Michel2/ESPEasy
1
0
Fork 0
mirror of https://github.com/letscontrolit/ESPEasy.git synced 2026-07-27 19:57:38 +00:00
Code Issues Releases Activity

[Fixes] %iswifi% report status value instead of boolean

Browse Source
This commit is contained in:
Ton Huisman
2026-04-22 23:10:42 +02:00
parent 0ff1e2f571
commit cc2ec06cb2
2 changed files with 28 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
docs/source/Reference/SystemVariable.rst
+9 -1
View File
@@ -241,9 +241,17 @@ More uses of these system variables can be seen in the rules section and formula
* ``0`` = disconnected
* ``1`` = Connected
* ``3`` = Got IP && Connected
* ``3`` = *Got IP && Connected (No longer reported since 2026-05-01)*
* ``7`` = Got IP && Connected && Completed to set all flags WiFi is initialized
- Yes
* - ``%iswifiap%``
- 1
- Status of WiFi AP mode
- Yes
* - ``%isppp%``
- 0
- Status of PPP Interface active (ESP32 only, with PPP Network Interface configured)
- Yes
* - ``%vcc%``
- 5.2
- VCC value, this is only available in the VCC builds of FW (with "VCC" in the file name).
src/src/Helpers/SystemVariables.cpp
+19 -8
View File
@@ -44,11 +44,24 @@
#if defined(ESP8266)
# include <ESP8266WiFi.h>
#define WIFI_CONNECTED WiFi.isConnected()
int WIFI_CONNECT_STATUS() {
if (WiFi.isConnected()) {
return 7;
}
return 0;
}
#endif // if defined(ESP8266)
#if defined(ESP32)
# include <WiFi.h>
#define WIFI_CONNECTED WiFi.STA.connected()
int WIFI_CONNECT_STATUS() {
if (WiFi.STA.connected()) {
if (WiFi.STA.hasIP()) {
return 7;
}
return 1;
}
return 0;
}
#endif // if defined(ESP32)
@@ -176,7 +189,7 @@ String SystemVariables::getSystemVariable(SystemVariables::Enum enumval) {
switch (enumval)
{
case BOOT_CAUSE: intvalue = lastBootCause; break; // Integer value to be used in rules
case BSSID: return (!WIFI_CONNECTED) ? MAC_address().toString() : WiFi.BSSIDstr();
case BSSID: return (!WIFI_CONNECT_STATUS()) ? MAC_address().toString() : WiFi.BSSIDstr();
case CR: return String('\r');
case IP4: intvalue = static_cast<int>(ESPEasy::net::NetworkLocalIP()[3]); break; // 4th IP octet
case ISVAR_DOUBLE: intvalue =
@@ -207,13 +220,11 @@ String SystemVariables::getSystemVariable(SystemVariables::Enum enumval) {
case ISNTP: intvalue = statusNTPInitialized ? 1 : 0; break;
case ISWIFIAP: intvalue = ESPEasy::net::wifi::WifiIsAP(WiFi.getMode()) ? 1 : 0; break;
case ISWIFI: intvalue = WIFI_CONNECTED ? 1 : 0; break;
case ISWIFI: intvalue = WIFI_CONNECT_STATUS(); break;
#ifdef USES_NW005
case ISPPP: intvalue = PPP.connected() ? 1 : 0; break;
#endif
// WiFiEventData.wifiStatus; break; // 0=disconnected, 1=connected, 2=got ip, 4=services
// initialized
case LCLTIME_AM: return node_time.getDateTimeString_ampm('-', ':', ' ');
case LF: return String('\n');
case MAC_INT: intvalue = getChipId(); break; // Last 24 bit of MAC address as integer, to be used in rules.
@@ -236,7 +247,7 @@ String SystemVariables::getSystemVariable(SystemVariables::Enum enumval) {
}
#endif // ifndef LIMIT_BUILD_SIZE
case SPACE: return String(' ');
case SSID: return (!WIFI_CONNECTED) ? String(F("--")) : WiFi.SSID();
case SSID: return (!WIFI_CONNECT_STATUS()) ? String(F("--")) : WiFi.SSID();
case SYSBUILD_DATE: return get_build_date();
@@ -290,7 +301,7 @@ String SystemVariables::getSystemVariable(SystemVariables::Enum enumval) {
#else // if FEATURE_ADC_VCC
case VCC: intvalue = -1; break;
#endif // if FEATURE_ADC_VCC
case WI_CH: intvalue = !WIFI_CONNECTED ? 0 : WiFi.channel(); break;
case WI_CH: intvalue = !WIFI_CONNECT_STATUS() ? 0 : WiFi.channel(); break;
default:
// Already handled above.