From c731223456a6a030ff0f802f670de0e9821eacf0 Mon Sep 17 00:00:00 2001 From: TD-er Date: Sat, 26 Oct 2024 18:15:22 +0200 Subject: [PATCH 001/564] [WiFi] Split WiFi code specific for ESP8266 and ESP32 --- ...FiEvent.cpp => ESPEasyWiFiEvent_ESP32.cpp} | 409 ++++++++---------- src/src/ESPEasyCore/ESPEasyWiFiEvent_ESP32.h | 40 ++ .../ESPEasyCore/ESPEasyWiFiEvent_ESP8266.cpp | 115 +++++ ...WiFiEvent.h => ESPEasyWiFiEvent_ESP8266.h} | 34 +- src/src/ESPEasyCore/ESPEasyWifi.cpp | 314 +------------- src/src/ESPEasyCore/ESPEasyWifi.h | 4 - .../ESPEasyWifi_abstracted_ESP32.cpp | 219 ++++++++++ .../ESPEasyWifi_abstracted_ESP8266.cpp | 196 +++++++++ src/src/ESPEasyCore/ESPEasyWifi_abstrated.h | 48 ++ 9 files changed, 815 insertions(+), 564 deletions(-) rename src/src/ESPEasyCore/{ESPEasyWiFiEvent.cpp => ESPEasyWiFiEvent_ESP32.cpp} (50%) create mode 100644 src/src/ESPEasyCore/ESPEasyWiFiEvent_ESP32.h create mode 100644 src/src/ESPEasyCore/ESPEasyWiFiEvent_ESP8266.cpp rename src/src/ESPEasyCore/{ESPEasyWiFiEvent.h => ESPEasyWiFiEvent_ESP8266.h} (70%) create mode 100644 src/src/ESPEasyCore/ESPEasyWifi_abstracted_ESP32.cpp create mode 100644 src/src/ESPEasyCore/ESPEasyWifi_abstracted_ESP8266.cpp create mode 100644 src/src/ESPEasyCore/ESPEasyWifi_abstrated.h diff --git a/src/src/ESPEasyCore/ESPEasyWiFiEvent.cpp b/src/src/ESPEasyCore/ESPEasyWiFiEvent_ESP32.cpp similarity index 50% rename from src/src/ESPEasyCore/ESPEasyWiFiEvent.cpp rename to src/src/ESPEasyCore/ESPEasyWiFiEvent_ESP32.cpp index ea4d769fd..9d414fa6d 100644 --- a/src/src/ESPEasyCore/ESPEasyWiFiEvent.cpp +++ b/src/src/ESPEasyCore/ESPEasyWiFiEvent_ESP32.cpp @@ -1,161 +1,158 @@ -#include "../ESPEasyCore/ESPEasyWiFiEvent.h" - -#if FEATURE_ETHERNET -#include -#endif - -#include "../DataStructs/RTCStruct.h" - -#include "../DataTypes/ESPEasyTimeSource.h" - -#include "../ESPEasyCore/ESPEasyEth.h" -#include "../ESPEasyCore/ESPEasy_Log.h" -#include "../ESPEasyCore/ESPEasyNetwork.h" -#include "../ESPEasyCore/ESPEasyWifi.h" -#include "../ESPEasyCore/ESPEasyWifi_ProcessEvent.h" - -#include "../Globals/ESPEasyWiFiEvent.h" -#include "../Globals/NetworkState.h" -#include "../Globals/RTC.h" -#include "../Globals/WiFi_AP_Candidates.h" - -#include "../Helpers/ESPEasy_time_calc.h" - - -#if FEATURE_ETHERNET -#include "../Globals/ESPEasyEthEvent.h" -#endif - +#include "../ESPEasyCore/ESPEasyWiFiEvent_ESP32.h" #ifdef ESP32 +# if FEATURE_ETHERNET +# include +# endif // if FEATURE_ETHERNET + +# include "../DataStructs/RTCStruct.h" + +# include "../DataTypes/ESPEasyTimeSource.h" + +# include "../ESPEasyCore/ESPEasyEth.h" +# include "../ESPEasyCore/ESPEasy_Log.h" +# include "../ESPEasyCore/ESPEasyNetwork.h" +# include "../ESPEasyCore/ESPEasyWifi.h" +# include "../ESPEasyCore/ESPEasyWifi_ProcessEvent.h" + +# include "../Globals/ESPEasyWiFiEvent.h" +# include "../Globals/NetworkState.h" +# include "../Globals/RTC.h" +# include "../Globals/WiFi_AP_Candidates.h" + +# include "../Helpers/ESPEasy_time_calc.h" + + +# if FEATURE_ETHERNET +# include "../Globals/ESPEasyEthEvent.h" +# endif // if FEATURE_ETHERNET + + void setUseStaticIP(bool enabled) { } -#endif // ifdef ESP32 -#ifdef ESP8266 -void WiFi_Access_Static_IP::set_use_static_ip(bool enabled) { - _useStaticIp = enabled; -} -void setUseStaticIP(bool enabled) { - WiFi_Access_Static_IP tmp_wifi; - - tmp_wifi.set_use_static_ip(enabled); -} - -#endif // ifdef ESP8266 - - - - // ******************************************************************************** // Functions called on events. // Make sure not to call anything in these functions that result in delay() or yield() // ******************************************************************************** -#ifdef ESP32 -#include +# include static bool ignoreDisconnectEvent = false; -#if ESP_IDF_VERSION_MAJOR > 3 +# if ESP_IDF_VERSION_MAJOR > 3 void WiFiEvent(WiFiEvent_t event, arduino_event_info_t info) { switch (event) { case ARDUINO_EVENT_WIFI_READY: // ESP32 WiFi ready break; case ARDUINO_EVENT_WIFI_STA_START: - # ifndef BUILD_NO_DEBUG - //addLog(LOG_LEVEL_INFO, F("WiFi : Event STA Started")); - #endif + # ifndef BUILD_NO_DEBUG + + // addLog(LOG_LEVEL_INFO, F("WiFi : Event STA Started")); + # endif // ifndef BUILD_NO_DEBUG break; case ARDUINO_EVENT_WIFI_STA_STOP: - # ifndef BUILD_NO_DEBUG - //addLog(LOG_LEVEL_INFO, F("WiFi : Event STA Stopped")); - #endif + # ifndef BUILD_NO_DEBUG + + // addLog(LOG_LEVEL_INFO, F("WiFi : Event STA Stopped")); + # endif // ifndef BUILD_NO_DEBUG break; case ARDUINO_EVENT_WIFI_AP_START: - # ifndef BUILD_NO_DEBUG - //addLog(LOG_LEVEL_INFO, F("WiFi : Event AP Started")); - #endif + # ifndef BUILD_NO_DEBUG + + // addLog(LOG_LEVEL_INFO, F("WiFi : Event AP Started")); + # endif // ifndef BUILD_NO_DEBUG break; case ARDUINO_EVENT_WIFI_AP_STOP: - # ifndef BUILD_NO_DEBUG - //addLog(LOG_LEVEL_INFO, F("WiFi : Event AP Stopped")); - #endif + # ifndef BUILD_NO_DEBUG + + // addLog(LOG_LEVEL_INFO, F("WiFi : Event AP Stopped")); + # endif // ifndef BUILD_NO_DEBUG break; case ARDUINO_EVENT_WIFI_STA_LOST_IP: // ESP32 station lost IP and the IP is reset to 0 - #if FEATURE_ETHERNET + # if FEATURE_ETHERNET + if (active_network_medium == NetworkMedium_t::Ethernet) { // DNS records are shared among WiFi and Ethernet (very bad design!) // So we must restore the DNS records for Ethernet in case we started with WiFi and then plugged in Ethernet. // As soon as WiFi is turned off, the DNS entry for Ethernet is cleared. EthEventData.markLostIP(); } - #endif // if FEATURE_ETHERNET + # endif // if FEATURE_ETHERNET WiFiEventData.markLostIP(); - # ifndef BUILD_NO_DEBUG - //addLog(LOG_LEVEL_INFO, + # ifndef BUILD_NO_DEBUG + + // addLog(LOG_LEVEL_INFO, + /* - active_network_medium == NetworkMedium_t::Ethernet ? - F("ETH : Event Lost IP") : - */ -// F("WiFi : Event Lost IP")); - #endif + active_network_medium == NetworkMedium_t::Ethernet ? + F("ETH : Event Lost IP") : + */ + + // F("WiFi : Event Lost IP")); + # endif // ifndef BUILD_NO_DEBUG break; case ARDUINO_EVENT_WIFI_AP_PROBEREQRECVED: // Receive probe request packet in soft-AP interface // TODO TD-er: Must implement like onProbeRequestAPmode for ESP8266 - # ifndef BUILD_NO_DEBUG - //addLog(LOG_LEVEL_INFO, F("WiFi : Event AP got probed")); - #endif + # ifndef BUILD_NO_DEBUG + + // addLog(LOG_LEVEL_INFO, F("WiFi : Event AP got probed")); + # endif // ifndef BUILD_NO_DEBUG break; case ARDUINO_EVENT_WIFI_STA_AUTHMODE_CHANGE: - #if ESP_IDF_VERSION_MAJOR > 3 + # if ESP_IDF_VERSION_MAJOR > 3 WiFiEventData.setAuthMode(info.wifi_sta_authmode_change.new_mode); - #else + # else // if ESP_IDF_VERSION_MAJOR > 3 WiFiEventData.setAuthMode(info.auth_change.new_mode); - #endif + # endif // if ESP_IDF_VERSION_MAJOR > 3 break; case ARDUINO_EVENT_WIFI_STA_CONNECTED: { char ssid_copy[33]; // Ensure space for maximum len SSID (32) plus trailing 0 - #if ESP_IDF_VERSION_MAJOR > 3 + # if ESP_IDF_VERSION_MAJOR > 3 memcpy(ssid_copy, info.wifi_sta_connected.ssid, info.wifi_sta_connected.ssid_len); - ssid_copy[32] = 0; // Potentially add 0-termination if none present earlier - WiFiEventData.markConnected((const char*) ssid_copy, info.wifi_sta_connected.bssid, info.wifi_sta_connected.channel); + ssid_copy[32] = 0; // Potentially add 0-termination if none present earlier + WiFiEventData.markConnected((const char *)ssid_copy, info.wifi_sta_connected.bssid, info.wifi_sta_connected.channel); WiFiEventData.setAuthMode(info.wifi_sta_connected.authmode); - //addLog(LOG_LEVEL_INFO, F("WiFi : Event WIFI_STA_CONNECTED")); - #else + + // addLog(LOG_LEVEL_INFO, F("WiFi : Event WIFI_STA_CONNECTED")); + # else // if ESP_IDF_VERSION_MAJOR > 3 memcpy(ssid_copy, info.connected.ssid, info.connected.ssid_len); ssid_copy[32] = 0; // Potentially add 0-termination if none present earlier - WiFiEventData.markConnected((const char*) ssid_copy, info.connected.bssid, info.connected.channel); - #endif + WiFiEventData.markConnected((const char *)ssid_copy, info.connected.bssid, info.connected.channel); + # endif // if ESP_IDF_VERSION_MAJOR > 3 break; } case ARDUINO_EVENT_WIFI_STA_DISCONNECTED: + if (!ignoreDisconnectEvent) { ignoreDisconnectEvent = true; - #if ESP_IDF_VERSION_MAJOR > 3 + # if ESP_IDF_VERSION_MAJOR > 3 WiFiEventData.markDisconnect(static_cast(info.wifi_sta_disconnected.reason)); + if (info.wifi_sta_disconnected.reason == WIFI_REASON_AUTH_EXPIRE) { // See: https://github.com/espressif/arduino-esp32/issues/8877#issuecomment-1807677897 - #if ESP_IDF_VERSION_MAJOR >= 5 + # if ESP_IDF_VERSION_MAJOR >= 5 + // FIXME TD-er: Should no longer be needed. WiFi.STA._setStatus(WL_CONNECTION_LOST); - #else + # else // if ESP_IDF_VERSION_MAJOR >= 5 WiFiSTAClass::_setStatus(WL_CONNECTION_LOST); - #endif + # endif // if ESP_IDF_VERSION_MAJOR >= 5 } - #else + # else // if ESP_IDF_VERSION_MAJOR > 3 WiFiEventData.markDisconnect(static_cast(info.disconnected.reason)); + if (info.disconnected.reason == WIFI_REASON_AUTH_EXPIRE) { // See: https://github.com/espressif/arduino-esp32/issues/8877#issuecomment-1807677897 WiFiSTAClass::_setStatus(WL_CONNECTION_LOST); } - #endif + # endif // if ESP_IDF_VERSION_MAJOR > 3 WiFi.persistent(false); WiFi.disconnect(true); } @@ -164,139 +161,148 @@ void WiFiEvent(WiFiEvent_t event, arduino_event_info_t info) { ignoreDisconnectEvent = false; WiFiEventData.markGotIP(); break; - #if FEATURE_USE_IPV6 + # if FEATURE_USE_IPV6 case ARDUINO_EVENT_WIFI_STA_GOT_IP6: { - ip_event_got_ip6_t * event = static_cast(&info.got_ip6); - const IPAddress ip(IPv6, (const uint8_t*)event->ip6_info.ip.addr, event->ip6_info.ip.zone); + ip_event_got_ip6_t *event = static_cast(&info.got_ip6); + const IPAddress ip(IPv6, (const uint8_t *)event->ip6_info.ip.addr, event->ip6_info.ip.zone); WiFiEventData.markGotIPv6(ip); break; } case ARDUINO_EVENT_WIFI_AP_GOT_IP6: addLog(LOG_LEVEL_INFO, F("WIFI : AP got IP6")); break; - #endif + # endif // if FEATURE_USE_IPV6 case ARDUINO_EVENT_WIFI_AP_STACONNECTED: - #if ESP_IDF_VERSION_MAJOR > 3 + # if ESP_IDF_VERSION_MAJOR > 3 WiFiEventData.markConnectedAPmode(info.wifi_ap_staconnected.mac); - #else + # else // if ESP_IDF_VERSION_MAJOR > 3 WiFiEventData.markConnectedAPmode(info.sta_connected.mac); - #endif + # endif // if ESP_IDF_VERSION_MAJOR > 3 break; case ARDUINO_EVENT_WIFI_AP_STADISCONNECTED: - #if ESP_IDF_VERSION_MAJOR > 3 + # if ESP_IDF_VERSION_MAJOR > 3 WiFiEventData.markDisconnectedAPmode(info.wifi_ap_stadisconnected.mac); - #else + # else // if ESP_IDF_VERSION_MAJOR > 3 WiFiEventData.markDisconnectedAPmode(info.sta_disconnected.mac); - #endif + # endif // if ESP_IDF_VERSION_MAJOR > 3 break; case ARDUINO_EVENT_WIFI_SCAN_DONE: WiFiEventData.processedScanDone = false; break; -#if FEATURE_ETHERNET +# if FEATURE_ETHERNET case ARDUINO_EVENT_ETH_START: case ARDUINO_EVENT_ETH_CONNECTED: case ARDUINO_EVENT_ETH_GOT_IP: case ARDUINO_EVENT_ETH_DISCONNECTED: case ARDUINO_EVENT_ETH_STOP: - #if ESP_IDF_VERSION_MAJOR > 3 + # if ESP_IDF_VERSION_MAJOR > 3 case ARDUINO_EVENT_ETH_GOT_IP6: - #else + # else // if ESP_IDF_VERSION_MAJOR > 3 case ARDUINO_EVENT_GOT_IP6: - #endif + # endif // if ESP_IDF_VERSION_MAJOR > 3 + // Handled in EthEvent break; -#endif //FEATURE_ETHERNET +# endif // FEATURE_ETHERNET default: - { - - // addLogMove(LOG_LEVEL_ERROR, concat(F("UNKNOWN WIFI/ETH EVENT: "), event)); - } + { + // addLogMove(LOG_LEVEL_ERROR, concat(F("UNKNOWN WIFI/ETH EVENT: "), event)); break; + } } } -#else + +# else // if ESP_IDF_VERSION_MAJOR > 3 void WiFiEvent(system_event_id_t event, system_event_info_t info) { switch (event) { case SYSTEM_EVENT_WIFI_READY: // ESP32 WiFi ready break; case SYSTEM_EVENT_STA_START: - # ifndef BUILD_NO_DEBUG - //addLog(LOG_LEVEL_INFO, F("WiFi : Event STA Started")); - #endif + # ifndef BUILD_NO_DEBUG + + // addLog(LOG_LEVEL_INFO, F("WiFi : Event STA Started")); + # endif // ifndef BUILD_NO_DEBUG break; case SYSTEM_EVENT_STA_STOP: - # ifndef BUILD_NO_DEBUG - //addLog(LOG_LEVEL_INFO, F("WiFi : Event STA Stopped")); - #endif + # ifndef BUILD_NO_DEBUG + + // addLog(LOG_LEVEL_INFO, F("WiFi : Event STA Stopped")); + # endif // ifndef BUILD_NO_DEBUG break; case SYSTEM_EVENT_AP_START: - # ifndef BUILD_NO_DEBUG - //addLog(LOG_LEVEL_INFO, F("WiFi : Event AP Started")); - #endif + # ifndef BUILD_NO_DEBUG + + // addLog(LOG_LEVEL_INFO, F("WiFi : Event AP Started")); + # endif // ifndef BUILD_NO_DEBUG break; case SYSTEM_EVENT_AP_STOP: - # ifndef BUILD_NO_DEBUG - //addLog(LOG_LEVEL_INFO, F("WiFi : Event AP Stopped")); - #endif + # ifndef BUILD_NO_DEBUG + + // addLog(LOG_LEVEL_INFO, F("WiFi : Event AP Stopped")); + # endif // ifndef BUILD_NO_DEBUG break; case SYSTEM_EVENT_STA_LOST_IP: // ESP32 station lost IP and the IP is reset to 0 - #if FEATURE_ETHERNET + # if FEATURE_ETHERNET + if (active_network_medium == NetworkMedium_t::Ethernet) { EthEventData.markLostIP(); } else - #endif // if FEATURE_ETHERNET + # endif // if FEATURE_ETHERNET WiFiEventData.markLostIP(); - # ifndef BUILD_NO_DEBUG + # ifndef BUILD_NO_DEBUG + /* - addLog(LOG_LEVEL_INFO, - active_network_medium == NetworkMedium_t::Ethernet ? - F("ETH : Event Lost IP") : F("WiFi : Event Lost IP")); - */ - #endif + addLog(LOG_LEVEL_INFO, + active_network_medium == NetworkMedium_t::Ethernet ? + F("ETH : Event Lost IP") : F("WiFi : Event Lost IP")); + */ + # endif // ifndef BUILD_NO_DEBUG break; case SYSTEM_EVENT_AP_PROBEREQRECVED: // Receive probe request packet in soft-AP interface // TODO TD-er: Must implement like onProbeRequestAPmode for ESP8266 - # ifndef BUILD_NO_DEBUG - //addLog(LOG_LEVEL_INFO, F("WiFi : Event AP got probed")); - #endif + # ifndef BUILD_NO_DEBUG + + // addLog(LOG_LEVEL_INFO, F("WiFi : Event AP got probed")); + # endif // ifndef BUILD_NO_DEBUG break; case SYSTEM_EVENT_STA_AUTHMODE_CHANGE: - #if ESP_IDF_VERSION_MAJOR > 3 + # if ESP_IDF_VERSION_MAJOR > 3 WiFiEventData.setAuthMode(info.wifi_sta_authmode_change.new_mode); - #else + # else // if ESP_IDF_VERSION_MAJOR > 3 WiFiEventData.setAuthMode(info.auth_change.new_mode); - #endif + # endif // if ESP_IDF_VERSION_MAJOR > 3 break; case SYSTEM_EVENT_STA_CONNECTED: { char ssid_copy[33] = { 0 }; // Ensure space for maximum len SSID (32) plus trailing 0 - #if ESP_IDF_VERSION_MAJOR > 3 + # if ESP_IDF_VERSION_MAJOR > 3 memcpy(ssid_copy, info.wifi_sta_connected.ssid, info.wifi_sta_connected.ssid_len); - ssid_copy[32] = 0; // Potentially add 0-termination if none present earlier - WiFiEventData.markConnected((const char*) ssid_copy, info.wifi_sta_connected.bssid, info.wifi_sta_connected.channel); - #else + ssid_copy[32] = 0; // Potentially add 0-termination if none present earlier + WiFiEventData.markConnected((const char *)ssid_copy, info.wifi_sta_connected.bssid, info.wifi_sta_connected.channel); + # else // if ESP_IDF_VERSION_MAJOR > 3 memcpy(ssid_copy, info.connected.ssid, info.connected.ssid_len); ssid_copy[32] = 0; // Potentially add 0-termination if none present earlier - WiFiEventData.markConnected((const char*) ssid_copy, info.connected.bssid, info.connected.channel); - #endif + WiFiEventData.markConnected((const char *)ssid_copy, info.connected.bssid, info.connected.channel); + # endif // if ESP_IDF_VERSION_MAJOR > 3 break; } case SYSTEM_EVENT_STA_DISCONNECTED: + if (!ignoreDisconnectEvent) { ignoreDisconnectEvent = true; - #if ESP_IDF_VERSION_MAJOR > 3 + # if ESP_IDF_VERSION_MAJOR > 3 WiFiEventData.markDisconnect(static_cast(info.wifi_sta_disconnected.reason)); - #else + # else // if ESP_IDF_VERSION_MAJOR > 3 WiFiEventData.markDisconnect(static_cast(info.disconnected.reason)); - #endif + # endif // if ESP_IDF_VERSION_MAJOR > 3 WiFi.persistent(false); WiFi.disconnect(true); } @@ -306,135 +312,58 @@ void WiFiEvent(system_event_id_t event, system_event_info_t info) { WiFiEventData.markGotIP(); break; case SYSTEM_EVENT_AP_STACONNECTED: - #if ESP_IDF_VERSION_MAJOR > 3 + # if ESP_IDF_VERSION_MAJOR > 3 WiFiEventData.markConnectedAPmode(info.wifi_ap_staconnected.mac); - #else + # else // if ESP_IDF_VERSION_MAJOR > 3 WiFiEventData.markConnectedAPmode(info.sta_connected.mac); - #endif + # endif // if ESP_IDF_VERSION_MAJOR > 3 break; case SYSTEM_EVENT_AP_STADISCONNECTED: - #if ESP_IDF_VERSION_MAJOR > 3 + # if ESP_IDF_VERSION_MAJOR > 3 WiFiEventData.markDisconnectedAPmode(info.wifi_ap_stadisconnected.mac); - #else + # else // if ESP_IDF_VERSION_MAJOR > 3 WiFiEventData.markDisconnectedAPmode(info.sta_disconnected.mac); - #endif + # endif // if ESP_IDF_VERSION_MAJOR > 3 break; case SYSTEM_EVENT_SCAN_DONE: WiFiEventData.processedScanDone = false; break; -#if FEATURE_ETHERNET +# if FEATURE_ETHERNET case SYSTEM_EVENT_ETH_START: + if (ethPrepare()) { - //addLog(LOG_LEVEL_INFO, F("ETH event: Started")); + // addLog(LOG_LEVEL_INFO, F("ETH event: Started")); } else { - //addLog(LOG_LEVEL_ERROR, F("ETH event: Could not prepare ETH!")); + // addLog(LOG_LEVEL_ERROR, F("ETH event: Could not prepare ETH!")); } break; case SYSTEM_EVENT_ETH_CONNECTED: - //addLog(LOG_LEVEL_INFO, F("ETH event: Connected")); + // addLog(LOG_LEVEL_INFO, F("ETH event: Connected")); EthEventData.markConnected(); break; case SYSTEM_EVENT_ETH_GOT_IP: EthEventData.markGotIP(); - //addLog(LOG_LEVEL_INFO, F("ETH event: Got IP")); + + // addLog(LOG_LEVEL_INFO, F("ETH event: Got IP")); break; case SYSTEM_EVENT_ETH_DISCONNECTED: - //addLog(LOG_LEVEL_ERROR, F("ETH event: Disconnected")); + // addLog(LOG_LEVEL_ERROR, F("ETH event: Disconnected")); EthEventData.markDisconnect(); break; case SYSTEM_EVENT_ETH_STOP: - //addLog(LOG_LEVEL_INFO, F("ETH event: Stopped")); + // addLog(LOG_LEVEL_INFO, F("ETH event: Stopped")); break; case SYSTEM_EVENT_GOT_IP6: - //addLog(LOG_LEVEL_INFO, F("ETH event: Got IP6")); + // addLog(LOG_LEVEL_INFO, F("ETH event: Got IP6")); break; -#endif //FEATURE_ETHERNET +# endif // FEATURE_ETHERNET default: - { - //addLogMove(LOG_LEVEL_ERROR, concat(F("UNKNOWN WIFI/ETH EVENT: "), event)); - } + { + // addLogMove(LOG_LEVEL_ERROR, concat(F("UNKNOWN WIFI/ETH EVENT: "), event)); break; + } } } -#endif - +# endif // if ESP_IDF_VERSION_MAJOR > 3 #endif // ifdef ESP32 - -#ifdef ESP8266 - -void onConnected(const WiFiEventStationModeConnected& event) { - WiFiEventData.markConnected(event.ssid, event.bssid, event.channel); -} - -void onDisconnect(const WiFiEventStationModeDisconnected& event) { - WiFiEventData.markDisconnect(event.reason); - if (WiFi.status() == WL_CONNECTED) { - // See https://github.com/esp8266/Arduino/issues/5912 - WiFi.persistent(false); - WiFi.disconnect(false); - delay(0); - } -} - -void onGotIP(const WiFiEventStationModeGotIP& event) { - WiFiEventData.markGotIP(); -} - -void onDHCPTimeout() { - WiFiEventData.processedDHCPTimeout = false; -} - -void onConnectedAPmode(const WiFiEventSoftAPModeStationConnected& event) { - WiFiEventData.markConnectedAPmode(event.mac); -} - -void onDisconnectedAPmode(const WiFiEventSoftAPModeStationDisconnected& event) { - WiFiEventData.markDisconnectedAPmode(event.mac); -} - -void onStationModeAuthModeChanged(const WiFiEventStationModeAuthModeChanged& event) { - WiFiEventData.setAuthMode(event.newMode); -} - -#if FEATURE_ESP8266_DIRECT_WIFI_SCAN -void onWiFiScanDone(void *arg, STATUS status) { - if (status == OK) { - auto *head = reinterpret_cast(arg); - int scanCount = 0; - for (bss_info *it = head; it != nullptr; it = STAILQ_NEXT(it, next)) { - WiFi_AP_Candidates.process_WiFiscan(*it); - ++scanCount; - } - WiFi_AP_Candidates.after_process_WiFiscan(); - WiFiEventData.lastGetScanMoment.setNow(); -// WiFiEventData.processedScanDone = true; -# ifndef BUILD_NO_DEBUG -/* - if (loglevelActiveFor(LOG_LEVEL_INFO)) { - addLogMove(LOG_LEVEL_INFO, concat(F("WiFi : Scan finished (ESP8266), found: "), scanCount)); - } -*/ -#endif - WiFi_AP_Candidates.load_knownCredentials(); - if (WiFi_AP_Candidates.addedKnownCandidate() || !NetworkConnected()) { - WiFiEventData.wifiConnectAttemptNeeded = true; - # ifndef BUILD_NO_DEBUG - if (WiFi_AP_Candidates.addedKnownCandidate()) { - //addLog(LOG_LEVEL_INFO, F("WiFi : Added known candidate, try to connect")); - } - #endif - NetworkConnectRelaxed(); - } - - } - - WiFiMode_t mode = WiFi.getMode(); - setWifiMode(WIFI_OFF); - delay(1); - setWifiMode(mode); - delay(1); -} -#endif - -#endif // ifdef ESP8266 diff --git a/src/src/ESPEasyCore/ESPEasyWiFiEvent_ESP32.h b/src/src/ESPEasyCore/ESPEasyWiFiEvent_ESP32.h new file mode 100644 index 000000000..9f7d6b904 --- /dev/null +++ b/src/src/ESPEasyCore/ESPEasyWiFiEvent_ESP32.h @@ -0,0 +1,40 @@ +#ifndef ESPEASY_WIFI_EVENT_ESP32_H +#define ESPEASY_WIFI_EVENT_ESP32_H + +#ifdef ESP32 + +#include "../../ESPEasy_common.h" + +#include + +// ******************************************************************************** + +// Work-around for setting _useStaticIP +// See reported issue: https://github.com/esp8266/Arduino/issues/4114 +// ******************************************************************************** +#include +#include +#include +class WiFi_Access_Static_IP : public WiFiSTAClass { +public: + + void set_use_static_ip(bool enabled); +}; + +void setUseStaticIP(bool enabled); + + +// ******************************************************************************** +// Functions called on events. +// Make sure not to call anything in these functions that result in delay() or yield() +// ******************************************************************************** + #if ESP_IDF_VERSION_MAJOR > 3 + #include + void WiFiEvent(WiFiEvent_t event, arduino_event_info_t info); + #else + void WiFiEvent(system_event_id_t event, system_event_info_t info); + #endif + +#endif + +#endif \ No newline at end of file diff --git a/src/src/ESPEasyCore/ESPEasyWiFiEvent_ESP8266.cpp b/src/src/ESPEasyCore/ESPEasyWiFiEvent_ESP8266.cpp new file mode 100644 index 000000000..b96282116 --- /dev/null +++ b/src/src/ESPEasyCore/ESPEasyWiFiEvent_ESP8266.cpp @@ -0,0 +1,115 @@ +#include "../ESPEasyCore/ESPEasyWiFiEvent_ESP8266.h" + +#ifdef ESP8266 + +#include "../DataStructs/RTCStruct.h" + +#include "../DataTypes/ESPEasyTimeSource.h" + +#include "../ESPEasyCore/ESPEasyEth.h" +#include "../ESPEasyCore/ESPEasy_Log.h" +#include "../ESPEasyCore/ESPEasyNetwork.h" +#include "../ESPEasyCore/ESPEasyWifi.h" +#include "../ESPEasyCore/ESPEasyWifi_ProcessEvent.h" + +#include "../Globals/ESPEasyWiFiEvent.h" +#include "../Globals/NetworkState.h" +#include "../Globals/RTC.h" +#include "../Globals/WiFi_AP_Candidates.h" + +#include "../Helpers/ESPEasy_time_calc.h" + + +void WiFi_Access_Static_IP::set_use_static_ip(bool enabled) { + _useStaticIp = enabled; +} +void setUseStaticIP(bool enabled) { + WiFi_Access_Static_IP tmp_wifi; + + tmp_wifi.set_use_static_ip(enabled); +} + + + + + +// ******************************************************************************** +// Functions called on events. +// Make sure not to call anything in these functions that result in delay() or yield() +// ******************************************************************************** +void onConnected(const WiFiEventStationModeConnected& event) { + WiFiEventData.markConnected(event.ssid, event.bssid, event.channel); +} + +void onDisconnect(const WiFiEventStationModeDisconnected& event) { + WiFiEventData.markDisconnect(event.reason); + if (WiFi.status() == WL_CONNECTED) { + // See https://github.com/esp8266/Arduino/issues/5912 + WiFi.persistent(false); + WiFi.disconnect(false); + delay(0); + } +} + +void onGotIP(const WiFiEventStationModeGotIP& event) { + WiFiEventData.markGotIP(); +} + +void onDHCPTimeout() { + WiFiEventData.processedDHCPTimeout = false; +} + +void onConnectedAPmode(const WiFiEventSoftAPModeStationConnected& event) { + WiFiEventData.markConnectedAPmode(event.mac); +} + +void onDisconnectedAPmode(const WiFiEventSoftAPModeStationDisconnected& event) { + WiFiEventData.markDisconnectedAPmode(event.mac); +} + +void onStationModeAuthModeChanged(const WiFiEventStationModeAuthModeChanged& event) { + WiFiEventData.setAuthMode(event.newMode); +} + +#if FEATURE_ESP8266_DIRECT_WIFI_SCAN +void onWiFiScanDone(void *arg, STATUS status) { + if (status == OK) { + auto *head = reinterpret_cast(arg); + int scanCount = 0; + for (bss_info *it = head; it != nullptr; it = STAILQ_NEXT(it, next)) { + WiFi_AP_Candidates.process_WiFiscan(*it); + ++scanCount; + } + WiFi_AP_Candidates.after_process_WiFiscan(); + WiFiEventData.lastGetScanMoment.setNow(); +// WiFiEventData.processedScanDone = true; +# ifndef BUILD_NO_DEBUG +/* + if (loglevelActiveFor(LOG_LEVEL_INFO)) { + addLogMove(LOG_LEVEL_INFO, concat(F("WiFi : Scan finished (ESP8266), found: "), scanCount)); + } +*/ +#endif + WiFi_AP_Candidates.load_knownCredentials(); + if (WiFi_AP_Candidates.addedKnownCandidate() || !NetworkConnected()) { + WiFiEventData.wifiConnectAttemptNeeded = true; + # ifndef BUILD_NO_DEBUG + if (WiFi_AP_Candidates.addedKnownCandidate()) { + //addLog(LOG_LEVEL_INFO, F("WiFi : Added known candidate, try to connect")); + } + #endif + NetworkConnectRelaxed(); + } + + } + + WiFiMode_t mode = WiFi.getMode(); + setWifiMode(WIFI_OFF); + delay(1); + setWifiMode(mode); + delay(1); +} + +#endif + +#endif diff --git a/src/src/ESPEasyCore/ESPEasyWiFiEvent.h b/src/src/ESPEasyCore/ESPEasyWiFiEvent_ESP8266.h similarity index 70% rename from src/src/ESPEasyCore/ESPEasyWiFiEvent.h rename to src/src/ESPEasyCore/ESPEasyWiFiEvent_ESP8266.h index 996692c62..aed20ebb8 100644 --- a/src/src/ESPEasyCore/ESPEasyWiFiEvent.h +++ b/src/src/ESPEasyCore/ESPEasyWiFiEvent_ESP8266.h @@ -1,5 +1,8 @@ -#ifndef ESPEASY_WIFI_EVENT_H -#define ESPEASY_WIFI_EVENT_H +#ifndef ESPEASY_WIFI_EVENT_ESP8266_H +#define ESPEASY_WIFI_EVENT_ESP8266_H + +#ifdef ESP8266 + #include "../../ESPEasy_common.h" @@ -10,18 +13,7 @@ // Work-around for setting _useStaticIP // See reported issue: https://github.com/esp8266/Arduino/issues/4114 // ******************************************************************************** -#ifdef ESP32 -#include -#include -#include -class WiFi_Access_Static_IP : public WiFiSTAClass { -public: - void set_use_static_ip(bool enabled); -}; -#endif - -#ifdef ESP8266 #include #include class WiFi_Access_Static_IP : public ESP8266WiFiSTAClass { @@ -29,8 +21,6 @@ public: void set_use_static_ip(bool enabled); }; -#endif - void setUseStaticIP(bool enabled); @@ -39,17 +29,6 @@ void setUseStaticIP(bool enabled); // Functions called on events. // Make sure not to call anything in these functions that result in delay() or yield() // ******************************************************************************** -#ifdef ESP32 - #if ESP_IDF_VERSION_MAJOR > 3 - #include - void WiFiEvent(WiFiEvent_t event, arduino_event_info_t info); - #else - void WiFiEvent(system_event_id_t event, system_event_info_t info); - #endif -#endif - -#ifdef ESP8266 - void onConnected(const WiFiEventStationModeConnected& event); void onDisconnect(const WiFiEventStationModeDisconnected& event); @@ -70,5 +49,4 @@ void onWiFiScanDone(void *arg, STATUS status); #endif - -#endif // ESPEASY_WIFI_EVENT_H \ No newline at end of file +#endif \ No newline at end of file diff --git a/src/src/ESPEasyCore/ESPEasyWifi.cpp b/src/src/ESPEasyCore/ESPEasyWifi.cpp index 8f5ea6c31..2245649dd 100644 --- a/src/src/ESPEasyCore/ESPEasyWifi.cpp +++ b/src/src/ESPEasyCore/ESPEasyWifi.cpp @@ -3,7 +3,6 @@ #include "../../ESPEasy-Globals.h" #include "../DataStructs/TimingStats.h" #include "../ESPEasyCore/ESPEasyNetwork.h" -#include "../ESPEasyCore/ESPEasyWiFiEvent.h" #include "../ESPEasyCore/ESPEasyWifi_ProcessEvent.h" #include "../ESPEasyCore/ESPEasy_Log.h" #include "../ESPEasyCore/Serial.h" @@ -24,6 +23,11 @@ #include "../Helpers/StringGenerator_WiFi.h" #include "../Helpers/StringProvider.h" + + +#include "../ESPEasyCore/ESPEasyWifi_abstrated.h" + + #ifdef ESP32 #include #include // Needed to call ESP-IDF functions like esp_wifi_.... @@ -261,28 +265,7 @@ bool WiFiConnected() { if (WiFiEventData.unprocessedWifiEvents()) { return false; } - bool wifi_isconnected = WiFi.isConnected(); - #ifdef ESP8266 - // Perform check on SDK function, see: https://github.com/esp8266/Arduino/issues/7432 - station_status_t status = wifi_station_get_connect_status(); - switch(status) { - case STATION_GOT_IP: - wifi_isconnected = true; - break; - case STATION_NO_AP_FOUND: - case STATION_CONNECT_FAIL: - case STATION_WRONG_PASSWORD: - wifi_isconnected = false; - break; - case STATION_IDLE: - case STATION_CONNECTING: - break; - - default: - wifi_isconnected = false; - break; - } - #endif + bool wifi_isconnected = ESPEasy_WiFi_abstraction::WiFiConnected(); if (recursiveCall) return wifi_isconnected; recursiveCall = true; @@ -566,9 +549,7 @@ void AttemptWiFiConnect() { // Set Wifi config // ******************************************************************************** bool prepareWiFi() { - #if defined(ESP32) - registerWiFiEventHandler(); - #endif + ESPEasy_WiFi_abstraction::registerWiFiEventHandler(); if (!WiFi_AP_Candidates.hasCandidateCredentials()) { if (!WiFiEventData.warnedNoValidWiFiSettings) { @@ -677,21 +658,6 @@ void resetWiFi() { initWiFi(); } -#ifdef ESP32 -void removeWiFiEventHandler() -{ - WiFi.removeEvent(WiFiEventData.wm_event_id); - WiFiEventData.wm_event_id = 0; -} - -void registerWiFiEventHandler() -{ - if (WiFiEventData.wm_event_id != 0) { - removeWiFiEventHandler(); - } - WiFiEventData.wm_event_id = WiFi.onEvent(WiFiEvent); -} -#endif void initWiFi() @@ -704,7 +670,7 @@ void initWiFi() // WiFi = ESP8266WiFiClass(); #endif // ifdef ESP8266 #ifdef ESP32 - removeWiFiEventHandler(); + ESPEasy_WiFi_abstraction::removeWiFiEventHandler(); #endif @@ -719,23 +685,7 @@ void initWiFi() } setWifiMode(WIFI_OFF); -#if defined(ESP32) - registerWiFiEventHandler(); -#endif -#ifdef ESP8266 - // WiFi event handlers - static bool handlers_initialized = false; - if (!handlers_initialized) { - stationConnectedHandler = WiFi.onStationModeConnected(onConnected); - stationDisconnectedHandler = WiFi.onStationModeDisconnected(onDisconnect); - stationGotIpHandler = WiFi.onStationModeGotIP(onGotIP); - stationModeDHCPTimeoutHandler = WiFi.onStationModeDHCPTimeout(onDHCPTimeout); - stationModeAuthModeChangeHandler = WiFi.onStationModeAuthModeChanged(onStationModeAuthModeChanged); - APModeStationConnectedHandler = WiFi.onSoftAPModeStationConnected(onConnectedAPmode); - APModeStationDisconnectedHandler = WiFi.onSoftAPModeStationDisconnected(onDisconnectedAPmode); - handlers_initialized = true; - } -#endif + ESPEasy_WiFi_abstraction::registerWiFiEventHandler(); delay(100); } @@ -791,18 +741,7 @@ void SetWiFiTXpower(float dBm, float rssi) { dBm = minTXpwr; } - #ifdef ESP32 - int8_t power = dBm * 4; - if (esp_wifi_set_max_tx_power(power) == ESP_OK) { - if (esp_wifi_get_max_tx_power(&power) == ESP_OK) { - dBm = static_cast(power) / 4.0f; - } - } - #endif - - #ifdef ESP8266 - WiFi.setOutputPower(dBm); - #endif +ESPEasy_WiFi_abstraction::SetWiFiTXpower(dBm); if (WiFiEventData.wifi_TX_pwr < dBm) { // Will increase the TX power, give power supply of the unit some rest @@ -840,39 +779,7 @@ void SetWiFiTXpower(float dBm, float rssi) { float GetRSSIthreshold(float& maxTXpwr) { maxTXpwr = Settings.getWiFi_TX_power(); - float threshold = WIFI_SENSITIVITY_n; - switch (getConnectionProtocol()) { - case WiFiConnectionProtocol::WiFi_Protocol_11b: - threshold = WIFI_SENSITIVITY_11b; - if (maxTXpwr > MAX_TX_PWR_DBM_11b) maxTXpwr = MAX_TX_PWR_DBM_11b; - break; - case WiFiConnectionProtocol::WiFi_Protocol_11g: - threshold = WIFI_SENSITIVITY_54g; - if (maxTXpwr > MAX_TX_PWR_DBM_54g) maxTXpwr = MAX_TX_PWR_DBM_54g; - break; -#ifdef ESP8266 - case WiFiConnectionProtocol::WiFi_Protocol_11n: -#else - case WiFiConnectionProtocol::WiFi_Protocol_HT20: - case WiFiConnectionProtocol::WiFi_Protocol_HT40: - case WiFiConnectionProtocol::WiFi_Protocol_HE20: -#endif - - threshold = WIFI_SENSITIVITY_n; - if (maxTXpwr > MAX_TX_PWR_DBM_n) maxTXpwr = MAX_TX_PWR_DBM_n; - break; -#ifdef ESP32 -#if ESP_IDF_VERSION > ESP_IDF_VERSION_VAL(5, 2, 0) - case WiFiConnectionProtocol::WiFi_Protocol_11a: - case WiFiConnectionProtocol::WiFi_Protocol_VHT20: - // FIXME TD-er: Must determine max. TX power for these 5 GHz modi -#endif - case WiFiConnectionProtocol::WiFi_Protocol_LR: -#endif - case WiFiConnectionProtocol::Unknown: - break; - } - return threshold; + return ESPEasy_WiFi_abstraction::GetRSSIthreshold(maxTXpwr); } int GetRSSI_quality() { @@ -886,37 +793,7 @@ int GetRSSI_quality() { } WiFiConnectionProtocol getConnectionProtocol() { - if (WiFi.RSSI() < 0) { - #ifdef ESP8266 - switch (wifi_get_phy_mode()) { - case PHY_MODE_11B: - return WiFiConnectionProtocol::WiFi_Protocol_11b; - case PHY_MODE_11G: - return WiFiConnectionProtocol::WiFi_Protocol_11g; - case PHY_MODE_11N: - return WiFiConnectionProtocol::WiFi_Protocol_11n; - } - #endif - #ifdef ESP32 - - wifi_phy_mode_t phymode; - esp_wifi_sta_get_negotiated_phymode(&phymode); - switch (phymode) { - case WIFI_PHY_MODE_11B: return WiFiConnectionProtocol::WiFi_Protocol_11b; - case WIFI_PHY_MODE_11G: return WiFiConnectionProtocol::WiFi_Protocol_11g; - case WIFI_PHY_MODE_HT20: return WiFiConnectionProtocol::WiFi_Protocol_HT20; - case WIFI_PHY_MODE_HT40: return WiFiConnectionProtocol::WiFi_Protocol_HT40; - case WIFI_PHY_MODE_HE20: return WiFiConnectionProtocol::WiFi_Protocol_HE20; - case WIFI_PHY_MODE_LR: return WiFiConnectionProtocol::WiFi_Protocol_LR; -#if ESP_IDF_VERSION >= ESP_IDF_VERSION_VAL(5, 3, 0) - // 5 GHz - case WIFI_PHY_MODE_11A: return WiFiConnectionProtocol::WiFi_Protocol_11a; - case WIFI_PHY_MODE_VHT20: return WiFiConnectionProtocol::WiFi_Protocol_VHT20; -#endif - } - #endif - } - return WiFiConnectionProtocol::Unknown; + return ESPEasy_WiFi_abstraction::getConnectionProtocol(); } #ifdef ESP32 @@ -947,29 +824,7 @@ void WifiDisconnect() # ifndef BUILD_NO_DEBUG addLog(LOG_LEVEL_INFO, F("WiFi : WifiDisconnect()")); #endif - #ifdef ESP32 - removeWiFiEventHandler(); - WiFi.disconnect(); - delay(100); - { - const IPAddress ip; - const IPAddress gw; - const IPAddress subnet; - const IPAddress dns; - WiFi.config(ip, gw, subnet, dns); - } - #endif - #ifdef ESP8266 - // Only call disconnect when STA is active - if (WifiIsSTA(WiFi.getMode())) { - wifi_station_disconnect(); - } - station_config conf{}; - memset(&conf, 0, sizeof(conf)); - ETS_UART_INTR_DISABLE(); - wifi_station_set_config_current(&conf); - ETS_UART_INTR_ENABLE(); - #endif + ESPEasy_WiFi_abstraction::WiFiDisconnect(); WiFiEventData.setWiFiDisconnected(); WiFiEventData.markDisconnect(WIFI_DISCONNECT_REASON_UNSPECIFIED); /* @@ -1395,6 +1250,8 @@ void setWifiMode(WiFiMode_t new_mode) { if (new_mode == WIFI_OFF) { + + // FIXME TD-er: Is this correct to mark Turn ON ???? WiFiEventData.markWiFiTurnOn(); #if defined(ESP32) // Needs to be set while WiFi is off @@ -1410,42 +1267,19 @@ void setWifiMode(WiFiMode_t new_mode) { #endif // ifdef ESP8266 delay(1); } else { - #ifdef ESP32 if (cur_mode == WIFI_OFF) { - registerWiFiEventHandler(); + ESPEasy_WiFi_abstraction::registerWiFiEventHandler(); } - #endif // Only set power mode when AP is not enabled // When AP is enabled, the sleep mode is already set to WIFI_NONE_SLEEP if (!WifiIsAP(new_mode)) { if (Settings.WifiNoneSleep()) { - #ifdef ESP8266 - WiFi.setSleepMode(WIFI_NONE_SLEEP); - #endif - #ifdef ESP32 - WiFi.setSleep(WIFI_PS_NONE); - #endif + ESPEasy_WiFi_abstraction::setWiFiNoneSleep(); } else if (Settings.EcoPowerMode()) { - // Allow light sleep during idle times - #ifdef ESP8266 - WiFi.setSleepMode(WIFI_LIGHT_SLEEP); - #endif - #ifdef ESP32 - // Maximum modem power saving. - // In this mode, interval to receive beacons is determined by the listen_interval parameter in wifi_sta_config_t - // FIXME TD-er: Must test if this is desired behavior in ESP32. - WiFi.setSleep(WIFI_PS_MAX_MODEM); - #endif + ESPEasy_WiFi_abstraction::setWiFiEcoPowerMode(); } else { // Default - #ifdef ESP8266 - WiFi.setSleepMode(WIFI_MODEM_SLEEP); - #endif - #ifdef ESP32 - // Minimum modem power saving. - // In this mode, station wakes up to receive beacon every DTIM period - WiFi.setSleep(WIFI_PS_MIN_MODEM); - #endif + ESPEasy_WiFi_abstraction::setWiFiDefaultPowerMode(); } } #if FEATURE_SET_WIFI_TX_PWR @@ -1477,20 +1311,12 @@ void setWifiMode(WiFiMode_t new_mode) { bool WifiIsAP(WiFiMode_t wifimode) { - #if defined(ESP32) - return (wifimode == WIFI_MODE_AP) || (wifimode == WIFI_MODE_APSTA); - #else // if defined(ESP32) - return (wifimode == WIFI_AP) || (wifimode == WIFI_AP_STA); - #endif // if defined(ESP32) + return ESPEasy_WiFi_abstraction::WifiIsAP(wifimode); } bool WifiIsSTA(WiFiMode_t wifimode) { - #if defined(ESP32) - return (wifimode & WIFI_MODE_STA) != 0; - #else // if defined(ESP32) - return (wifimode & WIFI_STA) != 0; - #endif // if defined(ESP32) + return ESPEasy_WiFi_abstraction::WifiIsSTA(wifimode); } bool WiFiUseStaticIP() { @@ -1510,103 +1336,7 @@ bool wifiAPmodeActivelyUsed() } void setConnectionSpeed() { - #ifdef ESP8266 - // ESP8266 only supports 802.11g mode when running in STA+AP - const bool forcedByAPmode = WifiIsAP(WiFi.getMode()); - WiFiPhyMode_t phyMode = (Settings.ForceWiFi_bg_mode() || forcedByAPmode) ? WIFI_PHY_MODE_11G : WIFI_PHY_MODE_11N; - if (!forcedByAPmode) { - const WiFi_AP_Candidate candidate = WiFi_AP_Candidates.getCurrent(); - if (candidate.phy_known() && (candidate.bits.phy_11g != candidate.bits.phy_11n)) { - if ((WIFI_PHY_MODE_11G == phyMode) && !candidate.bits.phy_11g) { - phyMode = WIFI_PHY_MODE_11N; - addLog(LOG_LEVEL_INFO, F("WIFI : AP is set to 802.11n only")); - } else if ((WIFI_PHY_MODE_11N == phyMode) && !candidate.bits.phy_11n) { - phyMode = WIFI_PHY_MODE_11G; - addLog(LOG_LEVEL_INFO, F("WIFI : AP is set to 802.11g only")); - } - } else { - bool useAlternate = WiFiEventData.connectionFailures > 10; - if (useAlternate) { - phyMode = (WIFI_PHY_MODE_11G == phyMode) ? WIFI_PHY_MODE_11N : WIFI_PHY_MODE_11G; - } - } - } else { - // No need to perform a next attempt. - WiFi_AP_Candidates.markAttempt(); - } - - if (WiFi.getPhyMode() == phyMode) { - return; - } - #ifndef BUILD_NO_DEBUG - if (loglevelActiveFor(LOG_LEVEL_INFO)) { - String log = concat(F("WIFI : Set to 802.11"), (WIFI_PHY_MODE_11G == phyMode) ? 'g' : 'n'); - if (forcedByAPmode) { - log += (F(" (AP+STA mode)")); - } - if (Settings.ForceWiFi_bg_mode()) { - log += F(" Force B/G mode"); - } - addLogMove(LOG_LEVEL_INFO, log); - } - #endif - WiFi.setPhyMode(phyMode); - #endif // ifdef ESP8266 - - // Does not (yet) work, so commented out. - #ifdef ESP32 - - // HT20 = 20 MHz channel width. - // HT40 = 40 MHz channel width. - // In theory, HT40 can offer upto 150 Mbps connection speed. - // However since HT40 is using nearly all channels on 2.4 GHz WiFi, - // Thus you are more likely to experience disturbances. - // The response speed and stability is better at HT20 for ESP units. - esp_wifi_set_bandwidth(WIFI_IF_STA, WIFI_BW_HT20); - - uint8_t protocol = WIFI_PROTOCOL_11B | WIFI_PROTOCOL_11G; // Default to BG - - if (!Settings.ForceWiFi_bg_mode() || (WiFiEventData.connectionFailures > 10)) { - // Set to use BGN - protocol |= WIFI_PROTOCOL_11N; - #ifdef ESP32C6 - protocol |= WIFI_PROTOCOL_11AX; - #endif - } - - const WiFi_AP_Candidate candidate = WiFi_AP_Candidates.getCurrent(); - if (candidate.phy_known()) { - // Check to see if the access point is set to "N-only" - if ((protocol & WIFI_PROTOCOL_11N) == 0) { - if (!candidate.bits.phy_11b && !candidate.bits.phy_11g && candidate.bits.phy_11n) { - if (candidate.bits.phy_11n) { - // Set to use BGN - protocol |= WIFI_PROTOCOL_11N; - addLog(LOG_LEVEL_INFO, F("WIFI : AP is set to 802.11n only")); - } -#ifdef ESP32C6 - if (candidate.bits.phy_11ax) { - // Set to use WiFi6 - protocol |= WIFI_PROTOCOL_11AX; - addLog(LOG_LEVEL_INFO, F("WIFI : AP is set to 802.11ax")); - } -#endif - } - } - } - - - if (WifiIsSTA(WiFi.getMode())) { - // Set to use "Long GI" making it more resilliant to reflections - // See: https://www.tp-link.com/us/configuration-guides/q_a_basic_wireless_concepts/?configurationId=2958#_idTextAnchor038 - esp_wifi_config_80211_tx_rate(WIFI_IF_STA, WIFI_PHY_RATE_MCS3_LGI); - esp_wifi_set_protocol(WIFI_IF_STA, protocol); - } - - if (WifiIsAP(WiFi.getMode())) { - esp_wifi_set_protocol(WIFI_IF_AP, protocol); - } - #endif // ifdef ESP32 + ESPEasy_WiFi_abstraction::setConnectionSpeed(Settings.ForceWiFi_bg_mode()); } void setupStaticIPconfig() { diff --git a/src/src/ESPEasyCore/ESPEasyWifi.h b/src/src/ESPEasyCore/ESPEasyWifi.h index 9b680a4fb..393c335d1 100644 --- a/src/src/ESPEasyCore/ESPEasyWifi.h +++ b/src/src/ESPEasyCore/ESPEasyWifi.h @@ -112,10 +112,6 @@ bool checkAndResetWiFi(); void resetWiFi(); void initWiFi(); -#ifdef ESP32 -void removeWiFiEventHandler(); -void registerWiFiEventHandler(); -#endif #if FEATURE_SET_WIFI_TX_PWR void SetWiFiTXpower(); diff --git a/src/src/ESPEasyCore/ESPEasyWifi_abstracted_ESP32.cpp b/src/src/ESPEasyCore/ESPEasyWifi_abstracted_ESP32.cpp new file mode 100644 index 000000000..a7d463427 --- /dev/null +++ b/src/src/ESPEasyCore/ESPEasyWifi_abstracted_ESP32.cpp @@ -0,0 +1,219 @@ +#include "../ESPEasyCore/ESPEasyWifi_abstrated.h" + +#ifdef ESP32 + +# include "../Globals/ESPEasyWiFiEvent.h" +# include "../Globals/WiFi_AP_Candidates.h" +# include "../ESPEasyCore/ESPEasyWiFiEvent_ESP32.h" + + +# include +# include // Needed to call ESP-IDF functions like esp_wifi_.... + +# include + + +namespace ESPEasy_WiFi_abstraction { +bool WiFiConnected() { + return WiFi.isConnected(); +} + +void WiFiDisconnect() { + removeWiFiEventHandler(); + WiFi.disconnect(); + delay(100); + { + const IPAddress ip; + const IPAddress gw; + const IPAddress subnet; + const IPAddress dns; + WiFi.config(ip, gw, subnet, dns); + } +} + +bool WifiIsAP(WiFiMode_t wifimode) +{ + return (wifimode == WIFI_MODE_AP) || (wifimode == WIFI_MODE_APSTA); +} + +bool WifiIsSTA(WiFiMode_t wifimode) +{ + return (wifimode & WIFI_MODE_STA) != 0; +} + +void removeWiFiEventHandler() +{ + WiFi.removeEvent(WiFiEventData.wm_event_id); + WiFiEventData.wm_event_id = 0; +} + +void registerWiFiEventHandler() +{ + if (WiFiEventData.wm_event_id != 0) { + removeWiFiEventHandler(); + } + WiFiEventData.wm_event_id = WiFi.onEvent(WiFiEvent); +} + +float GetRSSIthreshold(float& maxTXpwr) { + float threshold = WIFI_SENSITIVITY_n; + + switch (getConnectionProtocol()) { + case WiFiConnectionProtocol::WiFi_Protocol_11b: + threshold = WIFI_SENSITIVITY_11b; + + if (maxTXpwr > MAX_TX_PWR_DBM_11b) { maxTXpwr = MAX_TX_PWR_DBM_11b; } + break; + case WiFiConnectionProtocol::WiFi_Protocol_11g: + threshold = WIFI_SENSITIVITY_54g; + + if (maxTXpwr > MAX_TX_PWR_DBM_54g) { maxTXpwr = MAX_TX_PWR_DBM_54g; } + break; + case WiFiConnectionProtocol::WiFi_Protocol_HT20: + case WiFiConnectionProtocol::WiFi_Protocol_HT40: + case WiFiConnectionProtocol::WiFi_Protocol_HE20: + + threshold = WIFI_SENSITIVITY_n; + + if (maxTXpwr > MAX_TX_PWR_DBM_n) { maxTXpwr = MAX_TX_PWR_DBM_n; } + break; +# if ESP_IDF_VERSION > ESP_IDF_VERSION_VAL(5, 2, 0) + case WiFiConnectionProtocol::WiFi_Protocol_11a: + case WiFiConnectionProtocol::WiFi_Protocol_VHT20: + // FIXME TD-er: Must determine max. TX power for these 5 GHz modi +# endif // if ESP_IDF_VERSION > ESP_IDF_VERSION_VAL(5, 2, 0) + case WiFiConnectionProtocol::WiFi_Protocol_LR: + case WiFiConnectionProtocol::Unknown: + break; + } + return threshold; +} + +WiFiConnectionProtocol getConnectionProtocol() +{ + if (WiFi.RSSI() < 0) { + wifi_phy_mode_t phymode; + esp_wifi_sta_get_negotiated_phymode(&phymode); + + switch (phymode) { + case WIFI_PHY_MODE_11B: return WiFiConnectionProtocol::WiFi_Protocol_11b; + case WIFI_PHY_MODE_11G: return WiFiConnectionProtocol::WiFi_Protocol_11g; + case WIFI_PHY_MODE_HT20: return WiFiConnectionProtocol::WiFi_Protocol_HT20; + case WIFI_PHY_MODE_HT40: return WiFiConnectionProtocol::WiFi_Protocol_HT40; + case WIFI_PHY_MODE_HE20: return WiFiConnectionProtocol::WiFi_Protocol_HE20; + case WIFI_PHY_MODE_LR: return WiFiConnectionProtocol::WiFi_Protocol_LR; +# if ESP_IDF_VERSION >= ESP_IDF_VERSION_VAL(5, 3, 0) + + // 5 GHz + case WIFI_PHY_MODE_11A: return WiFiConnectionProtocol::WiFi_Protocol_11a; + case WIFI_PHY_MODE_VHT20: return WiFiConnectionProtocol::WiFi_Protocol_VHT20; +# endif // if ESP_IDF_VERSION >= ESP_IDF_VERSION_VAL(5, 3, 0) + } + } + return WiFiConnectionProtocol::Unknown; +} + +# if FEATURE_SET_WIFI_TX_PWR +void SetWiFiTXpower(float& dBm) +{ + int8_t power = dBm * 4; + + if (esp_wifi_set_max_tx_power(power) == ESP_OK) { + if (esp_wifi_get_max_tx_power(&power) == ESP_OK) { + dBm = static_cast(power) / 4.0f; + } + } +} + +# endif // if FEATURE_SET_WIFI_TX_PWR + +void setConnectionSpeed(bool ForceWiFi_bg_mode) { + // Does not (yet) work, so commented out. + + // HT20 = 20 MHz channel width. + // HT40 = 40 MHz channel width. + // In theory, HT40 can offer upto 150 Mbps connection speed. + // However since HT40 is using nearly all channels on 2.4 GHz WiFi, + // Thus you are more likely to experience disturbances. + // The response speed and stability is better at HT20 for ESP units. + esp_wifi_set_bandwidth(WIFI_IF_STA, WIFI_BW_HT20); + + uint8_t protocol = WIFI_PROTOCOL_11B | WIFI_PROTOCOL_11G; // Default to BG + + if (!ForceWiFi_bg_mode || (WiFiEventData.connectionFailures > 10)) { + // Set to use BGN + protocol |= WIFI_PROTOCOL_11N; + #ifdef ESP32C6 + protocol |= WIFI_PROTOCOL_11AX; + #endif + } + + const WiFi_AP_Candidate candidate = WiFi_AP_Candidates.getCurrent(); + if (candidate.phy_known()) { + // Check to see if the access point is set to "N-only" + if ((protocol & WIFI_PROTOCOL_11N) == 0) { + if (!candidate.bits.phy_11b && !candidate.bits.phy_11g && candidate.bits.phy_11n) { + if (candidate.bits.phy_11n) { + // Set to use BGN + protocol |= WIFI_PROTOCOL_11N; + addLog(LOG_LEVEL_INFO, F("WIFI : AP is set to 802.11n only")); + } +#ifdef ESP32C6 + if (candidate.bits.phy_11ax) { + // Set to use WiFi6 + protocol |= WIFI_PROTOCOL_11AX; + addLog(LOG_LEVEL_INFO, F("WIFI : AP is set to 802.11ax")); + } +#endif + } + } + } + + + if (ESPEasy_WiFi_abstraction::WifiIsSTA(WiFi.getMode())) { + // Set to use "Long GI" making it more resilliant to reflections + // See: https://www.tp-link.com/us/configuration-guides/q_a_basic_wireless_concepts/?configurationId=2958#_idTextAnchor038 + esp_wifi_config_80211_tx_rate(WIFI_IF_STA, WIFI_PHY_RATE_MCS3_LGI); + esp_wifi_set_protocol(WIFI_IF_STA, protocol); + } + + if (ESPEasy_WiFi_abstraction::WifiIsAP(WiFi.getMode())) { + esp_wifi_set_protocol(WIFI_IF_AP, protocol); + } +} + +void setWiFiNoneSleep() +{ + WiFi.setSleep(WIFI_PS_NONE); +} + +void setWiFiEcoPowerMode() +{ + // Allow light sleep during idle times +# ifdef ESP8266 + WiFi.setSleepMode(WIFI_LIGHT_SLEEP); +# endif // ifdef ESP8266 +# ifdef ESP32 + + // Maximum modem power saving. + // In this mode, interval to receive beacons is determined by the listen_interval parameter in wifi_sta_config_t + // FIXME TD-er: Must test if this is desired behavior in ESP32. + WiFi.setSleep(WIFI_PS_MAX_MODEM); +# endif // ifdef ESP32 +} + +void setWiFiDefaultPowerMode() +{ + // Minimum modem power saving. + // In this mode, station wakes up to receive beacon every DTIM period + WiFi.setSleep(WIFI_PS_MIN_MODEM); +} + + + + + +} // namespace ESPEasy_WiFi_abstraction + + +#endif // ifdef ESP32 diff --git a/src/src/ESPEasyCore/ESPEasyWifi_abstracted_ESP8266.cpp b/src/src/ESPEasyCore/ESPEasyWifi_abstracted_ESP8266.cpp new file mode 100644 index 000000000..26b19eebd --- /dev/null +++ b/src/src/ESPEasyCore/ESPEasyWifi_abstracted_ESP8266.cpp @@ -0,0 +1,196 @@ +#include "../ESPEasyCore/ESPEasyWifi_abstrated.h" + +#ifdef ESP8266 + +# include "../Globals/ESPEasyWiFiEvent.h" +# include "../Globals/WiFi_AP_Candidates.h" + +# include "../ESPEasyCore/ESPEasyWiFiEvent_ESP8266.h" + +namespace ESPEasy_WiFi_abstraction { +bool WiFiConnected() +{ + bool wifi_isconnected = WiFi.isConnected(); + + // Perform check on SDK function, see: https://github.com/esp8266/Arduino/issues/7432 + station_status_t status = wifi_station_get_connect_status(); + + switch (status) { + case STATION_GOT_IP: + wifi_isconnected = true; + break; + case STATION_NO_AP_FOUND: + case STATION_CONNECT_FAIL: + case STATION_WRONG_PASSWORD: + wifi_isconnected = false; + break; + case STATION_IDLE: + case STATION_CONNECTING: + break; + + default: + wifi_isconnected = false; + break; + } + return wifi_isconnected; +} + +void WiFiDisconnect() { + // Only call disconnect when STA is active + if (ESPEasy_WiFi_abstraction::WifiIsSTA(WiFi.getMode())) { + wifi_station_disconnect(); + } + station_config conf{}; + memset(&conf, 0, sizeof(conf)); + ETS_UART_INTR_DISABLE(); + wifi_station_set_config_current(&conf); + ETS_UART_INTR_ENABLE(); +} + +bool WifiIsAP(WiFiMode_t wifimode) +{ + return (wifimode == WIFI_AP) || (wifimode == WIFI_AP_STA); +} + +bool WifiIsSTA(WiFiMode_t wifimode) +{ + return (wifimode & WIFI_STA) != 0; +} + +void removeWiFiEventHandler() { + // Not needed for ESP8266 +} + +void registerWiFiEventHandler() +{ + // WiFi event handlers + static bool handlers_initialized = false; + + if (!handlers_initialized) { + stationConnectedHandler = WiFi.onStationModeConnected(onConnected); + stationDisconnectedHandler = WiFi.onStationModeDisconnected(onDisconnect); + stationGotIpHandler = WiFi.onStationModeGotIP(onGotIP); + stationModeDHCPTimeoutHandler = WiFi.onStationModeDHCPTimeout(onDHCPTimeout); + stationModeAuthModeChangeHandler = WiFi.onStationModeAuthModeChanged(onStationModeAuthModeChanged); + APModeStationConnectedHandler = WiFi.onSoftAPModeStationConnected(onConnectedAPmode); + APModeStationDisconnectedHandler = WiFi.onSoftAPModeStationDisconnected(onDisconnectedAPmode); + handlers_initialized = true; + } +} + +float GetRSSIthreshold(float& maxTXpwr) { + float threshold = WIFI_SENSITIVITY_n; + + switch (getConnectionProtocol()) { + case WiFiConnectionProtocol::WiFi_Protocol_11b: + threshold = WIFI_SENSITIVITY_11b; + + if (maxTXpwr > MAX_TX_PWR_DBM_11b) { maxTXpwr = MAX_TX_PWR_DBM_11b; } + break; + case WiFiConnectionProtocol::WiFi_Protocol_11g: + threshold = WIFI_SENSITIVITY_54g; + + if (maxTXpwr > MAX_TX_PWR_DBM_54g) { maxTXpwr = MAX_TX_PWR_DBM_54g; } + break; + case WiFiConnectionProtocol::WiFi_Protocol_11n: + threshold = WIFI_SENSITIVITY_n; + + if (maxTXpwr > MAX_TX_PWR_DBM_n) { maxTXpwr = MAX_TX_PWR_DBM_n; } + break; + case WiFiConnectionProtocol::Unknown: + break; + } + return threshold; +} + +WiFiConnectionProtocol getConnectionProtocol() +{ + if (WiFi.RSSI() < 0) { + switch (wifi_get_phy_mode()) { + case PHY_MODE_11B: + return WiFiConnectionProtocol::WiFi_Protocol_11b; + case PHY_MODE_11G: + return WiFiConnectionProtocol::WiFi_Protocol_11g; + case PHY_MODE_11N: + return WiFiConnectionProtocol::WiFi_Protocol_11n; + } + } + return WiFiConnectionProtocol::Unknown; +} + +# if FEATURE_SET_WIFI_TX_PWR +void SetWiFiTXpower(float& dBm) +{ + WiFi.setOutputPower(dBm); +} + +# endif // if FEATURE_SET_WIFI_TX_PWR + +void setConnectionSpeed(bool ForceWiFi_bg_mode) { + // ESP8266 only supports 802.11g mode when running in STA+AP + const bool forcedByAPmode = ESPEasy_WiFi_abstraction::WifiIsAP(WiFi.getMode()); + WiFiPhyMode_t phyMode = (ForceWiFi_bg_mode || forcedByAPmode) ? WIFI_PHY_MODE_11G : WIFI_PHY_MODE_11N; + if (!forcedByAPmode) { + const WiFi_AP_Candidate candidate = WiFi_AP_Candidates.getCurrent(); + if (candidate.phy_known() && (candidate.bits.phy_11g != candidate.bits.phy_11n)) { + if ((WIFI_PHY_MODE_11G == phyMode) && !candidate.bits.phy_11g) { + phyMode = WIFI_PHY_MODE_11N; + addLog(LOG_LEVEL_INFO, F("WIFI : AP is set to 802.11n only")); + } else if ((WIFI_PHY_MODE_11N == phyMode) && !candidate.bits.phy_11n) { + phyMode = WIFI_PHY_MODE_11G; + addLog(LOG_LEVEL_INFO, F("WIFI : AP is set to 802.11g only")); + } + } else { + bool useAlternate = WiFiEventData.connectionFailures > 10; + if (useAlternate) { + phyMode = (WIFI_PHY_MODE_11G == phyMode) ? WIFI_PHY_MODE_11N : WIFI_PHY_MODE_11G; + } + } + } else { + // No need to perform a next attempt. + WiFi_AP_Candidates.markAttempt(); + } + + if (WiFi.getPhyMode() == phyMode) { + return; + } + #ifndef BUILD_NO_DEBUG + if (loglevelActiveFor(LOG_LEVEL_INFO)) { + String log = concat(F("WIFI : Set to 802.11"), (WIFI_PHY_MODE_11G == phyMode) ? 'g' : 'n'); + if (forcedByAPmode) { + log += (F(" (AP+STA mode)")); + } + if (Settings.ForceWiFi_bg_mode()) { + log += F(" Force B/G mode"); + } + addLogMove(LOG_LEVEL_INFO, log); + } + #endif + WiFi.setPhyMode(phyMode); +} + +void setWiFiNoneSleep() +{ + WiFi.setSleepMode(WIFI_NONE_SLEEP); +} + +void setWiFiEcoPowerMode() +{ + // Allow light sleep during idle times + WiFi.setSleepMode(WIFI_LIGHT_SLEEP); +} + +void setWiFiDefaultPowerMode() +{ + WiFi.setSleepMode(WIFI_MODEM_SLEEP); +} + + + + + + +} // namespace ESPEasy_WiFi_abstraction + + +#endif // ifdef ESP8266 diff --git a/src/src/ESPEasyCore/ESPEasyWifi_abstrated.h b/src/src/ESPEasyCore/ESPEasyWifi_abstrated.h new file mode 100644 index 000000000..da803cea5 --- /dev/null +++ b/src/src/ESPEasyCore/ESPEasyWifi_abstrated.h @@ -0,0 +1,48 @@ +#ifndef ESPEASYCORE_ESPEASYWIFI_ABSTRACTED_H +#define ESPEASYCORE_ESPEASYWIFI_ABSTRACTED_H + +#include "../../ESPEasy_common.h" + + +#include "../DataTypes/WiFiConnectionProtocol.h" + + +#if defined(ESP8266) +#include "../ESPEasyCore/ESPEasyWiFiEvent_ESP8266.h" +# include +#endif // if defined(ESP8266) +#if defined(ESP32) +#include "../ESPEasyCore/ESPEasyWiFiEvent_ESP32.h" +# include +#endif // if defined(ESP32) + +namespace ESPEasy_WiFi_abstraction { +bool WiFiConnected(); + +void WiFiDisconnect(); + +bool WifiIsAP(WiFiMode_t wifimode); +bool WifiIsSTA(WiFiMode_t wifimode); + + +void removeWiFiEventHandler(); +void registerWiFiEventHandler(); + + +WiFiConnectionProtocol getConnectionProtocol(); +float GetRSSIthreshold(float& maxTXpwr); +#if FEATURE_SET_WIFI_TX_PWR +void SetWiFiTXpower(float& dBm); +#endif // if FEATURE_SET_WIFI_TX_PWR + +void setConnectionSpeed(bool ForceWiFi_bg_mode); + +void setWiFiNoneSleep(); +void setWiFiEcoPowerMode(); +void setWiFiDefaultPowerMode(); + + +} + + +#endif // ifndef ESPEASYCORE_ESPEASYWIFI_ABSTRACTED_H From 44f4bb271359cb2e646026982ec7e0c72b919ec6 Mon Sep 17 00:00:00 2001 From: TD-er Date: Sat, 26 Oct 2024 18:31:07 +0200 Subject: [PATCH 002/564] [Cleanup] Get rid of ESP32-IDF code for IDF3.x or older --- src/src/CustomBuild/ESPEasyLimits.h | 4 - src/src/DataTypes/EthernetParameters.cpp | 6 - src/src/DataTypes/EthernetParameters.h | 3 - src/src/ESPEasyCore/ESPEasyEth.cpp | 10 +- src/src/ESPEasyCore/ESPEasyEthEvent.cpp | 8 - src/src/ESPEasyCore/ESPEasyEthEvent.h | 2 - .../ESPEasyCore/ESPEasyWiFiEvent_ESP32.cpp | 190 ------------------ src/src/ESPEasyCore/ESPEasyWiFiEvent_ESP32.h | 10 +- src/src/Helpers/ESPEasy_checks.cpp | 4 +- src/src/Helpers/StringGenerator_System.cpp | 6 +- src/src/WebServer/HardwarePage.cpp | 4 - 11 files changed, 8 insertions(+), 239 deletions(-) diff --git a/src/src/CustomBuild/ESPEasyLimits.h b/src/src/CustomBuild/ESPEasyLimits.h index 73b5ecdeb..5b98587ea 100644 --- a/src/src/CustomBuild/ESPEasyLimits.h +++ b/src/src/CustomBuild/ESPEasyLimits.h @@ -34,12 +34,8 @@ #endif #ifndef MAX_GPIO - #if ESP_IDF_VERSION_MAJOR > 3 // IDF 4+ #include #define MAX_GPIO (GPIO_NUM_MAX - 1) - #else // ESP32 Before IDF 4.0 - #define MAX_GPIO 39 - #endif #endif #endif diff --git a/src/src/DataTypes/EthernetParameters.cpp b/src/src/DataTypes/EthernetParameters.cpp index ceab27833..f6aa07a83 100644 --- a/src/src/DataTypes/EthernetParameters.cpp +++ b/src/src/DataTypes/EthernetParameters.cpp @@ -40,7 +40,6 @@ bool isValid(EthPhyType_t phyType) { #if CONFIG_ETH_USE_ESP32_EMAC case EthPhyType_t::LAN8720: case EthPhyType_t::TLK110: -# if ESP_IDF_VERSION_MAJOR > 3 case EthPhyType_t::RTL8201: #if ETH_TYPE_JL1101_SUPPORTED case EthPhyType_t::JL1101: @@ -48,7 +47,6 @@ bool isValid(EthPhyType_t phyType) { case EthPhyType_t::DP83848: case EthPhyType_t::KSZ8041: case EthPhyType_t::KSZ8081: -# endif // if ESP_IDF_VERSION_MAJOR > 3 return true; #endif // if CONFIG_ETH_USE_ESP32_EMAC @@ -94,7 +92,6 @@ eth_phy_type_t to_ESP_phy_type(EthPhyType_t phyType) # if CONFIG_ETH_USE_ESP32_EMAC case EthPhyType_t::LAN8720: return ETH_PHY_LAN8720; case EthPhyType_t::TLK110: return ETH_PHY_TLK110; -# if ESP_IDF_VERSION_MAJOR > 3 case EthPhyType_t::RTL8201: return ETH_PHY_RTL8201; # if ETH_TYPE_JL1101_SUPPORTED case EthPhyType_t::JL1101: return ETH_PHY_JL1101; @@ -102,7 +99,6 @@ eth_phy_type_t to_ESP_phy_type(EthPhyType_t phyType) case EthPhyType_t::DP83848: return ETH_PHY_DP83848; case EthPhyType_t::KSZ8041: return ETH_PHY_KSZ8041; case EthPhyType_t::KSZ8081: return ETH_PHY_KSZ8081; -# endif // if ESP_IDF_VERSION_MAJOR > 3 # endif // if CONFIG_ETH_USE_ESP32_EMAC # if ESP_IDF_VERSION_MAJOR >= 5 @@ -130,7 +126,6 @@ const __FlashStringHelper* toString(EthPhyType_t phyType) { #if CONFIG_ETH_USE_ESP32_EMAC case EthPhyType_t::LAN8720: return F("LAN8710/LAN8720"); case EthPhyType_t::TLK110: return F("TLK110"); -# if ESP_IDF_VERSION_MAJOR > 3 case EthPhyType_t::RTL8201: return F("RTL8201"); #if ETH_TYPE_JL1101_SUPPORTED case EthPhyType_t::JL1101: return F("JL1101"); @@ -138,7 +133,6 @@ const __FlashStringHelper* toString(EthPhyType_t phyType) { case EthPhyType_t::DP83848: return F("DP83848"); case EthPhyType_t::KSZ8041: return F("KSZ8041"); case EthPhyType_t::KSZ8081: return F("KSZ8081"); -# endif // if ESP_IDF_VERSION_MAJOR > 3 #endif // if CONFIG_ETH_USE_ESP32_EMAC #if ESP_IDF_VERSION_MAJOR >= 5 diff --git a/src/src/DataTypes/EthernetParameters.h b/src/src/DataTypes/EthernetParameters.h index a017e6c62..3991e692f 100644 --- a/src/src/DataTypes/EthernetParameters.h +++ b/src/src/DataTypes/EthernetParameters.h @@ -24,8 +24,6 @@ enum class EthPhyType_t : uint8_t { #if CONFIG_ETH_USE_ESP32_EMAC LAN8720 = 0, TLK110 = 1, -#if ESP_IDF_VERSION_MAJOR > 3 - RTL8201 = 2, #if ETH_TYPE_JL1101_SUPPORTED JL1101 = 3, @@ -34,7 +32,6 @@ enum class EthPhyType_t : uint8_t { KSZ8041 = 5, KSZ8081 = 6, #endif -#endif #if ESP_IDF_VERSION_MAJOR >= 5 #if CONFIG_ETH_SPI_ETHERNET_DM9051 DM9051 = 10, diff --git a/src/src/ESPEasyCore/ESPEasyEth.cpp b/src/src/ESPEasyCore/ESPEasyEth.cpp index c0b8a8ac9..36cae36e8 100644 --- a/src/src/ESPEasyCore/ESPEasyEth.cpp +++ b/src/src/ESPEasyCore/ESPEasyEth.cpp @@ -17,11 +17,7 @@ #include #include -#if ESP_IDF_VERSION_MAJOR > 3 - #include -#else - #include -#endif +#include #include @@ -114,11 +110,7 @@ MAC_address ETHMacAddress() { if(!EthEventData.ethInitSuccess) { addLog(LOG_LEVEL_ERROR, F("Call NetworkMacAddress() only on connected Ethernet!")); } else { - #if ESP_IDF_VERSION_MAJOR > 3 ETH.macAddress(mac.mac); - #else - esp_eth_get_mac(mac.mac); - #endif } return mac; } diff --git a/src/src/ESPEasyCore/ESPEasyEthEvent.cpp b/src/src/ESPEasyCore/ESPEasyEthEvent.cpp index 8f69a1417..6d6ba4e16 100644 --- a/src/src/ESPEasyCore/ESPEasyEthEvent.cpp +++ b/src/src/ESPEasyCore/ESPEasyEthEvent.cpp @@ -15,8 +15,6 @@ # include - -# if ESP_IDF_VERSION_MAJOR > 3 void EthEvent(WiFiEvent_t event, arduino_event_info_t info) { switch (event) { case ARDUINO_EVENT_ETH_START: @@ -42,11 +40,7 @@ void EthEvent(WiFiEvent_t event, arduino_event_info_t info) { case ARDUINO_EVENT_ETH_STOP: // addLog(LOG_LEVEL_INFO, F("ETH event: Stopped")); break; - # if ESP_IDF_VERSION_MAJOR > 3 case ARDUINO_EVENT_ETH_GOT_IP6: - # else // if ESP_IDF_VERSION_MAJOR > 3 - case ARDUINO_EVENT_GOT_IP6: - # endif // if ESP_IDF_VERSION_MAJOR > 3 #if FEATURE_USE_IPV6 { ip_event_got_ip6_t * event = static_cast(&info.got_ip6); @@ -65,8 +59,6 @@ void EthEvent(WiFiEvent_t event, arduino_event_info_t info) { } } -# endif // if ESP_IDF_VERSION_MAJOR > 3 - # endif // if FEATURE_ETHERNET #endif // ifdef ESP32 diff --git a/src/src/ESPEasyCore/ESPEasyEthEvent.h b/src/src/ESPEasyCore/ESPEasyEthEvent.h index 620f672b1..6130eddfa 100644 --- a/src/src/ESPEasyCore/ESPEasyEthEvent.h +++ b/src/src/ESPEasyCore/ESPEasyEthEvent.h @@ -10,13 +10,11 @@ // ******************************************************************************** #ifdef ESP32 #if FEATURE_ETHERNET -#if ESP_IDF_VERSION_MAJOR > 3 #include #include void EthEvent(WiFiEvent_t event, arduino_event_info_t info); #endif #endif -#endif #endif // ESPEASY_ETH_EVENT_H \ No newline at end of file diff --git a/src/src/ESPEasyCore/ESPEasyWiFiEvent_ESP32.cpp b/src/src/ESPEasyCore/ESPEasyWiFiEvent_ESP32.cpp index 9d414fa6d..edc9dc376 100644 --- a/src/src/ESPEasyCore/ESPEasyWiFiEvent_ESP32.cpp +++ b/src/src/ESPEasyCore/ESPEasyWiFiEvent_ESP32.cpp @@ -39,7 +39,6 @@ void setUseStaticIP(bool enabled) { static bool ignoreDisconnectEvent = false; -# if ESP_IDF_VERSION_MAJOR > 3 void WiFiEvent(WiFiEvent_t event, arduino_event_info_t info) { switch (event) { case ARDUINO_EVENT_WIFI_READY: @@ -104,55 +103,31 @@ void WiFiEvent(WiFiEvent_t event, arduino_event_info_t info) { break; case ARDUINO_EVENT_WIFI_STA_AUTHMODE_CHANGE: - # if ESP_IDF_VERSION_MAJOR > 3 WiFiEventData.setAuthMode(info.wifi_sta_authmode_change.new_mode); - # else // if ESP_IDF_VERSION_MAJOR > 3 - WiFiEventData.setAuthMode(info.auth_change.new_mode); - # endif // if ESP_IDF_VERSION_MAJOR > 3 break; case ARDUINO_EVENT_WIFI_STA_CONNECTED: { char ssid_copy[33]; // Ensure space for maximum len SSID (32) plus trailing 0 - # if ESP_IDF_VERSION_MAJOR > 3 memcpy(ssid_copy, info.wifi_sta_connected.ssid, info.wifi_sta_connected.ssid_len); ssid_copy[32] = 0; // Potentially add 0-termination if none present earlier WiFiEventData.markConnected((const char *)ssid_copy, info.wifi_sta_connected.bssid, info.wifi_sta_connected.channel); WiFiEventData.setAuthMode(info.wifi_sta_connected.authmode); // addLog(LOG_LEVEL_INFO, F("WiFi : Event WIFI_STA_CONNECTED")); - # else // if ESP_IDF_VERSION_MAJOR > 3 - memcpy(ssid_copy, info.connected.ssid, info.connected.ssid_len); - ssid_copy[32] = 0; // Potentially add 0-termination if none present earlier - WiFiEventData.markConnected((const char *)ssid_copy, info.connected.bssid, info.connected.channel); - # endif // if ESP_IDF_VERSION_MAJOR > 3 break; } case ARDUINO_EVENT_WIFI_STA_DISCONNECTED: if (!ignoreDisconnectEvent) { ignoreDisconnectEvent = true; - # if ESP_IDF_VERSION_MAJOR > 3 WiFiEventData.markDisconnect(static_cast(info.wifi_sta_disconnected.reason)); if (info.wifi_sta_disconnected.reason == WIFI_REASON_AUTH_EXPIRE) { // See: https://github.com/espressif/arduino-esp32/issues/8877#issuecomment-1807677897 - # if ESP_IDF_VERSION_MAJOR >= 5 - // FIXME TD-er: Should no longer be needed. WiFi.STA._setStatus(WL_CONNECTION_LOST); - # else // if ESP_IDF_VERSION_MAJOR >= 5 - WiFiSTAClass::_setStatus(WL_CONNECTION_LOST); - # endif // if ESP_IDF_VERSION_MAJOR >= 5 } - # else // if ESP_IDF_VERSION_MAJOR > 3 - WiFiEventData.markDisconnect(static_cast(info.disconnected.reason)); - - if (info.disconnected.reason == WIFI_REASON_AUTH_EXPIRE) { - // See: https://github.com/espressif/arduino-esp32/issues/8877#issuecomment-1807677897 - WiFiSTAClass::_setStatus(WL_CONNECTION_LOST); - } - # endif // if ESP_IDF_VERSION_MAJOR > 3 WiFi.persistent(false); WiFi.disconnect(true); } @@ -174,18 +149,10 @@ void WiFiEvent(WiFiEvent_t event, arduino_event_info_t info) { break; # endif // if FEATURE_USE_IPV6 case ARDUINO_EVENT_WIFI_AP_STACONNECTED: - # if ESP_IDF_VERSION_MAJOR > 3 WiFiEventData.markConnectedAPmode(info.wifi_ap_staconnected.mac); - # else // if ESP_IDF_VERSION_MAJOR > 3 - WiFiEventData.markConnectedAPmode(info.sta_connected.mac); - # endif // if ESP_IDF_VERSION_MAJOR > 3 break; case ARDUINO_EVENT_WIFI_AP_STADISCONNECTED: - # if ESP_IDF_VERSION_MAJOR > 3 WiFiEventData.markDisconnectedAPmode(info.wifi_ap_stadisconnected.mac); - # else // if ESP_IDF_VERSION_MAJOR > 3 - WiFiEventData.markDisconnectedAPmode(info.sta_disconnected.mac); - # endif // if ESP_IDF_VERSION_MAJOR > 3 break; case ARDUINO_EVENT_WIFI_SCAN_DONE: WiFiEventData.processedScanDone = false; @@ -196,11 +163,7 @@ void WiFiEvent(WiFiEvent_t event, arduino_event_info_t info) { case ARDUINO_EVENT_ETH_GOT_IP: case ARDUINO_EVENT_ETH_DISCONNECTED: case ARDUINO_EVENT_ETH_STOP: - # if ESP_IDF_VERSION_MAJOR > 3 case ARDUINO_EVENT_ETH_GOT_IP6: - # else // if ESP_IDF_VERSION_MAJOR > 3 - case ARDUINO_EVENT_GOT_IP6: - # endif // if ESP_IDF_VERSION_MAJOR > 3 // Handled in EthEvent break; @@ -213,157 +176,4 @@ void WiFiEvent(WiFiEvent_t event, arduino_event_info_t info) { } } -# else // if ESP_IDF_VERSION_MAJOR > 3 -void WiFiEvent(system_event_id_t event, system_event_info_t info) { - switch (event) { - case SYSTEM_EVENT_WIFI_READY: - // ESP32 WiFi ready - break; - case SYSTEM_EVENT_STA_START: - # ifndef BUILD_NO_DEBUG - - // addLog(LOG_LEVEL_INFO, F("WiFi : Event STA Started")); - # endif // ifndef BUILD_NO_DEBUG - break; - case SYSTEM_EVENT_STA_STOP: - # ifndef BUILD_NO_DEBUG - - // addLog(LOG_LEVEL_INFO, F("WiFi : Event STA Stopped")); - # endif // ifndef BUILD_NO_DEBUG - break; - case SYSTEM_EVENT_AP_START: - # ifndef BUILD_NO_DEBUG - - // addLog(LOG_LEVEL_INFO, F("WiFi : Event AP Started")); - # endif // ifndef BUILD_NO_DEBUG - break; - case SYSTEM_EVENT_AP_STOP: - # ifndef BUILD_NO_DEBUG - - // addLog(LOG_LEVEL_INFO, F("WiFi : Event AP Stopped")); - # endif // ifndef BUILD_NO_DEBUG - break; - case SYSTEM_EVENT_STA_LOST_IP: - // ESP32 station lost IP and the IP is reset to 0 - # if FEATURE_ETHERNET - - if (active_network_medium == NetworkMedium_t::Ethernet) { - EthEventData.markLostIP(); - } - else - # endif // if FEATURE_ETHERNET - WiFiEventData.markLostIP(); - # ifndef BUILD_NO_DEBUG - - /* - addLog(LOG_LEVEL_INFO, - active_network_medium == NetworkMedium_t::Ethernet ? - F("ETH : Event Lost IP") : F("WiFi : Event Lost IP")); - */ - # endif // ifndef BUILD_NO_DEBUG - break; - - case SYSTEM_EVENT_AP_PROBEREQRECVED: - // Receive probe request packet in soft-AP interface - // TODO TD-er: Must implement like onProbeRequestAPmode for ESP8266 - # ifndef BUILD_NO_DEBUG - - // addLog(LOG_LEVEL_INFO, F("WiFi : Event AP got probed")); - # endif // ifndef BUILD_NO_DEBUG - break; - - case SYSTEM_EVENT_STA_AUTHMODE_CHANGE: - # if ESP_IDF_VERSION_MAJOR > 3 - WiFiEventData.setAuthMode(info.wifi_sta_authmode_change.new_mode); - # else // if ESP_IDF_VERSION_MAJOR > 3 - WiFiEventData.setAuthMode(info.auth_change.new_mode); - # endif // if ESP_IDF_VERSION_MAJOR > 3 - break; - - case SYSTEM_EVENT_STA_CONNECTED: - { - char ssid_copy[33] = { 0 }; // Ensure space for maximum len SSID (32) plus trailing 0 - # if ESP_IDF_VERSION_MAJOR > 3 - memcpy(ssid_copy, info.wifi_sta_connected.ssid, info.wifi_sta_connected.ssid_len); - ssid_copy[32] = 0; // Potentially add 0-termination if none present earlier - WiFiEventData.markConnected((const char *)ssid_copy, info.wifi_sta_connected.bssid, info.wifi_sta_connected.channel); - # else // if ESP_IDF_VERSION_MAJOR > 3 - memcpy(ssid_copy, info.connected.ssid, info.connected.ssid_len); - ssid_copy[32] = 0; // Potentially add 0-termination if none present earlier - WiFiEventData.markConnected((const char *)ssid_copy, info.connected.bssid, info.connected.channel); - # endif // if ESP_IDF_VERSION_MAJOR > 3 - break; - } - case SYSTEM_EVENT_STA_DISCONNECTED: - - if (!ignoreDisconnectEvent) { - ignoreDisconnectEvent = true; - # if ESP_IDF_VERSION_MAJOR > 3 - WiFiEventData.markDisconnect(static_cast(info.wifi_sta_disconnected.reason)); - # else // if ESP_IDF_VERSION_MAJOR > 3 - WiFiEventData.markDisconnect(static_cast(info.disconnected.reason)); - # endif // if ESP_IDF_VERSION_MAJOR > 3 - WiFi.persistent(false); - WiFi.disconnect(true); - } - break; - case SYSTEM_EVENT_STA_GOT_IP: - ignoreDisconnectEvent = false; - WiFiEventData.markGotIP(); - break; - case SYSTEM_EVENT_AP_STACONNECTED: - # if ESP_IDF_VERSION_MAJOR > 3 - WiFiEventData.markConnectedAPmode(info.wifi_ap_staconnected.mac); - # else // if ESP_IDF_VERSION_MAJOR > 3 - WiFiEventData.markConnectedAPmode(info.sta_connected.mac); - # endif // if ESP_IDF_VERSION_MAJOR > 3 - break; - case SYSTEM_EVENT_AP_STADISCONNECTED: - # if ESP_IDF_VERSION_MAJOR > 3 - WiFiEventData.markDisconnectedAPmode(info.wifi_ap_stadisconnected.mac); - # else // if ESP_IDF_VERSION_MAJOR > 3 - WiFiEventData.markDisconnectedAPmode(info.sta_disconnected.mac); - # endif // if ESP_IDF_VERSION_MAJOR > 3 - break; - case SYSTEM_EVENT_SCAN_DONE: - WiFiEventData.processedScanDone = false; - break; -# if FEATURE_ETHERNET - case SYSTEM_EVENT_ETH_START: - - if (ethPrepare()) { - // addLog(LOG_LEVEL_INFO, F("ETH event: Started")); - } else { - // addLog(LOG_LEVEL_ERROR, F("ETH event: Could not prepare ETH!")); - } - break; - case SYSTEM_EVENT_ETH_CONNECTED: - // addLog(LOG_LEVEL_INFO, F("ETH event: Connected")); - EthEventData.markConnected(); - break; - case SYSTEM_EVENT_ETH_GOT_IP: - EthEventData.markGotIP(); - - // addLog(LOG_LEVEL_INFO, F("ETH event: Got IP")); - break; - case SYSTEM_EVENT_ETH_DISCONNECTED: - // addLog(LOG_LEVEL_ERROR, F("ETH event: Disconnected")); - EthEventData.markDisconnect(); - break; - case SYSTEM_EVENT_ETH_STOP: - // addLog(LOG_LEVEL_INFO, F("ETH event: Stopped")); - break; - case SYSTEM_EVENT_GOT_IP6: - // addLog(LOG_LEVEL_INFO, F("ETH event: Got IP6")); - break; -# endif // FEATURE_ETHERNET - default: - { - // addLogMove(LOG_LEVEL_ERROR, concat(F("UNKNOWN WIFI/ETH EVENT: "), event)); - break; - } - } -} - -# endif // if ESP_IDF_VERSION_MAJOR > 3 #endif // ifdef ESP32 diff --git a/src/src/ESPEasyCore/ESPEasyWiFiEvent_ESP32.h b/src/src/ESPEasyCore/ESPEasyWiFiEvent_ESP32.h index 9f7d6b904..90b15c39f 100644 --- a/src/src/ESPEasyCore/ESPEasyWiFiEvent_ESP32.h +++ b/src/src/ESPEasyCore/ESPEasyWiFiEvent_ESP32.h @@ -15,6 +15,9 @@ #include #include #include +#include + + class WiFi_Access_Static_IP : public WiFiSTAClass { public: @@ -28,12 +31,7 @@ void setUseStaticIP(bool enabled); // Functions called on events. // Make sure not to call anything in these functions that result in delay() or yield() // ******************************************************************************** - #if ESP_IDF_VERSION_MAJOR > 3 - #include - void WiFiEvent(WiFiEvent_t event, arduino_event_info_t info); - #else - void WiFiEvent(system_event_id_t event, system_event_info_t info); - #endif +void WiFiEvent(WiFiEvent_t event, arduino_event_info_t info); #endif diff --git a/src/src/Helpers/ESPEasy_checks.cpp b/src/src/Helpers/ESPEasy_checks.cpp index 81340c09e..8a86e2544 100644 --- a/src/src/Helpers/ESPEasy_checks.cpp +++ b/src/src/Helpers/ESPEasy_checks.cpp @@ -91,7 +91,7 @@ void run_compiletime_checks() { check_size(); #endif // if FEATURE_NOTIFIER check_size(); - #if ESP_IDF_VERSION_MAJOR > 3 + #ifdef ESP32 // ESP_IDF_VERSION_MAJOR > 3 // String class has increased with 4 bytes check_size(); // Is not stored #else @@ -101,7 +101,7 @@ void run_compiletime_checks() { // LogStruct is mainly dependent on the number of lines. // Has to be round up to multiple of 4. - #if ESP_IDF_VERSION_MAJOR > 3 + #ifdef ESP32 // ESP_IDF_VERSION_MAJOR > 3 // String class has increased with 4 bytes const unsigned int LogStructSize = ((13u + 24 * LOG_STRUCT_MESSAGE_LINES) + 3) & ~3; #else diff --git a/src/src/Helpers/StringGenerator_System.cpp b/src/src/Helpers/StringGenerator_System.cpp index df5d9a368..ff7ffd40c 100644 --- a/src/src/Helpers/StringGenerator_System.cpp +++ b/src/src/Helpers/StringGenerator_System.cpp @@ -22,11 +22,7 @@ #elif defined(ESP32C6) #include # elif defined(ESP32_CLASSIC) - #if ESP_IDF_VERSION_MAJOR > 3 - #include - #else - #include - #endif + #include # else static_assert(false, "Implement processor architecture"); diff --git a/src/src/WebServer/HardwarePage.cpp b/src/src/WebServer/HardwarePage.cpp index 7542abce7..f79ea8f4c 100644 --- a/src/src/WebServer/HardwarePage.cpp +++ b/src/src/WebServer/HardwarePage.cpp @@ -251,7 +251,6 @@ void handle_hardware() { # if CONFIG_ETH_USE_ESP32_EMAC toString(EthPhyType_t::LAN8720), toString(EthPhyType_t::TLK110), -#if ESP_IDF_VERSION_MAJOR > 3 toString(EthPhyType_t::RTL8201), #if ETH_TYPE_JL1101_SUPPORTED toString(EthPhyType_t::JL1101), @@ -259,7 +258,6 @@ void handle_hardware() { toString(EthPhyType_t::DP83848), toString(EthPhyType_t::KSZ8041), toString(EthPhyType_t::KSZ8081), -#endif # endif // if CONFIG_ETH_USE_ESP32_EMAC #if ESP_IDF_VERSION_MAJOR >= 5 @@ -280,7 +278,6 @@ void handle_hardware() { # if CONFIG_ETH_USE_ESP32_EMAC static_cast(EthPhyType_t::LAN8720), static_cast(EthPhyType_t::TLK110), -#if ESP_IDF_VERSION_MAJOR > 3 static_cast(EthPhyType_t::RTL8201), #if ETH_TYPE_JL1101_SUPPORTED static_cast(EthPhyType_t::JL1101), @@ -288,7 +285,6 @@ void handle_hardware() { static_cast(EthPhyType_t::DP83848), static_cast(EthPhyType_t::KSZ8041), static_cast(EthPhyType_t::KSZ8081), -#endif # endif // if CONFIG_ETH_USE_ESP32_EMAC #if ESP_IDF_VERSION_MAJOR >= 5 From 07a6c55354fccacd0eab8b51da64dd42d75d7b04 Mon Sep 17 00:00:00 2001 From: TD-er Date: Sat, 26 Oct 2024 21:08:46 +0200 Subject: [PATCH 003/564] [Cleanup] Fix spelling error in filename --- src/src/ESPEasyCore/ESPEasyWifi.cpp | 2 +- .../{ESPEasyWifi_abstrated.h => ESPEasyWifi_abstracted.h} | 0 src/src/ESPEasyCore/ESPEasyWifi_abstracted_ESP32.cpp | 2 +- src/src/ESPEasyCore/ESPEasyWifi_abstracted_ESP8266.cpp | 2 +- 4 files changed, 3 insertions(+), 3 deletions(-) rename src/src/ESPEasyCore/{ESPEasyWifi_abstrated.h => ESPEasyWifi_abstracted.h} (100%) diff --git a/src/src/ESPEasyCore/ESPEasyWifi.cpp b/src/src/ESPEasyCore/ESPEasyWifi.cpp index 2245649dd..9410b0d28 100644 --- a/src/src/ESPEasyCore/ESPEasyWifi.cpp +++ b/src/src/ESPEasyCore/ESPEasyWifi.cpp @@ -25,7 +25,7 @@ -#include "../ESPEasyCore/ESPEasyWifi_abstrated.h" +#include "../ESPEasyCore/ESPEasyWifi_abstracted.h" #ifdef ESP32 diff --git a/src/src/ESPEasyCore/ESPEasyWifi_abstrated.h b/src/src/ESPEasyCore/ESPEasyWifi_abstracted.h similarity index 100% rename from src/src/ESPEasyCore/ESPEasyWifi_abstrated.h rename to src/src/ESPEasyCore/ESPEasyWifi_abstracted.h diff --git a/src/src/ESPEasyCore/ESPEasyWifi_abstracted_ESP32.cpp b/src/src/ESPEasyCore/ESPEasyWifi_abstracted_ESP32.cpp index a7d463427..01137da4c 100644 --- a/src/src/ESPEasyCore/ESPEasyWifi_abstracted_ESP32.cpp +++ b/src/src/ESPEasyCore/ESPEasyWifi_abstracted_ESP32.cpp @@ -1,4 +1,4 @@ -#include "../ESPEasyCore/ESPEasyWifi_abstrated.h" +#include "../ESPEasyCore/ESPEasyWifi_abstracted.h" #ifdef ESP32 diff --git a/src/src/ESPEasyCore/ESPEasyWifi_abstracted_ESP8266.cpp b/src/src/ESPEasyCore/ESPEasyWifi_abstracted_ESP8266.cpp index 26b19eebd..f09f4216e 100644 --- a/src/src/ESPEasyCore/ESPEasyWifi_abstracted_ESP8266.cpp +++ b/src/src/ESPEasyCore/ESPEasyWifi_abstracted_ESP8266.cpp @@ -1,4 +1,4 @@ -#include "../ESPEasyCore/ESPEasyWifi_abstrated.h" +#include "../ESPEasyCore/ESPEasyWifi_abstracted.h" #ifdef ESP8266 From e5100b180d2c8ce511b2e78e7646ebfbe6eaa296 Mon Sep 17 00:00:00 2001 From: TD-er Date: Sat, 2 Nov 2024 13:59:21 +0100 Subject: [PATCH 004/564] [WiFi] First part of moving code around to restructure WiFi code --- src/src/Commands/InternalCommands.cpp | 10 +- src/src/Commands/InternalCommands_decoder.cpp | 18 + src/src/Commands/InternalCommands_decoder.h | 7 +- src/src/Commands/WiFi.cpp | 17 +- src/src/Commands/WiFi.h | 4 + src/src/CustomBuild/define_plugin_sets.h | 10 + src/src/DataStructs/WiFiEventData.h | 39 +- src/src/DataTypes/WiFiConnectionProtocol.h | 34 +- src/src/DataTypes/WiFi_STA_connected_state.h | 26 ++ src/src/DataTypes/WiFi_State.h | 92 +++++ src/src/ESPEasyCore/ESPEasyNetwork.cpp | 3 +- .../ESPEasyCore/ESPEasyWiFiEvent_ESP32.cpp | 43 +-- src/src/ESPEasyCore/ESPEasyWiFiEvent_ESP32.h | 22 +- .../ESPEasyCore/ESPEasyWiFiEvent_ESP8266.cpp | 103 +++-- .../ESPEasyCore/ESPEasyWiFiEvent_ESP8266.h | 26 +- .../ESPEasyCore/ESPEasyWiFi_state_machine.cpp | 288 ++++++++++++++ .../ESPEasyCore/ESPEasyWiFi_state_machine.h | 128 +++++++ .../ESPEasyWiFi_state_machine_ESP32.cpp | 61 +++ .../ESPEasyWiFi_state_machine_ESP8266.cpp | 42 ++ src/src/ESPEasyCore/ESPEasyWifi.cpp | 362 ++---------------- src/src/ESPEasyCore/ESPEasyWifi.h | 170 +++----- .../ESPEasyCore/ESPEasyWifi_ProcessEvent.cpp | 188 +++++---- .../ESPEasyCore/ESPEasyWifi_abstracted.cpp | 151 ++++++++ src/src/ESPEasyCore/ESPEasyWifi_abstracted.h | 87 ++++- .../ESPEasyWifi_abstracted_ESP32.cpp | 289 +++++++++++--- .../ESPEasyWifi_abstracted_ESP8266.cpp | 290 +++++++++++--- src/src/ESPEasyCore/ESPEasy_setup.cpp | 7 +- src/src/Helpers/Network.cpp | 3 +- src/src/Helpers/PeriodicalActions.cpp | 3 +- src/src/Helpers/WiFi_AP_CandidatesList.cpp | 5 +- src/src/WebServer/AccessControl.cpp | 5 +- src/src/WebServer/ESPEasy_WebServer.cpp | 3 +- src/src/WebServer/SetupPage.cpp | 3 +- src/src/WebServer/WiFiScanner.cpp | 5 +- uncrustify.cfg | 56 +-- 35 files changed, 1777 insertions(+), 823 deletions(-) create mode 100644 src/src/DataTypes/WiFi_STA_connected_state.h create mode 100644 src/src/DataTypes/WiFi_State.h create mode 100644 src/src/ESPEasyCore/ESPEasyWiFi_state_machine.cpp create mode 100644 src/src/ESPEasyCore/ESPEasyWiFi_state_machine.h create mode 100644 src/src/ESPEasyCore/ESPEasyWiFi_state_machine_ESP32.cpp create mode 100644 src/src/ESPEasyCore/ESPEasyWiFi_state_machine_ESP8266.cpp create mode 100644 src/src/ESPEasyCore/ESPEasyWifi_abstracted.cpp diff --git a/src/src/Commands/InternalCommands.cpp b/src/src/Commands/InternalCommands.cpp index a1ae0fa89..737b5e179 100644 --- a/src/src/Commands/InternalCommands.cpp +++ b/src/src/Commands/InternalCommands.cpp @@ -43,7 +43,9 @@ #include "../Commands/Timer.h" #include "../Commands/UPD.h" #include "../Commands/wd.h" +#if FEATURE_WIFI #include "../Commands/WiFi.h" +#endif #include "../DataStructs/TimingStats.h" @@ -302,14 +304,18 @@ bool InternalCommands::executeInternalCommand() case ESPEasy_cmd_e::ethdisconnect: COMMAND_CASE_A(Command_ETH_Disconnect, 0); // Network Command case ESPEasy_cmd_e::ethwifimode: COMMAND_CASE_R(Command_ETH_Wifi_Mode, 1); // Network Command #endif // FEATURE_ETHERNET +#if FEATURE_WIFI case ESPEasy_cmd_e::erasesdkwifi: COMMAND_CASE_R(Command_WiFi_Erase, 0); // WiFi.h +#endif case ESPEasy_cmd_e::event: COMMAND_CASE_A(Command_Rules_Events, -1); // Rule.h case ESPEasy_cmd_e::executerules: COMMAND_CASE_A(Command_Rules_Execute, -1); // Rule.h case ESPEasy_cmd_e::factoryreset: COMMAND_CASE_R(Command_Settings_FactoryReset, 0); // Settings.h case ESPEasy_cmd_e::gateway: COMMAND_CASE_R(Command_Gateway, 1); // Network Command case ESPEasy_cmd_e::gpio: COMMAND_CASE_A(Command_GPIO, 2); // Gpio.h case ESPEasy_cmd_e::gpiotoggle: COMMAND_CASE_A(Command_GPIO_Toggle, 1); // Gpio.h +#if FEATURE_WIFI case ESPEasy_cmd_e::hiddenssid: COMMAND_CASE_R(Command_Wifi_HiddenSSID, 1); // wifi.h +#endif case ESPEasy_cmd_e::i2cscanner: COMMAND_CASE_R(Command_i2c_Scanner, -1); // i2c.h case ESPEasy_cmd_e::inc: COMMAND_CASE_A(Command_Rules_Inc, -1); // Rules.h case ESPEasy_cmd_e::ip: COMMAND_CASE_R(Command_IP, 1); // Network Command @@ -461,7 +467,7 @@ bool InternalCommands::executeInternalCommand() case ESPEasy_cmd_e::wdconfig: COMMAND_CASE_R(Command_WD_Config, 3); // WD.h case ESPEasy_cmd_e::wdread: COMMAND_CASE_R(Command_WD_Read, 2); // WD.h #endif // ifndef LIMIT_BUILD_SIZE - +#if FEATURE_WIFI case ESPEasy_cmd_e::wifiallowap: COMMAND_CASE_R(Command_Wifi_AllowAP, 0); // WiFi.h case ESPEasy_cmd_e::wifiapmode: COMMAND_CASE_R(Command_Wifi_APMode, 0); // WiFi.h case ESPEasy_cmd_e::wificonnect: COMMAND_CASE_A(Command_Wifi_Connect, 0); // WiFi.h @@ -473,7 +479,7 @@ bool InternalCommands::executeInternalCommand() case ESPEasy_cmd_e::wifissid: COMMAND_CASE_R(Command_Wifi_SSID, 1); // WiFi.h case ESPEasy_cmd_e::wifissid2: COMMAND_CASE_R(Command_Wifi_SSID2, 1); // WiFi.h case ESPEasy_cmd_e::wifistamode: COMMAND_CASE_R(Command_Wifi_STAMode, 0); // WiFi.h - +#endif case ESPEasy_cmd_e::NotMatched: return false; diff --git a/src/src/Commands/InternalCommands_decoder.cpp b/src/src/Commands/InternalCommands_decoder.cpp index 5bbb37c0e..3d95147a7 100644 --- a/src/src/Commands/InternalCommands_decoder.cpp +++ b/src/src/Commands/InternalCommands_decoder.cpp @@ -57,9 +57,15 @@ const char Internal_commands_d[] PROGMEM = "dst|" ; +#if FEATURE_WIFI #define Int_cmd_e_offset ESPEasy_cmd_e::erasesdkwifi +#else +#define Int_cmd_e_offset ESPEasy_cmd_e::event +#endif const char Internal_commands_e[] PROGMEM = +#if FEATURE_WIFI "erasesdkwifi|" +#endif "event|" "executerules|" #if FEATURE_ETHERNET @@ -84,7 +90,9 @@ const char Internal_commands_fghij[] PROGMEM = "gateway|" "gpio|" "gpiotoggle|" +#if FEATURE_WIFI "hiddenssid|" +#endif "i2cscanner|" "inc|" "ip|" @@ -259,8 +267,14 @@ const char Internal_commands_u[] PROGMEM = "usentp|" ; +#if FEATURE_WIFI || !defined(LIMIT_BUILD_SIZE) +#if FEATURE_WIFI #define Int_cmd_w_offset ESPEasy_cmd_e::wifiallowap +#else +#define Int_cmd_w_offset ESPEasy_cmd_e::wdconfig +#endif const char Internal_commands_w[] PROGMEM = +#if FEATURE_WIFI "wifiallowap|" "wifiapmode|" "wificonnect|" @@ -272,11 +286,13 @@ const char Internal_commands_w[] PROGMEM = "wifissid|" "wifissid2|" "wifistamode|" +#endif #ifndef LIMIT_BUILD_SIZE "wdconfig|" "wdread|" #endif // ifndef LIMIT_BUILD_SIZE ; +#endif const char* getInternalCommand_Haystack_Offset(const char firstLetter, int& offset) { @@ -345,10 +361,12 @@ const char* getInternalCommand_Haystack_Offset(const char firstLetter, int& offs offset = static_cast(Int_cmd_u_offset); haystack = Internal_commands_u; break; +#if FEATURE_WIFI || !defined(LIMIT_BUILD_SIZE) case 'w': offset = static_cast(Int_cmd_w_offset); haystack = Internal_commands_w; break; +#endif default: return nullptr; diff --git a/src/src/Commands/InternalCommands_decoder.h b/src/src/Commands/InternalCommands_decoder.h index 1887cc01e..6fa6bf4cf 100644 --- a/src/src/Commands/InternalCommands_decoder.h +++ b/src/src/Commands/InternalCommands_decoder.h @@ -40,8 +40,9 @@ enum class ESPEasy_cmd_e : uint8_t { #endif // #if FEATURE_PLUGIN_PRIORITY dns, dst, - +#if FEATURE_WIFI erasesdkwifi, +#endif event, executerules, #if FEATURE_ETHERNET @@ -64,7 +65,9 @@ enum class ESPEasy_cmd_e : uint8_t { gateway, gpio, gpiotoggle, +#if FEATURE_WIFI hiddenssid, +#endif i2cscanner, inc, @@ -216,6 +219,7 @@ enum class ESPEasy_cmd_e : uint8_t { unmonitorrange, usentp, +#if FEATURE_WIFI wifiallowap, wifiapmode, wificonnect, @@ -227,6 +231,7 @@ enum class ESPEasy_cmd_e : uint8_t { wifissid, wifissid2, wifistamode, +#endif #ifndef LIMIT_BUILD_SIZE wdconfig, wdread, diff --git a/src/src/Commands/WiFi.cpp b/src/src/Commands/WiFi.cpp index 6f355ac15..2c702854d 100644 --- a/src/src/Commands/WiFi.cpp +++ b/src/src/Commands/WiFi.cpp @@ -2,11 +2,14 @@ #include "../../ESPEasy_common.h" +#if FEATURE_WIFI + #include "../Commands/Common.h" #include "../DataStructs/ESPEasy_EventStruct.h" #include "../ESPEasyCore/ESPEasyWifi.h" +#include "../ESPEasyCore/ESPEasyWifi_abstracted.h" #include "../ESPEasyCore/Serial.h" #include "../Globals/ESPEasyWiFiEvent.h" @@ -96,13 +99,13 @@ const __FlashStringHelper* Command_Wifi_Disconnect(struct EventStruct *event, co const __FlashStringHelper* Command_Wifi_APMode(struct EventStruct *event, const char *Line) { - setAP(true); + ESPEasy::net::wifi::setAP(true); return return_command_success_flashstr(); } const __FlashStringHelper* Command_Wifi_STAMode(struct EventStruct *event, const char *Line) { - setSTA(true); + ESPEasy::net::wifi::setSTA(true); return return_command_success_flashstr(); } @@ -125,12 +128,12 @@ String Command_Wifi_Mode(struct EventStruct *event, const char *Line) } if ((mode >= WIFI_OFF) && (mode < WIFI_MODE_MAX)) { - setWifiMode(mode); + ESPEasy::net::wifi::setWifiMode(mode); } else { return return_result(event, F("Wifi Mode: invalid arguments")); } } else { - return return_result(event, concat(F("WiFi Mode:"), getWifiModeString(WiFi.getMode()))); + return return_result(event, concat(F("WiFi Mode:"), ESPEasy::net::wifi::getWifiModeString(WiFi.getMode()))); } return return_command_success(); } @@ -147,7 +150,7 @@ const __FlashStringHelper* Command_WiFi_Erase(struct EventStruct *event, const c { #ifdef ESP8266 WifiDisconnect(); - setWifiMode(WIFI_OFF); + ESPEasy::net::wifi::setWifiMode(WIFI_OFF); if (!ESP.eraseConfig()) return return_command_failed_flashstr(); addLog(LOG_LEVEL_INFO, F("WiFi : Erased WiFi calibration data")); @@ -155,7 +158,7 @@ const __FlashStringHelper* Command_WiFi_Erase(struct EventStruct *event, const c #ifdef ESP32 WifiDisconnect(); - setWifiMode(WIFI_OFF); + ESPEasy::net::wifi::setWifiMode(WIFI_OFF); delay(100); esp_phy_erase_cal_data_in_nvs(); addLog(LOG_LEVEL_INFO, F("WiFi : Erased WiFi calibration data")); @@ -166,3 +169,5 @@ const __FlashStringHelper* Command_WiFi_Erase(struct EventStruct *event, const c #endif return return_command_success_flashstr(); } + +#endif \ No newline at end of file diff --git a/src/src/Commands/WiFi.h b/src/src/Commands/WiFi.h index ba81aff0e..e1b0ebc4c 100644 --- a/src/src/Commands/WiFi.h +++ b/src/src/Commands/WiFi.h @@ -1,6 +1,9 @@ #ifndef COMMAND_WIFI_H #define COMMAND_WIFI_H +#include "../../ESPEasy_common.h" + +#if FEATURE_WIFI #include String Command_Wifi_SSID(struct EventStruct *event, @@ -33,4 +36,5 @@ const __FlashStringHelper* Command_Wifi_AllowAP(struct EventStruct *event, const __FlashStringHelper* Command_WiFi_Erase(struct EventStruct *event, const char *Line); +#endif #endif // COMMAND_WIFI_H diff --git a/src/src/CustomBuild/define_plugin_sets.h b/src/src/CustomBuild/define_plugin_sets.h index bda798b33..bfda3f398 100644 --- a/src/src/CustomBuild/define_plugin_sets.h +++ b/src/src/CustomBuild/define_plugin_sets.h @@ -3121,6 +3121,16 @@ To create/register a plugin, you have to : #define FEATURE_ETHERNET 0 #endif +#ifndef FEATURE_WIFI +#ifdef ESP8266 +#define FEATURE_WIFI 1 +#elif SOC_WIFI_SUPPORTED || CONFIG_ESP_WIFI_REMOTE_ENABLED +#define FEATURE_WIFI 1 +#else +#define FEATURE_WIFI 0 +#endif +#endif + #ifndef FEATURE_EXT_RTC #define FEATURE_EXT_RTC 0 #endif diff --git a/src/src/DataStructs/WiFiEventData.h b/src/src/DataStructs/WiFiEventData.h index 1dbd20fdb..76a3e5ff6 100644 --- a/src/src/DataStructs/WiFiEventData.h +++ b/src/src/DataStructs/WiFiEventData.h @@ -59,27 +59,25 @@ struct WiFiEventData_t { return bitRead(wifiStatus, ESPEASY_WIFI_SERVICES_INITIALIZED); } - void setWiFiDisconnected(); - void setWiFiGotIP(); - void setWiFiConnected(); - void setWiFiServicesInitialized(); + void setWiFiDisconnected(); + void setWiFiGotIP(); + void setWiFiConnected(); + void setWiFiServicesInitialized(); - void markGotIP(); + void markGotIP(); #if FEATURE_USE_IPV6 - void markGotIPv6(const IPAddress& ip6); + void markGotIPv6(const IPAddress& ip6); #endif - void markLostIP(); - void markDisconnect(WiFiDisconnectReason reason); - void markConnected(const String& ssid, - const uint8_t bssid[6], - uint8_t channel); - void markConnectedAPmode(const uint8_t mac[6]); - void markDisconnectedAPmode(const uint8_t mac[6]); + void markLostIP(); + void markDisconnect(WiFiDisconnectReason reason); + void markConnected(const String& ssid, + const uint8_t bssid[6], + uint8_t channel); + void markConnectedAPmode(const uint8_t mac[6]); + void markDisconnectedAPmode(const uint8_t mac[6]); - void setAuthMode(uint8_t newMode) { - auth_mode = newMode; - } + void setAuthMode(uint8_t newMode) { auth_mode = newMode; } String ESPeasyWifiStatusToString() const; @@ -135,11 +133,11 @@ struct WiFiEventData_t { // Semaphore like bools for processing data gathered from WiFi events. - bool processedConnect = true; - bool processedDisconnect = true; - bool processedGotIP = true; + bool processedConnect = true; + bool processedDisconnect = true; + bool processedGotIP = true; #if FEATURE_USE_IPV6 - bool processedGotIP6 = true; + bool processedGotIP6 = true; #endif bool processedDHCPTimeout = true; bool processedConnectAPmode = true; @@ -158,6 +156,7 @@ struct WiFiEventData_t { #ifdef ESP32 WiFiEventId_t wm_event_id = 0; #endif // ifdef ESP32 + }; #endif // ifndef DATASTRUCTS_WIFIEVENTDATA_H diff --git a/src/src/DataTypes/WiFiConnectionProtocol.h b/src/src/DataTypes/WiFiConnectionProtocol.h index a605bf3ec..54f55bf70 100644 --- a/src/src/DataTypes/WiFiConnectionProtocol.h +++ b/src/src/DataTypes/WiFiConnectionProtocol.h @@ -4,26 +4,28 @@ #include "../../ESPEasy_common.h" enum class WiFiConnectionProtocol { - Unknown, - WiFi_Protocol_11b, - WiFi_Protocol_11g, + Unknown, + WiFi_Protocol_11b, + WiFi_Protocol_11g, #ifdef ESP8266 - WiFi_Protocol_11n + WiFi_Protocol_11n #endif #ifdef ESP32 - WiFi_Protocol_HT20, - WiFi_Protocol_HT40, - WiFi_Protocol_HE20, // WiFi 6 -#if ESP_IDF_VERSION > ESP_IDF_VERSION_VAL(5, 2, 0) - WiFi_Protocol_11a, // traditional (old) 5 GHz - WiFi_Protocol_VHT20, // 5 GHz WiFi 5, 802.11ac -#endif - WiFi_Protocol_LR -#endif + WiFi_Protocol_HT20, + WiFi_Protocol_HT40, + WiFi_Protocol_HE20, // WiFi 6 +# if ESP_IDF_VERSION > ESP_IDF_VERSION_VAL(5, \ + 2, \ + 0) + WiFi_Protocol_11a, // traditional (old) 5 GHz + WiFi_Protocol_VHT20, // 5 GHz WiFi 5, 802.11ac +# endif // if ESP_IDF_VERSION > ESP_IDF_VERSION_VAL(5, 2, 0) + WiFi_Protocol_LR +#endif // ifdef ESP32 + }; -const __FlashStringHelper * toString(WiFiConnectionProtocol proto); +const __FlashStringHelper* toString(WiFiConnectionProtocol proto); - -#endif \ No newline at end of file +#endif // ifndef DATATYPES_WIFICONNECTIONPROTOCOL_H diff --git a/src/src/DataTypes/WiFi_STA_connected_state.h b/src/src/DataTypes/WiFi_STA_connected_state.h new file mode 100644 index 000000000..5f41e6648 --- /dev/null +++ b/src/src/DataTypes/WiFi_STA_connected_state.h @@ -0,0 +1,26 @@ +#pragma once + +#include "../../ESPEasy_common.h" + +#if FEATURE_WIFI + +namespace ESPEasy { +namespace net { +namespace wifi { + + +enum class STA_connected_state { + Idle, + Connecting, + Connected, + Error_Not_Found, + Error_Connect_Failed + +}; + + +} // namespace wifi +} // namespace net +} // namespace ESPEasy + +#endif // if FEATURE_WIFI diff --git a/src/src/DataTypes/WiFi_State.h b/src/src/DataTypes/WiFi_State.h new file mode 100644 index 000000000..62d5ff9cf --- /dev/null +++ b/src/src/DataTypes/WiFi_State.h @@ -0,0 +1,92 @@ +#pragma once + +#include "../../ESPEasy_common.h" + +#if FEATURE_WIFI + + +namespace ESPEasy { +namespace net { +namespace wifi { + + +/* + + State machine: + + Start at boot: Disabled + + Disabled: + When AP or STA is needed -> OFF + + + OFF: + When STA is needed -> IdleWaiting + + + IdleWaiting: + After waiting period: + If candidate present -> start STA_Connecting + Else if AP enabled (and client connected to AP) -> Start STA_AP_Scanning + Else -> start STA_Scanning + + STA_Scanning: + When finished: + If known candidate present -> IdleWaiting + else if no known candidate present -> start AP_only -> IdleWaiting + + STA_Connecting: + When failed -> STA_Reconnecting + Else -> STA_Connected + + STA_Reconnecting: + When failed -> IdleWaiting + Else -> STA_Connected + + + STA_Connected: + If disconnected -> OFF + If connected for X minutes -> mark as stable + + + */ + + +enum class WiFiState_e +{ + // WiFi radio is off and no new attempt should be made (e.g. low power mode or Ethernet active) + Disabled, + + // WiFi radio off, to continue, everything needs to be (re)initialized + OFF, + + // Only running in AP mode + AP_only, + + // WiFi was in some kind of error state or needs waiting period + IdleWaiting, + + // STA mode + scanning + STA_Scanning, + + // STA+AP mode + scanning, + // needs some careful handling to prevent disconnecting the connected stations + STA_AP_Scanning, + + // Connecting to an AP + STA_Connecting, + + // Reconnecting to an AP + // May need to handle some specific disconnect reasons differently from connecting for the first time. + STA_Reconnecting, + + // Connected to an AP + STA_Connected + +}; + + +} // namespace wifi +} // namespace net +} // namespace ESPEasy +#endif // if FEATURE_WIFI diff --git a/src/src/ESPEasyCore/ESPEasyNetwork.cpp b/src/src/ESPEasyCore/ESPEasyNetwork.cpp index 548c21280..a5bad8336 100644 --- a/src/src/ESPEasyCore/ESPEasyNetwork.cpp +++ b/src/src/ESPEasyCore/ESPEasyNetwork.cpp @@ -3,6 +3,7 @@ #include "../ESPEasyCore/ESPEasy_Log.h" #include "../ESPEasyCore/ESPEasyEth.h" #include "../ESPEasyCore/ESPEasyWifi.h" +#include "../ESPEasyCore/ESPEasyWifi_abstracted.h" #include "../Globals/ESPEasy_time.h" #include "../Globals/ESPEasyWiFiEvent.h" #include "../Globals/NetworkState.h" @@ -175,7 +176,7 @@ esp_netif_t * getActiveNetworkMediumInterface() { } else #endif { - if (WifiIsSTA(WiFi.getMode())) { + if ( ESPEasy::net::wifi::WifiIsSTA(WiFi.getMode())) { iface = ESP_IF_WIFI_STA; } } diff --git a/src/src/ESPEasyCore/ESPEasyWiFiEvent_ESP32.cpp b/src/src/ESPEasyCore/ESPEasyWiFiEvent_ESP32.cpp index edc9dc376..06d70ae52 100644 --- a/src/src/ESPEasyCore/ESPEasyWiFiEvent_ESP32.cpp +++ b/src/src/ESPEasyCore/ESPEasyWiFiEvent_ESP32.cpp @@ -27,9 +27,7 @@ # include "../Globals/ESPEasyEthEvent.h" # endif // if FEATURE_ETHERNET - -void setUseStaticIP(bool enabled) { -} +void setUseStaticIP(bool enabled) {} // ******************************************************************************** // Functions called on events. @@ -40,37 +38,38 @@ void setUseStaticIP(bool enabled) { static bool ignoreDisconnectEvent = false; void WiFiEvent(WiFiEvent_t event, arduino_event_info_t info) { - switch (event) { + switch (event) + { case ARDUINO_EVENT_WIFI_READY: // ESP32 WiFi ready break; case ARDUINO_EVENT_WIFI_STA_START: - # ifndef BUILD_NO_DEBUG + # ifndef BUILD_NO_DEBUG // addLog(LOG_LEVEL_INFO, F("WiFi : Event STA Started")); - # endif // ifndef BUILD_NO_DEBUG + # endif // ifndef BUILD_NO_DEBUG break; case ARDUINO_EVENT_WIFI_STA_STOP: - # ifndef BUILD_NO_DEBUG + # ifndef BUILD_NO_DEBUG // addLog(LOG_LEVEL_INFO, F("WiFi : Event STA Stopped")); - # endif // ifndef BUILD_NO_DEBUG + # endif // ifndef BUILD_NO_DEBUG break; case ARDUINO_EVENT_WIFI_AP_START: - # ifndef BUILD_NO_DEBUG + # ifndef BUILD_NO_DEBUG // addLog(LOG_LEVEL_INFO, F("WiFi : Event AP Started")); - # endif // ifndef BUILD_NO_DEBUG + # endif // ifndef BUILD_NO_DEBUG break; case ARDUINO_EVENT_WIFI_AP_STOP: - # ifndef BUILD_NO_DEBUG + # ifndef BUILD_NO_DEBUG // addLog(LOG_LEVEL_INFO, F("WiFi : Event AP Stopped")); - # endif // ifndef BUILD_NO_DEBUG + # endif // ifndef BUILD_NO_DEBUG break; case ARDUINO_EVENT_WIFI_STA_LOST_IP: // ESP32 station lost IP and the IP is reset to 0 - # if FEATURE_ETHERNET + # if FEATURE_ETHERNET if (active_network_medium == NetworkMedium_t::Ethernet) { // DNS records are shared among WiFi and Ethernet (very bad design!) @@ -78,9 +77,9 @@ void WiFiEvent(WiFiEvent_t event, arduino_event_info_t info) { // As soon as WiFi is turned off, the DNS entry for Ethernet is cleared. EthEventData.markLostIP(); } - # endif // if FEATURE_ETHERNET + # endif // if FEATURE_ETHERNET WiFiEventData.markLostIP(); - # ifndef BUILD_NO_DEBUG + # ifndef BUILD_NO_DEBUG // addLog(LOG_LEVEL_INFO, @@ -90,16 +89,16 @@ void WiFiEvent(WiFiEvent_t event, arduino_event_info_t info) { */ // F("WiFi : Event Lost IP")); - # endif // ifndef BUILD_NO_DEBUG + # endif // ifndef BUILD_NO_DEBUG break; case ARDUINO_EVENT_WIFI_AP_PROBEREQRECVED: // Receive probe request packet in soft-AP interface // TODO TD-er: Must implement like onProbeRequestAPmode for ESP8266 - # ifndef BUILD_NO_DEBUG + # ifndef BUILD_NO_DEBUG // addLog(LOG_LEVEL_INFO, F("WiFi : Event AP got probed")); - # endif // ifndef BUILD_NO_DEBUG + # endif // ifndef BUILD_NO_DEBUG break; case ARDUINO_EVENT_WIFI_STA_AUTHMODE_CHANGE: @@ -136,7 +135,7 @@ void WiFiEvent(WiFiEvent_t event, arduino_event_info_t info) { ignoreDisconnectEvent = false; WiFiEventData.markGotIP(); break; - # if FEATURE_USE_IPV6 + # if FEATURE_USE_IPV6 case ARDUINO_EVENT_WIFI_STA_GOT_IP6: { ip_event_got_ip6_t *event = static_cast(&info.got_ip6); @@ -147,7 +146,7 @@ void WiFiEvent(WiFiEvent_t event, arduino_event_info_t info) { case ARDUINO_EVENT_WIFI_AP_GOT_IP6: addLog(LOG_LEVEL_INFO, F("WIFI : AP got IP6")); break; - # endif // if FEATURE_USE_IPV6 + # endif // if FEATURE_USE_IPV6 case ARDUINO_EVENT_WIFI_AP_STACONNECTED: WiFiEventData.markConnectedAPmode(info.wifi_ap_staconnected.mac); break; @@ -157,7 +156,7 @@ void WiFiEvent(WiFiEvent_t event, arduino_event_info_t info) { case ARDUINO_EVENT_WIFI_SCAN_DONE: WiFiEventData.processedScanDone = false; break; -# if FEATURE_ETHERNET +# if FEATURE_ETHERNET case ARDUINO_EVENT_ETH_START: case ARDUINO_EVENT_ETH_CONNECTED: case ARDUINO_EVENT_ETH_GOT_IP: @@ -167,7 +166,7 @@ void WiFiEvent(WiFiEvent_t event, arduino_event_info_t info) { // Handled in EthEvent break; -# endif // FEATURE_ETHERNET +# endif // FEATURE_ETHERNET default: { // addLogMove(LOG_LEVEL_ERROR, concat(F("UNKNOWN WIFI/ETH EVENT: "), event)); diff --git a/src/src/ESPEasyCore/ESPEasyWiFiEvent_ESP32.h b/src/src/ESPEasyCore/ESPEasyWiFiEvent_ESP32.h index 90b15c39f..6f7e8df81 100644 --- a/src/src/ESPEasyCore/ESPEasyWiFiEvent_ESP32.h +++ b/src/src/ESPEasyCore/ESPEasyWiFiEvent_ESP32.h @@ -3,22 +3,23 @@ #ifdef ESP32 -#include "../../ESPEasy_common.h" +# include "../../ESPEasy_common.h" -#include +# include // ******************************************************************************** // Work-around for setting _useStaticIP // See reported issue: https://github.com/esp8266/Arduino/issues/4114 // ******************************************************************************** -#include -#include -#include -#include +# include +# include +# include +# include -class WiFi_Access_Static_IP : public WiFiSTAClass { +class WiFi_Access_Static_IP : public WiFiSTAClass +{ public: void set_use_static_ip(bool enabled); @@ -31,8 +32,9 @@ void setUseStaticIP(bool enabled); // Functions called on events. // Make sure not to call anything in these functions that result in delay() or yield() // ******************************************************************************** -void WiFiEvent(WiFiEvent_t event, arduino_event_info_t info); +void WiFiEvent(WiFiEvent_t event, + arduino_event_info_t info); -#endif +#endif // ifdef ESP32 -#endif \ No newline at end of file +#endif // ifndef ESPEASY_WIFI_EVENT_ESP32_H diff --git a/src/src/ESPEasyCore/ESPEasyWiFiEvent_ESP8266.cpp b/src/src/ESPEasyCore/ESPEasyWiFiEvent_ESP8266.cpp index b96282116..b127bc194 100644 --- a/src/src/ESPEasyCore/ESPEasyWiFiEvent_ESP8266.cpp +++ b/src/src/ESPEasyCore/ESPEasyWiFiEvent_ESP8266.cpp @@ -1,48 +1,42 @@ #include "../ESPEasyCore/ESPEasyWiFiEvent_ESP8266.h" -#ifdef ESP8266 +#if FEATURE_WIFI +# ifdef ESP8266 -#include "../DataStructs/RTCStruct.h" +# include "../DataStructs/RTCStruct.h" -#include "../DataTypes/ESPEasyTimeSource.h" +# include "../DataTypes/ESPEasyTimeSource.h" -#include "../ESPEasyCore/ESPEasyEth.h" -#include "../ESPEasyCore/ESPEasy_Log.h" -#include "../ESPEasyCore/ESPEasyNetwork.h" -#include "../ESPEasyCore/ESPEasyWifi.h" -#include "../ESPEasyCore/ESPEasyWifi_ProcessEvent.h" +# include "../ESPEasyCore/ESPEasyEth.h" +# include "../ESPEasyCore/ESPEasy_Log.h" +# include "../ESPEasyCore/ESPEasyNetwork.h" +# include "../ESPEasyCore/ESPEasyWifi.h" +# include "../ESPEasyCore/ESPEasyWifi_ProcessEvent.h" -#include "../Globals/ESPEasyWiFiEvent.h" -#include "../Globals/NetworkState.h" -#include "../Globals/RTC.h" -#include "../Globals/WiFi_AP_Candidates.h" +# include "../Globals/ESPEasyWiFiEvent.h" +# include "../Globals/NetworkState.h" +# include "../Globals/RTC.h" +# include "../Globals/WiFi_AP_Candidates.h" -#include "../Helpers/ESPEasy_time_calc.h" +# include "../Helpers/ESPEasy_time_calc.h" +void WiFi_Access_Static_IP::set_use_static_ip(bool enabled) { _useStaticIp = enabled; } -void WiFi_Access_Static_IP::set_use_static_ip(bool enabled) { - _useStaticIp = enabled; -} void setUseStaticIP(bool enabled) { WiFi_Access_Static_IP tmp_wifi; tmp_wifi.set_use_static_ip(enabled); } - - - - // ******************************************************************************** // Functions called on events. // Make sure not to call anything in these functions that result in delay() or yield() // ******************************************************************************** -void onConnected(const WiFiEventStationModeConnected& event) { - WiFiEventData.markConnected(event.ssid, event.bssid, event.channel); -} +void onConnected(const WiFiEventStationModeConnected& event) { WiFiEventData.markConnected(event.ssid, event.bssid, event.channel); } void onDisconnect(const WiFiEventStationModeDisconnected& event) { WiFiEventData.markDisconnect(event.reason); + if (WiFi.status() == WL_CONNECTED) { // See https://github.com/esp8266/Arduino/issues/5912 WiFi.persistent(false); @@ -51,65 +45,62 @@ void onDisconnect(const WiFiEventStationModeDisconnected& event) { } } -void onGotIP(const WiFiEventStationModeGotIP& event) { - WiFiEventData.markGotIP(); -} +void onGotIP(const WiFiEventStationModeGotIP& event) { WiFiEventData.markGotIP(); } -void onDHCPTimeout() { - WiFiEventData.processedDHCPTimeout = false; -} +void onDHCPTimeout() { WiFiEventData.processedDHCPTimeout = false; } -void onConnectedAPmode(const WiFiEventSoftAPModeStationConnected& event) { - WiFiEventData.markConnectedAPmode(event.mac); -} +void onConnectedAPmode(const WiFiEventSoftAPModeStationConnected& event) { WiFiEventData.markConnectedAPmode(event.mac); } -void onDisconnectedAPmode(const WiFiEventSoftAPModeStationDisconnected& event) { - WiFiEventData.markDisconnectedAPmode(event.mac); -} +void onDisconnectedAPmode(const WiFiEventSoftAPModeStationDisconnected& event) { WiFiEventData.markDisconnectedAPmode(event.mac); } -void onStationModeAuthModeChanged(const WiFiEventStationModeAuthModeChanged& event) { - WiFiEventData.setAuthMode(event.newMode); -} +void onStationModeAuthModeChanged(const WiFiEventStationModeAuthModeChanged& event) { WiFiEventData.setAuthMode(event.newMode); } + +# if FEATURE_ESP8266_DIRECT_WIFI_SCAN -#if FEATURE_ESP8266_DIRECT_WIFI_SCAN void onWiFiScanDone(void *arg, STATUS status) { if (status == OK) { - auto *head = reinterpret_cast(arg); - int scanCount = 0; + auto *head = reinterpret_cast(arg); + int scanCount = 0; + for (bss_info *it = head; it != nullptr; it = STAILQ_NEXT(it, next)) { WiFi_AP_Candidates.process_WiFiscan(*it); ++scanCount; } WiFi_AP_Candidates.after_process_WiFiscan(); WiFiEventData.lastGetScanMoment.setNow(); -// WiFiEventData.processedScanDone = true; -# ifndef BUILD_NO_DEBUG -/* - if (loglevelActiveFor(LOG_LEVEL_INFO)) { - addLogMove(LOG_LEVEL_INFO, concat(F("WiFi : Scan finished (ESP8266), found: "), scanCount)); - } -*/ -#endif + + // WiFiEventData.processedScanDone = true; +# ifndef BUILD_NO_DEBUG + + /* + if (loglevelActiveFor(LOG_LEVEL_INFO)) { + addLogMove(LOG_LEVEL_INFO, concat(F("WiFi : Scan finished (ESP8266), found: "), scanCount)); + } + */ +# endif // ifndef BUILD_NO_DEBUG WiFi_AP_Candidates.load_knownCredentials(); + if (WiFi_AP_Candidates.addedKnownCandidate() || !NetworkConnected()) { WiFiEventData.wifiConnectAttemptNeeded = true; - # ifndef BUILD_NO_DEBUG + # ifndef BUILD_NO_DEBUG + if (WiFi_AP_Candidates.addedKnownCandidate()) { - //addLog(LOG_LEVEL_INFO, F("WiFi : Added known candidate, try to connect")); + // addLog(LOG_LEVEL_INFO, F("WiFi : Added known candidate, try to connect")); } - #endif + # endif // ifndef BUILD_NO_DEBUG NetworkConnectRelaxed(); } } WiFiMode_t mode = WiFi.getMode(); - setWifiMode(WIFI_OFF); + ESPEasy::net::wifi::setWifiMode(WIFI_OFF); delay(1); - setWifiMode(mode); + ESPEasy::net::wifi::setWifiMode(mode); delay(1); } -#endif +# endif // if FEATURE_ESP8266_DIRECT_WIFI_SCAN -#endif +# endif // ifdef ESP8266 +#endif // if FEATURE_WIFI diff --git a/src/src/ESPEasyCore/ESPEasyWiFiEvent_ESP8266.h b/src/src/ESPEasyCore/ESPEasyWiFiEvent_ESP8266.h index aed20ebb8..d0ff23a37 100644 --- a/src/src/ESPEasyCore/ESPEasyWiFiEvent_ESP8266.h +++ b/src/src/ESPEasyCore/ESPEasyWiFiEvent_ESP8266.h @@ -4,9 +4,11 @@ #ifdef ESP8266 -#include "../../ESPEasy_common.h" +# include "../../ESPEasy_common.h" -#include +# if FEATURE_WIFI + +# include // ******************************************************************************** @@ -14,9 +16,11 @@ // See reported issue: https://github.com/esp8266/Arduino/issues/4114 // ******************************************************************************** -#include -#include -class WiFi_Access_Static_IP : public ESP8266WiFiSTAClass { +# include +# include + +class WiFi_Access_Static_IP : public ESP8266WiFiSTAClass +{ public: void set_use_static_ip(bool enabled); @@ -43,10 +47,12 @@ void onDisconnectedAPmode(const WiFiEventSoftAPModeStationDisconnected& event); void onStationModeAuthModeChanged(const WiFiEventStationModeAuthModeChanged& event); -#if FEATURE_ESP8266_DIRECT_WIFI_SCAN -void onWiFiScanDone(void *arg, STATUS status); -#endif +# if FEATURE_ESP8266_DIRECT_WIFI_SCAN +void onWiFiScanDone(void *arg, + STATUS status); +# endif // if FEATURE_ESP8266_DIRECT_WIFI_SCAN -#endif +# endif // if FEATURE_WIFI -#endif \ No newline at end of file +#endif // ifdef ESP8266 +#endif // ifndef ESPEASY_WIFI_EVENT_ESP8266_H diff --git a/src/src/ESPEasyCore/ESPEasyWiFi_state_machine.cpp b/src/src/ESPEasyCore/ESPEasyWiFi_state_machine.cpp new file mode 100644 index 000000000..5cec46c7b --- /dev/null +++ b/src/src/ESPEasyCore/ESPEasyWiFi_state_machine.cpp @@ -0,0 +1,288 @@ +#include "../ESPEasyCore/ESPEasyWiFi_state_machine.h" + +#if FEATURE_WIFI + +# include "../ESPEasyCore/ESPEasyWifi.h" +# include "../ESPEasyCore/ESPEasyWifi_abstracted.h" + + +#include "../ESPEasyCore/ESPEasyNetwork.h" // for setNetworkMedium, however this should not be part of the WiFi code + + +# include "../Globals/ESPEasyWiFiEvent.h" +# include "../Globals/RTC.h" +# include "../Globals/Settings.h" +# include "../Globals/WiFi_AP_Candidates.h" + +# include "../Helpers/StringConverter.h" + +namespace ESPEasy { +namespace net { +namespace wifi { + + # define WIFI_STATE_MACHINE_STA_CONNECTING_TIMEOUT 20000 + # define WIFI_STATE_MACHINE_STA_AP_SCANNING_TIMEOUT 20000 + # define WIFI_STATE_MACHINE_STA_SCANNING_TIMEOUT 10000 + +void ESPEasyWiFi_t::setup() { + // TODO TD-er: Must maybe also call 'disable()' first? + + // TODO TD-er: Load settings + + // TODO TD-er: Check if settings have changed. + + if (_disabledAtBoot) { + disable(); + return; + } + + WiFi_pre_setup(); + begin(); +} + +void ESPEasyWiFi_t::enable() {} + +void ESPEasyWiFi_t::disable() {} + +void ESPEasyWiFi_t::begin() {} + +void ESPEasyWiFi_t::loop() +{ + if (_state != WiFiState_e::IdleWaiting) { + if (_callbackError || (_state_timeout.isSet() && _state_timeout.timeReached())) + { + // TODO TD-er: Must check what error was given??? + _callbackError = false; + setState(WiFiState_e::OFF); + } + } + + switch (_state) + { + case WiFiState_e::Disabled: + // Do nothing here, as the device is disabled. + break; + case WiFiState_e::OFF: + begin(); + setState(WiFiState_e::IdleWaiting, 100); + break; + case WiFiState_e::AP_only: + break; + case WiFiState_e::IdleWaiting: + + // Wait for timeout to expire + if (_state_timeout.timeReached()) { + // Do we have candidate to connect to ? + if (WiFi_AP_Candidates.hasCandidates()) { + setState(WiFiState_e::STA_Connecting, WIFI_STATE_MACHINE_STA_CONNECTING_TIMEOUT); + } else if (WifiIsAP(WiFi.getMode())) { + // TODO TD-er: Must check if any client is connected. + // If not, then we can disable AP mode and switch to WiFiState_e::STA_Scanning + setState(WiFiState_e::STA_AP_Scanning, WIFI_STATE_MACHINE_STA_AP_SCANNING_TIMEOUT); + } else { + setState(WiFiState_e::STA_Scanning, WIFI_STATE_MACHINE_STA_SCANNING_TIMEOUT); + } + } + break; + case WiFiState_e::STA_Scanning: + case WiFiState_e::STA_AP_Scanning: + // Check if scanning is finished + // When scanning per channel, call for scanning next channel + break; + case WiFiState_e::STA_Connecting: + case WiFiState_e::STA_Reconnecting: + + // Check if (re)connecting has finished + if (getSTA_connected_state() != STA_connected_state::Connecting) { + if (getSTA_connected_state() == STA_connected_state::Connected) { + setState(WiFiState_e::STA_Connected); + } else { + if (_state == WiFiState_e::STA_Connecting) { + setState(WiFiState_e::STA_Reconnecting, WIFI_STATE_MACHINE_STA_CONNECTING_TIMEOUT); + } else { + setState(WiFiState_e::OFF); + } + } + } + break; + case WiFiState_e::STA_Connected: + + // Check if still connected + if (getSTA_connected_state() != STA_connected_state::Connected) { + setState(WiFiState_e::OFF); + } else { + // Else mark last timestamp seen as connected + _last_seen_connected.setNow(); + } + break; + } + + + { + // Check if we need to start AP + // Flag captive portal in webserver and/or whether we might be in setup mode + } + +# ifdef USE_IMPROV + { + // Check for Improv mode. + } +# endif // ifdef USE_IMPROV +} + +IPAddress ESPEasyWiFi_t::getIP() const +{ + IPAddress res; + + return res; +} + +void ESPEasyWiFi_t::disconnect() {} + +void ESPEasyWiFi_t::setState(WiFiState_e newState, uint32_t timeout) { + switch (newState) + { + case WiFiState_e::Disabled: + // Do nothing here, as the device is disabled. + break; + case WiFiState_e::OFF: + // TODO TD-er: Must cancel all and turn off WiFi. + break; + case WiFiState_e::AP_only: + break; + case WiFiState_e::IdleWaiting: + // Do nothing here as we're waiting till the timeout is over + break; + case WiFiState_e::STA_Scanning: + // Start scanning + break; + case WiFiState_e::STA_AP_Scanning: + // Start scanning per channel + break; + case WiFiState_e::STA_Connecting: + case WiFiState_e::STA_Reconnecting: + // Start connecting + connectSTA(); + break; + case WiFiState_e::STA_Connected: + _last_seen_connected.setNow(); + break; + } + + if (timeout == 0) + { + _state_timeout.clear(); + + } else { + _state_timeout.setMillisFromNow(timeout); + } + _last_state_change.setNow(); + _state = newState; +} + +void ESPEasyWiFi_t::checkConnectProgress() {} + +void ESPEasyWiFi_t::startScanning() +{ + _state = WiFiState_e::STA_Scanning; + WifiScan(true); + _last_state_change.setNow(); +} + +bool ESPEasyWiFi_t::connectSTA() +{ + if (!WiFi_AP_Candidates.hasCandidateCredentials()) + { + if (!WiFiEventData.warnedNoValidWiFiSettings) + { + addLog(LOG_LEVEL_ERROR, F("WIFI : No valid wifi settings")); + WiFiEventData.warnedNoValidWiFiSettings = true; + } + WiFiEventData.last_wifi_connect_attempt_moment.clear(); + WiFiEventData.wifi_connect_attempt = 1; + WiFiEventData.wifiConnectAttemptNeeded = false; + + // No need to wait longer to start AP mode. + if (!Settings.DoNotStartAP()) + { + setAP(true); + } + return false; + } + WiFiEventData.warnedNoValidWiFiSettings = false; + setSTA(true); +# if defined(ESP8266) + wifi_station_set_hostname(NetworkCreateRFCCompliantHostname().c_str()); + +# endif // if defined(ESP8266) +# if defined(ESP32) + WiFi.config(INADDR_NONE, INADDR_NONE, INADDR_NONE); +# endif // if defined(ESP32) + setConnectionSpeed(); + setupStaticIPconfig(); + + // Start the process of connecting or starting AP + if (!WiFi_AP_Candidates.getNext(true)) + { + return false; + } + + const WiFi_AP_Candidate candidate = WiFi_AP_Candidates.getCurrent(); + + if (loglevelActiveFor(LOG_LEVEL_INFO)) { + addLogMove(LOG_LEVEL_INFO, strformat( + F("WIFI : Connecting %s attempt #%u"), + candidate.toString().c_str(), + _connect_attempt)); + } + WiFiEventData.markWiFiBegin(); + if (prepareWiFi()) { + setNetworkMedium(NetworkMedium_t::WIFI); + RTC.clearLastWiFi(); + RTC.lastWiFiSettingsIndex = candidate.index; + + float tx_pwr = 0; // Will be set higher based on RSSI when needed. + // FIXME TD-er: Must check WiFiEventData.wifi_connect_attempt to increase TX power +#if FEATURE_SET_WIFI_TX_PWR + if (Settings.UseMaxTXpowerForSending()) { + tx_pwr = Settings.getWiFi_TX_power(); + } + SetWiFiTXpower(tx_pwr, candidate.rssi); +#endif + // Start connect attempt now, so no longer needed to attempt new connection. + WiFiEventData.wifiConnectAttemptNeeded = false; + WiFiEventData.wifiConnectInProgress = true; + const String key = WiFi_AP_CandidatesList::get_key(candidate.index); + +#if FEATURE_USE_IPV6 + if (Settings.EnableIPv6()) { + WiFi.enableIPv6(true); + } +#endif + +#ifdef ESP32 + if (Settings.IncludeHiddenSSID()) { + setWiFiCountryPolicyManual(); + } +#endif + + + if ((Settings.HiddenSSID_SlowConnectPerBSSID() || !candidate.bits.isHidden) + && candidate.allowQuickConnect()) { + WiFi.begin(candidate.ssid.c_str(), key.c_str(), candidate.channel, candidate.bssid.mac); + } else { + WiFi.begin(candidate.ssid.c_str(), key.c_str()); + } + // Always wait for a second + WiFi.waitForConnectResult(1000); // https://github.com/arendst/Tasmota/issues/14985 + + } + + return true; +} + +} // namespace wifi +} // namespace net +} // namespace ESPEasy + +#endif // if FEATURE_WIFI diff --git a/src/src/ESPEasyCore/ESPEasyWiFi_state_machine.h b/src/src/ESPEasyCore/ESPEasyWiFi_state_machine.h new file mode 100644 index 000000000..9ae2f044e --- /dev/null +++ b/src/src/ESPEasyCore/ESPEasyWiFi_state_machine.h @@ -0,0 +1,128 @@ +#pragma once + +#include "../../ESPEasy_common.h" + +#if FEATURE_WIFI + +# include "../DataStructs/WiFi_AP_Candidate.h" +# include "../Helpers/LongTermTimer.h" + +# include "../DataTypes/WiFi_STA_connected_state.h" +# include "../DataTypes/WiFi_State.h" + + +# include + + +namespace ESPEasy { +namespace net { +namespace wifi { + +class ESPEasyWiFi_t +{ +public: + + // Called after settings have changed or at boot + void setup(); + + // Start the process of connecting or start AP, depending on the existing configuration. + void enable(); + + // Terminate WiFi activity + void disable(); + +private: + void begin(); + +public: + + // Process the state machine for managing WiFi connection + void loop(); + + WiFiState_e getState() const + { + return _state; + } + + // Get the IP-address in this order: + // - STA interface if connected, + // - AP interface if active + // - 0.0.0.0 if neither connected nor active. + IPAddress getIP() const; + + void disconnect(); + +private: + + void setState(WiFiState_e newState, uint32_t timeout = 0); + + // Handle timeouts + start of AP mode + void checkConnectProgress(); + + // Check to see if we already have some AP to connect to. + void checkScanningProgress(); + + void startScanning(); + + bool connectSTA(); + + + STA_connected_state getSTA_connected_state(); + + WiFi_AP_Candidate _active_sta; + WiFi_AP_Candidate _AP_conf; + + String _last_ssid; + MAC_address _last_bssid; + uint8_t _last_channel = 0; + WiFiState_e _state = WiFiState_e::Disabled; + + LongTermTimer _last_state_change; + LongTermTimer _state_timeout; + LongTermTimer _last_seen_connected; + LongTermTimer _AP_start_timestamp; + + uint32_t _connect_attempt = 0; + + + uint32_t _nrReconnects = 0; + + bool _callbackError = false; + + // Special modes for initial setup or re-configuration of a node via serial port/IMPROV + bool _improvActive = false; + bool _setupActive = false; + + +// WiFi settings => Move to separate class/struct +bool _disabledAtBoot = false; +bool _passiveScan = false; +bool _includeHiddenSSID = false; +float _TX_power = -1; + +// Manual IP settings +// IP +// Gateway +// Subnet +// DNS + + + +// soft AP configuration => TODO TD-er: Implement +// bool _must_Start_AP; // "Do Not Start AP" +// bool _has_ap{false}; // Maybe just check for active mode? +// WiFiAP _ap_config; +// WPA AP mode key +// Don't force /setup in AP-Mode + + + + + + +}; // class ESPEasyWiFi_t + +} // namespace wifi +} // namespace net +} // namespace ESPEasy +#endif // if FEATURE_WIFI diff --git a/src/src/ESPEasyCore/ESPEasyWiFi_state_machine_ESP32.cpp b/src/src/ESPEasyCore/ESPEasyWiFi_state_machine_ESP32.cpp new file mode 100644 index 000000000..96c546ef0 --- /dev/null +++ b/src/src/ESPEasyCore/ESPEasyWiFi_state_machine_ESP32.cpp @@ -0,0 +1,61 @@ +#include "../ESPEasyCore/ESPEasyWiFi_state_machine.h" + +#ifdef ESP32 +# if FEATURE_WIFI + +# include +# include // Needed to call ESP-IDF functions like esp_wifi_.... + +# include + +# include +# include + +# include "../ESPEasyCore/ESPEasyWifi_abstracted.h" + + +namespace ESPEasy { +namespace net { +namespace wifi { + +STA_connected_state ESPEasyWiFi_t::getSTA_connected_state() +{ + switch (WiFi.status()) + { + case WL_CONNECTED: + return STA_connected_state::Connected; + + case WL_NO_SSID_AVAIL: + return STA_connected_state::Error_Not_Found; + + case WL_CONNECT_FAILED: + case WL_CONNECTION_LOST: + return STA_connected_state::Error_Connect_Failed; + + case WL_IDLE_STATUS: + return STA_connected_state::Idle; + + + case WL_NO_SHIELD: + case WL_STOPPED: + case WL_SCAN_COMPLETED: + case WL_DISCONNECTED: + // TODO: what to do here? Do we need an extra connected state? + break; + } + + // TODO: Keep track of whether connection is in progress + // The status() function does not return a reply stating "connecting" + + /* if (_sta_connecting) { + return STA_connected_state::Connecting; + } + */ + return STA_connected_state::Idle; +} + +} // namespace wifi +} // namespace net +} // namespace ESPEasy +# endif // if FEATURE_WIFI +#endif // ifdef ESP32 diff --git a/src/src/ESPEasyCore/ESPEasyWiFi_state_machine_ESP8266.cpp b/src/src/ESPEasyCore/ESPEasyWiFi_state_machine_ESP8266.cpp new file mode 100644 index 000000000..0cc60ec33 --- /dev/null +++ b/src/src/ESPEasyCore/ESPEasyWiFi_state_machine_ESP8266.cpp @@ -0,0 +1,42 @@ +#include "../ESPEasyCore/ESPEasyWiFi_state_machine.h" + +#ifdef ESP8266 +# if FEATURE_WIFI + +#include "../ESPEasyCore/ESPEasyWifi_abstracted.h" + +namespace ESPEasy { +namespace net { +namespace wifi { + + +STA_connected_state ESPEasyWiFi_t::getSTA_connected_state() +{ + // Perform check on SDK function, see: https://github.com/esp8266/Arduino/issues/7432 + station_status_t status = wifi_station_get_connect_status(); + + switch (status) + { + case STATION_GOT_IP: + return STA_connected_state::Connected; + case STATION_NO_AP_FOUND: + return STA_connected_state::Error_Not_Found; + case STATION_CONNECT_FAIL: + case STATION_WRONG_PASSWORD: + return STA_connected_state::Error_Connect_Failed; + case STATION_CONNECTING: + return STA_connected_state::Connecting; + case STATION_IDLE: + break; + + default: + break; + } + return STA_connected_state::Idle; +} + +} // namespace wifi +} // namespace net +} // namespace ESPEasy +# endif // if FEATURE_WIFI +#endif // ifdef ESP8266 diff --git a/src/src/ESPEasyCore/ESPEasyWifi.cpp b/src/src/ESPEasyCore/ESPEasyWifi.cpp index 9410b0d28..72f38eab2 100644 --- a/src/src/ESPEasyCore/ESPEasyWifi.cpp +++ b/src/src/ESPEasyCore/ESPEasyWifi.cpp @@ -1,5 +1,7 @@ #include "../ESPEasyCore/ESPEasyWifi.h" +#if FEATURE_WIFI + #include "../../ESPEasy-Globals.h" #include "../DataStructs/TimingStats.h" #include "../ESPEasyCore/ESPEasyNetwork.h" @@ -35,129 +37,6 @@ #include #endif -// FIXME TD-er: Cleanup of WiFi code -#ifdef ESPEASY_WIFI_CLEANUP_WORK_IN_PROGRESS -bool ESPEasyWiFi_t::begin() { - return true; -} - -void ESPEasyWiFi_t::end() { - - -} - - -void ESPEasyWiFi_t::loop() { - switch (_state) { - case WiFiState_e::OFF: - break; - case WiFiState_e::AP_only: - break; - case WiFiState_e::ErrorRecovery: - // Wait for timeout to expire - // Start again from scratch - break; - case WiFiState_e::STA_Scanning: - case WiFiState_e::STA_AP_Scanning: - // Check if scanning is finished - // When scanning per channel, call for scanning next channel - break; - case WiFiState_e::STA_Connecting: - case WiFiState_e::STA_Reconnecting: - // Check if (re)connecting has finished - break; - case WiFiState_e::STA_Connected: - // Check if still connected - // Reconnect if not. - // Else mark last timestamp seen as connected - break; - } - - - { - // Check if we need to start AP - // Flag captive portal in webserver and/or whether we might be in setup mode - } - -#ifdef USE_IMPROV - { - // Check for Improv mode. - } -#endif - - -} - - -IPAddress ESPEasyWiFi_t::getIP() const { - - IPAddress res; - - - return res; -} - -void ESPEasyWiFi_t::disconnect() { - -} - - -void ESPEasyWiFi_t::checkConnectProgress() { - -} - -void ESPEasyWiFi_t::startScanning() { - _state = WiFiState_e::STA_Scanning; - WifiScan(true); - _last_state_change.setNow(); -} - - -bool ESPEasyWiFi_t::connectSTA() { - if (!WiFi_AP_Candidates.hasCandidateCredentials()) { - if (!WiFiEventData.warnedNoValidWiFiSettings) { - addLog(LOG_LEVEL_ERROR, F("WIFI : No valid wifi settings")); - WiFiEventData.warnedNoValidWiFiSettings = true; - } - WiFiEventData.last_wifi_connect_attempt_moment.clear(); - WiFiEventData.wifi_connect_attempt = 1; - WiFiEventData.wifiConnectAttemptNeeded = false; - - // No need to wait longer to start AP mode. - if (!Settings.DoNotStartAP()) { - setAP(true); - } - return false; - } - WiFiEventData.warnedNoValidWiFiSettings = false; - setSTA(true); - #if defined(ESP8266) - wifi_station_set_hostname(NetworkCreateRFCCompliantHostname().c_str()); - - #endif // if defined(ESP8266) - #if defined(ESP32) - WiFi.config(INADDR_NONE, INADDR_NONE, INADDR_NONE); - #endif // if defined(ESP32) - setConnectionSpeed(); - setupStaticIPconfig(); - - - - // Start the process of connecting or starting AP - if (WiFi_AP_Candidates.getNext(true)) { - // Try to connect to AP - - } else { - // No (known) AP, start scanning - startScanning(); - } - - - return true; -} - -#endif // ESPEASY_WIFI_CLEANUP_WORK_IN_PROGRESS - // ******************************************************************************** // WiFi state @@ -239,7 +118,7 @@ bool WiFiConnected() { } #endif - if (!WifiIsSTA(WiFi.getMode())) { + if (! ESPEasy::net::wifi::WifiIsSTA(WiFi.getMode())) { lastState = false; return lastState; } @@ -265,7 +144,7 @@ bool WiFiConnected() { if (WiFiEventData.unprocessedWifiEvents()) { return false; } - bool wifi_isconnected = ESPEasy_WiFi_abstraction::WiFiConnected(); + bool wifi_isconnected = ESPEasy::net::wifi::WiFiConnected(); if (recursiveCall) return wifi_isconnected; recursiveCall = true; @@ -307,12 +186,12 @@ bool WiFiConnected() { if (WiFiEventData.timerAPoff.isSet() && !WiFiEventData.timerAPoff.timeReached()) { if (!Settings.DoNotStartAP()) { // Timer reached, so enable AP mode. - if (!WifiIsAP(WiFi.getMode())) { + if (! ESPEasy::net::wifi::WifiIsAP(WiFi.getMode())) { if (!WiFiEventData.wifiConnectAttemptNeeded) { addLog(LOG_LEVEL_INFO, F("WiFi : WiFiConnected(), start AP")); WifiScan(false); - setSTA(false); // Force reset WiFi + reduce power consumption - setAP(true); + ESPEasy::net::wifi::setSTA(false); // Force reset WiFi + reduce power consumption + ESPEasy::net::wifi::setAP(true); } } } @@ -324,7 +203,7 @@ bool WiFiConnected() { // When made this far in the code, we apparently do not have valid WiFi connection. - if (!WiFiEventData.timerAPstart.isSet() && !WifiIsAP(WiFi.getMode())) { + if (!WiFiEventData.timerAPstart.isSet() && ! ESPEasy::net::wifi::WifiIsAP(WiFi.getMode())) { // First run we do not have WiFi connection any more, set timer to start AP mode // Only allow the automatic AP mode in the first N minutes after boot. if (getUptimeMinutes() < WIFI_ALLOW_AP_AFTERBOOT_PERIOD) { @@ -455,9 +334,9 @@ void AttemptWiFiConnect() { if (WiFiEventData.unprocessedWifiEvents()) { return; } - setSTA(false); + ESPEasy::net::wifi::setSTA(false); - setSTA(true); + ESPEasy::net::wifi::setSTA(true); if (WiFi_AP_Candidates.getNext(WiFiScanAllowed())) { const WiFi_AP_Candidate candidate = WiFi_AP_Candidates.getCurrent(); @@ -549,7 +428,7 @@ void AttemptWiFiConnect() { // Set Wifi config // ******************************************************************************** bool prepareWiFi() { - ESPEasy_WiFi_abstraction::registerWiFiEventHandler(); + ESPEasy::net::wifi::registerWiFiEventHandler(); if (!WiFi_AP_Candidates.hasCandidateCredentials()) { if (!WiFiEventData.warnedNoValidWiFiSettings) { @@ -563,12 +442,12 @@ bool prepareWiFi() { // No need to wait longer to start AP mode. if (!Settings.DoNotStartAP()) { WifiScan(false); -// setAP(true); +// ESPEasy::net::wifi::setAP(true); } return false; } WiFiEventData.warnedNoValidWiFiSettings = false; - setSTA(true); + ESPEasy::net::wifi::setSTA(true); #if defined(ESP8266) wifi_station_set_hostname(NetworkCreateRFCCompliantHostname().c_str()); @@ -577,7 +456,7 @@ bool prepareWiFi() { #if defined(ESP32) WiFi.config(INADDR_NONE, INADDR_NONE, INADDR_NONE); #endif // if defined(ESP32) - setConnectionSpeed(); + ESPEasy::net::wifi::setConnectionSpeed(); setupStaticIPconfig(); WiFiEventData.wifiConnectAttemptNeeded = true; @@ -653,7 +532,7 @@ void resetWiFi() { // Send this log only after WifiDisconnect() or else sending to syslog may cause issues addLog(LOG_LEVEL_INFO, F("Reset WiFi.")); - // setWifiMode(WIFI_OFF); + // ESPEasy::net::wifi::setWifiMode(WIFI_OFF); initWiFi(); } @@ -670,7 +549,7 @@ void initWiFi() // WiFi = ESP8266WiFiClass(); #endif // ifdef ESP8266 #ifdef ESP32 - ESPEasy_WiFi_abstraction::removeWiFiEventHandler(); + ESPEasy::net::wifi::removeWiFiEventHandler(); #endif @@ -680,12 +559,12 @@ void initWiFi() WiFi.disconnect(false); delay(1); if (active_network_medium != NetworkMedium_t::NotSet) { - setSTA(true); + ESPEasy::net::wifi::setSTA(true); WifiScan(false); } - setWifiMode(WIFI_OFF); + ESPEasy::net::wifi::setWifiMode(WIFI_OFF); - ESPEasy_WiFi_abstraction::registerWiFiEventHandler(); + ESPEasy::net::wifi::registerWiFiEventHandler(); delay(100); } @@ -741,7 +620,7 @@ void SetWiFiTXpower(float dBm, float rssi) { dBm = minTXpwr; } -ESPEasy_WiFi_abstraction::SetWiFiTXpower(dBm); +ESPEasy::net::wifi::SetWiFiTXpower(dBm); if (WiFiEventData.wifi_TX_pwr < dBm) { // Will increase the TX power, give power supply of the unit some rest @@ -779,7 +658,7 @@ ESPEasy_WiFi_abstraction::SetWiFiTXpower(dBm); float GetRSSIthreshold(float& maxTXpwr) { maxTXpwr = Settings.getWiFi_TX_power(); - return ESPEasy_WiFi_abstraction::GetRSSIthreshold(maxTXpwr); + return ESPEasy::net::wifi::GetRSSIthreshold(maxTXpwr); } int GetRSSI_quality() { @@ -793,7 +672,7 @@ int GetRSSI_quality() { } WiFiConnectionProtocol getConnectionProtocol() { - return ESPEasy_WiFi_abstraction::getConnectionProtocol(); + return ESPEasy::net::wifi::getConnectionProtocol(); } #ifdef ESP32 @@ -824,7 +703,7 @@ void WifiDisconnect() # ifndef BUILD_NO_DEBUG addLog(LOG_LEVEL_INFO, F("WiFi : WifiDisconnect()")); #endif - ESPEasy_WiFi_abstraction::WiFiDisconnect(); + ESPEasy::net::wifi::WiFiDisconnect(); WiFiEventData.setWiFiDisconnected(); WiFiEventData.markDisconnect(WIFI_DISCONNECT_REASON_UNSPECIFIED); /* @@ -918,7 +797,7 @@ bool WiFiScanAllowed() { void WifiScan(bool async, uint8_t channel) { - setSTA(true); + ESPEasy::net::wifi::setSTA(true); if (!WiFiScanAllowed()) { return; } @@ -1043,7 +922,7 @@ void WiFiScan_log_to_serial() if (WiFi_AP_Candidates.scanComplete() <= 0) { WiFiMode_t cur_wifimode = WiFi.getMode(); WifiScan(false); - setWifiMode(cur_wifimode); + ESPEasy::net::wifi::setWifiMode(cur_wifimode); } const int8_t scanCompleteStatus = WiFi_AP_Candidates.scanComplete(); @@ -1072,61 +951,10 @@ void WiFiScan_log_to_serial() serialPrintln(""); } -// ******************************************************************************** -// Manage Wifi Modes -// ******************************************************************************** -void setSTA(bool enable) { - switch (WiFi.getMode()) { - case WIFI_OFF: - if (enable) { setWifiMode(WIFI_STA); } - break; - case WIFI_STA: - - if (!enable) { setWifiMode(WIFI_OFF); } - break; - case WIFI_AP: - - if (enable) { setWifiMode(WIFI_AP_STA); } - break; - case WIFI_AP_STA: - - if (!enable) { setWifiMode(WIFI_AP); } - break; - default: - break; - } -} - -void setAP(bool enable) { - WiFiMode_t wifimode = WiFi.getMode(); - - switch (wifimode) { - case WIFI_OFF: - - if (enable) { - setWifiMode(WIFI_AP); - } - break; - case WIFI_STA: - - if (enable) { setWifiMode(WIFI_AP_STA); } - break; - case WIFI_AP: - - if (!enable) { setWifiMode(WIFI_OFF); } - break; - case WIFI_AP_STA: - - if (!enable) { setWifiMode(WIFI_STA); } - break; - default: - break; - } -} // Only internal scope -void setAPinternal(bool enable) +void setAPinternal(bool enable) { if (enable) { // create and store unique AP SSID/PW to prevent ESP from starting AP mode with default SSID and No password! @@ -1146,7 +974,7 @@ void setAPinternal(bool enable) } int channel = 1; - if (WifiIsSTA(WiFi.getMode()) && WiFiConnected()) { + if ( ESPEasy::net::wifi::WifiIsSTA(WiFi.getMode()) && WiFiConnected()) { channel = WiFi.channel(); } @@ -1188,136 +1016,8 @@ void setAPinternal(bool enable) } } -const __FlashStringHelper * getWifiModeString(WiFiMode_t wifimode) -{ - switch (wifimode) { - case WIFI_OFF: return F("OFF"); - case WIFI_STA: return F("STA"); - case WIFI_AP: return F("AP"); - case WIFI_AP_STA: return F("AP+STA"); - default: - break; - } - return F("Unknown"); -} - -void setWifiMode(WiFiMode_t new_mode) { - const WiFiMode_t cur_mode = WiFi.getMode(); - static WiFiMode_t processing_wifi_mode = cur_mode; - if (cur_mode == new_mode) { - return; - } - if (processing_wifi_mode == new_mode) { - // Prevent loops - return; - } - processing_wifi_mode = new_mode; - - if (cur_mode == WIFI_OFF) { - #if defined(ESP32) - // Needs to be set while WiFi is off - WiFi.hostname(NetworkCreateRFCCompliantHostname()); - #endif - WiFiEventData.markWiFiTurnOn(); - } - if (new_mode != WIFI_OFF) { - #ifdef ESP8266 - // See: https://github.com/esp8266/Arduino/issues/6172#issuecomment-500457407 - WiFi.forceSleepWake(); // Make sure WiFi is really active. - #endif - delay(100); - } else { - WifiDisconnect(); -// delay(100); - processDisconnect(); - WiFiEventData.clear_processed_flags(); - } - - addLog(LOG_LEVEL_INFO, concat(F("WIFI : Set WiFi to "), getWifiModeString(new_mode))); - - int retry = 2; - while (!WiFi.mode(new_mode) && retry > 0) { - addLog(LOG_LEVEL_INFO, F("WIFI : Cannot set mode!!!!!")); - delay(100); - --retry; - } - retry = 2; - while (WiFi.getMode() != new_mode && retry > 0) { - addLog(LOG_LEVEL_INFO, F("WIFI : mode not yet set")); - delay(100); - --retry; - } - if (new_mode == WIFI_OFF) { - - // FIXME TD-er: Is this correct to mark Turn ON ???? - WiFiEventData.markWiFiTurnOn(); - #if defined(ESP32) - // Needs to be set while WiFi is off - WiFi.hostname(NetworkCreateRFCCompliantHostname()); - #endif - delay(100); - #if defined(ESP32) - esp_wifi_set_ps(WIFI_PS_NONE); -// esp_wifi_set_ps(WIFI_PS_MAX_MODEM); - #endif - #ifdef ESP8266 - WiFi.forceSleepBegin(); - #endif // ifdef ESP8266 - delay(1); - } else { - if (cur_mode == WIFI_OFF) { - ESPEasy_WiFi_abstraction::registerWiFiEventHandler(); - } - // Only set power mode when AP is not enabled - // When AP is enabled, the sleep mode is already set to WIFI_NONE_SLEEP - if (!WifiIsAP(new_mode)) { - if (Settings.WifiNoneSleep()) { - ESPEasy_WiFi_abstraction::setWiFiNoneSleep(); - } else if (Settings.EcoPowerMode()) { - ESPEasy_WiFi_abstraction::setWiFiEcoPowerMode(); - } else { - // Default - ESPEasy_WiFi_abstraction::setWiFiDefaultPowerMode(); - } - } -#if FEATURE_SET_WIFI_TX_PWR - SetWiFiTXpower(); -#endif - if (WifiIsSTA(new_mode)) { -// WiFi.setAutoConnect(Settings.SDK_WiFi_autoreconnect()); - WiFi.setAutoReconnect(Settings.SDK_WiFi_autoreconnect()); - } - delay(100); // Must allow for some time to init. - } - const bool new_mode_AP_enabled = WifiIsAP(new_mode); - - if (WifiIsAP(cur_mode) && !new_mode_AP_enabled) { - eventQueue.add(F("WiFi#APmodeDisabled")); - } - - if (WifiIsAP(cur_mode) != new_mode_AP_enabled) { - // Mode has changed - setAPinternal(new_mode_AP_enabled); - } - #if FEATURE_MDNS - #ifdef ESP8266 - // notifyAPChange() is not present in the ESP32 MDNSResponder - MDNS.notifyAPChange(); - #endif - #endif -} - -bool WifiIsAP(WiFiMode_t wifimode) -{ - return ESPEasy_WiFi_abstraction::WifiIsAP(wifimode); -} - -bool WifiIsSTA(WiFiMode_t wifimode) -{ - return ESPEasy_WiFi_abstraction::WifiIsSTA(wifimode); -} bool WiFiUseStaticIP() { return Settings.IP[0] != 0 && Settings.IP[0] != 255; @@ -1325,7 +1025,7 @@ bool WiFiUseStaticIP() { bool wifiAPmodeActivelyUsed() { - if (!WifiIsAP(WiFi.getMode()) || (!WiFiEventData.timerAPoff.isSet())) { + if (! ESPEasy::net::wifi::WifiIsAP(WiFi.getMode()) || (!WiFiEventData.timerAPoff.isSet())) { // AP not active or soon to be disabled in processDisableAPmode() return false; } @@ -1335,10 +1035,6 @@ bool wifiAPmodeActivelyUsed() // reconnect? } -void setConnectionSpeed() { - ESPEasy_WiFi_abstraction::setConnectionSpeed(Settings.ForceWiFi_bg_mode()); -} - void setupStaticIPconfig() { setUseStaticIP(WiFiUseStaticIP()); @@ -1443,3 +1139,5 @@ void logConnectionStatus() { */ #endif // ifndef BUILD_NO_DEBUG } + +#endif \ No newline at end of file diff --git a/src/src/ESPEasyCore/ESPEasyWifi.h b/src/src/ESPEasyCore/ESPEasyWifi.h index 393c335d1..d30d9c4e5 100644 --- a/src/src/ESPEasyCore/ESPEasyWifi.h +++ b/src/src/ESPEasyCore/ESPEasyWifi.h @@ -3,106 +3,36 @@ #include "../../ESPEasy_common.h" -#if defined(ESP8266) - # include -#endif // if defined(ESP8266) -#if defined(ESP32) - # include -#endif // if defined(ESP32) +#if FEATURE_WIFI -#include "../DataTypes/WiFiConnectionProtocol.h" -#include "../DataStructs/WiFi_AP_Candidate.h" +# if defined(ESP8266) + # include +# endif // if defined(ESP8266) +# if defined(ESP32) + # include +# endif // if defined(ESP32) -#include "../Helpers/LongTermTimer.h" +# include "../DataTypes/WiFiConnectionProtocol.h" +# include "../DataStructs/WiFi_AP_Candidate.h" -#define WIFI_RECONNECT_WAIT 30000 // in milliSeconds -#define WIFI_AP_OFF_TIMER_DURATION 300000 // in milliSeconds -#if FEATURE_CUSTOM_PROVISIONING -#define WIFI_CONNECTION_CONSIDERED_STABLE 60000 // in milliSeconds -#else -#define WIFI_CONNECTION_CONSIDERED_STABLE 60000 // in milliSeconds -#endif -#define WIFI_ALLOW_AP_AFTERBOOT_PERIOD 5 // in minutes -#define WIFI_SCAN_INTERVAL_AP_USED 125000 // in milliSeconds -#define WIFI_SCAN_INTERVAL_MINIMAL 60000 // in milliSeconds +# include "../Helpers/LongTermTimer.h" + +# define WIFI_RECONNECT_WAIT 30000 // in milliSeconds +# define WIFI_AP_OFF_TIMER_DURATION 300000 // in milliSeconds +# if FEATURE_CUSTOM_PROVISIONING +# define WIFI_CONNECTION_CONSIDERED_STABLE 60000 // in milliSeconds +# else +# define WIFI_CONNECTION_CONSIDERED_STABLE 60000 // in milliSeconds +# endif // if FEATURE_CUSTOM_PROVISIONING +# define WIFI_ALLOW_AP_AFTERBOOT_PERIOD 5 // in minutes +# define WIFI_SCAN_INTERVAL_AP_USED 125000 // in milliSeconds +# define WIFI_SCAN_INTERVAL_MINIMAL 60000 // in milliSeconds -#ifdef ESPEASY_WIFI_CLEANUP_WORK_IN_PROGRESS - -enum class WiFiState_e { - // WiFi radio off - OFF, - // Only running in AP mode - AP_only, - // WiFi was in some kind of error state, waiting period - ErrorRecovery, - // STA mode + scanning - STA_Scanning, - // STA+AP mode + scanning, - // needs some careful handling to prevent disconnecting the connected stations - STA_AP_Scanning, - // Connecting to an AP - STA_Connecting, - // Reconnecting to an AP - // May need to handle some specific disconnect reasons differently from connecting for the first time. - STA_Reconnecting, - // Connected to an AP - STA_Connected -}; +# ifdef ESPEASY_WIFI_CLEANUP_WORK_IN_PROGRESS -class ESPEasyWiFi_t { -public: - - // Start the process of connecting or start AP, depending on the existing configuration. - bool begin(); - - // Terminate WiFi activity - void end(); - - // Process the state machine for managing WiFi connection - void loop(); - - WiFiState_e getState() const { return _state; } - - // Get the IP-address in this order: - // - STA interface if connected, - // - AP interface if active - // - 0.0.0.0 if neither connected nor active. - IPAddress getIP() const; - - void disconnect(); - - - - -private: - - // Handle timeouts + start of AP mode - void checkConnectProgress(); - - // Check to see if we already have some AP to connect to. - void checkScanningProgress(); - - void startScanning(); - - bool connectSTA(); - - - WiFi_AP_Candidate _active_sta; - WiFi_AP_Candidate _AP_conf; - - String _last_ssid; - MAC_address _last_bssid; - uint8_t _last_channel = 0; - WiFiState_e _state = WiFiState_e::OFF; - - LongTermTimer _last_state_change; - LongTermTimer _last_seen_connected; -}; - - -#endif // ESPEASY_WIFI_CLEANUP_WORK_IN_PROGRESS +# endif // ESPEASY_WIFI_CLEANUP_WORK_IN_PROGRESS bool WiFiConnected(); void WiFiConnectRelaxed(); @@ -113,41 +43,45 @@ void resetWiFi(); void initWiFi(); -#if FEATURE_SET_WIFI_TX_PWR -void SetWiFiTXpower(); -void SetWiFiTXpower(float dBm); // 0-20.5 -void SetWiFiTXpower(float dBm, float rssi); -#endif +# if FEATURE_SET_WIFI_TX_PWR +void SetWiFiTXpower(); +void SetWiFiTXpower(float dBm); // 0-20.5 +void SetWiFiTXpower(float dBm, + float rssi); +# endif // if FEATURE_SET_WIFI_TX_PWR float GetRSSIthreshold(float& maxTXpwr); + // Return some quality based on RSSI. // <-97 => 0 , >-50 => 10 // -97 ... -50 => 1 ... 9 -int GetRSSI_quality(); +int GetRSSI_quality(); WiFiConnectionProtocol getConnectionProtocol(); -#ifdef ESP32 +# ifdef ESP32 + // TSF time is 64-bit timer in usec, sent by the AP along with other packets. // On tested access points, this seems to be the uptime in usec. // Could be used among nodes connected to the same AP to increase time sync accuracy. int64_t WiFi_get_TSF_time(); -#endif -void WifiDisconnect(); -bool WiFiScanAllowed(); -void WifiScan(bool async, uint8_t channel = 0); -void WiFiScan_log_to_serial(); -void setSTA(bool enable); -void setAP(bool enable); -const __FlashStringHelper * getWifiModeString(WiFiMode_t wifimode); -void setWifiMode(WiFiMode_t wifimode); -bool WifiIsAP(WiFiMode_t wifimode); -bool WifiIsSTA(WiFiMode_t wifimode); -bool WiFiUseStaticIP(); -bool wifiAPmodeActivelyUsed(); -void setConnectionSpeed(); -void setupStaticIPconfig(); -String formatScanResult(int i, const String& separator); -String formatScanResult(int i, const String& separator, int32_t& rssi); +# endif // ifdef ESP32 +void WifiDisconnect(); +bool WiFiScanAllowed(); +void WifiScan(bool async, + uint8_t channel = 0); +void WiFiScan_log_to_serial(); + +void setAPinternal(bool enable); // FIXME TD-er: Move to ESPEasyWifi_abstracted... + +bool WiFiUseStaticIP(); +bool wifiAPmodeActivelyUsed(); +void setupStaticIPconfig(); +String formatScanResult(int i, + const String& separator); +String formatScanResult(int i, + const String& separator, + int32_t & rssi); void logConnectionStatus(); +#endif // if FEATURE_WIFI -#endif // ESPEASY_WIFI_H \ No newline at end of file +#endif // ESPEASY_WIFI_H diff --git a/src/src/ESPEasyCore/ESPEasyWifi_ProcessEvent.cpp b/src/src/ESPEasyCore/ESPEasyWifi_ProcessEvent.cpp index ba4761597..739440fad 100644 --- a/src/src/ESPEasyCore/ESPEasyWifi_ProcessEvent.cpp +++ b/src/src/ESPEasyCore/ESPEasyWifi_ProcessEvent.cpp @@ -3,10 +3,11 @@ #include "../../ESPEasy-Globals.h" #if FEATURE_ETHERNET -#include "../ESPEasyCore/ESPEasyEth_ProcessEvent.h" +# include "../ESPEasyCore/ESPEasyEth_ProcessEvent.h" #endif #include "../ESPEasyCore/ESPEasyNetwork.h" #include "../ESPEasyCore/ESPEasyWifi.h" +#include "../ESPEasyCore/ESPEasyWifi_abstracted.h" #include "../Globals/ESPEasyWiFiEvent.h" #include "../Globals/ESPEasy_Scheduler.h" @@ -39,7 +40,6 @@ #include "../WebServer/ESPEasy_WebServer.h" - // ******************************************************************************** // Called from the loop() to make sure events are processed as soon as possible. // These functions are called from Setup() or Loop() and thus may call delay() or yield() @@ -52,39 +52,45 @@ void handle_unprocessedNetworkEvents() if (active_network_medium == NetworkMedium_t::WIFI) { const bool should_be_initialized = (WiFiEventData.WiFiGotIP() && WiFiEventData.WiFiConnected()) || NetworkConnected(); + if (WiFiEventData.WiFiServicesInitialized() != should_be_initialized) { if (!WiFiEventData.WiFiServicesInitialized()) { - WiFiEventData.processedDHCPTimeout = true; // FIXME TD-er: Find out when this happens (happens on ESP32 sometimes) + WiFiEventData.processedDHCPTimeout = true; // FIXME TD-er: Find out when this happens (happens on ESP32 sometimes) + if (WiFiConnected()) { if (!WiFiEventData.WiFiGotIP()) { - # ifndef BUILD_NO_DEBUG + #ifndef BUILD_NO_DEBUG addLog(LOG_LEVEL_DEBUG, F("WiFi : Missed gotIP event")); #endif WiFiEventData.processedGotIP = false; processGotIP(); } + if (!WiFiEventData.WiFiConnected()) { - # ifndef BUILD_NO_DEBUG + #ifndef BUILD_NO_DEBUG addLog(LOG_LEVEL_DEBUG, F("WiFi : Missed connected event")); #endif WiFiEventData.processedConnect = false; processConnect(); } + // Apparently we are connected, so no need to process any late disconnect event WiFiEventData.processedDisconnect = true; - } + } WiFiEventData.setWiFiServicesInitialized(); -//#ifdef ESP32 + + // #ifdef ESP32 setWebserverRunning(false); delay(1); setWebserverRunning(true); delay(1); -/* -#else - CheckRunningServices(); -#endif -*/ + + /* + #else + CheckRunningServices(); + #endif + */ } } } @@ -104,7 +110,7 @@ void handle_unprocessedNetworkEvents() // WiFi connection is not yet available, so introduce some extra delays to // help the background tasks managing wifi connections delay(0); - + if (!WiFiEventData.processedConnect) { #ifndef BUILD_NO_DEBUG addLog(LOG_LEVEL_DEBUG, F("WIFI : Entering processConnect()")); @@ -127,12 +133,13 @@ void handle_unprocessedNetworkEvents() WifiDisconnect(); } - if (WiFi.status() == WL_DISCONNECTED && WiFiEventData.wifiConnectInProgress) { - if (WiFiEventData.last_wifi_connect_attempt_moment.isSet() && + if ((WiFi.status() == WL_DISCONNECTED) && WiFiEventData.wifiConnectInProgress) { + if (WiFiEventData.last_wifi_connect_attempt_moment.isSet() && WiFiEventData.last_wifi_connect_attempt_moment.timeoutReached(DEFAULT_WIFI_CONNECTION_TIMEOUT)) { logConnectionStatus(); resetWiFi(); } + if (!WiFiEventData.last_wifi_connect_attempt_moment.isSet()) { WiFiEventData.wifiConnectInProgress = false; } @@ -152,9 +159,10 @@ void handle_unprocessedNetworkEvents() if (loglevelActiveFor(LOG_LEVEL_DEBUG)) { static LongTermTimer lastDisconnectMoment_log; static uint8_t lastWiFiStatus_log = 0; - uint8_t cur_wifi_status = WiFi.status(); - if (WiFiEventData.lastDisconnectMoment.get() != lastDisconnectMoment_log.get() || - lastWiFiStatus_log != cur_wifi_status) { + uint8_t cur_wifi_status = WiFi.status(); + + if ((WiFiEventData.lastDisconnectMoment.get() != lastDisconnectMoment_log.get()) || + (lastWiFiStatus_log != cur_wifi_status)) { lastDisconnectMoment_log.set(WiFiEventData.lastDisconnectMoment.get()); lastWiFiStatus_log = cur_wifi_status; String wifilog = F("WIFI : Disconnected: WiFi.status() = "); @@ -162,13 +170,13 @@ void handle_unprocessedNetworkEvents() wifilog += F(" RSSI: "); wifilog += String(WiFi.RSSI()); wifilog += F(" status: "); - #ifdef ESP8266 + # ifdef ESP8266 station_status_t status = wifi_station_get_connect_status(); wifilog += SDKwifiStatusToString(status); - #endif - #ifdef ESP32 + # endif // ifdef ESP8266 + # ifdef ESP32 wifilog += ArduinoWifiStatusToString(WiFi.status()); - #endif + # endif addLogMove(LOG_LEVEL_DEBUG, wifilog); } } @@ -191,7 +199,7 @@ void handle_unprocessedNetworkEvents() if (WiFiEventData.WiFiServicesInitialized()) { if (WiFiEventData.lastConnectMoment.isSet() && WiFiEventData.lastConnectMoment.timeoutReached(WIFI_CONNECTION_CONSIDERED_STABLE)) { // Connection considered stable - WiFiEventData.wifi_connect_attempt = 0; + WiFiEventData.wifi_connect_attempt = 0; WiFiEventData.wifi_considered_stable = true; WiFi_AP_Candidates.markCurrentConnectionStable(); @@ -226,12 +234,12 @@ void processDisconnect() { if (loglevelActiveFor(LOG_LEVEL_INFO)) { String log = strformat( - F("WIFI : Disconnected! Reason: '%s'"), + F("WIFI : Disconnected! Reason: '%s'"), getLastDisconnectReason().c_str()); if (WiFiEventData.lastConnectedDuration_us > 0) { log += concat( - F(" Connected for "), + F(" Connected for "), format_msec_duration(WiFiEventData.lastConnectedDuration_us / 1000ll)); } addLogMove(LOG_LEVEL_INFO, log); @@ -239,14 +247,14 @@ void processDisconnect() { logConnectionStatus(); if (WiFiEventData.processingDisconnect.isSet()) { - if (WiFiEventData.processingDisconnect.millisPassedSince() > 5000 || WiFiEventData.processedDisconnect) { + if ((WiFiEventData.processingDisconnect.millisPassedSince() > 5000) || WiFiEventData.processedDisconnect) { WiFiEventData.processedDisconnect = true; WiFiEventData.processingDisconnect.clear(); } } - if (WiFiEventData.processedDisconnect || + if (WiFiEventData.processedDisconnect || WiFiEventData.processingDisconnect.isSet()) { return; } WiFiEventData.processingDisconnect.setNow(); WiFiEventData.setWiFiDisconnected(); @@ -260,36 +268,42 @@ void processDisconnect() { // FIXME TD-er: With AutoReconnect enabled, WiFi must be reset or else we completely loose track of the actual WiFi state bool mustRestartWiFi = Settings.WiFiRestart_connection_lost() || WiFi.getAutoReconnect(); - if (WiFiEventData.lastConnectedDuration_us > 0 && (WiFiEventData.lastConnectedDuration_us / 1000) < 5000) { - if (!WiFi_AP_Candidates.getBestCandidate().usable()) -// addLog(LOG_LEVEL_INFO, F("WIFI : !getBestCandidate().usable() => mustRestartWiFi = true")); + + if ((WiFiEventData.lastConnectedDuration_us > 0) && ((WiFiEventData.lastConnectedDuration_us / 1000) < 5000)) { + if (!WiFi_AP_Candidates.getBestCandidate().usable()) { + // addLog(LOG_LEVEL_INFO, F("WIFI : !getBestCandidate().usable() => mustRestartWiFi = true")); mustRestartWiFi = true; + } } - + if (WiFi.status() == WL_IDLE_STATUS) { -// addLog(LOG_LEVEL_INFO, F("WIFI : WiFi.status() == WL_IDLE_STATUS => mustRestartWiFi = true")); + // addLog(LOG_LEVEL_INFO, F("WIFI : WiFi.status() == WL_IDLE_STATUS => mustRestartWiFi = true")); mustRestartWiFi = true; } #ifdef USES_ESPEASY_NOW + if (use_EspEasy_now) { -// mustRestartWiFi = true; + // mustRestartWiFi = true; } - #endif - //WifiDisconnect(); // Needed or else node may not reconnect reliably. + #endif // ifdef USES_ESPEASY_NOW + + // WifiDisconnect(); // Needed or else node may not reconnect reliably. if (mustRestartWiFi) { WiFiEventData.processedDisconnect = true; resetWiFi(); -// WifiScan(false); -// delay(100); -// setWifiMode(WIFI_OFF); -// initWiFi(); -// delay(100); + + // WifiScan(false); + // delay(100); + // ESPEasy::net::wifi::setWifiMode(WIFI_OFF); + // initWiFi(); + // delay(100); } -// delay(500); + + // delay(500); logConnectionStatus(); WiFiEventData.processedDisconnect = true; WiFiEventData.processingDisconnect.clear(); @@ -297,11 +311,13 @@ void processDisconnect() { void processConnect() { if (WiFiEventData.processedConnect) { return; } - //delay(100); // FIXME TD-er: See https://github.com/letscontrolit/ESPEasy/issues/1987#issuecomment-451644424 + + // delay(100); // FIXME TD-er: See https://github.com/letscontrolit/ESPEasy/issues/1987#issuecomment-451644424 if (checkAndResetWiFi()) { return; } WiFiEventData.processedConnect = true; + if (WiFi.status() == WL_DISCONNECTED) { // Apparently not really connected return; @@ -315,21 +331,24 @@ void processConnect() { const bool mustResetCredentials = CUSTOM_EMERGENCY_FALLBACK_RESET_CREDENTIALS; #else const bool mustResetCredentials = false; - #endif + #endif // ifdef CUSTOM_EMERGENCY_FALLBACK_RESET_CREDENTIALS #ifdef CUSTOM_EMERGENCY_FALLBACK_START_AP const bool mustStartAP = CUSTOM_EMERGENCY_FALLBACK_START_AP; #else const bool mustStartAP = false; - #endif + #endif // ifdef CUSTOM_EMERGENCY_FALLBACK_START_AP + if (mustStartAP) { int allowedUptimeMinutes = 10; #ifdef CUSTOM_EMERGENCY_FALLBACK_ALLOW_MINUTES_UPTIME allowedUptimeMinutes = CUSTOM_EMERGENCY_FALLBACK_ALLOW_MINUTES_UPTIME; #endif + if (getUptimeMinutes() < allowedUptimeMinutes) { WiFiEventData.timerAPstart.setNow(); } } + if (mustResetCredentials && !WiFiEventData.performedClearWiFiCredentials) { WiFiEventData.performedClearWiFiCredentials = true; SecuritySettings.clearWiFiCredentials(); @@ -341,7 +360,7 @@ void processConnect() { if (loglevelActiveFor(LOG_LEVEL_INFO)) { const LongTermTimer::Duration connect_duration = WiFiEventData.last_wifi_connect_attempt_moment.timeDiff(WiFiEventData.lastConnectMoment); - String log = strformat( + String log = strformat( F("WIFI : Connected! AP: %s (%s) Ch: %d"), WiFi.SSID().c_str(), WiFi.BSSIDstr().c_str(), @@ -356,7 +375,7 @@ void processConnect() { addLogMove(LOG_LEVEL_INFO, log); } -// WiFiEventData.last_wifi_connect_attempt_moment.clear(); + // WiFiEventData.last_wifi_connect_attempt_moment.clear(); if (Settings.UseRules) { if (WiFiEventData.bssid_changed) { @@ -366,7 +385,7 @@ void processConnect() { if (WiFiEventData.channel_changed) { eventQueue.add(F("WiFi#ChangedWiFichannel")); } - } + } if (useStaticIP()) { WiFiEventData.markGotIP(); // in static IP config the got IP event is never fired. @@ -380,6 +399,7 @@ void processGotIP() { if (WiFiEventData.processedGotIP) { return; } + if (checkAndResetWiFi()) { return; } @@ -388,15 +408,17 @@ void processGotIP() { if (!useStaticIP()) { #ifdef ESP8266 + if (!ip.isSet()) { - #else - if (ip[0] == 0 && ip[1] == 0 && ip[2] == 0 && ip[3] == 0) { - #endif + #else // ifdef ESP8266 + + if ((ip[0] == 0) && (ip[1] == 0) && (ip[2] == 0) && (ip[3] == 0)) { + #endif // ifdef ESP8266 return; } } - const IPAddress gw = WiFi.gatewayIP(); - const IPAddress subnet = WiFi.subnetMask(); + const IPAddress gw = WiFi.gatewayIP(); + const IPAddress subnet = WiFi.subnetMask(); const LongTermTimer::Duration dhcp_duration = WiFiEventData.lastConnectMoment.timeDiff(WiFiEventData.lastGetIPmoment); WiFiEventData.dns0_cache = WiFi.dnsIP(0); WiFiEventData.dns1_cache = WiFi.dnsIP(1); @@ -462,17 +484,22 @@ void processGotIP() { } #if FEATURE_USE_IPV6 + void processGotIPv6() { if (!WiFiEventData.processedGotIP6) { WiFiEventData.processedGotIP6 = true; - if (loglevelActiveFor(LOG_LEVEL_INFO)) + + if (loglevelActiveFor(LOG_LEVEL_INFO)) { addLog(LOG_LEVEL_INFO, String(F("WIFI : STA got IP6 ")) + WiFiEventData.unprocessed_IP6.toString(true)); -#if FEATURE_ESPEASY_P2P -// updateUDPport(true); -#endif + } +# if FEATURE_ESPEASY_P2P + + // updateUDPport(true); +# endif // if FEATURE_ESPEASY_P2P } } -#endif + +#endif // if FEATURE_USE_IPV6 // A client disconnected from the AP on this node. void processDisconnectAPmode() { @@ -480,6 +507,7 @@ void processDisconnectAPmode() { WiFiEventData.processedDisconnectAPmode = true; #ifndef BUILD_NO_DEBUG + if (loglevelActiveFor(LOG_LEVEL_INFO)) { const int nrStationsConnected = WiFi.softAPgetStationNum(); String log = F("AP Mode: Client disconnected: "); @@ -488,16 +516,18 @@ void processDisconnectAPmode() { log += nrStationsConnected; addLogMove(LOG_LEVEL_INFO, log); } -#endif +#endif // ifndef BUILD_NO_DEBUG } // Client connects to AP on this node void processConnectAPmode() { if (WiFiEventData.processedConnectAPmode) { return; } WiFiEventData.processedConnectAPmode = true; + // Extend timer to switch off AP. WiFiEventData.timerAPoff.setMillisFromNow(WIFI_AP_OFF_TIMER_DURATION); #ifndef BUILD_NO_DEBUG + if (loglevelActiveFor(LOG_LEVEL_INFO)) { String log = F("AP Mode: Client connected: "); log += WiFiEventData.lastMacConnectedAPmode.toString(); @@ -505,9 +535,10 @@ void processConnectAPmode() { log += WiFi.softAPgetStationNum(); addLogMove(LOG_LEVEL_INFO, log); } -#endif +#endif // ifndef BUILD_NO_DEBUG #if FEATURE_DNS_SERVER + // Start DNS, only used if the ESP has no valid WiFi config // It will reply with it's own address on all DNS requests // (captive portal concept) @@ -522,16 +553,18 @@ void processConnectAPmode() { void processDisableAPmode() { if (!WiFiEventData.timerAPoff.isSet()) { return; } - if (!WifiIsAP(WiFi.getMode())) { + if (!ESPEasy::net::wifi::WifiIsAP(WiFi.getMode())) { return; } + // disable AP after timeout and no clients connected. if (WiFiEventData.timerAPoff.timeReached() && (WiFi.softAPgetStationNum() == 0)) { - setAP(false); + ESPEasy::net::wifi::setAP(false); } - if (!WifiIsAP(WiFi.getMode())) { + if (!ESPEasy::net::wifi::WifiIsAP(WiFi.getMode())) { WiFiEventData.timerAPoff.clear(); + if (WiFiEventData.wifiConnectAttemptNeeded) { // Force a reconnect cycle WifiDisconnect(); @@ -541,24 +574,28 @@ void processDisableAPmode() { void processScanDone() { WiFi_AP_Candidates.load_knownCredentials(); - if (WiFiEventData.processedScanDone) { return; } + if (WiFiEventData.processedScanDone) { return; } // Better act on the scan done event, as it may get triggered for normal wifi begin calls. int8_t scanCompleteStatus = WiFi.scanComplete(); - switch (scanCompleteStatus) { + + switch (scanCompleteStatus) + { case 0: // Nothing (yet) found + if (WiFiEventData.lastGetScanMoment.timeoutReached(5000)) { WiFi.scanDelete(); WiFiEventData.processedScanDone = true; } return; case -1: // WIFI_SCAN_RUNNING + // FIXME TD-er: Set timeout... if (WiFiEventData.lastGetScanMoment.timeoutReached(5000)) { - # ifndef BUILD_NO_DEBUG - addLog(LOG_LEVEL_ERROR, F("WiFi : Scan Running Timeout")); + #ifndef BUILD_NO_DEBUG + addLog(LOG_LEVEL_ERROR, F("WiFi : Scan Running Timeout")); #endif WiFi.scanDelete(); WiFiEventData.processedScanDone = true; @@ -573,11 +610,12 @@ void processScanDone() { WiFiEventData.lastGetScanMoment.setNow(); WiFiEventData.processedScanDone = true; -# ifndef BUILD_NO_DEBUG +#ifndef BUILD_NO_DEBUG + if (loglevelActiveFor(LOG_LEVEL_INFO)) { addLogMove(LOG_LEVEL_INFO, concat(F("WiFi : Scan finished, found: "), scanCompleteStatus)); } -#endif +#endif // ifndef BUILD_NO_DEBUG #if !FEATURE_ESP8266_DIRECT_WIFI_SCAN WiFi_AP_Candidates.process_WiFiscan(scanCompleteStatus); @@ -587,14 +625,16 @@ void processScanDone() { if (WiFi_AP_Candidates.addedKnownCandidate() && !NetworkConnected()) { if (!WiFiEventData.wifiConnectInProgress) { WiFiEventData.wifiConnectAttemptNeeded = true; - # ifndef BUILD_NO_DEBUG + #ifndef BUILD_NO_DEBUG + if (WiFi_AP_Candidates.addedKnownCandidate()) { addLog(LOG_LEVEL_INFO, F("WiFi : Added known candidate, try to connect")); } - #endif + #endif // ifndef BUILD_NO_DEBUG #ifdef ESP32 -// setSTA(false); -#endif + + // ESPEasy::net::wifi::setSTA(false); +#endif // ifdef ESP32 NetworkConnectRelaxed(); #ifdef USES_ESPEASY_NOW temp_disable_EspEasy_now_timer = millis() + 20000; @@ -605,7 +645,3 @@ void processScanDone() { } } - - - - diff --git a/src/src/ESPEasyCore/ESPEasyWifi_abstracted.cpp b/src/src/ESPEasyCore/ESPEasyWifi_abstracted.cpp new file mode 100644 index 000000000..2cd0fe1f2 --- /dev/null +++ b/src/src/ESPEasyCore/ESPEasyWifi_abstracted.cpp @@ -0,0 +1,151 @@ +#include "../ESPEasyCore/ESPEasyWifi_abstracted.h" + +#if FEATURE_WIFI + +# include "../Globals/EventQueue.h" +# include "../Globals/Settings.h" +# include "../Globals/ESPEasyWiFiEvent.h" + +# include "../Helpers/StringConverter.h" + +namespace ESPEasy { +namespace net { +namespace wifi { + +const __FlashStringHelper* getWifiModeString(WiFiMode_t wifimode) +{ + switch (wifimode) + { + case WIFI_OFF: return F("OFF"); + case WIFI_STA: return F("STA"); + case WIFI_AP: return F("AP"); + case WIFI_AP_STA: return F("AP+STA"); + default: + break; + } + return F("Unknown"); +} + +bool setSTA(bool enable) { return setSTA_AP(enable, WifiIsAP(WiFi.getMode())); } + +bool setAP(bool enable) { return setSTA_AP(WifiIsSTA(WiFi.getMode()), enable); } + +bool setSTA_AP(bool sta_enable, bool ap_enable) +{ + if (ap_enable) { + return setWifiMode(sta_enable ? WIFI_AP_STA : WIFI_AP); + } + return setWifiMode(sta_enable ? WIFI_STA : WIFI_OFF); +} + +// ******************************************************************************** +// Configure WiFi TX power +// ******************************************************************************** +# if FEATURE_SET_WIFI_TX_PWR + +void SetWiFiTXpower() { + SetWiFiTXpower(0); // Just some minimal value, will be adjusted in SetWiFiTXpower +} + +void SetWiFiTXpower(float dBm) { SetWiFiTXpower(dBm, WiFi.RSSI()); } + +void SetWiFiTXpower(float dBm, float rssi) { + const WiFiMode_t cur_mode = WiFi.getMode(); + + if (cur_mode == WIFI_OFF) { + return; + } + + if (Settings.UseMaxTXpowerForSending()) { + dBm = 30; // Just some max, will be limited later + } + + // Range ESP32 : -1dBm - 20dBm + // Range ESP8266: 0dBm - 20.5dBm + float maxTXpwr; + float threshold = GetRSSIthreshold(maxTXpwr); + # ifdef ESP8266 + float minTXpwr{}; + # endif + # ifdef ESP32 + float minTXpwr = -1.0f; + # endif + + threshold += Settings.WiFi_sensitivity_margin; // Margin in dBm on top of threshold + + // Assume AP sends with max set by ETSI standard. + // 2.4 GHz: 100 mWatt (20 dBm) + // US and some other countries allow 1000 mW (30 dBm) + // We cannot send with over 20 dBm, thus it makes no sense to force higher TX power all the time. + const float newrssi = rssi - 20; + + if (newrssi < threshold) { + minTXpwr = threshold - newrssi; + } + + if (minTXpwr > maxTXpwr) { + minTXpwr = maxTXpwr; + } + + if (dBm > maxTXpwr) { + dBm = maxTXpwr; + } else if (dBm < minTXpwr) { + dBm = minTXpwr; + } + + doSetWiFiTXpower(dBm); + + if (WiFiEventData.wifi_TX_pwr < dBm) { + // Will increase the TX power, give power supply of the unit some rest + delay(1); + } + + WiFiEventData.wifi_TX_pwr = dBm; + + delay(0); + # ifndef BUILD_NO_DEBUG + + if (loglevelActiveFor(LOG_LEVEL_DEBUG)) { + const int TX_pwr_int = WiFiEventData.wifi_TX_pwr * 4; + const int maxTXpwr_int = maxTXpwr * 4; + + if (TX_pwr_int != maxTXpwr_int) { + static int last_log = -1; + + if (TX_pwr_int != last_log) { + last_log = TX_pwr_int; + String log = strformat( + F("WiFi : Set TX power to %ddBm sensitivity: %ddBm"), + static_cast(dBm), + static_cast(threshold)); + + if (rssi < 0) { + log += strformat(F(" RSSI: %ddBm"), static_cast(rssi)); + } + addLogMove(LOG_LEVEL_DEBUG, log); + } + } + } + # endif // ifndef BUILD_NO_DEBUG +} + +# endif // if FEATURE_SET_WIFI_TX_PWR + +int GetRSSI_quality() { + long rssi = WiFi.RSSI(); + + if (-50 < rssi) { return 10; } + + if (rssi <= -98) { return 0; } + rssi = rssi + 97; // Range 0..47 => 1..9 + return (rssi / 5) + 1; +} + +void setConnectionSpeed() { setConnectionSpeed(Settings.ForceWiFi_bg_mode()); } + +} // namespace wifi +} // namespace net +} // namespace ESPEasy + + +#endif // if FEATURE_WIFI diff --git a/src/src/ESPEasyCore/ESPEasyWifi_abstracted.h b/src/src/ESPEasyCore/ESPEasyWifi_abstracted.h index da803cea5..4eab7584a 100644 --- a/src/src/ESPEasyCore/ESPEasyWifi_abstracted.h +++ b/src/src/ESPEasyCore/ESPEasyWifi_abstracted.h @@ -3,27 +3,60 @@ #include "../../ESPEasy_common.h" +#if FEATURE_WIFI -#include "../DataTypes/WiFiConnectionProtocol.h" +# include "../DataTypes/WiFiConnectionProtocol.h" +# include "../DataTypes/WiFi_STA_connected_state.h" +# include "../DataTypes/WiFi_State.h" -#if defined(ESP8266) -#include "../ESPEasyCore/ESPEasyWiFiEvent_ESP8266.h" -# include -#endif // if defined(ESP8266) -#if defined(ESP32) -#include "../ESPEasyCore/ESPEasyWiFiEvent_ESP32.h" -# include -#endif // if defined(ESP32) +# if defined(ESP8266) +# include "../ESPEasyCore/ESPEasyWiFiEvent_ESP8266.h" +# include +# endif // if defined(ESP8266) +# if defined(ESP32) +# include "../ESPEasyCore/ESPEasyWiFiEvent_ESP32.h" +# include +# include +# endif // if defined(ESP32) -namespace ESPEasy_WiFi_abstraction { -bool WiFiConnected(); +namespace ESPEasy { +namespace net { +namespace wifi { -void WiFiDisconnect(); -bool WifiIsAP(WiFiMode_t wifimode); -bool WifiIsSTA(WiFiMode_t wifimode); +// Call before starting WiFi +bool WiFi_pre_setup(); +// Call before setting WiFi into STA mode +bool WiFi_pre_STA_setup(); + +STA_connected_state getSTA_connected_state(); + + +bool WiFiConnected(); + +void WiFiDisconnect(); + +// ******************************************************************************** +// Manage Wifi Modes +// ******************************************************************************** +bool WifiIsAP(WiFiMode_t wifimode); +bool WifiIsSTA(WiFiMode_t wifimode); + +const __FlashStringHelper* getWifiModeString(WiFiMode_t wifimode); + +bool setSTA(bool enable); +bool setAP(bool enable); +bool setSTA_AP(bool sta_enable, + bool ap_enable); + +bool setWifiMode(WiFiMode_t new_mode); + + +// ******************************************************************************** +// Event handlers +// ******************************************************************************** void removeWiFiEventHandler(); void registerWiFiEventHandler(); @@ -31,18 +64,36 @@ void registerWiFiEventHandler(); WiFiConnectionProtocol getConnectionProtocol(); float GetRSSIthreshold(float& maxTXpwr); -#if FEATURE_SET_WIFI_TX_PWR -void SetWiFiTXpower(float& dBm); -#endif // if FEATURE_SET_WIFI_TX_PWR +// ******************************************************************************** +// Configure WiFi TX power +// ******************************************************************************** + +# if FEATURE_SET_WIFI_TX_PWR +void SetWiFiTXpower(); +void SetWiFiTXpower(float dBm); +void SetWiFiTXpower(float dBm, + float rssi); + +// Actually set the TX power using platform specific calls. +void doSetWiFiTXpower(float& dBm); +# endif // if FEATURE_SET_WIFI_TX_PWR + +int GetRSSI_quality(); + +void setConnectionSpeed(); void setConnectionSpeed(bool ForceWiFi_bg_mode); void setWiFiNoneSleep(); void setWiFiEcoPowerMode(); void setWiFiDefaultPowerMode(); +void setWiFiCountryPolicyManual(); -} +} // namespace wifi +} // namespace net +} // namespace ESPEasy +#endif // if FEATURE_WIFI #endif // ifndef ESPEASYCORE_ESPEASYWIFI_ABSTRACTED_H diff --git a/src/src/ESPEasyCore/ESPEasyWifi_abstracted_ESP32.cpp b/src/src/ESPEasyCore/ESPEasyWifi_abstracted_ESP32.cpp index 01137da4c..4f7a25cee 100644 --- a/src/src/ESPEasyCore/ESPEasyWifi_abstracted_ESP32.cpp +++ b/src/src/ESPEasyCore/ESPEasyWifi_abstracted_ESP32.cpp @@ -1,23 +1,86 @@ #include "../ESPEasyCore/ESPEasyWifi_abstracted.h" -#ifdef ESP32 +#if FEATURE_WIFI +# ifdef ESP32 -# include "../Globals/ESPEasyWiFiEvent.h" -# include "../Globals/WiFi_AP_Candidates.h" -# include "../ESPEasyCore/ESPEasyWiFiEvent_ESP32.h" +# include "../Globals/ESPEasyWiFiEvent.h" +# include "../Globals/EventQueue.h" +# include "../Globals/Settings.h" +# include "../Globals/WiFi_AP_Candidates.h" +# include "../ESPEasyCore/ESPEasyWiFiEvent_ESP32.h" + +# include "../Helpers/StringConverter.h" -# include -# include // Needed to call ESP-IDF functions like esp_wifi_.... +# include "../ESPEasyCore/ESPEasyNetwork.h" // Needed for NetworkCreateRFCCompliantHostname, WiFi code should not include network code +# include "../ESPEasyCore/ESPEasyWifi.h" // Needed for WifiDisconnect. Maybe this should be moved to these 'abstract' files? -# include +# include "../ESPEasyCore/ESPEasyWifi_ProcessEvent.h" -namespace ESPEasy_WiFi_abstraction { -bool WiFiConnected() { - return WiFi.isConnected(); +# include +# include // Needed to call ESP-IDF functions like esp_wifi_.... + +# include + + +namespace ESPEasy { +namespace net { +namespace wifi { + +bool WiFi_pre_setup() { + + registerWiFiEventHandler(); + WiFi.persistent(false); + + return setSTA_AP(false, false); } +bool WiFi_pre_STA_setup() +{ + if (!setSTA(true)) { return false; } + + WiFi.setAutoReconnect(false); + delay(10); + return true; +} + +STA_connected_state getSTA_connected_state() +{ + switch (WiFi.status()) + { + case WL_CONNECTED: + return STA_connected_state::Connected; + + case WL_NO_SSID_AVAIL: + return STA_connected_state::Error_Not_Found; + + case WL_CONNECT_FAILED: + case WL_CONNECTION_LOST: + return STA_connected_state::Error_Connect_Failed; + + case WL_NO_SHIELD: + case WL_STOPPED: + case WL_IDLE_STATUS: + case WL_SCAN_COMPLETED: + case WL_DISCONNECTED: + // ToDo TD-er: What to do here? Should we add some disconnected state? + break; + + } + + // TODO: Keep track of whether connection is in progress + // The status() function does not return a reply stating "connecting" + + /* if (_sta_connecting) { + return STA_connected_state::Connecting; + } + */ + return STA_connected_state::Idle; +} + +bool WiFiConnected() { return WiFi.isConnected(); } + void WiFiDisconnect() { removeWiFiEventHandler(); WiFi.disconnect(); @@ -31,14 +94,138 @@ void WiFiDisconnect() { } } -bool WifiIsAP(WiFiMode_t wifimode) -{ - return (wifimode == WIFI_MODE_AP) || (wifimode == WIFI_MODE_APSTA); -} +bool WifiIsAP(WiFiMode_t wifimode) { return (wifimode == WIFI_MODE_AP) || (wifimode == WIFI_MODE_APSTA); } -bool WifiIsSTA(WiFiMode_t wifimode) +bool WifiIsSTA(WiFiMode_t wifimode) { return (wifimode & WIFI_MODE_STA) != 0; } + +bool setWifiMode(WiFiMode_t new_mode) { - return (wifimode & WIFI_MODE_STA) != 0; + const WiFiMode_t cur_mode = WiFi.getMode(); + + // Made this static flag an int as ESP8266 and ESP32 differ in the "not set" values + static int8_t processing_wifi_mode = -1; + + if (cur_mode == new_mode) { + return true; + } + + if (processing_wifi_mode == static_cast(new_mode)) { + // Prevent loops + return true; + } + processing_wifi_mode = static_cast(new_mode); + + + if (cur_mode == WIFI_OFF) { + # if defined(ESP32) + + // Needs to be set while WiFi is off + WiFi.hostname(NetworkCreateRFCCompliantHostname()); + # endif // if defined(ESP32) + WiFiEventData.markWiFiTurnOn(); + } + + if (new_mode != WIFI_OFF) { + # ifdef ESP8266 + + // See: https://github.com/esp8266/Arduino/issues/6172#issuecomment-500457407 + WiFi.forceSleepWake(); // Make sure WiFi is really active. + # endif // ifdef ESP8266 + delay(100); + } else { + WifiDisconnect(); + + // delay(100); + processDisconnect(); + WiFiEventData.clear_processed_flags(); + } + + addLog(LOG_LEVEL_INFO, concat(F("WIFI : Set WiFi to "), getWifiModeString(new_mode))); + + int retry = 2; + + while (!WiFi.mode(new_mode) && retry > 0) { + delay(100); + --retry; + } + retry = 2; + + while (WiFi.getMode() != new_mode && retry > 0) { + addLog(LOG_LEVEL_INFO, F("WIFI : mode not yet set")); + delay(100); + --retry; + } + + if (WiFi.getMode() != new_mode) { + addLog(LOG_LEVEL_ERROR, F("WIFI : Cannot set mode!!!!!")); + return false; + } + + + if (new_mode == WIFI_OFF) { + + // FIXME TD-er: Is this correct to mark Turn ON ???? + WiFiEventData.markWiFiTurnOn(); + # if defined(ESP32) + + // Needs to be set while WiFi is off + WiFi.hostname(NetworkCreateRFCCompliantHostname()); + # endif // if defined(ESP32) + delay(100); + # if defined(ESP32) + esp_wifi_set_ps(WIFI_PS_NONE); + + // esp_wifi_set_ps(WIFI_PS_MAX_MODEM); + # endif // if defined(ESP32) + # ifdef ESP8266 + WiFi.forceSleepBegin(); + # endif // ifdef ESP8266 + delay(1); + } else { + if (cur_mode == WIFI_OFF) { + registerWiFiEventHandler(); + } + + // Only set power mode when AP is not enabled + // When AP is enabled, the sleep mode is already set to WIFI_NONE_SLEEP + if (!WifiIsAP(new_mode)) { + if (Settings.WifiNoneSleep()) { + setWiFiNoneSleep(); + } else if (Settings.EcoPowerMode()) { + setWiFiEcoPowerMode(); + } else { + // Default + setWiFiDefaultPowerMode(); + } + } +# if FEATURE_SET_WIFI_TX_PWR + SetWiFiTXpower(); +# endif + + if (WifiIsSTA(new_mode)) { + // WiFi.setAutoConnect(Settings.SDK_WiFi_autoreconnect()); + WiFi.setAutoReconnect(Settings.SDK_WiFi_autoreconnect()); + } + delay(100); // Must allow for some time to init. + } + const bool new_mode_AP_enabled = WifiIsAP(new_mode); + + if (WifiIsAP(cur_mode) && !new_mode_AP_enabled) { + eventQueue.add(F("WiFi#APmodeDisabled")); + } + + if (WifiIsAP(cur_mode) != new_mode_AP_enabled) { + // Mode has changed + setAPinternal(new_mode_AP_enabled); + } + # if FEATURE_MDNS + # ifdef ESP8266 + + // notifyAPChange() is not present in the ESP32 MDNSResponder + MDNS.notifyAPChange(); + # endif // ifdef ESP8266 + # endif // if FEATURE_MDNS + return true; } void removeWiFiEventHandler() @@ -56,9 +243,12 @@ void registerWiFiEventHandler() } float GetRSSIthreshold(float& maxTXpwr) { + maxTXpwr = Settings.getWiFi_TX_power(); + float threshold = WIFI_SENSITIVITY_n; - switch (getConnectionProtocol()) { + switch (getConnectionProtocol()) + { case WiFiConnectionProtocol::WiFi_Protocol_11b: threshold = WIFI_SENSITIVITY_11b; @@ -77,11 +267,11 @@ float GetRSSIthreshold(float& maxTXpwr) { if (maxTXpwr > MAX_TX_PWR_DBM_n) { maxTXpwr = MAX_TX_PWR_DBM_n; } break; -# if ESP_IDF_VERSION > ESP_IDF_VERSION_VAL(5, 2, 0) +# if ESP_IDF_VERSION > ESP_IDF_VERSION_VAL(5, 2, 0) case WiFiConnectionProtocol::WiFi_Protocol_11a: case WiFiConnectionProtocol::WiFi_Protocol_VHT20: // FIXME TD-er: Must determine max. TX power for these 5 GHz modi -# endif // if ESP_IDF_VERSION > ESP_IDF_VERSION_VAL(5, 2, 0) +# endif // if ESP_IDF_VERSION > ESP_IDF_VERSION_VAL(5, 2, 0) case WiFiConnectionProtocol::WiFi_Protocol_LR: case WiFiConnectionProtocol::Unknown: break; @@ -95,26 +285,28 @@ WiFiConnectionProtocol getConnectionProtocol() wifi_phy_mode_t phymode; esp_wifi_sta_get_negotiated_phymode(&phymode); - switch (phymode) { + switch (phymode) + { case WIFI_PHY_MODE_11B: return WiFiConnectionProtocol::WiFi_Protocol_11b; case WIFI_PHY_MODE_11G: return WiFiConnectionProtocol::WiFi_Protocol_11g; case WIFI_PHY_MODE_HT20: return WiFiConnectionProtocol::WiFi_Protocol_HT20; case WIFI_PHY_MODE_HT40: return WiFiConnectionProtocol::WiFi_Protocol_HT40; case WIFI_PHY_MODE_HE20: return WiFiConnectionProtocol::WiFi_Protocol_HE20; case WIFI_PHY_MODE_LR: return WiFiConnectionProtocol::WiFi_Protocol_LR; -# if ESP_IDF_VERSION >= ESP_IDF_VERSION_VAL(5, 3, 0) +# if ESP_IDF_VERSION >= ESP_IDF_VERSION_VAL(5, 3, 0) // 5 GHz case WIFI_PHY_MODE_11A: return WiFiConnectionProtocol::WiFi_Protocol_11a; case WIFI_PHY_MODE_VHT20: return WiFiConnectionProtocol::WiFi_Protocol_VHT20; -# endif // if ESP_IDF_VERSION >= ESP_IDF_VERSION_VAL(5, 3, 0) +# endif // if ESP_IDF_VERSION >= ESP_IDF_VERSION_VAL(5, 3, 0) } } return WiFiConnectionProtocol::Unknown; } -# if FEATURE_SET_WIFI_TX_PWR -void SetWiFiTXpower(float& dBm) +# if FEATURE_SET_WIFI_TX_PWR + +void doSetWiFiTXpower(float& dBm) { int8_t power = dBm * 4; @@ -125,7 +317,7 @@ void SetWiFiTXpower(float& dBm) } } -# endif // if FEATURE_SET_WIFI_TX_PWR +# endif // if FEATURE_SET_WIFI_TX_PWR void setConnectionSpeed(bool ForceWiFi_bg_mode) { // Does not (yet) work, so commented out. @@ -143,12 +335,13 @@ void setConnectionSpeed(bool ForceWiFi_bg_mode) { if (!ForceWiFi_bg_mode || (WiFiEventData.connectionFailures > 10)) { // Set to use BGN protocol |= WIFI_PROTOCOL_11N; - #ifdef ESP32C6 + # ifdef ESP32C6 protocol |= WIFI_PROTOCOL_11AX; - #endif + # endif } const WiFi_AP_Candidate candidate = WiFi_AP_Candidates.getCurrent(); + if (candidate.phy_known()) { // Check to see if the access point is set to "N-only" if ((protocol & WIFI_PROTOCOL_11N) == 0) { @@ -158,48 +351,46 @@ void setConnectionSpeed(bool ForceWiFi_bg_mode) { protocol |= WIFI_PROTOCOL_11N; addLog(LOG_LEVEL_INFO, F("WIFI : AP is set to 802.11n only")); } -#ifdef ESP32C6 +# ifdef ESP32C6 + if (candidate.bits.phy_11ax) { // Set to use WiFi6 protocol |= WIFI_PROTOCOL_11AX; addLog(LOG_LEVEL_INFO, F("WIFI : AP is set to 802.11ax")); } -#endif +# endif // ifdef ESP32C6 } } } - if (ESPEasy_WiFi_abstraction::WifiIsSTA(WiFi.getMode())) { + if (WifiIsSTA(WiFi.getMode())) { // Set to use "Long GI" making it more resilliant to reflections // See: https://www.tp-link.com/us/configuration-guides/q_a_basic_wireless_concepts/?configurationId=2958#_idTextAnchor038 esp_wifi_config_80211_tx_rate(WIFI_IF_STA, WIFI_PHY_RATE_MCS3_LGI); esp_wifi_set_protocol(WIFI_IF_STA, protocol); } - if (ESPEasy_WiFi_abstraction::WifiIsAP(WiFi.getMode())) { + if (WifiIsAP(WiFi.getMode())) { esp_wifi_set_protocol(WIFI_IF_AP, protocol); } } -void setWiFiNoneSleep() -{ - WiFi.setSleep(WIFI_PS_NONE); -} +void setWiFiNoneSleep() { WiFi.setSleep(WIFI_PS_NONE); } void setWiFiEcoPowerMode() { // Allow light sleep during idle times -# ifdef ESP8266 +# ifdef ESP8266 WiFi.setSleepMode(WIFI_LIGHT_SLEEP); -# endif // ifdef ESP8266 -# ifdef ESP32 +# endif // ifdef ESP8266 +# ifdef ESP32 // Maximum modem power saving. // In this mode, interval to receive beacons is determined by the listen_interval parameter in wifi_sta_config_t // FIXME TD-er: Must test if this is desired behavior in ESP32. WiFi.setSleep(WIFI_PS_MAX_MODEM); -# endif // ifdef ESP32 +# endif // ifdef ESP32 } void setWiFiDefaultPowerMode() @@ -209,11 +400,21 @@ void setWiFiDefaultPowerMode() WiFi.setSleep(WIFI_PS_MIN_MODEM); } +void setWiFiCountryPolicyManual() +{ + wifi_country_t config = { + .cc = "01", + .schan = 1, + .nchan = 14, + .policy = WIFI_COUNTRY_POLICY_MANUAL, + }; + esp_wifi_set_country(&config); +} +} // namespace wifi +} // namespace net +} // namespace ESPEasy - -} // namespace ESPEasy_WiFi_abstraction - - -#endif // ifdef ESP32 +# endif // ifdef ESP32 +#endif // if FEATURE_WIFI diff --git a/src/src/ESPEasyCore/ESPEasyWifi_abstracted_ESP8266.cpp b/src/src/ESPEasyCore/ESPEasyWifi_abstracted_ESP8266.cpp index f09f4216e..a4891c5b9 100644 --- a/src/src/ESPEasyCore/ESPEasyWifi_abstracted_ESP8266.cpp +++ b/src/src/ESPEasyCore/ESPEasyWifi_abstracted_ESP8266.cpp @@ -1,43 +1,72 @@ #include "../ESPEasyCore/ESPEasyWifi_abstracted.h" -#ifdef ESP8266 +#if FEATURE_WIFI +# ifdef ESP8266 -# include "../Globals/ESPEasyWiFiEvent.h" -# include "../Globals/WiFi_AP_Candidates.h" +# include "../Helpers/StringConverter.h" -# include "../ESPEasyCore/ESPEasyWiFiEvent_ESP8266.h" +# include "../Globals/ESPEasyWiFiEvent.h" +# include "../Globals/Settings.h" +# include "../Globals/WiFi_AP_Candidates.h" -namespace ESPEasy_WiFi_abstraction { -bool WiFiConnected() +# include "../ESPEasyCore/ESPEasyWiFiEvent_ESP8266.h" + +namespace ESPEasy { +namespace net { +namespace wifi { + +bool WiFi_pre_setup() { + registerWiFiEventHandler(); + + setSTA_AP(false, false); + delay(100); + return true; +} + +bool WiFi_pre_STA_setup() { + if (! setSTA(true)) { return false; } + + // Assign to 2 separate bools to make sure both are executed. + const bool autoConnect = WiFi.setAutoConnect(false); + const bool autoReconnect = WiFi.setAutoReconnect(false); + + if (!autoConnect || !autoReconnect) { + addLog(LOG_LEVEL_ERROR, F("WiFi : Disabling auto (re)connect failed")); + } + delay(100); + return true; +} + +STA_connected_state getSTA_connected_state() { - bool wifi_isconnected = WiFi.isConnected(); - // Perform check on SDK function, see: https://github.com/esp8266/Arduino/issues/7432 station_status_t status = wifi_station_get_connect_status(); - switch (status) { + switch (status) + { case STATION_GOT_IP: - wifi_isconnected = true; - break; + return STA_connected_state::Connected; case STATION_NO_AP_FOUND: + return STA_connected_state::Error_Not_Found; case STATION_CONNECT_FAIL: case STATION_WRONG_PASSWORD: - wifi_isconnected = false; - break; - case STATION_IDLE: + return STA_connected_state::Error_Connect_Failed; case STATION_CONNECTING: + return STA_connected_state::Connecting; + case STATION_IDLE: break; default: - wifi_isconnected = false; break; } - return wifi_isconnected; + return STA_connected_state::Idle; } +bool WiFiConnected() { return getSTA_connected_state() == STA_connected_state::Connected; } + void WiFiDisconnect() { // Only call disconnect when STA is active - if (ESPEasy_WiFi_abstraction::WifiIsSTA(WiFi.getMode())) { + if ( WifiIsSTA(WiFi.getMode())) { wifi_station_disconnect(); } station_config conf{}; @@ -47,14 +76,170 @@ void WiFiDisconnect() { ETS_UART_INTR_ENABLE(); } -bool WifiIsAP(WiFiMode_t wifimode) -{ - return (wifimode == WIFI_AP) || (wifimode == WIFI_AP_STA); -} +bool WifiIsAP(WiFiMode_t wifimode) { return (wifimode == WIFI_AP) || (wifimode == WIFI_AP_STA); } -bool WifiIsSTA(WiFiMode_t wifimode) +bool WifiIsSTA(WiFiMode_t wifimode) { return (wifimode & WIFI_STA) != 0; } + +bool setWifiMode(WiFiMode_t new_mode) { - return (wifimode & WIFI_STA) != 0; + const WiFiMode_t cur_mode = WiFi.getMode(); + + // Made this static flag an int as ESP8266 and ESP32 differ in the "not set" values + static int8_t processing_wifi_mode = -1; + + if (cur_mode == new_mode) { + return true; + } + + if (processing_wifi_mode == static_cast(new_mode)) { + // Prevent loops + return true; + } + processing_wifi_mode = static_cast(new_mode); + + + if (! WifiIsSTA(new_mode)) { + // calls lwIP's dhcp_stop(), + // safe to call even if not started + // See: https://github.com/esp8266/Arduino/pull/5703/files + wifi_station_dhcpc_stop(); + } + + if (new_mode != WIFI_OFF) { + // See: https://github.com/esp8266/Arduino/issues/6172#issuecomment-500457407 + WiFi.forceSleepWake(); // Make sure WiFi is really active. + delay(100); + } + + addLog(LOG_LEVEL_INFO, concat(F("WIFI : Set WiFi to "), getWifiModeString(new_mode))); + + int retry = 2; + + while (!WiFi.mode(new_mode) && retry > 0) { + delay(100); + --retry; + } + retry = 2; + + while (WiFi.getMode() != new_mode && retry > 0) { + addLog(LOG_LEVEL_INFO, F("WIFI : mode not yet set")); + delay(100); + --retry; + } + + if (WiFi.getMode() != new_mode) { + addLog(LOG_LEVEL_ERROR, F("WIFI : Cannot set mode!!!!!")); + return false; + } + + + if (new_mode == WIFI_OFF) { + WiFi.forceSleepBegin(); + delay(1); + } + + + /* + if (cur_mode == WIFI_OFF) { + #if defined(ESP32) + // Needs to be set while WiFi is off + WiFi.hostname(NetworkCreateRFCCompliantHostname()); + #endif + WiFiEventData.markWiFiTurnOn(); + } + if (new_mode != WIFI_OFF) { + #ifdef ESP8266 + // See: https://github.com/esp8266/Arduino/issues/6172#issuecomment-500457407 + WiFi.forceSleepWake(); // Make sure WiFi is really active. + #endif + delay(100); + } else { + WifiDisconnect(); + // delay(100); + processDisconnect(); + WiFiEventData.clear_processed_flags(); + } + + addLog(LOG_LEVEL_INFO, concat(F("WIFI : Set WiFi to "), getWifiModeString(new_mode))); + + int retry = 2; + while (!WiFi.mode(new_mode) && retry > 0) { + delay(100); + --retry; + } + retry = 2; + while (WiFi.getMode() != new_mode && retry > 0) { + addLog(LOG_LEVEL_INFO, F("WIFI : mode not yet set")); + delay(100); + --retry; + } + if (WiFi.getMode() != new_mode) { + addLog(LOG_LEVEL_ERROR, F("WIFI : Cannot set mode!!!!!")); + return false; + } + + + if (new_mode == WIFI_OFF) { + + // FIXME TD-er: Is this correct to mark Turn ON ???? + WiFiEventData.markWiFiTurnOn(); + #if defined(ESP32) + // Needs to be set while WiFi is off + WiFi.hostname(NetworkCreateRFCCompliantHostname()); + #endif + delay(100); + #if defined(ESP32) + esp_wifi_set_ps(WIFI_PS_NONE); + // esp_wifi_set_ps(WIFI_PS_MAX_MODEM); + #endif + #ifdef ESP8266 + WiFi.forceSleepBegin(); + #endif // ifdef ESP8266 + delay(1); + } else { + if (cur_mode == WIFI_OFF) { + registerWiFiEventHandler(); + } + // Only set power mode when AP is not enabled + // When AP is enabled, the sleep mode is already set to WIFI_NONE_SLEEP + if (! WifiIsAP(new_mode)) { + if (Settings.WifiNoneSleep()) { + setWiFiNoneSleep(); + } else if (Settings.EcoPowerMode()) { + setWiFiEcoPowerMode(); + } else { + // Default + setWiFiDefaultPowerMode(); + } + } + #if FEATURE_SET_WIFI_TX_PWR + SetWiFiTXpower(); + #endif + if ( WifiIsSTA(new_mode)) { + // WiFi.setAutoConnect(Settings.SDK_WiFi_autoreconnect()); + WiFi.setAutoReconnect(Settings.SDK_WiFi_autoreconnect()); + } + delay(100); // Must allow for some time to init. + } + const bool new_mode_AP_enabled = WifiIsAP(new_mode); + + if ( WifiIsAP(cur_mode) && !new_mode_AP_enabled) { + eventQueue.add(F("WiFi#APmodeDisabled")); + } + + if ( WifiIsAP(cur_mode) != new_mode_AP_enabled) { + // Mode has changed + setAPinternal(new_mode_AP_enabled); + } + */ +# if FEATURE_MDNS + # ifdef ESP8266 + + // notifyAPChange() is not present in the ESP32 MDNSResponder + MDNS.notifyAPChange(); + # endif // ifdef ESP8266 + # endif // if FEATURE_MDNS + return true; } void removeWiFiEventHandler() { @@ -79,9 +264,12 @@ void registerWiFiEventHandler() } float GetRSSIthreshold(float& maxTXpwr) { + maxTXpwr = Settings.getWiFi_TX_power(); + float threshold = WIFI_SENSITIVITY_n; - switch (getConnectionProtocol()) { + switch (getConnectionProtocol()) + { case WiFiConnectionProtocol::WiFi_Protocol_11b: threshold = WIFI_SENSITIVITY_11b; @@ -106,7 +294,8 @@ float GetRSSIthreshold(float& maxTXpwr) { WiFiConnectionProtocol getConnectionProtocol() { if (WiFi.RSSI() < 0) { - switch (wifi_get_phy_mode()) { + switch (wifi_get_phy_mode()) + { case PHY_MODE_11B: return WiFiConnectionProtocol::WiFi_Protocol_11b; case PHY_MODE_11G: @@ -118,20 +307,20 @@ WiFiConnectionProtocol getConnectionProtocol() return WiFiConnectionProtocol::Unknown; } -# if FEATURE_SET_WIFI_TX_PWR -void SetWiFiTXpower(float& dBm) -{ - WiFi.setOutputPower(dBm); -} +# if FEATURE_SET_WIFI_TX_PWR -# endif // if FEATURE_SET_WIFI_TX_PWR +void doSetWiFiTXpower(float& dBm) { WiFi.setOutputPower(dBm); } + +# endif // if FEATURE_SET_WIFI_TX_PWR void setConnectionSpeed(bool ForceWiFi_bg_mode) { // ESP8266 only supports 802.11g mode when running in STA+AP - const bool forcedByAPmode = ESPEasy_WiFi_abstraction::WifiIsAP(WiFi.getMode()); - WiFiPhyMode_t phyMode = (ForceWiFi_bg_mode || forcedByAPmode) ? WIFI_PHY_MODE_11G : WIFI_PHY_MODE_11N; + const bool forcedByAPmode = WifiIsAP(WiFi.getMode()); + WiFiPhyMode_t phyMode = (ForceWiFi_bg_mode || forcedByAPmode) ? WIFI_PHY_MODE_11G : WIFI_PHY_MODE_11N; + if (!forcedByAPmode) { const WiFi_AP_Candidate candidate = WiFi_AP_Candidates.getCurrent(); + if (candidate.phy_known() && (candidate.bits.phy_11g != candidate.bits.phy_11n)) { if ((WIFI_PHY_MODE_11G == phyMode) && !candidate.bits.phy_11g) { phyMode = WIFI_PHY_MODE_11N; @@ -139,9 +328,10 @@ void setConnectionSpeed(bool ForceWiFi_bg_mode) { } else if ((WIFI_PHY_MODE_11N == phyMode) && !candidate.bits.phy_11n) { phyMode = WIFI_PHY_MODE_11G; addLog(LOG_LEVEL_INFO, F("WIFI : AP is set to 802.11g only")); - } + } } else { bool useAlternate = WiFiEventData.connectionFailures > 10; + if (useAlternate) { phyMode = (WIFI_PHY_MODE_11G == phyMode) ? WIFI_PHY_MODE_11N : WIFI_PHY_MODE_11G; } @@ -154,25 +344,25 @@ void setConnectionSpeed(bool ForceWiFi_bg_mode) { if (WiFi.getPhyMode() == phyMode) { return; } - #ifndef BUILD_NO_DEBUG + # ifndef BUILD_NO_DEBUG + if (loglevelActiveFor(LOG_LEVEL_INFO)) { String log = concat(F("WIFI : Set to 802.11"), (WIFI_PHY_MODE_11G == phyMode) ? 'g' : 'n'); + if (forcedByAPmode) { log += (F(" (AP+STA mode)")); } + if (Settings.ForceWiFi_bg_mode()) { log += F(" Force B/G mode"); } addLogMove(LOG_LEVEL_INFO, log); } - #endif + # endif // ifndef BUILD_NO_DEBUG WiFi.setPhyMode(phyMode); } -void setWiFiNoneSleep() -{ - WiFi.setSleepMode(WIFI_NONE_SLEEP); -} +void setWiFiNoneSleep() { WiFi.setSleepMode(WIFI_NONE_SLEEP); } void setWiFiEcoPowerMode() { @@ -180,17 +370,15 @@ void setWiFiEcoPowerMode() WiFi.setSleepMode(WIFI_LIGHT_SLEEP); } -void setWiFiDefaultPowerMode() -{ - WiFi.setSleepMode(WIFI_MODEM_SLEEP); +void setWiFiDefaultPowerMode() { WiFi.setSleepMode(WIFI_MODEM_SLEEP); } + +void setWiFiCountryPolicyManual() { + // Not yet implemented/required for ESP8266 } +} // namespace wifi +} // namespace net +} // namespace ESPEasy - - - - -} // namespace ESPEasy_WiFi_abstraction - - -#endif // ifdef ESP8266 +# endif // ifdef ESP8266 +#endif // if FEATURE_WIFI diff --git a/src/src/ESPEasyCore/ESPEasy_setup.cpp b/src/src/ESPEasyCore/ESPEasy_setup.cpp index 84a6384a3..cf3cca101 100644 --- a/src/src/ESPEasyCore/ESPEasy_setup.cpp +++ b/src/src/ESPEasyCore/ESPEasy_setup.cpp @@ -10,6 +10,7 @@ #include "../ESPEasyCore/ESPEasyNetwork.h" #include "../ESPEasyCore/ESPEasyRules.h" #include "../ESPEasyCore/ESPEasyWifi.h" +#include "../ESPEasyCore/ESPEasyWifi_abstracted.h" #include "../ESPEasyCore/ESPEasyWifi_ProcessEvent.h" #include "../ESPEasyCore/Serial.h" #include "../Globals/Cache.h" @@ -393,7 +394,7 @@ void ESPEasy_setup() if (initWiFi) { WiFi_AP_Candidates.clearCache(); WiFi_AP_Candidates.load_knownCredentials(); - setSTA(true); + ESPEasy::net::wifi::setSTA(true); if (!WiFi_AP_Candidates.hasCandidates()) { WiFiEventData.wifiSetup = true; RTC.clearLastWiFi(); // Must scan all channels @@ -416,14 +417,14 @@ void ESPEasy_setup() addLog(LOG_LEVEL_INFO, F("Setup: Scan all channels")); WifiScan(false); } -// setWifiMode(WIFI_OFF); +// ESPEasy::net::wifi::setWifiMode(WIFI_OFF); } #ifndef BUILD_NO_RAM_TRACKER logMemUsageAfter(F("WifiScan()")); #endif - // setWifiMode(WIFI_STA); + // ESPEasy::net::wifi::setWifiMode(WIFI_STA); checkRuleSets(); #ifndef BUILD_NO_RAM_TRACKER logMemUsageAfter(F("checkRuleSets()")); diff --git a/src/src/Helpers/Network.cpp b/src/src/Helpers/Network.cpp index 4d4d8cab8..0afe0376b 100644 --- a/src/src/Helpers/Network.cpp +++ b/src/src/Helpers/Network.cpp @@ -3,6 +3,7 @@ #include "../../ESPEasy_common.h" #include "../ESPEasyCore/ESPEasyWifi.h" +#include "../ESPEasyCore/ESPEasyWifi_abstracted.h" #include "../ESPEasyCore/ESPEasyNetwork.h" #include "../Globals/Settings.h" @@ -52,7 +53,7 @@ void statusLED(bool traffic) } // AP mode is active - else if (WifiIsAP(WiFi.getMode())) + else if ( ESPEasy::net::wifi::WifiIsAP(WiFi.getMode())) { nStatusValue = ((millis() >> 1) & PWMRANGE_FULL) - (PWMRANGE_FULL >> 2); // ramp up for 2 sec, 3/4 luminosity } diff --git a/src/src/Helpers/PeriodicalActions.cpp b/src/src/Helpers/PeriodicalActions.cpp index 4d444567d..d34444883 100644 --- a/src/src/Helpers/PeriodicalActions.cpp +++ b/src/src/Helpers/PeriodicalActions.cpp @@ -12,6 +12,7 @@ #include "../ESPEasyCore/ESPEasy_Log.h" #include "../ESPEasyCore/ESPEasyNetwork.h" #include "../ESPEasyCore/ESPEasyWifi.h" +#include "../ESPEasyCore/ESPEasyWifi_abstracted.h" #include "../ESPEasyCore/ESPEasyRules.h" #include "../ESPEasyCore/Serial.h" #include "../Globals/ESPEasyWiFiEvent.h" @@ -490,7 +491,7 @@ void prepareShutdown(IntendedRebootReason_e reason) process_serialWriteBuffer(); flushAndDisconnectAllClients(); saveUserVarToRTC(); - setWifiMode(WIFI_OFF); + ESPEasy::net::wifi::setWifiMode(WIFI_OFF); ESPEASY_FS.end(); process_serialWriteBuffer(); delay(100); // give the node time to flush all before reboot or sleep diff --git a/src/src/Helpers/WiFi_AP_CandidatesList.cpp b/src/src/Helpers/WiFi_AP_CandidatesList.cpp index 21b047aa4..7a4430166 100644 --- a/src/src/Helpers/WiFi_AP_CandidatesList.cpp +++ b/src/src/Helpers/WiFi_AP_CandidatesList.cpp @@ -144,12 +144,15 @@ bool WiFi_AP_CandidatesList::getNext(bool scanAllowed) { load_knownCredentials(); if (candidates.empty()) { - if (scanAllowed) { + return false; + +/* if (scanAllowed) { return false; } loadCandidatesFromScanned(); attemptsLeft = 1; if (candidates.empty()) { return false; } + */ } currentCandidate = candidates.front(); diff --git a/src/src/WebServer/AccessControl.cpp b/src/src/WebServer/AccessControl.cpp index 2723391ad..b463b3613 100644 --- a/src/src/WebServer/AccessControl.cpp +++ b/src/src/WebServer/AccessControl.cpp @@ -3,6 +3,7 @@ #include "../ESPEasyCore/ESPEasy_Log.h" #include "../ESPEasyCore/ESPEasyNetwork.h" #include "../ESPEasyCore/ESPEasyWifi.h" +#include "../ESPEasyCore/ESPEasyWifi_abstracted.h" #include "../Globals/SecuritySettings.h" #include "../Globals/Services.h" @@ -57,7 +58,7 @@ bool getIPallowedRange(IPAddress& low, IPAddress& high) switch (SecuritySettings.IPblockLevel) { case LOCAL_SUBNET_ALLOWED: - if (WifiIsAP(WiFi.getMode())) { + if ( ESPEasy::net::wifi::WifiIsAP(WiFi.getMode())) { // WiFi is active as accesspoint, do not check. return false; } @@ -114,7 +115,7 @@ boolean clientIPallowed() return true; } - if (WifiIsAP(WiFi.getMode())) { + if ( ESPEasy::net::wifi::WifiIsAP(WiFi.getMode())) { // @TD-er Fixme: Should match subnet of SoftAP. return true; } diff --git a/src/src/WebServer/ESPEasy_WebServer.cpp b/src/src/WebServer/ESPEasy_WebServer.cpp index 467efb1b1..b5311c349 100644 --- a/src/src/WebServer/ESPEasy_WebServer.cpp +++ b/src/src/WebServer/ESPEasy_WebServer.cpp @@ -53,6 +53,7 @@ #include "../ESPEasyCore/ESPEasyNetwork.h" #include "../ESPEasyCore/ESPEasyRules.h" #include "../ESPEasyCore/ESPEasyWifi.h" +#include "../ESPEasyCore/ESPEasyWifi_abstracted.h" #include "../Globals/CPlugins.h" #include "../Globals/Device.h" @@ -127,7 +128,7 @@ void sendHeadandTail_stdtemplate(bool Tail, bool rebooting) { sendHeadandTail(F("TmplStd"), Tail, rebooting); if (!Tail) { - if (!clientIPinSubnet() && WifiIsAP(WiFi.getMode()) && (WiFi.softAPgetStationNum() > 0)) { + if (!clientIPinSubnet() && ESPEasy::net::wifi::WifiIsAP(WiFi.getMode()) && (WiFi.softAPgetStationNum() > 0)) { addHtmlError(F("Warning: Connected via AP")); } diff --git a/src/src/WebServer/SetupPage.cpp b/src/src/WebServer/SetupPage.cpp index 373f98634..51ea58abb 100644 --- a/src/src/WebServer/SetupPage.cpp +++ b/src/src/WebServer/SetupPage.cpp @@ -13,6 +13,7 @@ # include "../ESPEasyCore/ESPEasyNetwork.h" # include "../ESPEasyCore/ESPEasyWifi.h" +#include "../ESPEasyCore/ESPEasyWifi_abstracted.h" # include "../Globals/ESPEasyWiFiEvent.h" # include "../Globals/NetworkState.h" @@ -250,7 +251,7 @@ void handle_setup_scan_and_show(const String& ssid, const String& other, const S WiFiMode_t cur_wifimode = WiFi.getMode(); WifiScan(false); scanCompleteStatus = WiFi_AP_Candidates.scanComplete(); - setWifiMode(cur_wifimode); + ESPEasy::net::wifi::setWifiMode(cur_wifimode); } diff --git a/src/src/WebServer/WiFiScanner.cpp b/src/src/WebServer/WiFiScanner.cpp index 88a530219..207e23413 100644 --- a/src/src/WebServer/WiFiScanner.cpp +++ b/src/src/WebServer/WiFiScanner.cpp @@ -5,6 +5,7 @@ #include "../WebServer/HTML_wrappers.h" #include "../ESPEasyCore/ESPEasyWifi.h" +#include "../ESPEasyCore/ESPEasyWifi_abstracted.h" #include "../Globals/WiFi_AP_Candidates.h" #include "../Helpers/StringGenerator_WiFi.h" @@ -31,7 +32,7 @@ void handle_wifiscanner_json() { if (WiFi_AP_Candidates.scanComplete() <= 0) { WiFiMode_t cur_wifimode = WiFi.getMode(); WifiScan(false); - setWifiMode(cur_wifimode); + ESPEasy::net::wifi::setWifiMode(cur_wifimode); } for (auto it = WiFi_AP_Candidates.scanned_begin(); it != WiFi_AP_Candidates.scanned_end(); ++it) @@ -68,7 +69,7 @@ void handle_wifiscanner() { WiFiMode_t cur_wifimode = WiFi.getMode(); WifiScan(false); int8_t scanCompleteStatus = WiFi_AP_Candidates.scanComplete(); - setWifiMode(cur_wifimode); + ESPEasy::net::wifi::setWifiMode(cur_wifimode); navMenuIndex = MENU_INDEX_TOOLS; TXBuffer.startStream(); diff --git a/uncrustify.cfg b/uncrustify.cfg index 72537534e..2ece31b8d 100644 --- a/uncrustify.cfg +++ b/uncrustify.cfg @@ -950,7 +950,7 @@ indent_namespace = false # true/false # Whether to indent only the first namespace, and not any nested namespaces. # Requires indent_namespace=true. -indent_namespace_single_indent = false # true/false +indent_namespace_single_indent = true # true/false # The number of spaces to indent a namespace block. # If set to zero, use the value indent_columns @@ -1242,7 +1242,7 @@ indent_ignore_asm_block = false # true/false nl_collapse_empty_body = true # true/false # Don't split one-line braced assignments, as in 'foo_t f = { 1, 2 };'. -nl_assign_leave_one_liners = false # true/false +nl_assign_leave_one_liners = true # true/false # Don't split one-line braced statements inside a 'class xx { }' body. nl_class_leave_one_liners = false # true/false @@ -1251,19 +1251,19 @@ nl_class_leave_one_liners = false # true/false nl_enum_leave_one_liners = false # true/false # Don't split one-line get or set functions. -nl_getset_leave_one_liners = false # true/false +nl_getset_leave_one_liners = true # true/false # (C#) Don't split one-line property get or set functions. nl_cs_property_leave_one_liners = false # true/false # Don't split one-line function definitions, as in 'int foo() { return 0; }'. -nl_func_leave_one_liners = false # true/false +nl_func_leave_one_liners = true # true/false # Don't split one-line C++11 lambdas, as in '[]() { return 0; }'. nl_cpp_lambda_leave_one_liners = false # true/false # Don't split one-line if/else statements, as in 'if(...) b++;'. -nl_if_leave_one_liners = false # true/false +nl_if_leave_one_liners = true # true/false # Don't split one-line while statements, as in 'while(...) b++;'. nl_while_leave_one_liners = false # true/false @@ -1410,16 +1410,16 @@ nl_using_brace = ignore # ignore/add/remove/force # Add or remove newline between two open or close braces. Due to general # newline/brace handling, REMOVE may not work. -nl_brace_brace = ignore # ignore/add/remove/force +nl_brace_brace = add # ignore/add/remove/force # Add or remove newline between 'do' and '{'. -nl_do_brace = ignore # ignore/add/remove/force +nl_do_brace = add # ignore/add/remove/force # Add or remove newline between '}' and 'while' of 'do' statement. nl_brace_while = ignore # ignore/add/remove/force # Add or remove newline between 'switch' and '{'. -nl_switch_brace = ignore # ignore/add/remove/force +nl_switch_brace = add # ignore/add/remove/force # Add or remove newline between 'synchronized' and '{'. nl_synchronized_brace = ignore # ignore/add/remove/force @@ -1429,7 +1429,7 @@ nl_synchronized_brace = ignore # ignore/add/remove/force # # Overrides nl_for_brace, nl_if_brace, nl_switch_brace, nl_while_switch and # nl_catch_brace. -nl_multi_line_cond = false # true/false +nl_multi_line_cond = true # true/false # Force a newline in a define after the macro name for multi-line defines. nl_multi_line_define = false # true/false @@ -1444,7 +1444,7 @@ nl_after_case = false # true/false # Add or remove newline between a case ':' and '{'. # # Overrides nl_after_case. -nl_case_colon_brace = ignore # ignore/add/remove/force +nl_case_colon_brace = add # ignore/add/remove/force # Add or remove newline between ')' and 'throw'. nl_before_throw = ignore # ignore/add/remove/force @@ -1456,7 +1456,7 @@ nl_namespace_brace = remove # ignore/add/remove/force nl_template_class = ignore # ignore/add/remove/force # Add or remove newline between 'class' and '{'. -nl_class_brace = remove # ignore/add/remove/force +nl_class_brace = add # ignore/add/remove/force # Add or remove newline before or after (depending on pos_class_comma, # may not be IGNORE) each',' in the base class list. @@ -1465,11 +1465,11 @@ nl_class_init_args = add # ignore/add/remove/force # Add or remove newline after each ',' in the constructor member # initialization. Related to nl_constr_colon, pos_constr_colon and # pos_constr_comma. -nl_constr_init_args = ignore # ignore/add/remove/force +nl_constr_init_args = add # ignore/add/remove/force # Add or remove newline before first element, after comma, and after last # element, in 'enum'. -nl_enum_own_lines = ignore # ignore/add/remove/force +nl_enum_own_lines = add # ignore/add/remove/force # Add or remove newline between return type and function name in a function # definition. @@ -1610,7 +1610,7 @@ nl_cpp_ldef_brace = ignore # ignore/add/remove/force nl_return_expr = ignore # ignore/add/remove/force # Whether to add a newline after semicolons, except in 'for' statements. -nl_after_semicolon = false # true/false +nl_after_semicolon = true # true/false # (Java) Add or remove newline between the ')' and '{{' of the double brace # initializer. @@ -1752,7 +1752,7 @@ nl_create_while_one_liner = true # true/false # Whether to collapse a function definition whose body (not counting braces) # is only one line so that the entire definition (prototype, braces, body) is # a single line. -nl_create_func_def_one_liner = false # true/false +nl_create_func_def_one_liner = true # true/false # Whether to split one-line simple unbraced if statements into two lines by # adding a newline, as in 'if(b) i++;'. @@ -1780,7 +1780,7 @@ nl_max_blank_in_func = 0 # unsigned number nl_before_func_body_proto = 0 # unsigned number # The number of newlines before a multi-line function definition. -nl_before_func_body_def = 0 # unsigned number +nl_before_func_body_def = 2 # unsigned number # The number of newlines before a class constructor/destructor prototype. nl_before_func_class_proto = 0 # unsigned number @@ -1789,7 +1789,7 @@ nl_before_func_class_proto = 0 # unsigned number nl_before_func_class_def = 0 # unsigned number # The number of newlines after a function prototype. -nl_after_func_proto = 0 # unsigned number +nl_after_func_proto = 1 # unsigned number # The number of newlines after a function prototype, if not followed by # another function prototype. @@ -1816,7 +1816,7 @@ nl_after_func_body = 2 # unsigned number # declaration. Also affects class constructors/destructors. # # Overrides nl_after_func_body. -nl_after_func_body_class = 0 # unsigned number +nl_after_func_body_class = 2 # unsigned number # The number of newlines after '}' of a single line function body. Also # affects class constructors/destructors. @@ -1884,13 +1884,13 @@ nl_after_multiline_comment = true # true/false nl_after_label_colon = false # true/false # The number of newlines after '}' or ';' of a struct/enum/union definition. -nl_after_struct = 0 # unsigned number +nl_after_struct = 2 # unsigned number # The number of newlines before a class definition. -nl_before_class = 0 # unsigned number +nl_before_class = 2 # unsigned number # The number of newlines after '}' or ';' of a class definition. -nl_after_class = 0 # unsigned number +nl_after_class = 2 # unsigned number # The number of newlines before an access specifier label. This also includes # the Qt-specific 'signals:' and 'slots:'. Will not change the newline count @@ -1944,10 +1944,10 @@ nl_property_brace = ignore # ignore/add/remove/force nl_inside_namespace = 0 # unsigned number # Whether to remove blank lines after '{'. -eat_blanks_after_open_brace = true # true/false +eat_blanks_after_open_brace = false # true/false # Whether to remove blank lines before '}'. -eat_blanks_before_close_brace = true # true/false +eat_blanks_before_close_brace = false # true/false # How aggressively to remove extra newlines not in preprocessor. # @@ -2531,11 +2531,11 @@ mod_add_long_function_closebrace_comment = 0 # unsigned number # If a namespace body exceeds the specified number of newlines and doesn't # have a comment after the close brace, a comment will be added. -mod_add_long_namespace_closebrace_comment = 0 # unsigned number +mod_add_long_namespace_closebrace_comment = 10 # unsigned number # If a class body exceeds the specified number of newlines and doesn't have a # comment after the close brace, a comment will be added. -mod_add_long_class_closebrace_comment = 0 # unsigned number +mod_add_long_class_closebrace_comment = 10 # unsigned number # If a switch body exceeds the specified number of newlines and doesn't have a # comment after the close brace, a comment will be added. @@ -2543,14 +2543,14 @@ mod_add_long_switch_closebrace_comment = 0 # unsigned number # If an #ifdef body exceeds the specified number of newlines and doesn't have # a comment after the #endif, a comment will be added. -mod_add_long_ifdef_endif_comment = 1 # unsigned number +mod_add_long_ifdef_endif_comment = 2 # unsigned number # If an #ifdef or #else body exceeds the specified number of newlines and # doesn't have a comment after the #else, a comment will be added. -mod_add_long_ifdef_else_comment = 1 # unsigned number +mod_add_long_ifdef_else_comment = 2 # unsigned number # Whether to sort consecutive single-line 'import' statements. -mod_sort_import = false # true/false +mod_sort_import = true # true/false # (C#) Whether to sort consecutive single-line 'using' statements. mod_sort_using = false # true/false From b5f360de1d21be90b987076bdbc06926d00b9a5f Mon Sep 17 00:00:00 2001 From: TD-er Date: Sun, 3 Nov 2024 00:47:56 +0100 Subject: [PATCH 005/564] [WiFi] Start using simplified state machine for WiFi --- src/src/DataStructs/WiFiEventData.cpp | 2 +- src/src/DataTypes/WiFi_State.cpp | 31 + src/src/DataTypes/WiFi_State.h | 2 + .../ESPEasyCore/ESPEasyWiFi_state_machine.cpp | 183 ++-- .../ESPEasyCore/ESPEasyWiFi_state_machine.h | 4 +- .../ESPEasyWiFi_state_machine_ESP32.cpp | 4 +- .../ESPEasyWiFi_state_machine_ESP8266.cpp | 2 +- src/src/ESPEasyCore/ESPEasyWifi.cpp | 896 ++++-------------- src/src/ESPEasyCore/ESPEasyWifi.h | 2 +- .../ESPEasyCore/ESPEasyWifi_ProcessEvent.cpp | 411 ++++---- .../ESPEasyWifi_abstracted_ESP32.cpp | 2 +- .../ESPEasyWifi_abstracted_ESP8266.cpp | 2 +- src/src/ESPEasyCore/ESPEasy_loop.cpp | 3 + src/src/Globals/ESPEasyWiFiEvent.cpp | 1 + src/src/Globals/ESPEasyWiFiEvent.h | 3 + src/src/Helpers/WiFi_AP_CandidatesList.cpp | 10 +- src/src/Helpers/WiFi_AP_CandidatesList.h | 4 +- 17 files changed, 580 insertions(+), 982 deletions(-) create mode 100644 src/src/DataTypes/WiFi_State.cpp diff --git a/src/src/DataStructs/WiFiEventData.cpp b/src/src/DataStructs/WiFiEventData.cpp index f34da0d7e..0996d94c4 100644 --- a/src/src/DataStructs/WiFiEventData.cpp +++ b/src/src/DataStructs/WiFiEventData.cpp @@ -160,7 +160,7 @@ void WiFiEventData_t::setWiFiConnected() { } void WiFiEventData_t::setWiFiServicesInitialized() { - if (!unprocessedWifiEvents() && WiFiConnected() && WiFiGotIP()) { + if (/*!unprocessedWifiEvents() && */ WiFiConnected() && WiFiGotIP()) { # ifndef BUILD_NO_DEBUG addLog(LOG_LEVEL_DEBUG, F("WiFi : WiFi services initialized")); #endif diff --git a/src/src/DataTypes/WiFi_State.cpp b/src/src/DataTypes/WiFi_State.cpp new file mode 100644 index 000000000..5aa6382d5 --- /dev/null +++ b/src/src/DataTypes/WiFi_State.cpp @@ -0,0 +1,31 @@ +#include "../DataTypes/WiFi_State.h" + +#if FEATURE_WIFI + + +namespace ESPEasy { +namespace net { +namespace wifi { + +const __FlashStringHelper* toString(WiFiState_e state) +{ + switch (state) + { + case ESPEasy::net::wifi::WiFiState_e::Disabled: return F("Disabled"); + case ESPEasy::net::wifi::WiFiState_e::OFF: return F("OFF"); + case ESPEasy::net::wifi::WiFiState_e::AP_only: return F("AP_only"); + case ESPEasy::net::wifi::WiFiState_e::IdleWaiting: return F("IdleWaiting"); + case ESPEasy::net::wifi::WiFiState_e::STA_Scanning: return F("STA_Scanning"); + case ESPEasy::net::wifi::WiFiState_e::STA_AP_Scanning: return F("STA_AP_Scanning"); + case ESPEasy::net::wifi::WiFiState_e::STA_Connecting: return F("STA_Connecting"); + case ESPEasy::net::wifi::WiFiState_e::STA_Reconnecting: return F("STA_Reconnecting"); + case ESPEasy::net::wifi::WiFiState_e::STA_Connected: return F("STA_Connected"); + } + return F(""); +} + +} // namespace wifi +} // namespace net +} // namespace ESPEasy + +#endif // if FEATURE_WIFI diff --git a/src/src/DataTypes/WiFi_State.h b/src/src/DataTypes/WiFi_State.h index 62d5ff9cf..f20ce86e3 100644 --- a/src/src/DataTypes/WiFi_State.h +++ b/src/src/DataTypes/WiFi_State.h @@ -85,6 +85,8 @@ enum class WiFiState_e }; +const __FlashStringHelper * toString(WiFiState_e state); + } // namespace wifi } // namespace net diff --git a/src/src/ESPEasyCore/ESPEasyWiFi_state_machine.cpp b/src/src/ESPEasyCore/ESPEasyWiFi_state_machine.cpp index 5cec46c7b..923a009ba 100644 --- a/src/src/ESPEasyCore/ESPEasyWiFi_state_machine.cpp +++ b/src/src/ESPEasyCore/ESPEasyWiFi_state_machine.cpp @@ -6,8 +6,9 @@ # include "../ESPEasyCore/ESPEasyWifi_abstracted.h" -#include "../ESPEasyCore/ESPEasyNetwork.h" // for setNetworkMedium, however this should not be part of the WiFi code +# include "../ESPEasyCore/ESPEasyNetwork.h" // for setNetworkMedium, however this should not be part of the WiFi code +# include "../ESPEasyCore/ESPEasy_Log.h" # include "../Globals/ESPEasyWiFiEvent.h" # include "../Globals/RTC.h" @@ -20,8 +21,8 @@ namespace ESPEasy { namespace net { namespace wifi { - # define WIFI_STATE_MACHINE_STA_CONNECTING_TIMEOUT 20000 - # define WIFI_STATE_MACHINE_STA_AP_SCANNING_TIMEOUT 20000 + # define WIFI_STATE_MACHINE_STA_CONNECTING_TIMEOUT 2000 + # define WIFI_STATE_MACHINE_STA_AP_SCANNING_TIMEOUT 10000 # define WIFI_STATE_MACHINE_STA_SCANNING_TIMEOUT 10000 void ESPEasyWiFi_t::setup() { @@ -44,12 +45,16 @@ void ESPEasyWiFi_t::enable() {} void ESPEasyWiFi_t::disable() {} -void ESPEasyWiFi_t::begin() {} +void ESPEasyWiFi_t::begin() { setState(WiFiState_e::IdleWaiting, 100); } void ESPEasyWiFi_t::loop() { + // TODO TD-er: Must inspect WiFiEventData to see if we need to update some state here. + + if (_state != WiFiState_e::IdleWaiting) { - if (_callbackError || (_state_timeout.isSet() && _state_timeout.timeReached())) + if (_callbackError || + (_state_timeout.isSet() && _state_timeout.timeReached())) { // TODO TD-er: Must check what error was given??? _callbackError = false; @@ -64,20 +69,20 @@ void ESPEasyWiFi_t::loop() break; case WiFiState_e::OFF: begin(); - setState(WiFiState_e::IdleWaiting, 100); + + // setState(WiFiState_e::IdleWaiting, 100); break; case WiFiState_e::AP_only: break; case WiFiState_e::IdleWaiting: - // Wait for timeout to expire if (_state_timeout.timeReached()) { // Do we have candidate to connect to ? if (WiFi_AP_Candidates.hasCandidates()) { setState(WiFiState_e::STA_Connecting, WIFI_STATE_MACHINE_STA_CONNECTING_TIMEOUT); } else if (WifiIsAP(WiFi.getMode())) { - // TODO TD-er: Must check if any client is connected. - // If not, then we can disable AP mode and switch to WiFiState_e::STA_Scanning + // TODO TD-er: Must check if any client is connected. + // If not, then we can disable AP mode and switch to WiFiState_e::STA_Scanning setState(WiFiState_e::STA_AP_Scanning, WIFI_STATE_MACHINE_STA_AP_SCANNING_TIMEOUT); } else { setState(WiFiState_e::STA_Scanning, WIFI_STATE_MACHINE_STA_SCANNING_TIMEOUT); @@ -86,6 +91,11 @@ void ESPEasyWiFi_t::loop() break; case WiFiState_e::STA_Scanning: case WiFiState_e::STA_AP_Scanning: + + if (_state_timeout.timeReached() || (WiFi.scanComplete() >= 0)) { + setState(WiFiState_e::OFF, 100); + } + // Check if scanning is finished // When scanning per channel, call for scanning next channel break; @@ -93,18 +103,21 @@ void ESPEasyWiFi_t::loop() case WiFiState_e::STA_Reconnecting: // Check if (re)connecting has finished - if (getSTA_connected_state() != STA_connected_state::Connecting) { - if (getSTA_connected_state() == STA_connected_state::Connected) { - setState(WiFiState_e::STA_Connected); + { + const STA_connected_state sta_connected_state = getSTA_connected_state(); + + if (sta_connected_state == STA_connected_state::Connected) { + setState(WiFiState_e::STA_Connected); + } else if (_state_timeout.timeReached()) { + if (_state == WiFiState_e::STA_Connecting) { + setState(WiFiState_e::STA_Reconnecting, WIFI_STATE_MACHINE_STA_CONNECTING_TIMEOUT); } else { - if (_state == WiFiState_e::STA_Connecting) { - setState(WiFiState_e::STA_Reconnecting, WIFI_STATE_MACHINE_STA_CONNECTING_TIMEOUT); - } else { - setState(WiFiState_e::OFF); - } + setState(WiFiState_e::OFF); } } + break; + } case WiFiState_e::STA_Connected: // Check if still connected @@ -130,6 +143,11 @@ void ESPEasyWiFi_t::loop() # endif // ifdef USE_IMPROV } +bool ESPEasyWiFi_t::connected() const +{ + return getSTA_connected_state() == STA_connected_state::Connected; +} + IPAddress ESPEasyWiFi_t::getIP() const { IPAddress res; @@ -140,6 +158,26 @@ IPAddress ESPEasyWiFi_t::getIP() const void ESPEasyWiFi_t::disconnect() {} void ESPEasyWiFi_t::setState(WiFiState_e newState, uint32_t timeout) { + if (loglevelActiveFor(LOG_LEVEL_INFO)) { + addLog( + LOG_LEVEL_INFO, + concat(F("WiFi : Set state from: "), toString(_state)) + + concat(F(" to: "), toString(newState)) + + concat(F(" timeout: "), timeout)); + } + + if (timeout == 0) + { + _state_timeout.clear(); + + } else { + _state_timeout.setMillisFromNow(timeout); + } + + _last_state_change.setNow(); + _state = newState; + + switch (newState) { case WiFiState_e::Disabled: @@ -155,6 +193,7 @@ void ESPEasyWiFi_t::setState(WiFiState_e newState, uint32_t timeout) { break; case WiFiState_e::STA_Scanning: // Start scanning + startScanning(); break; case WiFiState_e::STA_AP_Scanning: // Start scanning per channel @@ -166,18 +205,9 @@ void ESPEasyWiFi_t::setState(WiFiState_e newState, uint32_t timeout) { break; case WiFiState_e::STA_Connected: _last_seen_connected.setNow(); + _state_timeout.clear(); break; } - - if (timeout == 0) - { - _state_timeout.clear(); - - } else { - _state_timeout.setMillisFromNow(timeout); - } - _last_state_change.setNow(); - _state = newState; } void ESPEasyWiFi_t::checkConnectProgress() {} @@ -216,7 +246,8 @@ bool ESPEasyWiFi_t::connectSTA() # endif // if defined(ESP8266) # if defined(ESP32) - WiFi.config(INADDR_NONE, INADDR_NONE, INADDR_NONE); + + // WiFi.config(INADDR_NONE, INADDR_NONE, INADDR_NONE); # endif // if defined(ESP32) setConnectionSpeed(); setupStaticIPconfig(); @@ -224,59 +255,67 @@ bool ESPEasyWiFi_t::connectSTA() // Start the process of connecting or starting AP if (!WiFi_AP_Candidates.getNext(true)) { + startScanning(); return false; } - const WiFi_AP_Candidate candidate = WiFi_AP_Candidates.getCurrent(); + const WiFi_AP_Candidate candidate = WiFi_AP_Candidates.getCurrent(); - if (loglevelActiveFor(LOG_LEVEL_INFO)) { - addLogMove(LOG_LEVEL_INFO, strformat( - F("WIFI : Connecting %s attempt #%u"), - candidate.toString().c_str(), - _connect_attempt)); + if (loglevelActiveFor(LOG_LEVEL_INFO)) { + addLogMove(LOG_LEVEL_INFO, strformat( + F("WIFI : Connecting %s attempt #%u"), + candidate.toString().c_str(), + _connect_attempt)); + } + WiFiEventData.markWiFiBegin(); + + if (prepareWiFi()) { + setNetworkMedium(NetworkMedium_t::WIFI); + RTC.clearLastWiFi(); + RTC.lastWiFiSettingsIndex = candidate.index; + + float tx_pwr = 0; // Will be set higher based on RSSI when needed. + // FIXME TD-er: Must check WiFiEventData.wifi_connect_attempt to increase TX power +# if FEATURE_SET_WIFI_TX_PWR + + if (Settings.UseMaxTXpowerForSending()) { + tx_pwr = Settings.getWiFi_TX_power(); } - WiFiEventData.markWiFiBegin(); - if (prepareWiFi()) { - setNetworkMedium(NetworkMedium_t::WIFI); - RTC.clearLastWiFi(); - RTC.lastWiFiSettingsIndex = candidate.index; - - float tx_pwr = 0; // Will be set higher based on RSSI when needed. - // FIXME TD-er: Must check WiFiEventData.wifi_connect_attempt to increase TX power -#if FEATURE_SET_WIFI_TX_PWR - if (Settings.UseMaxTXpowerForSending()) { - tx_pwr = Settings.getWiFi_TX_power(); - } - SetWiFiTXpower(tx_pwr, candidate.rssi); -#endif - // Start connect attempt now, so no longer needed to attempt new connection. - WiFiEventData.wifiConnectAttemptNeeded = false; - WiFiEventData.wifiConnectInProgress = true; - const String key = WiFi_AP_CandidatesList::get_key(candidate.index); + SetWiFiTXpower(tx_pwr, candidate.rssi); +# endif // if FEATURE_SET_WIFI_TX_PWR -#if FEATURE_USE_IPV6 - if (Settings.EnableIPv6()) { - WiFi.enableIPv6(true); - } -#endif + // Start connect attempt now, so no longer needed to attempt new connection. + WiFiEventData.wifiConnectAttemptNeeded = false; + WiFiEventData.wifiConnectInProgress = true; + const String key = WiFi_AP_CandidatesList::get_key(candidate.index); -#ifdef ESP32 - if (Settings.IncludeHiddenSSID()) { - setWiFiCountryPolicyManual(); - } -#endif - - - if ((Settings.HiddenSSID_SlowConnectPerBSSID() || !candidate.bits.isHidden) - && candidate.allowQuickConnect()) { - WiFi.begin(candidate.ssid.c_str(), key.c_str(), candidate.channel, candidate.bssid.mac); - } else { - WiFi.begin(candidate.ssid.c_str(), key.c_str()); - } - // Always wait for a second - WiFi.waitForConnectResult(1000); // https://github.com/arendst/Tasmota/issues/14985 +# if FEATURE_USE_IPV6 + if (Settings.EnableIPv6()) { + WiFi.enableIPv6(true); } +# endif // if FEATURE_USE_IPV6 + +# ifdef ESP32 + + if (Settings.IncludeHiddenSSID()) { + setWiFiCountryPolicyManual(); + } +# endif // ifdef ESP32 + + + if ((Settings.HiddenSSID_SlowConnectPerBSSID() || !candidate.bits.isHidden) + && candidate.allowQuickConnect() + && (_state == WiFiState_e::STA_Reconnecting)) { + WiFi.begin(candidate.ssid.c_str(), key.c_str(), candidate.channel, candidate.bssid.mac); + } else { + WiFi.begin(candidate.ssid.c_str(), key.c_str()); + } + + // Always wait for a second + WiFi.waitForConnectResult(1000); // https://github.com/arendst/Tasmota/issues/14985 + + } return true; } diff --git a/src/src/ESPEasyCore/ESPEasyWiFi_state_machine.h b/src/src/ESPEasyCore/ESPEasyWiFi_state_machine.h index 9ae2f044e..a5ec96ad0 100644 --- a/src/src/ESPEasyCore/ESPEasyWiFi_state_machine.h +++ b/src/src/ESPEasyCore/ESPEasyWiFi_state_machine.h @@ -44,6 +44,8 @@ public: return _state; } + bool connected() const; + // Get the IP-address in this order: // - STA interface if connected, // - AP interface if active @@ -67,7 +69,7 @@ private: bool connectSTA(); - STA_connected_state getSTA_connected_state(); + STA_connected_state getSTA_connected_state() const; WiFi_AP_Candidate _active_sta; WiFi_AP_Candidate _AP_conf; diff --git a/src/src/ESPEasyCore/ESPEasyWiFi_state_machine_ESP32.cpp b/src/src/ESPEasyCore/ESPEasyWiFi_state_machine_ESP32.cpp index 96c546ef0..bdeeb3ea7 100644 --- a/src/src/ESPEasyCore/ESPEasyWiFi_state_machine_ESP32.cpp +++ b/src/src/ESPEasyCore/ESPEasyWiFi_state_machine_ESP32.cpp @@ -18,7 +18,7 @@ namespace ESPEasy { namespace net { namespace wifi { -STA_connected_state ESPEasyWiFi_t::getSTA_connected_state() +STA_connected_state ESPEasyWiFi_t::getSTA_connected_state() const { switch (WiFi.status()) { @@ -33,7 +33,7 @@ STA_connected_state ESPEasyWiFi_t::getSTA_connected_state() return STA_connected_state::Error_Connect_Failed; case WL_IDLE_STATUS: - return STA_connected_state::Idle; + return STA_connected_state::Connecting; case WL_NO_SHIELD: diff --git a/src/src/ESPEasyCore/ESPEasyWiFi_state_machine_ESP8266.cpp b/src/src/ESPEasyCore/ESPEasyWiFi_state_machine_ESP8266.cpp index 0cc60ec33..aad6d5367 100644 --- a/src/src/ESPEasyCore/ESPEasyWiFi_state_machine_ESP8266.cpp +++ b/src/src/ESPEasyCore/ESPEasyWiFi_state_machine_ESP8266.cpp @@ -10,7 +10,7 @@ namespace net { namespace wifi { -STA_connected_state ESPEasyWiFi_t::getSTA_connected_state() +STA_connected_state ESPEasyWiFi_t::getSTA_connected_state() const { // Perform check on SDK function, see: https://github.com/esp8266/Arduino/issues/7432 station_status_t status = wifi_station_get_connect_status(); diff --git a/src/src/ESPEasyCore/ESPEasyWifi.cpp b/src/src/ESPEasyCore/ESPEasyWifi.cpp index 72f38eab2..994720c03 100644 --- a/src/src/ESPEasyCore/ESPEasyWifi.cpp +++ b/src/src/ESPEasyCore/ESPEasyWifi.cpp @@ -2,40 +2,39 @@ #if FEATURE_WIFI -#include "../../ESPEasy-Globals.h" -#include "../DataStructs/TimingStats.h" -#include "../ESPEasyCore/ESPEasyNetwork.h" -#include "../ESPEasyCore/ESPEasyWifi_ProcessEvent.h" -#include "../ESPEasyCore/ESPEasy_Log.h" -#include "../ESPEasyCore/Serial.h" -#include "../Globals/ESPEasyWiFiEvent.h" -#include "../Globals/EventQueue.h" -#include "../Globals/NetworkState.h" -#include "../Globals/Nodes.h" -#include "../Globals/RTC.h" -#include "../Globals/SecuritySettings.h" -#include "../Globals/Services.h" -#include "../Globals/Settings.h" -#include "../Globals/WiFi_AP_Candidates.h" -#include "../Helpers/ESPEasy_time_calc.h" -#include "../Helpers/Hardware_defines.h" -#include "../Helpers/Misc.h" -#include "../Helpers/Networking.h" -#include "../Helpers/StringConverter.h" -#include "../Helpers/StringGenerator_WiFi.h" -#include "../Helpers/StringProvider.h" +# include "../../ESPEasy-Globals.h" +# include "../DataStructs/TimingStats.h" +# include "../ESPEasyCore/ESPEasyNetwork.h" +# include "../ESPEasyCore/ESPEasyWifi_ProcessEvent.h" +# include "../ESPEasyCore/ESPEasy_Log.h" +# include "../ESPEasyCore/Serial.h" +# include "../Globals/ESPEasyWiFiEvent.h" +# include "../Globals/EventQueue.h" +# include "../Globals/NetworkState.h" +# include "../Globals/Nodes.h" +# include "../Globals/RTC.h" +# include "../Globals/SecuritySettings.h" +# include "../Globals/Services.h" +# include "../Globals/Settings.h" +# include "../Globals/WiFi_AP_Candidates.h" +# include "../Helpers/ESPEasy_time_calc.h" +# include "../Helpers/Hardware_defines.h" +# include "../Helpers/Misc.h" +# include "../Helpers/Networking.h" +# include "../Helpers/StringConverter.h" +# include "../Helpers/StringGenerator_WiFi.h" +# include "../Helpers/StringProvider.h" - -#include "../ESPEasyCore/ESPEasyWifi_abstracted.h" +# include "../ESPEasyCore/ESPEasyWifi_abstracted.h" -#ifdef ESP32 -#include -#include // Needed to call ESP-IDF functions like esp_wifi_.... +# ifdef ESP32 +# include +# include // Needed to call ESP-IDF functions like esp_wifi_.... -#include -#endif +# include +# endif // ifdef ESP32 // ******************************************************************************** @@ -78,10 +77,10 @@ - Set timerAPstart when "valid WiFi connection" state is observed. - Disable timerAPstart when ESPEASY_WIFI_SERVICES_INITIALIZED wifi state is reached. - For the first attempt to connect after a cold boot (RTC values are 0), a WiFi scan will be + For the first attempt to connect after a cold boot (RTC values are 0), a WiFi scan will be performed to find the strongest known SSID. This will set RTC.lastBSSID and RTC.lastWiFiChannel - + Quick reconnect (using BSSID/channel of last connection) when both apply: - If wifi_connect_attempt < 3 - RTC.lastBSSID is known @@ -106,321 +105,28 @@ // ******************************************************************************** bool WiFiConnected() { START_TIMER; - - static bool recursiveCall = false; - static uint32_t lastCheckedTime = 0; - static bool lastState = false; - -#if FEATURE_USE_IPV6 - if (!WiFiEventData.processedGotIP6) { - processGotIPv6(); - } -#endif - - if (! ESPEasy::net::wifi::WifiIsSTA(WiFi.getMode())) { - lastState = false; - return lastState; - } - const int32_t timePassed = timePassedSince(lastCheckedTime); + if (lastCheckedTime != 0) { - if (timePassed < 100) { - if (WiFiEventData.lastDisconnectMoment.isSet() && - WiFiEventData.lastDisconnectMoment.millisPassedSince() > timePassed) - { - // Try to rate-limit the nr of calls to this function or else it will be called 1000's of times a second. - return lastState; - } - } if (timePassed < 10) { // Rate limit time spent in WiFiConnected() to max. 100x per sec to process the rest of this function - return lastState; + return ESPEasyWiFi.connected(); } - } - - - - if (WiFiEventData.unprocessedWifiEvents()) { return false; } - - bool wifi_isconnected = ESPEasy::net::wifi::WiFiConnected(); - - if (recursiveCall) return wifi_isconnected; - recursiveCall = true; - - - // For ESP82xx, do not rely on WiFi.status() with event based wifi. - const int32_t wifi_rssi = WiFi.RSSI(); - bool validWiFi = (wifi_rssi < 0) && wifi_isconnected && hasIPaddr(); - /* - if (validWiFi && WiFi.channel() != WiFiEventData.usedChannel) { - validWiFi = false; - } - */ - if (validWiFi != WiFiEventData.WiFiServicesInitialized()) { - // else wifiStatus is no longer in sync. - if (checkAndResetWiFi()) { - // Wifi has been reset, so no longer valid WiFi - validWiFi = false; - } - } - - if (validWiFi) { - // Connected, thus disable any timer to start AP mode. (except when in WiFi setup mode) - if (!WiFiEventData.wifiSetupConnect) { - WiFiEventData.timerAPstart.clear(); - } - STOP_TIMER(WIFI_ISCONNECTED_STATS); - recursiveCall = false; - // Only return true after some time since it got connected. -#if FEATURE_SET_WIFI_TX_PWR - SetWiFiTXpower(); -#endif - lastState = WiFiEventData.wifi_considered_stable || WiFiEventData.lastConnectMoment.timeoutReached(100); lastCheckedTime = millis(); - return lastState; } - if ((WiFiEventData.timerAPstart.isSet()) && WiFiEventData.timerAPstart.timeReached()) { - if (WiFiEventData.timerAPoff.isSet() && !WiFiEventData.timerAPoff.timeReached()) { - if (!Settings.DoNotStartAP()) { - // Timer reached, so enable AP mode. - if (! ESPEasy::net::wifi::WifiIsAP(WiFi.getMode())) { - if (!WiFiEventData.wifiConnectAttemptNeeded) { - addLog(LOG_LEVEL_INFO, F("WiFi : WiFiConnected(), start AP")); - WifiScan(false); - ESPEasy::net::wifi::setSTA(false); // Force reset WiFi + reduce power consumption - ESPEasy::net::wifi::setAP(true); - } - } - } - } else { - WiFiEventData.timerAPstart.clear(); - WiFiEventData.timerAPoff.clear(); - } - } - - - // When made this far in the code, we apparently do not have valid WiFi connection. - if (!WiFiEventData.timerAPstart.isSet() && ! ESPEasy::net::wifi::WifiIsAP(WiFi.getMode())) { - // First run we do not have WiFi connection any more, set timer to start AP mode - // Only allow the automatic AP mode in the first N minutes after boot. - if (getUptimeMinutes() < WIFI_ALLOW_AP_AFTERBOOT_PERIOD) { - WiFiEventData.timerAPstart.setMillisFromNow(WIFI_RECONNECT_WAIT); - // Fixme TD-er: Make this more elegant as it now needs to know about the extra time needed for the AP start timer. - WiFiEventData.timerAPoff.setMillisFromNow(WIFI_RECONNECT_WAIT + WIFI_AP_OFF_TIMER_DURATION); - } - } - - const bool timeoutReached = WiFiEventData.last_wifi_connect_attempt_moment.isSet() && - WiFiEventData.last_wifi_connect_attempt_moment.timeoutReached(2 * DEFAULT_WIFI_CONNECTION_TIMEOUT); - - if (timeoutReached && !WiFiEventData.wifiSetup) { - // It took too long to make a connection, set flag we need to try again - //if (!wifiAPmodeActivelyUsed()) { - WiFiEventData.wifiConnectAttemptNeeded = true; - //} - WiFiEventData.wifiConnectInProgress = false; - if (!WiFiEventData.WiFiDisconnected()) { - # ifndef BUILD_NO_DEBUG - addLog(LOG_LEVEL_INFO, F("WiFi : wifiConnectTimeoutReached")); - #endif - WifiDisconnect(); - } - } - delay(0); - STOP_TIMER(WIFI_NOTCONNECTED_STATS); - recursiveCall = false; - return false; + ESPEasyWiFi.loop(); + return ESPEasyWiFi.connected(); } -void WiFiConnectRelaxed() { - if (!WiFiEventData.processedDisconnect) { - processDisconnect(); - } - if (!WiFiEventData.WiFiConnectAllowed() || WiFiEventData.wifiConnectInProgress) { - if (WiFiEventData.wifiConnectInProgress) { - if (WiFiEventData.last_wifi_connect_attempt_moment.isSet()) { - if (WiFiEventData.last_wifi_connect_attempt_moment.timeoutReached(WIFI_PROCESS_EVENTS_TIMEOUT)) { - WiFiEventData.wifiConnectInProgress = false; - } - } - } - - if (WiFiEventData.wifiConnectInProgress) { - return; // already connected or connect attempt in progress need to disconnect first - } - } - if (!WiFiEventData.processedScanDone) { - // Scan is still active, so do not yet connect. - return; - } - - if (WiFiEventData.unprocessedWifiEvents()) { - # ifndef BUILD_NO_DEBUG - if (loglevelActiveFor(LOG_LEVEL_ERROR)) { - String log = F("WiFi : Connecting not possible, unprocessed WiFi events: "); - if (!WiFiEventData.processedConnect) { - log += F(" conn"); - } - if (!WiFiEventData.processedDisconnect) { - log += F(" disconn"); - } - if (!WiFiEventData.processedGotIP) { - log += F(" gotIP"); - } -#if FEATURE_USE_IPV6 - if (!WiFiEventData.processedGotIP6) { - log += F(" gotIP6"); - } -#endif - - if (!WiFiEventData.processedDHCPTimeout) { - log += F(" DHCP_t/o"); - } - - addLogMove(LOG_LEVEL_ERROR, log); - logConnectionStatus(); - } - #endif - return; - } - - if (!WiFiEventData.wifiSetupConnect && wifiAPmodeActivelyUsed()) { - return; - } - - - // FIXME TD-er: Should not try to prepare when a scan is still busy. - // This is a logic error which may lead to strange issues if some kind of timeout happens and/or RF calibration was not OK. - // Split this function into separate parts, with the last part being the actual connect attempt either after a scan is complete or quick connect is possible. - - AttemptWiFiConnect(); -} +void WiFiConnectRelaxed() { AttemptWiFiConnect(); } void AttemptWiFiConnect() { - if (!WiFiEventData.wifiConnectAttemptNeeded) { - return; + if (!WiFiConnected()) { + ESPEasyWiFi.setup(); } - - if (WiFiEventData.wifiConnectInProgress) { - return; - } - - setNetworkMedium(NetworkMedium_t::WIFI); - if (active_network_medium != NetworkMedium_t::WIFI) - { - return; - } - - - if (WiFiEventData.wifiSetupConnect) { - // wifiSetupConnect is when run from the setup page. - RTC.clearLastWiFi(); // Force slow connect - WiFiEventData.wifi_connect_attempt = 0; - WiFiEventData.wifiSetupConnect = false; - if (WiFiEventData.timerAPoff.isSet()) { - WiFiEventData.timerAPoff.setMillisFromNow(WIFI_RECONNECT_WAIT + WIFI_AP_OFF_TIMER_DURATION); - } - } - - if (WiFiEventData.last_wifi_connect_attempt_moment.isSet()) { - if (!WiFiEventData.last_wifi_connect_attempt_moment.timeoutReached(DEFAULT_WIFI_CONNECTION_TIMEOUT)) { - return; - } - } - - if (WiFiEventData.unprocessedWifiEvents()) { - return; - } - ESPEasy::net::wifi::setSTA(false); - - ESPEasy::net::wifi::setSTA(true); - - if (WiFi_AP_Candidates.getNext(WiFiScanAllowed())) { - const WiFi_AP_Candidate candidate = WiFi_AP_Candidates.getCurrent(); - - if (loglevelActiveFor(LOG_LEVEL_INFO)) { - addLogMove(LOG_LEVEL_INFO, strformat( - F("WIFI : Connecting %s attempt #%u"), - candidate.toString().c_str(), - WiFiEventData.wifi_connect_attempt)); - } - WiFiEventData.markWiFiBegin(); - if (prepareWiFi()) { - setNetworkMedium(NetworkMedium_t::WIFI); - RTC.clearLastWiFi(); - RTC.lastWiFiSettingsIndex = candidate.index; - - float tx_pwr = 0; // Will be set higher based on RSSI when needed. - // FIXME TD-er: Must check WiFiEventData.wifi_connect_attempt to increase TX power -#if FEATURE_SET_WIFI_TX_PWR - if (Settings.UseMaxTXpowerForSending()) { - tx_pwr = Settings.getWiFi_TX_power(); - } - SetWiFiTXpower(tx_pwr, candidate.rssi); -#endif - // Start connect attempt now, so no longer needed to attempt new connection. - WiFiEventData.wifiConnectAttemptNeeded = false; - WiFiEventData.wifiConnectInProgress = true; - const String key = WiFi_AP_CandidatesList::get_key(candidate.index); - -#if FEATURE_USE_IPV6 - if (Settings.EnableIPv6()) { - WiFi.enableIPv6(true); - } -#endif - -#ifdef ESP32 - if (Settings.IncludeHiddenSSID()) { - wifi_country_t config = { - .cc = "01", - .schan = 1, - .nchan = 14, - .policy = WIFI_COUNTRY_POLICY_MANUAL, - }; - esp_wifi_set_country(&config); - } -#endif - - - if ((Settings.HiddenSSID_SlowConnectPerBSSID() || !candidate.bits.isHidden) - && candidate.allowQuickConnect()) { - WiFi.begin(candidate.ssid.c_str(), key.c_str(), candidate.channel, candidate.bssid.mac); - } else { - WiFi.begin(candidate.ssid.c_str(), key.c_str()); - } -#ifdef ESP32 - // Always wait for a second on ESP32 - WiFi.waitForConnectResult(1000); // https://github.com/arendst/Tasmota/issues/14985 -#else - if (Settings.WaitWiFiConnect() || candidate.bits.isHidden) { -// WiFi.waitForConnectResult(candidate.isHidden ? 3000 : 1000); // https://github.com/arendst/Tasmota/issues/14985 - WiFi.waitForConnectResult(1000); // https://github.com/arendst/Tasmota/issues/14985 - } -#endif - delay(1); - } else { - WiFiEventData.wifiConnectInProgress = false; - } - } else { - if (!wifiAPmodeActivelyUsed() || WiFiEventData.wifiSetupConnect) { - if (!prepareWiFi()) { - //return; - } - - if (WiFiScanAllowed()) { - // Maybe not scan async to give the ESP some slack in power consumption? - const bool async = false; - WifiScan(async); - } - // Limit nr of attempts as we don't have any AP candidates. - WiFiEventData.last_wifi_connect_attempt_moment.setMillisFromNow(60000); - WiFiEventData.timerAPstart.setNow(); - } - } - logConnectionStatus(); } @@ -428,160 +134,50 @@ void AttemptWiFiConnect() { // Set Wifi config // ******************************************************************************** bool prepareWiFi() { - ESPEasy::net::wifi::registerWiFiEventHandler(); - - if (!WiFi_AP_Candidates.hasCandidateCredentials()) { - if (!WiFiEventData.warnedNoValidWiFiSettings) { - addLog(LOG_LEVEL_ERROR, F("WIFI : No valid wifi settings")); - WiFiEventData.warnedNoValidWiFiSettings = true; - } -// WiFiEventData.last_wifi_connect_attempt_moment.clear(); - WiFiEventData.wifi_connect_attempt = 1; - WiFiEventData.wifiConnectAttemptNeeded = false; - - // No need to wait longer to start AP mode. - if (!Settings.DoNotStartAP()) { - WifiScan(false); -// ESPEasy::net::wifi::setAP(true); - } - return false; - } - WiFiEventData.warnedNoValidWiFiSettings = false; - ESPEasy::net::wifi::setSTA(true); - - #if defined(ESP8266) - wifi_station_set_hostname(NetworkCreateRFCCompliantHostname().c_str()); - - #endif // if defined(ESP8266) - #if defined(ESP32) - WiFi.config(INADDR_NONE, INADDR_NONE, INADDR_NONE); - #endif // if defined(ESP32) - ESPEasy::net::wifi::setConnectionSpeed(); - setupStaticIPconfig(); - WiFiEventData.wifiConnectAttemptNeeded = true; +// ESPEasyWiFi.setup(); return true; } -bool checkAndResetWiFi() { - #ifdef ESP8266 - station_status_t status = wifi_station_get_connect_status(); - - switch(status) { - case STATION_GOT_IP: - if (WiFi.RSSI() < 0 && WiFi.localIP().isSet()) { - //if (WiFi.channel() == WiFiEventData.usedChannel || WiFiEventData.usedChannel == 0) { - // This is a valid status, no need to reset - return false; - //} - } - break; - case STATION_NO_AP_FOUND: - case STATION_CONNECT_FAIL: - case STATION_WRONG_PASSWORD: - // Reason to reset WiFi - break; - case STATION_IDLE: - case STATION_CONNECTING: - if (WiFiEventData.last_wifi_connect_attempt_moment.isSet() && !WiFiEventData.last_wifi_connect_attempt_moment.timeoutReached(DEFAULT_WIFI_CONNECTION_TIMEOUT)) { - return false; - } - break; - } - #endif - #ifdef ESP32 - if (WiFi.isConnected()) { - //if (WiFi.channel() == WiFiEventData.usedChannel || WiFiEventData.usedChannel == 0) { - return false; - //} - } - if (WiFiEventData.last_wifi_connect_attempt_moment.isSet() && !WiFiEventData.last_wifi_connect_attempt_moment.timeoutReached(DEFAULT_WIFI_CONNECTION_TIMEOUT)) { - return false; - } - #endif - # ifndef BUILD_NO_DEBUG - String log = F("WiFi : WiFiConnected() out of sync: "); - log += WiFiEventData.ESPeasyWifiStatusToString(); - log += F(" RSSI: "); - log += String(WiFi.RSSI()); - #ifdef ESP8266 - log += F(" status: "); - log += SDKwifiStatusToString(status); - #endif - #endif - - // Call for reset first, to make sure a syslog call will not try to send. - resetWiFi(); - # ifndef BUILD_NO_DEBUG - addLogMove(LOG_LEVEL_INFO, log); - #endif - return true; -} - +bool checkAndResetWiFi() { return true; } void resetWiFi() { - //if (wifiAPmodeActivelyUsed()) return; - if (WiFiEventData.lastWiFiResetMoment.isSet() && !WiFiEventData.lastWiFiResetMoment.timeoutReached(1000)) { - // Don't reset WiFi too often - return; - } - FeedSW_watchdog(); - WiFiEventData.clearAll(); - WifiDisconnect(); + /* //if (wifiAPmodeActivelyUsed()) return; + if (WiFiEventData.lastWiFiResetMoment.isSet() && !WiFiEventData.lastWiFiResetMoment.timeoutReached(1000)) { + // Don't reset WiFi too often + return; + } + FeedSW_watchdog(); + WiFiEventData.clearAll(); + WifiDisconnect(); - // Send this log only after WifiDisconnect() or else sending to syslog may cause issues - addLog(LOG_LEVEL_INFO, F("Reset WiFi.")); + // Send this log only after WifiDisconnect() or else sending to syslog may cause issues + addLog(LOG_LEVEL_INFO, F("Reset WiFi.")); - // ESPEasy::net::wifi::setWifiMode(WIFI_OFF); + // ESPEasy::net::wifi::setWifiMode(WIFI_OFF); - initWiFi(); + initWiFi(); + */ } +void initWiFi() { ESPEasyWiFi.setup(); } - -void initWiFi() -{ -#ifdef ESP8266 - - // See https://github.com/esp8266/Arduino/issues/5527#issuecomment-460537616 - // FIXME TD-er: Do not destruct WiFi object, it may cause crashes with queued UDP traffic. -// WiFi.~ESP8266WiFiClass(); -// WiFi = ESP8266WiFiClass(); -#endif // ifdef ESP8266 -#ifdef ESP32 - ESPEasy::net::wifi::removeWiFiEventHandler(); -#endif - - - WiFi.persistent(false); // Do not use SDK storage of SSID/WPA parameters - // The WiFi.disconnect() ensures that the WiFi is working correctly. If this is not done before receiving WiFi connections, - // those WiFi connections will take a long time to make or sometimes will not work at all. - WiFi.disconnect(false); - delay(1); - if (active_network_medium != NetworkMedium_t::NotSet) { - ESPEasy::net::wifi::setSTA(true); - WifiScan(false); - } - ESPEasy::net::wifi::setWifiMode(WIFI_OFF); - - ESPEasy::net::wifi::registerWiFiEventHandler(); - delay(100); -} +void loopWiFi() { ESPEasyWiFi.loop(); } // ******************************************************************************** // Configure WiFi TX power // ******************************************************************************** -#if FEATURE_SET_WIFI_TX_PWR +# if FEATURE_SET_WIFI_TX_PWR + void SetWiFiTXpower() { SetWiFiTXpower(0); // Just some minimal value, will be adjusted in SetWiFiTXpower } -void SetWiFiTXpower(float dBm) { - SetWiFiTXpower(dBm, WiFi.RSSI()); -} +void SetWiFiTXpower(float dBm) { SetWiFiTXpower(dBm, WiFi.RSSI()); } void SetWiFiTXpower(float dBm, float rssi) { const WiFiMode_t cur_mode = WiFi.getMode(); + if (cur_mode == WIFI_OFF) { return; } @@ -594,12 +190,12 @@ void SetWiFiTXpower(float dBm, float rssi) { // Range ESP8266: 0dBm - 20.5dBm float maxTXpwr; float threshold = GetRSSIthreshold(maxTXpwr); - #ifdef ESP8266 + # ifdef ESP8266 float minTXpwr{}; - #endif - #ifdef ESP32 + # endif + # ifdef ESP32 float minTXpwr = -1.0f; - #endif + # endif threshold += Settings.WiFi_sensitivity_margin; // Margin in dBm on top of threshold @@ -608,19 +204,22 @@ void SetWiFiTXpower(float dBm, float rssi) { // US and some other countries allow 1000 mW (30 dBm) // We cannot send with over 20 dBm, thus it makes no sense to force higher TX power all the time. const float newrssi = rssi - 20; + if (newrssi < threshold) { minTXpwr = threshold - newrssi; } + if (minTXpwr > maxTXpwr) { minTXpwr = maxTXpwr; } + if (dBm > maxTXpwr) { dBm = maxTXpwr; } else if (dBm < minTXpwr) { dBm = minTXpwr; } -ESPEasy::net::wifi::SetWiFiTXpower(dBm); + ESPEasy::net::wifi::SetWiFiTXpower(dBm); if (WiFiEventData.wifi_TX_pwr < dBm) { // Will increase the TX power, give power supply of the unit some rest @@ -630,18 +229,22 @@ ESPEasy::net::wifi::SetWiFiTXpower(dBm); WiFiEventData.wifi_TX_pwr = dBm; delay(0); - #ifndef BUILD_NO_DEBUG + # ifndef BUILD_NO_DEBUG + if (loglevelActiveFor(LOG_LEVEL_DEBUG)) { - const int TX_pwr_int = WiFiEventData.wifi_TX_pwr * 4; + const int TX_pwr_int = WiFiEventData.wifi_TX_pwr * 4; const int maxTXpwr_int = maxTXpwr * 4; + if (TX_pwr_int != maxTXpwr_int) { static int last_log = -1; + if (TX_pwr_int != last_log) { last_log = TX_pwr_int; String log = strformat( F("WiFi : Set TX power to %ddBm sensitivity: %ddBm"), static_cast(dBm), static_cast(threshold)); + if (rssi < 0) { log += strformat(F(" RSSI: %ddBm"), static_cast(rssi)); } @@ -649,12 +252,10 @@ ESPEasy::net::wifi::SetWiFiTXpower(dBm); } } } - #endif + # endif // ifndef BUILD_NO_DEBUG } -#endif - - +# endif // if FEATURE_SET_WIFI_TX_PWR float GetRSSIthreshold(float& maxTXpwr) { maxTXpwr = Settings.getWiFi_TX_power(); @@ -671,52 +272,18 @@ int GetRSSI_quality() { return (rssi / 5) + 1; } -WiFiConnectionProtocol getConnectionProtocol() { - return ESPEasy::net::wifi::getConnectionProtocol(); -} +WiFiConnectionProtocol getConnectionProtocol() { return ESPEasy::net::wifi::getConnectionProtocol(); } -#ifdef ESP32 -int64_t WiFi_get_TSF_time() -{ - return esp_wifi_get_tsf_time(WIFI_IF_STA); -} -#endif +# ifdef ESP32 +int64_t WiFi_get_TSF_time() { return esp_wifi_get_tsf_time(WIFI_IF_STA); } + +# endif // ifdef ESP32 // ******************************************************************************** // Disconnect from Wifi AP // ******************************************************************************** -void WifiDisconnect() -{ - if (!WiFiEventData.processedDisconnect || - WiFiEventData.processingDisconnect.isSet()) { - return; - } - if (WiFi.status() == WL_DISCONNECTED) { - return; - } - // Prevent recursion - static LongTermTimer processingDisconnectTimer; - if (processingDisconnectTimer.isSet() && - !processingDisconnectTimer.timeoutReached(200)) return; - processingDisconnectTimer.setNow(); - # ifndef BUILD_NO_DEBUG - addLog(LOG_LEVEL_INFO, F("WiFi : WifiDisconnect()")); - #endif - ESPEasy::net::wifi::WiFiDisconnect(); - WiFiEventData.setWiFiDisconnected(); - WiFiEventData.markDisconnect(WIFI_DISCONNECT_REASON_UNSPECIFIED); - /* - if (!Settings.UseLastWiFiFromRTC()) { - RTC.clearLastWiFi(); - } - */ - delay(100); - WiFiEventData.processingDisconnect.clear(); - WiFiEventData.processedDisconnect = false; - processDisconnect(); - processingDisconnectTimer.clear(); -} +void WifiDisconnect() { ESPEasyWiFi.disconnect(); } // ******************************************************************************** // Scan WiFi network @@ -725,83 +292,17 @@ bool WiFiScanAllowed() { if (WiFi_AP_Candidates.scanComplete() == WIFI_SCAN_RUNNING) { return false; } - if (!WiFiEventData.processedScanDone) { - processScanDone(); - } - if (!WiFiEventData.processedDisconnect) { - processDisconnect(); - } - - if (WiFiEventData.wifiConnectInProgress) { - return false; - } - - if (WiFiEventData.intent_to_reboot) { - return false; - } - - if (WiFiEventData.unprocessedWifiEvents()) { - # ifndef BUILD_NO_DEBUG - if (loglevelActiveFor(LOG_LEVEL_ERROR)) { - String log = F("WiFi : Scan not allowed, unprocessed WiFi events: "); - if (!WiFiEventData.processedConnect) { - log += F(" conn"); - } - if (!WiFiEventData.processedDisconnect) { - log += F(" disconn"); - } - if (!WiFiEventData.processedGotIP) { - log += F(" gotIP"); - } - if (!WiFiEventData.processedDHCPTimeout) { - log += F(" DHCP_t/o"); - } - - addLogMove(LOG_LEVEL_ERROR, log); - logConnectionStatus(); - } - #endif - return false; - } - /* - if (!wifiAPmodeActivelyUsed() && !NetworkConnected()) { - return true; - } - */ - WiFi_AP_Candidates.purge_expired(); - if (WiFiEventData.wifiConnectInProgress) { - return false; - } - if (WiFiEventData.lastScanMoment.isSet()) { - if (NetworkConnected() && WiFi_AP_Candidates.getBestCandidate().usable()) { - # ifndef BUILD_NO_DEBUG - addLog(LOG_LEVEL_ERROR, F("WiFi : Scan not needed, good candidate present")); - #endif - return false; - } - } - - if (WiFiEventData.lastDisconnectMoment.isSet() && WiFiEventData.lastDisconnectMoment.millisPassedSince() < WIFI_RECONNECT_WAIT) { - if (!NetworkConnected()) { - return WiFiEventData.processedConnect; - } - } - if (WiFiEventData.lastScanMoment.isSet()) { - const LongTermTimer::Duration scanInterval = wifiAPmodeActivelyUsed() ? WIFI_SCAN_INTERVAL_AP_USED : WIFI_SCAN_INTERVAL_MINIMAL; - if (WiFiEventData.lastScanMoment.millisPassedSince() < scanInterval) { - return false; - } - } return WiFiEventData.processedConnect; } - void WifiScan(bool async, uint8_t channel) { - ESPEasy::net::wifi::setSTA(true); + ESPEasy::net::wifi::setSTA(true); + if (!WiFiScanAllowed()) { return; } -#ifdef ESP32 +# ifdef ESP32 + // TD-er: Don't run async scan on ESP32. // Since IDF 4.4 it seems like the active channel may be messed up when running async scan // Perform a disconnect after scanning. @@ -810,20 +311,21 @@ void WifiScan(bool async, uint8_t channel) { if (Settings.IncludeHiddenSSID()) { wifi_country_t config = { - .cc = "01", - .schan = 1, - .nchan = 14, + .cc = "01", + .schan = 1, + .nchan = 14, .policy = WIFI_COUNTRY_POLICY_MANUAL, }; esp_wifi_set_country(&config); } -#endif +# endif // ifdef ESP32 START_TIMER; WiFiEventData.lastScanMoment.setNow(); # ifndef BUILD_NO_DEBUG + if (loglevelActiveFor(LOG_LEVEL_INFO)) { if (channel == 0) { addLog(LOG_LEVEL_INFO, F("WiFi : Start network scan all channels")); @@ -831,31 +333,33 @@ void WifiScan(bool async, uint8_t channel) { addLogMove(LOG_LEVEL_INFO, strformat(F("WiFi : Start network scan ch: %d "), channel)); } } - #endif - bool show_hidden = true; + # endif // ifndef BUILD_NO_DEBUG + bool show_hidden = true; WiFiEventData.processedScanDone = false; WiFiEventData.lastGetScanMoment.setNow(); WiFiEventData.lastScanChannel = channel; unsigned int nrScans = 1 + (async ? 0 : Settings.NumberExtraWiFiScans); + while (nrScans > 0) { if (!async) { WiFi_AP_Candidates.begin_sync_scan(); FeedSW_watchdog(); } --nrScans; -#ifdef ESP8266 -#if FEATURE_ESP8266_DIRECT_WIFI_SCAN +# ifdef ESP8266 +# if FEATURE_ESP8266_DIRECT_WIFI_SCAN { static bool FIRST_SCAN = true; struct scan_config config; memset(&config, 0, sizeof(config)); - config.ssid = nullptr; - config.bssid = nullptr; - config.channel = channel; - config.show_hidden = show_hidden ? 1 : 0;; - config.scan_type = WIFI_SCAN_TYPE_ACTIVE; + config.ssid = nullptr; + config.bssid = nullptr; + config.channel = channel; + config.show_hidden = show_hidden ? 1 : 0; + config.scan_type = WIFI_SCAN_TYPE_ACTIVE; + if (FIRST_SCAN) { config.scan_time.active.min = 100; config.scan_time.active.max = 200; @@ -865,50 +369,55 @@ void WifiScan(bool async, uint8_t channel) { } FIRST_SCAN = false; wifi_station_scan(&config, &onWiFiScanDone); + if (!async) { // will resume when SYSTEM_EVENT_SCAN_DONE event is fired - do { + do + { delay(0); } while (!WiFiEventData.processedScanDone); } - + } -#else +# else // if FEATURE_ESP8266_DIRECT_WIFI_SCAN WiFi.scanNetworks(async, show_hidden, channel); -#endif -#endif -#ifdef ESP32 - const bool passive = Settings.PassiveWiFiScan(); +# endif // if FEATURE_ESP8266_DIRECT_WIFI_SCAN +# endif // ifdef ESP8266 +# ifdef ESP32 + const bool passive = Settings.PassiveWiFiScan(); const uint32_t max_ms_per_chan = 120; WiFi.scanNetworks(async, show_hidden, passive, max_ms_per_chan /*, channel */); -#endif +# endif // ifdef ESP32 + if (!async) { FeedSW_watchdog(); processScanDone(); } } -#if FEATURE_TIMING_STATS +# if FEATURE_TIMING_STATS + if (async) { STOP_TIMER(WIFI_SCAN_ASYNC); } else { STOP_TIMER(WIFI_SCAN_SYNC); } -#endif +# endif // if FEATURE_TIMING_STATS -#ifdef ESP32 -#if ESP_IDF_VERSION_MAJOR<5 +# ifdef ESP32 +# if ESP_IDF_VERSION_MAJOR < 5 RTC.clearLastWiFi(); + if (WiFiConnected()) { - # ifndef BUILD_NO_DEBUG + # ifndef BUILD_NO_DEBUG addLog(LOG_LEVEL_INFO, F("WiFi : Disconnect after scan")); - #endif + # endif const bool needReconnect = WiFiEventData.wifiConnectAttemptNeeded; WifiDisconnect(); WiFiEventData.wifiConnectAttemptNeeded = needReconnect; } -#endif -#endif +# endif // if ESP_IDF_VERSION_MAJOR < 5 +# endif // ifdef ESP32 } @@ -919,6 +428,7 @@ void WiFiScan_log_to_serial() { // Direct Serial is allowed here, since this function will only be called from serial input. serialPrintln(F("WIFI : SSID Scan start")); + if (WiFi_AP_Candidates.scanComplete() <= 0) { WiFiMode_t cur_wifimode = WiFi.getMode(); WifiScan(false); @@ -926,6 +436,7 @@ void WiFiScan_log_to_serial() } const int8_t scanCompleteStatus = WiFi_AP_Candidates.scanComplete(); + if (scanCompleteStatus <= 0) { serialPrintln(F("WIFI : No networks found")); } @@ -940,6 +451,7 @@ void WiFiScan_log_to_serial() for (auto it = WiFi_AP_Candidates.scanned_begin(); it != WiFi_AP_Candidates.scanned_end(); ++it) { ++i; + // Print SSID and RSSI for each network found serialPrint(F("WIFI : ")); serialPrint(String(i)); @@ -951,10 +463,8 @@ void WiFiScan_log_to_serial() serialPrintln(""); } - - // Only internal scope -void setAPinternal(bool enable) +void setAPinternal(bool enable) { if (enable) { // create and store unique AP SSID/PW to prevent ESP from starting AP mode with default SSID and No password! @@ -965,67 +475,65 @@ void setAPinternal(bool enable) if (!WiFi.softAPConfig(apIP, apIP, subnet)) { addLog(LOG_LEVEL_ERROR, strformat( - ("WIFI : [AP] softAPConfig failed! IP: %s, GW: %s, SN: %s"), - apIP.toString().c_str(), - apIP.toString().c_str(), - subnet.toString().c_str() - ) - ); + ("WIFI : [AP] softAPConfig failed! IP: %s, GW: %s, SN: %s"), + apIP.toString().c_str(), + apIP.toString().c_str(), + subnet.toString().c_str() + ) + ); } int channel = 1; - if ( ESPEasy::net::wifi::WifiIsSTA(WiFi.getMode()) && WiFiConnected()) { + + if (ESPEasy::net::wifi::WifiIsSTA(WiFi.getMode()) && WiFiConnected()) { channel = WiFi.channel(); } if (WiFi.softAP(softAPSSID.c_str(), pwd.c_str(), channel)) { eventQueue.add(F("WiFi#APmodeEnabled")); + if (loglevelActiveFor(LOG_LEVEL_INFO)) { addLogMove(LOG_LEVEL_INFO, strformat( - F("WIFI : AP Mode enabled. SSID: %s IP: %s ch: %d"), - softAPSSID.c_str(), - formatIP(WiFi.softAPIP()).c_str(), - channel)); + F("WIFI : AP Mode enabled. SSID: %s IP: %s ch: %d"), + softAPSSID.c_str(), + formatIP(WiFi.softAPIP()).c_str(), + channel)); } } else { if (loglevelActiveFor(LOG_LEVEL_ERROR)) { addLogMove(LOG_LEVEL_ERROR, strformat( - F("WIFI : Error while starting AP Mode with SSID: %s IP: %s"), - softAPSSID.c_str(), - formatIP(apIP).c_str())); + F("WIFI : Error while starting AP Mode with SSID: %s IP: %s"), + softAPSSID.c_str(), + formatIP(apIP).c_str())); } } - #ifdef ESP32 + # ifdef ESP32 - #else // ifdef ESP32 + # else // ifdef ESP32 if (wifi_softap_dhcps_status() != DHCP_STARTED) { if (!wifi_softap_dhcps_start()) { addLog(LOG_LEVEL_ERROR, F("WIFI : [AP] wifi_softap_dhcps_start failed!")); } } - #endif // ifdef ESP32 + # endif // ifdef ESP32 WiFiEventData.timerAPoff.setMillisFromNow(WIFI_AP_OFF_TIMER_DURATION); } else { - #if FEATURE_DNS_SERVER + # if FEATURE_DNS_SERVER + if (dnsServerActive) { dnsServerActive = false; dnsServer.stop(); } - #endif // if FEATURE_DNS_SERVER + # endif // if FEATURE_DNS_SERVER } } - - - -bool WiFiUseStaticIP() { - return Settings.IP[0] != 0 && Settings.IP[0] != 255; -} +bool WiFiUseStaticIP() { return Settings.IP[0] != 0 && Settings.IP[0] != 255; } bool wifiAPmodeActivelyUsed() { - if (! ESPEasy::net::wifi::WifiIsAP(WiFi.getMode()) || (!WiFiEventData.timerAPoff.isSet())) { + if (!ESPEasy::net::wifi::WifiIsAP(WiFi.getMode()) || (!WiFiEventData.timerAPoff.isSet())) { // AP not active or soon to be disabled in processDisableAPmode() return false; } @@ -1039,10 +547,10 @@ void setupStaticIPconfig() { setUseStaticIP(WiFiUseStaticIP()); if (!WiFiUseStaticIP()) { return; } - const IPAddress ip (Settings.IP); - const IPAddress gw (Settings.Gateway); - const IPAddress subnet (Settings.Subnet); - const IPAddress dns (Settings.DNS); + const IPAddress ip(Settings.IP); + const IPAddress gw(Settings.Gateway); + const IPAddress subnet(Settings.Subnet); + const IPAddress dns(Settings.DNS); WiFiEventData.dns0_cache = dns; @@ -1050,11 +558,11 @@ void setupStaticIPconfig() { if (loglevelActiveFor(LOG_LEVEL_INFO)) { addLogMove(LOG_LEVEL_INFO, strformat( - F("IP : Static IP : %s GW: %s SN: %s DNS: %s"), - formatIP(ip).c_str(), - formatIP(gw).c_str(), - formatIP(subnet).c_str(), - getValue(LabelType::DNS).c_str())); + F("IP : Static IP : %s GW: %s SN: %s DNS: %s"), + formatIP(ip).c_str(), + formatIP(gw).c_str(), + formatIP(subnet).c_str(), + getValue(LabelType::DNS).c_str())); } } @@ -1069,19 +577,20 @@ String formatScanResult(int i, const String& separator) { String formatScanResult(int i, const String& separator, int32_t& rssi) { WiFi_AP_Candidate tmp(i); + rssi = tmp.rssi; return tmp.toString(separator); } - void logConnectionStatus() { static unsigned long lastLog = 0; - if (lastLog != 0 && timePassedSince(lastLog) < 1000) { + + if ((lastLog != 0) && (timePassedSince(lastLog) < 1000)) { return; } lastLog = millis(); -#ifndef BUILD_NO_DEBUG - #ifdef ESP8266 +# ifndef BUILD_NO_DEBUG + # ifdef ESP8266 const uint8_t arduino_corelib_wifistatus = WiFi.status(); const uint8_t sdk_wifistatus = wifi_station_get_connect_status(); @@ -1094,50 +603,51 @@ void logConnectionStatus() { addLogMove(LOG_LEVEL_ERROR, log); } } - #endif + # endif // ifdef ESP8266 if (loglevelActiveFor(LOG_LEVEL_INFO)) { addLogMove(LOG_LEVEL_INFO, strformat( - F("WIFI : Arduino wifi status: %s ESPeasy internal wifi status: %s"), - ArduinoWifiStatusToString(WiFi.status()).c_str(), - WiFiEventData.ESPeasyWifiStatusToString().c_str())); + F("WIFI : Arduino wifi status: %s ESPeasy internal wifi status: %s"), + ArduinoWifiStatusToString(WiFi.status()).c_str(), + WiFiEventData.ESPeasyWifiStatusToString().c_str())); } -/* - if (loglevelActiveFor(LOG_LEVEL_INFO)) { - String log; - switch (WiFi.status()) { - case WL_NO_SSID_AVAIL: { - log = F("WIFI : No SSID found matching: "); - break; - } - case WL_CONNECT_FAILED: { - log = F("WIFI : Connection failed to: "); - break; - } - case WL_DISCONNECTED: { - log = F("WIFI : WiFi.status() = WL_DISCONNECTED SSID: "); - break; - } - case WL_IDLE_STATUS: { - log = F("WIFI : Connection in IDLE state: "); - break; - } - case WL_CONNECTED: { - break; - } - default: - break; - } + /* + if (loglevelActiveFor(LOG_LEVEL_INFO)) { + String log; - if (log.length() > 0) { - const char *ssid = getLastWiFiSettingsSSID(); - log += ssid; - addLog(LOG_LEVEL_INFO, log); - } - } - */ -#endif // ifndef BUILD_NO_DEBUG + switch (WiFi.status()) { + case WL_NO_SSID_AVAIL: { + log = F("WIFI : No SSID found matching: "); + break; + } + case WL_CONNECT_FAILED: { + log = F("WIFI : Connection failed to: "); + break; + } + case WL_DISCONNECTED: { + log = F("WIFI : WiFi.status() = WL_DISCONNECTED SSID: "); + break; + } + case WL_IDLE_STATUS: { + log = F("WIFI : Connection in IDLE state: "); + break; + } + case WL_CONNECTED: { + break; + } + default: + break; + } + + if (log.length() > 0) { + const char *ssid = getLastWiFiSettingsSSID(); + log += ssid; + addLog(LOG_LEVEL_INFO, log); + } + } + */ +# endif // ifndef BUILD_NO_DEBUG } -#endif \ No newline at end of file +#endif // if FEATURE_WIFI diff --git a/src/src/ESPEasyCore/ESPEasyWifi.h b/src/src/ESPEasyCore/ESPEasyWifi.h index d30d9c4e5..c1d421389 100644 --- a/src/src/ESPEasyCore/ESPEasyWifi.h +++ b/src/src/ESPEasyCore/ESPEasyWifi.h @@ -41,7 +41,7 @@ bool prepareWiFi(); bool checkAndResetWiFi(); void resetWiFi(); void initWiFi(); - +void loopWiFi(); # if FEATURE_SET_WIFI_TX_PWR void SetWiFiTXpower(); diff --git a/src/src/ESPEasyCore/ESPEasyWifi_ProcessEvent.cpp b/src/src/ESPEasyCore/ESPEasyWifi_ProcessEvent.cpp index 739440fad..f1aa0b284 100644 --- a/src/src/ESPEasyCore/ESPEasyWifi_ProcessEvent.cpp +++ b/src/src/ESPEasyCore/ESPEasyWifi_ProcessEvent.cpp @@ -51,34 +51,31 @@ void handle_unprocessedNetworkEvents() #endif if (active_network_medium == NetworkMedium_t::WIFI) { - const bool should_be_initialized = (WiFiEventData.WiFiGotIP() && WiFiEventData.WiFiConnected()) || NetworkConnected(); + if (WiFiConnected() && !WiFiEventData.WiFiServicesInitialized()) { + WiFiEventData.processedConnect = false; + WiFiEventData.processedGotIP = false; + if (!WiFiEventData.processedConnect) { + #ifndef BUILD_NO_DEBUG + addLog(LOG_LEVEL_DEBUG, F("WIFI : Entering processConnect()")); + #endif // ifndef BUILD_NO_DEBUG + processConnect(); - if (WiFiEventData.WiFiServicesInitialized() != should_be_initialized) - { - if (!WiFiEventData.WiFiServicesInitialized()) { - WiFiEventData.processedDHCPTimeout = true; // FIXME TD-er: Find out when this happens (happens on ESP32 sometimes) +// FIXME TD-er: Forcefully set the connected flag for now + WiFiEventData.setWiFiConnected(); + } - if (WiFiConnected()) { - if (!WiFiEventData.WiFiGotIP()) { - #ifndef BUILD_NO_DEBUG - addLog(LOG_LEVEL_DEBUG, F("WiFi : Missed gotIP event")); - #endif - WiFiEventData.processedGotIP = false; - processGotIP(); - } + if (!WiFiEventData.processedGotIP) { + #ifndef BUILD_NO_DEBUG + addLog(LOG_LEVEL_DEBUG, F("WIFI : Entering processGotIP()")); + #endif // ifndef BUILD_NO_DEBUG + processGotIP(); - if (!WiFiEventData.WiFiConnected()) { - #ifndef BUILD_NO_DEBUG - addLog(LOG_LEVEL_DEBUG, F("WiFi : Missed connected event")); - #endif - WiFiEventData.processedConnect = false; - processConnect(); - } + // FIXME TD-er: Forcefully set the GotIP flag for now + WiFiEventData.setWiFiGotIP(); + } + WiFiEventData.setWiFiServicesInitialized(); - // Apparently we are connected, so no need to process any late disconnect event - WiFiEventData.processedDisconnect = true; - } - WiFiEventData.setWiFiServicesInitialized(); + if (WiFiEventData.WiFiServicesInitialized()) { // #ifdef ESP32 setWebserverRunning(false); @@ -95,127 +92,129 @@ void handle_unprocessedNetworkEvents() } } - if (WiFiEventData.unprocessedWifiEvents()) { - // Process disconnect events before connect events. - if (!WiFiEventData.processedDisconnect) { - #ifndef BUILD_NO_DEBUG - addLog(LOG_LEVEL_DEBUG, F("WIFI : Entering processDisconnect()")); - #endif // ifndef BUILD_NO_DEBUG - processDisconnect(); - } - } - - if (active_network_medium == NetworkMedium_t::WIFI) { - if ((!WiFiEventData.WiFiServicesInitialized()) || WiFiEventData.unprocessedWifiEvents() || WiFiEventData.wifiConnectAttemptNeeded) { - // WiFi connection is not yet available, so introduce some extra delays to - // help the background tasks managing wifi connections - delay(0); - - if (!WiFiEventData.processedConnect) { - #ifndef BUILD_NO_DEBUG - addLog(LOG_LEVEL_DEBUG, F("WIFI : Entering processConnect()")); - #endif // ifndef BUILD_NO_DEBUG - processConnect(); + /* if (WiFiEventData.unprocessedWifiEvents()) { + // Process disconnect events before connect events. + if (!WiFiEventData.processedDisconnect) { + #ifndef BUILD_NO_DEBUG + addLog(LOG_LEVEL_DEBUG, F("WIFI : Entering processDisconnect()")); + #endif // ifndef BUILD_NO_DEBUG + processDisconnect(); } + } - if (!WiFiEventData.processedGotIP) { - #ifndef BUILD_NO_DEBUG - addLog(LOG_LEVEL_DEBUG, F("WIFI : Entering processGotIP()")); - #endif // ifndef BUILD_NO_DEBUG - processGotIP(); - } + if (active_network_medium == NetworkMedium_t::WIFI) { + if ((!WiFiEventData.WiFiServicesInitialized()) || WiFiEventData.unprocessedWifiEvents() || WiFiEventData.wifiConnectAttemptNeeded) { + // WiFi connection is not yet available, so introduce some extra delays to + // help the background tasks managing wifi connections + delay(0); - if (!WiFiEventData.processedDHCPTimeout) { - #ifndef BUILD_NO_DEBUG - addLog(LOG_LEVEL_INFO, F("WIFI : DHCP timeout, Calling disconnect()")); - #endif // ifndef BUILD_NO_DEBUG - WiFiEventData.processedDHCPTimeout = true; - WifiDisconnect(); - } - - if ((WiFi.status() == WL_DISCONNECTED) && WiFiEventData.wifiConnectInProgress) { - if (WiFiEventData.last_wifi_connect_attempt_moment.isSet() && - WiFiEventData.last_wifi_connect_attempt_moment.timeoutReached(DEFAULT_WIFI_CONNECTION_TIMEOUT)) { - logConnectionStatus(); - resetWiFi(); + if (!WiFiEventData.processedConnect) { + #ifndef BUILD_NO_DEBUG + addLog(LOG_LEVEL_DEBUG, F("WIFI : Entering processConnect()")); + #endif // ifndef BUILD_NO_DEBUG + processConnect(); } - if (!WiFiEventData.last_wifi_connect_attempt_moment.isSet()) { - WiFiEventData.wifiConnectInProgress = false; + if (!WiFiEventData.processedGotIP) { + #ifndef BUILD_NO_DEBUG + addLog(LOG_LEVEL_DEBUG, F("WIFI : Entering processGotIP()")); + #endif // ifndef BUILD_NO_DEBUG + processGotIP(); } + + if (!WiFiEventData.processedDHCPTimeout) { + #ifndef BUILD_NO_DEBUG + addLog(LOG_LEVEL_INFO, F("WIFI : DHCP timeout, Calling disconnect()")); + #endif // ifndef BUILD_NO_DEBUG + WiFiEventData.processedDHCPTimeout = true; + WifiDisconnect(); + } + + if ((WiFi.status() == WL_DISCONNECTED) && WiFiEventData.wifiConnectInProgress) { + if (WiFiEventData.last_wifi_connect_attempt_moment.isSet() && + WiFiEventData.last_wifi_connect_attempt_moment.timeoutReached(DEFAULT_WIFI_CONNECTION_TIMEOUT)) { + logConnectionStatus(); + resetWiFi(); + } + + if (!WiFiEventData.last_wifi_connect_attempt_moment.isSet()) { + WiFiEventData.wifiConnectInProgress = false; + } + delay(10); + } + + if (!WiFiEventData.wifiConnectInProgress) { + WiFiEventData.wifiConnectAttemptNeeded = true; + NetworkConnectRelaxed(); + } + } + + + if (WiFiEventData.WiFiDisconnected()) { + #ifndef BUILD_NO_DEBUG + + if (loglevelActiveFor(LOG_LEVEL_DEBUG)) { + static LongTermTimer lastDisconnectMoment_log; + static uint8_t lastWiFiStatus_log = 0; + uint8_t cur_wifi_status = WiFi.status(); + + if ((WiFiEventData.lastDisconnectMoment.get() != lastDisconnectMoment_log.get()) || + (lastWiFiStatus_log != cur_wifi_status)) { + lastDisconnectMoment_log.set(WiFiEventData.lastDisconnectMoment.get()); + lastWiFiStatus_log = cur_wifi_status; + String wifilog = F("WIFI : Disconnected: WiFi.status() = "); + wifilog += WiFiEventData.ESPeasyWifiStatusToString(); + wifilog += F(" RSSI: "); + wifilog += String(WiFi.RSSI()); + wifilog += F(" status: "); + # ifdef ESP8266 + station_status_t status = wifi_station_get_connect_status(); + wifilog += SDKwifiStatusToString(status); + # endif // ifdef ESP8266 + # ifdef ESP32 + wifilog += ArduinoWifiStatusToString(WiFi.status()); + # endif + addLogMove(LOG_LEVEL_DEBUG, wifilog); + } + } + #endif // ifndef BUILD_NO_DEBUG + + // While connecting to WiFi make sure the device has ample time to do so delay(10); } - if (!WiFiEventData.wifiConnectInProgress) { - WiFiEventData.wifiConnectAttemptNeeded = true; - NetworkConnectRelaxed(); - } - } + if (!WiFiEventData.processedDisconnectAPmode) { processDisconnectAPmode(); } + if (!WiFiEventData.processedConnectAPmode) { processConnectAPmode(); } - if (WiFiEventData.WiFiDisconnected()) { - #ifndef BUILD_NO_DEBUG + if (WiFiEventData.timerAPoff.isSet()) { processDisableAPmode(); } - if (loglevelActiveFor(LOG_LEVEL_DEBUG)) { - static LongTermTimer lastDisconnectMoment_log; - static uint8_t lastWiFiStatus_log = 0; - uint8_t cur_wifi_status = WiFi.status(); + if (!WiFiEventData.processedScanDone) { processScanDone(); } - if ((WiFiEventData.lastDisconnectMoment.get() != lastDisconnectMoment_log.get()) || - (lastWiFiStatus_log != cur_wifi_status)) { - lastDisconnectMoment_log.set(WiFiEventData.lastDisconnectMoment.get()); - lastWiFiStatus_log = cur_wifi_status; - String wifilog = F("WIFI : Disconnected: WiFi.status() = "); - wifilog += WiFiEventData.ESPeasyWifiStatusToString(); - wifilog += F(" RSSI: "); - wifilog += String(WiFi.RSSI()); - wifilog += F(" status: "); - # ifdef ESP8266 - station_status_t status = wifi_station_get_connect_status(); - wifilog += SDKwifiStatusToString(status); - # endif // ifdef ESP8266 - # ifdef ESP32 - wifilog += ArduinoWifiStatusToString(WiFi.status()); - # endif - addLogMove(LOG_LEVEL_DEBUG, wifilog); - } - } - #endif // ifndef BUILD_NO_DEBUG + if (WiFiEventData.wifi_connect_attempt > 0) { + // We only want to clear this counter if the connection is currently stable. + if (WiFiEventData.WiFiServicesInitialized()) { + if (WiFiEventData.lastConnectMoment.isSet() && WiFiEventData.lastConnectMoment.timeoutReached(WIFI_CONNECTION_CONSIDERED_STABLE)) + #{ + // Connection considered stable + WiFiEventData.wifi_connect_attempt = 0; + WiFiEventData.wifi_considered_stable = true; + WiFi_AP_Candidates.markCurrentConnectionStable(); - // While connecting to WiFi make sure the device has ample time to do so - delay(10); - } - - if (!WiFiEventData.processedDisconnectAPmode) { processDisconnectAPmode(); } - - if (!WiFiEventData.processedConnectAPmode) { processConnectAPmode(); } - - if (WiFiEventData.timerAPoff.isSet()) { processDisableAPmode(); } - - if (!WiFiEventData.processedScanDone) { processScanDone(); } - - if (WiFiEventData.wifi_connect_attempt > 0) { - // We only want to clear this counter if the connection is currently stable. - if (WiFiEventData.WiFiServicesInitialized()) { - if (WiFiEventData.lastConnectMoment.isSet() && WiFiEventData.lastConnectMoment.timeoutReached(WIFI_CONNECTION_CONSIDERED_STABLE)) { - // Connection considered stable - WiFiEventData.wifi_connect_attempt = 0; - WiFiEventData.wifi_considered_stable = true; - WiFi_AP_Candidates.markCurrentConnectionStable(); - - if (WiFi.getAutoReconnect() != Settings.SDK_WiFi_autoreconnect()) { - WiFi.setAutoReconnect(Settings.SDK_WiFi_autoreconnect()); - delay(1); - } - } else { - if (WiFi.getAutoReconnect()) { - WiFi.setAutoReconnect(false); - delay(1); + if (WiFi.getAutoReconnect() != Settings.SDK_WiFi_autoreconnect()) { + WiFi.setAutoReconnect(Settings.SDK_WiFi_autoreconnect()); + delay(1); + } + } else { + if (WiFi.getAutoReconnect()) { + WiFi.setAutoReconnect(false); + delay(1); + } } } } - } - } + } + */ #if FEATURE_ETHERNET check_Eth_DNS_valid(); #endif // if FEATURE_ETHERNET @@ -230,119 +229,124 @@ void handle_unprocessedNetworkEvents() // These functions are called from Setup() or Loop() and thus may call delay() or yield() // ******************************************************************************** void processDisconnect() { - if (WiFiEventData.processedDisconnect) { return; } + /* + if (WiFiEventData.processedDisconnect) { return; } - if (loglevelActiveFor(LOG_LEVEL_INFO)) { - String log = strformat( + if (loglevelActiveFor(LOG_LEVEL_INFO)) { + String log = strformat( F("WIFI : Disconnected! Reason: '%s'"), getLastDisconnectReason().c_str()); - if (WiFiEventData.lastConnectedDuration_us > 0) { + if (WiFiEventData.lastConnectedDuration_us > 0) { log += concat( F(" Connected for "), format_msec_duration(WiFiEventData.lastConnectedDuration_us / 1000ll)); - } - addLogMove(LOG_LEVEL_INFO, log); - } - logConnectionStatus(); + } + addLogMove(LOG_LEVEL_INFO, log); + } + logConnectionStatus(); - if (WiFiEventData.processingDisconnect.isSet()) { - if ((WiFiEventData.processingDisconnect.millisPassedSince() > 5000) || WiFiEventData.processedDisconnect) { + if (WiFiEventData.processingDisconnect.isSet()) { + if ((WiFiEventData.processingDisconnect.millisPassedSince() > 5000) || WiFiEventData.processedDisconnect) { WiFiEventData.processedDisconnect = true; WiFiEventData.processingDisconnect.clear(); - } - } + } + } - if (WiFiEventData.processedDisconnect || + if (WiFiEventData.processedDisconnect || WiFiEventData.processingDisconnect.isSet()) { return; } - WiFiEventData.processingDisconnect.setNow(); - WiFiEventData.setWiFiDisconnected(); - WiFiEventData.wifiConnectAttemptNeeded = true; - delay(100); // FIXME TD-er: See https://github.com/letscontrolit/ESPEasy/issues/1987#issuecomment-451644424 + WiFiEventData.processingDisconnect.setNow(); + WiFiEventData.setWiFiDisconnected(); + WiFiEventData.wifiConnectAttemptNeeded = true; + delay(100); // FIXME TD-er: See https://github.com/letscontrolit/ESPEasy/issues/1987#issuecomment-451644424 - if (Settings.UseRules) { - eventQueue.add(F("WiFi#Disconnected")); - } + if (Settings.UseRules) { + eventQueue.add(F("WiFi#Disconnected")); + } - // FIXME TD-er: With AutoReconnect enabled, WiFi must be reset or else we completely loose track of the actual WiFi state - bool mustRestartWiFi = Settings.WiFiRestart_connection_lost() || WiFi.getAutoReconnect(); + // FIXME TD-er: With AutoReconnect enabled, WiFi must be reset or else we completely loose track of the actual WiFi state + bool mustRestartWiFi = Settings.WiFiRestart_connection_lost() || WiFi.getAutoReconnect(); - if ((WiFiEventData.lastConnectedDuration_us > 0) && ((WiFiEventData.lastConnectedDuration_us / 1000) < 5000)) { - if (!WiFi_AP_Candidates.getBestCandidate().usable()) { + if ((WiFiEventData.lastConnectedDuration_us > 0) && ((WiFiEventData.lastConnectedDuration_us / 1000) < 5000)) { + if (!WiFi_AP_Candidates.getBestCandidate().usable()) { // addLog(LOG_LEVEL_INFO, F("WIFI : !getBestCandidate().usable() => mustRestartWiFi = true")); mustRestartWiFi = true; - } - } + } + } - if (WiFi.status() == WL_IDLE_STATUS) { - // addLog(LOG_LEVEL_INFO, F("WIFI : WiFi.status() == WL_IDLE_STATUS => mustRestartWiFi = true")); - mustRestartWiFi = true; - } + if (WiFi.status() == WL_IDLE_STATUS) { + // addLog(LOG_LEVEL_INFO, F("WIFI : WiFi.status() == WL_IDLE_STATUS => mustRestartWiFi = true")); + mustRestartWiFi = true; + } - #ifdef USES_ESPEASY_NOW + #ifdef USES_ESPEASY_NOW - if (use_EspEasy_now) { - // mustRestartWiFi = true; - } - #endif // ifdef USES_ESPEASY_NOW + if (use_EspEasy_now) { + // mustRestartWiFi = true; + } + #endif // ifdef USES_ESPEASY_NOW - // WifiDisconnect(); // Needed or else node may not reconnect reliably. + // WifiDisconnect(); // Needed or else node may not reconnect reliably. - if (mustRestartWiFi) { - WiFiEventData.processedDisconnect = true; - resetWiFi(); + if (mustRestartWiFi) { + WiFiEventData.processedDisconnect = true; + resetWiFi(); - // WifiScan(false); - // delay(100); - // ESPEasy::net::wifi::setWifiMode(WIFI_OFF); - // initWiFi(); - // delay(100); - } + // WifiScan(false); + // delay(100); + // ESPEasy::net::wifi::setWifiMode(WIFI_OFF); + // initWiFi(); + // delay(100); + } - // delay(500); - logConnectionStatus(); - WiFiEventData.processedDisconnect = true; - WiFiEventData.processingDisconnect.clear(); + // delay(500); + logConnectionStatus(); + WiFiEventData.processedDisconnect = true; + WiFiEventData.processingDisconnect.clear(); + */ } void processConnect() { if (WiFiEventData.processedConnect) { return; } - // delay(100); // FIXME TD-er: See https://github.com/letscontrolit/ESPEasy/issues/1987#issuecomment-451644424 - if (checkAndResetWiFi()) { - return; - } + /* + // delay(100); // FIXME TD-er: See https://github.com/letscontrolit/ESPEasy/issues/1987#issuecomment-451644424 + if (checkAndResetWiFi()) { + return; + } + */ WiFiEventData.processedConnect = true; - if (WiFi.status() == WL_DISCONNECTED) { - // Apparently not really connected - return; - } - + /* + if (WiFi.status() == WL_DISCONNECTED) { + // Apparently not really connected + return; + } + */ WiFiEventData.setWiFiConnected(); ++WiFiEventData.wifi_reconnects; if (WiFi_AP_Candidates.getCurrent().bits.isEmergencyFallback) { - #ifdef CUSTOM_EMERGENCY_FALLBACK_RESET_CREDENTIALS + #ifdef CUSTOM_EMERGENCY_FALLBACK_RESET_CREDENTIALS const bool mustResetCredentials = CUSTOM_EMERGENCY_FALLBACK_RESET_CREDENTIALS; - #else + #else const bool mustResetCredentials = false; - #endif // ifdef CUSTOM_EMERGENCY_FALLBACK_RESET_CREDENTIALS - #ifdef CUSTOM_EMERGENCY_FALLBACK_START_AP + #endif // ifdef CUSTOM_EMERGENCY_FALLBACK_RESET_CREDENTIALS + #ifdef CUSTOM_EMERGENCY_FALLBACK_START_AP const bool mustStartAP = CUSTOM_EMERGENCY_FALLBACK_START_AP; - #else + #else const bool mustStartAP = false; - #endif // ifdef CUSTOM_EMERGENCY_FALLBACK_START_AP + #endif // ifdef CUSTOM_EMERGENCY_FALLBACK_START_AP if (mustStartAP) { int allowedUptimeMinutes = 10; - #ifdef CUSTOM_EMERGENCY_FALLBACK_ALLOW_MINUTES_UPTIME + #ifdef CUSTOM_EMERGENCY_FALLBACK_ALLOW_MINUTES_UPTIME allowedUptimeMinutes = CUSTOM_EMERGENCY_FALLBACK_ALLOW_MINUTES_UPTIME; - #endif + #endif if (getUptimeMinutes() < allowedUptimeMinutes) { WiFiEventData.timerAPstart.setNow(); @@ -359,8 +363,9 @@ void processConnect() { } if (loglevelActiveFor(LOG_LEVEL_INFO)) { - const LongTermTimer::Duration connect_duration = WiFiEventData.last_wifi_connect_attempt_moment.timeDiff(WiFiEventData.lastConnectMoment); - String log = strformat( + const LongTermTimer::Duration connect_duration = + WiFiEventData.last_wifi_connect_attempt_moment.timeDiff(WiFiEventData.lastConnectMoment); + String log = strformat( F("WIFI : Connected! AP: %s (%s) Ch: %d"), WiFi.SSID().c_str(), WiFi.BSSIDstr().c_str(), @@ -407,13 +412,13 @@ void processGotIP() { IPAddress ip = NetworkLocalIP(); if (!useStaticIP()) { - #ifdef ESP8266 + #ifdef ESP8266 if (!ip.isSet()) { - #else // ifdef ESP8266 + #else // ifdef ESP8266 if ((ip[0] == 0) && (ip[1] == 0) && (ip[2] == 0) && (ip[3] == 0)) { - #endif // ifdef ESP8266 + #endif // ifdef ESP8266 return; } } @@ -451,13 +456,13 @@ void processGotIP() { WiFi.config(ip, gw, subnet, WiFiEventData.dns0_cache, WiFiEventData.dns1_cache); } -#if FEATURE_MQTT + #if FEATURE_MQTT mqtt_reconnect_count = 0; MQTTclient_should_reconnect = true; timermqtt_interval = 100; Scheduler.setIntervalTimer(SchedulerIntervalTimer_e::TIMER_MQTT); scheduleNextMQTTdelayQueue(); -#endif // if FEATURE_MQTT + #endif // if FEATURE_MQTT Scheduler.sendGratuitousARP_now(); if (Settings.UseRules) @@ -477,9 +482,9 @@ void processGotIP() { if ((WiFiEventData.WiFiConnected() || WiFi.isConnected()) && hasIPaddr()) { WiFiEventData.setWiFiGotIP(); } - #if FEATURE_ESPEASY_P2P + #if FEATURE_ESPEASY_P2P refreshNodeList(); - #endif + #endif logConnectionStatus(); } diff --git a/src/src/ESPEasyCore/ESPEasyWifi_abstracted_ESP32.cpp b/src/src/ESPEasyCore/ESPEasyWifi_abstracted_ESP32.cpp index 4f7a25cee..c3d91e9c9 100644 --- a/src/src/ESPEasyCore/ESPEasyWifi_abstracted_ESP32.cpp +++ b/src/src/ESPEasyCore/ESPEasyWifi_abstracted_ESP32.cpp @@ -45,7 +45,7 @@ bool WiFi_pre_STA_setup() return true; } -STA_connected_state getSTA_connected_state() +STA_connected_state getSTA_connected_state() { switch (WiFi.status()) { diff --git a/src/src/ESPEasyCore/ESPEasyWifi_abstracted_ESP8266.cpp b/src/src/ESPEasyCore/ESPEasyWifi_abstracted_ESP8266.cpp index a4891c5b9..7388948fd 100644 --- a/src/src/ESPEasyCore/ESPEasyWifi_abstracted_ESP8266.cpp +++ b/src/src/ESPEasyCore/ESPEasyWifi_abstracted_ESP8266.cpp @@ -37,7 +37,7 @@ bool WiFi_pre_STA_setup() { return true; } -STA_connected_state getSTA_connected_state() +STA_connected_state getSTA_connected_state() { // Perform check on SDK function, see: https://github.com/esp8266/Arduino/issues/7432 station_status_t status = wifi_station_get_connect_status(); diff --git a/src/src/ESPEasyCore/ESPEasy_loop.cpp b/src/src/ESPEasyCore/ESPEasy_loop.cpp index b18aedb86..d157addb6 100644 --- a/src/src/ESPEasyCore/ESPEasy_loop.cpp +++ b/src/src/ESPEasyCore/ESPEasy_loop.cpp @@ -5,6 +5,7 @@ #include "../Commands/ExecuteCommand.h" #include "../DataStructs/TimingStats.h" #include "../ESPEasyCore/ESPEasyNetwork.h" +#include "../ESPEasyCore/ESPEasyWifi.h" #include "../ESPEasyCore/ESPEasyWifi_ProcessEvent.h" #include "../ESPEasyCore/ESPEasy_backgroundtasks.h" #include "../ESPEasyCore/ESPEasy_Log.h" @@ -72,6 +73,8 @@ void ESPEasy_loop() updateLoopStats(); + loopWiFi(); + handle_unprocessedNetworkEvents(); bool firstLoopConnectionsEstablished = NetworkConnected() && firstLoop; diff --git a/src/src/Globals/ESPEasyWiFiEvent.cpp b/src/src/Globals/ESPEasyWiFiEvent.cpp index 9ec0c0a46..3428e2d35 100644 --- a/src/src/Globals/ESPEasyWiFiEvent.cpp +++ b/src/src/Globals/ESPEasyWiFiEvent.cpp @@ -14,5 +14,6 @@ WiFiEventHandler APModeStationDisconnectedHandler; #endif // ifdef ESP8266 WiFiEventData_t WiFiEventData; +ESPEasy::net::wifi::ESPEasyWiFi_t ESPEasyWiFi; diff --git a/src/src/Globals/ESPEasyWiFiEvent.h b/src/src/Globals/ESPEasyWiFiEvent.h index 068e3f773..d01d3e49a 100644 --- a/src/src/Globals/ESPEasyWiFiEvent.h +++ b/src/src/Globals/ESPEasyWiFiEvent.h @@ -4,6 +4,8 @@ #include "../../ESPEasy_common.h" +#include "../ESPEasyCore/ESPEasyWiFi_state_machine.h" + #include "../DataStructs/WiFiEventData.h" @@ -34,6 +36,7 @@ extern WiFiEventHandler APModeStationDisconnectedHandler; extern WiFiEventData_t WiFiEventData; +extern ESPEasy::net::wifi::ESPEasyWiFi_t ESPEasyWiFi; #endif // GLOBALS_ESPEASYWIFIEVENT_H diff --git a/src/src/Helpers/WiFi_AP_CandidatesList.cpp b/src/src/Helpers/WiFi_AP_CandidatesList.cpp index 7a4430166..15681f954 100644 --- a/src/src/Helpers/WiFi_AP_CandidatesList.cpp +++ b/src/src/Helpers/WiFi_AP_CandidatesList.cpp @@ -41,7 +41,7 @@ void WiFi_AP_CandidatesList::load_knownCredentials() { _mustLoadCredentials = false; known.clear(); candidates.clear(); -// attemptsLeft = 1; +// attemptsLeft = WiFi_CONNECT_ATTEMPTS; _addedKnownCandidate = false; // addFromRTC(); @@ -137,7 +137,7 @@ void WiFi_AP_CandidatesList::after_process_WiFiscan() { scanned_new.unique(); _mustLoadCredentials = true; WiFi.scanDelete(); - attemptsLeft = 1; + attemptsLeft = WiFi_CONNECT_ATTEMPTS; } bool WiFi_AP_CandidatesList::getNext(bool scanAllowed) { @@ -150,7 +150,7 @@ bool WiFi_AP_CandidatesList::getNext(bool scanAllowed) { return false; } loadCandidatesFromScanned(); - attemptsLeft = 1; + attemptsLeft = WiFi_CONNECT_ATTEMPTS; if (candidates.empty()) { return false; } */ } @@ -174,7 +174,7 @@ bool WiFi_AP_CandidatesList::getNext(bool scanAllowed) { if (mustPop) { if (attemptsLeft == 0) { - if (currentCandidate.bits.isHidden) { + if (currentCandidate.bits.isHidden && !Settings.HiddenSSID_SlowConnectPerBSSID()) { // We tried to connect to hidden SSIDs in 1 run, so pop all hidden candidates. for (auto cand_it = candidates.begin(); cand_it != candidates.end() && cand_it->bits.isHidden; ) { cand_it = candidates.erase(cand_it); @@ -186,7 +186,7 @@ bool WiFi_AP_CandidatesList::getNext(bool scanAllowed) { } known_it = known.begin(); - attemptsLeft = 1; + attemptsLeft = WiFi_CONNECT_ATTEMPTS; } else { markAttempt(); } diff --git a/src/src/Helpers/WiFi_AP_CandidatesList.h b/src/src/Helpers/WiFi_AP_CandidatesList.h index 2c76e04e4..0ad3ba906 100644 --- a/src/src/Helpers/WiFi_AP_CandidatesList.h +++ b/src/src/Helpers/WiFi_AP_CandidatesList.h @@ -7,6 +7,8 @@ #include +#define WiFi_CONNECT_ATTEMPTS 2 + typedef std::list::const_iterator WiFi_AP_Candidate_const_iterator; struct WiFi_AP_CandidatesList { @@ -110,7 +112,7 @@ private: bool _mustLoadCredentials = true; bool _addedKnownCandidate = false; public: - int attemptsLeft = 1; + int attemptsLeft = WiFi_CONNECT_ATTEMPTS; }; #endif // ifndef HELPERS_WIFI_AP_CANDIDATESLIST_H From ae7d49e5bb2000073482dcf98c6a2b7d30a707a1 Mon Sep 17 00:00:00 2001 From: TD-er Date: Tue, 5 Nov 2024 00:44:01 +0100 Subject: [PATCH 006/564] [WiFi] Restructure ESP32/ESP8266 code --- src/src/CustomBuild/define_plugin_sets.h | 9 +- src/src/DataStructs/NodeStruct.cpp | 4 +- src/src/DataStructs/WiFiEventData.cpp | 183 ++++++--- src/src/DataStructs/WiFiEventData.h | 22 +- src/src/ESPEasyCore/ESPEasyNetwork.cpp | 380 ++---------------- src/src/ESPEasyCore/ESPEasyNetwork.h | 2 + src/src/ESPEasyCore/ESPEasyNetwork_ESP32.cpp | 297 ++++++++++++++ .../ESPEasyCore/ESPEasyNetwork_ESP8266.cpp | 87 ++++ .../ESPEasyCore/ESPEasyWiFi_state_machine.cpp | 50 ++- .../ESPEasyWifi_abstracted_ESP32.cpp | 19 +- src/src/Helpers/StringProvider.cpp | 2 + 11 files changed, 580 insertions(+), 475 deletions(-) create mode 100644 src/src/ESPEasyCore/ESPEasyNetwork_ESP32.cpp create mode 100644 src/src/ESPEasyCore/ESPEasyNetwork_ESP8266.cpp diff --git a/src/src/CustomBuild/define_plugin_sets.h b/src/src/CustomBuild/define_plugin_sets.h index bfda3f398..f2d2506c7 100644 --- a/src/src/CustomBuild/define_plugin_sets.h +++ b/src/src/CustomBuild/define_plugin_sets.h @@ -1104,9 +1104,6 @@ To create/register a plugin, you have to : #define PLUGIN_SET_MAX #define CONTROLLER_SET_ALL #define NOTIFIER_SET_ALL - #ifndef TESTING_FEATURE_USE_IPV6 - #define TESTING_FEATURE_USE_IPV6 - #endif #ifndef PLUGIN_ENERGY_COLLECTION #define PLUGIN_ENERGY_COLLECTION #endif @@ -3511,11 +3508,7 @@ To create/register a plugin, you have to : #ifndef FEATURE_USE_IPV6 # if ESP_IDF_VERSION_MAJOR>=5 && defined(LWIP_IPV6) -# ifdef TESTING_FEATURE_USE_IPV6 -# define FEATURE_USE_IPV6 1 -# else -# define FEATURE_USE_IPV6 0 -# endif +# define FEATURE_USE_IPV6 1 # else # define FEATURE_USE_IPV6 0 # endif diff --git a/src/src/DataStructs/NodeStruct.cpp b/src/src/DataStructs/NodeStruct.cpp index 70256c2fe..99a8ac800 100644 --- a/src/src/DataStructs/NodeStruct.cpp +++ b/src/src/DataStructs/NodeStruct.cpp @@ -313,8 +313,10 @@ bool NodeStruct::match(const MAC_address& mac) const bool NodeStruct::isThisNode() const { // Check to see if we process a node we've sent ourselves. + #if FEATURE_WIFI if (WifiSoftAPmacAddress() == ap_mac) return true; - if (WifiSTAmacAddress() == sta_mac) return true; + #endif + if (NetworkMacAddress() == sta_mac) return true; return false; } diff --git a/src/src/DataStructs/WiFiEventData.cpp b/src/src/DataStructs/WiFiEventData.cpp index 0996d94c4..9adb2c62b 100644 --- a/src/src/DataStructs/WiFiEventData.cpp +++ b/src/src/DataStructs/WiFiEventData.cpp @@ -10,41 +10,44 @@ #include "../Helpers/Networking.h" -#define WIFI_RECONNECT_WAIT 30000 // in milliSeconds +#define WIFI_RECONNECT_WAIT 30000 // in milliSeconds -#define CONNECT_TIMEOUT_MAX 4000 // in milliSeconds +#define CONNECT_TIMEOUT_MAX 4000 // in milliSeconds #if FEATURE_USE_IPV6 -#include +# include // ----------------------------------------------------------------------------------------------------------------------- // ---------------------------------------------------- Private functions ------------------------------------------------ // ----------------------------------------------------------------------------------------------------------------------- esp_netif_t* get_esp_interface_netif(esp_interface_t interface); -#endif +#endif // if FEATURE_USE_IPV6 - - -bool WiFiEventData_t::WiFiConnectAllowed() const { +bool WiFiEventData_t::WiFiConnectAllowed() const { if (WiFi.status() == WL_IDLE_STATUS) { // FIXME TD-er: What to do now? Set a timer? - //return false; - if (last_wifi_connect_attempt_moment.isSet() && - !last_wifi_connect_attempt_moment.timeoutReached(WIFI_PROCESS_EVENTS_TIMEOUT)) { + // return false; + if (last_wifi_connect_attempt_moment.isSet() && + !last_wifi_connect_attempt_moment.timeoutReached(WIFI_PROCESS_EVENTS_TIMEOUT)) { return false; } } - if (!wifiConnectAttemptNeeded) return false; - if (intent_to_reboot) return false; - if (wifiSetupConnect) return true; + + if (!wifiConnectAttemptNeeded) { return false; } + + if (intent_to_reboot) { return false; } + + if (wifiSetupConnect) { return true; } + if (wifiConnectInProgress) { - if (last_wifi_connect_attempt_moment.isSet() && - !last_wifi_connect_attempt_moment.timeoutReached(WIFI_PROCESS_EVENTS_TIMEOUT)) { + if (last_wifi_connect_attempt_moment.isSet() && + !last_wifi_connect_attempt_moment.timeoutReached(WIFI_PROCESS_EVENTS_TIMEOUT)) { return false; } - } + } + if (lastDisconnectMoment.isSet()) { // TODO TD-er: Make this time more dynamic. if (!lastDisconnectMoment.timeoutReached(1000)) { @@ -59,25 +62,29 @@ bool WiFiEventData_t::unprocessedWifiEvents() const { #if FEATURE_USE_IPV6 && processedGotIP6 #endif - ) + ) { return false; } + if (!processedConnect) { if (lastConnectMoment.isSet() && lastConnectMoment.timeoutReached(WIFI_PROCESS_EVENTS_TIMEOUT)) { return false; } } + if (!processedGotIP) { if (lastGetIPmoment.isSet() && lastGetIPmoment.timeoutReached(WIFI_PROCESS_EVENTS_TIMEOUT)) { return false; } } + if (!processedDisconnect) { if (lastDisconnectMoment.isSet() && lastDisconnectMoment.timeoutReached(WIFI_PROCESS_EVENTS_TIMEOUT)) { return false; } } + if (!processedDHCPTimeout) { return false; } @@ -97,22 +104,23 @@ void WiFiEventData_t::clearAll() { void WiFiEventData_t::markWiFiTurnOn() { setWiFiDisconnected(); -// lastDisconnectMoment.clear(); + + // lastDisconnectMoment.clear(); lastConnectMoment.clear(); lastGetIPmoment.clear(); - wifi_considered_stable = false; - + wifi_considered_stable = false; + clear_processed_flags(); } void WiFiEventData_t::clear_processed_flags() { // Mark all flags to default to prevent handling old events. WiFi.scanDelete(); - processedConnect = true; - processedDisconnect = true; - processedGotIP = true; + processedConnect = true; + processedDisconnect = true; + processedGotIP = true; #if FEATURE_USE_IPV6 - processedGotIP6 = true; + processedGotIP6 = true; #endif processedDHCPTimeout = true; processedConnectAPmode = true; @@ -128,17 +136,17 @@ void WiFiEventData_t::clear_processed_flags() { void WiFiEventData_t::markWiFiBegin() { markWiFiTurnOn(); last_wifi_connect_attempt_moment.setNow(); - wifiConnectInProgress = true; - usedChannel = 0; + wifiConnectInProgress = true; + usedChannel = 0; ++wifi_connect_attempt; + if (!timerAPstart.isSet()) { timerAPstart.setMillisFromNow(3 * WIFI_RECONNECT_WAIT); } } - void WiFiEventData_t::setWiFiDisconnected() { - wifiStatus = ESPEASY_WIFI_DISCONNECTED; + wifiStatus = ESPEASY_WIFI_DISCONNECTED; last_wifi_connect_attempt_moment.clear(); wifiConnectInProgress = false; } @@ -146,9 +154,11 @@ void WiFiEventData_t::setWiFiDisconnected() { void WiFiEventData_t::setWiFiGotIP() { bitSet(wifiStatus, ESPEASY_WIFI_GOT_IP); processedGotIP = true; + if (valid_DNS_address(WiFi.dnsIP(0))) { dns0_cache = WiFi.dnsIP(0); } + if (valid_DNS_address(WiFi.dnsIP(1))) { dns1_cache = WiFi.dnsIP(1); } @@ -161,14 +171,14 @@ void WiFiEventData_t::setWiFiConnected() { void WiFiEventData_t::setWiFiServicesInitialized() { if (/*!unprocessedWifiEvents() && */ WiFiConnected() && WiFiGotIP()) { - # ifndef BUILD_NO_DEBUG + #ifndef BUILD_NO_DEBUG addLog(LOG_LEVEL_DEBUG, F("WiFi : WiFi services initialized")); #endif bitSet(wifiStatus, ESPEASY_WIFI_SERVICES_INITIALIZED); - wifiConnectInProgress = false; + wifiConnectInProgress = false; wifiConnectAttemptNeeded = false; - dns0_cache = WiFi.dnsIP(0); - dns1_cache = WiFi.dnsIP(1); + dns0_cache = WiFi.dnsIP(0); + dns1_cache = WiFi.dnsIP(1); } } @@ -183,12 +193,13 @@ void WiFiEventData_t::markGotIP() { } #if FEATURE_USE_IPV6 - void WiFiEventData_t::markGotIPv6(const IPAddress& ip6) { - processedGotIP6 = false; - unprocessed_IP6 = ip6; - } -#endif +void WiFiEventData_t::markGotIPv6(const IPAddress& ip6) { + processedGotIP6 = false; + unprocessed_IP6 = ip6; +} + +#endif // if FEATURE_USE_IPV6 void WiFiEventData_t::markLostIP() { bitClear(wifiStatus, ESPEASY_WIFI_GOT_IP); @@ -196,13 +207,13 @@ void WiFiEventData_t::markLostIP() { } void WiFiEventData_t::markDisconnect(WiFiDisconnectReason reason) { -/* - #if defined(ESP32) - if ((WiFi.getMode() & WIFI_MODE_STA) == 0) return; - #else // if defined(ESP32) - if ((WiFi.getMode() & WIFI_STA) == 0) return; - #endif // if defined(ESP32) -*/ + /* + #if defined(ESP32) + if ((WiFi.getMode() & WIFI_MODE_STA) == 0) return; + #else // if defined(ESP32) + if ((WiFi.getMode() & WIFI_STA) == 0) return; + #endif // if defined(ESP32) + */ lastDisconnectMoment.setNow(); usedChannel = 0; @@ -210,26 +221,29 @@ void WiFiEventData_t::markDisconnect(WiFiDisconnectReason reason) { // There was an unsuccessful connection attempt lastConnectedDuration_us = last_wifi_connect_attempt_moment.timeDiff(lastDisconnectMoment); } else { - if (last_wifi_connect_attempt_moment.isSet()) + if (last_wifi_connect_attempt_moment.isSet()) { lastConnectedDuration_us = lastConnectMoment.timeDiff(lastDisconnectMoment); - else + } + else { lastConnectedDuration_us = 0; + } } - lastDisconnectReason = reason; - processedDisconnect = false; + lastDisconnectReason = reason; + processedDisconnect = false; wifiConnectInProgress = false; } void WiFiEventData_t::markConnected(const String& ssid, const uint8_t bssid[6], uint8_t channel) { usedChannel = channel; lastConnectMoment.setNow(); - processedConnect = false; - channel_changed = RTC.lastWiFiChannel != channel; - last_ssid = ssid; - bssid_changed = false; - auth_mode = WiFi_AP_Candidates.getCurrent().enc_type; + processedConnect = false; + channel_changed = RTC.lastWiFiChannel != channel; + last_ssid = ssid; + bssid_changed = false; + auth_mode = WiFi_AP_Candidates.getCurrent().enc_type; RTC.lastWiFiChannel = channel; + for (uint8_t i = 0; i < 6; ++i) { if (RTC.lastBSSID[i] != bssid[i]) { bssid_changed = true; @@ -237,10 +251,11 @@ void WiFiEventData_t::markConnected(const String& ssid, const uint8_t bssid[6], } } #if FEATURE_USE_IPV6 + if (Settings.EnableIPv6()) { WiFi.enableIPv6(true); } -#endif +#endif // if FEATURE_USE_IPV6 } void WiFiEventData_t::markConnectedAPmode(const uint8_t mac[6]) { @@ -253,19 +268,20 @@ void WiFiEventData_t::markDisconnectedAPmode(const uint8_t mac[6]) { processedDisconnectAPmode = false; } - - String WiFiEventData_t::ESPeasyWifiStatusToString() const { String log; + if (WiFiDisconnected()) { log = F("DISCONNECTED"); } else { if (WiFiConnected()) { log += F("Conn. "); } + if (WiFiGotIP()) { log += F("IP "); } + if (WiFiServicesInitialized()) { log += F("Init"); } @@ -273,12 +289,63 @@ String WiFiEventData_t::ESPeasyWifiStatusToString() const { return log; } - uint32_t WiFiEventData_t::getSuggestedTimeout(int index, uint32_t minimum_timeout) const { auto it = connectDurations.find(index); + if (it == connectDurations.end()) { return 3 * minimum_timeout; } const uint32_t res = 3 * it->second; return constrain(res, minimum_timeout, CONNECT_TIMEOUT_MAX); -} \ No newline at end of file +} + + +#ifdef ESP8266 + bool WiFiEventData_t::WiFiDisconnected() const { + return wifiStatus == ESPEASY_WIFI_DISCONNECTED; + } + + bool WiFiEventData_t::WiFiGotIP() const { + return bitRead(wifiStatus, ESPEASY_WIFI_GOT_IP); + } + + bool WiFiEventData_t::WiFiConnected() const { + return bitRead(wifiStatus, ESPEASY_WIFI_CONNECTED); + } + + bool WiFiEventData_t::WiFiServicesInitialized() const { + return bitRead(wifiStatus, ESPEASY_WIFI_SERVICES_INITIALIZED); + } + +#endif + +#ifdef ESP32 + bool WiFiEventData_t::WiFiDisconnected() const { + return !WiFi.STA.connected(); + } + + bool WiFiEventData_t::WiFiGotIP() const { + return WiFi.STA.hasIP(); + } + +#if FEATURE_USE_IPV6 + bool WiFiEventData_t::WiFiGotIPv6() const { + return WiFi.STA.hasGlobalIPv6(); + } +#endif + + bool WiFiEventData_t::WiFiConnected() const { + return WiFi.STA.connected(); + } + + bool WiFiEventData_t::WiFiServicesInitialized() const { + return WiFiConnected() && +#if FEATURE_USE_IPV6 +(WiFiGotIP() || WiFi.STA.hasGlobalIPv6() || WiFi.STA.hasLinkLocalIPv6()); +#else + WiFiGotIP(); +#endif + } + + #endif + diff --git a/src/src/DataStructs/WiFiEventData.h b/src/src/DataStructs/WiFiEventData.h index 76a3e5ff6..27e8db8c5 100644 --- a/src/src/DataStructs/WiFiEventData.h +++ b/src/src/DataStructs/WiFiEventData.h @@ -43,21 +43,13 @@ struct WiFiEventData_t { void clear_processed_flags(); void markWiFiBegin(); - bool WiFiDisconnected() const { - return wifiStatus == ESPEASY_WIFI_DISCONNECTED; - } - - bool WiFiGotIP() const { - return bitRead(wifiStatus, ESPEASY_WIFI_GOT_IP); - } - - bool WiFiConnected() const { - return bitRead(wifiStatus, ESPEASY_WIFI_CONNECTED); - } - - bool WiFiServicesInitialized() const { - return bitRead(wifiStatus, ESPEASY_WIFI_SERVICES_INITIALIZED); - } + bool WiFiDisconnected() const; + bool WiFiGotIP() const; +#if FEATURE_USE_IPV6 + bool WiFiGotIPv6() const; +#endif + bool WiFiConnected() const; + bool WiFiServicesInitialized() const; void setWiFiDisconnected(); void setWiFiGotIP(); diff --git a/src/src/ESPEasyCore/ESPEasyNetwork.cpp b/src/src/ESPEasyCore/ESPEasyNetwork.cpp index a5bad8336..b2c697b0c 100644 --- a/src/src/ESPEasyCore/ESPEasyNetwork.cpp +++ b/src/src/ESPEasyCore/ESPEasyNetwork.cpp @@ -1,331 +1,28 @@ #include "../ESPEasyCore/ESPEasyNetwork.h" -#include "../ESPEasyCore/ESPEasy_Log.h" -#include "../ESPEasyCore/ESPEasyEth.h" -#include "../ESPEasyCore/ESPEasyWifi.h" + #include "../ESPEasyCore/ESPEasyWifi_abstracted.h" -#include "../Globals/ESPEasy_time.h" -#include "../Globals/ESPEasyWiFiEvent.h" + #include "../Globals/NetworkState.h" #include "../Globals/Settings.h" -#include "../Helpers/Network.h" -#include "../Helpers/Networking.h" +#include "../Globals/ESPEasy_time.h" + #include "../Helpers/StringConverter.h" #include "../Helpers/MDNS_Helper.h" -#if FEATURE_ETHERNET -#include "../Globals/ESPEasyEthEvent.h" -#include -#endif - - -#if FEATURE_USE_IPV6 -#include - -// ----------------------------------------------------------------------------------------------------------------------- -// ---------------------------------------------------- Private functions ------------------------------------------------ -// ----------------------------------------------------------------------------------------------------------------------- - -esp_netif_t* get_esp_interface_netif(esp_interface_t interface); -#endif - - -void setNetworkMedium(NetworkMedium_t new_medium) { -#if !(FEATURE_ETHERNET) - if (new_medium == NetworkMedium_t::Ethernet) { - new_medium = NetworkMedium_t::WIFI; - } -#endif - if (active_network_medium == new_medium) { - return; - } - switch (active_network_medium) { - case NetworkMedium_t::Ethernet: - #if FEATURE_ETHERNET - // FIXME TD-er: How to 'end' ETH? -// ETH.end(); - if (new_medium == NetworkMedium_t::WIFI) { - WiFiEventData.clearAll(); -#if ESP_IDF_VERSION_MAJOR >= 5 - WiFi.STA.setDefault(); -#endif - } - #endif - break; - case NetworkMedium_t::WIFI: - WiFiEventData.timerAPoff.setMillisFromNow(WIFI_AP_OFF_TIMER_DURATION); - WiFiEventData.timerAPstart.clear(); - if (new_medium == NetworkMedium_t::Ethernet) { -#if ESP_IDF_VERSION_MAJOR >= 5 -#if FEATURE_ETHERNET - ETH.setDefault(); -#endif -#endif - WifiDisconnect(); - } - break; - case NetworkMedium_t::NotSet: - break; - } - statusLED(true); - active_network_medium = new_medium; - addLog(LOG_LEVEL_INFO, concat(F("Set Network mode: "), toString(active_network_medium))); -} - - -/*********************************************************************************************\ - Ethernet or Wifi Support for ESP32 Build flag FEATURE_ETHERNET -\*********************************************************************************************/ -void NetworkConnectRelaxed() { - if (NetworkConnected()) return; -#if FEATURE_ETHERNET - if(active_network_medium == NetworkMedium_t::Ethernet) { - if (ETHConnectRelaxed()) { - return; - } - // Failed to start the Ethernet network, probably not present of wrong parameters. - // So set the runtime active medium to WiFi to try connecting to WiFi or at least start the AP. - setNetworkMedium(NetworkMedium_t::WIFI); - } -#endif - // Failed to start the Ethernet network, probably not present of wrong parameters. - // So set the runtime active medium to WiFi to try connecting to WiFi or at least start the AP. - WiFiConnectRelaxed(); -} - -bool NetworkConnected() { - #if FEATURE_ETHERNET - if(active_network_medium == NetworkMedium_t::Ethernet) { - return ETHConnected(); - } - #endif - return WiFiConnected(); -} - -IPAddress NetworkLocalIP() { - #if FEATURE_ETHERNET - if(active_network_medium == NetworkMedium_t::Ethernet) { - if(EthEventData.ethInitSuccess) { - return ETH.localIP(); - } else { - addLog(LOG_LEVEL_ERROR, F("Call NetworkLocalIP() only on connected Ethernet!")); - return IPAddress(); - } - } - #endif - return WiFi.localIP(); -} - -IPAddress NetworkSubnetMask() { - #if FEATURE_ETHERNET - if(active_network_medium == NetworkMedium_t::Ethernet) { - if(EthEventData.ethInitSuccess) { - return ETH.subnetMask(); - } else { - addLog(LOG_LEVEL_ERROR, F("Call NetworkSubnetMask() only on connected Ethernet!")); - return IPAddress(); - } - } - #endif - return WiFi.subnetMask(); -} - -IPAddress NetworkGatewayIP() { - #if FEATURE_ETHERNET - if(active_network_medium == NetworkMedium_t::Ethernet) { - if(EthEventData.ethInitSuccess) { - return ETH.gatewayIP(); - } else { - addLog(LOG_LEVEL_ERROR, F("Call NetworkGatewayIP() only on connected Ethernet!")); - return IPAddress(); - } - } - #endif - return WiFi.gatewayIP(); -} - -IPAddress NetworkDnsIP(uint8_t dns_no) { - scrubDNS(); - #if FEATURE_ETHERNET - if(active_network_medium == NetworkMedium_t::Ethernet) { - if(EthEventData.ethInitSuccess) { - return ETH.dnsIP(dns_no); - } else { - addLog(LOG_LEVEL_ERROR, F("Call NetworkDnsIP(uint8_t dns_no) only on connected Ethernet!")); - return IPAddress(); - } - } - #endif - return WiFi.dnsIP(dns_no); -} - -#if FEATURE_USE_IPV6 -esp_netif_t * getActiveNetworkMediumInterface() { - esp_interface_t iface = ESP_IF_MAX; - #if FEATURE_ETHERNET - if(active_network_medium == NetworkMedium_t::Ethernet) { - if(EthEventData.ethInitSuccess) { - esp_netif_t *res = ETH.netif(); - if (res == nullptr) { - res = get_esp_interface_netif(ESP_IF_ETH); - } - if (res != nullptr) - return res; - } - } else - #endif - { - if ( ESPEasy::net::wifi::WifiIsSTA(WiFi.getMode())) { - iface = ESP_IF_WIFI_STA; - } - } - if (ESP_IF_MAX == iface) - return nullptr; - return get_esp_interface_netif(iface); -} - -IPAddress NetworkLocalIP6() { - esp_netif_t * iface = getActiveNetworkMediumInterface(); - esp_ip6_addr_t addr; - if (nullptr == iface || - esp_netif_get_ip6_linklocal(iface, &addr)) - { - return IN6ADDR_ANY; - } - - IPAddress res(IPv6, (const uint8_t*)addr.addr, addr.zone); - return res; -} - -IPAddress NetworkGlobalIP6() { - esp_netif_t * iface = getActiveNetworkMediumInterface(); - esp_ip6_addr_t addr; - if (nullptr == iface || - esp_netif_get_ip6_global(iface, &addr)) - { - return IN6ADDR_ANY; - } - - IPAddress res(IPv6, (const uint8_t*)addr.addr, addr.zone); - return res; -} - -IP6Addresses_t NetworkAllIPv6() { - IP6Addresses_t addresses; - esp_netif_t * iface = getActiveNetworkMediumInterface(); - if (nullptr != iface) { - esp_ip6_addr_t esp_ip6_addr[LWIP_IPV6_NUM_ADDRESSES]{}; - - int count = esp_netif_get_all_ip6(iface, esp_ip6_addr); - for (int i = 0; i < count; ++i) { - addresses.emplace_back(IPv6, (const uint8_t*)esp_ip6_addr[i].addr, esp_ip6_addr[i].zone); - } - } - - return addresses; -} - -bool IPv6_from_MAC(const MAC_address& mac, IPAddress& ipv6) -{ - if (ipv6 == IN6ADDR_ANY) { return false; } - int index_offset = 8; - - for (int i = 0; i < 6; ++i, ++index_offset) { - ipv6[index_offset] = mac.mac[i]; - - if (i == 0) { - // invert bit 2 - bitToggle(ipv6[index_offset], 1); - } - - if (i == 2) { - ipv6[++index_offset] = 0xFF; - ipv6[++index_offset] = 0xFE; - } - } -/* - addLog(LOG_LEVEL_INFO, strformat( - F("IPv6_from_MAC: Mac %s IP %s"), - mac.toString().c_str(), - ipv6.toString(true).c_str() - )); -*/ - return true; -} - -bool is_IPv6_based_on_MAC(const MAC_address& mac, const IPAddress& ipv6) -{ - IPAddress tmp = ipv6; - - if (IPv6_from_MAC(mac, tmp)) { - return ipv6 == tmp; - } - return false; -} - -bool IPv6_link_local_from_MAC(const MAC_address& mac, IPAddress& ipv6) -{ - ipv6 = NetworkLocalIP6(); - return IPv6_from_MAC(mac, ipv6); -} - -bool is_IPv6_link_local_from_MAC(const MAC_address& mac) -{ - return is_IPv6_based_on_MAC(mac, NetworkLocalIP6()); -} - -// Assume we're in the same subnet, thus use our own IPv6 global address -bool IPv6_global_from_MAC(const MAC_address& mac, IPAddress& ipv6) -{ - ipv6 = NetworkGlobalIP6(); - return IPv6_from_MAC(mac, ipv6); -} - -bool is_IPv6_global_from_MAC(const MAC_address& mac) -{ - return is_IPv6_based_on_MAC(mac, NetworkGlobalIP6()); -} - -#endif // if FEATURE_USE_IPV6 - - - -MAC_address NetworkMacAddress() { - #if FEATURE_ETHERNET - if(active_network_medium == NetworkMedium_t::Ethernet) { - return ETHMacAddress(); - } - #endif - MAC_address mac; - WiFi.macAddress(mac.mac); - return mac; -} - -String NetworkGetHostname() { - #ifdef ESP32 - #if FEATURE_ETHERNET - if(Settings.NetworkMedium == NetworkMedium_t::Ethernet && EthEventData.ethInitSuccess) { - return String(ETH.getHostname()); - } - #endif - return String(WiFi.getHostname()); - #else - return String(WiFi.hostname()); - #endif -} - // ******************************************************************************** // Determine Wifi AP name to set. (also used for mDNS) // ******************************************************************************** String NetworkGetHostNameFromSettings(bool force_add_unitnr) { - if (force_add_unitnr) return Settings.getHostname(true); + if (force_add_unitnr) { return Settings.getHostname(true); } return Settings.getHostname(); } String NetworkCreateRFCCompliantHostname(bool force_add_unitnr) { String hostname(NetworkGetHostNameFromSettings(force_add_unitnr)); + // Create hostname with - instead of spaces // See RFC952. @@ -334,8 +31,10 @@ String NetworkCreateRFCCompliantHostname(bool force_add_unitnr) { // * numerals (0-9) // * Hyphen (-) replaceUnicodeByChar(hostname, '-'); + for (size_t i = 0; i < hostname.length(); ++i) { const char c = hostname[i]; + if (!isAlphaNumeric(c)) { hostname[i] = '-'; } @@ -343,21 +42,26 @@ String NetworkCreateRFCCompliantHostname(bool force_add_unitnr) { // May not start or end with a hyphen const String dash('-'); + while (hostname.startsWith(dash)) { hostname = hostname.substring(1); } + while (hostname.endsWith(dash)) { hostname = hostname.substring(0, hostname.length() - 1); } // May not contain only numerals bool onlyNumerals = true; + for (size_t i = 0; onlyNumerals && i < hostname.length(); ++i) { const char c = hostname[i]; + if (!isdigit(c)) { onlyNumerals = false; } } + if (onlyNumerals) { hostname = concat(F("ESPEasy-"), hostname); } @@ -369,59 +73,23 @@ String NetworkCreateRFCCompliantHostname(bool force_add_unitnr) { return hostname; } -MAC_address WifiSoftAPmacAddress() { - MAC_address mac; - WiFi.softAPmacAddress(mac.mac); - return mac; -} - -MAC_address WifiSTAmacAddress() { - MAC_address mac; - WiFi.macAddress(mac.mac); - return mac; -} - void CheckRunningServices() { // First try to get the time, since that may be used in logs - if (Settings.UseNTP() && node_time.getTimeSource() > timeSource_t::NTP_time_source) { + if (Settings.UseNTP() && (node_time.getTimeSource() > timeSource_t::NTP_time_source)) { node_time.lastNTPSyncTime_ms = 0; node_time.initTime(); } -#if FEATURE_SET_WIFI_TX_PWR - if (active_network_medium == NetworkMedium_t::WIFI) +#if FEATURE_WIFI +# if FEATURE_SET_WIFI_TX_PWR + + if (active_network_medium == NetworkMedium_t::WIFI) { - SetWiFiTXpower(); + ESPEasy::net::wifi::SetWiFiTXpower(); } -#endif +# endif // if FEATURE_SET_WIFI_TX_PWR +#endif // if FEATURE_WIFI + +#if FEATURE_MDNS set_mDNS(); + #endif } - -#if FEATURE_ETHERNET -bool EthFullDuplex() -{ - if (EthEventData.ethInitSuccess) - return ETH.fullDuplex(); - return false; -} - -bool EthLinkUp() -{ - if (EthEventData.ethInitSuccess) { - #if ESP_IDF_VERSION_MAJOR < 5 - // FIXME TD-er: See: https://github.com/espressif/arduino-esp32/issues/6105 - return EthEventData.EthConnected(); - #else - return ETH.linkUp(); - #endif - } - return false; -} - -uint8_t EthLinkSpeed() -{ - if (EthEventData.ethInitSuccess) { - return ETH.linkSpeed(); - } - return 0; -} -#endif diff --git a/src/src/ESPEasyCore/ESPEasyNetwork.h b/src/src/ESPEasyCore/ESPEasyNetwork.h index c6e00d7af..436fab792 100644 --- a/src/src/ESPEasyCore/ESPEasyNetwork.h +++ b/src/src/ESPEasyCore/ESPEasyNetwork.h @@ -40,8 +40,10 @@ MAC_address NetworkMacAddress(); String NetworkGetHostNameFromSettings(bool force_add_unitnr = false); String NetworkGetHostname(); String NetworkCreateRFCCompliantHostname(bool force_add_unitnr = false); +#if FEATURE_WIFI MAC_address WifiSoftAPmacAddress(); MAC_address WifiSTAmacAddress(); +#endif void CheckRunningServices(); diff --git a/src/src/ESPEasyCore/ESPEasyNetwork_ESP32.cpp b/src/src/ESPEasyCore/ESPEasyNetwork_ESP32.cpp new file mode 100644 index 000000000..becbf000c --- /dev/null +++ b/src/src/ESPEasyCore/ESPEasyNetwork_ESP32.cpp @@ -0,0 +1,297 @@ +#ifdef ESP32 + +#include "../ESPEasyCore/ESPEasyNetwork.h" + +#include "../ESPEasyCore/ESPEasy_Log.h" +#include "../ESPEasyCore/ESPEasyEth.h" +#include "../ESPEasyCore/ESPEasyWifi.h" +#include "../ESPEasyCore/ESPEasyWifi_abstracted.h" +#include "../Globals/ESPEasy_time.h" +#include "../Globals/ESPEasyWiFiEvent.h" +#include "../Globals/NetworkState.h" +#include "../Globals/Settings.h" + +#include "../Globals/ESPEasyEthEvent.h" + +#include "../Helpers/Network.h" +#include "../Helpers/Networking.h" +#include "../Helpers/StringConverter.h" +#include "../Helpers/MDNS_Helper.h" + +#include + +#if FEATURE_ETHERNET +# include +#endif + +void setNetworkMedium(NetworkMedium_t new_medium) { +#if !(FEATURE_ETHERNET) + + if (new_medium == NetworkMedium_t::Ethernet) { + new_medium = NetworkMedium_t::WIFI; + } +#endif // if !(FEATURE_ETHERNET) + + if (new_medium == active_network_medium) { + return; + } + + switch (active_network_medium) + { + case NetworkMedium_t::WIFI: + WiFi.STA.end(); + break; + case NetworkMedium_t::Ethernet: +#if FEATURE_ETHERNET + ETH.end(); +#endif // if FEATURE_ETHERNET + break; + case NetworkMedium_t::NotSet: + break; + } + + switch (new_medium) + { + case NetworkMedium_t::WIFI: + WiFi.STA.setDefault(); + break; + case NetworkMedium_t::Ethernet: +#if FEATURE_ETHERNET + ETH.setDefault(); +#endif // if FEATURE_ETHERNET + break; + case NetworkMedium_t::NotSet: + break; + } + statusLED(true); + active_network_medium = new_medium; + addLog(LOG_LEVEL_INFO, concat(F("Set Network mode: "), toString(active_network_medium))); +} + +/*********************************************************************************************\ + Ethernet or Wifi Support for ESP32 Build flag FEATURE_ETHERNET +\*********************************************************************************************/ +void NetworkConnectRelaxed() { + if (NetworkConnected()) { return; } +#if FEATURE_ETHERNET + + if (active_network_medium == NetworkMedium_t::Ethernet) { + if (ETHConnectRelaxed()) { + return; + } + + // Failed to start the Ethernet network, probably not present of wrong parameters. + // So set the runtime active medium to WiFi to try connecting to WiFi or at least start the AP. + setNetworkMedium(NetworkMedium_t::WIFI); + } +#endif // if FEATURE_ETHERNET + + // Failed to start the Ethernet network, probably not present of wrong parameters. + // So set the runtime active medium to WiFi to try connecting to WiFi or at least start the AP. + WiFiConnectRelaxed(); +} + +bool NetworkConnected() { + auto network_if = Network.getDefaultInterface(); + + if (network_if == nullptr) { + return false; + } + return network_if->connected(); +} + +IPAddress NetworkLocalIP() { + auto network_if = Network.getDefaultInterface(); + + if (network_if == nullptr) { + return IPAddress(); + } + return network_if->localIP(); +} + +IPAddress NetworkSubnetMask() { + auto network_if = Network.getDefaultInterface(); + + if (network_if == nullptr) { + return IPAddress(); + } + return network_if->subnetMask(); +} + +IPAddress NetworkGatewayIP() { + auto network_if = Network.getDefaultInterface(); + + if (network_if == nullptr) { + return IPAddress(); + } + return network_if->gatewayIP(); +} + +IPAddress NetworkDnsIP(uint8_t dns_no) { + auto network_if = Network.getDefaultInterface(); + + if (network_if == nullptr) { + return IPAddress(); + } + return network_if->dnsIP(dns_no); +} + +#if FEATURE_USE_IPV6 + +IPAddress NetworkLocalIP6() { + auto network_if = Network.getDefaultInterface(); + + if (network_if == nullptr) { + return IN6ADDR_ANY; + } + return network_if->linkLocalIPv6(); +} + +IPAddress NetworkGlobalIP6() { + auto network_if = Network.getDefaultInterface(); + + if (network_if == nullptr) { + return IN6ADDR_ANY; + } + return network_if->globalIPv6(); +} + +IP6Addresses_t NetworkAllIPv6() { + IP6Addresses_t addresses; + auto network_if = Network.getDefaultInterface(); + + if (network_if != nullptr) { + esp_ip6_addr_t esp_ip6_addr[LWIP_IPV6_NUM_ADDRESSES]{}; + + int count = esp_netif_get_all_ip6(network_if->netif(), esp_ip6_addr); + + for (int i = 0; i < count; ++i) { + addresses.emplace_back(IPv6, (const uint8_t *)esp_ip6_addr[i].addr, esp_ip6_addr[i].zone); + } + } + + return addresses; +} + +bool IPv6_from_MAC(const MAC_address& mac, IPAddress& ipv6) +{ + if (ipv6 == IN6ADDR_ANY) { return false; } + int index_offset = 8; + + for (int i = 0; i < 6; ++i, ++index_offset) { + ipv6[index_offset] = mac.mac[i]; + + if (i == 0) { + // invert bit 2 + bitToggle(ipv6[index_offset], 1); + } + + if (i == 2) { + ipv6[++index_offset] = 0xFF; + ipv6[++index_offset] = 0xFE; + } + } + + /* + addLog(LOG_LEVEL_INFO, strformat( + F("IPv6_from_MAC: Mac %s IP %s"), + mac.toString().c_str(), + ipv6.toString(true).c_str() + )); + */ + return true; +} + +bool is_IPv6_based_on_MAC(const MAC_address& mac, const IPAddress& ipv6) +{ + IPAddress tmp = ipv6; + + if (IPv6_from_MAC(mac, tmp)) { + return ipv6 == tmp; + } + return false; +} + +bool IPv6_link_local_from_MAC(const MAC_address& mac, IPAddress& ipv6) +{ + ipv6 = NetworkLocalIP6(); + return IPv6_from_MAC(mac, ipv6); +} + +bool is_IPv6_link_local_from_MAC(const MAC_address& mac) { return is_IPv6_based_on_MAC(mac, NetworkLocalIP6()); } + +// Assume we're in the same subnet, thus use our own IPv6 global address +bool IPv6_global_from_MAC(const MAC_address& mac, IPAddress& ipv6) +{ + ipv6 = NetworkGlobalIP6(); + return IPv6_from_MAC(mac, ipv6); +} + +bool is_IPv6_global_from_MAC(const MAC_address& mac) { return is_IPv6_based_on_MAC(mac, NetworkGlobalIP6()); } + +#endif // if FEATURE_USE_IPV6 + +MAC_address NetworkMacAddress() { + MAC_address res; + auto network_if = Network.getDefaultInterface(); + + if (network_if != nullptr) { + network_if->macAddress(res.mac); + } + return res; +} + +String NetworkGetHostname() { + auto network_if = Network.getDefaultInterface(); + + if (network_if != nullptr) { + return network_if->getHostname(); + } + return EMPTY_STRING; +} + +#if FEATURE_WIFI +MAC_address WifiSoftAPmacAddress() { + MAC_address mac; + + WiFi.AP.macAddress(mac.mac); + return mac; +} + +MAC_address WifiSTAmacAddress() { + MAC_address mac; + + WiFi.macAddress(mac.mac); + return mac; +} +#endif + +#if FEATURE_ETHERNET + +bool EthFullDuplex() +{ + if (EthEventData.ethInitSuccess) { + return ETH.fullDuplex(); + } + return false; +} + +bool EthLinkUp() +{ + if (EthEventData.ethInitSuccess) { + return ETH.linkUp(); + } + return false; +} + +uint8_t EthLinkSpeed() +{ + if (EthEventData.ethInitSuccess) { + return ETH.linkSpeed(); + } + return 0; +} + +#endif // if FEATURE_ETHERNET + +#endif // ifdef ESP32 diff --git a/src/src/ESPEasyCore/ESPEasyNetwork_ESP8266.cpp b/src/src/ESPEasyCore/ESPEasyNetwork_ESP8266.cpp new file mode 100644 index 000000000..f31ea0c89 --- /dev/null +++ b/src/src/ESPEasyCore/ESPEasyNetwork_ESP8266.cpp @@ -0,0 +1,87 @@ +#ifdef ESP8266 + +#include "../ESPEasyCore/ESPEasyNetwork.h" + +#include "../ESPEasyCore/ESPEasy_Log.h" +#include "../ESPEasyCore/ESPEasyEth.h" +#include "../ESPEasyCore/ESPEasyWifi.h" +#include "../ESPEasyCore/ESPEasyWifi_abstracted.h" +#include "../Globals/ESPEasy_time.h" +#include "../Globals/ESPEasyWiFiEvent.h" +#include "../Globals/NetworkState.h" +#include "../Globals/Settings.h" + +#include "../Helpers/Network.h" +#include "../Helpers/Networking.h" +#include "../Helpers/StringConverter.h" +#include "../Helpers/MDNS_Helper.h" + +void setNetworkMedium(NetworkMedium_t new_medium) { + if (new_medium == NetworkMedium_t::Ethernet) { + new_medium = NetworkMedium_t::WIFI; + } + + if (new_medium == active_network_medium) { + return; + } + + switch (active_network_medium) + { + case NetworkMedium_t::Ethernet: + break; + case NetworkMedium_t::WIFI: + WiFiEventData.timerAPoff.setMillisFromNow(WIFI_AP_OFF_TIMER_DURATION); + WiFiEventData.timerAPstart.clear(); + break; + case NetworkMedium_t::NotSet: + break; + } + statusLED(true); + active_network_medium = new_medium; + addLog(LOG_LEVEL_INFO, concat(F("Set Network mode: "), toString(active_network_medium))); +} + +/*********************************************************************************************\ + Ethernet or Wifi Support for ESP32 Build flag FEATURE_ETHERNET +\*********************************************************************************************/ +void NetworkConnectRelaxed() { + if (NetworkConnected()) { return; } + WiFiConnectRelaxed(); +} + +bool NetworkConnected() { return WiFiConnected(); } + +IPAddress NetworkLocalIP() { return WiFi.localIP(); } + +IPAddress NetworkSubnetMask() { return WiFi.subnetMask(); } + +IPAddress NetworkGatewayIP() { return WiFi.gatewayIP(); } + +IPAddress NetworkDnsIP(uint8_t dns_no) { return WiFi.dnsIP(dns_no); } + +MAC_address NetworkMacAddress() { + MAC_address mac; + + WiFi.macAddress(mac.mac); + return mac; +} + +String NetworkGetHostname() { return String(WiFi.hostname()); } + +#if FEATURE_WIFI +MAC_address WifiSoftAPmacAddress() { + MAC_address mac; + + WiFi.softAPmacAddress(mac.mac); + return mac; +} + +MAC_address WifiSTAmacAddress() { + MAC_address mac; + + WiFi.macAddress(mac.mac); + return mac; +} +#endif + +#endif // ifdef ESP8266 diff --git a/src/src/ESPEasyCore/ESPEasyWiFi_state_machine.cpp b/src/src/ESPEasyCore/ESPEasyWiFi_state_machine.cpp index 923a009ba..225c6f687 100644 --- a/src/src/ESPEasyCore/ESPEasyWiFi_state_machine.cpp +++ b/src/src/ESPEasyCore/ESPEasyWiFi_state_machine.cpp @@ -21,7 +21,7 @@ namespace ESPEasy { namespace net { namespace wifi { - # define WIFI_STATE_MACHINE_STA_CONNECTING_TIMEOUT 2000 + # define WIFI_STATE_MACHINE_STA_CONNECTING_TIMEOUT 6000 # define WIFI_STATE_MACHINE_STA_AP_SCANNING_TIMEOUT 10000 # define WIFI_STATE_MACHINE_STA_SCANNING_TIMEOUT 10000 @@ -53,7 +53,7 @@ void ESPEasyWiFi_t::loop() if (_state != WiFiState_e::IdleWaiting) { - if (_callbackError || + if (_callbackError || (_state_timeout.isSet() && _state_timeout.timeReached())) { // TODO TD-er: Must check what error was given??? @@ -135,12 +135,6 @@ void ESPEasyWiFi_t::loop() // Check if we need to start AP // Flag captive portal in webserver and/or whether we might be in setup mode } - -# ifdef USE_IMPROV - { - // Check for Improv mode. - } -# endif // ifdef USE_IMPROV } bool ESPEasyWiFi_t::connected() const @@ -150,12 +144,17 @@ bool ESPEasyWiFi_t::connected() const IPAddress ESPEasyWiFi_t::getIP() const { - IPAddress res; + if (WiFi.STA.hasIP()) { + return WiFi.STA.localIP(); + } - return res; + if (WiFi.AP.hasIP()) { + return WiFi.AP.localIP(); + } + return IPAddress(); } -void ESPEasyWiFi_t::disconnect() {} +void ESPEasyWiFi_t::disconnect() { WiFi.disconnect(Settings.WiFiRestart_connection_lost()); } void ESPEasyWiFi_t::setState(WiFiState_e newState, uint32_t timeout) { if (loglevelActiveFor(LOG_LEVEL_INFO)) { @@ -200,8 +199,13 @@ void ESPEasyWiFi_t::setState(WiFiState_e newState, uint32_t timeout) { break; case WiFiState_e::STA_Connecting: case WiFiState_e::STA_Reconnecting: + // Start connecting - connectSTA(); + if (!connectSTA()) { + // TODO TD-er: Must keep track of failed attempts and start AP when either no credentials present or nr. of attempts failed > some + // threshold. + setState(WiFiState_e::IdleWaiting, 100); + } break; case WiFiState_e::STA_Connected: _last_seen_connected.setNow(); @@ -255,7 +259,6 @@ bool ESPEasyWiFi_t::connectSTA() // Start the process of connecting or starting AP if (!WiFi_AP_Candidates.getNext(true)) { - startScanning(); return false; } @@ -303,13 +306,22 @@ bool ESPEasyWiFi_t::connectSTA() } # endif // ifdef ESP32 - - if ((Settings.HiddenSSID_SlowConnectPerBSSID() || !candidate.bits.isHidden) - && candidate.allowQuickConnect() - && (_state == WiFiState_e::STA_Reconnecting)) { - WiFi.begin(candidate.ssid.c_str(), key.c_str(), candidate.channel, candidate.bssid.mac); + if (candidate.bits.isHidden /*&& Settings.HiddenSSID_SlowConnectPerBSSID()*/) { + WiFi.disconnect(); + delay(100); + WiFi.begin("" /*candidate.ssid.c_str()*/, key.c_str(), candidate.channel, candidate.bssid.mac); + // If the ssid returned from the scan is empty, it is a hidden SSID + // it appears that the WiFi.begin() function is asynchronous and takes + // additional time to connect to a hidden SSID. Therefore a delay of 1000ms + // is added for hidden SSIDs before calling WiFi.status() + delay(1000); +// WiFi.waitForConnectResult(6000); } else { - WiFi.begin(candidate.ssid.c_str(), key.c_str()); + if (candidate.allowQuickConnect()) { + WiFi.begin(candidate.ssid.c_str(), key.c_str(), candidate.channel, candidate.bssid.mac); + } else { + WiFi.begin(candidate.ssid.c_str(), key.c_str()); + } } // Always wait for a second diff --git a/src/src/ESPEasyCore/ESPEasyWifi_abstracted_ESP32.cpp b/src/src/ESPEasyCore/ESPEasyWifi_abstracted_ESP32.cpp index c3d91e9c9..a7cb9bda5 100644 --- a/src/src/ESPEasyCore/ESPEasyWifi_abstracted_ESP32.cpp +++ b/src/src/ESPEasyCore/ESPEasyWifi_abstracted_ESP32.cpp @@ -45,7 +45,7 @@ bool WiFi_pre_STA_setup() return true; } -STA_connected_state getSTA_connected_state() +STA_connected_state getSTA_connected_state() { switch (WiFi.status()) { @@ -117,11 +117,8 @@ bool setWifiMode(WiFiMode_t new_mode) if (cur_mode == WIFI_OFF) { - # if defined(ESP32) - // Needs to be set while WiFi is off WiFi.hostname(NetworkCreateRFCCompliantHostname()); - # endif // if defined(ESP32) WiFiEventData.markWiFiTurnOn(); } @@ -166,20 +163,13 @@ bool setWifiMode(WiFiMode_t new_mode) // FIXME TD-er: Is this correct to mark Turn ON ???? WiFiEventData.markWiFiTurnOn(); - # if defined(ESP32) // Needs to be set while WiFi is off WiFi.hostname(NetworkCreateRFCCompliantHostname()); - # endif // if defined(ESP32) delay(100); - # if defined(ESP32) esp_wifi_set_ps(WIFI_PS_NONE); // esp_wifi_set_ps(WIFI_PS_MAX_MODEM); - # endif // if defined(ESP32) - # ifdef ESP8266 - WiFi.forceSleepBegin(); - # endif // ifdef ESP8266 delay(1); } else { if (cur_mode == WIFI_OFF) { @@ -380,17 +370,10 @@ void setWiFiNoneSleep() { WiFi.setSleep(WIFI_PS_NONE); } void setWiFiEcoPowerMode() { - // Allow light sleep during idle times -# ifdef ESP8266 - WiFi.setSleepMode(WIFI_LIGHT_SLEEP); -# endif // ifdef ESP8266 -# ifdef ESP32 - // Maximum modem power saving. // In this mode, interval to receive beacons is determined by the listen_interval parameter in wifi_sta_config_t // FIXME TD-er: Must test if this is desired behavior in ESP32. WiFi.setSleep(WIFI_PS_MAX_MODEM); -# endif // ifdef ESP32 } void setWiFiDefaultPowerMode() diff --git a/src/src/Helpers/StringProvider.cpp b/src/src/Helpers/StringProvider.cpp index ec1ad917a..9da859818 100644 --- a/src/src/Helpers/StringProvider.cpp +++ b/src/src/Helpers/StringProvider.cpp @@ -488,6 +488,7 @@ String getValue(LabelType::Enum label) { case LabelType::DNS_1: return formatIP(NetworkDnsIP(0)); case LabelType::DNS_2: return formatIP(NetworkDnsIP(1)); case LabelType::ALLOWED_IP_RANGE: return describeAllowedIPrange(); +#if FEATURE_WIFI case LabelType::STA_MAC: return WifiSTAmacAddress().toString(); case LabelType::AP_MAC: return WifiSoftAPmacAddress().toString(); case LabelType::SSID: return WiFi.SSID(); @@ -495,6 +496,7 @@ String getValue(LabelType::Enum label) { case LabelType::CHANNEL: retval = WiFi.channel(); break; case LabelType::ENCRYPTION_TYPE_STA: return // WiFi_AP_Candidates.getCurrent().encryption_type(); WiFi_encryptionType(WiFiEventData.auth_mode); +#endif case LabelType::CONNECTED: #if FEATURE_ETHERNET if(active_network_medium == NetworkMedium_t::Ethernet) { From 7fed5ff3627228c444fffc215bd6d66ef43112d0 Mon Sep 17 00:00:00 2001 From: TD-er Date: Sat, 9 Nov 2024 16:34:49 +0100 Subject: [PATCH 007/564] [WiFi] Allow connecting to hidden SSID network --- .../ESPEasyCore/ESPEasyWiFiEvent_ESP32.cpp | 14 +------ .../ESPEasyCore/ESPEasyWiFi_state_machine.cpp | 34 +++++++++------- .../ESPEasyWiFi_state_machine_ESP32.cpp | 22 ++++++++++ .../ESPEasyWiFi_state_machine_ESP8266.cpp | 14 +++++++ src/src/ESPEasyCore/ESPEasyWifi.cpp | 8 +--- .../ESPEasyCore/ESPEasyWifi_abstracted.cpp | 2 + src/src/ESPEasyCore/ESPEasyWifi_abstracted.h | 3 -- .../ESPEasyWifi_abstracted_ESP32.cpp | 40 +------------------ .../ESPEasyWifi_abstracted_ESP8266.cpp | 27 ------------- src/src/Helpers/WiFi_AP_CandidatesList.h | 2 +- 10 files changed, 63 insertions(+), 103 deletions(-) diff --git a/src/src/ESPEasyCore/ESPEasyWiFiEvent_ESP32.cpp b/src/src/ESPEasyCore/ESPEasyWiFiEvent_ESP32.cpp index 06d70ae52..d1156a195 100644 --- a/src/src/ESPEasyCore/ESPEasyWiFiEvent_ESP32.cpp +++ b/src/src/ESPEasyCore/ESPEasyWiFiEvent_ESP32.cpp @@ -117,19 +117,7 @@ void WiFiEvent(WiFiEvent_t event, arduino_event_info_t info) { break; } case ARDUINO_EVENT_WIFI_STA_DISCONNECTED: - - if (!ignoreDisconnectEvent) { - ignoreDisconnectEvent = true; - WiFiEventData.markDisconnect(static_cast(info.wifi_sta_disconnected.reason)); - - if (info.wifi_sta_disconnected.reason == WIFI_REASON_AUTH_EXPIRE) { - // See: https://github.com/espressif/arduino-esp32/issues/8877#issuecomment-1807677897 - // FIXME TD-er: Should no longer be needed. - WiFi.STA._setStatus(WL_CONNECTION_LOST); - } - WiFi.persistent(false); - WiFi.disconnect(true); - } + WiFiEventData.markDisconnect(static_cast(info.wifi_sta_disconnected.reason)); break; case ARDUINO_EVENT_WIFI_STA_GOT_IP: ignoreDisconnectEvent = false; diff --git a/src/src/ESPEasyCore/ESPEasyWiFi_state_machine.cpp b/src/src/ESPEasyCore/ESPEasyWiFi_state_machine.cpp index 225c6f687..8060c61ea 100644 --- a/src/src/ESPEasyCore/ESPEasyWiFi_state_machine.cpp +++ b/src/src/ESPEasyCore/ESPEasyWiFi_state_machine.cpp @@ -16,12 +16,13 @@ # include "../Globals/WiFi_AP_Candidates.h" # include "../Helpers/StringConverter.h" +#include "../Helpers/StringGenerator_WiFi.h" namespace ESPEasy { namespace net { namespace wifi { - # define WIFI_STATE_MACHINE_STA_CONNECTING_TIMEOUT 6000 + # define WIFI_STATE_MACHINE_STA_CONNECTING_TIMEOUT 10000 # define WIFI_STATE_MACHINE_STA_AP_SCANNING_TIMEOUT 10000 # define WIFI_STATE_MACHINE_STA_SCANNING_TIMEOUT 10000 @@ -142,17 +143,6 @@ bool ESPEasyWiFi_t::connected() const return getSTA_connected_state() == STA_connected_state::Connected; } -IPAddress ESPEasyWiFi_t::getIP() const -{ - if (WiFi.STA.hasIP()) { - return WiFi.STA.localIP(); - } - - if (WiFi.AP.hasIP()) { - return WiFi.AP.localIP(); - } - return IPAddress(); -} void ESPEasyWiFi_t::disconnect() { WiFi.disconnect(Settings.WiFiRestart_connection_lost()); } @@ -243,6 +233,13 @@ bool ESPEasyWiFi_t::connectSTA() } return false; } + if (WiFiEventData.lastDisconnectReason != WIFI_DISCONNECT_REASON_UNSPECIFIED) { + addLog(LOG_LEVEL_INFO, concat( + F("WiFi : Disconnect reason: "), + getLastDisconnectReason())); + WiFiEventData.processedDisconnect = true; + } + WiFiEventData.warnedNoValidWiFiSettings = false; setSTA(true); # if defined(ESP8266) @@ -307,9 +304,12 @@ bool ESPEasyWiFi_t::connectSTA() # endif // ifdef ESP32 if (candidate.bits.isHidden /*&& Settings.HiddenSSID_SlowConnectPerBSSID()*/) { - WiFi.disconnect(); +// WiFi.disconnect(false, true); +# ifdef ESP32 + WiFi.setScanMethod(WIFI_ALL_CHANNEL_SCAN); +#endif delay(100); - WiFi.begin("" /*candidate.ssid.c_str()*/, key.c_str(), candidate.channel, candidate.bssid.mac); + WiFi.begin(candidate.ssid.c_str(), key.c_str(), candidate.channel, candidate.bssid.mac); // If the ssid returned from the scan is empty, it is a hidden SSID // it appears that the WiFi.begin() function is asynchronous and takes // additional time to connect to a hidden SSID. Therefore a delay of 1000ms @@ -318,8 +318,14 @@ bool ESPEasyWiFi_t::connectSTA() // WiFi.waitForConnectResult(6000); } else { if (candidate.allowQuickConnect()) { +# ifdef ESP32 + WiFi.setScanMethod(WIFI_FAST_SCAN); +#endif WiFi.begin(candidate.ssid.c_str(), key.c_str(), candidate.channel, candidate.bssid.mac); } else { +# ifdef ESP32 + WiFi.setScanMethod(WIFI_ALL_CHANNEL_SCAN); +#endif WiFi.begin(candidate.ssid.c_str(), key.c_str()); } } diff --git a/src/src/ESPEasyCore/ESPEasyWiFi_state_machine_ESP32.cpp b/src/src/ESPEasyCore/ESPEasyWiFi_state_machine_ESP32.cpp index bdeeb3ea7..1e2066d3a 100644 --- a/src/src/ESPEasyCore/ESPEasyWiFi_state_machine_ESP32.cpp +++ b/src/src/ESPEasyCore/ESPEasyWiFi_state_machine_ESP32.cpp @@ -9,6 +9,7 @@ # include # include +# include # include # include "../ESPEasyCore/ESPEasyWifi_abstracted.h" @@ -18,8 +19,29 @@ namespace ESPEasy { namespace net { namespace wifi { + +IPAddress ESPEasyWiFi_t::getIP() const +{ + if (WiFi.STA.hasIP()) { + return WiFi.STA.localIP(); + } + + if (WiFi.AP.hasIP()) { + return WiFi.AP.localIP(); + } + return IPAddress(); +} + STA_connected_state ESPEasyWiFi_t::getSTA_connected_state() const { + if (WiFi.STA.connected()) { + if (WiFi.STA.hasIP()) { + return STA_connected_state::Connected; + } + return STA_connected_state::Connecting; + } + + switch (WiFi.status()) { case WL_CONNECTED: diff --git a/src/src/ESPEasyCore/ESPEasyWiFi_state_machine_ESP8266.cpp b/src/src/ESPEasyCore/ESPEasyWiFi_state_machine_ESP8266.cpp index aad6d5367..ff8de9bb8 100644 --- a/src/src/ESPEasyCore/ESPEasyWiFi_state_machine_ESP8266.cpp +++ b/src/src/ESPEasyCore/ESPEasyWiFi_state_machine_ESP8266.cpp @@ -10,6 +10,20 @@ namespace net { namespace wifi { +IPAddress ESPEasyWiFi_t::getIP() const +{ + IPAddress ip = WiFi.localIP(); + if (ip.isSet()) { + return ip; + } + ip = WiFi.softAPIP(); + if (ip.isSet()) { + return ip; + } + return IPAddress(); +} + + STA_connected_state ESPEasyWiFi_t::getSTA_connected_state() const { // Perform check on SDK function, see: https://github.com/esp8266/Arduino/issues/7432 diff --git a/src/src/ESPEasyCore/ESPEasyWifi.cpp b/src/src/ESPEasyCore/ESPEasyWifi.cpp index 994720c03..19feae0f7 100644 --- a/src/src/ESPEasyCore/ESPEasyWifi.cpp +++ b/src/src/ESPEasyCore/ESPEasyWifi.cpp @@ -310,13 +310,7 @@ void WifiScan(bool async, uint8_t channel) { async = false; if (Settings.IncludeHiddenSSID()) { - wifi_country_t config = { - .cc = "01", - .schan = 1, - .nchan = 14, - .policy = WIFI_COUNTRY_POLICY_MANUAL, - }; - esp_wifi_set_country(&config); + ESPEasy::net::wifi::setWiFiCountryPolicyManual(); } diff --git a/src/src/ESPEasyCore/ESPEasyWifi_abstracted.cpp b/src/src/ESPEasyCore/ESPEasyWifi_abstracted.cpp index 2cd0fe1f2..155e4f63e 100644 --- a/src/src/ESPEasyCore/ESPEasyWifi_abstracted.cpp +++ b/src/src/ESPEasyCore/ESPEasyWifi_abstracted.cpp @@ -26,6 +26,8 @@ const __FlashStringHelper* getWifiModeString(WiFiMode_t wifimode) return F("Unknown"); } +bool WiFiConnected() { return ESPEasyWiFi.connected(); } + bool setSTA(bool enable) { return setSTA_AP(enable, WifiIsAP(WiFi.getMode())); } bool setAP(bool enable) { return setSTA_AP(WifiIsSTA(WiFi.getMode()), enable); } diff --git a/src/src/ESPEasyCore/ESPEasyWifi_abstracted.h b/src/src/ESPEasyCore/ESPEasyWifi_abstracted.h index 4eab7584a..3fd86c22b 100644 --- a/src/src/ESPEasyCore/ESPEasyWifi_abstracted.h +++ b/src/src/ESPEasyCore/ESPEasyWifi_abstracted.h @@ -31,9 +31,6 @@ bool WiFi_pre_setup(); // Call before setting WiFi into STA mode bool WiFi_pre_STA_setup(); -STA_connected_state getSTA_connected_state(); - - bool WiFiConnected(); void WiFiDisconnect(); diff --git a/src/src/ESPEasyCore/ESPEasyWifi_abstracted_ESP32.cpp b/src/src/ESPEasyCore/ESPEasyWifi_abstracted_ESP32.cpp index a7cb9bda5..2f5f28a23 100644 --- a/src/src/ESPEasyCore/ESPEasyWifi_abstracted_ESP32.cpp +++ b/src/src/ESPEasyCore/ESPEasyWifi_abstracted_ESP32.cpp @@ -45,42 +45,6 @@ bool WiFi_pre_STA_setup() return true; } -STA_connected_state getSTA_connected_state() -{ - switch (WiFi.status()) - { - case WL_CONNECTED: - return STA_connected_state::Connected; - - case WL_NO_SSID_AVAIL: - return STA_connected_state::Error_Not_Found; - - case WL_CONNECT_FAILED: - case WL_CONNECTION_LOST: - return STA_connected_state::Error_Connect_Failed; - - case WL_NO_SHIELD: - case WL_STOPPED: - case WL_IDLE_STATUS: - case WL_SCAN_COMPLETED: - case WL_DISCONNECTED: - // ToDo TD-er: What to do here? Should we add some disconnected state? - break; - - } - - // TODO: Keep track of whether connection is in progress - // The status() function does not return a reply stating "connecting" - - /* if (_sta_connecting) { - return STA_connected_state::Connecting; - } - */ - return STA_connected_state::Idle; -} - -bool WiFiConnected() { return WiFi.isConnected(); } - void WiFiDisconnect() { removeWiFiEventHandler(); WiFi.disconnect(); @@ -385,7 +349,7 @@ void setWiFiDefaultPowerMode() void setWiFiCountryPolicyManual() { - wifi_country_t config = { +/* wifi_country_t config = { .cc = "01", .schan = 1, .nchan = 14, @@ -393,7 +357,7 @@ void setWiFiCountryPolicyManual() }; esp_wifi_set_country(&config); -} + */} } // namespace wifi } // namespace net diff --git a/src/src/ESPEasyCore/ESPEasyWifi_abstracted_ESP8266.cpp b/src/src/ESPEasyCore/ESPEasyWifi_abstracted_ESP8266.cpp index 7388948fd..ceb659e7b 100644 --- a/src/src/ESPEasyCore/ESPEasyWifi_abstracted_ESP8266.cpp +++ b/src/src/ESPEasyCore/ESPEasyWifi_abstracted_ESP8266.cpp @@ -37,33 +37,6 @@ bool WiFi_pre_STA_setup() { return true; } -STA_connected_state getSTA_connected_state() -{ - // Perform check on SDK function, see: https://github.com/esp8266/Arduino/issues/7432 - station_status_t status = wifi_station_get_connect_status(); - - switch (status) - { - case STATION_GOT_IP: - return STA_connected_state::Connected; - case STATION_NO_AP_FOUND: - return STA_connected_state::Error_Not_Found; - case STATION_CONNECT_FAIL: - case STATION_WRONG_PASSWORD: - return STA_connected_state::Error_Connect_Failed; - case STATION_CONNECTING: - return STA_connected_state::Connecting; - case STATION_IDLE: - break; - - default: - break; - } - return STA_connected_state::Idle; -} - -bool WiFiConnected() { return getSTA_connected_state() == STA_connected_state::Connected; } - void WiFiDisconnect() { // Only call disconnect when STA is active if ( WifiIsSTA(WiFi.getMode())) { diff --git a/src/src/Helpers/WiFi_AP_CandidatesList.h b/src/src/Helpers/WiFi_AP_CandidatesList.h index 0ad3ba906..9e6f29f1c 100644 --- a/src/src/Helpers/WiFi_AP_CandidatesList.h +++ b/src/src/Helpers/WiFi_AP_CandidatesList.h @@ -7,7 +7,7 @@ #include -#define WiFi_CONNECT_ATTEMPTS 2 +#define WiFi_CONNECT_ATTEMPTS 1 typedef std::list::const_iterator WiFi_AP_Candidate_const_iterator; From 2e6fa428c706b3d77644f473eae46118bb5bffe8 Mon Sep 17 00:00:00 2001 From: TD-er Date: Sat, 9 Nov 2024 16:58:23 +0100 Subject: [PATCH 008/564] [WiFi] Fix build issue due to enum naming conflict --- src/src/DataTypes/WiFi_State.cpp | 2 +- src/src/DataTypes/WiFi_State.h | 2 +- src/src/ESPEasyCore/ESPEasyWiFi_state_machine.cpp | 12 ++++++------ 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/src/src/DataTypes/WiFi_State.cpp b/src/src/DataTypes/WiFi_State.cpp index 5aa6382d5..b583582ec 100644 --- a/src/src/DataTypes/WiFi_State.cpp +++ b/src/src/DataTypes/WiFi_State.cpp @@ -12,7 +12,7 @@ const __FlashStringHelper* toString(WiFiState_e state) switch (state) { case ESPEasy::net::wifi::WiFiState_e::Disabled: return F("Disabled"); - case ESPEasy::net::wifi::WiFiState_e::OFF: return F("OFF"); + case ESPEasy::net::wifi::WiFiState_e::WiFiOFF: return F("OFF"); case ESPEasy::net::wifi::WiFiState_e::AP_only: return F("AP_only"); case ESPEasy::net::wifi::WiFiState_e::IdleWaiting: return F("IdleWaiting"); case ESPEasy::net::wifi::WiFiState_e::STA_Scanning: return F("STA_Scanning"); diff --git a/src/src/DataTypes/WiFi_State.h b/src/src/DataTypes/WiFi_State.h index f20ce86e3..794ecdc17 100644 --- a/src/src/DataTypes/WiFi_State.h +++ b/src/src/DataTypes/WiFi_State.h @@ -58,7 +58,7 @@ enum class WiFiState_e Disabled, // WiFi radio off, to continue, everything needs to be (re)initialized - OFF, + WiFiOFF, // Only running in AP mode AP_only, diff --git a/src/src/ESPEasyCore/ESPEasyWiFi_state_machine.cpp b/src/src/ESPEasyCore/ESPEasyWiFi_state_machine.cpp index 8060c61ea..d3e9e97a3 100644 --- a/src/src/ESPEasyCore/ESPEasyWiFi_state_machine.cpp +++ b/src/src/ESPEasyCore/ESPEasyWiFi_state_machine.cpp @@ -59,7 +59,7 @@ void ESPEasyWiFi_t::loop() { // TODO TD-er: Must check what error was given??? _callbackError = false; - setState(WiFiState_e::OFF); + setState(WiFiState_e::WiFiOFF); } } @@ -68,7 +68,7 @@ void ESPEasyWiFi_t::loop() case WiFiState_e::Disabled: // Do nothing here, as the device is disabled. break; - case WiFiState_e::OFF: + case WiFiState_e::WiFiOFF: begin(); // setState(WiFiState_e::IdleWaiting, 100); @@ -94,7 +94,7 @@ void ESPEasyWiFi_t::loop() case WiFiState_e::STA_AP_Scanning: if (_state_timeout.timeReached() || (WiFi.scanComplete() >= 0)) { - setState(WiFiState_e::OFF, 100); + setState(WiFiState_e::WiFiOFF, 100); } // Check if scanning is finished @@ -113,7 +113,7 @@ void ESPEasyWiFi_t::loop() if (_state == WiFiState_e::STA_Connecting) { setState(WiFiState_e::STA_Reconnecting, WIFI_STATE_MACHINE_STA_CONNECTING_TIMEOUT); } else { - setState(WiFiState_e::OFF); + setState(WiFiState_e::WiFiOFF); } } @@ -123,7 +123,7 @@ void ESPEasyWiFi_t::loop() // Check if still connected if (getSTA_connected_state() != STA_connected_state::Connected) { - setState(WiFiState_e::OFF); + setState(WiFiState_e::WiFiOFF); } else { // Else mark last timestamp seen as connected _last_seen_connected.setNow(); @@ -172,7 +172,7 @@ void ESPEasyWiFi_t::setState(WiFiState_e newState, uint32_t timeout) { case WiFiState_e::Disabled: // Do nothing here, as the device is disabled. break; - case WiFiState_e::OFF: + case WiFiState_e::WiFiOFF: // TODO TD-er: Must cancel all and turn off WiFi. break; case WiFiState_e::AP_only: From 0eacd3d63e7aaf76f27a5cbf93544dd7de5535dc Mon Sep 17 00:00:00 2001 From: TD-er Date: Sat, 9 Nov 2024 22:14:57 +0100 Subject: [PATCH 009/564] [IPv6] Disable IPv6 for ESP32-C2 --- src/src/CustomBuild/define_plugin_sets.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/src/CustomBuild/define_plugin_sets.h b/src/src/CustomBuild/define_plugin_sets.h index f2d2506c7..f762035ea 100644 --- a/src/src/CustomBuild/define_plugin_sets.h +++ b/src/src/CustomBuild/define_plugin_sets.h @@ -3507,7 +3507,7 @@ To create/register a plugin, you have to : #endif #ifndef FEATURE_USE_IPV6 -# if ESP_IDF_VERSION_MAJOR>=5 && defined(LWIP_IPV6) +# if ESP_IDF_VERSION_MAJOR>=5 && defined(LWIP_IPV6) && !defined(ESP32C2) # define FEATURE_USE_IPV6 1 # else # define FEATURE_USE_IPV6 0 From 40df9b2b3a34323b874a20b13857ecd6e3019744 Mon Sep 17 00:00:00 2001 From: TD-er Date: Sun, 10 Nov 2024 14:42:00 +0100 Subject: [PATCH 010/564] [PSRAM] Free GPIO-16 and -17 on ESP32-classic when no PSRAM present --- src/src/ESPEasyCore/ESPEasy_setup.cpp | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/src/src/ESPEasyCore/ESPEasy_setup.cpp b/src/src/ESPEasyCore/ESPEasy_setup.cpp index cf3cca101..6f705edfe 100644 --- a/src/src/ESPEasyCore/ESPEasy_setup.cpp +++ b/src/src/ESPEasyCore/ESPEasy_setup.cpp @@ -64,6 +64,8 @@ # include "hal/efuse_hal.h" #else #include +// IDF5.3 fix esp_gpio_reserve used in init PSRAM. +#include "esp_private/esp_gpio_reserve.h" #endif #endif @@ -151,6 +153,10 @@ void ESPEasy_setup() #endif uint32_t pkg_version = chip_ver & 0x7; if (pkg_version <= 3) { // D0WD, S0WD, D2WD + #if ESP_IDF_VERSION_MAJOR >= 5 + // Thanks Theo Arends from Tasmota + esp_gpio_revoke(BIT64(GPIO_NUM_16 | GPIO_NUM_17)); + #endif gpio_reset_pin(GPIO_NUM_16); gpio_reset_pin(GPIO_NUM_17); } From a1fa226502bc6a777e9b48bbb7886248fc0dd7c6 Mon Sep 17 00:00:00 2001 From: TD-er Date: Sun, 10 Nov 2024 15:35:59 +0100 Subject: [PATCH 011/564] [PSRAM] Fix build on ESP-IDF 5.1 + add special case of ESP32-picoD4 --- src/src/ESPEasyCore/ESPEasy_setup.cpp | 43 +++++++++++++++++++----- src/src/Helpers/Hardware_device_info.cpp | 3 +- 2 files changed, 36 insertions(+), 10 deletions(-) diff --git a/src/src/ESPEasyCore/ESPEasy_setup.cpp b/src/src/ESPEasyCore/ESPEasy_setup.cpp index 6f705edfe..1eeb9c137 100644 --- a/src/src/ESPEasyCore/ESPEasy_setup.cpp +++ b/src/src/ESPEasyCore/ESPEasy_setup.cpp @@ -63,9 +63,13 @@ # include "hal/efuse_ll.h" # include "hal/efuse_hal.h" #else -#include +# include +# include + +# if ESP_IDF_VERSION > ESP_IDF_VERSION_VAL(5, 2, 0) // IDF5.3 fix esp_gpio_reserve used in init PSRAM. -#include "esp_private/esp_gpio_reserve.h" +# include "esp_private/esp_gpio_reserve.h" +# endif #endif #endif @@ -148,17 +152,38 @@ void ESPEasy_setup() // test if the CPU is not pico #if ESP_IDF_VERSION_MAJOR < 5 uint32_t chip_ver = REG_GET_FIELD(EFUSE_BLK0_RDATA3_REG, EFUSE_RD_CHIP_VER_PKG); + uint32_t pkg_version = chip_ver & 0x7; #else + uint32_t pkg_version = bootloader_common_get_chip_ver_pkg(); uint32_t chip_ver = REG_GET_FIELD(EFUSE_BLK0_RDATA3_REG, EFUSE_RD_CHIP_PACKAGE); #endif - uint32_t pkg_version = chip_ver & 0x7; - if (pkg_version <= 3) { // D0WD, S0WD, D2WD - #if ESP_IDF_VERSION_MAJOR >= 5 + if (pkg_version <= 7) { // D0WD, S0WD, D2WD + gpio_num_t PSRAM_CLK = GPIO_NUM_17; + gpio_num_t PSRAM_CS = GPIO_NUM_16; + switch (pkg_version) { + case EFUSE_RD_CHIP_VER_PKG_ESP32D2WDQ5: + PSRAM_CLK = static_cast(CONFIG_D2WD_PSRAM_CLK_IO); + PSRAM_CS = static_cast(CONFIG_D2WD_PSRAM_CS_IO); + break; + case EFUSE_RD_CHIP_VER_PKG_ESP32PICOD4: + case EFUSE_RD_CHIP_VER_PKG_ESP32PICOV302: + PSRAM_CLK = static_cast(GPIO_NUM_NC); + PSRAM_CS = static_cast(CONFIG_PICO_PSRAM_CS_IO); + break; + } + +#if ESP_IDF_VERSION > ESP_IDF_VERSION_VAL(5, 2, 0) // Thanks Theo Arends from Tasmota - esp_gpio_revoke(BIT64(GPIO_NUM_16 | GPIO_NUM_17)); - #endif - gpio_reset_pin(GPIO_NUM_16); - gpio_reset_pin(GPIO_NUM_17); + if (PSRAM_CLK != GPIO_NUM_NC) { + esp_gpio_revoke(BIT64(PSRAM_CLK) | BIT64(PSRAM_CS)); + } else { + esp_gpio_revoke(BIT64(PSRAM_CS)); + } +#endif + if (PSRAM_CLK != GPIO_NUM_NC) { + gpio_reset_pin(PSRAM_CLK); + } + gpio_reset_pin(PSRAM_CS); } } #endif // if CONFIG_IDF_TARGET_ESP32 diff --git a/src/src/Helpers/Hardware_device_info.cpp b/src/src/Helpers/Hardware_device_info.cpp index 2c21db896..4de0c6b14 100644 --- a/src/src/Helpers/Hardware_device_info.cpp +++ b/src/src/Helpers/Hardware_device_info.cpp @@ -503,10 +503,11 @@ const __FlashStringHelper* getChipModel() { */ # if ESP_IDF_VERSION_MAJOR < 5 uint32_t chip_ver = REG_GET_FIELD(EFUSE_BLK0_RDATA3_REG, EFUSE_RD_CHIP_VER_PKG); + pkg_version = chip_ver & 0x7; # else // if ESP_IDF_VERSION_MAJOR < 5 uint32_t chip_ver = REG_GET_FIELD(EFUSE_BLK0_RDATA3_REG, EFUSE_RD_CHIP_PACKAGE); # endif // if ESP_IDF_VERSION_MAJOR < 5 - pkg_version = chip_ver & 0x7; + // AddLog(LOG_LEVEL_DEBUG_MORE, PSTR("HDW: ESP32 Model %d, Revision %d, Core %d, Package %d"), chip_info.model, chip_revision, // chip_info.cores, chip_ver); From aaa6be7dbd72b095abecfb27acd20139831f2917 Mon Sep 17 00:00:00 2001 From: TD-er Date: Sun, 10 Nov 2024 15:45:04 +0100 Subject: [PATCH 012/564] [PSRAM] Cleanup code --- src/src/ESPEasyCore/ESPEasy_setup.cpp | 26 +++++++++++++------------- 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/src/src/ESPEasyCore/ESPEasy_setup.cpp b/src/src/ESPEasyCore/ESPEasy_setup.cpp index 1eeb9c137..bc6264d52 100644 --- a/src/src/ESPEasyCore/ESPEasy_setup.cpp +++ b/src/src/ESPEasyCore/ESPEasy_setup.cpp @@ -158,19 +158,19 @@ void ESPEasy_setup() uint32_t chip_ver = REG_GET_FIELD(EFUSE_BLK0_RDATA3_REG, EFUSE_RD_CHIP_PACKAGE); #endif if (pkg_version <= 7) { // D0WD, S0WD, D2WD - gpio_num_t PSRAM_CLK = GPIO_NUM_17; - gpio_num_t PSRAM_CS = GPIO_NUM_16; - switch (pkg_version) { - case EFUSE_RD_CHIP_VER_PKG_ESP32D2WDQ5: - PSRAM_CLK = static_cast(CONFIG_D2WD_PSRAM_CLK_IO); - PSRAM_CS = static_cast(CONFIG_D2WD_PSRAM_CS_IO); - break; - case EFUSE_RD_CHIP_VER_PKG_ESP32PICOD4: - case EFUSE_RD_CHIP_VER_PKG_ESP32PICOV302: - PSRAM_CLK = static_cast(GPIO_NUM_NC); - PSRAM_CS = static_cast(CONFIG_PICO_PSRAM_CS_IO); - break; - } + gpio_num_t PSRAM_CLK = static_cast(CONFIG_D0WD_PSRAM_CLK_IO); + gpio_num_t PSRAM_CS = static_cast(CONFIG_D0WD_PSRAM_CS_IO); + switch (pkg_version) { + case EFUSE_RD_CHIP_VER_PKG_ESP32D2WDQ5: + PSRAM_CLK = static_cast(CONFIG_D2WD_PSRAM_CLK_IO); + PSRAM_CS = static_cast(CONFIG_D2WD_PSRAM_CS_IO); + break; + case EFUSE_RD_CHIP_VER_PKG_ESP32PICOD4: + case EFUSE_RD_CHIP_VER_PKG_ESP32PICOV302: + PSRAM_CLK = static_cast(GPIO_NUM_NC); + PSRAM_CS = static_cast(CONFIG_PICO_PSRAM_CS_IO); + break; + } #if ESP_IDF_VERSION > ESP_IDF_VERSION_VAL(5, 2, 0) // Thanks Theo Arends from Tasmota From c78edee911e2e2416f134e752a8daf3cbc3d673f Mon Sep 17 00:00:00 2001 From: TD-er Date: Sun, 10 Nov 2024 20:13:19 +0100 Subject: [PATCH 013/564] [PSRAM] Fix solo1 builds --- src/src/ESPEasyCore/ESPEasy_setup.cpp | 215 +++++++++++++++----------- 1 file changed, 121 insertions(+), 94 deletions(-) diff --git a/src/src/ESPEasyCore/ESPEasy_setup.cpp b/src/src/ESPEasyCore/ESPEasy_setup.cpp index bc6264d52..2d4293e6d 100644 --- a/src/src/ESPEasyCore/ESPEasy_setup.cpp +++ b/src/src/ESPEasyCore/ESPEasy_setup.cpp @@ -47,44 +47,46 @@ #ifdef ESP32 -#if ESP_IDF_VERSION_MAJOR < 5 -#include -#include -#include -#include -#else -#include -#include -#include -#endif +# if ESP_IDF_VERSION_MAJOR < 5 +# include +# include +# include +# include +# else // if ESP_IDF_VERSION_MAJOR < 5 +# include +# include +# include +# endif // if ESP_IDF_VERSION_MAJOR < 5 -#if CONFIG_IDF_TARGET_ESP32 -#if ESP_IDF_VERSION_MAJOR < 5 -# include "hal/efuse_ll.h" -# include "hal/efuse_hal.h" -#else -# include -# include +# if CONFIG_IDF_TARGET_ESP32 +# if ESP_IDF_VERSION_MAJOR < 5 +# include "hal/efuse_ll.h" +# include "hal/efuse_hal.h" +# else // if ESP_IDF_VERSION_MAJOR < 5 +# include +# include + +# if ESP_IDF_VERSION > ESP_IDF_VERSION_VAL(5, 2, 0) -# if ESP_IDF_VERSION > ESP_IDF_VERSION_VAL(5, 2, 0) // IDF5.3 fix esp_gpio_reserve used in init PSRAM. -# include "esp_private/esp_gpio_reserve.h" -# endif -#endif -#endif +# include "esp_private/esp_gpio_reserve.h" +# endif // if ESP_IDF_VERSION > ESP_IDF_VERSION_VAL(5, 2, 0) +# endif // if ESP_IDF_VERSION_MAJOR < 5 +# endif // if CONFIG_IDF_TARGET_ESP32 -#endif +#endif // ifdef ESP32 #ifdef USE_RTOS_MULTITASKING + void RTOS_TaskServers(void *parameter) { while (true) { delay(100); web_server.handleClient(); - #if FEATURE_ESPEASY_P2P + # if FEATURE_ESPEASY_P2P checkUDP(); - #endif + # endif } } @@ -113,7 +115,6 @@ void RTOS_HandleSchedule(void *parameter) #endif // ifdef USE_RTOS_MULTITASKING - /*********************************************************************************************\ * ISR call back function for handling the watchdog. \*********************************************************************************************/ @@ -129,8 +130,9 @@ void sw_watchdog_callback(void *arg) void ESPEasy_setup() { #if defined(ESP8266_DISABLE_EXTRA4K) || defined(USE_SECOND_HEAP) -// disable_extra4k_at_link_time(); -#endif + + // disable_extra4k_at_link_time(); +#endif // if defined(ESP8266_DISABLE_EXTRA4K) || defined(USE_SECOND_HEAP) #ifdef PHASE_LOCKED_WAVEFORM enablePhaseLockedWaveform(); #endif @@ -138,29 +140,37 @@ void ESPEasy_setup() HeapSelectDram ephemeral; #endif #ifdef ESP32 -#ifdef DISABLE_ESP32_BROWNOUT - DisableBrownout(); // Workaround possible weak LDO resulting in brownout detection during Wifi connection -#endif // DISABLE_ESP32_BROWNOUT +# ifdef DISABLE_ESP32_BROWNOUT + DisableBrownout(); // Workaround possible weak LDO resulting in brownout detection during Wifi connection +# endif // DISABLE_ESP32_BROWNOUT -#ifdef BOARD_HAS_PSRAM +# ifdef BOARD_HAS_PSRAM psramInit(); -#endif +# endif + +# if CONFIG_IDF_TARGET_ESP32 -#if CONFIG_IDF_TARGET_ESP32 // restore GPIO16/17 if no PSRAM is found if (!FoundPSRAM()) { // test if the CPU is not pico - #if ESP_IDF_VERSION_MAJOR < 5 - uint32_t chip_ver = REG_GET_FIELD(EFUSE_BLK0_RDATA3_REG, EFUSE_RD_CHIP_VER_PKG); + # if ESP_IDF_VERSION_MAJOR < 5 + uint32_t chip_ver = REG_GET_FIELD(EFUSE_BLK0_RDATA3_REG, EFUSE_RD_CHIP_VER_PKG); uint32_t pkg_version = chip_ver & 0x7; - #else + # else // if ESP_IDF_VERSION_MAJOR < 5 uint32_t pkg_version = bootloader_common_get_chip_ver_pkg(); - uint32_t chip_ver = REG_GET_FIELD(EFUSE_BLK0_RDATA3_REG, EFUSE_RD_CHIP_PACKAGE); - #endif - if (pkg_version <= 7) { // D0WD, S0WD, D2WD + uint32_t chip_ver = REG_GET_FIELD(EFUSE_BLK0_RDATA3_REG, EFUSE_RD_CHIP_PACKAGE); + # endif // if ESP_IDF_VERSION_MAJOR < 5 + + if (pkg_version <= 7) { // D0WD, S0WD, D2WD +#ifdef CORE32SOLO1 + gpio_num_t PSRAM_CLK = GPIO_NUM_17; + gpio_num_t PSRAM_CS = GPIO_NUM_16; +#else gpio_num_t PSRAM_CLK = static_cast(CONFIG_D0WD_PSRAM_CLK_IO); gpio_num_t PSRAM_CS = static_cast(CONFIG_D0WD_PSRAM_CS_IO); - switch (pkg_version) { + + switch (pkg_version) + { case EFUSE_RD_CHIP_VER_PKG_ESP32D2WDQ5: PSRAM_CLK = static_cast(CONFIG_D2WD_PSRAM_CLK_IO); PSRAM_CS = static_cast(CONFIG_D2WD_PSRAM_CS_IO); @@ -171,22 +181,24 @@ void ESPEasy_setup() PSRAM_CS = static_cast(CONFIG_PICO_PSRAM_CS_IO); break; } +#endif +# if ESP_IDF_VERSION > ESP_IDF_VERSION_VAL(5, 2, 0) -#if ESP_IDF_VERSION > ESP_IDF_VERSION_VAL(5, 2, 0) // Thanks Theo Arends from Tasmota if (PSRAM_CLK != GPIO_NUM_NC) { esp_gpio_revoke(BIT64(PSRAM_CLK) | BIT64(PSRAM_CS)); } else { esp_gpio_revoke(BIT64(PSRAM_CS)); } -#endif +# endif // if ESP_IDF_VERSION > ESP_IDF_VERSION_VAL(5, 2, 0) + if (PSRAM_CLK != GPIO_NUM_NC) { gpio_reset_pin(PSRAM_CLK); } gpio_reset_pin(PSRAM_CS); } } -#endif // if CONFIG_IDF_TARGET_ESP32 +# endif // if CONFIG_IDF_TARGET_ESP32 initADC(); #endif // ESP32 #ifndef BUILD_NO_RAM_TRACKER @@ -194,21 +206,22 @@ void ESPEasy_setup() lowestRAM = FreeMem(); #endif // ifndef BUILD_NO_RAM_TRACKER -/* -#ifdef ESP32 -{ - ESPEasy_NVS_Helper preferences; - ResetFactoryDefaultPreference.init(preferences); -} -#endif -*/ + /* + #ifdef ESP32 + { + ESPEasy_NVS_Helper preferences; + ResetFactoryDefaultPreference.init(preferences); + } + #endif + */ #ifndef BUILD_NO_DEBUG -// checkAll_internalCommands(); -#endif + + // checkAll_internalCommands(); +#endif // ifndef BUILD_NO_DEBUG PluginSetup(); CPluginSetup(); - + initWiFi(); WiFiEventData.clearAll(); @@ -246,6 +259,7 @@ void ESPEasy_setup() logMemUsageAfter(F("initLog()")); #endif #ifdef BOARD_HAS_PSRAM + if (FoundPSRAM()) { if (UsePSRAM()) { addLog(LOG_LEVEL_INFO, F("Using PSRAM")); @@ -253,7 +267,7 @@ void ESPEasy_setup() addLog(LOG_LEVEL_ERROR, F("PSRAM found, unable to use")); } } - #endif + #endif // ifdef BOARD_HAS_PSRAM if (SpiffsSectors() < 32) { @@ -285,7 +299,7 @@ void ESPEasy_setup() readBootCause(); { - String log = F("INIT : "); + String log = F("INIT : "); log += getLastBootCauseString(); if (readFromRTC()) @@ -346,20 +360,21 @@ void ESPEasy_setup() #endif #ifdef ESP32 + // Configure dynamic frequency scaling: // maximum and minimum frequencies are set in sdkconfig, // automatic light sleep is enabled if tickless idle support is enabled. ESP_PM_CONFIG_T pm_config = { - .max_freq_mhz = getCPU_MaxFreqMHz(), - .min_freq_mhz = Settings.EcoPowerMode() ? getCPU_MinFreqMHz() : getCPU_MaxFreqMHz(), -#if CONFIG_FREERTOS_USE_TICKLESS_IDLE - .light_sleep_enable = Settings.EcoPowerMode() -#else - .light_sleep_enable = false -#endif + .max_freq_mhz = getCPU_MaxFreqMHz(), + .min_freq_mhz = Settings.EcoPowerMode() ? getCPU_MinFreqMHz() : getCPU_MaxFreqMHz(), +# if CONFIG_FREERTOS_USE_TICKLESS_IDLE + .light_sleep_enable = Settings.EcoPowerMode() +# else + .light_sleep_enable = false +# endif // if CONFIG_FREERTOS_USE_TICKLESS_IDLE }; esp_pm_configure(&pm_config); -#endif +#endif // ifdef ESP32 #ifndef BUILD_NO_RAM_TRACKER @@ -382,10 +397,11 @@ void ESPEasy_setup() toDisable = disableController(toDisable); } #if FEATURE_NOTIFIER + if (toDisable != 0) { toDisable = disableNotification(toDisable); } - #endif + #endif // if FEATURE_NOTIFIER if (toDisable != 0) { toDisable = disableRules(toDisable); @@ -399,10 +415,11 @@ void ESPEasy_setup() toDisable = disableAllControllers(toDisable); } #if FEATURE_NOTIFIER + if (toDisable != 0) { toDisable = disableAllNotifications(toDisable); } -#endif +#endif // if FEATURE_NOTIFIER } #if FEATURE_ETHERNET @@ -410,7 +427,8 @@ void ESPEasy_setup() // This only works after LoadSettings(); // Do not call setNetworkMedium here as that may try to clean up settings. active_network_medium = Settings.NetworkMedium; - #else + #else // if FEATURE_ETHERNET + if (Settings.NetworkMedium == NetworkMedium_t::Ethernet) { Settings.NetworkMedium = NetworkMedium_t::WIFI; } @@ -419,13 +437,15 @@ void ESPEasy_setup() setNetworkMedium(Settings.NetworkMedium); bool initWiFi = active_network_medium == NetworkMedium_t::WIFI; + // FIXME TD-er: Must add another check for 'delayed start WiFi' for poorly designed ESP8266 nodes. if (initWiFi) { WiFi_AP_Candidates.clearCache(); WiFi_AP_Candidates.load_knownCredentials(); - ESPEasy::net::wifi::setSTA(true); + ESPEasy::net::wifi::setSTA(true); + if (!WiFi_AP_Candidates.hasCandidates()) { WiFiEventData.wifiSetup = true; RTC.clearLastWiFi(); // Must scan all channels @@ -444,11 +464,13 @@ void ESPEasy_setup() WiFi_AP_Candidates.clearCache(); processScanDone(); WiFi_AP_Candidates.load_knownCredentials(); + if (!WiFi_AP_Candidates.hasCandidates()) { addLog(LOG_LEVEL_INFO, F("Setup: Scan all channels")); WifiScan(false); } -// ESPEasy::net::wifi::setWifiMode(WIFI_OFF); + + // ESPEasy::net::wifi::setWifiMode(WIFI_OFF); } #ifndef BUILD_NO_RAM_TRACKER logMemUsageAfter(F("WifiScan()")); @@ -485,11 +507,12 @@ void ESPEasy_setup() addLogMove(LOG_LEVEL_INFO, concat(F("INIT : Free RAM:"), FreeMem())); } -# ifndef BUILD_NO_DEBUG +#ifndef BUILD_NO_DEBUG + if (Settings.UseSerial && (Settings.SerialLogLevel >= LOG_LEVEL_DEBUG_MORE)) { ESPEasy_Console.setDebugOutput(true); } -#endif +#endif // ifndef BUILD_NO_DEBUG timermqtt_interval = 100; // Interval for checking MQTT timerAwakeFromDeepSleep = millis(); @@ -499,18 +522,19 @@ void ESPEasy_setup() #endif #if FEATURE_NOTIFIER NPluginInit(); - #ifndef BUILD_NO_RAM_TRACKER + # ifndef BUILD_NO_RAM_TRACKER logMemUsageAfter(F("NPluginInit()")); - #endif + # endif #endif // if FEATURE_NOTIFIER PluginInit(); initSerial(); // Plugins may have altered serial, so re-init serial - + #ifndef BUILD_NO_RAM_TRACKER logMemUsageAfter(F("PluginInit()")); #endif + if (loglevelActiveFor(LOG_LEVEL_INFO)) { String log; log.reserve(80); @@ -523,11 +547,11 @@ void ESPEasy_setup() addLogMove(LOG_LEVEL_INFO, log); } -/* - if ((getDeviceCount() + 1) >= PLUGIN_MAX) { - addLog(LOG_LEVEL_ERROR, concat(F("Programming error! - Increase PLUGIN_MAX ("), getDeviceCount()) + ')'); - } -*/ + /* + if ((getDeviceCount() + 1) >= PLUGIN_MAX) { + addLog(LOG_LEVEL_ERROR, concat(F("Programming error! - Increase PLUGIN_MAX ("), getDeviceCount()) + ')'); + } + */ clearAllCaches(); #ifndef BUILD_NO_RAM_TRACKER @@ -547,38 +571,41 @@ void ESPEasy_setup() rulesProcessing(event); // TD-er: Process events in the setup() now. } #ifdef ESP32 + if (Settings.UseRules) { const uint32_t gpio_strap = GPIO_REG_READ(GPIO_STRAP_REG); -// BOOT_MODE_GET(); - // Event values: + // BOOT_MODE_GET(); + + // Event values: // ESP32 : GPIO-5, GPIO-15, GPIO-4, GPIO-2, GPIO-0, GPIO-12 // ESP32-C3: bit 0: GPIO2, bit 2: GPIO8, bit 3: GPIO9 // ESP32-S2: Unclear what bits represent which strapping state. // ESP32-S3: bit5 ~ bit2 correspond to strapping pins GPIO3, GPIO45, GPIO0, and GPIO46 respectively. String event = F("System#BootMode="); - event += bitRead(gpio_strap, 0); + event += bitRead(gpio_strap, 0); event += ','; - event += bitRead(gpio_strap, 1); + event += bitRead(gpio_strap, 1); event += ','; - event += bitRead(gpio_strap, 2); + event += bitRead(gpio_strap, 2); event += ','; - event += bitRead(gpio_strap, 3); + event += bitRead(gpio_strap, 3); event += ','; - event += bitRead(gpio_strap, 4); + event += bitRead(gpio_strap, 4); event += ','; - event += bitRead(gpio_strap, 5); + event += bitRead(gpio_strap, 5); rulesProcessing(event); } - #endif + #endif // ifdef ESP32 #if FEATURE_ETHERNET + if (Settings.ETH_Pin_power_rst != -1) { GPIO_Write(PLUGIN_GPIO, Settings.ETH_Pin_power_rst, 1); } - #endif + #endif // if FEATURE_ETHERNET NetworkConnectRelaxed(); #ifndef BUILD_NO_RAM_TRACKER @@ -597,9 +624,9 @@ void ESPEasy_setup() #if FEATURE_ARDUINO_OTA ArduinoOTAInit(); - #ifndef BUILD_NO_RAM_TRACKER + # ifndef BUILD_NO_RAM_TRACKER logMemUsageAfter(F("ArduinoOTAInit()")); - #endif + # endif #endif // if FEATURE_ARDUINO_OTA if (node_time.systemTimePresent()) { @@ -638,9 +665,9 @@ void ESPEasy_setup() RTOS_HandleSchedule, /* Function to implement the task */ "RTOS_HandleSchedule", /* Name of the task */ 16384, /* Stack size in words */ - nullptr, /* Task input parameter */ + nullptr, /* Task input parameter */ 1, /* Priority of the task */ - nullptr, /* Task handle. */ + nullptr, /* Task handle. */ 1); /* Core where the task should run */ } #endif // ifdef USE_RTOS_MULTITASKING From 9d9821cc631429732cece9963de435c3f2ffee01 Mon Sep 17 00:00:00 2001 From: TD-er Date: Fri, 6 Dec 2024 13:20:44 +0100 Subject: [PATCH 014/564] [WiFi] Add some debug log to track GotIP event --- platformio_core_defs.ini | 3 +- src/src/DataStructs/WiFiEventData.cpp | 30 +++++++++++++++++-- src/src/DataStructs/WiFiEventData.h | 2 ++ .../ESPEasyCore/ESPEasyWiFiEvent_ESP32.cpp | 8 ++++- 4 files changed, 39 insertions(+), 4 deletions(-) diff --git a/platformio_core_defs.ini b/platformio_core_defs.ini index 1327c044d..41bce130b 100644 --- a/platformio_core_defs.ini +++ b/platformio_core_defs.ini @@ -198,7 +198,7 @@ lib_extra_dirs = ; ESP_IDF 5.3.1 [core_esp32_IDF5_3_1__3_0_5_LittleFS] platform = https://github.com/tasmota/platform-espressif32/releases/download/2024.10.31/platform-espressif32.zip -platform_packages = framework-arduinoespressif32 @ https://github.com/Jason2866/esp32-arduino-lib-builder/releases/download/3112/framework-arduinoespressif32-all-release_v5.3-1c74f314.zip +platform_packages = framework-arduinoespressif32 @ https://github.com/Jason2866/esp32-arduino-lib-builder/releases/download/3180/framework-arduinoespressif32-all-release_v5.3-1c74f314.zip build_flags = -DESP32_STAGE -DESP_IDF_VERSION_MAJOR=5 -DLIBRARIES_NO_LOG=1 @@ -218,6 +218,7 @@ build_flags = -DESP32_STAGE -include "ESPEasy_config.h" -include "esp32x_fixes.h" -Wnull-dereference + -DUPDATE_NOCRYPT lib_ignore = lib_extra_dirs = lib/lib_ssl diff --git a/src/src/DataStructs/WiFiEventData.cpp b/src/src/DataStructs/WiFiEventData.cpp index 9adb2c62b..d0429bfcd 100644 --- a/src/src/DataStructs/WiFiEventData.cpp +++ b/src/src/DataStructs/WiFiEventData.cpp @@ -9,6 +9,8 @@ #include "../Helpers/ESPEasy_Storage.h" #include "../Helpers/Networking.h" +#include "../Helpers/StringConverter.h" + #define WIFI_RECONNECT_WAIT 30000 // in milliSeconds @@ -170,6 +172,12 @@ void WiFiEventData_t::setWiFiConnected() { } void WiFiEventData_t::setWiFiServicesInitialized() { + if (!processedConnect) { + setWiFiConnected(); + } + if (!processedGotIP) { + setWiFiGotIP(); + } if (/*!unprocessedWifiEvents() && */ WiFiConnected() && WiFiGotIP()) { #ifndef BUILD_NO_DEBUG addLog(LOG_LEVEL_DEBUG, F("WiFi : WiFi services initialized")); @@ -177,8 +185,13 @@ void WiFiEventData_t::setWiFiServicesInitialized() { bitSet(wifiStatus, ESPEASY_WIFI_SERVICES_INITIALIZED); wifiConnectInProgress = false; wifiConnectAttemptNeeded = false; - dns0_cache = WiFi.dnsIP(0); - dns1_cache = WiFi.dnsIP(1); + if (valid_DNS_address(WiFi.dnsIP(0))) { + dns0_cache = WiFi.dnsIP(0); + } + + if (valid_DNS_address(WiFi.dnsIP(1))) { + dns1_cache = WiFi.dnsIP(1); + } } } @@ -192,6 +205,19 @@ void WiFiEventData_t::markGotIP() { processedGotIP = false; } +void WiFiEventData_t::markGotIP(const IPAddress& ip, const IPAddress& netmask, const IPAddress& gw) +{ + addLog( + LOG_LEVEL_INFO, + strformat( + F("WiFi : GotIP ip: %s, sn: %s, gw: %s"), + ip.toString().c_str(), + netmask.toString().c_str(), + gw.toString().c_str())); + markGotIP(); + +} + #if FEATURE_USE_IPV6 void WiFiEventData_t::markGotIPv6(const IPAddress& ip6) { diff --git a/src/src/DataStructs/WiFiEventData.h b/src/src/DataStructs/WiFiEventData.h index 27e8db8c5..d44c371fc 100644 --- a/src/src/DataStructs/WiFiEventData.h +++ b/src/src/DataStructs/WiFiEventData.h @@ -58,6 +58,8 @@ struct WiFiEventData_t { void markGotIP(); + void markGotIP(const IPAddress& ip, const IPAddress& netmask, const IPAddress& gw); + #if FEATURE_USE_IPV6 void markGotIPv6(const IPAddress& ip6); #endif diff --git a/src/src/ESPEasyCore/ESPEasyWiFiEvent_ESP32.cpp b/src/src/ESPEasyCore/ESPEasyWiFiEvent_ESP32.cpp index d1156a195..25f89e97c 100644 --- a/src/src/ESPEasyCore/ESPEasyWiFiEvent_ESP32.cpp +++ b/src/src/ESPEasyCore/ESPEasyWiFiEvent_ESP32.cpp @@ -120,9 +120,15 @@ void WiFiEvent(WiFiEvent_t event, arduino_event_info_t info) { WiFiEventData.markDisconnect(static_cast(info.wifi_sta_disconnected.reason)); break; case ARDUINO_EVENT_WIFI_STA_GOT_IP: + { ignoreDisconnectEvent = false; - WiFiEventData.markGotIP(); + ip_event_got_ip_t *event = static_cast(&info.got_ip); + const IPAddress ip(event->ip_info.ip.addr); + const IPAddress netmask(event->ip_info.ip.addr); + const IPAddress gw(event->ip_info.ip.addr); + WiFiEventData.markGotIP(ip, netmask, gw); break; + } # if FEATURE_USE_IPV6 case ARDUINO_EVENT_WIFI_STA_GOT_IP6: { From 6ab4ba66deacc2db4641e4d8c7bcd29c46fde5cf Mon Sep 17 00:00:00 2001 From: TD-er Date: Fri, 6 Dec 2024 21:26:59 +0100 Subject: [PATCH 015/564] [WiFi] Fix not showing /setup page --- src/src/DataStructs/WiFiEventData.cpp | 94 ++++++++++--------- .../ESPEasyCore/ESPEasyWiFiEvent_ESP32.cpp | 19 +++- src/src/ESPEasyCore/ESPEasy_setup.cpp | 2 +- 3 files changed, 66 insertions(+), 49 deletions(-) diff --git a/src/src/DataStructs/WiFiEventData.cpp b/src/src/DataStructs/WiFiEventData.cpp index d0429bfcd..b696ed0c0 100644 --- a/src/src/DataStructs/WiFiEventData.cpp +++ b/src/src/DataStructs/WiFiEventData.cpp @@ -175,9 +175,11 @@ void WiFiEventData_t::setWiFiServicesInitialized() { if (!processedConnect) { setWiFiConnected(); } + if (!processedGotIP) { setWiFiGotIP(); } + if (/*!unprocessedWifiEvents() && */ WiFiConnected() && WiFiGotIP()) { #ifndef BUILD_NO_DEBUG addLog(LOG_LEVEL_DEBUG, F("WiFi : WiFi services initialized")); @@ -185,6 +187,7 @@ void WiFiEventData_t::setWiFiServicesInitialized() { bitSet(wifiStatus, ESPEASY_WIFI_SERVICES_INITIALIZED); wifiConnectInProgress = false; wifiConnectAttemptNeeded = false; + if (valid_DNS_address(WiFi.dnsIP(0))) { dns0_cache = WiFi.dnsIP(0); } @@ -208,14 +211,17 @@ void WiFiEventData_t::markGotIP() { void WiFiEventData_t::markGotIP(const IPAddress& ip, const IPAddress& netmask, const IPAddress& gw) { addLog( - LOG_LEVEL_INFO, + LOG_LEVEL_INFO, strformat( - F("WiFi : GotIP ip: %s, sn: %s, gw: %s"), - ip.toString().c_str(), - netmask.toString().c_str(), - gw.toString().c_str())); + F("WiFi : GotIP IP: %s, GW: %s, SN: %s DNS: %s / %s"), + formatIP(ip).c_str(), + formatIP(gw).c_str(), + formatIP(netmask).c_str(), + formatIP(WiFi.dnsIP(0)).c_str(), + formatIP(WiFi.dnsIP(1)).c_str() + )); markGotIP(); - + } #if FEATURE_USE_IPV6 @@ -325,53 +331,55 @@ uint32_t WiFiEventData_t::getSuggestedTimeout(int index, uint32_t minimum_timeou return constrain(res, minimum_timeout, CONNECT_TIMEOUT_MAX); } - #ifdef ESP8266 - bool WiFiEventData_t::WiFiDisconnected() const { - return wifiStatus == ESPEASY_WIFI_DISCONNECTED; - } - bool WiFiEventData_t::WiFiGotIP() const { - return bitRead(wifiStatus, ESPEASY_WIFI_GOT_IP); - } +bool WiFiEventData_t::WiFiDisconnected() const { + return wifiStatus == ESPEASY_WIFI_DISCONNECTED; +} - bool WiFiEventData_t::WiFiConnected() const { - return bitRead(wifiStatus, ESPEASY_WIFI_CONNECTED); - } +bool WiFiEventData_t::WiFiGotIP() const { + return bitRead(wifiStatus, ESPEASY_WIFI_GOT_IP); +} - bool WiFiEventData_t::WiFiServicesInitialized() const { - return bitRead(wifiStatus, ESPEASY_WIFI_SERVICES_INITIALIZED); - } +bool WiFiEventData_t::WiFiConnected() const { + return bitRead(wifiStatus, ESPEASY_WIFI_CONNECTED); +} -#endif +bool WiFiEventData_t::WiFiServicesInitialized() const { + return bitRead(wifiStatus, ESPEASY_WIFI_SERVICES_INITIALIZED); +} + +#endif // ifdef ESP8266 #ifdef ESP32 - bool WiFiEventData_t::WiFiDisconnected() const { - return !WiFi.STA.connected(); - } - bool WiFiEventData_t::WiFiGotIP() const { - return WiFi.STA.hasIP(); - } +bool WiFiEventData_t::WiFiDisconnected() const { + return !WiFi.STA.connected(); +} -#if FEATURE_USE_IPV6 - bool WiFiEventData_t::WiFiGotIPv6() const { - return WiFi.STA.hasGlobalIPv6(); - } -#endif +bool WiFiEventData_t::WiFiGotIP() const { + return WiFi.STA.hasIP(); +} - bool WiFiEventData_t::WiFiConnected() const { - return WiFi.STA.connected(); - } +# if FEATURE_USE_IPV6 - bool WiFiEventData_t::WiFiServicesInitialized() const { - return WiFiConnected() && -#if FEATURE_USE_IPV6 -(WiFiGotIP() || WiFi.STA.hasGlobalIPv6() || WiFi.STA.hasLinkLocalIPv6()); -#else - WiFiGotIP(); -#endif - } +bool WiFiEventData_t::WiFiGotIPv6() const { + return WiFi.STA.hasGlobalIPv6(); +} - #endif +# endif // if FEATURE_USE_IPV6 +bool WiFiEventData_t::WiFiConnected() const { + return WiFi.STA.connected(); +} + +bool WiFiEventData_t::WiFiServicesInitialized() const { + return WiFiConnected() && +# if FEATURE_USE_IPV6 + (WiFiGotIP() || WiFi.STA.hasGlobalIPv6() || WiFi.STA.hasLinkLocalIPv6()); +# else + WiFiGotIP(); +# endif // if FEATURE_USE_IPV6 +} + + #endif // ifdef ESP32 diff --git a/src/src/ESPEasyCore/ESPEasyWiFiEvent_ESP32.cpp b/src/src/ESPEasyCore/ESPEasyWiFiEvent_ESP32.cpp index 25f89e97c..c3720b8bc 100644 --- a/src/src/ESPEasyCore/ESPEasyWiFiEvent_ESP32.cpp +++ b/src/src/ESPEasyCore/ESPEasyWiFiEvent_ESP32.cpp @@ -21,6 +21,7 @@ # include "../Globals/WiFi_AP_Candidates.h" # include "../Helpers/ESPEasy_time_calc.h" +# include "../Helpers/StringConverter.h" # if FEATURE_ETHERNET @@ -37,8 +38,8 @@ void setUseStaticIP(bool enabled) {} static bool ignoreDisconnectEvent = false; -void WiFiEvent(WiFiEvent_t event, arduino_event_info_t info) { - switch (event) +void WiFiEvent(WiFiEvent_t event_id, arduino_event_info_t info) { + switch (event_id) { case ARDUINO_EVENT_WIFI_READY: // ESP32 WiFi ready @@ -55,6 +56,13 @@ void WiFiEvent(WiFiEvent_t event, arduino_event_info_t info) { // addLog(LOG_LEVEL_INFO, F("WiFi : Event STA Stopped")); # endif // ifndef BUILD_NO_DEBUG break; + case ARDUINO_EVENT_WIFI_OFF: + # ifndef BUILD_NO_DEBUG + + // addLog(LOG_LEVEL_INFO, F("WiFi : Event WIFI off")); + # endif // ifndef BUILD_NO_DEBUG + break; + case ARDUINO_EVENT_WIFI_AP_START: # ifndef BUILD_NO_DEBUG @@ -121,11 +129,12 @@ void WiFiEvent(WiFiEvent_t event, arduino_event_info_t info) { break; case ARDUINO_EVENT_WIFI_STA_GOT_IP: { + // FIXME TD-er: Must also check event->esp_netif to see which interface got this event. ignoreDisconnectEvent = false; ip_event_got_ip_t *event = static_cast(&info.got_ip); const IPAddress ip(event->ip_info.ip.addr); - const IPAddress netmask(event->ip_info.ip.addr); - const IPAddress gw(event->ip_info.ip.addr); + const IPAddress netmask(event->ip_info.netmask.addr); + const IPAddress gw(event->ip_info.gw.addr); WiFiEventData.markGotIP(ip, netmask, gw); break; } @@ -163,7 +172,7 @@ void WiFiEvent(WiFiEvent_t event, arduino_event_info_t info) { # endif // FEATURE_ETHERNET default: { - // addLogMove(LOG_LEVEL_ERROR, concat(F("UNKNOWN WIFI/ETH EVENT: "), event)); + addLogMove(LOG_LEVEL_ERROR, concat(F("UNKNOWN WIFI/ETH EVENT: "), event_id)); break; } } diff --git a/src/src/ESPEasyCore/ESPEasy_setup.cpp b/src/src/ESPEasyCore/ESPEasy_setup.cpp index 2d4293e6d..91e2ebc58 100644 --- a/src/src/ESPEasyCore/ESPEasy_setup.cpp +++ b/src/src/ESPEasyCore/ESPEasy_setup.cpp @@ -446,7 +446,7 @@ void ESPEasy_setup() WiFi_AP_Candidates.load_knownCredentials(); ESPEasy::net::wifi::setSTA(true); - if (!WiFi_AP_Candidates.hasCandidates()) { + if (!WiFi_AP_Candidates.hasCandidateCredentials()) { WiFiEventData.wifiSetup = true; RTC.clearLastWiFi(); // Must scan all channels // Wait until scan has finished to make sure as many as possible are found From 64b9f4800bbd45cfd8f7cd344566e8e9daa3569e Mon Sep 17 00:00:00 2001 From: TD-er Date: Fri, 6 Dec 2024 23:27:05 +0100 Subject: [PATCH 016/564] [WiFi] Update to latest ESP-IDF SDK + handle gotIP event on ESP8266 --- platformio_core_defs.ini | 2 +- src/src/DataStructs/WiFiEventData.cpp | 1 - src/src/ESPEasyCore/ESPEasyWiFiEvent_ESP8266.cpp | 8 +++++++- 3 files changed, 8 insertions(+), 3 deletions(-) diff --git a/platformio_core_defs.ini b/platformio_core_defs.ini index 41bce130b..1676c1134 100644 --- a/platformio_core_defs.ini +++ b/platformio_core_defs.ini @@ -198,7 +198,7 @@ lib_extra_dirs = ; ESP_IDF 5.3.1 [core_esp32_IDF5_3_1__3_0_5_LittleFS] platform = https://github.com/tasmota/platform-espressif32/releases/download/2024.10.31/platform-espressif32.zip -platform_packages = framework-arduinoespressif32 @ https://github.com/Jason2866/esp32-arduino-lib-builder/releases/download/3180/framework-arduinoespressif32-all-release_v5.3-1c74f314.zip +platform_packages = framework-arduinoespressif32 @ https://github.com/Jason2866/esp32-arduino-lib-builder/releases/download/3184/framework-arduinoespressif32-all-release_v5.3-35321e8b.zip build_flags = -DESP32_STAGE -DESP_IDF_VERSION_MAJOR=5 -DLIBRARIES_NO_LOG=1 diff --git a/src/src/DataStructs/WiFiEventData.cpp b/src/src/DataStructs/WiFiEventData.cpp index b696ed0c0..2305ce5bc 100644 --- a/src/src/DataStructs/WiFiEventData.cpp +++ b/src/src/DataStructs/WiFiEventData.cpp @@ -221,7 +221,6 @@ void WiFiEventData_t::markGotIP(const IPAddress& ip, const IPAddress& netmask, c formatIP(WiFi.dnsIP(1)).c_str() )); markGotIP(); - } #if FEATURE_USE_IPV6 diff --git a/src/src/ESPEasyCore/ESPEasyWiFiEvent_ESP8266.cpp b/src/src/ESPEasyCore/ESPEasyWiFiEvent_ESP8266.cpp index b127bc194..2fb82ba1d 100644 --- a/src/src/ESPEasyCore/ESPEasyWiFiEvent_ESP8266.cpp +++ b/src/src/ESPEasyCore/ESPEasyWiFiEvent_ESP8266.cpp @@ -45,7 +45,13 @@ void onDisconnect(const WiFiEventStationModeDisconnected& event) { } } -void onGotIP(const WiFiEventStationModeGotIP& event) { WiFiEventData.markGotIP(); } +void onGotIP(const WiFiEventStationModeGotIP& event) +{ + WiFiEventData.markGotIP( + event.ip, + event.mask, + event.gw); +} void onDHCPTimeout() { WiFiEventData.processedDHCPTimeout = false; } From bf3485344ee7fbdabc6684b2e5c2735b21609e1f Mon Sep 17 00:00:00 2001 From: TD-er Date: Mon, 6 Jan 2025 15:12:45 +0100 Subject: [PATCH 017/564] [WiFi] Fix event handling for WiFi on ESP32 --- src/src/DataStructs/WiFiEventData.cpp | 22 +- .../ESPEasyCore/ESPEasyWiFi_state_machine.cpp | 29 +- .../ESPEasyCore/ESPEasyWiFi_state_machine.h | 45 +- .../ESPEasyCore/ESPEasyWifi_ProcessEvent.cpp | 201 ------- .../ESPEasyWifi_abstracted_ESP32.cpp | 11 +- src/src/Helpers/Networking.cpp | 566 ++++++++++-------- 6 files changed, 377 insertions(+), 497 deletions(-) diff --git a/src/src/DataStructs/WiFiEventData.cpp b/src/src/DataStructs/WiFiEventData.cpp index 2305ce5bc..e8bf8be67 100644 --- a/src/src/DataStructs/WiFiEventData.cpp +++ b/src/src/DataStructs/WiFiEventData.cpp @@ -210,16 +210,18 @@ void WiFiEventData_t::markGotIP() { void WiFiEventData_t::markGotIP(const IPAddress& ip, const IPAddress& netmask, const IPAddress& gw) { - addLog( - LOG_LEVEL_INFO, - strformat( - F("WiFi : GotIP IP: %s, GW: %s, SN: %s DNS: %s / %s"), - formatIP(ip).c_str(), - formatIP(gw).c_str(), - formatIP(netmask).c_str(), - formatIP(WiFi.dnsIP(0)).c_str(), - formatIP(WiFi.dnsIP(1)).c_str() - )); + if (loglevelActiveFor(LOG_LEVEL_INFO)) { + addLog( + LOG_LEVEL_INFO, + strformat( + F("WiFi : GotIP IP: %s, GW: %s, SN: %s DNS: %s / %s"), + formatIP(ip).c_str(), + formatIP(gw).c_str(), + formatIP(netmask).c_str(), + formatIP(WiFi.dnsIP(0)).c_str(), + formatIP(WiFi.dnsIP(1)).c_str() + )); + } markGotIP(); } diff --git a/src/src/ESPEasyCore/ESPEasyWiFi_state_machine.cpp b/src/src/ESPEasyCore/ESPEasyWiFi_state_machine.cpp index d3e9e97a3..16ce48675 100644 --- a/src/src/ESPEasyCore/ESPEasyWiFi_state_machine.cpp +++ b/src/src/ESPEasyCore/ESPEasyWiFi_state_machine.cpp @@ -16,7 +16,7 @@ # include "../Globals/WiFi_AP_Candidates.h" # include "../Helpers/StringConverter.h" -#include "../Helpers/StringGenerator_WiFi.h" +# include "../Helpers/StringGenerator_WiFi.h" namespace ESPEasy { namespace net { @@ -143,7 +143,6 @@ bool ESPEasyWiFi_t::connected() const return getSTA_connected_state() == STA_connected_state::Connected; } - void ESPEasyWiFi_t::disconnect() { WiFi.disconnect(Settings.WiFiRestart_connection_lost()); } void ESPEasyWiFi_t::setState(WiFiState_e newState, uint32_t timeout) { @@ -209,6 +208,7 @@ void ESPEasyWiFi_t::checkConnectProgress() {} void ESPEasyWiFi_t::startScanning() { _state = WiFiState_e::STA_Scanning; + setSTA(true); WifiScan(true); _last_state_change.setNow(); } @@ -233,12 +233,13 @@ bool ESPEasyWiFi_t::connectSTA() } return false; } - if (WiFiEventData.lastDisconnectReason != WIFI_DISCONNECT_REASON_UNSPECIFIED) { - addLog(LOG_LEVEL_INFO, concat( - F("WiFi : Disconnect reason: "), - getLastDisconnectReason())); - WiFiEventData.processedDisconnect = true; - } + + if (WiFiEventData.lastDisconnectReason != WIFI_DISCONNECT_REASON_UNSPECIFIED) { + addLog(LOG_LEVEL_INFO, concat( + F("WiFi : Disconnect reason: "), + getLastDisconnectReason())); + WiFiEventData.processedDisconnect = true; + } WiFiEventData.warnedNoValidWiFiSettings = false; setSTA(true); @@ -304,28 +305,30 @@ bool ESPEasyWiFi_t::connectSTA() # endif // ifdef ESP32 if (candidate.bits.isHidden /*&& Settings.HiddenSSID_SlowConnectPerBSSID()*/) { -// WiFi.disconnect(false, true); + // WiFi.disconnect(false, true); # ifdef ESP32 WiFi.setScanMethod(WIFI_ALL_CHANNEL_SCAN); -#endif +# endif delay(100); WiFi.begin(candidate.ssid.c_str(), key.c_str(), candidate.channel, candidate.bssid.mac); + // If the ssid returned from the scan is empty, it is a hidden SSID // it appears that the WiFi.begin() function is asynchronous and takes // additional time to connect to a hidden SSID. Therefore a delay of 1000ms // is added for hidden SSIDs before calling WiFi.status() delay(1000); -// WiFi.waitForConnectResult(6000); + + // WiFi.waitForConnectResult(6000); } else { if (candidate.allowQuickConnect()) { # ifdef ESP32 WiFi.setScanMethod(WIFI_FAST_SCAN); -#endif +# endif WiFi.begin(candidate.ssid.c_str(), key.c_str(), candidate.channel, candidate.bssid.mac); } else { # ifdef ESP32 WiFi.setScanMethod(WIFI_ALL_CHANNEL_SCAN); -#endif +# endif WiFi.begin(candidate.ssid.c_str(), key.c_str()); } } diff --git a/src/src/ESPEasyCore/ESPEasyWiFi_state_machine.h b/src/src/ESPEasyCore/ESPEasyWiFi_state_machine.h index a5ec96ad0..f6656cb5f 100644 --- a/src/src/ESPEasyCore/ESPEasyWiFi_state_machine.h +++ b/src/src/ESPEasyCore/ESPEasyWiFi_state_machine.h @@ -30,8 +30,9 @@ public: // Terminate WiFi activity void disable(); - + private: + void begin(); public: @@ -56,7 +57,8 @@ public: private: - void setState(WiFiState_e newState, uint32_t timeout = 0); + void setState(WiFiState_e newState, + uint32_t timeout = 0); // Handle timeouts + start of AP mode void checkConnectProgress(); @@ -93,33 +95,28 @@ private: // Special modes for initial setup or re-configuration of a node via serial port/IMPROV bool _improvActive = false; - bool _setupActive = false; + bool _setupActive = false; -// WiFi settings => Move to separate class/struct -bool _disabledAtBoot = false; -bool _passiveScan = false; -bool _includeHiddenSSID = false; -float _TX_power = -1; - -// Manual IP settings -// IP -// Gateway -// Subnet -// DNS - - - -// soft AP configuration => TODO TD-er: Implement -// bool _must_Start_AP; // "Do Not Start AP" -// bool _has_ap{false}; // Maybe just check for active mode? -// WiFiAP _ap_config; -// WPA AP mode key -// Don't force /setup in AP-Mode - + // WiFi settings => Move to separate class/struct + bool _disabledAtBoot = false; + bool _passiveScan = false; + bool _includeHiddenSSID = false; + float _TX_power = -1; + // Manual IP settings + // IP + // Gateway + // Subnet + // DNS + // soft AP configuration => TODO TD-er: Implement + // bool _must_Start_AP; // "Do Not Start AP" + // bool _has_ap{false}; // Maybe just check for active mode? + // WiFiAP _ap_config; + // WPA AP mode key + // Don't force /setup in AP-Mode }; // class ESPEasyWiFi_t diff --git a/src/src/ESPEasyCore/ESPEasyWifi_ProcessEvent.cpp b/src/src/ESPEasyCore/ESPEasyWifi_ProcessEvent.cpp index f1aa0b284..25ff3edfe 100644 --- a/src/src/ESPEasyCore/ESPEasyWifi_ProcessEvent.cpp +++ b/src/src/ESPEasyCore/ESPEasyWifi_ProcessEvent.cpp @@ -92,129 +92,6 @@ void handle_unprocessedNetworkEvents() } } - /* if (WiFiEventData.unprocessedWifiEvents()) { - // Process disconnect events before connect events. - if (!WiFiEventData.processedDisconnect) { - #ifndef BUILD_NO_DEBUG - addLog(LOG_LEVEL_DEBUG, F("WIFI : Entering processDisconnect()")); - #endif // ifndef BUILD_NO_DEBUG - processDisconnect(); - } - } - - if (active_network_medium == NetworkMedium_t::WIFI) { - if ((!WiFiEventData.WiFiServicesInitialized()) || WiFiEventData.unprocessedWifiEvents() || WiFiEventData.wifiConnectAttemptNeeded) { - // WiFi connection is not yet available, so introduce some extra delays to - // help the background tasks managing wifi connections - delay(0); - - if (!WiFiEventData.processedConnect) { - #ifndef BUILD_NO_DEBUG - addLog(LOG_LEVEL_DEBUG, F("WIFI : Entering processConnect()")); - #endif // ifndef BUILD_NO_DEBUG - processConnect(); - } - - if (!WiFiEventData.processedGotIP) { - #ifndef BUILD_NO_DEBUG - addLog(LOG_LEVEL_DEBUG, F("WIFI : Entering processGotIP()")); - #endif // ifndef BUILD_NO_DEBUG - processGotIP(); - } - - if (!WiFiEventData.processedDHCPTimeout) { - #ifndef BUILD_NO_DEBUG - addLog(LOG_LEVEL_INFO, F("WIFI : DHCP timeout, Calling disconnect()")); - #endif // ifndef BUILD_NO_DEBUG - WiFiEventData.processedDHCPTimeout = true; - WifiDisconnect(); - } - - if ((WiFi.status() == WL_DISCONNECTED) && WiFiEventData.wifiConnectInProgress) { - if (WiFiEventData.last_wifi_connect_attempt_moment.isSet() && - WiFiEventData.last_wifi_connect_attempt_moment.timeoutReached(DEFAULT_WIFI_CONNECTION_TIMEOUT)) { - logConnectionStatus(); - resetWiFi(); - } - - if (!WiFiEventData.last_wifi_connect_attempt_moment.isSet()) { - WiFiEventData.wifiConnectInProgress = false; - } - delay(10); - } - - if (!WiFiEventData.wifiConnectInProgress) { - WiFiEventData.wifiConnectAttemptNeeded = true; - NetworkConnectRelaxed(); - } - } - - - if (WiFiEventData.WiFiDisconnected()) { - #ifndef BUILD_NO_DEBUG - - if (loglevelActiveFor(LOG_LEVEL_DEBUG)) { - static LongTermTimer lastDisconnectMoment_log; - static uint8_t lastWiFiStatus_log = 0; - uint8_t cur_wifi_status = WiFi.status(); - - if ((WiFiEventData.lastDisconnectMoment.get() != lastDisconnectMoment_log.get()) || - (lastWiFiStatus_log != cur_wifi_status)) { - lastDisconnectMoment_log.set(WiFiEventData.lastDisconnectMoment.get()); - lastWiFiStatus_log = cur_wifi_status; - String wifilog = F("WIFI : Disconnected: WiFi.status() = "); - wifilog += WiFiEventData.ESPeasyWifiStatusToString(); - wifilog += F(" RSSI: "); - wifilog += String(WiFi.RSSI()); - wifilog += F(" status: "); - # ifdef ESP8266 - station_status_t status = wifi_station_get_connect_status(); - wifilog += SDKwifiStatusToString(status); - # endif // ifdef ESP8266 - # ifdef ESP32 - wifilog += ArduinoWifiStatusToString(WiFi.status()); - # endif - addLogMove(LOG_LEVEL_DEBUG, wifilog); - } - } - #endif // ifndef BUILD_NO_DEBUG - - // While connecting to WiFi make sure the device has ample time to do so - delay(10); - } - - if (!WiFiEventData.processedDisconnectAPmode) { processDisconnectAPmode(); } - - if (!WiFiEventData.processedConnectAPmode) { processConnectAPmode(); } - - if (WiFiEventData.timerAPoff.isSet()) { processDisableAPmode(); } - - if (!WiFiEventData.processedScanDone) { processScanDone(); } - - if (WiFiEventData.wifi_connect_attempt > 0) { - // We only want to clear this counter if the connection is currently stable. - if (WiFiEventData.WiFiServicesInitialized()) { - if (WiFiEventData.lastConnectMoment.isSet() && WiFiEventData.lastConnectMoment.timeoutReached(WIFI_CONNECTION_CONSIDERED_STABLE)) - #{ - // Connection considered stable - WiFiEventData.wifi_connect_attempt = 0; - WiFiEventData.wifi_considered_stable = true; - WiFi_AP_Candidates.markCurrentConnectionStable(); - - if (WiFi.getAutoReconnect() != Settings.SDK_WiFi_autoreconnect()) { - WiFi.setAutoReconnect(Settings.SDK_WiFi_autoreconnect()); - delay(1); - } - } else { - if (WiFi.getAutoReconnect()) { - WiFi.setAutoReconnect(false); - delay(1); - } - } - } - } - } - */ #if FEATURE_ETHERNET check_Eth_DNS_valid(); #endif // if FEATURE_ETHERNET @@ -229,85 +106,7 @@ void handle_unprocessedNetworkEvents() // These functions are called from Setup() or Loop() and thus may call delay() or yield() // ******************************************************************************** void processDisconnect() { - /* - if (WiFiEventData.processedDisconnect) { return; } - if (loglevelActiveFor(LOG_LEVEL_INFO)) { - String log = strformat( - F("WIFI : Disconnected! Reason: '%s'"), - getLastDisconnectReason().c_str()); - - if (WiFiEventData.lastConnectedDuration_us > 0) { - log += concat( - F(" Connected for "), - format_msec_duration(WiFiEventData.lastConnectedDuration_us / 1000ll)); - } - addLogMove(LOG_LEVEL_INFO, log); - } - logConnectionStatus(); - - if (WiFiEventData.processingDisconnect.isSet()) { - if ((WiFiEventData.processingDisconnect.millisPassedSince() > 5000) || WiFiEventData.processedDisconnect) { - WiFiEventData.processedDisconnect = true; - WiFiEventData.processingDisconnect.clear(); - } - } - - - if (WiFiEventData.processedDisconnect || - WiFiEventData.processingDisconnect.isSet()) { return; } - WiFiEventData.processingDisconnect.setNow(); - WiFiEventData.setWiFiDisconnected(); - WiFiEventData.wifiConnectAttemptNeeded = true; - delay(100); // FIXME TD-er: See https://github.com/letscontrolit/ESPEasy/issues/1987#issuecomment-451644424 - - if (Settings.UseRules) { - eventQueue.add(F("WiFi#Disconnected")); - } - - - // FIXME TD-er: With AutoReconnect enabled, WiFi must be reset or else we completely loose track of the actual WiFi state - bool mustRestartWiFi = Settings.WiFiRestart_connection_lost() || WiFi.getAutoReconnect(); - - if ((WiFiEventData.lastConnectedDuration_us > 0) && ((WiFiEventData.lastConnectedDuration_us / 1000) < 5000)) { - if (!WiFi_AP_Candidates.getBestCandidate().usable()) { - // addLog(LOG_LEVEL_INFO, F("WIFI : !getBestCandidate().usable() => mustRestartWiFi = true")); - - mustRestartWiFi = true; - } - } - - if (WiFi.status() == WL_IDLE_STATUS) { - // addLog(LOG_LEVEL_INFO, F("WIFI : WiFi.status() == WL_IDLE_STATUS => mustRestartWiFi = true")); - mustRestartWiFi = true; - } - - - #ifdef USES_ESPEASY_NOW - - if (use_EspEasy_now) { - // mustRestartWiFi = true; - } - #endif // ifdef USES_ESPEASY_NOW - - // WifiDisconnect(); // Needed or else node may not reconnect reliably. - - if (mustRestartWiFi) { - WiFiEventData.processedDisconnect = true; - resetWiFi(); - - // WifiScan(false); - // delay(100); - // ESPEasy::net::wifi::setWifiMode(WIFI_OFF); - // initWiFi(); - // delay(100); - } - - // delay(500); - logConnectionStatus(); - WiFiEventData.processedDisconnect = true; - WiFiEventData.processingDisconnect.clear(); - */ } void processConnect() { diff --git a/src/src/ESPEasyCore/ESPEasyWifi_abstracted_ESP32.cpp b/src/src/ESPEasyCore/ESPEasyWifi_abstracted_ESP32.cpp index 2f5f28a23..919f57745 100644 --- a/src/src/ESPEasyCore/ESPEasyWifi_abstracted_ESP32.cpp +++ b/src/src/ESPEasyCore/ESPEasyWifi_abstracted_ESP32.cpp @@ -46,7 +46,7 @@ bool WiFi_pre_STA_setup() } void WiFiDisconnect() { - removeWiFiEventHandler(); +// removeWiFiEventHandler(); WiFi.disconnect(); delay(100); { @@ -70,6 +70,9 @@ bool setWifiMode(WiFiMode_t new_mode) static int8_t processing_wifi_mode = -1; if (cur_mode == new_mode) { + if (cur_mode != WIFI_OFF) { + registerWiFiEventHandler(); + } return true; } @@ -81,6 +84,8 @@ bool setWifiMode(WiFiMode_t new_mode) if (cur_mode == WIFI_OFF) { + registerWiFiEventHandler(); + // Needs to be set while WiFi is off WiFi.hostname(NetworkCreateRFCCompliantHostname()); WiFiEventData.markWiFiTurnOn(); @@ -99,6 +104,7 @@ bool setWifiMode(WiFiMode_t new_mode) // delay(100); processDisconnect(); WiFiEventData.clear_processed_flags(); + removeWiFiEventHandler(); } addLog(LOG_LEVEL_INFO, concat(F("WIFI : Set WiFi to "), getWifiModeString(new_mode))); @@ -136,10 +142,11 @@ bool setWifiMode(WiFiMode_t new_mode) // esp_wifi_set_ps(WIFI_PS_MAX_MODEM); delay(1); } else { +/* if (cur_mode == WIFI_OFF) { registerWiFiEventHandler(); } - +*/ // Only set power mode when AP is not enabled // When AP is enabled, the sleep mode is already set to WIFI_NONE_SLEEP if (!WifiIsAP(new_mode)) { diff --git a/src/src/Helpers/Networking.cpp b/src/src/Helpers/Networking.cpp index d18cb7c81..b7eaa510f 100644 --- a/src/src/Helpers/Networking.cpp +++ b/src/src/Helpers/Networking.cpp @@ -16,7 +16,7 @@ #include "../Globals/ESPEasy_Scheduler.h" #ifdef USES_ESPEASY_NOW -#include "../Globals/ESPEasy_now_handler.h" +# include "../Globals/ESPEasy_now_handler.h" #endif #include "../Globals/EventQueue.h" @@ -50,18 +50,18 @@ // SSDP // #if LWIP_VERSION_MAJOR == 2 #define IPADDR2STR(addr) (uint8_t)((uint32_t)addr & 0xFF), (uint8_t)(((uint32_t)addr >> 8) & 0xFF), \ - (uint8_t)(((uint32_t)addr >> 16) & 0xFF), (uint8_t)(((uint32_t)addr >> 24) & 0xFF) + (uint8_t)(((uint32_t)addr >> 16) & 0xFF), (uint8_t)(((uint32_t)addr >> 24) & 0xFF) // #endif #include #ifdef ESP8266 -#include -#include -#include -#include -#endif +# include +# include +# include +# include +#endif // ifdef ESP8266 #ifdef SUPPORT_ARP # include @@ -70,13 +70,9 @@ # include # include -void _etharp_gratuitous_func(struct netif *netif) { - etharp_gratuitous(netif); -} +void _etharp_gratuitous_func(struct netif *netif) { etharp_gratuitous(netif); } -void etharp_gratuitous_r(struct netif *netif) { - tcpip_callback_with_block((tcpip_callback_fn)_etharp_gratuitous_func, netif, 0); -} +void etharp_gratuitous_r(struct netif *netif) { tcpip_callback_with_block((tcpip_callback_fn)_etharp_gratuitous_func, netif, 0); } # endif // ifdef ESP32 @@ -133,7 +129,7 @@ void sendSyslog(uint8_t logLevel, const String& message) header += F(" EspEasy: "); header.trim(); header.replace(' ', '_'); - + #ifdef ESP8266 portUDP.write(header.c_str(), header.length()); #endif // ifdef ESP8266 @@ -143,7 +139,7 @@ void sendSyslog(uint8_t logLevel, const String& message) } #ifdef ESP8266 - portUDP.write(message.c_str(), message.length()); + portUDP.write(message.c_str(), message.length()); #endif // ifdef ESP8266 #ifdef ESP32 portUDP.write(reinterpret_cast(message.c_str()), message.length()); @@ -199,11 +195,11 @@ void sendUDP(uint8_t unit, const uint8_t *data, uint8_t size) # ifndef BUILD_NO_DEBUG if (loglevelActiveFor(LOG_LEVEL_DEBUG_MORE)) { - addLogMove(LOG_LEVEL_DEBUG_MORE, strformat( - F("UDP : Send UDP message to %d (%s)"), - unit, - remoteNodeIP.toString().c_str() - )); + addLogMove(LOG_LEVEL_DEBUG_MORE, strformat( + F("UDP : Send UDP message to %d (%s)"), + unit, + remoteNodeIP.toString().c_str() + )); } # endif // ifndef BUILD_NO_DEBUG @@ -223,7 +219,7 @@ void updateUDPport(bool force) { static uint16_t lastUsedUDPPort = 0; - if (!force && Settings.UDPPort == lastUsedUDPPort) { + if (!force && (Settings.UDPPort == lastUsedUDPPort)) { return; } @@ -255,10 +251,13 @@ void updateUDPport(bool force) Check UDP messages (ESPEasy propiertary protocol) \*********************************************************************************************/ boolean runningUPDCheck = false; + void checkUDP() { - if (!NetworkConnected()) + if (!NetworkConnected()) { return; + } + if (Settings.UDPPort == 0) { return; } @@ -268,7 +267,7 @@ void checkUDP() } START_TIMER - runningUPDCheck = true; + runningUPDCheck = true; // UDP events int packetSize = portUDP.parsePacket(); @@ -297,7 +296,7 @@ void checkUDP() // and then crash due to memory allocation failures if ((packetSize >= 2) && (packetSize < UDP_PACKETSIZE_MAX)) { // Allocate buffer to process packet. - // Resize it to be 1 byte larger so we can 0-terminate it + // Resize it to be 1 byte larger so we can 0-terminate it // in case it is some plain text string std::vector packetBuffer; packetBuffer.resize(packetSize + 1); @@ -313,14 +312,14 @@ void checkUDP() # ifndef BUILD_NO_DEBUG if (loglevelActiveFor(LOG_LEVEL_DEBUG)) { - addLogMove(LOG_LEVEL_DEBUG, - strformat(F("UDP : %s Command: %s"), - formatIP(remoteIP, true).c_str(), - wrapWithQuotesIfContainsParameterSeparatorChar(String(&packetBuffer[0])).c_str() - )); + addLogMove(LOG_LEVEL_DEBUG, + strformat(F("UDP : %s Command: %s"), + formatIP(remoteIP, true).c_str(), + wrapWithQuotesIfContainsParameterSeparatorChar(String(&packetBuffer[0])).c_str() + )); } - #endif - ExecuteCommand_all({EventValueSource::Enum::VALUE_SOURCE_SYSTEM, &packetBuffer[0]}, true); + # endif // ifndef BUILD_NO_DEBUG + ExecuteCommand_all({ EventValueSource::Enum::VALUE_SOURCE_SYSTEM, &packetBuffer[0] }, true); } else { @@ -333,6 +332,7 @@ void checkUDP() break; } int copy_length = sizeof(NodeStruct); + // Older versions sent 80 bytes, regardless of the size of NodeStruct // Make sure the extra data received is ignored as it was also not initialized if (len == 80) { @@ -351,16 +351,16 @@ void checkUDP() # ifndef BUILD_NO_DEBUG if (loglevelActiveFor(LOG_LEVEL_DEBUG_MORE)) { - addLogMove(LOG_LEVEL_DEBUG_MORE, - strformat(F("UDP : %s (%d) %s,%s,%d"), - formatIP(remoteIP).c_str(), - received.unit, - received.STA_MAC().toString().c_str(), - formatIP(received.IP(), true).c_str(), - received.unit)); + addLogMove(LOG_LEVEL_DEBUG_MORE, + strformat(F("UDP : %s (%d) %s,%s,%d"), + formatIP(remoteIP).c_str(), + received.unit, + received.STA_MAC().toString().c_str(), + formatIP(received.IP(), true).c_str(), + received.unit)); } -#endif // ifndef BUILD_NO_DEBUG +# endif // ifndef BUILD_NO_DEBUG } break; } @@ -372,8 +372,9 @@ void checkUDP() TempEvent.Par1 = remoteIP[3]; TempEvent.Par2 = len; String dummy; + // TD-er: Disabled the PLUGIN_UDP_IN call as we don't have any plugin using this. - //PluginCall(PLUGIN_UDP_IN, &TempEvent, dummy); + // PluginCall(PLUGIN_UDP_IN, &TempEvent, dummy); CPluginCall(CPlugin::Function::CPLUGIN_UDP_IN, &TempEvent); break; } @@ -401,7 +402,8 @@ String formatUnitToIPAddress(uint8_t unit, uint8_t formatCode) { IPAddress unitIPAddress = getIPAddressForUnit(unit); if (unitIPAddress[0] == 0) { // Invalid? - switch (formatCode) { + switch (formatCode) + { case 1: // Return empty string { return EMPTY_STRING; @@ -425,29 +427,29 @@ IPAddress getIPAddressForUnit(uint8_t unit) { } auto it = Nodes.find(unit); - if (it == Nodes.end() || it->second.ip[0] == 0) { + if ((it == Nodes.end()) || (it->second.ip[0] == 0)) { IPAddress ip; return ip; } -#if FEATURE_USE_IPV6 -/* - // FIXME TD-er: for now do not try to send to IPv6 - if (it->second.hasIPv6_mac_based_link_local) { - return it->second.IPv6_link_local(); - } - if (it->second.hasIPv6_mac_based_link_global) { - return it->second.IPv6_global(); - } -*/ -#endif +# if FEATURE_USE_IPV6 + + /* + // FIXME TD-er: for now do not try to send to IPv6 + if (it->second.hasIPv6_mac_based_link_local) { + return it->second.IPv6_link_local(); + } + if (it->second.hasIPv6_mac_based_link_global) { + return it->second.IPv6_global(); + } + */ +# endif // if FEATURE_USE_IPV6 return it->second.IP(); } - String getNameForUnit(uint8_t unit) { auto it = Nodes.find(unit); - if (it == Nodes.end() || it->second.getNodeName().isEmpty()) { + if ((it == Nodes.end()) || it->second.getNodeName().isEmpty()) { return EMPTY_STRING; } return it->second.getNodeName(); @@ -465,7 +467,7 @@ long getAgeForUnit(uint8_t unit) { uint16_t getBuildnrForUnit(uint8_t unit) { auto it = Nodes.find(unit); - if (it == Nodes.end() || it->second.build == 0) { + if ((it == Nodes.end()) || (it->second.build == 0)) { return 0; } return it->second.build; @@ -508,20 +510,22 @@ void refreshNodeList() Nodes.refreshNodeList(max_age_allowed, max_age); - #ifdef USES_ESPEASY_NOW - #ifdef ESP8266 + # ifdef USES_ESPEASY_NOW + # ifdef ESP8266 + // FIXME TD-er: Do not perform regular scans on ESP32 as long as we cannot scan per channel if (!Nodes.isEndpoint()) { WifiScan(true, Nodes.getESPEasyNOW_channel()); } - #endif - #endif + # endif // ifdef ESP8266 + # endif // ifdef USES_ESPEASY_NOW if (max_age > (0.75 * max_age_allowed)) { Scheduler.sendGratuitousARP_now(); } sendSysInfoUDP(1); - #ifdef USES_ESPEASY_NOW + # ifdef USES_ESPEASY_NOW + if (Nodes.recentlyBecameDistanceZero()) { // Send to all channels ESPEasy_now_handler.sendDiscoveryAnnounce(-1); @@ -530,7 +534,7 @@ void refreshNodeList() } ESPEasy_now_handler.sendNTPquery(); ESPEasy_now_handler.sendTraceRoute(); - #endif // ifdef USES_ESPEASY_NOW + # endif // ifdef USES_ESPEASY_NOW } /*********************************************************************************************\ @@ -560,7 +564,7 @@ void sendSysInfoUDP(uint8_t repeats) // Prepare UDP packet to send constexpr size_t data_size = sizeof(NodeStruct) + 2; - uint8_t data[data_size] = {0}; + uint8_t data[data_size] = { 0 }; data[0] = 255; data[1] = 1; memcpy(&data[2], thisNode, sizeof(NodeStruct)); @@ -606,42 +610,42 @@ void SSDP_schema() { (uint16_t)chipId & 0xff); web_server.client().print(F( - "HTTP/1.1 200 OK\r\n" - "Content-Type: text/xml\r\n" - "Connection: close\r\n" - "Access-Control-Allow-Origin: *\r\n" - "\r\n" - "" - "" - "" - "1" - "0" - "" - "http://")); + "HTTP/1.1 200 OK\r\n" + "Content-Type: text/xml\r\n" + "Connection: close\r\n" + "Access-Control-Allow-Origin: *\r\n" + "\r\n" + "" + "" + "" + "1" + "0" + "" + "http://")); web_server.client().print(formatIP(ip)); web_server.client().print(F(":80/" - "" - "urn:schemas-upnp-org:device:BinaryLight:1" - "")); + "" + "urn:schemas-upnp-org:device:BinaryLight:1" + "")); web_server.client().print(Settings.getName()); web_server.client().print(F("" - "/" - "")); + "/" + "")); web_server.client().print(String(ESP.getChipId())); web_server.client().print(F("" - "ESP Easy" - "")); + "ESP Easy" + "")); web_server.client().print(getValue(LabelType::GIT_BUILD)); web_server.client().print(F("" - "http://www.letscontrolit.com" - "http://www.letscontrolit.com" - "http://www.letscontrolit.com" - "uuid:")); + "http://www.letscontrolit.com" + "http://www.letscontrolit.com" + "http://www.letscontrolit.com" + "uuid:")); web_server.client().print(String(uuid)); web_server.client().print(F("" - "\r\n" - "\r\n")); + "\r\n" + "\r\n")); } /********************************************************************************************\ @@ -667,7 +671,6 @@ unsigned long _notify_time; static const IPAddress SSDP_MULTICAST_ADDR(239, 255, 255, 250); - /********************************************************************************************\ Launch SSDP listener and send initial notify \*********************************************************************************************/ @@ -807,10 +810,24 @@ void SSDP_update() { _respondToAddr = _server->getRemoteAddress(); _respondToPort = _server->getRemotePort(); - typedef enum { METHOD, URI, PROTO, KEY, VALUE, ABORT } states; + typedef enum { + METHOD, + URI, + PROTO, + KEY, + VALUE, + ABORT + + } states; states state = METHOD; - typedef enum { START, MAN, ST, MX } headers; + typedef enum { + START, + MAN, + ST, + MX + + } headers; headers header = START; uint8_t cursor = 0; @@ -823,7 +840,8 @@ void SSDP_update() { (c == '\r' || c == '\n') ? cr++ : cr = 0; - switch (state) { + switch (state) + { case METHOD: if (c == ' ') { @@ -874,7 +892,8 @@ void SSDP_update() { case VALUE: if (cr == 2) { - switch (header) { + switch (header) + { case START: break; case MAN: @@ -916,14 +935,16 @@ void SSDP_update() { } break; case ABORT: - _pending = false; _delay = 0; + _pending = false; + _delay = 0; break; } } } if (_pending && timeOutReached(_process_time + _delay)) { - _pending = false; _delay = 0; + _pending = false; + _delay = 0; SSDP_send(NONE); } else if ((_notify_time == 0) || timeOutReached(_notify_time + (SSDP_INTERVAL * 1000L))) { _notify_time = millis(); @@ -940,7 +961,6 @@ void SSDP_update() { # endif // if FEATURE_SSDP #endif // if defined(ESP8266) - // ******************************************************************************** // Return subnet range of WiFi. // ******************************************************************************** @@ -974,7 +994,6 @@ bool getSubnetRange(IPAddress& low, IPAddress& high) # include #endif // ifdef CORE_POST_2_5_0 - bool hasIPaddr() { if (useStaticIP()) { return true; } @@ -1000,10 +1019,11 @@ bool hasIPaddr() { bool useStaticIP() { #if FEATURE_ETHERNET + if (active_network_medium == NetworkMedium_t::Ethernet) { return ethUseStaticIP(); } - #endif + #endif // if FEATURE_ETHERNET return WiFiUseStaticIP(); } @@ -1011,10 +1031,11 @@ bool useStaticIP() { bool NetworkConnected(uint32_t timeout_ms) { #ifdef USES_ESPEASY_NOW + if (isESPEasy_now_only()) { return false; } -#endif +#endif // ifdef USES_ESPEASY_NOW if (timeout_ms > 500) { timeout_ms = 500; @@ -1073,6 +1094,7 @@ bool hostReachable(const IPAddress& ip) { } #if FEATURE_HTTP_CLIENT + bool connectClient(WiFiClient& client, const char *hostname, uint16_t port, uint32_t timeout_ms) { IPAddress ip; @@ -1090,14 +1112,15 @@ bool connectClient(WiFiClient& client, IPAddress ip, uint16_t port, uint32_t tim client.stop(); return false; } -#ifndef BUILD_NO_DEBUG +# ifndef BUILD_NO_DEBUG + if (loglevelActiveFor(LOG_LEVEL_DEBUG)) { addLog(LOG_LEVEL_DEBUG, strformat( - F("connectClient: '%s' port: %u"), - ip.toString().c_str(), - port)); + F("connectClient: '%s' port: %u"), + ip.toString().c_str(), + port)); } -#endif +# endif // ifndef BUILD_NO_DEBUG // In case of domain name resolution error result can be negative. // https://github.com/esp8266/Arduino/blob/18f643c7e2d6a0da9d26ff2b14c94e6536ab78c1/libraries/Ethernet/src/Dns.cpp#L44 @@ -1107,32 +1130,35 @@ bool connectClient(WiFiClient& client, IPAddress ip, uint16_t port, uint32_t tim delay(0); if (!connected) { -#ifndef BUILD_NO_DEBUG - if (loglevelActiveFor(LOG_LEVEL_DEBUG)) { - addLog(LOG_LEVEL_ERROR, strformat( - F("connectClient: connect failed to '%s' port: %u"), - ip.toString().c_str(), - port)); - } -#endif +# ifndef BUILD_NO_DEBUG + + if (loglevelActiveFor(LOG_LEVEL_DEBUG)) { + addLog(LOG_LEVEL_ERROR, strformat( + F("connectClient: connect failed to '%s' port: %u"), + ip.toString().c_str(), + port)); + } +# endif // ifndef BUILD_NO_DEBUG Scheduler.sendGratuitousARP_now(); client.stop(); // Make sure to start over without some stale connection } STOP_TIMER(CONNECT_CLIENT_STATS); -#if defined(ESP32) || defined(ARDUINO_ESP8266_RELEASE_2_3_0) || defined(ARDUINO_ESP8266_RELEASE_2_4_0) -#else +# if defined(ESP32) || defined(ARDUINO_ESP8266_RELEASE_2_3_0) || defined(ARDUINO_ESP8266_RELEASE_2_4_0) +# else if (connected) { client.keepAlive(); // Use default keep alive values } -#endif // if defined(ESP32) || defined(ARDUINO_ESP8266_RELEASE_2_3_0) || defined(ARDUINO_ESP8266_RELEASE_2_4_0) +# endif // if defined(ESP32) || defined(ARDUINO_ESP8266_RELEASE_2_3_0) || defined(ARDUINO_ESP8266_RELEASE_2_4_0) return connected; } + #endif // FEATURE_HTTP_CLIENT void scrubDNS() { #if FEATURE_ETHERNET + if (active_network_medium == NetworkMedium_t::Ethernet) { if (EthEventData.EthServicesInitialized()) { setDNS(0, EthEventData.dns0_cache); @@ -1140,7 +1166,8 @@ void scrubDNS() { } return; } - #endif + #endif // if FEATURE_ETHERNET + if (WiFiEventData.WiFiServicesInitialized()) { setDNS(0, WiFiEventData.dns0_cache); setDNS(1, WiFiEventData.dns1_cache); @@ -1148,48 +1175,57 @@ void scrubDNS() { } bool valid_DNS_address(const IPAddress& dns) { - return (/*dns.v4() != (uint32_t)0x00000000 && */ - dns != IPAddress((uint32_t)0xFD000000) && + return /*dns.v4() != (uint32_t)0x00000000 && */ + dns != IPAddress((uint32_t)0xFD000000) && #ifdef ESP32 - // Bug where IPv6 global prefix is set as DNS - // Global IPv6 prefixes currently start with 2xxx:: - (dns[0] & 0xF0) != 0x20 && -#endif - dns != INADDR_NONE); + + // Bug where IPv6 global prefix is set as DNS + // Global IPv6 prefixes currently start with 2xxx:: + (dns[0] & 0xF0) != 0x20 && +#endif // ifdef ESP32 + dns != INADDR_NONE; } bool setDNS(int index, const IPAddress& dns) { - if (index >= 2) return false; + if (index >= 2) { return false; } #ifdef ESP8266 - if(dns.isSet() && dns != WiFi.dnsIP(index)) { - dns_setserver(index, dns); - #ifndef BUILD_NO_DEBUG - if (loglevelActiveFor(LOG_LEVEL_INFO)) { - addLogMove(LOG_LEVEL_INFO, concat(F("IP : Set DNS: "), formatIP(dns))); - } - #endif - return true; - } - #endif - #ifdef ESP32 - ip_addr_t d; - d.type = IPADDR_TYPE_V4; - if (valid_DNS_address(dns) || dns == INADDR_NONE) { - // Set DNS0-Server - d.u_addr.ip4.addr = static_cast(dns); - const ip_addr_t* cur_dns = dns_getserver(index); - if (cur_dns != nullptr && cur_dns->u_addr.ip4.addr == d.u_addr.ip4.addr) { - // Still the same as before - return false; - } - dns_setserver(index, &d); + if (dns.isSet() && (dns != WiFi.dnsIP(index))) { + dns_setserver(index, dns); + # ifndef BUILD_NO_DEBUG + if (loglevelActiveFor(LOG_LEVEL_INFO)) { - addLogMove(LOG_LEVEL_INFO, concat(F("IP : Set DNS: "), formatIP(dns))); + addLogMove(LOG_LEVEL_INFO, strformat(F("IP : Set DNS(%d): %s"), index, formatIP(dns).c_str())); + } + # endif // ifndef BUILD_NO_DEBUG + return true; + } + #endif // ifdef ESP8266 + #ifdef ESP32 + + if (valid_DNS_address(dns)) { + const ip_addr_t*cur_dns = dns_getserver(index); + + if (cur_dns != nullptr) { + const IPAddress cur_dns_IP(cur_dns); + + if (valid_DNS_address(cur_dns_IP) && (cur_dns_IP == dns)) { + // Still the same as before + return false; + } + } + + // Set DNS-Server + ip_addr_t d; + dns.to_ip_addr_t(&d); + dns_setserver(index, &d); + + if (loglevelActiveFor(LOG_LEVEL_INFO)) { + addLogMove(LOG_LEVEL_INFO, strformat(F("IP : Set DNS(%d): %s"), index, formatIP(dns).c_str())); } return true; } - #endif + #endif // ifdef ESP32 return false; } @@ -1228,7 +1264,7 @@ bool hostReachable(const String& hostname) { } if (loglevelActiveFor(LOG_LEVEL_ERROR)) { - addLogMove(LOG_LEVEL_ERROR, concat(F("Hostname cannot be resolved: "), hostname)); + addLogMove(LOG_LEVEL_ERROR, concat(F("Hostname cannot be resolved: "), hostname)); } return false; } @@ -1388,6 +1424,7 @@ String extractParam(const String& authReq, const String& param, const char delim } #if FEATURE_HTTP_CLIENT + String getCNonce(const int len) { static const char alphanum[] = "0123456789" "ABCDEFGHIJKLMNOPQRSTUVWXYZ" @@ -1437,11 +1474,11 @@ String getDigestAuth(const String& authReq, // return authorization return strformat( F("Digest username=\"%s\"" - ", realm=\"%s\"" - ", nonce=\"%s\"" - ", uri=\"%s\"" - ", algorithm=\"MD5\", qop=auth, nc=%s, cnonce=\"%s\"" - ", response=\"%s\""), + ", realm=\"%s\"" + ", nonce=\"%s\"" + ", uri=\"%s\"" + ", algorithm=\"MD5\", qop=auth, nc=%s, cnonce=\"%s\"" + ", response=\"%s\""), username.c_str(), realm.c_str(), nonce.c_str(), @@ -1451,7 +1488,8 @@ String getDigestAuth(const String& authReq, md5.toString().c_str()); // response } -#ifndef BUILD_NO_DEBUG +# ifndef BUILD_NO_DEBUG + void log_http_result(const HTTPClient& http, const String & logIdentifier, const String & host, @@ -1471,8 +1509,8 @@ void log_http_result(const HTTPClient& http, } if (loglevelActiveFor(loglevel)) { - String log = strformat(F("HTTP : %s %s %s"), - logIdentifier.c_str(), host.c_str(), HttpMethod.c_str()); + String log = strformat(F("HTTP : %s %s %s"), + logIdentifier.c_str(), host.c_str(), HttpMethod.c_str()); if (!success) { log += F("failed "); @@ -1490,7 +1528,8 @@ void log_http_result(const HTTPClient& http, addLogMove(loglevel, log); } } -#endif + +# endif // ifndef BUILD_NO_DEBUG int http_authenticate(const String& logIdentifier, WiFiClient & client, @@ -1522,17 +1561,17 @@ int http_authenticate(const String& logIdentifier, postStr, must_check_reply); } - int httpCode = 0; + int httpCode = 0; const bool hasCredentials = !user.isEmpty() && !pass.isEmpty(); if (hasCredentials) { must_check_reply = true; http.setAuthorization(user.c_str(), pass.c_str()); } else { - http.setAuthorization(""); // Clear Basic authorization -#ifdef ESP32 + http.setAuthorization(""); // Clear Basic authorization +# ifdef ESP32 http.setAuthorizationType(""); // Default type is "Basic" -#endif +# endif } http.setTimeout(timeout); http.setUserAgent(get_user_agent_string()); @@ -1542,31 +1581,31 @@ int http_authenticate(const String& logIdentifier, http.setRedirectLimit(2); } - #ifdef MUSTFIX_CLIENT_TIMEOUT_IN_SECONDS + # ifdef MUSTFIX_CLIENT_TIMEOUT_IN_SECONDS // See: https://github.com/espressif/arduino-esp32/pull/6676 client.setTimeout((timeout + 500) / 1000); // in seconds!!!! Client *pClient = &client; pClient->setTimeout(timeout); - #else // ifdef MUSTFIX_CLIENT_TIMEOUT_IN_SECONDS - client.setTimeout(timeout); // in msec as it should be! - #endif // ifdef MUSTFIX_CLIENT_TIMEOUT_IN_SECONDS + # else // ifdef MUSTFIX_CLIENT_TIMEOUT_IN_SECONDS + client.setTimeout(timeout); // in msec as it should be! + # endif // ifdef MUSTFIX_CLIENT_TIMEOUT_IN_SECONDS // Add request header as fall back. // When adding another "accept" header, it may be interpreted as: // "if you have XXX, send it; or failing that, just give me what you've got." - http.addHeader(F("Accept"), F("*/*;q=0.1")); + http.addHeader(F("Accept"), F("*/*;q=0.1")); // Add client IP http.addHeader(F("X-Forwarded-For"), formatIP(NetworkLocalIP())); delay(0); scrubDNS(); -#if defined(CORE_POST_2_6_0) || defined(ESP32) +# if defined(CORE_POST_2_6_0) || defined(ESP32) http.begin(client, host, port, uri, false); // HTTP -#else // if defined(CORE_POST_2_6_0) || defined(ESP32) +# else // if defined(CORE_POST_2_6_0) || defined(ESP32) http.begin(client, host, port, uri); -#endif // if defined(CORE_POST_2_6_0) || defined(ESP32) +# endif // if defined(CORE_POST_2_6_0) || defined(ESP32) const char *keys[] = { "WWW-Authenticate" }; http.collectHeaders(keys, 1); @@ -1576,17 +1615,18 @@ int http_authenticate(const String& logIdentifier, String name, value; while (splitHeaders(headerpos, header, name, value)) { - // Disabled the check to exclude "Authorization", due to: + // Disabled the check to exclude "Authorization", due to: // https://github.com/letscontrolit/ESPEasy/issues/4364 // Check was added for: https://github.com/letscontrolit/ESPEasy/issues/4355 // However, I doubt this was the actual bug. More likely the supplied credential strings were not entirely empty for whatever reason. // // Work-around to not add Authorization header since the HTTPClient code // only ignores this when base64Authorication is set. - -// if (!name.equalsIgnoreCase(F("Authorization"))) { - http.addHeader(name, value); -// } + + // if (!name.equalsIgnoreCase(F("Authorization"))) { + http.addHeader(name, value); + + // } } } @@ -1607,18 +1647,18 @@ int http_authenticate(const String& logIdentifier, addLogMove(LOG_LEVEL_INFO, concat(F("HTTP : Start Digest Authorization for "), host)); } - http.setAuthorization(""); // Clear Basic authorization -#ifdef ESP32 + http.setAuthorization(""); // Clear Basic authorization +# ifdef ESP32 http.setAuthorizationType(""); // Default type is "Basic" and "Digest" is already part of the string generated by getDigestAuth() -#endif +# endif const String authorization = getDigestAuth(authReq, user, pass, F("GET"), uri, 1); http.end(); -#if defined(CORE_POST_2_6_0) || defined(ESP32) +# if defined(CORE_POST_2_6_0) || defined(ESP32) http.begin(client, host, port, uri, false); // HTTP, not HTTPS -#else // if defined(CORE_POST_2_6_0) || defined(ESP32) +# else // if defined(CORE_POST_2_6_0) || defined(ESP32) http.begin(client, host, port, uri); -#endif // if defined(CORE_POST_2_6_0) || defined(ESP32) +# endif // if defined(CORE_POST_2_6_0) || defined(ESP32) http.addHeader(F("Authorization"), authorization); @@ -1643,50 +1683,58 @@ int http_authenticate(const String& logIdentifier, // Generate event with the HTTP return code // e.g. http#hostname=401 eventQueue.addMove(strformat(F("http#%s=%d"), host.c_str(), httpCode)); - - #if FEATURE_THINGSPEAK_EVENT - // Generate event with the response of a - // thingspeak request (https://de.mathworks.com/help/thingspeak/readlastfieldentry.html & - // https://de.mathworks.com/help/thingspeak/readdata.html) - // e.g. command for a specific field: "sendToHTTP,api.thingspeak.com,80,/channels/1637928/fields/5/last.csv" - // command for all fields: "sendToHTTP,api.thingspeak.com,80,/channels/1637928/feeds/last.csv" - // where first eventvalue is the channel number and the second to the nineth event values - // are the field values - // Example of the event: "EVENT: ThingspeakReply=1637928,5,24.2,12,900,..." - // ^ ^ └------┬------┘ - // channel number ┘ | └ received values - // field number (only available for a "single-value-event") - // In rules you can grep the reply by "On ThingspeakReply Do ..." - //----------------------------------------------------------------------------------------------------------------------------- - // 2024-02-05 - Added the option to get a single value of a field or all values of a channel at a certain time (not only the last entry) - // Examples: - // Single channel: "sendtohttp,api.thingspeak.com,80,channels/1637928/fields/1.csv?end=2024-01-01%2023:59:00&results=1" - // => gets the value of field 1 at (or the last entry before) 23:59:00 of the channel 1637928 - // All channels: "sendtohttp,api.thingspeak.com,80,channels/1637928/feeds.csv?end=2024-01-01%2023:59:00&results=1" - // => gets the value of each field of the channel 1637928 at (or the last entry before) 23:59:00 - //----------------------------------------------------------------------------------------------------------------------------- - if (httpCode == 200 && equals(host, F("api.thingspeak.com")) && (uri.endsWith(F("/last.csv")) || (uri.indexOf(F("results=1")) >= 0 && uri.indexOf(F(".csv")) >= 0))){ + # if FEATURE_THINGSPEAK_EVENT + + // Generate event with the response of a + // thingspeak request (https://de.mathworks.com/help/thingspeak/readlastfieldentry.html & + // https://de.mathworks.com/help/thingspeak/readdata.html) + // e.g. command for a specific field: "sendToHTTP,api.thingspeak.com,80,/channels/1637928/fields/5/last.csv" + // command for all fields: "sendToHTTP,api.thingspeak.com,80,/channels/1637928/feeds/last.csv" + // where first eventvalue is the channel number and the second to the nineth event values + // are the field values + // Example of the event: "EVENT: ThingspeakReply=1637928,5,24.2,12,900,..." + // ^ ^ └------┬------┘ + // channel number ┘ | └ received values + // field number (only available for a "single-value-event") + // In rules you can grep the reply by "On ThingspeakReply Do ..." + // ----------------------------------------------------------------------------------------------------------------------------- + // 2024-02-05 - Added the option to get a single value of a field or all values of a channel at a certain time (not only the last entry) + // Examples: + // Single channel: "sendtohttp,api.thingspeak.com,80,channels/1637928/fields/1.csv?end=2024-01-01%2023:59:00&results=1" + // => gets the value of field 1 at (or the last entry before) 23:59:00 of the channel 1637928 + // All channels: "sendtohttp,api.thingspeak.com,80,channels/1637928/feeds.csv?end=2024-01-01%2023:59:00&results=1" + // => gets the value of each field of the channel 1637928 at (or the last entry before) 23:59:00 + // ----------------------------------------------------------------------------------------------------------------------------- + + if ((httpCode == 200) && equals(host, + F("api.thingspeak.com")) && + (uri.endsWith(F("/last.csv")) || ((uri.indexOf(F("results=1")) >= 0) && (uri.indexOf(F(".csv")) >= 0)))) { String result = http.getString(); result.replace(' ', '_'); // if using a single field with a certain time, the result contains a space and would break the code const int posTimestamp = result.lastIndexOf(':'); - if (posTimestamp >= 0){ + + if (posTimestamp >= 0) { result = parseStringToEndKeepCase(result.substring(posTimestamp), 3); - if (uri.indexOf(F("fields")) >= 0){ // when there is a single field call add the field number before the value - result = parseStringKeepCase(uri, 4, '/').substring(0, 1) + "," + result; // since the field number is always the fourth part of the url and is always a single digit, we can use this to extact the fieldnumber + + if (uri.indexOf(F("fields")) >= 0) { // when there is a single field call add the field + // number before the value + result = parseStringKeepCase(uri, 4, '/').substring(0, 1) + "," + result; // since the field number is always the fourth part of + // the url and is always a single digit, we can use this + // to extact the fieldnumber } eventQueue.addMove(strformat( - F("ThingspeakReply=%s,%s"), - parseStringKeepCase(uri, 2, '/').c_str(), - result.c_str())); + F("ThingspeakReply=%s,%s"), + parseStringKeepCase(uri, 2, '/').c_str(), + result.c_str())); } } - #endif + # endif // if FEATURE_THINGSPEAK_EVENT } -#ifndef BUILD_NO_DEBUG +# ifndef BUILD_NO_DEBUG log_http_result(http, logIdentifier, host + ':' + port, HttpMethod, httpCode, EMPTY_STRING); -#endif +# endif return httpCode; } @@ -1704,6 +1752,7 @@ String send_via_http(const String& logIdentifier, bool must_check_reply) { WiFiClient client; HTTPClient http; + http.setReuse(false); httpCode = http_authenticate( @@ -1725,19 +1774,22 @@ String send_via_http(const String& logIdentifier, if ((httpCode > 0) && must_check_reply) { response = http.getString(); -#ifndef BUILD_NO_DEBUG +# ifndef BUILD_NO_DEBUG + if (!response.isEmpty()) { log_http_result(http, logIdentifier, host, HttpMethod, httpCode, response); } -#endif +# endif // ifndef BUILD_NO_DEBUG } http.end(); + // http.end() does not call client.stop() if it is no longer connected. - // However the client may still keep its internal state which may prevent + // However the client may still keep its internal state which may prevent // future connections to the same host until there has been a connection to another host inbetween. - client.stop(); + client.stop(); return response; } + #endif // FEATURE_HTTP_CLIENT #if FEATURE_DOWNLOAD @@ -1779,7 +1831,7 @@ bool start_downloadFile(WiFiClient & client, # ifndef BUILD_NO_DEBUG if (loglevelActiveFor(LOG_LEVEL_DEBUG)) { - addLogMove(LOG_LEVEL_DEBUG, strformat(F("downloadFile: URL: %s decoded: %s:%d%s"), + addLogMove(LOG_LEVEL_DEBUG, strformat(F("downloadFile: URL: %s decoded: %s:%d%s"), url.c_str(), host.c_str(), port, uri.c_str())); } # endif // ifndef BUILD_NO_DEBUG @@ -1807,7 +1859,7 @@ bool start_downloadFile(WiFiClient & client, ); if (httpCode != HTTP_CODE_OK) { - error = strformat(F("HTTP code: %d %s"), httpCode, url.c_str()); + error = strformat(F("HTTP code: %d %s"), httpCode, url.c_str()); addLog(LOG_LEVEL_ERROR, error); http.end(); @@ -1820,6 +1872,7 @@ bool start_downloadFile(WiFiClient & client, bool downloadFile(const String& url, String file_save, const String& user, const String& pass, String& error) { WiFiClient client; HTTPClient http; + http.setReuse(false); if (!start_downloadFile(client, http, url, file_save, user, pass, error)) { @@ -1827,7 +1880,7 @@ bool downloadFile(const String& url, String file_save, const String& user, const } if (fileExists(file_save)) { - error = concat(F("File exists: "), file_save); + error = concat(F("File exists: "), file_save); addLog(LOG_LEVEL_ERROR, error); http.end(); client.stop(); @@ -1860,7 +1913,7 @@ bool downloadFile(const String& url, String file_save, const String& user, const timeout = millis() + DOWNLOAD_FILE_TIMEOUT; if (f.write(buff, c) != c) { - error = strformat(F("Error saving file: %s %d Bytes written"), file_save.c_str(), bytesWritten); + error = strformat(F("Error saving file: %s %d Bytes written"), file_save.c_str(), bytesWritten); addLog(LOG_LEVEL_ERROR, error); http.end(); client.stop(); @@ -1872,7 +1925,7 @@ bool downloadFile(const String& url, String file_save, const String& user, const } if (timeOutReached(timeout)) { - error = concat(F("Timeout: "), file_save); + error = concat(F("Timeout: "), file_save); addLog(LOG_LEVEL_ERROR, error); delay(0); http.end(); @@ -1892,7 +1945,7 @@ bool downloadFile(const String& url, String file_save, const String& user, const } http.end(); client.stop(); - error = concat(F("Failed to open file for writing: "), file_save); + error = concat(F("Failed to open file for writing: "), file_save); addLog(LOG_LEVEL_ERROR, error); return false; } @@ -1900,18 +1953,20 @@ bool downloadFile(const String& url, String file_save, const String& user, const bool downloadFirmware(String filename, String& error) { String baseurl, user, pass; + # if FEATURE_CUSTOM_PROVISIONING MakeProvisioningSettings(ProvisioningSettings); if (ProvisioningSettings.get()) { loadProvisioningSettings(*ProvisioningSettings); + if (!ProvisioningSettings->allowedFlags.allowFetchFirmware) { error = F("Not Allowed"); return false; } baseurl = ProvisioningSettings->url; - user = ProvisioningSettings->user; - pass = ProvisioningSettings->pass; + user = ProvisioningSettings->user; + pass = ProvisioningSettings->pass; } # endif // if FEATURE_CUSTOM_PROVISIONING @@ -1924,6 +1979,7 @@ bool downloadFirmware(const String& url, String& file_save, String& user, String { WiFiClient client; HTTPClient http; + error.clear(); if (!start_downloadFile(client, http, url, file_save, user, pass, error)) { @@ -1954,8 +2010,8 @@ bool downloadFirmware(const String& url, String& file_save, String& user, String timeout = millis() + DOWNLOAD_FILE_TIMEOUT; if (Update.write(buff, c) != c) { - error = strformat(F("Error saving firmware update: %s %d Bytes written"), - file_save.c_str(), bytesWritten); + error = strformat(F("Error saving firmware update: %s %d Bytes written"), + file_save.c_str(), bytesWritten); break; } bytesWritten += c; @@ -1964,7 +2020,7 @@ bool downloadFirmware(const String& url, String& file_save, String& user, String } if (timeOutReached(timeout)) { - error = concat(F("Timeout: "), file_save); + error = concat(F("Timeout: "), file_save); break; } @@ -1983,29 +2039,45 @@ bool downloadFirmware(const String& url, String& file_save, String& user, String } uint8_t errorcode = 0; + if (!Update.end()) { errorcode = Update.getError(); -#ifdef ESP32 - const __FlashStringHelper * err_fstr = F("Unknown"); - switch (errorcode) { - case UPDATE_ERROR_OK: err_fstr = F("OK"); break; - case UPDATE_ERROR_WRITE: err_fstr = F("WRITE"); break; - case UPDATE_ERROR_ERASE: err_fstr = F("ERASE"); break; - case UPDATE_ERROR_READ: err_fstr = F("READ"); break; - case UPDATE_ERROR_SPACE: err_fstr = F("SPACE"); break; - case UPDATE_ERROR_SIZE: err_fstr = F("SIZE"); break; - case UPDATE_ERROR_STREAM: err_fstr = F("STREAM"); break; - case UPDATE_ERROR_MD5: err_fstr = F("MD5"); break; - case UPDATE_ERROR_MAGIC_BYTE: err_fstr = F("MAGIC_BYTE"); break; - case UPDATE_ERROR_ACTIVATE: err_fstr = F("ACTIVATE"); break; - case UPDATE_ERROR_NO_PARTITION: err_fstr = F("NO_PARTITION"); break; - case UPDATE_ERROR_BAD_ARGUMENT: err_fstr = F("BAD_ARGUMENT"); break; - case UPDATE_ERROR_ABORT: err_fstr = F("ABORT"); break; +# ifdef ESP32 + const __FlashStringHelper *err_fstr = F("Unknown"); + + switch (errorcode) + { + case UPDATE_ERROR_OK: err_fstr = F("OK"); + break; + case UPDATE_ERROR_WRITE: err_fstr = F("WRITE"); + break; + case UPDATE_ERROR_ERASE: err_fstr = F("ERASE"); + break; + case UPDATE_ERROR_READ: err_fstr = F("READ"); + break; + case UPDATE_ERROR_SPACE: err_fstr = F("SPACE"); + break; + case UPDATE_ERROR_SIZE: err_fstr = F("SIZE"); + break; + case UPDATE_ERROR_STREAM: err_fstr = F("STREAM"); + break; + case UPDATE_ERROR_MD5: err_fstr = F("MD5"); + break; + case UPDATE_ERROR_MAGIC_BYTE: err_fstr = F("MAGIC_BYTE"); + break; + case UPDATE_ERROR_ACTIVATE: err_fstr = F("ACTIVATE"); + break; + case UPDATE_ERROR_NO_PARTITION: err_fstr = F("NO_PARTITION"); + break; + case UPDATE_ERROR_BAD_ARGUMENT: err_fstr = F("BAD_ARGUMENT"); + break; + case UPDATE_ERROR_ABORT: err_fstr = F("ABORT"); + break; } error += concat(F(" Error: "), err_fstr); -#else +# else // ifdef ESP32 error += concat(F(" Error: "), errorcode); -#endif +# endif // ifdef ESP32 } else { if (Settings.UseRules) { eventQueue.addMove(concat(F("ProvisionFirmware#success="), file_save)); @@ -2014,6 +2086,7 @@ bool downloadFirmware(const String& url, String& file_save, String& user, String } backgroundtasks(); + if (loglevelActiveFor(LOG_LEVEL_ERROR)) { addLog(LOG_LEVEL_ERROR, concat(F("Failed update firmware: "), error)); } @@ -2048,4 +2121,3 @@ String joinUrlFilename(const String& url, String& filename) } #endif // if FEATURE_DOWNLOAD - From 3741f7f24f8e97c3c26445e07445240b5ebf942f Mon Sep 17 00:00:00 2001 From: TD-er Date: Mon, 6 Jan 2025 17:27:28 +0100 Subject: [PATCH 018/564] [WiFi] Fix start AP for setup --- .../ESPEasyCore/ESPEasyWiFi_state_machine.cpp | 73 +++++++++++++-- .../ESPEasyWifi_abstracted_ESP8266.cpp | 93 ------------------- src/src/Helpers/WiFi_AP_CandidatesList.cpp | 1 + 3 files changed, 66 insertions(+), 101 deletions(-) diff --git a/src/src/ESPEasyCore/ESPEasyWiFi_state_machine.cpp b/src/src/ESPEasyCore/ESPEasyWiFi_state_machine.cpp index 16ce48675..3c1d10172 100644 --- a/src/src/ESPEasyCore/ESPEasyWiFi_state_machine.cpp +++ b/src/src/ESPEasyCore/ESPEasyWiFi_state_machine.cpp @@ -25,6 +25,7 @@ namespace wifi { # define WIFI_STATE_MACHINE_STA_CONNECTING_TIMEOUT 10000 # define WIFI_STATE_MACHINE_STA_AP_SCANNING_TIMEOUT 10000 # define WIFI_STATE_MACHINE_STA_SCANNING_TIMEOUT 10000 + # define WIFI_STATE_MACHINE_AP_ONLY_TIMEOUT 60000 void ESPEasyWiFi_t::setup() { // TODO TD-er: Must maybe also call 'disable()' first? @@ -74,6 +75,12 @@ void ESPEasyWiFi_t::loop() // setState(WiFiState_e::IdleWaiting, 100); break; case WiFiState_e::AP_only: + + if (WiFi_AP_Candidates.hasCandidates() || + (_state_timeout.timeReached() && + (WiFi.softAPgetStationNum() == 0))) { + setState(WiFiState_e::IdleWaiting, 100); + } break; case WiFiState_e::IdleWaiting: @@ -81,25 +88,68 @@ void ESPEasyWiFi_t::loop() // Do we have candidate to connect to ? if (WiFi_AP_Candidates.hasCandidates()) { setState(WiFiState_e::STA_Connecting, WIFI_STATE_MACHINE_STA_CONNECTING_TIMEOUT); - } else if (WifiIsAP(WiFi.getMode())) { - // TODO TD-er: Must check if any client is connected. - // If not, then we can disable AP mode and switch to WiFiState_e::STA_Scanning - setState(WiFiState_e::STA_AP_Scanning, WIFI_STATE_MACHINE_STA_AP_SCANNING_TIMEOUT); - } else { - setState(WiFiState_e::STA_Scanning, WIFI_STATE_MACHINE_STA_SCANNING_TIMEOUT); + } else if (WiFi_AP_Candidates.scanComplete() == 0) { + if (WifiIsAP(WiFi.getMode())) { + // TODO TD-er: Must check if any client is connected. + // If not, then we can disable AP mode and switch to WiFiState_e::STA_Scanning + setState(WiFiState_e::STA_AP_Scanning, WIFI_STATE_MACHINE_STA_AP_SCANNING_TIMEOUT); + } else { + setState(WiFiState_e::STA_Scanning, WIFI_STATE_MACHINE_STA_SCANNING_TIMEOUT); + } + } else if (!WiFi_AP_Candidates.hasCandidateCredentials() || + !Settings.DoNotStartAP()) { + if (!WiFi_AP_Candidates.hasCandidateCredentials() && + !WiFiEventData.warnedNoValidWiFiSettings) + { + addLog(LOG_LEVEL_ERROR, F("WIFI : No valid wifi settings")); + WiFiEventData.warnedNoValidWiFiSettings = true; + } + + WiFiEventData.last_wifi_connect_attempt_moment.clear(); + WiFiEventData.wifi_connect_attempt = 1; + WiFiEventData.wifiConnectAttemptNeeded = false; + setState(WiFiState_e::AP_only, WIFI_STATE_MACHINE_AP_ONLY_TIMEOUT); } } break; case WiFiState_e::STA_Scanning: case WiFiState_e::STA_AP_Scanning: + { + auto scanCompleteStatus = WiFi.scanComplete(); - if (_state_timeout.timeReached() || (WiFi.scanComplete() >= 0)) { + if (scanCompleteStatus >= 0) { + WiFi_AP_Candidates.load_knownCredentials(); +# if !FEATURE_ESP8266_DIRECT_WIFI_SCAN + WiFi_AP_Candidates.process_WiFiscan(scanCompleteStatus); +# endif + addLog(LOG_LEVEL_INFO, strformat( + F("WiFi : Scan done, found %d APs"), + WiFi_AP_Candidates.scanComplete())); + } else if (scanCompleteStatus == -2) { // WIFI_SCAN_FAILED + addLog(LOG_LEVEL_ERROR, F("WiFi : Scan failed")); + WiFi.scanDelete(); setState(WiFiState_e::WiFiOFF, 100); + WiFiEventData.processedScanDone = true; } + if (_state_timeout.timeReached() || (scanCompleteStatus >= 0)) { + WiFi.scanDelete(); + + setState(WiFiState_e::WiFiOFF, 100); + + if (_state_timeout.timeReached()) { +# ifndef BUILD_NO_DEBUG + addLog(LOG_LEVEL_ERROR, F("WiFi : Scan Running Timeout")); +# endif + } + WiFiEventData.processedScanDone = true; + + } + break; + // Check if scanning is finished // When scanning per channel, call for scanning next channel - break; + } case WiFiState_e::STA_Connecting: case WiFiState_e::STA_Reconnecting: @@ -154,6 +204,11 @@ void ESPEasyWiFi_t::setState(WiFiState_e newState, uint32_t timeout) { concat(F(" timeout: "), timeout)); } + if (_state == WiFiState_e::AP_only) { + setAPinternal(false); + setAP(false); + } + if (timeout == 0) { _state_timeout.clear(); @@ -173,8 +228,10 @@ void ESPEasyWiFi_t::setState(WiFiState_e newState, uint32_t timeout) { break; case WiFiState_e::WiFiOFF: // TODO TD-er: Must cancel all and turn off WiFi. + setSTA_AP(false, false); break; case WiFiState_e::AP_only: + setAPinternal(true); break; case WiFiState_e::IdleWaiting: // Do nothing here as we're waiting till the timeout is over diff --git a/src/src/ESPEasyCore/ESPEasyWifi_abstracted_ESP8266.cpp b/src/src/ESPEasyCore/ESPEasyWifi_abstracted_ESP8266.cpp index ceb659e7b..361441c1a 100644 --- a/src/src/ESPEasyCore/ESPEasyWifi_abstracted_ESP8266.cpp +++ b/src/src/ESPEasyCore/ESPEasyWifi_abstracted_ESP8266.cpp @@ -112,99 +112,6 @@ bool setWifiMode(WiFiMode_t new_mode) } - /* - if (cur_mode == WIFI_OFF) { - #if defined(ESP32) - // Needs to be set while WiFi is off - WiFi.hostname(NetworkCreateRFCCompliantHostname()); - #endif - WiFiEventData.markWiFiTurnOn(); - } - if (new_mode != WIFI_OFF) { - #ifdef ESP8266 - // See: https://github.com/esp8266/Arduino/issues/6172#issuecomment-500457407 - WiFi.forceSleepWake(); // Make sure WiFi is really active. - #endif - delay(100); - } else { - WifiDisconnect(); - // delay(100); - processDisconnect(); - WiFiEventData.clear_processed_flags(); - } - - addLog(LOG_LEVEL_INFO, concat(F("WIFI : Set WiFi to "), getWifiModeString(new_mode))); - - int retry = 2; - while (!WiFi.mode(new_mode) && retry > 0) { - delay(100); - --retry; - } - retry = 2; - while (WiFi.getMode() != new_mode && retry > 0) { - addLog(LOG_LEVEL_INFO, F("WIFI : mode not yet set")); - delay(100); - --retry; - } - if (WiFi.getMode() != new_mode) { - addLog(LOG_LEVEL_ERROR, F("WIFI : Cannot set mode!!!!!")); - return false; - } - - - if (new_mode == WIFI_OFF) { - - // FIXME TD-er: Is this correct to mark Turn ON ???? - WiFiEventData.markWiFiTurnOn(); - #if defined(ESP32) - // Needs to be set while WiFi is off - WiFi.hostname(NetworkCreateRFCCompliantHostname()); - #endif - delay(100); - #if defined(ESP32) - esp_wifi_set_ps(WIFI_PS_NONE); - // esp_wifi_set_ps(WIFI_PS_MAX_MODEM); - #endif - #ifdef ESP8266 - WiFi.forceSleepBegin(); - #endif // ifdef ESP8266 - delay(1); - } else { - if (cur_mode == WIFI_OFF) { - registerWiFiEventHandler(); - } - // Only set power mode when AP is not enabled - // When AP is enabled, the sleep mode is already set to WIFI_NONE_SLEEP - if (! WifiIsAP(new_mode)) { - if (Settings.WifiNoneSleep()) { - setWiFiNoneSleep(); - } else if (Settings.EcoPowerMode()) { - setWiFiEcoPowerMode(); - } else { - // Default - setWiFiDefaultPowerMode(); - } - } - #if FEATURE_SET_WIFI_TX_PWR - SetWiFiTXpower(); - #endif - if ( WifiIsSTA(new_mode)) { - // WiFi.setAutoConnect(Settings.SDK_WiFi_autoreconnect()); - WiFi.setAutoReconnect(Settings.SDK_WiFi_autoreconnect()); - } - delay(100); // Must allow for some time to init. - } - const bool new_mode_AP_enabled = WifiIsAP(new_mode); - - if ( WifiIsAP(cur_mode) && !new_mode_AP_enabled) { - eventQueue.add(F("WiFi#APmodeDisabled")); - } - - if ( WifiIsAP(cur_mode) != new_mode_AP_enabled) { - // Mode has changed - setAPinternal(new_mode_AP_enabled); - } - */ # if FEATURE_MDNS # ifdef ESP8266 diff --git a/src/src/Helpers/WiFi_AP_CandidatesList.cpp b/src/src/Helpers/WiFi_AP_CandidatesList.cpp index 15681f954..5c3dbe156 100644 --- a/src/src/Helpers/WiFi_AP_CandidatesList.cpp +++ b/src/src/Helpers/WiFi_AP_CandidatesList.cpp @@ -92,6 +92,7 @@ void WiFi_AP_CandidatesList::force_reload() { clearCache(); RTC.clearLastWiFi(); // Invalidate the RTC WiFi data. candidates.clear(); + load_knownCredentials(); loadCandidatesFromScanned(); } From bbc99e2c051eeab1ef0ae6de5b59712c7c14e77a Mon Sep 17 00:00:00 2001 From: TD-er Date: Mon, 6 Jan 2025 18:04:57 +0100 Subject: [PATCH 019/564] [WiFi] Call WiFi_AP_Candidates.force_reload() on saving security setting --- src/src/Helpers/ESPEasy_Storage.cpp | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/src/src/Helpers/ESPEasy_Storage.cpp b/src/src/Helpers/ESPEasy_Storage.cpp index fb6c949f6..59bc4eddf 100644 --- a/src/src/Helpers/ESPEasy_Storage.cpp +++ b/src/src/Helpers/ESPEasy_Storage.cpp @@ -708,12 +708,14 @@ String SaveSecuritySettings(bool forFactoryReset) { sizeof(SecuritySettings)); // Security settings are saved, may be update of WiFi settings or hostname. - if (!forFactoryReset && !NetworkConnected()) { + if (!forFactoryReset) { if (SecuritySettings.hasWiFiCredentials() && (active_network_medium == NetworkMedium_t::WIFI)) { - WiFiEventData.wifiConnectAttemptNeeded = true; WiFi_AP_Candidates.force_reload(); // Force reload of the credentials and found APs from the last scan - resetWiFi(); - AttemptWiFiConnect(); + if (!NetworkConnected()) { + WiFiEventData.wifiConnectAttemptNeeded = true; + resetWiFi(); + AttemptWiFiConnect(); + } } } } From 079d58d779e776f00aa382a7897def78979e0ab9 Mon Sep 17 00:00:00 2001 From: TD-er Date: Tue, 28 Jan 2025 02:38:55 +0100 Subject: [PATCH 020/564] [PSRAM] Use PSRAM for logs, events and controller queues --- src/src/DataStructs/EventQueue.cpp | 13 ++++-- src/src/DataStructs/LogEntry.cpp | 2 +- src/src/Helpers/Memory.cpp | 70 +++++++++++++++++++++++++++++ src/src/Helpers/Memory.h | 5 ++- src/src/Helpers/StringConverter.cpp | 21 ++------- 5 files changed, 88 insertions(+), 23 deletions(-) diff --git a/src/src/DataStructs/EventQueue.cpp b/src/src/DataStructs/EventQueue.cpp index 0b975046f..06a0b4e54 100644 --- a/src/src/DataStructs/EventQueue.cpp +++ b/src/src/DataStructs/EventQueue.cpp @@ -11,18 +11,21 @@ void EventQueueStruct::add(const String& event, bool deduplicate) { if (!deduplicate || !isDuplicate(event)) { - #ifdef USE_SECOND_HEAP +#if defined(USE_SECOND_HEAP) || defined(ESP32) String tmp; reserve_special(tmp, event.length()); tmp = event; +#ifdef USE_SECOND_HEAP // Do not add to the list while on 2nd heap HeapSelectDram ephemeral; +#endif + _eventQueue.emplace_back(std::move(tmp)); - #else +#else _eventQueue.push_back(event); - #endif // ifdef USE_SECOND_HEAP +#endif } } @@ -38,12 +41,14 @@ void EventQueueStruct::addMove(String&& event, bool deduplicate) if (!event.length()) { return; } if (!deduplicate || !isDuplicate(event)) { - #ifdef USE_SECOND_HEAP + #if defined(USE_SECOND_HEAP) || defined(ESP32) String tmp; move_special(tmp, std::move(event)); + #ifdef USE_SECOND_HEAP // Do not add to the list while on 2nd heap HeapSelectDram ephemeral; + #endif _eventQueue.emplace_back(std::move(tmp)); #else _eventQueue.emplace_back(std::move(event)); diff --git a/src/src/DataStructs/LogEntry.cpp b/src/src/DataStructs/LogEntry.cpp index 90cb825dc..99348ce80 100644 --- a/src/src/DataStructs/LogEntry.cpp +++ b/src/src/DataStructs/LogEntry.cpp @@ -48,7 +48,7 @@ bool LogEntry_t::add(const uint8_t loglevel, String&& line) // Need to make a substring, which is a new allocation, on the 2nd heap HeapSelectIram ephemeral; #endif // ifdef USE_SECOND_HEAP - _message = std::move(line.substring(0, LOG_STRUCT_MESSAGE_SIZE - 1)); + _message = move_special(line.substring(0, LOG_STRUCT_MESSAGE_SIZE - 1)); } else { move_special(_message, std::move(line)); } diff --git a/src/src/Helpers/Memory.cpp b/src/src/Helpers/Memory.cpp index b4749f11c..173e49e94 100644 --- a/src/src/Helpers/Memory.cpp +++ b/src/src/Helpers/Memory.cpp @@ -197,3 +197,73 @@ void* special_calloc(size_t num, size_t size) { return res; } + + +#ifdef ESP8266 +bool String_reserve_special(String& str, size_t size) { + if (str.length() >= size) { + // Nothing needs to be done + return true; + } + #ifdef USE_SECOND_HEAP + if (size >= 32) { + // Only try to store larger strings here as those tend to be kept for a longer period. + HeapSelectIram ephemeral; + // String does round up to nearest multiple of 16 bytes, so no need to round up to multiples of 32 bit here + if (str.reserve(size)) { + return true; + } + } + #endif + return str.reserve(size); +} +#endif + +#ifdef ESP32 + +// Special class to get access to the protected String functions +// This class only has a constructor which will perform +// the requested allocation in PSRAM when possible +class PSRAM_String : public String { + public: + PSRAM_String(size_t size) : String() { + if (size > capacity() && UsePSRAM()) { + size_t newSize = (size + 16) & (~0xf); + void *ptr = special_calloc(1, newSize); + if (ptr != nullptr) { + setSSO(false); + setBuffer((char *)ptr); + setCapacity(newSize - 1); + setLen(newSize - 1); // TD-er: Not sure if needed? + } + } + } +}; + + +bool String_reserve_special(String& str, size_t size) { + if (str.length() < size) { + // As we like to move this to PSRAM, it also makes sense + // to do this when the length equals size + PSRAM_String psram_str(size); + + if (psram_str.length() == 0) { + return str.reserve(size); + } + + // Copy any existing content + String tmp(std::move(str)); + + // Move the newly allocated buffer to a tmp String object. + // Needs to be empty, so the buffer is moved. + // N.B. String::clear() = String::setlen(0)) + str = std::move(psram_str); + str.clear(); + + if (tmp.length()) { + str = tmp; + } + } + return true; +} +#endif diff --git a/src/src/Helpers/Memory.h b/src/src/Helpers/Memory.h index e09ce027d..06d1a3045 100644 --- a/src/src/Helpers/Memory.h +++ b/src/src/Helpers/Memory.h @@ -55,4 +55,7 @@ unsigned long getMaxFreeBlock(); void *special_malloc(uint32_t size); void *special_realloc(void *ptr, size_t size); -void *special_calloc(size_t num, size_t size); \ No newline at end of file +void *special_calloc(size_t num, size_t size); + + +bool String_reserve_special(String& str, size_t size); \ No newline at end of file diff --git a/src/src/Helpers/StringConverter.cpp b/src/src/Helpers/StringConverter.cpp index 7f312beaf..6fb63f445 100644 --- a/src/src/Helpers/StringConverter.cpp +++ b/src/src/Helpers/StringConverter.cpp @@ -90,6 +90,9 @@ void move_special(String& dest, String&& source) { } #endif // ifdef USE_SECOND_HEAP dest = std::move(source); + #ifdef ESP32 + reserve_special(dest, dest.length()); + #endif } String move_special(String&& source) { @@ -100,23 +103,7 @@ String move_special(String&& source) { bool reserve_special(String& str, size_t size) { - if (str.length() >= size) { - // Nothing needs to be done - return true; - } - // FIXME TD-er: Should also use this for ESP32 with PSRAM to allocate on PSRAM - #ifdef USE_SECOND_HEAP - if (size >= 32) { - // Only try to store larger strings here as those tend to be kept for a longer period. - HeapSelectIram ephemeral; - // String does round up to nearest multiple of 16 bytes, so no need to round up to multiples of 32 bit here - if (str.reserve(size)) { - return true; - } - } - #endif - return str.reserve(size); - // TD-er: should we also log here? + return String_reserve_special(str, size); } From 02f070c9e97ad40e06db5c1ca045c240e37b179e Mon Sep 17 00:00:00 2001 From: TD-er Date: Tue, 28 Jan 2025 14:49:27 +0100 Subject: [PATCH 021/564] [Memory] Fix freeing of allocated strings --- src/_C008.cpp | 2 +- src/_C010.cpp | 2 +- src/_C015.cpp | 2 +- src/_C016.cpp | 4 +-- src/_P055_Chiming.ino | 2 +- src/src/Commands/InternalCommands.cpp | 2 +- .../Controller_struct/C018_data_struct.cpp | 10 ++++---- .../ExtendedControllerCredentialsStruct.cpp | 3 ++- src/src/DataStructs/LogEntry.cpp | 7 +++--- src/src/DataStructs/LogStruct.h | 2 +- src/src/DataStructs/Modbus.cpp | 3 ++- src/src/DataStructs/RulesEventCache.cpp | 4 +++ src/src/DataStructs/Web_StreamingBuffer.cpp | 2 +- src/src/ESPEasyCore/ESPEasy_Log.cpp | 25 ++++++++++++------- src/src/Globals/RamTracker.cpp | 6 ++--- src/src/Helpers/Audio.cpp | 3 ++- src/src/Helpers/ESPEasy_checks.cpp | 2 +- src/src/Helpers/Memory.h | 6 ++++- src/src/Helpers/Modbus_RTU.cpp | 2 +- src/src/Helpers/StringConverter.cpp | 10 ++++++-- src/src/Helpers/StringConverter.h | 4 +++ src/src/Helpers/StringParser.cpp | 4 +-- src/src/Helpers/WebServer_commandHelper.cpp | 2 +- src/src/Helpers/_CPlugin_Helper.cpp | 3 ++- src/src/PluginStructs/P020_data_struct.cpp | 2 +- src/src/PluginStructs/P044_data_struct.cpp | 2 +- src/src/PluginStructs/P073_data_struct.cpp | 2 +- src/src/PluginStructs/P082_data_struct.cpp | 2 +- src/src/PluginStructs/P094_data_struct.cpp | 3 +-- src/src/PluginStructs/P104_data_struct.cpp | 4 +-- src/src/PluginStructs/P165_data_struct.cpp | 2 +- src/src/WebServer/ControlPage.cpp | 2 +- src/src/WebServer/RootPage.cpp | 4 +-- src/src/WebServer/ToolsPage.cpp | 4 +-- src/src/WebServer/UploadPage.cpp | 4 +-- src/src/WebServer/WebTemplateParser.cpp | 2 +- 36 files changed, 87 insertions(+), 58 deletions(-) diff --git a/src/_C008.cpp b/src/_C008.cpp index d7eb87dff..4383f382f 100644 --- a/src/_C008.cpp +++ b/src/_C008.cpp @@ -49,7 +49,7 @@ bool CPlugin_008(CPlugin::Function function, struct EventStruct *event, String& case CPlugin::Function::CPLUGIN_PROTOCOL_TEMPLATE: { - event->String1 = String(); + free_string(event->String1); event->String2 = F("demo.php?name=%sysname%&task=%tskname%&valuename=%valname%&value=%value%"); break; } diff --git a/src/_C010.cpp b/src/_C010.cpp index c12ff0e60..ec65589ad 100644 --- a/src/_C010.cpp +++ b/src/_C010.cpp @@ -35,7 +35,7 @@ bool CPlugin_010(CPlugin::Function function, struct EventStruct *event, String& case CPlugin::Function::CPLUGIN_PROTOCOL_TEMPLATE: { - event->String1 = String(); + free_string(event->String1); event->String2 = F("%sysname%_%tskname%_%valname%=%value%"); break; } diff --git a/src/_C015.cpp b/src/_C015.cpp index e06d6edda..5269e4973 100644 --- a/src/_C015.cpp +++ b/src/_C015.cpp @@ -202,7 +202,7 @@ bool CPlugin_015(CPlugin::Function function, struct EventStruct *event, String& if (!isvalid) { // send empty string to Blynk in case of error - formattedValue = String(); + free_string(formattedValue); } const String valueName = Cache.getTaskDeviceValueName(event->TaskIndex, x); diff --git a/src/_C016.cpp b/src/_C016.cpp index 625c377b0..899446b43 100644 --- a/src/_C016.cpp +++ b/src/_C016.cpp @@ -104,8 +104,8 @@ bool CPlugin_016(CPlugin::Function function, struct EventStruct *event, String& case CPlugin::Function::CPLUGIN_PROTOCOL_TEMPLATE: { - event->String1 = String(); - event->String2 = String(); + free_string(event->String1); + free_string(event->String2); break; } diff --git a/src/_P055_Chiming.ino b/src/_P055_Chiming.ino index 1a45df5cb..629b698d7 100644 --- a/src/_P055_Chiming.ino +++ b/src/_P055_Chiming.ino @@ -529,7 +529,7 @@ uint8_t Plugin_055_ReadChime(const String& name, String& tokens) log = strformat(F("Chime: read %s "), fileName.c_str()); } - tokens = String(); + free_string(tokens); fs::File f = tryOpenFile(fileName, "r"); if (f) diff --git a/src/src/Commands/InternalCommands.cpp b/src/src/Commands/InternalCommands.cpp index 17d794620..f9a8b631a 100644 --- a/src/src/Commands/InternalCommands.cpp +++ b/src/src/Commands/InternalCommands.cpp @@ -175,7 +175,7 @@ bool do_command_case_check(command_case_data & data, // The data struct is re-used on each attempt to process an internal command. // Re-initialize the only two members that may have been altered by a previous call. data.retval = false; - data.status = String(); + free_string(data.status); if (!checkSourceFlags(data.event->Source, group)) { data.status = return_incorrect_source(); diff --git a/src/src/Controller_struct/C018_data_struct.cpp b/src/src/Controller_struct/C018_data_struct.cpp index 16e1ce911..91b3adb3b 100644 --- a/src/src/Controller_struct/C018_data_struct.cpp +++ b/src/src/Controller_struct/C018_data_struct.cpp @@ -25,9 +25,9 @@ void C018_data_struct::reset() { delete C018_easySerial; C018_easySerial = nullptr; } - cacheDevAddr = String(); - cacheHWEUI = String(); - cacheSysVer = String(); + free_string(cacheDevAddr); + free_string(cacheHWEUI); + free_string(cacheSysVer); autobaud_success = false; } @@ -157,7 +157,7 @@ bool C018_data_struct::initOTAA(const String& AppEUI, const String& AppKey, cons if (myLora == nullptr) { return false; } bool success = myLora->initOTAA(AppEUI, AppKey, DevEUI); - cacheDevAddr = String(); + free_string(cacheDevAddr); C018_logError(F("initOTAA()")); updateCacheOnInit(); @@ -334,7 +334,7 @@ void C018_data_struct::updateCacheOnInit() { cacheDevAddr = myLora->sendRawCommand(F("mac get devaddr")); if (cacheDevAddr == F("00000000")) { - cacheDevAddr = String(); + free_string(cacheDevAddr); } } } diff --git a/src/src/DataStructs/ExtendedControllerCredentialsStruct.cpp b/src/src/DataStructs/ExtendedControllerCredentialsStruct.cpp index b53681679..2834cb750 100644 --- a/src/src/DataStructs/ExtendedControllerCredentialsStruct.cpp +++ b/src/src/DataStructs/ExtendedControllerCredentialsStruct.cpp @@ -1,6 +1,7 @@ #include "../DataStructs/ExtendedControllerCredentialsStruct.h" #include "../Helpers/ESPEasy_Storage.h" +#include "../Helpers/StringConverter.h" #define EXT_CONTR_CRED_USER_OFFSET 0 #define EXT_CONTR_CRED_PASS_OFFSET 1 @@ -24,7 +25,7 @@ bool ExtendedControllerCredentialsStruct::validateChecksum() const void ExtendedControllerCredentialsStruct::clear() { for (size_t i = 0; i < CONTROLLER_MAX * 2; ++i) { - _strings[i] = String(); + free_string(_strings[i]); } } diff --git a/src/src/DataStructs/LogEntry.cpp b/src/src/DataStructs/LogEntry.cpp index 99348ce80..0dffb03f9 100644 --- a/src/src/DataStructs/LogEntry.cpp +++ b/src/src/DataStructs/LogEntry.cpp @@ -26,8 +26,9 @@ bool LogEntry_t::add(const uint8_t loglevel, const String& line) #endif // ifdef USE_SECOND_HEAP if (line.length() > LOG_STRUCT_MESSAGE_SIZE - 1) { - _message = std::move(line.substring(0, LOG_STRUCT_MESSAGE_SIZE - 1)); + move_special(_message, line.substring(0, LOG_STRUCT_MESSAGE_SIZE - 1)); } else { + reserve_special(_message, line.length()); _message = line; } } @@ -48,7 +49,7 @@ bool LogEntry_t::add(const uint8_t loglevel, String&& line) // Need to make a substring, which is a new allocation, on the 2nd heap HeapSelectIram ephemeral; #endif // ifdef USE_SECOND_HEAP - _message = move_special(line.substring(0, LOG_STRUCT_MESSAGE_SIZE - 1)); + move_special(_message, line.substring(0, LOG_STRUCT_MESSAGE_SIZE - 1)); } else { move_special(_message, std::move(line)); } @@ -59,7 +60,7 @@ bool LogEntry_t::add(const uint8_t loglevel, String&& line) void LogEntry_t::clear() { - _message = String(); + free_string(_message); _timestamp = 0; _loglevel = 0; } diff --git a/src/src/DataStructs/LogStruct.h b/src/src/DataStructs/LogStruct.h index 40930d22a..4e3c64490 100644 --- a/src/src/DataStructs/LogStruct.h +++ b/src/src/DataStructs/LogStruct.h @@ -10,7 +10,7 @@ * LogStruct \*********************************************************************************************/ #ifdef ESP32 - #define LOG_STRUCT_MESSAGE_LINES 60 + #define LOG_STRUCT_MESSAGE_LINES 120 #else #ifdef USE_SECOND_HEAP #define LOG_STRUCT_MESSAGE_LINES 60 diff --git a/src/src/DataStructs/Modbus.cpp b/src/src/DataStructs/Modbus.cpp index 6c2e46ced..a83796fbe 100644 --- a/src/src/DataStructs/Modbus.cpp +++ b/src/src/DataStructs/Modbus.cpp @@ -4,6 +4,7 @@ #include "../DataStructs/ControllerSettingsStruct.h" #include "../ESPEasyCore/ESPEasy_Log.h" +#include "../Helpers/StringConverter.h" Modbus::Modbus() : ModbusClient(nullptr), errcnt(0), timeout(0), @@ -108,7 +109,7 @@ bool Modbus::handle() { unsigned int RXavailable = 0; #ifndef BUILD_NO_DEBUG - LogString = String(); + free_string(LogString); #endif int64_t rxValue = 0; diff --git a/src/src/DataStructs/RulesEventCache.cpp b/src/src/DataStructs/RulesEventCache.cpp index 743ad2703..e221c027c 100644 --- a/src/src/DataStructs/RulesEventCache.cpp +++ b/src/src/DataStructs/RulesEventCache.cpp @@ -41,6 +41,10 @@ bool RulesEventCache::addLine(const String& line, const String& filename, size_t # ifdef USE_SECOND_HEAP HeapSelectDram ephemeral; # endif // ifdef USE_SECOND_HEAP + #ifdef ESP32 + reserve_special(event, event.length()); + reserve_special(action, action.length()); + #endif _eventCache.emplace_back(filename, pos, std::move(event), std::move(action)); return true; diff --git a/src/src/DataStructs/Web_StreamingBuffer.cpp b/src/src/DataStructs/Web_StreamingBuffer.cpp index 41203f8d7..24e4905d6 100644 --- a/src/src/DataStructs/Web_StreamingBuffer.cpp +++ b/src/src/DataStructs/Web_StreamingBuffer.cpp @@ -336,7 +336,7 @@ void Web_StreamingBuffer::sendContentBlocking(String& data) { web_server.sendContent(data); if (data.length() > (CHUNKED_BUFFER_SIZE + 1)) { - data = String(); // Clear also allocated memory + free_string(data); // Clear also allocated memory } else { data.clear(); } diff --git a/src/src/ESPEasyCore/ESPEasy_Log.cpp b/src/src/ESPEasyCore/ESPEasy_Log.cpp index eade2faa6..fe82f366c 100644 --- a/src/src/ESPEasyCore/ESPEasy_Log.cpp +++ b/src/src/ESPEasyCore/ESPEasy_Log.cpp @@ -17,6 +17,8 @@ #include "../Helpers/ESPEasy_Storage.h" #endif +#define UPDATE_LOGLEVEL_ACTIVE_CACHE_INTERVAL 5000 + /********************************************************************************************\ Init critical variables for logging (important during initial factory reset stuff ) \*********************************************************************************************/ @@ -124,6 +126,13 @@ bool loglevelActiveFor(uint8_t logLevel) { return false; } #endif + static uint32_t lastUpdateLogLevelCache = 0; + if (lastUpdateLogLevelCache == 0 || + timePassedSince(lastUpdateLogLevelCache) > UPDATE_LOGLEVEL_ACTIVE_CACHE_INTERVAL) + { + lastUpdateLogLevelCache = millis(); + updateLogLevelCache(); + } return logLevel <= highest_active_log_level; } @@ -143,15 +152,13 @@ uint8_t getSerialLogLevel() { } uint8_t getWebLogLevel() { - uint8_t logLevelSettings = 0; if (Logging.logActiveRead()) { - logLevelSettings = Settings.WebLogLevel; - } else { - if (Settings.WebLogLevel != 0) { - updateLogLevelCache(); - } + return Settings.WebLogLevel; + } + if (Settings.WebLogLevel != LOG_LEVEL_NONE) { + updateLogLevelCache(); } - return logLevelSettings; + return LOG_LEVEL_NONE; } bool loglevelActiveFor(uint8_t destination, uint8_t logLevel) { @@ -245,7 +252,7 @@ void addLog(uint8_t logLevel, const char *line) } } #else - if (!copy.reserve(strlen_P((PGM_P)line))) { + if (!reserve_special(copy, strlen_P((PGM_P)line))) { return; } copy = line; @@ -353,5 +360,5 @@ void addToLogMove(uint8_t logLevel, String&& string) Logging.add(logLevel, std::move(string)); } // Make sure the string may no longer keep up memory - string = String(); + free_string(string); } diff --git a/src/src/Globals/RamTracker.cpp b/src/src/Globals/RamTracker.cpp index 2e8ce55af..874bfee83 100644 --- a/src/src/Globals/RamTracker.cpp +++ b/src/src/Globals/RamTracker.cpp @@ -156,7 +156,7 @@ RamTracker::RamTracker(void) { writePtr = 0; for (int i = 0; i < TRACES; i++) { - traces[i] = String(); + free_string(traces[i]); tracesMemory[i] = 0xffffffff; // init with best case memory values, so they get replaced if memory goes lower } @@ -172,7 +172,7 @@ void RamTracker::registerRamState(const String& s) { // store function int bestCase = bestCaseTrace(); // find best case memory trace if (ESP.getFreeHeap() < tracesMemory[bestCase]) { // compare to current memory value - traces[bestCase] = String(); + free_string(traces[bestCase]); readPtr = writePtr + 1; // read out buffer, oldest value first if (readPtr >= TRACEENTRIES) { @@ -210,7 +210,7 @@ void RamTracker::getTraceBuffer() { retval += ' '; retval += traces[i]; addLogMove(LOG_LEVEL_DEBUG_DEV, retval); - retval = String(); + retval.clear(); } } #endif // ifndef BUILD_NO_DEBUG diff --git a/src/src/Helpers/Audio.cpp b/src/src/Helpers/Audio.cpp index e7e8d115f..1ee71cda5 100644 --- a/src/src/Helpers/Audio.cpp +++ b/src/src/Helpers/Audio.cpp @@ -5,6 +5,7 @@ #include "../Globals/RamTracker.h" #include "../Helpers/Hardware_GPIO.h" #include "../Helpers/Hardware_PWM.h" +#include "../Helpers/StringConverter.h" /********************************************************************************************\ @@ -53,7 +54,7 @@ void clear_rtttl_melody() { # endif // if FEATURE_RTTTL_EVENTS } - rtttlMelody = String(); + free_string(rtttlMelody); } void set_rtttl_melody(String& melody) { diff --git a/src/src/Helpers/ESPEasy_checks.cpp b/src/src/Helpers/ESPEasy_checks.cpp index 8a86e2544..1af488d4e 100644 --- a/src/src/Helpers/ESPEasy_checks.cpp +++ b/src/src/Helpers/ESPEasy_checks.cpp @@ -211,7 +211,7 @@ String ReportOffsetErrorInStruct(const String& structname, size_t offset) { * Not a member function to be able to use the F-macro \*********************************************************************************************/ bool SettingsCheck(String& error) { - error = String(); + free_string(error); #ifndef LIMIT_BUILD_SIZE #ifdef esp8266 size_t offset = offsetof(SettingsStruct, ResetFactoryDefaultPreference); diff --git a/src/src/Helpers/Memory.h b/src/src/Helpers/Memory.h index 06d1a3045..9f7faab34 100644 --- a/src/src/Helpers/Memory.h +++ b/src/src/Helpers/Memory.h @@ -58,4 +58,8 @@ void *special_realloc(void *ptr, size_t size); void *special_calloc(size_t num, size_t size); -bool String_reserve_special(String& str, size_t size); \ No newline at end of file +// Perform a special memory allocate for the buffer pointer in the String object +// Allocation is tried either on 2nd heap (ESP8266) or PSRAM (ESP32) +// when possible. +bool String_reserve_special(String& str, size_t size); + diff --git a/src/src/Helpers/Modbus_RTU.cpp b/src/src/Helpers/Modbus_RTU.cpp index 7b3ac05ec..7e452360c 100644 --- a/src/src/Helpers/Modbus_RTU.cpp +++ b/src/src/Helpers/Modbus_RTU.cpp @@ -19,7 +19,7 @@ void ModbusRTU_struct::reset() { delete easySerial; easySerial = nullptr; } - detected_device_description = String(); + free_string(detected_device_description); for (int i = 0; i < 8; ++i) { _sendframe[i] = 0; diff --git a/src/src/Helpers/StringConverter.cpp b/src/src/Helpers/StringConverter.cpp index 6fb63f445..eb4415a6b 100644 --- a/src/src/Helpers/StringConverter.cpp +++ b/src/src/Helpers/StringConverter.cpp @@ -83,7 +83,7 @@ void move_special(String& dest, String&& source) { HeapSelectIram ephemeral; if (dest.reserve(source.length())) { dest = source; - source = String(); + free_string(source); return; } // Could not allocate on 2nd heap, so just move existing string @@ -106,6 +106,12 @@ bool reserve_special(String& str, size_t size) { return String_reserve_special(str, size); } +void free_string(String& str) { + // This is a call specifically tailored to what is done in: + // void String::move(String &rhs) + + String tmp(std::move(str)); +} /********************************************************************************************\ Format string using vsnprintf @@ -1515,7 +1521,7 @@ bool GetArgv(const char *string, String& argvString, unsigned int argc, char sep int pos_begin, pos_end; bool hasArgument = GetArgvBeginEnd(string, argc, pos_begin, pos_end, separator); - argvString = String(); + free_string(argvString); if (!hasArgument) { return false; } diff --git a/src/src/Helpers/StringConverter.h b/src/src/Helpers/StringConverter.h index de1ebfc58..61472b954 100644 --- a/src/src/Helpers/StringConverter.h +++ b/src/src/Helpers/StringConverter.h @@ -58,6 +58,10 @@ String move_special(String&& source); // Try to reserve on the heap with the most space available bool reserve_special(String& str, size_t size); +// Arduino String does not have a function to de-allocate its internal buffer +// This is a special trick to de-allocate its internal buffer and thus free up memory. +void free_string(String& str); + /* template bool equals(const String& str, const T &val) { diff --git a/src/src/Helpers/StringParser.cpp b/src/src/Helpers/StringParser.cpp index 6f1eff763..1a0e7b0f5 100644 --- a/src/src/Helpers/StringParser.cpp +++ b/src/src/Helpers/StringParser.cpp @@ -420,7 +420,7 @@ void transformValue( } if (equals(value, '0')) { - value = String(); + free_string(value); } else { const int valueLength = value.length(); @@ -769,7 +769,7 @@ bool findNextDevValNameInString(const String& input, int& startpos, int& endpos, move_special(format, valueName.substring(hashpos + 1)); move_special(valueName, valueName.substring(0, hashpos)); } else { - format = String(); + free_string(format); } deviceName.toLowerCase(); valueName.toLowerCase(); diff --git a/src/src/Helpers/WebServer_commandHelper.cpp b/src/src/Helpers/WebServer_commandHelper.cpp index 1a9092d22..d8f37ded5 100644 --- a/src/src/Helpers/WebServer_commandHelper.cpp +++ b/src/src/Helpers/WebServer_commandHelper.cpp @@ -23,7 +23,7 @@ HandledWebCommand_result handle_command_from_web(EventValueSource::Enum source, bool handledCmd = false; bool sendOK = false; - printWebString = String(); + free_string(printWebString); printToWeb = false; printToWebJSON = false; diff --git a/src/src/Helpers/_CPlugin_Helper.cpp b/src/src/Helpers/_CPlugin_Helper.cpp index 3d97c3b58..347ff2e57 100644 --- a/src/src/Helpers/_CPlugin_Helper.cpp +++ b/src/src/Helpers/_CPlugin_Helper.cpp @@ -42,7 +42,8 @@ bool safeReadStringUntil(Stream & input, const unsigned long timer = start + timeout; unsigned long backgroundtasks_timer = start + 10; - str = String(); + // FIXME TD-er: Should this also de-allocate internal buffer? + str.clear(); do { // read character diff --git a/src/src/PluginStructs/P020_data_struct.cpp b/src/src/PluginStructs/P020_data_struct.cpp index 5b1b2bfca..3129576c6 100644 --- a/src/src/PluginStructs/P020_data_struct.cpp +++ b/src/src/PluginStructs/P020_data_struct.cpp @@ -136,7 +136,7 @@ void P020_Task::discardClientIn() { } void P020_Task::clearBuffer() { - serial_buffer = String(); + free_string(serial_buffer); _maxDataGramSize = serial_processing == P020_Events::P1WiFiGateway ? P020_P1_DATAGRAM_MAX_SIZE : P020_DATAGRAM_MAX_SIZE; diff --git a/src/src/PluginStructs/P044_data_struct.cpp b/src/src/PluginStructs/P044_data_struct.cpp index 6db208ad2..f61fe04bb 100644 --- a/src/src/PluginStructs/P044_data_struct.cpp +++ b/src/src/PluginStructs/P044_data_struct.cpp @@ -154,7 +154,7 @@ void P044_Task::clearBuffer() { maxMessageSize = _min(serial_buffer.length(), P044_DATAGRAM_MAX_SIZE); } - serial_buffer = String(); + free_string(serial_buffer); serial_buffer.reserve(maxMessageSize); } diff --git a/src/src/PluginStructs/P073_data_struct.cpp b/src/src/PluginStructs/P073_data_struct.cpp index 52daaa878..008722e1b 100644 --- a/src/src/PluginStructs/P073_data_struct.cpp +++ b/src/src/PluginStructs/P073_data_struct.cpp @@ -498,7 +498,7 @@ bool P073_data_struct::NextScroll() { } void P073_data_struct::setTextToScroll(const String& text) { - _textToScroll = String(); + free_string(_textToScroll); if (!text.isEmpty()) { const int bufToFill = getBufferLength(displayModel); diff --git a/src/src/PluginStructs/P082_data_struct.cpp b/src/src/PluginStructs/P082_data_struct.cpp index 354455ca8..c51b682bf 100644 --- a/src/src/PluginStructs/P082_data_struct.cpp +++ b/src/src/PluginStructs/P082_data_struct.cpp @@ -342,7 +342,7 @@ bool P082_data_struct::loop() { // Full sentence received # ifdef P082_SEND_GPS_TO_LOG _lastSentence = _currentSentence; - _currentSentence = String(); + free_string(_currentSentence); # endif // ifdef P082_SEND_GPS_TO_LOG completeSentence = true; available = easySerial->available(); diff --git a/src/src/PluginStructs/P094_data_struct.cpp b/src/src/PluginStructs/P094_data_struct.cpp index 268807bfc..f0695bd37 100644 --- a/src/src/PluginStructs/P094_data_struct.cpp +++ b/src/src/PluginStructs/P094_data_struct.cpp @@ -594,7 +594,7 @@ bool P094_data_struct::loop() { for (size_t i = 0; i < length && valid; ++i) { if ((sentence_part[i] > 127) || (sentence_part[i] < 32)) { - sentence_part = String(); + free_string(sentence_part); ++sentences_received_error; valid = false; } @@ -653,7 +653,6 @@ const String& P094_data_struct::peekSentence() const { void P094_data_struct::getSentence(String& string, bool appendSysTime) { string = std::move(sentence_part); - sentence_part = String(); // FIXME TD-er: Should not be needed as move already cleared it. if (appendSysTime) { // Unix timestamp = 10 decimals + separator diff --git a/src/src/PluginStructs/P104_data_struct.cpp b/src/src/PluginStructs/P104_data_struct.cpp index 1b7e34e33..2f6e51a80 100644 --- a/src/src/PluginStructs/P104_data_struct.cpp +++ b/src/src/PluginStructs/P104_data_struct.cpp @@ -268,7 +268,7 @@ void P104_data_struct::loadSettings() { # endif // ifdef P104_DEBUG } - buffer = String(); // Free some memory + free_string(buffer); // Free some memory } delete[] settingsBuffer; // Release allocated buffer @@ -1676,7 +1676,7 @@ void P104_data_struct::checkRepeatTimer(uint8_t z) { * saveSettings gather the zones data from the UI and store in customsettings **************************************/ bool P104_data_struct::saveSettings() { - error = String(); // Clear + free_string(error); // Clear # ifdef P104_DEBUG_DEV diff --git a/src/src/PluginStructs/P165_data_struct.cpp b/src/src/PluginStructs/P165_data_struct.cpp index a7ceb8e1f..c10cf930e 100644 --- a/src/src/PluginStructs/P165_data_struct.cpp +++ b/src/src/PluginStructs/P165_data_struct.cpp @@ -2220,7 +2220,7 @@ bool P165_data_struct::nextScroll() { * Set up the string to scroll across the display, with optional prefixed spaces **********************************************************************************/ void P165_data_struct::setTextToScroll(const String& text) { - _textToScroll = String(); + free_string(_textToScroll); if (!text.isEmpty()) { const int bufToFill = calculateDisplayDigits(); diff --git a/src/src/WebServer/ControlPage.cpp b/src/src/WebServer/ControlPage.cpp index 5848d7d48..55efaaa81 100644 --- a/src/src/WebServer/ControlPage.cpp +++ b/src/src/WebServer/ControlPage.cpp @@ -41,7 +41,7 @@ void handle_control() { TXBuffer.endStream(); - printWebString = String(); + free_string(printWebString); printToWeb = false; printToWebJSON = false; } diff --git a/src/src/WebServer/RootPage.cpp b/src/src/WebServer/RootPage.cpp index a489a1e4f..1e6085f3a 100644 --- a/src/src/WebServer/RootPage.cpp +++ b/src/src/WebServer/RootPage.cpp @@ -274,7 +274,7 @@ void handle_root() { addHtml(F("Command Output
")); - printWebString = String(); + free_string(printWebString); } } html_end_table(); @@ -460,7 +460,7 @@ void handle_root() { # endif // if FEATURE_ESPEASY_P2P html_end_form(); - printWebString = String(); + free_string(printWebString); printToWeb = false; sendHeadandTail_stdtemplate(_TAIL); } diff --git a/src/src/WebServer/ToolsPage.cpp b/src/src/WebServer/ToolsPage.cpp index 26a861639..908f8f971 100644 --- a/src/src/WebServer/ToolsPage.cpp +++ b/src/src/WebServer/ToolsPage.cpp @@ -56,7 +56,7 @@ void handle_tools() { addHtml(F("Command Output
")); - printWebString = String(); + free_string(printWebString); } @@ -198,7 +198,7 @@ void handle_tools() { html_end_form(); sendHeadandTail_stdtemplate(_TAIL); TXBuffer.endStream(); - printWebString = String(); + free_string(printWebString); printToWeb = false; } diff --git a/src/src/WebServer/UploadPage.cpp b/src/src/WebServer/UploadPage.cpp index 072ba1a46..bb2a2e869 100644 --- a/src/src/WebServer/UploadPage.cpp +++ b/src/src/WebServer/UploadPage.cpp @@ -35,7 +35,7 @@ void handle_upload() { "

Upload settings file:

")); sendHeadandTail_stdtemplate(_TAIL); TXBuffer.endStream(); - printWebString = String(); + free_string(printWebString); printToWeb = false; } @@ -87,7 +87,7 @@ void handle_upload_post() { addHtml(F("Upload finished")); sendHeadandTail_stdtemplate(_TAIL); TXBuffer.endStream(); - printWebString = String(); + free_string(printWebString); printToWeb = false; } diff --git a/src/src/WebServer/WebTemplateParser.cpp b/src/src/WebServer/WebTemplateParser.cpp index 3bc338c55..afa20831d 100644 --- a/src/src/WebServer/WebTemplateParser.cpp +++ b/src/src/WebServer/WebTemplateParser.cpp @@ -159,7 +159,7 @@ bool WebTemplateParser::process(const char c) { } else if (Tail == contentVarFound) { processVarName(); } - varName = String(); + free_string(varName); } } break; From 50a404427ea3e56559876ba53ca1ef18d2684af8 Mon Sep 17 00:00:00 2001 From: TD-er Date: Tue, 28 Jan 2025 15:12:29 +0100 Subject: [PATCH 022/564] [Memory] Add small optimization in free_string() to prevent copying --- src/src/Helpers/StringConverter.cpp | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/src/Helpers/StringConverter.cpp b/src/src/Helpers/StringConverter.cpp index eb4415a6b..091bb87dc 100644 --- a/src/src/Helpers/StringConverter.cpp +++ b/src/src/Helpers/StringConverter.cpp @@ -109,7 +109,8 @@ bool reserve_special(String& str, size_t size) { void free_string(String& str) { // This is a call specifically tailored to what is done in: // void String::move(String &rhs) - + + str.clear(); // Prevent any unneeded copying String tmp(std::move(str)); } From 6d15414fb921e831e55526bd44d34a4b66517b3a Mon Sep 17 00:00:00 2001 From: TD-er Date: Thu, 13 Feb 2025 16:22:48 +0100 Subject: [PATCH 023/564] [ESP-IDF] Update to latest Arduino 3.1.2 for LittleFS builds --- platformio_core_defs.ini | 2 +- platformio_esp32_solo1.ini | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/platformio_core_defs.ini b/platformio_core_defs.ini index 5d8408882..85ed9d1cf 100644 --- a/platformio_core_defs.ini +++ b/platformio_core_defs.ini @@ -198,7 +198,7 @@ lib_extra_dirs = ; ESP_IDF 5.3.1 [core_esp32_IDF5_3_2__3_1_0_LittleFS] platform = https://github.com/Jason2866/platform-espressif32.git -platform_packages = framework-arduinoespressif32 @ https://github.com/Jason2866/esp32-arduino-lib-builder/releases/download/3203/framework-arduinoespressif32-all-release_v5.3-ddc10306.zip +platform_packages = framework-arduinoespressif32 @ https://github.com/Jason2866/esp32-arduino-lib-builder/releases/download/3385/framework-arduinoespressif32-all-release_v5.3-742cdfce.zip build_flags = -DESP32_STAGE -DESP_IDF_VERSION_MAJOR=5 -DLIBRARIES_NO_LOG=1 diff --git a/platformio_esp32_solo1.ini b/platformio_esp32_solo1.ini index 4da44943c..5042599aa 100644 --- a/platformio_esp32_solo1.ini +++ b/platformio_esp32_solo1.ini @@ -4,7 +4,7 @@ extends = esp32_base_idf5 board = esp32_solo1_4M platform = https://github.com/Jason2866/platform-espressif32.git#Arduino/IDF53 -platform_packages = framework-arduino-solo1 @ https://github.com/Jason2866/esp32-arduino-lib-builder/releases/download/3204/framework-arduinoespressif32-solo1-release_v5.3-ddc10306.zip +platform_packages = framework-arduino-solo1 @ https://github.com/Jason2866/esp32-arduino-lib-builder/releases/download/3386/framework-arduinoespressif32-solo1-release_v5.3-742cdfce.zip build_flags = ${esp32_base_idf5.build_flags} -DFEATURE_ARDUINO_OTA=1 -DUSE_LITTLEFS From a6fc7283973f33fce8b5d2f63052bf3a0bbf304a Mon Sep 17 00:00:00 2001 From: TD-er Date: Mon, 17 Feb 2025 16:29:27 +0100 Subject: [PATCH 024/564] [ESP-SDK] Update to ESP32/Arduino 3.1.3 --- platformio_core_defs.ini | 2 +- platformio_esp32_solo1.ini | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/platformio_core_defs.ini b/platformio_core_defs.ini index b408f5bdf..89fe27caf 100644 --- a/platformio_core_defs.ini +++ b/platformio_core_defs.ini @@ -198,7 +198,7 @@ lib_extra_dirs = ; ESP_IDF 5.3.1 [core_esp32_IDF5_3_2__3_1_0_LittleFS] platform = https://github.com/Jason2866/platform-espressif32.git -platform_packages = framework-arduinoespressif32 @ https://github.com/Jason2866/esp32-arduino-lib-builder/releases/download/3385/framework-arduinoespressif32-all-release_v5.3-742cdfce.zip +platform_packages = framework-arduinoespressif32 @ https://github.com/Jason2866/esp32-arduino-lib-builder/releases/download/3395/framework-arduinoespressif32-all-release_v5.3-9f9a0e25.zip build_flags = -DESP32_STAGE -DESP_IDF_VERSION_MAJOR=5 -DLIBRARIES_NO_LOG=1 diff --git a/platformio_esp32_solo1.ini b/platformio_esp32_solo1.ini index 5042599aa..1ab94d4bd 100644 --- a/platformio_esp32_solo1.ini +++ b/platformio_esp32_solo1.ini @@ -4,7 +4,7 @@ extends = esp32_base_idf5 board = esp32_solo1_4M platform = https://github.com/Jason2866/platform-espressif32.git#Arduino/IDF53 -platform_packages = framework-arduino-solo1 @ https://github.com/Jason2866/esp32-arduino-lib-builder/releases/download/3386/framework-arduinoespressif32-solo1-release_v5.3-742cdfce.zip +platform_packages = framework-arduino-solo1 @ https://github.com/Jason2866/esp32-arduino-lib-builder/releases/download/3396/framework-arduinoespressif32-solo1-release_v5.3-9f9a0e25.zip build_flags = ${esp32_base_idf5.build_flags} -DFEATURE_ARDUINO_OTA=1 -DUSE_LITTLEFS From ce69d379721fd163f0ef6da66c6f836de7fec435 Mon Sep 17 00:00:00 2001 From: TD-er Date: Mon, 17 Feb 2025 16:30:36 +0100 Subject: [PATCH 025/564] [ESPEasy p2p] Add node-IDs for new Espressif SoC models --- src/src/DataTypes/NodeTypeID.cpp | 27 ++++++++++--------- src/src/DataTypes/NodeTypeID.h | 46 ++++++++++++++++++++------------ 2 files changed, 44 insertions(+), 29 deletions(-) diff --git a/src/src/DataTypes/NodeTypeID.cpp b/src/src/DataTypes/NodeTypeID.cpp index 6e4bd9bfa..ea80827b9 100644 --- a/src/src/DataTypes/NodeTypeID.cpp +++ b/src/src/DataTypes/NodeTypeID.cpp @@ -4,18 +4,21 @@ const __FlashStringHelper* toNodeTypeDisplayString(uint8_t nodeType) { switch (nodeType) { - case NODE_TYPE_ID_ESP_EASY_STD: return F("ESP Easy"); - case NODE_TYPE_ID_ESP_EASYM_STD: return F("ESP Easy Mega"); - case NODE_TYPE_ID_ESP_EASY32_STD: return F("ESP Easy 32"); - case NODE_TYPE_ID_ESP_EASY32S2_STD: return F("ESP Easy 32-S2"); - case NODE_TYPE_ID_ESP_EASY32S3_STD: return F("ESP Easy 32-S3"); - case NODE_TYPE_ID_ESP_EASY32C2_STD: return F("ESP Easy 32-C2"); - case NODE_TYPE_ID_ESP_EASY32C3_STD: return F("ESP Easy 32-C3"); - case NODE_TYPE_ID_ESP_EASY32H2_STD: return F("ESP Easy 32-H2"); - case NODE_TYPE_ID_ESP_EASY32C6_STD: return F("ESP Easy 32-C6"); - case NODE_TYPE_ID_RPI_EASY_STD: return F("RPI Easy"); - case NODE_TYPE_ID_ARDUINO_EASY_STD: return F("Arduino Easy"); - case NODE_TYPE_ID_NANO_EASY_STD: return F("Nano Easy"); + case NODE_TYPE_ID_ESP_EASY_STD: return F("ESP Easy"); + case NODE_TYPE_ID_ESP_EASYM_STD: return F("ESP Easy Mega"); + case NODE_TYPE_ID_ESP_EASY32_STD: return F("ESP Easy 32"); + case NODE_TYPE_ID_ESP_EASY32S2_STD: return F("ESP Easy 32-S2"); + case NODE_TYPE_ID_ESP_EASY32S3_STD: return F("ESP Easy 32-S3"); + case NODE_TYPE_ID_ESP_EASY32C2_STD: return F("ESP Easy 32-C2"); + case NODE_TYPE_ID_ESP_EASY32C3_STD: return F("ESP Easy 32-C3"); + case NODE_TYPE_ID_ESP_EASY32C5_STD: return F("ESP Easy 32-C5"); + case NODE_TYPE_ID_ESP_EASY32C6_STD: return F("ESP Easy 32-C6"); + case NODE_TYPE_ID_ESP_EASY32C61_STD: return F("ESP Easy 32-C61"); + case NODE_TYPE_ID_ESP_EASY32H2_STD: return F("ESP Easy 32-H2"); + case NODE_TYPE_ID_ESP_EASY32P4_STD: return F("ESP Easy 32-P4"); + case NODE_TYPE_ID_RPI_EASY_STD: return F("RPI Easy"); + case NODE_TYPE_ID_ARDUINO_EASY_STD: return F("Arduino Easy"); + case NODE_TYPE_ID_NANO_EASY_STD: return F("Nano Easy"); } return F(""); } \ No newline at end of file diff --git a/src/src/DataTypes/NodeTypeID.h b/src/src/DataTypes/NodeTypeID.h index d3378e2cd..d448efa7f 100644 --- a/src/src/DataTypes/NodeTypeID.h +++ b/src/src/DataTypes/NodeTypeID.h @@ -3,6 +3,8 @@ #include "../../ESPEasy_common.h" +// These defines are used to identify other ESPEasy build platforms via ESPEasy p2p +// So don't ever change already assigned values as there might be older builds which rely on these. #define NODE_TYPE_ID_ESP_EASY_STD 1 #define NODE_TYPE_ID_RPI_EASY_STD 5 // https://github.com/enesbcs/rpieasy #define NODE_TYPE_ID_ESP_EASYM_STD 17 @@ -13,37 +15,47 @@ #define NODE_TYPE_ID_ESP_EASY32C2_STD 37 #define NODE_TYPE_ID_ESP_EASY32H2_STD 38 #define NODE_TYPE_ID_ESP_EASY32C6_STD 39 +#define NODE_TYPE_ID_ESP_EASY32C61_STD 40 +#define NODE_TYPE_ID_ESP_EASY32C5_STD 41 +#define NODE_TYPE_ID_ESP_EASY32P4_STD 42 #define NODE_TYPE_ID_ARDUINO_EASY_STD 65 #define NODE_TYPE_ID_NANO_EASY_STD 81 #if defined(ESP8266) - #define NODE_TYPE_ID NODE_TYPE_ID_ESP_EASYM_STD + # define NODE_TYPE_ID NODE_TYPE_ID_ESP_EASYM_STD #endif #if defined(ESP32) - #ifdef ESP32S2 - #define NODE_TYPE_ID NODE_TYPE_ID_ESP_EASY32S2_STD - #elif defined(ESP32S3) - #define NODE_TYPE_ID NODE_TYPE_ID_ESP_EASY32S3_STD - #elif defined(ESP32C6) - #define NODE_TYPE_ID NODE_TYPE_ID_ESP_EASY32C6_STD - #elif defined(ESP32C3) - #define NODE_TYPE_ID NODE_TYPE_ID_ESP_EASY32C3_STD - #elif defined(ESP32C2) - #define NODE_TYPE_ID NODE_TYPE_ID_ESP_EASY32C2_STD + # ifdef ESP32S2 + # define NODE_TYPE_ID NODE_TYPE_ID_ESP_EASY32S2_STD + # elif defined(ESP32S3) + # define NODE_TYPE_ID NODE_TYPE_ID_ESP_EASY32S3_STD + # elif defined(ESP32C2) + # define NODE_TYPE_ID NODE_TYPE_ID_ESP_EASY32C2_STD + # elif defined(ESP32C3) + # define NODE_TYPE_ID NODE_TYPE_ID_ESP_EASY32C3_STD + # elif defined(ESP32C5) + # define NODE_TYPE_ID NODE_TYPE_ID_ESP_EASY32C5_STD + # elif defined(ESP32C6) + # define NODE_TYPE_ID NODE_TYPE_ID_ESP_EASY32C6_STD + # elif defined(ESP32C61) + # define NODE_TYPE_ID NODE_TYPE_ID_ESP_EASY32C61_STD + # elif defined(ESP32H2) + # define NODE_TYPE_ID NODE_TYPE_ID_ESP_EASY32H2_STD + # elif defined(ESP32P4) + # define NODE_TYPE_ID NODE_TYPE_ID_ESP_EASY32P4_STD # elif defined(ESP32_CLASSIC) - #define NODE_TYPE_ID NODE_TYPE_ID_ESP_EASY32_STD - # else + # define NODE_TYPE_ID NODE_TYPE_ID_ESP_EASY32_STD + # else - static_assert(false, "Implement processor architecture"); +static_assert(false, "Implement processor architecture"); - #endif + # endif #endif - const __FlashStringHelper* toNodeTypeDisplayString(uint8_t nodeType); -#endif // ifndef DATATYPES_NODETYPEID_H \ No newline at end of file +#endif // ifndef DATATYPES_NODETYPEID_H From 3f2ac690fb14c4de6087039183f9f801cf60b7bc Mon Sep 17 00:00:00 2001 From: TD-er Date: Mon, 17 Feb 2025 16:31:13 +0100 Subject: [PATCH 026/564] [WiFi] Fix processing connected event --- src/src/ESPEasyCore/ESPEasyWifi_ProcessEvent.cpp | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/src/src/ESPEasyCore/ESPEasyWifi_ProcessEvent.cpp b/src/src/ESPEasyCore/ESPEasyWifi_ProcessEvent.cpp index 25ff3edfe..ce3d0886c 100644 --- a/src/src/ESPEasyCore/ESPEasyWifi_ProcessEvent.cpp +++ b/src/src/ESPEasyCore/ESPEasyWifi_ProcessEvent.cpp @@ -51,14 +51,13 @@ void handle_unprocessedNetworkEvents() #endif if (active_network_medium == NetworkMedium_t::WIFI) { - if (WiFiConnected() && !WiFiEventData.WiFiServicesInitialized()) { - WiFiEventData.processedConnect = false; - WiFiEventData.processedGotIP = false; + bool processedSomething = false; if (!WiFiEventData.processedConnect) { #ifndef BUILD_NO_DEBUG addLog(LOG_LEVEL_DEBUG, F("WIFI : Entering processConnect()")); #endif // ifndef BUILD_NO_DEBUG processConnect(); + processedSomething = true; // FIXME TD-er: Forcefully set the connected flag for now WiFiEventData.setWiFiConnected(); @@ -70,12 +69,14 @@ void handle_unprocessedNetworkEvents() #endif // ifndef BUILD_NO_DEBUG processGotIP(); + processedSomething = true; + // FIXME TD-er: Forcefully set the GotIP flag for now WiFiEventData.setWiFiGotIP(); } WiFiEventData.setWiFiServicesInitialized(); - if (WiFiEventData.WiFiServicesInitialized()) { + if (WiFiEventData.WiFiServicesInitialized() && processedSomething) { // #ifdef ESP32 setWebserverRunning(false); @@ -89,7 +90,6 @@ void handle_unprocessedNetworkEvents() #endif */ } - } } #if FEATURE_ETHERNET From e6957bd0f94d2f6d5fd31b1561f6f827fadbe76b Mon Sep 17 00:00:00 2001 From: TD-er Date: Mon, 17 Feb 2025 17:43:05 +0100 Subject: [PATCH 027/564] [ESP8266] Fix crash on processing log with weblog enabled. --- src/src/ESPEasyCore/ESPEasy_Log.cpp | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/src/src/ESPEasyCore/ESPEasy_Log.cpp b/src/src/ESPEasyCore/ESPEasy_Log.cpp index fe82f366c..b02ce2ca9 100644 --- a/src/src/ESPEasyCore/ESPEasy_Log.cpp +++ b/src/src/ESPEasyCore/ESPEasy_Log.cpp @@ -358,7 +358,8 @@ void addToLogMove(uint8_t logLevel, String&& string) // May clear the string, so call as last one. if (loglevelActiveFor(LOG_TO_WEBLOG, logLevel)) { Logging.add(logLevel, std::move(string)); + } else { + // Make sure the string may no longer keep up memory + free_string(string); } - // Make sure the string may no longer keep up memory - free_string(string); } From 115e8a571d27fdb5f524432788433cf16ac4034b Mon Sep 17 00:00:00 2001 From: TD-er Date: Mon, 17 Feb 2025 17:47:47 +0100 Subject: [PATCH 028/564] [Cleanup] Simplify generating sysinfo page --- src/src/ESPEasyCore/ESPEasyWifi.cpp | 1 - .../ESPEasyCore/ESPEasyWifi_ProcessEvent.cpp | 22 ++++---- src/src/WebServer/SysInfoPage.cpp | 53 +++++++++++++------ 3 files changed, 47 insertions(+), 29 deletions(-) diff --git a/src/src/ESPEasyCore/ESPEasyWifi.cpp b/src/src/ESPEasyCore/ESPEasyWifi.cpp index 19feae0f7..78ae3b9e6 100644 --- a/src/src/ESPEasyCore/ESPEasyWifi.cpp +++ b/src/src/ESPEasyCore/ESPEasyWifi.cpp @@ -104,7 +104,6 @@ // - Start/stop of AP mode // ******************************************************************************** bool WiFiConnected() { - START_TIMER; static uint32_t lastCheckedTime = 0; const int32_t timePassed = timePassedSince(lastCheckedTime); diff --git a/src/src/ESPEasyCore/ESPEasyWifi_ProcessEvent.cpp b/src/src/ESPEasyCore/ESPEasyWifi_ProcessEvent.cpp index ce3d0886c..085486bd2 100644 --- a/src/src/ESPEasyCore/ESPEasyWifi_ProcessEvent.cpp +++ b/src/src/ESPEasyCore/ESPEasyWifi_ProcessEvent.cpp @@ -213,11 +213,12 @@ void processGotIP() { if (!useStaticIP()) { #ifdef ESP8266 - if (!ip.isSet()) { + if (!ip.isSet()) #else // ifdef ESP8266 - if ((ip[0] == 0) && (ip[1] == 0) && (ip[2] == 0) && (ip[3] == 0)) { + if ((ip[0] == 0) && (ip[1] == 0) && (ip[2] == 0) && (ip[3] == 0)) #endif // ifdef ESP8266 + { return; } } @@ -313,11 +314,10 @@ void processDisconnectAPmode() { #ifndef BUILD_NO_DEBUG if (loglevelActiveFor(LOG_LEVEL_INFO)) { - const int nrStationsConnected = WiFi.softAPgetStationNum(); - String log = F("AP Mode: Client disconnected: "); - log += WiFiEventData.lastMacDisconnectedAPmode.toString(); - log += F(" Connected devices: "); - log += nrStationsConnected; + String log(strformat( + F("AP Mode: Client disconnected: %s Connected devices: %u"), + WiFiEventData.lastMacDisconnectedAPmode.toString().c_str(), + WiFi.softAPgetStationNum())); addLogMove(LOG_LEVEL_INFO, log); } #endif // ifndef BUILD_NO_DEBUG @@ -333,10 +333,10 @@ void processConnectAPmode() { #ifndef BUILD_NO_DEBUG if (loglevelActiveFor(LOG_LEVEL_INFO)) { - String log = F("AP Mode: Client connected: "); - log += WiFiEventData.lastMacConnectedAPmode.toString(); - log += F(" Connected devices: "); - log += WiFi.softAPgetStationNum(); + String log(strformat( + F("AP Mode: Client connected: %s Connected devices: %u"), + WiFiEventData.lastMacConnectedAPmode.toString().c_str(), + WiFi.softAPgetStationNum())); addLogMove(LOG_LEVEL_INFO, log); } #endif // ifndef BUILD_NO_DEBUG diff --git a/src/src/WebServer/SysInfoPage.cpp b/src/src/WebServer/SysInfoPage.cpp index 232d16665..0ffd9b76d 100644 --- a/src/src/WebServer/SysInfoPage.cpp +++ b/src/src/WebServer/SysInfoPage.cpp @@ -334,12 +334,21 @@ void handle_sysinfo_basicInfo() { getCPUload(), getLoopCountPerSec())); } + + static const LabelType::Enum labels[] PROGMEM = + { #if FEATURE_INTERNAL_TEMPERATURE - addRowLabelValue(LabelType::INTERNAL_TEMPERATURE); + LabelType::INTERNAL_TEMPERATURE, #endif - addRowLabelValue(LabelType::CPU_ECO_MODE); + LabelType::CPU_ECO_MODE, + LabelType::RESET_REASON, + LabelType::LAST_TASK_BEFORE_REBOOT, + LabelType::SW_WD_COUNT, + LabelType::MAX_LABEL + }; + addRowLabelValues(labels); addRowLabel(F("Boot")); { @@ -347,9 +356,6 @@ void handle_sysinfo_basicInfo() { addHtml(strformat( F(" (%d)"), static_cast(RTC.bootCounter))); } - addRowLabelValue(LabelType::RESET_REASON); - addRowLabelValue(LabelType::LAST_TASK_BEFORE_REBOOT); - addRowLabelValue(LabelType::SW_WD_COUNT); } #ifndef WEBSERVER_SYSINFO_MINIMAL @@ -408,9 +414,14 @@ void handle_sysinfo_memory() { addRowLabelValue(LabelType::PSRAM_SIZE); if (UsePSRAM()) { - addRowLabelValue(LabelType::PSRAM_FREE); - addRowLabelValue(LabelType::PSRAM_MIN_FREE); - addRowLabelValue(LabelType::PSRAM_MAX_FREE_BLOCK); + static const LabelType::Enum labels[] PROGMEM = + { + LabelType::PSRAM_FREE, + LabelType::PSRAM_MIN_FREE, + LabelType::PSRAM_MAX_FREE_BLOCK, + LabelType::MAX_LABEL + }; + addRowLabelValues(labels); } # endif // if defined(ESP32) && defined(BOARD_HAS_PSRAM) } @@ -665,22 +676,30 @@ void handle_sysinfo_ESP_Board() { chipID, formatToHex(chipID, 6).c_str())); - addRowLabelValue(LabelType::ESP_CHIP_FREQ); + static const LabelType::Enum labels[] PROGMEM = + { + LabelType::ESP_CHIP_FREQ, # ifdef ESP32 - addRowLabelValue(LabelType::ESP_CHIP_XTAL_FREQ); - addRowLabelValue(LabelType::ESP_CHIP_APB_FREQ); + LabelType::ESP_CHIP_XTAL_FREQ, + LabelType::ESP_CHIP_APB_FREQ, # endif // ifdef ESP32 - addRowLabelValue(LabelType::ESP_CHIP_MODEL); + LabelType::ESP_CHIP_MODEL, # if defined(ESP32) + LabelType::ESP_CHIP_REVISION, +# endif // if defined(ESP32) + LabelType::ESP_CHIP_CORES, + LabelType::BOARD_NAME, + LabelType::MAX_LABEL + }; + addRowLabelValues(labels); + + +#if defined(ESP32) addRowLabel(F("ESP Chip Features")); addHtml(getChipFeaturesString()); - - addRowLabelValue(LabelType::ESP_CHIP_REVISION); -# endif // if defined(ESP32) - addRowLabelValue(LabelType::ESP_CHIP_CORES); - addRowLabelValue(LabelType::BOARD_NAME); +#endif } # endif // ifndef WEBSERVER_SYSINFO_MINIMAL From 9d57e8b6efd542c20ff4955abf528c5c804eeb75 Mon Sep 17 00:00:00 2001 From: TD-er Date: Mon, 17 Feb 2025 22:06:35 +0100 Subject: [PATCH 029/564] [ESP8266] Fix crash on ESP8266 SDK 2.7.4 --- src/src/Helpers/StringConverter.cpp | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/src/src/Helpers/StringConverter.cpp b/src/src/Helpers/StringConverter.cpp index 6f71b78e4..ec3375cc7 100644 --- a/src/src/Helpers/StringConverter.cpp +++ b/src/src/Helpers/StringConverter.cpp @@ -109,9 +109,12 @@ bool reserve_special(String& str, size_t size) { void free_string(String& str) { // This is a call specifically tailored to what is done in: // void String::move(String &rhs) - + #if defined(ESP32) || defined(CORE_POST_3_0_0) str.clear(); // Prevent any unneeded copying String tmp(std::move(str)); + #else + str = String(); + #endif } /********************************************************************************************\ From fac4d97ca3319584105b4a3b96679700568ee8fc Mon Sep 17 00:00:00 2001 From: TD-er Date: Tue, 18 Feb 2025 17:26:52 +0100 Subject: [PATCH 030/564] [ESP8266] Balance more what should be allocated on 2nd heap --- src/_P082_GPS.ino | 11 +++-- src/src/Commands/InternalCommands.cpp | 2 +- src/src/CustomBuild/define_plugin_sets.h | 4 +- src/src/DataStructs/LogEntry.cpp | 11 ++--- src/src/DataStructs/NodeStruct.cpp | 38 +++++++-------- src/src/DataStructs/NodesHandler.cpp | 2 +- src/src/DataStructs/PluginStats_array.cpp | 6 +-- src/src/DataStructs/ProvisioningStruct.cpp | 2 +- src/src/DataStructs/ProvisioningStruct.h | 26 ++++++---- src/src/DataStructs/Web_StreamingBuffer.cpp | 12 ++++- src/src/DataStructs/WiFi_AP_Candidate.cpp | 48 ++++++++++++------- src/src/DataStructs/WiFi_AP_Candidate.h | 33 +++++++------ src/src/ESPEasyCore/ESPEasy_Log.cpp | 13 +++-- src/src/ESPEasyCore/ESPEasy_setup.cpp | 28 +++++------ src/src/Globals/Plugins.cpp | 24 ++++++---- src/src/Helpers/Memory.cpp | 14 ++++-- src/src/Helpers/RulesHelper.cpp | 3 +- src/src/Helpers/SerialWriteBuffer.cpp | 6 +-- src/src/Helpers/StringConverter.cpp | 10 ++-- src/src/Helpers/StringConverter.h | 4 +- src/src/Helpers/StringGenerator_GPIO.cpp | 14 +++--- .../Helpers/_Internal_GPIO_pulseHelper.cpp | 2 +- src/src/PluginStructs/P036_data_struct.cpp | 36 +++++++------- src/src/PluginStructs/P037_data_struct.cpp | 11 +++-- src/src/WebServer/ESPEasy_WebServer.cpp | 14 +++--- src/src/WebServer/Markup_Buttons.cpp | 12 ++--- 26 files changed, 210 insertions(+), 176 deletions(-) diff --git a/src/_P082_GPS.ino b/src/_P082_GPS.ino index d5bf404bb..1df45035c 100644 --- a/src/_P082_GPS.ino +++ b/src/_P082_GPS.ino @@ -314,11 +314,14 @@ boolean Plugin_082(uint8_t function, struct EventStruct *event, String& string) const int16_t serial_tx = CONFIG_PIN2; const int16_t pps_pin = CONFIG_PIN3; - # ifdef USE_SECOND_HEAP - HeapSelectIram ephemeral; - # endif // ifdef USE_SECOND_HEAP + // Try to allocate in PSRAM or 2nd heap if possible + constexpr unsigned size = sizeof(P082_data_struct); + void *ptr = special_calloc(1, size); + if (!ptr) { + return success; + } - initPluginTaskData(event->TaskIndex, new (std::nothrow) P082_data_struct()); + initPluginTaskData(event->TaskIndex, new (ptr) P082_data_struct()); P082_data_struct *P082_data = static_cast(getPluginTaskData(event->TaskIndex)); diff --git a/src/src/Commands/InternalCommands.cpp b/src/src/Commands/InternalCommands.cpp index f9a8b631a..f1337f2ae 100644 --- a/src/src/Commands/InternalCommands.cpp +++ b/src/src/Commands/InternalCommands.cpp @@ -66,7 +66,7 @@ bool checkNrArguments(const char *cmd, const String& Line, int nrArguments) { if (loglevelActiveFor(LOG_LEVEL_ERROR)) { String log; - if (log.reserve(128)) { + if (reserve_special(log, 128)) { log += F("Too many arguments: cmd="); log += cmd; diff --git a/src/src/CustomBuild/define_plugin_sets.h b/src/src/CustomBuild/define_plugin_sets.h index d3f2b000a..78c7c0563 100644 --- a/src/src/CustomBuild/define_plugin_sets.h +++ b/src/src/CustomBuild/define_plugin_sets.h @@ -55,7 +55,9 @@ To create/register a plugin, you have to : #define WEBSERVER_LOG #endif #ifndef WEBSERVER_GITHUB_COPY - #define WEBSERVER_GITHUB_COPY + #ifndef USE_SECOND_HEAP + #define WEBSERVER_GITHUB_COPY + #endif #endif #ifndef WEBSERVER_ROOT #define WEBSERVER_ROOT diff --git a/src/src/DataStructs/LogEntry.cpp b/src/src/DataStructs/LogEntry.cpp index 0dffb03f9..ac45bfd01 100644 --- a/src/src/DataStructs/LogEntry.cpp +++ b/src/src/DataStructs/LogEntry.cpp @@ -19,13 +19,12 @@ bool LogEntry_t::add(const uint8_t loglevel, const String& line) } { - #ifdef USE_SECOND_HEAP - - // Need to make a substring or a copy, which is a new allocation, on the 2nd heap - HeapSelectIram ephemeral; - #endif // ifdef USE_SECOND_HEAP - if (line.length() > LOG_STRUCT_MESSAGE_SIZE - 1) { + #ifdef USE_SECOND_HEAP + + // Need to make a substring or a copy, which is a new allocation, on the 2nd heap + HeapSelectIram ephemeral; + #endif // ifdef USE_SECOND_HEAP move_special(_message, line.substring(0, LOG_STRUCT_MESSAGE_SIZE - 1)); } else { reserve_special(_message, line.length()); diff --git a/src/src/DataStructs/NodeStruct.cpp b/src/src/DataStructs/NodeStruct.cpp index 99a8ac800..a7ab9af70 100644 --- a/src/src/DataStructs/NodeStruct.cpp +++ b/src/src/DataStructs/NodeStruct.cpp @@ -138,10 +138,10 @@ String NodeStruct::getNodeName() const { String res; size_t length = strnlen(reinterpret_cast(nodeName), sizeof(nodeName)); - res.reserve(length); - - for (size_t i = 0; i < length; ++i) { - res += static_cast(nodeName[i]); + if (reserve_special(res, length)) { + for (size_t i = 0; i < length; ++i) { + res += static_cast(nodeName[i]); + } } return res; } @@ -212,21 +212,21 @@ float NodeStruct::getLoad() const { String NodeStruct::getSummary() const { String res; - - res.reserve(48); - res = F("Unit: "); - res += unit; - res += F(" \""); - res += getNodeName(); - res += '"'; - res += F(" load: "); - res += String(getLoad(), 1); - res += F(" RSSI: "); - res += getRSSI(); - res += F(" ch: "); - res += channel; - res += F(" dst: "); - res += distance; + if (reserve_special(res, 48)) { + res = F("Unit: "); + res += unit; + res += F(" \""); + res += getNodeName(); + res += '"'; + res += F(" load: "); + res += String(getLoad(), 1); + res += F(" RSSI: "); + res += getRSSI(); + res += F(" ch: "); + res += channel; + res += F(" dst: "); + res += distance; + } return res; } diff --git a/src/src/DataStructs/NodesHandler.cpp b/src/src/DataStructs/NodesHandler.cpp index 0c3bd500e..14728d2f0 100644 --- a/src/src/DataStructs/NodesHandler.cpp +++ b/src/src/DataStructs/NodesHandler.cpp @@ -141,7 +141,7 @@ bool NodesHandler::addNode(const NodeStruct& node, const ESPEasy_now_traceroute_ if (traceRoute.getDistance() != 255) { if (loglevelActiveFor(LOG_LEVEL_INFO)) { String log; - if (log.reserve(80)) { + if (reserve_special(log, 80)) { log = F(ESPEASY_NOW_NAME); log += F(": Node: "); log += String(node.unit); diff --git a/src/src/DataStructs/PluginStats_array.cpp b/src/src/DataStructs/PluginStats_array.cpp index f23524f53..37141eedf 100644 --- a/src/src/DataStructs/PluginStats_array.cpp +++ b/src/src/DataStructs/PluginStats_array.cpp @@ -40,11 +40,7 @@ void PluginStats_array::initPluginStats(taskIndex_t taskIndex, taskVarIndex_t ta } if (ExtraTaskSettings.enabledPluginStats(taskVarIndex)) { - # ifdef USE_SECOND_HEAP - HeapSelectIram ephemeral; - # endif // ifdef USE_SECOND_HEAP - - // Try to allocate in PSRAM if possible + // Try to allocate in PSRAM or 2nd heap if possible constexpr unsigned size = sizeof(PluginStats); void *ptr = special_calloc(1, size); diff --git a/src/src/DataStructs/ProvisioningStruct.cpp b/src/src/DataStructs/ProvisioningStruct.cpp index e923975d1..839e84989 100644 --- a/src/src/DataStructs/ProvisioningStruct.cpp +++ b/src/src/DataStructs/ProvisioningStruct.cpp @@ -6,7 +6,7 @@ # include "../Helpers/Hardware.h" ProvisioningStruct::ProvisioningStruct() { - memset(this, 0, sizeof(ProvisioningStruct)); + _allBits = 0u; } void ProvisioningStruct::validate() { diff --git a/src/src/DataStructs/ProvisioningStruct.h b/src/src/DataStructs/ProvisioningStruct.h index 25a959721..f88a8b143 100644 --- a/src/src/DataStructs/ProvisioningStruct.h +++ b/src/src/DataStructs/ProvisioningStruct.h @@ -39,20 +39,26 @@ struct ProvisioningStruct char pass[64] = { 0 }; char url[128] = { 0 }; - struct { - uint16_t allowFetchFirmware :1; - uint16_t allowFetchConfigDat :1; - uint16_t allowFetchSecurityDat :1; - uint16_t allowFetchNotificationDat :1; - uint16_t allowFetchProvisioningDat :1; - uint16_t allowFetchRules :4; + union { + struct { + uint16_t allowFetchFirmware :1; + uint16_t allowFetchConfigDat :1; + uint16_t allowFetchSecurityDat :1; + uint16_t allowFetchNotificationDat :1; + uint16_t allowFetchProvisioningDat :1; + uint16_t allowFetchRules :4; - uint16_t unused :7; // Add to use full 16 bit. - } allowedFlags; + uint16_t unused :7; // Add to use full 16 bit. + } allowedFlags; + uint16_t _allBits; + }; }; typedef std::shared_ptr ProvisioningStruct_ptr_type; -# define MakeProvisioningSettings(T) ProvisioningStruct_ptr_type T(new (std::nothrow) ProvisioningStruct()); +//# define MakeProvisioningSettings(T) ProvisioningStruct_ptr_type T(new (std::nothrow) ProvisioningStruct()); + +#define MakeProvisioningSettings(T) void * calloc_ptr = special_calloc(1,sizeof(ProvisioningStruct)); ProvisioningStruct_ptr_type T(new (calloc_ptr) ProvisioningStruct()); + #endif // if FEATURE_CUSTOM_PROVISIONING diff --git a/src/src/DataStructs/Web_StreamingBuffer.cpp b/src/src/DataStructs/Web_StreamingBuffer.cpp index 24e4905d6..09313bf4c 100644 --- a/src/src/DataStructs/Web_StreamingBuffer.cpp +++ b/src/src/DataStructs/Web_StreamingBuffer.cpp @@ -294,7 +294,10 @@ void Web_StreamingBuffer::endStream() { lowMemorySkip = false; } delay(5); -// web_server.client().stop(); + #ifdef ESP8266 + web_server.client().stop(); + tcpCleanup(); + #endif } @@ -333,7 +336,14 @@ void Web_StreamingBuffer::sendContentBlocking(String& data) { if (length > 0) { web_server.sendContent(data); } web_server.sendContent("\r\n"); #else // ESP8266 2.4.0rc2 and higher and the ESP32 webserver supports chunked http transfer + #if defined(ESP8266) && defined(USE_SECOND_HEAP) + { + HeapSelectIram ephemeral; + web_server.sendContent(data); + } + #else web_server.sendContent(data); + #endif if (data.length() > (CHUNKED_BUFFER_SIZE + 1)) { free_string(data); // Clear also allocated memory diff --git a/src/src/DataStructs/WiFi_AP_Candidate.cpp b/src/src/DataStructs/WiFi_AP_Candidate.cpp index bf3738363..ce94585c4 100644 --- a/src/src/DataStructs/WiFi_AP_Candidate.cpp +++ b/src/src/DataStructs/WiFi_AP_Candidate.cpp @@ -32,18 +32,24 @@ country({ #endif last_seen(0), rssi(0), channel(0), index(0), enc_type(0) { - memset(&bits, 0, sizeof(bits)); + _allBits = 0u; } WiFi_AP_Candidate::WiFi_AP_Candidate(const WiFi_AP_Candidate& other) +: ssid(other.ssid), + last_seen(other.last_seen), + bssid(other.bssid), + rssi(other.rssi), + channel(other.channel), + index(other.index), + enc_type(other.enc_type) { - // All members other than ssid can be mem-copied - memcpy(this, &other, sizeof(WiFi_AP_Candidate)); - - // Make sure ssid isn't some kind of valid String with heap allocated memory - memset(&ssid, 0, sizeof(ssid)); - // Now copy the ssid String - ssid = other.ssid; + _allBits = other._allBits; + #ifdef ESP32 + # if ESP_IDF_VERSION_MAJOR >= 5 + memcpy(&this.country, &other.country, sizeof(wifi_country_t)); + #endif + #endif } WiFi_AP_Candidate::WiFi_AP_Candidate(uint8_t index_c, const String& ssid_c) : @@ -59,7 +65,7 @@ country({ #endif last_seen(0), rssi(0), channel(0), index(index_c), enc_type(0) { - memset(&bits, 0, sizeof(bits)); + _allBits = 0u; const size_t ssid_length = ssid_c.length(); @@ -76,7 +82,7 @@ WiFi_AP_Candidate::WiFi_AP_Candidate(uint8_t networkItem) : index(0) { // Need to make sure the phy isn't known as we can't get this information from the AP // See: https://github.com/letscontrolit/ESPEasy/issues/4996 // Not sure why this makes any difference as the flags should already have been set to 0. - memset(&bits, 0, sizeof(bits)); + _allBits = 0u; ssid = WiFi.SSID(networkItem); rssi = WiFi.RSSI(networkItem); @@ -129,8 +135,7 @@ WiFi_AP_Candidate::WiFi_AP_Candidate(const bss_info& ap) : phy_11b(ap.phy_11b), phy_11g(ap.phy_11g), phy_11n(ap.phy_11n), wps(ap.wps) { - memset(&bits, 0, sizeof(bits)); - + _allBits = 0u; last_seen = millis(); switch (ap.authmode) { @@ -180,13 +185,20 @@ bool WiFi_AP_Candidate::operator<(const WiFi_AP_Candidate& other) const { WiFi_AP_Candidate& WiFi_AP_Candidate::operator=(const WiFi_AP_Candidate& other) { - // All members other than ssid can be mem-copied - memcpy(this, &other, sizeof(WiFi_AP_Candidate)); - - // Make sure ssid isn't some kind of valid String with heap allocated memory - memset(&ssid, 0, sizeof(ssid)); - // Now copy the ssid String ssid = other.ssid; + last_seen = other.last_seen; + bssid = other.bssid; + rssi = other.rssi; + channel = other.channel; + index = other.index; + enc_type = other.enc_type; + _allBits = other._allBits; + #ifdef ESP32 + # if ESP_IDF_VERSION_MAJOR >= 5 + memcpy(&this.country, &other.country, sizeof(wifi_country_t)); + #endif + #endif + return *this; } diff --git a/src/src/DataStructs/WiFi_AP_Candidate.h b/src/src/DataStructs/WiFi_AP_Candidate.h index 82766ca51..970afe8f6 100644 --- a/src/src/DataStructs/WiFi_AP_Candidate.h +++ b/src/src/DataStructs/WiFi_AP_Candidate.h @@ -68,7 +68,7 @@ struct WiFi_AP_Candidate { return bits.phy_11b || bits.phy_11g || bits.phy_11n; } - String ssid; + String ssid; // String key; @@ -84,21 +84,24 @@ struct WiFi_AP_Candidate { uint8_t channel{}; uint8_t index{}; // Index of the matching credentials uint8_t enc_type{}; // Encryption used (e.g. WPA2) - struct { - uint16_t isHidden : 1; // Hidden SSID - uint16_t lowPriority : 1; // Try as last attempt - uint16_t isEmergencyFallback : 1; - uint16_t phy_11b : 1; - uint16_t phy_11g : 1; - uint16_t phy_11n : 1; - uint16_t phy_lr : 1; - uint16_t phy_11ax : 1; - uint16_t wps : 1; - uint16_t ftm_responder : 1; - uint16_t ftm_initiator : 1; + union { + struct { + uint16_t isHidden : 1; // Hidden SSID + uint16_t lowPriority : 1; // Try as last attempt + uint16_t isEmergencyFallback : 1; + uint16_t phy_11b : 1; + uint16_t phy_11g : 1; + uint16_t phy_11n : 1; + uint16_t phy_lr : 1; + uint16_t phy_11ax : 1; + uint16_t wps : 1; + uint16_t ftm_responder : 1; + uint16_t ftm_initiator : 1; - uint16_t unused : 5; - } bits; + uint16_t unused : 5; + } bits; + uint16_t _allBits; + }; }; #endif // ifndef DATASTRUCTS_WIFI_AP_CANDIDATES_H diff --git a/src/src/ESPEasyCore/ESPEasy_Log.cpp b/src/src/ESPEasyCore/ESPEasy_Log.cpp index b02ce2ca9..bcf69137e 100644 --- a/src/src/ESPEasyCore/ESPEasy_Log.cpp +++ b/src/src/ESPEasyCore/ESPEasy_Log.cpp @@ -351,15 +351,14 @@ void addToLogMove(uint8_t logLevel, String&& string) #endif if (string.isEmpty()) return; - addToSerialLog(logLevel, string); - addToSysLog(logLevel, string); - addToSDLog(logLevel, string); + String tmp; + move_special(tmp, std::move(string)); + addToSerialLog(logLevel, tmp); + addToSysLog(logLevel, tmp); + addToSDLog(logLevel, tmp); // May clear the string, so call as last one. if (loglevelActiveFor(LOG_TO_WEBLOG, logLevel)) { - Logging.add(logLevel, std::move(string)); - } else { - // Make sure the string may no longer keep up memory - free_string(string); + Logging.add(logLevel, std::move(tmp)); } } diff --git a/src/src/ESPEasyCore/ESPEasy_setup.cpp b/src/src/ESPEasyCore/ESPEasy_setup.cpp index 85043c42e..0f092f664 100644 --- a/src/src/ESPEasyCore/ESPEasy_setup.cpp +++ b/src/src/ESPEasyCore/ESPEasy_setup.cpp @@ -303,8 +303,7 @@ void ESPEasy_setup() readBootCause(); { - String log = F("INIT : "); - log += getLastBootCauseString(); + String log; if (readFromRTC()) { @@ -312,9 +311,8 @@ void ESPEasy_setup() RTC.bootCounter++; lastMixedSchedulerId_beforereboot.mixed_id = RTC.lastMixedSchedulerId; readUserVarFromRTC(); - - log += F(" #"); - log += RTC.bootCounter; + log = concat(F("INIT : "), getLastBootCauseString()) + + concat(F(" #"), RTC.bootCounter); #ifndef BUILD_NO_DEBUG log += F(" Last Action before Reboot: "); @@ -336,8 +334,7 @@ void ESPEasy_setup() log = F("INIT : Cold Boot"); } - log += F(" - Restart Reason: "); - log += getResetReasonString(); + log += concat(F(" - Restart Reason: "), getResetReasonString()); RTC.deepSleepState = 0; saveToRTC(); @@ -543,14 +540,15 @@ void ESPEasy_setup() if (loglevelActiveFor(LOG_LEVEL_INFO)) { String log; - log.reserve(80); - log += concat(F("INFO : Plugins: "), getDeviceCount() + 1); - log += ' '; - log += getPluginDescriptionString(); - log += F(" ("); - log += getSystemLibraryString(); - log += ')'; - addLogMove(LOG_LEVEL_INFO, log); + if (reserve_special(log, 80)) { + log += concat(F("INFO : Plugins: "), getDeviceCount() + 1); + log += ' '; + log += getPluginDescriptionString(); + log += F(" ("); + log += getSystemLibraryString(); + log += ')'; + addLogMove(LOG_LEVEL_INFO, log); + } } /* diff --git a/src/src/Globals/Plugins.cpp b/src/src/Globals/Plugins.cpp index 632d2ef3f..242cbb245 100644 --- a/src/src/Globals/Plugins.cpp +++ b/src/src/Globals/Plugins.cpp @@ -419,11 +419,14 @@ bool PluginCallForTask(taskIndex_t taskIndex, uint8_t Function, EventStruct *Tem LoadTaskSettings(taskIndex); if (ExtraTaskSettings.anyEnabledPluginStats()) { - # ifdef USE_SECOND_HEAP - HeapSelectIram ephemeral; - # endif // ifdef USE_SECOND_HEAP - initPluginTaskData(taskIndex, new (std::nothrow) _StatsOnly_data_struct()); + // Try to allocate in PSRAM or 2nd heap if possible + constexpr unsigned size = sizeof(_StatsOnly_data_struct); + void *ptr = special_calloc(1, size); + + if (ptr) { + initPluginTaskData(taskIndex, new (ptr) _StatsOnly_data_struct()); + } } } } @@ -448,10 +451,13 @@ bool PluginCallForTask(taskIndex_t taskIndex, uint8_t Function, EventStruct *Tem LoadTaskSettings(taskIndex); if (ExtraTaskSettings.anyEnabledPluginStats()) { - # ifdef USE_SECOND_HEAP - HeapSelectIram ephemeral; - # endif // ifdef USE_SECOND_HEAP - initPluginTaskData(taskIndex, new (std::nothrow) _StatsOnly_data_struct()); + // Try to allocate in PSRAM or 2nd heap if possible + constexpr unsigned size = sizeof(_StatsOnly_data_struct); + void *ptr = special_calloc(1, size); + + if (ptr) { + initPluginTaskData(taskIndex, new (std::nothrow) _StatsOnly_data_struct()); + } } } } @@ -700,7 +706,7 @@ bool PluginCall(uint8_t Function, struct EventStruct *event, String& str) const int freemem_end = ESP.getFreeHeap(); String log; - if (log.reserve(128)) { + if (reserve_special(log, 128)) { log = F("After PLUGIN_INIT "); log += F(" task: "); diff --git a/src/src/Helpers/Memory.cpp b/src/src/Helpers/Memory.cpp index 3a6432ff2..e7420f77a 100644 --- a/src/src/Helpers/Memory.cpp +++ b/src/src/Helpers/Memory.cpp @@ -176,10 +176,10 @@ void* special_calloc(size_t num, size_t size) { res = heap_caps_calloc(num, size, MALLOC_CAP_SPIRAM | MALLOC_CAP_8BIT); } #else // ifdef ESP32 - { + if (size > 64) { # ifdef USE_SECOND_HEAP - // Try allocating on ESP8266 2nd heap + // Try allocating on ESP8266 2nd heap, only when sufficiently large data is needed HeapSelectIram ephemeral; # endif // ifdef USE_SECOND_HEAP res = calloc(num, size); @@ -194,7 +194,13 @@ void* special_calloc(size_t num, size_t size) { #endif // ifdef USE_SECOND_HEAP res = calloc(num, size); } - +#if defined(ESP8266) && defined(USE_SECOND_HEAP) + if (res == nullptr) { + // Not successful, try allocating on (ESP8266) 2nd heap + HeapSelectIram ephemeral; + res = calloc(num, size); + } +#endif return res; } @@ -206,7 +212,7 @@ bool String_reserve_special(String& str, size_t size) { return true; } #ifdef USE_SECOND_HEAP - if (size >= 32) { + if (size >= 48) { // Only try to store larger strings here as those tend to be kept for a longer period. HeapSelectIram ephemeral; // String does round up to nearest multiple of 16 bytes, so no need to round up to multiples of 32 bit here diff --git a/src/src/Helpers/RulesHelper.cpp b/src/src/Helpers/RulesHelper.cpp index 3c9fafa92..bb969823e 100644 --- a/src/src/Helpers/RulesHelper.cpp +++ b/src/src/Helpers/RulesHelper.cpp @@ -18,8 +18,7 @@ bool rules_replace_common_mistakes(const String& from, const String& to, String& if (loglevelActiveFor(LOG_LEVEL_ERROR)) { String log; - - if (log.reserve(32 + from.length() + to.length() + line.length())) { + if (reserve_special(log, 32 + from.length() + to.length() + line.length())) { log = F("Rules (Syntax Error, auto-corrected): '"); log += from; log += F("' => '"); diff --git a/src/src/Helpers/SerialWriteBuffer.cpp b/src/src/Helpers/SerialWriteBuffer.cpp index 750a6c4bb..9321136f6 100644 --- a/src/src/Helpers/SerialWriteBuffer.cpp +++ b/src/src/Helpers/SerialWriteBuffer.cpp @@ -10,7 +10,7 @@ void SerialWriteBuffer_t::add(const String& line) #ifdef USE_SECOND_HEAP // Do not store in 2nd heap, std::dequeue cannot handle 2nd heap well - HeapSelectDram ephemeral; + HeapSelectIram ephemeral; #endif // ifdef USE_SECOND_HEAP int roomLeft = getRoomLeft(); @@ -37,7 +37,7 @@ void SerialWriteBuffer_t::add(char c) #ifdef USE_SECOND_HEAP // Do not store in 2nd heap, std::dequeue cannot handle 2nd heap well - HeapSelectDram ephemeral; + HeapSelectIram ephemeral; #endif // ifdef USE_SECOND_HEAP if (_buffer.size() > _maxSize) { @@ -118,7 +118,7 @@ int SerialWriteBuffer_t::getRoomLeft() const { #ifdef USE_SECOND_HEAP // Do not store in 2nd heap, std::dequeue cannot handle 2nd heap well - HeapSelectDram ephemeral; + HeapSelectIram ephemeral; #endif // ifdef USE_SECOND_HEAP int roomLeft = getMaxFreeBlock(); diff --git a/src/src/Helpers/StringConverter.cpp b/src/src/Helpers/StringConverter.cpp index ec3375cc7..a6ea8b0db 100644 --- a/src/src/Helpers/StringConverter.cpp +++ b/src/src/Helpers/StringConverter.cpp @@ -78,7 +78,7 @@ bool equals(const String& str, const char& c) { void move_special(String& dest, String&& source) { #ifdef USE_SECOND_HEAP // Only try to store larger strings here as those tend to be kept for a longer period. - if ((source.length() >= 32) && mmu_is_dram(&(source[0]))) { + if ((source.length() >= 64) && mmu_is_dram(&(source[0]))) { // The string was not allocated on the 2nd heap, so copy instead of move HeapSelectIram ephemeral; if (dest.reserve(source.length())) { @@ -734,11 +734,9 @@ String stripWrappingChar(const String& text, char wrappingChar) { const unsigned int length = text.length(); if ((length >= 2) && stringWrappedWithChar(text, wrappingChar)) { - # ifdef USE_SECOND_HEAP - HeapSelectIram ephemeral; - # endif // ifdef USE_SECOND_HEAP - - return text.substring(1, length - 1); + String dest; + move_special(dest,text.substring(1, length - 1)); + return dest; } return text; } diff --git a/src/src/Helpers/StringConverter.h b/src/src/Helpers/StringConverter.h index 61472b954..a8766e1f5 100644 --- a/src/src/Helpers/StringConverter.h +++ b/src/src/Helpers/StringConverter.h @@ -29,7 +29,7 @@ String concat(const char& str, const String &val); template String concat(const __FlashStringHelper * str, const T &val) { # ifdef USE_SECOND_HEAP - HeapSelectIram ephemeral; + HeapSelectDram ephemeral; # endif // ifdef USE_SECOND_HEAP String res(str); @@ -40,7 +40,7 @@ String concat(const __FlashStringHelper * str, const T &val) { template String concat(const String& str, const T &val) { # ifdef USE_SECOND_HEAP - HeapSelectIram ephemeral; + HeapSelectDram ephemeral; # endif // ifdef USE_SECOND_HEAP String res(str); diff --git a/src/src/Helpers/StringGenerator_GPIO.cpp b/src/src/Helpers/StringGenerator_GPIO.cpp index e33823d1a..29ceef03c 100644 --- a/src/src/Helpers/StringGenerator_GPIO.cpp +++ b/src/src/Helpers/StringGenerator_GPIO.cpp @@ -39,14 +39,14 @@ String formatGpioName(const __FlashStringHelper * label, gpio_direction directio reserveLength += 11; } String result; + if (reserve_special(result, reserveLength)) { + result += F("GPIO "); + result += formatGpioDirection(direction); + result += label; - result.reserve(reserveLength); - result += F("GPIO "); - result += formatGpioDirection(direction); - result += label; - - if (optional) { - result += F("(optional)"); + if (optional) { + result += F("(optional)"); + } } return result; } diff --git a/src/src/Helpers/_Internal_GPIO_pulseHelper.cpp b/src/src/Helpers/_Internal_GPIO_pulseHelper.cpp index ccba8caa8..35aa0c805 100644 --- a/src/src/Helpers/_Internal_GPIO_pulseHelper.cpp +++ b/src/src/Helpers/_Internal_GPIO_pulseHelper.cpp @@ -461,7 +461,7 @@ void Internal_GPIO_pulseHelper::doTimingLogging(uint8_t logLevel) // Timer to logfile. E.g: ... [4|12000|13444|12243|3244] String log; - if (log.reserve(120)) { + if (reserve_special(log, 120)) { log = strformat(F("Pulse:OverDueStats (GPIO) [dbTim] {step0OdCnt} [maxOdTimeStep0|1|2|3]= (%d) [%d] {%d} ["), config.gpio, config.debounceTime, diff --git a/src/src/PluginStructs/P036_data_struct.cpp b/src/src/PluginStructs/P036_data_struct.cpp index 1af417957..8ade3e86e 100644 --- a/src/src/PluginStructs/P036_data_struct.cpp +++ b/src/src/PluginStructs/P036_data_struct.cpp @@ -51,15 +51,12 @@ String P036_LineContent::saveDisplayLines(taskIndex_t taskIndex) { if (FreeMem() > 8000) { // Write in one single chunk. tDisplayLines_storage_full *tmp = nullptr; - # ifdef USE_SECOND_HEAP - { - HeapSelectIram ephemeral; - tmp = new (std::nothrow) tDisplayLines_storage_full; - } - # endif // ifdef USE_SECOND_HEAP - if (tmp == nullptr) { - tmp = new (std::nothrow) tDisplayLines_storage_full; + // Try to allocate in PSRAM or 2nd heap if possible + constexpr unsigned size = sizeof(tDisplayLines_storage_full); + void *ptr = special_calloc(1, size); + if (ptr) { + tmp = new (ptr) tDisplayLines_storage_full; } if (tmp != nullptr) { @@ -231,10 +228,13 @@ bool P036_data_struct::init(taskIndex_t taskIndex, } { - # ifdef USE_SECOND_HEAP - HeapSelectIram ephemeral; - # endif // ifdef USE_SECOND_HEAP - LineContent = new (std::nothrow) P036_LineContent(); + // Try to allocate in PSRAM or 2nd heap if possible + constexpr unsigned size = sizeof(P036_LineContent); + void *ptr = special_calloc(1, size); + + if (ptr) { + LineContent = new (ptr) P036_LineContent(); + } } if (isInitialized()) { @@ -723,11 +723,15 @@ void P036_data_struct::setOrientationRotated(bool rotated) { void P036_data_struct::RestoreLineContent(taskIndex_t taskIndex, uint8_t LoadVersion, uint8_t LineNo) { - # ifdef USE_SECOND_HEAP - HeapSelectIram ephemeral; - # endif // ifdef USE_SECOND_HEAP + // Try to allocate in PSRAM or 2nd heap if possible + constexpr unsigned size = sizeof(P036_LineContent); + void *ptr = special_calloc(1, size); - P036_LineContent *TempContent = new (std::nothrow) P036_LineContent(); + if (!ptr) { + return; + } + + P036_LineContent *TempContent = new (ptr) P036_LineContent(); if (TempContent != nullptr) { TempContent->loadDisplayLines(taskIndex, LoadVersion); diff --git a/src/src/PluginStructs/P037_data_struct.cpp b/src/src/PluginStructs/P037_data_struct.cpp index cbc56046b..2722d0ddf 100644 --- a/src/src/PluginStructs/P037_data_struct.cpp +++ b/src/src/PluginStructs/P037_data_struct.cpp @@ -973,11 +973,12 @@ bool P037_data_struct::parseJSONMessage(const String& message) { } if (nullptr == root) { - # ifdef USE_SECOND_HEAP - HeapSelectIram ephemeral; - # endif // ifdef USE_SECOND_HEAP - - root = new (std::nothrow) DynamicJsonDocument(lastJsonMessageLength); // Dynamic allocation + // Try to allocate in PSRAM or 2nd heap if possible + constexpr unsigned size = sizeof(DynamicJsonDocument); + void *ptr = special_calloc(1, size); + if (ptr) { + root = new (ptr) DynamicJsonDocument(lastJsonMessageLength); // Dynamic allocation + } } if (nullptr != root) { diff --git a/src/src/WebServer/ESPEasy_WebServer.cpp b/src/src/WebServer/ESPEasy_WebServer.cpp index b5311c349..ad7fa2294 100644 --- a/src/src/WebServer/ESPEasy_WebServer.cpp +++ b/src/src/WebServer/ESPEasy_WebServer.cpp @@ -166,8 +166,8 @@ void sendHeadandTail_stdtemplate(bool Tail, bool rebooting) { // We have sent a lot of data at once. // try to flush it to the connected client to free up some RAM // from pending transfers - TXBuffer.flush(); - delay(10); +// TXBuffer.flush(); +// delay(10); } bool captivePortal() { @@ -1093,12 +1093,10 @@ void getStorageTableSVG(SettingsType::Enum settingsType) { float textYoffset = yOffset + 0.9f * SVG_BAR_HEIGHT; if (struct_size != 0) { - String text; - text.reserve(32); - text += formatHumanReadable(struct_size, 1024); - text += '/'; - text += formatHumanReadable(max_size, 1024); - text += F(" per item"); + String text = strformat( + F("%s/%s per item"), + formatHumanReadable(struct_size, 1024).c_str(), + formatHumanReadable(max_size, 1024).c_str()); createSvgTextElement(text, textXoffset, textYoffset); } else { createSvgTextElement(F("Variable size"), textXoffset, textYoffset); diff --git a/src/src/WebServer/Markup_Buttons.cpp b/src/src/WebServer/Markup_Buttons.cpp index 220cb1734..0b074508c 100644 --- a/src/src/WebServer/Markup_Buttons.cpp +++ b/src/src/WebServer/Markup_Buttons.cpp @@ -3,6 +3,8 @@ #include "../WebServer/common.h" #include "../WebServer/HTML_wrappers.h" +#include "../Helpers/StringConverter.h" + #include "../Static/WebStaticData.h" @@ -153,15 +155,7 @@ void addSubmitButton(const String& value, const String& name, const String& clas { addHtml(F(" 0) { - fullClasses += ' '; - fullClasses += classes; - } - addHtmlAttribute(F("class"), fullClasses); + addHtmlAttribute(F("class"), concat(F("button link "), classes)); } addHtmlAttribute(F("type"), F("submit")); addHtmlAttribute(F("value"), value); From e84d07fba624bb27331357d358e22a3fe18ce860 Mon Sep 17 00:00:00 2001 From: TD-er Date: Tue, 18 Feb 2025 23:08:51 +0100 Subject: [PATCH 031/564] [Build] Fix build issues on ESP32-xx --- src/src/DataStructs/NodeStruct.cpp | 6 ++++++ src/src/DataStructs/WiFi_AP_Candidate.cpp | 4 ++-- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/src/src/DataStructs/NodeStruct.cpp b/src/src/DataStructs/NodeStruct.cpp index a7ab9af70..d7297dc71 100644 --- a/src/src/DataStructs/NodeStruct.cpp +++ b/src/src/DataStructs/NodeStruct.cpp @@ -2,11 +2,17 @@ #if FEATURE_ESPEASY_P2P #include "../../ESPEasy-Globals.h" + #include "../DataTypes/NodeTypeID.h" + #include "../ESPEasyCore/ESPEasyNetwork.h" + #include "../Globals/SecuritySettings.h" #include "../Globals/Settings.h" + #include "../Helpers/ESPEasy_time_calc.h" +#include "../Helpers/StringConverter.h" + #define NODE_STRUCT_AGE_TIMEOUT 300000 // 5 minutes diff --git a/src/src/DataStructs/WiFi_AP_Candidate.cpp b/src/src/DataStructs/WiFi_AP_Candidate.cpp index ce94585c4..a286b8cea 100644 --- a/src/src/DataStructs/WiFi_AP_Candidate.cpp +++ b/src/src/DataStructs/WiFi_AP_Candidate.cpp @@ -47,7 +47,7 @@ WiFi_AP_Candidate::WiFi_AP_Candidate(const WiFi_AP_Candidate& other) _allBits = other._allBits; #ifdef ESP32 # if ESP_IDF_VERSION_MAJOR >= 5 - memcpy(&this.country, &other.country, sizeof(wifi_country_t)); + memcpy(&this->country, &other.country, sizeof(wifi_country_t)); #endif #endif } @@ -195,7 +195,7 @@ WiFi_AP_Candidate& WiFi_AP_Candidate::operator=(const WiFi_AP_Candidate& other) _allBits = other._allBits; #ifdef ESP32 # if ESP_IDF_VERSION_MAJOR >= 5 - memcpy(&this.country, &other.country, sizeof(wifi_country_t)); + memcpy(&this->country, &other.country, sizeof(wifi_country_t)); #endif #endif From e94cbce20d46e32e617d3e6e4c12546153762517 Mon Sep 17 00:00:00 2001 From: TD-er Date: Wed, 19 Feb 2025 17:44:03 +0100 Subject: [PATCH 032/564] [Memory] Make memory allocation on ESP8266 2nd heap more stable --- platformio_esp82xx_base.ini | 8 + platformio_esp82xx_envs.ini | 20 ++ src/_N001_Email.cpp | 19 +- src/_N002_Buzzer.cpp | 12 +- src/_P002_ADC.ino | 9 +- src/_P036_FrameOLED.ino | 11 +- .../DataStructs/NotificationSettingsStruct.h | 8 +- src/src/Helpers/Memory.cpp | 6 +- src/src/PluginStructs/P036_data_struct.cpp | 3 + src/src/WebServer/NotificationPage.cpp | 300 +++++++++--------- 10 files changed, 231 insertions(+), 165 deletions(-) diff --git a/platformio_esp82xx_base.ini b/platformio_esp82xx_base.ini index c64d7e285..bc45ac8b5 100644 --- a/platformio_esp82xx_base.ini +++ b/platformio_esp82xx_base.ini @@ -107,6 +107,14 @@ build_flags = ${beta_platform.build_flags} lib_ignore = ${beta_platform.lib_ignore} ${no_ir.lib_ignore} +[normal_beta_2ndheap] +platform = ${beta_platform_2ndheap.platform} +platform_packages = ${beta_platform_2ndheap.platform_packages} +build_flags = ${beta_platform_2ndheap.build_flags} + -DBUILD_NO_DEBUG +lib_ignore = ${beta_platform.lib_ignore} + ${no_ir.lib_ignore} + ;;; COLLECTION ******************************************************** ; additional plugins (and dependend code) that is marked as COLLECTION ; ; Includes "normal" + "collection" plugins ; diff --git a/platformio_esp82xx_envs.ini b/platformio_esp82xx_envs.ini index e33f76713..a51d074c3 100644 --- a/platformio_esp82xx_envs.ini +++ b/platformio_esp82xx_envs.ini @@ -300,6 +300,26 @@ build_flags = ${normal.build_flags} -D NO_LIMIT_BUILD_SIZE lib_ignore = ${normal.lib_ignore} +[env:normal_beta_2ndheap_ESP8266_4M1M] +extends = esp8266_4M1M +platform = ${normal_beta_2ndheap.platform} +platform_packages = ${normal_beta_2ndheap.platform_packages} +build_flags = ${normal_beta_2ndheap.build_flags} + ${esp8266_4M1M.build_flags} + -D NO_LIMIT_BUILD_SIZE +lib_ignore = ${normal_beta_2ndheap.lib_ignore} + + +[env:normal_beta_2ndheap_ESP8266_4M1M_VCC] +extends = esp8266_4M1M +platform = ${normal_beta_2ndheap.platform} +platform_packages = ${normal_beta_2ndheap.platform_packages} +build_flags = ${normal_beta_2ndheap.build_flags} + ${esp8266_4M1M.build_flags} + -D FEATURE_ADC_VCC=1 + -D NO_LIMIT_BUILD_SIZE +lib_ignore = ${normal_beta_2ndheap.lib_ignore} + ; NORMAL: 16M version --- LittleFS -------------- ; LittleFS is determined by using "LittleFS" in the pio env name diff --git a/src/_N001_Email.cpp b/src/_N001_Email.cpp index 4bc89182d..30a652bc8 100644 --- a/src/_N001_Email.cpp +++ b/src/_N001_Email.cpp @@ -56,9 +56,9 @@ bool NPlugin_001(NPlugin::Function function, struct EventStruct *event, String& // if (command == F("email")) // { // MakeNotificationSettings(NotificationSettings); - // LoadNotificationSettings(event->NotificationIndex, (uint8_t*)&NotificationSettings, sizeof(NotificationSettingsStruct)); - // NPlugin_001_send(NotificationSettings.Domain, NotificationSettings.Receiver, NotificationSettings.Sender, - // NotificationSettings.Subject, NotificationSettings.Body, NotificationSettings.Server, NotificationSettings.Port); + // LoadNotificationSettings(event->NotificationIndex, (uint8_t *)NotificationSettings.get(), sizeof(NotificationSettingsStruct)); + // NPlugin_001_send(NotificationSettings->Domain, NotificationSettings->Receiver, NotificationSettings->Sender, + // NotificationSettings->Subject, NotificationSettings->Body, NotificationSettings->Server, NotificationSettings->Port); // success = true; // } // break; @@ -67,11 +67,14 @@ bool NPlugin_001(NPlugin::Function function, struct EventStruct *event, String& case NPlugin::Function::NPLUGIN_NOTIFY: { MakeNotificationSettings(NotificationSettings); - LoadNotificationSettings(event->NotificationIndex, (uint8_t *)&NotificationSettings, sizeof(NotificationSettingsStruct)); - NotificationSettings.validate(); + if (!AllocatedNotificationSettings()) { + break; + } + LoadNotificationSettings(event->NotificationIndex, (uint8_t *)NotificationSettings.get(), sizeof(NotificationSettingsStruct)); + NotificationSettings->validate(); - String subject = NotificationSettings.Subject; - String body = NotificationSettings.Body; + String subject = NotificationSettings->Subject; + String body = NotificationSettings->Body; if (!event->String1.isEmpty()) { body = event->String1; @@ -80,7 +83,7 @@ bool NPlugin_001(NPlugin::Function function, struct EventStruct *event, String& if (!event->String2.isEmpty()) { subject = event->String2; } - NPlugin_001_send(NotificationSettings, subject, body); + NPlugin_001_send(*NotificationSettings, subject, body); success = true; break; } diff --git a/src/_N002_Buzzer.cpp b/src/_N002_Buzzer.cpp index 008d213c9..1bcd867c0 100644 --- a/src/_N002_Buzzer.cpp +++ b/src/_N002_Buzzer.cpp @@ -46,7 +46,7 @@ bool NPlugin_002(NPlugin::Function function, struct EventStruct *event, String& // if (command == F("buzzer")) // { // MakeNotificationSettings(NotificationSettings); - // LoadNotificationSettings(event->NotificationIndex, (uint8_t*)&NotificationSettings, sizeof(NotificationSettingsStruct)); + // LoadNotificationSettings(event->NotificationIndex, (uint8_t *)NotificationSettings.get(), sizeof(NotificationSettingsStruct)); // success = true; // } // break; @@ -55,10 +55,14 @@ bool NPlugin_002(NPlugin::Function function, struct EventStruct *event, String& case NPlugin::Function::NPLUGIN_NOTIFY: { MakeNotificationSettings(NotificationSettings); - LoadNotificationSettings(event->NotificationIndex, (uint8_t*)&NotificationSettings, sizeof(NotificationSettingsStruct)); - NotificationSettings.validate(); + if (!AllocatedNotificationSettings()) { + break; + } + + LoadNotificationSettings(event->NotificationIndex, (uint8_t *)NotificationSettings.get(), sizeof(NotificationSettingsStruct)); + NotificationSettings->validate(); //this reserves IRAM and uninitialized RAM - tone_espEasy(NotificationSettings.Pin1, 440, 500); + tone_espEasy(NotificationSettings->Pin1, 440, 500); success = true; } diff --git a/src/_P002_ADC.ino b/src/_P002_ADC.ino index 21fa91268..920213d51 100644 --- a/src/_P002_ADC.ino +++ b/src/_P002_ADC.ino @@ -57,7 +57,14 @@ boolean Plugin_002(uint8_t function, struct EventStruct *event, String& string) P002_data->webformLoad(event); success = true; } else { - P002_data = new (std::nothrow) P002_data_struct(); + constexpr unsigned size = sizeof(P002_data_struct); + void *ptr = special_calloc(1, size); + + if (ptr == nullptr) { + break; + } + + P002_data = new (ptr) P002_data_struct(); if (nullptr != P002_data) { P002_data->init(event); diff --git a/src/_P036_FrameOLED.ino b/src/_P036_FrameOLED.ino index 6070a3337..0beba24f2 100644 --- a/src/_P036_FrameOLED.ino +++ b/src/_P036_FrameOLED.ino @@ -711,11 +711,12 @@ boolean Plugin_036(uint8_t function, struct EventStruct *event, String& string) P036_CheckHeap(F("_INIT: Entering")); # endif // P036_CHECK_HEAP { - # ifdef USE_SECOND_HEAP - HeapSelectIram ephemeral; - # endif // ifdef USE_SECOND_HEAP - - initPluginTaskData(event->TaskIndex, new (std::nothrow) P036_data_struct()); + constexpr unsigned size = sizeof(P036_data_struct); + void *ptr = special_calloc(1, size); + + if (ptr != nullptr) { + initPluginTaskData(event->TaskIndex, new (ptr) P036_data_struct()); + } } # ifdef P036_CHECK_HEAP P036_CheckHeap(F("_INIT: Before (*P036_data = static_cast)")); diff --git a/src/src/DataStructs/NotificationSettingsStruct.h b/src/src/DataStructs/NotificationSettingsStruct.h index 58827fcc7..4684bbeaf 100644 --- a/src/src/DataStructs/NotificationSettingsStruct.h +++ b/src/src/DataStructs/NotificationSettingsStruct.h @@ -36,8 +36,12 @@ struct NotificationSettingsStruct }; typedef std::shared_ptr NotificationSettingsStruct_ptr_type; -#define MakeNotificationSettings(T) NotificationSettingsStruct_ptr_type NotificationSettingsStruct_ptr(new (std::nothrow) NotificationSettingsStruct());\ - NotificationSettingsStruct& T = *NotificationSettingsStruct_ptr; + +#define MakeNotificationSettings(T) void * calloc_ptr = special_calloc(1,sizeof(NotificationSettingsStruct)); NotificationSettingsStruct_ptr_type T(new (calloc_ptr) NotificationSettingsStruct()); + +// Check to see if MakeNotificationSettings was successful +#define AllocatedNotificationSettings() (NotificationSettings.get() != nullptr) + // Need to make sure every byte between the members is also zero // Otherwise the checksum will fail and settings will be saved too often. diff --git a/src/src/Helpers/Memory.cpp b/src/src/Helpers/Memory.cpp index e7420f77a..2096a86e2 100644 --- a/src/src/Helpers/Memory.cpp +++ b/src/src/Helpers/Memory.cpp @@ -176,14 +176,14 @@ void* special_calloc(size_t num, size_t size) { res = heap_caps_calloc(num, size, MALLOC_CAP_SPIRAM | MALLOC_CAP_8BIT); } #else // ifdef ESP32 - if (size > 64) { # ifdef USE_SECOND_HEAP + if (size > 64 || FreeMem() < 5000) { // Try allocating on ESP8266 2nd heap, only when sufficiently large data is needed HeapSelectIram ephemeral; -# endif // ifdef USE_SECOND_HEAP res = calloc(num, size); } +# endif // ifdef USE_SECOND_HEAP #endif // ifdef ESP32 if (res == nullptr) { @@ -212,7 +212,7 @@ bool String_reserve_special(String& str, size_t size) { return true; } #ifdef USE_SECOND_HEAP - if (size >= 48) { + if (size >= 48 || FreeMem() < 5000) { // Only try to store larger strings here as those tend to be kept for a longer period. HeapSelectIram ephemeral; // String does round up to nearest multiple of 16 bytes, so no need to round up to multiples of 32 bit here diff --git a/src/src/PluginStructs/P036_data_struct.cpp b/src/src/PluginStructs/P036_data_struct.cpp index 8ade3e86e..a7bd15c3c 100644 --- a/src/src/PluginStructs/P036_data_struct.cpp +++ b/src/src/PluginStructs/P036_data_struct.cpp @@ -19,6 +19,9 @@ # include void P036_LineContent::loadDisplayLines(taskIndex_t taskIndex, uint8_t LoadVersion) { + #ifdef USE_SECOND_HEAP + HeapSelectIram ephemeral; + #endif if (LoadVersion == 0) { // read data of version 0 (up to 22.11.2019) String DisplayLinesV0[P36_Nlines]; // used to load the CustomTaskSettings for V0 diff --git a/src/src/WebServer/NotificationPage.cpp b/src/src/WebServer/NotificationPage.cpp index f5e830901..7852bd71a 100644 --- a/src/src/WebServer/NotificationPage.cpp +++ b/src/src/WebServer/NotificationPage.cpp @@ -34,7 +34,6 @@ # include "../Globals/NPlugins.h" - void handle_notifications() { # ifndef BUILD_NO_RAM_TRACKER checkRAM(F("handle_notifications")); @@ -67,43 +66,51 @@ void handle_notifications() { } else { MakeNotificationSettings(NotificationSettings); - if (Settings.Notification[notificationindex] != notification.value) - { - Settings.Notification[notificationindex] = notification.value; - } - else - { - if (Settings.Notification[notificationindex] != INVALID_N_PLUGIN_ID.value) + if (!AllocatedNotificationSettings()) { + addHtmlError(F("Out of memory!")); + } else { + + if (Settings.Notification[notificationindex] != notification.value) { - nprotocolIndex_t NotificationProtocolIndex = getNProtocolIndex_from_NotifierIndex(notificationindex); + Settings.Notification[notificationindex] = notification.value; + } + else + { + if (Settings.Notification[notificationindex] != INVALID_N_PLUGIN_ID.value) + { + nprotocolIndex_t NotificationProtocolIndex = getNProtocolIndex_from_NotifierIndex(notificationindex); - if (validNProtocolIndex(NotificationProtocolIndex)) { - String dummyString; - NPlugin_ptr[NotificationProtocolIndex](NPlugin::Function::NPLUGIN_WEBFORM_SAVE, 0, dummyString); + if (validNProtocolIndex(NotificationProtocolIndex)) { + String dummyString; + NPlugin_ptr[NotificationProtocolIndex](NPlugin::Function::NPLUGIN_WEBFORM_SAVE, 0, dummyString); + } + + // Reload & overwrite + LoadNotificationSettings(notificationindex, reinterpret_cast(NotificationSettings.get()), + sizeof(NotificationSettingsStruct)); + NotificationSettings->validate(); + NotificationSettings->Port = getFormItemInt(F("port"), 0); + + NotificationSettings->Timeout_ms = getFormItemInt(F("timeout"), NPLUGIN_001_DEF_TM); + NotificationSettings->Pin1 = getFormItemInt(F("pin1"), -1); + NotificationSettings->Pin2 = getFormItemInt(F("pin2"), -1); + Settings.NotificationEnabled[notificationindex] = isFormItemChecked(F("notificationenabled")); + strncpy_webserver_arg(NotificationSettings->Domain, F("domain")); + strncpy_webserver_arg(NotificationSettings->Server, F("server")); + strncpy_webserver_arg(NotificationSettings->Sender, F("sender")); + strncpy_webserver_arg(NotificationSettings->Receiver, F("receiver")); + strncpy_webserver_arg(NotificationSettings->Subject, F("subject")); + strncpy_webserver_arg(NotificationSettings->User, F("username")); + strncpy_webserver_arg(NotificationSettings->Body, F("body")); + + copyFormPassword(F("password"), NotificationSettings->Pass, sizeof(NotificationSettings->Pass)); } - - // Reload & overwrite - LoadNotificationSettings(notificationindex, reinterpret_cast(&NotificationSettings), sizeof(NotificationSettingsStruct)); - NotificationSettings.validate(); - NotificationSettings.Port = getFormItemInt(F("port"), 0); - - NotificationSettings.Timeout_ms = getFormItemInt(F("timeout"), NPLUGIN_001_DEF_TM); - NotificationSettings.Pin1 = getFormItemInt(F("pin1"), -1); - NotificationSettings.Pin2 = getFormItemInt(F("pin2"), -1); - Settings.NotificationEnabled[notificationindex] = isFormItemChecked(F("notificationenabled")); - strncpy_webserver_arg(NotificationSettings.Domain, F("domain")); - strncpy_webserver_arg(NotificationSettings.Server, F("server")); - strncpy_webserver_arg(NotificationSettings.Sender, F("sender")); - strncpy_webserver_arg(NotificationSettings.Receiver, F("receiver")); - strncpy_webserver_arg(NotificationSettings.Subject, F("subject")); - strncpy_webserver_arg(NotificationSettings.User, F("username")); - strncpy_webserver_arg(NotificationSettings.Body, F("body")); - - copyFormPassword(F("password"), NotificationSettings.Pass, sizeof(NotificationSettings.Pass)); } } - addHtmlError(SaveNotificationSettings(notificationindex, reinterpret_cast(&NotificationSettings), - sizeof(NotificationSettingsStruct))); + addHtmlError(SaveNotificationSettings( + notificationindex, + reinterpret_cast(NotificationSettings.get()), + sizeof(NotificationSettingsStruct))); } // Save the settings. @@ -138,51 +145,55 @@ void handle_notifications() { MakeNotificationSettings(NotificationSettings); - for (uint8_t x = 0; x < NOTIFICATION_MAX; x++) - { - LoadNotificationSettings(x, reinterpret_cast(&NotificationSettings), sizeof(NotificationSettingsStruct)); - NotificationSettings.validate(); - html_TR_TD(); - html_add_button_prefix(); - addHtml(F("notifications?index=")); - addHtmlInt(x + 1); - addHtml(F("'>Edit")); - html_TD(); - addHtmlInt(x + 1); - html_TD(); - - if (Settings.Notification[x] != INVALID_N_PLUGIN_ID.value) + if (!AllocatedNotificationSettings()) { + addHtmlError(F("Out of memory!")); + } else { + for (uint8_t x = 0; x < NOTIFICATION_MAX; x++) { - addEnabled(Settings.NotificationEnabled[x]); - + LoadNotificationSettings(x, reinterpret_cast(NotificationSettings.get()), sizeof(NotificationSettingsStruct)); + NotificationSettings->validate(); + html_TR_TD(); + html_add_button_prefix(); + addHtml(F("notifications?index=")); + addHtmlInt(x + 1); + addHtml(F("'>Edit")); + html_TD(); + addHtmlInt(x + 1); html_TD(); - uint8_t NotificationProtocolIndex = getNProtocolIndex(npluginID_t::toPluginID(Settings.Notification[x])); - String NotificationName = F("(plugin not found?)"); - if (validNProtocolIndex(NotificationProtocolIndex)) + if (Settings.Notification[x] != INVALID_N_PLUGIN_ID.value) { - NPlugin_ptr[NotificationProtocolIndex](NPlugin::Function::NPLUGIN_GET_DEVICENAME, 0, NotificationName); - } - addHtml(NotificationName); - html_TD(); - addHtml(NotificationSettings.Server); - html_TD(); + addEnabled(Settings.NotificationEnabled[x]); - if (NotificationSettings.Port) { - addHtmlInt(NotificationSettings.Port); - } else { - // MFD: we display the GPIO - addGpioHtml(NotificationSettings.Pin1); + html_TD(); + uint8_t NotificationProtocolIndex = getNProtocolIndex(npluginID_t::toPluginID(Settings.Notification[x])); + String NotificationName = F("(plugin not found?)"); - if (NotificationSettings.Pin2 >= 0) + if (validNProtocolIndex(NotificationProtocolIndex)) { - html_BR(); - addGpioHtml(NotificationSettings.Pin2); + NPlugin_ptr[NotificationProtocolIndex](NPlugin::Function::NPLUGIN_GET_DEVICENAME, 0, NotificationName); + } + addHtml(NotificationName); + html_TD(); + addHtml(NotificationSettings->Server); + html_TD(); + + if (NotificationSettings->Port) { + addHtmlInt(NotificationSettings->Port); + } else { + // MFD: we display the GPIO + addGpioHtml(NotificationSettings->Pin1); + + if (NotificationSettings->Pin2 >= 0) + { + html_BR(); + addGpioHtml(NotificationSettings->Pin2); + } } } - } - else { - html_TD(3); + else { + html_TD(3); + } } } html_end_table(); @@ -213,88 +224,93 @@ void handle_notifications() { if (Settings.Notification[notificationindex] != INVALID_N_PLUGIN_ID.value) { MakeNotificationSettings(NotificationSettings); - LoadNotificationSettings(notificationindex, reinterpret_cast(&NotificationSettings), sizeof(NotificationSettingsStruct)); - NotificationSettings.validate(); - nprotocolIndex_t NotificationProtocolIndex = getNProtocolIndex_from_NotifierIndex(notificationindex); + if (!AllocatedNotificationSettings()) { + addHtmlError(F("Out of memory!")); + } else { + LoadNotificationSettings(notificationindex, reinterpret_cast(NotificationSettings.get()), sizeof(NotificationSettingsStruct)); + NotificationSettings->validate(); - if (validNProtocolIndex(NotificationProtocolIndex)) - { - if (Notification[NotificationProtocolIndex].usesMessaging) + nprotocolIndex_t NotificationProtocolIndex = getNProtocolIndex_from_NotifierIndex(notificationindex); + + if (validNProtocolIndex(NotificationProtocolIndex)) { - if (NotificationSettings.Port == 0) { -# if FEATURE_EMAIL_TLS - NotificationSettings.Port = 465; -# else // if FEATURE_EMAIL_TLS - NotificationSettings.Port = 25; -# endif // if FEATURE_EMAIL_TLS - } - - addFormSubHeader(F("SMTP Server Settings")); - addFormTextBox(F("Domain"), F("domain"), NotificationSettings.Domain, sizeof(NotificationSettings.Domain) - 1); - addFormTextBox(F("Server"), F("server"), NotificationSettings.Server, sizeof(NotificationSettings.Server) - 1); - addFormNumericBox( - F("Port"), F("port"), - NotificationSettings.Port, - 1, - 65535); -# if FEATURE_EMAIL_TLS - addFormNote(F("default port SSL: 465")); -# else // if FEATURE_EMAIL_TLS - addFormNote(F("default port: 25, SSL/TLS servers NOT supported!")); -# endif // if FEATURE_EMAIL_TLS - - if ((NotificationSettings.Timeout_ms < NPLUGIN_001_MIN_TM) || - (NotificationSettings.Timeout_ms > NPLUGIN_001_MAX_TM)) + if (Notification[NotificationProtocolIndex].usesMessaging) { - NotificationSettings.Timeout_ms = NPLUGIN_001_DEF_TM; + if (NotificationSettings->Port == 0) { +# if FEATURE_EMAIL_TLS + NotificationSettings->Port = 465; +# else // if FEATURE_EMAIL_TLS + NotificationSettings->Port = 25; +# endif // if FEATURE_EMAIL_TLS + } + + addFormSubHeader(F("SMTP Server Settings")); + addFormTextBox(F("Domain"), F("domain"), NotificationSettings->Domain, sizeof(NotificationSettings->Domain) - 1); + addFormTextBox(F("Server"), F("server"), NotificationSettings->Server, sizeof(NotificationSettings->Server) - 1); + addFormNumericBox( + F("Port"), F("port"), + NotificationSettings->Port, + 1, + 65535); +# if FEATURE_EMAIL_TLS + addFormNote(F("default port SSL: 465")); +# else // if FEATURE_EMAIL_TLS + addFormNote(F("default port: 25, SSL/TLS servers NOT supported!")); +# endif // if FEATURE_EMAIL_TLS + + if ((NotificationSettings->Timeout_ms < NPLUGIN_001_MIN_TM) || + (NotificationSettings->Timeout_ms > NPLUGIN_001_MAX_TM)) + { + NotificationSettings->Timeout_ms = NPLUGIN_001_DEF_TM; + } + + addFormNumericBox( + F("Timeout"), F("timeout"), + NotificationSettings->Timeout_ms, + NPLUGIN_001_MIN_TM, + NPLUGIN_001_MAX_TM +# if FEATURE_TOOLTIPS + , F("Maximum Server Response Time") +# endif // if FEATURE_TOOLTIPS + ); + + addUnit(F("ms")); + + ZERO_TERMINATE(NotificationSettings->Pass); + addFormSubHeader(F("Credentials")); + + addFormTextBox(F("Username"), F("username"), NotificationSettings->User, sizeof(NotificationSettings->User) - 1); + addFormPasswordBox(F("Password"), F("password"), NotificationSettings->Pass, sizeof(NotificationSettings->Pass) - 1); + + addFormSubHeader(F("Email Attributes")); + + addFormTextBox(F("Sender"), F("sender"), NotificationSettings->Sender, sizeof(NotificationSettings->Sender) - 1); + addFormTextBox(F("Receiver"), F("receiver"), NotificationSettings->Receiver, sizeof(NotificationSettings->Receiver) - 1); + addFormTextBox(F("Subject"), F("subject"), NotificationSettings->Subject, sizeof(NotificationSettings->Subject) - 1); + + addRowLabel(F("Body")); + addHtml(F("")); } - addFormNumericBox( - F("Timeout"), F("timeout"), - NotificationSettings.Timeout_ms, - NPLUGIN_001_MIN_TM, - NPLUGIN_001_MAX_TM -# if FEATURE_TOOLTIPS - , F("Maximum Server Response Time") -# endif // if FEATURE_TOOLTIPS - ); + if (Notification[NotificationProtocolIndex].usesGPIO > 0) + { + addRowLabel(F("1st GPIO")); + addPinSelect(PinSelectPurpose::Generic, F("pin1"), NotificationSettings->Pin1); + } - addUnit(F("ms")); + addRowLabel(F("Enabled")); + addCheckBox(F("notificationenabled"), Settings.NotificationEnabled[notificationindex]); - ZERO_TERMINATE(NotificationSettings.Pass); - addFormSubHeader(F("Credentials")); + TempEvent.NotificationIndex = notificationindex; + String webformLoadString; + NPlugin_ptr[NotificationProtocolIndex](NPlugin::Function::NPLUGIN_WEBFORM_LOAD, &TempEvent, webformLoadString); - addFormTextBox(F("Username"), F("username"), NotificationSettings.User, sizeof(NotificationSettings.User) - 1); - addFormPasswordBox(F("Password"), F("password"), NotificationSettings.Pass, sizeof(NotificationSettings.Pass) - 1); - - addFormSubHeader(F("Email Attributes")); - - addFormTextBox(F("Sender"), F("sender"), NotificationSettings.Sender, sizeof(NotificationSettings.Sender) - 1); - addFormTextBox(F("Receiver"), F("receiver"), NotificationSettings.Receiver, sizeof(NotificationSettings.Receiver) - 1); - addFormTextBox(F("Subject"), F("subject"), NotificationSettings.Subject, sizeof(NotificationSettings.Subject) - 1); - - addRowLabel(F("Body")); - addHtml(F("")); - } - - if (Notification[NotificationProtocolIndex].usesGPIO > 0) - { - addRowLabel(F("1st GPIO")); - addPinSelect(PinSelectPurpose::Generic, F("pin1"), NotificationSettings.Pin1); - } - - addRowLabel(F("Enabled")); - addCheckBox(F("notificationenabled"), Settings.NotificationEnabled[notificationindex]); - - TempEvent.NotificationIndex = notificationindex; - String webformLoadString; - NPlugin_ptr[NotificationProtocolIndex](NPlugin::Function::NPLUGIN_WEBFORM_LOAD, &TempEvent, webformLoadString); - - if (webformLoadString.length() > 0) { - addHtmlError(F("Bug in NPlugin::Function::NPLUGIN_WEBFORM_LOAD, should not append to string, use addHtml() instead")); + if (webformLoadString.length() > 0) { + addHtmlError(F("Bug in NPlugin::Function::NPLUGIN_WEBFORM_LOAD, should not append to string, use addHtml() instead")); + } } } } From 64eff226d68beab6b2d3b78ab1f3a1f589c6fb1b Mon Sep 17 00:00:00 2001 From: TD-er Date: Wed, 19 Feb 2025 18:03:48 +0100 Subject: [PATCH 033/564] [Memory] Move C001 and C002 queue elements to 2nd heap (ESP8266) --- src/_C001.cpp | 9 +++++-- src/src/ESPEasyCore/Controller.cpp | 41 ++++++++++++++++++++++-------- 2 files changed, 37 insertions(+), 13 deletions(-) diff --git a/src/_C001.cpp b/src/_C001.cpp index 46ce884e6..445177d35 100644 --- a/src/_C001.cpp +++ b/src/_C001.cpp @@ -100,9 +100,14 @@ bool CPlugin_001(CPlugin::Function function, struct EventStruct *event, String& url += mapVccToDomoticz(); # endif // if FEATURE_ADC_VCC - std::unique_ptr element(new (std::nothrow) C001_queue_element(event->ControllerIndex, event->TaskIndex, std::move(url))); + constexpr unsigned size = sizeof(C001_queue_element); + void *ptr = special_calloc(1, size); + + if (ptr != nullptr) { + std::unique_ptr element(new (ptr) C001_queue_element(event->ControllerIndex, event->TaskIndex, std::move(url))); - success = C001_DelayHandler->addToQueue(std::move(element)); + success = C001_DelayHandler->addToQueue(std::move(element)); + } Scheduler.scheduleNextDelayQueue(SchedulerIntervalTimer_e::TIMER_C001_DELAY_QUEUE, C001_DelayHandler->getNextScheduleTime()); } diff --git a/src/src/ESPEasyCore/Controller.cpp b/src/src/ESPEasyCore/Controller.cpp index 2d953a24e..f8aa316e2 100644 --- a/src/src/ESPEasyCore/Controller.cpp +++ b/src/src/ESPEasyCore/Controller.cpp @@ -838,12 +838,22 @@ bool MQTTpublish(controllerIndex_t controller_idx, } topic_str = topic; payload_str = payload; - const bool success = - MQTTDelayHandler->addToQueue(std::unique_ptr(new (std::nothrow) MQTT_queue_element( - controller_idx, taskIndex, - std::move(topic_str), - std::move(payload_str), retained, - callbackTask))); + + bool success = false; + + constexpr unsigned size = sizeof(MQTT_queue_element); + void *ptr = special_calloc(1, size); + + if (ptr != nullptr) { + success = + MQTTDelayHandler->addToQueue( + std::unique_ptr( + new (ptr) MQTT_queue_element( + controller_idx, taskIndex, + std::move(topic_str), + std::move(payload_str), retained, + callbackTask))); + } scheduleNextMQTTdelayQueue(); return success; @@ -863,12 +873,21 @@ bool MQTTpublish(controllerIndex_t controller_idx, return false; } - const bool success = - MQTTDelayHandler->addToQueue(std::unique_ptr(new (std::nothrow) MQTT_queue_element(controller_idx, taskIndex, - std::move(topic), - std::move(payload), retained, - callbackTask))); + bool success = false; + constexpr unsigned size = sizeof(MQTT_queue_element); + void *ptr = special_calloc(1, size); + + if (ptr != nullptr) { + success = + MQTTDelayHandler->addToQueue( + std::unique_ptr( + new (ptr) MQTT_queue_element( + controller_idx, taskIndex, + std::move(topic), + std::move(payload), retained, + callbackTask))); + } scheduleNextMQTTdelayQueue(); return success; } From 5c9d7be604ea4374ef706971551dd6e564b8bb9c Mon Sep 17 00:00:00 2001 From: TD-er Date: Wed, 19 Feb 2025 22:58:06 +0100 Subject: [PATCH 034/564] [Memory] Move other controller queue elements to 2nd heap (ESP8266) --- src/_C003.cpp | 138 ++++++------ src/_C004.cpp | 12 +- src/_C007.cpp | 56 ++--- src/_C008.cpp | 71 ++++--- src/_C009.cpp | 198 +++++++++--------- src/_C010.cpp | 108 +++++----- src/_C011.cpp | 155 ++++++++------ src/_C012.cpp | 10 +- src/_C015.cpp | 135 ++++++------ src/_C017.cpp | 9 +- src/_C018.cpp | 48 ++++- .../DataStructs/ESPeasyControllerCache.cpp | 11 +- src/src/DataStructs/PluginTaskData_base.cpp | 7 +- src/src/DataStructs/ProvisioningStruct.h | 1 - src/src/Globals/Plugins.cpp | 2 +- src/src/Helpers/Networking.cpp | 18 +- src/src/WebServer/UploadPage.cpp | 7 +- 17 files changed, 574 insertions(+), 412 deletions(-) diff --git a/src/_C003.cpp b/src/_C003.cpp index 0405f090b..3a96f7678 100644 --- a/src/_C003.cpp +++ b/src/_C003.cpp @@ -49,6 +49,7 @@ bool CPlugin_003(CPlugin::Function function, struct EventStruct *event, String& if (C003_DelayHandler == nullptr) { break; } + if (C003_DelayHandler->queueFull(event->ControllerIndex)) { break; } @@ -58,13 +59,18 @@ bool CPlugin_003(CPlugin::Function function, struct EventStruct *event, String& F("variableset %d,%s\n"), event->idx, formatUserVarNoCheck(event, 0).c_str()); - std::unique_ptr element( - new (std::nothrow) C003_queue_element( - event->ControllerIndex, - event->TaskIndex, - std::move(url))); + constexpr unsigned size = sizeof(C003_queue_element); + void *ptr = special_calloc(1, size); - success = C003_DelayHandler->addToQueue(std::move(element)); + if (ptr != nullptr) { + std::unique_ptr element( + new (ptr) C003_queue_element( + event->ControllerIndex, + event->TaskIndex, + std::move(url))); + + success = C003_DelayHandler->addToQueue(std::move(element)); + } Scheduler.scheduleNextDelayQueue(SchedulerIntervalTimer_e::TIMER_C003_DELAY_QUEUE, C003_DelayHandler->getNextScheduleTime()); break; @@ -88,69 +94,69 @@ bool CPlugin_003(CPlugin::Function function, struct EventStruct *event, String& bool do_process_c003_delay_queue(cpluginID_t cpluginID, const Queue_element_base& element_base, ControllerSettingsStruct& ControllerSettings) { const C003_queue_element& element = static_cast(element_base); // *INDENT-ON* - bool success = false; +bool success = false; - // Use WiFiClient class to create TCP connections - WiFiClient client; +// Use WiFiClient class to create TCP connections +WiFiClient client; - if (!try_connect_host(cpluginID, client, ControllerSettings, F("TELNT: "))) - { - return success; - } - - // strcpy_P(log, PSTR("TELNT: Sending enter")); - // addLog(LOG_LEVEL_ERROR, log); - client.print(" \n"); - - unsigned long timer = millis() + 200; - - while (!client_available(client) && !timeOutReached(timer)) { - delay(1); - } - - timer = millis() + 1000; - - while (client_available(client) && !timeOutReached(timer) && !success) - { - // String line = client.readStringUntil('\n'); - String line; - safeReadStringUntil(client, line, '\n'); - - if (line.startsWith(F("Enter your password:"))) - { - success = true; - #ifndef BUILD_NO_DEBUG - addLog(LOG_LEVEL_DEBUG, F("TELNT: Password request ok")); - #endif - } - delay(1); - } - #ifndef BUILD_NO_DEBUG - addLog(LOG_LEVEL_DEBUG, F("TELNT: Sending pw")); - #endif - client.println(getControllerPass(element._controller_idx, ControllerSettings)); - delay(100); - - while (client_available(client)) { - client.read(); - } - - #ifndef BUILD_NO_DEBUG - addLog(LOG_LEVEL_DEBUG, F("TELNT: Sending cmd")); - #endif - client.print(element.txt); - delay(10); - - while (client_available(client)) { - client.read(); - } - - #ifndef BUILD_NO_DEBUG - addLog(LOG_LEVEL_DEBUG, F("TELNT: closing connection")); - #endif - - client.stop(); +if (!try_connect_host(cpluginID, client, ControllerSettings, F("TELNT: "))) +{ return success; } +// strcpy_P(log, PSTR("TELNT: Sending enter")); +// addLog(LOG_LEVEL_ERROR, log); +client.print(" \n"); + +unsigned long timer = millis() + 200; + +while (!client_available(client) && !timeOutReached(timer)) { + delay(1); +} + +timer = millis() + 1000; + +while (client_available(client) && !timeOutReached(timer) && !success) +{ + // String line = client.readStringUntil('\n'); + String line; + safeReadStringUntil(client, line, '\n'); + + if (line.startsWith(F("Enter your password:"))) + { + success = true; + # ifndef BUILD_NO_DEBUG + addLog(LOG_LEVEL_DEBUG, F("TELNT: Password request ok")); + # endif + } + delay(1); +} + # ifndef BUILD_NO_DEBUG +addLog(LOG_LEVEL_DEBUG, F("TELNT: Sending pw")); + # endif +client.println(getControllerPass(element._controller_idx, ControllerSettings)); +delay(100); + +while (client_available(client)) { + client.read(); +} + + # ifndef BUILD_NO_DEBUG +addLog(LOG_LEVEL_DEBUG, F("TELNT: Sending cmd")); + # endif +client.print(element.txt); +delay(10); + +while (client_available(client)) { + client.read(); +} + + # ifndef BUILD_NO_DEBUG +addLog(LOG_LEVEL_DEBUG, F("TELNT: closing connection")); + # endif + +client.stop(); +return success; +} + #endif // ifdef USES_C003 diff --git a/src/_C004.cpp b/src/_C004.cpp index d9903d9b1..a450f0da9 100644 --- a/src/_C004.cpp +++ b/src/_C004.cpp @@ -48,7 +48,8 @@ bool CPlugin_004(CPlugin::Function function, struct EventStruct *event, String& { success = true; - switch (event->idx) { + switch (event->idx) + { case ControllerSettingsStruct::CONTROLLER_USER: string = F("ThingHTTP Name"); break; @@ -72,9 +73,14 @@ bool CPlugin_004(CPlugin::Function function, struct EventStruct *event, String& break; } - std::unique_ptr element(new (std::nothrow) C004_queue_element(event)); + constexpr unsigned size = sizeof(C004_queue_element); + void *ptr = special_calloc(1, size); - success = C004_DelayHandler->addToQueue(std::move(element)); + if (ptr != nullptr) { + std::unique_ptr element(new (ptr) C004_queue_element(event)); + + success = C004_DelayHandler->addToQueue(std::move(element)); + } Scheduler.scheduleNextDelayQueue(SchedulerIntervalTimer_e::TIMER_C004_DELAY_QUEUE, C004_DelayHandler->getNextScheduleTime()); break; diff --git a/src/_C007.cpp b/src/_C007.cpp index 1cf062e58..f4de2157d 100644 --- a/src/_C007.cpp +++ b/src/_C007.cpp @@ -77,8 +77,13 @@ bool CPlugin_007(CPlugin::Function function, struct EventStruct *event, String& break; } - std::unique_ptr element(new (std::nothrow) C007_queue_element(event)); - success = C007_DelayHandler->addToQueue(std::move(element)); + constexpr unsigned size = sizeof(C007_queue_element); + void *ptr = special_calloc(1, size); + + if (ptr != nullptr) { + std::unique_ptr element(new (ptr) C007_queue_element(event)); + success = C007_DelayHandler->addToQueue(std::move(element)); + } Scheduler.scheduleNextDelayQueue(SchedulerIntervalTimer_e::TIMER_C007_DELAY_QUEUE, C007_DelayHandler->getNextScheduleTime()); break; @@ -101,35 +106,36 @@ bool CPlugin_007(CPlugin::Function function, struct EventStruct *event, String& // *INDENT-OFF* bool do_process_c007_delay_queue(cpluginID_t cpluginID, const Queue_element_base& element_base, ControllerSettingsStruct& ControllerSettings) { const C007_queue_element& element = static_cast(element_base); -// *INDENT-ON* - if (ControllerSettings.Publish[0] == '\0') { - strcpy_P(ControllerSettings.Publish, PSTR(C007_DEFAULT_URL)); - } - String url = strformat(F("%s?node=%d&json="), ControllerSettings.Publish, Settings.Unit); - for (uint8_t i = 0; i < element.valueCount; ++i) { - url += strformat(F("%cfield%d:%s"), (i == 0) ? '{' : ',', element.idx + i, element.txt[i].c_str()); - } - url += strformat(F("}&apikey=%s"), getControllerPass(element._controller_idx, ControllerSettings).c_str()); // "0UDNN17RW6XAS2E5" // api key +// *INDENT-ON* +if (ControllerSettings.Publish[0] == '\0') { + strcpy_P(ControllerSettings.Publish, PSTR(C007_DEFAULT_URL)); +} +String url = strformat(F("%s?node=%d&json="), ControllerSettings.Publish, Settings.Unit); + +for (uint8_t i = 0; i < element.valueCount; ++i) { + url += strformat(F("%cfield%d:%s"), (i == 0) ? '{' : ',', element.idx + i, element.txt[i].c_str()); +} +url += strformat(F("}&apikey=%s"), getControllerPass(element._controller_idx, ControllerSettings).c_str()); // "0UDNN17RW6XAS2E5" // api key # ifndef BUILD_NO_DEBUG - if (loglevelActiveFor(LOG_LEVEL_DEBUG_MORE)) { - addLog(LOG_LEVEL_DEBUG_MORE, url); - } +if (loglevelActiveFor(LOG_LEVEL_DEBUG_MORE)) { + addLog(LOG_LEVEL_DEBUG_MORE, url); +} # endif // ifndef BUILD_NO_DEBUG - int httpCode = -1; - send_via_http( - cpluginID, - ControllerSettings, - element._controller_idx, - url, - F("GET"), - EMPTY_STRING, - EMPTY_STRING, - httpCode); - return (httpCode >= 100) && (httpCode < 300); +int httpCode = -1; +send_via_http( + cpluginID, + ControllerSettings, + element._controller_idx, + url, + F("GET"), + EMPTY_STRING, + EMPTY_STRING, + httpCode); +return (httpCode >= 100) && (httpCode < 300); } #endif // ifdef USES_C007 diff --git a/src/_C008.cpp b/src/_C008.cpp index 4383f382f..761850332 100644 --- a/src/_C008.cpp +++ b/src/_C008.cpp @@ -59,6 +59,7 @@ bool CPlugin_008(CPlugin::Function function, struct EventStruct *event, String& if (C008_DelayHandler == nullptr) { break; } + if (C008_DelayHandler->queueFull(event->ControllerIndex)) { break; } @@ -67,7 +68,7 @@ bool CPlugin_008(CPlugin::Function function, struct EventStruct *event, String& String pubname; { // Place the ControllerSettings in a scope to free the memory as soon as we got all relevant information. - MakeControllerSettings(ControllerSettings); //-V522 + MakeControllerSettings(ControllerSettings); // -V522 if (!AllocatedControllerSettings()) { addLog(LOG_LEVEL_ERROR, F("C008 : Generic HTTP - Cannot send, out of RAM")); @@ -79,8 +80,14 @@ bool CPlugin_008(CPlugin::Function function, struct EventStruct *event, String& const bool contains_valname = pubname.indexOf(F("%valname%")) != -1; uint8_t valueCount = getValueCountForTask(event->TaskIndex); - std::unique_ptr element(new (std::nothrow) C008_queue_element(event, valueCount)); - success = C008_DelayHandler->addToQueue(std::move(element)); + + constexpr unsigned size = sizeof(C008_queue_element); + void *ptr = special_calloc(1, size); + + if (ptr != nullptr) { + std::unique_ptr element(new (ptr) C008_queue_element(event, valueCount)); + success = C008_DelayHandler->addToQueue(std::move(element)); + } if (success) { // Element was added. @@ -89,35 +96,38 @@ bool CPlugin_008(CPlugin::Function function, struct EventStruct *event, String& C008_queue_element& element = static_cast(*(C008_DelayHandler->sendQueue.back())); // Collect the values at the same run, to make sure all are from the same sample - //LoadTaskSettings(event->TaskIndex); // FIXME TD-er: This can probably be removed + // LoadTaskSettings(event->TaskIndex); // FIXME TD-er: This can probably be removed for (uint8_t x = 0; x < valueCount; x++) { - bool isvalid; - const String formattedValue = formatUserVar(event, x , isvalid); + bool isvalid; + const String formattedValue = formatUserVar(event, x, isvalid); if (isvalid) { // First store in a temporary string, so we can use move_special to allocate on the best heap String txt; txt += '/'; txt += pubname; + if (contains_valname) { parseSingleControllerVariable(txt, event, x, true); } parseControllerVariables(txt, event, true); # ifndef BUILD_NO_DEBUG + if (loglevelActiveFor(LOG_LEVEL_DEBUG)) { addLog(LOG_LEVEL_DEBUG, strformat( - F("C008 : pubname: %s value: %s"), - pubname.c_str(), - formattedValue.c_str() - )); + F("C008 : pubname: %s value: %s"), + pubname.c_str(), + formattedValue.c_str() + )); } -#endif +# endif // ifndef BUILD_NO_DEBUG txt.replace(F("%value%"), formattedValue); move_special(element.txt[x], std::move(txt)); # ifndef BUILD_NO_DEBUG + if (loglevelActiveFor(LOG_LEVEL_DEBUG_MORE)) { addLog(LOG_LEVEL_DEBUG_MORE, concat(F("C008 : "), element.txt[x])); } @@ -150,26 +160,27 @@ bool CPlugin_008(CPlugin::Function function, struct EventStruct *event, String& // *INDENT-OFF* bool do_process_c008_delay_queue(cpluginID_t cpluginID, const Queue_element_base& element_base, ControllerSettingsStruct& ControllerSettings) { const C008_queue_element& element = static_cast(element_base); -// *INDENT-ON* - while (element.txt[element.valuesSent].isEmpty()) { - // A non valid value, which we are not going to send. - // Increase sent counter until a valid value is found. - if (element.checkDone(true)) { - return true; - } - } - int httpCode = -1; - send_via_http( - cpluginID, - ControllerSettings, - element._controller_idx, - element.txt[element.valuesSent], - F("GET"), - EMPTY_STRING, - EMPTY_STRING, - httpCode); - return element.checkDone((httpCode >= 100) && (httpCode < 300)); +// *INDENT-ON* +while (element.txt[element.valuesSent].isEmpty()) { + // A non valid value, which we are not going to send. + // Increase sent counter until a valid value is found. + if (element.checkDone(true)) { + return true; + } +} + +int httpCode = -1; +send_via_http( + cpluginID, + ControllerSettings, + element._controller_idx, + element.txt[element.valuesSent], + F("GET"), + EMPTY_STRING, + EMPTY_STRING, + httpCode); +return element.checkDone((httpCode >= 100) && (httpCode < 300)); } #endif // ifdef USES_C008 diff --git a/src/_C009.cpp b/src/_C009.cpp index bcca8adf5..0b5e1a191 100644 --- a/src/_C009.cpp +++ b/src/_C009.cpp @@ -1,9 +1,9 @@ #include "src/Helpers/_CPlugin_Helper.h" #ifdef USES_C009 -#include "src/DataTypes/NodeTypeID.h" -#include "src/Helpers/StringProvider.h" -#include "src/CustomBuild/ESPEasy_buildinfo.h" +# include "src/DataTypes/NodeTypeID.h" +# include "src/Helpers/StringProvider.h" +# include "src/CustomBuild/ESPEasy_buildinfo.h" // ####################################################################################################### // ########################### Controller Plugin 009: FHEM HTTP ########################################## @@ -80,8 +80,13 @@ bool CPlugin_009(CPlugin::Function function, struct EventStruct *event, String& break; } - std::unique_ptr element(new (std::nothrow) C009_queue_element(event)); - success = C009_DelayHandler->addToQueue(std::move(element)); + constexpr unsigned size = sizeof(C009_queue_element); + void *ptr = special_calloc(1, size); + + if (ptr != nullptr) { + std::unique_ptr element(new (ptr) C009_queue_element(event)); + success = C009_DelayHandler->addToQueue(std::move(element)); + } Scheduler.scheduleNextDelayQueue(SchedulerIntervalTimer_e::TIMER_C009_DELAY_QUEUE, C009_DelayHandler->getNextScheduleTime()); } break; @@ -109,109 +114,110 @@ bool CPlugin_009(CPlugin::Function function, struct EventStruct *event, String& bool do_process_c009_delay_queue(cpluginID_t cpluginID, const Queue_element_base& element_base, ControllerSettingsStruct& ControllerSettings) { const C009_queue_element& element = static_cast(element_base); // *INDENT-ON* - String jsonString; - // Make an educated guess on the actual length, based on earlier requests. - static size_t expectedJsonLength = 100; - { - // Reserve on the heap with most space - if (!reserve_special(jsonString, expectedJsonLength)) { - // Not enough free memory - return false; - } +String jsonString; + +// Make an educated guess on the actual length, based on earlier requests. +static size_t expectedJsonLength = 100; +{ + // Reserve on the heap with most space + if (!reserve_special(jsonString, expectedJsonLength)) { + // Not enough free memory + return false; } +} +{ + jsonString += '{'; { - jsonString += '{'; + jsonString += to_json_object_value(F("module"), F("ESPEasy")); + jsonString += ','; + jsonString += to_json_object_value(F("version"), F("1.04")); + + // Create nested object "ESP" inside "data" + jsonString += ','; + jsonString += F("\"data\":{"); { - jsonString += to_json_object_value(F("module"), F("ESPEasy")); - jsonString += ','; - jsonString += to_json_object_value(F("version"), F("1.04")); - - // Create nested object "ESP" inside "data" - jsonString += ','; - jsonString += F("\"data\":{"); + jsonString += F("\"ESP\":{"); { - jsonString += F("\"ESP\":{"); - { - // Create nested objects in "ESP": - jsonString += to_json_object_value(F("name"), Settings.getName()); - jsonString += ','; - jsonString += to_json_object_value(F("unit"), static_cast(Settings.Unit)); - jsonString += ','; - jsonString += to_json_object_value(F("version"), static_cast(Settings.Version)); - jsonString += ','; - jsonString += to_json_object_value(F("build"), static_cast(Settings.Build)); - jsonString += ','; - jsonString += to_json_object_value(F("build_notes"), F(BUILD_NOTES)); - jsonString += ','; - jsonString += to_json_object_value(F("build_git"), getValue(LabelType::GIT_BUILD)); - jsonString += ','; - jsonString += to_json_object_value(F("node_type_id"), static_cast(NODE_TYPE_ID)); - jsonString += ','; - jsonString += to_json_object_value(F("sleep"), static_cast(Settings.deepSleep_wakeTime)); - - // embed IP, important if there is NAT/PAT - // char ipStr[20]; - // IPAddress ip = NetworkLocalIP(); - // sprintf_P(ipStr, PSTR("%u.%u.%u.%u"), ip[0], ip[1], ip[2], ip[3]); - jsonString += ','; - jsonString += to_json_object_value(F("ip"), formatIP(NetworkLocalIP())); - } - jsonString += '}'; // End "ESP" - + // Create nested objects in "ESP": + jsonString += to_json_object_value(F("name"), Settings.getName()); jsonString += ','; + jsonString += to_json_object_value(F("unit"), static_cast(Settings.Unit)); + jsonString += ','; + jsonString += to_json_object_value(F("version"), static_cast(Settings.Version)); + jsonString += ','; + jsonString += to_json_object_value(F("build"), static_cast(Settings.Build)); + jsonString += ','; + jsonString += to_json_object_value(F("build_notes"), F(BUILD_NOTES)); + jsonString += ','; + jsonString += to_json_object_value(F("build_git"), getValue(LabelType::GIT_BUILD)); + jsonString += ','; + jsonString += to_json_object_value(F("node_type_id"), static_cast(NODE_TYPE_ID)); + jsonString += ','; + jsonString += to_json_object_value(F("sleep"), static_cast(Settings.deepSleep_wakeTime)); - // Create nested object "SENSOR" json object inside "data" - jsonString += F("\"SENSOR\":{"); - { - // char itemNames[valueCount][2]; - for (uint8_t x = 0; x < element.valueCount; x++) - { - // Each sensor value get an own object (0..n) - // sprintf(itemNames[x],"%d",x); - if (x != 0) { - jsonString += ','; - } - - jsonString += '"'; - jsonString += x; - jsonString += F("\":{"); - { - jsonString += to_json_object_value(F("deviceName"), getTaskDeviceName(element._taskIndex)); - jsonString += ','; - jsonString += to_json_object_value(F("valueName"), Cache.getTaskDeviceValueName(element._taskIndex, x)); - jsonString += ','; - jsonString += to_json_object_value(F("type"), static_cast(element.sensorType)); - jsonString += ','; - jsonString += to_json_object_value(F("value"), element.txt[x]); - } - jsonString += '}'; // End "sensor value N" - } - } - jsonString += '}'; // End "SENSOR" + // embed IP, important if there is NAT/PAT + // char ipStr[20]; + // IPAddress ip = NetworkLocalIP(); + // sprintf_P(ipStr, PSTR("%u.%u.%u.%u"), ip[0], ip[1], ip[2], ip[3]); + jsonString += ','; + jsonString += to_json_object_value(F("ip"), formatIP(NetworkLocalIP())); } - jsonString += '}'; // End "data" + jsonString += '}'; // End "ESP" + + jsonString += ','; + + // Create nested object "SENSOR" json object inside "data" + jsonString += F("\"SENSOR\":{"); + { + // char itemNames[valueCount][2]; + for (uint8_t x = 0; x < element.valueCount; x++) + { + // Each sensor value get an own object (0..n) + // sprintf(itemNames[x],"%d",x); + if (x != 0) { + jsonString += ','; + } + + jsonString += '"'; + jsonString += x; + jsonString += F("\":{"); + { + jsonString += to_json_object_value(F("deviceName"), getTaskDeviceName(element._taskIndex)); + jsonString += ','; + jsonString += to_json_object_value(F("valueName"), Cache.getTaskDeviceValueName(element._taskIndex, x)); + jsonString += ','; + jsonString += to_json_object_value(F("type"), static_cast(element.sensorType)); + jsonString += ','; + jsonString += to_json_object_value(F("value"), element.txt[x]); + } + jsonString += '}'; // End "sensor value N" + } + } + jsonString += '}'; // End "SENSOR" } - jsonString += '}'; // End JSON structure + jsonString += '}'; // End "data" } + jsonString += '}'; // End JSON structure +} - if (expectedJsonLength < jsonString.length()) { - expectedJsonLength = jsonString.length(); - } +if (expectedJsonLength < jsonString.length()) { + expectedJsonLength = jsonString.length(); +} - // addLog(LOG_LEVEL_INFO, F("C009 Test JSON:")); - // addLog(LOG_LEVEL_INFO, jsonString); +// addLog(LOG_LEVEL_INFO, F("C009 Test JSON:")); +// addLog(LOG_LEVEL_INFO, jsonString); - int httpCode = -1; - send_via_http( - cpluginID, - ControllerSettings, - element._controller_idx, - F("/ESPEasy"), - F("POST"), - EMPTY_STRING, - jsonString, - httpCode); - return (httpCode >= 100) && (httpCode < 300); +int httpCode = -1; +send_via_http( + cpluginID, + ControllerSettings, + element._controller_idx, + F("/ESPEasy"), + F("POST"), + EMPTY_STRING, + jsonString, + httpCode); +return (httpCode >= 100) && (httpCode < 300); } #endif // ifdef USES_C009 diff --git a/src/_C010.cpp b/src/_C010.cpp index ec65589ad..7322233ef 100644 --- a/src/_C010.cpp +++ b/src/_C010.cpp @@ -57,6 +57,7 @@ bool CPlugin_010(CPlugin::Function function, struct EventStruct *event, String& if (C010_DelayHandler == nullptr) { break; } + if (C010_DelayHandler->queueFull(event->ControllerIndex)) { break; } @@ -67,47 +68,53 @@ bool CPlugin_010(CPlugin::Function function, struct EventStruct *event, String& break; } - //LoadTaskSettings(event->TaskIndex); // FIXME TD-er: This can probably be removed + // LoadTaskSettings(event->TaskIndex); // FIXME TD-er: This can probably be removed - std::unique_ptr element(new (std::nothrow) C010_queue_element(event, valueCount)); + constexpr unsigned size = sizeof(C010_queue_element); + void *ptr = special_calloc(1, size); - - { - String pubname; + if (ptr != nullptr) { + std::unique_ptr element(new (ptr) C010_queue_element(event, valueCount)); { - MakeControllerSettings(ControllerSettings); //-V522 + String pubname; + { + MakeControllerSettings(ControllerSettings); // -V522 - if (!AllocatedControllerSettings()) { - break; + if (!AllocatedControllerSettings()) { + break; + } + LoadControllerSettings(event->ControllerIndex, *ControllerSettings); + pubname = ControllerSettings->Publish; } - LoadControllerSettings(event->ControllerIndex, *ControllerSettings); - pubname = ControllerSettings->Publish; - } - const bool contains_valname = pubname.indexOf(F("%valname%")) != -1; + const bool contains_valname = pubname.indexOf(F("%valname%")) != -1; - for (uint8_t x = 0; x < valueCount; x++) - { - bool isvalid; - const String formattedValue = formatUserVar(event, x, isvalid); + for (uint8_t x = 0; x < valueCount; x++) + { + bool isvalid; + const String formattedValue = formatUserVar(event, x, isvalid); - if (isvalid) { - String txt; - txt = pubname; - if (contains_valname) { - parseSingleControllerVariable(txt, event, x, false); + if (isvalid) { + String txt; + txt = pubname; + + if (contains_valname) { + parseSingleControllerVariable(txt, event, x, false); + } + parseControllerVariables(txt, event, false); + txt.replace(F("%value%"), formattedValue); + move_special(element->txt[x], std::move(txt)); +# ifndef BUILD_NO_DEBUG + + if (loglevelActiveFor(LOG_LEVEL_DEBUG_MORE)) { + addLog(LOG_LEVEL_DEBUG_MORE, element->txt[x]); + } +# endif // ifndef BUILD_NO_DEBUG } - parseControllerVariables(txt, event, false); - txt.replace(F("%value%"), formattedValue); - move_special(element->txt[x], std::move(txt)); -#ifndef BUILD_NO_DEBUG - if (loglevelActiveFor(LOG_LEVEL_DEBUG_MORE)) - addLog(LOG_LEVEL_DEBUG_MORE, element->txt[x]); -#endif } } - } - success = C010_DelayHandler->addToQueue(std::move(element)); + success = C010_DelayHandler->addToQueue(std::move(element)); + } Scheduler.scheduleNextDelayQueue(SchedulerIntervalTimer_e::TIMER_C010_DELAY_QUEUE, C010_DelayHandler->getNextScheduleTime()); break; } @@ -133,33 +140,34 @@ bool CPlugin_010(CPlugin::Function function, struct EventStruct *event, String& // *INDENT-OFF* bool do_process_c010_delay_queue(cpluginID_t cpluginID, const Queue_element_base& element_base, ControllerSettingsStruct& ControllerSettings) { const C010_queue_element& element = static_cast(element_base); + // *INDENT-ON* - while (element.txt[element.valuesSent].isEmpty()) { - // A non valid value, which we are not going to send. - // Increase sent counter until a valid value is found. - if (element.checkDone(true)) { - return true; - } +while (element.txt[element.valuesSent].isEmpty()) { + // A non valid value, which we are not going to send. + // Increase sent counter until a valid value is found. + if (element.checkDone(true)) { + return true; } - WiFiUDP C010_portUDP; +} +WiFiUDP C010_portUDP; - if (!beginWiFiUDP_randomPort(C010_portUDP)) { return false; } +if (!beginWiFiUDP_randomPort(C010_portUDP)) { return false; } - if (!try_connect_host(cpluginID, C010_portUDP, ControllerSettings)) { - return false; - } +if (!try_connect_host(cpluginID, C010_portUDP, ControllerSettings)) { + return false; +} - C010_portUDP.write( - reinterpret_cast(element.txt[element.valuesSent].c_str()), - element.txt[element.valuesSent].length()); - bool reply = C010_portUDP.endPacket(); +C010_portUDP.write( + reinterpret_cast(element.txt[element.valuesSent].c_str()), + element.txt[element.valuesSent].length()); +bool reply = C010_portUDP.endPacket(); - C010_portUDP.stop(); +C010_portUDP.stop(); - if (ControllerSettings.MustCheckReply) { - return element.checkDone(reply); - } - return element.checkDone(true); +if (ControllerSettings.MustCheckReply) { + return element.checkDone(reply); +} +return element.checkDone(true); } #endif // ifdef USES_C010 diff --git a/src/_C011.cpp b/src/_C011.cpp index ef641abd6..c29756c32 100644 --- a/src/_C011.cpp +++ b/src/_C011.cpp @@ -19,6 +19,7 @@ bool C011_sendBinary = false; struct C011_ConfigStruct { + void zero_last() { HttpMethod[C011_HTTP_METHOD_MAX_LEN - 1] = 0; HttpUri[C011_HTTP_URI_MAX_LEN - 1] = 0; @@ -30,16 +31,22 @@ struct C011_ConfigStruct char HttpUri[C011_HTTP_URI_MAX_LEN] = { 0 }; char HttpHeader[C011_HTTP_HEADER_MAX_LEN] = { 0 }; char HttpBody[C011_HTTP_BODY_MAX_LEN] = { 0 }; + }; // Forward declarations -bool load_C011_ConfigStruct(controllerIndex_t ControllerIndex, String& HttpMethod, String& HttpUri, String& HttpHeader, String& HttpBody); +bool load_C011_ConfigStruct(controllerIndex_t ControllerIndex, + String & HttpMethod, + String & HttpUri, + String & HttpHeader, + String & HttpBody); boolean Create_schedule_HTTP_C011(struct EventStruct *event); -void DeleteNotNeededValues(String& s, uint8_t numberOfValuesWanted); -void ReplaceTokenByValue(String& s, struct EventStruct *event, bool sendBinary); - - +void DeleteNotNeededValues(String& s, + uint8_t numberOfValuesWanted); +void ReplaceTokenByValue(String & s, + struct EventStruct *event, + bool sendBinary); bool CPlugin_011(CPlugin::Function function, struct EventStruct *event, String& string) { @@ -68,7 +75,7 @@ bool CPlugin_011(CPlugin::Function function, struct EventStruct *event, String& case CPlugin::Function::CPLUGIN_INIT: { { - MakeControllerSettings(ControllerSettings); //-V522 + MakeControllerSettings(ControllerSettings); // -V522 if (AllocatedControllerSettings()) { LoadControllerSettings(event->ControllerIndex, *ControllerSettings); @@ -99,8 +106,8 @@ bool CPlugin_011(CPlugin::Function function, struct EventStruct *event, String& } addTableSeparator(F("HTTP Config"), 2, 3); { - uint8_t choice = 0; - const __FlashStringHelper * methods[] = { F("GET"), F("POST"), F("PUT"), F("HEAD"), F("PATCH") }; + uint8_t choice = 0; + const __FlashStringHelper *methods[] = { F("GET"), F("POST"), F("PUT"), F("HEAD"), F("PATCH") }; constexpr int nrOptions = NR_ELEMENTS(methods); @@ -127,7 +134,7 @@ bool CPlugin_011(CPlugin::Function function, struct EventStruct *event, String& } { // Place in scope to delete ControllerSettings as soon as it is no longer needed - MakeControllerSettings(ControllerSettings); //-V522 + MakeControllerSettings(ControllerSettings); // -V522 if (!AllocatedControllerSettings()) { addHtmlError(F("Out of memory, cannot load page")); @@ -142,30 +149,37 @@ bool CPlugin_011(CPlugin::Function function, struct EventStruct *event, String& case CPlugin::Function::CPLUGIN_WEBFORM_SAVE: { - std::shared_ptr customConfig(new (std::nothrow) C011_ConfigStruct); + constexpr unsigned size = sizeof(C011_ConfigStruct); + void *ptr = special_calloc(1, size); - if (customConfig) { - uint8_t choice = 0; - String methods[] = { F("GET"), F("POST"), F("PUT"), F("HEAD"), F("PATCH") }; + if (ptr != nullptr) { + std::shared_ptr customConfig(new (ptr) C011_ConfigStruct); - for (uint8_t i = 0; i < 5; i++) - { - if (methods[i].equals(customConfig->HttpMethod)) { - choice = i; + if (customConfig) { + uint8_t choice = 0; + String methods[] = { F("GET"), F("POST"), F("PUT"), F("HEAD"), F("PATCH") }; + + for (uint8_t i = 0; i < 5; i++) + { + if (methods[i].equals(customConfig->HttpMethod)) { + choice = i; + } } + + int httpmethod = getFormItemInt(F("P011httpmethod"), choice); + String httpuri = webArg(F("P011httpuri")); + String httpheader = webArg(F("P011httpheader")); + String httpbody = webArg(F("P011httpbody")); + + strlcpy(customConfig->HttpMethod, methods[httpmethod].c_str(), sizeof(customConfig->HttpMethod)); + strlcpy(customConfig->HttpUri, httpuri.c_str(), sizeof(customConfig->HttpUri)); + strlcpy(customConfig->HttpHeader, httpheader.c_str(), sizeof(customConfig->HttpHeader)); + strlcpy(customConfig->HttpBody, httpbody.c_str(), sizeof(customConfig->HttpBody)); + customConfig->zero_last(); + SaveCustomControllerSettings(event->ControllerIndex, + reinterpret_cast(customConfig.get()), + sizeof(C011_ConfigStruct)); } - - int httpmethod = getFormItemInt(F("P011httpmethod"), choice); - String httpuri = webArg(F("P011httpuri")); - String httpheader = webArg(F("P011httpheader")); - String httpbody = webArg(F("P011httpbody")); - - strlcpy(customConfig->HttpMethod, methods[httpmethod].c_str(), sizeof(customConfig->HttpMethod)); - strlcpy(customConfig->HttpUri, httpuri.c_str(), sizeof(customConfig->HttpUri)); - strlcpy(customConfig->HttpHeader, httpheader.c_str(), sizeof(customConfig->HttpHeader)); - strlcpy(customConfig->HttpBody, httpbody.c_str(), sizeof(customConfig->HttpBody)); - customConfig->zero_last(); - SaveCustomControllerSettings(event->ControllerIndex, reinterpret_cast(customConfig.get()), sizeof(C011_ConfigStruct)); } break; } @@ -202,29 +216,36 @@ bool do_process_c011_delay_queue(cpluginID_t cpluginID, const Queue_element_base const C011_queue_element& element = static_cast(element_base); // *INDENT-ON* - if (!NetworkConnected()) { return false; } +if (!NetworkConnected()) { return false; } - int httpCode = -1; +int httpCode = -1; - send_via_http( - cpluginID, - ControllerSettings, - element._controller_idx, - element.uri, - element.HttpMethod, - element.header, - element.postStr, - httpCode); +send_via_http( + cpluginID, + ControllerSettings, + element._controller_idx, + element.uri, + element.HttpMethod, + element.header, + element.postStr, + httpCode); - // HTTP codes: - // 1xx Informational response - // 2xx Success - return httpCode >= 100 && httpCode < 300; +// HTTP codes: +// 1xx Informational response +// 2xx Success +return httpCode >= 100 && httpCode < 300; } bool load_C011_ConfigStruct(controllerIndex_t ControllerIndex, String& HttpMethod, String& HttpUri, String& HttpHeader, String& HttpBody) { // Just copy the needed strings and destruct the C011_ConfigStruct as soon as possible - std::shared_ptr customConfig(new (std::nothrow) C011_ConfigStruct); + constexpr unsigned size = sizeof(C011_ConfigStruct); + void *ptr = special_calloc(1, size); + + if (ptr == nullptr) { + return false; + } + + std::shared_ptrcustomConfig(new (ptr) C011_ConfigStruct); if (!customConfig) { return false; @@ -232,9 +253,9 @@ bool load_C011_ConfigStruct(controllerIndex_t ControllerIndex, String& HttpMetho LoadCustomControllerSettings(ControllerIndex, reinterpret_cast(customConfig.get()), sizeof(C011_ConfigStruct)); customConfig->zero_last(); move_special(HttpMethod, String(customConfig->HttpMethod)); - move_special(HttpUri , String(customConfig->HttpUri)); + move_special(HttpUri, String(customConfig->HttpUri)); move_special(HttpHeader, String(customConfig->HttpHeader)); - move_special(HttpBody , String(customConfig->HttpBody)); + move_special(HttpBody, String(customConfig->HttpBody)); return true; } @@ -247,10 +268,19 @@ boolean Create_schedule_HTTP_C011(struct EventStruct *event) addLog(LOG_LEVEL_ERROR, F("No C011_DelayHandler")); return false; } - //LoadTaskSettings(event->TaskIndex); // FIXME TD-er: This can probably be removed + + // LoadTaskSettings(event->TaskIndex); // FIXME TD-er: This can probably be removed + + constexpr unsigned size = sizeof(C011_queue_element); + void *ptr = special_calloc(1, size); + + if (ptr == nullptr) { + return false; + } + // Add a new element to the queue with the minimal payload - std::unique_ptr element(new (std::nothrow) C011_queue_element(event)); + std::unique_ptrelement(new (ptr) C011_queue_element(event)); bool success = C011_DelayHandler->addToQueue(std::move(element)); if (success) { @@ -264,11 +294,11 @@ boolean Create_schedule_HTTP_C011(struct EventStruct *event) { if (loglevelActiveFor(LOG_LEVEL_ERROR)) { addLogMove(LOG_LEVEL_ERROR, strformat( - F("C011 : %s %s %s %s"), - element.HttpMethod.c_str(), - element.uri.c_str(), - element.header.c_str(), - element.postStr.c_str())); + F("C011 : %s %s %s %s"), + element.HttpMethod.c_str(), + element.uri.c_str(), + element.header.c_str(), + element.postStr.c_str())); } C011_DelayHandler->sendQueue.pop_back(); return false; @@ -305,7 +335,7 @@ void DeleteNotNeededValues(String& s, uint8_t numberOfValuesWanted) { // yes, so just remove the tokens s.replace(startToken, EMPTY_STRING); - s.replace(endToken, EMPTY_STRING); + s.replace(endToken, EMPTY_STRING); } else { @@ -344,31 +374,34 @@ void ReplaceTokenByValue(String& s, struct EventStruct *event, bool sendBinary) // write?db=testdb&type=%1%%vname1%%/1%%2%;%vname2%%/2%%3%;%vname3%%/3%%4%;%vname4%%/4%&value=%1%%val1%%/1%%2%;%val2%%/2%%3%;%val3%%/3%%4%;%val4%%/4% // %1%%vname1%,Standort=%tskname% Wert=%val1%%/1%%2%%LF%%vname2%,Standort=%tskname% Wert=%val2%%/2%%3%%LF%%vname3%,Standort=%tskname% // Wert=%val3%%/3%%4%%LF%%vname4%,Standort=%tskname% Wert=%val4%%/4% - #ifndef BUILD_NO_DEBUG + # ifndef BUILD_NO_DEBUG + if (loglevelActiveFor(LOG_LEVEL_DEBUG_MORE)) { addLog(LOG_LEVEL_DEBUG_MORE, F("HTTP before parsing: ")); addLog(LOG_LEVEL_DEBUG_MORE, s); } - #endif + # endif // ifndef BUILD_NO_DEBUG const uint8_t valueCount = getValueCountForTask(event->TaskIndex); DeleteNotNeededValues(s, valueCount); - #ifndef BUILD_NO_DEBUG + # ifndef BUILD_NO_DEBUG + if (loglevelActiveFor(LOG_LEVEL_DEBUG_MORE)) { addLog(LOG_LEVEL_DEBUG_MORE, F("HTTP after parsing: ")); addLog(LOG_LEVEL_DEBUG_MORE, s); } - #endif + # endif // ifndef BUILD_NO_DEBUG parseControllerVariables(s, event, !sendBinary); - #ifndef BUILD_NO_DEBUG + # ifndef BUILD_NO_DEBUG + if (loglevelActiveFor(LOG_LEVEL_DEBUG_MORE)) { addLog(LOG_LEVEL_DEBUG_MORE, F("HTTP after replacements: ")); addLog(LOG_LEVEL_DEBUG_MORE, s); } - #endif + # endif // ifndef BUILD_NO_DEBUG } #endif // ifdef USES_C011 diff --git a/src/_C012.cpp b/src/_C012.cpp index 94d639cf6..e4053f668 100644 --- a/src/_C012.cpp +++ b/src/_C012.cpp @@ -59,7 +59,15 @@ bool CPlugin_012(CPlugin::Function function, struct EventStruct *event, String& // Collect the values at the same run, to make sure all are from the same sample uint8_t valueCount = getValueCountForTask(event->TaskIndex); - std::unique_ptr element(new (std::nothrow) C012_queue_element(event, valueCount)); + + constexpr unsigned size = sizeof(C012_queue_element); + void *ptr = special_calloc(1, size); + + if (ptr == nullptr) { + break; + } + + std::unique_ptr element(new (ptr) C012_queue_element(event, valueCount)); for (uint8_t x = 0; x < valueCount; x++) { diff --git a/src/_C015.cpp b/src/_C015.cpp index 5269e4973..c0d8869e0 100644 --- a/src/_C015.cpp +++ b/src/_C015.cpp @@ -30,32 +30,35 @@ # define CPLUGIN_015_RECONNECT_INTERVAL 60000 # ifdef CPLUGIN_015_SSL - #ifdef ESP8266 - # include - #endif - #ifdef ESP32 - # include - #endif + # ifdef ESP8266 + # include + # endif + # ifdef ESP32 + # include + # endif # define CPLUGIN_NAME_015 "Blynk SSL" // Current official blynk server thumbprint # define CPLUGIN_015_DEFAULT_THUMBPRINT "FD C0 7D 8D 47 97 F7 E3 07 05 D3 4E E3 BB 8E 3D C0 EA BE 1C" # define C015_LOG_PREFIX "BL (ssl): " # else // ifdef CPLUGIN_015_SSL - #ifdef ESP8266 - # include - #endif - #ifdef ESP32 - # include - #endif + # ifdef ESP8266 + # include + # endif + # ifdef ESP32 + # include + # endif # define CPLUGIN_NAME_015 "Blynk" # define C015_LOG_PREFIX "BL: " # endif // ifdef CPLUGIN_015_SSL // Forward declarations: -boolean Blynk_send_c015(const String& value, int vPin, unsigned int clientTimeout); -boolean Blynk_keep_connection_c015(int controllerIndex, ControllerSettingsStruct& ControllerSettings); +boolean Blynk_send_c015(const String& value, + int vPin, + unsigned int clientTimeout); +boolean Blynk_keep_connection_c015(int controllerIndex, + ControllerSettingsStruct& ControllerSettings); static unsigned long _C015_LastConnectAttempt[CONTROLLER_MAX] = { 0, 0, 0 }; @@ -119,7 +122,7 @@ bool CPlugin_015(CPlugin::Function function, struct EventStruct *event, String& # ifdef CPLUGIN_015_SSL case CPlugin::Function::CPLUGIN_WEBFORM_LOAD: { - char thumbprint[60] = {0}; + char thumbprint[60] = { 0 }; LoadCustomControllerSettings(event->ControllerIndex, reinterpret_cast(&thumbprint), sizeof(thumbprint)); if (strlen(thumbprint) != 59) { @@ -141,6 +144,7 @@ bool CPlugin_015(CPlugin::Function function, struct EventStruct *event, String& if (validProtocolIndex(ProtocolIndex)) { const cpluginID_t number = getCPluginID_from_ProtocolIndex(ProtocolIndex); + if ((i != event->ControllerIndex) && (number == 15) && Settings.ControllerEnabled[i]) { success = false; @@ -156,8 +160,8 @@ bool CPlugin_015(CPlugin::Function function, struct EventStruct *event, String& _C015_LastConnectAttempt[event->ControllerIndex] = 0; # ifdef CPLUGIN_015_SSL - char thumbprint[60] = {0}; - String error = F("Specify server thumbprint with exactly 59 symbols string like " CPLUGIN_015_DEFAULT_THUMBPRINT); + char thumbprint[60] = { 0 }; + String error = F("Specify server thumbprint with exactly 59 symbols string like " CPLUGIN_015_DEFAULT_THUMBPRINT); if (!safe_strncpy(thumbprint, webArg("c015_thumbprint"), 60) || (strlen(thumbprint) != 59)) { addHtmlError(error); @@ -173,6 +177,7 @@ bool CPlugin_015(CPlugin::Function function, struct EventStruct *event, String& if (C015_DelayHandler == nullptr) { break; } + if (C015_DelayHandler->queueFull(event->ControllerIndex)) { break; } @@ -184,8 +189,13 @@ bool CPlugin_015(CPlugin::Function function, struct EventStruct *event, String& // Collect the values at the same run, to make sure all are from the same sample uint8_t valueCount = getValueCountForTask(event->TaskIndex); - std::unique_ptr element(new (std::nothrow) C015_queue_element(event, valueCount)); - success = C015_DelayHandler->addToQueue(std::move(element)); + constexpr unsigned size = sizeof(C015_queue_element); + void *ptr = special_calloc(1, size); + + if (ptr != nullptr) { + std::unique_ptr element(new (ptr) C015_queue_element(event, valueCount)); + success = C015_DelayHandler->addToQueue(std::move(element)); + } if (success) { // Element was added. @@ -205,19 +215,20 @@ bool CPlugin_015(CPlugin::Function function, struct EventStruct *event, String& free_string(formattedValue); } - const String valueName = Cache.getTaskDeviceValueName(event->TaskIndex, x); + const String valueName = Cache.getTaskDeviceValueName(event->TaskIndex, x); const String valueFullName = strformat( - F("%s.%s"), + F("%s.%s"), taskDeviceName.c_str(), valueName.c_str()); const String vPinNumberStr = valueName.substring(1, 4); - int vPinNumber = vPinNumberStr.toInt(); + int vPinNumber = vPinNumberStr.toInt(); if ((vPinNumber < 0) || (vPinNumber > 255)) { vPinNumber = -1; } + if (loglevelActiveFor(LOG_LEVEL_INFO)) { - String log = F(C015_LOG_PREFIX); + String log = F(C015_LOG_PREFIX); log += Blynk.connected() ? F("(online): ") : F("(offline): "); if ((vPinNumber > 0) && (vPinNumber < 256)) { @@ -228,9 +239,9 @@ bool CPlugin_015(CPlugin::Function function, struct EventStruct *event, String& vPinNumber); } else { log += strformat( - F("error got vPin number for %s, got not valid value: %s"), - valueFullName.c_str(), - vPinNumberStr.c_str()); + F("error got vPin number for %s, got not valid value: %s"), + valueFullName.c_str(), + vPinNumberStr.c_str()); } addLogMove(LOG_LEVEL_INFO, log); } @@ -257,34 +268,35 @@ bool CPlugin_015(CPlugin::Function function, struct EventStruct *event, String& // *INDENT-OFF* bool do_process_c015_delay_queue(cpluginID_t cpluginID, const Queue_element_base& element_base, ControllerSettingsStruct& ControllerSettings) { const C015_queue_element& element = static_cast(element_base); + // *INDENT-ON* - if (!Settings.ControllerEnabled[element._controller_idx]) { - // controller has been disabled. Answer true to flush queue. +if (!Settings.ControllerEnabled[element._controller_idx]) { + // controller has been disabled. Answer true to flush queue. + return true; +} + +if (!NetworkConnected()) { + return false; +} + +if (!Blynk_keep_connection_c015(element._controller_idx, ControllerSettings)) { + return false; +} + +while (element.vPin[element.valuesSent] == -1) { + // A non valid value, which we are not going to send. + // answer ok and skip real sending + if (element.checkDone(true)) { return true; } +} - if (!NetworkConnected()) { - return false; - } +bool sendSuccess = Blynk_send_c015( + element.txt[element.valuesSent], + element.vPin[element.valuesSent], + ControllerSettings.ClientTimeout); - if (!Blynk_keep_connection_c015(element._controller_idx, ControllerSettings)) { - return false; - } - - while (element.vPin[element.valuesSent] == -1) { - // A non valid value, which we are not going to send. - // answer ok and skip real sending - if (element.checkDone(true)) { - return true; - } - } - - bool sendSuccess = Blynk_send_c015( - element.txt[element.valuesSent], - element.vPin[element.valuesSent], - ControllerSettings.ClientTimeout); - - return element.checkDone(sendSuccess); +return element.checkDone(sendSuccess); } boolean Blynk_keep_connection_c015(int controllerIndex, ControllerSettingsStruct& ControllerSettings) { @@ -303,7 +315,7 @@ boolean Blynk_keep_connection_c015(int controllerIndex, ControllerSettingsStruct _C015_LastConnectAttempt[controllerIndex] = millis(); # ifdef CPLUGIN_015_SSL - char thumbprint[60] = {0}; + char thumbprint[60] = { 0 }; LoadCustomControllerSettings(controllerIndex, reinterpret_cast(&thumbprint), sizeof(thumbprint)); if (strlen(thumbprint) != 59) { @@ -312,6 +324,7 @@ boolean Blynk_keep_connection_c015(int controllerIndex, ControllerSettingsStruct addLog(LOG_LEVEL_INFO, thumbprint); } strcpy(thumbprint, CPLUGIN_015_DEFAULT_THUMBPRINT); + if (loglevelActiveFor(LOG_LEVEL_INFO)) { addLog(LOG_LEVEL_INFO, F(C015_LOG_PREFIX "using default one:")); addLog(LOG_LEVEL_INFO, thumbprint); @@ -421,9 +434,9 @@ String Command_Blynk_Set_c015(struct EventStruct *event, const char *Line) { if (loglevelActiveFor(LOG_LEVEL_INFO)) { addLogMove(LOG_LEVEL_INFO, strformat( - F(C015_LOG_PREFIX "(online): send blynk pin v%d = %s"), - vPin, - data.c_str())); + F(C015_LOG_PREFIX "(online): send blynk pin v%d = %s"), + vPin, + data.c_str())); } Blynk.virtualWrite(vPin, data); @@ -449,16 +462,16 @@ BLYNK_WRITE_DEFAULT() { if (loglevelActiveFor(LOG_LEVEL_INFO)) { addLogMove(LOG_LEVEL_INFO, strformat( - F(C015_LOG_PREFIX "server set v%u to %f"), - vPin, - pinValue)); + F(C015_LOG_PREFIX "server set v%u to %f"), + vPin, + pinValue)); } if (Settings.UseRules) { - eventQueue.addMove(strformat( - F("blynkv%d=%f"), - vPin, - pinValue)); + eventQueue.addMove(strformat( + F("blynkv%d=%f"), + vPin, + pinValue)); } } @@ -491,4 +504,4 @@ BLYNK_APP_DISCONNECTED() { // addLog(LOG_LEVEL_INFO, F(C015_LOG_PREFIX "app disconnected handler")); } -#endif // ifdef USES_C015 \ No newline at end of file +#endif // ifdef USES_C015 diff --git a/src/_C017.cpp b/src/_C017.cpp index fc8f5131d..be1180826 100644 --- a/src/_C017.cpp +++ b/src/_C017.cpp @@ -67,8 +67,13 @@ bool CPlugin_017(CPlugin::Function function, struct EventStruct *event, String& break; } - std::unique_ptr element(new (std::nothrow) C017_queue_element(event)); - success = C017_DelayHandler->addToQueue(std::move(element)); + constexpr unsigned size = sizeof(C017_queue_element); + void *ptr = special_calloc(1, size); + + if (ptr != nullptr) { + std::unique_ptr element(new (ptr) C017_queue_element(event)); + success = C017_DelayHandler->addToQueue(std::move(element)); + } Scheduler.scheduleNextDelayQueue(SchedulerIntervalTimer_e::TIMER_C017_DELAY_QUEUE, C017_DelayHandler->getNextScheduleTime()); break; } diff --git a/src/_C018.cpp b/src/_C018.cpp index 6642609dc..cd47ed974 100644 --- a/src/_C018.cpp +++ b/src/_C018.cpp @@ -127,7 +127,14 @@ bool CPlugin_018(CPlugin::Function function, struct EventStruct *event, String& { // Keep this object in a small scope so we can destruct it as soon as possible again. - std::shared_ptr customConfig(new (std::nothrow) C018_ConfigStruct); + + constexpr unsigned size = sizeof(C018_ConfigStruct); + void *ptr = special_calloc(1, size); + + if (ptr == nullptr) { + break; + } + std::shared_ptr customConfig(new (ptr) C018_ConfigStruct); if (!customConfig) { break; @@ -140,7 +147,13 @@ bool CPlugin_018(CPlugin::Function function, struct EventStruct *event, String& } case CPlugin::Function::CPLUGIN_WEBFORM_SAVE: { - std::shared_ptr customConfig(new (std::nothrow) C018_ConfigStruct); + constexpr unsigned size = sizeof(C018_ConfigStruct); + void *ptr = special_calloc(1, size); + + if (ptr == nullptr) { + break; + } + std::shared_ptr customConfig(new (ptr) C018_ConfigStruct); if (customConfig) { customConfig->webform_save(); @@ -186,7 +199,14 @@ bool CPlugin_018(CPlugin::Function function, struct EventStruct *event, String& if (C018_data != nullptr) { { - std::unique_ptr element(new (std::nothrow) C018_queue_element(event, C018_data->getSampleSetCount(event->TaskIndex))); + constexpr unsigned size = sizeof(C018_queue_element); + void *ptr = special_calloc(1, size); + + if (ptr == nullptr) { + break; + } + + std::unique_ptr element(new (ptr) C018_queue_element(event, C018_data->getSampleSetCount(event->TaskIndex))); success = C018_DelayHandler->addToQueue(std::move(element)); Scheduler.scheduleNextDelayQueue(SchedulerIntervalTimer_e::TIMER_C018_DELAY_QUEUE, C018_DelayHandler->getNextScheduleTime()); @@ -274,11 +294,19 @@ bool C018_init(struct EventStruct *event) { C018_data = nullptr; } + { + constexpr unsigned size = sizeof(C018_data_struct); + void *ptr = special_calloc(1, size); - C018_data = new (std::nothrow) C018_data_struct; + if (ptr == nullptr) { + return false; + } - if (C018_data == nullptr) { - return false; + C018_data = new (ptr) C018_data_struct; + + if (C018_data == nullptr) { + return false; + } } { // Allocate ControllerSettings object in a scope, so we can destruct it as soon as possible. @@ -296,7 +324,13 @@ bool C018_init(struct EventStruct *event) { Port = ControllerSettings->Port; } - std::shared_ptr customConfig(new (std::nothrow) C018_ConfigStruct); + constexpr unsigned size = sizeof(C018_ConfigStruct); + void *ptr = special_calloc(1, size); + + if (ptr == nullptr) { + return false; + } + std::shared_ptr customConfig(new (ptr) C018_ConfigStruct); if (!customConfig) { return false; diff --git a/src/src/DataStructs/ESPeasyControllerCache.cpp b/src/src/DataStructs/ESPeasyControllerCache.cpp index 1654e40c7..bae5fbee6 100644 --- a/src/src/DataStructs/ESPeasyControllerCache.cpp +++ b/src/src/DataStructs/ESPeasyControllerCache.cpp @@ -2,6 +2,8 @@ #if FEATURE_RTC_CACHE_STORAGE +#include "../Helpers/Memory.h" + ControllerCache_struct::~ControllerCache_struct() { if (_RTC_cache_handler != nullptr) { delete _RTC_cache_handler; @@ -33,11 +35,12 @@ bool ControllerCache_struct::flush() { void ControllerCache_struct::init() { if (_RTC_cache_handler == nullptr) { - # ifdef USE_SECOND_HEAP -// HeapSelectIram ephemeral; - # endif // ifdef USE_SECOND_HEAP + constexpr unsigned size = sizeof(RTC_cache_handler_struct); + void *ptr = special_calloc(1, size); - _RTC_cache_handler = new (std::nothrow) RTC_cache_handler_struct; + if (ptr != nullptr) { + _RTC_cache_handler = new (ptr) RTC_cache_handler_struct; + } if (_RTC_cache_handler != nullptr) { _RTC_cache_handler->init(); } diff --git a/src/src/DataStructs/PluginTaskData_base.cpp b/src/src/DataStructs/PluginTaskData_base.cpp index 28428100f..99e8346f4 100644 --- a/src/src/DataStructs/PluginTaskData_base.cpp +++ b/src/src/DataStructs/PluginTaskData_base.cpp @@ -60,7 +60,12 @@ void PluginTaskData_base::initPluginStats(taskIndex_t taskIndex, taskVarIndex_t { if (taskVarIndex < VARS_PER_TASK) { if (_plugin_stats_array == nullptr) { - _plugin_stats_array = new (std::nothrow) PluginStats_array(); + constexpr unsigned size = sizeof(PluginStats_array); + void *ptr = special_calloc(1, size); + + if (ptr != nullptr) { + _plugin_stats_array = new (ptr) PluginStats_array(); + } } if (_plugin_stats_array != nullptr) { diff --git a/src/src/DataStructs/ProvisioningStruct.h b/src/src/DataStructs/ProvisioningStruct.h index f88a8b143..5d0589928 100644 --- a/src/src/DataStructs/ProvisioningStruct.h +++ b/src/src/DataStructs/ProvisioningStruct.h @@ -55,7 +55,6 @@ struct ProvisioningStruct }; typedef std::shared_ptr ProvisioningStruct_ptr_type; -//# define MakeProvisioningSettings(T) ProvisioningStruct_ptr_type T(new (std::nothrow) ProvisioningStruct()); #define MakeProvisioningSettings(T) void * calloc_ptr = special_calloc(1,sizeof(ProvisioningStruct)); ProvisioningStruct_ptr_type T(new (calloc_ptr) ProvisioningStruct()); diff --git a/src/src/Globals/Plugins.cpp b/src/src/Globals/Plugins.cpp index 242cbb245..d3a856e48 100644 --- a/src/src/Globals/Plugins.cpp +++ b/src/src/Globals/Plugins.cpp @@ -456,7 +456,7 @@ bool PluginCallForTask(taskIndex_t taskIndex, uint8_t Function, EventStruct *Tem void *ptr = special_calloc(1, size); if (ptr) { - initPluginTaskData(taskIndex, new (std::nothrow) _StatsOnly_data_struct()); + initPluginTaskData(taskIndex, new (ptr) _StatsOnly_data_struct()); } } } diff --git a/src/src/Helpers/Networking.cpp b/src/src/Helpers/Networking.cpp index b7eaa510f..32b2fac50 100644 --- a/src/src/Helpers/Networking.cpp +++ b/src/src/Helpers/Networking.cpp @@ -685,7 +685,12 @@ bool SSDP_begin() { _server = nullptr; } - _server = new (std::nothrow) UdpContext; + constexpr unsigned size = sizeof(UdpContext); + void *ptr = special_calloc(1, size); + + if (ptr != nullptr) { + _server = new (ptr) UdpContext; + } if (_server == nullptr) { return false; @@ -770,7 +775,16 @@ void SSDP_send(uint8_t method) { (uint16_t)((chipId >> 8) & 0xff), (uint16_t)chipId & 0xff); - char *buffer = new (std::nothrow) char[1460](); + char *buffer = nullptr; + # ifdef USE_SECOND_HEAP + { + HeapSelectIram ephemeral; + buffer = new (std::nothrow) char[1460](); + } + # endif // ifdef USE_SECOND_HEAP + if (buffer == nullptr) { + buffer = new (std::nothrow) char[1460](); + } if (buffer == nullptr) { return; } int len = snprintf(buffer, 1460, diff --git a/src/src/WebServer/UploadPage.cpp b/src/src/WebServer/UploadPage.cpp index bb2a2e869..74ae84ca7 100644 --- a/src/src/WebServer/UploadPage.cpp +++ b/src/src/WebServer/UploadPage.cpp @@ -174,7 +174,12 @@ void handleFileUploadBase(bool toSDcard) { # if FEATURE_TARSTREAM_SUPPORT if ((upload.filename.length() > 3) && upload.filename.substring(upload.filename.length() - 4).equalsIgnoreCase(F(".tar"))) { - tarStream = new (std::nothrow) TarStream(upload.filename, destination); + constexpr unsigned size = sizeof(TarStream); + void *ptr = special_calloc(1, size); + + if (ptr != nullptr) { + tarStream = new (ptr) TarStream(upload.filename, destination); + } # ifndef BUILD_NO_DEBUG if (loglevelActiveFor(LOG_LEVEL_INFO)) { From 130d297fe55f2b25fe63aea3004e5a5a53448eb8 Mon Sep 17 00:00:00 2001 From: TD-er Date: Thu, 20 Feb 2025 17:02:56 +0100 Subject: [PATCH 035/564] [ESP32S3] Fix bootloop on ESP32S3 with OPI PSRAM --- boards/esp32s3cdc-qio_opi-16M.json | 3 ++- boards/esp8266_160MHz_4M1M_board.json | 31 +++++++++++++++++++++++++++ platformio_esp32s3_envs.ini | 6 +++--- platformio_esp82xx_envs.ini | 2 ++ src/src/ESPEasyCore/ESPEasy_setup.cpp | 7 +++--- 5 files changed, 42 insertions(+), 7 deletions(-) create mode 100644 boards/esp8266_160MHz_4M1M_board.json diff --git a/boards/esp32s3cdc-qio_opi-16M.json b/boards/esp32s3cdc-qio_opi-16M.json index 05b680768..964cb33ef 100644 --- a/boards/esp32s3cdc-qio_opi-16M.json +++ b/boards/esp32s3cdc-qio_opi-16M.json @@ -5,10 +5,11 @@ "memory_type": "qio_opi" }, "core": "esp32", - "extra_flags": "-DARDUINO_TASMOTA -DBOARD_HAS_PSRAM -DARDUINO_USB_MODE=1 -DUSE_USB_CDC_CONSOLE -DESP32_16M -DESP32S3 -DARDUINO_USB_CDC_ON_BOOT=1", "f_cpu": "240000000L", "f_flash": "80000000L", + "boot": "opi", "flash_mode": "qio", + "extra_flags": "-DARDUINO_TASMOTA -DBOARD_HAS_PSRAM -DARDUINO_USB_MODE=1 -DUSE_USB_CDC_CONSOLE -DESP32_16M -DESP32S3 -DARDUINO_USB_CDC_ON_BOOT=1", "hwids": [ [ "0x303A", diff --git a/boards/esp8266_160MHz_4M1M_board.json b/boards/esp8266_160MHz_4M1M_board.json new file mode 100644 index 000000000..01bddc562 --- /dev/null +++ b/boards/esp8266_160MHz_4M1M_board.json @@ -0,0 +1,31 @@ +{ + "build": { + "arduino": { + "ldscript": "eagle.flash.4m1m.ld" + }, + "core": "esp8266", + "extra_flags": "-DARDUINO_TASMOTA -DESP8266 -DARDUINO_ARCH_ESP8266 -DARDUINO_ESP8266_ESP01 -DESP8266_4M -DESP8266_4M1M", + "f_cpu": "120000000L", + "f_flash": "40000000L", + "flash_mode": "dout", + "mcu": "esp8266", + "variant": "generic" + }, + "connectivity": [ + "wifi" + ], + "frameworks": [ + "arduino" + ], + "name": "Espressif Generic ESP8266 ESPEasy 4M Flash 1M FS", + "upload": { + "maximum_ram_size": 81920, + "maximum_size": 1040316, + "require_upload_port": true, + "resetmethod": "nodemcu", + "speed": 115200 + }, + "url": "http://www.esp8266.com/wiki/doku.php?id=esp8266-module-family", + "vendor": "Espressif" + } + \ No newline at end of file diff --git a/platformio_esp32s3_envs.ini b/platformio_esp32s3_envs.ini index 55019ee6e..abc5bb7a0 100644 --- a/platformio_esp32s3_envs.ini +++ b/platformio_esp32s3_envs.ini @@ -217,9 +217,9 @@ build_flags = ${esp32s3_common_LittleFS.build_flags} -DPLUGIN_BUILD_IR_EXTENDED -DCONFIG_PM_LIGHTSLEEP_RTC_OSC_CAL_INTERVAL=1 extra_scripts = ${esp32s3_common_LittleFS.extra_scripts} -custom_sdkconfig = - CONFIG_RMT_ISR_CACHE_SAFE=y - CONFIG_PM_LIGHTSLEEP_RTC_OSC_CAL_INTERVAL=1 +;custom_sdkconfig = +; CONFIG_RMT_ISR_CACHE_SAFE=y +; CONFIG_PM_LIGHTSLEEP_RTC_OSC_CAL_INTERVAL=1 diff --git a/platformio_esp82xx_envs.ini b/platformio_esp82xx_envs.ini index a51d074c3..3e8246a42 100644 --- a/platformio_esp82xx_envs.ini +++ b/platformio_esp82xx_envs.ini @@ -302,6 +302,7 @@ lib_ignore = ${normal.lib_ignore} [env:normal_beta_2ndheap_ESP8266_4M1M] extends = esp8266_4M1M +board = esp8266_160MHz_4M1M_board platform = ${normal_beta_2ndheap.platform} platform_packages = ${normal_beta_2ndheap.platform_packages} build_flags = ${normal_beta_2ndheap.build_flags} @@ -312,6 +313,7 @@ lib_ignore = ${normal_beta_2ndheap.lib_ignore} [env:normal_beta_2ndheap_ESP8266_4M1M_VCC] extends = esp8266_4M1M +board = esp8266_160MHz_4M1M_board platform = ${normal_beta_2ndheap.platform} platform_packages = ${normal_beta_2ndheap.platform_packages} build_flags = ${normal_beta_2ndheap.build_flags} diff --git a/src/src/ESPEasyCore/ESPEasy_setup.cpp b/src/src/ESPEasyCore/ESPEasy_setup.cpp index 0f092f664..c956a8640 100644 --- a/src/src/ESPEasyCore/ESPEasy_setup.cpp +++ b/src/src/ESPEasyCore/ESPEasy_setup.cpp @@ -129,6 +129,10 @@ void sw_watchdog_callback(void *arg) \*********************************************************************************************/ void ESPEasy_setup() { +# ifdef BOARD_HAS_PSRAM + psramInit(); +# endif // ifdef BOARD_HAS_PSRAM + #if defined(ESP8266_DISABLE_EXTRA4K) || defined(USE_SECOND_HEAP) // disable_extra4k_at_link_time(); @@ -144,9 +148,6 @@ void ESPEasy_setup() DisableBrownout(); // Workaround possible weak LDO resulting in brownout detection during Wifi connection # endif // DISABLE_ESP32_BROWNOUT -# ifdef BOARD_HAS_PSRAM - psramInit(); -# endif // ifdef BOARD_HAS_PSRAM # if CONFIG_IDF_TARGET_ESP32 From bf300aa177448437f846d7606667e198e54fa560 Mon Sep 17 00:00:00 2001 From: TD-er Date: Thu, 20 Feb 2025 17:03:42 +0100 Subject: [PATCH 036/564] [WiFi] Fix not setting wifi as initialized too often --- src/src/DataStructs/WiFiEventData.cpp | 2 +- src/src/ESPEasyCore/ESPEasyWifi_ProcessEvent.cpp | 4 +++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/src/src/DataStructs/WiFiEventData.cpp b/src/src/DataStructs/WiFiEventData.cpp index e8bf8be67..0790640f8 100644 --- a/src/src/DataStructs/WiFiEventData.cpp +++ b/src/src/DataStructs/WiFiEventData.cpp @@ -182,7 +182,7 @@ void WiFiEventData_t::setWiFiServicesInitialized() { if (/*!unprocessedWifiEvents() && */ WiFiConnected() && WiFiGotIP()) { #ifndef BUILD_NO_DEBUG - addLog(LOG_LEVEL_DEBUG, F("WiFi : WiFi services initialized")); +// addLog(LOG_LEVEL_DEBUG, F("WiFi : WiFi services initialized")); #endif bitSet(wifiStatus, ESPEASY_WIFI_SERVICES_INITIALIZED); wifiConnectInProgress = false; diff --git a/src/src/ESPEasyCore/ESPEasyWifi_ProcessEvent.cpp b/src/src/ESPEasyCore/ESPEasyWifi_ProcessEvent.cpp index 085486bd2..3f19bf7b6 100644 --- a/src/src/ESPEasyCore/ESPEasyWifi_ProcessEvent.cpp +++ b/src/src/ESPEasyCore/ESPEasyWifi_ProcessEvent.cpp @@ -74,7 +74,9 @@ void handle_unprocessedNetworkEvents() // FIXME TD-er: Forcefully set the GotIP flag for now WiFiEventData.setWiFiGotIP(); } - WiFiEventData.setWiFiServicesInitialized(); + if (!WiFiEventData.WiFiServicesInitialized()) { + WiFiEventData.setWiFiServicesInitialized(); + } if (WiFiEventData.WiFiServicesInitialized() && processedSomething) { From c391ad8a3bfe4e780e7463e7ae270c1ceee2d0e8 Mon Sep 17 00:00:00 2001 From: TD-er Date: Thu, 20 Feb 2025 17:04:42 +0100 Subject: [PATCH 037/564] [Memory] Improve memory usage on Strings and task data --- src/_P002_ADC.ino | 2 +- src/_P023_OLED.ino | 5 +++- src/_P036_FrameOLED.ino | 9 +------ src/_P037_MQTTImport.ino | 18 +++++++++++--- src/_P082_GPS.ino | 9 +------ src/_P092_DLbus.ino | 2 ++ src/_Plugin_Helper.h | 3 +++ src/src/Globals/Plugins.cpp | 18 +++----------- src/src/Helpers/ESPEasy_Storage.cpp | 6 ++++- src/src/Helpers/RulesHelper.cpp | 9 ++++--- src/src/Helpers/StringConverter.cpp | 29 +++++++++++----------- src/src/PluginStructs/P037_data_struct.cpp | 4 +++ 12 files changed, 59 insertions(+), 55 deletions(-) diff --git a/src/_P002_ADC.ino b/src/_P002_ADC.ino index 920213d51..56a572765 100644 --- a/src/_P002_ADC.ino +++ b/src/_P002_ADC.ino @@ -99,7 +99,7 @@ boolean Plugin_002(uint8_t function, struct EventStruct *event, String& string) case PLUGIN_INIT: { - initPluginTaskData(event->TaskIndex, new (std::nothrow) P002_data_struct()); + special_initPluginTaskData(event->TaskIndex, P002_data_struct); P002_data_struct *P002_data = static_cast(getPluginTaskData(event->TaskIndex)); diff --git a/src/_P023_OLED.ino b/src/_P023_OLED.ino index eae8fb7be..97cfda340 100644 --- a/src/_P023_OLED.ino +++ b/src/_P023_OLED.ino @@ -183,7 +183,10 @@ boolean Plugin_023(uint8_t function, struct EventStruct *event, String& string) font_spacing = static_cast(PCONFIG(4)); } - initPluginTaskData(event->TaskIndex, new (std::nothrow) P023_data_struct(PCONFIG(0), type, font_spacing, PCONFIG(2), PCONFIG(5))); + void * ptr = special_calloc(1, sizeof(P023_data_struct)); + if (ptr) { + initPluginTaskData(event->TaskIndex, new (ptr) P023_data_struct(PCONFIG(0), type, font_spacing, PCONFIG(2), PCONFIG(5))); + } P023_data_struct *P023_data = static_cast(getPluginTaskData(event->TaskIndex)); if (nullptr != P023_data) { diff --git a/src/_P036_FrameOLED.ino b/src/_P036_FrameOLED.ino index 0beba24f2..3ea0e4396 100644 --- a/src/_P036_FrameOLED.ino +++ b/src/_P036_FrameOLED.ino @@ -710,14 +710,7 @@ boolean Plugin_036(uint8_t function, struct EventStruct *event, String& string) # ifdef P036_CHECK_HEAP P036_CheckHeap(F("_INIT: Entering")); # endif // P036_CHECK_HEAP - { - constexpr unsigned size = sizeof(P036_data_struct); - void *ptr = special_calloc(1, size); - - if (ptr != nullptr) { - initPluginTaskData(event->TaskIndex, new (ptr) P036_data_struct()); - } - } + special_initPluginTaskData(event->TaskIndex, P036_data_struct); # ifdef P036_CHECK_HEAP P036_CheckHeap(F("_INIT: Before (*P036_data = static_cast)")); # endif // P036_CHECK_HEAP diff --git a/src/_P037_MQTTImport.ino b/src/_P037_MQTTImport.ino index 3d5980a3d..8e47eb746 100644 --- a/src/_P037_MQTTImport.ino +++ b/src/_P037_MQTTImport.ino @@ -200,7 +200,12 @@ boolean Plugin_037(uint8_t function, struct EventStruct *event, String& string) # endif // if P037_REPLACE_BY_COMMA_SUPPORT { - P037_data_struct *P037_data = new (std::nothrow) P037_data_struct(event->TaskIndex); + P037_data_struct *P037_data = nullptr; + constexpr size_t size = sizeof(P037_data_struct); + void * ptr = special_calloc(1, size); + if (ptr) { + P037_data = new (ptr) P037_data_struct(event->TaskIndex); + } if (nullptr == P037_data) { return success; @@ -229,7 +234,11 @@ boolean Plugin_037(uint8_t function, struct EventStruct *event, String& string) case PLUGIN_WEBFORM_SAVE: { - P037_data_struct *P037_data = new (std::nothrow) P037_data_struct(event->TaskIndex); + P037_data_struct *P037_data = nullptr; + void * ptr = special_calloc(1, sizeof(P037_data_struct)); + if (ptr) { + P037_data = new (ptr) P037_data_struct(event->TaskIndex); + } if (nullptr == P037_data) { return success; @@ -271,7 +280,10 @@ boolean Plugin_037(uint8_t function, struct EventStruct *event, String& string) case PLUGIN_INIT: { - initPluginTaskData(event->TaskIndex, new (std::nothrow) P037_data_struct(event->TaskIndex)); + void * ptr = special_calloc(1, sizeof(P037_data_struct)); + if (ptr) { + initPluginTaskData(event->TaskIndex, new (ptr) P037_data_struct(event->TaskIndex)); + } P037_data_struct *P037_data = static_cast(getPluginTaskData(event->TaskIndex)); diff --git a/src/_P082_GPS.ino b/src/_P082_GPS.ino index 1df45035c..6237fc3b6 100644 --- a/src/_P082_GPS.ino +++ b/src/_P082_GPS.ino @@ -314,14 +314,7 @@ boolean Plugin_082(uint8_t function, struct EventStruct *event, String& string) const int16_t serial_tx = CONFIG_PIN2; const int16_t pps_pin = CONFIG_PIN3; - // Try to allocate in PSRAM or 2nd heap if possible - constexpr unsigned size = sizeof(P082_data_struct); - void *ptr = special_calloc(1, size); - if (!ptr) { - return success; - } - - initPluginTaskData(event->TaskIndex, new (ptr) P082_data_struct()); + special_initPluginTaskData(event->TaskIndex, P082_data_struct); P082_data_struct *P082_data = static_cast(getPluginTaskData(event->TaskIndex)); diff --git a/src/_P092_DLbus.ino b/src/_P092_DLbus.ino index 4a8a0e06e..63aa79e3f 100644 --- a/src/_P092_DLbus.ino +++ b/src/_P092_DLbus.ino @@ -411,6 +411,8 @@ boolean Plugin_092(uint8_t function, struct EventStruct *event, String& string) addLog(LOG_LEVEL_INFO, F("Create P092_data_struct ...")); # endif // ifndef P092_LIMIT_BUILD_SIZE + // FIXME TD-er: This is a really odd and overly complex way to handle this. + P092_data = new (std::nothrow) P092_data_struct(); initPluginTaskData(event->TaskIndex, P092_data); diff --git a/src/_Plugin_Helper.h b/src/_Plugin_Helper.h index 8acf57fac..d00edfd46 100644 --- a/src/_Plugin_Helper.h +++ b/src/_Plugin_Helper.h @@ -92,6 +92,9 @@ extern PluginTaskData_base *Plugin_task_data[TASKS_MAX]; +// Try to allocate in PSRAM or 2nd heap if possible +#define special_initPluginTaskData(I, T) void * ptr = special_calloc(1, sizeof(T)); if (ptr) { initPluginTaskData(I, new (ptr) T()); } + String PCONFIG_LABEL(int n); // ============================================== diff --git a/src/src/Globals/Plugins.cpp b/src/src/Globals/Plugins.cpp index d3a856e48..a20eec4bd 100644 --- a/src/src/Globals/Plugins.cpp +++ b/src/src/Globals/Plugins.cpp @@ -419,14 +419,7 @@ bool PluginCallForTask(taskIndex_t taskIndex, uint8_t Function, EventStruct *Tem LoadTaskSettings(taskIndex); if (ExtraTaskSettings.anyEnabledPluginStats()) { - - // Try to allocate in PSRAM or 2nd heap if possible - constexpr unsigned size = sizeof(_StatsOnly_data_struct); - void *ptr = special_calloc(1, size); - - if (ptr) { - initPluginTaskData(taskIndex, new (ptr) _StatsOnly_data_struct()); - } + special_initPluginTaskData(taskIndex, _StatsOnly_data_struct); } } } @@ -452,12 +445,7 @@ bool PluginCallForTask(taskIndex_t taskIndex, uint8_t Function, EventStruct *Tem if (ExtraTaskSettings.anyEnabledPluginStats()) { // Try to allocate in PSRAM or 2nd heap if possible - constexpr unsigned size = sizeof(_StatsOnly_data_struct); - void *ptr = special_calloc(1, size); - - if (ptr) { - initPluginTaskData(taskIndex, new (ptr) _StatsOnly_data_struct()); - } + special_initPluginTaskData(taskIndex, _StatsOnly_data_struct); } } } @@ -931,7 +919,7 @@ bool PluginCall(uint8_t Function, struct EventStruct *event, String& str) LoadTaskSettings(event->TaskIndex); if (ExtraTaskSettings.anyEnabledPluginStats()) { - initPluginTaskData(event->TaskIndex, new (std::nothrow) _StatsOnly_data_struct()); + special_initPluginTaskData(event->TaskIndex, _StatsOnly_data_struct); } } } diff --git a/src/src/Helpers/ESPEasy_Storage.cpp b/src/src/Helpers/ESPEasy_Storage.cpp index b4010bda3..4d93ca8a7 100644 --- a/src/src/Helpers/ESPEasy_Storage.cpp +++ b/src/src/Helpers/ESPEasy_Storage.cpp @@ -1061,7 +1061,11 @@ String LoadStringArray(SettingsType::Enum settingsType, // Specific string length, so we have to set the next string position. nextStringPos += maxStringLength; } - move_special(strings[stringCount], std::move(tmpString)); + if (!tmpString.isEmpty()) { + move_special(strings[stringCount], std::move(tmpString)); + } else { + free_string(strings[stringCount]); + } // Do not allocate tmpString on 2nd heap as byte access on 2nd heap is much slower // We're appending per byte, so better prefer speed for short lived objects diff --git a/src/src/Helpers/RulesHelper.cpp b/src/src/Helpers/RulesHelper.cpp index bb969823e..41b2ce958 100644 --- a/src/src/Helpers/RulesHelper.cpp +++ b/src/src/Helpers/RulesHelper.cpp @@ -293,7 +293,7 @@ String RulesHelperClass::readLn(const String& filename, while (f.available()) { if (addChar(char(f.read()), tmpStr, firstNonSpaceRead)) { - lines.push_back(move_special(std::move(tmpStr))); + lines.push_back(std::move(move_special(std::move(tmpStr)))); ++readPos; firstNonSpaceRead = false; @@ -304,7 +304,7 @@ String RulesHelperClass::readLn(const String& filename, if (tmpStr.length() > 0) { rules_strip_trailing_comments(tmpStr); check_rules_line_user_errors(tmpStr); - lines.push_back(move_special(std::move(tmpStr))); + lines.push_back(std::move(move_special(std::move(tmpStr)))); tmpStr.clear(); } # ifndef BUILD_NO_DEBUG @@ -404,7 +404,10 @@ String RulesHelperClass::readLn(const String& filename, } rules_strip_trailing_comments(line); check_rules_line_user_errors(line); - return line; + + // Make sure there is no left-over reserved data + // and allocate it to the appropriate memory area. + return move_special(std::move(line)); } #endif // ifdef CACHE_RULES_IN_MEMORY diff --git a/src/src/Helpers/StringConverter.cpp b/src/src/Helpers/StringConverter.cpp index a6ea8b0db..4e8ea1f4f 100644 --- a/src/src/Helpers/StringConverter.cpp +++ b/src/src/Helpers/StringConverter.cpp @@ -76,23 +76,24 @@ bool equals(const String& str, const char& c) { } void move_special(String& dest, String&& source) { - #ifdef USE_SECOND_HEAP // Only try to store larger strings here as those tend to be kept for a longer period. - if ((source.length() >= 64) && mmu_is_dram(&(source[0]))) { + if ((source.length() >= 64) +#ifdef USE_SECOND_HEAP + && mmu_is_dram(&(source[0])) +#endif + ) { // The string was not allocated on the 2nd heap, so copy instead of move - HeapSelectIram ephemeral; - if (dest.reserve(source.length())) { - dest = source; - free_string(source); + if (!reserve_special(dest, source.length())) { + // Could not allocate on 2nd heap or PSRAM, so just move existing string + dest = std::move(source); return; } - // Could not allocate on 2nd heap, so just move existing string } - #endif // ifdef USE_SECOND_HEAP - dest = std::move(source); - #ifdef ESP32 - reserve_special(dest, dest.length()); - #endif + + // Try to avoid keeping reserved memory on empty strings + // So just copy the data, not move + dest = source; + free_string(source); } String move_special(String&& source) { @@ -734,9 +735,7 @@ String stripWrappingChar(const String& text, char wrappingChar) { const unsigned int length = text.length(); if ((length >= 2) && stringWrappedWithChar(text, wrappingChar)) { - String dest; - move_special(dest,text.substring(1, length - 1)); - return dest; + return move_special(text.substring(1, length - 1)); } return text; } diff --git a/src/src/PluginStructs/P037_data_struct.cpp b/src/src/PluginStructs/P037_data_struct.cpp index 2722d0ddf..269216848 100644 --- a/src/src/PluginStructs/P037_data_struct.cpp +++ b/src/src/PluginStructs/P037_data_struct.cpp @@ -30,7 +30,11 @@ P037_data_struct::~P037_data_struct() { * Load the settings from file */ bool P037_data_struct::loadSettings() { + if (_taskIndex < TASKS_MAX) { + # ifdef USE_SECOND_HEAP +// HeapSelectIram ephemeral; + #endif size_t offset = 0; LoadCustomTaskSettings(_taskIndex, mqttTopics, VARS_PER_TASK, 41, offset); From 78c2c04ae6611edcb2bfab0766e4d7945bc56ccc Mon Sep 17 00:00:00 2001 From: TD-er Date: Fri, 21 Feb 2025 16:33:46 +0100 Subject: [PATCH 038/564] [Memory] Fix crashes on ESP32-S2 with 8M PSRAM --- src/src/Helpers/Memory.cpp | 9 ++++++++- src/src/Helpers/StringConverter.cpp | 13 ++++++++----- 2 files changed, 16 insertions(+), 6 deletions(-) diff --git a/src/src/Helpers/Memory.cpp b/src/src/Helpers/Memory.cpp index 2096a86e2..3fd4a35ad 100644 --- a/src/src/Helpers/Memory.cpp +++ b/src/src/Helpers/Memory.cpp @@ -233,7 +233,11 @@ bool String_reserve_special(String& str, size_t size) { class PSRAM_String : public String { public: PSRAM_String(size_t size) : String() { - init(); + sso.isSSO = 0; // setSSO(false); + ptr.buff = nullptr; // setBuffer(nullptr); + ptr.cap = 0; // setCapacity(0); + ptr.len = 0; // setLen(0); + if (size != 0 && size > capacity() && UsePSRAM()) { size_t newSize = (size + 16) & (~0xf); void *ptr = special_calloc(1, newSize); @@ -249,6 +253,9 @@ class PSRAM_String : public String { bool String_reserve_special(String& str, size_t size) { + if (size == 0) { + return true; + } if (!UsePSRAM()) { return str.reserve(size); } diff --git a/src/src/Helpers/StringConverter.cpp b/src/src/Helpers/StringConverter.cpp index 4e8ea1f4f..4afdd7362 100644 --- a/src/src/Helpers/StringConverter.cpp +++ b/src/src/Helpers/StringConverter.cpp @@ -110,12 +110,15 @@ bool reserve_special(String& str, size_t size) { void free_string(String& str) { // This is a call specifically tailored to what is done in: // void String::move(String &rhs) - #if defined(ESP32) || defined(CORE_POST_3_0_0) - str.clear(); // Prevent any unneeded copying - String tmp(std::move(str)); - #else + +#if defined(ESP32) || defined(CORE_POST_3_0_0) + // Use current implementation of String::copy as this + // invalidates and thus deallocates current buffer + str = (const char*)nullptr; + str = String(); // No idea why this is needed, without it, some ESP32's may bootloop +#else str = String(); - #endif +#endif } /********************************************************************************************\ From c58ac90c8c90da8aba8a5d77514261b2f2217496 Mon Sep 17 00:00:00 2001 From: TD-er Date: Mon, 10 Mar 2025 12:18:44 +0100 Subject: [PATCH 039/564] [WiFi] Fix setting dynamic WiFi TX power --- src/src/ESPEasyCore/ESPEasyWiFi_state_machine.cpp | 3 +++ src/src/ESPEasyCore/ESPEasyWifi_abstracted_ESP32.cpp | 7 +++---- tools/pio/pre_custom_esp32.py | 2 +- 3 files changed, 7 insertions(+), 5 deletions(-) diff --git a/src/src/ESPEasyCore/ESPEasyWiFi_state_machine.cpp b/src/src/ESPEasyCore/ESPEasyWiFi_state_machine.cpp index 3c1d10172..cb1ea480d 100644 --- a/src/src/ESPEasyCore/ESPEasyWiFi_state_machine.cpp +++ b/src/src/ESPEasyCore/ESPEasyWiFi_state_machine.cpp @@ -177,6 +177,9 @@ void ESPEasyWiFi_t::loop() } else { // Else mark last timestamp seen as connected _last_seen_connected.setNow(); + # if FEATURE_SET_WIFI_TX_PWR + SetWiFiTXpower(); + # endif } break; } diff --git a/src/src/ESPEasyCore/ESPEasyWifi_abstracted_ESP32.cpp b/src/src/ESPEasyCore/ESPEasyWifi_abstracted_ESP32.cpp index 919f57745..03b48ac1f 100644 --- a/src/src/ESPEasyCore/ESPEasyWifi_abstracted_ESP32.cpp +++ b/src/src/ESPEasyCore/ESPEasyWifi_abstracted_ESP32.cpp @@ -271,10 +271,9 @@ void doSetWiFiTXpower(float& dBm) { int8_t power = dBm * 4; - if (esp_wifi_set_max_tx_power(power) == ESP_OK) { - if (esp_wifi_get_max_tx_power(&power) == ESP_OK) { - dBm = static_cast(power) / 4.0f; - } + esp_wifi_set_max_tx_power(power); + if (esp_wifi_get_max_tx_power(&power) == ESP_OK) { + dBm = static_cast(power) / 4.0f; } } diff --git a/tools/pio/pre_custom_esp32.py b/tools/pio/pre_custom_esp32.py index 6c642b9b3..c43244b73 100644 --- a/tools/pio/pre_custom_esp32.py +++ b/tools/pio/pre_custom_esp32.py @@ -57,7 +57,7 @@ else: "-DUSES_P131", # NeoPixelMatrix "-DUSES_P146", # Cache Reader - "-DUSES_P123", # AS3935 Lightning Detector + "-DUSES_P169", # AS3935 Lightning Detector "-DUSES_C016", # Cache Controller "-DUSES_C018", # TTN/RN2483 From 3d62e87fab045ba7d09b87301d5fef73bcdeb2c3 Mon Sep 17 00:00:00 2001 From: TD-er Date: Mon, 10 Mar 2025 18:01:51 +0100 Subject: [PATCH 040/564] [Cleanup] Optimize parsing system variables --- src/src/Commands/Tasks.cpp | 4 -- src/src/ESPEasyCore/Controller.cpp | 6 ++- src/src/Helpers/Networking.cpp | 1 + src/src/Helpers/Scheduler_TaskDeviceTimer.cpp | 3 -- src/src/Helpers/StringConverter.cpp | 5 +- src/src/Helpers/SystemVariables.cpp | 47 ++++++++++++++++--- src/src/Helpers/SystemVariables.h | 4 +- src/src/Helpers/_CPlugin_Helper_mqtt.cpp | 22 ++++++++- src/src/Helpers/_CPlugin_Helper_mqtt.h | 2 +- 9 files changed, 71 insertions(+), 23 deletions(-) diff --git a/src/src/Commands/Tasks.cpp b/src/src/Commands/Tasks.cpp index 21782e3a5..1ac31846c 100644 --- a/src/src/Commands/Tasks.cpp +++ b/src/src/Commands/Tasks.cpp @@ -266,11 +266,9 @@ const __FlashStringHelper * Command_Task_ValueSetAndRun(struct EventStruct *even const __FlashStringHelper * returnvalue = taskValueSet(event, Line, taskIndex, success); if (success) { - START_TIMER; struct EventStruct TempEvent(taskIndex); TempEvent.Source = event->Source; SensorSendTask(&TempEvent); - STOP_TIMER(SENSOR_SEND_TASK); return return_command_success_flashstr(); } @@ -315,11 +313,9 @@ const __FlashStringHelper * Command_Task_Run(struct EventStruct *event, const ch validUIntFromString(par3, unixTime); } - START_TIMER; struct EventStruct TempEvent(taskIndex); TempEvent.Source = event->Source; SensorSendTask(&TempEvent, unixTime); - STOP_TIMER(SENSOR_SEND_TASK); return return_command_success_flashstr(); } diff --git a/src/src/ESPEasyCore/Controller.cpp b/src/src/ESPEasyCore/Controller.cpp index f8aa316e2..313053677 100644 --- a/src/src/ESPEasyCore/Controller.cpp +++ b/src/src/ESPEasyCore/Controller.cpp @@ -1006,7 +1006,9 @@ void SensorSendTask(struct EventStruct *event, unsigned long timestampUnixTime) void SensorSendTask(struct EventStruct *event, unsigned long timestampUnixTime, unsigned long lasttimer) { - if (!validTaskIndex(event->TaskIndex)) { return; } + if (!validTaskIndex(event->TaskIndex)) { + return; + } // FIXME TD-er: Should a 'disabled' task be rescheduled? // If not, then it should be rescheduled after the check to see if it is enabled. @@ -1018,6 +1020,7 @@ void SensorSendTask(struct EventStruct *event, unsigned long timestampUnixTime, if (Settings.TaskDeviceEnabled[event->TaskIndex]) { + START_TIMER; const deviceIndex_t DeviceIndex = getDeviceIndex_from_TaskIndex(event->TaskIndex); if (!validDeviceIndex(DeviceIndex)) { return; } @@ -1032,5 +1035,6 @@ void SensorSendTask(struct EventStruct *event, unsigned long timestampUnixTime, if (PluginCall(PLUGIN_READ, &TempEvent, dummy)) { sendData(&TempEvent); } + STOP_TIMER(SENSOR_SEND_TASK); } } diff --git a/src/src/Helpers/Networking.cpp b/src/src/Helpers/Networking.cpp index 32b2fac50..feaa17a57 100644 --- a/src/src/Helpers/Networking.cpp +++ b/src/src/Helpers/Networking.cpp @@ -1043,6 +1043,7 @@ bool useStaticIP() { // Check connection. Maximum timeout 500 msec. bool NetworkConnected(uint32_t timeout_ms) { + if (NetworkConnected()) return true; #ifdef USES_ESPEASY_NOW diff --git a/src/src/Helpers/Scheduler_TaskDeviceTimer.cpp b/src/src/Helpers/Scheduler_TaskDeviceTimer.cpp index dcf3747f9..6f1aa9864 100644 --- a/src/src/Helpers/Scheduler_TaskDeviceTimer.cpp +++ b/src/src/Helpers/Scheduler_TaskDeviceTimer.cpp @@ -85,9 +85,6 @@ void ESPEasy_Scheduler::process_task_device_timer(SchedulerTimerID timerID, unsi const taskIndex_t task_index = tmp->getTaskIndex(); if (!validTaskIndex(task_index)) { return; } - START_TIMER; struct EventStruct TempEvent(task_index); - SensorSendTask(&TempEvent, 0, lasttimer); - STOP_TIMER(SENSOR_SEND_TASK); } diff --git a/src/src/Helpers/StringConverter.cpp b/src/src/Helpers/StringConverter.cpp index 4afdd7362..0b8af08ec 100644 --- a/src/src/Helpers/StringConverter.cpp +++ b/src/src/Helpers/StringConverter.cpp @@ -545,10 +545,7 @@ String get_formatted_Controller_number(cpluginID_t cpluginID) { if (!validCPluginID(cpluginID)) { return F("C---"); } - String result; - result += 'C'; - result += formatIntLeadingZeroes(cpluginID, 3); - return result; + return strformat(F("C%03d"), cpluginID); } String get_formatted_Plugin_number(pluginID_t pluginID) diff --git a/src/src/Helpers/SystemVariables.cpp b/src/src/Helpers/SystemVariables.cpp index c5db8bf9a..bfb488bf6 100644 --- a/src/src/Helpers/SystemVariables.cpp +++ b/src/src/Helpers/SystemVariables.cpp @@ -230,7 +230,7 @@ String SystemVariables::getSystemVariable(SystemVariables::Enum enumval) { case SYSYEAR_0: case SYSYEAR: intvalue = node_time.year(); break; case SYSYEARS: return timeReplacement_leadZero(node_time.year() % 100); - case SYS_MONTH_0: return timeReplacement_leadZero(node_time.month()); + case SYSMONTH_0: return timeReplacement_leadZero(node_time.month()); case S_CR: return F("\\r"); case S_LF: return F("\\n"); case UNIXDAY: intvalue = node_time.getUnixTime() / 86400; break; @@ -407,7 +407,7 @@ SystemVariables::Enum SystemVariables::nextReplacementEnum(const String& str, Sy return Enum::UNKNOWN; } - nextTested = SystemVariables::startIndex_beginWith(str[percent_pos + 1]); + nextTested = SystemVariables::startIndex_beginWith(str.c_str() + percent_pos + 1); } while (Enum::UNKNOWN == nextTested); if (last_percent_pos < percent_pos) { @@ -435,7 +435,7 @@ SystemVariables::Enum SystemVariables::nextReplacementEnum(const String& str, Sy return Enum::UNKNOWN; } last_percent_pos = percent_pos; - return SystemVariables::startIndex_beginWith(str[percent_pos + 1]); + return SystemVariables::startIndex_beginWith(str.c_str() + percent_pos + 1); } const __FlashStringHelper *fstr_sysvar = SystemVariables::toFlashString(nextTested); @@ -474,9 +474,44 @@ String SystemVariables::toString(Enum enumval) return wrap_String(SystemVariables::toFlashString(enumval), '%'); } -SystemVariables::Enum SystemVariables::startIndex_beginWith(char beginchar) +SystemVariables::Enum SystemVariables::startIndex_beginWith(const char* beginchar) { - switch (tolower(beginchar)) + if (beginchar == nullptr || *beginchar == '\0') + { + return Enum::UNKNOWN; + } + + const char ch = tolower(*beginchar); + if (ch == 's') { + // Lots of system variables start with "%sys" + const char sys_str[] = {'s', 'y', 's'}; + bool found = true; + const char* cur = beginchar; + for (size_t i = 0; found && i < NR_ELEMENTS(sys_str); ++i, ++cur) { + if (tolower(*cur) != sys_str[i]) { + found = false; + } + } + if (found) { + const char next_ch = tolower(*cur); + if (next_ch != '\0') { + switch (next_ch) { + case 'b': return Enum::SYSBUILD_DATE; + case 'd': return Enum::SYSDAY; + case 'h': return Enum::SYSHEAP; + case 'l': return Enum::SYSLOAD; + case 'm': return Enum::SYSMIN; + case 'n': return Enum::SYSNAME; + case 's': return Enum::SYSSEC; + case 't': return Enum::SYSTIME; + case 'w': return Enum::SYSWEEKDAY; + case 'y': return Enum::SYSYEAR; + } + } + } + } + + switch (ch) { case 'b': return Enum::BOARD_NAME; case 'c': return Enum::CLIENTIP; @@ -584,6 +619,7 @@ const __FlashStringHelper * SystemVariables::toFlashString(SystemVariables::Enum case Enum::SYSMIN_0: return F("sysmin_0"); case Enum::SYSMONTH: return F("sysmonth"); case Enum::SYSMONTH_S: return F("sysmonth_s"); + case Enum::SYSMONTH_0: return F("sysmonth_0"); case Enum::SYSNAME: return F("sysname"); case Enum::SYSSEC: return F("syssec"); case Enum::SYSSEC_0: return F("syssec_0"); @@ -605,7 +641,6 @@ const __FlashStringHelper * SystemVariables::toFlashString(SystemVariables::Enum case Enum::SYSYEAR: return F("sysyear"); case Enum::SYSYEARS: return F("sysyears"); case Enum::SYSYEAR_0: return F("sysyear_0"); - case Enum::SYS_MONTH_0: return F("sysmonth_0"); case Enum::UNIT_sysvar: return F("unit"); #if FEATURE_ZEROFILLED_UNITNUMBER case Enum::UNIT_0_sysvar: return F("unit_0"); diff --git a/src/src/Helpers/SystemVariables.h b/src/src/Helpers/SystemVariables.h index d061f7a88..c2cc302a1 100644 --- a/src/src/Helpers/SystemVariables.h +++ b/src/src/Helpers/SystemVariables.h @@ -84,6 +84,7 @@ public: SYSMIN_0, SYSMONTH, SYSMONTH_S, + SYSMONTH_0, SYSNAME, SYSSEC, SYSSEC_0, @@ -105,7 +106,6 @@ public: SYSYEAR, SYSYEARS, SYSYEAR_0, - SYS_MONTH_0, UNIT_sysvar, #if FEATURE_ZEROFILLED_UNITNUMBER UNIT_0_sysvar, @@ -132,7 +132,7 @@ public: static String toString(SystemVariables::Enum enumval); - static SystemVariables::Enum startIndex_beginWith(char beginchar); + static SystemVariables::Enum startIndex_beginWith(const char* beginchar); static const __FlashStringHelper* toFlashString(SystemVariables::Enum enumval); static String getSystemVariable(SystemVariables::Enum enumval); diff --git a/src/src/Helpers/_CPlugin_Helper_mqtt.cpp b/src/src/Helpers/_CPlugin_Helper_mqtt.cpp index 318523672..f48a5f402 100644 --- a/src/src/Helpers/_CPlugin_Helper_mqtt.cpp +++ b/src/src/Helpers/_CPlugin_Helper_mqtt.cpp @@ -4,6 +4,9 @@ #if FEATURE_MQTT # include "../Commands/ExecuteCommand.h" +#include "../Helpers/SystemVariables.h" + + /*************************************************************************************** * Parse MQTT topic for /cmd and /set ending to handle commands or TaskValueSet * Special C014 case: handleCmd = false and handleSet is true, so *only* pluginID 33 & 86 are accepted @@ -186,11 +189,22 @@ void MQTT_execute_command(String& cmd, } bool MQTT_protocol_send(EventStruct *event, - String pubname, + String pubname, bool retainFlag) { bool success = false; + + // Check for %valname% const bool contains_valname = pubname.indexOf(F("%valname%")) != -1; + // Small speed-up as there are lots of system variables starting with "%sys" and this is used in quite a lot of MQTT topics. + if (pubname.indexOf(F("%sysname%")) != -1) { + pubname.replace(F("%sysname%"), SystemVariables::getSystemVariable(SystemVariables::SYSNAME)); + } + // %tskname% will not change per taskvalue, so replace now + if (pubname.indexOf(F("%tskname%")) != -1) { + pubname.replace(F("%tskname%"), getTaskDeviceName(event->TaskIndex)); + } + const uint8_t valueCount = getValueCountForTask(event->TaskIndex); for (uint8_t x = 0; x < valueCount; ++x) { @@ -214,7 +228,11 @@ bool MQTT_protocol_send(EventStruct *event, # ifndef BUILD_NO_DEBUG if (loglevelActiveFor(LOG_LEVEL_DEBUG)) { - addLog(LOG_LEVEL_DEBUG, strformat(F("MQTT C%03d : %s %s"), event->ControllerIndex, tmppubname.c_str(), value.c_str())); + addLog(LOG_LEVEL_DEBUG, strformat( + F("MQTT %s : %s %s"), + get_formatted_Controller_number(getCPluginID_from_ControllerIndex(event->ControllerIndex)).c_str(), + tmppubname.c_str(), + value.c_str())); } # endif // ifndef BUILD_NO_DEBUG diff --git a/src/src/Helpers/_CPlugin_Helper_mqtt.h b/src/src/Helpers/_CPlugin_Helper_mqtt.h index f4f056385..51222a2b6 100644 --- a/src/src/Helpers/_CPlugin_Helper_mqtt.h +++ b/src/src/Helpers/_CPlugin_Helper_mqtt.h @@ -11,7 +11,7 @@ bool MQTT_handle_topic_commands(struct EventStruct *event, void MQTT_execute_command(String& command, bool tryRemoteConfig = false); bool MQTT_protocol_send(EventStruct *event, - String pubname, + String pubname, bool retainFlag); #endif // if FEATURE_MQTT From c969cd00121adcb3b33a8aef9d83e7b37a0fdd02 Mon Sep 17 00:00:00 2001 From: TD-er Date: Mon, 10 Mar 2025 21:26:53 +0100 Subject: [PATCH 041/564] [Rules] Fix broken math parsing As reported on the [forum](https://www.letscontrolit.com/forum/viewtopic.php?p=73218#p73218) --- src/src/Helpers/Rules_calculate.cpp | 2 +- src/src/Helpers/SystemVariables.cpp | 9 ++++----- 2 files changed, 5 insertions(+), 6 deletions(-) diff --git a/src/src/Helpers/Rules_calculate.cpp b/src/src/Helpers/Rules_calculate.cpp index 9d48102f0..dfa39a4c3 100644 --- a/src/src/Helpers/Rules_calculate.cpp +++ b/src/src/Helpers/Rules_calculate.cpp @@ -572,7 +572,7 @@ CalculateReturnCode RulesCalculate_t::doCalculate(const char *input, ESPEASY_RUL } } } - // else + else { *TokenPos = sc; ++TokenPos; diff --git a/src/src/Helpers/SystemVariables.cpp b/src/src/Helpers/SystemVariables.cpp index bfb488bf6..b832281ae 100644 --- a/src/src/Helpers/SystemVariables.cpp +++ b/src/src/Helpers/SystemVariables.cpp @@ -53,11 +53,10 @@ String getReplacementString(const String& format, const String& s) { #ifndef BUILD_NO_DEBUG if (loglevelActiveFor(LOG_LEVEL_DEBUG)) { - String log = F("ReplacementString SunTime: "); - log += R; - log += F(" offset: "); - log += ESPEasy_time::getSecOffset(R); - addLogMove(LOG_LEVEL_DEBUG, log); + addLogMove(LOG_LEVEL_DEBUG, strformat( + F("ReplacementString SunTime: %s offset: %d"), + R.c_str(), + ESPEasy_time::getSecOffset(R))); } #endif // ifndef BUILD_NO_DEBUG return R; From 99ec939cefe975f75bb83adffc091be42131e20d Mon Sep 17 00:00:00 2001 From: TD-er Date: Tue, 11 Mar 2025 22:20:33 +0100 Subject: [PATCH 042/564] [WiFi] Fix (re-)connecting after WiFi connection lost --- src/src/ESPEasyCore/ESPEasyNetwork_ESP32.cpp | 38 +++++++++++++++---- .../ESPEasyCore/ESPEasyWiFi_state_machine.cpp | 17 ++++++++- .../ESPEasyWiFi_state_machine_ESP32.cpp | 2 +- .../ESPEasyWifi_abstracted_ESP32.cpp | 3 ++ src/src/Helpers/WiFi_AP_CandidatesList.cpp | 14 +++---- 5 files changed, 55 insertions(+), 19 deletions(-) diff --git a/src/src/ESPEasyCore/ESPEasyNetwork_ESP32.cpp b/src/src/ESPEasyCore/ESPEasyNetwork_ESP32.cpp index becbf000c..168c9eab7 100644 --- a/src/src/ESPEasyCore/ESPEasyNetwork_ESP32.cpp +++ b/src/src/ESPEasyCore/ESPEasyNetwork_ESP32.cpp @@ -91,8 +91,30 @@ void NetworkConnectRelaxed() { WiFiConnectRelaxed(); } -bool NetworkConnected() { + +// Forward declaration to access internal function in NetworkInterface.cpp +// as we don't have a public function in NetworkInterface to access the +// Network_Interface_ID +NetworkInterface *getNetifByID(Network_Interface_ID id); + +NetworkInterface * getDefaultNonAP_interface() +{ auto network_if = Network.getDefaultInterface(); + if (network_if != nullptr) { + auto ap_if = getNetifByID(ESP_NETIF_ID_AP); + if (ap_if != nullptr) { + if (network_if->netif() == ap_if->netif()) { + // This is the AP interface, which we do not want + return nullptr; + } + } + } + return network_if; +} + + +bool NetworkConnected() { + auto network_if = getDefaultNonAP_interface(); if (network_if == nullptr) { return false; @@ -101,7 +123,7 @@ bool NetworkConnected() { } IPAddress NetworkLocalIP() { - auto network_if = Network.getDefaultInterface(); + auto network_if = getDefaultNonAP_interface(); if (network_if == nullptr) { return IPAddress(); @@ -110,7 +132,7 @@ IPAddress NetworkLocalIP() { } IPAddress NetworkSubnetMask() { - auto network_if = Network.getDefaultInterface(); + auto network_if = getDefaultNonAP_interface(); if (network_if == nullptr) { return IPAddress(); @@ -119,7 +141,7 @@ IPAddress NetworkSubnetMask() { } IPAddress NetworkGatewayIP() { - auto network_if = Network.getDefaultInterface(); + auto network_if = getDefaultNonAP_interface(); if (network_if == nullptr) { return IPAddress(); @@ -128,7 +150,7 @@ IPAddress NetworkGatewayIP() { } IPAddress NetworkDnsIP(uint8_t dns_no) { - auto network_if = Network.getDefaultInterface(); + auto network_if = getDefaultNonAP_interface(); if (network_if == nullptr) { return IPAddress(); @@ -139,7 +161,7 @@ IPAddress NetworkDnsIP(uint8_t dns_no) { #if FEATURE_USE_IPV6 IPAddress NetworkLocalIP6() { - auto network_if = Network.getDefaultInterface(); + auto network_if = getDefaultNonAP_interface(); if (network_if == nullptr) { return IN6ADDR_ANY; @@ -148,7 +170,7 @@ IPAddress NetworkLocalIP6() { } IPAddress NetworkGlobalIP6() { - auto network_if = Network.getDefaultInterface(); + auto network_if = getDefaultNonAP_interface(); if (network_if == nullptr) { return IN6ADDR_ANY; @@ -158,7 +180,7 @@ IPAddress NetworkGlobalIP6() { IP6Addresses_t NetworkAllIPv6() { IP6Addresses_t addresses; - auto network_if = Network.getDefaultInterface(); + auto network_if = getDefaultNonAP_interface(); if (network_if != nullptr) { esp_ip6_addr_t esp_ip6_addr[LWIP_IPV6_NUM_ADDRESSES]{}; diff --git a/src/src/ESPEasyCore/ESPEasyWiFi_state_machine.cpp b/src/src/ESPEasyCore/ESPEasyWiFi_state_machine.cpp index cb1ea480d..f0a96c286 100644 --- a/src/src/ESPEasyCore/ESPEasyWiFi_state_machine.cpp +++ b/src/src/ESPEasyCore/ESPEasyWiFi_state_machine.cpp @@ -88,7 +88,11 @@ void ESPEasyWiFi_t::loop() // Do we have candidate to connect to ? if (WiFi_AP_Candidates.hasCandidates()) { setState(WiFiState_e::STA_Connecting, WIFI_STATE_MACHINE_STA_CONNECTING_TIMEOUT); - } else if (WiFi_AP_Candidates.scanComplete() == 0) { + } else if (WiFi_AP_Candidates.scanComplete() == 0 +#if ESP_IDF_VERSION >= ESP_IDF_VERSION_VAL(5, 1, 2) + || WiFi.status() == WL_STOPPED +#endif + ) { if (WifiIsAP(WiFi.getMode())) { // TODO TD-er: Must check if any client is connected. // If not, then we can disable AP mode and switch to WiFiState_e::STA_Scanning @@ -128,7 +132,7 @@ void ESPEasyWiFi_t::loop() } else if (scanCompleteStatus == -2) { // WIFI_SCAN_FAILED addLog(LOG_LEVEL_ERROR, F("WiFi : Scan failed")); WiFi.scanDelete(); - setState(WiFiState_e::WiFiOFF, 100); + setState(WiFiState_e::WiFiOFF, 1000); WiFiEventData.processedScanDone = true; } @@ -211,6 +215,11 @@ void ESPEasyWiFi_t::setState(WiFiState_e newState, uint32_t timeout) { setAPinternal(false); setAP(false); } + if (_state == WiFiState_e::STA_AP_Scanning || + _state == WiFiState_e::STA_Scanning) + { + WiFi.scanDelete(); + } if (timeout == 0) { @@ -257,6 +266,10 @@ void ESPEasyWiFi_t::setState(WiFiState_e newState, uint32_t timeout) { } break; case WiFiState_e::STA_Connected: + #ifdef ESP32 + // FIXME TD-er: Must move to ESP32-specific cpp file + WiFi.STA.setDefault(); + #endif _last_seen_connected.setNow(); _state_timeout.clear(); break; diff --git a/src/src/ESPEasyCore/ESPEasyWiFi_state_machine_ESP32.cpp b/src/src/ESPEasyCore/ESPEasyWiFi_state_machine_ESP32.cpp index 1e2066d3a..4bb82251f 100644 --- a/src/src/ESPEasyCore/ESPEasyWiFi_state_machine_ESP32.cpp +++ b/src/src/ESPEasyCore/ESPEasyWiFi_state_machine_ESP32.cpp @@ -45,7 +45,7 @@ STA_connected_state ESPEasyWiFi_t::getSTA_connected_state() const switch (WiFi.status()) { case WL_CONNECTED: - return STA_connected_state::Connected; + break; // return STA_connected_state::Connected; case WL_NO_SSID_AVAIL: return STA_connected_state::Error_Not_Found; diff --git a/src/src/ESPEasyCore/ESPEasyWifi_abstracted_ESP32.cpp b/src/src/ESPEasyCore/ESPEasyWifi_abstracted_ESP32.cpp index 03b48ac1f..b67da31ca 100644 --- a/src/src/ESPEasyCore/ESPEasyWifi_abstracted_ESP32.cpp +++ b/src/src/ESPEasyCore/ESPEasyWifi_abstracted_ESP32.cpp @@ -141,6 +141,9 @@ bool setWifiMode(WiFiMode_t new_mode) // esp_wifi_set_ps(WIFI_PS_MAX_MODEM); delay(1); + #ifdef ESP32 + WiFi.STA.end(); + #endif } else { /* if (cur_mode == WIFI_OFF) { diff --git a/src/src/Helpers/WiFi_AP_CandidatesList.cpp b/src/src/Helpers/WiFi_AP_CandidatesList.cpp index 5c3dbe156..48f8daeb7 100644 --- a/src/src/Helpers/WiFi_AP_CandidatesList.cpp +++ b/src/src/Helpers/WiFi_AP_CandidatesList.cpp @@ -251,6 +251,11 @@ void WiFi_AP_CandidatesList::markCurrentConnectionStable() { } int8_t WiFi_AP_CandidatesList::scanComplete() const { + const int8_t scanCompleteStatus = WiFi.scanComplete(); + if (scanCompleteStatus <= 0) { + return scanCompleteStatus; + } + size_t found = 0; for (auto scan = scanned.begin(); scan != scanned.end(); ++scan) { if (!scan->expired()) { @@ -262,14 +267,7 @@ int8_t WiFi_AP_CandidatesList::scanComplete() const { ++found; } } - if (found > 0) { - return found; - } - const int8_t scanCompleteStatus = WiFi.scanComplete(); - if (scanCompleteStatus <= 0) { - return scanCompleteStatus; - } - return 0; + return found; } bool WiFi_AP_CandidatesList::SettingsIndexMatchCustomCredentials(uint8_t index) From 3d2b15ff8d46a24f8a89375f62c04bdc4549458b Mon Sep 17 00:00:00 2001 From: TD-er Date: Tue, 11 Mar 2025 22:59:02 +0100 Subject: [PATCH 043/564] [WiFi] Fix build error on ESP8266 --- src/src/ESPEasyCore/ESPEasyWiFi_state_machine.cpp | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/src/src/ESPEasyCore/ESPEasyWiFi_state_machine.cpp b/src/src/ESPEasyCore/ESPEasyWiFi_state_machine.cpp index f0a96c286..984591422 100644 --- a/src/src/ESPEasyCore/ESPEasyWiFi_state_machine.cpp +++ b/src/src/ESPEasyCore/ESPEasyWiFi_state_machine.cpp @@ -89,10 +89,12 @@ void ESPEasyWiFi_t::loop() if (WiFi_AP_Candidates.hasCandidates()) { setState(WiFiState_e::STA_Connecting, WIFI_STATE_MACHINE_STA_CONNECTING_TIMEOUT); } else if (WiFi_AP_Candidates.scanComplete() == 0 -#if ESP_IDF_VERSION >= ESP_IDF_VERSION_VAL(5, 1, 2) - || WiFi.status() == WL_STOPPED -#endif - ) { +# ifdef ESP32 +# if ESP_IDF_VERSION >= ESP_IDF_VERSION_VAL(5, 1, 2) + || WiFi.status() == WL_STOPPED +# endif +# endif // ifdef ESP32 + ) { if (WifiIsAP(WiFi.getMode())) { // TODO TD-er: Must check if any client is connected. // If not, then we can disable AP mode and switch to WiFiState_e::STA_Scanning From 48d3b7d02da54e9b1ecf010e90a06cb88cca9629 Mon Sep 17 00:00:00 2001 From: TD-er Date: Tue, 11 Mar 2025 23:01:27 +0100 Subject: [PATCH 044/564] [Cleanup] Uncrustify WiFi/Network code --- src/src/DataStructs/WiFi_AP_Candidate.cpp | 96 ++++++++++--------- src/src/DataStructs/WiFi_AP_Candidate.h | 15 +-- src/src/DataTypes/WiFiConnectionProtocol.cpp | 17 ++-- src/src/DataTypes/WiFi_State.h | 2 +- src/src/ESPEasyCore/ESPEasyNetwork.h | 63 ++++++------ src/src/ESPEasyCore/ESPEasyNetwork_ESP32.cpp | 14 +-- .../ESPEasyCore/ESPEasyNetwork_ESP8266.cpp | 6 +- .../ESPEasyCore/ESPEasyWiFiEvent_ESP32.cpp | 8 +- .../ESPEasyCore/ESPEasyWiFi_state_machine.cpp | 10 +- .../ESPEasyWiFi_state_machine_ESP32.cpp | 1 - .../ESPEasyWiFi_state_machine_ESP8266.cpp | 6 +- .../ESPEasyCore/ESPEasyWifi_ProcessEvent.cpp | 82 ++++++++-------- .../ESPEasyCore/ESPEasyWifi_abstracted.cpp | 2 +- src/src/ESPEasyCore/ESPEasyWifi_abstracted.h | 8 +- .../ESPEasyWifi_abstracted_ESP32.cpp | 35 +++---- .../ESPEasyWifi_abstracted_ESP8266.cpp | 22 ++--- 16 files changed, 206 insertions(+), 181 deletions(-) diff --git a/src/src/DataStructs/WiFi_AP_Candidate.cpp b/src/src/DataStructs/WiFi_AP_Candidate.cpp index a286b8cea..bab5c2fa0 100644 --- a/src/src/DataStructs/WiFi_AP_Candidate.cpp +++ b/src/src/DataStructs/WiFi_AP_Candidate.cpp @@ -16,53 +16,53 @@ # include #endif // if defined(ESP32) -#define WIFI_AP_CANDIDATE_MAX_AGE 300000 // 5 minutes in msec +#define WIFI_AP_CANDIDATE_MAX_AGE 300000 // 5 minutes in msec WiFi_AP_Candidate::WiFi_AP_Candidate() : #ifdef ESP32 # if ESP_IDF_VERSION_MAJOR >= 5 -country({ - .cc = "01", - .schan = 1, - .nchan = 14, - .policy = WIFI_COUNTRY_POLICY_AUTO, + country({ + .cc = "01", + .schan = 1, + .nchan = 14, + .policy = WIFI_COUNTRY_POLICY_AUTO, }), -#endif -#endif +# endif // if ESP_IDF_VERSION_MAJOR >= 5 +#endif // ifdef ESP32 last_seen(0), rssi(0), channel(0), index(0), enc_type(0) { _allBits = 0u; } WiFi_AP_Candidate::WiFi_AP_Candidate(const WiFi_AP_Candidate& other) -: ssid(other.ssid), - last_seen(other.last_seen), + : ssid(other.ssid), + last_seen(other.last_seen), bssid(other.bssid), - rssi(other.rssi), - channel(other.channel), - index(other.index), + rssi(other.rssi), + channel(other.channel), + index(other.index), enc_type(other.enc_type) { _allBits = other._allBits; #ifdef ESP32 # if ESP_IDF_VERSION_MAJOR >= 5 memcpy(&this->country, &other.country, sizeof(wifi_country_t)); - #endif - #endif + # endif + #endif // ifdef ESP32 } WiFi_AP_Candidate::WiFi_AP_Candidate(uint8_t index_c, const String& ssid_c) : #ifdef ESP32 # if ESP_IDF_VERSION_MAJOR >= 5 -country({ - .cc = "01", - .schan = 1, - .nchan = 14, - .policy = WIFI_COUNTRY_POLICY_AUTO, + country({ + .cc = "01", + .schan = 1, + .nchan = 14, + .policy = WIFI_COUNTRY_POLICY_AUTO, }), -#endif -#endif +# endif // if ESP_IDF_VERSION_MAJOR >= 5 +#endif // ifdef ESP32 last_seen(0), rssi(0), channel(0), index(index_c), enc_type(0) { _allBits = 0u; @@ -121,7 +121,7 @@ WiFi_AP_Candidate::WiFi_AP_Candidate(uint8_t networkItem) : index(0) { // FIXME TD-er: Maybe also add other info like 2nd channel, ftm and phy_lr support? # if ESP_IDF_VERSION_MAJOR >= 5 memcpy(&country, &(it->country), sizeof(wifi_country_t)); -#endif +# endif } #endif // ifdef ESP32 last_seen = millis(); @@ -135,15 +135,21 @@ WiFi_AP_Candidate::WiFi_AP_Candidate(const bss_info& ap) : phy_11b(ap.phy_11b), phy_11g(ap.phy_11g), phy_11n(ap.phy_11n), wps(ap.wps) { - _allBits = 0u; + _allBits = 0u; last_seen = millis(); - switch (ap.authmode) { - case AUTH_OPEN: enc_type = ENC_TYPE_NONE; break; - case AUTH_WEP: enc_type = ENC_TYPE_WEP; break; - case AUTH_WPA_PSK: enc_type = ENC_TYPE_TKIP; break; - case AUTH_WPA2_PSK: enc_type = ENC_TYPE_CCMP; break; - case AUTH_WPA_WPA2_PSK: enc_type = ENC_TYPE_AUTO; break; + switch (ap.authmode) + { + case AUTH_OPEN: enc_type = ENC_TYPE_NONE; + break; + case AUTH_WEP: enc_type = ENC_TYPE_WEP; + break; + case AUTH_WPA_PSK: enc_type = ENC_TYPE_TKIP; + break; + case AUTH_WPA2_PSK: enc_type = ENC_TYPE_CCMP; + break; + case AUTH_WPA_WPA2_PSK: enc_type = ENC_TYPE_AUTO; + break; case AUTH_MAX: break; } @@ -185,19 +191,19 @@ bool WiFi_AP_Candidate::operator<(const WiFi_AP_Candidate& other) const { WiFi_AP_Candidate& WiFi_AP_Candidate::operator=(const WiFi_AP_Candidate& other) { - ssid = other.ssid; + ssid = other.ssid; last_seen = other.last_seen; - bssid = other.bssid; - rssi = other.rssi; - channel = other.channel; - index = other.index; - enc_type = other.enc_type; - _allBits = other._allBits; + bssid = other.bssid; + rssi = other.rssi; + channel = other.channel; + index = other.index; + enc_type = other.enc_type; + _allBits = other._allBits; #ifdef ESP32 # if ESP_IDF_VERSION_MAJOR >= 5 memcpy(&this->country, &other.country, sizeof(wifi_country_t)); - #endif - #endif + # endif + #endif // ifdef ESP32 return *this; } @@ -256,10 +262,13 @@ String WiFi_AP_Candidate::toString(const String& separator) const { #ifdef ESP32 # if ESP_IDF_VERSION_MAJOR >= 5 + // Country code string - if (country.cc[0] != '\0' && country.cc[1] != '\0') { + if ((country.cc[0] != '\0') && (country.cc[1] != '\0')) { result += strformat(F(" '%c%c'"), country.cc[0], country.cc[1]); - switch (country.cc[2]) { + + switch (country.cc[2]) + { case 'O': // Outdoor case 'I': // Indoor case 'X': // "non-country" @@ -267,11 +276,12 @@ String WiFi_AP_Candidate::toString(const String& separator) const { break; } } + if (country.nchan > 0) { result += strformat(F(" ch: %d..%d"), country.schan, country.schan + country.nchan - 1); } -#endif -#endif +# endif // if ESP_IDF_VERSION_MAJOR >= 5 +#endif // ifdef ESP32 if (phy_known()) { String phy_str; diff --git a/src/src/DataStructs/WiFi_AP_Candidate.h b/src/src/DataStructs/WiFi_AP_Candidate.h index 970afe8f6..8dda8a5ab 100644 --- a/src/src/DataStructs/WiFi_AP_Candidate.h +++ b/src/src/DataStructs/WiFi_AP_Candidate.h @@ -68,22 +68,22 @@ struct WiFi_AP_Candidate { return bits.phy_11b || bits.phy_11g || bits.phy_11n; } - String ssid; + String ssid; // String key; #ifdef ESP32 # if ESP_IDF_VERSION_MAJOR >= 5 wifi_country_t country; - #endif - #endif + # endif + #endif // ifdef ESP32 unsigned long last_seen = 0u; MAC_address bssid; int8_t rssi{}; uint8_t channel{}; - uint8_t index{}; // Index of the matching credentials - uint8_t enc_type{}; // Encryption used (e.g. WPA2) + uint8_t index{}; // Index of the matching credentials + uint8_t enc_type{}; // Encryption used (e.g. WPA2) union { struct { uint16_t isHidden : 1; // Hidden SSID @@ -99,9 +99,12 @@ struct WiFi_AP_Candidate { uint16_t ftm_initiator : 1; uint16_t unused : 5; - } bits; + + } bits; uint16_t _allBits; + }; + }; #endif // ifndef DATASTRUCTS_WIFI_AP_CANDIDATES_H diff --git a/src/src/DataTypes/WiFiConnectionProtocol.cpp b/src/src/DataTypes/WiFiConnectionProtocol.cpp index c5a72595f..909973dd1 100644 --- a/src/src/DataTypes/WiFiConnectionProtocol.cpp +++ b/src/src/DataTypes/WiFiConnectionProtocol.cpp @@ -1,7 +1,8 @@ #include "../DataTypes/WiFiConnectionProtocol.h" -const __FlashStringHelper * toString(WiFiConnectionProtocol proto) { - switch (proto) { +const __FlashStringHelper* toString(WiFiConnectionProtocol proto) { + switch (proto) + { case WiFiConnectionProtocol::WiFi_Protocol_11b: return F("802.11b"); case WiFiConnectionProtocol::WiFi_Protocol_11g: @@ -9,7 +10,7 @@ const __FlashStringHelper * toString(WiFiConnectionProtocol proto) { #ifdef ESP8266 case WiFiConnectionProtocol::WiFi_Protocol_11n: return F("802.11n"); -#endif +#endif // ifdef ESP8266 #ifdef ESP32 case WiFiConnectionProtocol::WiFi_Protocol_HT20: return F("802.11n (HT20)"); @@ -17,18 +18,18 @@ const __FlashStringHelper * toString(WiFiConnectionProtocol proto) { return F("802.11n (HT40)"); case WiFiConnectionProtocol::WiFi_Protocol_HE20: return F("802.11ax (HE20)"); -#if ESP_IDF_VERSION > ESP_IDF_VERSION_VAL(5, 2, 0) +# if ESP_IDF_VERSION > ESP_IDF_VERSION_VAL(5, 2, 0) case WiFiConnectionProtocol::WiFi_Protocol_11a: return F("802.11a"); case WiFiConnectionProtocol::WiFi_Protocol_VHT20: return F("802.11ac (VHT20)"); -#endif +# endif // if ESP_IDF_VERSION > ESP_IDF_VERSION_VAL(5, 2, 0) case WiFiConnectionProtocol::WiFi_Protocol_LR: return F("802.11lr"); -#endif +#endif // ifdef ESP32 case WiFiConnectionProtocol::Unknown: - break;; + break; } return F("-"); -} \ No newline at end of file +} diff --git a/src/src/DataTypes/WiFi_State.h b/src/src/DataTypes/WiFi_State.h index 794ecdc17..dade05ef6 100644 --- a/src/src/DataTypes/WiFi_State.h +++ b/src/src/DataTypes/WiFi_State.h @@ -85,7 +85,7 @@ enum class WiFiState_e }; -const __FlashStringHelper * toString(WiFiState_e state); +const __FlashStringHelper* toString(WiFiState_e state); } // namespace wifi diff --git a/src/src/ESPEasyCore/ESPEasyNetwork.h b/src/src/ESPEasyCore/ESPEasyNetwork.h index 436fab792..9b1cea915 100644 --- a/src/src/ESPEasyCore/ESPEasyNetwork.h +++ b/src/src/ESPEasyCore/ESPEasyNetwork.h @@ -8,50 +8,53 @@ #include #if FEATURE_USE_IPV6 -#include -//typedef uint8_t ip6_addr_type_t; -//typedef std::vector> IP6Addresses_t; +# include + +// typedef uint8_t ip6_addr_type_t; +// typedef std::vector> IP6Addresses_t; typedef std::vector IP6Addresses_t; -#endif +#endif // if FEATURE_USE_IPV6 -void setNetworkMedium(NetworkMedium_t medium); +void setNetworkMedium(NetworkMedium_t medium); -void NetworkConnectRelaxed(); -bool NetworkConnected(); -IPAddress NetworkLocalIP(); -IPAddress NetworkSubnetMask(); -IPAddress NetworkGatewayIP(); -IPAddress NetworkDnsIP (uint8_t dns_no); +void NetworkConnectRelaxed(); +bool NetworkConnected(); +IPAddress NetworkLocalIP(); +IPAddress NetworkSubnetMask(); +IPAddress NetworkGatewayIP(); +IPAddress NetworkDnsIP(uint8_t dns_no); #if FEATURE_USE_IPV6 -IPAddress NetworkLocalIP6(); -IPAddress NetworkGlobalIP6(); +IPAddress NetworkLocalIP6(); +IPAddress NetworkGlobalIP6(); IP6Addresses_t NetworkAllIPv6(); -bool IPv6_link_local_from_MAC(const MAC_address& mac, IPAddress &ipv6); -bool is_IPv6_link_local_from_MAC(const MAC_address& mac); +bool IPv6_link_local_from_MAC(const MAC_address& mac, + IPAddress & ipv6); +bool is_IPv6_link_local_from_MAC(const MAC_address& mac); // Assume we're in the same subnet, thus use our own IPv6 global address -bool IPv6_global_from_MAC(const MAC_address& mac, IPAddress &ipv6); -bool is_IPv6_global_from_MAC(const MAC_address& mac); +bool IPv6_global_from_MAC(const MAC_address& mac, + IPAddress & ipv6); +bool is_IPv6_global_from_MAC(const MAC_address& mac); -#endif -MAC_address NetworkMacAddress(); -String NetworkGetHostNameFromSettings(bool force_add_unitnr = false); -String NetworkGetHostname(); -String NetworkCreateRFCCompliantHostname(bool force_add_unitnr = false); +#endif // if FEATURE_USE_IPV6 +MAC_address NetworkMacAddress(); +String NetworkGetHostNameFromSettings(bool force_add_unitnr = false); +String NetworkGetHostname(); +String NetworkCreateRFCCompliantHostname(bool force_add_unitnr = false); #if FEATURE_WIFI -MAC_address WifiSoftAPmacAddress(); -MAC_address WifiSTAmacAddress(); -#endif +MAC_address WifiSoftAPmacAddress(); +MAC_address WifiSTAmacAddress(); +#endif // if FEATURE_WIFI -void CheckRunningServices(); +void CheckRunningServices(); #if FEATURE_ETHERNET -bool EthFullDuplex(); -bool EthLinkUp(); -uint8_t EthLinkSpeed(); +bool EthFullDuplex(); +bool EthLinkUp(); +uint8_t EthLinkSpeed(); #endif // if FEATURE_ETHERNET -#endif \ No newline at end of file +#endif // ifndef ESPEASY_NETWORK_H diff --git a/src/src/ESPEasyCore/ESPEasyNetwork_ESP32.cpp b/src/src/ESPEasyCore/ESPEasyNetwork_ESP32.cpp index 168c9eab7..38186bdb9 100644 --- a/src/src/ESPEasyCore/ESPEasyNetwork_ESP32.cpp +++ b/src/src/ESPEasyCore/ESPEasyNetwork_ESP32.cpp @@ -91,17 +91,18 @@ void NetworkConnectRelaxed() { WiFiConnectRelaxed(); } - // Forward declaration to access internal function in NetworkInterface.cpp -// as we don't have a public function in NetworkInterface to access the +// as we don't have a public function in NetworkInterface to access the // Network_Interface_ID -NetworkInterface *getNetifByID(Network_Interface_ID id); +NetworkInterface* getNetifByID(Network_Interface_ID id); -NetworkInterface * getDefaultNonAP_interface() +NetworkInterface* getDefaultNonAP_interface() { auto network_if = Network.getDefaultInterface(); + if (network_if != nullptr) { auto ap_if = getNetifByID(ESP_NETIF_ID_AP); + if (ap_if != nullptr) { if (network_if->netif() == ap_if->netif()) { // This is the AP interface, which we do not want @@ -112,7 +113,6 @@ NetworkInterface * getDefaultNonAP_interface() return network_if; } - bool NetworkConnected() { auto network_if = getDefaultNonAP_interface(); @@ -273,6 +273,7 @@ String NetworkGetHostname() { } #if FEATURE_WIFI + MAC_address WifiSoftAPmacAddress() { MAC_address mac; @@ -286,7 +287,8 @@ MAC_address WifiSTAmacAddress() { WiFi.macAddress(mac.mac); return mac; } -#endif + +#endif // if FEATURE_WIFI #if FEATURE_ETHERNET diff --git a/src/src/ESPEasyCore/ESPEasyNetwork_ESP8266.cpp b/src/src/ESPEasyCore/ESPEasyNetwork_ESP8266.cpp index f31ea0c89..d6d89e306 100644 --- a/src/src/ESPEasyCore/ESPEasyNetwork_ESP8266.cpp +++ b/src/src/ESPEasyCore/ESPEasyNetwork_ESP8266.cpp @@ -66,9 +66,10 @@ MAC_address NetworkMacAddress() { return mac; } -String NetworkGetHostname() { return String(WiFi.hostname()); } +String NetworkGetHostname() { return String(WiFi.hostname()); } #if FEATURE_WIFI + MAC_address WifiSoftAPmacAddress() { MAC_address mac; @@ -82,6 +83,7 @@ MAC_address WifiSTAmacAddress() { WiFi.macAddress(mac.mac); return mac; } -#endif + +#endif // if FEATURE_WIFI #endif // ifdef ESP8266 diff --git a/src/src/ESPEasyCore/ESPEasyWiFiEvent_ESP32.cpp b/src/src/ESPEasyCore/ESPEasyWiFiEvent_ESP32.cpp index c3720b8bc..52535cfef 100644 --- a/src/src/ESPEasyCore/ESPEasyWiFiEvent_ESP32.cpp +++ b/src/src/ESPEasyCore/ESPEasyWiFiEvent_ESP32.cpp @@ -131,10 +131,10 @@ void WiFiEvent(WiFiEvent_t event_id, arduino_event_info_t info) { { // FIXME TD-er: Must also check event->esp_netif to see which interface got this event. ignoreDisconnectEvent = false; - ip_event_got_ip_t *event = static_cast(&info.got_ip); - const IPAddress ip(event->ip_info.ip.addr); - const IPAddress netmask(event->ip_info.netmask.addr); - const IPAddress gw(event->ip_info.gw.addr); + ip_event_got_ip_t *event = static_cast(&info.got_ip); + const IPAddress ip(event->ip_info.ip.addr); + const IPAddress netmask(event->ip_info.netmask.addr); + const IPAddress gw(event->ip_info.gw.addr); WiFiEventData.markGotIP(ip, netmask, gw); break; } diff --git a/src/src/ESPEasyCore/ESPEasyWiFi_state_machine.cpp b/src/src/ESPEasyCore/ESPEasyWiFi_state_machine.cpp index 984591422..68e4e8461 100644 --- a/src/src/ESPEasyCore/ESPEasyWiFi_state_machine.cpp +++ b/src/src/ESPEasyCore/ESPEasyWiFi_state_machine.cpp @@ -217,8 +217,9 @@ void ESPEasyWiFi_t::setState(WiFiState_e newState, uint32_t timeout) { setAPinternal(false); setAP(false); } - if (_state == WiFiState_e::STA_AP_Scanning || - _state == WiFiState_e::STA_Scanning) + + if ((_state == WiFiState_e::STA_AP_Scanning) || + (_state == WiFiState_e::STA_Scanning)) { WiFi.scanDelete(); } @@ -268,10 +269,11 @@ void ESPEasyWiFi_t::setState(WiFiState_e newState, uint32_t timeout) { } break; case WiFiState_e::STA_Connected: - #ifdef ESP32 + # ifdef ESP32 + // FIXME TD-er: Must move to ESP32-specific cpp file WiFi.STA.setDefault(); - #endif + # endif // ifdef ESP32 _last_seen_connected.setNow(); _state_timeout.clear(); break; diff --git a/src/src/ESPEasyCore/ESPEasyWiFi_state_machine_ESP32.cpp b/src/src/ESPEasyCore/ESPEasyWiFi_state_machine_ESP32.cpp index 4bb82251f..0f38b7432 100644 --- a/src/src/ESPEasyCore/ESPEasyWiFi_state_machine_ESP32.cpp +++ b/src/src/ESPEasyCore/ESPEasyWiFi_state_machine_ESP32.cpp @@ -19,7 +19,6 @@ namespace ESPEasy { namespace net { namespace wifi { - IPAddress ESPEasyWiFi_t::getIP() const { if (WiFi.STA.hasIP()) { diff --git a/src/src/ESPEasyCore/ESPEasyWiFi_state_machine_ESP8266.cpp b/src/src/ESPEasyCore/ESPEasyWiFi_state_machine_ESP8266.cpp index ff8de9bb8..373afebbe 100644 --- a/src/src/ESPEasyCore/ESPEasyWiFi_state_machine_ESP8266.cpp +++ b/src/src/ESPEasyCore/ESPEasyWiFi_state_machine_ESP8266.cpp @@ -3,27 +3,27 @@ #ifdef ESP8266 # if FEATURE_WIFI -#include "../ESPEasyCore/ESPEasyWifi_abstracted.h" +# include "../ESPEasyCore/ESPEasyWifi_abstracted.h" namespace ESPEasy { namespace net { namespace wifi { - IPAddress ESPEasyWiFi_t::getIP() const { IPAddress ip = WiFi.localIP(); + if (ip.isSet()) { return ip; } ip = WiFi.softAPIP(); + if (ip.isSet()) { return ip; } return IPAddress(); } - STA_connected_state ESPEasyWiFi_t::getSTA_connected_state() const { // Perform check on SDK function, see: https://github.com/esp8266/Arduino/issues/7432 diff --git a/src/src/ESPEasyCore/ESPEasyWifi_ProcessEvent.cpp b/src/src/ESPEasyCore/ESPEasyWifi_ProcessEvent.cpp index 3f19bf7b6..f45ac4e4f 100644 --- a/src/src/ESPEasyCore/ESPEasyWifi_ProcessEvent.cpp +++ b/src/src/ESPEasyCore/ESPEasyWifi_ProcessEvent.cpp @@ -52,46 +52,48 @@ void handle_unprocessedNetworkEvents() if (active_network_medium == NetworkMedium_t::WIFI) { bool processedSomething = false; - if (!WiFiEventData.processedConnect) { + + if (!WiFiEventData.processedConnect) { #ifndef BUILD_NO_DEBUG - addLog(LOG_LEVEL_DEBUG, F("WIFI : Entering processConnect()")); + addLog(LOG_LEVEL_DEBUG, F("WIFI : Entering processConnect()")); #endif // ifndef BUILD_NO_DEBUG - processConnect(); - processedSomething = true; + processConnect(); + processedSomething = true; -// FIXME TD-er: Forcefully set the connected flag for now - WiFiEventData.setWiFiConnected(); - } + // FIXME TD-er: Forcefully set the connected flag for now + WiFiEventData.setWiFiConnected(); + } - if (!WiFiEventData.processedGotIP) { + if (!WiFiEventData.processedGotIP) { #ifndef BUILD_NO_DEBUG - addLog(LOG_LEVEL_DEBUG, F("WIFI : Entering processGotIP()")); + addLog(LOG_LEVEL_DEBUG, F("WIFI : Entering processGotIP()")); #endif // ifndef BUILD_NO_DEBUG - processGotIP(); + processGotIP(); - processedSomething = true; + processedSomething = true; - // FIXME TD-er: Forcefully set the GotIP flag for now - WiFiEventData.setWiFiGotIP(); - } - if (!WiFiEventData.WiFiServicesInitialized()) { - WiFiEventData.setWiFiServicesInitialized(); - } + // FIXME TD-er: Forcefully set the GotIP flag for now + WiFiEventData.setWiFiGotIP(); + } - if (WiFiEventData.WiFiServicesInitialized() && processedSomething) { + if (!WiFiEventData.WiFiServicesInitialized()) { + WiFiEventData.setWiFiServicesInitialized(); + } - // #ifdef ESP32 - setWebserverRunning(false); - delay(1); - setWebserverRunning(true); - delay(1); + if (WiFiEventData.WiFiServicesInitialized() && processedSomething) { - /* - #else - CheckRunningServices(); - #endif - */ - } + // #ifdef ESP32 + setWebserverRunning(false); + delay(1); + setWebserverRunning(true); + delay(1); + + /* + #else + CheckRunningServices(); + #endif + */ + } } #if FEATURE_ETHERNET @@ -107,9 +109,7 @@ void handle_unprocessedNetworkEvents() // Functions to process the data gathered from the events. // These functions are called from Setup() or Loop() and thus may call delay() or yield() // ******************************************************************************** -void processDisconnect() { - -} +void processDisconnect() {} void processConnect() { if (WiFiEventData.processedConnect) { return; } @@ -122,7 +122,7 @@ void processConnect() { */ WiFiEventData.processedConnect = true; - /* + /* if (WiFi.status() == WL_DISCONNECTED) { // Apparently not really connected return; @@ -215,10 +215,10 @@ void processGotIP() { if (!useStaticIP()) { #ifdef ESP8266 - if (!ip.isSet()) + if (!ip.isSet()) #else // ifdef ESP8266 - if ((ip[0] == 0) && (ip[1] == 0) && (ip[2] == 0) && (ip[3] == 0)) + if ((ip[0] == 0) && (ip[1] == 0) && (ip[2] == 0) && (ip[3] == 0)) #endif // ifdef ESP8266 { return; @@ -317,9 +317,9 @@ void processDisconnectAPmode() { if (loglevelActiveFor(LOG_LEVEL_INFO)) { String log(strformat( - F("AP Mode: Client disconnected: %s Connected devices: %u"), - WiFiEventData.lastMacDisconnectedAPmode.toString().c_str(), - WiFi.softAPgetStationNum())); + F("AP Mode: Client disconnected: %s Connected devices: %u"), + WiFiEventData.lastMacDisconnectedAPmode.toString().c_str(), + WiFi.softAPgetStationNum())); addLogMove(LOG_LEVEL_INFO, log); } #endif // ifndef BUILD_NO_DEBUG @@ -336,9 +336,9 @@ void processConnectAPmode() { if (loglevelActiveFor(LOG_LEVEL_INFO)) { String log(strformat( - F("AP Mode: Client connected: %s Connected devices: %u"), - WiFiEventData.lastMacConnectedAPmode.toString().c_str(), - WiFi.softAPgetStationNum())); + F("AP Mode: Client connected: %s Connected devices: %u"), + WiFiEventData.lastMacConnectedAPmode.toString().c_str(), + WiFi.softAPgetStationNum())); addLogMove(LOG_LEVEL_INFO, log); } #endif // ifndef BUILD_NO_DEBUG diff --git a/src/src/ESPEasyCore/ESPEasyWifi_abstracted.cpp b/src/src/ESPEasyCore/ESPEasyWifi_abstracted.cpp index 155e4f63e..3937d3eb2 100644 --- a/src/src/ESPEasyCore/ESPEasyWifi_abstracted.cpp +++ b/src/src/ESPEasyCore/ESPEasyWifi_abstracted.cpp @@ -26,7 +26,7 @@ const __FlashStringHelper* getWifiModeString(WiFiMode_t wifimode) return F("Unknown"); } -bool WiFiConnected() { return ESPEasyWiFi.connected(); } +bool WiFiConnected() { return ESPEasyWiFi.connected(); } bool setSTA(bool enable) { return setSTA_AP(enable, WifiIsAP(WiFi.getMode())); } diff --git a/src/src/ESPEasyCore/ESPEasyWifi_abstracted.h b/src/src/ESPEasyCore/ESPEasyWifi_abstracted.h index 3fd86c22b..a8a45d4f6 100644 --- a/src/src/ESPEasyCore/ESPEasyWifi_abstracted.h +++ b/src/src/ESPEasyCore/ESPEasyWifi_abstracted.h @@ -26,14 +26,14 @@ namespace wifi { // Call before starting WiFi -bool WiFi_pre_setup(); +bool WiFi_pre_setup(); // Call before setting WiFi into STA mode -bool WiFi_pre_STA_setup(); +bool WiFi_pre_STA_setup(); -bool WiFiConnected(); +bool WiFiConnected(); -void WiFiDisconnect(); +void WiFiDisconnect(); // ******************************************************************************** // Manage Wifi Modes diff --git a/src/src/ESPEasyCore/ESPEasyWifi_abstracted_ESP32.cpp b/src/src/ESPEasyCore/ESPEasyWifi_abstracted_ESP32.cpp index b67da31ca..18b3cd7fc 100644 --- a/src/src/ESPEasyCore/ESPEasyWifi_abstracted_ESP32.cpp +++ b/src/src/ESPEasyCore/ESPEasyWifi_abstracted_ESP32.cpp @@ -46,7 +46,7 @@ bool WiFi_pre_STA_setup() } void WiFiDisconnect() { -// removeWiFiEventHandler(); + // removeWiFiEventHandler(); WiFi.disconnect(); delay(100); { @@ -141,15 +141,16 @@ bool setWifiMode(WiFiMode_t new_mode) // esp_wifi_set_ps(WIFI_PS_MAX_MODEM); delay(1); - #ifdef ESP32 + # ifdef ESP32 WiFi.STA.end(); - #endif + # endif } else { -/* - if (cur_mode == WIFI_OFF) { - registerWiFiEventHandler(); - } -*/ + /* + if (cur_mode == WIFI_OFF) { + registerWiFiEventHandler(); + } + */ + // Only set power mode when AP is not enabled // When AP is enabled, the sleep mode is already set to WIFI_NONE_SLEEP if (!WifiIsAP(new_mode)) { @@ -275,6 +276,7 @@ void doSetWiFiTXpower(float& dBm) int8_t power = dBm * 4; esp_wifi_set_max_tx_power(power); + if (esp_wifi_get_max_tx_power(&power) == ESP_OK) { dBm = static_cast(power) / 4.0f; } @@ -358,15 +360,16 @@ void setWiFiDefaultPowerMode() void setWiFiCountryPolicyManual() { -/* wifi_country_t config = { - .cc = "01", - .schan = 1, - .nchan = 14, - .policy = WIFI_COUNTRY_POLICY_MANUAL, - }; + /* wifi_country_t config = { + .cc = "01", + .schan = 1, + .nchan = 14, + .policy = WIFI_COUNTRY_POLICY_MANUAL, + }; - esp_wifi_set_country(&config); - */} + esp_wifi_set_country(&config); + */ +} } // namespace wifi } // namespace net diff --git a/src/src/ESPEasyCore/ESPEasyWifi_abstracted_ESP8266.cpp b/src/src/ESPEasyCore/ESPEasyWifi_abstracted_ESP8266.cpp index 361441c1a..349c04831 100644 --- a/src/src/ESPEasyCore/ESPEasyWifi_abstracted_ESP8266.cpp +++ b/src/src/ESPEasyCore/ESPEasyWifi_abstracted_ESP8266.cpp @@ -18,13 +18,13 @@ namespace wifi { bool WiFi_pre_setup() { registerWiFiEventHandler(); - setSTA_AP(false, false); + setSTA_AP(false, false); delay(100); return true; } bool WiFi_pre_STA_setup() { - if (! setSTA(true)) { return false; } + if (!setSTA(true)) { return false; } // Assign to 2 separate bools to make sure both are executed. const bool autoConnect = WiFi.setAutoConnect(false); @@ -39,7 +39,7 @@ bool WiFi_pre_STA_setup() { void WiFiDisconnect() { // Only call disconnect when STA is active - if ( WifiIsSTA(WiFi.getMode())) { + if (WifiIsSTA(WiFi.getMode())) { wifi_station_disconnect(); } station_config conf{}; @@ -49,9 +49,9 @@ void WiFiDisconnect() { ETS_UART_INTR_ENABLE(); } -bool WifiIsAP(WiFiMode_t wifimode) { return (wifimode == WIFI_AP) || (wifimode == WIFI_AP_STA); } +bool WifiIsAP(WiFiMode_t wifimode) { return (wifimode == WIFI_AP) || (wifimode == WIFI_AP_STA); } -bool WifiIsSTA(WiFiMode_t wifimode) { return (wifimode & WIFI_STA) != 0; } +bool WifiIsSTA(WiFiMode_t wifimode) { return (wifimode & WIFI_STA) != 0; } bool setWifiMode(WiFiMode_t new_mode) { @@ -71,12 +71,12 @@ bool setWifiMode(WiFiMode_t new_mode) processing_wifi_mode = static_cast(new_mode); - if (! WifiIsSTA(new_mode)) { - // calls lwIP's dhcp_stop(), - // safe to call even if not started - // See: https://github.com/esp8266/Arduino/pull/5703/files - wifi_station_dhcpc_stop(); - } + if (!WifiIsSTA(new_mode)) { + // calls lwIP's dhcp_stop(), + // safe to call even if not started + // See: https://github.com/esp8266/Arduino/pull/5703/files + wifi_station_dhcpc_stop(); + } if (new_mode != WIFI_OFF) { // See: https://github.com/esp8266/Arduino/issues/6172#issuecomment-500457407 From f6bd2c40dc5d06c428f6faadd855455ce0e15091 Mon Sep 17 00:00:00 2001 From: TD-er Date: Wed, 12 Mar 2025 17:05:09 +0100 Subject: [PATCH 045/564] [WiFi] Fix reconnecting + WiFi scan --- .../ESPEasyCore/ESPEasyWiFi_state_machine.cpp | 11 ++++++-- .../ESPEasyCore/ESPEasyWiFi_state_machine.h | 26 +++++++++---------- src/src/ESPEasyCore/ESPEasyWifi.cpp | 1 + src/src/Helpers/WiFi_AP_CandidatesList.cpp | 10 ++++++- 4 files changed, 32 insertions(+), 16 deletions(-) diff --git a/src/src/ESPEasyCore/ESPEasyWiFi_state_machine.cpp b/src/src/ESPEasyCore/ESPEasyWiFi_state_machine.cpp index 68e4e8461..c9ae0b751 100644 --- a/src/src/ESPEasyCore/ESPEasyWiFi_state_machine.cpp +++ b/src/src/ESPEasyCore/ESPEasyWiFi_state_machine.cpp @@ -85,6 +85,13 @@ void ESPEasyWiFi_t::loop() case WiFiState_e::IdleWaiting: if (_state_timeout.timeReached()) { + // This is where we decide what to do next: + // - Reconnect + // - Scan + // + + + // Do we have candidate to connect to ? if (WiFi_AP_Candidates.hasCandidates()) { setState(WiFiState_e::STA_Connecting, WIFI_STATE_MACHINE_STA_CONNECTING_TIMEOUT); @@ -121,8 +128,8 @@ void ESPEasyWiFi_t::loop() case WiFiState_e::STA_Scanning: case WiFiState_e::STA_AP_Scanning: { + // -1 if scan not finished auto scanCompleteStatus = WiFi.scanComplete(); - if (scanCompleteStatus >= 0) { WiFi_AP_Candidates.load_knownCredentials(); # if !FEATURE_ESP8266_DIRECT_WIFI_SCAN @@ -343,7 +350,7 @@ bool ESPEasyWiFi_t::connectSTA() addLogMove(LOG_LEVEL_INFO, strformat( F("WIFI : Connecting %s attempt #%u"), candidate.toString().c_str(), - _connect_attempt)); + WiFiEventData.wifi_connect_attempt)); } WiFiEventData.markWiFiBegin(); diff --git a/src/src/ESPEasyCore/ESPEasyWiFi_state_machine.h b/src/src/ESPEasyCore/ESPEasyWiFi_state_machine.h index f6656cb5f..d64780348 100644 --- a/src/src/ESPEasyCore/ESPEasyWiFi_state_machine.h +++ b/src/src/ESPEasyCore/ESPEasyWiFi_state_machine.h @@ -73,36 +73,36 @@ private: STA_connected_state getSTA_connected_state() const; - WiFi_AP_Candidate _active_sta; - WiFi_AP_Candidate _AP_conf; +// WiFi_AP_Candidate _active_sta; +// WiFi_AP_Candidate _AP_conf; - String _last_ssid; - MAC_address _last_bssid; - uint8_t _last_channel = 0; +// String _last_ssid; +// MAC_address _last_bssid; +// uint8_t _last_channel = 0; WiFiState_e _state = WiFiState_e::Disabled; LongTermTimer _last_state_change; LongTermTimer _state_timeout; LongTermTimer _last_seen_connected; - LongTermTimer _AP_start_timestamp; +// LongTermTimer _AP_start_timestamp; - uint32_t _connect_attempt = 0; +// uint32_t _connect_attempt = 0; - uint32_t _nrReconnects = 0; +// uint32_t _nrReconnects = 0; bool _callbackError = false; // Special modes for initial setup or re-configuration of a node via serial port/IMPROV - bool _improvActive = false; - bool _setupActive = false; +// bool _improvActive = false; +// bool _setupActive = false; // WiFi settings => Move to separate class/struct bool _disabledAtBoot = false; - bool _passiveScan = false; - bool _includeHiddenSSID = false; - float _TX_power = -1; +// bool _passiveScan = false; +// bool _includeHiddenSSID = false; +// float _TX_power = -1; // Manual IP settings // IP diff --git a/src/src/ESPEasyCore/ESPEasyWifi.cpp b/src/src/ESPEasyCore/ESPEasyWifi.cpp index 78ae3b9e6..9a018c3a7 100644 --- a/src/src/ESPEasyCore/ESPEasyWifi.cpp +++ b/src/src/ESPEasyCore/ESPEasyWifi.cpp @@ -379,6 +379,7 @@ void WifiScan(bool async, uint8_t channel) { # ifdef ESP32 const bool passive = Settings.PassiveWiFiScan(); const uint32_t max_ms_per_chan = 120; + WiFi.setScanTimeout(14 * max_ms_per_chan * 2); WiFi.scanNetworks(async, show_hidden, passive, max_ms_per_chan /*, channel */); # endif // ifdef ESP32 diff --git a/src/src/Helpers/WiFi_AP_CandidatesList.cpp b/src/src/Helpers/WiFi_AP_CandidatesList.cpp index 48f8daeb7..8195defd4 100644 --- a/src/src/Helpers/WiFi_AP_CandidatesList.cpp +++ b/src/src/Helpers/WiFi_AP_CandidatesList.cpp @@ -137,6 +137,7 @@ void WiFi_AP_CandidatesList::after_process_WiFiscan() { scanned_new.sort(); scanned_new.unique(); _mustLoadCredentials = true; + load_knownCredentials(); WiFi.scanDelete(); attemptsLeft = WiFi_CONNECT_ATTEMPTS; } @@ -252,7 +253,8 @@ void WiFi_AP_CandidatesList::markCurrentConnectionStable() { int8_t WiFi_AP_CandidatesList::scanComplete() const { const int8_t scanCompleteStatus = WiFi.scanComplete(); - if (scanCompleteStatus <= 0) { + if (scanCompleteStatus == -1) { + // Still scanning return scanCompleteStatus; } @@ -267,6 +269,12 @@ int8_t WiFi_AP_CandidatesList::scanComplete() const { ++found; } } + if (found == 0) { + if (scanCompleteStatus == -2) { + // Not triggered + return scanCompleteStatus; + } + } return found; } From 7e2bce22c05d3ba5249afbd451302421c1c0acd5 Mon Sep 17 00:00:00 2001 From: TD-er Date: Thu, 13 Mar 2025 15:48:15 +0100 Subject: [PATCH 046/564] [ESP-IDF5.4] Prepare for ESP-IDF5.4 with Arduino 3.2.0 --- platformio_core_defs.ini | 4 ++-- src/src/Helpers/Hardware_device_info_ESP32C2.cpp | 9 +++++++++ src/src/Helpers/Hardware_device_info_ESP32C3.cpp | 9 +++++++++ src/src/Helpers/Hardware_device_info_ESP32C6.cpp | 9 +++++++++ src/src/Helpers/Hardware_device_info_ESP32S2.cpp | 9 +++++++++ src/src/Helpers/Hardware_device_info_ESP32S3.cpp | 9 +++++++++ 6 files changed, 47 insertions(+), 2 deletions(-) diff --git a/platformio_core_defs.ini b/platformio_core_defs.ini index 220d27851..93da5cf15 100644 --- a/platformio_core_defs.ini +++ b/platformio_core_defs.ini @@ -197,8 +197,8 @@ lib_extra_dirs = ; ESP_IDF 5.3.1 [core_esp32_IDF5_3_2__3_1_0_LittleFS] -platform = https://github.com/Jason2866/platform-espressif32.git -platform_packages = framework-arduinoespressif32 @ https://github.com/Jason2866/esp32-arduino-lib-builder/releases/download/3427/framework-arduinoespressif32-all-release_v5.3-be550b63.zip +platform = https://github.com/Jason2866/platform-espressif32.git#Arduino/IDF54 +platform_packages = framework-arduinoespressif32 @ https://github.com/Jason2866/esp32-arduino-lib-builder/releases/download/3443/framework-arduinoespressif32-all-release_v5.4-eb786b90.zip build_flags = -DESP32_STAGE -DESP_IDF_VERSION_MAJOR=5 -DLIBRARIES_NO_LOG=1 diff --git a/src/src/Helpers/Hardware_device_info_ESP32C2.cpp b/src/src/Helpers/Hardware_device_info_ESP32C2.cpp index 7bae3722b..9ec6d7a4c 100644 --- a/src/src/Helpers/Hardware_device_info_ESP32C2.cpp +++ b/src/src/Helpers/Hardware_device_info_ESP32C2.cpp @@ -16,12 +16,21 @@ bool isFlashInterfacePin_ESPEasy(int gpio) { // For chip variants with a SiP flash built in, GPIO11~ GPIO17 are dedicated to connecting SiP flash, not for other uses // return (gpio) >= 12 && (gpio) <= 17; switch (gpio) { +#if ESP_IDF_VERSION < ESP_IDF_VERSION_VAL(5, 4, 0) case SPI_IOMUX_PIN_NUM_HD: case SPI_IOMUX_PIN_NUM_CS: case SPI_IOMUX_PIN_NUM_MOSI: case SPI_IOMUX_PIN_NUM_CLK: case SPI_IOMUX_PIN_NUM_MISO: case SPI_IOMUX_PIN_NUM_WP: +#else + case SPI2_IOMUX_PIN_NUM_HD: + case SPI2_IOMUX_PIN_NUM_CS: + case SPI2_IOMUX_PIN_NUM_MOSI: + case SPI2_IOMUX_PIN_NUM_CLK: + case SPI2_IOMUX_PIN_NUM_MISO: + case SPI2_IOMUX_PIN_NUM_WP: +#endif return true; } return false; diff --git a/src/src/Helpers/Hardware_device_info_ESP32C3.cpp b/src/src/Helpers/Hardware_device_info_ESP32C3.cpp index ba0bb1198..e923c4664 100644 --- a/src/src/Helpers/Hardware_device_info_ESP32C3.cpp +++ b/src/src/Helpers/Hardware_device_info_ESP32C3.cpp @@ -37,12 +37,21 @@ bool isFlashInterfacePin_ESPEasy(int gpio) { // GPIO-12 ... 17: Connected to flash // return (gpio) >= 12 && (gpio) <= 17; switch (gpio) { +#if ESP_IDF_VERSION < ESP_IDF_VERSION_VAL(5, 4, 0) case SPI_IOMUX_PIN_NUM_HD: case SPI_IOMUX_PIN_NUM_CS: case SPI_IOMUX_PIN_NUM_MOSI: case SPI_IOMUX_PIN_NUM_CLK: case SPI_IOMUX_PIN_NUM_MISO: case SPI_IOMUX_PIN_NUM_WP: +#else + case SPI2_IOMUX_PIN_NUM_HD: + case SPI2_IOMUX_PIN_NUM_CS: + case SPI2_IOMUX_PIN_NUM_MOSI: + case SPI2_IOMUX_PIN_NUM_CLK: + case SPI2_IOMUX_PIN_NUM_MISO: + case SPI2_IOMUX_PIN_NUM_WP: +#endif return true; } return false; diff --git a/src/src/Helpers/Hardware_device_info_ESP32C6.cpp b/src/src/Helpers/Hardware_device_info_ESP32C6.cpp index e88b38e80..b0390de4f 100644 --- a/src/src/Helpers/Hardware_device_info_ESP32C6.cpp +++ b/src/src/Helpers/Hardware_device_info_ESP32C6.cpp @@ -33,12 +33,21 @@ bool isFlashInterfacePin_ESPEasy(int gpio) { // GPIO-24 ... 30: Connected to internal flash (might be available when using external flash???) switch (gpio) { +#if ESP_IDF_VERSION < ESP_IDF_VERSION_VAL(5, 4, 0) case SPI_IOMUX_PIN_NUM_CS: case SPI_IOMUX_PIN_NUM_CLK: case SPI_IOMUX_PIN_NUM_MOSI: case SPI_IOMUX_PIN_NUM_MISO: case SPI_IOMUX_PIN_NUM_WP: case SPI_IOMUX_PIN_NUM_HD: +#else + case SPI2_IOMUX_PIN_NUM_CS: + case SPI2_IOMUX_PIN_NUM_CLK: + case SPI2_IOMUX_PIN_NUM_MOSI: + case SPI2_IOMUX_PIN_NUM_MISO: + case SPI2_IOMUX_PIN_NUM_WP: + case SPI2_IOMUX_PIN_NUM_HD: +#endif return true; } return false; diff --git a/src/src/Helpers/Hardware_device_info_ESP32S2.cpp b/src/src/Helpers/Hardware_device_info_ESP32S2.cpp index 15867ba44..7e7cba83c 100644 --- a/src/src/Helpers/Hardware_device_info_ESP32S2.cpp +++ b/src/src/Helpers/Hardware_device_info_ESP32S2.cpp @@ -31,12 +31,21 @@ bool isFlashInterfacePin_ESPEasy(int gpio) { // GPIO-27 ... 32: SPI 8 ­line mode (OPI) pins for flash or PSRAM (e.g. ESP32-S2FH2 and ESP32-S2FH4) // return (gpio) >= 22 && (gpio) <= 25; switch (gpio) { +#if ESP_IDF_VERSION < ESP_IDF_VERSION_VAL(5, 4, 0) case SPI_IOMUX_PIN_NUM_HD: case SPI_IOMUX_PIN_NUM_CS: case SPI_IOMUX_PIN_NUM_MOSI: case SPI_IOMUX_PIN_NUM_CLK: case SPI_IOMUX_PIN_NUM_MISO: case SPI_IOMUX_PIN_NUM_WP: +#else + case SPI2_IOMUX_PIN_NUM_HD: + case SPI2_IOMUX_PIN_NUM_CS: + case SPI2_IOMUX_PIN_NUM_MOSI: + case SPI2_IOMUX_PIN_NUM_CLK: + case SPI2_IOMUX_PIN_NUM_MISO: + case SPI2_IOMUX_PIN_NUM_WP: +#endif return true; } return false; diff --git a/src/src/Helpers/Hardware_device_info_ESP32S3.cpp b/src/src/Helpers/Hardware_device_info_ESP32S3.cpp index a5abb5058..3f02fde3c 100644 --- a/src/src/Helpers/Hardware_device_info_ESP32S3.cpp +++ b/src/src/Helpers/Hardware_device_info_ESP32S3.cpp @@ -50,12 +50,21 @@ bool isFlashInterfacePin_ESPEasy(int gpio) { // return (gpio) >= 26 && (gpio) <= 32; switch (gpio) { case 26: // SPICS1 Only when PSRAM is present??? +#if ESP_IDF_VERSION < ESP_IDF_VERSION_VAL(5, 4, 0) case SPI_IOMUX_PIN_NUM_HD: case SPI_IOMUX_PIN_NUM_CS: case SPI_IOMUX_PIN_NUM_MOSI: case SPI_IOMUX_PIN_NUM_CLK: case SPI_IOMUX_PIN_NUM_MISO: case SPI_IOMUX_PIN_NUM_WP: +#else + case SPI2_IOMUX_PIN_NUM_HD: + case SPI2_IOMUX_PIN_NUM_CS: + case SPI2_IOMUX_PIN_NUM_MOSI: + case SPI2_IOMUX_PIN_NUM_CLK: + case SPI2_IOMUX_PIN_NUM_MISO: + case SPI2_IOMUX_PIN_NUM_WP: +#endif return true; } return false; From 853245c0fb1d1328395a162d7c5eda997dbdc31d Mon Sep 17 00:00:00 2001 From: TD-er Date: Sat, 15 Mar 2025 00:03:54 +0100 Subject: [PATCH 047/564] [Eastron] Speed up parsing Modbus RTU messages --- lib/ESPEasySerial/ESPEasySerial.cpp | 8 ++++++++ lib/ESPEasySerial/ESPeasySerial.h | 1 + lib/SDM_Energy_Meter/SDM.cpp | 21 +++++++++++---------- platformio_core_defs.ini | 7 +++++-- platformio_esp32_solo1.ini | 2 +- 5 files changed, 26 insertions(+), 13 deletions(-) diff --git a/lib/ESPEasySerial/ESPEasySerial.cpp b/lib/ESPEasySerial/ESPEasySerial.cpp index d8f2f21c9..bda77cdc1 100644 --- a/lib/ESPEasySerial/ESPEasySerial.cpp +++ b/lib/ESPEasySerial/ESPEasySerial.cpp @@ -182,6 +182,14 @@ int ESPeasySerial::read(void) return _serialPort->read(); } +int ESPeasySerial::read(uint8_t *buffer, size_t size) +{ + if (!isValid()) { + return -1; + } + return _serialPort->read(buffer, size); +} + int ESPeasySerial::available(void) { if (!isValid()) { diff --git a/lib/ESPEasySerial/ESPeasySerial.h b/lib/ESPEasySerial/ESPeasySerial.h index 7f9e5ea19..229919025 100644 --- a/lib/ESPEasySerial/ESPeasySerial.h +++ b/lib/ESPEasySerial/ESPeasySerial.h @@ -89,6 +89,7 @@ public: int peek(void); size_t write(uint8_t val) override; int read(void) override; + int read(uint8_t *buffer, size_t size); int available(void) override; int availableForWrite(void); void flush(void) override; diff --git a/lib/SDM_Energy_Meter/SDM.cpp b/lib/SDM_Energy_Meter/SDM.cpp index 8da79aebe..f98b8e2aa 100644 --- a/lib/SDM_Energy_Meter/SDM.cpp +++ b/lib/SDM_Energy_Meter/SDM.cpp @@ -104,19 +104,20 @@ void SDM::startReadVal(uint16_t reg, uint8_t node, uint8_t functionCode) { uint16_t SDM::readValReady(uint8_t node, uint8_t functionCode) { uint16_t readErr = SDM_ERR_NO_ERROR; - if (sdmSer.available() < FRAMESIZE && ((millis() - resptime) < msturnaround)) + int available = sdmSer.available(); + if (available < FRAMESIZE && ((millis() - resptime) < msturnaround)) { return SDM_ERR_STILL_WAITING; } - while (sdmSer.available() < FRAMESIZE) { + while (available < FRAMESIZE) { if ((millis() - resptime) > msturnaround) { readErr = SDM_ERR_TIMEOUT; //err debug (4) - if (sdmSer.available() == 5) { - for(int n=0; n<5; n++) { - sdmarr[n] = sdmSer.read(); - } + if (available == 5) { + memset(sdmarr, 0, NR_ELEMENTS(sdmarr)); + sdmSer.read(sdmarr, available); + if (validChecksum(sdmarr, 5)) { readErr = sdmarr[2]; } @@ -124,15 +125,15 @@ uint16_t SDM::readValReady(uint8_t node, uint8_t functionCode) { break; } delay(1); + available = sdmSer.available(); } if (readErr == SDM_ERR_NO_ERROR) { //if no timeout... - if (sdmSer.available() >= FRAMESIZE) { + if (available >= FRAMESIZE) { - for(int n=0; n Date: Wed, 26 Mar 2025 08:37:19 +0100 Subject: [PATCH 048/564] [Serial] Add setXxBufferSize functions --- lib/ESPEasySerial/ESPEasySerial.cpp | 16 ++++++++++++++++ lib/ESPEasySerial/ESPeasySerial.h | 5 +++++ lib/ESPEasySerial/Port_ESPEasySerial_base.h | 4 +++- src/_P091_SerSwitch.ino | 2 +- 4 files changed, 25 insertions(+), 2 deletions(-) diff --git a/lib/ESPEasySerial/ESPEasySerial.cpp b/lib/ESPEasySerial/ESPEasySerial.cpp index bda77cdc1..38af845a4 100644 --- a/lib/ESPEasySerial/ESPEasySerial.cpp +++ b/lib/ESPEasySerial/ESPEasySerial.cpp @@ -246,6 +246,22 @@ void ESPeasySerial::setDebugOutput(bool enable) } } +size_t ESPeasySerial::setRxBufferSize(size_t new_size) +{ + if (isValid()) { + return _serialPort->setRxBufferSize(new_size); + } + return 0; +} + +size_t ESPeasySerial::setTxBufferSize(size_t new_size) +{ + if (isValid()) { + return _serialPort->setTxBufferSize(new_size); + } + return 0; +} + bool ESPeasySerial::isTxEnabled(void) { return getTxPin() != -1; diff --git a/lib/ESPEasySerial/ESPeasySerial.h b/lib/ESPEasySerial/ESPeasySerial.h index 229919025..00d766db3 100644 --- a/lib/ESPEasySerial/ESPeasySerial.h +++ b/lib/ESPEasySerial/ESPeasySerial.h @@ -122,6 +122,11 @@ public: void setDebugOutput(bool); + // Set buffer size, should be called before calling begin() + size_t setRxBufferSize(size_t new_size); + size_t setTxBufferSize(size_t new_size); + + bool isTxEnabled(void); bool isRxEnabled(void); diff --git a/lib/ESPEasySerial/Port_ESPEasySerial_base.h b/lib/ESPEasySerial/Port_ESPEasySerial_base.h index e317b6764..c520df617 100644 --- a/lib/ESPEasySerial/Port_ESPEasySerial_base.h +++ b/lib/ESPEasySerial/Port_ESPEasySerial_base.h @@ -45,7 +45,7 @@ public: inline size_t write(const char *s) { - return write((uint8_t *)s, strlen(s)); + return (s) ? write((uint8_t *)s, strlen(s)) : 0; } inline size_t write(unsigned long n) @@ -74,6 +74,8 @@ public: virtual void setDebugOutput(bool) = 0; + + // Set buffer size, should be called before calling begin() virtual size_t setRxBufferSize(size_t new_size) = 0; virtual size_t setTxBufferSize(size_t new_size) = 0; virtual bool setRS485Mode(int8_t rtsPin, bool enableCollisionDetection) = 0; diff --git a/src/_P091_SerSwitch.ino b/src/_P091_SerSwitch.ino index 7cd07b113..304d7ea64 100644 --- a/src/_P091_SerSwitch.ino +++ b/src/_P091_SerSwitch.ino @@ -232,8 +232,8 @@ boolean Plugin_091(uint8_t function, struct EventStruct *event, String& string) if (PCONFIG(0) == SER_SWITCH_YEWE) { Plugin_091_numrelay = PCONFIG(1); - ESPEASY_SERIAL_0.begin(9600, SERIAL_8N1); ESPEASY_SERIAL_0.setRxBufferSize(BUFFER_SIZE); // Arduino core for ESP8266 WiFi chip 2.4.0 + ESPEASY_SERIAL_0.begin(9600, SERIAL_8N1); delay(1); getmcustate(); // request status on startup log += strformat(F(" Yewe %d btn"), Plugin_091_numrelay); From e7841a2c98b5cf877a3456acc573c409e3c39b34 Mon Sep 17 00:00:00 2001 From: TD-er Date: Thu, 17 Apr 2025 00:49:11 +0200 Subject: [PATCH 049/564] [ESP-IDF5.3] Update to latest Arduino/ESP-IDF5.3 version --- platformio_core_defs.ini | 2 +- platformio_esp32_solo1.ini | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/platformio_core_defs.ini b/platformio_core_defs.ini index 08e5cc190..49e382365 100644 --- a/platformio_core_defs.ini +++ b/platformio_core_defs.ini @@ -201,7 +201,7 @@ lib_extra_dirs = ;platform_packages = framework-arduinoespressif32 @ https://github.com/Jason2866/esp32-arduino-lib-builder/releases/download/3443/framework-arduinoespressif32-all-release_v5.4-eb786b90.zip platform = https://github.com/Jason2866/platform-espressif32.git -platform_packages = framework-arduinoespressif32 @ https://github.com/Jason2866/esp32-arduino-lib-builder/releases/download/3447/framework-arduinoespressif32-all-release_v5.3-a8f33310.zip +platform_packages = framework-arduinoespressif32 @ https://github.com/Jason2866/esp32-arduino-lib-builder/releases/download/3506/framework-arduinoespressif32-all-release_v5.3-2952ac93.zip build_flags = -DESP32_STAGE -DESP_IDF_VERSION_MAJOR=5 -DLIBRARIES_NO_LOG=1 diff --git a/platformio_esp32_solo1.ini b/platformio_esp32_solo1.ini index 299f1c144..a1ccd95fa 100644 --- a/platformio_esp32_solo1.ini +++ b/platformio_esp32_solo1.ini @@ -4,7 +4,7 @@ extends = esp32_base_idf5 board = esp32_solo1_4M platform = https://github.com/Jason2866/platform-espressif32.git#Arduino/IDF53 -platform_packages = framework-arduino-solo1 @ https://github.com/Jason2866/esp32-arduino-lib-builder/releases/download/3448/framework-arduinoespressif32-solo1-release_v5.3-a8f33310.zip +platform_packages = framework-arduino-solo1 @ https://github.com/Jason2866/esp32-arduino-lib-builder/releases/download/3507/framework-arduinoespressif32-solo1-release_v5.3-2952ac93.zip build_flags = ${esp32_base_idf5.build_flags} -DFEATURE_ARDUINO_OTA=1 -DUSE_LITTLEFS From a2a0e2c77b24e7362186568a38dfcd70c4bd1aa3 Mon Sep 17 00:00:00 2001 From: TD-er Date: Thu, 17 Apr 2025 00:50:03 +0200 Subject: [PATCH 050/564] [timing stats] Simplify and speedup collecting timing stats --- src/src/DataStructs/TimingStats.cpp | 48 ++++++++++------------ src/src/DataStructs/TimingStats.h | 30 +++++++------- src/src/ESPEasyCore/ESPEasy_loop.cpp | 6 +-- src/src/Globals/Statistics.cpp | 2 +- src/src/Globals/Statistics.h | 2 +- src/src/Helpers/Dallas1WireHelper.h | 2 +- src/src/Helpers/ESPEasyStatistics.cpp | 4 +- src/src/Helpers/msecTimerHandlerStruct.cpp | 4 +- src/src/Helpers/msecTimerHandlerStruct.h | 4 +- src/src/PluginStructs/P005_data_struct.cpp | 14 +++---- src/src/PluginStructs/P025_data_struct.cpp | 4 +- src/src/WebServer/TimingStats.cpp | 14 +++---- src/src/WebServer/TimingStats.h | 6 +-- 13 files changed, 68 insertions(+), 72 deletions(-) diff --git a/src/src/DataStructs/TimingStats.cpp b/src/src/DataStructs/TimingStats.cpp index fdf943119..d74f1bd24 100644 --- a/src/src/DataStructs/TimingStats.cpp +++ b/src/src/DataStructs/TimingStats.cpp @@ -13,45 +13,41 @@ std::map miscStats; unsigned long timingstats_last_reset(0); -TimingStats::TimingStats() : _timeTotal(0.0f), _count(0), _maxVal(0), _minVal(4294967295) {} - -void TimingStats::add(int64_t time) { - _timeTotal += static_cast(time); +void TimingStats::add(int32_t duration_usec) { + // Max duration in usec is roughly 35 minutes. + // For timing stats more than enough + if (duration_usec < 0) return; + _timeTotal += static_cast(duration_usec); ++_count; - if (time > static_cast(_maxVal)) { _maxVal = time; } + if (static_cast(duration_usec) > _maxVal) { _maxVal = duration_usec; } - if (time < static_cast(_minVal)) { _minVal = time; } + if (static_cast(duration_usec) < _minVal) { _minVal = duration_usec; } } void TimingStats::reset() { - _timeTotal = 0.0f; - _count = 0; - _maxVal = 0; - _minVal = 4294967295; + _timeTotal = 0u; + _count = 0u; + _maxVal = 0u; + _minVal = 4294967295u; } bool TimingStats::isEmpty() const { - return _count == 0; + return _count == 0u; } float TimingStats::getAvg() const { if (_count == 0) { return 0.0f; } - return _timeTotal / static_cast(_count); + return static_cast(_timeTotal) / static_cast(_count); } -uint32_t TimingStats::getMinMax(uint64_t& minVal, uint64_t& maxVal) const { - if (_count == 0) { - minVal = 0; - maxVal = 0; - return 0; - } +uint32_t TimingStats::getMinMax(uint32_t& minVal, uint32_t& maxVal) const { minVal = _minVal; maxVal = _maxVal; return _count; } -bool TimingStats::thresholdExceeded(const uint64_t& threshold) const { +bool TimingStats::thresholdExceeded(const uint32_t& threshold) const { if (_count == 0) { return false; } @@ -321,22 +317,22 @@ String getMiscStatsName(TimingStatsElements stat) { return getMiscStatsName_F(static_cast(stat)); } -void stopTimerTask(deviceIndex_t T, int F, uint64_t statisticsTimerStart) +void stopTimerTask(deviceIndex_t T, int F, uint32_t statisticsTimerStart) { - if (mustLogFunction(F)) { pluginStats[static_cast(T.value) * 256 + (F)].add(usecPassedSince(statisticsTimerStart)); } + if (mustLogFunction(F)) { pluginStats[static_cast(T.value) * 256 + (F)].add(usecPassedSince_fast(statisticsTimerStart)); } } -void stopTimerController(protocolIndex_t T, CPlugin::Function F, uint64_t statisticsTimerStart) +void stopTimerController(protocolIndex_t T, CPlugin::Function F, uint32_t statisticsTimerStart) { - if (mustLogCFunction(F)) { controllerStats[static_cast(T) * 256 + static_cast(F)].add(usecPassedSince(statisticsTimerStart)); } + if (mustLogCFunction(F)) { controllerStats[static_cast(T) * 256 + static_cast(F)].add(usecPassedSince_fast(statisticsTimerStart)); } } -void stopTimer(TimingStatsElements L, uint64_t statisticsTimerStart) +void stopTimer(TimingStatsElements L, uint32_t statisticsTimerStart) { - if (Settings.EnableTimingStats()) { miscStats[L].add(usecPassedSince(statisticsTimerStart)); } + if (Settings.EnableTimingStats()) { miscStats[L].add(usecPassedSince_fast(statisticsTimerStart)); } } -void addMiscTimerStat(TimingStatsElements L, int64_t T) +void addMiscTimerStat(TimingStatsElements L, int32_t T) { if (Settings.EnableTimingStats()) { miscStats[L].add(T); } } diff --git a/src/src/DataStructs/TimingStats.h b/src/src/DataStructs/TimingStats.h index 41126efef..5d70d5dd5 100644 --- a/src/src/DataStructs/TimingStats.h +++ b/src/src/DataStructs/TimingStats.h @@ -142,22 +142,22 @@ enum class TimingStatsElements { class TimingStats { public: - TimingStats(); + TimingStats() = default; - void add(int64_t time); + void add(int32_t duration_usec); void reset(); bool isEmpty() const; float getAvg() const; - uint32_t getMinMax(uint64_t& minVal, - uint64_t& maxVal) const; - bool thresholdExceeded(const uint64_t& threshold) const; + uint32_t getMinMax(uint32_t& minVal, + uint32_t& maxVal) const; + bool thresholdExceeded(const uint32_t& threshold) const; private: - float _timeTotal; - uint32_t _count; - uint64_t _maxVal; - uint64_t _minVal; + uint64_t _timeTotal{}; + uint32_t _count{}; + uint32_t _maxVal{}; + uint32_t _minVal = 4294967295; }; @@ -169,25 +169,25 @@ String getMiscStatsName(TimingStatsElements stat); void stopTimerTask(deviceIndex_t T, int F, - uint64_t statisticsTimerStart); + uint32_t statisticsTimerStart); void stopTimerController(protocolIndex_t T, CPlugin::Function F, - uint64_t statisticsTimerStart); + uint32_t statisticsTimerStart); void stopTimer(TimingStatsElements L, - uint64_t statisticsTimerStart); + uint32_t statisticsTimerStart); void addMiscTimerStat(TimingStatsElements L, - int64_t T); + int32_t T); extern std::map pluginStats; extern std::map controllerStats; extern std::map miscStats; extern unsigned long timingstats_last_reset; -# define START_TIMER const uint64_t statisticsTimerStart(getMicros64()); +# define START_TIMER const uint32_t statisticsTimerStart(micros()); # define STOP_TIMER_TASK(T, F) stopTimerTask(T, F, statisticsTimerStart); # define STOP_TIMER_CONTROLLER(T, F) stopTimerController(T, F, statisticsTimerStart); -// #define STOP_TIMER_LOADFILE miscStats[LOADFILE_STATS].add(usecPassedSince(statisticsTimerStart)); +// #define STOP_TIMER_LOADFILE miscStats[LOADFILE_STATS].add(usecPassedSince_fast(statisticsTimerStart)); # define STOP_TIMER(L) stopTimer(TimingStatsElements::L, statisticsTimerStart); # define STOP_TIMER_VAR(L) stopTimer(L, statisticsTimerStart); diff --git a/src/src/ESPEasyCore/ESPEasy_loop.cpp b/src/src/ESPEasyCore/ESPEasy_loop.cpp index d157addb6..128acd099 100644 --- a/src/src/ESPEasyCore/ESPEasy_loop.cpp +++ b/src/src/ESPEasyCore/ESPEasy_loop.cpp @@ -31,17 +31,17 @@ void updateLoopStats() { ++loopCounter_full; if (lastLoopStart == 0) { - lastLoopStart = getMicros64(); + lastLoopStart = micros(); return; } - const int64_t usecSince = usecPassedSince(lastLoopStart); + const int32_t usecSince = usecPassedSince_fast(lastLoopStart); #if FEATURE_TIMING_STATS ADD_TIMER_STAT(LOOP_STATS, usecSince); #endif // if FEATURE_TIMING_STATS loop_usec_duration_total += usecSince; - lastLoopStart = getMicros64(); + lastLoopStart = micros(); if ((usecSince <= 0) || (usecSince > 10000000)) { return; // No loop should take > 10 sec. diff --git a/src/src/Globals/Statistics.cpp b/src/src/Globals/Statistics.cpp index a0cdb5385..1dee64440 100644 --- a/src/src/Globals/Statistics.cpp +++ b/src/src/Globals/Statistics.cpp @@ -18,7 +18,7 @@ unsigned long elapsed50ps = 0; unsigned long loopCounter = 0; unsigned long loopCounterLast = 0; unsigned long loopCounterMax = 1; -uint64_t lastLoopStart = 0; +uint32_t lastLoopStart = 0; unsigned long shortestLoop = 10000000; unsigned long longestLoop = 0; unsigned long loopCounter_full = 1; diff --git a/src/src/Globals/Statistics.h b/src/src/Globals/Statistics.h index 10af6129f..1cb45dabb 100644 --- a/src/src/Globals/Statistics.h +++ b/src/src/Globals/Statistics.h @@ -35,7 +35,7 @@ extern SchedulerTimerID lastMixedSchedulerId_beforereboot; extern unsigned long loopCounter; extern unsigned long loopCounterLast; extern unsigned long loopCounterMax; -extern uint64_t lastLoopStart; +extern uint32_t lastLoopStart; extern unsigned long shortestLoop; extern unsigned long longestLoop; extern unsigned long loopCounter_full; diff --git a/src/src/Helpers/Dallas1WireHelper.h b/src/src/Helpers/Dallas1WireHelper.h index fceab3e5b..9ce548b06 100644 --- a/src/src/Helpers/Dallas1WireHelper.h +++ b/src/src/Helpers/Dallas1WireHelper.h @@ -136,7 +136,7 @@ bool Dallas_is_parasite(const uint8_t ROM[8], /*********************************************************************************************\ * Dallas data from scratchpad \*********************************************************************************************/ -enum struct Dallas_read_result { +enum class Dallas_read_result { OK, NoReply, CRCerr, diff --git a/src/src/Helpers/ESPEasyStatistics.cpp b/src/src/Helpers/ESPEasyStatistics.cpp index d4cfafafa..81e8addd6 100644 --- a/src/src/Helpers/ESPEasyStatistics.cpp +++ b/src/src/Helpers/ESPEasyStatistics.cpp @@ -10,8 +10,8 @@ void stream_json_timing_stats(const TimingStats& stats, long timeSinceLastReset) { - uint64_t minVal, maxVal; - uint64_t count = stats.getMinMax(minVal, maxVal); + uint32_t minVal, maxVal; + uint32_t count = stats.getMinMax(minVal, maxVal); float call_per_sec = static_cast(count) / static_cast(timeSinceLastReset) * 1000.0f; json_number(F("count"), ull2String(count)); diff --git a/src/src/Helpers/msecTimerHandlerStruct.cpp b/src/src/Helpers/msecTimerHandlerStruct.cpp index e3f6ce1d5..2a5862e33 100644 --- a/src/src/Helpers/msecTimerHandlerStruct.cpp +++ b/src/src/Helpers/msecTimerHandlerStruct.cpp @@ -146,7 +146,7 @@ void msecTimerHandlerStruct::recordIdle() { if (is_idle) { return; } - last_exec_time_usec = getMicros64(); + last_exec_time_usec = micros(); is_idle = true; delay(0); // Nothing to do, so leave time for backgroundtasks } @@ -154,5 +154,5 @@ void msecTimerHandlerStruct::recordRunning() { if (!is_idle) { return; } is_idle = false; - total_idle_time_usec += usecPassedSince(last_exec_time_usec); + total_idle_time_usec += usecPassedSince_fast(last_exec_time_usec); } diff --git a/src/src/Helpers/msecTimerHandlerStruct.h b/src/src/Helpers/msecTimerHandlerStruct.h index 6897a7110..fcddae316 100644 --- a/src/src/Helpers/msecTimerHandlerStruct.h +++ b/src/src/Helpers/msecTimerHandlerStruct.h @@ -49,8 +49,8 @@ private: unsigned long max_queue_length; // Compute idle system time - uint64_t last_exec_time_usec; - uint64_t total_idle_time_usec; + uint32_t last_exec_time_usec; + uint32_t total_idle_time_usec; uint32_t last_log_start_time; float idle_time_pct; bool is_idle; diff --git a/src/src/PluginStructs/P005_data_struct.cpp b/src/src/PluginStructs/P005_data_struct.cpp index 4429c69ed..f5caadc6d 100644 --- a/src/src/PluginStructs/P005_data_struct.cpp +++ b/src/src/PluginStructs/P005_data_struct.cpp @@ -76,7 +76,7 @@ P005_data_struct::P005_data_struct(struct EventStruct *event) { \*********************************************************************************************/ bool P005_data_struct::waitState(uint32_t state) { - const uint64_t timeout = getMicros64() + 100; + const uint32_t start = micros(); # ifdef DEBUG_LOGIC_ANALYZER_PIN @@ -86,7 +86,7 @@ bool P005_data_struct::waitState(uint32_t state) while (DIRECT_pinRead(DHT_pin) != state) { - if (usecTimeOutReached(timeout)) { return false; } + if (usecPassedSince_fast(start) >= 100) { return false; } } # ifdef DEBUG_LOGIC_ANALYZER_PIN @@ -166,8 +166,8 @@ bool P005_data_struct::readDHT(struct EventStruct *event) { if (receive_start) { // We know we're now at a "low" state. - uint64_t last_micros = getMicros64(); - uint64_t prev_edge = last_micros; + uint32_t last_micros = micros(); + uint32_t prev_edge = last_micros; for (dht_byte = 0; dht_byte < 5 && !readingAborted; ++dht_byte) { @@ -187,16 +187,16 @@ bool P005_data_struct::readDHT(struct EventStruct *event) { // Keep track of last microsecond the state had not yet changed. // This way we are less dependent on any jitter caused by // the delay call or rise times of the voltage on the pin. - last_micros = getMicros64(); + last_micros = micros(); - if (timeDiff64(prev_edge, last_micros) > 100) { + if (timeDiff(prev_edge, last_micros) > 100) { readingAborted = true; } } if (!readingAborted) { // We know it is less than 100 usec, so it does fit in the uint8_t timings array. - timings[t] = usecPassedSince(prev_edge); + timings[t] = usecPassedSince_fast(prev_edge); prev_edge = last_micros; } else { timings[t] = 255; diff --git a/src/src/PluginStructs/P025_data_struct.cpp b/src/src/PluginStructs/P025_data_struct.cpp index d5e33ddf5..c9e3783fd 100644 --- a/src/src/PluginStructs/P025_data_struct.cpp +++ b/src/src/PluginStructs/P025_data_struct.cpp @@ -233,7 +233,7 @@ bool P025_data_struct::startMeasurement(uint8_t i2cAddress, uint16_t configRegis long P025_data_struct::waitReady025(uint8_t i2cAddress) { - const uint64_t start = getMicros64(); + const uint32_t start = micros(); unsigned long timeout = millis(); bool is_ok = false; @@ -257,7 +257,7 @@ long P025_data_struct::waitReady025(uint8_t i2cAddress) const bool ready = reg.operatingStatus == 1; if (ready && is_ok) { - const long res = usecPassedSince(start); + const long res = usecPassedSince_fast(start); const long sps = (res > 0) ? 1000000 / res : 0; # ifndef BUILD_NO_DEBUG diff --git a/src/src/WebServer/TimingStats.cpp b/src/src/WebServer/TimingStats.cpp index 478795bc3..7c6481db7 100644 --- a/src/src/WebServer/TimingStats.cpp +++ b/src/src/WebServer/TimingStats.cpp @@ -44,7 +44,7 @@ void handle_timingstats() { } - const long timeSinceLastReset = stream_timing_statistics(true); + const int32_t timeSinceLastReset = stream_timing_statistics(true); html_end_table(); html_table_class_normal(); @@ -68,7 +68,7 @@ void handle_timingstats() { // ******************************************************************************** // HTML table formatted timing statistics // ******************************************************************************** -void format_using_threshhold(unsigned long value) { +void format_using_threshhold(uint32_t value) { float value_msec = value / 1000.0f; if (value > TIMING_STATS_THRESHOLD) { @@ -78,9 +78,9 @@ void format_using_threshhold(unsigned long value) { } } -void stream_html_timing_stats(const TimingStats& stats, long timeSinceLastReset) { - uint64_t minVal, maxVal; - const uint64_t c = stats.getMinMax(minVal, maxVal); +void stream_html_timing_stats(const TimingStats& stats, int32_t timeSinceLastReset) { + uint32_t minVal, maxVal; + const uint32_t c = stats.getMinMax(minVal, maxVal); html_TD(); addHtmlInt(c); @@ -112,8 +112,8 @@ void stream_html_timing_stats(const TimingStats& stats, long timeSinceLastReset) format_using_threshhold(maxVal); } -long stream_timing_statistics(bool clearStats) { - const long timeSinceLastReset = timePassedSince(timingstats_last_reset); +int32_t stream_timing_statistics(bool clearStats) { + const int32_t timeSinceLastReset = timePassedSince(timingstats_last_reset); for (auto& x: pluginStats) { if (!x.second.isEmpty()) { diff --git a/src/src/WebServer/TimingStats.h b/src/src/WebServer/TimingStats.h index 352bd353e..b416372f6 100644 --- a/src/src/WebServer/TimingStats.h +++ b/src/src/WebServer/TimingStats.h @@ -12,11 +12,11 @@ void handle_timingstats(); // ******************************************************************************** // HTML table formatted timing statistics // ******************************************************************************** -void format_using_threshhold(unsigned long value); +void format_using_threshhold(uint32_t value); -void stream_html_timing_stats(const TimingStats& stats, long timeSinceLastReset); +void stream_html_timing_stats(const TimingStats& stats, int32_t timeSinceLastReset); -long stream_timing_statistics(bool clearStats); +int32_t stream_timing_statistics(bool clearStats); #endif From 02e2f92e296132ca755bb690a6cd517d59f2f677 Mon Sep 17 00:00:00 2001 From: TD-er Date: Fri, 18 Apr 2025 17:11:55 +0200 Subject: [PATCH 051/564] [1-wire] Fix ESP8266 builds not fitting in IRAM --- src/src/Helpers/Dallas1WireHelper.cpp | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) diff --git a/src/src/Helpers/Dallas1WireHelper.cpp b/src/src/Helpers/Dallas1WireHelper.cpp index 99dbe3354..9bf203678 100644 --- a/src/src/Helpers/Dallas1WireHelper.cpp +++ b/src/src/Helpers/Dallas1WireHelper.cpp @@ -49,7 +49,13 @@ int32_t presence_end{}; void DALLAS_IRAM_ATTR Dallas_pinModeInput(uint32_t gpio_pin_rx, uint32_t gpio_pin_tx) { if (gpio_pin_rx == gpio_pin_tx) { - DIRECT_PINMODE_INPUT_ISR(gpio_pin_rx); // let pin float, pull up will raise level + // let pin float, pull up will raise level +#ifdef ESP8266 + // We're running out of IRAM on ESP8266 + DIRECT_PINMODE_INPUT(gpio_pin_rx); +#else + DIRECT_PINMODE_INPUT_ISR(gpio_pin_rx); +#endif } else { DIRECT_pinWrite_ISR(gpio_pin_tx, 1); } @@ -60,7 +66,12 @@ void DALLAS_IRAM_ATTR Dallas_pinWrite(uint32_t gpio_pin_rx, uint32_t gpio_pin_tx DIRECT_pinWrite_ISR(gpio_pin_tx, pinstate); if (gpio_pin_rx == gpio_pin_tx) { +#ifdef ESP8266 + // We're running out of IRAM on ESP8266 + DIRECT_PINMODE_OUTPUT(gpio_pin_rx); +#else DIRECT_PINMODE_OUTPUT_ISR(gpio_pin_rx); +#endif } } From 382dad51a169060e528d51671ad4c78c778c9944 Mon Sep 17 00:00:00 2001 From: TD-er Date: Sat, 24 May 2025 02:24:44 +0200 Subject: [PATCH 052/564] [ESP32-C5] Add preliminary support for ESP32-C5 with dual band WiFi --- boards/esp32c5cdc-8M.json | 40 +++++ boards/esp32c5cdc.json | 40 +++++ lib/ESPEasySerial/ESPEasySerialType.h | 12 +- .../ESPEasySerial_common_defines.h | 4 +- lib/GPIO_DirectAccess/GPIO_Direct_Access.h | 10 +- lib/ImprovWiFi/src/ImprovTypes.h | 2 + .../src/internal/DotStarEsp32DmaSpiMethod.h | 16 +- lib/NeoPixelBus/src/internal/Esp32_i2s.c | 16 +- lib/NeoPixelBus/src/internal/Esp32_i2s.h | 2 +- lib/NeoPixelBus/src/internal/NeoBusChannel.h | 2 +- .../src/internal/NeoEsp32I2sMethod.h | 8 +- .../src/internal/NeoEsp32RmtMethod.h | 16 +- .../src/internal/NeoEsp32RmtMethod_idf5.h | 20 +-- .../src/internal/NeoEsp32SpiMethod_idf5.h | 2 +- .../src/internal/NeoEspBitBangMethod.cpp | 2 +- platformio.ini | 5 +- platformio_core_defs.ini | 40 ++++- platformio_esp32_envs.ini | 46 ++++- platformio_esp32c5_envs..ini | 29 +++ src/include/ESPEasy_config.h | 2 +- src/include/esp32x_fixes.h | 2 +- src/src/CustomBuild/ESPEasy_buildinfo.h | 8 +- src/src/CustomBuild/define_plugin_sets.h | 2 +- src/src/DataStructs/WiFi_AP_Candidate.cpp | 18 +- src/src/DataStructs/WiFi_AP_Candidate.h | 6 +- src/src/DataStructs_templ/SettingsStruct.cpp | 2 +- src/src/DataTypes/SPI_options.cpp | 2 + src/src/DataTypes/SPI_options.h | 4 + src/src/ESPEasyCore/ESPEasyWifi.cpp | 3 + .../ESPEasyWifi_abstracted_ESP32.cpp | 25 ++- src/src/Helpers/ESPEasy_Storage.cpp | 5 +- src/src/Helpers/Hardware.cpp | 26 +++ src/src/Helpers/Hardware_ADC_cali.h | 2 +- src/src/Helpers/Hardware_GPIO_ESP32C5.cpp | 166 ++++++++++++++++++ src/src/Helpers/Hardware_defines.h | 12 +- .../Helpers/Hardware_device_info_ESP32C5.cpp | 77 +++++++- .../Helpers/Hardware_temperature_sensor.cpp | 4 +- src/src/Helpers/StringGenerator_GPIO.cpp | 3 + src/src/Helpers/StringGenerator_System.cpp | 28 +++ tools/pio/copy_files.py | 8 +- tools/pio/generate_web_flasher_manifest.py | 8 + 41 files changed, 637 insertions(+), 88 deletions(-) create mode 100644 boards/esp32c5cdc-8M.json create mode 100644 boards/esp32c5cdc.json create mode 100644 platformio_esp32c5_envs..ini create mode 100644 src/src/Helpers/Hardware_GPIO_ESP32C5.cpp diff --git a/boards/esp32c5cdc-8M.json b/boards/esp32c5cdc-8M.json new file mode 100644 index 000000000..17a802156 --- /dev/null +++ b/boards/esp32c5cdc-8M.json @@ -0,0 +1,40 @@ +{ + "build": { + "arduino":{ + "ldscript": "esp32c5_out.ld" + }, + "core": "esp32", + "extra_flags": "-DARDUINO_TASMOTA -DARDUINO_USB_MODE=1 -DUSE_USB_CDC_CONSOLE -DESP32_8M -DESP32C5 -DARDUINO_USB_CDC_ON_BOOT=1", + "f_cpu": "160000000L", + "f_flash": "80000000L", + "flash_mode": "qio", + "mcu": "esp32c5", + "variant": "esp32c5", + "partitions": "boards/partitions/esp32_partition_app3520k_spiffs1088k.csv" + }, + "connectivity": [ + "wifi", + "bluetooth" + ], + "debug": { + "default_tool": "esp-builtin", + "onboard_tools": [ + "esp-builtin" + ], + "openocd_target": "esp32c5.cfg" + }, + "frameworks": [ + "arduino", + "espidf" + ], + "name": "Espressif Generic ESP32-C5 >= 8M Flash, ESPEasy 3520k Code/OTA 1088k FS", + "upload": { + "flash_size": "8MB", + "maximum_ram_size": 327680, + "maximum_size": 8388608, + "require_upload_port": true, + "speed": 460800 + }, + "url": "https://docs.espressif.com/projects/espressif-esp-dev-kits/en/latest/esp32c5/esp32-c5-devkitc-1/index.html", + "vendor": "Espressif" + } diff --git a/boards/esp32c5cdc.json b/boards/esp32c5cdc.json new file mode 100644 index 000000000..312d32556 --- /dev/null +++ b/boards/esp32c5cdc.json @@ -0,0 +1,40 @@ +{ + "build": { + "arduino":{ + "ldscript": "esp32c5_out.ld" + }, + "core": "esp32", + "extra_flags": "-DARDUINO_TASMOTA -DARDUINO_USB_MODE=1 -DUSE_USB_CDC_CONSOLE -DESP32_4M -DESP32C5 -DARDUINO_USB_CDC_ON_BOOT=1", + "f_cpu": "160000000L", + "f_flash": "80000000L", + "flash_mode": "qio", + "mcu": "esp32c5", + "variant": "esp32c5", + "partitions": "boards/partitions/esp32_partition_app1810k_spiffs316k.csv" + }, + "connectivity": [ + "wifi", + "bluetooth" + ], + "debug": { + "default_tool": "esp-builtin", + "onboard_tools": [ + "esp-builtin" + ], + "openocd_target": "esp32c5.cfg" + }, + "frameworks": [ + "arduino", + "espidf" + ], + "name": "Espressif Generic ESP32-C5 >= 4M Flash, ESPEasy 1810k Code/OTA 316k FS", + "upload": { + "flash_size": "4MB", + "maximum_ram_size": 327680, + "maximum_size": 4194304, + "require_upload_port": true, + "speed": 460800 + }, + "url": "https://docs.espressif.com/projects/espressif-esp-dev-kits/en/latest/esp32c5/esp32-c5-devkitc-1/index.html", + "vendor": "Espressif" + } diff --git a/lib/ESPEasySerial/ESPEasySerialType.h b/lib/ESPEasySerial/ESPEasySerialType.h index d77ab506b..65d15d5b9 100644 --- a/lib/ESPEasySerial/ESPEasySerialType.h +++ b/lib/ESPEasySerial/ESPEasySerialType.h @@ -22,6 +22,8 @@ # define SOC_RX0 44 # elif CONFIG_IDF_TARGET_ESP32C6 # define SOC_RX0 17 +# elif CONFIG_IDF_TARGET_ESP32C5 +# define SOC_RX0 12 # elif CONFIG_IDF_TARGET_ESP32C3 # define SOC_RX0 20 # elif CONFIG_IDF_TARGET_ESP32C2 @@ -36,6 +38,8 @@ # define SOC_TX0 43 # elif CONFIG_IDF_TARGET_ESP32C6 # define SOC_TX0 16 +# elif CONFIG_IDF_TARGET_ESP32C5 +# define SOC_TX0 11 # elif CONFIG_IDF_TARGET_ESP32C3 # define SOC_TX0 21 # elif CONFIG_IDF_TARGET_ESP32C2 @@ -50,7 +54,7 @@ # define SOC_RX1 13 # elif CONFIG_IDF_TARGET_ESP32S2 # define SOC_RX1 18 -# elif CONFIG_IDF_TARGET_ESP32C2 || CONFIG_IDF_TARGET_ESP32C3 || CONFIG_IDF_TARGET_ESP32C6 +# elif CONFIG_IDF_TARGET_ESP32C2 || CONFIG_IDF_TARGET_ESP32C3 || CONFIG_IDF_TARGET_ESP32C5 || CONFIG_IDF_TARGET_ESP32C6 # define SOC_RX1 4 # elif CONFIG_IDF_TARGET_ESP32S3 # define SOC_RX1 15 @@ -62,7 +66,7 @@ # define SOC_TX1 15 # elif CONFIG_IDF_TARGET_ESP32S2 # define SOC_TX1 17 -# elif CONFIG_IDF_TARGET_ESP32C2 || CONFIG_IDF_TARGET_ESP32C3 || CONFIG_IDF_TARGET_ESP32C6 +# elif CONFIG_IDF_TARGET_ESP32C2 || CONFIG_IDF_TARGET_ESP32C3 || CONFIG_IDF_TARGET_ESP32C5 || CONFIG_IDF_TARGET_ESP32C6 # define SOC_TX1 5 # elif CONFIG_IDF_TARGET_ESP32S3 # define SOC_TX1 16 @@ -80,6 +84,8 @@ # define SOC_RX2 19 # elif CONFIG_IDF_TARGET_ESP32C6 # define SOC_RX2 6 +# elif CONFIG_IDF_TARGET_ESP32C5 +# define SOC_RX2 6 # else // if CONFIG_IDF_TARGET_ESP32 # define SOC_RX2 -1 # endif // if CONFIG_IDF_TARGET_ESP32 @@ -92,6 +98,8 @@ # define SOC_TX2 20 # elif CONFIG_IDF_TARGET_ESP32C6 # define SOC_TX2 7 +# elif CONFIG_IDF_TARGET_ESP32C5 +# define SOC_TX2 7 # else // if CONFIG_IDF_TARGET_ESP32 # define SOC_TX2 -1 # endif // if CONFIG_IDF_TARGET_ESP32 diff --git a/lib/ESPEasySerial/ESPEasySerial_common_defines.h b/lib/ESPEasySerial/ESPEasySerial_common_defines.h index 88d2a508c..6d8ce15dc 100644 --- a/lib/ESPEasySerial/ESPEasySerial_common_defines.h +++ b/lib/ESPEasySerial/ESPEasySerial_common_defines.h @@ -8,7 +8,7 @@ #ifndef SOC_UART_NUM # ifdef ESP8266 # define SOC_UART_NUM 2 -# elif defined(ESP32_CLASSIC) || defined(ESP32S2) || defined(ESP32S3) || defined(ESP32C2) || defined(ESP32C3) || defined(ESP32C6) +# elif defined(ESP32_CLASSIC) || defined(ESP32S2) || defined(ESP32S3) || defined(ESP32C2) || defined(ESP32C3) || defined(ESP32C5) || defined(ESP32C6) # include # else // ifdef ESP8266 static_assert(false, "Implement processor architecture"); @@ -40,7 +40,7 @@ static_assert(false, "Implement processor architecture"); CONFIG_IDF_TARGET_ESP32S2 || // support USB via USBCDC CONFIG_IDF_TARGET_ESP32S3 // support USB via HWCDC using JTAG interface or USBCDC */ -# if CONFIG_IDF_TARGET_ESP32C3 || CONFIG_IDF_TARGET_ESP32C6 || CONFIG_IDF_TARGET_ESP32S2 || CONFIG_IDF_TARGET_ESP32S3 +# if CONFIG_IDF_TARGET_ESP32C3 || CONFIG_IDF_TARGET_ESP32C5 || CONFIG_IDF_TARGET_ESP32C6 || CONFIG_IDF_TARGET_ESP32S2 || CONFIG_IDF_TARGET_ESP32S3 // #if CONFIG_TINYUSB_CDC_ENABLED // This define is not recognized here so use USE_USB_CDC_CONSOLE # ifdef USE_USB_CDC_CONSOLE diff --git a/lib/GPIO_DirectAccess/GPIO_Direct_Access.h b/lib/GPIO_DirectAccess/GPIO_Direct_Access.h index 36dd37c1f..24d4457af 100644 --- a/lib/GPIO_DirectAccess/GPIO_Direct_Access.h +++ b/lib/GPIO_DirectAccess/GPIO_Direct_Access.h @@ -152,7 +152,7 @@ void DIRECT_PINMODE_INPUT_ISR(IO_REG_TYPE pin); static inline __attribute__((always_inline)) IO_REG_TYPE directRead(IO_REG_TYPE pin) { -#if CONFIG_IDF_TARGET_ESP32C2 || CONFIG_IDF_TARGET_ESP32C3 +#if CONFIG_IDF_TARGET_ESP32C2 || CONFIG_IDF_TARGET_ESP32C3 || CONFIG_IDF_TARGET_ESP32C5 return (GPIO.in.val >> pin) & 0x1; #elif CONFIG_IDF_TARGET_ESP32C6 if ( pin < 32 ) @@ -172,7 +172,7 @@ IO_REG_TYPE directRead(IO_REG_TYPE pin) static inline __attribute__((always_inline)) void directWriteLow(IO_REG_TYPE pin) { -#if CONFIG_IDF_TARGET_ESP32C2 || CONFIG_IDF_TARGET_ESP32C3 +#if CONFIG_IDF_TARGET_ESP32C2 || CONFIG_IDF_TARGET_ESP32C3 || CONFIG_IDF_TARGET_ESP32C5 GPIO.out_w1tc.val = ((uint32_t)1 << pin); #elif CONFIG_IDF_TARGET_ESP32C6 if ( pin < 32 ) @@ -191,7 +191,7 @@ void directWriteLow(IO_REG_TYPE pin) static inline __attribute__((always_inline)) void directWriteHigh(IO_REG_TYPE pin) { -#if CONFIG_IDF_TARGET_ESP32C2 || CONFIG_IDF_TARGET_ESP32C3 +#if CONFIG_IDF_TARGET_ESP32C2 || CONFIG_IDF_TARGET_ESP32C3 || CONFIG_IDF_TARGET_ESP32C5 GPIO.out_w1ts.val = ((uint32_t)1 << pin); #elif CONFIG_IDF_TARGET_ESP32C6 if ( pin < 32 ) @@ -210,7 +210,7 @@ void directWriteHigh(IO_REG_TYPE pin) static inline __attribute__((always_inline)) void directModeInput(IO_REG_TYPE pin) { -#if CONFIG_IDF_TARGET_ESP32C2 || CONFIG_IDF_TARGET_ESP32C3 +#if CONFIG_IDF_TARGET_ESP32C2 || CONFIG_IDF_TARGET_ESP32C3 || CONFIG_IDF_TARGET_ESP32C5 GPIO.enable_w1tc.val = ((uint32_t)1 << (pin)); #else if ( GPIO_IS_VALID_GPIO(pin) ) @@ -243,7 +243,7 @@ void directModeInput(IO_REG_TYPE pin) static inline __attribute__((always_inline)) void directModeOutput(IO_REG_TYPE pin) { -#if CONFIG_IDF_TARGET_ESP32C2 || CONFIG_IDF_TARGET_ESP32C3 +#if CONFIG_IDF_TARGET_ESP32C2 || CONFIG_IDF_TARGET_ESP32C3 || CONFIG_IDF_TARGET_ESP32C5 GPIO.enable_w1ts.val = ((uint32_t)1 << (pin)); #else if ( GPIO_IS_VALID_GPIO(pin) && pin <= 33 ) // pins above 33 can be only inputs diff --git a/lib/ImprovWiFi/src/ImprovTypes.h b/lib/ImprovWiFi/src/ImprovTypes.h index 3e77a7cf3..bdd43e964 100644 --- a/lib/ImprovWiFi/src/ImprovTypes.h +++ b/lib/ImprovWiFi/src/ImprovTypes.h @@ -87,6 +87,8 @@ struct ImprovWiFiParamsStruct { "ESP32-C2" #elif defined(CONFIG_IDF_TARGET_ESP32C3) "ESP32-C3" +#elif defined(CONFIG_IDF_TARGET_ESP32C5) + "ESP32-C5" #elif defined(CONFIG_IDF_TARGET_ESP32C6) "ESP32-C6" #elif defined(CONFIG_IDF_TARGET_ESP32H2) diff --git a/lib/NeoPixelBus/src/internal/DotStarEsp32DmaSpiMethod.h b/lib/NeoPixelBus/src/internal/DotStarEsp32DmaSpiMethod.h index 953a216e7..398e03344 100644 --- a/lib/NeoPixelBus/src/internal/DotStarEsp32DmaSpiMethod.h +++ b/lib/NeoPixelBus/src/internal/DotStarEsp32DmaSpiMethod.h @@ -29,12 +29,12 @@ License along with NeoPixel. If not, see #include "driver/spi_master.h" -#if (defined(CONFIG_IDF_TARGET_ESP32C3) || defined(CONFIG_IDF_TARGET_ESP32C2) || defined(CONFIG_IDF_TARGET_ESP32C6)) && !defined(HSPI_HOST) +#if (defined(CONFIG_IDF_TARGET_ESP32C5) || defined(CONFIG_IDF_TARGET_ESP32C3) || defined(CONFIG_IDF_TARGET_ESP32C2) || defined(CONFIG_IDF_TARGET_ESP32C6)) && !defined(HSPI_HOST) // HSPI_HOST depreciated in C3 #define HSPI_HOST SPI2_HOST #endif -#if !defined(CONFIG_IDF_TARGET_ESP32S2) && !defined(CONFIG_IDF_TARGET_ESP32C3) && !defined(CONFIG_IDF_TARGET_ESP32C2) && !defined(CONFIG_IDF_TARGET_ESP32C6) +#if !defined(CONFIG_IDF_TARGET_ESP32S2) && !defined(CONFIG_IDF_TARGET_ESP32C5) && !defined(CONFIG_IDF_TARGET_ESP32C3) && !defined(CONFIG_IDF_TARGET_ESP32C2) && !defined(CONFIG_IDF_TARGET_ESP32C6) class Esp32VspiBus { public: @@ -52,7 +52,7 @@ public: const static int ParallelBits = 1; }; -#if !defined(CONFIG_IDF_TARGET_ESP32S2) && !defined(CONFIG_IDF_TARGET_ESP32C3) && !defined(CONFIG_IDF_TARGET_ESP32C2) && !defined(CONFIG_IDF_TARGET_ESP32C6) +#if !defined(CONFIG_IDF_TARGET_ESP32S2) && !defined(CONFIG_IDF_TARGET_ESP32C5) && !defined(CONFIG_IDF_TARGET_ESP32C3) && !defined(CONFIG_IDF_TARGET_ESP32C2) && !defined(CONFIG_IDF_TARGET_ESP32C6) class Esp32Vspi2BitBus { public: @@ -70,7 +70,7 @@ public: const static int ParallelBits = 2; }; -#if !defined(CONFIG_IDF_TARGET_ESP32S2) && !defined(CONFIG_IDF_TARGET_ESP32C3) && !defined(CONFIG_IDF_TARGET_ESP32C2) && !defined(CONFIG_IDF_TARGET_ESP32C6) +#if !defined(CONFIG_IDF_TARGET_ESP32S2) && !defined(CONFIG_IDF_TARGET_ESP32C5) && !defined(CONFIG_IDF_TARGET_ESP32C3) && !defined(CONFIG_IDF_TARGET_ESP32C2) && !defined(CONFIG_IDF_TARGET_ESP32C6) class Esp32Vspi4BitBus { public: @@ -174,7 +174,7 @@ public: // If pins aren't specified, initialize bus with just the default SCK and MOSI pins for the SPI peripheral (no SS, no >1-bit pins) void Initialize() { -#if !defined(CONFIG_IDF_TARGET_ESP32S2) && !defined(CONFIG_IDF_TARGET_ESP32C3) && !defined(CONFIG_IDF_TARGET_ESP32C2) && !defined(CONFIG_IDF_TARGET_ESP32C6) +#if !defined(CONFIG_IDF_TARGET_ESP32S2) && !defined(CONFIG_IDF_TARGET_ESP32C5) && !defined(CONFIG_IDF_TARGET_ESP32C3) && !defined(CONFIG_IDF_TARGET_ESP32C2) && !defined(CONFIG_IDF_TARGET_ESP32C6) if (T_SPIBUS::SpiHostDevice == VSPI_HOST) { Initialize(SCK, -1, MOSI, -1, -1, -1); @@ -277,7 +277,7 @@ private: int8_t _ssPin; }; -#if !defined(CONFIG_IDF_TARGET_ESP32S2) && !defined(CONFIG_IDF_TARGET_ESP32C3) && !defined(CONFIG_IDF_TARGET_ESP32C2) && !defined(CONFIG_IDF_TARGET_ESP32C6) +#if !defined(CONFIG_IDF_TARGET_ESP32S2) && !defined(CONFIG_IDF_TARGET_ESP32C5) && !defined(CONFIG_IDF_TARGET_ESP32C3) && !defined(CONFIG_IDF_TARGET_ESP32C2) && !defined(CONFIG_IDF_TARGET_ESP32C6) // Clock Speed and Default Definitions for DotStarEsp32DmaVspi typedef DotStarEsp32DmaSpiMethod DotStarEsp32DmaVspi40MhzMethod; typedef DotStarEsp32DmaSpiMethod DotStarEsp32DmaVspi20MhzMethod; @@ -303,7 +303,7 @@ typedef DotStarEsp32DmaSpiMethod DotStarEsp32DmaHspiHz typedef DotStarEsp32DmaHspi10MhzMethod DotStarEsp32DmaHspiMethod; -#if !defined(CONFIG_IDF_TARGET_ESP32S2) && !defined(CONFIG_IDF_TARGET_ESP32C3) && !defined(CONFIG_IDF_TARGET_ESP32C2) && !defined(CONFIG_IDF_TARGET_ESP32C6) +#if !defined(CONFIG_IDF_TARGET_ESP32S2) && !defined(CONFIG_IDF_TARGET_ESP32C5) && !defined(CONFIG_IDF_TARGET_ESP32C3) && !defined(CONFIG_IDF_TARGET_ESP32C2) && !defined(CONFIG_IDF_TARGET_ESP32C6) // Clock Speed and Default Definitions for DotStarEsp32DmaVspi2Bit typedef DotStarEsp32DmaSpiMethod DotStarEsp32DmaVspi2Bit40MhzMethod; typedef DotStarEsp32DmaSpiMethod DotStarEsp32DmaVspi2Bit20MhzMethod; @@ -329,7 +329,7 @@ typedef DotStarEsp32DmaSpiMethod DotStarEsp32DmaHsp typedef DotStarEsp32DmaHspi2Bit10MhzMethod DotStarEsp32DmaHspi2BitMethod; -#if !defined(CONFIG_IDF_TARGET_ESP32S2) && !defined(CONFIG_IDF_TARGET_ESP32C3) && !defined(CONFIG_IDF_TARGET_ESP32C2) && !defined(CONFIG_IDF_TARGET_ESP32C6) +#if !defined(CONFIG_IDF_TARGET_ESP32S2) && !defined(CONFIG_IDF_TARGET_ESP32C5) && !defined(CONFIG_IDF_TARGET_ESP32C3) && !defined(CONFIG_IDF_TARGET_ESP32C2) && !defined(CONFIG_IDF_TARGET_ESP32C6) // Clock Speed and Default Definitions for DotStarEsp32DmaVspi4Bit typedef DotStarEsp32DmaSpiMethod DotStarEsp32DmaVspi4Bit40MhzMethod; typedef DotStarEsp32DmaSpiMethod DotStarEsp32DmaVspi4Bit20MhzMethod; diff --git a/lib/NeoPixelBus/src/internal/Esp32_i2s.c b/lib/NeoPixelBus/src/internal/Esp32_i2s.c index 5823b1875..c4ff33239 100644 --- a/lib/NeoPixelBus/src/internal/Esp32_i2s.c +++ b/lib/NeoPixelBus/src/internal/Esp32_i2s.c @@ -21,7 +21,7 @@ // ESP32C3/S3 I2S is not supported yet due to significant changes to interface #ifndef CONFIG_SOC_RMT_TX_CANDIDATES_PER_GROUP // turn this off with something new from idf5.1 -#if !defined(CONFIG_IDF_TARGET_ESP32C3) && !defined(CONFIG_IDF_TARGET_ESP32S3) && !defined(CONFIG_IDF_TARGET_ESP32C2) +#if !defined(CONFIG_IDF_TARGET_ESP32C5) && !defined(CONFIG_IDF_TARGET_ESP32C3) && !defined(CONFIG_IDF_TARGET_ESP32S3) && !defined(CONFIG_IDF_TARGET_ESP32C2) #include #include @@ -113,7 +113,7 @@ typedef struct { static uint8_t i2s_silence_buf[I2S_DMA_SILENCE_SIZE] = { 0 }; -#if !defined(CONFIG_IDF_TARGET_ESP32S2) && !defined(CONFIG_IDF_TARGET_ESP32C3) +#if !defined(CONFIG_IDF_TARGET_ESP32S2) && !defined(CONFIG_IDF_TARGET_ESP32C5) && !defined(CONFIG_IDF_TARGET_ESP32C3) // (I2S_NUM_MAX == 2) static i2s_bus_t I2S[I2S_NUM_MAX] = { {&I2S0, -1, -1, -1, -1, 0, NULL, NULL, i2s_silence_buf, I2S_DMA_SILENCE_SIZE, NULL, I2S_DMA_BLOCK_COUNT_DEFAULT, 0, 0, I2s_Is_Idle}, @@ -187,7 +187,7 @@ esp_err_t i2sSetClock(uint8_t bus_num, uint8_t div_num, uint8_t div_b, uint8_t d typeof(i2s->clkm_conf) clkm_conf; clkm_conf.val = 0; -#if !defined(CONFIG_IDF_TARGET_ESP32S2) && !defined(CONFIG_IDF_TARGET_ESP32C3) +#if !defined(CONFIG_IDF_TARGET_ESP32S2) && !defined(CONFIG_IDF_TARGET_ESP32C5) && !defined(CONFIG_IDF_TARGET_ESP32C3) clkm_conf.clka_en = 0; #else clkm_conf.clk_sel = 2; @@ -222,7 +222,7 @@ void i2sSetPins(uint8_t bus_num, int8_t out, bool invert) { pinMode(out, OUTPUT); int i2sSignal; -#if !defined(CONFIG_IDF_TARGET_ESP32S2) && !defined(CONFIG_IDF_TARGET_ESP32C3) +#if !defined(CONFIG_IDF_TARGET_ESP32S2) && !defined(CONFIG_IDF_TARGET_ESP32C5) && !defined(CONFIG_IDF_TARGET_ESP32C3) // (I2S_NUM_MAX == 2) if (bus_num == 1) { i2sSignal = I2S1O_DATA_OUT23_IDX; @@ -268,7 +268,7 @@ void i2sInit(uint8_t bus_num, return; } -#if !defined(CONFIG_IDF_TARGET_ESP32S2) && !defined(CONFIG_IDF_TARGET_ESP32C3) +#if !defined(CONFIG_IDF_TARGET_ESP32S2) && !defined(CONFIG_IDF_TARGET_ESP32C5) && !defined(CONFIG_IDF_TARGET_ESP32C3) // (I2S_NUM_MAX == 2) if (bus_num) { periph_module_enable(PERIPH_I2S1_MODULE); @@ -310,7 +310,7 @@ void i2sInit(uint8_t bus_num, lc_conf.out_eof_mode = 1; i2s->lc_conf.val = lc_conf.val; -#if !defined(CONFIG_IDF_TARGET_ESP32S2) && !defined(CONFIG_IDF_TARGET_ESP32C3) +#if !defined(CONFIG_IDF_TARGET_ESP32S2) && !defined(CONFIG_IDF_TARGET_ESP32C5) && !defined(CONFIG_IDF_TARGET_ESP32C3) i2s->pdm_conf.pcm2pdm_conv_en = 0; i2s->pdm_conf.pdm2pcm_conv_en = 0; #endif @@ -341,7 +341,7 @@ void i2sInit(uint8_t bus_num, i2s->fifo_conf.tx_fifo_mod_force_en = 1; -#if !defined(CONFIG_IDF_TARGET_ESP32S2) && !defined(CONFIG_IDF_TARGET_ESP32C3) +#if !defined(CONFIG_IDF_TARGET_ESP32S2) && !defined(CONFIG_IDF_TARGET_ESP32C5) && !defined(CONFIG_IDF_TARGET_ESP32C3) i2s->pdm_conf.rx_pdm_en = 0; i2s->pdm_conf.tx_pdm_en = 0; #endif @@ -351,7 +351,7 @@ void i2sInit(uint8_t bus_num, // enable intr in cpu // int i2sIntSource; -#if !defined(CONFIG_IDF_TARGET_ESP32S2) && !defined(CONFIG_IDF_TARGET_ESP32C3) +#if !defined(CONFIG_IDF_TARGET_ESP32S2) && !defined(CONFIG_IDF_TARGET_ESP32C5) && !defined(CONFIG_IDF_TARGET_ESP32C3) // (I2S_NUM_MAX == 2) if (bus_num == 1) { i2sIntSource = ETS_I2S1_INTR_SOURCE; diff --git a/lib/NeoPixelBus/src/internal/Esp32_i2s.h b/lib/NeoPixelBus/src/internal/Esp32_i2s.h index bfc024a8c..b3df5def0 100644 --- a/lib/NeoPixelBus/src/internal/Esp32_i2s.h +++ b/lib/NeoPixelBus/src/internal/Esp32_i2s.h @@ -4,7 +4,7 @@ #ifndef CONFIG_SOC_RMT_TX_CANDIDATES_PER_GROUP // turn this off with something new from idf5.1 // ESP32C3 I2S is not supported yet due to significant changes to interface -#if defined(ARDUINO_ARCH_ESP32) && !defined(CONFIG_IDF_TARGET_ESP32C3) && !defined(CONFIG_IDF_TARGET_ESP32C2) +#if defined(ARDUINO_ARCH_ESP32) && !defined(CONFIG_IDF_TARGET_ESP32C5) && !defined(CONFIG_IDF_TARGET_ESP32C3) && !defined(CONFIG_IDF_TARGET_ESP32C2) #ifdef __cplusplus extern "C" { diff --git a/lib/NeoPixelBus/src/internal/NeoBusChannel.h b/lib/NeoPixelBus/src/internal/NeoBusChannel.h index 5fdb131bf..87f90d614 100644 --- a/lib/NeoPixelBus/src/internal/NeoBusChannel.h +++ b/lib/NeoPixelBus/src/internal/NeoBusChannel.h @@ -12,7 +12,7 @@ enum NeoBusChannel NeoBusChannel_0, NeoBusChannel_1, -#if !defined(CONFIG_IDF_TARGET_ESP32C3) && !defined(CONFIG_IDF_TARGET_ESP32C2) && !defined(CONFIG_IDF_TARGET_ESP32C6) +#if !defined(CONFIG_IDF_TARGET_ESP32C5) && !defined(CONFIG_IDF_TARGET_ESP32C3) && !defined(CONFIG_IDF_TARGET_ESP32C2) && !defined(CONFIG_IDF_TARGET_ESP32C6) NeoBusChannel_2, diff --git a/lib/NeoPixelBus/src/internal/NeoEsp32I2sMethod.h b/lib/NeoPixelBus/src/internal/NeoEsp32I2sMethod.h index 2afe6d5aa..374014261 100644 --- a/lib/NeoPixelBus/src/internal/NeoEsp32I2sMethod.h +++ b/lib/NeoPixelBus/src/internal/NeoEsp32I2sMethod.h @@ -28,7 +28,7 @@ License along with NeoPixel. If not, see #if ESP_IDF_VERSION_MAJOR <= 4 // ESP32C3 I2S is not supported yet due to significant changes to interface -#if defined(ARDUINO_ARCH_ESP32) && !defined(CONFIG_IDF_TARGET_ESP32C3) +#if defined(ARDUINO_ARCH_ESP32) && !defined(CONFIG_IDF_TARGET_ESP32C5) && !defined(CONFIG_IDF_TARGET_ESP32C3) extern "C" { @@ -305,7 +305,7 @@ typedef NeoEsp32I2sMethodBase NeoEsp32I2s0400KbpsInvertedMethod; typedef NeoEsp32I2sMethodBase NeoEsp32I2s0Apa106InvertedMethod; -#if !defined(CONFIG_IDF_TARGET_ESP32S2) && !defined(CONFIG_IDF_TARGET_ESP32C3) +#if !defined(CONFIG_IDF_TARGET_ESP32S2) && !defined(CONFIG_IDF_TARGET_ESP32C5) && !defined(CONFIG_IDF_TARGET_ESP32C3) // (I2S_NUM_MAX == 2) typedef NeoEsp32I2sMethodBase NeoEsp32I2s1Ws2812xMethod; @@ -347,7 +347,7 @@ typedef NeoEsp32I2sMethodBase NeoEs typedef NeoEsp32RmtMethodBase NeoEsp32Rmt1800KbpsMethod; typedef NeoEsp32RmtMethodBase NeoEsp32Rmt1400KbpsMethod; -#if !defined(CONFIG_IDF_TARGET_ESP32C3) +#if !defined(CONFIG_IDF_TARGET_ESP32C3) && !defined(CONFIG_IDF_TARGET_ESP32C5) typedef NeoEsp32RmtMethodBase NeoEsp32Rmt2Ws2811Method; typedef NeoEsp32RmtMethodBase NeoEsp32Rmt2Ws2812xMethod; @@ -765,7 +765,7 @@ typedef NeoEsp32RmtMethodBase NeoEsp32Rmt1800KbpsInvertedMethod; typedef NeoEsp32RmtMethodBase NeoEsp32Rmt1400KbpsInvertedMethod; -#if !defined(CONFIG_IDF_TARGET_ESP32C3) +#if !defined(CONFIG_IDF_TARGET_ESP32C3) && !defined(CONFIG_IDF_TARGET_ESP32C5) typedef NeoEsp32RmtMethodBase NeoEsp32Rmt2Ws2811InvertedMethod; typedef NeoEsp32RmtMethodBase NeoEsp32Rmt2Ws2812xInvertedMethod; @@ -839,13 +839,13 @@ typedef NeoEsp32RmtMethodBase NeoEs typedef NeoEsp32RmtMethodBase NeoEsp32Rmt1800KbpsMethod; typedef NeoEsp32RmtMethodBase NeoEsp32Rmt1400KbpsMethod; -#if !defined(CONFIG_IDF_TARGET_ESP32C3) && !defined(CONFIG_IDF_TARGET_ESP32C6) +#if !defined(CONFIG_IDF_TARGET_ESP32C3) && !defined(CONFIG_IDF_TARGET_ESP32C5) && !defined(CONFIG_IDF_TARGET_ESP32C6) typedef NeoEsp32RmtMethodBase NeoEsp32Rmt2Ws2811Method; typedef NeoEsp32RmtMethodBase NeoEsp32Rmt2Ws2812xMethod; @@ -653,7 +653,7 @@ typedef NeoEsp32RmtMethodBase NeoE typedef NeoEsp32RmtMethodBase NeoEsp32Rmt7400KbpsMethod; #endif // !defined(CONFIG_IDF_TARGET_ESP32S2) -#endif // !defined(CONFIG_IDF_TARGET_ESP32C3) && !defined(CONFIG_IDF_TARGET_ESP32C3) +#endif // !defined(CONFIG_IDF_TARGET_ESP32C3) && !defined(CONFIG_IDF_TARGET_ESP32C5) && !defined(CONFIG_IDF_TARGET_ESP32C5) && !defined(CONFIG_IDF_TARGET_ESP32C3) // inverted typedef NeoEsp32RmtMethodBase NeoEsp32RmtNWs2811InvertedMethod; @@ -689,7 +689,7 @@ typedef NeoEsp32RmtMethodBase NeoEsp32Rmt1800KbpsInvertedMethod; typedef NeoEsp32RmtMethodBase NeoEsp32Rmt1400KbpsInvertedMethod; -#if !defined(CONFIG_IDF_TARGET_ESP32C3) && !defined(CONFIG_IDF_TARGET_ESP32C6) +#if !defined(CONFIG_IDF_TARGET_ESP32C3) && !defined(CONFIG_IDF_TARGET_ESP32C5) && !defined(CONFIG_IDF_TARGET_ESP32C6) typedef NeoEsp32RmtMethodBase NeoEsp32Rmt2Ws2811InvertedMethod; typedef NeoEsp32RmtMethodBase NeoEsp32Rmt2Ws2812xInvertedMethod; @@ -763,13 +763,13 @@ typedef NeoEsp32RmtMethodBase= 5 -#if (defined(CONFIG_IDF_TARGET_ESP32C3) || defined(CONFIG_IDF_TARGET_ESP32C2) || defined(CONFIG_IDF_TARGET_ESP32C6)) && !defined(HSPI_HOST) +#if (defined(CONFIG_IDF_TARGET_ESP32C5) || defined(CONFIG_IDF_TARGET_ESP32C3) || defined(CONFIG_IDF_TARGET_ESP32C2) || defined(CONFIG_IDF_TARGET_ESP32C6)) && !defined(HSPI_HOST) // HSPI_HOST depreciated in C3 #define HSPI_HOST SPI2_HOST #endif diff --git a/lib/NeoPixelBus/src/internal/NeoEspBitBangMethod.cpp b/lib/NeoPixelBus/src/internal/NeoEspBitBangMethod.cpp index 01499fe13..7c66f7e40 100644 --- a/lib/NeoPixelBus/src/internal/NeoEspBitBangMethod.cpp +++ b/lib/NeoPixelBus/src/internal/NeoEspBitBangMethod.cpp @@ -29,7 +29,7 @@ License along with NeoPixel. If not, see #include // ESP32C3 I2S is not supported yet -#if !defined(CONFIG_IDF_TARGET_ESP32C3) && !defined(CONFIG_IDF_TARGET_ESP32C2) && !defined(CONFIG_IDF_TARGET_ESP32C6) +#if !defined(CONFIG_IDF_TARGET_ESP32C5) && !defined(CONFIG_IDF_TARGET_ESP32C3) && !defined(CONFIG_IDF_TARGET_ESP32C2) && !defined(CONFIG_IDF_TARGET_ESP32C6) #if !defined(ARDUINO_ARCH_ESP8266) #include "soc/gpio_periph.h" #endif diff --git a/platformio.ini b/platformio.ini index 0d8b3f33c..6e461dd30 100644 --- a/platformio.ini +++ b/platformio.ini @@ -22,16 +22,19 @@ extra_configs = platformio_esp82xx_envs.ini platformio_esp32_envs.ini platformio_esp32_solo1.ini - platformio_esp32c3_envs.ini platformio_esp32s2_envs.ini platformio_esp32s3_envs.ini platformio_special_envs.ini platformio_esp32c2_envs.ini + platformio_esp32c3_envs.ini + platformio_esp32c5_envs.ini platformio_esp32c6_envs.ini ;default_envs = normal_ESP32_4M default_envs = max_ESP32_16M8M_LittleFS_ETH +;default_envs = max_ESP32c5_8M1M_LittleFS_CDC_ETH + ;default_envs = normal_ESP32c6_4M316k_LittleFS_CDC ; default_envs = custom_ESP8266_4M1M diff --git a/platformio_core_defs.ini b/platformio_core_defs.ini index a13e8b50e..1591d67d4 100644 --- a/platformio_core_defs.ini +++ b/platformio_core_defs.ini @@ -195,10 +195,12 @@ lib_extra_dirs = lib/lib_ssl -; ESP_IDF 5.3.1 -[core_esp32_IDF5_3_2__3_1_0_LittleFS] -platform = https://github.com/Jason2866/platform-espressif32.git#Arduino/IDF54 -platform_packages = framework-arduinoespressif32 @ https://github.com/Jason2866/esp32-arduino-lib-builder/releases/download/3538/framework-arduinoespressif32-all-release_v5.4-8f5ad6d7.zip +; ESP_IDF 5.4.1 +[core_esp32_IDF5_4_1__3_2_0_LittleFS] +;platform = https://github.com/Jason2866/platform-espressif32.git#Arduino/IDF54 +;platform_packages = framework-arduinoespressif32 @ https://github.com/Jason2866/esp32-arduino-lib-builder/releases/download/3538/framework-arduinoespressif32-all-release_v5.4-8f5ad6d7.zip +platform = https://github.com/Jason2866/platform-espressif32.git#Arduino/IDF55 +platform_packages = build_flags = -DESP32_STAGE -DESP_IDF_VERSION_MAJOR=5 -DLIBRARIES_NO_LOG=1 @@ -223,6 +225,36 @@ lib_ignore = lib_extra_dirs = lib/lib_ssl + +; ESP_IDF 5.5.0 +[core_esp32_IDF5_5_0__3_2_0_LittleFS] +platform = https://github.com/Jason2866/platform-espressif32.git#Arduino/IDF55 +platform_packages = +build_flags = -DESP32_STAGE + -DESP_IDF_VERSION_MAJOR=5 + -DLIBRARIES_NO_LOG=1 + -DDISABLE_SC16IS752_SPI +; -DCONFIG_PM_ENABLE=0 + -DETH_TYPE_JL1101_SUPPORTED + ; PR_9453_FLUSH_TO_CLEAR_REVERTED + -DPR_9453_FLUSH_TO_CLEAR=clear +; -DCONFIG_LWIP_L2_TO_L3_COPY +; -DETH_SPI_SUPPORTS_NO_IRQ=1 + -DCONFIG_FREERTOS_USE_TICKLESS_IDLE=1 + -DCONFIG_FREERTOS_IDLE_TIME_BEFORE_SLEEP=3 + -DNEOPIXEL_ESP32_RMT_DEFAULT + -DCRON_USE_LOCAL_TIME + -I$PROJECT_DIR/src/include + -include "sdkconfig.h" + -include "ESPEasy_config.h" + -include "esp32x_fixes.h" + -DUPDATE_NOCRYPT +; -Wnull-dereference +lib_ignore = +lib_extra_dirs = + lib/lib_ssl + + ; Regarding the define PR_9453_FLUSH_TO_CLEAR ; See: ; https://github.com/espressif/arduino-esp32/pull/8871/files diff --git a/platformio_esp32_envs.ini b/platformio_esp32_envs.ini index e19c70d5f..bf258e2db 100644 --- a/platformio_esp32_envs.ini +++ b/platformio_esp32_envs.ini @@ -36,7 +36,7 @@ lib_ignore = [esp32_base_idf5] -extends = common, core_esp32_IDF5_3_2__3_1_0_LittleFS +extends = common, core_esp32_IDF5_4_1__3_2_0_LittleFS upload_speed = 460800 upload_before_reset = default_reset upload_after_reset = hard_reset @@ -55,7 +55,7 @@ extra_scripts = pre:tools/pio/pre_esp32.py ; However LTO cannot optimize builds with text section literals and thus will result in quite a lot larger builds (80k - 140k larger) build_unflags = -Wall -fno-lto -build_flags = ${core_esp32_IDF5_3_2__3_1_0_LittleFS.build_flags} +build_flags = ${core_esp32_IDF5_4_1__3_2_0_LittleFS.build_flags} ; ${mqtt_flags.build_flags} -DMQTT_MAX_PACKET_SIZE=2048 -DCONFIG_FREERTOS_ASSERT_DISABLE @@ -69,7 +69,45 @@ build_flags = ${core_esp32_IDF5_3_2__3_1_0_LittleFS.build_flags} -DLWIP_IPV6=1 monitor_filters = esp32_exception_decoder lib_ignore = - ${core_esp32_IDF5_3_2__3_1_0_LittleFS.lib_ignore} + ${core_esp32_IDF5_4_1__3_2_0_LittleFS.lib_ignore} + + +[esp32_base_idf5_5] +extends = common, core_esp32_IDF5_5_0__3_2_0_LittleFS +upload_speed = 460800 +upload_before_reset = default_reset +upload_after_reset = hard_reset +extra_scripts = pre:tools/pio/pre_esp32.py + post:tools/pio/post_esp32.py + ${extra_scripts_default.extra_scripts} + post:tools/pio/copy_files.py +; you can disable debug linker flag to reduce binary size (comment out line below), but the backtraces will become less readable +; tools/pio/extra_linker_flags.py +; fix the platform package to use gcc-ar and gcc-ranlib to enable lto linker plugin +; more detail: https://embeddedartistry.com/blog/2020/04/13/prefer-gcc-ar-to-ar-in-your-buildsystems/ +; pre:tools/pio/apply_patches.py + +; When using LTO, make sure NOT to use -mtext-section-literals +; -mtext-section-literals may be required when building large builds +; However LTO cannot optimize builds with text section literals and thus will result in quite a lot larger builds (80k - 140k larger) +build_unflags = -Wall + -fno-lto +build_flags = ${core_esp32_IDF5_5_0__3_2_0_LittleFS.build_flags} +; ${mqtt_flags.build_flags} + -DMQTT_MAX_PACKET_SIZE=2048 + -DCONFIG_FREERTOS_ASSERT_DISABLE + -DCONFIG_LWIP_ESP_GRATUITOUS_ARP + -fno-strict-aliasing + -flto=auto + -Wswitch + -DCORE_DEBUG_LEVEL=ARDUHAL_LOG_LEVEL_NONE +; -DCORE_DEBUG_LEVEL=ARDUHAL_LOG_LEVEL_INFO +; -DCORE_DEBUG_LEVEL=ARDUHAL_LOG_LEVEL_VERBOSE + -DLWIP_IPV6=1 + -DCONFIG_BT_NIMBLE_NVS_PERSIST=y +monitor_filters = esp32_exception_decoder +lib_ignore = + ${core_esp32_IDF5_5_0__3_2_0_LittleFS.lib_ignore} ; -flto cannot be used for ESP32 C3! @@ -120,7 +158,7 @@ board_build.filesystem = littlefs lib_ignore = ${esp32_always.lib_ignore} ESP32_ping ESP32 BLE Arduino - ${core_esp32_IDF5_3_2__3_1_0_LittleFS.lib_ignore} + ${core_esp32_IDF5_4_1__3_2_0_LittleFS.lib_ignore} [esp32_IRExt] diff --git a/platformio_esp32c5_envs..ini b/platformio_esp32c5_envs..ini new file mode 100644 index 000000000..1322859eb --- /dev/null +++ b/platformio_esp32c5_envs..ini @@ -0,0 +1,29 @@ + + +[esp32c5_common_LittleFS] +extends = esp32_base_idf5 +build_flags = ${esp32_base_idf5.build_flags} + -DFEATURE_ARDUINO_OTA=1 + -DUSE_LITTLEFS + -DESP32C5 +extra_scripts = ${esp32_base_idf5.extra_scripts} +build_unflags = ${esp32_base_idf5.build_unflags} + -fexceptions +board_build.filesystem = littlefs +lib_ignore = ${esp32_base_idf5.lib_ignore} +board = esp32c5cdc + + +[env:max_ESP32c5_8M1M_LittleFS_CDC_ETH] +extends = esp32c5_common_LittleFS +board = esp32c5cdc-8M +build_flags = ${esp32c5_common_LittleFS.build_flags} + -DFEATURE_ETHERNET=1 + -DFEATURE_ARDUINO_OTA=1 + -DPLUGIN_BUILD_MAX_ESP32 + -DPLUGIN_BUILD_IR_EXTENDED + -D ST7789_EXTRA_INIT=1 + -D P116_EXTRA_ST7789=1 +extra_scripts = ${esp32c5_common_LittleFS.extra_scripts} + + diff --git a/src/include/ESPEasy_config.h b/src/include/ESPEasy_config.h index 8ccfe1643..7dce45094 100644 --- a/src/include/ESPEasy_config.h +++ b/src/include/ESPEasy_config.h @@ -149,7 +149,7 @@ constexpr unsigned CEIL_LOG2(unsigned x) # endif // ifdef ESP8266 # ifdef ESP32 - # if defined(ESP32C2) || defined(ESP32C3) || defined(ESP32C6) + # if defined(ESP32C2) || defined(ESP32C3) || defined(ESP32C5) || defined(ESP32C6) // (ESP32) FsP: FlashstringHelper to String-Pointer # define FsP diff --git a/src/include/esp32x_fixes.h b/src/include/esp32x_fixes.h index 4c5a5e780..44c3ab47c 100644 --- a/src/include/esp32x_fixes.h +++ b/src/include/esp32x_fixes.h @@ -87,7 +87,7 @@ # endif // REG_SPI_BASE # endif // ESP_IDF_VERSION_MAJOR < 5 -#elif CONFIG_IDF_TARGET_ESP32C2 || CONFIG_IDF_TARGET_ESP32C6 +#elif CONFIG_IDF_TARGET_ESP32C2 || CONFIG_IDF_TARGET_ESP32C5 || CONFIG_IDF_TARGET_ESP32C6 # define SPI_HOST SPI1_HOST # define HSPI_HOST SPI2_HOST # define VSPI_HOST SPI2_HOST /* No SPI3_host on C2/C6 */ diff --git a/src/src/CustomBuild/ESPEasy_buildinfo.h b/src/src/CustomBuild/ESPEasy_buildinfo.h index 3b203c12f..b6f669d73 100644 --- a/src/src/CustomBuild/ESPEasy_buildinfo.h +++ b/src/src/CustomBuild/ESPEasy_buildinfo.h @@ -34,8 +34,14 @@ # define BUILD_NOTES " - Mega32-s2" #elif defined(ESP32S3) # define BUILD_NOTES " - Mega32-s3" + #elif defined(ESP32H2) + # define BUILD_NOTES " - Mega32-h2" + #elif defined(ESP32P4) + # define BUILD_NOTES " - Mega32-p4" #elif defined(ESP32C6) # define BUILD_NOTES " - Mega32-c6" + #elif defined(ESP32C5) + # define BUILD_NOTES " - Mega32-c5" #elif defined(ESP32C3) # define BUILD_NOTES " - Mega32-c3" #elif defined(ESP32C2) @@ -66,7 +72,7 @@ CONFIG_IDF_TARGET_ESP32S2 || // support USB via USBCDC CONFIG_IDF_TARGET_ESP32S3 // support USB via HWCDC using JTAG interface or USBCDC */ -# if CONFIG_IDF_TARGET_ESP32C3 || CONFIG_IDF_TARGET_ESP32C6 || CONFIG_IDF_TARGET_ESP32S2 || CONFIG_IDF_TARGET_ESP32S3 +# if CONFIG_IDF_TARGET_ESP32C3 || CONFIG_IDF_TARGET_ESP32C5 || CONFIG_IDF_TARGET_ESP32C6 || CONFIG_IDF_TARGET_ESP32S2 || CONFIG_IDF_TARGET_ESP32S3 // #if CONFIG_TINYUSB_CDC_ENABLED // This define is not recognized here so use USE_USB_CDC_CONSOLE # ifdef USE_USB_CDC_CONSOLE diff --git a/src/src/CustomBuild/define_plugin_sets.h b/src/src/CustomBuild/define_plugin_sets.h index e84d76cc9..53dfb5898 100644 --- a/src/src/CustomBuild/define_plugin_sets.h +++ b/src/src/CustomBuild/define_plugin_sets.h @@ -3477,7 +3477,7 @@ To create/register a plugin, you have to : #ifndef FEATURE_SET_WIFI_TX_PWR #ifdef ESP32 - #if defined(ESP32S2) || defined(ESP32S3) || defined(ESP32C2) || defined(ESP32C3) || defined(ESP32C6) + #if defined(ESP32S2) || defined(ESP32S3) || defined(ESP32C2) || defined(ESP32C3) || defined(ESP32C5) || defined(ESP32C6) #define FEATURE_SET_WIFI_TX_PWR 1 #else // TD-er: Disable setting TX power on ESP32 as it seems to cause issues on IDF4.4 diff --git a/src/src/DataStructs/WiFi_AP_Candidate.cpp b/src/src/DataStructs/WiFi_AP_Candidate.cpp index bab5c2fa0..50251e7b8 100644 --- a/src/src/DataStructs/WiFi_AP_Candidate.cpp +++ b/src/src/DataStructs/WiFi_AP_Candidate.cpp @@ -115,6 +115,10 @@ WiFi_AP_Candidate::WiFi_AP_Candidate(uint8_t networkItem) : index(0) { bits.phy_11ax = it->phy_11ax; bits.ftm_initiator = it->ftm_initiator; bits.ftm_responder = it->ftm_responder; +#ifdef ESP32C5 + bits.phy_11a = it->phy_11a; + bits.phy_11ac = it->phy_11ac; +#endif # endif // if ESP_IDF_VERSION_MAJOR >= 5 bits.wps = it->wps; @@ -252,6 +256,14 @@ String WiFi_AP_Candidate::toString(const String& separator) const { separator.c_str(), channel); +#ifdef ESP32C5 + if (channel < 36) { + result += F(" 2.4 GHz"); + } else { + result += F(" 5 GHz"); + } +#endif + if (rssi == -1) { result += F(" (RTC) "); } else { @@ -292,7 +304,6 @@ String WiFi_AP_Candidate::toString(const String& separator) const { if (bits.phy_11n) { phy_str += 'n'; } #ifdef ESP32 - if (bits.phy_11ax) { phy_str += F("/ax"); } if (bits.phy_lr) { phy_str += F("/lr"); } @@ -300,6 +311,11 @@ String WiFi_AP_Candidate::toString(const String& separator) const { if (bits.ftm_initiator) { phy_str += F("/FTM_i"); } if (bits.ftm_responder) { phy_str += F("/FTM_r"); } + + // Add 5 GHz WiFi types as last in the list. + if (bits.phy_11a) { phy_str += F("/a"); } + if (bits.phy_11ac) { phy_str += F("/ac"); } + #endif // ifdef ESP32 if (phy_str.length()) { diff --git a/src/src/DataStructs/WiFi_AP_Candidate.h b/src/src/DataStructs/WiFi_AP_Candidate.h index 8dda8a5ab..cfcb2bf1c 100644 --- a/src/src/DataStructs/WiFi_AP_Candidate.h +++ b/src/src/DataStructs/WiFi_AP_Candidate.h @@ -93,12 +93,14 @@ struct WiFi_AP_Candidate { uint16_t phy_11g : 1; uint16_t phy_11n : 1; uint16_t phy_lr : 1; - uint16_t phy_11ax : 1; + uint16_t phy_11a : 1; // traditional (old) 5 GHz + uint16_t phy_11ac : 1; // 5 GHz WiFi 5, 802.11ac + uint16_t phy_11ax : 1; // WiFi 6, both bands possible uint16_t wps : 1; uint16_t ftm_responder : 1; uint16_t ftm_initiator : 1; - uint16_t unused : 5; + uint16_t unused : 3; } bits; uint16_t _allBits; diff --git a/src/src/DataStructs_templ/SettingsStruct.cpp b/src/src/DataStructs_templ/SettingsStruct.cpp index 5e706b595..7d0aba71d 100644 --- a/src/src/DataStructs_templ/SettingsStruct.cpp +++ b/src/src/DataStructs_templ/SettingsStruct.cpp @@ -743,7 +743,7 @@ bool SettingsStruct_tmpl::getPinBootStateIndex( index_high = gpio_pin - maxStates; -# if defined(ESP32_CLASSIC) || defined(ESP32C2) || defined(ESP32C3)|| defined(ESP32C6) +# if defined(ESP32_CLASSIC) || defined(ESP32C2) || defined(ESP32C3) || defined(ESP32C5) || defined(ESP32C5) || defined(ESP32C6) // These can all store in the PinBootStates_ESP32 array return (index_high < maxStatesesp32); diff --git a/src/src/DataTypes/SPI_options.cpp b/src/src/DataTypes/SPI_options.cpp index 575611044..0736a212e 100644 --- a/src/src/DataTypes/SPI_options.cpp +++ b/src/src/DataTypes/SPI_options.cpp @@ -42,6 +42,8 @@ #define VSPI_FSPI_SHORT_STRING "FSPI" # elif CONFIG_IDF_TARGET_ESP32C3 // ESP32-C3 #define VSPI_FSPI_SHORT_STRING "SPI" +# elif CONFIG_IDF_TARGET_ESP32C5 // ESP32-C5 +#define VSPI_FSPI_SHORT_STRING "FSPI" # elif CONFIG_IDF_TARGET_ESP32C6 // ESP32-C6 #define VSPI_FSPI_SHORT_STRING "FSPI" # elif CONFIG_IDF_TARGET_ESP32 // ESP32/PICO-D4 diff --git a/src/src/DataTypes/SPI_options.h b/src/src/DataTypes/SPI_options.h index b2a8627dc..b70459622 100644 --- a/src/src/DataTypes/SPI_options.h +++ b/src/src/DataTypes/SPI_options.h @@ -51,6 +51,10 @@ #define VSPI_FSPI_SCK 21 #define VSPI_FSPI_MISO 20 #define VSPI_FSPI_MOSI 19 +# elif CONFIG_IDF_TARGET_ESP32C5 // ESP32-C5 +#define VSPI_FSPI_SCK 4 +#define VSPI_FSPI_MISO 5 +#define VSPI_FSPI_MOSI 6 # elif CONFIG_IDF_TARGET_ESP32C3 // ESP32-C3 #define VSPI_FSPI_SCK 4 #define VSPI_FSPI_MISO 5 diff --git a/src/src/ESPEasyCore/ESPEasyWifi.cpp b/src/src/ESPEasyCore/ESPEasyWifi.cpp index 9a018c3a7..828736fe5 100644 --- a/src/src/ESPEasyCore/ESPEasyWifi.cpp +++ b/src/src/ESPEasyCore/ESPEasyWifi.cpp @@ -379,7 +379,10 @@ void WifiScan(bool async, uint8_t channel) { # ifdef ESP32 const bool passive = Settings.PassiveWiFiScan(); const uint32_t max_ms_per_chan = 120; +#ifndef ESP32C5 + // C5 scans both 2.4 and 5 GHz band, which takes much longer WiFi.setScanTimeout(14 * max_ms_per_chan * 2); +#endif WiFi.scanNetworks(async, show_hidden, passive, max_ms_per_chan /*, channel */); # endif // ifdef ESP32 diff --git a/src/src/ESPEasyCore/ESPEasyWifi_abstracted_ESP32.cpp b/src/src/ESPEasyCore/ESPEasyWifi_abstracted_ESP32.cpp index 18b3cd7fc..cb83130f1 100644 --- a/src/src/ESPEasyCore/ESPEasyWifi_abstracted_ESP32.cpp +++ b/src/src/ESPEasyCore/ESPEasyWifi_abstracted_ESP32.cpp @@ -295,14 +295,19 @@ void setConnectionSpeed(bool ForceWiFi_bg_mode) { // The response speed and stability is better at HT20 for ESP units. esp_wifi_set_bandwidth(WIFI_IF_STA, WIFI_BW_HT20); - uint8_t protocol = WIFI_PROTOCOL_11B | WIFI_PROTOCOL_11G; // Default to BG + // uint8_t protocol = WIFI_PROTOCOL_11B | WIFI_PROTOCOL_11G; // Default to BG + uint8_t protocol = 0; if (!ForceWiFi_bg_mode || (WiFiEventData.connectionFailures > 10)) { // Set to use BGN protocol |= WIFI_PROTOCOL_11N; - # ifdef ESP32C6 + # if defined(ESP32C5) || defined(ESP32C6) protocol |= WIFI_PROTOCOL_11AX; # endif + #ifdef ESP32C5 + protocol |= WIFI_PROTOCOL_11A; + protocol |= WIFI_PROTOCOL_11AC; + #endif } const WiFi_AP_Candidate candidate = WiFi_AP_Candidates.getCurrent(); @@ -316,13 +321,25 @@ void setConnectionSpeed(bool ForceWiFi_bg_mode) { protocol |= WIFI_PROTOCOL_11N; addLog(LOG_LEVEL_INFO, F("WIFI : AP is set to 802.11n only")); } -# ifdef ESP32C6 +# if defined(ESP32C5) || defined(ESP32C6) if (candidate.bits.phy_11ax) { // Set to use WiFi6 protocol |= WIFI_PROTOCOL_11AX; - addLog(LOG_LEVEL_INFO, F("WIFI : AP is set to 802.11ax")); + addLog(LOG_LEVEL_INFO, F("WIFI : AP allows 802.11ax, Wi-Fi 6")); } +#ifdef ESP32C5 + if (candidate.bits.phy_11a) { + // Set to use 5 GHz WiFi + protocol |= WIFI_PROTOCOL_11A; + addLog(LOG_LEVEL_INFO, F("WIFI : AP allows 802.11a, 5 GHz")); + } + if (candidate.bits.phy_11ac) { + // Set to use 5 GHz WiFi-5 + protocol |= WIFI_PROTOCOL_11AC; + addLog(LOG_LEVEL_INFO, F("WIFI : AP allows 802.11ac, 5 GHz Wi-Fi 5")); + } +#endif # endif // ifdef ESP32C6 } } diff --git a/src/src/Helpers/ESPEasy_Storage.cpp b/src/src/Helpers/ESPEasy_Storage.cpp index 06272a37b..613923cd8 100644 --- a/src/src/Helpers/ESPEasy_Storage.cpp +++ b/src/src/Helpers/ESPEasy_Storage.cpp @@ -17,6 +17,7 @@ #include "../ESPEasyCore/ESPEasy_Log.h" #include "../ESPEasyCore/ESPEasyNetwork.h" #include "../ESPEasyCore/ESPEasyWifi.h" +#include "../ESPEasyCore/ESPEasyWifi_abstracted.h" #include "../ESPEasyCore/Serial.h" #include "../Globals/CRCValues.h" @@ -679,7 +680,7 @@ bool check_and_update_WiFi_Calibration() { bool Erase_WiFi_Calibration() { #ifdef ESP8266 WifiDisconnect(); - setWifiMode(WIFI_OFF); + ESPEasy::net::wifi::setWifiMode(WIFI_OFF); if (!ESP.eraseConfig()) return false; #ifndef BUILD_MINIMAL_OTA @@ -689,7 +690,7 @@ bool Erase_WiFi_Calibration() { #ifdef ESP32 WifiDisconnect(); - setWifiMode(WIFI_OFF); + ESPEasy::net::wifi::setWifiMode(WIFI_OFF); // Make sure power is stable, so wait a bit longer delay(1000); esp_phy_erase_cal_data_in_nvs(); diff --git a/src/src/Helpers/Hardware.cpp b/src/src/Helpers/Hardware.cpp index 29281b201..bff72f4c6 100644 --- a/src/src/Helpers/Hardware.cpp +++ b/src/src/Helpers/Hardware.cpp @@ -444,6 +444,8 @@ int getCPU_MaxFreqMHz() return 160; #elif CONFIG_IDF_TARGET_ESP32C6 return 160; +#elif CONFIG_IDF_TARGET_ESP32C5 + return 240; #elif CONFIG_IDF_TARGET_ESP32H2 //IDF-6570 return 96; @@ -673,6 +675,30 @@ void readBootCause() { case POWER_GLITCH_RESET : lastBootCause = BOOT_CAUSE_POWER_UNSTABLE; break; /**<23, power glitch reset digital core and rtc module*/ } +#elif defined(ESP32C5) + switch (rtc_get_reset_reason(0)) { + case NO_MEAN : break; + case POWERON_RESET : lastBootCause = BOOT_CAUSE_MANUAL_REBOOT; break; /**<1, Vbat power on reset*/ + case RTC_SW_SYS_RESET : lastBootCause = BOOT_CAUSE_SOFT_RESTART; break; /**<3, Software reset digital core*/ + case DEEPSLEEP_RESET : lastBootCause = BOOT_CAUSE_DEEP_SLEEP; break; /**<5, Deep Sleep reset digital core*/ +// case SDIO_RESET : lastBootCause = BOOT_CAUSE_MANUAL_REBOOT; break; /**<6, Reset by SLC module, reset digital core (hp system)*/ + case TG0WDT_SYS_RESET : lastBootCause = BOOT_CAUSE_EXT_WD; break; /**<7, Timer Group0 Watch dog reset digital core*/ + case TG1WDT_SYS_RESET : lastBootCause = BOOT_CAUSE_EXT_WD; break; /**<8, Timer Group1 Watch dog reset digital core*/ + case RTCWDT_SYS_RESET : lastBootCause = BOOT_CAUSE_EXT_WD; break; /**<9, RTC Watch dog Reset digital core*/ + case TG0WDT_CPU_RESET : lastBootCause = BOOT_CAUSE_EXT_WD; break; /**<11, Time Group0 reset CPU*/ + case RTC_SW_CPU_RESET : lastBootCause = BOOT_CAUSE_SOFT_RESTART; break; /**<12, Software reset CPU*/ + case RTCWDT_CPU_RESET : lastBootCause = BOOT_CAUSE_EXT_WD; break; /**<13, RTC Watch dog Reset CPU*/ + case RTCWDT_BROWN_OUT_RESET : lastBootCause = BOOT_CAUSE_POWER_UNSTABLE; break; /**<15, Reset when the vdd voltage is not stable*/ + case RTCWDT_RTC_RESET : lastBootCause = BOOT_CAUSE_EXT_WD; break; /**<16, RTC Watch dog reset digital core and rtc module*/ + case TG1WDT_CPU_RESET : lastBootCause = BOOT_CAUSE_EXT_WD; break; /**<17, Time Group1 reset CPU*/ + case SUPER_WDT_RESET : lastBootCause = BOOT_CAUSE_EXT_WD; break; /**<18, super watchdog reset digital core and rtc module*/ + case EFUSE_RESET : lastBootCause = BOOT_CAUSE_MANUAL_REBOOT; break; /**<20, efuse reset digital core*/ + case USB_UART_CHIP_RESET : lastBootCause = BOOT_CAUSE_MANUAL_REBOOT; break; /**<21, usb uart reset digital core */ + case USB_JTAG_CHIP_RESET : lastBootCause = BOOT_CAUSE_MANUAL_REBOOT; break; /**<22, usb jtag reset digital core */ + case JTAG_RESET : lastBootCause = BOOT_CAUSE_MANUAL_REBOOT; break; /**<24, jtag reset CPU*/ + } + + #elif defined(ESP32C6) switch (rtc_get_reset_reason(0)) { case NO_MEAN : break; diff --git a/src/src/Helpers/Hardware_ADC_cali.h b/src/src/Helpers/Hardware_ADC_cali.h index 824ad553d..0972e714c 100644 --- a/src/src/Helpers/Hardware_ADC_cali.h +++ b/src/src/Helpers/Hardware_ADC_cali.h @@ -18,7 +18,7 @@ # include # endif // if ESP_IDF_VERSION_MAJOR >= 5 -# if CONFIG_IDF_TARGET_ESP32C2 || CONFIG_IDF_TARGET_ESP32C3 || CONFIG_IDF_TARGET_ESP32C6 +# if CONFIG_IDF_TARGET_ESP32C2 || CONFIG_IDF_TARGET_ESP32C3 || CONFIG_IDF_TARGET_ESP32C5 || CONFIG_IDF_TARGET_ESP32C6 /** * On ESP32C3, ADC2 is no longer supported, due to its HW limitation. * Search for errata on espressif website for more details. diff --git a/src/src/Helpers/Hardware_GPIO_ESP32C5.cpp b/src/src/Helpers/Hardware_GPIO_ESP32C5.cpp new file mode 100644 index 000000000..f70b53b27 --- /dev/null +++ b/src/src/Helpers/Hardware_GPIO_ESP32C5.cpp @@ -0,0 +1,166 @@ +#include "../Helpers/Hardware_GPIO.h" + +#ifdef ESP32C5 +# include + +# include "../Helpers/Hardware_device_info.h" + +// ******************************************************************************** +// Get info of a specific GPIO pin +// ******************************************************************************** + +bool getGpioInfo(int gpio, int& pinnr, bool& input, bool& output, bool& warning) { + pinnr = -1; // ESP32 does not label the pins, they just use the GPIO number. + + input = GPIO_IS_VALID_GPIO(gpio); + output = GPIO_IS_VALID_OUTPUT_GPIO(gpio); + warning = isBootStrapPin(gpio); + + if (!(GPIO_IS_VALID_GPIO(gpio))) { return false; } + + + // FIXME TD-er: Implement for ESP32-C5 + // See: + // - https://docs.espressif.com/projects/esp-idf/en/v5.0/esp32c3/hw-reference/esp32c3/user-guide-devkitm-1.html + // - https://docs.espressif.com/projects/esp-idf/en/latest/esp32c3/api-reference/peripherals/gpio.html + // Datasheet: https://www.espressif.com/sites/default/files/documentation/esp32-c3_datasheet_en.pdf + + if (gpio == 11) { + if (getChipFeatures().embeddedFlash /* || !flashVddPinCanBeUsedAsGPIO() */) { + // See: https://www.letscontrolit.com/forum/viewtopic.php?p=71880#p71874 + // + // By default VDD_SPI is the power supply pin for embedded flash or external flash. + // It can only be used as GPIO11 only when the chip is connected to an + // external flash, and this flash is powered by an external power supply + input = false; + output = false; + } + warning = true; + } + + if (isFlashInterfacePin_ESPEasy(gpio)) { + if (getChipFeatures().embeddedFlash) { + // Connected to the integrated SPI flash. + input = false; + output = false; + } else { + // See: https://www.letscontrolit.com/forum/viewtopic.php?p=71880#p71874 + if ((gpio == 12) || (gpio == 13)) { + // SPIHD/GPIO12 + // SPIWP/GPIO13 + if ((ESP.getFlashChipMode() != FM_DOUT) && + (ESP.getFlashChipMode() != FM_DIO)) { + input = false; + output = false; + } + } + } + warning = true; + } + + if ((gpio == PIN_USB_D_MIN) || (gpio == PIN_USB_D_PLUS)) { + // USB OTG and USB Serial/JTAG function. USB signal is a differential + // signal transmitted over a pair of D+ and D- wires. + warning = true; + } + + // GPIO 18: USB_D- + // GPIO 19: USB_D+ + + // GPIO 20: U0RXD + // GPIO 21: U0TXD + + return (input || output); +} + +bool isBootStrapPin(int gpio) +{ + if (gpio == 2) { + // Strapping pin which must be high during boot + return true; + } + + if (gpio == 8) { + // Strapping pin which must be high during flashing + return true; + } + + if (gpio == 9) { + // Strapping pin to force download mode (like GPIO-0 on ESP8266/ESP32-classic) + return true; + } + return false; +} + +bool getGpioPullResistor(int gpio, bool& hasPullUp, bool& hasPullDown) { + hasPullDown = false; + hasPullUp = false; + + if (validGpio(gpio)) { + hasPullUp = true; + hasPullDown = true; + } + return true; +} + +bool validGpio(int gpio) { + if (!GPIO_IS_VALID_GPIO(gpio)) { return false; } + + int pinnr; + bool input; + bool output; + bool warning; + + return getGpioInfo(gpio, pinnr, input, output, warning); +} + +// Get ADC related info for a given GPIO pin +// @param gpio_pin GPIO pin number +// @param adc Number of ADC unit (0 == Hall effect) +// @param ch Channel number on ADC unit +// @param t index of touch pad ID +bool getADC_gpio_info(int gpio_pin, int& adc, int& ch, int& t) +{ + adc = -1; + ch = -1; + t = -1; + + if ((gpio_pin >= 0) && (gpio_pin <= 4)) { + adc = 1; + ch = gpio_pin; + return true; + } + # if ESP_IDF_VERSION_MAJOR >= 5 + + // Support for ADC2 has been dropped. + # else // if ESP_IDF_VERSION_MAJOR >= 5 + + if (gpio_pin == 5) { + adc = 2; + ch = 0; + return true; + } + # endif // if ESP_IDF_VERSION_MAJOR >= 5 + return false; +} + +#if SOC_TOUCH_SENSOR_SUPPORTED +int touchPinToGpio(int touch_pin) +{ + // No touch pin support + return -1; +} +#endif + +#if SOC_DAC_SUPPORTED +// Get DAC related info for a given GPIO pin +// @param gpio_pin GPIO pin number +// @param dac Number of DAC unit +bool getDAC_gpio_info(int gpio_pin, int& dac) +{ + // ESP32-C5, ESP32-S3, ESP32-C2, ESP32-C6 and ESP32-H2 don't have a DAC onboard + return false; +} +#endif + +#endif // ifdef ESP32C5 diff --git a/src/src/Helpers/Hardware_defines.h b/src/src/Helpers/Hardware_defines.h index bfd7c13a0..e58d72e0a 100644 --- a/src/src/Helpers/Hardware_defines.h +++ b/src/src/Helpers/Hardware_defines.h @@ -55,7 +55,7 @@ # define WIFI_SENSITIVITY_11b -88 # define WIFI_SENSITIVITY_54g -76 # define WIFI_SENSITIVITY_n -72 -#elif defined(ESP32C2) || defined(ESP32C3) || defined(ESP32C6) +#elif defined(ESP32C2) || defined(ESP32C3) || defined(ESP32C5) || defined(ESP32C6) # define MAX_TX_PWR_DBM_11b 21.0f # define MAX_TX_PWR_DBM_54g 19.0f # define MAX_TX_PWR_DBM_n 18.5f @@ -81,6 +81,8 @@ static_assert(false, "Implement processor architecture"); # define SOC_RX0 44 # elif CONFIG_IDF_TARGET_ESP32C6 # define SOC_RX0 17 +# elif CONFIG_IDF_TARGET_ESP32C5 +# define SOC_RX0 12 # elif CONFIG_IDF_TARGET_ESP32C3 # define SOC_RX0 20 # elif CONFIG_IDF_TARGET_ESP32C2 @@ -97,6 +99,8 @@ static_assert(false, "Implement processor architecture"); # define SOC_TX0 43 # elif CONFIG_IDF_TARGET_ESP32C6 # define SOC_TX0 16 +# elif CONFIG_IDF_TARGET_ESP32C5 +# define SOC_TX0 11 # elif CONFIG_IDF_TARGET_ESP32C3 # define SOC_TX0 21 # elif CONFIG_IDF_TARGET_ESP32C2 @@ -114,6 +118,9 @@ static_assert(false, "Implement processor architecture"); #ifdef ESP32C6 #define PIN_USB_D_MIN 12 #endif +#ifdef ESP32C5 +#define PIN_USB_D_MIN 13 +#endif #ifdef ESP32C3 #define PIN_USB_D_MIN 18 #endif @@ -127,6 +134,9 @@ static_assert(false, "Implement processor architecture"); #ifdef ESP32C6 #define PIN_USB_D_PLUS 13 #endif +#ifdef ESP32C5 +#define PIN_USB_D_PLUS 14 +#endif #ifdef ESP32C3 #define PIN_USB_D_PLUS 19 #endif diff --git a/src/src/Helpers/Hardware_device_info_ESP32C5.cpp b/src/src/Helpers/Hardware_device_info_ESP32C5.cpp index e9b9148bf..bbed9d264 100644 --- a/src/src/Helpers/Hardware_device_info_ESP32C5.cpp +++ b/src/src/Helpers/Hardware_device_info_ESP32C5.cpp @@ -2,17 +2,78 @@ #ifdef ESP32C5 +# include +# include +# include +# include +# include +# include +# include + + +bool isFlashInterfacePin_ESPEasy(int gpio) { + // FIXME TD-er: Must know whether we have internal or external flash + + // For chip variants with an in-package flash, this pin can not be used. + + + switch (gpio) { + case MSPI_IOMUX_PIN_NUM_HD: + case MSPI_IOMUX_PIN_NUM_WP: + case MSPI_IOMUX_PIN_NUM_CS0: + case MSPI_IOMUX_PIN_NUM_CLK: + case MSPI_IOMUX_PIN_NUM_MOSI: + case MSPI_IOMUX_PIN_NUM_MISO: + return true; + } + return false; + + // return (gpio) >= 24 && (gpio) <= 30 && gpio != 27; +} + +bool flashVddPinCanBeUsedAsGPIO() +{ + return false; +} + +int32_t getEmbeddedFlashSize() +{ + /* + // See: framework-arduinoespressif32\tools\esp32-arduino-libs\esp32c5\include\soc\esp32c5\include\soc\efuse_reg.h + const uint32_t flash_cap = REG_GET_FIELD(EFUSE_RD_MAC_SPI_SYS_4_REG, EFUSE_FLASH_CAP); + + // FIXME TD-er: No idea about meaning of values + switch (flash_cap) { + case 0: return 0; + case 1: return 4; + case 2: return 2; + case 3: return 1; + case 4: return 8; + } + + // Unknown value, thus mark as negative value + return -1 * static_cast(flash_cap); + */ + return 8; +} + +int32_t getEmbeddedPSRAMSize() +{ + // Doesn't have PSRAM + return 0; +} + +# ifndef isPSRAMInterfacePin +bool isPSRAMInterfacePin(int gpio) { + return false; +} + +# endif // ifndef isPSRAMInterfacePin + const __FlashStringHelper* getChipModel(uint32_t chip_model, uint32_t chip_revision, uint32_t pkg_version, bool single_core) { - if (17 == chip_model) { // ESP32-C5 beta3 (MPW) - return F("ESP32-C5 beta3"); - } - else if (23 == chip_model) { // ESP32-C5 MP - return F("ESP32-C5"); - } - - return F("Unknown"); + return F("ESP32-C5"); } #endif // ifdef ESP32C5 diff --git a/src/src/Helpers/Hardware_temperature_sensor.cpp b/src/src/Helpers/Hardware_temperature_sensor.cpp index 6420ca5d6..3104a1abd 100644 --- a/src/src/Helpers/Hardware_temperature_sensor.cpp +++ b/src/src/Helpers/Hardware_temperature_sensor.cpp @@ -17,7 +17,7 @@ extern "C" { uint8_t temprature_sens_read(); } -# elif defined(ESP32C2) || defined(ESP32C3) || defined(ESP32C6) || defined(ESP32S2) || defined(ESP32S3) +# elif defined(ESP32C2) || defined(ESP32C3) || defined(ESP32C5) || defined(ESP32C6) || defined(ESP32S2) || defined(ESP32S3) # if ESP_IDF_VERSION_MAJOR < 5 # include @@ -62,7 +62,7 @@ esp_err_t do_read_internal_temperature(float& celsius) { return result; } -# elif defined(ESP32C2) || defined(ESP32C3) || defined(ESP32C6) || defined(ESP32S2) || defined(ESP32S3) +# elif defined(ESP32C2) || defined(ESP32C3) || defined(ESP32C5) || defined(ESP32C6) || defined(ESP32S2) || defined(ESP32S3) esp_err_t do_read_internal_temperature(float& celsius) { esp_err_t result = ESP_FAIL; diff --git a/src/src/Helpers/StringGenerator_GPIO.cpp b/src/src/Helpers/StringGenerator_GPIO.cpp index 4841f57ec..36f4cc58c 100644 --- a/src/src/Helpers/StringGenerator_GPIO.cpp +++ b/src/src/Helpers/StringGenerator_GPIO.cpp @@ -195,6 +195,9 @@ const __FlashStringHelper* getConflictingUse(int gpio, PinSelectPurpose purpose, // See Appendix A, page 71: https://www.espressif.com/sites/default/files/documentation/esp32-s3_datasheet_en.pdf + #elif defined(ESP32C5) + // TODO TD-er: Must check if C5 has conflicts here + #elif defined(ESP32C6) if (gpio == 27) { diff --git a/src/src/Helpers/StringGenerator_System.cpp b/src/src/Helpers/StringGenerator_System.cpp index ff7ffd40c..ba59809f2 100644 --- a/src/src/Helpers/StringGenerator_System.cpp +++ b/src/src/Helpers/StringGenerator_System.cpp @@ -19,6 +19,8 @@ #include #elif defined(ESP32C3) #include + #elif defined(ESP32C5) + #include #elif defined(ESP32C6) #include # elif defined(ESP32_CLASSIC) @@ -177,6 +179,32 @@ const __FlashStringHelper * getResetReasonString_f(uint8_t icore, bool& isDEEPSL case POWER_GLITCH_RESET : return F("power glitch reset digital core and rtc module"); } + #elif defined(ESP32C5) + + // See tools\sdk\esp32\include\esp_rom\include\esp32c6\rom\rtc.h + switch (rtc_get_reset_reason(icore)) { + case NO_MEAN : break; + case POWERON_RESET : return F("Vbat power on reset"); + case RTC_SW_SYS_RESET : return F("Software reset digital core (hp system)"); + case DEEPSLEEP_RESET : isDEEPSLEEP_RESET = true; break; + //case DEEPSLEEP_RESET : return F("Deep Sleep reset digital core (hp system)"); +// case SDIO_RESET : return F("Reset by SLC module, reset digital core (hp system)"); + case TG0WDT_SYS_RESET : return F("Timer Group0 Watch dog reset digital core (hp system)"); + case TG1WDT_SYS_RESET : return F("Timer Group1 Watch dog reset digital core (hp system)"); + case RTCWDT_SYS_RESET : return F("RTC Watch dog Reset digital core (hp system)"); + case TG0WDT_CPU_RESET : return F("Time Group0 reset CPU"); + case RTC_SW_CPU_RESET : return F("Software reset CPU"); + case RTCWDT_CPU_RESET : return F("RTC Watch dog Reset CPU"); + case RTCWDT_BROWN_OUT_RESET : return F("Reset when the vdd voltage is not stable"); + case RTCWDT_RTC_RESET : return F("RTC Watch dog reset digital core and rtc module"); + case TG1WDT_CPU_RESET : return F("Time Group1 reset CPU"); + case SUPER_WDT_RESET : return F("super watchdog reset digital core and rtc module"); + case EFUSE_RESET : return F("efuse reset digital core (hp system)"); + case USB_UART_CHIP_RESET : return F("usb uart reset digital core (hp system)"); + case USB_JTAG_CHIP_RESET : return F("usb jtag reset digital core (hp system)"); + case JTAG_RESET : return F("jtag reset CPU"); + } + #elif defined(ESP32C6) // See tools\sdk\esp32\include\esp_rom\include\esp32c6\rom\rtc.h diff --git a/tools/pio/copy_files.py b/tools/pio/copy_files.py index 3aa58d0cf..53aa332ee 100644 --- a/tools/pio/copy_files.py +++ b/tools/pio/copy_files.py @@ -21,11 +21,11 @@ def get_max_bin_size(env_name, file_suffix): if "4M316k" in env_name or "_ESP32_4M2M" in env_name: # ESP32 with 1800k of sketch space. max_bin_size = 1900544 - if "_ESP32_" in env_name or "_ESP32c6_" in env_name or "_ESP32s2_" in env_name or "_ESP32s3_" in env_name: + if "_ESP32_" in env_name or "_ESP32c5_" in env_name or "_ESP32c6_" in env_name or "_ESP32s2_" in env_name or "_ESP32s3_" in env_name: if "_8M1M" in env_name: # ESP32 with 3520k of sketch space. max_bin_size = 3604480 - if "_ESP32_" in env_name or "_ESP32c3_" in env_name or "_ESP32c6_" in env_name or "_ESP32s2_" in env_name or "_ESP32s3_" in env_name: + if "_ESP32_" in env_name or "_ESP32c3_" in env_name or "_ESP32c5_" in env_name or "_ESP32c6_" in env_name or "_ESP32s2_" in env_name or "_ESP32s3_" in env_name: if "_16M8M" in env_name or "_16M2M" in env_name or "_16M1M" in env_name: # ESP32 with 4096k of sketch space. max_bin_size = 4194304 @@ -86,8 +86,12 @@ def generate_webflash_json_manifest(variant, file_suffix): chipFamily = 'ESP32-C2' elif 'ESP32c3' in variant: chipFamily = 'ESP32-C3' + elif 'ESP32c5' in variant: + chipFamily = 'ESP32-C5' elif 'ESP32c6' in variant: chipFamily = 'ESP32-C6' + elif 'ESP32p4' in variant: + chipFamily = 'ESP32-P4' elif 'ESP32h2' in variant: chipFamily = 'ESP32-H2' else: diff --git a/tools/pio/generate_web_flasher_manifest.py b/tools/pio/generate_web_flasher_manifest.py index b0f1cbfad..7ca9e1d5b 100644 --- a/tools/pio/generate_web_flasher_manifest.py +++ b/tools/pio/generate_web_flasher_manifest.py @@ -33,10 +33,14 @@ def create_display_text(description, version, families): esp32_split.append('C2') if 'ESP32-C3' in families: esp32_split.append('C3') + if 'ESP32-C5' in families: + esp32_split.append('C5') if 'ESP32-C6' in families: esp32_split.append('C6') if 'ESP32-H2' in families: esp32_split.append('H2') + if 'ESP32-P4' in families: + esp32_split.append('P4') if len(esp32_split) > 0: fam_split.append('ESP32-' + '/'.join(esp32_split)) @@ -74,10 +78,14 @@ def parse_filename(file, version, variant, file_suffix): chipFamily = 'ESP32-C2' elif 'ESP32c3' in variant: chipFamily = 'ESP32-C3' + elif 'ESP32c5' in variant: + chipFamily = 'ESP32-C5' elif 'ESP32c6' in variant: chipFamily = 'ESP32-C6' elif 'ESP32h2' in variant: chipFamily = 'ESP32-H2' + elif 'ESP32p4' in variant: + chipFamily = 'ESP32-P4' else: chipFamily = 'ESP32' From 732b4ff6229d158eb726e7d0da44466d50ac018a Mon Sep 17 00:00:00 2001 From: TD-er Date: Sun, 25 May 2025 00:24:22 +0200 Subject: [PATCH 053/564] [ESP32-C5] Minor tweaks formatting used WiFi protocol --- platformio_esp32c6_envs.ini | 29 +++++++++++ src/src/DataStructs/WiFi_AP_Candidate.cpp | 23 ++++++-- src/src/DataTypes/WiFiConnectionProtocol.cpp | 55 +++++++++++++------- src/src/DataTypes/WiFiConnectionProtocol.h | 18 +++++-- 4 files changed, 98 insertions(+), 27 deletions(-) diff --git a/platformio_esp32c6_envs.ini b/platformio_esp32c6_envs.ini index a97e1ac48..1921ee92d 100644 --- a/platformio_esp32c6_envs.ini +++ b/platformio_esp32c6_envs.ini @@ -57,3 +57,32 @@ build_flags = ${esp32c6_common_LittleFS.build_flags} extra_scripts = ${esp32c6_common_LittleFS.extra_scripts} + + + +[esp32c5_common_LittleFS] +extends = esp32_base_idf5 +build_flags = ${esp32_base_idf5.build_flags} + -DFEATURE_ARDUINO_OTA=1 + -DUSE_LITTLEFS + -DESP32C5 +extra_scripts = ${esp32_base_idf5.extra_scripts} +build_unflags = ${esp32_base_idf5.build_unflags} + -fexceptions +board_build.filesystem = littlefs +lib_ignore = ${esp32_base_idf5.lib_ignore} +board = esp32c5cdc + + +[env:max_ESP32c5_8M1M_LittleFS_CDC_ETH] +extends = esp32c5_common_LittleFS +board = esp32c5cdc-8M +build_flags = ${esp32c5_common_LittleFS.build_flags} + -DFEATURE_ETHERNET=1 + -DFEATURE_ARDUINO_OTA=1 + -DPLUGIN_BUILD_MAX_ESP32 + -DPLUGIN_BUILD_IR_EXTENDED + -D ST7789_EXTRA_INIT=1 + -D P116_EXTRA_ST7789=1 +extra_scripts = ${esp32c5_common_LittleFS.extra_scripts} + diff --git a/src/src/DataStructs/WiFi_AP_Candidate.cpp b/src/src/DataStructs/WiFi_AP_Candidate.cpp index 50251e7b8..907c3d5d2 100644 --- a/src/src/DataStructs/WiFi_AP_Candidate.cpp +++ b/src/src/DataStructs/WiFi_AP_Candidate.cpp @@ -297,13 +297,32 @@ String WiFi_AP_Candidate::toString(const String& separator) const { if (phy_known()) { String phy_str; + // Order of items is kinda in order of age, oldest first. + // first 2.4 GHz version + // Later called "Wi-Fi 1" if (bits.phy_11b) { phy_str += 'b'; } + // 2nd 2.4 GHz version to adopt the same 54 Mbps bandwidth as used in 802.11a + // Later called "Wi-Fi 3" if (bits.phy_11g) { phy_str += 'g'; } + // 3rd iteration for 2.4 GHz + // Also used for 5 GHz to make it even more confusing + // To top the naming confusion even worse, this is later called "Wi-Fi 4" if (bits.phy_11n) { phy_str += 'n'; } #ifdef ESP32 + // Add 5 GHz WiFi types, oldest first. + + // 802.11a was one of the first WiFi standards, using 5 GHz + // Later called "Wi-Fi 2" + if (bits.phy_11a) { phy_str += F("/a"); } + + // 802.11ac was the significantly faster version for 5 GHz WiFi. + // Later called "Wi-Fi 5" + if (bits.phy_11ac) { phy_str += F("/ac"); } + + // AX is WiFi-6, on both frequencies if (bits.phy_11ax) { phy_str += F("/ax"); } if (bits.phy_lr) { phy_str += F("/lr"); } @@ -312,10 +331,6 @@ String WiFi_AP_Candidate::toString(const String& separator) const { if (bits.ftm_responder) { phy_str += F("/FTM_r"); } - // Add 5 GHz WiFi types as last in the list. - if (bits.phy_11a) { phy_str += F("/a"); } - if (bits.phy_11ac) { phy_str += F("/ac"); } - #endif // ifdef ESP32 if (phy_str.length()) { diff --git a/src/src/DataTypes/WiFiConnectionProtocol.cpp b/src/src/DataTypes/WiFiConnectionProtocol.cpp index 909973dd1..e406df595 100644 --- a/src/src/DataTypes/WiFiConnectionProtocol.cpp +++ b/src/src/DataTypes/WiFiConnectionProtocol.cpp @@ -1,5 +1,7 @@ #include "../DataTypes/WiFiConnectionProtocol.h" +#ifdef ESP8266 + const __FlashStringHelper* toString(WiFiConnectionProtocol proto) { switch (proto) { @@ -7,29 +9,44 @@ const __FlashStringHelper* toString(WiFiConnectionProtocol proto) { return F("802.11b"); case WiFiConnectionProtocol::WiFi_Protocol_11g: return F("802.11g"); -#ifdef ESP8266 case WiFiConnectionProtocol::WiFi_Protocol_11n: return F("802.11n"); -#endif // ifdef ESP8266 -#ifdef ESP32 - case WiFiConnectionProtocol::WiFi_Protocol_HT20: - return F("802.11n (HT20)"); - case WiFiConnectionProtocol::WiFi_Protocol_HT40: - return F("802.11n (HT40)"); - case WiFiConnectionProtocol::WiFi_Protocol_HE20: - return F("802.11ax (HE20)"); -# if ESP_IDF_VERSION > ESP_IDF_VERSION_VAL(5, 2, 0) - case WiFiConnectionProtocol::WiFi_Protocol_11a: - return F("802.11a"); - case WiFiConnectionProtocol::WiFi_Protocol_VHT20: - return F("802.11ac (VHT20)"); -# endif // if ESP_IDF_VERSION > ESP_IDF_VERSION_VAL(5, 2, 0) - case WiFiConnectionProtocol::WiFi_Protocol_LR: - return F("802.11lr"); - -#endif // ifdef ESP32 case WiFiConnectionProtocol::Unknown: break; } return F("-"); } + +#endif // ifdef ESP8266 + +#ifdef ESP32 + +const __FlashStringHelper* toString(WiFiConnectionProtocol proto) { + switch (proto) + { + case WiFiConnectionProtocol::WiFi_Protocol_11b: + return F("Wi-Fi 1: 802.11b"); + case WiFiConnectionProtocol::WiFi_Protocol_11g: + return F("Wi-Fi 3: 802.11g"); + case WiFiConnectionProtocol::WiFi_Protocol_HT20: + return F("Wi-Fi 4: 802.11n (HT20)"); + case WiFiConnectionProtocol::WiFi_Protocol_HT40: + return F("Wi-Fi 4: 802.11n (HT40)"); + # if ESP_IDF_VERSION > ESP_IDF_VERSION_VAL(5, 2, 0) + case WiFiConnectionProtocol::WiFi_Protocol_11a: + return F("Wi-Fi 2: 802.11a"); + case WiFiConnectionProtocol::WiFi_Protocol_VHT20: + return F("Wi-Fi 5: 802.11ac (VHT20)"); + # endif // if ESP_IDF_VERSION > ESP_IDF_VERSION_VAL(5, 2, 0) + case WiFiConnectionProtocol::WiFi_Protocol_HE20: + return F("Wi-Fi 6: 802.11ax (HE20)"); + case WiFiConnectionProtocol::WiFi_Protocol_LR: + return F("802.11lr"); + + case WiFiConnectionProtocol::Unknown: + break; + } + return F("-"); +} + +#endif // ifdef ESP32 diff --git a/src/src/DataTypes/WiFiConnectionProtocol.h b/src/src/DataTypes/WiFiConnectionProtocol.h index 54f55bf70..9013ffab3 100644 --- a/src/src/DataTypes/WiFiConnectionProtocol.h +++ b/src/src/DataTypes/WiFiConnectionProtocol.h @@ -3,28 +3,38 @@ #include "../../ESPEasy_common.h" +#ifdef ESP8266 + enum class WiFiConnectionProtocol { Unknown, WiFi_Protocol_11b, WiFi_Protocol_11g, -#ifdef ESP8266 WiFi_Protocol_11n +}; + + #endif + #ifdef ESP32 + +enum class WiFiConnectionProtocol { + Unknown, + WiFi_Protocol_11b, + WiFi_Protocol_11g, WiFi_Protocol_HT20, WiFi_Protocol_HT40, - WiFi_Protocol_HE20, // WiFi 6 # if ESP_IDF_VERSION > ESP_IDF_VERSION_VAL(5, \ 2, \ 0) WiFi_Protocol_11a, // traditional (old) 5 GHz WiFi_Protocol_VHT20, // 5 GHz WiFi 5, 802.11ac # endif // if ESP_IDF_VERSION > ESP_IDF_VERSION_VAL(5, 2, 0) + WiFi_Protocol_HE20, // WiFi 6 WiFi_Protocol_LR -#endif // ifdef ESP32 - }; +#endif + const __FlashStringHelper* toString(WiFiConnectionProtocol proto); From 203f476484ff3eb8cd318e445be401df248be34d Mon Sep 17 00:00:00 2001 From: TD-er Date: Sun, 25 May 2025 15:42:42 +0200 Subject: [PATCH 054/564] [ESP32-C5] Fix file name error for platformio_esp32c5_envs.ini --- ...5_envs..ini => platformio_esp32c5_envs.ini | 58 +++++++++---------- platformio_esp32c6_envs.ini | 27 --------- 2 files changed, 29 insertions(+), 56 deletions(-) rename platformio_esp32c5_envs..ini => platformio_esp32c5_envs.ini (97%) diff --git a/platformio_esp32c5_envs..ini b/platformio_esp32c5_envs.ini similarity index 97% rename from platformio_esp32c5_envs..ini rename to platformio_esp32c5_envs.ini index 1322859eb..ae0a669c8 100644 --- a/platformio_esp32c5_envs..ini +++ b/platformio_esp32c5_envs.ini @@ -1,29 +1,29 @@ - - -[esp32c5_common_LittleFS] -extends = esp32_base_idf5 -build_flags = ${esp32_base_idf5.build_flags} - -DFEATURE_ARDUINO_OTA=1 - -DUSE_LITTLEFS - -DESP32C5 -extra_scripts = ${esp32_base_idf5.extra_scripts} -build_unflags = ${esp32_base_idf5.build_unflags} - -fexceptions -board_build.filesystem = littlefs -lib_ignore = ${esp32_base_idf5.lib_ignore} -board = esp32c5cdc - - -[env:max_ESP32c5_8M1M_LittleFS_CDC_ETH] -extends = esp32c5_common_LittleFS -board = esp32c5cdc-8M -build_flags = ${esp32c5_common_LittleFS.build_flags} - -DFEATURE_ETHERNET=1 - -DFEATURE_ARDUINO_OTA=1 - -DPLUGIN_BUILD_MAX_ESP32 - -DPLUGIN_BUILD_IR_EXTENDED - -D ST7789_EXTRA_INIT=1 - -D P116_EXTRA_ST7789=1 -extra_scripts = ${esp32c5_common_LittleFS.extra_scripts} - - + + +[esp32c5_common_LittleFS] +extends = esp32_base_idf5 +build_flags = ${esp32_base_idf5.build_flags} + -DFEATURE_ARDUINO_OTA=1 + -DUSE_LITTLEFS + -DESP32C5 +extra_scripts = ${esp32_base_idf5.extra_scripts} +build_unflags = ${esp32_base_idf5.build_unflags} + -fexceptions +board_build.filesystem = littlefs +lib_ignore = ${esp32_base_idf5.lib_ignore} +board = esp32c5cdc + + +[env:max_ESP32c5_8M1M_LittleFS_CDC_ETH] +extends = esp32c5_common_LittleFS +board = esp32c5cdc-8M +build_flags = ${esp32c5_common_LittleFS.build_flags} + -DFEATURE_ETHERNET=1 + -DFEATURE_ARDUINO_OTA=1 + -DPLUGIN_BUILD_MAX_ESP32 + -DPLUGIN_BUILD_IR_EXTENDED + -D ST7789_EXTRA_INIT=1 + -D P116_EXTRA_ST7789=1 +extra_scripts = ${esp32c5_common_LittleFS.extra_scripts} + + diff --git a/platformio_esp32c6_envs.ini b/platformio_esp32c6_envs.ini index 1921ee92d..b35600630 100644 --- a/platformio_esp32c6_envs.ini +++ b/platformio_esp32c6_envs.ini @@ -59,30 +59,3 @@ extra_scripts = ${esp32c6_common_LittleFS.extra_scripts} - -[esp32c5_common_LittleFS] -extends = esp32_base_idf5 -build_flags = ${esp32_base_idf5.build_flags} - -DFEATURE_ARDUINO_OTA=1 - -DUSE_LITTLEFS - -DESP32C5 -extra_scripts = ${esp32_base_idf5.extra_scripts} -build_unflags = ${esp32_base_idf5.build_unflags} - -fexceptions -board_build.filesystem = littlefs -lib_ignore = ${esp32_base_idf5.lib_ignore} -board = esp32c5cdc - - -[env:max_ESP32c5_8M1M_LittleFS_CDC_ETH] -extends = esp32c5_common_LittleFS -board = esp32c5cdc-8M -build_flags = ${esp32c5_common_LittleFS.build_flags} - -DFEATURE_ETHERNET=1 - -DFEATURE_ARDUINO_OTA=1 - -DPLUGIN_BUILD_MAX_ESP32 - -DPLUGIN_BUILD_IR_EXTENDED - -D ST7789_EXTRA_INIT=1 - -D P116_EXTRA_ST7789=1 -extra_scripts = ${esp32c5_common_LittleFS.extra_scripts} - From 398faf185113df730b2b19d91b4e38caf5ecca5e Mon Sep 17 00:00:00 2001 From: Fabio Ancona Date: Tue, 17 Jun 2025 09:49:04 +0200 Subject: [PATCH 055/564] Update LD2410 doc adding info of false positive Update LD2410 doc adding info of avoid false positive --- docs/source/Plugin/P159.rst | 2 ++ 1 file changed, 2 insertions(+) diff --git a/docs/source/Plugin/P159.rst b/docs/source/Plugin/P159.rst index 30fd97358..9469c3989 100644 --- a/docs/source/Plugin/P159.rst +++ b/docs/source/Plugin/P159.rst @@ -27,6 +27,8 @@ Description Detecting (human) presence can be achieved in several ways, like via IR detection sensors, or a light-beam that's interrupted by someone passing. But these sensors have quite some limitations, like limited sensitivity, no information about the distance, or weather a person is there but not moving. The limitations of these existing sensors are not applicable when using radar-based presence detection, and since some time, rather affordable radar human-presence detectors are available. These are available with 5 GHz, 10 GHz, 24 GHz and 60 GHz radar frequency transmitter/receiver chips. Because of the accuracy and range, achievable with 24 GHz sensors, these are quite popular, so support has been added to ESPEasy. +Some notes about "false positive" detections: based on our test and experience some false positive presence rilevations can happens. For example if the sensor is near to plant, the movement of leaves can be incorrectly translated as presence detection; also electric cables in front of the sensor can provide noise to the sensor. To avoid false positive presence detection try to leave the sensor as free from obstacles as possible. + Some examples of these sensors: From 7150f9641c0d4cb1e6c6797c635c66ee6a1b5ced Mon Sep 17 00:00:00 2001 From: Fabio Ancona Date: Tue, 17 Jun 2025 10:13:00 +0200 Subject: [PATCH 056/564] Update P159.rst Update wrong translation --- docs/source/Plugin/P159.rst | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/source/Plugin/P159.rst b/docs/source/Plugin/P159.rst index 9469c3989..a79975208 100644 --- a/docs/source/Plugin/P159.rst +++ b/docs/source/Plugin/P159.rst @@ -27,7 +27,7 @@ Description Detecting (human) presence can be achieved in several ways, like via IR detection sensors, or a light-beam that's interrupted by someone passing. But these sensors have quite some limitations, like limited sensitivity, no information about the distance, or weather a person is there but not moving. The limitations of these existing sensors are not applicable when using radar-based presence detection, and since some time, rather affordable radar human-presence detectors are available. These are available with 5 GHz, 10 GHz, 24 GHz and 60 GHz radar frequency transmitter/receiver chips. Because of the accuracy and range, achievable with 24 GHz sensors, these are quite popular, so support has been added to ESPEasy. -Some notes about "false positive" detections: based on our test and experience some false positive presence rilevations can happens. For example if the sensor is near to plant, the movement of leaves can be incorrectly translated as presence detection; also electric cables in front of the sensor can provide noise to the sensor. To avoid false positive presence detection try to leave the sensor as free from obstacles as possible. +Some notes about "false positive" detections: based on our test and experience some false positive presence detections can happens. For example if the sensor is near to plant, the movement of leaves can be incorrectly translated as presence detection; also electric cables in front of the sensor can provide noise to the sensor. To avoid false positive presence detection try to leave the sensor as free from obstacles as possible. Some examples of these sensors: From 7465a2233e2b6a03ab078909963ed9f4fc5d83a4 Mon Sep 17 00:00:00 2001 From: TD-er Date: Fri, 20 Jun 2025 11:19:24 +0200 Subject: [PATCH 057/564] [ESP-IDF] Update to latest SDK/IDF --- platformio_core_defs.ini | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/platformio_core_defs.ini b/platformio_core_defs.ini index 1591d67d4..1a06f5d42 100644 --- a/platformio_core_defs.ini +++ b/platformio_core_defs.ini @@ -229,7 +229,7 @@ lib_extra_dirs = ; ESP_IDF 5.5.0 [core_esp32_IDF5_5_0__3_2_0_LittleFS] platform = https://github.com/Jason2866/platform-espressif32.git#Arduino/IDF55 -platform_packages = +platform_packages = https://github.com/Jason2866/esp32-arduino-lib-builder/releases/download/3692/framework-arduinoespressif32-all-release_v5.5-eefeb2bb.zip build_flags = -DESP32_STAGE -DESP_IDF_VERSION_MAJOR=5 -DLIBRARIES_NO_LOG=1 From c144a591460f98b41d5f2eafab9a637d6b53cc6c Mon Sep 17 00:00:00 2001 From: TD-er Date: Fri, 20 Jun 2025 11:20:13 +0200 Subject: [PATCH 058/564] [ESPtool] Prepare use of esptool v5.0.0 --- tools/pio/post_esp32.py | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) diff --git a/tools/pio/post_esp32.py b/tools/pio/post_esp32.py index d75e918f8..5de862526 100644 --- a/tools/pio/post_esp32.py +++ b/tools/pio/post_esp32.py @@ -26,6 +26,17 @@ from os.path import join sys.path.append(join(platform.get_package_dir("tool-esptoolpy"))) import esptool +def esptool_call(cmd): + try: + esptool.main(cmd) + except SystemExit as e: + # Fetch sys.exit() without leaving the script + if e.code == 0: + return True + else: + print(f"❌ esptool failed with exit code: {e.code}") + return False + def esp32_create_combined_bin(source, target, env): print("Generating combined binary for serial flashing") @@ -66,7 +77,7 @@ def esp32_create_combined_bin(source, target, env): print('Using esptool.py arguments: %s' % ' '.join(cmd)) - esptool.main(cmd) + esptool_call(cmd) env.AddPostAction("$BUILD_DIR/${PROGNAME}.bin", esp32_create_combined_bin) From ee6c6b6bfefbc3572ce329d6ad2a88c283c2cbe3 Mon Sep 17 00:00:00 2001 From: TD-er Date: Fri, 20 Jun 2025 11:21:19 +0200 Subject: [PATCH 059/564] [ESP32-S2] Change ADC for ESP32-S2 back to 13 bit --- src/src/Helpers/Hardware_defines.h | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/src/Helpers/Hardware_defines.h b/src/src/Helpers/Hardware_defines.h index e58d72e0a..901549f2c 100644 --- a/src/src/Helpers/Hardware_defines.h +++ b/src/src/Helpers/Hardware_defines.h @@ -19,7 +19,11 @@ #if ESP_IDF_VERSION_MAJOR < 5 # define MAX_ADC_VALUE ((1 << SOC_ADC_MAX_BITWIDTH) - 1) #else +#ifdef ESP32S2 + # define MAX_ADC_VALUE ((1 << 13) - 1) + # else # define MAX_ADC_VALUE ((1 << SOC_ADC_DIGI_MAX_BITWIDTH) - 1) + # endif #endif # endif // if CONFIG_IDF_TARGET_ESP32 #endif // ifdef ESP32 From 54e0ad486f9bb7c2443a8b7d8a77452a10547928 Mon Sep 17 00:00:00 2001 From: TD-er Date: Fri, 20 Jun 2025 17:27:53 +0200 Subject: [PATCH 060/564] [ESP-IDF] Revert to older build due to broken UART support --- platformio_core_defs.ini | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/platformio_core_defs.ini b/platformio_core_defs.ini index 1a06f5d42..00c82440c 100644 --- a/platformio_core_defs.ini +++ b/platformio_core_defs.ini @@ -229,7 +229,7 @@ lib_extra_dirs = ; ESP_IDF 5.5.0 [core_esp32_IDF5_5_0__3_2_0_LittleFS] platform = https://github.com/Jason2866/platform-espressif32.git#Arduino/IDF55 -platform_packages = https://github.com/Jason2866/esp32-arduino-lib-builder/releases/download/3692/framework-arduinoespressif32-all-release_v5.5-eefeb2bb.zip +platform_packages = framework-arduinoespressif32 @ https://github.com/Jason2866/esp32-arduino-lib-builder/releases/download/3627/framework-arduinoespressif32-all-release_v5.5-5d572003.zip build_flags = -DESP32_STAGE -DESP_IDF_VERSION_MAJOR=5 -DLIBRARIES_NO_LOG=1 From a9b749c34a20ea17abf2d12cf855929129e9c9ec Mon Sep 17 00:00:00 2001 From: TD-er Date: Fri, 20 Jun 2025 17:28:41 +0200 Subject: [PATCH 061/564] [ESP32-C5] Add hardware specific info about ESP32-C5 --- boards/esp32c5cdc-8M.json | 2 +- docs/source/ESPEasy/ESPchips.rst | 7 +- docs/source/Reference/GPIO.rst | 15 +++ src/src/DataTypes/SPI_options.h | 94 ++++++++++++------- src/src/Helpers/Hardware_GPIO.h | 1 + src/src/Helpers/Hardware_GPIO_ESP32.cpp | 6 ++ src/src/Helpers/Hardware_GPIO_ESP32C2.cpp | 5 + src/src/Helpers/Hardware_GPIO_ESP32C3.cpp | 9 +- src/src/Helpers/Hardware_GPIO_ESP32C5.cpp | 83 ++++++++-------- src/src/Helpers/Hardware_GPIO_ESP32C6.cpp | 8 ++ src/src/Helpers/Hardware_GPIO_ESP32P4.cpp | 6 ++ src/src/Helpers/Hardware_GPIO_ESP32S2.cpp | 6 ++ src/src/Helpers/Hardware_GPIO_ESP32S3.cpp | 5 + src/src/Helpers/Hardware_GPIO_ESP8266.cpp | 5 + .../Helpers/Hardware_device_info_ESP32C5.cpp | 8 +- src/src/Helpers/StringGenerator_GPIO.cpp | 5 + 16 files changed, 176 insertions(+), 89 deletions(-) diff --git a/boards/esp32c5cdc-8M.json b/boards/esp32c5cdc-8M.json index 17a802156..42ae430a3 100644 --- a/boards/esp32c5cdc-8M.json +++ b/boards/esp32c5cdc-8M.json @@ -4,7 +4,7 @@ "ldscript": "esp32c5_out.ld" }, "core": "esp32", - "extra_flags": "-DARDUINO_TASMOTA -DARDUINO_USB_MODE=1 -DUSE_USB_CDC_CONSOLE -DESP32_8M -DESP32C5 -DARDUINO_USB_CDC_ON_BOOT=1", + "extra_flags": "-DARDUINO_TASMOTA -DBOARD_HAS_PSRAM -DARDUINO_USB_MODE=1 -DUSE_USB_CDC_CONSOLE -DESP32_8M -DESP32C5 -DARDUINO_USB_CDC_ON_BOOT=1", "f_cpu": "160000000L", "f_flash": "80000000L", "flash_mode": "qio", diff --git a/docs/source/ESPEasy/ESPchips.rst b/docs/source/ESPEasy/ESPchips.rst index f5cf06b70..f00d235c6 100644 --- a/docs/source/ESPEasy/ESPchips.rst +++ b/docs/source/ESPEasy/ESPchips.rst @@ -593,6 +593,7 @@ Datasheets * `DS:ESP32-S3 `_ * `DS:ESP32-C3 `_ / `DS:ESP8685 `_ * `DS:ESP32-C2 `_ / `DS:ESP8684 `_ +* `DS:ESP32-C5 `_ * `DS:ESP32-C6 `_ * `DS:ESP32-H2 `_ @@ -606,6 +607,7 @@ Technical Reference Manuals * `TR:ESP32-S3 `_ * `TR:ESP32-C3 `_ * `TR:ESP32-C2 `_ +* `TR:ESP32-C5 `_ * `TR:ESP32-C6 `_ * `TR:ESP32-H2 `_ @@ -854,7 +856,7 @@ ESP32-C5 This will be the first Espressif SoC supporting 5 GHz WiFi. -.. note:: Not yet available (as of Dec 2024) +.. note:: Beta silicon is available (as of June 2025), which may change in Q3 or Q4 of 2025. So not yet adviced to be used in real products ESP32-C6 ======== @@ -897,4 +899,5 @@ The CPU is rather powerful and there are versions with quite a large amount of P It does have a RMII interface for Ethernet, like the ESP32-classic does. -.. note:: Not yet supported (as of Dec 2024) +.. note:: Not yet supported. Beta silicon is available (as of June 2025), which may change in Q3 or Q4 of 2025. So not yet adviced to be used in real products + diff --git a/docs/source/Reference/GPIO.rst b/docs/source/Reference/GPIO.rst index fd2fd282f..ca9b50539 100644 --- a/docs/source/Reference/GPIO.rst +++ b/docs/source/Reference/GPIO.rst @@ -614,6 +614,21 @@ ESP32-C2 (ESP8684) The strapping combination of GPIO-8 = 0 and GPIO-9 = 0 is invalid and will trigger unexpected behavior. +ESP32-C5 +~~~~~~~~ + +* GPIO-26 ... 28: "Select Bootloader Mode" pin +* GPIO-27: Enable or disable ROM messages printing +* GPIO-7: JTAG signal source +* GPIO-2: MTMS, used to select crystal frequency in non-standard boot mode + + +GPIO-2 is only used when the crystal frequency isn't explicitly set via efuses (which should not happen). + +GPIO-25 and -3 are used to set SDIO sampling and driving clock edge. +However this is also never used as SDIO mode means no flash and the chip is connected to a CPU and used as WiFi card. + + ESP32-C6 ~~~~~~~~ diff --git a/src/src/DataTypes/SPI_options.h b/src/src/DataTypes/SPI_options.h index b70459622..341695d87 100644 --- a/src/src/DataTypes/SPI_options.h +++ b/src/src/DataTypes/SPI_options.h @@ -16,15 +16,15 @@ // SPI_HOST = SPI1_HOST // Only usable on ESP32 // HSPI_HOST = SPI2_HOST // VSPI_HOST = SPI3_HOST -// +// // ESP32-S2: // FSPI_HOST = SPI2_HOST // HSPI_HOST = SPI3_HOST -// +// // ESP32-S3: // FSPI_HOST = SPI2_HOST // HSPI_HOST = SPI3_HOST -// +// // ESP32-C6: // FSPI_HOST = SPI1_HOST // ESP32-C3: @@ -39,51 +39,72 @@ // HSPI option is disabled for now on other than ESP32_CLASSIC. // Should be added later as "Custom HSPI" when we support multiple SPI busses. #ifdef ESP32 -# if CONFIG_IDF_TARGET_ESP32S3 // ESP32-S3 -#define VSPI_FSPI_SCK 36 -#define VSPI_FSPI_MISO 37 -#define VSPI_FSPI_MOSI 35 -# elif CONFIG_IDF_TARGET_ESP32S2 // ESP32-S2 -#define VSPI_FSPI_SCK 36 -#define VSPI_FSPI_MISO 37 -#define VSPI_FSPI_MOSI 35 +# if ESP_IDF_VERSION < ESP_IDF_VERSION_VAL(5, 4, 0) +# if CONFIG_IDF_TARGET_ESP32S3 // ESP32-S3 +# define VSPI_FSPI_SCK 36 +# define VSPI_FSPI_MISO 37 +# define VSPI_FSPI_MOSI 35 +# elif CONFIG_IDF_TARGET_ESP32S2 // ESP32-S2 +# define VSPI_FSPI_SCK 36 +# define VSPI_FSPI_MISO 37 +# define VSPI_FSPI_MOSI 35 # elif CONFIG_IDF_TARGET_ESP32C6 // ESP32-C6 -#define VSPI_FSPI_SCK 21 -#define VSPI_FSPI_MISO 20 -#define VSPI_FSPI_MOSI 19 +# define VSPI_FSPI_SCK 21 +# define VSPI_FSPI_MISO 20 +# define VSPI_FSPI_MOSI 19 # elif CONFIG_IDF_TARGET_ESP32C5 // ESP32-C5 -#define VSPI_FSPI_SCK 4 -#define VSPI_FSPI_MISO 5 -#define VSPI_FSPI_MOSI 6 +# define VSPI_FSPI_SCK SPI2_IOMUX_PIN_NUM_CLK +# define VSPI_FSPI_MISO SPI2_IOMUX_PIN_NUM_MISO +# define VSPI_FSPI_MOSI SPI2_IOMUX_PIN_NUM_MOSI # elif CONFIG_IDF_TARGET_ESP32C3 // ESP32-C3 -#define VSPI_FSPI_SCK 4 -#define VSPI_FSPI_MISO 5 -#define VSPI_FSPI_MOSI 6 +# define VSPI_FSPI_SCK 4 +# define VSPI_FSPI_MISO 5 +# define VSPI_FSPI_MOSI 6 # elif CONFIG_IDF_TARGET_ESP32C2 // ESP32-C2 -#define VSPI_FSPI_SCK 4 -#define VSPI_FSPI_MISO 5 -#define VSPI_FSPI_MOSI 6 -# elif CONFIG_IDF_TARGET_ESP32 // ESP32/PICO-D4 -#define VSPI_FSPI_SCK 18 -#define VSPI_FSPI_MISO 19 -#define VSPI_FSPI_MOSI 23 +# define VSPI_FSPI_SCK 4 +# define VSPI_FSPI_MISO 5 +# define VSPI_FSPI_MOSI 6 +# elif CONFIG_IDF_TARGET_ESP32 // ESP32/PICO-D4 +# define VSPI_FSPI_SCK 18 +# define VSPI_FSPI_MISO 19 +# define VSPI_FSPI_MOSI 23 -# define HSPI_SCLK 14 -# define HSPI_MISO 12 -# define HSPI_MOSI 13 -# define HSPI_SS 15 +# define HSPI_SCLK 14 +# define HSPI_MISO 12 +# define HSPI_MOSI 13 +# define HSPI_SS 15 # else // if CONFIG_IDF_TARGET_ESP32S2 # error Target CONFIG_IDF_TARGET is not supported # endif // if CONFIG_IDF_TARGET_ESP32S2 +# else // if ESP_IDF_VERSION < ESP_IDF_VERSION_VAL(5, 4, 0) +# if CONFIG_IDF_TARGET_ESP32 // ESP32/PICO-D4 -#endif +# define VSPI_FSPI_SCK 18 +# define VSPI_FSPI_MISO 19 +# define VSPI_FSPI_MOSI 23 -enum class SPI_Options_e { // Do not change values as this is stored in the settings! - None = 0, - Vspi_Fspi = 1, // Default SPI bus +# define HSPI_SCLK 14 +# define HSPI_MISO 12 +# define HSPI_MOSI 13 +# define HSPI_SS 15 + +# else // if CONFIG_IDF_TARGET_ESP32 +# include + +# define VSPI_FSPI_SCK SPI2_IOMUX_PIN_NUM_CLK +# define VSPI_FSPI_MISO SPI2_IOMUX_PIN_NUM_MISO +# define VSPI_FSPI_MOSI SPI2_IOMUX_PIN_NUM_MOSI + +# endif // if CONFIG_IDF_TARGET_ESP32 +# endif // if ESP_IDF_VERSION < ESP_IDF_VERSION_VAL(5, 4, 0) +#endif // ifdef ESP32 +enum class SPI_Options_e { + // Do not change values as this is stored in the settings! + None = 0, + Vspi_Fspi = 1, // General-purpose SPI (GP-SPI) mode (Default SPI bus) #ifdef ESP32_CLASSIC - Hspi = 2, + Hspi = 2, #endif // UserDefined is using the default SPI bus. @@ -91,6 +112,7 @@ enum class SPI_Options_e { // Do not change values as this is stored in the sett // For later versions it is called FSPI // N.B. the ESP32-C3 does not seem to name these as there is no SPI3_HOST. UserDefined = 9 // Leave some room for other, possible future, hardware-related options + }; #ifdef ESP32 diff --git a/src/src/Helpers/Hardware_GPIO.h b/src/src/Helpers/Hardware_GPIO.h index dd97c5636..e03522aa6 100644 --- a/src/src/Helpers/Hardware_GPIO.h +++ b/src/src/Helpers/Hardware_GPIO.h @@ -17,6 +17,7 @@ bool getGpioInfo(int gpio, bool& input, bool& output, bool& warning); +bool isBootModePin(int gpio); bool isBootStrapPin(int gpio); diff --git a/src/src/Helpers/Hardware_GPIO_ESP32.cpp b/src/src/Helpers/Hardware_GPIO_ESP32.cpp index c7a42abec..1a130f49c 100644 --- a/src/src/Helpers/Hardware_GPIO_ESP32.cpp +++ b/src/src/Helpers/Hardware_GPIO_ESP32.cpp @@ -82,6 +82,12 @@ bool getGpioInfo(int gpio, int& pinnr, bool& input, bool& output, bool& warning) return (input || output); } +bool isBootModePin(int gpio) +{ + return gpio == 0; +} + + bool isBootStrapPin(int gpio) { // GPIO 0 & 2 can't be used as an input. State during boot is dependent on boot mode. diff --git a/src/src/Helpers/Hardware_GPIO_ESP32C2.cpp b/src/src/Helpers/Hardware_GPIO_ESP32C2.cpp index 609839052..a5d525d5f 100644 --- a/src/src/Helpers/Hardware_GPIO_ESP32C2.cpp +++ b/src/src/Helpers/Hardware_GPIO_ESP32C2.cpp @@ -36,6 +36,11 @@ bool getGpioInfo(int gpio, int& pinnr, bool& input, bool& output, bool& warning) return (input || output); } +bool isBootModePin(int gpio) +{ + return gpio == 9; +} + bool isBootStrapPin(int gpio) { if (gpio == 8) { diff --git a/src/src/Helpers/Hardware_GPIO_ESP32C3.cpp b/src/src/Helpers/Hardware_GPIO_ESP32C3.cpp index 99bfc09ff..daf353e55 100644 --- a/src/src/Helpers/Hardware_GPIO_ESP32C3.cpp +++ b/src/src/Helpers/Hardware_GPIO_ESP32C3.cpp @@ -45,9 +45,7 @@ bool getGpioInfo(int gpio, int& pinnr, bool& input, bool& output, bool& warning) output = false; } else { // See: https://www.letscontrolit.com/forum/viewtopic.php?p=71880#p71874 - if ((gpio == 12) || (gpio == 13)) { - // SPIHD/GPIO12 - // SPIWP/GPIO13 + if ((gpio == MSPI_IOMUX_PIN_NUM_HD) || (gpio == MSPI_IOMUX_PIN_NUM_WP)) { if ((ESP.getFlashChipMode() != FM_DOUT) && (ESP.getFlashChipMode() != FM_DIO)) { input = false; @@ -73,6 +71,11 @@ bool getGpioInfo(int gpio, int& pinnr, bool& input, bool& output, bool& warning) return (input || output); } +bool isBootModePin(int gpio) +{ + return gpio == 9; +} + bool isBootStrapPin(int gpio) { if (gpio == 2) { diff --git a/src/src/Helpers/Hardware_GPIO_ESP32C5.cpp b/src/src/Helpers/Hardware_GPIO_ESP32C5.cpp index f70b53b27..6f3e7218a 100644 --- a/src/src/Helpers/Hardware_GPIO_ESP32C5.cpp +++ b/src/src/Helpers/Hardware_GPIO_ESP32C5.cpp @@ -2,9 +2,12 @@ #ifdef ESP32C5 # include +# include # include "../Helpers/Hardware_device_info.h" + + // ******************************************************************************** // Get info of a specific GPIO pin // ******************************************************************************** @@ -21,33 +24,18 @@ bool getGpioInfo(int gpio, int& pinnr, bool& input, bool& output, bool& warning) // FIXME TD-er: Implement for ESP32-C5 // See: - // - https://docs.espressif.com/projects/esp-idf/en/v5.0/esp32c3/hw-reference/esp32c3/user-guide-devkitm-1.html - // - https://docs.espressif.com/projects/esp-idf/en/latest/esp32c3/api-reference/peripherals/gpio.html + // - https://docs.espressif.com/projects/esp-idf/en/v5.0/esp32c5/hw-reference/esp32c3/user-guide-devkitm-1.html + // - https://docs.espressif.com/projects/esp-idf/en/latest/esp32c5/api-reference/peripherals/gpio.html // Datasheet: https://www.espressif.com/sites/default/files/documentation/esp32-c3_datasheet_en.pdf - if (gpio == 11) { - if (getChipFeatures().embeddedFlash /* || !flashVddPinCanBeUsedAsGPIO() */) { - // See: https://www.letscontrolit.com/forum/viewtopic.php?p=71880#p71874 - // - // By default VDD_SPI is the power supply pin for embedded flash or external flash. - // It can only be used as GPIO11 only when the chip is connected to an - // external flash, and this flash is powered by an external power supply - input = false; - output = false; - } - warning = true; - } - - if (isFlashInterfacePin_ESPEasy(gpio)) { + if (isFlashInterfacePin_ESPEasy(gpio) || isPSRAMInterfacePin(gpio)) { if (getChipFeatures().embeddedFlash) { // Connected to the integrated SPI flash. input = false; output = false; } else { // See: https://www.letscontrolit.com/forum/viewtopic.php?p=71880#p71874 - if ((gpio == 12) || (gpio == 13)) { - // SPIHD/GPIO12 - // SPIWP/GPIO13 + if ((gpio == MSPI_IOMUX_PIN_NUM_HD) || (gpio == MSPI_IOMUX_PIN_NUM_WP)) { if ((ESP.getFlashChipMode() != FM_DOUT) && (ESP.getFlashChipMode() != FM_DIO)) { input = false; @@ -64,31 +52,44 @@ bool getGpioInfo(int gpio, int& pinnr, bool& input, bool& output, bool& warning) warning = true; } - // GPIO 18: USB_D- - // GPIO 19: USB_D+ - - // GPIO 20: U0RXD - // GPIO 21: U0TXD - return (input || output); } +bool isBootModePin(int gpio) +{ + return gpio == 28; +} + bool isBootStrapPin(int gpio) { - if (gpio == 2) { - // Strapping pin which must be high during boot + // Boot mode | GPIO26 | GPIO27 | GPIO28 + // + // SPI Boot | Any | Any | 1 + // Joint Download Boot 0 | Any | 1 | 0 + // Joint Download Boot 1 | 0 | 0 | 0 +/* + Joint Download Boot 0 mode supports the following download methods: + - USB-Serial-JTAG Download Boot + - UART Download Boot + - SPI Slave Download Boot (chip revision v0.1 only) + + Joint Download Boot 1 mode supports the following download methods: + - UART Download Boot + - SDIO Download Boot +*/ + if (gpio == 26 || gpio == 27 || gpio == 28) { + // Strapping pin setting boot mode return true; } - if (gpio == 8) { - // Strapping pin which must be high during flashing + + if (gpio == 7) { + // Strapping pin JTAG signal source return true; } - if (gpio == 9) { - // Strapping pin to force download mode (like GPIO-0 on ESP8266/ESP32-classic) - return true; - } + // Ignoring strapping pins GPIO-2, -3, 25 + // as they should never cause issues for users. return false; } @@ -125,22 +126,12 @@ bool getADC_gpio_info(int gpio_pin, int& adc, int& ch, int& t) ch = -1; t = -1; - if ((gpio_pin >= 0) && (gpio_pin <= 4)) { + // GPIO 1 ... 6 -> Channel 0 ... 5 + if ((gpio_pin > 0) && (gpio_pin <= 6)) { adc = 1; - ch = gpio_pin; + ch = gpio_pin - 1; return true; } - # if ESP_IDF_VERSION_MAJOR >= 5 - - // Support for ADC2 has been dropped. - # else // if ESP_IDF_VERSION_MAJOR >= 5 - - if (gpio_pin == 5) { - adc = 2; - ch = 0; - return true; - } - # endif // if ESP_IDF_VERSION_MAJOR >= 5 return false; } diff --git a/src/src/Helpers/Hardware_GPIO_ESP32C6.cpp b/src/src/Helpers/Hardware_GPIO_ESP32C6.cpp index b559912c4..bf5a53456 100644 --- a/src/src/Helpers/Hardware_GPIO_ESP32C6.cpp +++ b/src/src/Helpers/Hardware_GPIO_ESP32C6.cpp @@ -42,6 +42,11 @@ bool getGpioInfo(int gpio, int& pinnr, bool& input, bool& output, bool& warning) return (input || output); } +bool isBootModePin(int gpio) +{ + return gpio == 9; +} + bool isBootStrapPin(int gpio) { // See: https://www.espressif.com/sites/default/files/documentation/esp32-c6_datasheet_en.pdf @@ -58,12 +63,15 @@ bool isBootStrapPin(int gpio) return true; } + // Ignoring SDIO stapping pins as this will not be used in typical use cases where ESPEasy is used. + /* if (gpio == 4 || gpio == 5) { // SDIO Sampling and Driving Clock Edge // MTMS = GPIO-4 // MTDI = Gpio-5 return true; } + */ if (gpio == 15) { // JTAG signal source diff --git a/src/src/Helpers/Hardware_GPIO_ESP32P4.cpp b/src/src/Helpers/Hardware_GPIO_ESP32P4.cpp index ebfe55994..6e26586a0 100644 --- a/src/src/Helpers/Hardware_GPIO_ESP32P4.cpp +++ b/src/src/Helpers/Hardware_GPIO_ESP32P4.cpp @@ -47,6 +47,12 @@ bool getGpioInfo(int gpio, int& pinnr, bool& input, bool& output, bool& warning) return (input || output); } +bool isBootModePin(int gpio) +{ + return gpio == 35; +} + + bool isBootStrapPin(int gpio) { diff --git a/src/src/Helpers/Hardware_GPIO_ESP32S2.cpp b/src/src/Helpers/Hardware_GPIO_ESP32S2.cpp index 4ffe6ab2c..c7337b49b 100644 --- a/src/src/Helpers/Hardware_GPIO_ESP32S2.cpp +++ b/src/src/Helpers/Hardware_GPIO_ESP32S2.cpp @@ -45,6 +45,12 @@ bool getGpioInfo(int gpio, int& pinnr, bool& input, bool& output, bool& warning) return (input || output); } +bool isBootModePin(int gpio) +{ + return gpio == 0; +} + + bool isBootStrapPin(int gpio) { if (gpio == 45) { diff --git a/src/src/Helpers/Hardware_GPIO_ESP32S3.cpp b/src/src/Helpers/Hardware_GPIO_ESP32S3.cpp index be747f1f9..1f57ff3ce 100644 --- a/src/src/Helpers/Hardware_GPIO_ESP32S3.cpp +++ b/src/src/Helpers/Hardware_GPIO_ESP32S3.cpp @@ -46,6 +46,11 @@ bool getGpioInfo(int gpio, int& pinnr, bool& input, bool& output, bool& warning) return (input || output); } +bool isBootModePin(int gpio) +{ + return gpio == 0; +} + bool isBootStrapPin(int gpio) { if (gpio == 45) { diff --git a/src/src/Helpers/Hardware_GPIO_ESP8266.cpp b/src/src/Helpers/Hardware_GPIO_ESP8266.cpp index 917602466..17a566789 100644 --- a/src/src/Helpers/Hardware_GPIO_ESP8266.cpp +++ b/src/src/Helpers/Hardware_GPIO_ESP8266.cpp @@ -66,6 +66,11 @@ bool getGpioInfo(int gpio, int& pinnr, bool& input, bool& output, bool& warning) return input || output; } +bool isBootModePin(int gpio) +{ + return gpio == 0; +} + bool isBootStrapPin(int gpio) { return (gpio == 0 || gpio == 2 || gpio == 15); diff --git a/src/src/Helpers/Hardware_device_info_ESP32C5.cpp b/src/src/Helpers/Hardware_device_info_ESP32C5.cpp index bbed9d264..80440d4d9 100644 --- a/src/src/Helpers/Hardware_device_info_ESP32C5.cpp +++ b/src/src/Helpers/Hardware_device_info_ESP32C5.cpp @@ -25,6 +25,10 @@ bool isFlashInterfacePin_ESPEasy(int gpio) { case MSPI_IOMUX_PIN_NUM_MOSI: case MSPI_IOMUX_PIN_NUM_MISO: return true; + + case 19: + // special pin to power flash + return true; } return false; @@ -63,14 +67,16 @@ int32_t getEmbeddedPSRAMSize() return 0; } + # ifndef isPSRAMInterfacePin bool isPSRAMInterfacePin(int gpio) { - return false; + return FoundPSRAM() ? ((gpio) >= MSPI_IOMUX_PIN_NUM_CS1 && (gpio) <= MSPI_IOMUX_PIN_NUM_MOSI) : false; } # endif // ifndef isPSRAMInterfacePin + const __FlashStringHelper* getChipModel(uint32_t chip_model, uint32_t chip_revision, uint32_t pkg_version, bool single_core) { return F("ESP32-C5"); diff --git a/src/src/Helpers/StringGenerator_GPIO.cpp b/src/src/Helpers/StringGenerator_GPIO.cpp index 36f4cc58c..f71bc8c1b 100644 --- a/src/src/Helpers/StringGenerator_GPIO.cpp +++ b/src/src/Helpers/StringGenerator_GPIO.cpp @@ -373,6 +373,11 @@ const __FlashStringHelper* getConflictingUse(int gpio, PinSelectPurpose purpose, } #endif // if FEATURE_ETHERNET + + if (isBootModePin(gpio)) { + return F("Boot Mode"); + } + if (isBootStrapPin(gpio)) { return F("Boot Strapping"); } From ec4b23a0216415f5b36425dd4e38ffcc3707738f Mon Sep 17 00:00:00 2001 From: TD-er Date: Sat, 21 Jun 2025 01:03:40 +0200 Subject: [PATCH 062/564] [Build] Get rid of all ESP32-SPIFFS builds --- platformio_core_defs.ini | 34 +- platformio_esp32_envs.ini | 459 +++++----------------- platformio_esp32c3_envs.ini | 127 ++---- platformio_esp32c5_envs.ini | 10 +- platformio_esp32s2_envs.ini | 114 ++---- platformio_esp32s3_envs.ini | 117 ++---- src/src/Helpers/Hardware_GPIO_ESP32C3.cpp | 4 +- tools/pio/post_esp32.py | 8 +- 8 files changed, 213 insertions(+), 660 deletions(-) diff --git a/platformio_core_defs.ini b/platformio_core_defs.ini index 00c82440c..569072a76 100644 --- a/platformio_core_defs.ini +++ b/platformio_core_defs.ini @@ -162,44 +162,12 @@ extra_scripts = ${esp82xx_common.extra_scripts} -; Updated ESP-IDF to the latest stable 4.0.1 -; See: https://github.com/platformio/platform-espressif32/releases -; IDF 4.4 = platform-espressif32 3.4.x = espressif/arduino-esp32 tag 2.0.4 -; Just for those who lost track of the extremely confusing numbering schema. -; For MUSTFIX_CLIENT_TIMEOUT_IN_SECONDS See: https://github.com/espressif/arduino-esp32/pull/6676 -[core_esp32_IDF5_1_4__3_1_0_SPIFFS] -platform = https://github.com/tasmota/platform-espressif32/releases/download/2024.09.10/platform-espressif32.zip -platform_packages = framework-arduinoespressif32 @ https://github.com/Jason2866/esp32-arduino-lib-builder/releases/download/3202/framework-arduinoespressif32-all-release_v5.1-41a885b.zip -build_flags = -DESP32_STAGE - -DESP_IDF_VERSION_MAJOR=5 - -DLIBRARIES_NO_LOG=1 - -DDISABLE_SC16IS752_SPI - -DCONFIG_PM_ENABLE=0 - -DESP_IDF_STILL_NEEDS_SPI_REGISTERS_FIXED - -DPR_9453_FLUSH_TO_CLEAR=clear - - ;-DETH_TYPE_JL1101_SUPPORTED -; -DCONFIG_LWIP_L2_TO_L3_COPY -; -DETH_SPI_SUPPORTS_NO_IRQ=1 - -DCONFIG_FREERTOS_USE_TICKLESS_IDLE=1 - -DCONFIG_FREERTOS_IDLE_TIME_BEFORE_SLEEP=3 - -DNEOPIXEL_ESP32_RMT_DEFAULT - -DCRON_USE_LOCAL_TIME - -I$PROJECT_DIR/src/include - -include "sdkconfig.h" - -include "ESPEasy_config.h" - -include "esp32x_fixes.h" - -Wnull-dereference -lib_ignore = -lib_extra_dirs = - lib/lib_ssl - ; ESP_IDF 5.4.1 [core_esp32_IDF5_4_1__3_2_0_LittleFS] ;platform = https://github.com/Jason2866/platform-espressif32.git#Arduino/IDF54 ;platform_packages = framework-arduinoespressif32 @ https://github.com/Jason2866/esp32-arduino-lib-builder/releases/download/3538/framework-arduinoespressif32-all-release_v5.4-8f5ad6d7.zip -platform = https://github.com/Jason2866/platform-espressif32.git#Arduino/IDF55 +platform = https://github.com/Jason2866/platform-espressif32.git#Arduino/IDF54 platform_packages = build_flags = -DESP32_STAGE -DESP_IDF_VERSION_MAJOR=5 diff --git a/platformio_esp32_envs.ini b/platformio_esp32_envs.ini index bf258e2db..6670dced5 100644 --- a/platformio_esp32_envs.ini +++ b/platformio_esp32_envs.ini @@ -1,40 +1,3 @@ -;;; ESP32 test build ********************************************************************; -; Status of the ESP32 support is still considered "beta" ; -; Most plugins work just fine on ESP32. ; -; Especially some plugins using serial may not run very well (GPS does run fine). ; -; ***************************************************************************************; - - -[esp32_base] -extends = common, core_esp32_IDF5_1_4__3_1_0_SPIFFS -upload_speed = 460800 -upload_before_reset = default_reset -upload_after_reset = hard_reset -extra_scripts = pre:tools/pio/pre_esp32.py - post:tools/pio/post_esp32.py - ${extra_scripts_default.extra_scripts} - post:tools/pio/copy_files.py -; you can disable debug linker flag to reduce binary size (comment out line below), but the backtraces will become less readable -; tools/pio/extra_linker_flags.py -; fix the platform package to use gcc-ar and gcc-ranlib to enable lto linker plugin -; more detail: https://embeddedartistry.com/blog/2020/04/13/prefer-gcc-ar-to-ar-in-your-buildsystems/ -; pre:tools/pio/apply_patches.py -build_unflags = -Wall - -fno-lto -build_flags = ${core_esp32_IDF5_1_4__3_1_0_SPIFFS.build_flags} -; ${mqtt_flags.build_flags} - -DMQTT_MAX_PACKET_SIZE=2048 - -DCONFIG_FREERTOS_ASSERT_DISABLE - -DCONFIG_LWIP_ESP_GRATUITOUS_ARP - -fno-strict-aliasing - -flto=auto - -Wswitch - -DCORE_DEBUG_LEVEL=ARDUHAL_LOG_LEVEL_NONE -monitor_filters = esp32_exception_decoder -lib_ignore = - ${core_esp32_IDF5_1_4__3_1_0_SPIFFS.lib_ignore} - - [esp32_base_idf5] extends = common, core_esp32_IDF5_4_1__3_2_0_LittleFS upload_speed = 460800 @@ -110,16 +73,6 @@ lib_ignore = ${core_esp32_IDF5_5_0__3_2_0_LittleFS.lib_ignore} -; -flto cannot be used for ESP32 C3! -; See: https://github.com/letscontrolit/ESPEasy/pull/3845#issuecomment-1014857366 -; TD-er: 2022-01-20: Disabled for now as it also resulted in obscure linker errors on ESP32-S2 and ESP32 running custom builds. -;build_flags = ${esp32_base.build_flags} -; -flto -;build_unflags = ${esp32_base.build_unflags} -; -fexceptions -; -fno-lto - - [esp32_always] lib_ignore = ESP8266Ping ESP8266HTTPUpdateServer @@ -131,20 +84,9 @@ lib_ignore = ESP8266Ping TinyWireM LittleFS_esp32 Adafruit NeoPixel - ${esp32_base.lib_ignore} + ${esp32_base_idf5.lib_ignore} -[esp32_common] -extends = esp32_base -lib_ignore = ${esp32_always.lib_ignore} - ESP32_ping - ${no_ir.lib_ignore} - ESP32 BLE Arduino -build_flags = ${esp32_base.build_flags} - -DESP32_CLASSIC -extra_scripts = ${esp32_base.extra_scripts} -build_unflags = ${esp32_base.build_unflags} - -fexceptions [esp32_common_LittleFS] extends = esp32_base_idf5 @@ -153,7 +95,7 @@ build_flags = ${esp32_base_idf5.build_flags} -DESP32_CLASSIC -DUSE_LITTLEFS build_unflags = ${esp32_base_idf5.build_unflags} -extra_scripts = ${esp32_common.extra_scripts} +extra_scripts = ${esp32_base_idf5.extra_scripts} board_build.filesystem = littlefs lib_ignore = ${esp32_always.lib_ignore} ESP32_ping @@ -161,25 +103,19 @@ lib_ignore = ${esp32_always.lib_ignore} ${core_esp32_IDF5_4_1__3_2_0_LittleFS.lib_ignore} -[esp32_IRExt] -extends = esp32_common +[esp32_IRExt_LittleFS_ETH] +extends = esp32_common_LittleFS lib_ignore = ${esp32_always.lib_ignore} ESP32_ping -build_flags = ${esp32_common.build_flags} +build_flags = ${esp32_common_LittleFS.build_flags} + -DFEATURE_ETHERNET=1 -DFEATURE_ARDUINO_OTA=1 -DPLUGIN_BUILD_NORMAL_IRext -DCOLLECTION_FEATURE_RTTTL=1 -extra_scripts = ${esp32_common.extra_scripts} +extra_scripts = ${esp32_common_LittleFS.extra_scripts} pre:tools/pio/ir_build_check.py -[esp32_custom_base] -extends = esp32_common -build_flags = ${esp32_common.build_flags} - -DPLUGIN_BUILD_CUSTOM -extra_scripts = ${esp32_common.extra_scripts} - pre:tools/pio/pre_custom_esp32.py - [esp32_custom_base_LittleFS] extends = esp32_common_LittleFS build_flags = ${esp32_common_LittleFS.build_flags} @@ -188,189 +124,165 @@ extra_scripts = ${esp32_common_LittleFS.extra_scripts} pre:tools/pio/pre_custom_esp32.py -[env:custom_ESP32_4M316k_ETH] -extends = esp32_custom_base -board = esp32_4M -build_flags = ${esp32_custom_base.build_flags} - -DFEATURE_ETHERNET=1 - -; [env:custom_ESP32_4M316k_LittleFS] -; extends = esp32_custom_base_LittleFS -; board = esp32_4M - -[env:custom_ESP32_16M8M_LittleFS_ETH] +[env:custom_ESP32_4M316k_LittleFS_ETH] extends = esp32_custom_base_LittleFS -board = esp32_16M8M -board_upload.flash_size = 16MB +board = esp32_4M build_flags = ${esp32_custom_base_LittleFS.build_flags} -DFEATURE_ETHERNET=1 -[env:custom_IR_ESP32_4M316k_ETH] -extends = esp32_common + +[env:custom_ESP32_16M8M_LittleFS_ETH] +extends = env:custom_ESP32_4M316k_LittleFS_ETH +board = esp32_16M8M +board_upload.flash_size = 16MB +build_flags = ${env:custom_ESP32_4M316k_LittleFS_ETH.build_flags} + + +[env:custom_IR_ESP32_4M316k_LittleFS_ETH] +extends = esp32_common_LittleFS board = esp32_4M -build_flags = ${esp32_common.build_flags} +build_flags = ${esp32_common_LittleFS.build_flags} -DPLUGIN_BUILD_CUSTOM -DPLUGIN_BUILD_IR - -DFEATURE_ETHERNET=1 + lib_ignore = ${esp32_always.lib_ignore} ESP32_ping -extra_scripts = ${esp32_common.extra_scripts} +extra_scripts = ${esp32_common_LittleFS.extra_scripts} pre:tools/pio/pre_custom_esp32_IR.py pre:tools/pio/ir_build_check.py [env:custom_ESP32_4M2M_NO_OTA_LittleFS_ETH] -extends = esp32_custom_base_LittleFS +extends = env:custom_ESP32_4M316k_LittleFS_ETH board = esp32_4M2M -build_flags = ${esp32_custom_base_LittleFS.build_flags} +build_flags = ${env:custom_ESP32_4M316k_LittleFS_ETH.build_flags} -DNO_HTTP_UPDATER - -DFEATURE_ETHERNET=1 + -[env:normal_ESP32_4M316k_ETH] -extends = esp32_common +[env:collection_A_ESP32_4M316k_LittleFS_ETH] +extends = esp32_common_LittleFS board = esp32_4M -lib_ignore = ${esp32_common.lib_ignore} - ${no_ir.lib_ignore} -build_flags = ${esp32_common.build_flags} - -DFEATURE_ETHERNET=1 - -; [env:normal_ESP32_4M316k_LittleFS] -; extends = esp32_common_LittleFS -; board = esp32_4M -; lib_ignore = ${esp32_common_LittleFS.lib_ignore} -; ${no_ir.lib_ignore} - -[env:collection_A_ESP32_4M316k_ETH] -extends = esp32_common -board = esp32_4M -build_flags = ${esp32_common.build_flags} +build_flags = ${esp32_common_LittleFS.build_flags} -DFEATURE_ARDUINO_OTA=1 -DPLUGIN_SET_COLLECTION_ESP32 -DCOLLECTION_FEATURE_RTTTL=1 - -DFEATURE_ETHERNET=1 + -[env:collection_B_ESP32_4M316k_ETH] -extends = esp32_common +[env:collection_B_ESP32_4M316k_LittleFS_ETH] +extends = esp32_common_LittleFS board = esp32_4M -build_flags = ${esp32_common.build_flags} +build_flags = ${esp32_common_LittleFS.build_flags} -DFEATURE_ARDUINO_OTA=1 -DPLUGIN_SET_COLLECTION_B_ESP32 -DCOLLECTION_FEATURE_RTTTL=1 - -DFEATURE_ETHERNET=1 + -[env:collection_C_ESP32_4M316k_ETH] -extends = esp32_common +[env:collection_C_ESP32_4M316k_LittleFS_ETH] +extends = esp32_common_LittleFS board = esp32_4M -build_flags = ${esp32_common.build_flags} +build_flags = ${esp32_common_LittleFS.build_flags} -DFEATURE_ARDUINO_OTA=1 -DPLUGIN_SET_COLLECTION_C_ESP32 -DCOLLECTION_FEATURE_RTTTL=1 - -DFEATURE_ETHERNET=1 + -[env:collection_D_ESP32_4M316k_ETH] -extends = esp32_common +[env:collection_D_ESP32_4M316k_LittleFS_ETH] +extends = esp32_common_LittleFS board = esp32_4M -build_flags = ${esp32_common.build_flags} +build_flags = ${esp32_common_LittleFS.build_flags} -DFEATURE_ARDUINO_OTA=1 -DPLUGIN_SET_COLLECTION_D_ESP32 -DCOLLECTION_FEATURE_RTTTL=1 - -DFEATURE_ETHERNET=1 + -[env:collection_E_ESP32_4M316k_ETH] -extends = esp32_common +[env:collection_E_ESP32_4M316k_LittleFS_ETH] +extends = esp32_common_LittleFS board = esp32_4M -build_flags = ${esp32_common.build_flags} +build_flags = ${esp32_common_LittleFS.build_flags} -DFEATURE_ARDUINO_OTA=1 -DPLUGIN_SET_COLLECTION_E_ESP32 -DCOLLECTION_FEATURE_RTTTL=1 - -DFEATURE_ETHERNET=1 + -[env:collection_F_ESP32_4M316k_ETH] -extends = esp32_common +[env:collection_F_ESP32_4M316k_LittleFS_ETH] +extends = esp32_common_LittleFS board = esp32_4M -build_flags = ${esp32_common.build_flags} +build_flags = ${esp32_common_LittleFS.build_flags} -DFEATURE_ARDUINO_OTA=1 -DPLUGIN_SET_COLLECTION_F_ESP32 -DCOLLECTION_FEATURE_RTTTL=1 - -DFEATURE_ETHERNET=1 + -[env:collection_G_ESP32_4M316k_ETH] -extends = esp32_common +[env:collection_G_ESP32_4M316k_LittleFS_ETH] +extends = esp32_common_LittleFS board = esp32_4M -build_flags = ${esp32_common.build_flags} +build_flags = ${esp32_common_LittleFS.build_flags} -DFEATURE_ARDUINO_OTA=1 -DPLUGIN_SET_COLLECTION_G_ESP32 -DCOLLECTION_FEATURE_RTTTL=1 - -DFEATURE_ETHERNET=1 + -[env:collection_A_ESP32_IRExt_4M316k] -extends = esp32_IRExt +[env:collection_A_ESP32_IRExt_4M316k_LittleFS_ETH] +extends = esp32_IRExt_LittleFS_ETH board = esp32_4M -build_flags = ${esp32_IRExt.build_flags} +build_flags = ${esp32_IRExt_LittleFS_ETH.build_flags} -DPLUGIN_SET_COLLECTION_ESP32 -[env:collection_B_ESP32_IRExt_4M316k] -extends = esp32_IRExt +[env:collection_B_ESP32_IRExt_4M316k_LittleFS_ETH] +extends = esp32_IRExt_LittleFS_ETH board = esp32_4M -build_flags = ${esp32_IRExt.build_flags} +build_flags = ${esp32_IRExt_LittleFS_ETH.build_flags} -DPLUGIN_SET_COLLECTION_B_ESP32 -[env:collection_C_ESP32_IRExt_4M316k] -extends = esp32_IRExt +[env:collection_C_ESP32_IRExt_4M316k_LittleFS_ETH] +extends = esp32_IRExt_LittleFS_ETH board = esp32_4M -build_flags = ${esp32_IRExt.build_flags} +build_flags = ${esp32_IRExt_LittleFS_ETH.build_flags} -DPLUGIN_SET_COLLECTION_C_ESP32 -[env:collection_D_ESP32_IRExt_4M316k] -extends = esp32_IRExt +[env:collection_D_ESP32_IRExt_4M316k_LittleFS_ETH] +extends = esp32_IRExt_LittleFS_ETH board = esp32_4M -build_flags = ${esp32_IRExt.build_flags} +build_flags = ${esp32_IRExt_LittleFS_ETH.build_flags} -DPLUGIN_SET_COLLECTION_D_ESP32 -[env:collection_E_ESP32_IRExt_4M316k] -extends = esp32_IRExt +[env:collection_E_ESP32_IRExt_4M316k_LittleFS_ETH] +extends = esp32_IRExt_LittleFS_ETH board = esp32_4M -build_flags = ${esp32_IRExt.build_flags} +build_flags = ${esp32_IRExt_LittleFS_ETH.build_flags} -DPLUGIN_SET_COLLECTION_E_ESP32 -[env:collection_F_ESP32_IRExt_4M316k] -extends = esp32_IRExt +[env:collection_F_ESP32_IRExt_4M316k_LittleFS_ETH] +extends = esp32_IRExt_LittleFS_ETH board = esp32_4M -build_flags = ${esp32_IRExt.build_flags} +build_flags = ${esp32_IRExt_LittleFS_ETH.build_flags} -DPLUGIN_SET_COLLECTION_F_ESP32 -[env:collection_G_ESP32_IRExt_4M316k] -extends = esp32_IRExt +[env:collection_G_ESP32_IRExt_4M316k_LittleFS_ETH] +extends = esp32_IRExt_LittleFS_ETH board = esp32_4M -build_flags = ${esp32_IRExt.build_flags} +build_flags = ${esp32_IRExt_LittleFS_ETH.build_flags} -DPLUGIN_SET_COLLECTION_G_ESP32 -[env:energy_ESP32_4M316k_ETH] -extends = esp32_common +[env:energy_ESP32_4M316k_LittleFS_ETH] +extends = esp32_common_LittleFS board = esp32_4M -build_flags = ${esp32_common.build_flags} +build_flags = ${esp32_common_LittleFS.build_flags} -DFEATURE_ARDUINO_OTA=1 -DPLUGIN_ENERGY_COLLECTION - -DFEATURE_ETHERNET=1 + -[env:display_ESP32_4M316k_ETH] -extends = esp32_common +[env:display_ESP32_4M316k_LittleFS_ETH] +extends = esp32_common_LittleFS board = esp32_4M -build_flags = ${esp32_common.build_flags} +build_flags = ${esp32_common_LittleFS.build_flags} -DFEATURE_ARDUINO_OTA=1 -DPLUGIN_DISPLAY_COLLECTION -D ST7789_EXTRA_INIT=1 -D P116_EXTRA_ST7789=1 - -DFEATURE_ETHERNET=1 + -[env:climate_ESP32_4M316k_ETH] -extends = esp32_common -board = esp32_4M -build_flags = ${esp32_common.build_flags} - -DFEATURE_ARDUINO_OTA=1 - -DPLUGIN_CLIMATE_COLLECTION - -DFEATURE_ETHERNET=1 [env:climate_ESP32_4M316k_LittleFS_ETH] extends = esp32_common_LittleFS @@ -381,35 +293,18 @@ lib_ignore = ${esp32_always.lib_ignore} ${no_ir.lib_ignore} build_flags = ${esp32_common_LittleFS.build_flags} -DPLUGIN_CLIMATE_COLLECTION - -DFEATURE_ETHERNET=1 + -[env:neopixel_ESP32_4M316k_ETH] -extends = esp32_common +[env:neopixel_ESP32_4M316k_LittleFS_ETH] +extends = esp32_common_LittleFS board = esp32_4M -build_flags = ${esp32_common.build_flags} +build_flags = ${esp32_common_LittleFS.build_flags} -DFEATURE_ARDUINO_OTA=1 -DFEATURE_SD=1 -D PLUGIN_NEOPIXEL_COLLECTION - -DFEATURE_ETHERNET=1 + -; [env:custom_ESP32_4M316k_ETH] -; extends = env:custom_ESP32_4M316k -; build_flags = ${env:custom_ESP32_4M316k.build_flags} -; -DFEATURE_ETHERNET=1 - -[env:custom_ESP32_4M316k_LittleFS_ETH] -extends = esp32_custom_base_LittleFS -board = esp32_4M -build_flags = ${esp32_custom_base_LittleFS.build_flags} - -DFEATURE_ETHERNET=1 - - -; [env:custom_IR_ESP32_4M316k_ETH] -; extends = env:custom_IR_ESP32_4M316k -; build_flags = ${env:custom_IR_ESP32_4M316k.build_flags} -; -DFEATURE_ETHERNET=1 -; extra_scripts = ${env:custom_IR_ESP32_4M316k.extra_scripts} [env:custom_IR_ESP32_16M8M_LittleFS_ETH] extends = esp32_common_LittleFS @@ -418,18 +313,13 @@ board_upload.flash_size = 16MB build_flags = ${esp32_common_LittleFS.build_flags} -DPLUGIN_BUILD_CUSTOM -DPLUGIN_BUILD_IR - -DFEATURE_ETHERNET=1 lib_ignore = ${esp32_always.lib_ignore} ESP32_ping ${esp32_common_LittleFS.lib_ignore} -extra_scripts = ${esp32_common.extra_scripts} +extra_scripts = ${esp32_common_LittleFS.extra_scripts} pre:tools/pio/pre_custom_esp32_IR.py pre:tools/pio/ir_build_check.py -; [env:normal_ESP32_4M316k_ETH] -; extends = env:normal_ESP32_4M316k -; build_flags = ${env:normal_ESP32_4M316k.build_flags} -; -DFEATURE_ETHERNET=1 [env:normal_ESP32_4M316k_LittleFS_ETH] @@ -440,178 +330,19 @@ lib_ignore = ${esp32_always.lib_ignore} ${esp32_common_LittleFS.lib_ignore} ${no_ir.lib_ignore} build_flags = ${esp32_common_LittleFS.build_flags} - -DFEATURE_ETHERNET=1 + -[env:normal_ESP32_IRExt_4M316k_ETH] -extends = esp32_IRExt +[env:normal_ESP32_IRExt_4M316k_LittleFS_ETH] +extends = esp32_IRExt_LittleFS_ETH board = esp32_4M -build_flags = ${esp32_IRExt.build_flags} - -DFEATURE_ETHERNET=1 +build_flags = ${esp32_IRExt_LittleFS_ETH.build_flags} + -; [env:collection_A_ESP32_4M316k_ETH] -; extends = env:collection_A_ESP32_4M316k -; build_flags = ${env:collection_A_ESP32_4M316k.build_flags} -; -DFEATURE_ETHERNET=1 -; -DCOLLECTION_FEATURE_RTTTL=1 - -; [env:collection_B_ESP32_4M316k_ETH] -; extends = env:collection_B_ESP32_4M316k -; build_flags = ${env:collection_B_ESP32_4M316k.build_flags} -; -DFEATURE_ETHERNET=1 -; -DCOLLECTION_FEATURE_RTTTL=1 - -; [env:collection_C_ESP32_4M316k_ETH] -; extends = env:collection_C_ESP32_4M316k -; build_flags = ${env:collection_C_ESP32_4M316k.build_flags} -; -DFEATURE_ETHERNET=1 -; -DCOLLECTION_FEATURE_RTTTL=1 - -; [env:collection_D_ESP32_4M316k_ETH] -; extends = env:collection_D_ESP32_4M316k -; build_flags = ${env:collection_D_ESP32_4M316k.build_flags} -; -DFEATURE_ETHERNET=1 -; -DCOLLECTION_FEATURE_RTTTL=1 - -; [env:collection_E_ESP32_4M316k_ETH] -; extends = env:collection_E_ESP32_4M316k -; build_flags = ${env:collection_E_ESP32_4M316k.build_flags} -; -DFEATURE_ETHERNET=1 -; -DCOLLECTION_FEATURE_RTTTL=1 - -; [env:collection_F_ESP32_4M316k_ETH] -; extends = env:collection_F_ESP32_4M316k -; build_flags = ${env:collection_F_ESP32_4M316k.build_flags} -; -DFEATURE_ETHERNET=1 -; -DCOLLECTION_FEATURE_RTTTL=1 - -; [env:collection_G_ESP32_4M316k_ETH] -; extends = env:collection_G_ESP32_4M316k -; build_flags = ${env:collection_G_ESP32_4M316k.build_flags} -; -DFEATURE_ETHERNET=1 -; -DCOLLECTION_FEATURE_RTTTL=1 - -; [env:energy_ESP32_4M316k_ETH] -; extends = env:energy_ESP32_4M316k -; build_flags = ${env:energy_ESP32_4M316k.build_flags} -; -DFEATURE_ETHERNET=1 - -; [env:display_ESP32_4M316k_ETH] -; extends = env:display_ESP32_4M316k -; build_flags = ${env:display_ESP32_4M316k.build_flags} -; -DFEATURE_ETHERNET=1 - -; [env:climate_ESP32_4M316k_ETH] -; extends = env:climate_ESP32_4M316k -; build_flags = ${env:climate_ESP32_4M316k.build_flags} -; -DFEATURE_ETHERNET=1 - -; [env:neopixel_ESP32_4M316k_ETH] -; extends = env:neopixel_ESP32_4M316k -; build_flags = ${env:neopixel_ESP32_4M316k.build_flags} -; -DFEATURE_ETHERNET=1 - -; [env:collection_A_ESP32_IRExt_4M316k_ETH] -; extends = esp32_IRExt -; board = esp32_4M -; build_flags = ${esp32_IRExt.build_flags} -; -DPLUGIN_SET_COLLECTION_ESP32 -; -DFEATURE_ETHERNET=1 - -; [env:collection_B_ESP32_IRExt_4M316k_ETH] -; extends = esp32_IRExt -; board = esp32_4M -; build_flags = ${esp32_IRExt.build_flags} -; -DPLUGIN_SET_COLLECTION_B_ESP32 -; -DFEATURE_ETHERNET=1 - -; [env:collection_C_ESP32_IRExt_4M316k_ETH] -; extends = esp32_IRExt -; board = esp32_4M -; build_flags = ${esp32_IRExt.build_flags} -; -DPLUGIN_SET_COLLECTION_C_ESP32 -; -DFEATURE_ETHERNET=1 - -; [env:collection_D_ESP32_IRExt_4M316k_ETH] -; extends = esp32_IRExt -; board = esp32_4M -; build_flags = ${esp32_IRExt.build_flags} -; -DPLUGIN_SET_COLLECTION_D_ESP32 -; -DFEATURE_ETHERNET=1 - -; [env:collection_E_ESP32_IRExt_4M316k_ETH] -; extends = esp32_IRExt -; board = esp32_4M -; build_flags = ${esp32_IRExt.build_flags} -; -DPLUGIN_SET_COLLECTION_E_ESP32 -; -DFEATURE_ETHERNET=1 - -; [env:collection_F_ESP32_IRExt_4M316k_ETH] -; extends = esp32_IRExt -; board = esp32_4M -; build_flags = ${esp32_IRExt.build_flags} -; -DPLUGIN_SET_COLLECTION_F_ESP32 -; -DFEATURE_ETHERNET=1 - -; [env:collection_G_ESP32_IRExt_4M316k_ETH] -; extends = esp32_IRExt -; board = esp32_4M -; build_flags = ${esp32_IRExt.build_flags} -; -DPLUGIN_SET_COLLECTION_G_ESP32 -; -DFEATURE_ETHERNET=1 - -; [env:energy_ESP32_IRExt_4M316k_ETH] -; extends = esp32_IRExt -; board = esp32_4M -; build_flags = ${esp32_IRExt.build_flags} -; -DPLUGIN_ENERGY_COLLECTION -; -DFEATURE_ETHERNET=1 - -; [env:display_ESP32_IRExt_4M316k_ETH] -; extends = esp32_IRExt -; board = esp32_4M -; build_flags = ${esp32_IRExt.build_flags} -; -DPLUGIN_DISPLAY_COLLECTION -; -DFEATURE_ETHERNET=1 - -; [env:climate_ESP32_IRExt_4M316k_ETH] -; extends = esp32_IRExt -; board = esp32_4M -; build_flags = ${esp32_IRExt.build_flags} -; -DPLUGIN_CLIMATE_COLLECTION -; -DFEATURE_ETHERNET=1 - -; [env:neopixel_ESP32_IRExt_4M316k_ETH] -; extends = esp32_IRExt -; board = esp32_4M -; build_flags = ${esp32_IRExt.build_flags} -; -D PLUGIN_NEOPIXEL_COLLECTION -; -DFEATURE_ETHERNET=1 ; ESP32 MAX builds 16M flash ------------------------------ -; A Lolin D32 PRO with 16MB Flash, allowing 4MB sketch size, and file storage using the default (SPIFFS) filesystem -[env:max_ESP32_16M1M_ETH] -extends = esp32_common -board = esp32_16M1M -board_upload.flash_size = 16MB -lib_ignore = ${esp32_always.lib_ignore} - ESP32_ping -build_flags = ${esp32_common.build_flags} - -DFEATURE_ARDUINO_OTA=1 - -DPLUGIN_BUILD_MAX_ESP32 - -DPLUGIN_BUILD_IR_EXTENDED - -D ST7789_EXTRA_INIT=1 - -D P116_EXTRA_ST7789=1 - -DFEATURE_ETHERNET=1 - -; [env:max_ESP32_16M1M_ETH] -; extends = env:max_ESP32_16M1M -; build_flags = ${env:max_ESP32_16M1M.build_flags} -; -DFEATURE_ETHERNET=1 - - ; A Lolin D32 PRO with 16MB Flash, allowing 4MB sketch size, and file storage using LittleFS filesystem [env:max_ESP32_16M8M_LittleFS_ETH] extends = esp32_common_LittleFS @@ -624,10 +355,9 @@ build_flags = ${esp32_common_LittleFS.build_flags} -DFEATURE_ARDUINO_OTA=1 -DPLUGIN_BUILD_MAX_ESP32 -DPLUGIN_BUILD_IR_EXTENDED - -DFEATURE_ETHERNET=1 -D ST7789_EXTRA_INIT=1 -D P116_EXTRA_ST7789=1 -extra_scripts = ${esp32_common.extra_scripts} +extra_scripts = ${esp32_common_LittleFS.extra_scripts} board_build.filesystem = littlefs ; If you have a board with Ethernet integrated and 16MB Flash, then this configuration could be enabled, it's based on the max_ESP32_16M8M_LittleFS definition @@ -635,7 +365,6 @@ board_build.filesystem = littlefs ; extends = env:max_ESP32_16M8M_LittleFS ; board = ${env:max_ESP32_16M8M_LittleFS.board} ; build_flags = ${env:max_ESP32_16M8M_LittleFS.build_flags} -; -DFEATURE_ETHERNET=1 diff --git a/platformio_esp32c3_envs.ini b/platformio_esp32c3_envs.ini index 3ccbec85c..a0764a93d 100644 --- a/platformio_esp32c3_envs.ini +++ b/platformio_esp32c3_envs.ini @@ -1,23 +1,8 @@ - - - -[esp32c3_common] -extends = esp32_base -lib_ignore = ${esp32_always.lib_ignore} - ESP32_ping - ${no_ir.lib_ignore} - ESP32 BLE Arduino -build_flags = ${esp32_base.build_flags} - -DFEATURE_ARDUINO_OTA=1 - -DESP32C3 -extra_scripts = ${esp32_base.extra_scripts} -build_unflags = ${esp32_base.build_unflags} - -fexceptions - [esp32c3_common_LittleFS] extends = esp32_base_idf5 build_flags = ${esp32_base_idf5.build_flags} -DFEATURE_ARDUINO_OTA=1 + -DFEATURE_ETHERNET=1 -DUSE_LITTLEFS -DESP32C3 extra_scripts = ${esp32_base_idf5.extra_scripts} @@ -27,153 +12,100 @@ board_build.filesystem = littlefs lib_ignore = ${esp32_base_idf5.lib_ignore} -[env:custom_ESP32c3_4M316k_CDC] -extends = esp32c3_common -board = esp32c3cdc -build_flags = ${esp32c3_common.build_flags} - -DPLUGIN_BUILD_CUSTOM -extra_scripts = ${esp32c3_common.extra_scripts} - pre:tools/pio/pre_custom_esp32.py - - -[env:custom_IR_ESP32c3_4M316k_CDC] -extends = esp32c3_common -board = esp32c3cdc -build_flags = ${esp32c3_common.build_flags} - -DPLUGIN_BUILD_CUSTOM - -DPLUGIN_BUILD_IR -lib_ignore = ${esp32_always.lib_ignore} - ESP32_ping -extra_scripts = ${esp32c3_common.extra_scripts} - pre:tools/pio/pre_custom_esp32_IR.py - pre:tools/pio/ir_build_check.py - -; [env:custom_ESP32c3_4M316k_LittleFS_CDC] -; extends = esp32c3_common_LittleFS -; board = esp32c3cdc -; build_flags = ${esp32c3_common_LittleFS.build_flags} -; -DPLUGIN_BUILD_CUSTOM -; extra_scripts = ${esp32c3_common_LittleFS.extra_scripts} -; pre:tools/pio/pre_custom_esp32.py - [env:custom_ESP32c3_4M316k_LittleFS_CDC_ETH] extends = esp32c3_common_LittleFS board = esp32c3cdc build_flags = ${esp32c3_common_LittleFS.build_flags} -DPLUGIN_BUILD_CUSTOM - -DFEATURE_ETHERNET=1 extra_scripts = ${esp32c3_common_LittleFS.extra_scripts} pre:tools/pio/pre_custom_esp32.py -[env:normal_ESP32c3_4M316k_CDC] -extends = esp32c3_common -board = esp32c3cdc -lib_ignore = ${esp32_common.lib_ignore} - ${no_ir.lib_ignore} - - [env:normal_ESP32c3_4M316k_LittleFS_CDC_ETH] extends = esp32c3_common_LittleFS board = esp32c3cdc build_flags = ${esp32c3_common_LittleFS.build_flags} - -DFEATURE_ETHERNET=1 lib_ignore = ${esp32c3_common_LittleFS.lib_ignore} ${no_ir.lib_ignore} -[env:collection_A_ESP32c3_4M316k_CDC] -extends = esp32c3_common +[env:collection_A_ESP32c3_4M316k_LittleFS_CDC_ETH] +extends = esp32c3_common_LittleFS board = esp32c3cdc -build_flags = ${esp32c3_common.build_flags} +build_flags = ${esp32c3_common_LittleFS.build_flags} -DPLUGIN_SET_COLLECTION_ESP32 -DCOLLECTION_FEATURE_RTTTL=1 -[env:collection_B_ESP32c3_4M316k_CDC] -extends = esp32c3_common +[env:collection_B_ESP32c3_4M316k_LittleFS_CDC_ETH] +extends = esp32c3_common_LittleFS board = esp32c3cdc -build_flags = ${esp32c3_common.build_flags} +build_flags = ${esp32c3_common_LittleFS.build_flags} -DPLUGIN_SET_COLLECTION_B_ESP32 -DCOLLECTION_FEATURE_RTTTL=1 -[env:collection_C_ESP32c3_4M316k_CDC] -extends = esp32c3_common +[env:collection_C_ESP32c3_4M316k_LittleFS_CDC_ETH] +extends = esp32c3_common_LittleFS board = esp32c3cdc -build_flags = ${esp32c3_common.build_flags} +build_flags = ${esp32c3_common_LittleFS.build_flags} -DPLUGIN_SET_COLLECTION_C_ESP32 -DCOLLECTION_FEATURE_RTTTL=1 -[env:collection_D_ESP32c3_4M316k_CDC] -extends = esp32c3_common +[env:collection_D_ESP32c3_4M316k_LittleFS_CDC_ETH] +extends = esp32c3_common_LittleFS board = esp32c3cdc -build_flags = ${esp32c3_common.build_flags} +build_flags = ${esp32c3_common_LittleFS.build_flags} -DPLUGIN_SET_COLLECTION_D_ESP32 -DCOLLECTION_FEATURE_RTTTL=1 -[env:collection_E_ESP32c3_4M316k_CDC] -extends = esp32c3_common +[env:collection_E_ESP32c3_4M316k_LittleFS_CDC_ETH] +extends = esp32c3_common_LittleFS board = esp32c3cdc -build_flags = ${esp32c3_common.build_flags} +build_flags = ${esp32c3_common_LittleFS.build_flags} -DPLUGIN_SET_COLLECTION_E_ESP32 -DCOLLECTION_FEATURE_RTTTL=1 -[env:collection_F_ESP32c3_4M316k_CDC] -extends = esp32c3_common +[env:collection_F_ESP32c3_4M316k_LittleFS_CDC_ETH] +extends = esp32c3_common_LittleFS board = esp32c3cdc -build_flags = ${esp32c3_common.build_flags} +build_flags = ${esp32c3_common_LittleFS.build_flags} -DPLUGIN_SET_COLLECTION_F_ESP32 -DCOLLECTION_FEATURE_RTTTL=1 -[env:collection_G_ESP32c3_4M316k_CDC] -extends = esp32c3_common +[env:collection_G_ESP32c3_4M316k_LittleFS_CDC_ETH] +extends = esp32c3_common_LittleFS board = esp32c3cdc -build_flags = ${esp32c3_common.build_flags} +build_flags = ${esp32c3_common_LittleFS.build_flags} -DPLUGIN_SET_COLLECTION_G_ESP32 -DCOLLECTION_FEATURE_RTTTL=1 -[env:energy_ESP32c3_4M316k_CDC] -extends = esp32c3_common -board = esp32c3cdc -build_flags = ${esp32c3_common.build_flags} - -D PLUGIN_ENERGY_COLLECTION - [env:energy_ESP32c3_4M316k_LittleFS_CDC_ETH] extends = esp32c3_common_LittleFS board = esp32c3cdc build_flags = ${esp32c3_common_LittleFS.build_flags} -D PLUGIN_ENERGY_COLLECTION - -DFEATURE_ETHERNET=1 + -[env:display_ESP32c3_4M316k_CDC] -extends = esp32c3_common +[env:display_ESP32c3_4M316k_LittleFS_CDC_ETH] +extends = esp32c3_common_LittleFS board = esp32c3cdc -build_flags = ${esp32c3_common.build_flags} +build_flags = ${esp32c3_common_LittleFS.build_flags} -D PLUGIN_DISPLAY_COLLECTION -D ST7789_EXTRA_INIT=1 -D P116_EXTRA_ST7789=1 -[env:climate_ESP32c3_4M316k_CDC] -extends = esp32c3_common +[env:climate_ESP32c3_4M316k_LittleFS_CDC_ETH] +extends = esp32c3_common_LittleFS board = esp32c3cdc -build_flags = ${esp32c3_common.build_flags} +build_flags = ${esp32c3_common_LittleFS.build_flags} -D PLUGIN_CLIMATE_COLLECTION -[env:neopixel_ESP32c3_4M316k_CDC] -extends = esp32c3_common -board = esp32c3cdc -build_flags = ${esp32c3_common.build_flags} - -DFEATURE_ARDUINO_OTA=1 - -DFEATURE_SD=1 - -DPLUGIN_NEOPIXEL_COLLECTION - [env:neopixel_ESP32c3_4M316k_LittleFS_CDC_ETH] extends = esp32c3_common_LittleFS board = esp32c3cdc build_flags = ${esp32c3_common_LittleFS.build_flags} -DFEATURE_ARDUINO_OTA=1 -DFEATURE_SD=1 - -DFEATURE_ETHERNET=1 -DPLUGIN_NEOPIXEL_COLLECTION [env:max_ESP32c3_16M8M_LittleFS_CDC_ETH] @@ -182,7 +114,6 @@ board = esp32c3cdc-16M build_flags = ${esp32c3_common_LittleFS.build_flags} -DFEATURE_ARDUINO_OTA=1 -DFEATURE_SD=1 - -DFEATURE_ETHERNET=1 -DPLUGIN_BUILD_MAX_ESP32 -DPLUGIN_BUILD_IR_EXTENDED extra_scripts = ${esp32c3_common_LittleFS.extra_scripts} diff --git a/platformio_esp32c5_envs.ini b/platformio_esp32c5_envs.ini index ae0a669c8..3f3092566 100644 --- a/platformio_esp32c5_envs.ini +++ b/platformio_esp32c5_envs.ini @@ -1,16 +1,16 @@ [esp32c5_common_LittleFS] -extends = esp32_base_idf5 -build_flags = ${esp32_base_idf5.build_flags} +extends = esp32_base_idf5_5 +build_flags = ${esp32_base_idf5_5.build_flags} -DFEATURE_ARDUINO_OTA=1 -DUSE_LITTLEFS -DESP32C5 -extra_scripts = ${esp32_base_idf5.extra_scripts} -build_unflags = ${esp32_base_idf5.build_unflags} +extra_scripts = ${esp32_base_idf5_5.extra_scripts} +build_unflags = ${esp32_base_idf5_5.build_unflags} -fexceptions board_build.filesystem = littlefs -lib_ignore = ${esp32_base_idf5.lib_ignore} +lib_ignore = ${esp32_base_idf5_5.lib_ignore} board = esp32c5cdc diff --git a/platformio_esp32s2_envs.ini b/platformio_esp32s2_envs.ini index f51587d68..473b131ef 100644 --- a/platformio_esp32s2_envs.ini +++ b/platformio_esp32s2_envs.ini @@ -1,24 +1,8 @@ - - - - -[esp32s2_common] -extends = esp32_base -lib_ignore = ${esp32_always.lib_ignore} - ESP32_ping - ${no_ir.lib_ignore} - ESP32 BLE Arduino -build_flags = ${esp32_base.build_flags} - -DFEATURE_ARDUINO_OTA=1 - -DESP32S2 -extra_scripts = ${esp32_base.extra_scripts} -build_unflags = ${esp32_base.build_unflags} - -fexceptions - [esp32s2_common_LittleFS] extends = esp32_base_idf5 build_flags = ${esp32_base_idf5.build_flags} -DFEATURE_ARDUINO_OTA=1 + -DFEATURE_ETHERNET=1 -DUSE_LITTLEFS -DESP32S2 extra_scripts = ${esp32_base_idf5.extra_scripts} @@ -28,23 +12,6 @@ board_build.filesystem = littlefs lib_ignore = ${esp32_base_idf5.lib_ignore} -[env:custom_ESP32s2_4M316k_CDC] -extends = esp32s2_common -board = esp32s2cdc -build_flags = ${esp32s2_common.build_flags} - -DPLUGIN_BUILD_CUSTOM - -DESP_CONSOLE_USB_CDC=y -extra_scripts = ${esp32s2_common.extra_scripts} - pre:tools/pio/pre_custom_esp32.py - -[env:neopixel_ESP32s2_4M316k_CDC] -extends = esp32s2_common -board = esp32s2cdc -build_flags = ${esp32s2_common.build_flags} - -DFEATURE_ARDUINO_OTA=1 - -DFEATURE_SD=1 - -DPLUGIN_NEOPIXEL_COLLECTION - [env:neopixel_ESP32s2_4M316k_LittleFS_CDC_ETH] extends = esp32s2_common_LittleFS board = esp32s2cdc @@ -52,29 +19,22 @@ build_flags = ${esp32s2_common_LittleFS.build_flags} -DFEATURE_ARDUINO_OTA=1 -DFEATURE_SD=1 -DPLUGIN_NEOPIXEL_COLLECTION - -DFEATURE_ETHERNET=1 + -[env:custom_IR_ESP32s2_4M316k_CDC] -extends = esp32s2_common +[env:custom_IR_ESP32s2_4M316k_LittleFS_CDC_ETH] +extends = esp32s2_common_LittleFS board = esp32s2cdc -build_flags = ${esp32s2_common.build_flags} +build_flags = ${esp32s2_common_LittleFS.build_flags} -DPLUGIN_BUILD_CUSTOM -DPLUGIN_BUILD_IR lib_ignore = ${esp32_always.lib_ignore} ESP32_ping -extra_scripts = ${esp32s2_common.extra_scripts} +extra_scripts = ${esp32s2_common_LittleFS.extra_scripts} pre:tools/pio/pre_custom_esp32_IR.py pre:tools/pio/ir_build_check.py - -[env:normal_ESP32s2_4M316k_CDC] -extends = esp32s2_common -board = esp32s2cdc -lib_ignore = ${esp32s2_common.lib_ignore} - ${no_ir.lib_ignore} - [env:custom_ESP32s2_4M316k_LittleFS_CDC_ETH] extends = esp32s2_common_LittleFS board = esp32s2cdc @@ -83,7 +43,6 @@ lib_ignore = ${esp32s2_common_LittleFS.lib_ignore} build_flags = ${esp32s2_common_LittleFS.build_flags} -DPLUGIN_BUILD_CUSTOM -DESP_CONSOLE_USB_CDC=y - -DFEATURE_ETHERNET=1 extra_scripts = ${esp32s2_common_LittleFS.extra_scripts} pre:tools/pio/pre_custom_esp32.py @@ -94,77 +53,76 @@ extends = esp32s2_common_LittleFS board = esp32s2cdc build_flags = ${esp32s2_common_LittleFS.build_flags} -DESP_CONSOLE_USB_CDC=y - -DFEATURE_ETHERNET=1 lib_ignore = ${esp32s2_common_LittleFS.lib_ignore} ${no_ir.lib_ignore} -[env:collection_A_ESP32s2_4M316k_CDC] -extends = esp32s2_common +[env:collection_A_ESP32s2_4M316k_LittleFS_CDC_ETH] +extends = esp32s2_common_LittleFS board = esp32s2cdc -build_flags = ${esp32s2_common.build_flags} +build_flags = ${esp32s2_common_LittleFS.build_flags} -DPLUGIN_SET_COLLECTION_ESP32 -DCOLLECTION_FEATURE_RTTTL=1 -[env:collection_B_ESP32s2_4M316k_CDC] -extends = esp32s2_common +[env:collection_B_ESP32s2_4M316k_LittleFS_CDC_ETH] +extends = esp32s2_common_LittleFS board = esp32s2cdc -build_flags = ${esp32s2_common.build_flags} +build_flags = ${esp32s2_common_LittleFS.build_flags} -DPLUGIN_SET_COLLECTION_B_ESP32 -DCOLLECTION_FEATURE_RTTTL=1 -[env:collection_C_ESP32s2_4M316k_CDC] -extends = esp32s2_common +[env:collection_C_ESP32s2_4M316k_LittleFS_CDC_ETH] +extends = esp32s2_common_LittleFS board = esp32s2cdc -build_flags = ${esp32s2_common.build_flags} +build_flags = ${esp32s2_common_LittleFS.build_flags} -DPLUGIN_SET_COLLECTION_C_ESP32 -DCOLLECTION_FEATURE_RTTTL=1 -[env:collection_D_ESP32s2_4M316k_CDC] -extends = esp32s2_common +[env:collection_D_ESP32s2_4M316k_LittleFS_CDC_ETH] +extends = esp32s2_common_LittleFS board = esp32s2cdc -build_flags = ${esp32s2_common.build_flags} +build_flags = ${esp32s2_common_LittleFS.build_flags} -DPLUGIN_SET_COLLECTION_D_ESP32 -DCOLLECTION_FEATURE_RTTTL=1 -[env:collection_E_ESP32s2_4M316k_CDC] -extends = esp32s2_common +[env:collection_E_ESP32s2_4M316k_LittleFS_CDC_ETH] +extends = esp32s2_common_LittleFS board = esp32s2cdc -build_flags = ${esp32s2_common.build_flags} +build_flags = ${esp32s2_common_LittleFS.build_flags} -DPLUGIN_SET_COLLECTION_E_ESP32 -DCOLLECTION_FEATURE_RTTTL=1 -[env:collection_F_ESP32s2_4M316k_CDC] -extends = esp32s2_common +[env:collection_F_ESP32s2_4M316k_LittleFS_CDC_ETH] +extends = esp32s2_common_LittleFS board = esp32s2cdc -build_flags = ${esp32s2_common.build_flags} +build_flags = ${esp32s2_common_LittleFS.build_flags} -DPLUGIN_SET_COLLECTION_F_ESP32 -DCOLLECTION_FEATURE_RTTTL=1 -[env:collection_G_ESP32s2_4M316k_CDC] -extends = esp32s2_common +[env:collection_G_ESP32s2_4M316k_LittleFS_CDC_ETH] +extends = esp32s2_common_LittleFS board = esp32s2cdc -build_flags = ${esp32s2_common.build_flags} +build_flags = ${esp32s2_common_LittleFS.build_flags} -DPLUGIN_SET_COLLECTION_G_ESP32 -DCOLLECTION_FEATURE_RTTTL=1 -[env:energy_ESP32s2_4M316k_CDC] -extends = esp32s2_common +[env:energy_ESP32s2_4M316k_LittleFS_CDC_ETH] +extends = esp32s2_common_LittleFS board = esp32s2cdc -build_flags = ${esp32s2_common.build_flags} +build_flags = ${esp32s2_common_LittleFS.build_flags} -D PLUGIN_ENERGY_COLLECTION -[env:display_ESP32s2_4M316k_CDC] -extends = esp32s2_common +[env:display_ESP32s2_4M316k_LittleFS_CDC_ETH] +extends = esp32s2_common_LittleFS board = esp32s2cdc -build_flags = ${esp32s2_common.build_flags} +build_flags = ${esp32s2_common_LittleFS.build_flags} -D PLUGIN_DISPLAY_COLLECTION -D ST7789_EXTRA_INIT=1 -D P116_EXTRA_ST7789=1 -[env:climate_ESP32s2_4M316k_CDC] -extends = esp32s2_common +[env:climate_ESP32s2_4M316k_LittleFS_CDC_ETH] +extends = esp32s2_common_LittleFS board = esp32s2cdc -build_flags = ${esp32s2_common.build_flags} +build_flags = ${esp32s2_common_LittleFS.build_flags} -D PLUGIN_CLIMATE_COLLECTION diff --git a/platformio_esp32s3_envs.ini b/platformio_esp32s3_envs.ini index a70755617..aa3bde873 100644 --- a/platformio_esp32s3_envs.ini +++ b/platformio_esp32s3_envs.ini @@ -1,20 +1,3 @@ - - - - -[esp32s3_common] -extends = esp32_base -lib_ignore = ${esp32_always.lib_ignore} - ESP32_ping - ${no_ir.lib_ignore} - ESP32 BLE Arduino -build_flags = ${esp32_base.build_flags} - -DFEATURE_ARDUINO_OTA=1 - -DESP32S3 -extra_scripts = ${esp32_base.extra_scripts} -build_unflags = ${esp32_base.build_unflags} - -fexceptions - [esp32s3_common_LittleFS] extends = esp32_base_idf5 lib_ignore = ${esp32_common_LittleFS.lib_ignore} @@ -23,6 +6,7 @@ lib_ignore = ${esp32_common_LittleFS.lib_ignore} build_flags = ${esp32_base_idf5.build_flags} ; -mtext-section-literals -DFEATURE_ARDUINO_OTA=1 + -DFEATURE_ETHERNET=1 -DUSE_LITTLEFS -DESP32S3 extra_scripts = ${esp32_base_idf5.extra_scripts} @@ -31,35 +15,28 @@ build_unflags = ${esp32_base_idf5.build_unflags} board_build.filesystem = littlefs -[env:custom_ESP32s3_4M316k_CDC] -extends = esp32s3_common +[env:custom_ESP32s3_4M316k_LittleFS_CDC_ETH] +extends = esp32s3_common_LittleFS board = esp32s3cdc-qio_qspi -build_flags = ${esp32s3_common.build_flags} +build_flags = ${esp32s3_common_LittleFS.build_flags} -DPLUGIN_BUILD_CUSTOM -extra_scripts = ${esp32s3_common.extra_scripts} +extra_scripts = ${esp32s3_common_LittleFS.extra_scripts} pre:tools/pio/pre_custom_esp32.py -[env:custom_IR_ESP32s3_4M316k_CDC] -extends = esp32s3_common +[env:custom_IR_ESP32s3_4M316k_LittleFS_CDC_ETH] +extends = esp32s3_common_LittleFS board = esp32s3cdc-qio_qspi -build_flags = ${esp32s3_common.build_flags} +build_flags = ${esp32s3_common_LittleFS.build_flags} -DPLUGIN_BUILD_CUSTOM -DPLUGIN_BUILD_IR lib_ignore = ${esp32_always.lib_ignore} ESP32_ping -extra_scripts = ${esp32s3_common.extra_scripts} +extra_scripts = ${esp32s3_common_LittleFS.extra_scripts} pre:tools/pio/pre_custom_esp32_IR.py pre:tools/pio/ir_build_check.py - -[env:normal_ESP32s3_4M316k_CDC] -extends = esp32s3_common -board = esp32s3cdc-qio_qspi -lib_ignore = ${esp32s3_common.lib_ignore} - ${no_ir.lib_ignore} - [env:normal_ESP32s3_4M316k_LittleFS_CDC_ETH] extends = esp32s3_common_LittleFS board = esp32s3cdc-qio_qspi @@ -68,85 +45,78 @@ lib_ignore = ${esp32s3_common_LittleFS.lib_ignore} build_flags = ${esp32s3_common_LittleFS.build_flags} -DFEATURE_ARDUINO_OTA=1 -DFEATURE_SD=1 - -DFEATURE_ETHERNET=1 + -[env:collection_A_ESP32s3_4M316k_CDC] -extends = esp32s3_common +[env:collection_A_ESP32s3_4M316k_LittleFS_CDC_ETH] +extends = esp32s3_common_LittleFS board = esp32s3cdc-qio_qspi -build_flags = ${esp32s3_common.build_flags} +build_flags = ${esp32s3_common_LittleFS.build_flags} -DPLUGIN_SET_COLLECTION_ESP32 -DCOLLECTION_FEATURE_RTTTL=1 -[env:collection_B_ESP32s3_4M316k_CDC] -extends = esp32s3_common +[env:collection_B_ESP32s3_4M316k_LittleFS_CDC_ETH] +extends = esp32s3_common_LittleFS board = esp32s3cdc-qio_qspi -build_flags = ${esp32s3_common.build_flags} +build_flags = ${esp32s3_common_LittleFS.build_flags} -DPLUGIN_SET_COLLECTION_B_ESP32 -DCOLLECTION_FEATURE_RTTTL=1 -[env:collection_C_ESP32s3_4M316k_CDC] -extends = esp32s3_common +[env:collection_C_ESP32s3_4M316k_LittleFS_CDC_ETH] +extends = esp32s3_common_LittleFS board = esp32s3cdc-qio_qspi -build_flags = ${esp32s3_common.build_flags} +build_flags = ${esp32s3_common_LittleFS.build_flags} -DPLUGIN_SET_COLLECTION_C_ESP32 -DCOLLECTION_FEATURE_RTTTL=1 -[env:collection_D_ESP32s3_4M316k_CDC] -extends = esp32s3_common +[env:collection_D_ESP32s3_4M316k_LittleFS_CDC_ETH] +extends = esp32s3_common_LittleFS board = esp32s3cdc-qio_qspi -build_flags = ${esp32s3_common.build_flags} +build_flags = ${esp32s3_common_LittleFS.build_flags} -DPLUGIN_SET_COLLECTION_D_ESP32 -DCOLLECTION_FEATURE_RTTTL=1 -[env:collection_E_ESP32s3_4M316k_CDC] -extends = esp32s3_common +[env:collection_E_ESP32s3_4M316k_LittleFS_CDC_ETH] +extends = esp32s3_common_LittleFS board = esp32s3cdc-qio_qspi -build_flags = ${esp32s3_common.build_flags} +build_flags = ${esp32s3_common_LittleFS.build_flags} -DPLUGIN_SET_COLLECTION_E_ESP32 -DCOLLECTION_FEATURE_RTTTL=1 -[env:collection_F_ESP32s3_4M316k_CDC] -extends = esp32s3_common +[env:collection_F_ESP32s3_4M316k_LittleFS_CDC_ETH] +extends = esp32s3_common_LittleFS board = esp32s3cdc-qio_qspi -build_flags = ${esp32s3_common.build_flags} +build_flags = ${esp32s3_common_LittleFS.build_flags} -DPLUGIN_SET_COLLECTION_F_ESP32 -DCOLLECTION_FEATURE_RTTTL=1 -[env:collection_G_ESP32s3_4M316k_CDC] -extends = esp32s3_common +[env:collection_G_ESP32s3_4M316k_LittleFS_CDC_ETH] +extends = esp32s3_common_LittleFS board = esp32s3cdc-qio_qspi -build_flags = ${esp32s3_common.build_flags} +build_flags = ${esp32s3_common_LittleFS.build_flags} -DPLUGIN_SET_COLLECTION_G_ESP32 -DCOLLECTION_FEATURE_RTTTL=1 -[env:energy_ESP32s3_4M316k_CDC] -extends = esp32s3_common +[env:energy_ESP32s3_4M316k_LittleFS_CDC_ETH] +extends = esp32s3_common_LittleFS board = esp32s3cdc-qio_qspi -build_flags = ${esp32s3_common.build_flags} +build_flags = ${esp32s3_common_LittleFS.build_flags} -D PLUGIN_ENERGY_COLLECTION -[env:display_ESP32s3_4M316k_CDC] -extends = esp32s3_common +[env:display_ESP32s3_4M316k_LittleFS_CDC_ETH] +extends = esp32s3_common_LittleFS board = esp32s3cdc-qio_qspi -build_flags = ${esp32s3_common.build_flags} +build_flags = ${esp32s3_common_LittleFS.build_flags} -D PLUGIN_DISPLAY_COLLECTION -D ST7789_EXTRA_INIT=1 -D P116_EXTRA_ST7789=1 -[env:climate_ESP32s3_4M316k_CDC] -extends = esp32s3_common +[env:climate_ESP32s3_4M316k_LittleFS_CDC_ETH] +extends = esp32s3_common_LittleFS board = esp32s3cdc-qio_qspi -build_flags = ${esp32s3_common.build_flags} +build_flags = ${esp32s3_common_LittleFS.build_flags} -D PLUGIN_CLIMATE_COLLECTION -[env:neopixel_ESP32s3_4M316k_CDC] -extends = esp32s3_common -board = esp32s3cdc-qio_qspi -build_flags = ${esp32s3_common.build_flags} - -DFEATURE_ARDUINO_OTA=1 - -DFEATURE_SD=1 - -DPLUGIN_NEOPIXEL_COLLECTION [env:neopixel_ESP32s3_4M316k_LittleFS_CDC_ETH] extends = esp32s3_common_LittleFS @@ -155,14 +125,13 @@ build_flags = ${esp32s3_common_LittleFS.build_flags} -DFEATURE_ARDUINO_OTA=1 -DFEATURE_SD=1 -DPLUGIN_NEOPIXEL_COLLECTION - -DFEATURE_ETHERNET=1 + [env:custom_ESP32s3_8M1M_LittleFS_CDC_ETH] extends = esp32s3_common_LittleFS board = esp32s3cdc-qio_qspi-8M build_flags = ${esp32s3_common_LittleFS.build_flags} - -DFEATURE_ETHERNET=1 -DFEATURE_ARDUINO_OTA=1 -DPLUGIN_BUILD_CUSTOM -DFEATURE_SD=1 @@ -178,7 +147,6 @@ board = esp32s3cdc-qio_opi-8M extends = esp32s3_common_LittleFS board = esp32s3cdc-qio_qspi-8M build_flags = ${esp32s3_common_LittleFS.build_flags} - -DFEATURE_ETHERNET=1 -DFEATURE_ARDUINO_OTA=1 -DPLUGIN_BUILD_MAX_ESP32 -DPLUGIN_BUILD_IR_EXTENDED @@ -196,7 +164,6 @@ board = esp32s3cdc-qio_opi-8M extends = esp32s3_common_LittleFS board = esp32s3cdc-qio_qspi-16M build_flags = ${esp32s3_common_LittleFS.build_flags} - -DFEATURE_ETHERNET=1 -DFEATURE_ARDUINO_OTA=1 -DPLUGIN_BUILD_CUSTOM -DPLUGIN_BUILD_IR_EXTENDED @@ -213,7 +180,6 @@ board = esp32s3cdc-qio_opi-16M extends = esp32s3_common_LittleFS board = esp32s3cdc-qio_qspi-16M build_flags = ${esp32s3_common_LittleFS.build_flags} - -DFEATURE_ETHERNET=1 -DFEATURE_ARDUINO_OTA=1 -DPLUGIN_BUILD_MAX_ESP32 -DPLUGIN_BUILD_IR_EXTENDED @@ -226,7 +192,6 @@ extra_scripts = ${esp32s3_common_LittleFS.extra_scripts} extends = esp32s3_common_LittleFS board = esp32s3cdc-qio_opi-16M build_flags = ${esp32s3_common_LittleFS.build_flags} - -DFEATURE_ETHERNET=1 -DFEATURE_ARDUINO_OTA=1 -DPLUGIN_BUILD_MAX_ESP32 -DPLUGIN_BUILD_IR_EXTENDED diff --git a/src/src/Helpers/Hardware_GPIO_ESP32C3.cpp b/src/src/Helpers/Hardware_GPIO_ESP32C3.cpp index daf353e55..b7e90b3f4 100644 --- a/src/src/Helpers/Hardware_GPIO_ESP32C3.cpp +++ b/src/src/Helpers/Hardware_GPIO_ESP32C3.cpp @@ -45,7 +45,9 @@ bool getGpioInfo(int gpio, int& pinnr, bool& input, bool& output, bool& warning) output = false; } else { // See: https://www.letscontrolit.com/forum/viewtopic.php?p=71880#p71874 - if ((gpio == MSPI_IOMUX_PIN_NUM_HD) || (gpio == MSPI_IOMUX_PIN_NUM_WP)) { + if ((gpio == 12) || (gpio == 13)) { + // SPIHD/GPIO12 + // SPIWP/GPIO13 if ((ESP.getFlashChipMode() != FM_DOUT) && (ESP.getFlashChipMode() != FM_DIO)) { input = false; diff --git a/tools/pio/post_esp32.py b/tools/pio/post_esp32.py index 5de862526..b96787f26 100644 --- a/tools/pio/post_esp32.py +++ b/tools/pio/post_esp32.py @@ -55,14 +55,14 @@ def esp32_create_combined_bin(source, target, env): cmd = [ "--chip", chip, - "merge_bin", + "merge-bin", "-o", new_file_name, - "--flash_mode", + "--flash-mode", flash_mode, - "--flash_freq", + "--flash-freq", flash_freq, - "--flash_size", + "--flash-size", flash_size, ] From 4703d4f9484ba7b55a467cc8cc9e21018ad01413 Mon Sep 17 00:00:00 2001 From: TD-er Date: Sat, 21 Jun 2025 01:24:53 +0200 Subject: [PATCH 063/564] [Build] Fix display ESP32 build --- platformio_esp32_envs.ini | 89 +++++++++++++++++++------------------ platformio_esp32s3_envs.ini | 2 +- platformio_special_envs.ini | 16 +++---- 3 files changed, 54 insertions(+), 53 deletions(-) diff --git a/platformio_esp32_envs.ini b/platformio_esp32_envs.ini index 6670dced5..0c92f8b2c 100644 --- a/platformio_esp32_envs.ini +++ b/platformio_esp32_envs.ini @@ -88,10 +88,11 @@ lib_ignore = ESP8266Ping -[esp32_common_LittleFS] +[esp32_common_LittleFS_ETH] extends = esp32_base_idf5 build_flags = ${esp32_base_idf5.build_flags} ; -mtext-section-literals + -DFEATURE_ETHERNET=1 -DESP32_CLASSIC -DUSE_LITTLEFS build_unflags = ${esp32_base_idf5.build_unflags} @@ -104,23 +105,23 @@ lib_ignore = ${esp32_always.lib_ignore} [esp32_IRExt_LittleFS_ETH] -extends = esp32_common_LittleFS +extends = esp32_common_LittleFS_ETH lib_ignore = ${esp32_always.lib_ignore} ESP32_ping -build_flags = ${esp32_common_LittleFS.build_flags} +build_flags = ${esp32_common_LittleFS_ETH.build_flags} -DFEATURE_ETHERNET=1 -DFEATURE_ARDUINO_OTA=1 -DPLUGIN_BUILD_NORMAL_IRext -DCOLLECTION_FEATURE_RTTTL=1 -extra_scripts = ${esp32_common_LittleFS.extra_scripts} +extra_scripts = ${esp32_common_LittleFS_ETH.extra_scripts} pre:tools/pio/ir_build_check.py [esp32_custom_base_LittleFS] -extends = esp32_common_LittleFS -build_flags = ${esp32_common_LittleFS.build_flags} +extends = esp32_common_LittleFS_ETH +build_flags = ${esp32_common_LittleFS_ETH.build_flags} -DPLUGIN_BUILD_CUSTOM -extra_scripts = ${esp32_common_LittleFS.extra_scripts} +extra_scripts = ${esp32_common_LittleFS_ETH.extra_scripts} pre:tools/pio/pre_custom_esp32.py @@ -139,15 +140,15 @@ build_flags = ${env:custom_ESP32_4M316k_LittleFS_ETH.build_flags} [env:custom_IR_ESP32_4M316k_LittleFS_ETH] -extends = esp32_common_LittleFS +extends = esp32_common_LittleFS_ETH board = esp32_4M -build_flags = ${esp32_common_LittleFS.build_flags} +build_flags = ${esp32_common_LittleFS_ETH.build_flags} -DPLUGIN_BUILD_CUSTOM -DPLUGIN_BUILD_IR lib_ignore = ${esp32_always.lib_ignore} ESP32_ping -extra_scripts = ${esp32_common_LittleFS.extra_scripts} +extra_scripts = ${esp32_common_LittleFS_ETH.extra_scripts} pre:tools/pio/pre_custom_esp32_IR.py pre:tools/pio/ir_build_check.py @@ -160,63 +161,63 @@ build_flags = ${env:custom_ESP32_4M316k_LittleFS_ETH.build_flags} [env:collection_A_ESP32_4M316k_LittleFS_ETH] -extends = esp32_common_LittleFS +extends = esp32_common_LittleFS_ETH board = esp32_4M -build_flags = ${esp32_common_LittleFS.build_flags} +build_flags = ${esp32_common_LittleFS_ETH.build_flags} -DFEATURE_ARDUINO_OTA=1 -DPLUGIN_SET_COLLECTION_ESP32 -DCOLLECTION_FEATURE_RTTTL=1 [env:collection_B_ESP32_4M316k_LittleFS_ETH] -extends = esp32_common_LittleFS +extends = esp32_common_LittleFS_ETH board = esp32_4M -build_flags = ${esp32_common_LittleFS.build_flags} +build_flags = ${esp32_common_LittleFS_ETH.build_flags} -DFEATURE_ARDUINO_OTA=1 -DPLUGIN_SET_COLLECTION_B_ESP32 -DCOLLECTION_FEATURE_RTTTL=1 [env:collection_C_ESP32_4M316k_LittleFS_ETH] -extends = esp32_common_LittleFS +extends = esp32_common_LittleFS_ETH board = esp32_4M -build_flags = ${esp32_common_LittleFS.build_flags} +build_flags = ${esp32_common_LittleFS_ETH.build_flags} -DFEATURE_ARDUINO_OTA=1 -DPLUGIN_SET_COLLECTION_C_ESP32 -DCOLLECTION_FEATURE_RTTTL=1 [env:collection_D_ESP32_4M316k_LittleFS_ETH] -extends = esp32_common_LittleFS +extends = esp32_common_LittleFS_ETH board = esp32_4M -build_flags = ${esp32_common_LittleFS.build_flags} +build_flags = ${esp32_common_LittleFS_ETH.build_flags} -DFEATURE_ARDUINO_OTA=1 -DPLUGIN_SET_COLLECTION_D_ESP32 -DCOLLECTION_FEATURE_RTTTL=1 [env:collection_E_ESP32_4M316k_LittleFS_ETH] -extends = esp32_common_LittleFS +extends = esp32_common_LittleFS_ETH board = esp32_4M -build_flags = ${esp32_common_LittleFS.build_flags} +build_flags = ${esp32_common_LittleFS_ETH.build_flags} -DFEATURE_ARDUINO_OTA=1 -DPLUGIN_SET_COLLECTION_E_ESP32 -DCOLLECTION_FEATURE_RTTTL=1 [env:collection_F_ESP32_4M316k_LittleFS_ETH] -extends = esp32_common_LittleFS +extends = esp32_common_LittleFS_ETH board = esp32_4M -build_flags = ${esp32_common_LittleFS.build_flags} +build_flags = ${esp32_common_LittleFS_ETH.build_flags} -DFEATURE_ARDUINO_OTA=1 -DPLUGIN_SET_COLLECTION_F_ESP32 -DCOLLECTION_FEATURE_RTTTL=1 [env:collection_G_ESP32_4M316k_LittleFS_ETH] -extends = esp32_common_LittleFS +extends = esp32_common_LittleFS_ETH board = esp32_4M -build_flags = ${esp32_common_LittleFS.build_flags} +build_flags = ${esp32_common_LittleFS_ETH.build_flags} -DFEATURE_ARDUINO_OTA=1 -DPLUGIN_SET_COLLECTION_G_ESP32 -DCOLLECTION_FEATURE_RTTTL=1 @@ -266,17 +267,17 @@ build_flags = ${esp32_IRExt_LittleFS_ETH.build_flags} -DPLUGIN_SET_COLLECTION_G_ESP32 [env:energy_ESP32_4M316k_LittleFS_ETH] -extends = esp32_common_LittleFS +extends = esp32_common_LittleFS_ETH board = esp32_4M -build_flags = ${esp32_common_LittleFS.build_flags} +build_flags = ${esp32_common_LittleFS_ETH.build_flags} -DFEATURE_ARDUINO_OTA=1 -DPLUGIN_ENERGY_COLLECTION [env:display_ESP32_4M316k_LittleFS_ETH] -extends = esp32_common_LittleFS +extends = esp32_common_LittleFS_ETH board = esp32_4M -build_flags = ${esp32_common_LittleFS.build_flags} +build_flags = ${esp32_common_LittleFS_ETH.build_flags} -DFEATURE_ARDUINO_OTA=1 -DPLUGIN_DISPLAY_COLLECTION -D ST7789_EXTRA_INIT=1 @@ -285,20 +286,20 @@ build_flags = ${esp32_common_LittleFS.build_flags} [env:climate_ESP32_4M316k_LittleFS_ETH] -extends = esp32_common_LittleFS +extends = esp32_common_LittleFS_ETH board = esp32_4M lib_ignore = ${esp32_always.lib_ignore} ESP32_ping - ${esp32_common_LittleFS.lib_ignore} + ${esp32_common_LittleFS_ETH.lib_ignore} ${no_ir.lib_ignore} -build_flags = ${esp32_common_LittleFS.build_flags} +build_flags = ${esp32_common_LittleFS_ETH.build_flags} -DPLUGIN_CLIMATE_COLLECTION [env:neopixel_ESP32_4M316k_LittleFS_ETH] -extends = esp32_common_LittleFS +extends = esp32_common_LittleFS_ETH board = esp32_4M -build_flags = ${esp32_common_LittleFS.build_flags} +build_flags = ${esp32_common_LittleFS_ETH.build_flags} -DFEATURE_ARDUINO_OTA=1 -DFEATURE_SD=1 -D PLUGIN_NEOPIXEL_COLLECTION @@ -307,29 +308,29 @@ build_flags = ${esp32_common_LittleFS.build_flags} [env:custom_IR_ESP32_16M8M_LittleFS_ETH] -extends = esp32_common_LittleFS +extends = esp32_common_LittleFS_ETH board = esp32_16M8M board_upload.flash_size = 16MB -build_flags = ${esp32_common_LittleFS.build_flags} +build_flags = ${esp32_common_LittleFS_ETH.build_flags} -DPLUGIN_BUILD_CUSTOM -DPLUGIN_BUILD_IR lib_ignore = ${esp32_always.lib_ignore} ESP32_ping - ${esp32_common_LittleFS.lib_ignore} -extra_scripts = ${esp32_common_LittleFS.extra_scripts} + ${esp32_common_LittleFS_ETH.lib_ignore} +extra_scripts = ${esp32_common_LittleFS_ETH.extra_scripts} pre:tools/pio/pre_custom_esp32_IR.py pre:tools/pio/ir_build_check.py [env:normal_ESP32_4M316k_LittleFS_ETH] -extends = esp32_common_LittleFS +extends = esp32_common_LittleFS_ETH board = esp32_4M lib_ignore = ${esp32_always.lib_ignore} ESP32_ping - ${esp32_common_LittleFS.lib_ignore} + ${esp32_common_LittleFS_ETH.lib_ignore} ${no_ir.lib_ignore} -build_flags = ${esp32_common_LittleFS.build_flags} +build_flags = ${esp32_common_LittleFS_ETH.build_flags} @@ -345,19 +346,19 @@ build_flags = ${esp32_IRExt_LittleFS_ETH.build_flags} ; A Lolin D32 PRO with 16MB Flash, allowing 4MB sketch size, and file storage using LittleFS filesystem [env:max_ESP32_16M8M_LittleFS_ETH] -extends = esp32_common_LittleFS +extends = esp32_common_LittleFS_ETH board = esp32_16M8M board_upload.flash_size = 16MB lib_ignore = ${esp32_always.lib_ignore} ESP32_ping - ${esp32_common_LittleFS.lib_ignore} -build_flags = ${esp32_common_LittleFS.build_flags} + ${esp32_common_LittleFS_ETH.lib_ignore} +build_flags = ${esp32_common_LittleFS_ETH.build_flags} -DFEATURE_ARDUINO_OTA=1 -DPLUGIN_BUILD_MAX_ESP32 -DPLUGIN_BUILD_IR_EXTENDED -D ST7789_EXTRA_INIT=1 -D P116_EXTRA_ST7789=1 -extra_scripts = ${esp32_common_LittleFS.extra_scripts} +extra_scripts = ${esp32_common_LittleFS_ETH.extra_scripts} board_build.filesystem = littlefs ; If you have a board with Ethernet integrated and 16MB Flash, then this configuration could be enabled, it's based on the max_ESP32_16M8M_LittleFS definition diff --git a/platformio_esp32s3_envs.ini b/platformio_esp32s3_envs.ini index aa3bde873..a664f96fb 100644 --- a/platformio_esp32s3_envs.ini +++ b/platformio_esp32s3_envs.ini @@ -1,6 +1,6 @@ [esp32s3_common_LittleFS] extends = esp32_base_idf5 -lib_ignore = ${esp32_common_LittleFS.lib_ignore} +lib_ignore = ${esp32_common_LittleFS_ETH.lib_ignore} ESP32_ping ${esp32_base_idf5.lib_ignore} build_flags = ${esp32_base_idf5.build_flags} diff --git a/platformio_special_envs.ini b/platformio_special_envs.ini index 6b2c28ebd..179b27b68 100644 --- a/platformio_special_envs.ini +++ b/platformio_special_envs.ini @@ -50,14 +50,14 @@ extra_scripts = ${extra_scripts_esp8266.extra_scripts} [env:spec_debug_custom_ESP32_16M8M] -extends = esp32_common_LittleFS +extends = esp32_common_LittleFS_ETH build_type = ${debug_pio.build_type} check_tool = ${debug_pio.check_tool} check_flags = ${debug_pio.check_flags} -platform = ${esp32_common_LittleFS.platform} -build_flags = ${esp32_common_LittleFS.build_flags} ${debug_pio.build_flags} -DPLUGIN_BUILD_CUSTOM +platform = ${esp32_common_LittleFS_ETH.platform} +build_flags = ${esp32_common_LittleFS_ETH.build_flags} ${debug_pio.build_flags} -DPLUGIN_BUILD_CUSTOM board = esp32_16M8M -extra_scripts = ${esp32_common_LittleFS.extra_scripts} +extra_scripts = ${esp32_common_LittleFS_ETH.extra_scripts} pre:tools/pio/pre_custom_esp32.py [env:spec_debug_max_ESP32_16M8M] @@ -65,7 +65,7 @@ extends = esp32_base_idf5 build_type = ${debug_pio.build_type} check_tool = ${debug_pio.check_tool} check_flags = ${debug_pio.check_flags} -lib_ignore = ${esp32_common_LittleFS.lib_ignore} +lib_ignore = ${esp32_common_LittleFS_ETH.lib_ignore} build_flags = ${esp32_base_idf5.build_flags} ${debug_pio.build_flags} -DESP32_CLASSIC @@ -87,7 +87,7 @@ extends = esp32_base_idf5 build_type = ${debug_pio.build_type} check_tool = ${debug_pio.check_tool} check_flags = ${debug_pio.check_flags} -lib_ignore = ${esp32_common_LittleFS.lib_ignore} +lib_ignore = ${esp32_common_LittleFS_ETH.lib_ignore} build_flags = ${esp32_base_idf5.build_flags} ${debug_pio.build_flags} -DESP32_CLASSIC @@ -107,7 +107,7 @@ extends = esp32_base_idf5 build_type = ${debug_pio.build_type} check_tool = ${debug_pio.check_tool} check_flags = ${debug_pio.check_flags} -lib_ignore = ${esp32_common_LittleFS.lib_ignore} +lib_ignore = ${esp32_common_LittleFS_ETH.lib_ignore} build_flags = ${esp32_base_idf5.build_flags} ${debug_pio.build_flags} -DESP32_CLASSIC @@ -128,7 +128,7 @@ extends = esp32_base_idf5 build_type = ${debug_pio.build_type} check_tool = ${debug_pio.check_tool} check_flags = ${debug_pio.check_flags} -lib_ignore = ${esp32_common_LittleFS.lib_ignore} +lib_ignore = ${esp32_common_LittleFS_ETH.lib_ignore} build_flags = ${esp32_base_idf5.build_flags} ${debug_pio.build_flags} -DESP32_CLASSIC From 100d64e5ccd6665b3dd300592859041cd28d0224 Mon Sep 17 00:00:00 2001 From: TD-er Date: Sat, 21 Jun 2025 01:50:23 +0200 Subject: [PATCH 064/564] [build] Change ESP32 IRExt builds to LIMIT_BUILD_SIZE --- platformio_esp32_envs.ini | 1 + 1 file changed, 1 insertion(+) diff --git a/platformio_esp32_envs.ini b/platformio_esp32_envs.ini index 0c92f8b2c..5b0f60e04 100644 --- a/platformio_esp32_envs.ini +++ b/platformio_esp32_envs.ini @@ -113,6 +113,7 @@ build_flags = ${esp32_common_LittleFS_ETH.build_flags} -DFEATURE_ARDUINO_OTA=1 -DPLUGIN_BUILD_NORMAL_IRext -DCOLLECTION_FEATURE_RTTTL=1 + -DLIMIT_BUILD_SIZE extra_scripts = ${esp32_common_LittleFS_ETH.extra_scripts} pre:tools/pio/ir_build_check.py From 5ed46c1c40573f418d574f8520665794f610bf76 Mon Sep 17 00:00:00 2001 From: TD-er Date: Mon, 23 Jun 2025 15:50:46 +0200 Subject: [PATCH 065/564] [ESP32-C61] Start adding support for new SoC & generalize WiFi features --- boards/esp32c61cdc-8M.json | 40 ++++ lib/ESPEasySerial/ESPEasySerialType.h | 120 ++++++----- .../ESPEasySerial_common_defines.h | 4 +- platformio.ini | 1 + platformio_core_defs.ini | 7 +- platformio_esp32c61_envs.ini | 27 +++ src/include/esp32x_fixes.h | 28 ++- src/src/CustomBuild/ESPEasy_buildinfo.h | 26 ++- src/src/DataStructs/WiFi_AP_Candidate.cpp | 4 +- src/src/DataTypes/NodeTypeID.cpp | 1 + src/src/DataTypes/NodeTypeID.h | 3 + src/src/DataTypes/SPI_options.cpp | 2 + src/src/DataTypes/SPI_options.h | 67 ++---- src/src/ESPEasyCore/ESPEasyWifi.cpp | 10 +- .../ESPEasyWifi_abstracted_ESP32.cpp | 43 +++- src/src/Helpers/Hardware_GPIO.h | 3 + src/src/WebServer/Markup.h | 192 +++++++++--------- 17 files changed, 349 insertions(+), 229 deletions(-) create mode 100644 boards/esp32c61cdc-8M.json create mode 100644 platformio_esp32c61_envs.ini diff --git a/boards/esp32c61cdc-8M.json b/boards/esp32c61cdc-8M.json new file mode 100644 index 000000000..3bc30400c --- /dev/null +++ b/boards/esp32c61cdc-8M.json @@ -0,0 +1,40 @@ +{ + "build": { + "arduino":{ + "ldscript": "esp32c61_out.ld" + }, + "core": "esp32", + "extra_flags": "-DARDUINO_TASMOTA -DBOARD_HAS_PSRAM -DARDUINO_USB_MODE=1 -DUSE_USB_CDC_CONSOLE -DESP32_8M -DESP32C61 -DARDUINO_USB_CDC_ON_BOOT=1", + "f_cpu": "120000000L", + "f_flash": "80000000L", + "flash_mode": "qio", + "mcu": "esp32c61", + "variant": "esp32c61", + "partitions": "boards/partitions/esp32_partition_app3520k_spiffs1088k.csv" + }, + "connectivity": [ + "wifi", + "bluetooth" + ], + "debug": { + "default_tool": "esp-builtin", + "onboard_tools": [ + "esp-builtin" + ], + "openocd_target": "esp32c61.cfg" + }, + "frameworks": [ + "arduino", + "espidf" + ], + "name": "Espressif Generic ESP32-C61 >= 8M Flash, ESPEasy 3520k Code/OTA 1088k FS", + "upload": { + "flash_size": "8MB", + "maximum_ram_size": 327680, + "maximum_size": 8388608, + "require_upload_port": true, + "speed": 460800 + }, + "url": "https://docs.espressif.com/projects/espressif-esp-dev-kits/en/latest/esp32c6/esp32-c6-devkitc-1/index.html", + "vendor": "Espressif" + } diff --git a/lib/ESPEasySerial/ESPEasySerialType.h b/lib/ESPEasySerial/ESPEasySerialType.h index 65d15d5b9..90b71bb16 100644 --- a/lib/ESPEasySerial/ESPEasySerialType.h +++ b/lib/ESPEasySerial/ESPEasySerialType.h @@ -29,7 +29,7 @@ # elif CONFIG_IDF_TARGET_ESP32C2 # define SOC_RX0 19 # endif // if CONFIG_IDF_TARGET_ESP32 -# endif // ifndef SOC_RX0 +# endif // ifndef SOC_RX0 # ifndef SOC_TX0 # if CONFIG_IDF_TARGET_ESP32 @@ -45,67 +45,86 @@ # elif CONFIG_IDF_TARGET_ESP32C2 # define SOC_TX0 20 # endif // if CONFIG_IDF_TARGET_ESP32 -# endif // ifndef SOC_TX0 +# endif // ifndef SOC_TX0 -# if SOC_UART_NUM > 1 + +# if SOC_UART_HP_NUM > 1 # ifndef SOC_RX1 -# if CONFIG_IDF_TARGET_ESP32 -# define SOC_RX1 13 -# elif CONFIG_IDF_TARGET_ESP32S2 -# define SOC_RX1 18 -# elif CONFIG_IDF_TARGET_ESP32C2 || CONFIG_IDF_TARGET_ESP32C3 || CONFIG_IDF_TARGET_ESP32C5 || CONFIG_IDF_TARGET_ESP32C6 -# define SOC_RX1 4 -# elif CONFIG_IDF_TARGET_ESP32S3 -# define SOC_RX1 15 -# endif // if CONFIG_IDF_TARGET_ESP32 -# endif // ifndef SOC_RX1 +# ifdef RX1 +# define SOC_RX1 RX1 +# else +# if CONFIG_IDF_TARGET_ESP32 +# define SOC_RX1 13 +# elif CONFIG_IDF_TARGET_ESP32S2 +# define SOC_RX1 18 +# elif CONFIG_IDF_TARGET_ESP32C2 || CONFIG_IDF_TARGET_ESP32C3 || CONFIG_IDF_TARGET_ESP32C5 || CONFIG_IDF_TARGET_ESP32C6 +# define SOC_RX1 4 +# elif CONFIG_IDF_TARGET_ESP32S3 +# define SOC_RX1 15 +# endif // if CONFIG_IDF_TARGET_ESP32 +# endif // ifdef RX1 +# endif // ifndef SOC_RX1 # ifndef SOC_TX1 -# if CONFIG_IDF_TARGET_ESP32 -# define SOC_TX1 15 -# elif CONFIG_IDF_TARGET_ESP32S2 -# define SOC_TX1 17 -# elif CONFIG_IDF_TARGET_ESP32C2 || CONFIG_IDF_TARGET_ESP32C3 || CONFIG_IDF_TARGET_ESP32C5 || CONFIG_IDF_TARGET_ESP32C6 -# define SOC_TX1 5 -# elif CONFIG_IDF_TARGET_ESP32S3 -# define SOC_TX1 16 -# endif // if CONFIG_IDF_TARGET_ESP32 -# endif // ifndef SOC_TX1 +# ifdef TX1 +# define SOC_TX1 TX1 +# else +# if CONFIG_IDF_TARGET_ESP32 +# define SOC_TX1 15 +# elif CONFIG_IDF_TARGET_ESP32S2 +# define SOC_TX1 17 +# elif CONFIG_IDF_TARGET_ESP32C2 || CONFIG_IDF_TARGET_ESP32C3 || CONFIG_IDF_TARGET_ESP32C5 || CONFIG_IDF_TARGET_ESP32C6 +# define SOC_TX1 5 +# elif CONFIG_IDF_TARGET_ESP32S3 +# define SOC_TX1 16 +# endif // if CONFIG_IDF_TARGET_ESP32 +# endif // ifdef TX1 +# endif // ifndef SOC_TX1 -# endif // if SOC_UART_NUM > 1 +# endif // if SOC_UART_HP_NUM > 1 -# if SOC_UART_NUM > 2 +# if SOC_UART_HP_NUM > 2 # ifndef SOC_RX2 -# if CONFIG_IDF_TARGET_ESP32 -# define SOC_RX2 16 -# elif CONFIG_IDF_TARGET_ESP32S3 -# define SOC_RX2 19 -# elif CONFIG_IDF_TARGET_ESP32C6 -# define SOC_RX2 6 -# elif CONFIG_IDF_TARGET_ESP32C5 -# define SOC_RX2 6 -# else // if CONFIG_IDF_TARGET_ESP32 -# define SOC_RX2 -1 -# endif // if CONFIG_IDF_TARGET_ESP32 -# endif // ifndef SOC_RX2 +# ifdef RX2 +# define SOC_RX2 RX2 +# else + +# if CONFIG_IDF_TARGET_ESP32 +# define SOC_RX2 16 +# elif CONFIG_IDF_TARGET_ESP32S3 +# define SOC_RX2 19 +# elif CONFIG_IDF_TARGET_ESP32C6 +# define SOC_RX2 6 +# elif CONFIG_IDF_TARGET_ESP32C5 +# define SOC_RX2 6 +# else // if CONFIG_IDF_TARGET_ESP32 +# define SOC_RX2 -1 +# endif // if CONFIG_IDF_TARGET_ESP32 +# endif // ifdef RX2 +# endif // ifndef SOC_RX2 # ifndef SOC_TX2 -# if CONFIG_IDF_TARGET_ESP32 -# define SOC_TX2 17 -# elif CONFIG_IDF_TARGET_ESP32S3 -# define SOC_TX2 20 -# elif CONFIG_IDF_TARGET_ESP32C6 -# define SOC_TX2 7 -# elif CONFIG_IDF_TARGET_ESP32C5 -# define SOC_TX2 7 -# else // if CONFIG_IDF_TARGET_ESP32 -# define SOC_TX2 -1 -# endif // if CONFIG_IDF_TARGET_ESP32 -# endif // ifndef SOC_TX2 +# ifdef TX2 +# define SOC_TX2 TX2 +# else -# endif // if SOC_UART_NUM > 2 +# if CONFIG_IDF_TARGET_ESP32 +# define SOC_TX2 17 +# elif CONFIG_IDF_TARGET_ESP32S3 +# define SOC_TX2 20 +# elif CONFIG_IDF_TARGET_ESP32C6 +# define SOC_TX2 7 +# elif CONFIG_IDF_TARGET_ESP32C5 +# define SOC_TX2 7 +# else // if CONFIG_IDF_TARGET_ESP32 +# define SOC_TX2 -1 +# endif // if CONFIG_IDF_TARGET_ESP32 +# endif // ifdef TX2 +# endif // ifndef SOC_TX2 + +# endif // if SOC_UART_HP_NUM > 2 #endif // ifdef ESP32 @@ -117,6 +136,7 @@ struct ESPeasySerialType { static ESPEasySerialPort getSerialType(ESPEasySerialPort typeHint, int receivePin, int transmitPin); + }; diff --git a/lib/ESPEasySerial/ESPEasySerial_common_defines.h b/lib/ESPEasySerial/ESPEasySerial_common_defines.h index 6d8ce15dc..81ef0ba02 100644 --- a/lib/ESPEasySerial/ESPEasySerial_common_defines.h +++ b/lib/ESPEasySerial/ESPEasySerial_common_defines.h @@ -8,7 +8,7 @@ #ifndef SOC_UART_NUM # ifdef ESP8266 # define SOC_UART_NUM 2 -# elif defined(ESP32_CLASSIC) || defined(ESP32S2) || defined(ESP32S3) || defined(ESP32C2) || defined(ESP32C3) || defined(ESP32C5) || defined(ESP32C6) +# elif defined(ESP32_CLASSIC) || defined(ESP32S2) || defined(ESP32S3) || defined(ESP32C2) || defined(ESP32C3) || defined(ESP32C5) || defined(ESP32C6) || defined(ESP32C61) # include # else // ifdef ESP8266 static_assert(false, "Implement processor architecture"); @@ -40,7 +40,7 @@ static_assert(false, "Implement processor architecture"); CONFIG_IDF_TARGET_ESP32S2 || // support USB via USBCDC CONFIG_IDF_TARGET_ESP32S3 // support USB via HWCDC using JTAG interface or USBCDC */ -# if CONFIG_IDF_TARGET_ESP32C3 || CONFIG_IDF_TARGET_ESP32C5 || CONFIG_IDF_TARGET_ESP32C6 || CONFIG_IDF_TARGET_ESP32S2 || CONFIG_IDF_TARGET_ESP32S3 +# if CONFIG_IDF_TARGET_ESP32C3 || CONFIG_IDF_TARGET_ESP32C5 || CONFIG_IDF_TARGET_ESP32C6 || CONFIG_IDF_TARGET_ESP32C61 || CONFIG_IDF_TARGET_ESP32S2 || CONFIG_IDF_TARGET_ESP32S3 // #if CONFIG_TINYUSB_CDC_ENABLED // This define is not recognized here so use USE_USB_CDC_CONSOLE # ifdef USE_USB_CDC_CONSOLE diff --git a/platformio.ini b/platformio.ini index 6e461dd30..a638e17b2 100644 --- a/platformio.ini +++ b/platformio.ini @@ -29,6 +29,7 @@ extra_configs = platformio_esp32c3_envs.ini platformio_esp32c5_envs.ini platformio_esp32c6_envs.ini +; platformio_esp32c61_envs.ini ;default_envs = normal_ESP32_4M diff --git a/platformio_core_defs.ini b/platformio_core_defs.ini index 569072a76..eb4b43371 100644 --- a/platformio_core_defs.ini +++ b/platformio_core_defs.ini @@ -165,10 +165,8 @@ extra_scripts = ${esp82xx_common.extra_scripts} ; ESP_IDF 5.4.1 [core_esp32_IDF5_4_1__3_2_0_LittleFS] -;platform = https://github.com/Jason2866/platform-espressif32.git#Arduino/IDF54 -;platform_packages = framework-arduinoespressif32 @ https://github.com/Jason2866/esp32-arduino-lib-builder/releases/download/3538/framework-arduinoespressif32-all-release_v5.4-8f5ad6d7.zip platform = https://github.com/Jason2866/platform-espressif32.git#Arduino/IDF54 -platform_packages = +platform_packages = framework-arduinoespressif32 @ https://github.com/Jason2866/esp32-arduino-lib-builder/releases/download/3717/framework-arduinoespressif32-all-release_v5.4-fea159f6.zip build_flags = -DESP32_STAGE -DESP_IDF_VERSION_MAJOR=5 -DLIBRARIES_NO_LOG=1 @@ -197,7 +195,8 @@ lib_extra_dirs = ; ESP_IDF 5.5.0 [core_esp32_IDF5_5_0__3_2_0_LittleFS] platform = https://github.com/Jason2866/platform-espressif32.git#Arduino/IDF55 -platform_packages = framework-arduinoespressif32 @ https://github.com/Jason2866/esp32-arduino-lib-builder/releases/download/3627/framework-arduinoespressif32-all-release_v5.5-5d572003.zip +platform_packages = framework-arduinoespressif32 @ https://github.com/Jason2866/esp32-arduino-lib-builder/releases/download/3718/framework-arduinoespressif32-all-release_v5.5-eefeb2bb.zip +;platform_packages = framework-arduinoespressif32 @ https://github.com/Jason2866/esp32-arduino-lib-builder/releases/download/3627/framework-arduinoespressif32-all-release_v5.5-5d572003.zip build_flags = -DESP32_STAGE -DESP_IDF_VERSION_MAJOR=5 -DLIBRARIES_NO_LOG=1 diff --git a/platformio_esp32c61_envs.ini b/platformio_esp32c61_envs.ini new file mode 100644 index 000000000..1743b7abb --- /dev/null +++ b/platformio_esp32c61_envs.ini @@ -0,0 +1,27 @@ +[esp32c61_common_LittleFS] +extends = esp32_base_idf5_5 +build_flags = ${esp32_base_idf5_5.build_flags} + -DFEATURE_ARDUINO_OTA=1 + -DUSE_LITTLEFS + -DESP32C61 +extra_scripts = ${esp32_base_idf5_5.extra_scripts} +build_unflags = ${esp32_base_idf5_5.build_unflags} + -fexceptions +board_build.filesystem = littlefs +lib_ignore = ${esp32_base_idf5_5.lib_ignore} +board = esp32c61cdc + + +[env:max_ESP32c61_8M1M_LittleFS_CDC_ETH] +extends = esp32c61_common_LittleFS +board = esp32c61cdc-8M +build_flags = ${esp32c61_common_LittleFS.build_flags} + -DFEATURE_ETHERNET=1 + -DFEATURE_ARDUINO_OTA=1 + -DPLUGIN_BUILD_MAX_ESP32 + -DPLUGIN_BUILD_IR_EXTENDED + -D ST7789_EXTRA_INIT=1 + -D P116_EXTRA_ST7789=1 +extra_scripts = ${esp32c61_common_LittleFS.extra_scripts} + + diff --git a/src/include/esp32x_fixes.h b/src/include/esp32x_fixes.h index 44c3ab47c..d8ecec688 100644 --- a/src/include/esp32x_fixes.h +++ b/src/include/esp32x_fixes.h @@ -32,6 +32,9 @@ * -I$PROJECT_DIR/include * -include "esp32x_fixes.h" */ + +//#include + #ifdef __riscv # undef __INT32_TYPE__ @@ -87,10 +90,14 @@ # endif // REG_SPI_BASE # endif // ESP_IDF_VERSION_MAJOR < 5 -#elif CONFIG_IDF_TARGET_ESP32C2 || CONFIG_IDF_TARGET_ESP32C5 || CONFIG_IDF_TARGET_ESP32C6 +#else # define SPI_HOST SPI1_HOST # define HSPI_HOST SPI2_HOST -# define VSPI_HOST SPI2_HOST /* No SPI3_host on C2/C6 */ +#if SOC_SPI_PERIPH_NUM > 2 +# define VSPI_HOST SPI3_HOST +#else +# define VSPI_HOST SPI2_HOST /* No SPI3_host */ +#endif # define VSPI SPI // #if ESP_IDF_VERSION_MAJOR < 5 @@ -105,3 +112,20 @@ #endif // TARGET + + +#ifndef CONFIG_SOC_WIFI_HE_SUPPORT +#if CONFIG_IDF_TARGET_ESP32C5 || CONFIG_IDF_TARGET_ESP32C6 || CONFIG_IDF_TARGET_ESP32C61 +#define CONFIG_SOC_WIFI_HE_SUPPORT 1 +#else +#define CONFIG_SOC_WIFI_HE_SUPPORT 0 +#endif +#endif + +#ifndef CONFIG_SOC_WIFI_SUPPORT_5G +#if CONFIG_IDF_TARGET_ESP32C5 +#define CONFIG_SOC_WIFI_SUPPORT_5G 1 +#else +#define CONFIG_SOC_WIFI_SUPPORT_5G 0 +#endif +#endif \ No newline at end of file diff --git a/src/src/CustomBuild/ESPEasy_buildinfo.h b/src/src/CustomBuild/ESPEasy_buildinfo.h index b6f669d73..0fb8e9ba6 100644 --- a/src/src/CustomBuild/ESPEasy_buildinfo.h +++ b/src/src/CustomBuild/ESPEasy_buildinfo.h @@ -34,18 +34,22 @@ # define BUILD_NOTES " - Mega32-s2" #elif defined(ESP32S3) # define BUILD_NOTES " - Mega32-s3" - #elif defined(ESP32H2) - # define BUILD_NOTES " - Mega32-h2" - #elif defined(ESP32P4) - # define BUILD_NOTES " - Mega32-p4" - #elif defined(ESP32C6) - # define BUILD_NOTES " - Mega32-c6" - #elif defined(ESP32C5) - # define BUILD_NOTES " - Mega32-c5" - #elif defined(ESP32C3) - # define BUILD_NOTES " - Mega32-c3" #elif defined(ESP32C2) # define BUILD_NOTES " - Mega32-c2" + #elif defined(ESP32C3) + # define BUILD_NOTES " - Mega32-c3" + #elif defined(ESP32C5) + # define BUILD_NOTES " - Mega32-c5" + #elif defined(ESP32C6) + # define BUILD_NOTES " - Mega32-c6" + #elif defined(ESP32C61) + # define BUILD_NOTES " - Mega32-c61" + #elif defined(ESP32H2) + # define BUILD_NOTES " - Mega32-h2" + #elif defined(ESP32H21) + # define BUILD_NOTES " - Mega32-h21" + #elif defined(ESP32P4) + # define BUILD_NOTES " - Mega32-p4" # elif defined(ESP32_CLASSIC) # define BUILD_NOTES " - Mega32" # else @@ -72,7 +76,7 @@ CONFIG_IDF_TARGET_ESP32S2 || // support USB via USBCDC CONFIG_IDF_TARGET_ESP32S3 // support USB via HWCDC using JTAG interface or USBCDC */ -# if CONFIG_IDF_TARGET_ESP32C3 || CONFIG_IDF_TARGET_ESP32C5 || CONFIG_IDF_TARGET_ESP32C6 || CONFIG_IDF_TARGET_ESP32S2 || CONFIG_IDF_TARGET_ESP32S3 +# if !defined(CONFIG_IDF_TARGET_ESP32) && !defined(CONFIG_IDF_TARGET_ESP32C2) // #if CONFIG_TINYUSB_CDC_ENABLED // This define is not recognized here so use USE_USB_CDC_CONSOLE # ifdef USE_USB_CDC_CONSOLE diff --git a/src/src/DataStructs/WiFi_AP_Candidate.cpp b/src/src/DataStructs/WiFi_AP_Candidate.cpp index 907c3d5d2..e5a08dcae 100644 --- a/src/src/DataStructs/WiFi_AP_Candidate.cpp +++ b/src/src/DataStructs/WiFi_AP_Candidate.cpp @@ -115,7 +115,7 @@ WiFi_AP_Candidate::WiFi_AP_Candidate(uint8_t networkItem) : index(0) { bits.phy_11ax = it->phy_11ax; bits.ftm_initiator = it->ftm_initiator; bits.ftm_responder = it->ftm_responder; -#ifdef ESP32C5 +#if CONFIG_SOC_WIFI_SUPPORT_5G bits.phy_11a = it->phy_11a; bits.phy_11ac = it->phy_11ac; #endif @@ -256,7 +256,7 @@ String WiFi_AP_Candidate::toString(const String& separator) const { separator.c_str(), channel); -#ifdef ESP32C5 +#if CONFIG_SOC_WIFI_SUPPORT_5G if (channel < 36) { result += F(" 2.4 GHz"); } else { diff --git a/src/src/DataTypes/NodeTypeID.cpp b/src/src/DataTypes/NodeTypeID.cpp index ea80827b9..0001a954d 100644 --- a/src/src/DataTypes/NodeTypeID.cpp +++ b/src/src/DataTypes/NodeTypeID.cpp @@ -15,6 +15,7 @@ const __FlashStringHelper* toNodeTypeDisplayString(uint8_t nodeType) { case NODE_TYPE_ID_ESP_EASY32C6_STD: return F("ESP Easy 32-C6"); case NODE_TYPE_ID_ESP_EASY32C61_STD: return F("ESP Easy 32-C61"); case NODE_TYPE_ID_ESP_EASY32H2_STD: return F("ESP Easy 32-H2"); + case NODE_TYPE_ID_ESP_EASY32H21_STD: return F("ESP Easy 32-H21"); case NODE_TYPE_ID_ESP_EASY32P4_STD: return F("ESP Easy 32-P4"); case NODE_TYPE_ID_RPI_EASY_STD: return F("RPI Easy"); case NODE_TYPE_ID_ARDUINO_EASY_STD: return F("Arduino Easy"); diff --git a/src/src/DataTypes/NodeTypeID.h b/src/src/DataTypes/NodeTypeID.h index d448efa7f..46c672f55 100644 --- a/src/src/DataTypes/NodeTypeID.h +++ b/src/src/DataTypes/NodeTypeID.h @@ -18,6 +18,7 @@ #define NODE_TYPE_ID_ESP_EASY32C61_STD 40 #define NODE_TYPE_ID_ESP_EASY32C5_STD 41 #define NODE_TYPE_ID_ESP_EASY32P4_STD 42 +#define NODE_TYPE_ID_ESP_EASY32H21_STD 43 #define NODE_TYPE_ID_ARDUINO_EASY_STD 65 #define NODE_TYPE_ID_NANO_EASY_STD 81 @@ -44,6 +45,8 @@ # define NODE_TYPE_ID NODE_TYPE_ID_ESP_EASY32C61_STD # elif defined(ESP32H2) # define NODE_TYPE_ID NODE_TYPE_ID_ESP_EASY32H2_STD + # elif defined(ESP32H21) + # define NODE_TYPE_ID NODE_TYPE_ID_ESP_EASY32H21_STD # elif defined(ESP32P4) # define NODE_TYPE_ID NODE_TYPE_ID_ESP_EASY32P4_STD # elif defined(ESP32_CLASSIC) diff --git a/src/src/DataTypes/SPI_options.cpp b/src/src/DataTypes/SPI_options.cpp index 0736a212e..5f1c3ee79 100644 --- a/src/src/DataTypes/SPI_options.cpp +++ b/src/src/DataTypes/SPI_options.cpp @@ -46,6 +46,8 @@ #define VSPI_FSPI_SHORT_STRING "FSPI" # elif CONFIG_IDF_TARGET_ESP32C6 // ESP32-C6 #define VSPI_FSPI_SHORT_STRING "FSPI" +# elif CONFIG_IDF_TARGET_ESP32C61 // ESP32-C61 +#define VSPI_FSPI_SHORT_STRING "FSPI" # elif CONFIG_IDF_TARGET_ESP32 // ESP32/PICO-D4 #define VSPI_FSPI_SHORT_STRING "VSPI" diff --git a/src/src/DataTypes/SPI_options.h b/src/src/DataTypes/SPI_options.h index 341695d87..3bb385a8f 100644 --- a/src/src/DataTypes/SPI_options.h +++ b/src/src/DataTypes/SPI_options.h @@ -39,65 +39,26 @@ // HSPI option is disabled for now on other than ESP32_CLASSIC. // Should be added later as "Custom HSPI" when we support multiple SPI busses. #ifdef ESP32 -# if ESP_IDF_VERSION < ESP_IDF_VERSION_VAL(5, 4, 0) -# if CONFIG_IDF_TARGET_ESP32S3 // ESP32-S3 -# define VSPI_FSPI_SCK 36 -# define VSPI_FSPI_MISO 37 -# define VSPI_FSPI_MOSI 35 -# elif CONFIG_IDF_TARGET_ESP32S2 // ESP32-S2 -# define VSPI_FSPI_SCK 36 -# define VSPI_FSPI_MISO 37 -# define VSPI_FSPI_MOSI 35 -# elif CONFIG_IDF_TARGET_ESP32C6 // ESP32-C6 -# define VSPI_FSPI_SCK 21 -# define VSPI_FSPI_MISO 20 -# define VSPI_FSPI_MOSI 19 -# elif CONFIG_IDF_TARGET_ESP32C5 // ESP32-C5 -# define VSPI_FSPI_SCK SPI2_IOMUX_PIN_NUM_CLK -# define VSPI_FSPI_MISO SPI2_IOMUX_PIN_NUM_MISO -# define VSPI_FSPI_MOSI SPI2_IOMUX_PIN_NUM_MOSI -# elif CONFIG_IDF_TARGET_ESP32C3 // ESP32-C3 -# define VSPI_FSPI_SCK 4 -# define VSPI_FSPI_MISO 5 -# define VSPI_FSPI_MOSI 6 -# elif CONFIG_IDF_TARGET_ESP32C2 // ESP32-C2 -# define VSPI_FSPI_SCK 4 -# define VSPI_FSPI_MISO 5 -# define VSPI_FSPI_MOSI 6 -# elif CONFIG_IDF_TARGET_ESP32 // ESP32/PICO-D4 -# define VSPI_FSPI_SCK 18 -# define VSPI_FSPI_MISO 19 -# define VSPI_FSPI_MOSI 23 -# define HSPI_SCLK 14 -# define HSPI_MISO 12 -# define HSPI_MOSI 13 -# define HSPI_SS 15 +# if CONFIG_IDF_TARGET_ESP32 // ESP32/PICO-D4 -# else // if CONFIG_IDF_TARGET_ESP32S2 -# error Target CONFIG_IDF_TARGET is not supported -# endif // if CONFIG_IDF_TARGET_ESP32S2 -# else // if ESP_IDF_VERSION < ESP_IDF_VERSION_VAL(5, 4, 0) -# if CONFIG_IDF_TARGET_ESP32 // ESP32/PICO-D4 +# define VSPI_FSPI_SCK 18 +# define VSPI_FSPI_MISO 19 +# define VSPI_FSPI_MOSI 23 -# define VSPI_FSPI_SCK 18 -# define VSPI_FSPI_MISO 19 -# define VSPI_FSPI_MOSI 23 +# define HSPI_SCLK 14 +# define HSPI_MISO 12 +# define HSPI_MOSI 13 +# define HSPI_SS 15 -# define HSPI_SCLK 14 -# define HSPI_MISO 12 -# define HSPI_MOSI 13 -# define HSPI_SS 15 +# else // if CONFIG_IDF_TARGET_ESP32 +# include -# else // if CONFIG_IDF_TARGET_ESP32 -# include +# define VSPI_FSPI_SCK SPI2_IOMUX_PIN_NUM_CLK +# define VSPI_FSPI_MISO SPI2_IOMUX_PIN_NUM_MISO +# define VSPI_FSPI_MOSI SPI2_IOMUX_PIN_NUM_MOSI -# define VSPI_FSPI_SCK SPI2_IOMUX_PIN_NUM_CLK -# define VSPI_FSPI_MISO SPI2_IOMUX_PIN_NUM_MISO -# define VSPI_FSPI_MOSI SPI2_IOMUX_PIN_NUM_MOSI - -# endif // if CONFIG_IDF_TARGET_ESP32 -# endif // if ESP_IDF_VERSION < ESP_IDF_VERSION_VAL(5, 4, 0) +# endif // if CONFIG_IDF_TARGET_ESP32 #endif // ifdef ESP32 enum class SPI_Options_e { // Do not change values as this is stored in the settings! diff --git a/src/src/ESPEasyCore/ESPEasyWifi.cpp b/src/src/ESPEasyCore/ESPEasyWifi.cpp index 828736fe5..17af3cb25 100644 --- a/src/src/ESPEasyCore/ESPEasyWifi.cpp +++ b/src/src/ESPEasyCore/ESPEasyWifi.cpp @@ -379,9 +379,13 @@ void WifiScan(bool async, uint8_t channel) { # ifdef ESP32 const bool passive = Settings.PassiveWiFiScan(); const uint32_t max_ms_per_chan = 120; -#ifndef ESP32C5 - // C5 scans both 2.4 and 5 GHz band, which takes much longer - WiFi.setScanTimeout(14 * max_ms_per_chan * 2); +#if CONFIG_SOC_WIFI_SUPPORT_5G + // ESP32-C5 scans both 2.4 and 5 GHz band, which takes much longer + // 14 channels on 2.4 GHz + // 36 channels on 5 GHz: 36~177 (36, 40, 44 ... 177) + WiFi.setScanTimeout(50 * (max_ms_per_chan + 10)); +#else +// WiFi.setScanTimeout(14 * (max_ms_per_chan + 10)); #endif WiFi.scanNetworks(async, show_hidden, passive, max_ms_per_chan /*, channel */); # endif // ifdef ESP32 diff --git a/src/src/ESPEasyCore/ESPEasyWifi_abstracted_ESP32.cpp b/src/src/ESPEasyCore/ESPEasyWifi_abstracted_ESP32.cpp index cb83130f1..dd1c656cd 100644 --- a/src/src/ESPEasyCore/ESPEasyWifi_abstracted_ESP32.cpp +++ b/src/src/ESPEasyCore/ESPEasyWifi_abstracted_ESP32.cpp @@ -23,7 +23,6 @@ # include - namespace ESPEasy { namespace net { namespace wifi { @@ -295,24 +294,46 @@ void setConnectionSpeed(bool ForceWiFi_bg_mode) { // The response speed and stability is better at HT20 for ESP units. esp_wifi_set_bandwidth(WIFI_IF_STA, WIFI_BW_HT20); - // uint8_t protocol = WIFI_PROTOCOL_11B | WIFI_PROTOCOL_11G; // Default to BG uint8_t protocol = 0; + if (ForceWiFi_bg_mode) { + protocol = WIFI_PROTOCOL_11B | WIFI_PROTOCOL_11G; // Default to BG + } + if (!ForceWiFi_bg_mode || (WiFiEventData.connectionFailures > 10)) { // Set to use BGN protocol |= WIFI_PROTOCOL_11N; - # if defined(ESP32C5) || defined(ESP32C6) +# if CONFIG_SOC_WIFI_HE_SUPPORT protocol |= WIFI_PROTOCOL_11AX; - # endif - #ifdef ESP32C5 +# endif +# if CONFIG_SOC_WIFI_SUPPORT_5G protocol |= WIFI_PROTOCOL_11A; protocol |= WIFI_PROTOCOL_11AC; - #endif +# endif // if CONFIG_SOC_WIFI_SUPPORT_5G } const WiFi_AP_Candidate candidate = WiFi_AP_Candidates.getCurrent(); if (candidate.phy_known()) { + if (protocol == 0) { + // No protocol preference set, so we try to match at least the modes supported by the AP + if (candidate.bits.phy_11b) { protocol |= WIFI_PROTOCOL_11B; } + + if (candidate.bits.phy_11g) { protocol |= WIFI_PROTOCOL_11G; } + + if (candidate.bits.phy_11n) { protocol |= WIFI_PROTOCOL_11N; } +# if CONFIG_SOC_WIFI_HE_SUPPORT + + if (candidate.bits.phy_11ax) { protocol |= WIFI_PROTOCOL_11AX; } +# endif // if CONFIG_SOC_WIFI_HE_SUPPORT +# if CONFIG_SOC_WIFI_SUPPORT_5G + + if (candidate.bits.phy_11a) { protocol |= WIFI_PROTOCOL_11A; } + + if (candidate.bits.phy_11ac) { protocol |= WIFI_PROTOCOL_11AC; } +# endif // if CONFIG_SOC_WIFI_SUPPORT_5G + } else + // Check to see if the access point is set to "N-only" if ((protocol & WIFI_PROTOCOL_11N) == 0) { if (!candidate.bits.phy_11b && !candidate.bits.phy_11g && candidate.bits.phy_11n) { @@ -321,26 +342,28 @@ void setConnectionSpeed(bool ForceWiFi_bg_mode) { protocol |= WIFI_PROTOCOL_11N; addLog(LOG_LEVEL_INFO, F("WIFI : AP is set to 802.11n only")); } -# if defined(ESP32C5) || defined(ESP32C6) +# if CONFIG_SOC_WIFI_HE_SUPPORT if (candidate.bits.phy_11ax) { // Set to use WiFi6 protocol |= WIFI_PROTOCOL_11AX; addLog(LOG_LEVEL_INFO, F("WIFI : AP allows 802.11ax, Wi-Fi 6")); } -#ifdef ESP32C5 +# if CONFIG_SOC_WIFI_SUPPORT_5G + if (candidate.bits.phy_11a) { // Set to use 5 GHz WiFi protocol |= WIFI_PROTOCOL_11A; addLog(LOG_LEVEL_INFO, F("WIFI : AP allows 802.11a, 5 GHz")); } + if (candidate.bits.phy_11ac) { // Set to use 5 GHz WiFi-5 protocol |= WIFI_PROTOCOL_11AC; addLog(LOG_LEVEL_INFO, F("WIFI : AP allows 802.11ac, 5 GHz Wi-Fi 5")); } -#endif -# endif // ifdef ESP32C6 +# endif // if CONFIG_SOC_WIFI_SUPPORT_5G +# endif // if CONFIG_SOC_WIFI_HE_SUPPORT } } } diff --git a/src/src/Helpers/Hardware_GPIO.h b/src/src/Helpers/Hardware_GPIO.h index e03522aa6..73c94d9d5 100644 --- a/src/src/Helpers/Hardware_GPIO.h +++ b/src/src/Helpers/Hardware_GPIO.h @@ -17,6 +17,9 @@ bool getGpioInfo(int gpio, bool& input, bool& output, bool& warning); + + +// For ESP32, see: https://github.com/espressif/arduino-esp32/blob/9d84c78cf2d44911639530e54a9dbb9ee9164f6c/cores/esp32/esp32-hal.h#L64-L75 bool isBootModePin(int gpio); bool isBootStrapPin(int gpio); diff --git a/src/src/WebServer/Markup.h b/src/src/WebServer/Markup.h index 94011dbf6..d638308e7 100644 --- a/src/src/WebServer/Markup.h +++ b/src/src/WebServer/Markup.h @@ -9,32 +9,36 @@ #include "../Helpers/StringGenerator_GPIO.h" -#ifdef ESP32_CLASSIC -#define ESP32XX "esp32" -#elif defined(ESP32C2) -#define ESP32XX "esp32c2" -#elif defined(ESP32C3) -#define ESP32XX "esp32c3" -#elif defined(ESP32C5) -#define ESP32XX "esp32c5" -#elif defined(ESP32C6) -#define ESP32XX "esp32c6" -#elif defined(ESP32C61) -#define ESP32XX "esp32c61" -#elif defined(ESP32H2) -#define ESP32XX "esp32h2" -#elif defined(ESP32H21) -#define ESP32XX "esp32h21" -#elif defined(ESP32H4) -#define ESP32XX "esp32h4" -#elif defined(ESP32S2) -#define ESP32XX "esp32s2" -#elif defined(ESP32S3) -#define ESP32XX "esp32s3" -#elif defined(ESP32P4) -#define ESP32XX "esp32p4" -#endif - +#ifdef CONFIG_ARDUINO_VARIANT +// TD-er: Might also use CONFIG_IDF_TARGET +# define ESP32XX CONFIG_ARDUINO_VARIANT +#else +# ifdef ESP32_CLASSIC +# define ESP32XX "esp32" +# elif defined(ESP32C2) +# define ESP32XX "esp32c2" +# elif defined(ESP32C3) +# define ESP32XX "esp32c3" +# elif defined(ESP32C5) +# define ESP32XX "esp32c5" +# elif defined(ESP32C6) +# define ESP32XX "esp32c6" +# elif defined(ESP32C61) +# define ESP32XX "esp32c61" +# elif defined(ESP32H2) +# define ESP32XX "esp32h2" +# elif defined(ESP32H21) +# define ESP32XX "esp32h21" +# elif defined(ESP32H4) +# define ESP32XX "esp32h4" +# elif defined(ESP32S2) +# define ESP32XX "esp32s2" +# elif defined(ESP32S3) +# define ESP32XX "esp32s3" +# elif defined(ESP32P4) +# define ESP32XX "esp32p4" +# endif // ifdef ESP32_CLASSIC +#endif // ifdef CONFIG_ARDUINO_VARIANT #if FEATURE_TOOLTIPS void addTooltip(const String& tooltip); @@ -46,62 +50,63 @@ void addTooltip(const String& tooltip); void addSelector_Head(const String& id); -void addSelector_Head_reloadOnChange(const __FlashStringHelper * id); -//void addSelector_Head_reloadOnChange(const String& id); +void addSelector_Head_reloadOnChange(const __FlashStringHelper *id); + +// void addSelector_Head_reloadOnChange(const String& id); -void addSelector_Head_reloadOnChange(const String& id, - const __FlashStringHelper * classname, +void addSelector_Head_reloadOnChange(const String & id, + const __FlashStringHelper *classname, bool disabled - #if FEATURE_TOOLTIPS + #if FEATURE_TOOLTIPS , - const String& tooltip = EMPTY_STRING + const String & tooltip = EMPTY_STRING #endif // if FEATURE_TOOLTIPS ); -void addSelector_Head_reloadOnChange(const String& id, - const __FlashStringHelper * classname, - const String& onChangeCall, +void addSelector_Head_reloadOnChange(const String & id, + const __FlashStringHelper *classname, + const String & onChangeCall, bool disabled - #if FEATURE_TOOLTIPS + #if FEATURE_TOOLTIPS , - const String& tooltip = EMPTY_STRING + const String & tooltip = EMPTY_STRING #endif // if FEATURE_TOOLTIPS ); -void do_addSelector_Head(const String& id, - const __FlashStringHelper * classname, - const String& onChangeCall, +void do_addSelector_Head(const String & id, + const __FlashStringHelper *classname, + const String & onChangeCall, const bool& disabled - #if FEATURE_TOOLTIPS + #if FEATURE_TOOLTIPS , - const String& tooltip = EMPTY_STRING + const String & tooltip = EMPTY_STRING #endif // if FEATURE_TOOLTIPS ); void addPinSelector_Item(PinSelectPurpose purpose, const String & gpio_label, int gpio, - bool selected, - bool disabled = false, + bool selected, + bool disabled = false, const String & attr = EMPTY_STRING); void addSelector_Item(const __FlashStringHelper *option, int index, - bool selected, - bool disabled = false, + bool selected, + bool disabled = false, const String & attr = EMPTY_STRING); void addSelector_Item(const String& option, int index, - bool selected, - bool disabled = false, + bool selected, + bool disabled = false, const String& attr = EMPTY_STRING); -void addSelector_Foot(bool reloadonchange = false); +void addSelector_Foot(bool reloadonchange = false); -void addUnit(const __FlashStringHelper *unit); -void addUnit(const String& unit); -void addUnit(char unit); +void addUnit(const __FlashStringHelper *unit); +void addUnit(const String& unit); +void addUnit(char unit); #if FEATURE_TASKVALUE_UNIT_OF_MEASURE String toUnitOfMeasureName(const uint32_t unitOfMeasureIndex, @@ -154,13 +159,15 @@ void addFormHeader(const __FlashStringHelper *header, void addFormHeader(const __FlashStringHelper *header, const __FlashStringHelper *helpButton, const __FlashStringHelper *rtdHelpButton); -/* -void addFormHeader(const String& header, + +/* + void addFormHeader(const String& header, const String& helpButton = EMPTY_STRING); -void addFormHeader(const String& header, + void addFormHeader(const String& header, const String& helpButton, const String& rtdHelpButton); -*/ + */ + // ******************************************************************************** // Add a sub header // ******************************************************************************** @@ -171,28 +178,28 @@ void addFormSubHeader(const String& header); // Add a checkbox // ******************************************************************************** void addCheckBox(const String& id, - bool checked, + bool checked, bool disabled = false - #if FEATURE_TOOLTIPS + #if FEATURE_TOOLTIPS , const String& tooltip = EMPTY_STRING #endif // if FEATURE_TOOLTIPS ); void addCheckBox(const __FlashStringHelper *id, - bool checked, + bool checked, bool disabled = false); // ******************************************************************************** // Add a numeric box // ******************************************************************************** #if FEATURE_TOOLTIPS -void addNumericBox(const String& id, - int value, - int min, - int max, - const __FlashStringHelper * classname, - const String& tooltip = EMPTY_STRING, - bool disabled = false); +void addNumericBox(const String & id, + int value, + int min, + int max, + const __FlashStringHelper *classname, + const String & tooltip = EMPTY_STRING, + bool disabled = false); #endif // if FEATURE_TOOLTIPS void addFloatNumberBox(const String& id, @@ -220,23 +227,23 @@ void addNumericBox(const String& id, // ******************************************************************************** // Add Textbox // ******************************************************************************** -void addTextBox(const __FlashStringHelper * id, - const String& value, - int maxlength, - const __FlashStringHelper * classname); +void addTextBox(const __FlashStringHelper *id, + const String & value, + int maxlength, + const __FlashStringHelper *classname); -void addTextBox(const String& id, - const String& value, - int maxlength, - const __FlashStringHelper * classname); +void addTextBox(const String & id, + const String & value, + int maxlength, + const __FlashStringHelper *classname); -void addTextBox(const __FlashStringHelper * id, - const String& value, - int maxlength, - bool readonly = false, - bool required = false, - const String& pattern = EMPTY_STRING); +void addTextBox(const __FlashStringHelper *id, + const String & value, + int maxlength, + bool readonly = false, + bool required = false, + const String & pattern = EMPTY_STRING); void addTextBox(const String& id, const String& value, @@ -250,8 +257,8 @@ void addTextBox(const String& id, bool readonly, bool required, const String& pattern, - const __FlashStringHelper * classname - #if FEATURE_TOOLTIPS + const __FlashStringHelper *classname + #if FEATURE_TOOLTIPS , const String& tooltip = EMPTY_STRING #endif // if FEATURE_TOOLTIPS @@ -269,7 +276,7 @@ void addTextArea(const String& id, int columns, bool readonly, bool required - #if FEATURE_TOOLTIPS + #if FEATURE_TOOLTIPS , const String& tooltip = EMPTY_STRING #endif // if FEATURE_TOOLTIPS @@ -290,9 +297,9 @@ void addHelpButton(const String& url, bool isRTD); void addRTDPluginButton(pluginID_t pluginID); -# ifndef LIMIT_BUILD_SIZE +#ifndef LIMIT_BUILD_SIZE void addRTDControllerButton(cpluginID_t cpluginID); -# endif // ifndef LIMIT_BUILD_SIZE +#endif // ifndef LIMIT_BUILD_SIZE String makeDocLink(const String& url, bool isRTD); @@ -307,24 +314,25 @@ void addPinSelect(PinSelectPurpose purpose, #ifdef ESP32 -#if SOC_ADC_SUPPORTED +# if SOC_ADC_SUPPORTED enum class AdcPinSelectPurpose { TouchOnly, ADC_Touch, -#if HAS_HALL_EFFECT_SENSOR +# if HAS_HALL_EFFECT_SENSOR ADC_Touch_HallEffect, -#endif +# endif ADC_Touch_Optional + }; void addADC_PinSelect(AdcPinSelectPurpose purpose, const String & id, int choice); -#endif -#if SOC_DAC_SUPPORTED -void addDAC_PinSelect(const String& id, +# endif // if SOC_ADC_SUPPORTED +# if SOC_DAC_SUPPORTED +void addDAC_PinSelect(const String& id, int choice); -#endif +# endif // if SOC_DAC_SUPPORTED #endif // ifdef ESP32 From ac392105a41d9360ebadeca525c782c8daea398e Mon Sep 17 00:00:00 2001 From: TD-er Date: Mon, 23 Jun 2025 19:50:21 +0200 Subject: [PATCH 066/564] [ADC] Fix not setting attenuation on internal ADC --- src/src/PluginStructs/P002_data_struct.cpp | 32 ++++++++++++++++------ src/src/PluginStructs/P002_data_struct.h | 2 ++ 2 files changed, 25 insertions(+), 9 deletions(-) diff --git a/src/src/PluginStructs/P002_data_struct.cpp b/src/src/PluginStructs/P002_data_struct.cpp index bf97f9a03..6492fd526 100644 --- a/src/src/PluginStructs/P002_data_struct.cpp +++ b/src/src/PluginStructs/P002_data_struct.cpp @@ -31,13 +31,10 @@ void P002_data_struct::init(struct EventStruct *event) _pin_analogRead = CONFIG_PIN1; _useFactoryCalibration = useFactoryCalibration(event); _attenuation = getAttenuation(event); - int channel{}; - const int adc = getADC_num_for_gpio(_pin_analogRead, channel); - - if ((adc == 1) || (adc == 2)) { - analogSetPinAttenuation(_pin_analogRead, static_cast(_attenuation)); - } + // Initialize attenuation and perform read + // This way there is less chance of a big difference between 1st read and any next reads + analog_read(); # endif // ifdef ESP32 if (P002_CALIBRATION_ENABLED) { @@ -839,7 +836,7 @@ String P002_data_struct::webformSave(struct EventStruct *event) void P002_data_struct::takeSample() { if (_sampleMode == P002_USE_CURENT_SAMPLE) { return; } - int raw = espeasy_analogRead(_pin_analogRead); + const int raw = analog_read(); # if FEATURE_PLUGIN_STATS PluginStats *stats = getPluginStats(0); @@ -892,7 +889,7 @@ bool P002_data_struct::getValue(float& float_value, return false; } - raw_value = espeasy_analogRead(_pin_analogRead); + raw_value = analog_read(); # if FEATURE_PLUGIN_STATS PluginStats *stats = getPluginStats(0); @@ -1114,6 +1111,10 @@ float P002_data_struct::getCurrentValue(struct EventStruct *event, int& raw_valu # endif // ifdef ESP8266 # ifdef ESP32 const int pin = CONFIG_PIN1; + + auto att = getAttenuation(event); + + analogSetPinAttenuation(pin, static_cast(att)); # endif // ifdef ESP32 raw_value = espeasy_analogRead(pin); @@ -1121,7 +1122,7 @@ float P002_data_struct::getCurrentValue(struct EventStruct *event, int& raw_valu # ifdef ESP32 if (useFactoryCalibration(event)) { - return applyADCFactoryCalibration(raw_value, getAttenuation(event)); + return applyADCFactoryCalibration(raw_value, att); } # endif // ifdef ESP32 @@ -1289,5 +1290,18 @@ bool P002_data_struct::plugin_set_config(struct EventStruct *event, return success; } +int P002_data_struct::analog_read() const { +#ifdef ESP32 + int channel{}; + const int adc = getADC_num_for_gpio(_pin_analogRead, channel); + + if ((adc == 1) || (adc == 2)) { + analogSetPinAttenuation(_pin_analogRead, static_cast(_attenuation)); + } +#endif + + return espeasy_analogRead(_pin_analogRead); +} + #endif #endif // ifdef USES_P002 diff --git a/src/src/PluginStructs/P002_data_struct.h b/src/src/PluginStructs/P002_data_struct.h index 07a070245..4d924ecfd 100644 --- a/src/src/PluginStructs/P002_data_struct.h +++ b/src/src/PluginStructs/P002_data_struct.h @@ -245,6 +245,8 @@ public: private: + int analog_read() const; + OversamplingHelperOverSampling; int _calib_adc1 = 0; From d6d7f139bc1b1a1b0607d54e1f992dbd0d32d692 Mon Sep 17 00:00:00 2001 From: TD-er Date: Mon, 23 Jun 2025 22:10:58 +0200 Subject: [PATCH 067/564] [ESP-IDF] Update to latest IDF/Arduino code for IDF 5.5 --- platformio_core_defs.ini | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/platformio_core_defs.ini b/platformio_core_defs.ini index eb4b43371..0df4f2eba 100644 --- a/platformio_core_defs.ini +++ b/platformio_core_defs.ini @@ -195,7 +195,7 @@ lib_extra_dirs = ; ESP_IDF 5.5.0 [core_esp32_IDF5_5_0__3_2_0_LittleFS] platform = https://github.com/Jason2866/platform-espressif32.git#Arduino/IDF55 -platform_packages = framework-arduinoespressif32 @ https://github.com/Jason2866/esp32-arduino-lib-builder/releases/download/3718/framework-arduinoespressif32-all-release_v5.5-eefeb2bb.zip +platform_packages = framework-arduinoespressif32 @ https://github.com/Jason2866/esp32-arduino-lib-builder/releases/download/3722/framework-arduinoespressif32-all-release_v5.5-eefeb2bb.zip ;platform_packages = framework-arduinoespressif32 @ https://github.com/Jason2866/esp32-arduino-lib-builder/releases/download/3627/framework-arduinoespressif32-all-release_v5.5-5d572003.zip build_flags = -DESP32_STAGE -DESP_IDF_VERSION_MAJOR=5 From a6aca34f4e08f5bea453c237127cc96cfd409dae Mon Sep 17 00:00:00 2001 From: TD-er Date: Tue, 24 Jun 2025 22:03:15 +0200 Subject: [PATCH 068/564] [MFRC522] Speed-up detecting cards + make error recovery more stable --- lib/MFRC522/MFRC522.cpp | 45 +++++++++------- lib/MFRC522/MFRC522.h | 28 ++++++++-- platformio_core_defs.ini | 2 +- platformio_esp32_envs.ini | 2 +- platformio_esp32s3_envs.ini | 10 ++-- src/_P111_RC522_RFID.ino | 27 +++++++++- src/src/PluginStructs/P111_data_struct.cpp | 60 ++++++++++++++++++++-- src/src/PluginStructs/P111_data_struct.h | 2 + 8 files changed, 141 insertions(+), 35 deletions(-) diff --git a/lib/MFRC522/MFRC522.cpp b/lib/MFRC522/MFRC522.cpp index e06ae4b97..f9bde8207 100644 --- a/lib/MFRC522/MFRC522.cpp +++ b/lib/MFRC522/MFRC522.cpp @@ -291,7 +291,7 @@ void MFRC522::PCD_AntennaOff() { /** * Get the current MFRC522 Receiver Gain (RxGain[2:0]) value. - * See 9.3.3.6 / table 98 in http://www.nxp.com/documents/data_sheet/MFRC522.pdf + * See 9.3.3.6 / table 98 in https://www.nxp.com/docs/en/data-sheet/MFRC522.pdf * NOTE: Return value scrubbed with (0x07<<4)=01110000b as RCFfgReg may use reserved bits. * * @return Value of the RxGain, scrubbed to the 3 bits used. @@ -302,7 +302,7 @@ uint8_t MFRC522::PCD_GetAntennaGain() { /** * Set the MFRC522 Receiver Gain (RxGain) to value specified by given mask. - * See 9.3.3.6 / table 98 in http://www.nxp.com/documents/data_sheet/MFRC522.pdf + * See 9.3.3.6 / table 98 in https://www.nxp.com/docs/en/data-sheet/MFRC522.pdf * NOTE: Given mask is scrubbed with (0x07<<4)=01110000b as RCFfgReg may use reserved bits. */ void MFRC522::PCD_SetAntennaGain(uint8_t mask) { @@ -314,7 +314,7 @@ void MFRC522::PCD_SetAntennaGain(uint8_t mask) { /** * Performs a self-test of the MFRC522 - * See 16.1.1 in http://www.nxp.com/documents/data_sheet/MFRC522.pdf + * See 16.1.1 in https://www.nxp.com/docs/en/data-sheet/MFRC522.pdf * * @return Whether or not the test passed. Or false if no firmware reference is available. */ @@ -368,21 +368,28 @@ bool MFRC522::PCD_PerformSelfTest() { // Pick the appropriate reference values const uint8_t *reference; - switch (version) { - case 0x88: // Fudan Semiconductor FM17522 clone - reference = FM17522_firmware_reference; - break; - case 0x90: // Version 0.0 - reference = MFRC522_firmware_referenceV0_0; - break; - case 0x91: // Version 1.0 - reference = MFRC522_firmware_referenceV1_0; - break; - case 0x92: // Version 2.0 - reference = MFRC522_firmware_referenceV2_0; - break; - default: // Unknown version - return false; // abort test + switch(version) { + // Fudan Semiconductor clone: + case 0xb2: // FM17522 + reference = FM17522_firmware_referenceB2; + break; + case 0x88: // FM17522 + reference = FM17522_firmware_reference88; + break; + case 0x89: // FM17522E + reference = FM17522E_firmware_reference; + break; + case 0x90: // Version 0.0 + reference = MFRC522_firmware_referenceV0_0; + break; + case 0x91: // Version 1.0 + reference = MFRC522_firmware_referenceV1_0; + break; + case 0x92: // Version 2.0 + reference = MFRC522_firmware_referenceV2_0; + break; + default: // Unknown version + return false; // abort test } // Verify that the results match up to our expectations @@ -868,7 +875,7 @@ MFRC522::StatusCode MFRC522::PICC_HaltA() { /** * Executes the MFRC522 MFAuthent command. * This command manages MIFARE authentication to enable a secure communication to any MIFARE Mini, MIFARE 1K and MIFARE 4K card. - * The authentication is described in the MFRC522 datasheet section 10.3.1.9 and http://www.nxp.com/documents/data_sheet/MF1S503x.pdf section 10.1. + * The authentication is described in the MFRC522 datasheet section 10.3.1.9 and https://www.nxp.com/docs/en/data-sheet/MF1S503x.pdf section 10.1. * For use with MIFARE Classic PICCs. * The PICC must be selected - ie in state ACTIVE(*) - before calling this function. * Remember to call PCD_StopCrypto1() after communicating with the authenticated PICC - otherwise no new communications can start. diff --git a/lib/MFRC522/MFRC522.h b/lib/MFRC522/MFRC522.h index 9044c0e90..0e94b071a 100644 --- a/lib/MFRC522/MFRC522.h +++ b/lib/MFRC522/MFRC522.h @@ -64,7 +64,7 @@ const uint8_t MFRC522_firmware_referenceV2_0[] PROGMEM = { }; // Clone // Fudan Semiconductor FM17522 (0x88) -const uint8_t FM17522_firmware_reference[] PROGMEM = { +const uint8_t FM17522_firmware_reference88[] PROGMEM = { 0x00, 0xD6, 0x78, 0x8C, 0xE2, 0xAA, 0x0C, 0x18, 0x2A, 0xB8, 0x7A, 0x7F, 0xD3, 0x6A, 0xCF, 0x0B, 0xB1, 0x37, 0x63, 0x4B, 0x69, 0xAE, 0x91, 0xC7, @@ -74,6 +74,28 @@ const uint8_t FM17522_firmware_reference[] PROGMEM = { 0x51, 0x64, 0xAB, 0x3E, 0xE9, 0x15, 0xB5, 0xAB, 0x56, 0x9A, 0x98, 0x82, 0x26, 0xEA, 0x2A, 0x62 }; +// Another "FM17522" ic form Aliexpress +const uint8_t FM17522_firmware_referenceB2[] PROGMEM = { + 0x00, 0xeb, 0x44, 0x85, 0xfa, 0x9a, 0x78, 0x01, + 0x74, 0xe5, 0x1c, 0x7a, 0x0a, 0xa0, 0x71, 0xe1, + 0xf3, 0xfa, 0x96, 0x6d, 0x28, 0xa1, 0x34, 0x46, + 0x3a, 0x1c, 0x32, 0x96, 0xb9, 0xe6, 0x44, 0x87, + 0x0a, 0x45, 0x98, 0xa9, 0x36, 0x60, 0x89, 0x0f, + 0x06, 0x9b, 0x7b, 0x17, 0xb3, 0x0c, 0x1a, 0x6c, + 0x1a, 0xae, 0x2c, 0xac, 0x0e, 0x6f, 0x2e, 0x02, + 0x2b, 0xcb, 0x8a, 0xb2, 0x45, 0xdd, 0x7e, 0x3c +}; +// Fudan Semiconductor FM17522E (0x89) +const uint8_t FM17522E_firmware_reference[] PROGMEM = { + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x80, 0x00, 0x04, 0xcc, 0xc8, 0x00, + 0x10, 0x04, 0x00, 0xc0, 0x00, 0x90, 0x00, 0x20, + 0x00, 0x00, 0x23, 0x00, 0x38, 0x06, 0x01, 0x33, + 0x98, 0xf3, 0x80, 0x06, 0xc0, 0xf9, 0x80, 0x08, + 0x27, 0x04, 0x23, 0x82, 0x21, 0x12, 0xf9, 0xc7 +}; class MFRC522 { public: @@ -173,7 +195,7 @@ public: }; // MFRC522 RxGain[2:0] masks, defines the receiver's signal voltage gain factor (on the PCD). - // Described in 9.3.3.6 / table 98 of the datasheet at http://www.nxp.com/documents/data_sheet/MFRC522.pdf + // Described in 9.3.3.6 / table 98 of the datasheet at https://www.nxp.com/docs/en/data-sheet/MFRC522.pdf enum PCD_RxGain : uint8_t { RxGain_18dB = 0x00 << 4, // 000b - 18 dB, minimum RxGain_23dB = 0x01 << 4, // 001b - 23 dB @@ -210,7 +232,7 @@ public: PICC_CMD_MF_INCREMENT = 0xC1, // Increments the contents of a block and stores the result in the internal data register. PICC_CMD_MF_RESTORE = 0xC2, // Reads the contents of a block into the internal data register. PICC_CMD_MF_TRANSFER = 0xB0, // Writes the contents of the internal data register to a block. - // The commands used for MIFARE Ultralight (from http://www.nxp.com/documents/data_sheet/MF0ICU1.pdf, Section 8.6) + // The commands used for MIFARE Ultralight (from https://www.nxp.com/docs/en/data-sheet/MF0ICU1.pdf, Section 8.6) // The PICC_CMD_MF_READ and PICC_CMD_MF_WRITE can also be used for MIFARE Ultralight. PICC_CMD_UL_WRITE = 0xA2 // Writes one 4 uint8_t page to the PICC. }; diff --git a/platformio_core_defs.ini b/platformio_core_defs.ini index 0df4f2eba..f18f5d9a9 100644 --- a/platformio_core_defs.ini +++ b/platformio_core_defs.ini @@ -195,7 +195,7 @@ lib_extra_dirs = ; ESP_IDF 5.5.0 [core_esp32_IDF5_5_0__3_2_0_LittleFS] platform = https://github.com/Jason2866/platform-espressif32.git#Arduino/IDF55 -platform_packages = framework-arduinoespressif32 @ https://github.com/Jason2866/esp32-arduino-lib-builder/releases/download/3722/framework-arduinoespressif32-all-release_v5.5-eefeb2bb.zip +platform_packages = framework-arduinoespressif32 @ https://github.com/Jason2866/esp32-arduino-lib-builder/releases/download/3725/framework-arduinoespressif32-all-release_v5.5-eefeb2bb.zip ;platform_packages = framework-arduinoespressif32 @ https://github.com/Jason2866/esp32-arduino-lib-builder/releases/download/3627/framework-arduinoespressif32-all-release_v5.5-5d572003.zip build_flags = -DESP32_STAGE -DESP_IDF_VERSION_MAJOR=5 diff --git a/platformio_esp32_envs.ini b/platformio_esp32_envs.ini index 5b0f60e04..d1d7b3979 100644 --- a/platformio_esp32_envs.ini +++ b/platformio_esp32_envs.ini @@ -101,7 +101,7 @@ board_build.filesystem = littlefs lib_ignore = ${esp32_always.lib_ignore} ESP32_ping ESP32 BLE Arduino - ${core_esp32_IDF5_4_1__3_2_0_LittleFS.lib_ignore} + ${esp32_base_idf5.lib_ignore} [esp32_IRExt_LittleFS_ETH] diff --git a/platformio_esp32s3_envs.ini b/platformio_esp32s3_envs.ini index a664f96fb..b8e9be2ec 100644 --- a/platformio_esp32s3_envs.ini +++ b/platformio_esp32s3_envs.ini @@ -1,16 +1,16 @@ [esp32s3_common_LittleFS] -extends = esp32_base_idf5 +extends = esp32_base_idf5_5 lib_ignore = ${esp32_common_LittleFS_ETH.lib_ignore} ESP32_ping - ${esp32_base_idf5.lib_ignore} -build_flags = ${esp32_base_idf5.build_flags} + ${esp32_base_idf5_5.lib_ignore} +build_flags = ${esp32_base_idf5_5.build_flags} ; -mtext-section-literals -DFEATURE_ARDUINO_OTA=1 -DFEATURE_ETHERNET=1 -DUSE_LITTLEFS -DESP32S3 -extra_scripts = ${esp32_base_idf5.extra_scripts} -build_unflags = ${esp32_base_idf5.build_unflags} +extra_scripts = ${esp32_base_idf5_5.extra_scripts} +build_unflags = ${esp32_base_idf5_5.build_unflags} -fexceptions board_build.filesystem = littlefs diff --git a/src/_P111_RC522_RFID.ino b/src/_P111_RC522_RFID.ino index 403482c91..42aa1e5f2 100644 --- a/src/_P111_RC522_RFID.ino +++ b/src/_P111_RC522_RFID.ino @@ -36,7 +36,7 @@ boolean Plugin_111(uint8_t function, struct EventStruct *event, String& string) { auto& dev = Device[++deviceCount]; dev.Number = PLUGIN_ID_111; - dev.Type = DEVICE_TYPE_SPI2; + dev.Type = DEVICE_TYPE_SPI3; dev.VType = Sensor_VType::SENSOR_TYPE_ULONG; dev.ValueCount = 1; dev.SendDataOption = true; @@ -59,9 +59,23 @@ boolean Plugin_111(uint8_t function, struct EventStruct *event, String& string) { event->String1 = formatGpioName_output(F("CS PIN")); // P111_CS_PIN event->String2 = formatGpioName_output_optional(F("RST PIN ")); // P111_RST_PIN + event->String3 = formatGpioName_input_optional(F("IRQ PIN ")); // P111_IRQ_PIN break; } + case PLUGIN_WEBFORM_SHOW_GPIO_DESCR: + { + string = event->String1; + string += concat(F("CS: "), formatGpioLabel(CONFIG_PIN1, false)); + string += event->String1; + string += concat(F("RST: "), formatGpioLabel(CONFIG_PIN2, false)); + string += event->String1; + string += concat(F("IRQ: "), formatGpioLabel(CONFIG_PIN3, false)); + success = true; + break; + } + + case PLUGIN_SET_DEFAULTS: { P111_REMOVALTIMEOUT = 500; // Default 500 msec reset delay @@ -70,8 +84,17 @@ boolean Plugin_111(uint8_t function, struct EventStruct *event, String& string) case PLUGIN_WEBFORM_LOAD: { - addFormSubHeader(F("Options")); + P111_data_struct *P111_data = static_cast(getPluginTaskData(event->TaskIndex)); + if (nullptr != P111_data) { + uint8_t v{}; + const String version = P111_data->PCD_getVersion(v); + if (v != 0 && v != 0xFF) { + addRowLabel(F("Reader Version")); + addHtml(version); + } + } + addFormSubHeader(F("Options")); { const __FlashStringHelper *removaltype[] = { F("None"), diff --git a/src/src/PluginStructs/P111_data_struct.cpp b/src/src/PluginStructs/P111_data_struct.cpp index aee4a1edb..3d1953962 100644 --- a/src/src/PluginStructs/P111_data_struct.cpp +++ b/src/src/PluginStructs/P111_data_struct.cpp @@ -26,6 +26,8 @@ void P111_data_struct::init() { if (mfrc522 != nullptr) { mfrc522->PCD_Init(); // Initialize MFRC522 reader + mfrc522->PCD_WriteRegister(MFRC522::ComIEnReg, 0b10100000); // enable receiver interrupt + mfrc522->PCD_WriteRegister(MFRC522::DivIEnReg, 0x80); // Set as CMOS output pin initPhase = P111_initPhases::Ready; } } @@ -116,10 +118,15 @@ bool P111_data_struct::reset(int8_t csPin, if ((resetPin != -1) && (initPhase == P111_initPhases::Ready)) { if (loglevelActiveFor(LOG_LEVEL_INFO)) { - String log = F("MFRC522: Reset on pin: "); - log += resetPin; - addLogMove(LOG_LEVEL_INFO, log); + addLogMove( + LOG_LEVEL_INFO, + concat(F("MFRC522: Reset on pin: "), resetPin)); } + + init(); + return true; + + // FIXME TD-er: Remove the rest of this function. pinMode(resetPin, OUTPUT); digitalWrite(resetPin, LOW); timeToWait = 100; @@ -140,6 +147,8 @@ bool P111_data_struct::reset(int8_t csPin, digitalWrite(csPin, LOW); mfrc522->PCD_Init(csPin, resetPin); // Init MFRC522 module + mfrc522->PCD_WriteRegister(MFRC522::ComIEnReg, 0b10100000); // enable receiver interrupt + mfrc522->PCD_WriteRegister(MFRC522::DivIEnReg, 0x80); // Set as CMOS output pin // If you set Antenna Gain to Max it will increase reading distance mfrc522->PCD_SetAntennaGain(mfrc522->RxGain_max); @@ -226,8 +235,10 @@ bool P111_data_struct::plugin_ten_per_second(struct EventStruct *event) { } counter++; // This variable replaces a static variable in the original implementation + const bool ComIrqReg_bits = (mfrc522->PCD_ReadRegister(MFRC522::ComIrqReg) & (1<<5)) != 0; + mfrc522->PCD_WriteRegister(MFRC522::ComIrqReg, 0x34); - if (counter == 3) { // Only every 3rd 0.1 second we do a read + if (counter >= 10 || ComIrqReg_bits) { // Only every 3rd 0.1 second we do a read counter = 0; uint32_t key = P111_NO_KEY; @@ -300,4 +311,45 @@ bool P111_data_struct::plugin_fifty_per_second() { return true; } + +String P111_data_struct::PCD_getVersion(uint8_t& v) { + v = 0xFF; + if (mfrc522) { + v = mfrc522->PCD_ReadRegister(MFRC522::VersionReg); + if (v != 0xFF && v != 0) { + // Human readable version. + String res = concat(formatToHex(v, 2), F(" = ")); + switch(v) { + case 0xb2: + res += F("FM17522_1"); + break; + case 0x88: + res += F("FM17522"); + break; + case 0x89: + res += F("FM17522E"); + break; + case 0x90: + res += F("v0.0"); + break; + case 0x91: + res += F("v1.0"); + break; + case 0x92: + res += F("v2.0"); + break; + case 0x12: + res += F("counterfeit chip"); + break; + default: + res += F("(unknown)"); + break; + } + return res; + } + } + return EMPTY_STRING; +} + + #endif // ifdef USES_P111 diff --git a/src/src/PluginStructs/P111_data_struct.h b/src/src/PluginStructs/P111_data_struct.h index 219af16fb..4a5d68c40 100644 --- a/src/src/PluginStructs/P111_data_struct.h +++ b/src/src/PluginStructs/P111_data_struct.h @@ -39,6 +39,8 @@ struct P111_data_struct : public PluginTaskData_base { bool plugin_ten_per_second(struct EventStruct *event); bool plugin_fifty_per_second(); + String PCD_getVersion(uint8_t& v); + private: MFRC522 *mfrc522 = nullptr; From 445f66cc9a111a01e19a1fbcba9cd61147e73396 Mon Sep 17 00:00:00 2001 From: TD-er Date: Wed, 25 Jun 2025 00:55:03 +0200 Subject: [PATCH 069/564] [MFRC522] Improve range of reader --- lib/MFRC522/MFRC522.cpp | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/lib/MFRC522/MFRC522.cpp b/lib/MFRC522/MFRC522.cpp index f9bde8207..05fbad01f 100644 --- a/lib/MFRC522/MFRC522.cpp +++ b/lib/MFRC522/MFRC522.cpp @@ -233,6 +233,11 @@ void MFRC522::PCD_Init() { PCD_WriteRegister(TxASKReg, 0x40); // Default 0x00. Force a 100 % ASK modulation independent of the ModGsPReg register setting PCD_WriteRegister(ModeReg, 0x3D); // Default 0x3F. Set the preset value for the CRC coprocessor for the CalcCRC command to 0x6363 (ISO 14443-3 part 6.2.4) + + PCD_WriteRegister(CWGsPReg, 0b111111); // conductance of the p-driver output + PCD_WriteRegister(ModGsPReg, 0b111111); // conductance of the p-driver output + PCD_WriteRegister(GsNReg, 0b11111111); // impedance of the n-driver + PCD_AntennaOn(); // Enable the antenna driver pins TX1 and TX2 (they were disabled by the reset) } // End PCD_Init() From 0323cabbed5ae7434f4b151d5eb524339c475734 Mon Sep 17 00:00:00 2001 From: TD-er Date: Wed, 25 Jun 2025 13:02:22 +0200 Subject: [PATCH 070/564] Add HTML_Print and PrintToString helpers --- src/src/Helpers/PrintToString.cpp | 21 +++++++++++++++++++++ src/src/Helpers/PrintToString.h | 29 +++++++++++++++++++++++++++++ src/src/WebServer/HTML_Print.cpp | 9 +++++++++ src/src/WebServer/HTML_Print.h | 20 ++++++++++++++++++++ 4 files changed, 79 insertions(+) create mode 100644 src/src/Helpers/PrintToString.cpp create mode 100644 src/src/Helpers/PrintToString.h create mode 100644 src/src/WebServer/HTML_Print.cpp create mode 100644 src/src/WebServer/HTML_Print.h diff --git a/src/src/Helpers/PrintToString.cpp b/src/src/Helpers/PrintToString.cpp new file mode 100644 index 000000000..9cc44a316 --- /dev/null +++ b/src/src/Helpers/PrintToString.cpp @@ -0,0 +1,21 @@ +#include "../Helpers/PrintToString.h" + +void PrintToString::clear() { _str.clear(); } + +size_t PrintToString::length() const +{ + return _str.length(); +} + +bool PrintToString::reserve(unsigned int size) { return _str.reserve(size); } + +size_t PrintToString::write(uint8_t c) +{ + _str += (char)c; + return 1; +} + +const String& PrintToString::get() const +{ + return _str; +} diff --git a/src/src/Helpers/PrintToString.h b/src/src/Helpers/PrintToString.h new file mode 100644 index 000000000..79113710b --- /dev/null +++ b/src/src/Helpers/PrintToString.h @@ -0,0 +1,29 @@ +#ifndef HELPERS_PRINTTOSTRING_H +#define HELPERS_PRINTTOSTRING_H + +#include "../../ESPEasy_common.h" + +class PrintToString : public Print +{ +public: + + virtual ~PrintToString() {} + + void clear(); + + size_t length() const; + + bool reserve(unsigned int size); + + + size_t write(uint8_t c) override; + + const String& get() const; + +private: + + String _str; +}; // class PrintToString + + +#endif // HELPERS_PRINTTOSTRING_H diff --git a/src/src/WebServer/HTML_Print.cpp b/src/src/WebServer/HTML_Print.cpp new file mode 100644 index 000000000..cb19b92ef --- /dev/null +++ b/src/src/WebServer/HTML_Print.cpp @@ -0,0 +1,9 @@ +#include "../WebServer/HTML_Print.h" + +#include "../Globals/TXBuffer.h" + +size_t HTML_Print::write(uint8_t c) +{ + TXBuffer += (char)c; + return 1; +} diff --git a/src/src/WebServer/HTML_Print.h b/src/src/WebServer/HTML_Print.h new file mode 100644 index 000000000..403261b87 --- /dev/null +++ b/src/src/WebServer/HTML_Print.h @@ -0,0 +1,20 @@ +#ifndef WEBSERVER_HTML_PRINT_H +#define WEBSERVER_HTML_PRINT_H + + +#include "../../ESPEasy_common.h" + + +// Class to redirect any function expecting a Print stream to output to the TXBuffer of our webserver. +class HTML_Print : public Print +{ +public: + + virtual ~HTML_Print() {} + + size_t write(uint8_t c) override; + +}; + + +#endif // WEBSERVER_HTML_PRINT_H From 88986c77441c6d160f7e880bd9a89482147db463 Mon Sep 17 00:00:00 2001 From: TD-er Date: Wed, 25 Jun 2025 13:04:47 +0200 Subject: [PATCH 071/564] [MFRC522] Simplify board reset during init --- lib/MFRC522/MFRC522.cpp | 33 ++++++++++++++++++--------------- lib/MFRC522/MFRC522.h | 1 + 2 files changed, 19 insertions(+), 15 deletions(-) diff --git a/lib/MFRC522/MFRC522.cpp b/lib/MFRC522/MFRC522.cpp index 05fbad01f..6284d3f39 100644 --- a/lib/MFRC522/MFRC522.cpp +++ b/lib/MFRC522/MFRC522.cpp @@ -198,22 +198,13 @@ void MFRC522::PCD_Init() { digitalWrite(_chipSelectPin, HIGH); // If a valid pin number has been set, pull device out of power down / reset state. - if (_resetPowerDownPin != UNUSED_PIN) { - // First set the resetPowerDownPin as digital input, to check the MFRC522 power down mode. - pinMode(_resetPowerDownPin, INPUT); - - if (digitalRead(_resetPowerDownPin) == LOW) { // The MFRC522 chip is in power down mode. - pinMode(_resetPowerDownPin, OUTPUT); // Now set the resetPowerDownPin as digital output. - digitalWrite(_resetPowerDownPin, LOW); // Make sure we have a clean LOW state. - delayMicroseconds(2); // 8.8.1 Reset timing requirements says about 100ns. Let us be generous: 2μsl - digitalWrite(_resetPowerDownPin, HIGH); // Exit power down mode. This triggers a hard reset. - // Section 8.8.2 in the datasheet says the oscillator start-up time is the start up time of the crystal + 37,74μs. Let us be generous: 50ms. - delay(50); - hardReset = true; - } + if (_resetPowerDownPin != UNUSED_PIN) + { + pinMode(_resetPowerDownPin, OUTPUT); + PCD_HardReset(); } - - if (!hardReset) { // Perform a soft reset if we haven't triggered a hard reset above. + else + { // Perform a soft reset if we haven't triggered a hard reset above. PCD_Reset(); } @@ -276,6 +267,18 @@ void MFRC522::PCD_Reset() { } while ((PCD_ReadRegister(CommandReg) & (1 << 4)) && (++count) < 3); } // End PCD_Reset() +void MFRC522::PCD_HardReset() +{ + if (_resetPowerDownPin != UNUSED_PIN) + { + digitalWrite(_resetPowerDownPin, LOW); // Make sure we have a clean LOW state. + delayMicroseconds(2); // 8.8.1 Reset timing requirements says about 100ns. Let us be generous: 2μsl + digitalWrite(_resetPowerDownPin, HIGH); // Exit power down mode. This triggers a hard reset. + // Section 8.8.2 in the datasheet says the oscillator start-up time is the start up time of the crystal + 37,74μs. Let us be generous: 50ms. + delay(50); + } +} + /** * Turns the antenna on by enabling pins TX1 and TX2. * After a reset these pins are disabled. diff --git a/lib/MFRC522/MFRC522.h b/lib/MFRC522/MFRC522.h index 0e94b071a..b00a57f42 100644 --- a/lib/MFRC522/MFRC522.h +++ b/lib/MFRC522/MFRC522.h @@ -314,6 +314,7 @@ public: void PCD_Init(uint8_t resetPowerDownPin); void PCD_Init(uint8_t chipSelectPin, uint8_t resetPowerDownPin); void PCD_Reset(); + void PCD_HardReset(); void PCD_AntennaOn(); void PCD_AntennaOff(); uint8_t PCD_GetAntennaGain(); From b48d96e135f0b8a0cdccf600557a59a4916065a9 Mon Sep 17 00:00:00 2001 From: TD-er Date: Wed, 25 Jun 2025 13:07:06 +0200 Subject: [PATCH 072/564] [MFRC522] Allow to dump card info to debug logs --- lib/MFRC522/MFRC522.cpp | 144 ++++++++++----------- lib/MFRC522/MFRC522.h | 12 +- src/src/PluginStructs/P111_data_struct.cpp | 17 ++- 3 files changed, 94 insertions(+), 79 deletions(-) diff --git a/lib/MFRC522/MFRC522.cpp b/lib/MFRC522/MFRC522.cpp index 6284d3f39..4956cfed3 100644 --- a/lib/MFRC522/MFRC522.cpp +++ b/lib/MFRC522/MFRC522.cpp @@ -1361,36 +1361,36 @@ const __FlashStringHelper *MFRC522::PICC_GetTypeName(PICC_Type piccType ///< One * Dumps debug info about the connected PCD to Serial. * Shows all known firmware versions */ -void MFRC522::PCD_DumpVersionToSerial() { +void MFRC522::PCD_DumpVersionToSerial(Print &logPrint) { // Get the MFRC522 firmware version uint8_t v = PCD_ReadRegister(VersionReg); - Serial.print(F("Firmware Version: 0x")); - Serial.print(v, HEX); + logPrint.print(F("Firmware Version: 0x")); + logPrint.print(v, HEX); // Lookup which version switch(v) { - case 0x88: Serial.println(F(" = (clone)")); break; - case 0x90: Serial.println(F(" = v0.0")); break; - case 0x91: Serial.println(F(" = v1.0")); break; - case 0x92: Serial.println(F(" = v2.0")); break; - case 0x12: Serial.println(F(" = counterfeit chip")); break; - default: Serial.println(F(" = (unknown)")); + case 0x88: logPrint.println(F(" = (clone)")); break; + case 0x90: logPrint.println(F(" = v0.0")); break; + case 0x91: logPrint.println(F(" = v1.0")); break; + case 0x92: logPrint.println(F(" = v2.0")); break; + case 0x12: logPrint.println(F(" = counterfeit chip")); break; + default: logPrint.println(F(" = (unknown)")); } // When 0x00 or 0xFF is returned, communication probably failed if ((v == 0x00) || (v == 0xFF)) - Serial.println(F("WARNING: Communication failure, is the MFRC522 properly connected?")); + logPrint.println(F("WARNING: Communication failure, is the MFRC522 properly connected?")); } // End PCD_DumpVersionToSerial() /** - * Dumps debug info about the selected PICC to Serial. + * Dumps debug info about the selected PICC to logPrint. * On success the PICC is halted after dumping the data. * For MIFARE Classic the factory default key of 0xFFFFFFFFFFFF is tried. */ void MFRC522::PICC_DumpToSerial(Uid *uid ///< Pointer to Uid struct returned from a successful PICC_Select(). - ) { + , Print &logPrint) { MIFARE_Key key; // Dump UID, SAK and Type - PICC_DumpDetailsToSerial(uid); + PICC_DumpDetailsToSerial(uid, logPrint); // Dump contents PICC_Type piccType = PICC_GetType(uid->sak); @@ -1402,11 +1402,11 @@ void MFRC522::PICC_DumpToSerial(Uid *uid ///< Pointer to Uid struct returned fro for (uint8_t i = 0; i < 6; i++) { key.keyByte[i] = 0xFF; } - PICC_DumpMifareClassicToSerial(uid, piccType, &key); + PICC_DumpMifareClassicToSerial(uid, piccType, &key, logPrint); break; case PICC_TYPE_MIFARE_UL: - PICC_DumpMifareUltralightToSerial(); + PICC_DumpMifareUltralightToSerial(logPrint); break; case PICC_TYPE_ISO_14443_4: @@ -1414,7 +1414,7 @@ void MFRC522::PICC_DumpToSerial(Uid *uid ///< Pointer to Uid struct returned fro case PICC_TYPE_ISO_18092: case PICC_TYPE_MIFARE_PLUS: case PICC_TYPE_TNP3XXX: - Serial.println(F("Dumping memory contents not implemented for that PICC type.")); + logPrint.println(F("Dumping memory contents not implemented for that PICC type.")); break; case PICC_TYPE_UNKNOWN: @@ -1423,36 +1423,36 @@ void MFRC522::PICC_DumpToSerial(Uid *uid ///< Pointer to Uid struct returned fro break; // No memory dump here } - Serial.println(); + logPrint.println(); PICC_HaltA(); // Already done if it was a MIFARE Classic PICC. } // End PICC_DumpToSerial() /** - * Dumps card info (UID,SAK,Type) about the selected PICC to Serial. + * Dumps card info (UID,SAK,Type) about the selected PICC to logPrint. */ void MFRC522::PICC_DumpDetailsToSerial(Uid *uid ///< Pointer to Uid struct returned from a successful PICC_Select(). - ) { + , Print &logPrint) { // UID - Serial.print(F("Card UID:")); + logPrint.print(F("Card UID:")); for (uint8_t i = 0; i < uid->size; i++) { if(uid->uidByte[i] < 0x10) - Serial.print(F(" 0")); + logPrint.print(F(" 0")); else - Serial.print(F(" ")); - Serial.print(uid->uidByte[i], HEX); + logPrint.print(F(" ")); + logPrint.print(uid->uidByte[i], HEX); } - Serial.println(); + logPrint.println(); // SAK - Serial.print(F("Card SAK: ")); + logPrint.print(F("Card SAK: ")); if(uid->sak < 0x10) - Serial.print(F("0")); - Serial.println(uid->sak, HEX); + logPrint.print(F("0")); + logPrint.println(uid->sak, HEX); // (suggested) PICC type PICC_Type piccType = PICC_GetType(uid->sak); - Serial.print(F("PICC type: ")); - Serial.println(PICC_GetTypeName(piccType)); + logPrint.print(F("PICC type: ")); + logPrint.println(PICC_GetTypeName(piccType)); } // End PICC_DumpDetailsToSerial() /** @@ -1462,7 +1462,7 @@ void MFRC522::PICC_DumpDetailsToSerial(Uid *uid ///< Pointer to Uid struct retur void MFRC522::PICC_DumpMifareClassicToSerial( Uid *uid, ///< Pointer to Uid struct returned from a successful PICC_Select(). PICC_Type piccType, ///< One of the PICC_Type enums. MIFARE_Key *key ///< Key A used for all sectors. - ) { + , Print &logPrint) { uint8_t no_of_sectors = 0; switch (piccType) { case PICC_TYPE_MIFARE_MINI: @@ -1486,9 +1486,9 @@ void MFRC522::PICC_DumpMifareClassicToSerial( Uid *uid, ///< Pointer to Uid st // Dump sectors, highest address first. if (no_of_sectors) { - Serial.println(F("Sector Block 0 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 AccessBits")); + logPrint.println(F("Sector Block 0 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 AccessBits")); for (int8_t i = no_of_sectors - 1; i >= 0; i--) { - PICC_DumpMifareClassicSectorToSerial(uid, key, i); + PICC_DumpMifareClassicSectorToSerial(uid, key, i, logPrint); } } PICC_HaltA(); // Halt the PICC before stopping the encrypted session. @@ -1503,7 +1503,7 @@ void MFRC522::PICC_DumpMifareClassicToSerial( Uid *uid, ///< Pointer to Uid st void MFRC522::PICC_DumpMifareClassicSectorToSerial(Uid *uid, ///< Pointer to Uid struct returned from a successful PICC_Select(). MIFARE_Key *key, ///< Key A for the sector. uint8_t sector ///< The sector to dump, 0..39. - ) { + , Print &logPrint) { MFRC522::StatusCode status; uint8_t firstBlock; // Address of lowest address to dump actually last block dumped) uint8_t no_of_blocks; // Number of blocks in sector @@ -1548,32 +1548,32 @@ void MFRC522::PICC_DumpMifareClassicSectorToSerial(Uid *uid, ///< Pointer to U // Sector number - only on first line if (isSectorTrailer) { if(sector < 10) - Serial.print(F(" ")); // Pad with spaces + logPrint.print(F(" ")); // Pad with spaces else - Serial.print(F(" ")); // Pad with spaces - Serial.print(sector); - Serial.print(F(" ")); + logPrint.print(F(" ")); // Pad with spaces + logPrint.print(sector); + logPrint.print(F(" ")); } else { - Serial.print(F(" ")); + logPrint.print(F(" ")); } // Block number if(blockAddr < 10) - Serial.print(F(" ")); // Pad with spaces + logPrint.print(F(" ")); // Pad with spaces else { if(blockAddr < 100) - Serial.print(F(" ")); // Pad with spaces + logPrint.print(F(" ")); // Pad with spaces else - Serial.print(F(" ")); // Pad with spaces + logPrint.print(F(" ")); // Pad with spaces } - Serial.print(blockAddr); - Serial.print(F(" ")); + logPrint.print(blockAddr); + logPrint.print(F(" ")); // Establish encrypted communications before reading the first block if (isSectorTrailer) { status = PCD_Authenticate(PICC_CMD_MF_AUTH_KEY_A, firstBlock, key, uid); if (status != STATUS_OK) { - Serial.print(F("PCD_Authenticate() failed: ")); - Serial.println(GetStatusCodeName(status)); + logPrint.print(F("PCD_Authenticate() failed: ")); + logPrint.println(GetStatusCodeName(status)); return; } } @@ -1581,19 +1581,19 @@ void MFRC522::PICC_DumpMifareClassicSectorToSerial(Uid *uid, ///< Pointer to U byteCount = sizeof(buffer); status = MIFARE_Read(blockAddr, buffer, &byteCount); if (status != STATUS_OK) { - Serial.print(F("MIFARE_Read() failed: ")); - Serial.println(GetStatusCodeName(status)); + logPrint.print(F("MIFARE_Read() failed: ")); + logPrint.println(GetStatusCodeName(status)); continue; } // Dump data for (uint8_t index = 0; index < 16; index++) { if(buffer[index] < 0x10) - Serial.print(F(" 0")); + logPrint.print(F(" 0")); else - Serial.print(F(" ")); - Serial.print(buffer[index], HEX); + logPrint.print(F(" ")); + logPrint.print(buffer[index], HEX); if ((index % 4) == 3) { - Serial.print(F(" ")); + logPrint.print(F(" ")); } } // Parse sector trailer data @@ -1624,22 +1624,22 @@ void MFRC522::PICC_DumpMifareClassicSectorToSerial(Uid *uid, ///< Pointer to U if (firstInGroup) { // Print access bits - Serial.print(F(" [ ")); - Serial.print((g[group] >> 2) & 1, DEC); Serial.print(F(" ")); - Serial.print((g[group] >> 1) & 1, DEC); Serial.print(F(" ")); - Serial.print((g[group] >> 0) & 1, DEC); - Serial.print(F(" ] ")); + logPrint.print(F(" [ ")); + logPrint.print((g[group] >> 2) & 1, DEC); logPrint.print(F(" ")); + logPrint.print((g[group] >> 1) & 1, DEC); logPrint.print(F(" ")); + logPrint.print((g[group] >> 0) & 1, DEC); + logPrint.print(F(" ] ")); if (invertedError) { - Serial.print(F(" Inverted access bits did not match! ")); + logPrint.print(F(" Inverted access bits did not match! ")); } } if (group != 3 && (g[group] == 1 || g[group] == 6)) { // Not a sector trailer, a value block int32_t value = (int32_t(buffer[3])<<24) | (int32_t(buffer[2])<<16) | (int32_t(buffer[1])<<8) | int32_t(buffer[0]); - Serial.print(F(" Value=0x")); Serial.print(value, HEX); - Serial.print(F(" Adr=0x")); Serial.print(buffer[12], HEX); + logPrint.print(F(" Value=0x")); logPrint.print(value, HEX); + logPrint.print(F(" Adr=0x")); logPrint.print(buffer[12], HEX); } - Serial.println(); + logPrint.println(); } return; @@ -1648,41 +1648,41 @@ void MFRC522::PICC_DumpMifareClassicSectorToSerial(Uid *uid, ///< Pointer to U /** * Dumps memory contents of a MIFARE Ultralight PICC. */ -void MFRC522::PICC_DumpMifareUltralightToSerial() { +void MFRC522::PICC_DumpMifareUltralightToSerial(Print &logPrint) { MFRC522::StatusCode status; uint8_t byteCount; uint8_t buffer[18]; uint8_t i; - Serial.println(F("Page 0 1 2 3")); + logPrint.println(F("Page 0 1 2 3")); // Try the mpages of the original Ultralight. Ultralight C has more pages. for (uint8_t page = 0; page < 16; page +=4) { // Read returns data for 4 pages at a time. // Read pages byteCount = sizeof(buffer); status = MIFARE_Read(page, buffer, &byteCount); if (status != STATUS_OK) { - Serial.print(F("MIFARE_Read() failed: ")); - Serial.println(GetStatusCodeName(status)); + logPrint.print(F("MIFARE_Read() failed: ")); + logPrint.println(GetStatusCodeName(status)); break; } // Dump data for (uint8_t offset = 0; offset < 4; offset++) { i = page + offset; if(i < 10) - Serial.print(F(" ")); // Pad with spaces + logPrint.print(F(" ")); // Pad with spaces else - Serial.print(F(" ")); // Pad with spaces - Serial.print(i); - Serial.print(F(" ")); + logPrint.print(F(" ")); // Pad with spaces + logPrint.print(i); + logPrint.print(F(" ")); for (uint8_t index = 0; index < 4; index++) { i = 4 * offset + index; if(buffer[i] < 0x10) - Serial.print(F(" 0")); + logPrint.print(F(" 0")); else - Serial.print(F(" ")); - Serial.print(buffer[i], HEX); + logPrint.print(F(" ")); + logPrint.print(buffer[i], HEX); } - Serial.println(); + logPrint.println(); } } } // End PICC_DumpMifareUltralightToSerial() diff --git a/lib/MFRC522/MFRC522.h b/lib/MFRC522/MFRC522.h index b00a57f42..0a7f0e426 100644 --- a/lib/MFRC522/MFRC522.h +++ b/lib/MFRC522/MFRC522.h @@ -367,12 +367,12 @@ public: static const __FlashStringHelper *PICC_GetTypeName(PICC_Type type); // Support functions for debuging - void PCD_DumpVersionToSerial(); - void PICC_DumpToSerial(Uid *uid); - void PICC_DumpDetailsToSerial(Uid *uid); - void PICC_DumpMifareClassicToSerial(Uid *uid, PICC_Type piccType, MIFARE_Key *key); - void PICC_DumpMifareClassicSectorToSerial(Uid *uid, MIFARE_Key *key, uint8_t sector); - void PICC_DumpMifareUltralightToSerial(); + void PCD_DumpVersionToSerial(Print &logPrint); + void PICC_DumpToSerial(Uid *uid, Print &logPrint); + void PICC_DumpDetailsToSerial(Uid *uid, Print &logPrint); + void PICC_DumpMifareClassicToSerial(Uid *uid, PICC_Type piccType, MIFARE_Key *key, Print &logPrint); + void PICC_DumpMifareClassicSectorToSerial(Uid *uid, MIFARE_Key *key, uint8_t sector, Print &logPrint); + void PICC_DumpMifareUltralightToSerial(Print &logPrint); // Advanced functions for MIFARE void MIFARE_SetAccessBits(uint8_t *accessBitBuffer, uint8_t g0, uint8_t g1, uint8_t g2, uint8_t g3); diff --git a/src/src/PluginStructs/P111_data_struct.cpp b/src/src/PluginStructs/P111_data_struct.cpp index 3d1953962..3dc5e9600 100644 --- a/src/src/PluginStructs/P111_data_struct.cpp +++ b/src/src/PluginStructs/P111_data_struct.cpp @@ -3,6 +3,7 @@ #ifdef USES_P111 # include "../PluginStructs/P111_data_struct.h" +# include "../Helpers/PrintToString.h" // Needed also here for PlatformIO's library finder as the .h file // is in a directory which is excluded in the src_filter @@ -215,6 +216,20 @@ uint8_t P111_data_struct::readPassiveTargetID(uint8_t *uid, uid[i] = mfrc522->uid.uidByte[i]; } *uidLength = 4; + + + #ifndef BUILD_NO_DEBUG + if (loglevelActiveFor(LOG_LEVEL_DEBUG)) + { + PrintToString p2str; + mfrc522->PICC_DumpToSerial(&(mfrc522->uid), p2str); + if (p2str.length()) { + addLog(LOG_LEVEL_DEBUG, concat(F("MFRC522: "), p2str.get())); + } + } + #endif + + mfrc522->PICC_HaltA(); // Stop reading return P111_NO_ERROR; } @@ -269,7 +284,7 @@ bool P111_data_struct::plugin_ten_per_second(struct EventStruct *event) { } else { log += F("Old Tag: "); } - log += key; + log += formatToHex_decimal(key); if (!removedTag) { log += F(" card: "); From 1c995d5fe341f779fe50a18130fe51e207b00038 Mon Sep 17 00:00:00 2001 From: TD-er Date: Wed, 25 Jun 2025 13:07:58 +0200 Subject: [PATCH 073/564] [MFRC522] Do proper timing for communicating with card --- lib/MFRC522/MFRC522.cpp | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/lib/MFRC522/MFRC522.cpp b/lib/MFRC522/MFRC522.cpp index 4956cfed3..bb96dc27e 100644 --- a/lib/MFRC522/MFRC522.cpp +++ b/lib/MFRC522/MFRC522.cpp @@ -478,6 +478,8 @@ MFRC522::StatusCode MFRC522::PCD_CommunicateWithPICC( uint8_t command, ///< The uint8_t rxAlign, ///< In: Defines the bit position in backData[0] for the first bit received. Default 0. bool checkCRC ///< In: True => The last two bytes of the response is assumed to be a CRC_A that must be validated. ) { + const long software_timeout_ms = 36; // 36ms + // Prepare values for BitFramingReg uint8_t txLastBits = validBits ? *validBits : 0; uint8_t bitFraming = (rxAlign << 4) + txLastBits; // RxAlign = BitFramingReg[6..4]. TxLastBits = BitFramingReg[2..0] @@ -496,8 +498,9 @@ MFRC522::StatusCode MFRC522::PCD_CommunicateWithPICC( uint8_t command, ///< The // In PCD_Init() we set the TAuto flag in TModeReg. This means the timer automatically starts when the PCD stops transmitting. // Each iteration of the do-while-loop takes 17.86μs. // TODO check/modify for other architectures than Arduino Uno 16bit - uint16_t i; - for (i = 2000; i > 0; i--) { + long t_delta=0; + long t_start=millis(); + while(t_delta < software_timeout_ms) { uint8_t n = PCD_ReadRegister(ComIrqReg); // ComIrqReg[7..0] bits are: Set1 TxIRq RxIRq IdleIRq HiAlertIRq LoAlertIRq ErrIRq TimerIRq if (n & waitIRq) { // One of the interrupts that signal success has been set. break; @@ -505,9 +508,11 @@ MFRC522::StatusCode MFRC522::PCD_CommunicateWithPICC( uint8_t command, ///< The if (n & 0x01) { // Timer interrupt - nothing received in 25ms return STATUS_TIMEOUT; } + delay(1); // prevents bus flood + t_delta = millis() - t_start; } // 35.7ms and nothing happend. Communication with the MFRC522 might be down. - if (i == 0) { + if(t_delta >= software_timeout_ms) { return STATUS_TIMEOUT; } From 69f04883d6231478e07a39d8538d60a31c30c10e Mon Sep 17 00:00:00 2001 From: TD-er Date: Thu, 26 Jun 2025 12:04:37 +0200 Subject: [PATCH 074/564] [Rules] Fix processing variables with index > 2^31 --- src/src/Globals/RulesCalculate.cpp | 15 +++++++++------ src/src/Globals/RulesCalculate.h | 4 ++-- src/src/Helpers/SystemVariables.cpp | 7 ++++--- 3 files changed, 15 insertions(+), 11 deletions(-) diff --git a/src/src/Globals/RulesCalculate.cpp b/src/src/Globals/RulesCalculate.cpp index 9c95d3de5..979fd4a0e 100644 --- a/src/src/Globals/RulesCalculate.cpp +++ b/src/src/Globals/RulesCalculate.cpp @@ -10,8 +10,8 @@ RulesCalculate_t RulesCalculate{}; /******************************************************************************************* * Helper functions to actually interact with the rules calculation functions. * *****************************************************************************************/ -int CalculateParam(const String& TmpStr, int errorValue) { - int32_t returnValue = errorValue; +int64_t CalculateParam(const String& TmpStr, int64_t errorValue) { + int64_t returnValue = errorValue; if (TmpStr.length() == 0) { return returnValue; @@ -20,7 +20,7 @@ int CalculateParam(const String& TmpStr, int errorValue) { // Minimize calls to the Calulate function. // Only if TmpStr starts with '=' then call Calculate(). Otherwise do not call it if (TmpStr[0] != '=') { - if (!validIntFromString(TmpStr, returnValue)) { + if (!validInt64FromString(TmpStr, returnValue)) { return errorValue; } } else { @@ -37,10 +37,13 @@ int CalculateParam(const String& TmpStr, int errorValue) { strformat(F("CALCULATE PARAM: %s = %.6g"), TmpStr.c_str(), roundf(param))); } #endif // ifndef BUILD_NO_DEBUG - } else { - return errorValue; + // return integer only as it's valid only for variable indices and device/task id + #if FEATURE_USE_DOUBLE_AS_ESPEASY_RULES_FLOAT_TYPE + return round(param); + #else + return roundf(param); + #endif } - returnValue = roundf(param); // return integer only as it's valid only for device and task id } return returnValue; } diff --git a/src/src/Globals/RulesCalculate.h b/src/src/Globals/RulesCalculate.h index 1de0df501..72cf41a57 100644 --- a/src/src/Globals/RulesCalculate.h +++ b/src/src/Globals/RulesCalculate.h @@ -17,8 +17,8 @@ extern RulesCalculate_t RulesCalculate; * Helper functions to actually interact with the rules calculation functions. * *****************************************************************************************/ -int CalculateParam(const String& TmpStr, - int errorValue = 0); +int64_t CalculateParam(const String& TmpStr, + int64_t errorValue = 0ll); CalculateReturnCode Calculate_preProcessed(const String & preprocessd_input, ESPEASY_RULES_FLOAT_TYPE& result); diff --git a/src/src/Helpers/SystemVariables.cpp b/src/src/Helpers/SystemVariables.cpp index 8147d24ce..4c3387910 100644 --- a/src/src/Helpers/SystemVariables.cpp +++ b/src/src/Helpers/SystemVariables.cpp @@ -303,10 +303,11 @@ bool parse_pct_v_num_pct(String& s, boolean useURLencode, int start_pos) const int pos_closing_pct = s.indexOf('%', v_index + 1); const String arg = s.substring(v_index + 2 + (isv_ ? 1 : 0), pos_closing_pct); String valArg(arg); - const int32_t i = CalculateParam(arg, -1); + constexpr int64_t errorvalue = -1; + const int64_t i = CalculateParam(arg, errorvalue); // addLog(LOG_LEVEL_INFO, strformat(F("s: '%s', calc parse: %s => %d"), s.c_str(), arg.c_str(), i)); - if (i != -1) { // We're calculating a numeric index like %v=1+%v2%%, so have to use the result for the value - valArg = String(i); + if (i != errorvalue) { // We're calculating a numeric index like %v=1+%v2%%, so have to use the result for the value + valArg = ll2String(i); } // Need to replace the entire arg From 44b0694f1ce3711909c3f9e5e94df94774023e0c Mon Sep 17 00:00:00 2001 From: TD-er Date: Thu, 26 Jun 2025 15:49:51 +0200 Subject: [PATCH 075/564] [Log] Add PrintToLog helper --- src/src/Helpers/PrintToLog.cpp | 80 ++++++++++++++++++++++++++++++++++ src/src/Helpers/PrintToLog.h | 49 +++++++++++++++++++++ 2 files changed, 129 insertions(+) create mode 100644 src/src/Helpers/PrintToLog.cpp create mode 100644 src/src/Helpers/PrintToLog.h diff --git a/src/src/Helpers/PrintToLog.cpp b/src/src/Helpers/PrintToLog.cpp new file mode 100644 index 000000000..d0a9726e2 --- /dev/null +++ b/src/src/Helpers/PrintToLog.cpp @@ -0,0 +1,80 @@ +#include "../Helpers/PrintToLog.h" + +#include "../Helpers/StringConverter.h" + +PrintToLog::PrintToLog(uint8_t logLevel) : _logLevel(logLevel) +{ + _logLevelActive = loglevelActiveFor(_logLevel); +} + +PrintToLog::PrintToLog(uint8_t logLevel, const String& logPrefix) + : _prefix(logPrefix), _logLevel(logLevel) +{ + _logLevelActive = loglevelActiveFor(_logLevel); +} + +PrintToLog::PrintToLog(uint8_t logLevel, const __FlashStringHelper *logPrefix) + : _prefix(logPrefix), _logLevel(logLevel) +{ + _logLevelActive = loglevelActiveFor(_logLevel); +} + +PrintToLog::~PrintToLog() +{ + sendToLog(); +} + +PrintToLog::operator bool() const +{ + return loglevelActiveFor(_logLevel); +} + +void PrintToLog::flush() +{ + // For compatibility + sendToLog(); +} + +void PrintToLog::sendToLog() +{ + // Update cached loglevel + _logLevelActive = loglevelActiveFor(_logLevel); + + if (_logLevelActive) { + if (!_str.isEmpty()) { + if (_prefix.isEmpty()) { + addLogMove(_logLevel, _str); + } else { + addLog(_logLevel, concat(_prefix, _str)); + } + } + } + _str.clear(); +} + +void PrintToLog::clear() { + _str.clear(); + _logLevelActive = loglevelActiveFor(_logLevel); +} + +size_t PrintToLog::length() const +{ + return _str.length(); +} + +bool PrintToLog::reserve(unsigned int size) { return _str.reserve(size); } + +size_t PrintToLog::write(uint8_t c) +{ + if (!_logLevelActive) { return 0; } + _str += (char)c; + return 1; +} + +String PrintToLog::get() const +{ + if (!_str.isEmpty() && !_prefix.isEmpty()) { + return concat(_prefix, _str); + } + return _str; +} diff --git a/src/src/Helpers/PrintToLog.h b/src/src/Helpers/PrintToLog.h new file mode 100644 index 000000000..7ca82d7bd --- /dev/null +++ b/src/src/Helpers/PrintToLog.h @@ -0,0 +1,49 @@ +#ifndef HELPERS_PRINTTOLOG_H +#define HELPERS_PRINTTOLOG_H + +#include "../../ESPEasy_common.h" + +class PrintToLog : public Print +{ +public: + + PrintToLog(uint8_t logLevel); + + PrintToLog(uint8_t logLevel, + const String& logPrefix); + + PrintToLog(uint8_t logLevel, + const __FlashStringHelper *logPrefix); + + virtual ~PrintToLog(); + + // Check if loglevel is active + operator bool() const; + + void flush() override; + + void sendToLog(); + + void clear(); + + size_t length() const; + + bool reserve(unsigned int size); + + size_t write(uint8_t c) override; + + String get() const; + +private: + + String _prefix; + + String _str; + uint8_t _logLevel{}; + + // Cached loglevel to speed up write. + bool _logLevelActive{}; +}; // class PrintToLog + + +#endif // ifndef HELPERS_PRINTTOLOG_H From 7b6fd5f3446ced5399a2dc317170d0141d14b2e0 Mon Sep 17 00:00:00 2001 From: TD-er Date: Thu, 26 Jun 2025 15:50:21 +0200 Subject: [PATCH 076/564] [Build] Add ESP32C5 to release.yml build script --- .github/workflows/release.yml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index d41dc5e09..b20edfc45 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -169,6 +169,7 @@ jobs: find . -name '*ESP32c3*' -print | zip -@ ../ESPEasy_ESP32c3.zip find . -name '*ESP32s3*' -print | zip -@ ../ESPEasy_ESP32s3.zip find . -name '*ESP32c2*' -print | zip -@ ../ESPEasy_ESP32c2.zip + find . -name '*ESP32c5*' -print | zip -@ ../ESPEasy_ESP32c5.zip find . -name '*ESP32c6*' -print | zip -@ ../ESPEasy_ESP32c6.zip find . -name '*ESP32solo1*' -print | zip -@ ../ESPEasy_ESP32solo1.zip find . -name '*ESP32_*' -print | zip -@ ../ESPEasy_ESP32.zip @@ -186,6 +187,7 @@ jobs: zipmerge ESPEasy_mega_${{ steps.date.outputs.builddate }}_ESP32c3_binaries.zip ESPEasy_mega_${{ steps.date.outputs.builddate }}_ESP32_binaries.zip ESPEasy_ESP32c3.zip zipmerge ESPEasy_mega_${{ steps.date.outputs.builddate }}_ESP32s3_binaries.zip ESPEasy_mega_${{ steps.date.outputs.builddate }}_ESP32_binaries.zip ESPEasy_ESP32s3.zip zipmerge ESPEasy_mega_${{ steps.date.outputs.builddate }}_ESP32c2_binaries.zip ESPEasy_mega_${{ steps.date.outputs.builddate }}_ESP32_binaries.zip ESPEasy_ESP32c2.zip + zipmerge ESPEasy_mega_${{ steps.date.outputs.builddate }}_ESP32c5_binaries.zip ESPEasy_mega_${{ steps.date.outputs.builddate }}_ESP32_binaries.zip ESPEasy_ESP32c5.zip zipmerge ESPEasy_mega_${{ steps.date.outputs.builddate }}_ESP32c6_binaries.zip ESPEasy_mega_${{ steps.date.outputs.builddate }}_ESP32_binaries.zip ESPEasy_ESP32c6.zip zipmerge ESPEasy_mega_${{ steps.date.outputs.builddate }}_ESP32solo1_binaries.zip ESPEasy_mega_${{ steps.date.outputs.builddate }}_ESP32_binaries.zip ESPEasy_ESP32solo1.zip zipmerge ESPEasy_mega_${{ steps.date.outputs.builddate }}_ESP32_binaries.zip ESPEasy_ESP32.zip @@ -193,6 +195,6 @@ jobs: with: # Upload all separately supported CPU models and the docs zip # TODO if/when available: ESP32h2 - artifacts: "ESPEasy_mega_${{ steps.date.outputs.builddate }}_ESP82xx_binaries.zip,ESPEasy_mega_${{ steps.date.outputs.builddate }}_ESP32_binaries.zip,ESPEasy_mega_${{ steps.date.outputs.builddate }}_ESP32solo1_binaries.zip,ESPEasy_mega_${{ steps.date.outputs.builddate }}_ESP32s2_binaries.zip,ESPEasy_mega_${{ steps.date.outputs.builddate }}_ESP32c3_binaries.zip,ESPEasy_mega_${{ steps.date.outputs.builddate }}_ESP32s3_binaries.zip,ESPEasy_mega_${{ steps.date.outputs.builddate }}_ESP32c2_binaries.zip,ESPEasy_mega_${{ steps.date.outputs.builddate }}_ESP32c6_binaries.zip,distribution/*.zip" + artifacts: "ESPEasy_mega_${{ steps.date.outputs.builddate }}_ESP82xx_binaries.zip,ESPEasy_mega_${{ steps.date.outputs.builddate }}_ESP32_binaries.zip,ESPEasy_mega_${{ steps.date.outputs.builddate }}_ESP32solo1_binaries.zip,ESPEasy_mega_${{ steps.date.outputs.builddate }}_ESP32s2_binaries.zip,ESPEasy_mega_${{ steps.date.outputs.builddate }}_ESP32c3_binaries.zip,ESPEasy_mega_${{ steps.date.outputs.builddate }}_ESP32s3_binaries.zip,ESPEasy_mega_${{ steps.date.outputs.builddate }}_ESP32c2_binaries.zip,ESPEasy_mega_${{ steps.date.outputs.builddate }}_ESP32c5_binaries.zip,ESPEasy_mega_${{ steps.date.outputs.builddate }}_ESP32c6_binaries.zip,distribution/*.zip" body: ${{ needs.prepare-notes.outputs.notes }} token: ${{ secrets.GITHUB_TOKEN }} From 873c6c731d1cc6cf5a955d0f28377c7ebd833d57 Mon Sep 17 00:00:00 2001 From: TD-er Date: Thu, 26 Jun 2025 18:14:52 +0200 Subject: [PATCH 077/564] [ESP-IDF] Update to latest SDK version --- platformio_core_defs.ini | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/platformio_core_defs.ini b/platformio_core_defs.ini index f18f5d9a9..94be31e37 100644 --- a/platformio_core_defs.ini +++ b/platformio_core_defs.ini @@ -166,7 +166,7 @@ extra_scripts = ${esp82xx_common.extra_scripts} ; ESP_IDF 5.4.1 [core_esp32_IDF5_4_1__3_2_0_LittleFS] platform = https://github.com/Jason2866/platform-espressif32.git#Arduino/IDF54 -platform_packages = framework-arduinoespressif32 @ https://github.com/Jason2866/esp32-arduino-lib-builder/releases/download/3717/framework-arduinoespressif32-all-release_v5.4-fea159f6.zip +platform_packages = framework-arduinoespressif32 @ https://github.com/Jason2866/esp32-arduino-lib-builder/releases/download/3743/framework-arduinoespressif32-all-release_v5.4-a4437683.zip build_flags = -DESP32_STAGE -DESP_IDF_VERSION_MAJOR=5 -DLIBRARIES_NO_LOG=1 @@ -195,8 +195,7 @@ lib_extra_dirs = ; ESP_IDF 5.5.0 [core_esp32_IDF5_5_0__3_2_0_LittleFS] platform = https://github.com/Jason2866/platform-espressif32.git#Arduino/IDF55 -platform_packages = framework-arduinoespressif32 @ https://github.com/Jason2866/esp32-arduino-lib-builder/releases/download/3725/framework-arduinoespressif32-all-release_v5.5-eefeb2bb.zip -;platform_packages = framework-arduinoespressif32 @ https://github.com/Jason2866/esp32-arduino-lib-builder/releases/download/3627/framework-arduinoespressif32-all-release_v5.5-5d572003.zip +platform_packages = framework-arduinoespressif32 @ https://github.com/Jason2866/esp32-arduino-lib-builder/releases/download/3744/framework-arduinoespressif32-all-release_v5.5-c241ccd4.zip build_flags = -DESP32_STAGE -DESP_IDF_VERSION_MAJOR=5 -DLIBRARIES_NO_LOG=1 From c7e6397a7ba0b04714f247b1290899f3c8c78102 Mon Sep 17 00:00:00 2001 From: TD-er Date: Thu, 26 Jun 2025 18:15:26 +0200 Subject: [PATCH 078/564] [MFRC522] Speedup reading by acting on interrupt pin --- src/_P111_RC522_RFID.ino | 4 +-- src/src/PluginStructs/P111_data_struct.cpp | 35 ++++++++++++++++++++-- src/src/PluginStructs/P111_data_struct.h | 15 ++++++++-- 3 files changed, 47 insertions(+), 7 deletions(-) diff --git a/src/_P111_RC522_RFID.ino b/src/_P111_RC522_RFID.ino index 42aa1e5f2..17a4eb28e 100644 --- a/src/_P111_RC522_RFID.ino +++ b/src/_P111_RC522_RFID.ino @@ -139,7 +139,7 @@ boolean Plugin_111(uint8_t function, struct EventStruct *event, String& string) case PLUGIN_INIT: { - initPluginTaskData(event->TaskIndex, new (std::nothrow) P111_data_struct(P111_CS_PIN, P111_RST_PIN)); + initPluginTaskData(event->TaskIndex, new (std::nothrow) P111_data_struct(P111_CS_PIN, P111_RST_PIN, P111_IRQ_PIN)); P111_data_struct *P111_data = static_cast(getPluginTaskData(event->TaskIndex)); if (nullptr != P111_data) { @@ -186,7 +186,7 @@ boolean Plugin_111(uint8_t function, struct EventStruct *event, String& string) P111_data_struct *P111_data = static_cast(getPluginTaskData(event->TaskIndex)); if (nullptr != P111_data) { - success = P111_data->plugin_fifty_per_second(); + success = P111_data->plugin_fifty_per_second(event); } break; } diff --git a/src/src/PluginStructs/P111_data_struct.cpp b/src/src/PluginStructs/P111_data_struct.cpp index 3dc5e9600..2f5fcebc6 100644 --- a/src/src/PluginStructs/P111_data_struct.cpp +++ b/src/src/PluginStructs/P111_data_struct.cpp @@ -11,11 +11,16 @@ # include P111_data_struct::P111_data_struct(int8_t csPin, - int8_t rstPin) - : mfrc522(nullptr), _csPin(csPin), _rstPin(rstPin) + int8_t rstPin, + int8_t irqPin) + : mfrc522(nullptr), _csPin(csPin), _rstPin(rstPin), _irqPin(irqPin) {} P111_data_struct::~P111_data_struct() { + if (validGpio(_irqPin)) { + detachInterrupt(digitalPinToInterrupt(_irqPin)); + } + delete mfrc522; mfrc522 = nullptr; } @@ -30,6 +35,15 @@ void P111_data_struct::init() { mfrc522->PCD_WriteRegister(MFRC522::ComIEnReg, 0b10100000); // enable receiver interrupt mfrc522->PCD_WriteRegister(MFRC522::DivIEnReg, 0x80); // Set as CMOS output pin initPhase = P111_initPhases::Ready; + + if (validGpio(_irqPin)) { + pinMode(_irqPin, INPUT); + + attachInterruptArg( + digitalPinToInterrupt(_irqPin), + reinterpret_cast(mfrc522_interrupt), + this, FALLING); + } } } @@ -234,10 +248,19 @@ uint8_t P111_data_struct::readPassiveTargetID(uint8_t *uid, return P111_NO_ERROR; } +void P111_data_struct::mfrc522_interrupt(P111_data_struct * self) +{ + self->_irq_pin_time_micros = getMicros64(); +} + /********************************************************************************************* * Handle regular read and reset processing ********************************************************************************************/ bool P111_data_struct::plugin_ten_per_second(struct EventStruct *event) { + return loop(event); +} + +bool P111_data_struct::loop(struct EventStruct *event) { bool success = false; if (((initPhase == P111_initPhases::ResetDelay1) || // Whichever handler comes first @@ -306,7 +329,7 @@ bool P111_data_struct::plugin_ten_per_second(struct EventStruct *event) { /********************************************************************************************* * Handle timers instead of using delay() ********************************************************************************************/ -bool P111_data_struct::plugin_fifty_per_second() { +bool P111_data_struct::plugin_fifty_per_second(struct EventStruct *event) { if ((initPhase == P111_initPhases::ResetDelay1) || (initPhase == P111_initPhases::ResetDelay2)) { timeToWait -= 20; // milliseconds @@ -323,6 +346,12 @@ bool P111_data_struct::plugin_fifty_per_second() { } } } + if (_irq_pin_time_micros > _last_served_irq_pin_time_micros) { + _last_served_irq_pin_time_micros = _irq_pin_time_micros; + //addLog(LOG_LEVEL_INFO, F("P111: acting on interrupt")); + loop(event); + } + return true; } diff --git a/src/src/PluginStructs/P111_data_struct.h b/src/src/PluginStructs/P111_data_struct.h index 4a5d68c40..8acabdc6f 100644 --- a/src/src/PluginStructs/P111_data_struct.h +++ b/src/src/PluginStructs/P111_data_struct.h @@ -8,6 +8,7 @@ # define P111_CS_PIN PIN(0) # define P111_RST_PIN PIN(1) +# define P111_IRQ_PIN PIN(2) # define P111_TAG_AUTOREMOVAL PCONFIG(0) # define P111_SENDRESET PCONFIG(1) # define P111_REMOVALVALUE PCONFIG_LONG(0) @@ -31,18 +32,21 @@ enum class P111_initPhases : uint8_t { struct P111_data_struct : public PluginTaskData_base { P111_data_struct(int8_t csPin, - int8_t rstPin); + int8_t rstPin, + int8_t irqPin); P111_data_struct() = delete; virtual ~P111_data_struct(); void init(); bool plugin_ten_per_second(struct EventStruct *event); - bool plugin_fifty_per_second(); + bool plugin_fifty_per_second(struct EventStruct *event); String PCD_getVersion(uint8_t& v); private: + bool loop(struct EventStruct *event); + MFRC522 *mfrc522 = nullptr; uint8_t counter = 0; @@ -55,14 +59,21 @@ private: uint8_t readPassiveTargetID(uint8_t *uid, uint8_t *uidLength); + static void mfrc522_interrupt(P111_data_struct * self); + int32_t timeToWait = 0; int8_t _csPin; int8_t _rstPin; + int8_t _irqPin; uint8_t errorCount = 0; bool removedState = true; // On startup, there will usually not be a tag nearby P111_initPhases initPhase = P111_initPhases::Undefined; + + int64_t _last_served_irq_pin_time_micros{}; + + ESPEASY_VOLATILE(int64_t) _irq_pin_time_micros = -1; }; #endif // ifdef USES_P111 From 59e3a1b119a2c688894051dfa7e36d1918a507ae Mon Sep 17 00:00:00 2001 From: TD-er Date: Thu, 26 Jun 2025 18:16:14 +0200 Subject: [PATCH 079/564] [PWM motor] Speedup acting on limit switch interrupt --- src/src/PluginStructs/P098_data_struct.cpp | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/src/src/PluginStructs/P098_data_struct.cpp b/src/src/PluginStructs/P098_data_struct.cpp index 154a60ba9..922405039 100644 --- a/src/src/PluginStructs/P098_data_struct.cpp +++ b/src/src/PluginStructs/P098_data_struct.cpp @@ -4,6 +4,8 @@ # include "../ESPEasyCore/ESPEasyGPIO.h" +# include + # include "../Commands/GPIO.h" // FIXME TD-er: Only needed till we can call GPIO commands from the ESPEasy core. @@ -440,7 +442,8 @@ void ICACHE_RAM_ATTR P098_data_struct::process_limit_switch( ISR_noInterrupts(); { // Don't call gpio_config.readState() here - const bool pinState = gpio_config.inverted ? digitalRead(gpio_config.gpio) == 0 : digitalRead(gpio_config.gpio) != 0; + const bool pinState = + (DIRECT_pinRead_ISR(gpio_config.gpio) == 0) ^ gpio_config.inverted; const uint64_t currentTime = getMicros64(); From 0ed022e6b4bc59aa503d22f4abc377165c3c0571 Mon Sep 17 00:00:00 2001 From: TD-er Date: Fri, 27 Jun 2025 10:19:57 +0200 Subject: [PATCH 080/564] [Web flasher] Update esp web tools to 8.1.10 to support ESP32-C5 --- tools/pio/generate_web_flasher_manifest.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/pio/generate_web_flasher_manifest.py b/tools/pio/generate_web_flasher_manifest.py index 8e9021063..a92646c59 100644 --- a/tools/pio/generate_web_flasher_manifest.py +++ b/tools/pio/generate_web_flasher_manifest.py @@ -371,7 +371,7 @@ def generate_manifest_files(bin_folder, output_prefix): ' \n', ' \n', ' \n', ' \n', From 7fb4d4e821dc24961354072d2d55535abcad03cf Mon Sep 17 00:00:00 2001 From: TD-er Date: Sat, 28 Jun 2025 23:20:27 +0200 Subject: [PATCH 081/564] [PubSubClient] Update to new fork PubSubClient3 --- lib/pubsubclient/.gitignore | 1 - lib/pubsubclient/CHANGES.txt | 76 -- .../examples/mqtt_auth/mqtt_auth.ino | 43 - .../examples/mqtt_basic/mqtt_basic.ino | 77 -- .../examples/mqtt_esp8266/mqtt_esp8266.ino | 132 --- .../mqtt_large_message/mqtt_large_message.ino | 179 ---- .../mqtt_publish_in_callback.ino | 60 -- .../mqtt_reconnect_nonblocking.ino | 67 -- lib/pubsubclient/src/PubSubClient.cpp | 842 ------------------ lib/pubsubclient/src/PubSubClient.h | 205 ----- lib/pubsubclient/tests/src/connect_spec.cpp | 302 ------- lib/pubsubclient/tests/src/lib/Arduino.h | 26 - lib/pubsubclient/tests/src/lib/Client.h | 21 - lib/pubsubclient/tests/src/lib/ShimClient.h | 51 -- lib/pubsubclient/tests/src/publish_spec.cpp | 190 ---- lib/pubsubclient/tests/src/receive_spec.cpp | 279 ------ lib/pubsubclient3/.clang-format | 8 + lib/pubsubclient3/.editorconfig | 17 + lib/pubsubclient3/.github/build-arduino.sh | 53 ++ lib/pubsubclient3/.github/clang-lint.sh | 21 + lib/pubsubclient3/.github/workflows/build.yml | 31 + lib/pubsubclient3/.gitignore | 5 + .../.travis.yml | 0 lib/pubsubclient3/CHANGES.txt | 136 +++ .../LICENSE.txt | 3 +- lib/{pubsubclient => pubsubclient3}/README.md | 25 +- .../examples/mqtt_auth/mqtt_auth.ino | 41 + .../examples/mqtt_basic/mqtt_basic.ino | 74 ++ .../examples/mqtt_esp8266/mqtt_esp8266.ino | 135 +++ .../mqtt_large_message/mqtt_large_message.ino | 185 ++++ .../mqtt_publish_in_callback.ino | 56 ++ .../mqtt_reconnect_nonblocking.ino | 62 ++ .../examples/mqtt_stream/mqtt_stream.ino | 46 +- .../keywords.txt | 3 + .../library.json | 7 +- .../library.properties | 11 +- lib/pubsubclient3/src/PubSubClient.cpp | 772 ++++++++++++++++ lib/pubsubclient3/src/PubSubClient.h | 612 +++++++++++++ .../tests/.gitignore | 0 .../tests/Makefile | 8 +- .../tests/README.md | 21 +- lib/pubsubclient3/tests/src/connect_spec.cpp | 361 ++++++++ .../tests/src/keepalive_spec.cpp | 119 +-- lib/pubsubclient3/tests/src/lib/Arduino.h | 38 + .../tests/src/lib/BDDTest.cpp | 16 +- .../tests/src/lib/BDDTest.h | 4 +- .../tests/src/lib/Buffer.cpp | 5 +- .../tests/src/lib/Buffer.h | 12 +- lib/pubsubclient3/tests/src/lib/Client.h | 21 + .../tests/src/lib/IPAddress.cpp | 24 +- .../tests/src/lib/IPAddress.h | 37 +- .../tests/src/lib/Print.h | 4 +- .../tests/src/lib/ShimClient.cpp | 81 +- lib/pubsubclient3/tests/src/lib/ShimClient.h | 50 ++ .../tests/src/lib/Stream.cpp | 14 +- .../tests/src/lib/Stream.h | 8 +- .../tests/src/lib/trace.h | 4 +- lib/pubsubclient3/tests/src/publish_spec.cpp | 228 +++++ lib/pubsubclient3/tests/src/receive_spec.cpp | 345 +++++++ .../tests/src/subscribe_spec.cpp | 96 +- .../tests/testcases/__init__.py | 0 .../tests/testcases/mqtt_basic.py | 13 +- .../testcases/mqtt_publish_in_callback.py | 12 +- .../tests/testcases/settings.py | 0 .../tests/testsuite.py | 2 +- .../ESPEasyControllerCache_CSV_dumper.cpp | 2 +- src/src/PluginStructs/P146_data_struct.cpp | 2 +- 67 files changed, 3563 insertions(+), 2818 deletions(-) delete mode 100644 lib/pubsubclient/.gitignore delete mode 100644 lib/pubsubclient/CHANGES.txt delete mode 100644 lib/pubsubclient/examples/mqtt_auth/mqtt_auth.ino delete mode 100644 lib/pubsubclient/examples/mqtt_basic/mqtt_basic.ino delete mode 100644 lib/pubsubclient/examples/mqtt_esp8266/mqtt_esp8266.ino delete mode 100644 lib/pubsubclient/examples/mqtt_large_message/mqtt_large_message.ino delete mode 100644 lib/pubsubclient/examples/mqtt_publish_in_callback/mqtt_publish_in_callback.ino delete mode 100644 lib/pubsubclient/examples/mqtt_reconnect_nonblocking/mqtt_reconnect_nonblocking.ino delete mode 100644 lib/pubsubclient/src/PubSubClient.cpp delete mode 100644 lib/pubsubclient/src/PubSubClient.h delete mode 100644 lib/pubsubclient/tests/src/connect_spec.cpp delete mode 100644 lib/pubsubclient/tests/src/lib/Arduino.h delete mode 100644 lib/pubsubclient/tests/src/lib/Client.h delete mode 100644 lib/pubsubclient/tests/src/lib/ShimClient.h delete mode 100644 lib/pubsubclient/tests/src/publish_spec.cpp delete mode 100644 lib/pubsubclient/tests/src/receive_spec.cpp create mode 100644 lib/pubsubclient3/.clang-format create mode 100644 lib/pubsubclient3/.editorconfig create mode 100644 lib/pubsubclient3/.github/build-arduino.sh create mode 100644 lib/pubsubclient3/.github/clang-lint.sh create mode 100644 lib/pubsubclient3/.github/workflows/build.yml create mode 100644 lib/pubsubclient3/.gitignore rename lib/{pubsubclient => pubsubclient3}/.travis.yml (100%) create mode 100644 lib/pubsubclient3/CHANGES.txt rename lib/{pubsubclient => pubsubclient3}/LICENSE.txt (93%) rename lib/{pubsubclient => pubsubclient3}/README.md (56%) create mode 100644 lib/pubsubclient3/examples/mqtt_auth/mqtt_auth.ino create mode 100644 lib/pubsubclient3/examples/mqtt_basic/mqtt_basic.ino create mode 100644 lib/pubsubclient3/examples/mqtt_esp8266/mqtt_esp8266.ino create mode 100644 lib/pubsubclient3/examples/mqtt_large_message/mqtt_large_message.ino create mode 100644 lib/pubsubclient3/examples/mqtt_publish_in_callback/mqtt_publish_in_callback.ino create mode 100644 lib/pubsubclient3/examples/mqtt_reconnect_nonblocking/mqtt_reconnect_nonblocking.ino rename lib/{pubsubclient => pubsubclient3}/examples/mqtt_stream/mqtt_stream.ino (50%) rename lib/{pubsubclient => pubsubclient3}/keywords.txt (91%) rename lib/{pubsubclient => pubsubclient3}/library.json (83%) rename lib/{pubsubclient => pubsubclient3}/library.properties (75%) create mode 100644 lib/pubsubclient3/src/PubSubClient.cpp create mode 100644 lib/pubsubclient3/src/PubSubClient.h rename lib/{pubsubclient => pubsubclient3}/tests/.gitignore (100%) rename lib/{pubsubclient => pubsubclient3}/tests/Makefile (52%) rename lib/{pubsubclient => pubsubclient3}/tests/README.md (93%) create mode 100644 lib/pubsubclient3/tests/src/connect_spec.cpp rename lib/{pubsubclient => pubsubclient3}/tests/src/keepalive_spec.cpp (51%) create mode 100644 lib/pubsubclient3/tests/src/lib/Arduino.h rename lib/{pubsubclient => pubsubclient3}/tests/src/lib/BDDTest.cpp (82%) rename lib/{pubsubclient => pubsubclient3}/tests/src/lib/BDDTest.h (87%) rename lib/{pubsubclient => pubsubclient3}/tests/src/lib/Buffer.cpp (90%) rename lib/{pubsubclient => pubsubclient3}/tests/src/lib/Buffer.h (84%) create mode 100644 lib/pubsubclient3/tests/src/lib/Client.h rename lib/{pubsubclient => pubsubclient3}/tests/src/lib/IPAddress.cpp (58%) rename lib/{pubsubclient => pubsubclient3}/tests/src/lib/IPAddress.h (79%) rename lib/{pubsubclient => pubsubclient3}/tests/src/lib/Print.h (94%) rename lib/{pubsubclient => pubsubclient3}/tests/src/lib/ShimClient.cpp (67%) create mode 100644 lib/pubsubclient3/tests/src/lib/ShimClient.h rename lib/{pubsubclient => pubsubclient3}/tests/src/lib/Stream.cpp (86%) rename lib/{pubsubclient => pubsubclient3}/tests/src/lib/Stream.h (78%) rename lib/{pubsubclient => pubsubclient3}/tests/src/lib/trace.h (100%) create mode 100644 lib/pubsubclient3/tests/src/publish_spec.cpp create mode 100644 lib/pubsubclient3/tests/src/receive_spec.cpp rename lib/{pubsubclient => pubsubclient3}/tests/src/subscribe_spec.cpp (52%) rename lib/{pubsubclient => pubsubclient3}/tests/testcases/__init__.py (100%) rename lib/{pubsubclient => pubsubclient3}/tests/testcases/mqtt_basic.py (77%) rename lib/{pubsubclient => pubsubclient3}/tests/testcases/mqtt_publish_in_callback.py (86%) rename lib/{pubsubclient => pubsubclient3}/tests/testcases/settings.py (100%) rename lib/{pubsubclient => pubsubclient3}/tests/testsuite.py (99%) diff --git a/lib/pubsubclient/.gitignore b/lib/pubsubclient/.gitignore deleted file mode 100644 index 1c3ba189b..000000000 --- a/lib/pubsubclient/.gitignore +++ /dev/null @@ -1 +0,0 @@ -tests/bin diff --git a/lib/pubsubclient/CHANGES.txt b/lib/pubsubclient/CHANGES.txt deleted file mode 100644 index ff4da62ab..000000000 --- a/lib/pubsubclient/CHANGES.txt +++ /dev/null @@ -1,76 +0,0 @@ -2.7 - * Fix remaining-length handling to prevent buffer overrun - * Add large-payload API - beginPublish/write/publish/endPublish - * Add yield call to improve reliability on ESP - * Add Clean Session flag to connect options - * Add ESP32 support for functional callback signature - * Various other fixes - -2.4 - * Add MQTT_SOCKET_TIMEOUT to prevent it blocking indefinitely - whilst waiting for inbound data - * Fixed return code when publishing >256 bytes - -2.3 - * Add publish(topic,payload,retained) function - -2.2 - * Change code layout to match Arduino Library reqs - -2.1 - * Add MAX_TRANSFER_SIZE def to chunk messages if needed - * Reject topic/payloads that exceed MQTT_MAX_PACKET_SIZE - -2.0 - * Add (and default to) MQTT 3.1.1 support - * Fix PROGMEM handling for Intel Galileo/ESP8266 - * Add overloaded constructors for convenience - * Add chainable setters for server/callback/client/stream - * Add state function to return connack return code - -1.9 - * Do not split MQTT packets over multiple calls to _client->write() - * API change: All constructors now require an instance of Client - to be passed in. - * Fixed example to match 1.8 api changes - dpslwk - * Added username/password support - WilHall - * Added publish_P - publishes messages from PROGMEM - jobytaffey - -1.8 - * KeepAlive interval is configurable in PubSubClient.h - * Maximum packet size is configurable in PubSubClient.h - * API change: Return boolean rather than int from various functions - * API change: Length parameter in message callback changed - from int to unsigned int - * Various internal tidy-ups around types -1.7 - * Improved keepalive handling - * Updated to the Arduino-1.0 API -1.6 - * Added the ability to publish a retained message - -1.5 - * Added default constructor - * Fixed compile error when used with arduino-0021 or later - -1.4 - * Fixed connection lost handling - -1.3 - * Fixed packet reading bug in PubSubClient.readPacket - -1.2 - * Fixed compile error when used with arduino-0016 or later - - -1.1 - * Reduced size of library - * Added support for Will messages - * Clarified licensing - see LICENSE.txt - - -1.0 - * Only Quality of Service (QOS) 0 messaging is supported - * The maximum message size, including header, is 128 bytes - * The keepalive interval is set to 30 seconds - * No support for Will messages diff --git a/lib/pubsubclient/examples/mqtt_auth/mqtt_auth.ino b/lib/pubsubclient/examples/mqtt_auth/mqtt_auth.ino deleted file mode 100644 index e9f7b180f..000000000 --- a/lib/pubsubclient/examples/mqtt_auth/mqtt_auth.ino +++ /dev/null @@ -1,43 +0,0 @@ -/* - Basic MQTT example with Authentication - - - connects to an MQTT server, providing username - and password - - publishes "hello world" to the topic "outTopic" - - subscribes to the topic "inTopic" -*/ - -#include -#include -#include - -// Update these with values suitable for your network. -byte mac[] = { 0xDE, 0xED, 0xBA, 0xFE, 0xFE, 0xED }; -IPAddress ip(172, 16, 0, 100); -IPAddress server(172, 16, 0, 2); - -void callback(char* topic, byte* payload, unsigned int length) { - // handle message arrived -} - -EthernetClient ethClient; -PubSubClient client(server, 1883, callback, ethClient); - -void setup() -{ - Ethernet.begin(mac, ip); - // Note - the default maximum packet size is 128 bytes. If the - // combined length of clientId, username and password exceed this, - // you will need to increase the value of MQTT_MAX_PACKET_SIZE in - // PubSubClient.h - - if (client.connect("arduinoClient", "testuser", "testpass")) { - client.publish("outTopic","hello world"); - client.subscribe("inTopic"); - } -} - -void loop() -{ - client.loop(); -} diff --git a/lib/pubsubclient/examples/mqtt_basic/mqtt_basic.ino b/lib/pubsubclient/examples/mqtt_basic/mqtt_basic.ino deleted file mode 100644 index f545adef8..000000000 --- a/lib/pubsubclient/examples/mqtt_basic/mqtt_basic.ino +++ /dev/null @@ -1,77 +0,0 @@ -/* - Basic MQTT example - - This sketch demonstrates the basic capabilities of the library. - It connects to an MQTT server then: - - publishes "hello world" to the topic "outTopic" - - subscribes to the topic "inTopic", printing out any messages - it receives. NB - it assumes the received payloads are strings not binary - - It will reconnect to the server if the connection is lost using a blocking - reconnect function. See the 'mqtt_reconnect_nonblocking' example for how to - achieve the same result without blocking the main loop. - -*/ - -#include -#include -#include - -// Update these with values suitable for your network. -byte mac[] = { 0xDE, 0xED, 0xBA, 0xFE, 0xFE, 0xED }; -IPAddress ip(172, 16, 0, 100); -IPAddress server(172, 16, 0, 2); - -void callback(char* topic, byte* payload, unsigned int length) { - Serial.print("Message arrived ["); - Serial.print(topic); - Serial.print("] "); - for (int i=0;i Preferences -> Additional Boards Manager URLs": - http://arduino.esp8266.com/stable/package_esp8266com_index.json - - Open the "Tools -> Board -> Board Manager" and click install for the ESP8266" - - Select your ESP8266 in "Tools -> Board" - -*/ - -#include -#include - -// Update these with values suitable for your network. - -const char* ssid = "........"; -const char* password = "........"; -const char* mqtt_server = "broker.mqtt-dashboard.com"; - -WiFiClient espClient; -PubSubClient client(espClient); -long lastMsg = 0; -char msg[50]; -int value = 0; - -void setup_wifi() { - - delay(10); - // We start by connecting to a WiFi network - Serial.println(); - Serial.print("Connecting to "); - Serial.println(ssid); - - WiFi.begin(ssid, password); - - while (WiFi.status() != WL_CONNECTED) { - delay(500); - Serial.print("."); - } - - randomSeed(micros()); - - Serial.println(""); - Serial.println("WiFi connected"); - Serial.println("IP address: "); - Serial.println(WiFi.localIP()); -} - -void callback(char* topic, byte* payload, unsigned int length) { - Serial.print("Message arrived ["); - Serial.print(topic); - Serial.print("] "); - for (int i = 0; i < length; i++) { - Serial.print((char)payload[i]); - } - Serial.println(); - - // Switch on the LED if an 1 was received as first character - if ((char)payload[0] == '1') { - digitalWrite(BUILTIN_LED, LOW); // Turn the LED on (Note that LOW is the voltage level - // but actually the LED is on; this is because - // it is active low on the ESP-01) - } else { - digitalWrite(BUILTIN_LED, HIGH); // Turn the LED off by making the voltage HIGH - } - -} - -void reconnect() { - // Loop until we're reconnected - while (!client.connected()) { - Serial.print("Attempting MQTT connection..."); - // Create a random client ID - String clientId = "ESP8266Client-"; - clientId += String(random(0xffff), HEX); - // Attempt to connect - if (client.connect(clientId.c_str())) { - Serial.println("connected"); - // Once connected, publish an announcement... - client.publish("outTopic", "hello world"); - // ... and resubscribe - client.subscribe("inTopic"); - } else { - Serial.print("failed, rc="); - Serial.print(client.state()); - Serial.println(" try again in 5 seconds"); - // Wait 5 seconds before retrying - delay(5000); - } - } -} - -void setup() { - pinMode(BUILTIN_LED, OUTPUT); // Initialize the BUILTIN_LED pin as an output - Serial.begin(115200); - setup_wifi(); - client.setServer(mqtt_server, 1883); - client.setCallback(callback); -} - -void loop() { - - if (!client.connected()) { - reconnect(); - } - client.loop(); - - long now = millis(); - if (now - lastMsg > 2000) { - lastMsg = now; - ++value; - snprintf (msg, 50, "hello world #%ld", value); - Serial.print("Publish message: "); - Serial.println(msg); - client.publish("outTopic", msg); - } -} diff --git a/lib/pubsubclient/examples/mqtt_large_message/mqtt_large_message.ino b/lib/pubsubclient/examples/mqtt_large_message/mqtt_large_message.ino deleted file mode 100644 index e048c3ed3..000000000 --- a/lib/pubsubclient/examples/mqtt_large_message/mqtt_large_message.ino +++ /dev/null @@ -1,179 +0,0 @@ -/* - Long message ESP8266 MQTT example - - This sketch demonstrates sending arbitrarily large messages in combination - with the ESP8266 board/library. - - It connects to an MQTT server then: - - publishes "hello world" to the topic "outTopic" - - subscribes to the topic "greenBottles/#", printing out any messages - it receives. NB - it assumes the received payloads are strings not binary - - If the sub-topic is a number, it publishes a "greenBottles/lyrics" message - with a payload consisting of the lyrics to "10 green bottles", replacing - 10 with the number given in the sub-topic. - - It will reconnect to the server if the connection is lost using a blocking - reconnect function. See the 'mqtt_reconnect_nonblocking' example for how to - achieve the same result without blocking the main loop. - - To install the ESP8266 board, (using Arduino 1.6.4+): - - Add the following 3rd party board manager under "File -> Preferences -> Additional Boards Manager URLs": - http://arduino.esp8266.com/stable/package_esp8266com_index.json - - Open the "Tools -> Board -> Board Manager" and click install for the ESP8266" - - Select your ESP8266 in "Tools -> Board" - -*/ - -#include -#include - -// Update these with values suitable for your network. - -const char* ssid = "........"; -const char* password = "........"; -const char* mqtt_server = "broker.mqtt-dashboard.com"; - -WiFiClient espClient; -PubSubClient client(espClient); -long lastMsg = 0; -char msg[50]; -int value = 0; - -void setup_wifi() { - - delay(10); - // We start by connecting to a WiFi network - Serial.println(); - Serial.print("Connecting to "); - Serial.println(ssid); - - WiFi.begin(ssid, password); - - while (WiFi.status() != WL_CONNECTED) { - delay(500); - Serial.print("."); - } - - randomSeed(micros()); - - Serial.println(""); - Serial.println("WiFi connected"); - Serial.println("IP address: "); - Serial.println(WiFi.localIP()); -} - -void callback(char* topic, byte* payload, unsigned int length) { - Serial.print("Message arrived ["); - Serial.print(topic); - Serial.print("] "); - for (int i = 0; i < length; i++) { - Serial.print((char)payload[i]); - } - Serial.println(); - - // Find out how many bottles we should generate lyrics for - String topicStr(topic); - int bottleCount = 0; // assume no bottles unless we correctly parse a value from the topic - if (topicStr.indexOf('/') >= 0) { - // The topic includes a '/', we'll try to read the number of bottles from just after that - topicStr.remove(0, topicStr.indexOf('/')+1); - // Now see if there's a number of bottles after the '/' - bottleCount = topicStr.toInt(); - } - - if (bottleCount > 0) { - // Work out how big our resulting message will be - int msgLen = 0; - for (int i = bottleCount; i > 0; i--) { - String numBottles(i); - msgLen += 2*numBottles.length(); - if (i == 1) { - msgLen += 2*String(" green bottle, standing on the wall\n").length(); - } else { - msgLen += 2*String(" green bottles, standing on the wall\n").length(); - } - msgLen += String("And if one green bottle should accidentally fall\nThere'll be ").length(); - switch (i) { - case 1: - msgLen += String("no green bottles, standing on the wall\n\n").length(); - break; - case 2: - msgLen += String("1 green bottle, standing on the wall\n\n").length(); - break; - default: - numBottles = i-1; - msgLen += numBottles.length(); - msgLen += String(" green bottles, standing on the wall\n\n").length(); - break; - }; - } - - // Now we can start to publish the message - client.beginPublish("greenBottles/lyrics", msgLen, false); - for (int i = bottleCount; i > 0; i--) { - for (int j = 0; j < 2; j++) { - client.print(i); - if (i == 1) { - client.print(" green bottle, standing on the wall\n"); - } else { - client.print(" green bottles, standing on the wall\n"); - } - } - client.print("And if one green bottle should accidentally fall\nThere'll be "); - switch (i) { - case 1: - client.print("no green bottles, standing on the wall\n\n"); - break; - case 2: - client.print("1 green bottle, standing on the wall\n\n"); - break; - default: - client.print(i-1); - client.print(" green bottles, standing on the wall\n\n"); - break; - }; - } - // Now we're done! - client.endPublish(); - } -} - -void reconnect() { - // Loop until we're reconnected - while (!client.connected()) { - Serial.print("Attempting MQTT connection..."); - // Create a random client ID - String clientId = "ESP8266Client-"; - clientId += String(random(0xffff), HEX); - // Attempt to connect - if (client.connect(clientId.c_str())) { - Serial.println("connected"); - // Once connected, publish an announcement... - client.publish("outTopic", "hello world"); - // ... and resubscribe - client.subscribe("greenBottles/#"); - } else { - Serial.print("failed, rc="); - Serial.print(client.state()); - Serial.println(" try again in 5 seconds"); - // Wait 5 seconds before retrying - delay(5000); - } - } -} - -void setup() { - pinMode(BUILTIN_LED, OUTPUT); // Initialize the BUILTIN_LED pin as an output - Serial.begin(115200); - setup_wifi(); - client.setServer(mqtt_server, 1883); - client.setCallback(callback); -} - -void loop() { - - if (!client.connected()) { - reconnect(); - } - client.loop(); -} diff --git a/lib/pubsubclient/examples/mqtt_publish_in_callback/mqtt_publish_in_callback.ino b/lib/pubsubclient/examples/mqtt_publish_in_callback/mqtt_publish_in_callback.ino deleted file mode 100644 index 42afb2a3a..000000000 --- a/lib/pubsubclient/examples/mqtt_publish_in_callback/mqtt_publish_in_callback.ino +++ /dev/null @@ -1,60 +0,0 @@ -/* - Publishing in the callback - - - connects to an MQTT server - - subscribes to the topic "inTopic" - - when a message is received, republishes it to "outTopic" - - This example shows how to publish messages within the - callback function. The callback function header needs to - be declared before the PubSubClient constructor and the - actual callback defined afterwards. - This ensures the client reference in the callback function - is valid. - -*/ - -#include -#include -#include - -// Update these with values suitable for your network. -byte mac[] = { 0xDE, 0xED, 0xBA, 0xFE, 0xFE, 0xED }; -IPAddress ip(172, 16, 0, 100); -IPAddress server(172, 16, 0, 2); - -// Callback function header -void callback(char* topic, byte* payload, unsigned int length); - -EthernetClient ethClient; -PubSubClient client(server, 1883, callback, ethClient); - -// Callback function -void callback(char* topic, byte* payload, unsigned int length) { - // In order to republish this payload, a copy must be made - // as the orignal payload buffer will be overwritten whilst - // constructing the PUBLISH packet. - - // Allocate the correct amount of memory for the payload copy - byte* p = (byte*)malloc(length); - // Copy the payload to the new buffer - memcpy(p,payload,length); - client.publish("outTopic", p, length); - // Free the memory - free(p); -} - -void setup() -{ - - Ethernet.begin(mac, ip); - if (client.connect("arduinoClient")) { - client.publish("outTopic","hello world"); - client.subscribe("inTopic"); - } -} - -void loop() -{ - client.loop(); -} diff --git a/lib/pubsubclient/examples/mqtt_reconnect_nonblocking/mqtt_reconnect_nonblocking.ino b/lib/pubsubclient/examples/mqtt_reconnect_nonblocking/mqtt_reconnect_nonblocking.ino deleted file mode 100644 index 080b7391c..000000000 --- a/lib/pubsubclient/examples/mqtt_reconnect_nonblocking/mqtt_reconnect_nonblocking.ino +++ /dev/null @@ -1,67 +0,0 @@ -/* - Reconnecting MQTT example - non-blocking - - This sketch demonstrates how to keep the client connected - using a non-blocking reconnect function. If the client loses - its connection, it attempts to reconnect every 5 seconds - without blocking the main loop. - -*/ - -#include -#include -#include - -// Update these with values suitable for your hardware/network. -byte mac[] = { 0xDE, 0xED, 0xBA, 0xFE, 0xFE, 0xED }; -IPAddress ip(172, 16, 0, 100); -IPAddress server(172, 16, 0, 2); - -void callback(char* topic, byte* payload, unsigned int length) { - // handle message arrived -} - -EthernetClient ethClient; -PubSubClient client(ethClient); - -long lastReconnectAttempt = 0; - -boolean reconnect() { - if (client.connect("arduinoClient")) { - // Once connected, publish an announcement... - client.publish("outTopic","hello world"); - // ... and resubscribe - client.subscribe("inTopic"); - } - return client.connected(); -} - -void setup() -{ - client.setServer(server, 1883); - client.setCallback(callback); - - Ethernet.begin(mac, ip); - delay(1500); - lastReconnectAttempt = 0; -} - - -void loop() -{ - if (!client.connected()) { - long now = millis(); - if (now - lastReconnectAttempt > 5000) { - lastReconnectAttempt = now; - // Attempt to reconnect - if (reconnect()) { - lastReconnectAttempt = 0; - } - } - } else { - // Client connected - - client.loop(); - } - -} diff --git a/lib/pubsubclient/src/PubSubClient.cpp b/lib/pubsubclient/src/PubSubClient.cpp deleted file mode 100644 index 34a8cab7b..000000000 --- a/lib/pubsubclient/src/PubSubClient.cpp +++ /dev/null @@ -1,842 +0,0 @@ -/* - PubSubClient.cpp - A simple client for MQTT. - Nick O'Leary - http://knolleary.net -*/ - -#include "PubSubClient.h" -#include - -#ifdef ESP32 -#include -#endif - -#ifdef USE_SECOND_HEAP - #include -#endif - - -PubSubClient::PubSubClient() { - this->_state = MQTT_DISCONNECTED; - this->_client = NULL; - this->stream = NULL; - this->keepAlive_sec = MQTT_KEEPALIVE; - this->socketTimeout_msec = MQTT_SOCKET_TIMEOUT * 1000; - - setCallback(NULL); -} - -PubSubClient::PubSubClient(Client& client) { - this->_state = MQTT_DISCONNECTED; - setClient(client); - this->stream = NULL; - this->keepAlive_sec = MQTT_KEEPALIVE; - this->socketTimeout_msec = MQTT_SOCKET_TIMEOUT * 1000; -} - -PubSubClient::PubSubClient(IPAddress addr, uint16_t port, Client& client) { - this->_state = MQTT_DISCONNECTED; - setServer(addr, port); - setClient(client); - this->stream = NULL; - this->keepAlive_sec = MQTT_KEEPALIVE; - this->socketTimeout_msec = MQTT_SOCKET_TIMEOUT * 1000; -} -PubSubClient::PubSubClient(IPAddress addr, uint16_t port, Client& client, Stream& stream) { - this->_state = MQTT_DISCONNECTED; - setServer(addr,port); - setClient(client); - setStream(stream); - this->keepAlive_sec = MQTT_KEEPALIVE; - this->socketTimeout_msec = MQTT_SOCKET_TIMEOUT * 1000; -} -PubSubClient::PubSubClient(IPAddress addr, uint16_t port, MQTT_CALLBACK_SIGNATURE, Client& client) { - this->_state = MQTT_DISCONNECTED; - setServer(addr, port); - setCallback(callback); - setClient(client); - this->stream = NULL; - this->keepAlive_sec = MQTT_KEEPALIVE; - this->socketTimeout_msec = MQTT_SOCKET_TIMEOUT * 1000; -} -PubSubClient::PubSubClient(IPAddress addr, uint16_t port, MQTT_CALLBACK_SIGNATURE, Client& client, Stream& stream) { - this->_state = MQTT_DISCONNECTED; - setServer(addr,port); - setCallback(callback); - setClient(client); - setStream(stream); - this->keepAlive_sec = MQTT_KEEPALIVE; - this->socketTimeout_msec = MQTT_SOCKET_TIMEOUT * 1000; -} - -PubSubClient::PubSubClient(uint8_t *ip, uint16_t port, Client& client) { - this->_state = MQTT_DISCONNECTED; - setServer(ip, port); - setClient(client); - this->stream = NULL; - this->keepAlive_sec = MQTT_KEEPALIVE; - this->socketTimeout_msec = MQTT_SOCKET_TIMEOUT * 1000; -} -PubSubClient::PubSubClient(uint8_t *ip, uint16_t port, Client& client, Stream& stream) { - this->_state = MQTT_DISCONNECTED; - setServer(ip,port); - setClient(client); - setStream(stream); - this->keepAlive_sec = MQTT_KEEPALIVE; - this->socketTimeout_msec = MQTT_SOCKET_TIMEOUT * 1000; -} -PubSubClient::PubSubClient(uint8_t *ip, uint16_t port, MQTT_CALLBACK_SIGNATURE, Client& client) { - this->_state = MQTT_DISCONNECTED; - setServer(ip, port); - setCallback(callback); - setClient(client); - this->stream = NULL; - this->keepAlive_sec = MQTT_KEEPALIVE; - this->socketTimeout_msec = MQTT_SOCKET_TIMEOUT * 1000; -} -PubSubClient::PubSubClient(uint8_t *ip, uint16_t port, MQTT_CALLBACK_SIGNATURE, Client& client, Stream& stream) { - this->_state = MQTT_DISCONNECTED; - setServer(ip,port); - setCallback(callback); - setClient(client); - setStream(stream); - this->keepAlive_sec = MQTT_KEEPALIVE; - this->socketTimeout_msec = MQTT_SOCKET_TIMEOUT * 1000; -} - -PubSubClient::PubSubClient(const char* domain, uint16_t port, Client& client) { - this->_state = MQTT_DISCONNECTED; - setServer(domain,port); - setClient(client); - this->stream = NULL; - this->keepAlive_sec = MQTT_KEEPALIVE; - this->socketTimeout_msec = MQTT_SOCKET_TIMEOUT * 1000; -} -PubSubClient::PubSubClient(const char* domain, uint16_t port, Client& client, Stream& stream) { - this->_state = MQTT_DISCONNECTED; - setServer(domain,port); - setClient(client); - setStream(stream); - this->keepAlive_sec = MQTT_KEEPALIVE; - this->socketTimeout_msec = MQTT_SOCKET_TIMEOUT * 1000; -} -PubSubClient::PubSubClient(const char* domain, uint16_t port, MQTT_CALLBACK_SIGNATURE, Client& client) { - this->_state = MQTT_DISCONNECTED; - setServer(domain,port); - setCallback(callback); - setClient(client); - this->stream = NULL; - this->keepAlive_sec = MQTT_KEEPALIVE; - this->socketTimeout_msec = MQTT_SOCKET_TIMEOUT * 1000; -} -PubSubClient::PubSubClient(const char* domain, uint16_t port, MQTT_CALLBACK_SIGNATURE, Client& client, Stream& stream) { - this->_state = MQTT_DISCONNECTED; - setServer(domain,port); - setCallback(callback); - setClient(client); - setStream(stream); - this->keepAlive_sec = MQTT_KEEPALIVE; - this->socketTimeout_msec = MQTT_SOCKET_TIMEOUT * 1000; -} - -PubSubClient::~PubSubClient() -{ - if (buffer != nullptr) { - free(buffer); - buffer = nullptr; - } -} - -boolean PubSubClient::connect(const char *id) { - return connect(id,NULL,NULL,0,0,0,0,1); -} - -boolean PubSubClient::connect(const char *id, const char *user, const char *pass) { - return connect(id,user,pass,0,0,0,0,1); -} - -boolean PubSubClient::connect(const char *id, const char* willTopic, uint8_t willQos, boolean willRetain, const char* willMessage) { - return connect(id,NULL,NULL,willTopic,willQos,willRetain,willMessage,1); -} - -boolean PubSubClient::connect(const char *id, const char *user, const char *pass, const char* willTopic, uint8_t willQos, boolean willRetain, const char* willMessage) { - return connect(id,user,pass,willTopic,willQos,willRetain,willMessage,1); -} - -boolean PubSubClient::connect(const char *id, const char *user, const char *pass, const char* willTopic, uint8_t willQos, boolean willRetain, const char* willMessage, boolean cleanSession) { - if (!initBuffer()) { - return false; - } - - if (!connected()) { - int result = 0; - - if (_client == nullptr) { - return false; - } - if (_client->connected()) { - result = 1; - } else { - if (domain.length() != 0) { -#if defined(ESP32) && ESP_IDF_VERSION_MAJOR < 5 - WiFiClient* wfc = (WiFiClient*)_client; - result = wfc->connect(this->domain.c_str(), this->port, _client->getTimeout()); -#else - result = _client->connect(this->domain.c_str(), this->port); -#endif - } else { -#if defined(ESP32) && ESP_IDF_VERSION_MAJOR < 5 - WiFiClient* wfc = (WiFiClient*)_client; - result = wfc->connect(this->ip, this->port, _client->getTimeout()); -#else - result = _client->connect(this->ip, this->port); -#endif - } - } - if (result == 1) { - nextMsgId = 1; - // Leave room in the buffer for header and variable length field - uint16_t length = MQTT_MAX_HEADER_SIZE; - unsigned int j; - -#if MQTT_VERSION == MQTT_VERSION_3_1 - uint8_t d[9] = {0x00,0x06,'M','Q','I','s','d','p', MQTT_VERSION}; -#define MQTT_HEADER_VERSION_LENGTH 9 -#elif MQTT_VERSION == MQTT_VERSION_3_1_1 - uint8_t d[7] = {0x00,0x04,'M','Q','T','T',MQTT_VERSION}; -#define MQTT_HEADER_VERSION_LENGTH 7 -#endif - for (j = 0;j>1); - } - } - - buffer[length++] = v; - - buffer[length++] = ((keepAlive_sec) >> 8); - buffer[length++] = ((keepAlive_sec) & 0xFF); - - CHECK_STRING_LENGTH(length,id) - length = writeString(id,buffer,length); - if (willTopic) { - CHECK_STRING_LENGTH(length,willTopic) - length = writeString(willTopic,buffer,length); - CHECK_STRING_LENGTH(length,willMessage) - length = writeString(willMessage,buffer,length); - } - - if(user != NULL) { - CHECK_STRING_LENGTH(length,user) - length = writeString(user,buffer,length); - if(pass != NULL) { - CHECK_STRING_LENGTH(length,pass) - length = writeString(pass,buffer,length); - } - } - - write(MQTTCONNECT,buffer,length-MQTT_MAX_HEADER_SIZE); - - lastInActivity = lastOutActivity = millis(); - pingOutstanding = false; // See: https://github.com/knolleary/pubsubclient/pull/802 - - while (!_client->available()) { - delay(0); // Prevent watchdog crashes - unsigned long t = millis(); - if ((int32_t)(t - lastInActivity) >= socketTimeout_msec) { - _state = MQTT_CONNECTION_TIMEOUT; - _client->stop(); - return false; - } - } - uint8_t llen; - uint16_t len = readPacket(&llen); - - if (len == 4) { - if (buffer[3] == 0) { - lastInActivity = millis(); - pingOutstanding = false; - _state = MQTT_CONNECTED; - return true; - } else { - _state = buffer[3]; - } - } - _client->stop(); - } else { - _state = MQTT_CONNECT_FAILED; - } - return false; - } - return true; -} - -// reads a byte into result -boolean PubSubClient::readByte(uint8_t * result) { - if (_client == nullptr) { - return false; - } - uint32_t previousMillis = millis(); - - while(!_client->available() && _client->connected()) { - delay(1); // Prevent watchdog crashes - - if((int32_t)(millis() - previousMillis) >= socketTimeout_msec){ - return false; - } - } - *result = _client->read(); - return true; -} - -// reads a byte into result[*index] and increments index -boolean PubSubClient::readByte(uint8_t * result, uint16_t * index){ - uint16_t current_index = *index; - uint8_t * write_address = &(result[current_index]); - if(readByte(write_address)){ - *index = current_index + 1; - return true; - } - return false; -} - -uint16_t PubSubClient::readPacket(uint8_t* lengthLength) { - if (!initBuffer()) { - return 0; - } - - uint16_t len = 0; - if(!readByte(buffer, &len)) return 0; - bool isPublish = (buffer[0]&0xF0) == MQTTPUBLISH; - uint32_t multiplier = 1; - uint16_t length = 0; - uint8_t digit = 0; - uint16_t skip = 0; - uint8_t start = 0; - - do { - if (len == 5) { - // Invalid remaining length encoding - kill the connection - _state = MQTT_DISCONNECTED; - _client->stop(); - return 0; - } - if(!readByte(&digit)) return 0; - buffer[len++] = digit; - length += (digit & 127) * multiplier; - multiplier *= 128; - } while ((digit & 128) != 0 && len < (MQTT_MAX_PACKET_SIZE -2)); - *lengthLength = len-1; - - if (isPublish) { - // Read in topic length to calculate bytes to skip over for Stream writing - if(!readByte(buffer, &len)) return 0; - if(!readByte(buffer, &len)) return 0; - skip = (buffer[*lengthLength+1]<<8)+buffer[*lengthLength+2]; - start = 2; - if (buffer[0]&MQTTQOS1) { - // skip message id - skip += 2; - } - } - - for (uint16_t i = start;istream) { - if (isPublish && len-*lengthLength-2>skip) { - this->stream->write(digit); - } - } - if (len < MQTT_MAX_PACKET_SIZE) { - buffer[len] = digit; - } - len++; - } - - if (!this->stream && len > MQTT_MAX_PACKET_SIZE) { - len = 0; // This will cause the packet to be ignored. - } - - return len; -} - -bool PubSubClient::loop_read() { - if (!initBuffer()) { - return false; - } - - if (_client == nullptr) { - return false; - } - if (!_client->available()) { - return false; - } - uint8_t llen; - uint16_t len = readPacket(&llen); - if (len == 0) { - return false; - } - unsigned long t = millis(); - lastInActivity = t; - uint8_t type = buffer[0]&0xF0; - - switch(type) { - case MQTTPUBLISH: - { - if (callback) { - const bool msgId_present = (buffer[0]&0x06) == MQTTQOS1; - const uint16_t tl_offset = llen+1; - const uint16_t tl = (buffer[tl_offset]<<8)+buffer[tl_offset+1]; /* topic length in bytes */ - const uint16_t topic_offset = tl_offset+2; - const uint16_t msgId_offset = topic_offset+tl; - const uint16_t payload_offset = msgId_present ? msgId_offset+2 : msgId_offset; - if (payload_offset >= MQTT_MAX_PACKET_SIZE) return false; - if (len < payload_offset) return false; - // Need to move the topic 1 byte to insert a '\0' at the end of the topic. - memmove(buffer+topic_offset-1,buffer+topic_offset,tl); /* move topic inside buffer 1 byte to front */ - buffer[topic_offset-1+tl] = 0; /* end the topic as a 'C' string with \x00 */ - char *topic = (char*) buffer+topic_offset-1; - uint8_t *payload; - // msgId only present for QOS>0 - if (msgId_present) { - const uint16_t msgId = (buffer[msgId_offset]<<8)+buffer[msgId_offset+1]; - payload = buffer+payload_offset; - callback(topic,payload,len-payload_offset); - if (_client->connected()) { - buffer[0] = MQTTPUBACK; - buffer[1] = 2; - buffer[2] = (msgId >> 8); - buffer[3] = (msgId & 0xFF); - if (_client->write(buffer,4) != 0) { - lastOutActivity = t; - } - } - } else { - // No msgId - payload = buffer+payload_offset; - callback(topic,payload,len-payload_offset); - } - } - break; - } - case MQTTPINGREQ: - { - if (_client->connected()) { - buffer[0] = MQTTPINGRESP; - buffer[1] = 0; - if (_client->write(buffer,2) != 0) { - lastOutActivity = t; - } - } - break; - } - case MQTTPINGRESP: - { - pingOutstanding = false; - break; - } - default: - return false; - } - return true; -} - -boolean PubSubClient::loop() { - delay(0); - loop_read(); - if (connected()) { - unsigned long t = millis(); - // Send message at 2/3 of keepalive interval - // Wait for server-sent keep-alive till 3/2 of keepalive interval - // Just to make sure the broker will not disconnect us - const int32_t keepalive_66pct = pingOutstanding - ? keepAlive_sec * 1500 - : keepAlive_sec * 666; - if (((int32_t)(t - lastInActivity) > keepalive_66pct) || - ((int32_t)(t - lastOutActivity) > keepalive_66pct)) { - if (pingOutstanding) { - this->_state = MQTT_CONNECTION_TIMEOUT; - _client->stop(); - return false; - } else { - buffer[0] = MQTTPINGREQ; - buffer[1] = 0; - if (_client->write(buffer,2) != 0) { - lastOutActivity = t; - lastInActivity = t; - } - pingOutstanding = true; - } - } - return true; - } - return false; -} - -boolean PubSubClient::publish(const char* topic, const char* payload) { - size_t plength = (payload != nullptr) ? strlen(payload) : 0; - return publish(topic,(const uint8_t*)payload,plength,false); -} - -boolean PubSubClient::publish(const char* topic, const char* payload, boolean retained) { - size_t plength = (payload != nullptr) ? strlen(payload) : 0; - return publish(topic,(const uint8_t*)payload,plength,retained); -} - -boolean PubSubClient::publish(const char* topic, const uint8_t* payload, unsigned int plength) { - return publish(topic, payload, plength, false); -} - -boolean PubSubClient::publish(const char* topic, const uint8_t* payload, unsigned int plength, boolean retained) { - if (!beginPublish(topic, plength, retained)) { - return false; - } - for (unsigned int i=0;iwrite(buffer+(MQTT_MAX_HEADER_SIZE-hlen),length-(MQTT_MAX_HEADER_SIZE-hlen)); - if (rc > 0) { - lastOutActivity = millis(); - } - return (rc == (length-(MQTT_MAX_HEADER_SIZE-hlen))); - } - return false; -} - -int PubSubClient::endPublish() { - flushBuffer(); - return 1; -} - -size_t PubSubClient::write(uint8_t data) { - if (_client == nullptr) { - lastOutActivity = millis(); - return 0; - } - size_t rc = appendBuffer(data); - if (rc != 0) { - lastOutActivity = millis(); - } - return rc; -} - -size_t PubSubClient::write(const uint8_t *data, size_t size) { - if (_client == nullptr) { - lastOutActivity = millis(); - return 0; - } - size_t rc = appendBuffer(data,size); - if (rc != 0) { - lastOutActivity = millis(); - } - return rc; -} - -size_t PubSubClient::write(const String& message) { - return write(reinterpret_cast(message.c_str()), message.length()); -} - - -size_t PubSubClient::buildHeader(uint8_t header, uint8_t* buf, uint32_t length) { - uint8_t lenBuf[4]; - uint8_t llen = 0; - uint8_t digit; - uint8_t pos = 0; - uint32_t len = length; - do { - digit = len % 128; - len = len / 128; - if (len > 0) { - digit |= 0x80; - } - lenBuf[pos++] = digit; - llen++; - } while(len>0 && pos < 4); - - buf[4-llen] = header; - for (int i=0;i 0) && result) { - delay(0); // Prevent watchdog crashes - bytesToWrite = (bytesRemaining > MQTT_MAX_TRANSFER_SIZE)?MQTT_MAX_TRANSFER_SIZE:bytesRemaining; - rc = _client->write(writeBuf,bytesToWrite); - result = (rc == bytesToWrite); - bytesRemaining -= rc; - writeBuf += rc; - if (rc != 0) { - lastOutActivity = millis(); - } - } - return result; -#else - rc = _client->write(buf+(MQTT_MAX_HEADER_SIZE-hlen),length+hlen); - if (rc != 0) { - lastOutActivity = millis(); - } - return (rc == hlen+length); -#endif -} - -boolean PubSubClient::subscribe(const char* topic) { - return subscribe(topic, 0); -} - -boolean PubSubClient::subscribe(const char* topic, uint8_t qos) { - if (qos > 1) { - return false; - } - if (MQTT_MAX_PACKET_SIZE < 9 + strlen(topic)) { - // Too long - return false; - } - if (connected()) { - // Leave room in the buffer for header and variable length field - uint16_t length = MQTT_MAX_HEADER_SIZE; - nextMsgId++; - if (nextMsgId == 0) { - nextMsgId = 1; - } - buffer[length++] = (nextMsgId >> 8); - buffer[length++] = (nextMsgId & 0xFF); - length = writeString((char*)topic, buffer,length); - buffer[length++] = qos; - return write(MQTTSUBSCRIBE|MQTTQOS1,buffer,length-MQTT_MAX_HEADER_SIZE); - } - return false; -} - -boolean PubSubClient::unsubscribe(const char* topic) { - if (MQTT_MAX_PACKET_SIZE < 9 + strlen(topic)) { - // Too long - return false; - } - if (connected()) { - uint16_t length = MQTT_MAX_HEADER_SIZE; - nextMsgId++; - if (nextMsgId == 0) { - nextMsgId = 1; - } - buffer[length++] = (nextMsgId >> 8); - buffer[length++] = (nextMsgId & 0xFF); - length = writeString(topic, buffer,length); - return write(MQTTUNSUBSCRIBE|MQTTQOS1,buffer,length-MQTT_MAX_HEADER_SIZE); - } - return false; -} - -void PubSubClient::disconnect() { - if (_state == MQTT_DISCONNECTED || !initBuffer()) { - _state = MQTT_DISCONNECTED; - lastInActivity = lastOutActivity = millis(); - - return; - } - - buffer[0] = MQTTDISCONNECT; - buffer[1] = 0; - if (_client != nullptr) { - _client->write(buffer,2); - _client->flush(); - _client->stop(); - } - _state = MQTT_DISCONNECTED; - lastInActivity = lastOutActivity = millis(); -} - -uint16_t PubSubClient::writeString(const char* string, uint8_t* buf, uint16_t pos) { - const char* idp = string; - uint16_t i = 0; - pos += 2; - while (*idp && pos < (MQTT_MAX_PACKET_SIZE - 2)) { - buf[pos++] = *idp++; - i++; - } - buf[pos-i-2] = (i >> 8); - buf[pos-i-1] = (i & 0xFF); - return pos; -} - -size_t PubSubClient::appendBuffer(uint8_t data) { - if (!initBuffer()) { - return 0; - } - - buffer[_bufferWritePos] = data; - ++_bufferWritePos; - if (_bufferWritePos >= MQTT_MAX_PACKET_SIZE) { - if (flushBuffer() == 0) return 0; - } - return 1; -} - -size_t PubSubClient::appendBuffer(const uint8_t *data, size_t size) { - for (size_t i = 0; i < size; ++i) { - if (appendBuffer(data[i]) == 0) return i; - } - return size; -} - -size_t PubSubClient::flushBuffer() { - size_t rc = 0; - if (_bufferWritePos > 0) { - if (connected()) { - rc = _client->write(buffer, _bufferWritePos); - if (rc != 0) { - lastOutActivity = millis(); - } - } - _bufferWritePos = 0; - } - return rc; -} - -bool PubSubClient::initBuffer() -{ - constexpr size_t size = sizeof(uint8_t) * MQTT_MAX_PACKET_SIZE; - if (buffer == nullptr) { -#ifdef ESP32 - buffer = (uint8_t*) heap_caps_malloc(size, MALLOC_CAP_SPIRAM | MALLOC_CAP_8BIT); - if (buffer == nullptr) { - buffer = (uint8_t*) malloc(size); - } -#else - { -#ifdef USE_SECOND_HEAP - // Try allocating on ESP8266 2nd heap - HeapSelectIram ephemeral; -#endif - buffer = (uint8_t*) malloc(size); - if (buffer != nullptr) return true; - } -#ifdef USE_SECOND_HEAP - // Not successful, try allocating on (ESP8266) main heap - HeapSelectDram ephemeral; -#endif - buffer = (uint8_t*) malloc(size); -#endif - } - return buffer != nullptr; -} - -boolean PubSubClient::connected() { - if (_client == NULL ) { - this->_state = MQTT_DISCONNECTED; - return false; - } - if (_client->connected() == 0) { - bool lastStateConnected = this->_state == MQTT_CONNECTED; - this->disconnect(); - if (lastStateConnected) { - this->_state = MQTT_CONNECTION_LOST; - } - return false; - } - return this->_state == MQTT_CONNECTED; -} - -PubSubClient& PubSubClient::setServer(uint8_t * ip, uint16_t port) { - IPAddress addr(ip[0],ip[1],ip[2],ip[3]); - return setServer(addr,port); -} - -PubSubClient& PubSubClient::setServer(IPAddress ip, uint16_t port) { - this->ip = ip; - this->port = port; - this->domain = ""; - return *this; -} - -PubSubClient& PubSubClient::setServer(const char * domain, uint16_t port) { - this->domain = domain; - this->port = port; - return *this; -} - -PubSubClient& PubSubClient::setCallback(MQTT_CALLBACK_SIGNATURE) { - this->callback = callback; - return *this; -} - -PubSubClient& PubSubClient::setClient(Client& client){ - this->_client = &client; - return *this; -} - -PubSubClient& PubSubClient::setStream(Stream& stream){ - this->stream = &stream; - return *this; -} - -int PubSubClient::state() { - return this->_state; -} - -PubSubClient& PubSubClient::setKeepAlive(uint16_t keepAlive_sec) { - this->keepAlive_sec = keepAlive_sec; - return *this; -} - -PubSubClient& PubSubClient::setSocketTimeout(uint16_t timeout_ms) { - this->socketTimeout_msec = timeout_ms; - return *this; -} \ No newline at end of file diff --git a/lib/pubsubclient/src/PubSubClient.h b/lib/pubsubclient/src/PubSubClient.h deleted file mode 100644 index 4a59af578..000000000 --- a/lib/pubsubclient/src/PubSubClient.h +++ /dev/null @@ -1,205 +0,0 @@ -/* - PubSubClient.h - A simple client for MQTT. - Nick O'Leary - http://knolleary.net -*/ - -#ifndef PubSubClient_h -#define PubSubClient_h - -#include -#include "IPAddress.h" -#include "Client.h" -#include "Stream.h" - -#define MQTT_VERSION_3_1 3 -#define MQTT_VERSION_3_1_1 4 - -// MQTT_VERSION : Pick the version -//#define MQTT_VERSION MQTT_VERSION_3_1 -#ifndef MQTT_VERSION -#define MQTT_VERSION MQTT_VERSION_3_1_1 -#endif - -// MQTT_MAX_PACKET_SIZE : Maximum packet size -#ifndef MQTT_MAX_PACKET_SIZE - // need to fix this here, because this define cannot be overruled within the Arduino sketch... - #define MQTT_MAX_PACKET_SIZE 1024 -#endif - -// MQTT_KEEPALIVE : keepAlive interval in Seconds -// Keepalive timeout for default MQTT Broker is 10s -#ifndef MQTT_KEEPALIVE -#define MQTT_KEEPALIVE 10 -#endif - -// MQTT_SOCKET_TIMEOUT: socket timeout interval in Seconds -#ifndef MQTT_SOCKET_TIMEOUT -#define MQTT_SOCKET_TIMEOUT 15 -#endif - -// ESP32_CONNECTION_TIMEOUT : Specific case for ESP32, we need to manually provide timeout as default (-1) leads to WDT reset (after 5 seconds). -// By default (4500 milliseconds) 4,5 seconds to avoid reaching 5s default watchdog reset time. -// This is multiplied in WiFiClient.cpp (part of arduino-esp32) by 1000 inside [WiFiClient::connect] method. -// ESP8266 Arduino framework in contrast has fixed 5000ms timeout. No need to define it manually here. -// See: https://github.com/knolleary/pubsubclient/pull/842 -#ifndef ESP32_CONNECTION_TIMEOUT -#define ESP32_CONNECTION_TIMEOUT 4500 -#endif - -// MQTT_MAX_TRANSFER_SIZE : limit how much data is passed to the network client -// in each write call. Needed for the Arduino Wifi Shield. Leave undefined to -// pass the entire MQTT packet in each write call. -//#define MQTT_MAX_TRANSFER_SIZE 80 - -// Possible values for client.state() -#define MQTT_CONNECTION_TIMEOUT -4 -#define MQTT_CONNECTION_LOST -3 -#define MQTT_CONNECT_FAILED -2 -#define MQTT_DISCONNECTED -1 -#define MQTT_CONNECTED 0 -#define MQTT_CONNECT_BAD_PROTOCOL 1 -#define MQTT_CONNECT_BAD_CLIENT_ID 2 -#define MQTT_CONNECT_UNAVAILABLE 3 -#define MQTT_CONNECT_BAD_CREDENTIALS 4 -#define MQTT_CONNECT_UNAUTHORIZED 5 - -#define MQTTCONNECT 1 << 4 // Client request to connect to Server -#define MQTTCONNACK 2 << 4 // Connect Acknowledgment -#define MQTTPUBLISH 3 << 4 // Publish message -#define MQTTPUBACK 4 << 4 // Publish Acknowledgment -#define MQTTPUBREC 5 << 4 // Publish Received (assured delivery part 1) -#define MQTTPUBREL 6 << 4 // Publish Release (assured delivery part 2) -#define MQTTPUBCOMP 7 << 4 // Publish Complete (assured delivery part 3) -#define MQTTSUBSCRIBE 8 << 4 // Client Subscribe request -#define MQTTSUBACK 9 << 4 // Subscribe Acknowledgment -#define MQTTUNSUBSCRIBE 10 << 4 // Client Unsubscribe request -#define MQTTUNSUBACK 11 << 4 // Unsubscribe Acknowledgment -#define MQTTPINGREQ 12 << 4 // PING Request -#define MQTTPINGRESP 13 << 4 // PING Response -#define MQTTDISCONNECT 14 << 4 // Client is Disconnecting -#define MQTTReserved 15 << 4 // Reserved - -#define MQTTQOS0 (0 << 1) -#define MQTTQOS1 (1 << 1) -#define MQTTQOS2 (2 << 1) - -// Maximum size of fixed header and variable length size header -#define MQTT_MAX_HEADER_SIZE 5 - -#if defined(ESP8266) || defined(ESP32) -#include -#define MQTT_CALLBACK_SIGNATURE std::function callback -#else -#define MQTT_CALLBACK_SIGNATURE void (*callback)(char*, uint8_t*, unsigned int) -#endif - -#define CHECK_STRING_LENGTH(l,s) if (l+2+strlen(s) > MQTT_MAX_PACKET_SIZE) {_client->stop();return false;} - -class PubSubClient : public Print { -private: - Client* _client; - uint8_t *buffer = nullptr; - uint16_t nextMsgId = 0; - unsigned long lastOutActivity = 0; - unsigned long lastInActivity = 0; - bool pingOutstanding = false; - MQTT_CALLBACK_SIGNATURE; - // Try to read from the client whatever is available. - bool loop_read(); - uint16_t readPacket(uint8_t*); - boolean readByte(uint8_t * result); - boolean readByte(uint8_t * result, uint16_t * index); - boolean write(uint8_t header, uint8_t* buf, uint32_t length); - uint16_t writeString(const char* string, uint8_t* buf, uint16_t pos); - // Build up the header ready to send - // Returns the size of the header - // Note: the header is built at the end of the first MQTT_MAX_HEADER_SIZE bytes, so will start - // (MQTT_MAX_HEADER_SIZE - ) bytes into the buffer - size_t buildHeader(uint8_t header, uint8_t* buf, uint32_t length); - - // Add to buffer and flush if full (only to be used with beginPublish/endPublish) - size_t appendBuffer(uint8_t data); - size_t appendBuffer(const uint8_t *data, size_t size); - size_t flushBuffer(); - - bool initBuffer(); - - IPAddress ip; - String domain; - uint16_t port = 0; - Stream* stream; - int _state = MQTT_DISCONNECTED; - int _bufferWritePos = 0; - int16_t keepAlive_sec = MQTT_KEEPALIVE; - int16_t socketTimeout_msec = MQTT_SOCKET_TIMEOUT*1000; -public: - PubSubClient(); - PubSubClient(Client& client); - PubSubClient(IPAddress, uint16_t, Client& client); - PubSubClient(IPAddress, uint16_t, Client& client, Stream&); - PubSubClient(IPAddress, uint16_t, MQTT_CALLBACK_SIGNATURE,Client& client); - PubSubClient(IPAddress, uint16_t, MQTT_CALLBACK_SIGNATURE,Client& client, Stream&); - PubSubClient(uint8_t *, uint16_t, Client& client); - PubSubClient(uint8_t *, uint16_t, Client& client, Stream&); - PubSubClient(uint8_t *, uint16_t, MQTT_CALLBACK_SIGNATURE,Client& client); - PubSubClient(uint8_t *, uint16_t, MQTT_CALLBACK_SIGNATURE,Client& client, Stream&); - PubSubClient(const char*, uint16_t, Client& client); - PubSubClient(const char*, uint16_t, Client& client, Stream&); - PubSubClient(const char*, uint16_t, MQTT_CALLBACK_SIGNATURE,Client& client); - PubSubClient(const char*, uint16_t, MQTT_CALLBACK_SIGNATURE,Client& client, Stream&); - virtual ~PubSubClient(); - - PubSubClient& setServer(IPAddress ip, uint16_t port); - PubSubClient& setServer(uint8_t * ip, uint16_t port); - PubSubClient& setServer(const char * domain, uint16_t port); - PubSubClient& setCallback(MQTT_CALLBACK_SIGNATURE); - PubSubClient& setClient(Client& client); - PubSubClient& setStream(Stream& stream); - - boolean connect(const char* id); - boolean connect(const char* id, const char* user, const char* pass); - boolean connect(const char* id, const char* willTopic, uint8_t willQos, boolean willRetain, const char* willMessage); - boolean connect(const char* id, const char* user, const char* pass, const char* willTopic, uint8_t willQos, boolean willRetain, const char* willMessage); - boolean connect(const char* id, const char* user, const char* pass, const char* willTopic, uint8_t willQos, boolean willRetain, const char* willMessage, boolean cleanSession); - void disconnect(); - boolean publish(const char* topic, const char* payload); - boolean publish(const char* topic, const char* payload, boolean retained); - boolean publish(const char* topic, const uint8_t * payload, unsigned int plength); - boolean publish(const char* topic, const uint8_t * payload, unsigned int plength, boolean retained); - boolean publish_P(const char* topic, const char* payload, boolean retained); - boolean publish_P(const char* topic, const uint8_t * payload, unsigned int plength, boolean retained); - // Start to publish a message. - // This API: - // beginPublish(...) - // one or more calls to write(...) - // endPublish() - // Allows for arbitrarily large payloads to be sent without them having to be copied into - // a new buffer and held in memory at one time - // Returns 1 if the message was started successfully, 0 if there was an error - boolean beginPublish(const char* topic, unsigned int plength, boolean retained); - // Finish off this publish message (started with beginPublish) - // Returns 1 if the packet was sent successfully, 0 if there was an error - int endPublish(); - // Write a single byte of payload (only to be used with beginPublish/endPublish) - virtual size_t write(uint8_t); - // Write size bytes from buffer into the payload (only to be used with beginPublish/endPublish) - // Returns the number of bytes written - virtual size_t write(const uint8_t *buffer, size_t size); - // Write string into the payload (only to be used with beginPublish/endPublish) - size_t write(const String& message); - - - boolean subscribe(const char* topic); - boolean subscribe(const char* topic, uint8_t qos); - boolean unsubscribe(const char* topic); - boolean loop(); - boolean connected(); - int state(); - - PubSubClient& setKeepAlive(uint16_t keepAlive_sec); - PubSubClient& setSocketTimeout(uint16_t timeout_ms); -}; - - -#endif diff --git a/lib/pubsubclient/tests/src/connect_spec.cpp b/lib/pubsubclient/tests/src/connect_spec.cpp deleted file mode 100644 index e27a1f59f..000000000 --- a/lib/pubsubclient/tests/src/connect_spec.cpp +++ /dev/null @@ -1,302 +0,0 @@ -#include "PubSubClient.h" -#include "ShimClient.h" -#include "Buffer.h" -#include "BDDTest.h" -#include "trace.h" - - -byte server[] = { 172, 16, 0, 2 }; - -void callback(char* topic, byte* payload, unsigned int length) { - // handle message arrived -} - - -int test_connect_fails_no_network() { - IT("fails to connect if underlying client doesn't connect"); - ShimClient shimClient; - shimClient.setAllowConnect(false); - PubSubClient client(server, 1883, callback, shimClient); - int rc = client.connect((char*)"client_test1"); - IS_FALSE(rc); - int state = client.state(); - IS_TRUE(state == MQTT_CONNECT_FAILED); - END_IT -} - -int test_connect_fails_on_no_response() { - IT("fails to connect if no response received after 15 seconds"); - ShimClient shimClient; - shimClient.setAllowConnect(true); - PubSubClient client(server, 1883, callback, shimClient); - int rc = client.connect((char*)"client_test1"); - IS_FALSE(rc); - int state = client.state(); - IS_TRUE(state == MQTT_CONNECTION_TIMEOUT); - END_IT -} - -int test_connect_properly_formatted() { - IT("sends a properly formatted connect packet and succeeds"); - ShimClient shimClient; - - shimClient.setAllowConnect(true); - byte expectServer[] = { 172, 16, 0, 2 }; - shimClient.expectConnect(expectServer,1883); - byte connect[] = {0x10,0x18,0x0,0x4,0x4d,0x51,0x54,0x54,0x4,0x2,0x0,0xf,0x0,0xc,0x63,0x6c,0x69,0x65,0x6e,0x74,0x5f,0x74,0x65,0x73,0x74,0x31}; - byte connack[] = { 0x20, 0x02, 0x00, 0x00 }; - - shimClient.expect(connect,26); - shimClient.respond(connack,4); - - PubSubClient client(server, 1883, callback, shimClient); - int state = client.state(); - IS_TRUE(state == MQTT_DISCONNECTED); - - int rc = client.connect((char*)"client_test1"); - IS_TRUE(rc); - IS_FALSE(shimClient.error()); - - state = client.state(); - IS_TRUE(state == MQTT_CONNECTED); - - END_IT -} - -int test_connect_properly_formatted_hostname() { - IT("accepts a hostname"); - ShimClient shimClient; - - shimClient.setAllowConnect(true); - shimClient.expectConnect((char* const)"localhost",1883); - byte connack[] = { 0x20, 0x02, 0x00, 0x00 }; - shimClient.respond(connack,4); - - PubSubClient client((char* const)"localhost", 1883, callback, shimClient); - int rc = client.connect((char*)"client_test1"); - IS_TRUE(rc); - IS_FALSE(shimClient.error()); - - END_IT -} - - -int test_connect_fails_on_bad_rc() { - IT("fails to connect if a bad return code is received"); - ShimClient shimClient; - shimClient.setAllowConnect(true); - byte connack[] = { 0x20, 0x02, 0x00, 0x01 }; - shimClient.respond(connack,4); - - PubSubClient client(server, 1883, callback, shimClient); - int rc = client.connect((char*)"client_test1"); - IS_FALSE(rc); - - int state = client.state(); - IS_TRUE(state == 0x01); - - END_IT -} - -int test_connect_non_clean_session() { - IT("sends a properly formatted non-clean session connect packet and succeeds"); - ShimClient shimClient; - - shimClient.setAllowConnect(true); - byte expectServer[] = { 172, 16, 0, 2 }; - shimClient.expectConnect(expectServer,1883); - byte connect[] = {0x10,0x18,0x0,0x4,0x4d,0x51,0x54,0x54,0x4,0x0,0x0,0xf,0x0,0xc,0x63,0x6c,0x69,0x65,0x6e,0x74,0x5f,0x74,0x65,0x73,0x74,0x31}; - byte connack[] = { 0x20, 0x02, 0x00, 0x00 }; - - shimClient.expect(connect,26); - shimClient.respond(connack,4); - - PubSubClient client(server, 1883, callback, shimClient); - int state = client.state(); - IS_TRUE(state == MQTT_DISCONNECTED); - - int rc = client.connect((char*)"client_test1",0,0,0,0,0,0,0); - IS_TRUE(rc); - IS_FALSE(shimClient.error()); - - state = client.state(); - IS_TRUE(state == MQTT_CONNECTED); - - END_IT -} - -int test_connect_accepts_username_password() { - IT("accepts a username and password"); - ShimClient shimClient; - shimClient.setAllowConnect(true); - - byte connect[] = { 0x10,0x24,0x0,0x4,0x4d,0x51,0x54,0x54,0x4,0xc2,0x0,0xf,0x0,0xc,0x63,0x6c,0x69,0x65,0x6e,0x74,0x5f,0x74,0x65,0x73,0x74,0x31,0x0,0x4,0x75,0x73,0x65,0x72,0x0,0x4,0x70,0x61,0x73,0x73}; - byte connack[] = { 0x20, 0x02, 0x00, 0x00 }; - shimClient.expect(connect,0x26); - shimClient.respond(connack,4); - - PubSubClient client(server, 1883, callback, shimClient); - int rc = client.connect((char*)"client_test1",(char*)"user",(char*)"pass"); - IS_TRUE(rc); - IS_FALSE(shimClient.error()); - - END_IT -} - -int test_connect_accepts_username_no_password() { - IT("accepts a username but no password"); - ShimClient shimClient; - shimClient.setAllowConnect(true); - - byte connect[] = { 0x10,0x1e,0x0,0x4,0x4d,0x51,0x54,0x54,0x4,0x82,0x0,0xf,0x0,0xc,0x63,0x6c,0x69,0x65,0x6e,0x74,0x5f,0x74,0x65,0x73,0x74,0x31,0x0,0x4,0x75,0x73,0x65,0x72}; - byte connack[] = { 0x20, 0x02, 0x00, 0x00 }; - shimClient.expect(connect,0x20); - shimClient.respond(connack,4); - - PubSubClient client(server, 1883, callback, shimClient); - int rc = client.connect((char*)"client_test1",(char*)"user",0); - IS_TRUE(rc); - IS_FALSE(shimClient.error()); - - END_IT -} -int test_connect_accepts_username_blank_password() { - IT("accepts a username and blank password"); - ShimClient shimClient; - shimClient.setAllowConnect(true); - - byte connect[] = { 0x10,0x20,0x0,0x4,0x4d,0x51,0x54,0x54,0x4,0xc2,0x0,0xf,0x0,0xc,0x63,0x6c,0x69,0x65,0x6e,0x74,0x5f,0x74,0x65,0x73,0x74,0x31,0x0,0x4,0x75,0x73,0x65,0x72,0x0,0x0}; - byte connack[] = { 0x20, 0x02, 0x00, 0x00 }; - shimClient.expect(connect,0x26); - shimClient.respond(connack,4); - - PubSubClient client(server, 1883, callback, shimClient); - int rc = client.connect((char*)"client_test1",(char*)"user",(char*)"pass"); - IS_TRUE(rc); - IS_FALSE(shimClient.error()); - - END_IT -} - -int test_connect_ignores_password_no_username() { - IT("ignores a password but no username"); - ShimClient shimClient; - shimClient.setAllowConnect(true); - - byte connect[] = {0x10,0x18,0x0,0x4,0x4d,0x51,0x54,0x54,0x4,0x2,0x0,0xf,0x0,0xc,0x63,0x6c,0x69,0x65,0x6e,0x74,0x5f,0x74,0x65,0x73,0x74,0x31}; - byte connack[] = { 0x20, 0x02, 0x00, 0x00 }; - shimClient.expect(connect,26); - shimClient.respond(connack,4); - - PubSubClient client(server, 1883, callback, shimClient); - int rc = client.connect((char*)"client_test1",0,(char*)"pass"); - IS_TRUE(rc); - IS_FALSE(shimClient.error()); - - END_IT -} - -int test_connect_with_will() { - IT("accepts a will"); - ShimClient shimClient; - shimClient.setAllowConnect(true); - - byte connect[] = {0x10,0x30,0x0,0x4,0x4d,0x51,0x54,0x54,0x4,0xe,0x0,0xf,0x0,0xc,0x63,0x6c,0x69,0x65,0x6e,0x74,0x5f,0x74,0x65,0x73,0x74,0x31,0x0,0x9,0x77,0x69,0x6c,0x6c,0x54,0x6f,0x70,0x69,0x63,0x0,0xb,0x77,0x69,0x6c,0x6c,0x4d,0x65,0x73,0x73,0x61,0x67,0x65}; - byte connack[] = { 0x20, 0x02, 0x00, 0x00 }; - shimClient.expect(connect,0x32); - shimClient.respond(connack,4); - - PubSubClient client(server, 1883, callback, shimClient); - int rc = client.connect((char*)"client_test1",(char*)"willTopic",1,0,(char*)"willMessage"); - IS_TRUE(rc); - IS_FALSE(shimClient.error()); - - END_IT -} - -int test_connect_with_will_username_password() { - IT("accepts a will, username and password"); - ShimClient shimClient; - shimClient.setAllowConnect(true); - - byte connect[] = {0x10,0x40,0x0,0x4,0x4d,0x51,0x54,0x54,0x4,0xce,0x0,0xf,0x0,0xc,0x63,0x6c,0x69,0x65,0x6e,0x74,0x5f,0x74,0x65,0x73,0x74,0x31,0x0,0x9,0x77,0x69,0x6c,0x6c,0x54,0x6f,0x70,0x69,0x63,0x0,0xb,0x77,0x69,0x6c,0x6c,0x4d,0x65,0x73,0x73,0x61,0x67,0x65,0x0,0x4,0x75,0x73,0x65,0x72,0x0,0x8,0x70,0x61,0x73,0x73,0x77,0x6f,0x72,0x64}; - byte connack[] = { 0x20, 0x02, 0x00, 0x00 }; - shimClient.expect(connect,0x42); - shimClient.respond(connack,4); - - PubSubClient client(server, 1883, callback, shimClient); - int rc = client.connect((char*)"client_test1",(char*)"user",(char*)"password",(char*)"willTopic",1,0,(char*)"willMessage"); - IS_TRUE(rc); - IS_FALSE(shimClient.error()); - - END_IT -} - -int test_connect_disconnect_connect() { - IT("connects, disconnects and connects again"); - ShimClient shimClient; - - shimClient.setAllowConnect(true); - byte expectServer[] = { 172, 16, 0, 2 }; - shimClient.expectConnect(expectServer,1883); - byte connect[] = {0x10,0x18,0x0,0x4,0x4d,0x51,0x54,0x54,0x4,0x2,0x0,0xf,0x0,0xc,0x63,0x6c,0x69,0x65,0x6e,0x74,0x5f,0x74,0x65,0x73,0x74,0x31}; - byte connack[] = { 0x20, 0x02, 0x00, 0x00 }; - - shimClient.expect(connect,26); - shimClient.respond(connack,4); - - PubSubClient client(server, 1883, callback, shimClient); - - int state = client.state(); - IS_TRUE(state == MQTT_DISCONNECTED); - - int rc = client.connect((char*)"client_test1"); - IS_TRUE(rc); - IS_FALSE(shimClient.error()); - - state = client.state(); - IS_TRUE(state == MQTT_CONNECTED); - - byte disconnect[] = {0xE0,0x00}; - shimClient.expect(disconnect,2); - - client.disconnect(); - - IS_FALSE(client.connected()); - IS_FALSE(shimClient.connected()); - IS_FALSE(shimClient.error()); - - state = client.state(); - IS_TRUE(state == MQTT_DISCONNECTED); - - shimClient.expect(connect,28); - shimClient.respond(connack,4); - rc = client.connect((char*)"client_test1"); - IS_TRUE(rc); - IS_FALSE(shimClient.error()); - state = client.state(); - IS_TRUE(state == MQTT_CONNECTED); - - END_IT -} - -int main() -{ - SUITE("Connect"); - - test_connect_fails_no_network(); - test_connect_fails_on_no_response(); - - test_connect_properly_formatted(); - test_connect_non_clean_session(); - test_connect_accepts_username_password(); - test_connect_fails_on_bad_rc(); - test_connect_properly_formatted_hostname(); - - test_connect_accepts_username_no_password(); - test_connect_ignores_password_no_username(); - test_connect_with_will(); - test_connect_with_will_username_password(); - test_connect_disconnect_connect(); - FINISH -} diff --git a/lib/pubsubclient/tests/src/lib/Arduino.h b/lib/pubsubclient/tests/src/lib/Arduino.h deleted file mode 100644 index 2a00f24bc..000000000 --- a/lib/pubsubclient/tests/src/lib/Arduino.h +++ /dev/null @@ -1,26 +0,0 @@ -#ifndef Arduino_h -#define Arduino_h - -#include -#include -#include -#include -#include "Print.h" - - -extern "C"{ - typedef uint8_t byte ; - typedef uint8_t boolean ; - - /* sketch */ - extern void setup( void ) ; - extern void loop( void ) ; - uint32_t millis( void ); -} - -#define PROGMEM -#define pgm_read_byte_near(x) *(x) - -#define yield(x) {} - -#endif // Arduino_h diff --git a/lib/pubsubclient/tests/src/lib/Client.h b/lib/pubsubclient/tests/src/lib/Client.h deleted file mode 100644 index 9e18c0764..000000000 --- a/lib/pubsubclient/tests/src/lib/Client.h +++ /dev/null @@ -1,21 +0,0 @@ -#ifndef client_h -#define client_h -#include "IPAddress.h" - -class Client { -public: - virtual int connect(IPAddress ip, uint16_t port) =0; - virtual int connect(const char *host, uint16_t port) =0; - virtual size_t write(uint8_t) =0; - virtual size_t write(const uint8_t *buf, size_t size) =0; - virtual int available() = 0; - virtual int read() = 0; - virtual int read(uint8_t *buf, size_t size) = 0; - virtual int peek() = 0; - virtual void flush() = 0; - virtual void stop() = 0; - virtual uint8_t connected() = 0; - virtual operator bool() = 0; -}; - -#endif diff --git a/lib/pubsubclient/tests/src/lib/ShimClient.h b/lib/pubsubclient/tests/src/lib/ShimClient.h deleted file mode 100644 index 2e3f874fc..000000000 --- a/lib/pubsubclient/tests/src/lib/ShimClient.h +++ /dev/null @@ -1,51 +0,0 @@ -#ifndef shimclient_h -#define shimclient_h - -#include "Arduino.h" -#include "Client.h" -#include "IPAddress.h" -#include "Buffer.h" - - -class ShimClient : public Client { -private: - Buffer* responseBuffer; - Buffer* expectBuffer; - bool _allowConnect; - bool _connected; - bool expectAnything; - bool _error; - uint16_t _received; - IPAddress _expectedIP; - uint16_t _expectedPort; - const char* _expectedHost; - -public: - ShimClient(); - virtual int connect(IPAddress ip, uint16_t port); - virtual int connect(const char *host, uint16_t port); - virtual size_t write(uint8_t); - virtual size_t write(const uint8_t *buf, size_t size); - virtual int available(); - virtual int read(); - virtual int read(uint8_t *buf, size_t size); - virtual int peek(); - virtual void flush(); - virtual void stop(); - virtual uint8_t connected(); - virtual operator bool(); - - virtual ShimClient* respond(uint8_t *buf, size_t size); - virtual ShimClient* expect(uint8_t *buf, size_t size); - - virtual void expectConnect(IPAddress ip, uint16_t port); - virtual void expectConnect(const char *host, uint16_t port); - - virtual uint16_t received(); - virtual bool error(); - - virtual void setAllowConnect(bool b); - virtual void setConnected(bool b); -}; - -#endif diff --git a/lib/pubsubclient/tests/src/publish_spec.cpp b/lib/pubsubclient/tests/src/publish_spec.cpp deleted file mode 100644 index 232df0d37..000000000 --- a/lib/pubsubclient/tests/src/publish_spec.cpp +++ /dev/null @@ -1,190 +0,0 @@ -#include "PubSubClient.h" -#include "ShimClient.h" -#include "Buffer.h" -#include "BDDTest.h" -#include "trace.h" - - -byte server[] = { 172, 16, 0, 2 }; - -void callback(char* topic, byte* payload, unsigned int length) { - // handle message arrived -} - -int test_publish() { - IT("publishes a null-terminated string"); - ShimClient shimClient; - shimClient.setAllowConnect(true); - - byte connack[] = { 0x20, 0x02, 0x00, 0x00 }; - shimClient.respond(connack,4); - - PubSubClient client(server, 1883, callback, shimClient); - int rc = client.connect((char*)"client_test1"); - IS_TRUE(rc); - - byte publish[] = {0x30,0xe,0x0,0x5,0x74,0x6f,0x70,0x69,0x63,0x70,0x61,0x79,0x6c,0x6f,0x61,0x64}; - shimClient.expect(publish,16); - - rc = client.publish((char*)"topic",(char*)"payload"); - IS_TRUE(rc); - - IS_FALSE(shimClient.error()); - - END_IT -} - - -int test_publish_bytes() { - IT("publishes a byte array"); - ShimClient shimClient; - shimClient.setAllowConnect(true); - - byte payload[] = { 0x01,0x02,0x03,0x0,0x05 }; - int length = 5; - - byte connack[] = { 0x20, 0x02, 0x00, 0x00 }; - shimClient.respond(connack,4); - - PubSubClient client(server, 1883, callback, shimClient); - int rc = client.connect((char*)"client_test1"); - IS_TRUE(rc); - - byte publish[] = {0x30,0xc,0x0,0x5,0x74,0x6f,0x70,0x69,0x63,0x1,0x2,0x3,0x0,0x5}; - shimClient.expect(publish,14); - - rc = client.publish((char*)"topic",payload,length); - IS_TRUE(rc); - - IS_FALSE(shimClient.error()); - - END_IT -} - - -int test_publish_retained() { - IT("publishes retained - 1"); - ShimClient shimClient; - shimClient.setAllowConnect(true); - - byte payload[] = { 0x01,0x02,0x03,0x0,0x05 }; - int length = 5; - - byte connack[] = { 0x20, 0x02, 0x00, 0x00 }; - shimClient.respond(connack,4); - - PubSubClient client(server, 1883, callback, shimClient); - int rc = client.connect((char*)"client_test1"); - IS_TRUE(rc); - - byte publish[] = {0x31,0xc,0x0,0x5,0x74,0x6f,0x70,0x69,0x63,0x1,0x2,0x3,0x0,0x5}; - shimClient.expect(publish,14); - - rc = client.publish((char*)"topic",payload,length,true); - IS_TRUE(rc); - - IS_FALSE(shimClient.error()); - - END_IT -} - -int test_publish_retained_2() { - IT("publishes retained - 2"); - ShimClient shimClient; - shimClient.setAllowConnect(true); - - byte connack[] = { 0x20, 0x02, 0x00, 0x00 }; - shimClient.respond(connack,4); - - PubSubClient client(server, 1883, callback, shimClient); - int rc = client.connect((char*)"client_test1"); - IS_TRUE(rc); - - byte publish[] = {0x31,0xc,0x0,0x5,0x74,0x6f,0x70,0x69,0x63,'A','B','C','D','E'}; - shimClient.expect(publish,14); - - rc = client.publish((char*)"topic",(char*)"ABCDE",true); - IS_TRUE(rc); - - IS_FALSE(shimClient.error()); - - END_IT -} - -int test_publish_not_connected() { - IT("publish fails when not connected"); - ShimClient shimClient; - - PubSubClient client(server, 1883, callback, shimClient); - - int rc = client.publish((char*)"topic",(char*)"payload"); - IS_FALSE(rc); - - IS_FALSE(shimClient.error()); - - END_IT -} - -int test_publish_too_long() { - IT("publish fails when topic/payload are too long"); - ShimClient shimClient; - shimClient.setAllowConnect(true); - - byte connack[] = { 0x20, 0x02, 0x00, 0x00 }; - shimClient.respond(connack,4); - - PubSubClient client(server, 1883, callback, shimClient); - int rc = client.connect((char*)"client_test1"); - IS_TRUE(rc); - - // 0 1 2 3 4 5 6 7 8 9 0 1 2 - rc = client.publish((char*)"topic",(char*)"123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890"); - IS_FALSE(rc); - - IS_FALSE(shimClient.error()); - - END_IT -} - -int test_publish_P() { - IT("publishes using PROGMEM"); - ShimClient shimClient; - shimClient.setAllowConnect(true); - - byte payload[] = { 0x01,0x02,0x03,0x0,0x05 }; - int length = 5; - - byte connack[] = { 0x20, 0x02, 0x00, 0x00 }; - shimClient.respond(connack,4); - - PubSubClient client(server, 1883, callback, shimClient); - int rc = client.connect((char*)"client_test1"); - IS_TRUE(rc); - - byte publish[] = {0x31,0xc,0x0,0x5,0x74,0x6f,0x70,0x69,0x63,0x1,0x2,0x3,0x0,0x5}; - shimClient.expect(publish,14); - - rc = client.publish_P((char*)"topic",payload,length,true); - IS_TRUE(rc); - - IS_FALSE(shimClient.error()); - - END_IT -} - - - - -int main() -{ - SUITE("Publish"); - test_publish(); - test_publish_bytes(); - test_publish_retained(); - test_publish_retained_2(); - test_publish_not_connected(); - test_publish_too_long(); - test_publish_P(); - - FINISH -} diff --git a/lib/pubsubclient/tests/src/receive_spec.cpp b/lib/pubsubclient/tests/src/receive_spec.cpp deleted file mode 100644 index 9a18af042..000000000 --- a/lib/pubsubclient/tests/src/receive_spec.cpp +++ /dev/null @@ -1,279 +0,0 @@ -#include "PubSubClient.h" -#include "ShimClient.h" -#include "Buffer.h" -#include "BDDTest.h" -#include "trace.h" - - -byte server[] = { 172, 16, 0, 2 }; - -bool callback_called = false; -char lastTopic[1024]; -char lastPayload[1024]; -unsigned int lastLength; - -void reset_callback() { - callback_called = false; - lastTopic[0] = '\0'; - lastPayload[0] = '\0'; - lastLength = 0; -} - -void callback(char* topic, byte* payload, unsigned int length) { - callback_called = true; - strcpy(lastTopic,topic); - memcpy(lastPayload,payload,length); - lastLength = length; -} - -int test_receive_callback() { - IT("receives a callback message"); - reset_callback(); - - ShimClient shimClient; - shimClient.setAllowConnect(true); - - byte connack[] = { 0x20, 0x02, 0x00, 0x00 }; - shimClient.respond(connack,4); - - PubSubClient client(server, 1883, callback, shimClient); - int rc = client.connect((char*)"client_test1"); - IS_TRUE(rc); - - byte publish[] = {0x30,0xe,0x0,0x5,0x74,0x6f,0x70,0x69,0x63,0x70,0x61,0x79,0x6c,0x6f,0x61,0x64}; - shimClient.respond(publish,16); - - rc = client.loop(); - - IS_TRUE(rc); - - IS_TRUE(callback_called); - IS_TRUE(strcmp(lastTopic,"topic")==0); - IS_TRUE(memcmp(lastPayload,"payload",7)==0); - IS_TRUE(lastLength == 7); - - IS_FALSE(shimClient.error()); - - END_IT -} - -int test_receive_stream() { - IT("receives a streamed callback message"); - reset_callback(); - - Stream stream; - stream.expect((uint8_t*)"payload",7); - - ShimClient shimClient; - shimClient.setAllowConnect(true); - - byte connack[] = { 0x20, 0x02, 0x00, 0x00 }; - shimClient.respond(connack,4); - - PubSubClient client(server, 1883, callback, shimClient, stream); - int rc = client.connect((char*)"client_test1"); - IS_TRUE(rc); - - byte publish[] = {0x30,0xe,0x0,0x5,0x74,0x6f,0x70,0x69,0x63,0x70,0x61,0x79,0x6c,0x6f,0x61,0x64}; - shimClient.respond(publish,16); - - rc = client.loop(); - - IS_TRUE(rc); - - IS_TRUE(callback_called); - IS_TRUE(strcmp(lastTopic,"topic")==0); - IS_TRUE(lastLength == 7); - - IS_FALSE(stream.error()); - IS_FALSE(shimClient.error()); - - END_IT -} - -int test_receive_max_sized_message() { - IT("receives an max-sized message"); - reset_callback(); - - ShimClient shimClient; - shimClient.setAllowConnect(true); - - byte connack[] = { 0x20, 0x02, 0x00, 0x00 }; - shimClient.respond(connack,4); - - PubSubClient client(server, 1883, callback, shimClient); - int rc = client.connect((char*)"client_test1"); - IS_TRUE(rc); - - int length = MQTT_MAX_PACKET_SIZE; - byte publish[] = {0x30,length-2,0x0,0x5,0x74,0x6f,0x70,0x69,0x63,0x70,0x61,0x79,0x6c,0x6f,0x61,0x64}; - byte bigPublish[length]; - memset(bigPublish,'A',length); - bigPublish[length] = 'B'; - memcpy(bigPublish,publish,16); - shimClient.respond(bigPublish,length); - - rc = client.loop(); - - IS_TRUE(rc); - - IS_TRUE(callback_called); - IS_TRUE(strcmp(lastTopic,"topic")==0); - IS_TRUE(lastLength == length-9); - IS_TRUE(memcmp(lastPayload,bigPublish+9,lastLength)==0); - - IS_FALSE(shimClient.error()); - - END_IT -} - -int test_receive_oversized_message() { - IT("drops an oversized message"); - reset_callback(); - - ShimClient shimClient; - shimClient.setAllowConnect(true); - - byte connack[] = { 0x20, 0x02, 0x00, 0x00 }; - shimClient.respond(connack,4); - - PubSubClient client(server, 1883, callback, shimClient); - int rc = client.connect((char*)"client_test1"); - IS_TRUE(rc); - - int length = MQTT_MAX_PACKET_SIZE+1; - byte publish[] = {0x30,length-2,0x0,0x5,0x74,0x6f,0x70,0x69,0x63,0x70,0x61,0x79,0x6c,0x6f,0x61,0x64}; - byte bigPublish[length]; - memset(bigPublish,'A',length); - bigPublish[length] = 'B'; - memcpy(bigPublish,publish,16); - shimClient.respond(bigPublish,length); - - rc = client.loop(); - - IS_TRUE(rc); - - IS_FALSE(callback_called); - - IS_FALSE(shimClient.error()); - - END_IT -} - -int test_drop_invalid_remaining_length_message() { - IT("drops invalid remaining length message"); - reset_callback(); - - ShimClient shimClient; - shimClient.setAllowConnect(true); - - byte connack[] = { 0x20, 0x02, 0x00, 0x00 }; - shimClient.respond(connack,4); - - PubSubClient client(server, 1883, callback, shimClient); - int rc = client.connect((char*)"client_test1"); - IS_TRUE(rc); - - byte publish[] = {0x30,0x92,0x92,0x92,0x92,0x01,0x0,0x5,0x74,0x6f,0x70,0x69,0x63,0x70,0x61,0x79,0x6c,0x6f,0x61,0x64}; - shimClient.respond(publish,20); - - rc = client.loop(); - - IS_FALSE(rc); - - IS_FALSE(callback_called); - - IS_FALSE(shimClient.error()); - - END_IT -} - - -int test_receive_oversized_stream_message() { - IT("drops an oversized message"); - reset_callback(); - - Stream stream; - - ShimClient shimClient; - shimClient.setAllowConnect(true); - - byte connack[] = { 0x20, 0x02, 0x00, 0x00 }; - shimClient.respond(connack,4); - - PubSubClient client(server, 1883, callback, shimClient, stream); - int rc = client.connect((char*)"client_test1"); - IS_TRUE(rc); - - int length = MQTT_MAX_PACKET_SIZE+1; - byte publish[] = {0x30,length-2,0x0,0x5,0x74,0x6f,0x70,0x69,0x63,0x70,0x61,0x79,0x6c,0x6f,0x61,0x64}; - - byte bigPublish[length]; - memset(bigPublish,'A',length); - bigPublish[length] = 'B'; - memcpy(bigPublish,publish,16); - - shimClient.respond(bigPublish,length); - stream.expect(bigPublish+9,length-9); - - rc = client.loop(); - - IS_TRUE(rc); - - IS_TRUE(callback_called); - IS_TRUE(strcmp(lastTopic,"topic")==0); - IS_TRUE(lastLength == length-9); - - IS_FALSE(stream.error()); - IS_FALSE(shimClient.error()); - - END_IT -} - -int test_receive_qos1() { - IT("receives a qos1 message"); - reset_callback(); - - ShimClient shimClient; - shimClient.setAllowConnect(true); - - byte connack[] = { 0x20, 0x02, 0x00, 0x00 }; - shimClient.respond(connack,4); - - PubSubClient client(server, 1883, callback, shimClient); - int rc = client.connect((char*)"client_test1"); - IS_TRUE(rc); - - byte publish[] = {0x32,0x10,0x0,0x5,0x74,0x6f,0x70,0x69,0x63,0x12,0x34,0x70,0x61,0x79,0x6c,0x6f,0x61,0x64}; - shimClient.respond(publish,18); - - byte puback[] = {0x40,0x2,0x12,0x34}; - shimClient.expect(puback,4); - - rc = client.loop(); - - IS_TRUE(rc); - - IS_TRUE(callback_called); - IS_TRUE(strcmp(lastTopic,"topic")==0); - IS_TRUE(memcmp(lastPayload,"payload",7)==0); - IS_TRUE(lastLength == 7); - - IS_FALSE(shimClient.error()); - - END_IT -} - -int main() -{ - SUITE("Receive"); - test_receive_callback(); - test_receive_stream(); - test_receive_max_sized_message(); - test_drop_invalid_remaining_length_message(); - test_receive_oversized_message(); - test_receive_oversized_stream_message(); - test_receive_qos1(); - - FINISH -} diff --git a/lib/pubsubclient3/.clang-format b/lib/pubsubclient3/.clang-format new file mode 100644 index 000000000..a96fa8ab5 --- /dev/null +++ b/lib/pubsubclient3/.clang-format @@ -0,0 +1,8 @@ +BasedOnStyle: Google +Language: Cpp +IndentWidth: 4 +ColumnLimit: 155 +AllowShortFunctionsOnASingleLine: Empty +AlignConsecutiveMacros: Consecutive +SkipMacroDefinitionBody: true +LineEnding: LF diff --git a/lib/pubsubclient3/.editorconfig b/lib/pubsubclient3/.editorconfig new file mode 100644 index 000000000..392dfa64d --- /dev/null +++ b/lib/pubsubclient3/.editorconfig @@ -0,0 +1,17 @@ +root = true + +[*] +charset = utf-8 +end_of_line = lf +insert_final_newline = true +trim_trailing_whitespace = true + +[*.{c,cpp}] +indent_style = space +indent_size = 4 +max_line_length = 155 + +[*.py] +indent_style = space +indent_size = 4 +max_line_length = 155 diff --git a/lib/pubsubclient3/.github/build-arduino.sh b/lib/pubsubclient3/.github/build-arduino.sh new file mode 100644 index 000000000..551fe8bd7 --- /dev/null +++ b/lib/pubsubclient3/.github/build-arduino.sh @@ -0,0 +1,53 @@ +#!/bin/bash +# Exit immediately if a command exits with a non-zero status. +set -e +# Enable the globstar shell option +shopt -s globstar +# Make sure we are inside the github workspace +cd $GITHUB_WORKSPACE +# Create directories +mkdir $HOME/Arduino +mkdir $HOME/Arduino/libraries +# Install Arduino IDE +export PATH=$PATH:$GITHUB_WORKSPACE/bin +curl -fsSL https://raw.githubusercontent.com/arduino/arduino-cli/master/install.sh | sh +arduino-cli config init +arduino-cli config add board_manager.additional_urls http://arduino.esp8266.com/stable/package_esp8266com_index.json +arduino-cli config set library.enable_unsafe_install true +arduino-cli core update-index +#arduino-cli core search +# Install Arduino cores +arduino-cli core install arduino:avr +arduino-cli core install esp8266:esp8266 +arduino-cli core install esp32:esp32 +#arduino-cli board listall +# Install Arduino libs +arduino-cli lib install Ethernet +arduino-cli lib install --git-url https://github.com/ennui2342/arduino-sram +# Link the project to the Arduino library +ln -s $GITHUB_WORKSPACE $HOME/Arduino/libraries/CI_Test_Library + +# Compile all *.ino files for the Arduino +for f in **/*.ino ; do + if [[ "$f" != *mqtt_esp8266.ino && "$f" != *mqtt_large_message.ino ]]; then + echo "################################################################" + echo "Arduino Uno compiling file ${f}" + arduino-cli compile -b arduino:avr:uno $f + fi +done + +# Compile all *.ino files for the ESP32 +for f in **/*.ino ; do + if [[ "$f" != *"mqtt_stream.ino" ]]; then + echo "################################################################" + echo "ESP32 compiling file ${f}" + arduino-cli compile -b esp32:esp32:esp32 $f + fi +done + +# Compile all *.ino files for the ESP8266 +for f in **/*.ino ; do + echo "################################################################" + echo "ESP8266 compiling file ${f}" + arduino-cli compile -b esp8266:esp8266:generic $f +done diff --git a/lib/pubsubclient3/.github/clang-lint.sh b/lib/pubsubclient3/.github/clang-lint.sh new file mode 100644 index 000000000..2018fd2be --- /dev/null +++ b/lib/pubsubclient3/.github/clang-lint.sh @@ -0,0 +1,21 @@ +#!/bin/bash +# Exit immediately if a command exits with a non-zero status. +set -e +# Enable the globstar shell option +shopt -s globstar +# Make sure we are inside the github workspace +cd $GITHUB_WORKSPACE +# Install clang-format (if not already installed) +#command -v clang-format >/dev/null 2>&1 || sudo apt-get -y install clang-format +# need Ubuntu clang-format version 19.1.1 (1ubuntu1~24.04.2) +# default Ubuntu clang-format version 18.1.3 (1ubuntu1) is not working +sudo apt-get -y install clang-format-19 +# Check clang-format output +for f in **/*.{h,c,hpp,cpp,ino} ; do + #if [ -f "$f" ] && [[ "$f" != "tests/"* ]]; then + if [ -f "$f" ]; then + echo "################################################################" + echo "Checking file ${f}" + diff $f <(clang-format-19 -assume-filename=main.cpp $f) 1>&2 + fi +done diff --git a/lib/pubsubclient3/.github/workflows/build.yml b/lib/pubsubclient3/.github/workflows/build.yml new file mode 100644 index 000000000..f8c919060 --- /dev/null +++ b/lib/pubsubclient3/.github/workflows/build.yml @@ -0,0 +1,31 @@ +name: build + +on: + push: + branches: [ "master" ] + pull_request: + branches: [ "master" ] + +jobs: + build: + runs-on: ubuntu-latest + steps: + - name: Checkout + uses: actions/checkout@v2 + + - name: Check clang-format conformity + run: bash .github/clang-lint.sh + + - name: Build tests + # Build / Execute tests defined in tests folder + working-directory: ${{ github.workspace }}/tests + run: make + + - name: Execute tests + # Build / Execute tests defined in tests folder + working-directory: ${{ github.workspace }}/tests + #run: make test + run: bin/connect_spec && bin/publish_spec && bin/receive_spec && bin/subscribe_spec + + - name: Build on Arduino CLI + run: bash .github/build-arduino.sh diff --git a/lib/pubsubclient3/.gitignore b/lib/pubsubclient3/.gitignore new file mode 100644 index 000000000..a42cc406e --- /dev/null +++ b/lib/pubsubclient3/.gitignore @@ -0,0 +1,5 @@ +tests/bin +.pioenvs +.piolibdeps +.clang_complete +.gcc-flags.json diff --git a/lib/pubsubclient/.travis.yml b/lib/pubsubclient3/.travis.yml similarity index 100% rename from lib/pubsubclient/.travis.yml rename to lib/pubsubclient3/.travis.yml diff --git a/lib/pubsubclient3/CHANGES.txt b/lib/pubsubclient3/CHANGES.txt new file mode 100644 index 000000000..c06984322 --- /dev/null +++ b/lib/pubsubclient3/CHANGES.txt @@ -0,0 +1,136 @@ +3.1.0 + * Fix setServer(domain, ...) by copy domain string to own buffer (prevent potential dangling string pointer) #10 + * Connect to broker only if port != 0 (e.g. in case of incorrect PubSubClient initialization) #10 + * Refactored different buffer length types to size_t #11 + * Added a bunch of warnings and -Werror to tests Makefile #11 + * Reformatted tests code using Google sytle (see .clang-format) #11 + * Fix keepalive handling, thanks to @uschnindler providing this to thingsboard #14 + * Use initializer lists instead of assigning global members in constructor #15 + * Fix DEBUG_PSC_PRINTF outputs #18 + * Added ERROR_PSC_PRINTF and ERROR_PSC_PRINTF_P outputs #25 + * Introduce MQTTRETAINED flag instead of hard coding #21 + * Added documentation on readByte() and readPacket() functions #23 + * Refactored buildHeader() (change return type, use MQTT_MAX_HEADER_SIZE, locals) #22, #34, #37 + * Refactored readPacket() (changed return type to size_t, used MQTT_MAX_HEADER_SIZE, locals) #23 + * Refactored readByte() #23 + * Refactored beginPublish() and endPublish() #28 + * Refactored publish() #31 + * Refactored publish_P() #30 + * Refactored connect() #40 + * Refactored connected() (mostly rewritten and simplified, added setting pingOutstanding, don't need flush()) #44 + * Refactored subscribe() and unsubscribe() #44 + * Refactored internal socketTimeout and keepAlive to millis to improve performance #33, #38, #39 + * Fix potential memory corruption in MQTTPUBLISH callback preparation #25 + * Fix potential error in readByte() (missing failure test on _client->read()) #32 + * Switch from constructor init-lists to class member initialization, see C++ core guideline C.45 #42 + +3.0.2 + * Added github workflow to execute tests + * Added github workflow to compile examples using arduino-cli + * Examples: Use a better source of random #9 + * Deactivate use of std::function on demand #7 + +3.0.1 + * Reformatted code using Google sytle (see .clang-format) + * Added .editorconfig + * Added github workflow to check code sytle on push and pull request + * Fix-tests: missing def for strlen_P & Python libs + +3.0 + * Maintenance taken over by Holger Mueller + * Adds in-source documentation to PubSubClient header. + * Add flag for enabling debugging of library + * Always use PubSubClient() constructor + * Use bool instead of boolean + * Add yield() calls in connect() and write() to avoid wdt resets if either blocks for too long + * Fix bug in publish_P which will always treat the payload length as 0 when used with PROGMEM + * Fix increase `bytesToWrite` to uint16_t to prevent overflow + * Remove compiler warning `expectedLength` should be unsigned + * Extend usage of std::function on all the platforms where it's available + * Fix for keep alive zero + +2.8 + * Add setBufferSize() to override MQTT_MAX_PACKET_SIZE + * Add setKeepAlive() to override MQTT_KEEPALIVE + * Add setSocketTimeout() to overide MQTT_SOCKET_TIMEOUT + * Added check to prevent subscribe/unsubscribe to empty topics + * Declare wifi mode prior to connect in ESP example + * Use `strnlen` to avoid overruns + * Support pre-connected Client objects + +2.7 + * Fix remaining-length handling to prevent buffer overrun + * Add large-payload API - beginPublish/write/publish/endPublish + * Add yield call to improve reliability on ESP + * Add Clean Session flag to connect options + * Add ESP32 support for functional callback signature + * Various other fixes + +2.4 + * Add MQTT_SOCKET_TIMEOUT to prevent it blocking indefinitely + whilst waiting for inbound data + * Fixed return code when publishing >256 bytes + +2.3 + * Add publish(topic,payload,retained) function + +2.2 + * Change code layout to match Arduino Library reqs + +2.1 + * Add MAX_TRANSFER_SIZE def to chunk messages if needed + * Reject topic/payloads that exceed MQTT_MAX_PACKET_SIZE + +2.0 + * Add (and default to) MQTT 3.1.1 support + * Fix PROGMEM handling for Intel Galileo/ESP8266 + * Add overloaded constructors for convenience + * Add chainable setters for server/callback/client/stream + * Add state function to return connack return code + +1.9 + * Do not split MQTT packets over multiple calls to _client->write() + * API change: All constructors now require an instance of Client + to be passed in. + * Fixed example to match 1.8 api changes - dpslwk + * Added username/password support - WilHall + * Added publish_P - publishes messages from PROGMEM - jobytaffey + +1.8 + * KeepAlive interval is configurable in PubSubClient.h + * Maximum packet size is configurable in PubSubClient.h + * API change: Return boolean rather than int from various functions + * API change: Length parameter in message callback changed + from int to unsigned int + * Various internal tidy-ups around types + +1.7 + * Improved keepalive handling + * Updated to the Arduino-1.0 API + +1.6 + * Added the ability to publish a retained message + +1.5 + * Added default constructor + * Fixed compile error when used with arduino-0021 or later + +1.4 + * Fixed connection lost handling + +1.3 + * Fixed packet reading bug in PubSubClient.readPacket + +1.2 + * Fixed compile error when used with arduino-0016 or later + +1.1 + * Reduced size of library + * Added support for Will messages + * Clarified licensing - see LICENSE.txt + +1.0 + * Only Quality of Service (QOS) 0 messaging is supported + * The maximum message size, including header, is 128 bytes + * The keepalive interval is set to 30 seconds + * No support for Will messages diff --git a/lib/pubsubclient/LICENSE.txt b/lib/pubsubclient3/LICENSE.txt similarity index 93% rename from lib/pubsubclient/LICENSE.txt rename to lib/pubsubclient3/LICENSE.txt index 217df35cc..3fa566ac0 100644 --- a/lib/pubsubclient/LICENSE.txt +++ b/lib/pubsubclient3/LICENSE.txt @@ -1,4 +1,5 @@ -Copyright (c) 2008-2015 Nicholas O'Leary +Copyright (c) 2008-2020 Nicholas O'Leary +Copyright (c) 2025 Holger Mueller Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the diff --git a/lib/pubsubclient/README.md b/lib/pubsubclient3/README.md similarity index 56% rename from lib/pubsubclient/README.md rename to lib/pubsubclient3/README.md index 69cbb8f0c..8233d8e11 100644 --- a/lib/pubsubclient/README.md +++ b/lib/pubsubclient3/README.md @@ -3,6 +3,22 @@ This library provides a client for doing simple publish/subscribe messaging with a server that supports MQTT. +## Notes of this fork + +This is a fork of the repository [knolleary/pubsubclient v2.8](https://github.com/knolleary/pubsubclient/releases/tag/v2.8), which was last updated in May 20, 2020. There was an update approach in [#1045](https://github.com/knolleary/pubsubclient/issues/1045), but it's also stale. + +I tried lot's of different other MQTT libs, but they need more resources than PubSubClient or lacking maintenance as well: + + - https://github.com/256dpi/arduino-mqtt + - https://github.com/hideakitai/MQTTPubSubClient + - https://github.com/bertmelis/espMqttClient + - https://github.com/arduino-libraries/ArduinoMqttClient + - https://github.com/thingsboard/pubsubclient + +Since there was no progress I decided to merge the most important PRs manually and publish a new major version. I also renamed to PubSubClient3 to have a similar but different name of the library. + +I appreciate every contribution to this library. + ## Examples The library comes with a number of example sketches. See File > Examples > PubSubClient @@ -12,11 +28,14 @@ Full API documentation is available here: https://pubsubclient.knolleary.net ## Limitations + - The client is based on the [MQTT Version 3.1.1 specification](https://docs.oasis-open.org/mqtt/mqtt/v3.1.1/os/mqtt-v3.1.1-os.html) with some limitations. - It can only publish QoS 0 messages. It can subscribe at QoS 0 or QoS 1. - - The maximum message size, including header, is **128 bytes** by default. This - is configurable via `MQTT_MAX_PACKET_SIZE` in `PubSubClient.h`. + - The maximum message size, including header, is **256 bytes** by default. This + is configurable via `MQTT_MAX_PACKET_SIZE` in `PubSubClient.h` or can be changed + by calling `PubSubClient::setBufferSize(size)`. - The keepalive interval is set to 15 seconds by default. This is configurable - via `MQTT_KEEPALIVE` in `PubSubClient.h`. + via `MQTT_KEEPALIVE` in `PubSubClient.h` or can be changed by calling + `PubSubClient::setKeepAlive(keepAlive)`. - The client uses MQTT 3.1.1 by default. It can be changed to use MQTT 3.1 by changing value of `MQTT_VERSION` in `PubSubClient.h`. diff --git a/lib/pubsubclient3/examples/mqtt_auth/mqtt_auth.ino b/lib/pubsubclient3/examples/mqtt_auth/mqtt_auth.ino new file mode 100644 index 000000000..cdeb7959d --- /dev/null +++ b/lib/pubsubclient3/examples/mqtt_auth/mqtt_auth.ino @@ -0,0 +1,41 @@ +/* + Basic MQTT example with Authentication + + - connects to an MQTT server, providing username + and password + - publishes "hello world" to the topic "outTopic" + - subscribes to the topic "inTopic" +*/ + +#include +#include +#include + +// Update these with values suitable for your network. +byte mac[] = {0xDE, 0xED, 0xBA, 0xFE, 0xFE, 0xED}; +IPAddress ip(172, 16, 0, 100); +IPAddress server(172, 16, 0, 2); + +void callback(char* topic, uint8_t* payload, size_t length) { + // handle message arrived +} + +EthernetClient ethClient; +PubSubClient client(server, 1883, callback, ethClient); + +void setup() { + Ethernet.begin(mac, ip); + // Note - the default maximum packet size is 128 bytes. If the + // combined length of clientId, username and password exceed this use the + // following to increase the buffer size: + // client.setBufferSize(255); + + if (client.connect("arduinoClient", "testuser", "testpass")) { + client.publish("outTopic", "hello world"); + client.subscribe("inTopic"); + } +} + +void loop() { + client.loop(); +} diff --git a/lib/pubsubclient3/examples/mqtt_basic/mqtt_basic.ino b/lib/pubsubclient3/examples/mqtt_basic/mqtt_basic.ino new file mode 100644 index 000000000..f790aab6a --- /dev/null +++ b/lib/pubsubclient3/examples/mqtt_basic/mqtt_basic.ino @@ -0,0 +1,74 @@ +/* + Basic MQTT example + + This sketch demonstrates the basic capabilities of the library. + It connects to an MQTT server then: + - publishes "hello world" to the topic "outTopic" + - subscribes to the topic "inTopic", printing out any messages + it receives. NB - it assumes the received payloads are strings not binary + + It will reconnect to the server if the connection is lost using a blocking + reconnect function. See the 'mqtt_reconnect_nonblocking' example for how to + achieve the same result without blocking the main loop. +*/ + +#include +#include +#include + +// Update these with values suitable for your network. +byte mac[] = {0xDE, 0xED, 0xBA, 0xFE, 0xFE, 0xED}; +IPAddress ip(172, 16, 0, 100); +IPAddress server(172, 16, 0, 2); + +void callback(char* topic, uint8_t* payload, size_t length) { + Serial.print("Message arrived ["); + Serial.print(topic); + Serial.print("] "); + for (size_t i = 0; i < length; i++) { + Serial.print((char)payload[i]); + } + Serial.println(); +} + +EthernetClient ethClient; +PubSubClient client(ethClient); + +void reconnect() { + // Loop until we're reconnected + while (!client.connected()) { + Serial.print("Attempting MQTT connection..."); + // Attempt to connect + if (client.connect("arduinoClient")) { + Serial.println("connected"); + // Once connected, publish an announcement... + client.publish("outTopic", "hello world"); + // ... and resubscribe + client.subscribe("inTopic"); + } else { + Serial.print("failed, rc="); + Serial.print(client.state()); + Serial.println(" try again in 5 seconds"); + // Wait 5 seconds before retrying + delay(5000); + } + } +} + +void setup() { + Serial.begin(57600); + + client.setServer(server, 1883); + client.setCallback(callback); + + Ethernet.begin(mac, ip); + // Allow the hardware to sort itself out + delay(1500); +} + +void loop() { + if (!client.connected()) { + reconnect(); + } + client.loop(); +} diff --git a/lib/pubsubclient3/examples/mqtt_esp8266/mqtt_esp8266.ino b/lib/pubsubclient3/examples/mqtt_esp8266/mqtt_esp8266.ino new file mode 100644 index 000000000..b41192ab4 --- /dev/null +++ b/lib/pubsubclient3/examples/mqtt_esp8266/mqtt_esp8266.ino @@ -0,0 +1,135 @@ +/* + Basic ESP8266 / ESP32 MQTT example + This sketch demonstrates the capabilities of the pubsub library in combination + with the ESP8266 board/library. + It connects to an MQTT server then: + - publishes "hello world" to the topic "outTopic" every two seconds + - subscribes to the topic "inTopic", printing out any messages + it receives. NB - it assumes the received payloads are strings not binary + - If the first character of the topic "inTopic" is an 1, switch ON the ESP Led, + else switch it off + It will reconnect to the server if the connection is lost using a blocking + reconnect function. See the 'mqtt_reconnect_nonblocking' example for how to + achieve the same result without blocking the main loop. + To install the ESP8266 board, (using Arduino 1.6.4+): + - Add the following 3rd party board manager under "File -> Preferences -> Additional Boards Manager URLs": + http://arduino.esp8266.com/stable/package_esp8266com_index.json + - Open the "Tools -> Board -> Board Manager" and click install for the ESP8266" + - Select your ESP8266 in "Tools -> Board" +*/ + +#ifdef ESP8266 +#include +#elif defined(ESP32) +#include +#include +#define BUILTIN_LED A0 +#define RANDOM_REG32 esp_random() +#else +#error Platform not supported. +#endif +#include + +// Update these with values suitable for your network. + +const char* ssid = "........"; +const char* password = "........"; +const char* mqtt_server = "broker.mqtt-dashboard.com"; + +WiFiClient espClient; +PubSubClient client(espClient); +unsigned long lastMsg = 0; +#define MSG_BUFFER_SIZE (50) +char msg[MSG_BUFFER_SIZE]; +int value = 0; + +void setup_wifi() { + delay(10); + // We start by connecting to a WiFi network + Serial.println(); + Serial.print("Connecting to "); + Serial.println(ssid); + + WiFi.mode(WIFI_STA); + WiFi.begin(ssid, password); + + while (WiFi.status() != WL_CONNECTED) { + delay(500); + Serial.print("."); + } + + randomSeed(RANDOM_REG32); + + Serial.println(""); + Serial.println("WiFi connected"); + Serial.println("IP address: "); + Serial.println(WiFi.localIP()); +} + +void callback(char* topic, uint8_t* payload, size_t length) { + Serial.print("Message arrived ["); + Serial.print(topic); + Serial.print("] "); + for (size_t i = 0; i < length; i++) { + Serial.print((char)payload[i]); + } + Serial.println(); + + // Switch on the LED if an 1 was received as first character + if ((char)payload[0] == '1') { + digitalWrite(BUILTIN_LED, LOW); // Turn the LED on (Note that LOW is the voltage level + // but actually the LED is on; this is because + // it is active low on the ESP-01) + } else { + digitalWrite(BUILTIN_LED, HIGH); // Turn the LED off by making the voltage HIGH + } +} + +void reconnect() { + // Loop until we're reconnected + while (!client.connected()) { + Serial.print("Attempting MQTT connection..."); + // Create a random client ID + String clientId = "ESP8266Client-"; + clientId += String(random(0xffff), HEX); + // Attempt to connect + if (client.connect(clientId.c_str())) { + Serial.println("connected"); + // Once connected, publish an announcement... + client.publish("outTopic", "hello world"); + // ... and resubscribe + client.subscribe("inTopic"); + } else { + Serial.print("failed, rc="); + Serial.print(client.state()); + Serial.println(" try again in 5 seconds"); + // Wait 5 seconds before retrying + delay(5000); + } + } +} + +void setup() { + pinMode(BUILTIN_LED, OUTPUT); // Initialize the BUILTIN_LED pin as an output + Serial.begin(115200); + setup_wifi(); + client.setServer(mqtt_server, 1883); + client.setCallback(callback); +} + +void loop() { + if (!client.connected()) { + reconnect(); + } + client.loop(); + + unsigned long now = millis(); + if (now - lastMsg > 2000) { + lastMsg = now; + ++value; + snprintf(msg, MSG_BUFFER_SIZE, "hello world #%ld", value); + Serial.print("Publish message: "); + Serial.println(msg); + client.publish("outTopic", msg); + } +} diff --git a/lib/pubsubclient3/examples/mqtt_large_message/mqtt_large_message.ino b/lib/pubsubclient3/examples/mqtt_large_message/mqtt_large_message.ino new file mode 100644 index 000000000..48049c3e9 --- /dev/null +++ b/lib/pubsubclient3/examples/mqtt_large_message/mqtt_large_message.ino @@ -0,0 +1,185 @@ +/* + Long message ESP8266 / ESP32 MQTT example + + This sketch demonstrates sending arbitrarily large messages in combination + with the ESP8266 board/library. + + It connects to an MQTT server then: + - publishes "hello world" to the topic "outTopic" + - subscribes to the topic "greenBottles/#", printing out any messages + it receives. NB - it assumes the received payloads are strings not binary + - If the sub-topic is a number, it publishes a "greenBottles/lyrics" message + with a payload consisting of the lyrics to "10 green bottles", replacing + 10 with the number given in the sub-topic. + + It will reconnect to the server if the connection is lost using a blocking + reconnect function. See the 'mqtt_reconnect_nonblocking' example for how to + achieve the same result without blocking the main loop. + + To install the ESP8266 board, (using Arduino 1.6.4+): + - Add the following 3rd party board manager under "File -> Preferences -> Additional Boards Manager URLs": + http://arduino.esp8266.com/stable/package_esp8266com_index.json + - Open the "Tools -> Board -> Board Manager" and click install for the ESP8266" + - Select your ESP8266 in "Tools -> Board" +*/ + +#ifdef ESP8266 +#include +#elif defined(ESP32) +#include +#include +#define BUILTIN_LED A0 +#define RANDOM_REG32 esp_random() +#else +#error Platform not supported. +#endif +#include + +// Update these with values suitable for your network. + +const char* ssid = "........"; +const char* password = "........"; +const char* mqtt_server = "broker.mqtt-dashboard.com"; + +WiFiClient espClient; +PubSubClient client(espClient); +long lastMsg = 0; +char msg[50]; +int value = 0; + +void setup_wifi() { + delay(10); + // We start by connecting to a WiFi network + Serial.println(); + Serial.print("Connecting to "); + Serial.println(ssid); + + WiFi.begin(ssid, password); + + while (WiFi.status() != WL_CONNECTED) { + delay(500); + Serial.print("."); + } + + randomSeed(RANDOM_REG32); + + Serial.println(""); + Serial.println("WiFi connected"); + Serial.println("IP address: "); + Serial.println(WiFi.localIP()); +} + +void callback(char* topic, uint8_t* payload, size_t length) { + Serial.print("Message arrived ["); + Serial.print(topic); + Serial.print("] "); + for (size_t i = 0; i < length; i++) { + Serial.print((char)payload[i]); + } + Serial.println(); + + // Find out how many bottles we should generate lyrics for + String topicStr(topic); + int bottleCount = 0; // assume no bottles unless we correctly parse a value from the topic + if (topicStr.indexOf('/') >= 0) { + // The topic includes a '/', we'll try to read the number of bottles from just after that + topicStr.remove(0, topicStr.indexOf('/') + 1); + // Now see if there's a number of bottles after the '/' + bottleCount = topicStr.toInt(); + } + + if (bottleCount > 0) { + // Work out how big our resulting message will be + size_t msgLen = 0; + for (size_t i = bottleCount; i > 0; i--) { + String numBottles(i); + msgLen += 2 * numBottles.length(); + if (i == 1) { + msgLen += 2 * String(" green bottle, standing on the wall\n").length(); + } else { + msgLen += 2 * String(" green bottles, standing on the wall\n").length(); + } + msgLen += String("And if one green bottle should accidentally fall\nThere'll be ").length(); + switch (i) { + case 1: + msgLen += String("no green bottles, standing on the wall\n\n").length(); + break; + case 2: + msgLen += String("1 green bottle, standing on the wall\n\n").length(); + break; + default: + numBottles = i - 1; + msgLen += numBottles.length(); + msgLen += String(" green bottles, standing on the wall\n\n").length(); + break; + }; + } + + // Now we can start to publish the message + client.beginPublish("greenBottles/lyrics", msgLen, false); + for (int i = bottleCount; i > 0; i--) { + for (int j = 0; j < 2; j++) { + client.print(i); + if (i == 1) { + client.print(" green bottle, standing on the wall\n"); + } else { + client.print(" green bottles, standing on the wall\n"); + } + } + client.print("And if one green bottle should accidentally fall\nThere'll be "); + switch (i) { + case 1: + client.print("no green bottles, standing on the wall\n\n"); + break; + case 2: + client.print("1 green bottle, standing on the wall\n\n"); + break; + default: + client.print(i - 1); + client.print(" green bottles, standing on the wall\n\n"); + break; + }; + } + // Now we're done! + client.endPublish(); + } +} + +void reconnect() { + // Loop until we're reconnected + while (!client.connected()) { + Serial.print("Attempting MQTT connection..."); + // Create a random client ID + String clientId = "ESP8266Client-"; + clientId += String(random(0xffff), HEX); + // Attempt to connect + if (client.connect(clientId.c_str())) { + Serial.println("connected"); + // Once connected, publish an announcement... + client.publish("outTopic", "hello world"); + // ... and resubscribe + client.subscribe("greenBottles/#"); + } else { + Serial.print("failed, rc="); + Serial.print(client.state()); + Serial.println(" try again in 5 seconds"); + // Wait 5 seconds before retrying + delay(5000); + } + } +} + +void setup() { + pinMode(BUILTIN_LED, OUTPUT); // Initialize the BUILTIN_LED pin as an output + Serial.begin(115200); + setup_wifi(); + client.setServer(mqtt_server, 1883); + client.setCallback(callback); +} + +void loop() { + if (!client.connected()) { + reconnect(); + } + client.loop(); +} diff --git a/lib/pubsubclient3/examples/mqtt_publish_in_callback/mqtt_publish_in_callback.ino b/lib/pubsubclient3/examples/mqtt_publish_in_callback/mqtt_publish_in_callback.ino new file mode 100644 index 000000000..733bea3f5 --- /dev/null +++ b/lib/pubsubclient3/examples/mqtt_publish_in_callback/mqtt_publish_in_callback.ino @@ -0,0 +1,56 @@ +/* + Publishing in the callback + + - connects to an MQTT server + - subscribes to the topic "inTopic" + - when a message is received, republishes it to "outTopic" + + This example shows how to publish messages within the + callback function. The callback function header needs to + be declared before the PubSubClient constructor and the + actual callback defined afterwards. + This ensures the client reference in the callback function + is valid. +*/ + +#include +#include +#include + +// Update these with values suitable for your network. +byte mac[] = {0xDE, 0xED, 0xBA, 0xFE, 0xFE, 0xED}; +IPAddress ip(172, 16, 0, 100); +IPAddress server(172, 16, 0, 2); + +// Callback function header +void callback(char* topic, uint8_t* payload, size_t length); + +EthernetClient ethClient; +PubSubClient client(server, 1883, callback, ethClient); + +// Callback function +void callback(char* topic, uint8_t* payload, size_t length) { + // In order to republish this payload, a copy must be made + // as the orignal payload buffer will be overwritten whilst + // constructing the PUBLISH packet. + + // Allocate the correct amount of memory for the payload copy + byte* p = (byte*)malloc(length); + // Copy the payload to the new buffer + memcpy(p, payload, length); + client.publish("outTopic", p, length); + // Free the memory + free(p); +} + +void setup() { + Ethernet.begin(mac, ip); + if (client.connect("arduinoClient")) { + client.publish("outTopic", "hello world"); + client.subscribe("inTopic"); + } +} + +void loop() { + client.loop(); +} diff --git a/lib/pubsubclient3/examples/mqtt_reconnect_nonblocking/mqtt_reconnect_nonblocking.ino b/lib/pubsubclient3/examples/mqtt_reconnect_nonblocking/mqtt_reconnect_nonblocking.ino new file mode 100644 index 000000000..9d5c60098 --- /dev/null +++ b/lib/pubsubclient3/examples/mqtt_reconnect_nonblocking/mqtt_reconnect_nonblocking.ino @@ -0,0 +1,62 @@ +/* + Reconnecting MQTT example - non-blocking + + This sketch demonstrates how to keep the client connected + using a non-blocking reconnect function. If the client loses + its connection, it attempts to reconnect every 5 seconds + without blocking the main loop. +*/ + +#include +#include +#include + +// Update these with values suitable for your hardware/network. +byte mac[] = {0xDE, 0xED, 0xBA, 0xFE, 0xFE, 0xED}; +IPAddress ip(172, 16, 0, 100); +IPAddress server(172, 16, 0, 2); + +void callback(char* topic, uint8_t* payload, size_t length) { + // handle message arrived +} + +EthernetClient ethClient; +PubSubClient client(ethClient); + +long lastReconnectAttempt = 0; + +boolean reconnect() { + if (client.connect("arduinoClient")) { + // Once connected, publish an announcement... + client.publish("outTopic", "hello world"); + // ... and resubscribe + client.subscribe("inTopic"); + } + return client.connected(); +} + +void setup() { + client.setServer(server, 1883); + client.setCallback(callback); + + Ethernet.begin(mac, ip); + delay(1500); + lastReconnectAttempt = 0; +} + +void loop() { + if (!client.connected()) { + unsigned long now = millis(); + if (now - lastReconnectAttempt > 5000) { + lastReconnectAttempt = now; + // Attempt to reconnect + if (reconnect()) { + lastReconnectAttempt = 0; + } + } + } else { + // Client connected + + client.loop(); + } +} diff --git a/lib/pubsubclient/examples/mqtt_stream/mqtt_stream.ino b/lib/pubsubclient3/examples/mqtt_stream/mqtt_stream.ino similarity index 50% rename from lib/pubsubclient/examples/mqtt_stream/mqtt_stream.ino rename to lib/pubsubclient3/examples/mqtt_stream/mqtt_stream.ino index 67c22872c..5e620a0e3 100644 --- a/lib/pubsubclient/examples/mqtt_stream/mqtt_stream.ino +++ b/lib/pubsubclient3/examples/mqtt_stream/mqtt_stream.ino @@ -9,49 +9,47 @@ - subscribes to the topic "inTopic" */ -#include #include #include +#include #include // Update these with values suitable for your network. -byte mac[] = { 0xDE, 0xED, 0xBA, 0xFE, 0xFE, 0xED }; +byte mac[] = {0xDE, 0xED, 0xBA, 0xFE, 0xFE, 0xED}; IPAddress ip(172, 16, 0, 100); IPAddress server(172, 16, 0, 2); SRAM sram(4, SRAM_1024); -void callback(char* topic, byte* payload, unsigned int length) { - sram.seek(1); +void callback(char* topic, uint8_t* payload, size_t length) { + sram.seek(1); - // do something with the message - for(uint8_t i=0; i -maintainer=Nick O'Leary +maintainer=Holger Mueller +license=MIT sentence=A client library for MQTT messaging. paragraph=MQTT is a lightweight messaging protocol ideal for small devices. This library allows you to send and receive MQTT messages. It supports the latest MQTT 3.1.1 protocol and can be configured to use the older MQTT 3.1 if needed. It supports all Arduino Ethernet Client compatible hardware, including the Intel Galileo/Edison, ESP8266 and TI CC3000. category=Communication -url=http://pubsubclient.knolleary.net -architectures=esp8266,esp32 +url=https://github.com/hmueller01/pubsubclient3.git +architectures=* diff --git a/lib/pubsubclient3/src/PubSubClient.cpp b/lib/pubsubclient3/src/PubSubClient.cpp new file mode 100644 index 000000000..e50c0973a --- /dev/null +++ b/lib/pubsubclient3/src/PubSubClient.cpp @@ -0,0 +1,772 @@ +/* + PubSubClient.cpp - A simple client for MQTT. + Nick O'Leary, Holger Mueller + http://knolleary.net + https://github.com/hmueller01/pubsubclient3 +*/ + +#include "PubSubClient.h" + +PubSubClient::PubSubClient() { + setBufferSize(MQTT_MAX_PACKET_SIZE); + setKeepAlive(MQTT_KEEPALIVE); + setSocketTimeout(MQTT_SOCKET_TIMEOUT); +} + +PubSubClient::PubSubClient(Client& client) : PubSubClient() { + setClient(client); +} + +PubSubClient::PubSubClient(IPAddress addr, uint16_t port, Client& client) : PubSubClient() { + setServer(addr, port); + setClient(client); +} + +PubSubClient::PubSubClient(IPAddress addr, uint16_t port, Client& client, Stream& stream) : PubSubClient() { + setServer(addr, port); + setClient(client); + setStream(stream); +} + +PubSubClient::PubSubClient(IPAddress addr, uint16_t port, MQTT_CALLBACK_SIGNATURE, Client& client) : PubSubClient() { + setServer(addr, port); + setCallback(callback); + setClient(client); +} + +PubSubClient::PubSubClient(IPAddress addr, uint16_t port, MQTT_CALLBACK_SIGNATURE, Client& client, Stream& stream) : PubSubClient() { + setServer(addr, port); + setCallback(callback); + setClient(client); + setStream(stream); +} + +PubSubClient::PubSubClient(uint8_t* ip, uint16_t port, Client& client) : PubSubClient() { + setServer(ip, port); + setClient(client); +} + +PubSubClient::PubSubClient(uint8_t* ip, uint16_t port, Client& client, Stream& stream) : PubSubClient() { + setServer(ip, port); + setClient(client); + setStream(stream); +} + +PubSubClient::PubSubClient(uint8_t* ip, uint16_t port, MQTT_CALLBACK_SIGNATURE, Client& client) : PubSubClient() { + setServer(ip, port); + setCallback(callback); + setClient(client); +} + +PubSubClient::PubSubClient(uint8_t* ip, uint16_t port, MQTT_CALLBACK_SIGNATURE, Client& client, Stream& stream) : PubSubClient() { + setServer(ip, port); + setCallback(callback); + setClient(client); + setStream(stream); +} + +PubSubClient::PubSubClient(const char* domain, uint16_t port, Client& client) : PubSubClient() { + setServer(domain, port); + setClient(client); +} + +PubSubClient::PubSubClient(const char* domain, uint16_t port, Client& client, Stream& stream) : PubSubClient() { + setServer(domain, port); + setClient(client); + setStream(stream); +} + +PubSubClient::PubSubClient(const char* domain, uint16_t port, MQTT_CALLBACK_SIGNATURE, Client& client) : PubSubClient() { + setServer(domain, port); + setCallback(callback); + setClient(client); +} + +PubSubClient::PubSubClient(const char* domain, uint16_t port, MQTT_CALLBACK_SIGNATURE, Client& client, Stream& stream) : PubSubClient() { + setServer(domain, port); + setCallback(callback); + setClient(client); + setStream(stream); +} + +PubSubClient::~PubSubClient() { + free(this->domain); + free(this->buffer); +} + +bool PubSubClient::connect(const char* id) { + return connect(id, nullptr, nullptr, 0, 0, 0, 0, 1); +} + +bool PubSubClient::connect(const char* id, const char* user, const char* pass) { + return connect(id, user, pass, 0, 0, 0, 0, 1); +} + +bool PubSubClient::connect(const char* id, const char* willTopic, uint8_t willQos, bool willRetain, const char* willMessage) { + return connect(id, nullptr, nullptr, willTopic, willQos, willRetain, willMessage, 1); +} + +bool PubSubClient::connect(const char* id, const char* user, const char* pass, const char* willTopic, uint8_t willQos, bool willRetain, + const char* willMessage) { + return connect(id, user, pass, willTopic, willQos, willRetain, willMessage, 1); +} + +bool PubSubClient::connect(const char* id, const char* user, const char* pass, const char* willTopic, uint8_t willQos, bool willRetain, + const char* willMessage, bool cleanSession) { + if (!connected()) { + int result = 0; + + if (_client->connected()) { + result = 1; + } else if (this->port != 0) { + if (this->domain) { + result = _client->connect(this->domain, this->port); + } else { + result = _client->connect(this->ip, this->port); + } + } + + if (result == 1) { + nextMsgId = 1; // init msgId (packet identifier) + +#if MQTT_VERSION == MQTT_VERSION_3_1 + const uint8_t protocol[9] = {0x00, 0x06, 'M', 'Q', 'I', 's', 'd', 'p', MQTT_VERSION}; +#elif MQTT_VERSION == MQTT_VERSION_3_1_1 + const uint8_t protocol[7] = {0x00, 0x04, 'M', 'Q', 'T', 'T', MQTT_VERSION}; +#endif + // Leave room in the buffer for header and variable length field + memcpy(this->buffer + MQTT_MAX_HEADER_SIZE, protocol, sizeof(protocol)); + + size_t length = MQTT_MAX_HEADER_SIZE + sizeof(protocol); + uint8_t flags = 0x00; + if (willTopic) { + flags = (0x01 << 2) | (willQos << 3) | (willRetain << 5); // set will flag bit 2, will QoS and will retain bit 5 + } + if (cleanSession) { + flags = flags | (0x01 << 1); // set clean session bit 1 + } + if (user) { + flags = flags | (0x01 << 7); // set user name flag bit 7 + if (pass) { + flags = flags | (0x01 << 6); // set password flag bit 6 + } + } + const uint16_t keepAlive = this->keepAliveMillis / 1000; + this->buffer[length++] = flags; + this->buffer[length++] = keepAlive >> 8; + this->buffer[length++] = keepAlive & 0xFF; + + CHECK_STRING_LENGTH(length, id) + length = writeString(id, this->buffer, length); + if (willTopic) { + CHECK_STRING_LENGTH(length, willTopic) + length = writeString(willTopic, this->buffer, length); + CHECK_STRING_LENGTH(length, willMessage) + length = writeString(willMessage, this->buffer, length); + } + + if (user) { + CHECK_STRING_LENGTH(length, user) + length = writeString(user, this->buffer, length); + if (pass) { + CHECK_STRING_LENGTH(length, pass) + length = writeString(pass, this->buffer, length); + } + } + + write(MQTTCONNECT, this->buffer, length - MQTT_MAX_HEADER_SIZE); + + lastInActivity = lastOutActivity = millis(); + pingOutstanding = false; + + while (!_client->available()) { + yield(); + unsigned long t = millis(); + if (t - lastInActivity >= this->socketTimeoutMillis) { + DEBUG_PSC_PRINTF("connect aborting due to timeout\n"); + _state = MQTT_CONNECTION_TIMEOUT; + _client->stop(); + return false; + } + } + uint8_t hdrLen; + size_t len = readPacket(&hdrLen); + + if (len == 4) { + if (buffer[3] == 0) { + lastInActivity = millis(); + _state = MQTT_CONNECTED; + return true; + } else { + _state = buffer[3]; + } + } + DEBUG_PSC_PRINTF("connect aborting due to protocol error\n"); + _client->stop(); + } else { + _state = MQTT_CONNECT_FAILED; + } + return false; + } + return true; +} + +bool PubSubClient::connected() { + if (!_client) return false; + + if (_client->connected()) { + return (_state == MQTT_CONNECTED); + } else if (_state == MQTT_CONNECTED) { + DEBUG_PSC_PRINTF("lost connection (client may have more details)\n"); + _state = MQTT_CONNECTION_LOST; + _client->stop(); + pingOutstanding = false; + } + return false; +} + +void PubSubClient::disconnect() { + DEBUG_PSC_PRINTF("disconnect called\n"); + this->buffer[0] = MQTTDISCONNECT; + this->buffer[1] = 0; + _client->write(this->buffer, 2); + _state = MQTT_DISCONNECTED; + _client->flush(); + _client->stop(); + lastInActivity = lastOutActivity = millis(); + pingOutstanding = false; +} + +/** + * @brief Reads a byte into result. + * + * @param result Pointer to result buffer. + * @return true if byte was read, false if socketTimeout occurred. + */ +bool PubSubClient::readByte(uint8_t* result) { + unsigned long previousMillis = millis(); + while (!_client->available()) { + yield(); + unsigned long currentMillis = millis(); + if (currentMillis - previousMillis >= this->socketTimeoutMillis) { + return false; + } + } + int rc = _client->read(); + if (rc < 0) { + return false; + } + *result = (uint8_t)rc; + return true; +} + +/** + * @brief Reads a byte into result[*pos] and increments *pos. + * Note: *pos may go out of bounds of result. This must be checked outside of this function! + * + * @return true if a byte was read, otherwise false (socketTimeout). + */ +bool PubSubClient::readByte(uint8_t* result, size_t* pos) { + uint8_t* write_address = &(result[*pos]); + if (readByte(write_address)) { + (*pos)++; + return true; + } + return false; +} + +/** + * @brief Reads a complete packet (header, topic, payload) into this->buffer. + * + * @param *hdrLen Returns the variable header length send by MQTT broker (1 .. MQTT_MAX_HEADER_SIZE - 1) + * @return Number of read bytes, 0 in case of an error (socketTimeout, buffer overflow) + */ +size_t PubSubClient::readPacket(uint8_t* hdrLen) { + size_t len = 0; + if (!readByte(this->buffer, &len)) return 0; + bool isPublish = (this->buffer[0] & 0xF0) == MQTTPUBLISH; + uint32_t multiplier = 1; + size_t length = 0; + uint8_t digit = 0; + uint16_t skip = 0; + uint8_t start = 0; + + do { + if (len == MQTT_MAX_HEADER_SIZE) { + // Invalid remaining length encoding - kill the connection + DEBUG_PSC_PRINTF("readPacket detected packet of invalid length\n"); + _state = MQTT_DISCONNECTED; + _client->stop(); + return 0; + } + if (!readByte(&digit)) return 0; + this->buffer[len++] = digit; + length += (digit & 0x7F) * multiplier; // length is coded in the lower 7 bits + multiplier <<= 7; // multiplier *= 128 + } while ((digit & 0x80) != 0); // do while 8th continuation bit is set + *hdrLen = (uint8_t)(len - 1); + + DEBUG_PSC_PRINTF("readPacket received packet of length %zu (isPublish = %u)\n", length, isPublish); + + if (isPublish) { + // Read in topic length to calculate bytes to skip over for Stream writing + if (!readByte(this->buffer, &len)) return 0; + if (!readByte(this->buffer, &len)) return 0; + skip = (this->buffer[*hdrLen + 1] << 8) + this->buffer[*hdrLen + 2]; + start = 2; + if (this->buffer[0] & MQTTQOS1) { + // skip message id + skip += 2; + } + } + size_t idx = len; + + for (size_t i = start; i < length; i++) { + if (!readByte(&digit)) return 0; + if (this->stream) { + if (isPublish && idx - *hdrLen - 2 > skip) { + this->stream->write(digit); + } + } + + if (len < this->bufferSize) { + this->buffer[len++] = digit; + } + idx++; + } + + if (!this->stream && idx > this->bufferSize) { + DEBUG_PSC_PRINTF("readPacket ignoring packet of size %zu exceeding buffer of size %zu\n", length, this->bufferSize); + len = 0; // This will cause the packet to be ignored. + } + return len; +} + +/** + * @brief After a packet is read handle the content here (call the callback, handle pings). + * + * @param hdrLen Variable header length send by MQTT broker (1 .. MQTT_MAX_HEADER_SIZE - 1). + * @param length Number of read bytes in this->buffer. + * @return true if packet was successfully processed, false if a buffer over or underflow occurred. + */ +bool PubSubClient::handlePacket(uint8_t hdrLen, size_t length) { + uint8_t type = this->buffer[0] & 0xF0; + DEBUG_PSC_PRINTF("received message of type %u\n", type); + switch (type) { + case MQTTPUBLISH: + if (callback) { + // MQTT Publish packet: See section 3.3 MQTT v3.1 protocol specification: + // - Header: 1 byte + // - Remaining header length: hdrLen bytes, multibyte field (1 .. MQTT_MAX_HEADER_SIZE - 1) + // - Topic length: 2 bytes (starts at buffer[hdrLen + 1]) + // - Topic: topicLen bytes (starts at buffer[hdrLen + 3]) + // - Packet Identifier (msgId): 0 bytes for QoS 0, 2 bytes for QoS 1 and 2 (starts at buffer[hdrLen + 3 + topicLen]) + // - Payload (for QoS = 0): length - (hdrLen + 3 + topicLen) bytes (starts at buffer[hdrLen + 3 + topicLen]) + // - Payload (for QoS > 0): length - (hdrLen + 5 + topicLen) bytes (starts at buffer[hdrLen + 5 + topicLen]) + // To get a null reminated 'C' topic string we move the topic 1 byte to the front (overwriting the LSB of the topic lenght) + uint16_t topicLen = (this->buffer[hdrLen + 1] << 8) + this->buffer[hdrLen + 2]; // topic length in bytes + char* topic = (char*)(this->buffer + hdrLen + 3 - 1); // set the topic in the LSB of the topic lenght, as we move it there + uint16_t payloadOffset = hdrLen + 3 + topicLen; // payload starts after header and topic (if there is no packet identifier) + size_t payloadLen = length - payloadOffset; // this might change by 2 if we have a QoS 1 or 2 message + uint8_t* payload = this->buffer + payloadOffset; + + if (length < payloadOffset) { // do not move outside the max bufferSize + ERROR_PSC_PRINTF_P("handlePacket(): Suspicious topicLen (%u) points outside of received buffer length (%zu)\n", topicLen, length); + return false; + } + memmove(topic, topic + 1, topicLen); // move topic inside buffer 1 byte to front + topic[topicLen] = '\0'; // end the topic as a 'C' string with \x00 + + if ((this->buffer[0] & 0x06) == MQTTQOS0) { + // No msgId for QOS == 0 + callback(topic, payload, payloadLen); + } else { + // For QOS 1 and 2 we have a msgId (packet identifier) after the topic at the current payloadOffset + if (payloadLen < 2) { // payload must be >= 2, as we have the msgId before + ERROR_PSC_PRINTF_P("handlePacket(): Missing msgId in QoS 1/2 message\n"); + return false; + } + uint16_t msgId = (this->buffer[payloadOffset] << 8) + this->buffer[payloadOffset + 1]; + callback(topic, payload + 2, payloadLen - 2); // remove the msgId from the callback payload + + this->buffer[0] = MQTTPUBACK; + this->buffer[1] = 2; + this->buffer[2] = (msgId >> 8); + this->buffer[3] = (msgId & 0xFF); + if (_client->write(this->buffer, 4) == 4) { + lastOutActivity = millis(); + } + } + } + break; + case MQTTPINGREQ: + this->buffer[0] = MQTTPINGRESP; + this->buffer[1] = 0; + if (_client->write(this->buffer, 2) == 2) { + lastOutActivity = millis(); + } + break; + case MQTTPINGRESP: + pingOutstanding = false; + break; + default: + break; + } + return true; +} + +bool PubSubClient::loop() { + if (!connected()) { + return false; + } + bool ret = true; + const unsigned long t = millis(); + if (keepAliveMillis && ((t - lastInActivity > this->keepAliveMillis) || (t - lastOutActivity > this->keepAliveMillis))) { + if (pingOutstanding) { + DEBUG_PSC_PRINTF("loop aborting due to timeout\n"); + _state = MQTT_CONNECTION_TIMEOUT; + _client->stop(); + pingOutstanding = false; + return false; + } else { + this->buffer[0] = MQTTPINGREQ; + this->buffer[1] = 0; + if (_client->write(this->buffer, 2) == 2) { + lastInActivity = lastOutActivity = t; + pingOutstanding = true; + } + } + } + if (_client->available()) { + uint8_t hdrLen; + size_t len = readPacket(&hdrLen); + if (len > 0) { + lastInActivity = t; + ret = handlePacket(hdrLen, len); + if (!ret) { + _state = MQTT_DISCONNECTED; + _client->stop(); + } + } else if (!connected()) { + // readPacket has closed the connection + return false; + } + } + return ret; +} + +bool PubSubClient::publish(const char* topic, const char* payload) { + return publish(topic, (const uint8_t*)payload, payload ? strnlen(payload, MQTT_MAX_POSSIBLE_PACKET_SIZE) : 0, false); +} + +bool PubSubClient::publish(const char* topic, const char* payload, bool retained) { + return publish(topic, (const uint8_t*)payload, payload ? strnlen(payload, MQTT_MAX_POSSIBLE_PACKET_SIZE) : 0, retained); +} + +bool PubSubClient::publish(const char* topic, const uint8_t* payload, size_t plength) { + return publish(topic, payload, plength, false); +} + +bool PubSubClient::publish(const char* topic, const uint8_t* payload, size_t plength, bool retained) { + if (beginPublish(topic, plength, retained)) { + size_t rc = write(payload, plength); + lastOutActivity = millis(); + return endPublish() && (rc == plength); + } + return false; +} + +bool PubSubClient::publish_P(const char* topic, const char* payload, bool retained) { + return publish_P(topic, (const uint8_t*)payload, payload ? strnlen_P(payload, MQTT_MAX_POSSIBLE_PACKET_SIZE) : 0, retained); +} + +bool PubSubClient::publish_P(const char* topic, const uint8_t* payload, size_t plength, bool retained) { + if (beginPublish(topic, plength, retained)) { + size_t rc = 0; + for (size_t i = 0; i < plength; i++) { + rc += _client->write((uint8_t)pgm_read_byte_near(payload + i)); + } + lastOutActivity = millis(); + return endPublish() && (rc == plength); + } + return false; +} + +bool PubSubClient::beginPublish(const char* topic, size_t plength, bool retained) { + if (!topic) return false; + // check if the header and the topic (including 2 length bytes) fit into the buffer + if (connected() && MQTT_MAX_HEADER_SIZE + strlen(topic) + 2 <= this->bufferSize) { + // first write the topic at the end of the maximal variable header (MQTT_MAX_HEADER_SIZE) to the buffer + size_t topicLen = writeString(topic, this->buffer, MQTT_MAX_HEADER_SIZE) - MQTT_MAX_HEADER_SIZE; + // we now know the length of the topic string (lenght + 2 bytes signalling the length) and can build the variable header information + const uint8_t header = MQTTPUBLISH | (retained ? MQTTRETAINED : 0); + uint8_t hdrLen = buildHeader(header, this->buffer, topicLen + plength); + if (hdrLen == 0) return false; // exit here in case of header generation failure + // as the header length is variable, it starts at MQTT_MAX_HEADER_SIZE - hdrLen (see buildHeader() documentation) + size_t rc = _client->write(this->buffer + (MQTT_MAX_HEADER_SIZE - hdrLen), hdrLen + topicLen); + lastOutActivity = millis(); + return (rc == (hdrLen + topicLen)); + } + return false; +} + +bool PubSubClient::endPublish() { + return connected(); +} + +/** + * @brief Build up the header ready to send. + * Note: the header is built at the end of the first MQTT_MAX_HEADER_SIZE bytes, so will start + * (MQTT_MAX_HEADER_SIZE - ) bytes into the buffer. + * + * @param header Header byte, e.g. MQTTCONNECT, MQTTPUBLISH, MQTTSUBSCRIBE, MQTTUNSUBSCRIBE. + * @param buf Buffer to write header to. + * @param length Length to encode in the header. + * @return Returns the size of the header (1 .. MQTT_MAX_HEADER_SIZE), or 0 in case of a failure (e.g. length to big). + */ +uint8_t PubSubClient::buildHeader(uint8_t header, uint8_t* buf, size_t length) { + uint8_t hdrBuf[MQTT_MAX_HEADER_SIZE - 1]; + uint8_t hdrLen = 0; + uint8_t digit; + size_t len = length; + do { + digit = len & 0x7F; // digit = len % 128 + len >>= 7; // len = len / 128 + if (len > 0) { + digit |= 0x80; + } + hdrBuf[hdrLen++] = digit; + } while (len > 0 && hdrLen < MQTT_MAX_HEADER_SIZE - 1); + + if (len > 0) { + ERROR_PSC_PRINTF_P("buildHeader() length too big %zu, left %zu\n", length, len); + return 0; + } + + buf[MQTT_MAX_HEADER_SIZE - 1 - hdrLen] = header; + memcpy(buf + MQTT_MAX_HEADER_SIZE - hdrLen, hdrBuf, hdrLen); + return hdrLen + 1; // Full header size is variable length bit plus the 1-byte fixed header +} + +size_t PubSubClient::write(uint8_t data) { + lastOutActivity = millis(); + return _client->write(data); +} + +size_t PubSubClient::write(const uint8_t* buffer, size_t size) { + lastOutActivity = millis(); + return _client->write(buffer, size); +} + +/** + * @brief Send the header and the prepared data to the client / MQTT broker. + * + * @param header Header byte, e.g. MQTTCONNECT, MQTTPUBLISH, MQTTSUBSCRIBE, MQTTUNSUBSCRIBE. + * @param buf Buffer of data to write. + * @param length Length of buf to write. + * @return True if successfully sent, otherwise false if buildHeader() failed or buf could not be written. + */ +bool PubSubClient::write(uint8_t header, uint8_t* buf, size_t length) { + bool result = true; + size_t rc; + uint8_t hdrLen = buildHeader(header, buf, length); + if (hdrLen == 0) return false; // exit here in case of header generation failure + +#ifdef MQTT_MAX_TRANSFER_SIZE + uint8_t* writeBuf = buf + (MQTT_MAX_HEADER_SIZE - hdrLen); + size_t bytesRemaining = length + hdrLen; // Match the length type + size_t bytesToWrite; + while ((bytesRemaining > 0) && result) { + yield(); + bytesToWrite = (bytesRemaining > MQTT_MAX_TRANSFER_SIZE) ? MQTT_MAX_TRANSFER_SIZE : bytesRemaining; + rc = _client->write(writeBuf, bytesToWrite); + result = (rc == bytesToWrite); + bytesRemaining -= rc; + writeBuf += rc; + if (result) { + lastOutActivity = millis(); + } + } +#else + rc = _client->write(buf + (MQTT_MAX_HEADER_SIZE - hdrLen), length + hdrLen); + result = (rc == length + hdrLen); + if (result) { + lastOutActivity = millis(); + } +#endif + return result; +} + +/** + * @brief Write an UTF-8 encoded string to the give buffer and position. The string can have a length of 0 to 65535 bytes. The buffer is prefixed with two + * bytes representing the length of the string. See section 1.5.3 of MQTT v3.1.1 protocol specification. + * @note If the string does not fit in the buffer (bufferSize) or is longer than 65535 bytes nothing is written to the buffer and the returned position + * is unchanged. + * + * @param string 'C' string of the data that shall be written in the buffer. + * @param buf Buffer to write the string into. + * @param pos Position in the buffer to write the string. + * @return New position in the buffer (pos + 2 + string length), or pos if a buffer overrun would occur. + */ +size_t PubSubClient::writeString(const char* string, uint8_t* buf, size_t pos) { + return writeString(string, buf, pos, this->bufferSize); +} + +/** + * @brief Write an UTF-8 encoded string to the give buffer and position. The string can have a length of 0 to 65535 bytes. The buffer is prefixed with two + * bytes representing the length of the string. See section 1.5.3 of MQTT v3.1.1 protocol specification. + * @note If the string does not fit in the buffer or is longer than 65535 bytes nothing is written to the buffer and the returned position is unchanged. + * + * @param string 'C' string of the data that shall be written in the buffer. + * @param buf Buffer to write the string into. + * @param pos Position in the buffer to write the string. + * @param size Maximal size of the buffer. + * @return New position in the buffer (pos + 2 + string length), or pos if a buffer overrun would occur or the string is a nullptr. + */ +size_t PubSubClient::writeString(const char* string, uint8_t* buf, size_t pos, size_t size) { + if (!string) return pos; + + size_t sLen = strlen(string); + if (pos + 2 + sLen <= size && sLen <= 0xFFFF) { + buf[pos++] = (uint8_t)(sLen >> 8); + buf[pos++] = (uint8_t)(sLen & 0xFF); + memcpy(buf + pos, string, sLen); + pos += sLen; + } else { + ERROR_PSC_PRINTF_P("writeString(): string (%zu) does not fit into buf (%zu)\n", pos + 2 + sLen, size); + } + return pos; +} + +bool PubSubClient::subscribe(const char* topic) { + return subscribe(topic, 0); +} + +bool PubSubClient::subscribe(const char* topic, uint8_t qos) { + if (!topic) return false; + if (qos > 1) return false; // only QoS 0 and 1 supported + + size_t topicLen = strnlen(topic, this->bufferSize); + if (this->bufferSize < MQTT_MAX_HEADER_SIZE + 2 + 2 + topicLen) { + // Too long: header + nextMsgId (2) + topic length bytes (2) + topicLen + return false; + } + if (connected()) { + // Leave room in the buffer for header and variable length field + uint16_t length = MQTT_MAX_HEADER_SIZE; + nextMsgId++; + if (nextMsgId == 0) { + nextMsgId = 1; + } + this->buffer[length++] = (nextMsgId >> 8); + this->buffer[length++] = (nextMsgId & 0xFF); + length = writeString(topic, this->buffer, length); + this->buffer[length++] = qos; + return write(MQTTSUBSCRIBE | MQTTQOS1, this->buffer, length - MQTT_MAX_HEADER_SIZE); + } + return false; +} + +bool PubSubClient::unsubscribe(const char* topic) { + if (!topic) return false; + + size_t topicLen = strnlen(topic, this->bufferSize); + if (this->bufferSize < MQTT_MAX_HEADER_SIZE + 2 + 2 + topicLen) { + // Too long: header + nextMsgId (2) + topic length bytes (2) + topicLen + return false; + } + if (connected()) { + uint16_t length = MQTT_MAX_HEADER_SIZE; + nextMsgId++; + if (nextMsgId == 0) { + nextMsgId = 1; + } + this->buffer[length++] = (nextMsgId >> 8); + this->buffer[length++] = (nextMsgId & 0xFF); + length = writeString(topic, this->buffer, length); + return write(MQTTUNSUBSCRIBE | MQTTQOS1, this->buffer, length - MQTT_MAX_HEADER_SIZE); + } + return false; +} + +PubSubClient& PubSubClient::setServer(uint8_t* ip, uint16_t port) { + IPAddress addr(ip[0], ip[1], ip[2], ip[3]); + return setServer(addr, port); +} + +PubSubClient& PubSubClient::setServer(IPAddress ip, uint16_t port) { + this->ip = ip; + this->port = port; + free(this->domain); + this->domain = nullptr; + return *this; +} + +PubSubClient& PubSubClient::setServer(const char* domain, uint16_t port) { + char* newDomain = nullptr; + if (domain) { + newDomain = (char*)realloc(this->domain, strlen(domain) + 1); + } + if (newDomain) { + strcpy(newDomain, domain); + this->domain = newDomain; + this->port = port; + } else { + free(this->domain); + this->domain = nullptr; + this->port = 0; + } + return *this; +} + +PubSubClient& PubSubClient::setCallback(MQTT_CALLBACK_SIGNATURE) { + this->callback = callback; + return *this; +} + +PubSubClient& PubSubClient::setClient(Client& client) { + this->_client = &client; + return *this; +} + +PubSubClient& PubSubClient::setStream(Stream& stream) { + this->stream = &stream; + return *this; +} + +bool PubSubClient::setBufferSize(size_t size) { + if (size == 0) { + // Cannot set it back to 0 + return false; + } + if (this->bufferSize == 0) { + this->buffer = (uint8_t*)malloc(size); + } else { + uint8_t* newBuffer = (uint8_t*)realloc(this->buffer, size); + if (newBuffer) { + this->buffer = newBuffer; + } else { + return false; + } + } + this->bufferSize = size; + return (this->buffer != nullptr); +} + +size_t PubSubClient::getBufferSize() { + return this->bufferSize; +} + +PubSubClient& PubSubClient::setKeepAlive(uint16_t keepAlive) { + this->keepAliveMillis = keepAlive * 1000UL; + return *this; +} + +PubSubClient& PubSubClient::setSocketTimeout(uint16_t timeout) { + this->socketTimeoutMillis = timeout * 1000UL; + return *this; +} + +int PubSubClient::state() { + return this->_state; +} diff --git a/lib/pubsubclient3/src/PubSubClient.h b/lib/pubsubclient3/src/PubSubClient.h new file mode 100644 index 000000000..d899786bc --- /dev/null +++ b/lib/pubsubclient3/src/PubSubClient.h @@ -0,0 +1,612 @@ +/* + PubSubClient.h - A simple client for MQTT. + Nick O'Leary, Holger Mueller + http://knolleary.net + https://github.com/hmueller01/pubsubclient3 +*/ + +#ifndef PubSubClient_h +#define PubSubClient_h + +#include + +#include "Client.h" +#include "IPAddress.h" +#include "Stream.h" + +#define MQTT_VERSION_3_1 3 +#define MQTT_VERSION_3_1_1 4 + +//< @note The following #define directives can be used to configure the library. + +/** + * @brief Sets the version of the MQTT protocol to use. + * @note Default value is MQTT_VERSION_3_1_1 for MQTT 3.1.1. + */ +#ifndef MQTT_VERSION +#define MQTT_VERSION MQTT_VERSION_3_1_1 +#endif + +// MQTT_MAX_POSSIBLE_PACKET_SIZE : Maximum packet size defined by MQTT protocol. +#ifndef MQTT_MAX_POSSIBLE_PACKET_SIZE +#define MQTT_MAX_POSSIBLE_PACKET_SIZE 268435455 +#endif + +/** + * @brief Sets the largest packet size, in bytes, the client will handle. + * Any packet received that exceeds this size will be ignored. + * This value can be overridden by calling setBufferSize. + * @note Default value is 256 bytes. + */ +#ifndef MQTT_MAX_PACKET_SIZE +#define MQTT_MAX_PACKET_SIZE 256 +#endif + +/** + * @brief Sets the keepalive interval, in seconds, the client will use. + * This is used to maintain the connection when no other packets are being sent or received. + * This value can be overridden by calling setKeepAlive. + * @note Default value is 15 seconds. + */ +#ifndef MQTT_KEEPALIVE +#define MQTT_KEEPALIVE 15 +#endif + +/** + * @brief Sets the timeout, in seconds, when reading from the network. + * This also applies as the timeout for calls to connect. + * This value can be overridden by calling setSocketTimeout. + * @note Default value is 15 seconds. + */ +#ifndef MQTT_SOCKET_TIMEOUT +#define MQTT_SOCKET_TIMEOUT 15 +#endif + +/** + * @brief Sets the maximum number of bytes passed to the network client in each write call. + * Some hardware has a limit to how much data can be passed to them in one go, + * such as the Arduino Wifi Shield. + * @note Defaults to undefined, which passes the entire packet in each write call. + */ +// #define MQTT_MAX_TRANSFER_SIZE 80 + +// Possible values for client.state() +#define MQTT_CONNECTION_TIMEOUT -4 +#define MQTT_CONNECTION_LOST -3 +#define MQTT_CONNECT_FAILED -2 +#define MQTT_DISCONNECTED -1 +#define MQTT_CONNECTED 0 +#define MQTT_CONNECT_BAD_PROTOCOL 1 +#define MQTT_CONNECT_BAD_CLIENT_ID 2 +#define MQTT_CONNECT_UNAVAILABLE 3 +#define MQTT_CONNECT_BAD_CREDENTIALS 4 +#define MQTT_CONNECT_UNAUTHORIZED 5 + +#define MQTTRETAINED 1 // Retained flag in the header +#define MQTTCONNECT 1 << 4 // Client request to connect to Server +#define MQTTCONNACK 2 << 4 // Connect Acknowledgment +#define MQTTPUBLISH 3 << 4 // Publish message +#define MQTTPUBACK 4 << 4 // Publish Acknowledgment +#define MQTTPUBREC 5 << 4 // Publish Received (assured delivery part 1) +#define MQTTPUBREL 6 << 4 // Publish Release (assured delivery part 2) +#define MQTTPUBCOMP 7 << 4 // Publish Complete (assured delivery part 3) +#define MQTTSUBSCRIBE 8 << 4 // Client Subscribe request +#define MQTTSUBACK 9 << 4 // Subscribe Acknowledgment +#define MQTTUNSUBSCRIBE 10 << 4 // Client Unsubscribe request +#define MQTTUNSUBACK 11 << 4 // Unsubscribe Acknowledgment +#define MQTTPINGREQ 12 << 4 // PING Request +#define MQTTPINGRESP 13 << 4 // PING Response +#define MQTTDISCONNECT 14 << 4 // Client is Disconnecting +#define MQTTRESERVED 15 << 4 // Reserved + +#define MQTTQOS0 (0 << 1) +#define MQTTQOS1 (1 << 1) +#define MQTTQOS2 (2 << 1) + +// Maximum size of fixed header and variable length size header +#define MQTT_MAX_HEADER_SIZE 5 + +#if defined(__has_include) && __has_include() && !defined(NOFUNCTIONAL) +#include +/** + * @brief Define the signature required by any callback function. + * @note The parameters are TOPIC, PAYLOAD, and LENGTH, respectively. + */ +#define MQTT_CALLBACK_SIGNATURE std::function callback +#else +#define MQTT_CALLBACK_SIGNATURE void (*callback)(char*, uint8_t*, size_t) +#endif + +#define CHECK_STRING_LENGTH(l, s) \ + if (l + 2 + strnlen(s, this->bufferSize) > this->bufferSize) { \ + _client->stop(); \ + return false; \ + } + +#ifdef DEBUG_ESP_PORT +#ifdef DEBUG_PUBSUBCLIENT +#define DEBUG_PSC_PRINTF(fmt, ...) DEBUG_ESP_PORT.printf(("PubSubClient: " fmt), ##__VA_ARGS__) +#else +#define DEBUG_PSC_PRINTF(...) +#endif + +#define ERROR_PSC_PRINTF(fmt, ...) DEBUG_ESP_PORT.printf(("PubSubClient error: " fmt), ##__VA_ARGS__) +#define ERROR_PSC_PRINTF_P(fmt, ...) DEBUG_ESP_PORT.printf_P(PSTR("PubSubClient error: " fmt), ##__VA_ARGS__) +#else // DEBUG_ESP_PORT +#ifndef DEBUG_PSC_PRINTF +#define DEBUG_PSC_PRINTF(...) +#endif +#ifndef ERROR_PSC_PRINTF +#define ERROR_PSC_PRINTF(fmt, ...) +#endif +#ifndef ERROR_PSC_PRINTF_P +#define ERROR_PSC_PRINTF_P(fmt, ...) +#endif +#endif + +/** + * @class PubSubClient + * @brief This class provides a client for doing simple publish and subscribe messaging with a server that supports MQTT. + */ +class PubSubClient : public Print { + private: + Client* _client{}; + uint8_t* buffer{}; + size_t bufferSize{}; + unsigned long keepAliveMillis{}; + unsigned long socketTimeoutMillis{}; + uint16_t nextMsgId{}; + unsigned long lastOutActivity{}; + unsigned long lastInActivity{}; + bool pingOutstanding{}; + MQTT_CALLBACK_SIGNATURE{}; + IPAddress ip{}; + char* domain{}; + uint16_t port{}; + Stream* stream{}; + int _state{MQTT_DISCONNECTED}; + + size_t readPacket(uint8_t* hdrLen); + bool handlePacket(uint8_t hdrLen, size_t len); + bool readByte(uint8_t* result); + bool readByte(uint8_t* result, size_t* pos); + uint8_t buildHeader(uint8_t header, uint8_t* buf, size_t length); + bool write(uint8_t header, uint8_t* buf, size_t length); + size_t writeString(const char* string, uint8_t* buf, size_t pos); + size_t writeString(const char* string, uint8_t* buf, size_t pos, size_t size); + + public: + /** + * @brief Creates an uninitialised client instance. + * @note Before it can be used, + * it must be configured using the property setters setClient and setServer. + */ + PubSubClient(); + + /** + * @brief Creates a partially initialised client instance. + * @param client The network client to use, for example WiFiClient. + * @note Before it can be used, + * it must be configured with the property setter setServer. + */ + PubSubClient(Client& client); + + /** + * @brief Creates a fully configured client instance. + * @param domain The address of the server. + * @param port The port to connect to. + * @param client The network client to use, for example WiFiClient. + */ + PubSubClient(IPAddress, uint16_t, Client& client); + + /** + * @brief Creates a fully configured client instance. + * @param domain The address of the server. + * @param port The port to connect to. + * @param client The network client to use, for example WiFiClient. + * @param stream A stream to write received messages to. + */ + PubSubClient(IPAddress, uint16_t, Client& client, Stream&); + + /** + * @brief Creates a fully configured client instance. + * @param domain The address of the server. + * @param port The port to connect to. + * @param callback Pointer to a message callback function. + * Called when a message arrives for a subscription created by this client. + * @param client The network client to use, for example WiFiClient. + */ + PubSubClient(IPAddress, uint16_t, MQTT_CALLBACK_SIGNATURE, Client& client); + + /** + * @brief Creates a fully configured client instance. + * @param domain The address of the server. + * @param port The port to connect to. + * @param callback Pointer to a message callback function. + * Called when a message arrives for a subscription created by this client. + * @param client The network client to use, for example WiFiClient. + * @param stream A stream to write received messages to. + */ + PubSubClient(IPAddress, uint16_t, MQTT_CALLBACK_SIGNATURE, Client& client, Stream&); + + /** + * @brief Creates a fully configured client instance. + * @param domain The address of the server. + * @param port The port to connect to. + * @param client The network client to use, for example WiFiClient. + */ + PubSubClient(uint8_t*, uint16_t, Client& client); + + /** + * @brief Creates a fully configured client instance. + * @param domain The address of the server. + * @param port The port to connect to. + * @param client The network client to use, for example WiFiClient. + * @param stream A stream to write received messages to. + */ + PubSubClient(uint8_t*, uint16_t, Client& client, Stream&); + + /** + * @brief Creates a fully configured client instance. + * @param domain The address of the server. + * @param port The port to connect to. + * @param callback Pointer to a message callback function. + * Called when a message arrives for a subscription created by this client. + * @param client The network client to use, for example WiFiClient. + */ + PubSubClient(uint8_t*, uint16_t, MQTT_CALLBACK_SIGNATURE, Client& client); + + /** + * @brief Creates a fully configured client instance. + * @param domain The address of the server. + * @param port The port to connect to. + * @param callback Pointer to a message callback function. + * Called when a message arrives for a subscription created by this client. + * @param client The network client to use, for example WiFiClient. + * @param stream A stream to write received messages to. + */ + PubSubClient(uint8_t*, uint16_t, MQTT_CALLBACK_SIGNATURE, Client& client, Stream&); + + /** + * @brief Creates a fully configured client instance. + * @param domain The address of the server. + * @param port The port to connect to. + * @param client The network client to use, for example WiFiClient. + */ + PubSubClient(const char*, uint16_t, Client& client); + + /** + * @brief Creates a fully configured client instance. + * @param domain The address of the server. + * @param port The port to connect to. + * @param client The network client to use, for example WiFiClient. + * @param stream A stream to write received messages to. + */ + PubSubClient(const char*, uint16_t, Client& client, Stream&); + + /** + * @brief Creates a fully configured client instance. + * @param domain The address of the server. + * @param port The port to connect to. + * @param callback Pointer to a message callback function. + * Called when a message arrives for a subscription created by this client. + * @param client The network client to use, for example WiFiClient. + */ + PubSubClient(const char*, uint16_t, MQTT_CALLBACK_SIGNATURE, Client& client); + + /** + * @brief Creates a fully configured client instance. + * @param domain The address of the server. + * @param port The port to connect to. + * @param callback Pointer to a message callback function. + * Called when a message arrives for a subscription created by this client. + * @param client The network client to use, for example WiFiClient. + * @param stream A stream to write received messages to. + */ + PubSubClient(const char*, uint16_t, MQTT_CALLBACK_SIGNATURE, Client& client, Stream&); + + /** + * @brief Destructor for the PubSubClient class. + */ + ~PubSubClient(); + + /** + * @brief Sets the server details. + * @param ip The address of the server. + * @param port The port to connect to. + * @return The client instance, allowing the function to be chained. + */ + PubSubClient& setServer(IPAddress ip, uint16_t port); + + /** + * @brief Sets the server details. + * @param ip The address of the server. + * @param port The port to connect to. + * @return The client instance, allowing the function to be chained. + */ + PubSubClient& setServer(uint8_t* ip, uint16_t port); + + /** + * @brief Sets the server details. + * @param ip The address of the server. + * @param port The port to connect to. + * @return The client instance, allowing the function to be chained. + */ + PubSubClient& setServer(const char* domain, uint16_t port); + + /** + * @brief Sets the message callback function. + * @param callback Pointer to a message callback function. + * Called when a message arrives for a subscription created by this client. + * @return The client instance, allowing the function to be chained. + */ + PubSubClient& setCallback(MQTT_CALLBACK_SIGNATURE); + + /** + * @brief Sets the network client instance to use. + * @param client The network client to use, for example WiFiClient. + * @return The client instance, allowing the function to be chained. + */ + PubSubClient& setClient(Client& client); + + /** + * @brief Sets the stream to write received messages to. + * @param stream A stream to write received messages to. + * @return The client instance, allowing the function to be chained. + */ + PubSubClient& setStream(Stream& stream); + + /** + * @brief Sets the keep alive interval used by the client. + * This value should only be changed when the client is not connected. + * Set keepAlive to zero (0) to turn off the keep alive mechanism. + * @param keepAlive The keep alive interval, in seconds. + * @return The client instance, allowing the function to be chained. + */ + PubSubClient& setKeepAlive(uint16_t keepAlive); + + /** + * @brief Sets the socket timeout used by the client. + * This determines how long the client will wait for incoming data when it expects data to arrive - for example, + * whilst it is in the middle of reading a MQTT packet. + * @param timeout The socket timeout, in seconds. + * @return The client instance, allowing the function to be chained. + */ + PubSubClient& setSocketTimeout(uint16_t timeout); + + /** + * @brief Sets the size, in bytes, of the internal send and receive buffer. + * This must be large enough to contain the full MQTT packet. + * When sending or receiving messages, the packet will contain the full topic string, + * the payload data, and a small number of header bytes. + * @param size The size, in bytes, for the internal buffer. + * @return true If the buffer was resized. + * false If the buffer could not be resized. + */ + bool setBufferSize(size_t size); + + /** + * @brief Gets the current size of the internal buffer. + * @return The size of the internal buffer. + */ + size_t getBufferSize(); + + /** + * @brief Connects the client. + * @param id The client ID to use when connecting to the server. + * @return true If client succeeded in establishing a connection to the broker. + * false If client failed to establish a connection to the broker. + */ + bool connect(const char* id); + + /** + * @brief Connects the client. + * @param id The client ID to use when connecting to the server. + * @param user The username to use. If NULL, no username or password is used. + * @param pass The password to use. If NULL, no password is used. + * @return true If client succeeded in establishing a connection to the broker. + * false If client failed to establish a connection to the broker. + */ + bool connect(const char* id, const char* user, const char* pass); + + /** + * @brief Connects the client. + * @param id The client ID to use when connecting to the server. + * @param willTopic The topic to be used by the will message. + * @param willQos The quality of service to be used by the will message. [0, 1, 2]. + * @param willRetain Publish the will message with the retain flag. + * @return true If client succeeded in establishing a connection to the broker. + * false If client failed to establish a connection to the broker. + */ + bool connect(const char* id, const char* willTopic, uint8_t willQos, bool willRetain, const char* willMessage); + + /** + * @brief Connects the client. + * @param id The client ID to use when connecting to the server. + * @param user The username to use. If NULL, no username or password is used. + * @param pass The password to use. If NULL, no password is used. + * @param willTopic The topic to be used by the will message. + * @param willQos The quality of service to be used by the will message. [0, 1, 2]. + * @param willRetain Publish the will message with the retain flag. + * @return true If client succeeded in establishing a connection to the broker. + * false If client failed to establish a connection to the broker. + */ + bool connect(const char* id, const char* user, const char* pass, const char* willTopic, uint8_t willQos, bool willRetain, const char* willMessage); + + /** + * @brief Connects the client. + * @param id The client ID to use when connecting to the server. + * @param user The username to use. If NULL, no username or password is used. + * @param pass The password to use. If NULL, no password is used. + * @param willTopic The topic to be used by the will message. + * @param willQos The quality of service to be used by the will message. [0, 1, 2]. + * @param willRetain Publish the will message with the retain flag. + * @param cleanSession Connect with a clean session. + * @return true If client succeeded in establishing a connection to the broker. + * false If client failed to establish a connection to the broker. + */ + bool connect(const char* id, const char* user, const char* pass, const char* willTopic, uint8_t willQos, bool willRetain, const char* willMessage, + bool cleanSession); + + /** + * @brief Disconnects the client. + */ + void disconnect(); + + /** + * @brief Publishes a non retained message to the specified topic. + * @param topic The topic to publish to. + * @param payload The message to publish. + * @return true If the publish succeeded. + * false If the publish failed, either connection lost or message too large. + */ + bool publish(const char* topic, const char* payload); + + /** + * @brief Publishes a message to the specified topic. + * @param topic The topic to publish to. + * @param payload The message to publish. + * @param retained Publish the message with the retain flag. + * @return true If the publish succeeded. + * false If the publish failed, either connection lost or message too large. + */ + bool publish(const char* topic, const char* payload, bool retained); + + /** + * @brief Publishes a non retained message to the specified topic. + * @param topic The topic to publish to. + * @param payload The message to publish. + * @param plength The length of the payload. + * @return true If the publish succeeded. + * false If the publish failed, either connection lost or message too large. + */ + bool publish(const char* topic, const uint8_t* payload, size_t plength); + + /** + * @brief Publishes a message to the specified topic. + * @param topic The topic to publish to. + * @param payload The message to publish. + * @param plength The length of the payload. + * @param retained Publish the message with the retain flag. + * @return true If the publish succeeded. + * false If the publish failed, either connection lost or message too large. + */ + bool publish(const char* topic, const uint8_t* payload, size_t plength, bool retained); + + /** + * @brief Publishes a message stored in PROGMEM to the specified topic. + * @param topic The topic to publish to. + * @param payload The message to publish. + * @param retained Publish the message with the retain flag. + * @return true If the publish succeeded. + * false If the publish failed, either connection lost or message too large. + */ + bool publish_P(const char* topic, const char* payload, bool retained); + + /** + * @brief Publishes a message stored in PROGMEM to the specified topic. + * @param topic The topic to publish to. + * @param payload The message to publish. + * @param plength The length of the payload. + * @param retained Publish the message with the retain flag. + * @return true If the publish succeeded. + * false If the publish failed, either connection lost or message too large. + */ + bool publish_P(const char* topic, const uint8_t* payload, size_t plength, bool retained); + + /** + * @brief Start to publish a message. + * This API: + * beginPublish(...) + * one or more calls to write(...) + * endPublish() + * Allows for arbitrarily large payloads to be sent without them having to be copied into + * a new buffer and held in memory at one time. + * @param topic The topic to publish to. + * @param plength The length of the payload. + * @param retained Publish the message with the retain flag. + * @return true If the publish succeeded. + * false If the publish failed, either connection lost or message too large. + */ + bool beginPublish(const char* topic, size_t plength, bool retained); + + /** + * @brief Finish sending a message that was started with a call to beginPublish. + * @return true If the publish succeeded. + * false If the publish failed, either connection lost or message too large. + */ + bool endPublish(); + + /** + * @brief Writes a single byte as a component of a publish started with a call to beginPublish. + * @param byte A byte to write to the publish payload. + * @return The number of bytes written. + */ + virtual size_t write(uint8_t); + + /** + * @brief Writes an array of bytes as a component of a publish started with a call to beginPublish. + * @param buffer The bytes to write. + * @param size The length of the payload to be sent. + * @return The number of bytes written. + */ + virtual size_t write(const uint8_t* buffer, size_t size); + + /** + * @brief Subscribes to messages published to the specified topic. + * @param topic The topic to subscribe to. + * @return true If sending the subscribe succeeded. + * false If sending the subscribe failed, either connection lost or message too large. + */ + bool subscribe(const char* topic); + + /** + * @brief Subscribes to messages published to the specified topic. + * @param topic The topic to subscribe to. + * @param qos The qos to subscribe at. [0, 1]. + * @return true If sending the subscribe succeeded. + * false If sending the subscribe failed, either connection lost or message too large. + */ + bool subscribe(const char* topic, uint8_t qos); + + /** + * @brief Unsubscribes from the specified topic. + * @param topic The topic to unsubscribe from. + * @return true If sending the unsubscribe succeeded. + * false If sending the unsubscribe failed, either connection lost or message too large. + */ + bool unsubscribe(const char* topic); + + /** + * @brief This should be called regularly to allow the client to process incoming messages and maintain its connection to the server. + * @return true If the client is still connected. + * false If the client is no longer connected. + */ + bool loop(); + + /** + * @brief Checks whether the client is connected to the server. + * @return true If the client is connected. + * false If the client is not connected. + */ + bool connected(); + + /** + * @brief Returns the current state of the client. + * If a connection attempt fails, this can be used to get more information about the failure. + * @note All of the values have corresponding constants defined in PubSubClient.h. + * @return -4 : MQTT_CONNECTION_TIMEOUT - The server didn't respond within the keepalive time. + * -3 : MQTT_CONNECTION_LOST - The network connection was broken. + * -2 : MQTT_CONNECT_FAILED - The network connection failed. + * -1 : MQTT_DISCONNECTED - The client is disconnected cleanly. + * 0 : MQTT_CONNECTED - The client is connected. + * 1 : MQTT_CONNECT_BAD_PROTOCOL - The server doesn't support the requested version of MQTT. + * 2 : MQTT_CONNECT_BAD_CLIENT_ID - The server rejected the client identifier. + * 3 : MQTT_CONNECT_UNAVAILABLE - The server was unable to accept the connection. + * 4 : MQTT_CONNECT_BAD_CREDENTIALS - The username/password were rejected. + * 5 : MQTT_CONNECT_UNAUTHORIZED - The client was not authorized to connect. + */ + int state(); +}; + +#endif diff --git a/lib/pubsubclient/tests/.gitignore b/lib/pubsubclient3/tests/.gitignore similarity index 100% rename from lib/pubsubclient/tests/.gitignore rename to lib/pubsubclient3/tests/.gitignore diff --git a/lib/pubsubclient/tests/Makefile b/lib/pubsubclient3/tests/Makefile similarity index 52% rename from lib/pubsubclient/tests/Makefile rename to lib/pubsubclient3/tests/Makefile index 1f7163675..1e67aac80 100644 --- a/lib/pubsubclient/tests/Makefile +++ b/lib/pubsubclient3/tests/Makefile @@ -6,7 +6,11 @@ VPATH=${SRC_PATH} SHIM_FILES=${SRC_PATH}/lib/*.cpp PSC_FILE=../src/PubSubClient.cpp CC=g++ -CFLAGS=-I${SRC_PATH}/lib -I../src +CFLAGS=-std=c++11 -I${SRC_PATH}/lib -I../src +CFLAGS+=-pedantic -Werror -Wall -Wextra -Wcast-align -Wcast-qual -Wctor-dtor-privacy -Wdisabled-optimization -Wformat=2 +CFLAGS+=-Winit-self -Wmissing-declarations -Wmissing-include-dirs -Wno-unused -Wnull-dereference -Woverloaded-virtual +CFLAGS+=-Wredundant-decls -Wreorder -Wsign-conversion -Wsign-promo -Wstrict-overflow=5 -Wswitch-default -Wundef +#CFLAGS+=-DDEBUG_PUBSUBCLIENT all: $(TEST_BIN) @@ -17,7 +21,7 @@ ${OUT_PATH}/%: ${SRC_PATH}/%.cpp ${PSC_FILE} ${SHIM_FILES} clean: @rm -rf ${OUT_PATH} -test: +test: all @bin/connect_spec @bin/publish_spec @bin/receive_spec diff --git a/lib/pubsubclient/tests/README.md b/lib/pubsubclient3/tests/README.md similarity index 93% rename from lib/pubsubclient/tests/README.md rename to lib/pubsubclient3/tests/README.md index e5700a6d6..e29496ad5 100644 --- a/lib/pubsubclient/tests/README.md +++ b/lib/pubsubclient3/tests/README.md @@ -7,9 +7,7 @@ There are two parts: - Tests that can be compiled and run on any machine - Tests that build the example sketches using the Arduino IDE - -It is a work-in-progress and is subject to complete refactoring as the whim takes -me. +It is a work-in-progress and is subject to complete refactoring as the whim takes me. ## Local tests @@ -17,8 +15,7 @@ me. These are a set of executables that can be run to test specific areas of functionality. They do not require a real Arduino to be attached, nor the use of the Arduino IDE. -The tests include a set of mock files to stub out the parts of the Arduino environment the library -depends on. +The tests include a set of mock files to stub out the parts of the Arduino environment the library depends on. ### Dependencies @@ -30,13 +27,15 @@ Build the tests using the provided `Makefile`: $ make -This will create a set of executables in `./bin/`. Run each of these executables to test the corresponding functionality. +This will create a set of executables in `./bin/`. Run each of these executables to test the corresponding functionality. + + $ make test *Note:* the `connect_spec` and `keepalive_spec` tests involve testing keepalive timers so naturally take a few minutes to run through. ## Arduino tests -*Note:* INO Tool doesn't currently play nicely with Arduino 1.5. This has broken this test suite. +*Note:* INO Tool doesn't currently play nicely with Arduino 1.5. This has broken this test suite. Without a suitable arduino plugged in, the test suite will only check the example sketches compile cleanly against the library. @@ -52,7 +51,7 @@ test case is built, uploaded and then the tests run. ### Running The test suite _does not_ run an MQTT server - it is assumed to be running already. - + $ python testsuite.py A summary of activity is printed to the console. More comprehensive logs are written @@ -67,7 +66,7 @@ The test case must follow these conventions: - sub-class `unittest.TestCase` - provide the class methods `setUpClass` and `tearDownClass` (TODO: make this optional) - all test method names begin with `test_` - + The suite will call the `setUpClass` method _before_ uploading the sketch. This allows any test setup to be performed before the sketch runs - such as connecting a client and subscribing to topics. @@ -87,7 +86,3 @@ do this, the suite looks for lines that _start_ with the following: byte ip[] = { and replaces them with the appropriate values. - - - - diff --git a/lib/pubsubclient3/tests/src/connect_spec.cpp b/lib/pubsubclient3/tests/src/connect_spec.cpp new file mode 100644 index 000000000..75dc819b5 --- /dev/null +++ b/lib/pubsubclient3/tests/src/connect_spec.cpp @@ -0,0 +1,361 @@ +#include "BDDTest.h" +#include "Buffer.h" +#include "PubSubClient.h" +#include "ShimClient.h" +#include "trace.h" + +byte server[] = {172, 16, 0, 2}; + +// function declarations +void callback(char* topic, uint8_t* payload, size_t length); +int test_connect_fails_no_network(); +int test_connect_fails_on_no_response(); +int test_connect_properly_formatted(); +int test_connect_properly_formatted_hostname(); +int test_connect_fails_on_bad_rc(); +int test_connect_non_clean_session(); +int test_connect_accepts_username_password(); +int test_connect_accepts_username_no_password(); +int test_connect_accepts_username_blank_password(); +int test_connect_ignores_password_no_username(); +int test_connect_with_will(); +int test_connect_with_will_username_password(); +int test_connect_disconnect_connect(); +int test_connect_custom_keepalive(); + +void callback(_UNUSED_ char* topic, _UNUSED_ uint8_t* payload, _UNUSED_ size_t length) { + // handle message arrived +} + +int test_connect_fails_no_network() { + IT("fails to connect if underlying client doesn't connect"); + ShimClient shimClient; + shimClient.setAllowConnect(false); + PubSubClient client(server, 1883, callback, shimClient); + bool rc = client.connect("client_test1"); + IS_FALSE(rc); + int state = client.state(); + IS_TRUE(state == MQTT_CONNECT_FAILED); + END_IT +} + +int test_connect_fails_on_no_response() { + IT("fails to connect if no response received after 15 seconds"); + ShimClient shimClient; + shimClient.setAllowConnect(true); + PubSubClient client(server, 1883, callback, shimClient); + bool rc = client.connect("client_test1"); + IS_FALSE(rc); + int state = client.state(); + IS_TRUE(state == MQTT_CONNECTION_TIMEOUT); + END_IT +} + +int test_connect_properly_formatted() { + IT("sends a properly formatted connect packet and succeeds"); + ShimClient shimClient; + + shimClient.setAllowConnect(true); + byte expectServer[] = {172, 16, 0, 2}; + shimClient.expectConnect(expectServer, 1883); + byte connect[] = {0x10, 0x18, 0x0, 0x4, 0x4d, 0x51, 0x54, 0x54, 0x4, 0x2, 0x0, 0xf, 0x0, + 0xc, 0x63, 0x6c, 0x69, 0x65, 0x6e, 0x74, 0x5f, 0x74, 0x65, 0x73, 0x74, 0x31}; + byte connack[] = {0x20, 0x02, 0x00, 0x00}; + + shimClient.expect(connect, 26); + shimClient.respond(connack, 4); + + PubSubClient client(server, 1883, callback, shimClient); + int state = client.state(); + IS_TRUE(state == MQTT_DISCONNECTED); + + bool rc = client.connect("client_test1"); + IS_TRUE(rc); + IS_FALSE(shimClient.error()); + + state = client.state(); + IS_TRUE(state == MQTT_CONNECTED); + + END_IT +} + +int test_connect_properly_formatted_hostname() { + IT("accepts a hostname"); + ShimClient shimClient; + + shimClient.setAllowConnect(true); + shimClient.expectConnect("localhost", 1883); + byte connack[] = {0x20, 0x02, 0x00, 0x00}; + shimClient.respond(connack, 4); + + PubSubClient client("localhost", 1883, callback, shimClient); + bool rc = client.connect("client_test1"); + IS_TRUE(rc); + IS_FALSE(shimClient.error()); + + END_IT +} + +int test_connect_fails_on_bad_rc() { + IT("fails to connect if a bad return code is received"); + ShimClient shimClient; + shimClient.setAllowConnect(true); + byte connack[] = {0x20, 0x02, 0x00, 0x01}; + shimClient.respond(connack, 4); + + PubSubClient client(server, 1883, callback, shimClient); + bool rc = client.connect("client_test1"); + IS_FALSE(rc); + + int state = client.state(); + IS_TRUE(state == 0x01); + + END_IT +} + +int test_connect_non_clean_session() { + IT("sends a properly formatted non-clean session connect packet and succeeds"); + ShimClient shimClient; + + shimClient.setAllowConnect(true); + byte expectServer[] = {172, 16, 0, 2}; + shimClient.expectConnect(expectServer, 1883); + byte connect[] = {0x10, 0x18, 0x0, 0x4, 0x4d, 0x51, 0x54, 0x54, 0x4, 0x0, 0x0, 0xf, 0x0, + 0xc, 0x63, 0x6c, 0x69, 0x65, 0x6e, 0x74, 0x5f, 0x74, 0x65, 0x73, 0x74, 0x31}; + byte connack[] = {0x20, 0x02, 0x00, 0x00}; + + shimClient.expect(connect, 26); + shimClient.respond(connack, 4); + + PubSubClient client(server, 1883, callback, shimClient); + int state = client.state(); + IS_TRUE(state == MQTT_DISCONNECTED); + + bool rc = client.connect("client_test1", 0, 0, 0, 0, 0, 0, 0); + IS_TRUE(rc); + IS_FALSE(shimClient.error()); + + state = client.state(); + IS_TRUE(state == MQTT_CONNECTED); + + END_IT +} + +int test_connect_accepts_username_password() { + IT("accepts a username and password"); + ShimClient shimClient; + shimClient.setAllowConnect(true); + + byte connect[] = {0x10, 0x24, 0x0, 0x4, 0x4d, 0x51, 0x54, 0x54, 0x4, 0xc2, 0x0, 0xf, 0x0, 0xc, 0x63, 0x6c, 0x69, 0x65, 0x6e, + 0x74, 0x5f, 0x74, 0x65, 0x73, 0x74, 0x31, 0x0, 0x4, 0x75, 0x73, 0x65, 0x72, 0x0, 0x4, 0x70, 0x61, 0x73, 0x73}; + byte connack[] = {0x20, 0x02, 0x00, 0x00}; + shimClient.expect(connect, 0x26); + shimClient.respond(connack, 4); + + PubSubClient client(server, 1883, callback, shimClient); + bool rc = client.connect("client_test1", "user", "pass"); + IS_TRUE(rc); + IS_FALSE(shimClient.error()); + + END_IT +} + +int test_connect_accepts_username_no_password() { + IT("accepts a username but no password"); + ShimClient shimClient; + shimClient.setAllowConnect(true); + + byte connect[] = {0x10, 0x1e, 0x0, 0x4, 0x4d, 0x51, 0x54, 0x54, 0x4, 0x82, 0x0, 0xf, 0x0, 0xc, 0x63, 0x6c, + 0x69, 0x65, 0x6e, 0x74, 0x5f, 0x74, 0x65, 0x73, 0x74, 0x31, 0x0, 0x4, 0x75, 0x73, 0x65, 0x72}; + byte connack[] = {0x20, 0x02, 0x00, 0x00}; + shimClient.expect(connect, 0x20); + shimClient.respond(connack, 4); + + PubSubClient client(server, 1883, callback, shimClient); + bool rc = client.connect("client_test1", "user", 0); + IS_TRUE(rc); + IS_FALSE(shimClient.error()); + + END_IT +} + +int test_connect_accepts_username_blank_password() { + IT("accepts a username and blank password"); + ShimClient shimClient; + shimClient.setAllowConnect(true); + + byte connect[] = {0x10, 0x20, 0x0, 0x4, 0x4d, 0x51, 0x54, 0x54, 0x4, 0xc2, 0x0, 0xf, 0x0, 0xc, 0x63, 0x6c, 0x69, + 0x65, 0x6e, 0x74, 0x5f, 0x74, 0x65, 0x73, 0x74, 0x31, 0x0, 0x4, 0x75, 0x73, 0x65, 0x72, 0x0, 0x0}; + byte connack[] = {0x20, 0x02, 0x00, 0x00}; + shimClient.expect(connect, 0x26); + shimClient.respond(connack, 4); + + PubSubClient client(server, 1883, callback, shimClient); + bool rc = client.connect("client_test1", "user", "pass"); + IS_TRUE(rc); + IS_FALSE(shimClient.error()); + + END_IT +} + +int test_connect_ignores_password_no_username() { + IT("ignores a password but no username"); + ShimClient shimClient; + shimClient.setAllowConnect(true); + + byte connect[] = {0x10, 0x18, 0x0, 0x4, 0x4d, 0x51, 0x54, 0x54, 0x4, 0x2, 0x0, 0xf, 0x0, + 0xc, 0x63, 0x6c, 0x69, 0x65, 0x6e, 0x74, 0x5f, 0x74, 0x65, 0x73, 0x74, 0x31}; + byte connack[] = {0x20, 0x02, 0x00, 0x00}; + shimClient.expect(connect, 26); + shimClient.respond(connack, 4); + + PubSubClient client(server, 1883, callback, shimClient); + bool rc = client.connect("client_test1", 0, "pass"); + IS_TRUE(rc); + IS_FALSE(shimClient.error()); + + END_IT +} + +int test_connect_with_will() { + IT("accepts a will"); + ShimClient shimClient; + shimClient.setAllowConnect(true); + + byte connect[] = {0x10, 0x30, 0x0, 0x4, 0x4d, 0x51, 0x54, 0x54, 0x4, 0xe, 0x0, 0xf, 0x0, 0xc, 0x63, 0x6c, 0x69, + 0x65, 0x6e, 0x74, 0x5f, 0x74, 0x65, 0x73, 0x74, 0x31, 0x0, 0x9, 0x77, 0x69, 0x6c, 0x6c, 0x54, 0x6f, + 0x70, 0x69, 0x63, 0x0, 0xb, 0x77, 0x69, 0x6c, 0x6c, 0x4d, 0x65, 0x73, 0x73, 0x61, 0x67, 0x65}; + byte connack[] = {0x20, 0x02, 0x00, 0x00}; + shimClient.expect(connect, 0x32); + shimClient.respond(connack, 4); + + PubSubClient client(server, 1883, callback, shimClient); + bool rc = client.connect("client_test1", "willTopic", 1, 0, "willMessage"); + IS_TRUE(rc); + IS_FALSE(shimClient.error()); + + END_IT +} + +int test_connect_with_will_username_password() { + IT("accepts a will, username and password"); + ShimClient shimClient; + shimClient.setAllowConnect(true); + + byte connect[] = {0x10, 0x40, 0x0, 0x4, 0x4d, 0x51, 0x54, 0x54, 0x4, 0xce, 0x0, 0xf, 0x0, 0xc, 0x63, 0x6c, 0x69, 0x65, 0x6e, 0x74, 0x5f, 0x74, + 0x65, 0x73, 0x74, 0x31, 0x0, 0x9, 0x77, 0x69, 0x6c, 0x6c, 0x54, 0x6f, 0x70, 0x69, 0x63, 0x0, 0xb, 0x77, 0x69, 0x6c, 0x6c, 0x4d, + 0x65, 0x73, 0x73, 0x61, 0x67, 0x65, 0x0, 0x4, 0x75, 0x73, 0x65, 0x72, 0x0, 0x8, 0x70, 0x61, 0x73, 0x73, 0x77, 0x6f, 0x72, 0x64}; + byte connack[] = {0x20, 0x02, 0x00, 0x00}; + shimClient.expect(connect, 0x42); + shimClient.respond(connack, 4); + + PubSubClient client(server, 1883, callback, shimClient); + bool rc = client.connect("client_test1", "user", "password", "willTopic", 1, 0, "willMessage"); + IS_TRUE(rc); + IS_FALSE(shimClient.error()); + + END_IT +} + +int test_connect_disconnect_connect() { + IT("connects, disconnects and connects again"); + ShimClient shimClient; + + shimClient.setAllowConnect(true); + byte expectServer[] = {172, 16, 0, 2}; + shimClient.expectConnect(expectServer, 1883); + byte connect[] = {0x10, 0x18, 0x0, 0x4, 0x4d, 0x51, 0x54, 0x54, 0x4, 0x2, 0x0, 0xf, 0x0, + 0xc, 0x63, 0x6c, 0x69, 0x65, 0x6e, 0x74, 0x5f, 0x74, 0x65, 0x73, 0x74, 0x31}; + byte connack[] = {0x20, 0x02, 0x00, 0x00}; + + shimClient.expect(connect, 26); + shimClient.respond(connack, 4); + + PubSubClient client(server, 1883, callback, shimClient); + + int state = client.state(); + IS_TRUE(state == MQTT_DISCONNECTED); + + bool rc = client.connect("client_test1"); + IS_TRUE(rc); + IS_FALSE(shimClient.error()); + + state = client.state(); + IS_TRUE(state == MQTT_CONNECTED); + + byte disconnect[] = {0xE0, 0x00}; + shimClient.expect(disconnect, 2); + + client.disconnect(); + + IS_FALSE(client.connected()); + IS_FALSE(shimClient.connected()); + IS_FALSE(shimClient.error()); + + state = client.state(); + IS_TRUE(state == MQTT_DISCONNECTED); + + shimClient.expect(connect, 28); + shimClient.respond(connack, 4); + rc = client.connect("client_test1"); + IS_TRUE(rc); + IS_FALSE(shimClient.error()); + state = client.state(); + IS_TRUE(state == MQTT_CONNECTED); + + END_IT +} + +int test_connect_custom_keepalive() { + IT("sends a properly formatted connect packet with custom keepalive value"); + ShimClient shimClient; + + shimClient.setAllowConnect(true); + byte expectServer[] = {172, 16, 0, 2}; + shimClient.expectConnect(expectServer, 1883); + + // Set keepalive to 300secs == 0x01 0x2c + byte connect[] = {0x10, 0x18, 0x0, 0x4, 0x4d, 0x51, 0x54, 0x54, 0x4, 0x2, 0x01, 0x2c, 0x0, + 0xc, 0x63, 0x6c, 0x69, 0x65, 0x6e, 0x74, 0x5f, 0x74, 0x65, 0x73, 0x74, 0x31}; + byte connack[] = {0x20, 0x02, 0x00, 0x00}; + + shimClient.expect(connect, 26); + shimClient.respond(connack, 4); + + PubSubClient client(server, 1883, callback, shimClient); + int state = client.state(); + IS_TRUE(state == MQTT_DISCONNECTED); + + client.setKeepAlive(300); + + bool rc = client.connect("client_test1"); + IS_TRUE(rc); + IS_FALSE(shimClient.error()); + + state = client.state(); + IS_TRUE(state == MQTT_CONNECTED); + + END_IT +} + +int main() { + SUITE("Connect"); + + test_connect_fails_no_network(); + test_connect_fails_on_no_response(); + + test_connect_properly_formatted(); + test_connect_non_clean_session(); + test_connect_accepts_username_password(); + test_connect_fails_on_bad_rc(); + test_connect_properly_formatted_hostname(); + + test_connect_accepts_username_no_password(); + test_connect_ignores_password_no_username(); + test_connect_with_will(); + test_connect_with_will_username_password(); + test_connect_disconnect_connect(); + + test_connect_custom_keepalive(); + FINISH +} diff --git a/lib/pubsubclient/tests/src/keepalive_spec.cpp b/lib/pubsubclient3/tests/src/keepalive_spec.cpp similarity index 51% rename from lib/pubsubclient/tests/src/keepalive_spec.cpp rename to lib/pubsubclient3/tests/src/keepalive_spec.cpp index ea643cf17..58e3f206c 100644 --- a/lib/pubsubclient/tests/src/keepalive_spec.cpp +++ b/lib/pubsubclient3/tests/src/keepalive_spec.cpp @@ -1,40 +1,48 @@ -#include "PubSubClient.h" -#include "ShimClient.h" -#include "Buffer.h" -#include "BDDTest.h" -#include "trace.h" #include -byte server[] = { 172, 16, 0, 2 }; +#include "BDDTest.h" +#include "Buffer.h" +#include "PubSubClient.h" +#include "ShimClient.h" +#include "trace.h" -void callback(char* topic, byte* payload, unsigned int length) { - // handle message arrived +byte server[] = {172, 16, 0, 2}; + +// function declarations +void callback(char* topic, uint8_t* payload, size_t length); +int test_keepalive_pings_idle(); +int test_keepalive_pings_with_outbound_qos0(); +int test_keepalive_pings_with_inbound_qos0(); +int test_keepalive_no_pings_inbound_qos1(); +int test_keepalive_disconnects_hung(); + +void callback(_UNUSED_ char* topic, _UNUSED_ uint8_t* payload, _UNUSED_ size_t length) { + // handle message arrived } - int test_keepalive_pings_idle() { IT("keeps an idle connection alive (takes 1 minute)"); ShimClient shimClient; shimClient.setAllowConnect(true); - byte connack[] = { 0x20, 0x02, 0x00, 0x00 }; - shimClient.respond(connack,4); + byte connack[] = {0x20, 0x02, 0x00, 0x00}; + shimClient.respond(connack, 4); PubSubClient client(server, 1883, callback, shimClient); - int rc = client.connect((char*)"client_test1"); + bool rc = client.connect("client_test1"); IS_TRUE(rc); - byte pingreq[] = { 0xC0,0x0 }; - shimClient.expect(pingreq,2); - byte pingresp[] = { 0xD0,0x0 }; - shimClient.respond(pingresp,2); + byte pingreq[] = {0xC0, 0x0}; + shimClient.expect(pingreq, 2); + byte pingresp[] = {0xD0, 0x0}; + shimClient.respond(pingresp, 2); for (int i = 0; i < 50; i++) { sleep(1); - if ( i == 15 || i == 31 || i == 47) { - shimClient.expect(pingreq,2); - shimClient.respond(pingresp,2); + if (i == 15 || i == 31 || i == 47) { + shimClient.expect(pingreq, 2); + shimClient.respond(pingresp, 2); } rc = client.loop(); IS_TRUE(rc); @@ -51,27 +59,27 @@ int test_keepalive_pings_with_outbound_qos0() { ShimClient shimClient; shimClient.setAllowConnect(true); - byte connack[] = { 0x20, 0x02, 0x00, 0x00 }; - shimClient.respond(connack,4); + byte connack[] = {0x20, 0x02, 0x00, 0x00}; + shimClient.respond(connack, 4); PubSubClient client(server, 1883, callback, shimClient); - int rc = client.connect((char*)"client_test1"); + bool rc = client.connect("client_test1"); IS_TRUE(rc); - byte publish[] = {0x30,0xe,0x0,0x5,0x74,0x6f,0x70,0x69,0x63,0x70,0x61,0x79,0x6c,0x6f,0x61,0x64}; + byte publish[] = {0x30, 0xe, 0x0, 0x5, 0x74, 0x6f, 0x70, 0x69, 0x63, 0x70, 0x61, 0x79, 0x6c, 0x6f, 0x61, 0x64}; for (int i = 0; i < 50; i++) { - TRACE(i<<":"); - shimClient.expect(publish,16); - rc = client.publish((char*)"topic",(char*)"payload"); + TRACE(i << ":"); + shimClient.expect(publish, 16); + rc = client.publish("topic", "payload"); IS_TRUE(rc); IS_FALSE(shimClient.error()); sleep(1); - if ( i == 15 || i == 31 || i == 47) { - byte pingreq[] = { 0xC0,0x0 }; - shimClient.expect(pingreq,2); - byte pingresp[] = { 0xD0,0x0 }; - shimClient.respond(pingresp,2); + if (i == 15 || i == 31 || i == 47) { + byte pingreq[] = {0xC0, 0x0}; + shimClient.expect(pingreq, 2); + byte pingresp[] = {0xD0, 0x0}; + shimClient.respond(pingresp, 2); } rc = client.loop(); IS_TRUE(rc); @@ -87,25 +95,25 @@ int test_keepalive_pings_with_inbound_qos0() { ShimClient shimClient; shimClient.setAllowConnect(true); - byte connack[] = { 0x20, 0x02, 0x00, 0x00 }; - shimClient.respond(connack,4); + byte connack[] = {0x20, 0x02, 0x00, 0x00}; + shimClient.respond(connack, 4); PubSubClient client(server, 1883, callback, shimClient); - int rc = client.connect((char*)"client_test1"); + bool rc = client.connect("client_test1"); IS_TRUE(rc); - byte publish[] = {0x30,0xe,0x0,0x5,0x74,0x6f,0x70,0x69,0x63,0x70,0x61,0x79,0x6c,0x6f,0x61,0x64}; + byte publish[] = {0x30, 0xe, 0x0, 0x5, 0x74, 0x6f, 0x70, 0x69, 0x63, 0x70, 0x61, 0x79, 0x6c, 0x6f, 0x61, 0x64}; for (int i = 0; i < 50; i++) { - TRACE(i<<":"); + TRACE(i << ":"); sleep(1); - if ( i == 15 || i == 31 || i == 47) { - byte pingreq[] = { 0xC0,0x0 }; - shimClient.expect(pingreq,2); - byte pingresp[] = { 0xD0,0x0 }; - shimClient.respond(pingresp,2); + if (i == 15 || i == 31 || i == 47) { + byte pingreq[] = {0xC0, 0x0}; + shimClient.expect(pingreq, 2); + byte pingresp[] = {0xD0, 0x0}; + shimClient.respond(pingresp, 2); } - shimClient.respond(publish,16); + shimClient.respond(publish, 16); rc = client.loop(); IS_TRUE(rc); IS_FALSE(shimClient.error()); @@ -120,19 +128,19 @@ int test_keepalive_no_pings_inbound_qos1() { ShimClient shimClient; shimClient.setAllowConnect(true); - byte connack[] = { 0x20, 0x02, 0x00, 0x00 }; - shimClient.respond(connack,4); + byte connack[] = {0x20, 0x02, 0x00, 0x00}; + shimClient.respond(connack, 4); PubSubClient client(server, 1883, callback, shimClient); - int rc = client.connect((char*)"client_test1"); + bool rc = client.connect("client_test1"); IS_TRUE(rc); - byte publish[] = {0x32,0x10,0x0,0x5,0x74,0x6f,0x70,0x69,0x63,0x12,0x34,0x70,0x61,0x79,0x6c,0x6f,0x61,0x64}; - byte puback[] = {0x40,0x2,0x12,0x34}; + byte publish[] = {0x32, 0x10, 0x0, 0x5, 0x74, 0x6f, 0x70, 0x69, 0x63, 0x12, 0x34, 0x70, 0x61, 0x79, 0x6c, 0x6f, 0x61, 0x64}; + byte puback[] = {0x40, 0x2, 0x12, 0x34}; for (int i = 0; i < 50; i++) { - shimClient.respond(publish,18); - shimClient.expect(puback,4); + shimClient.respond(publish, 18); + shimClient.expect(puback, 4); sleep(1); rc = client.loop(); IS_TRUE(rc); @@ -148,15 +156,15 @@ int test_keepalive_disconnects_hung() { ShimClient shimClient; shimClient.setAllowConnect(true); - byte connack[] = { 0x20, 0x02, 0x00, 0x00 }; - shimClient.respond(connack,4); + byte connack[] = {0x20, 0x02, 0x00, 0x00}; + shimClient.respond(connack, 4); PubSubClient client(server, 1883, callback, shimClient); - int rc = client.connect((char*)"client_test1"); + bool rc = client.connect("client_test1"); IS_TRUE(rc); - byte pingreq[] = { 0xC0,0x0 }; - shimClient.expect(pingreq,2); + byte pingreq[] = {0xC0, 0x0}; + shimClient.expect(pingreq, 2); for (int i = 0; i < 32; i++) { sleep(1); @@ -172,8 +180,7 @@ int test_keepalive_disconnects_hung() { END_IT } -int main() -{ +int main() { SUITE("Keep-alive"); test_keepalive_pings_idle(); test_keepalive_pings_with_outbound_qos0(); diff --git a/lib/pubsubclient3/tests/src/lib/Arduino.h b/lib/pubsubclient3/tests/src/lib/Arduino.h new file mode 100644 index 000000000..b5903ea5c --- /dev/null +++ b/lib/pubsubclient3/tests/src/lib/Arduino.h @@ -0,0 +1,38 @@ +#ifndef Arduino_h +#define Arduino_h + +#include +#include +#include +#include + +#include + +#include "Print.h" + +extern "C" { +typedef uint8_t byte; +typedef uint8_t boolean; + +/* sketch */ +extern void setup(void); +extern void loop(void); +unsigned long millis(void); +} + +#define PROGMEM +#define strnlen_P strnlen +#define pgm_read_byte_near(x) *(x) + +#define yield(x) {} + +#pragma GCC system_header +#define ERROR_PSC_PRINTF(fmt, ...) printf(("PubSubClient error: " fmt), ##__VA_ARGS__) +#define ERROR_PSC_PRINTF_P(fmt, ...) printf(("PubSubClient error: " fmt), ##__VA_ARGS__) +#ifdef DEBUG_PUBSUBCLIENT +#define DEBUG_PSC_PRINTF(fmt, ...) printf(("PubSubClient: " fmt), ##__VA_ARGS__) +#endif + +#define _UNUSED_ __attribute__((unused)) + +#endif // Arduino_h diff --git a/lib/pubsubclient/tests/src/lib/BDDTest.cpp b/lib/pubsubclient3/tests/src/lib/BDDTest.cpp similarity index 82% rename from lib/pubsubclient/tests/src/lib/BDDTest.cpp rename to lib/pubsubclient3/tests/src/lib/BDDTest.cpp index a72bf65e2..10d392d3e 100644 --- a/lib/pubsubclient/tests/src/lib/BDDTest.cpp +++ b/lib/pubsubclient3/tests/src/lib/BDDTest.cpp @@ -1,9 +1,11 @@ #include "BDDTest.h" -#include "trace.h" -#include + #include -#include #include +#include +#include + +#include "trace.h" int testCount = 0; int testPasses = 0; @@ -19,20 +21,20 @@ int bddtest_test(const char* file, int line, const char* assertion, int result) if (!result) { LOG("✗\n"); std::ostringstream os; - os << " ! "<pos = 0; this->length = 0; - this->add(buf,size); + this->add(buf, size); } bool Buffer::available() { return this->pos < this->length; @@ -28,7 +29,7 @@ void Buffer::reset() { void Buffer::add(uint8_t* buf, size_t size) { uint16_t i = 0; - for (;ibuffer[this->length++] = buf[i]; } } diff --git a/lib/pubsubclient/tests/src/lib/Buffer.h b/lib/pubsubclient3/tests/src/lib/Buffer.h similarity index 84% rename from lib/pubsubclient/tests/src/lib/Buffer.h rename to lib/pubsubclient3/tests/src/lib/Buffer.h index f448cade8..ae3002ba2 100644 --- a/lib/pubsubclient/tests/src/lib/Buffer.h +++ b/lib/pubsubclient3/tests/src/lib/Buffer.h @@ -4,19 +4,19 @@ #include "Arduino.h" class Buffer { -private: - uint8_t buffer[1024]; + private: + uint8_t buffer[2048]; uint16_t pos; uint16_t length; - -public: + + public: Buffer(); Buffer(uint8_t* buf, size_t size); - + virtual bool available(); virtual uint8_t next(); virtual void reset(); - + virtual void add(uint8_t* buf, size_t size); }; diff --git a/lib/pubsubclient3/tests/src/lib/Client.h b/lib/pubsubclient3/tests/src/lib/Client.h new file mode 100644 index 000000000..54c86d1bd --- /dev/null +++ b/lib/pubsubclient3/tests/src/lib/Client.h @@ -0,0 +1,21 @@ +#ifndef client_h +#define client_h +#include "IPAddress.h" + +class Client { + public: + virtual int connect(IPAddress ip, uint16_t port) = 0; + virtual int connect(const char *host, uint16_t port) = 0; + virtual size_t write(uint8_t) = 0; + virtual size_t write(const uint8_t *buf, size_t size) = 0; + virtual int available() = 0; + virtual int read() = 0; + virtual int read(uint8_t *buf, size_t size) = 0; + virtual int peek() = 0; + virtual void flush() = 0; + virtual void stop() = 0; + virtual uint8_t connected() = 0; + virtual operator bool() = 0; +}; + +#endif diff --git a/lib/pubsubclient/tests/src/lib/IPAddress.cpp b/lib/pubsubclient3/tests/src/lib/IPAddress.cpp similarity index 58% rename from lib/pubsubclient/tests/src/lib/IPAddress.cpp rename to lib/pubsubclient3/tests/src/lib/IPAddress.cpp index 610ff4c53..99d4ede07 100644 --- a/lib/pubsubclient/tests/src/lib/IPAddress.cpp +++ b/lib/pubsubclient3/tests/src/lib/IPAddress.cpp @@ -2,43 +2,35 @@ #include #include -IPAddress::IPAddress() -{ +IPAddress::IPAddress() { memset(_address, 0, sizeof(_address)); } -IPAddress::IPAddress(uint8_t first_octet, uint8_t second_octet, uint8_t third_octet, uint8_t fourth_octet) -{ +IPAddress::IPAddress(uint8_t first_octet, uint8_t second_octet, uint8_t third_octet, uint8_t fourth_octet) { _address[0] = first_octet; _address[1] = second_octet; _address[2] = third_octet; _address[3] = fourth_octet; } -IPAddress::IPAddress(uint32_t address) -{ +IPAddress::IPAddress(uint32_t address) { memcpy(_address, &address, sizeof(_address)); } -IPAddress::IPAddress(const uint8_t *address) -{ +IPAddress::IPAddress(const uint8_t* address) { memcpy(_address, address, sizeof(_address)); } -IPAddress& IPAddress::operator=(const uint8_t *address) -{ +IPAddress& IPAddress::operator=(const uint8_t* address) { memcpy(_address, address, sizeof(_address)); return *this; } -IPAddress& IPAddress::operator=(uint32_t address) -{ - memcpy(_address, (const uint8_t *)&address, sizeof(_address)); +IPAddress& IPAddress::operator=(uint32_t address) { + memcpy(_address, (const uint8_t*)&address, sizeof(_address)); return *this; } -bool IPAddress::operator==(const uint8_t* addr) -{ +bool IPAddress::operator==(const uint8_t* addr) { return memcmp(addr, _address, sizeof(_address)) == 0; } - diff --git a/lib/pubsubclient/tests/src/lib/IPAddress.h b/lib/pubsubclient3/tests/src/lib/IPAddress.h similarity index 79% rename from lib/pubsubclient/tests/src/lib/IPAddress.h rename to lib/pubsubclient3/tests/src/lib/IPAddress.h index e75a8fe65..05efdcd6c 100644 --- a/lib/pubsubclient/tests/src/lib/IPAddress.h +++ b/lib/pubsubclient3/tests/src/lib/IPAddress.h @@ -8,10 +8,10 @@ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell * copies of the Software, and to permit persons to whom the Software is * furnished to do so, subject to the following conditions: - * + * * The above copyright notice and this permission notice shall be included in * all copies or substantial portions of the Software. - * + * * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE @@ -26,40 +26,48 @@ #ifndef IPAddress_h #define IPAddress_h - // A class to make it easier to handle and pass around IP addresses class IPAddress { -private: - uint8_t _address[4]; // IPv4 address + private: + alignas(4) uint8_t _address[4]; // IPv4 address // Access the raw byte array containing the address. Because this returns a pointer // to the internal structure rather than a copy of the address this function should only // be used when you know that the usage of the returned uint8_t* will be transient and not // stored. - uint8_t* raw_address() { return _address; }; + uint8_t* raw_address() { + return _address; + }; -public: + public: // Constructors IPAddress(); IPAddress(uint8_t first_octet, uint8_t second_octet, uint8_t third_octet, uint8_t fourth_octet); IPAddress(uint32_t address); - IPAddress(const uint8_t *address); + IPAddress(const uint8_t* address); // Overloaded cast operator to allow IPAddress objects to be used where a pointer // to a four-byte uint8_t array is expected - operator uint32_t() { return *((uint32_t*)_address); }; - bool operator==(const IPAddress& addr) { return (*((uint32_t*)_address)) == (*((uint32_t*)addr._address)); }; + operator uint32_t() { + return *((uint32_t*)_address); + }; + bool operator==(IPAddress& addr) { + return (*((uint32_t*)_address)) == (*(reinterpret_cast(addr._address))); + }; bool operator==(const uint8_t* addr); // Overloaded index operator to allow getting and setting individual octets of the address - uint8_t operator[](int index) const { return _address[index]; }; - uint8_t& operator[](int index) { return _address[index]; }; + uint8_t operator[](int index) const { + return _address[index]; + }; + uint8_t& operator[](int index) { + return _address[index]; + }; // Overloaded copy operators to allow initialisation of IPAddress objects from other types - IPAddress& operator=(const uint8_t *address); + IPAddress& operator=(const uint8_t* address); IPAddress& operator=(uint32_t address); - friend class EthernetClass; friend class UDP; friend class Client; @@ -68,5 +76,4 @@ public: friend class DNSClient; }; - #endif diff --git a/lib/pubsubclient/tests/src/lib/Print.h b/lib/pubsubclient3/tests/src/lib/Print.h similarity index 94% rename from lib/pubsubclient/tests/src/lib/Print.h rename to lib/pubsubclient3/tests/src/lib/Print.h index 02ef77c2c..60084095b 100644 --- a/lib/pubsubclient/tests/src/lib/Print.h +++ b/lib/pubsubclient3/tests/src/lib/Print.h @@ -21,8 +21,8 @@ #define Print_h class Print { - public: - virtual size_t write(uint8_t) = 0; + public: + virtual size_t write(uint8_t) = 0; }; #endif diff --git a/lib/pubsubclient/tests/src/lib/ShimClient.cpp b/lib/pubsubclient3/tests/src/lib/ShimClient.cpp similarity index 67% rename from lib/pubsubclient/tests/src/lib/ShimClient.cpp rename to lib/pubsubclient3/tests/src/lib/ShimClient.cpp index f70115fa8..ba283020d 100644 --- a/lib/pubsubclient/tests/src/lib/ShimClient.cpp +++ b/lib/pubsubclient3/tests/src/lib/ShimClient.cpp @@ -1,13 +1,16 @@ #include "ShimClient.h" -#include "trace.h" -#include + #include + #include +#include + +#include "trace.h" extern "C" { - uint32_t millis(void) { - return time(0)*1000; - } +unsigned long millis(void) { + return (unsigned long)time(0) * 1000UL; +} } ShimClient::ShimClient() { @@ -25,36 +28,35 @@ int ShimClient::connect(IPAddress ip, uint16_t port) { if (this->_allowConnect) { this->_connected = true; } - if (this->_expectedPort !=0) { - // if (memcmp(ip,this->_expectedIP,4) != 0) { - // TRACE( "ip mismatch\n"); - // this->_error = true; - // } + if (this->_expectedPort != 0) { + if (memcmp(&ip, &this->_expectedIP, 4) != 0) { + TRACE("ip mismatch\n"); + this->_error = true; + } if (port != this->_expectedPort) { - TRACE( "port mismatch\n"); + TRACE("port mismatch\n"); this->_error = true; } } return this->_connected; } -int ShimClient::connect(const char *host, uint16_t port) { +int ShimClient::connect(const char *host, uint16_t port) { if (this->_allowConnect) { this->_connected = true; } - if (this->_expectedPort !=0) { - if (strcmp(host,this->_expectedHost) != 0) { - TRACE( "host mismatch\n"); + if (this->_expectedPort != 0) { + if (strcmp(host, this->_expectedHost) != 0) { + TRACE("host mismatch\n"); this->_error = true; } if (port != this->_expectedPort) { - TRACE( "port mismatch\n"); + TRACE("port mismatch\n"); this->_error = true; } - } return this->_connected; } -size_t ShimClient::write(uint8_t b) { +size_t ShimClient::write(uint8_t b) { this->_received += 1; TRACE(std::hex << (unsigned int)b); if (!this->expectAnything) { @@ -68,15 +70,15 @@ size_t ShimClient::write(uint8_t b) { this->_error = true; } } - TRACE("\n"<< std::dec); + TRACE("\n" << std::dec); return 1; } -size_t ShimClient::write(const uint8_t *buf, size_t size) { +size_t ShimClient::write(const uint8_t *buf, size_t size) { this->_received += size; - TRACE( "[" << std::dec << (unsigned int)(size) << "] "); - uint16_t i=0; - for (;i0) { + TRACE("[" << std::dec << (unsigned int)(size) << "] "); + uint16_t i = 0; + for (; i < size; i++) { + if (i > 0) { TRACE(":"); } TRACE(std::hex << (unsigned int)(buf[i])); @@ -93,37 +95,44 @@ size_t ShimClient::write(const uint8_t *buf, size_t size) { } } } - TRACE("\n"<responseBuffer->available(); } -int ShimClient::read() { return this->responseBuffer->next(); } +int ShimClient::read() { + return this->responseBuffer->next(); +} int ShimClient::read(uint8_t *buf, size_t size) { uint16_t i = 0; - for (;iread(); } return size; } -int ShimClient::peek() { return 0; } +int ShimClient::peek() { + return 0; +} void ShimClient::flush() {} void ShimClient::stop() { this->setConnected(false); } -uint8_t ShimClient::connected() { return this->_connected; } -ShimClient::operator bool() { return true; } +uint8_t ShimClient::connected() { + return this->_connected; +} +ShimClient::operator bool() { + return true; +} - -ShimClient* ShimClient::respond(uint8_t *buf, size_t size) { - this->responseBuffer->add(buf,size); +ShimClient *ShimClient::respond(uint8_t *buf, size_t size) { + this->responseBuffer->add(buf, size); return this; } -ShimClient* ShimClient::expect(uint8_t *buf, size_t size) { +ShimClient *ShimClient::expect(uint8_t *buf, size_t size) { this->expectAnything = false; - this->expectBuffer->add(buf,size); + this->expectBuffer->add(buf, size); return this; } diff --git a/lib/pubsubclient3/tests/src/lib/ShimClient.h b/lib/pubsubclient3/tests/src/lib/ShimClient.h new file mode 100644 index 000000000..cb369668b --- /dev/null +++ b/lib/pubsubclient3/tests/src/lib/ShimClient.h @@ -0,0 +1,50 @@ +#ifndef shimclient_h +#define shimclient_h + +#include "Arduino.h" +#include "Buffer.h" +#include "Client.h" +#include "IPAddress.h" + +class ShimClient : public Client { + private: + Buffer *responseBuffer; + Buffer *expectBuffer; + bool _allowConnect; + bool _connected; + bool expectAnything; + bool _error; + uint16_t _received; + IPAddress _expectedIP; + uint16_t _expectedPort; + const char *_expectedHost; + + public: + ShimClient(); + virtual int connect(IPAddress ip, uint16_t port); + virtual int connect(const char *host, uint16_t port); + virtual size_t write(uint8_t); + virtual size_t write(const uint8_t *buf, size_t size); + virtual int available(); + virtual int read(); + virtual int read(uint8_t *buf, size_t size); + virtual int peek(); + virtual void flush(); + virtual void stop(); + virtual uint8_t connected(); + virtual operator bool(); + + virtual ShimClient *respond(uint8_t *buf, size_t size); + virtual ShimClient *expect(uint8_t *buf, size_t size); + + virtual void expectConnect(IPAddress ip, uint16_t port); + virtual void expectConnect(const char *host, uint16_t port); + + virtual uint16_t received(); + virtual bool error(); + + virtual void setAllowConnect(bool b); + virtual void setConnected(bool b); +}; + +#endif diff --git a/lib/pubsubclient/tests/src/lib/Stream.cpp b/lib/pubsubclient3/tests/src/lib/Stream.cpp similarity index 86% rename from lib/pubsubclient/tests/src/lib/Stream.cpp rename to lib/pubsubclient3/tests/src/lib/Stream.cpp index b0ecbb44e..20f514661 100644 --- a/lib/pubsubclient/tests/src/lib/Stream.cpp +++ b/lib/pubsubclient3/tests/src/lib/Stream.cpp @@ -1,15 +1,18 @@ #include "Stream.h" -#include "trace.h" -#include + #include +#include + +#include "trace.h" + Stream::Stream() { this->expectBuffer = new Buffer(); this->_error = false; this->_written = 0; } -size_t Stream::write(uint8_t b) { +size_t Stream::write(uint8_t b) { this->_written++; TRACE(std::hex << (unsigned int)b); if (this->expectBuffer->available()) { @@ -21,17 +24,16 @@ size_t Stream::write(uint8_t b) { } else { this->_error = true; } - TRACE("\n"<< std::dec); + TRACE("\n" << std::dec); return 1; } - bool Stream::error() { return this->_error; } void Stream::expect(uint8_t *buf, size_t size) { - this->expectBuffer->add(buf,size); + this->expectBuffer->add(buf, size); } uint16_t Stream::length() { diff --git a/lib/pubsubclient/tests/src/lib/Stream.h b/lib/pubsubclient3/tests/src/lib/Stream.h similarity index 78% rename from lib/pubsubclient/tests/src/lib/Stream.h rename to lib/pubsubclient3/tests/src/lib/Stream.h index 4e41f86fa..41f7058b3 100644 --- a/lib/pubsubclient/tests/src/lib/Stream.h +++ b/lib/pubsubclient3/tests/src/lib/Stream.h @@ -5,17 +5,17 @@ #include "Buffer.h" class Stream { -private: + private: Buffer* expectBuffer; bool _error; uint16_t _written; -public: + public: Stream(); virtual size_t write(uint8_t); - + virtual bool error(); - virtual void expect(uint8_t *buf, size_t size); + virtual void expect(uint8_t* buf, size_t size); virtual uint16_t length(); }; diff --git a/lib/pubsubclient/tests/src/lib/trace.h b/lib/pubsubclient3/tests/src/lib/trace.h similarity index 100% rename from lib/pubsubclient/tests/src/lib/trace.h rename to lib/pubsubclient3/tests/src/lib/trace.h index 42eb99104..36a9cd40f 100644 --- a/lib/pubsubclient/tests/src/lib/trace.h +++ b/lib/pubsubclient3/tests/src/lib/trace.h @@ -1,9 +1,9 @@ #ifndef trace_h #define trace_h -#include - #include +#include + #define LOG(x) {std::cout << x << std::flush; } #define TRACE(x) {if (getenv("TRACE")) { std::cout << x << std::flush; }} diff --git a/lib/pubsubclient3/tests/src/publish_spec.cpp b/lib/pubsubclient3/tests/src/publish_spec.cpp new file mode 100644 index 000000000..4346a721a --- /dev/null +++ b/lib/pubsubclient3/tests/src/publish_spec.cpp @@ -0,0 +1,228 @@ +#include "BDDTest.h" +#include "Buffer.h" +#include "PubSubClient.h" +#include "ShimClient.h" +#include "trace.h" + +byte server[] = {172, 16, 0, 2}; + +// function declarations +void callback(char* topic, uint8_t* payload, size_t length); +int test_publish(); +int test_publish_bytes(); +int test_publish_retained(); +int test_publish_retained_2(); +int test_publish_not_connected(); +int test_publish_too_long(); +int test_publish_P(); +int test_publish_P_too_long(); + +void callback(_UNUSED_ char* topic, _UNUSED_ uint8_t* payload, _UNUSED_ size_t length) { + // handle message arrived +} + +int test_publish() { + IT("publishes a null-terminated string"); + ShimClient shimClient; + shimClient.setAllowConnect(true); + + byte connack[] = {0x20, 0x02, 0x00, 0x00}; + shimClient.respond(connack, 4); + + PubSubClient client(server, 1883, callback, shimClient); + bool rc = client.connect("client_test1"); + IS_TRUE(rc); + + byte publish[] = {0x30, 0xe, 0x0, 0x5, 0x74, 0x6f, 0x70, 0x69, 0x63, 0x70, 0x61, 0x79, 0x6c, 0x6f, 0x61, 0x64}; + shimClient.expect(publish, 16); + + rc = client.publish("topic", "payload"); + IS_TRUE(rc); + + IS_FALSE(shimClient.error()); + + END_IT +} + +int test_publish_bytes() { + IT("publishes a byte array"); + ShimClient shimClient; + shimClient.setAllowConnect(true); + + byte payload[] = {0x01, 0x02, 0x03, 0x0, 0x05}; + size_t length = 5; + + byte connack[] = {0x20, 0x02, 0x00, 0x00}; + shimClient.respond(connack, 4); + + PubSubClient client(server, 1883, callback, shimClient); + bool rc = client.connect("client_test1"); + IS_TRUE(rc); + + byte publish[] = {0x30, 0xc, 0x0, 0x5, 0x74, 0x6f, 0x70, 0x69, 0x63, 0x1, 0x2, 0x3, 0x0, 0x5}; + shimClient.expect(publish, 14); + + rc = client.publish("topic", payload, length); + IS_TRUE(rc); + + IS_FALSE(shimClient.error()); + + END_IT +} + +int test_publish_retained() { + IT("publishes retained - 1"); + ShimClient shimClient; + shimClient.setAllowConnect(true); + + byte payload[] = {0x01, 0x02, 0x03, 0x0, 0x05}; + size_t length = 5; + + byte connack[] = {0x20, 0x02, 0x00, 0x00}; + shimClient.respond(connack, 4); + + PubSubClient client(server, 1883, callback, shimClient); + bool rc = client.connect("client_test1"); + IS_TRUE(rc); + + byte publish[] = {0x31, 0xc, 0x0, 0x5, 0x74, 0x6f, 0x70, 0x69, 0x63, 0x1, 0x2, 0x3, 0x0, 0x5}; + shimClient.expect(publish, 14); + + rc = client.publish("topic", payload, length, true); + IS_TRUE(rc); + + IS_FALSE(shimClient.error()); + + END_IT +} + +int test_publish_retained_2() { + IT("publishes retained - 2"); + ShimClient shimClient; + shimClient.setAllowConnect(true); + + byte connack[] = {0x20, 0x02, 0x00, 0x00}; + shimClient.respond(connack, 4); + + PubSubClient client(server, 1883, callback, shimClient); + bool rc = client.connect("client_test1"); + IS_TRUE(rc); + + byte publish[] = {0x31, 0xc, 0x0, 0x5, 0x74, 0x6f, 0x70, 0x69, 0x63, 'A', 'B', 'C', 'D', 'E'}; + shimClient.expect(publish, 14); + + rc = client.publish("topic", "ABCDE", true); + IS_TRUE(rc); + + IS_FALSE(shimClient.error()); + + END_IT +} + +int test_publish_not_connected() { + IT("publish fails when not connected"); + ShimClient shimClient; + + PubSubClient client(server, 1883, callback, shimClient); + + bool rc = client.publish("topic", "payload"); + IS_FALSE(rc); + + IS_FALSE(shimClient.error()); + + END_IT +} + +int test_publish_too_long() { + IT("publish fails when topic/payload are too long"); + ShimClient shimClient; + shimClient.setAllowConnect(true); + + // 0 1 2 3 4 5 6 7 8 9 0 1 2 + char topic[] = "1234567890123456789012345678901234567890123456789012345678901234"; + + // 0 1 2 3 4 5 6 7 8 9 0 1 2 + char payload[] = "123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890"; + + byte connack[] = {0x20, 0x02, 0x00, 0x00}; + shimClient.respond(connack, 4); + + PubSubClient client(server, 1883, callback, shimClient); + client.setBufferSize(64); + bool rc = client.connect("client_test1"); + IS_TRUE(rc); + + rc = client.publish(topic, payload); + IS_FALSE(rc); + + IS_FALSE(shimClient.error()); + + END_IT +} + +int test_publish_P() { + IT("publishes using PROGMEM"); + ShimClient shimClient; + shimClient.setAllowConnect(true); + + byte payload[] = {0x01, 0x02, 0x03, 0x0, 0x05}; + size_t length = 5; + + byte connack[] = {0x20, 0x02, 0x00, 0x00}; + shimClient.respond(connack, 4); + + PubSubClient client(server, 1883, callback, shimClient); + bool rc = client.connect("client_test1"); + IS_TRUE(rc); + + byte publish[] = {0x31, 0xc, 0x0, 0x5, 0x74, 0x6f, 0x70, 0x69, 0x63, 0x1, 0x2, 0x3, 0x0, 0x5}; + shimClient.expect(publish, 14); + + rc = client.publish_P("topic", payload, length, true); + IS_TRUE(rc); + + IS_FALSE(shimClient.error()); + + END_IT +} + +int test_publish_P_too_long() { + IT("publish using PROGMEM fails when topic are too long"); + ShimClient shimClient; + shimClient.setAllowConnect(true); + + // 0 1 2 3 4 5 6 7 8 9 0 1 2 + char topic[] = "1234567890123456789012345678901234567890123456789012345678901234"; + + // 0 1 2 3 4 5 6 7 8 9 0 1 2 + char payload[] = "123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890"; + + byte connack[] = {0x20, 0x02, 0x00, 0x00}; + shimClient.respond(connack, 4); + + PubSubClient client(server, 1883, callback, shimClient); + client.setBufferSize(64); + bool rc = client.connect("client_test1"); + IS_TRUE(rc); + + rc = client.publish_P(topic, payload, false); + IS_FALSE(rc); + + IS_FALSE(shimClient.error()); + + END_IT +} + +int main() { + SUITE("Publish"); + test_publish(); + test_publish_bytes(); + test_publish_retained(); + test_publish_retained_2(); + test_publish_not_connected(); + test_publish_too_long(); + test_publish_P(); + test_publish_P_too_long(); + + FINISH +} diff --git a/lib/pubsubclient3/tests/src/receive_spec.cpp b/lib/pubsubclient3/tests/src/receive_spec.cpp new file mode 100644 index 000000000..3635e9778 --- /dev/null +++ b/lib/pubsubclient3/tests/src/receive_spec.cpp @@ -0,0 +1,345 @@ +#include "BDDTest.h" +#include "Buffer.h" +#include "PubSubClient.h" +#include "ShimClient.h" +#include "trace.h" + +// If this is changed to > 128 then the publish packet below +// is no longer valid as it assumes the remaining length +// is a single-byte. Don't make that mistake like I just +// did and lose a whole evening tracking down the issue. +#define PUBLISH_LEN 80 + +byte server[] = {172, 16, 0, 2}; + +bool callback_called = false; +char lastTopic[1024]; +char lastPayload[1024]; +size_t lastLength; + +// function declarations +void callback(char* topic, uint8_t* payload, size_t length); +void reset_callback(); +int test_receive_callback(); +int test_receive_stream(); +int test_receive_max_sized_message(); +int test_drop_invalid_remaining_length_message(); +int test_receive_oversized_message(); +int test_resize_buffer(); +int test_receive_oversized_stream_message(); +int test_receive_qos1(); + +void reset_callback() { + callback_called = false; + lastTopic[0] = '\0'; + lastPayload[0] = '\0'; + lastLength = 0; +} + +void callback(char* topic, uint8_t* payload, size_t length) { + TRACE("Callback received topic=[" << topic << "] length=" << length << "\n") + callback_called = true; + strcpy(lastTopic, topic); + memcpy(lastPayload, payload, length); + lastLength = length; +} + +int test_receive_callback() { + IT("receives a callback message"); + reset_callback(); + + ShimClient shimClient; + shimClient.setAllowConnect(true); + + byte connack[] = {0x20, 0x02, 0x00, 0x00}; + shimClient.respond(connack, 4); + + PubSubClient client(server, 1883, callback, shimClient); + bool rc = client.connect("client_test1"); + IS_TRUE(rc); + + byte publish[] = {0x30, 0xe, 0x0, 0x5, 0x74, 0x6f, 0x70, 0x69, 0x63, 0x70, 0x61, 0x79, 0x6c, 0x6f, 0x61, 0x64}; + shimClient.respond(publish, 16); + + rc = client.loop(); + + IS_TRUE(rc); + + IS_TRUE(callback_called); + IS_TRUE(strcmp(lastTopic, "topic") == 0); + IS_TRUE(memcmp(lastPayload, "payload", 7) == 0); + IS_TRUE(lastLength == 7); + + IS_FALSE(shimClient.error()); + + END_IT +} + +int test_receive_stream() { + IT("receives a streamed callback message"); + reset_callback(); + + Stream stream; + uint8_t payload[] = "payload"; + stream.expect(payload, sizeof(payload) - 1); + + ShimClient shimClient; + shimClient.setAllowConnect(true); + + byte connack[] = {0x20, 0x02, 0x00, 0x00}; + shimClient.respond(connack, 4); + + PubSubClient client(server, 1883, callback, shimClient, stream); + bool rc = client.connect("client_test1"); + IS_TRUE(rc); + + byte publish[] = {0x30, 0xe, 0x0, 0x5, 0x74, 0x6f, 0x70, 0x69, 0x63, 0x70, 0x61, 0x79, 0x6c, 0x6f, 0x61, 0x64}; + shimClient.respond(publish, 16); + + rc = client.loop(); + + IS_TRUE(rc); + + IS_TRUE(callback_called); + IS_TRUE(strcmp(lastTopic, "topic") == 0); + IS_TRUE(lastLength == 7); + + IS_FALSE(stream.error()); + IS_FALSE(shimClient.error()); + + END_IT +} + +int test_receive_max_sized_message() { + IT("receives an max-sized message"); + reset_callback(); + + ShimClient shimClient; + shimClient.setAllowConnect(true); + + byte connack[] = {0x20, 0x02, 0x00, 0x00}; + shimClient.respond(connack, 4); + + PubSubClient client(server, 1883, callback, shimClient); + client.setBufferSize(PUBLISH_LEN); + bool rc = client.connect("client_test1"); + IS_TRUE(rc); + + byte publish[] = {0x30, PUBLISH_LEN - 2, 0x0, 0x5, 0x74, 0x6f, 0x70, 0x69, 0x63, 0x70, 0x61, 0x79, 0x6c, 0x6f, 0x61, 0x64}; + byte bigPublish[PUBLISH_LEN]; + memset(bigPublish, 'A', PUBLISH_LEN); + bigPublish[PUBLISH_LEN - 1] = 'B'; + memcpy(bigPublish, publish, 16); + shimClient.respond(bigPublish, PUBLISH_LEN); + + rc = client.loop(); + + IS_TRUE(rc); + + IS_TRUE(callback_called); + IS_TRUE(strcmp(lastTopic, "topic") == 0); + IS_TRUE(lastLength == PUBLISH_LEN - 9); + IS_TRUE(memcmp(lastPayload, bigPublish + 9, lastLength) == 0); + + IS_FALSE(shimClient.error()); + + END_IT +} + +int test_receive_oversized_message() { + IT("drops an oversized message"); + reset_callback(); + + ShimClient shimClient; + shimClient.setAllowConnect(true); + + byte connack[] = {0x20, 0x02, 0x00, 0x00}; + shimClient.respond(connack, 4); + + PubSubClient client(server, 1883, callback, shimClient); + client.setBufferSize(PUBLISH_LEN - 1); + bool rc = client.connect("client_test1"); + IS_TRUE(rc); + + byte publish[] = {0x30, PUBLISH_LEN - 2, 0x0, 0x5, 0x74, 0x6f, 0x70, 0x69, 0x63, 0x70, 0x61, 0x79, 0x6c, 0x6f, 0x61, 0x64}; + byte bigPublish[PUBLISH_LEN]; + memset(bigPublish, 'A', PUBLISH_LEN); + bigPublish[PUBLISH_LEN - 1] = 'B'; + memcpy(bigPublish, publish, 16); + shimClient.respond(bigPublish, PUBLISH_LEN); + + rc = client.loop(); + + IS_TRUE(rc); + + IS_FALSE(callback_called); + + IS_FALSE(shimClient.error()); + + END_IT +} + +int test_drop_invalid_remaining_length_message() { + IT("drops invalid remaining length message"); + reset_callback(); + + ShimClient shimClient; + shimClient.setAllowConnect(true); + + byte connack[] = {0x20, 0x02, 0x00, 0x00}; + shimClient.respond(connack, 4); + + PubSubClient client(server, 1883, callback, shimClient); + bool rc = client.connect("client_test1"); + IS_TRUE(rc); + + byte publish[] = {0x30, 0x92, 0x92, 0x92, 0x92, 0x01, 0x0, 0x5, 0x74, 0x6f, 0x70, 0x69, 0x63, 0x70, 0x61, 0x79, 0x6c, 0x6f, 0x61, 0x64}; + shimClient.respond(publish, 20); + + rc = client.loop(); + + IS_FALSE(rc); + + IS_FALSE(callback_called); + + IS_FALSE(shimClient.error()); + + END_IT +} + +int test_resize_buffer() { + IT("receives a message larger than the default maximum"); + reset_callback(); + + ShimClient shimClient; + shimClient.setAllowConnect(true); + + byte connack[] = {0x20, 0x02, 0x00, 0x00}; + shimClient.respond(connack, 4); + + PubSubClient client(server, 1883, callback, shimClient); + client.setBufferSize(PUBLISH_LEN - 1); + bool rc = client.connect("client_test1"); + IS_TRUE(rc); + + byte publish[] = {0x30, PUBLISH_LEN - 2, 0x0, 0x5, 0x74, 0x6f, 0x70, 0x69, 0x63, 0x70, 0x61, 0x79, 0x6c, 0x6f, 0x61, 0x64}; + byte bigPublish[PUBLISH_LEN]; + memset(bigPublish, 'A', PUBLISH_LEN); + bigPublish[PUBLISH_LEN - 1] = 'B'; + memcpy(bigPublish, publish, 16); + // Send it twice + shimClient.respond(bigPublish, PUBLISH_LEN); + shimClient.respond(bigPublish, PUBLISH_LEN); + + rc = client.loop(); + IS_TRUE(rc); + + // First message fails as it is too big + IS_FALSE(callback_called); + + // Resize the buffer + client.setBufferSize(PUBLISH_LEN); + + rc = client.loop(); + IS_TRUE(rc); + + IS_TRUE(callback_called); + + IS_TRUE(strcmp(lastTopic, "topic") == 0); + IS_TRUE(lastLength == PUBLISH_LEN - 9); + IS_TRUE(memcmp(lastPayload, bigPublish + 9, lastLength) == 0); + + IS_FALSE(shimClient.error()); + + END_IT +} + +int test_receive_oversized_stream_message() { + IT("receive an oversized streamed message"); + reset_callback(); + + Stream stream; + + ShimClient shimClient; + shimClient.setAllowConnect(true); + + byte connack[] = {0x20, 0x02, 0x00, 0x00}; + shimClient.respond(connack, 4); + + PubSubClient client(server, 1883, callback, shimClient, stream); + client.setBufferSize(PUBLISH_LEN - 1); + bool rc = client.connect("client_test1"); + IS_TRUE(rc); + + byte publish[] = {0x30, PUBLISH_LEN - 2, 0x0, 0x5, 0x74, 0x6f, 0x70, 0x69, 0x63, 0x70, 0x61, 0x79, 0x6c, 0x6f, 0x61, 0x64}; + + byte bigPublish[PUBLISH_LEN]; + memset(bigPublish, 'A', PUBLISH_LEN); + bigPublish[PUBLISH_LEN - 1] = 'B'; + memcpy(bigPublish, publish, 16); + + shimClient.respond(bigPublish, PUBLISH_LEN); + stream.expect(bigPublish + 9, PUBLISH_LEN - 9); + + rc = client.loop(); + + IS_TRUE(rc); + + IS_TRUE(callback_called); + IS_TRUE(strcmp(lastTopic, "topic") == 0); + + IS_TRUE(lastLength == PUBLISH_LEN - 10); + + IS_FALSE(stream.error()); + IS_FALSE(shimClient.error()); + + END_IT +} + +int test_receive_qos1() { + IT("receives a qos1 message"); + reset_callback(); + + ShimClient shimClient; + shimClient.setAllowConnect(true); + + byte connack[] = {0x20, 0x02, 0x00, 0x00}; + shimClient.respond(connack, 4); + + PubSubClient client(server, 1883, callback, shimClient); + bool rc = client.connect("client_test1"); + IS_TRUE(rc); + + byte publish[] = {0x32, 0x10, 0x0, 0x5, 0x74, 0x6f, 0x70, 0x69, 0x63, 0x12, 0x34, 0x70, 0x61, 0x79, 0x6c, 0x6f, 0x61, 0x64}; + shimClient.respond(publish, 18); + + byte puback[] = {0x40, 0x2, 0x12, 0x34}; + shimClient.expect(puback, 4); + + rc = client.loop(); + + IS_TRUE(rc); + + IS_TRUE(callback_called); + IS_TRUE(strcmp(lastTopic, "topic") == 0); + IS_TRUE(memcmp(lastPayload, "payload", 7) == 0); + IS_TRUE(lastLength == 7); + + IS_FALSE(shimClient.error()); + + END_IT +} + +int main() { + SUITE("Receive"); + test_receive_callback(); + test_receive_stream(); + test_receive_max_sized_message(); + test_drop_invalid_remaining_length_message(); + test_receive_oversized_message(); + test_resize_buffer(); + test_receive_oversized_stream_message(); + test_receive_qos1(); + + FINISH +} diff --git a/lib/pubsubclient/tests/src/subscribe_spec.cpp b/lib/pubsubclient3/tests/src/subscribe_spec.cpp similarity index 52% rename from lib/pubsubclient/tests/src/subscribe_spec.cpp rename to lib/pubsubclient3/tests/src/subscribe_spec.cpp index a41982355..8ae83e7ad 100644 --- a/lib/pubsubclient/tests/src/subscribe_spec.cpp +++ b/lib/pubsubclient3/tests/src/subscribe_spec.cpp @@ -1,14 +1,23 @@ +#include "BDDTest.h" +#include "Buffer.h" #include "PubSubClient.h" #include "ShimClient.h" -#include "Buffer.h" -#include "BDDTest.h" #include "trace.h" +byte server[] = {172, 16, 0, 2}; -byte server[] = { 172, 16, 0, 2 }; +// function declarations +void callback(char* topic, uint8_t* payload, size_t length); +int test_subscribe_no_qos(); +int test_subscribe_qos_1(); +int test_subscribe_not_connected(); +int test_subscribe_invalid_qos(); +int test_subscribe_too_long(); +int test_unsubscribe(); +int test_unsubscribe_not_connected(); -void callback(char* topic, byte* payload, unsigned int length) { - // handle message arrived +void callback(_UNUSED_ char* topic, _UNUSED_ uint8_t* payload, _UNUSED_ size_t length) { + // handle message arrived } int test_subscribe_no_qos() { @@ -16,19 +25,19 @@ int test_subscribe_no_qos() { ShimClient shimClient; shimClient.setAllowConnect(true); - byte connack[] = { 0x20, 0x02, 0x00, 0x00 }; - shimClient.respond(connack,4); + byte connack[] = {0x20, 0x02, 0x00, 0x00}; + shimClient.respond(connack, 4); PubSubClient client(server, 1883, callback, shimClient); - int rc = client.connect((char*)"client_test1"); + bool rc = client.connect("client_test1"); IS_TRUE(rc); - byte subscribe[] = { 0x82,0xa,0x0,0x2,0x0,0x5,0x74,0x6f,0x70,0x69,0x63,0x0 }; - shimClient.expect(subscribe,12); - byte suback[] = { 0x90,0x3,0x0,0x2,0x0 }; - shimClient.respond(suback,5); + byte subscribe[] = {0x82, 0xa, 0x0, 0x2, 0x0, 0x5, 0x74, 0x6f, 0x70, 0x69, 0x63, 0x0}; + shimClient.expect(subscribe, 12); + byte suback[] = {0x90, 0x3, 0x0, 0x2, 0x0}; + shimClient.respond(suback, 5); - rc = client.subscribe((char*)"topic"); + rc = client.subscribe("topic"); IS_TRUE(rc); IS_FALSE(shimClient.error()); @@ -41,19 +50,19 @@ int test_subscribe_qos_1() { ShimClient shimClient; shimClient.setAllowConnect(true); - byte connack[] = { 0x20, 0x02, 0x00, 0x00 }; - shimClient.respond(connack,4); + byte connack[] = {0x20, 0x02, 0x00, 0x00}; + shimClient.respond(connack, 4); PubSubClient client(server, 1883, callback, shimClient); - int rc = client.connect((char*)"client_test1"); + bool rc = client.connect("client_test1"); IS_TRUE(rc); - byte subscribe[] = { 0x82,0xa,0x0,0x2,0x0,0x5,0x74,0x6f,0x70,0x69,0x63,0x1 }; - shimClient.expect(subscribe,12); - byte suback[] = { 0x90,0x3,0x0,0x2,0x1 }; - shimClient.respond(suback,5); + byte subscribe[] = {0x82, 0xa, 0x0, 0x2, 0x0, 0x5, 0x74, 0x6f, 0x70, 0x69, 0x63, 0x1}; + shimClient.expect(subscribe, 12); + byte suback[] = {0x90, 0x3, 0x0, 0x2, 0x1}; + shimClient.respond(suback, 5); - rc = client.subscribe((char*)"topic",1); + rc = client.subscribe("topic", 1); IS_TRUE(rc); IS_FALSE(shimClient.error()); @@ -67,7 +76,7 @@ int test_subscribe_not_connected() { PubSubClient client(server, 1883, callback, shimClient); - int rc = client.subscribe((char*)"topic"); + bool rc = client.subscribe("topic"); IS_FALSE(rc); IS_FALSE(shimClient.error()); @@ -80,16 +89,16 @@ int test_subscribe_invalid_qos() { ShimClient shimClient; shimClient.setAllowConnect(true); - byte connack[] = { 0x20, 0x02, 0x00, 0x00 }; - shimClient.respond(connack,4); + byte connack[] = {0x20, 0x02, 0x00, 0x00}; + shimClient.respond(connack, 4); PubSubClient client(server, 1883, callback, shimClient); - int rc = client.connect((char*)"client_test1"); + bool rc = client.connect("client_test1"); IS_TRUE(rc); - rc = client.subscribe((char*)"topic",2); + rc = client.subscribe("topic", 2); IS_FALSE(rc); - rc = client.subscribe((char*)"topic",254); + rc = client.subscribe("topic", 254); IS_FALSE(rc); IS_FALSE(shimClient.error()); @@ -102,20 +111,21 @@ int test_subscribe_too_long() { ShimClient shimClient; shimClient.setAllowConnect(true); - byte connack[] = { 0x20, 0x02, 0x00, 0x00 }; - shimClient.respond(connack,4); + byte connack[] = {0x20, 0x02, 0x00, 0x00}; + shimClient.respond(connack, 4); PubSubClient client(server, 1883, callback, shimClient); - int rc = client.connect((char*)"client_test1"); + client.setBufferSize(128); + bool rc = client.connect("client_test1"); IS_TRUE(rc); // max length should be allowed // 0 1 2 3 4 5 6 7 8 9 0 1 2 - rc = client.subscribe((char*)"12345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789"); + rc = client.subscribe("12345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789"); IS_TRUE(rc); // 0 1 2 3 4 5 6 7 8 9 0 1 2 - rc = client.subscribe((char*)"123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890"); + rc = client.subscribe("123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890"); IS_FALSE(rc); IS_FALSE(shimClient.error()); @@ -123,25 +133,24 @@ int test_subscribe_too_long() { END_IT } - int test_unsubscribe() { IT("unsubscribes"); ShimClient shimClient; shimClient.setAllowConnect(true); - byte connack[] = { 0x20, 0x02, 0x00, 0x00 }; - shimClient.respond(connack,4); + byte connack[] = {0x20, 0x02, 0x00, 0x00}; + shimClient.respond(connack, 4); PubSubClient client(server, 1883, callback, shimClient); - int rc = client.connect((char*)"client_test1"); + bool rc = client.connect("client_test1"); IS_TRUE(rc); - byte unsubscribe[] = { 0xA2,0x9,0x0,0x2,0x0,0x5,0x74,0x6f,0x70,0x69,0x63 }; - shimClient.expect(unsubscribe,12); - byte unsuback[] = { 0xB0,0x2,0x0,0x2 }; - shimClient.respond(unsuback,4); + byte unsubscribe[] = {0xA2, 0x9, 0x0, 0x2, 0x0, 0x5, 0x74, 0x6f, 0x70, 0x69, 0x63}; + shimClient.expect(unsubscribe, 12); + byte unsuback[] = {0xB0, 0x2, 0x0, 0x2}; + shimClient.respond(unsuback, 4); - rc = client.unsubscribe((char*)"topic"); + rc = client.unsubscribe("topic"); IS_TRUE(rc); IS_FALSE(shimClient.error()); @@ -155,7 +164,7 @@ int test_unsubscribe_not_connected() { PubSubClient client(server, 1883, callback, shimClient); - int rc = client.unsubscribe((char*)"topic"); + bool rc = client.unsubscribe("topic"); IS_FALSE(rc); IS_FALSE(shimClient.error()); @@ -163,8 +172,7 @@ int test_unsubscribe_not_connected() { END_IT } -int main() -{ +int main() { SUITE("Subscribe"); test_subscribe_no_qos(); test_subscribe_qos_1(); diff --git a/lib/pubsubclient/tests/testcases/__init__.py b/lib/pubsubclient3/tests/testcases/__init__.py similarity index 100% rename from lib/pubsubclient/tests/testcases/__init__.py rename to lib/pubsubclient3/tests/testcases/__init__.py diff --git a/lib/pubsubclient/tests/testcases/mqtt_basic.py b/lib/pubsubclient3/tests/testcases/mqtt_basic.py similarity index 77% rename from lib/pubsubclient/tests/testcases/mqtt_basic.py rename to lib/pubsubclient3/tests/testcases/mqtt_basic.py index f23ef71c1..1a2754042 100644 --- a/lib/pubsubclient/tests/testcases/mqtt_basic.py +++ b/lib/pubsubclient3/tests/testcases/mqtt_basic.py @@ -1,22 +1,19 @@ import unittest import settings import time -import mosquitto - - -def on_message(mosq, obj, msg): - obj.message_queue.append(msg) +import paho.mqtt.client as mqttclinet class mqtt_basic(unittest.TestCase): - + def on_message(self, client, userdata, message: mqttclinet.MQTTMessage): + self.message_queue.append(message) message_queue = [] @classmethod def setUpClass(self): - self.client = mosquitto.Mosquitto("pubsubclient_ut", clean_session=True, obj=self) + self.client = mqttclinet.Client("pubsubclient_ut", clean_session=True) self.client.connect(settings.server_ip) - self.client.on_message = on_message + self.client.on_message = self.on_message self.client.subscribe("outTopic", 0) @classmethod diff --git a/lib/pubsubclient/tests/testcases/mqtt_publish_in_callback.py b/lib/pubsubclient3/tests/testcases/mqtt_publish_in_callback.py similarity index 86% rename from lib/pubsubclient/tests/testcases/mqtt_publish_in_callback.py rename to lib/pubsubclient3/tests/testcases/mqtt_publish_in_callback.py index 45b0a8515..5dd591d28 100644 --- a/lib/pubsubclient/tests/testcases/mqtt_publish_in_callback.py +++ b/lib/pubsubclient3/tests/testcases/mqtt_publish_in_callback.py @@ -1,22 +1,20 @@ import unittest import settings import time -import mosquitto - - -def on_message(mosq, obj, msg): - obj.message_queue.append(msg) +import paho.mqtt.client as mqttclinet class mqtt_publish_in_callback(unittest.TestCase): + def on_message(self, client, userdata, message: mqttclinet.MQTTMessage): + self.message_queue.append(message) message_queue = [] @classmethod def setUpClass(self): - self.client = mosquitto.Mosquitto("pubsubclient_ut", clean_session=True, obj=self) + self.client = mqttclinet.Client("pubsubclient_ut", clean_session=True) self.client.connect(settings.server_ip) - self.client.on_message = on_message + self.client.on_message = self.on_message self.client.subscribe("outTopic", 0) @classmethod diff --git a/lib/pubsubclient/tests/testcases/settings.py b/lib/pubsubclient3/tests/testcases/settings.py similarity index 100% rename from lib/pubsubclient/tests/testcases/settings.py rename to lib/pubsubclient3/tests/testcases/settings.py diff --git a/lib/pubsubclient/tests/testsuite.py b/lib/pubsubclient3/tests/testsuite.py similarity index 99% rename from lib/pubsubclient/tests/testsuite.py rename to lib/pubsubclient3/tests/testsuite.py index 788fc5d97..b00dd159a 100644 --- a/lib/pubsubclient/tests/testsuite.py +++ b/lib/pubsubclient3/tests/testsuite.py @@ -21,7 +21,7 @@ class Workspace(object): self.examples_dir = os.path.join(self.root_dir, "../PubSubClient/examples") self.examples = [] self.tests = [] - if not os.path.isdir("../PubSubClient"): + if not os.path.isdir("../src"): raise Exception("Cannot find PubSubClient library") try: return __import__('ino') diff --git a/src/src/DataStructs/ESPEasyControllerCache_CSV_dumper.cpp b/src/src/DataStructs/ESPEasyControllerCache_CSV_dumper.cpp index ac671cde3..6b80e0c3e 100644 --- a/src/src/DataStructs/ESPEasyControllerCache_CSV_dumper.cpp +++ b/src/src/DataStructs/ESPEasyControllerCache_CSV_dumper.cpp @@ -64,7 +64,7 @@ uint32_t ESPEasyControllerCache_CSV_dumper::writeToTarget(const String& str, boo if (_target == Target::CSV_file) { addHtml(str); } else { - MQTTclient.write(str); + MQTTclient.write((const uint8_t*)str.c_str(), str.length()); } } return str.length(); diff --git a/src/src/PluginStructs/P146_data_struct.cpp b/src/src/PluginStructs/P146_data_struct.cpp index 97f377f05..680d1b2f1 100644 --- a/src/src/PluginStructs/P146_data_struct.cpp +++ b/src/src/PluginStructs/P146_data_struct.cpp @@ -27,7 +27,7 @@ P146_data_struct::~P146_data_struct() uint32_t writeToMqtt(const String& str, bool send) { if (send) { - MQTTclient.write(str); + MQTTclient.write((const uint8_t*)str.c_str(), str.length()); } return str.length(); } From f2f58ada3e9e273c4974858e23a258861802bac5 Mon Sep 17 00:00:00 2001 From: TD-er Date: Sun, 29 Jun 2025 00:18:13 +0200 Subject: [PATCH 082/564] [PubSubClient3] Speedup publish large messages using buffer As discussed here: https://github.com/hmueller01/pubsubclient3/issues/29#issuecomment-2727644476 --- lib/pubsubclient3/src/PubSubClient.cpp | 45 +++++++++++++++++++++++--- lib/pubsubclient3/src/PubSubClient.h | 10 ++++++ 2 files changed, 51 insertions(+), 4 deletions(-) diff --git a/lib/pubsubclient3/src/PubSubClient.cpp b/lib/pubsubclient3/src/PubSubClient.cpp index e50c0973a..dd1e5bf94 100644 --- a/lib/pubsubclient3/src/PubSubClient.cpp +++ b/lib/pubsubclient3/src/PubSubClient.cpp @@ -511,6 +511,7 @@ bool PubSubClient::beginPublish(const char* topic, size_t plength, bool retained } bool PubSubClient::endPublish() { + flushBuffer(); return connected(); } @@ -549,13 +550,19 @@ uint8_t PubSubClient::buildHeader(uint8_t header, uint8_t* buf, size_t length) { } size_t PubSubClient::write(uint8_t data) { - lastOutActivity = millis(); - return _client->write(data); + const size_t rc = appendBuffer(data); + if (rc != 0) { + lastOutActivity = millis(); + } + return rc; } size_t PubSubClient::write(const uint8_t* buffer, size_t size) { - lastOutActivity = millis(); - return _client->write(buffer, size); + const size_t rc = appendBuffer(buffer, size); + if (rc != 0) { + lastOutActivity = millis(); + } + return rc; } /** @@ -638,6 +645,36 @@ size_t PubSubClient::writeString(const char* string, uint8_t* buf, size_t pos, s return pos; } +size_t PubSubClient::appendBuffer(uint8_t data) { + buffer[_bufferWritePos] = data; + ++_bufferWritePos; + if (_bufferWritePos >= bufferSize) { + if (flushBuffer() == 0) return 0; + } + return 1; +} + +size_t PubSubClient::appendBuffer(const uint8_t *data, size_t size) { + for (size_t i = 0; i < size; ++i) { + if (appendBuffer(data[i]) == 0) return i; + } + return size; +} + +size_t PubSubClient::flushBuffer() { + size_t rc = 0; + if (_bufferWritePos > 0) { + if (connected()) { + rc = _client->write(buffer, _bufferWritePos); + if (rc != 0) { + lastOutActivity = millis(); + } + } + _bufferWritePos = 0; + } + return rc; +} + bool PubSubClient::subscribe(const char* topic) { return subscribe(topic, 0); } diff --git a/lib/pubsubclient3/src/PubSubClient.h b/lib/pubsubclient3/src/PubSubClient.h index d899786bc..6840d77bd 100644 --- a/lib/pubsubclient3/src/PubSubClient.h +++ b/lib/pubsubclient3/src/PubSubClient.h @@ -165,6 +165,7 @@ class PubSubClient : public Print { uint16_t port{}; Stream* stream{}; int _state{MQTT_DISCONNECTED}; + int _bufferWritePos = 0; size_t readPacket(uint8_t* hdrLen); bool handlePacket(uint8_t hdrLen, size_t len); @@ -175,6 +176,11 @@ class PubSubClient : public Print { size_t writeString(const char* string, uint8_t* buf, size_t pos); size_t writeString(const char* string, uint8_t* buf, size_t pos, size_t size); + // Add to buffer and flush if full (only to be used with beginPublish/endPublish)Add commentMore actions + size_t appendBuffer(uint8_t data); + size_t appendBuffer(const uint8_t *data, size_t size); + size_t flushBuffer(); + public: /** * @brief Creates an uninitialised client instance. @@ -539,6 +545,8 @@ class PubSubClient : public Print { /** * @brief Writes a single byte as a component of a publish started with a call to beginPublish. + * For performance reasons, this will be appended to the internal buffer, + * which will be flushed when full or on a call to endPublish(). * @param byte A byte to write to the publish payload. * @return The number of bytes written. */ @@ -546,6 +554,8 @@ class PubSubClient : public Print { /** * @brief Writes an array of bytes as a component of a publish started with a call to beginPublish. + * For performance reasons, this will be appended to the internal buffer, + * which will be flushed when full or on a call to endPublish(). * @param buffer The bytes to write. * @param size The length of the payload to be sent. * @return The number of bytes written. From c0a316822146276cc28a99fdaa538a79865101ed Mon Sep 17 00:00:00 2001 From: TD-er Date: Sun, 29 Jun 2025 00:44:43 +0200 Subject: [PATCH 083/564] [Build] Fix failed build due to missing include --- src/src/ESPEasyCore/ESPEasyNetwork_ESP32.cpp | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/src/src/ESPEasyCore/ESPEasyNetwork_ESP32.cpp b/src/src/ESPEasyCore/ESPEasyNetwork_ESP32.cpp index 38186bdb9..3829dd659 100644 --- a/src/src/ESPEasyCore/ESPEasyNetwork_ESP32.cpp +++ b/src/src/ESPEasyCore/ESPEasyNetwork_ESP32.cpp @@ -24,6 +24,11 @@ # include #endif +#if FEATURE_USE_IPV6 +# include +#endif + + void setNetworkMedium(NetworkMedium_t new_medium) { #if !(FEATURE_ETHERNET) From 5e7f1db5f3a7a2319b99e6037d806e3218794da9 Mon Sep 17 00:00:00 2001 From: TD-er Date: Wed, 2 Jul 2025 13:41:30 +0200 Subject: [PATCH 084/564] [ESP32-C5] Add option to force WiFi band 2.4/5 GHz --- src/src/DataStructs/SettingsStruct.h | 14 +- src/src/DataStructs/WiFi_AP_Candidate.cpp | 15 ++ src/src/DataStructs/WiFi_AP_Candidate.h | 1 + src/src/ESPEasyCore/ESPEasyWifi.cpp | 130 +------------ src/src/ESPEasyCore/ESPEasyWifi.h | 2 - .../ESPEasyCore/ESPEasyWifi_abstracted.cpp | 23 ++- src/src/ESPEasyCore/ESPEasyWifi_abstracted.h | 12 ++ .../ESPEasyWifi_abstracted_ESP32.cpp | 176 ++++++++++++++++-- .../ESPEasyWifi_abstracted_ESP8266.cpp | 86 +++++++++ src/src/ESPEasyCore/ESPEasy_setup.cpp | 6 +- src/src/Helpers/Networking.cpp | 2 +- src/src/Helpers/StringProvider.cpp | 13 +- src/src/Helpers/StringProvider.h | 3 + src/src/WebServer/AdvancedConfigPage.cpp | 56 ++++-- src/src/WebServer/RootPage.cpp | 2 +- src/src/WebServer/SetupPage.cpp | 4 +- src/src/WebServer/SysInfoPage.cpp | 3 + src/src/WebServer/WiFiScanner.cpp | 4 +- 18 files changed, 379 insertions(+), 173 deletions(-) diff --git a/src/src/DataStructs/SettingsStruct.h b/src/src/DataStructs/SettingsStruct.h index 3853b720d..9c5da80ce 100644 --- a/src/src/DataStructs/SettingsStruct.h +++ b/src/src/DataStructs/SettingsStruct.h @@ -217,6 +217,15 @@ class SettingsStruct_tmpl void ShowUnitOfMeasureOnDevicesPage(bool value) { VariousBits_2.ShowUnitOfMeasureOnDevicesPage = !value; } #endif // if FEATURE_TASKVALUE_UNIT_OF_MEASURE +#if CONFIG_SOC_WIFI_SUPPORT_5G + wifi_band_mode_t WiFi_band_mode() const { + if (VariousBits_2.WiFi_band_mode == 0) return WIFI_BAND_MODE_AUTO; + return static_cast(VariousBits_2.WiFi_band_mode); + } + void WiFi_band_mode(wifi_band_mode_t value) { VariousBits_2.WiFi_band_mode = value; } +#endif + + // Flag indicating whether all task values should be sent in a single event or one event per task value (default behavior) bool CombineTaskValues_SingleEvent(taskIndex_t taskIndex) const; void CombineTaskValues_SingleEvent(taskIndex_t taskIndex, bool value); @@ -568,7 +577,7 @@ public: int8_t SPI_SCLK_pin = -1; int8_t SPI_MISO_pin = -1; int8_t SPI_MOSI_pin = -1; - int8_t ForceESPEasyNOWchannel = 0; + uint8_t ForceESPEasyNOWchannel = 0; // Do not rename or move this checksum. // Checksum calculation will work "around" this @@ -584,8 +593,7 @@ public: uint32_t DisableSaveConfigAsTar : 1; // Bit 05 uint32_t PassiveWiFiScan : 1; // Bit 06 // inverted uint32_t ShowUnitOfMeasureOnDevicesPage : 1; // Bit 07 // inverted - uint32_t unused_08 : 1; // Bit 08 - uint32_t unused_09 : 1; // Bit 09 + uint32_t WiFi_band_mode : 2; // Bit 08 & 09 uint32_t unused_10 : 1; // Bit 10 uint32_t unused_11 : 1; // Bit 11 uint32_t unused_12 : 1; // Bit 12 diff --git a/src/src/DataStructs/WiFi_AP_Candidate.cpp b/src/src/DataStructs/WiFi_AP_Candidate.cpp index e5a08dcae..0bdfa6501 100644 --- a/src/src/DataStructs/WiFi_AP_Candidate.cpp +++ b/src/src/DataStructs/WiFi_AP_Candidate.cpp @@ -125,6 +125,7 @@ WiFi_AP_Candidate::WiFi_AP_Candidate(uint8_t networkItem) : index(0) { // FIXME TD-er: Maybe also add other info like 2nd channel, ftm and phy_lr support? # if ESP_IDF_VERSION_MAJOR >= 5 memcpy(&country, &(it->country), sizeof(wifi_country_t)); + bandwidth = it->bandwidth; # endif } #endif // ifdef ESP32 @@ -206,6 +207,7 @@ WiFi_AP_Candidate& WiFi_AP_Candidate::operator=(const WiFi_AP_Candidate& other) #ifdef ESP32 # if ESP_IDF_VERSION_MAJOR >= 5 memcpy(&this->country, &other.country, sizeof(wifi_country_t)); + bandwidth = other.bandwidth; # endif #endif // ifdef ESP32 @@ -334,6 +336,19 @@ String WiFi_AP_Candidate::toString(const String& separator) const { #endif // ifdef ESP32 if (phy_str.length()) { +#ifdef ESP32 + switch (bandwidth) + { + case WIFI_BW_HT20: break; + case WIFI_BW_HT40: phy_str += F(" 40 MHz"); break; + case WIFI_BW80: phy_str += F(" 80 MHz"); break; + case WIFI_BW160: phy_str += F(" 160 MHz"); break; + case WIFI_BW80_BW80: phy_str += F(" 80+80 MHz"); break; + + default: + break; + } +#endif result += strformat(F(" (%s)"), phy_str.c_str()); } } diff --git a/src/src/DataStructs/WiFi_AP_Candidate.h b/src/src/DataStructs/WiFi_AP_Candidate.h index cfcb2bf1c..a552912fd 100644 --- a/src/src/DataStructs/WiFi_AP_Candidate.h +++ b/src/src/DataStructs/WiFi_AP_Candidate.h @@ -75,6 +75,7 @@ struct WiFi_AP_Candidate { #ifdef ESP32 # if ESP_IDF_VERSION_MAJOR >= 5 wifi_country_t country; + wifi_bandwidth_t bandwidth{WIFI_BW_HT20}; # endif #endif // ifdef ESP32 diff --git a/src/src/ESPEasyCore/ESPEasyWifi.cpp b/src/src/ESPEasyCore/ESPEasyWifi.cpp index 17af3cb25..668950e33 100644 --- a/src/src/ESPEasyCore/ESPEasyWifi.cpp +++ b/src/src/ESPEasyCore/ESPEasyWifi.cpp @@ -294,134 +294,6 @@ bool WiFiScanAllowed() { return WiFiEventData.processedConnect; } -void WifiScan(bool async, uint8_t channel) { - ESPEasy::net::wifi::setSTA(true); - - if (!WiFiScanAllowed()) { - return; - } -# ifdef ESP32 - - // TD-er: Don't run async scan on ESP32. - // Since IDF 4.4 it seems like the active channel may be messed up when running async scan - // Perform a disconnect after scanning. - // See: https://github.com/letscontrolit/ESPEasy/pull/3579#issuecomment-967021347 - async = false; - - if (Settings.IncludeHiddenSSID()) { - ESPEasy::net::wifi::setWiFiCountryPolicyManual(); - } - - -# endif // ifdef ESP32 - - START_TIMER; - WiFiEventData.lastScanMoment.setNow(); - # ifndef BUILD_NO_DEBUG - - if (loglevelActiveFor(LOG_LEVEL_INFO)) { - if (channel == 0) { - addLog(LOG_LEVEL_INFO, F("WiFi : Start network scan all channels")); - } else { - addLogMove(LOG_LEVEL_INFO, strformat(F("WiFi : Start network scan ch: %d "), channel)); - } - } - # endif // ifndef BUILD_NO_DEBUG - bool show_hidden = true; - WiFiEventData.processedScanDone = false; - WiFiEventData.lastGetScanMoment.setNow(); - WiFiEventData.lastScanChannel = channel; - - unsigned int nrScans = 1 + (async ? 0 : Settings.NumberExtraWiFiScans); - - while (nrScans > 0) { - if (!async) { - WiFi_AP_Candidates.begin_sync_scan(); - FeedSW_watchdog(); - } - --nrScans; -# ifdef ESP8266 -# if FEATURE_ESP8266_DIRECT_WIFI_SCAN - { - static bool FIRST_SCAN = true; - - struct scan_config config; - memset(&config, 0, sizeof(config)); - config.ssid = nullptr; - config.bssid = nullptr; - config.channel = channel; - config.show_hidden = show_hidden ? 1 : 0; - config.scan_type = WIFI_SCAN_TYPE_ACTIVE; - - if (FIRST_SCAN) { - config.scan_time.active.min = 100; - config.scan_time.active.max = 200; - } else { - config.scan_time.active.min = 400; - config.scan_time.active.max = 500; - } - FIRST_SCAN = false; - wifi_station_scan(&config, &onWiFiScanDone); - - if (!async) { - // will resume when SYSTEM_EVENT_SCAN_DONE event is fired - do - { - delay(0); - } while (!WiFiEventData.processedScanDone); - } - - } -# else // if FEATURE_ESP8266_DIRECT_WIFI_SCAN - WiFi.scanNetworks(async, show_hidden, channel); -# endif // if FEATURE_ESP8266_DIRECT_WIFI_SCAN -# endif // ifdef ESP8266 -# ifdef ESP32 - const bool passive = Settings.PassiveWiFiScan(); - const uint32_t max_ms_per_chan = 120; -#if CONFIG_SOC_WIFI_SUPPORT_5G - // ESP32-C5 scans both 2.4 and 5 GHz band, which takes much longer - // 14 channels on 2.4 GHz - // 36 channels on 5 GHz: 36~177 (36, 40, 44 ... 177) - WiFi.setScanTimeout(50 * (max_ms_per_chan + 10)); -#else -// WiFi.setScanTimeout(14 * (max_ms_per_chan + 10)); -#endif - WiFi.scanNetworks(async, show_hidden, passive, max_ms_per_chan /*, channel */); -# endif // ifdef ESP32 - - if (!async) { - FeedSW_watchdog(); - processScanDone(); - } - } -# if FEATURE_TIMING_STATS - - if (async) { - STOP_TIMER(WIFI_SCAN_ASYNC); - } else { - STOP_TIMER(WIFI_SCAN_SYNC); - } -# endif // if FEATURE_TIMING_STATS - -# ifdef ESP32 -# if ESP_IDF_VERSION_MAJOR < 5 - RTC.clearLastWiFi(); - - if (WiFiConnected()) { - # ifndef BUILD_NO_DEBUG - addLog(LOG_LEVEL_INFO, F("WiFi : Disconnect after scan")); - # endif - - const bool needReconnect = WiFiEventData.wifiConnectAttemptNeeded; - WifiDisconnect(); - WiFiEventData.wifiConnectAttemptNeeded = needReconnect; - } -# endif // if ESP_IDF_VERSION_MAJOR < 5 -# endif // ifdef ESP32 - -} - // ******************************************************************************** // Scan all Wifi Access Points // ******************************************************************************** @@ -432,7 +304,7 @@ void WiFiScan_log_to_serial() if (WiFi_AP_Candidates.scanComplete() <= 0) { WiFiMode_t cur_wifimode = WiFi.getMode(); - WifiScan(false); + ESPEasy::net::wifi::WifiScan(false); ESPEasy::net::wifi::setWifiMode(cur_wifimode); } diff --git a/src/src/ESPEasyCore/ESPEasyWifi.h b/src/src/ESPEasyCore/ESPEasyWifi.h index c1d421389..9102dd75f 100644 --- a/src/src/ESPEasyCore/ESPEasyWifi.h +++ b/src/src/ESPEasyCore/ESPEasyWifi.h @@ -65,8 +65,6 @@ int64_t WiFi_get_TSF_time(); # endif // ifdef ESP32 void WifiDisconnect(); bool WiFiScanAllowed(); -void WifiScan(bool async, - uint8_t channel = 0); void WiFiScan_log_to_serial(); void setAPinternal(bool enable); // FIXME TD-er: Move to ESPEasyWifi_abstracted... diff --git a/src/src/ESPEasyCore/ESPEasyWifi_abstracted.cpp b/src/src/ESPEasyCore/ESPEasyWifi_abstracted.cpp index 3937d3eb2..8e8b0d3fd 100644 --- a/src/src/ESPEasyCore/ESPEasyWifi_abstracted.cpp +++ b/src/src/ESPEasyCore/ESPEasyWifi_abstracted.cpp @@ -26,6 +26,20 @@ const __FlashStringHelper* getWifiModeString(WiFiMode_t wifimode) return F("Unknown"); } +#if CONFIG_SOC_WIFI_SUPPORT_5G +const __FlashStringHelper* getWifiBandModeString(wifi_band_mode_t wifiBandMode) +{ + switch (wifiBandMode) + { + case WIFI_BAND_MODE_2G_ONLY: return F("2.4 GHz only"); + case WIFI_BAND_MODE_5G_ONLY: return F("5 GHz only"); + default: break; + } + return F("2.4 GHz + 5 GHz"); +} +#endif + + bool WiFiConnected() { return ESPEasyWiFi.connected(); } bool setSTA(bool enable) { return setSTA_AP(enable, WifiIsAP(WiFi.getMode())); } @@ -143,7 +157,14 @@ int GetRSSI_quality() { return (rssi / 5) + 1; } -void setConnectionSpeed() { setConnectionSpeed(Settings.ForceWiFi_bg_mode()); } +void setConnectionSpeed() { + setConnectionSpeed( + Settings.ForceWiFi_bg_mode() +#if CONFIG_SOC_WIFI_SUPPORT_5G + ,Settings.WiFi_band_mode() +#endif + ); +} } // namespace wifi } // namespace net diff --git a/src/src/ESPEasyCore/ESPEasyWifi_abstracted.h b/src/src/ESPEasyCore/ESPEasyWifi_abstracted.h index a8a45d4f6..2de675c7a 100644 --- a/src/src/ESPEasyCore/ESPEasyWifi_abstracted.h +++ b/src/src/ESPEasyCore/ESPEasyWifi_abstracted.h @@ -43,6 +43,10 @@ bool WifiIsSTA(WiFiMode_t wifimode); const __FlashStringHelper* getWifiModeString(WiFiMode_t wifimode); +#if CONFIG_SOC_WIFI_SUPPORT_5G +const __FlashStringHelper* getWifiBandModeString(wifi_band_mode_t wifiBandMode); +#endif + bool setSTA(bool enable); bool setAP(bool enable); bool setSTA_AP(bool sta_enable, @@ -51,6 +55,10 @@ bool setSTA_AP(bool sta_enable, bool setWifiMode(WiFiMode_t new_mode); +void WifiScan(bool async, + uint8_t channel = 0); + + // ******************************************************************************** // Event handlers // ******************************************************************************** @@ -79,7 +87,11 @@ void doSetWiFiTXpower(float& dBm); int GetRSSI_quality(); void setConnectionSpeed(); +#if CONFIG_SOC_WIFI_SUPPORT_5G +void setConnectionSpeed(bool ForceWiFi_bg_mode, wifi_band_mode_t WiFi_band_mode); +#else void setConnectionSpeed(bool ForceWiFi_bg_mode); +#endif void setWiFiNoneSleep(); void setWiFiEcoPowerMode(); diff --git a/src/src/ESPEasyCore/ESPEasyWifi_abstracted_ESP32.cpp b/src/src/ESPEasyCore/ESPEasyWifi_abstracted_ESP32.cpp index dd1c656cd..a436a7e9a 100644 --- a/src/src/ESPEasyCore/ESPEasyWifi_abstracted_ESP32.cpp +++ b/src/src/ESPEasyCore/ESPEasyWifi_abstracted_ESP32.cpp @@ -3,6 +3,8 @@ #if FEATURE_WIFI # ifdef ESP32 +# include "../DataStructs/TimingStats.h" + # include "../Globals/ESPEasyWiFiEvent.h" # include "../Globals/EventQueue.h" # include "../Globals/Settings.h" @@ -192,6 +194,103 @@ bool setWifiMode(WiFiMode_t new_mode) return true; } +void WifiScan(bool async, uint8_t channel) { + ESPEasy::net::wifi::setSTA(true); + + if (!WiFiScanAllowed()) { + return; + } + +# if CONFIG_SOC_WIFI_SUPPORT_5G + const wifi_band_mode_t current_wifi_band_mode = WiFi.getBandMode(); + WiFi.setBandMode(Settings.WiFi_band_mode()); +# endif + + // TD-er: Don't run async scan on ESP32. + // Since IDF 4.4 it seems like the active channel may be messed up when running async scan + // Perform a disconnect after scanning. + // See: https://github.com/letscontrolit/ESPEasy/pull/3579#issuecomment-967021347 + async = false; + + if (Settings.IncludeHiddenSSID()) { + ESPEasy::net::wifi::setWiFiCountryPolicyManual(); + } + + START_TIMER; + WiFiEventData.lastScanMoment.setNow(); + # ifndef BUILD_NO_DEBUG + + if (loglevelActiveFor(LOG_LEVEL_INFO)) { + if (channel == 0) { + addLog(LOG_LEVEL_INFO, F("WiFi : Start network scan all channels")); + } else { + addLogMove(LOG_LEVEL_INFO, strformat(F("WiFi : Start network scan ch: %d "), channel)); + } + } + # endif // ifndef BUILD_NO_DEBUG + bool show_hidden = true; + WiFiEventData.processedScanDone = false; + WiFiEventData.lastGetScanMoment.setNow(); + WiFiEventData.lastScanChannel = channel; + + unsigned int nrScans = 1 + (async ? 0 : Settings.NumberExtraWiFiScans); + + while (nrScans > 0) { + if (!async) { + WiFi_AP_Candidates.begin_sync_scan(); + FeedSW_watchdog(); + } + --nrScans; + + const bool passive = Settings.PassiveWiFiScan(); + const uint32_t max_ms_per_chan = 120; +# if CONFIG_SOC_WIFI_SUPPORT_5G + + // ESP32-C5 scans both 2.4 and 5 GHz band, which takes much longer + // 14 channels on 2.4 GHz + // 28 channels on 5 GHz: 36~177 (36, 40, 44 ... 177) + // Typically a scan takes 40 ... 60 msec per channel longer. + // To be safe, set the timeout to 2x max_ms_per_chan + + WiFi.setScanTimeout((14 + 28) * max_ms_per_chan * 2); +# else // if CONFIG_SOC_WIFI_SUPPORT_5G + WiFi.setScanTimeout(14 * max_ms_per_chan * 2); +# endif // if CONFIG_SOC_WIFI_SUPPORT_5G + WiFi.scanNetworks(async, show_hidden, passive, max_ms_per_chan /*, channel */); + + if (!async) { + FeedSW_watchdog(); + processScanDone(); + } + } +# if FEATURE_TIMING_STATS + + if (async) { + STOP_TIMER(WIFI_SCAN_ASYNC); + } else { + STOP_TIMER(WIFI_SCAN_SYNC); + } +# endif // if FEATURE_TIMING_STATS + +# if ESP_IDF_VERSION_MAJOR < 5 + RTC.clearLastWiFi(); + + if (WiFiConnected()) { + # ifndef BUILD_NO_DEBUG + addLog(LOG_LEVEL_INFO, F("WiFi : Disconnect after scan")); + # endif + + const bool needReconnect = WiFiEventData.wifiConnectAttemptNeeded; + WifiDisconnect(); + WiFiEventData.wifiConnectAttemptNeeded = needReconnect; + } +# endif // if ESP_IDF_VERSION_MAJOR < 5 +# if CONFIG_SOC_WIFI_SUPPORT_5G + // Restore band mode + WiFi.setBandMode(current_wifi_band_mode); +#endif +} + void removeWiFiEventHandler() { WiFi.removeEvent(WiFiEventData.wm_event_id); @@ -283,7 +382,44 @@ void doSetWiFiTXpower(float& dBm) # endif // if FEATURE_SET_WIFI_TX_PWR -void setConnectionSpeed(bool ForceWiFi_bg_mode) { +# if CONFIG_SOC_WIFI_SUPPORT_5G + +bool setProtocol(wifi_interface_t ifx, uint16_t protocol_2GHz, uint16_t protocol_5GHz) +{ + esp_err_t err; + switch (WiFi.getBandMode()) + { + case WIFI_BAND_MODE_2G_ONLY: err = esp_wifi_set_protocol(ifx, protocol_2GHz); break; + case WIFI_BAND_MODE_5G_ONLY: err = esp_wifi_set_protocol(ifx, protocol_5GHz); break; + default: + { + wifi_protocols_t protocols { .ghz_2g = protocol_2GHz, .ghz_5g = protocol_5GHz }; + err = esp_wifi_set_protocols(WIFI_IF_STA, &protocols); + break; + } + } + if (err != ESP_OK) { + // TODO TD-er: Log + } + + return err == ESP_OK; +} + +# else // if CONFIG_SOC_WIFI_SUPPORT_5G + +bool setProtocol(wifi_interface_t ifx, uint8_t protocol_2GHz) { return esp_wifi_set_protocol(ifx, protocol_2GHz) == ESP_OK; } + +# endif // if CONFIG_SOC_WIFI_SUPPORT_5G + + +# if CONFIG_SOC_WIFI_SUPPORT_5G + +void setConnectionSpeed(bool ForceWiFi_bg_mode, wifi_band_mode_t WiFi_band_mode) +# else // if CONFIG_SOC_WIFI_SUPPORT_5G + +void setConnectionSpeed(bool ForceWiFi_bg_mode) +# endif // if CONFIG_SOC_WIFI_SUPPORT_5G +{ // Does not (yet) work, so commented out. // HT20 = 20 MHz channel width. @@ -294,22 +430,27 @@ void setConnectionSpeed(bool ForceWiFi_bg_mode) { // The response speed and stability is better at HT20 for ESP units. esp_wifi_set_bandwidth(WIFI_IF_STA, WIFI_BW_HT20); +# if CONFIG_SOC_WIFI_SUPPORT_5G + WiFi.setBandMode(WiFi_band_mode); +# if CONFIG_SOC_WIFI_HE_SUPPORT + uint8_t protocol_5GHz = WIFI_PROTOCOL_11N | WIFI_PROTOCOL_11A | WIFI_PROTOCOL_11AC | WIFI_PROTOCOL_11AX; +# else + uint8_t protocol_5GHz = WIFI_PROTOCOL_11N | WIFI_PROTOCOL_11A | WIFI_PROTOCOL_11AC; +# endif // if CONFIG_SOC_WIFI_HE_SUPPORT +# endif // if CONFIG_SOC_WIFI_SUPPORT_5G + uint8_t protocol = 0; if (ForceWiFi_bg_mode) { protocol = WIFI_PROTOCOL_11B | WIFI_PROTOCOL_11G; // Default to BG } - if (!ForceWiFi_bg_mode || (WiFiEventData.connectionFailures > 10)) { - // Set to use BGN - protocol |= WIFI_PROTOCOL_11N; + if (WiFiEventData.connectionFailures > 10) { + // Set to allow all protocols + protocol = WIFI_PROTOCOL_11B | WIFI_PROTOCOL_11G | WIFI_PROTOCOL_11N; # if CONFIG_SOC_WIFI_HE_SUPPORT protocol |= WIFI_PROTOCOL_11AX; # endif -# if CONFIG_SOC_WIFI_SUPPORT_5G - protocol |= WIFI_PROTOCOL_11A; - protocol |= WIFI_PROTOCOL_11AC; -# endif // if CONFIG_SOC_WIFI_SUPPORT_5G } const WiFi_AP_Candidate candidate = WiFi_AP_Candidates.getCurrent(); @@ -326,12 +467,14 @@ void setConnectionSpeed(bool ForceWiFi_bg_mode) { if (candidate.bits.phy_11ax) { protocol |= WIFI_PROTOCOL_11AX; } # endif // if CONFIG_SOC_WIFI_HE_SUPPORT +/* # if CONFIG_SOC_WIFI_SUPPORT_5G if (candidate.bits.phy_11a) { protocol |= WIFI_PROTOCOL_11A; } if (candidate.bits.phy_11ac) { protocol |= WIFI_PROTOCOL_11AC; } # endif // if CONFIG_SOC_WIFI_SUPPORT_5G +*/ } else // Check to see if the access point is set to "N-only" @@ -347,19 +490,20 @@ void setConnectionSpeed(bool ForceWiFi_bg_mode) { if (candidate.bits.phy_11ax) { // Set to use WiFi6 protocol |= WIFI_PROTOCOL_11AX; +// protocol_5GHz |= WIFI_PROTOCOL_11AX; addLog(LOG_LEVEL_INFO, F("WIFI : AP allows 802.11ax, Wi-Fi 6")); } # if CONFIG_SOC_WIFI_SUPPORT_5G if (candidate.bits.phy_11a) { // Set to use 5 GHz WiFi - protocol |= WIFI_PROTOCOL_11A; +// protocol_5GHz |= WIFI_PROTOCOL_11A; addLog(LOG_LEVEL_INFO, F("WIFI : AP allows 802.11a, 5 GHz")); } if (candidate.bits.phy_11ac) { // Set to use 5 GHz WiFi-5 - protocol |= WIFI_PROTOCOL_11AC; +// protocol_5GHz |= WIFI_PROTOCOL_11AC; addLog(LOG_LEVEL_INFO, F("WIFI : AP allows 802.11ac, 5 GHz Wi-Fi 5")); } # endif // if CONFIG_SOC_WIFI_SUPPORT_5G @@ -373,11 +517,19 @@ void setConnectionSpeed(bool ForceWiFi_bg_mode) { // Set to use "Long GI" making it more resilliant to reflections // See: https://www.tp-link.com/us/configuration-guides/q_a_basic_wireless_concepts/?configurationId=2958#_idTextAnchor038 esp_wifi_config_80211_tx_rate(WIFI_IF_STA, WIFI_PHY_RATE_MCS3_LGI); - esp_wifi_set_protocol(WIFI_IF_STA, protocol); + # if CONFIG_SOC_WIFI_SUPPORT_5G + setProtocol(WIFI_IF_STA, protocol, protocol_5GHz); + # else + setProtocol(WIFI_IF_STA, protocol); + # endif // if CONFIG_SOC_WIFI_SUPPORT_5G } if (WifiIsAP(WiFi.getMode())) { - esp_wifi_set_protocol(WIFI_IF_AP, protocol); + # if CONFIG_SOC_WIFI_SUPPORT_5G + setProtocol(WIFI_IF_AP, protocol, protocol_5GHz); + # else + setProtocol(WIFI_IF_STA, protocol); + # endif // if CONFIG_SOC_WIFI_SUPPORT_5G } } diff --git a/src/src/ESPEasyCore/ESPEasyWifi_abstracted_ESP8266.cpp b/src/src/ESPEasyCore/ESPEasyWifi_abstracted_ESP8266.cpp index 349c04831..4b25ff4ae 100644 --- a/src/src/ESPEasyCore/ESPEasyWifi_abstracted_ESP8266.cpp +++ b/src/src/ESPEasyCore/ESPEasyWifi_abstracted_ESP8266.cpp @@ -3,6 +3,8 @@ #if FEATURE_WIFI # ifdef ESP8266 +# include "../DataStructs/TimingStats.h" + # include "../Helpers/StringConverter.h" # include "../Globals/ESPEasyWiFiEvent.h" @@ -122,6 +124,90 @@ bool setWifiMode(WiFiMode_t new_mode) return true; } +void WifiScan(bool async, uint8_t channel) { + ESPEasy::net::wifi::setSTA(true); + + if (!WiFiScanAllowed()) { + return; + } + + START_TIMER; + WiFiEventData.lastScanMoment.setNow(); + # ifndef BUILD_NO_DEBUG + + if (loglevelActiveFor(LOG_LEVEL_INFO)) { + if (channel == 0) { + addLog(LOG_LEVEL_INFO, F("WiFi : Start network scan all channels")); + } else { + addLogMove(LOG_LEVEL_INFO, strformat(F("WiFi : Start network scan ch: %d "), channel)); + } + } + # endif // ifndef BUILD_NO_DEBUG + bool show_hidden = true; + WiFiEventData.processedScanDone = false; + WiFiEventData.lastGetScanMoment.setNow(); + WiFiEventData.lastScanChannel = channel; + + unsigned int nrScans = 1 + (async ? 0 : Settings.NumberExtraWiFiScans); + + while (nrScans > 0) { + if (!async) { + WiFi_AP_Candidates.begin_sync_scan(); + FeedSW_watchdog(); + } + --nrScans; +# if FEATURE_ESP8266_DIRECT_WIFI_SCAN + { + static bool FIRST_SCAN = true; + + struct scan_config config; + memset(&config, 0, sizeof(config)); + config.ssid = nullptr; + config.bssid = nullptr; + config.channel = channel; + config.show_hidden = show_hidden ? 1 : 0; + config.scan_type = WIFI_SCAN_TYPE_ACTIVE; + + if (FIRST_SCAN) { + config.scan_time.active.min = 100; + config.scan_time.active.max = 200; + } else { + config.scan_time.active.min = 400; + config.scan_time.active.max = 500; + } + FIRST_SCAN = false; + wifi_station_scan(&config, &onWiFiScanDone); + + if (!async) { + // will resume when SYSTEM_EVENT_SCAN_DONE event is fired + do + { + delay(0); + } while (!WiFiEventData.processedScanDone); + } + + } +# else // if FEATURE_ESP8266_DIRECT_WIFI_SCAN + WiFi.scanNetworks(async, show_hidden, channel); +# endif // if FEATURE_ESP8266_DIRECT_WIFI_SCAN + + if (!async) { + FeedSW_watchdog(); + processScanDone(); + } + } +# if FEATURE_TIMING_STATS + + if (async) { + STOP_TIMER(WIFI_SCAN_ASYNC); + } else { + STOP_TIMER(WIFI_SCAN_SYNC); + } +# endif // if FEATURE_TIMING_STATS + + +} + void removeWiFiEventHandler() { // Not needed for ESP8266 } diff --git a/src/src/ESPEasyCore/ESPEasy_setup.cpp b/src/src/ESPEasyCore/ESPEasy_setup.cpp index ddf65fddf..6ddafc386 100644 --- a/src/src/ESPEasyCore/ESPEasy_setup.cpp +++ b/src/src/ESPEasyCore/ESPEasy_setup.cpp @@ -461,7 +461,7 @@ void ESPEasy_setup() RTC.clearLastWiFi(); // Must scan all channels // Wait until scan has finished to make sure as many as possible are found // We're still in the setup phase, so nothing else is taking resources of the ESP. - WifiScan(false); + ESPEasy::net::wifi::WifiScan(false); WiFiEventData.lastScanMoment.clear(); } @@ -469,7 +469,7 @@ void ESPEasy_setup() // It appears reconnecting from RTC may take just as long to be able to send first packet as performing a scan first and then connect. // Perhaps the WiFi radio needs some time to stabilize first? if (!WiFi_AP_Candidates.hasCandidates()) { - WifiScan(false, RTC.lastWiFiChannel); + ESPEasy::net::wifi::WifiScan(false, RTC.lastWiFiChannel); } WiFi_AP_Candidates.clearCache(); processScanDone(); @@ -479,7 +479,7 @@ void ESPEasy_setup() #ifndef BUILD_MINIMAL_OTA addLog(LOG_LEVEL_INFO, F("Setup: Scan all channels")); #endif - WifiScan(false); + ESPEasy::net::wifi::WifiScan(false); } // ESPEasy::net::wifi::setWifiMode(WIFI_OFF); diff --git a/src/src/Helpers/Networking.cpp b/src/src/Helpers/Networking.cpp index 4b0550c63..4335fa99b 100644 --- a/src/src/Helpers/Networking.cpp +++ b/src/src/Helpers/Networking.cpp @@ -520,7 +520,7 @@ void refreshNodeList() // FIXME TD-er: Do not perform regular scans on ESP32 as long as we cannot scan per channel if (!Nodes.isEndpoint()) { - WifiScan(true, Nodes.getESPEasyNOW_channel()); + ESPEasy::net::wifi::WifiScan(true, Nodes.getESPEasyNOW_channel()); } # endif // ifdef ESP8266 # endif // ifdef USES_ESPEASY_NOW diff --git a/src/src/Helpers/StringProvider.cpp b/src/src/Helpers/StringProvider.cpp index 8cdd31321..487d272e8 100644 --- a/src/src/Helpers/StringProvider.cpp +++ b/src/src/Helpers/StringProvider.cpp @@ -10,6 +10,7 @@ #include "../ESPEasyCore/ESPEasyNetwork.h" #include "../ESPEasyCore/ESPEasyWifi.h" +#include "../ESPEasyCore/ESPEasyWifi_abstracted.h" #if FEATURE_ETHERNET #include "../ESPEasyCore/ESPEasyEth.h" #endif @@ -142,9 +143,13 @@ const __FlashStringHelper * getLabel(LabelType::Enum label) { #if FEATURE_TARSTREAM_SUPPORT case LabelType::DISABLE_SAVE_CONFIG_AS_TAR: return F("Disable Save Config as .tar"); #endif // if FEATURE_TARSTREAM_SUPPORT - #if FEATURE_TASKVALUE_UNIT_OF_MEASURE +#if FEATURE_TASKVALUE_UNIT_OF_MEASURE case LabelType::SHOW_UOM_ON_DEVICES_PAGE: return F("Show Unit of Measure"); - #endif // if FEATURE_TASKVALUE_UNIT_OF_MEASURE +#endif // if FEATURE_TASKVALUE_UNIT_OF_MEASURE + +#if CONFIG_SOC_WIFI_SUPPORT_5G + case LabelType::WIFI_BAND_MODE: return F("WiFi Band Mode"); +#endif case LabelType::BOOT_TYPE: return F("Last Boot Cause"); case LabelType::BOOT_COUNT: return F("Boot Count"); @@ -442,6 +447,10 @@ String getValue(LabelType::Enum label) { case LabelType::SHOW_UOM_ON_DEVICES_PAGE: return jsonBool(Settings.ShowUnitOfMeasureOnDevicesPage()); #endif // if FEATURE_TASKVALUE_UNIT_OF_MEASURE +#if CONFIG_SOC_WIFI_SUPPORT_5G + case LabelType::WIFI_BAND_MODE: return ESPEasy::net::wifi::getWifiBandModeString(Settings.WiFi_band_mode()); +#endif + case LabelType::BOOT_TYPE: return getLastBootCauseString(); case LabelType::BOOT_COUNT: break; case LabelType::DEEP_SLEEP_ALTERNATIVE_CALL: return jsonBool(Settings.UseAlternativeDeepSleep()); diff --git a/src/src/Helpers/StringProvider.h b/src/src/Helpers/StringProvider.h index f15d3bc81..2e71af5b5 100644 --- a/src/src/Helpers/StringProvider.h +++ b/src/src/Helpers/StringProvider.h @@ -93,6 +93,9 @@ struct LabelType { #if FEATURE_TASKVALUE_UNIT_OF_MEASURE SHOW_UOM_ON_DEVICES_PAGE, #endif // if FEATURE_TASKVALUE_UNIT_OF_MEASURE +#if CONFIG_SOC_WIFI_SUPPORT_5G + WIFI_BAND_MODE, +#endif BOOT_TYPE, // Cold boot BOOT_COUNT, // 0 diff --git a/src/src/WebServer/AdvancedConfigPage.cpp b/src/src/WebServer/AdvancedConfigPage.cpp index 4e22f5852..ee9aa48f9 100644 --- a/src/src/WebServer/AdvancedConfigPage.cpp +++ b/src/src/WebServer/AdvancedConfigPage.cpp @@ -9,6 +9,7 @@ #include "../WebServer/ESPEasy_WebServer.h" #include "../ESPEasyCore/ESPEasyWifi.h" +#include "../ESPEasyCore/ESPEasyWifi_abstracted.h" #include "../Globals/ESPEasy_time.h" #include "../Globals/Settings.h" @@ -147,6 +148,9 @@ void handle_advanced() { #ifdef ESP32 Settings.PassiveWiFiScan(isFormItemChecked(LabelType::WIFI_PASSIVE_SCAN)); #endif +#if CONFIG_SOC_WIFI_SUPPORT_5G + Settings.WiFi_band_mode(static_cast(getFormItemInt(getInternalLabel(LabelType::WIFI_BAND_MODE)))); +#endif #if FEATURE_USE_IPV6 Settings.EnableIPv6(isFormItemChecked(LabelType::ENABLE_IPV6)); #endif @@ -359,21 +363,23 @@ void handle_advanced() { addFormCheckBox(LabelType::ALLOW_OTA_UNLIMITED, Settings.AllowOTAUnlimited()); # endif // ifndef NO_HTTP_UPDATER #if FEATURE_AUTO_DARK_MODE - const __FlashStringHelper * cssModeNames[] = { - F("Auto"), - F("Light"), - F("Dark"), - }; - //const int cssModeOptions[] = { 0, 1, 2}; - constexpr int nrCssModeOptions = NR_ELEMENTS(cssModeNames); - const FormSelectorOptions selector( - nrCssModeOptions, - cssModeNames/*, - cssModeOptions*/); - selector.addFormSelector( - getLabel(LabelType::ENABLE_AUTO_DARK_MODE), - getInternalLabel(LabelType::ENABLE_AUTO_DARK_MODE), - Settings.getCssMode()); + { + const __FlashStringHelper * cssModeNames[] = { + F("Auto"), + F("Light"), + F("Dark"), + }; + //const int cssModeOptions[] = { 0, 1, 2}; + constexpr int nrCssModeOptions = NR_ELEMENTS(cssModeNames); + const FormSelectorOptions selector( + nrCssModeOptions, + cssModeNames/*, + cssModeOptions*/); + selector.addFormSelector( + getLabel(LabelType::ENABLE_AUTO_DARK_MODE), + getInternalLabel(LabelType::ENABLE_AUTO_DARK_MODE), + Settings.getCssMode()); + } #endif // FEATURE_AUTO_DARK_MODE #if FEATURE_RULES_EASY_COLOR_CODE @@ -419,6 +425,26 @@ void handle_advanced() { #ifdef ESP32 addFormCheckBox(LabelType::WIFI_PASSIVE_SCAN, Settings.PassiveWiFiScan()); #endif +#if CONFIG_SOC_WIFI_SUPPORT_5G + { + const __FlashStringHelper * wifiModeNames[] = { + ESPEasy::net::wifi::getWifiBandModeString(WIFI_BAND_MODE_2G_ONLY), + ESPEasy::net::wifi::getWifiBandModeString(WIFI_BAND_MODE_5G_ONLY), + ESPEasy::net::wifi::getWifiBandModeString(WIFI_BAND_MODE_AUTO), + }; + const int wifiModeOptions[] = { WIFI_BAND_MODE_2G_ONLY, WIFI_BAND_MODE_5G_ONLY, WIFI_BAND_MODE_AUTO}; + constexpr int nrWifiModeOptions = NR_ELEMENTS(wifiModeNames); + const FormSelectorOptions selector( + nrWifiModeOptions, + wifiModeNames, + wifiModeOptions); + selector.addFormSelector( + getLabel(LabelType::WIFI_BAND_MODE), + getInternalLabel(LabelType::WIFI_BAND_MODE), + Settings.WiFi_band_mode()); + } +#endif + #if FEATURE_USE_IPV6 addFormCheckBox(LabelType::ENABLE_IPV6, Settings.EnableIPv6()); #endif diff --git a/src/src/WebServer/RootPage.cpp b/src/src/WebServer/RootPage.cpp index df0749f29..534eade50 100644 --- a/src/src/WebServer/RootPage.cpp +++ b/src/src/WebServer/RootPage.cpp @@ -304,7 +304,7 @@ void handle_root() { html_table_header(F("Type")); } html_table_header(F("IP"), 160); // Should fit "255.255.255.255" - html_table_header(F("Load")); + html_table_header(F("Load (%)")); html_table_header(F("Age (s)")); # ifdef USES_ESPEASY_NOW diff --git a/src/src/WebServer/SetupPage.cpp b/src/src/WebServer/SetupPage.cpp index 51ea58abb..4a143d68f 100644 --- a/src/src/WebServer/SetupPage.cpp +++ b/src/src/WebServer/SetupPage.cpp @@ -92,7 +92,7 @@ void handle_setup() { const bool performRescan = hasArg(F("performrescan")); if (performRescan) { WiFiEventData.lastScanMoment.clear(); - WifiScan(false); + ESPEasy::net::wifi::WifiScan(false); } if (!other.isEmpty()) @@ -249,7 +249,7 @@ void handle_setup_scan_and_show(const String& ssid, const String& other, const S && WiFiScanAllowed(); if (needsRescan) { WiFiMode_t cur_wifimode = WiFi.getMode(); - WifiScan(false); + ESPEasy::net::wifi::WifiScan(false); scanCompleteStatus = WiFi_AP_Candidates.scanComplete(); ESPEasy::net::wifi::setWifiMode(cur_wifimode); } diff --git a/src/src/WebServer/SysInfoPage.cpp b/src/src/WebServer/SysInfoPage.cpp index 0ffd9b76d..aba0535c1 100644 --- a/src/src/WebServer/SysInfoPage.cpp +++ b/src/src/WebServer/SysInfoPage.cpp @@ -519,6 +519,9 @@ void handle_sysinfo_Network() { addRowLabel(getLabel(LabelType::CHANNEL)); if (showWiFiConnectionInfo) { addHtml(getValue(LabelType::CHANNEL)); +#if CONFIG_SOC_WIFI_SUPPORT_5G + addHtml(WiFi.channel() < 36 ? F(" (2.4 GHz)") : F(" (5 GHz)")); +#endif } else addHtml('-'); addRowLabel(getLabel(LabelType::ENCRYPTION_TYPE_STA)); diff --git a/src/src/WebServer/WiFiScanner.cpp b/src/src/WebServer/WiFiScanner.cpp index 207e23413..5ee884590 100644 --- a/src/src/WebServer/WiFiScanner.cpp +++ b/src/src/WebServer/WiFiScanner.cpp @@ -31,7 +31,7 @@ void handle_wifiscanner_json() { if (WiFi_AP_Candidates.scanComplete() <= 0) { WiFiMode_t cur_wifimode = WiFi.getMode(); - WifiScan(false); + ESPEasy::net::wifi::WifiScan(false); ESPEasy::net::wifi::setWifiMode(cur_wifimode); } @@ -67,7 +67,7 @@ void handle_wifiscanner() { if (!isLoggedIn()) { return; } WiFiMode_t cur_wifimode = WiFi.getMode(); - WifiScan(false); + ESPEasy::net::wifi::WifiScan(false); int8_t scanCompleteStatus = WiFi_AP_Candidates.scanComplete(); ESPEasy::net::wifi::setWifiMode(cur_wifimode); From 083778f1a3318a6954e3ea49b0ad49c574b17d5c Mon Sep 17 00:00:00 2001 From: TD-er Date: Thu, 3 Jul 2025 11:27:44 +0200 Subject: [PATCH 085/564] [PubSubClient3] Add check for nullptr in CHECK_STRING_LENGTH strnlen will cause a crash when called with a nullptr. Where this macro is called, there are already some checks for optional fields, however it is a bit 'not so nice' for the device to crash when accidentally a nullptr is given for for example the id or will message. (will topic is checked, will message is not) See: https://github.com/hmueller01/pubsubclient3/pull/48 --- lib/pubsubclient3/src/PubSubClient.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/pubsubclient3/src/PubSubClient.h b/lib/pubsubclient3/src/PubSubClient.h index 6840d77bd..db77df9e9 100644 --- a/lib/pubsubclient3/src/PubSubClient.h +++ b/lib/pubsubclient3/src/PubSubClient.h @@ -118,7 +118,7 @@ #endif #define CHECK_STRING_LENGTH(l, s) \ - if (l + 2 + strnlen(s, this->bufferSize) > this->bufferSize) { \ + if ((!s) || (l + 2 + strnlen(s, this->bufferSize) > this->bufferSize)) { \ _client->stop(); \ return false; \ } From 284047d884f33279f31c16fb20cce87baa5d93cf Mon Sep 17 00:00:00 2001 From: TD-er Date: Thu, 3 Jul 2025 13:44:44 +0200 Subject: [PATCH 086/564] [Controller] Fix crashes on MQTT callback calls --- src/_C005.cpp | 4 ++-- src/src/DataStructs/ControllerSettingsStruct.cpp | 3 +++ src/src/Helpers/ESPEasy_Storage.cpp | 1 + src/src/Helpers/Scheduler_SystemEventTimer.cpp | 3 ++- 4 files changed, 8 insertions(+), 3 deletions(-) diff --git a/src/_C005.cpp b/src/_C005.cpp index f8e534501..9fb1b349d 100644 --- a/src/_C005.cpp +++ b/src/_C005.cpp @@ -137,7 +137,7 @@ bool CPlugin_005(CPlugin::Function function, struct EventStruct *event, String& { controllerIndex_t ControllerID = findFirstEnabledControllerWithId(CPLUGIN_ID_005); - if (validControllerIndex(ControllerID)) { + if (validControllerIndex(ControllerID) && event) { # if FEATURE_MQTT_DISCOVER MakeControllerSettings(ControllerSettings); // -V522 @@ -152,7 +152,7 @@ bool CPlugin_005(CPlugin::Function function, struct EventStruct *event, String& if (ControllerSettings->mqtt_autoDiscovery() && (ControllerSettings->MqttAutoDiscoveryTrigger[0] != '\0') && event->String1.equals(ControllerSettings->MqttAutoDiscoveryTrigger) - && event->String2.equals(online.isEmpty() ? F("online") : online) + && event->String2.equals(online.isEmpty() ? String(F("online")) : online) ) { // We have received the Discovery request topic // Generate random time-offset in 0.1 sec, range 1..30 seconds diff --git a/src/src/DataStructs/ControllerSettingsStruct.cpp b/src/src/DataStructs/ControllerSettingsStruct.cpp index 340d4fdd3..9afc59e96 100644 --- a/src/src/DataStructs/ControllerSettingsStruct.cpp +++ b/src/src/DataStructs/ControllerSettingsStruct.cpp @@ -84,9 +84,12 @@ void ControllerSettingsStruct::validate() { ZERO_TERMINATE(MQTTLwtTopic); ZERO_TERMINATE(LWTMessageConnect); ZERO_TERMINATE(LWTMessageDisconnect); + ZERO_TERMINATE(ClientID); ZERO_TERMINATE(MqttAutoDiscoveryTopic); + ZERO_TERMINATE(MqttAutoDiscoveryConfig); ZERO_TERMINATE(MqttAutoDiscoveryTrigger); + #if FEATURE_MQTT #if FEATURE_MQTT_TLS if (TLStype() == TLS_types::NoTLS) { diff --git a/src/src/Helpers/ESPEasy_Storage.cpp b/src/src/Helpers/ESPEasy_Storage.cpp index 613923cd8..b28063a90 100644 --- a/src/src/Helpers/ESPEasy_Storage.cpp +++ b/src/src/Helpers/ESPEasy_Storage.cpp @@ -1591,6 +1591,7 @@ String SaveControllerSettings(controllerIndex_t ControllerIndex, ControllerSetti Load Controller settings to file system \*********************************************************************************************/ String LoadControllerSettings(controllerIndex_t ControllerIndex, ControllerSettingsStruct& controller_settings) { + if (!validControllerIndex(ControllerIndex)) return EMPTY_STRING; #ifndef BUILD_NO_RAM_TRACKER checkRAM(F("LoadControllerSettings")); #endif // ifndef BUILD_NO_RAM_TRACKER diff --git a/src/src/Helpers/Scheduler_SystemEventTimer.cpp b/src/src/Helpers/Scheduler_SystemEventTimer.cpp index 688b1b0f2..492e849b0 100644 --- a/src/src/Helpers/Scheduler_SystemEventTimer.cpp +++ b/src/src/Helpers/Scheduler_SystemEventTimer.cpp @@ -92,7 +92,7 @@ void ESPEasy_Scheduler::schedule_mqtt_controller_event_timer( const char *c_topic, const uint8_t *b_payload, unsigned int length) { - if (validProtocolIndex(ProtocolIndex)) { + if (validProtocolIndex(ProtocolIndex) && c_topic && b_payload) { EventStruct event; const size_t topic_length = strlen_P(c_topic); @@ -117,6 +117,7 @@ void ESPEasy_Scheduler::schedule_mqtt_controller_event_timer( // Make sure emplace_back is not called when on 2nd heap HeapSelectDram ephemeral; # endif // ifdef USE_SECOND_HEAP + ScheduledEventQueue.emplace_back(timerID.mixed_id, std::move(event)); } } From 56a6706fb99fa505d405c0a6791581bde47f85a6 Mon Sep 17 00:00:00 2001 From: TD-er Date: Sun, 6 Jul 2025 01:34:38 +0200 Subject: [PATCH 087/564] [Network] Start adding Network config page --- platformio_core_defs.ini | 4 +- src/Custom-sample.h | 2 + src/src/CustomBuild/ESPEasyLimits.h | 6 + src/src/CustomBuild/define_plugin_sets.h | 3 + src/src/DataStructs/NetworkAdapterStruct.cpp | 1 + src/src/DataStructs/NetworkAdapterStruct.h | 19 + src/src/DataStructs/TimingStats.cpp | 15 + src/src/DataStructs/TimingStats.h | 8 + src/src/DataTypes/ESPEasy_plugin_functions.h | 23 + src/src/DataTypes/NWPluginID.cpp | 3 + src/src/DataTypes/NWPluginID.h | 11 + src/src/DataTypes/NetworkAdapterIndex.cpp | 5 + src/src/DataTypes/NetworkAdapterIndex.h | 11 + src/src/DataTypes/NetworkIndex.cpp | 5 + src/src/DataTypes/NetworkIndex.h | 10 + src/src/Globals/NWPlugins.cpp | 61 + src/src/Globals/NWPlugins.h | 33 + src/src/Helpers/_NWPlugin_init.cpp | 2195 ++++++++++++++++++ src/src/Helpers/_NWPlugin_init.h | 1062 +++++++++ src/src/WebServer/ESPEasy_WebServer.cpp | 4 + src/src/WebServer/NetworkPage.cpp | 75 + src/src/WebServer/NetworkPage.h | 40 + src/src/WebServer/WebTemplateParser.cpp | 15 +- src/src/WebServer/WebTemplateParser.h | 17 +- 24 files changed, 3619 insertions(+), 9 deletions(-) create mode 100644 src/src/DataStructs/NetworkAdapterStruct.cpp create mode 100644 src/src/DataStructs/NetworkAdapterStruct.h create mode 100644 src/src/DataTypes/NWPluginID.cpp create mode 100644 src/src/DataTypes/NWPluginID.h create mode 100644 src/src/DataTypes/NetworkAdapterIndex.cpp create mode 100644 src/src/DataTypes/NetworkAdapterIndex.h create mode 100644 src/src/DataTypes/NetworkIndex.cpp create mode 100644 src/src/DataTypes/NetworkIndex.h create mode 100644 src/src/Globals/NWPlugins.cpp create mode 100644 src/src/Globals/NWPlugins.h create mode 100644 src/src/Helpers/_NWPlugin_init.cpp create mode 100644 src/src/Helpers/_NWPlugin_init.h create mode 100644 src/src/WebServer/NetworkPage.cpp create mode 100644 src/src/WebServer/NetworkPage.h diff --git a/platformio_core_defs.ini b/platformio_core_defs.ini index 94be31e37..3e3d3af5c 100644 --- a/platformio_core_defs.ini +++ b/platformio_core_defs.ini @@ -166,7 +166,7 @@ extra_scripts = ${esp82xx_common.extra_scripts} ; ESP_IDF 5.4.1 [core_esp32_IDF5_4_1__3_2_0_LittleFS] platform = https://github.com/Jason2866/platform-espressif32.git#Arduino/IDF54 -platform_packages = framework-arduinoespressif32 @ https://github.com/Jason2866/esp32-arduino-lib-builder/releases/download/3743/framework-arduinoespressif32-all-release_v5.4-a4437683.zip +platform_packages = framework-arduinoespressif32 @ https://github.com/Jason2866/esp32-arduino-lib-builder/releases/download/3765/framework-arduinoespressif32-all-release_v5.4-3138bf0e.zip build_flags = -DESP32_STAGE -DESP_IDF_VERSION_MAJOR=5 -DLIBRARIES_NO_LOG=1 @@ -195,7 +195,7 @@ lib_extra_dirs = ; ESP_IDF 5.5.0 [core_esp32_IDF5_5_0__3_2_0_LittleFS] platform = https://github.com/Jason2866/platform-espressif32.git#Arduino/IDF55 -platform_packages = framework-arduinoespressif32 @ https://github.com/Jason2866/esp32-arduino-lib-builder/releases/download/3744/framework-arduinoespressif32-all-release_v5.5-c241ccd4.zip +platform_packages = framework-arduinoespressif32 @ https://github.com/Jason2866/esp32-arduino-lib-builder/releases/download/3766/framework-arduinoespressif32-all-release_v5.5-1bc6b44d.zip build_flags = -DESP32_STAGE -DESP_IDF_VERSION_MAJOR=5 -DLIBRARIES_NO_LOG=1 diff --git a/src/Custom-sample.h b/src/Custom-sample.h index 232ae1963..47d541356 100644 --- a/src/Custom-sample.h +++ b/src/Custom-sample.h @@ -290,7 +290,9 @@ /* #define MENU_INDEX_CONFIG_VISIBLE false #define MENU_INDEX_CONTROLLERS_VISIBLE false +#define MENU_INDEX_NETWORK_VISIBLE false #define MENU_INDEX_HARDWARE_VISIBLE false +#define MENU_INDEX_BUSES_VISIBLE false #define MENU_INDEX_DEVICES_VISIBLE false #define MENU_INDEX_RULES_VISIBLE false #define MENU_INDEX_NOTIFICATIONS_VISIBLE false diff --git a/src/src/CustomBuild/ESPEasyLimits.h b/src/src/CustomBuild/ESPEasyLimits.h index 5b98587ea..0912bc25c 100644 --- a/src/src/CustomBuild/ESPEasyLimits.h +++ b/src/src/CustomBuild/ESPEasyLimits.h @@ -40,6 +40,9 @@ #endif +#ifndef NETWORK_MAX + #define NETWORK_MAX 8 +#endif #ifndef CONTROLLER_MAX #define CONTROLLER_MAX 3 // max 4! #endif @@ -92,6 +95,9 @@ #ifndef CPLUGIN_MAX #define CPLUGIN_MAX 255 #endif +#ifndef NWPLUGIN_MAX + #define NWPLUGIN_MAX 255 +#endif #ifndef NPLUGIN_MAX #define NPLUGIN_MAX 4 #endif diff --git a/src/src/CustomBuild/define_plugin_sets.h b/src/src/CustomBuild/define_plugin_sets.h index 25c01d3cb..f5536e1fb 100644 --- a/src/src/CustomBuild/define_plugin_sets.h +++ b/src/src/CustomBuild/define_plugin_sets.h @@ -71,6 +71,9 @@ To create/register a plugin, you have to : #ifndef WEBSERVER_CONFIG #define WEBSERVER_CONFIG #endif + #ifndef WEBSERVER_NETWORK + #define WEBSERVER_NETWORK + #endif #ifndef WEBSERVER_CONTROL #define WEBSERVER_CONTROL #endif diff --git a/src/src/DataStructs/NetworkAdapterStruct.cpp b/src/src/DataStructs/NetworkAdapterStruct.cpp new file mode 100644 index 000000000..6d24e3bd0 --- /dev/null +++ b/src/src/DataStructs/NetworkAdapterStruct.cpp @@ -0,0 +1 @@ +#include "../DataStructs/NetworkAdapterStruct.h" \ No newline at end of file diff --git a/src/src/DataStructs/NetworkAdapterStruct.h b/src/src/DataStructs/NetworkAdapterStruct.h new file mode 100644 index 000000000..254dad82f --- /dev/null +++ b/src/src/DataStructs/NetworkAdapterStruct.h @@ -0,0 +1,19 @@ +#ifndef DATASTRUCTS_NETWORKADAPTERSTRUCT_H +#define DATASTRUCTS_NETWORKADAPTERSTRUCT_H + +#include "../../ESPEasy_common.h" +#include + +/*********************************************************************************************\ +* NetworkAdapterStruct +\*********************************************************************************************/ +struct NetworkAdapterStruct +{ + NetworkAdapterStruct() = default; + + + + +}; + +#endif \ No newline at end of file diff --git a/src/src/DataStructs/TimingStats.cpp b/src/src/DataStructs/TimingStats.cpp index d74f1bd24..276e350bb 100644 --- a/src/src/DataStructs/TimingStats.cpp +++ b/src/src/DataStructs/TimingStats.cpp @@ -9,6 +9,7 @@ std::map pluginStats; std::map controllerStats; +std::map networkStats; std::map miscStats; unsigned long timingstats_last_reset(0); @@ -202,6 +203,14 @@ bool mustLogCFunction(CPlugin::Function function) { return false; } +bool mustLogNWFunction(NWPlugin::Function function) +{ + if (!Settings.EnableTimingStats()) { return false; } + + return true; +} + + // Return flash string type to reduce bin size const __FlashStringHelper* getMiscStatsName_F(TimingStatsElements stat) { switch (stat) { @@ -327,6 +336,12 @@ void stopTimerController(protocolIndex_t T, CPlugin::Function F, uint32_t statis if (mustLogCFunction(F)) { controllerStats[static_cast(T) * 256 + static_cast(F)].add(usecPassedSince_fast(statisticsTimerStart)); } } +void stopTimerNetwork(networkAdapterIndex_t T, NWPlugin::Function F, uint32_t statisticsTimerStart) +{ + if (mustLogNWFunction(F)) { networkStats[static_cast(T) * 256 + static_cast(F)].add(usecPassedSince_fast(statisticsTimerStart)); } +} + + void stopTimer(TimingStatsElements L, uint32_t statisticsTimerStart) { if (Settings.EnableTimingStats()) { miscStats[L].add(usecPassedSince_fast(statisticsTimerStart)); } diff --git a/src/src/DataStructs/TimingStats.h b/src/src/DataStructs/TimingStats.h index 5d70d5dd5..5397d54e6 100644 --- a/src/src/DataStructs/TimingStats.h +++ b/src/src/DataStructs/TimingStats.h @@ -7,6 +7,7 @@ # include "../DataTypes/DeviceIndex.h" # include "../DataTypes/ESPEasy_plugin_functions.h" +# include "../DataTypes/NetworkAdapterIndex.h" # include "../DataTypes/ProtocolIndex.h" # include "../Globals/Settings.h" # include "../Helpers/ESPEasy_time_calc.h" @@ -165,6 +166,7 @@ const __FlashStringHelper* getPluginFunctionName(int function); bool mustLogFunction(int function); const __FlashStringHelper* getCPluginCFunctionName(CPlugin::Function function); bool mustLogCFunction(CPlugin::Function function); +bool mustLogNWFunction(NWPlugin::Function function); String getMiscStatsName(TimingStatsElements stat); void stopTimerTask(deviceIndex_t T, @@ -173,6 +175,9 @@ void stopTimerTask(deviceIndex_t T, void stopTimerController(protocolIndex_t T, CPlugin::Function F, uint32_t statisticsTimerStart); +void stopTimerNetwork(networkAdapterIndex_t T, + NWPlugin::Function F, + uint32_t statisticsTimerStart); void stopTimer(TimingStatsElements L, uint32_t statisticsTimerStart); void addMiscTimerStat(TimingStatsElements L, @@ -180,12 +185,14 @@ void addMiscTimerStat(TimingStatsElements L, extern std::map pluginStats; extern std::map controllerStats; +extern std::map networkStats; extern std::map miscStats; extern unsigned long timingstats_last_reset; # define START_TIMER const uint32_t statisticsTimerStart(micros()); # define STOP_TIMER_TASK(T, F) stopTimerTask(T, F, statisticsTimerStart); # define STOP_TIMER_CONTROLLER(T, F) stopTimerController(T, F, statisticsTimerStart); +# define STOP_TIMER_NETWORK(T, F) stopTimerNetwork(T, F, statisticsTimerStart); // #define STOP_TIMER_LOADFILE miscStats[LOADFILE_STATS].add(usecPassedSince_fast(statisticsTimerStart)); # define STOP_TIMER(L) stopTimer(TimingStatsElements::L, statisticsTimerStart); @@ -199,6 +206,7 @@ extern unsigned long timingstats_last_reset; # define START_TIMER ; # define STOP_TIMER_TASK(T, F) ; # define STOP_TIMER_CONTROLLER(T, F) ; +# define STOP_TIMER_NETWORK(T, F) ; # define STOP_TIMER(L) ; # define ADD_TIMER_STAT(L, T) ; diff --git a/src/src/DataTypes/ESPEasy_plugin_functions.h b/src/src/DataTypes/ESPEasy_plugin_functions.h index f3e460438..1ad407c7c 100644 --- a/src/src/DataTypes/ESPEasy_plugin_functions.h +++ b/src/src/DataTypes/ESPEasy_plugin_functions.h @@ -118,6 +118,29 @@ public: }; }; +class NWPlugin { +public: + + // As these function values are also used in the timing stats, make sure there is no overlap with the PLUGIN_xxx numbering. + + enum class Function { + NWPLUGIN_ADAPTER_ADD = 192, // Called at boot for letting a network adapter adding itself to list of available controllers + NWPLUGIN_CONNECT_SUCCESS, // Only used for timing stats + NWPLUGIN_CONNECT_FAIL, // Only used for timing stats + NWPLUGIN_ADAPTER_TEMPLATE, + NWPLUGIN_GET_DEVICENAME, + NWPLUGIN_WEBFORM_SAVE, + NWPLUGIN_WEBFORM_LOAD, + NWPLUGIN_GET_ADAPTER_DISPLAY_NAME, + NWPLUGIN_INIT, + NWPLUGIN_TEN_PER_SECOND, // Called 10x per second (typical for checking new data instead of waiting) + NWPLUGIN_FIFTY_PER_SECOND, // Called 50x per second (typical for checking new data instead of waiting) + NWPLUGIN_INIT_ALL, + NWPLUGIN_EXIT, + NWPLUGIN_WRITE, // Send commands to a network adapter. + }; +}; + // ******************************************************************************** // NPlugin (Notification) function calls // ******************************************************************************** diff --git a/src/src/DataTypes/NWPluginID.cpp b/src/src/DataTypes/NWPluginID.cpp new file mode 100644 index 000000000..be48ec49b --- /dev/null +++ b/src/src/DataTypes/NWPluginID.cpp @@ -0,0 +1,3 @@ +#include "../DataTypes/NWPluginID.h" + +const nwpluginID_t INVALID_NW_PLUGIN_ID = 0; diff --git a/src/src/DataTypes/NWPluginID.h b/src/src/DataTypes/NWPluginID.h new file mode 100644 index 000000000..cffec9e3c --- /dev/null +++ b/src/src/DataTypes/NWPluginID.h @@ -0,0 +1,11 @@ +#ifndef DATATYPES_NWPLUGINID_H +#define DATATYPES_NWPLUGINID_H + +#include "../../ESPEasy_common.h" + +typedef uint8_t nwpluginID_t; + +extern const nwpluginID_t INVALID_NW_PLUGIN_ID; + + +#endif // ifndef DATATYPES_NWPLUGINID_H diff --git a/src/src/DataTypes/NetworkAdapterIndex.cpp b/src/src/DataTypes/NetworkAdapterIndex.cpp new file mode 100644 index 000000000..b0de15048 --- /dev/null +++ b/src/src/DataTypes/NetworkAdapterIndex.cpp @@ -0,0 +1,5 @@ +#include "../DataTypes/NetworkAdapterIndex.h" + +#include "../CustomBuild/ESPEasyLimits.h" + +networkAdapterIndex_t INVALID_NETWORKADAPTER_INDEX = NWPLUGIN_MAX; \ No newline at end of file diff --git a/src/src/DataTypes/NetworkAdapterIndex.h b/src/src/DataTypes/NetworkAdapterIndex.h new file mode 100644 index 000000000..daee21217 --- /dev/null +++ b/src/src/DataTypes/NetworkAdapterIndex.h @@ -0,0 +1,11 @@ +#ifndef DATATYPES_NETWORKADAPTERINDEX_H +#define DATATYPES_NETWORKADAPTERINDEX_H + +#include "../../ESPEasy_common.h" + +typedef uint8_t networkAdapterIndex_t; + +extern networkAdapterIndex_t INVALID_NETWORKADAPTER_INDEX; + + +#endif \ No newline at end of file diff --git a/src/src/DataTypes/NetworkIndex.cpp b/src/src/DataTypes/NetworkIndex.cpp new file mode 100644 index 000000000..92daa31f5 --- /dev/null +++ b/src/src/DataTypes/NetworkIndex.cpp @@ -0,0 +1,5 @@ +#include "../DataTypes/NetworkIndex.h" + +#include "../CustomBuild/ESPEasyLimits.h" + +networkIndex_t INVALID_NETWORK_INDEX = NETWORK_MAX; \ No newline at end of file diff --git a/src/src/DataTypes/NetworkIndex.h b/src/src/DataTypes/NetworkIndex.h new file mode 100644 index 000000000..c196de707 --- /dev/null +++ b/src/src/DataTypes/NetworkIndex.h @@ -0,0 +1,10 @@ +#ifndef DATATYPES_NETWORKINDEX_H +#define DATATYPES_NETWORKINDEX_H + +#include "../../ESPEasy_common.h" + +typedef uint8_t networkIndex_t; + +extern networkIndex_t INVALID_NETWORK_INDEX; + +#endif \ No newline at end of file diff --git a/src/src/Globals/NWPlugins.cpp b/src/src/Globals/NWPlugins.cpp new file mode 100644 index 000000000..682e61a41 --- /dev/null +++ b/src/src/Globals/NWPlugins.cpp @@ -0,0 +1,61 @@ +#include "../Globals/NWPlugins.h" + +#include "../../_Plugin_Helper.h" +#include "../DataStructs/ESPEasy_EventStruct.h" +#include "../DataStructs/TimingStats.h" +#include "../DataTypes/ESPEasy_plugin_functions.h" +#include "../ESPEasyCore/ESPEasy_Log.h" + +#include "../Globals/Settings.h" +#include "../Helpers/_NWPlugin_init.h" + + + +bool NWPluginCall(NWPlugin::Function Function, struct EventStruct *event) { + #ifdef USE_SECOND_HEAP + HeapSelectDram ephemeral; + #endif // ifdef USE_SECOND_HEAP + + String dummy; + + return NWPluginCall(Function, event, dummy); +} + +bool NWPluginCall(NWPlugin::Function Function, struct EventStruct *event, String& str) +{ + #ifdef USE_SECOND_HEAP + HeapSelectDram ephemeral; + #endif // ifdef USE_SECOND_HEAP + + struct EventStruct TempEvent; + + if (event == 0) { + event = &TempEvent; + } + + switch (Function) + { + case NWPlugin::Function::NWPLUGIN_ADAPTER_ADD: + // only called from NWPluginSetup() directly using protocolIndex + break; + + // calls to all active controllers + case NWPlugin::Function::NWPLUGIN_INIT_ALL: + case NWPlugin::Function::NWPLUGIN_TEN_PER_SECOND: + case NWPlugin::Function::NWPLUGIN_FIFTY_PER_SECOND: + case NWPlugin::Function::NWPLUGIN_WRITE: +{ + const bool success = Function != NWPlugin::Function::NWPLUGIN_WRITE; + + if (Function == NWPlugin::Function::NWPLUGIN_INIT_ALL) { + Function = NWPlugin::Function::NWPLUGIN_INIT; + } + + // TODO TD-er: Implement + + return success; +} + + } + return false; +} \ No newline at end of file diff --git a/src/src/Globals/NWPlugins.h b/src/src/Globals/NWPlugins.h new file mode 100644 index 000000000..fc6eab895 --- /dev/null +++ b/src/src/Globals/NWPlugins.h @@ -0,0 +1,33 @@ +#ifndef GLOBALS_NWPLUGIN_H +#define GLOBALS_NWPLUGIN_H + +#include "../../ESPEasy_common.h" + +#include "../CustomBuild/ESPEasyLimits.h" +#include "../DataTypes/ESPEasy_plugin_functions.h" +#include "../DataTypes/NWPluginID.h" +#include "../DataTypes/NetworkIndex.h" +#include "../DataTypes/NetworkAdapterIndex.h" + + + + + +bool NWPluginCall(NWPlugin::Function Function, + struct EventStruct *event); +bool NWPluginCall(NWPlugin::Function Function, + struct EventStruct *event, + String & str); +bool NWPluginCall(networkAdapterIndex_t networkAdapterIndex, + NWPlugin::Function Function, + struct EventStruct *event, + String & str); + + + + +#endif + + + + diff --git a/src/src/Helpers/_NWPlugin_init.cpp b/src/src/Helpers/_NWPlugin_init.cpp new file mode 100644 index 000000000..9df9dbc05 --- /dev/null +++ b/src/src/Helpers/_NWPlugin_init.cpp @@ -0,0 +1,2195 @@ +#include "../Helpers/_NWPlugin_init.h" + +#include "../DataStructs/ESPEasy_EventStruct.h" +#include "../DataStructs/TimingStats.h" + +#include "../DataTypes/ESPEasy_plugin_functions.h" + +#include "../Globals/NWPlugins.h" +#include "../Globals/Settings.h" + +#include "../Helpers/Misc.h" + +// ******************************************************************************** +// Initialize all Controller NWPlugins that where defined earlier +// and initialize the function call pointer into the CNWPlugin array +// ******************************************************************************** + +constexpr nwpluginID_t NetworkAdapterIndex_to_NWPlugin_id[] PROGMEM = +{ +#ifdef USES_NW001 + 1, +#endif // ifdef USES_NW001 + +#ifdef USES_NW002 + 2, +#endif // ifdef USES_NW002 + +#ifdef USES_NW003 + 3, +#endif // ifdef USES_NW003 + +#ifdef USES_NW004 + 4, +#endif // ifdef USES_NW004 + +#ifdef USES_NW005 + 5, +#endif // ifdef USES_NW005 + +#ifdef USES_NW006 + 6, +#endif // ifdef USES_NW006 + +#ifdef USES_NW007 + 7, +#endif // ifdef USES_NW007 + +#ifdef USES_NW008 + 8, +#endif // ifdef USES_NW008 + +#ifdef USES_NW009 + 9, +#endif // ifdef USES_NW009 + +#ifdef USES_NW010 + 10, +#endif // ifdef USES_NW010 + +#ifdef USES_NW011 + 11, +#endif // ifdef USES_NW011 + +#ifdef USES_NW012 + 12, +#endif // ifdef USES_NW012 + +#ifdef USES_NW013 + 13, +#endif // ifdef USES_NW013 + +#ifdef USES_NW014 + 14, +#endif // ifdef USES_NW014 + +#ifdef USES_NW015 + 15, +#endif // ifdef USES_NW015 + +#ifdef USES_NW016 + 16, +#endif // ifdef USES_NW016 + +#ifdef USES_NW017 + 17, +#endif // ifdef USES_NW017 + +#ifdef USES_NW018 + 18, +#endif // ifdef USES_NW018 + +#ifdef USES_NW019 + 19, +#endif // ifdef USES_NW019 + +#ifdef USES_NW020 + 20, +#endif // ifdef USES_NW020 + +#ifdef USES_NW021 + 21, +#endif // ifdef USES_NW021 + +#ifdef USES_NW022 + 22, +#endif // ifdef USES_NW022 + +#ifdef USES_NW023 + 23, +#endif // ifdef USES_NW023 + +#ifdef USES_NW024 + 24, +#endif // ifdef USES_NW024 + +#ifdef USES_NW025 + 25, +#endif // ifdef USES_NW025 + +#ifdef USES_NW026 + 26, +#endif // ifdef USES_NW026 + +#ifdef USES_NW027 + 27, +#endif // ifdef USES_NW027 + +#ifdef USES_NW028 + 28, +#endif // ifdef USES_NW028 + +#ifdef USES_NW029 + 29, +#endif // ifdef USES_NW029 + +#ifdef USES_NW030 + 30, +#endif // ifdef USES_NW030 + +#ifdef USES_NW031 + 31, +#endif // ifdef USES_NW031 + +#ifdef USES_NW032 + 32, +#endif // ifdef USES_NW032 + +#ifdef USES_NW033 + 33, +#endif // ifdef USES_NW033 + +#ifdef USES_NW034 + 34, +#endif // ifdef USES_NW034 + +#ifdef USES_NW035 + 35, +#endif // ifdef USES_NW035 + +#ifdef USES_NW036 + 36, +#endif // ifdef USES_NW036 + +#ifdef USES_NW037 + 37, +#endif // ifdef USES_NW037 + +#ifdef USES_NW038 + 38, +#endif // ifdef USES_NW038 + +#ifdef USES_NW039 + 39, +#endif // ifdef USES_NW039 + +#ifdef USES_NW040 + 40, +#endif // ifdef USES_NW040 + +#ifdef USES_NW041 + 41, +#endif // ifdef USES_NW041 + +#ifdef USES_NW042 + 42, +#endif // ifdef USES_NW042 + +#ifdef USES_NW043 + 43, +#endif // ifdef USES_NW043 + +#ifdef USES_NW044 + 44, +#endif // ifdef USES_NW044 + +#ifdef USES_NW045 + 45, +#endif // ifdef USES_NW045 + +#ifdef USES_NW046 + 46, +#endif // ifdef USES_NW046 + +#ifdef USES_NW047 + 47, +#endif // ifdef USES_NW047 + +#ifdef USES_NW048 + 48, +#endif // ifdef USES_NW048 + +#ifdef USES_NW049 + 49, +#endif // ifdef USES_NW049 + +#ifdef USES_NW050 + 50, +#endif // ifdef USES_NW050 + +#ifdef USES_NW051 + 51, +#endif // ifdef USES_NW051 + +#ifdef USES_NW052 + 52, +#endif // ifdef USES_NW052 + +#ifdef USES_NW053 + 53, +#endif // ifdef USES_NW053 + +#ifdef USES_NW054 + 54, +#endif // ifdef USES_NW054 + +#ifdef USES_NW055 + 55, +#endif // ifdef USES_NW055 + +#ifdef USES_NW056 + 56, +#endif // ifdef USES_NW056 + +#ifdef USES_NW057 + 57, +#endif // ifdef USES_NW057 + +#ifdef USES_NW058 + 58, +#endif // ifdef USES_NW058 + +#ifdef USES_NW059 + 59, +#endif // ifdef USES_NW059 + +#ifdef USES_NW060 + 60, +#endif // ifdef USES_NW060 + +#ifdef USES_NW061 + 61, +#endif // ifdef USES_NW061 + +#ifdef USES_NW062 + 62, +#endif // ifdef USES_NW062 + +#ifdef USES_NW063 + 63, +#endif // ifdef USES_NW063 + +#ifdef USES_NW064 + 64, +#endif // ifdef USES_NW064 + +#ifdef USES_NW065 + 65, +#endif // ifdef USES_NW065 + +#ifdef USES_NW066 + 66, +#endif // ifdef USES_NW066 + +#ifdef USES_NW067 + 67, +#endif // ifdef USES_NW067 + +#ifdef USES_NW068 + 68, +#endif // ifdef USES_NW068 + +#ifdef USES_NW069 + 69, +#endif // ifdef USES_NW069 + +#ifdef USES_NW070 + 70, +#endif // ifdef USES_NW070 + +#ifdef USES_NW071 + 71, +#endif // ifdef USES_NW071 + +#ifdef USES_NW072 + 72, +#endif // ifdef USES_NW072 + +#ifdef USES_NW073 + 73, +#endif // ifdef USES_NW073 + +#ifdef USES_NW074 + 74, +#endif // ifdef USES_NW074 + +#ifdef USES_NW075 + 75, +#endif // ifdef USES_NW075 + +#ifdef USES_NW076 + 76, +#endif // ifdef USES_NW076 + +#ifdef USES_NW077 + 77, +#endif // ifdef USES_NW077 + +#ifdef USES_NW078 + 78, +#endif // ifdef USES_NW078 + +#ifdef USES_NW079 + 79, +#endif // ifdef USES_NW079 + +#ifdef USES_NW080 + 80, +#endif // ifdef USES_NW080 + +#ifdef USES_NW081 + 81, +#endif // ifdef USES_NW081 + +#ifdef USES_NW082 + 82, +#endif // ifdef USES_NW082 + +#ifdef USES_NW083 + 83, +#endif // ifdef USES_NW083 + +#ifdef USES_NW084 + 84, +#endif // ifdef USES_NW084 + +#ifdef USES_NW085 + 85, +#endif // ifdef USES_NW085 + +#ifdef USES_NW086 + 86, +#endif // ifdef USES_NW086 + +#ifdef USES_NW087 + 87, +#endif // ifdef USES_NW087 + +#ifdef USES_NW088 + 88, +#endif // ifdef USES_NW088 + +#ifdef USES_NW089 + 89, +#endif // ifdef USES_NW089 + +#ifdef USES_NW090 + 90, +#endif // ifdef USES_NW090 + +#ifdef USES_NW091 + 91, +#endif // ifdef USES_NW091 + +#ifdef USES_NW092 + 92, +#endif // ifdef USES_NW092 + +#ifdef USES_NW093 + 93, +#endif // ifdef USES_NW093 + +#ifdef USES_NW094 + 94, +#endif // ifdef USES_NW094 + +#ifdef USES_NW095 + 95, +#endif // ifdef USES_NW095 + +#ifdef USES_NW096 + 96, +#endif // ifdef USES_NW096 + +#ifdef USES_NW097 + 97, +#endif // ifdef USES_NW097 + +#ifdef USES_NW098 + 98, +#endif // ifdef USES_NW098 + +#ifdef USES_NW099 + 99, +#endif // ifdef USES_NW099 + +#ifdef USES_NW100 + 100, +#endif // ifdef USES_NW100 + +#ifdef USES_NW101 + 101, +#endif // ifdef USES_NW101 + +#ifdef USES_NW102 + 102, +#endif // ifdef USES_NW102 + +#ifdef USES_NW103 + 103, +#endif // ifdef USES_NW103 + +#ifdef USES_NW104 + 104, +#endif // ifdef USES_NW104 + +#ifdef USES_NW105 + 105, +#endif // ifdef USES_NW105 + +#ifdef USES_NW106 + 106, +#endif // ifdef USES_NW106 + +#ifdef USES_NW107 + 107, +#endif // ifdef USES_NW107 + +#ifdef USES_NW108 + 108, +#endif // ifdef USES_NW108 + +#ifdef USES_NW109 + 109, +#endif // ifdef USES_NW109 + +#ifdef USES_NW110 + 110, +#endif // ifdef USES_NW110 + +#ifdef USES_NW111 + 111, +#endif // ifdef USES_NW111 + +#ifdef USES_NW112 + 112, +#endif // ifdef USES_NW112 + +#ifdef USES_NW113 + 113, +#endif // ifdef USES_NW113 + +#ifdef USES_NW114 + 114, +#endif // ifdef USES_NW114 + +#ifdef USES_NW115 + 115, +#endif // ifdef USES_NW115 + +#ifdef USES_NW116 + 116, +#endif // ifdef USES_NW116 + +#ifdef USES_NW117 + 117, +#endif // ifdef USES_NW117 + +#ifdef USES_NW118 + 118, +#endif // ifdef USES_NW118 + +#ifdef USES_NW119 + 119, +#endif // ifdef USES_NW119 + +#ifdef USES_NW120 + 120, +#endif // ifdef USES_NW120 + +#ifdef USES_NW121 + 121, +#endif // ifdef USES_NW121 + +#ifdef USES_NW122 + 122, +#endif // ifdef USES_NW122 + +#ifdef USES_NW123 + 123, +#endif // ifdef USES_NW123 + +#ifdef USES_NW124 + 124, +#endif // ifdef USES_NW124 + +#ifdef USES_NW125 + 125, +#endif // ifdef USES_NW125 + +#ifdef USES_NW126 + 126, +#endif // ifdef USES_NW126 + +#ifdef USES_NW127 + 127, +#endif // ifdef USES_NW127 + +#ifdef USES_NW128 + 128, +#endif // ifdef USES_NW128 + +#ifdef USES_NW129 + 129, +#endif // ifdef USES_NW129 + +#ifdef USES_NW130 + 130, +#endif // ifdef USES_NW130 + +#ifdef USES_NW131 + 131, +#endif // ifdef USES_NW131 + +#ifdef USES_NW132 + 132, +#endif // ifdef USES_NW132 + +#ifdef USES_NW133 + 133, +#endif // ifdef USES_NW133 + +#ifdef USES_NW134 + 134, +#endif // ifdef USES_NW134 + +#ifdef USES_NW135 + 135, +#endif // ifdef USES_NW135 + +#ifdef USES_NW136 + 136, +#endif // ifdef USES_NW136 + +#ifdef USES_NW137 + 137, +#endif // ifdef USES_NW137 + +#ifdef USES_NW138 + 138, +#endif // ifdef USES_NW138 + +#ifdef USES_NW139 + 139, +#endif // ifdef USES_NW139 + +#ifdef USES_NW140 + 140, +#endif // ifdef USES_NW140 + +#ifdef USES_NW141 + 141, +#endif // ifdef USES_NW141 + +#ifdef USES_NW142 + 142, +#endif // ifdef USES_NW142 + +#ifdef USES_NW143 + 143, +#endif // ifdef USES_NW143 + +#ifdef USES_NW144 + 144, +#endif // ifdef USES_NW144 + +#ifdef USES_NW145 + 145, +#endif // ifdef USES_NW145 + +#ifdef USES_NW146 + 146, +#endif // ifdef USES_NW146 + +#ifdef USES_NW147 + 147, +#endif // ifdef USES_NW147 + +#ifdef USES_NW148 + 148, +#endif // ifdef USES_NW148 + +#ifdef USES_NW149 + 149, +#endif // ifdef USES_NW149 + +#ifdef USES_NW150 + 150, +#endif // ifdef USES_NW150 + +#ifdef USES_NW151 + 151, +#endif // ifdef USES_NW151 + +#ifdef USES_NW152 + 152, +#endif // ifdef USES_NW152 + +#ifdef USES_NW153 + 153, +#endif // ifdef USES_NW153 + +#ifdef USES_NW154 + 154, +#endif // ifdef USES_NW154 + +#ifdef USES_NW155 + 155, +#endif // ifdef USES_NW155 + +#ifdef USES_NW156 + 156, +#endif // ifdef USES_NW156 + +#ifdef USES_NW157 + 157, +#endif // ifdef USES_NW157 + +#ifdef USES_NW158 + 158, +#endif // ifdef USES_NW158 + +#ifdef USES_NW159 + 159, +#endif // ifdef USES_NW159 + +#ifdef USES_NW160 + 160, +#endif // ifdef USES_NW160 + +#ifdef USES_NW161 + 161, +#endif // ifdef USES_NW161 + +#ifdef USES_NW162 + 162, +#endif // ifdef USES_NW162 + +#ifdef USES_NW163 + 163, +#endif // ifdef USES_NW163 + +#ifdef USES_NW164 + 164, +#endif // ifdef USES_NW164 + +#ifdef USES_NW165 + 165, +#endif // ifdef USES_NW165 + +#ifdef USES_NW166 + 166, +#endif // ifdef USES_NW166 + +#ifdef USES_NW167 + 167, +#endif // ifdef USES_NW167 + +#ifdef USES_NW168 + 168, +#endif // ifdef USES_NW168 + +#ifdef USES_NW169 + 169, +#endif // ifdef USES_NW169 + +#ifdef USES_NW170 + 170, +#endif // ifdef USES_NW170 + +#ifdef USES_NW171 + 171, +#endif // ifdef USES_NW171 + +#ifdef USES_NW172 + 172, +#endif // ifdef USES_NW172 + +#ifdef USES_NW173 + 173, +#endif // ifdef USES_NW173 + +#ifdef USES_NW174 + 174, +#endif // ifdef USES_NW174 + +#ifdef USES_NW175 + 175, +#endif // ifdef USES_NW175 + +#ifdef USES_NW176 + 176, +#endif // ifdef USES_NW176 + +#ifdef USES_NW177 + 177, +#endif // ifdef USES_NW177 + +#ifdef USES_NW178 + 178, +#endif // ifdef USES_NW178 + +#ifdef USES_NW179 + 179, +#endif // ifdef USES_NW179 + +#ifdef USES_NW180 + 180, +#endif // ifdef USES_NW180 + +#ifdef USES_NW181 + 181, +#endif // ifdef USES_NW181 + +#ifdef USES_NW182 + 182, +#endif // ifdef USES_NW182 + +#ifdef USES_NW183 + 183, +#endif // ifdef USES_NW183 + +#ifdef USES_NW184 + 184, +#endif // ifdef USES_NW184 + +#ifdef USES_NW185 + 185, +#endif // ifdef USES_NW185 + +#ifdef USES_NW186 + 186, +#endif // ifdef USES_NW186 + +#ifdef USES_NW187 + 187, +#endif // ifdef USES_NW187 + +#ifdef USES_NW188 + 188, +#endif // ifdef USES_NW188 + +#ifdef USES_NW189 + 189, +#endif // ifdef USES_NW189 + +#ifdef USES_NW190 + 190, +#endif // ifdef USES_NW190 + +#ifdef USES_NW191 + 191, +#endif // ifdef USES_NW191 + +#ifdef USES_NW192 + 192, +#endif // ifdef USES_NW192 + +#ifdef USES_NW193 + 193, +#endif // ifdef USES_NW193 + +#ifdef USES_NW194 + 194, +#endif // ifdef USES_NW194 + +#ifdef USES_NW195 + 195, +#endif // ifdef USES_NW195 + +#ifdef USES_NW196 + 196, +#endif // ifdef USES_NW196 + +#ifdef USES_NW197 + 197, +#endif // ifdef USES_NW197 + +#ifdef USES_NW198 + 198, +#endif // ifdef USES_NW198 + +#ifdef USES_NW199 + 199, +#endif // ifdef USES_NW199 + +#ifdef USES_NW200 + 200, +#endif // ifdef USES_NW200 + +#ifdef USES_NW201 + 201, +#endif // ifdef USES_NW201 + +#ifdef USES_NW202 + 202, +#endif // ifdef USES_NW202 + +#ifdef USES_NW203 + 203, +#endif // ifdef USES_NW203 + +#ifdef USES_NW204 + 204, +#endif // ifdef USES_NW204 + +#ifdef USES_NW205 + 205, +#endif // ifdef USES_NW205 + +#ifdef USES_NW206 + 206, +#endif // ifdef USES_NW206 + +#ifdef USES_NW207 + 207, +#endif // ifdef USES_NW207 + +#ifdef USES_NW208 + 208, +#endif // ifdef USES_NW208 + +#ifdef USES_NW209 + 209, +#endif // ifdef USES_NW209 + +#ifdef USES_NW210 + 210, +#endif // ifdef USES_NW210 + +#ifdef USES_NW211 + 211, +#endif // ifdef USES_NW211 + +#ifdef USES_NW212 + 212, +#endif // ifdef USES_NW212 + +#ifdef USES_NW213 + 213, +#endif // ifdef USES_NW213 + +#ifdef USES_NW214 + 214, +#endif // ifdef USES_NW214 + +#ifdef USES_NW215 + 215, +#endif // ifdef USES_NW215 + +#ifdef USES_NW216 + 216, +#endif // ifdef USES_NW216 + +#ifdef USES_NW217 + 217, +#endif // ifdef USES_NW217 + +#ifdef USES_NW218 + 218, +#endif // ifdef USES_NW218 + +#ifdef USES_NW219 + 219, +#endif // ifdef USES_NW219 + +#ifdef USES_NW220 + 220, +#endif // ifdef USES_NW220 + +#ifdef USES_NW221 + 221, +#endif // ifdef USES_NW221 + +#ifdef USES_NW222 + 222, +#endif // ifdef USES_NW222 + +#ifdef USES_NW223 + 223, +#endif // ifdef USES_NW223 + +#ifdef USES_NW224 + 224, +#endif // ifdef USES_NW224 + +#ifdef USES_NW225 + 225, +#endif // ifdef USES_NW225 + +#ifdef USES_NW226 + 226, +#endif // ifdef USES_NW226 + +#ifdef USES_NW227 + 227, +#endif // ifdef USES_NW227 + +#ifdef USES_NW228 + 228, +#endif // ifdef USES_NW228 + +#ifdef USES_NW229 + 229, +#endif // ifdef USES_NW229 + +#ifdef USES_NW230 + 230, +#endif // ifdef USES_NW230 + +#ifdef USES_NW231 + 231, +#endif // ifdef USES_NW231 + +#ifdef USES_NW232 + 232, +#endif // ifdef USES_NW232 + +#ifdef USES_NW233 + 233, +#endif // ifdef USES_NW233 + +#ifdef USES_NW234 + 234, +#endif // ifdef USES_NW234 + +#ifdef USES_NW235 + 235, +#endif // ifdef USES_NW235 + +#ifdef USES_NW236 + 236, +#endif // ifdef USES_NW236 + +#ifdef USES_NW237 + 237, +#endif // ifdef USES_NW237 + +#ifdef USES_NW238 + 238, +#endif // ifdef USES_NW238 + +#ifdef USES_NW239 + 239, +#endif // ifdef USES_NW239 + +#ifdef USES_NW240 + 240, +#endif // ifdef USES_NW240 + +#ifdef USES_NW241 + 241, +#endif // ifdef USES_NW241 + +#ifdef USES_NW242 + 242, +#endif // ifdef USES_NW242 + +#ifdef USES_NW243 + 243, +#endif // ifdef USES_NW243 + +#ifdef USES_NW244 + 244, +#endif // ifdef USES_NW244 + +#ifdef USES_NW245 + 245, +#endif // ifdef USES_NW245 + +#ifdef USES_NW246 + 246, +#endif // ifdef USES_NW246 + +#ifdef USES_NW247 + 247, +#endif // ifdef USES_NW247 + +#ifdef USES_NW248 + 248, +#endif // ifdef USES_NW248 + +#ifdef USES_NW249 + 249, +#endif // ifdef USES_NW249 + +#ifdef USES_NW250 + 250, +#endif // ifdef USES_NW250 + +#ifdef USES_NW251 + 251, +#endif // ifdef USES_NW251 + +#ifdef USES_NW252 + 252, +#endif // ifdef USES_NW252 + +#ifdef USES_NW253 + 253, +#endif // ifdef USES_NW253 + +#ifdef USES_NW254 + 254, +#endif // ifdef USES_NW254 + +#ifdef USES_NW255 + 255, +#endif // ifdef USES_NW255 +}; + + +typedef bool (*NWPlugin_ptr_t)(NWPlugin::Function, + struct EventStruct *, + String&); + +const NWPlugin_ptr_t PROGMEM NWPlugin_ptr[] = +{ +#ifdef USES_NW001 + &NWPlugin_001, +#endif // ifdef USES_NW001 + +#ifdef USES_NW002 + &NWPlugin_002, +#endif // ifdef USES_NW002 + +#ifdef USES_NW003 + &NWPlugin_003, +#endif // ifdef USES_NW003 + +#ifdef USES_NW004 + &NWPlugin_004, +#endif // ifdef USES_NW004 + +#ifdef USES_NW005 + &NWPlugin_005, +#endif // ifdef USES_NW005 + +#ifdef USES_NW006 + &NWPlugin_006, +#endif // ifdef USES_NW006 + +#ifdef USES_NW007 + &NWPlugin_007, +#endif // ifdef USES_NW007 + +#ifdef USES_NW008 + &NWPlugin_008, +#endif // ifdef USES_NW008 + +#ifdef USES_NW009 + &NWPlugin_009, +#endif // ifdef USES_NW009 + +#ifdef USES_NW010 + &NWPlugin_010, +#endif // ifdef USES_NW010 + +#ifdef USES_NW011 + &NWPlugin_011, +#endif // ifdef USES_NW011 + +#ifdef USES_NW012 + &NWPlugin_012, +#endif // ifdef USES_NW012 + +#ifdef USES_NW013 + &NWPlugin_013, +#endif // ifdef USES_NW013 + +#ifdef USES_NW014 + &NWPlugin_014, +#endif // ifdef USES_NW014 + +#ifdef USES_NW015 + &NWPlugin_015, +#endif // ifdef USES_NW015 + +#ifdef USES_NW016 + &NWPlugin_016, +#endif // ifdef USES_NW016 + +#ifdef USES_NW017 + &NWPlugin_017, +#endif // ifdef USES_NW017 + +#ifdef USES_NW018 + &NWPlugin_018, +#endif // ifdef USES_NW018 + +#ifdef USES_NW019 + &NWPlugin_019, +#endif // ifdef USES_NW019 + +#ifdef USES_NW020 + &NWPlugin_020, +#endif // ifdef USES_NW020 + +#ifdef USES_NW021 + &NWPlugin_021, +#endif // ifdef USES_NW021 + +#ifdef USES_NW022 + &NWPlugin_022, +#endif // ifdef USES_NW022 + +#ifdef USES_NW023 + &NWPlugin_023, +#endif // ifdef USES_NW023 + +#ifdef USES_NW024 + &NWPlugin_024, +#endif // ifdef USES_NW024 + +#ifdef USES_NW025 + &NWPlugin_025, +#endif // ifdef USES_NW025 + +#ifdef USES_NW026 + &NWPlugin_026, +#endif // ifdef USES_NW026 + +#ifdef USES_NW027 + &NWPlugin_027, +#endif // ifdef USES_NW027 + +#ifdef USES_NW028 + &NWPlugin_028, +#endif // ifdef USES_NW028 + +#ifdef USES_NW029 + &NWPlugin_029, +#endif // ifdef USES_NW029 + +#ifdef USES_NW030 + &NWPlugin_030, +#endif // ifdef USES_NW030 + +#ifdef USES_NW031 + &NWPlugin_031, +#endif // ifdef USES_NW031 + +#ifdef USES_NW032 + &NWPlugin_032, +#endif // ifdef USES_NW032 + +#ifdef USES_NW033 + &NWPlugin_033, +#endif // ifdef USES_NW033 + +#ifdef USES_NW034 + &NWPlugin_034, +#endif // ifdef USES_NW034 + +#ifdef USES_NW035 + &NWPlugin_035, +#endif // ifdef USES_NW035 + +#ifdef USES_NW036 + &NWPlugin_036, +#endif // ifdef USES_NW036 + +#ifdef USES_NW037 + &NWPlugin_037, +#endif // ifdef USES_NW037 + +#ifdef USES_NW038 + &NWPlugin_038, +#endif // ifdef USES_NW038 + +#ifdef USES_NW039 + &NWPlugin_039, +#endif // ifdef USES_NW039 + +#ifdef USES_NW040 + &NWPlugin_040, +#endif // ifdef USES_NW040 + +#ifdef USES_NW041 + &NWPlugin_041, +#endif // ifdef USES_NW041 + +#ifdef USES_NW042 + &NWPlugin_042, +#endif // ifdef USES_NW042 + +#ifdef USES_NW043 + &NWPlugin_043, +#endif // ifdef USES_NW043 + +#ifdef USES_NW044 + &NWPlugin_044, +#endif // ifdef USES_NW044 + +#ifdef USES_NW045 + &NWPlugin_045, +#endif // ifdef USES_NW045 + +#ifdef USES_NW046 + &NWPlugin_046, +#endif // ifdef USES_NW046 + +#ifdef USES_NW047 + &NWPlugin_047, +#endif // ifdef USES_NW047 + +#ifdef USES_NW048 + &NWPlugin_048, +#endif // ifdef USES_NW048 + +#ifdef USES_NW049 + &NWPlugin_049, +#endif // ifdef USES_NW049 + +#ifdef USES_NW050 + &NWPlugin_050, +#endif // ifdef USES_NW050 + +#ifdef USES_NW051 + &NWPlugin_051, +#endif // ifdef USES_NW051 + +#ifdef USES_NW052 + &NWPlugin_052, +#endif // ifdef USES_NW052 + +#ifdef USES_NW053 + &NWPlugin_053, +#endif // ifdef USES_NW053 + +#ifdef USES_NW054 + &NWPlugin_054, +#endif // ifdef USES_NW054 + +#ifdef USES_NW055 + &NWPlugin_055, +#endif // ifdef USES_NW055 + +#ifdef USES_NW056 + &NWPlugin_056, +#endif // ifdef USES_NW056 + +#ifdef USES_NW057 + &NWPlugin_057, +#endif // ifdef USES_NW057 + +#ifdef USES_NW058 + &NWPlugin_058, +#endif // ifdef USES_NW058 + +#ifdef USES_NW059 + &NWPlugin_059, +#endif // ifdef USES_NW059 + +#ifdef USES_NW060 + &NWPlugin_060, +#endif // ifdef USES_NW060 + +#ifdef USES_NW061 + &NWPlugin_061, +#endif // ifdef USES_NW061 + +#ifdef USES_NW062 + &NWPlugin_062, +#endif // ifdef USES_NW062 + +#ifdef USES_NW063 + &NWPlugin_063, +#endif // ifdef USES_NW063 + +#ifdef USES_NW064 + &NWPlugin_064, +#endif // ifdef USES_NW064 + +#ifdef USES_NW065 + &NWPlugin_065, +#endif // ifdef USES_NW065 + +#ifdef USES_NW066 + &NWPlugin_066, +#endif // ifdef USES_NW066 + +#ifdef USES_NW067 + &NWPlugin_067, +#endif // ifdef USES_NW067 + +#ifdef USES_NW068 + &NWPlugin_068, +#endif // ifdef USES_NW068 + +#ifdef USES_NW069 + &NWPlugin_069, +#endif // ifdef USES_NW069 + +#ifdef USES_NW070 + &NWPlugin_070, +#endif // ifdef USES_NW070 + +#ifdef USES_NW071 + &NWPlugin_071, +#endif // ifdef USES_NW071 + +#ifdef USES_NW072 + &NWPlugin_072, +#endif // ifdef USES_NW072 + +#ifdef USES_NW073 + &NWPlugin_073, +#endif // ifdef USES_NW073 + +#ifdef USES_NW074 + &NWPlugin_074, +#endif // ifdef USES_NW074 + +#ifdef USES_NW075 + &NWPlugin_075, +#endif // ifdef USES_NW075 + +#ifdef USES_NW076 + &NWPlugin_076, +#endif // ifdef USES_NW076 + +#ifdef USES_NW077 + &NWPlugin_077, +#endif // ifdef USES_NW077 + +#ifdef USES_NW078 + &NWPlugin_078, +#endif // ifdef USES_NW078 + +#ifdef USES_NW079 + &NWPlugin_079, +#endif // ifdef USES_NW079 + +#ifdef USES_NW080 + &NWPlugin_080, +#endif // ifdef USES_NW080 + +#ifdef USES_NW081 + &NWPlugin_081, +#endif // ifdef USES_NW081 + +#ifdef USES_NW082 + &NWPlugin_082, +#endif // ifdef USES_NW082 + +#ifdef USES_NW083 + &NWPlugin_083, +#endif // ifdef USES_NW083 + +#ifdef USES_NW084 + &NWPlugin_084, +#endif // ifdef USES_NW084 + +#ifdef USES_NW085 + &NWPlugin_085, +#endif // ifdef USES_NW085 + +#ifdef USES_NW086 + &NWPlugin_086, +#endif // ifdef USES_NW086 + +#ifdef USES_NW087 + &NWPlugin_087, +#endif // ifdef USES_NW087 + +#ifdef USES_NW088 + &NWPlugin_088, +#endif // ifdef USES_NW088 + +#ifdef USES_NW089 + &NWPlugin_089, +#endif // ifdef USES_NW089 + +#ifdef USES_NW090 + &NWPlugin_090, +#endif // ifdef USES_NW090 + +#ifdef USES_NW091 + &NWPlugin_091, +#endif // ifdef USES_NW091 + +#ifdef USES_NW092 + &NWPlugin_092, +#endif // ifdef USES_NW092 + +#ifdef USES_NW093 + &NWPlugin_093, +#endif // ifdef USES_NW093 + +#ifdef USES_NW094 + &NWPlugin_094, +#endif // ifdef USES_NW094 + +#ifdef USES_NW095 + &NWPlugin_095, +#endif // ifdef USES_NW095 + +#ifdef USES_NW096 + &NWPlugin_096, +#endif // ifdef USES_NW096 + +#ifdef USES_NW097 + &NWPlugin_097, +#endif // ifdef USES_NW097 + +#ifdef USES_NW098 + &NWPlugin_098, +#endif // ifdef USES_NW098 + +#ifdef USES_NW099 + &NWPlugin_099, +#endif // ifdef USES_NW099 + +#ifdef USES_NW100 + &NWPlugin_100, +#endif // ifdef USES_NW100 + +#ifdef USES_NW101 + &NWPlugin_101, +#endif // ifdef USES_NW101 + +#ifdef USES_NW102 + &NWPlugin_102, +#endif // ifdef USES_NW102 + +#ifdef USES_NW103 + &NWPlugin_103, +#endif // ifdef USES_NW103 + +#ifdef USES_NW104 + &NWPlugin_104, +#endif // ifdef USES_NW104 + +#ifdef USES_NW105 + &NWPlugin_105, +#endif // ifdef USES_NW105 + +#ifdef USES_NW106 + &NWPlugin_106, +#endif // ifdef USES_NW106 + +#ifdef USES_NW107 + &NWPlugin_107, +#endif // ifdef USES_NW107 + +#ifdef USES_NW108 + &NWPlugin_108, +#endif // ifdef USES_NW108 + +#ifdef USES_NW109 + &NWPlugin_109, +#endif // ifdef USES_NW109 + +#ifdef USES_NW110 + &NWPlugin_110, +#endif // ifdef USES_NW110 + +#ifdef USES_NW111 + &NWPlugin_111, +#endif // ifdef USES_NW111 + +#ifdef USES_NW112 + &NWPlugin_112, +#endif // ifdef USES_NW112 + +#ifdef USES_NW113 + &NWPlugin_113, +#endif // ifdef USES_NW113 + +#ifdef USES_NW114 + &NWPlugin_114, +#endif // ifdef USES_NW114 + +#ifdef USES_NW115 + &NWPlugin_115, +#endif // ifdef USES_NW115 + +#ifdef USES_NW116 + &NWPlugin_116, +#endif // ifdef USES_NW116 + +#ifdef USES_NW117 + &NWPlugin_117, +#endif // ifdef USES_NW117 + +#ifdef USES_NW118 + &NWPlugin_118, +#endif // ifdef USES_NW118 + +#ifdef USES_NW119 + &NWPlugin_119, +#endif // ifdef USES_NW119 + +#ifdef USES_NW120 + &NWPlugin_120, +#endif // ifdef USES_NW120 + +#ifdef USES_NW121 + &NWPlugin_121, +#endif // ifdef USES_NW121 + +#ifdef USES_NW122 + &NWPlugin_122, +#endif // ifdef USES_NW122 + +#ifdef USES_NW123 + &NWPlugin_123, +#endif // ifdef USES_NW123 + +#ifdef USES_NW124 + &NWPlugin_124, +#endif // ifdef USES_NW124 + +#ifdef USES_NW125 + &NWPlugin_125, +#endif // ifdef USES_NW125 + +#ifdef USES_NW126 + &NWPlugin_126, +#endif // ifdef USES_NW126 + +#ifdef USES_NW127 + &NWPlugin_127, +#endif // ifdef USES_NW127 + +#ifdef USES_NW128 + &NWPlugin_128, +#endif // ifdef USES_NW128 + +#ifdef USES_NW129 + &NWPlugin_129, +#endif // ifdef USES_NW129 + +#ifdef USES_NW130 + &NWPlugin_130, +#endif // ifdef USES_NW130 + +#ifdef USES_NW131 + &NWPlugin_131, +#endif // ifdef USES_NW131 + +#ifdef USES_NW132 + &NWPlugin_132, +#endif // ifdef USES_NW132 + +#ifdef USES_NW133 + &NWPlugin_133, +#endif // ifdef USES_NW133 + +#ifdef USES_NW134 + &NWPlugin_134, +#endif // ifdef USES_NW134 + +#ifdef USES_NW135 + &NWPlugin_135, +#endif // ifdef USES_NW135 + +#ifdef USES_NW136 + &NWPlugin_136, +#endif // ifdef USES_NW136 + +#ifdef USES_NW137 + &NWPlugin_137, +#endif // ifdef USES_NW137 + +#ifdef USES_NW138 + &NWPlugin_138, +#endif // ifdef USES_NW138 + +#ifdef USES_NW139 + &NWPlugin_139, +#endif // ifdef USES_NW139 + +#ifdef USES_NW140 + &NWPlugin_140, +#endif // ifdef USES_NW140 + +#ifdef USES_NW141 + &NWPlugin_141, +#endif // ifdef USES_NW141 + +#ifdef USES_NW142 + &NWPlugin_142, +#endif // ifdef USES_NW142 + +#ifdef USES_NW143 + &NWPlugin_143, +#endif // ifdef USES_NW143 + +#ifdef USES_NW144 + &NWPlugin_144, +#endif // ifdef USES_NW144 + +#ifdef USES_NW145 + &NWPlugin_145, +#endif // ifdef USES_NW145 + +#ifdef USES_NW146 + &NWPlugin_146, +#endif // ifdef USES_NW146 + +#ifdef USES_NW147 + &NWPlugin_147, +#endif // ifdef USES_NW147 + +#ifdef USES_NW148 + &NWPlugin_148, +#endif // ifdef USES_NW148 + +#ifdef USES_NW149 + &NWPlugin_149, +#endif // ifdef USES_NW149 + +#ifdef USES_NW150 + &NWPlugin_150, +#endif // ifdef USES_NW150 + +#ifdef USES_NW151 + &NWPlugin_151, +#endif // ifdef USES_NW151 + +#ifdef USES_NW152 + &NWPlugin_152, +#endif // ifdef USES_NW152 + +#ifdef USES_NW153 + &NWPlugin_153, +#endif // ifdef USES_NW153 + +#ifdef USES_NW154 + &NWPlugin_154, +#endif // ifdef USES_NW154 + +#ifdef USES_NW155 + &NWPlugin_155, +#endif // ifdef USES_NW155 + +#ifdef USES_NW156 + &NWPlugin_156, +#endif // ifdef USES_NW156 + +#ifdef USES_NW157 + &NWPlugin_157, +#endif // ifdef USES_NW157 + +#ifdef USES_NW158 + &NWPlugin_158, +#endif // ifdef USES_NW158 + +#ifdef USES_NW159 + &NWPlugin_159, +#endif // ifdef USES_NW159 + +#ifdef USES_NW160 + &NWPlugin_160, +#endif // ifdef USES_NW160 + +#ifdef USES_NW161 + &NWPlugin_161, +#endif // ifdef USES_NW161 + +#ifdef USES_NW162 + &NWPlugin_162, +#endif // ifdef USES_NW162 + +#ifdef USES_NW163 + &NWPlugin_163, +#endif // ifdef USES_NW163 + +#ifdef USES_NW164 + &NWPlugin_164, +#endif // ifdef USES_NW164 + +#ifdef USES_NW165 + &NWPlugin_165, +#endif // ifdef USES_NW165 + +#ifdef USES_NW166 + &NWPlugin_166, +#endif // ifdef USES_NW166 + +#ifdef USES_NW167 + &NWPlugin_167, +#endif // ifdef USES_NW167 + +#ifdef USES_NW168 + &NWPlugin_168, +#endif // ifdef USES_NW168 + +#ifdef USES_NW169 + &NWPlugin_169, +#endif // ifdef USES_NW169 + +#ifdef USES_NW170 + &NWPlugin_170, +#endif // ifdef USES_NW170 + +#ifdef USES_NW171 + &NWPlugin_171, +#endif // ifdef USES_NW171 + +#ifdef USES_NW172 + &NWPlugin_172, +#endif // ifdef USES_NW172 + +#ifdef USES_NW173 + &NWPlugin_173, +#endif // ifdef USES_NW173 + +#ifdef USES_NW174 + &NWPlugin_174, +#endif // ifdef USES_NW174 + +#ifdef USES_NW175 + &NWPlugin_175, +#endif // ifdef USES_NW175 + +#ifdef USES_NW176 + &NWPlugin_176, +#endif // ifdef USES_NW176 + +#ifdef USES_NW177 + &NWPlugin_177, +#endif // ifdef USES_NW177 + +#ifdef USES_NW178 + &NWPlugin_178, +#endif // ifdef USES_NW178 + +#ifdef USES_NW179 + &NWPlugin_179, +#endif // ifdef USES_NW179 + +#ifdef USES_NW180 + &NWPlugin_180, +#endif // ifdef USES_NW180 + +#ifdef USES_NW181 + &NWPlugin_181, +#endif // ifdef USES_NW181 + +#ifdef USES_NW182 + &NWPlugin_182, +#endif // ifdef USES_NW182 + +#ifdef USES_NW183 + &NWPlugin_183, +#endif // ifdef USES_NW183 + +#ifdef USES_NW184 + &NWPlugin_184, +#endif // ifdef USES_NW184 + +#ifdef USES_NW185 + &NWPlugin_185, +#endif // ifdef USES_NW185 + +#ifdef USES_NW186 + &NWPlugin_186, +#endif // ifdef USES_NW186 + +#ifdef USES_NW187 + &NWPlugin_187, +#endif // ifdef USES_NW187 + +#ifdef USES_NW188 + &NWPlugin_188, +#endif // ifdef USES_NW188 + +#ifdef USES_NW189 + &NWPlugin_189, +#endif // ifdef USES_NW189 + +#ifdef USES_NW190 + &NWPlugin_190, +#endif // ifdef USES_NW190 + +#ifdef USES_NW191 + &NWPlugin_191, +#endif // ifdef USES_NW191 + +#ifdef USES_NW192 + &NWPlugin_192, +#endif // ifdef USES_NW192 + +#ifdef USES_NW193 + &NWPlugin_193, +#endif // ifdef USES_NW193 + +#ifdef USES_NW194 + &NWPlugin_194, +#endif // ifdef USES_NW194 + +#ifdef USES_NW195 + &NWPlugin_195, +#endif // ifdef USES_NW195 + +#ifdef USES_NW196 + &NWPlugin_196, +#endif // ifdef USES_NW196 + +#ifdef USES_NW197 + &NWPlugin_197, +#endif // ifdef USES_NW197 + +#ifdef USES_NW198 + &NWPlugin_198, +#endif // ifdef USES_NW198 + +#ifdef USES_NW199 + &NWPlugin_199, +#endif // ifdef USES_NW199 + +#ifdef USES_NW200 + &NWPlugin_200, +#endif // ifdef USES_NW200 + +#ifdef USES_NW201 + &NWPlugin_201, +#endif // ifdef USES_NW201 + +#ifdef USES_NW202 + &NWPlugin_202, +#endif // ifdef USES_NW202 + +#ifdef USES_NW203 + &NWPlugin_203, +#endif // ifdef USES_NW203 + +#ifdef USES_NW204 + &NWPlugin_204, +#endif // ifdef USES_NW204 + +#ifdef USES_NW205 + &NWPlugin_205, +#endif // ifdef USES_NW205 + +#ifdef USES_NW206 + &NWPlugin_206, +#endif // ifdef USES_NW206 + +#ifdef USES_NW207 + &NWPlugin_207, +#endif // ifdef USES_NW207 + +#ifdef USES_NW208 + &NWPlugin_208, +#endif // ifdef USES_NW208 + +#ifdef USES_NW209 + &NWPlugin_209, +#endif // ifdef USES_NW209 + +#ifdef USES_NW210 + &NWPlugin_210, +#endif // ifdef USES_NW210 + +#ifdef USES_NW211 + &NWPlugin_211, +#endif // ifdef USES_NW211 + +#ifdef USES_NW212 + &NWPlugin_212, +#endif // ifdef USES_NW212 + +#ifdef USES_NW213 + &NWPlugin_213, +#endif // ifdef USES_NW213 + +#ifdef USES_NW214 + &NWPlugin_214, +#endif // ifdef USES_NW214 + +#ifdef USES_NW215 + &NWPlugin_215, +#endif // ifdef USES_NW215 + +#ifdef USES_NW216 + &NWPlugin_216, +#endif // ifdef USES_NW216 + +#ifdef USES_NW217 + &NWPlugin_217, +#endif // ifdef USES_NW217 + +#ifdef USES_NW218 + &NWPlugin_218, +#endif // ifdef USES_NW218 + +#ifdef USES_NW219 + &NWPlugin_219, +#endif // ifdef USES_NW219 + +#ifdef USES_NW220 + &NWPlugin_220, +#endif // ifdef USES_NW220 + +#ifdef USES_NW221 + &NWPlugin_221, +#endif // ifdef USES_NW221 + +#ifdef USES_NW222 + &NWPlugin_222, +#endif // ifdef USES_NW222 + +#ifdef USES_NW223 + &NWPlugin_223, +#endif // ifdef USES_NW223 + +#ifdef USES_NW224 + &NWPlugin_224, +#endif // ifdef USES_NW224 + +#ifdef USES_NW225 + &NWPlugin_225, +#endif // ifdef USES_NW225 + +#ifdef USES_NW226 + &NWPlugin_226, +#endif // ifdef USES_NW226 + +#ifdef USES_NW227 + &NWPlugin_227, +#endif // ifdef USES_NW227 + +#ifdef USES_NW228 + &NWPlugin_228, +#endif // ifdef USES_NW228 + +#ifdef USES_NW229 + &NWPlugin_229, +#endif // ifdef USES_NW229 + +#ifdef USES_NW230 + &NWPlugin_230, +#endif // ifdef USES_NW230 + +#ifdef USES_NW231 + &NWPlugin_231, +#endif // ifdef USES_NW231 + +#ifdef USES_NW232 + &NWPlugin_232, +#endif // ifdef USES_NW232 + +#ifdef USES_NW233 + &NWPlugin_233, +#endif // ifdef USES_NW233 + +#ifdef USES_NW234 + &NWPlugin_234, +#endif // ifdef USES_NW234 + +#ifdef USES_NW235 + &NWPlugin_235, +#endif // ifdef USES_NW235 + +#ifdef USES_NW236 + &NWPlugin_236, +#endif // ifdef USES_NW236 + +#ifdef USES_NW237 + &NWPlugin_237, +#endif // ifdef USES_NW237 + +#ifdef USES_NW238 + &NWPlugin_238, +#endif // ifdef USES_NW238 + +#ifdef USES_NW239 + &NWPlugin_239, +#endif // ifdef USES_NW239 + +#ifdef USES_NW240 + &NWPlugin_240, +#endif // ifdef USES_NW240 + +#ifdef USES_NW241 + &NWPlugin_241, +#endif // ifdef USES_NW241 + +#ifdef USES_NW242 + &NWPlugin_242, +#endif // ifdef USES_NW242 + +#ifdef USES_NW243 + &NWPlugin_243, +#endif // ifdef USES_NW243 + +#ifdef USES_NW244 + &NWPlugin_244, +#endif // ifdef USES_NW244 + +#ifdef USES_NW245 + &NWPlugin_245, +#endif // ifdef USES_NW245 + +#ifdef USES_NW246 + &NWPlugin_246, +#endif // ifdef USES_NW246 + +#ifdef USES_NW247 + &NWPlugin_247, +#endif // ifdef USES_NW247 + +#ifdef USES_NW248 + &NWPlugin_248, +#endif // ifdef USES_NW248 + +#ifdef USES_NW249 + &NWPlugin_249, +#endif // ifdef USES_NW249 + +#ifdef USES_NW250 + &NWPlugin_250, +#endif // ifdef USES_NW250 + +#ifdef USES_NW251 + &NWPlugin_251, +#endif // ifdef USES_NW251 + +#ifdef USES_NW252 + &NWPlugin_252, +#endif // ifdef USES_NW252 + +#ifdef USES_NW253 + &NWPlugin_253, +#endif // ifdef USES_NW253 + +#ifdef USES_NW254 + &NWPlugin_254, +#endif // ifdef USES_NW254 + +#ifdef USES_NW255 + &NWPlugin_255, +#endif // ifdef USES_NW255 +}; + + +constexpr size_t NetworkAdapterIndex_to_NWPlugin_id_size = sizeof(NetworkAdapterIndex_to_NWPlugin_id); + +// Highest NWPlugin ID included in the build +constexpr size_t Highest_NWPlugin_id = NetworkAdapterIndex_to_NWPlugin_id_size == 0 ? 0 : NetworkAdapterIndex_to_NWPlugin_id[NetworkAdapterIndex_to_NWPlugin_id_size - 1]; + +constexpr size_t NWPlugin_id_to_NetworkAdapterIndex_size = Highest_NWPlugin_id + 1; + +// Array filled during init. +// Valid index: 1 ... Highest_NWPlugin_id +// Returns index to the NetworkAdapterIndex_to_NWPlugin_id array +networkAdapterIndex_t NWPlugin_id_to_NetworkAdapterIndex[NWPlugin_id_to_NetworkAdapterIndex_size]{}; + + +NetworkAdapterStruct NetworkAdapterArray[NetworkAdapterIndex_to_NWPlugin_id_size + 1]{}; + +NetworkAdapterStruct& getNetworkAdapterStruct(networkAdapterIndex_t networkAdapterIndex) +{ + if (networkAdapterIndex >= NetworkAdapterIndex_to_NWPlugin_id_size) { + networkAdapterIndex = NetworkAdapterIndex_to_NWPlugin_id_size; + } + return NetworkAdapterArray[networkAdapterIndex]; +} + + +bool validNetworkAdapterIndex(networkAdapterIndex_t index) +{ + return validNetworkAdapterIndex_init(index); +} + +/* + bool validControllerIndex(controllerIndex_t index) + { + return index < CONTROLLER_MAX; + } + */ +bool validNWPluginID(nwpluginID_t nwpluginID) +{ + return getNetworkAdapterIndex_from_NWPluginID_(nwpluginID) != INVALID_PROTOCOL_INDEX; +} + +bool supportedNWPluginID(nwpluginID_t nwpluginID) +{ + return validNetworkAdapterIndex(getNetworkAdapterIndex_from_NWPluginID_(nwpluginID)); +} + + + +networkAdapterIndex_t getNetworkAdapterIndex_from_NWPluginID_(nwpluginID_t nwpluginID) +{ + if (nwpluginID < NWPlugin_id_to_NetworkAdapterIndex_size) + { + return static_cast(NWPlugin_id_to_NetworkAdapterIndex[nwpluginID]); + } + return INVALID_NETWORKADAPTER_INDEX; +} + +nwpluginID_t getNWPluginID_from_NetworkAdapterIndex_(networkAdapterIndex_t networkAdapterIndex) +{ + if (networkAdapterIndex < NetworkAdapterIndex_to_NWPlugin_id_size) + { + // return static_cast(NetworkAdapterIndex_to_NWPlugin_id[networkAdapterIndex]); + return static_cast(pgm_read_byte(NetworkAdapterIndex_to_NWPlugin_id + networkAdapterIndex)); + } + return INVALID_NW_PLUGIN_ID; +} + +bool validNetworkAdapterIndex_init(networkAdapterIndex_t networkAdapterIndex) +{ + return networkAdapterIndex < NetworkAdapterIndex_to_NWPlugin_id_size; +} + +nwpluginID_t getHighestIncludedNWPluginID() +{ + return Highest_NWPlugin_id; +} + + +bool NWPluginCall(networkAdapterIndex_t networkAdapterIndex, NWPlugin::Function Function, struct EventStruct *event, String& string) +{ + if (networkAdapterIndex < NetworkAdapterIndex_to_NWPlugin_id_size) + { + START_TIMER; + NWPlugin_ptr_t nwplugin_call = (NWPlugin_ptr_t)pgm_read_ptr(NWPlugin_ptr + networkAdapterIndex); + const bool res = nwplugin_call(Function, event, string); + STOP_TIMER_NETWORK(networkAdapterIndex, Function); + return res; + } + return false; +} + +void NWPluginSetup() +{ + static bool setupDone = false; + + if (setupDone) { return; } + + for (size_t id = 0; id < NWPlugin_id_to_NetworkAdapterIndex_size; ++id) + { + NWPlugin_id_to_NetworkAdapterIndex[id] = INVALID_NETWORKADAPTER_INDEX; + } + + for (networkAdapterIndex_t networkAdapterIndex = 0; networkAdapterIndex < NetworkAdapterIndex_to_NWPlugin_id_size; ++networkAdapterIndex) + { + const nwpluginID_t nwpluginID = getNWPluginID_from_NetworkAdapterIndex_(networkAdapterIndex); + + if (INVALID_NW_PLUGIN_ID != nwpluginID) { + NWPlugin_id_to_NetworkAdapterIndex[nwpluginID] = networkAdapterIndex; + struct EventStruct TempEvent; + TempEvent.idx = networkAdapterIndex; + String dummy; + NWPluginCall(networkAdapterIndex, NWPlugin::Function::NWPLUGIN_ADAPTER_ADD, &TempEvent, dummy); + } + } + setupDone = true; +} + +void NWPluginInit() +{ + // Set all not supported nwplugins to disabled. + for (controllerIndex_t controller = 0; controller < CONTROLLER_MAX; ++controller) { +// if (!supportedNWPluginID(Settings.NetworkAdapter[controller])) { +// Settings.ControllerEnabled[controller] = false; +// } + } + NWPluginCall(NWPlugin::Function::NWPLUGIN_INIT_ALL, 0); +} diff --git a/src/src/Helpers/_NWPlugin_init.h b/src/src/Helpers/_NWPlugin_init.h new file mode 100644 index 000000000..0c6918843 --- /dev/null +++ b/src/src/Helpers/_NWPlugin_init.h @@ -0,0 +1,1062 @@ +#ifndef HELPERS__NWPLUGIN_INIT_H +#define HELPERS__NWPLUGIN_INIT_H + +#include "../../ESPEasy_common.h" + +#include "../DataTypes/ESPEasy_plugin_functions.h" + +#include "../DataTypes/NWPluginID.h" +#include "../DataTypes/NetworkAdapterIndex.h" +#include "../DataStructs/NetworkAdapterStruct.h" + +struct EventStruct; + +networkAdapterIndex_t getNetworkAdapterIndex_from_NWPluginID_(nwpluginID_t pluginID); +nwpluginID_t getNWPluginID_from_NetworkAdapterIndex_(networkAdapterIndex_t networkAdapterIndex); +bool validNetworkAdapterIndex_init(networkAdapterIndex_t networkAdapterIndex); + +nwpluginID_t getHighestIncludedNWPluginID(); + +NetworkAdapterStruct& getNetworkAdapterStruct(networkAdapterIndex_t networkAdapterIndex); + +bool NWPluginCall(networkAdapterIndex_t networkAdapterIndex, NWPlugin::Function Function, struct EventStruct *event, String& string); + + +void NWPluginSetup(); +void NWPluginInit(); + +// Macro to forward declare the NWPlugin_NNN functions. +// N.B. Some controllers also have a do_process_cNNN_delay_queue function. +// Forward declaration of these is done in ControllerQueue/ControllerDelayHandlerStruct.h +// +// Uncrustify must not be used on macros, so turn it off. +// *INDENT-OFF* +#define ADDNWPLUGIN_H(NNN) bool NWPlugin_##NNN(NWPlugin::Function function, struct EventStruct *event, String& string); +// Uncrustify must not be used on macros, but we're now done, so turn Uncrustify on again. +// *INDENT-ON* + + +#ifdef USES_NW001 + ADDNWPLUGIN_H(001) +#endif + +#ifdef USES_NW002 + ADDNWPLUGIN_H(002) +#endif + +#ifdef USES_NW003 + ADDNWPLUGIN_H(003) +#endif + +#ifdef USES_NW004 + ADDNWPLUGIN_H(004) +#endif + +#ifdef USES_NW005 + ADDNWPLUGIN_H(005) +#endif + +#ifdef USES_NW006 + ADDNWPLUGIN_H(006) +#endif + +#ifdef USES_NW007 + ADDNWPLUGIN_H(007) +#endif + +#ifdef USES_NW008 + ADDNWPLUGIN_H(008) +#endif + +#ifdef USES_NW009 + ADDNWPLUGIN_H(009) +#endif + +#ifdef USES_NW010 + ADDNWPLUGIN_H(010) +#endif + +#ifdef USES_NW011 + ADDNWPLUGIN_H(011) +#endif + +#ifdef USES_NW012 + ADDNWPLUGIN_H(012) +#endif + +#ifdef USES_NW013 + ADDNWPLUGIN_H(013) +#endif + +#ifdef USES_NW014 + ADDNWPLUGIN_H(014) +#endif + +#ifdef USES_NW015 + ADDNWPLUGIN_H(015) +#endif + +#ifdef USES_NW016 + ADDNWPLUGIN_H(016) +#endif + +#ifdef USES_NW017 + ADDNWPLUGIN_H(017) +#endif + +#ifdef USES_NW018 + ADDNWPLUGIN_H(018) +#endif + +#ifdef USES_NW019 + ADDNWPLUGIN_H(019) +#endif + +#ifdef USES_NW020 + ADDNWPLUGIN_H(020) +#endif + +#ifdef USES_NW021 + ADDNWPLUGIN_H(021) +#endif + +#ifdef USES_NW022 + ADDNWPLUGIN_H(022) +#endif + +#ifdef USES_NW023 + ADDNWPLUGIN_H(023) +#endif + +#ifdef USES_NW024 + ADDNWPLUGIN_H(024) +#endif + +#ifdef USES_NW025 + ADDNWPLUGIN_H(025) +#endif + +#ifdef USES_NW026 + ADDNWPLUGIN_H(026) +#endif + +#ifdef USES_NW027 + ADDNWPLUGIN_H(027) +#endif + +#ifdef USES_NW028 + ADDNWPLUGIN_H(028) +#endif + +#ifdef USES_NW029 + ADDNWPLUGIN_H(029) +#endif + +#ifdef USES_NW030 + ADDNWPLUGIN_H(030) +#endif + +#ifdef USES_NW031 + ADDNWPLUGIN_H(031) +#endif + +#ifdef USES_NW032 + ADDNWPLUGIN_H(032) +#endif + +#ifdef USES_NW033 + ADDNWPLUGIN_H(033) +#endif + +#ifdef USES_NW034 + ADDNWPLUGIN_H(034) +#endif + +#ifdef USES_NW035 + ADDNWPLUGIN_H(035) +#endif + +#ifdef USES_NW036 + ADDNWPLUGIN_H(036) +#endif + +#ifdef USES_NW037 + ADDNWPLUGIN_H(037) +#endif + +#ifdef USES_NW038 + ADDNWPLUGIN_H(038) +#endif + +#ifdef USES_NW039 + ADDNWPLUGIN_H(039) +#endif + +#ifdef USES_NW040 + ADDNWPLUGIN_H(040) +#endif + +#ifdef USES_NW041 + ADDNWPLUGIN_H(041) +#endif + +#ifdef USES_NW042 + ADDNWPLUGIN_H(042) +#endif + +#ifdef USES_NW043 + ADDNWPLUGIN_H(043) +#endif + +#ifdef USES_NW044 + ADDNWPLUGIN_H(044) +#endif + +#ifdef USES_NW045 + ADDNWPLUGIN_H(045) +#endif + +#ifdef USES_NW046 + ADDNWPLUGIN_H(046) +#endif + +#ifdef USES_NW047 + ADDNWPLUGIN_H(047) +#endif + +#ifdef USES_NW048 + ADDNWPLUGIN_H(048) +#endif + +#ifdef USES_NW049 + ADDNWPLUGIN_H(049) +#endif + +#ifdef USES_NW050 + ADDNWPLUGIN_H(050) +#endif + +#ifdef USES_NW051 + ADDNWPLUGIN_H(051) +#endif + +#ifdef USES_NW052 + ADDNWPLUGIN_H(052) +#endif + +#ifdef USES_NW053 + ADDNWPLUGIN_H(053) +#endif + +#ifdef USES_NW054 + ADDNWPLUGIN_H(054) +#endif + +#ifdef USES_NW055 + ADDNWPLUGIN_H(055) +#endif + +#ifdef USES_NW056 + ADDNWPLUGIN_H(056) +#endif + +#ifdef USES_NW057 + ADDNWPLUGIN_H(057) +#endif + +#ifdef USES_NW058 + ADDNWPLUGIN_H(058) +#endif + +#ifdef USES_NW059 + ADDNWPLUGIN_H(059) +#endif + +#ifdef USES_NW060 + ADDNWPLUGIN_H(060) +#endif + +#ifdef USES_NW061 + ADDNWPLUGIN_H(061) +#endif + +#ifdef USES_NW062 + ADDNWPLUGIN_H(062) +#endif + +#ifdef USES_NW063 + ADDNWPLUGIN_H(063) +#endif + +#ifdef USES_NW064 + ADDNWPLUGIN_H(064) +#endif + +#ifdef USES_NW065 + ADDNWPLUGIN_H(065) +#endif + +#ifdef USES_NW066 + ADDNWPLUGIN_H(066) +#endif + +#ifdef USES_NW067 + ADDNWPLUGIN_H(067) +#endif + +#ifdef USES_NW068 + ADDNWPLUGIN_H(068) +#endif + +#ifdef USES_NW069 + ADDNWPLUGIN_H(069) +#endif + +#ifdef USES_NW070 + ADDNWPLUGIN_H(070) +#endif + +#ifdef USES_NW071 + ADDNWPLUGIN_H(071) +#endif + +#ifdef USES_NW072 + ADDNWPLUGIN_H(072) +#endif + +#ifdef USES_NW073 + ADDNWPLUGIN_H(073) +#endif + +#ifdef USES_NW074 + ADDNWPLUGIN_H(074) +#endif + +#ifdef USES_NW075 + ADDNWPLUGIN_H(075) +#endif + +#ifdef USES_NW076 + ADDNWPLUGIN_H(076) +#endif + +#ifdef USES_NW077 + ADDNWPLUGIN_H(077) +#endif + +#ifdef USES_NW078 + ADDNWPLUGIN_H(078) +#endif + +#ifdef USES_NW079 + ADDNWPLUGIN_H(079) +#endif + +#ifdef USES_NW080 + ADDNWPLUGIN_H(080) +#endif + +#ifdef USES_NW081 + ADDNWPLUGIN_H(081) +#endif + +#ifdef USES_NW082 + ADDNWPLUGIN_H(082) +#endif + +#ifdef USES_NW083 + ADDNWPLUGIN_H(083) +#endif + +#ifdef USES_NW084 + ADDNWPLUGIN_H(084) +#endif + +#ifdef USES_NW085 + ADDNWPLUGIN_H(085) +#endif + +#ifdef USES_NW086 + ADDNWPLUGIN_H(086) +#endif + +#ifdef USES_NW087 + ADDNWPLUGIN_H(087) +#endif + +#ifdef USES_NW088 + ADDNWPLUGIN_H(088) +#endif + +#ifdef USES_NW089 + ADDNWPLUGIN_H(089) +#endif + +#ifdef USES_NW090 + ADDNWPLUGIN_H(090) +#endif + +#ifdef USES_NW091 + ADDNWPLUGIN_H(091) +#endif + +#ifdef USES_NW092 + ADDNWPLUGIN_H(092) +#endif + +#ifdef USES_NW093 + ADDNWPLUGIN_H(093) +#endif + +#ifdef USES_NW094 + ADDNWPLUGIN_H(094) +#endif + +#ifdef USES_NW095 + ADDNWPLUGIN_H(095) +#endif + +#ifdef USES_NW096 + ADDNWPLUGIN_H(096) +#endif + +#ifdef USES_NW097 + ADDNWPLUGIN_H(097) +#endif + +#ifdef USES_NW098 + ADDNWPLUGIN_H(098) +#endif + +#ifdef USES_NW099 + ADDNWPLUGIN_H(099) +#endif + +#ifdef USES_NW100 + ADDNWPLUGIN_H(100) +#endif + +#ifdef USES_NW101 + ADDNWPLUGIN_H(101) +#endif + +#ifdef USES_NW102 + ADDNWPLUGIN_H(102) +#endif + +#ifdef USES_NW103 + ADDNWPLUGIN_H(103) +#endif + +#ifdef USES_NW104 + ADDNWPLUGIN_H(104) +#endif + +#ifdef USES_NW105 + ADDNWPLUGIN_H(105) +#endif + +#ifdef USES_NW106 + ADDNWPLUGIN_H(106) +#endif + +#ifdef USES_NW107 + ADDNWPLUGIN_H(107) +#endif + +#ifdef USES_NW108 + ADDNWPLUGIN_H(108) +#endif + +#ifdef USES_NW109 + ADDNWPLUGIN_H(109) +#endif + +#ifdef USES_NW110 + ADDNWPLUGIN_H(110) +#endif + +#ifdef USES_NW111 + ADDNWPLUGIN_H(111) +#endif + +#ifdef USES_NW112 + ADDNWPLUGIN_H(112) +#endif + +#ifdef USES_NW113 + ADDNWPLUGIN_H(113) +#endif + +#ifdef USES_NW114 + ADDNWPLUGIN_H(114) +#endif + +#ifdef USES_NW115 + ADDNWPLUGIN_H(115) +#endif + +#ifdef USES_NW116 + ADDNWPLUGIN_H(116) +#endif + +#ifdef USES_NW117 + ADDNWPLUGIN_H(117) +#endif + +#ifdef USES_NW118 + ADDNWPLUGIN_H(118) +#endif + +#ifdef USES_NW119 + ADDNWPLUGIN_H(119) +#endif + +#ifdef USES_NW120 + ADDNWPLUGIN_H(120) +#endif + +#ifdef USES_NW121 + ADDNWPLUGIN_H(121) +#endif + +#ifdef USES_NW122 + ADDNWPLUGIN_H(122) +#endif + +#ifdef USES_NW123 + ADDNWPLUGIN_H(123) +#endif + +#ifdef USES_NW124 + ADDNWPLUGIN_H(124) +#endif + +#ifdef USES_NW125 + ADDNWPLUGIN_H(125) +#endif + +#ifdef USES_NW126 + ADDNWPLUGIN_H(126) +#endif + +#ifdef USES_NW127 + ADDNWPLUGIN_H(127) +#endif + +#ifdef USES_NW128 + ADDNWPLUGIN_H(128) +#endif + +#ifdef USES_NW129 + ADDNWPLUGIN_H(129) +#endif + +#ifdef USES_NW130 + ADDNWPLUGIN_H(130) +#endif + +#ifdef USES_NW131 + ADDNWPLUGIN_H(131) +#endif + +#ifdef USES_NW132 + ADDNWPLUGIN_H(132) +#endif + +#ifdef USES_NW133 + ADDNWPLUGIN_H(133) +#endif + +#ifdef USES_NW134 + ADDNWPLUGIN_H(134) +#endif + +#ifdef USES_NW135 + ADDNWPLUGIN_H(135) +#endif + +#ifdef USES_NW136 + ADDNWPLUGIN_H(136) +#endif + +#ifdef USES_NW137 + ADDNWPLUGIN_H(137) +#endif + +#ifdef USES_NW138 + ADDNWPLUGIN_H(138) +#endif + +#ifdef USES_NW139 + ADDNWPLUGIN_H(139) +#endif + +#ifdef USES_NW140 + ADDNWPLUGIN_H(140) +#endif + +#ifdef USES_NW141 + ADDNWPLUGIN_H(141) +#endif + +#ifdef USES_NW142 + ADDNWPLUGIN_H(142) +#endif + +#ifdef USES_NW143 + ADDNWPLUGIN_H(143) +#endif + +#ifdef USES_NW144 + ADDNWPLUGIN_H(144) +#endif + +#ifdef USES_NW145 + ADDNWPLUGIN_H(145) +#endif + +#ifdef USES_NW146 + ADDNWPLUGIN_H(146) +#endif + +#ifdef USES_NW147 + ADDNWPLUGIN_H(147) +#endif + +#ifdef USES_NW148 + ADDNWPLUGIN_H(148) +#endif + +#ifdef USES_NW149 + ADDNWPLUGIN_H(149) +#endif + +#ifdef USES_NW150 + ADDNWPLUGIN_H(150) +#endif + +#ifdef USES_NW151 + ADDNWPLUGIN_H(151) +#endif + +#ifdef USES_NW152 + ADDNWPLUGIN_H(152) +#endif + +#ifdef USES_NW153 + ADDNWPLUGIN_H(153) +#endif + +#ifdef USES_NW154 + ADDNWPLUGIN_H(154) +#endif + +#ifdef USES_NW155 + ADDNWPLUGIN_H(155) +#endif + +#ifdef USES_NW156 + ADDNWPLUGIN_H(156) +#endif + +#ifdef USES_NW157 + ADDNWPLUGIN_H(157) +#endif + +#ifdef USES_NW158 + ADDNWPLUGIN_H(158) +#endif + +#ifdef USES_NW159 + ADDNWPLUGIN_H(159) +#endif + +#ifdef USES_NW160 + ADDNWPLUGIN_H(160) +#endif + +#ifdef USES_NW161 + ADDNWPLUGIN_H(161) +#endif + +#ifdef USES_NW162 + ADDNWPLUGIN_H(162) +#endif + +#ifdef USES_NW163 + ADDNWPLUGIN_H(163) +#endif + +#ifdef USES_NW164 + ADDNWPLUGIN_H(164) +#endif + +#ifdef USES_NW165 + ADDNWPLUGIN_H(165) +#endif + +#ifdef USES_NW166 + ADDNWPLUGIN_H(166) +#endif + +#ifdef USES_NW167 + ADDNWPLUGIN_H(167) +#endif + +#ifdef USES_NW168 + ADDNWPLUGIN_H(168) +#endif + +#ifdef USES_NW169 + ADDNWPLUGIN_H(169) +#endif + +#ifdef USES_NW170 + ADDNWPLUGIN_H(170) +#endif + +#ifdef USES_NW171 + ADDNWPLUGIN_H(171) +#endif + +#ifdef USES_NW172 + ADDNWPLUGIN_H(172) +#endif + +#ifdef USES_NW173 + ADDNWPLUGIN_H(173) +#endif + +#ifdef USES_NW174 + ADDNWPLUGIN_H(174) +#endif + +#ifdef USES_NW175 + ADDNWPLUGIN_H(175) +#endif + +#ifdef USES_NW176 + ADDNWPLUGIN_H(176) +#endif + +#ifdef USES_NW177 + ADDNWPLUGIN_H(177) +#endif + +#ifdef USES_NW178 + ADDNWPLUGIN_H(178) +#endif + +#ifdef USES_NW179 + ADDNWPLUGIN_H(179) +#endif + +#ifdef USES_NW180 + ADDNWPLUGIN_H(180) +#endif + +#ifdef USES_NW181 + ADDNWPLUGIN_H(181) +#endif + +#ifdef USES_NW182 + ADDNWPLUGIN_H(182) +#endif + +#ifdef USES_NW183 + ADDNWPLUGIN_H(183) +#endif + +#ifdef USES_NW184 + ADDNWPLUGIN_H(184) +#endif + +#ifdef USES_NW185 + ADDNWPLUGIN_H(185) +#endif + +#ifdef USES_NW186 + ADDNWPLUGIN_H(186) +#endif + +#ifdef USES_NW187 + ADDNWPLUGIN_H(187) +#endif + +#ifdef USES_NW188 + ADDNWPLUGIN_H(188) +#endif + +#ifdef USES_NW189 + ADDNWPLUGIN_H(189) +#endif + +#ifdef USES_NW190 + ADDNWPLUGIN_H(190) +#endif + +#ifdef USES_NW191 + ADDNWPLUGIN_H(191) +#endif + +#ifdef USES_NW192 + ADDNWPLUGIN_H(192) +#endif + +#ifdef USES_NW193 + ADDNWPLUGIN_H(193) +#endif + +#ifdef USES_NW194 + ADDNWPLUGIN_H(194) +#endif + +#ifdef USES_NW195 + ADDNWPLUGIN_H(195) +#endif + +#ifdef USES_NW196 + ADDNWPLUGIN_H(196) +#endif + +#ifdef USES_NW197 + ADDNWPLUGIN_H(197) +#endif + +#ifdef USES_NW198 + ADDNWPLUGIN_H(198) +#endif + +#ifdef USES_NW199 + ADDNWPLUGIN_H(199) +#endif + +#ifdef USES_NW200 + ADDNWPLUGIN_H(200) +#endif + +#ifdef USES_NW201 + ADDNWPLUGIN_H(201) +#endif + +#ifdef USES_NW202 + ADDNWPLUGIN_H(202) +#endif + +#ifdef USES_NW203 + ADDNWPLUGIN_H(203) +#endif + +#ifdef USES_NW204 + ADDNWPLUGIN_H(204) +#endif + +#ifdef USES_NW205 + ADDNWPLUGIN_H(205) +#endif + +#ifdef USES_NW206 + ADDNWPLUGIN_H(206) +#endif + +#ifdef USES_NW207 + ADDNWPLUGIN_H(207) +#endif + +#ifdef USES_NW208 + ADDNWPLUGIN_H(208) +#endif + +#ifdef USES_NW209 + ADDNWPLUGIN_H(209) +#endif + +#ifdef USES_NW210 + ADDNWPLUGIN_H(210) +#endif + +#ifdef USES_NW211 + ADDNWPLUGIN_H(211) +#endif + +#ifdef USES_NW212 + ADDNWPLUGIN_H(212) +#endif + +#ifdef USES_NW213 + ADDNWPLUGIN_H(213) +#endif + +#ifdef USES_NW214 + ADDNWPLUGIN_H(214) +#endif + +#ifdef USES_NW215 + ADDNWPLUGIN_H(215) +#endif + +#ifdef USES_NW216 + ADDNWPLUGIN_H(216) +#endif + +#ifdef USES_NW217 + ADDNWPLUGIN_H(217) +#endif + +#ifdef USES_NW218 + ADDNWPLUGIN_H(218) +#endif + +#ifdef USES_NW219 + ADDNWPLUGIN_H(219) +#endif + +#ifdef USES_NW220 + ADDNWPLUGIN_H(220) +#endif + +#ifdef USES_NW221 + ADDNWPLUGIN_H(221) +#endif + +#ifdef USES_NW222 + ADDNWPLUGIN_H(222) +#endif + +#ifdef USES_NW223 + ADDNWPLUGIN_H(223) +#endif + +#ifdef USES_NW224 + ADDNWPLUGIN_H(224) +#endif + +#ifdef USES_NW225 + ADDNWPLUGIN_H(225) +#endif + +#ifdef USES_NW226 + ADDNWPLUGIN_H(226) +#endif + +#ifdef USES_NW227 + ADDNWPLUGIN_H(227) +#endif + +#ifdef USES_NW228 + ADDNWPLUGIN_H(228) +#endif + +#ifdef USES_NW229 + ADDNWPLUGIN_H(229) +#endif + +#ifdef USES_NW230 + ADDNWPLUGIN_H(230) +#endif + +#ifdef USES_NW231 + ADDNWPLUGIN_H(231) +#endif + +#ifdef USES_NW232 + ADDNWPLUGIN_H(232) +#endif + +#ifdef USES_NW233 + ADDNWPLUGIN_H(233) +#endif + +#ifdef USES_NW234 + ADDNWPLUGIN_H(234) +#endif + +#ifdef USES_NW235 + ADDNWPLUGIN_H(235) +#endif + +#ifdef USES_NW236 + ADDNWPLUGIN_H(236) +#endif + +#ifdef USES_NW237 + ADDNWPLUGIN_H(237) +#endif + +#ifdef USES_NW238 + ADDNWPLUGIN_H(238) +#endif + +#ifdef USES_NW239 + ADDNWPLUGIN_H(239) +#endif + +#ifdef USES_NW240 + ADDNWPLUGIN_H(240) +#endif + +#ifdef USES_NW241 + ADDNWPLUGIN_H(241) +#endif + +#ifdef USES_NW242 + ADDNWPLUGIN_H(242) +#endif + +#ifdef USES_NW243 + ADDNWPLUGIN_H(243) +#endif + +#ifdef USES_NW244 + ADDNWPLUGIN_H(244) +#endif + +#ifdef USES_NW245 + ADDNWPLUGIN_H(245) +#endif + +#ifdef USES_NW246 + ADDNWPLUGIN_H(246) +#endif + +#ifdef USES_NW247 + ADDNWPLUGIN_H(247) +#endif + +#ifdef USES_NW248 + ADDNWPLUGIN_H(248) +#endif + +#ifdef USES_NW249 + ADDNWPLUGIN_H(249) +#endif + +#ifdef USES_NW250 + ADDNWPLUGIN_H(250) +#endif + +#ifdef USES_NW251 + ADDNWPLUGIN_H(251) +#endif + +#ifdef USES_NW252 + ADDNWPLUGIN_H(252) +#endif + +#ifdef USES_NW253 + ADDNWPLUGIN_H(253) +#endif + +#ifdef USES_NW254 + ADDNWPLUGIN_H(254) +#endif + +#ifdef USES_NW255 + ADDNWPLUGIN_H(255) +#endif + +#undef ADDNWPLUGIN_H + + +#endif \ No newline at end of file diff --git a/src/src/WebServer/ESPEasy_WebServer.cpp b/src/src/WebServer/ESPEasy_WebServer.cpp index 9cb7c6917..c14a4642e 100644 --- a/src/src/WebServer/ESPEasy_WebServer.cpp +++ b/src/src/WebServer/ESPEasy_WebServer.cpp @@ -23,6 +23,7 @@ #include "../WebServer/Markup.h" #include "../WebServer/Markup_Buttons.h" #include "../WebServer/Markup_Forms.h" +#include "../WebServer/NetworkPage.h" #include "../WebServer/NotificationPage.h" #include "../WebServer/PinStates.h" #include "../WebServer/RootPage.h" @@ -225,6 +226,9 @@ void WebServerInit() #ifdef WEBSERVER_CONFIG web_server.on(F("/config"), handle_config); #endif // ifdef WEBSERVER_CONFIG + #ifdef WEBSERVER_NETWORK + web_server.on(F("/network"), handle_networks); + #endif // ifdef WEBSERVER_NETWORK #ifdef WEBSERVER_CONTROL web_server.on(F("/control"), handle_control); #endif // ifdef WEBSERVER_CONTROL diff --git a/src/src/WebServer/NetworkPage.cpp b/src/src/WebServer/NetworkPage.cpp new file mode 100644 index 000000000..e9bea1f61 --- /dev/null +++ b/src/src/WebServer/NetworkPage.cpp @@ -0,0 +1,75 @@ +#include "../WebServer/NetworkPage.h" + +#ifdef WEBSERVER_NETWORK + +# include "../WebServer/ESPEasy_WebServer.h" +# include "../WebServer/HTML_wrappers.h" +# include "../WebServer/Markup.h" +# include "../WebServer/Markup_Buttons.h" +# include "../WebServer/Markup_Forms.h" + +void handle_networks() +{ +# ifndef BUILD_NO_RAM_TRACKER + checkRAM(F("handle_networks")); +# endif // ifndef BUILD_NO_RAM_TRACKER + + if (!isLoggedIn()) { return; } + navMenuIndex = MENU_INDEX_NETWORK; + TXBuffer.startStream(); + sendHeadandTail_stdtemplate(_HEAD); + + // 'index' value in the URL + uint8_t networkindex = getFormItemInt(F("index"), 0); + boolean networkNotSet = networkindex == 0; + --networkindex; // Index in URL is starting from 1, but starting from 0 in the array. + + const int protocol_webarg_value = getFormItemInt(F("protocol"), -1); + + // submitted data + if ((protocol_webarg_value != -1) && !networkNotSet) + { + // TODO TD-er: Implement saving submitted settings + + + } + + html_add_form(); + + if (networkNotSet) + { + handle_networks_ShowAllNetworksTable(); + } + else + { + //handle_networks_NetworkSettingsPage(networkindex); + } + + sendHeadandTail_stdtemplate(_TAIL); + TXBuffer.endStream(); +} + + +/* +void handle_networks_clearLoadDefaults(uint8_t networkindex, NetworkSettingsStruct& NetworkSettings) +{} +*/ + +/* +void handle_networks_CopySubmittedSettings(uint8_t networkindex, NetworkSettingsStruct& NetworkSettings) +{} +*/ + +void handle_networks_CopySubmittedSettings_CPluginCall(uint8_t networkindex) +{} + +void handle_networks_ShowAllNetworksTable() +{} + + +void handle_networks_NetworkSettingsPage(networkIndex_t networkindex) +{} + + + +#endif // ifdef WEBSERVER_NETWORK diff --git a/src/src/WebServer/NetworkPage.h b/src/src/WebServer/NetworkPage.h new file mode 100644 index 000000000..9910687f4 --- /dev/null +++ b/src/src/WebServer/NetworkPage.h @@ -0,0 +1,40 @@ +#ifndef WEBSERVER_WEBSERVER_NETWORKPAGE_H +#define WEBSERVER_WEBSERVER_NETWORKPAGE_H + +#include "../WebServer/common.h" + +#ifdef WEBSERVER_NETWORK + +#include "../DataTypes/NetworkIndex.h" + +// ******************************************************************************** +// Web Interface Network page +// ******************************************************************************** +void handle_networks(); + +// ******************************************************************************** +// Selected network has changed. +// Clear all Network settings and load some defaults +// ******************************************************************************** +//void handle_networks_clearLoadDefaults(uint8_t networkindex, NetworkSettingsStruct& NetworkSettings); + +// ******************************************************************************** +// Collect all submitted form data and store in the NetworkSettings +// ******************************************************************************** +//void handle_networks_CopySubmittedSettings(uint8_t networkindex, NetworkSettingsStruct& NetworkSettings); + +void handle_networks_CopySubmittedSettings_CPluginCall(uint8_t networkindex); + +// ******************************************************************************** +// Show table with all selected networks +// ******************************************************************************** +void handle_networks_ShowAllNetworksTable(); + +// ******************************************************************************** +// Show the network settings page +// ******************************************************************************** +void handle_networks_NetworkSettingsPage(networkIndex_t networkindex); + + +#endif +#endif diff --git a/src/src/WebServer/WebTemplateParser.cpp b/src/src/WebServer/WebTemplateParser.cpp index afa20831d..5a0ae54d9 100644 --- a/src/src/WebServer/WebTemplateParser.cpp +++ b/src/src/WebServer/WebTemplateParser.cpp @@ -30,6 +30,15 @@ #endif #endif // ifndef MENU_INDEX_CONFIG_VISIBLE +#ifndef MENU_INDEX_NETWORK_VISIBLE +#ifdef WEBSERVER_NETWORK + # define MENU_INDEX_NETWORK_VISIBLE true +#else + # define MENU_INDEX_NETWORK_VISIBLE false +#endif +#endif // ifndef MENU_INDEX_NETWORK_VISIBLE + + #ifndef MENU_INDEX_CONTROLLERS_VISIBLE #ifdef WEBSERVER_CONTROLLERS # define MENU_INDEX_CONTROLLERS_VISIBLE true @@ -92,6 +101,7 @@ const __FlashStringHelper* getGpMenuIcon(uint8_t index) { switch (index) { case MENU_INDEX_MAIN: return F("⌂"); case MENU_INDEX_CONFIG: return F("⚙"); + case MENU_INDEX_NETWORK: return F("🖧"); case MENU_INDEX_CONTROLLERS: return F("💬"); case MENU_INDEX_HARDWARE: return F("📌"); case MENU_INDEX_DEVICES: return F("🔌"); @@ -106,6 +116,7 @@ const __FlashStringHelper* getGpMenuLabel(uint8_t index) { switch (index) { case MENU_INDEX_MAIN: return F("Main"); case MENU_INDEX_CONFIG: return F("Config"); + case MENU_INDEX_NETWORK: return F("Network"); case MENU_INDEX_CONTROLLERS: return F("Controllers"); case MENU_INDEX_HARDWARE: return F("Hardware"); case MENU_INDEX_DEVICES: return F("Devices"); @@ -120,6 +131,7 @@ const __FlashStringHelper* getGpMenuURL(uint8_t index) { switch (index) { case MENU_INDEX_MAIN: return F("/"); case MENU_INDEX_CONFIG: return F("/config"); + case MENU_INDEX_NETWORK: return F("/network"); case MENU_INDEX_CONTROLLERS: return F("/controllers"); case MENU_INDEX_HARDWARE: return F("/hardware"); case MENU_INDEX_DEVICES: return F("/devices"); @@ -134,6 +146,7 @@ bool GpMenuVisible(uint8_t index) { switch (index) { case MENU_INDEX_MAIN: return MENU_INDEX_MAIN_VISIBLE; case MENU_INDEX_CONFIG: return MENU_INDEX_CONFIG_VISIBLE; + case MENU_INDEX_NETWORK: return MENU_INDEX_NETWORK_VISIBLE; case MENU_INDEX_CONTROLLERS: return MENU_INDEX_CONTROLLERS_VISIBLE; case MENU_INDEX_HARDWARE: return MENU_INDEX_HARDWARE_VISIBLE; case MENU_INDEX_DEVICES: return MENU_INDEX_DEVICES_VISIBLE; @@ -390,7 +403,7 @@ void WebTemplateParser::getWebPageTemplateVar(const String& varName) { addHtml(F("
")); - for (uint8_t i = 0; i < 8; i++) + for (uint8_t i = 0; i <= MENU_MAX_INDEX_SHOWN; i++) { if (!GpMenuVisible(i)) { // hide menu item diff --git a/src/src/WebServer/WebTemplateParser.h b/src/src/WebServer/WebTemplateParser.h index 91152ea8b..e18476894 100644 --- a/src/src/WebServer/WebTemplateParser.h +++ b/src/src/WebServer/WebTemplateParser.h @@ -11,14 +11,19 @@ #define MENU_INDEX_MAIN 0 #define MENU_INDEX_CONFIG 1 -#define MENU_INDEX_CONTROLLERS 2 -#define MENU_INDEX_HARDWARE 3 -#define MENU_INDEX_DEVICES 4 -#define MENU_INDEX_RULES 5 -#define MENU_INDEX_NOTIFICATIONS 6 -#define MENU_INDEX_TOOLS 7 +#define MENU_INDEX_NETWORK 2 +#define MENU_INDEX_CONTROLLERS 3 +#define MENU_INDEX_HARDWARE 4 +#define MENU_INDEX_BUSES 5 +#define MENU_INDEX_DEVICES 6 +#define MENU_INDEX_RULES 7 +#define MENU_INDEX_NOTIFICATIONS 8 +#define MENU_INDEX_TOOLS 9 #define MENU_INDEX_SETUP 254 #define MENU_INDEX_CUSTOM_PAGE 255 + +#define MENU_MAX_INDEX_SHOWN MENU_INDEX_TOOLS + extern uint8_t navMenuIndex; From 544bbc84f10186648fabae6dc39c0faf2fa22b84 Mon Sep 17 00:00:00 2001 From: TD-er Date: Sun, 6 Jul 2025 16:15:31 +0200 Subject: [PATCH 088/564] [Network] Continue adding network config page --- src/src/DataStructs/SettingsStruct.h | 32 +++++++ src/src/DataStructs_templ/SettingsStruct.cpp | 22 +++++ src/src/DataTypes/ESPEasy_plugin_functions.h | 21 +++-- src/src/DataTypes/NWPluginID.cpp | 10 ++- src/src/DataTypes/NWPluginID.h | 57 ++++++++++++- src/src/DataTypes/PluginID.cpp | 2 +- src/src/DataTypes/PluginID.h | 5 ++ src/src/Globals/CPlugins.cpp | 2 +- src/src/Globals/NWPlugins.cpp | 69 +++++++++++++-- src/src/Globals/NWPlugins.h | 21 +++++ src/src/Helpers/ESPEasy_checks.cpp | 4 +- src/src/Helpers/_NWPlugin_init.cpp | 40 ++------- src/src/WebServer/ControllerPage.cpp | 1 - src/src/WebServer/NetworkPage.cpp | 90 +++++++++++++++++++- 14 files changed, 318 insertions(+), 58 deletions(-) diff --git a/src/src/DataStructs/SettingsStruct.h b/src/src/DataStructs/SettingsStruct.h index eff58183c..543e1d5c1 100644 --- a/src/src/DataStructs/SettingsStruct.h +++ b/src/src/DataStructs/SettingsStruct.h @@ -10,11 +10,14 @@ #include "../DataTypes/ControllerIndex.h" #include "../DataTypes/EthernetParameters.h" #include "../DataTypes/NetworkMedium.h" +#include "../DataTypes/NWPluginID.h" +#include "../DataTypes/NetworkIndex.h" #include "../DataTypes/NPluginID.h" #include "../DataTypes/PluginID.h" //#include "../DataTypes/TaskEnabledState.h" #include "../DataTypes/TimeSource.h" #include "../Globals/Plugins.h" +#include "../Globals/NWPlugins.h" #ifdef ESP32 #include @@ -397,6 +400,21 @@ public: memcpy(&VariousBits_2, &value, sizeof(VariousBits_2)); } + bool getNetworkEnabled(networkIndex_t index) const { + if (validNetworkIndex(index)) bitRead(NetworkEnabled_bits, index); + return false; + } + + void setNetworkEnabled(networkIndex_t index, bool enabled) { + if (validNetworkIndex(index)) { + bitWrite(NetworkEnabled_bits, index, enabled); + } + } + + nwpluginID_t getNWPluginID_for_network(networkIndex_t index) const; + + void setNWPluginID_for_network(networkIndex_t index, nwpluginID_t id); + unsigned long PID = 0; int Version = 0; @@ -625,7 +643,21 @@ public: int8_t console_serial_txpin = DEFAULT_CONSOLE_PORT_TXPIN; uint8_t console_serial0_fallback = DEFAULT_CONSOLE_SER0_FALLBACK; + + // ******************************************************************************** + // NWPlugin (Network) settings + // ******************************************************************************** + // FIXME TD-er: Must change to nwpluginID_t, but then also another check must be added since changing the pluginID_t will also render settings incompatible + uint8_t NetworkAdapter[NETWORK_MAX] = {0}; // The NWPluginID number + uint8_t NetworkEnabled_bits{}; + uint8_t NetworkUnused_1{}; + uint8_t NetworkUnused_2{}; + uint8_t NetworkUnused_3{}; + + + // Try to extend settings to make the checksum 4-uint8_t aligned. + }; /* diff --git a/src/src/DataStructs_templ/SettingsStruct.cpp b/src/src/DataStructs_templ/SettingsStruct.cpp index 1bd48293b..2ad6d7b0d 100644 --- a/src/src/DataStructs_templ/SettingsStruct.cpp +++ b/src/src/DataStructs_templ/SettingsStruct.cpp @@ -10,6 +10,7 @@ #include "../CustomBuild/ESPEasyLimits.h" #include "../DataStructs/DeviceStruct.h" #include "../DataTypes/SPI_options.h" +#include "../DataTypes/NWPluginID.h" #include "../DataTypes/NPluginID.h" #include "../DataTypes/PluginID.h" #include "../Globals/Plugins.h" @@ -1249,4 +1250,25 @@ pluginID_t SettingsStruct_tmpl::getPluginID_for_task(taskIndex_t taskIn return INVALID_PLUGIN_ID; } +template +nwpluginID_t SettingsStruct_tmpl::getNWPluginID_for_network(networkIndex_t index) const +{ + if (validNetworkIndex(index)) { + const uint8_t nwa = NetworkAdapter[index]; + if (nwa > 0) { + return nwpluginID_t::toPluginID(nwa); + } + } + return INVALID_NW_PLUGIN_ID; +} + +template +void SettingsStruct_tmpl::setNWPluginID_for_network(networkIndex_t index, nwpluginID_t id) +{ + if (validNetworkIndex(index)) { + NetworkAdapter[index] = id.value; + } +} + + #endif // ifndef DATASTRUCTS_SETTINGSSTRUCT_CPP diff --git a/src/src/DataTypes/ESPEasy_plugin_functions.h b/src/src/DataTypes/ESPEasy_plugin_functions.h index 1ad407c7c..74c2dd2a9 100644 --- a/src/src/DataTypes/ESPEasy_plugin_functions.h +++ b/src/src/DataTypes/ESPEasy_plugin_functions.h @@ -118,28 +118,35 @@ public: }; }; -class NWPlugin { +// ******************************************************************************** +// NWPlugin (Network) function calls +// ******************************************************************************** +class NWPlugin +{ public: // As these function values are also used in the timing stats, make sure there is no overlap with the PLUGIN_xxx numbering. enum class Function { NWPLUGIN_ADAPTER_ADD = 192, // Called at boot for letting a network adapter adding itself to list of available controllers - NWPLUGIN_CONNECT_SUCCESS, // Only used for timing stats - NWPLUGIN_CONNECT_FAIL, // Only used for timing stats + NWPLUGIN_CONNECT_SUCCESS, // Only used for timing stats + NWPLUGIN_CONNECT_FAIL, // Only used for timing stats NWPLUGIN_ADAPTER_TEMPLATE, NWPLUGIN_GET_DEVICENAME, NWPLUGIN_WEBFORM_SAVE, NWPLUGIN_WEBFORM_LOAD, NWPLUGIN_GET_ADAPTER_DISPLAY_NAME, NWPLUGIN_INIT, - NWPLUGIN_TEN_PER_SECOND, // Called 10x per second (typical for checking new data instead of waiting) - NWPLUGIN_FIFTY_PER_SECOND, // Called 50x per second (typical for checking new data instead of waiting) + NWPLUGIN_TEN_PER_SECOND, // Called 10x per second (typical for checking new data instead of waiting) + NWPLUGIN_FIFTY_PER_SECOND, // Called 50x per second (typical for checking new data instead of waiting) NWPLUGIN_INIT_ALL, NWPLUGIN_EXIT, - NWPLUGIN_WRITE, // Send commands to a network adapter. + NWPLUGIN_WRITE, // Send commands to a network adapter. + NWPLUGIN_WEBFORM_SHOW_HOST_CONFIG // Used for showing host information for the network adapter. + }; -}; + +}; // class NWPlugin // ******************************************************************************** // NPlugin (Notification) function calls diff --git a/src/src/DataTypes/NWPluginID.cpp b/src/src/DataTypes/NWPluginID.cpp index be48ec49b..3ba3476ae 100644 --- a/src/src/DataTypes/NWPluginID.cpp +++ b/src/src/DataTypes/NWPluginID.cpp @@ -1,3 +1,11 @@ #include "../DataTypes/NWPluginID.h" -const nwpluginID_t INVALID_NW_PLUGIN_ID = 0; +#include "../Helpers/StringConverter.h" + + +String nwpluginID_t::toDisplayString() const { + if (value == 0) { return F("NW---"); } + return strformat(F("NW%03d"), value); +} + +const nwpluginID_t INVALID_NW_PLUGIN_ID{}; diff --git a/src/src/DataTypes/NWPluginID.h b/src/src/DataTypes/NWPluginID.h index cffec9e3c..736f34a5e 100644 --- a/src/src/DataTypes/NWPluginID.h +++ b/src/src/DataTypes/NWPluginID.h @@ -3,9 +3,62 @@ #include "../../ESPEasy_common.h" -typedef uint8_t nwpluginID_t; +struct __attribute__((__packed__)) nwpluginID_t { + nwpluginID_t() = default; + + nwpluginID_t(const nwpluginID_t& other) + { + value = other.value; + } + + constexpr explicit nwpluginID_t(uint8_t id) : value(id) {} + + + static nwpluginID_t toPluginID(unsigned other) + { + nwpluginID_t res; + + if (other <= 255) { res.value = other; } + + return res; + } + + bool isValid() const + { + return value != 0; + } + + operator bool() const + { + return isValid(); + } + + nwpluginID_t& operator=(const nwpluginID_t& other) + { + value = other.value; + return *this; + } + + bool operator==(const nwpluginID_t& other) const + { + return this->value == other.value; + } + + bool operator!=(const nwpluginID_t& other) const + { + return this->value != other.value; + } + + void setInvalid() { + value = 0; + } + + String toDisplayString() const; + + uint8_t value{}; +}; + extern const nwpluginID_t INVALID_NW_PLUGIN_ID; - #endif // ifndef DATATYPES_NWPLUGINID_H diff --git a/src/src/DataTypes/PluginID.cpp b/src/src/DataTypes/PluginID.cpp index 6a866651d..c18ddaff5 100644 --- a/src/src/DataTypes/PluginID.cpp +++ b/src/src/DataTypes/PluginID.cpp @@ -8,4 +8,4 @@ String pluginID_t::toDisplayString() const { return strformat(F("P%03d"), value); } -const pluginID_t INVALID_PLUGIN_ID; +const pluginID_t INVALID_PLUGIN_ID{}; diff --git a/src/src/DataTypes/PluginID.h b/src/src/DataTypes/PluginID.h index 8e9b909da..443258bcf 100644 --- a/src/src/DataTypes/PluginID.h +++ b/src/src/DataTypes/PluginID.h @@ -23,6 +23,11 @@ struct __attribute__((__packed__)) pluginID_t { return res; } + operator bool() const + { + return value != 0; + } + pluginID_t& operator=(const pluginID_t& other) { value = other.value; diff --git a/src/src/Globals/CPlugins.cpp b/src/src/Globals/CPlugins.cpp index 7ec9a0ac7..8bacb79e9 100644 --- a/src/src/Globals/CPlugins.cpp +++ b/src/src/Globals/CPlugins.cpp @@ -206,7 +206,7 @@ protocolIndex_t getProtocolIndex_from_CPluginID(cpluginID_t cpluginID) { } cpluginID_t getCPluginID_from_ProtocolIndex(protocolIndex_t index) { - return getCPluginID_from_ProtocolIndex_(index); + return getCPluginID_from_ProtocolIndex(index); } cpluginID_t getCPluginID_from_ControllerIndex(controllerIndex_t index) { diff --git a/src/src/Globals/NWPlugins.cpp b/src/src/Globals/NWPlugins.cpp index 682e61a41..3dda7103d 100644 --- a/src/src/Globals/NWPlugins.cpp +++ b/src/src/Globals/NWPlugins.cpp @@ -9,8 +9,6 @@ #include "../Globals/Settings.h" #include "../Helpers/_NWPlugin_init.h" - - bool NWPluginCall(NWPlugin::Function Function, struct EventStruct *event) { #ifdef USE_SECOND_HEAP HeapSelectDram ephemeral; @@ -36,15 +34,15 @@ bool NWPluginCall(NWPlugin::Function Function, struct EventStruct *event, String switch (Function) { case NWPlugin::Function::NWPLUGIN_ADAPTER_ADD: - // only called from NWPluginSetup() directly using protocolIndex + // only called from NWPluginSetup() directly using networkAdapterIndex break; - // calls to all active controllers + // calls to all active networks case NWPlugin::Function::NWPLUGIN_INIT_ALL: case NWPlugin::Function::NWPLUGIN_TEN_PER_SECOND: case NWPlugin::Function::NWPLUGIN_FIFTY_PER_SECOND: case NWPlugin::Function::NWPLUGIN_WRITE: -{ + { const bool success = Function != NWPlugin::Function::NWPLUGIN_WRITE; if (Function == NWPlugin::Function::NWPLUGIN_INIT_ALL) { @@ -53,9 +51,64 @@ bool NWPluginCall(NWPlugin::Function Function, struct EventStruct *event, String // TODO TD-er: Implement - return success; -} + return success; + } } return false; -} \ No newline at end of file +} + +bool validNetworkAdapterIndex(networkAdapterIndex_t index) { return validNetworkAdapterIndex_init(index); } + +/* + bool validNetworkIndex(networkIndex_t index) + { + return index < NETWORK_MAX; + } + */ +bool validNWPluginID(nwpluginID_t nwpluginID) { + return getNetworkAdapterIndex_from_NWPluginID_(nwpluginID) != + INVALID_NETWORKADAPTER_INDEX; +} + +bool supportedNWPluginID(nwpluginID_t nwpluginID) { + return validNetworkAdapterIndex( + getNetworkAdapterIndex_from_NWPluginID_(nwpluginID)); +} + +networkAdapterIndex_t getNetworkAdapterIndex_from_NetworkIndex(networkIndex_t index) { + if (validNetworkIndex(index)) { + return getNetworkAdapterIndex_from_NWPluginID_(Settings.getNWPluginID_for_network(index)); + } + return INVALID_NETWORKADAPTER_INDEX; +} + +networkAdapterIndex_t getNetworkAdapterIndex_from_NWPluginID(nwpluginID_t nwpluginID) { + return getNetworkAdapterIndex_from_NWPluginID_(nwpluginID); +} + +nwpluginID_t getNWPluginID_from_NetworkAdapterIndex(networkAdapterIndex_t index) { return getNWPluginID_from_NetworkAdapterIndex(index); } + +nwpluginID_t getNWPluginID_from_NetworkIndex(networkIndex_t index) { + const networkAdapterIndex_t networkAdapterIndex = getNetworkAdapterIndex_from_NetworkIndex(index); + + return getNWPluginID_from_NetworkAdapterIndex(networkAdapterIndex); +} + +String getNWPluginNameFromNetworkAdapterIndex(networkAdapterIndex_t NetworkAdapterIndex) { + String networkName; + + if (validNetworkAdapterIndex(NetworkAdapterIndex)) { + NWPluginCall(NetworkAdapterIndex, NWPlugin::Function::NWPLUGIN_GET_DEVICENAME, nullptr, networkName); + } + return networkName; +} + +String getNWPluginNameFromNWPluginID(nwpluginID_t nwpluginID) { + networkAdapterIndex_t networkAdapterIndex = getNetworkAdapterIndex_from_NWPluginID(nwpluginID); + + if (!validNetworkAdapterIndex(networkAdapterIndex)) { + return strformat(F("NWPlugin %d not included in build"), nwpluginID); + } + return getNWPluginNameFromNetworkAdapterIndex(networkAdapterIndex); +} diff --git a/src/src/Globals/NWPlugins.h b/src/src/Globals/NWPlugins.h index fc6eab895..66db76bd6 100644 --- a/src/src/Globals/NWPlugins.h +++ b/src/src/Globals/NWPlugins.h @@ -24,6 +24,27 @@ bool NWPluginCall(networkAdapterIndex_t networkAdapterIndex, String & str); + +bool validNetworkAdapterIndex(networkAdapterIndex_t index); + + +// bool validNetworkIndex(networkIndex_t index); +#define validNetworkIndex(C_X) ((C_X) < NETWORK_MAX) + +// Check whether NWPlugin is included in build. +bool validNWPluginID(nwpluginID_t nwpluginID); + +// Check if nwplugin is included in build. +// N.B. Invalid nwplugin is also not considered supported. +// This is essentially (validNWPluginID && validNetworkAdapterIndex) +bool supportedNWPluginID(nwpluginID_t nwpluginID); +networkAdapterIndex_t getNetworkAdapterIndex_from_NetworkIndex(networkIndex_t index); +networkAdapterIndex_t getNetworkAdapterIndex_from_NWPluginID(nwpluginID_t nwpluginID); +nwpluginID_t getNWPluginID_from_NetworkAdapterIndex(networkAdapterIndex_t index); +nwpluginID_t getNWPluginID_from_NetworkIndex(networkIndex_t index); + +String getNWPluginNameFromNetworkAdapterIndex(networkAdapterIndex_t NetworkAdapterIndex); +String getNWPluginNameFromNWPluginID(nwpluginID_t nwpluginID); #endif diff --git a/src/src/Helpers/ESPEasy_checks.cpp b/src/src/Helpers/ESPEasy_checks.cpp index 00ff7ee4e..81b808328 100644 --- a/src/src/Helpers/ESPEasy_checks.cpp +++ b/src/src/Helpers/ESPEasy_checks.cpp @@ -84,10 +84,10 @@ void run_compiletime_checks() { check_size(); check_max_size(); #ifdef ESP32 - constexpr unsigned int SettingsStructSize = (340 + 84 * TASKS_MAX); + constexpr unsigned int SettingsStructSize = (352 + 84 * TASKS_MAX); #endif #ifdef ESP8266 - constexpr unsigned int SettingsStructSize = (316 + 84 * TASKS_MAX); + constexpr unsigned int SettingsStructSize = (328 + 84 * TASKS_MAX); #endif #if FEATURE_CUSTOM_PROVISIONING check_size(); diff --git a/src/src/Helpers/_NWPlugin_init.cpp b/src/src/Helpers/_NWPlugin_init.cpp index 9df9dbc05..ebb08f6ea 100644 --- a/src/src/Helpers/_NWPlugin_init.cpp +++ b/src/src/Helpers/_NWPlugin_init.cpp @@ -11,8 +11,8 @@ #include "../Helpers/Misc.h" // ******************************************************************************** -// Initialize all Controller NWPlugins that where defined earlier -// and initialize the function call pointer into the CNWPlugin array +// Initialize all Network NWPlugins that where defined earlier +// and initialize the function call pointer into the NWPlugin array // ******************************************************************************** constexpr nwpluginID_t NetworkAdapterIndex_to_NWPlugin_id[] PROGMEM = @@ -2091,28 +2091,6 @@ NetworkAdapterStruct& getNetworkAdapterStruct(networkAdapterIndex_t networkAdapt } -bool validNetworkAdapterIndex(networkAdapterIndex_t index) -{ - return validNetworkAdapterIndex_init(index); -} - -/* - bool validControllerIndex(controllerIndex_t index) - { - return index < CONTROLLER_MAX; - } - */ -bool validNWPluginID(nwpluginID_t nwpluginID) -{ - return getNetworkAdapterIndex_from_NWPluginID_(nwpluginID) != INVALID_PROTOCOL_INDEX; -} - -bool supportedNWPluginID(nwpluginID_t nwpluginID) -{ - return validNetworkAdapterIndex(getNetworkAdapterIndex_from_NWPluginID_(nwpluginID)); -} - - networkAdapterIndex_t getNetworkAdapterIndex_from_NWPluginID_(nwpluginID_t nwpluginID) { @@ -2140,7 +2118,7 @@ bool validNetworkAdapterIndex_init(networkAdapterIndex_t networkAdapterIndex) nwpluginID_t getHighestIncludedNWPluginID() { - return Highest_NWPlugin_id; + return nwpluginID_t(Highest_NWPlugin_id); } @@ -2170,9 +2148,9 @@ void NWPluginSetup() for (networkAdapterIndex_t networkAdapterIndex = 0; networkAdapterIndex < NetworkAdapterIndex_to_NWPlugin_id_size; ++networkAdapterIndex) { - const nwpluginID_t nwpluginID = getNWPluginID_from_NetworkAdapterIndex_(networkAdapterIndex); + const nwpluginID_t nwpluginID = getNWPluginID_from_NetworkAdapterIndex(networkAdapterIndex); - if (INVALID_NW_PLUGIN_ID != nwpluginID) { + if (nwpluginID) { NWPlugin_id_to_NetworkAdapterIndex[nwpluginID] = networkAdapterIndex; struct EventStruct TempEvent; TempEvent.idx = networkAdapterIndex; @@ -2186,10 +2164,10 @@ void NWPluginSetup() void NWPluginInit() { // Set all not supported nwplugins to disabled. - for (controllerIndex_t controller = 0; controller < CONTROLLER_MAX; ++controller) { -// if (!supportedNWPluginID(Settings.NetworkAdapter[controller])) { -// Settings.ControllerEnabled[controller] = false; -// } + for (networkIndex_t network = 0; network < NETWORK_MAX; ++network) { + if (!supportedNWPluginID(Settings.getNWPluginID_for_network(network))) { + Settings.setNetworkEnabled(network, false); + } } NWPluginCall(NWPlugin::Function::NWPLUGIN_INIT_ALL, 0); } diff --git a/src/src/WebServer/ControllerPage.cpp b/src/src/WebServer/ControllerPage.cpp index dbcfcdfa7..0cf0b85b9 100644 --- a/src/src/WebServer/ControllerPage.cpp +++ b/src/src/WebServer/ControllerPage.cpp @@ -29,7 +29,6 @@ # include "../Helpers/_CPlugin_Helper_webform.h" # include "../Helpers/_Plugin_SensorTypeHelper.h" # include "../Helpers/ESPEasy_Storage.h" -# include "../Helpers/StringConverter.h" // ******************************************************************************** // Web Interface controller page diff --git a/src/src/WebServer/NetworkPage.cpp b/src/src/WebServer/NetworkPage.cpp index e9bea1f61..c32b74b71 100644 --- a/src/src/WebServer/NetworkPage.cpp +++ b/src/src/WebServer/NetworkPage.cpp @@ -8,6 +8,16 @@ # include "../WebServer/Markup_Buttons.h" # include "../WebServer/Markup_Forms.h" +# include "../DataStructs/ESPEasy_EventStruct.h" +# include "../Globals/NWPlugins.h" +# include "../Globals/Settings.h" + +# include "../Helpers/_NWPlugin_init.h" +# include "../Helpers/ESPEasy_Storage.h" +# include "../Helpers/StringConverter.h" +# include "../Helpers/ESPEasy_Storage.h" + + void handle_networks() { # ifndef BUILD_NO_RAM_TRACKER @@ -24,10 +34,10 @@ void handle_networks() boolean networkNotSet = networkindex == 0; --networkindex; // Index in URL is starting from 1, but starting from 0 in the array. - const int protocol_webarg_value = getFormItemInt(F("protocol"), -1); + const int networkAdapter_webarg_value = getFormItemInt(F("networkAdapter"), -1); // submitted data - if ((protocol_webarg_value != -1) && !networkNotSet) + if ((networkAdapter_webarg_value != -1) && !networkNotSet) { // TODO TD-er: Implement saving submitted settings @@ -60,7 +70,7 @@ void handle_networks_CopySubmittedSettings(uint8_t networkindex, NetworkSettings {} */ -void handle_networks_CopySubmittedSettings_CPluginCall(uint8_t networkindex) +void handle_networks_CopySubmittedSettings_NWPluginCall(uint8_t networkindex) {} void handle_networks_ShowAllNetworksTable() @@ -68,7 +78,79 @@ void handle_networks_ShowAllNetworksTable() void handle_networks_NetworkSettingsPage(networkIndex_t networkindex) -{} +{ + html_table_class_multirow(); + html_TR(); + html_table_header(F(""), 70); + html_table_header(F("Nr"), 50); + html_table_header(F("Order"), 50); + html_table_header(F("Enabled"), 100); + html_table_header(F("Connected"), 100); + html_table_header(F("Network Adapter")); + html_table_header(F("MAC")); + html_table_header(F("IP")); + html_table_header(F("Port")); + + for (networkIndex_t x = 0; x < NETWORK_MAX; x++) + { + const nwpluginID_t nwpluginID = Settings.getNWPluginID_for_network(x); + const bool nwplugin_set = nwpluginID.isValid(); + + html_TR_TD(); + + if (nwplugin_set && !supportedNWPluginID(nwpluginID)) { + html_add_button_prefix(F("red"), true); + } else { + html_add_button_prefix(); + } + { + addHtml(F("network?index=")); + addHtmlInt(x + 1); + addHtml(F("'>")); + + if (nwplugin_set) { + addHtml(F("Edit")); + } else { + addHtml(F("Add")); + } + addHtml(F("")); + } + html_TD(); + + if (nwplugin_set) + { + addEnabled(Settings.getNetworkEnabled(x)); + + html_TD(); + addHtml(getNWPluginNameFromNWPluginID(Settings.getNWPluginID_for_network(x))); + html_TD(); + const networkAdapterIndex_t NetworkAdapterIndex = getNetworkAdapterIndex_from_NetworkIndex(x); + { + String hostDescription; + NWPluginCall(NetworkAdapterIndex, NWPlugin::Function::NWPLUGIN_WEBFORM_SHOW_HOST_CONFIG, 0, hostDescription); + + if (!hostDescription.isEmpty()) { + addHtml(hostDescription); + } + } + + html_TD(); + /* + const NetworkAdapterStruct& adapter = getNetworkAdapterStruct(NetworkAdapterIndex); + + if ((INVALID_NETWORKADAPTER_INDEX == NetworkAdapterIndex) || adapter.usesPort) { + addHtmlInt(13 == nwpluginID ? Settings.UDPPort : NetworkSettings->Port); // P2P/C013 exception + } + */ + } + else { + html_TD(3); + } + } + + html_end_table(); + html_end_form(); +} From 7f105721452511df370f0999c1c1b9868b10a222 Mon Sep 17 00:00:00 2001 From: TD-er Date: Sun, 6 Jul 2025 16:23:36 +0200 Subject: [PATCH 089/564] [Network] Rename NetworkAdapter to NetworkDriver --- src/src/CustomBuild/ESPEasyLimits.h | 3 + src/src/DataStructs/NetworkAdapterStruct.cpp | 1 - src/src/DataStructs/NetworkDriverStruct.cpp | 1 + ...kAdapterStruct.h => NetworkDriverStruct.h} | 10 +-- src/src/DataStructs/SettingsStruct.h | 2 +- src/src/DataStructs/TimingStats.cpp | 4 +- src/src/DataStructs/TimingStats.h | 4 +- src/src/DataStructs_templ/SettingsStruct.cpp | 4 +- src/src/DataTypes/NetworkAdapterIndex.cpp | 5 -- src/src/DataTypes/NetworkAdapterIndex.h | 11 ---- src/src/DataTypes/NetworkDriverIndex.cpp | 6 ++ src/src/DataTypes/NetworkDriverIndex.h | 66 +++++++++++++++++++ src/src/Globals/NWPlugins.cpp | 40 +++++------ src/src/Globals/NWPlugins.h | 16 ++--- src/src/Helpers/_NWPlugin_init.cpp | 65 +++++++++--------- src/src/Helpers/_NWPlugin_init.h | 14 ++-- src/src/WebServer/NetworkPage.cpp | 12 ++-- 17 files changed, 162 insertions(+), 102 deletions(-) delete mode 100644 src/src/DataStructs/NetworkAdapterStruct.cpp create mode 100644 src/src/DataStructs/NetworkDriverStruct.cpp rename src/src/DataStructs/{NetworkAdapterStruct.h => NetworkDriverStruct.h} (57%) delete mode 100644 src/src/DataTypes/NetworkAdapterIndex.cpp delete mode 100644 src/src/DataTypes/NetworkAdapterIndex.h create mode 100644 src/src/DataTypes/NetworkDriverIndex.cpp create mode 100644 src/src/DataTypes/NetworkDriverIndex.h diff --git a/src/src/CustomBuild/ESPEasyLimits.h b/src/src/CustomBuild/ESPEasyLimits.h index 0912bc25c..b1b0ca2e8 100644 --- a/src/src/CustomBuild/ESPEasyLimits.h +++ b/src/src/CustomBuild/ESPEasyLimits.h @@ -95,6 +95,9 @@ #ifndef CPLUGIN_MAX #define CPLUGIN_MAX 255 #endif +#ifndef NETWORKDRIVER_INDEX_MAX + #define NETWORKDRIVER_INDEX_MAX 255 +#endif #ifndef NWPLUGIN_MAX #define NWPLUGIN_MAX 255 #endif diff --git a/src/src/DataStructs/NetworkAdapterStruct.cpp b/src/src/DataStructs/NetworkAdapterStruct.cpp deleted file mode 100644 index 6d24e3bd0..000000000 --- a/src/src/DataStructs/NetworkAdapterStruct.cpp +++ /dev/null @@ -1 +0,0 @@ -#include "../DataStructs/NetworkAdapterStruct.h" \ No newline at end of file diff --git a/src/src/DataStructs/NetworkDriverStruct.cpp b/src/src/DataStructs/NetworkDriverStruct.cpp new file mode 100644 index 000000000..6e2eb8773 --- /dev/null +++ b/src/src/DataStructs/NetworkDriverStruct.cpp @@ -0,0 +1 @@ +#include "../DataStructs/NetworkDriverStruct.h" \ No newline at end of file diff --git a/src/src/DataStructs/NetworkAdapterStruct.h b/src/src/DataStructs/NetworkDriverStruct.h similarity index 57% rename from src/src/DataStructs/NetworkAdapterStruct.h rename to src/src/DataStructs/NetworkDriverStruct.h index 254dad82f..1f7adbe2d 100644 --- a/src/src/DataStructs/NetworkAdapterStruct.h +++ b/src/src/DataStructs/NetworkDriverStruct.h @@ -1,15 +1,15 @@ -#ifndef DATASTRUCTS_NETWORKADAPTERSTRUCT_H -#define DATASTRUCTS_NETWORKADAPTERSTRUCT_H +#ifndef DATASTRUCTS_NETWORKDRIVERSTRUCT_H +#define DATASTRUCTS_NETWORKDRIVERSTRUCT_H #include "../../ESPEasy_common.h" #include /*********************************************************************************************\ -* NetworkAdapterStruct +* NetworkDriverStruct \*********************************************************************************************/ -struct NetworkAdapterStruct +struct NetworkDriverStruct { - NetworkAdapterStruct() = default; + NetworkDriverStruct() = default; diff --git a/src/src/DataStructs/SettingsStruct.h b/src/src/DataStructs/SettingsStruct.h index 543e1d5c1..4c25ce6f0 100644 --- a/src/src/DataStructs/SettingsStruct.h +++ b/src/src/DataStructs/SettingsStruct.h @@ -648,7 +648,7 @@ public: // NWPlugin (Network) settings // ******************************************************************************** // FIXME TD-er: Must change to nwpluginID_t, but then also another check must be added since changing the pluginID_t will also render settings incompatible - uint8_t NetworkAdapter[NETWORK_MAX] = {0}; // The NWPluginID number + uint8_t NWPluginID[NETWORK_MAX] = {0}; uint8_t NetworkEnabled_bits{}; uint8_t NetworkUnused_1{}; uint8_t NetworkUnused_2{}; diff --git a/src/src/DataStructs/TimingStats.cpp b/src/src/DataStructs/TimingStats.cpp index 276e350bb..0a2025e54 100644 --- a/src/src/DataStructs/TimingStats.cpp +++ b/src/src/DataStructs/TimingStats.cpp @@ -336,9 +336,9 @@ void stopTimerController(protocolIndex_t T, CPlugin::Function F, uint32_t statis if (mustLogCFunction(F)) { controllerStats[static_cast(T) * 256 + static_cast(F)].add(usecPassedSince_fast(statisticsTimerStart)); } } -void stopTimerNetwork(networkAdapterIndex_t T, NWPlugin::Function F, uint32_t statisticsTimerStart) +void stopTimerNetwork(networkDriverIndex_t T, NWPlugin::Function F, uint32_t statisticsTimerStart) { - if (mustLogNWFunction(F)) { networkStats[static_cast(T) * 256 + static_cast(F)].add(usecPassedSince_fast(statisticsTimerStart)); } + if (mustLogNWFunction(F)) { networkStats[static_cast(T.value) * 256 + static_cast(F)].add(usecPassedSince_fast(statisticsTimerStart)); } } diff --git a/src/src/DataStructs/TimingStats.h b/src/src/DataStructs/TimingStats.h index 5397d54e6..39c2648a3 100644 --- a/src/src/DataStructs/TimingStats.h +++ b/src/src/DataStructs/TimingStats.h @@ -7,7 +7,7 @@ # include "../DataTypes/DeviceIndex.h" # include "../DataTypes/ESPEasy_plugin_functions.h" -# include "../DataTypes/NetworkAdapterIndex.h" +# include "../DataTypes/NetworkDriverIndex.h" # include "../DataTypes/ProtocolIndex.h" # include "../Globals/Settings.h" # include "../Helpers/ESPEasy_time_calc.h" @@ -175,7 +175,7 @@ void stopTimerTask(deviceIndex_t T, void stopTimerController(protocolIndex_t T, CPlugin::Function F, uint32_t statisticsTimerStart); -void stopTimerNetwork(networkAdapterIndex_t T, +void stopTimerNetwork(networkDriverIndex_t T, NWPlugin::Function F, uint32_t statisticsTimerStart); void stopTimer(TimingStatsElements L, diff --git a/src/src/DataStructs_templ/SettingsStruct.cpp b/src/src/DataStructs_templ/SettingsStruct.cpp index 2ad6d7b0d..838d70b9c 100644 --- a/src/src/DataStructs_templ/SettingsStruct.cpp +++ b/src/src/DataStructs_templ/SettingsStruct.cpp @@ -1254,7 +1254,7 @@ template nwpluginID_t SettingsStruct_tmpl::getNWPluginID_for_network(networkIndex_t index) const { if (validNetworkIndex(index)) { - const uint8_t nwa = NetworkAdapter[index]; + const uint8_t nwa = NWPluginID[index]; if (nwa > 0) { return nwpluginID_t::toPluginID(nwa); } @@ -1266,7 +1266,7 @@ template void SettingsStruct_tmpl::setNWPluginID_for_network(networkIndex_t index, nwpluginID_t id) { if (validNetworkIndex(index)) { - NetworkAdapter[index] = id.value; + NWPluginID[index] = id.value; } } diff --git a/src/src/DataTypes/NetworkAdapterIndex.cpp b/src/src/DataTypes/NetworkAdapterIndex.cpp deleted file mode 100644 index b0de15048..000000000 --- a/src/src/DataTypes/NetworkAdapterIndex.cpp +++ /dev/null @@ -1,5 +0,0 @@ -#include "../DataTypes/NetworkAdapterIndex.h" - -#include "../CustomBuild/ESPEasyLimits.h" - -networkAdapterIndex_t INVALID_NETWORKADAPTER_INDEX = NWPLUGIN_MAX; \ No newline at end of file diff --git a/src/src/DataTypes/NetworkAdapterIndex.h b/src/src/DataTypes/NetworkAdapterIndex.h deleted file mode 100644 index daee21217..000000000 --- a/src/src/DataTypes/NetworkAdapterIndex.h +++ /dev/null @@ -1,11 +0,0 @@ -#ifndef DATATYPES_NETWORKADAPTERINDEX_H -#define DATATYPES_NETWORKADAPTERINDEX_H - -#include "../../ESPEasy_common.h" - -typedef uint8_t networkAdapterIndex_t; - -extern networkAdapterIndex_t INVALID_NETWORKADAPTER_INDEX; - - -#endif \ No newline at end of file diff --git a/src/src/DataTypes/NetworkDriverIndex.cpp b/src/src/DataTypes/NetworkDriverIndex.cpp new file mode 100644 index 000000000..67310bde4 --- /dev/null +++ b/src/src/DataTypes/NetworkDriverIndex.cpp @@ -0,0 +1,6 @@ +#include "../DataTypes/NetworkDriverIndex.h" + +#include "../CustomBuild/ESPEasyLimits.h" + + +networkDriverIndex_t INVALID_NETWORKDRIVER_INDEX = networkDriverIndex_t::toNetworkDriverIndex(NETWORKDRIVER_INDEX_MAX); diff --git a/src/src/DataTypes/NetworkDriverIndex.h b/src/src/DataTypes/NetworkDriverIndex.h new file mode 100644 index 000000000..75baa89ff --- /dev/null +++ b/src/src/DataTypes/NetworkDriverIndex.h @@ -0,0 +1,66 @@ +#ifndef DATATYPES_NETWORKDRIVERINDEX_H +#define DATATYPES_NETWORKDRIVERINDEX_H + +#include "../../ESPEasy_common.h" + +#include "../CustomBuild/ESPEasyLimits.h" + +struct networkDriverIndex_t { + networkDriverIndex_t() = default; + + networkDriverIndex_t(const networkDriverIndex_t& other) + { + value = other.value; + } + + static networkDriverIndex_t toNetworkDriverIndex(unsigned other) + { + networkDriverIndex_t res; + res = other; + return res; + } + + // TD-er: Do not add constructor with int as argument, + // as this makes it impossible for the compiler to typecheck its use. + // networkDriverIndex_t(int other); + + networkDriverIndex_t& operator=(unsigned other) + { + value = (other < NETWORKDRIVER_INDEX_MAX) ? other : NETWORKDRIVER_INDEX_MAX; + return *this; + } + + + networkDriverIndex_t& operator=(const networkDriverIndex_t& other) + { + value = other.value; + return *this; + } + + // TD-er: Using operator unsigned() makes it impossible for the compiler to check for types. + // However, since the NetworkDriver[] array is accessed using a networkDriverIndex_t, we need this operator unsigned() + // on ESP8266. + // On ESP32 we have a strongly typed NetworkDriverVector class and thus we can properly check per operator. + #ifndef ESP8266 + bool operator<(unsigned other) const { return value < other; } + bool operator!=(unsigned other) const { return value != other; } + bool operator!=(const networkDriverIndex_t& other) const { return value != other.value; } + + #else // ifndef ESP8266 + operator unsigned() const { return value; } + #endif // ifndef ESP8266 + + networkDriverIndex_t& operator++() + { + // pre-increment, ++a + ++value; + return *this; + } + + uint8_t value{}; // Init this to 0, so we can easily iterate over it. +}; + + +extern networkDriverIndex_t INVALID_NETWORKDRIVER_INDEX; + +#endif // ifndef DATATYPES_NETWORKDRIVERINDEX_H diff --git a/src/src/Globals/NWPlugins.cpp b/src/src/Globals/NWPlugins.cpp index 3dda7103d..a7bf67a9d 100644 --- a/src/src/Globals/NWPlugins.cpp +++ b/src/src/Globals/NWPlugins.cpp @@ -34,7 +34,7 @@ bool NWPluginCall(NWPlugin::Function Function, struct EventStruct *event, String switch (Function) { case NWPlugin::Function::NWPLUGIN_ADAPTER_ADD: - // only called from NWPluginSetup() directly using networkAdapterIndex + // only called from NWPluginSetup() directly using networkDriverIndex break; // calls to all active networks @@ -58,7 +58,7 @@ bool NWPluginCall(NWPlugin::Function Function, struct EventStruct *event, String return false; } -bool validNetworkAdapterIndex(networkAdapterIndex_t index) { return validNetworkAdapterIndex_init(index); } +bool validNetworkDriverIndex(networkDriverIndex_t index) { return validNetworkDriverIndex_init(index); } /* bool validNetworkIndex(networkIndex_t index) @@ -67,48 +67,48 @@ bool validNetworkAdapterIndex(networkAdapterIndex_t index) { return validNetwork } */ bool validNWPluginID(nwpluginID_t nwpluginID) { - return getNetworkAdapterIndex_from_NWPluginID_(nwpluginID) != - INVALID_NETWORKADAPTER_INDEX; + return getNetworkDriverIndex_from_NWPluginID_(nwpluginID) != + INVALID_NETWORKDRIVER_INDEX; } bool supportedNWPluginID(nwpluginID_t nwpluginID) { - return validNetworkAdapterIndex( - getNetworkAdapterIndex_from_NWPluginID_(nwpluginID)); + return validNetworkDriverIndex( + getNetworkDriverIndex_from_NWPluginID_(nwpluginID)); } -networkAdapterIndex_t getNetworkAdapterIndex_from_NetworkIndex(networkIndex_t index) { +networkDriverIndex_t getNetworkDriverIndex_from_NetworkIndex(networkIndex_t index) { if (validNetworkIndex(index)) { - return getNetworkAdapterIndex_from_NWPluginID_(Settings.getNWPluginID_for_network(index)); + return getNetworkDriverIndex_from_NWPluginID_(Settings.getNWPluginID_for_network(index)); } - return INVALID_NETWORKADAPTER_INDEX; + return INVALID_NETWORKDRIVER_INDEX; } -networkAdapterIndex_t getNetworkAdapterIndex_from_NWPluginID(nwpluginID_t nwpluginID) { - return getNetworkAdapterIndex_from_NWPluginID_(nwpluginID); +networkDriverIndex_t getNetworkDriverIndex_from_NWPluginID(nwpluginID_t nwpluginID) { + return getNetworkDriverIndex_from_NWPluginID_(nwpluginID); } -nwpluginID_t getNWPluginID_from_NetworkAdapterIndex(networkAdapterIndex_t index) { return getNWPluginID_from_NetworkAdapterIndex(index); } +nwpluginID_t getNWPluginID_from_NetworkDriverIndex(networkDriverIndex_t index) { return getNWPluginID_from_NetworkDriverIndex(index); } nwpluginID_t getNWPluginID_from_NetworkIndex(networkIndex_t index) { - const networkAdapterIndex_t networkAdapterIndex = getNetworkAdapterIndex_from_NetworkIndex(index); + const networkDriverIndex_t networkDriverIndex = getNetworkDriverIndex_from_NetworkIndex(index); - return getNWPluginID_from_NetworkAdapterIndex(networkAdapterIndex); + return getNWPluginID_from_NetworkDriverIndex(networkDriverIndex); } -String getNWPluginNameFromNetworkAdapterIndex(networkAdapterIndex_t NetworkAdapterIndex) { +String getNWPluginNameFromNetworkDriverIndex(networkDriverIndex_t NetworkDriverIndex) { String networkName; - if (validNetworkAdapterIndex(NetworkAdapterIndex)) { - NWPluginCall(NetworkAdapterIndex, NWPlugin::Function::NWPLUGIN_GET_DEVICENAME, nullptr, networkName); + if (validNetworkDriverIndex(NetworkDriverIndex)) { + NWPluginCall(NetworkDriverIndex, NWPlugin::Function::NWPLUGIN_GET_DEVICENAME, nullptr, networkName); } return networkName; } String getNWPluginNameFromNWPluginID(nwpluginID_t nwpluginID) { - networkAdapterIndex_t networkAdapterIndex = getNetworkAdapterIndex_from_NWPluginID(nwpluginID); + networkDriverIndex_t networkDriverIndex = getNetworkDriverIndex_from_NWPluginID(nwpluginID); - if (!validNetworkAdapterIndex(networkAdapterIndex)) { + if (!validNetworkDriverIndex(networkDriverIndex)) { return strformat(F("NWPlugin %d not included in build"), nwpluginID); } - return getNWPluginNameFromNetworkAdapterIndex(networkAdapterIndex); + return getNWPluginNameFromNetworkDriverIndex(networkDriverIndex); } diff --git a/src/src/Globals/NWPlugins.h b/src/src/Globals/NWPlugins.h index 66db76bd6..50aa8e2d5 100644 --- a/src/src/Globals/NWPlugins.h +++ b/src/src/Globals/NWPlugins.h @@ -7,7 +7,7 @@ #include "../DataTypes/ESPEasy_plugin_functions.h" #include "../DataTypes/NWPluginID.h" #include "../DataTypes/NetworkIndex.h" -#include "../DataTypes/NetworkAdapterIndex.h" +#include "../DataTypes/NetworkDriverIndex.h" @@ -18,14 +18,14 @@ bool NWPluginCall(NWPlugin::Function Function, bool NWPluginCall(NWPlugin::Function Function, struct EventStruct *event, String & str); -bool NWPluginCall(networkAdapterIndex_t networkAdapterIndex, +bool NWPluginCall(networkDriverIndex_t networkDriverIndex, NWPlugin::Function Function, struct EventStruct *event, String & str); -bool validNetworkAdapterIndex(networkAdapterIndex_t index); +bool validNetworkDriverIndex(networkDriverIndex_t index); // bool validNetworkIndex(networkIndex_t index); @@ -36,14 +36,14 @@ bool validNWPluginID(nwpluginID_t nwpluginID); // Check if nwplugin is included in build. // N.B. Invalid nwplugin is also not considered supported. -// This is essentially (validNWPluginID && validNetworkAdapterIndex) +// This is essentially (validNWPluginID && validNetworkDriverIndex) bool supportedNWPluginID(nwpluginID_t nwpluginID); -networkAdapterIndex_t getNetworkAdapterIndex_from_NetworkIndex(networkIndex_t index); -networkAdapterIndex_t getNetworkAdapterIndex_from_NWPluginID(nwpluginID_t nwpluginID); -nwpluginID_t getNWPluginID_from_NetworkAdapterIndex(networkAdapterIndex_t index); +networkDriverIndex_t getNetworkDriverIndex_from_NetworkIndex(networkIndex_t index); +networkDriverIndex_t getNetworkDriverIndex_from_NWPluginID(nwpluginID_t nwpluginID); +nwpluginID_t getNWPluginID_from_NetworkDriverIndex(networkDriverIndex_t index); nwpluginID_t getNWPluginID_from_NetworkIndex(networkIndex_t index); -String getNWPluginNameFromNetworkAdapterIndex(networkAdapterIndex_t NetworkAdapterIndex); +String getNWPluginNameFromNetworkDriverIndex(networkDriverIndex_t NetworkDriverIndex); String getNWPluginNameFromNWPluginID(nwpluginID_t nwpluginID); diff --git a/src/src/Helpers/_NWPlugin_init.cpp b/src/src/Helpers/_NWPlugin_init.cpp index ebb08f6ea..0841615f2 100644 --- a/src/src/Helpers/_NWPlugin_init.cpp +++ b/src/src/Helpers/_NWPlugin_init.cpp @@ -15,7 +15,7 @@ // and initialize the function call pointer into the NWPlugin array // ******************************************************************************** -constexpr nwpluginID_t NetworkAdapterIndex_to_NWPlugin_id[] PROGMEM = +constexpr nwpluginID_t NetworkDriverIndex_to_NWPlugin_id[] PROGMEM = { #ifdef USES_NW001 1, @@ -2067,53 +2067,53 @@ const NWPlugin_ptr_t PROGMEM NWPlugin_ptr[] = }; -constexpr size_t NetworkAdapterIndex_to_NWPlugin_id_size = sizeof(NetworkAdapterIndex_to_NWPlugin_id); +constexpr size_t NetworkDriverIndex_to_NWPlugin_id_size = sizeof(NetworkDriverIndex_to_NWPlugin_id); // Highest NWPlugin ID included in the build -constexpr size_t Highest_NWPlugin_id = NetworkAdapterIndex_to_NWPlugin_id_size == 0 ? 0 : NetworkAdapterIndex_to_NWPlugin_id[NetworkAdapterIndex_to_NWPlugin_id_size - 1]; +constexpr size_t Highest_NWPlugin_id = NetworkDriverIndex_to_NWPlugin_id_size == 0 ? 0 : NetworkDriverIndex_to_NWPlugin_id[NetworkDriverIndex_to_NWPlugin_id_size - 1]; -constexpr size_t NWPlugin_id_to_NetworkAdapterIndex_size = Highest_NWPlugin_id + 1; +constexpr size_t NWPlugin_id_to_NetworkDriverIndex_size = Highest_NWPlugin_id + 1; // Array filled during init. // Valid index: 1 ... Highest_NWPlugin_id -// Returns index to the NetworkAdapterIndex_to_NWPlugin_id array -networkAdapterIndex_t NWPlugin_id_to_NetworkAdapterIndex[NWPlugin_id_to_NetworkAdapterIndex_size]{}; +// Returns index to the NetworkDriverIndex_to_NWPlugin_id array +networkDriverIndex_t NWPlugin_id_to_NetworkDriverIndex[NWPlugin_id_to_NetworkDriverIndex_size]{}; -NetworkAdapterStruct NetworkAdapterArray[NetworkAdapterIndex_to_NWPlugin_id_size + 1]{}; +NetworkDriverStruct NetworkDriverArray[NetworkDriverIndex_to_NWPlugin_id_size + 1]{}; -NetworkAdapterStruct& getNetworkAdapterStruct(networkAdapterIndex_t networkAdapterIndex) +NetworkDriverStruct& getNetworkDriverStruct(networkDriverIndex_t networkDriverIndex) { - if (networkAdapterIndex >= NetworkAdapterIndex_to_NWPlugin_id_size) { - networkAdapterIndex = NetworkAdapterIndex_to_NWPlugin_id_size; + if (networkDriverIndex.value >= NetworkDriverIndex_to_NWPlugin_id_size) { + networkDriverIndex = NetworkDriverIndex_to_NWPlugin_id_size; } - return NetworkAdapterArray[networkAdapterIndex]; + return NetworkDriverArray[networkDriverIndex.value]; } -networkAdapterIndex_t getNetworkAdapterIndex_from_NWPluginID_(nwpluginID_t nwpluginID) +networkDriverIndex_t getNetworkDriverIndex_from_NWPluginID_(nwpluginID_t nwpluginID) { - if (nwpluginID < NWPlugin_id_to_NetworkAdapterIndex_size) + if (nwpluginID < NWPlugin_id_to_NetworkDriverIndex_size) { - return static_cast(NWPlugin_id_to_NetworkAdapterIndex[nwpluginID]); + return static_cast(NWPlugin_id_to_NetworkDriverIndex[nwpluginID]); } - return INVALID_NETWORKADAPTER_INDEX; + return INVALID_NETWORKDRIVER_INDEX; } -nwpluginID_t getNWPluginID_from_NetworkAdapterIndex_(networkAdapterIndex_t networkAdapterIndex) +nwpluginID_t getNWPluginID_from_NetworkDriverIndex_(networkDriverIndex_t networkDriverIndex) { - if (networkAdapterIndex < NetworkAdapterIndex_to_NWPlugin_id_size) + if (networkDriverIndex < NetworkDriverIndex_to_NWPlugin_id_size) { - // return static_cast(NetworkAdapterIndex_to_NWPlugin_id[networkAdapterIndex]); - return static_cast(pgm_read_byte(NetworkAdapterIndex_to_NWPlugin_id + networkAdapterIndex)); + // return static_cast(NetworkDriverIndex_to_NWPlugin_id[networkDriverIndex]); + return static_cast(pgm_read_byte(NetworkDriverIndex_to_NWPlugin_id + networkDriverIndex.value)); } return INVALID_NW_PLUGIN_ID; } -bool validNetworkAdapterIndex_init(networkAdapterIndex_t networkAdapterIndex) +bool validNetworkDriverIndex_init(networkDriverIndex_t networkDriverIndex) { - return networkAdapterIndex < NetworkAdapterIndex_to_NWPlugin_id_size; + return networkDriverIndex < NetworkDriverIndex_to_NWPlugin_id_size; } nwpluginID_t getHighestIncludedNWPluginID() @@ -2122,14 +2122,14 @@ nwpluginID_t getHighestIncludedNWPluginID() } -bool NWPluginCall(networkAdapterIndex_t networkAdapterIndex, NWPlugin::Function Function, struct EventStruct *event, String& string) +bool NWPluginCall(networkDriverIndex_t networkDriverIndex, NWPlugin::Function Function, struct EventStruct *event, String& string) { - if (networkAdapterIndex < NetworkAdapterIndex_to_NWPlugin_id_size) + if (networkDriverIndex < NetworkDriverIndex_to_NWPlugin_id_size) { START_TIMER; - NWPlugin_ptr_t nwplugin_call = (NWPlugin_ptr_t)pgm_read_ptr(NWPlugin_ptr + networkAdapterIndex); + NWPlugin_ptr_t nwplugin_call = (NWPlugin_ptr_t)pgm_read_ptr(NWPlugin_ptr + networkDriverIndex.value); const bool res = nwplugin_call(Function, event, string); - STOP_TIMER_NETWORK(networkAdapterIndex, Function); + STOP_TIMER_NETWORK(networkDriverIndex, Function); return res; } return false; @@ -2141,21 +2141,22 @@ void NWPluginSetup() if (setupDone) { return; } - for (size_t id = 0; id < NWPlugin_id_to_NetworkAdapterIndex_size; ++id) + for (size_t id = 0; id < NWPlugin_id_to_NetworkDriverIndex_size; ++id) { - NWPlugin_id_to_NetworkAdapterIndex[id] = INVALID_NETWORKADAPTER_INDEX; + NWPlugin_id_to_NetworkDriverIndex[id] = INVALID_NETWORKDRIVER_INDEX; } - for (networkAdapterIndex_t networkAdapterIndex = 0; networkAdapterIndex < NetworkAdapterIndex_to_NWPlugin_id_size; ++networkAdapterIndex) + networkDriverIndex_t networkDriverIndex{}; + for (; networkDriverIndex < NetworkDriverIndex_to_NWPlugin_id_size; ++networkDriverIndex) { - const nwpluginID_t nwpluginID = getNWPluginID_from_NetworkAdapterIndex(networkAdapterIndex); + const nwpluginID_t nwpluginID = getNWPluginID_from_NetworkDriverIndex(networkDriverIndex); if (nwpluginID) { - NWPlugin_id_to_NetworkAdapterIndex[nwpluginID] = networkAdapterIndex; + NWPlugin_id_to_NetworkDriverIndex[nwpluginID] = networkDriverIndex; struct EventStruct TempEvent; - TempEvent.idx = networkAdapterIndex; + TempEvent.idx = networkDriverIndex.value; String dummy; - NWPluginCall(networkAdapterIndex, NWPlugin::Function::NWPLUGIN_ADAPTER_ADD, &TempEvent, dummy); + NWPluginCall(networkDriverIndex, NWPlugin::Function::NWPLUGIN_ADAPTER_ADD, &TempEvent, dummy); } } setupDone = true; diff --git a/src/src/Helpers/_NWPlugin_init.h b/src/src/Helpers/_NWPlugin_init.h index 0c6918843..b3545a0cb 100644 --- a/src/src/Helpers/_NWPlugin_init.h +++ b/src/src/Helpers/_NWPlugin_init.h @@ -6,20 +6,20 @@ #include "../DataTypes/ESPEasy_plugin_functions.h" #include "../DataTypes/NWPluginID.h" -#include "../DataTypes/NetworkAdapterIndex.h" -#include "../DataStructs/NetworkAdapterStruct.h" +#include "../DataTypes/NetworkDriverIndex.h" +#include "../DataStructs/NetworkDriverStruct.h" struct EventStruct; -networkAdapterIndex_t getNetworkAdapterIndex_from_NWPluginID_(nwpluginID_t pluginID); -nwpluginID_t getNWPluginID_from_NetworkAdapterIndex_(networkAdapterIndex_t networkAdapterIndex); -bool validNetworkAdapterIndex_init(networkAdapterIndex_t networkAdapterIndex); +networkDriverIndex_t getNetworkDriverIndex_from_NWPluginID_(nwpluginID_t pluginID); +nwpluginID_t getNWPluginID_from_NetworkDriverIndex_(networkDriverIndex_t networkDriverIndex); +bool validNetworkDriverIndex_init(networkDriverIndex_t networkDriverIndex); nwpluginID_t getHighestIncludedNWPluginID(); -NetworkAdapterStruct& getNetworkAdapterStruct(networkAdapterIndex_t networkAdapterIndex); +NetworkDriverStruct& getNetworkDriverStruct(networkDriverIndex_t networkDriverIndex); -bool NWPluginCall(networkAdapterIndex_t networkAdapterIndex, NWPlugin::Function Function, struct EventStruct *event, String& string); +bool NWPluginCall(networkDriverIndex_t networkDriverIndex, NWPlugin::Function Function, struct EventStruct *event, String& string); void NWPluginSetup(); diff --git a/src/src/WebServer/NetworkPage.cpp b/src/src/WebServer/NetworkPage.cpp index c32b74b71..ba1bce7f5 100644 --- a/src/src/WebServer/NetworkPage.cpp +++ b/src/src/WebServer/NetworkPage.cpp @@ -34,10 +34,10 @@ void handle_networks() boolean networkNotSet = networkindex == 0; --networkindex; // Index in URL is starting from 1, but starting from 0 in the array. - const int networkAdapter_webarg_value = getFormItemInt(F("networkAdapter"), -1); + const int networkDriver_webarg_value = getFormItemInt(F("networkDriver"), -1); // submitted data - if ((networkAdapter_webarg_value != -1) && !networkNotSet) + if ((networkDriver_webarg_value != -1) && !networkNotSet) { // TODO TD-er: Implement saving submitted settings @@ -124,10 +124,10 @@ void handle_networks_NetworkSettingsPage(networkIndex_t networkindex) html_TD(); addHtml(getNWPluginNameFromNWPluginID(Settings.getNWPluginID_for_network(x))); html_TD(); - const networkAdapterIndex_t NetworkAdapterIndex = getNetworkAdapterIndex_from_NetworkIndex(x); + const networkDriverIndex_t NetworkDriverIndex = getNetworkDriverIndex_from_NetworkIndex(x); { String hostDescription; - NWPluginCall(NetworkAdapterIndex, NWPlugin::Function::NWPLUGIN_WEBFORM_SHOW_HOST_CONFIG, 0, hostDescription); + NWPluginCall(NetworkDriverIndex, NWPlugin::Function::NWPLUGIN_WEBFORM_SHOW_HOST_CONFIG, 0, hostDescription); if (!hostDescription.isEmpty()) { addHtml(hostDescription); @@ -136,9 +136,9 @@ void handle_networks_NetworkSettingsPage(networkIndex_t networkindex) html_TD(); /* - const NetworkAdapterStruct& adapter = getNetworkAdapterStruct(NetworkAdapterIndex); + const NetworkDriverStruct& adapter = getNetworkDriverStruct(NetworkDriverIndex); - if ((INVALID_NETWORKADAPTER_INDEX == NetworkAdapterIndex) || adapter.usesPort) { + if ((INVALID_NETWORKDRIVER_INDEX == NetworkDriverIndex) || adapter.usesPort) { addHtmlInt(13 == nwpluginID ? Settings.UDPPort : NetworkSettings->Port); // P2P/C013 exception } */ From b7163df50b58ab53105ff09a12a033f39314482a Mon Sep 17 00:00:00 2001 From: TD-er Date: Sun, 6 Jul 2025 22:12:18 +0200 Subject: [PATCH 090/564] [Network] Start on initial first WiFi STA/AP drivers --- src/_NW001_WiFi_STA.cpp | 197 +++++++++++++++++++ src/_NW002_WiFi_AP.cpp | 73 +++++++ src/src/CustomBuild/define_plugin_sets.h | 16 ++ src/src/DataTypes/ESPEasy_plugin_functions.h | 4 +- src/src/Globals/NWPlugins.cpp | 8 +- src/src/Helpers/_NWPlugin_init.cpp | 4 +- src/src/Helpers/_NWPlugin_init.h | 1 - src/src/WebServer/NetworkPage.cpp | 154 ++++++++------- 8 files changed, 383 insertions(+), 74 deletions(-) create mode 100644 src/_NW001_WiFi_STA.cpp create mode 100644 src/_NW002_WiFi_AP.cpp diff --git a/src/_NW001_WiFi_STA.cpp b/src/_NW001_WiFi_STA.cpp new file mode 100644 index 000000000..9fec7e660 --- /dev/null +++ b/src/_NW001_WiFi_STA.cpp @@ -0,0 +1,197 @@ +#include "ESPEasy_common.h" + +#ifdef USES_NW001 + +// ####################################################################################################### +// ########################### Network Plugin 001: WiFi Station ########################################## +// ####################################################################################################### + +# define NWPLUGIN_001 +# define NWPLUGIN_ID_001 1 +# define NWPLUGIN_NAME_001 "WiFi Station" + +# include "src/DataStructs/ESPEasy_EventStruct.h" +# include "src/Globals/NWPlugins.h" +# include "src/Helpers/ESPEasy_Storage.h" +# include "src/Helpers/_NWPlugin_init.h" + +# include "src/Globals/SecuritySettings.h" +# include "src/WebServer/common.h" +# include "src/Helpers/StringConverter.h" +# include "src/WebServer/ESPEasy_WebServer.h" +# include "src/Globals/Settings.h" +# include "src/WebServer/Markup_Forms.h" +# include "src/WebServer/Markup.h" +# include "src/ESPEasyCore/ESPEasyWifi_abstracted.h" + +bool NWPlugin_001(NWPlugin::Function function, struct EventStruct *event, String& string) +{ + bool success = false; + + switch (function) + { + case NWPlugin::Function::NWPLUGIN_DRIVER_ADD: + { + NetworkDriverStruct& nw = getNetworkDriverStruct(networkDriverIndex_t::toNetworkDriverIndex(event->idx)); + break; + } + + case NWPlugin::Function::NWPLUGIN_GET_DEVICENAME: + { + string = F(NWPLUGIN_NAME_001); + break; + } + + case NWPlugin::Function::NWPLUGIN_WEBFORM_SAVE: + { + // SSID 1 + safe_strncpy(SecuritySettings.WifiSSID, webArg(F("ssid")).c_str(), sizeof(SecuritySettings.WifiSSID)); + copyFormPassword(F("key"), SecuritySettings.WifiKey, sizeof(SecuritySettings.WifiKey)); + + // SSID 2 + strncpy_webserver_arg(SecuritySettings.WifiSSID2, F("ssid2")); + copyFormPassword(F("key2"), SecuritySettings.WifiKey2, sizeof(SecuritySettings.WifiKey2)); + + // Hidden SSID + Settings.IncludeHiddenSSID(isFormItemChecked(LabelType::CONNECT_HIDDEN_SSID)); + Settings.HiddenSSID_SlowConnectPerBSSID(isFormItemChecked(LabelType::HIDDEN_SSID_SLOW_CONNECT)); + +# ifdef ESP32 + Settings.PassiveWiFiScan(isFormItemChecked(LabelType::WIFI_PASSIVE_SCAN)); +# endif + + webArg2ip(F("espip"), Settings.IP); + webArg2ip(F("espgateway"), Settings.Gateway); + webArg2ip(F("espsubnet"), Settings.Subnet); + webArg2ip(F("espdns"), Settings.DNS); + + + Settings.ForceWiFi_bg_mode(isFormItemChecked(LabelType::FORCE_WIFI_BG)); + Settings.WiFiRestart_connection_lost(isFormItemChecked(LabelType::RESTART_WIFI_LOST_CONN)); + + Settings.WifiNoneSleep(isFormItemChecked(LabelType::FORCE_WIFI_NOSLEEP)); +# ifdef SUPPORT_ARP + Settings.gratuitousARP(isFormItemChecked(LabelType::PERIODICAL_GRAT_ARP)); +# endif // ifdef SUPPORT_ARP +# if FEATURE_SET_WIFI_TX_PWR + Settings.setWiFi_TX_power(getFormItemFloat(LabelType::WIFI_TX_MAX_PWR)); + Settings.WiFi_sensitivity_margin = getFormItemInt(LabelType::WIFI_SENS_MARGIN); + Settings.UseMaxTXpowerForSending(isFormItemChecked(LabelType::WIFI_SEND_AT_MAX_TX_PWR)); +# endif // if FEATURE_SET_WIFI_TX_PWR + Settings.NumberExtraWiFiScans = getFormItemInt(LabelType::WIFI_NR_EXTRA_SCANS); + Settings.UseLastWiFiFromRTC(isFormItemChecked(LabelType::WIFI_USE_LAST_CONN_FROM_RTC)); + +# ifndef ESP32 + Settings.WaitWiFiConnect(isFormItemChecked(LabelType::WAIT_WIFI_CONNECT)); +# endif + Settings.HiddenSSID_SlowConnectPerBSSID(isFormItemChecked(LabelType::HIDDEN_SSID_SLOW_CONNECT)); + Settings.SDK_WiFi_autoreconnect(isFormItemChecked(LabelType::SDK_WIFI_AUTORECONNECT)); +# ifdef ESP32 + Settings.PassiveWiFiScan(isFormItemChecked(LabelType::WIFI_PASSIVE_SCAN)); +# endif +# if CONFIG_SOC_WIFI_SUPPORT_5G + Settings.WiFi_band_mode(static_cast(getFormItemInt(getInternalLabel(LabelType::WIFI_BAND_MODE)))); +# endif +# if FEATURE_USE_IPV6 + Settings.EnableIPv6(isFormItemChecked(LabelType::ENABLE_IPV6)); +# endif + + + break; + } + + case NWPlugin::Function::NWPLUGIN_WEBFORM_LOAD: + { + addFormSubHeader(F("Wifi Settings")); + + addFormTextBox(getLabel(LabelType::SSID), F("ssid"), SecuritySettings.WifiSSID, 31); + addFormPasswordBox(F("WPA Key"), F("key"), SecuritySettings.WifiKey, 63); + addFormTextBox(F("Fallback SSID"), F("ssid2"), SecuritySettings.WifiSSID2, 31); + addFormPasswordBox(F("Fallback WPA Key"), F("key2"), SecuritySettings.WifiKey2, 63); + addFormNote(F("WPA Key must be at least 8 characters long")); + + addFormCheckBox(LabelType::CONNECT_HIDDEN_SSID, Settings.IncludeHiddenSSID()); + +# ifdef ESP32 + addFormCheckBox(LabelType::WIFI_PASSIVE_SCAN, Settings.PassiveWiFiScan()); +# endif + + addFormCheckBox(LabelType::HIDDEN_SSID_SLOW_CONNECT, Settings.HiddenSSID_SlowConnectPerBSSID()); + + addFormSubHeader(F("WiFi IP Settings")); + + addFormIPBox(F("ESP WiFi IP"), F("espip"), Settings.IP); + addFormIPBox(F("ESP WiFi Gateway"), F("espgateway"), Settings.Gateway); + addFormIPBox(F("ESP WiFi Subnetmask"), F("espsubnet"), Settings.Subnet); + addFormIPBox(F("ESP WiFi DNS"), F("espdns"), Settings.DNS); + addFormNote(F("Leave empty for DHCP")); + + addFormSubHeader(F("WiFi Tweaks")); + + addFormCheckBox(LabelType::FORCE_WIFI_BG, Settings.ForceWiFi_bg_mode()); + + addFormCheckBox(LabelType::RESTART_WIFI_LOST_CONN, Settings.WiFiRestart_connection_lost()); + addFormCheckBox(LabelType::FORCE_WIFI_NOSLEEP, Settings.WifiNoneSleep()); + +# ifdef SUPPORT_ARP + addFormCheckBox(LabelType::PERIODICAL_GRAT_ARP, Settings.gratuitousARP()); +# endif // ifdef SUPPORT_ARP + +# if FEATURE_SET_WIFI_TX_PWR + addFormFloatNumberBox(LabelType::WIFI_TX_MAX_PWR, Settings.getWiFi_TX_power(), 0.0f, MAX_TX_PWR_DBM_11b, 2, 0.25f); + addFormNumericBox(LabelType::WIFI_SENS_MARGIN, Settings.WiFi_sensitivity_margin, -20, 30); + addFormCheckBox(LabelType::WIFI_SEND_AT_MAX_TX_PWR, Settings.UseMaxTXpowerForSending()); +# endif // if FEATURE_SET_WIFI_TX_PWR + addFormNumericBox(LabelType::WIFI_NR_EXTRA_SCANS, Settings.NumberExtraWiFiScans, 0, 5); + addFormCheckBox(LabelType::WIFI_USE_LAST_CONN_FROM_RTC, Settings.UseLastWiFiFromRTC()); + +# ifndef ESP32 + addFormCheckBox(LabelType::WAIT_WIFI_CONNECT, Settings.WaitWiFiConnect()); +# endif + addFormCheckBox(LabelType::SDK_WIFI_AUTORECONNECT, Settings.SDK_WiFi_autoreconnect()); + addFormCheckBox(LabelType::HIDDEN_SSID_SLOW_CONNECT, Settings.HiddenSSID_SlowConnectPerBSSID()); +# ifdef ESP32 + addFormCheckBox(LabelType::WIFI_PASSIVE_SCAN, Settings.PassiveWiFiScan()); +# endif +# if CONFIG_SOC_WIFI_SUPPORT_5G + { + const __FlashStringHelper *wifiModeNames[] = { + ESPEasy::net::wifi::getWifiBandModeString(WIFI_BAND_MODE_2G_ONLY), + ESPEasy::net::wifi::getWifiBandModeString(WIFI_BAND_MODE_5G_ONLY), + ESPEasy::net::wifi::getWifiBandModeString(WIFI_BAND_MODE_AUTO), + }; + const int wifiModeOptions[] = { WIFI_BAND_MODE_2G_ONLY, WIFI_BAND_MODE_5G_ONLY, WIFI_BAND_MODE_AUTO }; + constexpr int nrWifiModeOptions = NR_ELEMENTS(wifiModeNames); + const FormSelectorOptions selector( + nrWifiModeOptions, + wifiModeNames, + wifiModeOptions); + selector.addFormSelector( + getLabel(LabelType::WIFI_BAND_MODE), + getInternalLabel(LabelType::WIFI_BAND_MODE), + Settings.WiFi_band_mode()); + } +# endif // if CONFIG_SOC_WIFI_SUPPORT_5G + +# if FEATURE_USE_IPV6 + addFormCheckBox(LabelType::ENABLE_IPV6, Settings.EnableIPv6()); +# endif + + + break; + } + + case NWPlugin::Function::NWPLUGIN_INIT: + { + break; + } + + + default: + break; + + } + return success; +} + +#endif // ifdef USES_NW001 diff --git a/src/_NW002_WiFi_AP.cpp b/src/_NW002_WiFi_AP.cpp new file mode 100644 index 000000000..d6fb54215 --- /dev/null +++ b/src/_NW002_WiFi_AP.cpp @@ -0,0 +1,73 @@ +#include "ESPEasy_common.h" + +#ifdef USES_NW002 + +// ####################################################################################################### +// ########################### Network Plugin 002: WiFi Access Point ##################################### +// ####################################################################################################### + +# define NWPLUGIN_002 +# define NWPLUGIN_ID_002 2 +# define NWPLUGIN_NAME_002 "WiFi AP" + +# include "src/DataStructs/ESPEasy_EventStruct.h" +# include "src/Globals/NWPlugins.h" +# include "src/Helpers/ESPEasy_Storage.h" +# include "src/Helpers/_NWPlugin_init.h" + +# include "src/Globals/SecuritySettings.h" +# include "src/WebServer/common.h" +# include "src/Helpers/StringConverter.h" +# include "src/WebServer/ESPEasy_WebServer.h" +# include "src/Globals/Settings.h" +# include "src/WebServer/Markup_Forms.h" +# include "src/WebServer/Markup.h" +# include "src/ESPEasyCore/ESPEasyWifi_abstracted.h" + +bool NWPlugin_002(NWPlugin::Function function, struct EventStruct *event, String& string) +{ + bool success = false; + + switch (function) + { + case NWPlugin::Function::NWPLUGIN_DRIVER_ADD: + { + NetworkDriverStruct& nw = getNetworkDriverStruct(networkDriverIndex_t::toNetworkDriverIndex(event->idx)); + break; + } + + case NWPlugin::Function::NWPLUGIN_GET_DEVICENAME: + { + string = F(NWPLUGIN_NAME_002); + break; + } + + case NWPlugin::Function::NWPLUGIN_WEBFORM_SAVE: + { + + + + break; + } + + case NWPlugin::Function::NWPLUGIN_WEBFORM_LOAD: + { + + + break; + } + + case NWPlugin::Function::NWPLUGIN_INIT: + { + break; + } + + + default: + break; + + } + return success; +} + +#endif // ifdef USES_NW002 diff --git a/src/src/CustomBuild/define_plugin_sets.h b/src/src/CustomBuild/define_plugin_sets.h index f5536e1fb..40b88d535 100644 --- a/src/src/CustomBuild/define_plugin_sets.h +++ b/src/src/CustomBuild/define_plugin_sets.h @@ -3815,4 +3815,20 @@ To create/register a plugin, you have to : #endif +#if FEATURE_WIFI + #ifndef USES_NW001 + #define USES_NW001 + #endif + #ifndef USES_NW002 + #define USES_NW002 + #endif +#else + #ifdef USES_NW001 + #undef USES_NW001 + #endif + #ifdef USES_NW002 + #undef USES_NW002 + #endif +#endif + #endif // CUSTOMBUILD_DEFINE_PLUGIN_SETS_H \ No newline at end of file diff --git a/src/src/DataTypes/ESPEasy_plugin_functions.h b/src/src/DataTypes/ESPEasy_plugin_functions.h index 74c2dd2a9..875226849 100644 --- a/src/src/DataTypes/ESPEasy_plugin_functions.h +++ b/src/src/DataTypes/ESPEasy_plugin_functions.h @@ -128,10 +128,10 @@ public: // As these function values are also used in the timing stats, make sure there is no overlap with the PLUGIN_xxx numbering. enum class Function { - NWPLUGIN_ADAPTER_ADD = 192, // Called at boot for letting a network adapter adding itself to list of available controllers + NWPLUGIN_DRIVER_ADD = 192, // Called at boot for letting a network adapter adding itself to list of available controllers NWPLUGIN_CONNECT_SUCCESS, // Only used for timing stats NWPLUGIN_CONNECT_FAIL, // Only used for timing stats - NWPLUGIN_ADAPTER_TEMPLATE, + NWPLUGIN_DRIVER_TEMPLATE, NWPLUGIN_GET_DEVICENAME, NWPLUGIN_WEBFORM_SAVE, NWPLUGIN_WEBFORM_LOAD, diff --git a/src/src/Globals/NWPlugins.cpp b/src/src/Globals/NWPlugins.cpp index a7bf67a9d..9dece1888 100644 --- a/src/src/Globals/NWPlugins.cpp +++ b/src/src/Globals/NWPlugins.cpp @@ -33,7 +33,7 @@ bool NWPluginCall(NWPlugin::Function Function, struct EventStruct *event, String switch (Function) { - case NWPlugin::Function::NWPLUGIN_ADAPTER_ADD: + case NWPlugin::Function::NWPLUGIN_DRIVER_ADD: // only called from NWPluginSetup() directly using networkDriverIndex break; @@ -87,12 +87,14 @@ networkDriverIndex_t getNetworkDriverIndex_from_NWPluginID(nwpluginID_t nwplugin return getNetworkDriverIndex_from_NWPluginID_(nwpluginID); } -nwpluginID_t getNWPluginID_from_NetworkDriverIndex(networkDriverIndex_t index) { return getNWPluginID_from_NetworkDriverIndex(index); } +nwpluginID_t getNWPluginID_from_NetworkDriverIndex(networkDriverIndex_t index) { + return getNWPluginID_from_NetworkDriverIndex_(index); +} nwpluginID_t getNWPluginID_from_NetworkIndex(networkIndex_t index) { const networkDriverIndex_t networkDriverIndex = getNetworkDriverIndex_from_NetworkIndex(index); - return getNWPluginID_from_NetworkDriverIndex(networkDriverIndex); + return getNWPluginID_from_NetworkDriverIndex_(networkDriverIndex); } String getNWPluginNameFromNetworkDriverIndex(networkDriverIndex_t NetworkDriverIndex) { diff --git a/src/src/Helpers/_NWPlugin_init.cpp b/src/src/Helpers/_NWPlugin_init.cpp index 0841615f2..16d9c14e3 100644 --- a/src/src/Helpers/_NWPlugin_init.cpp +++ b/src/src/Helpers/_NWPlugin_init.cpp @@ -15,7 +15,7 @@ // and initialize the function call pointer into the NWPlugin array // ******************************************************************************** -constexpr nwpluginID_t NetworkDriverIndex_to_NWPlugin_id[] PROGMEM = +constexpr /*nwpluginID_t*/ uint8_t NetworkDriverIndex_to_NWPlugin_id[] PROGMEM = { #ifdef USES_NW001 1, @@ -2156,7 +2156,7 @@ void NWPluginSetup() struct EventStruct TempEvent; TempEvent.idx = networkDriverIndex.value; String dummy; - NWPluginCall(networkDriverIndex, NWPlugin::Function::NWPLUGIN_ADAPTER_ADD, &TempEvent, dummy); + NWPluginCall(networkDriverIndex, NWPlugin::Function::NWPLUGIN_DRIVER_ADD, &TempEvent, dummy); } } setupDone = true; diff --git a/src/src/Helpers/_NWPlugin_init.h b/src/src/Helpers/_NWPlugin_init.h index b3545a0cb..39aa9df75 100644 --- a/src/src/Helpers/_NWPlugin_init.h +++ b/src/src/Helpers/_NWPlugin_init.h @@ -35,7 +35,6 @@ void NWPluginInit(); // Uncrustify must not be used on macros, but we're now done, so turn Uncrustify on again. // *INDENT-ON* - #ifdef USES_NW001 ADDNWPLUGIN_H(001) #endif diff --git a/src/src/WebServer/NetworkPage.cpp b/src/src/WebServer/NetworkPage.cpp index ba1bce7f5..6c5e876c5 100644 --- a/src/src/WebServer/NetworkPage.cpp +++ b/src/src/WebServer/NetworkPage.cpp @@ -17,7 +17,6 @@ # include "../Helpers/StringConverter.h" # include "../Helpers/ESPEasy_Storage.h" - void handle_networks() { # ifndef BUILD_NO_RAM_TRACKER @@ -52,106 +51,129 @@ void handle_networks() } else { - //handle_networks_NetworkSettingsPage(networkindex); + handle_networks_NetworkSettingsPage(networkindex); } sendHeadandTail_stdtemplate(_TAIL); TXBuffer.endStream(); } +/* + void handle_networks_clearLoadDefaults(uint8_t networkindex, NetworkSettingsStruct& NetworkSettings) + {} + */ /* -void handle_networks_clearLoadDefaults(uint8_t networkindex, NetworkSettingsStruct& NetworkSettings) -{} -*/ - -/* -void handle_networks_CopySubmittedSettings(uint8_t networkindex, NetworkSettingsStruct& NetworkSettings) -{} -*/ - -void handle_networks_CopySubmittedSettings_NWPluginCall(uint8_t networkindex) -{} + void handle_networks_CopySubmittedSettings(uint8_t networkindex, NetworkSettingsStruct& NetworkSettings) + {} + */ +void handle_networks_CopySubmittedSettings_NWPluginCall(uint8_t networkindex) {} void handle_networks_ShowAllNetworksTable() -{} - - -void handle_networks_NetworkSettingsPage(networkIndex_t networkindex) { - html_table_class_multirow(); + html_table_class_multirow(); html_TR(); - html_table_header(F(""), 70); - html_table_header(F("Nr"), 50); - html_table_header(F("Order"), 50); - html_table_header(F("Enabled"), 100); + html_table_header(F(""), 70); + html_table_header(F("Nr"), 50); + html_table_header(F("Order"), 50); + html_table_header(F("Enabled"), 100); html_table_header(F("Connected"), 100); html_table_header(F("Network Adapter")); html_table_header(F("MAC")); html_table_header(F("IP")); html_table_header(F("Port")); - for (networkIndex_t x = 0; x < NETWORK_MAX; x++) + for (networkIndex_t x = 0; x < NETWORK_MAX; x++) + { + const nwpluginID_t nwpluginID = Settings.getNWPluginID_for_network(x); + const bool nwplugin_set = nwpluginID.isValid(); + + html_TR_TD(); + + if (nwplugin_set && !supportedNWPluginID(nwpluginID)) { + html_add_button_prefix(F("red"), true); + } else { + html_add_button_prefix(); + } { - const nwpluginID_t nwpluginID = Settings.getNWPluginID_for_network(x); - const bool nwplugin_set = nwpluginID.isValid(); + addHtml(F("network?index=")); + addHtmlInt(x + 1); + addHtml(F("'>")); - html_TR_TD(); - - if (nwplugin_set && !supportedNWPluginID(nwpluginID)) { - html_add_button_prefix(F("red"), true); + if (nwplugin_set) { + addHtml(F("Edit")); } else { - html_add_button_prefix(); + addHtml(F("Add")); } - { - addHtml(F("network?index=")); - addHtmlInt(x + 1); - addHtml(F("'>")); + addHtml(F("")); + } + html_TD(); - if (nwplugin_set) { - addHtml(F("Edit")); - } else { - addHtml(F("Add")); + if (nwplugin_set) + { + addEnabled(Settings.getNetworkEnabled(x)); + + html_TD(); + addHtml(getNWPluginNameFromNWPluginID(Settings.getNWPluginID_for_network(x))); + html_TD(); + const networkDriverIndex_t NetworkDriverIndex = getNetworkDriverIndex_from_NetworkIndex(x); + { + String hostDescription; + NWPluginCall(NetworkDriverIndex, NWPlugin::Function::NWPLUGIN_WEBFORM_SHOW_HOST_CONFIG, 0, hostDescription); + + if (!hostDescription.isEmpty()) { + addHtml(hostDescription); } - addHtml(F("")); } + html_TD(); - if (nwplugin_set) - { - addEnabled(Settings.getNetworkEnabled(x)); + /* + const NetworkDriverStruct& adapter = getNetworkDriverStruct(NetworkDriverIndex); - html_TD(); - addHtml(getNWPluginNameFromNWPluginID(Settings.getNWPluginID_for_network(x))); - html_TD(); - const networkDriverIndex_t NetworkDriverIndex = getNetworkDriverIndex_from_NetworkIndex(x); - { - String hostDescription; - NWPluginCall(NetworkDriverIndex, NWPlugin::Function::NWPLUGIN_WEBFORM_SHOW_HOST_CONFIG, 0, hostDescription); + if ((INVALID_NETWORKDRIVER_INDEX == NetworkDriverIndex) || adapter.usesPort) { + addHtmlInt(13 == nwpluginID ? Settings.UDPPort : NetworkSettings->Port); // P2P/C013 exception + } + */ + } + else { + html_TD(3); + } + html_TD(3); - if (!hostDescription.isEmpty()) { - addHtml(hostDescription); - } - } - - html_TD(); - /* - const NetworkDriverStruct& adapter = getNetworkDriverStruct(NetworkDriverIndex); - - if ((INVALID_NETWORKDRIVER_INDEX == NetworkDriverIndex) || adapter.usesPort) { - addHtmlInt(13 == nwpluginID ? Settings.UDPPort : NetworkSettings->Port); // P2P/C013 exception - } - */ - } - else { - html_TD(3); - } } html_end_table(); html_end_form(); } +void handle_networks_NetworkSettingsPage(networkIndex_t networkindex) { + if (!validNetworkIndex(networkindex)) { return; } + // Show network settings page + html_table_class_normal(); + addFormHeader(F("Network Settings")); + addRowLabel(F("Network Driver")); + uint8_t choice = Settings.getNWPluginID_for_network(networkindex); + + addSelector_Head_reloadOnChange(F("networkDriver")); + addSelector_Item(F("- Standalone -"), 0, false, false, EMPTY_STRING); + + networkDriverIndex_t networkDriverIndex{}; + + while (validNetworkDriverIndex(networkDriverIndex)) + { + const nwpluginID_t number = getNWPluginID_from_NetworkDriverIndex(networkDriverIndex); + boolean disabled = false; // !((networkindex == 0) || !NetworkDriver[x].usesMQTT); + addSelector_Item(getNWPluginNameFromNetworkDriverIndex(networkDriverIndex), + number, + choice == number, + disabled); + ++networkDriverIndex; + } + addSelector_Foot(true); + + +} #endif // ifdef WEBSERVER_NETWORK From e36a9563e8639857d90d96d00d0ba9442c96a717 Mon Sep 17 00:00:00 2001 From: TD-er Date: Mon, 7 Jul 2025 13:46:13 +0200 Subject: [PATCH 091/564] [Network] Add webform load/save for WiFi STA and AP --- src/_NW001_WiFi_STA.cpp | 61 +++--- src/_NW002_WiFi_AP.cpp | 20 ++ src/src/DataStructs/ESPEasy_EventStruct.h | 2 + src/src/DataStructs/NetworkSettingsStruct.cpp | 37 ++++ src/src/DataStructs/NetworkSettingsStruct.h | 65 ++++++ src/src/DataTypes/ESPEasy_plugin_functions.h | 2 +- src/src/DataTypes/NWPluginID.h | 5 + src/src/DataTypes/PluginID.h | 5 + src/src/ESPEasyCore/ESPEasy_setup.cpp | 6 + src/src/Globals/NWPlugins.cpp | 52 ++++- src/src/Helpers/_NWPlugin_Helper_webform.cpp | 202 ++++++++++++++++++ src/src/Helpers/_NWPlugin_Helper_webform.h | 36 ++++ src/src/Helpers/_NWPlugin_init.cpp | 18 +- src/src/WebServer/Markup.cpp | 8 + src/src/WebServer/Markup.h | 2 + src/src/WebServer/NetworkPage.cpp | 167 ++++++++++++--- src/src/WebServer/NetworkPage.h | 14 +- 17 files changed, 626 insertions(+), 76 deletions(-) create mode 100644 src/src/DataStructs/NetworkSettingsStruct.cpp create mode 100644 src/src/DataStructs/NetworkSettingsStruct.h create mode 100644 src/src/Helpers/_NWPlugin_Helper_webform.cpp create mode 100644 src/src/Helpers/_NWPlugin_Helper_webform.h diff --git a/src/_NW001_WiFi_STA.cpp b/src/_NW001_WiFi_STA.cpp index 9fec7e660..6bf696df6 100644 --- a/src/_NW001_WiFi_STA.cpp +++ b/src/_NW001_WiFi_STA.cpp @@ -126,33 +126,13 @@ bool NWPlugin_001(NWPlugin::Function function, struct EventStruct *event, String addFormIPBox(F("ESP WiFi DNS"), F("espdns"), Settings.DNS); addFormNote(F("Leave empty for DHCP")); - addFormSubHeader(F("WiFi Tweaks")); - - addFormCheckBox(LabelType::FORCE_WIFI_BG, Settings.ForceWiFi_bg_mode()); - - addFormCheckBox(LabelType::RESTART_WIFI_LOST_CONN, Settings.WiFiRestart_connection_lost()); - addFormCheckBox(LabelType::FORCE_WIFI_NOSLEEP, Settings.WifiNoneSleep()); - -# ifdef SUPPORT_ARP - addFormCheckBox(LabelType::PERIODICAL_GRAT_ARP, Settings.gratuitousARP()); -# endif // ifdef SUPPORT_ARP - -# if FEATURE_SET_WIFI_TX_PWR - addFormFloatNumberBox(LabelType::WIFI_TX_MAX_PWR, Settings.getWiFi_TX_power(), 0.0f, MAX_TX_PWR_DBM_11b, 2, 0.25f); - addFormNumericBox(LabelType::WIFI_SENS_MARGIN, Settings.WiFi_sensitivity_margin, -20, 30); - addFormCheckBox(LabelType::WIFI_SEND_AT_MAX_TX_PWR, Settings.UseMaxTXpowerForSending()); -# endif // if FEATURE_SET_WIFI_TX_PWR - addFormNumericBox(LabelType::WIFI_NR_EXTRA_SCANS, Settings.NumberExtraWiFiScans, 0, 5); - addFormCheckBox(LabelType::WIFI_USE_LAST_CONN_FROM_RTC, Settings.UseLastWiFiFromRTC()); - -# ifndef ESP32 - addFormCheckBox(LabelType::WAIT_WIFI_CONNECT, Settings.WaitWiFiConnect()); -# endif - addFormCheckBox(LabelType::SDK_WIFI_AUTORECONNECT, Settings.SDK_WiFi_autoreconnect()); - addFormCheckBox(LabelType::HIDDEN_SSID_SLOW_CONNECT, Settings.HiddenSSID_SlowConnectPerBSSID()); -# ifdef ESP32 - addFormCheckBox(LabelType::WIFI_PASSIVE_SCAN, Settings.PassiveWiFiScan()); +# if FEATURE_USE_IPV6 + addFormCheckBox(LabelType::ENABLE_IPV6, Settings.EnableIPv6()); # endif + + + addFormSubHeader(F("WiFi Mode")); + addFormCheckBox(LabelType::FORCE_WIFI_BG, Settings.ForceWiFi_bg_mode()); # if CONFIG_SOC_WIFI_SUPPORT_5G { const __FlashStringHelper *wifiModeNames[] = { @@ -173,9 +153,34 @@ bool NWPlugin_001(NWPlugin::Function function, struct EventStruct *event, String } # endif // if CONFIG_SOC_WIFI_SUPPORT_5G -# if FEATURE_USE_IPV6 - addFormCheckBox(LabelType::ENABLE_IPV6, Settings.EnableIPv6()); + + addFormSubHeader(F("WiFi Power")); + addFormCheckBox(LabelType::FORCE_WIFI_NOSLEEP, Settings.WifiNoneSleep()); +# if FEATURE_SET_WIFI_TX_PWR + addFormFloatNumberBox(LabelType::WIFI_TX_MAX_PWR, Settings.getWiFi_TX_power(), 0.0f, MAX_TX_PWR_DBM_11b, 2, 0.25f); + addFormNumericBox(LabelType::WIFI_SENS_MARGIN, Settings.WiFi_sensitivity_margin, -20, 30); + addFormCheckBox(LabelType::WIFI_SEND_AT_MAX_TX_PWR, Settings.UseMaxTXpowerForSending()); +# endif // if FEATURE_SET_WIFI_TX_PWR + + addFormSubHeader(F("WiFi Tweaks")); + + addFormCheckBox(LabelType::RESTART_WIFI_LOST_CONN, Settings.WiFiRestart_connection_lost()); + + addFormNumericBox(LabelType::WIFI_NR_EXTRA_SCANS, Settings.NumberExtraWiFiScans, 0, 5); + addFormCheckBox(LabelType::WIFI_USE_LAST_CONN_FROM_RTC, Settings.UseLastWiFiFromRTC()); + +# ifndef ESP32 + addFormCheckBox(LabelType::WAIT_WIFI_CONNECT, Settings.WaitWiFiConnect()); # endif + addFormCheckBox(LabelType::SDK_WIFI_AUTORECONNECT, Settings.SDK_WiFi_autoreconnect()); + addFormCheckBox(LabelType::HIDDEN_SSID_SLOW_CONNECT, Settings.HiddenSSID_SlowConnectPerBSSID()); +# ifdef ESP32 + addFormCheckBox(LabelType::WIFI_PASSIVE_SCAN, Settings.PassiveWiFiScan()); +# endif + +# ifdef SUPPORT_ARP + addFormCheckBox(LabelType::PERIODICAL_GRAT_ARP, Settings.gratuitousARP()); +# endif // ifdef SUPPORT_ARP break; diff --git a/src/_NW002_WiFi_AP.cpp b/src/_NW002_WiFi_AP.cpp index d6fb54215..6ed0c3c1e 100644 --- a/src/_NW002_WiFi_AP.cpp +++ b/src/_NW002_WiFi_AP.cpp @@ -45,6 +45,14 @@ bool NWPlugin_002(NWPlugin::Function function, struct EventStruct *event, String case NWPlugin::Function::NWPLUGIN_WEBFORM_SAVE: { + // Access point password. + copyFormPassword(F("apkey"), SecuritySettings.WifiAPKey, sizeof(SecuritySettings.WifiAPKey)); + + // When set you can use the Sensor in AP-Mode without being forced to /setup + Settings.ApDontForceSetup(isFormItemChecked(F("ApDontForceSetup"))); + + // Usually the AP will be started when no WiFi is defined, or the defined one cannot be found. This flag may prevent it. + Settings.DoNotStartAP(isFormItemChecked(F("DoNotStartAP"))); break; @@ -52,6 +60,18 @@ bool NWPlugin_002(NWPlugin::Function function, struct EventStruct *event, String case NWPlugin::Function::NWPLUGIN_WEBFORM_LOAD: { + addFormPasswordBox(F("WPA AP Mode Key"), F("apkey"), SecuritySettings.WifiAPKey, 63); + addFormNote(F("WPA Key must be at least 8 characters long")); + + addFormCheckBox(F("Don't force /setup in AP-Mode"), F("ApDontForceSetup"), Settings.ApDontForceSetup()); + addFormNote(F("When set you can use the Sensor in AP-Mode without being forced to /setup. /setup can still be called.")); + + addFormCheckBox(F("Do Not Start AP"), F("DoNotStartAP"), Settings.DoNotStartAP()); + # if FEATURE_ETHERNET + addFormNote(F("Do not allow to start an AP when unable to connect to configured LAN/WiFi")); + # else // if FEATURE_ETHERNET + addFormNote(F("Do not allow to start an AP when configured WiFi cannot be found")); + # endif // if FEATURE_ETHERNET break; diff --git a/src/src/DataStructs/ESPEasy_EventStruct.h b/src/src/DataStructs/ESPEasy_EventStruct.h index 93a19e7f3..08cd19d45 100644 --- a/src/src/DataStructs/ESPEasy_EventStruct.h +++ b/src/src/DataStructs/ESPEasy_EventStruct.h @@ -7,6 +7,7 @@ #include "../DataTypes/EventValueSource.h" #include "../DataTypes/TaskIndex.h" #include "../DataTypes/NotifierIndex.h" +#include "../DataTypes/NetworkIndex.h" #include "../DataStructs/DeviceStruct.h" @@ -78,6 +79,7 @@ public: #if FEATURE_NOTIFIER notifierIndex_t NotificationIndex = INVALID_NOTIFIER_INDEX; // index position in Settings.Notification, 0-3 #endif + networkIndex_t NetworkIndex = INVALID_NETWORK_INDEX; // index position in Settings.NWPluginID, 0-7 uint8_t BaseVarIndex = 0; Sensor_VType sensorType = Sensor_VType::SENSOR_TYPE_NOT_SET; uint8_t OriginTaskIndex = 0; diff --git a/src/src/DataStructs/NetworkSettingsStruct.cpp b/src/src/DataStructs/NetworkSettingsStruct.cpp new file mode 100644 index 000000000..6ea3c8d0f --- /dev/null +++ b/src/src/DataStructs/NetworkSettingsStruct.cpp @@ -0,0 +1,37 @@ +#include "../DataStructs/NetworkSettingsStruct.h" + +#include "../../ESPEasy_common.h" + +#include "../CustomBuild/ESPEasyLimits.h" +#include "../ESPEasyCore/ESPEasy_Log.h" +#include "../ESPEasyCore/ESPEasyNetwork.h" +#include "../Helpers/Misc.h" +#include "../Helpers/Networking.h" +#include "../Helpers/StringConverter.h" + + +#include +#include +#include +#include + + +NetworkSettingsStruct::NetworkSettingsStruct() +{ + memset(this, 0, sizeof(NetworkSettingsStruct)); +} + +void NetworkSettingsStruct::reset() { + // Need to make sure every byte between the members is also zero + // Otherwise the checksum will fail and settings will be saved too often. + memset(this, 0, sizeof(NetworkSettingsStruct)); + + +} + + +void NetworkSettingsStruct::validate() { + + +} + diff --git a/src/src/DataStructs/NetworkSettingsStruct.h b/src/src/DataStructs/NetworkSettingsStruct.h new file mode 100644 index 000000000..f3bb432cb --- /dev/null +++ b/src/src/DataStructs/NetworkSettingsStruct.h @@ -0,0 +1,65 @@ +#ifndef DATASTRUCTS_NETWORKSETTINGSSTRUCT_H +#define DATASTRUCTS_NETWORKSETTINGSSTRUCT_H + +/*********************************************************************************************\ +* NetworkSettingsStruct definition +\*********************************************************************************************/ +#include "../../ESPEasy_common.h" + +#include // For std::shared_ptr +#include // for std::nothrow + +#include "../Globals/Plugins.h" + +struct NetworkSettingsStruct +{ + // ******************************************************************************** + // IDs of network settings, used to generate web forms + // ******************************************************************************** + enum VarType { + NETWORK_IP, + NETWORK_PORT, + NETWORK_USER, + NETWORK_PASS, + NETWORK_TIMEOUT, + + + // Keep this as last, is used to loop over all parameters + NETWORK_ENABLED + + }; + + + NetworkSettingsStruct(); + + void reset(); + + void validate(); + + + uint8_t IP[4]; + unsigned int Port; + unsigned int ClientTimeout; + +private: + +}; + +#include "../Helpers/Memory.h" + +typedef std::shared_ptr NetworkSettingsStruct_ptr_type; + +/* + # ifdef USE_SECOND_HEAP + #define MakeNetworkSettings(T) HeapSelectIram ephemeral; NetworkSettingsStruct_ptr_type T(new (std::nothrow) NetworkSettingsStruct()); + #else + */ +#define MakeNetworkSettings(T) void *calloc_ptr = special_calloc(1, sizeof(NetworkSettingsStruct)); \ + NetworkSettingsStruct_ptr_type T(new (calloc_ptr) NetworkSettingsStruct()); + +// #endif + +// Check to see if MakeNetworkSettings was successful +#define AllocatedNetworkSettings() (NetworkSettings.get() != nullptr) + +#endif // DATASTRUCTS_NETWORKSETTINGSSTRUCT_H diff --git a/src/src/DataTypes/ESPEasy_plugin_functions.h b/src/src/DataTypes/ESPEasy_plugin_functions.h index 875226849..4953b05e2 100644 --- a/src/src/DataTypes/ESPEasy_plugin_functions.h +++ b/src/src/DataTypes/ESPEasy_plugin_functions.h @@ -135,7 +135,7 @@ public: NWPLUGIN_GET_DEVICENAME, NWPLUGIN_WEBFORM_SAVE, NWPLUGIN_WEBFORM_LOAD, - NWPLUGIN_GET_ADAPTER_DISPLAY_NAME, + NWPLUGIN_GET_PARAMETER_DISPLAY_NAME, NWPLUGIN_INIT, NWPLUGIN_TEN_PER_SECOND, // Called 10x per second (typical for checking new data instead of waiting) NWPLUGIN_FIFTY_PER_SECOND, // Called 50x per second (typical for checking new data instead of waiting) diff --git a/src/src/DataTypes/NWPluginID.h b/src/src/DataTypes/NWPluginID.h index 736f34a5e..97f4d0e17 100644 --- a/src/src/DataTypes/NWPluginID.h +++ b/src/src/DataTypes/NWPluginID.h @@ -28,6 +28,11 @@ struct __attribute__((__packed__)) nwpluginID_t { return value != 0; } + operator int() const + { + return value; + } + operator bool() const { return isValid(); diff --git a/src/src/DataTypes/PluginID.h b/src/src/DataTypes/PluginID.h index 443258bcf..5d5447ebc 100644 --- a/src/src/DataTypes/PluginID.h +++ b/src/src/DataTypes/PluginID.h @@ -23,6 +23,11 @@ struct __attribute__((__packed__)) pluginID_t { return res; } + operator int() const + { + return value; + } + operator bool() const { return value != 0; diff --git a/src/src/ESPEasyCore/ESPEasy_setup.cpp b/src/src/ESPEasyCore/ESPEasy_setup.cpp index 6ddafc386..8514cc02f 100644 --- a/src/src/ESPEasyCore/ESPEasy_setup.cpp +++ b/src/src/ESPEasyCore/ESPEasy_setup.cpp @@ -22,6 +22,7 @@ #include "../Globals/Statistics.h" #include "../Globals/WiFi_AP_Candidates.h" #include "../Helpers/_CPlugin_init.h" +#include "../Helpers/_NWPlugin_init.h" #include "../Helpers/_NPlugin_init.h" #include "../Helpers/_Plugin_init.h" #include "../Helpers/DeepSleep.h" @@ -226,6 +227,7 @@ void ESPEasy_setup() PluginSetup(); CPluginSetup(); + NWPluginSetup(); initWiFi(); WiFiEventData.clearAll(); @@ -532,6 +534,10 @@ void ESPEasy_setup() #ifndef BUILD_NO_RAM_TRACKER logMemUsageAfter(F("CPluginInit()")); #endif // ifndef BUILD_NO_RAM_TRACKER + NWPluginInit(); + #ifndef BUILD_NO_RAM_TRACKER + logMemUsageAfter(F("NWPluginInit()")); + #endif // ifndef BUILD_NO_RAM_TRACKER #if FEATURE_NOTIFIER NPluginInit(); # ifndef BUILD_NO_RAM_TRACKER diff --git a/src/src/Globals/NWPlugins.cpp b/src/src/Globals/NWPlugins.cpp index 9dece1888..52524e812 100644 --- a/src/src/Globals/NWPlugins.cpp +++ b/src/src/Globals/NWPlugins.cpp @@ -49,8 +49,56 @@ bool NWPluginCall(NWPlugin::Function Function, struct EventStruct *event, String Function = NWPlugin::Function::NWPLUGIN_INIT; } - // TODO TD-er: Implement + for (networkIndex_t x = 0; x < CONTROLLER_MAX; x++) { + if (Settings.getNWPluginID_for_network(x) && Settings.getNetworkEnabled(x)) { + event->NetworkIndex = x; + String command; + if (Function == NWPlugin::Function::NWPLUGIN_WRITE) { + command = str; + } + + if (NWPluginCall( + getNetworkDriverIndex_from_NetworkIndex(x), + Function, + event, + command)) { + if (Function == NWPlugin::Function::NWPLUGIN_WRITE) { + // Need to stop when write call was handled + return true; + } + } + } + } + break; + } + // calls to specific network + case NWPlugin::Function::NWPLUGIN_INIT: + case NWPlugin::Function::NWPLUGIN_EXIT: + case NWPlugin::Function::NWPLUGIN_GET_DEVICENAME: + case NWPlugin::Function::NWPLUGIN_WEBFORM_LOAD: + case NWPlugin::Function::NWPLUGIN_WEBFORM_SAVE: + case NWPlugin::Function::NWPLUGIN_WEBFORM_SHOW_HOST_CONFIG: + { + const networkIndex_t networkIndex = event->NetworkIndex; + bool success = false; + + if (validNetworkIndex(networkIndex)) { + if (Settings.getNetworkEnabled(networkIndex) && supportedNWPluginID(Settings.getNWPluginID_for_network(networkIndex))) + { + success = NWPluginCall( + getNetworkDriverIndex_from_NetworkIndex(networkIndex), + Function, + event, + str); + } + #ifdef ESP32 + + if (Function == NWPlugin::Function::NWPLUGIN_EXIT) { +// Cache.clearNetworkSettings(networkIndex); + } + #endif // ifdef ESP32 + } return success; } @@ -110,7 +158,7 @@ String getNWPluginNameFromNWPluginID(nwpluginID_t nwpluginID) { networkDriverIndex_t networkDriverIndex = getNetworkDriverIndex_from_NWPluginID(nwpluginID); if (!validNetworkDriverIndex(networkDriverIndex)) { - return strformat(F("NWPlugin %d not included in build"), nwpluginID); + return strformat(F("NWPlugin %d not included in build"), nwpluginID.value); } return getNWPluginNameFromNetworkDriverIndex(networkDriverIndex); } diff --git a/src/src/Helpers/_NWPlugin_Helper_webform.cpp b/src/src/Helpers/_NWPlugin_Helper_webform.cpp new file mode 100644 index 000000000..7c3f57968 --- /dev/null +++ b/src/src/Helpers/_NWPlugin_Helper_webform.cpp @@ -0,0 +1,202 @@ +#include "../Helpers/_NWPlugin_Helper_webform.h" + +#include "../../ESPEasy_common.h" + +#include "../DataStructs/ESPEasy_EventStruct.h" +#include "../DataTypes/ESPEasy_plugin_functions.h" +#include "../Globals/NWPlugins.h" +#include "../Globals/SecuritySettings.h" +#include "../Globals/Settings.h" +#include "../Helpers/Networking.h" +#include "../WebServer/ESPEasy_WebServer.h" +#include "../WebServer/Markup.h" +#include "../WebServer/Markup_Forms.h" + +/*********************************************************************************************\ +* Functions to load and store network settings on the web page. +\*********************************************************************************************/ +const __FlashStringHelper* toString(NetworkSettingsStruct::VarType parameterIdx, bool displayName) +{ + switch (parameterIdx) + { + case NetworkSettingsStruct::NETWORK_IP: return F("Network IP"); + case NetworkSettingsStruct::NETWORK_PORT: return F("Network Port"); + case NetworkSettingsStruct::NETWORK_USER: return F("Network User"); + case NetworkSettingsStruct::NETWORK_PASS: return F("Network Password"); + case NetworkSettingsStruct::NETWORK_ENABLED: + + if (displayName) { return F("Enabled"); } + else { return F("networkenabled"); } + + + default: + return F("Undefined"); + } +} + +String getNetworkParameterName(networkDriverIndex_t NetworkDriverIndex, + NetworkSettingsStruct::VarType parameterIdx, + bool displayName, + bool & isAlternative) { + String name; + + if (displayName) { + EventStruct tmpEvent; + tmpEvent.idx = parameterIdx; + + if (NWPluginCall(NetworkDriverIndex, NWPlugin::Function::NWPLUGIN_GET_PARAMETER_DISPLAY_NAME, &tmpEvent, name)) { + // Found an alternative name for it. + isAlternative = true; + return name; + } + } + isAlternative = false; + + name = toString(parameterIdx, displayName); + + if (!displayName) { + // Change name to lower case and remove spaces to make it an internal name. + name.toLowerCase(); + removeChar(name, ' '); + } + return name; +} + +String getNetworkParameterInternalName(networkDriverIndex_t NetworkDriverIndex, NetworkSettingsStruct::VarType parameterIdx) { + bool isAlternative; // Dummy, not needed for internal name + bool displayName = false; + + return getNetworkParameterName(NetworkDriverIndex, parameterIdx, displayName, isAlternative); +} + +String getNetworkParameterDisplayName(networkDriverIndex_t NetworkDriverIndex, + NetworkSettingsStruct::VarType parameterIdx, + bool & isAlternative) { + bool displayName = true; + + return getNetworkParameterName(NetworkDriverIndex, parameterIdx, displayName, isAlternative); +} + +void addNetworkEnabledForm(networkIndex_t networkindex) { + networkDriverIndex_t NetworkDriverIndex = getNetworkDriverIndex_from_NetworkIndex(networkindex); + + if (!validNetworkDriverIndex(NetworkDriverIndex)) { + return; + } + + NetworkSettingsStruct::VarType varType = NetworkSettingsStruct::NETWORK_ENABLED; + + bool isAlternativeDisplayName = false; + const String displayName = getNetworkParameterDisplayName(NetworkDriverIndex, varType, isAlternativeDisplayName); + const String internalName = getNetworkParameterInternalName(NetworkDriverIndex, varType); + addFormCheckBox(displayName, internalName, Settings.getNetworkEnabled(networkindex)); +} + +void addNetworkParameterForm(const NetworkSettingsStruct & NetworkSettings, + networkIndex_t networkindex, + NetworkSettingsStruct::VarType varType) { + networkDriverIndex_t NetworkDriverIndex = getNetworkDriverIndex_from_NetworkIndex(networkindex); + + if (!validNetworkDriverIndex(NetworkDriverIndex)) { + return; + } + + bool isAlternativeDisplayName = false; + const String displayName = getNetworkParameterDisplayName(NetworkDriverIndex, varType, isAlternativeDisplayName); + const String internalName = getNetworkParameterInternalName(NetworkDriverIndex, varType); + + switch (varType) + { + case NetworkSettingsStruct::NETWORK_IP: + { + addFormIPBox(displayName, internalName, NetworkSettings.IP); + break; + } + case NetworkSettingsStruct::NETWORK_PORT: + { + addFormNumericBox(displayName, internalName, NetworkSettings.Port, 1, 65535); + break; + } + + case NetworkSettingsStruct::NETWORK_USER: + { + /* + const size_t fieldMaxLength = + NetworkSettings.useExtendedCredentials() ? EXT_SECURITY_MAX_USER_LENGTH : sizeof(SecuritySettings.NetworkUser[0]) - 1; + addFormTextBox(displayName, + internalName, + getNetworkUser(networkindex, NetworkSettings, false), + fieldMaxLength); + */ + break; + } + case NetworkSettingsStruct::NETWORK_PASS: + { + /* + const size_t fieldMaxLength = + NetworkSettings.useExtendedCredentials() ? EXT_SECURITY_MAX_PASS_LENGTH : sizeof(SecuritySettings.NetworkPassword[0]) - 1; + + if (isAlternativeDisplayName) { + // It is not a regular password, thus use normal text field. + addFormTextBox(displayName, internalName, + getNetworkPass(networkindex, NetworkSettings), + fieldMaxLength); + } else { + addFormPasswordBox(displayName, internalName, + getNetworkPass(networkindex, NetworkSettings), + fieldMaxLength); + } + */ + break; + } + + case NetworkSettingsStruct::NETWORK_ENABLED: + addFormCheckBox(displayName, internalName, Settings.getNetworkEnabled(networkindex)); + break; + } +} + +void saveNetworkParameterForm(NetworkSettingsStruct & NetworkSettings, + networkIndex_t networkindex, + NetworkSettingsStruct::VarType varType) { + const networkDriverIndex_t NetworkDriverIndex = + getNetworkDriverIndex_from_NetworkIndex(networkindex); + + if (!validNetworkDriverIndex(NetworkDriverIndex)) { + return; + } + const String internalName = getNetworkParameterInternalName(NetworkDriverIndex, varType); + + switch (varType) + { + + case NetworkSettingsStruct::NETWORK_IP: + /* + if (!NetworkSettings.UseDNS) + { + str2ip(webArg(internalName), NetworkSettings.IP); + } + */ + break; + case NetworkSettingsStruct::NETWORK_PORT: + NetworkSettings.Port = getFormItemInt(internalName, NetworkSettings.Port); + break; + + case NetworkSettingsStruct::NETWORK_USER: + // setNetworkUser(networkindex, NetworkSettings, webArg(internalName)); + break; + case NetworkSettingsStruct::NETWORK_PASS: + { + String password; + + if (getFormPassword(internalName, password)) { + // setNetworkPass(networkindex, NetworkSettings, password); + } + break; + } + + case NetworkSettingsStruct::NETWORK_ENABLED: + Settings.setNetworkEnabled(networkindex, isFormItemChecked(internalName)); + break; + } +} diff --git a/src/src/Helpers/_NWPlugin_Helper_webform.h b/src/src/Helpers/_NWPlugin_Helper_webform.h new file mode 100644 index 000000000..9cf4ee6a7 --- /dev/null +++ b/src/src/Helpers/_NWPlugin_Helper_webform.h @@ -0,0 +1,36 @@ +#ifndef HELPERS__NWPLUGIN_HELPER_WEBFORM_H +#define HELPERS__NWPLUGIN_HELPER_WEBFORM_H + +#include "../../ESPEasy_common.h" + +#include "../DataStructs/NetworkSettingsStruct.h" +#include "../Globals/NWPlugins.h" + + +/*********************************************************************************************\ +* Functions to load and store network settings on the web page. +\*********************************************************************************************/ +String getNetworkParameterName(networkDriverIndex_t NetworkDriverIndex, + NetworkSettingsStruct::VarType parameterIdx, + bool displayName, + bool & isAlternative); + +String getNetworkParameterInternalName(networkDriverIndex_t NetworkDriverIndex, + NetworkSettingsStruct::VarType parameterIdx); + +String getNetworkParameterDisplayName(networkDriverIndex_t NetworkDriverIndex, + NetworkSettingsStruct::VarType parameterIdx, + bool & isAlternative); + +void addNetworkEnabledForm(networkIndex_t networkindex); + +void addNetworkParameterForm(const NetworkSettingsStruct & NetworkSettings, + networkIndex_t networkindex, + NetworkSettingsStruct::VarType varType); + +void saveNetworkParameterForm(NetworkSettingsStruct & NetworkSettings, + networkIndex_t networkindex, + NetworkSettingsStruct::VarType varType); + + +#endif // ifndef HELPERS__NWPLUGIN_HELPER_WEBFORM_H diff --git a/src/src/Helpers/_NWPlugin_init.cpp b/src/src/Helpers/_NWPlugin_init.cpp index 16d9c14e3..47e4a4cc8 100644 --- a/src/src/Helpers/_NWPlugin_init.cpp +++ b/src/src/Helpers/_NWPlugin_init.cpp @@ -2094,37 +2094,37 @@ NetworkDriverStruct& getNetworkDriverStruct(networkDriverIndex_t networkDriverIn networkDriverIndex_t getNetworkDriverIndex_from_NWPluginID_(nwpluginID_t nwpluginID) { - if (nwpluginID < NWPlugin_id_to_NetworkDriverIndex_size) + if (nwpluginID.value < NWPlugin_id_to_NetworkDriverIndex_size) { - return static_cast(NWPlugin_id_to_NetworkDriverIndex[nwpluginID]); + return static_cast(NWPlugin_id_to_NetworkDriverIndex[nwpluginID.value]); } return INVALID_NETWORKDRIVER_INDEX; } nwpluginID_t getNWPluginID_from_NetworkDriverIndex_(networkDriverIndex_t networkDriverIndex) { - if (networkDriverIndex < NetworkDriverIndex_to_NWPlugin_id_size) + if (networkDriverIndex.value < NetworkDriverIndex_to_NWPlugin_id_size) { // return static_cast(NetworkDriverIndex_to_NWPlugin_id[networkDriverIndex]); - return static_cast(pgm_read_byte(NetworkDriverIndex_to_NWPlugin_id + networkDriverIndex.value)); + return nwpluginID_t::toPluginID(pgm_read_byte(NetworkDriverIndex_to_NWPlugin_id + networkDriverIndex.value)); } return INVALID_NW_PLUGIN_ID; } bool validNetworkDriverIndex_init(networkDriverIndex_t networkDriverIndex) { - return networkDriverIndex < NetworkDriverIndex_to_NWPlugin_id_size; + return networkDriverIndex.value < NetworkDriverIndex_to_NWPlugin_id_size; } nwpluginID_t getHighestIncludedNWPluginID() { - return nwpluginID_t(Highest_NWPlugin_id); + return nwpluginID_t::toPluginID(Highest_NWPlugin_id); } bool NWPluginCall(networkDriverIndex_t networkDriverIndex, NWPlugin::Function Function, struct EventStruct *event, String& string) { - if (networkDriverIndex < NetworkDriverIndex_to_NWPlugin_id_size) + if (networkDriverIndex.value < NetworkDriverIndex_to_NWPlugin_id_size) { START_TIMER; NWPlugin_ptr_t nwplugin_call = (NWPlugin_ptr_t)pgm_read_ptr(NWPlugin_ptr + networkDriverIndex.value); @@ -2147,12 +2147,12 @@ void NWPluginSetup() } networkDriverIndex_t networkDriverIndex{}; - for (; networkDriverIndex < NetworkDriverIndex_to_NWPlugin_id_size; ++networkDriverIndex) + for (; networkDriverIndex.value < NetworkDriverIndex_to_NWPlugin_id_size; ++networkDriverIndex) { const nwpluginID_t nwpluginID = getNWPluginID_from_NetworkDriverIndex(networkDriverIndex); if (nwpluginID) { - NWPlugin_id_to_NetworkDriverIndex[nwpluginID] = networkDriverIndex; + NWPlugin_id_to_NetworkDriverIndex[nwpluginID.value] = networkDriverIndex; struct EventStruct TempEvent; TempEvent.idx = networkDriverIndex.value; String dummy; diff --git a/src/src/WebServer/Markup.cpp b/src/src/WebServer/Markup.cpp index c7b785448..8cd777af0 100644 --- a/src/src/WebServer/Markup.cpp +++ b/src/src/WebServer/Markup.cpp @@ -1004,6 +1004,14 @@ void addRTDControllerButton(cpluginID_t cpluginID) { F("Controller/%s.html"), get_formatted_Controller_number(cpluginID).c_str())); } + +void addRTDNetworkDriverButton(nwpluginID_t nwpluginID) +{ + addRTDHelpButton( + strformat( + F("NetworkDriver/%s.html"), + nwpluginID.toDisplayString().c_str())); +} # endif // ifndef LIMIT_BUILD_SIZE String makeDocLink(const String& url, bool isRTD) { diff --git a/src/src/WebServer/Markup.h b/src/src/WebServer/Markup.h index d638308e7..08d544876 100644 --- a/src/src/WebServer/Markup.h +++ b/src/src/WebServer/Markup.h @@ -4,6 +4,7 @@ #include "../WebServer/common.h" #include "../DataTypes/ProtocolIndex.h" #include "../DataTypes/CPluginID.h" +#include "../DataTypes/NWPluginID.h" #include "../DataTypes/PluginID.h" #include "../Globals/Plugins.h" #include "../Helpers/StringGenerator_GPIO.h" @@ -299,6 +300,7 @@ void addHelpButton(const String& url, void addRTDPluginButton(pluginID_t pluginID); #ifndef LIMIT_BUILD_SIZE void addRTDControllerButton(cpluginID_t cpluginID); +void addRTDNetworkDriverButton(nwpluginID_t nwpluginID); #endif // ifndef LIMIT_BUILD_SIZE String makeDocLink(const String& url, diff --git a/src/src/WebServer/NetworkPage.cpp b/src/src/WebServer/NetworkPage.cpp index 6c5e876c5..f23a91469 100644 --- a/src/src/WebServer/NetworkPage.cpp +++ b/src/src/WebServer/NetworkPage.cpp @@ -7,6 +7,7 @@ # include "../WebServer/Markup.h" # include "../WebServer/Markup_Buttons.h" # include "../WebServer/Markup_Forms.h" +# include "../Helpers/_NWPlugin_Helper_webform.h" # include "../DataStructs/ESPEasy_EventStruct.h" # include "../Globals/NWPlugins.h" @@ -38,8 +39,61 @@ void handle_networks() // submitted data if ((networkDriver_webarg_value != -1) && !networkNotSet) { - // TODO TD-er: Implement saving submitted settings + bool mustInit = false; + bool mustCallNWpluginSave = false; + // TODO TD-er: Implement saving submitted settings + const nwpluginID_t nwpluginID = nwpluginID_t::toPluginID(networkDriver_webarg_value); + + if (Settings.getNWPluginID_for_network(networkindex) != nwpluginID) + { + // NetworkDriver has changed. + Settings.setNWPluginID_for_network(networkindex, nwpluginID); + + // there is a networkDriverIndex selected? + if (nwpluginID.isValid()) + { + mustInit = true; + + // handle_networks_clearLoadDefaults(networkindex, *NetworkSettings); + } + } + + // subitted same networkDriverIndex + else + { + // there is a networkDriverIndex selected + if (nwpluginID.isValid()) + { + mustInit = true; + + // handle_networks_CopySubmittedSettings(networkindex, *NetworkSettings); + mustCallNWpluginSave = true; + } + } + + if (mustCallNWpluginSave) { + // Call NWPLUGIN_WEBFORM_SAVE after destructing NetworkSettings object to reduce RAM usage. + // Network plugin almost only deals with custom network settings. + // Even if they need to save things to the NetworkSettings, then the changes must + // already be saved first as the NWPluginCall does not have the NetworkSettings as argument. + handle_networks_CopySubmittedSettings_NWPluginCall(networkindex); + } + addHtmlError(SaveSettings()); + + if (mustInit) { + // Init network plugin using the new settings. + networkDriverIndex_t NetworkDriverIndex = getNetworkDriverIndex_from_NWPluginID(nwpluginID); + + if (validNetworkDriverIndex(NetworkDriverIndex)) { + struct EventStruct TempEvent; + TempEvent.NetworkIndex = networkindex; + String dummy; + NWPlugin::Function cfunction = + Settings.getNetworkEnabled(networkindex) ? NWPlugin::Function::NWPLUGIN_INIT : NWPlugin::Function::NWPLUGIN_EXIT; + NWPluginCall(NetworkDriverIndex, cfunction, &TempEvent, dummy); + } + } } @@ -58,16 +112,31 @@ void handle_networks() TXBuffer.endStream(); } -/* - void handle_networks_clearLoadDefaults(uint8_t networkindex, NetworkSettingsStruct& NetworkSettings) - {} - */ +void handle_networks_clearLoadDefaults(networkIndex_t networkindex, NetworkSettingsStruct& NetworkSettings) {} -/* - void handle_networks_CopySubmittedSettings(uint8_t networkindex, NetworkSettingsStruct& NetworkSettings) - {} - */ -void handle_networks_CopySubmittedSettings_NWPluginCall(uint8_t networkindex) {} +void handle_networks_CopySubmittedSettings(networkIndex_t networkindex, NetworkSettingsStruct& NetworkSettings) +{ + // copy all settings to network settings struct + for (int parameterIdx = 0; parameterIdx <= NetworkSettingsStruct::NETWORK_ENABLED; ++parameterIdx) { + NetworkSettingsStruct::VarType varType = static_cast(parameterIdx); + saveNetworkParameterForm(NetworkSettings, networkindex, varType); + } + +} + +void handle_networks_CopySubmittedSettings_NWPluginCall(networkIndex_t networkindex) { + networkDriverIndex_t NetworkDriverIndex = getNetworkDriverIndex_from_NetworkIndex(networkindex); + + if (validNetworkDriverIndex(NetworkDriverIndex)) { + struct EventStruct TempEvent; + TempEvent.NetworkIndex = networkindex; + + // Call network plugin to save CustomNetworkSettings + String dummy; + NWPluginCall(NetworkDriverIndex, NWPlugin::Function::NWPLUGIN_WEBFORM_SAVE, &TempEvent, dummy); + } + +} void handle_networks_ShowAllNetworksTable() { @@ -151,28 +220,66 @@ void handle_networks_NetworkSettingsPage(networkIndex_t networkindex) { if (!validNetworkIndex(networkindex)) { return; } // Show network settings page - html_table_class_normal(); - addFormHeader(F("Network Settings")); - addRowLabel(F("Network Driver")); - uint8_t choice = Settings.getNWPluginID_for_network(networkindex); - - addSelector_Head_reloadOnChange(F("networkDriver")); - addSelector_Item(F("- Standalone -"), 0, false, false, EMPTY_STRING); - - networkDriverIndex_t networkDriverIndex{}; - - while (validNetworkDriverIndex(networkDriverIndex)) { - const nwpluginID_t number = getNWPluginID_from_NetworkDriverIndex(networkDriverIndex); - boolean disabled = false; // !((networkindex == 0) || !NetworkDriver[x].usesMQTT); - addSelector_Item(getNWPluginNameFromNetworkDriverIndex(networkDriverIndex), - number, - choice == number, - disabled); - ++networkDriverIndex; - } - addSelector_Foot(true); + html_table_class_normal(); + addFormHeader(F("Network Settings")); + addRowLabel(F("Network Driver")); + const nwpluginID_t choice = Settings.getNWPluginID_for_network(networkindex); + addSelector_Head_reloadOnChange(F("networkDriver")); + addSelector_Item(F("- Standalone -"), 0, false, false, EMPTY_STRING); + + networkDriverIndex_t networkDriverIndex{}; + + while (validNetworkDriverIndex(networkDriverIndex)) + { + const nwpluginID_t number = getNWPluginID_from_NetworkDriverIndex(networkDriverIndex); + boolean disabled = false; // !((networkindex == 0) || !NetworkDriver[x].usesMQTT); + addSelector_Item(getNWPluginNameFromNetworkDriverIndex(networkDriverIndex), + number.value, + choice == number, + disabled); + ++networkDriverIndex; + } + addSelector_Foot(true); + } + const networkDriverIndex_t networkDriverIndex = + getNetworkDriverIndex_from_NWPluginID( + Settings.getNWPluginID_for_network(networkindex)); + const NetworkDriverStruct& driver = getNetworkDriverStruct(networkDriverIndex); + + # ifndef LIMIT_BUILD_SIZE + addRTDNetworkDriverButton(getNWPluginID_from_NetworkDriverIndex(networkDriverIndex)); + # endif // ifndef LIMIT_BUILD_SIZE + + if (Settings.getNWPluginID_for_network(networkindex)) { + // TODO TD-er: Add driver specifics from NetworkDriverStruct + + // Load network specific settings + struct EventStruct TempEvent; + TempEvent.NetworkIndex = networkindex; + + String webformLoadString; + NWPluginCall(networkDriverIndex, NWPlugin::Function::NWPLUGIN_WEBFORM_LOAD, &TempEvent, webformLoadString); + + if (webformLoadString.length() > 0) { + addHtmlError(F("Bug in NWPlugin::Function::NWPLUGIN_WEBFORM_LOAD, should not append to string, use addHtml() instead")); + } + + addFormSeparator(2); + + // Separate enabled checkbox as it doesn't need to use the NetworkSettings. + // So NetworkSettings object can be destructed before network specific settings are loaded. + addNetworkEnabledForm(networkindex); + } + + addFormSeparator(2); + html_TR_TD(); + html_TD(); + addButton(F("network"), F("Close")); + addSubmitButton(); + html_end_table(); + html_end_form(); } diff --git a/src/src/WebServer/NetworkPage.h b/src/src/WebServer/NetworkPage.h index 9910687f4..16c5ac3e7 100644 --- a/src/src/WebServer/NetworkPage.h +++ b/src/src/WebServer/NetworkPage.h @@ -5,7 +5,9 @@ #ifdef WEBSERVER_NETWORK -#include "../DataTypes/NetworkIndex.h" +# include "../DataTypes/NetworkIndex.h" +# include "../DataStructs/NetworkSettingsStruct.h" + // ******************************************************************************** // Web Interface Network page @@ -16,14 +18,14 @@ void handle_networks(); // Selected network has changed. // Clear all Network settings and load some defaults // ******************************************************************************** -//void handle_networks_clearLoadDefaults(uint8_t networkindex, NetworkSettingsStruct& NetworkSettings); +void handle_networks_clearLoadDefaults(networkIndex_t networkindex, NetworkSettingsStruct& NetworkSettings); // ******************************************************************************** // Collect all submitted form data and store in the NetworkSettings // ******************************************************************************** -//void handle_networks_CopySubmittedSettings(uint8_t networkindex, NetworkSettingsStruct& NetworkSettings); +void handle_networks_CopySubmittedSettings(networkIndex_t networkindex, NetworkSettingsStruct& NetworkSettings); -void handle_networks_CopySubmittedSettings_CPluginCall(uint8_t networkindex); +void handle_networks_CopySubmittedSettings_NWPluginCall(networkIndex_t networkindex); // ******************************************************************************** // Show table with all selected networks @@ -36,5 +38,5 @@ void handle_networks_ShowAllNetworksTable(); void handle_networks_NetworkSettingsPage(networkIndex_t networkindex); -#endif -#endif +#endif // ifdef WEBSERVER_NETWORK +#endif // ifndef WEBSERVER_WEBSERVER_NETWORKPAGE_H From 58beac2708d1f2e5d5f463aebb238a3c03e81b8a Mon Sep 17 00:00:00 2001 From: TD-er Date: Mon, 7 Jul 2025 23:32:54 +0200 Subject: [PATCH 092/564] [Network] Fix looping over CONTROLLER_MAX instead of NETWORK_MAX --- src/src/Globals/NWPlugins.cpp | 15 +++++++-------- 1 file changed, 7 insertions(+), 8 deletions(-) diff --git a/src/src/Globals/NWPlugins.cpp b/src/src/Globals/NWPlugins.cpp index 52524e812..adf1bdf11 100644 --- a/src/src/Globals/NWPlugins.cpp +++ b/src/src/Globals/NWPlugins.cpp @@ -49,7 +49,7 @@ bool NWPluginCall(NWPlugin::Function Function, struct EventStruct *event, String Function = NWPlugin::Function::NWPLUGIN_INIT; } - for (networkIndex_t x = 0; x < CONTROLLER_MAX; x++) { + for (networkIndex_t x = 0; x < NETWORK_MAX; x++) { if (Settings.getNWPluginID_for_network(x) && Settings.getNetworkEnabled(x)) { event->NetworkIndex = x; String command; @@ -72,6 +72,7 @@ bool NWPluginCall(NWPlugin::Function Function, struct EventStruct *event, String } break; } + // calls to specific network case NWPlugin::Function::NWPLUGIN_INIT: case NWPlugin::Function::NWPLUGIN_EXIT: @@ -81,7 +82,7 @@ bool NWPluginCall(NWPlugin::Function Function, struct EventStruct *event, String case NWPlugin::Function::NWPLUGIN_WEBFORM_SHOW_HOST_CONFIG: { const networkIndex_t networkIndex = event->NetworkIndex; - bool success = false; + bool success = false; if (validNetworkIndex(networkIndex)) { if (Settings.getNetworkEnabled(networkIndex) && supportedNWPluginID(Settings.getNWPluginID_for_network(networkIndex))) @@ -95,7 +96,7 @@ bool NWPluginCall(NWPlugin::Function Function, struct EventStruct *event, String #ifdef ESP32 if (Function == NWPlugin::Function::NWPLUGIN_EXIT) { -// Cache.clearNetworkSettings(networkIndex); + // Cache.clearNetworkSettings(networkIndex); } #endif // ifdef ESP32 } @@ -114,12 +115,12 @@ bool validNetworkDriverIndex(networkDriverIndex_t index) { return validNetworkDr return index < NETWORK_MAX; } */ -bool validNWPluginID(nwpluginID_t nwpluginID) { +bool validNWPluginID(nwpluginID_t nwpluginID) { return getNetworkDriverIndex_from_NWPluginID_(nwpluginID) != INVALID_NETWORKDRIVER_INDEX; } -bool supportedNWPluginID(nwpluginID_t nwpluginID) { +bool supportedNWPluginID(nwpluginID_t nwpluginID) { return validNetworkDriverIndex( getNetworkDriverIndex_from_NWPluginID_(nwpluginID)); } @@ -135,9 +136,7 @@ networkDriverIndex_t getNetworkDriverIndex_from_NWPluginID(nwpluginID_t nwplugin return getNetworkDriverIndex_from_NWPluginID_(nwpluginID); } -nwpluginID_t getNWPluginID_from_NetworkDriverIndex(networkDriverIndex_t index) { - return getNWPluginID_from_NetworkDriverIndex_(index); -} +nwpluginID_t getNWPluginID_from_NetworkDriverIndex(networkDriverIndex_t index) { return getNWPluginID_from_NetworkDriverIndex_(index); } nwpluginID_t getNWPluginID_from_NetworkIndex(networkIndex_t index) { const networkDriverIndex_t networkDriverIndex = getNetworkDriverIndex_from_NetworkIndex(index); From 7152862e715d6f2250ab9f03616bef93c690a682 Mon Sep 17 00:00:00 2001 From: TD-er Date: Tue, 8 Jul 2025 01:00:41 +0200 Subject: [PATCH 093/564] [ESP32P4] Add preliminary support for ESP32P4 --- boards/esp32p4_ev.json | 37 +++++++++++++++++++ docs/source/ESPEasy/ESPchips.rst | 2 + lib/GPIO_DirectAccess/GPIO_Direct_Access.h | 23 ++++++------ .../src/internal/NeoEspBitBangMethod.cpp | 4 +- platformio.ini | 1 + platformio_core_defs.ini | 3 +- platformio_esp32p4_envs.ini | 29 +++++++++++++++ src/_P097_Esp32Touch.ino | 2 +- src/include/ESPEasy_config.h | 2 +- src/include/esp32x_fixes.h | 4 ++ src/src/CustomBuild/define_plugin_sets.h | 18 +++++---- src/src/DataStructs_templ/SettingsStruct.cpp | 16 ++++++++ src/src/DataTypes/SPI_options.cpp | 2 + .../ESPEasyWiFi_state_machine_ESP32.cpp | 2 + src/src/ESPEasyCore/ESPEasyWifi.cpp | 11 +++++- .../ESPEasyWifi_abstracted_ESP32.cpp | 32 +++++++++++++++- src/src/ESPEasyCore/ESPEasy_setup.cpp | 2 +- src/src/Helpers/ESPEasy_Storage.cpp | 11 +++++- src/src/Helpers/Hardware.cpp | 23 ++++++++++++ src/src/Helpers/Hardware_defines.h | 9 ++++- src/src/Helpers/Hardware_device_info.cpp | 16 +++++++- .../Helpers/Hardware_device_info_ESP32P4.cpp | 35 ++++++++++++++++++ .../Helpers/Hardware_temperature_sensor.cpp | 4 +- src/src/Helpers/StringGenerator_GPIO.cpp | 3 ++ src/src/Helpers/StringGenerator_System.cpp | 26 +++++++++++++ src/src/PluginStructs/P097_data_struct.h | 10 +++++ tools/pio/copy_files.py | 2 +- 27 files changed, 295 insertions(+), 34 deletions(-) create mode 100644 boards/esp32p4_ev.json create mode 100644 platformio_esp32p4_envs.ini diff --git a/boards/esp32p4_ev.json b/boards/esp32p4_ev.json new file mode 100644 index 000000000..eebf5e6ab --- /dev/null +++ b/boards/esp32p4_ev.json @@ -0,0 +1,37 @@ +{ + "build": { + "core": "esp32", + "extra_flags": [ + "-DARDUINO_TASMOTA -DESP32P4 -DBOARD_HAS_PSRAM -DARDUINO_USB_MODE=1 -DUSE_USB_CDC_CONSOLE -DARDUINO_USB_CDC_ON_BOOT=1" + ], + "f_cpu": "360000000L", + "f_flash": "80000000L", + "flash_mode": "qio", + "mcu": "esp32p4", + "variant": "esp32p4", + "partitions": "boards/partitions/esp32_partition_app4096k_spiffs8124k.csv" + }, + "connectivity": [ + "wifi", + "bluetooth", + "openthread", + "ethernet" + ], + "debug": { + "openocd_target": "esp32p4.cfg" + }, + "frameworks": [ + "arduino", + "espidf" + ], + "name": "Espressif ESP32-P4 Function EV Board 16M Flash, ESPEasy 4096k Code/OTA 8M FS", + "upload": { + "flash_size": "16MB", + "maximum_ram_size": 768000, + "maximum_size": 16777216, + "require_upload_port": true, + "speed": 1500000 + }, + "url": "https://docs.espressif.com/projects/esp-dev-kits/en/latest/esp32p4/esp32-p4-function-ev-board/index.html", + "vendor": "Espressif" +} \ No newline at end of file diff --git a/docs/source/ESPEasy/ESPchips.rst b/docs/source/ESPEasy/ESPchips.rst index f00d235c6..05a1f1043 100644 --- a/docs/source/ESPEasy/ESPchips.rst +++ b/docs/source/ESPEasy/ESPchips.rst @@ -596,6 +596,7 @@ Datasheets * `DS:ESP32-C5 `_ * `DS:ESP32-C6 `_ * `DS:ESP32-H2 `_ +* `DS:ESP32-P4 `_ Technical Reference Manuals @@ -610,6 +611,7 @@ Technical Reference Manuals * `TR:ESP32-C5 `_ * `TR:ESP32-C6 `_ * `TR:ESP32-H2 `_ +* `TR:ESP32-P4 `_ ESP8266/ESP8285 diff --git a/lib/GPIO_DirectAccess/GPIO_Direct_Access.h b/lib/GPIO_DirectAccess/GPIO_Direct_Access.h index 24d4457af..66dcb7001 100644 --- a/lib/GPIO_DirectAccess/GPIO_Direct_Access.h +++ b/lib/GPIO_DirectAccess/GPIO_Direct_Access.h @@ -139,6 +139,7 @@ void DIRECT_PINMODE_INPUT_ISR(IO_REG_TYPE pin); #include #include #include +#include #if ESP_IDF_VERSION >= ESP_IDF_VERSION_VAL(5, 5, 0) #include #endif @@ -154,15 +155,15 @@ IO_REG_TYPE directRead(IO_REG_TYPE pin) { #if CONFIG_IDF_TARGET_ESP32C2 || CONFIG_IDF_TARGET_ESP32C3 || CONFIG_IDF_TARGET_ESP32C5 return (GPIO.in.val >> pin) & 0x1; -#elif CONFIG_IDF_TARGET_ESP32C6 +#elif CONFIG_IDF_TARGET_ESP32C6 || CONFIG_IDF_TARGET_ESP32P4 if ( pin < 32 ) return (GPIO.in.val >> pin) & 0x1; - else if ( pin < 46 ) + else if ( pin < SOC_GPIO_PIN_COUNT ) return (GPIO.in1.val >> (pin - 32)) & 0x1; #else // plain ESP32 if ( pin < 32 ) return (GPIO.in >> pin) & 0x1; - else if ( pin < 46 ) + else if ( pin < SOC_GPIO_PIN_COUNT ) return (GPIO.in1.val >> (pin - 32)) & 0x1; #endif @@ -174,16 +175,16 @@ void directWriteLow(IO_REG_TYPE pin) { #if CONFIG_IDF_TARGET_ESP32C2 || CONFIG_IDF_TARGET_ESP32C3 || CONFIG_IDF_TARGET_ESP32C5 GPIO.out_w1tc.val = ((uint32_t)1 << pin); -#elif CONFIG_IDF_TARGET_ESP32C6 +#elif CONFIG_IDF_TARGET_ESP32C6 || CONFIG_IDF_TARGET_ESP32P4 if ( pin < 32 ) GPIO.out_w1tc.val = ((uint32_t)1 << pin); - else if ( pin < 46 ) + else if ( pin < SOC_GPIO_PIN_COUNT ) GPIO.out1_w1tc.val = ((uint32_t)1 << (pin - 32)); #else // plain ESP32 if ( pin < 32 ) GPIO.out_w1tc = ((uint32_t)1 << pin); - else if ( pin < 46 ) + else if ( pin < SOC_GPIO_PIN_COUNT ) GPIO.out1_w1tc.val = ((uint32_t)1 << (pin - 32)); #endif } @@ -193,16 +194,16 @@ void directWriteHigh(IO_REG_TYPE pin) { #if CONFIG_IDF_TARGET_ESP32C2 || CONFIG_IDF_TARGET_ESP32C3 || CONFIG_IDF_TARGET_ESP32C5 GPIO.out_w1ts.val = ((uint32_t)1 << pin); -#elif CONFIG_IDF_TARGET_ESP32C6 +#elif CONFIG_IDF_TARGET_ESP32C6 || CONFIG_IDF_TARGET_ESP32P4 if ( pin < 32 ) GPIO.out_w1ts.val = ((uint32_t)1 << pin); - else if ( pin < 46 ) + else if ( pin < SOC_GPIO_PIN_COUNT ) GPIO.out1_w1ts.val = ((uint32_t)1 << (pin - 32)); #else // plain ESP32 if ( pin < 32 ) GPIO.out_w1ts = ((uint32_t)1 << pin); - else if ( pin < 46 ) + else if ( pin < SOC_GPIO_PIN_COUNT ) GPIO.out1_w1ts.val = ((uint32_t)1 << (pin - 32)); #endif } @@ -225,7 +226,7 @@ void directModeInput(IO_REG_TYPE pin) } #endif // Input -#if CONFIG_IDF_TARGET_ESP32C6 +#if CONFIG_IDF_TARGET_ESP32C6 || CONFIG_IDF_TARGET_ESP32P4 if ( pin < 32 ) GPIO.enable_w1tc.val = ((uint32_t)1 << pin); else @@ -258,7 +259,7 @@ void directModeOutput(IO_REG_TYPE pin) } #endif // Output -#if CONFIG_IDF_TARGET_ESP32C6 +#if CONFIG_IDF_TARGET_ESP32C6 || CONFIG_IDF_TARGET_ESP32P4 if ( pin < 32 ) GPIO.enable_w1ts.val = ((uint32_t)1 << pin); else // already validated to pins <= 33 diff --git a/lib/NeoPixelBus/src/internal/NeoEspBitBangMethod.cpp b/lib/NeoPixelBus/src/internal/NeoEspBitBangMethod.cpp index 7c66f7e40..bdb1d73ad 100644 --- a/lib/NeoPixelBus/src/internal/NeoEspBitBangMethod.cpp +++ b/lib/NeoPixelBus/src/internal/NeoEspBitBangMethod.cpp @@ -29,7 +29,7 @@ License along with NeoPixel. If not, see #include // ESP32C3 I2S is not supported yet -#if !defined(CONFIG_IDF_TARGET_ESP32C5) && !defined(CONFIG_IDF_TARGET_ESP32C3) && !defined(CONFIG_IDF_TARGET_ESP32C2) && !defined(CONFIG_IDF_TARGET_ESP32C6) +#if !defined(CONFIG_IDF_TARGET_ESP32C5) && !defined(CONFIG_IDF_TARGET_ESP32C3) && !defined(CONFIG_IDF_TARGET_ESP32C2) && !defined(CONFIG_IDF_TARGET_ESP32C6) && !defined(CONFIG_IDF_TARGET_ESP32P4) #if !defined(ARDUINO_ARCH_ESP8266) #include "soc/gpio_periph.h" #endif @@ -74,7 +74,7 @@ void IRAM_ATTR NeoEspBitBangBase_send_pixels(uint8_t* pixels, uint8_t* end, uint // reset pin start #if defined(ARDUINO_ARCH_ESP32) - GPIO.out_w1tc = pinRegister; + GPIO.out_w1ts = pinRegister; #else GPIO_REG_WRITE(GPIO_OUT_W1TC_ADDRESS, pinRegister); #endif diff --git a/platformio.ini b/platformio.ini index a638e17b2..8b60523b5 100644 --- a/platformio.ini +++ b/platformio.ini @@ -30,6 +30,7 @@ extra_configs = platformio_esp32c5_envs.ini platformio_esp32c6_envs.ini ; platformio_esp32c61_envs.ini + platformio_esp32p4_envs.ini ;default_envs = normal_ESP32_4M diff --git a/platformio_core_defs.ini b/platformio_core_defs.ini index 3e3d3af5c..24a148cbf 100644 --- a/platformio_core_defs.ini +++ b/platformio_core_defs.ini @@ -195,7 +195,8 @@ lib_extra_dirs = ; ESP_IDF 5.5.0 [core_esp32_IDF5_5_0__3_2_0_LittleFS] platform = https://github.com/Jason2866/platform-espressif32.git#Arduino/IDF55 -platform_packages = framework-arduinoespressif32 @ https://github.com/Jason2866/esp32-arduino-lib-builder/releases/download/3766/framework-arduinoespressif32-all-release_v5.5-1bc6b44d.zip +platform_packages = +;platform_packages = framework-arduinoespressif32 @ https://github.com/Jason2866/esp32-arduino-lib-builder/releases/download/3766/framework-arduinoespressif32-all-release_v5.5-1bc6b44d.zip build_flags = -DESP32_STAGE -DESP_IDF_VERSION_MAJOR=5 -DLIBRARIES_NO_LOG=1 diff --git a/platformio_esp32p4_envs.ini b/platformio_esp32p4_envs.ini new file mode 100644 index 000000000..8941ec02a --- /dev/null +++ b/platformio_esp32p4_envs.ini @@ -0,0 +1,29 @@ + + +[esp32p4_common_LittleFS] +extends = esp32_base_idf5_5 +build_flags = ${esp32_base_idf5_5.build_flags} + -DFEATURE_ARDUINO_OTA=1 + -DUSE_LITTLEFS + -DESP32P4 +extra_scripts = ${esp32_base_idf5_5.extra_scripts} +build_unflags = ${esp32_base_idf5_5.build_unflags} + -fexceptions +board_build.filesystem = littlefs +lib_ignore = ${esp32_base_idf5_5.lib_ignore} +board = esp32p4_ev + + +[env:max_ESP32p4_16M8M_LittleFS_CDC_ETH] +extends = esp32p4_common_LittleFS +board = esp32p4_ev +build_flags = ${esp32p4_common_LittleFS.build_flags} + -DFEATURE_ETHERNET=1 + -DFEATURE_ARDUINO_OTA=1 + -DPLUGIN_BUILD_MAX_ESP32 + -DPLUGIN_BUILD_IR_EXTENDED + -D ST7789_EXTRA_INIT=1 + -D P116_EXTRA_ST7789=1 +extra_scripts = ${esp32p4_common_LittleFS.extra_scripts} + + diff --git a/src/_P097_Esp32Touch.ino b/src/_P097_Esp32Touch.ino index 25ac2a4ec..8a271e1d7 100644 --- a/src/_P097_Esp32Touch.ino +++ b/src/_P097_Esp32Touch.ino @@ -173,7 +173,7 @@ boolean Plugin_097(uint8_t function, struct EventStruct *event, String& string) const bool touched_prev = bitRead(p097_pinTouchedPrev, t); # endif // ifdef ESP32_CLASSIC - # if defined(ESP32S2) || defined(ESP32S3) + # if defined(ESP32S2) || defined(ESP32S3) || defined(ESP32P4) if (touched) { bitClear(p097_pinTouched, t); diff --git a/src/include/ESPEasy_config.h b/src/include/ESPEasy_config.h index 7dce45094..5230e53da 100644 --- a/src/include/ESPEasy_config.h +++ b/src/include/ESPEasy_config.h @@ -149,7 +149,7 @@ constexpr unsigned CEIL_LOG2(unsigned x) # endif // ifdef ESP8266 # ifdef ESP32 - # if defined(ESP32C2) || defined(ESP32C3) || defined(ESP32C5) || defined(ESP32C6) + # if defined(ESP32C2) || defined(ESP32C3) || defined(ESP32C5) || defined(ESP32C6) || defined(ESP32C61) || defined(ESP32P4) // (ESP32) FsP: FlashstringHelper to String-Pointer # define FsP diff --git a/src/include/esp32x_fixes.h b/src/include/esp32x_fixes.h index d8ecec688..76cdc9b79 100644 --- a/src/include/esp32x_fixes.h +++ b/src/include/esp32x_fixes.h @@ -45,6 +45,10 @@ #endif // __riscv +#ifdef ESP32 +#include +#endif + // alias, deprecated for the chips after esp32s2 #ifdef CONFIG_IDF_TARGET_ESP32 # define SPI_HOST SPI1_HOST diff --git a/src/src/CustomBuild/define_plugin_sets.h b/src/src/CustomBuild/define_plugin_sets.h index 40b88d535..9b6e7ff79 100644 --- a/src/src/CustomBuild/define_plugin_sets.h +++ b/src/src/CustomBuild/define_plugin_sets.h @@ -3509,15 +3509,19 @@ To create/register a plugin, you have to : #endif #ifndef FEATURE_SET_WIFI_TX_PWR - #ifdef ESP32 - #if defined(ESP32S2) || defined(ESP32S3) || defined(ESP32C2) || defined(ESP32C3) || defined(ESP32C5) || defined(ESP32C6) - #define FEATURE_SET_WIFI_TX_PWR 1 - #else - // TD-er: Disable setting TX power on ESP32 as it seems to cause issues on IDF4.4 + #ifdef ESP32P4 + #define FEATURE_SET_WIFI_TX_PWR 0 + #else + #ifdef ESP32 + #if defined(ESP32S2) || defined(ESP32S3) || defined(ESP32C2) || defined(ESP32C3) || defined(ESP32C5) || defined(ESP32C6) + #define FEATURE_SET_WIFI_TX_PWR 1 + #else + // TD-er: Disable setting TX power on ESP32 as it seems to cause issues on IDF4.4 + #define FEATURE_SET_WIFI_TX_PWR 1 + #endif + #elif defined(ESP8266) #define FEATURE_SET_WIFI_TX_PWR 1 #endif - #elif defined(ESP8266) - #define FEATURE_SET_WIFI_TX_PWR 1 #endif #endif diff --git a/src/src/DataStructs_templ/SettingsStruct.cpp b/src/src/DataStructs_templ/SettingsStruct.cpp index 838d70b9c..a871df789 100644 --- a/src/src/DataStructs_templ/SettingsStruct.cpp +++ b/src/src/DataStructs_templ/SettingsStruct.cpp @@ -831,6 +831,22 @@ bool SettingsStruct_tmpl::getPinBootStateIndex( index_high = gpio_pin - maxStates + 22 - 33; return true; } + +# elif defined(ESP32P4) + + // GPIO 27 ... 39 should never be used. + // Thus: + // - map ... <27> to the beginning of PinBootStates_ESP32 + // - map <40> ... <54> to the end of PinBootStates_ESP32 + if (gpio_pin < 27) { + return true; + } + + if (gpio_pin >= 40) { + index_high = gpio_pin - maxStates + 27 - 39; + return true; + } + # else // if defined(ESP32_CLASSIC) || defined(ESP32C3) static_assert(false, "Implement processor architecture"); diff --git a/src/src/DataTypes/SPI_options.cpp b/src/src/DataTypes/SPI_options.cpp index 5f1c3ee79..57bac16f2 100644 --- a/src/src/DataTypes/SPI_options.cpp +++ b/src/src/DataTypes/SPI_options.cpp @@ -48,6 +48,8 @@ #define VSPI_FSPI_SHORT_STRING "FSPI" # elif CONFIG_IDF_TARGET_ESP32C61 // ESP32-C61 #define VSPI_FSPI_SHORT_STRING "FSPI" +# elif CONFIG_IDF_TARGET_ESP32P4 // ESP32-P4 +#define VSPI_FSPI_SHORT_STRING "FSPI" # elif CONFIG_IDF_TARGET_ESP32 // ESP32/PICO-D4 #define VSPI_FSPI_SHORT_STRING "VSPI" diff --git a/src/src/ESPEasyCore/ESPEasyWiFi_state_machine_ESP32.cpp b/src/src/ESPEasyCore/ESPEasyWiFi_state_machine_ESP32.cpp index 0f38b7432..f85d97598 100644 --- a/src/src/ESPEasyCore/ESPEasyWiFi_state_machine_ESP32.cpp +++ b/src/src/ESPEasyCore/ESPEasyWiFi_state_machine_ESP32.cpp @@ -6,7 +6,9 @@ # include # include // Needed to call ESP-IDF functions like esp_wifi_.... +#ifndef ESP32P4 # include +#endif # include # include diff --git a/src/src/ESPEasyCore/ESPEasyWifi.cpp b/src/src/ESPEasyCore/ESPEasyWifi.cpp index 668950e33..31b3e7e3f 100644 --- a/src/src/ESPEasyCore/ESPEasyWifi.cpp +++ b/src/src/ESPEasyCore/ESPEasyWifi.cpp @@ -33,7 +33,10 @@ # include # include // Needed to call ESP-IDF functions like esp_wifi_.... +#ifndef ESP32P4 # include +#endif + # endif // ifdef ESP32 @@ -275,7 +278,13 @@ WiFiConnectionProtocol getConnectionProtocol() { return ESPEasy::net::wifi::getC # ifdef ESP32 -int64_t WiFi_get_TSF_time() { return esp_wifi_get_tsf_time(WIFI_IF_STA); } +int64_t WiFi_get_TSF_time() { + #ifdef ESP32P4 + return 0; + #else + return esp_wifi_get_tsf_time(WIFI_IF_STA); + #endif +} # endif // ifdef ESP32 diff --git a/src/src/ESPEasyCore/ESPEasyWifi_abstracted_ESP32.cpp b/src/src/ESPEasyCore/ESPEasyWifi_abstracted_ESP32.cpp index a436a7e9a..beb0d4056 100644 --- a/src/src/ESPEasyCore/ESPEasyWifi_abstracted_ESP32.cpp +++ b/src/src/ESPEasyCore/ESPEasyWifi_abstracted_ESP32.cpp @@ -23,7 +23,10 @@ # include # include // Needed to call ESP-IDF functions like esp_wifi_.... +#ifndef ESP32P4 # include +#endif + namespace ESPEasy { namespace net { @@ -125,6 +128,8 @@ bool setWifiMode(WiFiMode_t new_mode) } if (WiFi.getMode() != new_mode) { + WiFi.mode(WIFI_OFF); + delay(100); addLog(LOG_LEVEL_ERROR, F("WIFI : Cannot set mode!!!!!")); return false; } @@ -138,7 +143,9 @@ bool setWifiMode(WiFiMode_t new_mode) // Needs to be set while WiFi is off WiFi.hostname(NetworkCreateRFCCompliantHostname()); delay(100); +#ifndef ESP32P4 esp_wifi_set_ps(WIFI_PS_NONE); +#endif // esp_wifi_set_ps(WIFI_PS_MAX_MODEM); delay(1); @@ -344,6 +351,7 @@ float GetRSSIthreshold(float& maxTXpwr) { WiFiConnectionProtocol getConnectionProtocol() { + #ifndef ESP32P4 if (WiFi.RSSI() < 0) { wifi_phy_mode_t phymode; esp_wifi_sta_get_negotiated_phymode(&phymode); @@ -364,6 +372,7 @@ WiFiConnectionProtocol getConnectionProtocol() # endif // if ESP_IDF_VERSION >= ESP_IDF_VERSION_VAL(5, 3, 0) } } + #endif return WiFiConnectionProtocol::Unknown; } @@ -407,7 +416,13 @@ bool setProtocol(wifi_interface_t ifx, uint16_t protocol_2GHz, uint16_t protocol # else // if CONFIG_SOC_WIFI_SUPPORT_5G -bool setProtocol(wifi_interface_t ifx, uint8_t protocol_2GHz) { return esp_wifi_set_protocol(ifx, protocol_2GHz) == ESP_OK; } +bool setProtocol(wifi_interface_t ifx, uint8_t protocol_2GHz) { + #ifdef ESP32P4 + return false; + #else + return esp_wifi_set_protocol(ifx, protocol_2GHz) == ESP_OK; + #endif +} # endif // if CONFIG_SOC_WIFI_SUPPORT_5G @@ -428,8 +443,12 @@ void setConnectionSpeed(bool ForceWiFi_bg_mode) // However since HT40 is using nearly all channels on 2.4 GHz WiFi, // Thus you are more likely to experience disturbances. // The response speed and stability is better at HT20 for ESP units. + #ifdef ESP32P4 + return; + #else esp_wifi_set_bandwidth(WIFI_IF_STA, WIFI_BW_HT20); + # if CONFIG_SOC_WIFI_SUPPORT_5G WiFi.setBandMode(WiFi_band_mode); # if CONFIG_SOC_WIFI_HE_SUPPORT @@ -531,23 +550,32 @@ void setConnectionSpeed(bool ForceWiFi_bg_mode) setProtocol(WIFI_IF_STA, protocol); # endif // if CONFIG_SOC_WIFI_SUPPORT_5G } + #endif } -void setWiFiNoneSleep() { WiFi.setSleep(WIFI_PS_NONE); } +void setWiFiNoneSleep() { + #ifndef ESP32P4 + WiFi.setSleep(WIFI_PS_NONE); + #endif +} void setWiFiEcoPowerMode() { // Maximum modem power saving. // In this mode, interval to receive beacons is determined by the listen_interval parameter in wifi_sta_config_t // FIXME TD-er: Must test if this is desired behavior in ESP32. + #ifndef ESP32P4 WiFi.setSleep(WIFI_PS_MAX_MODEM); + #endif } void setWiFiDefaultPowerMode() { // Minimum modem power saving. // In this mode, station wakes up to receive beacon every DTIM period + #ifndef ESP32P4 WiFi.setSleep(WIFI_PS_MIN_MODEM); + #endif } void setWiFiCountryPolicyManual() diff --git a/src/src/ESPEasyCore/ESPEasy_setup.cpp b/src/src/ESPEasyCore/ESPEasy_setup.cpp index 8514cc02f..dd5f0010a 100644 --- a/src/src/ESPEasyCore/ESPEasy_setup.cpp +++ b/src/src/ESPEasyCore/ESPEasy_setup.cpp @@ -364,7 +364,7 @@ void ESPEasy_setup() #endif // ifndef BUILD_NO_RAM_TRACKER #ifdef ESP32 -#ifndef CORE32SOLO1 +#if !defined(CORE32SOLO1) && !defined(ESP32P4) // Configure dynamic frequency scaling: // maximum and minimum frequencies are set in sdkconfig, diff --git a/src/src/Helpers/ESPEasy_Storage.cpp b/src/src/Helpers/ESPEasy_Storage.cpp index b28063a90..6e1e3c8df 100644 --- a/src/src/Helpers/ESPEasy_Storage.cpp +++ b/src/src/Helpers/ESPEasy_Storage.cpp @@ -62,7 +62,10 @@ #ifdef ESP32 # include -# include +#ifndef ESP32P4 +# include +#endif + String patch_fname(const String& fname) { if (fname.startsWith(F("/"))) { @@ -689,6 +692,9 @@ bool Erase_WiFi_Calibration() { #endif #ifdef ESP32 + #ifdef ESP32P4 + return false; + #else WifiDisconnect(); ESPEasy::net::wifi::setWifiMode(WIFI_OFF); // Make sure power is stable, so wait a bit longer @@ -701,6 +707,7 @@ bool Erase_WiFi_Calibration() { delay(200); setWiFi_CalibrationVersion(); #endif + #endif return true; } @@ -936,7 +943,9 @@ void afterloadSettings() { applyFactoryDefaultPref(); Scheduler.setEcoMode(Settings.EcoPowerMode()); #ifdef ESP32 + #ifndef ESP32P4 setCpuFrequencyMhz(Settings.EcoPowerMode() ? getCPU_MinFreqMHz() : getCPU_MaxFreqMHz()); + #endif #endif // ifdef ESP32 if (!Settings.UseRules) { diff --git a/src/src/Helpers/Hardware.cpp b/src/src/Helpers/Hardware.cpp index bff72f4c6..37abf8c4c 100644 --- a/src/src/Helpers/Hardware.cpp +++ b/src/src/Helpers/Hardware.cpp @@ -722,6 +722,29 @@ void readBootCause() { case JTAG_RESET : lastBootCause = BOOT_CAUSE_MANUAL_REBOOT; break; /**<24, jtag reset CPU*/ } +#elif defined(ESP32P4) + switch (rtc_get_reset_reason(0)) { + case NO_MEAN : break; + case POWERON_RESET : lastBootCause = BOOT_CAUSE_MANUAL_REBOOT; break; /**<1, Vbat power on reset*/ + case SW_SYS_RESET : lastBootCause = BOOT_CAUSE_SOFT_RESTART; break; /**<3, Software reset digital core*/ + case PMU_SYS_PWR_DOWN_RESET : lastBootCause = BOOT_CAUSE_DEEP_SLEEP; break; /**<5, PMU HP system power down reset*/ + case HP_SYS_HP_WDT_RESET : lastBootCause = BOOT_CAUSE_MANUAL_REBOOT; break; /**<7, HP system reset from HP watchdog*/ + case HP_SYS_LP_WDT_RESET : lastBootCause = BOOT_CAUSE_EXT_WD; break; /**<9, HP system reset from LP watchdog*/ + case HP_CORE_HP_WDT_RESET : lastBootCause = BOOT_CAUSE_EXT_WD; break; /**<11, HP core reset from HP watchdog*/ + case SW_CPU_RESET : lastBootCause = BOOT_CAUSE_EXT_WD; break; /**<12, software reset cpu*/ + case HP_CORE_LP_WDT_RESET : lastBootCause = BOOT_CAUSE_EXT_WD; break; /**<13, HP core reset from LP watchdog*/ + case BROWN_OUT_RESET : lastBootCause = BOOT_CAUSE_POWER_UNSTABLE; break; /**<15, Reset when the vdd voltage is not stable*/ + case CHIP_LP_WDT_RESET : lastBootCause = BOOT_CAUSE_EXT_WD; break; /**<16, LP watchdog chip reset*/ + case SUPER_WDT_RESET : lastBootCause = BOOT_CAUSE_EXT_WD; break; /**<18, super watchdog reset*/ + case GLITCH_RTC_RESET : lastBootCause = BOOT_CAUSE_POWER_UNSTABLE; break; /**<19, glitch reset*/ + case EFUSE_CRC_ERR_RESET : lastBootCause = BOOT_CAUSE_POWER_UNSTABLE; break; /**<20, efuse ecc error reset*/ + case CHIP_USB_JTAG_RESET : lastBootCause = BOOT_CAUSE_MANUAL_REBOOT; break; /**<22, HP usb jtag chip reset*/ + case CHIP_USB_UART_RESET : lastBootCause = BOOT_CAUSE_MANUAL_REBOOT; break; /**<23, HP usb uart chip reset*/ + case JTAG_RESET : lastBootCause = BOOT_CAUSE_MANUAL_REBOOT; break; /**<24, jtag reset*/ + case CPU_LOCKUP_RESET : lastBootCause = BOOT_CAUSE_MANUAL_REBOOT; break; /**<26, cpu lockup reset*/ + } + + # elif defined(ESP32_CLASSIC) switch (rtc_get_reset_reason(0)) { case NO_MEAN : break; diff --git a/src/src/Helpers/Hardware_defines.h b/src/src/Helpers/Hardware_defines.h index 901549f2c..b9fa7885c 100644 --- a/src/src/Helpers/Hardware_defines.h +++ b/src/src/Helpers/Hardware_defines.h @@ -59,7 +59,8 @@ # define WIFI_SENSITIVITY_11b -88 # define WIFI_SENSITIVITY_54g -76 # define WIFI_SENSITIVITY_n -72 -#elif defined(ESP32C2) || defined(ESP32C3) || defined(ESP32C5) || defined(ESP32C6) +#elif defined(ESP32C2) || defined(ESP32C3) || defined(ESP32C5) || defined(ESP32C6) || defined(ESP32C61) || defined(ESP32P4) +// TODO TD-er: P4 does not have WiFi, but C6 used on those boards has. What to do here? # define MAX_TX_PWR_DBM_11b 21.0f # define MAX_TX_PWR_DBM_54g 19.0f # define MAX_TX_PWR_DBM_n 18.5f @@ -119,6 +120,9 @@ static_assert(false, "Implement processor architecture"); #if defined(ESP32S2) || defined(ESP32S3) #define PIN_USB_D_MIN 19 #endif +#ifdef ESP32P4 +#define PIN_USB_D_MIN 25 +#endif #ifdef ESP32C6 #define PIN_USB_D_MIN 12 #endif @@ -135,6 +139,9 @@ static_assert(false, "Implement processor architecture"); #if defined(ESP32S2) || defined(ESP32S3) #define PIN_USB_D_PLUS 20 #endif +#ifdef ESP32P4 +#define PIN_USB_D_PLUS 24 +#endif #ifdef ESP32C6 #define PIN_USB_D_PLUS 13 #endif diff --git a/src/src/Helpers/Hardware_device_info.cpp b/src/src/Helpers/Hardware_device_info.cpp index ce69b6eb1..9b34544b1 100644 --- a/src/src/Helpers/Hardware_device_info.cpp +++ b/src/src/Helpers/Hardware_device_info.cpp @@ -113,6 +113,9 @@ uint32_t getFlashChipId() { if (flashChipId == 0) { #ifdef ESP32 + #ifdef ESP32P4 + // TODO TD-er: Implement + #else uint32_t tmp = g_rom_flashchip.device_id; for (int i = 0; i < 3; ++i) { @@ -122,6 +125,7 @@ uint32_t getFlashChipId() { } // esp_flash_read_id(nullptr, &flashChipId); + #endif #elif defined(ESP8266) flashChipId = ESP.getFlashChipId(); #endif // ifdef ESP32 @@ -135,7 +139,12 @@ uint32_t getFlashRealSizeInBytes() { if (res == 0) { #if defined(ESP32) + #ifdef ESP32P4 + // TODO TD-er: Implement + res = 1 << 24; + #else res = (1 << ((getFlashChipId() >> 16) & 0xFF)); + #endif #else // if defined(ESP32) res = ESP.getFlashChipRealSize(); // ESP.getFlashChipSize(); #endif // if defined(ESP32) @@ -258,8 +267,11 @@ uint32_t getFlashChipSpeed() { } const __FlashStringHelper* getFlashChipMode() { - #ifdef ESP32 + #ifdef ESP32P4 + // TODO TD-er: Implement + #else + #ifdef ESP32 if (getFlashChipOPI_wired()) { switch (ESP.getFlashChipMode()) { case FM_QIO: return F("QIO (OPI Wired)"); @@ -273,7 +285,6 @@ const __FlashStringHelper* getFlashChipMode() { case FM_UNKNOWN: break; } } - #endif // ifdef ESP32 switch (ESP.getFlashChipMode()) { @@ -287,6 +298,7 @@ const __FlashStringHelper* getFlashChipMode() { #endif // ifdef ESP32 case FM_UNKNOWN: break; } +#endif return F("Unknown"); } diff --git a/src/src/Helpers/Hardware_device_info_ESP32P4.cpp b/src/src/Helpers/Hardware_device_info_ESP32P4.cpp index 99c80aada..8eca76654 100644 --- a/src/src/Helpers/Hardware_device_info_ESP32P4.cpp +++ b/src/src/Helpers/Hardware_device_info_ESP32P4.cpp @@ -2,6 +2,7 @@ #ifdef ESP32P4 +#include const __FlashStringHelper* getChipModel(uint32_t chip_model, uint32_t chip_revision, uint32_t pkg_version, bool single_core) { @@ -12,4 +13,38 @@ const __FlashStringHelper* getChipModel(uint32_t chip_model, uint32_t chip_revis return F("Unknown"); } +int32_t getEmbeddedFlashSize() +{ + // TODO TD-er: Implement + return 16; +} + +int32_t getEmbeddedPSRAMSize() +{ + const uint32_t psram_cap = REG_GET_FIELD(EFUSE_RD_MAC_SYS_2_REG, EFUSE_PSRAM_CAP); + + // TODO TD-er: Must check whether this is true + switch (psram_cap) { + case 0: return 0; + case 1: return 8; + case 2: return 2; + } + + // Unknown value, thus mark as negative value + return -1 * static_cast(psram_cap); +} + +# ifndef isPSRAMInterfacePin +bool isPSRAMInterfacePin(int gpio) { + // TODO TD-er: Implement + return false; +} + +# endif // ifndef isPSRAMInterfacePin + +bool isFlashInterfacePin_ESPEasy(int gpio) { + // TODO TD-er: Implement + return false; +} + #endif // ifdef ESP32P4 diff --git a/src/src/Helpers/Hardware_temperature_sensor.cpp b/src/src/Helpers/Hardware_temperature_sensor.cpp index 3104a1abd..cc89d6074 100644 --- a/src/src/Helpers/Hardware_temperature_sensor.cpp +++ b/src/src/Helpers/Hardware_temperature_sensor.cpp @@ -17,7 +17,7 @@ extern "C" { uint8_t temprature_sens_read(); } -# elif defined(ESP32C2) || defined(ESP32C3) || defined(ESP32C5) || defined(ESP32C6) || defined(ESP32S2) || defined(ESP32S3) +# elif defined(ESP32C2) || defined(ESP32C3) || defined(ESP32C5) || defined(ESP32C6) || defined(ESP32C61) || defined(ESP32S2) || defined(ESP32S3) || defined(ESP32P4) # if ESP_IDF_VERSION_MAJOR < 5 # include @@ -62,7 +62,7 @@ esp_err_t do_read_internal_temperature(float& celsius) { return result; } -# elif defined(ESP32C2) || defined(ESP32C3) || defined(ESP32C5) || defined(ESP32C6) || defined(ESP32S2) || defined(ESP32S3) +# elif defined(ESP32C2) || defined(ESP32C3) || defined(ESP32C5) || defined(ESP32C6) || defined(ESP32C61) || defined(ESP32S2) || defined(ESP32S3) || defined(ESP32P4) esp_err_t do_read_internal_temperature(float& celsius) { esp_err_t result = ESP_FAIL; diff --git a/src/src/Helpers/StringGenerator_GPIO.cpp b/src/src/Helpers/StringGenerator_GPIO.cpp index f71bc8c1b..07225c84d 100644 --- a/src/src/Helpers/StringGenerator_GPIO.cpp +++ b/src/src/Helpers/StringGenerator_GPIO.cpp @@ -195,6 +195,9 @@ const __FlashStringHelper* getConflictingUse(int gpio, PinSelectPurpose purpose, // See Appendix A, page 71: https://www.espressif.com/sites/default/files/documentation/esp32-s3_datasheet_en.pdf + #elif defined(ESP32P4) + // TODO TD-er: Must check if P4 has conflicts here + #elif defined(ESP32C5) // TODO TD-er: Must check if C5 has conflicts here diff --git a/src/src/Helpers/StringGenerator_System.cpp b/src/src/Helpers/StringGenerator_System.cpp index ba59809f2..ad60dd3cc 100644 --- a/src/src/Helpers/StringGenerator_System.cpp +++ b/src/src/Helpers/StringGenerator_System.cpp @@ -23,6 +23,8 @@ #include #elif defined(ESP32C6) #include + #elif defined(ESP32P4) + #include # elif defined(ESP32_CLASSIC) #include # else @@ -231,6 +233,30 @@ const __FlashStringHelper * getResetReasonString_f(uint8_t icore, bool& isDEEPSL case JTAG_RESET : return F("jtag reset CPU"); } + #elif defined(ESP32P4) + + // See tools\sdk\esp32\include\esp_rom\include\esp32p4\rom\rtc.h + switch (rtc_get_reset_reason(icore)) { + case NO_MEAN : break; + case POWERON_RESET : return F("Vbat power on reset"); + case SW_SYS_RESET : return F("Software reset digital core"); + case PMU_SYS_PWR_DOWN_RESET : return F("PMU HP system power down reset"); + case HP_SYS_HP_WDT_RESET : return F("HP system reset from HP watchdog"); + case HP_SYS_LP_WDT_RESET : return F("HP system reset from LP watchdog"); + case HP_CORE_HP_WDT_RESET : return F("HP core reset from HP watchdog"); + case SW_CPU_RESET : return F("software reset cpu"); + case HP_CORE_LP_WDT_RESET : return F("HP core reset from LP watchdog"); + case BROWN_OUT_RESET : return F("Reset when the vdd voltage is not stable"); + case CHIP_LP_WDT_RESET : return F("LP watchdog chip reset"); + case SUPER_WDT_RESET : return F("super watchdog reset"); + case GLITCH_RTC_RESET : return F("glitch reset"); + case EFUSE_CRC_ERR_RESET : return F("efuse ecc error reset"); + case CHIP_USB_JTAG_RESET : return F("HP usb jtag chip reset"); + case CHIP_USB_UART_RESET : return F("HP usb uart chip reset"); + case JTAG_RESET : return F("jtag reset"); + case CPU_LOCKUP_RESET : return F("cpu lockup reset"); + } + # elif defined(ESP32_CLASSIC) diff --git a/src/src/PluginStructs/P097_data_struct.h b/src/src/PluginStructs/P097_data_struct.h index 9f1d4c8c9..34cc1c577 100644 --- a/src/src/PluginStructs/P097_data_struct.h +++ b/src/src/PluginStructs/P097_data_struct.h @@ -27,6 +27,16 @@ # define LAST_TOUCH_INPUT_INDEX 14 # define P097_MAX_THRESHOLD_VALUE 500000 // couldn't find a max value but threshold for ESP32S2 & ESP32S3 is uint32_t # define P097_DEFAULT_TOUCH_THRESHOLD 1500 +# elif defined(ESP32P4) +// TODO TD-er: Must use SOC_TOUCH_MIN_CHAN_ID and SOC_TOUCH_MAX_CHAN_ID from soc/soc_caps.h + # define HAS_T0_INPUT 0 + # define HAS_T10_TO_T14 0 // Temporary disabled since T10 to T14 are causing problems + # ifdef LAST_TOUCH_INPUT_INDEX + # undef LAST_TOUCH_INPUT_INDEX + # endif // ifdef LAST_TOUCH_INPUT_INDEX + # define LAST_TOUCH_INPUT_INDEX 14 + # define P097_MAX_THRESHOLD_VALUE 500000 // couldn't find a max value but threshold for ESP32S2 & ESP32S3 is uint32_t + # define P097_DEFAULT_TOUCH_THRESHOLD 1500 # endif // if defined(ESP32_CLASSIC) # define P097_MAX_LONGPRESS_VALUE 10000 diff --git a/tools/pio/copy_files.py b/tools/pio/copy_files.py index 53aa332ee..afef51984 100644 --- a/tools/pio/copy_files.py +++ b/tools/pio/copy_files.py @@ -25,7 +25,7 @@ def get_max_bin_size(env_name, file_suffix): if "_8M1M" in env_name: # ESP32 with 3520k of sketch space. max_bin_size = 3604480 - if "_ESP32_" in env_name or "_ESP32c3_" in env_name or "_ESP32c5_" in env_name or "_ESP32c6_" in env_name or "_ESP32s2_" in env_name or "_ESP32s3_" in env_name: + if "_ESP32_" in env_name or "_ESP32c3_" in env_name or "_ESP32c5_" in env_name or "_ESP32c6_" in env_name or "_ESP32p4_" in env_name or "_ESP32s2_" in env_name or "_ESP32s3_" in env_name: if "_16M8M" in env_name or "_16M2M" in env_name or "_16M1M" in env_name: # ESP32 with 4096k of sketch space. max_bin_size = 4194304 From e4c60dc6bc75a03ca18031cc3cfa7e6ad9529688 Mon Sep 17 00:00:00 2001 From: TD-er Date: Tue, 8 Jul 2025 11:50:46 +0200 Subject: [PATCH 094/564] [ESP32P4] Fix crashes when trying to connect to WiFi --- platformio_core_defs.ini | 3 +- src/src/CustomBuild/ESPEasyDefaults.h | 28 +++++++++++++++++++ .../ESPEasyCore/ESPEasyWifi_abstracted.cpp | 4 +++ src/src/Helpers/Hardware_device_info.cpp | 5 ++++ 4 files changed, 38 insertions(+), 2 deletions(-) diff --git a/platformio_core_defs.ini b/platformio_core_defs.ini index 24a148cbf..ecb186980 100644 --- a/platformio_core_defs.ini +++ b/platformio_core_defs.ini @@ -195,8 +195,7 @@ lib_extra_dirs = ; ESP_IDF 5.5.0 [core_esp32_IDF5_5_0__3_2_0_LittleFS] platform = https://github.com/Jason2866/platform-espressif32.git#Arduino/IDF55 -platform_packages = -;platform_packages = framework-arduinoespressif32 @ https://github.com/Jason2866/esp32-arduino-lib-builder/releases/download/3766/framework-arduinoespressif32-all-release_v5.5-1bc6b44d.zip +platform_packages = framework-arduinoespressif32 @ https://github.com/Jason2866/esp32-arduino-lib-builder/releases/download/3770/framework-arduinoespressif32-all-release_v5.5-1bc6b44d.zip build_flags = -DESP32_STAGE -DESP_IDF_VERSION_MAJOR=5 -DLIBRARIES_NO_LOG=1 diff --git a/src/src/CustomBuild/ESPEasyDefaults.h b/src/src/CustomBuild/ESPEasyDefaults.h index 9b67a0cec..f6c6319aa 100644 --- a/src/src/CustomBuild/ESPEasyDefaults.h +++ b/src/src/CustomBuild/ESPEasyDefaults.h @@ -8,6 +8,10 @@ #include "../Helpers/Hardware_defines.h" +#ifdef ESP32P4 +#include +#endif + // ******************************************************************************** // User specific configuration // ******************************************************************************** @@ -261,25 +265,49 @@ #define DEFAULT_PIN_RESET_BUTTON (-1) #endif #ifndef DEFAULT_ETH_PHY_ADDR +#ifdef ESP32P4 +#define DEFAULT_ETH_PHY_ADDR 1 +#else #define DEFAULT_ETH_PHY_ADDR 0 #endif +#endif #ifndef DEFAULT_ETH_PHY_TYPE +#ifdef ESP32P4 +#define DEFAULT_ETH_PHY_TYPE EthPhyType_t::TLK110 +#else #define DEFAULT_ETH_PHY_TYPE EthPhyType_t::notSet #endif +#endif #ifndef DEFAULT_ETH_PIN_MDC +#ifdef ESP32P4 +#define DEFAULT_ETH_PIN_MDC ETH_PHY_MDC +#else #define DEFAULT_ETH_PIN_MDC -1 #endif +#endif #ifndef DEFAULT_ETH_PIN_MDIO +#ifdef ESP32P4 +#define DEFAULT_ETH_PIN_MDIO ETH_PHY_MDIO +#else #define DEFAULT_ETH_PIN_MDIO -1 #endif +#endif #ifndef DEFAULT_ETH_PIN_POWER +#ifdef ESP32P4 +#define DEFAULT_ETH_PIN_POWER ETH_PHY_POWER +#else #define DEFAULT_ETH_PIN_POWER -1 #endif +#endif #ifndef DEFAULT_ETH_CLOCK_MODE #define DEFAULT_ETH_CLOCK_MODE EthClockMode_t::Ext_crystal_osc #endif #ifndef DEFAULT_NETWORK_MEDIUM +#ifdef ESP32P4 #define DEFAULT_NETWORK_MEDIUM NetworkMedium_t::WIFI +#else + #define DEFAULT_NETWORK_MEDIUM NetworkMedium_t::WIFI +#endif #endif #ifndef DEFAULT_JSON_BOOL_WITHOUT_QUOTES #define DEFAULT_JSON_BOOL_WITHOUT_QUOTES false diff --git a/src/src/ESPEasyCore/ESPEasyWifi_abstracted.cpp b/src/src/ESPEasyCore/ESPEasyWifi_abstracted.cpp index 8e8b0d3fd..48bc51dcd 100644 --- a/src/src/ESPEasyCore/ESPEasyWifi_abstracted.cpp +++ b/src/src/ESPEasyCore/ESPEasyWifi_abstracted.cpp @@ -48,10 +48,14 @@ bool setAP(bool enable) { return setSTA_AP(WifiIsSTA(WiFi.getMode()), enable); bool setSTA_AP(bool sta_enable, bool ap_enable) { +#ifdef ESP32P4 + return true; +#else if (ap_enable) { return setWifiMode(sta_enable ? WIFI_AP_STA : WIFI_AP); } return setWifiMode(sta_enable ? WIFI_STA : WIFI_OFF); +#endif } // ******************************************************************************** diff --git a/src/src/Helpers/Hardware_device_info.cpp b/src/src/Helpers/Hardware_device_info.cpp index 9b34544b1..8127ec01e 100644 --- a/src/src/Helpers/Hardware_device_info.cpp +++ b/src/src/Helpers/Hardware_device_info.cpp @@ -247,6 +247,10 @@ uint32_t getFlashChipSpeed() { // for which patches have been submitted and somehow they managed to merge it completely wrong. return ESP.getFlashChipSpeed(); # else // if ESP_IDF_STILL_NEEDS_SPI_REGISTERS_FIXED +#ifdef ESP32P4 + // TODO TD-er: Implement + return 80000000; +#else // All ESP32-variants have the SPI flash wired to SPI peripheral 1 const uint32_t spi_clock = REG_READ(SPI_CLOCK_REG(1)); @@ -262,6 +266,7 @@ uint32_t getFlashChipSpeed() { return getApbFrequency(); } return spiClockDivToFrequency(spi_clock); +#endif # endif // if ESP_IDF_STILL_NEEDS_SPI_REGISTERS_FIXED #endif // ifdef ESP8266 } From e56326ad889757b4edf3ca64f11a65cb90853c87 Mon Sep 17 00:00:00 2001 From: TD-er Date: Wed, 9 Jul 2025 12:29:02 +0200 Subject: [PATCH 095/564] [ESP32P4] Add more warnings for specific GPIO pins --- platformio_core_defs.ini | 4 +- requirements.txt | 1 + src/src/DataStructs_templ/SettingsStruct.cpp | 23 ++++++ .../ESPEasyCore/ESPEasyWiFiEvent_ESP32.cpp | 3 + src/src/Helpers/Hardware_GPIO_ESP32P4.cpp | 75 +++++++++++-------- src/src/Helpers/StringGenerator_GPIO.cpp | 19 +++++ 6 files changed, 90 insertions(+), 35 deletions(-) diff --git a/platformio_core_defs.ini b/platformio_core_defs.ini index ecb186980..eb58b5300 100644 --- a/platformio_core_defs.ini +++ b/platformio_core_defs.ini @@ -166,7 +166,7 @@ extra_scripts = ${esp82xx_common.extra_scripts} ; ESP_IDF 5.4.1 [core_esp32_IDF5_4_1__3_2_0_LittleFS] platform = https://github.com/Jason2866/platform-espressif32.git#Arduino/IDF54 -platform_packages = framework-arduinoespressif32 @ https://github.com/Jason2866/esp32-arduino-lib-builder/releases/download/3765/framework-arduinoespressif32-all-release_v5.4-3138bf0e.zip +platform_packages = framework-arduinoespressif32 @ https://github.com/Jason2866/esp32-arduino-lib-builder/releases/download/3772/framework-arduinoespressif32-all-release_v5.4-ef69115d.zip build_flags = -DESP32_STAGE -DESP_IDF_VERSION_MAJOR=5 -DLIBRARIES_NO_LOG=1 @@ -195,7 +195,7 @@ lib_extra_dirs = ; ESP_IDF 5.5.0 [core_esp32_IDF5_5_0__3_2_0_LittleFS] platform = https://github.com/Jason2866/platform-espressif32.git#Arduino/IDF55 -platform_packages = framework-arduinoespressif32 @ https://github.com/Jason2866/esp32-arduino-lib-builder/releases/download/3770/framework-arduinoespressif32-all-release_v5.5-1bc6b44d.zip +platform_packages = framework-arduinoespressif32 @ https://github.com/Jason2866/esp32-arduino-lib-builder/releases/download/3774/framework-arduinoespressif32-all-release_v5.5-29017369.zip build_flags = -DESP32_STAGE -DESP_IDF_VERSION_MAJOR=5 -DLIBRARIES_NO_LOG=1 diff --git a/requirements.txt b/requirements.txt index b2440a3a4..7beb7addd 100644 --- a/requirements.txt +++ b/requirements.txt @@ -2,3 +2,4 @@ platformio==6.1.18 pygit2>=1.10.1 cryptography==44.0.1 setuptools>=75.8 +uv \ No newline at end of file diff --git a/src/src/DataStructs_templ/SettingsStruct.cpp b/src/src/DataStructs_templ/SettingsStruct.cpp index a871df789..7f7a4359d 100644 --- a/src/src/DataStructs_templ/SettingsStruct.cpp +++ b/src/src/DataStructs_templ/SettingsStruct.cpp @@ -27,6 +27,10 @@ #include "include/esp32x_fixes.h" #endif +#if CONFIG_ETH_USE_ESP32_EMAC +#include +#endif + /* // VariousBits1 defaults to 0, keep in mind when adding bit lookups. template @@ -1207,12 +1211,31 @@ bool SettingsStruct_tmpl::isEthernetPin(int8_t pin) const { if (pin < 0) return false; if (NetworkMedium == NetworkMedium_t::Ethernet && !isSPI_EthernetType(ETH_Phy_Type)) { + #if CONFIG_ETH_USE_ESP32_EMAC + #ifdef ESP32P4 + switch (pin) { + // MDC/MDIO/Power can be configured by user + //case ETH_PHY_MDC : + //case ETH_PHY_MDIO : + //case ETH_PHY_POWER : + case ETH_RMII_TX_EN : + case ETH_RMII_TX0 : + case ETH_RMII_TX1 : + case ETH_RMII_RX0 : + case ETH_RMII_RX1_EN : + case ETH_RMII_CRS_DV : + case ETH_RMII_CLK : + return true; + } + #else if (19 == pin) return true; // ETH TXD0 if (21 == pin) return true; // ETH TX EN if (22 == pin) return true; // ETH TXD1 if (25 == pin) return true; // ETH RXD0 if (26 == pin) return true; // ETH RXD1 if (27 == pin) return true; // ETH CRS_DV + #endif + #endif } #endif // if FEATURE_ETHERNET return false; diff --git a/src/src/ESPEasyCore/ESPEasyWiFiEvent_ESP32.cpp b/src/src/ESPEasyCore/ESPEasyWiFiEvent_ESP32.cpp index 52535cfef..025f94bd4 100644 --- a/src/src/ESPEasyCore/ESPEasyWiFiEvent_ESP32.cpp +++ b/src/src/ESPEasyCore/ESPEasyWiFiEvent_ESP32.cpp @@ -150,6 +150,9 @@ void WiFiEvent(WiFiEvent_t event_id, arduino_event_info_t info) { addLog(LOG_LEVEL_INFO, F("WIFI : AP got IP6")); break; # endif // if FEATURE_USE_IPV6 + case ARDUINO_EVENT_WIFI_AP_STAIPASSIGNED: + addLog(LOG_LEVEL_INFO, F("WIFI : AP assigned IP to STA")); + break; case ARDUINO_EVENT_WIFI_AP_STACONNECTED: WiFiEventData.markConnectedAPmode(info.wifi_ap_staconnected.mac); break; diff --git a/src/src/Helpers/Hardware_GPIO_ESP32P4.cpp b/src/src/Helpers/Hardware_GPIO_ESP32P4.cpp index 6e26586a0..4fa954dae 100644 --- a/src/src/Helpers/Hardware_GPIO_ESP32P4.cpp +++ b/src/src/Helpers/Hardware_GPIO_ESP32P4.cpp @@ -6,6 +6,8 @@ # include "../Globals/Settings.h" # include "../Helpers/Hardware_device_info.h" +#include + // ******************************************************************************** // Get info of a specific GPIO pin // ******************************************************************************** @@ -24,26 +26,30 @@ bool getGpioInfo(int gpio, int& pinnr, bool& input, bool& output, bool& warning) # if FEATURE_ETHERNET // Check pins used for RMII Ethernet PHY - if (NetworkMedium_t::Ethernet == Settings.NetworkMedium) { - switch (gpio) { - case 28: // RMII_RXDV - case 29: // RMII_RXD0 - case 30: // RMII_RXD1 - case 34: // RMII_TXD0 - case 35: // RMII_TXD1 - case 49: // RMII_TXEN - case 50: // RMII_CLK - case 51: // PHY_RSTN - case 52: // MDIO - warning = true; - break; - } - - - // FIXME TD-er: Must we also check for pins used for MDC/MDIO and Eth PHY power? + if (Settings.isEthernetPin(gpio) || Settings.isEthernetPinOptional(gpio)) + { + warning = true; } # endif // if FEATURE_ETHERNET +#ifdef BOARD_HAS_SDIO_ESP_HOSTED + // TODO TD-er: Make this configurable as we can set this via WiFi.setPins + switch (gpio) { + case BOARD_SDIO_ESP_HOSTED_CLK : + case BOARD_SDIO_ESP_HOSTED_CMD : + case BOARD_SDIO_ESP_HOSTED_D0 : + case BOARD_SDIO_ESP_HOSTED_D1 : + case BOARD_SDIO_ESP_HOSTED_D2 : + case BOARD_SDIO_ESP_HOSTED_D3 : + case BOARD_SDIO_ESP_HOSTED_RESET : + { + warning = true; +// if (gpio != BOARD_SDIO_ESP_HOSTED_RESET) { return false; } + break; + } + } +#endif + return (input || output); } @@ -55,8 +61,11 @@ bool isBootModePin(int gpio) bool isBootStrapPin(int gpio) { - - return false; + // Boot mode | GPIO35 | GPIO36 | GPIO37 | GPIO38 + // + // SPI Boot | 1 | Any | Any | Any + // Joint Download Boot | 0 | 1 | Any | Any + return gpio >= 35 && gpio <= 38; } bool getGpioPullResistor(int gpio, bool& hasPullUp, bool& hasPullDown) { @@ -103,20 +112,20 @@ bool getADC_gpio_info(int gpio_pin, int& adc, int& ch, int& t) t = -1; switch (gpio_pin) { - case 16: adc = 1; ch = 0; break; - case 17: adc = 1; ch = 1; break; - case 18: adc = 1; ch = 2; break; - case 19: adc = 1; ch = 3; break; - case 20: adc = 1; ch = 4; break; - case 21: adc = 1; ch = 5; break; - case 22: adc = 1; ch = 6; break; - case 23: adc = 1; ch = 7; break; - case 49: adc = 2; ch = 0; break; - case 50: adc = 2; ch = 1; break; - case 51: adc = 2; ch = 2; break; - case 52: adc = 2; ch = 3; break; - case 53: adc = 2; ch = 4; break; - case 54: adc = 2; ch = 5; break; + case A0: adc = 1; ch = 0; break; + case A1: adc = 1; ch = 1; break; + case A2: adc = 1; ch = 2; break; + case A3: adc = 1; ch = 3; break; + case A4: adc = 1; ch = 4; break; + case A5: adc = 1; ch = 5; break; + case A6: adc = 1; ch = 6; break; + case A7: adc = 1; ch = 7; break; + case A8: adc = 2; ch = 0; break; + case A9: adc = 2; ch = 1; break; + case A10: adc = 2; ch = 2; break; + case A11: adc = 2; ch = 3; break; + case A12: adc = 2; ch = 4; break; + case A13: adc = 2; ch = 5; break; default: return false; } diff --git a/src/src/Helpers/StringGenerator_GPIO.cpp b/src/src/Helpers/StringGenerator_GPIO.cpp index 07225c84d..e54345c0b 100644 --- a/src/src/Helpers/StringGenerator_GPIO.cpp +++ b/src/src/Helpers/StringGenerator_GPIO.cpp @@ -6,6 +6,11 @@ #include "../Helpers/StringConverter.h" #include "../../ESPEasy_common.h" +#ifdef ESP32P4 +#include + +#endif + /*********************************************************************************************\ Device GPIO name functions to share flash strings \*********************************************************************************************/ @@ -361,6 +366,20 @@ const __FlashStringHelper* getConflictingUse(int gpio, PinSelectPurpose purpose, if (Settings.isEthernetPin(gpio)) { return F("Eth"); } + #ifdef ESP32P4 + #ifdef BOARD_HAS_SDIO_ESP_HOSTED + // TODO TD-er: Make this configurable as we can set this via WiFi.setPins + switch (gpio) { + case BOARD_SDIO_ESP_HOSTED_CLK : return F("SDIO_CLK"); + case BOARD_SDIO_ESP_HOSTED_CMD : return F("SDIO_CMD"); + case BOARD_SDIO_ESP_HOSTED_D0 : return F("SDIO_D0"); + case BOARD_SDIO_ESP_HOSTED_D1 : return F("SDIO_D1"); + case BOARD_SDIO_ESP_HOSTED_D2 : return F("SDIO_D2"); + case BOARD_SDIO_ESP_HOSTED_D3 : return F("SDIO_D3"); + case BOARD_SDIO_ESP_HOSTED_RESET : return F("SDIO_RESET"); + } + #endif + #endif if (includeEthernet && Settings.isEthernetPinOptional(gpio)) { if (isGpioUsedInETHClockMode(Settings.ETH_Clock_Mode, gpio)) { return F("Eth Clock"); } From 7db117500ef705ed9bba949dfb2cc4acf79ac83f Mon Sep 17 00:00:00 2001 From: TD-er Date: Wed, 9 Jul 2025 12:29:52 +0200 Subject: [PATCH 096/564] [Cleanup] Fix JS issues --- src/src/DataStructs/Web_StreamingBuffer.cpp | 2 +- src/src/Static/WebStaticData.h | 4 ++-- static/github_clipboard.js | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/src/DataStructs/Web_StreamingBuffer.cpp b/src/src/DataStructs/Web_StreamingBuffer.cpp index 09313bf4c..6beb1a3df 100644 --- a/src/src/DataStructs/Web_StreamingBuffer.cpp +++ b/src/src/DataStructs/Web_StreamingBuffer.cpp @@ -294,8 +294,8 @@ void Web_StreamingBuffer::endStream() { lowMemorySkip = false; } delay(5); - #ifdef ESP8266 web_server.client().stop(); + #ifdef ESP8266 tcpCleanup(); #endif } diff --git a/src/src/Static/WebStaticData.h b/src/src/Static/WebStaticData.h index dff23a02d..9053f6d3c 100644 --- a/src/src/Static/WebStaticData.h +++ b/src/src/Static/WebStaticData.h @@ -103,7 +103,7 @@ static const char DATA_GITHUB_CLIPBOARD_JS[] PROGMEM = { "{var o='copyText_'+n,t=document.getElementById(o);if(t){var a='|';n%2==0&&(a+='\\n'),e+=t.innerHTML.replace(/<[Bb][Rr]\\s*\\/?>/gim,'\\n')+a}else n=101}" "e=(e=e.replace(/<\\/[Dd][Ii][Vv]\\s*\\/?>/gim,'\\n')).replace(/<[^>]*>/gim,'');" "var i=document.createElement('textarea');i.style='position: absolute;left: -1000px; top: -1000px',i.innerHTML=e,document.body.appendChild(i),i.select(),document.execCommand('copy')," - "document.body.removeChild(i),alert('Copied: ''+e+'' to clipboard!')}" + "document.body.removeChild(i),alert('Copied: '+e+' to clipboard!');}" }; #endif @@ -356,7 +356,7 @@ static const char jsClipboardCopyPart3[] PROGMEM = { "ti.select();" "document.execCommand('copy');" "document.body.removeChild(ti);" - "alert('Copied: \"' + cb + '\" to clipboard!') }" + "alert('Copied: \"' + cb + '\" to clipboard!'); }" "" }; diff --git a/static/github_clipboard.js b/static/github_clipboard.js index 46bda9535..bb2c1a8f8 100644 --- a/static/github_clipboard.js +++ b/static/github_clipboard.js @@ -23,5 +23,5 @@ function setGithubClipboard() { tempInput.select(); document.execCommand('copy'); document.body.removeChild(tempInput); - alert('Copied: "' + clipboard + '" to clipboard!') + alert('Copied: "' + clipboard + '" to clipboard!'); } From b90252efd766c008cdc40f27e58288fb5842ae3c Mon Sep 17 00:00:00 2001 From: TD-er Date: Wed, 9 Jul 2025 17:35:38 +0200 Subject: [PATCH 097/564] [Network] Add ETH config page + tweak Network Page --- src/_NW001_WiFi_STA.cpp | 79 +++++- src/_NW002_WiFi_AP.cpp | 54 ++++ src/_NW003_ETH.cpp | 255 +++++++++++++++++++ src/src/CustomBuild/define_plugin_sets.h | 14 +- src/src/DataTypes/ESPEasy_plugin_functions.h | 6 +- src/src/Globals/NWPlugins.cpp | 5 +- src/src/Static/WebStaticData.h | 2 +- src/src/WebServer/AdvancedConfigPage.cpp | 11 + src/src/WebServer/ConfigPage.cpp | 13 +- src/src/WebServer/HardwarePage.cpp | 5 +- src/src/WebServer/NetworkPage.cpp | 57 +++-- 11 files changed, 464 insertions(+), 37 deletions(-) create mode 100644 src/_NW003_ETH.cpp diff --git a/src/_NW001_WiFi_STA.cpp b/src/_NW001_WiFi_STA.cpp index 6bf696df6..1b03cfa98 100644 --- a/src/_NW001_WiFi_STA.cpp +++ b/src/_NW001_WiFi_STA.cpp @@ -10,6 +10,8 @@ # define NWPLUGIN_ID_001 1 # define NWPLUGIN_NAME_001 "WiFi Station" +# include "src/ESPEasyCore/ESPEasyNetwork.h" +# include "src/ESPEasyCore/ESPEasyWifi.h" # include "src/DataStructs/ESPEasy_EventStruct.h" # include "src/Globals/NWPlugins.h" # include "src/Helpers/ESPEasy_Storage.h" @@ -42,6 +44,66 @@ bool NWPlugin_001(NWPlugin::Function function, struct EventStruct *event, String break; } + case NWPlugin::Function::NWPLUGIN_WEBFORM_SHOW_CONNECTED: + { +# ifdef ESP32 + success = WiFi.STA.connected(); + + if (success) { + string = strformat(F("%s (ch: %d)
%s"), + WiFi.STA.SSID().c_str(), + WiFi.channel(), + WiFi.STA.BSSIDstr().c_str()); + } +# else // ifdef ESP32 + success = WiFi.isConnected(); + + if (success) { + string = strformat(F("%s (ch: %d)
%s"), + WiFi.SSID().c_str(), + WiFi.channel(), + WiFi.BSSIDstr().c_str()); + } +# endif // ifdef ESP32 + break; + } + + case NWPlugin::Function::NWPLUGIN_WEBFORM_SHOW_HOSTNAME: + { +# ifdef ESP32 + string = WiFi.STA.getHostname(); +# else + string = WiFi.hostname(); +# endif // ifdef ESP32 + break; + } + + case NWPlugin::Function::NWPLUGIN_WEBFORM_SHOW_MAC: + { +# ifdef ESP32 + string = WiFi.STA.macAddress(); +# else + string = WiFi.macAddress(); +# endif // ifdef ESP32 + + break; + } + + case NWPlugin::Function::NWPLUGIN_WEBFORM_SHOW_IP: + { +# ifdef ESP32 + string = WiFi.STA.localIP().toString(); +# else + string = WiFi.localIP().toString(); +# endif // ifdef ESP32 + break; + } + + case NWPlugin::Function::NWPLUGIN_WEBFORM_SHOW_PORT: + { + break; + } + case NWPlugin::Function::NWPLUGIN_WEBFORM_SAVE: { // SSID 1 @@ -92,10 +154,12 @@ bool NWPlugin_001(NWPlugin::Function function, struct EventStruct *event, String # if CONFIG_SOC_WIFI_SUPPORT_5G Settings.WiFi_band_mode(static_cast(getFormItemInt(getInternalLabel(LabelType::WIFI_BAND_MODE)))); # endif -# if FEATURE_USE_IPV6 - Settings.EnableIPv6(isFormItemChecked(LabelType::ENABLE_IPV6)); -# endif + /* + # if FEATURE_USE_IPV6 + Settings.EnableIPv6(isFormItemChecked(LabelType::ENABLE_IPV6)); + # endif + */ break; } @@ -126,10 +190,11 @@ bool NWPlugin_001(NWPlugin::Function function, struct EventStruct *event, String addFormIPBox(F("ESP WiFi DNS"), F("espdns"), Settings.DNS); addFormNote(F("Leave empty for DHCP")); -# if FEATURE_USE_IPV6 - addFormCheckBox(LabelType::ENABLE_IPV6, Settings.EnableIPv6()); -# endif - + /* + # if FEATURE_USE_IPV6 + addFormCheckBox(LabelType::ENABLE_IPV6, Settings.EnableIPv6()); + # endif + */ addFormSubHeader(F("WiFi Mode")); addFormCheckBox(LabelType::FORCE_WIFI_BG, Settings.ForceWiFi_bg_mode()); diff --git a/src/_NW002_WiFi_AP.cpp b/src/_NW002_WiFi_AP.cpp index 6ed0c3c1e..51f8fb40d 100644 --- a/src/_NW002_WiFi_AP.cpp +++ b/src/_NW002_WiFi_AP.cpp @@ -10,6 +10,7 @@ # define NWPLUGIN_ID_002 2 # define NWPLUGIN_NAME_002 "WiFi AP" +# include "src/ESPEasyCore/ESPEasyNetwork.h" # include "src/DataStructs/ESPEasy_EventStruct.h" # include "src/Globals/NWPlugins.h" # include "src/Helpers/ESPEasy_Storage.h" @@ -42,6 +43,59 @@ bool NWPlugin_002(NWPlugin::Function function, struct EventStruct *event, String break; } + case NWPlugin::Function::NWPLUGIN_WEBFORM_SHOW_CONNECTED: + { +# ifdef ESP32 + const uint8_t num = WiFi.AP.stationCount(); +# else + const uint8_t num = WiFi.softAPgetStationNum(); +# endif // ifdef ESP32 + + if (num > 0) { + success = true; + string = concat(num, F(" client")); + + if (num > 1) { string += 's'; } + } + break; + } + + case NWPlugin::Function::NWPLUGIN_WEBFORM_SHOW_HOSTNAME: + { +# ifdef ESP32 + string = WiFi.AP.getHostname(); +# else + string = WiFi.softAPSSID(); +# endif // ifdef ESP32 + break; + } + + case NWPlugin::Function::NWPLUGIN_WEBFORM_SHOW_MAC: + { +# ifdef ESP32 + string = WiFi.AP.macAddress(); +# else + string = WiFi.softAPmacAddress(); +# endif // ifdef ESP32 + break; + } + + case NWPlugin::Function::NWPLUGIN_WEBFORM_SHOW_IP: + { +# ifdef ESP32 + string = WiFi.AP.localIP().toString(); +# else + string = WiFi.softAPIP().toString(); +# endif // ifdef ESP32 + break; + } + + case NWPlugin::Function::NWPLUGIN_WEBFORM_SHOW_PORT: + { + break; + } + + case NWPlugin::Function::NWPLUGIN_WEBFORM_SAVE: { diff --git a/src/_NW003_ETH.cpp b/src/_NW003_ETH.cpp new file mode 100644 index 000000000..2e72f205b --- /dev/null +++ b/src/_NW003_ETH.cpp @@ -0,0 +1,255 @@ +#include "ESPEasy_common.h" + +#ifdef USES_NW003 + +// ####################################################################################################### +// ########################### Network Plugin 003: Ethernet ############################################## +// ####################################################################################################### + +# define NWPLUGIN_003 +# define NWPLUGIN_ID_003 3 +# define NWPLUGIN_NAME_003 "Ethernet" + +# include "src/DataStructs/ESPEasy_EventStruct.h" +# include "src/Globals/NWPlugins.h" +# include "src/Helpers/ESPEasy_Storage.h" +# include "src/Helpers/_NWPlugin_init.h" + +# include "src/Globals/SecuritySettings.h" +# include "src/WebServer/common.h" +# include "src/Helpers/StringConverter.h" +# include "src/WebServer/ESPEasy_WebServer.h" +# include "src/Globals/Settings.h" +# include "src/WebServer/Markup_Forms.h" +# include "src/WebServer/Markup.h" +# include "src/ESPEasyCore/ESPEasyWifi_abstracted.h" + +bool NWPlugin_003(NWPlugin::Function function, struct EventStruct *event, String& string) +{ + bool success = false; + + switch (function) + { + case NWPlugin::Function::NWPLUGIN_DRIVER_ADD: + { + NetworkDriverStruct& nw = getNetworkDriverStruct(networkDriverIndex_t::toNetworkDriverIndex(event->idx)); + break; + } + + case NWPlugin::Function::NWPLUGIN_GET_DEVICENAME: + { + string = F(NWPLUGIN_NAME_003); + break; + } + + case NWPlugin::Function::NWPLUGIN_WEBFORM_SHOW_CONNECTED: + { + success = ETH.connected(); + + if (ETH.linkUp()) { + string = concat(ETH.linkSpeed(), ETH.fullDuplex() ? F("M FD") : F("M HD")); + + if (!ETH.autoNegotiation()) { string += F("(man)"); } + } + break; + } + + case NWPlugin::Function::NWPLUGIN_WEBFORM_SHOW_HOSTNAME: + { + string = ETH.getHostname(); + break; + } + + case NWPlugin::Function::NWPLUGIN_WEBFORM_SHOW_MAC: + { + string = ETH.macAddress(); + break; + } + + case NWPlugin::Function::NWPLUGIN_WEBFORM_SHOW_IP: + { + string = ETH.localIP().toString(); + break; + } + + case NWPlugin::Function::NWPLUGIN_WEBFORM_SHOW_PORT: + { + break; + } + + case NWPlugin::Function::NWPLUGIN_WEBFORM_SAVE: + { + + webArg2ip(F("espethip"), Settings.ETH_IP); + webArg2ip(F("espethgateway"), Settings.ETH_Gateway); + webArg2ip(F("espethsubnet"), Settings.ETH_Subnet); + webArg2ip(F("espethdns"), Settings.ETH_DNS); + + Settings.ETH_Phy_Addr = getFormItemInt(F("ethphy")); + Settings.ETH_Pin_mdc_cs = getFormItemInt(F("ethmdc")); + Settings.ETH_Pin_mdio_irq = getFormItemInt(F("ethmdio")); + Settings.ETH_Pin_power_rst = getFormItemInt(F("ethpower")); + Settings.ETH_Phy_Type = static_cast(getFormItemInt(F("ethtype"))); +# if CONFIG_ETH_USE_ESP32_EMAC + Settings.ETH_Clock_Mode = static_cast(getFormItemInt(F("ethclock"))); +# endif + Settings.NetworkMedium = static_cast(getFormItemInt(F("ethwifi"))); + + break; + } + + case NWPlugin::Function::NWPLUGIN_WEBFORM_LOAD: + { + addFormSubHeader(F("Ethernet IP Settings")); + + addFormIPBox(F("ESP Ethernet IP"), F("espethip"), Settings.ETH_IP); + addFormIPBox(F("ESP Ethernet Gateway"), F("espethgateway"), Settings.ETH_Gateway); + addFormIPBox(F("ESP Ethernet Subnetmask"), F("espethsubnet"), Settings.ETH_Subnet); + addFormIPBox(F("ESP Ethernet DNS"), F("espethdns"), Settings.ETH_DNS); + addFormNote(F("Leave empty for DHCP")); + + + addFormSubHeader(F("Ethernet")); + addRowLabel_tr_id(F("Preferred network medium"), F("ethwifi")); + { + const __FlashStringHelper *ethWifiOptions[] = { + toString(NetworkMedium_t::WIFI), + toString(NetworkMedium_t::Ethernet) + }; + const FormSelectorOptions selector(NR_ELEMENTS(ethWifiOptions), ethWifiOptions); + selector.addSelector(F("ethwifi"), static_cast(Settings.NetworkMedium)); + } + addFormNote(F("Change Switch between WiFi and Ethernet requires reboot to activate")); + { + const __FlashStringHelper *ethPhyTypes[] = { + toString(EthPhyType_t::notSet), + +# if CONFIG_ETH_USE_ESP32_EMAC + toString(EthPhyType_t::LAN8720), + toString(EthPhyType_t::TLK110), + toString(EthPhyType_t::RTL8201), +# if ETH_TYPE_JL1101_SUPPORTED + toString(EthPhyType_t::JL1101), +# endif + toString(EthPhyType_t::DP83848), + toString(EthPhyType_t::KSZ8041), + toString(EthPhyType_t::KSZ8081), +# endif // if CONFIG_ETH_USE_ESP32_EMAC + +# if ESP_IDF_VERSION_MAJOR >= 5 +# if CONFIG_ETH_SPI_ETHERNET_DM9051 + toString(EthPhyType_t::DM9051), +# endif // if CONFIG_ETH_SPI_ETHERNET_DM9051 +# if CONFIG_ETH_SPI_ETHERNET_W5500 + toString(EthPhyType_t::W5500), +# endif // if CONFIG_ETH_SPI_ETHERNET_W5500 +# if CONFIG_ETH_SPI_ETHERNET_KSZ8851SNL + toString(EthPhyType_t::KSZ8851), +# endif // if CONFIG_ETH_SPI_ETHERNET_KSZ8851SNL +# endif // if ESP_IDF_VERSION_MAJOR >= 5 + }; + const int ethPhyTypes_index[] = { + static_cast(EthPhyType_t::notSet), + +# if CONFIG_ETH_USE_ESP32_EMAC + static_cast(EthPhyType_t::LAN8720), + static_cast(EthPhyType_t::TLK110), + static_cast(EthPhyType_t::RTL8201), +# if ETH_TYPE_JL1101_SUPPORTED + static_cast(EthPhyType_t::JL1101), +# endif + static_cast(EthPhyType_t::DP83848), + static_cast(EthPhyType_t::KSZ8041), + static_cast(EthPhyType_t::KSZ8081), +# endif // if CONFIG_ETH_USE_ESP32_EMAC + +# if ESP_IDF_VERSION_MAJOR >= 5 +# if CONFIG_ETH_SPI_ETHERNET_DM9051 + static_cast(EthPhyType_t::DM9051), +# endif // if CONFIG_ETH_SPI_ETHERNET_DM9051 +# if CONFIG_ETH_SPI_ETHERNET_W5500 + static_cast(EthPhyType_t::W5500), +# endif // if CONFIG_ETH_SPI_ETHERNET_W5500 +# if CONFIG_ETH_SPI_ETHERNET_KSZ8851SNL + static_cast(EthPhyType_t::KSZ8851), +# endif // if CONFIG_ETH_SPI_ETHERNET_KSZ8851SNL +# endif // if ESP_IDF_VERSION_MAJOR >= 5 + }; + + constexpr unsigned nrItems = NR_ELEMENTS(ethPhyTypes_index); + + + const int choice = + isValid(Settings.ETH_Phy_Type) + ? static_cast(Settings.ETH_Phy_Type) + : static_cast(EthPhyType_t::notSet); + + const FormSelectorOptions selector( + nrItems, + ethPhyTypes, + ethPhyTypes_index); + selector.addFormSelector( + F("Ethernet PHY type"), + F("ethtype"), + choice); + } + +# if CONFIG_ETH_USE_SPI_ETHERNET && CONFIG_ETH_USE_ESP32_EMAC +# define MDC_CS_PIN_DESCR "Ethernet MDC/CS pin" +# define MIO_IRQ_PIN_DESCR "Ethernet MDIO/IRQ pin" +# define PWR_RST_PIN_DESCR "Ethernet Power/RST pin" +# elif CONFIG_ETH_USE_SPI_ETHERNET +# define MDC_CS_PIN_DESCR "Ethernet CS pin" +# define MIO_IRQ_PIN_DESCR "Ethernet IRQ pin" +# define PWR_RST_PIN_DESCR "Ethernet RST pin" +# else // #elif CONFIG_ETH_USE_ESP32_EMAC +# define MDC_CS_PIN_DESCR "Ethernet MDC pin" +# define MIO_IRQ_PIN_DESCR "Ethernet MIO pin" +# define PWR_RST_PIN_DESCR "Ethernet Power pin" +# endif // if CONFIG_ETH_USE_SPI_ETHERNET && CONFIG_ETH_USE_ESP32_EMAC + + addFormNumericBox(F("Ethernet PHY Address"), F("ethphy"), Settings.ETH_Phy_Addr, -1, 127); + addFormNote(F("I²C-address of Ethernet PHY" +# if CONFIG_ETH_USE_ESP32_EMAC + " (0 or 1 for LAN8720, 31 for TLK110, -1 autodetect)" +# endif + )); + addFormPinSelect(PinSelectPurpose::Ethernet, formatGpioName_output( + F(MDC_CS_PIN_DESCR)), + F("ethmdc"), Settings.ETH_Pin_mdc_cs); + addFormPinSelect(PinSelectPurpose::Ethernet, formatGpioName_input( + F(MIO_IRQ_PIN_DESCR)), + F("ethmdio"), Settings.ETH_Pin_mdio_irq); + addFormPinSelect(PinSelectPurpose::Ethernet, formatGpioName_output( + F(PWR_RST_PIN_DESCR)), + F("ethpower"), Settings.ETH_Pin_power_rst); +# if CONFIG_ETH_USE_ESP32_EMAC + addRowLabel_tr_id(F("Ethernet Clock"), F("ethclock")); + { + const __FlashStringHelper *ethClockOptions[] = { + toString(EthClockMode_t::Ext_crystal_osc), + toString(EthClockMode_t::Int_50MHz_GPIO_0), + toString(EthClockMode_t::Int_50MHz_GPIO_16), + toString(EthClockMode_t::Int_50MHz_GPIO_17_inv) + }; + const FormSelectorOptions selector(NR_ELEMENTS(ethClockOptions), ethClockOptions); + selector.addSelector(F("ethclock"), static_cast(Settings.ETH_Clock_Mode)); + } +# endif // if CONFIG_ETH_USE_ESP32_EMAC + break; + } + + case NWPlugin::Function::NWPLUGIN_INIT: + { + break; + } + + + default: + break; + + } + return success; +} + +#endif // ifdef USES_NW003 diff --git a/src/src/CustomBuild/define_plugin_sets.h b/src/src/CustomBuild/define_plugin_sets.h index 9b6e7ff79..c833a02d8 100644 --- a/src/src/CustomBuild/define_plugin_sets.h +++ b/src/src/CustomBuild/define_plugin_sets.h @@ -72,7 +72,9 @@ To create/register a plugin, you have to : #define WEBSERVER_CONFIG #endif #ifndef WEBSERVER_NETWORK - #define WEBSERVER_NETWORK +// #ifdef ESP32 + #define WEBSERVER_NETWORK +// #endif #endif #ifndef WEBSERVER_CONTROL #define WEBSERVER_CONTROL @@ -3834,5 +3836,15 @@ To create/register a plugin, you have to : #undef USES_NW002 #endif #endif +#if FEATURE_ETHERNET + #ifndef USES_NW003 + #define USES_NW003 + #endif +#else + #ifdef USES_NW003 + #undef USES_NW003 + #endif +#endif + #endif // CUSTOMBUILD_DEFINE_PLUGIN_SETS_H \ No newline at end of file diff --git a/src/src/DataTypes/ESPEasy_plugin_functions.h b/src/src/DataTypes/ESPEasy_plugin_functions.h index 4953b05e2..e4b9855fe 100644 --- a/src/src/DataTypes/ESPEasy_plugin_functions.h +++ b/src/src/DataTypes/ESPEasy_plugin_functions.h @@ -142,7 +142,11 @@ public: NWPLUGIN_INIT_ALL, NWPLUGIN_EXIT, NWPLUGIN_WRITE, // Send commands to a network adapter. - NWPLUGIN_WEBFORM_SHOW_HOST_CONFIG // Used for showing host information for the network adapter. + NWPLUGIN_WEBFORM_SHOW_CONNECTED, // Used for showing connected state/speed + NWPLUGIN_WEBFORM_SHOW_HOSTNAME, // Used for showing hostname + NWPLUGIN_WEBFORM_SHOW_MAC, // Used for showing MAC + NWPLUGIN_WEBFORM_SHOW_IP , // Used for showing IP + NWPLUGIN_WEBFORM_SHOW_PORT // Used for showing host information for the network adapter. }; diff --git a/src/src/Globals/NWPlugins.cpp b/src/src/Globals/NWPlugins.cpp index adf1bdf11..c8bd96871 100644 --- a/src/src/Globals/NWPlugins.cpp +++ b/src/src/Globals/NWPlugins.cpp @@ -79,7 +79,10 @@ bool NWPluginCall(NWPlugin::Function Function, struct EventStruct *event, String case NWPlugin::Function::NWPLUGIN_GET_DEVICENAME: case NWPlugin::Function::NWPLUGIN_WEBFORM_LOAD: case NWPlugin::Function::NWPLUGIN_WEBFORM_SAVE: - case NWPlugin::Function::NWPLUGIN_WEBFORM_SHOW_HOST_CONFIG: + case NWPlugin::Function::NWPLUGIN_WEBFORM_SHOW_CONNECTED: + case NWPlugin::Function::NWPLUGIN_WEBFORM_SHOW_MAC: + case NWPlugin::Function::NWPLUGIN_WEBFORM_SHOW_IP: + case NWPlugin::Function::NWPLUGIN_WEBFORM_SHOW_PORT: { const networkIndex_t networkIndex = event->NetworkIndex; bool success = false; diff --git a/src/src/Static/WebStaticData.h b/src/src/Static/WebStaticData.h index 9053f6d3c..51f981df4 100644 --- a/src/src/Static/WebStaticData.h +++ b/src/src/Static/WebStaticData.h @@ -103,7 +103,7 @@ static const char DATA_GITHUB_CLIPBOARD_JS[] PROGMEM = { "{var o='copyText_'+n,t=document.getElementById(o);if(t){var a='|';n%2==0&&(a+='\\n'),e+=t.innerHTML.replace(/<[Bb][Rr]\\s*\\/?>/gim,'\\n')+a}else n=101}" "e=(e=e.replace(/<\\/[Dd][Ii][Vv]\\s*\\/?>/gim,'\\n')).replace(/<[^>]*>/gim,'');" "var i=document.createElement('textarea');i.style='position: absolute;left: -1000px; top: -1000px',i.innerHTML=e,document.body.appendChild(i),i.select(),document.execCommand('copy')," - "document.body.removeChild(i),alert('Copied: '+e+' to clipboard!');}" + "document.body.removeChild(i),alert('Copied: \"'+e+'\" to clipboard!');}" }; #endif diff --git a/src/src/WebServer/AdvancedConfigPage.cpp b/src/src/WebServer/AdvancedConfigPage.cpp index ee9aa48f9..de2e819ae 100644 --- a/src/src/WebServer/AdvancedConfigPage.cpp +++ b/src/src/WebServer/AdvancedConfigPage.cpp @@ -115,9 +115,12 @@ void handle_advanced() { Settings.TolerantLastArgParse(isFormItemChecked(F("tolerantargparse"))); Settings.SendToHttp_ack(isFormItemChecked(F("sendtohttp_ack"))); Settings.SendToHTTP_follow_redirects(isFormItemChecked(F("sendtohttp_redir"))); +#ifndef WEBSERVER_NETWORK Settings.ForceWiFi_bg_mode(isFormItemChecked(LabelType::FORCE_WIFI_BG)); Settings.WiFiRestart_connection_lost(isFormItemChecked(LabelType::RESTART_WIFI_LOST_CONN)); +#endif Settings.EcoPowerMode(isFormItemChecked(LabelType::CPU_ECO_MODE)); +#ifndef WEBSERVER_NETWORK Settings.WifiNoneSleep(isFormItemChecked(LabelType::FORCE_WIFI_NOSLEEP)); #ifdef SUPPORT_ARP Settings.gratuitousARP(isFormItemChecked(LabelType::PERIODICAL_GRAT_ARP)); @@ -129,6 +132,7 @@ void handle_advanced() { #endif Settings.NumberExtraWiFiScans = getFormItemInt(LabelType::WIFI_NR_EXTRA_SCANS); Settings.UseLastWiFiFromRTC(isFormItemChecked(LabelType::WIFI_USE_LAST_CONN_FROM_RTC)); +#endif Settings.JSONBoolWithoutQuotes(isFormItemChecked(LabelType::JSON_BOOL_QUOTES)); #if FEATURE_TIMING_STATS Settings.EnableTimingStats(isFormItemChecked(LabelType::ENABLE_TIMING_STATISTICS)); @@ -140,6 +144,7 @@ void handle_advanced() { #if FEATURE_I2C_DEVICE_CHECK Settings.CheckI2Cdevice(isFormItemChecked(LabelType::ENABLE_I2C_DEVICE_CHECK)); #endif // if FEATURE_I2C_DEVICE_CHECK +#ifndef WEBSERVER_NETWORK #ifndef ESP32 Settings.WaitWiFiConnect(isFormItemChecked(LabelType::WAIT_WIFI_CONNECT)); #endif @@ -151,12 +156,14 @@ void handle_advanced() { #if CONFIG_SOC_WIFI_SUPPORT_5G Settings.WiFi_band_mode(static_cast(getFormItemInt(getInternalLabel(LabelType::WIFI_BAND_MODE)))); #endif +#endif #if FEATURE_USE_IPV6 Settings.EnableIPv6(isFormItemChecked(LabelType::ENABLE_IPV6)); #endif + #ifndef BUILD_NO_RAM_TRACKER Settings.EnableRAMTracking(isFormItemChecked(LabelType::ENABLE_RAM_TRACKING)); #endif @@ -399,6 +406,7 @@ void handle_advanced() { #endif // if FEATURE_SSDP addFormNumericBox(LabelType::CONNECTION_FAIL_THRESH, Settings.ConnectionFailuresThreshold, 0, 100); +#ifndef WEBSERVER_NETWORK addFormCheckBox(LabelType::FORCE_WIFI_BG, Settings.ForceWiFi_bg_mode()); addFormCheckBox(LabelType::RESTART_WIFI_LOST_CONN, Settings.WiFiRestart_connection_lost()); @@ -406,7 +414,9 @@ void handle_advanced() { #ifdef SUPPORT_ARP addFormCheckBox(LabelType::PERIODICAL_GRAT_ARP, Settings.gratuitousARP()); #endif // ifdef SUPPORT_ARP +#endif addFormCheckBox(LabelType::CPU_ECO_MODE, Settings.EcoPowerMode()); +#ifndef WEBSERVER_NETWORK #if FEATURE_SET_WIFI_TX_PWR addFormFloatNumberBox(LabelType::WIFI_TX_MAX_PWR, Settings.getWiFi_TX_power(), 0.0f, MAX_TX_PWR_DBM_11b, 2, 0.25f); addFormNumericBox(LabelType::WIFI_SENS_MARGIN, Settings.WiFi_sensitivity_margin, -20, 30); @@ -444,6 +454,7 @@ void handle_advanced() { Settings.WiFi_band_mode()); } #endif +#endif #if FEATURE_USE_IPV6 addFormCheckBox(LabelType::ENABLE_IPV6, Settings.EnableIPv6()); diff --git a/src/src/WebServer/ConfigPage.cpp b/src/src/WebServer/ConfigPage.cpp index d02a1d23e..58962c52c 100644 --- a/src/src/WebServer/ConfigPage.cpp +++ b/src/src/WebServer/ConfigPage.cpp @@ -72,7 +72,7 @@ void handle_config() { // Password copyFormPassword(F("password"), SecuritySettings.Password, sizeof(SecuritySettings.Password)); - +#ifndef WEBSERVER_NETWORK // SSID 1 safe_strncpy(SecuritySettings.WifiSSID, webArg(F("ssid")).c_str(), sizeof(SecuritySettings.WifiSSID)); copyFormPassword(F("key"), SecuritySettings.WifiKey, sizeof(SecuritySettings.WifiKey)); @@ -97,7 +97,7 @@ void handle_config() { // Usually the AP will be started when no WiFi is defined, or the defined one cannot be found. This flag may prevent it. Settings.DoNotStartAP(isFormItemChecked(F("DoNotStartAP"))); - +#endif // TD-er Read access control from form. SecuritySettings.IPblockLevel = getFormItemInt(F("ipblocklevel")); @@ -143,6 +143,7 @@ void handle_config() { #endif Settings.deepSleepOnFail = isFormItemChecked(F("deepsleeponfail")); +#ifndef WEBSERVER_NETWORK webArg2ip(F("espip"), Settings.IP); webArg2ip(F("espgateway"), Settings.Gateway); webArg2ip(F("espsubnet"), Settings.Subnet); @@ -153,6 +154,7 @@ void handle_config() { webArg2ip(F("espethsubnet"), Settings.ETH_Subnet); webArg2ip(F("espethdns"), Settings.ETH_DNS); #endif // if FEATURE_ETHERNET +#endif #if FEATURE_ALTERNATIVE_CDN_URL set_CDN_url_custom(webArg(F("alturl"))); #endif // if FEATURE_ALTERNATIVE_CDN_URL @@ -172,6 +174,7 @@ void handle_config() { addFormCheckBox(F("Append Unit Number to hostname"), F("appendunittohostname"), Settings.appendUnitToHostname()); addFormPasswordBox(F("Admin Password"), F("password"), SecuritySettings.Password, 25); +#ifndef WEBSERVER_NETWORK addFormSubHeader(F("Wifi Settings")); addFormTextBox(getLabel(LabelType::SSID), F("ssid"), SecuritySettings.WifiSSID, 31); @@ -201,7 +204,7 @@ void handle_config() { #else // if FEATURE_ETHERNET addFormNote(F("Do not allow to start an AP when configured WiFi cannot be found")); #endif // if FEATURE_ETHERNET - +#endif // TD-er add IP access box F("ipblocklevel") addFormSubHeader(F("Client IP filtering")); @@ -219,7 +222,7 @@ void handle_config() { addFormIPBox(F("Access IP lower range"), F("iprangelow"), iplow); addFormIPBox(F("Access IP upper range"), F("iprangehigh"), iphigh); } - +#ifndef WEBSERVER_NETWORK addFormSubHeader(F("WiFi IP Settings")); addFormIPBox(F("ESP WiFi IP"), F("espip"), Settings.IP); @@ -227,7 +230,6 @@ void handle_config() { addFormIPBox(F("ESP WiFi Subnetmask"), F("espsubnet"), Settings.Subnet); addFormIPBox(F("ESP WiFi DNS"), F("espdns"), Settings.DNS); addFormNote(F("Leave empty for DHCP")); - #if FEATURE_ETHERNET addFormSubHeader(F("Ethernet IP Settings")); @@ -237,6 +239,7 @@ void handle_config() { addFormIPBox(F("ESP Ethernet DNS"), F("espethdns"), Settings.ETH_DNS); addFormNote(F("Leave empty for DHCP")); #endif // if FEATURE_ETHERNET +#endif #ifdef USES_ESPEASY_NOW addFormSubHeader(F("ESPEasy-NOW")); diff --git a/src/src/WebServer/HardwarePage.cpp b/src/src/WebServer/HardwarePage.cpp index 4caa4cb16..6b41d0c13 100644 --- a/src/src/WebServer/HardwarePage.cpp +++ b/src/src/WebServer/HardwarePage.cpp @@ -121,6 +121,7 @@ void handle_hardware() { Settings.InitSPI = isFormItemChecked(F("initspi")); // SPI Init #endif Settings.Pin_sd_cs = getFormItemInt(F("sd")); +#ifndef WEBSERVER_NETWORK #if FEATURE_ETHERNET Settings.ETH_Phy_Addr = getFormItemInt(F("ethphy")); Settings.ETH_Pin_mdc_cs = getFormItemInt(F("ethmdc")); @@ -132,6 +133,7 @@ void handle_hardware() { #endif Settings.NetworkMedium = static_cast(getFormItemInt(F("ethwifi"))); #endif // if FEATURE_ETHERNET +#endif int gpio = 0; while (gpio <= MAX_GPIO) { @@ -328,7 +330,7 @@ void handle_hardware() { addFormSubHeader(F("SD Card")); addFormPinSelect(PinSelectPurpose::SD_Card, formatGpioName_output(F("SD Card CS")), F("sd"), Settings.Pin_sd_cs); #endif // if FEATURE_SD - +#ifndef WEBSERVER_NETWORK #if FEATURE_ETHERNET addFormSubHeader(F("Ethernet")); addRowLabel_tr_id(F("Preferred network medium"), F("ethwifi")); @@ -457,6 +459,7 @@ void handle_hardware() { } #endif #endif // if FEATURE_ETHERNET +#endif addFormSubHeader(F("GPIO boot states")); diff --git a/src/src/WebServer/NetworkPage.cpp b/src/src/WebServer/NetworkPage.cpp index f23a91469..7896c727d 100644 --- a/src/src/WebServer/NetworkPage.cpp +++ b/src/src/WebServer/NetworkPage.cpp @@ -45,6 +45,8 @@ void handle_networks() // TODO TD-er: Implement saving submitted settings const nwpluginID_t nwpluginID = nwpluginID_t::toPluginID(networkDriver_webarg_value); + MakeNetworkSettings(NetworkSettings); + if (Settings.getNWPluginID_for_network(networkindex) != nwpluginID) { // NetworkDriver has changed. @@ -55,7 +57,7 @@ void handle_networks() { mustInit = true; - // handle_networks_clearLoadDefaults(networkindex, *NetworkSettings); + handle_networks_clearLoadDefaults(networkindex, *NetworkSettings); } } @@ -67,7 +69,7 @@ void handle_networks() { mustInit = true; - // handle_networks_CopySubmittedSettings(networkindex, *NetworkSettings); + handle_networks_CopySubmittedSettings(networkindex, *NetworkSettings); mustCallNWpluginSave = true; } } @@ -142,12 +144,12 @@ void handle_networks_ShowAllNetworksTable() { html_table_class_multirow(); html_TR(); - html_table_header(F(""), 70); - html_table_header(F("Nr"), 50); - html_table_header(F("Order"), 50); - html_table_header(F("Enabled"), 100); - html_table_header(F("Connected"), 100); + html_table_header(F(""), 70); + html_table_header(F("Order"), 50); + html_table_header(F("Enabled"), 100); html_table_header(F("Network Adapter")); + html_table_header(F("Connected")); + html_table_header(F("Hostname/SSID")); html_table_header(F("MAC")); html_table_header(F("IP")); html_table_header(F("Port")); @@ -176,26 +178,42 @@ void handle_networks_ShowAllNetworksTable() } addHtml(F("")); } - html_TD(); if (nwplugin_set) { + // order + html_TD(); addEnabled(Settings.getNetworkEnabled(x)); - html_TD(); + + // Network Adapter addHtml(getNWPluginNameFromNWPluginID(Settings.getNWPluginID_for_network(x))); - html_TD(); + + const NWPlugin::Function functions[] { + NWPlugin::Function::NWPLUGIN_WEBFORM_SHOW_CONNECTED, + NWPlugin::Function::NWPLUGIN_WEBFORM_SHOW_HOSTNAME, + NWPlugin::Function::NWPLUGIN_WEBFORM_SHOW_MAC, + NWPlugin::Function::NWPLUGIN_WEBFORM_SHOW_IP, + NWPlugin::Function::NWPLUGIN_WEBFORM_SHOW_PORT + }; const networkDriverIndex_t NetworkDriverIndex = getNetworkDriverIndex_from_NetworkIndex(x); - { - String hostDescription; - NWPluginCall(NetworkDriverIndex, NWPlugin::Function::NWPLUGIN_WEBFORM_SHOW_HOST_CONFIG, 0, hostDescription); - if (!hostDescription.isEmpty()) { - addHtml(hostDescription); + for (uint8_t i = 0; i < NR_ELEMENTS(functions); ++i) { + html_TD(); + String str; + const bool res = NWPluginCall(NetworkDriverIndex, functions[i], 0, str); + + if (functions[i] == NWPlugin::Function::NWPLUGIN_WEBFORM_SHOW_CONNECTED) { + if (!res || str.isEmpty()) { + addEnabled(res); + } } - } - html_TD(); + if (!str.isEmpty()) { + addHtml(str); + } + + } /* const NetworkDriverStruct& adapter = getNetworkDriverStruct(NetworkDriverIndex); @@ -204,12 +222,11 @@ void handle_networks_ShowAllNetworksTable() addHtmlInt(13 == nwpluginID ? Settings.UDPPort : NetworkSettings->Port); // P2P/C013 exception } */ + } else { - html_TD(3); + html_TD(7); } - html_TD(3); - } html_end_table(); From 57731b4849f35e8e240d9734484f1427499d578b Mon Sep 17 00:00:00 2001 From: TD-er Date: Thu, 10 Jul 2025 00:45:58 +0200 Subject: [PATCH 098/564] [ESP32-P4] Add OTA update command for ESP32C6 WiFi firmware --- misc/ESP32P4/OTA_esp-hosted-mcu/Readme.md | 43 ++++++++++++++++++ .../OTA_esp-hosted-mcu/network_adapter.bin | Bin 0 -> 1113456 bytes src/src/Commands/InternalCommands.cpp | 3 ++ src/src/Commands/InternalCommands_decoder.cpp | 3 ++ src/src/Commands/InternalCommands_decoder.h | 3 ++ src/src/Commands/WiFi.cpp | 40 ++++++++++++++++ src/src/Commands/WiFi.h | 7 +++ 7 files changed, 99 insertions(+) create mode 100644 misc/ESP32P4/OTA_esp-hosted-mcu/Readme.md create mode 100644 misc/ESP32P4/OTA_esp-hosted-mcu/network_adapter.bin diff --git a/misc/ESP32P4/OTA_esp-hosted-mcu/Readme.md b/misc/ESP32P4/OTA_esp-hosted-mcu/Readme.md new file mode 100644 index 000000000..5fbaf51d8 --- /dev/null +++ b/misc/ESP32P4/OTA_esp-hosted-mcu/Readme.md @@ -0,0 +1,43 @@ +# ESP-Hosted SDIO WiFi + +The ESP32-p4 does not have a WiFi radio built in. +Therefore each ESP32-p4 board is equiped with a separate ESP32-C6 module to add WiFi-support. + +Both ESP32-p4 and ESP32-c6 are connected via a fast SDIO bus. + +The ESP32-c6 does run a firmware on its own. +This is the esp-hosted-mcu firmware. +For more information see [esp-hosted-mcu GitHub docs](https://github.com/espressif/esp-hosted-mcu/blob/main/docs/sdio.md) + + +The factory flashed firmware of this ESP32-c6 is quite old and typically is running version 0.0.6 + +N.B. Whenever the ESP32-C6 module is not yet flashed, or an update failed, the C6 can be flashed again with build 0.0.6 using [this site](https://espressif.github.io/arduino-esp32/c6-hosted/) +For this, a separate USB to serial adapter must be wired to the RX/TX pins of the C6, which are accessible via some pin header. (at least on all P4 boards currently available) + +ESP-IDF 5.5 is compiled to link against firmware 2.0.12 + +As stated in the [esp-hosted-mcu troubleshooting docs](https://github.com/espressif/esp-hosted-mcu/blob/main/docs/troubleshooting.md#3-make-sure-hosted-code-is-in-sync-for-master-and-slave), both the 'hosted code' (running on the ESP32-p4) and the 'slave code' (running on the ESP32-c6) should be kept in sync. + + + +# OTA update ESP-Hosted-MCU firmware + +In this folder, there is a freshly build firmware for the ESP32-C6, based on version 2.0.13 + +This file must be made available via some HTTP (not HTTPS) web server, which can be accessed by the ESP32-P4 via WiFi. + +For example upload the file to another ESPEasy node with at least 1.2 MByte free space on its file system. (e.g. some ESP32-S3 with 16M flash) + +Then this command must be given (adapt the URL for your own situation) + +``` +wifiotahostedmcu,"http://192.168.11.1/network_adapter.bin" +``` + +Make sure the complete URL is given, including `http://` and ending with `network_adapter.bin` + + +Keep an eye on the logs via the serial port of the P4 to see its progres. + +After about 30 - 60 seconds (depending also on the connection speed of the ESP board serving the file) the ESP32-P4 will reboot and start using the newly flashed WiFi firmware. \ No newline at end of file diff --git a/misc/ESP32P4/OTA_esp-hosted-mcu/network_adapter.bin b/misc/ESP32P4/OTA_esp-hosted-mcu/network_adapter.bin new file mode 100644 index 0000000000000000000000000000000000000000..0a1b4b6fdbe87f5f33065fb71103ade4c6a47be7 GIT binary patch literal 1113456 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≦Fb42&311;ztL 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
  • *?da6iBr$aELOW*b5fo{Y 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 VX23*1?(wKpQ#ZdPTy- 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 literal 0 HcmV?d00001 diff --git a/src/src/Commands/InternalCommands.cpp b/src/src/Commands/InternalCommands.cpp index a4e82b2af..bef48922c 100644 --- a/src/src/Commands/InternalCommands.cpp +++ b/src/src/Commands/InternalCommands.cpp @@ -485,6 +485,9 @@ bool InternalCommands::executeInternalCommand() case ESPEasy_cmd_e::wifikey: COMMAND_CASE_R(Command_Wifi_Key, 1); // WiFi.h case ESPEasy_cmd_e::wifikey2: COMMAND_CASE_R(Command_Wifi_Key2, 1); // WiFi.h case ESPEasy_cmd_e::wifimode: COMMAND_CASE_R(Command_Wifi_Mode, 1); // WiFi.h +#ifdef ESP32P4 + case ESPEasy_cmd_e::wifiotahostedmcu: COMMAND_CASE_R(Command_Wifi_OTA_hosted_mcu, 1); // WiFi.h +#endif case ESPEasy_cmd_e::wifiscan: COMMAND_CASE_R(Command_Wifi_Scan, 0); // WiFi.h case ESPEasy_cmd_e::wifissid: COMMAND_CASE_R(Command_Wifi_SSID, 1); // WiFi.h case ESPEasy_cmd_e::wifissid2: COMMAND_CASE_R(Command_Wifi_SSID2, 1); // WiFi.h diff --git a/src/src/Commands/InternalCommands_decoder.cpp b/src/src/Commands/InternalCommands_decoder.cpp index 8074dd70c..202efe840 100644 --- a/src/src/Commands/InternalCommands_decoder.cpp +++ b/src/src/Commands/InternalCommands_decoder.cpp @@ -292,6 +292,9 @@ const char Internal_commands_w[] PROGMEM = "wifikey|" "wifikey2|" "wifimode|" +#ifdef ESP32P4 + "wifiotahostedmcu|" +#endif "wifiscan|" "wifissid|" "wifissid2|" diff --git a/src/src/Commands/InternalCommands_decoder.h b/src/src/Commands/InternalCommands_decoder.h index 88f86351e..4750c4c1b 100644 --- a/src/src/Commands/InternalCommands_decoder.h +++ b/src/src/Commands/InternalCommands_decoder.h @@ -237,6 +237,9 @@ enum class ESPEasy_cmd_e : uint8_t { wifikey, wifikey2, wifimode, +#ifdef ESP32P4 + wifiotahostedmcu, +#endif wifiscan, wifissid, wifissid2, diff --git a/src/src/Commands/WiFi.cpp b/src/src/Commands/WiFi.cpp index c6d6de661..0cb8ad69a 100644 --- a/src/src/Commands/WiFi.cpp +++ b/src/src/Commands/WiFi.cpp @@ -151,4 +151,44 @@ const __FlashStringHelper* Command_WiFi_Erase(struct EventStruct *event, const c : return_command_failed_flashstr(); } + +# ifdef ESP32P4 +# include "esp_hosted.h" + +// Perform OTA update on the esp-hosted-mcu firmware of the external WiFi module (typically ESP32-C6) +String Command_Wifi_OTA_hosted_mcu( + struct EventStruct *event, const char *Line) +{ + + String url; + + if (GetArgv(Line, url, 2)) { + if (!url.startsWith(F("http://"))) { + String str(concat(F("OTA update esp-hosted-mcu not HTTP url: "), url)); + addLog(LOG_LEVEL_ERROR, str); + return str; + } + + if (!url.endsWith(F("network_adapter.bin"))) { + String str(concat(F("OTA update esp-hosted-mcu not correct file: "), url)); + addLog(LOG_LEVEL_ERROR, str); + return str; + } + addLog(LOG_LEVEL_INFO, concat(F("OTA update esp-hosted-mcu: "), url)); + + + esp_err_t err = esp_hosted_slave_ota(url.c_str()); + + if (err != ESP_OK) { + String str(strformat(F("Failed to start OTA update: %s"), esp_err_to_name(err))); + addLog(LOG_LEVEL_ERROR, str); + return str; + } + } + return return_command_success_flashstr(); +} + +# endif // ifdef ESP32P4 + + #endif \ No newline at end of file diff --git a/src/src/Commands/WiFi.h b/src/src/Commands/WiFi.h index e1b0ebc4c..4dae930c8 100644 --- a/src/src/Commands/WiFi.h +++ b/src/src/Commands/WiFi.h @@ -36,5 +36,12 @@ const __FlashStringHelper* Command_Wifi_AllowAP(struct EventStruct *event, const __FlashStringHelper* Command_WiFi_Erase(struct EventStruct *event, const char *Line); +#ifdef ESP32P4 +// Perform OTA update on the esp-hosted-mcu firmware of the external WiFi module (typically ESP32-C6) +String Command_Wifi_OTA_hosted_mcu(struct EventStruct *event, + const char *Line); + +#endif + #endif #endif // COMMAND_WIFI_H From 1f404b34c86cc1e73d48b1ffca92d6eebb72e7d6 Mon Sep 17 00:00:00 2001 From: TD-er Date: Wed, 9 Jul 2025 17:37:13 +0200 Subject: [PATCH 099/564] Merge branch 'mega' into bugfix/WiFi_state_machine --- docs/source/Plugin/P095.rst | 8 +- .../Plugin/P095_TFTDisplayModelOptions.png | Bin 46463 -> 63394 bytes lib/Adafruit_ILI9341/Adafruit_ILI9341.cpp | 95 ++++++++++++++++++ lib/Adafruit_ILI9341/Adafruit_ILI9341.h | 2 + src/_P095_ILI9341.ino | 12 ++- src/src/DataStructs/Web_StreamingBuffer.cpp | 1 + src/src/PluginStructs/P093_data_struct.h | 6 +- src/src/PluginStructs/P095_data_struct.cpp | 10 +- src/src/PluginStructs/P095_data_struct.h | 8 ++ 9 files changed, 134 insertions(+), 8 deletions(-) diff --git a/docs/source/Plugin/P095.rst b/docs/source/Plugin/P095.rst index 3d1f22e78..203331c75 100644 --- a/docs/source/Plugin/P095.rst +++ b/docs/source/Plugin/P095.rst @@ -97,18 +97,22 @@ Device Settings * **TFT Display model**: Select the hardware model that is connected. Currently there are only preset resolutions available. -* **Invert display**: Default value for Invert display, some displays have foreground and background colors swapped (f.e. M5Stack Core2 using ILI9342C and some ILI9486/ILI9488 models), this option is applied at plugin initialization. - Available options: .. image:: P095_TFTDisplayModelOptions.png :alt: TFT Display model options +The available options here depend on the build used, as some are only available on ESP32 because they won't fit in an ESP8266 build. + +Some of the display controllers need the **Invert display** setting checked to show the correct colors. + .. warning:: The **ILI9481** display controller does have issues when rotating, by using the ``,rot,`` command, to change the display orientation after some content is already displayed on the screen (content may move, rotate and/or mirror unexpectedly). It is advised to clear the screen after changing the rotation setting. .. note:: ILI9486 displays tested so far (sourced from Aliexpress) either are *compatible* with ILI9488 or **are** ILI9488 displays, that's why they share the same entry in the list. If you find an ILI9486 display that doesn't work with this setting, please raise an issue in ESPEasy Github Issues list, so this can be adjusted. +* **Invert display**: When checked will Invert display colors, as some displays have foreground and background colors swapped (f.e. M5Stack Core2 using ILI9342C, some ILI9342 CYD (Cheap Yellow Display) boards, and some ILI9486/ILI9488 models), this option is applied at plugin initialization. + Layout ^^^^^^^^ diff --git a/docs/source/Plugin/P095_TFTDisplayModelOptions.png b/docs/source/Plugin/P095_TFTDisplayModelOptions.png index 9eb88b673922243844413fb275193f71f0cf2be4..7494c07f7ae4e4a6e177c74c4c016f276fd165cc 100644 GIT binary patch literal 63394 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 l!Ba-~oi@9v$3cD`pABHdRMnS29@8$(V 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 literal 46463 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 E0p|2hjQ{`u diff --git a/lib/Adafruit_ILI9341/Adafruit_ILI9341.cpp b/lib/Adafruit_ILI9341/Adafruit_ILI9341.cpp index 2a61cf3da..88c0e2ae5 100644 --- a/lib/Adafruit_ILI9341/Adafruit_ILI9341.cpp +++ b/lib/Adafruit_ILI9341/Adafruit_ILI9341.cpp @@ -238,6 +238,83 @@ static const uint8_t PROGMEM initcmd_9342[] = { // ILI9342 // clang-format on +#ifdef ESP32 +// clang-format off +static const uint8_t PROGMEM initcmd_9342_2[] = { // ILI9342_2 (CYD/Adafruit) + 0xEF, 3, 0x03, 0x80, 0x02, + 0xCF, 3, 0x00, 0xC1, 0x30, + 0xED, 4, 0x64, 0x03, 0x12, 0x81, + 0xE8, 3, 0x85, 0x00, 0x78, + 0xCB, 5, 0x39, 0x2C, 0x00, 0x34, 0x02, + 0xF7, 1, 0x20, + 0xEA, 2, 0x00, 0x00, + ILI9341_PWCTR1, 1, 0x23, // Power control VRH[5:0] + ILI9341_PWCTR2, 1, 0x10, // Power control SAP[2:0];BT[3:0] + ILI9341_VMCTR1, 2, 0x2B, 0x2B, // VCM control + ILI9341_VMCTR2, 1, 0xC0, // VCM control2 + ILI9341_MADCTL, 1, (MADCTL_MX | MADCTL_BGR), // Memory Access Control + ILI9341_VSCRSADD, 1, 0x00, // Vertical scroll zero + ILI9341_PIXFMT, 1, 0x55, + ILI9341_FRMCTR1, 2, 0x00, 0x1B, + ILI9341_DFUNCTR, 3, 0x08, 0x82, 0x27, // Display Function Control + 0xF2, 1, 0x00, // 3Gamma Function Disable + ILI9341_GAMMASET, 1, 0x01, // Gamma curve selected + ILI9341_GMCTRP1, 15, 0x0F, 0x31, 0x2B, 0x0C, 0x0E, + 0x08, + 0x4E, 0xF1, 0x37, 0x07, 0x10, 0x03, 0x0E, + 0x09, 0x00, // + // Set + // Gamma + ILI9341_GMCTRN1, 15, 0x00, 0x0E, 0x14, 0x03, 0x11, + 0x07, + 0x31, 0xC1, 0x48, 0x08, 0x0F, 0x0C, 0x31, + 0x36, 0x0F, // Set Gamma + ILI9341_SLPOUT, 0x80, // Exit Sleep + ILI9341_DISPON, 0x80, // Display on + 0x00 // End of list +}; + +// clang-format on +// clang-format off +static const uint8_t PROGMEM initcmd_9342_3[] = { // ILI9342_3 (CYD/Bodmer) + 0xEF, 3, 0x03, 0x80, 0x02, + 0xCF, 3, 0x00, 0xC1, 0x30, + 0xED, 4, 0x64, 0x03, 0x12, 0x81, + 0xE8, 3, 0x85, 0x00, 0x78, + 0xCB, 5, 0x39, 0x2C, 0x00, 0x34, 0x02, + 0xF7, 1, 0x20, + 0xEA, 2, 0x00, 0x00, + ILI9341_PWCTR1, 1, 0x10, // Power control VRH[5:0] + ILI9341_PWCTR2, 1, 0x00, // Power control SAP[2:0];BT[3:0] + ILI9341_VMCTR1, 2, 0x30, 0x30, // VCM control + ILI9341_VMCTR2, 1, 0xB7, // VCM control2 + ILI9341_MADCTL, 1, (MADCTL_BGR), // Memory Access Control + // ILI9341_VSCRSADD, 1, 0x00, // Vertical scroll zero + ILI9341_PIXFMT, 1, 0x55, + ILI9341_FRMCTR1, 2, 0x00, 0x1A, + ILI9341_DFUNCTR, 3, 0x08, 0x82, 0x27, // Display Function Control + 0xF2, 1, 0x00, // 3Gamma Function Disable + ILI9341_GAMMASET, 1, 0x01, // Gamma curve selected + ILI9341_GMCTRP1, 15, 0x0F, 0x2A, 0x28, 0x08, 0x0E, + 0x08, + 0x54, 0xA9, 0x43, 0x0A, 0x0F, 0x00, 0x00, + 0x00, 0x00, // + // Set + // Gamma + ILI9341_GMCTRN1, 15, 0x00, 0x15, 0x17, 0x07, 0x11, + 0x06, + 0x2B, 0x56, 0x3C, 0x05, 0x10, 0x0F, 0x3F, + 0x3F, 0x0F, // Set Gamma + ILI9341_PASET, 4, 0x00, 0x00, 0x01, 0x3F, + ILI9341_CASET, 4, 0x00, 0x00, 0x00, 0xEF, + ILI9341_SLPOUT, 0x80, // Exit Sleep + ILI9341_DISPON, 0x80, // Display on + 0x00 // End of list +}; + +// clang-format on +#endif // ifdef ESP32 + // clang-format off static const uint8_t PROGMEM initcmd_9481[] = { // ILI9481 ILI9341_SLPOUT, 0x80, // Exit Sleep @@ -478,6 +555,14 @@ void Adafruit_ILI9341::begin(uint32_t freq) { case ILI_TYPE_9342: // ILI9342 M5STACK addr = initcmd_9342; break; + #ifdef ESP32 + case ILI_TYPE_9342_2: // ILI9342 CYD/Adafruit + addr = initcmd_9342_2; + break; + case ILI_TYPE_9342_3: // ILI9342 CYD/Bodmer + addr = initcmd_9342_3; + break; + #endif // ifdef ESP32 case ILI_TYPE_9481: // ILI9481 addr = initcmd_9481; break; @@ -540,6 +625,9 @@ void Adafruit_ILI9341::setRotation(uint8_t m) { case ILI_TYPE_9342: // ILI9342 M5STACK m = (MADCTL_MY | MADCTL_MV | MADCTL_BGR); break; + case ILI_TYPE_9342_2: // ILI9342 CYD/Adafruit + m = (MADCTL_BGR); + break; case ILI_TYPE_9481: // ILI9481 case ILI_TYPE_9481_CPT29: // ILI9481 CPT29 case ILI_TYPE_9481_PVI35: // ILI9481 PVI35 @@ -551,6 +639,7 @@ void Adafruit_ILI9341::setRotation(uint8_t m) { m = (MADCTL_SS | MADCTL_BGR); break; case ILI_TYPE_9341: // ILI9341 + case ILI_TYPE_9342_3: // ILI9342 CYD/Bodmer // m = (MADCTL_MX | MADCTL_BGR); // break; default: @@ -577,6 +666,8 @@ void Adafruit_ILI9341::setRotation(uint8_t m) { // m = (MADCTL_MV | MADCTL_BGR); // break; case ILI_TYPE_9341: // ILI9341 + case ILI_TYPE_9342_2: // ILI9342 CYD/Adafruit + case ILI_TYPE_9342_3: // ILI9342 CYD/Bodmer // m = (MADCTL_MV | MADCTL_BGR); // break; default: @@ -603,6 +694,8 @@ void Adafruit_ILI9341::setRotation(uint8_t m) { m = (MADCTL_GS | MADCTL_BGR); break; case ILI_TYPE_9341: // ILI9341 + case ILI_TYPE_9342_2: // ILI9342 CYD/Adafruit + case ILI_TYPE_9342_3: // ILI9342 CYD/Bodmer // m = (MADCTL_MY | MADCTL_BGR); // break; default: @@ -629,6 +722,8 @@ void Adafruit_ILI9341::setRotation(uint8_t m) { m = (MADCTL_SS | MADCTL_GS | MADCTL_MV | MADCTL_BGR); break; case ILI_TYPE_9341: // ILI9341 + case ILI_TYPE_9342_2: // ILI9342 CYD/Adafruit + case ILI_TYPE_9342_3: // ILI9342 CYD/Bodmer // m = (MADCTL_MX | MADCTL_MY | MADCTL_MV | MADCTL_BGR); // break; default: diff --git a/lib/Adafruit_ILI9341/Adafruit_ILI9341.h b/lib/Adafruit_ILI9341/Adafruit_ILI9341.h index 346877acc..349323700 100644 --- a/lib/Adafruit_ILI9341/Adafruit_ILI9341.h +++ b/lib/Adafruit_ILI9341/Adafruit_ILI9341.h @@ -128,6 +128,8 @@ #define ILI_TYPE_9341 0 // MUST match with enum class ILI9xxx_type_e in P095_data_struct.h ! #define ILI_TYPE_9342 1 +#define ILI_TYPE_9342_2 12 // !! ONLY enabled on ESP32 for size reasons !! +#define ILI_TYPE_9342_3 13 // !! ONLY enabled on ESP32 for size reasons !! #define ILI_TYPE_9481 2 #define ILI_TYPE_9481_CPT29 3 #define ILI_TYPE_9481_PVI35 4 diff --git a/src/_P095_ILI9341.ino b/src/_P095_ILI9341.ino index 4babc42fd..9f7ae8a03 100644 --- a/src/_P095_ILI9341.ino +++ b/src/_P095_ILI9341.ino @@ -229,6 +229,10 @@ boolean Plugin_095(uint8_t function, struct EventStruct *event, String& string) const __FlashStringHelper *hardwareTypes[] = { ILI9xxx_type_toString(ILI9xxx_type_e::ILI9341_240x320), ILI9xxx_type_toString(ILI9xxx_type_e::ILI9342_240x320), + # if P095_ENABLE_ILI9342_2 + ILI9xxx_type_toString(ILI9xxx_type_e::ILI9342_CYD_AF_240x320), + ILI9xxx_type_toString(ILI9xxx_type_e::ILI9342_CYD_BD_240x320), + # endif // if P095_ENABLE_ILI9342_2 ILI9xxx_type_toString(ILI9xxx_type_e::ILI9481_320x480), ILI9xxx_type_toString(ILI9xxx_type_e::ILI9481_CPT29_320x480), ILI9xxx_type_toString(ILI9xxx_type_e::ILI9481_PVI35_320x480), @@ -246,6 +250,10 @@ boolean Plugin_095(uint8_t function, struct EventStruct *event, String& string) constexpr int hardwareOptions[] = { static_cast(ILI9xxx_type_e::ILI9341_240x320), static_cast(ILI9xxx_type_e::ILI9342_240x320), + # if P095_ENABLE_ILI9342_2 + static_cast(ILI9xxx_type_e::ILI9342_CYD_AF_240x320), + static_cast(ILI9xxx_type_e::ILI9342_CYD_BD_240x320), + # endif // if P095_ENABLE_ILI9342_2 static_cast(ILI9xxx_type_e::ILI9481_320x480), static_cast(ILI9xxx_type_e::ILI9481_CPT29_320x480), static_cast(ILI9xxx_type_e::ILI9481_PVI35_320x480), @@ -262,8 +270,8 @@ boolean Plugin_095(uint8_t function, struct EventStruct *event, String& string) }; constexpr size_t optionCount = NR_ELEMENTS(hardwareOptions); const FormSelectorOptions selector(optionCount, - hardwareTypes, - hardwareOptions); + hardwareTypes, + hardwareOptions); selector.addFormSelector( F("TFT display model"), F("dsptype"), diff --git a/src/src/DataStructs/Web_StreamingBuffer.cpp b/src/src/DataStructs/Web_StreamingBuffer.cpp index 6beb1a3df..a98f70f9f 100644 --- a/src/src/DataStructs/Web_StreamingBuffer.cpp +++ b/src/src/DataStructs/Web_StreamingBuffer.cpp @@ -293,6 +293,7 @@ void Web_StreamingBuffer::endStream() { addLog(LOG_LEVEL_ERROR, concat("Webpage skipped: low memory: ", finalRam)); lowMemorySkip = false; } + delay(5); web_server.client().stop(); #ifdef ESP8266 diff --git a/src/src/PluginStructs/P093_data_struct.h b/src/src/PluginStructs/P093_data_struct.h index af44c3768..43f25433f 100644 --- a/src/src/PluginStructs/P093_data_struct.h +++ b/src/src/PluginStructs/P093_data_struct.h @@ -122,9 +122,9 @@ private: static const uint8_t Power = 0x02; static const uint8_t Mode = 0x04; static const uint8_t Fan = 0x08; - static const uint8_t Vane = 0x10; - static const uint8_t WideVane = 0x20; - static const uint8_t RemoteTemperature = 0x30; + static const uint8_t Vane = 0x20; + static const uint8_t WideVane = 0x30; + static const uint8_t RemoteTemperature = 0x40; struct WriteStatus { WriteStatus() : _flags(0) {} diff --git a/src/src/PluginStructs/P095_data_struct.cpp b/src/src/PluginStructs/P095_data_struct.cpp index 699b74f4b..927b4e36c 100644 --- a/src/src/PluginStructs/P095_data_struct.cpp +++ b/src/src/PluginStructs/P095_data_struct.cpp @@ -9,6 +9,10 @@ const __FlashStringHelper* ILI9xxx_type_toString(const ILI9xxx_type_e& device) { switch (device) { case ILI9xxx_type_e::ILI9341_240x320: return F("ILI9341 240 x 320px"); case ILI9xxx_type_e::ILI9342_240x320: return F("ILI9342 240 x 320px (M5Stack)"); + # if P095_ENABLE_ILI9342_2 + case ILI9xxx_type_e::ILI9342_CYD_AF_240x320: return F("ILI9342 240 x 320px (CYD-1)"); + case ILI9xxx_type_e::ILI9342_CYD_BD_240x320: return F("ILI9342 240 x 320px (CYD-2)"); + # endif // if P095_ENABLE_ILI9342_2 case ILI9xxx_type_e::ILI9481_320x480: return F("ILI9481 320 x 480px"); case ILI9xxx_type_e::ILI9481_CPT29_320x480: return F("ILI9481 320 x 480px (CPT29)"); case ILI9xxx_type_e::ILI9481_PVI35_320x480: return F("ILI9481 320 x 480px (PVI35)"); @@ -39,6 +43,10 @@ void ILI9xxx_type_toResolution(const ILI9xxx_type_e& device, switch (device) { case ILI9xxx_type_e::ILI9341_240x320: case ILI9xxx_type_e::ILI9342_240x320: + # if P095_ENABLE_ILI9342_2 + case ILI9xxx_type_e::ILI9342_CYD_AF_240x320: + case ILI9xxx_type_e::ILI9342_CYD_BD_240x320: + # endif // if P095_ENABLE_ILI9342_2 x = 240; y = 320; break; @@ -180,7 +188,7 @@ bool P095_data_struct::plugin_init(struct EventStruct *event) { log += F("in"); } log += strformat(F("valid, display: %s, commands: %s/%s"), - String(ILI9xxx_type_toString(_displayType)).c_str(), + FsP(ILI9xxx_type_toString(_displayType)), _commandTrigger.c_str(), _commandTriggerCmd.c_str()); addLogMove(LOG_LEVEL_INFO, log); diff --git a/src/src/PluginStructs/P095_data_struct.h b/src/src/PluginStructs/P095_data_struct.h index 679d57d34..dec258d0e 100644 --- a/src/src/PluginStructs/P095_data_struct.h +++ b/src/src/PluginStructs/P095_data_struct.h @@ -22,6 +22,10 @@ # define P095_ENABLE_ILI948X 0 // Not enabled for limited buildsizes # endif // if defined(LIMIT_BUILD_SIZE) && P095_ENABLE_ILI948X && !defined(PLUGIN_BUILD_CUSTOM) +# if !defined(P095_ENABLE_ILI9342_2) && defined(ESP32) +# define P095_ENABLE_ILI9342_2 1 +# endif // if !defined(P095_ENABLE_ILI9342_2) && defined(ESP32) + # if P095_ENABLE_ILI948X # include // Specific behavior: ILI9488 needs 24 bit colors in SPI mode # endif // if P095_ENABLE_ILI948X @@ -97,6 +101,10 @@ enum class ILI9xxx_type_e : uint8_t { // ILI9486_320x480 = 10u, ILI9488_320x480 = 11u, // Uses a separate library for having a 16 bit data interface # endif // if P095_ENABLE_ILI948X + # if P095_ENABLE_ILI9342_2 + ILI9342_CYD_AF_240x320 = 12u, + ILI9342_CYD_BD_240x320 = 13u, + # endif // if P095_ENABLE_ILI9342_2 }; enum class P095_CommandTrigger : uint8_t { From f2f89bdf94d387b64e1ab80c56f8a547081ef4f5 Mon Sep 17 00:00:00 2001 From: TD-er Date: Thu, 10 Jul 2025 21:46:49 +0200 Subject: [PATCH 100/564] [Network] Split ESP32P4 code from other MCUs --- src/_NW001_WiFi_STA.cpp | 54 ++++-- src/_NW002_WiFi_AP.cpp | 12 ++ src/_NW003_ETH.cpp | 43 +++++ src/src/CustomBuild/ESPEasyDefaults.h | 2 +- .../DataStructs/GpioFactorySettingsStruct.cpp | 159 +++++++++--------- src/src/DataStructs/SettingsStruct.h | 4 +- src/src/DataTypes/ESPEasy_plugin_functions.h | 1 + src/src/DataTypes/EthernetParameters.cpp | 34 ---- src/src/DataTypes/EthernetParameters.h | 19 +++ .../DataTypes/EthernetParameters_ESP32.cpp | 42 +++++ .../DataTypes/EthernetParameters_ESP32P4.cpp | 70 ++++++++ src/src/ESPEasyCore/ESPEasyEth.cpp | 7 +- .../ESPEasyWifi_abstracted_ESP32.cpp | 4 +- src/src/Globals/NWPlugins.cpp | 1 + src/src/Helpers/Hardware_device_info.cpp | 3 +- .../Helpers/Hardware_device_info_ESP32P4.cpp | 16 +- src/src/Helpers/_NWPlugin_Helper_webform.cpp | 1 + src/src/WebServer/HTML_Print.cpp | 6 +- src/src/WebServer/NetworkPage.cpp | 29 +++- 19 files changed, 367 insertions(+), 140 deletions(-) create mode 100644 src/src/DataTypes/EthernetParameters_ESP32.cpp create mode 100644 src/src/DataTypes/EthernetParameters_ESP32P4.cpp diff --git a/src/_NW001_WiFi_STA.cpp b/src/_NW001_WiFi_STA.cpp index 1b03cfa98..be56ffbc1 100644 --- a/src/_NW001_WiFi_STA.cpp +++ b/src/_NW001_WiFi_STA.cpp @@ -26,6 +26,13 @@ # include "src/WebServer/Markup.h" # include "src/ESPEasyCore/ESPEasyWifi_abstracted.h" +# include "src/WebServer/HTML_Print.h" +# include "src/WebServer/HTML_wrappers.h" + +# ifdef ESP32P4 +# include +# endif + bool NWPlugin_001(NWPlugin::Function function, struct EventStruct *event, String& string) { bool success = false; @@ -146,11 +153,7 @@ bool NWPlugin_001(NWPlugin::Function function, struct EventStruct *event, String # ifndef ESP32 Settings.WaitWiFiConnect(isFormItemChecked(LabelType::WAIT_WIFI_CONNECT)); # endif - Settings.HiddenSSID_SlowConnectPerBSSID(isFormItemChecked(LabelType::HIDDEN_SSID_SLOW_CONNECT)); Settings.SDK_WiFi_autoreconnect(isFormItemChecked(LabelType::SDK_WIFI_AUTORECONNECT)); -# ifdef ESP32 - Settings.PassiveWiFiScan(isFormItemChecked(LabelType::WIFI_PASSIVE_SCAN)); -# endif # if CONFIG_SOC_WIFI_SUPPORT_5G Settings.WiFi_band_mode(static_cast(getFormItemInt(getInternalLabel(LabelType::WIFI_BAND_MODE)))); # endif @@ -168,6 +171,25 @@ bool NWPlugin_001(NWPlugin::Function function, struct EventStruct *event, String { addFormSubHeader(F("Wifi Settings")); + // TODO Add pin configuration for ESP32P4. + // ESP32-C5 may use different SDIO pins. + // See: https://github.com/espressif/esp-hosted-mcu/blob/main/docs/sdio.md#esp32-p4-function-ev-board-host-pin-mapping + + +# ifdef ESP32P4 + { + addRowLabel(F("ESP Hosted Firmware")); + esp_hosted_coprocessor_fwver_t ver_info; + esp_hosted_get_coprocessor_fwversion(&ver_info); + addHtml(strformat( + F("%d.%d.%d"), + ver_info.major1, + ver_info.minor1, + ver_info.patch1)); + } +# endif // ifdef ESP32P4 + + addFormTextBox(getLabel(LabelType::SSID), F("ssid"), SecuritySettings.WifiSSID, 31); addFormPasswordBox(F("WPA Key"), F("key"), SecuritySettings.WifiKey, 63); addFormTextBox(F("Fallback SSID"), F("ssid2"), SecuritySettings.WifiSSID2, 31); @@ -175,13 +197,11 @@ bool NWPlugin_001(NWPlugin::Function function, struct EventStruct *event, String addFormNote(F("WPA Key must be at least 8 characters long")); addFormCheckBox(LabelType::CONNECT_HIDDEN_SSID, Settings.IncludeHiddenSSID()); - + addFormCheckBox(LabelType::HIDDEN_SSID_SLOW_CONNECT, Settings.HiddenSSID_SlowConnectPerBSSID()); # ifdef ESP32 addFormCheckBox(LabelType::WIFI_PASSIVE_SCAN, Settings.PassiveWiFiScan()); # endif - addFormCheckBox(LabelType::HIDDEN_SSID_SLOW_CONNECT, Settings.HiddenSSID_SlowConnectPerBSSID()); - addFormSubHeader(F("WiFi IP Settings")); addFormIPBox(F("ESP WiFi IP"), F("espip"), Settings.IP); @@ -238,15 +258,20 @@ bool NWPlugin_001(NWPlugin::Function function, struct EventStruct *event, String addFormCheckBox(LabelType::WAIT_WIFI_CONNECT, Settings.WaitWiFiConnect()); # endif addFormCheckBox(LabelType::SDK_WIFI_AUTORECONNECT, Settings.SDK_WiFi_autoreconnect()); - addFormCheckBox(LabelType::HIDDEN_SSID_SLOW_CONNECT, Settings.HiddenSSID_SlowConnectPerBSSID()); -# ifdef ESP32 - addFormCheckBox(LabelType::WIFI_PASSIVE_SCAN, Settings.PassiveWiFiScan()); -# endif # ifdef SUPPORT_ARP - addFormCheckBox(LabelType::PERIODICAL_GRAT_ARP, Settings.gratuitousARP()); + addFormCheckBox(LabelType::PERIODICAL_GRAT_ARP, Settings.gratuitousARP()); # endif // ifdef SUPPORT_ARP + addRowLabel(F("Driver Info")); + + HTML_Print htmlPrint; + addHtml(F("
    ")); + WiFi.STA.printTo(htmlPrint); + + // TODO TD-er: Must remove this later, as it also prints your WiFi passwd. + addHtml(F("
    ")); + WiFi.printDiag(htmlPrint); break; } @@ -256,6 +281,11 @@ bool NWPlugin_001(NWPlugin::Function function, struct EventStruct *event, String break; } + case NWPlugin::Function::NWPLUGIN_EXIT: + { + break; + } + default: break; diff --git a/src/_NW002_WiFi_AP.cpp b/src/_NW002_WiFi_AP.cpp index 51f8fb40d..ad89f97d9 100644 --- a/src/_NW002_WiFi_AP.cpp +++ b/src/_NW002_WiFi_AP.cpp @@ -25,6 +25,9 @@ # include "src/WebServer/Markup.h" # include "src/ESPEasyCore/ESPEasyWifi_abstracted.h" +# include "src/WebServer/HTML_Print.h" +# include "src/WebServer/HTML_wrappers.h" + bool NWPlugin_002(NWPlugin::Function function, struct EventStruct *event, String& string) { bool success = false; @@ -127,6 +130,11 @@ bool NWPlugin_002(NWPlugin::Function function, struct EventStruct *event, String addFormNote(F("Do not allow to start an AP when configured WiFi cannot be found")); # endif // if FEATURE_ETHERNET + addRowLabel(F("Driver Info")); + + HTML_Print htmlPrint; + addHtml(F("
    ")); + WiFi.AP.printTo(htmlPrint); break; } @@ -136,6 +144,10 @@ bool NWPlugin_002(NWPlugin::Function function, struct EventStruct *event, String break; } + case NWPlugin::Function::NWPLUGIN_EXIT: + { + break; + } default: break; diff --git a/src/_NW003_ETH.cpp b/src/_NW003_ETH.cpp index 2e72f205b..cb649a62d 100644 --- a/src/_NW003_ETH.cpp +++ b/src/_NW003_ETH.cpp @@ -23,6 +23,12 @@ # include "src/WebServer/Markup_Forms.h" # include "src/WebServer/Markup.h" # include "src/ESPEasyCore/ESPEasyWifi_abstracted.h" +# include "src/ESPEasyCore/ESPEasyEth.h" + +# include "src/WebServer/HTML_Print.h" +# include "src/WebServer/HTML_wrappers.h" + +# include bool NWPlugin_003(NWPlugin::Function function, struct EventStruct *event, String& string) { @@ -36,6 +42,21 @@ bool NWPlugin_003(NWPlugin::Function function, struct EventStruct *event, String break; } + case NWPlugin::Function::NWPLUGIN_LOAD_DEFAULTS: + { + #if CONFIG_IDF_TARGET_ESP32P4 + Settings.ETH_Clock_Mode = EthClockMode_t::Default; + Settings.ETH_Phy_Type = EthPhyType_t::TLK110; + Settings.ETH_Phy_Addr = ETH_PHY_ADDR; + Settings.ETH_Pin_mdc_cs = ETH_PHY_MDC; + Settings.ETH_Pin_mdio_irq = ETH_PHY_MDIO; + Settings.ETH_Pin_power_rst = ETH_PHY_POWER; + #else + Settings.ETH_Clock_Mode = EthClockMode_t::Ext_crystal_osc; + #endif + break; + } + case NWPlugin::Function::NWPLUGIN_GET_DEVICENAME: { string = F(NWPLUGIN_NAME_003); @@ -226,21 +247,43 @@ bool NWPlugin_003(NWPlugin::Function function, struct EventStruct *event, String # if CONFIG_ETH_USE_ESP32_EMAC addRowLabel_tr_id(F("Ethernet Clock"), F("ethclock")); { + #if CONFIG_IDF_TARGET_ESP32 const __FlashStringHelper *ethClockOptions[] = { toString(EthClockMode_t::Ext_crystal_osc), toString(EthClockMode_t::Int_50MHz_GPIO_0), toString(EthClockMode_t::Int_50MHz_GPIO_16), toString(EthClockMode_t::Int_50MHz_GPIO_17_inv) }; + #endif + #if CONFIG_IDF_TARGET_ESP32P4 + const __FlashStringHelper *ethClockOptions[] = { + toString(EthClockMode_t::Default), + toString(EthClockMode_t::Ext_crystal), + toString(EthClockMode_t::Int_50MHz) + }; + #endif const FormSelectorOptions selector(NR_ELEMENTS(ethClockOptions), ethClockOptions); selector.addSelector(F("ethclock"), static_cast(Settings.ETH_Clock_Mode)); } # endif // if CONFIG_ETH_USE_ESP32_EMAC + + addRowLabel(F("Driver Info")); + + HTML_Print htmlPrint; + addHtml(F("
    ")); + ETH.printTo(htmlPrint); + break; } case NWPlugin::Function::NWPLUGIN_INIT: { +// ETHConnectRelaxed(); + break; + } + + case NWPlugin::Function::NWPLUGIN_EXIT: + { break; } diff --git a/src/src/CustomBuild/ESPEasyDefaults.h b/src/src/CustomBuild/ESPEasyDefaults.h index f6c6319aa..1a8451ce3 100644 --- a/src/src/CustomBuild/ESPEasyDefaults.h +++ b/src/src/CustomBuild/ESPEasyDefaults.h @@ -300,7 +300,7 @@ #endif #endif #ifndef DEFAULT_ETH_CLOCK_MODE -#define DEFAULT_ETH_CLOCK_MODE EthClockMode_t::Ext_crystal_osc +#define DEFAULT_ETH_CLOCK_MODE static_cast(0) #endif #ifndef DEFAULT_NETWORK_MEDIUM #ifdef ESP32P4 diff --git a/src/src/DataStructs/GpioFactorySettingsStruct.cpp b/src/src/DataStructs/GpioFactorySettingsStruct.cpp index b0e6838a8..a511f9267 100644 --- a/src/src/DataStructs/GpioFactorySettingsStruct.cpp +++ b/src/src/DataStructs/GpioFactorySettingsStruct.cpp @@ -23,8 +23,9 @@ GpioFactorySettingsStruct::GpioFactorySettingsStruct(DeviceModel model) #ifndef LIMIT_BUILD_SIZE - switch (model) { -#if defined(ESP8266) + switch (model) + { +# if defined(ESP8266) case DeviceModel::DeviceModel_Sonoff_Basic: case DeviceModel::DeviceModel_Sonoff_TH1x: case DeviceModel::DeviceModel_Sonoff_S2x: @@ -65,33 +66,33 @@ GpioFactorySettingsStruct::GpioFactorySettingsStruct(DeviceModel model) break; case DeviceModel::DeviceModel_Sonoff_4ch: - button[0] = 0; // Button 1 - button[1] = 9; // Button 2 - button[2] = 10; // Button 3 - button[3] = 14; // Button 4 - relais[0] = 12; // Red Led and Relay1 (0 = Off, 1 = On) - relais[1] = 5; // Red Led and Relay2 (0 = Off, 1 = On) - relais[2] = 4; // Red Led and Relay3 (0 = Off, 1 = On) - relais[3] = 15; // Red Led and Relay4 (0 = Off, 1 = On) - status_led = 13; // Blue Led (0 = On, 1 = Off) - i2c_sda = -1; // GPIO4 conflicts with GPIO_REL3 - i2c_scl = -1; // GPIO5 conflicts with GPIO_REL2 + button[0] = 0; // Button 1 + button[1] = 9; // Button 2 + button[2] = 10; // Button 3 + button[3] = 14; // Button 4 + relais[0] = 12; // Red Led and Relay1 (0 = Off, 1 = On) + relais[1] = 5; // Red Led and Relay2 (0 = Off, 1 = On) + relais[2] = 4; // Red Led and Relay3 (0 = Off, 1 = On) + relais[3] = 15; // Red Led and Relay4 (0 = Off, 1 = On) + status_led = 13; // Blue Led (0 = On, 1 = Off) + i2c_sda = -1; // GPIO4 conflicts with GPIO_REL3 + i2c_scl = -1; // GPIO5 conflicts with GPIO_REL2 break; case DeviceModel::DeviceModel_Shelly1: - button[0] = 5; // Single Button - relais[0] = 4; // Red Led and Relay (0 = Off, 1 = On) - status_led = 15; // Blue Led (0 = On, 1 = Off) - i2c_sda = -1; // GPIO4 conflicts with relay control. - i2c_scl = -1; // GPIO5 conflicts with SW input + button[0] = 5; // Single Button + relais[0] = 4; // Red Led and Relay (0 = Off, 1 = On) + status_led = 15; // Blue Led (0 = On, 1 = Off) + i2c_sda = -1; // GPIO4 conflicts with relay control. + i2c_scl = -1; // GPIO5 conflicts with SW input break; case DeviceModel::DeviceModel_ShellyPLUG_S: - button[0] = 13; // Single Button - relais[0] = 15; // Red Led and Relay (0 = Off, 1 = On) - status_led = 2; // Blue Led (0 = On, 1 = Off) - i2c_sda = -1; // GPIO4 conflicts with relay control. - i2c_scl = -1; // GPIO5 conflicts with SW input + button[0] = 13; // Single Button + relais[0] = 15; // Red Led and Relay (0 = Off, 1 = On) + status_led = 2; // Blue Led (0 = On, 1 = Off) + i2c_sda = -1; // GPIO4 conflicts with relay control. + i2c_scl = -1; // GPIO5 conflicts with SW input break; -#else +# else // if defined(ESP8266) case DeviceModel::DeviceModel_Sonoff_Basic: case DeviceModel::DeviceModel_Sonoff_TH1x: case DeviceModel::DeviceModel_Sonoff_S2x: @@ -104,22 +105,23 @@ GpioFactorySettingsStruct::GpioFactorySettingsStruct(DeviceModel model) case DeviceModel::DeviceModel_Shelly1: case DeviceModel::DeviceModel_ShellyPLUG_S: break; -#endif +# endif // if defined(ESP8266) # if CONFIG_ETH_USE_ESP32_EMAC +# if CONFIG_IDF_TARGET_ESP32 case DeviceModel::DeviceModel_Olimex_ESP32_PoE: - button[0] = 34; // BUT1 Button - relais[0] = -1; // No LED's or relays on board - status_led = -1; - i2c_sda = 13; - i2c_scl = 16; - eth_phyaddr = 0; - eth_phytype = EthPhyType_t::LAN8720; - eth_mdc = 23; - eth_mdio = 18; - eth_power = 12; - eth_clock_mode = EthClockMode_t::Int_50MHz_GPIO_17_inv; + button[0] = 34; // BUT1 Button + relais[0] = -1; // No LED's or relays on board + status_led = -1; + i2c_sda = 13; + i2c_scl = 16; + eth_phyaddr = 0; + eth_phytype = EthPhyType_t::LAN8720; + eth_mdc = 23; + eth_mdio = 18; + eth_power = 12; + eth_clock_mode = EthClockMode_t::Int_50MHz_GPIO_17_inv; network_medium = NetworkMedium_t::Ethernet; break; case DeviceModel::DeviceModel_Olimex_ESP32_EVB: @@ -127,31 +129,32 @@ GpioFactorySettingsStruct::GpioFactorySettingsStruct(DeviceModel model) relais[0] = 32; // LED1 + Relay1 (0 = Off, 1 = On) relais[1] = 33; // LED2 + Relay2 (0 = Off, 1 = On) - status_led = -1; - i2c_sda = 13; - i2c_scl = 16; - eth_phyaddr = 0; - eth_phytype = EthPhyType_t::LAN8720; - eth_mdc = 23; - eth_mdio = 18; - eth_power = -1; // No Ethernet power pin - eth_clock_mode = EthClockMode_t::Ext_crystal_osc; + status_led = -1; + i2c_sda = 13; + i2c_scl = 16; + eth_phyaddr = 0; + eth_phytype = EthPhyType_t::LAN8720; + eth_mdc = 23; + eth_mdio = 18; + eth_power = -1; // No Ethernet power pin + eth_clock_mode = EthClockMode_t::Ext_crystal_osc; network_medium = NetworkMedium_t::Ethernet; break; case DeviceModel::DeviceModel_Olimex_ESP32_GATEWAY: - button[0] = 34; // BUT1 Button - relais[0] = -1; // No LED's or relays on board - status_led = 33; - i2c_sda = -1; - i2c_scl = -1; - eth_phyaddr = 0; - eth_phytype = EthPhyType_t::LAN8720; - eth_mdc = 23; - eth_mdio = 18; - eth_power = 5; - eth_clock_mode = EthClockMode_t::Int_50MHz_GPIO_17_inv; + button[0] = 34; // BUT1 Button + relais[0] = -1; // No LED's or relays on board + status_led = 33; + i2c_sda = -1; + i2c_scl = -1; + eth_phyaddr = 0; + eth_phytype = EthPhyType_t::LAN8720; + eth_mdc = 23; + eth_mdio = 18; + eth_power = 5; + eth_clock_mode = EthClockMode_t::Int_50MHz_GPIO_17_inv; network_medium = NetworkMedium_t::Ethernet; + // Rev A to E: // GPIO 5, 17 can be used only if Ethernet functionality is not used // GPIO 6, 7, 8, 9, 10, 11 used for internal flash and SD card @@ -174,32 +177,34 @@ GpioFactorySettingsStruct::GpioFactorySettingsStruct(DeviceModel model) break; case DeviceModel::DeviceModel_wESP32: - status_led = -1; - i2c_sda = 15; - i2c_scl = 4; - eth_phyaddr = 0; - eth_phytype = EthPhyType_t::LAN8720; - eth_mdc = 16; - eth_mdio = 17; - eth_power = -1; - eth_clock_mode = EthClockMode_t::Ext_crystal_osc; + status_led = -1; + i2c_sda = 15; + i2c_scl = 4; + eth_phyaddr = 0; + eth_phytype = EthPhyType_t::LAN8720; + eth_mdc = 16; + eth_mdio = 17; + eth_power = -1; + eth_clock_mode = EthClockMode_t::Ext_crystal_osc; network_medium = NetworkMedium_t::Ethernet; break; case DeviceModel::DeviceModel_WT32_ETH01: - status_led = -1; - i2c_sda = 21; - i2c_scl = 22; - eth_phyaddr = 1; - eth_phytype = EthPhyType_t::LAN8720; - eth_mdc = 23; - eth_mdio = 18; - eth_power = 12; // TODO TD-er: Better to use GPIO-16? as shown here: https://letscontrolit.com/forum/viewtopic.php?p=50133#p50133 - eth_clock_mode = EthClockMode_t::Ext_crystal_osc; + status_led = -1; + i2c_sda = 21; + i2c_scl = 22; + eth_phyaddr = 1; + eth_phytype = EthPhyType_t::LAN8720; + eth_mdc = 23; + eth_mdio = 18; + eth_power = 12; // TODO TD-er: Better to use GPIO-16? as shown here: https://letscontrolit.com/forum/viewtopic.php?p=50133#p50133 + eth_clock_mode = EthClockMode_t::Ext_crystal_osc; network_medium = NetworkMedium_t::Ethernet; break; - - #endif +# else // if CONFIG_IDF_TARGET_ESP32 + default: break; +# endif // if CONFIG_IDF_TARGET_ESP32 + # endif // if CONFIG_ETH_USE_ESP32_EMAC case DeviceModel::DeviceModel_default: case DeviceModel::DeviceModel_MAX: @@ -208,5 +213,5 @@ GpioFactorySettingsStruct::GpioFactorySettingsStruct(DeviceModel model) // Do not use default: as this allows the compiler to detect any missing cases. // default: break; } - #endif + #endif // ifndef LIMIT_BUILD_SIZE } diff --git a/src/src/DataStructs/SettingsStruct.h b/src/src/DataStructs/SettingsStruct.h index 4c25ce6f0..3e98a1b9a 100644 --- a/src/src/DataStructs/SettingsStruct.h +++ b/src/src/DataStructs/SettingsStruct.h @@ -401,7 +401,7 @@ public: } bool getNetworkEnabled(networkIndex_t index) const { - if (validNetworkIndex(index)) bitRead(NetworkEnabled_bits, index); + if (validNetworkIndex(index)) return bitRead(NetworkEnabled_bits, index); return false; } @@ -574,7 +574,7 @@ public: int8_t ETH_Pin_mdio_irq = -1; int8_t ETH_Pin_power_rst = -1; EthPhyType_t ETH_Phy_Type = EthPhyType_t::notSet; - EthClockMode_t ETH_Clock_Mode = EthClockMode_t::Ext_crystal_osc; + EthClockMode_t ETH_Clock_Mode = static_cast(0); uint8_t ETH_IP[4] = {0}; uint8_t ETH_Gateway[4] = {0}; uint8_t ETH_Subnet[4] = {0}; diff --git a/src/src/DataTypes/ESPEasy_plugin_functions.h b/src/src/DataTypes/ESPEasy_plugin_functions.h index e4b9855fe..54080b9f8 100644 --- a/src/src/DataTypes/ESPEasy_plugin_functions.h +++ b/src/src/DataTypes/ESPEasy_plugin_functions.h @@ -132,6 +132,7 @@ public: NWPLUGIN_CONNECT_SUCCESS, // Only used for timing stats NWPLUGIN_CONNECT_FAIL, // Only used for timing stats NWPLUGIN_DRIVER_TEMPLATE, + NWPLUGIN_LOAD_DEFAULTS, NWPLUGIN_GET_DEVICENAME, NWPLUGIN_WEBFORM_SAVE, NWPLUGIN_WEBFORM_LOAD, diff --git a/src/src/DataTypes/EthernetParameters.cpp b/src/src/DataTypes/EthernetParameters.cpp index f6aa07a83..18acc15d4 100644 --- a/src/src/DataTypes/EthernetParameters.cpp +++ b/src/src/DataTypes/EthernetParameters.cpp @@ -1,39 +1,5 @@ #include "../DataTypes/EthernetParameters.h" -bool isValid(EthClockMode_t clockMode) { - switch (clockMode) { - case EthClockMode_t::Ext_crystal_osc: - case EthClockMode_t::Int_50MHz_GPIO_0: - case EthClockMode_t::Int_50MHz_GPIO_16: - case EthClockMode_t::Int_50MHz_GPIO_17_inv: - return true; - - // Do not use default: as this allows the compiler to detect any missing cases. - } - return false; -} - -bool isGpioUsedInETHClockMode(EthClockMode_t clockMode, - int8_t gpio) { - if (((clockMode == EthClockMode_t::Int_50MHz_GPIO_0) && (gpio == 0)) || - ((clockMode == EthClockMode_t::Int_50MHz_GPIO_16) && (gpio == 16)) || - ((clockMode == EthClockMode_t::Int_50MHz_GPIO_17_inv) && (gpio == 17))) { - return true; - } - return false; -} - -const __FlashStringHelper* toString(EthClockMode_t clockMode) { - switch (clockMode) { - case EthClockMode_t::Ext_crystal_osc: return F("External crystal oscillator"); - case EthClockMode_t::Int_50MHz_GPIO_0: return F("50MHz APLL Output on GPIO0"); - case EthClockMode_t::Int_50MHz_GPIO_16: return F("50MHz APLL Output on GPIO16"); - case EthClockMode_t::Int_50MHz_GPIO_17_inv: return F("50MHz APLL Inverted Output on GPIO17"); - - // Do not use default: as this allows the compiler to detect any missing cases. - } - return F("Unknown"); -} bool isValid(EthPhyType_t phyType) { switch (phyType) { diff --git a/src/src/DataTypes/EthernetParameters.h b/src/src/DataTypes/EthernetParameters.h index 3991e692f..db4053e9d 100644 --- a/src/src/DataTypes/EthernetParameters.h +++ b/src/src/DataTypes/EthernetParameters.h @@ -5,12 +5,31 @@ // Is stored in settings +#ifdef ESP32P4 +// Clock pin can only be GPIO 32 / 44 / 50 (default) +enum class EthClockMode_t : uint8_t { + Default = 0, + Ext_crystal = 1, + Int_50MHz = 2, + /* + Ext_crystal_GPIO_32 = (1 | (32 << 2)), + Ext_crystal_GPIO_44 = (1 | (44 << 2)), + Ext_crystal_GPIO_50 = (1 | (50 << 2)), + Int_50MHz_GPIO_32 = (2 | (32 << 2)), + Int_50MHz_GPIO_44 = (2 | (44 << 2)), + Int_50MHz_GPIO_50 = (2 | (50 << 2)), + */ + +}; +#endif +#if CONFIG_IDF_TARGET_ESP32 enum class EthClockMode_t : uint8_t { Ext_crystal_osc = 0, Int_50MHz_GPIO_0 = 1, Int_50MHz_GPIO_16 = 2, Int_50MHz_GPIO_17_inv = 3 }; +#endif bool isValid(EthClockMode_t clockMode); diff --git a/src/src/DataTypes/EthernetParameters_ESP32.cpp b/src/src/DataTypes/EthernetParameters_ESP32.cpp new file mode 100644 index 000000000..4e4d29b45 --- /dev/null +++ b/src/src/DataTypes/EthernetParameters_ESP32.cpp @@ -0,0 +1,42 @@ +#include "../DataTypes/EthernetParameters.h" + + +#if CONFIG_IDF_TARGET_ESP32 + +bool isValid(EthClockMode_t clockMode) { + switch (clockMode) { + case EthClockMode_t::Ext_crystal_osc: + case EthClockMode_t::Int_50MHz_GPIO_0: + case EthClockMode_t::Int_50MHz_GPIO_16: + case EthClockMode_t::Int_50MHz_GPIO_17_inv: + return true; + + // Do not use default: as this allows the compiler to detect any missing cases. + } + return false; +} + +bool isGpioUsedInETHClockMode(EthClockMode_t clockMode, + int8_t gpio) { + if (((clockMode == EthClockMode_t::Int_50MHz_GPIO_0) && (gpio == 0)) || + ((clockMode == EthClockMode_t::Int_50MHz_GPIO_16) && (gpio == 16)) || + ((clockMode == EthClockMode_t::Int_50MHz_GPIO_17_inv) && (gpio == 17))) { + return true; + } + return false; +} + +const __FlashStringHelper* toString(EthClockMode_t clockMode) { + switch (clockMode) { + case EthClockMode_t::Ext_crystal_osc: return F("External crystal oscillator"); + case EthClockMode_t::Int_50MHz_GPIO_0: return F("50MHz APLL Output on GPIO0"); + case EthClockMode_t::Int_50MHz_GPIO_16: return F("50MHz APLL Output on GPIO16"); + case EthClockMode_t::Int_50MHz_GPIO_17_inv: return F("50MHz APLL Inverted Output on GPIO17"); + + // Do not use default: as this allows the compiler to detect any missing cases. + } + return F("Unknown"); +} + + +#endif \ No newline at end of file diff --git a/src/src/DataTypes/EthernetParameters_ESP32P4.cpp b/src/src/DataTypes/EthernetParameters_ESP32P4.cpp new file mode 100644 index 000000000..0b025849f --- /dev/null +++ b/src/src/DataTypes/EthernetParameters_ESP32P4.cpp @@ -0,0 +1,70 @@ +#include "../DataTypes/EthernetParameters.h" + + +#if CONFIG_IDF_TARGET_ESP32P4 + +# include + +bool isValid(EthClockMode_t clockMode) { + switch (clockMode) + { + case EthClockMode_t::Default: + case EthClockMode_t::Ext_crystal: + case EthClockMode_t::Int_50MHz: + /* + case EthClockMode_t::Ext_crystal_GPIO_32: + case EthClockMode_t::Ext_crystal_GPIO_44: + case EthClockMode_t::Ext_crystal_GPIO_50: + case EthClockMode_t::Int_50MHz_GPIO_32: + case EthClockMode_t::Int_50MHz_GPIO_44: + case EthClockMode_t::Int_50MHz_GPIO_50: + */ + return true; + + // Do not use default: as this allows the compiler to detect any missing cases. + } + return false; +} + +bool isGpioUsedInETHClockMode(EthClockMode_t clockMode, + int8_t gpio) { + switch (clockMode) + { + case EthClockMode_t::Default: + case EthClockMode_t::Ext_crystal: + case EthClockMode_t::Int_50MHz: return gpio == ETH_RMII_CLK; + + /* + case EthClockMode_t::Int_50MHz_GPIO_32: + case EthClockMode_t::Ext_crystal_GPIO_32: return (gpio == 32); + case EthClockMode_t::Int_50MHz_GPIO_44: + case EthClockMode_t::Ext_crystal_GPIO_44: return (gpio == 44); + case EthClockMode_t::Int_50MHz_GPIO_50: + case EthClockMode_t::Ext_crystal_GPIO_50: return (gpio == 50); + */ + } + return false; +} + +const __FlashStringHelper* toString(EthClockMode_t clockMode) { + switch (clockMode) + { + case EthClockMode_t::Default: return F("default"); + case EthClockMode_t::Ext_crystal: return F("External crystal oscillator"); + case EthClockMode_t::Int_50MHz: return F("50MHz APLL Output"); + + /* + case EthClockMode_t::Ext_crystal_GPIO_32: return F("External crystal oscillator on GPIO-32"); + case EthClockMode_t::Ext_crystal_GPIO_44: return F("External crystal oscillator on GPIO-44"); + case EthClockMode_t::Ext_crystal_GPIO_50: return F("External crystal oscillator on GPIO-50"); + case EthClockMode_t::Int_50MHz_GPIO_32: return F("50MHz APLL Output on GPIO-32"); + case EthClockMode_t::Int_50MHz_GPIO_44: return F("50MHz APLL Output on GPIO-44"); + case EthClockMode_t::Int_50MHz_GPIO_50: return F("50MHz APLL Output on GPIO-50"); + */ + + // Do not use default: as this allows the compiler to detect any missing cases. + } + return F("Unknown"); +} + +#endif // if CONFIG_IDF_TARGET_ESP32P4 diff --git a/src/src/ESPEasyCore/ESPEasyEth.cpp b/src/src/ESPEasyCore/ESPEasyEth.cpp index 36cae36e8..dee1dd3a2 100644 --- a/src/src/ESPEasyCore/ESPEasyEth.cpp +++ b/src/src/ESPEasyCore/ESPEasyEth.cpp @@ -281,7 +281,12 @@ void ethPower(bool enable) { GPIO_Write(PLUGIN_GPIO, Settings.ETH_Pin_power_rst, enable ? 1 : 0); if (!enable) { - if (Settings.ETH_Clock_Mode == EthClockMode_t::Ext_crystal_osc) { + #if CONFIG_IDF_TARGET_ESP32P4 + const bool isExternalCrystal = Settings.ETH_Clock_Mode == EthClockMode_t::Ext_crystal; + #else + const bool isExternalCrystal = Settings.ETH_Clock_Mode == EthClockMode_t::Ext_crystal_osc; + #endif + if (isExternalCrystal) { delay(600); // Give some time to discharge any capacitors // Delay is needed to make sure no clock signal remains present which may cause the ESP to boot into flash mode. } diff --git a/src/src/ESPEasyCore/ESPEasyWifi_abstracted_ESP32.cpp b/src/src/ESPEasyCore/ESPEasyWifi_abstracted_ESP32.cpp index beb0d4056..302d2b914 100644 --- a/src/src/ESPEasyCore/ESPEasyWifi_abstracted_ESP32.cpp +++ b/src/src/ESPEasyCore/ESPEasyWifi_abstracted_ESP32.cpp @@ -351,7 +351,7 @@ float GetRSSIthreshold(float& maxTXpwr) { WiFiConnectionProtocol getConnectionProtocol() { - #ifndef ESP32P4 +// #ifndef ESP32P4 if (WiFi.RSSI() < 0) { wifi_phy_mode_t phymode; esp_wifi_sta_get_negotiated_phymode(&phymode); @@ -372,7 +372,7 @@ WiFiConnectionProtocol getConnectionProtocol() # endif // if ESP_IDF_VERSION >= ESP_IDF_VERSION_VAL(5, 3, 0) } } - #endif +// #endif return WiFiConnectionProtocol::Unknown; } diff --git a/src/src/Globals/NWPlugins.cpp b/src/src/Globals/NWPlugins.cpp index c8bd96871..7d55e2bf5 100644 --- a/src/src/Globals/NWPlugins.cpp +++ b/src/src/Globals/NWPlugins.cpp @@ -74,6 +74,7 @@ bool NWPluginCall(NWPlugin::Function Function, struct EventStruct *event, String } // calls to specific network + case NWPlugin::Function::NWPLUGIN_LOAD_DEFAULTS: case NWPlugin::Function::NWPLUGIN_INIT: case NWPlugin::Function::NWPLUGIN_EXIT: case NWPlugin::Function::NWPLUGIN_GET_DEVICENAME: diff --git a/src/src/Helpers/Hardware_device_info.cpp b/src/src/Helpers/Hardware_device_info.cpp index 8127ec01e..c54724056 100644 --- a/src/src/Helpers/Hardware_device_info.cpp +++ b/src/src/Helpers/Hardware_device_info.cpp @@ -249,7 +249,8 @@ uint32_t getFlashChipSpeed() { # else // if ESP_IDF_STILL_NEEDS_SPI_REGISTERS_FIXED #ifdef ESP32P4 // TODO TD-er: Implement - return 80000000; +// return 80000000; + return ESP.getFlashChipSpeed(); #else // All ESP32-variants have the SPI flash wired to SPI peripheral 1 diff --git a/src/src/Helpers/Hardware_device_info_ESP32P4.cpp b/src/src/Helpers/Hardware_device_info_ESP32P4.cpp index 8eca76654..d26ba698e 100644 --- a/src/src/Helpers/Hardware_device_info_ESP32P4.cpp +++ b/src/src/Helpers/Hardware_device_info_ESP32P4.cpp @@ -15,8 +15,8 @@ const __FlashStringHelper* getChipModel(uint32_t chip_model, uint32_t chip_revis int32_t getEmbeddedFlashSize() { - // TODO TD-er: Implement - return 16; + // Returned size in MB + return ESP.getFlashChipSize() >> 20; } int32_t getEmbeddedPSRAMSize() @@ -26,8 +26,8 @@ int32_t getEmbeddedPSRAMSize() // TODO TD-er: Must check whether this is true switch (psram_cap) { case 0: return 0; - case 1: return 8; - case 2: return 2; + case 1: return 16; + case 2: return 32; } // Unknown value, thus mark as negative value @@ -36,14 +36,18 @@ int32_t getEmbeddedPSRAMSize() # ifndef isPSRAMInterfacePin bool isPSRAMInterfacePin(int gpio) { - // TODO TD-er: Implement + // PSRAM and flash do not use GPIO pins + // The ESP32-P4 chip has dedicated pins for external flash and in-package PSRAM. + // Such pins can not be used for other purpose. return false; } # endif // ifndef isPSRAMInterfacePin bool isFlashInterfacePin_ESPEasy(int gpio) { - // TODO TD-er: Implement + // PSRAM and flash do not use GPIO pins + // The ESP32-P4 chip has dedicated pins for external flash and in-package PSRAM. + // Such pins can not be used for other purpose. return false; } diff --git a/src/src/Helpers/_NWPlugin_Helper_webform.cpp b/src/src/Helpers/_NWPlugin_Helper_webform.cpp index 7c3f57968..b664b1c9d 100644 --- a/src/src/Helpers/_NWPlugin_Helper_webform.cpp +++ b/src/src/Helpers/_NWPlugin_Helper_webform.cpp @@ -197,6 +197,7 @@ void saveNetworkParameterForm(NetworkSettingsStruct & NetworkSettings, case NetworkSettingsStruct::NETWORK_ENABLED: Settings.setNetworkEnabled(networkindex, isFormItemChecked(internalName)); + addLog(LOG_LEVEL_INFO, concat(F("Save NW_Enabled: "), internalName) + ' ' + isFormItemChecked(internalName) + ' ' + Settings.getNetworkEnabled(networkindex)); break; } } diff --git a/src/src/WebServer/HTML_Print.cpp b/src/src/WebServer/HTML_Print.cpp index cb19b92ef..634cd4e08 100644 --- a/src/src/WebServer/HTML_Print.cpp +++ b/src/src/WebServer/HTML_Print.cpp @@ -4,6 +4,10 @@ size_t HTML_Print::write(uint8_t c) { - TXBuffer += (char)c; + if (c == '\n') { + TXBuffer += F("
    "); + } else { + TXBuffer += (char)c; + } return 1; } diff --git a/src/src/WebServer/NetworkPage.cpp b/src/src/WebServer/NetworkPage.cpp index 7896c727d..94c13b5a0 100644 --- a/src/src/WebServer/NetworkPage.cpp +++ b/src/src/WebServer/NetworkPage.cpp @@ -49,6 +49,11 @@ void handle_networks() if (Settings.getNWPluginID_for_network(networkindex) != nwpluginID) { + addLog(LOG_LEVEL_INFO, strformat( + F("HandleNW: Driver changed from %d to %d"), + Settings.getNWPluginID_for_network(networkindex).value, + nwpluginID.value)); + // NetworkDriver has changed. Settings.setNWPluginID_for_network(networkindex, nwpluginID); @@ -65,6 +70,10 @@ void handle_networks() else { // there is a networkDriverIndex selected + addLog(LOG_LEVEL_INFO, concat( + F("HandleNW: Driver selected: "), + nwpluginID.value) + (nwpluginID.isValid() ? F("valid") : F("invalid"))); + if (nwpluginID.isValid()) { mustInit = true; @@ -91,9 +100,9 @@ void handle_networks() struct EventStruct TempEvent; TempEvent.NetworkIndex = networkindex; String dummy; - NWPlugin::Function cfunction = + NWPlugin::Function nfunction = Settings.getNetworkEnabled(networkindex) ? NWPlugin::Function::NWPLUGIN_INIT : NWPlugin::Function::NWPLUGIN_EXIT; - NWPluginCall(NetworkDriverIndex, cfunction, &TempEvent, dummy); + NWPluginCall(NetworkDriverIndex, nfunction, &TempEvent, dummy); } } @@ -114,7 +123,21 @@ void handle_networks() TXBuffer.endStream(); } -void handle_networks_clearLoadDefaults(networkIndex_t networkindex, NetworkSettingsStruct& NetworkSettings) {} +void handle_networks_clearLoadDefaults(networkIndex_t networkindex, NetworkSettingsStruct& NetworkSettings) { + networkDriverIndex_t NetworkDriverIndex = getNetworkDriverIndex_from_NetworkIndex(networkindex); + + if (validNetworkDriverIndex(NetworkDriverIndex)) { + struct EventStruct TempEvent; + TempEvent.NetworkIndex = networkindex; + + String dummy; + NWPluginCall( + NetworkDriverIndex, + NWPlugin::Function::NWPLUGIN_LOAD_DEFAULTS, &TempEvent, dummy); + } + + // TODO TD-er: Must also check NetworkDriverStruct to see if something else must be done +} void handle_networks_CopySubmittedSettings(networkIndex_t networkindex, NetworkSettingsStruct& NetworkSettings) { From 34ad6ec3c16d384411845af314e6106982c23078 Mon Sep 17 00:00:00 2001 From: TD-er Date: Fri, 11 Jul 2025 01:18:36 +0200 Subject: [PATCH 101/564] [Network] Fix Ethernet on ESP32P4 + allow multiple active interfaces --- src/_NW001_WiFi_STA.cpp | 21 ++++--- src/_NW002_WiFi_AP.cpp | 18 ++++-- src/_NW003_ETH.cpp | 62 +++++++++++++------ src/src/Commands/InternalCommands.cpp | 2 +- src/src/Commands/InternalCommands_decoder.cpp | 2 +- src/src/Commands/InternalCommands_decoder.h | 2 +- src/src/Commands/WiFi.h | 2 +- src/src/CustomBuild/define_plugin_sets.h | 2 +- src/src/DataTypes/EthernetParameters.cpp | 28 +++++---- .../DataTypes/EthernetParameters_ESP32.cpp | 9 +-- src/src/ESPEasyCore/ESPEasyEth.cpp | 3 + src/src/ESPEasyCore/ESPEasyWifi.cpp | 2 +- .../ESPEasyCore/ESPEasyWifi_abstracted.cpp | 2 +- .../ESPEasyWifi_abstracted_ESP32.cpp | 4 +- src/src/Helpers/ESPEasy_Storage.cpp | 2 +- src/src/Helpers/_NWPlugin_Helper_webform.cpp | 22 +++++++ src/src/Helpers/_NWPlugin_Helper_webform.h | 3 + src/src/WebServer/NetworkPage.cpp | 1 + 18 files changed, 130 insertions(+), 57 deletions(-) diff --git a/src/_NW001_WiFi_STA.cpp b/src/_NW001_WiFi_STA.cpp index be56ffbc1..36198b1a5 100644 --- a/src/_NW001_WiFi_STA.cpp +++ b/src/_NW001_WiFi_STA.cpp @@ -29,6 +29,9 @@ # include "src/WebServer/HTML_Print.h" # include "src/WebServer/HTML_wrappers.h" +# include "src/Helpers/_NWPlugin_Helper_webform.h" +# include "src/Helpers/PrintToString.h" + # ifdef ESP32P4 # include # endif @@ -57,7 +60,7 @@ bool NWPlugin_001(NWPlugin::Function function, struct EventStruct *event, String success = WiFi.STA.connected(); if (success) { - string = strformat(F("%s (ch: %d)
    %s"), + string = strformat(F("%s (ch: %d)\n%s"), WiFi.STA.SSID().c_str(), WiFi.channel(), WiFi.STA.BSSIDstr().c_str()); @@ -66,7 +69,7 @@ bool NWPlugin_001(NWPlugin::Function function, struct EventStruct *event, String success = WiFi.isConnected(); if (success) { - string = strformat(F("%s (ch: %d)
    %s"), + string = strformat(F("%s (ch: %d)\n%s"), WiFi.SSID().c_str(), WiFi.channel(), WiFi.BSSIDstr().c_str()); @@ -99,8 +102,11 @@ bool NWPlugin_001(NWPlugin::Function function, struct EventStruct *event, String case NWPlugin::Function::NWPLUGIN_WEBFORM_SHOW_IP: { # ifdef ESP32 - string = WiFi.STA.localIP().toString(); -# else + PrintToString str; + printAllIpAddresses(&WiFi.STA, str); + string = str.get(); + // string = WiFi.STA.localIP().toString(); +# else // ifdef ESP32 string = WiFi.localIP().toString(); # endif // ifdef ESP32 break; @@ -263,16 +269,17 @@ bool NWPlugin_001(NWPlugin::Function function, struct EventStruct *event, String addFormCheckBox(LabelType::PERIODICAL_GRAT_ARP, Settings.gratuitousARP()); # endif // ifdef SUPPORT_ARP +# ifdef ESP32 addRowLabel(F("Driver Info")); HTML_Print htmlPrint; - addHtml(F("
    ")); + addHtml(F("\n")); WiFi.STA.printTo(htmlPrint); // TODO TD-er: Must remove this later, as it also prints your WiFi passwd. - addHtml(F("
    ")); + addHtml(F("\n")); WiFi.printDiag(htmlPrint); - +# endif // ifdef ESP32 break; } diff --git a/src/_NW002_WiFi_AP.cpp b/src/_NW002_WiFi_AP.cpp index ad89f97d9..a9b211cb7 100644 --- a/src/_NW002_WiFi_AP.cpp +++ b/src/_NW002_WiFi_AP.cpp @@ -25,6 +25,9 @@ # include "src/WebServer/Markup.h" # include "src/ESPEasyCore/ESPEasyWifi_abstracted.h" +# include "src/Helpers/_NWPlugin_Helper_webform.h" +# include "src/Helpers/PrintToString.h" + # include "src/WebServer/HTML_Print.h" # include "src/WebServer/HTML_wrappers.h" @@ -56,7 +59,8 @@ bool NWPlugin_002(NWPlugin::Function function, struct EventStruct *event, String if (num > 0) { success = true; - string = concat(num, F(" client")); + string = num; + string += F(" client"); if (num > 1) { string += 's'; } } @@ -66,7 +70,7 @@ bool NWPlugin_002(NWPlugin::Function function, struct EventStruct *event, String case NWPlugin::Function::NWPLUGIN_WEBFORM_SHOW_HOSTNAME: { # ifdef ESP32 - string = WiFi.AP.getHostname(); + string = WiFi.AP.SSID(); # else string = WiFi.softAPSSID(); # endif // ifdef ESP32 @@ -86,8 +90,12 @@ bool NWPlugin_002(NWPlugin::Function function, struct EventStruct *event, String case NWPlugin::Function::NWPLUGIN_WEBFORM_SHOW_IP: { # ifdef ESP32 - string = WiFi.AP.localIP().toString(); -# else + PrintToString str; + printAllIpAddresses(&WiFi.AP, str); + string = str.get(); + + // string = WiFi.AP.localIP().toString(); +# else // ifdef ESP32 string = WiFi.softAPIP().toString(); # endif // ifdef ESP32 break; @@ -130,11 +138,13 @@ bool NWPlugin_002(NWPlugin::Function function, struct EventStruct *event, String addFormNote(F("Do not allow to start an AP when configured WiFi cannot be found")); # endif // if FEATURE_ETHERNET +# ifdef ESP32 addRowLabel(F("Driver Info")); HTML_Print htmlPrint; addHtml(F("
    ")); WiFi.AP.printTo(htmlPrint); +# endif // ifdef ESP32 break; } diff --git a/src/_NW003_ETH.cpp b/src/_NW003_ETH.cpp index cb649a62d..e10055eb2 100644 --- a/src/_NW003_ETH.cpp +++ b/src/_NW003_ETH.cpp @@ -28,6 +28,9 @@ # include "src/WebServer/HTML_Print.h" # include "src/WebServer/HTML_wrappers.h" +# include "src/Helpers/_NWPlugin_Helper_webform.h" +# include "src/Helpers/PrintToString.h" + # include bool NWPlugin_003(NWPlugin::Function function, struct EventStruct *event, String& string) @@ -44,16 +47,16 @@ bool NWPlugin_003(NWPlugin::Function function, struct EventStruct *event, String case NWPlugin::Function::NWPLUGIN_LOAD_DEFAULTS: { - #if CONFIG_IDF_TARGET_ESP32P4 - Settings.ETH_Clock_Mode = EthClockMode_t::Default; - Settings.ETH_Phy_Type = EthPhyType_t::TLK110; - Settings.ETH_Phy_Addr = ETH_PHY_ADDR; - Settings.ETH_Pin_mdc_cs = ETH_PHY_MDC; - Settings.ETH_Pin_mdio_irq = ETH_PHY_MDIO; + # if CONFIG_IDF_TARGET_ESP32P4 + Settings.ETH_Clock_Mode = EthClockMode_t::Ext_crystal; + Settings.ETH_Phy_Type = EthPhyType_t::TLK110; + Settings.ETH_Phy_Addr = ETH_PHY_ADDR; + Settings.ETH_Pin_mdc_cs = ETH_PHY_MDC; + Settings.ETH_Pin_mdio_irq = ETH_PHY_MDIO; Settings.ETH_Pin_power_rst = ETH_PHY_POWER; - #else + # else // if CONFIG_IDF_TARGET_ESP32P4 Settings.ETH_Clock_Mode = EthClockMode_t::Ext_crystal_osc; - #endif + # endif // if CONFIG_IDF_TARGET_ESP32P4 break; } @@ -68,9 +71,10 @@ bool NWPlugin_003(NWPlugin::Function function, struct EventStruct *event, String success = ETH.connected(); if (ETH.linkUp()) { - string = concat(ETH.linkSpeed(), ETH.fullDuplex() ? F("M FD") : F("M HD")); + string = ETH.linkSpeed(); + string += ETH.fullDuplex() ? F("M FD") : F("M HD"); - if (!ETH.autoNegotiation()) { string += F("(man)"); } + if (!ETH.autoNegotiation()) { string += F("(manual)"); } } break; } @@ -89,7 +93,11 @@ bool NWPlugin_003(NWPlugin::Function function, struct EventStruct *event, String case NWPlugin::Function::NWPLUGIN_WEBFORM_SHOW_IP: { - string = ETH.localIP().toString(); + PrintToString str; + printAllIpAddresses(Ð, str); + string = str.get(); + + // string = ETH.localIP().toString(); break; } @@ -138,7 +146,9 @@ bool NWPlugin_003(NWPlugin::Function function, struct EventStruct *event, String toString(NetworkMedium_t::Ethernet) }; const FormSelectorOptions selector(NR_ELEMENTS(ethWifiOptions), ethWifiOptions); - selector.addSelector(F("ethwifi"), static_cast(Settings.NetworkMedium)); + selector.addSelector( + F("ethwifi"), + static_cast(Settings.NetworkMedium)); } addFormNote(F("Change Switch between WiFi and Ethernet requires reboot to activate")); { @@ -247,22 +257,36 @@ bool NWPlugin_003(NWPlugin::Function function, struct EventStruct *event, String # if CONFIG_ETH_USE_ESP32_EMAC addRowLabel_tr_id(F("Ethernet Clock"), F("ethclock")); { - #if CONFIG_IDF_TARGET_ESP32 + # if CONFIG_IDF_TARGET_ESP32 const __FlashStringHelper *ethClockOptions[] = { toString(EthClockMode_t::Ext_crystal_osc), toString(EthClockMode_t::Int_50MHz_GPIO_0), toString(EthClockMode_t::Int_50MHz_GPIO_16), toString(EthClockMode_t::Int_50MHz_GPIO_17_inv) }; - #endif - #if CONFIG_IDF_TARGET_ESP32P4 + const int indices[] = { + static_cast(EthClockMode_t::Ext_crystal_osc), + static_cast(EthClockMode_t::Int_50MHz_GPIO_0), + static_cast(EthClockMode_t::Int_50MHz_GPIO_16), + static_cast(EthClockMode_t::Int_50MHz_GPIO_17_inv) + }; + # endif // if CONFIG_IDF_TARGET_ESP32 + # if CONFIG_IDF_TARGET_ESP32P4 const __FlashStringHelper *ethClockOptions[] = { - toString(EthClockMode_t::Default), + // toString(EthClockMode_t::Default), toString(EthClockMode_t::Ext_crystal), toString(EthClockMode_t::Int_50MHz) }; - #endif - const FormSelectorOptions selector(NR_ELEMENTS(ethClockOptions), ethClockOptions); + const int indices[] = { + // static_cast(EthClockMode_t::Default), + static_cast(EthClockMode_t::Ext_crystal), + static_cast(EthClockMode_t::Int_50MHz) + }; + # endif // if CONFIG_IDF_TARGET_ESP32P4 + const FormSelectorOptions selector( + NR_ELEMENTS(ethClockOptions), + ethClockOptions, + indices); selector.addSelector(F("ethclock"), static_cast(Settings.ETH_Clock_Mode)); } # endif // if CONFIG_ETH_USE_ESP32_EMAC @@ -278,7 +302,7 @@ bool NWPlugin_003(NWPlugin::Function function, struct EventStruct *event, String case NWPlugin::Function::NWPLUGIN_INIT: { -// ETHConnectRelaxed(); + ETHConnectRelaxed(); break; } diff --git a/src/src/Commands/InternalCommands.cpp b/src/src/Commands/InternalCommands.cpp index bef48922c..be651dc51 100644 --- a/src/src/Commands/InternalCommands.cpp +++ b/src/src/Commands/InternalCommands.cpp @@ -485,7 +485,7 @@ bool InternalCommands::executeInternalCommand() case ESPEasy_cmd_e::wifikey: COMMAND_CASE_R(Command_Wifi_Key, 1); // WiFi.h case ESPEasy_cmd_e::wifikey2: COMMAND_CASE_R(Command_Wifi_Key2, 1); // WiFi.h case ESPEasy_cmd_e::wifimode: COMMAND_CASE_R(Command_Wifi_Mode, 1); // WiFi.h -#ifdef ESP32P4 +# ifndef SOC_WIFI_SUPPORTED case ESPEasy_cmd_e::wifiotahostedmcu: COMMAND_CASE_R(Command_Wifi_OTA_hosted_mcu, 1); // WiFi.h #endif case ESPEasy_cmd_e::wifiscan: COMMAND_CASE_R(Command_Wifi_Scan, 0); // WiFi.h diff --git a/src/src/Commands/InternalCommands_decoder.cpp b/src/src/Commands/InternalCommands_decoder.cpp index 202efe840..4a60994eb 100644 --- a/src/src/Commands/InternalCommands_decoder.cpp +++ b/src/src/Commands/InternalCommands_decoder.cpp @@ -292,7 +292,7 @@ const char Internal_commands_w[] PROGMEM = "wifikey|" "wifikey2|" "wifimode|" -#ifdef ESP32P4 +# ifndef SOC_WIFI_SUPPORTED "wifiotahostedmcu|" #endif "wifiscan|" diff --git a/src/src/Commands/InternalCommands_decoder.h b/src/src/Commands/InternalCommands_decoder.h index 4750c4c1b..df56a0eb0 100644 --- a/src/src/Commands/InternalCommands_decoder.h +++ b/src/src/Commands/InternalCommands_decoder.h @@ -237,7 +237,7 @@ enum class ESPEasy_cmd_e : uint8_t { wifikey, wifikey2, wifimode, -#ifdef ESP32P4 +# ifndef SOC_WIFI_SUPPORTED wifiotahostedmcu, #endif wifiscan, diff --git a/src/src/Commands/WiFi.h b/src/src/Commands/WiFi.h index 4dae930c8..eae0251bf 100644 --- a/src/src/Commands/WiFi.h +++ b/src/src/Commands/WiFi.h @@ -36,7 +36,7 @@ const __FlashStringHelper* Command_Wifi_AllowAP(struct EventStruct *event, const __FlashStringHelper* Command_WiFi_Erase(struct EventStruct *event, const char *Line); -#ifdef ESP32P4 +# ifndef SOC_WIFI_SUPPORTED // Perform OTA update on the esp-hosted-mcu firmware of the external WiFi module (typically ESP32-C6) String Command_Wifi_OTA_hosted_mcu(struct EventStruct *event, const char *Line); diff --git a/src/src/CustomBuild/define_plugin_sets.h b/src/src/CustomBuild/define_plugin_sets.h index c833a02d8..4ac4891b9 100644 --- a/src/src/CustomBuild/define_plugin_sets.h +++ b/src/src/CustomBuild/define_plugin_sets.h @@ -3511,7 +3511,7 @@ To create/register a plugin, you have to : #endif #ifndef FEATURE_SET_WIFI_TX_PWR - #ifdef ESP32P4 + # ifndef SOC_WIFI_SUPPORTED #define FEATURE_SET_WIFI_TX_PWR 0 #else #ifdef ESP32 diff --git a/src/src/DataTypes/EthernetParameters.cpp b/src/src/DataTypes/EthernetParameters.cpp index 18acc15d4..2b27a9971 100644 --- a/src/src/DataTypes/EthernetParameters.cpp +++ b/src/src/DataTypes/EthernetParameters.cpp @@ -1,15 +1,15 @@ #include "../DataTypes/EthernetParameters.h" - bool isValid(EthPhyType_t phyType) { - switch (phyType) { + switch (phyType) + { #if CONFIG_ETH_USE_ESP32_EMAC case EthPhyType_t::LAN8720: case EthPhyType_t::TLK110: case EthPhyType_t::RTL8201: -#if ETH_TYPE_JL1101_SUPPORTED +# if ETH_TYPE_JL1101_SUPPORTED case EthPhyType_t::JL1101: -#endif +# endif case EthPhyType_t::DP83848: case EthPhyType_t::KSZ8041: case EthPhyType_t::KSZ8081: @@ -34,6 +34,7 @@ bool isValid(EthPhyType_t phyType) { } #if FEATURE_ETHERNET + bool isSPI_EthernetType(EthPhyType_t phyType) { # if ESP_IDF_VERSION_MAJOR >= 5 return @@ -54,14 +55,15 @@ bool isSPI_EthernetType(EthPhyType_t phyType) { eth_phy_type_t to_ESP_phy_type(EthPhyType_t phyType) { - switch (phyType) { + switch (phyType) + { # if CONFIG_ETH_USE_ESP32_EMAC case EthPhyType_t::LAN8720: return ETH_PHY_LAN8720; case EthPhyType_t::TLK110: return ETH_PHY_TLK110; case EthPhyType_t::RTL8201: return ETH_PHY_RTL8201; -# if ETH_TYPE_JL1101_SUPPORTED +# if ETH_TYPE_JL1101_SUPPORTED case EthPhyType_t::JL1101: return ETH_PHY_JL1101; -# endif +# endif case EthPhyType_t::DP83848: return ETH_PHY_DP83848; case EthPhyType_t::KSZ8041: return ETH_PHY_KSZ8041; case EthPhyType_t::KSZ8081: return ETH_PHY_KSZ8081; @@ -86,16 +88,16 @@ eth_phy_type_t to_ESP_phy_type(EthPhyType_t phyType) #endif // if FEATURE_ETHERNET - const __FlashStringHelper* toString(EthPhyType_t phyType) { - switch (phyType) { + switch (phyType) + { #if CONFIG_ETH_USE_ESP32_EMAC - case EthPhyType_t::LAN8720: return F("LAN8710/LAN8720"); - case EthPhyType_t::TLK110: return F("TLK110"); + case EthPhyType_t::LAN8720: return F("LAN8710 / LAN8720"); + case EthPhyType_t::TLK110: return F("TLK110 / IP101"); case EthPhyType_t::RTL8201: return F("RTL8201"); -#if ETH_TYPE_JL1101_SUPPORTED +# if ETH_TYPE_JL1101_SUPPORTED case EthPhyType_t::JL1101: return F("JL1101"); -#endif +# endif case EthPhyType_t::DP83848: return F("DP83848"); case EthPhyType_t::KSZ8041: return F("KSZ8041"); case EthPhyType_t::KSZ8081: return F("KSZ8081"); diff --git a/src/src/DataTypes/EthernetParameters_ESP32.cpp b/src/src/DataTypes/EthernetParameters_ESP32.cpp index 4e4d29b45..5125d1bcb 100644 --- a/src/src/DataTypes/EthernetParameters_ESP32.cpp +++ b/src/src/DataTypes/EthernetParameters_ESP32.cpp @@ -4,7 +4,8 @@ #if CONFIG_IDF_TARGET_ESP32 bool isValid(EthClockMode_t clockMode) { - switch (clockMode) { + switch (clockMode) + { case EthClockMode_t::Ext_crystal_osc: case EthClockMode_t::Int_50MHz_GPIO_0: case EthClockMode_t::Int_50MHz_GPIO_16: @@ -27,7 +28,8 @@ bool isGpioUsedInETHClockMode(EthClockMode_t clockMode, } const __FlashStringHelper* toString(EthClockMode_t clockMode) { - switch (clockMode) { + switch (clockMode) + { case EthClockMode_t::Ext_crystal_osc: return F("External crystal oscillator"); case EthClockMode_t::Int_50MHz_GPIO_0: return F("50MHz APLL Output on GPIO0"); case EthClockMode_t::Int_50MHz_GPIO_16: return F("50MHz APLL Output on GPIO16"); @@ -38,5 +40,4 @@ const __FlashStringHelper* toString(EthClockMode_t clockMode) { return F("Unknown"); } - -#endif \ No newline at end of file +#endif // if CONFIG_IDF_TARGET_ESP32 diff --git a/src/src/ESPEasyCore/ESPEasyEth.cpp b/src/src/ESPEasyCore/ESPEasyEth.cpp index dee1dd3a2..cbcc0a8e7 100644 --- a/src/src/ESPEasyCore/ESPEasyEth.cpp +++ b/src/src/ESPEasyCore/ESPEasyEth.cpp @@ -204,7 +204,9 @@ bool ETHConnectRelaxed() { } } else { # if CONFIG_ETH_USE_ESP32_EMAC +#ifndef ESP32P4 ethResetGPIOpins(); +#endif EthEventData.ethInitSuccess = ETH.begin( to_ESP_phy_type(Settings.ETH_Phy_Type), Settings.ETH_Phy_Addr, @@ -307,6 +309,7 @@ void ethResetGPIOpins() { gpio_reset_pin((gpio_num_t)Settings.ETH_Pin_mdc_cs); gpio_reset_pin((gpio_num_t)Settings.ETH_Pin_mdio_irq); # if CONFIG_ETH_USE_ESP32_EMAC + gpio_reset_pin(GPIO_NUM_19); // EMAC_TXD0 - hardcoded gpio_reset_pin(GPIO_NUM_21); // EMAC_TX_EN - hardcoded gpio_reset_pin(GPIO_NUM_22); // EMAC_TXD1 - hardcoded diff --git a/src/src/ESPEasyCore/ESPEasyWifi.cpp b/src/src/ESPEasyCore/ESPEasyWifi.cpp index 31b3e7e3f..67f31432f 100644 --- a/src/src/ESPEasyCore/ESPEasyWifi.cpp +++ b/src/src/ESPEasyCore/ESPEasyWifi.cpp @@ -279,7 +279,7 @@ WiFiConnectionProtocol getConnectionProtocol() { return ESPEasy::net::wifi::getC # ifdef ESP32 int64_t WiFi_get_TSF_time() { - #ifdef ESP32P4 + # ifndef SOC_WIFI_SUPPORTED return 0; #else return esp_wifi_get_tsf_time(WIFI_IF_STA); diff --git a/src/src/ESPEasyCore/ESPEasyWifi_abstracted.cpp b/src/src/ESPEasyCore/ESPEasyWifi_abstracted.cpp index 48bc51dcd..2f93e9acf 100644 --- a/src/src/ESPEasyCore/ESPEasyWifi_abstracted.cpp +++ b/src/src/ESPEasyCore/ESPEasyWifi_abstracted.cpp @@ -48,7 +48,7 @@ bool setAP(bool enable) { return setSTA_AP(WifiIsSTA(WiFi.getMode()), enable); bool setSTA_AP(bool sta_enable, bool ap_enable) { -#ifdef ESP32P4 +# ifndef SOC_WIFI_SUPPORTED return true; #else if (ap_enable) { diff --git a/src/src/ESPEasyCore/ESPEasyWifi_abstracted_ESP32.cpp b/src/src/ESPEasyCore/ESPEasyWifi_abstracted_ESP32.cpp index 302d2b914..49a170fea 100644 --- a/src/src/ESPEasyCore/ESPEasyWifi_abstracted_ESP32.cpp +++ b/src/src/ESPEasyCore/ESPEasyWifi_abstracted_ESP32.cpp @@ -417,7 +417,7 @@ bool setProtocol(wifi_interface_t ifx, uint16_t protocol_2GHz, uint16_t protocol # else // if CONFIG_SOC_WIFI_SUPPORT_5G bool setProtocol(wifi_interface_t ifx, uint8_t protocol_2GHz) { - #ifdef ESP32P4 + # ifndef SOC_WIFI_SUPPORTED return false; #else return esp_wifi_set_protocol(ifx, protocol_2GHz) == ESP_OK; @@ -443,7 +443,7 @@ void setConnectionSpeed(bool ForceWiFi_bg_mode) // However since HT40 is using nearly all channels on 2.4 GHz WiFi, // Thus you are more likely to experience disturbances. // The response speed and stability is better at HT20 for ESP units. - #ifdef ESP32P4 + # ifndef SOC_WIFI_SUPPORTED return; #else esp_wifi_set_bandwidth(WIFI_IF_STA, WIFI_BW_HT20); diff --git a/src/src/Helpers/ESPEasy_Storage.cpp b/src/src/Helpers/ESPEasy_Storage.cpp index 6e1e3c8df..f4a4788eb 100644 --- a/src/src/Helpers/ESPEasy_Storage.cpp +++ b/src/src/Helpers/ESPEasy_Storage.cpp @@ -692,7 +692,7 @@ bool Erase_WiFi_Calibration() { #endif #ifdef ESP32 - #ifdef ESP32P4 + # ifndef SOC_WIFI_SUPPORTED return false; #else WifiDisconnect(); diff --git a/src/src/Helpers/_NWPlugin_Helper_webform.cpp b/src/src/Helpers/_NWPlugin_Helper_webform.cpp index b664b1c9d..234c36cf1 100644 --- a/src/src/Helpers/_NWPlugin_Helper_webform.cpp +++ b/src/src/Helpers/_NWPlugin_Helper_webform.cpp @@ -201,3 +201,25 @@ void saveNetworkParameterForm(NetworkSettingsStruct & NetworkSettings, break; } } + +#ifdef ESP32 +bool printAllIpAddresses(NetworkInterface* networkInterface, Print &out) +{ + if (!networkInterface) return false; + out.println(networkInterface->localIP()); + + #if CONFIG_LWIP_IPV6 + static const char *types[] = {"UNKNOWN", "GLOBAL", "LINK_LOCAL", "SITE_LOCAL", "UNIQUE_LOCAL", "IPV4_MAPPED_IPV6"}; + esp_ip6_addr_t if_ip6[CONFIG_LWIP_IPV6_NUM_ADDRESSES]; + int v6addrs = esp_netif_get_all_ip6(networkInterface->netif(), if_ip6); + for (int i = 0; i < v6addrs; ++i) { + out.print(types[esp_netif_ip6_get_addr_type(&if_ip6[i])]); + out.print(": "); + IPAddress(IPv6, (const uint8_t *)if_ip6[i].addr, if_ip6[i].zone).printTo(out, true); + out.println(); + } +#endif + + return true; +} +#endif \ No newline at end of file diff --git a/src/src/Helpers/_NWPlugin_Helper_webform.h b/src/src/Helpers/_NWPlugin_Helper_webform.h index 9cf4ee6a7..1095b74ed 100644 --- a/src/src/Helpers/_NWPlugin_Helper_webform.h +++ b/src/src/Helpers/_NWPlugin_Helper_webform.h @@ -32,5 +32,8 @@ void saveNetworkParameterForm(NetworkSettingsStruct & NetworkSettings, networkIndex_t networkindex, NetworkSettingsStruct::VarType varType); +#ifdef ESP32 +bool printAllIpAddresses(NetworkInterface* networkInterface, Print &out); +#endif #endif // ifndef HELPERS__NWPLUGIN_HELPER_WEBFORM_H diff --git a/src/src/WebServer/NetworkPage.cpp b/src/src/WebServer/NetworkPage.cpp index 94c13b5a0..c7d5a030e 100644 --- a/src/src/WebServer/NetworkPage.cpp +++ b/src/src/WebServer/NetworkPage.cpp @@ -233,6 +233,7 @@ void handle_networks_ShowAllNetworksTable() } if (!str.isEmpty()) { + str.replace(F("\n"), F("
    ")); addHtml(str); } From 049e9fa0238cceacff2c14951484a08a69b1189f Mon Sep 17 00:00:00 2001 From: TD-er Date: Fri, 11 Jul 2025 11:13:02 +0200 Subject: [PATCH 102/564] [Network] List all IP-addresses per network interface --- src/_NW001_WiFi_STA.cpp | 2 +- src/_NW002_WiFi_AP.cpp | 2 +- src/_NW003_ETH.cpp | 2 +- .../DataTypes/ESPEasy_plugin_functions.cpp | 23 ++++++ src/src/DataTypes/ESPEasy_plugin_functions.h | 23 ++++++ src/src/Globals/NWPlugins.cpp | 4 + src/src/Globals/NWPlugins.h | 2 + src/src/Helpers/_NWPlugin_Helper_webform.cpp | 73 ++++++++++++++----- src/src/Helpers/_NWPlugin_Helper_webform.h | 4 +- src/src/WebServer/NetworkPage.cpp | 39 ++++++++-- 10 files changed, 147 insertions(+), 27 deletions(-) create mode 100644 src/src/DataTypes/ESPEasy_plugin_functions.cpp diff --git a/src/_NW001_WiFi_STA.cpp b/src/_NW001_WiFi_STA.cpp index 36198b1a5..5256fb6cc 100644 --- a/src/_NW001_WiFi_STA.cpp +++ b/src/_NW001_WiFi_STA.cpp @@ -103,7 +103,7 @@ bool NWPlugin_001(NWPlugin::Function function, struct EventStruct *event, String { # ifdef ESP32 PrintToString str; - printAllIpAddresses(&WiFi.STA, str); + success = print_IP_address(static_cast(event->Par1), &WiFi.STA, str); string = str.get(); // string = WiFi.STA.localIP().toString(); # else // ifdef ESP32 diff --git a/src/_NW002_WiFi_AP.cpp b/src/_NW002_WiFi_AP.cpp index a9b211cb7..bec0d9f1a 100644 --- a/src/_NW002_WiFi_AP.cpp +++ b/src/_NW002_WiFi_AP.cpp @@ -91,7 +91,7 @@ bool NWPlugin_002(NWPlugin::Function function, struct EventStruct *event, String { # ifdef ESP32 PrintToString str; - printAllIpAddresses(&WiFi.AP, str); + success = print_IP_address(static_cast(event->Par1), &WiFi.AP, str); string = str.get(); // string = WiFi.AP.localIP().toString(); diff --git a/src/_NW003_ETH.cpp b/src/_NW003_ETH.cpp index e10055eb2..20f60db0a 100644 --- a/src/_NW003_ETH.cpp +++ b/src/_NW003_ETH.cpp @@ -94,7 +94,7 @@ bool NWPlugin_003(NWPlugin::Function function, struct EventStruct *event, String case NWPlugin::Function::NWPLUGIN_WEBFORM_SHOW_IP: { PrintToString str; - printAllIpAddresses(Ð, str); + success = print_IP_address(static_cast(event->Par1), Ð, str); string = str.get(); // string = ETH.localIP().toString(); diff --git a/src/src/DataTypes/ESPEasy_plugin_functions.cpp b/src/src/DataTypes/ESPEasy_plugin_functions.cpp new file mode 100644 index 000000000..44e8cd3fb --- /dev/null +++ b/src/src/DataTypes/ESPEasy_plugin_functions.cpp @@ -0,0 +1,23 @@ +#include "../DataTypes/ESPEasy_plugin_functions.h" + +const __FlashStringHelper * NWPlugin::toString(NWPlugin::IP_type ip_type) +{ + switch (ip_type) + { + case NWPlugin::IP_type::inet: return F("Inet"); + case NWPlugin::IP_type::netmask: return F("Netmask"); + case NWPlugin::IP_type::broadcast: return F("Broadcast"); + case NWPlugin::IP_type::gateway: return F("Gateway"); + case NWPlugin::IP_type::dns1: return F("Dns1"); + case NWPlugin::IP_type::dns2: return F("Dns2"); +#if CONFIG_LWIP_IPV6 + case NWPlugin::IP_type::ipv6_unknown: return F("IPv6 unknown"); + case NWPlugin::IP_type::ipv6_global: return F("IPv6 global"); + case NWPlugin::IP_type::ipv6_link_local: return F("IPv6 link local"); + case NWPlugin::IP_type::ipv6_site_local: return F("IPv6 site local"); + case NWPlugin::IP_type::ipv6_unique_local: return F("IPv6 unique local"); + case NWPlugin::IP_type::ipv4_mapped_ipv6: return F("IPv4 mapped IPv6"); +#endif // if CONFIG_LWIP_IPV6 + } + return F("unknown"); +} diff --git a/src/src/DataTypes/ESPEasy_plugin_functions.h b/src/src/DataTypes/ESPEasy_plugin_functions.h index 54080b9f8..9e640802c 100644 --- a/src/src/DataTypes/ESPEasy_plugin_functions.h +++ b/src/src/DataTypes/ESPEasy_plugin_functions.h @@ -143,6 +143,9 @@ public: NWPLUGIN_INIT_ALL, NWPLUGIN_EXIT, NWPLUGIN_WRITE, // Send commands to a network adapter. + #ifdef ESP32 + NWPLUGIN_GET_INTERFACE, + #endif NWPLUGIN_WEBFORM_SHOW_CONNECTED, // Used for showing connected state/speed NWPLUGIN_WEBFORM_SHOW_HOSTNAME, // Used for showing hostname NWPLUGIN_WEBFORM_SHOW_MAC, // Used for showing MAC @@ -151,6 +154,26 @@ public: }; + enum class IP_type { + inet, + netmask, + broadcast, + gateway, + dns1, + dns2, +# if CONFIG_LWIP_IPV6 + ipv6_unknown, + ipv6_global, + ipv6_link_local, + ipv6_site_local, + ipv6_unique_local, + ipv4_mapped_ipv6 +# endif + + }; + + static const __FlashStringHelper* toString(IP_type ip_type); + }; // class NWPlugin // ******************************************************************************** diff --git a/src/src/Globals/NWPlugins.cpp b/src/src/Globals/NWPlugins.cpp index 7d55e2bf5..d24c224c2 100644 --- a/src/src/Globals/NWPlugins.cpp +++ b/src/src/Globals/NWPlugins.cpp @@ -113,6 +113,10 @@ bool NWPluginCall(NWPlugin::Function Function, struct EventStruct *event, String bool validNetworkDriverIndex(networkDriverIndex_t index) { return validNetworkDriverIndex_init(index); } + +//bool getIP(networkDriverIndex_t index, NWPlugin::IP_type ip_type){} + + /* bool validNetworkIndex(networkIndex_t index) { diff --git a/src/src/Globals/NWPlugins.h b/src/src/Globals/NWPlugins.h index 50aa8e2d5..8bcebfa37 100644 --- a/src/src/Globals/NWPlugins.h +++ b/src/src/Globals/NWPlugins.h @@ -27,6 +27,8 @@ bool NWPluginCall(networkDriverIndex_t networkDriverIndex, bool validNetworkDriverIndex(networkDriverIndex_t index); +//bool getIP(networkDriverIndex_t index, NWPlugin::IP_type ip_type); + // bool validNetworkIndex(networkIndex_t index); #define validNetworkIndex(C_X) ((C_X) < NETWORK_MAX) diff --git a/src/src/Helpers/_NWPlugin_Helper_webform.cpp b/src/src/Helpers/_NWPlugin_Helper_webform.cpp index 234c36cf1..416fb377c 100644 --- a/src/src/Helpers/_NWPlugin_Helper_webform.cpp +++ b/src/src/Helpers/_NWPlugin_Helper_webform.cpp @@ -197,29 +197,66 @@ void saveNetworkParameterForm(NetworkSettingsStruct & NetworkSettings, case NetworkSettingsStruct::NETWORK_ENABLED: Settings.setNetworkEnabled(networkindex, isFormItemChecked(internalName)); - addLog(LOG_LEVEL_INFO, concat(F("Save NW_Enabled: "), internalName) + ' ' + isFormItemChecked(internalName) + ' ' + Settings.getNetworkEnabled(networkindex)); + addLog(LOG_LEVEL_INFO, + concat(F("Save NW_Enabled: "), + internalName) + ' ' + isFormItemChecked(internalName) + ' ' + Settings.getNetworkEnabled(networkindex)); break; } } #ifdef ESP32 -bool printAllIpAddresses(NetworkInterface* networkInterface, Print &out) +bool print_IP_address(NWPlugin::IP_type ip_type, NetworkInterface* networkInterface, Print &out) { - if (!networkInterface) return false; - out.println(networkInterface->localIP()); - - #if CONFIG_LWIP_IPV6 - static const char *types[] = {"UNKNOWN", "GLOBAL", "LINK_LOCAL", "SITE_LOCAL", "UNIQUE_LOCAL", "IPV4_MAPPED_IPV6"}; - esp_ip6_addr_t if_ip6[CONFIG_LWIP_IPV6_NUM_ADDRESSES]; - int v6addrs = esp_netif_get_all_ip6(networkInterface->netif(), if_ip6); - for (int i = 0; i < v6addrs; ++i) { - out.print(types[esp_netif_ip6_get_addr_type(&if_ip6[i])]); - out.print(": "); - IPAddress(IPv6, (const uint8_t *)if_ip6[i].addr, if_ip6[i].zone).printTo(out, true); - out.println(); + const IPAddress ip(get_IP_address(ip_type, networkInterface)); + const size_t nrBytes = ip.printTo(out, true) > 0; + if (ip.type() == IPv4) { + const uint32_t val(ip); + if (val == 0) return false; } -#endif - - return true; + return nrBytes > 0; } -#endif \ No newline at end of file + +IPAddress get_IP_address(NWPlugin::IP_type ip_type, NetworkInterface*networkInterface) +{ + IPAddress ip; + + if (networkInterface) { +# if CONFIG_LWIP_IPV6 + esp_ip6_addr_type_t ip6_addr_type = ESP_IP6_ADDR_IS_UNKNOWN; +#endif + switch (ip_type) + { + case NWPlugin::IP_type::inet: return networkInterface->localIP(); + case NWPlugin::IP_type::netmask: return networkInterface->subnetMask(); + case NWPlugin::IP_type::broadcast: return networkInterface->broadcastIP(); + case NWPlugin::IP_type::gateway: return networkInterface->gatewayIP(); + case NWPlugin::IP_type::dns1: return networkInterface->dnsIP(0); + case NWPlugin::IP_type::dns2: return networkInterface->dnsIP(1); +# if CONFIG_LWIP_IPV6 + case NWPlugin::IP_type::ipv6_unknown: ip6_addr_type = ESP_IP6_ADDR_IS_UNKNOWN; break; + case NWPlugin::IP_type::ipv6_global: ip6_addr_type = ESP_IP6_ADDR_IS_GLOBAL; break; + case NWPlugin::IP_type::ipv6_link_local: ip6_addr_type = ESP_IP6_ADDR_IS_LINK_LOCAL; break; + case NWPlugin::IP_type::ipv6_site_local: ip6_addr_type = ESP_IP6_ADDR_IS_SITE_LOCAL; break; + case NWPlugin::IP_type::ipv6_unique_local: ip6_addr_type = ESP_IP6_ADDR_IS_UNIQUE_LOCAL; break; + case NWPlugin::IP_type::ipv4_mapped_ipv6: ip6_addr_type = ESP_IP6_ADDR_IS_IPV4_MAPPED_IPV6; break; +# endif // if CONFIG_LWIP_IPV6 + default: + return ip; + } +# if CONFIG_LWIP_IPV6 + if (networkInterface->netif()) { + esp_ip6_addr_t if_ip6[CONFIG_LWIP_IPV6_NUM_ADDRESSES]; + int v6addrs = esp_netif_get_all_ip6(networkInterface->netif(), if_ip6); + for (int i = 0; i < v6addrs; ++i) { + if (esp_netif_ip6_get_addr_type(&if_ip6[i]) == ip6_addr_type) { + return IPAddress(IPv6, (const uint8_t *)if_ip6[i].addr, if_ip6[i].zone); + } + } + } +# endif + } + + return ip; +} + +#endif // ifdef ESP32 diff --git a/src/src/Helpers/_NWPlugin_Helper_webform.h b/src/src/Helpers/_NWPlugin_Helper_webform.h index 1095b74ed..2d77ae8d6 100644 --- a/src/src/Helpers/_NWPlugin_Helper_webform.h +++ b/src/src/Helpers/_NWPlugin_Helper_webform.h @@ -33,7 +33,9 @@ void saveNetworkParameterForm(NetworkSettingsStruct & NetworkSettings, NetworkSettingsStruct::VarType varType); #ifdef ESP32 -bool printAllIpAddresses(NetworkInterface* networkInterface, Print &out); +bool print_IP_address(NWPlugin::IP_type ip_type, NetworkInterface* networkInterface, Print &out); + +IPAddress get_IP_address(NWPlugin::IP_type ip_type, NetworkInterface* networkInterface); #endif #endif // ifndef HELPERS__NWPLUGIN_HELPER_WEBFORM_H diff --git a/src/src/WebServer/NetworkPage.cpp b/src/src/WebServer/NetworkPage.cpp index c7d5a030e..9a21cf114 100644 --- a/src/src/WebServer/NetworkPage.cpp +++ b/src/src/WebServer/NetworkPage.cpp @@ -223,8 +223,11 @@ void handle_networks_ShowAllNetworksTable() for (uint8_t i = 0; i < NR_ELEMENTS(functions); ++i) { html_TD(); + struct EventStruct TempEvent; + TempEvent.NetworkIndex = x; + String str; - const bool res = NWPluginCall(NetworkDriverIndex, functions[i], 0, str); + const bool res = NWPluginCall(NetworkDriverIndex, functions[i], &TempEvent, str); if (functions[i] == NWPlugin::Function::NWPLUGIN_WEBFORM_SHOW_CONNECTED) { if (!res || str.isEmpty()) { @@ -300,11 +303,37 @@ void handle_networks_NetworkSettingsPage(networkIndex_t networkindex) { struct EventStruct TempEvent; TempEvent.NetworkIndex = networkindex; - String webformLoadString; - NWPluginCall(networkDriverIndex, NWPlugin::Function::NWPLUGIN_WEBFORM_LOAD, &TempEvent, webformLoadString); + String str; + NWPluginCall(networkDriverIndex, NWPlugin::Function::NWPLUGIN_WEBFORM_LOAD, &TempEvent, str); - if (webformLoadString.length() > 0) { - addHtmlError(F("Bug in NWPlugin::Function::NWPLUGIN_WEBFORM_LOAD, should not append to string, use addHtml() instead")); + addFormSubHeader(F("IP Config")); + + const NWPlugin::IP_type ip_types[] = { + NWPlugin::IP_type::inet, + NWPlugin::IP_type::netmask, + NWPlugin::IP_type::broadcast, + NWPlugin::IP_type::gateway, + NWPlugin::IP_type::dns1, + NWPlugin::IP_type::dns2, +# if CONFIG_LWIP_IPV6 + NWPlugin::IP_type::ipv6_unknown, + NWPlugin::IP_type::ipv6_global, + NWPlugin::IP_type::ipv6_link_local, + NWPlugin::IP_type::ipv6_site_local, + NWPlugin::IP_type::ipv6_unique_local, + NWPlugin::IP_type::ipv4_mapped_ipv6, +# endif // if CONFIG_LWIP_IPV6 + + }; + + for (size_t i = 0; i < NR_ELEMENTS(ip_types); ++i) { + TempEvent.Par1 = static_cast(ip_types[i]); + + if (NWPluginCall(networkDriverIndex, NWPlugin::Function::NWPLUGIN_WEBFORM_SHOW_IP, &TempEvent, str)) + { + addRowLabel(NWPlugin::toString(ip_types[i])); + addHtml(str); + } } addFormSeparator(2); From c6130f928f8c45d59e5827a22e63923dcf6d0ff5 Mon Sep 17 00:00:00 2001 From: TD-er Date: Fri, 11 Jul 2025 15:58:39 +0200 Subject: [PATCH 103/564] [Network] Process info based on NetworkInterface baseclass when possible --- src/_NW001_WiFi_STA.cpp | 35 ++++--- src/_NW002_WiFi_AP.cpp | 31 +++--- src/_NW003_ETH.cpp | 34 +++---- src/src/DataStructs/ESPEasy_EventStruct.h | 6 ++ .../DataTypes/ESPEasy_plugin_functions.cpp | 96 ++++++++++++++++++- src/src/DataTypes/ESPEasy_plugin_functions.h | 13 ++- src/src/Globals/NWPlugins.cpp | 66 +++++++++++-- src/src/Globals/NWPlugins.h | 42 +++----- src/src/Helpers/ESPEasy_checks.cpp | 2 +- src/src/Helpers/_NWPlugin_Helper_webform.cpp | 71 +++----------- src/src/Helpers/_NWPlugin_Helper_webform.h | 5 - src/src/Helpers/_NWPlugin_init.cpp | 22 ++--- src/src/Helpers/_NWPlugin_init.h | 3 +- src/src/WebServer/HTML_wrappers.cpp | 6 ++ src/src/WebServer/HTML_wrappers.h | 2 + src/src/WebServer/NetworkPage.cpp | 31 +++--- src/src/WebServer/SysVarPage.cpp | 6 +- 17 files changed, 284 insertions(+), 187 deletions(-) diff --git a/src/_NW001_WiFi_STA.cpp b/src/_NW001_WiFi_STA.cpp index 5256fb6cc..33e8207f7 100644 --- a/src/_NW001_WiFi_STA.cpp +++ b/src/_NW001_WiFi_STA.cpp @@ -53,6 +53,14 @@ bool NWPlugin_001(NWPlugin::Function function, struct EventStruct *event, String string = F(NWPLUGIN_NAME_001); break; } +# ifdef ESP32 + case NWPlugin::Function::NWPLUGIN_GET_INTERFACE: + { + event->networkInterface = &WiFi.STA; + success = event->networkInterface != nullptr; + break; + } +# endif // ifdef ESP32 case NWPlugin::Function::NWPLUGIN_WEBFORM_SHOW_CONNECTED: { @@ -78,39 +86,28 @@ bool NWPlugin_001(NWPlugin::Function function, struct EventStruct *event, String break; } +# ifdef ESP8266 case NWPlugin::Function::NWPLUGIN_WEBFORM_SHOW_HOSTNAME: { -# ifdef ESP32 - string = WiFi.STA.getHostname(); -# else - string = WiFi.hostname(); -# endif // ifdef ESP32 + string = WiFi.hostname(); + success = true; break; } case NWPlugin::Function::NWPLUGIN_WEBFORM_SHOW_MAC: { -# ifdef ESP32 - string = WiFi.STA.macAddress(); -# else - string = WiFi.macAddress(); -# endif // ifdef ESP32 - + string = WiFi.macAddress(); + success = true; break; } case NWPlugin::Function::NWPLUGIN_WEBFORM_SHOW_IP: { -# ifdef ESP32 - PrintToString str; - success = print_IP_address(static_cast(event->Par1), &WiFi.STA, str); - string = str.get(); - // string = WiFi.STA.localIP().toString(); -# else // ifdef ESP32 - string = WiFi.localIP().toString(); -# endif // ifdef ESP32 + string = WiFi.localIP().toString(); + success = true; break; } +# endif // ifdef ESP8266 case NWPlugin::Function::NWPLUGIN_WEBFORM_SHOW_PORT: { diff --git a/src/_NW002_WiFi_AP.cpp b/src/_NW002_WiFi_AP.cpp index bec0d9f1a..dfc8d50f9 100644 --- a/src/_NW002_WiFi_AP.cpp +++ b/src/_NW002_WiFi_AP.cpp @@ -49,6 +49,16 @@ bool NWPlugin_002(NWPlugin::Function function, struct EventStruct *event, String break; } +# ifdef ESP32 + case NWPlugin::Function::NWPLUGIN_GET_INTERFACE: + { + event->networkInterface = &WiFi.AP; + success = event->networkInterface != nullptr; + break; + } +# endif // ifdef ESP32 + + case NWPlugin::Function::NWPLUGIN_WEBFORM_SHOW_CONNECTED: { # ifdef ESP32 @@ -74,32 +84,25 @@ bool NWPlugin_002(NWPlugin::Function function, struct EventStruct *event, String # else string = WiFi.softAPSSID(); # endif // ifdef ESP32 + success = true; break; } +# ifdef ESP8266 case NWPlugin::Function::NWPLUGIN_WEBFORM_SHOW_MAC: { -# ifdef ESP32 - string = WiFi.AP.macAddress(); -# else - string = WiFi.softAPmacAddress(); -# endif // ifdef ESP32 + string = WiFi.softAPmacAddress(); + success = true; break; } case NWPlugin::Function::NWPLUGIN_WEBFORM_SHOW_IP: { -# ifdef ESP32 - PrintToString str; - success = print_IP_address(static_cast(event->Par1), &WiFi.AP, str); - string = str.get(); - - // string = WiFi.AP.localIP().toString(); -# else // ifdef ESP32 - string = WiFi.softAPIP().toString(); -# endif // ifdef ESP32 + string = WiFi.softAPIP().toString(); + success = true; break; } +# endif // ifdef ESP8266 case NWPlugin::Function::NWPLUGIN_WEBFORM_SHOW_PORT: { diff --git a/src/_NW003_ETH.cpp b/src/_NW003_ETH.cpp index 20f60db0a..37cbf02e4 100644 --- a/src/_NW003_ETH.cpp +++ b/src/_NW003_ETH.cpp @@ -66,41 +66,29 @@ bool NWPlugin_003(NWPlugin::Function function, struct EventStruct *event, String break; } + # ifdef ESP32 + case NWPlugin::Function::NWPLUGIN_GET_INTERFACE: + { + event->networkInterface = Ð + success = event->networkInterface != nullptr; + break; + } +# endif // ifdef ESP32 + + case NWPlugin::Function::NWPLUGIN_WEBFORM_SHOW_CONNECTED: { success = ETH.connected(); if (ETH.linkUp()) { string = ETH.linkSpeed(); - string += ETH.fullDuplex() ? F("M FD") : F("M HD"); + string += ETH.fullDuplex() ? F("Mbps FD") : F("Mbps HD"); if (!ETH.autoNegotiation()) { string += F("(manual)"); } } break; } - case NWPlugin::Function::NWPLUGIN_WEBFORM_SHOW_HOSTNAME: - { - string = ETH.getHostname(); - break; - } - - case NWPlugin::Function::NWPLUGIN_WEBFORM_SHOW_MAC: - { - string = ETH.macAddress(); - break; - } - - case NWPlugin::Function::NWPLUGIN_WEBFORM_SHOW_IP: - { - PrintToString str; - success = print_IP_address(static_cast(event->Par1), Ð, str); - string = str.get(); - - // string = ETH.localIP().toString(); - break; - } - case NWPlugin::Function::NWPLUGIN_WEBFORM_SHOW_PORT: { break; diff --git a/src/src/DataStructs/ESPEasy_EventStruct.h b/src/src/DataStructs/ESPEasy_EventStruct.h index 08cd19d45..e9f3b62f7 100644 --- a/src/src/DataStructs/ESPEasy_EventStruct.h +++ b/src/src/DataStructs/ESPEasy_EventStruct.h @@ -10,6 +10,9 @@ #include "../DataTypes/NetworkIndex.h" #include "../DataStructs/DeviceStruct.h" +#ifdef ESP32 +class NetworkInterface; +#endif /*********************************************************************************************\ * EventStruct @@ -55,6 +58,9 @@ public: String String3; String String4; String String5; + #ifdef ESP32 + NetworkInterface* networkInterface = nullptr; + #endif uint32_t timestamp_sec = 0u; diff --git a/src/src/DataTypes/ESPEasy_plugin_functions.cpp b/src/src/DataTypes/ESPEasy_plugin_functions.cpp index 44e8cd3fb..de17668d0 100644 --- a/src/src/DataTypes/ESPEasy_plugin_functions.cpp +++ b/src/src/DataTypes/ESPEasy_plugin_functions.cpp @@ -1,23 +1,115 @@ #include "../DataTypes/ESPEasy_plugin_functions.h" +#ifdef ESP32 + +# include + +bool NWPlugin::canQueryViaNetworkInterface(NWPlugin::Function function) +{ + switch (function) + { + // TD-er: Do not try to fetch hostname via base class. No idea why, but it doesn't work well + case NWPlugin::Function::NWPLUGIN_WEBFORM_SHOW_HOSTNAME: + case NWPlugin::Function::NWPLUGIN_WEBFORM_SHOW_MAC: + case NWPlugin::Function::NWPLUGIN_WEBFORM_SHOW_IP: + return true; + default: break; + } + return false; +} + const __FlashStringHelper * NWPlugin::toString(NWPlugin::IP_type ip_type) { switch (ip_type) { case NWPlugin::IP_type::inet: return F("Inet"); + case NWPlugin::IP_type::network_id_cdr: return F("Network/CDR"); case NWPlugin::IP_type::netmask: return F("Netmask"); case NWPlugin::IP_type::broadcast: return F("Broadcast"); case NWPlugin::IP_type::gateway: return F("Gateway"); case NWPlugin::IP_type::dns1: return F("Dns1"); case NWPlugin::IP_type::dns2: return F("Dns2"); -#if CONFIG_LWIP_IPV6 +# if CONFIG_LWIP_IPV6 case NWPlugin::IP_type::ipv6_unknown: return F("IPv6 unknown"); case NWPlugin::IP_type::ipv6_global: return F("IPv6 global"); case NWPlugin::IP_type::ipv6_link_local: return F("IPv6 link local"); case NWPlugin::IP_type::ipv6_site_local: return F("IPv6 site local"); case NWPlugin::IP_type::ipv6_unique_local: return F("IPv6 unique local"); case NWPlugin::IP_type::ipv4_mapped_ipv6: return F("IPv4 mapped IPv6"); -#endif // if CONFIG_LWIP_IPV6 +# endif // if CONFIG_LWIP_IPV6 } return F("unknown"); } + +bool NWPlugin::print_IP_address(NWPlugin::IP_type ip_type, NetworkInterface*networkInterface, Print& out) +{ + const IPAddress ip(get_IP_address(ip_type, networkInterface)); + const size_t nrBytes = ip.printTo(out, true) > 0; + + if (ip.type() == IPv4) { + const uint32_t val(ip); + + if (val == 0) { return false; } + } + + if (ip_type == NWPlugin::IP_type::network_id_cdr) { + out.print('/'); + out.print(networkInterface->subnetCIDR()); + } + return nrBytes > 0; +} + +IPAddress NWPlugin::get_IP_address(NWPlugin::IP_type ip_type, NetworkInterface*networkInterface) +{ + IPAddress ip; + + if (networkInterface) { +# if CONFIG_LWIP_IPV6 + esp_ip6_addr_type_t ip6_addr_type = ESP_IP6_ADDR_IS_UNKNOWN; +# endif + + switch (ip_type) + { + case NWPlugin::IP_type::inet: return networkInterface->localIP(); + case NWPlugin::IP_type::network_id_cdr: return networkInterface->networkID(); + case NWPlugin::IP_type::netmask: return networkInterface->subnetMask(); + case NWPlugin::IP_type::broadcast: return networkInterface->broadcastIP(); + case NWPlugin::IP_type::gateway: return networkInterface->gatewayIP(); + case NWPlugin::IP_type::dns1: return networkInterface->dnsIP(0); + case NWPlugin::IP_type::dns2: return networkInterface->dnsIP(1); +# if CONFIG_LWIP_IPV6 + case NWPlugin::IP_type::ipv6_unknown: ip6_addr_type = ESP_IP6_ADDR_IS_UNKNOWN; + break; + case NWPlugin::IP_type::ipv6_global: ip6_addr_type = ESP_IP6_ADDR_IS_GLOBAL; + break; + case NWPlugin::IP_type::ipv6_link_local: ip6_addr_type = ESP_IP6_ADDR_IS_LINK_LOCAL; + break; + case NWPlugin::IP_type::ipv6_site_local: ip6_addr_type = ESP_IP6_ADDR_IS_SITE_LOCAL; + break; + case NWPlugin::IP_type::ipv6_unique_local: ip6_addr_type = ESP_IP6_ADDR_IS_UNIQUE_LOCAL; + break; + case NWPlugin::IP_type::ipv4_mapped_ipv6: ip6_addr_type = ESP_IP6_ADDR_IS_IPV4_MAPPED_IPV6; + break; +# endif // if CONFIG_LWIP_IPV6 + default: + return ip; + } +# if CONFIG_LWIP_IPV6 + + if (networkInterface->netif()) { + esp_ip6_addr_t if_ip6[CONFIG_LWIP_IPV6_NUM_ADDRESSES]; + int v6addrs = esp_netif_get_all_ip6(networkInterface->netif(), if_ip6); + + for (int i = 0; i < v6addrs; ++i) { + if (esp_netif_ip6_get_addr_type(&if_ip6[i]) == ip6_addr_type) { + return IPAddress(IPv6, (const uint8_t *)if_ip6[i].addr, if_ip6[i].zone); + } + } + } +# endif // if CONFIG_LWIP_IPV6 + } + + return ip; +} + +#endif // ifdef ESP32 diff --git a/src/src/DataTypes/ESPEasy_plugin_functions.h b/src/src/DataTypes/ESPEasy_plugin_functions.h index 9e640802c..fe0e30d37 100644 --- a/src/src/DataTypes/ESPEasy_plugin_functions.h +++ b/src/src/DataTypes/ESPEasy_plugin_functions.h @@ -154,8 +154,11 @@ public: }; +#ifdef ESP32 + enum class IP_type { - inet, + inet = 0, // Keep index at 0 as default query + network_id_cdr, netmask, broadcast, gateway, @@ -172,8 +175,16 @@ public: }; + static bool canQueryViaNetworkInterface(Function function); + static const __FlashStringHelper* toString(IP_type ip_type); + static IPAddress get_IP_address(NWPlugin::IP_type ip_type, NetworkInterface* networkInterface); + + static bool print_IP_address(NWPlugin::IP_type ip_type, NetworkInterface* networkInterface, Print &out); + +#endif + }; // class NWPlugin // ******************************************************************************** diff --git a/src/src/Globals/NWPlugins.cpp b/src/src/Globals/NWPlugins.cpp index d24c224c2..86c674a18 100644 --- a/src/src/Globals/NWPlugins.cpp +++ b/src/src/Globals/NWPlugins.cpp @@ -8,6 +8,7 @@ #include "../Globals/Settings.h" #include "../Helpers/_NWPlugin_init.h" +#include "../Helpers/PrintToString.h" bool NWPluginCall(NWPlugin::Function Function, struct EventStruct *event) { #ifdef USE_SECOND_HEAP @@ -58,7 +59,7 @@ bool NWPluginCall(NWPlugin::Function Function, struct EventStruct *event, String command = str; } - if (NWPluginCall( + if (NWPluginCall_( getNetworkDriverIndex_from_NetworkIndex(x), Function, event, @@ -80,7 +81,15 @@ bool NWPluginCall(NWPlugin::Function Function, struct EventStruct *event, String case NWPlugin::Function::NWPLUGIN_GET_DEVICENAME: case NWPlugin::Function::NWPLUGIN_WEBFORM_LOAD: case NWPlugin::Function::NWPLUGIN_WEBFORM_SAVE: +#ifdef ESP32 + case NWPlugin::Function::NWPLUGIN_GET_INTERFACE: +#endif + case NWPlugin::Function::NWPLUGIN_CONNECT_SUCCESS: + case NWPlugin::Function::NWPLUGIN_CONNECT_FAIL: + case NWPlugin::Function::NWPLUGIN_DRIVER_TEMPLATE: + case NWPlugin::Function::NWPLUGIN_GET_PARAMETER_DISPLAY_NAME: case NWPlugin::Function::NWPLUGIN_WEBFORM_SHOW_CONNECTED: + case NWPlugin::Function::NWPLUGIN_WEBFORM_SHOW_HOSTNAME: case NWPlugin::Function::NWPLUGIN_WEBFORM_SHOW_MAC: case NWPlugin::Function::NWPLUGIN_WEBFORM_SHOW_IP: case NWPlugin::Function::NWPLUGIN_WEBFORM_SHOW_PORT: @@ -91,18 +100,60 @@ bool NWPluginCall(NWPlugin::Function Function, struct EventStruct *event, String if (validNetworkIndex(networkIndex)) { if (Settings.getNetworkEnabled(networkIndex) && supportedNWPluginID(Settings.getNWPluginID_for_network(networkIndex))) { - success = NWPluginCall( - getNetworkDriverIndex_from_NetworkIndex(networkIndex), + const networkDriverIndex_t networkDriverIndex = + getNetworkDriverIndex_from_NetworkIndex(networkIndex); + + success = NWPluginCall_( + networkDriverIndex, Function, event, str); +#ifdef ESP32 + + if (!success && NWPlugin::canQueryViaNetworkInterface(Function)) { + String dummy_str; + + if (NWPluginCall_( + networkDriverIndex, + NWPlugin::Function::NWPLUGIN_GET_INTERFACE, + event, + dummy_str)) { + if (event->networkInterface != nullptr) { + switch (Function) + { + case NWPlugin::Function::NWPLUGIN_WEBFORM_SHOW_HOSTNAME: + str = event->networkInterface->getHostname(); + success = true; + break; + + case NWPlugin::Function::NWPLUGIN_WEBFORM_SHOW_MAC: + str = event->networkInterface->macAddress(); + success = true; + break; + + case NWPlugin::Function::NWPLUGIN_WEBFORM_SHOW_IP: + { + PrintToString prstr; + success = NWPlugin::print_IP_address( + static_cast(event->Par1), + event->networkInterface, + prstr); + str = prstr.get(); + break; + } + default: break; + } + } + } + } +#endif // ifdef ESP32 } - #ifdef ESP32 +#ifdef ESP32 if (Function == NWPlugin::Function::NWPLUGIN_EXIT) { // Cache.clearNetworkSettings(networkIndex); } - #endif // ifdef ESP32 +#endif // ifdef ESP32 } return success; } @@ -114,8 +165,7 @@ bool NWPluginCall(NWPlugin::Function Function, struct EventStruct *event, String bool validNetworkDriverIndex(networkDriverIndex_t index) { return validNetworkDriverIndex_init(index); } -//bool getIP(networkDriverIndex_t index, NWPlugin::IP_type ip_type){} - +// bool getIP(networkDriverIndex_t index, NWPlugin::IP_type ip_type){} /* bool validNetworkIndex(networkIndex_t index) @@ -156,7 +206,7 @@ String getNWPluginNameFromNetworkDriverIndex(networkDriverIndex_t NetworkDriverI String networkName; if (validNetworkDriverIndex(NetworkDriverIndex)) { - NWPluginCall(NetworkDriverIndex, NWPlugin::Function::NWPLUGIN_GET_DEVICENAME, nullptr, networkName); + NWPluginCall_(NetworkDriverIndex, NWPlugin::Function::NWPLUGIN_GET_DEVICENAME, nullptr, networkName); } return networkName; } diff --git a/src/src/Globals/NWPlugins.h b/src/src/Globals/NWPlugins.h index 8bcebfa37..3f40debca 100644 --- a/src/src/Globals/NWPlugins.h +++ b/src/src/Globals/NWPlugins.h @@ -10,47 +10,35 @@ #include "../DataTypes/NetworkDriverIndex.h" +bool NWPluginCall(NWPlugin::Function Function, + struct EventStruct *event); +bool NWPluginCall(NWPlugin::Function Function, + struct EventStruct *event, + String & str); +bool validNetworkDriverIndex(networkDriverIndex_t index); -bool NWPluginCall(NWPlugin::Function Function, - struct EventStruct *event); -bool NWPluginCall(NWPlugin::Function Function, - struct EventStruct *event, - String & str); -bool NWPluginCall(networkDriverIndex_t networkDriverIndex, - NWPlugin::Function Function, - struct EventStruct *event, - String & str); - - - -bool validNetworkDriverIndex(networkDriverIndex_t index); - -//bool getIP(networkDriverIndex_t index, NWPlugin::IP_type ip_type); +// bool getIP(networkDriverIndex_t index, NWPlugin::IP_type ip_type); // bool validNetworkIndex(networkIndex_t index); -#define validNetworkIndex(C_X) ((C_X) < NETWORK_MAX) +#define validNetworkIndex(C_X) ((C_X) < NETWORK_MAX) // Check whether NWPlugin is included in build. -bool validNWPluginID(nwpluginID_t nwpluginID); +bool validNWPluginID(nwpluginID_t nwpluginID); // Check if nwplugin is included in build. // N.B. Invalid nwplugin is also not considered supported. // This is essentially (validNWPluginID && validNetworkDriverIndex) -bool supportedNWPluginID(nwpluginID_t nwpluginID); +bool supportedNWPluginID(nwpluginID_t nwpluginID); networkDriverIndex_t getNetworkDriverIndex_from_NetworkIndex(networkIndex_t index); networkDriverIndex_t getNetworkDriverIndex_from_NWPluginID(nwpluginID_t nwpluginID); -nwpluginID_t getNWPluginID_from_NetworkDriverIndex(networkDriverIndex_t index); -nwpluginID_t getNWPluginID_from_NetworkIndex(networkIndex_t index); - -String getNWPluginNameFromNetworkDriverIndex(networkDriverIndex_t NetworkDriverIndex); -String getNWPluginNameFromNWPluginID(nwpluginID_t nwpluginID); - - -#endif - +nwpluginID_t getNWPluginID_from_NetworkDriverIndex(networkDriverIndex_t index); +nwpluginID_t getNWPluginID_from_NetworkIndex(networkIndex_t index); +String getNWPluginNameFromNetworkDriverIndex(networkDriverIndex_t NetworkDriverIndex); +String getNWPluginNameFromNWPluginID(nwpluginID_t nwpluginID); +#endif // ifndef GLOBALS_NWPLUGIN_H diff --git a/src/src/Helpers/ESPEasy_checks.cpp b/src/src/Helpers/ESPEasy_checks.cpp index 81b808328..da01f3204 100644 --- a/src/src/Helpers/ESPEasy_checks.cpp +++ b/src/src/Helpers/ESPEasy_checks.cpp @@ -104,7 +104,7 @@ void run_compiletime_checks() { check_max_size(); #ifdef ESP32 // ESP_IDF_VERSION_MAJOR > 3 // String class has increased with 4 bytes - check_size(); // Is not stored + check_size(); // Is not stored #else check_size(); // Is not stored #endif diff --git a/src/src/Helpers/_NWPlugin_Helper_webform.cpp b/src/src/Helpers/_NWPlugin_Helper_webform.cpp index 416fb377c..34245356f 100644 --- a/src/src/Helpers/_NWPlugin_Helper_webform.cpp +++ b/src/src/Helpers/_NWPlugin_Helper_webform.cpp @@ -12,6 +12,8 @@ #include "../WebServer/Markup.h" #include "../WebServer/Markup_Forms.h" +#include "../Helpers/_NWPlugin_init.h" + /*********************************************************************************************\ * Functions to load and store network settings on the web page. \*********************************************************************************************/ @@ -44,7 +46,7 @@ String getNetworkParameterName(networkDriverIndex_t NetworkDriverIndex EventStruct tmpEvent; tmpEvent.idx = parameterIdx; - if (NWPluginCall(NetworkDriverIndex, NWPlugin::Function::NWPLUGIN_GET_PARAMETER_DISPLAY_NAME, &tmpEvent, name)) { + if (NWPluginCall_(NetworkDriverIndex, NWPlugin::Function::NWPLUGIN_GET_PARAMETER_DISPLAY_NAME, &tmpEvent, name)) { // Found an alternative name for it. isAlternative = true; return name; @@ -150,6 +152,11 @@ void addNetworkParameterForm(const NetworkSettingsStruct & NetworkSettings, break; } + case NetworkSettingsStruct::NETWORK_TIMEOUT: + { + break; + } + case NetworkSettingsStruct::NETWORK_ENABLED: addFormCheckBox(displayName, internalName, Settings.getNetworkEnabled(networkindex)); break; @@ -195,6 +202,11 @@ void saveNetworkParameterForm(NetworkSettingsStruct & NetworkSettings, break; } + case NetworkSettingsStruct::NETWORK_TIMEOUT: + { + break; + } + case NetworkSettingsStruct::NETWORK_ENABLED: Settings.setNetworkEnabled(networkindex, isFormItemChecked(internalName)); addLog(LOG_LEVEL_INFO, @@ -203,60 +215,3 @@ void saveNetworkParameterForm(NetworkSettingsStruct & NetworkSettings, break; } } - -#ifdef ESP32 -bool print_IP_address(NWPlugin::IP_type ip_type, NetworkInterface* networkInterface, Print &out) -{ - const IPAddress ip(get_IP_address(ip_type, networkInterface)); - const size_t nrBytes = ip.printTo(out, true) > 0; - if (ip.type() == IPv4) { - const uint32_t val(ip); - if (val == 0) return false; - } - return nrBytes > 0; -} - -IPAddress get_IP_address(NWPlugin::IP_type ip_type, NetworkInterface*networkInterface) -{ - IPAddress ip; - - if (networkInterface) { -# if CONFIG_LWIP_IPV6 - esp_ip6_addr_type_t ip6_addr_type = ESP_IP6_ADDR_IS_UNKNOWN; -#endif - switch (ip_type) - { - case NWPlugin::IP_type::inet: return networkInterface->localIP(); - case NWPlugin::IP_type::netmask: return networkInterface->subnetMask(); - case NWPlugin::IP_type::broadcast: return networkInterface->broadcastIP(); - case NWPlugin::IP_type::gateway: return networkInterface->gatewayIP(); - case NWPlugin::IP_type::dns1: return networkInterface->dnsIP(0); - case NWPlugin::IP_type::dns2: return networkInterface->dnsIP(1); -# if CONFIG_LWIP_IPV6 - case NWPlugin::IP_type::ipv6_unknown: ip6_addr_type = ESP_IP6_ADDR_IS_UNKNOWN; break; - case NWPlugin::IP_type::ipv6_global: ip6_addr_type = ESP_IP6_ADDR_IS_GLOBAL; break; - case NWPlugin::IP_type::ipv6_link_local: ip6_addr_type = ESP_IP6_ADDR_IS_LINK_LOCAL; break; - case NWPlugin::IP_type::ipv6_site_local: ip6_addr_type = ESP_IP6_ADDR_IS_SITE_LOCAL; break; - case NWPlugin::IP_type::ipv6_unique_local: ip6_addr_type = ESP_IP6_ADDR_IS_UNIQUE_LOCAL; break; - case NWPlugin::IP_type::ipv4_mapped_ipv6: ip6_addr_type = ESP_IP6_ADDR_IS_IPV4_MAPPED_IPV6; break; -# endif // if CONFIG_LWIP_IPV6 - default: - return ip; - } -# if CONFIG_LWIP_IPV6 - if (networkInterface->netif()) { - esp_ip6_addr_t if_ip6[CONFIG_LWIP_IPV6_NUM_ADDRESSES]; - int v6addrs = esp_netif_get_all_ip6(networkInterface->netif(), if_ip6); - for (int i = 0; i < v6addrs; ++i) { - if (esp_netif_ip6_get_addr_type(&if_ip6[i]) == ip6_addr_type) { - return IPAddress(IPv6, (const uint8_t *)if_ip6[i].addr, if_ip6[i].zone); - } - } - } -# endif - } - - return ip; -} - -#endif // ifdef ESP32 diff --git a/src/src/Helpers/_NWPlugin_Helper_webform.h b/src/src/Helpers/_NWPlugin_Helper_webform.h index 2d77ae8d6..9cf4ee6a7 100644 --- a/src/src/Helpers/_NWPlugin_Helper_webform.h +++ b/src/src/Helpers/_NWPlugin_Helper_webform.h @@ -32,10 +32,5 @@ void saveNetworkParameterForm(NetworkSettingsStruct & NetworkSettings, networkIndex_t networkindex, NetworkSettingsStruct::VarType varType); -#ifdef ESP32 -bool print_IP_address(NWPlugin::IP_type ip_type, NetworkInterface* networkInterface, Print &out); - -IPAddress get_IP_address(NWPlugin::IP_type ip_type, NetworkInterface* networkInterface); -#endif #endif // ifndef HELPERS__NWPLUGIN_HELPER_WEBFORM_H diff --git a/src/src/Helpers/_NWPlugin_init.cpp b/src/src/Helpers/_NWPlugin_init.cpp index 47e4a4cc8..fadf10685 100644 --- a/src/src/Helpers/_NWPlugin_init.cpp +++ b/src/src/Helpers/_NWPlugin_init.cpp @@ -1040,8 +1040,8 @@ constexpr /*nwpluginID_t*/ uint8_t NetworkDriverIndex_to_NWPlugin_id[] PROGMEM = typedef bool (*NWPlugin_ptr_t)(NWPlugin::Function, - struct EventStruct *, - String&); + struct EventStruct *, + String&); const NWPlugin_ptr_t PROGMEM NWPlugin_ptr[] = { @@ -2070,7 +2070,8 @@ const NWPlugin_ptr_t PROGMEM NWPlugin_ptr[] = constexpr size_t NetworkDriverIndex_to_NWPlugin_id_size = sizeof(NetworkDriverIndex_to_NWPlugin_id); // Highest NWPlugin ID included in the build -constexpr size_t Highest_NWPlugin_id = NetworkDriverIndex_to_NWPlugin_id_size == 0 ? 0 : NetworkDriverIndex_to_NWPlugin_id[NetworkDriverIndex_to_NWPlugin_id_size - 1]; +constexpr size_t Highest_NWPlugin_id = NetworkDriverIndex_to_NWPlugin_id_size == + 0 ? 0 : NetworkDriverIndex_to_NWPlugin_id[NetworkDriverIndex_to_NWPlugin_id_size - 1]; constexpr size_t NWPlugin_id_to_NetworkDriverIndex_size = Highest_NWPlugin_id + 1; @@ -2090,8 +2091,6 @@ NetworkDriverStruct& getNetworkDriverStruct(networkDriverIndex_t networkDriverIn return NetworkDriverArray[networkDriverIndex.value]; } - - networkDriverIndex_t getNetworkDriverIndex_from_NWPluginID_(nwpluginID_t nwpluginID) { if (nwpluginID.value < NWPlugin_id_to_NetworkDriverIndex_size) @@ -2116,19 +2115,15 @@ bool validNetworkDriverIndex_init(networkDriverIndex_t networkDriverIndex) return networkDriverIndex.value < NetworkDriverIndex_to_NWPlugin_id_size; } -nwpluginID_t getHighestIncludedNWPluginID() -{ - return nwpluginID_t::toPluginID(Highest_NWPlugin_id); -} +nwpluginID_t getHighestIncludedNWPluginID() { return nwpluginID_t::toPluginID(Highest_NWPlugin_id); } - -bool NWPluginCall(networkDriverIndex_t networkDriverIndex, NWPlugin::Function Function, struct EventStruct *event, String& string) +bool NWPluginCall_(networkDriverIndex_t networkDriverIndex, NWPlugin::Function Function, struct EventStruct *event, String& string) { if (networkDriverIndex.value < NetworkDriverIndex_to_NWPlugin_id_size) { START_TIMER; NWPlugin_ptr_t nwplugin_call = (NWPlugin_ptr_t)pgm_read_ptr(NWPlugin_ptr + networkDriverIndex.value); - const bool res = nwplugin_call(Function, event, string); + const bool res = nwplugin_call(Function, event, string); STOP_TIMER_NETWORK(networkDriverIndex, Function); return res; } @@ -2147,6 +2142,7 @@ void NWPluginSetup() } networkDriverIndex_t networkDriverIndex{}; + for (; networkDriverIndex.value < NetworkDriverIndex_to_NWPlugin_id_size; ++networkDriverIndex) { const nwpluginID_t nwpluginID = getNWPluginID_from_NetworkDriverIndex(networkDriverIndex); @@ -2156,7 +2152,7 @@ void NWPluginSetup() struct EventStruct TempEvent; TempEvent.idx = networkDriverIndex.value; String dummy; - NWPluginCall(networkDriverIndex, NWPlugin::Function::NWPLUGIN_DRIVER_ADD, &TempEvent, dummy); + NWPluginCall_(networkDriverIndex, NWPlugin::Function::NWPLUGIN_DRIVER_ADD, &TempEvent, dummy); } } setupDone = true; diff --git a/src/src/Helpers/_NWPlugin_init.h b/src/src/Helpers/_NWPlugin_init.h index 39aa9df75..9cb0cbfb4 100644 --- a/src/src/Helpers/_NWPlugin_init.h +++ b/src/src/Helpers/_NWPlugin_init.h @@ -19,7 +19,8 @@ nwpluginID_t getHighestIncludedNWPluginID(); NetworkDriverStruct& getNetworkDriverStruct(networkDriverIndex_t networkDriverIndex); -bool NWPluginCall(networkDriverIndex_t networkDriverIndex, NWPlugin::Function Function, struct EventStruct *event, String& string); +// Should only be called from NWPluginCall, or maybe for very special occasions +bool NWPluginCall_(networkDriverIndex_t networkDriverIndex, NWPlugin::Function Function, struct EventStruct *event, String& string); void NWPluginSetup(); diff --git a/src/src/WebServer/HTML_wrappers.cpp b/src/src/WebServer/HTML_wrappers.cpp index 1820cc801..0b17941e0 100644 --- a/src/src/WebServer/HTML_wrappers.cpp +++ b/src/src/WebServer/HTML_wrappers.cpp @@ -397,6 +397,12 @@ void addHtml(String&& html) { TXBuffer += html; } +void addHtml_pre(const String& html) { + addHtml(F("

    "));
+  addHtml(html);
+  addHtml(F("
    ")); +} + void addHtmlInt(int8_t int_val) { addHtml(String(int_val)); } diff --git a/src/src/WebServer/HTML_wrappers.h b/src/src/WebServer/HTML_wrappers.h index 005393a84..741eba655 100644 --- a/src/src/WebServer/HTML_wrappers.h +++ b/src/src/WebServer/HTML_wrappers.h @@ -121,6 +121,8 @@ void addHtml(const char& char1); void addHtml(const char& char1, const char& char2); void addHtml(const __FlashStringHelper * html); void addHtml(const String& html); +// Add text wrapped in 
     ...
    (monospaced formatted) +void addHtml_pre(const String& html); void addHtml(String&& html); void addHtmlInt(int8_t int_val); void addHtmlInt(int16_t int_val); diff --git a/src/src/WebServer/NetworkPage.cpp b/src/src/WebServer/NetworkPage.cpp index 9a21cf114..676c5f3ce 100644 --- a/src/src/WebServer/NetworkPage.cpp +++ b/src/src/WebServer/NetworkPage.cpp @@ -18,6 +18,8 @@ # include "../Helpers/StringConverter.h" # include "../Helpers/ESPEasy_Storage.h" +# include "../Helpers/PrintToString.h" + void handle_networks() { # ifndef BUILD_NO_RAM_TRACKER @@ -102,7 +104,7 @@ void handle_networks() String dummy; NWPlugin::Function nfunction = Settings.getNetworkEnabled(networkindex) ? NWPlugin::Function::NWPLUGIN_INIT : NWPlugin::Function::NWPLUGIN_EXIT; - NWPluginCall(NetworkDriverIndex, nfunction, &TempEvent, dummy); + NWPluginCall_(NetworkDriverIndex, nfunction, &TempEvent, dummy); } } @@ -131,7 +133,7 @@ void handle_networks_clearLoadDefaults(networkIndex_t networkindex, NetworkSetti TempEvent.NetworkIndex = networkindex; String dummy; - NWPluginCall( + NWPluginCall_( NetworkDriverIndex, NWPlugin::Function::NWPLUGIN_LOAD_DEFAULTS, &TempEvent, dummy); } @@ -158,7 +160,7 @@ void handle_networks_CopySubmittedSettings_NWPluginCall(networkIndex_t networkin // Call network plugin to save CustomNetworkSettings String dummy; - NWPluginCall(NetworkDriverIndex, NWPlugin::Function::NWPLUGIN_WEBFORM_SAVE, &TempEvent, dummy); + NWPluginCall_(NetworkDriverIndex, NWPlugin::Function::NWPLUGIN_WEBFORM_SAVE, &TempEvent, dummy); } } @@ -219,6 +221,7 @@ void handle_networks_ShowAllNetworksTable() NWPlugin::Function::NWPLUGIN_WEBFORM_SHOW_IP, NWPlugin::Function::NWPLUGIN_WEBFORM_SHOW_PORT }; + const networkDriverIndex_t NetworkDriverIndex = getNetworkDriverIndex_from_NetworkIndex(x); for (uint8_t i = 0; i < NR_ELEMENTS(functions); ++i) { @@ -227,7 +230,9 @@ void handle_networks_ShowAllNetworksTable() TempEvent.NetworkIndex = x; String str; - const bool res = NWPluginCall(NetworkDriverIndex, functions[i], &TempEvent, str); + + // const bool res = NWPluginCall_(NetworkDriverIndex, functions[i], &TempEvent, str); + const bool res = NWPluginCall(functions[i], &TempEvent, str); if (functions[i] == NWPlugin::Function::NWPLUGIN_WEBFORM_SHOW_CONNECTED) { if (!res || str.isEmpty()) { @@ -304,12 +309,13 @@ void handle_networks_NetworkSettingsPage(networkIndex_t networkindex) { TempEvent.NetworkIndex = networkindex; String str; - NWPluginCall(networkDriverIndex, NWPlugin::Function::NWPLUGIN_WEBFORM_LOAD, &TempEvent, str); + NWPluginCall_(networkDriverIndex, NWPlugin::Function::NWPLUGIN_WEBFORM_LOAD, &TempEvent, str); addFormSubHeader(F("IP Config")); const NWPlugin::IP_type ip_types[] = { NWPlugin::IP_type::inet, + NWPlugin::IP_type::network_id_cdr, NWPlugin::IP_type::netmask, NWPlugin::IP_type::broadcast, NWPlugin::IP_type::gateway, @@ -326,13 +332,16 @@ void handle_networks_NetworkSettingsPage(networkIndex_t networkindex) { }; - for (size_t i = 0; i < NR_ELEMENTS(ip_types); ++i) { - TempEvent.Par1 = static_cast(ip_types[i]); + if (NWPluginCall_(networkDriverIndex, NWPlugin::Function::NWPLUGIN_GET_INTERFACE, &TempEvent, str)) + { + for (size_t i = 0; i < NR_ELEMENTS(ip_types); ++i) { - if (NWPluginCall(networkDriverIndex, NWPlugin::Function::NWPLUGIN_WEBFORM_SHOW_IP, &TempEvent, str)) - { - addRowLabel(NWPlugin::toString(ip_types[i])); - addHtml(str); + PrintToString str; + + if (NWPlugin::print_IP_address(ip_types[i], TempEvent.networkInterface, str)) { + addRowLabel(NWPlugin::toString(ip_types[i])); + addHtml_pre(str.get()); + } } } diff --git a/src/src/WebServer/SysVarPage.cpp b/src/src/WebServer/SysVarPage.cpp index 155e936e0..da0687d26 100644 --- a/src/src/WebServer/SysVarPage.cpp +++ b/src/src/WebServer/SysVarPage.cpp @@ -500,10 +500,8 @@ void addSysVar_html(String input, bool isSpecialChar) { // Make deepcopy for replacement, so parameter is a copy, not a const reference html_TR_TD(); - addHtml(F("
    ")); // Make monospaced ( tag?)
-  addHtml(input);
-  addHtml(F("
    ")); - + addHtml_pre(input); + if (isSpecialChar) { parseSpecialCharacters(input, false); html_TD(); From 4aef5463be32f61190b42db9c283ae4d2a8f893d Mon Sep 17 00:00:00 2001 From: TD-er Date: Fri, 11 Jul 2025 16:57:05 +0200 Subject: [PATCH 104/564] [Network] Show Network Interface flags --- src/_NW001_WiFi_STA.cpp | 11 --- src/_NW002_WiFi_AP.cpp | 8 -- src/_NW003_ETH.cpp | 6 -- .../DataTypes/ESPEasy_plugin_functions.cpp | 30 ++++++ src/src/DataTypes/ESPEasy_plugin_functions.h | 82 +++++++++++------ src/src/WebServer/NetworkPage.cpp | 92 +++++++++++++------ 6 files changed, 149 insertions(+), 80 deletions(-) diff --git a/src/_NW001_WiFi_STA.cpp b/src/_NW001_WiFi_STA.cpp index 33e8207f7..e88193add 100644 --- a/src/_NW001_WiFi_STA.cpp +++ b/src/_NW001_WiFi_STA.cpp @@ -266,17 +266,6 @@ bool NWPlugin_001(NWPlugin::Function function, struct EventStruct *event, String addFormCheckBox(LabelType::PERIODICAL_GRAT_ARP, Settings.gratuitousARP()); # endif // ifdef SUPPORT_ARP -# ifdef ESP32 - addRowLabel(F("Driver Info")); - - HTML_Print htmlPrint; - addHtml(F("\n")); - WiFi.STA.printTo(htmlPrint); - - // TODO TD-er: Must remove this later, as it also prints your WiFi passwd. - addHtml(F("\n")); - WiFi.printDiag(htmlPrint); -# endif // ifdef ESP32 break; } diff --git a/src/_NW002_WiFi_AP.cpp b/src/_NW002_WiFi_AP.cpp index dfc8d50f9..b77c01e39 100644 --- a/src/_NW002_WiFi_AP.cpp +++ b/src/_NW002_WiFi_AP.cpp @@ -141,14 +141,6 @@ bool NWPlugin_002(NWPlugin::Function function, struct EventStruct *event, String addFormNote(F("Do not allow to start an AP when configured WiFi cannot be found")); # endif // if FEATURE_ETHERNET -# ifdef ESP32 - addRowLabel(F("Driver Info")); - - HTML_Print htmlPrint; - addHtml(F("
    ")); - WiFi.AP.printTo(htmlPrint); -# endif // ifdef ESP32 - break; } diff --git a/src/_NW003_ETH.cpp b/src/_NW003_ETH.cpp index 37cbf02e4..b6631ccda 100644 --- a/src/_NW003_ETH.cpp +++ b/src/_NW003_ETH.cpp @@ -279,12 +279,6 @@ bool NWPlugin_003(NWPlugin::Function function, struct EventStruct *event, String } # endif // if CONFIG_ETH_USE_ESP32_EMAC - addRowLabel(F("Driver Info")); - - HTML_Print htmlPrint; - addHtml(F("
    ")); - ETH.printTo(htmlPrint); - break; } diff --git a/src/src/DataTypes/ESPEasy_plugin_functions.cpp b/src/src/DataTypes/ESPEasy_plugin_functions.cpp index de17668d0..db4c1f8b9 100644 --- a/src/src/DataTypes/ESPEasy_plugin_functions.cpp +++ b/src/src/DataTypes/ESPEasy_plugin_functions.cpp @@ -112,4 +112,34 @@ IPAddress NWPlugin::get_IP_address(NWPlugin::IP_type ip_type, NetworkInterface*n return ip; } +const __FlashStringHelper * NWPlugin::toString(NWPlugin::NetforkFlags flag) +{ + switch (flag) + { + case NWPlugin::NetforkFlags::DHCP_client: return F("DHCP Client"); + case NWPlugin::NetforkFlags::DHCP_server: return F("DHCP Server"); + case NWPlugin::NetforkFlags::AutoUp: return F("Auto Up"); + case NWPlugin::NetforkFlags::GratuituousArp: return F("Gratuituous Arp"); + case NWPlugin::NetforkFlags::EventIPmodified: return F("Send Event when IP Modified"); + case NWPlugin::NetforkFlags::isPPP: return F("PPP"); + case NWPlugin::NetforkFlags::isBridge: return F("Bridge"); + case NWPlugin::NetforkFlags::MLD_v6_report: return F("MLD IPv6 Report"); + case NWPlugin::NetforkFlags::IPv6_autoconf_enabled: return F("IPv6 Autoconf"); + + } + return F("unknown"); +} + +bool NWPlugin::isFlagSet(NWPlugin::NetforkFlags flag, NetworkInterface*networkInterface) +{ + if (networkInterface == nullptr) { return false; } + auto netif = networkInterface->netif(); + + if (netif == nullptr) { return false; } + const auto flags = esp_netif_get_flags(netif); + + const uint32_t mask = static_cast(flag); + return flags & mask; +} + #endif // ifdef ESP32 diff --git a/src/src/DataTypes/ESPEasy_plugin_functions.h b/src/src/DataTypes/ESPEasy_plugin_functions.h index fe0e30d37..e1180580f 100644 --- a/src/src/DataTypes/ESPEasy_plugin_functions.h +++ b/src/src/DataTypes/ESPEasy_plugin_functions.h @@ -128,9 +128,9 @@ public: // As these function values are also used in the timing stats, make sure there is no overlap with the PLUGIN_xxx numbering. enum class Function { - NWPLUGIN_DRIVER_ADD = 192, // Called at boot for letting a network adapter adding itself to list of available controllers - NWPLUGIN_CONNECT_SUCCESS, // Only used for timing stats - NWPLUGIN_CONNECT_FAIL, // Only used for timing stats + NWPLUGIN_DRIVER_ADD = 192, // Called at boot for letting a network adapter adding itself to list of available controllers + NWPLUGIN_CONNECT_SUCCESS, // Only used for timing stats + NWPLUGIN_CONNECT_FAIL, // Only used for timing stats NWPLUGIN_DRIVER_TEMPLATE, NWPLUGIN_LOAD_DEFAULTS, NWPLUGIN_GET_DEVICENAME, @@ -138,55 +138,79 @@ public: NWPLUGIN_WEBFORM_LOAD, NWPLUGIN_GET_PARAMETER_DISPLAY_NAME, NWPLUGIN_INIT, - NWPLUGIN_TEN_PER_SECOND, // Called 10x per second (typical for checking new data instead of waiting) - NWPLUGIN_FIFTY_PER_SECOND, // Called 50x per second (typical for checking new data instead of waiting) + NWPLUGIN_TEN_PER_SECOND, // Called 10x per second (typical for checking new data instead of waiting) + NWPLUGIN_FIFTY_PER_SECOND, // Called 50x per second (typical for checking new data instead of waiting) NWPLUGIN_INIT_ALL, NWPLUGIN_EXIT, - NWPLUGIN_WRITE, // Send commands to a network adapter. + NWPLUGIN_WRITE, // Send commands to a network adapter. #ifdef ESP32 NWPLUGIN_GET_INTERFACE, #endif - NWPLUGIN_WEBFORM_SHOW_CONNECTED, // Used for showing connected state/speed - NWPLUGIN_WEBFORM_SHOW_HOSTNAME, // Used for showing hostname - NWPLUGIN_WEBFORM_SHOW_MAC, // Used for showing MAC - NWPLUGIN_WEBFORM_SHOW_IP , // Used for showing IP - NWPLUGIN_WEBFORM_SHOW_PORT // Used for showing host information for the network adapter. + NWPLUGIN_WEBFORM_SHOW_CONNECTED, // Used for showing connected state/speed + NWPLUGIN_WEBFORM_SHOW_HOSTNAME, // Used for showing hostname + NWPLUGIN_WEBFORM_SHOW_MAC, // Used for showing MAC + NWPLUGIN_WEBFORM_SHOW_IP, // Used for showing IP + NWPLUGIN_WEBFORM_SHOW_PORT // Used for showing host information for the network adapter. }; #ifdef ESP32 + static bool canQueryViaNetworkInterface(Function function); enum class IP_type { - inet = 0, // Keep index at 0 as default query - network_id_cdr, - netmask, - broadcast, - gateway, - dns1, - dns2, + inet = 0, // Keep index at 0 as default query + network_id_cdr, + netmask, + broadcast, + gateway, + dns1, + dns2, # if CONFIG_LWIP_IPV6 - ipv6_unknown, - ipv6_global, - ipv6_link_local, - ipv6_site_local, - ipv6_unique_local, - ipv4_mapped_ipv6 -# endif + ipv6_unknown, + ipv6_global, + ipv6_link_local, + ipv6_site_local, + ipv6_unique_local, + ipv4_mapped_ipv6 +# endif // if CONFIG_LWIP_IPV6 }; - static bool canQueryViaNetworkInterface(Function function); static const __FlashStringHelper* toString(IP_type ip_type); - static IPAddress get_IP_address(NWPlugin::IP_type ip_type, NetworkInterface* networkInterface); + static IPAddress get_IP_address(NWPlugin::IP_type ip_type, + NetworkInterface *networkInterface); - static bool print_IP_address(NWPlugin::IP_type ip_type, NetworkInterface* networkInterface, Print &out); + static bool print_IP_address(NWPlugin::IP_type ip_type, + NetworkInterface *networkInterface, + Print & out); -#endif + + enum class NetforkFlags { + DHCP_client = ESP_NETIF_DHCP_CLIENT, + DHCP_server = ESP_NETIF_DHCP_SERVER, + AutoUp = ESP_NETIF_FLAG_AUTOUP, + GratuituousArp = ESP_NETIF_FLAG_GARP, + EventIPmodified = ESP_NETIF_FLAG_EVENT_IP_MODIFIED, + isPPP = ESP_NETIF_FLAG_IS_PPP, + isBridge = ESP_NETIF_FLAG_IS_BRIDGE, + MLD_v6_report = ESP_NETIF_FLAG_MLDV6_REPORT, + IPv6_autoconf_enabled = ESP_NETIF_FLAG_IPV6_AUTOCONFIG_ENABLED + + }; + + static const __FlashStringHelper* toString(NetforkFlags flag); + + static bool isFlagSet(NetforkFlags flag, + NetworkInterface*networkInterface); + + +#endif // ifdef ESP32 }; // class NWPlugin + // ******************************************************************************** // NPlugin (Notification) function calls // ******************************************************************************** diff --git a/src/src/WebServer/NetworkPage.cpp b/src/src/WebServer/NetworkPage.cpp index 676c5f3ce..4c7a8d8c6 100644 --- a/src/src/WebServer/NetworkPage.cpp +++ b/src/src/WebServer/NetworkPage.cpp @@ -311,36 +311,76 @@ void handle_networks_NetworkSettingsPage(networkIndex_t networkindex) { String str; NWPluginCall_(networkDriverIndex, NWPlugin::Function::NWPLUGIN_WEBFORM_LOAD, &TempEvent, str); - addFormSubHeader(F("IP Config")); - - const NWPlugin::IP_type ip_types[] = { - NWPlugin::IP_type::inet, - NWPlugin::IP_type::network_id_cdr, - NWPlugin::IP_type::netmask, - NWPlugin::IP_type::broadcast, - NWPlugin::IP_type::gateway, - NWPlugin::IP_type::dns1, - NWPlugin::IP_type::dns2, -# if CONFIG_LWIP_IPV6 - NWPlugin::IP_type::ipv6_unknown, - NWPlugin::IP_type::ipv6_global, - NWPlugin::IP_type::ipv6_link_local, - NWPlugin::IP_type::ipv6_site_local, - NWPlugin::IP_type::ipv6_unique_local, - NWPlugin::IP_type::ipv4_mapped_ipv6, -# endif // if CONFIG_LWIP_IPV6 - - }; - if (NWPluginCall_(networkDriverIndex, NWPlugin::Function::NWPLUGIN_GET_INTERFACE, &TempEvent, str)) { - for (size_t i = 0; i < NR_ELEMENTS(ip_types); ++i) { + { + addFormSubHeader(F("Network Interface")); + addRowLabel(F("MAC Address")); + addHtml_pre(TempEvent.networkInterface->macAddress()); - PrintToString str; + const NWPlugin::NetforkFlags flags[] = { + NWPlugin::NetforkFlags::DHCP_client, + NWPlugin::NetforkFlags::DHCP_server, + NWPlugin::NetforkFlags::AutoUp, + NWPlugin::NetforkFlags::GratuituousArp, + NWPlugin::NetforkFlags::EventIPmodified, + NWPlugin::NetforkFlags::isPPP, + NWPlugin::NetforkFlags::isBridge, +# if CONFIG_LWIP_IPV6 + NWPlugin::NetforkFlags::MLD_v6_report, + NWPlugin::NetforkFlags::IPv6_autoconf_enabled, +# endif // if CONFIG_LWIP_IPV6 + }; - if (NWPlugin::print_IP_address(ip_types[i], TempEvent.networkInterface, str)) { - addRowLabel(NWPlugin::toString(ip_types[i])); - addHtml_pre(str.get()); + addRowLabel(F("Flags")); + String labels_str; + + for (size_t i = 0; i < NR_ELEMENTS(flags); ++i) { + if (NWPlugin::isFlagSet(flags[i], TempEvent.networkInterface)) { + if (!labels_str.isEmpty()) { + labels_str += F("
    "); + } + labels_str += NWPlugin::toString(flags[i]); + + if (flags[i] == NWPlugin::NetforkFlags::DHCP_client) { + if (TempEvent.networkInterface->getStatusBits() & ESP_NETIF_HAS_STATIC_IP_BIT) { + labels_str += F(" (static IP)"); + } + } + } + } + addHtml_pre(labels_str); + } + { + addFormSubHeader(F("IP Config")); + + const NWPlugin::IP_type ip_types[] = { + NWPlugin::IP_type::inet, + NWPlugin::IP_type::network_id_cdr, + NWPlugin::IP_type::netmask, + NWPlugin::IP_type::broadcast, + NWPlugin::IP_type::gateway, + NWPlugin::IP_type::dns1, + NWPlugin::IP_type::dns2, +# if CONFIG_LWIP_IPV6 + NWPlugin::IP_type::ipv6_unknown, + NWPlugin::IP_type::ipv6_global, + NWPlugin::IP_type::ipv6_link_local, + NWPlugin::IP_type::ipv6_site_local, + NWPlugin::IP_type::ipv6_unique_local, + NWPlugin::IP_type::ipv4_mapped_ipv6, +# endif // if CONFIG_LWIP_IPV6 + + }; + + for (size_t i = 0; i < NR_ELEMENTS(ip_types); ++i) { + + PrintToString str; + + if (NWPlugin::print_IP_address(ip_types[i], TempEvent.networkInterface, str)) { + addRowLabel(NWPlugin::toString(ip_types[i])); + addHtml_pre(str.get()); + } } } } From 43b849714b85c36f425180003a0914b9109abad0 Mon Sep 17 00:00:00 2001 From: TD-er Date: Fri, 11 Jul 2025 17:28:53 +0200 Subject: [PATCH 105/564] [PPP Modem] Add framework for new PPP Modem network interface --- src/_NW005_PPP_modem.cpp | 104 +++++++++++++++++++++++ src/src/CustomBuild/define_plugin_sets.h | 22 +++++ 2 files changed, 126 insertions(+) create mode 100644 src/_NW005_PPP_modem.cpp diff --git a/src/_NW005_PPP_modem.cpp b/src/_NW005_PPP_modem.cpp new file mode 100644 index 000000000..136c7b9f3 --- /dev/null +++ b/src/_NW005_PPP_modem.cpp @@ -0,0 +1,104 @@ +#include "ESPEasy_common.h" + +#ifdef USES_NW005 + +// ####################################################################################################### +// ########################### Network Plugin 005: PPP modem ############################################# +// ####################################################################################################### + +# define NWPLUGIN_005 +# define NWPLUGIN_ID_005 5 +# define NWPLUGIN_NAME_005 "PPP modem" + +# include "src/ESPEasyCore/ESPEasyNetwork.h" +# include "src/DataStructs/ESPEasy_EventStruct.h" +# include "src/Globals/NWPlugins.h" +# include "src/Helpers/ESPEasy_Storage.h" +# include "src/Helpers/_NWPlugin_init.h" + +# include "src/Globals/SecuritySettings.h" +# include "src/WebServer/common.h" +# include "src/Helpers/StringConverter.h" +# include "src/WebServer/ESPEasy_WebServer.h" +# include "src/Globals/Settings.h" +# include "src/WebServer/Markup_Forms.h" +# include "src/WebServer/Markup.h" +# include "src/ESPEasyCore/ESPEasyWifi_abstracted.h" + +# include "src/Helpers/_NWPlugin_Helper_webform.h" +# include "src/Helpers/PrintToString.h" + +# include "src/WebServer/HTML_Print.h" +# include "src/WebServer/HTML_wrappers.h" + +#include + +bool NWPlugin_005(NWPlugin::Function function, struct EventStruct *event, String& string) +{ + bool success = false; + + switch (function) + { + case NWPlugin::Function::NWPLUGIN_DRIVER_ADD: + { + NetworkDriverStruct& nw = getNetworkDriverStruct(networkDriverIndex_t::toNetworkDriverIndex(event->idx)); + break; + } + + case NWPlugin::Function::NWPLUGIN_GET_DEVICENAME: + { + string = F(NWPLUGIN_NAME_005); + break; + } + +# ifdef ESP32 + case NWPlugin::Function::NWPLUGIN_GET_INTERFACE: + { + event->networkInterface = &PPP; + success = event->networkInterface != nullptr; + break; + } +# endif // ifdef ESP32 + + + case NWPlugin::Function::NWPLUGIN_WEBFORM_SHOW_CONNECTED: + { + break; + } + + case NWPlugin::Function::NWPLUGIN_WEBFORM_SHOW_PORT: + { + break; + } + + + case NWPlugin::Function::NWPLUGIN_WEBFORM_SAVE: + { + + break; + } + + case NWPlugin::Function::NWPLUGIN_WEBFORM_LOAD: + { + + break; + } + + case NWPlugin::Function::NWPLUGIN_INIT: + { + break; + } + + case NWPlugin::Function::NWPLUGIN_EXIT: + { + break; + } + + default: + break; + + } + return success; +} + +#endif // ifdef USES_NW005 diff --git a/src/src/CustomBuild/define_plugin_sets.h b/src/src/CustomBuild/define_plugin_sets.h index 4ac4891b9..2cd7eb7c7 100644 --- a/src/src/CustomBuild/define_plugin_sets.h +++ b/src/src/CustomBuild/define_plugin_sets.h @@ -3231,6 +3231,14 @@ To create/register a plugin, you have to : #define FEATURE_ETHERNET 0 #endif +#ifndef FEATURE_PPP_MODEM +#ifdef ESP32 +#define FEATURE_PPP_MODEM 1 +#else +#define FEATURE_PPP_MODEM 0 +#endif +#endif + #ifndef FEATURE_WIFI #ifdef ESP8266 #define FEATURE_WIFI 1 @@ -3820,6 +3828,10 @@ To create/register a plugin, you have to : #endif #endif +#if FEATURE_PPP_MODEM && !defined(ESP32) +#undef FEATURE_PPP_MODEM +#define FEATURE_PPP_MODEM 0 +#endif #if FEATURE_WIFI #ifndef USES_NW001 @@ -3846,5 +3858,15 @@ To create/register a plugin, you have to : #endif #endif +#if FEATURE_PPP_MODEM + #ifndef USES_NW005 + #define USES_NW005 + #endif +#else + #ifdef USES_NW005 + #undef USES_NW005 + #endif +#endif + #endif // CUSTOMBUILD_DEFINE_PLUGIN_SETS_H \ No newline at end of file From ba2af9f5a346dec171ca3bf3aa36abe477a06e84 Mon Sep 17 00:00:00 2001 From: TD-er Date: Sun, 13 Jul 2025 01:56:51 +0200 Subject: [PATCH 106/564] [ESP32P4] Add extra HW serial ports supported by ESP32P4 --- lib/ESPEasySerial/ESPEasySerialPort.cpp | 36 +++++++++++++++++++ lib/ESPEasySerial/ESPEasySerialPort.h | 10 ++++++ lib/ESPEasySerial/ESPEasySerialType_ESP32.cpp | 9 +++++ .../Port_ESPEasySerial_HardwareSerial.cpp | 22 ++++++++++++ src/src/Helpers/_Plugin_Helper_serial.cpp | 23 +++++++++++- src/src/Helpers/_Plugin_Helper_serial.h | 2 +- 6 files changed, 100 insertions(+), 2 deletions(-) diff --git a/lib/ESPEasySerial/ESPEasySerialPort.cpp b/lib/ESPEasySerial/ESPEasySerialPort.cpp index e8db0e6b0..3a6c52b16 100644 --- a/lib/ESPEasySerial/ESPEasySerialPort.cpp +++ b/lib/ESPEasySerial/ESPEasySerialPort.cpp @@ -17,6 +17,15 @@ const __FlashStringHelper* ESPEasySerialPort_toString(ESPEasySerialPort port, bo #if USABLE_SOC_UART_NUM > 2 case ESPEasySerialPort::serial2: return shortName ? F("serial2") : F("HW Serial2"); #endif // if USABLE_SOC_UART_NUM > 2 +#if USABLE_SOC_UART_NUM > 3 + case ESPEasySerialPort::serial3: return shortName ? F("serial3") : F("HW Serial3"); +#endif +#if USABLE_SOC_UART_NUM > 4 + case ESPEasySerialPort::serial4: return shortName ? F("serial4") : F("HW Serial4"); +#endif +#if USABLE_SOC_UART_NUM > 5 + case ESPEasySerialPort::serial5: return shortName ? F("serial5") : F("HW Serial5"); +#endif #if USES_SW_SERIAL case ESPEasySerialPort::software: return shortName ? F("serialsw") : F("SW Serial"); #endif // if USES_SW_SERIAL @@ -49,6 +58,15 @@ bool isHWserial(ESPEasySerialPort port) #if USABLE_SOC_UART_NUM > 2 case ESPEasySerialPort::serial2: #endif // if USABLE_SOC_UART_NUM > 2 +#if USABLE_SOC_UART_NUM > 3 + case ESPEasySerialPort::serial3: +#endif +#if USABLE_SOC_UART_NUM > 4 + case ESPEasySerialPort::serial4: +#endif +#if USABLE_SOC_UART_NUM > 5 + case ESPEasySerialPort::serial5: +#endif return true; default: break; @@ -69,6 +87,15 @@ bool useGPIOpins(ESPEasySerialPort port) #if USABLE_SOC_UART_NUM > 2 case ESPEasySerialPort::serial2: #endif // if USABLE_SOC_UART_NUM > 2 +#if USABLE_SOC_UART_NUM > 3 + case ESPEasySerialPort::serial3: +#endif +#if USABLE_SOC_UART_NUM > 4 + case ESPEasySerialPort::serial4: +#endif +#if USABLE_SOC_UART_NUM > 5 + case ESPEasySerialPort::serial5: +#endif #if USES_SW_SERIAL case ESPEasySerialPort::software: #endif // if USES_SW_SERIAL @@ -96,6 +123,15 @@ bool validSerialPort(ESPEasySerialPort port) #if USABLE_SOC_UART_NUM > 2 case ESPEasySerialPort::serial2: #endif // if USABLE_SOC_UART_NUM > 2 +#if USABLE_SOC_UART_NUM > 3 + case ESPEasySerialPort::serial3: +#endif +#if USABLE_SOC_UART_NUM > 4 + case ESPEasySerialPort::serial4: +#endif +#if USABLE_SOC_UART_NUM > 5 + case ESPEasySerialPort::serial5: +#endif #if USES_SW_SERIAL case ESPEasySerialPort::software: #endif // if USES_SW_SERIAL diff --git a/lib/ESPEasySerial/ESPEasySerialPort.h b/lib/ESPEasySerial/ESPEasySerialPort.h index 79eb51a39..a2b5c2df6 100644 --- a/lib/ESPEasySerial/ESPEasySerialPort.h +++ b/lib/ESPEasySerial/ESPEasySerialPort.h @@ -20,6 +20,16 @@ enum class ESPEasySerialPort : uint8_t { #if USABLE_SOC_UART_NUM > 2 serial2 = 5, #endif // if USABLE_SOC_UART_NUM > 2 +#if USABLE_SOC_UART_NUM > 3 + serial3 = 10, +#endif +#if USABLE_SOC_UART_NUM > 4 + serial4 = 11, +#endif +#if USABLE_SOC_UART_NUM > 5 + serial5 = 12, +#endif + #if USES_SW_SERIAL software = 6, #endif // if USES_SW_SERIAL diff --git a/lib/ESPEasySerial/ESPEasySerialType_ESP32.cpp b/lib/ESPEasySerial/ESPEasySerialType_ESP32.cpp index cb705867e..6738194d1 100644 --- a/lib/ESPEasySerial/ESPEasySerialType_ESP32.cpp +++ b/lib/ESPEasySerial/ESPEasySerialType_ESP32.cpp @@ -16,6 +16,15 @@ bool ESPeasySerialType::getSerialTypePins(ESPEasySerialPort serType, int& rxPin, # if USABLE_SOC_UART_NUM > 2 case ESPEasySerialPort::serial2: rxPin = SOC_RX2; txPin = SOC_TX2; return true; # endif // if USABLE_SOC_UART_NUM > 2 +# if USABLE_SOC_UART_NUM > 3 + case ESPEasySerialPort::serial3: return true; +# endif +# if USABLE_SOC_UART_NUM > 4 + case ESPEasySerialPort::serial4: return true; +# endif +# if USABLE_SOC_UART_NUM > 5 + case ESPEasySerialPort::serial5: return true; +# endif # if USES_I2C_SC16IS752 case ESPEasySerialPort::sc16is752: return true; # endif // if USES_I2C_SC16IS752 diff --git a/lib/ESPEasySerial/Port_ESPEasySerial_HardwareSerial.cpp b/lib/ESPEasySerial/Port_ESPEasySerial_HardwareSerial.cpp index 20f29dda7..aad83e661 100644 --- a/lib/ESPEasySerial/Port_ESPEasySerial_HardwareSerial.cpp +++ b/lib/ESPEasySerial/Port_ESPEasySerial_HardwareSerial.cpp @@ -40,6 +40,16 @@ void Port_ESPEasySerial_HardwareSerial_t::resetConfig(const ESPEasySerialConfig& #if USABLE_SOC_UART_NUM > 2 case ESPEasySerialPort::serial2: #endif // if USABLE_SOC_UART_NUM > 2 + #if USABLE_SOC_UART_NUM > 3 + case ESPEasySerialPort::serial3: +#endif +#if USABLE_SOC_UART_NUM > 4 + case ESPEasySerialPort::serial4: +#endif +#if USABLE_SOC_UART_NUM > 5 + case ESPEasySerialPort::serial5: +#endif + _config.port = config.port; break; default: @@ -64,6 +74,18 @@ void Port_ESPEasySerial_HardwareSerial_t::resetConfig(const ESPEasySerialConfig& } else if (_config.port == ESPEasySerialPort::serial2) { _serial = &Serial2; #endif // if USABLE_SOC_UART_NUM > 2 +#if USABLE_SOC_UART_NUM > 3 + } else if (_config.port == ESPEasySerialPort::serial3) { + _serial = &Serial3; +#endif +#if USABLE_SOC_UART_NUM > 4 + } else if (_config.port == ESPEasySerialPort::serial4) { + _serial = &Serial4; +#endif +#if USABLE_SOC_UART_NUM > 5 + } else if (_config.port == ESPEasySerialPort::serial5) { + _serial = &Serial5; +#endif } else { _config.port = ESPEasySerialPort::not_set; } diff --git a/src/src/Helpers/_Plugin_Helper_serial.cpp b/src/src/Helpers/_Plugin_Helper_serial.cpp index f3a495be4..7ab423bac 100644 --- a/src/src/Helpers/_Plugin_Helper_serial.cpp +++ b/src/src/Helpers/_Plugin_Helper_serial.cpp @@ -17,7 +17,7 @@ #include -String serialHelper_getSerialTypeLabel(ESPEasySerialPort serType, bool shortName) { +const __FlashStringHelper* serialHelper_getSerialTypeLabel(ESPEasySerialPort serType, bool shortName) { return ESPEasySerialPort_toString(serType, shortName); } @@ -227,6 +227,18 @@ void serialHelper_webformLoad(ESPEasySerialPort port, int rxPinDef, int txPinDef //" document.querySelector('#taskdevicepin2').value =" STRINGIFY(SOC_TX2) ";" " style = '';" #endif +# if USABLE_SOC_UART_NUM > 3 +" } else if (elem.value == 10) {" +" style = '';" +#endif +# if USABLE_SOC_UART_NUM > 4 +" } else if (elem.value == 11) {" +" style = '';" +#endif +# if USABLE_SOC_UART_NUM > 5 +" } else if (elem.value == 12) {" +" style = '';" +#endif #if USES_SW_SERIAL " } else if (elem.value == 6) {" " style = '';" @@ -256,6 +268,15 @@ void serialHelper_webformLoad(ESPEasySerialPort port, int rxPinDef, int txPinDef #if USABLE_SOC_UART_NUM > 2 ,static_cast(ESPEasySerialPort::serial2) #endif // if USABLE_SOC_UART_NUM > 2 +#if USABLE_SOC_UART_NUM > 3 + ,static_cast(ESPEasySerialPort::serial3) +#endif +#if USABLE_SOC_UART_NUM > 4 + ,static_cast(ESPEasySerialPort::serial4) +#endif +#if USABLE_SOC_UART_NUM > 5 + ,static_cast(ESPEasySerialPort::serial5) +#endif #if USES_SW_SERIAL ,static_cast(ESPEasySerialPort::software) #endif // if USES_SW_SERIAL diff --git a/src/src/Helpers/_Plugin_Helper_serial.h b/src/src/Helpers/_Plugin_Helper_serial.h index 1273c4085..c889331ef 100644 --- a/src/src/Helpers/_Plugin_Helper_serial.h +++ b/src/src/Helpers/_Plugin_Helper_serial.h @@ -11,7 +11,7 @@ struct ESPeasySerialType; -String serialHelper_getSerialTypeLabel(ESPEasySerialPort serType, +const __FlashStringHelper* serialHelper_getSerialTypeLabel(ESPEasySerialPort serType, bool shortName = false); void serialHelper_log_GpioDescription(ESPEasySerialPort typeHint, From ef156ddb08ad590e217ca49f940de4b655fd2ed4 Mon Sep 17 00:00:00 2001 From: TD-er Date: Sun, 13 Jul 2025 01:57:52 +0200 Subject: [PATCH 107/564] [Network] Split ETH into RMII and SPI + add template for PPP modem --- src/{_NW003_ETH.cpp => _NW003_ETH_RMII.cpp} | 4 +- src/_NW004_ETH_SPI.cpp | 304 ++++++++++++++++++++ src/_NW005_PPP_modem.cpp | 77 ++++- src/src/CustomBuild/define_plugin_sets.h | 13 +- 4 files changed, 382 insertions(+), 16 deletions(-) rename src/{_NW003_ETH.cpp => _NW003_ETH_RMII.cpp} (95%) create mode 100644 src/_NW004_ETH_SPI.cpp diff --git a/src/_NW003_ETH.cpp b/src/_NW003_ETH_RMII.cpp similarity index 95% rename from src/_NW003_ETH.cpp rename to src/_NW003_ETH_RMII.cpp index b6631ccda..18f203f09 100644 --- a/src/_NW003_ETH.cpp +++ b/src/_NW003_ETH_RMII.cpp @@ -3,12 +3,12 @@ #ifdef USES_NW003 // ####################################################################################################### -// ########################### Network Plugin 003: Ethernet ############################################## +// ########################### Network Plugin 003: Ethernet RMII ######################################### // ####################################################################################################### # define NWPLUGIN_003 # define NWPLUGIN_ID_003 3 -# define NWPLUGIN_NAME_003 "Ethernet" +# define NWPLUGIN_NAME_003 "Ethernet (RMII)" # include "src/DataStructs/ESPEasy_EventStruct.h" # include "src/Globals/NWPlugins.h" diff --git a/src/_NW004_ETH_SPI.cpp b/src/_NW004_ETH_SPI.cpp new file mode 100644 index 000000000..54646d28b --- /dev/null +++ b/src/_NW004_ETH_SPI.cpp @@ -0,0 +1,304 @@ +#include "ESPEasy_common.h" + +#ifdef USES_NW004 + +// ####################################################################################################### +// ########################### Network Plugin 004: Ethernet SPI ########################################## +// ####################################################################################################### + +# define NWPLUGIN_004 +# define NWPLUGIN_ID_004 4 +# define NWPLUGIN_NAME_004 "Ethernet (SPI)" + +# include "src/DataStructs/ESPEasy_EventStruct.h" +# include "src/Globals/NWPlugins.h" +# include "src/Helpers/ESPEasy_Storage.h" +# include "src/Helpers/_NWPlugin_init.h" + +# include "src/Globals/SecuritySettings.h" +# include "src/WebServer/common.h" +# include "src/Helpers/StringConverter.h" +# include "src/WebServer/ESPEasy_WebServer.h" +# include "src/Globals/Settings.h" +# include "src/WebServer/Markup_Forms.h" +# include "src/WebServer/Markup.h" +# include "src/ESPEasyCore/ESPEasyWifi_abstracted.h" +# include "src/ESPEasyCore/ESPEasyEth.h" + +# include "src/WebServer/HTML_Print.h" +# include "src/WebServer/HTML_wrappers.h" + +# include "src/Helpers/_NWPlugin_Helper_webform.h" +# include "src/Helpers/PrintToString.h" + +# include + +bool NWPlugin_004(NWPlugin::Function function, struct EventStruct *event, String& string) +{ + bool success = false; + + switch (function) + { + case NWPlugin::Function::NWPLUGIN_DRIVER_ADD: + { + NetworkDriverStruct& nw = getNetworkDriverStruct(networkDriverIndex_t::toNetworkDriverIndex(event->idx)); + break; + } + + case NWPlugin::Function::NWPLUGIN_LOAD_DEFAULTS: + { + # if CONFIG_IDF_TARGET_ESP32P4 + Settings.ETH_Clock_Mode = EthClockMode_t::Ext_crystal; + Settings.ETH_Phy_Type = EthPhyType_t::TLK110; + Settings.ETH_Phy_Addr = ETH_PHY_ADDR; + Settings.ETH_Pin_mdc_cs = ETH_PHY_MDC; + Settings.ETH_Pin_mdio_irq = ETH_PHY_MDIO; + Settings.ETH_Pin_power_rst = ETH_PHY_POWER; + # else // if CONFIG_IDF_TARGET_ESP32P4 + Settings.ETH_Clock_Mode = EthClockMode_t::Ext_crystal_osc; + # endif // if CONFIG_IDF_TARGET_ESP32P4 + break; + } + + case NWPlugin::Function::NWPLUGIN_GET_DEVICENAME: + { + string = F(NWPLUGIN_NAME_004); + break; + } + + # ifdef ESP32 + case NWPlugin::Function::NWPLUGIN_GET_INTERFACE: + { + event->networkInterface = Ð + success = event->networkInterface != nullptr; + break; + } +# endif // ifdef ESP32 + + + case NWPlugin::Function::NWPLUGIN_WEBFORM_SHOW_CONNECTED: + { + success = ETH.connected(); + + if (ETH.linkUp()) { + string = ETH.linkSpeed(); + string += ETH.fullDuplex() ? F("Mbps FD") : F("Mbps HD"); + + if (!ETH.autoNegotiation()) { string += F("(manual)"); } + } + break; + } + + case NWPlugin::Function::NWPLUGIN_WEBFORM_SHOW_PORT: + { + break; + } + + case NWPlugin::Function::NWPLUGIN_WEBFORM_SAVE: + { + + webArg2ip(F("espethip"), Settings.ETH_IP); + webArg2ip(F("espethgateway"), Settings.ETH_Gateway); + webArg2ip(F("espethsubnet"), Settings.ETH_Subnet); + webArg2ip(F("espethdns"), Settings.ETH_DNS); + + Settings.ETH_Phy_Addr = getFormItemInt(F("ethphy")); + Settings.ETH_Pin_mdc_cs = getFormItemInt(F("ethmdc")); + Settings.ETH_Pin_mdio_irq = getFormItemInt(F("ethmdio")); + Settings.ETH_Pin_power_rst = getFormItemInt(F("ethpower")); + Settings.ETH_Phy_Type = static_cast(getFormItemInt(F("ethtype"))); +# if CONFIG_ETH_USE_ESP32_EMAC + Settings.ETH_Clock_Mode = static_cast(getFormItemInt(F("ethclock"))); +# endif + Settings.NetworkMedium = static_cast(getFormItemInt(F("ethwifi"))); + + break; + } + + case NWPlugin::Function::NWPLUGIN_WEBFORM_LOAD: + { + addFormSubHeader(F("Ethernet IP Settings")); + + addFormIPBox(F("ESP Ethernet IP"), F("espethip"), Settings.ETH_IP); + addFormIPBox(F("ESP Ethernet Gateway"), F("espethgateway"), Settings.ETH_Gateway); + addFormIPBox(F("ESP Ethernet Subnetmask"), F("espethsubnet"), Settings.ETH_Subnet); + addFormIPBox(F("ESP Ethernet DNS"), F("espethdns"), Settings.ETH_DNS); + addFormNote(F("Leave empty for DHCP")); + + + addFormSubHeader(F("Ethernet")); + addRowLabel_tr_id(F("Preferred network medium"), F("ethwifi")); + { + const __FlashStringHelper *ethWifiOptions[] = { + toString(NetworkMedium_t::WIFI), + toString(NetworkMedium_t::Ethernet) + }; + const FormSelectorOptions selector(NR_ELEMENTS(ethWifiOptions), ethWifiOptions); + selector.addSelector( + F("ethwifi"), + static_cast(Settings.NetworkMedium)); + } + addFormNote(F("Change Switch between WiFi and Ethernet requires reboot to activate")); + { + const __FlashStringHelper *ethPhyTypes[] = { + toString(EthPhyType_t::notSet), + +# if CONFIG_ETH_USE_ESP32_EMAC + toString(EthPhyType_t::LAN8720), + toString(EthPhyType_t::TLK110), + toString(EthPhyType_t::RTL8201), +# if ETH_TYPE_JL1101_SUPPORTED + toString(EthPhyType_t::JL1101), +# endif + toString(EthPhyType_t::DP83848), + toString(EthPhyType_t::KSZ8041), + toString(EthPhyType_t::KSZ8081), +# endif // if CONFIG_ETH_USE_ESP32_EMAC + +# if ESP_IDF_VERSION_MAJOR >= 5 +# if CONFIG_ETH_SPI_ETHERNET_DM9051 + toString(EthPhyType_t::DM9051), +# endif // if CONFIG_ETH_SPI_ETHERNET_DM9051 +# if CONFIG_ETH_SPI_ETHERNET_W5500 + toString(EthPhyType_t::W5500), +# endif // if CONFIG_ETH_SPI_ETHERNET_W5500 +# if CONFIG_ETH_SPI_ETHERNET_KSZ8851SNL + toString(EthPhyType_t::KSZ8851), +# endif // if CONFIG_ETH_SPI_ETHERNET_KSZ8851SNL +# endif // if ESP_IDF_VERSION_MAJOR >= 5 + }; + const int ethPhyTypes_index[] = { + static_cast(EthPhyType_t::notSet), + +# if CONFIG_ETH_USE_ESP32_EMAC + static_cast(EthPhyType_t::LAN8720), + static_cast(EthPhyType_t::TLK110), + static_cast(EthPhyType_t::RTL8201), +# if ETH_TYPE_JL1101_SUPPORTED + static_cast(EthPhyType_t::JL1101), +# endif + static_cast(EthPhyType_t::DP83848), + static_cast(EthPhyType_t::KSZ8041), + static_cast(EthPhyType_t::KSZ8081), +# endif // if CONFIG_ETH_USE_ESP32_EMAC + +# if ESP_IDF_VERSION_MAJOR >= 5 +# if CONFIG_ETH_SPI_ETHERNET_DM9051 + static_cast(EthPhyType_t::DM9051), +# endif // if CONFIG_ETH_SPI_ETHERNET_DM9051 +# if CONFIG_ETH_SPI_ETHERNET_W5500 + static_cast(EthPhyType_t::W5500), +# endif // if CONFIG_ETH_SPI_ETHERNET_W5500 +# if CONFIG_ETH_SPI_ETHERNET_KSZ8851SNL + static_cast(EthPhyType_t::KSZ8851), +# endif // if CONFIG_ETH_SPI_ETHERNET_KSZ8851SNL +# endif // if ESP_IDF_VERSION_MAJOR >= 5 + }; + + constexpr unsigned nrItems = NR_ELEMENTS(ethPhyTypes_index); + + + const int choice = + isValid(Settings.ETH_Phy_Type) + ? static_cast(Settings.ETH_Phy_Type) + : static_cast(EthPhyType_t::notSet); + + const FormSelectorOptions selector( + nrItems, + ethPhyTypes, + ethPhyTypes_index); + selector.addFormSelector( + F("Ethernet PHY type"), + F("ethtype"), + choice); + } + +# if CONFIG_ETH_USE_SPI_ETHERNET && CONFIG_ETH_USE_ESP32_EMAC +# define MDC_CS_PIN_DESCR "Ethernet MDC/CS pin" +# define MIO_IRQ_PIN_DESCR "Ethernet MDIO/IRQ pin" +# define PWR_RST_PIN_DESCR "Ethernet Power/RST pin" +# elif CONFIG_ETH_USE_SPI_ETHERNET +# define MDC_CS_PIN_DESCR "Ethernet CS pin" +# define MIO_IRQ_PIN_DESCR "Ethernet IRQ pin" +# define PWR_RST_PIN_DESCR "Ethernet RST pin" +# else // #elif CONFIG_ETH_USE_ESP32_EMAC +# define MDC_CS_PIN_DESCR "Ethernet MDC pin" +# define MIO_IRQ_PIN_DESCR "Ethernet MIO pin" +# define PWR_RST_PIN_DESCR "Ethernet Power pin" +# endif // if CONFIG_ETH_USE_SPI_ETHERNET && CONFIG_ETH_USE_ESP32_EMAC + + addFormNumericBox(F("Ethernet PHY Address"), F("ethphy"), Settings.ETH_Phy_Addr, -1, 127); + addFormNote(F("I²C-address of Ethernet PHY" +# if CONFIG_ETH_USE_ESP32_EMAC + " (0 or 1 for LAN8720, 31 for TLK110, -1 autodetect)" +# endif + )); + addFormPinSelect(PinSelectPurpose::Ethernet, formatGpioName_output( + F(MDC_CS_PIN_DESCR)), + F("ethmdc"), Settings.ETH_Pin_mdc_cs); + addFormPinSelect(PinSelectPurpose::Ethernet, formatGpioName_input( + F(MIO_IRQ_PIN_DESCR)), + F("ethmdio"), Settings.ETH_Pin_mdio_irq); + addFormPinSelect(PinSelectPurpose::Ethernet, formatGpioName_output( + F(PWR_RST_PIN_DESCR)), + F("ethpower"), Settings.ETH_Pin_power_rst); +# if CONFIG_ETH_USE_ESP32_EMAC + addRowLabel_tr_id(F("Ethernet Clock"), F("ethclock")); + { + # if CONFIG_IDF_TARGET_ESP32 + const __FlashStringHelper *ethClockOptions[] = { + toString(EthClockMode_t::Ext_crystal_osc), + toString(EthClockMode_t::Int_50MHz_GPIO_0), + toString(EthClockMode_t::Int_50MHz_GPIO_16), + toString(EthClockMode_t::Int_50MHz_GPIO_17_inv) + }; + const int indices[] = { + static_cast(EthClockMode_t::Ext_crystal_osc), + static_cast(EthClockMode_t::Int_50MHz_GPIO_0), + static_cast(EthClockMode_t::Int_50MHz_GPIO_16), + static_cast(EthClockMode_t::Int_50MHz_GPIO_17_inv) + }; + # endif // if CONFIG_IDF_TARGET_ESP32 + # if CONFIG_IDF_TARGET_ESP32P4 + const __FlashStringHelper *ethClockOptions[] = { + // toString(EthClockMode_t::Default), + toString(EthClockMode_t::Ext_crystal), + toString(EthClockMode_t::Int_50MHz) + }; + const int indices[] = { + // static_cast(EthClockMode_t::Default), + static_cast(EthClockMode_t::Ext_crystal), + static_cast(EthClockMode_t::Int_50MHz) + }; + # endif // if CONFIG_IDF_TARGET_ESP32P4 + const FormSelectorOptions selector( + NR_ELEMENTS(ethClockOptions), + ethClockOptions, + indices); + selector.addSelector(F("ethclock"), static_cast(Settings.ETH_Clock_Mode)); + } +# endif // if CONFIG_ETH_USE_ESP32_EMAC + + break; + } + + case NWPlugin::Function::NWPLUGIN_INIT: + { + ETHConnectRelaxed(); + break; + } + + case NWPlugin::Function::NWPLUGIN_EXIT: + { + break; + } + + + default: + break; + + } + return success; +} + +#endif // ifdef USES_NW004 diff --git a/src/_NW005_PPP_modem.cpp b/src/_NW005_PPP_modem.cpp index 136c7b9f3..821972435 100644 --- a/src/_NW005_PPP_modem.cpp +++ b/src/_NW005_PPP_modem.cpp @@ -10,26 +10,30 @@ # define NWPLUGIN_ID_005 5 # define NWPLUGIN_NAME_005 "PPP modem" -# include "src/ESPEasyCore/ESPEasyNetwork.h" # include "src/DataStructs/ESPEasy_EventStruct.h" -# include "src/Globals/NWPlugins.h" -# include "src/Helpers/ESPEasy_Storage.h" -# include "src/Helpers/_NWPlugin_init.h" -# include "src/Globals/SecuritySettings.h" -# include "src/WebServer/common.h" -# include "src/Helpers/StringConverter.h" -# include "src/WebServer/ESPEasy_WebServer.h" -# include "src/Globals/Settings.h" -# include "src/WebServer/Markup_Forms.h" -# include "src/WebServer/Markup.h" +# include "src/ESPEasyCore/ESPEasyNetwork.h" # include "src/ESPEasyCore/ESPEasyWifi_abstracted.h" -# include "src/Helpers/_NWPlugin_Helper_webform.h" -# include "src/Helpers/PrintToString.h" +# include "src/Globals/NWPlugins.h" +# include "src/Globals/SecuritySettings.h" +# include "src/Globals/Settings.h" +# include "src/Helpers/ESPEasy_Storage.h" +# include "src/Helpers/PrintToString.h" +# include "src/Helpers/StringConverter.h" +# include "src/Helpers/_NWPlugin_Helper_webform.h" +# include "src/Helpers/_NWPlugin_init.h" +# include "src/Helpers/_Plugin_Helper_serial.h" + +# include "src/WebServer/ESPEasy_WebServer.h" # include "src/WebServer/HTML_Print.h" # include "src/WebServer/HTML_wrappers.h" +# include "src/WebServer/Markup.h" +# include "src/WebServer/Markup_Forms.h" +# include "src/WebServer/common.h" + +#include #include @@ -80,6 +84,53 @@ bool NWPlugin_005(NWPlugin::Function function, struct EventStruct *event, String case NWPlugin::Function::NWPLUGIN_WEBFORM_LOAD: { + // TODO TD-er: We cannot use ESPEasySerialPort here as PPPClass needs to handle the pins using periman +{ + const int ids[] = { + static_cast(ESPEasySerialPort::serial0) +#if USABLE_SOC_UART_NUM > 1 + ,static_cast(ESPEasySerialPort::serial1) +#endif +#if USABLE_SOC_UART_NUM > 2 + ,static_cast(ESPEasySerialPort::serial2) +#endif +#if USABLE_SOC_UART_NUM > 3 + ,static_cast(ESPEasySerialPort::serial3) +#endif +#if USABLE_SOC_UART_NUM > 4 + ,static_cast(ESPEasySerialPort::serial4) +#endif +#if USABLE_SOC_UART_NUM > 5 + ,static_cast(ESPEasySerialPort::serial5) +#endif + }; + + constexpr int NR_ESPEASY_SERIAL_TYPES = NR_ELEMENTS(ids); + const __FlashStringHelper* options[] = { + serialHelper_getSerialTypeLabel(ESPEasySerialPort::serial0) +#if USABLE_SOC_UART_NUM > 1 + ,serialHelper_getSerialTypeLabel(ESPEasySerialPort::serial1) +#endif +#if USABLE_SOC_UART_NUM > 2 + ,serialHelper_getSerialTypeLabel(ESPEasySerialPort::serial2) +#endif +#if USABLE_SOC_UART_NUM > 3 + ,serialHelper_getSerialTypeLabel(ESPEasySerialPort::serial3) +#endif +#if USABLE_SOC_UART_NUM > 4 + ,serialHelper_getSerialTypeLabel(ESPEasySerialPort::serial4) +#endif +#if USABLE_SOC_UART_NUM > 5 + ,serialHelper_getSerialTypeLabel(ESPEasySerialPort::serial5) +#endif + }; + FormSelectorOptions selector(NR_ESPEASY_SERIAL_TYPES, options, ids); + +// selector.addFormSelector(F("Serial Port"), F("serPort"), port); + +} + + break; } diff --git a/src/src/CustomBuild/define_plugin_sets.h b/src/src/CustomBuild/define_plugin_sets.h index 2cd7eb7c7..47fe6d4fd 100644 --- a/src/src/CustomBuild/define_plugin_sets.h +++ b/src/src/CustomBuild/define_plugin_sets.h @@ -3848,7 +3848,7 @@ To create/register a plugin, you have to : #undef USES_NW002 #endif #endif -#if FEATURE_ETHERNET +#if FEATURE_ETHERNET && CONFIG_ETH_USE_ESP32_EMAC #ifndef USES_NW003 #define USES_NW003 #endif @@ -3858,6 +3858,17 @@ To create/register a plugin, you have to : #endif #endif +#if FEATURE_ETHERNET && CONFIG_ETH_USE_SPI_ETHERNET + #ifndef USES_NW004 + #define USES_NW004 + #endif +#else + #ifdef USES_NW004 + #undef USES_NW004 + #endif +#endif + + #if FEATURE_PPP_MODEM #ifndef USES_NW005 #define USES_NW005 From abd8a22dd7c87da3e6e569cecbc3f672ac6fe80a Mon Sep 17 00:00:00 2001 From: TD-er Date: Sun, 13 Jul 2025 01:58:40 +0200 Subject: [PATCH 108/564] [Storage] Add generic key/value store to simplify data storage --- .../ESPEasy_key_value_store_4byte_data.cpp | 50 +++ .../ESPEasy_key_value_store_8byte_data.cpp | 50 +++ .../DataTypes/ESPEasy_key_value_store_data.h | 63 ++++ src/src/Helpers/_ESPEasy_key_value_store.cpp | 341 ++++++++++++++++++ src/src/Helpers/_ESPEasy_key_value_store.h | 159 ++++++++ 5 files changed, 663 insertions(+) create mode 100644 src/src/DataTypes/ESPEasy_key_value_store_4byte_data.cpp create mode 100644 src/src/DataTypes/ESPEasy_key_value_store_8byte_data.cpp create mode 100644 src/src/DataTypes/ESPEasy_key_value_store_data.h create mode 100644 src/src/Helpers/_ESPEasy_key_value_store.cpp create mode 100644 src/src/Helpers/_ESPEasy_key_value_store.h diff --git a/src/src/DataTypes/ESPEasy_key_value_store_4byte_data.cpp b/src/src/DataTypes/ESPEasy_key_value_store_4byte_data.cpp new file mode 100644 index 000000000..66ea759ad --- /dev/null +++ b/src/src/DataTypes/ESPEasy_key_value_store_4byte_data.cpp @@ -0,0 +1,50 @@ +#include "../DataTypes/ESPEasy_key_value_store_data.h" + +constexpr unsigned int size_32bit = sizeof(float); + +ESPEasy_key_value_store_4byte_data_t::ESPEasy_key_value_store_4byte_data_t() { + ZERO_FILL(binary); +} + +ESPEasy_key_value_store_4byte_data_t::ESPEasy_key_value_store_4byte_data_t(const ESPEasy_key_value_store_4byte_data_t& other) +{ + memcpy(binary, other.binary, sizeof(binary)); +} + +ESPEasy_key_value_store_4byte_data_t& ESPEasy_key_value_store_4byte_data_t::operator=(const ESPEasy_key_value_store_4byte_data_t& other) +{ + memcpy(binary, other.binary, sizeof(binary)); + return *this; +} + +void ESPEasy_key_value_store_4byte_data_t::clear() { ZERO_FILL(binary); } + +int32_t ESPEasy_key_value_store_4byte_data_t::getInt32() const +{ + int32_t res{}; + + memcpy(&res, binary, size_32bit); + return res; +} + +void ESPEasy_key_value_store_4byte_data_t::setInt32(int32_t value) { memcpy(binary, &value, size_32bit); } + +uint32_t ESPEasy_key_value_store_4byte_data_t::getUint32() const +{ + uint32_t res{}; + + memcpy(&res, binary, size_32bit); + return res; +} + +void ESPEasy_key_value_store_4byte_data_t::setUint32(uint32_t value) { memcpy(binary, &value, size_32bit); } + +float ESPEasy_key_value_store_4byte_data_t::getFloat() const +{ + float res{}; + + memcpy(&res, binary, size_32bit); + return res; +} + +void ESPEasy_key_value_store_4byte_data_t::setFloat(float value) { memcpy(binary, &value, size_32bit); } diff --git a/src/src/DataTypes/ESPEasy_key_value_store_8byte_data.cpp b/src/src/DataTypes/ESPEasy_key_value_store_8byte_data.cpp new file mode 100644 index 000000000..14252e866 --- /dev/null +++ b/src/src/DataTypes/ESPEasy_key_value_store_8byte_data.cpp @@ -0,0 +1,50 @@ +#include "../DataTypes/ESPEasy_key_value_store_data.h" + +constexpr unsigned int size_64bit = sizeof(double); + +ESPEasy_key_value_store_8byte_data_t::ESPEasy_key_value_store_8byte_data_t() { + ZERO_FILL(binary); +} + +ESPEasy_key_value_store_8byte_data_t::ESPEasy_key_value_store_8byte_data_t(const ESPEasy_key_value_store_8byte_data_t& other) +{ + memcpy(binary, other.binary, sizeof(binary)); +} + +ESPEasy_key_value_store_8byte_data_t& ESPEasy_key_value_store_8byte_data_t::operator=(const ESPEasy_key_value_store_8byte_data_t& other) +{ + memcpy(binary, other.binary, sizeof(binary)); + return *this; +} + +void ESPEasy_key_value_store_8byte_data_t::clear() { ZERO_FILL(binary); } + +int64_t ESPEasy_key_value_store_8byte_data_t::getInt64() const +{ + int64_t res{}; + + memcpy(&res, binary, size_64bit); + return res; +} + +void ESPEasy_key_value_store_8byte_data_t::setInt64(int64_t value) { memcpy(binary, &value, size_64bit); } + +uint64_t ESPEasy_key_value_store_8byte_data_t::getUint64() const +{ + uint64_t res{}; + + memcpy(&res, binary, size_64bit); + return res; +} + +void ESPEasy_key_value_store_8byte_data_t::setUint64(uint64_t value) { memcpy(binary, &value, size_64bit); } + +double ESPEasy_key_value_store_8byte_data_t::getDouble() const +{ + double res{}; + + memcpy(&res, binary, size_64bit); + return res; +} + +void ESPEasy_key_value_store_8byte_data_t::setDouble(double value) { memcpy(binary, &value, size_64bit); } diff --git a/src/src/DataTypes/ESPEasy_key_value_store_data.h b/src/src/DataTypes/ESPEasy_key_value_store_data.h new file mode 100644 index 000000000..03950f5ad --- /dev/null +++ b/src/src/DataTypes/ESPEasy_key_value_store_data.h @@ -0,0 +1,63 @@ +#ifndef DATATYPES_ESPEASY_KEY_VALUE_STORE_DATA_H +#define DATATYPES_ESPEASY_KEY_VALUE_STORE_DATA_H + +#include "../../ESPEasy_common.h" + +// Store various types of 32 bit +class alignas(uint32_t) ESPEasy_key_value_store_4byte_data_t +{ +public: + + ESPEasy_key_value_store_4byte_data_t(); + + ESPEasy_key_value_store_4byte_data_t(const ESPEasy_key_value_store_4byte_data_t& other); + + ESPEasy_key_value_store_4byte_data_t& operator=(const ESPEasy_key_value_store_4byte_data_t& other); + + void clear(); + + + int32_t getInt32() const; + void setInt32(int32_t value); + + uint32_t getUint32() const; + void setUint32(uint32_t value); + + float getFloat() const; + void setFloat(float value); + +private: + + uint8_t binary[sizeof(float)]{}; +}; // class alignas + +// Store various types of 64 bit +class alignas(uint32_t) ESPEasy_key_value_store_8byte_data_t +{ +public: + + ESPEasy_key_value_store_8byte_data_t(); + + ESPEasy_key_value_store_8byte_data_t(const ESPEasy_key_value_store_8byte_data_t& other); + + ESPEasy_key_value_store_8byte_data_t& operator=(const ESPEasy_key_value_store_8byte_data_t& other); + + void clear(); + + + int64_t getInt64() const; + void setInt64(int64_t value); + + uint64_t getUint64() const; + void setUint64(uint64_t value); + + double getDouble() const; + void setDouble(double value); + +private: + + uint8_t binary[sizeof(double)]{}; +}; // class alignas + + +#endif // ifndef DATATYPES_ESPEASY_KEY_VALUE_STORE_DATA_H diff --git a/src/src/Helpers/_ESPEasy_key_value_store.cpp b/src/src/Helpers/_ESPEasy_key_value_store.cpp new file mode 100644 index 000000000..2f4dc1422 --- /dev/null +++ b/src/src/Helpers/_ESPEasy_key_value_store.cpp @@ -0,0 +1,341 @@ +#include "../Helpers/_ESPEasy_key_value_store.h" + +#include "../Helpers/StringConverter_Numerical.h" + +uint32_t combine_StorageType_and_key( + ESPEasy_key_value_store::StorageType storageType, + uint32_t key) +{ + if (storageType == ESPEasy_key_value_store::StorageType::bool_false) { + // bool type will be kept in memory as bool_type + storageType = ESPEasy_key_value_store::StorageType::bool_type; + } + + uint32_t res = key & ((1 << 24) - 1); + res |= (static_cast(storageType) << 24); + return res; +} + +ESPEasy_key_value_store::StorageType get_StorageType_from_key(uint32_t key) +{ + return static_cast(key >> 24); +} + +size_t getStorageSizePerType(ESPEasy_key_value_store::StorageType storageType) +{ + switch (storageType) + { + case ESPEasy_key_value_store::StorageType::not_set: break; + case ESPEasy_key_value_store::StorageType::string_type: break; + case ESPEasy_key_value_store::StorageType::int8_type: return 4 + 1; + case ESPEasy_key_value_store::StorageType::uint8_type: return 4 + 1; + case ESPEasy_key_value_store::StorageType::int16_type: return 4 + 2; + case ESPEasy_key_value_store::StorageType::uint16_type: return 4 + 2; + case ESPEasy_key_value_store::StorageType::int32_type: return 4 + 4; + case ESPEasy_key_value_store::StorageType::uint32_type: return 4 + 4; + case ESPEasy_key_value_store::StorageType::int64_type: return 4 + 8; + case ESPEasy_key_value_store::StorageType::uint64_type: return 4 + 8; + case ESPEasy_key_value_store::StorageType::float_type: return 4 + 4; + case ESPEasy_key_value_store::StorageType::double_type: return 4 + 8; + case ESPEasy_key_value_store::StorageType::bool_type: return 4 + 0; + case ESPEasy_key_value_store::StorageType::MAX_Type: break; + case ESPEasy_key_value_store::StorageType::bool_true: + case ESPEasy_key_value_store::StorageType::bool_false: return 4 + 0; + } + return 0; +} + +// TODO TD-er: Implement +bool ESPEasy_key_value_store::load() { return false; } + +// TODO TD-er: Implement +bool ESPEasy_key_value_store::store() { return false; } + +size_t ESPEasy_key_value_store::getStorageSize() const +{ + size_t res{}; + + for (auto it = _string_data.begin(); it != _string_data.end(); ++it) + { + res += 4; // key size + res += it->second.length(); + } + + for (auto it = _4byte_data.begin(); it != _4byte_data.end(); ++it) + { + res += getStorageSizePerType( + static_cast(it->first)); + } + + for (auto it = _8byte_data.begin(); it != _8byte_data.end(); ++it) + { + res += getStorageSizePerType( + static_cast(it->first)); + } + return res; +} + +bool ESPEasy_key_value_store::hasKey(StorageType storageType, uint32_t key) const +{ + if (!hasStorageType(storageType)) { return false; } + + if (storageType == ESPEasy_key_value_store::StorageType::string_type) + { + return _string_data.find(key) != _string_data.end(); + } + const uint32_t combined_key = combine_StorageType_and_key(storageType, key); + const size_t size = getStorageSizePerType(storageType); + + if (size > 8) + { + return _8byte_data.find(key) != _8byte_data.end(); + } + + if (size >= 4) { + return _4byte_data.find(key) != _4byte_data.end(); + } + return false; +} + +ESPEasy_key_value_store::StorageType ESPEasy_key_value_store::getStorageType(uint32_t key) const +{ + uint32_t cached_bitmap = _storage_type_present_cache; + + // Search all storage types, skipping the 'not_set' + for (size_t i = 0; + cached_bitmap && + i < static_cast(ESPEasy_key_value_store::StorageType::MAX_Type); + ++i) + { + const ESPEasy_key_value_store::StorageType res = static_cast(i); + + if (hasKey(res, key)) { return res; } + cached_bitmap >>= 1; + } + return ESPEasy_key_value_store::StorageType::not_set; +} + +bool ESPEasy_key_value_store::getValue(uint32_t key, String& value) const +{ + auto it = _string_data.find(key); + + if (it == _string_data.end()) { return false; } + value = it->second; + return true; +} + +void ESPEasy_key_value_store::setValue(uint32_t key, const String& value) +{ + _string_data[key] = value; + setHasStorageType(ESPEasy_key_value_store::StorageType::string_type); +} + +#define GET_4BYTE_TYPE(T, GF) \ + if (hasStorageType(ESPEasy_key_value_store::StorageType::T)) \ + { const uint32_t combined_key = combine_StorageType_and_key( \ + ESPEasy_key_value_store::StorageType::T, key); \ + auto it = _4byte_data.find(combined_key); \ + if (it != _4byte_data.end()) { \ + value = it->second.GF(); \ + return true; \ + } \ + } \ + return false; + +#define GET_8BYTE_TYPE(T, GF) \ + if (hasStorageType(ESPEasy_key_value_store::StorageType::T)) \ + { const uint32_t combined_key = combine_StorageType_and_key( \ + ESPEasy_key_value_store::StorageType::T, key); \ + auto it = _8byte_data.find(combined_key); \ + if (it != _8byte_data.end()) { \ + value = it->second.GF(); \ + return true; \ + } \ + } \ + return false; + + +#define SET_4BYTE_TYPE(T, SF) \ + const uint32_t combined_key = combine_StorageType_and_key( \ + ESPEasy_key_value_store::StorageType::T, key); \ + _4byte_data[combined_key].SF(value); \ + setHasStorageType(ESPEasy_key_value_store::StorageType::T); + + +#define SET_8BYTE_TYPE(T, SF) \ + const uint32_t combined_key = combine_StorageType_and_key( \ + ESPEasy_key_value_store::StorageType::T, key); \ + _8byte_data[combined_key].SF(value); \ + setHasStorageType(ESPEasy_key_value_store::StorageType::T); + +bool ESPEasy_key_value_store::getValue(uint32_t key, int8_t& value) const +{ + GET_4BYTE_TYPE(int8_type, getInt32) +} + +void ESPEasy_key_value_store::setValue(uint32_t key, const int8_t& value) { SET_4BYTE_TYPE(int8_type, setInt32) } + +bool ESPEasy_key_value_store::getValue(uint32_t key, uint8_t& value) const +{ + GET_4BYTE_TYPE(uint8_type, getUint32); +} + +void ESPEasy_key_value_store::setValue(uint32_t key, const uint8_t& value) { SET_4BYTE_TYPE(uint8_type, setUint32); } + +bool ESPEasy_key_value_store::getValue(uint32_t key, int16_t& value) const +{ + GET_4BYTE_TYPE(int16_type, getInt32); +} + +void ESPEasy_key_value_store::setValue(uint32_t key, const int16_t& value) { SET_4BYTE_TYPE(int16_type, setInt32); } + +bool ESPEasy_key_value_store::getValue(uint32_t key, uint16_t& value) const +{ + GET_4BYTE_TYPE(uint16_type, getUint32); + +} + +void ESPEasy_key_value_store::setValue(uint32_t key, const uint16_t& value) { SET_4BYTE_TYPE(uint16_type, setUint32); } + +bool ESPEasy_key_value_store::getValue(uint32_t key, int32_t& value) const +{ + GET_4BYTE_TYPE(int32_type, getInt32); +} + +void ESPEasy_key_value_store::setValue(uint32_t key, const int32_t& value) { SET_4BYTE_TYPE(int32_type, setInt32); } + +bool ESPEasy_key_value_store::getValue(uint32_t key, uint32_t& value) const +{ + GET_4BYTE_TYPE(uint32_type, getUint32); +} + +void ESPEasy_key_value_store::setValue(uint32_t key, const uint32_t& value) { SET_4BYTE_TYPE(uint32_type, setUint32); } + +bool ESPEasy_key_value_store::getValue(uint32_t key, int64_t& value) const +{ + GET_8BYTE_TYPE(int64_type, getInt64); +} + +void ESPEasy_key_value_store::setValue(uint32_t key, const int64_t& value) { SET_8BYTE_TYPE(int64_type, setInt64); } + +bool ESPEasy_key_value_store::getValue(uint32_t key, uint64_t& value) const +{ + GET_8BYTE_TYPE(uint64_type, getUint64); +} + +void ESPEasy_key_value_store::setValue(uint32_t key, const uint64_t& value) { SET_8BYTE_TYPE(uint64_type, setUint64); } + +bool ESPEasy_key_value_store::getValue(uint32_t key, float& value) const +{ + GET_4BYTE_TYPE(float_type, getFloat); +} + +void ESPEasy_key_value_store::setValue(uint32_t key, const float& value) { SET_4BYTE_TYPE(float_type, setFloat); } + +bool ESPEasy_key_value_store::getValue(uint32_t key, double& value) const +{ + GET_8BYTE_TYPE(double_type, getDouble); +} + +void ESPEasy_key_value_store::setValue(uint32_t key, const double& value) { SET_8BYTE_TYPE(double_type, setDouble); } + +bool ESPEasy_key_value_store::getValue(uint32_t key, bool& value) const +{ + GET_4BYTE_TYPE(bool_type, getUint32); +} + +void ESPEasy_key_value_store::setValue(uint32_t key, const bool& value) { SET_4BYTE_TYPE(bool_type, setUint32); } + + +#define GET_4BYTE_TYPE_AS_STRING(T, CT) \ + case ESPEasy_key_value_store::StorageType::T: \ + { \ + CT v{}; \ + if (getValue(key, v)) { \ + value = String(v); \ + return true; \ + } \ + break; \ + } + +bool ESPEasy_key_value_store::getValue(StorageType& storageType, uint32_t key, String& value) const +{ + if (!hasKey(storageType, key)) { return false; } + + switch (storageType) + { + case ESPEasy_key_value_store::StorageType::string_type: + getValue(key, value); + break; + GET_4BYTE_TYPE_AS_STRING(bool_type, bool) + GET_4BYTE_TYPE_AS_STRING(int8_type, int8_t) + GET_4BYTE_TYPE_AS_STRING(uint8_type, uint8_t) + GET_4BYTE_TYPE_AS_STRING(int16_type, int16_t) + GET_4BYTE_TYPE_AS_STRING(uint16_type, uint16_t) + GET_4BYTE_TYPE_AS_STRING(int32_type, int32_t) + GET_4BYTE_TYPE_AS_STRING(uint32_type, uint32_t) + GET_4BYTE_TYPE_AS_STRING(float_type, float) + + case ESPEasy_key_value_store::StorageType::int64_type: + { + int64_t v{}; + + if (getValue(key, v)) { + value = ll2String(v); + return true; + } + break; + } + + case ESPEasy_key_value_store::StorageType::uint64_type: + { + uint64_t v{}; + + if (getValue(key, v)) { + value = ull2String(v); + return true; + } + break; + } + + case ESPEasy_key_value_store::StorageType::double_type: + { + double v{}; + + if (getValue(key, v)) { + value = doubleToString(v); + return true; + } + break; + } + + case ESPEasy_key_value_store::StorageType::not_set: + case ESPEasy_key_value_store::StorageType::bool_true: + case ESPEasy_key_value_store::StorageType::bool_false: + case ESPEasy_key_value_store::StorageType::MAX_Type: + break; + } + return false; +} + +// TODO TD-er: Implement +void ESPEasy_key_value_store::setValue(StorageType& storageType, uint32_t key, const String& value) {} + +bool ESPEasy_key_value_store::hasStorageType(StorageType storageType) const +{ + const uint32_t bitnr = static_cast(storageType); + constexpr uint32_t max_bitnr = static_cast(StorageType::MAX_Type); + + if (bitnr >= max_bitnr) { return false; } + return bitRead(_storage_type_present_cache, bitnr); +} + +void ESPEasy_key_value_store::setHasStorageType(StorageType storageType) +{ + const uint32_t bitnr = static_cast(storageType); + constexpr uint32_t max_bitnr = static_cast(StorageType::MAX_Type); + + if (bitnr < max_bitnr) { + bitSet(_storage_type_present_cache, bitnr); + } +} diff --git a/src/src/Helpers/_ESPEasy_key_value_store.h b/src/src/Helpers/_ESPEasy_key_value_store.h new file mode 100644 index 000000000..d11d918d9 --- /dev/null +++ b/src/src/Helpers/_ESPEasy_key_value_store.h @@ -0,0 +1,159 @@ +#ifndef HELPERS_ESPEASY_KEY_VALUE_STORE_H +#define HELPERS_ESPEASY_KEY_VALUE_STORE_H + +#include "../../ESPEasy_common.h" + +#include "../DataTypes/ESPEasy_key_value_store_data.h" +#include + +// Generic storage layer, which on a low level will store everything as a string. +// Low level storage structure: +// - uint8_t: version of storage layer +// - uint8_t[3]: rawSize (offset to start of checksum) +// - List of key/value pairs: +// - uint8_t: storage type +// - uint8_t[3]: key +// - zero-terminated string or shortened binary form +// ... +// - uint8_t[16] checksum + +class ESPEasy_key_value_store +{ +public: + + // Type is stored, so do not change the order/values + enum class StorageType { + not_set = 0, + string_type = 1, + int8_type = 2, + uint8_type = 3, + int16_type = 4, + uint16_type = 5, + int32_type = 6, + uint32_type = 7, + int64_type = 8, + uint64_type = 9, + float_type = 10, + double_type = 11, + bool_type = 12, + + MAX_Type, // Leave this one after the generic type and before 'special' types + + + bool_true = 254, // small optimization to store 'true' as extra type + bool_false = 255 // small optimization to store 'false' as extra type + + }; + + + bool load(); // TODO TD-er: Implement + bool store(); // TODO TD-er: Implement + + // Count all data to estimate how much storage space it would require to store everything in a somewhat compact form. + size_t getStorageSize() const; + + // Check to see if there is a key stored with given storage type + bool hasKey(StorageType storageType, + uint32_t key) const; + + // Try to find a key and get its storage type or 'not_set' if the key is not present + StorageType getStorageType(uint32_t key) const; + + + /* + ############################################### + ## get/set functions for all supported types ## + ############################################### + */ + + bool getValue(uint32_t key, + String & value) const; + void setValue(uint32_t key, + const String& value); + + bool getValue(uint32_t key, + int8_t & value) const; + void setValue(uint32_t key, + const int8_t& value); + + bool getValue(uint32_t key, + uint8_t& value) const; + void setValue(uint32_t key, + const uint8_t& value); + + bool getValue(uint32_t key, + int16_t& value) const; + void setValue(uint32_t key, + const int16_t& value); + + bool getValue(uint32_t key, + uint16_t& value) const; + void setValue(uint32_t key, + const uint16_t& value); + + bool getValue(uint32_t key, + int32_t& value) const; + void setValue(uint32_t key, + const int32_t& value); + + bool getValue(uint32_t key, + uint32_t& value) const; + void setValue(uint32_t key, + const uint32_t& value); + + bool getValue(uint32_t key, + int64_t& value) const; + void setValue(uint32_t key, + const int64_t& value); + + bool getValue(uint32_t key, + uint64_t& value) const; + void setValue(uint32_t key, + const uint64_t& value); + + bool getValue(uint32_t key, + float & value) const; + void setValue(uint32_t key, + const float& value); + + bool getValue(uint32_t key, + double & value) const; + void setValue(uint32_t key, + const double& value); + + bool getValue(uint32_t key, + bool & value) const; + void setValue(uint32_t key, + const bool& value); + + + // Generic get function for any given storageType/key and represent its value as a string. + // Return false when storageType/key is not present. + bool getValue(StorageType& storageType, + uint32_t key, + String & value) const; + + // Generic set function for any given storageType/key. + // Given value is a string representation of that storage type. + // TODO TD-er: Implement + void setValue(StorageType & storageType, + uint32_t key, + const String& value); + +private: + + // Query cache to see if we have any of the asked storage type + bool hasStorageType(StorageType storageType) const; + + // Update cache to indicate we have at least one of the given storage type + void setHasStorageType(StorageType storageType); + + std::map_string_data{}; + std::map_4byte_data{}; + std::map_8byte_data{}; + + uint32_t _storage_type_present_cache{}; + +}; // class ESPEasy_key_value_store + +#endif // ifndef HELPERS_ESPEASY_KEY_VALUE_STORE_H From f38ae9b92e5b965a1b9a94b80f643cbb1b6f1fe6 Mon Sep 17 00:00:00 2001 From: TD-er Date: Sun, 13 Jul 2025 15:46:41 +0200 Subject: [PATCH 109/564] [Storage] Add load function for new key/value store --- .../ESPEasy_key_value_store_4byte_data.cpp | 5 + .../ESPEasy_key_value_store_8byte_data.cpp | 6 + .../DataTypes/ESPEasy_key_value_store_data.h | 10 + src/src/Helpers/_ESPEasy_key_value_store.cpp | 304 +++++++++++++++++- src/src/Helpers/_ESPEasy_key_value_store.h | 34 +- 5 files changed, 341 insertions(+), 18 deletions(-) diff --git a/src/src/DataTypes/ESPEasy_key_value_store_4byte_data.cpp b/src/src/DataTypes/ESPEasy_key_value_store_4byte_data.cpp index 66ea759ad..9edf8ad9e 100644 --- a/src/src/DataTypes/ESPEasy_key_value_store_4byte_data.cpp +++ b/src/src/DataTypes/ESPEasy_key_value_store_4byte_data.cpp @@ -11,6 +11,11 @@ ESPEasy_key_value_store_4byte_data_t::ESPEasy_key_value_store_4byte_data_t(const memcpy(binary, other.binary, sizeof(binary)); } +ESPEasy_key_value_store_4byte_data_t::ESPEasy_key_value_store_4byte_data_t(const uint8_t* data) +{ + memcpy(binary, data, sizeof(binary)); +} + ESPEasy_key_value_store_4byte_data_t& ESPEasy_key_value_store_4byte_data_t::operator=(const ESPEasy_key_value_store_4byte_data_t& other) { memcpy(binary, other.binary, sizeof(binary)); diff --git a/src/src/DataTypes/ESPEasy_key_value_store_8byte_data.cpp b/src/src/DataTypes/ESPEasy_key_value_store_8byte_data.cpp index 14252e866..0db9d848c 100644 --- a/src/src/DataTypes/ESPEasy_key_value_store_8byte_data.cpp +++ b/src/src/DataTypes/ESPEasy_key_value_store_8byte_data.cpp @@ -11,6 +11,12 @@ ESPEasy_key_value_store_8byte_data_t::ESPEasy_key_value_store_8byte_data_t(const memcpy(binary, other.binary, sizeof(binary)); } +ESPEasy_key_value_store_8byte_data_t::ESPEasy_key_value_store_8byte_data_t(const uint8_t* data) +{ + memcpy(binary, data, sizeof(binary)); +} + + ESPEasy_key_value_store_8byte_data_t& ESPEasy_key_value_store_8byte_data_t::operator=(const ESPEasy_key_value_store_8byte_data_t& other) { memcpy(binary, other.binary, sizeof(binary)); diff --git a/src/src/DataTypes/ESPEasy_key_value_store_data.h b/src/src/DataTypes/ESPEasy_key_value_store_data.h index 03950f5ad..b751192cc 100644 --- a/src/src/DataTypes/ESPEasy_key_value_store_data.h +++ b/src/src/DataTypes/ESPEasy_key_value_store_data.h @@ -12,6 +12,8 @@ public: ESPEasy_key_value_store_4byte_data_t(const ESPEasy_key_value_store_4byte_data_t& other); + ESPEasy_key_value_store_4byte_data_t(const uint8_t* data); + ESPEasy_key_value_store_4byte_data_t& operator=(const ESPEasy_key_value_store_4byte_data_t& other); void clear(); @@ -26,6 +28,9 @@ public: float getFloat() const; void setFloat(float value); + uint8_t* getBinary() { return binary; } + const uint8_t* getBinary() const { return binary; } + private: uint8_t binary[sizeof(float)]{}; @@ -40,6 +45,8 @@ public: ESPEasy_key_value_store_8byte_data_t(const ESPEasy_key_value_store_8byte_data_t& other); + ESPEasy_key_value_store_8byte_data_t(const uint8_t* data); + ESPEasy_key_value_store_8byte_data_t& operator=(const ESPEasy_key_value_store_8byte_data_t& other); void clear(); @@ -54,6 +61,9 @@ public: double getDouble() const; void setDouble(double value); + uint8_t* getBinary() { return binary; } + const uint8_t* getBinary() const { return binary; } + private: uint8_t binary[sizeof(double)]{}; diff --git a/src/src/Helpers/_ESPEasy_key_value_store.cpp b/src/src/Helpers/_ESPEasy_key_value_store.cpp index 2f4dc1422..d7700f0be 100644 --- a/src/src/Helpers/_ESPEasy_key_value_store.cpp +++ b/src/src/Helpers/_ESPEasy_key_value_store.cpp @@ -1,6 +1,8 @@ #include "../Helpers/_ESPEasy_key_value_store.h" #include "../Helpers/StringConverter_Numerical.h" +#include "../Helpers/ESPEasy_Storage.h" +#include "../Helpers/StringConverter.h" uint32_t combine_StorageType_and_key( ESPEasy_key_value_store::StorageType storageType, @@ -16,9 +18,16 @@ uint32_t combine_StorageType_and_key( return res; } -ESPEasy_key_value_store::StorageType get_StorageType_from_key(uint32_t key) +ESPEasy_key_value_store::StorageType get_StorageType_from_combined_key(uint32_t combined_key) { - return static_cast(key >> 24); + return static_cast(combined_key >> 24); +} + +uint32_t getKey_from_combined_key(uint32_t combined_key) +{ + const uint32_t res = combined_key & ((1 << 24) - 1); + + return res; } size_t getStorageSizePerType(ESPEasy_key_value_store::StorageType storageType) @@ -45,11 +54,205 @@ size_t getStorageSizePerType(ESPEasy_key_value_store::StorageType storageType) return 0; } -// TODO TD-er: Implement -bool ESPEasy_key_value_store::load() { return false; } +bool ESPEasy_key_value_store::load(SettingsType::Enum settingsType, int index, uint32_t offset_in_block) +{ + int offset, max_size; + + if (!SettingsType::getSettingsParameters(settingsType, index, offset, max_size)) + { + _lastError = F("KVS: Invalid index"); + #ifndef BUILD_NO_DEBUG + addLog(LOG_LEVEL_DEBUG, _lastError); + #endif // ifndef BUILD_NO_DEBUG + return false; + } + + const uint32_t bufferSize = 128; + + char buffer[bufferSize] = { 0 }; + const uint8_t*buf_start = (const uint8_t *)buffer; + String result; + uint32_t readPos = offset_in_block; + + // Read header: + // - uint8_t: version of storage layer + // - uint8_t[3]: rawSize (offset to start of checksum) + result += LoadFromFile(settingsType, + index, + reinterpret_cast(&buffer), + 4, // readSize + readPos); + readPos += 4; + + + // TODO TD-er: Compute checksum + + const uint8_t version = buffer[0]; + const size_t payloadSize = (buffer[1] << 16) | (buffer[2] << 8) | buffer[0]; + const size_t totalSize = 4 + payloadSize + 16; // header + payload + checksum + const size_t startChecksumPos = offset_in_block + 4 + payloadSize; + + if ((offset_in_block + totalSize) > max_size) { + _lastError = strformat(F("KVS: Total size %d + offset %d exceeds max size %d"), totalSize, offset_in_block, max_size); + #ifndef BUILD_NO_DEBUG + addLog(LOG_LEVEL_DEBUG, _lastError); + #endif // ifndef BUILD_NO_DEBUG + return false; + } + + size_t bytesLeftPartialString{}; + String partialString; + ESPEasy_key_value_store::StorageType storageType{}; + size_t sizePerType{}; + uint32_t key{}; + + while (readPos < startChecksumPos) { + // This loop always starts at the beginning of a key/value type, + // except when we're parsing a string which may be longer than the buffer + const uint32_t readSize = std::min(bufferSize, max_size - readPos); + result += LoadFromFile(settingsType, + index, + reinterpret_cast(&buffer), + readSize, + readPos); + uint32_t bufPos = 0; + bool loadNextFromFile = false; + + for (; !loadNextFromFile && (bufPos + 3) < readSize;) { +#define LOG_READPOS_OFFSET (readPos + (bufPos - bufPos_start_loop)) + const uint32_t bufPos_start_loop = bufPos; + + if (!bytesLeftPartialString) { + // Parse StorageType + key + const ESPEasy_key_value_store_4byte_data_t combined_key(buf_start + bufPos); + storageType = get_StorageType_from_combined_key(combined_key.getUint32()); + sizePerType = getStorageSizePerType(storageType); + key = getKey_from_combined_key(combined_key.getUint32()); + + if (sizePerType < 4) { + // Should not happen + _lastError = strformat(F("KVS: Invalid storage type %d at readPos %d"), static_cast(storageType), LOG_READPOS_OFFSET); + addLog(LOG_LEVEL_ERROR, _lastError); + return false; + } + } + + switch (storageType) + { + case ESPEasy_key_value_store::StorageType::bool_false: + { + // Store bool 'false' + const bool res = false; + setValue(key, res); + bufPos += 4; + break; + } + case ESPEasy_key_value_store::StorageType::bool_type: + case ESPEasy_key_value_store::StorageType::bool_true: + { + // Store bool 'true' + const bool res = true; + setValue(key, res); + bufPos += 4; + break; + } + + case ESPEasy_key_value_store::StorageType::string_type: + { + if (bytesLeftPartialString == 0) { + // Found new string type + // Read expected size in next 2 bytes + if ((readSize - bufPos) < 2) { + // Read next block + loadNextFromFile = true; + } else { + bufPos += 4; + bytesLeftPartialString = (buffer[bufPos] << 8) | buffer[bufPos + 1]; + bufPos += 2; + + if (!partialString.reserve(bytesLeftPartialString)) + { + _lastError = strformat(F("KVS: Could not allocate string size %d at readPos %d"), bytesLeftPartialString, LOG_READPOS_OFFSET); + addLog(LOG_LEVEL_ERROR, _lastError); + return false; + } + } + } + + while (bytesLeftPartialString > 0 && bufPos < readSize) { + const char c = buffer[bufPos]; + --bytesLeftPartialString; + ++bufPos; + + if (c != '\0') { + partialString += c; + } else if (bytesLeftPartialString > 0) { + // What to do here if bytesLeftPartialString != 0 ???? + _lastError = strformat(F("KVS: Unexpected end-of-string, expected %d more at readPos %d"), + bytesLeftPartialString, + LOG_READPOS_OFFSET); + addLog(LOG_LEVEL_ERROR, _lastError); + return false; + } + } + + if ((bytesLeftPartialString == 0) && (partialString.length() > 0)) { + setValue(key, std::move(partialString)); + partialString.clear(); + } + break; + + } + + default: + { + if ((readSize - bufPos) < sizePerType) { + // Read next block + loadNextFromFile = true; + } else { + bufPos += 4; + const size_t bytesLeftPerType = sizePerType - 4; + + if (bytesLeftPerType == 8) { + // 8-byte value type + const ESPEasy_key_value_store_8byte_data_t data_8byte(buf_start + bufPos); + setValue(storageType, key, data_8byte); + } else if (bytesLeftPerType > 0) { + if (bytesLeftPerType == 4) { + const ESPEasy_key_value_store_4byte_data_t data_4byte(buf_start + bufPos); + setValue(storageType, key, data_4byte); + } else { + ESPEasy_key_value_store_4byte_data_t data_4byte{}; + + // FIXME TD-er: Need to check the byte order + memcpy(data_4byte.getBinary(), buf_start + bufPos, bytesLeftPerType); + setValue(storageType, key, data_4byte); + } + } + bufPos += bytesLeftPerType; + } + + break; + } + } + + if ((bufPos_start_loop == bufPos) && !loadNextFromFile) { + _lastError = strformat(F("KVS: BUG! Did not increment bufPos while processing StorageType %d at readPos %d"), + static_cast(storageType), LOG_READPOS_OFFSET); + addLog(LOG_LEVEL_ERROR, _lastError); + return false; + } + readPos += (bufPos - bufPos_start_loop); + #undef LOG_READPOS_OFFSET + } + } + + // TODO TD-er: Read checksum + return true; +} // TODO TD-er: Implement -bool ESPEasy_key_value_store::store() { return false; } +bool ESPEasy_key_value_store::store(SettingsType::Enum settingsType, int index, uint32_t offset_in_block) { return false; } size_t ESPEasy_key_value_store::getStorageSize() const { @@ -57,8 +260,9 @@ size_t ESPEasy_key_value_store::getStorageSize() const for (auto it = _string_data.begin(); it != _string_data.end(); ++it) { - res += 4; // key size - res += it->second.length(); + res += 4; // key size + res += 2; // string length + res += it->second.length() + 1; // include 0-termination } for (auto it = _4byte_data.begin(); it != _4byte_data.end(); ++it) @@ -130,6 +334,18 @@ void ESPEasy_key_value_store::setValue(uint32_t key, const String& value) setHasStorageType(ESPEasy_key_value_store::StorageType::string_type); } +void ESPEasy_key_value_store::setValue(uint32_t key, String&& value) +{ + auto it = _string_data.find(key); + + if (it == _string_data.end()) { + // Does not yet exist. + _string_data.emplace(key, std::move(value)); + } else { + it->second = std::move(value); + } +} + #define GET_4BYTE_TYPE(T, GF) \ if (hasStorageType(ESPEasy_key_value_store::StorageType::T)) \ { const uint32_t combined_key = combine_StorageType_and_key( \ @@ -267,14 +483,14 @@ bool ESPEasy_key_value_store::getValue(StorageType& storageType, uint32_t key, S case ESPEasy_key_value_store::StorageType::string_type: getValue(key, value); break; - GET_4BYTE_TYPE_AS_STRING(bool_type, bool) - GET_4BYTE_TYPE_AS_STRING(int8_type, int8_t) - GET_4BYTE_TYPE_AS_STRING(uint8_type, uint8_t) - GET_4BYTE_TYPE_AS_STRING(int16_type, int16_t) - GET_4BYTE_TYPE_AS_STRING(uint16_type, uint16_t) - GET_4BYTE_TYPE_AS_STRING(int32_type, int32_t) - GET_4BYTE_TYPE_AS_STRING(uint32_type, uint32_t) - GET_4BYTE_TYPE_AS_STRING(float_type, float) + GET_4BYTE_TYPE_AS_STRING(bool_type, bool) + GET_4BYTE_TYPE_AS_STRING(int8_type, int8_t) + GET_4BYTE_TYPE_AS_STRING(uint8_type, uint8_t) + GET_4BYTE_TYPE_AS_STRING(int16_type, int16_t) + GET_4BYTE_TYPE_AS_STRING(uint16_type, uint16_t) + GET_4BYTE_TYPE_AS_STRING(int32_type, int32_t) + GET_4BYTE_TYPE_AS_STRING(uint32_type, uint32_t) + GET_4BYTE_TYPE_AS_STRING(float_type, float) case ESPEasy_key_value_store::StorageType::int64_type: { @@ -321,6 +537,62 @@ bool ESPEasy_key_value_store::getValue(StorageType& storageType, uint32_t key, S // TODO TD-er: Implement void ESPEasy_key_value_store::setValue(StorageType& storageType, uint32_t key, const String& value) {} +bool ESPEasy_key_value_store::getValue( + StorageType & storageType, + uint32_t key, + ESPEasy_key_value_store_4byte_data_t& value) const +{ + auto it = _4byte_data.find(combine_StorageType_and_key(storageType, key)); + + if (it == _4byte_data.end()) { return false; } + memcpy(value.getBinary(), it->second.getBinary(), 4); + return true; +} + +void ESPEasy_key_value_store::setValue( + StorageType & storageType, + uint32_t key, + const ESPEasy_key_value_store_4byte_data_t& value) +{ + auto combined_key = combine_StorageType_and_key(storageType, key); + auto it = _4byte_data.find(combined_key); + + if (it == _4byte_data.end()) { + // new entry + _4byte_data.emplace(combined_key, value); + } else { + memcpy(it->second.getBinary(), value.getBinary(), 4); + } +} + +bool ESPEasy_key_value_store::getValue( + StorageType & storageType, + uint32_t key, + ESPEasy_key_value_store_8byte_data_t& value) const +{ + auto it = _8byte_data.find(combine_StorageType_and_key(storageType, key)); + + if (it == _8byte_data.end()) { return false; } + memcpy(value.getBinary(), it->second.getBinary(), 8); + return true; +} + +void ESPEasy_key_value_store::setValue( + StorageType & storageType, + uint32_t key, + const ESPEasy_key_value_store_8byte_data_t& value) +{ + auto combined_key = combine_StorageType_and_key(storageType, key); + auto it = _8byte_data.find(combined_key); + + if (it == _8byte_data.end()) { + // new entry + _8byte_data.emplace(combined_key, value); + } else { + memcpy(it->second.getBinary(), value.getBinary(), 8); + } +} + bool ESPEasy_key_value_store::hasStorageType(StorageType storageType) const { const uint32_t bitnr = static_cast(storageType); @@ -338,4 +610,6 @@ void ESPEasy_key_value_store::setHasStorageType(StorageType storageType) if (bitnr < max_bitnr) { bitSet(_storage_type_present_cache, bitnr); } + + // TODO TD-er: Whenever this is called, there has been a change, so invalidate checksum } diff --git a/src/src/Helpers/_ESPEasy_key_value_store.h b/src/src/Helpers/_ESPEasy_key_value_store.h index d11d918d9..f255c3379 100644 --- a/src/src/Helpers/_ESPEasy_key_value_store.h +++ b/src/src/Helpers/_ESPEasy_key_value_store.h @@ -4,6 +4,8 @@ #include "../../ESPEasy_common.h" #include "../DataTypes/ESPEasy_key_value_store_data.h" +#include "../DataTypes/SettingsType.h" + #include // Generic storage layer, which on a low level will store everything as a string. @@ -46,8 +48,8 @@ public: }; - bool load(); // TODO TD-er: Implement - bool store(); // TODO TD-er: Implement + bool load(SettingsType::Enum settingsType, int index, uint32_t offset_in_block); + bool store(SettingsType::Enum settingsType, int index, uint32_t offset_in_block); // Count all data to estimate how much storage space it would require to store everything in a somewhat compact form. size_t getStorageSize() const; @@ -70,6 +72,8 @@ public: String & value) const; void setValue(uint32_t key, const String& value); + void setValue(uint32_t key, + String&& value); bool getValue(uint32_t key, int8_t & value) const; @@ -140,20 +144,44 @@ public: uint32_t key, const String& value); + String getLastError() const { return _lastError; } + private: + bool getValue(StorageType& storageType, + uint32_t key, + ESPEasy_key_value_store_4byte_data_t& value) const; + + void setValue(StorageType & storageType, + uint32_t key, + const ESPEasy_key_value_store_4byte_data_t& value); + + bool getValue(StorageType& storageType, + uint32_t key, + ESPEasy_key_value_store_8byte_data_t& value) const; + + void setValue(StorageType & storageType, + uint32_t key, + const ESPEasy_key_value_store_8byte_data_t& value); + + + // Query cache to see if we have any of the asked storage type bool hasStorageType(StorageType storageType) const; // Update cache to indicate we have at least one of the given storage type void setHasStorageType(StorageType storageType); - std::map_string_data{}; + String _lastError; + + std::map _string_data{}; std::map_4byte_data{}; std::map_8byte_data{}; uint32_t _storage_type_present_cache{}; + // TODO TD-er: Add checksum and invalidate whenever anyting is being stored. + }; // class ESPEasy_key_value_store #endif // ifndef HELPERS_ESPEASY_KEY_VALUE_STORE_H From 4d573f5b9787dee494eeef9413e6ee4708337d65 Mon Sep 17 00:00:00 2001 From: TD-er Date: Sun, 13 Jul 2025 18:20:41 +0200 Subject: [PATCH 110/564] [Storage] Add save function for new key/value store --- src/src/Helpers/_ESPEasy_key_value_store.cpp | 251 +++++++++++++++++-- src/src/Helpers/_ESPEasy_key_value_store.h | 2 +- 2 files changed, 230 insertions(+), 23 deletions(-) diff --git a/src/src/Helpers/_ESPEasy_key_value_store.cpp b/src/src/Helpers/_ESPEasy_key_value_store.cpp index d7700f0be..db51546c9 100644 --- a/src/src/Helpers/_ESPEasy_key_value_store.cpp +++ b/src/src/Helpers/_ESPEasy_key_value_store.cpp @@ -85,12 +85,13 @@ bool ESPEasy_key_value_store::load(SettingsType::Enum settingsType, int index, u readPos += 4; - // TODO TD-er: Compute checksum + // TODO TD-er: Compute checksum & check version - const uint8_t version = buffer[0]; - const size_t payloadSize = (buffer[1] << 16) | (buffer[2] << 8) | buffer[0]; - const size_t totalSize = 4 + payloadSize + 16; // header + payload + checksum - const size_t startChecksumPos = offset_in_block + 4 + payloadSize; + const uint8_t version = buffer[0]; + + const size_t payloadSize = (buffer[3] << 16) | (buffer[2] << 8) | buffer[1]; + const size_t totalSize = 4 + payloadSize + 16; // header + payload + checksum + const size_t startChecksumPos = offset_in_block + 4 + payloadSize; if ((offset_in_block + totalSize) > max_size) { _lastError = strformat(F("KVS: Total size %d + offset %d exceeds max size %d"), totalSize, offset_in_block, max_size); @@ -119,7 +120,11 @@ bool ESPEasy_key_value_store::load(SettingsType::Enum settingsType, int index, u bool loadNextFromFile = false; for (; !loadNextFromFile && (bufPos + 3) < readSize;) { -#define LOG_READPOS_OFFSET (readPos + (bufPos - bufPos_start_loop)) + // In this loop, only update bufPos and at the end also correct readPos + // as it might be easy to forget adding the same to both bufPos and readPos + // However in logs we might need to refer to the actual pos in the file/block + // For this the following define is used + #define LOG_READPOS_OFFSET (readPos + (bufPos - bufPos_start_loop)) const uint32_t bufPos_start_loop = bufPos; if (!bytesLeftPartialString) { @@ -129,8 +134,8 @@ bool ESPEasy_key_value_store::load(SettingsType::Enum settingsType, int index, u sizePerType = getStorageSizePerType(storageType); key = getKey_from_combined_key(combined_key.getUint32()); - if (sizePerType < 4) { - // Should not happen + if (sizePerType < 4 && storageType != ESPEasy_key_value_store::StorageType::string_type) { + // Should not happen as those should not be stored in the file _lastError = strformat(F("KVS: Invalid storage type %d at readPos %d"), static_cast(storageType), LOG_READPOS_OFFSET); addLog(LOG_LEVEL_ERROR, _lastError); return false; @@ -140,18 +145,11 @@ bool ESPEasy_key_value_store::load(SettingsType::Enum settingsType, int index, u switch (storageType) { case ESPEasy_key_value_store::StorageType::bool_false: - { - // Store bool 'false' - const bool res = false; - setValue(key, res); - bufPos += 4; - break; - } case ESPEasy_key_value_store::StorageType::bool_type: case ESPEasy_key_value_store::StorageType::bool_true: { - // Store bool 'true' - const bool res = true; + // Store bool type + const bool res = storageType != ESPEasy_key_value_store::StorageType::bool_false; setValue(key, res); bufPos += 4; break; @@ -162,7 +160,7 @@ bool ESPEasy_key_value_store::load(SettingsType::Enum settingsType, int index, u if (bytesLeftPartialString == 0) { // Found new string type // Read expected size in next 2 bytes - if ((readSize - bufPos) < 2) { + if ((readSize - bufPos) < 6) { // Read next block loadNextFromFile = true; } else { @@ -251,10 +249,219 @@ bool ESPEasy_key_value_store::load(SettingsType::Enum settingsType, int index, u return true; } -// TODO TD-er: Implement -bool ESPEasy_key_value_store::store(SettingsType::Enum settingsType, int index, uint32_t offset_in_block) { return false; } +bool ESPEasy_key_value_store::store(SettingsType::Enum settingsType, int index, uint32_t offset_in_block) +{ + // FIXME TD-er: Must add some check to see if the existing data has changed before saving. + int offset, max_size; -size_t ESPEasy_key_value_store::getStorageSize() const + if (!SettingsType::getSettingsParameters(settingsType, index, offset, max_size)) + { + _lastError = F("KVS: Invalid index"); + #ifndef BUILD_NO_DEBUG + addLog(LOG_LEVEL_DEBUG, _lastError); + #endif // ifndef BUILD_NO_DEBUG + return false; + } + + #ifdef ESP8266 + uint16_t bufferSize = 256; + #endif // ifdef ESP8266 + #ifdef ESP32 + uint16_t bufferSize = 1024; + #endif // ifdef ESP32 + + if (bufferSize > max_size) { + bufferSize = max_size; + } + + std::vector buffer; + buffer.resize(bufferSize, 0); + uint8_t*buf_start = &(buffer[0]); + + String result; + + int writePos = offset_in_block; + int bufPos = 0; + + // Write header + buffer[bufPos++] = 0; // TODO TD-er: Add version + const size_t payloadSize = getPayloadStorageSize(); + const size_t totalSize = 4 + payloadSize + 16; // header + payload + checksum + const size_t startChecksumPos = offset_in_block + 4 + payloadSize; + + if ((offset_in_block + totalSize) > max_size) { + _lastError = strformat(F("KVS: Total size %d + offset %d exceeds max size %d"), totalSize, offset_in_block, max_size); + #ifndef BUILD_NO_DEBUG + addLog(LOG_LEVEL_DEBUG, _lastError); + #endif // ifndef BUILD_NO_DEBUG + return false; + } + + buffer[bufPos++] = payloadSize & 0xFF; + buffer[bufPos++] = (payloadSize >> 8) & 0xFF; + buffer[bufPos++] = (payloadSize >> 16) & 0xFF; + + bool mustFlushToFile = false; + auto it_str = _string_data.begin(); + auto it_4byte = _4byte_data.begin(); + auto it_8byte = _8byte_data.begin(); + int pos_in_partial_string = -1; + + while (writePos < startChecksumPos) { + if (it_str != _string_data.end()) { + // Write strings + + /* + const size_t expectedSize = + 4 + // key + 2 + // length + it_str->second.length() // string + + 1; // nul-terminator + */ + const uint16_t strLength = it_str->second.length(); + + if (pos_in_partial_string == -1) { + // Need to write key + length + if ((buffer.size() - bufPos) < 6) { + mustFlushToFile = true; + } else { + ESPEasy_key_value_store_4byte_data_t key_data; + key_data.setUint32(it_str->first); + memcpy(buf_start + bufPos, key_data.getBinary(), 4); + bufPos += 4; + buffer[bufPos++] = strLength >> 8; + buffer[bufPos++] = strLength & 0xFF; + + // Now we're at the start of the string + pos_in_partial_string = 0; + } + } + + if (!mustFlushToFile) { + mustFlushToFile = bufPos == buffer.size(); + + while (pos_in_partial_string >= 0 && + pos_in_partial_string < strLength && + !mustFlushToFile) + { + buffer[bufPos++] = it_str->second[pos_in_partial_string]; + ++pos_in_partial_string; + mustFlushToFile = bufPos == buffer.size(); + } + + if ((pos_in_partial_string == strLength) && + !mustFlushToFile) + { + // Write 0-termination + move to next string + buffer[bufPos++] = 0; + pos_in_partial_string = -1; + ++it_str; + } + } + + } else if (it_8byte != _8byte_data.end()) { + // Write 8-byte data + if ((buffer.size() - bufPos) < 12) { + mustFlushToFile = true; + } else { + ESPEasy_key_value_store_4byte_data_t key_data; + key_data.setUint32(it_8byte->first); + memcpy(buf_start + bufPos, key_data.getBinary(), 4); + bufPos += 4; + + memcpy(buf_start + bufPos, it_8byte->second.getBinary(), 8); + bufPos += 8; + ++it_8byte; + } + + } else if (it_4byte != _4byte_data.end()) { + // Write 4-byte data + uint32_t combined_key = it_4byte->first; + ESPEasy_key_value_store::StorageType storageType = get_StorageType_from_combined_key(combined_key); + const uint32_t key = getKey_from_combined_key(combined_key); + const size_t sizePerType = getStorageSizePerType(storageType); + + if (sizePerType >= 4) { + if ((buffer.size() - bufPos) < sizePerType) { + mustFlushToFile = true; + } else { + + switch (storageType) + { + case ESPEasy_key_value_store::StorageType::bool_false: + case ESPEasy_key_value_store::StorageType::bool_true: + case ESPEasy_key_value_store::StorageType::bool_type: + { + bool value{}; + getValue(key, value); + combined_key = combine_StorageType_and_key( + value + ? ESPEasy_key_value_store::StorageType::bool_true + : ESPEasy_key_value_store::StorageType::bool_false + , key); + break; + } + default: + break; + + } + ESPEasy_key_value_store_4byte_data_t key_data; + key_data.setUint32(combined_key); + memcpy(buf_start + bufPos, key_data.getBinary(), 4); + bufPos += 4; + + const size_t bytesLeftPerType = sizePerType - 4; + + if (bytesLeftPerType != 0) { + if (bytesLeftPerType == 4) { + memcpy(buf_start + bufPos, it_4byte->second.getBinary(), bytesLeftPerType); + } else { + // FIXME TD-er: Need to check the byte order + memcpy(buf_start + bufPos, it_4byte->second.getBinary(), bytesLeftPerType); + } + bufPos += bytesLeftPerType; + ++it_4byte; + } + + } + } else { + _lastError = strformat(F("KVS: BUG! Should not have storage type %d stored with 0 bytes at writePos %d"), + static_cast(storageType), writePos + bufPos); + addLog(LOG_LEVEL_ERROR, _lastError); + return false; + } + } else { + mustFlushToFile = true; + } + + if (mustFlushToFile) { + result += SaveToFile(settingsType, index, buf_start, bufPos, writePos); + writePos += bufPos; + mustFlushToFile = false; + bufPos = 0; + + for (size_t i = 0; i < buffer.size(); ++i) { + buffer[i] = 0; + } + } + } + + if (bufPos) { + + // Some kind of error??? We should be done and + // writePos should be equal to startChecksumPos + + result += SaveToFile(settingsType, index, buf_start, bufPos, writePos); + writePos += bufPos; + mustFlushToFile = false; + bufPos = 0; + } + + + return true; +} + +size_t ESPEasy_key_value_store::getPayloadStorageSize() const { size_t res{}; @@ -290,7 +497,7 @@ bool ESPEasy_key_value_store::hasKey(StorageType storageType, uint32_t key) cons const uint32_t combined_key = combine_StorageType_and_key(storageType, key); const size_t size = getStorageSizePerType(storageType); - if (size > 8) + if (size == 12) { return _8byte_data.find(key) != _8byte_data.end(); } diff --git a/src/src/Helpers/_ESPEasy_key_value_store.h b/src/src/Helpers/_ESPEasy_key_value_store.h index f255c3379..0bf64e393 100644 --- a/src/src/Helpers/_ESPEasy_key_value_store.h +++ b/src/src/Helpers/_ESPEasy_key_value_store.h @@ -52,7 +52,7 @@ public: bool store(SettingsType::Enum settingsType, int index, uint32_t offset_in_block); // Count all data to estimate how much storage space it would require to store everything in a somewhat compact form. - size_t getStorageSize() const; + size_t getPayloadStorageSize() const; // Check to see if there is a key stored with given storage type bool hasKey(StorageType storageType, From 252d632365a5e9ed15fcafbec212610481b2d47f Mon Sep 17 00:00:00 2001 From: TD-er Date: Sun, 13 Jul 2025 23:54:44 +0200 Subject: [PATCH 111/564] [Network] Add NetworkSettings type to store network interface settings --- src/src/Commands/Provisioning.cpp | 4 +++- src/src/CustomBuild/StorageLayout.h | 16 ++++++++++++++++ src/src/CustomBuild/define_plugin_sets.h | 12 ++++++++++++ src/src/DataTypes/SettingsType.cpp | 22 ++++++++++++++++++++++ src/src/DataTypes/SettingsType.h | 2 ++ src/src/Helpers/StringGenerator_GPIO.cpp | 2 +- 6 files changed, 56 insertions(+), 2 deletions(-) diff --git a/src/src/Commands/Provisioning.cpp b/src/src/Commands/Provisioning.cpp index ce7ba429a..0746d2478 100644 --- a/src/src/Commands/Provisioning.cpp +++ b/src/src/Commands/Provisioning.cpp @@ -102,6 +102,9 @@ String Command_Provisioning_NotificationFallback(struct EventStruct *event, cons return Command_Provisioning_Notification(); } +# endif // if FEATURE_NOTIFIER + + String Command_Provisioning_ProvisionFallback(struct EventStruct *event, const char *Line) { Command_Provisioning_DeprecatedMessage(F("Provision")); @@ -130,7 +133,6 @@ String Command_Provisioning_FirmwareFallback(struct EventStruct *event, const ch return error; } -# endif // if FEATURE_NOTIFIER # endif // ifdef PLUGIN_BUILD_MAX_ESP32 diff --git a/src/src/CustomBuild/StorageLayout.h b/src/src/CustomBuild/StorageLayout.h index 5b78641a0..6c10cb95f 100644 --- a/src/src/CustomBuild/StorageLayout.h +++ b/src/src/CustomBuild/StorageLayout.h @@ -130,6 +130,11 @@ #endif +#ifndef DAT_NETWORK_INTERFACE_SIZE +# define DAT_NETWORK_INTERFACE_SIZE 1024 +#endif + + /* @@ -218,6 +223,17 @@ # ifndef CONFIG_FILE_SIZE # define CONFIG_FILE_SIZE (DAT_OFFSET_TASKS + ((DAT_TASKS_SIZE + DAT_TASKS_CUSTOM_SIZE) * TASKS_MAX)) # endif // ifndef CONFIG_FILE_SIZE + + // On ESP8266 we will not store Network Interface settings + // The only 2 interfaces supported on ESP8266 are: + // - WiFi STA + // - WiFi AP + // Both do not need extra settings for basic functionality + // All other network interface plugins will be ESP32-only. + # ifndef DAT_NETWORK_INTERFACES_OFFSET + # define DAT_NETWORK_INTERFACES_OFFSET 16384 + # endif // ifndef DAT_OFFSET_CUSTOM_CONTROLLER + #endif // if defined(ESP32) diff --git a/src/src/CustomBuild/define_plugin_sets.h b/src/src/CustomBuild/define_plugin_sets.h index 47fe6d4fd..e661540ab 100644 --- a/src/src/CustomBuild/define_plugin_sets.h +++ b/src/src/CustomBuild/define_plugin_sets.h @@ -3880,4 +3880,16 @@ To create/register a plugin, you have to : #endif + +#if defined(USES_NW003) || defined(USES_NW004) || defined(USES_NW005) +# ifndef FEATURE_STORE_NETWORK_INTERFACE_SETTINGS +# define FEATURE_STORE_NETWORK_INTERFACE_SETTINGS 1 +# endif +#else +# ifdef FEATURE_STORE_NETWORK_INTERFACE_SETTINGS +# undef FEATURE_STORE_NETWORK_INTERFACE_SETTINGS +# endif +# define FEATURE_STORE_NETWORK_INTERFACE_SETTINGS 0 +#endif + #endif // CUSTOMBUILD_DEFINE_PLUGIN_SETS_H \ No newline at end of file diff --git a/src/src/DataTypes/SettingsType.cpp b/src/src/DataTypes/SettingsType.cpp index 52ddaf8f6..9859495a0 100644 --- a/src/src/DataTypes/SettingsType.cpp +++ b/src/src/DataTypes/SettingsType.cpp @@ -27,6 +27,9 @@ const __FlashStringHelper * SettingsType::getSettingsTypeString(Enum settingsTyp #if FEATURE_ALTERNATIVE_CDN_URL case Enum::CdnSettings_Type: return F("CDN_url"); #endif +#if FEATURE_STORE_NETWORK_INTERFACE_SETTINGS + case Enum::NetworkInterfaceSettings_Type: return F("NetworkInterface"); +#endif case Enum::SettingsType_MAX: break; } @@ -118,6 +121,18 @@ bool SettingsType::getSettingsParameters(Enum settingsType, int index, int& max_ struct_size = 0; break; } +#if FEATURE_STORE_NETWORK_INTERFACE_SETTINGS + case Enum::NetworkInterfaceSettings_Type: + { + max_index = NETWORK_MAX; + offset = DAT_NETWORK_INTERFACES_OFFSET + index * (DAT_NETWORK_INTERFACE_SIZE); + max_size = DAT_NETWORK_INTERFACE_SIZE; + + // struct_size may differ. + struct_size = 0; + break; + } +#endif #if FEATURE_ALTERNATIVE_CDN_URL case Enum::CdnSettings_Type: { @@ -195,6 +210,10 @@ unsigned int SettingsType::getSVGcolor(Enum settingsType) { return 0xFAC05E; case Enum::NotificationSettings_Type: return 0xF79D84; +#if FEATURE_STORE_NETWORK_INTERFACE_SETTINGS + case Enum::NetworkInterfaceSettings_Type: + return 0x84F79D; +#endif case Enum::SecuritySettings_Type: return 0xff00a2; @@ -223,7 +242,10 @@ SettingsType::SettingsFileEnum SettingsType::getSettingsFile(Enum settingsType) #if FEATURE_ALTERNATIVE_CDN_URL case Enum::CdnSettings_Type: #endif +#if FEATURE_STORE_NETWORK_INTERFACE_SETTINGS + case Enum::NetworkInterfaceSettings_Type: return SettingsFileEnum::FILE_CONFIG_type; +#endif case Enum::NotificationSettings_Type: return SettingsFileEnum::FILE_NOTIFICATION_type; case Enum::SecuritySettings_Type: diff --git a/src/src/DataTypes/SettingsType.h b/src/src/DataTypes/SettingsType.h index 5030e2f7c..e0be3cea8 100644 --- a/src/src/DataTypes/SettingsType.h +++ b/src/src/DataTypes/SettingsType.h @@ -19,6 +19,8 @@ public: #if FEATURE_ALTERNATIVE_CDN_URL CdnSettings_Type, #endif + NetworkInterfaceSettings_Type, + SettingsType_MAX }; diff --git a/src/src/Helpers/StringGenerator_GPIO.cpp b/src/src/Helpers/StringGenerator_GPIO.cpp index e54345c0b..fd43a5b9a 100644 --- a/src/src/Helpers/StringGenerator_GPIO.cpp +++ b/src/src/Helpers/StringGenerator_GPIO.cpp @@ -183,7 +183,7 @@ const __FlashStringHelper* getConflictingUse(int gpio, PinSelectPurpose purpose, if (gpio == PIN_USB_D_PLUS) { return F("USB_D+"); } #endif - if (isFlashInterfacePin_ESPEasy(gpio)) { + if (!ignorePSRAMpins && isFlashInterfacePin_ESPEasy(gpio)) { return F("Flash"); } From 64f66e35f140b1777f87a674c5e21c29739fae93 Mon Sep 17 00:00:00 2001 From: TD-er Date: Mon, 14 Jul 2025 14:08:03 +0200 Subject: [PATCH 112/564] [Network] Fix build issues --- src/_NW001_WiFi_STA.cpp | 2 +- src/_NW002_WiFi_AP.cpp | 2 +- src/src/Commands/InternalCommands.cpp | 2 +- src/src/Commands/InternalCommands_decoder.cpp | 2 +- src/src/Commands/InternalCommands_decoder.h | 2 +- src/src/Commands/WiFi.cpp | 2 +- src/src/Commands/WiFi.h | 2 +- src/src/CustomBuild/define_plugin_sets.h | 6 ++++++ src/src/DataStructs/GpioFactorySettingsStruct.cpp | 4 ++++ src/src/DataStructs/GpioFactorySettingsStruct.h | 8 ++++++++ src/src/DataStructs/SettingsStruct.h | 5 +++++ src/src/DataTypes/EthernetParameters.cpp | 3 +++ src/src/DataTypes/EthernetParameters.h | 3 ++- src/src/DataTypes/EthernetParameters_ESP32.cpp | 2 +- src/src/DataTypes/EthernetParameters_ESP32P4.cpp | 2 +- src/src/DataTypes/SettingsType.h | 2 ++ src/src/Helpers/_ESPEasy_key_value_store.cpp | 8 ++++---- src/src/WebServer/NetworkPage.cpp | 3 ++- 18 files changed, 45 insertions(+), 15 deletions(-) diff --git a/src/_NW001_WiFi_STA.cpp b/src/_NW001_WiFi_STA.cpp index e88193add..06d4a80ef 100644 --- a/src/_NW001_WiFi_STA.cpp +++ b/src/_NW001_WiFi_STA.cpp @@ -44,7 +44,7 @@ bool NWPlugin_001(NWPlugin::Function function, struct EventStruct *event, String { case NWPlugin::Function::NWPLUGIN_DRIVER_ADD: { - NetworkDriverStruct& nw = getNetworkDriverStruct(networkDriverIndex_t::toNetworkDriverIndex(event->idx)); +// NetworkDriverStruct& nw = getNetworkDriverStruct(networkDriverIndex_t::toNetworkDriverIndex(event->idx)); break; } diff --git a/src/_NW002_WiFi_AP.cpp b/src/_NW002_WiFi_AP.cpp index b77c01e39..da7ac436f 100644 --- a/src/_NW002_WiFi_AP.cpp +++ b/src/_NW002_WiFi_AP.cpp @@ -39,7 +39,7 @@ bool NWPlugin_002(NWPlugin::Function function, struct EventStruct *event, String { case NWPlugin::Function::NWPLUGIN_DRIVER_ADD: { - NetworkDriverStruct& nw = getNetworkDriverStruct(networkDriverIndex_t::toNetworkDriverIndex(event->idx)); +// NetworkDriverStruct& nw = getNetworkDriverStruct(networkDriverIndex_t::toNetworkDriverIndex(event->idx)); break; } diff --git a/src/src/Commands/InternalCommands.cpp b/src/src/Commands/InternalCommands.cpp index be651dc51..d34b6177b 100644 --- a/src/src/Commands/InternalCommands.cpp +++ b/src/src/Commands/InternalCommands.cpp @@ -485,7 +485,7 @@ bool InternalCommands::executeInternalCommand() case ESPEasy_cmd_e::wifikey: COMMAND_CASE_R(Command_Wifi_Key, 1); // WiFi.h case ESPEasy_cmd_e::wifikey2: COMMAND_CASE_R(Command_Wifi_Key2, 1); // WiFi.h case ESPEasy_cmd_e::wifimode: COMMAND_CASE_R(Command_Wifi_Mode, 1); // WiFi.h -# ifndef SOC_WIFI_SUPPORTED +#if FEATURE_OTA_FW_UPDATE_ESP_HOSTED_MCU case ESPEasy_cmd_e::wifiotahostedmcu: COMMAND_CASE_R(Command_Wifi_OTA_hosted_mcu, 1); // WiFi.h #endif case ESPEasy_cmd_e::wifiscan: COMMAND_CASE_R(Command_Wifi_Scan, 0); // WiFi.h diff --git a/src/src/Commands/InternalCommands_decoder.cpp b/src/src/Commands/InternalCommands_decoder.cpp index 4a60994eb..d5bd354ac 100644 --- a/src/src/Commands/InternalCommands_decoder.cpp +++ b/src/src/Commands/InternalCommands_decoder.cpp @@ -292,7 +292,7 @@ const char Internal_commands_w[] PROGMEM = "wifikey|" "wifikey2|" "wifimode|" -# ifndef SOC_WIFI_SUPPORTED +#if FEATURE_OTA_FW_UPDATE_ESP_HOSTED_MCU "wifiotahostedmcu|" #endif "wifiscan|" diff --git a/src/src/Commands/InternalCommands_decoder.h b/src/src/Commands/InternalCommands_decoder.h index df56a0eb0..fa16e14f8 100644 --- a/src/src/Commands/InternalCommands_decoder.h +++ b/src/src/Commands/InternalCommands_decoder.h @@ -237,7 +237,7 @@ enum class ESPEasy_cmd_e : uint8_t { wifikey, wifikey2, wifimode, -# ifndef SOC_WIFI_SUPPORTED +#if FEATURE_OTA_FW_UPDATE_ESP_HOSTED_MCU wifiotahostedmcu, #endif wifiscan, diff --git a/src/src/Commands/WiFi.cpp b/src/src/Commands/WiFi.cpp index 0cb8ad69a..3552f6c3b 100644 --- a/src/src/Commands/WiFi.cpp +++ b/src/src/Commands/WiFi.cpp @@ -152,7 +152,7 @@ const __FlashStringHelper* Command_WiFi_Erase(struct EventStruct *event, const c } -# ifdef ESP32P4 +#if FEATURE_OTA_FW_UPDATE_ESP_HOSTED_MCU # include "esp_hosted.h" // Perform OTA update on the esp-hosted-mcu firmware of the external WiFi module (typically ESP32-C6) diff --git a/src/src/Commands/WiFi.h b/src/src/Commands/WiFi.h index eae0251bf..41582e0b9 100644 --- a/src/src/Commands/WiFi.h +++ b/src/src/Commands/WiFi.h @@ -36,7 +36,7 @@ const __FlashStringHelper* Command_Wifi_AllowAP(struct EventStruct *event, const __FlashStringHelper* Command_WiFi_Erase(struct EventStruct *event, const char *Line); -# ifndef SOC_WIFI_SUPPORTED +#if FEATURE_OTA_FW_UPDATE_ESP_HOSTED_MCU // Perform OTA update on the esp-hosted-mcu firmware of the external WiFi module (typically ESP32-C6) String Command_Wifi_OTA_hosted_mcu(struct EventStruct *event, const char *Line); diff --git a/src/src/CustomBuild/define_plugin_sets.h b/src/src/CustomBuild/define_plugin_sets.h index e661540ab..a383edb65 100644 --- a/src/src/CustomBuild/define_plugin_sets.h +++ b/src/src/CustomBuild/define_plugin_sets.h @@ -3880,6 +3880,12 @@ To create/register a plugin, you have to : #endif +#if !defined(SOC_WIFI_SUPPORTED) && defined(ESP32) +#define FEATURE_OTA_FW_UPDATE_ESP_HOSTED_MCU 1 +#else +#define FEATURE_OTA_FW_UPDATE_ESP_HOSTED_MCU 0 +#endif + #if defined(USES_NW003) || defined(USES_NW004) || defined(USES_NW005) # ifndef FEATURE_STORE_NETWORK_INTERFACE_SETTINGS diff --git a/src/src/DataStructs/GpioFactorySettingsStruct.cpp b/src/src/DataStructs/GpioFactorySettingsStruct.cpp index a511f9267..f42a7f6da 100644 --- a/src/src/DataStructs/GpioFactorySettingsStruct.cpp +++ b/src/src/DataStructs/GpioFactorySettingsStruct.cpp @@ -8,11 +8,15 @@ GpioFactorySettingsStruct::GpioFactorySettingsStruct(DeviceModel model) i2c_sda(DEFAULT_PIN_I2C_SDA), i2c_scl(DEFAULT_PIN_I2C_SCL), eth_phyaddr(DEFAULT_ETH_PHY_ADDR), +#if FEATURE_ETHERNET eth_phytype(DEFAULT_ETH_PHY_TYPE), +#endif eth_mdc(DEFAULT_ETH_PIN_MDC), eth_mdio(DEFAULT_ETH_PIN_MDIO), eth_power(DEFAULT_ETH_PIN_POWER), +#if FEATURE_ETHERNET eth_clock_mode(DEFAULT_ETH_CLOCK_MODE), +#endif network_medium(DEFAULT_NETWORK_MEDIUM) { diff --git a/src/src/DataStructs/GpioFactorySettingsStruct.h b/src/src/DataStructs/GpioFactorySettingsStruct.h index bb54c84ff..79ef3daf6 100644 --- a/src/src/DataStructs/GpioFactorySettingsStruct.h +++ b/src/src/DataStructs/GpioFactorySettingsStruct.h @@ -16,11 +16,19 @@ struct GpioFactorySettingsStruct { int8_t i2c_sda; int8_t i2c_scl; int8_t eth_phyaddr; +#if FEATURE_ETHERNET EthPhyType_t eth_phytype; +#else + uint8_t eth_phytype{}; +#endif int8_t eth_mdc; int8_t eth_mdio; int8_t eth_power; +#if FEATURE_ETHERNET EthClockMode_t eth_clock_mode; +#else + uint8_t eth_clock_mode{}; +#endif NetworkMedium_t network_medium; }; diff --git a/src/src/DataStructs/SettingsStruct.h b/src/src/DataStructs/SettingsStruct.h index 3e98a1b9a..51a7cb387 100644 --- a/src/src/DataStructs/SettingsStruct.h +++ b/src/src/DataStructs/SettingsStruct.h @@ -573,8 +573,13 @@ public: int8_t ETH_Pin_mdc_cs = -1; int8_t ETH_Pin_mdio_irq = -1; int8_t ETH_Pin_power_rst = -1; +#if FEATURE_ETHERNET EthPhyType_t ETH_Phy_Type = EthPhyType_t::notSet; EthClockMode_t ETH_Clock_Mode = static_cast(0); +#else + uint8_t ETH_Phy_Type{}; + uint8_t ETH_Clock_Mode{}; +#endif uint8_t ETH_IP[4] = {0}; uint8_t ETH_Gateway[4] = {0}; uint8_t ETH_Subnet[4] = {0}; diff --git a/src/src/DataTypes/EthernetParameters.cpp b/src/src/DataTypes/EthernetParameters.cpp index 2b27a9971..07777cb88 100644 --- a/src/src/DataTypes/EthernetParameters.cpp +++ b/src/src/DataTypes/EthernetParameters.cpp @@ -1,5 +1,7 @@ #include "../DataTypes/EthernetParameters.h" +#if FEATURE_ETHERNET + bool isValid(EthPhyType_t phyType) { switch (phyType) { @@ -121,3 +123,4 @@ const __FlashStringHelper* toString(EthPhyType_t phyType) { } return F("- None -"); } +#endif \ No newline at end of file diff --git a/src/src/DataTypes/EthernetParameters.h b/src/src/DataTypes/EthernetParameters.h index db4053e9d..b2b685a6e 100644 --- a/src/src/DataTypes/EthernetParameters.h +++ b/src/src/DataTypes/EthernetParameters.h @@ -3,6 +3,7 @@ #include "../../ESPEasy_common.h" +#if FEATURE_ETHERNET // Is stored in settings #ifdef ESP32P4 @@ -78,5 +79,5 @@ eth_phy_type_t to_ESP_phy_type(EthPhyType_t phyType); const __FlashStringHelper * toString(EthPhyType_t phyType); - +#endif #endif // DATASTRUCTS_ETHERNETPARAMETERS_H diff --git a/src/src/DataTypes/EthernetParameters_ESP32.cpp b/src/src/DataTypes/EthernetParameters_ESP32.cpp index 5125d1bcb..98ab8aefd 100644 --- a/src/src/DataTypes/EthernetParameters_ESP32.cpp +++ b/src/src/DataTypes/EthernetParameters_ESP32.cpp @@ -1,7 +1,7 @@ #include "../DataTypes/EthernetParameters.h" -#if CONFIG_IDF_TARGET_ESP32 +#if CONFIG_IDF_TARGET_ESP32 && FEATURE_ETHERNET bool isValid(EthClockMode_t clockMode) { switch (clockMode) diff --git a/src/src/DataTypes/EthernetParameters_ESP32P4.cpp b/src/src/DataTypes/EthernetParameters_ESP32P4.cpp index 0b025849f..0c3575575 100644 --- a/src/src/DataTypes/EthernetParameters_ESP32P4.cpp +++ b/src/src/DataTypes/EthernetParameters_ESP32P4.cpp @@ -1,7 +1,7 @@ #include "../DataTypes/EthernetParameters.h" -#if CONFIG_IDF_TARGET_ESP32P4 +#if CONFIG_IDF_TARGET_ESP32P4 && FEATURE_ETHERNET # include diff --git a/src/src/DataTypes/SettingsType.h b/src/src/DataTypes/SettingsType.h index e0be3cea8..37fd2982c 100644 --- a/src/src/DataTypes/SettingsType.h +++ b/src/src/DataTypes/SettingsType.h @@ -19,7 +19,9 @@ public: #if FEATURE_ALTERNATIVE_CDN_URL CdnSettings_Type, #endif +#if FEATURE_STORE_NETWORK_INTERFACE_SETTINGS NetworkInterfaceSettings_Type, +#endif SettingsType_MAX diff --git a/src/src/Helpers/_ESPEasy_key_value_store.cpp b/src/src/Helpers/_ESPEasy_key_value_store.cpp index db51546c9..e49eac1e6 100644 --- a/src/src/Helpers/_ESPEasy_key_value_store.cpp +++ b/src/src/Helpers/_ESPEasy_key_value_store.cpp @@ -93,7 +93,7 @@ bool ESPEasy_key_value_store::load(SettingsType::Enum settingsType, int index, u const size_t totalSize = 4 + payloadSize + 16; // header + payload + checksum const size_t startChecksumPos = offset_in_block + 4 + payloadSize; - if ((offset_in_block + totalSize) > max_size) { + if ((offset_in_block + totalSize) > static_cast(max_size)) { _lastError = strformat(F("KVS: Total size %d + offset %d exceeds max size %d"), totalSize, offset_in_block, max_size); #ifndef BUILD_NO_DEBUG addLog(LOG_LEVEL_DEBUG, _lastError); @@ -280,8 +280,8 @@ bool ESPEasy_key_value_store::store(SettingsType::Enum settingsType, int index, String result; - int writePos = offset_in_block; - int bufPos = 0; + size_t writePos = offset_in_block; + size_t bufPos = 0; // Write header buffer[bufPos++] = 0; // TODO TD-er: Add version @@ -289,7 +289,7 @@ bool ESPEasy_key_value_store::store(SettingsType::Enum settingsType, int index, const size_t totalSize = 4 + payloadSize + 16; // header + payload + checksum const size_t startChecksumPos = offset_in_block + 4 + payloadSize; - if ((offset_in_block + totalSize) > max_size) { + if ((offset_in_block + totalSize) > static_cast(max_size)) { _lastError = strformat(F("KVS: Total size %d + offset %d exceeds max size %d"), totalSize, offset_in_block, max_size); #ifndef BUILD_NO_DEBUG addLog(LOG_LEVEL_DEBUG, _lastError); diff --git a/src/src/WebServer/NetworkPage.cpp b/src/src/WebServer/NetworkPage.cpp index 4c7a8d8c6..96b57f697 100644 --- a/src/src/WebServer/NetworkPage.cpp +++ b/src/src/WebServer/NetworkPage.cpp @@ -310,7 +310,7 @@ void handle_networks_NetworkSettingsPage(networkIndex_t networkindex) { String str; NWPluginCall_(networkDriverIndex, NWPlugin::Function::NWPLUGIN_WEBFORM_LOAD, &TempEvent, str); - +#ifdef ESP32 if (NWPluginCall_(networkDriverIndex, NWPlugin::Function::NWPLUGIN_GET_INTERFACE, &TempEvent, str)) { { @@ -384,6 +384,7 @@ void handle_networks_NetworkSettingsPage(networkIndex_t networkindex) { } } } +#endif addFormSeparator(2); From 6c974ddf9c8491975e17239b6e4db617e3d19b64 Mon Sep 17 00:00:00 2001 From: TD-er Date: Mon, 14 Jul 2025 14:14:27 +0200 Subject: [PATCH 113/564] [Network] Uncrustify new code --- src/_NW001_WiFi_STA.cpp | 2 +- .../ESPEasy_key_value_store_4byte_data.cpp | 2 +- .../ESPEasy_key_value_store_8byte_data.cpp | 3 +- .../DataTypes/ESPEasy_key_value_store_data.h | 14 +-- src/src/DataTypes/EthernetParameters.cpp | 97 ++++++++++--------- src/src/DataTypes/EthernetParameters.h | 94 +++++++++--------- src/src/Helpers/_ESPEasy_key_value_store.cpp | 2 +- src/src/Helpers/_ESPEasy_key_value_store.h | 29 +++--- 8 files changed, 127 insertions(+), 116 deletions(-) diff --git a/src/_NW001_WiFi_STA.cpp b/src/_NW001_WiFi_STA.cpp index 06d4a80ef..ddca2cb5c 100644 --- a/src/_NW001_WiFi_STA.cpp +++ b/src/_NW001_WiFi_STA.cpp @@ -182,7 +182,7 @@ bool NWPlugin_001(NWPlugin::Function function, struct EventStruct *event, String # ifdef ESP32P4 { addRowLabel(F("ESP Hosted Firmware")); - esp_hosted_coprocessor_fwver_t ver_info; + esp_hosted_coprocessor_fwver_t ver_info{}; esp_hosted_get_coprocessor_fwversion(&ver_info); addHtml(strformat( F("%d.%d.%d"), diff --git a/src/src/DataTypes/ESPEasy_key_value_store_4byte_data.cpp b/src/src/DataTypes/ESPEasy_key_value_store_4byte_data.cpp index 9edf8ad9e..dedc91e31 100644 --- a/src/src/DataTypes/ESPEasy_key_value_store_4byte_data.cpp +++ b/src/src/DataTypes/ESPEasy_key_value_store_4byte_data.cpp @@ -11,7 +11,7 @@ ESPEasy_key_value_store_4byte_data_t::ESPEasy_key_value_store_4byte_data_t(const memcpy(binary, other.binary, sizeof(binary)); } -ESPEasy_key_value_store_4byte_data_t::ESPEasy_key_value_store_4byte_data_t(const uint8_t* data) +ESPEasy_key_value_store_4byte_data_t::ESPEasy_key_value_store_4byte_data_t(const uint8_t*data) { memcpy(binary, data, sizeof(binary)); } diff --git a/src/src/DataTypes/ESPEasy_key_value_store_8byte_data.cpp b/src/src/DataTypes/ESPEasy_key_value_store_8byte_data.cpp index 0db9d848c..31ead0757 100644 --- a/src/src/DataTypes/ESPEasy_key_value_store_8byte_data.cpp +++ b/src/src/DataTypes/ESPEasy_key_value_store_8byte_data.cpp @@ -11,12 +11,11 @@ ESPEasy_key_value_store_8byte_data_t::ESPEasy_key_value_store_8byte_data_t(const memcpy(binary, other.binary, sizeof(binary)); } -ESPEasy_key_value_store_8byte_data_t::ESPEasy_key_value_store_8byte_data_t(const uint8_t* data) +ESPEasy_key_value_store_8byte_data_t::ESPEasy_key_value_store_8byte_data_t(const uint8_t*data) { memcpy(binary, data, sizeof(binary)); } - ESPEasy_key_value_store_8byte_data_t& ESPEasy_key_value_store_8byte_data_t::operator=(const ESPEasy_key_value_store_8byte_data_t& other) { memcpy(binary, other.binary, sizeof(binary)); diff --git a/src/src/DataTypes/ESPEasy_key_value_store_data.h b/src/src/DataTypes/ESPEasy_key_value_store_data.h index b751192cc..9fd60e3ff 100644 --- a/src/src/DataTypes/ESPEasy_key_value_store_data.h +++ b/src/src/DataTypes/ESPEasy_key_value_store_data.h @@ -12,7 +12,7 @@ public: ESPEasy_key_value_store_4byte_data_t(const ESPEasy_key_value_store_4byte_data_t& other); - ESPEasy_key_value_store_4byte_data_t(const uint8_t* data); + ESPEasy_key_value_store_4byte_data_t(const uint8_t*data); ESPEasy_key_value_store_4byte_data_t& operator=(const ESPEasy_key_value_store_4byte_data_t& other); @@ -28,8 +28,9 @@ public: float getFloat() const; void setFloat(float value); - uint8_t* getBinary() { return binary; } - const uint8_t* getBinary() const { return binary; } + uint8_t* getBinary() { return binary; } + + const uint8_t* getBinary() const { return binary; } private: @@ -45,7 +46,7 @@ public: ESPEasy_key_value_store_8byte_data_t(const ESPEasy_key_value_store_8byte_data_t& other); - ESPEasy_key_value_store_8byte_data_t(const uint8_t* data); + ESPEasy_key_value_store_8byte_data_t(const uint8_t*data); ESPEasy_key_value_store_8byte_data_t& operator=(const ESPEasy_key_value_store_8byte_data_t& other); @@ -61,8 +62,9 @@ public: double getDouble() const; void setDouble(double value); - uint8_t* getBinary() { return binary; } - const uint8_t* getBinary() const { return binary; } + uint8_t* getBinary() { return binary; } + + const uint8_t* getBinary() const { return binary; } private: diff --git a/src/src/DataTypes/EthernetParameters.cpp b/src/src/DataTypes/EthernetParameters.cpp index 07777cb88..a0ef6742c 100644 --- a/src/src/DataTypes/EthernetParameters.cpp +++ b/src/src/DataTypes/EthernetParameters.cpp @@ -5,117 +5,117 @@ bool isValid(EthPhyType_t phyType) { switch (phyType) { -#if CONFIG_ETH_USE_ESP32_EMAC +# if CONFIG_ETH_USE_ESP32_EMAC case EthPhyType_t::LAN8720: case EthPhyType_t::TLK110: case EthPhyType_t::RTL8201: -# if ETH_TYPE_JL1101_SUPPORTED +# if ETH_TYPE_JL1101_SUPPORTED case EthPhyType_t::JL1101: -# endif +# endif case EthPhyType_t::DP83848: case EthPhyType_t::KSZ8041: case EthPhyType_t::KSZ8081: return true; -#endif // if CONFIG_ETH_USE_ESP32_EMAC +# endif // if CONFIG_ETH_USE_ESP32_EMAC -#if ESP_IDF_VERSION_MAJOR >= 5 -# if CONFIG_ETH_SPI_ETHERNET_DM9051 +# if ESP_IDF_VERSION_MAJOR >= 5 +# if CONFIG_ETH_SPI_ETHERNET_DM9051 case EthPhyType_t::DM9051: return true; -# endif // if CONFIG_ETH_SPI_ETHERNET_DM9051 -# if CONFIG_ETH_SPI_ETHERNET_W5500 +# endif // if CONFIG_ETH_SPI_ETHERNET_DM9051 +# if CONFIG_ETH_SPI_ETHERNET_W5500 case EthPhyType_t::W5500: return true; -# endif // if CONFIG_ETH_SPI_ETHERNET_W5500 -# if CONFIG_ETH_SPI_ETHERNET_KSZ8851SNL +# endif // if CONFIG_ETH_SPI_ETHERNET_W5500 +# if CONFIG_ETH_SPI_ETHERNET_KSZ8851SNL case EthPhyType_t::KSZ8851: return true; -# endif // if CONFIG_ETH_SPI_ETHERNET_KSZ8851SNL -#endif // if ESP_IDF_VERSION_MAJOR >= 5 +# endif // if CONFIG_ETH_SPI_ETHERNET_KSZ8851SNL +# endif // if ESP_IDF_VERSION_MAJOR >= 5 case EthPhyType_t::notSet: break; } return false; } -#if FEATURE_ETHERNET +# if FEATURE_ETHERNET bool isSPI_EthernetType(EthPhyType_t phyType) { -# if ESP_IDF_VERSION_MAJOR >= 5 +# if ESP_IDF_VERSION_MAJOR >= 5 return -# if CONFIG_ETH_SPI_ETHERNET_DM9051 +# if CONFIG_ETH_SPI_ETHERNET_DM9051 phyType == EthPhyType_t::DM9051 || -# endif // if CONFIG_ETH_SPI_ETHERNET_DM9051 -# if CONFIG_ETH_SPI_ETHERNET_W5500 +# endif // if CONFIG_ETH_SPI_ETHERNET_DM9051 +# if CONFIG_ETH_SPI_ETHERNET_W5500 phyType == EthPhyType_t::W5500 || -# endif // if CONFIG_ETH_SPI_ETHERNET_W5500 -# if CONFIG_ETH_SPI_ETHERNET_KSZ8851SNL +# endif // if CONFIG_ETH_SPI_ETHERNET_W5500 +# if CONFIG_ETH_SPI_ETHERNET_KSZ8851SNL phyType == EthPhyType_t::KSZ8851 || -# endif // if CONFIG_ETH_SPI_ETHERNET_KSZ8851SNL +# endif // if CONFIG_ETH_SPI_ETHERNET_KSZ8851SNL false; -# else // if ESP_IDF_VERSION_MAJOR >= 5 +# else // if ESP_IDF_VERSION_MAJOR >= 5 return false; -# endif // if ESP_IDF_VERSION_MAJOR >= 5 +# endif // if ESP_IDF_VERSION_MAJOR >= 5 } eth_phy_type_t to_ESP_phy_type(EthPhyType_t phyType) { switch (phyType) { -# if CONFIG_ETH_USE_ESP32_EMAC +# if CONFIG_ETH_USE_ESP32_EMAC case EthPhyType_t::LAN8720: return ETH_PHY_LAN8720; case EthPhyType_t::TLK110: return ETH_PHY_TLK110; case EthPhyType_t::RTL8201: return ETH_PHY_RTL8201; -# if ETH_TYPE_JL1101_SUPPORTED +# if ETH_TYPE_JL1101_SUPPORTED case EthPhyType_t::JL1101: return ETH_PHY_JL1101; -# endif +# endif case EthPhyType_t::DP83848: return ETH_PHY_DP83848; case EthPhyType_t::KSZ8041: return ETH_PHY_KSZ8041; case EthPhyType_t::KSZ8081: return ETH_PHY_KSZ8081; -# endif // if CONFIG_ETH_USE_ESP32_EMAC +# endif // if CONFIG_ETH_USE_ESP32_EMAC -# if ESP_IDF_VERSION_MAJOR >= 5 -# if CONFIG_ETH_SPI_ETHERNET_DM9051 +# if ESP_IDF_VERSION_MAJOR >= 5 +# if CONFIG_ETH_SPI_ETHERNET_DM9051 case EthPhyType_t::DM9051: return ETH_PHY_DM9051; -# endif // if CONFIG_ETH_SPI_ETHERNET_DM9051 -# if CONFIG_ETH_SPI_ETHERNET_W5500 +# endif // if CONFIG_ETH_SPI_ETHERNET_DM9051 +# if CONFIG_ETH_SPI_ETHERNET_W5500 case EthPhyType_t::W5500: return ETH_PHY_W5500; -# endif // if CONFIG_ETH_SPI_ETHERNET_W5500 -# if CONFIG_ETH_SPI_ETHERNET_KSZ8851SNL +# endif // if CONFIG_ETH_SPI_ETHERNET_W5500 +# if CONFIG_ETH_SPI_ETHERNET_KSZ8851SNL case EthPhyType_t::KSZ8851: return ETH_PHY_KSZ8851; -# endif // if CONFIG_ETH_SPI_ETHERNET_KSZ8851SNL -# endif // if ESP_IDF_VERSION_MAJOR >= 5 +# endif // if CONFIG_ETH_SPI_ETHERNET_KSZ8851SNL +# endif // if ESP_IDF_VERSION_MAJOR >= 5 case EthPhyType_t::notSet: break; } return ETH_PHY_MAX; } -#endif // if FEATURE_ETHERNET +# endif // if FEATURE_ETHERNET const __FlashStringHelper* toString(EthPhyType_t phyType) { switch (phyType) { -#if CONFIG_ETH_USE_ESP32_EMAC +# if CONFIG_ETH_USE_ESP32_EMAC case EthPhyType_t::LAN8720: return F("LAN8710 / LAN8720"); case EthPhyType_t::TLK110: return F("TLK110 / IP101"); case EthPhyType_t::RTL8201: return F("RTL8201"); -# if ETH_TYPE_JL1101_SUPPORTED +# if ETH_TYPE_JL1101_SUPPORTED case EthPhyType_t::JL1101: return F("JL1101"); -# endif +# endif case EthPhyType_t::DP83848: return F("DP83848"); case EthPhyType_t::KSZ8041: return F("KSZ8041"); case EthPhyType_t::KSZ8081: return F("KSZ8081"); -#endif // if CONFIG_ETH_USE_ESP32_EMAC +# endif // if CONFIG_ETH_USE_ESP32_EMAC -#if ESP_IDF_VERSION_MAJOR >= 5 -# if CONFIG_ETH_SPI_ETHERNET_DM9051 +# if ESP_IDF_VERSION_MAJOR >= 5 +# if CONFIG_ETH_SPI_ETHERNET_DM9051 case EthPhyType_t::DM9051: return F("DM9051(SPI)"); -# endif // if CONFIG_ETH_SPI_ETHERNET_DM9051 -# if CONFIG_ETH_SPI_ETHERNET_W5500 +# endif // if CONFIG_ETH_SPI_ETHERNET_DM9051 +# if CONFIG_ETH_SPI_ETHERNET_W5500 case EthPhyType_t::W5500: return F("W5500(SPI)"); -# endif // if CONFIG_ETH_SPI_ETHERNET_W5500 -# if CONFIG_ETH_SPI_ETHERNET_KSZ8851SNL +# endif // if CONFIG_ETH_SPI_ETHERNET_W5500 +# if CONFIG_ETH_SPI_ETHERNET_KSZ8851SNL case EthPhyType_t::KSZ8851: return F("KSZ8851(SPI)"); -# endif // if CONFIG_ETH_SPI_ETHERNET_KSZ8851SNL -#endif // if ESP_IDF_VERSION_MAJOR >= 5 +# endif // if CONFIG_ETH_SPI_ETHERNET_KSZ8851SNL +# endif // if ESP_IDF_VERSION_MAJOR >= 5 case EthPhyType_t::notSet: break; @@ -123,4 +123,5 @@ const __FlashStringHelper* toString(EthPhyType_t phyType) { } return F("- None -"); } -#endif \ No newline at end of file + +#endif // if FEATURE_ETHERNET diff --git a/src/src/DataTypes/EthernetParameters.h b/src/src/DataTypes/EthernetParameters.h index b2b685a6e..5f21c55a2 100644 --- a/src/src/DataTypes/EthernetParameters.h +++ b/src/src/DataTypes/EthernetParameters.h @@ -6,78 +6,84 @@ #if FEATURE_ETHERNET // Is stored in settings -#ifdef ESP32P4 +# ifdef ESP32P4 + // Clock pin can only be GPIO 32 / 44 / 50 (default) enum class EthClockMode_t : uint8_t { - Default = 0, - Ext_crystal = 1, - Int_50MHz = 2, + Default = 0, + Ext_crystal = 1, + Int_50MHz = 2, + /* - Ext_crystal_GPIO_32 = (1 | (32 << 2)), - Ext_crystal_GPIO_44 = (1 | (44 << 2)), - Ext_crystal_GPIO_50 = (1 | (50 << 2)), - Int_50MHz_GPIO_32 = (2 | (32 << 2)), - Int_50MHz_GPIO_44 = (2 | (44 << 2)), - Int_50MHz_GPIO_50 = (2 | (50 << 2)), - */ + Ext_crystal_GPIO_32 = (1 | (32 << 2)), + Ext_crystal_GPIO_44 = (1 | (44 << 2)), + Ext_crystal_GPIO_50 = (1 | (50 << 2)), + Int_50MHz_GPIO_32 = (2 | (32 << 2)), + Int_50MHz_GPIO_44 = (2 | (44 << 2)), + Int_50MHz_GPIO_50 = (2 | (50 << 2)), + */ }; -#endif -#if CONFIG_IDF_TARGET_ESP32 + +# endif // ifdef ESP32P4 +# if CONFIG_IDF_TARGET_ESP32 enum class EthClockMode_t : uint8_t { Ext_crystal_osc = 0, Int_50MHz_GPIO_0 = 1, Int_50MHz_GPIO_16 = 2, Int_50MHz_GPIO_17_inv = 3 + }; -#endif -bool isValid(EthClockMode_t clockMode); +# endif // if CONFIG_IDF_TARGET_ESP32 -const __FlashStringHelper * toString(EthClockMode_t clockMode); +bool isValid(EthClockMode_t clockMode); -bool isGpioUsedInETHClockMode(EthClockMode_t clockMode, - int8_t gpio); +const __FlashStringHelper* toString(EthClockMode_t clockMode); + +bool isGpioUsedInETHClockMode(EthClockMode_t clockMode, + int8_t gpio); // Is stored in settings enum class EthPhyType_t : uint8_t { -#if CONFIG_ETH_USE_ESP32_EMAC +# if CONFIG_ETH_USE_ESP32_EMAC LAN8720 = 0, TLK110 = 1, RTL8201 = 2, -#if ETH_TYPE_JL1101_SUPPORTED - JL1101 = 3, -#endif - DP83848 = 4, - KSZ8041 = 5, +# if ETH_TYPE_JL1101_SUPPORTED + JL1101 = 3, +# endif + DP83848 = 4, + KSZ8041 = 5, KSZ8081 = 6, -#endif -#if ESP_IDF_VERSION_MAJOR >= 5 -#if CONFIG_ETH_SPI_ETHERNET_DM9051 - DM9051 = 10, -#endif -#if CONFIG_ETH_SPI_ETHERNET_W5500 - W5500 = 11, -#endif -#if CONFIG_ETH_SPI_ETHERNET_KSZ8851SNL +# endif // if CONFIG_ETH_USE_ESP32_EMAC +# if ESP_IDF_VERSION_MAJOR >= 5 +# if CONFIG_ETH_SPI_ETHERNET_DM9051 + DM9051 = 10, +# endif +# if CONFIG_ETH_SPI_ETHERNET_W5500 + W5500 = 11, +# endif +# if CONFIG_ETH_SPI_ETHERNET_KSZ8851SNL KSZ8851 = 12, -#endif -#endif - notSet = 127 // Might be processed in some code as int, uint8_t and int8_t +# endif +# endif // if ESP_IDF_VERSION_MAJOR >= 5 + notSet = 127 // Might be processed in some code as int, uint8_t and int8_t + }; -bool isValid(EthPhyType_t phyType); +bool isValid(EthPhyType_t phyType); -#if FEATURE_ETHERNET -#include +# if FEATURE_ETHERNET +# include -bool isSPI_EthernetType(EthPhyType_t phyType); +bool isSPI_EthernetType(EthPhyType_t phyType); // Convert to internal enum type as those enum values may not always be the same int value -eth_phy_type_t to_ESP_phy_type(EthPhyType_t phyType); -#endif +eth_phy_type_t to_ESP_phy_type(EthPhyType_t phyType); +# endif // if FEATURE_ETHERNET -const __FlashStringHelper * toString(EthPhyType_t phyType); +const __FlashStringHelper* toString(EthPhyType_t phyType); -#endif +#endif // if FEATURE_ETHERNET #endif // DATASTRUCTS_ETHERNETPARAMETERS_H diff --git a/src/src/Helpers/_ESPEasy_key_value_store.cpp b/src/src/Helpers/_ESPEasy_key_value_store.cpp index e49eac1e6..5864773a2 100644 --- a/src/src/Helpers/_ESPEasy_key_value_store.cpp +++ b/src/src/Helpers/_ESPEasy_key_value_store.cpp @@ -134,7 +134,7 @@ bool ESPEasy_key_value_store::load(SettingsType::Enum settingsType, int index, u sizePerType = getStorageSizePerType(storageType); key = getKey_from_combined_key(combined_key.getUint32()); - if (sizePerType < 4 && storageType != ESPEasy_key_value_store::StorageType::string_type) { + if ((sizePerType < 4) && (storageType != ESPEasy_key_value_store::StorageType::string_type)) { // Should not happen as those should not be stored in the file _lastError = strformat(F("KVS: Invalid storage type %d at readPos %d"), static_cast(storageType), LOG_READPOS_OFFSET); addLog(LOG_LEVEL_ERROR, _lastError); diff --git a/src/src/Helpers/_ESPEasy_key_value_store.h b/src/src/Helpers/_ESPEasy_key_value_store.h index 0bf64e393..df713366e 100644 --- a/src/src/Helpers/_ESPEasy_key_value_store.h +++ b/src/src/Helpers/_ESPEasy_key_value_store.h @@ -48,8 +48,12 @@ public: }; - bool load(SettingsType::Enum settingsType, int index, uint32_t offset_in_block); - bool store(SettingsType::Enum settingsType, int index, uint32_t offset_in_block); + bool load(SettingsType::Enum settingsType, + int index, + uint32_t offset_in_block); + bool store(SettingsType::Enum settingsType, + int index, + uint32_t offset_in_block); // Count all data to estimate how much storage space it would require to store everything in a somewhat compact form. size_t getPayloadStorageSize() const; @@ -72,7 +76,7 @@ public: String & value) const; void setValue(uint32_t key, const String& value); - void setValue(uint32_t key, + void setValue(uint32_t key, String&& value); bool getValue(uint32_t key, @@ -148,24 +152,23 @@ public: private: - bool getValue(StorageType& storageType, - uint32_t key, + bool getValue(StorageType & storageType, + uint32_t key, ESPEasy_key_value_store_4byte_data_t& value) const; - void setValue(StorageType & storageType, - uint32_t key, + void setValue(StorageType & storageType, + uint32_t key, const ESPEasy_key_value_store_4byte_data_t& value); - bool getValue(StorageType& storageType, - uint32_t key, + bool getValue(StorageType & storageType, + uint32_t key, ESPEasy_key_value_store_8byte_data_t& value) const; - void setValue(StorageType & storageType, - uint32_t key, + void setValue(StorageType & storageType, + uint32_t key, const ESPEasy_key_value_store_8byte_data_t& value); - // Query cache to see if we have any of the asked storage type bool hasStorageType(StorageType storageType) const; @@ -174,7 +177,7 @@ private: String _lastError; - std::map _string_data{}; + std::map_string_data{}; std::map_4byte_data{}; std::map_8byte_data{}; From 2ef4f2ffc15fcd08642025fa933293bf159f6a8d Mon Sep 17 00:00:00 2001 From: TD-er Date: Mon, 14 Jul 2025 17:54:45 +0200 Subject: [PATCH 114/564] [Storage] Add NWPluginData_base & optimize key/value store --- src/_NW005_PPP_modem.cpp | 7 + src/_NWPlugin_Helper.cpp | 83 +++++++++++ src/_NWPlugin_Helper.h | 34 +++++ src/src/DataStructs/NWPluginData_base.cpp | 43 ++++++ src/src/DataStructs/NWPluginData_base.h | 60 ++++++++ .../ESPEasy_key_value_store_4byte_data.cpp | 13 +- .../ESPEasy_key_value_store_8byte_data.cpp | 13 +- .../DataTypes/ESPEasy_key_value_store_data.h | 31 +++- src/src/Helpers/_ESPEasy_key_value_store.cpp | 141 ++++++++++++------ src/src/Helpers/_ESPEasy_key_value_store.h | 40 ++++- .../NW005_data_struct_PPP_modem.cpp | 3 + .../NW005_data_struct_PPP_modem.h | 20 +++ 12 files changed, 428 insertions(+), 60 deletions(-) create mode 100644 src/_NWPlugin_Helper.cpp create mode 100644 src/_NWPlugin_Helper.h create mode 100644 src/src/DataStructs/NWPluginData_base.cpp create mode 100644 src/src/DataStructs/NWPluginData_base.h create mode 100644 src/src/NWPluginStructs/NW005_data_struct_PPP_modem.cpp create mode 100644 src/src/NWPluginStructs/NW005_data_struct_PPP_modem.h diff --git a/src/_NW005_PPP_modem.cpp b/src/_NW005_PPP_modem.cpp index 821972435..c15f38361 100644 --- a/src/_NW005_PPP_modem.cpp +++ b/src/_NW005_PPP_modem.cpp @@ -10,6 +10,8 @@ # define NWPLUGIN_ID_005 5 # define NWPLUGIN_NAME_005 "PPP modem" +#include "src/NWPluginStructs/NW005_data_struct_PPP_modem.h" + # include "src/DataStructs/ESPEasy_EventStruct.h" # include "src/ESPEasyCore/ESPEasyNetwork.h" @@ -137,6 +139,11 @@ bool NWPlugin_005(NWPlugin::Function function, struct EventStruct *event, String case NWPlugin::Function::NWPLUGIN_INIT: { + initNWPluginData(event->NetworkIndex, new (std::nothrow) NW005_data_struct_PPP_modem); + NW005_data_struct_PPP_modem *NW_data = static_cast(getNWPluginData(event->NetworkIndex)); + if (NW_data) { + + } break; } diff --git a/src/_NWPlugin_Helper.cpp b/src/_NWPlugin_Helper.cpp new file mode 100644 index 000000000..ed1d7003d --- /dev/null +++ b/src/_NWPlugin_Helper.cpp @@ -0,0 +1,83 @@ +#include "../src/_NWPlugin_Helper.h" + +#include "src/CustomBuild/ESPEasyLimits.h" + +#include "src/Globals/NWPlugins.h" +#include "src/Globals/Settings.h" + +NWPluginData_base *NWPlugin_task_data[NETWORK_MAX]; + +void resetNWPluginData() { + for (networkIndex_t i = 0; i < NR_ELEMENTS(NWPlugin_task_data); ++i) { + NWPlugin_task_data[i] = nullptr; + } +} + +void clearNWPluginData(networkIndex_t networkIndex) { + if (validNetworkIndex(networkIndex)) { + if (NWPlugin_task_data[networkIndex] != nullptr) { + delete NWPlugin_task_data[networkIndex]; + NWPlugin_task_data[networkIndex] = nullptr; + } + } +} + +bool initNWPluginData(networkIndex_t networkIndex, NWPluginData_base *data) { + if (!validNetworkIndex(networkIndex)) { + if (data != nullptr) { + delete data; + data = nullptr; + } + return false; + } + + // 2nd heap may have been active to allocate the NWPluginData, but here we need to keep the default heap active + #ifdef USE_SECOND_HEAP + HeapSelectDram ephemeral; + #endif // ifdef USE_SECOND_HEAP + + + clearNWPluginData(networkIndex); + + if (data != nullptr) { + if (Settings.getNetworkEnabled(networkIndex)) { + if (!NWPlugin_task_data[networkIndex]->init_KVS()) { + delete data; + data = nullptr; + } else { + NWPlugin_task_data[networkIndex] = data; + NWPlugin_task_data[networkIndex]->_nw_data_pluginID = Settings.getNWPluginID_for_network(networkIndex); + NWPlugin_task_data[networkIndex]->_networkIndex = networkIndex; + } + } else { + delete data; + data = nullptr; + } + } + return getNWPluginData(networkIndex) != nullptr; +} + +NWPluginData_base* getNWPluginData(networkIndex_t networkIndex) { + if (nwpluginTaskData_initialized(networkIndex)) { + + if (!NWPlugin_task_data[networkIndex]->baseClassOnly()) { + return NWPlugin_task_data[networkIndex]; + } + } + return nullptr; +} + +NWPluginData_base* getNWPluginDataBaseClassOnly(networkIndex_t networkIndex) { + if (nwpluginTaskData_initialized(networkIndex)) { + return NWPlugin_task_data[networkIndex]; + } + return nullptr; +} + +bool nwpluginTaskData_initialized(networkIndex_t networkIndex) { + if (!validNetworkIndex(networkIndex)) { + return false; + } + return NWPlugin_task_data[networkIndex] != nullptr && + (NWPlugin_task_data[networkIndex]->_nw_data_pluginID == Settings.getNWPluginID_for_network(networkIndex)); +} diff --git a/src/_NWPlugin_Helper.h b/src/_NWPlugin_Helper.h new file mode 100644 index 000000000..8c91cda78 --- /dev/null +++ b/src/_NWPlugin_Helper.h @@ -0,0 +1,34 @@ +#ifndef _NWPLUGIN_HELPER_H +#define _NWPLUGIN_HELPER_H + +#include "ESPEasy_common.h" + +#include "src/CustomBuild/ESPEasyLimits.h" + + +#include "src/DataStructs/NWPluginData_base.h" + +extern NWPluginData_base *NWPlugin_task_data[NETWORK_MAX]; + +// Try to allocate in PSRAM or 2nd heap if possible +#define special_initNWPluginData(I, T) void * ptr = special_calloc(1, sizeof(T)); if (ptr) { initNWPluginData(I, new (ptr) T()); } + + + +// ============================================== +// Data used by instances of plugins. +// ============================================= + +void resetNWPluginData(); + +void clearNWPluginData(networkIndex_t networkIndex); + +bool initNWPluginData(networkIndex_t networkIndex, + NWPluginData_base *data); + +NWPluginData_base* getNWPluginData(networkIndex_t networkIndex); +NWPluginData_base* getNWPluginDataBaseClassOnly(networkIndex_t networkIndex); + +bool nwpluginTaskData_initialized(networkIndex_t networkIndex); + +#endif \ No newline at end of file diff --git a/src/src/DataStructs/NWPluginData_base.cpp b/src/src/DataStructs/NWPluginData_base.cpp new file mode 100644 index 000000000..07b959d2d --- /dev/null +++ b/src/src/DataStructs/NWPluginData_base.cpp @@ -0,0 +1,43 @@ +#include "../DataStructs/NWPluginData_base.h" + +#include "../DataStructs/ESPEasy_EventStruct.h" + +#include "../Globals/RuntimeData.h" + +#include "../Helpers/StringConverter.h" +#include "../Helpers/_ESPEasy_key_value_store.h" + + + +NWPluginData_base::~NWPluginData_base() +{ + if (_kvs) { delete _kvs; } + _kvs = nullptr; +} + +bool NWPluginData_base::plugin_write_base(struct EventStruct *event, + const String & string) { return false; } + +bool NWPluginData_base::init_KVS() +{ + _kvs = new (std::nothrow) ESPEasy_key_value_store; + return _kvs != nullptr; +} + +bool NWPluginData_base::_load() +{ + if (!_kvs) { return false; } + return _kvs->load( + SettingsType::Enum::NetworkInterfaceSettings_Type, + _networkIndex, + 0); +} + +bool NWPluginData_base::_store() +{ + if (!_kvs) { return false; } + return _kvs->store( + SettingsType::Enum::NetworkInterfaceSettings_Type, + _networkIndex, + 0); +} diff --git a/src/src/DataStructs/NWPluginData_base.h b/src/src/DataStructs/NWPluginData_base.h new file mode 100644 index 000000000..ac7c65804 --- /dev/null +++ b/src/src/DataStructs/NWPluginData_base.h @@ -0,0 +1,60 @@ +#ifndef DATASTRUCTS_NWPLUGINDATA_BASE_H +#define DATASTRUCTS_NWPLUGINDATA_BASE_H + +#include "../../ESPEasy_common.h" + + +#include "../DataTypes/NWPluginID.h" +#include "../DataTypes/NetworkIndex.h" + +// FW declaration, so we can use a simple pointer here and only include it in the cpp +class ESPEasy_key_value_store; + +// ============================================== +// Data used by instances of NW-plugins. +// ============================================= + +// base class to be able to delete a data object from the array. +// N.B. in order to use this, a data object must inherit from this base class. +// This is a compile time check. +struct NWPluginData_base { + NWPluginData_base() = default; + + virtual ~NWPluginData_base(); + + bool baseClassOnly() const { + return _baseClassOnly; + } + + bool plugin_write_base(struct EventStruct *event, + const String & string); + + + // We cannot use dynamic_cast, so we must keep track of the plugin ID to + // perform checks on the casting. + // This is also a check to only use these functions and not to insert pointers + // at random in the Plugin_task_data array. + nwpluginID_t _nw_data_pluginID = INVALID_NW_PLUGIN_ID; + networkIndex_t _networkIndex = INVALID_NETWORK_INDEX; + + bool init_KVS(); + +protected: + + bool _KVS_initialized() const { return _kvs != nullptr; } + + // Load settings in the _kvs + bool _load(); + + // Save settings from the _kvs to the settings + bool _store(); + + ESPEasy_key_value_store *_kvs{}; + + bool _baseClassOnly = false; +}; + + + + +#endif \ No newline at end of file diff --git a/src/src/DataTypes/ESPEasy_key_value_store_4byte_data.cpp b/src/src/DataTypes/ESPEasy_key_value_store_4byte_data.cpp index dedc91e31..80d8fd647 100644 --- a/src/src/DataTypes/ESPEasy_key_value_store_4byte_data.cpp +++ b/src/src/DataTypes/ESPEasy_key_value_store_4byte_data.cpp @@ -32,7 +32,7 @@ int32_t ESPEasy_key_value_store_4byte_data_t::getInt32() const return res; } -void ESPEasy_key_value_store_4byte_data_t::setInt32(int32_t value) { memcpy(binary, &value, size_32bit); } +bool ESPEasy_key_value_store_4byte_data_t::setInt32(int32_t value) { return set(&value); } uint32_t ESPEasy_key_value_store_4byte_data_t::getUint32() const { @@ -42,7 +42,7 @@ uint32_t ESPEasy_key_value_store_4byte_data_t::getUint32() const return res; } -void ESPEasy_key_value_store_4byte_data_t::setUint32(uint32_t value) { memcpy(binary, &value, size_32bit); } +bool ESPEasy_key_value_store_4byte_data_t::setUint32(uint32_t value) { return set(&value); } float ESPEasy_key_value_store_4byte_data_t::getFloat() const { @@ -52,4 +52,11 @@ float ESPEasy_key_value_store_4byte_data_t::getFloat() const return res; } -void ESPEasy_key_value_store_4byte_data_t::setFloat(float value) { memcpy(binary, &value, size_32bit); } +bool ESPEasy_key_value_store_4byte_data_t::setFloat(float value) { return set(&value); } + +bool ESPEasy_key_value_store_4byte_data_t::set(const void*value) +{ + if (memcmp(binary, value, size_32bit) == 0) { return false; } + memcpy(binary, value, size_32bit); + return true; +} diff --git a/src/src/DataTypes/ESPEasy_key_value_store_8byte_data.cpp b/src/src/DataTypes/ESPEasy_key_value_store_8byte_data.cpp index 31ead0757..b2e14202f 100644 --- a/src/src/DataTypes/ESPEasy_key_value_store_8byte_data.cpp +++ b/src/src/DataTypes/ESPEasy_key_value_store_8byte_data.cpp @@ -32,7 +32,7 @@ int64_t ESPEasy_key_value_store_8byte_data_t::getInt64() const return res; } -void ESPEasy_key_value_store_8byte_data_t::setInt64(int64_t value) { memcpy(binary, &value, size_64bit); } +bool ESPEasy_key_value_store_8byte_data_t::setInt64(int64_t value) { return set(&value); } uint64_t ESPEasy_key_value_store_8byte_data_t::getUint64() const { @@ -42,7 +42,7 @@ uint64_t ESPEasy_key_value_store_8byte_data_t::getUint64() const return res; } -void ESPEasy_key_value_store_8byte_data_t::setUint64(uint64_t value) { memcpy(binary, &value, size_64bit); } +bool ESPEasy_key_value_store_8byte_data_t::setUint64(uint64_t value) { return set(&value); } double ESPEasy_key_value_store_8byte_data_t::getDouble() const { @@ -52,4 +52,11 @@ double ESPEasy_key_value_store_8byte_data_t::getDouble() const return res; } -void ESPEasy_key_value_store_8byte_data_t::setDouble(double value) { memcpy(binary, &value, size_64bit); } +bool ESPEasy_key_value_store_8byte_data_t::setDouble(double value) { return set(&value); } + +bool ESPEasy_key_value_store_8byte_data_t::set(const void*value) +{ + if (memcmp(binary, value, size_64bit) == 0) { return false; } + memcpy(binary, value, size_64bit); + return true; +} diff --git a/src/src/DataTypes/ESPEasy_key_value_store_data.h b/src/src/DataTypes/ESPEasy_key_value_store_data.h index 9fd60e3ff..80d981a7d 100644 --- a/src/src/DataTypes/ESPEasy_key_value_store_data.h +++ b/src/src/DataTypes/ESPEasy_key_value_store_data.h @@ -20,18 +20,27 @@ public: int32_t getInt32() const; - void setInt32(int32_t value); + + // Return true when content has changed + bool setInt32(int32_t value); uint32_t getUint32() const; - void setUint32(uint32_t value); + + // Return true when content has changed + bool setUint32(uint32_t value); float getFloat() const; - void setFloat(float value); + + // Return true when content has changed + bool setFloat(float value); uint8_t* getBinary() { return binary; } const uint8_t* getBinary() const { return binary; } + // Return true when content has changed + bool set(const void*value); + private: uint8_t binary[sizeof(float)]{}; @@ -54,18 +63,28 @@ public: int64_t getInt64() const; - void setInt64(int64_t value); + + // Return true when content has changed + bool setInt64(int64_t value); uint64_t getUint64() const; - void setUint64(uint64_t value); + + // Return true when content has changed + bool setUint64(uint64_t value); double getDouble() const; - void setDouble(double value); + + // Return true when content has changed + bool setDouble(double value); uint8_t* getBinary() { return binary; } const uint8_t* getBinary() const { return binary; } + + // Return true when content has changed + bool set(const void*value); + private: uint8_t binary[sizeof(double)]{}; diff --git a/src/src/Helpers/_ESPEasy_key_value_store.cpp b/src/src/Helpers/_ESPEasy_key_value_store.cpp index 5864773a2..5e04bfb24 100644 --- a/src/src/Helpers/_ESPEasy_key_value_store.cpp +++ b/src/src/Helpers/_ESPEasy_key_value_store.cpp @@ -54,6 +54,22 @@ size_t getStorageSizePerType(ESPEasy_key_value_store::StorageType storageType) return 0; } +bool ESPEasy_key_value_store::isEmpty() const +{ + return + _4byte_data.empty() && + _8byte_data.empty() && + _string_data.empty(); +} + +void ESPEasy_key_value_store::clear() +{ + _4byte_data.clear(); + _8byte_data.clear(); + _string_data.clear(); + _state = State::Empty; +} + bool ESPEasy_key_value_store::load(SettingsType::Enum settingsType, int index, uint32_t offset_in_block) { int offset, max_size; @@ -67,6 +83,8 @@ bool ESPEasy_key_value_store::load(SettingsType::Enum settingsType, int index, u return false; } + clear(); + const uint32_t bufferSize = 128; char buffer[bufferSize] = { 0 }; @@ -94,6 +112,7 @@ bool ESPEasy_key_value_store::load(SettingsType::Enum settingsType, int index, u const size_t startChecksumPos = offset_in_block + 4 + payloadSize; if ((offset_in_block + totalSize) > static_cast(max_size)) { + _state = State::ErrorOnLoad; _lastError = strformat(F("KVS: Total size %d + offset %d exceeds max size %d"), totalSize, offset_in_block, max_size); #ifndef BUILD_NO_DEBUG addLog(LOG_LEVEL_DEBUG, _lastError); @@ -136,6 +155,7 @@ bool ESPEasy_key_value_store::load(SettingsType::Enum settingsType, int index, u if ((sizePerType < 4) && (storageType != ESPEasy_key_value_store::StorageType::string_type)) { // Should not happen as those should not be stored in the file + _state = State::ErrorOnLoad; _lastError = strformat(F("KVS: Invalid storage type %d at readPos %d"), static_cast(storageType), LOG_READPOS_OFFSET); addLog(LOG_LEVEL_ERROR, _lastError); return false; @@ -170,6 +190,7 @@ bool ESPEasy_key_value_store::load(SettingsType::Enum settingsType, int index, u if (!partialString.reserve(bytesLeftPartialString)) { + _state = State::ErrorOnLoad; _lastError = strformat(F("KVS: Could not allocate string size %d at readPos %d"), bytesLeftPartialString, LOG_READPOS_OFFSET); addLog(LOG_LEVEL_ERROR, _lastError); return false; @@ -186,6 +207,7 @@ bool ESPEasy_key_value_store::load(SettingsType::Enum settingsType, int index, u partialString += c; } else if (bytesLeftPartialString > 0) { // What to do here if bytesLeftPartialString != 0 ???? + _state = State::ErrorOnLoad; _lastError = strformat(F("KVS: Unexpected end-of-string, expected %d more at readPos %d"), bytesLeftPartialString, LOG_READPOS_OFFSET); @@ -235,6 +257,7 @@ bool ESPEasy_key_value_store::load(SettingsType::Enum settingsType, int index, u } if ((bufPos_start_loop == bufPos) && !loadNextFromFile) { + _state = State::ErrorOnLoad; _lastError = strformat(F("KVS: BUG! Did not increment bufPos while processing StorageType %d at readPos %d"), static_cast(storageType), LOG_READPOS_OFFSET); addLog(LOG_LEVEL_ERROR, _lastError); @@ -246,16 +269,23 @@ bool ESPEasy_key_value_store::load(SettingsType::Enum settingsType, int index, u } // TODO TD-er: Read checksum + _state = State::NotChanged; return true; } bool ESPEasy_key_value_store::store(SettingsType::Enum settingsType, int index, uint32_t offset_in_block) { + if (getState() == State::NotChanged) { + addLog(LOG_LEVEL_INFO, F("KVS: Content not changed, no need to save")); + return true; + } + // FIXME TD-er: Must add some check to see if the existing data has changed before saving. int offset, max_size; if (!SettingsType::getSettingsParameters(settingsType, index, offset, max_size)) { + _state = State::ErrorOnSave; _lastError = F("KVS: Invalid index"); #ifndef BUILD_NO_DEBUG addLog(LOG_LEVEL_DEBUG, _lastError); @@ -290,6 +320,7 @@ bool ESPEasy_key_value_store::store(SettingsType::Enum settingsType, int index, const size_t startChecksumPos = offset_in_block + 4 + payloadSize; if ((offset_in_block + totalSize) > static_cast(max_size)) { + _state = State::ErrorOnSave; _lastError = strformat(F("KVS: Total size %d + offset %d exceeds max size %d"), totalSize, offset_in_block, max_size); #ifndef BUILD_NO_DEBUG addLog(LOG_LEVEL_DEBUG, _lastError); @@ -425,6 +456,7 @@ bool ESPEasy_key_value_store::store(SettingsType::Enum settingsType, int index, } } else { + _state = State::ErrorOnSave; _lastError = strformat(F("KVS: BUG! Should not have storage type %d stored with 0 bytes at writePos %d"), static_cast(storageType), writePos + bufPos); addLog(LOG_LEVEL_ERROR, _lastError); @@ -457,7 +489,10 @@ bool ESPEasy_key_value_store::store(SettingsType::Enum settingsType, int index, bufPos = 0; } + // Consider a successful save the same as a fresh load. + // The data is now the same as what is stored + _state = State::NotChanged; return true; } @@ -528,67 +563,84 @@ ESPEasy_key_value_store::StorageType ESPEasy_key_value_store::getStorageType(uin bool ESPEasy_key_value_store::getValue(uint32_t key, String& value) const { - auto it = _string_data.find(key); + const uint32_t combined_key = combine_StorageType_and_key( + ESPEasy_key_value_store::StorageType::string_type, + key); + + auto it = _string_data.find(combined_key); if (it == _string_data.end()) { return false; } value = it->second; return true; } -void ESPEasy_key_value_store::setValue(uint32_t key, const String& value) -{ - _string_data[key] = value; - setHasStorageType(ESPEasy_key_value_store::StorageType::string_type); -} +void ESPEasy_key_value_store::setValue(uint32_t key, const String& value) { setValue(key, String(value)); } + +void ESPEasy_key_value_store::setValue(uint32_t key, + const __FlashStringHelper*value) { setValue(key, String(value)); } void ESPEasy_key_value_store::setValue(uint32_t key, String&& value) { - auto it = _string_data.find(key); + const uint32_t combined_key = combine_StorageType_and_key( + ESPEasy_key_value_store::StorageType::string_type, + key); + auto it = _string_data.find(combined_key); if (it == _string_data.end()) { // Does not yet exist. - _string_data.emplace(key, std::move(value)); + _string_data.emplace(combined_key, std::move(value)); + _state = State::Changed; } else { - it->second = std::move(value); + if (!it->second.equals(value)) { + it->second = std::move(value); + _state = State::Changed; + } } + setHasStorageType(ESPEasy_key_value_store::StorageType::string_type); } -#define GET_4BYTE_TYPE(T, GF) \ - if (hasStorageType(ESPEasy_key_value_store::StorageType::T)) \ - { const uint32_t combined_key = combine_StorageType_and_key( \ - ESPEasy_key_value_store::StorageType::T, key); \ - auto it = _4byte_data.find(combined_key); \ - if (it != _4byte_data.end()) { \ - value = it->second.GF(); \ - return true; \ - } \ - } \ - return false; +ESPEasy_key_value_store::map_4byte_data::const_iterator ESPEasy_key_value_store::get4byteIterator( + ESPEasy_key_value_store::StorageType storageType, + uint32_t key) const +{ + if (!hasStorageType(storageType)) { return _4byte_data.end(); } + const uint32_t combined_key = combine_StorageType_and_key(storageType, key); + return _4byte_data.find(combined_key); +} -#define GET_8BYTE_TYPE(T, GF) \ - if (hasStorageType(ESPEasy_key_value_store::StorageType::T)) \ - { const uint32_t combined_key = combine_StorageType_and_key( \ - ESPEasy_key_value_store::StorageType::T, key); \ - auto it = _8byte_data.find(combined_key); \ - if (it != _8byte_data.end()) { \ - value = it->second.GF(); \ - return true; \ - } \ - } \ - return false; +ESPEasy_key_value_store::map_8byte_data::const_iterator ESPEasy_key_value_store::get8byteIterator( + ESPEasy_key_value_store::StorageType storageType, + uint32_t key) const +{ + if (!hasStorageType(storageType)) { return _8byte_data.end(); } + const uint32_t combined_key = combine_StorageType_and_key(storageType, key); + return _8byte_data.find(combined_key); +} + +#define GET_4BYTE_TYPE(T, GF) \ + auto it = get4byteIterator(ESPEasy_key_value_store::StorageType::T, key); \ + if (it == _4byte_data.end()) return false; \ + value = it->second.GF(); \ + return true; \ + +#define GET_8BYTE_TYPE(T, GF) \ + auto it = get8byteIterator(ESPEasy_key_value_store::StorageType::T, key); \ + if (it == _8byte_data.end()) return false; \ + value = it->second.GF(); \ + return true; \ -#define SET_4BYTE_TYPE(T, SF) \ - const uint32_t combined_key = combine_StorageType_and_key( \ - ESPEasy_key_value_store::StorageType::T, key); \ - _4byte_data[combined_key].SF(value); \ +#define SET_4BYTE_TYPE(T, SF) \ + const uint32_t combined_key = combine_StorageType_and_key( \ + ESPEasy_key_value_store::StorageType::T, key); \ + if (_4byte_data[combined_key].SF(value)) _state = State::Changed; \ setHasStorageType(ESPEasy_key_value_store::StorageType::T); -#define SET_8BYTE_TYPE(T, SF) \ - const uint32_t combined_key = combine_StorageType_and_key( \ - ESPEasy_key_value_store::StorageType::T, key); \ - _8byte_data[combined_key].SF(value); \ +#define SET_8BYTE_TYPE(T, SF) \ + const uint32_t combined_key = combine_StorageType_and_key( \ + ESPEasy_key_value_store::StorageType::T, key); \ + if (_8byte_data[combined_key].SF(value)) _state = State::Changed; \ setHasStorageType(ESPEasy_key_value_store::StorageType::T); bool ESPEasy_key_value_store::getValue(uint32_t key, int8_t& value) const @@ -767,8 +819,9 @@ void ESPEasy_key_value_store::setValue( if (it == _4byte_data.end()) { // new entry _4byte_data.emplace(combined_key, value); + _state = State::Changed; } else { - memcpy(it->second.getBinary(), value.getBinary(), 4); + if (it->second.set(value.getBinary())) { _state = State::Changed; } } } @@ -795,8 +848,9 @@ void ESPEasy_key_value_store::setValue( if (it == _8byte_data.end()) { // new entry _8byte_data.emplace(combined_key, value); + _state = State::Changed; } else { - memcpy(it->second.getBinary(), value.getBinary(), 8); + if (it->second.set(value.getBinary())) { _state = State::Changed; } } } @@ -815,7 +869,10 @@ void ESPEasy_key_value_store::setHasStorageType(StorageType storageType) constexpr uint32_t max_bitnr = static_cast(StorageType::MAX_Type); if (bitnr < max_bitnr) { - bitSet(_storage_type_present_cache, bitnr); + if (!bitRead(_storage_type_present_cache, bitnr)) { + _state = State::Changed; + bitSet(_storage_type_present_cache, bitnr); + } } // TODO TD-er: Whenever this is called, there has been a change, so invalidate checksum diff --git a/src/src/Helpers/_ESPEasy_key_value_store.h b/src/src/Helpers/_ESPEasy_key_value_store.h index df713366e..a4c9ae14c 100644 --- a/src/src/Helpers/_ESPEasy_key_value_store.h +++ b/src/src/Helpers/_ESPEasy_key_value_store.h @@ -47,13 +47,28 @@ public: }; + enum class State { + Empty, + NotChanged, // Not changed since last load/save + Changed, + ErrorOnLoad, + ErrorOnSave - bool load(SettingsType::Enum settingsType, - int index, - uint32_t offset_in_block); - bool store(SettingsType::Enum settingsType, + }; + + State getState() const { return _state; } + + bool isEmpty() const; + + void clear(); + + + bool load(SettingsType::Enum settingsType, int index, uint32_t offset_in_block); + bool store(SettingsType::Enum settingsType, + int index, + uint32_t offset_in_block); // Count all data to estimate how much storage space it would require to store everything in a somewhat compact form. size_t getPayloadStorageSize() const; @@ -76,6 +91,8 @@ public: String & value) const; void setValue(uint32_t key, const String& value); + void setValue(uint32_t key, + const __FlashStringHelper*value); void setValue(uint32_t key, String&& value); @@ -175,15 +192,26 @@ private: // Update cache to indicate we have at least one of the given storage type void setHasStorageType(StorageType storageType); + typedef std::mapmap_4byte_data; + typedef std::mapmap_8byte_data; + + map_4byte_data::const_iterator get4byteIterator( + ESPEasy_key_value_store::StorageType storageType, + uint32_t key) const; + map_8byte_data::const_iterator get8byteIterator( + ESPEasy_key_value_store::StorageType storageType, + uint32_t key) const; + String _lastError; std::map_string_data{}; - std::map_4byte_data{}; - std::map_8byte_data{}; + map_4byte_data _4byte_data{}; + map_8byte_data _8byte_data{}; uint32_t _storage_type_present_cache{}; // TODO TD-er: Add checksum and invalidate whenever anyting is being stored. + State _state{ State::Empty }; }; // class ESPEasy_key_value_store diff --git a/src/src/NWPluginStructs/NW005_data_struct_PPP_modem.cpp b/src/src/NWPluginStructs/NW005_data_struct_PPP_modem.cpp new file mode 100644 index 000000000..69b36fffd --- /dev/null +++ b/src/src/NWPluginStructs/NW005_data_struct_PPP_modem.cpp @@ -0,0 +1,3 @@ +#include "../NWPluginStructs/NW005_data_struct_PPP_modem.h" + + diff --git a/src/src/NWPluginStructs/NW005_data_struct_PPP_modem.h b/src/src/NWPluginStructs/NW005_data_struct_PPP_modem.h new file mode 100644 index 000000000..d2c9b5cbb --- /dev/null +++ b/src/src/NWPluginStructs/NW005_data_struct_PPP_modem.h @@ -0,0 +1,20 @@ +#ifndef NWPLUGINSTRUCT_NW005_DATA_STRUCT_PPP_MODEM_H +#define NWPLUGINSTRUCT_NW005_DATA_STRUCT_PPP_MODEM_H + + +#include "../../_NWPlugin_Helper.h" +#ifdef USES_NW005 + + +struct NW005_data_struct_PPP_modem : public NWPluginData_base { + + NW005_data_struct_PPP_modem() = default; + + + +}; + + +#endif + +#endif \ No newline at end of file From 0aad8b1ecf8202cd8bb672054c89d8d66124df83 Mon Sep 17 00:00:00 2001 From: TD-er Date: Tue, 15 Jul 2025 00:47:46 +0200 Subject: [PATCH 115/564] [Storage] Add tests for key/value store --- src/_NW005_PPP_modem.cpp | 7 +- src/_NWPlugin_Helper.cpp | 2 +- src/src/DataStructs/NWPluginData_base.cpp | 5 +- src/src/DataStructs/NWPluginData_base.h | 8 +-- src/src/Helpers/_ESPEasy_key_value_store.cpp | 72 ++++++++++++++++--- src/src/Helpers/_ESPEasy_key_value_store.h | 36 ++++++---- .../NW005_data_struct_PPP_modem.cpp | 47 ++++++++++++ .../NW005_data_struct_PPP_modem.h | 9 ++- 8 files changed, 152 insertions(+), 34 deletions(-) diff --git a/src/_NW005_PPP_modem.cpp b/src/_NW005_PPP_modem.cpp index c15f38361..72654fed6 100644 --- a/src/_NW005_PPP_modem.cpp +++ b/src/_NW005_PPP_modem.cpp @@ -142,13 +142,18 @@ bool NWPlugin_005(NWPlugin::Function function, struct EventStruct *event, String initNWPluginData(event->NetworkIndex, new (std::nothrow) NW005_data_struct_PPP_modem); NW005_data_struct_PPP_modem *NW_data = static_cast(getNWPluginData(event->NetworkIndex)); if (NW_data) { - + NW_data->testWrite(); + } break; } case NWPlugin::Function::NWPLUGIN_EXIT: { + NW005_data_struct_PPP_modem *NW_data = static_cast(getNWPluginData(event->NetworkIndex)); + if (NW_data) { + NW_data->testRead(); + } break; } diff --git a/src/_NWPlugin_Helper.cpp b/src/_NWPlugin_Helper.cpp index ed1d7003d..b1e6168c6 100644 --- a/src/_NWPlugin_Helper.cpp +++ b/src/_NWPlugin_Helper.cpp @@ -41,7 +41,7 @@ bool initNWPluginData(networkIndex_t networkIndex, NWPluginData_base *data) { if (data != nullptr) { if (Settings.getNetworkEnabled(networkIndex)) { - if (!NWPlugin_task_data[networkIndex]->init_KVS()) { + if (!data->init_KVS()) { delete data; data = nullptr; } else { diff --git a/src/src/DataStructs/NWPluginData_base.cpp b/src/src/DataStructs/NWPluginData_base.cpp index 07b959d2d..02701e285 100644 --- a/src/src/DataStructs/NWPluginData_base.cpp +++ b/src/src/DataStructs/NWPluginData_base.cpp @@ -8,6 +8,7 @@ #include "../Helpers/_ESPEasy_key_value_store.h" +NWPluginData_base::NWPluginData_base() : _kvs(nullptr), _baseClassOnly(false) {} NWPluginData_base::~NWPluginData_base() { @@ -20,8 +21,10 @@ bool NWPluginData_base::plugin_write_base(struct EventStruct *event, bool NWPluginData_base::init_KVS() { + if (_kvs == nullptr) { _kvs = new (std::nothrow) ESPEasy_key_value_store; - return _kvs != nullptr; + } + return _kvs != nullptr; } bool NWPluginData_base::_load() diff --git a/src/src/DataStructs/NWPluginData_base.h b/src/src/DataStructs/NWPluginData_base.h index ac7c65804..346c7a41a 100644 --- a/src/src/DataStructs/NWPluginData_base.h +++ b/src/src/DataStructs/NWPluginData_base.h @@ -6,9 +6,7 @@ #include "../DataTypes/NWPluginID.h" #include "../DataTypes/NetworkIndex.h" - -// FW declaration, so we can use a simple pointer here and only include it in the cpp -class ESPEasy_key_value_store; +#include "../Helpers/_ESPEasy_key_value_store.h" // ============================================== // Data used by instances of NW-plugins. @@ -18,7 +16,7 @@ class ESPEasy_key_value_store; // N.B. in order to use this, a data object must inherit from this base class. // This is a compile time check. struct NWPluginData_base { - NWPluginData_base() = default; + NWPluginData_base(); virtual ~NWPluginData_base(); @@ -49,7 +47,7 @@ protected: // Save settings from the _kvs to the settings bool _store(); - ESPEasy_key_value_store *_kvs{}; + ESPEasy_key_value_store *_kvs=nullptr; bool _baseClassOnly = false; }; diff --git a/src/src/Helpers/_ESPEasy_key_value_store.cpp b/src/src/Helpers/_ESPEasy_key_value_store.cpp index 5e04bfb24..d5589e04a 100644 --- a/src/src/Helpers/_ESPEasy_key_value_store.cpp +++ b/src/src/Helpers/_ESPEasy_key_value_store.cpp @@ -4,7 +4,7 @@ #include "../Helpers/ESPEasy_Storage.h" #include "../Helpers/StringConverter.h" -uint32_t combine_StorageType_and_key( +uint32_t ESPEasy_key_value_store::combine_StorageType_and_key( ESPEasy_key_value_store::StorageType storageType, uint32_t key) { @@ -18,12 +18,12 @@ uint32_t combine_StorageType_and_key( return res; } -ESPEasy_key_value_store::StorageType get_StorageType_from_combined_key(uint32_t combined_key) +ESPEasy_key_value_store::StorageType ESPEasy_key_value_store::get_StorageType_from_combined_key(uint32_t combined_key) { return static_cast(combined_key >> 24); } -uint32_t getKey_from_combined_key(uint32_t combined_key) +uint32_t ESPEasy_key_value_store::getKey_from_combined_key(uint32_t combined_key) { const uint32_t res = combined_key & ((1 << 24) - 1); @@ -525,20 +525,21 @@ bool ESPEasy_key_value_store::hasKey(StorageType storageType, uint32_t key) cons { if (!hasStorageType(storageType)) { return false; } + const uint32_t combined_key = combine_StorageType_and_key(storageType, key); + if (storageType == ESPEasy_key_value_store::StorageType::string_type) { - return _string_data.find(key) != _string_data.end(); + return _string_data.find(combined_key) != _string_data.end(); } - const uint32_t combined_key = combine_StorageType_and_key(storageType, key); - const size_t size = getStorageSizePerType(storageType); + const size_t size = getStorageSizePerType(storageType); if (size == 12) { - return _8byte_data.find(key) != _8byte_data.end(); + return _8byte_data.find(combined_key) != _8byte_data.end(); } if (size >= 4) { - return _4byte_data.find(key) != _4byte_data.end(); + return _4byte_data.find(combined_key) != _4byte_data.end(); } return false; } @@ -733,7 +734,7 @@ void ESPEasy_key_value_store::setValue(uint32_t key, const bool& value) { SET_4B break; \ } -bool ESPEasy_key_value_store::getValue(StorageType& storageType, uint32_t key, String& value) const +bool ESPEasy_key_value_store::getValueAsString(const StorageType& storageType, uint32_t key, String& value) const { if (!hasKey(storageType, key)) { return false; } @@ -794,7 +795,7 @@ bool ESPEasy_key_value_store::getValue(StorageType& storageType, uint32_t key, S } // TODO TD-er: Implement -void ESPEasy_key_value_store::setValue(StorageType& storageType, uint32_t key, const String& value) {} +void ESPEasy_key_value_store::setValue(const StorageType& storageType, uint32_t key, const String& value) {} bool ESPEasy_key_value_store::getValue( StorageType & storageType, @@ -877,3 +878,54 @@ void ESPEasy_key_value_store::setHasStorageType(StorageType storageType) // TODO TD-er: Whenever this is called, there has been a change, so invalidate checksum } + +void ESPEasy_key_value_store::dump() const +{ + addLog(LOG_LEVEL_INFO, strformat(F("KVS: Payload Storage size : %d"), getPayloadStorageSize())); + + for (auto it = _string_data.begin(); it != _string_data.end(); ++it) + { + + String val; + + if (!getValueAsString( + get_StorageType_from_combined_key(it->first), + getKey_from_combined_key(it->first), + val)) { + val = '-'; + } + + addLog(LOG_LEVEL_INFO, strformat( + F("KVS: type: %d, combined-key: %x, key: %d, value: '%s' '%s'"), + get_StorageType_from_combined_key(it->first), + it->first, getKey_from_combined_key(it->first), + it->second.c_str(), + val.c_str())); + + } + + for (auto it = _4byte_data.begin(); it != _4byte_data.end(); ++it) + { + String val; + + if (!getValueAsString( + get_StorageType_from_combined_key(it->first), + getKey_from_combined_key(it->first), + val)) { + val = '-'; + } + + addLog(LOG_LEVEL_INFO, strformat( + F("KVS: type: %d, comb: %x, key: %d, val: '%x %x %x %x' strval: '%s'"), + get_StorageType_from_combined_key(it->first), + it->first, getKey_from_combined_key(it->first), + it->second.getBinary()[0], + it->second.getBinary()[1], + it->second.getBinary()[2], + it->second.getBinary()[3], + val.c_str() + )); + + } + +} diff --git a/src/src/Helpers/_ESPEasy_key_value_store.h b/src/src/Helpers/_ESPEasy_key_value_store.h index a4c9ae14c..59d9b2e6b 100644 --- a/src/src/Helpers/_ESPEasy_key_value_store.h +++ b/src/src/Helpers/_ESPEasy_key_value_store.h @@ -56,19 +56,27 @@ public: }; - State getState() const { return _state; } + static uint32_t combine_StorageType_and_key( + ESPEasy_key_value_store::StorageType storageType, + uint32_t key); - bool isEmpty() const; + static ESPEasy_key_value_store::StorageType get_StorageType_from_combined_key(uint32_t combined_key); - void clear(); + static uint32_t getKey_from_combined_key(uint32_t combined_key); + + State getState() const { return _state; } + + bool isEmpty() const; + + void clear(); - bool load(SettingsType::Enum settingsType, - int index, - uint32_t offset_in_block); - bool store(SettingsType::Enum settingsType, - int index, - uint32_t offset_in_block); + bool load(SettingsType::Enum settingsType, + int index, + uint32_t offset_in_block); + bool store(SettingsType::Enum settingsType, + int index, + uint32_t offset_in_block); // Count all data to estimate how much storage space it would require to store everything in a somewhat compact form. size_t getPayloadStorageSize() const; @@ -154,19 +162,21 @@ public: // Generic get function for any given storageType/key and represent its value as a string. // Return false when storageType/key is not present. - bool getValue(StorageType& storageType, - uint32_t key, - String & value) const; + bool getValueAsString(const StorageType& storageType, + uint32_t key, + String & value) const; // Generic set function for any given storageType/key. // Given value is a string representation of that storage type. // TODO TD-er: Implement - void setValue(StorageType & storageType, + void setValue(const StorageType & storageType, uint32_t key, const String& value); String getLastError() const { return _lastError; } + void dump() const; + private: bool getValue(StorageType & storageType, diff --git a/src/src/NWPluginStructs/NW005_data_struct_PPP_modem.cpp b/src/src/NWPluginStructs/NW005_data_struct_PPP_modem.cpp index 69b36fffd..fd63e738b 100644 --- a/src/src/NWPluginStructs/NW005_data_struct_PPP_modem.cpp +++ b/src/src/NWPluginStructs/NW005_data_struct_PPP_modem.cpp @@ -1,3 +1,50 @@ #include "../NWPluginStructs/NW005_data_struct_PPP_modem.h" +#ifdef USES_NW005 +# include "../Helpers/StringConverter.h" + + +NW005_data_struct_PPP_modem::NW005_data_struct_PPP_modem() {} + +NW005_data_struct_PPP_modem::~NW005_data_struct_PPP_modem() {} + +struct testStruct { + String foo1 = F("test123"); + int32_t foo2 = -123; + uint32_t foo3 = 123; + + +}; + +void NW005_data_struct_PPP_modem::testWrite() +{ + if (!_KVS_initialized()) { return; } + _load(); + + for (int i = 0; i < 30; ++i) { + testStruct _test{ .foo1=concat(F("str_"), (3 * (i) + 1)), .foo2=-1l * (3 * (i) + 2), .foo3=3 * (i) + 3 }; + _kvs->setValue(3 * (i) + 1, _test.foo1); + _kvs->setValue(3 * (i) + 2, _test.foo2); + _kvs->setValue(3 * (i) + 3, _test.foo3); + } + + _kvs->dump(); + + _store(); +} + +void NW005_data_struct_PPP_modem::testRead() +{ + if (!_KVS_initialized()) { return; } + _load(); + + for (uint32_t i = 1; i <= 30; ++i) { + String val; + _kvs->getValue(i, val); + addLog(LOG_LEVEL_INFO, strformat(F("KVS, foo%d: %s"), i, val.c_str())); + } + +} + +#endif // ifdef USES_NW005 diff --git a/src/src/NWPluginStructs/NW005_data_struct_PPP_modem.h b/src/src/NWPluginStructs/NW005_data_struct_PPP_modem.h index d2c9b5cbb..2327aca5e 100644 --- a/src/src/NWPluginStructs/NW005_data_struct_PPP_modem.h +++ b/src/src/NWPluginStructs/NW005_data_struct_PPP_modem.h @@ -8,13 +8,16 @@ struct NW005_data_struct_PPP_modem : public NWPluginData_base { - NW005_data_struct_PPP_modem() = default; + NW005_data_struct_PPP_modem(); + ~NW005_data_struct_PPP_modem(); + void testWrite(); + void testRead(); }; -#endif +#endif // ifdef USES_NW005 -#endif \ No newline at end of file +#endif // ifndef NWPLUGINSTRUCT_NW005_DATA_STRUCT_PPP_MODEM_H From 550aa38dea83c7e974c84ced22b866a73894b79c Mon Sep 17 00:00:00 2001 From: TD-er Date: Tue, 15 Jul 2025 13:52:25 +0200 Subject: [PATCH 116/564] [Storage] Fix issues storing/loading from key/value store --- src/src/Helpers/_ESPEasy_key_value_store.cpp | 73 +++++++++++++------ .../NW005_data_struct_PPP_modem.cpp | 13 +++- 2 files changed, 61 insertions(+), 25 deletions(-) diff --git a/src/src/Helpers/_ESPEasy_key_value_store.cpp b/src/src/Helpers/_ESPEasy_key_value_store.cpp index d5589e04a..f0d6caa70 100644 --- a/src/src/Helpers/_ESPEasy_key_value_store.cpp +++ b/src/src/Helpers/_ESPEasy_key_value_store.cpp @@ -36,20 +36,20 @@ size_t getStorageSizePerType(ESPEasy_key_value_store::StorageType storageType) { case ESPEasy_key_value_store::StorageType::not_set: break; case ESPEasy_key_value_store::StorageType::string_type: break; - case ESPEasy_key_value_store::StorageType::int8_type: return 4 + 1; - case ESPEasy_key_value_store::StorageType::uint8_type: return 4 + 1; - case ESPEasy_key_value_store::StorageType::int16_type: return 4 + 2; - case ESPEasy_key_value_store::StorageType::uint16_type: return 4 + 2; - case ESPEasy_key_value_store::StorageType::int32_type: return 4 + 4; - case ESPEasy_key_value_store::StorageType::uint32_type: return 4 + 4; - case ESPEasy_key_value_store::StorageType::int64_type: return 4 + 8; - case ESPEasy_key_value_store::StorageType::uint64_type: return 4 + 8; - case ESPEasy_key_value_store::StorageType::float_type: return 4 + 4; - case ESPEasy_key_value_store::StorageType::double_type: return 4 + 8; - case ESPEasy_key_value_store::StorageType::bool_type: return 4 + 0; + case ESPEasy_key_value_store::StorageType::int8_type: return (4 + 1); + case ESPEasy_key_value_store::StorageType::uint8_type: return (4 + 1); + case ESPEasy_key_value_store::StorageType::int16_type: return (4 + 2); + case ESPEasy_key_value_store::StorageType::uint16_type: return (4 + 2); + case ESPEasy_key_value_store::StorageType::int32_type: return (4 + 4); + case ESPEasy_key_value_store::StorageType::uint32_type: return (4 + 4); + case ESPEasy_key_value_store::StorageType::int64_type: return (4 + 8); + case ESPEasy_key_value_store::StorageType::uint64_type: return (4 + 8); + case ESPEasy_key_value_store::StorageType::float_type: return (4 + 4); + case ESPEasy_key_value_store::StorageType::double_type: return (4 + 8); + case ESPEasy_key_value_store::StorageType::bool_type: return (4 + 0); case ESPEasy_key_value_store::StorageType::MAX_Type: break; case ESPEasy_key_value_store::StorageType::bool_true: - case ESPEasy_key_value_store::StorageType::bool_false: return 4 + 0; + case ESPEasy_key_value_store::StorageType::bool_false: return (4 + 0); } return 0; } @@ -78,7 +78,7 @@ bool ESPEasy_key_value_store::load(SettingsType::Enum settingsType, int index, u { _lastError = F("KVS: Invalid index"); #ifndef BUILD_NO_DEBUG - addLog(LOG_LEVEL_DEBUG, _lastError); + addLog(LOG_LEVEL_ERROR, _lastError); // addLog(LOG_LEVEL_DEBUG, _lastError); #endif // ifndef BUILD_NO_DEBUG return false; } @@ -115,11 +115,13 @@ bool ESPEasy_key_value_store::load(SettingsType::Enum settingsType, int index, u _state = State::ErrorOnLoad; _lastError = strformat(F("KVS: Total size %d + offset %d exceeds max size %d"), totalSize, offset_in_block, max_size); #ifndef BUILD_NO_DEBUG - addLog(LOG_LEVEL_DEBUG, _lastError); + addLog(LOG_LEVEL_ERROR, _lastError); // addLog(LOG_LEVEL_DEBUG, _lastError); #endif // ifndef BUILD_NO_DEBUG return false; } + addLog(LOG_LEVEL_INFO, strformat(F("KVS Load : Total size %d + offset %d, max size %d"), totalSize, offset_in_block, max_size)); + size_t bytesLeftPartialString{}; String partialString; ESPEasy_key_value_store::StorageType storageType{}; @@ -129,7 +131,7 @@ bool ESPEasy_key_value_store::load(SettingsType::Enum settingsType, int index, u while (readPos < startChecksumPos) { // This loop always starts at the beginning of a key/value type, // except when we're parsing a string which may be longer than the buffer - const uint32_t readSize = std::min(bufferSize, max_size - readPos); + const uint32_t readSize = std::min(bufferSize, startChecksumPos - readPos); result += LoadFromFile(settingsType, index, reinterpret_cast(&buffer), @@ -219,6 +221,7 @@ bool ESPEasy_key_value_store::load(SettingsType::Enum settingsType, int index, u if ((bytesLeftPartialString == 0) && (partialString.length() > 0)) { setValue(key, std::move(partialString)); partialString.clear(); + ++bufPos; // Skip over nul-termination char } break; @@ -288,7 +291,7 @@ bool ESPEasy_key_value_store::store(SettingsType::Enum settingsType, int index, _state = State::ErrorOnSave; _lastError = F("KVS: Invalid index"); #ifndef BUILD_NO_DEBUG - addLog(LOG_LEVEL_DEBUG, _lastError); + addLog(LOG_LEVEL_ERROR, _lastError); // addLog(LOG_LEVEL_DEBUG, _lastError); #endif // ifndef BUILD_NO_DEBUG return false; } @@ -323,7 +326,7 @@ bool ESPEasy_key_value_store::store(SettingsType::Enum settingsType, int index, _state = State::ErrorOnSave; _lastError = strformat(F("KVS: Total size %d + offset %d exceeds max size %d"), totalSize, offset_in_block, max_size); #ifndef BUILD_NO_DEBUG - addLog(LOG_LEVEL_DEBUG, _lastError); + addLog(LOG_LEVEL_ERROR, _lastError); // addLog(LOG_LEVEL_DEBUG, _lastError); #endif // ifndef BUILD_NO_DEBUG return false; } @@ -492,6 +495,8 @@ bool ESPEasy_key_value_store::store(SettingsType::Enum settingsType, int index, // Consider a successful save the same as a fresh load. // The data is now the same as what is stored + addLog(LOG_LEVEL_INFO, strformat(F("KVS: Written %d bytes"), writePos)); + _state = State::NotChanged; return true; } @@ -510,13 +515,13 @@ size_t ESPEasy_key_value_store::getPayloadStorageSize() const for (auto it = _4byte_data.begin(); it != _4byte_data.end(); ++it) { res += getStorageSizePerType( - static_cast(it->first)); + get_StorageType_from_combined_key(it->first)); } for (auto it = _8byte_data.begin(); it != _8byte_data.end(); ++it) { res += getStorageSizePerType( - static_cast(it->first)); + get_StorageType_from_combined_key(it->first)); } return res; } @@ -741,8 +746,7 @@ bool ESPEasy_key_value_store::getValueAsString(const StorageType& storageType, u switch (storageType) { case ESPEasy_key_value_store::StorageType::string_type: - getValue(key, value); - break; + return getValue(key, value); GET_4BYTE_TYPE_AS_STRING(bool_type, bool) GET_4BYTE_TYPE_AS_STRING(int8_type, int8_t) GET_4BYTE_TYPE_AS_STRING(uint8_type, uint8_t) @@ -927,5 +931,32 @@ void ESPEasy_key_value_store::dump() const )); } + for (auto it = _8byte_data.begin(); it != _8byte_data.end(); ++it) + { + String val; + + if (!getValueAsString( + get_StorageType_from_combined_key(it->first), + getKey_from_combined_key(it->first), + val)) { + val = '-'; + } + + addLog(LOG_LEVEL_INFO, strformat( + F("KVS: type: %d, comb: %x, key: %d, val: '%x %x %x %x %x %x %x %x' strval: '%s'"), + get_StorageType_from_combined_key(it->first), + it->first, getKey_from_combined_key(it->first), + it->second.getBinary()[0], + it->second.getBinary()[1], + it->second.getBinary()[2], + it->second.getBinary()[3], + it->second.getBinary()[4], + it->second.getBinary()[5], + it->second.getBinary()[6], + it->second.getBinary()[7], + val.c_str() + )); + + } } diff --git a/src/src/NWPluginStructs/NW005_data_struct_PPP_modem.cpp b/src/src/NWPluginStructs/NW005_data_struct_PPP_modem.cpp index fd63e738b..84eecfc28 100644 --- a/src/src/NWPluginStructs/NW005_data_struct_PPP_modem.cpp +++ b/src/src/NWPluginStructs/NW005_data_struct_PPP_modem.cpp @@ -11,7 +11,7 @@ NW005_data_struct_PPP_modem::~NW005_data_struct_PPP_modem() {} struct testStruct { String foo1 = F("test123"); - int32_t foo2 = -123; + int64_t foo2 = -123; uint32_t foo3 = 123; @@ -20,9 +20,7 @@ struct testStruct { void NW005_data_struct_PPP_modem::testWrite() { if (!_KVS_initialized()) { return; } - _load(); - - for (int i = 0; i < 30; ++i) { + for (int i = 0; i < 5; ++i) { testStruct _test{ .foo1=concat(F("str_"), (3 * (i) + 1)), .foo2=-1l * (3 * (i) + 2), .foo3=3 * (i) + 3 }; _kvs->setValue(3 * (i) + 1, _test.foo1); _kvs->setValue(3 * (i) + 2, _test.foo2); @@ -31,7 +29,14 @@ void NW005_data_struct_PPP_modem::testWrite() _kvs->dump(); + +// _kvs->clear(); _store(); + + _load(); + + _kvs->dump(); + } void NW005_data_struct_PPP_modem::testRead() From 8a398d0acd71393a74e3fe2de911546f6d7af2e8 Mon Sep 17 00:00:00 2001 From: TD-er Date: Tue, 15 Jul 2025 14:04:43 +0200 Subject: [PATCH 117/564] [Storage] Remove 0-termination for strings from raw stored data --- src/src/Helpers/_ESPEasy_key_value_store.cpp | 6 +++--- src/src/Helpers/_ESPEasy_key_value_store.h | 4 +++- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/src/src/Helpers/_ESPEasy_key_value_store.cpp b/src/src/Helpers/_ESPEasy_key_value_store.cpp index f0d6caa70..8a0aa2479 100644 --- a/src/src/Helpers/_ESPEasy_key_value_store.cpp +++ b/src/src/Helpers/_ESPEasy_key_value_store.cpp @@ -221,7 +221,7 @@ bool ESPEasy_key_value_store::load(SettingsType::Enum settingsType, int index, u if ((bytesLeftPartialString == 0) && (partialString.length() > 0)) { setValue(key, std::move(partialString)); partialString.clear(); - ++bufPos; // Skip over nul-termination char +// ++bufPos; // Skip over nul-termination char } break; @@ -387,7 +387,7 @@ bool ESPEasy_key_value_store::store(SettingsType::Enum settingsType, int index, !mustFlushToFile) { // Write 0-termination + move to next string - buffer[bufPos++] = 0; +// buffer[bufPos++] = 0; pos_in_partial_string = -1; ++it_str; } @@ -509,7 +509,7 @@ size_t ESPEasy_key_value_store::getPayloadStorageSize() const { res += 4; // key size res += 2; // string length - res += it->second.length() + 1; // include 0-termination + res += it->second.length(); // + 1; // include 0-termination } for (auto it = _4byte_data.begin(); it != _4byte_data.end(); ++it) diff --git a/src/src/Helpers/_ESPEasy_key_value_store.h b/src/src/Helpers/_ESPEasy_key_value_store.h index 59d9b2e6b..cd4f2e52b 100644 --- a/src/src/Helpers/_ESPEasy_key_value_store.h +++ b/src/src/Helpers/_ESPEasy_key_value_store.h @@ -15,7 +15,9 @@ // - List of key/value pairs: // - uint8_t: storage type // - uint8_t[3]: key -// - zero-terminated string or shortened binary form +// - N bytes value; either: +// - String: 2 bytes length + string (without 0-termination) +// - shortened binary form // ... // - uint8_t[16] checksum From 0f7cdf3ceb10099066f2e985d0e43feb35fb96ec Mon Sep 17 00:00:00 2001 From: TD-er Date: Wed, 16 Jul 2025 00:12:49 +0200 Subject: [PATCH 118/564] [Storage] Use key value store for storing network interfaces --- src/_NW005_PPP_modem.cpp | 81 ++-- src/_NWPlugin_Helper.cpp | 20 +- src/_NWPlugin_Helper.h | 24 +- src/src/DataStructs/NWPluginData_base.cpp | 41 +- src/src/DataStructs/NWPluginData_base.h | 33 +- src/src/Helpers/_ESPEasy_key_value_store.cpp | 451 ++++++++++++------ src/src/Helpers/_ESPEasy_key_value_store.h | 27 +- .../NW005_data_struct_PPP_modem.cpp | 134 +++++- .../NW005_data_struct_PPP_modem.h | 5 +- .../ESPEasy_key_value_store_webform.cpp | 140 ++++++ .../ESPEasy_key_value_store_webform.h | 50 ++ 11 files changed, 746 insertions(+), 260 deletions(-) create mode 100644 src/src/WebServer/ESPEasy_key_value_store_webform.cpp create mode 100644 src/src/WebServer/ESPEasy_key_value_store_webform.h diff --git a/src/_NW005_PPP_modem.cpp b/src/_NW005_PPP_modem.cpp index 72654fed6..e739a2f04 100644 --- a/src/_NW005_PPP_modem.cpp +++ b/src/_NW005_PPP_modem.cpp @@ -10,7 +10,7 @@ # define NWPLUGIN_ID_005 5 # define NWPLUGIN_NAME_005 "PPP modem" -#include "src/NWPluginStructs/NW005_data_struct_PPP_modem.h" +# include "src/NWPluginStructs/NW005_data_struct_PPP_modem.h" # include "src/DataStructs/ESPEasy_EventStruct.h" @@ -35,9 +35,9 @@ # include "src/WebServer/Markup_Forms.h" # include "src/WebServer/common.h" -#include +# include -#include +# include bool NWPlugin_005(NWPlugin::Function function, struct EventStruct *event, String& string) { @@ -80,69 +80,51 @@ bool NWPlugin_005(NWPlugin::Function function, struct EventStruct *event, String case NWPlugin::Function::NWPLUGIN_WEBFORM_SAVE: { + NW005_data_struct_PPP_modem *NW_data = static_cast(getNWPluginData(event->NetworkIndex)); + bool mustCleanup = NW_data == nullptr; + + if (mustCleanup) { + NW_data = new (std::nothrow) NW005_data_struct_PPP_modem(event->NetworkIndex); + NW_data->init_KVS(); + } + + if (NW_data) { + NW_data->webform_save(event); + + if (mustCleanup) { delete NW_data; } + + } break; } case NWPlugin::Function::NWPLUGIN_WEBFORM_LOAD: { - // TODO TD-er: We cannot use ESPEasySerialPort here as PPPClass needs to handle the pins using periman -{ - const int ids[] = { - static_cast(ESPEasySerialPort::serial0) -#if USABLE_SOC_UART_NUM > 1 - ,static_cast(ESPEasySerialPort::serial1) -#endif -#if USABLE_SOC_UART_NUM > 2 - ,static_cast(ESPEasySerialPort::serial2) -#endif -#if USABLE_SOC_UART_NUM > 3 - ,static_cast(ESPEasySerialPort::serial3) -#endif -#if USABLE_SOC_UART_NUM > 4 - ,static_cast(ESPEasySerialPort::serial4) -#endif -#if USABLE_SOC_UART_NUM > 5 - ,static_cast(ESPEasySerialPort::serial5) -#endif - }; + NW005_data_struct_PPP_modem *NW_data = static_cast(getNWPluginData(event->NetworkIndex)); + bool mustCleanup = NW_data == nullptr; - constexpr int NR_ESPEASY_SERIAL_TYPES = NR_ELEMENTS(ids); - const __FlashStringHelper* options[] = { - serialHelper_getSerialTypeLabel(ESPEasySerialPort::serial0) -#if USABLE_SOC_UART_NUM > 1 - ,serialHelper_getSerialTypeLabel(ESPEasySerialPort::serial1) -#endif -#if USABLE_SOC_UART_NUM > 2 - ,serialHelper_getSerialTypeLabel(ESPEasySerialPort::serial2) -#endif -#if USABLE_SOC_UART_NUM > 3 - ,serialHelper_getSerialTypeLabel(ESPEasySerialPort::serial3) -#endif -#if USABLE_SOC_UART_NUM > 4 - ,serialHelper_getSerialTypeLabel(ESPEasySerialPort::serial4) -#endif -#if USABLE_SOC_UART_NUM > 5 - ,serialHelper_getSerialTypeLabel(ESPEasySerialPort::serial5) -#endif - }; - FormSelectorOptions selector(NR_ESPEASY_SERIAL_TYPES, options, ids); + if (mustCleanup) { + NW_data = new (std::nothrow) NW005_data_struct_PPP_modem(event->NetworkIndex); + NW_data->init_KVS(); + } -// selector.addFormSelector(F("Serial Port"), F("serPort"), port); - -} + if (NW_data) { + NW_data->webform_load(event); + if (mustCleanup) { delete NW_data; } + } break; } case NWPlugin::Function::NWPLUGIN_INIT: { - initNWPluginData(event->NetworkIndex, new (std::nothrow) NW005_data_struct_PPP_modem); + initNWPluginData(event->NetworkIndex, new (std::nothrow) NW005_data_struct_PPP_modem(event->NetworkIndex)); NW005_data_struct_PPP_modem *NW_data = static_cast(getNWPluginData(event->NetworkIndex)); + if (NW_data) { - NW_data->testWrite(); + // NW_data->testWrite(); } break; @@ -151,8 +133,9 @@ bool NWPlugin_005(NWPlugin::Function function, struct EventStruct *event, String case NWPlugin::Function::NWPLUGIN_EXIT: { NW005_data_struct_PPP_modem *NW_data = static_cast(getNWPluginData(event->NetworkIndex)); + if (NW_data) { - NW_data->testRead(); + // NW_data->testRead(); } break; } diff --git a/src/_NWPlugin_Helper.cpp b/src/_NWPlugin_Helper.cpp index b1e6168c6..8d0e8f4fa 100644 --- a/src/_NWPlugin_Helper.cpp +++ b/src/_NWPlugin_Helper.cpp @@ -1,9 +1,11 @@ #include "../src/_NWPlugin_Helper.h" -#include "src/CustomBuild/ESPEasyLimits.h" +#if FEATURE_STORE_NETWORK_INTERFACE_SETTINGS -#include "src/Globals/NWPlugins.h" -#include "src/Globals/Settings.h" +# include "src/CustomBuild/ESPEasyLimits.h" + +# include "src/Globals/NWPlugins.h" +# include "src/Globals/Settings.h" NWPluginData_base *NWPlugin_task_data[NETWORK_MAX]; @@ -32,9 +34,9 @@ bool initNWPluginData(networkIndex_t networkIndex, NWPluginData_base *data) { } // 2nd heap may have been active to allocate the NWPluginData, but here we need to keep the default heap active - #ifdef USE_SECOND_HEAP + # ifdef USE_SECOND_HEAP HeapSelectDram ephemeral; - #endif // ifdef USE_SECOND_HEAP + # endif // ifdef USE_SECOND_HEAP clearNWPluginData(networkIndex); @@ -45,9 +47,7 @@ bool initNWPluginData(networkIndex_t networkIndex, NWPluginData_base *data) { delete data; data = nullptr; } else { - NWPlugin_task_data[networkIndex] = data; - NWPlugin_task_data[networkIndex]->_nw_data_pluginID = Settings.getNWPluginID_for_network(networkIndex); - NWPlugin_task_data[networkIndex]->_networkIndex = networkIndex; + NWPlugin_task_data[networkIndex] = data; } } else { delete data; @@ -79,5 +79,7 @@ bool nwpluginTaskData_initialized(networkIndex_t networkIndex) { return false; } return NWPlugin_task_data[networkIndex] != nullptr && - (NWPlugin_task_data[networkIndex]->_nw_data_pluginID == Settings.getNWPluginID_for_network(networkIndex)); + (NWPlugin_task_data[networkIndex]->getNWWPluginID() == Settings.getNWPluginID_for_network(networkIndex)); } + +#endif // if FEATURE_STORE_NETWORK_INTERFACE_SETTINGS diff --git a/src/_NWPlugin_Helper.h b/src/_NWPlugin_Helper.h index 8c91cda78..80c81bc7c 100644 --- a/src/_NWPlugin_Helper.h +++ b/src/_NWPlugin_Helper.h @@ -3,32 +3,34 @@ #include "ESPEasy_common.h" -#include "src/CustomBuild/ESPEasyLimits.h" +#if FEATURE_STORE_NETWORK_INTERFACE_SETTINGS +# include "src/CustomBuild/ESPEasyLimits.h" -#include "src/DataStructs/NWPluginData_base.h" +# include "src/DataStructs/NWPluginData_base.h" extern NWPluginData_base *NWPlugin_task_data[NETWORK_MAX]; // Try to allocate in PSRAM or 2nd heap if possible -#define special_initNWPluginData(I, T) void * ptr = special_calloc(1, sizeof(T)); if (ptr) { initNWPluginData(I, new (ptr) T()); } - +# define special_initNWPluginData(I, T) void *ptr = special_calloc(1, sizeof(T)); \ + if (ptr) { initNWPluginData(I, new (ptr) T()); } // ============================================== -// Data used by instances of plugins. +// Data used by instances of NWPlugins. // ============================================= -void resetNWPluginData(); +void resetNWPluginData(); -void clearNWPluginData(networkIndex_t networkIndex); +void clearNWPluginData(networkIndex_t networkIndex); -bool initNWPluginData(networkIndex_t networkIndex, - NWPluginData_base *data); +bool initNWPluginData(networkIndex_t networkIndex, + NWPluginData_base *data); NWPluginData_base* getNWPluginData(networkIndex_t networkIndex); NWPluginData_base* getNWPluginDataBaseClassOnly(networkIndex_t networkIndex); -bool nwpluginTaskData_initialized(networkIndex_t networkIndex); +bool nwpluginTaskData_initialized(networkIndex_t networkIndex); -#endif \ No newline at end of file +#endif // if FEATURE_STORE_NETWORK_INTERFACE_SETTINGS +#endif // ifndef _NWPLUGIN_HELPER_H diff --git a/src/src/DataStructs/NWPluginData_base.cpp b/src/src/DataStructs/NWPluginData_base.cpp index 02701e285..78e7fc330 100644 --- a/src/src/DataStructs/NWPluginData_base.cpp +++ b/src/src/DataStructs/NWPluginData_base.cpp @@ -1,14 +1,24 @@ #include "../DataStructs/NWPluginData_base.h" -#include "../DataStructs/ESPEasy_EventStruct.h" +#if FEATURE_STORE_NETWORK_INTERFACE_SETTINGS -#include "../Globals/RuntimeData.h" - -#include "../Helpers/StringConverter.h" -#include "../Helpers/_ESPEasy_key_value_store.h" +# include "../DataStructs/ESPEasy_EventStruct.h" +# include "../Globals/RuntimeData.h" +# include "../Globals/Settings.h" +# include "../Helpers/StringConverter.h" +# include "../Helpers/_ESPEasy_key_value_store.h" -NWPluginData_base::NWPluginData_base() : _kvs(nullptr), _baseClassOnly(false) {} +NWPluginData_base::NWPluginData_base(nwpluginID_t nwpluginID, networkIndex_t networkIndex) : + _kvs(nullptr), + _nw_data_pluginID(nwpluginID), + _networkIndex(networkIndex), + _baseClassOnly(false) +{ + if (_kvs == nullptr) { + _kvs = new (std::nothrow) ESPEasy_key_value_store; + } +} NWPluginData_base::~NWPluginData_base() { @@ -20,11 +30,12 @@ bool NWPluginData_base::plugin_write_base(struct EventStruct *event, const String & string) { return false; } bool NWPluginData_base::init_KVS() -{ - if (_kvs == nullptr) { - _kvs = new (std::nothrow) ESPEasy_key_value_store; - } - return _kvs != nullptr; +{ + if (!_KVS_initialized()) { return false; } +// _load(); + + // TODO TD-er: load() can also return false when some other data used to be present. Have to think about how to handle this. + return true; } bool NWPluginData_base::_load() @@ -33,7 +44,8 @@ bool NWPluginData_base::_load() return _kvs->load( SettingsType::Enum::NetworkInterfaceSettings_Type, _networkIndex, - 0); + 0, + _nw_data_pluginID.value); } bool NWPluginData_base::_store() @@ -42,5 +54,8 @@ bool NWPluginData_base::_store() return _kvs->store( SettingsType::Enum::NetworkInterfaceSettings_Type, _networkIndex, - 0); + 0, + _nw_data_pluginID.value); } + +#endif // if FEATURE_STORE_NETWORK_INTERFACE_SETTINGS diff --git a/src/src/DataStructs/NWPluginData_base.h b/src/src/DataStructs/NWPluginData_base.h index 346c7a41a..36a2d2a57 100644 --- a/src/src/DataStructs/NWPluginData_base.h +++ b/src/src/DataStructs/NWPluginData_base.h @@ -3,10 +3,11 @@ #include "../../ESPEasy_common.h" +#if FEATURE_STORE_NETWORK_INTERFACE_SETTINGS -#include "../DataTypes/NWPluginID.h" -#include "../DataTypes/NetworkIndex.h" -#include "../Helpers/_ESPEasy_key_value_store.h" +# include "../DataTypes/NWPluginID.h" +# include "../DataTypes/NetworkIndex.h" +# include "../Helpers/_ESPEasy_key_value_store.h" // ============================================== // Data used by instances of NW-plugins. @@ -16,7 +17,7 @@ // N.B. in order to use this, a data object must inherit from this base class. // This is a compile time check. struct NWPluginData_base { - NWPluginData_base(); + NWPluginData_base(nwpluginID_t nwpluginID, networkIndex_t networkIndex); virtual ~NWPluginData_base(); @@ -28,14 +29,10 @@ struct NWPluginData_base { const String & string); - // We cannot use dynamic_cast, so we must keep track of the plugin ID to - // perform checks on the casting. - // This is also a check to only use these functions and not to insert pointers - // at random in the Plugin_task_data array. - nwpluginID_t _nw_data_pluginID = INVALID_NW_PLUGIN_ID; - networkIndex_t _networkIndex = INVALID_NETWORK_INDEX; + // Should only be called from initNWPluginData + bool init_KVS(); - bool init_KVS(); + nwpluginID_t getNWWPluginID() const { return _nw_data_pluginID; } protected: @@ -47,12 +44,20 @@ protected: // Save settings from the _kvs to the settings bool _store(); - ESPEasy_key_value_store *_kvs=nullptr; + ESPEasy_key_value_store *_kvs = nullptr; + + // We cannot use dynamic_cast, so we must keep track of the plugin ID to + // perform checks on the casting. + // This is also a check to only use these functions and not to insert pointers + // at random in the Plugin_task_data array. + nwpluginID_t _nw_data_pluginID = INVALID_NW_PLUGIN_ID; + networkIndex_t _networkIndex = INVALID_NETWORK_INDEX; bool _baseClassOnly = false; + }; +#endif // if FEATURE_STORE_NETWORK_INTERFACE_SETTINGS - -#endif \ No newline at end of file +#endif // ifndef DATASTRUCTS_NWPLUGINDATA_BASE_H diff --git a/src/src/Helpers/_ESPEasy_key_value_store.cpp b/src/src/Helpers/_ESPEasy_key_value_store.cpp index 8a0aa2479..b56b88097 100644 --- a/src/src/Helpers/_ESPEasy_key_value_store.cpp +++ b/src/src/Helpers/_ESPEasy_key_value_store.cpp @@ -2,6 +2,7 @@ #include "../Helpers/StringConverter_Numerical.h" #include "../Helpers/ESPEasy_Storage.h" +#include "../Helpers/ESPEasy_time_calc.h" #include "../Helpers/StringConverter.h" uint32_t ESPEasy_key_value_store::combine_StorageType_and_key( @@ -36,20 +37,20 @@ size_t getStorageSizePerType(ESPEasy_key_value_store::StorageType storageType) { case ESPEasy_key_value_store::StorageType::not_set: break; case ESPEasy_key_value_store::StorageType::string_type: break; - case ESPEasy_key_value_store::StorageType::int8_type: return (4 + 1); - case ESPEasy_key_value_store::StorageType::uint8_type: return (4 + 1); - case ESPEasy_key_value_store::StorageType::int16_type: return (4 + 2); - case ESPEasy_key_value_store::StorageType::uint16_type: return (4 + 2); - case ESPEasy_key_value_store::StorageType::int32_type: return (4 + 4); - case ESPEasy_key_value_store::StorageType::uint32_type: return (4 + 4); - case ESPEasy_key_value_store::StorageType::int64_type: return (4 + 8); - case ESPEasy_key_value_store::StorageType::uint64_type: return (4 + 8); - case ESPEasy_key_value_store::StorageType::float_type: return (4 + 4); - case ESPEasy_key_value_store::StorageType::double_type: return (4 + 8); - case ESPEasy_key_value_store::StorageType::bool_type: return (4 + 0); + case ESPEasy_key_value_store::StorageType::int8_type: return 4 + 1; + case ESPEasy_key_value_store::StorageType::uint8_type: return 4 + 1; + case ESPEasy_key_value_store::StorageType::int16_type: return 4 + 2; + case ESPEasy_key_value_store::StorageType::uint16_type: return 4 + 2; + case ESPEasy_key_value_store::StorageType::int32_type: return 4 + 4; + case ESPEasy_key_value_store::StorageType::uint32_type: return 4 + 4; + case ESPEasy_key_value_store::StorageType::int64_type: return 4 + 8; + case ESPEasy_key_value_store::StorageType::uint64_type: return 4 + 8; + case ESPEasy_key_value_store::StorageType::float_type: return 4 + 4; + case ESPEasy_key_value_store::StorageType::double_type: return 4 + 8; + case ESPEasy_key_value_store::StorageType::bool_type: return 4 + 0; case ESPEasy_key_value_store::StorageType::MAX_Type: break; case ESPEasy_key_value_store::StorageType::bool_true: - case ESPEasy_key_value_store::StorageType::bool_false: return (4 + 0); + case ESPEasy_key_value_store::StorageType::bool_false: return 4 + 0; } return 0; } @@ -70,8 +71,13 @@ void ESPEasy_key_value_store::clear() _state = State::Empty; } -bool ESPEasy_key_value_store::load(SettingsType::Enum settingsType, int index, uint32_t offset_in_block) +bool ESPEasy_key_value_store::load( + SettingsType::Enum settingsType, + int index, + uint32_t offset_in_block, + uint16_t id_to_match) { + if (_state == State::NotChanged) { return true; } int offset, max_size; if (!SettingsType::getSettingsParameters(settingsType, index, offset, max_size)) @@ -98,29 +104,41 @@ bool ESPEasy_key_value_store::load(SettingsType::Enum settingsType, int index, u result += LoadFromFile(settingsType, index, reinterpret_cast(&buffer), - 4, // readSize + 6, // readSize readPos); - readPos += 4; + readPos += 6; // TODO TD-er: Compute checksum & check version const uint8_t version = buffer[0]; - const size_t payloadSize = (buffer[3] << 16) | (buffer[2] << 8) | buffer[1]; - const size_t totalSize = 4 + payloadSize + 16; // header + payload + checksum - const size_t startChecksumPos = offset_in_block + 4 + payloadSize; + // uint8_t[2]: ID to match, if not matched, then stop loading + const uint16_t id = (buffer[2] << 8) | buffer[1]; - if ((offset_in_block + totalSize) > static_cast(max_size)) { - _state = State::ErrorOnLoad; - _lastError = strformat(F("KVS: Total size %d + offset %d exceeds max size %d"), totalSize, offset_in_block, max_size); + if (id != id_to_match) { #ifndef BUILD_NO_DEBUG - addLog(LOG_LEVEL_ERROR, _lastError); // addLog(LOG_LEVEL_DEBUG, _lastError); + _lastError = strformat(F("KVS: Stored ID %d != expected ID %d, stop loading"), id, id_to_match); + addLog(LOG_LEVEL_DEBUG, _lastError); #endif // ifndef BUILD_NO_DEBUG return false; } + const size_t payloadSize = (buffer[5] << 16) | (buffer[4] << 8) | buffer[3]; + const size_t totalSize = 6 + payloadSize + 16; // header + payload + checksum + const size_t startChecksumPos = offset_in_block + 6 + payloadSize; + + if ((offset_in_block + totalSize) > static_cast(max_size)) { + _state = State::ErrorOnLoad; + #ifndef BUILD_NO_DEBUG + _lastError = strformat(F("KVS: Total size %d + offset %d exceeds max size %d"), totalSize, offset_in_block, max_size); + addLog(LOG_LEVEL_ERROR, _lastError); // addLog(LOG_LEVEL_DEBUG, _lastError); + #endif // ifndef BUILD_NO_DEBUG + return false; + } +#ifndef BUILD_NO_DEBUG addLog(LOG_LEVEL_INFO, strformat(F("KVS Load : Total size %d + offset %d, max size %d"), totalSize, offset_in_block, max_size)); +#endif size_t bytesLeftPartialString{}; String partialString; @@ -128,7 +146,9 @@ bool ESPEasy_key_value_store::load(SettingsType::Enum settingsType, int index, u size_t sizePerType{}; uint32_t key{}; - while (readPos < startChecksumPos) { + const unsigned long start = millis(); + + while (readPos < startChecksumPos && timePassedSince(start) < 1000) { // This loop always starts at the beginning of a key/value type, // except when we're parsing a string which may be longer than the buffer const uint32_t readSize = std::min(bufferSize, startChecksumPos - readPos); @@ -137,10 +157,14 @@ bool ESPEasy_key_value_store::load(SettingsType::Enum settingsType, int index, u reinterpret_cast(&buffer), readSize, readPos); + addLog(LOG_LEVEL_INFO, strformat( + F("KVS: LoadFromFile readSize %d readPos %d"), + readSize, + readPos)); uint32_t bufPos = 0; bool loadNextFromFile = false; - for (; !loadNextFromFile && (bufPos + 3) < readSize;) { + for (; !loadNextFromFile && bufPos < readSize;) { // In this loop, only update bufPos and at the end also correct readPos // as it might be easy to forget adding the same to both bufPos and readPos // However in logs we might need to refer to the actual pos in the file/block @@ -150,120 +174,138 @@ bool ESPEasy_key_value_store::load(SettingsType::Enum settingsType, int index, u if (!bytesLeftPartialString) { // Parse StorageType + key - const ESPEasy_key_value_store_4byte_data_t combined_key(buf_start + bufPos); - storageType = get_StorageType_from_combined_key(combined_key.getUint32()); - sizePerType = getStorageSizePerType(storageType); - key = getKey_from_combined_key(combined_key.getUint32()); + if ((readSize - bufPos) < 4) { + // Read next block + loadNextFromFile = true; - if ((sizePerType < 4) && (storageType != ESPEasy_key_value_store::StorageType::string_type)) { - // Should not happen as those should not be stored in the file - _state = State::ErrorOnLoad; - _lastError = strformat(F("KVS: Invalid storage type %d at readPos %d"), static_cast(storageType), LOG_READPOS_OFFSET); - addLog(LOG_LEVEL_ERROR, _lastError); - return false; + } else { + const ESPEasy_key_value_store_4byte_data_t combined_key(buf_start + bufPos); + storageType = get_StorageType_from_combined_key(combined_key.getUint32()); + sizePerType = getStorageSizePerType(storageType); + key = getKey_from_combined_key(combined_key.getUint32()); + + if ((sizePerType < 4) && (storageType != ESPEasy_key_value_store::StorageType::string_type)) { + // Should not happen as those should not be stored in the file + _state = State::ErrorOnLoad; + #ifndef BUILD_NO_DEBUG + _lastError = strformat(F("KVS: Invalid storage type %d at readPos %d"), static_cast(storageType), LOG_READPOS_OFFSET); + addLog(LOG_LEVEL_ERROR, _lastError); + #endif // ifndef BUILD_NO_DEBUG + return false; + } } } - switch (storageType) - { - case ESPEasy_key_value_store::StorageType::bool_false: - case ESPEasy_key_value_store::StorageType::bool_type: - case ESPEasy_key_value_store::StorageType::bool_true: + if (!loadNextFromFile) { + switch (storageType) { - // Store bool type - const bool res = storageType != ESPEasy_key_value_store::StorageType::bool_false; - setValue(key, res); - bufPos += 4; - break; - } + case ESPEasy_key_value_store::StorageType::bool_false: + case ESPEasy_key_value_store::StorageType::bool_type: + case ESPEasy_key_value_store::StorageType::bool_true: + { + // Store bool type + const bool res = storageType != ESPEasy_key_value_store::StorageType::bool_false; + setValue(key, res); + bufPos += 4; + break; + } - case ESPEasy_key_value_store::StorageType::string_type: - { - if (bytesLeftPartialString == 0) { - // Found new string type - // Read expected size in next 2 bytes - if ((readSize - bufPos) < 6) { - // Read next block - loadNextFromFile = true; - } else { - bufPos += 4; - bytesLeftPartialString = (buffer[bufPos] << 8) | buffer[bufPos + 1]; - bufPos += 2; + case ESPEasy_key_value_store::StorageType::string_type: + { + if (bytesLeftPartialString == 0) { + // Found new string type + // Read expected size in next 2 bytes + if ((readSize - bufPos) < 6) { + // Read next block + loadNextFromFile = true; + } else { + bufPos += 4; + bytesLeftPartialString = (buffer[bufPos] << 8) | buffer[bufPos + 1]; + bufPos += 2; - if (!partialString.reserve(bytesLeftPartialString)) - { - _state = State::ErrorOnLoad; - _lastError = strformat(F("KVS: Could not allocate string size %d at readPos %d"), bytesLeftPartialString, LOG_READPOS_OFFSET); + if (!partialString.reserve(bytesLeftPartialString)) + { + _state = State::ErrorOnLoad; + #ifndef BUILD_NO_DEBUG + _lastError = strformat(F("KVS: Could not allocate string size %d at readPos %d"), bytesLeftPartialString, + LOG_READPOS_OFFSET); + addLog(LOG_LEVEL_ERROR, _lastError); + #endif // ifndef BUILD_NO_DEBUG + return false; + } + } + } + + while (bytesLeftPartialString > 0 && bufPos < readSize) { + const char c = buffer[bufPos]; + --bytesLeftPartialString; + ++bufPos; + + if (c != '\0') { + partialString += c; + } else if (bytesLeftPartialString > 0) { + // What to do here if bytesLeftPartialString != 0 ???? + _state = State::ErrorOnLoad; + #ifndef BUILD_NO_DEBUG + _lastError = strformat(F("KVS: Unexpected end-of-string, expected %d more at readPos %d"), + bytesLeftPartialString, + LOG_READPOS_OFFSET); addLog(LOG_LEVEL_ERROR, _lastError); + #endif // ifndef BUILD_NO_DEBUG return false; } } - } - while (bytesLeftPartialString > 0 && bufPos < readSize) { - const char c = buffer[bufPos]; - --bytesLeftPartialString; - ++bufPos; + if ((bytesLeftPartialString == 0) && (partialString.length() > 0)) { + setValue(key, std::move(partialString)); + partialString.clear(); - if (c != '\0') { - partialString += c; - } else if (bytesLeftPartialString > 0) { - // What to do here if bytesLeftPartialString != 0 ???? - _state = State::ErrorOnLoad; - _lastError = strformat(F("KVS: Unexpected end-of-string, expected %d more at readPos %d"), - bytesLeftPartialString, - LOG_READPOS_OFFSET); - addLog(LOG_LEVEL_ERROR, _lastError); - return false; + // ++bufPos; // Skip over nul-termination char } + break; + } - if ((bytesLeftPartialString == 0) && (partialString.length() > 0)) { - setValue(key, std::move(partialString)); - partialString.clear(); -// ++bufPos; // Skip over nul-termination char - } - break; + default: + { + if ((readSize - bufPos) < sizePerType) { + // Read next block + loadNextFromFile = true; + } else { + bufPos += 4; + const size_t bytesLeftPerType = sizePerType - 4; - } + if (bytesLeftPerType == 8) { + // 8-byte value type + const ESPEasy_key_value_store_8byte_data_t data_8byte(buf_start + bufPos); + setValue(storageType, key, data_8byte); + } else if (bytesLeftPerType > 0) { + if (bytesLeftPerType == 4) { + const ESPEasy_key_value_store_4byte_data_t data_4byte(buf_start + bufPos); + setValue(storageType, key, data_4byte); + } else { + ESPEasy_key_value_store_4byte_data_t data_4byte{}; - default: - { - if ((readSize - bufPos) < sizePerType) { - // Read next block - loadNextFromFile = true; - } else { - bufPos += 4; - const size_t bytesLeftPerType = sizePerType - 4; - - if (bytesLeftPerType == 8) { - // 8-byte value type - const ESPEasy_key_value_store_8byte_data_t data_8byte(buf_start + bufPos); - setValue(storageType, key, data_8byte); - } else if (bytesLeftPerType > 0) { - if (bytesLeftPerType == 4) { - const ESPEasy_key_value_store_4byte_data_t data_4byte(buf_start + bufPos); - setValue(storageType, key, data_4byte); - } else { - ESPEasy_key_value_store_4byte_data_t data_4byte{}; - - // FIXME TD-er: Need to check the byte order - memcpy(data_4byte.getBinary(), buf_start + bufPos, bytesLeftPerType); - setValue(storageType, key, data_4byte); + // FIXME TD-er: Need to check the byte order + memcpy(data_4byte.getBinary(), buf_start + bufPos, bytesLeftPerType); + setValue(storageType, key, data_4byte); + } } + bufPos += bytesLeftPerType; } - bufPos += bytesLeftPerType; - } - break; + break; + } } } if ((bufPos_start_loop == bufPos) && !loadNextFromFile) { - _state = State::ErrorOnLoad; + _state = State::ErrorOnLoad; + #ifndef BUILD_NO_DEBUG _lastError = strformat(F("KVS: BUG! Did not increment bufPos while processing StorageType %d at readPos %d"), static_cast(storageType), LOG_READPOS_OFFSET); addLog(LOG_LEVEL_ERROR, _lastError); + #endif // ifndef BUILD_NO_DEBUG return false; } readPos += (bufPos - bufPos_start_loop); @@ -271,15 +313,34 @@ bool ESPEasy_key_value_store::load(SettingsType::Enum settingsType, int index, u } } + if (timePassedSince(start) >= 1000) { + _state = State::ErrorOnLoad; +#ifndef BUILD_NO_DEBUG + _lastError = strformat( + F("KVS: Timeout! bufPos while processing StorageType %d at readPos %d, startChecksumPos: %d"), + static_cast(storageType), readPos, startChecksumPos); + addLog(LOG_LEVEL_ERROR, _lastError); + dump(); +#endif // ifndef BUILD_NO_DEBUG + return false; + + } + // TODO TD-er: Read checksum _state = State::NotChanged; return true; } -bool ESPEasy_key_value_store::store(SettingsType::Enum settingsType, int index, uint32_t offset_in_block) +bool ESPEasy_key_value_store::store( + SettingsType::Enum settingsType, + int index, + uint32_t offset_in_block, + uint16_t id_to_match) { if (getState() == State::NotChanged) { + #ifndef BUILD_NO_DEBUG addLog(LOG_LEVEL_INFO, F("KVS: Content not changed, no need to save")); + #endif return true; } @@ -288,9 +349,9 @@ bool ESPEasy_key_value_store::store(SettingsType::Enum settingsType, int index, if (!SettingsType::getSettingsParameters(settingsType, index, offset, max_size)) { - _state = State::ErrorOnSave; - _lastError = F("KVS: Invalid index"); + _state = State::ErrorOnSave; #ifndef BUILD_NO_DEBUG + _lastError = F("KVS: Invalid index"); addLog(LOG_LEVEL_ERROR, _lastError); // addLog(LOG_LEVEL_DEBUG, _lastError); #endif // ifndef BUILD_NO_DEBUG return false; @@ -317,15 +378,17 @@ bool ESPEasy_key_value_store::store(SettingsType::Enum settingsType, int index, size_t bufPos = 0; // Write header - buffer[bufPos++] = 0; // TODO TD-er: Add version + buffer[bufPos++] = 0; // TODO TD-er: Add version + buffer[bufPos++] = id_to_match & 0xFF; + buffer[bufPos++] = (id_to_match >> 8) & 0xFF; const size_t payloadSize = getPayloadStorageSize(); - const size_t totalSize = 4 + payloadSize + 16; // header + payload + checksum + const size_t totalSize = 6 + payloadSize + 16; // header + payload + checksum const size_t startChecksumPos = offset_in_block + 4 + payloadSize; if ((offset_in_block + totalSize) > static_cast(max_size)) { - _state = State::ErrorOnSave; - _lastError = strformat(F("KVS: Total size %d + offset %d exceeds max size %d"), totalSize, offset_in_block, max_size); + _state = State::ErrorOnSave; #ifndef BUILD_NO_DEBUG + _lastError = strformat(F("KVS: Total size %d + offset %d exceeds max size %d"), totalSize, offset_in_block, max_size); addLog(LOG_LEVEL_ERROR, _lastError); // addLog(LOG_LEVEL_DEBUG, _lastError); #endif // ifndef BUILD_NO_DEBUG return false; @@ -387,7 +450,7 @@ bool ESPEasy_key_value_store::store(SettingsType::Enum settingsType, int index, !mustFlushToFile) { // Write 0-termination + move to next string -// buffer[bufPos++] = 0; + // buffer[bufPos++] = 0; pos_in_partial_string = -1; ++it_str; } @@ -459,10 +522,12 @@ bool ESPEasy_key_value_store::store(SettingsType::Enum settingsType, int index, } } else { - _state = State::ErrorOnSave; + _state = State::ErrorOnSave; + #ifndef BUILD_NO_DEBUG _lastError = strformat(F("KVS: BUG! Should not have storage type %d stored with 0 bytes at writePos %d"), static_cast(storageType), writePos + bufPos); addLog(LOG_LEVEL_ERROR, _lastError); + #endif // ifndef BUILD_NO_DEBUG return false; } } else { @@ -494,10 +559,11 @@ bool ESPEasy_key_value_store::store(SettingsType::Enum settingsType, int index, // Consider a successful save the same as a fresh load. // The data is now the same as what is stored - +#ifndef BUILD_NO_DEBUG addLog(LOG_LEVEL_INFO, strformat(F("KVS: Written %d bytes"), writePos)); - +#endif _state = State::NotChanged; + dump(); return true; } @@ -507,8 +573,8 @@ size_t ESPEasy_key_value_store::getPayloadStorageSize() const for (auto it = _string_data.begin(); it != _string_data.end(); ++it) { - res += 4; // key size - res += 2; // string length + res += 4; // key size + res += 2; // string length res += it->second.length(); // + 1; // include 0-termination } @@ -727,18 +793,6 @@ bool ESPEasy_key_value_store::getValue(uint32_t key, bool& value) const void ESPEasy_key_value_store::setValue(uint32_t key, const bool& value) { SET_4BYTE_TYPE(bool_type, setUint32); } - -#define GET_4BYTE_TYPE_AS_STRING(T, CT) \ - case ESPEasy_key_value_store::StorageType::T: \ - { \ - CT v{}; \ - if (getValue(key, v)) { \ - value = String(v); \ - return true; \ - } \ - break; \ - } - bool ESPEasy_key_value_store::getValueAsString(const StorageType& storageType, uint32_t key, String& value) const { if (!hasKey(storageType, key)) { return false; } @@ -747,21 +801,31 @@ bool ESPEasy_key_value_store::getValueAsString(const StorageType& storageType, u { case ESPEasy_key_value_store::StorageType::string_type: return getValue(key, value); - GET_4BYTE_TYPE_AS_STRING(bool_type, bool) - GET_4BYTE_TYPE_AS_STRING(int8_type, int8_t) - GET_4BYTE_TYPE_AS_STRING(uint8_type, uint8_t) - GET_4BYTE_TYPE_AS_STRING(int16_type, int16_t) - GET_4BYTE_TYPE_AS_STRING(uint16_type, uint16_t) - GET_4BYTE_TYPE_AS_STRING(int32_type, int32_t) - GET_4BYTE_TYPE_AS_STRING(uint32_type, uint32_t) - GET_4BYTE_TYPE_AS_STRING(float_type, float) + case ESPEasy_key_value_store::StorageType::bool_type: + case ESPEasy_key_value_store::StorageType::int8_type: + case ESPEasy_key_value_store::StorageType::uint8_type: + case ESPEasy_key_value_store::StorageType::int16_type: + case ESPEasy_key_value_store::StorageType::uint16_type: + case ESPEasy_key_value_store::StorageType::int32_type: + case ESPEasy_key_value_store::StorageType::uint32_type: case ESPEasy_key_value_store::StorageType::int64_type: { - int64_t v{}; + int64_t int64_value{}; + + if (getValueAsInt(key, int64_value)) { + value = ll2String(int64_value); + return true; + } + break; + } + + case ESPEasy_key_value_store::StorageType::float_type: + { + float v{}; if (getValue(key, v)) { - value = ll2String(v); + value = floatToString(v, 6, true); return true; } break; @@ -783,7 +847,7 @@ bool ESPEasy_key_value_store::getValueAsString(const StorageType& storageType, u double v{}; if (getValue(key, v)) { - value = doubleToString(v); + value = doubleToString(v, 6, true); return true; } break; @@ -798,8 +862,95 @@ bool ESPEasy_key_value_store::getValueAsString(const StorageType& storageType, u return false; } -// TODO TD-er: Implement -void ESPEasy_key_value_store::setValue(const StorageType& storageType, uint32_t key, const String& value) {} +bool ESPEasy_key_value_store::getValueAsString(uint32_t key, String& value) const +{ + return getValueAsString(getStorageType(key), key, value); +} + +#define GET_TYPE_AS_INT64(T, CT) \ + case ESPEasy_key_value_store::StorageType::T: \ + { \ + CT v{}; \ + if (getValue(key, v)) { \ + value = v; \ + return true; \ + } \ + break; \ + } + +bool ESPEasy_key_value_store::getValueAsInt( + uint32_t key, + int64_t& value) const +{ + auto storageType = getStorageType(key); + + if (!hasKey(storageType, key)) { return false; } + + switch (storageType) + { + GET_TYPE_AS_INT64(bool_type, bool) + GET_TYPE_AS_INT64(int8_type, int8_t) + GET_TYPE_AS_INT64(uint8_type, uint8_t) + GET_TYPE_AS_INT64(int16_type, int16_t) + GET_TYPE_AS_INT64(uint16_type, uint16_t) + GET_TYPE_AS_INT64(int32_type, int32_t) + GET_TYPE_AS_INT64(uint32_type, uint32_t) + GET_TYPE_AS_INT64(float_type, float) + GET_TYPE_AS_INT64(uint64_type, uint64_t) + GET_TYPE_AS_INT64(double_type, double) + + case ESPEasy_key_value_store::StorageType::int64_type: + return getValue(key, value); + default: break; + } + return false; +} + +#define GET_4BYTE_INT_TYPE_FROM_STRING(T, CT) \ + case ESPEasy_key_value_store::StorageType::T: \ + { \ + CT v(value.toInt()); \ + setValue(key, v); \ + break; \ + } + +void ESPEasy_key_value_store::setValue(const StorageType& storageType, uint32_t key, const String& value) +{ + switch (storageType) + { + case ESPEasy_key_value_store::StorageType::string_type: + setValue(key, value); + break; + GET_4BYTE_INT_TYPE_FROM_STRING(int8_type, int8_t) + GET_4BYTE_INT_TYPE_FROM_STRING(uint8_type, uint8_t) + GET_4BYTE_INT_TYPE_FROM_STRING(int16_type, int16_t) + GET_4BYTE_INT_TYPE_FROM_STRING(uint16_type, uint16_t) + GET_4BYTE_INT_TYPE_FROM_STRING(int32_type, int32_t) + GET_4BYTE_INT_TYPE_FROM_STRING(uint32_type, uint32_t) + case ESPEasy_key_value_store::StorageType::double_type: + setValue(key, value.toDouble()); + break; + case ESPEasy_key_value_store::StorageType::float_type: + setValue(key, value.toFloat()); + break; + case ESPEasy_key_value_store::StorageType::int64_type: + { + // TODO TD-er: Implement + break; + } + + case ESPEasy_key_value_store::StorageType::uint64_type: + { + // TODO TD-er: Implement + break; + } + case ESPEasy_key_value_store::StorageType::bool_type: + setValue(key, static_cast(value.toInt())); + break; + default: return; + } + setHasStorageType(storageType); +} bool ESPEasy_key_value_store::getValue( StorageType & storageType, @@ -828,6 +979,7 @@ void ESPEasy_key_value_store::setValue( } else { if (it->second.set(value.getBinary())) { _state = State::Changed; } } + setHasStorageType(storageType); } bool ESPEasy_key_value_store::getValue( @@ -857,10 +1009,12 @@ void ESPEasy_key_value_store::setValue( } else { if (it->second.set(value.getBinary())) { _state = State::Changed; } } + setHasStorageType(storageType); } bool ESPEasy_key_value_store::hasStorageType(StorageType storageType) const { + // return true; const uint32_t bitnr = static_cast(storageType); constexpr uint32_t max_bitnr = static_cast(StorageType::MAX_Type); @@ -931,6 +1085,7 @@ void ESPEasy_key_value_store::dump() const )); } + for (auto it = _8byte_data.begin(); it != _8byte_data.end(); ++it) { String val; diff --git a/src/src/Helpers/_ESPEasy_key_value_store.h b/src/src/Helpers/_ESPEasy_key_value_store.h index cd4f2e52b..56fabd858 100644 --- a/src/src/Helpers/_ESPEasy_key_value_store.h +++ b/src/src/Helpers/_ESPEasy_key_value_store.h @@ -11,6 +11,7 @@ // Generic storage layer, which on a low level will store everything as a string. // Low level storage structure: // - uint8_t: version of storage layer +// - uint8_t[2]: ID to match, if not matched, then stop loading // - uint8_t[3]: rawSize (offset to start of checksum) // - List of key/value pairs: // - uint8_t: storage type @@ -75,10 +76,12 @@ public: bool load(SettingsType::Enum settingsType, int index, - uint32_t offset_in_block); - bool store(SettingsType::Enum settingsType, - int index, - uint32_t offset_in_block); + uint32_t offset_in_block, + uint16_t id_to_match); + bool store(SettingsType::Enum settingsType, + int index, + uint32_t offset_in_block, + uint16_t id_to_match); // Count all data to estimate how much storage space it would require to store everything in a somewhat compact form. size_t getPayloadStorageSize() const; @@ -165,15 +168,21 @@ public: // Generic get function for any given storageType/key and represent its value as a string. // Return false when storageType/key is not present. bool getValueAsString(const StorageType& storageType, - uint32_t key, - String & value) const; + uint32_t key, + String & value) const; + + bool getValueAsString(uint32_t key, + String & value) const; + + bool getValueAsInt(uint32_t key, + int64_t & value) const; // Generic set function for any given storageType/key. // Given value is a string representation of that storage type. // TODO TD-er: Implement - void setValue(const StorageType & storageType, - uint32_t key, - const String& value); + void setValue(const StorageType& storageType, + uint32_t key, + const String & value); String getLastError() const { return _lastError; } diff --git a/src/src/NWPluginStructs/NW005_data_struct_PPP_modem.cpp b/src/src/NWPluginStructs/NW005_data_struct_PPP_modem.cpp index 84eecfc28..ed23b0bed 100644 --- a/src/src/NWPluginStructs/NW005_data_struct_PPP_modem.cpp +++ b/src/src/NWPluginStructs/NW005_data_struct_PPP_modem.cpp @@ -4,11 +4,132 @@ # include "../Helpers/StringConverter.h" +# include "../WebServer/Markup_Forms.h" -NW005_data_struct_PPP_modem::NW005_data_struct_PPP_modem() {} + +# include +# include "../Helpers/_Plugin_Helper_serial.h" + +// Keys as used in the Key-value-store +# define NW005_KEY_SERIAL_PORT 1 +# define NW005_KEY_PIN_RX 2 +# define NW005_KEY_PIN_TX 3 +# define NW005_KEY_PIN_RTS 4 +# define NW005_KEY_PIN_CTS 5 +# define NW005_KEY_PIN_RESET 6 +# define NW005_KEY_FLOWCTRL 10 + +const __FlashStringHelper* NW005_getLabelString(uint32_t key, bool displayString, ESPEasy_key_value_store::StorageType& storageType) +{ + storageType = ESPEasy_key_value_store::StorageType::int8_type; + + switch (key) + { + case NW005_KEY_SERIAL_PORT: return displayString ? F("Serial Port") : F("serPort"); + case NW005_KEY_PIN_RX: return F("RX"); + case NW005_KEY_PIN_TX: return F("TX"); + case NW005_KEY_PIN_RTS: return F("RTS"); + case NW005_KEY_PIN_CTS: return F("CTS"); + case NW005_KEY_PIN_RESET: return displayString ? F("Reset") : F("rst"); + case NW005_KEY_FLOWCTRL: return displayString ? F("Flow Control") : F("flowctrl"); + } + return F(""); +} + +NW005_data_struct_PPP_modem::NW005_data_struct_PPP_modem(networkIndex_t networkIndex) + : NWPluginData_base(nwpluginID_t(5), networkIndex) +{} NW005_data_struct_PPP_modem::~NW005_data_struct_PPP_modem() {} +void NW005_data_struct_PPP_modem::webform_load(struct EventStruct *event) +{ + _load(); + { + // TODO TD-er: We cannot use ESPEasySerialPort here as PPPClass needs to handle the pins using periman + const int ids[] = { + static_cast(ESPEasySerialPort::serial0) +# if USABLE_SOC_UART_NUM > 1 + , static_cast(ESPEasySerialPort::serial1) +# endif +# if USABLE_SOC_UART_NUM > 2 + , static_cast(ESPEasySerialPort::serial2) +# endif +# if USABLE_SOC_UART_NUM > 3 + , static_cast(ESPEasySerialPort::serial3) +# endif +# if USABLE_SOC_UART_NUM > 4 + , static_cast(ESPEasySerialPort::serial4) +# endif +# if USABLE_SOC_UART_NUM > 5 + , static_cast(ESPEasySerialPort::serial5) +# endif + }; + + constexpr int NR_ESPEASY_SERIAL_TYPES = NR_ELEMENTS(ids); + const __FlashStringHelper*options[] = { + serialHelper_getSerialTypeLabel(ESPEasySerialPort::serial0) +# if USABLE_SOC_UART_NUM > 1 + , serialHelper_getSerialTypeLabel(ESPEasySerialPort::serial1) +# endif +# if USABLE_SOC_UART_NUM > 2 + , serialHelper_getSerialTypeLabel(ESPEasySerialPort::serial2) +# endif +# if USABLE_SOC_UART_NUM > 3 + , serialHelper_getSerialTypeLabel(ESPEasySerialPort::serial3) +# endif +# if USABLE_SOC_UART_NUM > 4 + , serialHelper_getSerialTypeLabel(ESPEasySerialPort::serial4) +# endif +# if USABLE_SOC_UART_NUM > 5 + , serialHelper_getSerialTypeLabel(ESPEasySerialPort::serial5) +# endif + }; + + int8_t port{}; + _kvs->getValue(NW005_KEY_SERIAL_PORT, port); + FormSelectorOptions selector(NR_ESPEASY_SERIAL_TYPES, options, ids); + selector.addFormSelector(F("Serial Port"), F("serPort"), port); + + } + + for (int i = NW005_KEY_PIN_RX; i <= NW005_KEY_PIN_RESET; ++i) + { + ESPEasy_key_value_store::StorageType storageType; + const __FlashStringHelper *label = NW005_getLabelString(i, true, storageType); + const __FlashStringHelper *id = NW005_getLabelString(i, false, storageType); + int8_t pin = -1; + _kvs->getValue(i, pin); + addFormPinSelect(PinSelectPurpose::Generic, label, id, pin); + } + uint8_t flow_ctrl{}; + + _kvs->getValue(NW005_KEY_FLOWCTRL, flow_ctrl); + +} + +void NW005_data_struct_PPP_modem::webform_save(struct EventStruct *event) +{ + const uint32_t keys[] { + NW005_KEY_SERIAL_PORT, + NW005_KEY_PIN_RX, + NW005_KEY_PIN_TX, + NW005_KEY_PIN_RTS, + NW005_KEY_PIN_CTS, + NW005_KEY_PIN_RESET, + NW005_KEY_FLOWCTRL + }; + + + for (int i = 0; i < NR_ELEMENTS(keys); ++i) + { + ESPEasy_key_value_store::StorageType storageType; + const __FlashStringHelper *id = NW005_getLabelString(keys[i], false, storageType); + _kvs->setValue(storageType, keys[i], webArg(id)); + } + _store(); +} + struct testStruct { String foo1 = F("test123"); int64_t foo2 = -123; @@ -20,8 +141,9 @@ struct testStruct { void NW005_data_struct_PPP_modem::testWrite() { if (!_KVS_initialized()) { return; } - for (int i = 0; i < 5; ++i) { - testStruct _test{ .foo1=concat(F("str_"), (3 * (i) + 1)), .foo2=-1l * (3 * (i) + 2), .foo3=3 * (i) + 3 }; + + for (int i = 0; i < 30; ++i) { + testStruct _test{ .foo1 = concat(F("str_"), (3 * (i) + 1)), .foo2 = -1l * (3 * (i) + 2), .foo3 = 3 * (i) + 3 }; _kvs->setValue(3 * (i) + 1, _test.foo1); _kvs->setValue(3 * (i) + 2, _test.foo2); _kvs->setValue(3 * (i) + 3, _test.foo3); @@ -30,12 +152,12 @@ void NW005_data_struct_PPP_modem::testWrite() _kvs->dump(); -// _kvs->clear(); + // _kvs->clear(); _store(); - _load(); + _load(); - _kvs->dump(); + _kvs->dump(); } diff --git a/src/src/NWPluginStructs/NW005_data_struct_PPP_modem.h b/src/src/NWPluginStructs/NW005_data_struct_PPP_modem.h index 2327aca5e..a3f468a43 100644 --- a/src/src/NWPluginStructs/NW005_data_struct_PPP_modem.h +++ b/src/src/NWPluginStructs/NW005_data_struct_PPP_modem.h @@ -8,9 +8,12 @@ struct NW005_data_struct_PPP_modem : public NWPluginData_base { - NW005_data_struct_PPP_modem(); + NW005_data_struct_PPP_modem(networkIndex_t networkIndex); ~NW005_data_struct_PPP_modem(); + void webform_load(struct EventStruct *event); + void webform_save(struct EventStruct *event); + void testWrite(); void testRead(); diff --git a/src/src/WebServer/ESPEasy_key_value_store_webform.cpp b/src/src/WebServer/ESPEasy_key_value_store_webform.cpp new file mode 100644 index 000000000..5007ec028 --- /dev/null +++ b/src/src/WebServer/ESPEasy_key_value_store_webform.cpp @@ -0,0 +1,140 @@ +#include "../WebServer/ESPEasy_key_value_store_webform.h" + +#include "../Helpers/StringConverter.h" + +#include "../WebServer/Markup_Forms.h" + +WebFormItemParams::WebFormItemParams( + const String & label, + const String & id, + ESPEasy_key_value_store::StorageType storageType) + : _label(label), _id(id), _storageType(storageType) {} + +WebFormItemParams::WebFormItemParams( + const __FlashStringHelper *label, + const __FlashStringHelper *id, + ESPEasy_key_value_store::StorageType storageType) + : _label(label), _id(id), _storageType(storageType) {} + +bool showWebformItem(const ESPEasy_key_value_store& store, + uint32_t key, + const WebFormItemParams & params) +{ + String id = params._id.isEmpty() ? concat(F("KVS_ID_"), key) : params._id; + + switch (params._storageType) + { + case ESPEasy_key_value_store::StorageType::string_type: + { + String value; + + if (!store.getValueAsString(key, value)) { return false; } + addFormTextBox( + params._label, + id, + value, + params._maxLength, + params._readOnly, + params._required, + params._pattern +#if FEATURE_TOOLTIPS + , params._tooltip +#endif // if FEATURE_TOOLTIPS + ); + return true; + } + case ESPEasy_key_value_store::StorageType::int8_type: + case ESPEasy_key_value_store::StorageType::uint8_type: + case ESPEasy_key_value_store::StorageType::int16_type: + case ESPEasy_key_value_store::StorageType::uint16_type: + case ESPEasy_key_value_store::StorageType::int32_type: + case ESPEasy_key_value_store::StorageType::uint32_type: + { + String valueAsString; + + if (!store.getValueAsString(key, valueAsString)) { return false; } + addFormNumericBox( + params._label, + id, + valueAsString.toInt(), + params._min, + params._max, +#if FEATURE_TOOLTIPS + params._tooltip, +#endif // if FEATURE_TOOLTIPS + params._disabled + ); + + return true; + } + + case ESPEasy_key_value_store::StorageType::int64_type: + { + break; + } + + case ESPEasy_key_value_store::StorageType::uint64_type: + { + break; + } + + case ESPEasy_key_value_store::StorageType::float_type: + case ESPEasy_key_value_store::StorageType::double_type: + { + float value{}; + + if (!store.getValue(key, value)) { return false; } + addFormFloatNumberBox( + params._label, + id, + value, + params._min, + params._max, + params._nrDecimals, + params._stepsize, + +#if FEATURE_TOOLTIPS + params._tooltip +#endif // if FEATURE_TOOLTIPS + ); + + + return true; + } + + case ESPEasy_key_value_store::StorageType::bool_type: + { + bool value{}; + + if (!store.getValue(key, value)) { return false; } + addFormCheckBox( + params._label, + id, + value, + params._disabled); + return true; + } + + default: break; + } + return false; +} + +void storeWebformItem(ESPEasy_key_value_store & store, + uint32_t key, + ESPEasy_key_value_store::StorageType storageType, + const __FlashStringHelper *id) { storeWebformItem(store, key, storageType, String(id)); } + +void storeWebformItem(ESPEasy_key_value_store & store, + uint32_t key, + ESPEasy_key_value_store::StorageType storageType, + const String & id) +{ + String _id = id.isEmpty() ? concat(F("KVS_ID_"), key) : id; + + if (storageType == ESPEasy_key_value_store::StorageType::bool_type) { + store.setValue(key, isFormItemChecked(_id)); + return; + } + store.setValue(storageType, key, webArg(_id)); +} diff --git a/src/src/WebServer/ESPEasy_key_value_store_webform.h b/src/src/WebServer/ESPEasy_key_value_store_webform.h new file mode 100644 index 000000000..e2ad3398a --- /dev/null +++ b/src/src/WebServer/ESPEasy_key_value_store_webform.h @@ -0,0 +1,50 @@ +#ifndef WEBSERVER_ESPEASY_KEY_VALUE_STORE_WEBFORM_H +#define WEBSERVER_ESPEASY_KEY_VALUE_STORE_WEBFORM_H + +#include "../WebServer/common.h" + +#include "../DataTypes/FormSelectorOptions.h" +#include "../Helpers/_ESPEasy_key_value_store.h" + +struct WebFormItemParams { + WebFormItemParams(const String & label, + const String & id, + ESPEasy_key_value_store::StorageType storageType); + + WebFormItemParams(const __FlashStringHelper *label, + const __FlashStringHelper *id, + ESPEasy_key_value_store::StorageType storageType); + String _label; + String _id; +#if FEATURE_TOOLTIPS + String _tooltip; +#endif // if FEATURE_TOOLTIPS + float _min = INT_MIN; + float _max = INT_MAX; + uint8_t _nrDecimals{}; + float _stepsize = 1; + ESPEasy_key_value_store::StorageType _storageType = ESPEasy_key_value_store::StorageType::not_set; + int _maxLength{}; + bool _disabled{}; + bool _readOnly{}; + bool _required{}; + String _pattern; + +}; + +bool showWebformItem(const ESPEasy_key_value_store& store, + uint32_t key, + const WebFormItemParams & params); + +void storeWebformItem(ESPEasy_key_value_store & store, + uint32_t key, + ESPEasy_key_value_store::StorageType storageType, + const __FlashStringHelper *id); + +void storeWebformItem(ESPEasy_key_value_store & store, + uint32_t key, + ESPEasy_key_value_store::StorageType storageType, + const String & id = EMPTY_STRING); + + +#endif // ifndef WEBSERVER_ESPEASY_KEY_VALUE_STORE_WEBFORM_H From 8dc91cdd44fd909ab0a30fdd60a3de715230fdb0 Mon Sep 17 00:00:00 2001 From: TD-er Date: Wed, 16 Jul 2025 02:54:09 +0200 Subject: [PATCH 119/564] [PPP Modem] Add modem parameters to NW005 + fix compile issues --- src/_NW004_ETH_SPI.cpp | 2 + src/_NW005_PPP_modem.cpp | 8 +- src/src/Commands/InternalCommands.cpp | 2 + src/src/Commands/InternalCommands_decoder.cpp | 2 + src/src/Commands/InternalCommands_decoder.h | 2 + src/src/Commands/Networks.cpp | 3 +- src/src/Commands/Networks.h | 2 + src/src/CustomBuild/ESPEasyDefaults.h | 4 + .../FactoryDefault_Network_NVS.cpp | 2 + .../DataStructs/GpioFactorySettingsStruct.h | 2 +- src/src/DataStructs/SettingsStruct.h | 4 + src/src/DataStructs_templ/SettingsStruct.cpp | 6 +- src/src/DataTypes/EthernetParameters.h | 3 + src/src/ESPEasyCore/ESPEasyEth.cpp | 2 + src/src/Helpers/StringGenerator_GPIO.cpp | 2 + .../NW005_data_struct_PPP_modem.cpp | 191 ++++++++++++++++-- .../NW005_data_struct_PPP_modem.h | 8 + 17 files changed, 224 insertions(+), 21 deletions(-) diff --git a/src/_NW004_ETH_SPI.cpp b/src/_NW004_ETH_SPI.cpp index 54646d28b..7677280ed 100644 --- a/src/_NW004_ETH_SPI.cpp +++ b/src/_NW004_ETH_SPI.cpp @@ -47,6 +47,7 @@ bool NWPlugin_004(NWPlugin::Function function, struct EventStruct *event, String case NWPlugin::Function::NWPLUGIN_LOAD_DEFAULTS: { + /* # if CONFIG_IDF_TARGET_ESP32P4 Settings.ETH_Clock_Mode = EthClockMode_t::Ext_crystal; Settings.ETH_Phy_Type = EthPhyType_t::TLK110; @@ -57,6 +58,7 @@ bool NWPlugin_004(NWPlugin::Function function, struct EventStruct *event, String # else // if CONFIG_IDF_TARGET_ESP32P4 Settings.ETH_Clock_Mode = EthClockMode_t::Ext_crystal_osc; # endif // if CONFIG_IDF_TARGET_ESP32P4 + */ break; } diff --git a/src/_NW005_PPP_modem.cpp b/src/_NW005_PPP_modem.cpp index e739a2f04..df4109fa1 100644 --- a/src/_NW005_PPP_modem.cpp +++ b/src/_NW005_PPP_modem.cpp @@ -92,7 +92,7 @@ bool NWPlugin_005(NWPlugin::Function function, struct EventStruct *event, String NW_data->webform_save(event); if (mustCleanup) { delete NW_data; } - + success = true; } break; @@ -110,6 +110,7 @@ bool NWPlugin_005(NWPlugin::Function function, struct EventStruct *event, String if (NW_data) { NW_data->webform_load(event); + success = true; if (mustCleanup) { delete NW_data; } @@ -124,8 +125,7 @@ bool NWPlugin_005(NWPlugin::Function function, struct EventStruct *event, String NW005_data_struct_PPP_modem *NW_data = static_cast(getNWPluginData(event->NetworkIndex)); if (NW_data) { - // NW_data->testWrite(); - + success = NW_data->init(event); } break; } @@ -135,7 +135,7 @@ bool NWPlugin_005(NWPlugin::Function function, struct EventStruct *event, String NW005_data_struct_PPP_modem *NW_data = static_cast(getNWPluginData(event->NetworkIndex)); if (NW_data) { - // NW_data->testRead(); + success = NW_data->exit(event); } break; } diff --git a/src/src/Commands/InternalCommands.cpp b/src/src/Commands/InternalCommands.cpp index d34b6177b..2138654f2 100644 --- a/src/src/Commands/InternalCommands.cpp +++ b/src/src/Commands/InternalCommands.cpp @@ -296,7 +296,9 @@ bool InternalCommands::executeInternalCommand() case ESPEasy_cmd_e::ethpinmdio: COMMAND_CASE_R(Command_ETH_Pin_mdio, 1); // Network Command case ESPEasy_cmd_e::ethpinpower: COMMAND_CASE_R(Command_ETH_Pin_power, 1); // Network Command case ESPEasy_cmd_e::ethphytype: COMMAND_CASE_R(Command_ETH_Phy_Type, 1); // Network Command +# if CONFIG_ETH_USE_ESP32_EMAC case ESPEasy_cmd_e::ethclockmode: COMMAND_CASE_R(Command_ETH_Clock_Mode, 1); // Network Command +#endif case ESPEasy_cmd_e::ethip: COMMAND_CASE_R(Command_ETH_IP, 1); // Network Command case ESPEasy_cmd_e::ethgateway: COMMAND_CASE_R(Command_ETH_Gateway, 1); // Network Command case ESPEasy_cmd_e::ethsubnet: COMMAND_CASE_R(Command_ETH_Subnet, 1); // Network Command diff --git a/src/src/Commands/InternalCommands_decoder.cpp b/src/src/Commands/InternalCommands_decoder.cpp index d5bd354ac..39ebd4674 100644 --- a/src/src/Commands/InternalCommands_decoder.cpp +++ b/src/src/Commands/InternalCommands_decoder.cpp @@ -74,7 +74,9 @@ const char Internal_commands_e[] PROGMEM = "ethpinmdio|" "ethpinpower|" "ethphytype|" +# if CONFIG_ETH_USE_ESP32_EMAC "ethclockmode|" +#endif "ethip|" "ethgateway|" "ethsubnet|" diff --git a/src/src/Commands/InternalCommands_decoder.h b/src/src/Commands/InternalCommands_decoder.h index fa16e14f8..cac9545af 100644 --- a/src/src/Commands/InternalCommands_decoder.h +++ b/src/src/Commands/InternalCommands_decoder.h @@ -51,7 +51,9 @@ enum class ESPEasy_cmd_e : uint8_t { ethpinmdio, ethpinpower, ethphytype, +# if CONFIG_ETH_USE_ESP32_EMAC ethclockmode, +#endif ethip, ethgateway, ethsubnet, diff --git a/src/src/Commands/Networks.cpp b/src/src/Commands/Networks.cpp index 0db3581d0..b7fb5462f 100644 --- a/src/src/Commands/Networks.cpp +++ b/src/src/Commands/Networks.cpp @@ -93,7 +93,7 @@ String Command_ETH_Phy_Type (struct EventStruct *event, const char* Line) { return Command_GetORSetInt8_t(event, F("ETH_Phy_Type:"), Line, reinterpret_cast(&Settings.ETH_Phy_Type),1); } - +# if CONFIG_ETH_USE_ESP32_EMAC String Command_ETH_Clock_Mode (struct EventStruct *event, const char* Line) { return Command_GetORSetETH(event, @@ -103,6 +103,7 @@ String Command_ETH_Clock_Mode (struct EventStruct *event, const char* Line) reinterpret_cast(&Settings.ETH_Clock_Mode), 1); } +#endif String Command_ETH_IP (struct EventStruct *event, const char* Line) { diff --git a/src/src/Commands/Networks.h b/src/src/Commands/Networks.h index 3ef0e8302..28480bd7f 100644 --- a/src/src/Commands/Networks.h +++ b/src/src/Commands/Networks.h @@ -19,7 +19,9 @@ String Command_ETH_Pin_mdc (struct EventStruct *event, const char* Line); String Command_ETH_Pin_mdio (struct EventStruct *event, const char* Line); String Command_ETH_Pin_power (struct EventStruct *event, const char* Line); String Command_ETH_Phy_Type (struct EventStruct *event, const char* Line); +# if CONFIG_ETH_USE_ESP32_EMAC String Command_ETH_Clock_Mode (struct EventStruct *event, const char* Line); +#endif String Command_ETH_IP (struct EventStruct *event, const char* Line); String Command_ETH_Gateway (struct EventStruct *event, const char* Line); String Command_ETH_Subnet (struct EventStruct *event, const char* Line); diff --git a/src/src/CustomBuild/ESPEasyDefaults.h b/src/src/CustomBuild/ESPEasyDefaults.h index 1a8451ce3..e7f1f8509 100644 --- a/src/src/CustomBuild/ESPEasyDefaults.h +++ b/src/src/CustomBuild/ESPEasyDefaults.h @@ -300,7 +300,11 @@ #endif #endif #ifndef DEFAULT_ETH_CLOCK_MODE +# if CONFIG_ETH_USE_ESP32_EMAC #define DEFAULT_ETH_CLOCK_MODE static_cast(0) +#else +#define DEFAULT_ETH_CLOCK_MODE (0) +#endif #endif #ifndef DEFAULT_NETWORK_MEDIUM #ifdef ESP32P4 diff --git a/src/src/DataStructs/FactoryDefault_Network_NVS.cpp b/src/src/DataStructs/FactoryDefault_Network_NVS.cpp index 97a725e8c..add6e4595 100644 --- a/src/src/DataStructs/FactoryDefault_Network_NVS.cpp +++ b/src/src/DataStructs/FactoryDefault_Network_NVS.cpp @@ -39,7 +39,9 @@ bool FactoryDefault_Network_NVS::applyToSettings_from_NVS(ESPEasy_NVS_Helper& pr Settings.ETH_Pin_mdio_irq = bits.ETH_Pin_mdio_irq; Settings.ETH_Pin_power_rst = bits.ETH_Pin_power_rst; Settings.ETH_Phy_Type = static_cast(bits.ETH_Phy_Type); +# if CONFIG_ETH_USE_ESP32_EMAC Settings.ETH_Clock_Mode = static_cast(bits.ETH_Clock_Mode); +#endif Settings.NetworkMedium = static_cast(bits.NetworkMedium); res = true; } diff --git a/src/src/DataStructs/GpioFactorySettingsStruct.h b/src/src/DataStructs/GpioFactorySettingsStruct.h index 79ef3daf6..7c3ae7d66 100644 --- a/src/src/DataStructs/GpioFactorySettingsStruct.h +++ b/src/src/DataStructs/GpioFactorySettingsStruct.h @@ -24,7 +24,7 @@ struct GpioFactorySettingsStruct { int8_t eth_mdc; int8_t eth_mdio; int8_t eth_power; -#if FEATURE_ETHERNET +#if FEATURE_ETHERNET && CONFIG_ETH_USE_ESP32_EMAC EthClockMode_t eth_clock_mode; #else uint8_t eth_clock_mode{}; diff --git a/src/src/DataStructs/SettingsStruct.h b/src/src/DataStructs/SettingsStruct.h index 51a7cb387..5341929ff 100644 --- a/src/src/DataStructs/SettingsStruct.h +++ b/src/src/DataStructs/SettingsStruct.h @@ -575,7 +575,11 @@ public: int8_t ETH_Pin_power_rst = -1; #if FEATURE_ETHERNET EthPhyType_t ETH_Phy_Type = EthPhyType_t::notSet; +# if CONFIG_ETH_USE_ESP32_EMAC EthClockMode_t ETH_Clock_Mode = static_cast(0); +#else + uint8_t ETH_Clock_Mode{}; +#endif #else uint8_t ETH_Phy_Type{}; uint8_t ETH_Clock_Mode{}; diff --git a/src/src/DataStructs_templ/SettingsStruct.cpp b/src/src/DataStructs_templ/SettingsStruct.cpp index 7f7a4359d..22f06762c 100644 --- a/src/src/DataStructs_templ/SettingsStruct.cpp +++ b/src/src/DataStructs_templ/SettingsStruct.cpp @@ -1247,7 +1247,11 @@ bool SettingsStruct_tmpl::isEthernetPinOptional(int8_t pin) const { #if FEATURE_ETHERNET if (pin < 0) return false; if (NetworkMedium == NetworkMedium_t::Ethernet) { - if (!isSPI_EthernetType(ETH_Phy_Type) && isGpioUsedInETHClockMode(ETH_Clock_Mode, pin)) return true; + if (!isSPI_EthernetType(ETH_Phy_Type) +# if CONFIG_ETH_USE_ESP32_EMAC + && isGpioUsedInETHClockMode(ETH_Clock_Mode, pin) + #endif + ) return true; if (ETH_Pin_mdc_cs == pin) return true; if (ETH_Pin_mdio_irq == pin) return true; if (ETH_Pin_power_rst == pin) return true; diff --git a/src/src/DataTypes/EthernetParameters.h b/src/src/DataTypes/EthernetParameters.h index 5f21c55a2..78f3b0607 100644 --- a/src/src/DataTypes/EthernetParameters.h +++ b/src/src/DataTypes/EthernetParameters.h @@ -37,12 +37,15 @@ enum class EthClockMode_t : uint8_t { # endif // if CONFIG_IDF_TARGET_ESP32 +# if CONFIG_ETH_USE_ESP32_EMAC + bool isValid(EthClockMode_t clockMode); const __FlashStringHelper* toString(EthClockMode_t clockMode); bool isGpioUsedInETHClockMode(EthClockMode_t clockMode, int8_t gpio); +#endif // Is stored in settings enum class EthPhyType_t : uint8_t { diff --git a/src/src/ESPEasyCore/ESPEasyEth.cpp b/src/src/ESPEasyCore/ESPEasyEth.cpp index cbcc0a8e7..803a88a85 100644 --- a/src/src/ESPEasyCore/ESPEasyEth.cpp +++ b/src/src/ESPEasyCore/ESPEasyEth.cpp @@ -283,6 +283,7 @@ void ethPower(bool enable) { GPIO_Write(PLUGIN_GPIO, Settings.ETH_Pin_power_rst, enable ? 1 : 0); if (!enable) { +# if CONFIG_ETH_USE_ESP32_EMAC #if CONFIG_IDF_TARGET_ESP32P4 const bool isExternalCrystal = Settings.ETH_Clock_Mode == EthClockMode_t::Ext_crystal; #else @@ -292,6 +293,7 @@ void ethPower(bool enable) { delay(600); // Give some time to discharge any capacitors // Delay is needed to make sure no clock signal remains present which may cause the ESP to boot into flash mode. } +#endif } else { delay(400); // LAN chip needs to initialize before calling Eth.begin() } diff --git a/src/src/Helpers/StringGenerator_GPIO.cpp b/src/src/Helpers/StringGenerator_GPIO.cpp index fd43a5b9a..4c2381690 100644 --- a/src/src/Helpers/StringGenerator_GPIO.cpp +++ b/src/src/Helpers/StringGenerator_GPIO.cpp @@ -382,6 +382,7 @@ const __FlashStringHelper* getConflictingUse(int gpio, PinSelectPurpose purpose, #endif if (includeEthernet && Settings.isEthernetPinOptional(gpio)) { +# if CONFIG_ETH_USE_ESP32_EMAC if (isGpioUsedInETHClockMode(Settings.ETH_Clock_Mode, gpio)) { return F("Eth Clock"); } if (Settings.ETH_Pin_mdc_cs == gpio) { return F("Eth MDC"); } @@ -389,6 +390,7 @@ const __FlashStringHelper* getConflictingUse(int gpio, PinSelectPurpose purpose, if (Settings.ETH_Pin_mdio_irq == gpio) { return F("Eth MDIO"); } if (Settings.ETH_Pin_power_rst == gpio) { return F("Eth Pwr"); } +#endif return F("Eth"); } diff --git a/src/src/NWPluginStructs/NW005_data_struct_PPP_modem.cpp b/src/src/NWPluginStructs/NW005_data_struct_PPP_modem.cpp index ed23b0bed..d1c85e8ce 100644 --- a/src/src/NWPluginStructs/NW005_data_struct_PPP_modem.cpp +++ b/src/src/NWPluginStructs/NW005_data_struct_PPP_modem.cpp @@ -5,19 +5,23 @@ # include "../Helpers/StringConverter.h" # include "../WebServer/Markup_Forms.h" - - -# include # include "../Helpers/_Plugin_Helper_serial.h" +# include +# include + // Keys as used in the Key-value-store -# define NW005_KEY_SERIAL_PORT 1 -# define NW005_KEY_PIN_RX 2 -# define NW005_KEY_PIN_TX 3 -# define NW005_KEY_PIN_RTS 4 -# define NW005_KEY_PIN_CTS 5 -# define NW005_KEY_PIN_RESET 6 -# define NW005_KEY_FLOWCTRL 10 +# define NW005_KEY_SERIAL_PORT 1 +# define NW005_KEY_PIN_RX 2 +# define NW005_KEY_PIN_TX 3 +# define NW005_KEY_PIN_RTS 4 +# define NW005_KEY_PIN_CTS 5 +# define NW005_KEY_PIN_RESET 6 +# define NW005_KEY_PIN_RESET_ACTIVE_LOW 7 +# define NW005_KEY_PIN_RESET_DELAY 8 +# define NW005_KEY_BAUDRATE 9 +# define NW005_KEY_FLOWCTRL 10 +# define NW005_KEY_MODEM_MODEL 11 const __FlashStringHelper* NW005_getLabelString(uint32_t key, bool displayString, ESPEasy_key_value_store::StorageType& storageType) { @@ -25,13 +29,26 @@ const __FlashStringHelper* NW005_getLabelString(uint32_t key, bool displayString switch (key) { - case NW005_KEY_SERIAL_PORT: return displayString ? F("Serial Port") : F("serPort"); + case NW005_KEY_SERIAL_PORT: + return displayString ? F("Serial Port") : F("serPort"); case NW005_KEY_PIN_RX: return F("RX"); case NW005_KEY_PIN_TX: return F("TX"); case NW005_KEY_PIN_RTS: return F("RTS"); case NW005_KEY_PIN_CTS: return F("CTS"); case NW005_KEY_PIN_RESET: return displayString ? F("Reset") : F("rst"); - case NW005_KEY_FLOWCTRL: return displayString ? F("Flow Control") : F("flowctrl"); + case NW005_KEY_PIN_RESET_ACTIVE_LOW: + storageType = ESPEasy_key_value_store::StorageType::bool_type; + return displayString ? F("Reset Active Low") : F("rst_act_low"); + case NW005_KEY_PIN_RESET_DELAY: + storageType = ESPEasy_key_value_store::StorageType::uint16_type; + return displayString ? F("Reset Delay") : F("rst_delay"); + case NW005_KEY_BAUDRATE: + storageType = ESPEasy_key_value_store::StorageType::uint32_type; + return displayString ? F("Baud rate") : F("baudrate"); + case NW005_KEY_FLOWCTRL: + return displayString ? F("Flow Control") : F("flowctrl"); + case NW005_KEY_MODEM_MODEL: return displayString ? F("Modem Model") : F("mmodel"); + } return F(""); } @@ -40,11 +57,78 @@ NW005_data_struct_PPP_modem::NW005_data_struct_PPP_modem(networkIndex_t networkI : NWPluginData_base(nwpluginID_t(5), networkIndex) {} -NW005_data_struct_PPP_modem::~NW005_data_struct_PPP_modem() {} +NW005_data_struct_PPP_modem::~NW005_data_struct_PPP_modem() { + PPP.end(); + _modem_initialized = false; +} + +enum class NW005_modem_model { + generic = 1, + SIM7600 = 2, + SIM7070 = 3, + SIM7000 = 4, + BG96 = 5, + SIM800 = 6 + +}; + +const __FlashStringHelper* toString(NW005_modem_model NW005_modemmodel) +{ + switch (NW005_modemmodel) + { + case NW005_modem_model::generic: return F("Generic"); + case NW005_modem_model::SIM7600: return F("SIM7600"); + case NW005_modem_model::SIM7070: return F("SIM7070"); + case NW005_modem_model::SIM7000: return F("SIM7000"); + case NW005_modem_model::BG96: return F("BG96"); + case NW005_modem_model::SIM800: return F("SIM800"); + } + return F("unknown"); +} + +ppp_modem_model_t to_ppp_modem_model_t(NW005_modem_model NW005_modemmodel) +{ + switch (NW005_modemmodel) + { + case NW005_modem_model::generic: return PPP_MODEM_GENERIC; + case NW005_modem_model::SIM7600: return PPP_MODEM_SIM7600; + case NW005_modem_model::SIM7070: return PPP_MODEM_SIM7070; + case NW005_modem_model::SIM7000: return PPP_MODEM_SIM7000; + case NW005_modem_model::BG96: return PPP_MODEM_BG96; + case NW005_modem_model::SIM800: return PPP_MODEM_SIM800; + } + return PPP_MODEM_GENERIC; +} void NW005_data_struct_PPP_modem::webform_load(struct EventStruct *event) { _load(); + { + const int ids[] = { + static_cast(NW005_modem_model::generic), + static_cast(NW005_modem_model::SIM7600), + static_cast(NW005_modem_model::SIM7070), + static_cast(NW005_modem_model::SIM7000), + static_cast(NW005_modem_model::BG96), + static_cast(NW005_modem_model::SIM800) + }; + + const __FlashStringHelper*options[] = { + toString(NW005_modem_model::generic), + toString(NW005_modem_model::SIM7600), + toString(NW005_modem_model::SIM7070), + toString(NW005_modem_model::SIM7000), + toString(NW005_modem_model::BG96), + toString(NW005_modem_model::SIM800) + }; + + int8_t model{}; + _kvs->getValue(NW005_KEY_MODEM_MODEL, model); + FormSelectorOptions selector(NR_ELEMENTS(ids), options, ids); + selector.addFormSelector(F("Modem Model"), F("mmodel"), model); + + } + { // TODO TD-er: We cannot use ESPEasySerialPort here as PPPClass needs to handle the pins using periman const int ids[] = { @@ -117,7 +201,11 @@ void NW005_data_struct_PPP_modem::webform_save(struct EventStruct *event) NW005_KEY_PIN_RTS, NW005_KEY_PIN_CTS, NW005_KEY_PIN_RESET, - NW005_KEY_FLOWCTRL + NW005_KEY_PIN_RESET_ACTIVE_LOW, + NW005_KEY_PIN_RESET_DELAY, + NW005_KEY_BAUDRATE, + NW005_KEY_FLOWCTRL, + NW005_KEY_MODEM_MODEL }; @@ -130,6 +218,81 @@ void NW005_data_struct_PPP_modem::webform_save(struct EventStruct *event) _store(); } +bool NW005_data_struct_PPP_modem::init(struct EventStruct *event) +{ + if (!_KVS_initialized()) { return false; } + + if (!_load()) { return false; } + int8_t tx, rx, rts, cts, rst = -1; + _kvs->getValue(NW005_KEY_PIN_TX, tx); + _kvs->getValue(NW005_KEY_PIN_RX, rx); + _kvs->getValue(NW005_KEY_PIN_RTS, rts); + _kvs->getValue(NW005_KEY_PIN_CTS, cts); + _kvs->getValue(NW005_KEY_PIN_RESET, rst); + + PPP.setResetPin(rst); + + if (!PPP.setPins(tx, rx, rts, cts)) { return false; } + + ppp_modem_model_t model = PPP_MODEM_GENERIC; + { + int8_t modemModel = PPP_MODEM_GENERIC; + + if (_kvs->getValue(NW005_KEY_MODEM_MODEL, modemModel)) { + ppp_modem_model_t model = to_ppp_modem_model_t(static_cast(modemModel)); + } + } + int serialPort = 1; + { + int8_t serial = 1; + + if (_kvs->getValue(NW005_KEY_SERIAL_PORT, serial)) { + switch (static_cast(serial)) + { + case ESPEasySerialPort::serial0: serialPort = 0; + break; +# if USABLE_SOC_UART_NUM > 1 + case ESPEasySerialPort::serial1: serialPort = 1; + break; +# endif // if USABLE_SOC_UART_NUM > 1 +# if USABLE_SOC_UART_NUM > 2 + case ESPEasySerialPort::serial2: serialPort = 2; + break; +# endif // if USABLE_SOC_UART_NUM > 2 +# if USABLE_SOC_UART_NUM > 3 + case ESPEasySerialPort::serial3: serialPort = 3; + break; +# endif // if USABLE_SOC_UART_NUM > 3 +# if USABLE_SOC_UART_NUM > 4 + case ESPEasySerialPort::serial4: serialPort = 4; + break; +# endif // if USABLE_SOC_UART_NUM > 4 +# if USABLE_SOC_UART_NUM > 5 + case ESPEasySerialPort::serial5: serialPort = 5; + break; +# endif // if USABLE_SOC_UART_NUM > 5 + default: break; + } + } + } + uint32_t baud_rate = 115200; + _kvs->getValue(NW005_KEY_BAUDRATE, baud_rate); + + if (!PPP.begin(model, serialPort, baud_rate)) { return false; } + + + _modem_initialized = true; + return true; +} + +bool NW005_data_struct_PPP_modem::exit(struct EventStruct *event) +{ + PPP.end(); + + _modem_initialized = false; + return true; +} + struct testStruct { String foo1 = F("test123"); int64_t foo2 = -123; diff --git a/src/src/NWPluginStructs/NW005_data_struct_PPP_modem.h b/src/src/NWPluginStructs/NW005_data_struct_PPP_modem.h index a3f468a43..2ca2cdef6 100644 --- a/src/src/NWPluginStructs/NW005_data_struct_PPP_modem.h +++ b/src/src/NWPluginStructs/NW005_data_struct_PPP_modem.h @@ -14,10 +14,18 @@ struct NW005_data_struct_PPP_modem : public NWPluginData_base { void webform_load(struct EventStruct *event); void webform_save(struct EventStruct *event); + bool init(struct EventStruct *event); + + bool exit(struct EventStruct *event); + + void testWrite(); void testRead(); +private: + bool _modem_initialized{}; + }; From 35dc30d6a4d6afd99071f338b7342a962932fc50 Mon Sep 17 00:00:00 2001 From: TD-er Date: Wed, 16 Jul 2025 14:25:56 +0200 Subject: [PATCH 120/564] [PPP modem] Add more settings + simplify key/value/store use --- src/_P003_Pulse.ino | 2 +- src/_P008_RFID.ino | 2 +- src/_P017_PN532.ino | 2 +- src/src/Helpers/StringGenerator_GPIO.cpp | 10 +- src/src/Helpers/StringGenerator_GPIO.h | 3 + .../NW005_data_struct_PPP_modem.cpp | 100 ++++++++++++++---- .../ESPEasy_key_value_store_webform.cpp | 64 ++++++++--- .../ESPEasy_key_value_store_webform.h | 23 +++- 8 files changed, 166 insertions(+), 40 deletions(-) diff --git a/src/_P003_Pulse.ino b/src/_P003_Pulse.ino index 43b07e20b..6b150ba3d 100644 --- a/src/_P003_Pulse.ino +++ b/src/_P003_Pulse.ino @@ -167,7 +167,7 @@ boolean Plugin_003(uint8_t function, struct EventStruct *event, String& string) { addFormNumericBox(F("Debounce Time"), F("debounce") , PCONFIG(P003_IDX_DEBOUNCETIME)); - addUnit(F("mSec")); + addUnit(F("ms")); { const uint8_t choice = PCONFIG(P003_IDX_COUNTERTYPE); diff --git a/src/_P008_RFID.ino b/src/_P008_RFID.ino index 35f06e07c..b24f36c15 100644 --- a/src/_P008_RFID.ino +++ b/src/_P008_RFID.ino @@ -157,7 +157,7 @@ boolean Plugin_008(uint8_t function, struct EventStruct *event, String& string) if (P008_REMOVE_TIMEOUT == 0) { P008_REMOVE_TIMEOUT = 500; } // Default 500 mSec (was hardcoded value) addFormNumericBox(F("Automatic Tag removal after"), F("rmvtime"), P008_REMOVE_TIMEOUT, 250, 60000); // 0.25 to 60 seconds - addUnit(F("mSec.")); + addUnit(F("ms")); // Max allowed is int = 0x7FFFFFFF ... addFormNumericBox(F("Value to set on Tag removal"), F("rmvval"), P008_REMOVE_VALUE, 0); diff --git a/src/_P017_PN532.ino b/src/_P017_PN532.ino index e5ee30273..27d118486 100644 --- a/src/_P017_PN532.ino +++ b/src/_P017_PN532.ino @@ -164,7 +164,7 @@ boolean Plugin_017(uint8_t function, struct EventStruct *event, String& string) // 0.25 to 60 seconds addFormNumericBox(F("Automatic Tag removal after"), F("removetime"), P017_REMOVAL_TIMEOUT, 250, 60000); - addUnit(F("mSec.")); + addUnit(F("ms")); addFormNumericBox(F("Value to set on Tag removal"), F("removevalue"), P017_NO_TAG_DETECTED_VALUE, 0, 2147483647); diff --git a/src/src/Helpers/StringGenerator_GPIO.cpp b/src/src/Helpers/StringGenerator_GPIO.cpp index 4c2381690..c06f9cff7 100644 --- a/src/src/Helpers/StringGenerator_GPIO.cpp +++ b/src/src/Helpers/StringGenerator_GPIO.cpp @@ -38,7 +38,15 @@ String formatGpioLabel(int gpio, bool includeWarning) { } String formatGpioName(const __FlashStringHelper * label, gpio_direction direction, bool optional) { - int reserveLength = 5 /* "GPIO " */ + 8 /* "⇄ " */ + strlen_P((PGM_P)label); + return formatGpioName(String(label), direction, optional); +} + +String formatGpioName(const String& label, + gpio_direction direction, + bool optional) +{ + + int reserveLength = 5 /* "GPIO " */ + 8 /* "⇄ " */ + label.length(); if (optional) { reserveLength += 11; diff --git a/src/src/Helpers/StringGenerator_GPIO.h b/src/src/Helpers/StringGenerator_GPIO.h index e09b85b34..628c883a2 100644 --- a/src/src/Helpers/StringGenerator_GPIO.h +++ b/src/src/Helpers/StringGenerator_GPIO.h @@ -56,6 +56,9 @@ String formatGpioLabel(int gpio, String formatGpioName(const __FlashStringHelper * label, gpio_direction direction, bool optional = false); +String formatGpioName(const String& label, + gpio_direction direction, + bool optional = false); String formatGpioName_input(const __FlashStringHelper * label); String formatGpioName_output(const __FlashStringHelper * label); diff --git a/src/src/NWPluginStructs/NW005_data_struct_PPP_modem.cpp b/src/src/NWPluginStructs/NW005_data_struct_PPP_modem.cpp index d1c85e8ce..f3b752212 100644 --- a/src/src/NWPluginStructs/NW005_data_struct_PPP_modem.cpp +++ b/src/src/NWPluginStructs/NW005_data_struct_PPP_modem.cpp @@ -3,10 +3,12 @@ #ifdef USES_NW005 # include "../Helpers/StringConverter.h" - -# include "../WebServer/Markup_Forms.h" # include "../Helpers/_Plugin_Helper_serial.h" +# include "../WebServer/Markup.h" +# include "../WebServer/Markup_Forms.h" +# include "../WebServer/ESPEasy_key_value_store_webform.h" + # include # include @@ -57,6 +59,14 @@ NW005_data_struct_PPP_modem::NW005_data_struct_PPP_modem(networkIndex_t networkI : NWPluginData_base(nwpluginID_t(5), networkIndex) {} +WebFormItemParams NW005_makeWebFormItemParams(uint32_t key) { + ESPEasy_key_value_store::StorageType storageType; + const __FlashStringHelper*label = NW005_getLabelString(key, true, storageType); + const __FlashStringHelper*id = NW005_getLabelString(key, false, storageType); + + return WebFormItemParams(label, id, storageType, key); +} + NW005_data_struct_PPP_modem::~NW005_data_struct_PPP_modem() { PPP.end(); _modem_initialized = false; @@ -122,11 +132,8 @@ void NW005_data_struct_PPP_modem::webform_load(struct EventStruct *event) toString(NW005_modem_model::SIM800) }; - int8_t model{}; - _kvs->getValue(NW005_KEY_MODEM_MODEL, model); FormSelectorOptions selector(NR_ELEMENTS(ids), options, ids); - selector.addFormSelector(F("Modem Model"), F("mmodel"), model); - + showFormSelector(*_kvs, selector, NW005_makeWebFormItemParams(NW005_KEY_MODEM_MODEL)); } { @@ -170,25 +177,80 @@ void NW005_data_struct_PPP_modem::webform_load(struct EventStruct *event) # endif }; - int8_t port{}; - _kvs->getValue(NW005_KEY_SERIAL_PORT, port); - FormSelectorOptions selector(NR_ESPEASY_SERIAL_TYPES, options, ids); - selector.addFormSelector(F("Serial Port"), F("serPort"), port); - + FormSelectorOptions selector(NR_ELEMENTS(ids), options, ids); + showFormSelector(*_kvs, selector, NW005_makeWebFormItemParams(NW005_KEY_SERIAL_PORT)); } for (int i = NW005_KEY_PIN_RX; i <= NW005_KEY_PIN_RESET; ++i) { ESPEasy_key_value_store::StorageType storageType; - const __FlashStringHelper *label = NW005_getLabelString(i, true, storageType); - const __FlashStringHelper *id = NW005_getLabelString(i, false, storageType); - int8_t pin = -1; - _kvs->getValue(i, pin); - addFormPinSelect(PinSelectPurpose::Generic, label, id, pin); - } - uint8_t flow_ctrl{}; + PinSelectPurpose purpose = PinSelectPurpose::Generic; + String label = NW005_getLabelString(i, true, storageType); + const __FlashStringHelper *id = NW005_getLabelString(i, false, storageType); - _kvs->getValue(NW005_KEY_FLOWCTRL, flow_ctrl); + switch (i) + { + case NW005_KEY_PIN_RX: + purpose = PinSelectPurpose::Serial_input; + label = formatGpioName_serialRX(false); + break; + case NW005_KEY_PIN_TX: + purpose = PinSelectPurpose::Serial_output; + label = formatGpioName_serialTX(false); + break; + case NW005_KEY_PIN_CTS: + purpose = PinSelectPurpose::Generic_input; + label = formatGpioName( + label, gpio_direction::gpio_input, true); + break; + case NW005_KEY_PIN_RTS: + purpose = PinSelectPurpose::Generic_output; + label = formatGpioName( + label, gpio_direction::gpio_output, true); + break; + case NW005_KEY_PIN_RESET: + purpose = PinSelectPurpose::Generic_output; + label = formatGpioName( + label, gpio_direction::gpio_output, true); + break; + } + + int8_t pin = -1; + _kvs->getValue(i, pin); + addFormPinSelect(purpose, label, id, pin); + } + showWebformItem( + *_kvs, + NW005_makeWebFormItemParams(NW005_KEY_PIN_RESET_ACTIVE_LOW)); + { + auto params = NW005_makeWebFormItemParams(NW005_KEY_PIN_RESET_DELAY); + params._max = 2000; + params._defaultIntValue = 200; + showWebformItem(*_kvs, params); + addUnit(F("ms")); + + } + { + const int ids[] = { + ESP_MODEM_FLOW_CONTROL_NONE, + ESP_MODEM_FLOW_CONTROL_SW, + ESP_MODEM_FLOW_CONTROL_HW + }; + const __FlashStringHelper*options[] = { + F("None"), + F("Software"), + F("Hardware") + }; + + FormSelectorOptions selector(NR_ELEMENTS(ids), options, ids); + showFormSelector(*_kvs, selector, NW005_makeWebFormItemParams(NW005_KEY_FLOWCTRL)); + } + { + auto params = NW005_makeWebFormItemParams(NW005_KEY_BAUDRATE); + params._max = 10000000; + showWebformItem(*_kvs, params); + + } } diff --git a/src/src/WebServer/ESPEasy_key_value_store_webform.cpp b/src/src/WebServer/ESPEasy_key_value_store_webform.cpp index 5007ec028..5ffefde7c 100644 --- a/src/src/WebServer/ESPEasy_key_value_store_webform.cpp +++ b/src/src/WebServer/ESPEasy_key_value_store_webform.cpp @@ -7,20 +7,47 @@ WebFormItemParams::WebFormItemParams( const String & label, const String & id, - ESPEasy_key_value_store::StorageType storageType) - : _label(label), _id(id), _storageType(storageType) {} + ESPEasy_key_value_store::StorageType storageType, + uint32_t key) + : _label(label), _id(id), _storageType(storageType), _key(key) {} WebFormItemParams::WebFormItemParams( const __FlashStringHelper *label, const __FlashStringHelper *id, - ESPEasy_key_value_store::StorageType storageType) - : _label(label), _id(id), _storageType(storageType) {} + ESPEasy_key_value_store::StorageType storageType, + uint32_t key) + : _label(label), _id(id), _storageType(storageType), _key(key) {} + +#define CORRECT_RANGE(T, CT) \ + case ESPEasy_key_value_store::StorageType::T: \ + if (_max > std::numeric_limits::max()) _max = std::numeric_limits::max(); \ + if (_min < std::numeric_limits::min()) _min = std::numeric_limits::min(); \ + break; + +void WebFormItemParams::checkRanges() +{ + switch (_storageType) + { + CORRECT_RANGE(int8_type, int8_t) + CORRECT_RANGE(uint8_type, uint8_t) + CORRECT_RANGE(int16_type, int16_t) + CORRECT_RANGE(uint16_type, uint16_t) + CORRECT_RANGE(int32_type, int32_t) + CORRECT_RANGE(uint32_type, uint32_t) + CORRECT_RANGE(float_type, float) + CORRECT_RANGE(uint64_type, uint64_t) + CORRECT_RANGE(int64_type, int64_t) + + // CORRECT_RANGE(double_type, double) + default: break; + } +} bool showWebformItem(const ESPEasy_key_value_store& store, - uint32_t key, - const WebFormItemParams & params) + WebFormItemParams params) { - String id = params._id.isEmpty() ? concat(F("KVS_ID_"), key) : params._id; + params.checkRanges(); + String id = params._id.isEmpty() ? concat(F("KVS_ID_"), params._key) : params._id; switch (params._storageType) { @@ -28,7 +55,7 @@ bool showWebformItem(const ESPEasy_key_value_store& store, { String value; - if (!store.getValueAsString(key, value)) { return false; } + if (!store.getValueAsString(params._key, value)) { value = params._defaultStringValue; } addFormTextBox( params._label, id, @@ -50,13 +77,13 @@ bool showWebformItem(const ESPEasy_key_value_store& store, case ESPEasy_key_value_store::StorageType::int32_type: case ESPEasy_key_value_store::StorageType::uint32_type: { - String valueAsString; + int64_t value; - if (!store.getValueAsString(key, valueAsString)) { return false; } + if (!store.getValueAsInt(params._key, value)) { value = params._defaultIntValue; } addFormNumericBox( params._label, id, - valueAsString.toInt(), + value, params._min, params._max, #if FEATURE_TOOLTIPS @@ -83,7 +110,7 @@ bool showWebformItem(const ESPEasy_key_value_store& store, { float value{}; - if (!store.getValue(key, value)) { return false; } + if (!store.getValue(params._key, value)) { value = params._defaultFloatValue; } addFormFloatNumberBox( params._label, id, @@ -106,7 +133,7 @@ bool showWebformItem(const ESPEasy_key_value_store& store, { bool value{}; - if (!store.getValue(key, value)) { return false; } + if (!store.getValue(params._key, value)) { value = params._defaultIntValue != 0; } addFormCheckBox( params._label, id, @@ -120,6 +147,17 @@ bool showWebformItem(const ESPEasy_key_value_store& store, return false; } +void showFormSelector(const ESPEasy_key_value_store& store, + FormSelectorOptions& selector, + const WebFormItemParams& params) +{ + int64_t value{}; + if (!store.getValueAsInt(params._key, value)) { value = params._defaultIntValue; } + + selector.addFormSelector(params._label, params._id, value); +} + + void storeWebformItem(ESPEasy_key_value_store & store, uint32_t key, ESPEasy_key_value_store::StorageType storageType, diff --git a/src/src/WebServer/ESPEasy_key_value_store_webform.h b/src/src/WebServer/ESPEasy_key_value_store_webform.h index e2ad3398a..2ff261d18 100644 --- a/src/src/WebServer/ESPEasy_key_value_store_webform.h +++ b/src/src/WebServer/ESPEasy_key_value_store_webform.h @@ -9,11 +9,17 @@ struct WebFormItemParams { WebFormItemParams(const String & label, const String & id, - ESPEasy_key_value_store::StorageType storageType); + ESPEasy_key_value_store::StorageType storageType, + uint32_t key = 0); WebFormItemParams(const __FlashStringHelper *label, const __FlashStringHelper *id, - ESPEasy_key_value_store::StorageType storageType); + ESPEasy_key_value_store::StorageType storageType, + uint32_t key = 0); + + + void checkRanges(); + String _label; String _id; #if FEATURE_TOOLTIPS @@ -24,17 +30,26 @@ struct WebFormItemParams { uint8_t _nrDecimals{}; float _stepsize = 1; ESPEasy_key_value_store::StorageType _storageType = ESPEasy_key_value_store::StorageType::not_set; + uint32_t _key{}; int _maxLength{}; bool _disabled{}; bool _readOnly{}; bool _required{}; String _pattern; + int64_t _defaultIntValue{}; + double _defaultFloatValue{}; + String _defaultStringValue; + + }; bool showWebformItem(const ESPEasy_key_value_store& store, - uint32_t key, - const WebFormItemParams & params); + WebFormItemParams params); + +void showFormSelector(const ESPEasy_key_value_store& store, + FormSelectorOptions& selector, + const WebFormItemParams& params); void storeWebformItem(ESPEasy_key_value_store & store, uint32_t key, From 78aec6bc0baf5efb0508e9e61343bb25c3baacaa Mon Sep 17 00:00:00 2001 From: TD-er Date: Wed, 16 Jul 2025 17:36:52 +0200 Subject: [PATCH 121/564] [PPP modem] Add APN/Pin settings + show modem status --- src/_NW005_PPP_modem.cpp | 9 + src/src/Helpers/_ESPEasy_key_value_store.cpp | 12 + src/src/Helpers/_ESPEasy_key_value_store.h | 3 + .../NW005_data_struct_PPP_modem.cpp | 208 ++++++++++++++++-- 4 files changed, 209 insertions(+), 23 deletions(-) diff --git a/src/_NW005_PPP_modem.cpp b/src/_NW005_PPP_modem.cpp index df4109fa1..f5f801838 100644 --- a/src/_NW005_PPP_modem.cpp +++ b/src/_NW005_PPP_modem.cpp @@ -69,6 +69,15 @@ bool NWPlugin_005(NWPlugin::Function function, struct EventStruct *event, String case NWPlugin::Function::NWPLUGIN_WEBFORM_SHOW_CONNECTED: { + success = PPP.connected(); + + if (success) { + string = strformat( + F("%s (%d dBm)"), + PPP.operatorName().c_str(), + PPP.RSSI()); + } + break; } diff --git a/src/src/Helpers/_ESPEasy_key_value_store.cpp b/src/src/Helpers/_ESPEasy_key_value_store.cpp index b56b88097..317daaf6c 100644 --- a/src/src/Helpers/_ESPEasy_key_value_store.cpp +++ b/src/src/Helpers/_ESPEasy_key_value_store.cpp @@ -906,6 +906,18 @@ bool ESPEasy_key_value_store::getValueAsInt( return false; } + int64_t ESPEasy_key_value_store::getValueAsInt_or_default(uint32_t key, int64_t default_value) const + { + int64_t value = default_value; + if (getValueAsInt(key, value)) return value; + return default_value; + } + int64_t ESPEasy_key_value_store::getValueAsInt(uint32_t key) const + { + return getValueAsInt_or_default(key, 0); + } + + #define GET_4BYTE_INT_TYPE_FROM_STRING(T, CT) \ case ESPEasy_key_value_store::StorageType::T: \ { \ diff --git a/src/src/Helpers/_ESPEasy_key_value_store.h b/src/src/Helpers/_ESPEasy_key_value_store.h index 56fabd858..8ac5438d5 100644 --- a/src/src/Helpers/_ESPEasy_key_value_store.h +++ b/src/src/Helpers/_ESPEasy_key_value_store.h @@ -177,6 +177,9 @@ public: bool getValueAsInt(uint32_t key, int64_t & value) const; + int64_t getValueAsInt_or_default(uint32_t key, int64_t default_value) const; + int64_t getValueAsInt(uint32_t key) const; + // Generic set function for any given storageType/key. // Given value is a string representation of that storage type. // TODO TD-er: Implement diff --git a/src/src/NWPluginStructs/NW005_data_struct_PPP_modem.cpp b/src/src/NWPluginStructs/NW005_data_struct_PPP_modem.cpp index f3b752212..41326a845 100644 --- a/src/src/NWPluginStructs/NW005_data_struct_PPP_modem.cpp +++ b/src/src/NWPluginStructs/NW005_data_struct_PPP_modem.cpp @@ -5,6 +5,7 @@ # include "../Helpers/StringConverter.h" # include "../Helpers/_Plugin_Helper_serial.h" +# include "../WebServer/HTML_wrappers.h" # include "../WebServer/Markup.h" # include "../WebServer/Markup_Forms.h" # include "../WebServer/ESPEasy_key_value_store_webform.h" @@ -12,6 +13,9 @@ # include # include +//# include +//#include + // Keys as used in the Key-value-store # define NW005_KEY_SERIAL_PORT 1 # define NW005_KEY_PIN_RX 2 @@ -24,6 +28,8 @@ # define NW005_KEY_BAUDRATE 9 # define NW005_KEY_FLOWCTRL 10 # define NW005_KEY_MODEM_MODEL 11 +# define NW005_KEY_APN 12 +# define NW005_KEY_PIN 13 const __FlashStringHelper* NW005_getLabelString(uint32_t key, bool displayString, ESPEasy_key_value_store::StorageType& storageType) { @@ -50,6 +56,12 @@ const __FlashStringHelper* NW005_getLabelString(uint32_t key, bool displayString case NW005_KEY_FLOWCTRL: return displayString ? F("Flow Control") : F("flowctrl"); case NW005_KEY_MODEM_MODEL: return displayString ? F("Modem Model") : F("mmodel"); + case NW005_KEY_APN: + storageType = ESPEasy_key_value_store::StorageType::string_type; + return displayString ? F("Access Point Name (APN)") : F("apn"); + case NW005_KEY_PIN: + storageType = ESPEasy_key_value_store::StorageType::string_type; + return displayString ? F("SIM Card Pin") : F("pin"); } return F(""); @@ -113,6 +125,8 @@ ppp_modem_model_t to_ppp_modem_model_t(NW005_modem_model NW005_modemmodel) void NW005_data_struct_PPP_modem::webform_load(struct EventStruct *event) { _load(); + + addFormSubHeader(F("Device Settings")); { const int ids[] = { static_cast(NW005_modem_model::generic), @@ -244,14 +258,124 @@ void NW005_data_struct_PPP_modem::webform_load(struct EventStruct *event) FormSelectorOptions selector(NR_ELEMENTS(ids), options, ids); showFormSelector(*_kvs, selector, NW005_makeWebFormItemParams(NW005_KEY_FLOWCTRL)); + addFormNote(F("Only set flow control if RTS and CTS are used")); } { auto params = NW005_makeWebFormItemParams(NW005_KEY_BAUDRATE); - params._max = 10000000; + params._max = 10000000; + params._defaultIntValue = 115200; showWebformItem(*_kvs, params); - } + addFormSubHeader(F("Connection")); + { + auto params = NW005_makeWebFormItemParams(NW005_KEY_APN); + params._maxLength = 64; + showWebformItem(*_kvs, params); + } + { + auto params = NW005_makeWebFormItemParams(NW005_KEY_PIN); + params._maxLength = 4; + showWebformItem(*_kvs, params); + addFormNote(F("Only numerical digits")); + } + + if (!_modem_initialized) { return; } + + addFormSubHeader(F("Modem State")); + addRowLabel(F("Modem Model")); + addHtml_pre(PPP.moduleName()); + addRowLabel(F("IMEI")); + addHtml_pre(PPP.IMEI()); + + addRowLabel(F("IMSI")); + addHtml_pre(PPP.IMSI()); + + if (PPP.attached()) { + addRowLabel(F("Operator Name")); + addHtml_pre(PPP.operatorName()); + } + + addRowLabel(F("RSSI")); + addHtmlInt(PPP.RSSI()); + + addRowLabel(F("BER")); + addHtmlInt(PPP.BER()); + + addRowLabel(F("Radio State")); + addHtml((PPP.radioState() == 0) ? F("Minimal") : F("Full")); + + int networkMode = PPP.networkMode(); + + if (networkMode >= 0) { + addRowLabel(F("Network Mode")); + + // TODO TD-er: Must 'decode' the mode into GSM, LTE, etc. + addHtmlInt(networkMode); + } + + int batVolt = PPP.batteryVoltage(); + + if (batVolt >= 0) { + addRowLabel(F("Battery Voltage")); + addHtmlInt(batVolt); + } + + int batLevel = PPP.batteryLevel(); + + if (batLevel >= 0) { + addRowLabel(F("Battery Level")); + addHtmlInt(batLevel); + } + + int batStatus = PPP.batteryStatus(); + + if (batStatus >= 0) { + addRowLabel(F("Battery Status")); + addHtmlInt(batStatus); + } + + // TODO TD-er: Disabled for now, missing PdpContext + /* + esp_modem_dce_t *handle = PPP.handle(); + + if (handle) { + int state{}; + + if (esp_modem_get_network_registration_state(handle, state) == ESP_OK) { + addRowLabel(F("Network Registration State")); + const __FlashStringHelper*str = F("Unknown"); + + switch (state) + { + case 0: str = F("Not registered, MT is not currently searching an operator to register to"); + break; + case 1: str = F("Registered, home network"); + break; + case 2: str = F("Not registered, but MT is currently trying to attach or searching an operator to register to"); + break; + case 3: str = F("Registration denied"); + break; + case 4: str = F("Unknown"); + break; + case 5: str = F("Registered, Roaming"); + break; + case 6: str = F("Registered, for SMS only, home network (NB-IoT only)"); + break; + case 7: str = F("Registered, for SMS only, roaming (NB-IoT only)"); + break; + case 8: str = F("Attached for emergency bearer services only"); + break; + case 9: str = F("Registered for CSFB not preferred, home network"); + break; + case 10: str = F("Registered for CSFB not preferred, roaming"); + break; + } + addHtml(str); + } + } +*/ + } void NW005_data_struct_PPP_modem::webform_save(struct EventStruct *event) @@ -267,7 +391,9 @@ void NW005_data_struct_PPP_modem::webform_save(struct EventStruct *event) NW005_KEY_PIN_RESET_DELAY, NW005_KEY_BAUDRATE, NW005_KEY_FLOWCTRL, - NW005_KEY_MODEM_MODEL + NW005_KEY_MODEM_MODEL, + NW005_KEY_APN, + NW005_KEY_PIN }; @@ -275,35 +401,66 @@ void NW005_data_struct_PPP_modem::webform_save(struct EventStruct *event) { ESPEasy_key_value_store::StorageType storageType; const __FlashStringHelper *id = NW005_getLabelString(keys[i], false, storageType); - _kvs->setValue(storageType, keys[i], webArg(id)); + storeWebformItem(*_kvs, keys[i], storageType, id); } _store(); } bool NW005_data_struct_PPP_modem::init(struct EventStruct *event) { - if (!_KVS_initialized()) { return false; } + if (!_KVS_initialized()) { + addLog(LOG_LEVEL_ERROR, F("PPP: Could not initialize storage")); + return false; + } - if (!_load()) { return false; } - int8_t tx, rx, rts, cts, rst = -1; - _kvs->getValue(NW005_KEY_PIN_TX, tx); - _kvs->getValue(NW005_KEY_PIN_RX, rx); - _kvs->getValue(NW005_KEY_PIN_RTS, rts); - _kvs->getValue(NW005_KEY_PIN_CTS, cts); - _kvs->getValue(NW005_KEY_PIN_RESET, rst); + if (!_load()) { + addLog(LOG_LEVEL_ERROR, F("PPP: Could not load settings")); + return false; + } - PPP.setResetPin(rst); + PPP.setResetPin( + _kvs->getValueAsInt_or_default(NW005_KEY_PIN_RESET, -1), + _kvs->getValueAsInt_or_default(NW005_KEY_PIN_RESET_ACTIVE_LOW, 0), + _kvs->getValueAsInt_or_default(NW005_KEY_PIN_RESET_DELAY, 200)); - if (!PPP.setPins(tx, rx, rts, cts)) { return false; } + const int rtsPin = _kvs->getValueAsInt_or_default(NW005_KEY_PIN_RTS, -1); + const int ctsPin = _kvs->getValueAsInt_or_default(NW005_KEY_PIN_CTS, -1); + esp_modem_flow_ctrl_t flow_ctl = static_cast(_kvs->getValueAsInt_or_default(NW005_KEY_FLOWCTRL, + ESP_MODEM_FLOW_CONTROL_NONE)); - ppp_modem_model_t model = PPP_MODEM_GENERIC; - { - int8_t modemModel = PPP_MODEM_GENERIC; - - if (_kvs->getValue(NW005_KEY_MODEM_MODEL, modemModel)) { - ppp_modem_model_t model = to_ppp_modem_model_t(static_cast(modemModel)); + if ((rtsPin < 0) || (ctsPin < 0)) { + if (flow_ctl != ESP_MODEM_FLOW_CONTROL_NONE) { + addLog(LOG_LEVEL_INFO, F("PPP: Disable flow control as RTS/CTS are not set")); + flow_ctl = ESP_MODEM_FLOW_CONTROL_NONE; } } + + if (!PPP.setPins( + _kvs->getValueAsInt_or_default(NW005_KEY_PIN_TX, -1), + _kvs->getValueAsInt_or_default(NW005_KEY_PIN_RX, -1), + rtsPin, + ctsPin, + flow_ctl)) + { + addLog(LOG_LEVEL_ERROR, F("PPP: Could not set pins")); + return false; + } + { + String apn; + _kvs->getValue(NW005_KEY_APN, apn); + PPP.setApn(apn.c_str()); + } + { + String pin; + _kvs->getValue(NW005_KEY_PIN, pin); + + if (pin.length() >= 4) { + PPP.setPin(pin.c_str()); + } + } + + ppp_modem_model_t model = to_ppp_modem_model_t(static_cast( + _kvs->getValueAsInt_or_default(NW005_KEY_MODEM_MODEL, PPP_MODEM_GENERIC))); int serialPort = 1; { int8_t serial = 1; @@ -337,11 +494,16 @@ bool NW005_data_struct_PPP_modem::init(struct EventStruct *event) } } } - uint32_t baud_rate = 115200; - _kvs->getValue(NW005_KEY_BAUDRATE, baud_rate); + uint32_t baud_rate = _kvs->getValueAsInt_or_default(NW005_KEY_BAUDRATE, 115200); - if (!PPP.begin(model, serialPort, baud_rate)) { return false; } + if (!PPP.begin(model, serialPort, baud_rate)) { + addLog(LOG_LEVEL_ERROR, F("PPP: Error PPP.begin")); + return false; + } + addLog(LOG_LEVEL_INFO, strformat(F("PPP: Module Name: %s, IMEI: %s"), + PPP.moduleName().c_str(), + PPP.IMEI().c_str())); _modem_initialized = true; return true; From d42277a2ddf850ce126b6a804e0b8ea1369e9f3b Mon Sep 17 00:00:00 2001 From: TD-er Date: Thu, 17 Jul 2025 00:55:06 +0200 Subject: [PATCH 122/564] [PPP Modem] Show more cell info + correct reported RSSI/BER values --- src/_NW005_PPP_modem.cpp | 6 +- .../NW005_data_struct_PPP_modem.cpp | 257 +++++++++++++++--- .../NW005_data_struct_PPP_modem.h | 5 + 3 files changed, 232 insertions(+), 36 deletions(-) diff --git a/src/_NW005_PPP_modem.cpp b/src/_NW005_PPP_modem.cpp index f5f801838..b20dda211 100644 --- a/src/_NW005_PPP_modem.cpp +++ b/src/_NW005_PPP_modem.cpp @@ -69,13 +69,13 @@ bool NWPlugin_005(NWPlugin::Function function, struct EventStruct *event, String case NWPlugin::Function::NWPLUGIN_WEBFORM_SHOW_CONNECTED: { - success = PPP.connected(); + success = PPP.attached(); if (success) { string = strformat( - F("%s (%d dBm)"), + F("%s (%s dBm)"), PPP.operatorName().c_str(), - PPP.RSSI()); + NW005_data_struct_PPP_modem::getRSSI().c_str()); } break; diff --git a/src/src/NWPluginStructs/NW005_data_struct_PPP_modem.cpp b/src/src/NWPluginStructs/NW005_data_struct_PPP_modem.cpp index 41326a845..925d89e9d 100644 --- a/src/src/NWPluginStructs/NW005_data_struct_PPP_modem.cpp +++ b/src/src/NWPluginStructs/NW005_data_struct_PPP_modem.cpp @@ -13,8 +13,8 @@ # include # include -//# include -//#include +// # include +// #include // Keys as used in the Key-value-store # define NW005_KEY_SERIAL_PORT 1 @@ -122,6 +122,132 @@ ppp_modem_model_t to_ppp_modem_model_t(NW005_modem_model NW005_modemmodel) return PPP_MODEM_GENERIC; } +String NW005_data_struct_PPP_modem::getRSSI() +{ + const int rssi_raw = PPP.RSSI(); + + if (rssi_raw == 99) { return F("-"); } // Not known or not detectable + + if (rssi_raw == 0) { return F("<= -113"); } + + if (rssi_raw >= 31) { return F(">= -51"); } + return String(map(rssi_raw, 2, 30, -109, -53)); +} + +String NW005_data_struct_PPP_modem::getBER() +{ + switch (PPP.BER()) + { + case 0: return F("<0.01 %"); + case 1: return F("0.01 % ... 0.1 %"); + case 2: return F("0.1 % ... 0.5 %"); + case 3: return F("0.5 % ... 1 %"); + case 4: return F("1 % ... 2 %"); + case 5: return F("2 % ... 4 %"); + case 6: return F("4 % ... 8 %"); + case 7: return F(">= 8 %"); + case 99: break; // Not known or not detectable + } + return F("-"); +} + +const __FlashStringHelper* NW005_decode_label(int sysmode_index, uint8_t i) +{ + const __FlashStringHelper*res = F(""); + + switch (sysmode_index) + { + case 0: + { + // No service system mode + const __FlashStringHelper*labels[] + { + F("System Mode"), F("Operation Mode") + }; + + if (i < NR_ELEMENTS(labels)) { res = labels[i]; } + break; + } + case 1: + { + // GSM system mode + const __FlashStringHelper*labels[] + { + F("System Mode"), F("Operation Mode"), F("MCC-MNC"), F("LAC"), F("Cell ID"), F("Absolute RF Ch Num"), F("RxLev"), + F("Track LO Adjust"), F("C1-C2") + }; + + if (i < NR_ELEMENTS(labels)) { res = labels[i]; } + break; + } + case 2: + { + // WCDMA system mode + const __FlashStringHelper*labels[] + { + F("System Mode"), F("Operation Mode"), F("MCC-MNC"), F("LAC"), F("Cell ID"), F("Frequency Band"), F("PSC"), F("Freq"), F("SSC"), + F("EC/IO"), F("RSCP"), F("Qual"), F("RxLev"), F("TXPWR") + }; + + if (i < NR_ELEMENTS(labels)) { res = labels[i]; } + break; + } + case 3: + { + // LTE system mode + const __FlashStringHelper*labels[] + { + F("System Mode"), F("Operation Mode"), F("MCC-MNC"), F("TAC"), F("SCellID"), F("PCellID"), F("Frequency Band"), F("earfcn"), + F("dlbw"), F("ulbw"), F("RSRQ"), F("RSRP"), F("RSSI"), F("RSSNR") + }; + + if (i < NR_ELEMENTS(labels)) { res = labels[i]; } + break; + } + } + return res; +} + +void NW005_data_struct_PPP_modem::webform_load_UE_system_information() +{ + String res = PPP.cmd("AT+CPSI?", 1000); + + if (!res.isEmpty()/* && res.startsWith(F("+CPSI"))*/) { + int start_index = 0; + int end_index = res.indexOf(','); + const String systemMode = res.substring(start_index, end_index); + const __FlashStringHelper*sysmode_str[] = { + F("NO SERVICE"), F("GSM"), F("WCDMA"), F("LTE") + }; + int sysmode_index = -1; + + for (int i = 0; i < NR_ELEMENTS(sysmode_str) && sysmode_index != -1; ++i) { + if (systemMode.endsWith(sysmode_str[i])) { sysmode_index = i; } + + } + +// if (sysmode_index == -1) { return; } + + addFormSubHeader(F("UE System Information")); + + res += ','; // Add trailing comma so we're not missing the last element + for (int i = 0; end_index != -1; ++i) + { + const String label = NW005_decode_label(sysmode_index, i); + if (!label.isEmpty()) { + addRowLabel(label); + if (i == 0) addHtml(sysmode_str[sysmode_index]); + else + addHtml_pre(res.substring(start_index, end_index)); + } + start_index = end_index; + end_index = res.indexOf(',', start_index); + } + + } + +} + void NW005_data_struct_PPP_modem::webform_load(struct EventStruct *event) { _load(); @@ -292,15 +418,43 @@ void NW005_data_struct_PPP_modem::webform_load(struct EventStruct *event) addHtml_pre(PPP.IMSI()); if (PPP.attached()) { - addRowLabel(F("Operator Name")); - addHtml_pre(PPP.operatorName()); + addRowLabel(F("Mobile Country Code (MCC)")); + addHtml_pre(PPP.operatorName().substring(0, 3)); + addRowLabel(F("Mobile Network Code (MNC)")); + addHtml_pre(PPP.operatorName().substring(3)); + addFormNote(F("See     Wikipedia - Mobile Country Code")); + + if (PPP.mode() != ESP_MODEM_MODE_CMUX) { + PPP.mode(ESP_MODEM_MODE_CMUX); + } + /* + { + String res = PPP.cmd("AT+CPSI?", 1000); + + if (!res.isEmpty()) { + addRowLabel(F("AT+CPSI?")); + addHtml_pre(res); + } + }*/ + /* + { + String res = PPP.cmd("AT+CPSITD?", 1000); + + if (!res.isEmpty()) { + addRowLabel(F("AT+CPSITD?")); + addHtml_pre(res); + } + } + */ + } addRowLabel(F("RSSI")); - addHtmlInt(PPP.RSSI()); + addHtml(NW005_data_struct_PPP_modem::getRSSI()); + addUnit(F("dBm")); addRowLabel(F("BER")); - addHtmlInt(PPP.BER()); + addHtml(NW005_data_struct_PPP_modem::getBER()); addRowLabel(F("Radio State")); addHtml((PPP.radioState() == 0) ? F("Minimal") : F("Full")); @@ -310,39 +464,75 @@ void NW005_data_struct_PPP_modem::webform_load(struct EventStruct *event) if (networkMode >= 0) { addRowLabel(F("Network Mode")); - // TODO TD-er: Must 'decode' the mode into GSM, LTE, etc. - addHtmlInt(networkMode); + // Result from AT+CNSMOD Show network system mode + switch (networkMode) + { + case 0: addHtml(F("no service")); + break; + case 1: addHtml(F("GSM")); + break; + case 2: addHtml(F("GPRS")); + break; + case 3: addHtml(F("EGPRS (EDGE)")); + break; + case 4: addHtml(F("WCDMA")); + break; + case 5: addHtml(F("HSDPA only(WCDMA)")); + break; + case 6: addHtml(F("HSUPA only(WCDMA)")); + break; + case 7: addHtml(F("HSPA (HSDPA and HSUPA, WCDMA)")); + break; + case 8: addHtml(F("LTE")); + break; + default: addHtmlInt(networkMode); + break; + } } - int batVolt = PPP.batteryVoltage(); - - if (batVolt >= 0) { - addRowLabel(F("Battery Voltage")); - addHtmlInt(batVolt); - } - - int batLevel = PPP.batteryLevel(); - - if (batLevel >= 0) { - addRowLabel(F("Battery Level")); - addHtmlInt(batLevel); - } - - int batStatus = PPP.batteryStatus(); - - if (batStatus >= 0) { + { + int batStatus = PPP.batteryStatus(); addRowLabel(F("Battery Status")); - addHtmlInt(batStatus); + const __FlashStringHelper*str = F("Not Available"); + + switch (batStatus) + { + case 0: str = F("Not Charging"); + break; + case 1: str = F("Charging"); + break; + case 2: str = F("Charging Done"); + break; + } + addHtml(str); + + if (batStatus >= 0) { + int batVolt = PPP.batteryVoltage(); + + if (batVolt >= 0) { + addRowLabel(F("Battery Voltage")); + addHtmlInt(batVolt); + addUnit(F("mV")); + } + + int batLevel = PPP.batteryLevel(); + + if (batLevel >= 0) { + addRowLabel(F("Battery Level")); + addHtmlInt(batLevel); + } + } } // TODO TD-er: Disabled for now, missing PdpContext + /* - esp_modem_dce_t *handle = PPP.handle(); + esp_modem_dce_t *handle = PPP.handle(); - if (handle) { - int state{}; + if (handle) { + int state{}; - if (esp_modem_get_network_registration_state(handle, state) == ESP_OK) { + if (esp_modem_get_network_registration_state(handle, state) == ESP_OK) { addRowLabel(F("Network Registration State")); const __FlashStringHelper*str = F("Unknown"); @@ -372,10 +562,11 @@ void NW005_data_struct_PPP_modem::webform_load(struct EventStruct *event) break; } addHtml(str); - } - } -*/ + } + } + */ +// webform_load_UE_system_information(); } void NW005_data_struct_PPP_modem::webform_save(struct EventStruct *event) diff --git a/src/src/NWPluginStructs/NW005_data_struct_PPP_modem.h b/src/src/NWPluginStructs/NW005_data_struct_PPP_modem.h index 2ca2cdef6..82924c8b0 100644 --- a/src/src/NWPluginStructs/NW005_data_struct_PPP_modem.h +++ b/src/src/NWPluginStructs/NW005_data_struct_PPP_modem.h @@ -11,6 +11,11 @@ struct NW005_data_struct_PPP_modem : public NWPluginData_base { NW005_data_struct_PPP_modem(networkIndex_t networkIndex); ~NW005_data_struct_PPP_modem(); + static String getRSSI(); + static String getBER(); + + void webform_load_UE_system_information(); + void webform_load(struct EventStruct *event); void webform_save(struct EventStruct *event); From 9d9ed38c3fbe845e09134f8464bc914d59a6cd08 Mon Sep 17 00:00:00 2001 From: TD-er Date: Thu, 17 Jul 2025 01:08:43 +0200 Subject: [PATCH 123/564] [Storage] Fix build on ESP8266 builds --- src/src/DataStructs/NWPluginData_base.cpp | 5 +- src/src/DataStructs/NWPluginData_base.h | 3 +- .../ESPEasy_key_value_store_4byte_data.cpp | 4 + .../ESPEasy_key_value_store_8byte_data.cpp | 4 + .../DataTypes/ESPEasy_key_value_store_data.h | 4 +- src/src/Helpers/_ESPEasy_key_value_store.cpp | 113 +++++++++--------- src/src/Helpers/_ESPEasy_key_value_store.h | 21 ++-- .../NW005_data_struct_PPP_modem.cpp | 5 +- .../ESPEasy_key_value_store_webform.cpp | 33 ++--- .../ESPEasy_key_value_store_webform.h | 22 ++-- 10 files changed, 121 insertions(+), 93 deletions(-) diff --git a/src/src/DataStructs/NWPluginData_base.cpp b/src/src/DataStructs/NWPluginData_base.cpp index 78e7fc330..6b248a624 100644 --- a/src/src/DataStructs/NWPluginData_base.cpp +++ b/src/src/DataStructs/NWPluginData_base.cpp @@ -30,9 +30,10 @@ bool NWPluginData_base::plugin_write_base(struct EventStruct *event, const String & string) { return false; } bool NWPluginData_base::init_KVS() -{ +{ if (!_KVS_initialized()) { return false; } -// _load(); + + // _load(); // TODO TD-er: load() can also return false when some other data used to be present. Have to think about how to handle this. return true; diff --git a/src/src/DataStructs/NWPluginData_base.h b/src/src/DataStructs/NWPluginData_base.h index 36a2d2a57..5cca7940f 100644 --- a/src/src/DataStructs/NWPluginData_base.h +++ b/src/src/DataStructs/NWPluginData_base.h @@ -17,7 +17,8 @@ // N.B. in order to use this, a data object must inherit from this base class. // This is a compile time check. struct NWPluginData_base { - NWPluginData_base(nwpluginID_t nwpluginID, networkIndex_t networkIndex); + NWPluginData_base(nwpluginID_t nwpluginID, + networkIndex_t networkIndex); virtual ~NWPluginData_base(); diff --git a/src/src/DataTypes/ESPEasy_key_value_store_4byte_data.cpp b/src/src/DataTypes/ESPEasy_key_value_store_4byte_data.cpp index 80d8fd647..935072683 100644 --- a/src/src/DataTypes/ESPEasy_key_value_store_4byte_data.cpp +++ b/src/src/DataTypes/ESPEasy_key_value_store_4byte_data.cpp @@ -1,5 +1,7 @@ #include "../DataTypes/ESPEasy_key_value_store_data.h" +#if FEATURE_STORE_NETWORK_INTERFACE_SETTINGS + constexpr unsigned int size_32bit = sizeof(float); ESPEasy_key_value_store_4byte_data_t::ESPEasy_key_value_store_4byte_data_t() { @@ -60,3 +62,5 @@ bool ESPEasy_key_value_store_4byte_data_t::set(const void*value) memcpy(binary, value, size_32bit); return true; } + +#endif // if FEATURE_STORE_NETWORK_INTERFACE_SETTINGS diff --git a/src/src/DataTypes/ESPEasy_key_value_store_8byte_data.cpp b/src/src/DataTypes/ESPEasy_key_value_store_8byte_data.cpp index b2e14202f..d836b049f 100644 --- a/src/src/DataTypes/ESPEasy_key_value_store_8byte_data.cpp +++ b/src/src/DataTypes/ESPEasy_key_value_store_8byte_data.cpp @@ -1,5 +1,7 @@ #include "../DataTypes/ESPEasy_key_value_store_data.h" +#if FEATURE_STORE_NETWORK_INTERFACE_SETTINGS + constexpr unsigned int size_64bit = sizeof(double); ESPEasy_key_value_store_8byte_data_t::ESPEasy_key_value_store_8byte_data_t() { @@ -60,3 +62,5 @@ bool ESPEasy_key_value_store_8byte_data_t::set(const void*value) memcpy(binary, value, size_64bit); return true; } + +#endif // if FEATURE_STORE_NETWORK_INTERFACE_SETTINGS diff --git a/src/src/DataTypes/ESPEasy_key_value_store_data.h b/src/src/DataTypes/ESPEasy_key_value_store_data.h index 80d981a7d..c9ddbb21f 100644 --- a/src/src/DataTypes/ESPEasy_key_value_store_data.h +++ b/src/src/DataTypes/ESPEasy_key_value_store_data.h @@ -3,6 +3,8 @@ #include "../../ESPEasy_common.h" +#if FEATURE_STORE_NETWORK_INTERFACE_SETTINGS + // Store various types of 32 bit class alignas(uint32_t) ESPEasy_key_value_store_4byte_data_t { @@ -90,5 +92,5 @@ private: uint8_t binary[sizeof(double)]{}; }; // class alignas - +#endif // if FEATURE_STORE_NETWORK_INTERFACE_SETTINGS #endif // ifndef DATATYPES_ESPEASY_KEY_VALUE_STORE_DATA_H diff --git a/src/src/Helpers/_ESPEasy_key_value_store.cpp b/src/src/Helpers/_ESPEasy_key_value_store.cpp index 317daaf6c..82766753c 100644 --- a/src/src/Helpers/_ESPEasy_key_value_store.cpp +++ b/src/src/Helpers/_ESPEasy_key_value_store.cpp @@ -1,9 +1,11 @@ #include "../Helpers/_ESPEasy_key_value_store.h" -#include "../Helpers/StringConverter_Numerical.h" -#include "../Helpers/ESPEasy_Storage.h" -#include "../Helpers/ESPEasy_time_calc.h" -#include "../Helpers/StringConverter.h" +#if FEATURE_STORE_NETWORK_INTERFACE_SETTINGS + +# include "../Helpers/StringConverter_Numerical.h" +# include "../Helpers/ESPEasy_Storage.h" +# include "../Helpers/ESPEasy_time_calc.h" +# include "../Helpers/StringConverter.h" uint32_t ESPEasy_key_value_store::combine_StorageType_and_key( ESPEasy_key_value_store::StorageType storageType, @@ -83,9 +85,9 @@ bool ESPEasy_key_value_store::load( if (!SettingsType::getSettingsParameters(settingsType, index, offset, max_size)) { _lastError = F("KVS: Invalid index"); - #ifndef BUILD_NO_DEBUG + # ifndef BUILD_NO_DEBUG addLog(LOG_LEVEL_ERROR, _lastError); // addLog(LOG_LEVEL_DEBUG, _lastError); - #endif // ifndef BUILD_NO_DEBUG + # endif // ifndef BUILD_NO_DEBUG return false; } @@ -117,10 +119,10 @@ bool ESPEasy_key_value_store::load( const uint16_t id = (buffer[2] << 8) | buffer[1]; if (id != id_to_match) { - #ifndef BUILD_NO_DEBUG + # ifndef BUILD_NO_DEBUG _lastError = strformat(F("KVS: Stored ID %d != expected ID %d, stop loading"), id, id_to_match); addLog(LOG_LEVEL_DEBUG, _lastError); - #endif // ifndef BUILD_NO_DEBUG + # endif // ifndef BUILD_NO_DEBUG return false; } @@ -130,15 +132,15 @@ bool ESPEasy_key_value_store::load( if ((offset_in_block + totalSize) > static_cast(max_size)) { _state = State::ErrorOnLoad; - #ifndef BUILD_NO_DEBUG + # ifndef BUILD_NO_DEBUG _lastError = strformat(F("KVS: Total size %d + offset %d exceeds max size %d"), totalSize, offset_in_block, max_size); addLog(LOG_LEVEL_ERROR, _lastError); // addLog(LOG_LEVEL_DEBUG, _lastError); - #endif // ifndef BUILD_NO_DEBUG + # endif // ifndef BUILD_NO_DEBUG return false; } -#ifndef BUILD_NO_DEBUG +# ifndef BUILD_NO_DEBUG addLog(LOG_LEVEL_INFO, strformat(F("KVS Load : Total size %d + offset %d, max size %d"), totalSize, offset_in_block, max_size)); -#endif +# endif size_t bytesLeftPartialString{}; String partialString; @@ -169,7 +171,7 @@ bool ESPEasy_key_value_store::load( // as it might be easy to forget adding the same to both bufPos and readPos // However in logs we might need to refer to the actual pos in the file/block // For this the following define is used - #define LOG_READPOS_OFFSET (readPos + (bufPos - bufPos_start_loop)) + # define LOG_READPOS_OFFSET (readPos + (bufPos - bufPos_start_loop)) const uint32_t bufPos_start_loop = bufPos; if (!bytesLeftPartialString) { @@ -187,10 +189,10 @@ bool ESPEasy_key_value_store::load( if ((sizePerType < 4) && (storageType != ESPEasy_key_value_store::StorageType::string_type)) { // Should not happen as those should not be stored in the file _state = State::ErrorOnLoad; - #ifndef BUILD_NO_DEBUG + # ifndef BUILD_NO_DEBUG _lastError = strformat(F("KVS: Invalid storage type %d at readPos %d"), static_cast(storageType), LOG_READPOS_OFFSET); addLog(LOG_LEVEL_ERROR, _lastError); - #endif // ifndef BUILD_NO_DEBUG + # endif // ifndef BUILD_NO_DEBUG return false; } } @@ -226,11 +228,11 @@ bool ESPEasy_key_value_store::load( if (!partialString.reserve(bytesLeftPartialString)) { _state = State::ErrorOnLoad; - #ifndef BUILD_NO_DEBUG + # ifndef BUILD_NO_DEBUG _lastError = strformat(F("KVS: Could not allocate string size %d at readPos %d"), bytesLeftPartialString, LOG_READPOS_OFFSET); addLog(LOG_LEVEL_ERROR, _lastError); - #endif // ifndef BUILD_NO_DEBUG + # endif // ifndef BUILD_NO_DEBUG return false; } } @@ -246,12 +248,12 @@ bool ESPEasy_key_value_store::load( } else if (bytesLeftPartialString > 0) { // What to do here if bytesLeftPartialString != 0 ???? _state = State::ErrorOnLoad; - #ifndef BUILD_NO_DEBUG + # ifndef BUILD_NO_DEBUG _lastError = strformat(F("KVS: Unexpected end-of-string, expected %d more at readPos %d"), bytesLeftPartialString, LOG_READPOS_OFFSET); addLog(LOG_LEVEL_ERROR, _lastError); - #endif // ifndef BUILD_NO_DEBUG + # endif // ifndef BUILD_NO_DEBUG return false; } } @@ -301,27 +303,27 @@ bool ESPEasy_key_value_store::load( if ((bufPos_start_loop == bufPos) && !loadNextFromFile) { _state = State::ErrorOnLoad; - #ifndef BUILD_NO_DEBUG + # ifndef BUILD_NO_DEBUG _lastError = strformat(F("KVS: BUG! Did not increment bufPos while processing StorageType %d at readPos %d"), static_cast(storageType), LOG_READPOS_OFFSET); addLog(LOG_LEVEL_ERROR, _lastError); - #endif // ifndef BUILD_NO_DEBUG + # endif // ifndef BUILD_NO_DEBUG return false; } readPos += (bufPos - bufPos_start_loop); - #undef LOG_READPOS_OFFSET + # undef LOG_READPOS_OFFSET } } if (timePassedSince(start) >= 1000) { _state = State::ErrorOnLoad; -#ifndef BUILD_NO_DEBUG +# ifndef BUILD_NO_DEBUG _lastError = strformat( F("KVS: Timeout! bufPos while processing StorageType %d at readPos %d, startChecksumPos: %d"), static_cast(storageType), readPos, startChecksumPos); addLog(LOG_LEVEL_ERROR, _lastError); dump(); -#endif // ifndef BUILD_NO_DEBUG +# endif // ifndef BUILD_NO_DEBUG return false; } @@ -338,9 +340,9 @@ bool ESPEasy_key_value_store::store( uint16_t id_to_match) { if (getState() == State::NotChanged) { - #ifndef BUILD_NO_DEBUG + # ifndef BUILD_NO_DEBUG addLog(LOG_LEVEL_INFO, F("KVS: Content not changed, no need to save")); - #endif + # endif return true; } @@ -350,19 +352,19 @@ bool ESPEasy_key_value_store::store( if (!SettingsType::getSettingsParameters(settingsType, index, offset, max_size)) { _state = State::ErrorOnSave; - #ifndef BUILD_NO_DEBUG + # ifndef BUILD_NO_DEBUG _lastError = F("KVS: Invalid index"); addLog(LOG_LEVEL_ERROR, _lastError); // addLog(LOG_LEVEL_DEBUG, _lastError); - #endif // ifndef BUILD_NO_DEBUG + # endif // ifndef BUILD_NO_DEBUG return false; } - #ifdef ESP8266 + # ifdef ESP8266 uint16_t bufferSize = 256; - #endif // ifdef ESP8266 - #ifdef ESP32 + # endif // ifdef ESP8266 + # ifdef ESP32 uint16_t bufferSize = 1024; - #endif // ifdef ESP32 + # endif // ifdef ESP32 if (bufferSize > max_size) { bufferSize = max_size; @@ -387,10 +389,10 @@ bool ESPEasy_key_value_store::store( if ((offset_in_block + totalSize) > static_cast(max_size)) { _state = State::ErrorOnSave; - #ifndef BUILD_NO_DEBUG + # ifndef BUILD_NO_DEBUG _lastError = strformat(F("KVS: Total size %d + offset %d exceeds max size %d"), totalSize, offset_in_block, max_size); addLog(LOG_LEVEL_ERROR, _lastError); // addLog(LOG_LEVEL_DEBUG, _lastError); - #endif // ifndef BUILD_NO_DEBUG + # endif // ifndef BUILD_NO_DEBUG return false; } @@ -523,11 +525,11 @@ bool ESPEasy_key_value_store::store( } } else { _state = State::ErrorOnSave; - #ifndef BUILD_NO_DEBUG + # ifndef BUILD_NO_DEBUG _lastError = strformat(F("KVS: BUG! Should not have storage type %d stored with 0 bytes at writePos %d"), static_cast(storageType), writePos + bufPos); addLog(LOG_LEVEL_ERROR, _lastError); - #endif // ifndef BUILD_NO_DEBUG + # endif // ifndef BUILD_NO_DEBUG return false; } } else { @@ -559,9 +561,9 @@ bool ESPEasy_key_value_store::store( // Consider a successful save the same as a fresh load. // The data is now the same as what is stored -#ifndef BUILD_NO_DEBUG +# ifndef BUILD_NO_DEBUG addLog(LOG_LEVEL_INFO, strformat(F("KVS: Written %d bytes"), writePos)); -#endif +# endif _state = State::NotChanged; dump(); return true; @@ -689,27 +691,27 @@ ESPEasy_key_value_store::map_8byte_data::const_iterator ESPEasy_key_value_store: return _8byte_data.find(combined_key); } -#define GET_4BYTE_TYPE(T, GF) \ +# define GET_4BYTE_TYPE(T, GF) \ auto it = get4byteIterator(ESPEasy_key_value_store::StorageType::T, key); \ if (it == _4byte_data.end()) return false; \ value = it->second.GF(); \ return true; \ -#define GET_8BYTE_TYPE(T, GF) \ +# define GET_8BYTE_TYPE(T, GF) \ auto it = get8byteIterator(ESPEasy_key_value_store::StorageType::T, key); \ if (it == _8byte_data.end()) return false; \ value = it->second.GF(); \ return true; \ -#define SET_4BYTE_TYPE(T, SF) \ +# define SET_4BYTE_TYPE(T, SF) \ const uint32_t combined_key = combine_StorageType_and_key( \ ESPEasy_key_value_store::StorageType::T, key); \ if (_4byte_data[combined_key].SF(value)) _state = State::Changed; \ setHasStorageType(ESPEasy_key_value_store::StorageType::T); -#define SET_8BYTE_TYPE(T, SF) \ +# define SET_8BYTE_TYPE(T, SF) \ const uint32_t combined_key = combine_StorageType_and_key( \ ESPEasy_key_value_store::StorageType::T, key); \ if (_8byte_data[combined_key].SF(value)) _state = State::Changed; \ @@ -867,7 +869,7 @@ bool ESPEasy_key_value_store::getValueAsString(uint32_t key, String& value) cons return getValueAsString(getStorageType(key), key, value); } -#define GET_TYPE_AS_INT64(T, CT) \ +# define GET_TYPE_AS_INT64(T, CT) \ case ESPEasy_key_value_store::StorageType::T: \ { \ CT v{}; \ @@ -906,19 +908,20 @@ bool ESPEasy_key_value_store::getValueAsInt( return false; } - int64_t ESPEasy_key_value_store::getValueAsInt_or_default(uint32_t key, int64_t default_value) const - { - int64_t value = default_value; - if (getValueAsInt(key, value)) return value; - return default_value; - } - int64_t ESPEasy_key_value_store::getValueAsInt(uint32_t key) const - { - return getValueAsInt_or_default(key, 0); - } +int64_t ESPEasy_key_value_store::getValueAsInt_or_default(uint32_t key, int64_t default_value) const +{ + int64_t value = default_value; + if (getValueAsInt(key, value)) { return value; } + return default_value; +} -#define GET_4BYTE_INT_TYPE_FROM_STRING(T, CT) \ +int64_t ESPEasy_key_value_store::getValueAsInt(uint32_t key) const +{ + return getValueAsInt_or_default(key, 0); +} + +# define GET_4BYTE_INT_TYPE_FROM_STRING(T, CT) \ case ESPEasy_key_value_store::StorageType::T: \ { \ CT v(value.toInt()); \ @@ -1127,3 +1130,5 @@ void ESPEasy_key_value_store::dump() const } } + +#endif // if FEATURE_STORE_NETWORK_INTERFACE_SETTINGS diff --git a/src/src/Helpers/_ESPEasy_key_value_store.h b/src/src/Helpers/_ESPEasy_key_value_store.h index 8ac5438d5..b60bb7bd3 100644 --- a/src/src/Helpers/_ESPEasy_key_value_store.h +++ b/src/src/Helpers/_ESPEasy_key_value_store.h @@ -3,10 +3,12 @@ #include "../../ESPEasy_common.h" -#include "../DataTypes/ESPEasy_key_value_store_data.h" -#include "../DataTypes/SettingsType.h" +#if FEATURE_STORE_NETWORK_INTERFACE_SETTINGS -#include +# include "../DataTypes/ESPEasy_key_value_store_data.h" +# include "../DataTypes/SettingsType.h" + +# include // Generic storage layer, which on a low level will store everything as a string. // Low level storage structure: @@ -171,13 +173,14 @@ public: uint32_t key, String & value) const; - bool getValueAsString(uint32_t key, - String & value) const; + bool getValueAsString(uint32_t key, + String & value) const; - bool getValueAsInt(uint32_t key, - int64_t & value) const; + bool getValueAsInt(uint32_t key, + int64_t& value) const; - int64_t getValueAsInt_or_default(uint32_t key, int64_t default_value) const; + int64_t getValueAsInt_or_default(uint32_t key, + int64_t default_value) const; int64_t getValueAsInt(uint32_t key) const; // Generic set function for any given storageType/key. @@ -239,4 +242,6 @@ private: }; // class ESPEasy_key_value_store +#endif // if FEATURE_STORE_NETWORK_INTERFACE_SETTINGS + #endif // ifndef HELPERS_ESPEASY_KEY_VALUE_STORE_H diff --git a/src/src/NWPluginStructs/NW005_data_struct_PPP_modem.cpp b/src/src/NWPluginStructs/NW005_data_struct_PPP_modem.cpp index 925d89e9d..d44c65fa3 100644 --- a/src/src/NWPluginStructs/NW005_data_struct_PPP_modem.cpp +++ b/src/src/NWPluginStructs/NW005_data_struct_PPP_modem.cpp @@ -418,10 +418,11 @@ void NW005_data_struct_PPP_modem::webform_load(struct EventStruct *event) addHtml_pre(PPP.IMSI()); if (PPP.attached()) { + const String operatorName = PPP.operatorName(); addRowLabel(F("Mobile Country Code (MCC)")); - addHtml_pre(PPP.operatorName().substring(0, 3)); + addHtml_pre(operatorName.substring(0, 3)); addRowLabel(F("Mobile Network Code (MNC)")); - addHtml_pre(PPP.operatorName().substring(3)); + addHtml_pre(operatorName.substring(3)); addFormNote(F("See Wikipedia - Mobile Country Code")); if (PPP.mode() != ESP_MODEM_MODE_CMUX) { diff --git a/src/src/WebServer/ESPEasy_key_value_store_webform.cpp b/src/src/WebServer/ESPEasy_key_value_store_webform.cpp index 5ffefde7c..bdb367778 100644 --- a/src/src/WebServer/ESPEasy_key_value_store_webform.cpp +++ b/src/src/WebServer/ESPEasy_key_value_store_webform.cpp @@ -1,8 +1,9 @@ #include "../WebServer/ESPEasy_key_value_store_webform.h" -#include "../Helpers/StringConverter.h" +#if FEATURE_STORE_NETWORK_INTERFACE_SETTINGS +# include "../Helpers/StringConverter.h" -#include "../WebServer/Markup_Forms.h" +# include "../WebServer/Markup_Forms.h" WebFormItemParams::WebFormItemParams( const String & label, @@ -18,7 +19,7 @@ WebFormItemParams::WebFormItemParams( uint32_t key) : _label(label), _id(id), _storageType(storageType), _key(key) {} -#define CORRECT_RANGE(T, CT) \ +# define CORRECT_RANGE(T, CT) \ case ESPEasy_key_value_store::StorageType::T: \ if (_max > std::numeric_limits::max()) _max = std::numeric_limits::max(); \ if (_min < std::numeric_limits::min()) _min = std::numeric_limits::min(); \ @@ -64,9 +65,9 @@ bool showWebformItem(const ESPEasy_key_value_store& store, params._readOnly, params._required, params._pattern -#if FEATURE_TOOLTIPS +# if FEATURE_TOOLTIPS , params._tooltip -#endif // if FEATURE_TOOLTIPS +# endif // if FEATURE_TOOLTIPS ); return true; } @@ -86,9 +87,9 @@ bool showWebformItem(const ESPEasy_key_value_store& store, value, params._min, params._max, -#if FEATURE_TOOLTIPS +# if FEATURE_TOOLTIPS params._tooltip, -#endif // if FEATURE_TOOLTIPS +# endif // if FEATURE_TOOLTIPS params._disabled ); @@ -120,9 +121,9 @@ bool showWebformItem(const ESPEasy_key_value_store& store, params._nrDecimals, params._stepsize, -#if FEATURE_TOOLTIPS +# if FEATURE_TOOLTIPS params._tooltip -#endif // if FEATURE_TOOLTIPS +# endif // if FEATURE_TOOLTIPS ); @@ -148,16 +149,16 @@ bool showWebformItem(const ESPEasy_key_value_store& store, } void showFormSelector(const ESPEasy_key_value_store& store, - FormSelectorOptions& selector, - const WebFormItemParams& params) + FormSelectorOptions & selector, + const WebFormItemParams & params) { - int64_t value{}; - if (!store.getValueAsInt(params._key, value)) { value = params._defaultIntValue; } + int64_t value{}; - selector.addFormSelector(params._label, params._id, value); + if (!store.getValueAsInt(params._key, value)) { value = params._defaultIntValue; } + + selector.addFormSelector(params._label, params._id, value); } - void storeWebformItem(ESPEasy_key_value_store & store, uint32_t key, ESPEasy_key_value_store::StorageType storageType, @@ -176,3 +177,5 @@ void storeWebformItem(ESPEasy_key_value_store & store, } store.setValue(storageType, key, webArg(_id)); } + +#endif // if FEATURE_STORE_NETWORK_INTERFACE_SETTINGS diff --git a/src/src/WebServer/ESPEasy_key_value_store_webform.h b/src/src/WebServer/ESPEasy_key_value_store_webform.h index 2ff261d18..686a54905 100644 --- a/src/src/WebServer/ESPEasy_key_value_store_webform.h +++ b/src/src/WebServer/ESPEasy_key_value_store_webform.h @@ -3,8 +3,10 @@ #include "../WebServer/common.h" -#include "../DataTypes/FormSelectorOptions.h" -#include "../Helpers/_ESPEasy_key_value_store.h" +#if FEATURE_STORE_NETWORK_INTERFACE_SETTINGS + +# include "../DataTypes/FormSelectorOptions.h" +# include "../Helpers/_ESPEasy_key_value_store.h" struct WebFormItemParams { WebFormItemParams(const String & label, @@ -22,9 +24,9 @@ struct WebFormItemParams { String _label; String _id; -#if FEATURE_TOOLTIPS +# if FEATURE_TOOLTIPS String _tooltip; -#endif // if FEATURE_TOOLTIPS +# endif // if FEATURE_TOOLTIPS float _min = INT_MIN; float _max = INT_MAX; uint8_t _nrDecimals{}; @@ -38,18 +40,18 @@ struct WebFormItemParams { String _pattern; int64_t _defaultIntValue{}; - double _defaultFloatValue{}; - String _defaultStringValue; + double _defaultFloatValue{}; + String _defaultStringValue; }; bool showWebformItem(const ESPEasy_key_value_store& store, - WebFormItemParams params); + WebFormItemParams params); void showFormSelector(const ESPEasy_key_value_store& store, - FormSelectorOptions& selector, - const WebFormItemParams& params); + FormSelectorOptions & selector, + const WebFormItemParams & params); void storeWebformItem(ESPEasy_key_value_store & store, uint32_t key, @@ -61,5 +63,5 @@ void storeWebformItem(ESPEasy_key_value_store & store, ESPEasy_key_value_store::StorageType storageType, const String & id = EMPTY_STRING); - +#endif // if FEATURE_STORE_NETWORK_INTERFACE_SETTINGS #endif // ifndef WEBSERVER_ESPEASY_KEY_VALUE_STORE_WEBFORM_H From de2edd937f102abf1d3f8bcd4c9e78763a809bcb Mon Sep 17 00:00:00 2001 From: TD-er Date: Thu, 17 Jul 2025 01:45:49 +0200 Subject: [PATCH 124/564] [PPP modem] Remove PPP Modem plugin from ESP32-C3 as there isn't support --- src/src/CustomBuild/define_plugin_sets.h | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/src/src/CustomBuild/define_plugin_sets.h b/src/src/CustomBuild/define_plugin_sets.h index a383edb65..ac65f7b54 100644 --- a/src/src/CustomBuild/define_plugin_sets.h +++ b/src/src/CustomBuild/define_plugin_sets.h @@ -3869,11 +3869,17 @@ To create/register a plugin, you have to : #endif -#if FEATURE_PPP_MODEM + +#if FEATURE_PPP_MODEM && defined __has_include && __has_include("esp_modem_c_api_types.h") + #ifndef USES_NW005 #define USES_NW005 #endif #else + #if FEATURE_PPP_MODEM + #undef FEATURE_PPP_MODEM + #define FEATURE_PPP_MODEM 0 + #endif #ifdef USES_NW005 #undef USES_NW005 #endif From 746c3c5356c22f34c5a290dcdd46922730ea89ba Mon Sep 17 00:00:00 2001 From: TD-er Date: Thu, 17 Jul 2025 02:17:16 +0200 Subject: [PATCH 125/564] [PPP Modem] Fix build on LIMIT_BUILD_SIZE ESP32 builds --- src/src/CustomBuild/define_plugin_sets.h | 13 +++++++------ .../WebServer/ESPEasy_key_value_store_webform.cpp | 4 ++-- 2 files changed, 9 insertions(+), 8 deletions(-) diff --git a/src/src/CustomBuild/define_plugin_sets.h b/src/src/CustomBuild/define_plugin_sets.h index ac65f7b54..e1b7903e7 100644 --- a/src/src/CustomBuild/define_plugin_sets.h +++ b/src/src/CustomBuild/define_plugin_sets.h @@ -3239,6 +3239,12 @@ To create/register a plugin, you have to : #endif #endif +#if FEATURE_PPP_MODEM && defined __has_include && !__has_include("esp_modem_c_api_types.h") +#undef FEATURE_PPP_MODEM +#define FEATURE_PPP_MODEM 0 +#endif + + #ifndef FEATURE_WIFI #ifdef ESP8266 #define FEATURE_WIFI 1 @@ -3870,16 +3876,11 @@ To create/register a plugin, you have to : -#if FEATURE_PPP_MODEM && defined __has_include && __has_include("esp_modem_c_api_types.h") - +#if FEATURE_PPP_MODEM #ifndef USES_NW005 #define USES_NW005 #endif #else - #if FEATURE_PPP_MODEM - #undef FEATURE_PPP_MODEM - #define FEATURE_PPP_MODEM 0 - #endif #ifdef USES_NW005 #undef USES_NW005 #endif diff --git a/src/src/WebServer/ESPEasy_key_value_store_webform.cpp b/src/src/WebServer/ESPEasy_key_value_store_webform.cpp index bdb367778..f62a15b83 100644 --- a/src/src/WebServer/ESPEasy_key_value_store_webform.cpp +++ b/src/src/WebServer/ESPEasy_key_value_store_webform.cpp @@ -119,10 +119,10 @@ bool showWebformItem(const ESPEasy_key_value_store& store, params._min, params._max, params._nrDecimals, - params._stepsize, + params._stepsize # if FEATURE_TOOLTIPS - params._tooltip + ,params._tooltip # endif // if FEATURE_TOOLTIPS ); From 55283bdab957b3c6ad0d399214d545d7a8182f26 Mon Sep 17 00:00:00 2001 From: TD-er Date: Thu, 17 Jul 2025 12:37:52 +0200 Subject: [PATCH 126/564] [PPP Modem] Add UE Cell info + fix ESP32C2 build --- src/src/CustomBuild/ESPEasyDefaults.h | 2 + .../FactoryDefault_Network_NVS.cpp | 4 + .../NW005_data_struct_PPP_modem.cpp | 93 +++++++++++++------ 3 files changed, 69 insertions(+), 30 deletions(-) diff --git a/src/src/CustomBuild/ESPEasyDefaults.h b/src/src/CustomBuild/ESPEasyDefaults.h index e7f1f8509..3982fdf3c 100644 --- a/src/src/CustomBuild/ESPEasyDefaults.h +++ b/src/src/CustomBuild/ESPEasyDefaults.h @@ -274,6 +274,8 @@ #ifndef DEFAULT_ETH_PHY_TYPE #ifdef ESP32P4 #define DEFAULT_ETH_PHY_TYPE EthPhyType_t::TLK110 +#elif defined(ESP32C2) +#define DEFAULT_ETH_PHY_TYPE 0 #else #define DEFAULT_ETH_PHY_TYPE EthPhyType_t::notSet #endif diff --git a/src/src/DataStructs/FactoryDefault_Network_NVS.cpp b/src/src/DataStructs/FactoryDefault_Network_NVS.cpp index add6e4595..6bc5c4c90 100644 --- a/src/src/DataStructs/FactoryDefault_Network_NVS.cpp +++ b/src/src/DataStructs/FactoryDefault_Network_NVS.cpp @@ -38,7 +38,11 @@ bool FactoryDefault_Network_NVS::applyToSettings_from_NVS(ESPEasy_NVS_Helper& pr Settings.ETH_Pin_mdc_cs = bits.ETH_Pin_mdc_cs; Settings.ETH_Pin_mdio_irq = bits.ETH_Pin_mdio_irq; Settings.ETH_Pin_power_rst = bits.ETH_Pin_power_rst; +#ifdef ESP32C2 + Settings.ETH_Phy_Type = 0; +#else Settings.ETH_Phy_Type = static_cast(bits.ETH_Phy_Type); +#endif # if CONFIG_ETH_USE_ESP32_EMAC Settings.ETH_Clock_Mode = static_cast(bits.ETH_Clock_Mode); #endif diff --git a/src/src/NWPluginStructs/NW005_data_struct_PPP_modem.cpp b/src/src/NWPluginStructs/NW005_data_struct_PPP_modem.cpp index d44c65fa3..37f35e1b9 100644 --- a/src/src/NWPluginStructs/NW005_data_struct_PPP_modem.cpp +++ b/src/src/NWPluginStructs/NW005_data_struct_PPP_modem.cpp @@ -151,7 +151,7 @@ String NW005_data_struct_PPP_modem::getBER() return F("-"); } -const __FlashStringHelper* NW005_decode_label(int sysmode_index, uint8_t i) +const __FlashStringHelper* NW005_decode_label(int sysmode_index, uint8_t i, String& value_str) { const __FlashStringHelper*res = F(""); @@ -201,7 +201,30 @@ const __FlashStringHelper* NW005_decode_label(int sysmode_index, uint8_t i) F("dlbw"), F("ulbw"), F("RSRQ"), F("RSRP"), F("RSSI"), F("RSSNR") }; - if (i < NR_ELEMENTS(labels)) { res = labels[i]; } + if (i < NR_ELEMENTS(labels)) { + res = labels[i]; + switch (i) + { + case 10: + // RSRQ + { + float val = value_str.toInt(); + val -= 40; + val /= 2.0f; + value_str = String(val, 1) + F(" [dBm]"); + } + break; + case 11: + // RSRP + value_str = strformat(F("%d [dBm]"), value_str.toInt() - 140); + break; + case 12: + // RSSI + value_str = strformat(F("%d [dBm]"), value_str.toInt() - 110); + break; + } + + } break; } } @@ -212,36 +235,45 @@ void NW005_data_struct_PPP_modem::webform_load_UE_system_information() { String res = PPP.cmd("AT+CPSI?", 1000); - if (!res.isEmpty()/* && res.startsWith(F("+CPSI"))*/) { + if (!res.isEmpty() /* && res.startsWith(F("+CPSI"))*/) { int start_index = 0; int end_index = res.indexOf(','); const String systemMode = res.substring(start_index, end_index); + addLog(LOG_LEVEL_INFO, concat(F("PPP: UE sysinfo: "), systemMode)); + const __FlashStringHelper*sysmode_str[] = { F("NO SERVICE"), F("GSM"), F("WCDMA"), F("LTE") }; int sysmode_index = -1; - for (int i = 0; i < NR_ELEMENTS(sysmode_str) && sysmode_index != -1; ++i) { + for (int i = 0; i < NR_ELEMENTS(sysmode_str) && sysmode_index == -1; ++i) { if (systemMode.endsWith(sysmode_str[i])) { sysmode_index = i; } } -// if (sysmode_index == -1) { return; } + if (sysmode_index == -1) { return; } addFormSubHeader(F("UE System Information")); res += ','; // Add trailing comma so we're not missing the last element - for (int i = 0; end_index != -1; ++i) + + for (int i = 0; start_index < res.length() && end_index != -1 && i < 15; ++i) { - const String label = NW005_decode_label(sysmode_index, i); - if (!label.isEmpty()) { - addRowLabel(label); - if (i == 0) addHtml(sysmode_str[sysmode_index]); - else - addHtml_pre(res.substring(start_index, end_index)); + String value_str = res.substring(start_index, end_index); + const String label = NW005_decode_label(sysmode_index, i, value_str); + + if (!label.isEmpty()) { + addRowLabel(label); + + if (i == 0) { + // We have some leading characters left here, so use the 'clean' strings + addHtml(sysmode_str[sysmode_index]); + } else { + addHtml_pre(value_str); } - start_index = end_index; - end_index = res.indexOf(',', start_index); + } + start_index = end_index + 1; + end_index = res.indexOf(',', start_index); } } @@ -428,25 +460,26 @@ void NW005_data_struct_PPP_modem::webform_load(struct EventStruct *event) if (PPP.mode() != ESP_MODEM_MODE_CMUX) { PPP.mode(ESP_MODEM_MODE_CMUX); } - /* - { - String res = PPP.cmd("AT+CPSI?", 1000); - if (!res.isEmpty()) { + /* + { + String res = PPP.cmd("AT+CPSI?", 1000); + + if (!res.isEmpty()) { addRowLabel(F("AT+CPSI?")); addHtml_pre(res); - } - }*/ - /* - { - String res = PPP.cmd("AT+CPSITD?", 1000); + } + }*/ + /* + { + String res = PPP.cmd("AT+CPSITD?", 1000); - if (!res.isEmpty()) { - addRowLabel(F("AT+CPSITD?")); - addHtml_pre(res); - } - } - */ + if (!res.isEmpty()) { + addRowLabel(F("AT+CPSITD?")); + addHtml_pre(res); + } + } + */ } @@ -567,7 +600,7 @@ void NW005_data_struct_PPP_modem::webform_load(struct EventStruct *event) } */ -// webform_load_UE_system_information(); + webform_load_UE_system_information(); } void NW005_data_struct_PPP_modem::webform_save(struct EventStruct *event) From 2a84e95ade60f091c8a9b393c8eaa913dc0ce364 Mon Sep 17 00:00:00 2001 From: TD-er Date: Thu, 17 Jul 2025 17:34:57 +0200 Subject: [PATCH 127/564] [PPP Modem] Disable PPP Modem plugin for 4M flash builds due to size --- src/src/CustomBuild/define_plugin_sets.h | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/src/src/CustomBuild/define_plugin_sets.h b/src/src/CustomBuild/define_plugin_sets.h index e1b7903e7..41ed5fc69 100644 --- a/src/src/CustomBuild/define_plugin_sets.h +++ b/src/src/CustomBuild/define_plugin_sets.h @@ -3233,7 +3233,12 @@ To create/register a plugin, you have to : #ifndef FEATURE_PPP_MODEM #ifdef ESP32 +#ifdef ESP32_4M +// For now we need to keep build size in mind +#define FEATURE_PPP_MODEM 0 +#else #define FEATURE_PPP_MODEM 1 +#endif #else #define FEATURE_PPP_MODEM 0 #endif From 8d022794bea460e5427fe6d7c3a478ce4533d43f Mon Sep 17 00:00:00 2001 From: TD-er Date: Thu, 17 Jul 2025 18:05:10 +0200 Subject: [PATCH 128/564] [Build] Fix ESP32C6 builds --- platformio_esp32c2_envs.ini | 1 - platformio_esp32c6_envs.ini | 1 + src/src/CustomBuild/ESPEasyDefaults.h | 6 ++++-- src/src/DataStructs/FactoryDefault_Network_NVS.cpp | 6 +++--- 4 files changed, 8 insertions(+), 6 deletions(-) diff --git a/platformio_esp32c2_envs.ini b/platformio_esp32c2_envs.ini index de68b96fc..44a27d902 100644 --- a/platformio_esp32c2_envs.ini +++ b/platformio_esp32c2_envs.ini @@ -4,7 +4,6 @@ extends = esp32_base_idf5 build_flags = ${esp32_base_idf5.build_flags} -DFEATURE_ARDUINO_OTA=1 - -DUSE_LITTLEFS -DESP32C2 extra_scripts = ${esp32_base_idf5.extra_scripts} build_unflags = ${esp32_base_idf5.build_unflags} diff --git a/platformio_esp32c6_envs.ini b/platformio_esp32c6_envs.ini index 27cc0958f..4e78a5ecd 100644 --- a/platformio_esp32c6_envs.ini +++ b/platformio_esp32c6_envs.ini @@ -4,6 +4,7 @@ build_flags = ${esp32_base_idf5.build_flags} -DFEATURE_ARDUINO_OTA=1 -DUSE_LITTLEFS -DESP32C6 + -DFEATURE_ETHERNET extra_scripts = ${esp32_base_idf5.extra_scripts} build_unflags = ${esp32_base_idf5.build_unflags} -fexceptions diff --git a/src/src/CustomBuild/ESPEasyDefaults.h b/src/src/CustomBuild/ESPEasyDefaults.h index 3982fdf3c..7a548c57c 100644 --- a/src/src/CustomBuild/ESPEasyDefaults.h +++ b/src/src/CustomBuild/ESPEasyDefaults.h @@ -272,13 +272,15 @@ #endif #endif #ifndef DEFAULT_ETH_PHY_TYPE +#if FEATURE_ETHERNET #ifdef ESP32P4 #define DEFAULT_ETH_PHY_TYPE EthPhyType_t::TLK110 -#elif defined(ESP32C2) -#define DEFAULT_ETH_PHY_TYPE 0 #else #define DEFAULT_ETH_PHY_TYPE EthPhyType_t::notSet #endif +#else +#define DEFAULT_ETH_PHY_TYPE 0 +#endif #endif #ifndef DEFAULT_ETH_PIN_MDC #ifdef ESP32P4 diff --git a/src/src/DataStructs/FactoryDefault_Network_NVS.cpp b/src/src/DataStructs/FactoryDefault_Network_NVS.cpp index 6bc5c4c90..2d3b6bca7 100644 --- a/src/src/DataStructs/FactoryDefault_Network_NVS.cpp +++ b/src/src/DataStructs/FactoryDefault_Network_NVS.cpp @@ -38,10 +38,10 @@ bool FactoryDefault_Network_NVS::applyToSettings_from_NVS(ESPEasy_NVS_Helper& pr Settings.ETH_Pin_mdc_cs = bits.ETH_Pin_mdc_cs; Settings.ETH_Pin_mdio_irq = bits.ETH_Pin_mdio_irq; Settings.ETH_Pin_power_rst = bits.ETH_Pin_power_rst; -#ifdef ESP32C2 - Settings.ETH_Phy_Type = 0; -#else +#if FEATURE_ETHERNET Settings.ETH_Phy_Type = static_cast(bits.ETH_Phy_Type); +#else + Settings.ETH_Phy_Type = 0; #endif # if CONFIG_ETH_USE_ESP32_EMAC Settings.ETH_Clock_Mode = static_cast(bits.ETH_Clock_Mode); From 31178de0245bedf65497aa4871492697556e804a Mon Sep 17 00:00:00 2001 From: TD-er Date: Fri, 18 Jul 2025 00:19:18 +0200 Subject: [PATCH 129/564] [Build] Remove "_CDC_" from all env names due to linker issues --- .gitignore | 14 ++++---- README.md | 4 +-- platformio.ini | 2 +- platformio_esp32c3_envs.ini | 28 +++++++-------- platformio_esp32c5_envs.ini | 2 +- platformio_esp32c61_envs.ini | 2 +- platformio_esp32c6_envs.ini | 16 ++++----- platformio_esp32p4_envs.ini | 2 +- platformio_esp32s2_envs.ini | 28 +++++++-------- platformio_esp32s3_envs.ini | 50 +++++++++++++-------------- src/src/ESPEasyCore/ESPEasy_setup.cpp | 3 ++ 11 files changed, 77 insertions(+), 74 deletions(-) diff --git a/.gitignore b/.gitignore index 0cecf1e8b..71a3dc59c 100644 --- a/.gitignore +++ b/.gitignore @@ -74,13 +74,13 @@ docs/source/Plugin/_plugin_sets_overview.repl .pio/ managed_components/ - -CMakeLists.txt - -sdkconfig.max_ESP32s3_16M8M_LittleFS_OPI_PSRAM_CDC_ETH - -sdkconfig.defaults - + +CMakeLists.txt + +sdkconfig.max_ESP32s3_16M8M_LittleFS_OPI_PSRAM_ETH + +sdkconfig.defaults + dependencies.lock .dummy/ diff --git a/README.md b/README.md index 5ad86b237..7e170d399 100644 --- a/README.md +++ b/README.md @@ -137,8 +137,8 @@ ESPEasy_mega-20230822_collection_A_ESP8266_4M1M.bin | ESP8266 ESPEasy_mega-20230822_normal_ESP32_4M316k_ETH.bin | ESP32 with 4MB flash | Stable | ESPEasy_mega-20230822_collection_A_ESP32_4M316k_ETH.bin | ESP32 with 4MB flash | Stable + Collection base + set A | ESPEasy_mega-20230822_collection_B_ESP32_4M316k_ETH.bin | ESP32 with 4MB flash | Stable + Collection base + set B | -ESPEasy_mega-20230822_max_ESP32s3_8M1M_LittleFS_CDC_ETH.bin | ESP32-S3 with 8MB flash, CDC-serial, Ethernet | All available plugins | -ESPEasy_mega-20230822_max_ESP32s3_8M1M_LittleFS_OPI_PSRAM_CDC_ETH.bin | ESP32-S3 8MB flash, PSRAM, CDC-serial, Ethernet | All available plugins | +ESPEasy_mega-20230822_max_ESP32s3_8M1M_LittleFS_ETH.bin | ESP32-S3 with 8MB flash, CDC-serial, Ethernet | All available plugins | +ESPEasy_mega-20230822_max_ESP32s3_8M1M_LittleFS_OPI_PSRAM_ETH.bin | ESP32-S3 8MB flash, PSRAM, CDC-serial, Ethernet | All available plugins | ESPEasy_mega-20230822_max_ESP32_16M1M_ETH.bin | ESP32 with 16MB flash, SPIFFS, Ethernet | All available plugins | ESPEasy_mega-20230822_max_ESP32_16M8M_LittleFS_ETH.bin | ESP32 with 16MB flash, LittleFS, Ethernet | All available plugins | diff --git a/platformio.ini b/platformio.ini index 8b60523b5..5c939704f 100644 --- a/platformio.ini +++ b/platformio.ini @@ -35,7 +35,7 @@ extra_configs = ;default_envs = normal_ESP32_4M default_envs = max_ESP32_16M8M_LittleFS_ETH -;default_envs = max_ESP32c5_8M1M_LittleFS_CDC_ETH +;default_envs = max_ESP32c5_8M1M_LittleFS_ETH ;default_envs = normal_ESP32c6_4M316k_LittleFS_CDC ; default_envs = custom_ESP8266_4M1M diff --git a/platformio_esp32c3_envs.ini b/platformio_esp32c3_envs.ini index 816ab1f4c..874ecd23d 100644 --- a/platformio_esp32c3_envs.ini +++ b/platformio_esp32c3_envs.ini @@ -13,7 +13,7 @@ lib_ignore = ${esp32_base_idf5.lib_ignore} board = esp32c3cdc -[env:custom_ESP32c3_4M316k_LittleFS_CDC_ETH] +[env:custom_ESP32c3_4M316k_LittleFS_ETH] extends = esp32c3_common_LittleFS build_flags = ${esp32c3_common_LittleFS.build_flags} -DPLUGIN_BUILD_CUSTOM @@ -22,81 +22,81 @@ extra_scripts = ${esp32c3_common_LittleFS.extra_scripts} -[env:normal_ESP32c3_4M316k_LittleFS_CDC_ETH] +[env:normal_ESP32c3_4M316k_LittleFS_ETH] extends = esp32c3_common_LittleFS build_flags = ${esp32c3_common_LittleFS.build_flags} lib_ignore = ${esp32c3_common_LittleFS.lib_ignore} ${no_ir.lib_ignore} -[env:collection_A_ESP32c3_4M316k_LittleFS_CDC_ETH] +[env:collection_A_ESP32c3_4M316k_LittleFS_ETH] extends = esp32c3_common_LittleFS build_flags = ${esp32c3_common_LittleFS.build_flags} -DPLUGIN_SET_COLLECTION_ESP32 -DCOLLECTION_FEATURE_RTTTL=1 -[env:collection_B_ESP32c3_4M316k_LittleFS_CDC_ETH] +[env:collection_B_ESP32c3_4M316k_LittleFS_ETH] extends = esp32c3_common_LittleFS build_flags = ${esp32c3_common_LittleFS.build_flags} -DPLUGIN_SET_COLLECTION_B_ESP32 -DCOLLECTION_FEATURE_RTTTL=1 -[env:collection_C_ESP32c3_4M316k_LittleFS_CDC_ETH] +[env:collection_C_ESP32c3_4M316k_LittleFS_ETH] extends = esp32c3_common_LittleFS build_flags = ${esp32c3_common_LittleFS.build_flags} -DPLUGIN_SET_COLLECTION_C_ESP32 -DCOLLECTION_FEATURE_RTTTL=1 -[env:collection_D_ESP32c3_4M316k_LittleFS_CDC_ETH] +[env:collection_D_ESP32c3_4M316k_LittleFS_ETH] extends = esp32c3_common_LittleFS build_flags = ${esp32c3_common_LittleFS.build_flags} -DPLUGIN_SET_COLLECTION_D_ESP32 -DCOLLECTION_FEATURE_RTTTL=1 -[env:collection_E_ESP32c3_4M316k_LittleFS_CDC_ETH] +[env:collection_E_ESP32c3_4M316k_LittleFS_ETH] extends = esp32c3_common_LittleFS build_flags = ${esp32c3_common_LittleFS.build_flags} -DPLUGIN_SET_COLLECTION_E_ESP32 -DCOLLECTION_FEATURE_RTTTL=1 -[env:collection_F_ESP32c3_4M316k_LittleFS_CDC_ETH] +[env:collection_F_ESP32c3_4M316k_LittleFS_ETH] extends = esp32c3_common_LittleFS build_flags = ${esp32c3_common_LittleFS.build_flags} -DPLUGIN_SET_COLLECTION_F_ESP32 -DCOLLECTION_FEATURE_RTTTL=1 -[env:collection_G_ESP32c3_4M316k_LittleFS_CDC_ETH] +[env:collection_G_ESP32c3_4M316k_LittleFS_ETH] extends = esp32c3_common_LittleFS build_flags = ${esp32c3_common_LittleFS.build_flags} -DPLUGIN_SET_COLLECTION_G_ESP32 -DCOLLECTION_FEATURE_RTTTL=1 -[env:energy_ESP32c3_4M316k_LittleFS_CDC_ETH] +[env:energy_ESP32c3_4M316k_LittleFS_ETH] extends = esp32c3_common_LittleFS build_flags = ${esp32c3_common_LittleFS.build_flags} -D PLUGIN_ENERGY_COLLECTION -[env:display_ESP32c3_4M316k_LittleFS_CDC_ETH] +[env:display_ESP32c3_4M316k_LittleFS_ETH] extends = esp32c3_common_LittleFS build_flags = ${esp32c3_common_LittleFS.build_flags} -D PLUGIN_DISPLAY_COLLECTION -D ST7789_EXTRA_INIT=1 -D P116_EXTRA_ST7789=1 -[env:climate_ESP32c3_4M316k_LittleFS_CDC_ETH] +[env:climate_ESP32c3_4M316k_LittleFS_ETH] extends = esp32c3_common_LittleFS build_flags = ${esp32c3_common_LittleFS.build_flags} -D PLUGIN_CLIMATE_COLLECTION -[env:neopixel_ESP32c3_4M316k_LittleFS_CDC_ETH] +[env:neopixel_ESP32c3_4M316k_LittleFS_ETH] extends = esp32c3_common_LittleFS build_flags = ${esp32c3_common_LittleFS.build_flags} -DFEATURE_ARDUINO_OTA=1 -DFEATURE_SD=1 -DPLUGIN_NEOPIXEL_COLLECTION -[env:max_ESP32c3_16M8M_LittleFS_CDC_ETH] +[env:max_ESP32c3_16M8M_LittleFS_ETH] extends = esp32c3_common_LittleFS board = esp32c3cdc-16M build_flags = ${esp32c3_common_LittleFS.build_flags} diff --git a/platformio_esp32c5_envs.ini b/platformio_esp32c5_envs.ini index 3f3092566..6998ba52e 100644 --- a/platformio_esp32c5_envs.ini +++ b/platformio_esp32c5_envs.ini @@ -14,7 +14,7 @@ lib_ignore = ${esp32_base_idf5_5.lib_ignore} board = esp32c5cdc -[env:max_ESP32c5_8M1M_LittleFS_CDC_ETH] +[env:max_ESP32c5_8M1M_LittleFS_ETH] extends = esp32c5_common_LittleFS board = esp32c5cdc-8M build_flags = ${esp32c5_common_LittleFS.build_flags} diff --git a/platformio_esp32c61_envs.ini b/platformio_esp32c61_envs.ini index 1743b7abb..9f5a7d750 100644 --- a/platformio_esp32c61_envs.ini +++ b/platformio_esp32c61_envs.ini @@ -12,7 +12,7 @@ lib_ignore = ${esp32_base_idf5_5.lib_ignore} board = esp32c61cdc -[env:max_ESP32c61_8M1M_LittleFS_CDC_ETH] +[env:max_ESP32c61_8M1M_LittleFS_ETH] extends = esp32c61_common_LittleFS board = esp32c61cdc-8M build_flags = ${esp32c61_common_LittleFS.build_flags} diff --git a/platformio_esp32c6_envs.ini b/platformio_esp32c6_envs.ini index 4e78a5ecd..2ee850a0e 100644 --- a/platformio_esp32c6_envs.ini +++ b/platformio_esp32c6_envs.ini @@ -13,7 +13,7 @@ lib_ignore = ${esp32_base_idf5.lib_ignore} board = esp32c6cdc -[env:custom_ESP32c6_4M316k_LittleFS_CDC_ETH] +[env:custom_ESP32c6_4M316k_LittleFS_ETH] extends = esp32c6_common_LittleFS build_flags = ${esp32c6_common_LittleFS.build_flags} -DPLUGIN_BUILD_CUSTOM @@ -22,32 +22,32 @@ extra_scripts = ${esp32c6_common_LittleFS.extra_scripts} pre:tools/pio/pre_custom_esp32c6.py -[env:normal_ESP32c6_4M316k_LittleFS_CDC_ETH] +[env:normal_ESP32c6_4M316k_LittleFS_ETH] extends = esp32c6_common_LittleFS build_flags = ${esp32c6_common_LittleFS.build_flags} -DFEATURE_ETHERNET=1 lib_ignore = ${esp32c6_common_LittleFS.lib_ignore} ${no_ir.lib_ignore} -[env:energy_ESP32c6_4M316k_LittleFS_CDC_ETH] +[env:energy_ESP32c6_4M316k_LittleFS_ETH] extends = esp32c6_common_LittleFS build_flags = ${esp32c6_common_LittleFS.build_flags} -D PLUGIN_ENERGY_COLLECTION -[env:display_ESP32c6_4M316k_LittleFS_CDC_ETH] +[env:display_ESP32c6_4M316k_LittleFS_ETH] extends = esp32c6_common_LittleFS build_flags = ${esp32c6_common_LittleFS.build_flags} -D PLUGIN_DISPLAY_COLLECTION -D ST7789_EXTRA_INIT=1 -D P116_EXTRA_ST7789=1 -[env:climate_ESP32c6_4M316k_LittleFS_CDC_ETH] +[env:climate_ESP32c6_4M316k_LittleFS_ETH] extends = esp32c6_common_LittleFS build_flags = ${esp32c6_common_LittleFS.build_flags} -D PLUGIN_CLIMATE_COLLECTION -[env:neopixel_ESP32c6_4M316k_LittleFS_CDC_ETH] +[env:neopixel_ESP32c6_4M316k_LittleFS_ETH] extends = esp32c6_common_LittleFS build_flags = ${esp32c6_common_LittleFS.build_flags} -DFEATURE_ARDUINO_OTA=1 @@ -55,7 +55,7 @@ build_flags = ${esp32c6_common_LittleFS.build_flags} -DPLUGIN_NEOPIXEL_COLLECTION -[env:max_ESP32c6_8M1M_LittleFS_CDC_ETH] +[env:max_ESP32c6_8M1M_LittleFS_ETH] extends = esp32c6_common_LittleFS board = esp32c6cdc-8M build_flags = ${esp32c6_common_LittleFS.build_flags} @@ -68,7 +68,7 @@ build_flags = ${esp32c6_common_LittleFS.build_flags} extra_scripts = ${esp32c6_common_LittleFS.extra_scripts} -[env:max_ESP32c6_16M8M_LittleFS_CDC_ETH] +[env:max_ESP32c6_16M8M_LittleFS_ETH] extends = esp32c6_common_LittleFS board = esp32c6cdc-16M build_flags = ${esp32c6_common_LittleFS.build_flags} diff --git a/platformio_esp32p4_envs.ini b/platformio_esp32p4_envs.ini index 8941ec02a..5f3380910 100644 --- a/platformio_esp32p4_envs.ini +++ b/platformio_esp32p4_envs.ini @@ -14,7 +14,7 @@ lib_ignore = ${esp32_base_idf5_5.lib_ignore} board = esp32p4_ev -[env:max_ESP32p4_16M8M_LittleFS_CDC_ETH] +[env:max_ESP32p4_16M8M_LittleFS_ETH] extends = esp32p4_common_LittleFS board = esp32p4_ev build_flags = ${esp32p4_common_LittleFS.build_flags} diff --git a/platformio_esp32s2_envs.ini b/platformio_esp32s2_envs.ini index 473b131ef..98c9a46a8 100644 --- a/platformio_esp32s2_envs.ini +++ b/platformio_esp32s2_envs.ini @@ -12,7 +12,7 @@ board_build.filesystem = littlefs lib_ignore = ${esp32_base_idf5.lib_ignore} -[env:neopixel_ESP32s2_4M316k_LittleFS_CDC_ETH] +[env:neopixel_ESP32s2_4M316k_LittleFS_ETH] extends = esp32s2_common_LittleFS board = esp32s2cdc build_flags = ${esp32s2_common_LittleFS.build_flags} @@ -22,7 +22,7 @@ build_flags = ${esp32s2_common_LittleFS.build_flags} -[env:custom_IR_ESP32s2_4M316k_LittleFS_CDC_ETH] +[env:custom_IR_ESP32s2_4M316k_LittleFS_ETH] extends = esp32s2_common_LittleFS board = esp32s2cdc build_flags = ${esp32s2_common_LittleFS.build_flags} @@ -35,7 +35,7 @@ extra_scripts = ${esp32s2_common_LittleFS.extra_scripts} pre:tools/pio/ir_build_check.py -[env:custom_ESP32s2_4M316k_LittleFS_CDC_ETH] +[env:custom_ESP32s2_4M316k_LittleFS_ETH] extends = esp32s2_common_LittleFS board = esp32s2cdc lib_ignore = ${esp32s2_common_LittleFS.lib_ignore} @@ -48,7 +48,7 @@ extra_scripts = ${esp32s2_common_LittleFS.extra_scripts} -[env:normal_ESP32s2_4M316k_LittleFS_CDC_ETH] +[env:normal_ESP32s2_4M316k_LittleFS_ETH] extends = esp32s2_common_LittleFS board = esp32s2cdc build_flags = ${esp32s2_common_LittleFS.build_flags} @@ -56,49 +56,49 @@ build_flags = ${esp32s2_common_LittleFS.build_flags} lib_ignore = ${esp32s2_common_LittleFS.lib_ignore} ${no_ir.lib_ignore} -[env:collection_A_ESP32s2_4M316k_LittleFS_CDC_ETH] +[env:collection_A_ESP32s2_4M316k_LittleFS_ETH] extends = esp32s2_common_LittleFS board = esp32s2cdc build_flags = ${esp32s2_common_LittleFS.build_flags} -DPLUGIN_SET_COLLECTION_ESP32 -DCOLLECTION_FEATURE_RTTTL=1 -[env:collection_B_ESP32s2_4M316k_LittleFS_CDC_ETH] +[env:collection_B_ESP32s2_4M316k_LittleFS_ETH] extends = esp32s2_common_LittleFS board = esp32s2cdc build_flags = ${esp32s2_common_LittleFS.build_flags} -DPLUGIN_SET_COLLECTION_B_ESP32 -DCOLLECTION_FEATURE_RTTTL=1 -[env:collection_C_ESP32s2_4M316k_LittleFS_CDC_ETH] +[env:collection_C_ESP32s2_4M316k_LittleFS_ETH] extends = esp32s2_common_LittleFS board = esp32s2cdc build_flags = ${esp32s2_common_LittleFS.build_flags} -DPLUGIN_SET_COLLECTION_C_ESP32 -DCOLLECTION_FEATURE_RTTTL=1 -[env:collection_D_ESP32s2_4M316k_LittleFS_CDC_ETH] +[env:collection_D_ESP32s2_4M316k_LittleFS_ETH] extends = esp32s2_common_LittleFS board = esp32s2cdc build_flags = ${esp32s2_common_LittleFS.build_flags} -DPLUGIN_SET_COLLECTION_D_ESP32 -DCOLLECTION_FEATURE_RTTTL=1 -[env:collection_E_ESP32s2_4M316k_LittleFS_CDC_ETH] +[env:collection_E_ESP32s2_4M316k_LittleFS_ETH] extends = esp32s2_common_LittleFS board = esp32s2cdc build_flags = ${esp32s2_common_LittleFS.build_flags} -DPLUGIN_SET_COLLECTION_E_ESP32 -DCOLLECTION_FEATURE_RTTTL=1 -[env:collection_F_ESP32s2_4M316k_LittleFS_CDC_ETH] +[env:collection_F_ESP32s2_4M316k_LittleFS_ETH] extends = esp32s2_common_LittleFS board = esp32s2cdc build_flags = ${esp32s2_common_LittleFS.build_flags} -DPLUGIN_SET_COLLECTION_F_ESP32 -DCOLLECTION_FEATURE_RTTTL=1 -[env:collection_G_ESP32s2_4M316k_LittleFS_CDC_ETH] +[env:collection_G_ESP32s2_4M316k_LittleFS_ETH] extends = esp32s2_common_LittleFS board = esp32s2cdc build_flags = ${esp32s2_common_LittleFS.build_flags} @@ -106,13 +106,13 @@ build_flags = ${esp32s2_common_LittleFS.build_flags} -DCOLLECTION_FEATURE_RTTTL=1 -[env:energy_ESP32s2_4M316k_LittleFS_CDC_ETH] +[env:energy_ESP32s2_4M316k_LittleFS_ETH] extends = esp32s2_common_LittleFS board = esp32s2cdc build_flags = ${esp32s2_common_LittleFS.build_flags} -D PLUGIN_ENERGY_COLLECTION -[env:display_ESP32s2_4M316k_LittleFS_CDC_ETH] +[env:display_ESP32s2_4M316k_LittleFS_ETH] extends = esp32s2_common_LittleFS board = esp32s2cdc build_flags = ${esp32s2_common_LittleFS.build_flags} @@ -120,7 +120,7 @@ build_flags = ${esp32s2_common_LittleFS.build_flags} -D ST7789_EXTRA_INIT=1 -D P116_EXTRA_ST7789=1 -[env:climate_ESP32s2_4M316k_LittleFS_CDC_ETH] +[env:climate_ESP32s2_4M316k_LittleFS_ETH] extends = esp32s2_common_LittleFS board = esp32s2cdc build_flags = ${esp32s2_common_LittleFS.build_flags} diff --git a/platformio_esp32s3_envs.ini b/platformio_esp32s3_envs.ini index b8e9be2ec..23c5f0cde 100644 --- a/platformio_esp32s3_envs.ini +++ b/platformio_esp32s3_envs.ini @@ -15,7 +15,7 @@ build_unflags = ${esp32_base_idf5_5.build_unflags} board_build.filesystem = littlefs -[env:custom_ESP32s3_4M316k_LittleFS_CDC_ETH] +[env:custom_ESP32s3_4M316k_LittleFS_ETH] extends = esp32s3_common_LittleFS board = esp32s3cdc-qio_qspi build_flags = ${esp32s3_common_LittleFS.build_flags} @@ -24,7 +24,7 @@ extra_scripts = ${esp32s3_common_LittleFS.extra_scripts} pre:tools/pio/pre_custom_esp32.py -[env:custom_IR_ESP32s3_4M316k_LittleFS_CDC_ETH] +[env:custom_IR_ESP32s3_4M316k_LittleFS_ETH] extends = esp32s3_common_LittleFS board = esp32s3cdc-qio_qspi build_flags = ${esp32s3_common_LittleFS.build_flags} @@ -37,7 +37,7 @@ extra_scripts = ${esp32s3_common_LittleFS.extra_scripts} pre:tools/pio/ir_build_check.py -[env:normal_ESP32s3_4M316k_LittleFS_CDC_ETH] +[env:normal_ESP32s3_4M316k_LittleFS_ETH] extends = esp32s3_common_LittleFS board = esp32s3cdc-qio_qspi lib_ignore = ${esp32s3_common_LittleFS.lib_ignore} @@ -47,49 +47,49 @@ build_flags = ${esp32s3_common_LittleFS.build_flags} -DFEATURE_SD=1 -[env:collection_A_ESP32s3_4M316k_LittleFS_CDC_ETH] +[env:collection_A_ESP32s3_4M316k_LittleFS_ETH] extends = esp32s3_common_LittleFS board = esp32s3cdc-qio_qspi build_flags = ${esp32s3_common_LittleFS.build_flags} -DPLUGIN_SET_COLLECTION_ESP32 -DCOLLECTION_FEATURE_RTTTL=1 -[env:collection_B_ESP32s3_4M316k_LittleFS_CDC_ETH] +[env:collection_B_ESP32s3_4M316k_LittleFS_ETH] extends = esp32s3_common_LittleFS board = esp32s3cdc-qio_qspi build_flags = ${esp32s3_common_LittleFS.build_flags} -DPLUGIN_SET_COLLECTION_B_ESP32 -DCOLLECTION_FEATURE_RTTTL=1 -[env:collection_C_ESP32s3_4M316k_LittleFS_CDC_ETH] +[env:collection_C_ESP32s3_4M316k_LittleFS_ETH] extends = esp32s3_common_LittleFS board = esp32s3cdc-qio_qspi build_flags = ${esp32s3_common_LittleFS.build_flags} -DPLUGIN_SET_COLLECTION_C_ESP32 -DCOLLECTION_FEATURE_RTTTL=1 -[env:collection_D_ESP32s3_4M316k_LittleFS_CDC_ETH] +[env:collection_D_ESP32s3_4M316k_LittleFS_ETH] extends = esp32s3_common_LittleFS board = esp32s3cdc-qio_qspi build_flags = ${esp32s3_common_LittleFS.build_flags} -DPLUGIN_SET_COLLECTION_D_ESP32 -DCOLLECTION_FEATURE_RTTTL=1 -[env:collection_E_ESP32s3_4M316k_LittleFS_CDC_ETH] +[env:collection_E_ESP32s3_4M316k_LittleFS_ETH] extends = esp32s3_common_LittleFS board = esp32s3cdc-qio_qspi build_flags = ${esp32s3_common_LittleFS.build_flags} -DPLUGIN_SET_COLLECTION_E_ESP32 -DCOLLECTION_FEATURE_RTTTL=1 -[env:collection_F_ESP32s3_4M316k_LittleFS_CDC_ETH] +[env:collection_F_ESP32s3_4M316k_LittleFS_ETH] extends = esp32s3_common_LittleFS board = esp32s3cdc-qio_qspi build_flags = ${esp32s3_common_LittleFS.build_flags} -DPLUGIN_SET_COLLECTION_F_ESP32 -DCOLLECTION_FEATURE_RTTTL=1 -[env:collection_G_ESP32s3_4M316k_LittleFS_CDC_ETH] +[env:collection_G_ESP32s3_4M316k_LittleFS_ETH] extends = esp32s3_common_LittleFS board = esp32s3cdc-qio_qspi build_flags = ${esp32s3_common_LittleFS.build_flags} @@ -97,13 +97,13 @@ build_flags = ${esp32s3_common_LittleFS.build_flags} -DCOLLECTION_FEATURE_RTTTL=1 -[env:energy_ESP32s3_4M316k_LittleFS_CDC_ETH] +[env:energy_ESP32s3_4M316k_LittleFS_ETH] extends = esp32s3_common_LittleFS board = esp32s3cdc-qio_qspi build_flags = ${esp32s3_common_LittleFS.build_flags} -D PLUGIN_ENERGY_COLLECTION -[env:display_ESP32s3_4M316k_LittleFS_CDC_ETH] +[env:display_ESP32s3_4M316k_LittleFS_ETH] extends = esp32s3_common_LittleFS board = esp32s3cdc-qio_qspi build_flags = ${esp32s3_common_LittleFS.build_flags} @@ -111,14 +111,14 @@ build_flags = ${esp32s3_common_LittleFS.build_flags} -D ST7789_EXTRA_INIT=1 -D P116_EXTRA_ST7789=1 -[env:climate_ESP32s3_4M316k_LittleFS_CDC_ETH] +[env:climate_ESP32s3_4M316k_LittleFS_ETH] extends = esp32s3_common_LittleFS board = esp32s3cdc-qio_qspi build_flags = ${esp32s3_common_LittleFS.build_flags} -D PLUGIN_CLIMATE_COLLECTION -[env:neopixel_ESP32s3_4M316k_LittleFS_CDC_ETH] +[env:neopixel_ESP32s3_4M316k_LittleFS_ETH] extends = esp32s3_common_LittleFS board = esp32s3cdc-qio_qspi build_flags = ${esp32s3_common_LittleFS.build_flags} @@ -128,7 +128,7 @@ build_flags = ${esp32s3_common_LittleFS.build_flags} -[env:custom_ESP32s3_8M1M_LittleFS_CDC_ETH] +[env:custom_ESP32s3_8M1M_LittleFS_ETH] extends = esp32s3_common_LittleFS board = esp32s3cdc-qio_qspi-8M build_flags = ${esp32s3_common_LittleFS.build_flags} @@ -138,12 +138,12 @@ build_flags = ${esp32s3_common_LittleFS.build_flags} extra_scripts = ${esp32s3_common_LittleFS.extra_scripts} pre:tools/pio/pre_custom_esp32.py -[env:custom_ESP32s3_8M1M_LittleFS_OPI_PSRAM_CDC_ETH] -extends = env:custom_ESP32s3_8M1M_LittleFS_CDC_ETH +[env:custom_ESP32s3_8M1M_LittleFS_OPI_PSRAM_ETH] +extends = env:custom_ESP32s3_8M1M_LittleFS_ETH board = esp32s3cdc-qio_opi-8M -[env:max_ESP32s3_8M1M_LittleFS_CDC_ETH] +[env:max_ESP32s3_8M1M_LittleFS_ETH] extends = esp32s3_common_LittleFS board = esp32s3cdc-qio_qspi-8M build_flags = ${esp32s3_common_LittleFS.build_flags} @@ -155,12 +155,12 @@ build_flags = ${esp32s3_common_LittleFS.build_flags} extra_scripts = ${esp32s3_common_LittleFS.extra_scripts} -[env:max_ESP32s3_8M1M_LittleFS_OPI_PSRAM_CDC_ETH] -extends = env:max_ESP32s3_8M1M_LittleFS_CDC_ETH +[env:max_ESP32s3_8M1M_LittleFS_OPI_PSRAM_ETH] +extends = env:max_ESP32s3_8M1M_LittleFS_ETH board = esp32s3cdc-qio_opi-8M -[env:custom_ESP32s3_16M8M_LittleFS_CDC_ETH] +[env:custom_ESP32s3_16M8M_LittleFS_ETH] extends = esp32s3_common_LittleFS board = esp32s3cdc-qio_qspi-16M build_flags = ${esp32s3_common_LittleFS.build_flags} @@ -171,12 +171,12 @@ build_flags = ${esp32s3_common_LittleFS.build_flags} extra_scripts = ${esp32s3_common_LittleFS.extra_scripts} pre:tools/pio/pre_custom_esp32.py -[env:custom_ESP32s3_16M8M_LittleFS_OPI_PSRAM_CDC_ETH] -extends = env:custom_ESP32s3_16M8M_LittleFS_CDC_ETH +[env:custom_ESP32s3_16M8M_LittleFS_OPI_PSRAM_ETH] +extends = env:custom_ESP32s3_16M8M_LittleFS_ETH board = esp32s3cdc-qio_opi-16M -[env:max_ESP32s3_16M8M_LittleFS_CDC_ETH] +[env:max_ESP32s3_16M8M_LittleFS_ETH] extends = esp32s3_common_LittleFS board = esp32s3cdc-qio_qspi-16M build_flags = ${esp32s3_common_LittleFS.build_flags} @@ -188,7 +188,7 @@ build_flags = ${esp32s3_common_LittleFS.build_flags} extra_scripts = ${esp32s3_common_LittleFS.extra_scripts} -[env:max_ESP32s3_16M8M_LittleFS_OPI_PSRAM_CDC_ETH] +[env:max_ESP32s3_16M8M_LittleFS_OPI_PSRAM_ETH] extends = esp32s3_common_LittleFS board = esp32s3cdc-qio_opi-16M build_flags = ${esp32s3_common_LittleFS.build_flags} diff --git a/src/src/ESPEasyCore/ESPEasy_setup.cpp b/src/src/ESPEasyCore/ESPEasy_setup.cpp index dd5f0010a..8730bd6e6 100644 --- a/src/src/ESPEasyCore/ESPEasy_setup.cpp +++ b/src/src/ESPEasyCore/ESPEasy_setup.cpp @@ -363,6 +363,9 @@ void ESPEasy_setup() logMemUsageAfter(F("LoadSettings()")); #endif // ifndef BUILD_NO_RAM_TRACKER + addLog(LOG_LEVEL_INFO, concat(F("CPU Frequency: "), ESP.getCpuFreqMHz())); + + #ifdef ESP32 #if !defined(CORE32SOLO1) && !defined(ESP32P4) From bf9bfd33f408f04ce2646191ca828720363972c0 Mon Sep 17 00:00:00 2001 From: TD-er Date: Fri, 18 Jul 2025 00:20:10 +0200 Subject: [PATCH 130/564] [ESP-IDF] Update IDF 5.5 builds (P4/S3) to latest version --- .gitignore | 18 +++++++++--------- platformio_core_defs.ini | 2 +- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/.gitignore b/.gitignore index 71a3dc59c..a23e4363d 100644 --- a/.gitignore +++ b/.gitignore @@ -72,8 +72,8 @@ docs/source/Plugin/_plugin_sets_overview.repl .platformio/ .pio/ - -managed_components/ + +managed_components/ CMakeLists.txt @@ -81,10 +81,10 @@ sdkconfig.max_ESP32s3_16M8M_LittleFS_OPI_PSRAM_ETH sdkconfig.defaults -dependencies.lock - -.dummy/ - -.cache/ - -src/src/CustomBuild/CompiletimeDefines_generated.h +dependencies.lock + +.dummy/ + +.cache/ + +src/src/CustomBuild/CompiletimeDefines_generated.h diff --git a/platformio_core_defs.ini b/platformio_core_defs.ini index eb58b5300..9bd98cd0c 100644 --- a/platformio_core_defs.ini +++ b/platformio_core_defs.ini @@ -195,7 +195,7 @@ lib_extra_dirs = ; ESP_IDF 5.5.0 [core_esp32_IDF5_5_0__3_2_0_LittleFS] platform = https://github.com/Jason2866/platform-espressif32.git#Arduino/IDF55 -platform_packages = framework-arduinoespressif32 @ https://github.com/Jason2866/esp32-arduino-lib-builder/releases/download/3774/framework-arduinoespressif32-all-release_v5.5-29017369.zip +platform_packages = framework-arduinoespressif32 @ https://github.com/Jason2866/esp32-arduino-lib-builder/releases/download/1707-1440-5.5/framework-arduinoespressif32-release_v5.5-b163123c.zip build_flags = -DESP32_STAGE -DESP_IDF_VERSION_MAJOR=5 -DLIBRARIES_NO_LOG=1 From 4d66bd53263334d4383545a799f8f7778baa606a Mon Sep 17 00:00:00 2001 From: TD-er Date: Fri, 18 Jul 2025 00:20:42 +0200 Subject: [PATCH 131/564] [Network] Allow crash detection to turn off network interfaces --- src/src/ESPEasyCore/ESPEasy_setup.cpp | 6 ++++++ src/src/Helpers/ESPEasy_Storage.cpp | 30 +++++++++++++++++++++++++++ src/src/Helpers/ESPEasy_Storage.h | 6 ++++++ 3 files changed, 42 insertions(+) diff --git a/src/src/ESPEasyCore/ESPEasy_setup.cpp b/src/src/ESPEasyCore/ESPEasy_setup.cpp index 8730bd6e6..195245b15 100644 --- a/src/src/ESPEasyCore/ESPEasy_setup.cpp +++ b/src/src/ESPEasyCore/ESPEasy_setup.cpp @@ -411,6 +411,9 @@ void ESPEasy_setup() toDisable = disableNotification(toDisable); } #endif // if FEATURE_NOTIFIER + if (toDisable != 0) { + toDisable = disableNetwork(toDisable); + } if (toDisable != 0) { toDisable = disableRules(toDisable); @@ -429,6 +432,9 @@ void ESPEasy_setup() toDisable = disableAllNotifications(toDisable); } #endif // if FEATURE_NOTIFIER + if (toDisable != 0) { + toDisable = disableAllNetworkss(toDisable); + } } #if FEATURE_ETHERNET diff --git a/src/src/Helpers/ESPEasy_Storage.cpp b/src/src/Helpers/ESPEasy_Storage.cpp index f4a4788eb..3e54bc6cc 100644 --- a/src/src/Helpers/ESPEasy_Storage.cpp +++ b/src/src/Helpers/ESPEasy_Storage.cpp @@ -1117,6 +1117,36 @@ uint8_t disableAllNotifications(uint8_t bootFailedCount) { #endif // if FEATURE_NOTIFIER +/********************************************************************************************\ + Disable Network Interfaces, based on bootFailedCount + \*********************************************************************************************/ +uint8_t disableNetwork(uint8_t bootFailedCount) +{ + for (networkIndex_t i = 0; i < NETWORK_MAX && bootFailedCount > 0; ++i) { + if (Settings.getNetworkEnabled(i)) { + --bootFailedCount; + + if (bootFailedCount == 0) { + Settings.setNetworkEnabled(i, false); + } + } + } + return bootFailedCount; +} + +uint8_t disableAllNetworkss(uint8_t bootFailedCount) +{ + if (bootFailedCount > 0) { + --bootFailedCount; + + for (networkIndex_t i = 0; i < NETWORK_MAX; ++i) { + Settings.setNetworkEnabled(i, false); + } + } + return bootFailedCount; +} + + /********************************************************************************************\ Disable Rules, based on bootFailedCount \*********************************************************************************************/ diff --git a/src/src/Helpers/ESPEasy_Storage.h b/src/src/Helpers/ESPEasy_Storage.h index 93b648405..81b3d6557 100644 --- a/src/src/Helpers/ESPEasy_Storage.h +++ b/src/src/Helpers/ESPEasy_Storage.h @@ -153,6 +153,12 @@ uint8_t disableAllNotifications(uint8_t bootFailedCount); \*********************************************************************************************/ uint8_t disableRules(uint8_t bootFailedCount); +/********************************************************************************************\ + Disable Network Interfaces, based on bootFailedCount + \*********************************************************************************************/ +uint8_t disableNetwork(uint8_t bootFailedCount); +uint8_t disableAllNetworkss(uint8_t bootFailedCount); + bool getAndLogSettingsParameters(bool read, SettingsType::Enum settingsType, int index, int& offset, int& max_size); From 3e30a1f0a38b510c2c576ef76890d928bc8bb3bf Mon Sep 17 00:00:00 2001 From: TD-er Date: Fri, 18 Jul 2025 00:21:12 +0200 Subject: [PATCH 132/564] [ESP32P4] Set Ethernet as default on ESP32P4 builds --- src/src/CustomBuild/ESPEasyDefaults.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/src/CustomBuild/ESPEasyDefaults.h b/src/src/CustomBuild/ESPEasyDefaults.h index 7a548c57c..d69fb6463 100644 --- a/src/src/CustomBuild/ESPEasyDefaults.h +++ b/src/src/CustomBuild/ESPEasyDefaults.h @@ -312,7 +312,7 @@ #endif #ifndef DEFAULT_NETWORK_MEDIUM #ifdef ESP32P4 - #define DEFAULT_NETWORK_MEDIUM NetworkMedium_t::WIFI + #define DEFAULT_NETWORK_MEDIUM NetworkMedium_t::Ethernet #else #define DEFAULT_NETWORK_MEDIUM NetworkMedium_t::WIFI #endif From ae4c97caf602a83a8e1d84d42686975efd28f3f0 Mon Sep 17 00:00:00 2001 From: TD-er Date: Sat, 19 Jul 2025 00:05:53 +0200 Subject: [PATCH 133/564] [PubSubClient] Update to latest lib version --- lib/pubsubclient3/.github/doxygen-header.html | 77 ++++ .../.github/doxygen-update-version.sh | 9 + lib/pubsubclient3/.github/workflows/build.yml | 4 + .../.github/workflows/gh-pages.yml | 65 +++ lib/pubsubclient3/.gitignore | 1 + lib/pubsubclient3/Doxyfile | 39 ++ lib/pubsubclient3/README.md | 11 +- .../examples/mqtt_auth/mqtt_auth.ino | 2 +- .../examples/mqtt_basic/mqtt_basic.ino | 4 +- .../examples/mqtt_esp8266/mqtt_esp8266.ino | 4 +- .../mqtt_large_message/mqtt_large_message.ino | 4 +- .../mqtt_publish_in_callback.ino | 10 +- .../mqtt_reconnect_nonblocking.ino | 2 +- .../examples/mqtt_stream/mqtt_stream.ino | 4 +- lib/pubsubclient3/src/PubSubClient.cpp | 255 ++++++----- lib/pubsubclient3/src/PubSubClient.h | 424 +++++++++++------- lib/pubsubclient3/tests/src/connect_spec.cpp | 4 +- .../tests/src/keepalive_spec.cpp | 10 +- lib/pubsubclient3/tests/src/publish_spec.cpp | 205 +++++++-- lib/pubsubclient3/tests/src/receive_spec.cpp | 10 +- .../tests/src/subscribe_spec.cpp | 24 +- 21 files changed, 825 insertions(+), 343 deletions(-) create mode 100644 lib/pubsubclient3/.github/doxygen-header.html create mode 100644 lib/pubsubclient3/.github/doxygen-update-version.sh create mode 100644 lib/pubsubclient3/.github/workflows/gh-pages.yml create mode 100644 lib/pubsubclient3/Doxyfile diff --git a/lib/pubsubclient3/.github/doxygen-header.html b/lib/pubsubclient3/.github/doxygen-header.html new file mode 100644 index 000000000..fbe29e8a2 --- /dev/null +++ b/lib/pubsubclient3/.github/doxygen-header.html @@ -0,0 +1,77 @@ + + + + + + + + +$projectname: $title +$title + + + + + + + + + + + + +$treeview +$search +$mathjax +$darkmode + +$extrastylesheet + + + +
    + + +
    + + +
    + + + + + + + + + + + + + + + + + + + + + + + +
    +
    $projectname $projectnumber
    + +
    $projectbrief
    + + +     		$searchbox
    $searchbox
    +
    + + diff --git a/lib/pubsubclient3/.github/doxygen-update-version.sh b/lib/pubsubclient3/.github/doxygen-update-version.sh new file mode 100644 index 000000000..a2ec04181 --- /dev/null +++ b/lib/pubsubclient3/.github/doxygen-update-version.sh @@ -0,0 +1,9 @@ +#!/bin/bash +# Update the Doxyfile PROJECT_NUMBER with the version from library.properties +# Exit immediately if a command exits with a non-zero status. +set -e +# Make sure we are inside the github workspace +cd $GITHUB_WORKSPACE +version=`grep "version=" library.properties | cut -d "=" -f 2-` +echo "Update current version in Doxyfile: $version" +sed -i "s/PROJECT_NUMBER.*/PROJECT_NUMBER = \"v$version\"/" Doxyfile diff --git a/lib/pubsubclient3/.github/workflows/build.yml b/lib/pubsubclient3/.github/workflows/build.yml index f8c919060..110a8f0ec 100644 --- a/lib/pubsubclient3/.github/workflows/build.yml +++ b/lib/pubsubclient3/.github/workflows/build.yml @@ -3,6 +3,10 @@ name: build on: push: branches: [ "master" ] + paths: + - 'examples/**' + - 'src/**' + - 'tests/**' pull_request: branches: [ "master" ] diff --git a/lib/pubsubclient3/.github/workflows/gh-pages.yml b/lib/pubsubclient3/.github/workflows/gh-pages.yml new file mode 100644 index 000000000..6eed1ea16 --- /dev/null +++ b/lib/pubsubclient3/.github/workflows/gh-pages.yml @@ -0,0 +1,65 @@ +# This workflow generates Doxygen API documentation and deploys it to GitHub Pages. +# I didn't manage to build a Jekyll site and deploy the content to GitHub Pages. +# So now I use a static index.html file in the gh-pages branch. +# It runs on pushes to the master branch and can also be triggered manually. +name: Generate Doxygen API and deploy content to GitHub Pages + +on: + # Runs on pushes targeting the default branch + push: + branches: ["master"] + + # Allows you to run this workflow manually from the Actions tab + workflow_dispatch: + +# Sets permissions of the GITHUB_TOKEN to allow deployment to GitHub Pages +permissions: + contents: write + pages: write + id-token: write + +# Allow only one concurrent deployment, skipping runs queued between the run in-progress and latest queued. +# However, do NOT cancel in-progress runs as we want to allow these production deployments to complete. +concurrency: + group: "pages" + cancel-in-progress: false + +jobs: + # Single deploy job since we're just deploying + deploy: + if: github.repository == 'hmueller01/pubsubclient3' + environment: + name: github-pages + url: ${{ steps.deployment.outputs.page_url }} + runs-on: ubuntu-latest + steps: + - name: Checkout + uses: actions/checkout@v4 + - name: Update Doxyfile PROJECT_NUMBER + run: bash .github/doxygen-update-version.sh + - name: Doxygenize + #uses: langroodi/doxygenize@v1.7.1 # waiting for update ... + uses: langroodi/doxygenize@6e920681c5d838e9a1b5cd273b814d1e4023b63d + #uses: hmueller01/doxygenize@update-alpine-linux+patches + with: + # Doxygen configuration file path + doxygenconf: ./Doxyfile + # Generated HTML documents output folder + htmloutput: ./site/api + # GitHub Pages branch name + ghpagesbranch: gh-pages + # GitHub Pages directory path + ghpagesdir: ./site/api + # - name: List site contents + # run: | + # find ./site + - name: Setup Pages + uses: actions/configure-pages@v5 + - name: Upload artifact + uses: actions/upload-pages-artifact@v3 + with: + #path: '.' # Upload entire repository + path: './site' + - name: Deploy to GitHub Pages + id: deployment + uses: actions/deploy-pages@v4 diff --git a/lib/pubsubclient3/.gitignore b/lib/pubsubclient3/.gitignore index a42cc406e..9ffb670e2 100644 --- a/lib/pubsubclient3/.gitignore +++ b/lib/pubsubclient3/.gitignore @@ -3,3 +3,4 @@ tests/bin .piolibdeps .clang_complete .gcc-flags.json +site/api diff --git a/lib/pubsubclient3/Doxyfile b/lib/pubsubclient3/Doxyfile new file mode 100644 index 000000000..8e0e065b8 --- /dev/null +++ b/lib/pubsubclient3/Doxyfile @@ -0,0 +1,39 @@ +# Minimal Doxyfile for Doxygen 1.13.2 + +# Project related configuration options +PROJECT_NAME = "PubSubClient3" +PROJECT_NUMBER = "automatically updated by doxygen-update-version.sh" +PROJECT_BRIEF = "Located at GitHub" +OUTPUT_DIRECTORY = ./site +INPUT = ./src +RECURSIVE = YES + +# Build related configuration options +EXTRACT_ALL = YES +EXTRACT_PRIVATE = NO +EXTRACT_STATIC = NO +EXCLUDE_SYMBOLS = CHECK_STRING_LENGTH + +# HTML output +GENERATE_HTML = YES +HTML_OUTPUT = api +HTML_COLORSTYLE = AUTO_LIGHT +HTML_HEADER = .github/doxygen-header.html + +# LaTeX output (disable if not needed) +GENERATE_LATEX = NO + +# Source code browsing +SOURCE_BROWSER = YES + +# Warnings +WARNINGS = YES + +# Dot/Graphviz support (disable if not needed) +HAVE_DOT = NO + +# File patterns (optional, default covers most C/C++ files) +FILE_PATTERNS = *.h *.cpp *.c *.hpp + +# Language +OUTPUT_LANGUAGE = English diff --git a/lib/pubsubclient3/README.md b/lib/pubsubclient3/README.md index 8233d8e11..f285bee6e 100644 --- a/lib/pubsubclient3/README.md +++ b/lib/pubsubclient3/README.md @@ -24,12 +24,19 @@ I appreciate every contribution to this library. The library comes with a number of example sketches. See File > Examples > PubSubClient within the Arduino application. -Full API documentation is available here: https://pubsubclient.knolleary.net +Full API documentation is available here: https://hmueller01.github.io/pubsubclient3/api ## Limitations - The client is based on the [MQTT Version 3.1.1 specification](https://docs.oasis-open.org/mqtt/mqtt/v3.1.1/os/mqtt-v3.1.1-os.html) with some limitations. - - It can only publish QoS 0 messages. It can subscribe at QoS 0 or QoS 1. + - It can publish at QoS 0, 1 or 2. + + **WARNING:** No retransmission is supported to keep the library as much memory friendly as possible. + + Note: Without retransmission support, the publish QoS is only meaningful when the broker sends your + message to a subscriber, supposing that the subscriber subscribes with a QoS greater then or equal to + the publish QoS. Consider that MQTT runs over TCP, so retransmission isn't really required in most cases, especially when publishing to the broker. + - It can subscribe at QoS 0 or QoS 1. - The maximum message size, including header, is **256 bytes** by default. This is configurable via `MQTT_MAX_PACKET_SIZE` in `PubSubClient.h` or can be changed by calling `PubSubClient::setBufferSize(size)`. diff --git a/lib/pubsubclient3/examples/mqtt_auth/mqtt_auth.ino b/lib/pubsubclient3/examples/mqtt_auth/mqtt_auth.ino index cdeb7959d..5d5d95ce4 100644 --- a/lib/pubsubclient3/examples/mqtt_auth/mqtt_auth.ino +++ b/lib/pubsubclient3/examples/mqtt_auth/mqtt_auth.ino @@ -16,7 +16,7 @@ byte mac[] = {0xDE, 0xED, 0xBA, 0xFE, 0xFE, 0xED}; IPAddress ip(172, 16, 0, 100); IPAddress server(172, 16, 0, 2); -void callback(char* topic, uint8_t* payload, size_t length) { +void callback(char* topic, uint8_t* payload, size_t plength) { // handle message arrived } diff --git a/lib/pubsubclient3/examples/mqtt_basic/mqtt_basic.ino b/lib/pubsubclient3/examples/mqtt_basic/mqtt_basic.ino index f790aab6a..b38716899 100644 --- a/lib/pubsubclient3/examples/mqtt_basic/mqtt_basic.ino +++ b/lib/pubsubclient3/examples/mqtt_basic/mqtt_basic.ino @@ -21,11 +21,11 @@ byte mac[] = {0xDE, 0xED, 0xBA, 0xFE, 0xFE, 0xED}; IPAddress ip(172, 16, 0, 100); IPAddress server(172, 16, 0, 2); -void callback(char* topic, uint8_t* payload, size_t length) { +void callback(char* topic, uint8_t* payload, size_t plength) { Serial.print("Message arrived ["); Serial.print(topic); Serial.print("] "); - for (size_t i = 0; i < length; i++) { + for (size_t i = 0; i < plength; i++) { Serial.print((char)payload[i]); } Serial.println(); diff --git a/lib/pubsubclient3/examples/mqtt_esp8266/mqtt_esp8266.ino b/lib/pubsubclient3/examples/mqtt_esp8266/mqtt_esp8266.ino index b41192ab4..9ffe0e725 100644 --- a/lib/pubsubclient3/examples/mqtt_esp8266/mqtt_esp8266.ino +++ b/lib/pubsubclient3/examples/mqtt_esp8266/mqtt_esp8266.ino @@ -66,11 +66,11 @@ void setup_wifi() { Serial.println(WiFi.localIP()); } -void callback(char* topic, uint8_t* payload, size_t length) { +void callback(char* topic, uint8_t* payload, size_t plength) { Serial.print("Message arrived ["); Serial.print(topic); Serial.print("] "); - for (size_t i = 0; i < length; i++) { + for (size_t i = 0; i < plength; i++) { Serial.print((char)payload[i]); } Serial.println(); diff --git a/lib/pubsubclient3/examples/mqtt_large_message/mqtt_large_message.ino b/lib/pubsubclient3/examples/mqtt_large_message/mqtt_large_message.ino index 48049c3e9..3fc23c8c5 100644 --- a/lib/pubsubclient3/examples/mqtt_large_message/mqtt_large_message.ino +++ b/lib/pubsubclient3/examples/mqtt_large_message/mqtt_large_message.ino @@ -69,11 +69,11 @@ void setup_wifi() { Serial.println(WiFi.localIP()); } -void callback(char* topic, uint8_t* payload, size_t length) { +void callback(char* topic, uint8_t* payload, size_t plength) { Serial.print("Message arrived ["); Serial.print(topic); Serial.print("] "); - for (size_t i = 0; i < length; i++) { + for (size_t i = 0; i < plength; i++) { Serial.print((char)payload[i]); } Serial.println(); diff --git a/lib/pubsubclient3/examples/mqtt_publish_in_callback/mqtt_publish_in_callback.ino b/lib/pubsubclient3/examples/mqtt_publish_in_callback/mqtt_publish_in_callback.ino index 733bea3f5..f30159706 100644 --- a/lib/pubsubclient3/examples/mqtt_publish_in_callback/mqtt_publish_in_callback.ino +++ b/lib/pubsubclient3/examples/mqtt_publish_in_callback/mqtt_publish_in_callback.ino @@ -23,22 +23,22 @@ IPAddress ip(172, 16, 0, 100); IPAddress server(172, 16, 0, 2); // Callback function header -void callback(char* topic, uint8_t* payload, size_t length); +void callback(char* topic, uint8_t* payload, size_t plength); EthernetClient ethClient; PubSubClient client(server, 1883, callback, ethClient); // Callback function -void callback(char* topic, uint8_t* payload, size_t length) { +void callback(char* topic, uint8_t* payload, size_t plength) { // In order to republish this payload, a copy must be made // as the orignal payload buffer will be overwritten whilst // constructing the PUBLISH packet. // Allocate the correct amount of memory for the payload copy - byte* p = (byte*)malloc(length); + byte* p = (byte*)malloc(plength); // Copy the payload to the new buffer - memcpy(p, payload, length); - client.publish("outTopic", p, length); + memcpy(p, payload, plength); + client.publish("outTopic", p, plength); // Free the memory free(p); } diff --git a/lib/pubsubclient3/examples/mqtt_reconnect_nonblocking/mqtt_reconnect_nonblocking.ino b/lib/pubsubclient3/examples/mqtt_reconnect_nonblocking/mqtt_reconnect_nonblocking.ino index 9d5c60098..d0797419b 100644 --- a/lib/pubsubclient3/examples/mqtt_reconnect_nonblocking/mqtt_reconnect_nonblocking.ino +++ b/lib/pubsubclient3/examples/mqtt_reconnect_nonblocking/mqtt_reconnect_nonblocking.ino @@ -16,7 +16,7 @@ byte mac[] = {0xDE, 0xED, 0xBA, 0xFE, 0xFE, 0xED}; IPAddress ip(172, 16, 0, 100); IPAddress server(172, 16, 0, 2); -void callback(char* topic, uint8_t* payload, size_t length) { +void callback(char* topic, uint8_t* payload, size_t plength) { // handle message arrived } diff --git a/lib/pubsubclient3/examples/mqtt_stream/mqtt_stream.ino b/lib/pubsubclient3/examples/mqtt_stream/mqtt_stream.ino index 5e620a0e3..54ab20fa0 100644 --- a/lib/pubsubclient3/examples/mqtt_stream/mqtt_stream.ino +++ b/lib/pubsubclient3/examples/mqtt_stream/mqtt_stream.ino @@ -21,11 +21,11 @@ IPAddress server(172, 16, 0, 2); SRAM sram(4, SRAM_1024); -void callback(char* topic, uint8_t* payload, size_t length) { +void callback(char* topic, uint8_t* payload, size_t plength) { sram.seek(1); // do something with the message - for (size_t i = 0; i < length; i++) { + for (size_t i = 0; i < plength; i++) { Serial.write(sram.read()); } Serial.println(); diff --git a/lib/pubsubclient3/src/PubSubClient.cpp b/lib/pubsubclient3/src/PubSubClient.cpp index dd1e5bf94..96aee156e 100644 --- a/lib/pubsubclient3/src/PubSubClient.cpp +++ b/lib/pubsubclient3/src/PubSubClient.cpp @@ -1,12 +1,28 @@ -/* - PubSubClient.cpp - A simple client for MQTT. - Nick O'Leary, Holger Mueller - http://knolleary.net - https://github.com/hmueller01/pubsubclient3 -*/ +/** + * @file PubSubClient.cpp + * @brief A simple client for MQTT. + * @author Nicholas O'Leary - http://knolleary.net + * @author Holger Mueller - https://github.com/hmueller01/pubsubclient3 + * @copyright MIT License 2008-2025 + * + * This file is part of the PubSubClient library. + */ #include "PubSubClient.h" +/** + * @brief Macro to check if a string 's' can be safely added to the MQTT buffer. + * + * If either check fails, the client connection is stopped and the function returns false. + * @param l current length in the buffer + * @param s string to check + */ +#define CHECK_STRING_LENGTH(l, s) \ + if ((!s) || (l + 2 + strnlen(s, this->bufferSize) > this->bufferSize)) { \ + _client->stop(); \ + return false; \ + } + PubSubClient::PubSubClient() { setBufferSize(MQTT_MAX_PACKET_SIZE); setKeepAlive(MQTT_KEEPALIVE); @@ -95,20 +111,20 @@ PubSubClient::~PubSubClient() { } bool PubSubClient::connect(const char* id) { - return connect(id, nullptr, nullptr, 0, 0, 0, 0, 1); + return connect(id, nullptr, nullptr, nullptr, MQTT_QOS0, false, nullptr, true); } bool PubSubClient::connect(const char* id, const char* user, const char* pass) { - return connect(id, user, pass, 0, 0, 0, 0, 1); + return connect(id, user, pass, nullptr, MQTT_QOS0, false, nullptr, true); } bool PubSubClient::connect(const char* id, const char* willTopic, uint8_t willQos, bool willRetain, const char* willMessage) { - return connect(id, nullptr, nullptr, willTopic, willQos, willRetain, willMessage, 1); + return connect(id, nullptr, nullptr, willTopic, willQos, willRetain, willMessage, true); } bool PubSubClient::connect(const char* id, const char* user, const char* pass, const char* willTopic, uint8_t willQos, bool willRetain, const char* willMessage) { - return connect(id, user, pass, willTopic, willQos, willRetain, willMessage, 1); + return connect(id, user, pass, willTopic, willQos, willRetain, willMessage, true); } bool PubSubClient::connect(const char* id, const char* user, const char* pass, const char* willTopic, uint8_t willQos, bool willRetain, @@ -157,20 +173,20 @@ bool PubSubClient::connect(const char* id, const char* user, const char* pass, c this->buffer[length++] = keepAlive & 0xFF; CHECK_STRING_LENGTH(length, id) - length = writeString(id, this->buffer, length); + length = writeString(id, this->buffer, length, this->bufferSize); if (willTopic) { CHECK_STRING_LENGTH(length, willTopic) - length = writeString(willTopic, this->buffer, length); + length = writeString(willTopic, this->buffer, length, this->bufferSize); CHECK_STRING_LENGTH(length, willMessage) - length = writeString(willMessage, this->buffer, length); + length = writeString(willMessage, this->buffer, length, this->bufferSize); } if (user) { CHECK_STRING_LENGTH(length, user) - length = writeString(user, this->buffer, length); + length = writeString(user, this->buffer, length, this->bufferSize); if (pass) { CHECK_STRING_LENGTH(length, pass) - length = writeString(pass, this->buffer, length); + length = writeString(pass, this->buffer, length, this->bufferSize); } } @@ -314,8 +330,8 @@ size_t PubSubClient::readPacket(uint8_t* hdrLen) { if (!readByte(this->buffer, &len)) return 0; skip = (this->buffer[*hdrLen + 1] << 8) + this->buffer[*hdrLen + 2]; start = 2; - if (this->buffer[0] & MQTTQOS1) { - // skip message id + if (MQTT_HDR_GET_QOS(this->buffer[0]) > MQTT_QOS0) { + // skip msgId (packet identifier) for QoS 1 and 2 messages skip += 2; } } @@ -355,7 +371,7 @@ bool PubSubClient::handlePacket(uint8_t hdrLen, size_t length) { switch (type) { case MQTTPUBLISH: if (callback) { - // MQTT Publish packet: See section 3.3 MQTT v3.1 protocol specification: + // MQTT Publish packet: See section 3.3 MQTT v3.1.1 protocol specification: // - Header: 1 byte // - Remaining header length: hdrLen bytes, multibyte field (1 .. MQTT_MAX_HEADER_SIZE - 1) // - Topic length: 2 bytes (starts at buffer[hdrLen + 1]) @@ -377,7 +393,7 @@ bool PubSubClient::handlePacket(uint8_t hdrLen, size_t length) { memmove(topic, topic + 1, topicLen); // move topic inside buffer 1 byte to front topic[topicLen] = '\0'; // end the topic as a 'C' string with \x00 - if ((this->buffer[0] & 0x06) == MQTTQOS0) { + if (MQTT_HDR_GET_QOS(this->buffer[0]) == MQTT_QOS0) { // No msgId for QOS == 0 callback(topic, payload, payloadLen); } else { @@ -399,7 +415,37 @@ bool PubSubClient::handlePacket(uint8_t hdrLen, size_t length) { } } break; + case MQTTPUBACK: + // MQTT Publish Acknowledgment (QoS 1 publish received): See section 3.4 MQTT v3.1.1 protocol specification + if (length < 4) { + ERROR_PSC_PRINTF_P("handlePacket(): Received PUBACK packet with length %zu, expected at least 4 bytes\n", length); + return false; + } + // No futher action here, as resending is not supported. + break; + case MQTTPUBREC: + // MQTT Publish Received (QoS 2 publish received, part 1): See section 3.5 MQTT v3.1.1 protocol specification + if (length < 4) { + ERROR_PSC_PRINTF_P("handlePacket(): Received PUBREC packet with length %zu, expected at least 4 bytes\n", length); + return false; + } + // MQTT Publish Release (QoS 2 publish received, part 2): See section 3.6 MQTT v3.1.1 protocol specification + buffer[0] = MQTTPUBREL | 2; // PUBREL with bit 1 set + // bytes 1-3 of PUBREL are the same as of PUBREC + if (_client->write(buffer, 4) == 4) { + lastOutActivity = millis(); + } + break; + case MQTTPUBCOMP: + // MQTT Publish Complete (QoS 2 publish received, part 3): See section 3.7 MQTT v3.1.1 protocol specification + if (length < 4) { + ERROR_PSC_PRINTF_P("handlePacket(): Received PUBCOMP packet with length %zu, expected at least 4 bytes\n", length); + return false; + } + // No futher action here, as resending is not supported. + break; case MQTTPINGREQ: + // MQTT Ping Request: See section 3.12 MQTT v3.1.1 protocol specification this->buffer[0] = MQTTPINGRESP; this->buffer[1] = 0; if (_client->write(this->buffer, 2) == 2) { @@ -456,19 +502,27 @@ bool PubSubClient::loop() { } bool PubSubClient::publish(const char* topic, const char* payload) { - return publish(topic, (const uint8_t*)payload, payload ? strnlen(payload, MQTT_MAX_POSSIBLE_PACKET_SIZE) : 0, false); + return publish(topic, payload, MQTT_QOS0, false); } bool PubSubClient::publish(const char* topic, const char* payload, bool retained) { - return publish(topic, (const uint8_t*)payload, payload ? strnlen(payload, MQTT_MAX_POSSIBLE_PACKET_SIZE) : 0, retained); + return publish(topic, payload, MQTT_QOS0, retained); +} + +bool PubSubClient::publish(const char* topic, const char* payload, uint8_t qos, bool retained) { + return publish(topic, (const uint8_t*)payload, payload ? strnlen(payload, MQTT_MAX_POSSIBLE_PACKET_SIZE) : 0, qos, retained); } bool PubSubClient::publish(const char* topic, const uint8_t* payload, size_t plength) { - return publish(topic, payload, plength, false); + return publish(topic, payload, plength, MQTT_QOS0, false); } bool PubSubClient::publish(const char* topic, const uint8_t* payload, size_t plength, bool retained) { - if (beginPublish(topic, plength, retained)) { + return publish(topic, payload, plength, MQTT_QOS0, retained); +} + +bool PubSubClient::publish(const char* topic, const uint8_t* payload, size_t plength, uint8_t qos, bool retained) { + if (beginPublish(topic, plength, qos, retained)) { size_t rc = write(payload, plength); lastOutActivity = millis(); return endPublish() && (rc == plength); @@ -477,11 +531,19 @@ bool PubSubClient::publish(const char* topic, const uint8_t* payload, size_t ple } bool PubSubClient::publish_P(const char* topic, const char* payload, bool retained) { - return publish_P(topic, (const uint8_t*)payload, payload ? strnlen_P(payload, MQTT_MAX_POSSIBLE_PACKET_SIZE) : 0, retained); + return publish_P(topic, payload, MQTT_QOS0, retained); +} + +bool PubSubClient::publish_P(const char* topic, const char* payload, uint8_t qos, bool retained) { + return publish_P(topic, (const uint8_t*)payload, payload ? strnlen_P(payload, MQTT_MAX_POSSIBLE_PACKET_SIZE) : 0, qos, retained); } bool PubSubClient::publish_P(const char* topic, const uint8_t* payload, size_t plength, bool retained) { - if (beginPublish(topic, plength, retained)) { + return publish_P(topic, payload, plength, MQTT_QOS0, retained); +} + +bool PubSubClient::publish_P(const char* topic, const uint8_t* payload, size_t plength, uint8_t qos, bool retained) { + if (beginPublish(topic, plength, qos, retained)) { size_t rc = 0; for (size_t i = 0; i < plength; i++) { rc += _client->write((uint8_t)pgm_read_byte_near(payload + i)); @@ -493,14 +555,26 @@ bool PubSubClient::publish_P(const char* topic, const uint8_t* payload, size_t p } bool PubSubClient::beginPublish(const char* topic, size_t plength, bool retained) { + return beginPublish(topic, plength, MQTT_QOS0, retained); +} + +bool PubSubClient::beginPublish(const char* topic, size_t plength, uint8_t qos, bool retained) { if (!topic) return false; + if (strlen(topic) == 0) return false; // empty topic is not allowed + if (qos > MQTT_QOS2) { // only valid QoS supported + this->_qos = MQTT_QOS0; // reset QoS to 0, that endPublish() will not send a nextMsgId + ERROR_PSC_PRINTF_P("beginPublish() called with invalid QoS %u\n", qos); + return false; + } + this->_qos = qos; // save the QoS for later endPublish() operation // check if the header and the topic (including 2 length bytes) fit into the buffer if (connected() && MQTT_MAX_HEADER_SIZE + strlen(topic) + 2 <= this->bufferSize) { // first write the topic at the end of the maximal variable header (MQTT_MAX_HEADER_SIZE) to the buffer - size_t topicLen = writeString(topic, this->buffer, MQTT_MAX_HEADER_SIZE) - MQTT_MAX_HEADER_SIZE; + size_t topicLen = writeString(topic, this->buffer, MQTT_MAX_HEADER_SIZE, this->bufferSize) - MQTT_MAX_HEADER_SIZE; // we now know the length of the topic string (lenght + 2 bytes signalling the length) and can build the variable header information - const uint8_t header = MQTTPUBLISH | (retained ? MQTTRETAINED : 0); - uint8_t hdrLen = buildHeader(header, this->buffer, topicLen + plength); + const uint8_t header = MQTTPUBLISH | MQTT_QOS_GET_HDR(qos) | (retained ? MQTTRETAINED : 0); + const size_t nextMsgLen = (qos) ? 2 : 0; // add 2 bytes for the nextMsgId if QoS > 0 + uint8_t hdrLen = buildHeader(header, this->buffer, topicLen + plength + nextMsgLen); if (hdrLen == 0) return false; // exit here in case of header generation failure // as the header length is variable, it starts at MQTT_MAX_HEADER_SIZE - hdrLen (see buildHeader() documentation) size_t rc = _client->write(this->buffer + (MQTT_MAX_HEADER_SIZE - hdrLen), hdrLen + topicLen); @@ -511,8 +585,19 @@ bool PubSubClient::beginPublish(const char* topic, size_t plength, bool retained } bool PubSubClient::endPublish() { - flushBuffer(); - return connected(); + if (connected()) { + if (this->_qos > MQTT_QOS0) { + // QoS == 1 or 2, send the msgId + uint8_t buf[2]; + writeNextMsgId(buf, 0, 2); + size_t rc = _client->write(buf, 2); + lastOutActivity = millis(); + return (rc == 2); + } + // QoS == 0, no msgId to send + return true; + } + return false; } /** @@ -550,19 +635,13 @@ uint8_t PubSubClient::buildHeader(uint8_t header, uint8_t* buf, size_t length) { } size_t PubSubClient::write(uint8_t data) { - const size_t rc = appendBuffer(data); - if (rc != 0) { - lastOutActivity = millis(); - } - return rc; + lastOutActivity = millis(); + return _client->write(data); } size_t PubSubClient::write(const uint8_t* buffer, size_t size) { - const size_t rc = appendBuffer(buffer, size); - if (rc != 0) { - lastOutActivity = millis(); - } - return rc; + lastOutActivity = millis(); + return _client->write(buffer, size); } /** @@ -605,24 +684,10 @@ bool PubSubClient::write(uint8_t header, uint8_t* buf, size_t length) { } /** - * @brief Write an UTF-8 encoded string to the give buffer and position. The string can have a length of 0 to 65535 bytes. The buffer is prefixed with two - * bytes representing the length of the string. See section 1.5.3 of MQTT v3.1.1 protocol specification. - * @note If the string does not fit in the buffer (bufferSize) or is longer than 65535 bytes nothing is written to the buffer and the returned position - * is unchanged. - * - * @param string 'C' string of the data that shall be written in the buffer. - * @param buf Buffer to write the string into. - * @param pos Position in the buffer to write the string. - * @return New position in the buffer (pos + 2 + string length), or pos if a buffer overrun would occur. - */ -size_t PubSubClient::writeString(const char* string, uint8_t* buf, size_t pos) { - return writeString(string, buf, pos, this->bufferSize); -} - -/** - * @brief Write an UTF-8 encoded string to the give buffer and position. The string can have a length of 0 to 65535 bytes. The buffer is prefixed with two - * bytes representing the length of the string. See section 1.5.3 of MQTT v3.1.1 protocol specification. - * @note If the string does not fit in the buffer or is longer than 65535 bytes nothing is written to the buffer and the returned position is unchanged. + * @brief Write an UTF-8 encoded string to the give buffer and position. The string can have a length of 0 to 65535 bytes. The buffer is prefixed with + * two bytes representing the length of the string. See section 1.5.3 of MQTT v3.1.1 protocol specification. + * @note If the string does not fit in the buffer or is longer than 65535 bytes nothing is written to the buffer and the returned position is + * unchanged. * * @param string 'C' string of the data that shall be written in the buffer. * @param buf Buffer to write the string into. @@ -645,61 +710,46 @@ size_t PubSubClient::writeString(const char* string, uint8_t* buf, size_t pos, s return pos; } -size_t PubSubClient::appendBuffer(uint8_t data) { - buffer[_bufferWritePos] = data; - ++_bufferWritePos; - if (_bufferWritePos >= bufferSize) { - if (flushBuffer() == 0) return 0; +/** + * @brief Write nextMsgId to the give buffer and position. + * @note If the nextMsgId (2 bytes) does not fit in the buffer nothing is written to the buffer and the returned position is unchanged. + * + * @param buf Buffer to write the nextMsgId into. + * @param pos Position in the buffer to write the nextMsgId. + * @param size Maximal size of the buffer. + * @return New position in the buffer (pos + 2), or pos if a buffer overrun would occur. + */ +size_t PubSubClient::writeNextMsgId(uint8_t* buf, size_t pos, size_t size) { + if (pos + 2 <= size) { + nextMsgId = (++nextMsgId == 0) ? 1 : nextMsgId; // increment msgId (must not be 0, so start at 1) + buf[pos++] = (uint8_t)(nextMsgId >> 8); + buf[pos++] = (uint8_t)(nextMsgId & 0xFF); + } else { + ERROR_PSC_PRINTF_P("writeNextMsgId(): buffer (%zu) does not fit into buf (%zu)\n", pos + 2, size); } - return 1; -} - -size_t PubSubClient::appendBuffer(const uint8_t *data, size_t size) { - for (size_t i = 0; i < size; ++i) { - if (appendBuffer(data[i]) == 0) return i; - } - return size; -} - -size_t PubSubClient::flushBuffer() { - size_t rc = 0; - if (_bufferWritePos > 0) { - if (connected()) { - rc = _client->write(buffer, _bufferWritePos); - if (rc != 0) { - lastOutActivity = millis(); - } - } - _bufferWritePos = 0; - } - return rc; + return pos; } bool PubSubClient::subscribe(const char* topic) { - return subscribe(topic, 0); + return subscribe(topic, MQTT_QOS0); } bool PubSubClient::subscribe(const char* topic, uint8_t qos) { if (!topic) return false; - if (qos > 1) return false; // only QoS 0 and 1 supported + if (qos > MQTT_QOS1) return false; // only QoS 0 and 1 supported size_t topicLen = strnlen(topic, this->bufferSize); - if (this->bufferSize < MQTT_MAX_HEADER_SIZE + 2 + 2 + topicLen) { - // Too long: header + nextMsgId (2) + topic length bytes (2) + topicLen + if (this->bufferSize < MQTT_MAX_HEADER_SIZE + 2 + 2 + topicLen + 1) { + // Too long: header + nextMsgId (2) + topic length bytes (2) + topicLen + QoS (1) return false; } if (connected()) { // Leave room in the buffer for header and variable length field uint16_t length = MQTT_MAX_HEADER_SIZE; - nextMsgId++; - if (nextMsgId == 0) { - nextMsgId = 1; - } - this->buffer[length++] = (nextMsgId >> 8); - this->buffer[length++] = (nextMsgId & 0xFF); - length = writeString(topic, this->buffer, length); + length = writeNextMsgId(buffer, length, this->bufferSize); // buffer size is checked before + length = writeString(topic, this->buffer, length, this->bufferSize); this->buffer[length++] = qos; - return write(MQTTSUBSCRIBE | MQTTQOS1, this->buffer, length - MQTT_MAX_HEADER_SIZE); + return write(MQTTSUBSCRIBE | MQTT_QOS_GET_HDR(MQTT_QOS1), this->buffer, length - MQTT_MAX_HEADER_SIZE); } return false; } @@ -714,14 +764,9 @@ bool PubSubClient::unsubscribe(const char* topic) { } if (connected()) { uint16_t length = MQTT_MAX_HEADER_SIZE; - nextMsgId++; - if (nextMsgId == 0) { - nextMsgId = 1; - } - this->buffer[length++] = (nextMsgId >> 8); - this->buffer[length++] = (nextMsgId & 0xFF); - length = writeString(topic, this->buffer, length); - return write(MQTTUNSUBSCRIBE | MQTTQOS1, this->buffer, length - MQTT_MAX_HEADER_SIZE); + length = writeNextMsgId(buffer, length, this->bufferSize); // buffer size is checked before + length = writeString(topic, this->buffer, length, this->bufferSize); + return write(MQTTUNSUBSCRIBE | MQTT_QOS_GET_HDR(MQTT_QOS1), this->buffer, length - MQTT_MAX_HEADER_SIZE); } return false; } diff --git a/lib/pubsubclient3/src/PubSubClient.h b/lib/pubsubclient3/src/PubSubClient.h index db77df9e9..2e8842997 100644 --- a/lib/pubsubclient3/src/PubSubClient.h +++ b/lib/pubsubclient3/src/PubSubClient.h @@ -1,9 +1,12 @@ -/* - PubSubClient.h - A simple client for MQTT. - Nick O'Leary, Holger Mueller - http://knolleary.net - https://github.com/hmueller01/pubsubclient3 -*/ +/** + * @file PubSubClient.h + * @brief A simple client for MQTT. + * @author Nicholas O'Leary - http://knolleary.net + * @author Holger Mueller - https://github.com/hmueller01/pubsubclient3 + * @copyright MIT License 2008-2025 + * + * This file is part of the PubSubClient library. + */ #ifndef PubSubClient_h #define PubSubClient_h @@ -14,20 +17,22 @@ #include "IPAddress.h" #include "Stream.h" -#define MQTT_VERSION_3_1 3 -#define MQTT_VERSION_3_1_1 4 +#define MQTT_VERSION_3_1 3 ///< Defines MQTT 3.1 protocol version, see #MQTT_VERSION +#define MQTT_VERSION_3_1_1 4 ///< Defines MQTT 3.1.1 protocol version, see #MQTT_VERSION //< @note The following #define directives can be used to configure the library. /** - * @brief Sets the version of the MQTT protocol to use. - * @note Default value is MQTT_VERSION_3_1_1 for MQTT 3.1.1. + * @brief Sets the version of the MQTT protocol to use (3.1 or 3.1.1). [#MQTT_VERSION_3_1, #MQTT_VERSION_3_1_1]. + * @note Default value is #MQTT_VERSION_3_1_1 for MQTT 3.1.1. */ #ifndef MQTT_VERSION #define MQTT_VERSION MQTT_VERSION_3_1_1 #endif -// MQTT_MAX_POSSIBLE_PACKET_SIZE : Maximum packet size defined by MQTT protocol. +/** + * @brief Maximum packet size defined by MQTT protocol. + */ #ifndef MQTT_MAX_POSSIBLE_PACKET_SIZE #define MQTT_MAX_POSSIBLE_PACKET_SIZE 268435455 #endif @@ -65,23 +70,32 @@ /** * @brief Sets the maximum number of bytes passed to the network client in each write call. * Some hardware has a limit to how much data can be passed to them in one go, - * such as the Arduino Wifi Shield. + * such as the Arduino Wifi Shield e.g. use 80. * @note Defaults to undefined, which passes the entire packet in each write call. */ -// #define MQTT_MAX_TRANSFER_SIZE 80 +#ifndef MQTT_MAX_TRANSFER_SIZE // just a hack that it gets shown in Doxygen +#define MQTT_MAX_TRANSFER_SIZE 80 +#undef MQTT_MAX_TRANSFER_SIZE +#endif -// Possible values for client.state() -#define MQTT_CONNECTION_TIMEOUT -4 -#define MQTT_CONNECTION_LOST -3 -#define MQTT_CONNECT_FAILED -2 -#define MQTT_DISCONNECTED -1 -#define MQTT_CONNECTED 0 -#define MQTT_CONNECT_BAD_PROTOCOL 1 -#define MQTT_CONNECT_BAD_CLIENT_ID 2 -#define MQTT_CONNECT_UNAVAILABLE 3 -#define MQTT_CONNECT_BAD_CREDENTIALS 4 -#define MQTT_CONNECT_UNAUTHORIZED 5 +/** + * @defgroup group_state state() result + * @brief These values indicate the current PubSubClient::state() of the client. + * @{ + */ +#define MQTT_CONNECTION_TIMEOUT -4 ///< The network connection timed out or server didn't respond within the keepalive time. +#define MQTT_CONNECTION_LOST -3 ///< The network connection was lost/broken. +#define MQTT_CONNECT_FAILED -2 ///< The network connection failed. +#define MQTT_DISCONNECTED -1 ///< The client is disconnected cleanly. +#define MQTT_CONNECTED 0 ///< The client is connected. +#define MQTT_CONNECT_BAD_PROTOCOL 1 ///< The server does not support the requested MQTT version. +#define MQTT_CONNECT_BAD_CLIENT_ID 2 ///< The server rejected the client identifier. +#define MQTT_CONNECT_UNAVAILABLE 3 ///< The server was unable to accept the connection. +#define MQTT_CONNECT_BAD_CREDENTIALS 4 ///< The username or password is not valid. +#define MQTT_CONNECT_UNAUTHORIZED 5 ///< The client is not authorized to connect to the server. +/** @} */ +/// \cond #define MQTTRETAINED 1 // Retained flag in the header #define MQTTCONNECT 1 << 4 // Client request to connect to Server #define MQTTCONNACK 2 << 4 // Connect Acknowledgment @@ -98,31 +112,41 @@ #define MQTTPINGRESP 13 << 4 // PING Response #define MQTTDISCONNECT 14 << 4 // Client is Disconnecting #define MQTTRESERVED 15 << 4 // Reserved +/// \endcond -#define MQTTQOS0 (0 << 1) -#define MQTTQOS1 (1 << 1) -#define MQTTQOS2 (2 << 1) +/** + * @defgroup group_qos QoS levels + * @brief Quality of Service (QoS) levels for MQTT messages. + * @{ + */ +#define MQTT_QOS0 ((uint8_t)0) ///< Quality of Service 0: At most once +#define MQTT_QOS1 ((uint8_t)1) ///< Quality of Service 1: At least once +#define MQTT_QOS2 ((uint8_t)2) ///< Quality of Service 2: Exactly once +/// \cond +#define MQTT_QOS_GET_HDR(qos) (((qos) & 0x03) << 1) // Get QoS header bits from QoS value +#define MQTT_HDR_GET_QOS(header) (((header) & 0x06 ) >> 1) // Get QoS value from MQTT header +/// \endcond +/** @} */ -// Maximum size of fixed header and variable length size header +/// \cond Maximum size of fixed header and variable length size header #define MQTT_MAX_HEADER_SIZE 5 +/// \endcond -#if defined(__has_include) && __has_include() && !defined(NOFUNCTIONAL) -#include +/// \anchor callback /** * @brief Define the signature required by any callback function. - * @note The parameters are TOPIC, PAYLOAD, and LENGTH, respectively. + * @param topic The topic of the message. + * @param payload The payload of the message. + * @param plength The length of the payload. */ -#define MQTT_CALLBACK_SIGNATURE std::function callback +#if defined(__has_include) && __has_include() && !defined(NOFUNCTIONAL) +#include +#define MQTT_CALLBACK_SIGNATURE std::function callback #else -#define MQTT_CALLBACK_SIGNATURE void (*callback)(char*, uint8_t*, size_t) +#define MQTT_CALLBACK_SIGNATURE void (*callback)(char* topic, uint8_t* payload, size_t plength) #endif -#define CHECK_STRING_LENGTH(l, s) \ - if ((!s) || (l + 2 + strnlen(s, this->bufferSize) > this->bufferSize)) { \ - _client->stop(); \ - return false; \ - } - +/// \cond #ifdef DEBUG_ESP_PORT #ifdef DEBUG_PUBSUBCLIENT #define DEBUG_PSC_PRINTF(fmt, ...) DEBUG_ESP_PORT.printf(("PubSubClient: " fmt), ##__VA_ARGS__) @@ -143,6 +167,7 @@ #define ERROR_PSC_PRINTF_P(fmt, ...) #endif #endif +/// \endcond /** * @class PubSubClient @@ -165,7 +190,7 @@ class PubSubClient : public Print { uint16_t port{}; Stream* stream{}; int _state{MQTT_DISCONNECTED}; - int _bufferWritePos = 0; + uint8_t _qos{MQTT_QOS0}; size_t readPacket(uint8_t* hdrLen); bool handlePacket(uint8_t hdrLen, size_t len); @@ -173,37 +198,106 @@ class PubSubClient : public Print { bool readByte(uint8_t* result, size_t* pos); uint8_t buildHeader(uint8_t header, uint8_t* buf, size_t length); bool write(uint8_t header, uint8_t* buf, size_t length); - size_t writeString(const char* string, uint8_t* buf, size_t pos); size_t writeString(const char* string, uint8_t* buf, size_t pos, size_t size); - - // Add to buffer and flush if full (only to be used with beginPublish/endPublish)Add commentMore actions - size_t appendBuffer(uint8_t data); - size_t appendBuffer(const uint8_t *data, size_t size); - size_t flushBuffer(); + size_t writeNextMsgId(uint8_t* buf, size_t pos, size_t size); public: /** * @brief Creates an uninitialised client instance. - * @note Before it can be used, - * it must be configured using the property setters setClient and setServer. + * @note Before it can be used, it must be configured using the property setters setClient() and setServer(). */ PubSubClient(); /** * @brief Creates a partially initialised client instance. * @param client The network client to use, for example WiFiClient. - * @note Before it can be used, - * it must be configured with the property setter setServer. + * @note Before it can be used, it must be configured with the property setter setServer(). */ PubSubClient(Client& client); + /** + * @brief Creates a fully configured client instance. + * @param addr The address of the server. + * @param port The port to connect to. + * @param client The network client to use, for example WiFiClient. + */ + PubSubClient(IPAddress addr, uint16_t port, Client& client); + + /** + * @brief Creates a fully configured client instance. + * @param addr The address of the server. + * @param port The port to connect to. + * @param client The network client to use, for example WiFiClient. + * @param stream A stream to write received messages to. + */ + PubSubClient(IPAddress addr, uint16_t port, Client& client, Stream& stream); + + /** + * @brief Creates a fully configured client instance. + * @param addr The address of the server. + * @param port The port to connect to. + * @param callback Pointer to a message \ref callback function. + * Called when a message arrives for a subscription created by this client. + * @param client The network client to use, for example WiFiClient. + */ + PubSubClient(IPAddress addr, uint16_t port, MQTT_CALLBACK_SIGNATURE, Client& client); + + /** + * @brief Creates a fully configured client instance. + * @param addr The address of the server. + * @param port The port to connect to. + * @param callback Pointer to a message \ref callback function. + * Called when a message arrives for a subscription created by this client. + * @param client The network client to use, for example WiFiClient. + * @param stream A stream to write received messages to. + */ + PubSubClient(IPAddress addr, uint16_t port, MQTT_CALLBACK_SIGNATURE, Client& client, Stream& stream); + + /** + * @brief Creates a fully configured client instance. + * @param ip The address of the server. + * @param port The port to connect to. + * @param client The network client to use, for example WiFiClient. + */ + PubSubClient(uint8_t* ip, uint16_t port, Client& client); + + /** + * @brief Creates a fully configured client instance. + * @param ip The address of the server. + * @param port The port to connect to. + * @param client The network client to use, for example WiFiClient. + * @param stream A stream to write received messages to. + */ + PubSubClient(uint8_t* ip, uint16_t port, Client& client, Stream& stream); + + /** + * @brief Creates a fully configured client instance. + * @param ip The address of the server. + * @param port The port to connect to. + * @param callback Pointer to a message \ref callback function. + * Called when a message arrives for a subscription created by this client. + * @param client The network client to use, for example WiFiClient. + */ + PubSubClient(uint8_t* ip, uint16_t port, MQTT_CALLBACK_SIGNATURE, Client& client); + + /** + * @brief Creates a fully configured client instance. + * @param ip The address of the server. + * @param port The port to connect to. + * @param callback Pointer to a message \ref callback function. + * Called when a message arrives for a subscription created by this client. + * @param client The network client to use, for example WiFiClient. + * @param stream A stream to write received messages to. + */ + PubSubClient(uint8_t* ip, uint16_t port, MQTT_CALLBACK_SIGNATURE, Client& client, Stream& stream); + /** * @brief Creates a fully configured client instance. * @param domain The address of the server. * @param port The port to connect to. * @param client The network client to use, for example WiFiClient. */ - PubSubClient(IPAddress, uint16_t, Client& client); + PubSubClient(const char* domain, uint16_t port, Client& client); /** * @brief Creates a fully configured client instance. @@ -212,104 +306,28 @@ class PubSubClient : public Print { * @param client The network client to use, for example WiFiClient. * @param stream A stream to write received messages to. */ - PubSubClient(IPAddress, uint16_t, Client& client, Stream&); + PubSubClient(const char* domain, uint16_t port, Client& client, Stream& stream); /** * @brief Creates a fully configured client instance. * @param domain The address of the server. * @param port The port to connect to. - * @param callback Pointer to a message callback function. + * @param callback Pointer to a message \ref callback function. * Called when a message arrives for a subscription created by this client. * @param client The network client to use, for example WiFiClient. */ - PubSubClient(IPAddress, uint16_t, MQTT_CALLBACK_SIGNATURE, Client& client); + PubSubClient(const char* domain, uint16_t port, MQTT_CALLBACK_SIGNATURE, Client& client); /** * @brief Creates a fully configured client instance. * @param domain The address of the server. * @param port The port to connect to. - * @param callback Pointer to a message callback function. + * @param callback Pointer to a message \ref callback function. * Called when a message arrives for a subscription created by this client. * @param client The network client to use, for example WiFiClient. * @param stream A stream to write received messages to. */ - PubSubClient(IPAddress, uint16_t, MQTT_CALLBACK_SIGNATURE, Client& client, Stream&); - - /** - * @brief Creates a fully configured client instance. - * @param domain The address of the server. - * @param port The port to connect to. - * @param client The network client to use, for example WiFiClient. - */ - PubSubClient(uint8_t*, uint16_t, Client& client); - - /** - * @brief Creates a fully configured client instance. - * @param domain The address of the server. - * @param port The port to connect to. - * @param client The network client to use, for example WiFiClient. - * @param stream A stream to write received messages to. - */ - PubSubClient(uint8_t*, uint16_t, Client& client, Stream&); - - /** - * @brief Creates a fully configured client instance. - * @param domain The address of the server. - * @param port The port to connect to. - * @param callback Pointer to a message callback function. - * Called when a message arrives for a subscription created by this client. - * @param client The network client to use, for example WiFiClient. - */ - PubSubClient(uint8_t*, uint16_t, MQTT_CALLBACK_SIGNATURE, Client& client); - - /** - * @brief Creates a fully configured client instance. - * @param domain The address of the server. - * @param port The port to connect to. - * @param callback Pointer to a message callback function. - * Called when a message arrives for a subscription created by this client. - * @param client The network client to use, for example WiFiClient. - * @param stream A stream to write received messages to. - */ - PubSubClient(uint8_t*, uint16_t, MQTT_CALLBACK_SIGNATURE, Client& client, Stream&); - - /** - * @brief Creates a fully configured client instance. - * @param domain The address of the server. - * @param port The port to connect to. - * @param client The network client to use, for example WiFiClient. - */ - PubSubClient(const char*, uint16_t, Client& client); - - /** - * @brief Creates a fully configured client instance. - * @param domain The address of the server. - * @param port The port to connect to. - * @param client The network client to use, for example WiFiClient. - * @param stream A stream to write received messages to. - */ - PubSubClient(const char*, uint16_t, Client& client, Stream&); - - /** - * @brief Creates a fully configured client instance. - * @param domain The address of the server. - * @param port The port to connect to. - * @param callback Pointer to a message callback function. - * Called when a message arrives for a subscription created by this client. - * @param client The network client to use, for example WiFiClient. - */ - PubSubClient(const char*, uint16_t, MQTT_CALLBACK_SIGNATURE, Client& client); - - /** - * @brief Creates a fully configured client instance. - * @param domain The address of the server. - * @param port The port to connect to. - * @param callback Pointer to a message callback function. - * Called when a message arrives for a subscription created by this client. - * @param client The network client to use, for example WiFiClient. - * @param stream A stream to write received messages to. - */ - PubSubClient(const char*, uint16_t, MQTT_CALLBACK_SIGNATURE, Client& client, Stream&); + PubSubClient(const char* domain, uint16_t port, MQTT_CALLBACK_SIGNATURE, Client& client, Stream& stream); /** * @brief Destructor for the PubSubClient class. @@ -319,7 +337,7 @@ class PubSubClient : public Print { /** * @brief Sets the server details. * @param ip The address of the server. - * @param port The port to connect to. + * @param port The port to connect to. * @return The client instance, allowing the function to be chained. */ PubSubClient& setServer(IPAddress ip, uint16_t port); @@ -327,22 +345,22 @@ class PubSubClient : public Print { /** * @brief Sets the server details. * @param ip The address of the server. - * @param port The port to connect to. + * @param port The port to connect to. * @return The client instance, allowing the function to be chained. */ PubSubClient& setServer(uint8_t* ip, uint16_t port); /** * @brief Sets the server details. - * @param ip The address of the server. - * @param port The port to connect to. + * @param domain The address of the server. + * @param port The port to connect to. * @return The client instance, allowing the function to be chained. */ PubSubClient& setServer(const char* domain, uint16_t port); /** * @brief Sets the message callback function. - * @param callback Pointer to a message callback function. + * @param callback Pointer to a message \ref callback function. * Called when a message arrives for a subscription created by this client. * @return The client instance, allowing the function to be chained. */ @@ -398,7 +416,7 @@ class PubSubClient : public Print { size_t getBufferSize(); /** - * @brief Connects the client. + * @brief Connects the client using a clean session without username and password. * @param id The client ID to use when connecting to the server. * @return true If client succeeded in establishing a connection to the broker. * false If client failed to establish a connection to the broker. @@ -406,48 +424,60 @@ class PubSubClient : public Print { bool connect(const char* id); /** - * @brief Connects the client. + * @brief Connects the client using a clean session with username and password. * @param id The client ID to use when connecting to the server. - * @param user The username to use. If NULL, no username or password is used. - * @param pass The password to use. If NULL, no password is used. + * @param user The username to use. + * @param pass The password to use. + * @note If **user** is NULL, no username or password is used. + * @note If **pass** is NULL, no password is used. * @return true If client succeeded in establishing a connection to the broker. * false If client failed to establish a connection to the broker. */ bool connect(const char* id, const char* user, const char* pass); /** - * @brief Connects the client. + * @brief Connects the client using a clean session and will. * @param id The client ID to use when connecting to the server. * @param willTopic The topic to be used by the will message. * @param willQos The quality of service to be used by the will message. [0, 1, 2]. * @param willRetain Publish the will message with the retain flag. + * @param willMessage The message to be used by the will message. + * @note If **willTopic** is NULL, no will message is sent. * @return true If client succeeded in establishing a connection to the broker. * false If client failed to establish a connection to the broker. */ bool connect(const char* id, const char* willTopic, uint8_t willQos, bool willRetain, const char* willMessage); /** - * @brief Connects the client. + * @brief Connects the client using a clean session with username, password and will. * @param id The client ID to use when connecting to the server. - * @param user The username to use. If NULL, no username or password is used. - * @param pass The password to use. If NULL, no password is used. + * @param user The username to use. + * @param pass The password to use. * @param willTopic The topic to be used by the will message. * @param willQos The quality of service to be used by the will message. [0, 1, 2]. * @param willRetain Publish the will message with the retain flag. + * @param willMessage The message to be used by the will message. + * @note If **user** is NULL, no username or password is used. + * @note If **pass** is NULL, no password is used. + * @note If **willTopic** is NULL, no will message is sent. * @return true If client succeeded in establishing a connection to the broker. * false If client failed to establish a connection to the broker. */ bool connect(const char* id, const char* user, const char* pass, const char* willTopic, uint8_t willQos, bool willRetain, const char* willMessage); /** - * @brief Connects the client. + * @brief Connects the client with all possible parameters (user, password, will and session). * @param id The client ID to use when connecting to the server. - * @param user The username to use. If NULL, no username or password is used. - * @param pass The password to use. If NULL, no password is used. + * @param user The username to use. + * @param pass The password to use. * @param willTopic The topic to be used by the will message. * @param willQos The quality of service to be used by the will message. [0, 1, 2]. * @param willRetain Publish the will message with the retain flag. - * @param cleanSession Connect with a clean session. + * @param willMessage The message to be used by the will message. + * @param cleanSession True to connect with a clean session. + * @note If **user** is NULL, no username or password is used. + * @note If **pass** is NULL, no password is used. + * @note If **willTopic** is NULL, no will message is sent. * @return true If client succeeded in establishing a connection to the broker. * false If client failed to establish a connection to the broker. */ @@ -460,7 +490,7 @@ class PubSubClient : public Print { void disconnect(); /** - * @brief Publishes a non retained message to the specified topic. + * @brief Publishes a non retained message to the specified topic using QoS 0. * @param topic The topic to publish to. * @param payload The message to publish. * @return true If the publish succeeded. @@ -469,7 +499,7 @@ class PubSubClient : public Print { bool publish(const char* topic, const char* payload); /** - * @brief Publishes a message to the specified topic. + * @brief Publishes a message to the specified topic using QoS 0. * @param topic The topic to publish to. * @param payload The message to publish. * @param retained Publish the message with the retain flag. @@ -479,7 +509,18 @@ class PubSubClient : public Print { bool publish(const char* topic, const char* payload, bool retained); /** - * @brief Publishes a non retained message to the specified topic. + * @brief Publishes a message to the specified topic. + * @param topic The topic to publish to. + * @param payload The message to publish. + * @param qos The quality of service (\ref group_qos) to publish at. [0, 1, 2]. + * @param retained Publish the message with the retain flag. + * @return true If the publish succeeded. + * false If the publish failed, either connection lost or message too large. + */ + bool publish(const char* topic, const char* payload, uint8_t qos, bool retained); + + /** + * @brief Publishes a non retained message to the specified topic using QoS 0. * @param topic The topic to publish to. * @param payload The message to publish. * @param plength The length of the payload. @@ -489,7 +530,7 @@ class PubSubClient : public Print { bool publish(const char* topic, const uint8_t* payload, size_t plength); /** - * @brief Publishes a message to the specified topic. + * @brief Publishes a message to the specified topic using QoS 0. * @param topic The topic to publish to. * @param payload The message to publish. * @param plength The length of the payload. @@ -500,7 +541,19 @@ class PubSubClient : public Print { bool publish(const char* topic, const uint8_t* payload, size_t plength, bool retained); /** - * @brief Publishes a message stored in PROGMEM to the specified topic. + * @brief Publishes a message to the specified topic. + * @param topic The topic to publish to. + * @param payload The message to publish. + * @param plength The length of the payload. + * @param qos The quality of service (\ref group_qos) to publish at. [0, 1, 2]. + * @param retained Publish the message with the retain flag. + * @return true If the publish succeeded. + * false If the publish failed, either connection lost or message too large. + */ + bool publish(const char* topic, const uint8_t* payload, size_t plength, uint8_t qos, bool retained); + + /** + * @brief Publishes a message stored in PROGMEM to the specified topic using QoS 0. * @param topic The topic to publish to. * @param payload The message to publish. * @param retained Publish the message with the retain flag. @@ -513,6 +566,17 @@ class PubSubClient : public Print { * @brief Publishes a message stored in PROGMEM to the specified topic. * @param topic The topic to publish to. * @param payload The message to publish. + * @param qos The quality of service (\ref group_qos) to publish at. [0, 1, 2]. + * @param retained Publish the message with the retain flag. + * @return true If the publish succeeded. + * false If the publish failed, either connection lost or message too large. + */ + bool publish_P(const char* topic, const char* payload, uint8_t qos, bool retained); + + /** + * @brief Publishes a message stored in PROGMEM to the specified topic using QoS 0. + * @param topic The topic to publish to. + * @param payload The message to publish. * @param plength The length of the payload. * @param retained Publish the message with the retain flag. * @return true If the publish succeeded. @@ -521,7 +585,19 @@ class PubSubClient : public Print { bool publish_P(const char* topic, const uint8_t* payload, size_t plength, bool retained); /** - * @brief Start to publish a message. + * @brief Publishes a message stored in PROGMEM to the specified topic. + * @param topic The topic to publish to. + * @param payload The message to publish. + * @param plength The length of the payload. + * @param qos The quality of service (\ref group_qos) to publish at. [0, 1, 2]. + * @param retained Publish the message with the retain flag. + * @return true If the publish succeeded. + * false If the publish failed, either connection lost or message too large. + */ + bool publish_P(const char* topic, const uint8_t* payload, size_t plength, uint8_t qos, bool retained); + + /** + * @brief Start to publish a message using QoS 0. * This API: * beginPublish(...) * one or more calls to write(...) @@ -536,6 +612,23 @@ class PubSubClient : public Print { */ bool beginPublish(const char* topic, size_t plength, bool retained); + /** + * @brief Start to publish a message. + * This API: + * beginPublish(...) + * one or more calls to write(...) + * endPublish() + * Allows for arbitrarily large payloads to be sent without them having to be copied into + * a new buffer and held in memory at one time. + * @param topic The topic to publish to. + * @param plength The length of the payload. + * @param qos The quality of service (\ref group_qos) to publish at. [0, 1, 2]. + * @param retained Publish the message with the retain flag. + * @return true If the publish succeeded. + * false If the publish failed, either connection lost or message too large. + */ + bool beginPublish(const char* topic, size_t plength, uint8_t qos, bool retained); + /** * @brief Finish sending a message that was started with a call to beginPublish. * @return true If the publish succeeded. @@ -545,17 +638,13 @@ class PubSubClient : public Print { /** * @brief Writes a single byte as a component of a publish started with a call to beginPublish. - * For performance reasons, this will be appended to the internal buffer, - * which will be flushed when full or on a call to endPublish(). - * @param byte A byte to write to the publish payload. + * @param data A byte to write to the publish payload. * @return The number of bytes written. */ - virtual size_t write(uint8_t); + virtual size_t write(uint8_t data); /** * @brief Writes an array of bytes as a component of a publish started with a call to beginPublish. - * For performance reasons, this will be appended to the internal buffer, - * which will be flushed when full or on a call to endPublish(). * @param buffer The bytes to write. * @param size The length of the payload to be sent. * @return The number of bytes written. @@ -563,7 +652,7 @@ class PubSubClient : public Print { virtual size_t write(const uint8_t* buffer, size_t size); /** - * @brief Subscribes to messages published to the specified topic. + * @brief Subscribes to messages published to the specified topic using QoS 0. * @param topic The topic to subscribe to. * @return true If sending the subscribe succeeded. * false If sending the subscribe failed, either connection lost or message too large. @@ -605,16 +694,7 @@ class PubSubClient : public Print { * @brief Returns the current state of the client. * If a connection attempt fails, this can be used to get more information about the failure. * @note All of the values have corresponding constants defined in PubSubClient.h. - * @return -4 : MQTT_CONNECTION_TIMEOUT - The server didn't respond within the keepalive time. - * -3 : MQTT_CONNECTION_LOST - The network connection was broken. - * -2 : MQTT_CONNECT_FAILED - The network connection failed. - * -1 : MQTT_DISCONNECTED - The client is disconnected cleanly. - * 0 : MQTT_CONNECTED - The client is connected. - * 1 : MQTT_CONNECT_BAD_PROTOCOL - The server doesn't support the requested version of MQTT. - * 2 : MQTT_CONNECT_BAD_CLIENT_ID - The server rejected the client identifier. - * 3 : MQTT_CONNECT_UNAVAILABLE - The server was unable to accept the connection. - * 4 : MQTT_CONNECT_BAD_CREDENTIALS - The username/password were rejected. - * 5 : MQTT_CONNECT_UNAUTHORIZED - The client was not authorized to connect. + * @return See \ref group_state */ int state(); }; diff --git a/lib/pubsubclient3/tests/src/connect_spec.cpp b/lib/pubsubclient3/tests/src/connect_spec.cpp index 75dc819b5..b272e92f5 100644 --- a/lib/pubsubclient3/tests/src/connect_spec.cpp +++ b/lib/pubsubclient3/tests/src/connect_spec.cpp @@ -7,7 +7,7 @@ byte server[] = {172, 16, 0, 2}; // function declarations -void callback(char* topic, uint8_t* payload, size_t length); +void callback(char* topic, uint8_t* payload, size_t plength); int test_connect_fails_no_network(); int test_connect_fails_on_no_response(); int test_connect_properly_formatted(); @@ -23,7 +23,7 @@ int test_connect_with_will_username_password(); int test_connect_disconnect_connect(); int test_connect_custom_keepalive(); -void callback(_UNUSED_ char* topic, _UNUSED_ uint8_t* payload, _UNUSED_ size_t length) { +void callback(_UNUSED_ char* topic, _UNUSED_ uint8_t* payload, _UNUSED_ size_t plength) { // handle message arrived } diff --git a/lib/pubsubclient3/tests/src/keepalive_spec.cpp b/lib/pubsubclient3/tests/src/keepalive_spec.cpp index 58e3f206c..37b99be72 100644 --- a/lib/pubsubclient3/tests/src/keepalive_spec.cpp +++ b/lib/pubsubclient3/tests/src/keepalive_spec.cpp @@ -9,14 +9,14 @@ byte server[] = {172, 16, 0, 2}; // function declarations -void callback(char* topic, uint8_t* payload, size_t length); +void callback(char* topic, uint8_t* payload, size_t plength); int test_keepalive_pings_idle(); int test_keepalive_pings_with_outbound_qos0(); int test_keepalive_pings_with_inbound_qos0(); int test_keepalive_no_pings_inbound_qos1(); int test_keepalive_disconnects_hung(); -void callback(_UNUSED_ char* topic, _UNUSED_ uint8_t* payload, _UNUSED_ size_t length) { +void callback(_UNUSED_ char* topic, _UNUSED_ uint8_t* payload, _UNUSED_ size_t plength) { // handle message arrived } @@ -54,7 +54,7 @@ int test_keepalive_pings_idle() { } int test_keepalive_pings_with_outbound_qos0() { - IT("keeps a connection alive that only sends qos0 (takes 1 minute)"); + IT("keeps a connection alive that only sends QoS 0 (takes 1 minute)"); ShimClient shimClient; shimClient.setAllowConnect(true); @@ -90,7 +90,7 @@ int test_keepalive_pings_with_outbound_qos0() { } int test_keepalive_pings_with_inbound_qos0() { - IT("keeps a connection alive that only receives qos0 (takes 1 minute)"); + IT("keeps a connection alive that only receives QoS 0 (takes 1 minute)"); ShimClient shimClient; shimClient.setAllowConnect(true); @@ -123,7 +123,7 @@ int test_keepalive_pings_with_inbound_qos0() { } int test_keepalive_no_pings_inbound_qos1() { - IT("does not send pings for connections with inbound qos1 (takes 1 minute)"); + IT("does not send pings for connections with inbound QoS 1 (takes 1 minute)"); ShimClient shimClient; shimClient.setAllowConnect(true); diff --git a/lib/pubsubclient3/tests/src/publish_spec.cpp b/lib/pubsubclient3/tests/src/publish_spec.cpp index 4346a721a..241ee57e2 100644 --- a/lib/pubsubclient3/tests/src/publish_spec.cpp +++ b/lib/pubsubclient3/tests/src/publish_spec.cpp @@ -7,7 +7,7 @@ byte server[] = {172, 16, 0, 2}; // function declarations -void callback(char* topic, uint8_t* payload, size_t length); +void callback(char* topic, uint8_t* payload, size_t plength); int test_publish(); int test_publish_bytes(); int test_publish_retained(); @@ -16,8 +16,14 @@ int test_publish_not_connected(); int test_publish_too_long(); int test_publish_P(); int test_publish_P_too_long(); +int test_publish_empty_topic(); +int test_publish_null_payload(); +int test_publish_qos1(); +int test_publish_qos2(); +int test_publish_P_qos1(); +int test_publish_P_qos2(); -void callback(_UNUSED_ char* topic, _UNUSED_ uint8_t* payload, _UNUSED_ size_t length) { +void callback(_UNUSED_ char* topic, _UNUSED_ uint8_t* payload, _UNUSED_ size_t plength) { // handle message arrived } @@ -27,14 +33,14 @@ int test_publish() { shimClient.setAllowConnect(true); byte connack[] = {0x20, 0x02, 0x00, 0x00}; - shimClient.respond(connack, 4); + shimClient.respond(connack, sizeof(connack)); PubSubClient client(server, 1883, callback, shimClient); bool rc = client.connect("client_test1"); IS_TRUE(rc); - byte publish[] = {0x30, 0xe, 0x0, 0x5, 0x74, 0x6f, 0x70, 0x69, 0x63, 0x70, 0x61, 0x79, 0x6c, 0x6f, 0x61, 0x64}; - shimClient.expect(publish, 16); + byte publish[] = {0x30, 0x0e, 0x00, 0x05, 't', 'o', 'p', 'i', 'c', 'p', 'a', 'y', 'l', 'o', 'a', 'd'}; + shimClient.expect(publish, sizeof(publish)); rc = client.publish("topic", "payload"); IS_TRUE(rc); @@ -49,18 +55,18 @@ int test_publish_bytes() { ShimClient shimClient; shimClient.setAllowConnect(true); - byte payload[] = {0x01, 0x02, 0x03, 0x0, 0x05}; - size_t length = 5; + byte payload[] = {0x01, 0x02, 0x03, 0x00, 0x05}; + size_t length = sizeof(payload); byte connack[] = {0x20, 0x02, 0x00, 0x00}; - shimClient.respond(connack, 4); + shimClient.respond(connack, sizeof(connack)); PubSubClient client(server, 1883, callback, shimClient); bool rc = client.connect("client_test1"); IS_TRUE(rc); - byte publish[] = {0x30, 0xc, 0x0, 0x5, 0x74, 0x6f, 0x70, 0x69, 0x63, 0x1, 0x2, 0x3, 0x0, 0x5}; - shimClient.expect(publish, 14); + byte publish[] = {0x30, 0x0c, 0x00, 0x05, 't', 'o', 'p', 'i', 'c', 0x01, 0x02, 0x03, 0x00, 0x05}; + shimClient.expect(publish, sizeof(publish)); rc = client.publish("topic", payload, length); IS_TRUE(rc); @@ -75,18 +81,18 @@ int test_publish_retained() { ShimClient shimClient; shimClient.setAllowConnect(true); - byte payload[] = {0x01, 0x02, 0x03, 0x0, 0x05}; - size_t length = 5; + byte payload[] = {0x01, 0x02, 0x03, 0x00, 0x05}; + size_t length = sizeof(payload); byte connack[] = {0x20, 0x02, 0x00, 0x00}; - shimClient.respond(connack, 4); + shimClient.respond(connack, sizeof(connack)); PubSubClient client(server, 1883, callback, shimClient); bool rc = client.connect("client_test1"); IS_TRUE(rc); - byte publish[] = {0x31, 0xc, 0x0, 0x5, 0x74, 0x6f, 0x70, 0x69, 0x63, 0x1, 0x2, 0x3, 0x0, 0x5}; - shimClient.expect(publish, 14); + byte publish[] = {0x31, 0x0c, 0x00, 0x05, 't', 'o', 'p', 'i', 'c', 0x1, 0x2, 0x3, 0x0, 0x5}; + shimClient.expect(publish, sizeof(publish)); rc = client.publish("topic", payload, length, true); IS_TRUE(rc); @@ -102,14 +108,14 @@ int test_publish_retained_2() { shimClient.setAllowConnect(true); byte connack[] = {0x20, 0x02, 0x00, 0x00}; - shimClient.respond(connack, 4); + shimClient.respond(connack, sizeof(connack)); PubSubClient client(server, 1883, callback, shimClient); bool rc = client.connect("client_test1"); IS_TRUE(rc); - byte publish[] = {0x31, 0xc, 0x0, 0x5, 0x74, 0x6f, 0x70, 0x69, 0x63, 'A', 'B', 'C', 'D', 'E'}; - shimClient.expect(publish, 14); + byte publish[] = {0x31, 0x0c, 0x00, 0x05, 't', 'o', 'p', 'i', 'c', 'A', 'B', 'C', 'D', 'E'}; + shimClient.expect(publish, sizeof(publish)); rc = client.publish("topic", "ABCDE", true); IS_TRUE(rc); @@ -165,18 +171,18 @@ int test_publish_P() { ShimClient shimClient; shimClient.setAllowConnect(true); - byte payload[] = {0x01, 0x02, 0x03, 0x0, 0x05}; - size_t length = 5; + byte payload[] = {0x01, 0x02, 0x03, 0x00, 0x05}; + size_t length = sizeof(payload); byte connack[] = {0x20, 0x02, 0x00, 0x00}; - shimClient.respond(connack, 4); + shimClient.respond(connack, sizeof(connack)); PubSubClient client(server, 1883, callback, shimClient); bool rc = client.connect("client_test1"); IS_TRUE(rc); - byte publish[] = {0x31, 0xc, 0x0, 0x5, 0x74, 0x6f, 0x70, 0x69, 0x63, 0x1, 0x2, 0x3, 0x0, 0x5}; - shimClient.expect(publish, 14); + byte publish[] = {0x31, 0x0c, 0x00, 0x05, 't', 'o', 'p', 'i', 'c', 0x01, 0x02, 0x03, 0x00, 0x05}; + shimClient.expect(publish, sizeof(publish)); rc = client.publish_P("topic", payload, length, true); IS_TRUE(rc); @@ -187,7 +193,7 @@ int test_publish_P() { } int test_publish_P_too_long() { - IT("publish using PROGMEM fails when topic are too long"); + IT("publish using PROGMEM fails when topic is too long"); ShimClient shimClient; shimClient.setAllowConnect(true); @@ -198,7 +204,7 @@ int test_publish_P_too_long() { char payload[] = "123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890"; byte connack[] = {0x20, 0x02, 0x00, 0x00}; - shimClient.respond(connack, 4); + shimClient.respond(connack, sizeof(connack)); PubSubClient client(server, 1883, callback, shimClient); client.setBufferSize(64); @@ -213,15 +219,164 @@ int test_publish_P_too_long() { END_IT } +int test_publish_empty_topic() { + IT("publish fails when topic is empty"); + ShimClient shimClient; + shimClient.setAllowConnect(true); + + byte connack[] = {0x20, 0x02, 0x00, 0x00}; + shimClient.respond(connack, 4); + + PubSubClient client(server, 1883, callback, shimClient); + bool rc = client.connect("client_test1"); + IS_TRUE(rc); + + rc = client.publish("", "payload"); + IS_FALSE(rc); + + IS_FALSE(shimClient.error()); + + END_IT +} + +int test_publish_null_payload() { + IT("publishes with null payload"); + ShimClient shimClient; + shimClient.setAllowConnect(true); + + byte connack[] = {0x20, 0x02, 0x00, 0x00}; + shimClient.respond(connack, sizeof(connack)); + + PubSubClient client(server, 1883, callback, shimClient); + bool rc = client.connect("client_test1"); + IS_TRUE(rc); + + byte publish[] = {0x30, 0x07, 0x00, 0x05, 't', 'o', 'p', 'i', 'c'}; + shimClient.expect(publish, sizeof(publish)); + + rc = client.publish("topic", nullptr); + IS_TRUE(rc); + + IS_FALSE(shimClient.error()); + + END_IT +} + +int test_publish_qos1() { + IT("publishes with QoS 1"); + ShimClient shimClient; + shimClient.setAllowConnect(true); + + byte connack[] = {0x20, 0x02, 0x00, 0x00}; + shimClient.respond(connack, 4); + + PubSubClient client(server, 1883, callback, shimClient); + bool rc = client.connect("client_test1"); + IS_TRUE(rc); + + // Example publish packet for QoS 1 (0x32) + byte publish[] = {0x32, 0x10, 0x00, 0x05, 't', 'o', 'p', 'i', 'c', 'p', 'a', 'y', 'l', 'o', 'a', 'd', 0x00, 0x02}; + shimClient.expect(publish, sizeof(publish)); + + rc = client.publish("topic", "payload", MQTT_QOS1, false); + IS_TRUE(rc); + + IS_FALSE(shimClient.error()); + + END_IT +} + +int test_publish_qos2() { + IT("publishes with QoS 2"); + ShimClient shimClient; + shimClient.setAllowConnect(true); + + byte connack[] = {0x20, 0x02, 0x00, 0x00}; + shimClient.respond(connack, 4); + + PubSubClient client(server, 1883, callback, shimClient); + bool rc = client.connect("client_test1"); + IS_TRUE(rc); + + // Example publish packet for QoS 2 (0x34) + byte publish[] = {0x34, 0x10, 0x00, 0x05, 't', 'o', 'p', 'i', 'c', 'p', 'a', 'y', 'l', 'o', 'a', 'd', 0x00, 0x02}; + shimClient.expect(publish, sizeof(publish)); + + rc = client.publish("topic", "payload", MQTT_QOS2, false); + IS_TRUE(rc); + + IS_FALSE(shimClient.error()); + + END_IT +} + +int test_publish_P_qos1() { + IT("publishes using PROGMEM with QoS 1 retained"); + ShimClient shimClient; + shimClient.setAllowConnect(true); + + byte payload[] = {0x01, 0x02, 0x03, 0x04, 0x05}; + size_t length = sizeof(payload); + + byte connack[] = {0x20, 0x02, 0x00, 0x00}; + shimClient.respond(connack, sizeof(connack)); + + PubSubClient client(server, 1883, callback, shimClient); + bool rc = client.connect("client_test1"); + IS_TRUE(rc); + + byte publish[] = {0x33, 0x0e, 0x00, 0x05, 't', 'o', 'p', 'i', 'c', 0x01, 0x02, 0x03, 0x04, 0x05, 0x00, 0x02}; + shimClient.expect(publish, sizeof(publish)); + + rc = client.publish_P("topic", payload, length, MQTT_QOS1, true); + IS_TRUE(rc); + + IS_FALSE(shimClient.error()); + + END_IT +} + +int test_publish_P_qos2() { + IT("publishes using PROGMEM with QoS 2 retained"); + ShimClient shimClient; + shimClient.setAllowConnect(true); + + byte payload[] = {0x01, 0x02, 0x03, 0x04, 0x05}; + size_t length = sizeof(payload); + + byte connack[] = {0x20, 0x02, 0x00, 0x00}; + shimClient.respond(connack, sizeof(connack)); + + PubSubClient client(server, 1883, callback, shimClient); + bool rc = client.connect("client_test1"); + IS_TRUE(rc); + + byte publish[] = {0x35, 0x0e, 0x00, 0x05, 't', 'o', 'p', 'i', 'c', 0x01, 0x02, 0x03, 0x04, 0x05, 0x00, 0x02}; + shimClient.expect(publish, sizeof(publish)); + + rc = client.publish_P("topic", payload, length, MQTT_QOS2, true); + IS_TRUE(rc); + + IS_FALSE(shimClient.error()); + + END_IT +} + int main() { SUITE("Publish"); test_publish(); test_publish_bytes(); test_publish_retained(); test_publish_retained_2(); + test_publish_qos1(); + test_publish_qos2(); + test_publish_null_payload(); test_publish_not_connected(); + test_publish_empty_topic(); test_publish_too_long(); test_publish_P(); + test_publish_P_qos1(); + test_publish_P_qos2(); test_publish_P_too_long(); FINISH diff --git a/lib/pubsubclient3/tests/src/receive_spec.cpp b/lib/pubsubclient3/tests/src/receive_spec.cpp index 3635e9778..8cbe0efae 100644 --- a/lib/pubsubclient3/tests/src/receive_spec.cpp +++ b/lib/pubsubclient3/tests/src/receive_spec.cpp @@ -18,7 +18,7 @@ char lastPayload[1024]; size_t lastLength; // function declarations -void callback(char* topic, uint8_t* payload, size_t length); +void callback(char* topic, uint8_t* payload, size_t plength); void reset_callback(); int test_receive_callback(); int test_receive_stream(); @@ -36,12 +36,12 @@ void reset_callback() { lastLength = 0; } -void callback(char* topic, uint8_t* payload, size_t length) { - TRACE("Callback received topic=[" << topic << "] length=" << length << "\n") +void callback(char* topic, uint8_t* payload, size_t plength) { + TRACE("Callback received topic=[" << topic << "] plength=" << plength << "\n") callback_called = true; strcpy(lastTopic, topic); - memcpy(lastPayload, payload, length); - lastLength = length; + memcpy(lastPayload, payload, plength); + lastLength = plength; } int test_receive_callback() { diff --git a/lib/pubsubclient3/tests/src/subscribe_spec.cpp b/lib/pubsubclient3/tests/src/subscribe_spec.cpp index 8ae83e7ad..c00eddf75 100644 --- a/lib/pubsubclient3/tests/src/subscribe_spec.cpp +++ b/lib/pubsubclient3/tests/src/subscribe_spec.cpp @@ -7,7 +7,7 @@ byte server[] = {172, 16, 0, 2}; // function declarations -void callback(char* topic, uint8_t* payload, size_t length); +void callback(char* topic, uint8_t* payload, size_t plength); int test_subscribe_no_qos(); int test_subscribe_qos_1(); int test_subscribe_not_connected(); @@ -16,12 +16,12 @@ int test_subscribe_too_long(); int test_unsubscribe(); int test_unsubscribe_not_connected(); -void callback(_UNUSED_ char* topic, _UNUSED_ uint8_t* payload, _UNUSED_ size_t length) { +void callback(_UNUSED_ char* topic, _UNUSED_ uint8_t* payload, _UNUSED_ size_t plength) { // handle message arrived } int test_subscribe_no_qos() { - IT("subscribe without qos defaults to 0"); + IT("subscribe without QoS (defaults to 0)"); ShimClient shimClient; shimClient.setAllowConnect(true); @@ -46,7 +46,7 @@ int test_subscribe_no_qos() { } int test_subscribe_qos_1() { - IT("subscribes qos 1"); + IT("subscribe with QoS 1"); ShimClient shimClient; shimClient.setAllowConnect(true); @@ -62,7 +62,7 @@ int test_subscribe_qos_1() { byte suback[] = {0x90, 0x3, 0x0, 0x2, 0x1}; shimClient.respond(suback, 5); - rc = client.subscribe("topic", 1); + rc = client.subscribe("topic", MQTT_QOS1); IS_TRUE(rc); IS_FALSE(shimClient.error()); @@ -85,7 +85,7 @@ int test_subscribe_not_connected() { } int test_subscribe_invalid_qos() { - IT("subscribe fails with invalid qos values"); + IT("subscribe fails with invalid QoS values"); ShimClient shimClient; shimClient.setAllowConnect(true); @@ -96,7 +96,7 @@ int test_subscribe_invalid_qos() { bool rc = client.connect("client_test1"); IS_TRUE(rc); - rc = client.subscribe("topic", 2); + rc = client.subscribe("topic", MQTT_QOS2); IS_FALSE(rc); rc = client.subscribe("topic", 254); IS_FALSE(rc); @@ -119,13 +119,13 @@ int test_subscribe_too_long() { bool rc = client.connect("client_test1"); IS_TRUE(rc); - // max length should be allowed - // 0 1 2 3 4 5 6 7 8 9 0 1 2 - rc = client.subscribe("12345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789"); + // max length should be allowed (buffer size - MQTT_MAX_HEADER_SIZE - msgId (2) - topic length bytes (2) - QoS (1) = 118) + // 0 1 2 3 4 5 6 7 8 9 0 1 2 + rc = client.subscribe("1234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678"); IS_TRUE(rc); - // 0 1 2 3 4 5 6 7 8 9 0 1 2 - rc = client.subscribe("123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890"); + // 0 1 2 3 4 5 6 7 8 9 0 1 2 + rc = client.subscribe("12345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789"); IS_FALSE(rc); IS_FALSE(shimClient.error()); From abae0f71bfb1c1eeec9f157aceeeabc690861c2b Mon Sep 17 00:00:00 2001 From: TD-er Date: Sat, 19 Jul 2025 16:41:18 +0200 Subject: [PATCH 134/564] [PubSubClient3] Speedup publish large messages using buffer As discussed here: #29 (comment) --- lib/pubsubclient3/src/PubSubClient.cpp | 46 +++++++++++++++++++++++--- lib/pubsubclient3/src/PubSubClient.h | 12 ++++++- 2 files changed, 53 insertions(+), 5 deletions(-) diff --git a/lib/pubsubclient3/src/PubSubClient.cpp b/lib/pubsubclient3/src/PubSubClient.cpp index 96aee156e..bdc3673e0 100644 --- a/lib/pubsubclient3/src/PubSubClient.cpp +++ b/lib/pubsubclient3/src/PubSubClient.cpp @@ -585,6 +585,7 @@ bool PubSubClient::beginPublish(const char* topic, size_t plength, uint8_t qos, } bool PubSubClient::endPublish() { + flushBuffer(); if (connected()) { if (this->_qos > MQTT_QOS0) { // QoS == 1 or 2, send the msgId @@ -635,13 +636,19 @@ uint8_t PubSubClient::buildHeader(uint8_t header, uint8_t* buf, size_t length) { } size_t PubSubClient::write(uint8_t data) { - lastOutActivity = millis(); - return _client->write(data); + const size_t rc = appendBuffer(data); + if (rc != 0) { + lastOutActivity = millis(); + } + return rc; } size_t PubSubClient::write(const uint8_t* buffer, size_t size) { - lastOutActivity = millis(); - return _client->write(buffer, size); + const size_t rc = appendBuffer(buffer, size); + if (rc != 0) { + lastOutActivity = millis(); + } + return rc; } /** @@ -710,6 +717,37 @@ size_t PubSubClient::writeString(const char* string, uint8_t* buf, size_t pos, s return pos; } + +size_t PubSubClient::appendBuffer(uint8_t data) { + buffer[_bufferWritePos] = data; + ++_bufferWritePos; + if (_bufferWritePos >= bufferSize) { + if (flushBuffer() == 0) return 0; + } + return 1; +} + +size_t PubSubClient::appendBuffer(const uint8_t *data, size_t size) { + for (size_t i = 0; i < size; ++i) { + if (appendBuffer(data[i]) == 0) return i; + } + return size; +} + +size_t PubSubClient::flushBuffer() { + size_t rc = 0; + if (_bufferWritePos > 0) { + if (connected()) { + rc = _client->write(buffer, _bufferWritePos); + if (rc != 0) { + lastOutActivity = millis(); + } + } + _bufferWritePos = 0; + } + return rc; +} + /** * @brief Write nextMsgId to the give buffer and position. * @note If the nextMsgId (2 bytes) does not fit in the buffer nothing is written to the buffer and the returned position is unchanged. diff --git a/lib/pubsubclient3/src/PubSubClient.h b/lib/pubsubclient3/src/PubSubClient.h index 2e8842997..a512785f4 100644 --- a/lib/pubsubclient3/src/PubSubClient.h +++ b/lib/pubsubclient3/src/PubSubClient.h @@ -190,6 +190,7 @@ class PubSubClient : public Print { uint16_t port{}; Stream* stream{}; int _state{MQTT_DISCONNECTED}; + int _bufferWritePos = 0; uint8_t _qos{MQTT_QOS0}; size_t readPacket(uint8_t* hdrLen); @@ -201,6 +202,12 @@ class PubSubClient : public Print { size_t writeString(const char* string, uint8_t* buf, size_t pos, size_t size); size_t writeNextMsgId(uint8_t* buf, size_t pos, size_t size); + + // Add to buffer and flush if full (only to be used with beginPublish/endPublish)Add commentMore actions + size_t appendBuffer(uint8_t data); + size_t appendBuffer(const uint8_t *data, size_t size); + size_t flushBuffer(); + public: /** * @brief Creates an uninitialised client instance. @@ -638,6 +645,8 @@ class PubSubClient : public Print { /** * @brief Writes a single byte as a component of a publish started with a call to beginPublish. + * For performance reasons, this will be appended to the internal buffer, + * which will be flushed when full or on a call to endPublish(). * @param data A byte to write to the publish payload. * @return The number of bytes written. */ @@ -645,7 +654,8 @@ class PubSubClient : public Print { /** * @brief Writes an array of bytes as a component of a publish started with a call to beginPublish. - * @param buffer The bytes to write. + * For performance reasons, this will be appended to the internal buffer, + * which will be flushed when full or on a call to endPublish(). * @param buffer The bytes to write. * @param size The length of the payload to be sent. * @return The number of bytes written. */ From 17da3e08b449295de07c87009d3517a29c82b07e Mon Sep 17 00:00:00 2001 From: TD-er Date: Sat, 19 Jul 2025 16:42:15 +0200 Subject: [PATCH 135/564] [Storage] Fix storing bool types --- src/src/Helpers/_ESPEasy_key_value_store.cpp | 64 ++++++++++++++------ src/src/Helpers/_ESPEasy_key_value_store.h | 5 +- 2 files changed, 49 insertions(+), 20 deletions(-) diff --git a/src/src/Helpers/_ESPEasy_key_value_store.cpp b/src/src/Helpers/_ESPEasy_key_value_store.cpp index 82766753c..08332b7ff 100644 --- a/src/src/Helpers/_ESPEasy_key_value_store.cpp +++ b/src/src/Helpers/_ESPEasy_key_value_store.cpp @@ -11,11 +11,6 @@ uint32_t ESPEasy_key_value_store::combine_StorageType_and_key( ESPEasy_key_value_store::StorageType storageType, uint32_t key) { - if (storageType == ESPEasy_key_value_store::StorageType::bool_false) { - // bool type will be kept in memory as bool_type - storageType = ESPEasy_key_value_store::StorageType::bool_type; - } - uint32_t res = key & ((1 << 24) - 1); res |= (static_cast(storageType) << 24); return res; @@ -788,12 +783,22 @@ bool ESPEasy_key_value_store::getValue(uint32_t key, double& value) const void ESPEasy_key_value_store::setValue(uint32_t key, const double& value) { SET_8BYTE_TYPE(double_type, setDouble); } -bool ESPEasy_key_value_store::getValue(uint32_t key, bool& value) const +bool ESPEasy_key_value_store::getValue(uint32_t key, bool& boolValue) const { - GET_4BYTE_TYPE(bool_type, getUint32); + boolValue = false; + uint32_t value{}; + auto it = get4byteIterator(ESPEasy_key_value_store::StorageType::bool_type, key); + + if (it == _4byte_data.end()) { return false; } + value = it->second.getUint32(); + boolValue = value != 0u; + return true; } -void ESPEasy_key_value_store::setValue(uint32_t key, const bool& value) { SET_4BYTE_TYPE(bool_type, setUint32); } +void ESPEasy_key_value_store::setValue(uint32_t key, const bool& boolValue) { + uint32_t value = boolValue ? 1 : 0; + SET_4BYTE_TYPE(bool_type, setUint32); +} bool ESPEasy_key_value_store::getValueAsString(const StorageType& storageType, uint32_t key, String& value) const { @@ -890,16 +895,28 @@ bool ESPEasy_key_value_store::getValueAsInt( switch (storageType) { - GET_TYPE_AS_INT64(bool_type, bool) - GET_TYPE_AS_INT64(int8_type, int8_t) - GET_TYPE_AS_INT64(uint8_type, uint8_t) - GET_TYPE_AS_INT64(int16_type, int16_t) - GET_TYPE_AS_INT64(uint16_type, uint16_t) - GET_TYPE_AS_INT64(int32_type, int32_t) - GET_TYPE_AS_INT64(uint32_type, uint32_t) - GET_TYPE_AS_INT64(float_type, float) - GET_TYPE_AS_INT64(uint64_type, uint64_t) - GET_TYPE_AS_INT64(double_type, double) + case ESPEasy_key_value_store::StorageType::bool_type: + case ESPEasy_key_value_store::StorageType::bool_true: + case ESPEasy_key_value_store::StorageType::bool_false: + { + bool v{}; + + if (getValue(key, v)) + { + value = v ? 1 : 0; + return true; + } + break; + } + GET_TYPE_AS_INT64(int8_type, int8_t) + GET_TYPE_AS_INT64(uint8_type, uint8_t) + GET_TYPE_AS_INT64(int16_type, int16_t) + GET_TYPE_AS_INT64(uint16_type, uint16_t) + GET_TYPE_AS_INT64(int32_type, int32_t) + GET_TYPE_AS_INT64(uint32_type, uint32_t) + GET_TYPE_AS_INT64(float_type, float) + GET_TYPE_AS_INT64(uint64_type, uint64_t) + GET_TYPE_AS_INT64(double_type, double) case ESPEasy_key_value_store::StorageType::int64_type: return getValue(key, value); @@ -960,6 +977,8 @@ void ESPEasy_key_value_store::setValue(const StorageType& storageType, uint32_t break; } case ESPEasy_key_value_store::StorageType::bool_type: + case ESPEasy_key_value_store::StorageType::bool_true: + case ESPEasy_key_value_store::StorageType::bool_false: setValue(key, static_cast(value.toInt())); break; default: return; @@ -1030,6 +1049,11 @@ void ESPEasy_key_value_store::setValue( bool ESPEasy_key_value_store::hasStorageType(StorageType storageType) const { // return true; + if ((storageType == ESPEasy_key_value_store::StorageType::bool_true) || + (storageType == ESPEasy_key_value_store::StorageType::bool_false)) { + storageType = ESPEasy_key_value_store::StorageType::bool_type; + } + const uint32_t bitnr = static_cast(storageType); constexpr uint32_t max_bitnr = static_cast(StorageType::MAX_Type); @@ -1039,6 +1063,10 @@ bool ESPEasy_key_value_store::hasStorageType(StorageType storageType) const void ESPEasy_key_value_store::setHasStorageType(StorageType storageType) { + if ((storageType == ESPEasy_key_value_store::StorageType::bool_true) || + (storageType == ESPEasy_key_value_store::StorageType::bool_false)) { + storageType = ESPEasy_key_value_store::StorageType::bool_type; + } const uint32_t bitnr = static_cast(storageType); constexpr uint32_t max_bitnr = static_cast(StorageType::MAX_Type); diff --git a/src/src/Helpers/_ESPEasy_key_value_store.h b/src/src/Helpers/_ESPEasy_key_value_store.h index b60bb7bd3..9a7732ceb 100644 --- a/src/src/Helpers/_ESPEasy_key_value_store.h +++ b/src/src/Helpers/_ESPEasy_key_value_store.h @@ -47,8 +47,9 @@ public: MAX_Type, // Leave this one after the generic type and before 'special' types - bool_true = 254, // small optimization to store 'true' as extra type - bool_false = 255 // small optimization to store 'false' as extra type + bool_true = 126, // small optimization to store 'true' as extra type + bool_false = 127, // small optimization to store 'false' as extra type + binary = 255 }; From 12577e77a1d6b3dcf73147f62c3414826818143d Mon Sep 17 00:00:00 2001 From: TD-er Date: Sat, 19 Jul 2025 17:13:10 +0200 Subject: [PATCH 136/564] [Controller] Fix bug not being able to add controller --- src/src/Globals/CPlugins.cpp | 2 +- src/src/WebServer/ControllerPage.cpp | 12 +++++------- 2 files changed, 6 insertions(+), 8 deletions(-) diff --git a/src/src/Globals/CPlugins.cpp b/src/src/Globals/CPlugins.cpp index 8bacb79e9..7ec9a0ac7 100644 --- a/src/src/Globals/CPlugins.cpp +++ b/src/src/Globals/CPlugins.cpp @@ -206,7 +206,7 @@ protocolIndex_t getProtocolIndex_from_CPluginID(cpluginID_t cpluginID) { } cpluginID_t getCPluginID_from_ProtocolIndex(protocolIndex_t index) { - return getCPluginID_from_ProtocolIndex(index); + return getCPluginID_from_ProtocolIndex_(index); } cpluginID_t getCPluginID_from_ControllerIndex(controllerIndex_t index) { diff --git a/src/src/WebServer/ControllerPage.cpp b/src/src/WebServer/ControllerPage.cpp index 0cf0b85b9..be0d2767f 100644 --- a/src/src/WebServer/ControllerPage.cpp +++ b/src/src/WebServer/ControllerPage.cpp @@ -45,13 +45,13 @@ void handle_controllers() { // 'index' value in the URL uint8_t controllerindex = getFormItemInt(F("index"), 0); - boolean controllerNotSet = controllerindex == 0; + const bool controllerIndexSet = controllerindex != 0 && validControllerIndex(controllerindex); --controllerindex; // Index in URL is starting from 1, but starting from 0 in the array. const int protocol_webarg_value = getFormItemInt(F("protocol"), -1); // submitted data - if ((protocol_webarg_value != -1) && !controllerNotSet) + if ((protocol_webarg_value != -1) && controllerIndexSet) { const protocolIndex_t protocolIndex = protocol_webarg_value; bool mustInit = false; @@ -138,13 +138,11 @@ void handle_controllers() { html_add_form(); - if (controllerNotSet) - { - handle_controllers_ShowAllControllersTable(); - } - else + if (controllerIndexSet) { handle_controllers_ControllerSettingsPage(controllerindex); + } else { + handle_controllers_ShowAllControllersTable(); } sendHeadandTail_stdtemplate(_TAIL); From 1a1c53d3e189c3729d555574623b0f34133baf4a Mon Sep 17 00:00:00 2001 From: TD-er Date: Sat, 19 Jul 2025 20:04:01 +0200 Subject: [PATCH 137/564] [Cleanup] Rename CPlugin and NWPlugin calls to make clear where used --- src/src/ESPEasyCore/Controller.cpp | 2 +- src/src/Globals/CPlugins.cpp | 22 +++++++++---------- src/src/Globals/CPlugins.h | 4 ---- src/src/Globals/NWPlugins.cpp | 22 +++++++++---------- .../Helpers/Scheduler_SystemEventTimer.cpp | 6 +++-- src/src/Helpers/_CPlugin_Helper_webform.cpp | 2 +- src/src/Helpers/_CPlugin_init.cpp | 12 +++++----- src/src/Helpers/_CPlugin_init.h | 9 ++++---- src/src/Helpers/_NWPlugin_Helper_webform.cpp | 2 +- src/src/Helpers/_NWPlugin_init.cpp | 10 ++++----- src/src/Helpers/_NWPlugin_init.h | 8 +++---- src/src/PluginStructs/P146_data_struct.cpp | 2 +- src/src/WebServer/ControllerPage.cpp | 10 ++++----- src/src/WebServer/DevicesPage.cpp | 2 +- src/src/WebServer/NetworkPage.cpp | 12 +++++----- 15 files changed, 62 insertions(+), 63 deletions(-) diff --git a/src/src/ESPEasyCore/Controller.cpp b/src/src/ESPEasyCore/Controller.cpp index 36a1b238c..a2325a109 100644 --- a/src/src/ESPEasyCore/Controller.cpp +++ b/src/src/ESPEasyCore/Controller.cpp @@ -70,7 +70,7 @@ void sendData(struct EventStruct *event, bool sendEvents) if (validUserVar(event)) { String dummy; - CPluginCall(ProtocolIndex, CPlugin::Function::CPLUGIN_PROTOCOL_SEND, event, dummy); + do_CPluginCall(ProtocolIndex, CPlugin::Function::CPLUGIN_PROTOCOL_SEND, event, dummy); } #ifndef BUILD_NO_DEBUG else { diff --git a/src/src/Globals/CPlugins.cpp b/src/src/Globals/CPlugins.cpp index 7ec9a0ac7..660a7f685 100644 --- a/src/src/Globals/CPlugins.cpp +++ b/src/src/Globals/CPlugins.cpp @@ -69,7 +69,7 @@ bool CPluginCall(CPlugin::Function Function, struct EventStruct *event, String& command = str; } - if (CPluginCall( + if (do_CPluginCall( getProtocolIndex_from_ControllerIndex(x), Function, event, @@ -106,7 +106,7 @@ bool CPluginCall(CPlugin::Function Function, struct EventStruct *event, String& if (Function == CPlugin::Function::CPLUGIN_PROTOCOL_SEND) { checkDeviceVTypeForTask(event); } - success = CPluginCall( + success = do_CPluginCall( getProtocolIndex_from_ControllerIndex(controllerindex), Function, event, @@ -135,7 +135,7 @@ bool CPluginCall(CPlugin::Function Function, struct EventStruct *event, String& for (controllerIndex_t x = 0; x < CONTROLLER_MAX; x++) { if (Settings.ControllerEnabled[x] && supportedCPluginID(Settings.Protocol[x])) { - CPluginCall( + do_CPluginCall( getProtocolIndex_from_ControllerIndex(x), Function, event, @@ -175,7 +175,7 @@ controllerIndex_t findFirstEnabledControllerWithId(cpluginID_t cpluginid) { bool validProtocolIndex(protocolIndex_t index) { - return validProtocolIndex_init(index); + return do_check_validProtocolIndex(index); } /* @@ -186,27 +186,27 @@ bool validProtocolIndex(protocolIndex_t index) */ bool validCPluginID(cpluginID_t cpluginID) { - return getProtocolIndex_from_CPluginID_(cpluginID) != INVALID_PROTOCOL_INDEX; + return do_getProtocolIndex_from_CPluginID(cpluginID) != INVALID_PROTOCOL_INDEX; } bool supportedCPluginID(cpluginID_t cpluginID) { - return validProtocolIndex(getProtocolIndex_from_CPluginID_(cpluginID)); + return validProtocolIndex(do_getProtocolIndex_from_CPluginID(cpluginID)); } protocolIndex_t getProtocolIndex_from_ControllerIndex(controllerIndex_t index) { if (validControllerIndex(index)) { - return getProtocolIndex_from_CPluginID_(Settings.Protocol[index]); + return do_getProtocolIndex_from_CPluginID(Settings.Protocol[index]); } return INVALID_PROTOCOL_INDEX; } protocolIndex_t getProtocolIndex_from_CPluginID(cpluginID_t cpluginID) { - return getProtocolIndex_from_CPluginID_(cpluginID); + return do_getProtocolIndex_from_CPluginID(cpluginID); } cpluginID_t getCPluginID_from_ProtocolIndex(protocolIndex_t index) { - return getCPluginID_from_ProtocolIndex_(index); + return do_getCPluginID_from_ProtocolIndex(index); } cpluginID_t getCPluginID_from_ControllerIndex(controllerIndex_t index) { @@ -219,13 +219,13 @@ String getCPluginNameFromProtocolIndex(protocolIndex_t ProtocolIndex) { String controllerName; if (validProtocolIndex(ProtocolIndex)) { - CPluginCall(ProtocolIndex, CPlugin::Function::CPLUGIN_GET_DEVICENAME, nullptr, controllerName); + do_CPluginCall(ProtocolIndex, CPlugin::Function::CPLUGIN_GET_DEVICENAME, nullptr, controllerName); } return controllerName; } String getCPluginNameFromCPluginID(cpluginID_t cpluginID) { - protocolIndex_t protocolIndex = getProtocolIndex_from_CPluginID_(cpluginID); + protocolIndex_t protocolIndex = do_getProtocolIndex_from_CPluginID(cpluginID); if (!validProtocolIndex(protocolIndex)) { return strformat(F("CPlugin %d not included in build"), cpluginID); diff --git a/src/src/Globals/CPlugins.h b/src/src/Globals/CPlugins.h index 31e9ab3ae..ace77949b 100644 --- a/src/src/Globals/CPlugins.h +++ b/src/src/Globals/CPlugins.h @@ -36,10 +36,6 @@ bool CPluginCall(CPlugin::Function Function, bool CPluginCall(CPlugin::Function Function, struct EventStruct *event, String & str); -bool CPluginCall(protocolIndex_t protocolIndex, - CPlugin::Function Function, - struct EventStruct *event, - String & str); bool anyControllerEnabled(); controllerIndex_t findFirstEnabledControllerWithId(cpluginID_t cpluginid); diff --git a/src/src/Globals/NWPlugins.cpp b/src/src/Globals/NWPlugins.cpp index 86c674a18..60887e305 100644 --- a/src/src/Globals/NWPlugins.cpp +++ b/src/src/Globals/NWPlugins.cpp @@ -59,7 +59,7 @@ bool NWPluginCall(NWPlugin::Function Function, struct EventStruct *event, String command = str; } - if (NWPluginCall_( + if (do_NWPluginCall( getNetworkDriverIndex_from_NetworkIndex(x), Function, event, @@ -103,7 +103,7 @@ bool NWPluginCall(NWPlugin::Function Function, struct EventStruct *event, String const networkDriverIndex_t networkDriverIndex = getNetworkDriverIndex_from_NetworkIndex(networkIndex); - success = NWPluginCall_( + success = do_NWPluginCall( networkDriverIndex, Function, event, @@ -113,7 +113,7 @@ bool NWPluginCall(NWPlugin::Function Function, struct EventStruct *event, String if (!success && NWPlugin::canQueryViaNetworkInterface(Function)) { String dummy_str; - if (NWPluginCall_( + if (do_NWPluginCall( networkDriverIndex, NWPlugin::Function::NWPLUGIN_GET_INTERFACE, event, @@ -162,7 +162,7 @@ bool NWPluginCall(NWPlugin::Function Function, struct EventStruct *event, String return false; } -bool validNetworkDriverIndex(networkDriverIndex_t index) { return validNetworkDriverIndex_init(index); } +bool validNetworkDriverIndex(networkDriverIndex_t index) { return do_check_validNetworkDriverIndex(index); } // bool getIP(networkDriverIndex_t index, NWPlugin::IP_type ip_type){} @@ -174,39 +174,39 @@ bool validNetworkDriverIndex(networkDriverIndex_t index) { return validNetworkDr } */ bool validNWPluginID(nwpluginID_t nwpluginID) { - return getNetworkDriverIndex_from_NWPluginID_(nwpluginID) != + return do_getNetworkDriverIndex_from_NWPluginID(nwpluginID) != INVALID_NETWORKDRIVER_INDEX; } bool supportedNWPluginID(nwpluginID_t nwpluginID) { return validNetworkDriverIndex( - getNetworkDriverIndex_from_NWPluginID_(nwpluginID)); + do_getNetworkDriverIndex_from_NWPluginID(nwpluginID)); } networkDriverIndex_t getNetworkDriverIndex_from_NetworkIndex(networkIndex_t index) { if (validNetworkIndex(index)) { - return getNetworkDriverIndex_from_NWPluginID_(Settings.getNWPluginID_for_network(index)); + return do_getNetworkDriverIndex_from_NWPluginID(Settings.getNWPluginID_for_network(index)); } return INVALID_NETWORKDRIVER_INDEX; } networkDriverIndex_t getNetworkDriverIndex_from_NWPluginID(nwpluginID_t nwpluginID) { - return getNetworkDriverIndex_from_NWPluginID_(nwpluginID); + return do_getNetworkDriverIndex_from_NWPluginID(nwpluginID); } -nwpluginID_t getNWPluginID_from_NetworkDriverIndex(networkDriverIndex_t index) { return getNWPluginID_from_NetworkDriverIndex_(index); } +nwpluginID_t getNWPluginID_from_NetworkDriverIndex(networkDriverIndex_t index) { return do_getNWPluginID_from_NetworkDriverIndex(index); } nwpluginID_t getNWPluginID_from_NetworkIndex(networkIndex_t index) { const networkDriverIndex_t networkDriverIndex = getNetworkDriverIndex_from_NetworkIndex(index); - return getNWPluginID_from_NetworkDriverIndex_(networkDriverIndex); + return do_getNWPluginID_from_NetworkDriverIndex(networkDriverIndex); } String getNWPluginNameFromNetworkDriverIndex(networkDriverIndex_t NetworkDriverIndex) { String networkName; if (validNetworkDriverIndex(NetworkDriverIndex)) { - NWPluginCall_(NetworkDriverIndex, NWPlugin::Function::NWPLUGIN_GET_DEVICENAME, nullptr, networkName); + do_NWPluginCall(NetworkDriverIndex, NWPlugin::Function::NWPLUGIN_GET_DEVICENAME, nullptr, networkName); } return networkName; } diff --git a/src/src/Helpers/Scheduler_SystemEventTimer.cpp b/src/src/Helpers/Scheduler_SystemEventTimer.cpp index 492e849b0..686c54a42 100644 --- a/src/src/Helpers/Scheduler_SystemEventTimer.cpp +++ b/src/src/Helpers/Scheduler_SystemEventTimer.cpp @@ -3,12 +3,14 @@ #include "../DataStructs/Scheduler_SystemEventQueueTimerID.h" #include "../DataStructs/TimingStats.h" -#include "../Globals/CPlugins.h" +//#include "../Globals/CPlugins.h" #include "../Globals/Device.h" #include "../Globals/NPlugins.h" #include "../Globals/RTC.h" #include "../Helpers/_Plugin_init.h" +#include "../Helpers/_CPlugin_init.h" +#include "../Helpers/_NWPlugin_init.h" #include "../Helpers/ESPEasyRTC.h" #include "../Helpers/ESPEasy_Storage.h" #include "../Helpers/StringConverter.h" @@ -206,7 +208,7 @@ void ESPEasy_Scheduler::process_system_event_queue() { break; } case SchedulerPluginPtrType_e::ControllerPlugin: - CPluginCall(Index, + do_CPluginCall(Index, static_cast(Function), &ScheduledEventQueue.front().event, tmpString); diff --git a/src/src/Helpers/_CPlugin_Helper_webform.cpp b/src/src/Helpers/_CPlugin_Helper_webform.cpp index 249456a1b..80324eb86 100644 --- a/src/src/Helpers/_CPlugin_Helper_webform.cpp +++ b/src/src/Helpers/_CPlugin_Helper_webform.cpp @@ -92,7 +92,7 @@ String getControllerParameterName(protocolIndex_t ProtocolInde EventStruct tmpEvent; tmpEvent.idx = parameterIdx; - if (CPluginCall(ProtocolIndex, CPlugin::Function::CPLUGIN_GET_PROTOCOL_DISPLAY_NAME, &tmpEvent, name)) { + if (do_CPluginCall(ProtocolIndex, CPlugin::Function::CPLUGIN_GET_PROTOCOL_DISPLAY_NAME, &tmpEvent, name)) { // Found an alternative name for it. isAlternative = true; return name; diff --git a/src/src/Helpers/_CPlugin_init.cpp b/src/src/Helpers/_CPlugin_init.cpp index 863debffb..bc3997be5 100644 --- a/src/src/Helpers/_CPlugin_init.cpp +++ b/src/src/Helpers/_CPlugin_init.cpp @@ -2090,7 +2090,7 @@ ProtocolStruct& getProtocolStruct(protocolIndex_t protocolIndex) return ProtocolArray[protocolIndex]; } -protocolIndex_t getProtocolIndex_from_CPluginID_(cpluginID_t cpluginID) +protocolIndex_t do_getProtocolIndex_from_CPluginID(cpluginID_t cpluginID) { if (cpluginID < CPlugin_id_to_ProtocolIndex_size) { @@ -2099,7 +2099,7 @@ protocolIndex_t getProtocolIndex_from_CPluginID_(cpluginID_t cpluginID) return INVALID_PROTOCOL_INDEX; } -cpluginID_t getCPluginID_from_ProtocolIndex_(protocolIndex_t protocolIndex) +cpluginID_t do_getCPluginID_from_ProtocolIndex(protocolIndex_t protocolIndex) { if (protocolIndex < ProtocolIndex_to_CPlugin_id_size) { @@ -2109,7 +2109,7 @@ cpluginID_t getCPluginID_from_ProtocolIndex_(protocolIndex_t protocolIndex) return INVALID_C_PLUGIN_ID; } -bool validProtocolIndex_init(protocolIndex_t protocolIndex) +bool do_check_validProtocolIndex(protocolIndex_t protocolIndex) { return protocolIndex < ProtocolIndex_to_CPlugin_id_size; } @@ -2120,7 +2120,7 @@ cpluginID_t getHighestIncludedCPluginID() } -bool CPluginCall(protocolIndex_t protocolIndex, CPlugin::Function Function, struct EventStruct *event, String& string) +bool do_CPluginCall(protocolIndex_t protocolIndex, CPlugin::Function Function, struct EventStruct *event, String& string) { if (protocolIndex < ProtocolIndex_to_CPlugin_id_size) { @@ -2146,14 +2146,14 @@ void CPluginSetup() for (protocolIndex_t protocolIndex = 0; protocolIndex < ProtocolIndex_to_CPlugin_id_size; ++protocolIndex) { - const cpluginID_t cpluginID = getCPluginID_from_ProtocolIndex_(protocolIndex); + const cpluginID_t cpluginID = do_getCPluginID_from_ProtocolIndex(protocolIndex); if (INVALID_C_PLUGIN_ID != cpluginID) { CPlugin_id_to_ProtocolIndex[cpluginID] = protocolIndex; struct EventStruct TempEvent; TempEvent.idx = protocolIndex; String dummy; - CPluginCall(protocolIndex, CPlugin::Function::CPLUGIN_PROTOCOL_ADD, &TempEvent, dummy); + do_CPluginCall(protocolIndex, CPlugin::Function::CPLUGIN_PROTOCOL_ADD, &TempEvent, dummy); } } setupDone = true; diff --git a/src/src/Helpers/_CPlugin_init.h b/src/src/Helpers/_CPlugin_init.h index dc0627007..1daab49f5 100644 --- a/src/src/Helpers/_CPlugin_init.h +++ b/src/src/Helpers/_CPlugin_init.h @@ -11,15 +11,16 @@ struct EventStruct; -protocolIndex_t getProtocolIndex_from_CPluginID_(cpluginID_t pluginID); -cpluginID_t getCPluginID_from_ProtocolIndex_(protocolIndex_t protocolIndex); -bool validProtocolIndex_init(protocolIndex_t protocolIndex); +protocolIndex_t do_getProtocolIndex_from_CPluginID(cpluginID_t pluginID); +cpluginID_t do_getCPluginID_from_ProtocolIndex(protocolIndex_t protocolIndex); +bool do_check_validProtocolIndex(protocolIndex_t protocolIndex); cpluginID_t getHighestIncludedCPluginID(); ProtocolStruct& getProtocolStruct(protocolIndex_t protocolIndex); -bool CPluginCall(protocolIndex_t protocolIndex, CPlugin::Function Function, struct EventStruct *event, String& string); +// Should only be called from CPluginCall, or maybe for very special occasions +bool do_CPluginCall(protocolIndex_t protocolIndex, CPlugin::Function Function, struct EventStruct *event, String& string); void CPluginSetup(); diff --git a/src/src/Helpers/_NWPlugin_Helper_webform.cpp b/src/src/Helpers/_NWPlugin_Helper_webform.cpp index 34245356f..ee8324e78 100644 --- a/src/src/Helpers/_NWPlugin_Helper_webform.cpp +++ b/src/src/Helpers/_NWPlugin_Helper_webform.cpp @@ -46,7 +46,7 @@ String getNetworkParameterName(networkDriverIndex_t NetworkDriverIndex EventStruct tmpEvent; tmpEvent.idx = parameterIdx; - if (NWPluginCall_(NetworkDriverIndex, NWPlugin::Function::NWPLUGIN_GET_PARAMETER_DISPLAY_NAME, &tmpEvent, name)) { + if (do_NWPluginCall(NetworkDriverIndex, NWPlugin::Function::NWPLUGIN_GET_PARAMETER_DISPLAY_NAME, &tmpEvent, name)) { // Found an alternative name for it. isAlternative = true; return name; diff --git a/src/src/Helpers/_NWPlugin_init.cpp b/src/src/Helpers/_NWPlugin_init.cpp index fadf10685..420922dde 100644 --- a/src/src/Helpers/_NWPlugin_init.cpp +++ b/src/src/Helpers/_NWPlugin_init.cpp @@ -2091,7 +2091,7 @@ NetworkDriverStruct& getNetworkDriverStruct(networkDriverIndex_t networkDriverIn return NetworkDriverArray[networkDriverIndex.value]; } -networkDriverIndex_t getNetworkDriverIndex_from_NWPluginID_(nwpluginID_t nwpluginID) +networkDriverIndex_t do_getNetworkDriverIndex_from_NWPluginID(nwpluginID_t nwpluginID) { if (nwpluginID.value < NWPlugin_id_to_NetworkDriverIndex_size) { @@ -2100,7 +2100,7 @@ networkDriverIndex_t getNetworkDriverIndex_from_NWPluginID_(nwpluginID_t nwplugi return INVALID_NETWORKDRIVER_INDEX; } -nwpluginID_t getNWPluginID_from_NetworkDriverIndex_(networkDriverIndex_t networkDriverIndex) +nwpluginID_t do_getNWPluginID_from_NetworkDriverIndex(networkDriverIndex_t networkDriverIndex) { if (networkDriverIndex.value < NetworkDriverIndex_to_NWPlugin_id_size) { @@ -2110,14 +2110,14 @@ nwpluginID_t getNWPluginID_from_NetworkDriverIndex_(networkDriverIndex_t network return INVALID_NW_PLUGIN_ID; } -bool validNetworkDriverIndex_init(networkDriverIndex_t networkDriverIndex) +bool do_check_validNetworkDriverIndex(networkDriverIndex_t networkDriverIndex) { return networkDriverIndex.value < NetworkDriverIndex_to_NWPlugin_id_size; } nwpluginID_t getHighestIncludedNWPluginID() { return nwpluginID_t::toPluginID(Highest_NWPlugin_id); } -bool NWPluginCall_(networkDriverIndex_t networkDriverIndex, NWPlugin::Function Function, struct EventStruct *event, String& string) +bool do_NWPluginCall(networkDriverIndex_t networkDriverIndex, NWPlugin::Function Function, struct EventStruct *event, String& string) { if (networkDriverIndex.value < NetworkDriverIndex_to_NWPlugin_id_size) { @@ -2152,7 +2152,7 @@ void NWPluginSetup() struct EventStruct TempEvent; TempEvent.idx = networkDriverIndex.value; String dummy; - NWPluginCall_(networkDriverIndex, NWPlugin::Function::NWPLUGIN_DRIVER_ADD, &TempEvent, dummy); + do_NWPluginCall(networkDriverIndex, NWPlugin::Function::NWPLUGIN_DRIVER_ADD, &TempEvent, dummy); } } setupDone = true; diff --git a/src/src/Helpers/_NWPlugin_init.h b/src/src/Helpers/_NWPlugin_init.h index 9cb0cbfb4..02bbd0778 100644 --- a/src/src/Helpers/_NWPlugin_init.h +++ b/src/src/Helpers/_NWPlugin_init.h @@ -11,16 +11,16 @@ struct EventStruct; -networkDriverIndex_t getNetworkDriverIndex_from_NWPluginID_(nwpluginID_t pluginID); -nwpluginID_t getNWPluginID_from_NetworkDriverIndex_(networkDriverIndex_t networkDriverIndex); -bool validNetworkDriverIndex_init(networkDriverIndex_t networkDriverIndex); +networkDriverIndex_t do_getNetworkDriverIndex_from_NWPluginID(nwpluginID_t pluginID); +nwpluginID_t do_getNWPluginID_from_NetworkDriverIndex(networkDriverIndex_t networkDriverIndex); +bool do_check_validNetworkDriverIndex(networkDriverIndex_t networkDriverIndex); nwpluginID_t getHighestIncludedNWPluginID(); NetworkDriverStruct& getNetworkDriverStruct(networkDriverIndex_t networkDriverIndex); // Should only be called from NWPluginCall, or maybe for very special occasions -bool NWPluginCall_(networkDriverIndex_t networkDriverIndex, NWPlugin::Function Function, struct EventStruct *event, String& string); +bool do_NWPluginCall(networkDriverIndex_t networkDriverIndex, NWPlugin::Function Function, struct EventStruct *event, String& string); void NWPluginSetup(); diff --git a/src/src/PluginStructs/P146_data_struct.cpp b/src/src/PluginStructs/P146_data_struct.cpp index 680d1b2f1..76266ff2b 100644 --- a/src/src/PluginStructs/P146_data_struct.cpp +++ b/src/src/PluginStructs/P146_data_struct.cpp @@ -385,7 +385,7 @@ bool P146_data_struct::sendViaOriginalTask( String dummy; // FIXME TD-er: Must think about how to include the timestamp - if (CPluginCall(ProtocolIndex, CPlugin::Function::CPLUGIN_PROTOCOL_SEND, &tmpEvent, dummy)) { + if (do_CPluginCall(ProtocolIndex, CPlugin::Function::CPLUGIN_PROTOCOL_SEND, &tmpEvent, dummy)) { // FIXME TD-er: What to do when multiple controllers are selected and one fails? // Also, what if we only sent 1 value instead of all? success = true; diff --git a/src/src/WebServer/ControllerPage.cpp b/src/src/WebServer/ControllerPage.cpp index be0d2767f..bd2a38bb6 100644 --- a/src/src/WebServer/ControllerPage.cpp +++ b/src/src/WebServer/ControllerPage.cpp @@ -131,7 +131,7 @@ void handle_controllers() { String dummy; CPlugin::Function cfunction = Settings.ControllerEnabled[controllerindex] ? CPlugin::Function::CPLUGIN_INIT : CPlugin::Function::CPLUGIN_EXIT; - CPluginCall(ProtocolIndex, cfunction, &TempEvent, dummy); + do_CPluginCall(ProtocolIndex, cfunction, &TempEvent, dummy); } } } @@ -179,7 +179,7 @@ void handle_controllers_clearLoadDefaults(uint8_t controllerindex, ControllerSet if (proto.usesTemplate) { String dummy; - CPluginCall(ProtocolIndex, CPlugin::Function::CPLUGIN_PROTOCOL_TEMPLATE, &TempEvent, dummy); + do_CPluginCall(ProtocolIndex, CPlugin::Function::CPLUGIN_PROTOCOL_TEMPLATE, &TempEvent, dummy); } safe_strncpy(ControllerSettings.Subscribe, TempEvent.String1.c_str(), sizeof(ControllerSettings.Subscribe)); safe_strncpy(ControllerSettings.Publish, TempEvent.String2.c_str(), sizeof(ControllerSettings.Publish)); @@ -218,7 +218,7 @@ void handle_controllers_CopySubmittedSettings_CPluginCall(uint8_t controllerinde // Call controller plugin to save CustomControllerSettings String dummy; - CPluginCall(ProtocolIndex, CPlugin::Function::CPLUGIN_WEBFORM_SAVE, &TempEvent, dummy); + do_CPluginCall(ProtocolIndex, CPlugin::Function::CPLUGIN_WEBFORM_SAVE, &TempEvent, dummy); } } @@ -277,7 +277,7 @@ void handle_controllers_ShowAllControllersTable() const protocolIndex_t ProtocolIndex = getProtocolIndex_from_ControllerIndex(x); { String hostDescription; - CPluginCall(ProtocolIndex, CPlugin::Function::CPLUGIN_WEBFORM_SHOW_HOST_CONFIG, 0, hostDescription); + do_CPluginCall(ProtocolIndex, CPlugin::Function::CPLUGIN_WEBFORM_SHOW_HOST_CONFIG, 0, hostDescription); if (!hostDescription.isEmpty()) { addHtml(hostDescription); @@ -496,7 +496,7 @@ void handle_controllers_ControllerSettingsPage(controllerIndex_t controllerindex TempEvent.ControllerIndex = controllerindex; String webformLoadString; - CPluginCall(ProtocolIndex, CPlugin::Function::CPLUGIN_WEBFORM_LOAD, &TempEvent, webformLoadString); + do_CPluginCall(ProtocolIndex, CPlugin::Function::CPLUGIN_WEBFORM_LOAD, &TempEvent, webformLoadString); if (webformLoadString.length() > 0) { addHtmlError(F("Bug in CPlugin::Function::CPLUGIN_WEBFORM_LOAD, should not append to string, use addHtml() instead")); diff --git a/src/src/WebServer/DevicesPage.cpp b/src/src/WebServer/DevicesPage.cpp index fd7631208..16124ed51 100644 --- a/src/src/WebServer/DevicesPage.cpp +++ b/src/src/WebServer/DevicesPage.cpp @@ -523,7 +523,7 @@ void handle_devices_CopySubmittedSettings(taskIndex_t taskIndex, pluginID_t task { protocolIndex_t ProtocolIndex = getProtocolIndex_from_ControllerIndex(TempEvent.ControllerIndex); String dummy; - CPluginCall(ProtocolIndex, CPlugin::Function::CPLUGIN_TASK_CHANGE_NOTIFICATION, &TempEvent, dummy); + do_CPluginCall(ProtocolIndex, CPlugin::Function::CPLUGIN_TASK_CHANGE_NOTIFICATION, &TempEvent, dummy); } } diff --git a/src/src/WebServer/NetworkPage.cpp b/src/src/WebServer/NetworkPage.cpp index 96b57f697..4bd617a89 100644 --- a/src/src/WebServer/NetworkPage.cpp +++ b/src/src/WebServer/NetworkPage.cpp @@ -104,7 +104,7 @@ void handle_networks() String dummy; NWPlugin::Function nfunction = Settings.getNetworkEnabled(networkindex) ? NWPlugin::Function::NWPLUGIN_INIT : NWPlugin::Function::NWPLUGIN_EXIT; - NWPluginCall_(NetworkDriverIndex, nfunction, &TempEvent, dummy); + do_NWPluginCall(NetworkDriverIndex, nfunction, &TempEvent, dummy); } } @@ -133,7 +133,7 @@ void handle_networks_clearLoadDefaults(networkIndex_t networkindex, NetworkSetti TempEvent.NetworkIndex = networkindex; String dummy; - NWPluginCall_( + do_NWPluginCall( NetworkDriverIndex, NWPlugin::Function::NWPLUGIN_LOAD_DEFAULTS, &TempEvent, dummy); } @@ -160,7 +160,7 @@ void handle_networks_CopySubmittedSettings_NWPluginCall(networkIndex_t networkin // Call network plugin to save CustomNetworkSettings String dummy; - NWPluginCall_(NetworkDriverIndex, NWPlugin::Function::NWPLUGIN_WEBFORM_SAVE, &TempEvent, dummy); + do_NWPluginCall(NetworkDriverIndex, NWPlugin::Function::NWPLUGIN_WEBFORM_SAVE, &TempEvent, dummy); } } @@ -231,7 +231,7 @@ void handle_networks_ShowAllNetworksTable() String str; - // const bool res = NWPluginCall_(NetworkDriverIndex, functions[i], &TempEvent, str); + // const bool res = do_NWPluginCall(NetworkDriverIndex, functions[i], &TempEvent, str); const bool res = NWPluginCall(functions[i], &TempEvent, str); if (functions[i] == NWPlugin::Function::NWPLUGIN_WEBFORM_SHOW_CONNECTED) { @@ -309,9 +309,9 @@ void handle_networks_NetworkSettingsPage(networkIndex_t networkindex) { TempEvent.NetworkIndex = networkindex; String str; - NWPluginCall_(networkDriverIndex, NWPlugin::Function::NWPLUGIN_WEBFORM_LOAD, &TempEvent, str); + do_NWPluginCall(networkDriverIndex, NWPlugin::Function::NWPLUGIN_WEBFORM_LOAD, &TempEvent, str); #ifdef ESP32 - if (NWPluginCall_(networkDriverIndex, NWPlugin::Function::NWPLUGIN_GET_INTERFACE, &TempEvent, str)) + if (do_NWPluginCall(networkDriverIndex, NWPlugin::Function::NWPLUGIN_GET_INTERFACE, &TempEvent, str)) { { addFormSubHeader(F("Network Interface")); From 4c814944bcf4769e7e0f0afc0250936d8a7e216f Mon Sep 17 00:00:00 2001 From: TD-er Date: Sun, 20 Jul 2025 01:06:56 +0200 Subject: [PATCH 138/564] [Network] Add WiFi/AP when not present in settings + limit options --- src/_NW001_WiFi_STA.cpp | 5 ++- src/_NW002_WiFi_AP.cpp | 12 +++++- src/_NW003_ETH_RMII.cpp | 2 + src/_NW004_ETH_SPI.cpp | 2 + src/_NW005_PPP_modem.cpp | 2 + src/src/DataStructs/NetworkDriverStruct.h | 9 +++- src/src/DataStructs/SettingsStruct.h | 7 +++- src/src/DataStructs_templ/SettingsStruct.cpp | 25 +++++++++-- src/src/Globals/NWPlugins.cpp | 1 + .../NW005_data_struct_PPP_modem.cpp | 2 + src/src/WebServer/NetworkPage.cpp | 41 +++++++++++-------- 11 files changed, 84 insertions(+), 24 deletions(-) diff --git a/src/_NW001_WiFi_STA.cpp b/src/_NW001_WiFi_STA.cpp index ddca2cb5c..c1cc859ca 100644 --- a/src/_NW001_WiFi_STA.cpp +++ b/src/_NW001_WiFi_STA.cpp @@ -44,7 +44,10 @@ bool NWPlugin_001(NWPlugin::Function function, struct EventStruct *event, String { case NWPlugin::Function::NWPLUGIN_DRIVER_ADD: { -// NetworkDriverStruct& nw = getNetworkDriverStruct(networkDriverIndex_t::toNetworkDriverIndex(event->idx)); + NetworkDriverStruct& nw = getNetworkDriverStruct(networkDriverIndex_t::toNetworkDriverIndex(event->idx)); + nw.onlySingleInstance = true; + nw.alwaysPresent = true; + nw.fixedNetworkIndex = NWPLUGIN_ID_001 -1; // Start counting at 0 break; } diff --git a/src/_NW002_WiFi_AP.cpp b/src/_NW002_WiFi_AP.cpp index da7ac436f..e18162355 100644 --- a/src/_NW002_WiFi_AP.cpp +++ b/src/_NW002_WiFi_AP.cpp @@ -39,7 +39,10 @@ bool NWPlugin_002(NWPlugin::Function function, struct EventStruct *event, String { case NWPlugin::Function::NWPLUGIN_DRIVER_ADD: { -// NetworkDriverStruct& nw = getNetworkDriverStruct(networkDriverIndex_t::toNetworkDriverIndex(event->idx)); + NetworkDriverStruct& nw = getNetworkDriverStruct(networkDriverIndex_t::toNetworkDriverIndex(event->idx)); + nw.onlySingleInstance = true; + nw.alwaysPresent = true; + nw.fixedNetworkIndex = NWPLUGIN_ID_002 - 1; // Start counting at 0 break; } @@ -122,12 +125,16 @@ bool NWPlugin_002(NWPlugin::Function function, struct EventStruct *event, String // Usually the AP will be started when no WiFi is defined, or the defined one cannot be found. This flag may prevent it. Settings.DoNotStartAP(isFormItemChecked(F("DoNotStartAP"))); +# ifdef ESP32 + Settings.WiFi_AP_enable_NAPT(isFormItemChecked(F("napt"))); +# endif break; } case NWPlugin::Function::NWPLUGIN_WEBFORM_LOAD: { + addFormSubHeader(F("Wifi AP Settings")); addFormPasswordBox(F("WPA AP Mode Key"), F("apkey"), SecuritySettings.WifiAPKey, 63); addFormNote(F("WPA Key must be at least 8 characters long")); @@ -140,6 +147,9 @@ bool NWPlugin_002(NWPlugin::Function function, struct EventStruct *event, String # else // if FEATURE_ETHERNET addFormNote(F("Do not allow to start an AP when configured WiFi cannot be found")); # endif // if FEATURE_ETHERNET + # ifdef ESP32 + addFormCheckBox(F("Enable NAPT"), F("napt"), Settings.WiFi_AP_enable_NAPT()); + # endif break; } diff --git a/src/_NW003_ETH_RMII.cpp b/src/_NW003_ETH_RMII.cpp index 18f203f09..2e716ecd8 100644 --- a/src/_NW003_ETH_RMII.cpp +++ b/src/_NW003_ETH_RMII.cpp @@ -42,6 +42,8 @@ bool NWPlugin_003(NWPlugin::Function function, struct EventStruct *event, String case NWPlugin::Function::NWPLUGIN_DRIVER_ADD: { NetworkDriverStruct& nw = getNetworkDriverStruct(networkDriverIndex_t::toNetworkDriverIndex(event->idx)); + nw.onlySingleInstance = true; + nw.alwaysPresent = false; break; } diff --git a/src/_NW004_ETH_SPI.cpp b/src/_NW004_ETH_SPI.cpp index 7677280ed..b581b482d 100644 --- a/src/_NW004_ETH_SPI.cpp +++ b/src/_NW004_ETH_SPI.cpp @@ -42,6 +42,8 @@ bool NWPlugin_004(NWPlugin::Function function, struct EventStruct *event, String case NWPlugin::Function::NWPLUGIN_DRIVER_ADD: { NetworkDriverStruct& nw = getNetworkDriverStruct(networkDriverIndex_t::toNetworkDriverIndex(event->idx)); + nw.onlySingleInstance = true; + nw.alwaysPresent = false; break; } diff --git a/src/_NW005_PPP_modem.cpp b/src/_NW005_PPP_modem.cpp index b20dda211..c8aa1dc4f 100644 --- a/src/_NW005_PPP_modem.cpp +++ b/src/_NW005_PPP_modem.cpp @@ -48,6 +48,8 @@ bool NWPlugin_005(NWPlugin::Function function, struct EventStruct *event, String case NWPlugin::Function::NWPLUGIN_DRIVER_ADD: { NetworkDriverStruct& nw = getNetworkDriverStruct(networkDriverIndex_t::toNetworkDriverIndex(event->idx)); + nw.onlySingleInstance = true; + nw.alwaysPresent = false; break; } diff --git a/src/src/DataStructs/NetworkDriverStruct.h b/src/src/DataStructs/NetworkDriverStruct.h index 1f7adbe2d..a643f118e 100644 --- a/src/src/DataStructs/NetworkDriverStruct.h +++ b/src/src/DataStructs/NetworkDriverStruct.h @@ -2,6 +2,9 @@ #define DATASTRUCTS_NETWORKDRIVERSTRUCT_H #include "../../ESPEasy_common.h" + +#include "../DataTypes/NetworkIndex.h" + #include /*********************************************************************************************\ @@ -11,9 +14,11 @@ struct NetworkDriverStruct { NetworkDriverStruct() = default; - + bool onlySingleInstance = true; + bool alwaysPresent = false; + networkIndex_t fixedNetworkIndex = INVALID_NETWORK_INDEX; }; -#endif \ No newline at end of file +#endif // ifndef DATASTRUCTS_NETWORKDRIVERSTRUCT_H diff --git a/src/src/DataStructs/SettingsStruct.h b/src/src/DataStructs/SettingsStruct.h index 5341929ff..ffae48031 100644 --- a/src/src/DataStructs/SettingsStruct.h +++ b/src/src/DataStructs/SettingsStruct.h @@ -229,6 +229,11 @@ class SettingsStruct_tmpl void WiFi_band_mode(wifi_band_mode_t value) { VariousBits_2.WiFi_band_mode = value; } #endif +#ifdef ESP32 + bool WiFi_AP_enable_NAPT() const { return VariousBits_2.WiFi_AP_enable_NAPT; } + void WiFi_AP_enable_NAPT(bool enable) { VariousBits_2.WiFi_AP_enable_NAPT = enable; } +#endif + // Flag indicating whether all task values should be sent in a single event or one event per task value (default behavior) bool CombineTaskValues_SingleEvent(taskIndex_t taskIndex) const; @@ -622,7 +627,7 @@ public: uint32_t PassiveWiFiScan : 1; // Bit 06 // inverted uint32_t ShowUnitOfMeasureOnDevicesPage : 1; // Bit 07 // inverted uint32_t WiFi_band_mode : 2; // Bit 08 & 09 - uint32_t unused_10 : 1; // Bit 10 + uint32_t WiFi_AP_enable_NAPT : 1; // Bit 10 uint32_t unused_11 : 1; // Bit 11 uint32_t unused_12 : 1; // Bit 12 uint32_t unused_13 : 1; // Bit 13 diff --git a/src/src/DataStructs_templ/SettingsStruct.cpp b/src/src/DataStructs_templ/SettingsStruct.cpp index 22f06762c..cf0594fab 100644 --- a/src/src/DataStructs_templ/SettingsStruct.cpp +++ b/src/src/DataStructs_templ/SettingsStruct.cpp @@ -9,14 +9,17 @@ #include "../CustomBuild/CompiletimeDefines.h" #include "../CustomBuild/ESPEasyLimits.h" #include "../DataStructs/DeviceStruct.h" -#include "../DataTypes/SPI_options.h" -#include "../DataTypes/NWPluginID.h" +#include "../DataStructs/NetworkDriverStruct.h" #include "../DataTypes/NPluginID.h" +#include "../DataTypes/NWPluginID.h" +#include "../DataTypes/NWPluginID.h" #include "../DataTypes/PluginID.h" -#include "../Globals/Plugins.h" +#include "../DataTypes/SPI_options.h" #include "../Globals/CPlugins.h" +#include "../Globals/Plugins.h" #include "../Helpers/Misc.h" #include "../Helpers/StringParser.h" +#include "../Helpers/_NWPlugin_init.h" #if FEATURE_I2C_MULTIPLE #include "../Helpers/Hardware_device_info.h" @@ -544,6 +547,22 @@ void SettingsStruct_tmpl::validate() { } #endif #endif + + // Make sure the WiFi and AP drivers are always added and set enabled when loading older settings, + // or factory default settings + for (networkDriverIndex_t index; validNetworkDriverIndex(index); ++index) + { + const NetworkDriverStruct& nw = getNetworkDriverStruct(index); + if (nw.alwaysPresent) { + if (validNetworkIndex(nw.fixedNetworkIndex)) { + const nwpluginID_t nwpluginID = getNWPluginID_from_NetworkDriverIndex(index); + if (getNWPluginID_for_network(nw.fixedNetworkIndex) != nwpluginID) { + setNWPluginID_for_network(nw.fixedNetworkIndex, nwpluginID); + setNetworkEnabled(nw.fixedNetworkIndex, true); + } + } + } + } } template diff --git a/src/src/Globals/NWPlugins.cpp b/src/src/Globals/NWPlugins.cpp index 60887e305..95dc9fbed 100644 --- a/src/src/Globals/NWPlugins.cpp +++ b/src/src/Globals/NWPlugins.cpp @@ -7,6 +7,7 @@ #include "../ESPEasyCore/ESPEasy_Log.h" #include "../Globals/Settings.h" +#include "../Globals/NWPlugins.h" #include "../Helpers/_NWPlugin_init.h" #include "../Helpers/PrintToString.h" diff --git a/src/src/NWPluginStructs/NW005_data_struct_PPP_modem.cpp b/src/src/NWPluginStructs/NW005_data_struct_PPP_modem.cpp index 37f35e1b9..950f7bec5 100644 --- a/src/src/NWPluginStructs/NW005_data_struct_PPP_modem.cpp +++ b/src/src/NWPluginStructs/NW005_data_struct_PPP_modem.cpp @@ -725,6 +725,7 @@ bool NW005_data_struct_PPP_modem::init(struct EventStruct *event) addLog(LOG_LEVEL_ERROR, F("PPP: Error PPP.begin")); return false; } + PPP.mode(ESP_MODEM_MODE_COMMAND); addLog(LOG_LEVEL_INFO, strformat(F("PPP: Module Name: %s, IMEI: %s"), PPP.moduleName().c_str(), @@ -736,6 +737,7 @@ bool NW005_data_struct_PPP_modem::init(struct EventStruct *event) bool NW005_data_struct_PPP_modem::exit(struct EventStruct *event) { + PPP.mode(ESP_MODEM_MODE_COMMAND); PPP.end(); _modem_initialized = false; diff --git a/src/src/WebServer/NetworkPage.cpp b/src/src/WebServer/NetworkPage.cpp index 4bd617a89..7e17a9597 100644 --- a/src/src/WebServer/NetworkPage.cpp +++ b/src/src/WebServer/NetworkPage.cpp @@ -248,9 +248,9 @@ void handle_networks_ShowAllNetworksTable() } /* - const NetworkDriverStruct& adapter = getNetworkDriverStruct(NetworkDriverIndex); + const NetworkDriverStruct& driver = getNetworkDriverStruct(NetworkDriverIndex); - if ((INVALID_NETWORKDRIVER_INDEX == NetworkDriverIndex) || adapter.usesPort) { + if ((INVALID_NETWORKDRIVER_INDEX == NetworkDriverIndex) || driver.usesPort) { addHtmlInt(13 == nwpluginID ? Settings.UDPPort : NetworkSettings->Port); // P2P/C013 exception } */ @@ -268,6 +268,15 @@ void handle_networks_ShowAllNetworksTable() void handle_networks_NetworkSettingsPage(networkIndex_t networkindex) { if (!validNetworkIndex(networkindex)) { return; } + const networkDriverIndex_t networkDriverIndex = + getNetworkDriverIndex_from_NWPluginID( + Settings.getNWPluginID_for_network(networkindex)); + const NetworkDriverStruct& cur_driver = getNetworkDriverStruct(networkDriverIndex); + + const bool networkDriverSelectorDisabled = cur_driver.alwaysPresent && validNetworkIndex(cur_driver.fixedNetworkIndex) && + networkindex == cur_driver.fixedNetworkIndex; + + // Show network settings page { html_table_class_normal(); @@ -275,27 +284,26 @@ void handle_networks_NetworkSettingsPage(networkIndex_t networkindex) { addRowLabel(F("Network Driver")); const nwpluginID_t choice = Settings.getNWPluginID_for_network(networkindex); - addSelector_Head_reloadOnChange(F("networkDriver")); + addSelector_Head_reloadOnChange(F("networkDriver"), F("wide"), networkDriverSelectorDisabled); addSelector_Item(F("- Standalone -"), 0, false, false, EMPTY_STRING); networkDriverIndex_t networkDriverIndex{}; while (validNetworkDriverIndex(networkDriverIndex)) { - const nwpluginID_t number = getNWPluginID_from_NetworkDriverIndex(networkDriverIndex); - boolean disabled = false; // !((networkindex == 0) || !NetworkDriver[x].usesMQTT); + const NetworkDriverStruct& driver = getNetworkDriverStruct(networkDriverIndex); + const nwpluginID_t number = getNWPluginID_from_NetworkDriverIndex(networkDriverIndex); + const bool disabled = driver.alwaysPresent && + validNetworkIndex(driver.fixedNetworkIndex) && + networkindex != driver.fixedNetworkIndex; addSelector_Item(getNWPluginNameFromNetworkDriverIndex(networkDriverIndex), number.value, choice == number, disabled); ++networkDriverIndex; } - addSelector_Foot(true); + addSelector_Foot(!networkDriverSelectorDisabled); } - const networkDriverIndex_t networkDriverIndex = - getNetworkDriverIndex_from_NWPluginID( - Settings.getNWPluginID_for_network(networkindex)); - const NetworkDriverStruct& driver = getNetworkDriverStruct(networkDriverIndex); # ifndef LIMIT_BUILD_SIZE addRTDNetworkDriverButton(getNWPluginID_from_NetworkDriverIndex(networkDriverIndex)); @@ -310,7 +318,8 @@ void handle_networks_NetworkSettingsPage(networkIndex_t networkindex) { String str; do_NWPluginCall(networkDriverIndex, NWPlugin::Function::NWPLUGIN_WEBFORM_LOAD, &TempEvent, str); -#ifdef ESP32 +# ifdef ESP32 + if (do_NWPluginCall(networkDriverIndex, NWPlugin::Function::NWPLUGIN_GET_INTERFACE, &TempEvent, str)) { { @@ -326,10 +335,10 @@ void handle_networks_NetworkSettingsPage(networkIndex_t networkindex) { NWPlugin::NetforkFlags::EventIPmodified, NWPlugin::NetforkFlags::isPPP, NWPlugin::NetforkFlags::isBridge, -# if CONFIG_LWIP_IPV6 +# if CONFIG_LWIP_IPV6 NWPlugin::NetforkFlags::MLD_v6_report, NWPlugin::NetforkFlags::IPv6_autoconf_enabled, -# endif // if CONFIG_LWIP_IPV6 +# endif // if CONFIG_LWIP_IPV6 }; addRowLabel(F("Flags")); @@ -362,14 +371,14 @@ void handle_networks_NetworkSettingsPage(networkIndex_t networkindex) { NWPlugin::IP_type::gateway, NWPlugin::IP_type::dns1, NWPlugin::IP_type::dns2, -# if CONFIG_LWIP_IPV6 +# if CONFIG_LWIP_IPV6 NWPlugin::IP_type::ipv6_unknown, NWPlugin::IP_type::ipv6_global, NWPlugin::IP_type::ipv6_link_local, NWPlugin::IP_type::ipv6_site_local, NWPlugin::IP_type::ipv6_unique_local, NWPlugin::IP_type::ipv4_mapped_ipv6, -# endif // if CONFIG_LWIP_IPV6 +# endif // if CONFIG_LWIP_IPV6 }; @@ -384,7 +393,7 @@ void handle_networks_NetworkSettingsPage(networkIndex_t networkindex) { } } } -#endif +# endif // ifdef ESP32 addFormSeparator(2); From e850483e98e72a61e19972feaebdd3552b7310df Mon Sep 17 00:00:00 2001 From: TD-er Date: Sun, 20 Jul 2025 01:07:43 +0200 Subject: [PATCH 139/564] [Plugin] Rename PluginCall functions to use same convention as controllers --- src/src/Globals/Plugins.cpp | 26 +++++++++---------- src/src/Helpers/Scheduler_PluginTimer.cpp | 2 +- .../Helpers/Scheduler_SystemEventTimer.cpp | 2 +- src/src/Helpers/_Plugin_init.cpp | 12 ++++----- src/src/Helpers/_Plugin_init.h | 4 +-- src/src/WebServer/DevicesPage.cpp | 2 +- 6 files changed, 24 insertions(+), 24 deletions(-) diff --git a/src/src/Globals/Plugins.cpp b/src/src/Globals/Plugins.cpp index d71dfaeee..00a003e07 100644 --- a/src/src/Globals/Plugins.cpp +++ b/src/src/Globals/Plugins.cpp @@ -39,7 +39,7 @@ bool validDeviceIndex(deviceIndex_t index) { - return validDeviceIndex_init(index); + return do_check_validDeviceIndex(index); } /* @@ -127,7 +127,7 @@ String getPluginNameFromDeviceIndex(deviceIndex_t deviceIndex) { String deviceName; if (validDeviceIndex(deviceIndex)) { - PluginCall(deviceIndex, PLUGIN_GET_DEVICENAME, nullptr, deviceName); + do_PluginCall(deviceIndex, PLUGIN_GET_DEVICENAME, nullptr, deviceName); } return deviceName; } @@ -149,7 +149,7 @@ bool checkPluginI2CAddressFromDeviceIndex(deviceIndex_t deviceIndex, uint8_t i2c String dummy; struct EventStruct TempEvent; TempEvent.Par1 = i2cAddress; - hasI2CAddress = PluginCall(deviceIndex, PLUGIN_I2C_HAS_ADDRESS, &TempEvent, dummy); + hasI2CAddress = do_PluginCall(deviceIndex, PLUGIN_I2C_HAS_ADDRESS, &TempEvent, dummy); } return hasI2CAddress; } @@ -168,7 +168,7 @@ bool getPluginDisplayParametersFromTaskIndex(taskIndex_t taskIndex, uint16_t& x, struct EventStruct TempEvent; TempEvent.setTaskIndex(taskIndex); - if (PluginCall(deviceIndex, PLUGIN_GET_DISPLAY_PARAMETERS, &TempEvent, dummy)) { + if (do_PluginCall(deviceIndex, PLUGIN_GET_DISPLAY_PARAMETERS, &TempEvent, dummy)) { x = TempEvent.Par1; y = TempEvent.Par2; r = TempEvent.Par3; @@ -191,7 +191,7 @@ uint8_t getTaskI2CAddress(taskIndex_t taskIndex) { TempEvent.setTaskIndex(taskIndex); TempEvent.Par1 = 0; - if (PluginCall(deviceIndex, PLUGIN_I2C_GET_ADDRESS, &TempEvent, dummy)) { + if (do_PluginCall(deviceIndex, PLUGIN_I2C_GET_ADDRESS, &TempEvent, dummy)) { getI2CAddress = TempEvent.Par1; } } @@ -430,7 +430,7 @@ bool PluginCallForTask(taskIndex_t taskIndex, uint8_t Function, EventStruct *Tem } START_TIMER; - retval = (PluginCall(DeviceIndex, Function, TempEvent, command)); + retval = (do_PluginCall(DeviceIndex, Function, TempEvent, command)); STOP_TIMER_TASK(DeviceIndex, Function); @@ -546,7 +546,7 @@ bool PluginCall(uint8_t Function, struct EventStruct *event, String& str) I2CSelectHighClockSpeed(i2cBus); // Switch to requested bus, no need to switch back, // next I2C plugin call will switch to desired bus #endif // if FEATURE_I2C_MULTIPLE - PluginCall(DeviceIndex, Function, &TempEvent, str); + do_PluginCall(DeviceIndex, Function, &TempEvent, str); STOP_TIMER_TASK(DeviceIndex, Function); } } @@ -653,7 +653,7 @@ bool PluginCall(uint8_t Function, struct EventStruct *event, String& str) if (Function == PLUGIN_REQUEST) { // @FIXME TD-er: work-around as long as gpio command is still performed in P001_switch. for (deviceIndex_t deviceIndex = 0; validDeviceIndex(deviceIndex); deviceIndex++) { - if (PluginCall(deviceIndex, Function, event, str)) { + if (do_PluginCall(deviceIndex, Function, event, str)) { delay(0); // SMY: call delay(0) unconditionally CPluginCall(CPlugin::Function::CPLUGIN_ACKNOWLEDGE, event, str); return true; @@ -871,7 +871,7 @@ bool PluginCall(uint8_t Function, struct EventStruct *event, String& str) // It may be better if ranges are set in the call for default values and error values set via PLUGIN_INIT. // Also these may be plugin specific so perhaps create a helper function to load/save these values and call these helpers from the // plugin code. - PluginCall(DeviceIndex, PLUGIN_INIT_VALUE_RANGES, event, str); // Initialize value range(s) + do_PluginCall(DeviceIndex, PLUGIN_INIT_VALUE_RANGES, event, str); // Initialize value range(s) } if ((Function == PLUGIN_INIT) @@ -895,7 +895,7 @@ bool PluginCall(uint8_t Function, struct EventStruct *event, String& str) } if (performPluginCall) { - retval = PluginCall(DeviceIndex, Function, event, str); + retval = do_PluginCall(DeviceIndex, Function, event, str); } else { retval = event->Source == EventValueSource::Enum::VALUE_SOURCE_UDP; } @@ -904,7 +904,7 @@ bool PluginCall(uint8_t Function, struct EventStruct *event, String& str) if (!retval) { String errorStr; - if (PluginCall(DeviceIndex, PLUGIN_READ_ERROR_OCCURED, event, errorStr)) + if (do_PluginCall(DeviceIndex, PLUGIN_READ_ERROR_OCCURED, event, errorStr)) { // Apparently the last read call resulted in an error // Send event indicating the error. @@ -1044,7 +1044,7 @@ bool PluginCall(uint8_t Function, struct EventStruct *event, String& str) } } - bool retval = PluginCall(DeviceIndex, Function, event, str); + bool retval = do_PluginCall(DeviceIndex, Function, event, str); // Calls may have updated ExtraTaskSettings, so validate them. ExtraTaskSettings.validate(); @@ -1106,7 +1106,7 @@ bool PluginCall(uint8_t Function, struct EventStruct *event, String& str) if (Function == PLUGIN_GET_DEVICEVTYPE) { event->sensorType = Device[DeviceIndex].VType; } - bool retval = PluginCall(DeviceIndex, Function, event, str); + bool retval = do_PluginCall(DeviceIndex, Function, event, str); if (Function == PLUGIN_GET_DEVICEVALUECOUNT) { // Check if we have a valid value count. diff --git a/src/src/Helpers/Scheduler_PluginTimer.cpp b/src/src/Helpers/Scheduler_PluginTimer.cpp index d015fb0f3..46c675a60 100644 --- a/src/src/Helpers/Scheduler_PluginTimer.cpp +++ b/src/src/Helpers/Scheduler_PluginTimer.cpp @@ -66,7 +66,7 @@ void ESPEasy_Scheduler::process_plugin_timer(SchedulerTimerID id) { if (validDeviceIndex(deviceIndex)) { String dummy; - PluginCall(deviceIndex, PLUGIN_DEVICETIMER_IN, &TempEvent, dummy); + do_PluginCall(deviceIndex, PLUGIN_DEVICETIMER_IN, &TempEvent, dummy); } STOP_TIMER(PLUGIN_CALL_DEVICETIMER_IN); } diff --git a/src/src/Helpers/Scheduler_SystemEventTimer.cpp b/src/src/Helpers/Scheduler_SystemEventTimer.cpp index 686c54a42..8da3b59b7 100644 --- a/src/src/Helpers/Scheduler_SystemEventTimer.cpp +++ b/src/src/Helpers/Scheduler_SystemEventTimer.cpp @@ -200,7 +200,7 @@ void ESPEasy_Scheduler::process_system_event_queue() { // FIXME TD-er: LoadTaskSettings should only be called when needed, not pre-emptive. LoadTaskSettings(ScheduledEventQueue.front().event.TaskIndex); } - PluginCall(deviceIndex, + do_PluginCall(deviceIndex, Function, &ScheduledEventQueue.front().event, tmpString); diff --git a/src/src/Helpers/_Plugin_init.cpp b/src/src/Helpers/_Plugin_init.cpp index 9365b8d79..76401f6d6 100644 --- a/src/src/Helpers/_Plugin_init.cpp +++ b/src/src/Helpers/_Plugin_init.cpp @@ -2172,14 +2172,14 @@ deviceIndex_t getDeviceIndex_from_PluginID(pluginID_t pluginID) pluginID_t getPluginID_from_DeviceIndex(deviceIndex_t deviceIndex) { - if (validDeviceIndex_init(deviceIndex)) + if (do_check_validDeviceIndex(deviceIndex)) { return pluginID_t::toPluginID(pgm_read_byte(DeviceIndex_to_Plugin_id + deviceIndex.value)); } return INVALID_PLUGIN_ID; } -bool validDeviceIndex_init(deviceIndex_t deviceIndex) +bool do_check_validDeviceIndex(deviceIndex_t deviceIndex) { if (_Plugin_init_setupDone) { return deviceIndex < DeviceIndex_to_Plugin_id_size; @@ -2190,16 +2190,16 @@ bool validDeviceIndex_init(deviceIndex_t deviceIndex) // Array containing "DeviceIndex" alfabetically sorted. deviceIndex_t getDeviceIndex_sorted(deviceIndex_t deviceIndex) { - if (validDeviceIndex_init(deviceIndex)) { + if (do_check_validDeviceIndex(deviceIndex)) { return DeviceIndex_sorted[deviceIndex.value]; } return INVALID_DEVICE_INDEX; } -boolean PluginCall(deviceIndex_t deviceIndex, uint8_t function, struct EventStruct *event, String& string) +boolean do_PluginCall(deviceIndex_t deviceIndex, uint8_t function, struct EventStruct *event, String& string) { - if (validDeviceIndex_init(deviceIndex)) + if (do_check_validDeviceIndex(deviceIndex)) { Plugin_ptr_t plugin_call = (Plugin_ptr_t)pgm_read_ptr(Plugin_ptr + deviceIndex.value); return plugin_call(function, event, string); @@ -2240,7 +2240,7 @@ void PluginSetup() struct EventStruct TempEvent; TempEvent.idx = deviceIndex.value; String dummy; - PluginCall(deviceIndex, PLUGIN_DEVICE_ADD, &TempEvent, dummy); + do_PluginCall(deviceIndex, PLUGIN_DEVICE_ADD, &TempEvent, dummy); } } } diff --git a/src/src/Helpers/_Plugin_init.h b/src/src/Helpers/_Plugin_init.h index 512c61038..81baa3d86 100644 --- a/src/src/Helpers/_Plugin_init.h +++ b/src/src/Helpers/_Plugin_init.h @@ -12,13 +12,13 @@ struct EventStruct; deviceIndex_t getDeviceIndex_from_PluginID(pluginID_t pluginID); pluginID_t getPluginID_from_DeviceIndex(deviceIndex_t deviceIndex); -bool validDeviceIndex_init(deviceIndex_t deviceIndex); +bool do_check_validDeviceIndex(deviceIndex_t deviceIndex); // Array containing "DeviceIndex" alfabetically sorted. deviceIndex_t getDeviceIndex_sorted(deviceIndex_t deviceIndex); -boolean PluginCall(deviceIndex_t deviceIndex, uint8_t function, struct EventStruct *event, String& string); +boolean do_PluginCall(deviceIndex_t deviceIndex, uint8_t function, struct EventStruct *event, String& string); // Get the sizeof() in number of bits for the number of actually included plugins in the build unsigned getNrBitsDeviceIndex(); diff --git a/src/src/WebServer/DevicesPage.cpp b/src/src/WebServer/DevicesPage.cpp index 16124ed51..b203678ef 100644 --- a/src/src/WebServer/DevicesPage.cpp +++ b/src/src/WebServer/DevicesPage.cpp @@ -475,7 +475,7 @@ void handle_devices_CopySubmittedSettings(taskIndex_t taskIndex, pluginID_t task if (device.ErrorStateValues) { // FIXME TD-er: Must collect these from the web page. - PluginCall(DeviceIndex, PLUGIN_INIT_VALUE_RANGES, &TempEvent, dummy); + do_PluginCall(DeviceIndex, PLUGIN_INIT_VALUE_RANGES, &TempEvent, dummy); } // Make sure the task needs to reload using the new settings. From e7dabc72e5fcb4dfd7f173cdbf9e8e9607d33d47 Mon Sep 17 00:00:00 2001 From: TD-er Date: Sun, 20 Jul 2025 16:04:05 +0200 Subject: [PATCH 140/564] [PPP Modem] Make PPP.begin() non-blocking by running in RTOS task --- src/_NW001_WiFi_STA.cpp | 2 +- src/_NW002_WiFi_AP.cpp | 2 +- src/_NW005_PPP_modem.cpp | 46 ++- .../DataTypes/ESPEasy_plugin_functions.cpp | 32 +- src/src/DataTypes/ESPEasy_plugin_functions.h | 15 +- src/src/Globals/NWPlugins.cpp | 5 +- .../NW005_data_struct_PPP_modem.cpp | 310 ++++++++++++------ .../NW005_data_struct_PPP_modem.h | 46 ++- src/src/WebServer/NetworkPage.cpp | 24 +- 9 files changed, 357 insertions(+), 125 deletions(-) diff --git a/src/_NW001_WiFi_STA.cpp b/src/_NW001_WiFi_STA.cpp index c1cc859ca..5821d47ab 100644 --- a/src/_NW001_WiFi_STA.cpp +++ b/src/_NW001_WiFi_STA.cpp @@ -97,7 +97,7 @@ bool NWPlugin_001(NWPlugin::Function function, struct EventStruct *event, String break; } - case NWPlugin::Function::NWPLUGIN_WEBFORM_SHOW_MAC: + case NWPlugin::Function::NWPLUGIN_WEBFORM_SHOW_HW_ADDRESS: { string = WiFi.macAddress(); success = true; diff --git a/src/_NW002_WiFi_AP.cpp b/src/_NW002_WiFi_AP.cpp index e18162355..cbaa277b4 100644 --- a/src/_NW002_WiFi_AP.cpp +++ b/src/_NW002_WiFi_AP.cpp @@ -92,7 +92,7 @@ bool NWPlugin_002(NWPlugin::Function function, struct EventStruct *event, String } # ifdef ESP8266 - case NWPlugin::Function::NWPLUGIN_WEBFORM_SHOW_MAC: + case NWPlugin::Function::NWPLUGIN_WEBFORM_SHOW_HW_ADDRESS: { string = WiFi.softAPmacAddress(); success = true; diff --git a/src/_NW005_PPP_modem.cpp b/src/_NW005_PPP_modem.cpp index c8aa1dc4f..42767b80d 100644 --- a/src/_NW005_PPP_modem.cpp +++ b/src/_NW005_PPP_modem.cpp @@ -49,7 +49,7 @@ bool NWPlugin_005(NWPlugin::Function function, struct EventStruct *event, String { NetworkDriverStruct& nw = getNetworkDriverStruct(networkDriverIndex_t::toNetworkDriverIndex(event->idx)); nw.onlySingleInstance = true; - nw.alwaysPresent = false; + nw.alwaysPresent = false; break; } @@ -62,8 +62,12 @@ bool NWPlugin_005(NWPlugin::Function function, struct EventStruct *event, String # ifdef ESP32 case NWPlugin::Function::NWPLUGIN_GET_INTERFACE: { - event->networkInterface = &PPP; - success = event->networkInterface != nullptr; + NW005_data_struct_PPP_modem *NW_data = static_cast(getNWPluginData(event->NetworkIndex)); + + if (NW_data && NW_data->attached()) { + event->networkInterface = &PPP; + success = event->networkInterface != nullptr; + } break; } # endif // ifdef ESP32 @@ -71,20 +75,44 @@ bool NWPlugin_005(NWPlugin::Function function, struct EventStruct *event, String case NWPlugin::Function::NWPLUGIN_WEBFORM_SHOW_CONNECTED: { - success = PPP.attached(); + NW005_data_struct_PPP_modem *NW_data = static_cast(getNWPluginData(event->NetworkIndex)); - if (success) { - string = strformat( - F("%s (%s dBm)"), - PPP.operatorName().c_str(), - NW005_data_struct_PPP_modem::getRSSI().c_str()); + if (NW_data) { + success = NW_data->attached(); + + if (success) { + string = strformat( + F("%s (%s dBm)"), + NW_data->operatorName().c_str(), + NW_data->getRSSI().c_str()); + } } break; } + case NWPlugin::Function::NWPLUGIN_WEBFORM_SHOW_HW_ADDRESS: + { + NW005_data_struct_PPP_modem *NW_data = static_cast(getNWPluginData(event->NetworkIndex)); + + if (NW_data) { + string = NW_data->IMEI(); + event->String1 = F("IMEI"); + } + + // Still mark success = true to prevent a call to get the MAC address + success = true; + break; + } + + case NWPlugin::Function::NWPLUGIN_WEBFORM_SHOW_PORT: { + NW005_data_struct_PPP_modem *NW_data = static_cast(getNWPluginData(event->NetworkIndex)); + + if (NW_data) { + success = NW_data->webform_getPort(string); + } break; } diff --git a/src/src/DataTypes/ESPEasy_plugin_functions.cpp b/src/src/DataTypes/ESPEasy_plugin_functions.cpp index db4c1f8b9..f0465387e 100644 --- a/src/src/DataTypes/ESPEasy_plugin_functions.cpp +++ b/src/src/DataTypes/ESPEasy_plugin_functions.cpp @@ -10,7 +10,7 @@ bool NWPlugin::canQueryViaNetworkInterface(NWPlugin::Function function) { // TD-er: Do not try to fetch hostname via base class. No idea why, but it doesn't work well case NWPlugin::Function::NWPLUGIN_WEBFORM_SHOW_HOSTNAME: - case NWPlugin::Function::NWPLUGIN_WEBFORM_SHOW_MAC: + case NWPlugin::Function::NWPLUGIN_WEBFORM_SHOW_HW_ADDRESS: case NWPlugin::Function::NWPLUGIN_WEBFORM_SHOW_IP: return true; default: break; @@ -18,6 +18,36 @@ bool NWPlugin::canQueryViaNetworkInterface(NWPlugin::Function function) return false; } +const __FlashStringHelper * NWPlugin::toString(ConnectionState connectionState, bool asUnicodeSymbol) +{ + if (asUnicodeSymbol) { + switch (connectionState) + { + case NWPlugin::ConnectionState::Disabled: return F("❌"); // Same icon as used everywhere else in ESPEasy to + // indicate disabled + case NWPlugin::ConnectionState::Error: return F("⚠"); // Warning Emoji + case NWPlugin::ConnectionState::Initializing: return F("⏳"); // Hourglass Not Done Emoji + case NWPlugin::ConnectionState::Connecting: return F("⏶⏳"); // LinkUp & Initializing + case NWPlugin::ConnectionState::LinkDown: return F("🔻"); // Red Triangle Pointed Down Emoji + case NWPlugin::ConnectionState::LinkUp: return F("⏶"); // Black Medium Up-Pointing Triangle + case NWPlugin::ConnectionState::Connected: return F("🔗"); // Link Emoji + } + } + else { + switch (connectionState) + { + case NWPlugin::ConnectionState::Disabled: return F("Disabled"); + case NWPlugin::ConnectionState::Error: return F("Error"); + case NWPlugin::ConnectionState::Initializing: return F("Initializing"); + case NWPlugin::ConnectionState::Connecting: return F("Connecting"); + case NWPlugin::ConnectionState::LinkDown: return F("LinkDown"); + case NWPlugin::ConnectionState::LinkUp: return F("LinkUp"); + case NWPlugin::ConnectionState::Connected: return F("Connected"); + } + } + return F(""); +} + const __FlashStringHelper * NWPlugin::toString(NWPlugin::IP_type ip_type) { switch (ip_type) diff --git a/src/src/DataTypes/ESPEasy_plugin_functions.h b/src/src/DataTypes/ESPEasy_plugin_functions.h index e1180580f..3de93de74 100644 --- a/src/src/DataTypes/ESPEasy_plugin_functions.h +++ b/src/src/DataTypes/ESPEasy_plugin_functions.h @@ -125,12 +125,25 @@ class NWPlugin { public: + enum class ConnectionState { + Disabled, + Error, + Initializing, // e.g. power-on sequence of PPP modem may take quite long + Connecting, + LinkDown, + LinkUp, + Connected + }; + + static const __FlashStringHelper* toString(ConnectionState connectionState, bool asUnicodeSymbol = false); + // As these function values are also used in the timing stats, make sure there is no overlap with the PLUGIN_xxx numbering. enum class Function { NWPLUGIN_DRIVER_ADD = 192, // Called at boot for letting a network adapter adding itself to list of available controllers NWPLUGIN_CONNECT_SUCCESS, // Only used for timing stats NWPLUGIN_CONNECT_FAIL, // Only used for timing stats + NWPLUGIN_CONNECTION_STATE, NWPLUGIN_DRIVER_TEMPLATE, NWPLUGIN_LOAD_DEFAULTS, NWPLUGIN_GET_DEVICENAME, @@ -148,7 +161,7 @@ public: #endif NWPLUGIN_WEBFORM_SHOW_CONNECTED, // Used for showing connected state/speed NWPLUGIN_WEBFORM_SHOW_HOSTNAME, // Used for showing hostname - NWPLUGIN_WEBFORM_SHOW_MAC, // Used for showing MAC + NWPLUGIN_WEBFORM_SHOW_HW_ADDRESS, // Used for showing MAC NWPLUGIN_WEBFORM_SHOW_IP, // Used for showing IP NWPLUGIN_WEBFORM_SHOW_PORT // Used for showing host information for the network adapter. diff --git a/src/src/Globals/NWPlugins.cpp b/src/src/Globals/NWPlugins.cpp index 95dc9fbed..c47b3e481 100644 --- a/src/src/Globals/NWPlugins.cpp +++ b/src/src/Globals/NWPlugins.cpp @@ -91,7 +91,7 @@ bool NWPluginCall(NWPlugin::Function Function, struct EventStruct *event, String case NWPlugin::Function::NWPLUGIN_GET_PARAMETER_DISPLAY_NAME: case NWPlugin::Function::NWPLUGIN_WEBFORM_SHOW_CONNECTED: case NWPlugin::Function::NWPLUGIN_WEBFORM_SHOW_HOSTNAME: - case NWPlugin::Function::NWPLUGIN_WEBFORM_SHOW_MAC: + case NWPlugin::Function::NWPLUGIN_WEBFORM_SHOW_HW_ADDRESS: case NWPlugin::Function::NWPLUGIN_WEBFORM_SHOW_IP: case NWPlugin::Function::NWPLUGIN_WEBFORM_SHOW_PORT: { @@ -127,8 +127,9 @@ bool NWPluginCall(NWPlugin::Function Function, struct EventStruct *event, String success = true; break; - case NWPlugin::Function::NWPLUGIN_WEBFORM_SHOW_MAC: + case NWPlugin::Function::NWPLUGIN_WEBFORM_SHOW_HW_ADDRESS: str = event->networkInterface->macAddress(); + event->String1 = F("MAC"); success = true; break; diff --git a/src/src/NWPluginStructs/NW005_data_struct_PPP_modem.cpp b/src/src/NWPluginStructs/NW005_data_struct_PPP_modem.cpp index 950f7bec5..0ace0de19 100644 --- a/src/src/NWPluginStructs/NW005_data_struct_PPP_modem.cpp +++ b/src/src/NWPluginStructs/NW005_data_struct_PPP_modem.cpp @@ -29,7 +29,7 @@ # define NW005_KEY_FLOWCTRL 10 # define NW005_KEY_MODEM_MODEL 11 # define NW005_KEY_APN 12 -# define NW005_KEY_PIN 13 +# define NW005_KEY_SIM_PIN 13 const __FlashStringHelper* NW005_getLabelString(uint32_t key, bool displayString, ESPEasy_key_value_store::StorageType& storageType) { @@ -59,7 +59,7 @@ const __FlashStringHelper* NW005_getLabelString(uint32_t key, bool displayString case NW005_KEY_APN: storageType = ESPEasy_key_value_store::StorageType::string_type; return displayString ? F("Access Point Name (APN)") : F("apn"); - case NW005_KEY_PIN: + case NW005_KEY_SIM_PIN: storageType = ESPEasy_key_value_store::StorageType::string_type; return displayString ? F("SIM Card Pin") : F("pin"); @@ -80,8 +80,13 @@ WebFormItemParams NW005_makeWebFormItemParams(uint32_t key) { } NW005_data_struct_PPP_modem::~NW005_data_struct_PPP_modem() { + if (_modem_task_data.modem_taskHandle) { + vTaskDelete(_modem_task_data.modem_taskHandle); + _modem_task_data.modem_taskHandle = nullptr; + } + PPP.mode(ESP_MODEM_MODE_COMMAND); PPP.end(); - _modem_initialized = false; + _modem_task_data.modem_initialized = false; } enum class NW005_modem_model { @@ -122,8 +127,9 @@ ppp_modem_model_t to_ppp_modem_model_t(NW005_modem_model NW005_modemmodel) return PPP_MODEM_GENERIC; } -String NW005_data_struct_PPP_modem::getRSSI() +String NW005_data_struct_PPP_modem::getRSSI() const { + if (!_modem_task_data.modem_initialized) { return F("-"); } const int rssi_raw = PPP.RSSI(); if (rssi_raw == 99) { return F("-"); } // Not known or not detectable @@ -134,23 +140,43 @@ String NW005_data_struct_PPP_modem::getRSSI() return String(map(rssi_raw, 2, 30, -109, -53)); } -String NW005_data_struct_PPP_modem::getBER() +String NW005_data_struct_PPP_modem::getBER() const { - switch (PPP.BER()) - { - case 0: return F("<0.01 %"); - case 1: return F("0.01 % ... 0.1 %"); - case 2: return F("0.1 % ... 0.5 %"); - case 3: return F("0.5 % ... 1 %"); - case 4: return F("1 % ... 2 %"); - case 5: return F("2 % ... 4 %"); - case 6: return F("4 % ... 8 %"); - case 7: return F(">= 8 %"); - case 99: break; // Not known or not detectable + if (_modem_task_data.modem_initialized) { + switch (PPP.BER()) + { + case 0: return F("<0.01 %"); + case 1: return F("0.01 % ... 0.1 %"); + case 2: return F("0.1 % ... 0.5 %"); + case 3: return F("0.5 % ... 1 %"); + case 4: return F("1 % ... 2 %"); + case 5: return F("2 % ... 4 %"); + case 6: return F("4 % ... 8 %"); + case 7: return F(">= 8 %"); + case 99: break; // Not known or not detectable + } } return F("-"); } +bool NW005_data_struct_PPP_modem::attached() const +{ + if (!_modem_task_data.modem_initialized) { return false; } + return PPP.attached(); +} + +String NW005_data_struct_PPP_modem::IMEI() const +{ + if (!_modem_task_data.modem_initialized) { return EMPTY_STRING; } + return PPP.IMEI(); +} + +String NW005_data_struct_PPP_modem::operatorName() const +{ + if (!_modem_task_data.modem_initialized) { return EMPTY_STRING; } + return PPP.operatorName(); +} + const __FlashStringHelper* NW005_decode_label(int sysmode_index, uint8_t i, String& value_str) { const __FlashStringHelper*res = F(""); @@ -202,28 +228,29 @@ const __FlashStringHelper* NW005_decode_label(int sysmode_index, uint8_t i, Stri }; if (i < NR_ELEMENTS(labels)) { - res = labels[i]; - switch (i) - { - case 10: + res = labels[i]; + + switch (i) + { + case 10: // RSRQ - { - float val = value_str.toInt(); - val -= 40; - val /= 2.0f; - value_str = String(val, 1) + F(" [dBm]"); - } + { + float val = value_str.toInt(); + val -= 40; + val /= 2.0f; + value_str = String(val, 1) + F(" [dBm]"); break; - case 11: + } + case 11: // RSRP value_str = strformat(F("%d [dBm]"), value_str.toInt() - 140); break; - case 12: + case 12: // RSSI value_str = strformat(F("%d [dBm]"), value_str.toInt() - 110); break; - } - + } + } break; } @@ -236,9 +263,9 @@ void NW005_data_struct_PPP_modem::webform_load_UE_system_information() String res = PPP.cmd("AT+CPSI?", 1000); if (!res.isEmpty() /* && res.startsWith(F("+CPSI"))*/) { - int start_index = 0; - int end_index = res.indexOf(','); - const String systemMode = res.substring(start_index, end_index); + int start_index = 0; + int end_index = res.indexOf(','); + const String systemMode = res.substring(start_index, end_index); addLog(LOG_LEVEL_INFO, concat(F("PPP: UE sysinfo: "), systemMode)); const __FlashStringHelper*sysmode_str[] = { @@ -259,15 +286,15 @@ void NW005_data_struct_PPP_modem::webform_load_UE_system_information() for (int i = 0; start_index < res.length() && end_index != -1 && i < 15; ++i) { - String value_str = res.substring(start_index, end_index); + String value_str = res.substring(start_index, end_index); const String label = NW005_decode_label(sysmode_index, i, value_str); if (!label.isEmpty()) { addRowLabel(label); - if (i == 0) { - // We have some leading characters left here, so use the 'clean' strings - addHtml(sysmode_str[sysmode_index]); + if (i == 0) { + // We have some leading characters left here, so use the 'clean' strings + addHtml(sysmode_str[sysmode_index]); } else { addHtml_pre(value_str); } @@ -356,39 +383,13 @@ void NW005_data_struct_PPP_modem::webform_load(struct EventStruct *event) for (int i = NW005_KEY_PIN_RX; i <= NW005_KEY_PIN_RESET; ++i) { ESPEasy_key_value_store::StorageType storageType; - PinSelectPurpose purpose = PinSelectPurpose::Generic; - String label = NW005_getLabelString(i, true, storageType); const __FlashStringHelper *id = NW005_getLabelString(i, false, storageType); - - switch (i) - { - case NW005_KEY_PIN_RX: - purpose = PinSelectPurpose::Serial_input; - label = formatGpioName_serialRX(false); - break; - case NW005_KEY_PIN_TX: - purpose = PinSelectPurpose::Serial_output; - label = formatGpioName_serialTX(false); - break; - case NW005_KEY_PIN_CTS: - purpose = PinSelectPurpose::Generic_input; - label = formatGpioName( - label, gpio_direction::gpio_input, true); - break; - case NW005_KEY_PIN_RTS: - purpose = PinSelectPurpose::Generic_output; - label = formatGpioName( - label, gpio_direction::gpio_output, true); - break; - case NW005_KEY_PIN_RESET: - purpose = PinSelectPurpose::Generic_output; - label = formatGpioName( - label, gpio_direction::gpio_output, true); - break; - } + PinSelectPurpose purpose = PinSelectPurpose::Generic; + String label = NW005_formatGpioLabel(i, purpose); int8_t pin = -1; _kvs->getValue(i, pin); + addFormPinSelect(purpose, label, id, pin); } showWebformItem( @@ -432,16 +433,24 @@ void NW005_data_struct_PPP_modem::webform_load(struct EventStruct *event) showWebformItem(*_kvs, params); } { - auto params = NW005_makeWebFormItemParams(NW005_KEY_PIN); + auto params = NW005_makeWebFormItemParams(NW005_KEY_SIM_PIN); params._maxLength = 4; showWebformItem(*_kvs, params); addFormNote(F("Only numerical digits")); } - if (!_modem_initialized) { return; } - addFormSubHeader(F("Modem State")); addRowLabel(F("Modem Model")); + + if (!_modem_task_data.modem_initialized) { + if (_modem_task_data.initializing) { + addHtml(F("Initializing ...")); + } else { + addHtml(F("Not found")); + } + return; + } + addHtml_pre(PPP.moduleName()); addRowLabel(F("IMEI")); addHtml_pre(PPP.IMEI()); @@ -484,11 +493,11 @@ void NW005_data_struct_PPP_modem::webform_load(struct EventStruct *event) } addRowLabel(F("RSSI")); - addHtml(NW005_data_struct_PPP_modem::getRSSI()); + addHtml(getRSSI()); addUnit(F("dBm")); addRowLabel(F("BER")); - addHtml(NW005_data_struct_PPP_modem::getBER()); + addHtml(getBER()); addRowLabel(F("Radio State")); addHtml((PPP.radioState() == 0) ? F("Minimal") : F("Full")); @@ -600,7 +609,7 @@ void NW005_data_struct_PPP_modem::webform_load(struct EventStruct *event) } */ - webform_load_UE_system_information(); + webform_load_UE_system_information(); } void NW005_data_struct_PPP_modem::webform_save(struct EventStruct *event) @@ -618,7 +627,7 @@ void NW005_data_struct_PPP_modem::webform_save(struct EventStruct *event) NW005_KEY_FLOWCTRL, NW005_KEY_MODEM_MODEL, NW005_KEY_APN, - NW005_KEY_PIN + NW005_KEY_SIM_PIN }; @@ -631,6 +640,63 @@ void NW005_data_struct_PPP_modem::webform_save(struct EventStruct *event) _store(); } +bool NW005_data_struct_PPP_modem::webform_getPort(String& str) +{ + str.clear(); + + if (_KVS_initialized() && _load()) { + int serialPort = _kvs->getValueAsInt_or_default(NW005_KEY_SERIAL_PORT, -1); + str = serialHelper_getSerialTypeLabel(static_cast(serialPort)); + + if (serialPort >= 0) { + const uint32_t keys[] { + NW005_KEY_PIN_RX, + NW005_KEY_PIN_TX, + NW005_KEY_PIN_RTS, + NW005_KEY_PIN_CTS, + NW005_KEY_PIN_RESET + }; + + for (int i = 0; i < NR_ELEMENTS(keys); ++i) { + int pin = _kvs->getValueAsInt_or_default(keys[i], -1); + + if (pin >= 0) { + PinSelectPurpose purpose = PinSelectPurpose::Generic; + const bool shortNotation = true; + String label = NW005_formatGpioLabel(keys[i], purpose, shortNotation); + str += strformat(F("\n%s: %d"), + label.c_str(), + pin); + } + } + } + } + return !str.isEmpty(); +} + +void NW005_begin_modem_task(void *parameter) +{ + NW005_modem_task_data*modem_task_data = static_cast(parameter); + + if (!modem_task_data->modem_initialized) { + modem_task_data->initializing = true; + modem_task_data->modem_initialized = + PPP.begin( + modem_task_data->model, + modem_task_data->uart_num, + modem_task_data->baud_rate); + modem_task_data->initializing = false; + modem_task_data->logString = strformat( + F("PPP: Module Name: %s, IMEI: %s"), + PPP.moduleName().c_str(), + PPP.IMEI().c_str()); + + // PPP.mode(ESP_MODEM_MODE_COMMAND); + } + modem_task_data->modem_taskHandle = nullptr; + vTaskDelete(modem_task_data->modem_taskHandle); +} + bool NW005_data_struct_PPP_modem::init(struct EventStruct *event) { if (!_KVS_initialized()) { @@ -677,70 +743,75 @@ bool NW005_data_struct_PPP_modem::init(struct EventStruct *event) } { String pin; - _kvs->getValue(NW005_KEY_PIN, pin); + _kvs->getValue(NW005_KEY_SIM_PIN, pin); if (pin.length() >= 4) { PPP.setPin(pin.c_str()); } } - ppp_modem_model_t model = to_ppp_modem_model_t(static_cast( - _kvs->getValueAsInt_or_default(NW005_KEY_MODEM_MODEL, PPP_MODEM_GENERIC))); - int serialPort = 1; + _modem_task_data.model = to_ppp_modem_model_t(static_cast( + _kvs->getValueAsInt_or_default(NW005_KEY_MODEM_MODEL, PPP_MODEM_GENERIC))); + + _modem_task_data.uart_num = 1; { int8_t serial = 1; if (_kvs->getValue(NW005_KEY_SERIAL_PORT, serial)) { switch (static_cast(serial)) { - case ESPEasySerialPort::serial0: serialPort = 0; + case ESPEasySerialPort::serial0: _modem_task_data.uart_num = 0; break; # if USABLE_SOC_UART_NUM > 1 - case ESPEasySerialPort::serial1: serialPort = 1; + case ESPEasySerialPort::serial1: _modem_task_data.uart_num = 1; break; # endif // if USABLE_SOC_UART_NUM > 1 # if USABLE_SOC_UART_NUM > 2 - case ESPEasySerialPort::serial2: serialPort = 2; + case ESPEasySerialPort::serial2: _modem_task_data.uart_num = 2; break; # endif // if USABLE_SOC_UART_NUM > 2 # if USABLE_SOC_UART_NUM > 3 - case ESPEasySerialPort::serial3: serialPort = 3; + case ESPEasySerialPort::serial3: _modem_task_data.uart_num = 3; break; # endif // if USABLE_SOC_UART_NUM > 3 # if USABLE_SOC_UART_NUM > 4 - case ESPEasySerialPort::serial4: serialPort = 4; + case ESPEasySerialPort::serial4: _modem_task_data.uart_num = 4; break; # endif // if USABLE_SOC_UART_NUM > 4 # if USABLE_SOC_UART_NUM > 5 - case ESPEasySerialPort::serial5: serialPort = 5; + case ESPEasySerialPort::serial5: _modem_task_data.uart_num = 5; break; # endif // if USABLE_SOC_UART_NUM > 5 default: break; } } } - uint32_t baud_rate = _kvs->getValueAsInt_or_default(NW005_KEY_BAUDRATE, 115200); + _modem_task_data.baud_rate = _kvs->getValueAsInt_or_default(NW005_KEY_BAUDRATE, 115200); + _modem_task_data.modem_initialized = false; + _modem_task_data.initializing = false; - if (!PPP.begin(model, serialPort, baud_rate)) { - addLog(LOG_LEVEL_ERROR, F("PPP: Error PPP.begin")); - return false; - } - PPP.mode(ESP_MODEM_MODE_COMMAND); + xTaskCreatePinnedToCore( + NW005_begin_modem_task, // Function that should be called + "PPP.begin()", // Name of the task (for debugging) + 4000, // Stack size (bytes) + &_modem_task_data, // Parameter to pass + 1, // Task priority + &_modem_task_data.modem_taskHandle, // Task handle + xPortGetCoreID() // Core you want to run the task on (0 or 1) + ); - addLog(LOG_LEVEL_INFO, strformat(F("PPP: Module Name: %s, IMEI: %s"), - PPP.moduleName().c_str(), - PPP.IMEI().c_str())); - - _modem_initialized = true; return true; } bool NW005_data_struct_PPP_modem::exit(struct EventStruct *event) { + if (_modem_task_data.modem_taskHandle) { + vTaskDelete(_modem_task_data.modem_taskHandle); + _modem_task_data.modem_taskHandle = nullptr; + } PPP.mode(ESP_MODEM_MODE_COMMAND); PPP.end(); - - _modem_initialized = false; + _modem_task_data.modem_initialized = false; return true; } @@ -752,6 +823,53 @@ struct testStruct { }; +String NW005_data_struct_PPP_modem::NW005_formatGpioLabel(uint32_t key, PinSelectPurpose& purpose, bool shortNotation) const +{ + String label; + + if ((key >= NW005_KEY_PIN_RX) && (key <= NW005_KEY_PIN_RESET)) + { + ESPEasy_key_value_store::StorageType storageType; + purpose = PinSelectPurpose::Generic; + label = NW005_getLabelString(key, true, storageType); + + const bool optional = !shortNotation; + + switch (key) + { + case NW005_KEY_PIN_RX: + purpose = PinSelectPurpose::Serial_input; + label = shortNotation + ? formatGpioName_RX(false) + : formatGpioName_serialRX(false); + break; + case NW005_KEY_PIN_TX: + purpose = PinSelectPurpose::Serial_output; + label = shortNotation + ? formatGpioName_TX(false) + : formatGpioName_serialTX(false); + break; + case NW005_KEY_PIN_CTS: + purpose = PinSelectPurpose::Generic_input; + label = formatGpioName( + label, gpio_direction::gpio_input, optional); + break; + case NW005_KEY_PIN_RTS: + purpose = PinSelectPurpose::Generic_output; + label = formatGpioName( + label, gpio_direction::gpio_output, optional); + break; + case NW005_KEY_PIN_RESET: + purpose = PinSelectPurpose::Generic_output; + label = formatGpioName( + label, gpio_direction::gpio_output, optional); + break; + } + + } + return label; +} + void NW005_data_struct_PPP_modem::testWrite() { if (!_KVS_initialized()) { return; } diff --git a/src/src/NWPluginStructs/NW005_data_struct_PPP_modem.h b/src/src/NWPluginStructs/NW005_data_struct_PPP_modem.h index 82924c8b0..da542bc37 100644 --- a/src/src/NWPluginStructs/NW005_data_struct_PPP_modem.h +++ b/src/src/NWPluginStructs/NW005_data_struct_PPP_modem.h @@ -5,31 +5,57 @@ #include "../../_NWPlugin_Helper.h" #ifdef USES_NW005 +# include "../Helpers/StringGenerator_GPIO.h" + +# include + +struct NW005_modem_task_data { + ppp_modem_model_t model = PPP_MODEM_GENERIC; + uint8_t uart_num = 1; + int baud_rate = 115200; + bool initializing{}; + bool modem_initialized{}; + String logString; + TaskHandle_t modem_taskHandle = nullptr; + +}; + struct NW005_data_struct_PPP_modem : public NWPluginData_base { NW005_data_struct_PPP_modem(networkIndex_t networkIndex); ~NW005_data_struct_PPP_modem(); - static String getRSSI(); - static String getBER(); + String getRSSI() const; + String getBER() const; + bool attached() const; + String IMEI() const; + String operatorName() const; - void webform_load_UE_system_information(); + void webform_load_UE_system_information(); - void webform_load(struct EventStruct *event); - void webform_save(struct EventStruct *event); + void webform_load(struct EventStruct *event); + void webform_save(struct EventStruct *event); - bool init(struct EventStruct *event); + bool webform_getPort(String& str); - bool exit(struct EventStruct *event); + bool init(struct EventStruct *event); + + bool exit(struct EventStruct *event); - void testWrite(); + void testWrite(); - void testRead(); + void testRead(); private: - bool _modem_initialized{}; + + String NW005_formatGpioLabel(uint32_t key, + PinSelectPurpose& purpose, + bool shortNotation = false) const; + + NW005_modem_task_data _modem_task_data; + }; diff --git a/src/src/WebServer/NetworkPage.cpp b/src/src/WebServer/NetworkPage.cpp index 7e17a9597..ecdc1916f 100644 --- a/src/src/WebServer/NetworkPage.cpp +++ b/src/src/WebServer/NetworkPage.cpp @@ -175,7 +175,7 @@ void handle_networks_ShowAllNetworksTable() html_table_header(F("Network Adapter")); html_table_header(F("Connected")); html_table_header(F("Hostname/SSID")); - html_table_header(F("MAC")); + html_table_header(F("HW Address")); html_table_header(F("IP")); html_table_header(F("Port")); @@ -217,7 +217,7 @@ void handle_networks_ShowAllNetworksTable() const NWPlugin::Function functions[] { NWPlugin::Function::NWPLUGIN_WEBFORM_SHOW_CONNECTED, NWPlugin::Function::NWPLUGIN_WEBFORM_SHOW_HOSTNAME, - NWPlugin::Function::NWPLUGIN_WEBFORM_SHOW_MAC, + NWPlugin::Function::NWPLUGIN_WEBFORM_SHOW_HW_ADDRESS, NWPlugin::Function::NWPLUGIN_WEBFORM_SHOW_IP, NWPlugin::Function::NWPLUGIN_WEBFORM_SHOW_PORT }; @@ -238,6 +238,10 @@ void handle_networks_ShowAllNetworksTable() if (!res || str.isEmpty()) { addEnabled(res); } + } else if (functions[i] == NWPlugin::Function::NWPLUGIN_WEBFORM_SHOW_HW_ADDRESS) { + if (res && !TempEvent.String1.isEmpty() && !str.isEmpty()) { + addHtml(strformat(F("%s: "), TempEvent.String1.c_str())); + } } if (!str.isEmpty()) { @@ -324,8 +328,20 @@ void handle_networks_NetworkSettingsPage(networkIndex_t networkindex) { { { addFormSubHeader(F("Network Interface")); - addRowLabel(F("MAC Address")); - addHtml_pre(TempEvent.networkInterface->macAddress()); + + { + String str; + const bool res = NWPluginCall(NWPlugin::Function::NWPLUGIN_WEBFORM_SHOW_HW_ADDRESS, &TempEvent, str); + + if (res && !TempEvent.String1.isEmpty()) { + addRowLabel(TempEvent.String1); + } else { + addRowLabel(F("MAC Address")); + } + addHtml_pre(res + ? str + : TempEvent.networkInterface->macAddress()); + } const NWPlugin::NetforkFlags flags[] = { NWPlugin::NetforkFlags::DHCP_client, From 29cbff11ea9142aa3b53b021ea2d25c97a1ce0f9 Mon Sep 17 00:00:00 2001 From: TD-er Date: Sun, 20 Jul 2025 19:16:57 +0200 Subject: [PATCH 141/564] [PPP Modem] Initialize C-code to NULL instead of nullptr --- .../NWPluginStructs/NW005_data_struct_PPP_modem.cpp | 10 +++++++--- src/src/NWPluginStructs/NW005_data_struct_PPP_modem.h | 3 ++- 2 files changed, 9 insertions(+), 4 deletions(-) diff --git a/src/src/NWPluginStructs/NW005_data_struct_PPP_modem.cpp b/src/src/NWPluginStructs/NW005_data_struct_PPP_modem.cpp index 0ace0de19..bd5c7d558 100644 --- a/src/src/NWPluginStructs/NW005_data_struct_PPP_modem.cpp +++ b/src/src/NWPluginStructs/NW005_data_struct_PPP_modem.cpp @@ -2,6 +2,8 @@ #ifdef USES_NW005 +# include "../Globals/Settings.h" + # include "../Helpers/StringConverter.h" # include "../Helpers/_Plugin_Helper_serial.h" @@ -82,7 +84,7 @@ WebFormItemParams NW005_makeWebFormItemParams(uint32_t key) { NW005_data_struct_PPP_modem::~NW005_data_struct_PPP_modem() { if (_modem_task_data.modem_taskHandle) { vTaskDelete(_modem_task_data.modem_taskHandle); - _modem_task_data.modem_taskHandle = nullptr; + _modem_task_data.modem_taskHandle = NULL; } PPP.mode(ESP_MODEM_MODE_COMMAND); PPP.end(); @@ -439,6 +441,8 @@ void NW005_data_struct_PPP_modem::webform_load(struct EventStruct *event) addFormNote(F("Only numerical digits")); } + if (!Settings.getNetworkEnabled(event->NetworkIndex)) return; + addFormSubHeader(F("Modem State")); addRowLabel(F("Modem Model")); @@ -693,7 +697,7 @@ void NW005_begin_modem_task(void *parameter) // PPP.mode(ESP_MODEM_MODE_COMMAND); } - modem_task_data->modem_taskHandle = nullptr; + modem_task_data->modem_taskHandle = NULL; vTaskDelete(modem_task_data->modem_taskHandle); } @@ -807,7 +811,7 @@ bool NW005_data_struct_PPP_modem::exit(struct EventStruct *event) { if (_modem_task_data.modem_taskHandle) { vTaskDelete(_modem_task_data.modem_taskHandle); - _modem_task_data.modem_taskHandle = nullptr; + _modem_task_data.modem_taskHandle = NULL; } PPP.mode(ESP_MODEM_MODE_COMMAND); PPP.end(); diff --git a/src/src/NWPluginStructs/NW005_data_struct_PPP_modem.h b/src/src/NWPluginStructs/NW005_data_struct_PPP_modem.h index da542bc37..338bb3bdf 100644 --- a/src/src/NWPluginStructs/NW005_data_struct_PPP_modem.h +++ b/src/src/NWPluginStructs/NW005_data_struct_PPP_modem.h @@ -16,8 +16,9 @@ struct NW005_modem_task_data { bool initializing{}; bool modem_initialized{}; String logString; - TaskHandle_t modem_taskHandle = nullptr; + // This is C-code, so not set to nullptr, but to NULL + TaskHandle_t modem_taskHandle = NULL; }; From 964950228f5e505035cf71560bd3ddf79fafe932 Mon Sep 17 00:00:00 2001 From: TD-er Date: Sun, 20 Jul 2025 19:17:32 +0200 Subject: [PATCH 142/564] [Network] Fix saving WiFi STA & WiFi AP settings --- src/src/WebServer/NetworkPage.cpp | 48 +++++++++++++++++++------------ 1 file changed, 30 insertions(+), 18 deletions(-) diff --git a/src/src/WebServer/NetworkPage.cpp b/src/src/WebServer/NetworkPage.cpp index ecdc1916f..96fd24cc0 100644 --- a/src/src/WebServer/NetworkPage.cpp +++ b/src/src/WebServer/NetworkPage.cpp @@ -31,6 +31,7 @@ void handle_networks() TXBuffer.startStream(); sendHeadandTail_stdtemplate(_HEAD); + // 'index' value in the URL uint8_t networkindex = getFormItemInt(F("index"), 0); boolean networkNotSet = networkindex == 0; @@ -159,6 +160,7 @@ void handle_networks_CopySubmittedSettings_NWPluginCall(networkIndex_t networkin TempEvent.NetworkIndex = networkindex; // Call network plugin to save CustomNetworkSettings + addLog(LOG_LEVEL_INFO, F("Call network plugin to save CustomNetworkSettings")); String dummy; do_NWPluginCall(NetworkDriverIndex, NWPlugin::Function::NWPLUGIN_WEBFORM_SAVE, &TempEvent, dummy); } @@ -277,9 +279,6 @@ void handle_networks_NetworkSettingsPage(networkIndex_t networkindex) { Settings.getNWPluginID_for_network(networkindex)); const NetworkDriverStruct& cur_driver = getNetworkDriverStruct(networkDriverIndex); - const bool networkDriverSelectorDisabled = cur_driver.alwaysPresent && validNetworkIndex(cur_driver.fixedNetworkIndex) && - networkindex == cur_driver.fixedNetworkIndex; - // Show network settings page { @@ -288,25 +287,38 @@ void handle_networks_NetworkSettingsPage(networkIndex_t networkindex) { addRowLabel(F("Network Driver")); const nwpluginID_t choice = Settings.getNWPluginID_for_network(networkindex); - addSelector_Head_reloadOnChange(F("networkDriver"), F("wide"), networkDriverSelectorDisabled); - addSelector_Item(F("- Standalone -"), 0, false, false, EMPTY_STRING); + const bool networkDriverSelectorDisabled = cur_driver.alwaysPresent && validNetworkIndex(cur_driver.fixedNetworkIndex) && + networkindex == cur_driver.fixedNetworkIndex; - networkDriverIndex_t networkDriverIndex{}; + if (networkDriverSelectorDisabled) { + addSelector_Head(F("networkDriver")); + + // Must add the fixed network driver label here. - while (validNetworkDriverIndex(networkDriverIndex)) - { - const NetworkDriverStruct& driver = getNetworkDriverStruct(networkDriverIndex); - const nwpluginID_t number = getNWPluginID_from_NetworkDriverIndex(networkDriverIndex); - const bool disabled = driver.alwaysPresent && - validNetworkIndex(driver.fixedNetworkIndex) && - networkindex != driver.fixedNetworkIndex; addSelector_Item(getNWPluginNameFromNetworkDriverIndex(networkDriverIndex), - number.value, - choice == number, - disabled); - ++networkDriverIndex; + choice.value, + true); + } else { + addSelector_Head_reloadOnChange(F("networkDriver")); + addSelector_Item(F("- Standalone -"), 0, false, false, EMPTY_STRING); + networkDriverIndex_t tmpNetworkDriverIndex{}; + + while (validNetworkDriverIndex(tmpNetworkDriverIndex)) + { + const NetworkDriverStruct& driver = getNetworkDriverStruct(tmpNetworkDriverIndex); + const nwpluginID_t number = getNWPluginID_from_NetworkDriverIndex(tmpNetworkDriverIndex); + const bool disabled = driver.alwaysPresent && + validNetworkIndex(driver.fixedNetworkIndex) && + networkindex != driver.fixedNetworkIndex; + addSelector_Item(getNWPluginNameFromNetworkDriverIndex(tmpNetworkDriverIndex), + number.value, + choice == number, + disabled); + ++tmpNetworkDriverIndex; + } } - addSelector_Foot(!networkDriverSelectorDisabled); + addSelector_Foot(); + } # ifndef LIMIT_BUILD_SIZE From 4a783fba42dc691c191c23a88e5b4ad217bb4595 Mon Sep 17 00:00:00 2001 From: TD-er Date: Tue, 22 Jul 2025 01:18:07 +0200 Subject: [PATCH 143/564] [Network] Add route prio to network overview --- platformio_core_defs.ini | 2 +- src/_NW002_WiFi_AP.cpp | 12 +++++++++ src/_NW003_ETH_RMII.cpp | 1 + src/_NW004_ETH_SPI.cpp | 1 + src/src/CustomBuild/ESPEasyDefaults.h | 9 +++++++ src/src/DataStructs/SettingsStruct.h | 6 ++--- src/src/DataStructs/TimingStats.cpp | 2 ++ src/src/DataStructs/TimingStats.h | 2 ++ .../DataTypes/ESPEasy_plugin_functions.cpp | 1 + src/src/DataTypes/ESPEasy_plugin_functions.h | 2 ++ .../ESPEasyCore/ESPEasyWiFiEvent_ESP32.cpp | 25 +++++++++++++++++++ src/src/ESPEasyCore/ESPEasyWifi.cpp | 18 +++++++++++-- src/src/Globals/NWPlugins.cpp | 17 +++++++++++++ src/src/Helpers/PeriodicalActions.cpp | 14 ++++++++++- .../NW005_data_struct_PPP_modem.cpp | 15 +++++++++-- src/src/WebServer/NetworkPage.cpp | 20 ++++++++++++--- 16 files changed, 134 insertions(+), 13 deletions(-) diff --git a/platformio_core_defs.ini b/platformio_core_defs.ini index 9bd98cd0c..995f8dc1b 100644 --- a/platformio_core_defs.ini +++ b/platformio_core_defs.ini @@ -195,7 +195,7 @@ lib_extra_dirs = ; ESP_IDF 5.5.0 [core_esp32_IDF5_5_0__3_2_0_LittleFS] platform = https://github.com/Jason2866/platform-espressif32.git#Arduino/IDF55 -platform_packages = framework-arduinoespressif32 @ https://github.com/Jason2866/esp32-arduino-lib-builder/releases/download/1707-1440-5.5/framework-arduinoespressif32-release_v5.5-b163123c.zip +platform_packages = framework-arduinoespressif32 @ https://github.com/Jason2866/esp32-arduino-lib-builder/releases/download/2107-2206-5.5/framework-arduinoespressif32-release_v5.5-01bfc7c1.zip build_flags = -DESP32_STAGE -DESP_IDF_VERSION_MAJOR=5 -DLIBRARIES_NO_LOG=1 diff --git a/src/_NW002_WiFi_AP.cpp b/src/_NW002_WiFi_AP.cpp index cbaa277b4..e3f79d955 100644 --- a/src/_NW002_WiFi_AP.cpp +++ b/src/_NW002_WiFi_AP.cpp @@ -31,6 +31,10 @@ # include "src/WebServer/HTML_Print.h" # include "src/WebServer/HTML_wrappers.h" + +// TODO TD-er: This code should be moved to this NW002 plugin +#include "src/ESPEasyCore/ESPEasyWifi.h" + bool NWPlugin_002(NWPlugin::Function function, struct EventStruct *event, String& string) { bool success = false; @@ -156,11 +160,19 @@ bool NWPlugin_002(NWPlugin::Function function, struct EventStruct *event, String case NWPlugin::Function::NWPLUGIN_INIT: { + setAPinternal(true); +// WiFi.AP.begin(); break; } case NWPlugin::Function::NWPLUGIN_EXIT: { +#ifdef ESP32 + WiFi.AP.end(); +#endif +#ifdef ESP8266 +//WiFi.softAP +#endif break; } diff --git a/src/_NW003_ETH_RMII.cpp b/src/_NW003_ETH_RMII.cpp index 2e716ecd8..7b80b8796 100644 --- a/src/_NW003_ETH_RMII.cpp +++ b/src/_NW003_ETH_RMII.cpp @@ -292,6 +292,7 @@ bool NWPlugin_003(NWPlugin::Function function, struct EventStruct *event, String case NWPlugin::Function::NWPLUGIN_EXIT: { + ETH.end(); break; } diff --git a/src/_NW004_ETH_SPI.cpp b/src/_NW004_ETH_SPI.cpp index b581b482d..abf27f8e7 100644 --- a/src/_NW004_ETH_SPI.cpp +++ b/src/_NW004_ETH_SPI.cpp @@ -294,6 +294,7 @@ bool NWPlugin_004(NWPlugin::Function function, struct EventStruct *event, String case NWPlugin::Function::NWPLUGIN_EXIT: { + ETH.end(); break; } diff --git a/src/src/CustomBuild/ESPEasyDefaults.h b/src/src/CustomBuild/ESPEasyDefaults.h index d69fb6463..b8c105097 100644 --- a/src/src/CustomBuild/ESPEasyDefaults.h +++ b/src/src/CustomBuild/ESPEasyDefaults.h @@ -37,6 +37,15 @@ #ifndef DEFAULT_AP_SUBNET #define DEFAULT_AP_SUBNET 255,255,255,0 // Enter IP address (comma separated) for AP (config) mode #endif +#ifndef DEFAULT_AP_DNS +#define DEFAULT_AP_DNS 1,1,1,1 // Cloudflare DNS: 1.1.1.1 and 1.0.0.1 + // Alternatives + // Cleanbrowsing: 185.228.168.9 and 185.228.169.9 + // Google Public DNS: 8.8.8.8 and 8.8.4.4 + // Quad9: 9.9.9.9 and 149.112.112.112 + // OpenDNS: 208.67.222.222 and 208.67.220.220 + // Comodo Secure DNS: 8.26.56.26 and 8.20.247.20 +#endif #ifndef DEFAULT_AP_KEY #define DEFAULT_AP_KEY "configesp" // Enter network WPA key for AP (config) mode #endif diff --git a/src/src/DataStructs/SettingsStruct.h b/src/src/DataStructs/SettingsStruct.h index ffae48031..1bb8c9a81 100644 --- a/src/src/DataStructs/SettingsStruct.h +++ b/src/src/DataStructs/SettingsStruct.h @@ -230,8 +230,8 @@ class SettingsStruct_tmpl #endif #ifdef ESP32 - bool WiFi_AP_enable_NAPT() const { return VariousBits_2.WiFi_AP_enable_NAPT; } - void WiFi_AP_enable_NAPT(bool enable) { VariousBits_2.WiFi_AP_enable_NAPT = enable; } + bool WiFi_AP_enable_NAPT() const { return !VariousBits_2.WiFi_AP_enable_NAPT; } + void WiFi_AP_enable_NAPT(bool enable) { VariousBits_2.WiFi_AP_enable_NAPT = !enable; } #endif @@ -627,7 +627,7 @@ public: uint32_t PassiveWiFiScan : 1; // Bit 06 // inverted uint32_t ShowUnitOfMeasureOnDevicesPage : 1; // Bit 07 // inverted uint32_t WiFi_band_mode : 2; // Bit 08 & 09 - uint32_t WiFi_AP_enable_NAPT : 1; // Bit 10 + uint32_t WiFi_AP_enable_NAPT : 1; // Bit 10 // inverted uint32_t unused_11 : 1; // Bit 11 uint32_t unused_12 : 1; // Bit 12 uint32_t unused_13 : 1; // Bit 13 diff --git a/src/src/DataStructs/TimingStats.cpp b/src/src/DataStructs/TimingStats.cpp index 0a2025e54..721070c24 100644 --- a/src/src/DataStructs/TimingStats.cpp +++ b/src/src/DataStructs/TimingStats.cpp @@ -223,6 +223,8 @@ const __FlashStringHelper* getMiscStatsName_F(TimingStatsElements stat) { case TimingStatsElements::PLUGIN_CALL_1PS: return F("Plugin call 1 p/s"); case TimingStatsElements::CPLUGIN_CALL_50PS: return F("CPlugin call 50 p/s"); case TimingStatsElements::CPLUGIN_CALL_10PS: return F("CPlugin call 10 p/s"); + case TimingStatsElements::NWPLUGIN_CALL_50PS: return F("NWPlugin call 50 p/s"); + case TimingStatsElements::NWPLUGIN_CALL_10PS: return F("NWPlugin call 10 p/s"); case TimingStatsElements::SENSOR_SEND_TASK: return F("SensorSendTask()"); case TimingStatsElements::COMMAND_EXEC_INTERNAL: return F("Exec Internal Command"); case TimingStatsElements::COMMAND_DECODE_INTERNAL: return F("Decode Internal Command"); diff --git a/src/src/DataStructs/TimingStats.h b/src/src/DataStructs/TimingStats.h index 39c2648a3..331a10220 100644 --- a/src/src/DataStructs/TimingStats.h +++ b/src/src/DataStructs/TimingStats.h @@ -66,6 +66,8 @@ enum class TimingStatsElements { PLUGIN_CALL_1PS, CPLUGIN_CALL_10PS, CPLUGIN_CALL_50PS, + NWPLUGIN_CALL_10PS, + NWPLUGIN_CALL_50PS, SENSOR_SEND_TASK, SEND_DATA_STATS, COMPUTE_FORMULA_STATS, diff --git a/src/src/DataTypes/ESPEasy_plugin_functions.cpp b/src/src/DataTypes/ESPEasy_plugin_functions.cpp index f0465387e..2c6dd083d 100644 --- a/src/src/DataTypes/ESPEasy_plugin_functions.cpp +++ b/src/src/DataTypes/ESPEasy_plugin_functions.cpp @@ -9,6 +9,7 @@ bool NWPlugin::canQueryViaNetworkInterface(NWPlugin::Function function) switch (function) { // TD-er: Do not try to fetch hostname via base class. No idea why, but it doesn't work well + case NWPlugin::Function::NWPLUGIN_WEBFORM_SHOW_ROUTE_PRIO: case NWPlugin::Function::NWPLUGIN_WEBFORM_SHOW_HOSTNAME: case NWPlugin::Function::NWPLUGIN_WEBFORM_SHOW_HW_ADDRESS: case NWPlugin::Function::NWPLUGIN_WEBFORM_SHOW_IP: diff --git a/src/src/DataTypes/ESPEasy_plugin_functions.h b/src/src/DataTypes/ESPEasy_plugin_functions.h index 3de93de74..4f9235470 100644 --- a/src/src/DataTypes/ESPEasy_plugin_functions.h +++ b/src/src/DataTypes/ESPEasy_plugin_functions.h @@ -154,10 +154,12 @@ public: NWPLUGIN_TEN_PER_SECOND, // Called 10x per second (typical for checking new data instead of waiting) NWPLUGIN_FIFTY_PER_SECOND, // Called 50x per second (typical for checking new data instead of waiting) NWPLUGIN_INIT_ALL, + NWPLUGIN_EXIT_ALL, // Exit all network interfaces NWPLUGIN_EXIT, NWPLUGIN_WRITE, // Send commands to a network adapter. #ifdef ESP32 NWPLUGIN_GET_INTERFACE, + NWPLUGIN_WEBFORM_SHOW_ROUTE_PRIO, #endif NWPLUGIN_WEBFORM_SHOW_CONNECTED, // Used for showing connected state/speed NWPLUGIN_WEBFORM_SHOW_HOSTNAME, // Used for showing hostname diff --git a/src/src/ESPEasyCore/ESPEasyWiFiEvent_ESP32.cpp b/src/src/ESPEasyCore/ESPEasyWiFiEvent_ESP32.cpp index 025f94bd4..d8a2ddb53 100644 --- a/src/src/ESPEasyCore/ESPEasyWiFiEvent_ESP32.cpp +++ b/src/src/ESPEasyCore/ESPEasyWiFiEvent_ESP32.cpp @@ -4,6 +4,9 @@ # if FEATURE_ETHERNET # include # endif // if FEATURE_ETHERNET +# if FEATURE_PPP_MODEM +# include +# endif # include "../DataStructs/RTCStruct.h" @@ -173,6 +176,28 @@ void WiFiEvent(WiFiEvent_t event_id, arduino_event_info_t info) { // Handled in EthEvent break; # endif // FEATURE_ETHERNET + +#if FEATURE_PPP_MODEM + case ARDUINO_EVENT_PPP_START: addLog(LOG_LEVEL_INFO, F("PPP Started")); break; + case ARDUINO_EVENT_PPP_CONNECTED: addLog(LOG_LEVEL_INFO, F("PPP Connected")); break; + case ARDUINO_EVENT_PPP_GOT_IP: + addLog(LOG_LEVEL_INFO, F("PPP Got IP")); + PPP.setDefault(); + if (WiFi.AP.enableNAPT(true)) + addLog(LOG_LEVEL_INFO, F("WiFi.AP.enableNAPT")); + break; + case ARDUINO_EVENT_PPP_LOST_IP: + addLog(LOG_LEVEL_INFO, F("PPP Lost IP")); + WiFi.AP.enableNAPT(false); + break; + case ARDUINO_EVENT_PPP_DISCONNECTED: + addLog(LOG_LEVEL_INFO, F("PPP Disconnected")); + WiFi.AP.enableNAPT(false); + break; + case ARDUINO_EVENT_PPP_STOP: addLog(LOG_LEVEL_INFO, F("PPP Stopped")); break; + +#endif + default: { addLogMove(LOG_LEVEL_ERROR, concat(F("UNKNOWN WIFI/ETH EVENT: "), event_id)); diff --git a/src/src/ESPEasyCore/ESPEasyWifi.cpp b/src/src/ESPEasyCore/ESPEasyWifi.cpp index 67f31432f..14851dd33 100644 --- a/src/src/ESPEasyCore/ESPEasyWifi.cpp +++ b/src/src/ESPEasyCore/ESPEasyWifi.cpp @@ -354,16 +354,30 @@ void setAPinternal(bool enable) String softAPSSID = NetworkCreateRFCCompliantHostname(); String pwd = SecuritySettings.WifiAPKey; IPAddress subnet(DEFAULT_AP_SUBNET); + #ifdef ESP32 + IPAddress dhcp_lease_start = (uint32_t)0; + IPAddress dns(DEFAULT_AP_DNS); + if (!WiFi.softAPConfig(apIP, apIP, subnet, dhcp_lease_start, dns)) { + addLog(LOG_LEVEL_ERROR, strformat( + ("WIFI : [AP] softAPConfig failed! IP: %s, GW: %s, SN: %s, DNS: %s"), + apIP.toString().c_str(), + apIP.toString().c_str(), + subnet.toString().c_str(), + dns.toString().c_str()) + ); + } + #endif + #ifdef ESP8266 if (!WiFi.softAPConfig(apIP, apIP, subnet)) { addLog(LOG_LEVEL_ERROR, strformat( ("WIFI : [AP] softAPConfig failed! IP: %s, GW: %s, SN: %s"), apIP.toString().c_str(), apIP.toString().c_str(), - subnet.toString().c_str() - ) + subnet.toString().c_str()) ); } + #endif int channel = 1; diff --git a/src/src/Globals/NWPlugins.cpp b/src/src/Globals/NWPlugins.cpp index c47b3e481..f5ee68fe8 100644 --- a/src/src/Globals/NWPlugins.cpp +++ b/src/src/Globals/NWPlugins.cpp @@ -41,6 +41,7 @@ bool NWPluginCall(NWPlugin::Function Function, struct EventStruct *event, String // calls to all active networks case NWPlugin::Function::NWPLUGIN_INIT_ALL: + case NWPlugin::Function::NWPLUGIN_EXIT_ALL: case NWPlugin::Function::NWPLUGIN_TEN_PER_SECOND: case NWPlugin::Function::NWPLUGIN_FIFTY_PER_SECOND: case NWPlugin::Function::NWPLUGIN_WRITE: @@ -50,6 +51,9 @@ bool NWPluginCall(NWPlugin::Function Function, struct EventStruct *event, String if (Function == NWPlugin::Function::NWPLUGIN_INIT_ALL) { Function = NWPlugin::Function::NWPLUGIN_INIT; } + if (Function == NWPlugin::Function::NWPLUGIN_EXIT_ALL) { + Function = NWPlugin::Function::NWPLUGIN_EXIT; + } for (networkIndex_t x = 0; x < NETWORK_MAX; x++) { if (Settings.getNWPluginID_for_network(x) && Settings.getNetworkEnabled(x)) { @@ -84,6 +88,7 @@ bool NWPluginCall(NWPlugin::Function Function, struct EventStruct *event, String case NWPlugin::Function::NWPLUGIN_WEBFORM_SAVE: #ifdef ESP32 case NWPlugin::Function::NWPLUGIN_GET_INTERFACE: + case NWPlugin::Function::NWPLUGIN_WEBFORM_SHOW_ROUTE_PRIO: #endif case NWPlugin::Function::NWPLUGIN_CONNECT_SUCCESS: case NWPlugin::Function::NWPLUGIN_CONNECT_FAIL: @@ -122,6 +127,18 @@ bool NWPluginCall(NWPlugin::Function Function, struct EventStruct *event, String if (event->networkInterface != nullptr) { switch (Function) { + case NWPlugin::Function::NWPLUGIN_WEBFORM_SHOW_ROUTE_PRIO: +#if ESP_IDF_VERSION >= ESP_IDF_VERSION_VAL(5, 5, 0) + // TODO TD-er: Must also add option to set route prio + // See: https://github.com/espressif/arduino-esp32/pull/11617 + event->Par1 = event->networkInterface->getRoutePrio(); +#else + event->Par1 = event->networkInterface->route_prio(); +#endif + event->Par2 = event->networkInterface->isDefault(); + success = true; + break; + case NWPlugin::Function::NWPLUGIN_WEBFORM_SHOW_HOSTNAME: str = event->networkInterface->getHostname(); success = true; diff --git a/src/src/Helpers/PeriodicalActions.cpp b/src/src/Helpers/PeriodicalActions.cpp index 224243418..26c166a43 100644 --- a/src/src/Helpers/PeriodicalActions.cpp +++ b/src/src/Helpers/PeriodicalActions.cpp @@ -65,6 +65,12 @@ void run50TimesPerSecond() { CPluginCall(CPlugin::Function::CPLUGIN_FIFTY_PER_SECOND, 0, dummy); STOP_TIMER(CPLUGIN_CALL_50PS); } + { + START_TIMER; + NWPluginCall(NWPlugin::Function::NWPLUGIN_FIFTY_PER_SECOND, 0, dummy); + STOP_TIMER(NWPLUGIN_CALL_50PS); + } + processNextEvent(); } @@ -95,6 +101,11 @@ void run10TimesPerSecond() { CPluginCall(CPlugin::Function::CPLUGIN_TEN_PER_SECOND, 0, dummy); STOP_TIMER(CPLUGIN_CALL_10PS); } + { + START_TIMER; + NWPluginCall(NWPlugin::Function::NWPLUGIN_TEN_PER_SECOND, 0, dummy); + STOP_TIMER(NWPLUGIN_CALL_10PS); + } #ifdef USES_C015 if (NetworkConnected()) { @@ -496,7 +507,8 @@ void prepareShutdown(IntendedRebootReason_e reason) process_serialWriteBuffer(); flushAndDisconnectAllClients(); saveUserVarToRTC(); - ESPEasy::net::wifi::setWifiMode(WIFI_OFF); + NWPluginCall(NWPlugin::Function::NWPLUGIN_EXIT_ALL, 0); +// ESPEasy::net::wifi::setWifiMode(WIFI_OFF); ESPEASY_FS.end(); process_serialWriteBuffer(); delay(100); // give the node time to flush all before reboot or sleep diff --git a/src/src/NWPluginStructs/NW005_data_struct_PPP_modem.cpp b/src/src/NWPluginStructs/NW005_data_struct_PPP_modem.cpp index bd5c7d558..e2b98de47 100644 --- a/src/src/NWPluginStructs/NW005_data_struct_PPP_modem.cpp +++ b/src/src/NWPluginStructs/NW005_data_struct_PPP_modem.cpp @@ -31,7 +31,8 @@ # define NW005_KEY_FLOWCTRL 10 # define NW005_KEY_MODEM_MODEL 11 # define NW005_KEY_APN 12 -# define NW005_KEY_SIM_PIN 13 +# define NW005_KEY_SIM_PIN 13 +# define NW005_KEY_SET_DEFAULT_ROUTE 14 const __FlashStringHelper* NW005_getLabelString(uint32_t key, bool displayString, ESPEasy_key_value_store::StorageType& storageType) { @@ -64,6 +65,10 @@ const __FlashStringHelper* NW005_getLabelString(uint32_t key, bool displayString case NW005_KEY_SIM_PIN: storageType = ESPEasy_key_value_store::StorageType::string_type; return displayString ? F("SIM Card Pin") : F("pin"); + case NW005_KEY_SET_DEFAULT_ROUTE: + storageType = ESPEasy_key_value_store::StorageType::bool_type; + return displayString ? F("Set as Default Route") : F("default_route"); + } return F(""); @@ -313,6 +318,11 @@ void NW005_data_struct_PPP_modem::webform_load(struct EventStruct *event) { _load(); + showWebformItem( + *_kvs, + NW005_makeWebFormItemParams(NW005_KEY_SET_DEFAULT_ROUTE)); + + addFormSubHeader(F("Device Settings")); { const int ids[] = { @@ -631,7 +641,8 @@ void NW005_data_struct_PPP_modem::webform_save(struct EventStruct *event) NW005_KEY_FLOWCTRL, NW005_KEY_MODEM_MODEL, NW005_KEY_APN, - NW005_KEY_SIM_PIN + NW005_KEY_SIM_PIN, + NW005_KEY_SET_DEFAULT_ROUTE }; diff --git a/src/src/WebServer/NetworkPage.cpp b/src/src/WebServer/NetworkPage.cpp index 96fd24cc0..9634a22fc 100644 --- a/src/src/WebServer/NetworkPage.cpp +++ b/src/src/WebServer/NetworkPage.cpp @@ -172,9 +172,11 @@ void handle_networks_ShowAllNetworksTable() html_table_class_multirow(); html_TR(); html_table_header(F(""), 70); - html_table_header(F("Order"), 50); html_table_header(F("Enabled"), 100); html_table_header(F("Network Adapter")); + #ifdef ESP32 + html_table_header(F("Prio"), 50); + #endif html_table_header(F("Connected")); html_table_header(F("Hostname/SSID")); html_table_header(F("HW Address")); @@ -208,8 +210,6 @@ void handle_networks_ShowAllNetworksTable() if (nwplugin_set) { - // order - html_TD(); addEnabled(Settings.getNetworkEnabled(x)); html_TD(); @@ -217,6 +217,9 @@ void handle_networks_ShowAllNetworksTable() addHtml(getNWPluginNameFromNWPluginID(Settings.getNWPluginID_for_network(x))); const NWPlugin::Function functions[] { +#ifdef ESP32 + NWPlugin::Function::NWPLUGIN_WEBFORM_SHOW_ROUTE_PRIO, +#endif NWPlugin::Function::NWPLUGIN_WEBFORM_SHOW_CONNECTED, NWPlugin::Function::NWPLUGIN_WEBFORM_SHOW_HOSTNAME, NWPlugin::Function::NWPLUGIN_WEBFORM_SHOW_HW_ADDRESS, @@ -235,7 +238,16 @@ void handle_networks_ShowAllNetworksTable() // const bool res = do_NWPluginCall(NetworkDriverIndex, functions[i], &TempEvent, str); const bool res = NWPluginCall(functions[i], &TempEvent, str); - +#ifdef ESP32 + if (functions[i] == NWPlugin::Function::NWPLUGIN_WEBFORM_SHOW_ROUTE_PRIO) { + if (TempEvent.Par1 > 0) { + addHtmlInt(TempEvent.Par1); + if (TempEvent.Par2) { + addHtml(F("(*)")); + } + } + } else +#endif if (functions[i] == NWPlugin::Function::NWPLUGIN_WEBFORM_SHOW_CONNECTED) { if (!res || str.isEmpty()) { addEnabled(res); From 9891d43b02bc20035bfaa19bf9152f841527d5c8 Mon Sep 17 00:00:00 2001 From: TD-er Date: Sat, 26 Jul 2025 13:36:40 +0200 Subject: [PATCH 144/564] [Network] Move network plugin code to new ESPEasy::net namespace --- src/_NW001_WiFi_STA.cpp | 14 +++++-- src/_NW002_WiFi_AP.cpp | 24 +++++++---- src/_NW003_ETH_RMII.cpp | 11 ++++- src/_NW004_ETH_SPI.cpp | 34 ++++++++------- src/_NW005_PPP_modem.cpp | 42 ++++++++++++------- src/_NWPlugin_Helper.cpp | 21 ++++++---- src/_NWPlugin_Helper.h | 26 ++++++++---- src/src/DataStructs/ESPEasy_EventStruct.h | 4 +- src/src/DataStructs/NWPluginData_base.cpp | 10 ++++- src/src/DataStructs/NWPluginData_base.h | 13 ++++-- src/src/DataStructs/NetworkDriverStruct.cpp | 8 +++- src/src/DataStructs/NetworkDriverStruct.h | 7 ++++ src/src/DataStructs/NetworkSettingsStruct.cpp | 6 ++- src/src/DataStructs/NetworkSettingsStruct.h | 10 ++++- src/src/DataStructs/SettingsStruct.h | 8 ++-- src/src/DataStructs/TimingStats.cpp | 2 +- src/src/DataStructs/TimingStats.h | 2 +- src/src/DataStructs_templ/SettingsStruct.cpp | 14 +++---- src/src/DataTypes/ESPEasy_plugin_functions.h | 1 + src/src/DataTypes/NWPluginID.cpp | 5 +++ src/src/DataTypes/NWPluginID.h | 13 ++++-- src/src/DataTypes/NetworkDriverIndex.cpp | 5 +++ src/src/DataTypes/NetworkDriverIndex.h | 22 +++++++--- src/src/DataTypes/NetworkIndex.cpp | 8 +++- src/src/DataTypes/NetworkIndex.h | 7 ++++ src/src/ESPEasyCore/ESPEasy_setup.cpp | 4 +- src/src/Globals/NWPlugins.cpp | 35 ++++++++++------ src/src/Globals/NWPlugins.h | 15 ++++--- src/src/Helpers/ESPEasy_Storage.cpp | 4 +- src/src/Helpers/PeriodicalActions.cpp | 6 +-- src/src/Helpers/_NWPlugin_Helper_webform.cpp | 6 +++ src/src/Helpers/_NWPlugin_Helper_webform.h | 5 +++ src/src/Helpers/_NWPlugin_init.cpp | 14 +++++-- src/src/Helpers/_NWPlugin_init.h | 14 ++++--- src/src/NWPluginStructs/NW001_WiFi_STA.cpp | 9 ++++ src/src/NWPluginStructs/NW001_WiFi_STA.h | 21 ++++++++++ .../NW005_data_struct_PPP_modem.cpp | 18 +++++--- .../NW005_data_struct_PPP_modem.h | 23 ++++++---- src/src/WebServer/Markup.cpp | 2 +- src/src/WebServer/Markup.h | 2 +- src/src/WebServer/NetworkPage.cpp | 16 +++---- src/src/WebServer/NetworkPage.h | 8 ++-- 42 files changed, 369 insertions(+), 150 deletions(-) create mode 100644 src/src/NWPluginStructs/NW001_WiFi_STA.cpp create mode 100644 src/src/NWPluginStructs/NW001_WiFi_STA.h diff --git a/src/_NW001_WiFi_STA.cpp b/src/_NW001_WiFi_STA.cpp index 5821d47ab..8f74164e2 100644 --- a/src/_NW001_WiFi_STA.cpp +++ b/src/_NW001_WiFi_STA.cpp @@ -10,6 +10,8 @@ # define NWPLUGIN_ID_001 1 # define NWPLUGIN_NAME_001 "WiFi Station" +# include "src/NWPluginStructs/NW001_WiFi_STA.h" + # include "src/ESPEasyCore/ESPEasyNetwork.h" # include "src/ESPEasyCore/ESPEasyWifi.h" # include "src/DataStructs/ESPEasy_EventStruct.h" @@ -36,7 +38,10 @@ # include # endif -bool NWPlugin_001(NWPlugin::Function function, struct EventStruct *event, String& string) +namespace ESPEasy { +namespace net { + +bool NWPlugin_001(NWPlugin::Function function, EventStruct *event, String& string) { bool success = false; @@ -46,8 +51,8 @@ bool NWPlugin_001(NWPlugin::Function function, struct EventStruct *event, String { NetworkDriverStruct& nw = getNetworkDriverStruct(networkDriverIndex_t::toNetworkDriverIndex(event->idx)); nw.onlySingleInstance = true; - nw.alwaysPresent = true; - nw.fixedNetworkIndex = NWPLUGIN_ID_001 -1; // Start counting at 0 + nw.alwaysPresent = true; + nw.fixedNetworkIndex = NWPLUGIN_ID_001 - 1; // Start counting at 0 break; } @@ -290,4 +295,7 @@ bool NWPlugin_001(NWPlugin::Function function, struct EventStruct *event, String return success; } +} // namespace net +} // namespace ESPEasy + #endif // ifdef USES_NW001 diff --git a/src/_NW002_WiFi_AP.cpp b/src/_NW002_WiFi_AP.cpp index e3f79d955..261ad336d 100644 --- a/src/_NW002_WiFi_AP.cpp +++ b/src/_NW002_WiFi_AP.cpp @@ -33,9 +33,12 @@ // TODO TD-er: This code should be moved to this NW002 plugin -#include "src/ESPEasyCore/ESPEasyWifi.h" +# include "src/ESPEasyCore/ESPEasyWifi.h" -bool NWPlugin_002(NWPlugin::Function function, struct EventStruct *event, String& string) +namespace ESPEasy { +namespace net { + +bool NWPlugin_002(NWPlugin::Function function, EventStruct *event, String& string) { bool success = false; @@ -161,18 +164,20 @@ bool NWPlugin_002(NWPlugin::Function function, struct EventStruct *event, String case NWPlugin::Function::NWPLUGIN_INIT: { setAPinternal(true); -// WiFi.AP.begin(); + + // WiFi.AP.begin(); break; } case NWPlugin::Function::NWPLUGIN_EXIT: { -#ifdef ESP32 +# ifdef ESP32 WiFi.AP.end(); -#endif -#ifdef ESP8266 -//WiFi.softAP -#endif +# endif +# ifdef ESP8266 + + // WiFi.softAP +# endif // ifdef ESP8266 break; } @@ -183,4 +188,7 @@ bool NWPlugin_002(NWPlugin::Function function, struct EventStruct *event, String return success; } +} // namespace net +} // namespace ESPEasy + #endif // ifdef USES_NW002 diff --git a/src/_NW003_ETH_RMII.cpp b/src/_NW003_ETH_RMII.cpp index 7b80b8796..ec007958e 100644 --- a/src/_NW003_ETH_RMII.cpp +++ b/src/_NW003_ETH_RMII.cpp @@ -33,7 +33,10 @@ # include -bool NWPlugin_003(NWPlugin::Function function, struct EventStruct *event, String& string) +namespace ESPEasy { +namespace net { + +bool NWPlugin_003(NWPlugin::Function function, EventStruct *event, String& string) { bool success = false; @@ -43,7 +46,7 @@ bool NWPlugin_003(NWPlugin::Function function, struct EventStruct *event, String { NetworkDriverStruct& nw = getNetworkDriverStruct(networkDriverIndex_t::toNetworkDriverIndex(event->idx)); nw.onlySingleInstance = true; - nw.alwaysPresent = false; + nw.alwaysPresent = false; break; } @@ -304,4 +307,8 @@ bool NWPlugin_003(NWPlugin::Function function, struct EventStruct *event, String return success; } +} // namespace net +} // namespace ESPEasy + + #endif // ifdef USES_NW003 diff --git a/src/_NW004_ETH_SPI.cpp b/src/_NW004_ETH_SPI.cpp index abf27f8e7..c30362a52 100644 --- a/src/_NW004_ETH_SPI.cpp +++ b/src/_NW004_ETH_SPI.cpp @@ -33,7 +33,10 @@ # include -bool NWPlugin_004(NWPlugin::Function function, struct EventStruct *event, String& string) +namespace ESPEasy { +namespace net { + +bool NWPlugin_004(NWPlugin::Function function, EventStruct *event, String& string) { bool success = false; @@ -43,24 +46,24 @@ bool NWPlugin_004(NWPlugin::Function function, struct EventStruct *event, String { NetworkDriverStruct& nw = getNetworkDriverStruct(networkDriverIndex_t::toNetworkDriverIndex(event->idx)); nw.onlySingleInstance = true; - nw.alwaysPresent = false; + nw.alwaysPresent = false; break; } case NWPlugin::Function::NWPLUGIN_LOAD_DEFAULTS: { - /* - # if CONFIG_IDF_TARGET_ESP32P4 - Settings.ETH_Clock_Mode = EthClockMode_t::Ext_crystal; - Settings.ETH_Phy_Type = EthPhyType_t::TLK110; - Settings.ETH_Phy_Addr = ETH_PHY_ADDR; - Settings.ETH_Pin_mdc_cs = ETH_PHY_MDC; - Settings.ETH_Pin_mdio_irq = ETH_PHY_MDIO; - Settings.ETH_Pin_power_rst = ETH_PHY_POWER; - # else // if CONFIG_IDF_TARGET_ESP32P4 - Settings.ETH_Clock_Mode = EthClockMode_t::Ext_crystal_osc; - # endif // if CONFIG_IDF_TARGET_ESP32P4 - */ + /* + # if CONFIG_IDF_TARGET_ESP32P4 + Settings.ETH_Clock_Mode = EthClockMode_t::Ext_crystal; + Settings.ETH_Phy_Type = EthPhyType_t::TLK110; + Settings.ETH_Phy_Addr = ETH_PHY_ADDR; + Settings.ETH_Pin_mdc_cs = ETH_PHY_MDC; + Settings.ETH_Pin_mdio_irq = ETH_PHY_MDIO; + Settings.ETH_Pin_power_rst = ETH_PHY_POWER; + # else // if CONFIG_IDF_TARGET_ESP32P4 + Settings.ETH_Clock_Mode = EthClockMode_t::Ext_crystal_osc; + # endif // if CONFIG_IDF_TARGET_ESP32P4 + */ break; } @@ -306,4 +309,7 @@ bool NWPlugin_004(NWPlugin::Function function, struct EventStruct *event, String return success; } +} // namespace net +} // namespace ESPEasy + #endif // ifdef USES_NW004 diff --git a/src/_NW005_PPP_modem.cpp b/src/_NW005_PPP_modem.cpp index 42767b80d..418423d38 100644 --- a/src/_NW005_PPP_modem.cpp +++ b/src/_NW005_PPP_modem.cpp @@ -39,7 +39,10 @@ # include -bool NWPlugin_005(NWPlugin::Function function, struct EventStruct *event, String& string) +namespace ESPEasy { +namespace net { + +bool NWPlugin_005(NWPlugin::Function function, EventStruct *event, String& string) { bool success = false; @@ -62,7 +65,8 @@ bool NWPlugin_005(NWPlugin::Function function, struct EventStruct *event, String # ifdef ESP32 case NWPlugin::Function::NWPLUGIN_GET_INTERFACE: { - NW005_data_struct_PPP_modem *NW_data = static_cast(getNWPluginData(event->NetworkIndex)); + ESPEasy::net::ppp::NW005_data_struct_PPP_modem *NW_data = + static_cast(getNWPluginData(event->NetworkIndex)); if (NW_data && NW_data->attached()) { event->networkInterface = &PPP; @@ -75,7 +79,8 @@ bool NWPlugin_005(NWPlugin::Function function, struct EventStruct *event, String case NWPlugin::Function::NWPLUGIN_WEBFORM_SHOW_CONNECTED: { - NW005_data_struct_PPP_modem *NW_data = static_cast(getNWPluginData(event->NetworkIndex)); + ESPEasy::net::ppp::NW005_data_struct_PPP_modem *NW_data = + static_cast(getNWPluginData(event->NetworkIndex)); if (NW_data) { success = NW_data->attached(); @@ -93,7 +98,8 @@ bool NWPlugin_005(NWPlugin::Function function, struct EventStruct *event, String case NWPlugin::Function::NWPLUGIN_WEBFORM_SHOW_HW_ADDRESS: { - NW005_data_struct_PPP_modem *NW_data = static_cast(getNWPluginData(event->NetworkIndex)); + ESPEasy::net::ppp::NW005_data_struct_PPP_modem *NW_data = + static_cast(getNWPluginData(event->NetworkIndex)); if (NW_data) { string = NW_data->IMEI(); @@ -108,7 +114,8 @@ bool NWPlugin_005(NWPlugin::Function function, struct EventStruct *event, String case NWPlugin::Function::NWPLUGIN_WEBFORM_SHOW_PORT: { - NW005_data_struct_PPP_modem *NW_data = static_cast(getNWPluginData(event->NetworkIndex)); + ESPEasy::net::ppp::NW005_data_struct_PPP_modem *NW_data = + static_cast(getNWPluginData(event->NetworkIndex)); if (NW_data) { success = NW_data->webform_getPort(string); @@ -119,11 +126,12 @@ bool NWPlugin_005(NWPlugin::Function function, struct EventStruct *event, String case NWPlugin::Function::NWPLUGIN_WEBFORM_SAVE: { - NW005_data_struct_PPP_modem *NW_data = static_cast(getNWPluginData(event->NetworkIndex)); - bool mustCleanup = NW_data == nullptr; + ESPEasy::net::ppp::NW005_data_struct_PPP_modem *NW_data = + static_cast(getNWPluginData(event->NetworkIndex)); + bool mustCleanup = NW_data == nullptr; if (mustCleanup) { - NW_data = new (std::nothrow) NW005_data_struct_PPP_modem(event->NetworkIndex); + NW_data = new (std::nothrow) ESPEasy::net::ppp::NW005_data_struct_PPP_modem(event->NetworkIndex); NW_data->init_KVS(); } @@ -139,11 +147,12 @@ bool NWPlugin_005(NWPlugin::Function function, struct EventStruct *event, String case NWPlugin::Function::NWPLUGIN_WEBFORM_LOAD: { - NW005_data_struct_PPP_modem *NW_data = static_cast(getNWPluginData(event->NetworkIndex)); - bool mustCleanup = NW_data == nullptr; + ESPEasy::net::ppp::NW005_data_struct_PPP_modem *NW_data = + static_cast(getNWPluginData(event->NetworkIndex)); + bool mustCleanup = NW_data == nullptr; if (mustCleanup) { - NW_data = new (std::nothrow) NW005_data_struct_PPP_modem(event->NetworkIndex); + NW_data = new (std::nothrow) ESPEasy::net::ppp::NW005_data_struct_PPP_modem(event->NetworkIndex); NW_data->init_KVS(); } @@ -160,8 +169,9 @@ bool NWPlugin_005(NWPlugin::Function function, struct EventStruct *event, String case NWPlugin::Function::NWPLUGIN_INIT: { - initNWPluginData(event->NetworkIndex, new (std::nothrow) NW005_data_struct_PPP_modem(event->NetworkIndex)); - NW005_data_struct_PPP_modem *NW_data = static_cast(getNWPluginData(event->NetworkIndex)); + initNWPluginData(event->NetworkIndex, new (std::nothrow) ESPEasy::net::ppp::NW005_data_struct_PPP_modem(event->NetworkIndex)); + ESPEasy::net::ppp::NW005_data_struct_PPP_modem *NW_data = + static_cast(getNWPluginData(event->NetworkIndex)); if (NW_data) { success = NW_data->init(event); @@ -171,7 +181,8 @@ bool NWPlugin_005(NWPlugin::Function function, struct EventStruct *event, String case NWPlugin::Function::NWPLUGIN_EXIT: { - NW005_data_struct_PPP_modem *NW_data = static_cast(getNWPluginData(event->NetworkIndex)); + ESPEasy::net::ppp::NW005_data_struct_PPP_modem *NW_data = + static_cast(getNWPluginData(event->NetworkIndex)); if (NW_data) { success = NW_data->exit(event); @@ -186,4 +197,7 @@ bool NWPlugin_005(NWPlugin::Function function, struct EventStruct *event, String return success; } +} // namespace net +} // namespace ESPEasy + #endif // ifdef USES_NW005 diff --git a/src/_NWPlugin_Helper.cpp b/src/_NWPlugin_Helper.cpp index 8d0e8f4fa..9a9e95460 100644 --- a/src/_NWPlugin_Helper.cpp +++ b/src/_NWPlugin_Helper.cpp @@ -7,15 +7,19 @@ # include "src/Globals/NWPlugins.h" # include "src/Globals/Settings.h" +namespace ESPEasy { +namespace net { + + NWPluginData_base *NWPlugin_task_data[NETWORK_MAX]; void resetNWPluginData() { - for (networkIndex_t i = 0; i < NR_ELEMENTS(NWPlugin_task_data); ++i) { + for (ESPEasy::net::networkIndex_t i = 0; i < NR_ELEMENTS(NWPlugin_task_data); ++i) { NWPlugin_task_data[i] = nullptr; } } -void clearNWPluginData(networkIndex_t networkIndex) { +void clearNWPluginData(ESPEasy::net::networkIndex_t networkIndex) { if (validNetworkIndex(networkIndex)) { if (NWPlugin_task_data[networkIndex] != nullptr) { delete NWPlugin_task_data[networkIndex]; @@ -24,7 +28,7 @@ void clearNWPluginData(networkIndex_t networkIndex) { } } -bool initNWPluginData(networkIndex_t networkIndex, NWPluginData_base *data) { +bool initNWPluginData(ESPEasy::net::networkIndex_t networkIndex, NWPluginData_base *data) { if (!validNetworkIndex(networkIndex)) { if (data != nullptr) { delete data; @@ -57,7 +61,7 @@ bool initNWPluginData(networkIndex_t networkIndex, NWPluginData_base *data) { return getNWPluginData(networkIndex) != nullptr; } -NWPluginData_base* getNWPluginData(networkIndex_t networkIndex) { +NWPluginData_base* getNWPluginData(ESPEasy::net::networkIndex_t networkIndex) { if (nwpluginTaskData_initialized(networkIndex)) { if (!NWPlugin_task_data[networkIndex]->baseClassOnly()) { @@ -67,19 +71,22 @@ NWPluginData_base* getNWPluginData(networkIndex_t networkIndex) { return nullptr; } -NWPluginData_base* getNWPluginDataBaseClassOnly(networkIndex_t networkIndex) { +NWPluginData_base* getNWPluginDataBaseClassOnly(ESPEasy::net::networkIndex_t networkIndex) { if (nwpluginTaskData_initialized(networkIndex)) { return NWPlugin_task_data[networkIndex]; } return nullptr; } -bool nwpluginTaskData_initialized(networkIndex_t networkIndex) { +bool nwpluginTaskData_initialized(ESPEasy::net::networkIndex_t networkIndex) { if (!validNetworkIndex(networkIndex)) { return false; } return NWPlugin_task_data[networkIndex] != nullptr && - (NWPlugin_task_data[networkIndex]->getNWWPluginID() == Settings.getNWPluginID_for_network(networkIndex)); + (NWPlugin_task_data[networkIndex]->getNWPluginID() == Settings.getNWPluginID_for_network(networkIndex)); } +} // namespace net +} // namespace ESPEasy + #endif // if FEATURE_STORE_NETWORK_INTERFACE_SETTINGS diff --git a/src/_NWPlugin_Helper.h b/src/_NWPlugin_Helper.h index 80c81bc7c..3eda6d8ac 100644 --- a/src/_NWPlugin_Helper.h +++ b/src/_NWPlugin_Helper.h @@ -4,11 +4,15 @@ #include "ESPEasy_common.h" #if FEATURE_STORE_NETWORK_INTERFACE_SETTINGS + # include "src/CustomBuild/ESPEasyLimits.h" - - +# include "src/DataStructs/ESPEasy_EventStruct.h" # include "src/DataStructs/NWPluginData_base.h" +namespace ESPEasy { +namespace net { + + extern NWPluginData_base *NWPlugin_task_data[NETWORK_MAX]; // Try to allocate in PSRAM or 2nd heap if possible @@ -20,17 +24,21 @@ extern NWPluginData_base *NWPlugin_task_data[NETWORK_MAX]; // Data used by instances of NWPlugins. // ============================================= -void resetNWPluginData(); +void resetNWPluginData(); -void clearNWPluginData(networkIndex_t networkIndex); +void clearNWPluginData(ESPEasy::net::networkIndex_t networkIndex); -bool initNWPluginData(networkIndex_t networkIndex, - NWPluginData_base *data); +bool initNWPluginData(ESPEasy::net::networkIndex_t networkIndex, + NWPluginData_base * data); -NWPluginData_base* getNWPluginData(networkIndex_t networkIndex); -NWPluginData_base* getNWPluginDataBaseClassOnly(networkIndex_t networkIndex); +NWPluginData_base* getNWPluginData(ESPEasy::net::networkIndex_t networkIndex); +NWPluginData_base* getNWPluginDataBaseClassOnly(ESPEasy::net::networkIndex_t networkIndex); + +bool nwpluginTaskData_initialized(ESPEasy::net::networkIndex_t networkIndex); + +} // namespace net +} // namespace ESPEasy -bool nwpluginTaskData_initialized(networkIndex_t networkIndex); #endif // if FEATURE_STORE_NETWORK_INTERFACE_SETTINGS #endif // ifndef _NWPLUGIN_HELPER_H diff --git a/src/src/DataStructs/ESPEasy_EventStruct.h b/src/src/DataStructs/ESPEasy_EventStruct.h index e9f3b62f7..4e03a820f 100644 --- a/src/src/DataStructs/ESPEasy_EventStruct.h +++ b/src/src/DataStructs/ESPEasy_EventStruct.h @@ -11,7 +11,7 @@ #include "../DataStructs/DeviceStruct.h" #ifdef ESP32 -class NetworkInterface; +#include #endif /*********************************************************************************************\ @@ -85,7 +85,7 @@ public: #if FEATURE_NOTIFIER notifierIndex_t NotificationIndex = INVALID_NOTIFIER_INDEX; // index position in Settings.Notification, 0-3 #endif - networkIndex_t NetworkIndex = INVALID_NETWORK_INDEX; // index position in Settings.NWPluginID, 0-7 + ESPEasy::net::networkIndex_t NetworkIndex = ESPEasy::net::INVALID_NETWORK_INDEX; // index position in Settings.NWPluginID, 0-7 uint8_t BaseVarIndex = 0; Sensor_VType sensorType = Sensor_VType::SENSOR_TYPE_NOT_SET; uint8_t OriginTaskIndex = 0; diff --git a/src/src/DataStructs/NWPluginData_base.cpp b/src/src/DataStructs/NWPluginData_base.cpp index 6b248a624..beb9249c2 100644 --- a/src/src/DataStructs/NWPluginData_base.cpp +++ b/src/src/DataStructs/NWPluginData_base.cpp @@ -8,6 +8,9 @@ # include "../Helpers/StringConverter.h" # include "../Helpers/_ESPEasy_key_value_store.h" +namespace ESPEasy { +namespace net { + NWPluginData_base::NWPluginData_base(nwpluginID_t nwpluginID, networkIndex_t networkIndex) : _kvs(nullptr), @@ -26,8 +29,8 @@ NWPluginData_base::~NWPluginData_base() _kvs = nullptr; } -bool NWPluginData_base::plugin_write_base(struct EventStruct *event, - const String & string) { return false; } +bool NWPluginData_base::plugin_write_base(EventStruct *event, + const String& string) { return false; } bool NWPluginData_base::init_KVS() { @@ -59,4 +62,7 @@ bool NWPluginData_base::_store() _nw_data_pluginID.value); } +} // namespace net +} // namespace ESPEasy + #endif // if FEATURE_STORE_NETWORK_INTERFACE_SETTINGS diff --git a/src/src/DataStructs/NWPluginData_base.h b/src/src/DataStructs/NWPluginData_base.h index 5cca7940f..a1e6826ce 100644 --- a/src/src/DataStructs/NWPluginData_base.h +++ b/src/src/DataStructs/NWPluginData_base.h @@ -5,10 +5,15 @@ #if FEATURE_STORE_NETWORK_INTERFACE_SETTINGS +# include "../DataStructs/ESPEasy_EventStruct.h" # include "../DataTypes/NWPluginID.h" # include "../DataTypes/NetworkIndex.h" # include "../Helpers/_ESPEasy_key_value_store.h" +namespace ESPEasy { +namespace net { + + // ============================================== // Data used by instances of NW-plugins. // ============================================= @@ -26,14 +31,14 @@ struct NWPluginData_base { return _baseClassOnly; } - bool plugin_write_base(struct EventStruct *event, - const String & string); + bool plugin_write_base(EventStruct *event, + const String& string); // Should only be called from initNWPluginData bool init_KVS(); - nwpluginID_t getNWWPluginID() const { return _nw_data_pluginID; } + nwpluginID_t getNWPluginID() const { return _nw_data_pluginID; } protected: @@ -58,6 +63,8 @@ protected: }; +} // namespace net +} // namespace ESPEasy #endif // if FEATURE_STORE_NETWORK_INTERFACE_SETTINGS diff --git a/src/src/DataStructs/NetworkDriverStruct.cpp b/src/src/DataStructs/NetworkDriverStruct.cpp index 6e2eb8773..8f813525c 100644 --- a/src/src/DataStructs/NetworkDriverStruct.cpp +++ b/src/src/DataStructs/NetworkDriverStruct.cpp @@ -1 +1,7 @@ -#include "../DataStructs/NetworkDriverStruct.h" \ No newline at end of file +#include "../DataStructs/NetworkDriverStruct.h" + +namespace ESPEasy { +namespace net { + +} +} diff --git a/src/src/DataStructs/NetworkDriverStruct.h b/src/src/DataStructs/NetworkDriverStruct.h index a643f118e..d6f96cf88 100644 --- a/src/src/DataStructs/NetworkDriverStruct.h +++ b/src/src/DataStructs/NetworkDriverStruct.h @@ -7,6 +7,10 @@ #include +namespace ESPEasy { +namespace net { + + /*********************************************************************************************\ * NetworkDriverStruct \*********************************************************************************************/ @@ -21,4 +25,7 @@ struct NetworkDriverStruct }; +} // namespace net +} // namespace ESPEasy + #endif // ifndef DATASTRUCTS_NETWORKDRIVERSTRUCT_H diff --git a/src/src/DataStructs/NetworkSettingsStruct.cpp b/src/src/DataStructs/NetworkSettingsStruct.cpp index 6ea3c8d0f..626b54250 100644 --- a/src/src/DataStructs/NetworkSettingsStruct.cpp +++ b/src/src/DataStructs/NetworkSettingsStruct.cpp @@ -15,6 +15,9 @@ #include #include +namespace ESPEasy { +namespace net { + NetworkSettingsStruct::NetworkSettingsStruct() { @@ -29,9 +32,10 @@ void NetworkSettingsStruct::reset() { } - void NetworkSettingsStruct::validate() { } +} // namespace net +} // namespace ESPEasy diff --git a/src/src/DataStructs/NetworkSettingsStruct.h b/src/src/DataStructs/NetworkSettingsStruct.h index f3bb432cb..154ab8501 100644 --- a/src/src/DataStructs/NetworkSettingsStruct.h +++ b/src/src/DataStructs/NetworkSettingsStruct.h @@ -10,6 +10,11 @@ #include // for std::nothrow #include "../Globals/Plugins.h" +#include "../Helpers/Memory.h" + +namespace ESPEasy { +namespace net { + struct NetworkSettingsStruct { @@ -45,7 +50,6 @@ private: }; -#include "../Helpers/Memory.h" typedef std::shared_ptr NetworkSettingsStruct_ptr_type; @@ -62,4 +66,8 @@ typedef std::shared_ptr NetworkSettingsStruct_ptr_type; // Check to see if MakeNetworkSettings was successful #define AllocatedNetworkSettings() (NetworkSettings.get() != nullptr) +} +} + + #endif // DATASTRUCTS_NETWORKSETTINGSSTRUCT_H diff --git a/src/src/DataStructs/SettingsStruct.h b/src/src/DataStructs/SettingsStruct.h index 1bb8c9a81..3dd10b187 100644 --- a/src/src/DataStructs/SettingsStruct.h +++ b/src/src/DataStructs/SettingsStruct.h @@ -405,20 +405,20 @@ public: memcpy(&VariousBits_2, &value, sizeof(VariousBits_2)); } - bool getNetworkEnabled(networkIndex_t index) const { + bool getNetworkEnabled(ESPEasy::net::networkIndex_t index) const { if (validNetworkIndex(index)) return bitRead(NetworkEnabled_bits, index); return false; } - void setNetworkEnabled(networkIndex_t index, bool enabled) { + void setNetworkEnabled(ESPEasy::net::networkIndex_t index, bool enabled) { if (validNetworkIndex(index)) { bitWrite(NetworkEnabled_bits, index, enabled); } } - nwpluginID_t getNWPluginID_for_network(networkIndex_t index) const; + ESPEasy::net::nwpluginID_t getNWPluginID_for_network(ESPEasy::net::networkIndex_t index) const; - void setNWPluginID_for_network(networkIndex_t index, nwpluginID_t id); + void setNWPluginID_for_network(ESPEasy::net::networkIndex_t index, ESPEasy::net::nwpluginID_t id); unsigned long PID = 0; diff --git a/src/src/DataStructs/TimingStats.cpp b/src/src/DataStructs/TimingStats.cpp index 721070c24..caf56ad2a 100644 --- a/src/src/DataStructs/TimingStats.cpp +++ b/src/src/DataStructs/TimingStats.cpp @@ -338,7 +338,7 @@ void stopTimerController(protocolIndex_t T, CPlugin::Function F, uint32_t statis if (mustLogCFunction(F)) { controllerStats[static_cast(T) * 256 + static_cast(F)].add(usecPassedSince_fast(statisticsTimerStart)); } } -void stopTimerNetwork(networkDriverIndex_t T, NWPlugin::Function F, uint32_t statisticsTimerStart) +void stopTimerNetwork(ESPEasy::net::networkDriverIndex_t T, NWPlugin::Function F, uint32_t statisticsTimerStart) { if (mustLogNWFunction(F)) { networkStats[static_cast(T.value) * 256 + static_cast(F)].add(usecPassedSince_fast(statisticsTimerStart)); } } diff --git a/src/src/DataStructs/TimingStats.h b/src/src/DataStructs/TimingStats.h index 331a10220..ab3894181 100644 --- a/src/src/DataStructs/TimingStats.h +++ b/src/src/DataStructs/TimingStats.h @@ -177,7 +177,7 @@ void stopTimerTask(deviceIndex_t T, void stopTimerController(protocolIndex_t T, CPlugin::Function F, uint32_t statisticsTimerStart); -void stopTimerNetwork(networkDriverIndex_t T, +void stopTimerNetwork(ESPEasy::net::networkDriverIndex_t T, NWPlugin::Function F, uint32_t statisticsTimerStart); void stopTimer(TimingStatsElements L, diff --git a/src/src/DataStructs_templ/SettingsStruct.cpp b/src/src/DataStructs_templ/SettingsStruct.cpp index cf0594fab..57f52424b 100644 --- a/src/src/DataStructs_templ/SettingsStruct.cpp +++ b/src/src/DataStructs_templ/SettingsStruct.cpp @@ -550,12 +550,12 @@ void SettingsStruct_tmpl::validate() { // Make sure the WiFi and AP drivers are always added and set enabled when loading older settings, // or factory default settings - for (networkDriverIndex_t index; validNetworkDriverIndex(index); ++index) + for (ESPEasy::net::networkDriverIndex_t index; ESPEasy::net::validNetworkDriverIndex(index); ++index) { - const NetworkDriverStruct& nw = getNetworkDriverStruct(index); + const ESPEasy::net::NetworkDriverStruct& nw = ESPEasy::net::getNetworkDriverStruct(index); if (nw.alwaysPresent) { if (validNetworkIndex(nw.fixedNetworkIndex)) { - const nwpluginID_t nwpluginID = getNWPluginID_from_NetworkDriverIndex(index); + const ESPEasy::net::nwpluginID_t nwpluginID = ESPEasy::net::getNWPluginID_from_NetworkDriverIndex(index); if (getNWPluginID_for_network(nw.fixedNetworkIndex) != nwpluginID) { setNWPluginID_for_network(nw.fixedNetworkIndex, nwpluginID); setNetworkEnabled(nw.fixedNetworkIndex, true); @@ -1313,19 +1313,19 @@ pluginID_t SettingsStruct_tmpl::getPluginID_for_task(taskIndex_t taskIn } template -nwpluginID_t SettingsStruct_tmpl::getNWPluginID_for_network(networkIndex_t index) const +ESPEasy::net::nwpluginID_t SettingsStruct_tmpl::getNWPluginID_for_network(ESPEasy::net::networkIndex_t index) const { if (validNetworkIndex(index)) { const uint8_t nwa = NWPluginID[index]; if (nwa > 0) { - return nwpluginID_t::toPluginID(nwa); + return ESPEasy::net::nwpluginID_t::toPluginID(nwa); } } - return INVALID_NW_PLUGIN_ID; + return ESPEasy::net::INVALID_NW_PLUGIN_ID; } template -void SettingsStruct_tmpl::setNWPluginID_for_network(networkIndex_t index, nwpluginID_t id) +void SettingsStruct_tmpl::setNWPluginID_for_network(ESPEasy::net::networkIndex_t index, ESPEasy::net::nwpluginID_t id) { if (validNetworkIndex(index)) { NWPluginID[index] = id.value; diff --git a/src/src/DataTypes/ESPEasy_plugin_functions.h b/src/src/DataTypes/ESPEasy_plugin_functions.h index 4f9235470..93e4c40e6 100644 --- a/src/src/DataTypes/ESPEasy_plugin_functions.h +++ b/src/src/DataTypes/ESPEasy_plugin_functions.h @@ -161,6 +161,7 @@ public: NWPLUGIN_GET_INTERFACE, NWPLUGIN_WEBFORM_SHOW_ROUTE_PRIO, #endif + NWPLUGIN_PROCESS_EVENT, // Process received event arduino_event_id_t NWPLUGIN_WEBFORM_SHOW_CONNECTED, // Used for showing connected state/speed NWPLUGIN_WEBFORM_SHOW_HOSTNAME, // Used for showing hostname NWPLUGIN_WEBFORM_SHOW_HW_ADDRESS, // Used for showing MAC diff --git a/src/src/DataTypes/NWPluginID.cpp b/src/src/DataTypes/NWPluginID.cpp index 3ba3476ae..815e06cb4 100644 --- a/src/src/DataTypes/NWPluginID.cpp +++ b/src/src/DataTypes/NWPluginID.cpp @@ -2,6 +2,8 @@ #include "../Helpers/StringConverter.h" +namespace ESPEasy { +namespace net { String nwpluginID_t::toDisplayString() const { if (value == 0) { return F("NW---"); } @@ -9,3 +11,6 @@ String nwpluginID_t::toDisplayString() const { } const nwpluginID_t INVALID_NW_PLUGIN_ID{}; + +} // namespace net +} // namespace ESPEasy diff --git a/src/src/DataTypes/NWPluginID.h b/src/src/DataTypes/NWPluginID.h index 97f4d0e17..888526c1b 100644 --- a/src/src/DataTypes/NWPluginID.h +++ b/src/src/DataTypes/NWPluginID.h @@ -3,6 +3,9 @@ #include "../../ESPEasy_common.h" +namespace ESPEasy { +namespace net { + struct __attribute__((__packed__)) nwpluginID_t { nwpluginID_t() = default; @@ -13,7 +16,6 @@ struct __attribute__((__packed__)) nwpluginID_t { constexpr explicit nwpluginID_t(uint8_t id) : value(id) {} - static nwpluginID_t toPluginID(unsigned other) { nwpluginID_t res; @@ -54,16 +56,19 @@ struct __attribute__((__packed__)) nwpluginID_t { return this->value != other.value; } - void setInvalid() { - value = 0; - } + void setInvalid() { value = 0; } String toDisplayString() const; uint8_t value{}; + }; extern const nwpluginID_t INVALID_NW_PLUGIN_ID; +} // namespace net +} // namespace ESPEasy + + #endif // ifndef DATATYPES_NWPLUGINID_H diff --git a/src/src/DataTypes/NetworkDriverIndex.cpp b/src/src/DataTypes/NetworkDriverIndex.cpp index 67310bde4..f980389bc 100644 --- a/src/src/DataTypes/NetworkDriverIndex.cpp +++ b/src/src/DataTypes/NetworkDriverIndex.cpp @@ -2,5 +2,10 @@ #include "../CustomBuild/ESPEasyLimits.h" +namespace ESPEasy { +namespace net { networkDriverIndex_t INVALID_NETWORKDRIVER_INDEX = networkDriverIndex_t::toNetworkDriverIndex(NETWORKDRIVER_INDEX_MAX); + +} // namespace net +} // namespace ESPEasy diff --git a/src/src/DataTypes/NetworkDriverIndex.h b/src/src/DataTypes/NetworkDriverIndex.h index 75baa89ff..374082503 100644 --- a/src/src/DataTypes/NetworkDriverIndex.h +++ b/src/src/DataTypes/NetworkDriverIndex.h @@ -5,6 +5,9 @@ #include "../CustomBuild/ESPEasyLimits.h" +namespace ESPEasy { +namespace net { + struct networkDriverIndex_t { networkDriverIndex_t() = default; @@ -14,7 +17,7 @@ struct networkDriverIndex_t { } static networkDriverIndex_t toNetworkDriverIndex(unsigned other) - { + { networkDriverIndex_t res; res = other; return res; @@ -24,13 +27,12 @@ struct networkDriverIndex_t { // as this makes it impossible for the compiler to typecheck its use. // networkDriverIndex_t(int other); - networkDriverIndex_t& operator=(unsigned other) + networkDriverIndex_t& operator=(unsigned other) { value = (other < NETWORKDRIVER_INDEX_MAX) ? other : NETWORKDRIVER_INDEX_MAX; return *this; } - networkDriverIndex_t& operator=(const networkDriverIndex_t& other) { value = other.value; @@ -42,12 +44,16 @@ struct networkDriverIndex_t { // on ESP8266. // On ESP32 we have a strongly typed NetworkDriverVector class and thus we can properly check per operator. #ifndef ESP8266 - bool operator<(unsigned other) const { return value < other; } - bool operator!=(unsigned other) const { return value != other; } + bool operator<(unsigned other) const { return value < other; } + + bool operator!=(unsigned other) const { return value != other; } + bool operator!=(const networkDriverIndex_t& other) const { return value != other.value; } #else // ifndef ESP8266 - operator unsigned() const { return value; } + operator unsigned() const { + return value; + } #endif // ifndef ESP8266 networkDriverIndex_t& operator++() @@ -58,9 +64,13 @@ struct networkDriverIndex_t { } uint8_t value{}; // Init this to 0, so we can easily iterate over it. + }; extern networkDriverIndex_t INVALID_NETWORKDRIVER_INDEX; +} // namespace net +} // namespace ESPEasy + #endif // ifndef DATATYPES_NETWORKDRIVERINDEX_H diff --git a/src/src/DataTypes/NetworkIndex.cpp b/src/src/DataTypes/NetworkIndex.cpp index 92daa31f5..49920b680 100644 --- a/src/src/DataTypes/NetworkIndex.cpp +++ b/src/src/DataTypes/NetworkIndex.cpp @@ -2,4 +2,10 @@ #include "../CustomBuild/ESPEasyLimits.h" -networkIndex_t INVALID_NETWORK_INDEX = NETWORK_MAX; \ No newline at end of file +namespace ESPEasy { +namespace net { + +networkIndex_t INVALID_NETWORK_INDEX = NETWORK_MAX; + +} // namespace net +} // namespace ESPEasy diff --git a/src/src/DataTypes/NetworkIndex.h b/src/src/DataTypes/NetworkIndex.h index c196de707..eae415213 100644 --- a/src/src/DataTypes/NetworkIndex.h +++ b/src/src/DataTypes/NetworkIndex.h @@ -3,8 +3,15 @@ #include "../../ESPEasy_common.h" +namespace ESPEasy { +namespace net { + typedef uint8_t networkIndex_t; extern networkIndex_t INVALID_NETWORK_INDEX; +} // namespace net +} // namespace ESPEasy + + #endif \ No newline at end of file diff --git a/src/src/ESPEasyCore/ESPEasy_setup.cpp b/src/src/ESPEasyCore/ESPEasy_setup.cpp index 195245b15..2b8bce205 100644 --- a/src/src/ESPEasyCore/ESPEasy_setup.cpp +++ b/src/src/ESPEasyCore/ESPEasy_setup.cpp @@ -227,7 +227,7 @@ void ESPEasy_setup() PluginSetup(); CPluginSetup(); - NWPluginSetup(); + ESPEasy::net::NWPluginSetup(); initWiFi(); WiFiEventData.clearAll(); @@ -543,7 +543,7 @@ void ESPEasy_setup() #ifndef BUILD_NO_RAM_TRACKER logMemUsageAfter(F("CPluginInit()")); #endif // ifndef BUILD_NO_RAM_TRACKER - NWPluginInit(); + ESPEasy::net::NWPluginInit(); #ifndef BUILD_NO_RAM_TRACKER logMemUsageAfter(F("NWPluginInit()")); #endif // ifndef BUILD_NO_RAM_TRACKER diff --git a/src/src/Globals/NWPlugins.cpp b/src/src/Globals/NWPlugins.cpp index f5ee68fe8..e3420bcce 100644 --- a/src/src/Globals/NWPlugins.cpp +++ b/src/src/Globals/NWPlugins.cpp @@ -11,7 +11,10 @@ #include "../Helpers/_NWPlugin_init.h" #include "../Helpers/PrintToString.h" -bool NWPluginCall(NWPlugin::Function Function, struct EventStruct *event) { +namespace ESPEasy { +namespace net { + +bool NWPluginCall(NWPlugin::Function Function, EventStruct *event) { #ifdef USE_SECOND_HEAP HeapSelectDram ephemeral; #endif // ifdef USE_SECOND_HEAP @@ -21,13 +24,13 @@ bool NWPluginCall(NWPlugin::Function Function, struct EventStruct *event) { return NWPluginCall(Function, event, dummy); } -bool NWPluginCall(NWPlugin::Function Function, struct EventStruct *event, String& str) +bool NWPluginCall(NWPlugin::Function Function, EventStruct *event, String& str) { #ifdef USE_SECOND_HEAP HeapSelectDram ephemeral; #endif // ifdef USE_SECOND_HEAP - struct EventStruct TempEvent; + EventStruct TempEvent; if (event == 0) { event = &TempEvent; @@ -51,6 +54,7 @@ bool NWPluginCall(NWPlugin::Function Function, struct EventStruct *event, String if (Function == NWPlugin::Function::NWPLUGIN_INIT_ALL) { Function = NWPlugin::Function::NWPLUGIN_INIT; } + if (Function == NWPlugin::Function::NWPLUGIN_EXIT_ALL) { Function = NWPlugin::Function::NWPLUGIN_EXIT; } @@ -89,7 +93,7 @@ bool NWPluginCall(NWPlugin::Function Function, struct EventStruct *event, String #ifdef ESP32 case NWPlugin::Function::NWPLUGIN_GET_INTERFACE: case NWPlugin::Function::NWPLUGIN_WEBFORM_SHOW_ROUTE_PRIO: -#endif +#endif // ifdef ESP32 case NWPlugin::Function::NWPLUGIN_CONNECT_SUCCESS: case NWPlugin::Function::NWPLUGIN_CONNECT_FAIL: case NWPlugin::Function::NWPLUGIN_DRIVER_TEMPLATE: @@ -128,15 +132,16 @@ bool NWPluginCall(NWPlugin::Function Function, struct EventStruct *event, String switch (Function) { case NWPlugin::Function::NWPLUGIN_WEBFORM_SHOW_ROUTE_PRIO: -#if ESP_IDF_VERSION >= ESP_IDF_VERSION_VAL(5, 5, 0) - // TODO TD-er: Must also add option to set route prio - // See: https://github.com/espressif/arduino-esp32/pull/11617 +# if ESP_IDF_VERSION >= ESP_IDF_VERSION_VAL(5, 5, 0) + + // TODO TD-er: Must also add option to set route prio + // See: https://github.com/espressif/arduino-esp32/pull/11617 event->Par1 = event->networkInterface->getRoutePrio(); -#else +# else // if ESP_IDF_VERSION >= ESP_IDF_VERSION_VAL(5, 5, 0) event->Par1 = event->networkInterface->route_prio(); -#endif +# endif // if ESP_IDF_VERSION >= ESP_IDF_VERSION_VAL(5, 5, 0) event->Par2 = event->networkInterface->isDefault(); - success = true; + success = true; break; case NWPlugin::Function::NWPLUGIN_WEBFORM_SHOW_HOSTNAME: @@ -145,9 +150,9 @@ bool NWPluginCall(NWPlugin::Function Function, struct EventStruct *event, String break; case NWPlugin::Function::NWPLUGIN_WEBFORM_SHOW_HW_ADDRESS: - str = event->networkInterface->macAddress(); + str = event->networkInterface->macAddress(); event->String1 = F("MAC"); - success = true; + success = true; break; case NWPlugin::Function::NWPLUGIN_WEBFORM_SHOW_IP: @@ -213,7 +218,8 @@ networkDriverIndex_t getNetworkDriverIndex_from_NWPluginID(nwpluginID_t nwplugin return do_getNetworkDriverIndex_from_NWPluginID(nwpluginID); } -nwpluginID_t getNWPluginID_from_NetworkDriverIndex(networkDriverIndex_t index) { return do_getNWPluginID_from_NetworkDriverIndex(index); } +nwpluginID_t getNWPluginID_from_NetworkDriverIndex(networkDriverIndex_t index) { return do_getNWPluginID_from_NetworkDriverIndex(index); +} nwpluginID_t getNWPluginID_from_NetworkIndex(networkIndex_t index) { const networkDriverIndex_t networkDriverIndex = getNetworkDriverIndex_from_NetworkIndex(index); @@ -238,3 +244,6 @@ String getNWPluginNameFromNWPluginID(nwpluginID_t nwpluginID) { } return getNWPluginNameFromNetworkDriverIndex(networkDriverIndex); } + +} // namespace net +} // namespace ESPEasy diff --git a/src/src/Globals/NWPlugins.h b/src/src/Globals/NWPlugins.h index 3f40debca..8f7b65d65 100644 --- a/src/src/Globals/NWPlugins.h +++ b/src/src/Globals/NWPlugins.h @@ -4,17 +4,20 @@ #include "../../ESPEasy_common.h" #include "../CustomBuild/ESPEasyLimits.h" +#include "../DataStructs/ESPEasy_EventStruct.h" #include "../DataTypes/ESPEasy_plugin_functions.h" #include "../DataTypes/NWPluginID.h" #include "../DataTypes/NetworkIndex.h" #include "../DataTypes/NetworkDriverIndex.h" +namespace ESPEasy { +namespace net { -bool NWPluginCall(NWPlugin::Function Function, - struct EventStruct *event); -bool NWPluginCall(NWPlugin::Function Function, - struct EventStruct *event, - String & str); +bool NWPluginCall(NWPlugin::Function Function, + EventStruct *event); +bool NWPluginCall(NWPlugin::Function Function, + EventStruct *event, + String & str); bool validNetworkDriverIndex(networkDriverIndex_t index); @@ -40,5 +43,7 @@ nwpluginID_t getNWPluginID_from_NetworkIndex(networkIndex_t index); String getNWPluginNameFromNetworkDriverIndex(networkDriverIndex_t NetworkDriverIndex); String getNWPluginNameFromNWPluginID(nwpluginID_t nwpluginID); +} // namespace net +} // namespace ESPEasy #endif // ifndef GLOBALS_NWPLUGIN_H diff --git a/src/src/Helpers/ESPEasy_Storage.cpp b/src/src/Helpers/ESPEasy_Storage.cpp index 3e54bc6cc..6977961ab 100644 --- a/src/src/Helpers/ESPEasy_Storage.cpp +++ b/src/src/Helpers/ESPEasy_Storage.cpp @@ -1122,7 +1122,7 @@ uint8_t disableAllNotifications(uint8_t bootFailedCount) { \*********************************************************************************************/ uint8_t disableNetwork(uint8_t bootFailedCount) { - for (networkIndex_t i = 0; i < NETWORK_MAX && bootFailedCount > 0; ++i) { + for (ESPEasy::net::networkIndex_t i = 0; i < NETWORK_MAX && bootFailedCount > 0; ++i) { if (Settings.getNetworkEnabled(i)) { --bootFailedCount; @@ -1139,7 +1139,7 @@ uint8_t disableAllNetworkss(uint8_t bootFailedCount) if (bootFailedCount > 0) { --bootFailedCount; - for (networkIndex_t i = 0; i < NETWORK_MAX; ++i) { + for (ESPEasy::net::networkIndex_t i = 0; i < NETWORK_MAX; ++i) { Settings.setNetworkEnabled(i, false); } } diff --git a/src/src/Helpers/PeriodicalActions.cpp b/src/src/Helpers/PeriodicalActions.cpp index 26c166a43..57f25a474 100644 --- a/src/src/Helpers/PeriodicalActions.cpp +++ b/src/src/Helpers/PeriodicalActions.cpp @@ -67,7 +67,7 @@ void run50TimesPerSecond() { } { START_TIMER; - NWPluginCall(NWPlugin::Function::NWPLUGIN_FIFTY_PER_SECOND, 0, dummy); + ESPEasy::net::NWPluginCall(NWPlugin::Function::NWPLUGIN_FIFTY_PER_SECOND, 0, dummy); STOP_TIMER(NWPLUGIN_CALL_50PS); } @@ -103,7 +103,7 @@ void run10TimesPerSecond() { } { START_TIMER; - NWPluginCall(NWPlugin::Function::NWPLUGIN_TEN_PER_SECOND, 0, dummy); + ESPEasy::net::NWPluginCall(NWPlugin::Function::NWPLUGIN_TEN_PER_SECOND, 0, dummy); STOP_TIMER(NWPLUGIN_CALL_10PS); } @@ -507,7 +507,7 @@ void prepareShutdown(IntendedRebootReason_e reason) process_serialWriteBuffer(); flushAndDisconnectAllClients(); saveUserVarToRTC(); - NWPluginCall(NWPlugin::Function::NWPLUGIN_EXIT_ALL, 0); + ESPEasy::net::NWPluginCall(NWPlugin::Function::NWPLUGIN_EXIT_ALL, 0); // ESPEasy::net::wifi::setWifiMode(WIFI_OFF); ESPEASY_FS.end(); process_serialWriteBuffer(); diff --git a/src/src/Helpers/_NWPlugin_Helper_webform.cpp b/src/src/Helpers/_NWPlugin_Helper_webform.cpp index ee8324e78..8d0a5e155 100644 --- a/src/src/Helpers/_NWPlugin_Helper_webform.cpp +++ b/src/src/Helpers/_NWPlugin_Helper_webform.cpp @@ -14,6 +14,9 @@ #include "../Helpers/_NWPlugin_init.h" +namespace ESPEasy { +namespace net { + /*********************************************************************************************\ * Functions to load and store network settings on the web page. \*********************************************************************************************/ @@ -215,3 +218,6 @@ void saveNetworkParameterForm(NetworkSettingsStruct & NetworkSettings, break; } } + +} // namespace net +} // namespace ESPEasy diff --git a/src/src/Helpers/_NWPlugin_Helper_webform.h b/src/src/Helpers/_NWPlugin_Helper_webform.h index 9cf4ee6a7..acc9d54b9 100644 --- a/src/src/Helpers/_NWPlugin_Helper_webform.h +++ b/src/src/Helpers/_NWPlugin_Helper_webform.h @@ -6,6 +6,9 @@ #include "../DataStructs/NetworkSettingsStruct.h" #include "../Globals/NWPlugins.h" +namespace ESPEasy { +namespace net { + /*********************************************************************************************\ * Functions to load and store network settings on the web page. @@ -32,5 +35,7 @@ void saveNetworkParameterForm(NetworkSettingsStruct & NetworkSettings, networkIndex_t networkindex, NetworkSettingsStruct::VarType varType); +} // namespace net +} // namespace ESPEasy #endif // ifndef HELPERS__NWPLUGIN_HELPER_WEBFORM_H diff --git a/src/src/Helpers/_NWPlugin_init.cpp b/src/src/Helpers/_NWPlugin_init.cpp index 420922dde..5c5d153c0 100644 --- a/src/src/Helpers/_NWPlugin_init.cpp +++ b/src/src/Helpers/_NWPlugin_init.cpp @@ -10,6 +10,9 @@ #include "../Helpers/Misc.h" +namespace ESPEasy { +namespace net { + // ******************************************************************************** // Initialize all Network NWPlugins that where defined earlier // and initialize the function call pointer into the NWPlugin array @@ -1040,7 +1043,7 @@ constexpr /*nwpluginID_t*/ uint8_t NetworkDriverIndex_to_NWPlugin_id[] PROGMEM = typedef bool (*NWPlugin_ptr_t)(NWPlugin::Function, - struct EventStruct *, + EventStruct *, String&); const NWPlugin_ptr_t PROGMEM NWPlugin_ptr[] = @@ -2117,7 +2120,7 @@ bool do_check_validNetworkDriverIndex(networkDriverIndex_t networkDriverIndex) nwpluginID_t getHighestIncludedNWPluginID() { return nwpluginID_t::toPluginID(Highest_NWPlugin_id); } -bool do_NWPluginCall(networkDriverIndex_t networkDriverIndex, NWPlugin::Function Function, struct EventStruct *event, String& string) +bool do_NWPluginCall(networkDriverIndex_t networkDriverIndex, NWPlugin::Function Function, EventStruct *event, String& string) { if (networkDriverIndex.value < NetworkDriverIndex_to_NWPlugin_id_size) { @@ -2149,7 +2152,7 @@ void NWPluginSetup() if (nwpluginID) { NWPlugin_id_to_NetworkDriverIndex[nwpluginID.value] = networkDriverIndex; - struct EventStruct TempEvent; + EventStruct TempEvent; TempEvent.idx = networkDriverIndex.value; String dummy; do_NWPluginCall(networkDriverIndex, NWPlugin::Function::NWPLUGIN_DRIVER_ADD, &TempEvent, dummy); @@ -2161,10 +2164,13 @@ void NWPluginSetup() void NWPluginInit() { // Set all not supported nwplugins to disabled. - for (networkIndex_t network = 0; network < NETWORK_MAX; ++network) { + for (ESPEasy::net::networkIndex_t network = 0; network < NETWORK_MAX; ++network) { if (!supportedNWPluginID(Settings.getNWPluginID_for_network(network))) { Settings.setNetworkEnabled(network, false); } } NWPluginCall(NWPlugin::Function::NWPLUGIN_INIT_ALL, 0); } + +} // namespace net +} // namespace ESPEasy diff --git a/src/src/Helpers/_NWPlugin_init.h b/src/src/Helpers/_NWPlugin_init.h index 02bbd0778..f190820ad 100644 --- a/src/src/Helpers/_NWPlugin_init.h +++ b/src/src/Helpers/_NWPlugin_init.h @@ -3,13 +3,15 @@ #include "../../ESPEasy_common.h" +#include "../DataStructs/ESPEasy_EventStruct.h" +#include "../DataStructs/NetworkDriverStruct.h" #include "../DataTypes/ESPEasy_plugin_functions.h" - #include "../DataTypes/NWPluginID.h" #include "../DataTypes/NetworkDriverIndex.h" -#include "../DataStructs/NetworkDriverStruct.h" -struct EventStruct; + +namespace ESPEasy { +namespace net { networkDriverIndex_t do_getNetworkDriverIndex_from_NWPluginID(nwpluginID_t pluginID); nwpluginID_t do_getNWPluginID_from_NetworkDriverIndex(networkDriverIndex_t networkDriverIndex); @@ -20,7 +22,7 @@ nwpluginID_t getHighestIncludedNWPluginID(); NetworkDriverStruct& getNetworkDriverStruct(networkDriverIndex_t networkDriverIndex); // Should only be called from NWPluginCall, or maybe for very special occasions -bool do_NWPluginCall(networkDriverIndex_t networkDriverIndex, NWPlugin::Function Function, struct EventStruct *event, String& string); +bool do_NWPluginCall(networkDriverIndex_t networkDriverIndex, NWPlugin::Function Function, EventStruct *event, String& string); void NWPluginSetup(); @@ -32,7 +34,7 @@ void NWPluginInit(); // // Uncrustify must not be used on macros, so turn it off. // *INDENT-OFF* -#define ADDNWPLUGIN_H(NNN) bool NWPlugin_##NNN(NWPlugin::Function function, struct EventStruct *event, String& string); +#define ADDNWPLUGIN_H(NNN) bool NWPlugin_##NNN(NWPlugin::Function function, EventStruct *event, String& string); // Uncrustify must not be used on macros, but we're now done, so turn Uncrustify on again. // *INDENT-ON* @@ -1058,5 +1060,7 @@ void NWPluginInit(); #undef ADDNWPLUGIN_H +} // namespace net +} // namespace ESPEasy #endif \ No newline at end of file diff --git a/src/src/NWPluginStructs/NW001_WiFi_STA.cpp b/src/src/NWPluginStructs/NW001_WiFi_STA.cpp new file mode 100644 index 000000000..ce313210e --- /dev/null +++ b/src/src/NWPluginStructs/NW001_WiFi_STA.cpp @@ -0,0 +1,9 @@ +#include "../NWPluginStructs/NW001_WiFi_STA.h" + +namespace ESPEasy { +namespace net { +namespace wifi { + +} // namespace wifi +} // namespace net +} // namespace ESPEasy diff --git a/src/src/NWPluginStructs/NW001_WiFi_STA.h b/src/src/NWPluginStructs/NW001_WiFi_STA.h new file mode 100644 index 000000000..1cbb8a895 --- /dev/null +++ b/src/src/NWPluginStructs/NW001_WiFi_STA.h @@ -0,0 +1,21 @@ +#ifndef NWPLUGINSTRUCTS_NW001_WIFI_STA_H +#define NWPLUGINSTRUCTS_NW001_WIFI_STA_H + +#include "../../_NWPlugin_Helper.h" +#ifdef USES_NW001 + +namespace ESPEasy { +namespace net { +namespace wifi { + +struct NW001_data_struct_WiFi_STA : public NWPluginData_base { + +}; + + +} // namespace wifi +} // namespace net +} // namespace ESPEasy + +#endif // ifdef USES_NW001 +#endif // ifndef NWPLUGINSTRUCTS_NW001_WIFI_STA_H diff --git a/src/src/NWPluginStructs/NW005_data_struct_PPP_modem.cpp b/src/src/NWPluginStructs/NW005_data_struct_PPP_modem.cpp index e2b98de47..30a80cd4f 100644 --- a/src/src/NWPluginStructs/NW005_data_struct_PPP_modem.cpp +++ b/src/src/NWPluginStructs/NW005_data_struct_PPP_modem.cpp @@ -18,6 +18,10 @@ // # include // #include +namespace ESPEasy { +namespace net { +namespace ppp { + // Keys as used in the Key-value-store # define NW005_KEY_SERIAL_PORT 1 # define NW005_KEY_PIN_RX 2 @@ -314,7 +318,7 @@ void NW005_data_struct_PPP_modem::webform_load_UE_system_information() } -void NW005_data_struct_PPP_modem::webform_load(struct EventStruct *event) +void NW005_data_struct_PPP_modem::webform_load(EventStruct *event) { _load(); @@ -451,7 +455,7 @@ void NW005_data_struct_PPP_modem::webform_load(struct EventStruct *event) addFormNote(F("Only numerical digits")); } - if (!Settings.getNetworkEnabled(event->NetworkIndex)) return; + if (!Settings.getNetworkEnabled(event->NetworkIndex)) { return; } addFormSubHeader(F("Modem State")); addRowLabel(F("Modem Model")); @@ -626,7 +630,7 @@ void NW005_data_struct_PPP_modem::webform_load(struct EventStruct *event) webform_load_UE_system_information(); } -void NW005_data_struct_PPP_modem::webform_save(struct EventStruct *event) +void NW005_data_struct_PPP_modem::webform_save(EventStruct *event) { const uint32_t keys[] { NW005_KEY_SERIAL_PORT, @@ -712,7 +716,7 @@ void NW005_begin_modem_task(void *parameter) vTaskDelete(modem_task_data->modem_taskHandle); } -bool NW005_data_struct_PPP_modem::init(struct EventStruct *event) +bool NW005_data_struct_PPP_modem::init(EventStruct *event) { if (!_KVS_initialized()) { addLog(LOG_LEVEL_ERROR, F("PPP: Could not initialize storage")); @@ -818,7 +822,7 @@ bool NW005_data_struct_PPP_modem::init(struct EventStruct *event) return true; } -bool NW005_data_struct_PPP_modem::exit(struct EventStruct *event) +bool NW005_data_struct_PPP_modem::exit(EventStruct *event) { if (_modem_task_data.modem_taskHandle) { vTaskDelete(_modem_task_data.modem_taskHandle); @@ -921,4 +925,8 @@ void NW005_data_struct_PPP_modem::testRead() } +} // namespace ppp +} // namespace net +} // namespace ESPEasy + #endif // ifdef USES_NW005 diff --git a/src/src/NWPluginStructs/NW005_data_struct_PPP_modem.h b/src/src/NWPluginStructs/NW005_data_struct_PPP_modem.h index 338bb3bdf..05a6a3273 100644 --- a/src/src/NWPluginStructs/NW005_data_struct_PPP_modem.h +++ b/src/src/NWPluginStructs/NW005_data_struct_PPP_modem.h @@ -9,6 +9,11 @@ # include + +namespace ESPEasy { +namespace net { +namespace ppp { + struct NW005_modem_task_data { ppp_modem_model_t model = PPP_MODEM_GENERIC; uint8_t uart_num = 1; @@ -18,7 +23,8 @@ struct NW005_modem_task_data { String logString; // This is C-code, so not set to nullptr, but to NULL - TaskHandle_t modem_taskHandle = NULL; + TaskHandle_t modem_taskHandle = NULL; + }; @@ -35,14 +41,14 @@ struct NW005_data_struct_PPP_modem : public NWPluginData_base { void webform_load_UE_system_information(); - void webform_load(struct EventStruct *event); - void webform_save(struct EventStruct *event); + void webform_load(EventStruct *event); + void webform_save(EventStruct *event); bool webform_getPort(String& str); - bool init(struct EventStruct *event); + bool init(EventStruct *event); - bool exit(struct EventStruct *event); + bool exit(EventStruct *event); void testWrite(); @@ -52,14 +58,17 @@ struct NW005_data_struct_PPP_modem : public NWPluginData_base { private: String NW005_formatGpioLabel(uint32_t key, - PinSelectPurpose& purpose, - bool shortNotation = false) const; + PinSelectPurpose& purpose, + bool shortNotation = false) const; NW005_modem_task_data _modem_task_data; }; +} // namespace ppp +} // namespace net +} // namespace ESPEasy #endif // ifdef USES_NW005 diff --git a/src/src/WebServer/Markup.cpp b/src/src/WebServer/Markup.cpp index 8cd777af0..75328468c 100644 --- a/src/src/WebServer/Markup.cpp +++ b/src/src/WebServer/Markup.cpp @@ -1005,7 +1005,7 @@ void addRTDControllerButton(cpluginID_t cpluginID) { get_formatted_Controller_number(cpluginID).c_str())); } -void addRTDNetworkDriverButton(nwpluginID_t nwpluginID) +void addRTDNetworkDriverButton(ESPEasy::net::nwpluginID_t nwpluginID) { addRTDHelpButton( strformat( diff --git a/src/src/WebServer/Markup.h b/src/src/WebServer/Markup.h index 08d544876..a040af2c9 100644 --- a/src/src/WebServer/Markup.h +++ b/src/src/WebServer/Markup.h @@ -300,7 +300,7 @@ void addHelpButton(const String& url, void addRTDPluginButton(pluginID_t pluginID); #ifndef LIMIT_BUILD_SIZE void addRTDControllerButton(cpluginID_t cpluginID); -void addRTDNetworkDriverButton(nwpluginID_t nwpluginID); +void addRTDNetworkDriverButton(ESPEasy::net::nwpluginID_t nwpluginID); #endif // ifndef LIMIT_BUILD_SIZE String makeDocLink(const String& url, diff --git a/src/src/WebServer/NetworkPage.cpp b/src/src/WebServer/NetworkPage.cpp index 9634a22fc..1c9d19170 100644 --- a/src/src/WebServer/NetworkPage.cpp +++ b/src/src/WebServer/NetworkPage.cpp @@ -20,6 +20,8 @@ # include "../Helpers/PrintToString.h" +using namespace ESPEasy::net; + void handle_networks() { # ifndef BUILD_NO_RAM_TRACKER @@ -126,7 +128,7 @@ void handle_networks() TXBuffer.endStream(); } -void handle_networks_clearLoadDefaults(networkIndex_t networkindex, NetworkSettingsStruct& NetworkSettings) { +void handle_networks_clearLoadDefaults(ESPEasy::net::networkIndex_t networkindex, NetworkSettingsStruct& NetworkSettings) { networkDriverIndex_t NetworkDriverIndex = getNetworkDriverIndex_from_NetworkIndex(networkindex); if (validNetworkDriverIndex(NetworkDriverIndex)) { @@ -142,7 +144,7 @@ void handle_networks_clearLoadDefaults(networkIndex_t networkindex, NetworkSetti // TODO TD-er: Must also check NetworkDriverStruct to see if something else must be done } -void handle_networks_CopySubmittedSettings(networkIndex_t networkindex, NetworkSettingsStruct& NetworkSettings) +void handle_networks_CopySubmittedSettings(ESPEasy::net::networkIndex_t networkindex, NetworkSettingsStruct& NetworkSettings) { // copy all settings to network settings struct for (int parameterIdx = 0; parameterIdx <= NetworkSettingsStruct::NETWORK_ENABLED; ++parameterIdx) { @@ -152,7 +154,7 @@ void handle_networks_CopySubmittedSettings(networkIndex_t networkindex, NetworkS } -void handle_networks_CopySubmittedSettings_NWPluginCall(networkIndex_t networkindex) { +void handle_networks_CopySubmittedSettings_NWPluginCall(ESPEasy::net::networkIndex_t networkindex) { networkDriverIndex_t NetworkDriverIndex = getNetworkDriverIndex_from_NetworkIndex(networkindex); if (validNetworkDriverIndex(NetworkDriverIndex)) { @@ -183,7 +185,7 @@ void handle_networks_ShowAllNetworksTable() html_table_header(F("IP")); html_table_header(F("Port")); - for (networkIndex_t x = 0; x < NETWORK_MAX; x++) + for (ESPEasy::net::networkIndex_t x = 0; x < NETWORK_MAX; x++) { const nwpluginID_t nwpluginID = Settings.getNWPluginID_for_network(x); const bool nwplugin_set = nwpluginID.isValid(); @@ -266,7 +268,7 @@ void handle_networks_ShowAllNetworksTable() } /* - const NetworkDriverStruct& driver = getNetworkDriverStruct(NetworkDriverIndex); + const NetworkDriverStruct& driver = ESPEasy::net::getNetworkDriverStruct(NetworkDriverIndex); if ((INVALID_NETWORKDRIVER_INDEX == NetworkDriverIndex) || driver.usesPort) { addHtmlInt(13 == nwpluginID ? Settings.UDPPort : NetworkSettings->Port); // P2P/C013 exception @@ -283,13 +285,13 @@ void handle_networks_ShowAllNetworksTable() html_end_form(); } -void handle_networks_NetworkSettingsPage(networkIndex_t networkindex) { +void handle_networks_NetworkSettingsPage(ESPEasy::net::networkIndex_t networkindex) { if (!validNetworkIndex(networkindex)) { return; } const networkDriverIndex_t networkDriverIndex = getNetworkDriverIndex_from_NWPluginID( Settings.getNWPluginID_for_network(networkindex)); - const NetworkDriverStruct& cur_driver = getNetworkDriverStruct(networkDriverIndex); + const NetworkDriverStruct& cur_driver = ESPEasy::net::getNetworkDriverStruct(networkDriverIndex); // Show network settings page diff --git a/src/src/WebServer/NetworkPage.h b/src/src/WebServer/NetworkPage.h index 16c5ac3e7..6764ae3a0 100644 --- a/src/src/WebServer/NetworkPage.h +++ b/src/src/WebServer/NetworkPage.h @@ -18,14 +18,14 @@ void handle_networks(); // Selected network has changed. // Clear all Network settings and load some defaults // ******************************************************************************** -void handle_networks_clearLoadDefaults(networkIndex_t networkindex, NetworkSettingsStruct& NetworkSettings); +void handle_networks_clearLoadDefaults(ESPEasy::net::networkIndex_t networkindex, ESPEasy::net::NetworkSettingsStruct& NetworkSettings); // ******************************************************************************** // Collect all submitted form data and store in the NetworkSettings // ******************************************************************************** -void handle_networks_CopySubmittedSettings(networkIndex_t networkindex, NetworkSettingsStruct& NetworkSettings); +void handle_networks_CopySubmittedSettings(ESPEasy::net::networkIndex_t networkindex, ESPEasy::net::NetworkSettingsStruct& NetworkSettings); -void handle_networks_CopySubmittedSettings_NWPluginCall(networkIndex_t networkindex); +void handle_networks_CopySubmittedSettings_NWPluginCall(ESPEasy::net::networkIndex_t networkindex); // ******************************************************************************** // Show table with all selected networks @@ -35,7 +35,7 @@ void handle_networks_ShowAllNetworksTable(); // ******************************************************************************** // Show the network settings page // ******************************************************************************** -void handle_networks_NetworkSettingsPage(networkIndex_t networkindex); +void handle_networks_NetworkSettingsPage(ESPEasy::net::networkIndex_t networkindex); #endif // ifdef WEBSERVER_NETWORK From e468b021ae18e0998c92c8776c5a0776b8c264bf Mon Sep 17 00:00:00 2001 From: TD-er Date: Sat, 26 Jul 2025 15:49:45 +0200 Subject: [PATCH 145/564] [Network] Move ESPEasy::net namespace code to new folder structure --- .../net}/DataStructs/NWPluginData_base.cpp | 10 ++-- .../net}/DataStructs/NWPluginData_base.h | 11 ++-- .../net}/DataStructs/NetworkDriverStruct.cpp | 0 .../net}/DataStructs/NetworkDriverStruct.h | 7 +-- .../DataStructs/NetworkSettingsStruct.cpp | 14 ++--- .../net}/DataStructs/NetworkSettingsStruct.h | 16 +++--- .../net}/DataTypes/NWPluginID.cpp | 2 +- .../net}/DataTypes/NWPluginID.h | 8 +-- .../net}/DataTypes/NetworkDriverIndex.cpp | 2 +- .../net}/DataTypes/NetworkDriverIndex.h | 9 ++-- .../net}/DataTypes/NetworkIndex.cpp | 2 +- src/ESPEasy/net/DataTypes/NetworkIndex.h | 13 +++++ .../net}/Globals/NWPlugins.cpp | 16 +++--- src/{src => ESPEasy/net}/Globals/NWPlugins.h | 13 ++--- .../net}/Helpers/_NWPlugin_Helper_webform.cpp | 19 ++++--- .../net}/Helpers/_NWPlugin_Helper_webform.h | 7 +-- .../net}/Helpers/_NWPlugin_init.cpp | 13 ++--- .../net}/Helpers/_NWPlugin_init.h | 11 ++-- .../net}/NWPluginStructs/NW001_WiFi_STA.cpp | 0 .../net}/NWPluginStructs/NW001_WiFi_STA.h | 9 ++-- .../NW005_data_struct_PPP_modem.cpp | 14 ++--- .../NW005_data_struct_PPP_modem.h | 10 ++-- src/{ => ESPEasy/net}/_NW001_WiFi_STA.cpp | 44 +++++++-------- src/{ => ESPEasy/net}/_NW002_WiFi_AP.cpp | 41 +++++++------- src/{ => ESPEasy/net}/_NW003_ETH_RMII.cpp | 39 +++++++------- src/{ => ESPEasy/net}/_NW004_ETH_SPI.cpp | 39 +++++++------- src/{ => ESPEasy/net}/_NW005_PPP_modem.cpp | 45 +++++++--------- src/{ => ESPEasy/net}/_NWPlugin_Helper.cpp | 8 +-- src/{ => ESPEasy/net}/_NWPlugin_Helper.h | 12 ++--- .../net/wifi}/ESPEasyWiFiEvent_ESP32.cpp | 31 +++++------ .../net/wifi}/ESPEasyWiFiEvent_ESP32.h | 2 +- .../net/wifi}/ESPEasyWiFiEvent_ESP8266.cpp | 26 ++++----- .../net/wifi}/ESPEasyWiFiEvent_ESP8266.h | 2 +- .../net/wifi}/ESPEasyWiFi_state_machine.cpp | 22 ++++---- .../net/wifi}/ESPEasyWiFi_state_machine.h | 11 ++-- .../wifi}/ESPEasyWiFi_state_machine_ESP32.cpp | 4 +- .../ESPEasyWiFi_state_machine_ESP8266.cpp | 4 +- .../net/wifi}/ESPEasyWifi.cpp | 50 ++++++++--------- .../net/wifi}/ESPEasyWifi.h | 10 ++-- .../net/wifi}/ESPEasyWifi_ProcessEvent.cpp | 54 +++++++++---------- .../net/wifi}/ESPEasyWifi_ProcessEvent.h | 2 +- .../net/wifi}/ESPEasyWifi_abstracted.cpp | 10 ++-- .../net/wifi}/ESPEasyWifi_abstracted.h | 12 ++--- .../wifi}/ESPEasyWifi_abstracted_ESP32.cpp | 22 ++++---- .../wifi}/ESPEasyWifi_abstracted_ESP8266.cpp | 16 +++--- .../net/wifi}/WiFiConnectionProtocol.cpp | 10 +++- .../net/wifi}/WiFiConnectionProtocol.h | 14 +++-- .../net/wifi}/WiFiDisconnectReason.h | 22 ++++++-- .../net/wifi}/WiFi_STA_connected_state.h | 2 +- .../net/wifi}/WiFi_State.cpp | 2 +- .../net/wifi}/WiFi_State.h | 2 +- src/_P075_Nextion.ino | 2 +- src/src/Commands/Common.cpp | 3 +- src/src/Commands/WiFi.cpp | 5 +- src/src/DataStructs/ESPEasy_EventStruct.h | 2 +- src/src/DataStructs/NodesHandler.cpp | 5 +- src/src/DataStructs/SettingsStruct.h | 6 +-- src/src/DataStructs/TimingStats.h | 2 +- src/src/DataStructs/WiFiEventData.h | 3 +- src/src/DataStructs_templ/SettingsStruct.cpp | 8 +-- src/src/DataTypes/NetworkIndex.h | 17 ------ src/src/ESPEasyCore/ESPEasyEth.cpp | 2 +- .../ESPEasyCore/ESPEasyEth_ProcessEvent.cpp | 2 +- src/src/ESPEasyCore/ESPEasyNetwork.cpp | 3 +- src/src/ESPEasyCore/ESPEasyNetwork_ESP32.cpp | 4 +- .../ESPEasyCore/ESPEasyNetwork_ESP8266.cpp | 4 +- src/src/ESPEasyCore/ESPEasy_loop.cpp | 4 +- src/src/ESPEasyCore/ESPEasy_setup.cpp | 8 +-- src/src/Globals/ESPEasyWiFi.h | 3 +- src/src/Globals/ESPEasyWiFiEvent.h | 2 +- src/src/Helpers/DeepSleep.cpp | 2 +- src/src/Helpers/ESPEasy_FactoryDefault.cpp | 2 +- src/src/Helpers/ESPEasy_Storage.cpp | 4 +- src/src/Helpers/Network.cpp | 4 +- src/src/Helpers/Networking.cpp | 2 +- src/src/Helpers/PeriodicalActions.cpp | 4 +- .../Helpers/Scheduler_SystemEventTimer.cpp | 2 +- src/src/Helpers/StringProvider.cpp | 4 +- src/src/Helpers/_CPlugin_DomoticzHelper.cpp | 2 +- src/src/Helpers/_CPlugin_Helper.cpp | 2 +- src/src/WebServer/AccessControl.cpp | 4 +- src/src/WebServer/AdvancedConfigPage.cpp | 4 +- src/src/WebServer/DownloadPage.cpp | 8 +-- src/src/WebServer/ESPEasy_WebServer.cpp | 4 +- src/src/WebServer/Markup.h | 2 +- src/src/WebServer/Metrics.cpp | 2 +- src/src/WebServer/NetworkPage.cpp | 22 ++++---- src/src/WebServer/NetworkPage.h | 4 +- src/src/WebServer/SetupPage.cpp | 4 +- src/src/WebServer/SysInfoPage.cpp | 3 +- src/src/WebServer/WiFiScanner.cpp | 4 +- 91 files changed, 454 insertions(+), 484 deletions(-) rename src/{src => ESPEasy/net}/DataStructs/NWPluginData_base.cpp (83%) rename src/{src => ESPEasy/net}/DataStructs/NWPluginData_base.h (83%) rename src/{src => ESPEasy/net}/DataStructs/NetworkDriverStruct.cpp (100%) rename src/{src => ESPEasy/net}/DataStructs/NetworkDriverStruct.h (74%) rename src/{src => ESPEasy/net}/DataStructs/NetworkSettingsStruct.cpp (65%) rename src/{src => ESPEasy/net}/DataStructs/NetworkSettingsStruct.h (86%) rename src/{src => ESPEasy/net}/DataTypes/NWPluginID.cpp (81%) rename src/{src => ESPEasy/net}/DataTypes/NWPluginID.h (83%) rename src/{src => ESPEasy/net}/DataTypes/NetworkDriverIndex.cpp (79%) rename src/{src => ESPEasy/net}/DataTypes/NetworkDriverIndex.h (86%) rename src/{src => ESPEasy/net}/DataTypes/NetworkIndex.cpp (73%) create mode 100644 src/ESPEasy/net/DataTypes/NetworkIndex.h rename src/{src => ESPEasy/net}/Globals/NWPlugins.cpp (93%) rename src/{src => ESPEasy/net}/Globals/NWPlugins.h (82%) rename src/{src => ESPEasy/net}/Helpers/_NWPlugin_Helper_webform.cpp (94%) rename src/{src => ESPEasy/net}/Helpers/_NWPlugin_Helper_webform.h (90%) rename src/{src => ESPEasy/net}/Helpers/_NWPlugin_init.cpp (99%) rename src/{src => ESPEasy/net}/Helpers/_NWPlugin_init.h (98%) rename src/{src => ESPEasy/net}/NWPluginStructs/NW001_WiFi_STA.cpp (100%) rename src/{src => ESPEasy/net}/NWPluginStructs/NW001_WiFi_STA.h (55%) rename src/{src => ESPEasy/net}/NWPluginStructs/NW005_data_struct_PPP_modem.cpp (95%) rename src/{src => ESPEasy/net}/NWPluginStructs/NW005_data_struct_PPP_modem.h (80%) rename src/{ => ESPEasy/net}/_NW001_WiFi_STA.cpp (88%) rename src/{ => ESPEasy/net}/_NW002_WiFi_AP.cpp (80%) rename src/{ => ESPEasy/net}/_NW003_ETH_RMII.cpp (89%) rename src/{ => ESPEasy/net}/_NW004_ETH_SPI.cpp (89%) rename src/{ => ESPEasy/net}/_NW005_PPP_modem.cpp (81%) rename src/{ => ESPEasy/net}/_NWPlugin_Helper.cpp (89%) rename src/{ => ESPEasy/net}/_NWPlugin_Helper.h (77%) rename src/{src/ESPEasyCore => ESPEasy/net/wifi}/ESPEasyWiFiEvent_ESP32.cpp (87%) rename src/{src/ESPEasyCore => ESPEasy/net/wifi}/ESPEasyWiFiEvent_ESP32.h (93%) rename src/{src/ESPEasyCore => ESPEasy/net/wifi}/ESPEasyWiFiEvent_ESP8266.cpp (80%) rename src/{src/ESPEasyCore => ESPEasy/net/wifi}/ESPEasyWiFiEvent_ESP8266.h (94%) rename src/{src/ESPEasyCore => ESPEasy/net/wifi}/ESPEasyWiFi_state_machine.cpp (92%) rename src/{src/ESPEasyCore => ESPEasy/net/wifi}/ESPEasyWiFi_state_machine.h (87%) rename src/{src/ESPEasyCore => ESPEasy/net/wifi}/ESPEasyWiFi_state_machine_ESP32.cpp (89%) rename src/{src/ESPEasyCore => ESPEasy/net/wifi}/ESPEasyWiFi_state_machine_ESP8266.cpp (87%) rename src/{src/ESPEasyCore => ESPEasy/net/wifi}/ESPEasyWifi.cpp (89%) rename src/{src/ESPEasyCore => ESPEasy/net/wifi}/ESPEasyWifi.h (87%) rename src/{src/ESPEasyCore => ESPEasy/net/wifi}/ESPEasyWifi_ProcessEvent.cpp (87%) rename src/{src/ESPEasyCore => ESPEasy/net/wifi}/ESPEasyWifi_ProcessEvent.h (88%) rename src/{src/ESPEasyCore => ESPEasy/net/wifi}/ESPEasyWifi_abstracted.cpp (90%) rename src/{src/ESPEasyCore => ESPEasy/net/wifi}/ESPEasyWifi_abstracted.h (87%) rename src/{src/ESPEasyCore => ESPEasy/net/wifi}/ESPEasyWifi_abstracted_ESP32.cpp (92%) rename src/{src/ESPEasyCore => ESPEasy/net/wifi}/ESPEasyWifi_abstracted_ESP8266.cpp (92%) rename src/{src/DataTypes => ESPEasy/net/wifi}/WiFiConnectionProtocol.cpp (93%) rename src/{src/DataTypes => ESPEasy/net/wifi}/WiFiConnectionProtocol.h (80%) rename src/{src/DataTypes => ESPEasy/net/wifi}/WiFiDisconnectReason.h (84%) rename src/{src/DataTypes => ESPEasy/net/wifi}/WiFi_STA_connected_state.h (82%) rename src/{src/DataTypes => ESPEasy/net/wifi}/WiFi_State.cpp (93%) rename src/{src/DataTypes => ESPEasy/net/wifi}/WiFi_State.h (93%) delete mode 100644 src/src/DataTypes/NetworkIndex.h diff --git a/src/src/DataStructs/NWPluginData_base.cpp b/src/ESPEasy/net/DataStructs/NWPluginData_base.cpp similarity index 83% rename from src/src/DataStructs/NWPluginData_base.cpp rename to src/ESPEasy/net/DataStructs/NWPluginData_base.cpp index beb9249c2..f20badba4 100644 --- a/src/src/DataStructs/NWPluginData_base.cpp +++ b/src/ESPEasy/net/DataStructs/NWPluginData_base.cpp @@ -2,11 +2,11 @@ #if FEATURE_STORE_NETWORK_INTERFACE_SETTINGS -# include "../DataStructs/ESPEasy_EventStruct.h" -# include "../Globals/RuntimeData.h" -# include "../Globals/Settings.h" -# include "../Helpers/StringConverter.h" -# include "../Helpers/_ESPEasy_key_value_store.h" + +# include "../../../src/Globals/RuntimeData.h" +# include "../../../src/Globals/Settings.h" +# include "../../../src/Helpers/StringConverter.h" +# include "../../../src/Helpers/_ESPEasy_key_value_store.h" namespace ESPEasy { namespace net { diff --git a/src/src/DataStructs/NWPluginData_base.h b/src/ESPEasy/net/DataStructs/NWPluginData_base.h similarity index 83% rename from src/src/DataStructs/NWPluginData_base.h rename to src/ESPEasy/net/DataStructs/NWPluginData_base.h index a1e6826ce..dd3ffc325 100644 --- a/src/src/DataStructs/NWPluginData_base.h +++ b/src/ESPEasy/net/DataStructs/NWPluginData_base.h @@ -1,14 +1,13 @@ -#ifndef DATASTRUCTS_NWPLUGINDATA_BASE_H -#define DATASTRUCTS_NWPLUGINDATA_BASE_H +#pragma once -#include "../../ESPEasy_common.h" +#include "../../../ESPEasy_common.h" #if FEATURE_STORE_NETWORK_INTERFACE_SETTINGS -# include "../DataStructs/ESPEasy_EventStruct.h" +# include "../../../src/DataStructs/ESPEasy_EventStruct.h" +# include "../../../src/Helpers/_ESPEasy_key_value_store.h" # include "../DataTypes/NWPluginID.h" # include "../DataTypes/NetworkIndex.h" -# include "../Helpers/_ESPEasy_key_value_store.h" namespace ESPEasy { namespace net { @@ -67,5 +66,3 @@ protected: } // namespace ESPEasy #endif // if FEATURE_STORE_NETWORK_INTERFACE_SETTINGS - -#endif // ifndef DATASTRUCTS_NWPLUGINDATA_BASE_H diff --git a/src/src/DataStructs/NetworkDriverStruct.cpp b/src/ESPEasy/net/DataStructs/NetworkDriverStruct.cpp similarity index 100% rename from src/src/DataStructs/NetworkDriverStruct.cpp rename to src/ESPEasy/net/DataStructs/NetworkDriverStruct.cpp diff --git a/src/src/DataStructs/NetworkDriverStruct.h b/src/ESPEasy/net/DataStructs/NetworkDriverStruct.h similarity index 74% rename from src/src/DataStructs/NetworkDriverStruct.h rename to src/ESPEasy/net/DataStructs/NetworkDriverStruct.h index d6f96cf88..a02d8d705 100644 --- a/src/src/DataStructs/NetworkDriverStruct.h +++ b/src/ESPEasy/net/DataStructs/NetworkDriverStruct.h @@ -1,7 +1,6 @@ -#ifndef DATASTRUCTS_NETWORKDRIVERSTRUCT_H -#define DATASTRUCTS_NETWORKDRIVERSTRUCT_H +#pragma once -#include "../../ESPEasy_common.h" +#include "../../../ESPEasy_common.h" #include "../DataTypes/NetworkIndex.h" @@ -27,5 +26,3 @@ struct NetworkDriverStruct } // namespace net } // namespace ESPEasy - -#endif // ifndef DATASTRUCTS_NETWORKDRIVERSTRUCT_H diff --git a/src/src/DataStructs/NetworkSettingsStruct.cpp b/src/ESPEasy/net/DataStructs/NetworkSettingsStruct.cpp similarity index 65% rename from src/src/DataStructs/NetworkSettingsStruct.cpp rename to src/ESPEasy/net/DataStructs/NetworkSettingsStruct.cpp index 626b54250..522ca1760 100644 --- a/src/src/DataStructs/NetworkSettingsStruct.cpp +++ b/src/ESPEasy/net/DataStructs/NetworkSettingsStruct.cpp @@ -1,13 +1,13 @@ #include "../DataStructs/NetworkSettingsStruct.h" -#include "../../ESPEasy_common.h" +#include "../../../ESPEasy_common.h" -#include "../CustomBuild/ESPEasyLimits.h" -#include "../ESPEasyCore/ESPEasy_Log.h" -#include "../ESPEasyCore/ESPEasyNetwork.h" -#include "../Helpers/Misc.h" -#include "../Helpers/Networking.h" -#include "../Helpers/StringConverter.h" +#include "../../../src/CustomBuild/ESPEasyLimits.h" +#include "../../../src/ESPEasyCore/ESPEasy_Log.h" +#include "../../../src/ESPEasyCore/ESPEasyNetwork.h" +#include "../../../src/Helpers/Misc.h" +#include "../../../src/Helpers/Networking.h" +#include "../../../src/Helpers/StringConverter.h" #include diff --git a/src/src/DataStructs/NetworkSettingsStruct.h b/src/ESPEasy/net/DataStructs/NetworkSettingsStruct.h similarity index 86% rename from src/src/DataStructs/NetworkSettingsStruct.h rename to src/ESPEasy/net/DataStructs/NetworkSettingsStruct.h index 154ab8501..525d564fd 100644 --- a/src/src/DataStructs/NetworkSettingsStruct.h +++ b/src/ESPEasy/net/DataStructs/NetworkSettingsStruct.h @@ -1,16 +1,15 @@ -#ifndef DATASTRUCTS_NETWORKSETTINGSSTRUCT_H -#define DATASTRUCTS_NETWORKSETTINGSSTRUCT_H +#pragma once /*********************************************************************************************\ * NetworkSettingsStruct definition \*********************************************************************************************/ -#include "../../ESPEasy_common.h" +#include "../../../ESPEasy_common.h" #include // For std::shared_ptr #include // for std::nothrow -#include "../Globals/Plugins.h" -#include "../Helpers/Memory.h" +#include "../../../src/Globals/Plugins.h" +#include "../../../src/Helpers/Memory.h" namespace ESPEasy { namespace net { @@ -66,8 +65,5 @@ typedef std::shared_ptr NetworkSettingsStruct_ptr_type; // Check to see if MakeNetworkSettings was successful #define AllocatedNetworkSettings() (NetworkSettings.get() != nullptr) -} -} - - -#endif // DATASTRUCTS_NETWORKSETTINGSSTRUCT_H +} // namespace net +} // namespace ESPEasy diff --git a/src/src/DataTypes/NWPluginID.cpp b/src/ESPEasy/net/DataTypes/NWPluginID.cpp similarity index 81% rename from src/src/DataTypes/NWPluginID.cpp rename to src/ESPEasy/net/DataTypes/NWPluginID.cpp index 815e06cb4..2257949cc 100644 --- a/src/src/DataTypes/NWPluginID.cpp +++ b/src/ESPEasy/net/DataTypes/NWPluginID.cpp @@ -1,6 +1,6 @@ #include "../DataTypes/NWPluginID.h" -#include "../Helpers/StringConverter.h" +#include "../../../src/Helpers/StringConverter.h" namespace ESPEasy { namespace net { diff --git a/src/src/DataTypes/NWPluginID.h b/src/ESPEasy/net/DataTypes/NWPluginID.h similarity index 83% rename from src/src/DataTypes/NWPluginID.h rename to src/ESPEasy/net/DataTypes/NWPluginID.h index 888526c1b..b8f27244d 100644 --- a/src/src/DataTypes/NWPluginID.h +++ b/src/ESPEasy/net/DataTypes/NWPluginID.h @@ -1,7 +1,6 @@ -#ifndef DATATYPES_NWPLUGINID_H -#define DATATYPES_NWPLUGINID_H +#pragma once -#include "../../ESPEasy_common.h" +#include "../../../ESPEasy_common.h" namespace ESPEasy { namespace net { @@ -69,6 +68,3 @@ extern const nwpluginID_t INVALID_NW_PLUGIN_ID; } // namespace net } // namespace ESPEasy - - -#endif // ifndef DATATYPES_NWPLUGINID_H diff --git a/src/src/DataTypes/NetworkDriverIndex.cpp b/src/ESPEasy/net/DataTypes/NetworkDriverIndex.cpp similarity index 79% rename from src/src/DataTypes/NetworkDriverIndex.cpp rename to src/ESPEasy/net/DataTypes/NetworkDriverIndex.cpp index f980389bc..3d432b69b 100644 --- a/src/src/DataTypes/NetworkDriverIndex.cpp +++ b/src/ESPEasy/net/DataTypes/NetworkDriverIndex.cpp @@ -1,6 +1,6 @@ #include "../DataTypes/NetworkDriverIndex.h" -#include "../CustomBuild/ESPEasyLimits.h" +#include "../../../src/CustomBuild/ESPEasyLimits.h" namespace ESPEasy { namespace net { diff --git a/src/src/DataTypes/NetworkDriverIndex.h b/src/ESPEasy/net/DataTypes/NetworkDriverIndex.h similarity index 86% rename from src/src/DataTypes/NetworkDriverIndex.h rename to src/ESPEasy/net/DataTypes/NetworkDriverIndex.h index 374082503..1fd608ff2 100644 --- a/src/src/DataTypes/NetworkDriverIndex.h +++ b/src/ESPEasy/net/DataTypes/NetworkDriverIndex.h @@ -1,9 +1,8 @@ -#ifndef DATATYPES_NETWORKDRIVERINDEX_H -#define DATATYPES_NETWORKDRIVERINDEX_H +#pragma once -#include "../../ESPEasy_common.h" +#include "../../../ESPEasy_common.h" -#include "../CustomBuild/ESPEasyLimits.h" +#include "../../../src/CustomBuild/ESPEasyLimits.h" namespace ESPEasy { namespace net { @@ -72,5 +71,3 @@ extern networkDriverIndex_t INVALID_NETWORKDRIVER_INDEX; } // namespace net } // namespace ESPEasy - -#endif // ifndef DATATYPES_NETWORKDRIVERINDEX_H diff --git a/src/src/DataTypes/NetworkIndex.cpp b/src/ESPEasy/net/DataTypes/NetworkIndex.cpp similarity index 73% rename from src/src/DataTypes/NetworkIndex.cpp rename to src/ESPEasy/net/DataTypes/NetworkIndex.cpp index 49920b680..977e968d6 100644 --- a/src/src/DataTypes/NetworkIndex.cpp +++ b/src/ESPEasy/net/DataTypes/NetworkIndex.cpp @@ -1,6 +1,6 @@ #include "../DataTypes/NetworkIndex.h" -#include "../CustomBuild/ESPEasyLimits.h" +#include "../../../src/CustomBuild/ESPEasyLimits.h" namespace ESPEasy { namespace net { diff --git a/src/ESPEasy/net/DataTypes/NetworkIndex.h b/src/ESPEasy/net/DataTypes/NetworkIndex.h new file mode 100644 index 000000000..f9009649e --- /dev/null +++ b/src/ESPEasy/net/DataTypes/NetworkIndex.h @@ -0,0 +1,13 @@ +#pragma once + +#include "../../../ESPEasy_common.h" + +namespace ESPEasy { +namespace net { + +typedef uint8_t networkIndex_t; + +extern networkIndex_t INVALID_NETWORK_INDEX; + +} // namespace net +} // namespace ESPEasy diff --git a/src/src/Globals/NWPlugins.cpp b/src/ESPEasy/net/Globals/NWPlugins.cpp similarity index 93% rename from src/src/Globals/NWPlugins.cpp rename to src/ESPEasy/net/Globals/NWPlugins.cpp index e3420bcce..81f3e473c 100644 --- a/src/src/Globals/NWPlugins.cpp +++ b/src/ESPEasy/net/Globals/NWPlugins.cpp @@ -1,15 +1,13 @@ #include "../Globals/NWPlugins.h" -#include "../../_Plugin_Helper.h" -#include "../DataStructs/ESPEasy_EventStruct.h" -#include "../DataStructs/TimingStats.h" -#include "../DataTypes/ESPEasy_plugin_functions.h" -#include "../ESPEasyCore/ESPEasy_Log.h" - -#include "../Globals/Settings.h" -#include "../Globals/NWPlugins.h" +#include "../../../_Plugin_Helper.h" +#include "../../../src/DataStructs/ESPEasy_EventStruct.h" +#include "../../../src/DataStructs/TimingStats.h" +#include "../../../src/DataTypes/ESPEasy_plugin_functions.h" +#include "../../../src/ESPEasyCore/ESPEasy_Log.h" +#include "../../../src/Globals/Settings.h" +#include "../../../src/Helpers/PrintToString.h" #include "../Helpers/_NWPlugin_init.h" -#include "../Helpers/PrintToString.h" namespace ESPEasy { namespace net { diff --git a/src/src/Globals/NWPlugins.h b/src/ESPEasy/net/Globals/NWPlugins.h similarity index 82% rename from src/src/Globals/NWPlugins.h rename to src/ESPEasy/net/Globals/NWPlugins.h index 8f7b65d65..08a8df201 100644 --- a/src/src/Globals/NWPlugins.h +++ b/src/ESPEasy/net/Globals/NWPlugins.h @@ -1,11 +1,10 @@ -#ifndef GLOBALS_NWPLUGIN_H -#define GLOBALS_NWPLUGIN_H +#pragma once -#include "../../ESPEasy_common.h" +#include "../../../ESPEasy_common.h" -#include "../CustomBuild/ESPEasyLimits.h" -#include "../DataStructs/ESPEasy_EventStruct.h" -#include "../DataTypes/ESPEasy_plugin_functions.h" +#include "../../../src/CustomBuild/ESPEasyLimits.h" +#include "../../../src/DataStructs/ESPEasy_EventStruct.h" +#include "../../../src/DataTypes/ESPEasy_plugin_functions.h" #include "../DataTypes/NWPluginID.h" #include "../DataTypes/NetworkIndex.h" #include "../DataTypes/NetworkDriverIndex.h" @@ -45,5 +44,3 @@ String getNWPluginNameFromNWPluginID(nwpluginID_t nwpluginID); } // namespace net } // namespace ESPEasy - -#endif // ifndef GLOBALS_NWPLUGIN_H diff --git a/src/src/Helpers/_NWPlugin_Helper_webform.cpp b/src/ESPEasy/net/Helpers/_NWPlugin_Helper_webform.cpp similarity index 94% rename from src/src/Helpers/_NWPlugin_Helper_webform.cpp rename to src/ESPEasy/net/Helpers/_NWPlugin_Helper_webform.cpp index 8d0a5e155..91b058c19 100644 --- a/src/src/Helpers/_NWPlugin_Helper_webform.cpp +++ b/src/ESPEasy/net/Helpers/_NWPlugin_Helper_webform.cpp @@ -1,17 +1,16 @@ #include "../Helpers/_NWPlugin_Helper_webform.h" -#include "../../ESPEasy_common.h" +#include "../../../ESPEasy_common.h" -#include "../DataStructs/ESPEasy_EventStruct.h" -#include "../DataTypes/ESPEasy_plugin_functions.h" +#include "../../../src/DataStructs/ESPEasy_EventStruct.h" +#include "../../../src/DataTypes/ESPEasy_plugin_functions.h" +#include "../../../src/Globals/SecuritySettings.h" +#include "../../../src/Globals/Settings.h" +#include "../../../src/Helpers/Networking.h" +#include "../../../src/WebServer/ESPEasy_WebServer.h" +#include "../../../src/WebServer/Markup.h" +#include "../../../src/WebServer/Markup_Forms.h" #include "../Globals/NWPlugins.h" -#include "../Globals/SecuritySettings.h" -#include "../Globals/Settings.h" -#include "../Helpers/Networking.h" -#include "../WebServer/ESPEasy_WebServer.h" -#include "../WebServer/Markup.h" -#include "../WebServer/Markup_Forms.h" - #include "../Helpers/_NWPlugin_init.h" namespace ESPEasy { diff --git a/src/src/Helpers/_NWPlugin_Helper_webform.h b/src/ESPEasy/net/Helpers/_NWPlugin_Helper_webform.h similarity index 90% rename from src/src/Helpers/_NWPlugin_Helper_webform.h rename to src/ESPEasy/net/Helpers/_NWPlugin_Helper_webform.h index acc9d54b9..0e368a842 100644 --- a/src/src/Helpers/_NWPlugin_Helper_webform.h +++ b/src/ESPEasy/net/Helpers/_NWPlugin_Helper_webform.h @@ -1,7 +1,6 @@ -#ifndef HELPERS__NWPLUGIN_HELPER_WEBFORM_H -#define HELPERS__NWPLUGIN_HELPER_WEBFORM_H +#pragma once -#include "../../ESPEasy_common.h" +#include "../../../ESPEasy_common.h" #include "../DataStructs/NetworkSettingsStruct.h" #include "../Globals/NWPlugins.h" @@ -37,5 +36,3 @@ void saveNetworkParameterForm(NetworkSettingsStruct & NetworkSettings, } // namespace net } // namespace ESPEasy - -#endif // ifndef HELPERS__NWPLUGIN_HELPER_WEBFORM_H diff --git a/src/src/Helpers/_NWPlugin_init.cpp b/src/ESPEasy/net/Helpers/_NWPlugin_init.cpp similarity index 99% rename from src/src/Helpers/_NWPlugin_init.cpp rename to src/ESPEasy/net/Helpers/_NWPlugin_init.cpp index 5c5d153c0..67b40344f 100644 --- a/src/src/Helpers/_NWPlugin_init.cpp +++ b/src/ESPEasy/net/Helpers/_NWPlugin_init.cpp @@ -1,14 +1,11 @@ #include "../Helpers/_NWPlugin_init.h" -#include "../DataStructs/ESPEasy_EventStruct.h" -#include "../DataStructs/TimingStats.h" - -#include "../DataTypes/ESPEasy_plugin_functions.h" - +#include "../../../src/DataStructs/ESPEasy_EventStruct.h" +#include "../../../src/DataStructs/TimingStats.h" +#include "../../../src/DataTypes/ESPEasy_plugin_functions.h" +#include "../../../src/Globals/Settings.h" +#include "../../../src/Helpers/Misc.h" #include "../Globals/NWPlugins.h" -#include "../Globals/Settings.h" - -#include "../Helpers/Misc.h" namespace ESPEasy { namespace net { diff --git a/src/src/Helpers/_NWPlugin_init.h b/src/ESPEasy/net/Helpers/_NWPlugin_init.h similarity index 98% rename from src/src/Helpers/_NWPlugin_init.h rename to src/ESPEasy/net/Helpers/_NWPlugin_init.h index f190820ad..d81132b39 100644 --- a/src/src/Helpers/_NWPlugin_init.h +++ b/src/ESPEasy/net/Helpers/_NWPlugin_init.h @@ -1,11 +1,10 @@ -#ifndef HELPERS__NWPLUGIN_INIT_H -#define HELPERS__NWPLUGIN_INIT_H +#pragma once -#include "../../ESPEasy_common.h" +#include "../../../ESPEasy_common.h" -#include "../DataStructs/ESPEasy_EventStruct.h" +#include "../../../src/DataStructs/ESPEasy_EventStruct.h" #include "../DataStructs/NetworkDriverStruct.h" -#include "../DataTypes/ESPEasy_plugin_functions.h" +#include "../../../src/DataTypes/ESPEasy_plugin_functions.h" #include "../DataTypes/NWPluginID.h" #include "../DataTypes/NetworkDriverIndex.h" @@ -1062,5 +1061,3 @@ void NWPluginInit(); } // namespace net } // namespace ESPEasy - -#endif \ No newline at end of file diff --git a/src/src/NWPluginStructs/NW001_WiFi_STA.cpp b/src/ESPEasy/net/NWPluginStructs/NW001_WiFi_STA.cpp similarity index 100% rename from src/src/NWPluginStructs/NW001_WiFi_STA.cpp rename to src/ESPEasy/net/NWPluginStructs/NW001_WiFi_STA.cpp diff --git a/src/src/NWPluginStructs/NW001_WiFi_STA.h b/src/ESPEasy/net/NWPluginStructs/NW001_WiFi_STA.h similarity index 55% rename from src/src/NWPluginStructs/NW001_WiFi_STA.h rename to src/ESPEasy/net/NWPluginStructs/NW001_WiFi_STA.h index 1cbb8a895..f7589a8dc 100644 --- a/src/src/NWPluginStructs/NW001_WiFi_STA.h +++ b/src/ESPEasy/net/NWPluginStructs/NW001_WiFi_STA.h @@ -1,9 +1,10 @@ -#ifndef NWPLUGINSTRUCTS_NW001_WIFI_STA_H -#define NWPLUGINSTRUCTS_NW001_WIFI_STA_H +#pragma once -#include "../../_NWPlugin_Helper.h" +#include "../_NWPlugin_Helper.h" #ifdef USES_NW001 +# if FEATURE_STORE_NETWORK_INTERFACE_SETTINGS + namespace ESPEasy { namespace net { namespace wifi { @@ -17,5 +18,5 @@ struct NW001_data_struct_WiFi_STA : public NWPluginData_base { } // namespace net } // namespace ESPEasy +# endif // if FEATURE_STORE_NETWORK_INTERFACE_SETTINGS #endif // ifdef USES_NW001 -#endif // ifndef NWPLUGINSTRUCTS_NW001_WIFI_STA_H diff --git a/src/src/NWPluginStructs/NW005_data_struct_PPP_modem.cpp b/src/ESPEasy/net/NWPluginStructs/NW005_data_struct_PPP_modem.cpp similarity index 95% rename from src/src/NWPluginStructs/NW005_data_struct_PPP_modem.cpp rename to src/ESPEasy/net/NWPluginStructs/NW005_data_struct_PPP_modem.cpp index 30a80cd4f..c2456aefc 100644 --- a/src/src/NWPluginStructs/NW005_data_struct_PPP_modem.cpp +++ b/src/ESPEasy/net/NWPluginStructs/NW005_data_struct_PPP_modem.cpp @@ -2,15 +2,15 @@ #ifdef USES_NW005 -# include "../Globals/Settings.h" +# include "../../../src/Globals/Settings.h" -# include "../Helpers/StringConverter.h" -# include "../Helpers/_Plugin_Helper_serial.h" +# include "../../../src/Helpers/StringConverter.h" +# include "../../../src/Helpers/_Plugin_Helper_serial.h" -# include "../WebServer/HTML_wrappers.h" -# include "../WebServer/Markup.h" -# include "../WebServer/Markup_Forms.h" -# include "../WebServer/ESPEasy_key_value_store_webform.h" +# include "../../../src/WebServer/HTML_wrappers.h" +# include "../../../src/WebServer/Markup.h" +# include "../../../src/WebServer/Markup_Forms.h" +# include "../../../src/WebServer/ESPEasy_key_value_store_webform.h" # include # include diff --git a/src/src/NWPluginStructs/NW005_data_struct_PPP_modem.h b/src/ESPEasy/net/NWPluginStructs/NW005_data_struct_PPP_modem.h similarity index 80% rename from src/src/NWPluginStructs/NW005_data_struct_PPP_modem.h rename to src/ESPEasy/net/NWPluginStructs/NW005_data_struct_PPP_modem.h index 05a6a3273..0db0f5872 100644 --- a/src/src/NWPluginStructs/NW005_data_struct_PPP_modem.h +++ b/src/ESPEasy/net/NWPluginStructs/NW005_data_struct_PPP_modem.h @@ -1,11 +1,9 @@ -#ifndef NWPLUGINSTRUCT_NW005_DATA_STRUCT_PPP_MODEM_H -#define NWPLUGINSTRUCT_NW005_DATA_STRUCT_PPP_MODEM_H +#pragma once - -#include "../../_NWPlugin_Helper.h" +#include "../_NWPlugin_Helper.h" #ifdef USES_NW005 -# include "../Helpers/StringGenerator_GPIO.h" +# include "../../../src/Helpers/StringGenerator_GPIO.h" # include @@ -71,5 +69,3 @@ private: } // namespace ESPEasy #endif // ifdef USES_NW005 - -#endif // ifndef NWPLUGINSTRUCT_NW005_DATA_STRUCT_PPP_MODEM_H diff --git a/src/_NW001_WiFi_STA.cpp b/src/ESPEasy/net/_NW001_WiFi_STA.cpp similarity index 88% rename from src/_NW001_WiFi_STA.cpp rename to src/ESPEasy/net/_NW001_WiFi_STA.cpp index 8f74164e2..a1a618fb0 100644 --- a/src/_NW001_WiFi_STA.cpp +++ b/src/ESPEasy/net/_NW001_WiFi_STA.cpp @@ -1,4 +1,4 @@ -#include "ESPEasy_common.h" +#include "../../ESPEasy_common.h" #ifdef USES_NW001 @@ -10,29 +10,25 @@ # define NWPLUGIN_ID_001 1 # define NWPLUGIN_NAME_001 "WiFi Station" -# include "src/NWPluginStructs/NW001_WiFi_STA.h" - -# include "src/ESPEasyCore/ESPEasyNetwork.h" -# include "src/ESPEasyCore/ESPEasyWifi.h" -# include "src/DataStructs/ESPEasy_EventStruct.h" -# include "src/Globals/NWPlugins.h" -# include "src/Helpers/ESPEasy_Storage.h" -# include "src/Helpers/_NWPlugin_init.h" - -# include "src/Globals/SecuritySettings.h" -# include "src/WebServer/common.h" -# include "src/Helpers/StringConverter.h" -# include "src/WebServer/ESPEasy_WebServer.h" -# include "src/Globals/Settings.h" -# include "src/WebServer/Markup_Forms.h" -# include "src/WebServer/Markup.h" -# include "src/ESPEasyCore/ESPEasyWifi_abstracted.h" - -# include "src/WebServer/HTML_Print.h" -# include "src/WebServer/HTML_wrappers.h" - -# include "src/Helpers/_NWPlugin_Helper_webform.h" -# include "src/Helpers/PrintToString.h" +# include "../../src/DataStructs/ESPEasy_EventStruct.h" +# include "../../src/ESPEasyCore/ESPEasyNetwork.h" +# include "../../src/Globals/SecuritySettings.h" +# include "../../src/Globals/Settings.h" +# include "../../src/Helpers/ESPEasy_Storage.h" +# include "../../src/Helpers/PrintToString.h" +# include "../../src/Helpers/StringConverter.h" +# include "../../src/WebServer/ESPEasy_WebServer.h" +# include "../../src/WebServer/HTML_Print.h" +# include "../../src/WebServer/HTML_wrappers.h" +# include "../../src/WebServer/Markup.h" +# include "../../src/WebServer/Markup_Forms.h" +# include "../../src/WebServer/common.h" +# include "../net/Globals/NWPlugins.h" +# include "../net/Helpers/_NWPlugin_Helper_webform.h" +# include "../net/Helpers/_NWPlugin_init.h" +# include "../net/NWPluginStructs/NW001_WiFi_STA.h" +# include "../net/wifi/ESPEasyWifi.h" +# include "../net/wifi/ESPEasyWifi_abstracted.h" # ifdef ESP32P4 # include diff --git a/src/_NW002_WiFi_AP.cpp b/src/ESPEasy/net/_NW002_WiFi_AP.cpp similarity index 80% rename from src/_NW002_WiFi_AP.cpp rename to src/ESPEasy/net/_NW002_WiFi_AP.cpp index 261ad336d..69a2e9e4d 100644 --- a/src/_NW002_WiFi_AP.cpp +++ b/src/ESPEasy/net/_NW002_WiFi_AP.cpp @@ -1,4 +1,4 @@ -#include "ESPEasy_common.h" +#include "../../ESPEasy_common.h" #ifdef USES_NW002 @@ -10,30 +10,27 @@ # define NWPLUGIN_ID_002 2 # define NWPLUGIN_NAME_002 "WiFi AP" -# include "src/ESPEasyCore/ESPEasyNetwork.h" -# include "src/DataStructs/ESPEasy_EventStruct.h" -# include "src/Globals/NWPlugins.h" -# include "src/Helpers/ESPEasy_Storage.h" -# include "src/Helpers/_NWPlugin_init.h" - -# include "src/Globals/SecuritySettings.h" -# include "src/WebServer/common.h" -# include "src/Helpers/StringConverter.h" -# include "src/WebServer/ESPEasy_WebServer.h" -# include "src/Globals/Settings.h" -# include "src/WebServer/Markup_Forms.h" -# include "src/WebServer/Markup.h" -# include "src/ESPEasyCore/ESPEasyWifi_abstracted.h" - -# include "src/Helpers/_NWPlugin_Helper_webform.h" -# include "src/Helpers/PrintToString.h" - -# include "src/WebServer/HTML_Print.h" -# include "src/WebServer/HTML_wrappers.h" +# include "../../src/DataStructs/ESPEasy_EventStruct.h" +# include "../../src/ESPEasyCore/ESPEasyNetwork.h" +# include "../../src/Globals/SecuritySettings.h" +# include "../../src/Globals/Settings.h" +# include "../../src/Helpers/ESPEasy_Storage.h" +# include "../../src/Helpers/PrintToString.h" +# include "../../src/Helpers/StringConverter.h" +# include "../../src/WebServer/ESPEasy_WebServer.h" +# include "../../src/WebServer/HTML_Print.h" +# include "../../src/WebServer/HTML_wrappers.h" +# include "../../src/WebServer/Markup.h" +# include "../../src/WebServer/Markup_Forms.h" +# include "../../src/WebServer/common.h" +# include "../net/Globals/NWPlugins.h" +# include "../net/Helpers/_NWPlugin_Helper_webform.h" +# include "../net/Helpers/_NWPlugin_init.h" +# include "../net/wifi/ESPEasyWifi_abstracted.h" // TODO TD-er: This code should be moved to this NW002 plugin -# include "src/ESPEasyCore/ESPEasyWifi.h" +# include "../net/wifi/ESPEasyWifi.h" namespace ESPEasy { namespace net { diff --git a/src/_NW003_ETH_RMII.cpp b/src/ESPEasy/net/_NW003_ETH_RMII.cpp similarity index 89% rename from src/_NW003_ETH_RMII.cpp rename to src/ESPEasy/net/_NW003_ETH_RMII.cpp index ec007958e..42e914f8d 100644 --- a/src/_NW003_ETH_RMII.cpp +++ b/src/ESPEasy/net/_NW003_ETH_RMII.cpp @@ -1,4 +1,4 @@ -#include "ESPEasy_common.h" +#include "../../ESPEasy_common.h" #ifdef USES_NW003 @@ -10,26 +10,23 @@ # define NWPLUGIN_ID_003 3 # define NWPLUGIN_NAME_003 "Ethernet (RMII)" -# include "src/DataStructs/ESPEasy_EventStruct.h" -# include "src/Globals/NWPlugins.h" -# include "src/Helpers/ESPEasy_Storage.h" -# include "src/Helpers/_NWPlugin_init.h" - -# include "src/Globals/SecuritySettings.h" -# include "src/WebServer/common.h" -# include "src/Helpers/StringConverter.h" -# include "src/WebServer/ESPEasy_WebServer.h" -# include "src/Globals/Settings.h" -# include "src/WebServer/Markup_Forms.h" -# include "src/WebServer/Markup.h" -# include "src/ESPEasyCore/ESPEasyWifi_abstracted.h" -# include "src/ESPEasyCore/ESPEasyEth.h" - -# include "src/WebServer/HTML_Print.h" -# include "src/WebServer/HTML_wrappers.h" - -# include "src/Helpers/_NWPlugin_Helper_webform.h" -# include "src/Helpers/PrintToString.h" +# include "../../src/DataStructs/ESPEasy_EventStruct.h" +# include "../../src/ESPEasyCore/ESPEasyEth.h" +# include "../net/wifi/ESPEasyWifi_abstracted.h" +# include "../../src/Globals/SecuritySettings.h" +# include "../../src/Globals/Settings.h" +# include "../../src/Helpers/ESPEasy_Storage.h" +# include "../../src/Helpers/PrintToString.h" +# include "../../src/Helpers/StringConverter.h" +# include "../../src/WebServer/ESPEasy_WebServer.h" +# include "../../src/WebServer/HTML_Print.h" +# include "../../src/WebServer/HTML_wrappers.h" +# include "../../src/WebServer/Markup.h" +# include "../../src/WebServer/Markup_Forms.h" +# include "../../src/WebServer/common.h" +# include "../net/Globals/NWPlugins.h" +# include "../net/Helpers/_NWPlugin_Helper_webform.h" +# include "../net/Helpers/_NWPlugin_init.h" # include diff --git a/src/_NW004_ETH_SPI.cpp b/src/ESPEasy/net/_NW004_ETH_SPI.cpp similarity index 89% rename from src/_NW004_ETH_SPI.cpp rename to src/ESPEasy/net/_NW004_ETH_SPI.cpp index c30362a52..b2873ef28 100644 --- a/src/_NW004_ETH_SPI.cpp +++ b/src/ESPEasy/net/_NW004_ETH_SPI.cpp @@ -1,4 +1,4 @@ -#include "ESPEasy_common.h" +#include "../../ESPEasy_common.h" #ifdef USES_NW004 @@ -10,26 +10,23 @@ # define NWPLUGIN_ID_004 4 # define NWPLUGIN_NAME_004 "Ethernet (SPI)" -# include "src/DataStructs/ESPEasy_EventStruct.h" -# include "src/Globals/NWPlugins.h" -# include "src/Helpers/ESPEasy_Storage.h" -# include "src/Helpers/_NWPlugin_init.h" - -# include "src/Globals/SecuritySettings.h" -# include "src/WebServer/common.h" -# include "src/Helpers/StringConverter.h" -# include "src/WebServer/ESPEasy_WebServer.h" -# include "src/Globals/Settings.h" -# include "src/WebServer/Markup_Forms.h" -# include "src/WebServer/Markup.h" -# include "src/ESPEasyCore/ESPEasyWifi_abstracted.h" -# include "src/ESPEasyCore/ESPEasyEth.h" - -# include "src/WebServer/HTML_Print.h" -# include "src/WebServer/HTML_wrappers.h" - -# include "src/Helpers/_NWPlugin_Helper_webform.h" -# include "src/Helpers/PrintToString.h" +# include "../../src/DataStructs/ESPEasy_EventStruct.h" +# include "../../src/ESPEasyCore/ESPEasyEth.h" +# include "../../src/Globals/SecuritySettings.h" +# include "../../src/Globals/Settings.h" +# include "../../src/Helpers/ESPEasy_Storage.h" +# include "../../src/Helpers/PrintToString.h" +# include "../../src/Helpers/StringConverter.h" +# include "../../src/WebServer/ESPEasy_WebServer.h" +# include "../../src/WebServer/HTML_Print.h" +# include "../../src/WebServer/HTML_wrappers.h" +# include "../../src/WebServer/Markup.h" +# include "../../src/WebServer/Markup_Forms.h" +# include "../../src/WebServer/common.h" +# include "../net/Globals/NWPlugins.h" +# include "../net/Helpers/_NWPlugin_Helper_webform.h" +# include "../net/Helpers/_NWPlugin_init.h" +# include "../net/wifi/ESPEasyWifi_abstracted.h" # include diff --git a/src/_NW005_PPP_modem.cpp b/src/ESPEasy/net/_NW005_PPP_modem.cpp similarity index 81% rename from src/_NW005_PPP_modem.cpp rename to src/ESPEasy/net/_NW005_PPP_modem.cpp index 418423d38..e3006bc00 100644 --- a/src/_NW005_PPP_modem.cpp +++ b/src/ESPEasy/net/_NW005_PPP_modem.cpp @@ -1,4 +1,4 @@ -#include "ESPEasy_common.h" +#include "../../ESPEasy_common.h" #ifdef USES_NW005 @@ -10,30 +10,25 @@ # define NWPLUGIN_ID_005 5 # define NWPLUGIN_NAME_005 "PPP modem" -# include "src/NWPluginStructs/NW005_data_struct_PPP_modem.h" - -# include "src/DataStructs/ESPEasy_EventStruct.h" - -# include "src/ESPEasyCore/ESPEasyNetwork.h" -# include "src/ESPEasyCore/ESPEasyWifi_abstracted.h" - -# include "src/Globals/NWPlugins.h" -# include "src/Globals/SecuritySettings.h" -# include "src/Globals/Settings.h" - -# include "src/Helpers/ESPEasy_Storage.h" -# include "src/Helpers/PrintToString.h" -# include "src/Helpers/StringConverter.h" -# include "src/Helpers/_NWPlugin_Helper_webform.h" -# include "src/Helpers/_NWPlugin_init.h" -# include "src/Helpers/_Plugin_Helper_serial.h" - -# include "src/WebServer/ESPEasy_WebServer.h" -# include "src/WebServer/HTML_Print.h" -# include "src/WebServer/HTML_wrappers.h" -# include "src/WebServer/Markup.h" -# include "src/WebServer/Markup_Forms.h" -# include "src/WebServer/common.h" +# include "../../src/DataStructs/ESPEasy_EventStruct.h" +# include "../../src/ESPEasyCore/ESPEasyNetwork.h" +# include "../../src/Globals/SecuritySettings.h" +# include "../../src/Globals/Settings.h" +# include "../../src/Helpers/ESPEasy_Storage.h" +# include "../../src/Helpers/PrintToString.h" +# include "../../src/Helpers/StringConverter.h" +# include "../../src/Helpers/_Plugin_Helper_serial.h" +# include "../../src/WebServer/ESPEasy_WebServer.h" +# include "../../src/WebServer/HTML_Print.h" +# include "../../src/WebServer/HTML_wrappers.h" +# include "../../src/WebServer/Markup.h" +# include "../../src/WebServer/Markup_Forms.h" +# include "../../src/WebServer/common.h" +# include "../net/Globals/NWPlugins.h" +# include "../net/Helpers/_NWPlugin_Helper_webform.h" +# include "../net/Helpers/_NWPlugin_init.h" +# include "../net/NWPluginStructs/NW005_data_struct_PPP_modem.h" +# include "../net/wifi/ESPEasyWifi_abstracted.h" # include diff --git a/src/_NWPlugin_Helper.cpp b/src/ESPEasy/net/_NWPlugin_Helper.cpp similarity index 89% rename from src/_NWPlugin_Helper.cpp rename to src/ESPEasy/net/_NWPlugin_Helper.cpp index 9a9e95460..cfe503804 100644 --- a/src/_NWPlugin_Helper.cpp +++ b/src/ESPEasy/net/_NWPlugin_Helper.cpp @@ -1,11 +1,11 @@ -#include "../src/_NWPlugin_Helper.h" +#include "../net/_NWPlugin_Helper.h" #if FEATURE_STORE_NETWORK_INTERFACE_SETTINGS -# include "src/CustomBuild/ESPEasyLimits.h" +# include "../../src/CustomBuild/ESPEasyLimits.h" -# include "src/Globals/NWPlugins.h" -# include "src/Globals/Settings.h" +# include "../net/Globals/NWPlugins.h" +# include "../../src/Globals/Settings.h" namespace ESPEasy { namespace net { diff --git a/src/_NWPlugin_Helper.h b/src/ESPEasy/net/_NWPlugin_Helper.h similarity index 77% rename from src/_NWPlugin_Helper.h rename to src/ESPEasy/net/_NWPlugin_Helper.h index 3eda6d8ac..b6c8fc8f4 100644 --- a/src/_NWPlugin_Helper.h +++ b/src/ESPEasy/net/_NWPlugin_Helper.h @@ -1,13 +1,12 @@ -#ifndef _NWPLUGIN_HELPER_H -#define _NWPLUGIN_HELPER_H +#pragma once -#include "ESPEasy_common.h" +#include "../../ESPEasy_common.h" #if FEATURE_STORE_NETWORK_INTERFACE_SETTINGS -# include "src/CustomBuild/ESPEasyLimits.h" -# include "src/DataStructs/ESPEasy_EventStruct.h" -# include "src/DataStructs/NWPluginData_base.h" +# include "../../src/CustomBuild/ESPEasyLimits.h" +# include "../../src/DataStructs/ESPEasy_EventStruct.h" +# include "../net/DataStructs/NWPluginData_base.h" namespace ESPEasy { namespace net { @@ -41,4 +40,3 @@ bool nwpluginTaskData_initialized(ESPEasy::net::networkIndex_t networkIndex); #endif // if FEATURE_STORE_NETWORK_INTERFACE_SETTINGS -#endif // ifndef _NWPLUGIN_HELPER_H diff --git a/src/src/ESPEasyCore/ESPEasyWiFiEvent_ESP32.cpp b/src/ESPEasy/net/wifi/ESPEasyWiFiEvent_ESP32.cpp similarity index 87% rename from src/src/ESPEasyCore/ESPEasyWiFiEvent_ESP32.cpp rename to src/ESPEasy/net/wifi/ESPEasyWiFiEvent_ESP32.cpp index d8a2ddb53..be4219ac0 100644 --- a/src/src/ESPEasyCore/ESPEasyWiFiEvent_ESP32.cpp +++ b/src/ESPEasy/net/wifi/ESPEasyWiFiEvent_ESP32.cpp @@ -1,4 +1,4 @@ -#include "../ESPEasyCore/ESPEasyWiFiEvent_ESP32.h" +#include "../wifi/ESPEasyWiFiEvent_ESP32.h" #ifdef ESP32 # if FEATURE_ETHERNET @@ -8,27 +8,28 @@ # include # endif -# include "../DataStructs/RTCStruct.h" +# include "../../../src/DataStructs/RTCStruct.h" -# include "../DataTypes/ESPEasyTimeSource.h" +# include "../../../src/DataTypes/ESPEasyTimeSource.h" -# include "../ESPEasyCore/ESPEasyEth.h" -# include "../ESPEasyCore/ESPEasy_Log.h" -# include "../ESPEasyCore/ESPEasyNetwork.h" -# include "../ESPEasyCore/ESPEasyWifi.h" -# include "../ESPEasyCore/ESPEasyWifi_ProcessEvent.h" +# include "../../../src/ESPEasyCore/ESPEasyEth.h" +# include "../../../src/ESPEasyCore/ESPEasy_Log.h" +# include "../../../src/ESPEasyCore/ESPEasyNetwork.h" -# include "../Globals/ESPEasyWiFiEvent.h" -# include "../Globals/NetworkState.h" -# include "../Globals/RTC.h" -# include "../Globals/WiFi_AP_Candidates.h" +# include "../wifi/ESPEasyWifi.h" +# include "../wifi/ESPEasyWifi_ProcessEvent.h" -# include "../Helpers/ESPEasy_time_calc.h" -# include "../Helpers/StringConverter.h" +# include "../../../src/Globals/ESPEasyWiFiEvent.h" +# include "../../../src/Globals/NetworkState.h" +# include "../../../src/Globals/RTC.h" +# include "../../../src/Globals/WiFi_AP_Candidates.h" + +# include "../../../src/Helpers/ESPEasy_time_calc.h" +# include "../../../src/Helpers/StringConverter.h" # if FEATURE_ETHERNET -# include "../Globals/ESPEasyEthEvent.h" +# include "../../../src/Globals/ESPEasyEthEvent.h" # endif // if FEATURE_ETHERNET void setUseStaticIP(bool enabled) {} diff --git a/src/src/ESPEasyCore/ESPEasyWiFiEvent_ESP32.h b/src/ESPEasy/net/wifi/ESPEasyWiFiEvent_ESP32.h similarity index 93% rename from src/src/ESPEasyCore/ESPEasyWiFiEvent_ESP32.h rename to src/ESPEasy/net/wifi/ESPEasyWiFiEvent_ESP32.h index 6f7e8df81..08598aaad 100644 --- a/src/src/ESPEasyCore/ESPEasyWiFiEvent_ESP32.h +++ b/src/ESPEasy/net/wifi/ESPEasyWiFiEvent_ESP32.h @@ -3,7 +3,7 @@ #ifdef ESP32 -# include "../../ESPEasy_common.h" +# include "../../../ESPEasy_common.h" # include diff --git a/src/src/ESPEasyCore/ESPEasyWiFiEvent_ESP8266.cpp b/src/ESPEasy/net/wifi/ESPEasyWiFiEvent_ESP8266.cpp similarity index 80% rename from src/src/ESPEasyCore/ESPEasyWiFiEvent_ESP8266.cpp rename to src/ESPEasy/net/wifi/ESPEasyWiFiEvent_ESP8266.cpp index 2fb82ba1d..d17bc3a9d 100644 --- a/src/src/ESPEasyCore/ESPEasyWiFiEvent_ESP8266.cpp +++ b/src/ESPEasy/net/wifi/ESPEasyWiFiEvent_ESP8266.cpp @@ -1,24 +1,24 @@ -#include "../ESPEasyCore/ESPEasyWiFiEvent_ESP8266.h" +#include "../wifi/ESPEasyWiFiEvent_ESP8266.h" #if FEATURE_WIFI # ifdef ESP8266 -# include "../DataStructs/RTCStruct.h" +# include "../../../src/DataStructs/RTCStruct.h" -# include "../DataTypes/ESPEasyTimeSource.h" +# include "../../../src/DataTypes/ESPEasyTimeSource.h" -# include "../ESPEasyCore/ESPEasyEth.h" -# include "../ESPEasyCore/ESPEasy_Log.h" -# include "../ESPEasyCore/ESPEasyNetwork.h" -# include "../ESPEasyCore/ESPEasyWifi.h" -# include "../ESPEasyCore/ESPEasyWifi_ProcessEvent.h" +# include "../../../src/ESPEasyCore/ESPEasyEth.h" +# include "../../../src/ESPEasyCore/ESPEasy_Log.h" +# include "../../../src/ESPEasyCore/ESPEasyNetwork.h" +# include "../wifi/ESPEasyWifi.h" +# include "../wifi/ESPEasyWifi_ProcessEvent.h" -# include "../Globals/ESPEasyWiFiEvent.h" -# include "../Globals/NetworkState.h" -# include "../Globals/RTC.h" -# include "../Globals/WiFi_AP_Candidates.h" +# include "../../../src/Globals/ESPEasyWiFiEvent.h" +# include "../../../src/Globals/NetworkState.h" +# include "../../../src/Globals/RTC.h" +# include "../../../src/Globals/WiFi_AP_Candidates.h" -# include "../Helpers/ESPEasy_time_calc.h" +# include "../../../src/Helpers/ESPEasy_time_calc.h" void WiFi_Access_Static_IP::set_use_static_ip(bool enabled) { _useStaticIp = enabled; } diff --git a/src/src/ESPEasyCore/ESPEasyWiFiEvent_ESP8266.h b/src/ESPEasy/net/wifi/ESPEasyWiFiEvent_ESP8266.h similarity index 94% rename from src/src/ESPEasyCore/ESPEasyWiFiEvent_ESP8266.h rename to src/ESPEasy/net/wifi/ESPEasyWiFiEvent_ESP8266.h index d0ff23a37..f1bd4223a 100644 --- a/src/src/ESPEasyCore/ESPEasyWiFiEvent_ESP8266.h +++ b/src/ESPEasy/net/wifi/ESPEasyWiFiEvent_ESP8266.h @@ -4,7 +4,7 @@ #ifdef ESP8266 -# include "../../ESPEasy_common.h" +# include "../../../ESPEasy_common.h" # if FEATURE_WIFI diff --git a/src/src/ESPEasyCore/ESPEasyWiFi_state_machine.cpp b/src/ESPEasy/net/wifi/ESPEasyWiFi_state_machine.cpp similarity index 92% rename from src/src/ESPEasyCore/ESPEasyWiFi_state_machine.cpp rename to src/ESPEasy/net/wifi/ESPEasyWiFi_state_machine.cpp index c9ae0b751..99b7dc59b 100644 --- a/src/src/ESPEasyCore/ESPEasyWiFi_state_machine.cpp +++ b/src/ESPEasy/net/wifi/ESPEasyWiFi_state_machine.cpp @@ -1,22 +1,22 @@ -#include "../ESPEasyCore/ESPEasyWiFi_state_machine.h" +#include "../wifi/ESPEasyWiFi_state_machine.h" #if FEATURE_WIFI -# include "../ESPEasyCore/ESPEasyWifi.h" -# include "../ESPEasyCore/ESPEasyWifi_abstracted.h" +# include "../wifi/ESPEasyWifi.h" +# include "../wifi/ESPEasyWifi_abstracted.h" -# include "../ESPEasyCore/ESPEasyNetwork.h" // for setNetworkMedium, however this should not be part of the WiFi code +# include "../../../src/ESPEasyCore/ESPEasyNetwork.h" // for setNetworkMedium, however this should not be part of the WiFi code -# include "../ESPEasyCore/ESPEasy_Log.h" +# include "../../../src/ESPEasyCore/ESPEasy_Log.h" -# include "../Globals/ESPEasyWiFiEvent.h" -# include "../Globals/RTC.h" -# include "../Globals/Settings.h" -# include "../Globals/WiFi_AP_Candidates.h" +# include "../../../src/Globals/ESPEasyWiFiEvent.h" +# include "../../../src/Globals/RTC.h" +# include "../../../src/Globals/Settings.h" +# include "../../../src/Globals/WiFi_AP_Candidates.h" -# include "../Helpers/StringConverter.h" -# include "../Helpers/StringGenerator_WiFi.h" +# include "../../../src/Helpers/StringConverter.h" +# include "../../../src/Helpers/StringGenerator_WiFi.h" namespace ESPEasy { namespace net { diff --git a/src/src/ESPEasyCore/ESPEasyWiFi_state_machine.h b/src/ESPEasy/net/wifi/ESPEasyWiFi_state_machine.h similarity index 87% rename from src/src/ESPEasyCore/ESPEasyWiFi_state_machine.h rename to src/ESPEasy/net/wifi/ESPEasyWiFi_state_machine.h index d64780348..5351de5b7 100644 --- a/src/src/ESPEasyCore/ESPEasyWiFi_state_machine.h +++ b/src/ESPEasy/net/wifi/ESPEasyWiFi_state_machine.h @@ -1,15 +1,14 @@ #pragma once -#include "../../ESPEasy_common.h" +#include "../../../ESPEasy_common.h" #if FEATURE_WIFI -# include "../DataStructs/WiFi_AP_Candidate.h" -# include "../Helpers/LongTermTimer.h" - -# include "../DataTypes/WiFi_STA_connected_state.h" -# include "../DataTypes/WiFi_State.h" +# include "../../../src/DataStructs/WiFi_AP_Candidate.h" +# include "../../../src/Helpers/LongTermTimer.h" +#include "../wifi/WiFi_STA_connected_state.h" +#include "../wifi/WiFi_State.h" # include diff --git a/src/src/ESPEasyCore/ESPEasyWiFi_state_machine_ESP32.cpp b/src/ESPEasy/net/wifi/ESPEasyWiFi_state_machine_ESP32.cpp similarity index 89% rename from src/src/ESPEasyCore/ESPEasyWiFi_state_machine_ESP32.cpp rename to src/ESPEasy/net/wifi/ESPEasyWiFi_state_machine_ESP32.cpp index f85d97598..215a72869 100644 --- a/src/src/ESPEasyCore/ESPEasyWiFi_state_machine_ESP32.cpp +++ b/src/ESPEasy/net/wifi/ESPEasyWiFi_state_machine_ESP32.cpp @@ -1,4 +1,4 @@ -#include "../ESPEasyCore/ESPEasyWiFi_state_machine.h" +#include "../wifi/ESPEasyWiFi_state_machine.h" #ifdef ESP32 # if FEATURE_WIFI @@ -14,7 +14,7 @@ # include # include -# include "../ESPEasyCore/ESPEasyWifi_abstracted.h" +# include "../wifi/ESPEasyWifi_abstracted.h" namespace ESPEasy { diff --git a/src/src/ESPEasyCore/ESPEasyWiFi_state_machine_ESP8266.cpp b/src/ESPEasy/net/wifi/ESPEasyWiFi_state_machine_ESP8266.cpp similarity index 87% rename from src/src/ESPEasyCore/ESPEasyWiFi_state_machine_ESP8266.cpp rename to src/ESPEasy/net/wifi/ESPEasyWiFi_state_machine_ESP8266.cpp index 373afebbe..fb5ff2516 100644 --- a/src/src/ESPEasyCore/ESPEasyWiFi_state_machine_ESP8266.cpp +++ b/src/ESPEasy/net/wifi/ESPEasyWiFi_state_machine_ESP8266.cpp @@ -1,9 +1,9 @@ -#include "../ESPEasyCore/ESPEasyWiFi_state_machine.h" +#include "../wifi/ESPEasyWiFi_state_machine.h" #ifdef ESP8266 # if FEATURE_WIFI -# include "../ESPEasyCore/ESPEasyWifi_abstracted.h" +# include "../wifi/ESPEasyWifi_abstracted.h" namespace ESPEasy { namespace net { diff --git a/src/src/ESPEasyCore/ESPEasyWifi.cpp b/src/ESPEasy/net/wifi/ESPEasyWifi.cpp similarity index 89% rename from src/src/ESPEasyCore/ESPEasyWifi.cpp rename to src/ESPEasy/net/wifi/ESPEasyWifi.cpp index 14851dd33..e7c670706 100644 --- a/src/src/ESPEasyCore/ESPEasyWifi.cpp +++ b/src/ESPEasy/net/wifi/ESPEasyWifi.cpp @@ -1,32 +1,32 @@ -#include "../ESPEasyCore/ESPEasyWifi.h" +#include "../wifi/ESPEasyWifi.h" #if FEATURE_WIFI -# include "../../ESPEasy-Globals.h" -# include "../DataStructs/TimingStats.h" -# include "../ESPEasyCore/ESPEasyNetwork.h" -# include "../ESPEasyCore/ESPEasyWifi_ProcessEvent.h" -# include "../ESPEasyCore/ESPEasy_Log.h" -# include "../ESPEasyCore/Serial.h" -# include "../Globals/ESPEasyWiFiEvent.h" -# include "../Globals/EventQueue.h" -# include "../Globals/NetworkState.h" -# include "../Globals/Nodes.h" -# include "../Globals/RTC.h" -# include "../Globals/SecuritySettings.h" -# include "../Globals/Services.h" -# include "../Globals/Settings.h" -# include "../Globals/WiFi_AP_Candidates.h" -# include "../Helpers/ESPEasy_time_calc.h" -# include "../Helpers/Hardware_defines.h" -# include "../Helpers/Misc.h" -# include "../Helpers/Networking.h" -# include "../Helpers/StringConverter.h" -# include "../Helpers/StringGenerator_WiFi.h" -# include "../Helpers/StringProvider.h" +# include "../../../ESPEasy-Globals.h" +# include "../../../src/DataStructs/TimingStats.h" +# include "../../../src/ESPEasyCore/ESPEasyNetwork.h" +# include "../wifi/ESPEasyWifi_ProcessEvent.h" +# include "../../../src/ESPEasyCore/ESPEasy_Log.h" +# include "../../../src/ESPEasyCore/Serial.h" +# include "../../../src/Globals/ESPEasyWiFiEvent.h" +# include "../../../src/Globals/EventQueue.h" +# include "../../../src/Globals/NetworkState.h" +# include "../../../src/Globals/Nodes.h" +# include "../../../src/Globals/RTC.h" +# include "../../../src/Globals/SecuritySettings.h" +# include "../../../src/Globals/Services.h" +# include "../../../src/Globals/Settings.h" +# include "../../../src/Globals/WiFi_AP_Candidates.h" +# include "../../../src/Helpers/ESPEasy_time_calc.h" +# include "../../../src/Helpers/Hardware_defines.h" +# include "../../../src/Helpers/Misc.h" +# include "../../../src/Helpers/Networking.h" +# include "../../../src/Helpers/StringConverter.h" +# include "../../../src/Helpers/StringGenerator_WiFi.h" +# include "../../../src/Helpers/StringProvider.h" -# include "../ESPEasyCore/ESPEasyWifi_abstracted.h" +# include "../wifi/ESPEasyWifi_abstracted.h" # ifdef ESP32 @@ -274,7 +274,7 @@ int GetRSSI_quality() { return (rssi / 5) + 1; } -WiFiConnectionProtocol getConnectionProtocol() { return ESPEasy::net::wifi::getConnectionProtocol(); } +ESPEasy::net::wifi::WiFiConnectionProtocol getConnectionProtocol() { return ESPEasy::net::wifi::getConnectionProtocol(); } # ifdef ESP32 diff --git a/src/src/ESPEasyCore/ESPEasyWifi.h b/src/ESPEasy/net/wifi/ESPEasyWifi.h similarity index 87% rename from src/src/ESPEasyCore/ESPEasyWifi.h rename to src/ESPEasy/net/wifi/ESPEasyWifi.h index 9102dd75f..99e1b75c5 100644 --- a/src/src/ESPEasyCore/ESPEasyWifi.h +++ b/src/ESPEasy/net/wifi/ESPEasyWifi.h @@ -1,7 +1,7 @@ #ifndef ESPEASY_WIFI_H #define ESPEASY_WIFI_H -#include "../../ESPEasy_common.h" +#include "../../../ESPEasy_common.h" #if FEATURE_WIFI @@ -12,10 +12,10 @@ # include # endif // if defined(ESP32) -# include "../DataTypes/WiFiConnectionProtocol.h" -# include "../DataStructs/WiFi_AP_Candidate.h" +#include "../wifi/WiFiConnectionProtocol.h" +# include "../../../src/DataStructs/WiFi_AP_Candidate.h" -# include "../Helpers/LongTermTimer.h" +# include "../../../src/Helpers/LongTermTimer.h" # define WIFI_RECONNECT_WAIT 30000 // in milliSeconds # define WIFI_AP_OFF_TIMER_DURATION 300000 // in milliSeconds @@ -55,7 +55,7 @@ float GetRSSIthreshold(float& maxTXpwr); // <-97 => 0 , >-50 => 10 // -97 ... -50 => 1 ... 9 int GetRSSI_quality(); -WiFiConnectionProtocol getConnectionProtocol(); +ESPEasy::net::wifi::WiFiConnectionProtocol getConnectionProtocol(); # ifdef ESP32 // TSF time is 64-bit timer in usec, sent by the AP along with other packets. diff --git a/src/src/ESPEasyCore/ESPEasyWifi_ProcessEvent.cpp b/src/ESPEasy/net/wifi/ESPEasyWifi_ProcessEvent.cpp similarity index 87% rename from src/src/ESPEasyCore/ESPEasyWifi_ProcessEvent.cpp rename to src/ESPEasy/net/wifi/ESPEasyWifi_ProcessEvent.cpp index f45ac4e4f..c215fd5ec 100644 --- a/src/src/ESPEasyCore/ESPEasyWifi_ProcessEvent.cpp +++ b/src/ESPEasy/net/wifi/ESPEasyWifi_ProcessEvent.cpp @@ -1,35 +1,35 @@ -#include "../ESPEasyCore/ESPEasyWifi_ProcessEvent.h" +#include "../wifi/ESPEasyWifi_ProcessEvent.h" -#include "../../ESPEasy-Globals.h" +#include "../../../ESPEasy-Globals.h" #if FEATURE_ETHERNET -# include "../ESPEasyCore/ESPEasyEth_ProcessEvent.h" +# include "../../../src/ESPEasyCore/ESPEasyEth_ProcessEvent.h" #endif -#include "../ESPEasyCore/ESPEasyNetwork.h" -#include "../ESPEasyCore/ESPEasyWifi.h" -#include "../ESPEasyCore/ESPEasyWifi_abstracted.h" +# include "../../../src/ESPEasyCore/ESPEasyNetwork.h" +#include "../wifi/ESPEasyWifi.h" +#include "../wifi/ESPEasyWifi_abstracted.h" -#include "../Globals/ESPEasyWiFiEvent.h" -#include "../Globals/ESPEasy_Scheduler.h" -#include "../Globals/ESPEasy_time.h" -#include "../Globals/EventQueue.h" -#include "../Globals/MQTT.h" -#include "../Globals/NetworkState.h" -#include "../Globals/RTC.h" -#include "../Globals/SecuritySettings.h" -#include "../Globals/Services.h" -#include "../Globals/Settings.h" -#include "../Globals/WiFi_AP_Candidates.h" +# include "../../../src/Globals/ESPEasyWiFiEvent.h" +# include "../../../src/Globals/ESPEasy_Scheduler.h" +# include "../../../src/Globals/ESPEasy_time.h" +# include "../../../src/Globals/EventQueue.h" +# include "../../../src/Globals/MQTT.h" +# include "../../../src/Globals/NetworkState.h" +# include "../../../src/Globals/RTC.h" +# include "../../../src/Globals/SecuritySettings.h" +# include "../../../src/Globals/Services.h" +# include "../../../src/Globals/Settings.h" +# include "../../../src/Globals/WiFi_AP_Candidates.h" -#include "../Helpers/Convert.h" -#include "../Helpers/ESPEasyRTC.h" -#include "../Helpers/ESPEasy_Storage.h" -#include "../Helpers/Network.h" -#include "../Helpers/Networking.h" -#include "../Helpers/PeriodicalActions.h" -#include "../Helpers/StringConverter.h" -#include "../Helpers/StringGenerator_WiFi.h" -#include "../Helpers/StringProvider.h" +# include "../../../src/Helpers/Convert.h" +# include "../../../src/Helpers/ESPEasyRTC.h" +# include "../../../src/Helpers/ESPEasy_Storage.h" +# include "../../../src/Helpers/Network.h" +# include "../../../src/Helpers/Networking.h" +# include "../../../src/Helpers/PeriodicalActions.h" +# include "../../../src/Helpers/StringConverter.h" +# include "../../../src/Helpers/StringGenerator_WiFi.h" +# include "../../../src/Helpers/StringProvider.h" // #include "../ESPEasyCore/ESPEasyEth.h" // #include "../ESPEasyCore/ESPEasyWiFiEvent.h" @@ -38,7 +38,7 @@ // #include "../Helpers/Misc.h" // #include "../Helpers/Scheduler.h" -#include "../WebServer/ESPEasy_WebServer.h" +# include "../../../src/WebServer/ESPEasy_WebServer.h" // ******************************************************************************** // Called from the loop() to make sure events are processed as soon as possible. diff --git a/src/src/ESPEasyCore/ESPEasyWifi_ProcessEvent.h b/src/ESPEasy/net/wifi/ESPEasyWifi_ProcessEvent.h similarity index 88% rename from src/src/ESPEasyCore/ESPEasyWifi_ProcessEvent.h rename to src/ESPEasy/net/wifi/ESPEasyWifi_ProcessEvent.h index 826bda61d..c359ee088 100644 --- a/src/src/ESPEasyCore/ESPEasyWifi_ProcessEvent.h +++ b/src/ESPEasy/net/wifi/ESPEasyWifi_ProcessEvent.h @@ -1,7 +1,7 @@ #ifndef ESPEASYCORE_ESPEASYWIFI_PROCESSEVENT_H #define ESPEASYCORE_ESPEASYWIFI_PROCESSEVENT_H -#include "../../ESPEasy_common.h" +#include "../../../ESPEasy_common.h" void handle_unprocessedNetworkEvents(); void processDisconnect(); diff --git a/src/src/ESPEasyCore/ESPEasyWifi_abstracted.cpp b/src/ESPEasy/net/wifi/ESPEasyWifi_abstracted.cpp similarity index 90% rename from src/src/ESPEasyCore/ESPEasyWifi_abstracted.cpp rename to src/ESPEasy/net/wifi/ESPEasyWifi_abstracted.cpp index 2f93e9acf..0404e51d3 100644 --- a/src/src/ESPEasyCore/ESPEasyWifi_abstracted.cpp +++ b/src/ESPEasy/net/wifi/ESPEasyWifi_abstracted.cpp @@ -1,12 +1,12 @@ -#include "../ESPEasyCore/ESPEasyWifi_abstracted.h" +#include "../wifi/ESPEasyWifi_abstracted.h" #if FEATURE_WIFI -# include "../Globals/EventQueue.h" -# include "../Globals/Settings.h" -# include "../Globals/ESPEasyWiFiEvent.h" +# include "../../../src/Globals/EventQueue.h" +# include "../../../src/Globals/Settings.h" +# include "../../../src/Globals/ESPEasyWiFiEvent.h" -# include "../Helpers/StringConverter.h" +# include "../../../src/Helpers/StringConverter.h" namespace ESPEasy { namespace net { diff --git a/src/src/ESPEasyCore/ESPEasyWifi_abstracted.h b/src/ESPEasy/net/wifi/ESPEasyWifi_abstracted.h similarity index 87% rename from src/src/ESPEasyCore/ESPEasyWifi_abstracted.h rename to src/ESPEasy/net/wifi/ESPEasyWifi_abstracted.h index 2de675c7a..caf22d10b 100644 --- a/src/src/ESPEasyCore/ESPEasyWifi_abstracted.h +++ b/src/ESPEasy/net/wifi/ESPEasyWifi_abstracted.h @@ -1,21 +1,21 @@ #ifndef ESPEASYCORE_ESPEASYWIFI_ABSTRACTED_H #define ESPEASYCORE_ESPEASYWIFI_ABSTRACTED_H -#include "../../ESPEasy_common.h" +#include "../../../ESPEasy_common.h" #if FEATURE_WIFI -# include "../DataTypes/WiFiConnectionProtocol.h" -# include "../DataTypes/WiFi_STA_connected_state.h" -# include "../DataTypes/WiFi_State.h" +#include "../wifi/WiFiConnectionProtocol.h" +#include "../wifi/WiFi_STA_connected_state.h" +#include "../wifi/WiFi_State.h" # if defined(ESP8266) -# include "../ESPEasyCore/ESPEasyWiFiEvent_ESP8266.h" +# include "../wifi/ESPEasyWiFiEvent_ESP8266.h" # include # endif // if defined(ESP8266) # if defined(ESP32) -# include "../ESPEasyCore/ESPEasyWiFiEvent_ESP32.h" +# include "../wifi/ESPEasyWiFiEvent_ESP32.h" # include # include # endif // if defined(ESP32) diff --git a/src/src/ESPEasyCore/ESPEasyWifi_abstracted_ESP32.cpp b/src/ESPEasy/net/wifi/ESPEasyWifi_abstracted_ESP32.cpp similarity index 92% rename from src/src/ESPEasyCore/ESPEasyWifi_abstracted_ESP32.cpp rename to src/ESPEasy/net/wifi/ESPEasyWifi_abstracted_ESP32.cpp index 49a170fea..5aaed414a 100644 --- a/src/src/ESPEasyCore/ESPEasyWifi_abstracted_ESP32.cpp +++ b/src/ESPEasy/net/wifi/ESPEasyWifi_abstracted_ESP32.cpp @@ -1,23 +1,23 @@ -#include "../ESPEasyCore/ESPEasyWifi_abstracted.h" +#include "../wifi/ESPEasyWifi_abstracted.h" #if FEATURE_WIFI # ifdef ESP32 -# include "../DataStructs/TimingStats.h" +# include "../../../src/DataStructs/TimingStats.h" -# include "../Globals/ESPEasyWiFiEvent.h" -# include "../Globals/EventQueue.h" -# include "../Globals/Settings.h" -# include "../Globals/WiFi_AP_Candidates.h" -# include "../ESPEasyCore/ESPEasyWiFiEvent_ESP32.h" +# include "../../../src/Globals/ESPEasyWiFiEvent.h" +# include "../../../src/Globals/EventQueue.h" +# include "../../../src/Globals/Settings.h" +# include "../../../src/Globals/WiFi_AP_Candidates.h" +# include "../wifi/ESPEasyWiFiEvent_ESP32.h" -# include "../Helpers/StringConverter.h" +# include "../../../src/Helpers/StringConverter.h" -# include "../ESPEasyCore/ESPEasyNetwork.h" // Needed for NetworkCreateRFCCompliantHostname, WiFi code should not include network code -# include "../ESPEasyCore/ESPEasyWifi.h" // Needed for WifiDisconnect. Maybe this should be moved to these 'abstract' files? +# include "../../../src/ESPEasyCore/ESPEasyNetwork.h" // Needed for NetworkCreateRFCCompliantHostname, WiFi code should not include network code +# include "../wifi/ESPEasyWifi.h" // Needed for WifiDisconnect. Maybe this should be moved to these 'abstract' files? -# include "../ESPEasyCore/ESPEasyWifi_ProcessEvent.h" +# include "../wifi/ESPEasyWifi_ProcessEvent.h" # include diff --git a/src/src/ESPEasyCore/ESPEasyWifi_abstracted_ESP8266.cpp b/src/ESPEasy/net/wifi/ESPEasyWifi_abstracted_ESP8266.cpp similarity index 92% rename from src/src/ESPEasyCore/ESPEasyWifi_abstracted_ESP8266.cpp rename to src/ESPEasy/net/wifi/ESPEasyWifi_abstracted_ESP8266.cpp index 4b25ff4ae..1d37a0691 100644 --- a/src/src/ESPEasyCore/ESPEasyWifi_abstracted_ESP8266.cpp +++ b/src/ESPEasy/net/wifi/ESPEasyWifi_abstracted_ESP8266.cpp @@ -1,17 +1,19 @@ -#include "../ESPEasyCore/ESPEasyWifi_abstracted.h" +#include "../wifi/ESPEasyWifi_abstracted.h" #if FEATURE_WIFI # ifdef ESP8266 -# include "../DataStructs/TimingStats.h" +# include "../../../src/DataStructs/TimingStats.h" -# include "../Helpers/StringConverter.h" +# include "../../../src/Helpers/StringConverter.h" -# include "../Globals/ESPEasyWiFiEvent.h" -# include "../Globals/Settings.h" -# include "../Globals/WiFi_AP_Candidates.h" +# include "../../../src/Globals/ESPEasyWiFiEvent.h" +# include "../../../src/Globals/Settings.h" +# include "../../../src/Globals/WiFi_AP_Candidates.h" -# include "../ESPEasyCore/ESPEasyWiFiEvent_ESP8266.h" +# include "../wifi/ESPEasyWiFiEvent_ESP8266.h" +# include "../wifi/ESPEasyWifi_ProcessEvent.h" +# include "../wifi/ESPEasyWifi.h" namespace ESPEasy { namespace net { diff --git a/src/src/DataTypes/WiFiConnectionProtocol.cpp b/src/ESPEasy/net/wifi/WiFiConnectionProtocol.cpp similarity index 93% rename from src/src/DataTypes/WiFiConnectionProtocol.cpp rename to src/ESPEasy/net/wifi/WiFiConnectionProtocol.cpp index e406df595..6fad22651 100644 --- a/src/src/DataTypes/WiFiConnectionProtocol.cpp +++ b/src/ESPEasy/net/wifi/WiFiConnectionProtocol.cpp @@ -1,4 +1,9 @@ -#include "../DataTypes/WiFiConnectionProtocol.h" +#include "../wifi/WiFiConnectionProtocol.h" + +namespace ESPEasy { +namespace net { +namespace wifi { + #ifdef ESP8266 @@ -50,3 +55,6 @@ const __FlashStringHelper* toString(WiFiConnectionProtocol proto) { } #endif // ifdef ESP32 +} +} +} \ No newline at end of file diff --git a/src/src/DataTypes/WiFiConnectionProtocol.h b/src/ESPEasy/net/wifi/WiFiConnectionProtocol.h similarity index 80% rename from src/src/DataTypes/WiFiConnectionProtocol.h rename to src/ESPEasy/net/wifi/WiFiConnectionProtocol.h index 9013ffab3..f50639bc8 100644 --- a/src/src/DataTypes/WiFiConnectionProtocol.h +++ b/src/ESPEasy/net/wifi/WiFiConnectionProtocol.h @@ -1,7 +1,11 @@ -#ifndef DATATYPES_WIFICONNECTIONPROTOCOL_H -#define DATATYPES_WIFICONNECTIONPROTOCOL_H +#pragma once + +#include "../../../ESPEasy_common.h" + +namespace ESPEasy { +namespace net { +namespace wifi { -#include "../../ESPEasy_common.h" #ifdef ESP8266 @@ -38,4 +42,6 @@ enum class WiFiConnectionProtocol { const __FlashStringHelper* toString(WiFiConnectionProtocol proto); -#endif // ifndef DATATYPES_WIFICONNECTIONPROTOCOL_H +} +} +} \ No newline at end of file diff --git a/src/src/DataTypes/WiFiDisconnectReason.h b/src/ESPEasy/net/wifi/WiFiDisconnectReason.h similarity index 84% rename from src/src/DataTypes/WiFiDisconnectReason.h rename to src/ESPEasy/net/wifi/WiFiDisconnectReason.h index 76ef13f64..dee47d019 100644 --- a/src/src/DataTypes/WiFiDisconnectReason.h +++ b/src/ESPEasy/net/wifi/WiFiDisconnectReason.h @@ -1,5 +1,16 @@ -#ifndef DATATYPES_WIFIDISCONNECTREASON_H -#define DATATYPES_WIFIDISCONNECTREASON_H +#pragma once + + +// The WiFi Disconnect Reason is not part of the ESPEasy::net::wifi namespace +// ESP8266 does have it defined as a type, but ESP32 doesn't. +// So to not further complicate every call where this is used, it is left +// out of this namespace + +/* +namespace ESPEasy { +namespace net { +namespace wifi { +*/ #ifdef ESP32 enum WiFiDisconnectReason @@ -35,5 +46,8 @@ enum WiFiDisconnectReason WIFI_DISCONNECT_REASON_HANDSHAKE_TIMEOUT = 204 }; #endif - -#endif \ No newline at end of file +/* +} +} +} +*/ \ No newline at end of file diff --git a/src/src/DataTypes/WiFi_STA_connected_state.h b/src/ESPEasy/net/wifi/WiFi_STA_connected_state.h similarity index 82% rename from src/src/DataTypes/WiFi_STA_connected_state.h rename to src/ESPEasy/net/wifi/WiFi_STA_connected_state.h index 5f41e6648..e8cabecce 100644 --- a/src/src/DataTypes/WiFi_STA_connected_state.h +++ b/src/ESPEasy/net/wifi/WiFi_STA_connected_state.h @@ -1,6 +1,6 @@ #pragma once -#include "../../ESPEasy_common.h" +#include "../../../ESPEasy_common.h" #if FEATURE_WIFI diff --git a/src/src/DataTypes/WiFi_State.cpp b/src/ESPEasy/net/wifi/WiFi_State.cpp similarity index 93% rename from src/src/DataTypes/WiFi_State.cpp rename to src/ESPEasy/net/wifi/WiFi_State.cpp index b583582ec..48e0be27f 100644 --- a/src/src/DataTypes/WiFi_State.cpp +++ b/src/ESPEasy/net/wifi/WiFi_State.cpp @@ -1,4 +1,4 @@ -#include "../DataTypes/WiFi_State.h" +#include "../wifi/WiFi_State.h" #if FEATURE_WIFI diff --git a/src/src/DataTypes/WiFi_State.h b/src/ESPEasy/net/wifi/WiFi_State.h similarity index 93% rename from src/src/DataTypes/WiFi_State.h rename to src/ESPEasy/net/wifi/WiFi_State.h index dade05ef6..8e38961b3 100644 --- a/src/src/DataTypes/WiFi_State.h +++ b/src/ESPEasy/net/wifi/WiFi_State.h @@ -1,6 +1,6 @@ #pragma once -#include "../../ESPEasy_common.h" +#include "../../../ESPEasy_common.h" #if FEATURE_WIFI diff --git a/src/_P075_Nextion.ino b/src/_P075_Nextion.ino index 62bdb6ef8..c5399cf85 100644 --- a/src/_P075_Nextion.ino +++ b/src/_P075_Nextion.ino @@ -3,7 +3,7 @@ # include "src/PluginStructs/P075_data_struct.h" -# include "src/ESPEasyCore/ESPEasyWifi.h" +# include "ESPEasy/net/wifi/ESPEasyWifi.h" // ####################################################################################################### // ####################################################################################################### diff --git a/src/src/Commands/Common.cpp b/src/src/Commands/Common.cpp index 0eb96ac9f..5abe2326d 100644 --- a/src/src/Commands/Common.cpp +++ b/src/src/Commands/Common.cpp @@ -5,8 +5,7 @@ #include "../../ESPEasy_common.h" - -#include "../ESPEasyCore/ESPEasyWifi.h" +#include "../../ESPEasy/net/wifi/ESPEasyWifi.h" #include "../ESPEasyCore/Serial.h" #include "../Helpers/Networking.h" diff --git a/src/src/Commands/WiFi.cpp b/src/src/Commands/WiFi.cpp index 3552f6c3b..7887ca15a 100644 --- a/src/src/Commands/WiFi.cpp +++ b/src/src/Commands/WiFi.cpp @@ -8,8 +8,6 @@ #include "../DataStructs/ESPEasy_EventStruct.h" -#include "../ESPEasyCore/ESPEasyWifi.h" -#include "../ESPEasyCore/ESPEasyWifi_abstracted.h" #include "../ESPEasyCore/Serial.h" #include "../Globals/ESPEasyWiFiEvent.h" @@ -20,6 +18,9 @@ #include "../Helpers/ESPEasy_Storage.h" #include "../Helpers/StringConverter.h" +#include "../../ESPEasy/net/wifi/ESPEasyWifi.h" +#include "../../ESPEasy/net/wifi/ESPEasyWifi_abstracted.h" + #define WIFI_MODE_MAX (WiFiMode_t)4 diff --git a/src/src/DataStructs/ESPEasy_EventStruct.h b/src/src/DataStructs/ESPEasy_EventStruct.h index 4e03a820f..67de080f1 100644 --- a/src/src/DataStructs/ESPEasy_EventStruct.h +++ b/src/src/DataStructs/ESPEasy_EventStruct.h @@ -7,7 +7,7 @@ #include "../DataTypes/EventValueSource.h" #include "../DataTypes/TaskIndex.h" #include "../DataTypes/NotifierIndex.h" -#include "../DataTypes/NetworkIndex.h" +#include "../ESPEasy/net/DataTypes/NetworkIndex.h" #include "../DataStructs/DeviceStruct.h" #ifdef ESP32 diff --git a/src/src/DataStructs/NodesHandler.cpp b/src/src/DataStructs/NodesHandler.cpp index d2e997db6..b0f76b1bf 100644 --- a/src/src/DataStructs/NodesHandler.cpp +++ b/src/src/DataStructs/NodesHandler.cpp @@ -20,7 +20,7 @@ #include "../ESPEasyCore/ESPEasy_Log.h" #include "../ESPEasyCore/ESPEasyNetwork.h" -#include "../ESPEasyCore/ESPEasyWifi.h" + #include "../Globals/ESPEasy_time.h" #include "../Globals/ESPEasyWiFiEvent.h" #include "../Globals/MQTT.h" @@ -33,6 +33,9 @@ #include "../Helpers/StringConverter.h" #include "../Helpers/StringGenerator_System.h" +#include "../../ESPEasy/net/wifi/ESPEasyWifi.h" + + #define ESPEASY_NOW_ALLOWED_AGE_NO_TRACEROUTE 35000 bool NodesHandler::addNode(const NodeStruct& node) diff --git a/src/src/DataStructs/SettingsStruct.h b/src/src/DataStructs/SettingsStruct.h index 3dd10b187..c6d12bf2c 100644 --- a/src/src/DataStructs/SettingsStruct.h +++ b/src/src/DataStructs/SettingsStruct.h @@ -10,14 +10,14 @@ #include "../DataTypes/ControllerIndex.h" #include "../DataTypes/EthernetParameters.h" #include "../DataTypes/NetworkMedium.h" -#include "../DataTypes/NWPluginID.h" -#include "../DataTypes/NetworkIndex.h" +#include "../ESPEasy/net/DataTypes/NWPluginID.h" +#include "../ESPEasy/net/DataTypes/NetworkIndex.h" #include "../DataTypes/NPluginID.h" #include "../DataTypes/PluginID.h" //#include "../DataTypes/TaskEnabledState.h" #include "../DataTypes/TimeSource.h" #include "../Globals/Plugins.h" -#include "../Globals/NWPlugins.h" +#include "../ESPEasy/net/Globals/NWPlugins.h" #ifdef ESP32 #include diff --git a/src/src/DataStructs/TimingStats.h b/src/src/DataStructs/TimingStats.h index ab3894181..3ff6101e7 100644 --- a/src/src/DataStructs/TimingStats.h +++ b/src/src/DataStructs/TimingStats.h @@ -7,7 +7,7 @@ # include "../DataTypes/DeviceIndex.h" # include "../DataTypes/ESPEasy_plugin_functions.h" -# include "../DataTypes/NetworkDriverIndex.h" +# include "../../ESPEasy/net/DataTypes/NetworkDriverIndex.h" # include "../DataTypes/ProtocolIndex.h" # include "../Globals/Settings.h" # include "../Helpers/ESPEasy_time_calc.h" diff --git a/src/src/DataStructs/WiFiEventData.h b/src/src/DataStructs/WiFiEventData.h index d44c371fc..389137390 100644 --- a/src/src/DataStructs/WiFiEventData.h +++ b/src/src/DataStructs/WiFiEventData.h @@ -2,7 +2,7 @@ #define DATASTRUCTS_WIFIEVENTDATA_H #include "../DataStructs/MAC_address.h" -#include "../DataTypes/WiFiDisconnectReason.h" +#include "../../ESPEasy/net/wifi/WiFiDisconnectReason.h" #include "../Helpers/LongTermTimer.h" @@ -98,7 +98,6 @@ struct WiFiEventData_t { bool eventError = false; - WiFiDisconnectReason lastDisconnectReason = WIFI_DISCONNECT_REASON_UNSPECIFIED; LongTermTimer lastScanMoment; LongTermTimer lastConnectMoment; diff --git a/src/src/DataStructs_templ/SettingsStruct.cpp b/src/src/DataStructs_templ/SettingsStruct.cpp index 57f52424b..38733cef0 100644 --- a/src/src/DataStructs_templ/SettingsStruct.cpp +++ b/src/src/DataStructs_templ/SettingsStruct.cpp @@ -9,17 +9,17 @@ #include "../CustomBuild/CompiletimeDefines.h" #include "../CustomBuild/ESPEasyLimits.h" #include "../DataStructs/DeviceStruct.h" -#include "../DataStructs/NetworkDriverStruct.h" +#include "../ESPEasy/net/DataStructs/NetworkDriverStruct.h" #include "../DataTypes/NPluginID.h" -#include "../DataTypes/NWPluginID.h" -#include "../DataTypes/NWPluginID.h" +#include "../ESPEasy/net/DataTypes/NWPluginID.h" +#include "../ESPEasy/net/DataTypes/NWPluginID.h" #include "../DataTypes/PluginID.h" #include "../DataTypes/SPI_options.h" #include "../Globals/CPlugins.h" #include "../Globals/Plugins.h" #include "../Helpers/Misc.h" #include "../Helpers/StringParser.h" -#include "../Helpers/_NWPlugin_init.h" +#include "../ESPEasy/net/Helpers/_NWPlugin_init.h" #if FEATURE_I2C_MULTIPLE #include "../Helpers/Hardware_device_info.h" diff --git a/src/src/DataTypes/NetworkIndex.h b/src/src/DataTypes/NetworkIndex.h deleted file mode 100644 index eae415213..000000000 --- a/src/src/DataTypes/NetworkIndex.h +++ /dev/null @@ -1,17 +0,0 @@ -#ifndef DATATYPES_NETWORKINDEX_H -#define DATATYPES_NETWORKINDEX_H - -#include "../../ESPEasy_common.h" - -namespace ESPEasy { -namespace net { - -typedef uint8_t networkIndex_t; - -extern networkIndex_t INVALID_NETWORK_INDEX; - -} // namespace net -} // namespace ESPEasy - - -#endif \ No newline at end of file diff --git a/src/src/ESPEasyCore/ESPEasyEth.cpp b/src/src/ESPEasyCore/ESPEasyEth.cpp index 803a88a85..cb279a155 100644 --- a/src/src/ESPEasyCore/ESPEasyEth.cpp +++ b/src/src/ESPEasyCore/ESPEasyEth.cpp @@ -4,7 +4,7 @@ #include "../CustomBuild/ESPEasyLimits.h" #include "../ESPEasyCore/ESPEasyNetwork.h" -#include "../ESPEasyCore/ESPEasyWifi.h" +#include "../../ESPEasy/net/wifi/ESPEasyWifi.h" #include "../ESPEasyCore/ESPEasy_Log.h" #include "../ESPEasyCore/ESPEasyGPIO.h" #include "../ESPEasyCore/ESPEasyEthEvent.h" diff --git a/src/src/ESPEasyCore/ESPEasyEth_ProcessEvent.cpp b/src/src/ESPEasyCore/ESPEasyEth_ProcessEvent.cpp index 50e35132c..a6f05f8d3 100644 --- a/src/src/ESPEasyCore/ESPEasyEth_ProcessEvent.cpp +++ b/src/src/ESPEasyCore/ESPEasyEth_ProcessEvent.cpp @@ -6,7 +6,7 @@ # include "../ESPEasyCore/ESPEasyEth.h" # include "../ESPEasyCore/ESPEasyNetwork.h" -# include "../ESPEasyCore/ESPEasyWifi.h" // LogConnectionStatus +#include "../../ESPEasy/net/wifi/ESPEasyWifi.h" // LogConnectionStatus # include "../Globals/ESPEasyEthEvent.h" # include "../Globals/ESPEasyWiFiEvent.h" diff --git a/src/src/ESPEasyCore/ESPEasyNetwork.cpp b/src/src/ESPEasyCore/ESPEasyNetwork.cpp index b2c697b0c..1fe92a59a 100644 --- a/src/src/ESPEasyCore/ESPEasyNetwork.cpp +++ b/src/src/ESPEasyCore/ESPEasyNetwork.cpp @@ -1,7 +1,6 @@ #include "../ESPEasyCore/ESPEasyNetwork.h" - -#include "../ESPEasyCore/ESPEasyWifi_abstracted.h" +#include "../../ESPEasy/net/wifi/ESPEasyWifi_abstracted.h" #include "../Globals/NetworkState.h" #include "../Globals/Settings.h" diff --git a/src/src/ESPEasyCore/ESPEasyNetwork_ESP32.cpp b/src/src/ESPEasyCore/ESPEasyNetwork_ESP32.cpp index 3829dd659..c999f103c 100644 --- a/src/src/ESPEasyCore/ESPEasyNetwork_ESP32.cpp +++ b/src/src/ESPEasyCore/ESPEasyNetwork_ESP32.cpp @@ -4,8 +4,8 @@ #include "../ESPEasyCore/ESPEasy_Log.h" #include "../ESPEasyCore/ESPEasyEth.h" -#include "../ESPEasyCore/ESPEasyWifi.h" -#include "../ESPEasyCore/ESPEasyWifi_abstracted.h" +#include "../../ESPEasy/net/wifi/ESPEasyWifi.h" +#include "../../ESPEasy/net/wifi/ESPEasyWifi_abstracted.h" #include "../Globals/ESPEasy_time.h" #include "../Globals/ESPEasyWiFiEvent.h" #include "../Globals/NetworkState.h" diff --git a/src/src/ESPEasyCore/ESPEasyNetwork_ESP8266.cpp b/src/src/ESPEasyCore/ESPEasyNetwork_ESP8266.cpp index d6d89e306..e416ed85a 100644 --- a/src/src/ESPEasyCore/ESPEasyNetwork_ESP8266.cpp +++ b/src/src/ESPEasyCore/ESPEasyNetwork_ESP8266.cpp @@ -4,8 +4,8 @@ #include "../ESPEasyCore/ESPEasy_Log.h" #include "../ESPEasyCore/ESPEasyEth.h" -#include "../ESPEasyCore/ESPEasyWifi.h" -#include "../ESPEasyCore/ESPEasyWifi_abstracted.h" +#include "../../ESPEasy/net/wifi/ESPEasyWifi.h" +#include "../../ESPEasy/net/wifi/ESPEasyWifi_abstracted.h" #include "../Globals/ESPEasy_time.h" #include "../Globals/ESPEasyWiFiEvent.h" #include "../Globals/NetworkState.h" diff --git a/src/src/ESPEasyCore/ESPEasy_loop.cpp b/src/src/ESPEasyCore/ESPEasy_loop.cpp index de55edd41..b395aa165 100644 --- a/src/src/ESPEasyCore/ESPEasy_loop.cpp +++ b/src/src/ESPEasyCore/ESPEasy_loop.cpp @@ -5,8 +5,8 @@ #include "../Commands/ExecuteCommand.h" #include "../DataStructs/TimingStats.h" #include "../ESPEasyCore/ESPEasyNetwork.h" -#include "../ESPEasyCore/ESPEasyWifi.h" -#include "../ESPEasyCore/ESPEasyWifi_ProcessEvent.h" +#include "../../ESPEasy/net/wifi/ESPEasyWifi.h" +#include "../../ESPEasy/net/wifi/ESPEasyWifi_ProcessEvent.h" #include "../ESPEasyCore/ESPEasy_backgroundtasks.h" #include "../ESPEasyCore/ESPEasy_Log.h" #include "../Globals/ESPEasy_Scheduler.h" diff --git a/src/src/ESPEasyCore/ESPEasy_setup.cpp b/src/src/ESPEasyCore/ESPEasy_setup.cpp index 2b8bce205..294c55ffc 100644 --- a/src/src/ESPEasyCore/ESPEasy_setup.cpp +++ b/src/src/ESPEasyCore/ESPEasy_setup.cpp @@ -9,9 +9,9 @@ #include "../ESPEasyCore/ESPEasyGPIO.h" #include "../ESPEasyCore/ESPEasyNetwork.h" #include "../ESPEasyCore/ESPEasyRules.h" -#include "../ESPEasyCore/ESPEasyWifi.h" -#include "../ESPEasyCore/ESPEasyWifi_abstracted.h" -#include "../ESPEasyCore/ESPEasyWifi_ProcessEvent.h" +#include "../../ESPEasy/net/wifi/ESPEasyWifi.h" +#include "../../ESPEasy/net/wifi/ESPEasyWifi_abstracted.h" +#include "../../ESPEasy/net/wifi/ESPEasyWifi_ProcessEvent.h" #include "../ESPEasyCore/Serial.h" #include "../Globals/Cache.h" #include "../Globals/ESPEasy_Console.h" @@ -22,7 +22,7 @@ #include "../Globals/Statistics.h" #include "../Globals/WiFi_AP_Candidates.h" #include "../Helpers/_CPlugin_init.h" -#include "../Helpers/_NWPlugin_init.h" +#include "../../ESPEasy/net/Helpers/_NWPlugin_init.h" #include "../Helpers/_NPlugin_init.h" #include "../Helpers/_Plugin_init.h" #include "../Helpers/DeepSleep.h" diff --git a/src/src/Globals/ESPEasyWiFi.h b/src/src/Globals/ESPEasyWiFi.h index c5a156839..1c6efa55d 100644 --- a/src/src/Globals/ESPEasyWiFi.h +++ b/src/src/Globals/ESPEasyWiFi.h @@ -1,8 +1,7 @@ #ifndef GLOBALS_ESPEASYWIFI_H #define GLOBALS_ESPEASYWIFI_H -#include "../ESPEasyCore/ESPEasyWifi.h" - +#include "../../ESPEasy/net/wifi/ESPEasyWifi.h" #include "../../ESPEasy_common.h" diff --git a/src/src/Globals/ESPEasyWiFiEvent.h b/src/src/Globals/ESPEasyWiFiEvent.h index d01d3e49a..626f346bf 100644 --- a/src/src/Globals/ESPEasyWiFiEvent.h +++ b/src/src/Globals/ESPEasyWiFiEvent.h @@ -4,7 +4,7 @@ #include "../../ESPEasy_common.h" -#include "../ESPEasyCore/ESPEasyWiFi_state_machine.h" +#include "../../ESPEasy/net/wifi/ESPEasyWiFi_state_machine.h" #include "../DataStructs/WiFiEventData.h" diff --git a/src/src/Helpers/DeepSleep.cpp b/src/src/Helpers/DeepSleep.cpp index f9248937e..44ad9c31b 100644 --- a/src/src/Helpers/DeepSleep.cpp +++ b/src/src/Helpers/DeepSleep.cpp @@ -6,7 +6,7 @@ #include "../ESPEasyCore/ESPEasy_Log.h" #include "../ESPEasyCore/ESPEasyEth.h" #include "../ESPEasyCore/ESPEasyNetwork.h" -#include "../ESPEasyCore/ESPEasyWifi.h" +#include "../../ESPEasy/net/wifi/ESPEasyWifi.h" #include "../ESPEasyCore/ESPEasyRules.h" #include "../Globals/EventQueue.h" diff --git a/src/src/Helpers/ESPEasy_FactoryDefault.cpp b/src/src/Helpers/ESPEasy_FactoryDefault.cpp index 77a98564d..21a5b3463 100644 --- a/src/src/Helpers/ESPEasy_FactoryDefault.cpp +++ b/src/src/Helpers/ESPEasy_FactoryDefault.cpp @@ -11,7 +11,7 @@ #include "../DataStructs/GpioFactorySettingsStruct.h" #include "../ESPEasyCore/ESPEasy_backgroundtasks.h" -#include "../ESPEasyCore/ESPEasyWifi.h" +#include "../../ESPEasy/net/wifi/ESPEasyWifi.h" #include "../ESPEasyCore/Serial.h" #include "../Globals/ESPEasyWiFiEvent.h" diff --git a/src/src/Helpers/ESPEasy_Storage.cpp b/src/src/Helpers/ESPEasy_Storage.cpp index 6977961ab..8abee085d 100644 --- a/src/src/Helpers/ESPEasy_Storage.cpp +++ b/src/src/Helpers/ESPEasy_Storage.cpp @@ -16,8 +16,8 @@ #endif // if FEATURE_MQTT #include "../ESPEasyCore/ESPEasy_Log.h" #include "../ESPEasyCore/ESPEasyNetwork.h" -#include "../ESPEasyCore/ESPEasyWifi.h" -#include "../ESPEasyCore/ESPEasyWifi_abstracted.h" +#include "../../ESPEasy/net/wifi/ESPEasyWifi.h" +#include "../../ESPEasy/net/wifi/ESPEasyWifi_abstracted.h" #include "../ESPEasyCore/Serial.h" #include "../Globals/CRCValues.h" diff --git a/src/src/Helpers/Network.cpp b/src/src/Helpers/Network.cpp index 1ab4aa011..2a5d08e71 100644 --- a/src/src/Helpers/Network.cpp +++ b/src/src/Helpers/Network.cpp @@ -2,8 +2,8 @@ #include "../../ESPEasy_common.h" -#include "../ESPEasyCore/ESPEasyWifi.h" -#include "../ESPEasyCore/ESPEasyWifi_abstracted.h" +#include "../../ESPEasy/net/wifi/ESPEasyWifi.h" +#include "../../ESPEasy/net/wifi/ESPEasyWifi_abstracted.h" #include "../ESPEasyCore/ESPEasyNetwork.h" #include "../Globals/Settings.h" diff --git a/src/src/Helpers/Networking.cpp b/src/src/Helpers/Networking.cpp index 4335fa99b..c89446e9f 100644 --- a/src/src/Helpers/Networking.cpp +++ b/src/src/Helpers/Networking.cpp @@ -9,7 +9,7 @@ #include "../ESPEasyCore/ESPEasy_backgroundtasks.h" #include "../ESPEasyCore/ESPEasyEth.h" #include "../ESPEasyCore/ESPEasyNetwork.h" -#include "../ESPEasyCore/ESPEasyWifi.h" +#include "../../ESPEasy/net/wifi/ESPEasyWifi.h" #include "../ESPEasyCore/Serial.h" #include "../Globals/ESPEasyEthEvent.h" #include "../Globals/ESPEasyWiFiEvent.h" diff --git a/src/src/Helpers/PeriodicalActions.cpp b/src/src/Helpers/PeriodicalActions.cpp index 57f25a474..7a2742d23 100644 --- a/src/src/Helpers/PeriodicalActions.cpp +++ b/src/src/Helpers/PeriodicalActions.cpp @@ -11,8 +11,8 @@ #include "../ESPEasyCore/ESPEasyGPIO.h" #include "../ESPEasyCore/ESPEasy_Log.h" #include "../ESPEasyCore/ESPEasyNetwork.h" -#include "../ESPEasyCore/ESPEasyWifi.h" -#include "../ESPEasyCore/ESPEasyWifi_abstracted.h" +#include "../../ESPEasy/net/wifi/ESPEasyWifi.h" +#include "../../ESPEasy/net/wifi/ESPEasyWifi_abstracted.h" #include "../ESPEasyCore/ESPEasyRules.h" #include "../ESPEasyCore/Serial.h" #include "../Globals/ESPEasyWiFiEvent.h" diff --git a/src/src/Helpers/Scheduler_SystemEventTimer.cpp b/src/src/Helpers/Scheduler_SystemEventTimer.cpp index 8da3b59b7..17238008e 100644 --- a/src/src/Helpers/Scheduler_SystemEventTimer.cpp +++ b/src/src/Helpers/Scheduler_SystemEventTimer.cpp @@ -10,7 +10,7 @@ #include "../Helpers/_Plugin_init.h" #include "../Helpers/_CPlugin_init.h" -#include "../Helpers/_NWPlugin_init.h" +#include "../../ESPEasy/net/Helpers/_NWPlugin_init.h" #include "../Helpers/ESPEasyRTC.h" #include "../Helpers/ESPEasy_Storage.h" #include "../Helpers/StringConverter.h" diff --git a/src/src/Helpers/StringProvider.cpp b/src/src/Helpers/StringProvider.cpp index 487d272e8..1eb0b269a 100644 --- a/src/src/Helpers/StringProvider.cpp +++ b/src/src/Helpers/StringProvider.cpp @@ -9,8 +9,8 @@ #include "../CustomBuild/CompiletimeDefines.h" #include "../ESPEasyCore/ESPEasyNetwork.h" -#include "../ESPEasyCore/ESPEasyWifi.h" -#include "../ESPEasyCore/ESPEasyWifi_abstracted.h" +#include "../../ESPEasy/net/wifi/ESPEasyWifi.h" +#include "../../ESPEasy/net/wifi/ESPEasyWifi_abstracted.h" #if FEATURE_ETHERNET #include "../ESPEasyCore/ESPEasyEth.h" #endif diff --git a/src/src/Helpers/_CPlugin_DomoticzHelper.cpp b/src/src/Helpers/_CPlugin_DomoticzHelper.cpp index 3413f6506..b18b4e2ce 100644 --- a/src/src/Helpers/_CPlugin_DomoticzHelper.cpp +++ b/src/src/Helpers/_CPlugin_DomoticzHelper.cpp @@ -6,7 +6,7 @@ # include "../DataTypes/TaskIndex.h" # include "../ESPEasyCore/ESPEasy_Log.h" -# include "../ESPEasyCore/ESPEasyWifi.h" +#include "../../ESPEasy/net/wifi/ESPEasyWifi.h" # include "../Globals/Cache.h" diff --git a/src/src/Helpers/_CPlugin_Helper.cpp b/src/src/Helpers/_CPlugin_Helper.cpp index 347ff2e57..e48e4d126 100644 --- a/src/src/Helpers/_CPlugin_Helper.cpp +++ b/src/src/Helpers/_CPlugin_Helper.cpp @@ -15,7 +15,7 @@ #include "../ESPEasyCore/ESPEasy_Log.h" #include "../ESPEasyCore/ESPEasyEth.h" #include "../ESPEasyCore/ESPEasyNetwork.h" -#include "../ESPEasyCore/ESPEasyWifi.h" +#include "../../ESPEasy/net/wifi/ESPEasyWifi.h" #include "../Globals/Settings.h" #include "../Globals/SecuritySettings.h" diff --git a/src/src/WebServer/AccessControl.cpp b/src/src/WebServer/AccessControl.cpp index 3d476feb4..a6d8fc501 100644 --- a/src/src/WebServer/AccessControl.cpp +++ b/src/src/WebServer/AccessControl.cpp @@ -4,8 +4,8 @@ #include "../ESPEasyCore/ESPEasy_Log.h" #include "../ESPEasyCore/ESPEasyNetwork.h" -#include "../ESPEasyCore/ESPEasyWifi.h" -#include "../ESPEasyCore/ESPEasyWifi_abstracted.h" +#include "../../ESPEasy/net/wifi/ESPEasyWifi.h" +#include "../../ESPEasy/net/wifi/ESPEasyWifi_abstracted.h" #include "../Globals/SecuritySettings.h" #include "../Globals/Services.h" diff --git a/src/src/WebServer/AdvancedConfigPage.cpp b/src/src/WebServer/AdvancedConfigPage.cpp index de2e819ae..ec1d23527 100644 --- a/src/src/WebServer/AdvancedConfigPage.cpp +++ b/src/src/WebServer/AdvancedConfigPage.cpp @@ -8,8 +8,8 @@ #include "../WebServer/Markup_Forms.h" #include "../WebServer/ESPEasy_WebServer.h" -#include "../ESPEasyCore/ESPEasyWifi.h" -#include "../ESPEasyCore/ESPEasyWifi_abstracted.h" +#include "../../ESPEasy/net/wifi/ESPEasyWifi.h" +#include "../../ESPEasy/net/wifi/ESPEasyWifi_abstracted.h" #include "../Globals/ESPEasy_time.h" #include "../Globals/Settings.h" diff --git a/src/src/WebServer/DownloadPage.cpp b/src/src/WebServer/DownloadPage.cpp index 723e6c32c..1455d0480 100644 --- a/src/src/WebServer/DownloadPage.cpp +++ b/src/src/WebServer/DownloadPage.cpp @@ -87,13 +87,13 @@ void handle_config_download(bool fullBackup, fs::Dir dir = ESPEASY_FS.openDir(""); while (dir.next()) { - fs::File f = dir.openFile("r"); + fs::File file = dir.openFile("r"); - if (f) { + if (file) { if (!noCreds || (noCreds && (0 != strncasecmp(file.name(), security_dat.c_str(), security_dat.length())))) { - tarStream->addFile(f.name(), f.size()); + tarStream->addFile(file.name(), file.size()); } - f.close(); + file.close(); } } # endif // if defined(ESP8266) diff --git a/src/src/WebServer/ESPEasy_WebServer.cpp b/src/src/WebServer/ESPEasy_WebServer.cpp index 23abb982b..a76a5a343 100644 --- a/src/src/WebServer/ESPEasy_WebServer.cpp +++ b/src/src/WebServer/ESPEasy_WebServer.cpp @@ -53,8 +53,8 @@ #include "../ESPEasyCore/ESPEasyNetwork.h" #include "../ESPEasyCore/ESPEasyRules.h" -#include "../ESPEasyCore/ESPEasyWifi.h" -#include "../ESPEasyCore/ESPEasyWifi_abstracted.h" +#include "../../ESPEasy/net/wifi/ESPEasyWifi.h" +#include "../../ESPEasy/net/wifi/ESPEasyWifi_abstracted.h" #include "../Globals/CPlugins.h" #include "../Globals/Device.h" diff --git a/src/src/WebServer/Markup.h b/src/src/WebServer/Markup.h index a040af2c9..b02784605 100644 --- a/src/src/WebServer/Markup.h +++ b/src/src/WebServer/Markup.h @@ -4,7 +4,7 @@ #include "../WebServer/common.h" #include "../DataTypes/ProtocolIndex.h" #include "../DataTypes/CPluginID.h" -#include "../DataTypes/NWPluginID.h" +#include "../ESPEasy/net/DataTypes/NWPluginID.h" #include "../DataTypes/PluginID.h" #include "../Globals/Plugins.h" #include "../Helpers/StringGenerator_GPIO.h" diff --git a/src/src/WebServer/Metrics.cpp b/src/src/WebServer/Metrics.cpp index 7fd4526b2..969987979 100644 --- a/src/src/WebServer/Metrics.cpp +++ b/src/src/WebServer/Metrics.cpp @@ -3,7 +3,7 @@ #include "../../ESPEasy-Globals.h" #include "../Commands/Diagnostic.h" #include "../ESPEasyCore/ESPEasyNetwork.h" -#include "../ESPEasyCore/ESPEasyWifi.h" +#include "../../ESPEasy/net/wifi/ESPEasyWifi.h" #include "../../_Plugin_Helper.h" #include "../Helpers/ESPEasyStatistics.h" #include "../Static/WebStaticData.h" diff --git a/src/src/WebServer/NetworkPage.cpp b/src/src/WebServer/NetworkPage.cpp index 1c9d19170..8c1ce6b6a 100644 --- a/src/src/WebServer/NetworkPage.cpp +++ b/src/src/WebServer/NetworkPage.cpp @@ -2,23 +2,21 @@ #ifdef WEBSERVER_NETWORK + +# include "../DataStructs/ESPEasy_EventStruct.h" +# include "../Globals/Settings.h" +# include "../Helpers/ESPEasy_Storage.h" +# include "../Helpers/ESPEasy_Storage.h" +# include "../Helpers/PrintToString.h" +# include "../Helpers/StringConverter.h" # include "../WebServer/ESPEasy_WebServer.h" # include "../WebServer/HTML_wrappers.h" # include "../WebServer/Markup.h" # include "../WebServer/Markup_Buttons.h" # include "../WebServer/Markup_Forms.h" -# include "../Helpers/_NWPlugin_Helper_webform.h" - -# include "../DataStructs/ESPEasy_EventStruct.h" -# include "../Globals/NWPlugins.h" -# include "../Globals/Settings.h" - -# include "../Helpers/_NWPlugin_init.h" -# include "../Helpers/ESPEasy_Storage.h" -# include "../Helpers/StringConverter.h" -# include "../Helpers/ESPEasy_Storage.h" - -# include "../Helpers/PrintToString.h" +# include "../../ESPEasy/net/Globals/NWPlugins.h" +# include "../../ESPEasy/net/Helpers/_NWPlugin_Helper_webform.h" +# include "../../ESPEasy/net/Helpers/_NWPlugin_init.h" using namespace ESPEasy::net; diff --git a/src/src/WebServer/NetworkPage.h b/src/src/WebServer/NetworkPage.h index 6764ae3a0..fd1533c40 100644 --- a/src/src/WebServer/NetworkPage.h +++ b/src/src/WebServer/NetworkPage.h @@ -5,8 +5,8 @@ #ifdef WEBSERVER_NETWORK -# include "../DataTypes/NetworkIndex.h" -# include "../DataStructs/NetworkSettingsStruct.h" +#include "../../ESPEasy/net/DataTypes/NetworkIndex.h" +#include "../../ESPEasy/net/DataStructs/NetworkSettingsStruct.h" // ******************************************************************************** diff --git a/src/src/WebServer/SetupPage.cpp b/src/src/WebServer/SetupPage.cpp index 4a143d68f..44a42a247 100644 --- a/src/src/WebServer/SetupPage.cpp +++ b/src/src/WebServer/SetupPage.cpp @@ -12,8 +12,8 @@ # include "../WebServer/SysInfoPage.h" # include "../ESPEasyCore/ESPEasyNetwork.h" -# include "../ESPEasyCore/ESPEasyWifi.h" -#include "../ESPEasyCore/ESPEasyWifi_abstracted.h" +# include "../../ESPEasy/net/wifi/ESPEasyWifi.h" +#include "../../ESPEasy/net/wifi/ESPEasyWifi_abstracted.h" # include "../Globals/ESPEasyWiFiEvent.h" # include "../Globals/NetworkState.h" diff --git a/src/src/WebServer/SysInfoPage.cpp b/src/src/WebServer/SysInfoPage.cpp index aba0535c1..2f4131244 100644 --- a/src/src/WebServer/SysInfoPage.cpp +++ b/src/src/WebServer/SysInfoPage.cpp @@ -19,7 +19,8 @@ # include "../ESPEasyCore/ESPEasyEth.h" # include "../ESPEasyCore/ESPEasyNetwork.h" -# include "../ESPEasyCore/ESPEasyWifi.h" +# include "../../ESPEasy/net/wifi/ESPEasyWifi.h" + # include "../Globals/CRCValues.h" # include "../Globals/ESPEasy_time.h" diff --git a/src/src/WebServer/WiFiScanner.cpp b/src/src/WebServer/WiFiScanner.cpp index 5ee884590..96c2c0027 100644 --- a/src/src/WebServer/WiFiScanner.cpp +++ b/src/src/WebServer/WiFiScanner.cpp @@ -4,8 +4,8 @@ #include "../WebServer/AccessControl.h" #include "../WebServer/HTML_wrappers.h" -#include "../ESPEasyCore/ESPEasyWifi.h" -#include "../ESPEasyCore/ESPEasyWifi_abstracted.h" +#include "../../ESPEasy/net/wifi/ESPEasyWifi.h" +#include "../../ESPEasy/net/wifi/ESPEasyWifi_abstracted.h" #include "../Globals/WiFi_AP_Candidates.h" #include "../Helpers/StringGenerator_WiFi.h" From f9f14a8a08717d6cc6b25a00a952e79fe7820a8a Mon Sep 17 00:00:00 2001 From: TD-er Date: Sat, 26 Jul 2025 18:58:59 +0200 Subject: [PATCH 146/564] [Network] Move global runtime data to new ESPEasy::net namespace --- .../net}/DataStructs/EthernetEventData.cpp | 6 +++--- .../net}/DataStructs/EthernetEventData.h | 8 +++----- .../net}/DataStructs/WiFiEventData.cpp | 14 +++++++------- .../net}/DataStructs/WiFiEventData.h | 10 ++++------ .../net}/Globals/ESPEasyEthEvent.cpp | 2 +- src/{src => ESPEasy/net}/Globals/ESPEasyEthEvent.h | 6 ++---- src/{src => ESPEasy/net}/Globals/ESPEasyWiFi.cpp | 0 src/ESPEasy/net/Globals/ESPEasyWiFi.h | 11 +++++++++++ .../net}/Globals/ESPEasyWiFiEvent.cpp | 2 +- .../net}/Globals/ESPEasyWiFiEvent.h | 9 +++------ src/{src => ESPEasy/net}/Globals/NetworkState.cpp | 2 +- src/{src => ESPEasy/net}/Globals/NetworkState.h | 11 ++++------- src/ESPEasy/net/wifi/ESPEasyWiFiEvent_ESP32.cpp | 6 +++--- src/ESPEasy/net/wifi/ESPEasyWiFiEvent_ESP8266.cpp | 6 +++--- src/ESPEasy/net/wifi/ESPEasyWiFi_state_machine.cpp | 2 +- src/ESPEasy/net/wifi/ESPEasyWifi.cpp | 4 ++-- src/ESPEasy/net/wifi/ESPEasyWifi_ProcessEvent.cpp | 4 ++-- src/ESPEasy/net/wifi/ESPEasyWifi_abstracted.cpp | 2 +- .../net/wifi/ESPEasyWifi_abstracted_ESP32.cpp | 2 +- .../net/wifi/ESPEasyWifi_abstracted_ESP8266.cpp | 2 +- src/src/Commands/Networks.cpp | 2 +- src/src/Commands/UDP.cpp | 2 +- src/src/Commands/WiFi.cpp | 2 +- src/src/DataStructs/NodesHandler.cpp | 4 ++-- src/src/DataStructs/WiFi_AP_Candidate.cpp | 2 +- src/src/ESPEasyCore/Controller.cpp | 2 +- src/src/ESPEasyCore/ESPEasyEth.cpp | 4 ++-- src/src/ESPEasyCore/ESPEasyEthEvent.cpp | 2 +- src/src/ESPEasyCore/ESPEasyEth_ProcessEvent.cpp | 6 +++--- src/src/ESPEasyCore/ESPEasyNetwork.cpp | 2 +- src/src/ESPEasyCore/ESPEasyNetwork_ESP32.cpp | 6 +++--- src/src/ESPEasyCore/ESPEasyNetwork_ESP8266.cpp | 4 ++-- src/src/ESPEasyCore/ESPEasy_Log.cpp | 2 +- src/src/ESPEasyCore/ESPEasy_backgroundtasks.cpp | 2 +- src/src/ESPEasyCore/ESPEasy_setup.cpp | 4 ++-- src/src/Globals/ESPEasyWiFi.h | 13 ------------- src/src/Globals/Plugins.cpp | 2 +- src/src/Helpers/ESPEasy_FactoryDefault.cpp | 2 +- src/src/Helpers/ESPEasy_Storage.cpp | 4 ++-- src/src/Helpers/ESPEasy_time.cpp | 2 +- src/src/Helpers/Hardware.cpp | 2 +- src/src/Helpers/Hardware_ADC.cpp | 2 +- src/src/Helpers/MDNS_Helper.cpp | 4 ++-- src/src/Helpers/Networking.cpp | 6 +++--- src/src/Helpers/PeriodicalActions.cpp | 6 +++--- src/src/Helpers/StringConverter.cpp | 2 +- src/src/Helpers/StringGenerator_WiFi.cpp | 2 +- src/src/Helpers/StringProvider.cpp | 6 +++--- src/src/Helpers/SystemVariables.cpp | 4 ++-- src/src/Helpers/WiFi_AP_CandidatesList.cpp | 2 +- src/src/Helpers/_CPlugin_Helper.cpp | 2 +- src/src/PluginStructs/P026_data_struct.cpp | 2 +- src/src/PluginStructs/P109_data_struct.h | 3 ++- src/src/PluginStructs/P145_data_struct.cpp | 2 +- src/src/WebServer/404.cpp | 2 +- src/src/WebServer/ESPEasy_WebServer.cpp | 2 +- src/src/WebServer/RootPage.cpp | 4 ++-- src/src/WebServer/SetupPage.cpp | 4 ++-- src/src/WebServer/SysInfoPage.cpp | 4 ++-- 59 files changed, 113 insertions(+), 126 deletions(-) rename src/{src => ESPEasy/net}/DataStructs/EthernetEventData.cpp (97%) rename src/{src => ESPEasy/net}/DataStructs/EthernetEventData.h (90%) rename src/{src => ESPEasy/net}/DataStructs/WiFiEventData.cpp (93%) rename src/{src => ESPEasy/net}/DataStructs/WiFiEventData.h (91%) rename src/{src => ESPEasy/net}/Globals/ESPEasyEthEvent.cpp (73%) rename src/{src => ESPEasy/net}/Globals/ESPEasyEthEvent.h (50%) rename src/{src => ESPEasy/net}/Globals/ESPEasyWiFi.cpp (100%) create mode 100644 src/ESPEasy/net/Globals/ESPEasyWiFi.h rename src/{src => ESPEasy/net}/Globals/ESPEasyWiFiEvent.cpp (89%) rename src/{src => ESPEasy/net}/Globals/ESPEasyWiFiEvent.h (76%) rename src/{src => ESPEasy/net}/Globals/NetworkState.cpp (88%) rename src/{src => ESPEasy/net}/Globals/NetworkState.h (65%) delete mode 100644 src/src/Globals/ESPEasyWiFi.h diff --git a/src/src/DataStructs/EthernetEventData.cpp b/src/ESPEasy/net/DataStructs/EthernetEventData.cpp similarity index 97% rename from src/src/DataStructs/EthernetEventData.cpp rename to src/ESPEasy/net/DataStructs/EthernetEventData.cpp index 008320e9e..4597964b4 100644 --- a/src/src/DataStructs/EthernetEventData.cpp +++ b/src/ESPEasy/net/DataStructs/EthernetEventData.cpp @@ -2,9 +2,9 @@ #if FEATURE_ETHERNET -#include "../ESPEasyCore/ESPEasy_Log.h" -#include "../Globals/Settings.h" -#include "../Helpers/Networking.h" +#include "../../../src/ESPEasyCore/ESPEasy_Log.h" +#include "../../../src/Globals/Settings.h" +#include "../../../src/Helpers/Networking.h" #include diff --git a/src/src/DataStructs/EthernetEventData.h b/src/ESPEasy/net/DataStructs/EthernetEventData.h similarity index 90% rename from src/src/DataStructs/EthernetEventData.h rename to src/ESPEasy/net/DataStructs/EthernetEventData.h index d17fe04b4..9d02712b5 100644 --- a/src/src/DataStructs/EthernetEventData.h +++ b/src/ESPEasy/net/DataStructs/EthernetEventData.h @@ -1,11 +1,10 @@ -#ifndef DATASTRUCTS_ETHERNETEVENTDATA_H -#define DATASTRUCTS_ETHERNETEVENTDATA_H +#pragma once -#include "../../ESPEasy_common.h" +#include "../../../ESPEasy_common.h" #if FEATURE_ETHERNET -#include "../Helpers/LongTermTimer.h" +#include "../../../src/Helpers/LongTermTimer.h" @@ -96,4 +95,3 @@ struct EthernetEventData_t { #endif -#endif // ifndef DATASTRUCTS_ETHERNETEVENTDATA_H diff --git a/src/src/DataStructs/WiFiEventData.cpp b/src/ESPEasy/net/DataStructs/WiFiEventData.cpp similarity index 93% rename from src/src/DataStructs/WiFiEventData.cpp rename to src/ESPEasy/net/DataStructs/WiFiEventData.cpp index d0d05bb6f..c2076ad6f 100644 --- a/src/src/DataStructs/WiFiEventData.cpp +++ b/src/ESPEasy/net/DataStructs/WiFiEventData.cpp @@ -1,15 +1,15 @@ #include "../DataStructs/WiFiEventData.h" -#include "../ESPEasyCore/ESPEasy_Log.h" +#include "../../../src/ESPEasyCore/ESPEasy_Log.h" -#include "../Globals/RTC.h" -#include "../Globals/Settings.h" -#include "../Globals/WiFi_AP_Candidates.h" +#include "../../../src/Globals/RTC.h" +#include "../../../src/Globals/Settings.h" +#include "../../../src/Globals/WiFi_AP_Candidates.h" -#include "../Helpers/ESPEasy_Storage.h" -#include "../Helpers/Networking.h" +#include "../../../src/Helpers/ESPEasy_Storage.h" +#include "../../../src/Helpers/Networking.h" -#include "../Helpers/StringConverter.h" +#include "../../../src/Helpers/StringConverter.h" #define WIFI_RECONNECT_WAIT 30000 // in milliSeconds diff --git a/src/src/DataStructs/WiFiEventData.h b/src/ESPEasy/net/DataStructs/WiFiEventData.h similarity index 91% rename from src/src/DataStructs/WiFiEventData.h rename to src/ESPEasy/net/DataStructs/WiFiEventData.h index 389137390..484669863 100644 --- a/src/src/DataStructs/WiFiEventData.h +++ b/src/ESPEasy/net/DataStructs/WiFiEventData.h @@ -1,9 +1,8 @@ -#ifndef DATASTRUCTS_WIFIEVENTDATA_H -#define DATASTRUCTS_WIFIEVENTDATA_H +#pragma once -#include "../DataStructs/MAC_address.h" -#include "../../ESPEasy/net/wifi/WiFiDisconnectReason.h" -#include "../Helpers/LongTermTimer.h" +#include "../../../src/DataStructs/MAC_address.h" +#include "../wifi/WiFiDisconnectReason.h" +#include "../../../src/Helpers/LongTermTimer.h" #ifdef ESP32 @@ -152,4 +151,3 @@ struct WiFiEventData_t { }; -#endif // ifndef DATASTRUCTS_WIFIEVENTDATA_H diff --git a/src/src/Globals/ESPEasyEthEvent.cpp b/src/ESPEasy/net/Globals/ESPEasyEthEvent.cpp similarity index 73% rename from src/src/Globals/ESPEasyEthEvent.cpp rename to src/ESPEasy/net/Globals/ESPEasyEthEvent.cpp index ae30f4310..5457b2a22 100644 --- a/src/src/Globals/ESPEasyEthEvent.cpp +++ b/src/ESPEasy/net/Globals/ESPEasyEthEvent.cpp @@ -1,6 +1,6 @@ #include "../Globals/ESPEasyEthEvent.h" -#include "../../ESPEasy_common.h" +#include "../../../ESPEasy_common.h" #if FEATURE_ETHERNET EthernetEventData_t EthEventData; diff --git a/src/src/Globals/ESPEasyEthEvent.h b/src/ESPEasy/net/Globals/ESPEasyEthEvent.h similarity index 50% rename from src/src/Globals/ESPEasyEthEvent.h rename to src/ESPEasy/net/Globals/ESPEasyEthEvent.h index 53c837efe..d9453a16f 100644 --- a/src/src/Globals/ESPEasyEthEvent.h +++ b/src/ESPEasy/net/Globals/ESPEasyEthEvent.h @@ -1,8 +1,7 @@ -#ifndef GLOBALS_ESPEASYETHEVENT_H -#define GLOBALS_ESPEASYETHEVENT_H +#pragma once -#include "../../ESPEasy_common.h" +#include "../../../ESPEasy_common.h" #if FEATURE_ETHERNET # include "../DataStructs/EthernetEventData.h" @@ -12,4 +11,3 @@ extern EthernetEventData_t EthEventData; #endif // if FEATURE_ETHERNET -#endif // ifndef GLOBALS_ESPEASYETHEVENT_H diff --git a/src/src/Globals/ESPEasyWiFi.cpp b/src/ESPEasy/net/Globals/ESPEasyWiFi.cpp similarity index 100% rename from src/src/Globals/ESPEasyWiFi.cpp rename to src/ESPEasy/net/Globals/ESPEasyWiFi.cpp diff --git a/src/ESPEasy/net/Globals/ESPEasyWiFi.h b/src/ESPEasy/net/Globals/ESPEasyWiFi.h new file mode 100644 index 000000000..5a15da0a9 --- /dev/null +++ b/src/ESPEasy/net/Globals/ESPEasyWiFi.h @@ -0,0 +1,11 @@ +#pragma once + +#include "../wifi/ESPEasyWifi.h" + +#include "../../../ESPEasy_common.h" + +#ifdef ESPEASY_WIFI_CLEANUP_WORK_IN_PROGRESS + +extern ESPEasyWiFi_t ESPEasyWiFi; +#endif // ifdef ESPEASY_WIFI_CLEANUP_WORK_IN_PROGRESS + diff --git a/src/src/Globals/ESPEasyWiFiEvent.cpp b/src/ESPEasy/net/Globals/ESPEasyWiFiEvent.cpp similarity index 89% rename from src/src/Globals/ESPEasyWiFiEvent.cpp rename to src/ESPEasy/net/Globals/ESPEasyWiFiEvent.cpp index 3428e2d35..b4cd3b894 100644 --- a/src/src/Globals/ESPEasyWiFiEvent.cpp +++ b/src/ESPEasy/net/Globals/ESPEasyWiFiEvent.cpp @@ -1,6 +1,6 @@ #include "../Globals/ESPEasyWiFiEvent.h" -#include "../../ESPEasy_common.h" +#include "../../../ESPEasy_common.h" #ifdef ESP8266 diff --git a/src/src/Globals/ESPEasyWiFiEvent.h b/src/ESPEasy/net/Globals/ESPEasyWiFiEvent.h similarity index 76% rename from src/src/Globals/ESPEasyWiFiEvent.h rename to src/ESPEasy/net/Globals/ESPEasyWiFiEvent.h index 626f346bf..b10394b8b 100644 --- a/src/src/Globals/ESPEasyWiFiEvent.h +++ b/src/ESPEasy/net/Globals/ESPEasyWiFiEvent.h @@ -1,10 +1,8 @@ -#ifndef GLOBALS_ESPEASYWIFIEVENT_H -#define GLOBALS_ESPEASYWIFIEVENT_H +#pragma once +#include "../../../ESPEasy_common.h" -#include "../../ESPEasy_common.h" - -#include "../../ESPEasy/net/wifi/ESPEasyWiFi_state_machine.h" +#include "../wifi/ESPEasyWiFi_state_machine.h" #include "../DataStructs/WiFiEventData.h" @@ -39,4 +37,3 @@ extern WiFiEventData_t WiFiEventData; extern ESPEasy::net::wifi::ESPEasyWiFi_t ESPEasyWiFi; -#endif // GLOBALS_ESPEASYWIFIEVENT_H diff --git a/src/src/Globals/NetworkState.cpp b/src/ESPEasy/net/Globals/NetworkState.cpp similarity index 88% rename from src/src/Globals/NetworkState.cpp rename to src/ESPEasy/net/Globals/NetworkState.cpp index e5c286c85..d1ae85d73 100644 --- a/src/src/Globals/NetworkState.cpp +++ b/src/ESPEasy/net/Globals/NetworkState.cpp @@ -1,6 +1,6 @@ #include "../Globals/NetworkState.h" -#include "../../ESPEasy_common.h" +#include "../../../ESPEasy_common.h" // Ethernet Connection status diff --git a/src/src/Globals/NetworkState.h b/src/ESPEasy/net/Globals/NetworkState.h similarity index 65% rename from src/src/Globals/NetworkState.h rename to src/ESPEasy/net/Globals/NetworkState.h index b7664cb84..12e9483aa 100644 --- a/src/src/Globals/NetworkState.h +++ b/src/ESPEasy/net/Globals/NetworkState.h @@ -1,13 +1,12 @@ -#ifndef GLOBALS_NETWORKSTATE_H -#define GLOBALS_NETWORKSTATE_H +#pragma once -#include "../../ESPEasy_common.h" +#include "../../../ESPEasy_common.h" #include #include -#include "../DataTypes/ESPEasy_plugin_functions.h" -#include "../DataTypes/NetworkMedium.h" +#include "../../../src/DataTypes/ESPEasy_plugin_functions.h" +#include "../../../src/DataTypes/NetworkMedium.h" // Ethernet Connectiopn status extern NetworkMedium_t active_network_medium; @@ -30,5 +29,3 @@ extern IPAddress apIP; // udp protocol stuff (syslog, global sync, node info list, ntp time) extern WiFiUDP portUDP; - -#endif // GLOBALS_NETWORKSTATE_H diff --git a/src/ESPEasy/net/wifi/ESPEasyWiFiEvent_ESP32.cpp b/src/ESPEasy/net/wifi/ESPEasyWiFiEvent_ESP32.cpp index be4219ac0..a699b8b39 100644 --- a/src/ESPEasy/net/wifi/ESPEasyWiFiEvent_ESP32.cpp +++ b/src/ESPEasy/net/wifi/ESPEasyWiFiEvent_ESP32.cpp @@ -19,8 +19,8 @@ # include "../wifi/ESPEasyWifi.h" # include "../wifi/ESPEasyWifi_ProcessEvent.h" -# include "../../../src/Globals/ESPEasyWiFiEvent.h" -# include "../../../src/Globals/NetworkState.h" +# include "../Globals/ESPEasyWiFiEvent.h" +# include "../Globals/NetworkState.h" # include "../../../src/Globals/RTC.h" # include "../../../src/Globals/WiFi_AP_Candidates.h" @@ -29,7 +29,7 @@ # if FEATURE_ETHERNET -# include "../../../src/Globals/ESPEasyEthEvent.h" +# include "../Globals/ESPEasyEthEvent.h" # endif // if FEATURE_ETHERNET void setUseStaticIP(bool enabled) {} diff --git a/src/ESPEasy/net/wifi/ESPEasyWiFiEvent_ESP8266.cpp b/src/ESPEasy/net/wifi/ESPEasyWiFiEvent_ESP8266.cpp index d17bc3a9d..6561f9d7d 100644 --- a/src/ESPEasy/net/wifi/ESPEasyWiFiEvent_ESP8266.cpp +++ b/src/ESPEasy/net/wifi/ESPEasyWiFiEvent_ESP8266.cpp @@ -7,14 +7,14 @@ # include "../../../src/DataTypes/ESPEasyTimeSource.h" -# include "../../../src/ESPEasyCore/ESPEasyEth.h" +//# include "../../../src/ESPEasyCore/ESPEasyEth.h" # include "../../../src/ESPEasyCore/ESPEasy_Log.h" # include "../../../src/ESPEasyCore/ESPEasyNetwork.h" # include "../wifi/ESPEasyWifi.h" # include "../wifi/ESPEasyWifi_ProcessEvent.h" -# include "../../../src/Globals/ESPEasyWiFiEvent.h" -# include "../../../src/Globals/NetworkState.h" +# include "../Globals/ESPEasyWiFiEvent.h" +# include "../Globals/NetworkState.h" # include "../../../src/Globals/RTC.h" # include "../../../src/Globals/WiFi_AP_Candidates.h" diff --git a/src/ESPEasy/net/wifi/ESPEasyWiFi_state_machine.cpp b/src/ESPEasy/net/wifi/ESPEasyWiFi_state_machine.cpp index 99b7dc59b..8f6044321 100644 --- a/src/ESPEasy/net/wifi/ESPEasyWiFi_state_machine.cpp +++ b/src/ESPEasy/net/wifi/ESPEasyWiFi_state_machine.cpp @@ -10,7 +10,7 @@ # include "../../../src/ESPEasyCore/ESPEasy_Log.h" -# include "../../../src/Globals/ESPEasyWiFiEvent.h" +# include "../Globals/ESPEasyWiFiEvent.h" # include "../../../src/Globals/RTC.h" # include "../../../src/Globals/Settings.h" # include "../../../src/Globals/WiFi_AP_Candidates.h" diff --git a/src/ESPEasy/net/wifi/ESPEasyWifi.cpp b/src/ESPEasy/net/wifi/ESPEasyWifi.cpp index e7c670706..ec94788bd 100644 --- a/src/ESPEasy/net/wifi/ESPEasyWifi.cpp +++ b/src/ESPEasy/net/wifi/ESPEasyWifi.cpp @@ -8,9 +8,9 @@ # include "../wifi/ESPEasyWifi_ProcessEvent.h" # include "../../../src/ESPEasyCore/ESPEasy_Log.h" # include "../../../src/ESPEasyCore/Serial.h" -# include "../../../src/Globals/ESPEasyWiFiEvent.h" +# include "../Globals/ESPEasyWiFiEvent.h" # include "../../../src/Globals/EventQueue.h" -# include "../../../src/Globals/NetworkState.h" +# include "../Globals/NetworkState.h" # include "../../../src/Globals/Nodes.h" # include "../../../src/Globals/RTC.h" # include "../../../src/Globals/SecuritySettings.h" diff --git a/src/ESPEasy/net/wifi/ESPEasyWifi_ProcessEvent.cpp b/src/ESPEasy/net/wifi/ESPEasyWifi_ProcessEvent.cpp index c215fd5ec..facc54b1d 100644 --- a/src/ESPEasy/net/wifi/ESPEasyWifi_ProcessEvent.cpp +++ b/src/ESPEasy/net/wifi/ESPEasyWifi_ProcessEvent.cpp @@ -9,12 +9,12 @@ #include "../wifi/ESPEasyWifi.h" #include "../wifi/ESPEasyWifi_abstracted.h" -# include "../../../src/Globals/ESPEasyWiFiEvent.h" +# include "../Globals/ESPEasyWiFiEvent.h" # include "../../../src/Globals/ESPEasy_Scheduler.h" # include "../../../src/Globals/ESPEasy_time.h" # include "../../../src/Globals/EventQueue.h" # include "../../../src/Globals/MQTT.h" -# include "../../../src/Globals/NetworkState.h" +# include "../Globals/NetworkState.h" # include "../../../src/Globals/RTC.h" # include "../../../src/Globals/SecuritySettings.h" # include "../../../src/Globals/Services.h" diff --git a/src/ESPEasy/net/wifi/ESPEasyWifi_abstracted.cpp b/src/ESPEasy/net/wifi/ESPEasyWifi_abstracted.cpp index 0404e51d3..2c0bacc0c 100644 --- a/src/ESPEasy/net/wifi/ESPEasyWifi_abstracted.cpp +++ b/src/ESPEasy/net/wifi/ESPEasyWifi_abstracted.cpp @@ -4,7 +4,7 @@ # include "../../../src/Globals/EventQueue.h" # include "../../../src/Globals/Settings.h" -# include "../../../src/Globals/ESPEasyWiFiEvent.h" +# include "../Globals/ESPEasyWiFiEvent.h" # include "../../../src/Helpers/StringConverter.h" diff --git a/src/ESPEasy/net/wifi/ESPEasyWifi_abstracted_ESP32.cpp b/src/ESPEasy/net/wifi/ESPEasyWifi_abstracted_ESP32.cpp index 5aaed414a..eacaa4ec8 100644 --- a/src/ESPEasy/net/wifi/ESPEasyWifi_abstracted_ESP32.cpp +++ b/src/ESPEasy/net/wifi/ESPEasyWifi_abstracted_ESP32.cpp @@ -5,7 +5,7 @@ # include "../../../src/DataStructs/TimingStats.h" -# include "../../../src/Globals/ESPEasyWiFiEvent.h" +# include "../Globals/ESPEasyWiFiEvent.h" # include "../../../src/Globals/EventQueue.h" # include "../../../src/Globals/Settings.h" # include "../../../src/Globals/WiFi_AP_Candidates.h" diff --git a/src/ESPEasy/net/wifi/ESPEasyWifi_abstracted_ESP8266.cpp b/src/ESPEasy/net/wifi/ESPEasyWifi_abstracted_ESP8266.cpp index 1d37a0691..326c7e551 100644 --- a/src/ESPEasy/net/wifi/ESPEasyWifi_abstracted_ESP8266.cpp +++ b/src/ESPEasy/net/wifi/ESPEasyWifi_abstracted_ESP8266.cpp @@ -7,7 +7,7 @@ # include "../../../src/Helpers/StringConverter.h" -# include "../../../src/Globals/ESPEasyWiFiEvent.h" +# include "../Globals/ESPEasyWiFiEvent.h" # include "../../../src/Globals/Settings.h" # include "../../../src/Globals/WiFi_AP_Candidates.h" diff --git a/src/src/Commands/Networks.cpp b/src/src/Commands/Networks.cpp index b7fb5462f..1883acbb6 100644 --- a/src/src/Commands/Networks.cpp +++ b/src/src/Commands/Networks.cpp @@ -4,7 +4,7 @@ #include "../Commands/Common.h" #include "../ESPEasyCore/ESPEasyNetwork.h" #include "../ESPEasyCore/ESPEasyEth.h" -#include "../Globals/NetworkState.h" +#include "../../ESPEasy/net/Globals/NetworkState.h" #include "../Globals/Settings.h" #include "../Helpers/StringConverter.h" #include "../WebServer/AccessControl.h" diff --git a/src/src/Commands/UDP.cpp b/src/src/Commands/UDP.cpp index ea539c337..60bb0a124 100644 --- a/src/src/Commands/UDP.cpp +++ b/src/src/Commands/UDP.cpp @@ -5,7 +5,7 @@ #include "../Commands/Common.h" #include "../ESPEasyCore/ESPEasyNetwork.h" -#include "../Globals/NetworkState.h" +#include "../../ESPEasy/net/Globals/NetworkState.h" #include "../Globals/Settings.h" #include "../Helpers/Misc.h" #include "../Helpers/Network.h" diff --git a/src/src/Commands/WiFi.cpp b/src/src/Commands/WiFi.cpp index 7887ca15a..3acfd97c1 100644 --- a/src/src/Commands/WiFi.cpp +++ b/src/src/Commands/WiFi.cpp @@ -10,7 +10,7 @@ #include "../ESPEasyCore/Serial.h" -#include "../Globals/ESPEasyWiFiEvent.h" +#include "../../ESPEasy/net/Globals/ESPEasyWiFiEvent.h" #include "../Globals/RTC.h" #include "../Globals/SecuritySettings.h" #include "../Globals/Settings.h" diff --git a/src/src/DataStructs/NodesHandler.cpp b/src/src/DataStructs/NodesHandler.cpp index b0f76b1bf..972f092a2 100644 --- a/src/src/DataStructs/NodesHandler.cpp +++ b/src/src/DataStructs/NodesHandler.cpp @@ -22,9 +22,9 @@ #include "../ESPEasyCore/ESPEasyNetwork.h" #include "../Globals/ESPEasy_time.h" -#include "../Globals/ESPEasyWiFiEvent.h" +#include "../../ESPEasy/net/Globals/ESPEasyWiFiEvent.h" #include "../Globals/MQTT.h" -#include "../Globals/NetworkState.h" +#include "../../ESPEasy/net/Globals/NetworkState.h" #include "../Globals/RTC.h" #include "../Globals/Settings.h" #include "../Helpers/ESPEasy_time_calc.h" diff --git a/src/src/DataStructs/WiFi_AP_Candidate.cpp b/src/src/DataStructs/WiFi_AP_Candidate.cpp index 0bdfa6501..c49572df3 100644 --- a/src/src/DataStructs/WiFi_AP_Candidate.cpp +++ b/src/src/DataStructs/WiFi_AP_Candidate.cpp @@ -1,6 +1,6 @@ #include "../DataStructs/WiFi_AP_Candidate.h" -#include "../Globals/ESPEasyWiFiEvent.h" +#include "../../ESPEasy/net/Globals/ESPEasyWiFiEvent.h" #include "../Globals/SecuritySettings.h" #include "../Globals/Statistics.h" #include "../Helpers/ESPEasy_time_calc.h" diff --git a/src/src/ESPEasyCore/Controller.cpp b/src/src/ESPEasyCore/Controller.cpp index a2325a109..2cfdf0246 100644 --- a/src/src/ESPEasyCore/Controller.cpp +++ b/src/src/ESPEasyCore/Controller.cpp @@ -20,7 +20,7 @@ #include "../Globals/CPlugins.h" #include "../Globals/Device.h" -#include "../Globals/ESPEasyWiFiEvent.h" +#include "../../ESPEasy/net/Globals/ESPEasyWiFiEvent.h" #include "../Globals/ESPEasy_Scheduler.h" #include "../Globals/MQTT.h" #include "../Globals/Plugins.h" diff --git a/src/src/ESPEasyCore/ESPEasyEth.cpp b/src/src/ESPEasyCore/ESPEasyEth.cpp index cb279a155..a4f3e74da 100644 --- a/src/src/ESPEasyCore/ESPEasyEth.cpp +++ b/src/src/ESPEasyCore/ESPEasyEth.cpp @@ -8,8 +8,8 @@ #include "../ESPEasyCore/ESPEasy_Log.h" #include "../ESPEasyCore/ESPEasyGPIO.h" #include "../ESPEasyCore/ESPEasyEthEvent.h" -#include "../Globals/ESPEasyEthEvent.h" -#include "../Globals/NetworkState.h" +#include "../../ESPEasy/net/Globals/ESPEasyEthEvent.h" +#include "../../ESPEasy/net/Globals/NetworkState.h" #include "../Globals/Settings.h" #include "../Helpers/Hardware_GPIO.h" #include "../Helpers/StringConverter.h" diff --git a/src/src/ESPEasyCore/ESPEasyEthEvent.cpp b/src/src/ESPEasyCore/ESPEasyEthEvent.cpp index 6d6ba4e16..0dd097560 100644 --- a/src/src/ESPEasyCore/ESPEasyEthEvent.cpp +++ b/src/src/ESPEasyCore/ESPEasyEthEvent.cpp @@ -5,7 +5,7 @@ # include #include "../ESPEasyCore/ESPEasyEth.h" -#include "../Globals/ESPEasyEthEvent.h" +#include "../../ESPEasy/net/Globals/ESPEasyEthEvent.h" // ******************************************************************************** diff --git a/src/src/ESPEasyCore/ESPEasyEth_ProcessEvent.cpp b/src/src/ESPEasyCore/ESPEasyEth_ProcessEvent.cpp index a6f05f8d3..449423ef6 100644 --- a/src/src/ESPEasyCore/ESPEasyEth_ProcessEvent.cpp +++ b/src/src/ESPEasyCore/ESPEasyEth_ProcessEvent.cpp @@ -8,13 +8,13 @@ # include "../ESPEasyCore/ESPEasyNetwork.h" #include "../../ESPEasy/net/wifi/ESPEasyWifi.h" // LogConnectionStatus -# include "../Globals/ESPEasyEthEvent.h" -# include "../Globals/ESPEasyWiFiEvent.h" +# include "../../ESPEasy/net/Globals/ESPEasyEthEvent.h" +# include "../../ESPEasy/net/Globals/ESPEasyWiFiEvent.h" # include "../Globals/ESPEasy_Scheduler.h" # include "../Globals/ESPEasy_time.h" # include "../Globals/EventQueue.h" # include "../Globals/MQTT.h" -# include "../Globals/NetworkState.h" +# include "../../ESPEasy/net/Globals/NetworkState.h" # include "../Globals/Settings.h" # include "../Helpers/LongTermTimer.h" diff --git a/src/src/ESPEasyCore/ESPEasyNetwork.cpp b/src/src/ESPEasyCore/ESPEasyNetwork.cpp index 1fe92a59a..c08ad3ef6 100644 --- a/src/src/ESPEasyCore/ESPEasyNetwork.cpp +++ b/src/src/ESPEasyCore/ESPEasyNetwork.cpp @@ -2,7 +2,7 @@ #include "../../ESPEasy/net/wifi/ESPEasyWifi_abstracted.h" -#include "../Globals/NetworkState.h" +#include "../../ESPEasy/net/Globals/NetworkState.h" #include "../Globals/Settings.h" #include "../Globals/ESPEasy_time.h" diff --git a/src/src/ESPEasyCore/ESPEasyNetwork_ESP32.cpp b/src/src/ESPEasyCore/ESPEasyNetwork_ESP32.cpp index c999f103c..367da4beb 100644 --- a/src/src/ESPEasyCore/ESPEasyNetwork_ESP32.cpp +++ b/src/src/ESPEasyCore/ESPEasyNetwork_ESP32.cpp @@ -7,11 +7,11 @@ #include "../../ESPEasy/net/wifi/ESPEasyWifi.h" #include "../../ESPEasy/net/wifi/ESPEasyWifi_abstracted.h" #include "../Globals/ESPEasy_time.h" -#include "../Globals/ESPEasyWiFiEvent.h" -#include "../Globals/NetworkState.h" +#include "../../ESPEasy/net/Globals/ESPEasyWiFiEvent.h" +#include "../../ESPEasy/net/Globals/NetworkState.h" #include "../Globals/Settings.h" -#include "../Globals/ESPEasyEthEvent.h" +#include "../../ESPEasy/net/Globals/ESPEasyEthEvent.h" #include "../Helpers/Network.h" #include "../Helpers/Networking.h" diff --git a/src/src/ESPEasyCore/ESPEasyNetwork_ESP8266.cpp b/src/src/ESPEasyCore/ESPEasyNetwork_ESP8266.cpp index e416ed85a..9619a3b7d 100644 --- a/src/src/ESPEasyCore/ESPEasyNetwork_ESP8266.cpp +++ b/src/src/ESPEasyCore/ESPEasyNetwork_ESP8266.cpp @@ -7,8 +7,8 @@ #include "../../ESPEasy/net/wifi/ESPEasyWifi.h" #include "../../ESPEasy/net/wifi/ESPEasyWifi_abstracted.h" #include "../Globals/ESPEasy_time.h" -#include "../Globals/ESPEasyWiFiEvent.h" -#include "../Globals/NetworkState.h" +#include "../../ESPEasy/net/Globals/ESPEasyWiFiEvent.h" +#include "../../ESPEasy/net/Globals/NetworkState.h" #include "../Globals/Settings.h" #include "../Helpers/Network.h" diff --git a/src/src/ESPEasyCore/ESPEasy_Log.cpp b/src/src/ESPEasyCore/ESPEasy_Log.cpp index bcf69137e..4756daeea 100644 --- a/src/src/ESPEasyCore/ESPEasy_Log.cpp +++ b/src/src/ESPEasyCore/ESPEasy_Log.cpp @@ -4,7 +4,7 @@ #include "../ESPEasyCore/Serial.h" #include "../Globals/Cache.h" #include "../Globals/ESPEasy_Console.h" -#include "../Globals/ESPEasyWiFiEvent.h" +#include "../../ESPEasy/net/Globals/ESPEasyWiFiEvent.h" #include "../Globals/Logging.h" #include "../Globals/Settings.h" #include "../Helpers/Networking.h" diff --git a/src/src/ESPEasyCore/ESPEasy_backgroundtasks.cpp b/src/src/ESPEasyCore/ESPEasy_backgroundtasks.cpp index db80122b2..98aae53d1 100644 --- a/src/src/ESPEasyCore/ESPEasy_backgroundtasks.cpp +++ b/src/src/ESPEasyCore/ESPEasy_backgroundtasks.cpp @@ -6,7 +6,7 @@ #include "../DataStructs/TimingStats.h" #include "../ESPEasyCore/ESPEasyNetwork.h" #include "../ESPEasyCore/Serial.h" -#include "../Globals/NetworkState.h" +#include "../../ESPEasy/net/Globals/NetworkState.h" #include "../Globals/Services.h" #include "../Globals/Settings.h" #if FEATURE_RTTTL && FEATURE_ANYRTTTL_LIB && FEATURE_ANYRTTTL_ASYNC diff --git a/src/src/ESPEasyCore/ESPEasy_setup.cpp b/src/src/ESPEasyCore/ESPEasy_setup.cpp index 294c55ffc..b79022645 100644 --- a/src/src/ESPEasyCore/ESPEasy_setup.cpp +++ b/src/src/ESPEasyCore/ESPEasy_setup.cpp @@ -15,9 +15,9 @@ #include "../ESPEasyCore/Serial.h" #include "../Globals/Cache.h" #include "../Globals/ESPEasy_Console.h" -#include "../Globals/ESPEasyWiFiEvent.h" +#include "../../ESPEasy/net/Globals/ESPEasyWiFiEvent.h" #include "../Globals/ESPEasy_time.h" -#include "../Globals/NetworkState.h" +#include "../../ESPEasy/net/Globals/NetworkState.h" #include "../Globals/RTC.h" #include "../Globals/Statistics.h" #include "../Globals/WiFi_AP_Candidates.h" diff --git a/src/src/Globals/ESPEasyWiFi.h b/src/src/Globals/ESPEasyWiFi.h deleted file mode 100644 index 1c6efa55d..000000000 --- a/src/src/Globals/ESPEasyWiFi.h +++ /dev/null @@ -1,13 +0,0 @@ -#ifndef GLOBALS_ESPEASYWIFI_H -#define GLOBALS_ESPEASYWIFI_H - -#include "../../ESPEasy/net/wifi/ESPEasyWifi.h" - -#include "../../ESPEasy_common.h" - -#ifdef ESPEASY_WIFI_CLEANUP_WORK_IN_PROGRESS - -extern ESPEasyWiFi_t ESPEasyWiFi; -#endif // ifdef ESPEASY_WIFI_CLEANUP_WORK_IN_PROGRESS - -#endif // ifndef GLOBALS_ESPEASYWIFI_H diff --git a/src/src/Globals/Plugins.cpp b/src/src/Globals/Plugins.cpp index 00a003e07..179bbe9de 100644 --- a/src/src/Globals/Plugins.cpp +++ b/src/src/Globals/Plugins.cpp @@ -18,7 +18,7 @@ #include "../Globals/ExtraTaskSettings.h" #include "../Globals/EventQueue.h" #include "../Globals/GlobalMapPortStatus.h" -#include "../Globals/NetworkState.h" +#include "../../ESPEasy/net/Globals/NetworkState.h" #include "../Globals/Settings.h" #include "../Globals/Statistics.h" diff --git a/src/src/Helpers/ESPEasy_FactoryDefault.cpp b/src/src/Helpers/ESPEasy_FactoryDefault.cpp index 21a5b3463..e5e461171 100644 --- a/src/src/Helpers/ESPEasy_FactoryDefault.cpp +++ b/src/src/Helpers/ESPEasy_FactoryDefault.cpp @@ -14,7 +14,7 @@ #include "../../ESPEasy/net/wifi/ESPEasyWifi.h" #include "../ESPEasyCore/Serial.h" -#include "../Globals/ESPEasyWiFiEvent.h" +#include "../../ESPEasy/net/Globals/ESPEasyWiFiEvent.h" #include "../Globals/RTC.h" #include "../Globals/ResetFactoryDefaultPref.h" #include "../Globals/SecuritySettings.h" diff --git a/src/src/Helpers/ESPEasy_Storage.cpp b/src/src/Helpers/ESPEasy_Storage.cpp index 8abee085d..bf833cca6 100644 --- a/src/src/Helpers/ESPEasy_Storage.cpp +++ b/src/src/Helpers/ESPEasy_Storage.cpp @@ -23,12 +23,12 @@ #include "../Globals/CRCValues.h" #include "../Globals/Cache.h" #include "../Globals/Device.h" -#include "../Globals/ESPEasyWiFiEvent.h" +#include "../../ESPEasy/net/Globals/ESPEasyWiFiEvent.h" #include "../Globals/ESPEasy_Scheduler.h" #include "../Globals/ESPEasy_time.h" #include "../Globals/EventQueue.h" #include "../Globals/ExtraTaskSettings.h" -#include "../Globals/NetworkState.h" +#include "../../ESPEasy/net/Globals/NetworkState.h" #include "../Globals/Plugins.h" #include "../Globals/RTC.h" #include "../Globals/ResetFactoryDefaultPref.h" diff --git a/src/src/Helpers/ESPEasy_time.cpp b/src/src/Helpers/ESPEasy_time.cpp index ff8fe940b..228a15881 100644 --- a/src/src/Helpers/ESPEasy_time.cpp +++ b/src/src/Helpers/ESPEasy_time.cpp @@ -15,7 +15,7 @@ #include "../ESPEasyCore/ESPEasyNetwork.h" #include "../Globals/EventQueue.h" -#include "../Globals/NetworkState.h" +#include "../../ESPEasy/net/Globals/NetworkState.h" #include "../Globals/Nodes.h" #include "../Globals/RTC.h" #include "../Globals/Settings.h" diff --git a/src/src/Helpers/Hardware.cpp b/src/src/Helpers/Hardware.cpp index 37abf8c4c..d46c15873 100644 --- a/src/src/Helpers/Hardware.cpp +++ b/src/src/Helpers/Hardware.cpp @@ -7,7 +7,7 @@ #include "../ESPEasyCore/ESPEasy_Log.h" #include "../Globals/Device.h" -#include "../Globals/ESPEasyWiFiEvent.h" +#include "../../ESPEasy/net/Globals/ESPEasyWiFiEvent.h" #include "../Globals/ExtraTaskSettings.h" #include "../Globals/Settings.h" #include "../Globals/Statistics.h" diff --git a/src/src/Helpers/Hardware_ADC.cpp b/src/src/Helpers/Hardware_ADC.cpp index e96a174e0..f4f763142 100644 --- a/src/src/Helpers/Hardware_ADC.cpp +++ b/src/src/Helpers/Hardware_ADC.cpp @@ -6,7 +6,7 @@ #endif // ifdef ESP32 #ifdef ESP8266 -#include "../Globals/ESPEasyWiFiEvent.h" +#include "../../ESPEasy/net/Globals/ESPEasyWiFiEvent.h" bool Hardware_ADC_t::init() { diff --git a/src/src/Helpers/MDNS_Helper.cpp b/src/src/Helpers/MDNS_Helper.cpp index 48aeaa365..9f3a562df 100644 --- a/src/src/Helpers/MDNS_Helper.cpp +++ b/src/src/Helpers/MDNS_Helper.cpp @@ -6,8 +6,8 @@ #include "../ESPEasyCore/ESPEasyEth.h" #include "../ESPEasyCore/ESPEasyNetwork.h" -#include "../Globals/ESPEasyWiFiEvent.h" -#include "../Globals/NetworkState.h" +#include "../../ESPEasy/net/Globals/ESPEasyWiFiEvent.h" +#include "../../ESPEasy/net/Globals/NetworkState.h" #include "../Globals/Services.h" #include "../Globals/Settings.h" diff --git a/src/src/Helpers/Networking.cpp b/src/src/Helpers/Networking.cpp index c89446e9f..2219e35a1 100644 --- a/src/src/Helpers/Networking.cpp +++ b/src/src/Helpers/Networking.cpp @@ -11,8 +11,8 @@ #include "../ESPEasyCore/ESPEasyNetwork.h" #include "../../ESPEasy/net/wifi/ESPEasyWifi.h" #include "../ESPEasyCore/Serial.h" -#include "../Globals/ESPEasyEthEvent.h" -#include "../Globals/ESPEasyWiFiEvent.h" +#include "../../ESPEasy/net/Globals/ESPEasyEthEvent.h" +#include "../../ESPEasy/net/Globals/ESPEasyWiFiEvent.h" #include "../Globals/ESPEasy_Scheduler.h" #ifdef USES_ESPEASY_NOW @@ -20,7 +20,7 @@ #endif #include "../Globals/EventQueue.h" -#include "../Globals/NetworkState.h" +#include "../../ESPEasy/net/Globals/NetworkState.h" #include "../Globals/Nodes.h" #include "../Globals/ResetFactoryDefaultPref.h" #include "../Globals/Settings.h" diff --git a/src/src/Helpers/PeriodicalActions.cpp b/src/src/Helpers/PeriodicalActions.cpp index 7a2742d23..4a612b344 100644 --- a/src/src/Helpers/PeriodicalActions.cpp +++ b/src/src/Helpers/PeriodicalActions.cpp @@ -15,16 +15,16 @@ #include "../../ESPEasy/net/wifi/ESPEasyWifi_abstracted.h" #include "../ESPEasyCore/ESPEasyRules.h" #include "../ESPEasyCore/Serial.h" -#include "../Globals/ESPEasyWiFiEvent.h" +#include "../../ESPEasy/net/Globals/ESPEasyWiFiEvent.h" #if FEATURE_ETHERNET -#include "../Globals/ESPEasyEthEvent.h" +#include "../../ESPEasy/net/Globals/ESPEasyEthEvent.h" #endif #include "../Globals/ESPEasy_Scheduler.h" #include "../Globals/ESPEasy_time.h" #include "../Globals/EventQueue.h" #include "../Globals/MainLoopCommand.h" #include "../Globals/MQTT.h" -#include "../Globals/NetworkState.h" +#include "../../ESPEasy/net/Globals/NetworkState.h" #include "../Globals/RTC.h" #include "../Globals/Services.h" #include "../Globals/Settings.h" diff --git a/src/src/Helpers/StringConverter.cpp b/src/src/Helpers/StringConverter.cpp index b44442f6e..60c3c6e28 100644 --- a/src/src/Helpers/StringConverter.cpp +++ b/src/src/Helpers/StringConverter.cpp @@ -11,7 +11,7 @@ #include "../Globals/Cache.h" #include "../Globals/CRCValues.h" #include "../Globals/Device.h" -#include "../Globals/ESPEasyWiFiEvent.h" +#include "../../ESPEasy/net/Globals/ESPEasyWiFiEvent.h" #include "../Globals/ESPEasy_time.h" #include "../Globals/MQTT.h" #include "../Globals/Plugins.h" diff --git a/src/src/Helpers/StringGenerator_WiFi.cpp b/src/src/Helpers/StringGenerator_WiFi.cpp index 7d49df982..a3389637a 100644 --- a/src/src/Helpers/StringGenerator_WiFi.cpp +++ b/src/src/Helpers/StringGenerator_WiFi.cpp @@ -2,7 +2,7 @@ #include "../Helpers/StringConverter.h" -#include "../Globals/ESPEasyWiFiEvent.h" +#include "../../ESPEasy/net/Globals/ESPEasyWiFiEvent.h" #ifdef ESP8266 #include diff --git a/src/src/Helpers/StringProvider.cpp b/src/src/Helpers/StringProvider.cpp index 1eb0b269a..1444fa813 100644 --- a/src/src/Helpers/StringProvider.cpp +++ b/src/src/Helpers/StringProvider.cpp @@ -19,13 +19,13 @@ #include "../Globals/ESPEasy_Console.h" #include "../Globals/ESPEasy_Scheduler.h" #include "../Globals/ESPEasy_time.h" -#include "../Globals/ESPEasyWiFiEvent.h" +#include "../../ESPEasy/net/Globals/ESPEasyWiFiEvent.h" #if FEATURE_ETHERNET -#include "../Globals/ESPEasyEthEvent.h" +#include "../../ESPEasy/net/Globals/ESPEasyEthEvent.h" #endif -#include "../Globals/NetworkState.h" +#include "../../ESPEasy/net/Globals/NetworkState.h" #include "../Globals/SecuritySettings.h" #include "../Globals/Settings.h" #include "../Globals/WiFi_AP_Candidates.h" diff --git a/src/src/Helpers/SystemVariables.cpp b/src/src/Helpers/SystemVariables.cpp index 4c3387910..cb73baa88 100644 --- a/src/src/Helpers/SystemVariables.cpp +++ b/src/src/Helpers/SystemVariables.cpp @@ -14,11 +14,11 @@ #include "../Globals/CRCValues.h" #include "../Globals/ESPEasy_time.h" -#include "../Globals/ESPEasyWiFiEvent.h" +#include "../../ESPEasy/net/Globals/ESPEasyWiFiEvent.h" #if FEATURE_MQTT # include "../Globals/MQTT.h" #endif // if FEATURE_MQTT -#include "../Globals/NetworkState.h" +#include "../../ESPEasy/net/Globals/NetworkState.h" #include "../Globals/RulesCalculate.h" #include "../Globals/RuntimeData.h" #include "../Globals/Settings.h" diff --git a/src/src/Helpers/WiFi_AP_CandidatesList.cpp b/src/src/Helpers/WiFi_AP_CandidatesList.cpp index 8195defd4..5f737e6e2 100644 --- a/src/src/Helpers/WiFi_AP_CandidatesList.cpp +++ b/src/src/Helpers/WiFi_AP_CandidatesList.cpp @@ -5,7 +5,7 @@ #endif #include "../ESPEasyCore/ESPEasy_Log.h" -#include "../Globals/ESPEasyWiFiEvent.h" +#include "../../ESPEasy/net/Globals/ESPEasyWiFiEvent.h" #include "../Globals/RTC.h" #include "../Globals/SecuritySettings.h" #include "../Globals/Settings.h" diff --git a/src/src/Helpers/_CPlugin_Helper.cpp b/src/src/Helpers/_CPlugin_Helper.cpp index e48e4d126..86effaf14 100644 --- a/src/src/Helpers/_CPlugin_Helper.cpp +++ b/src/src/Helpers/_CPlugin_Helper.cpp @@ -19,7 +19,7 @@ #include "../Globals/Settings.h" #include "../Globals/SecuritySettings.h" -#include "../Globals/ESPEasyWiFiEvent.h" +#include "../../ESPEasy/net/Globals/ESPEasyWiFiEvent.h" #include "../Helpers/ESPEasy_time_calc.h" #include "../Helpers/Misc.h" diff --git a/src/src/PluginStructs/P026_data_struct.cpp b/src/src/PluginStructs/P026_data_struct.cpp index 280ef56e3..139c686d0 100644 --- a/src/src/PluginStructs/P026_data_struct.cpp +++ b/src/src/PluginStructs/P026_data_struct.cpp @@ -4,7 +4,7 @@ # include "../DataStructs/ESPEasy_packed_raw_data.h" # include "../ESPEasyCore/ESPEasyNetwork.h" -# include "../Globals/ESPEasyWiFiEvent.h" +# include "../../ESPEasy/net/Globals/ESPEasyWiFiEvent.h" # include "../Helpers/Memory.h" # include "../Helpers/Hardware_temperature_sensor.h" # ifdef ESP32 diff --git a/src/src/PluginStructs/P109_data_struct.h b/src/src/PluginStructs/P109_data_struct.h index 68b750586..9cdf63be0 100644 --- a/src/src/PluginStructs/P109_data_struct.h +++ b/src/src/PluginStructs/P109_data_struct.h @@ -4,7 +4,8 @@ #include "../../_Plugin_Helper.h" #ifdef USES_P109 -# include "../Globals/ESPEasyWiFiEvent.h" + +# include "../../ESPEasy/net/Globals/ESPEasyWiFiEvent.h" # include "../Helpers/OLed_helper.h" # include "SSD1306.h" diff --git a/src/src/PluginStructs/P145_data_struct.cpp b/src/src/PluginStructs/P145_data_struct.cpp index 9b3102e9f..192fa2a37 100644 --- a/src/src/PluginStructs/P145_data_struct.cpp +++ b/src/src/PluginStructs/P145_data_struct.cpp @@ -13,7 +13,7 @@ // #define P145_TEST // #define P145_CALIBRATION_INTERVAL (5*60*1000) -# include "../Globals/ESPEasyWiFiEvent.h" // Need to know when WiFi is ruining the ADC measurements +# include "../../ESPEasy/net/Globals/ESPEasyWiFiEvent.h" // Need to know when WiFi is ruining the ADC measurements // The table sensorDefs[] contains string items for representation. // Storage is in PROGMEM where a (fixed format) C-style string does not fit well diff --git a/src/src/WebServer/404.cpp b/src/src/WebServer/404.cpp index 6f53d7965..9efaa304f 100644 --- a/src/src/WebServer/404.cpp +++ b/src/src/WebServer/404.cpp @@ -8,7 +8,7 @@ #include "../Globals/Services.h" #include "../Globals/Settings.h" -#include "../Globals/ESPEasyWiFiEvent.h" +#include "../../ESPEasy/net/Globals/ESPEasyWiFiEvent.h" // ******************************************************************************** // Web Interface handle other requests diff --git a/src/src/WebServer/ESPEasy_WebServer.cpp b/src/src/WebServer/ESPEasy_WebServer.cpp index a76a5a343..a59613e00 100644 --- a/src/src/WebServer/ESPEasy_WebServer.cpp +++ b/src/src/WebServer/ESPEasy_WebServer.cpp @@ -58,7 +58,7 @@ #include "../Globals/CPlugins.h" #include "../Globals/Device.h" -#include "../Globals/NetworkState.h" +#include "../../ESPEasy/net/Globals/NetworkState.h" #include "../Globals/SecuritySettings.h" #include "../Globals/Settings.h" diff --git a/src/src/WebServer/RootPage.cpp b/src/src/WebServer/RootPage.cpp index 534eade50..478380aa7 100644 --- a/src/src/WebServer/RootPage.cpp +++ b/src/src/WebServer/RootPage.cpp @@ -13,9 +13,9 @@ # include "../Commands/ExecuteCommand.h" # include "../ESPEasyCore/ESPEasyNetwork.h" # include "../Globals/ESPEasy_time.h" -# include "../Globals/ESPEasyWiFiEvent.h" +# include "../../ESPEasy/net/Globals/ESPEasyWiFiEvent.h" # include "../Globals/MainLoopCommand.h" -# include "../Globals/NetworkState.h" +#include "../../ESPEasy/net/Globals/NetworkState.h" # include "../Globals/Nodes.h" # include "../Globals/Settings.h" # include "../Globals/Statistics.h" diff --git a/src/src/WebServer/SetupPage.cpp b/src/src/WebServer/SetupPage.cpp index 44a42a247..d90646707 100644 --- a/src/src/WebServer/SetupPage.cpp +++ b/src/src/WebServer/SetupPage.cpp @@ -15,8 +15,8 @@ # include "../../ESPEasy/net/wifi/ESPEasyWifi.h" #include "../../ESPEasy/net/wifi/ESPEasyWifi_abstracted.h" -# include "../Globals/ESPEasyWiFiEvent.h" -# include "../Globals/NetworkState.h" +# include "../../ESPEasy/net/Globals/ESPEasyWiFiEvent.h" +#include "../../ESPEasy/net/Globals/NetworkState.h" # include "../Globals/RTC.h" # include "../Globals/Settings.h" # include "../Globals/SecuritySettings.h" diff --git a/src/src/WebServer/SysInfoPage.cpp b/src/src/WebServer/SysInfoPage.cpp index 2f4131244..6bbad38df 100644 --- a/src/src/WebServer/SysInfoPage.cpp +++ b/src/src/WebServer/SysInfoPage.cpp @@ -24,8 +24,8 @@ # include "../Globals/CRCValues.h" # include "../Globals/ESPEasy_time.h" -# include "../Globals/ESPEasyWiFiEvent.h" -# include "../Globals/NetworkState.h" +# include "../../ESPEasy/net/Globals/ESPEasyWiFiEvent.h" +#include "../../ESPEasy/net/Globals/NetworkState.h" # include "../Globals/RTC.h" # include "../Globals/Settings.h" From 62b6ecee697ac884a90ad48fb5efe7b6ed5a0bb8 Mon Sep 17 00:00:00 2001 From: TD-er Date: Sun, 27 Jul 2025 13:54:03 +0200 Subject: [PATCH 147/564] [Network] Move more WiFi related code into ESPEasy::net::wifi namespace --- src/ESPEasy/net/DataStructs/WiFiEventData.cpp | 77 +++--- src/ESPEasy/net/DataStructs/WiFiEventData.h | 77 +++--- src/ESPEasy/net/Globals/ESPEasyWiFi.cpp | 8 +- src/ESPEasy/net/Globals/ESPEasyWiFi.h | 10 +- src/ESPEasy/net/Globals/ESPEasyWiFiEvent.cpp | 8 +- src/ESPEasy/net/Globals/ESPEasyWiFiEvent.h | 28 +- src/ESPEasy/net/_NW001_WiFi_STA.cpp | 2 +- src/ESPEasy/net/_NW002_WiFi_AP.cpp | 4 +- src/ESPEasy/net/_NW003_ETH_RMII.cpp | 2 +- src/ESPEasy/net/_NW004_ETH_SPI.cpp | 2 +- src/ESPEasy/net/_NW005_PPP_modem.cpp | 2 +- .../net/wifi/ESPEasyWiFiEvent_ESP32.cpp | 121 +++++---- src/ESPEasy/net/wifi/ESPEasyWiFiEvent_ESP32.h | 18 +- .../net/wifi/ESPEasyWiFiEvent_ESP8266.cpp | 8 + .../net/wifi/ESPEasyWiFiEvent_ESP8266.h | 23 +- .../net/wifi/ESPEasyWiFi_state_machine.cpp | 23 +- src/ESPEasy/net/wifi/ESPEasyWifi.cpp | 243 ++++-------------- src/ESPEasy/net/wifi/ESPEasyWifi.h | 42 ++- .../net/wifi/ESPEasyWifi_ProcessEvent.cpp | 121 +++++---- .../net/wifi/ESPEasyWifi_ProcessEvent.h | 14 +- .../net/wifi/ESPEasyWifi_abstracted.cpp | 171 ++++++++---- src/ESPEasy/net/wifi/ESPEasyWifi_abstracted.h | 81 +++--- .../net/wifi/ESPEasyWifi_abstracted_ESP32.cpp | 201 ++++++++------- .../wifi/ESPEasyWifi_abstracted_ESP8266.cpp | 67 +++-- .../net/wifi/WiFiConnectionProtocol.cpp | 20 +- src/ESPEasy/net/wifi/WiFiConnectionProtocol.h | 31 ++- src/ESPEasy/net/wifi/WiFiDisconnectReason.h | 29 ++- src/_P075_Nextion.ino | 2 +- src/src/Commands/WiFi.cpp | 6 +- .../ESPEasyCore/ESPEasyEth_ProcessEvent.cpp | 2 +- src/src/ESPEasyCore/ESPEasyNetwork.cpp | 3 +- src/src/ESPEasyCore/ESPEasyNetwork_ESP32.cpp | 4 +- .../ESPEasyCore/ESPEasyNetwork_ESP8266.cpp | 6 +- src/src/ESPEasyCore/ESPEasy_loop.cpp | 4 +- src/src/ESPEasyCore/ESPEasy_setup.cpp | 6 +- src/src/Helpers/ESPEasy_FactoryDefault.cpp | 2 +- src/src/Helpers/ESPEasy_Storage.cpp | 10 +- src/src/Helpers/Network.cpp | 2 +- src/src/Helpers/Networking.cpp | 2 +- src/src/Helpers/PeriodicalActions.cpp | 17 +- src/src/Helpers/StringProvider.cpp | 4 +- src/src/Helpers/_CPlugin_DomoticzHelper.cpp | 2 +- src/src/WebServer/AccessControl.cpp | 2 +- src/src/WebServer/AdvancedConfigPage.cpp | 2 +- src/src/WebServer/ESPEasy_WebServer.cpp | 2 +- src/src/WebServer/SetupPage.cpp | 6 +- src/src/WebServer/SysInfoPage.cpp | 6 +- src/src/WebServer/WiFiScanner.cpp | 2 +- 48 files changed, 800 insertions(+), 725 deletions(-) diff --git a/src/ESPEasy/net/DataStructs/WiFiEventData.cpp b/src/ESPEasy/net/DataStructs/WiFiEventData.cpp index c2076ad6f..29b27dd50 100644 --- a/src/ESPEasy/net/DataStructs/WiFiEventData.cpp +++ b/src/ESPEasy/net/DataStructs/WiFiEventData.cpp @@ -1,31 +1,33 @@ #include "../DataStructs/WiFiEventData.h" -#include "../../../src/ESPEasyCore/ESPEasy_Log.h" +#if FEATURE_WIFI -#include "../../../src/Globals/RTC.h" -#include "../../../src/Globals/Settings.h" -#include "../../../src/Globals/WiFi_AP_Candidates.h" +# include "../../../src/ESPEasyCore/ESPEasy_Log.h" -#include "../../../src/Helpers/ESPEasy_Storage.h" -#include "../../../src/Helpers/Networking.h" +# include "../../../src/Globals/RTC.h" +# include "../../../src/Globals/Settings.h" +# include "../../../src/Globals/WiFi_AP_Candidates.h" -#include "../../../src/Helpers/StringConverter.h" +# include "../../../src/Helpers/ESPEasy_Storage.h" +# include "../../../src/Helpers/Networking.h" + +# include "../../../src/Helpers/StringConverter.h" -#define WIFI_RECONNECT_WAIT 30000 // in milliSeconds +# define WIFI_RECONNECT_WAIT 30000 // in milliSeconds -#define CONNECT_TIMEOUT_MAX 4000 // in milliSeconds +# define CONNECT_TIMEOUT_MAX 4000 // in milliSeconds -#if FEATURE_USE_IPV6 -# include +# if FEATURE_USE_IPV6 +# include // ----------------------------------------------------------------------------------------------------------------------- // ---------------------------------------------------- Private functions ------------------------------------------------ // ----------------------------------------------------------------------------------------------------------------------- esp_netif_t* get_esp_interface_netif(esp_interface_t interface); -#endif // if FEATURE_USE_IPV6 +# endif // if FEATURE_USE_IPV6 bool WiFiEventData_t::WiFiConnectAllowed() const { if (WiFi.status() == WL_IDLE_STATUS) { @@ -61,9 +63,9 @@ bool WiFiEventData_t::WiFiConnectAllowed() const { bool WiFiEventData_t::unprocessedWifiEvents() const { if (processedConnect && processedDisconnect && processedGotIP && processedDHCPTimeout -#if FEATURE_USE_IPV6 +# if FEATURE_USE_IPV6 && processedGotIP6 -#endif +# endif ) { return false; @@ -121,9 +123,9 @@ void WiFiEventData_t::clear_processed_flags() { processedConnect = true; processedDisconnect = true; processedGotIP = true; - #if FEATURE_USE_IPV6 + # if FEATURE_USE_IPV6 processedGotIP6 = true; - #endif + # endif processedDHCPTimeout = true; processedConnectAPmode = true; processedDisconnectAPmode = true; @@ -151,9 +153,9 @@ void WiFiEventData_t::setWiFiDisconnected() { wifiStatus = ESPEASY_WIFI_DISCONNECTED; last_wifi_connect_attempt_moment.clear(); wifiConnectInProgress = false; -#if FEATURE_ESPEASY_P2P +# if FEATURE_ESPEASY_P2P updateUDPport(true); -#endif +# endif } @@ -185,9 +187,10 @@ void WiFiEventData_t::setWiFiServicesInitialized() { } if (/*!unprocessedWifiEvents() && */ WiFiConnected() && WiFiGotIP()) { - #ifndef BUILD_NO_DEBUG -// addLog(LOG_LEVEL_DEBUG, F("WiFi : WiFi services initialized")); - #endif + # ifndef BUILD_NO_DEBUG + + // addLog(LOG_LEVEL_DEBUG, F("WiFi : WiFi services initialized")); + # endif // ifndef BUILD_NO_DEBUG bitSet(wifiStatus, ESPEASY_WIFI_SERVICES_INITIALIZED); wifiConnectInProgress = false; wifiConnectAttemptNeeded = false; @@ -199,9 +202,9 @@ void WiFiEventData_t::setWiFiServicesInitialized() { if (valid_DNS_address(WiFi.dnsIP(1))) { dns1_cache = WiFi.dnsIP(1); } -#if FEATURE_ESPEASY_P2P +# if FEATURE_ESPEASY_P2P updateUDPport(false); -#endif +# endif } } @@ -232,14 +235,14 @@ void WiFiEventData_t::markGotIP(const IPAddress& ip, const IPAddress& netmask, c markGotIP(); } -#if FEATURE_USE_IPV6 +# if FEATURE_USE_IPV6 void WiFiEventData_t::markGotIPv6(const IPAddress& ip6) { processedGotIP6 = false; unprocessed_IP6 = ip6; } -#endif // if FEATURE_USE_IPV6 +# endif // if FEATURE_USE_IPV6 void WiFiEventData_t::markLostIP() { bitClear(wifiStatus, ESPEASY_WIFI_GOT_IP); @@ -290,12 +293,12 @@ void WiFiEventData_t::markConnected(const String& ssid, const uint8_t bssid[6], RTC.lastBSSID[i] = bssid[i]; } } -#if FEATURE_USE_IPV6 +# if FEATURE_USE_IPV6 if (Settings.EnableIPv6()) { WiFi.enableIPv6(true); } -#endif // if FEATURE_USE_IPV6 +# endif // if FEATURE_USE_IPV6 } void WiFiEventData_t::markConnectedAPmode(const uint8_t mac[6]) { @@ -339,7 +342,7 @@ uint32_t WiFiEventData_t::getSuggestedTimeout(int index, uint32_t minimum_timeou return constrain(res, minimum_timeout, CONNECT_TIMEOUT_MAX); } -#ifdef ESP8266 +# ifdef ESP8266 bool WiFiEventData_t::WiFiDisconnected() const { return wifiStatus == ESPEASY_WIFI_DISCONNECTED; @@ -357,9 +360,9 @@ bool WiFiEventData_t::WiFiServicesInitialized() const { return bitRead(wifiStatus, ESPEASY_WIFI_SERVICES_INITIALIZED); } -#endif // ifdef ESP8266 +# endif // ifdef ESP8266 -#ifdef ESP32 +# ifdef ESP32 bool WiFiEventData_t::WiFiDisconnected() const { return !WiFi.STA.connected(); @@ -369,13 +372,13 @@ bool WiFiEventData_t::WiFiGotIP() const { return WiFi.STA.hasIP(); } -# if FEATURE_USE_IPV6 +# if FEATURE_USE_IPV6 bool WiFiEventData_t::WiFiGotIPv6() const { return WiFi.STA.hasGlobalIPv6(); } -# endif // if FEATURE_USE_IPV6 +# endif // if FEATURE_USE_IPV6 bool WiFiEventData_t::WiFiConnected() const { return WiFi.STA.connected(); @@ -383,11 +386,13 @@ bool WiFiEventData_t::WiFiConnected() const { bool WiFiEventData_t::WiFiServicesInitialized() const { return WiFiConnected() && -# if FEATURE_USE_IPV6 +# if FEATURE_USE_IPV6 (WiFiGotIP() || WiFi.STA.hasGlobalIPv6() || WiFi.STA.hasLinkLocalIPv6()); -# else +# else WiFiGotIP(); -# endif // if FEATURE_USE_IPV6 +# endif // if FEATURE_USE_IPV6 } - #endif // ifdef ESP32 +# endif // ifdef ESP32 + +#endif // if FEATURE_WIFI diff --git a/src/ESPEasy/net/DataStructs/WiFiEventData.h b/src/ESPEasy/net/DataStructs/WiFiEventData.h index 484669863..a2118103b 100644 --- a/src/ESPEasy/net/DataStructs/WiFiEventData.h +++ b/src/ESPEasy/net/DataStructs/WiFiEventData.h @@ -1,36 +1,40 @@ #pragma once -#include "../../../src/DataStructs/MAC_address.h" -#include "../wifi/WiFiDisconnectReason.h" -#include "../../../src/Helpers/LongTermTimer.h" +#include "../../../ESPEasy_common.h" + +#if FEATURE_WIFI + +# include "../../../src/DataStructs/MAC_address.h" +# include "../wifi/WiFiDisconnectReason.h" +# include "../../../src/Helpers/LongTermTimer.h" -#ifdef ESP32 -# include -# include -# include +# ifdef ESP32 +# include +# include +# include -#endif // ifdef ESP32 +# endif // ifdef ESP32 -#include +# include -#ifdef ESP8266 -# include -# include -#endif // ifdef ESP8266 +# ifdef ESP8266 +# include +# include +# endif // ifdef ESP8266 -#include +# include // WifiStatus -#define ESPEASY_WIFI_DISCONNECTED 0 +# define ESPEASY_WIFI_DISCONNECTED 0 // Bit numbers for WiFi status -#define ESPEASY_WIFI_CONNECTED 0 -#define ESPEASY_WIFI_GOT_IP 1 -#define ESPEASY_WIFI_SERVICES_INITIALIZED 2 +# define ESPEASY_WIFI_CONNECTED 0 +# define ESPEASY_WIFI_GOT_IP 1 +# define ESPEASY_WIFI_SERVICES_INITIALIZED 2 -#define WIFI_PROCESS_EVENTS_TIMEOUT 20000 // in milliSeconds +# define WIFI_PROCESS_EVENTS_TIMEOUT 20000 // in milliSeconds struct WiFiEventData_t { bool WiFiConnectAllowed() const; @@ -44,24 +48,26 @@ struct WiFiEventData_t { bool WiFiDisconnected() const; bool WiFiGotIP() const; -#if FEATURE_USE_IPV6 +# if FEATURE_USE_IPV6 bool WiFiGotIPv6() const; -#endif +# endif bool WiFiConnected() const; bool WiFiServicesInitialized() const; - void setWiFiDisconnected(); - void setWiFiGotIP(); - void setWiFiConnected(); - void setWiFiServicesInitialized(); + void setWiFiDisconnected(); + void setWiFiGotIP(); + void setWiFiConnected(); + void setWiFiServicesInitialized(); - void markGotIP(); - void markGotIP(const IPAddress& ip, const IPAddress& netmask, const IPAddress& gw); + void markGotIP(); + void markGotIP(const IPAddress& ip, + const IPAddress& netmask, + const IPAddress& gw); -#if FEATURE_USE_IPV6 +# if FEATURE_USE_IPV6 void markGotIPv6(const IPAddress& ip6); -#endif +# endif void markLostIP(); void markDisconnect(WiFiDisconnectReason reason); void markConnected(const String& ssid, @@ -114,9 +120,9 @@ struct WiFiEventData_t { IPAddress dns0_cache; IPAddress dns1_cache; - #if FEATURE_USE_IPV6 + # if FEATURE_USE_IPV6 IPAddress unprocessed_IP6; - #endif + # endif // processDisconnect() may clear all WiFi settings, resulting in clearing processedDisconnect @@ -128,9 +134,9 @@ struct WiFiEventData_t { bool processedConnect = true; bool processedDisconnect = true; bool processedGotIP = true; - #if FEATURE_USE_IPV6 + # if FEATURE_USE_IPV6 bool processedGotIP6 = true; - #endif + # endif bool processedDHCPTimeout = true; bool processedConnectAPmode = true; bool processedDisconnectAPmode = true; @@ -145,9 +151,10 @@ struct WiFiEventData_t { std::mapconnectDurations; -#ifdef ESP32 +# ifdef ESP32 WiFiEventId_t wm_event_id = 0; -#endif // ifdef ESP32 +# endif // ifdef ESP32 }; +#endif // if FEATURE_WIFI diff --git a/src/ESPEasy/net/Globals/ESPEasyWiFi.cpp b/src/ESPEasy/net/Globals/ESPEasyWiFi.cpp index b4ab40207..abd327056 100644 --- a/src/ESPEasy/net/Globals/ESPEasyWiFi.cpp +++ b/src/ESPEasy/net/Globals/ESPEasyWiFi.cpp @@ -1,5 +1,7 @@ #include "../Globals/ESPEasyWiFi.h" -#ifdef ESPEASY_WIFI_CLEANUP_WORK_IN_PROGRESS -ESPEasyWiFi_t ESPEasyWiFi; -#endif // ifdef ESPEASY_WIFI_CLEANUP_WORK_IN_PROGRESS +#if FEATURE_WIFI + +ESPEasy::net::wifi::ESPEasyWiFi_t ESPEasyWiFi; + +#endif \ No newline at end of file diff --git a/src/ESPEasy/net/Globals/ESPEasyWiFi.h b/src/ESPEasy/net/Globals/ESPEasyWiFi.h index 5a15da0a9..a91112a76 100644 --- a/src/ESPEasy/net/Globals/ESPEasyWiFi.h +++ b/src/ESPEasy/net/Globals/ESPEasyWiFi.h @@ -1,11 +1,11 @@ #pragma once -#include "../wifi/ESPEasyWifi.h" - #include "../../../ESPEasy_common.h" -#ifdef ESPEASY_WIFI_CLEANUP_WORK_IN_PROGRESS +#if FEATURE_WIFI -extern ESPEasyWiFi_t ESPEasyWiFi; -#endif // ifdef ESPEASY_WIFI_CLEANUP_WORK_IN_PROGRESS +#include "../wifi/ESPEasyWifi.h" +#include "../wifi/ESPEasyWiFi_state_machine.h" +extern ESPEasy::net::wifi::ESPEasyWiFi_t ESPEasyWiFi; +#endif \ No newline at end of file diff --git a/src/ESPEasy/net/Globals/ESPEasyWiFiEvent.cpp b/src/ESPEasy/net/Globals/ESPEasyWiFiEvent.cpp index b4cd3b894..e6a7cacff 100644 --- a/src/ESPEasy/net/Globals/ESPEasyWiFiEvent.cpp +++ b/src/ESPEasy/net/Globals/ESPEasyWiFiEvent.cpp @@ -2,8 +2,9 @@ #include "../../../ESPEasy_common.h" +#if FEATURE_WIFI -#ifdef ESP8266 +# ifdef ESP8266 WiFiEventHandler stationConnectedHandler; WiFiEventHandler stationDisconnectedHandler; WiFiEventHandler stationGotIpHandler; @@ -11,9 +12,8 @@ WiFiEventHandler stationModeDHCPTimeoutHandler; WiFiEventHandler stationModeAuthModeChangeHandler; WiFiEventHandler APModeStationConnectedHandler; WiFiEventHandler APModeStationDisconnectedHandler; -#endif // ifdef ESP8266 +# endif // ifdef ESP8266 WiFiEventData_t WiFiEventData; -ESPEasy::net::wifi::ESPEasyWiFi_t ESPEasyWiFi; - +#endif // if FEATURE_WIFI diff --git a/src/ESPEasy/net/Globals/ESPEasyWiFiEvent.h b/src/ESPEasy/net/Globals/ESPEasyWiFiEvent.h index b10394b8b..68bda1ca0 100644 --- a/src/ESPEasy/net/Globals/ESPEasyWiFiEvent.h +++ b/src/ESPEasy/net/Globals/ESPEasyWiFiEvent.h @@ -2,25 +2,25 @@ #include "../../../ESPEasy_common.h" -#include "../wifi/ESPEasyWiFi_state_machine.h" +#if FEATURE_WIFI -#include "../DataStructs/WiFiEventData.h" +# include "../DataStructs/WiFiEventData.h" -#include -#include +# include +# include -#ifdef ESP32 -# include -# include -# include +# ifdef ESP32 +# include +# include +# include -#endif // ifdef ESP32 +# endif // ifdef ESP32 -#ifdef ESP8266 -# include -# include +# ifdef ESP8266 +# include +# include class IPAddress; extern WiFiEventHandler stationConnectedHandler; @@ -30,10 +30,10 @@ extern WiFiEventHandler stationModeDHCPTimeoutHandler; extern WiFiEventHandler stationModeAuthModeChangeHandler; extern WiFiEventHandler APModeStationConnectedHandler; extern WiFiEventHandler APModeStationDisconnectedHandler; -#endif // ifdef ESP8266 +# endif // ifdef ESP8266 extern WiFiEventData_t WiFiEventData; -extern ESPEasy::net::wifi::ESPEasyWiFi_t ESPEasyWiFi; +#endif // if FEATURE_WIFI diff --git a/src/ESPEasy/net/_NW001_WiFi_STA.cpp b/src/ESPEasy/net/_NW001_WiFi_STA.cpp index a1a618fb0..11d0adbb6 100644 --- a/src/ESPEasy/net/_NW001_WiFi_STA.cpp +++ b/src/ESPEasy/net/_NW001_WiFi_STA.cpp @@ -28,7 +28,7 @@ # include "../net/Helpers/_NWPlugin_init.h" # include "../net/NWPluginStructs/NW001_WiFi_STA.h" # include "../net/wifi/ESPEasyWifi.h" -# include "../net/wifi/ESPEasyWifi_abstracted.h" + # ifdef ESP32P4 # include diff --git a/src/ESPEasy/net/_NW002_WiFi_AP.cpp b/src/ESPEasy/net/_NW002_WiFi_AP.cpp index 69a2e9e4d..40f16878f 100644 --- a/src/ESPEasy/net/_NW002_WiFi_AP.cpp +++ b/src/ESPEasy/net/_NW002_WiFi_AP.cpp @@ -26,7 +26,7 @@ # include "../net/Globals/NWPlugins.h" # include "../net/Helpers/_NWPlugin_Helper_webform.h" # include "../net/Helpers/_NWPlugin_init.h" -# include "../net/wifi/ESPEasyWifi_abstracted.h" + // TODO TD-er: This code should be moved to this NW002 plugin @@ -160,7 +160,7 @@ bool NWPlugin_002(NWPlugin::Function function, EventStruct *event, String& strin case NWPlugin::Function::NWPLUGIN_INIT: { - setAPinternal(true); + ESPEasy::net::wifi::setAPinternal(true); // WiFi.AP.begin(); break; diff --git a/src/ESPEasy/net/_NW003_ETH_RMII.cpp b/src/ESPEasy/net/_NW003_ETH_RMII.cpp index 42e914f8d..0bfc37c2e 100644 --- a/src/ESPEasy/net/_NW003_ETH_RMII.cpp +++ b/src/ESPEasy/net/_NW003_ETH_RMII.cpp @@ -12,7 +12,7 @@ # include "../../src/DataStructs/ESPEasy_EventStruct.h" # include "../../src/ESPEasyCore/ESPEasyEth.h" -# include "../net/wifi/ESPEasyWifi_abstracted.h" + # include "../../src/Globals/SecuritySettings.h" # include "../../src/Globals/Settings.h" # include "../../src/Helpers/ESPEasy_Storage.h" diff --git a/src/ESPEasy/net/_NW004_ETH_SPI.cpp b/src/ESPEasy/net/_NW004_ETH_SPI.cpp index b2873ef28..a07803471 100644 --- a/src/ESPEasy/net/_NW004_ETH_SPI.cpp +++ b/src/ESPEasy/net/_NW004_ETH_SPI.cpp @@ -26,7 +26,7 @@ # include "../net/Globals/NWPlugins.h" # include "../net/Helpers/_NWPlugin_Helper_webform.h" # include "../net/Helpers/_NWPlugin_init.h" -# include "../net/wifi/ESPEasyWifi_abstracted.h" + # include diff --git a/src/ESPEasy/net/_NW005_PPP_modem.cpp b/src/ESPEasy/net/_NW005_PPP_modem.cpp index e3006bc00..0486c8518 100644 --- a/src/ESPEasy/net/_NW005_PPP_modem.cpp +++ b/src/ESPEasy/net/_NW005_PPP_modem.cpp @@ -28,7 +28,7 @@ # include "../net/Helpers/_NWPlugin_Helper_webform.h" # include "../net/Helpers/_NWPlugin_init.h" # include "../net/NWPluginStructs/NW005_data_struct_PPP_modem.h" -# include "../net/wifi/ESPEasyWifi_abstracted.h" + # include diff --git a/src/ESPEasy/net/wifi/ESPEasyWiFiEvent_ESP32.cpp b/src/ESPEasy/net/wifi/ESPEasyWiFiEvent_ESP32.cpp index a699b8b39..6d8c51c91 100644 --- a/src/ESPEasy/net/wifi/ESPEasyWiFiEvent_ESP32.cpp +++ b/src/ESPEasy/net/wifi/ESPEasyWiFiEvent_ESP32.cpp @@ -1,36 +1,42 @@ #include "../wifi/ESPEasyWiFiEvent_ESP32.h" -#ifdef ESP32 -# if FEATURE_ETHERNET -# include -# endif // if FEATURE_ETHERNET -# if FEATURE_PPP_MODEM -# include -# endif +#if FEATURE_WIFI -# include "../../../src/DataStructs/RTCStruct.h" +# ifdef ESP32 +# if FEATURE_ETHERNET +# include +# endif // if FEATURE_ETHERNET +# if FEATURE_PPP_MODEM +# include +# endif -# include "../../../src/DataTypes/ESPEasyTimeSource.h" +# include "../../../src/DataStructs/RTCStruct.h" -# include "../../../src/ESPEasyCore/ESPEasyEth.h" -# include "../../../src/ESPEasyCore/ESPEasy_Log.h" -# include "../../../src/ESPEasyCore/ESPEasyNetwork.h" +# include "../../../src/DataTypes/ESPEasyTimeSource.h" -# include "../wifi/ESPEasyWifi.h" -# include "../wifi/ESPEasyWifi_ProcessEvent.h" +# include "../../../src/ESPEasyCore/ESPEasyEth.h" +# include "../../../src/ESPEasyCore/ESPEasy_Log.h" +# include "../../../src/ESPEasyCore/ESPEasyNetwork.h" -# include "../Globals/ESPEasyWiFiEvent.h" -# include "../Globals/NetworkState.h" -# include "../../../src/Globals/RTC.h" -# include "../../../src/Globals/WiFi_AP_Candidates.h" +# include "../wifi/ESPEasyWifi.h" +# include "../wifi/ESPEasyWifi_ProcessEvent.h" -# include "../../../src/Helpers/ESPEasy_time_calc.h" -# include "../../../src/Helpers/StringConverter.h" +# include "../Globals/ESPEasyWiFiEvent.h" +# include "../Globals/NetworkState.h" +# include "../../../src/Globals/RTC.h" +# include "../../../src/Globals/WiFi_AP_Candidates.h" + +# include "../../../src/Helpers/ESPEasy_time_calc.h" +# include "../../../src/Helpers/StringConverter.h" -# if FEATURE_ETHERNET -# include "../Globals/ESPEasyEthEvent.h" -# endif // if FEATURE_ETHERNET +# if FEATURE_ETHERNET +# include "../Globals/ESPEasyEthEvent.h" +# endif // if FEATURE_ETHERNET + +namespace ESPEasy { +namespace net { +namespace wifi { void setUseStaticIP(bool enabled) {} @@ -38,7 +44,7 @@ void setUseStaticIP(bool enabled) {} // Functions called on events. // Make sure not to call anything in these functions that result in delay() or yield() // ******************************************************************************** -# include +# include static bool ignoreDisconnectEvent = false; @@ -49,39 +55,39 @@ void WiFiEvent(WiFiEvent_t event_id, arduino_event_info_t info) { // ESP32 WiFi ready break; case ARDUINO_EVENT_WIFI_STA_START: - # ifndef BUILD_NO_DEBUG + # ifndef BUILD_NO_DEBUG // addLog(LOG_LEVEL_INFO, F("WiFi : Event STA Started")); - # endif // ifndef BUILD_NO_DEBUG + # endif // ifndef BUILD_NO_DEBUG break; case ARDUINO_EVENT_WIFI_STA_STOP: - # ifndef BUILD_NO_DEBUG + # ifndef BUILD_NO_DEBUG // addLog(LOG_LEVEL_INFO, F("WiFi : Event STA Stopped")); - # endif // ifndef BUILD_NO_DEBUG + # endif // ifndef BUILD_NO_DEBUG break; case ARDUINO_EVENT_WIFI_OFF: - # ifndef BUILD_NO_DEBUG + # ifndef BUILD_NO_DEBUG // addLog(LOG_LEVEL_INFO, F("WiFi : Event WIFI off")); - # endif // ifndef BUILD_NO_DEBUG + # endif // ifndef BUILD_NO_DEBUG break; case ARDUINO_EVENT_WIFI_AP_START: - # ifndef BUILD_NO_DEBUG + # ifndef BUILD_NO_DEBUG // addLog(LOG_LEVEL_INFO, F("WiFi : Event AP Started")); - # endif // ifndef BUILD_NO_DEBUG + # endif // ifndef BUILD_NO_DEBUG break; case ARDUINO_EVENT_WIFI_AP_STOP: - # ifndef BUILD_NO_DEBUG + # ifndef BUILD_NO_DEBUG // addLog(LOG_LEVEL_INFO, F("WiFi : Event AP Stopped")); - # endif // ifndef BUILD_NO_DEBUG + # endif // ifndef BUILD_NO_DEBUG break; case ARDUINO_EVENT_WIFI_STA_LOST_IP: // ESP32 station lost IP and the IP is reset to 0 - # if FEATURE_ETHERNET + # if FEATURE_ETHERNET if (active_network_medium == NetworkMedium_t::Ethernet) { // DNS records are shared among WiFi and Ethernet (very bad design!) @@ -89,9 +95,9 @@ void WiFiEvent(WiFiEvent_t event_id, arduino_event_info_t info) { // As soon as WiFi is turned off, the DNS entry for Ethernet is cleared. EthEventData.markLostIP(); } - # endif // if FEATURE_ETHERNET + # endif // if FEATURE_ETHERNET WiFiEventData.markLostIP(); - # ifndef BUILD_NO_DEBUG + # ifndef BUILD_NO_DEBUG // addLog(LOG_LEVEL_INFO, @@ -101,16 +107,16 @@ void WiFiEvent(WiFiEvent_t event_id, arduino_event_info_t info) { */ // F("WiFi : Event Lost IP")); - # endif // ifndef BUILD_NO_DEBUG + # endif // ifndef BUILD_NO_DEBUG break; case ARDUINO_EVENT_WIFI_AP_PROBEREQRECVED: // Receive probe request packet in soft-AP interface // TODO TD-er: Must implement like onProbeRequestAPmode for ESP8266 - # ifndef BUILD_NO_DEBUG + # ifndef BUILD_NO_DEBUG // addLog(LOG_LEVEL_INFO, F("WiFi : Event AP got probed")); - # endif // ifndef BUILD_NO_DEBUG + # endif // ifndef BUILD_NO_DEBUG break; case ARDUINO_EVENT_WIFI_STA_AUTHMODE_CHANGE: @@ -142,7 +148,7 @@ void WiFiEvent(WiFiEvent_t event_id, arduino_event_info_t info) { WiFiEventData.markGotIP(ip, netmask, gw); break; } - # if FEATURE_USE_IPV6 + # if FEATURE_USE_IPV6 case ARDUINO_EVENT_WIFI_STA_GOT_IP6: { ip_event_got_ip6_t *event = static_cast(&info.got_ip6); @@ -153,7 +159,7 @@ void WiFiEvent(WiFiEvent_t event_id, arduino_event_info_t info) { case ARDUINO_EVENT_WIFI_AP_GOT_IP6: addLog(LOG_LEVEL_INFO, F("WIFI : AP got IP6")); break; - # endif // if FEATURE_USE_IPV6 + # endif // if FEATURE_USE_IPV6 case ARDUINO_EVENT_WIFI_AP_STAIPASSIGNED: addLog(LOG_LEVEL_INFO, F("WIFI : AP assigned IP to STA")); break; @@ -166,7 +172,7 @@ void WiFiEvent(WiFiEvent_t event_id, arduino_event_info_t info) { case ARDUINO_EVENT_WIFI_SCAN_DONE: WiFiEventData.processedScanDone = false; break; -# if FEATURE_ETHERNET +# if FEATURE_ETHERNET case ARDUINO_EVENT_ETH_START: case ARDUINO_EVENT_ETH_CONNECTED: case ARDUINO_EVENT_ETH_GOT_IP: @@ -176,16 +182,20 @@ void WiFiEvent(WiFiEvent_t event_id, arduino_event_info_t info) { // Handled in EthEvent break; -# endif // FEATURE_ETHERNET +# endif // FEATURE_ETHERNET -#if FEATURE_PPP_MODEM - case ARDUINO_EVENT_PPP_START: addLog(LOG_LEVEL_INFO, F("PPP Started")); break; - case ARDUINO_EVENT_PPP_CONNECTED: addLog(LOG_LEVEL_INFO, F("PPP Connected")); break; +# if FEATURE_PPP_MODEM + case ARDUINO_EVENT_PPP_START: addLog(LOG_LEVEL_INFO, F("PPP Started")); + break; + case ARDUINO_EVENT_PPP_CONNECTED: addLog(LOG_LEVEL_INFO, F("PPP Connected")); + break; case ARDUINO_EVENT_PPP_GOT_IP: - addLog(LOG_LEVEL_INFO, F("PPP Got IP")); + addLog(LOG_LEVEL_INFO, F("PPP Got IP")); PPP.setDefault(); - if (WiFi.AP.enableNAPT(true)) - addLog(LOG_LEVEL_INFO, F("WiFi.AP.enableNAPT")); + + if (WiFi.AP.enableNAPT(true)) { + addLog(LOG_LEVEL_INFO, F("WiFi.AP.enableNAPT")); + } break; case ARDUINO_EVENT_PPP_LOST_IP: addLog(LOG_LEVEL_INFO, F("PPP Lost IP")); @@ -195,9 +205,10 @@ void WiFiEvent(WiFiEvent_t event_id, arduino_event_info_t info) { addLog(LOG_LEVEL_INFO, F("PPP Disconnected")); WiFi.AP.enableNAPT(false); break; - case ARDUINO_EVENT_PPP_STOP: addLog(LOG_LEVEL_INFO, F("PPP Stopped")); break; + case ARDUINO_EVENT_PPP_STOP: addLog(LOG_LEVEL_INFO, F("PPP Stopped")); + break; -#endif +# endif // if FEATURE_PPP_MODEM default: { @@ -207,4 +218,8 @@ void WiFiEvent(WiFiEvent_t event_id, arduino_event_info_t info) { } } -#endif // ifdef ESP32 +} +} +} +# endif // ifdef ESP32 +#endif // if FEATURE_WIFI diff --git a/src/ESPEasy/net/wifi/ESPEasyWiFiEvent_ESP32.h b/src/ESPEasy/net/wifi/ESPEasyWiFiEvent_ESP32.h index 08598aaad..6868704af 100644 --- a/src/ESPEasy/net/wifi/ESPEasyWiFiEvent_ESP32.h +++ b/src/ESPEasy/net/wifi/ESPEasyWiFiEvent_ESP32.h @@ -1,10 +1,10 @@ -#ifndef ESPEASY_WIFI_EVENT_ESP32_H -#define ESPEASY_WIFI_EVENT_ESP32_H - -#ifdef ESP32 +#pragma once # include "../../../ESPEasy_common.h" +#if FEATURE_WIFI +#ifdef ESP32 + # include // ******************************************************************************** @@ -17,6 +17,9 @@ # include # include +namespace ESPEasy { +namespace net { +namespace wifi { class WiFi_Access_Static_IP : public WiFiSTAClass { @@ -35,6 +38,9 @@ void setUseStaticIP(bool enabled); void WiFiEvent(WiFiEvent_t event, arduino_event_info_t info); -#endif // ifdef ESP32 +} +} +} -#endif // ifndef ESPEASY_WIFI_EVENT_ESP32_H +#endif // ifdef ESP32 +#endif diff --git a/src/ESPEasy/net/wifi/ESPEasyWiFiEvent_ESP8266.cpp b/src/ESPEasy/net/wifi/ESPEasyWiFiEvent_ESP8266.cpp index 6561f9d7d..5c5e30841 100644 --- a/src/ESPEasy/net/wifi/ESPEasyWiFiEvent_ESP8266.cpp +++ b/src/ESPEasy/net/wifi/ESPEasyWiFiEvent_ESP8266.cpp @@ -20,6 +20,10 @@ # include "../../../src/Helpers/ESPEasy_time_calc.h" +namespace ESPEasy { +namespace net { +namespace wifi { + void WiFi_Access_Static_IP::set_use_static_ip(bool enabled) { _useStaticIp = enabled; } void setUseStaticIP(bool enabled) { @@ -108,5 +112,9 @@ void onWiFiScanDone(void *arg, STATUS status) { # endif // if FEATURE_ESP8266_DIRECT_WIFI_SCAN +} +} +} + # endif // ifdef ESP8266 #endif // if FEATURE_WIFI diff --git a/src/ESPEasy/net/wifi/ESPEasyWiFiEvent_ESP8266.h b/src/ESPEasy/net/wifi/ESPEasyWiFiEvent_ESP8266.h index f1bd4223a..c21a5efe6 100644 --- a/src/ESPEasy/net/wifi/ESPEasyWiFiEvent_ESP8266.h +++ b/src/ESPEasy/net/wifi/ESPEasyWiFiEvent_ESP8266.h @@ -1,12 +1,12 @@ -#ifndef ESPEASY_WIFI_EVENT_ESP8266_H -#define ESPEASY_WIFI_EVENT_ESP8266_H +#pragma once -#ifdef ESP8266 +#include "../../../ESPEasy_common.h" + +#if FEATURE_WIFI -# include "../../../ESPEasy_common.h" +# ifdef ESP8266 -# if FEATURE_WIFI # include @@ -19,6 +19,10 @@ # include # include +namespace ESPEasy { +namespace net { +namespace wifi { + class WiFi_Access_Static_IP : public ESP8266WiFiSTAClass { public: @@ -52,7 +56,10 @@ void onWiFiScanDone(void *arg, STATUS status); # endif // if FEATURE_ESP8266_DIRECT_WIFI_SCAN -# endif // if FEATURE_WIFI +} +} +} -#endif // ifdef ESP8266 -#endif // ifndef ESPEASY_WIFI_EVENT_ESP8266_H +# endif // ifdef ESP8266 + +#endif // if FEATURE_WIFI diff --git a/src/ESPEasy/net/wifi/ESPEasyWiFi_state_machine.cpp b/src/ESPEasy/net/wifi/ESPEasyWiFi_state_machine.cpp index 8f6044321..1ae8bbeec 100644 --- a/src/ESPEasy/net/wifi/ESPEasyWiFi_state_machine.cpp +++ b/src/ESPEasy/net/wifi/ESPEasyWiFi_state_machine.cpp @@ -2,22 +2,19 @@ #if FEATURE_WIFI -# include "../wifi/ESPEasyWifi.h" -# include "../wifi/ESPEasyWifi_abstracted.h" - - # include "../../../src/ESPEasyCore/ESPEasyNetwork.h" // for setNetworkMedium, however this should not be part of the WiFi code - # include "../../../src/ESPEasyCore/ESPEasy_Log.h" - -# include "../Globals/ESPEasyWiFiEvent.h" # include "../../../src/Globals/RTC.h" # include "../../../src/Globals/Settings.h" # include "../../../src/Globals/WiFi_AP_Candidates.h" - # include "../../../src/Helpers/StringConverter.h" # include "../../../src/Helpers/StringGenerator_WiFi.h" +# include "../Globals/ESPEasyWiFiEvent.h" +# include "../wifi/ESPEasyWifi.h" +# include "../wifi/ESPEasyWifi_abstracted.h" + + namespace ESPEasy { namespace net { namespace wifi { @@ -88,8 +85,7 @@ void ESPEasyWiFi_t::loop() // This is where we decide what to do next: // - Reconnect // - Scan - // - + // // Do we have candidate to connect to ? @@ -130,6 +126,7 @@ void ESPEasyWiFi_t::loop() { // -1 if scan not finished auto scanCompleteStatus = WiFi.scanComplete(); + if (scanCompleteStatus >= 0) { WiFi_AP_Candidates.load_knownCredentials(); # if !FEATURE_ESP8266_DIRECT_WIFI_SCAN @@ -209,7 +206,7 @@ bool ESPEasyWiFi_t::connected() const return getSTA_connected_state() == STA_connected_state::Connected; } -void ESPEasyWiFi_t::disconnect() { WiFi.disconnect(Settings.WiFiRestart_connection_lost()); } +void ESPEasyWiFi_t::disconnect() { doWiFiDisconnect(); } void ESPEasyWiFi_t::setState(WiFiState_e newState, uint32_t timeout) { if (loglevelActiveFor(LOG_LEVEL_INFO)) { @@ -335,7 +332,7 @@ bool ESPEasyWiFi_t::connectSTA() // WiFi.config(INADDR_NONE, INADDR_NONE, INADDR_NONE); # endif // if defined(ESP32) - setConnectionSpeed(); + doSetConnectionSpeed(); setupStaticIPconfig(); // Start the process of connecting or starting AP @@ -384,7 +381,7 @@ bool ESPEasyWiFi_t::connectSTA() # ifdef ESP32 if (Settings.IncludeHiddenSSID()) { - setWiFiCountryPolicyManual(); + doSetWiFiCountryPolicyManual(); } # endif // ifdef ESP32 diff --git a/src/ESPEasy/net/wifi/ESPEasyWifi.cpp b/src/ESPEasy/net/wifi/ESPEasyWifi.cpp index ec94788bd..6e69c95ab 100644 --- a/src/ESPEasy/net/wifi/ESPEasyWifi.cpp +++ b/src/ESPEasy/net/wifi/ESPEasyWifi.cpp @@ -5,12 +5,9 @@ # include "../../../ESPEasy-Globals.h" # include "../../../src/DataStructs/TimingStats.h" # include "../../../src/ESPEasyCore/ESPEasyNetwork.h" -# include "../wifi/ESPEasyWifi_ProcessEvent.h" # include "../../../src/ESPEasyCore/ESPEasy_Log.h" # include "../../../src/ESPEasyCore/Serial.h" -# include "../Globals/ESPEasyWiFiEvent.h" # include "../../../src/Globals/EventQueue.h" -# include "../Globals/NetworkState.h" # include "../../../src/Globals/Nodes.h" # include "../../../src/Globals/RTC.h" # include "../../../src/Globals/SecuritySettings.h" @@ -24,8 +21,10 @@ # include "../../../src/Helpers/StringConverter.h" # include "../../../src/Helpers/StringGenerator_WiFi.h" # include "../../../src/Helpers/StringProvider.h" - - +# include "../Globals/ESPEasyWiFi.h" +# include "../Globals/ESPEasyWiFiEvent.h" +# include "../Globals/NetworkState.h" +# include "../wifi/ESPEasyWifi_ProcessEvent.h" # include "../wifi/ESPEasyWifi_abstracted.h" @@ -33,13 +32,17 @@ # include # include // Needed to call ESP-IDF functions like esp_wifi_.... -#ifndef ESP32P4 -# include -#endif +# ifndef ESP32P4 +# include +# endif # endif // ifdef ESP32 +namespace ESPEasy { +namespace net { +namespace wifi { + // ******************************************************************************** // WiFi state // ******************************************************************************** @@ -99,7 +102,6 @@ */ - // ******************************************************************************** // Check WiFi connected status // This is basically the state machine to switch between states: @@ -136,7 +138,7 @@ void AttemptWiFiConnect() { // Set Wifi config // ******************************************************************************** bool prepareWiFi() { -// ESPEasyWiFi.setup(); + // ESPEasyWiFi.setup(); return true; } @@ -156,7 +158,7 @@ void resetWiFi() { // Send this log only after WifiDisconnect() or else sending to syslog may cause issues addLog(LOG_LEVEL_INFO, F("Reset WiFi.")); - // ESPEasy::net::wifi::setWifiMode(WIFI_OFF); + // setWifiMode(WIFI_OFF); initWiFi(); */ @@ -175,93 +177,15 @@ void SetWiFiTXpower() { SetWiFiTXpower(0); // Just some minimal value, will be adjusted in SetWiFiTXpower } -void SetWiFiTXpower(float dBm) { SetWiFiTXpower(dBm, WiFi.RSSI()); } +void SetWiFiTXpower(float dBm) { doSetWiFiTXpower(dBm, WiFi.RSSI()); } -void SetWiFiTXpower(float dBm, float rssi) { - const WiFiMode_t cur_mode = WiFi.getMode(); - - if (cur_mode == WIFI_OFF) { - return; - } - - if (Settings.UseMaxTXpowerForSending()) { - dBm = 30; // Just some max, will be limited later - } - - // Range ESP32 : -1dBm - 20dBm - // Range ESP8266: 0dBm - 20.5dBm - float maxTXpwr; - float threshold = GetRSSIthreshold(maxTXpwr); - # ifdef ESP8266 - float minTXpwr{}; - # endif - # ifdef ESP32 - float minTXpwr = -1.0f; - # endif - - threshold += Settings.WiFi_sensitivity_margin; // Margin in dBm on top of threshold - - // Assume AP sends with max set by ETSI standard. - // 2.4 GHz: 100 mWatt (20 dBm) - // US and some other countries allow 1000 mW (30 dBm) - // We cannot send with over 20 dBm, thus it makes no sense to force higher TX power all the time. - const float newrssi = rssi - 20; - - if (newrssi < threshold) { - minTXpwr = threshold - newrssi; - } - - if (minTXpwr > maxTXpwr) { - minTXpwr = maxTXpwr; - } - - if (dBm > maxTXpwr) { - dBm = maxTXpwr; - } else if (dBm < minTXpwr) { - dBm = minTXpwr; - } - - ESPEasy::net::wifi::SetWiFiTXpower(dBm); - - if (WiFiEventData.wifi_TX_pwr < dBm) { - // Will increase the TX power, give power supply of the unit some rest - delay(1); - } - - WiFiEventData.wifi_TX_pwr = dBm; - - delay(0); - # ifndef BUILD_NO_DEBUG - - if (loglevelActiveFor(LOG_LEVEL_DEBUG)) { - const int TX_pwr_int = WiFiEventData.wifi_TX_pwr * 4; - const int maxTXpwr_int = maxTXpwr * 4; - - if (TX_pwr_int != maxTXpwr_int) { - static int last_log = -1; - - if (TX_pwr_int != last_log) { - last_log = TX_pwr_int; - String log = strformat( - F("WiFi : Set TX power to %ddBm sensitivity: %ddBm"), - static_cast(dBm), - static_cast(threshold)); - - if (rssi < 0) { - log += strformat(F(" RSSI: %ddBm"), static_cast(rssi)); - } - addLogMove(LOG_LEVEL_DEBUG, log); - } - } - } - # endif // ifndef BUILD_NO_DEBUG -} +void SetWiFiTXpower(float dBm, float rssi) { doSetWiFiTXpower(dBm, rssi); } # endif // if FEATURE_SET_WIFI_TX_PWR float GetRSSIthreshold(float& maxTXpwr) { maxTXpwr = Settings.getWiFi_TX_power(); - return ESPEasy::net::wifi::GetRSSIthreshold(maxTXpwr); + return doGetRSSIthreshold(maxTXpwr); } int GetRSSI_quality() { @@ -274,16 +198,16 @@ int GetRSSI_quality() { return (rssi / 5) + 1; } -ESPEasy::net::wifi::WiFiConnectionProtocol getConnectionProtocol() { return ESPEasy::net::wifi::getConnectionProtocol(); } +WiFiConnectionProtocol getConnectionProtocol() { return doGetConnectionProtocol(); } # ifdef ESP32 -int64_t WiFi_get_TSF_time() { - # ifndef SOC_WIFI_SUPPORTED +int64_t WiFi_get_TSF_time() { + # ifndef SOC_WIFI_SUPPORTED return 0; - #else - return esp_wifi_get_tsf_time(WIFI_IF_STA); - #endif + # else + return esp_wifi_get_tsf_time(WIFI_IF_STA); + # endif // ifndef SOC_WIFI_SUPPORTED } # endif // ifdef ESP32 @@ -296,12 +220,7 @@ void WifiDisconnect() { ESPEasyWiFi.disconnect(); } // ******************************************************************************** // Scan WiFi network // ******************************************************************************** -bool WiFiScanAllowed() { - if (WiFi_AP_Candidates.scanComplete() == WIFI_SCAN_RUNNING) { - return false; - } - return WiFiEventData.processedConnect; -} +bool WiFiScanAllowed() { return doWiFiScanAllowed(); } // ******************************************************************************** // Scan all Wifi Access Points @@ -313,8 +232,8 @@ void WiFiScan_log_to_serial() if (WiFi_AP_Candidates.scanComplete() <= 0) { WiFiMode_t cur_wifimode = WiFi.getMode(); - ESPEasy::net::wifi::WifiScan(false); - ESPEasy::net::wifi::setWifiMode(cur_wifimode); + WifiScan(false); + setWifiMode(cur_wifimode); } const int8_t scanCompleteStatus = WiFi_AP_Candidates.scanComplete(); @@ -346,90 +265,13 @@ void WiFiScan_log_to_serial() } // Only internal scope -void setAPinternal(bool enable) -{ - if (enable) { - // create and store unique AP SSID/PW to prevent ESP from starting AP mode with default SSID and No password! - // setup ssid for AP Mode when needed - String softAPSSID = NetworkCreateRFCCompliantHostname(); - String pwd = SecuritySettings.WifiAPKey; - IPAddress subnet(DEFAULT_AP_SUBNET); - #ifdef ESP32 - IPAddress dhcp_lease_start = (uint32_t)0; - IPAddress dns(DEFAULT_AP_DNS); +void setAPinternal(bool enable) { doSetAPinternal(enable); } - if (!WiFi.softAPConfig(apIP, apIP, subnet, dhcp_lease_start, dns)) { - addLog(LOG_LEVEL_ERROR, strformat( - ("WIFI : [AP] softAPConfig failed! IP: %s, GW: %s, SN: %s, DNS: %s"), - apIP.toString().c_str(), - apIP.toString().c_str(), - subnet.toString().c_str(), - dns.toString().c_str()) - ); - } - #endif - #ifdef ESP8266 - if (!WiFi.softAPConfig(apIP, apIP, subnet)) { - addLog(LOG_LEVEL_ERROR, strformat( - ("WIFI : [AP] softAPConfig failed! IP: %s, GW: %s, SN: %s"), - apIP.toString().c_str(), - apIP.toString().c_str(), - subnet.toString().c_str()) - ); - } - #endif - - int channel = 1; - - if (ESPEasy::net::wifi::WifiIsSTA(WiFi.getMode()) && WiFiConnected()) { - channel = WiFi.channel(); - } - - if (WiFi.softAP(softAPSSID.c_str(), pwd.c_str(), channel)) { - eventQueue.add(F("WiFi#APmodeEnabled")); - - if (loglevelActiveFor(LOG_LEVEL_INFO)) { - addLogMove(LOG_LEVEL_INFO, strformat( - F("WIFI : AP Mode enabled. SSID: %s IP: %s ch: %d"), - softAPSSID.c_str(), - formatIP(WiFi.softAPIP()).c_str(), - channel)); - } - } else { - if (loglevelActiveFor(LOG_LEVEL_ERROR)) { - addLogMove(LOG_LEVEL_ERROR, strformat( - F("WIFI : Error while starting AP Mode with SSID: %s IP: %s"), - softAPSSID.c_str(), - formatIP(apIP).c_str())); - } - } - # ifdef ESP32 - - # else // ifdef ESP32 - - if (wifi_softap_dhcps_status() != DHCP_STARTED) { - if (!wifi_softap_dhcps_start()) { - addLog(LOG_LEVEL_ERROR, F("WIFI : [AP] wifi_softap_dhcps_start failed!")); - } - } - # endif // ifdef ESP32 - WiFiEventData.timerAPoff.setMillisFromNow(WIFI_AP_OFF_TIMER_DURATION); - } else { - # if FEATURE_DNS_SERVER - - if (dnsServerActive) { - dnsServerActive = false; - dnsServer.stop(); - } - # endif // if FEATURE_DNS_SERVER - } -} - -bool WiFiUseStaticIP() { return Settings.IP[0] != 0 && Settings.IP[0] != 255; } +bool WiFiUseStaticIP() { return Settings.IP[0] != 0 && Settings.IP[0] != 255; } bool wifiAPmodeActivelyUsed() { - if (!ESPEasy::net::wifi::WifiIsAP(WiFi.getMode()) || (!WiFiEventData.timerAPoff.isSet())) { + if (!WifiIsAP(WiFi.getMode()) || (!WiFiEventData.timerAPoff.isSet())) { // AP not active or soon to be disabled in processDisableAPmode() return false; } @@ -546,4 +388,33 @@ void logConnectionStatus() { # endif // ifndef BUILD_NO_DEBUG } +bool WifiIsAP(WiFiMode_t wifimode) { return doWifiIsAP(wifimode); } + +bool WifiIsSTA(WiFiMode_t wifimode) { return doWifiIsSTA(wifimode); } + +const __FlashStringHelper* getWifiModeString(WiFiMode_t wifimode) { return doGetWifiModeString(wifimode); } + +# if CONFIG_SOC_WIFI_SUPPORT_5G + +const __FlashStringHelper* getWifiBandModeString(wifi_band_mode_t wifiBandMode) { return doGetWifiBandModeString(wifiBandMode); } + +# endif // if CONFIG_SOC_WIFI_SUPPORT_5G + +bool setSTA(bool enable) { return doSetSTA(enable); } + +bool setAP(bool enable) { return doSetAP(enable); } + +bool setSTA_AP(bool sta_enable, + bool ap_enable) { return doSetSTA_AP(sta_enable, ap_enable); } + +bool setWifiMode(WiFiMode_t new_mode) { return doSetWifiMode(new_mode); } + +void WifiScan(bool async, + uint8_t channel) { doWifiScan(async, channel); } + + +} // namespace wifi +} // namespace net +} // namespace ESPEasy + #endif // if FEATURE_WIFI diff --git a/src/ESPEasy/net/wifi/ESPEasyWifi.h b/src/ESPEasy/net/wifi/ESPEasyWifi.h index 99e1b75c5..30c34255c 100644 --- a/src/ESPEasy/net/wifi/ESPEasyWifi.h +++ b/src/ESPEasy/net/wifi/ESPEasyWifi.h @@ -1,5 +1,4 @@ -#ifndef ESPEASY_WIFI_H -#define ESPEASY_WIFI_H +#pragma once #include "../../../ESPEasy_common.h" @@ -17,6 +16,10 @@ # include "../../../src/Helpers/LongTermTimer.h" +namespace ESPEasy { +namespace net { +namespace wifi { + # define WIFI_RECONNECT_WAIT 30000 // in milliSeconds # define WIFI_AP_OFF_TIMER_DURATION 300000 // in milliSeconds # if FEATURE_CUSTOM_PROVISIONING @@ -29,10 +32,6 @@ # define WIFI_SCAN_INTERVAL_MINIMAL 60000 // in milliSeconds -# ifdef ESPEASY_WIFI_CLEANUP_WORK_IN_PROGRESS - - -# endif // ESPEASY_WIFI_CLEANUP_WORK_IN_PROGRESS bool WiFiConnected(); void WiFiConnectRelaxed(); @@ -55,7 +54,7 @@ float GetRSSIthreshold(float& maxTXpwr); // <-97 => 0 , >-50 => 10 // -97 ... -50 => 1 ... 9 int GetRSSI_quality(); -ESPEasy::net::wifi::WiFiConnectionProtocol getConnectionProtocol(); +WiFiConnectionProtocol getConnectionProtocol(); # ifdef ESP32 // TSF time is 64-bit timer in usec, sent by the AP along with other packets. @@ -80,6 +79,33 @@ String formatScanResult(int i, void logConnectionStatus(); + +// ******************************************************************************** +// Manage Wifi Modes +// ******************************************************************************** +bool WifiIsAP(WiFiMode_t wifimode); +bool WifiIsSTA(WiFiMode_t wifimode); + +const __FlashStringHelper* getWifiModeString(WiFiMode_t wifimode); + +#if CONFIG_SOC_WIFI_SUPPORT_5G +const __FlashStringHelper* getWifiBandModeString(wifi_band_mode_t wifiBandMode); +#endif + +bool setSTA(bool enable); +bool setAP(bool enable); +bool setSTA_AP(bool sta_enable, + bool ap_enable); + +bool setWifiMode(WiFiMode_t new_mode); + + +void WifiScan(bool async, + uint8_t channel = 0); + + +} +} +} #endif // if FEATURE_WIFI -#endif // ESPEASY_WIFI_H diff --git a/src/ESPEasy/net/wifi/ESPEasyWifi_ProcessEvent.cpp b/src/ESPEasy/net/wifi/ESPEasyWifi_ProcessEvent.cpp index facc54b1d..d66daed79 100644 --- a/src/ESPEasy/net/wifi/ESPEasyWifi_ProcessEvent.cpp +++ b/src/ESPEasy/net/wifi/ESPEasyWifi_ProcessEvent.cpp @@ -2,19 +2,16 @@ #include "../../../ESPEasy-Globals.h" -#if FEATURE_ETHERNET -# include "../../../src/ESPEasyCore/ESPEasyEth_ProcessEvent.h" -#endif -# include "../../../src/ESPEasyCore/ESPEasyNetwork.h" -#include "../wifi/ESPEasyWifi.h" -#include "../wifi/ESPEasyWifi_abstracted.h" +#if FEATURE_WIFI -# include "../Globals/ESPEasyWiFiEvent.h" +# if FEATURE_ETHERNET +# include "../../../src/ESPEasyCore/ESPEasyEth_ProcessEvent.h" +# endif +# include "../../../src/ESPEasyCore/ESPEasyNetwork.h" # include "../../../src/Globals/ESPEasy_Scheduler.h" # include "../../../src/Globals/ESPEasy_time.h" # include "../../../src/Globals/EventQueue.h" # include "../../../src/Globals/MQTT.h" -# include "../Globals/NetworkState.h" # include "../../../src/Globals/RTC.h" # include "../../../src/Globals/SecuritySettings.h" # include "../../../src/Globals/Services.h" @@ -40,23 +37,32 @@ # include "../../../src/WebServer/ESPEasy_WebServer.h" +# include "../wifi/ESPEasyWifi.h" +# include "../Globals/ESPEasyWiFiEvent.h" +# include "../Globals/NetworkState.h" + + +namespace ESPEasy { +namespace net { +namespace wifi { + // ******************************************************************************** // Called from the loop() to make sure events are processed as soon as possible. // These functions are called from Setup() or Loop() and thus may call delay() or yield() // ******************************************************************************** void handle_unprocessedNetworkEvents() { -#if FEATURE_ETHERNET +# if FEATURE_ETHERNET handle_unprocessedEthEvents(); -#endif +# endif if (active_network_medium == NetworkMedium_t::WIFI) { bool processedSomething = false; if (!WiFiEventData.processedConnect) { - #ifndef BUILD_NO_DEBUG + # ifndef BUILD_NO_DEBUG addLog(LOG_LEVEL_DEBUG, F("WIFI : Entering processConnect()")); - #endif // ifndef BUILD_NO_DEBUG + # endif // ifndef BUILD_NO_DEBUG processConnect(); processedSomething = true; @@ -65,9 +71,9 @@ void handle_unprocessedNetworkEvents() } if (!WiFiEventData.processedGotIP) { - #ifndef BUILD_NO_DEBUG + # ifndef BUILD_NO_DEBUG addLog(LOG_LEVEL_DEBUG, F("WIFI : Entering processGotIP()")); - #endif // ifndef BUILD_NO_DEBUG + # endif // ifndef BUILD_NO_DEBUG processGotIP(); processedSomething = true; @@ -96,13 +102,13 @@ void handle_unprocessedNetworkEvents() } } -#if FEATURE_ETHERNET +# if FEATURE_ETHERNET check_Eth_DNS_valid(); -#endif // if FEATURE_ETHERNET +# endif // if FEATURE_ETHERNET -#if FEATURE_ESPEASY_P2P +# if FEATURE_ESPEASY_P2P updateUDPport(false); -#endif +# endif } // ******************************************************************************** @@ -132,22 +138,22 @@ void processConnect() { ++WiFiEventData.wifi_reconnects; if (WiFi_AP_Candidates.getCurrent().bits.isEmergencyFallback) { - #ifdef CUSTOM_EMERGENCY_FALLBACK_RESET_CREDENTIALS + # ifdef CUSTOM_EMERGENCY_FALLBACK_RESET_CREDENTIALS const bool mustResetCredentials = CUSTOM_EMERGENCY_FALLBACK_RESET_CREDENTIALS; - #else + # else const bool mustResetCredentials = false; - #endif // ifdef CUSTOM_EMERGENCY_FALLBACK_RESET_CREDENTIALS - #ifdef CUSTOM_EMERGENCY_FALLBACK_START_AP + # endif // ifdef CUSTOM_EMERGENCY_FALLBACK_RESET_CREDENTIALS + # ifdef CUSTOM_EMERGENCY_FALLBACK_START_AP const bool mustStartAP = CUSTOM_EMERGENCY_FALLBACK_START_AP; - #else + # else const bool mustStartAP = false; - #endif // ifdef CUSTOM_EMERGENCY_FALLBACK_START_AP + # endif // ifdef CUSTOM_EMERGENCY_FALLBACK_START_AP if (mustStartAP) { int allowedUptimeMinutes = 10; - #ifdef CUSTOM_EMERGENCY_FALLBACK_ALLOW_MINUTES_UPTIME + # ifdef CUSTOM_EMERGENCY_FALLBACK_ALLOW_MINUTES_UPTIME allowedUptimeMinutes = CUSTOM_EMERGENCY_FALLBACK_ALLOW_MINUTES_UPTIME; - #endif + # endif if (getUptimeMinutes() < allowedUptimeMinutes) { WiFiEventData.timerAPstart.setNow(); @@ -213,13 +219,13 @@ void processGotIP() { IPAddress ip = NetworkLocalIP(); if (!useStaticIP()) { - #ifdef ESP8266 + # ifdef ESP8266 if (!ip.isSet()) - #else // ifdef ESP8266 + # else // ifdef ESP8266 if ((ip[0] == 0) && (ip[1] == 0) && (ip[2] == 0) && (ip[3] == 0)) - #endif // ifdef ESP8266 + # endif // ifdef ESP8266 { return; } @@ -258,13 +264,13 @@ void processGotIP() { WiFi.config(ip, gw, subnet, WiFiEventData.dns0_cache, WiFiEventData.dns1_cache); } - #if FEATURE_MQTT + # if FEATURE_MQTT mqtt_reconnect_count = 0; MQTTclient_should_reconnect = true; timermqtt_interval = 100; Scheduler.setIntervalTimer(SchedulerIntervalTimer_e::TIMER_MQTT); scheduleNextMQTTdelayQueue(); - #endif // if FEATURE_MQTT + # endif // if FEATURE_MQTT Scheduler.sendGratuitousARP_now(); if (Settings.UseRules) @@ -284,13 +290,13 @@ void processGotIP() { if ((WiFiEventData.WiFiConnected() || WiFi.isConnected()) && hasIPaddr()) { WiFiEventData.setWiFiGotIP(); } - #if FEATURE_ESPEASY_P2P + # if FEATURE_ESPEASY_P2P refreshNodeList(); - #endif + # endif logConnectionStatus(); } -#if FEATURE_USE_IPV6 +# if FEATURE_USE_IPV6 void processGotIPv6() { if (!WiFiEventData.processedGotIP6) { @@ -299,21 +305,21 @@ void processGotIPv6() { if (loglevelActiveFor(LOG_LEVEL_INFO)) { addLog(LOG_LEVEL_INFO, String(F("WIFI : STA got IP6 ")) + WiFiEventData.unprocessed_IP6.toString(true)); } -# if FEATURE_ESPEASY_P2P +# if FEATURE_ESPEASY_P2P // updateUDPport(true); -# endif // if FEATURE_ESPEASY_P2P +# endif // if FEATURE_ESPEASY_P2P } } -#endif // if FEATURE_USE_IPV6 +# endif // if FEATURE_USE_IPV6 // A client disconnected from the AP on this node. void processDisconnectAPmode() { if (WiFiEventData.processedDisconnectAPmode) { return; } WiFiEventData.processedDisconnectAPmode = true; -#ifndef BUILD_NO_DEBUG +# ifndef BUILD_NO_DEBUG if (loglevelActiveFor(LOG_LEVEL_INFO)) { String log(strformat( @@ -322,7 +328,7 @@ void processDisconnectAPmode() { WiFi.softAPgetStationNum())); addLogMove(LOG_LEVEL_INFO, log); } -#endif // ifndef BUILD_NO_DEBUG +# endif // ifndef BUILD_NO_DEBUG } // Client connects to AP on this node @@ -332,7 +338,7 @@ void processConnectAPmode() { // Extend timer to switch off AP. WiFiEventData.timerAPoff.setMillisFromNow(WIFI_AP_OFF_TIMER_DURATION); -#ifndef BUILD_NO_DEBUG +# ifndef BUILD_NO_DEBUG if (loglevelActiveFor(LOG_LEVEL_INFO)) { String log(strformat( @@ -341,9 +347,9 @@ void processConnectAPmode() { WiFi.softAPgetStationNum())); addLogMove(LOG_LEVEL_INFO, log); } -#endif // ifndef BUILD_NO_DEBUG +# endif // ifndef BUILD_NO_DEBUG - #if FEATURE_DNS_SERVER + # if FEATURE_DNS_SERVER // Start DNS, only used if the ESP has no valid WiFi config // It will reply with it's own address on all DNS requests @@ -352,7 +358,7 @@ void processConnectAPmode() { dnsServerActive = true; dnsServer.start(DNS_PORT, "*", apIP); } - #endif // if FEATURE_DNS_SERVER + # endif // if FEATURE_DNS_SERVER } // Switch of AP mode when timeout reached and no client connected anymore. @@ -400,9 +406,9 @@ void processScanDone() { // FIXME TD-er: Set timeout... if (WiFiEventData.lastGetScanMoment.timeoutReached(5000)) { - #ifndef BUILD_NO_DEBUG + # ifndef BUILD_NO_DEBUG addLog(LOG_LEVEL_ERROR, F("WiFi : Scan Running Timeout")); - #endif + # endif WiFi.scanDelete(); WiFiEventData.processedScanDone = true; } @@ -416,38 +422,43 @@ void processScanDone() { WiFiEventData.lastGetScanMoment.setNow(); WiFiEventData.processedScanDone = true; -#ifndef BUILD_NO_DEBUG +# ifndef BUILD_NO_DEBUG if (loglevelActiveFor(LOG_LEVEL_INFO)) { addLogMove(LOG_LEVEL_INFO, concat(F("WiFi : Scan finished, found: "), scanCompleteStatus)); } -#endif // ifndef BUILD_NO_DEBUG +# endif // ifndef BUILD_NO_DEBUG -#if !FEATURE_ESP8266_DIRECT_WIFI_SCAN +# if !FEATURE_ESP8266_DIRECT_WIFI_SCAN WiFi_AP_Candidates.process_WiFiscan(scanCompleteStatus); -#endif +# endif WiFi_AP_Candidates.load_knownCredentials(); if (WiFi_AP_Candidates.addedKnownCandidate() && !NetworkConnected()) { if (!WiFiEventData.wifiConnectInProgress) { WiFiEventData.wifiConnectAttemptNeeded = true; - #ifndef BUILD_NO_DEBUG + # ifndef BUILD_NO_DEBUG if (WiFi_AP_Candidates.addedKnownCandidate()) { addLog(LOG_LEVEL_INFO, F("WiFi : Added known candidate, try to connect")); } - #endif // ifndef BUILD_NO_DEBUG -#ifdef ESP32 + # endif // ifndef BUILD_NO_DEBUG +# ifdef ESP32 // ESPEasy::net::wifi::setSTA(false); -#endif // ifdef ESP32 +# endif // ifdef ESP32 NetworkConnectRelaxed(); -#ifdef USES_ESPEASY_NOW +# ifdef USES_ESPEASY_NOW temp_disable_EspEasy_now_timer = millis() + 20000; -#endif +# endif } } else if (!WiFiEventData.wifiConnectInProgress && !NetworkConnected()) { WiFiEventData.timerAPstart.setNow(); } } + +} // namespace wifi +} // namespace net +} // namespace ESPEasy +#endif // if FEATURE_WIFI diff --git a/src/ESPEasy/net/wifi/ESPEasyWifi_ProcessEvent.h b/src/ESPEasy/net/wifi/ESPEasyWifi_ProcessEvent.h index c359ee088..1d5abcebd 100644 --- a/src/ESPEasy/net/wifi/ESPEasyWifi_ProcessEvent.h +++ b/src/ESPEasy/net/wifi/ESPEasyWifi_ProcessEvent.h @@ -1,8 +1,12 @@ -#ifndef ESPEASYCORE_ESPEASYWIFI_PROCESSEVENT_H -#define ESPEASYCORE_ESPEASYWIFI_PROCESSEVENT_H +#pragma once #include "../../../ESPEasy_common.h" +#if FEATURE_WIFI +namespace ESPEasy { +namespace net { +namespace wifi { + void handle_unprocessedNetworkEvents(); void processDisconnect(); void processConnect(); @@ -15,4 +19,8 @@ void processConnectAPmode(); void processDisableAPmode(); void processScanDone(); -#endif // ifndef ESPEASYCORE_ESPEASYWIFI_PROCESSEVENT_H +} +} +} + +#endif \ No newline at end of file diff --git a/src/ESPEasy/net/wifi/ESPEasyWifi_abstracted.cpp b/src/ESPEasy/net/wifi/ESPEasyWifi_abstracted.cpp index 2c0bacc0c..a9c8484d3 100644 --- a/src/ESPEasy/net/wifi/ESPEasyWifi_abstracted.cpp +++ b/src/ESPEasy/net/wifi/ESPEasyWifi_abstracted.cpp @@ -2,23 +2,28 @@ #if FEATURE_WIFI +# include "../../../src/ESPEasyCore/ESPEasyNetwork.h" # include "../../../src/Globals/EventQueue.h" +# include "../../../src/Globals/SecuritySettings.h" +# include "../../../src/Globals/Services.h" # include "../../../src/Globals/Settings.h" -# include "../Globals/ESPEasyWiFiEvent.h" - +# include "../../../src/Globals/WiFi_AP_Candidates.h" # include "../../../src/Helpers/StringConverter.h" +# include "../Globals/ESPEasyWiFiEvent.h" +# include "../Globals/ESPEasyWiFi.h" +# include "../Globals/NetworkState.h" namespace ESPEasy { namespace net { namespace wifi { -const __FlashStringHelper* getWifiModeString(WiFiMode_t wifimode) +const __FlashStringHelper* doGetWifiModeString(WiFiMode_t wifimode) { switch (wifimode) { - case WIFI_OFF: return F("OFF"); - case WIFI_STA: return F("STA"); - case WIFI_AP: return F("AP"); + case WIFI_OFF: return F("OFF"); + case WIFI_STA: return F("STA"); + case WIFI_AP: return F("AP"); case WIFI_AP_STA: return F("AP+STA"); default: break; @@ -26,8 +31,9 @@ const __FlashStringHelper* getWifiModeString(WiFiMode_t wifimode) return F("Unknown"); } -#if CONFIG_SOC_WIFI_SUPPORT_5G -const __FlashStringHelper* getWifiBandModeString(wifi_band_mode_t wifiBandMode) +# if CONFIG_SOC_WIFI_SUPPORT_5G + +const __FlashStringHelper* doGetWifiBandModeString(wifi_band_mode_t wifiBandMode) { switch (wifiBandMode) { @@ -37,25 +43,124 @@ const __FlashStringHelper* getWifiBandModeString(wifi_band_mode_t wifiBandMode) } return F("2.4 GHz + 5 GHz"); } -#endif +# endif // if CONFIG_SOC_WIFI_SUPPORT_5G -bool WiFiConnected() { return ESPEasyWiFi.connected(); } +bool doSetSTA(bool enable) { return doSetSTA_AP(enable, doWifiIsAP(WiFi.getMode())); } -bool setSTA(bool enable) { return setSTA_AP(enable, WifiIsAP(WiFi.getMode())); } +bool doSetAP(bool enable) { return doSetSTA_AP(doWifiIsSTA(WiFi.getMode()), enable); } -bool setAP(bool enable) { return setSTA_AP(WifiIsSTA(WiFi.getMode()), enable); } - -bool setSTA_AP(bool sta_enable, bool ap_enable) +bool doSetSTA_AP(bool sta_enable, bool ap_enable) { # ifndef SOC_WIFI_SUPPORTED return true; -#else +# else + if (ap_enable) { - return setWifiMode(sta_enable ? WIFI_AP_STA : WIFI_AP); + return doSetWifiMode(sta_enable ? WIFI_AP_STA : WIFI_AP); } - return setWifiMode(sta_enable ? WIFI_STA : WIFI_OFF); -#endif + return doSetWifiMode(sta_enable ? WIFI_STA : WIFI_OFF); +# endif // ifndef SOC_WIFI_SUPPORTED +} + +// ******************************************************************************** +// Scan WiFi network +// ******************************************************************************** +bool doWiFiScanAllowed() { + if (WiFi_AP_Candidates.scanComplete() == WIFI_SCAN_RUNNING) { + return false; + } + return WiFiEventData.processedConnect; +} + +// Only internal scope +void doSetAPinternal(bool enable) +{ + if (enable) { + // create and store unique AP SSID/PW to prevent ESP from starting AP mode with default SSID and No password! + // setup ssid for AP Mode when needed + String softAPSSID = NetworkCreateRFCCompliantHostname(); + String pwd = SecuritySettings.WifiAPKey; + IPAddress subnet(DEFAULT_AP_SUBNET); + # ifdef ESP32 + IPAddress dhcp_lease_start = (uint32_t)0; + IPAddress dns(DEFAULT_AP_DNS); + + if (!WiFi.softAPConfig(apIP, apIP, subnet, dhcp_lease_start, dns)) { + addLog(LOG_LEVEL_ERROR, strformat( + ("WIFI : [AP] softAPConfig failed! IP: %s, GW: %s, SN: %s, DNS: %s"), + apIP.toString().c_str(), + apIP.toString().c_str(), + subnet.toString().c_str(), + dns.toString().c_str()) + ); + } + # endif // ifdef ESP32 + # ifdef ESP8266 + + if (!WiFi.softAPConfig(apIP, apIP, subnet)) { + addLog(LOG_LEVEL_ERROR, strformat( + ("WIFI : [AP] softAPConfig failed! IP: %s, GW: %s, SN: %s"), + apIP.toString().c_str(), + apIP.toString().c_str(), + subnet.toString().c_str()) + ); + } + # endif // ifdef ESP8266 + + int channel = 1; + + if (WifiIsSTA(WiFi.getMode()) && WiFiConnected()) { + channel = WiFi.channel(); + } + + if (WiFi.softAP(softAPSSID.c_str(), pwd.c_str(), channel)) { + eventQueue.add(F("WiFi#APmodeEnabled")); + + if (loglevelActiveFor(LOG_LEVEL_INFO)) { + addLogMove(LOG_LEVEL_INFO, strformat( + F("WIFI : AP Mode enabled. SSID: %s IP: %s ch: %d"), + softAPSSID.c_str(), + formatIP(WiFi.softAPIP()).c_str(), + channel)); + } + } else { + if (loglevelActiveFor(LOG_LEVEL_ERROR)) { + addLogMove(LOG_LEVEL_ERROR, strformat( + F("WIFI : Error while starting AP Mode with SSID: %s IP: %s"), + softAPSSID.c_str(), + formatIP(apIP).c_str())); + } + } + # ifdef ESP32 + + # else // ifdef ESP32 + + if (wifi_softap_dhcps_status() != DHCP_STARTED) { + if (!wifi_softap_dhcps_start()) { + addLog(LOG_LEVEL_ERROR, F("WIFI : [AP] wifi_softap_dhcps_start failed!")); + } + } + # endif // ifdef ESP32 + WiFiEventData.timerAPoff.setMillisFromNow(WIFI_AP_OFF_TIMER_DURATION); + } else { + # if FEATURE_DNS_SERVER + + if (dnsServerActive) { + dnsServerActive = false; + dnsServer.stop(); + } + # endif // if FEATURE_DNS_SERVER + } +} + +void doSetConnectionSpeed() { + doSetConnectionSpeed( + Settings.ForceWiFi_bg_mode() +# if CONFIG_SOC_WIFI_SUPPORT_5G + , Settings.WiFi_band_mode() +# endif + ); } // ******************************************************************************** @@ -63,13 +168,13 @@ bool setSTA_AP(bool sta_enable, bool ap_enable) // ******************************************************************************** # if FEATURE_SET_WIFI_TX_PWR -void SetWiFiTXpower() { - SetWiFiTXpower(0); // Just some minimal value, will be adjusted in SetWiFiTXpower +void doSetWiFiTXpower() { + doSetWiFiTXpower(0, WiFi.RSSI()); + + // Just some minimal value, will be adjusted in doSetWiFiTXpower } -void SetWiFiTXpower(float dBm) { SetWiFiTXpower(dBm, WiFi.RSSI()); } - -void SetWiFiTXpower(float dBm, float rssi) { +void doSetWiFiTXpower(float dBm, float rssi) { const WiFiMode_t cur_mode = WiFi.getMode(); if (cur_mode == WIFI_OFF) { @@ -151,28 +256,8 @@ void SetWiFiTXpower(float dBm, float rssi) { # endif // if FEATURE_SET_WIFI_TX_PWR -int GetRSSI_quality() { - long rssi = WiFi.RSSI(); - - if (-50 < rssi) { return 10; } - - if (rssi <= -98) { return 0; } - rssi = rssi + 97; // Range 0..47 => 1..9 - return (rssi / 5) + 1; -} - -void setConnectionSpeed() { - setConnectionSpeed( - Settings.ForceWiFi_bg_mode() -#if CONFIG_SOC_WIFI_SUPPORT_5G - ,Settings.WiFi_band_mode() -#endif - ); -} - } // namespace wifi } // namespace net } // namespace ESPEasy - #endif // if FEATURE_WIFI diff --git a/src/ESPEasy/net/wifi/ESPEasyWifi_abstracted.h b/src/ESPEasy/net/wifi/ESPEasyWifi_abstracted.h index caf22d10b..b30c4bd53 100644 --- a/src/ESPEasy/net/wifi/ESPEasyWifi_abstracted.h +++ b/src/ESPEasy/net/wifi/ESPEasyWifi_abstracted.h @@ -1,13 +1,12 @@ -#ifndef ESPEASYCORE_ESPEASYWIFI_ABSTRACTED_H -#define ESPEASYCORE_ESPEASYWIFI_ABSTRACTED_H +#pragma once #include "../../../ESPEasy_common.h" #if FEATURE_WIFI -#include "../wifi/WiFiConnectionProtocol.h" -#include "../wifi/WiFi_STA_connected_state.h" -#include "../wifi/WiFi_State.h" +# include "../wifi/WiFiConnectionProtocol.h" +# include "../wifi/WiFi_STA_connected_state.h" +# include "../wifi/WiFi_State.h" # if defined(ESP8266) @@ -31,34 +30,38 @@ bool WiFi_pre_setup(); // Call before setting WiFi into STA mode bool WiFi_pre_STA_setup(); -bool WiFiConnected(); -void WiFiDisconnect(); +void doWiFiDisconnect(); // ******************************************************************************** // Manage Wifi Modes // ******************************************************************************** -bool WifiIsAP(WiFiMode_t wifimode); -bool WifiIsSTA(WiFiMode_t wifimode); +bool doWifiIsAP(WiFiMode_t wifimode); +bool doWifiIsSTA(WiFiMode_t wifimode); -const __FlashStringHelper* getWifiModeString(WiFiMode_t wifimode); +const __FlashStringHelper* doGetWifiModeString(WiFiMode_t wifimode); -#if CONFIG_SOC_WIFI_SUPPORT_5G -const __FlashStringHelper* getWifiBandModeString(wifi_band_mode_t wifiBandMode); -#endif +# if CONFIG_SOC_WIFI_SUPPORT_5G +const __FlashStringHelper* doGetWifiBandModeString(wifi_band_mode_t wifiBandMode); +# endif -bool setSTA(bool enable); -bool setAP(bool enable); -bool setSTA_AP(bool sta_enable, - bool ap_enable); +bool doSetSTA(bool enable); +bool doSetAP(bool enable); +bool doSetSTA_AP(bool sta_enable, + bool ap_enable); -bool setWifiMode(WiFiMode_t new_mode); +bool doSetWifiMode(WiFiMode_t new_mode); -void WifiScan(bool async, - uint8_t channel = 0); +void doWifiScan(bool async, + uint8_t channel = 0); +bool doWiFiScanAllowed(); + +// Only internal scope +void doSetAPinternal(bool enable); + // ******************************************************************************** // Event handlers // ******************************************************************************** @@ -67,37 +70,40 @@ void removeWiFiEventHandler(); void registerWiFiEventHandler(); -WiFiConnectionProtocol getConnectionProtocol(); -float GetRSSIthreshold(float& maxTXpwr); +WiFiConnectionProtocol doGetConnectionProtocol(); +float doGetRSSIthreshold(float& maxTXpwr); // ******************************************************************************** // Configure WiFi TX power // ******************************************************************************** # if FEATURE_SET_WIFI_TX_PWR -void SetWiFiTXpower(); -void SetWiFiTXpower(float dBm); -void SetWiFiTXpower(float dBm, - float rssi); // Actually set the TX power using platform specific calls. void doSetWiFiTXpower(float& dBm); + + +void doSetWiFiTXpower(); + +void doSetWiFiTXpower(float dBm, + float rssi); + # endif // if FEATURE_SET_WIFI_TX_PWR -int GetRSSI_quality(); -void setConnectionSpeed(); -#if CONFIG_SOC_WIFI_SUPPORT_5G -void setConnectionSpeed(bool ForceWiFi_bg_mode, wifi_band_mode_t WiFi_band_mode); -#else -void setConnectionSpeed(bool ForceWiFi_bg_mode); -#endif +void doSetConnectionSpeed(); +# if CONFIG_SOC_WIFI_SUPPORT_5G +void doSetConnectionSpeed(bool ForceWiFi_bg_mode, + wifi_band_mode_t WiFi_band_mode); +# else // if CONFIG_SOC_WIFI_SUPPORT_5G +void doSetConnectionSpeed(bool ForceWiFi_bg_mode); +# endif // if CONFIG_SOC_WIFI_SUPPORT_5G -void setWiFiNoneSleep(); -void setWiFiEcoPowerMode(); -void setWiFiDefaultPowerMode(); +void doSetWiFiNoneSleep(); +void doSetWiFiEcoPowerMode(); +void doSetWiFiDefaultPowerMode(); -void setWiFiCountryPolicyManual(); +void doSetWiFiCountryPolicyManual(); } // namespace wifi } // namespace net @@ -105,4 +111,3 @@ void setWiFiCountryPolicyManual(); #endif // if FEATURE_WIFI -#endif // ifndef ESPEASYCORE_ESPEASYWIFI_ABSTRACTED_H diff --git a/src/ESPEasy/net/wifi/ESPEasyWifi_abstracted_ESP32.cpp b/src/ESPEasy/net/wifi/ESPEasyWifi_abstracted_ESP32.cpp index eacaa4ec8..e447e0eb0 100644 --- a/src/ESPEasy/net/wifi/ESPEasyWifi_abstracted_ESP32.cpp +++ b/src/ESPEasy/net/wifi/ESPEasyWifi_abstracted_ESP32.cpp @@ -4,28 +4,23 @@ # ifdef ESP32 # include "../../../src/DataStructs/TimingStats.h" - -# include "../Globals/ESPEasyWiFiEvent.h" # include "../../../src/Globals/EventQueue.h" # include "../../../src/Globals/Settings.h" # include "../../../src/Globals/WiFi_AP_Candidates.h" -# include "../wifi/ESPEasyWiFiEvent_ESP32.h" - # include "../../../src/Helpers/StringConverter.h" - -# include "../../../src/ESPEasyCore/ESPEasyNetwork.h" // Needed for NetworkCreateRFCCompliantHostname, WiFi code should not include network code -# include "../wifi/ESPEasyWifi.h" // Needed for WifiDisconnect. Maybe this should be moved to these 'abstract' files? - +# include "../../../src/ESPEasyCore/ESPEasyNetwork.h" // Needed for NetworkCreateRFCCompliantHostname, WiFi code should not include network + // code +# include "../Globals/ESPEasyWiFiEvent.h" +# include "../wifi/ESPEasyWiFiEvent_ESP32.h" # include "../wifi/ESPEasyWifi_ProcessEvent.h" - # include # include // Needed to call ESP-IDF functions like esp_wifi_.... -#ifndef ESP32P4 -# include -#endif +# ifndef ESP32P4 +# include +# endif namespace ESPEasy { @@ -37,21 +32,21 @@ bool WiFi_pre_setup() { registerWiFiEventHandler(); WiFi.persistent(false); - return setSTA_AP(false, false); + return doSetSTA_AP(false, false); } bool WiFi_pre_STA_setup() { - if (!setSTA(true)) { return false; } + if (!doSetSTA(true)) { return false; } WiFi.setAutoReconnect(false); delay(10); return true; } -void WiFiDisconnect() { +void doWiFiDisconnect() { // removeWiFiEventHandler(); - WiFi.disconnect(); + WiFi.disconnect(Settings.WiFiRestart_connection_lost()); delay(100); { const IPAddress ip; @@ -62,11 +57,11 @@ void WiFiDisconnect() { } } -bool WifiIsAP(WiFiMode_t wifimode) { return (wifimode == WIFI_MODE_AP) || (wifimode == WIFI_MODE_APSTA); } +bool doWifiIsAP(WiFiMode_t wifimode) { return (wifimode == WIFI_MODE_AP) || (wifimode == WIFI_MODE_APSTA); } -bool WifiIsSTA(WiFiMode_t wifimode) { return (wifimode & WIFI_MODE_STA) != 0; } +bool doWifiIsSTA(WiFiMode_t wifimode) { return (wifimode & WIFI_MODE_STA) != 0; } -bool setWifiMode(WiFiMode_t new_mode) +bool doSetWifiMode(WiFiMode_t new_mode) { const WiFiMode_t cur_mode = WiFi.getMode(); @@ -103,7 +98,7 @@ bool setWifiMode(WiFiMode_t new_mode) # endif // ifdef ESP8266 delay(100); } else { - WifiDisconnect(); + doWiFiDisconnect(); // delay(100); processDisconnect(); @@ -111,7 +106,7 @@ bool setWifiMode(WiFiMode_t new_mode) removeWiFiEventHandler(); } - addLog(LOG_LEVEL_INFO, concat(F("WIFI : Set WiFi to "), getWifiModeString(new_mode))); + addLog(LOG_LEVEL_INFO, concat(F("WIFI : Set WiFi to "), doGetWifiModeString(new_mode))); int retry = 2; @@ -143,9 +138,9 @@ bool setWifiMode(WiFiMode_t new_mode) // Needs to be set while WiFi is off WiFi.hostname(NetworkCreateRFCCompliantHostname()); delay(100); -#ifndef ESP32P4 +# ifndef ESP32P4 esp_wifi_set_ps(WIFI_PS_NONE); -#endif +# endif // esp_wifi_set_ps(WIFI_PS_MAX_MODEM); delay(1); @@ -161,35 +156,35 @@ bool setWifiMode(WiFiMode_t new_mode) // Only set power mode when AP is not enabled // When AP is enabled, the sleep mode is already set to WIFI_NONE_SLEEP - if (!WifiIsAP(new_mode)) { + if (!doWifiIsAP(new_mode)) { if (Settings.WifiNoneSleep()) { - setWiFiNoneSleep(); + doSetWiFiNoneSleep(); } else if (Settings.EcoPowerMode()) { - setWiFiEcoPowerMode(); + doSetWiFiEcoPowerMode(); } else { // Default - setWiFiDefaultPowerMode(); + doSetWiFiDefaultPowerMode(); } } # if FEATURE_SET_WIFI_TX_PWR - SetWiFiTXpower(); + doSetWiFiTXpower(); # endif - if (WifiIsSTA(new_mode)) { + if (doWifiIsSTA(new_mode)) { // WiFi.setAutoConnect(Settings.SDK_WiFi_autoreconnect()); WiFi.setAutoReconnect(Settings.SDK_WiFi_autoreconnect()); } delay(100); // Must allow for some time to init. } - const bool new_mode_AP_enabled = WifiIsAP(new_mode); + const bool new_mode_AP_enabled = doWifiIsAP(new_mode); - if (WifiIsAP(cur_mode) && !new_mode_AP_enabled) { + if (doWifiIsAP(cur_mode) && !new_mode_AP_enabled) { eventQueue.add(F("WiFi#APmodeDisabled")); } - if (WifiIsAP(cur_mode) != new_mode_AP_enabled) { + if (doWifiIsAP(cur_mode) != new_mode_AP_enabled) { // Mode has changed - setAPinternal(new_mode_AP_enabled); + doSetAPinternal(new_mode_AP_enabled); } # if FEATURE_MDNS # ifdef ESP8266 @@ -201,17 +196,17 @@ bool setWifiMode(WiFiMode_t new_mode) return true; } -void WifiScan(bool async, uint8_t channel) { - ESPEasy::net::wifi::setSTA(true); +void doWifiScan(bool async, uint8_t channel) { + doSetSTA(true); - if (!WiFiScanAllowed()) { + if (!doWiFiScanAllowed()) { return; } # if CONFIG_SOC_WIFI_SUPPORT_5G const wifi_band_mode_t current_wifi_band_mode = WiFi.getBandMode(); WiFi.setBandMode(Settings.WiFi_band_mode()); -# endif +# endif // if CONFIG_SOC_WIFI_SUPPORT_5G // TD-er: Don't run async scan on ESP32. // Since IDF 4.4 it seems like the active channel may be messed up when running async scan @@ -220,7 +215,7 @@ void WifiScan(bool async, uint8_t channel) { async = false; if (Settings.IncludeHiddenSSID()) { - ESPEasy::net::wifi::setWiFiCountryPolicyManual(); + doSetWiFiCountryPolicyManual(); } START_TIMER; @@ -293,9 +288,10 @@ void WifiScan(bool async, uint8_t channel) { } # endif // if ESP_IDF_VERSION_MAJOR < 5 # if CONFIG_SOC_WIFI_SUPPORT_5G + // Restore band mode WiFi.setBandMode(current_wifi_band_mode); -#endif +# endif // if CONFIG_SOC_WIFI_SUPPORT_5G } void removeWiFiEventHandler() @@ -312,12 +308,12 @@ void registerWiFiEventHandler() WiFiEventData.wm_event_id = WiFi.onEvent(WiFiEvent); } -float GetRSSIthreshold(float& maxTXpwr) { +float doGetRSSIthreshold(float& maxTXpwr) { maxTXpwr = Settings.getWiFi_TX_power(); float threshold = WIFI_SENSITIVITY_n; - switch (getConnectionProtocol()) + switch (doGetConnectionProtocol()) { case WiFiConnectionProtocol::WiFi_Protocol_11b: threshold = WIFI_SENSITIVITY_11b; @@ -349,9 +345,9 @@ float GetRSSIthreshold(float& maxTXpwr) { return threshold; } -WiFiConnectionProtocol getConnectionProtocol() +WiFiConnectionProtocol doGetConnectionProtocol() { -// #ifndef ESP32P4 + // #ifndef ESP32P4 if (WiFi.RSSI() < 0) { wifi_phy_mode_t phymode; esp_wifi_sta_get_negotiated_phymode(&phymode); @@ -372,7 +368,8 @@ WiFiConnectionProtocol getConnectionProtocol() # endif // if ESP_IDF_VERSION >= ESP_IDF_VERSION_VAL(5, 3, 0) } } -// #endif + + // #endif return WiFiConnectionProtocol::Unknown; } @@ -396,32 +393,36 @@ void doSetWiFiTXpower(float& dBm) bool setProtocol(wifi_interface_t ifx, uint16_t protocol_2GHz, uint16_t protocol_5GHz) { esp_err_t err; + switch (WiFi.getBandMode()) { - case WIFI_BAND_MODE_2G_ONLY: err = esp_wifi_set_protocol(ifx, protocol_2GHz); break; - case WIFI_BAND_MODE_5G_ONLY: err = esp_wifi_set_protocol(ifx, protocol_5GHz); break; - default: + case WIFI_BAND_MODE_2G_ONLY: err = esp_wifi_set_protocol(ifx, protocol_2GHz); + break; + case WIFI_BAND_MODE_5G_ONLY: err = esp_wifi_set_protocol(ifx, protocol_5GHz); + break; + default: { wifi_protocols_t protocols { .ghz_2g = protocol_2GHz, .ghz_5g = protocol_5GHz }; err = esp_wifi_set_protocols(WIFI_IF_STA, &protocols); break; } } + if (err != ESP_OK) { // TODO TD-er: Log } - + return err == ESP_OK; } # else // if CONFIG_SOC_WIFI_SUPPORT_5G -bool setProtocol(wifi_interface_t ifx, uint8_t protocol_2GHz) { - # ifndef SOC_WIFI_SUPPORTED +bool setProtocol(wifi_interface_t ifx, uint8_t protocol_2GHz) { + # ifndef SOC_WIFI_SUPPORTED return false; - #else - return esp_wifi_set_protocol(ifx, protocol_2GHz) == ESP_OK; - #endif + # else + return esp_wifi_set_protocol(ifx, protocol_2GHz) == ESP_OK; + # endif // ifndef SOC_WIFI_SUPPORTED } # endif // if CONFIG_SOC_WIFI_SUPPORT_5G @@ -429,10 +430,10 @@ bool setProtocol(wifi_interface_t ifx, uint8_t protocol_2GHz) { # if CONFIG_SOC_WIFI_SUPPORT_5G -void setConnectionSpeed(bool ForceWiFi_bg_mode, wifi_band_mode_t WiFi_band_mode) +void doSetConnectionSpeed(bool ForceWiFi_bg_mode, wifi_band_mode_t WiFi_band_mode) # else // if CONFIG_SOC_WIFI_SUPPORT_5G -void setConnectionSpeed(bool ForceWiFi_bg_mode) +void doSetConnectionSpeed(bool ForceWiFi_bg_mode) # endif // if CONFIG_SOC_WIFI_SUPPORT_5G { // Does not (yet) work, so commented out. @@ -443,20 +444,20 @@ void setConnectionSpeed(bool ForceWiFi_bg_mode) // However since HT40 is using nearly all channels on 2.4 GHz WiFi, // Thus you are more likely to experience disturbances. // The response speed and stability is better at HT20 for ESP units. - # ifndef SOC_WIFI_SUPPORTED + # ifndef SOC_WIFI_SUPPORTED return; - #else + # else esp_wifi_set_bandwidth(WIFI_IF_STA, WIFI_BW_HT20); -# if CONFIG_SOC_WIFI_SUPPORT_5G +# if CONFIG_SOC_WIFI_SUPPORT_5G WiFi.setBandMode(WiFi_band_mode); -# if CONFIG_SOC_WIFI_HE_SUPPORT +# if CONFIG_SOC_WIFI_HE_SUPPORT uint8_t protocol_5GHz = WIFI_PROTOCOL_11N | WIFI_PROTOCOL_11A | WIFI_PROTOCOL_11AC | WIFI_PROTOCOL_11AX; -# else +# else uint8_t protocol_5GHz = WIFI_PROTOCOL_11N | WIFI_PROTOCOL_11A | WIFI_PROTOCOL_11AC; -# endif // if CONFIG_SOC_WIFI_HE_SUPPORT -# endif // if CONFIG_SOC_WIFI_SUPPORT_5G +# endif // if CONFIG_SOC_WIFI_HE_SUPPORT +# endif // if CONFIG_SOC_WIFI_SUPPORT_5G uint8_t protocol = 0; @@ -467,9 +468,9 @@ void setConnectionSpeed(bool ForceWiFi_bg_mode) if (WiFiEventData.connectionFailures > 10) { // Set to allow all protocols protocol = WIFI_PROTOCOL_11B | WIFI_PROTOCOL_11G | WIFI_PROTOCOL_11N; -# if CONFIG_SOC_WIFI_HE_SUPPORT +# if CONFIG_SOC_WIFI_HE_SUPPORT protocol |= WIFI_PROTOCOL_11AX; -# endif +# endif } const WiFi_AP_Candidate candidate = WiFi_AP_Candidates.getCurrent(); @@ -482,18 +483,19 @@ void setConnectionSpeed(bool ForceWiFi_bg_mode) if (candidate.bits.phy_11g) { protocol |= WIFI_PROTOCOL_11G; } if (candidate.bits.phy_11n) { protocol |= WIFI_PROTOCOL_11N; } -# if CONFIG_SOC_WIFI_HE_SUPPORT +# if CONFIG_SOC_WIFI_HE_SUPPORT if (candidate.bits.phy_11ax) { protocol |= WIFI_PROTOCOL_11AX; } -# endif // if CONFIG_SOC_WIFI_HE_SUPPORT -/* -# if CONFIG_SOC_WIFI_SUPPORT_5G +# endif // if CONFIG_SOC_WIFI_HE_SUPPORT - if (candidate.bits.phy_11a) { protocol |= WIFI_PROTOCOL_11A; } + /* + # if CONFIG_SOC_WIFI_SUPPORT_5G - if (candidate.bits.phy_11ac) { protocol |= WIFI_PROTOCOL_11AC; } -# endif // if CONFIG_SOC_WIFI_SUPPORT_5G -*/ + if (candidate.bits.phy_11a) { protocol |= WIFI_PROTOCOL_11A; } + + if (candidate.bits.phy_11ac) { protocol |= WIFI_PROTOCOL_11AC; } + # endif // if CONFIG_SOC_WIFI_SUPPORT_5G + */ } else // Check to see if the access point is set to "N-only" @@ -504,81 +506,82 @@ void setConnectionSpeed(bool ForceWiFi_bg_mode) protocol |= WIFI_PROTOCOL_11N; addLog(LOG_LEVEL_INFO, F("WIFI : AP is set to 802.11n only")); } -# if CONFIG_SOC_WIFI_HE_SUPPORT +# if CONFIG_SOC_WIFI_HE_SUPPORT if (candidate.bits.phy_11ax) { // Set to use WiFi6 protocol |= WIFI_PROTOCOL_11AX; -// protocol_5GHz |= WIFI_PROTOCOL_11AX; + + // protocol_5GHz |= WIFI_PROTOCOL_11AX; addLog(LOG_LEVEL_INFO, F("WIFI : AP allows 802.11ax, Wi-Fi 6")); } -# if CONFIG_SOC_WIFI_SUPPORT_5G +# if CONFIG_SOC_WIFI_SUPPORT_5G if (candidate.bits.phy_11a) { // Set to use 5 GHz WiFi -// protocol_5GHz |= WIFI_PROTOCOL_11A; + // protocol_5GHz |= WIFI_PROTOCOL_11A; addLog(LOG_LEVEL_INFO, F("WIFI : AP allows 802.11a, 5 GHz")); } if (candidate.bits.phy_11ac) { // Set to use 5 GHz WiFi-5 -// protocol_5GHz |= WIFI_PROTOCOL_11AC; + // protocol_5GHz |= WIFI_PROTOCOL_11AC; addLog(LOG_LEVEL_INFO, F("WIFI : AP allows 802.11ac, 5 GHz Wi-Fi 5")); } -# endif // if CONFIG_SOC_WIFI_SUPPORT_5G -# endif // if CONFIG_SOC_WIFI_HE_SUPPORT +# endif // if CONFIG_SOC_WIFI_SUPPORT_5G +# endif // if CONFIG_SOC_WIFI_HE_SUPPORT } } } - if (WifiIsSTA(WiFi.getMode())) { + if (doWifiIsSTA(WiFi.getMode())) { // Set to use "Long GI" making it more resilliant to reflections // See: https://www.tp-link.com/us/configuration-guides/q_a_basic_wireless_concepts/?configurationId=2958#_idTextAnchor038 esp_wifi_config_80211_tx_rate(WIFI_IF_STA, WIFI_PHY_RATE_MCS3_LGI); - # if CONFIG_SOC_WIFI_SUPPORT_5G + # if CONFIG_SOC_WIFI_SUPPORT_5G setProtocol(WIFI_IF_STA, protocol, protocol_5GHz); - # else + # else setProtocol(WIFI_IF_STA, protocol); - # endif // if CONFIG_SOC_WIFI_SUPPORT_5G + # endif // if CONFIG_SOC_WIFI_SUPPORT_5G } - if (WifiIsAP(WiFi.getMode())) { - # if CONFIG_SOC_WIFI_SUPPORT_5G + if (doWifiIsAP(WiFi.getMode())) { + # if CONFIG_SOC_WIFI_SUPPORT_5G setProtocol(WIFI_IF_AP, protocol, protocol_5GHz); - # else + # else setProtocol(WIFI_IF_STA, protocol); - # endif // if CONFIG_SOC_WIFI_SUPPORT_5G + # endif // if CONFIG_SOC_WIFI_SUPPORT_5G } - #endif + # endif // ifndef SOC_WIFI_SUPPORTED } -void setWiFiNoneSleep() { - #ifndef ESP32P4 - WiFi.setSleep(WIFI_PS_NONE); - #endif +void doSetWiFiNoneSleep() { + # ifndef ESP32P4 + WiFi.setSleep(WIFI_PS_NONE); + # endif } -void setWiFiEcoPowerMode() +void doSetWiFiEcoPowerMode() { // Maximum modem power saving. // In this mode, interval to receive beacons is determined by the listen_interval parameter in wifi_sta_config_t // FIXME TD-er: Must test if this is desired behavior in ESP32. - #ifndef ESP32P4 + # ifndef ESP32P4 WiFi.setSleep(WIFI_PS_MAX_MODEM); - #endif + # endif } -void setWiFiDefaultPowerMode() +void doSetWiFiDefaultPowerMode() { // Minimum modem power saving. // In this mode, station wakes up to receive beacon every DTIM period - #ifndef ESP32P4 + # ifndef ESP32P4 WiFi.setSleep(WIFI_PS_MIN_MODEM); - #endif + # endif } -void setWiFiCountryPolicyManual() +void doSetWiFiCountryPolicyManual() { /* wifi_country_t config = { .cc = "01", diff --git a/src/ESPEasy/net/wifi/ESPEasyWifi_abstracted_ESP8266.cpp b/src/ESPEasy/net/wifi/ESPEasyWifi_abstracted_ESP8266.cpp index 326c7e551..bb11f699c 100644 --- a/src/ESPEasy/net/wifi/ESPEasyWifi_abstracted_ESP8266.cpp +++ b/src/ESPEasy/net/wifi/ESPEasyWifi_abstracted_ESP8266.cpp @@ -3,17 +3,16 @@ #if FEATURE_WIFI # ifdef ESP8266 -# include "../../../src/DataStructs/TimingStats.h" +# include "../../../src/DataStructs/TimingStats.h" +# include "../../../src/Helpers/StringConverter.h" +# include "../../../src/Globals/Settings.h" +# include "../../../src/Globals/WiFi_AP_Candidates.h" -# include "../../../src/Helpers/StringConverter.h" +# include "../Globals/ESPEasyWiFiEvent.h" +# include "../wifi/ESPEasyWiFiEvent_ESP8266.h" +# include "../wifi/ESPEasyWifi_ProcessEvent.h" -# include "../Globals/ESPEasyWiFiEvent.h" -# include "../../../src/Globals/Settings.h" -# include "../../../src/Globals/WiFi_AP_Candidates.h" - -# include "../wifi/ESPEasyWiFiEvent_ESP8266.h" -# include "../wifi/ESPEasyWifi_ProcessEvent.h" -# include "../wifi/ESPEasyWifi.h" +// # include "../wifi/ESPEasyWifi.h" namespace ESPEasy { namespace net { @@ -22,13 +21,13 @@ namespace wifi { bool WiFi_pre_setup() { registerWiFiEventHandler(); - setSTA_AP(false, false); + doSetSTA_AP(false, false); delay(100); return true; } bool WiFi_pre_STA_setup() { - if (!setSTA(true)) { return false; } + if (!doSetSTA(true)) { return false; } // Assign to 2 separate bools to make sure both are executed. const bool autoConnect = WiFi.setAutoConnect(false); @@ -41,9 +40,9 @@ bool WiFi_pre_STA_setup() { return true; } -void WiFiDisconnect() { +void doWiFiDisconnect() { // Only call disconnect when STA is active - if (WifiIsSTA(WiFi.getMode())) { + if (doWifiIsSTA(WiFi.getMode())) { wifi_station_disconnect(); } station_config conf{}; @@ -53,11 +52,11 @@ void WiFiDisconnect() { ETS_UART_INTR_ENABLE(); } -bool WifiIsAP(WiFiMode_t wifimode) { return (wifimode == WIFI_AP) || (wifimode == WIFI_AP_STA); } +bool doWifiIsAP(WiFiMode_t wifimode) { return (wifimode == WIFI_AP) || (wifimode == WIFI_AP_STA); } -bool WifiIsSTA(WiFiMode_t wifimode) { return (wifimode & WIFI_STA) != 0; } +bool doWifiIsSTA(WiFiMode_t wifimode) { return (wifimode & WIFI_STA) != 0; } -bool setWifiMode(WiFiMode_t new_mode) +bool doSetWifiMode(WiFiMode_t new_mode) { const WiFiMode_t cur_mode = WiFi.getMode(); @@ -75,7 +74,7 @@ bool setWifiMode(WiFiMode_t new_mode) processing_wifi_mode = static_cast(new_mode); - if (!WifiIsSTA(new_mode)) { + if (!doWifiIsSTA(new_mode)) { // calls lwIP's dhcp_stop(), // safe to call even if not started // See: https://github.com/esp8266/Arduino/pull/5703/files @@ -88,7 +87,7 @@ bool setWifiMode(WiFiMode_t new_mode) delay(100); } - addLog(LOG_LEVEL_INFO, concat(F("WIFI : Set WiFi to "), getWifiModeString(new_mode))); + addLog(LOG_LEVEL_INFO, concat(F("WIFI : Set WiFi to "), doGetWifiModeString(new_mode))); int retry = 2; @@ -126,16 +125,16 @@ bool setWifiMode(WiFiMode_t new_mode) return true; } -void WifiScan(bool async, uint8_t channel) { - ESPEasy::net::wifi::setSTA(true); +void doWifiScan(bool async, uint8_t channel) { + doSetSTA(true); - if (!WiFiScanAllowed()) { + if (!doWiFiScanAllowed()) { return; } START_TIMER; WiFiEventData.lastScanMoment.setNow(); - # ifndef BUILD_NO_DEBUG + # ifndef BUILD_NO_DEBUG if (loglevelActiveFor(LOG_LEVEL_INFO)) { if (channel == 0) { @@ -144,7 +143,7 @@ void WifiScan(bool async, uint8_t channel) { addLogMove(LOG_LEVEL_INFO, strformat(F("WiFi : Start network scan ch: %d "), channel)); } } - # endif // ifndef BUILD_NO_DEBUG + # endif // ifndef BUILD_NO_DEBUG bool show_hidden = true; WiFiEventData.processedScanDone = false; WiFiEventData.lastGetScanMoment.setNow(); @@ -198,14 +197,14 @@ void WifiScan(bool async, uint8_t channel) { processScanDone(); } } -# if FEATURE_TIMING_STATS +# if FEATURE_TIMING_STATS if (async) { STOP_TIMER(WIFI_SCAN_ASYNC); } else { STOP_TIMER(WIFI_SCAN_SYNC); } -# endif // if FEATURE_TIMING_STATS +# endif // if FEATURE_TIMING_STATS } @@ -231,12 +230,12 @@ void registerWiFiEventHandler() } } -float GetRSSIthreshold(float& maxTXpwr) { +float doGetRSSIthreshold(float& maxTXpwr) { maxTXpwr = Settings.getWiFi_TX_power(); float threshold = WIFI_SENSITIVITY_n; - switch (getConnectionProtocol()) + switch (doGetConnectionProtocol()) { case WiFiConnectionProtocol::WiFi_Protocol_11b: threshold = WIFI_SENSITIVITY_11b; @@ -259,7 +258,7 @@ float GetRSSIthreshold(float& maxTXpwr) { return threshold; } -WiFiConnectionProtocol getConnectionProtocol() +WiFiConnectionProtocol doGetConnectionProtocol() { if (WiFi.RSSI() < 0) { switch (wifi_get_phy_mode()) @@ -281,9 +280,9 @@ void doSetWiFiTXpower(float& dBm) { WiFi.setOutputPower(dBm); } # endif // if FEATURE_SET_WIFI_TX_PWR -void setConnectionSpeed(bool ForceWiFi_bg_mode) { +void doSetConnectionSpeed(bool ForceWiFi_bg_mode) { // ESP8266 only supports 802.11g mode when running in STA+AP - const bool forcedByAPmode = WifiIsAP(WiFi.getMode()); + const bool forcedByAPmode = doWifiIsAP(WiFi.getMode()); WiFiPhyMode_t phyMode = (ForceWiFi_bg_mode || forcedByAPmode) ? WIFI_PHY_MODE_11G : WIFI_PHY_MODE_11N; if (!forcedByAPmode) { @@ -330,17 +329,17 @@ void setConnectionSpeed(bool ForceWiFi_bg_mode) { WiFi.setPhyMode(phyMode); } -void setWiFiNoneSleep() { WiFi.setSleepMode(WIFI_NONE_SLEEP); } +void doSetWiFiNoneSleep() { WiFi.setSleepMode(WIFI_NONE_SLEEP); } -void setWiFiEcoPowerMode() +void doSetWiFiEcoPowerMode() { // Allow light sleep during idle times WiFi.setSleepMode(WIFI_LIGHT_SLEEP); } -void setWiFiDefaultPowerMode() { WiFi.setSleepMode(WIFI_MODEM_SLEEP); } +void doSetWiFiDefaultPowerMode() { WiFi.setSleepMode(WIFI_MODEM_SLEEP); } -void setWiFiCountryPolicyManual() { +void doSetWiFiCountryPolicyManual() { // Not yet implemented/required for ESP8266 } diff --git a/src/ESPEasy/net/wifi/WiFiConnectionProtocol.cpp b/src/ESPEasy/net/wifi/WiFiConnectionProtocol.cpp index 6fad22651..a7fa45ff5 100644 --- a/src/ESPEasy/net/wifi/WiFiConnectionProtocol.cpp +++ b/src/ESPEasy/net/wifi/WiFiConnectionProtocol.cpp @@ -1,11 +1,12 @@ #include "../wifi/WiFiConnectionProtocol.h" +#if FEATURE_WIFI namespace ESPEasy { namespace net { namespace wifi { -#ifdef ESP8266 +# ifdef ESP8266 const __FlashStringHelper* toString(WiFiConnectionProtocol proto) { switch (proto) @@ -22,9 +23,9 @@ const __FlashStringHelper* toString(WiFiConnectionProtocol proto) { return F("-"); } -#endif // ifdef ESP8266 +# endif // ifdef ESP8266 -#ifdef ESP32 +# ifdef ESP32 const __FlashStringHelper* toString(WiFiConnectionProtocol proto) { switch (proto) @@ -37,12 +38,12 @@ const __FlashStringHelper* toString(WiFiConnectionProtocol proto) { return F("Wi-Fi 4: 802.11n (HT20)"); case WiFiConnectionProtocol::WiFi_Protocol_HT40: return F("Wi-Fi 4: 802.11n (HT40)"); - # if ESP_IDF_VERSION > ESP_IDF_VERSION_VAL(5, 2, 0) + # if ESP_IDF_VERSION > ESP_IDF_VERSION_VAL(5, 2, 0) case WiFiConnectionProtocol::WiFi_Protocol_11a: return F("Wi-Fi 2: 802.11a"); case WiFiConnectionProtocol::WiFi_Protocol_VHT20: return F("Wi-Fi 5: 802.11ac (VHT20)"); - # endif // if ESP_IDF_VERSION > ESP_IDF_VERSION_VAL(5, 2, 0) + # endif // if ESP_IDF_VERSION > ESP_IDF_VERSION_VAL(5, 2, 0) case WiFiConnectionProtocol::WiFi_Protocol_HE20: return F("Wi-Fi 6: 802.11ax (HE20)"); case WiFiConnectionProtocol::WiFi_Protocol_LR: @@ -54,7 +55,8 @@ const __FlashStringHelper* toString(WiFiConnectionProtocol proto) { return F("-"); } -#endif // ifdef ESP32 -} -} -} \ No newline at end of file +# endif // ifdef ESP32 +} // namespace wifi +} // namespace net +} // namespace ESPEasy +#endif // if FEATURE_WIFI diff --git a/src/ESPEasy/net/wifi/WiFiConnectionProtocol.h b/src/ESPEasy/net/wifi/WiFiConnectionProtocol.h index f50639bc8..0dc34223d 100644 --- a/src/ESPEasy/net/wifi/WiFiConnectionProtocol.h +++ b/src/ESPEasy/net/wifi/WiFiConnectionProtocol.h @@ -2,24 +2,28 @@ #include "../../../ESPEasy_common.h" +#if FEATURE_WIFI + + namespace ESPEasy { namespace net { namespace wifi { -#ifdef ESP8266 +# ifdef ESP8266 enum class WiFiConnectionProtocol { Unknown, WiFi_Protocol_11b, WiFi_Protocol_11g, WiFi_Protocol_11n + }; -#endif +# endif // ifdef ESP8266 -#ifdef ESP32 +# ifdef ESP32 enum class WiFiConnectionProtocol { Unknown, @@ -27,21 +31,24 @@ enum class WiFiConnectionProtocol { WiFi_Protocol_11g, WiFi_Protocol_HT20, WiFi_Protocol_HT40, -# if ESP_IDF_VERSION > ESP_IDF_VERSION_VAL(5, \ - 2, \ - 0) +# if ESP_IDF_VERSION > ESP_IDF_VERSION_VAL(5, \ + 2, \ + 0) WiFi_Protocol_11a, // traditional (old) 5 GHz WiFi_Protocol_VHT20, // 5 GHz WiFi 5, 802.11ac -# endif // if ESP_IDF_VERSION > ESP_IDF_VERSION_VAL(5, 2, 0) - WiFi_Protocol_HE20, // WiFi 6 +# endif // if ESP_IDF_VERSION > ESP_IDF_VERSION_VAL(5, 2, 0) + WiFi_Protocol_HE20, // WiFi 6 WiFi_Protocol_LR + }; -#endif +# endif // ifdef ESP32 const __FlashStringHelper* toString(WiFiConnectionProtocol proto); -} -} -} \ No newline at end of file +} // namespace wifi +} // namespace net +} // namespace ESPEasy + +#endif // if FEATURE_WIFI diff --git a/src/ESPEasy/net/wifi/WiFiDisconnectReason.h b/src/ESPEasy/net/wifi/WiFiDisconnectReason.h index dee47d019..faefbb833 100644 --- a/src/ESPEasy/net/wifi/WiFiDisconnectReason.h +++ b/src/ESPEasy/net/wifi/WiFiDisconnectReason.h @@ -1,5 +1,9 @@ #pragma once +#include "../../../ESPEasy_common.h" + +#if FEATURE_WIFI + // The WiFi Disconnect Reason is not part of the ESPEasy::net::wifi namespace // ESP8266 does have it defined as a type, but ESP32 doesn't. @@ -7,12 +11,12 @@ // out of this namespace /* -namespace ESPEasy { -namespace net { -namespace wifi { -*/ + namespace ESPEasy { + namespace net { + namespace wifi { + */ -#ifdef ESP32 +# ifdef ESP32 enum WiFiDisconnectReason { WIFI_DISCONNECT_REASON_UNSPECIFIED = 1, @@ -44,10 +48,15 @@ enum WiFiDisconnectReason WIFI_DISCONNECT_REASON_AUTH_FAIL = 202, WIFI_DISCONNECT_REASON_ASSOC_FAIL = 203, WIFI_DISCONNECT_REASON_HANDSHAKE_TIMEOUT = 204 + }; -#endif + +# endif // ifdef ESP32 + /* -} -} -} -*/ \ No newline at end of file + } + } + } + */ + +#endif // if FEATURE_WIFI diff --git a/src/_P075_Nextion.ino b/src/_P075_Nextion.ino index c5399cf85..b50853d7d 100644 --- a/src/_P075_Nextion.ino +++ b/src/_P075_Nextion.ino @@ -215,7 +215,7 @@ boolean Plugin_075(uint8_t function, struct EventStruct *event, String& string) if (RssiIndex >= 0) { newString = concat( P075_data->displayLines[x].substring(0, RssiIndex), - GetRSSI_quality() * 10); + ESPEasy::net::wifi::GetRSSI_quality() * 10); } else { String tmpString(P075_data->displayLines[x]); diff --git a/src/src/Commands/WiFi.cpp b/src/src/Commands/WiFi.cpp index 3acfd97c1..649659ec7 100644 --- a/src/src/Commands/WiFi.cpp +++ b/src/src/Commands/WiFi.cpp @@ -19,7 +19,7 @@ #include "../Helpers/StringConverter.h" #include "../../ESPEasy/net/wifi/ESPEasyWifi.h" -#include "../../ESPEasy/net/wifi/ESPEasyWifi_abstracted.h" + #define WIFI_MODE_MAX (WiFiMode_t)4 @@ -78,7 +78,7 @@ String Command_Wifi_HiddenSSID(struct EventStruct *event, const char *Line) const __FlashStringHelper* Command_Wifi_Scan(struct EventStruct *event, const char *Line) { - WiFiScan_log_to_serial(); + ESPEasy::net::wifi::WiFiScan_log_to_serial(); return return_command_success_flashstr(); } @@ -91,7 +91,7 @@ const __FlashStringHelper* Command_Wifi_Connect(struct EventStruct *event, const const __FlashStringHelper* Command_Wifi_Disconnect(struct EventStruct *event, const char *Line) { RTC.clearLastWiFi(); // Force a WiFi scan - WifiDisconnect(); + ESPEasy::net::wifi::WifiDisconnect(); return return_command_success_flashstr(); } diff --git a/src/src/ESPEasyCore/ESPEasyEth_ProcessEvent.cpp b/src/src/ESPEasyCore/ESPEasyEth_ProcessEvent.cpp index 449423ef6..51bb8cadd 100644 --- a/src/src/ESPEasyCore/ESPEasyEth_ProcessEvent.cpp +++ b/src/src/ESPEasyCore/ESPEasyEth_ProcessEvent.cpp @@ -247,7 +247,7 @@ void processEthernetGotIP() { eventQueue.add(F("Ethernet#Connected")); } statusLED(true); - logConnectionStatus(); + ESPEasy::net::wifi::logConnectionStatus(); EthEventData.processedGotIP = true; #if ESP_IDF_VERSION_MAJOR >= 5 diff --git a/src/src/ESPEasyCore/ESPEasyNetwork.cpp b/src/src/ESPEasyCore/ESPEasyNetwork.cpp index c08ad3ef6..96d14c0f4 100644 --- a/src/src/ESPEasyCore/ESPEasyNetwork.cpp +++ b/src/src/ESPEasyCore/ESPEasyNetwork.cpp @@ -1,6 +1,7 @@ #include "../ESPEasyCore/ESPEasyNetwork.h" -#include "../../ESPEasy/net/wifi/ESPEasyWifi_abstracted.h" +#include "../../ESPEasy/net/wifi/ESPEasyWifi.h" + #include "../../ESPEasy/net/Globals/NetworkState.h" #include "../Globals/Settings.h" diff --git a/src/src/ESPEasyCore/ESPEasyNetwork_ESP32.cpp b/src/src/ESPEasyCore/ESPEasyNetwork_ESP32.cpp index 367da4beb..0e0b2aeda 100644 --- a/src/src/ESPEasyCore/ESPEasyNetwork_ESP32.cpp +++ b/src/src/ESPEasyCore/ESPEasyNetwork_ESP32.cpp @@ -5,7 +5,7 @@ #include "../ESPEasyCore/ESPEasy_Log.h" #include "../ESPEasyCore/ESPEasyEth.h" #include "../../ESPEasy/net/wifi/ESPEasyWifi.h" -#include "../../ESPEasy/net/wifi/ESPEasyWifi_abstracted.h" + #include "../Globals/ESPEasy_time.h" #include "../../ESPEasy/net/Globals/ESPEasyWiFiEvent.h" #include "../../ESPEasy/net/Globals/NetworkState.h" @@ -93,7 +93,7 @@ void NetworkConnectRelaxed() { // Failed to start the Ethernet network, probably not present of wrong parameters. // So set the runtime active medium to WiFi to try connecting to WiFi or at least start the AP. - WiFiConnectRelaxed(); + ESPEasy::net::wifi::WiFiConnectRelaxed(); } // Forward declaration to access internal function in NetworkInterface.cpp diff --git a/src/src/ESPEasyCore/ESPEasyNetwork_ESP8266.cpp b/src/src/ESPEasyCore/ESPEasyNetwork_ESP8266.cpp index 9619a3b7d..be68253f5 100644 --- a/src/src/ESPEasyCore/ESPEasyNetwork_ESP8266.cpp +++ b/src/src/ESPEasyCore/ESPEasyNetwork_ESP8266.cpp @@ -5,7 +5,7 @@ #include "../ESPEasyCore/ESPEasy_Log.h" #include "../ESPEasyCore/ESPEasyEth.h" #include "../../ESPEasy/net/wifi/ESPEasyWifi.h" -#include "../../ESPEasy/net/wifi/ESPEasyWifi_abstracted.h" + #include "../Globals/ESPEasy_time.h" #include "../../ESPEasy/net/Globals/ESPEasyWiFiEvent.h" #include "../../ESPEasy/net/Globals/NetworkState.h" @@ -46,10 +46,10 @@ void setNetworkMedium(NetworkMedium_t new_medium) { \*********************************************************************************************/ void NetworkConnectRelaxed() { if (NetworkConnected()) { return; } - WiFiConnectRelaxed(); + ESPEasy::net::wifi::WiFiConnectRelaxed(); } -bool NetworkConnected() { return WiFiConnected(); } +bool NetworkConnected() { return ESPEasy::net::wifi::WiFiConnected(); } IPAddress NetworkLocalIP() { return WiFi.localIP(); } diff --git a/src/src/ESPEasyCore/ESPEasy_loop.cpp b/src/src/ESPEasyCore/ESPEasy_loop.cpp index b395aa165..6a1b3c129 100644 --- a/src/src/ESPEasyCore/ESPEasy_loop.cpp +++ b/src/src/ESPEasyCore/ESPEasy_loop.cpp @@ -73,9 +73,9 @@ void ESPEasy_loop() updateLoopStats(); - loopWiFi(); + ESPEasy::net::wifi::loopWiFi(); - handle_unprocessedNetworkEvents(); + ESPEasy::net::wifi::handle_unprocessedNetworkEvents(); bool firstLoopConnectionsEstablished = NetworkConnected() && firstLoop; diff --git a/src/src/ESPEasyCore/ESPEasy_setup.cpp b/src/src/ESPEasyCore/ESPEasy_setup.cpp index b79022645..076b0653c 100644 --- a/src/src/ESPEasyCore/ESPEasy_setup.cpp +++ b/src/src/ESPEasyCore/ESPEasy_setup.cpp @@ -10,7 +10,7 @@ #include "../ESPEasyCore/ESPEasyNetwork.h" #include "../ESPEasyCore/ESPEasyRules.h" #include "../../ESPEasy/net/wifi/ESPEasyWifi.h" -#include "../../ESPEasy/net/wifi/ESPEasyWifi_abstracted.h" + #include "../../ESPEasy/net/wifi/ESPEasyWifi_ProcessEvent.h" #include "../ESPEasyCore/Serial.h" #include "../Globals/Cache.h" @@ -229,7 +229,7 @@ void ESPEasy_setup() CPluginSetup(); ESPEasy::net::NWPluginSetup(); - initWiFi(); + ESPEasy::net::wifi::initWiFi(); WiFiEventData.clearAll(); #ifndef BUILD_MINIMAL_OTA @@ -483,7 +483,7 @@ void ESPEasy_setup() ESPEasy::net::wifi::WifiScan(false, RTC.lastWiFiChannel); } WiFi_AP_Candidates.clearCache(); - processScanDone(); + ESPEasy::net::wifi::processScanDone(); WiFi_AP_Candidates.load_knownCredentials(); if (!WiFi_AP_Candidates.hasCandidates()) { diff --git a/src/src/Helpers/ESPEasy_FactoryDefault.cpp b/src/src/Helpers/ESPEasy_FactoryDefault.cpp index e5e461171..c2629eae6 100644 --- a/src/src/Helpers/ESPEasy_FactoryDefault.cpp +++ b/src/src/Helpers/ESPEasy_FactoryDefault.cpp @@ -420,7 +420,7 @@ void ResetFactory(bool formatFS) delay(1000); WiFi.persistent(true); // use SDK storage of SSID/WPA parameters WiFiEventData.intent_to_reboot = true; - WifiDisconnect(); // this will store empty ssid/wpa into sdk storage + ESPEasy::net::wifi::WifiDisconnect(); // this will store empty ssid/wpa into sdk storage WiFi.persistent(false); // Do not use SDK storage of SSID/WPA parameters reboot(IntendedRebootReason_e::ResetFactory); } diff --git a/src/src/Helpers/ESPEasy_Storage.cpp b/src/src/Helpers/ESPEasy_Storage.cpp index bf833cca6..95cf3c5d8 100644 --- a/src/src/Helpers/ESPEasy_Storage.cpp +++ b/src/src/Helpers/ESPEasy_Storage.cpp @@ -17,7 +17,7 @@ #include "../ESPEasyCore/ESPEasy_Log.h" #include "../ESPEasyCore/ESPEasyNetwork.h" #include "../../ESPEasy/net/wifi/ESPEasyWifi.h" -#include "../../ESPEasy/net/wifi/ESPEasyWifi_abstracted.h" + #include "../ESPEasyCore/Serial.h" #include "../Globals/CRCValues.h" @@ -682,7 +682,7 @@ bool check_and_update_WiFi_Calibration() { bool Erase_WiFi_Calibration() { #ifdef ESP8266 - WifiDisconnect(); + ESPEasy::net::wifi::WifiDisconnect(); ESPEasy::net::wifi::setWifiMode(WIFI_OFF); if (!ESP.eraseConfig()) return false; @@ -695,7 +695,7 @@ bool Erase_WiFi_Calibration() { # ifndef SOC_WIFI_SUPPORTED return false; #else - WifiDisconnect(); + ESPEasy::net::wifi::WifiDisconnect(); ESPEasy::net::wifi::setWifiMode(WIFI_OFF); // Make sure power is stable, so wait a bit longer delay(1000); @@ -866,8 +866,8 @@ String SaveSecuritySettings(bool forFactoryReset) { WiFi_AP_Candidates.force_reload(); // Force reload of the credentials and found APs from the last scan if (!NetworkConnected()) { WiFiEventData.wifiConnectAttemptNeeded = true; - resetWiFi(); - AttemptWiFiConnect(); + ESPEasy::net::wifi::resetWiFi(); + ESPEasy::net::wifi::AttemptWiFiConnect(); } } } diff --git a/src/src/Helpers/Network.cpp b/src/src/Helpers/Network.cpp index 2a5d08e71..b3824fecd 100644 --- a/src/src/Helpers/Network.cpp +++ b/src/src/Helpers/Network.cpp @@ -3,7 +3,7 @@ #include "../../ESPEasy_common.h" #include "../../ESPEasy/net/wifi/ESPEasyWifi.h" -#include "../../ESPEasy/net/wifi/ESPEasyWifi_abstracted.h" + #include "../ESPEasyCore/ESPEasyNetwork.h" #include "../Globals/Settings.h" diff --git a/src/src/Helpers/Networking.cpp b/src/src/Helpers/Networking.cpp index 2219e35a1..6cc61fd2d 100644 --- a/src/src/Helpers/Networking.cpp +++ b/src/src/Helpers/Networking.cpp @@ -1043,7 +1043,7 @@ bool useStaticIP() { return ethUseStaticIP(); } #endif // if FEATURE_ETHERNET - return WiFiUseStaticIP(); + return ESPEasy::net::wifi::WiFiUseStaticIP(); } // Check connection. Maximum timeout 500 msec. diff --git a/src/src/Helpers/PeriodicalActions.cpp b/src/src/Helpers/PeriodicalActions.cpp index 4a612b344..8b093cfe0 100644 --- a/src/src/Helpers/PeriodicalActions.cpp +++ b/src/src/Helpers/PeriodicalActions.cpp @@ -11,20 +11,13 @@ #include "../ESPEasyCore/ESPEasyGPIO.h" #include "../ESPEasyCore/ESPEasy_Log.h" #include "../ESPEasyCore/ESPEasyNetwork.h" -#include "../../ESPEasy/net/wifi/ESPEasyWifi.h" -#include "../../ESPEasy/net/wifi/ESPEasyWifi_abstracted.h" #include "../ESPEasyCore/ESPEasyRules.h" #include "../ESPEasyCore/Serial.h" -#include "../../ESPEasy/net/Globals/ESPEasyWiFiEvent.h" -#if FEATURE_ETHERNET -#include "../../ESPEasy/net/Globals/ESPEasyEthEvent.h" -#endif #include "../Globals/ESPEasy_Scheduler.h" #include "../Globals/ESPEasy_time.h" #include "../Globals/EventQueue.h" #include "../Globals/MainLoopCommand.h" #include "../Globals/MQTT.h" -#include "../../ESPEasy/net/Globals/NetworkState.h" #include "../Globals/RTC.h" #include "../Globals/Services.h" #include "../Globals/Settings.h" @@ -40,6 +33,14 @@ #include "../Helpers/StringGenerator_WiFi.h" #include "../Helpers/StringProvider.h" +#include "../../ESPEasy/net/wifi/ESPEasyWifi.h" +#include "../../ESPEasy/net/Globals/ESPEasyWiFiEvent.h" +#if FEATURE_ETHERNET +#include "../../ESPEasy/net/Globals/ESPEasyEthEvent.h" +#endif +#include "../../ESPEasy/net/Globals/NetworkState.h" + + #ifdef USES_C015 #include "../../ESPEasy_fdwdecl.h" #endif @@ -148,7 +149,7 @@ void runOncePerSecond() { case CMD_WIFI_DISCONNECT: { - WifiDisconnect(); + ESPEasy::net::wifi::WifiDisconnect(); break; } case CMD_REBOOT: diff --git a/src/src/Helpers/StringProvider.cpp b/src/src/Helpers/StringProvider.cpp index 1444fa813..38a4414a5 100644 --- a/src/src/Helpers/StringProvider.cpp +++ b/src/src/Helpers/StringProvider.cpp @@ -10,7 +10,7 @@ #include "../ESPEasyCore/ESPEasyNetwork.h" #include "../../ESPEasy/net/wifi/ESPEasyWifi.h" -#include "../../ESPEasy/net/wifi/ESPEasyWifi_abstracted.h" + #if FEATURE_ETHERNET #include "../ESPEasyCore/ESPEasyEth.h" #endif @@ -750,7 +750,7 @@ String getFormNote(LabelType::Enum label) case LabelType::WIFI_SENS_MARGIN: { float maxTXpwr; - float sensitivity = GetRSSIthreshold(maxTXpwr); + float sensitivity = ESPEasy::net::wifi::GetRSSIthreshold(maxTXpwr); if (LabelType::WIFI_TX_MAX_PWR == label) { return strformat( F("Current max: %.2f dBm"), maxTXpwr); diff --git a/src/src/Helpers/_CPlugin_DomoticzHelper.cpp b/src/src/Helpers/_CPlugin_DomoticzHelper.cpp index b18b4e2ce..67aeaed75 100644 --- a/src/src/Helpers/_CPlugin_DomoticzHelper.cpp +++ b/src/src/Helpers/_CPlugin_DomoticzHelper.cpp @@ -42,7 +42,7 @@ int humStatDomoticz(struct EventStruct *event, uint8_t rel_index) { } int mapRSSItoDomoticz() { - return GetRSSI_quality(); + return ESPEasy::net::wifi::GetRSSI_quality(); } int mapVccToDomoticz() { diff --git a/src/src/WebServer/AccessControl.cpp b/src/src/WebServer/AccessControl.cpp index a6d8fc501..c77ee940f 100644 --- a/src/src/WebServer/AccessControl.cpp +++ b/src/src/WebServer/AccessControl.cpp @@ -5,7 +5,7 @@ #include "../ESPEasyCore/ESPEasy_Log.h" #include "../ESPEasyCore/ESPEasyNetwork.h" #include "../../ESPEasy/net/wifi/ESPEasyWifi.h" -#include "../../ESPEasy/net/wifi/ESPEasyWifi_abstracted.h" + #include "../Globals/SecuritySettings.h" #include "../Globals/Services.h" diff --git a/src/src/WebServer/AdvancedConfigPage.cpp b/src/src/WebServer/AdvancedConfigPage.cpp index ec1d23527..9e5be9b61 100644 --- a/src/src/WebServer/AdvancedConfigPage.cpp +++ b/src/src/WebServer/AdvancedConfigPage.cpp @@ -9,7 +9,7 @@ #include "../WebServer/ESPEasy_WebServer.h" #include "../../ESPEasy/net/wifi/ESPEasyWifi.h" -#include "../../ESPEasy/net/wifi/ESPEasyWifi_abstracted.h" + #include "../Globals/ESPEasy_time.h" #include "../Globals/Settings.h" diff --git a/src/src/WebServer/ESPEasy_WebServer.cpp b/src/src/WebServer/ESPEasy_WebServer.cpp index a59613e00..1b5614ad8 100644 --- a/src/src/WebServer/ESPEasy_WebServer.cpp +++ b/src/src/WebServer/ESPEasy_WebServer.cpp @@ -54,7 +54,7 @@ #include "../ESPEasyCore/ESPEasyNetwork.h" #include "../ESPEasyCore/ESPEasyRules.h" #include "../../ESPEasy/net/wifi/ESPEasyWifi.h" -#include "../../ESPEasy/net/wifi/ESPEasyWifi_abstracted.h" + #include "../Globals/CPlugins.h" #include "../Globals/Device.h" diff --git a/src/src/WebServer/SetupPage.cpp b/src/src/WebServer/SetupPage.cpp index d90646707..73282a902 100644 --- a/src/src/WebServer/SetupPage.cpp +++ b/src/src/WebServer/SetupPage.cpp @@ -13,7 +13,7 @@ # include "../ESPEasyCore/ESPEasyNetwork.h" # include "../../ESPEasy/net/wifi/ESPEasyWifi.h" -#include "../../ESPEasy/net/wifi/ESPEasyWifi_abstracted.h" + # include "../../ESPEasy/net/Globals/ESPEasyWiFiEvent.h" #include "../../ESPEasy/net/Globals/NetworkState.h" @@ -130,7 +130,7 @@ void handle_setup() { } status = HANDLE_SETUP_CONNECTING_STAGE; refreshCount = 0; - AttemptWiFiConnect(); + ESPEasy::net::wifi::AttemptWiFiConnect(); } } } @@ -246,7 +246,7 @@ void handle_setup_scan_and_show(const String& ssid, const String& other, const S const bool needsRescan = (scanCompleteStatus == 0 || // No AP found scanCompleteStatus == -2) // Scan not triggered - && WiFiScanAllowed(); + && ESPEasy::net::wifi::WiFiScanAllowed(); if (needsRescan) { WiFiMode_t cur_wifimode = WiFi.getMode(); ESPEasy::net::wifi::WifiScan(false); diff --git a/src/src/WebServer/SysInfoPage.cpp b/src/src/WebServer/SysInfoPage.cpp index 6bbad38df..948246ded 100644 --- a/src/src/WebServer/SysInfoPage.cpp +++ b/src/src/WebServer/SysInfoPage.cpp @@ -125,7 +125,7 @@ void handle_sysinfo_json() { json_close(); json_open(false, F("wifi")); - json_prop(F("type"), toString(getConnectionProtocol())); + json_prop(F("type"), toString(ESPEasy::net::wifi::getConnectionProtocol())); json_number(F("rssi"), String(WiFi.RSSI())); json_prop(F("dhcp"), useStaticIP() ? getLabel(LabelType::IP_CONFIG_STATIC) : getLabel(LabelType::IP_CONFIG_DYNAMIC)); json_prop(F("ip"), getValue(LabelType::IP_ADDRESS)); @@ -491,7 +491,7 @@ void handle_sysinfo_Network() { addRowLabel(LabelType::WIFI_CONNECTION); if (showWiFiConnectionInfo) { - addHtml(toString(getConnectionProtocol())); + addHtml(toString(ESPEasy::net::wifi::getConnectionProtocol())); addHtml(F(" (RSSI ")); addHtmlInt(WiFi.RSSI()); addHtml(F(" dBm)")); @@ -507,7 +507,7 @@ void handle_sysinfo_Network() { } else addHtml('-'); #ifdef ESP32 - const int64_t tsf_time = WiFi_get_TSF_time(); + const int64_t tsf_time = ESPEasy::net::wifi::WiFi_get_TSF_time(); if (tsf_time > 0) { addRowLabel(F("WiFi TSF time")); // Split it while printing, so we're not loosing a lot of decimals in the float conversion diff --git a/src/src/WebServer/WiFiScanner.cpp b/src/src/WebServer/WiFiScanner.cpp index 96c2c0027..84f03d644 100644 --- a/src/src/WebServer/WiFiScanner.cpp +++ b/src/src/WebServer/WiFiScanner.cpp @@ -5,7 +5,7 @@ #include "../WebServer/HTML_wrappers.h" #include "../../ESPEasy/net/wifi/ESPEasyWifi.h" -#include "../../ESPEasy/net/wifi/ESPEasyWifi_abstracted.h" + #include "../Globals/WiFi_AP_Candidates.h" #include "../Helpers/StringGenerator_WiFi.h" From 21f53f15070dc1d8ea5d5e18a76934a6cbba96c6 Mon Sep 17 00:00:00 2001 From: TD-er Date: Sun, 27 Jul 2025 15:42:14 +0200 Subject: [PATCH 148/564] [Network] Move Network code to ESPEasy::net namespace --- .../net}/DataStructs/MAC_address.cpp | 2 +- .../net}/DataStructs/MAC_address.h | 5 +- .../net/DataStructs/NetworkSettingsStruct.cpp | 2 +- src/ESPEasy/net/DataStructs/WiFiEventData.h | 2 +- .../net}/ESPEasyNetwork.cpp | 16 +- .../net}/ESPEasyNetwork.h | 11 +- .../net}/ESPEasyNetwork_ESP32.cpp | 43 +-- .../net}/ESPEasyNetwork_ESP8266.cpp | 33 ++- src/ESPEasy/net/Globals/ESPEasyEthEvent.cpp | 1 - src/ESPEasy/net/Globals/ESPEasyEthEvent.h | 1 - src/ESPEasy/net/Globals/ESPEasyWiFi.cpp | 2 +- src/ESPEasy/net/Globals/ESPEasyWiFi.h | 6 +- src/ESPEasy/net/Globals/NetworkState.cpp | 3 +- src/ESPEasy/net/Globals/NetworkState.h | 3 +- src/ESPEasy/net/_NW001_WiFi_STA.cpp | 2 +- src/ESPEasy/net/_NW002_WiFi_AP.cpp | 2 +- src/ESPEasy/net/_NW003_ETH_RMII.cpp | 5 +- src/ESPEasy/net/_NW004_ETH_SPI.cpp | 4 +- src/ESPEasy/net/_NW005_PPP_modem.cpp | 2 +- .../net/eth}/ESPEasyEth.cpp | 267 ++++++++++-------- src/ESPEasy/net/eth/ESPEasyEth.h | 35 +++ src/ESPEasy/net/eth/ESPEasyEthEvent.cpp | 76 +++++ src/ESPEasy/net/eth/ESPEasyEthEvent.h | 26 ++ .../net/eth}/ESPEasyEth_ProcessEvent.cpp | 90 +++--- .../net/eth}/ESPEasyEth_ProcessEvent.h | 21 +- .../net/wifi/ESPEasyWiFiEvent_ESP32.cpp | 24 +- src/ESPEasy/net/wifi/ESPEasyWiFiEvent_ESP32.h | 24 +- .../net/wifi/ESPEasyWiFiEvent_ESP8266.cpp | 26 +- .../net/wifi/ESPEasyWiFiEvent_ESP8266.h | 6 +- .../net/wifi/ESPEasyWiFi_state_machine.cpp | 2 +- .../net/wifi/ESPEasyWiFi_state_machine.h | 36 +-- .../wifi/ESPEasyWiFi_state_machine_ESP32.cpp | 6 +- src/ESPEasy/net/wifi/ESPEasyWifi.cpp | 2 +- src/ESPEasy/net/wifi/ESPEasyWifi.h | 34 ++- .../net/wifi/ESPEasyWifi_ProcessEvent.cpp | 10 +- .../net/wifi/ESPEasyWifi_ProcessEvent.h | 12 +- .../net/wifi/ESPEasyWifi_abstracted.cpp | 2 +- .../net/wifi/ESPEasyWifi_abstracted_ESP32.cpp | 3 +- src/_C009.cpp | 2 +- src/_C011.cpp | 2 +- src/_C012.cpp | 2 +- src/_C014.cpp | 2 +- src/_C015.cpp | 4 +- src/_P036_FrameOLED.ino | 4 +- src/_P092_DLbus.ino | 6 +- src/_P094_CULReader.ino | 4 +- src/src/Commands/HTTP.cpp | 4 +- src/src/Commands/Networks.cpp | 22 +- src/src/Commands/Settings.cpp | 4 +- src/src/Commands/UDP.cpp | 4 +- .../DataStructs/ControllerSettingsStruct.cpp | 4 +- src/src/DataStructs/NodeStruct.cpp | 12 +- src/src/DataStructs/NodeStruct.h | 2 +- src/src/DataStructs/NodesHandler.cpp | 20 +- src/src/DataStructs/NodesHandler.h | 2 +- src/src/DataStructs/Web_StreamingBuffer.cpp | 2 +- src/src/DataStructs/WiFi_AP_Candidate.h | 2 +- src/src/ESPEasyCore/ESPEasyEth.h | 27 -- src/src/ESPEasyCore/ESPEasyEthEvent.cpp | 64 ----- src/src/ESPEasyCore/ESPEasyEthEvent.h | 20 -- .../ESPEasyCore/ESPEasy_backgroundtasks.cpp | 6 +- src/src/ESPEasyCore/ESPEasy_loop.cpp | 4 +- src/src/ESPEasyCore/ESPEasy_setup.cpp | 6 +- src/src/Helpers/DeepSleep.cpp | 6 +- src/src/Helpers/ESPEasy_Storage.cpp | 6 +- src/src/Helpers/ESPEasy_time.cpp | 4 +- src/src/Helpers/Improv_Helper.cpp | 4 +- src/src/Helpers/MDNS_Helper.cpp | 4 +- src/src/Helpers/Network.cpp | 4 +- src/src/Helpers/Networking.cpp | 34 +-- src/src/Helpers/PeriodicalActions.cpp | 6 +- src/src/Helpers/StringProvider.cpp | 53 ++-- src/src/Helpers/SystemVariables.cpp | 4 +- src/src/Helpers/_CPlugin_Helper.cpp | 8 +- src/src/Helpers/_CPlugin_Helper.h | 2 +- src/src/PluginStructs/P020_data_struct.cpp | 8 +- src/src/PluginStructs/P026_data_struct.cpp | 4 +- src/src/PluginStructs/P036_data_struct.cpp | 12 +- src/src/PluginStructs/P044_data_struct.cpp | 6 +- src/src/PluginStructs/P089_data_struct.cpp | 2 +- src/src/PluginStructs/P089_data_struct.h | 2 +- src/src/PluginStructs/P099_data_struct.cpp | 2 +- src/src/WebServer/AccessControl.cpp | 2 +- src/src/WebServer/ConfigPage.cpp | 4 +- src/src/WebServer/ESPEasy_WebServer.cpp | 6 +- src/src/WebServer/Markup_Forms.h | 2 +- src/src/WebServer/Metrics.cpp | 2 +- src/src/WebServer/RootPage.cpp | 2 +- src/src/WebServer/SetupPage.cpp | 6 +- src/src/WebServer/SysInfoPage.cpp | 6 +- 90 files changed, 686 insertions(+), 593 deletions(-) rename src/{src => ESPEasy/net}/DataStructs/MAC_address.cpp (97%) rename src/{src => ESPEasy/net}/DataStructs/MAC_address.h (91%) rename src/{src/ESPEasyCore => ESPEasy/net}/ESPEasyNetwork.cpp (85%) rename src/{src/ESPEasyCore => ESPEasy/net}/ESPEasyNetwork.h (90%) rename src/{src/ESPEasyCore => ESPEasy/net}/ESPEasyNetwork_ESP32.cpp (88%) rename src/{src/ESPEasyCore => ESPEasy/net}/ESPEasyNetwork_ESP8266.cpp (73%) rename src/{src/ESPEasyCore => ESPEasy/net/eth}/ESPEasyEth.cpp (57%) create mode 100644 src/ESPEasy/net/eth/ESPEasyEth.h create mode 100644 src/ESPEasy/net/eth/ESPEasyEthEvent.cpp create mode 100644 src/ESPEasy/net/eth/ESPEasyEthEvent.h rename src/{src/ESPEasyCore => ESPEasy/net/eth}/ESPEasyEth_ProcessEvent.cpp (80%) rename src/{src/ESPEasyCore => ESPEasy/net/eth}/ESPEasyEth_ProcessEvent.h (54%) delete mode 100644 src/src/ESPEasyCore/ESPEasyEth.h delete mode 100644 src/src/ESPEasyCore/ESPEasyEthEvent.cpp delete mode 100644 src/src/ESPEasyCore/ESPEasyEthEvent.h diff --git a/src/src/DataStructs/MAC_address.cpp b/src/ESPEasy/net/DataStructs/MAC_address.cpp similarity index 97% rename from src/src/DataStructs/MAC_address.cpp rename to src/ESPEasy/net/DataStructs/MAC_address.cpp index b7ecfd8d2..bd75941c8 100644 --- a/src/src/DataStructs/MAC_address.cpp +++ b/src/ESPEasy/net/DataStructs/MAC_address.cpp @@ -1,6 +1,6 @@ #include "../DataStructs/MAC_address.h" -#include "../../ESPEasy_common.h" +#include "../../../ESPEasy_common.h" MAC_address::MAC_address(const uint8_t new_mac[6]) diff --git a/src/src/DataStructs/MAC_address.h b/src/ESPEasy/net/DataStructs/MAC_address.h similarity index 91% rename from src/src/DataStructs/MAC_address.h rename to src/ESPEasy/net/DataStructs/MAC_address.h index 1f5ab6b3f..5f0ad49a1 100644 --- a/src/src/DataStructs/MAC_address.h +++ b/src/ESPEasy/net/DataStructs/MAC_address.h @@ -1,5 +1,4 @@ -#ifndef DATASTRUCTS_MAC_ADDRESS_H -#define DATASTRUCTS_MAC_ADDRESS_H +#pragma once #include #include @@ -75,5 +74,3 @@ private: bool mac_addr_cmp(const uint8_t other[6]) const; }; - -#endif // DATASTRUCTS_MAC_ADDRESS_H \ No newline at end of file diff --git a/src/ESPEasy/net/DataStructs/NetworkSettingsStruct.cpp b/src/ESPEasy/net/DataStructs/NetworkSettingsStruct.cpp index 522ca1760..298ac31aa 100644 --- a/src/ESPEasy/net/DataStructs/NetworkSettingsStruct.cpp +++ b/src/ESPEasy/net/DataStructs/NetworkSettingsStruct.cpp @@ -4,7 +4,7 @@ #include "../../../src/CustomBuild/ESPEasyLimits.h" #include "../../../src/ESPEasyCore/ESPEasy_Log.h" -#include "../../../src/ESPEasyCore/ESPEasyNetwork.h" +#include "../ESPEasyNetwork.h" #include "../../../src/Helpers/Misc.h" #include "../../../src/Helpers/Networking.h" #include "../../../src/Helpers/StringConverter.h" diff --git a/src/ESPEasy/net/DataStructs/WiFiEventData.h b/src/ESPEasy/net/DataStructs/WiFiEventData.h index a2118103b..850dd99f3 100644 --- a/src/ESPEasy/net/DataStructs/WiFiEventData.h +++ b/src/ESPEasy/net/DataStructs/WiFiEventData.h @@ -4,7 +4,7 @@ #if FEATURE_WIFI -# include "../../../src/DataStructs/MAC_address.h" +# include "../DataStructs/MAC_address.h" # include "../wifi/WiFiDisconnectReason.h" # include "../../../src/Helpers/LongTermTimer.h" diff --git a/src/src/ESPEasyCore/ESPEasyNetwork.cpp b/src/ESPEasy/net/ESPEasyNetwork.cpp similarity index 85% rename from src/src/ESPEasyCore/ESPEasyNetwork.cpp rename to src/ESPEasy/net/ESPEasyNetwork.cpp index 96d14c0f4..f474b632e 100644 --- a/src/src/ESPEasyCore/ESPEasyNetwork.cpp +++ b/src/ESPEasy/net/ESPEasyNetwork.cpp @@ -1,15 +1,18 @@ -#include "../ESPEasyCore/ESPEasyNetwork.h" +#include "../net/ESPEasyNetwork.h" #include "../../ESPEasy/net/wifi/ESPEasyWifi.h" #include "../../ESPEasy/net/Globals/NetworkState.h" -#include "../Globals/Settings.h" +#include "../../src/Globals/Settings.h" -#include "../Globals/ESPEasy_time.h" +#include "../../src/Globals/ESPEasy_time.h" -#include "../Helpers/StringConverter.h" -#include "../Helpers/MDNS_Helper.h" +#include "../../src/Helpers/StringConverter.h" +#include "../../src/Helpers/MDNS_Helper.h" + +namespace ESPEasy { +namespace net { // ******************************************************************************** // Determine Wifi AP name to set. (also used for mDNS) @@ -93,3 +96,6 @@ void CheckRunningServices() { set_mDNS(); #endif } + +} +} diff --git a/src/src/ESPEasyCore/ESPEasyNetwork.h b/src/ESPEasy/net/ESPEasyNetwork.h similarity index 90% rename from src/src/ESPEasyCore/ESPEasyNetwork.h rename to src/ESPEasy/net/ESPEasyNetwork.h index 9b1cea915..64cf1be33 100644 --- a/src/src/ESPEasyCore/ESPEasyNetwork.h +++ b/src/ESPEasy/net/ESPEasyNetwork.h @@ -1,9 +1,8 @@ -#ifndef ESPEASY_NETWORK_H -#define ESPEASY_NETWORK_H +#pragma once #include "../../ESPEasy_common.h" -#include "../DataStructs/MAC_address.h" +#include "../net/DataStructs/MAC_address.h" #include @@ -15,6 +14,9 @@ typedef std::vector IP6Addresses_t; #endif // if FEATURE_USE_IPV6 +namespace ESPEasy { +namespace net { + void setNetworkMedium(NetworkMedium_t medium); void NetworkConnectRelaxed(); @@ -57,4 +59,5 @@ uint8_t EthLinkSpeed(); #endif // if FEATURE_ETHERNET -#endif // ifndef ESPEASY_NETWORK_H +} +} diff --git a/src/src/ESPEasyCore/ESPEasyNetwork_ESP32.cpp b/src/ESPEasy/net/ESPEasyNetwork_ESP32.cpp similarity index 88% rename from src/src/ESPEasyCore/ESPEasyNetwork_ESP32.cpp rename to src/ESPEasy/net/ESPEasyNetwork_ESP32.cpp index 0e0b2aeda..671c5696f 100644 --- a/src/src/ESPEasyCore/ESPEasyNetwork_ESP32.cpp +++ b/src/ESPEasy/net/ESPEasyNetwork_ESP32.cpp @@ -1,22 +1,22 @@ #ifdef ESP32 -#include "../ESPEasyCore/ESPEasyNetwork.h" +#include "../net/ESPEasyNetwork.h" -#include "../ESPEasyCore/ESPEasy_Log.h" -#include "../ESPEasyCore/ESPEasyEth.h" -#include "../../ESPEasy/net/wifi/ESPEasyWifi.h" +#include "../../src/ESPEasyCore/ESPEasy_Log.h" +#include "../net/eth/ESPEasyEth.h" +#include "../net/wifi/ESPEasyWifi.h" -#include "../Globals/ESPEasy_time.h" +#include "../../src/Globals/ESPEasy_time.h" #include "../../ESPEasy/net/Globals/ESPEasyWiFiEvent.h" #include "../../ESPEasy/net/Globals/NetworkState.h" -#include "../Globals/Settings.h" +#include "../../src/Globals/Settings.h" #include "../../ESPEasy/net/Globals/ESPEasyEthEvent.h" -#include "../Helpers/Network.h" -#include "../Helpers/Networking.h" -#include "../Helpers/StringConverter.h" -#include "../Helpers/MDNS_Helper.h" +#include "../../src/Helpers/Network.h" +#include "../../src/Helpers/Networking.h" +#include "../../src/Helpers/StringConverter.h" +#include "../../src/Helpers/MDNS_Helper.h" #include @@ -29,6 +29,17 @@ #endif +// Forward declaration to access internal function in NetworkInterface.cpp +// as we don't have a public function in NetworkInterface to access the +// Network_Interface_ID +NetworkInterface* getNetifByID(Network_Interface_ID id); + + + +namespace ESPEasy { +namespace net { + + void setNetworkMedium(NetworkMedium_t new_medium) { #if !(FEATURE_ETHERNET) @@ -77,11 +88,11 @@ void setNetworkMedium(NetworkMedium_t new_medium) { Ethernet or Wifi Support for ESP32 Build flag FEATURE_ETHERNET \*********************************************************************************************/ void NetworkConnectRelaxed() { - if (NetworkConnected()) { return; } + if (ESPEasy::net::NetworkConnected()) { return; } #if FEATURE_ETHERNET if (active_network_medium == NetworkMedium_t::Ethernet) { - if (ETHConnectRelaxed()) { + if (ESPEasy::net::eth::ETHConnectRelaxed()) { return; } @@ -96,11 +107,6 @@ void NetworkConnectRelaxed() { ESPEasy::net::wifi::WiFiConnectRelaxed(); } -// Forward declaration to access internal function in NetworkInterface.cpp -// as we don't have a public function in NetworkInterface to access the -// Network_Interface_ID -NetworkInterface* getNetifByID(Network_Interface_ID id); - NetworkInterface* getDefaultNonAP_interface() { auto network_if = Network.getDefaultInterface(); @@ -323,4 +329,7 @@ uint8_t EthLinkSpeed() #endif // if FEATURE_ETHERNET +} +} + #endif // ifdef ESP32 diff --git a/src/src/ESPEasyCore/ESPEasyNetwork_ESP8266.cpp b/src/ESPEasy/net/ESPEasyNetwork_ESP8266.cpp similarity index 73% rename from src/src/ESPEasyCore/ESPEasyNetwork_ESP8266.cpp rename to src/ESPEasy/net/ESPEasyNetwork_ESP8266.cpp index be68253f5..ddf27046a 100644 --- a/src/src/ESPEasyCore/ESPEasyNetwork_ESP8266.cpp +++ b/src/ESPEasy/net/ESPEasyNetwork_ESP8266.cpp @@ -1,20 +1,24 @@ #ifdef ESP8266 -#include "../ESPEasyCore/ESPEasyNetwork.h" +#include "../../ESPEasy/net/ESPEasyNetwork.h" -#include "../ESPEasyCore/ESPEasy_Log.h" -#include "../ESPEasyCore/ESPEasyEth.h" -#include "../../ESPEasy/net/wifi/ESPEasyWifi.h" +#include "../../src/ESPEasyCore/ESPEasy_Log.h" -#include "../Globals/ESPEasy_time.h" -#include "../../ESPEasy/net/Globals/ESPEasyWiFiEvent.h" -#include "../../ESPEasy/net/Globals/NetworkState.h" -#include "../Globals/Settings.h" +#include "../../src/Globals/ESPEasy_time.h" +#include "../../src/Globals/Settings.h" -#include "../Helpers/Network.h" -#include "../Helpers/Networking.h" -#include "../Helpers/StringConverter.h" -#include "../Helpers/MDNS_Helper.h" +#include "../../src/Helpers/Network.h" +#include "../../src/Helpers/Networking.h" +#include "../../src/Helpers/StringConverter.h" +#include "../../src/Helpers/MDNS_Helper.h" + +#include "../net/Globals/ESPEasyWiFiEvent.h" +#include "../net/Globals/NetworkState.h" +#include "../net/wifi/ESPEasyWifi.h" + + +namespace ESPEasy { +namespace net { void setNetworkMedium(NetworkMedium_t new_medium) { if (new_medium == NetworkMedium_t::Ethernet) { @@ -45,7 +49,7 @@ void setNetworkMedium(NetworkMedium_t new_medium) { Ethernet or Wifi Support for ESP32 Build flag FEATURE_ETHERNET \*********************************************************************************************/ void NetworkConnectRelaxed() { - if (NetworkConnected()) { return; } + if (!ESPEasy::net::NetworkConnected()) ESPEasy::net::wifi::WiFiConnectRelaxed(); } @@ -86,4 +90,7 @@ MAC_address WifiSTAmacAddress() { #endif // if FEATURE_WIFI +} +} + #endif // ifdef ESP8266 diff --git a/src/ESPEasy/net/Globals/ESPEasyEthEvent.cpp b/src/ESPEasy/net/Globals/ESPEasyEthEvent.cpp index 5457b2a22..3cf027e09 100644 --- a/src/ESPEasy/net/Globals/ESPEasyEthEvent.cpp +++ b/src/ESPEasy/net/Globals/ESPEasyEthEvent.cpp @@ -5,4 +5,3 @@ #if FEATURE_ETHERNET EthernetEventData_t EthEventData; #endif - diff --git a/src/ESPEasy/net/Globals/ESPEasyEthEvent.h b/src/ESPEasy/net/Globals/ESPEasyEthEvent.h index d9453a16f..af0125010 100644 --- a/src/ESPEasy/net/Globals/ESPEasyEthEvent.h +++ b/src/ESPEasy/net/Globals/ESPEasyEthEvent.h @@ -10,4 +10,3 @@ extern EthernetEventData_t EthEventData; #endif // if FEATURE_ETHERNET - diff --git a/src/ESPEasy/net/Globals/ESPEasyWiFi.cpp b/src/ESPEasy/net/Globals/ESPEasyWiFi.cpp index abd327056..32a06fe4c 100644 --- a/src/ESPEasy/net/Globals/ESPEasyWiFi.cpp +++ b/src/ESPEasy/net/Globals/ESPEasyWiFi.cpp @@ -4,4 +4,4 @@ ESPEasy::net::wifi::ESPEasyWiFi_t ESPEasyWiFi; -#endif \ No newline at end of file +#endif // if FEATURE_WIFI diff --git a/src/ESPEasy/net/Globals/ESPEasyWiFi.h b/src/ESPEasy/net/Globals/ESPEasyWiFi.h index a91112a76..48d641718 100644 --- a/src/ESPEasy/net/Globals/ESPEasyWiFi.h +++ b/src/ESPEasy/net/Globals/ESPEasyWiFi.h @@ -4,8 +4,8 @@ #if FEATURE_WIFI -#include "../wifi/ESPEasyWifi.h" -#include "../wifi/ESPEasyWiFi_state_machine.h" +# include "../wifi/ESPEasyWifi.h" +# include "../wifi/ESPEasyWiFi_state_machine.h" extern ESPEasy::net::wifi::ESPEasyWiFi_t ESPEasyWiFi; -#endif \ No newline at end of file +#endif // if FEATURE_WIFI diff --git a/src/ESPEasy/net/Globals/NetworkState.cpp b/src/ESPEasy/net/Globals/NetworkState.cpp index d1ae85d73..67b88c136 100644 --- a/src/ESPEasy/net/Globals/NetworkState.cpp +++ b/src/ESPEasy/net/Globals/NetworkState.cpp @@ -20,8 +20,7 @@ bool statusNTPInitialized = false; // Setup DNS, only used if the ESP has no valid WiFi config const uint8_t DNS_PORT = 53; -IPAddress apIP(DEFAULT_AP_IP); - +IPAddress apIP(DEFAULT_AP_IP); // udp protocol stuff (syslog, global sync, node info list, ntp time) diff --git a/src/ESPEasy/net/Globals/NetworkState.h b/src/ESPEasy/net/Globals/NetworkState.h index 12e9483aa..1ce17b29e 100644 --- a/src/ESPEasy/net/Globals/NetworkState.h +++ b/src/ESPEasy/net/Globals/NetworkState.h @@ -24,8 +24,7 @@ extern bool statusNTPInitialized; // Setup DNS, only used if the ESP has no valid WiFi config extern const uint8_t DNS_PORT; -extern IPAddress apIP; +extern IPAddress apIP; // udp protocol stuff (syslog, global sync, node info list, ntp time) extern WiFiUDP portUDP; - diff --git a/src/ESPEasy/net/_NW001_WiFi_STA.cpp b/src/ESPEasy/net/_NW001_WiFi_STA.cpp index 11d0adbb6..5282d1df9 100644 --- a/src/ESPEasy/net/_NW001_WiFi_STA.cpp +++ b/src/ESPEasy/net/_NW001_WiFi_STA.cpp @@ -11,7 +11,6 @@ # define NWPLUGIN_NAME_001 "WiFi Station" # include "../../src/DataStructs/ESPEasy_EventStruct.h" -# include "../../src/ESPEasyCore/ESPEasyNetwork.h" # include "../../src/Globals/SecuritySettings.h" # include "../../src/Globals/Settings.h" # include "../../src/Helpers/ESPEasy_Storage.h" @@ -23,6 +22,7 @@ # include "../../src/WebServer/Markup.h" # include "../../src/WebServer/Markup_Forms.h" # include "../../src/WebServer/common.h" +# include "../net/ESPEasyNetwork.h" # include "../net/Globals/NWPlugins.h" # include "../net/Helpers/_NWPlugin_Helper_webform.h" # include "../net/Helpers/_NWPlugin_init.h" diff --git a/src/ESPEasy/net/_NW002_WiFi_AP.cpp b/src/ESPEasy/net/_NW002_WiFi_AP.cpp index 40f16878f..c561f50d0 100644 --- a/src/ESPEasy/net/_NW002_WiFi_AP.cpp +++ b/src/ESPEasy/net/_NW002_WiFi_AP.cpp @@ -11,7 +11,6 @@ # define NWPLUGIN_NAME_002 "WiFi AP" # include "../../src/DataStructs/ESPEasy_EventStruct.h" -# include "../../src/ESPEasyCore/ESPEasyNetwork.h" # include "../../src/Globals/SecuritySettings.h" # include "../../src/Globals/Settings.h" # include "../../src/Helpers/ESPEasy_Storage.h" @@ -23,6 +22,7 @@ # include "../../src/WebServer/Markup.h" # include "../../src/WebServer/Markup_Forms.h" # include "../../src/WebServer/common.h" +# include "../net/ESPEasyNetwork.h" # include "../net/Globals/NWPlugins.h" # include "../net/Helpers/_NWPlugin_Helper_webform.h" # include "../net/Helpers/_NWPlugin_init.h" diff --git a/src/ESPEasy/net/_NW003_ETH_RMII.cpp b/src/ESPEasy/net/_NW003_ETH_RMII.cpp index 0bfc37c2e..ee477493a 100644 --- a/src/ESPEasy/net/_NW003_ETH_RMII.cpp +++ b/src/ESPEasy/net/_NW003_ETH_RMII.cpp @@ -11,8 +11,6 @@ # define NWPLUGIN_NAME_003 "Ethernet (RMII)" # include "../../src/DataStructs/ESPEasy_EventStruct.h" -# include "../../src/ESPEasyCore/ESPEasyEth.h" - # include "../../src/Globals/SecuritySettings.h" # include "../../src/Globals/Settings.h" # include "../../src/Helpers/ESPEasy_Storage.h" @@ -24,6 +22,7 @@ # include "../../src/WebServer/Markup.h" # include "../../src/WebServer/Markup_Forms.h" # include "../../src/WebServer/common.h" +# include "../net/eth/ESPEasyEth.h" # include "../net/Globals/NWPlugins.h" # include "../net/Helpers/_NWPlugin_Helper_webform.h" # include "../net/Helpers/_NWPlugin_init.h" @@ -286,7 +285,7 @@ bool NWPlugin_003(NWPlugin::Function function, EventStruct *event, String& strin case NWPlugin::Function::NWPLUGIN_INIT: { - ETHConnectRelaxed(); + ESPEasy::net::eth::ETHConnectRelaxed(); break; } diff --git a/src/ESPEasy/net/_NW004_ETH_SPI.cpp b/src/ESPEasy/net/_NW004_ETH_SPI.cpp index a07803471..e41c8e64e 100644 --- a/src/ESPEasy/net/_NW004_ETH_SPI.cpp +++ b/src/ESPEasy/net/_NW004_ETH_SPI.cpp @@ -11,7 +11,7 @@ # define NWPLUGIN_NAME_004 "Ethernet (SPI)" # include "../../src/DataStructs/ESPEasy_EventStruct.h" -# include "../../src/ESPEasyCore/ESPEasyEth.h" +# include "../net/eth/ESPEasyEth.h" # include "../../src/Globals/SecuritySettings.h" # include "../../src/Globals/Settings.h" # include "../../src/Helpers/ESPEasy_Storage.h" @@ -288,7 +288,7 @@ bool NWPlugin_004(NWPlugin::Function function, EventStruct *event, String& strin case NWPlugin::Function::NWPLUGIN_INIT: { - ETHConnectRelaxed(); + ESPEasy::net::eth::ETHConnectRelaxed(); break; } diff --git a/src/ESPEasy/net/_NW005_PPP_modem.cpp b/src/ESPEasy/net/_NW005_PPP_modem.cpp index 0486c8518..666fbf3e8 100644 --- a/src/ESPEasy/net/_NW005_PPP_modem.cpp +++ b/src/ESPEasy/net/_NW005_PPP_modem.cpp @@ -11,7 +11,7 @@ # define NWPLUGIN_NAME_005 "PPP modem" # include "../../src/DataStructs/ESPEasy_EventStruct.h" -# include "../../src/ESPEasyCore/ESPEasyNetwork.h" +# include "../net/ESPEasyNetwork.h" # include "../../src/Globals/SecuritySettings.h" # include "../../src/Globals/Settings.h" # include "../../src/Helpers/ESPEasy_Storage.h" diff --git a/src/src/ESPEasyCore/ESPEasyEth.cpp b/src/ESPEasy/net/eth/ESPEasyEth.cpp similarity index 57% rename from src/src/ESPEasyCore/ESPEasyEth.cpp rename to src/ESPEasy/net/eth/ESPEasyEth.cpp index a4f3e74da..2b1ec1bc0 100644 --- a/src/src/ESPEasyCore/ESPEasyEth.cpp +++ b/src/ESPEasy/net/eth/ESPEasyEth.cpp @@ -1,37 +1,40 @@ -#include "../ESPEasyCore/ESPEasyEth.h" +#include "../eth/ESPEasyEth.h" #if FEATURE_ETHERNET -#include "../CustomBuild/ESPEasyLimits.h" -#include "../ESPEasyCore/ESPEasyNetwork.h" -#include "../../ESPEasy/net/wifi/ESPEasyWifi.h" -#include "../ESPEasyCore/ESPEasy_Log.h" -#include "../ESPEasyCore/ESPEasyGPIO.h" -#include "../ESPEasyCore/ESPEasyEthEvent.h" -#include "../../ESPEasy/net/Globals/ESPEasyEthEvent.h" -#include "../../ESPEasy/net/Globals/NetworkState.h" -#include "../Globals/Settings.h" -#include "../Helpers/Hardware_GPIO.h" -#include "../Helpers/StringConverter.h" -#include "../Helpers/Networking.h" +# include "../../../src/CustomBuild/ESPEasyLimits.h" +# include "../ESPEasyNetwork.h" +# include "../wifi/ESPEasyWifi.h" +# include "../../../src/ESPEasyCore/ESPEasy_Log.h" +# include "../../../src/ESPEasyCore/ESPEasyGPIO.h" +# include "../eth/ESPEasyEthEvent.h" +# include "../Globals/ESPEasyEthEvent.h" +# include "../Globals/NetworkState.h" +# include "../../../src/Globals/Settings.h" +# include "../../../src/Helpers/Hardware_GPIO.h" +# include "../../../src/Helpers/StringConverter.h" +# include "../../../src/Helpers/Networking.h" -#include -#include -#include +# include +# include +# include -#include +# include -bool ethUseStaticIP() { - return Settings.ETH_IP[0] != 0 && Settings.ETH_IP[0] != 255; -} +namespace ESPEasy { +namespace net { +namespace eth { + +bool ethUseStaticIP() { return Settings.ETH_IP[0] != 0 && Settings.ETH_IP[0] != 255; } void ethSetupStaticIPconfig() { - const IPAddress IP_zero(0, 0, 0, 0); - if (!ethUseStaticIP()) { + const IPAddress IP_zero(0, 0, 0, 0); + + if (!ethUseStaticIP()) { if (!ETH.config(IP_zero, IP_zero, IP_zero, IP_zero)) { addLog(LOG_LEVEL_ERROR, F("ETH : Cannot set IP config")); } - return; + return; } const IPAddress ip = Settings.ETH_IP; const IPAddress gw = Settings.ETH_Gateway; @@ -59,21 +62,22 @@ void ethSetupStaticIPconfig() { } bool ethCheckSettings() { - return isValid(Settings.ETH_Phy_Type) -#if CONFIG_ETH_USE_ESP32_EMAC - && (isValid(Settings.ETH_Clock_Mode)/* || isSPI_EthernetType(Settings.ETH_Phy_Type)*/) -#endif - && isValid(Settings.NetworkMedium) - && validGpio(Settings.ETH_Pin_mdc_cs) - && (isSPI_EthernetType(Settings.ETH_Phy_Type) || - ( validGpio(Settings.ETH_Pin_mdio_irq) && - (validGpio(Settings.ETH_Pin_power_rst) || (Settings.ETH_Pin_power_rst == -1)) - ) - ); // Some boards have fixed power + return isValid(Settings.ETH_Phy_Type) +# if CONFIG_ETH_USE_ESP32_EMAC + && (isValid(Settings.ETH_Clock_Mode) /* || isSPI_EthernetType(Settings.ETH_Phy_Type)*/) +# endif + && isValid(Settings.NetworkMedium) + && validGpio(Settings.ETH_Pin_mdc_cs) + && (isSPI_EthernetType(Settings.ETH_Phy_Type) || + (validGpio(Settings.ETH_Pin_mdio_irq) && + (validGpio(Settings.ETH_Pin_power_rst) || (Settings.ETH_Pin_power_rst == -1)) + ) + ); // Some boards have fixed power } bool ethPrepare() { char hostname[40]; + safe_strncpy(hostname, NetworkCreateRFCCompliantHostname().c_str(), sizeof(hostname)); ETH.setHostname(hostname); ethSetupStaticIPconfig(); @@ -83,9 +87,10 @@ bool ethPrepare() { void ethPrintSettings() { if (loglevelActiveFor(LOG_LEVEL_INFO)) { String log; + if (log.reserve(115)) { -// log += F("ETH/Wifi mode: "); -// log += toString(active_network_medium); + // log += F("ETH/Wifi mode: "); + // log += toString(active_network_medium); log += F("ETH PHY Type: "); log += toString(Settings.ETH_Phy_Type); log += F(" PHY Addr: "); @@ -95,11 +100,11 @@ void ethPrintSettings() { log += F(" Eth Clock mode: "); log += toString(Settings.ETH_Clock_Mode); } - log += strformat(isSPI_EthernetType(Settings.ETH_Phy_Type) + log += strformat(isSPI_EthernetType(Settings.ETH_Phy_Type) ? F(" CS: %d IRQ: %d RST: %d") : F(" MDC: %d MIO: %d PWR: %d"), - Settings.ETH_Pin_mdc_cs, - Settings.ETH_Pin_mdio_irq, - Settings.ETH_Pin_power_rst); + Settings.ETH_Pin_mdc_cs, + Settings.ETH_Pin_mdio_irq, + Settings.ETH_Pin_power_rst); addLogMove(LOG_LEVEL_INFO, log); } } @@ -107,7 +112,8 @@ void ethPrintSettings() { MAC_address ETHMacAddress() { MAC_address mac; - if(!EthEventData.ethInitSuccess) { + + if (!EthEventData.ethInitSuccess) { addLog(LOG_LEVEL_ERROR, F("Call NetworkMacAddress() only on connected Ethernet!")); } else { ETH.macAddress(mac.mac); @@ -129,18 +135,19 @@ void registerEthEventHandler() EthEventData.wm_event_id = WiFi.onEvent(EthEvent); } - bool ETHConnectRelaxed() { if (EthEventData.ethInitSuccess) { return EthLinkUp(); } ethPrintSettings(); + if (!ethCheckSettings()) { addLog(LOG_LEVEL_ERROR, F("ETH: Settings not correct!!!")); EthEventData.ethInitSuccess = false; return false; } + // Re-register event listener removeEthEventHandler(); @@ -151,46 +158,50 @@ bool ETHConnectRelaxed() { registerEthEventHandler(); if (!EthEventData.ethInitSuccess) { -#if ESP_IDF_VERSION_MAJOR < 5 - EthEventData.ethInitSuccess = ETH.begin( +# if ESP_IDF_VERSION_MAJOR < 5 + EthEventData.ethInitSuccess = ETH.begin( Settings.ETH_Phy_Addr, Settings.ETH_Pin_power_rst, Settings.ETH_Pin_mdc_cs, Settings.ETH_Pin_mdio_irq, (eth_phy_type_t)Settings.ETH_Phy_Type, (eth_clock_mode_t)Settings.ETH_Clock_Mode); -#else -#if FEATURE_USE_IPV6 +# else // if ESP_IDF_VERSION_MAJOR < 5 +# if FEATURE_USE_IPV6 + if (Settings.EnableIPv6()) { ETH.enableIPv6(true); } -#endif +# endif // if FEATURE_USE_IPV6 if (isSPI_EthernetType(Settings.ETH_Phy_Type)) { spi_host_device_t SPI_host = Settings.getSPI_host(); + if (SPI_host == spi_host_device_t::SPI_HOST_MAX) { addLog(LOG_LEVEL_ERROR, F("SPI not enabled")); - #ifdef ESP32C3 + # ifdef ESP32C3 + // FIXME TD-er: Fallback for ETH01-EVO board - SPI_host = spi_host_device_t::SPI2_HOST; - Settings.InitSPI = static_cast(SPI_Options_e::UserDefined); + SPI_host = spi_host_device_t::SPI2_HOST; + Settings.InitSPI = static_cast(SPI_Options_e::UserDefined); Settings.SPI_SCLK_pin = 7; Settings.SPI_MISO_pin = 3; Settings.SPI_MOSI_pin = 10; - #endif + # endif // ifdef ESP32C3 } - // else + + // else { -#if ETH_SPI_SUPPORTS_CUSTOM - EthEventData.ethInitSuccess = ETH.begin( +# if ETH_SPI_SUPPORTS_CUSTOM + EthEventData.ethInitSuccess = ETH.begin( to_ESP_phy_type(Settings.ETH_Phy_Type), Settings.ETH_Phy_Addr, Settings.ETH_Pin_mdc_cs, Settings.ETH_Pin_mdio_irq, Settings.ETH_Pin_power_rst, SPI); -#else - EthEventData.ethInitSuccess = ETH.begin( +# else // if ETH_SPI_SUPPORTS_CUSTOM + EthEventData.ethInitSuccess = ETH.begin( to_ESP_phy_type(Settings.ETH_Phy_Type), Settings.ETH_Phy_Addr, Settings.ETH_Pin_mdc_cs, @@ -200,50 +211,51 @@ bool ETHConnectRelaxed() { static_cast(Settings.SPI_SCLK_pin), static_cast(Settings.SPI_MISO_pin), static_cast(Settings.SPI_MOSI_pin)); -#endif +# endif // if ETH_SPI_SUPPORTS_CUSTOM } } else { -# if CONFIG_ETH_USE_ESP32_EMAC -#ifndef ESP32P4 - ethResetGPIOpins(); -#endif - EthEventData.ethInitSuccess = ETH.begin( - to_ESP_phy_type(Settings.ETH_Phy_Type), - Settings.ETH_Phy_Addr, - Settings.ETH_Pin_mdc_cs, - Settings.ETH_Pin_mdio_irq, - Settings.ETH_Pin_power_rst, - (eth_clock_mode_t)Settings.ETH_Clock_Mode); -#endif +# if CONFIG_ETH_USE_ESP32_EMAC +# ifndef ESP32P4 + ethResetGPIOpins(); +# endif + EthEventData.ethInitSuccess = ETH.begin( + to_ESP_phy_type(Settings.ETH_Phy_Type), + Settings.ETH_Phy_Addr, + Settings.ETH_Pin_mdc_cs, + Settings.ETH_Pin_mdio_irq, + Settings.ETH_Pin_power_rst, + (eth_clock_mode_t)Settings.ETH_Clock_Mode); +# endif // if CONFIG_ETH_USE_ESP32_EMAC } -#endif +# endif // if ESP_IDF_VERSION_MAJOR < 5 } + if (EthEventData.ethInitSuccess) { // FIXME TD-er: Not sure if this is correctly set to false - //EthEventData.ethConnectAttemptNeeded = false; + // EthEventData.ethConnectAttemptNeeded = false; if (loglevelActiveFor(LOG_LEVEL_INFO)) { -#if ESP_IDF_VERSION_MAJOR < 5 +# if ESP_IDF_VERSION_MAJOR < 5 addLog(LOG_LEVEL_INFO, strformat( - F("ETH : MAC: %s speed: %dM %s Link: %s"), - ETH.macAddress().c_str(), - ETH.linkSpeed(), - String(ETH.fullDuplex() ? F("Full Duplex") : F("Half Duplex")).c_str(), - String(ETH.linkUp() ? F("Up") : F("Down")).c_str())); -#else + F("ETH : MAC: %s speed: %dM %s Link: %s"), + ETH.macAddress().c_str(), + ETH.linkSpeed(), + String(ETH.fullDuplex() ? F("Full Duplex") : F("Half Duplex")).c_str(), + String(ETH.linkUp() ? F("Up") : F("Down")).c_str())); +# else // if ESP_IDF_VERSION_MAJOR < 5 addLog(LOG_LEVEL_INFO, strformat( - F("ETH : MAC: %s phy addr: %d speed: %dM %s Link: %s"), - ETH.macAddress().c_str(), - ETH.phyAddr(), - ETH.linkSpeed(), - concat( - ETH.fullDuplex() ? F("Full Duplex") : F("Half Duplex"), - ETH.autoNegotiation() ? F("(auto)") : F("")).c_str(), - String(ETH.linkUp() ? F("Up") : F("Down")).c_str())); -#endif + F("ETH : MAC: %s phy addr: %d speed: %dM %s Link: %s"), + ETH.macAddress().c_str(), + ETH.phyAddr(), + ETH.linkSpeed(), + concat( + ETH.fullDuplex() ? F("Full Duplex") : F("Half Duplex"), + ETH.autoNegotiation() ? F("(auto)") : F("")).c_str(), + String(ETH.linkUp() ? F("Up") : F("Down")).c_str())); +# endif // if ESP_IDF_VERSION_MAJOR < 5 } - + if (EthLinkUp()) { // We might miss the connected event, since we are already connected. EthEventData.markConnected(); @@ -255,45 +267,55 @@ bool ETHConnectRelaxed() { } void ethPower(bool enable) { - if (isSPI_EthernetType(Settings.ETH_Phy_Type)) + if (isSPI_EthernetType(Settings.ETH_Phy_Type)) { return; + } + if (Settings.ETH_Pin_power_rst != -1) { if (GPIO_Internal_Read(Settings.ETH_Pin_power_rst) == enable) { // Already the desired state return; } addLog(LOG_LEVEL_INFO, enable ? F("ETH power ON") : F("ETH power OFF")); + if (!enable) { EthEventData.ethInitSuccess = false; EthEventData.clearAll(); - #ifdef ESP_IDF_VERSION_MAJOR + # ifdef ESP_IDF_VERSION_MAJOR + // FIXME TD-er: See: https://github.com/espressif/arduino-esp32/issues/6105 // Need to store the last link state, as it will be cleared after destructing the object. EthEventData.setEthDisconnected(); + if (ETH.linkUp()) { EthEventData.setEthConnected(); } - #endif -// ETH = ETHClass(); + # endif // ifdef ESP_IDF_VERSION_MAJOR + + // ETH = ETHClass(); } + if (enable) { -// ethResetGPIOpins(); + // ethResetGPIOpins(); } -// gpio_reset_pin((gpio_num_t)Settings.ETH_Pin_power_rst); + + // gpio_reset_pin((gpio_num_t)Settings.ETH_Pin_power_rst); GPIO_Write(PLUGIN_GPIO, Settings.ETH_Pin_power_rst, enable ? 1 : 0); + if (!enable) { # if CONFIG_ETH_USE_ESP32_EMAC - #if CONFIG_IDF_TARGET_ESP32P4 + # if CONFIG_IDF_TARGET_ESP32P4 const bool isExternalCrystal = Settings.ETH_Clock_Mode == EthClockMode_t::Ext_crystal; - #else + # else const bool isExternalCrystal = Settings.ETH_Clock_Mode == EthClockMode_t::Ext_crystal_osc; - #endif + # endif // if CONFIG_IDF_TARGET_ESP32P4 + if (isExternalCrystal) { delay(600); // Give some time to discharge any capacitors // Delay is needed to make sure no clock signal remains present which may cause the ESP to boot into flash mode. } -#endif +# endif // if CONFIG_ETH_USE_ESP32_EMAC } else { delay(400); // LAN chip needs to initialize before calling Eth.begin() } @@ -301,8 +323,9 @@ void ethPower(bool enable) { } void ethResetGPIOpins() { - if (isSPI_EthernetType(Settings.ETH_Phy_Type)) + if (isSPI_EthernetType(Settings.ETH_Phy_Type)) { return; + } // fix an disconnection issue after rebooting Olimex POE - this forces a clean state for all GPIO involved in RMII // Thanks to @s-hadinger and @Jason2866 @@ -312,27 +335,28 @@ void ethResetGPIOpins() { gpio_reset_pin((gpio_num_t)Settings.ETH_Pin_mdio_irq); # if CONFIG_ETH_USE_ESP32_EMAC - gpio_reset_pin(GPIO_NUM_19); // EMAC_TXD0 - hardcoded - gpio_reset_pin(GPIO_NUM_21); // EMAC_TX_EN - hardcoded - gpio_reset_pin(GPIO_NUM_22); // EMAC_TXD1 - hardcoded - gpio_reset_pin(GPIO_NUM_25); // EMAC_RXD0 - hardcoded - gpio_reset_pin(GPIO_NUM_26); // EMAC_RXD1 - hardcoded - gpio_reset_pin(GPIO_NUM_27); // EMAC_RX_CRS_DV - hardcoded -#endif + gpio_reset_pin(GPIO_NUM_19); // EMAC_TXD0 - hardcoded + gpio_reset_pin(GPIO_NUM_21); // EMAC_TX_EN - hardcoded + gpio_reset_pin(GPIO_NUM_22); // EMAC_TXD1 - hardcoded + gpio_reset_pin(GPIO_NUM_25); // EMAC_RXD0 - hardcoded + gpio_reset_pin(GPIO_NUM_26); // EMAC_RXD1 - hardcoded + gpio_reset_pin(GPIO_NUM_27); // EMAC_RX_CRS_DV - hardcoded +# endif // if CONFIG_ETH_USE_ESP32_EMAC + /* - switch (Settings.ETH_Clock_Mode) { - case EthClockMode_t::Ext_crystal_osc: // ETH_CLOCK_GPIO0_IN - case EthClockMode_t::Int_50MHz_GPIO_0: // ETH_CLOCK_GPIO0_OUT + switch (Settings.ETH_Clock_Mode) { + case EthClockMode_t::Ext_crystal_osc: // ETH_CLOCK_GPIO0_IN + case EthClockMode_t::Int_50MHz_GPIO_0: // ETH_CLOCK_GPIO0_OUT gpio_reset_pin(GPIO_NUM_0); break; - case EthClockMode_t::Int_50MHz_GPIO_16: // ETH_CLOCK_GPIO16_OUT + case EthClockMode_t::Int_50MHz_GPIO_16: // ETH_CLOCK_GPIO16_OUT gpio_reset_pin(GPIO_NUM_16); break; - case EthClockMode_t::Int_50MHz_GPIO_17_inv: // ETH_CLOCK_GPIO17_OUT + case EthClockMode_t::Int_50MHz_GPIO_17_inv: // ETH_CLOCK_GPIO17_OUT gpio_reset_pin(GPIO_NUM_17); break; - } - */ + } + */ delay(1); } @@ -341,18 +365,21 @@ bool ETHConnected() { if (EthLinkUp()) { return true; } + // Apparently we missed an event EthEventData.processedDisconnect = false; } else if (EthEventData.ethInitSuccess) { if (EthLinkUp()) { EthEventData.setEthConnected(); - if (NetworkLocalIP() != IPAddress(0, 0, 0, 0) && + + if ((NetworkLocalIP() != IPAddress(0, 0, 0, 0)) && !EthEventData.EthGotIP()) { EthEventData.processedGotIP = false; } + if (EthEventData.lastConnectMoment.isSet()) { if (!EthEventData.EthServicesInitialized()) { - if (EthEventData.lastConnectMoment.millisPassedSince() > 10000 && + if ((EthEventData.lastConnectMoment.millisPassedSince() > 10000) && EthEventData.lastGetIPmoment.isSet()) { EthEventData.processedGotIP = false; EthEventData.markLostIP(); @@ -361,8 +388,8 @@ bool ETHConnected() { } return EthEventData.EthServicesInitialized(); } else { - if (EthEventData.last_eth_connect_attempt_moment.isSet() && - EthEventData.last_eth_connect_attempt_moment.millisPassedSince() < 5000) { + if (EthEventData.last_eth_connect_attempt_moment.isSet() && + (EthEventData.last_eth_connect_attempt_moment.millisPassedSince() < 5000)) { return false; } setNetworkMedium(NetworkMedium_t::WIFI); @@ -371,4 +398,8 @@ bool ETHConnected() { return false; } -#endif // if FEATURE_ETHERNET \ No newline at end of file +} // namespace eth +} // namespace net +} // namespace ESPEasy + +#endif // if FEATURE_ETHERNET diff --git a/src/ESPEasy/net/eth/ESPEasyEth.h b/src/ESPEasy/net/eth/ESPEasyEth.h new file mode 100644 index 000000000..58fa7ea17 --- /dev/null +++ b/src/ESPEasy/net/eth/ESPEasyEth.h @@ -0,0 +1,35 @@ +#ifndef ESPEASY_ETH_H +#define ESPEASY_ETH_H + +#include "../../../ESPEasy_common.h" + +#if FEATURE_ETHERNET + +# include "../DataStructs/MAC_address.h" + +# include + +namespace ESPEasy { +namespace net { +namespace eth { + +bool ethUseStaticIP(); +void ethSetupStaticIPconfig(); +bool ethCheckSettings(); +bool ethPrepare(); +void ethPrintSettings(); +bool ETHConnectRelaxed(); +bool ETHConnected(); +void ethPower(bool enable); +void ethResetGPIOpins(); +MAC_address ETHMacAddress(); + +void removeEthEventHandler(); +void registerEthEventHandler(); + +} // namespace eth +} // namespace net +} // namespace ESPEasy + +#endif // if FEATURE_ETHERNET +#endif // ifndef ESPEASY_ETH_H diff --git a/src/ESPEasy/net/eth/ESPEasyEthEvent.cpp b/src/ESPEasy/net/eth/ESPEasyEthEvent.cpp new file mode 100644 index 000000000..2dc91970a --- /dev/null +++ b/src/ESPEasy/net/eth/ESPEasyEthEvent.cpp @@ -0,0 +1,76 @@ +#include "../eth/ESPEasyEthEvent.h" + +#ifdef ESP32 +# if FEATURE_ETHERNET +# include + +# include "../eth/ESPEasyEth.h" +# include "../Globals/ESPEasyEthEvent.h" + + +// ******************************************************************************** +// Functions called on events. ** WARNING ** +// Make sure not to call anything in these functions that result in delay() or yield() +// ******************************************************************************** + +# include + +namespace ESPEasy { +namespace net { +namespace eth { + +void EthEvent(WiFiEvent_t event, arduino_event_info_t info) { + switch (event) + { + case ARDUINO_EVENT_ETH_START: + + if (ethPrepare()) { + // addLog(LOG_LEVEL_INFO, F("ETH event: Started")); + // } else { + // addLog(LOG_LEVEL_ERROR, F("ETH event: Could not prepare ETH!")); + } + break; + case ARDUINO_EVENT_ETH_CONNECTED: + // addLog(LOG_LEVEL_INFO, F("ETH event: Connected")); + EthEventData.markConnected(); + break; + case ARDUINO_EVENT_ETH_GOT_IP: + EthEventData.markGotIP(); + + // addLog(LOG_LEVEL_INFO, F("ETH event: Got IP")); + break; + case ARDUINO_EVENT_ETH_DISCONNECTED: + // addLog(LOG_LEVEL_ERROR, F("ETH event: Disconnected")); + EthEventData.markDisconnect(); + break; + case ARDUINO_EVENT_ETH_STOP: + // addLog(LOG_LEVEL_INFO, F("ETH event: Stopped")); + break; + case ARDUINO_EVENT_ETH_GOT_IP6: + # if FEATURE_USE_IPV6 + { + ip_event_got_ip6_t *event = static_cast(&info.got_ip6); + IPAddress ip(IPv6, (const uint8_t *)event->ip6_info.ip.addr, event->ip6_info.ip.zone); + EthEventData.markGotIPv6(ip); + + // addLog(LOG_LEVEL_INFO, String(F("ETH event: Got IP6 ")) + ip.toString(true)); + } + # else // if FEATURE_USE_IPV6 + + // addLog(LOG_LEVEL_INFO, F("ETH event: Got IP6")); + # endif // if FEATURE_USE_IPV6 + break; + default: + { + break; + } + } +} + +} // namespace eth +} // namespace net +} // namespace ESPEasy + +# endif // if FEATURE_ETHERNET + +#endif // ifdef ESP32 diff --git a/src/ESPEasy/net/eth/ESPEasyEthEvent.h b/src/ESPEasy/net/eth/ESPEasyEthEvent.h new file mode 100644 index 000000000..77d5c11c7 --- /dev/null +++ b/src/ESPEasy/net/eth/ESPEasyEthEvent.h @@ -0,0 +1,26 @@ +#pragma once + +#include "../../../ESPEasy_common.h" + +#ifdef ESP32 +# if FEATURE_ETHERNET + +namespace ESPEasy { +namespace net { +namespace eth { + +// ******************************************************************************** +// Functions called on Eth events. +// Make sure not to call anything in these functions that result in delay() or yield() +// ******************************************************************************** +# include +# include +void EthEvent(WiFiEvent_t event, + arduino_event_info_t info); + +} // namespace eth +} // namespace net +} // namespace ESPEasy + +# endif // if FEATURE_ETHERNET +#endif // ifdef ESP32 diff --git a/src/src/ESPEasyCore/ESPEasyEth_ProcessEvent.cpp b/src/ESPEasy/net/eth/ESPEasyEth_ProcessEvent.cpp similarity index 80% rename from src/src/ESPEasyCore/ESPEasyEth_ProcessEvent.cpp rename to src/ESPEasy/net/eth/ESPEasyEth_ProcessEvent.cpp index 51bb8cadd..4d3c0e14a 100644 --- a/src/src/ESPEasyCore/ESPEasyEth_ProcessEvent.cpp +++ b/src/ESPEasy/net/eth/ESPEasyEth_ProcessEvent.cpp @@ -1,38 +1,43 @@ -#include "../ESPEasyCore/ESPEasyEth_ProcessEvent.h" +#include "../eth/ESPEasyEth_ProcessEvent.h" #if FEATURE_ETHERNET -# include "../../ESPEasy-Globals.h" +# include "../../../ESPEasy-Globals.h" -# include "../ESPEasyCore/ESPEasyEth.h" -# include "../ESPEasyCore/ESPEasyNetwork.h" -#include "../../ESPEasy/net/wifi/ESPEasyWifi.h" // LogConnectionStatus +# include "../eth/ESPEasyEth.h" +# include "../ESPEasyNetwork.h" +# include "../wifi/ESPEasyWifi.h" // LogConnectionStatus -# include "../../ESPEasy/net/Globals/ESPEasyEthEvent.h" -# include "../../ESPEasy/net/Globals/ESPEasyWiFiEvent.h" -# include "../Globals/ESPEasy_Scheduler.h" -# include "../Globals/ESPEasy_time.h" -# include "../Globals/EventQueue.h" -# include "../Globals/MQTT.h" -# include "../../ESPEasy/net/Globals/NetworkState.h" -# include "../Globals/Settings.h" +# include "../Globals/ESPEasyEthEvent.h" +# include "../Globals/ESPEasyWiFiEvent.h" +# include "../../../src/Globals/ESPEasy_Scheduler.h" +# include "../../../src/Globals/ESPEasy_time.h" +# include "../../../src/Globals/EventQueue.h" +# include "../../../src/Globals/MQTT.h" +# include "../Globals/NetworkState.h" +# include "../../../src/Globals/Settings.h" -# include "../Helpers/LongTermTimer.h" -# include "../Helpers/Network.h" -# include "../Helpers/Networking.h" -# include "../Helpers/PeriodicalActions.h" -# include "../Helpers/StringConverter.h" +# include "../../../src/Helpers/LongTermTimer.h" +# include "../../../src/Helpers/Network.h" +# include "../../../src/Helpers/Networking.h" +# include "../../../src/Helpers/PeriodicalActions.h" +# include "../../../src/Helpers/StringConverter.h" # include +namespace ESPEasy { +namespace net { +namespace eth { + void handle_unprocessedEthEvents() { if (EthEventData.unprocessedEthEvents()) { // Process disconnect events before connect events. -#if FEATURE_USE_IPV6 +# if FEATURE_USE_IPV6 + if (!EthEventData.processedGotIP6) { processEthernetGotIPv6(); } -#endif +# endif // if FEATURE_USE_IPV6 if (!EthEventData.processedDisconnect) { # ifndef BUILD_NO_DEBUG @@ -92,8 +97,8 @@ void check_Eth_DNS_valid() { (active_network_medium == NetworkMedium_t::Ethernet) && EthEventData.ethInitSuccess && !ethUseStaticIP()) { - const bool has_cache = - valid_DNS_address(EthEventData.dns0_cache) || + const bool has_cache = + valid_DNS_address(EthEventData.dns0_cache) || valid_DNS_address(EthEventData.dns1_cache); if (has_cache) { @@ -102,10 +107,11 @@ void check_Eth_DNS_valid() { if (!valid_DNS_address(dns0) && !valid_DNS_address(dns1)) { static uint32_t lastLog = 0; + if (timePassedSince(lastLog) > 1000) { addLogMove(LOG_LEVEL_ERROR, concat( - F("ETH : DNS server was cleared, use cached DNS IP: "), - formatIP(EthEventData.dns0_cache))); + F("ETH : DNS server was cleared, use cached DNS IP: "), + formatIP(EthEventData.dns0_cache))); lastLog = millis(); } setDNS(0, EthEventData.dns0_cache); @@ -165,15 +171,17 @@ void processEthernetGotIP() { IPAddress dns0 = ETH.dnsIP(0); IPAddress dns1 = ETH.dnsIP(1); const LongTermTimer::Duration dhcp_duration = EthEventData.lastConnectMoment.timeDiff(EthEventData.lastGetIPmoment); - #if ESP_IDF_VERSION_MAJOR >= 5 + # if ESP_IDF_VERSION_MAJOR >= 5 const bool mustRequestDHCP = (!dns0 && !dns1) && !ethUseStaticIP(); - #endif + # endif if (!ethUseStaticIP()) { if (!dns0 && !dns1) { addLog(LOG_LEVEL_ERROR, F("ETH : No DNS server received via DHCP, use cached DNS IP")); - if (EthEventData.dns0_cache) setDNS(0, EthEventData.dns0_cache); - if (EthEventData.dns1_cache) setDNS(1, EthEventData.dns1_cache); + + if (EthEventData.dns0_cache) { setDNS(0, EthEventData.dns0_cache); } + + if (EthEventData.dns1_cache) { setDNS(1, EthEventData.dns1_cache); } } else { EthEventData.dns0_cache = dns0; EthEventData.dns1_cache = dns1; @@ -250,30 +258,40 @@ void processEthernetGotIP() { ESPEasy::net::wifi::logConnectionStatus(); EthEventData.processedGotIP = true; -#if ESP_IDF_VERSION_MAJOR >= 5 +# if ESP_IDF_VERSION_MAJOR >= 5 + if (mustRequestDHCP /*&& EthEventData.lastConnectMoment.millisPassedSince() < 10000*/) { // FIXME TD-er: Must add some check other than fixed timeout here to not constantly make DHCP requests. // Force new DHCP request. ETH.config(); } -#endif +# endif // if ESP_IDF_VERSION_MAJOR >= 5 EthEventData.setEthGotIP(); CheckRunningServices(); } -#if FEATURE_USE_IPV6 +# if FEATURE_USE_IPV6 + void processEthernetGotIPv6() { if (!EthEventData.processedGotIP6) { - if (loglevelActiveFor(LOG_LEVEL_INFO)) + if (loglevelActiveFor(LOG_LEVEL_INFO)) { addLog(LOG_LEVEL_INFO, String(F("ETH event: Got IP6 ")) + EthEventData.unprocessed_IP6.toString(true)); + } EthEventData.processedGotIP6 = true; -#if FEATURE_ESPEASY_P2P -// updateUDPport(true); -#endif +# if FEATURE_ESPEASY_P2P + + // updateUDPport(true); +# endif // if FEATURE_ESPEASY_P2P } } -#endif + +# endif // if FEATURE_USE_IPV6 + + +} // namespace eth +} // namespace net +} // namespace ESPEasy #endif // if FEATURE_ETHERNET diff --git a/src/src/ESPEasyCore/ESPEasyEth_ProcessEvent.h b/src/ESPEasy/net/eth/ESPEasyEth_ProcessEvent.h similarity index 54% rename from src/src/ESPEasyCore/ESPEasyEth_ProcessEvent.h rename to src/ESPEasy/net/eth/ESPEasyEth_ProcessEvent.h index 40c10dcf8..8494641bd 100644 --- a/src/src/ESPEasyCore/ESPEasyEth_ProcessEvent.h +++ b/src/ESPEasy/net/eth/ESPEasyEth_ProcessEvent.h @@ -1,9 +1,13 @@ -#ifndef ESPEASYCORE_ESPEASYETH_PROCESSEVENT_H -#define ESPEASYCORE_ESPEASYETH_PROCESSEVENT_H +#pragma once -#include "../../ESPEasy_common.h" +#include "../../../ESPEasy_common.h" #if FEATURE_ETHERNET + +namespace ESPEasy { +namespace net { +namespace eth { + void handle_unprocessedEthEvents(); void check_Eth_DNS_valid(); @@ -11,9 +15,12 @@ void check_Eth_DNS_valid(); void processEthernetConnected(); void processEthernetDisconnected(); void processEthernetGotIP(); -#if FEATURE_USE_IPV6 +# if FEATURE_USE_IPV6 void processEthernetGotIPv6(); -#endif -#endif // if FEATURE_ETHERNET +# endif -#endif // ifndef ESPEASYCORE_ESPEASYETH_PROCESSEVENT_H +} // namespace eth +} // namespace net +} // namespace ESPEasy + +#endif // if FEATURE_ETHERNET diff --git a/src/ESPEasy/net/wifi/ESPEasyWiFiEvent_ESP32.cpp b/src/ESPEasy/net/wifi/ESPEasyWiFiEvent_ESP32.cpp index 6d8c51c91..ac24676f4 100644 --- a/src/ESPEasy/net/wifi/ESPEasyWiFiEvent_ESP32.cpp +++ b/src/ESPEasy/net/wifi/ESPEasyWiFiEvent_ESP32.cpp @@ -11,24 +11,18 @@ # endif # include "../../../src/DataStructs/RTCStruct.h" - # include "../../../src/DataTypes/ESPEasyTimeSource.h" - -# include "../../../src/ESPEasyCore/ESPEasyEth.h" # include "../../../src/ESPEasyCore/ESPEasy_Log.h" -# include "../../../src/ESPEasyCore/ESPEasyNetwork.h" - -# include "../wifi/ESPEasyWifi.h" -# include "../wifi/ESPEasyWifi_ProcessEvent.h" - -# include "../Globals/ESPEasyWiFiEvent.h" -# include "../Globals/NetworkState.h" # include "../../../src/Globals/RTC.h" # include "../../../src/Globals/WiFi_AP_Candidates.h" - # include "../../../src/Helpers/ESPEasy_time_calc.h" # include "../../../src/Helpers/StringConverter.h" - +# include "../../net/ESPEasyNetwork.h" +# include "../Globals/ESPEasyWiFiEvent.h" +# include "../Globals/NetworkState.h" +# include "../eth/ESPEasyEth.h" +# include "../wifi/ESPEasyWifi.h" +# include "../wifi/ESPEasyWifi_ProcessEvent.h" # if FEATURE_ETHERNET # include "../Globals/ESPEasyEthEvent.h" @@ -218,8 +212,8 @@ void WiFiEvent(WiFiEvent_t event_id, arduino_event_info_t info) { } } -} -} -} +} // namespace wifi +} // namespace net +} // namespace ESPEasy # endif // ifdef ESP32 #endif // if FEATURE_WIFI diff --git a/src/ESPEasy/net/wifi/ESPEasyWiFiEvent_ESP32.h b/src/ESPEasy/net/wifi/ESPEasyWiFiEvent_ESP32.h index 6868704af..decdb05d9 100644 --- a/src/ESPEasy/net/wifi/ESPEasyWiFiEvent_ESP32.h +++ b/src/ESPEasy/net/wifi/ESPEasyWiFiEvent_ESP32.h @@ -1,21 +1,21 @@ #pragma once -# include "../../../ESPEasy_common.h" +#include "../../../ESPEasy_common.h" #if FEATURE_WIFI -#ifdef ESP32 +# ifdef ESP32 -# include +# include // ******************************************************************************** // Work-around for setting _useStaticIP // See reported issue: https://github.com/esp8266/Arduino/issues/4114 // ******************************************************************************** -# include -# include -# include -# include +# include +# include +# include +# include namespace ESPEasy { namespace net { @@ -38,9 +38,9 @@ void setUseStaticIP(bool enabled); void WiFiEvent(WiFiEvent_t event, arduino_event_info_t info); -} -} -} +} // namespace wifi +} // namespace net +} // namespace ESPEasy -#endif // ifdef ESP32 -#endif +# endif // ifdef ESP32 +#endif // if FEATURE_WIFI diff --git a/src/ESPEasy/net/wifi/ESPEasyWiFiEvent_ESP8266.cpp b/src/ESPEasy/net/wifi/ESPEasyWiFiEvent_ESP8266.cpp index 5c5e30841..be73fdeda 100644 --- a/src/ESPEasy/net/wifi/ESPEasyWiFiEvent_ESP8266.cpp +++ b/src/ESPEasy/net/wifi/ESPEasyWiFiEvent_ESP8266.cpp @@ -3,22 +3,20 @@ #if FEATURE_WIFI # ifdef ESP8266 -# include "../../../src/DataStructs/RTCStruct.h" +# include "../../../src/DataStructs/RTCStruct.h" +# include "../../../src/DataTypes/ESPEasyTimeSource.h" +# include "../../../src/ESPEasyCore/ESPEasy_Log.h" +# include "../../../src/Globals/RTC.h" +# include "../../../src/Globals/WiFi_AP_Candidates.h" +# include "../../../src/Helpers/ESPEasy_time_calc.h" -# include "../../../src/DataTypes/ESPEasyTimeSource.h" - -//# include "../../../src/ESPEasyCore/ESPEasyEth.h" -# include "../../../src/ESPEasyCore/ESPEasy_Log.h" -# include "../../../src/ESPEasyCore/ESPEasyNetwork.h" +# include "../ESPEasyNetwork.h" # include "../wifi/ESPEasyWifi.h" # include "../wifi/ESPEasyWifi_ProcessEvent.h" -# include "../Globals/ESPEasyWiFiEvent.h" -# include "../Globals/NetworkState.h" -# include "../../../src/Globals/RTC.h" -# include "../../../src/Globals/WiFi_AP_Candidates.h" +# include "../Globals/ESPEasyWiFiEvent.h" +# include "../Globals/NetworkState.h" -# include "../../../src/Helpers/ESPEasy_time_calc.h" namespace ESPEasy { namespace net { @@ -112,9 +110,9 @@ void onWiFiScanDone(void *arg, STATUS status) { # endif // if FEATURE_ESP8266_DIRECT_WIFI_SCAN -} -} -} +} // namespace wifi +} // namespace net +} // namespace ESPEasy # endif // ifdef ESP8266 #endif // if FEATURE_WIFI diff --git a/src/ESPEasy/net/wifi/ESPEasyWiFiEvent_ESP8266.h b/src/ESPEasy/net/wifi/ESPEasyWiFiEvent_ESP8266.h index c21a5efe6..a55b6eb2b 100644 --- a/src/ESPEasy/net/wifi/ESPEasyWiFiEvent_ESP8266.h +++ b/src/ESPEasy/net/wifi/ESPEasyWiFiEvent_ESP8266.h @@ -56,9 +56,9 @@ void onWiFiScanDone(void *arg, STATUS status); # endif // if FEATURE_ESP8266_DIRECT_WIFI_SCAN -} -} -} +} // namespace wifi +} // namespace net +} // namespace ESPEasy # endif // ifdef ESP8266 diff --git a/src/ESPEasy/net/wifi/ESPEasyWiFi_state_machine.cpp b/src/ESPEasy/net/wifi/ESPEasyWiFi_state_machine.cpp index 1ae8bbeec..02ea17e1a 100644 --- a/src/ESPEasy/net/wifi/ESPEasyWiFi_state_machine.cpp +++ b/src/ESPEasy/net/wifi/ESPEasyWiFi_state_machine.cpp @@ -2,7 +2,7 @@ #if FEATURE_WIFI -# include "../../../src/ESPEasyCore/ESPEasyNetwork.h" // for setNetworkMedium, however this should not be part of the WiFi code +# include "../ESPEasyNetwork.h" // for setNetworkMedium, however this should not be part of the WiFi code # include "../../../src/ESPEasyCore/ESPEasy_Log.h" # include "../../../src/Globals/RTC.h" # include "../../../src/Globals/Settings.h" diff --git a/src/ESPEasy/net/wifi/ESPEasyWiFi_state_machine.h b/src/ESPEasy/net/wifi/ESPEasyWiFi_state_machine.h index 5351de5b7..39abaf9b6 100644 --- a/src/ESPEasy/net/wifi/ESPEasyWiFi_state_machine.h +++ b/src/ESPEasy/net/wifi/ESPEasyWiFi_state_machine.h @@ -7,8 +7,8 @@ # include "../../../src/DataStructs/WiFi_AP_Candidate.h" # include "../../../src/Helpers/LongTermTimer.h" -#include "../wifi/WiFi_STA_connected_state.h" -#include "../wifi/WiFi_State.h" +# include "../wifi/WiFi_STA_connected_state.h" +# include "../wifi/WiFi_State.h" # include @@ -72,36 +72,38 @@ private: STA_connected_state getSTA_connected_state() const; -// WiFi_AP_Candidate _active_sta; -// WiFi_AP_Candidate _AP_conf; + // WiFi_AP_Candidate _active_sta; + // WiFi_AP_Candidate _AP_conf; -// String _last_ssid; -// MAC_address _last_bssid; -// uint8_t _last_channel = 0; - WiFiState_e _state = WiFiState_e::Disabled; + // String _last_ssid; + // MAC_address _last_bssid; + // uint8_t _last_channel = 0; + WiFiState_e _state = WiFiState_e::Disabled; LongTermTimer _last_state_change; LongTermTimer _state_timeout; LongTermTimer _last_seen_connected; -// LongTermTimer _AP_start_timestamp; -// uint32_t _connect_attempt = 0; + // LongTermTimer _AP_start_timestamp; + + // uint32_t _connect_attempt = 0; -// uint32_t _nrReconnects = 0; + // uint32_t _nrReconnects = 0; bool _callbackError = false; // Special modes for initial setup or re-configuration of a node via serial port/IMPROV -// bool _improvActive = false; -// bool _setupActive = false; + // bool _improvActive = false; + // bool _setupActive = false; // WiFi settings => Move to separate class/struct - bool _disabledAtBoot = false; -// bool _passiveScan = false; -// bool _includeHiddenSSID = false; -// float _TX_power = -1; + bool _disabledAtBoot = false; + + // bool _passiveScan = false; + // bool _includeHiddenSSID = false; + // float _TX_power = -1; // Manual IP settings // IP diff --git a/src/ESPEasy/net/wifi/ESPEasyWiFi_state_machine_ESP32.cpp b/src/ESPEasy/net/wifi/ESPEasyWiFi_state_machine_ESP32.cpp index 215a72869..f54db9060 100644 --- a/src/ESPEasy/net/wifi/ESPEasyWiFi_state_machine_ESP32.cpp +++ b/src/ESPEasy/net/wifi/ESPEasyWiFi_state_machine_ESP32.cpp @@ -6,9 +6,9 @@ # include # include // Needed to call ESP-IDF functions like esp_wifi_.... -#ifndef ESP32P4 -# include -#endif +# ifndef ESP32P4 +# include +# endif # include # include diff --git a/src/ESPEasy/net/wifi/ESPEasyWifi.cpp b/src/ESPEasy/net/wifi/ESPEasyWifi.cpp index 6e69c95ab..1d30ea4ac 100644 --- a/src/ESPEasy/net/wifi/ESPEasyWifi.cpp +++ b/src/ESPEasy/net/wifi/ESPEasyWifi.cpp @@ -4,7 +4,7 @@ # include "../../../ESPEasy-Globals.h" # include "../../../src/DataStructs/TimingStats.h" -# include "../../../src/ESPEasyCore/ESPEasyNetwork.h" +# include "../../net/ESPEasyNetwork.h" # include "../../../src/ESPEasyCore/ESPEasy_Log.h" # include "../../../src/ESPEasyCore/Serial.h" # include "../../../src/Globals/EventQueue.h" diff --git a/src/ESPEasy/net/wifi/ESPEasyWifi.h b/src/ESPEasy/net/wifi/ESPEasyWifi.h index 30c34255c..c6218e77e 100644 --- a/src/ESPEasy/net/wifi/ESPEasyWifi.h +++ b/src/ESPEasy/net/wifi/ESPEasyWifi.h @@ -11,7 +11,7 @@ # include # endif // if defined(ESP32) -#include "../wifi/WiFiConnectionProtocol.h" +# include "../wifi/WiFiConnectionProtocol.h" # include "../../../src/DataStructs/WiFi_AP_Candidate.h" # include "../../../src/Helpers/LongTermTimer.h" @@ -32,15 +32,14 @@ namespace wifi { # define WIFI_SCAN_INTERVAL_MINIMAL 60000 // in milliSeconds - -bool WiFiConnected(); -void WiFiConnectRelaxed(); -void AttemptWiFiConnect(); -bool prepareWiFi(); -bool checkAndResetWiFi(); -void resetWiFi(); -void initWiFi(); -void loopWiFi(); +bool WiFiConnected(); +void WiFiConnectRelaxed(); +void AttemptWiFiConnect(); +bool prepareWiFi(); +bool checkAndResetWiFi(); +void resetWiFi(); +void initWiFi(); +void loopWiFi(); # if FEATURE_SET_WIFI_TX_PWR void SetWiFiTXpower(); @@ -88,9 +87,9 @@ bool WifiIsSTA(WiFiMode_t wifimode); const __FlashStringHelper* getWifiModeString(WiFiMode_t wifimode); -#if CONFIG_SOC_WIFI_SUPPORT_5G +# if CONFIG_SOC_WIFI_SUPPORT_5G const __FlashStringHelper* getWifiBandModeString(wifi_band_mode_t wifiBandMode); -#endif +# endif bool setSTA(bool enable); bool setAP(bool enable); @@ -100,12 +99,11 @@ bool setSTA_AP(bool sta_enable, bool setWifiMode(WiFiMode_t new_mode); -void WifiScan(bool async, - uint8_t channel = 0); +void WifiScan(bool async, + uint8_t channel = 0); -} -} -} +} // namespace wifi +} // namespace net +} // namespace ESPEasy #endif // if FEATURE_WIFI - diff --git a/src/ESPEasy/net/wifi/ESPEasyWifi_ProcessEvent.cpp b/src/ESPEasy/net/wifi/ESPEasyWifi_ProcessEvent.cpp index d66daed79..6fc6b649f 100644 --- a/src/ESPEasy/net/wifi/ESPEasyWifi_ProcessEvent.cpp +++ b/src/ESPEasy/net/wifi/ESPEasyWifi_ProcessEvent.cpp @@ -5,9 +5,9 @@ #if FEATURE_WIFI # if FEATURE_ETHERNET -# include "../../../src/ESPEasyCore/ESPEasyEth_ProcessEvent.h" +# include "../eth/ESPEasyEth_ProcessEvent.h" # endif -# include "../../../src/ESPEasyCore/ESPEasyNetwork.h" +# include "../ESPEasyNetwork.h" # include "../../../src/Globals/ESPEasy_Scheduler.h" # include "../../../src/Globals/ESPEasy_time.h" # include "../../../src/Globals/EventQueue.h" @@ -28,7 +28,7 @@ # include "../../../src/Helpers/StringGenerator_WiFi.h" # include "../../../src/Helpers/StringProvider.h" -// #include "../ESPEasyCore/ESPEasyEth.h" +// #include "../../ESPEasy/net/eth/ESPEasyEth.h" // #include "../ESPEasyCore/ESPEasyWiFiEvent.h" // #include "../ESPEasyCore/ESPEasy_Log.h" // #include "../Helpers/ESPEasy_time_calc.h" @@ -53,7 +53,7 @@ namespace wifi { void handle_unprocessedNetworkEvents() { # if FEATURE_ETHERNET - handle_unprocessedEthEvents(); + ESPEasy::net::eth::handle_unprocessedEthEvents(); # endif if (active_network_medium == NetworkMedium_t::WIFI) { @@ -103,7 +103,7 @@ void handle_unprocessedNetworkEvents() } # if FEATURE_ETHERNET - check_Eth_DNS_valid(); + ESPEasy::net::eth::check_Eth_DNS_valid(); # endif // if FEATURE_ETHERNET # if FEATURE_ESPEASY_P2P diff --git a/src/ESPEasy/net/wifi/ESPEasyWifi_ProcessEvent.h b/src/ESPEasy/net/wifi/ESPEasyWifi_ProcessEvent.h index 1d5abcebd..ba914aeff 100644 --- a/src/ESPEasy/net/wifi/ESPEasyWifi_ProcessEvent.h +++ b/src/ESPEasy/net/wifi/ESPEasyWifi_ProcessEvent.h @@ -11,16 +11,16 @@ void handle_unprocessedNetworkEvents(); void processDisconnect(); void processConnect(); void processGotIP(); -#if FEATURE_USE_IPV6 +# if FEATURE_USE_IPV6 void processGotIPv6(); -#endif +# endif void processDisconnectAPmode(); void processConnectAPmode(); void processDisableAPmode(); void processScanDone(); -} -} -} +} // namespace wifi +} // namespace net +} // namespace ESPEasy -#endif \ No newline at end of file +#endif // if FEATURE_WIFI diff --git a/src/ESPEasy/net/wifi/ESPEasyWifi_abstracted.cpp b/src/ESPEasy/net/wifi/ESPEasyWifi_abstracted.cpp index a9c8484d3..560d94811 100644 --- a/src/ESPEasy/net/wifi/ESPEasyWifi_abstracted.cpp +++ b/src/ESPEasy/net/wifi/ESPEasyWifi_abstracted.cpp @@ -2,7 +2,7 @@ #if FEATURE_WIFI -# include "../../../src/ESPEasyCore/ESPEasyNetwork.h" +# include "../../net/ESPEasyNetwork.h" # include "../../../src/Globals/EventQueue.h" # include "../../../src/Globals/SecuritySettings.h" # include "../../../src/Globals/Services.h" diff --git a/src/ESPEasy/net/wifi/ESPEasyWifi_abstracted_ESP32.cpp b/src/ESPEasy/net/wifi/ESPEasyWifi_abstracted_ESP32.cpp index e447e0eb0..6df94a408 100644 --- a/src/ESPEasy/net/wifi/ESPEasyWifi_abstracted_ESP32.cpp +++ b/src/ESPEasy/net/wifi/ESPEasyWifi_abstracted_ESP32.cpp @@ -9,8 +9,7 @@ # include "../../../src/Globals/WiFi_AP_Candidates.h" # include "../../../src/Helpers/StringConverter.h" -# include "../../../src/ESPEasyCore/ESPEasyNetwork.h" // Needed for NetworkCreateRFCCompliantHostname, WiFi code should not include network - // code +# include "../../net/ESPEasyNetwork.h" // Needed for NetworkCreateRFCCompliantHostname, WiFi code should not include network code # include "../Globals/ESPEasyWiFiEvent.h" # include "../wifi/ESPEasyWiFiEvent_ESP32.h" # include "../wifi/ESPEasyWifi_ProcessEvent.h" diff --git a/src/_C009.cpp b/src/_C009.cpp index 0b5e1a191..32c23b612 100644 --- a/src/_C009.cpp +++ b/src/_C009.cpp @@ -160,7 +160,7 @@ static size_t expectedJsonLength = 100; // IPAddress ip = NetworkLocalIP(); // sprintf_P(ipStr, PSTR("%u.%u.%u.%u"), ip[0], ip[1], ip[2], ip[3]); jsonString += ','; - jsonString += to_json_object_value(F("ip"), formatIP(NetworkLocalIP())); + jsonString += to_json_object_value(F("ip"), formatIP(ESPEasy::net::NetworkLocalIP())); } jsonString += '}'; // End "ESP" diff --git a/src/_C011.cpp b/src/_C011.cpp index c29756c32..5ed15b89b 100644 --- a/src/_C011.cpp +++ b/src/_C011.cpp @@ -216,7 +216,7 @@ bool do_process_c011_delay_queue(cpluginID_t cpluginID, const Queue_element_base const C011_queue_element& element = static_cast(element_base); // *INDENT-ON* -if (!NetworkConnected()) { return false; } +if (!ESPEasy::net::NetworkConnected()) { return false; } int httpCode = -1; diff --git a/src/_C012.cpp b/src/_C012.cpp index e4053f668..d8c0edd6e 100644 --- a/src/_C012.cpp +++ b/src/_C012.cpp @@ -124,7 +124,7 @@ bool do_process_c012_delay_queue(cpluginID_t cpluginID, const Queue_element_base } } - if (!NetworkConnected()) { + if (!ESPEasy::net::NetworkConnected()) { return false; } return element.checkDone(Blynk_get(element.txt[element.valuesSent], element._controller_idx)); diff --git a/src/_C014.cpp b/src/_C014.cpp index ff73bc5b6..63ce7252e 100644 --- a/src/_C014.cpp +++ b/src/_C014.cpp @@ -288,7 +288,7 @@ bool CPlugin_014(CPlugin::Function function, struct EventStruct *event, String& CPlugin_014_sendMQTTdevice(pubname, event->TaskIndex, F("$localip"), formatIP(NetworkLocalIP()), errorCounter); // $mac Device → Controller Mac address of the device network interface. The format MUST be of the type A1:B2:C3:D4:E5:F6 Yes Yes - CPlugin_014_sendMQTTdevice(pubname, event->TaskIndex, F("$mac"), NetworkMacAddress(), errorCounter); + CPlugin_014_sendMQTTdevice(pubname, event->TaskIndex, F("$mac"), ESPEasy::net::NetworkMacAddress(), errorCounter); // $implementation Device → Controller An identifier for the Homie implementation (example esp8266) Yes Yes CPlugin_014_sendMQTTdevice(pubname, event->TaskIndex, F("$implementation"), diff --git a/src/_C015.cpp b/src/_C015.cpp index c0d8869e0..73ce848f4 100644 --- a/src/_C015.cpp +++ b/src/_C015.cpp @@ -275,7 +275,7 @@ if (!Settings.ControllerEnabled[element._controller_idx]) { return true; } -if (!NetworkConnected()) { +if (!ESPEasy::net::NetworkConnected()) { return false; } @@ -300,7 +300,7 @@ return element.checkDone(sendSuccess); } boolean Blynk_keep_connection_c015(int controllerIndex, ControllerSettingsStruct& ControllerSettings) { - if (!NetworkConnected()) { + if (!ESPEasy::net::NetworkConnected()) { return false; } diff --git a/src/_P036_FrameOLED.ino b/src/_P036_FrameOLED.ino index f1b2f361f..8eaa4dbc1 100644 --- a/src/_P036_FrameOLED.ino +++ b/src/_P036_FrameOLED.ino @@ -223,7 +223,7 @@ # ifdef P036_CHECK_HEAP # include "src/Helpers/Memory.h" # endif // ifdef P036_CHECK_HEAP -# include "src/ESPEasyCore/ESPEasyNetwork.h" +# include "ESPEasy/net/ESPEasyNetwork.h" # define PLUGIN_036 # define PLUGIN_ID_036 36 @@ -968,7 +968,7 @@ boolean Plugin_036(uint8_t function, struct EventStruct *event, String& string) if (P036_DisplayIsOn) { // Display is on. - if (!P036_data->bRunning && NetworkConnected() && (P036_data->ScrollingPages.Scrolling == 0)) { + if (!P036_data->bRunning && ESPEasy::net::NetworkConnected() && (P036_data->ScrollingPages.Scrolling == 0)) { // start page updates after network has connected P036_data->P036_DisplayPage(event); } diff --git a/src/_P092_DLbus.ino b/src/_P092_DLbus.ino index 30aa07fb9..35da716ed 100644 --- a/src/_P092_DLbus.ino +++ b/src/_P092_DLbus.ino @@ -71,7 +71,7 @@ # include "src/PluginStructs/P092_data_struct.h" -# include "src/ESPEasyCore/ESPEasyNetwork.h" +# include "ESPEasy/net/ESPEasyNetwork.h" # define PLUGIN_092 # define PLUGIN_ID_092 92 @@ -468,7 +468,7 @@ boolean Plugin_092(uint8_t function, struct EventStruct *event, String& string) case PLUGIN_ONCE_A_SECOND: { - if (!NetworkConnected() + if (!ESPEasy::net::NetworkConnected() || !P092_init || (nullptr == P092_data)) { return false; @@ -533,7 +533,7 @@ boolean Plugin_092(uint8_t function, struct EventStruct *event, String& string) } # endif // ifndef P092_LIMIT_BUILD_SIZE - if (!NetworkConnected()) { + if (!ESPEasy::net::NetworkConnected()) { // too busy for DLbus while wifi connect is running addLog(LOG_LEVEL_ERROR, F("## P092_read: Error DL-Bus: WiFi not connected!")); return false; diff --git a/src/_P094_CULReader.ino b/src/_P094_CULReader.ino index 0d7aa9cdc..e1dadd6d2 100644 --- a/src/_P094_CULReader.ino +++ b/src/_P094_CULReader.ino @@ -14,7 +14,7 @@ * 2025-01-12 tonhuisman: Add support for MQTT AutoDiscovery (not supported for CUL-reader) */ -# include "src/ESPEasyCore/ESPEasyNetwork.h" +# include "ESPEasy/net/ESPEasyNetwork.h" # include "src/Helpers/ESPEasy_Storage.h" # include "src/Helpers/StringConverter.h" @@ -281,7 +281,7 @@ boolean Plugin_094(uint8_t function, struct EventStruct *event, String& string) if (event->String2.length() > 0) { const bool fromCUL = true; - const String source = NetworkGetHostname(); + const String source = ESPEasy::net::NetworkGetHostname(); if (Plugin_094_match_all(event->TaskIndex, event->String2, source, fromCUL)) { if (loglevelActiveFor(LOG_LEVEL_INFO)) { diff --git a/src/src/Commands/HTTP.cpp b/src/src/Commands/HTTP.cpp index 5cf27b8c5..17aacdad7 100644 --- a/src/src/Commands/HTTP.cpp +++ b/src/src/Commands/HTTP.cpp @@ -8,7 +8,7 @@ #include "../DataStructs/SettingsStruct.h" #include "../ESPEasyCore/ESPEasy_Log.h" -#include "../ESPEasyCore/ESPEasyNetwork.h" +#include "../../ESPEasy/net/ESPEasyNetwork.h" #include "../Globals/Settings.h" @@ -27,7 +27,7 @@ const __FlashStringHelper* httpEmitToHTTP(struct EventStruct *event, const bool useHeader, const bool useBody) { - if (NetworkConnected()) { + if (ESPEasy::net::NetworkConnected()) { String user, pass, host, file, path, header, postBody; uint16_t port; uint8_t idx; diff --git a/src/src/Commands/Networks.cpp b/src/src/Commands/Networks.cpp index 1883acbb6..5c7b292af 100644 --- a/src/src/Commands/Networks.cpp +++ b/src/src/Commands/Networks.cpp @@ -2,8 +2,8 @@ #include "../../ESPEasy_common.h" #include "../Commands/Common.h" -#include "../ESPEasyCore/ESPEasyNetwork.h" -#include "../ESPEasyCore/ESPEasyEth.h" +#include "../../ESPEasy/net/ESPEasyNetwork.h" +#include "../../ESPEasy/net/eth/ESPEasyEth.h" #include "../../ESPEasy/net/Globals/NetworkState.h" #include "../Globals/Settings.h" #include "../Helpers/StringConverter.h" @@ -27,24 +27,24 @@ String Command_AccessInfo_Clear (struct EventStruct *event, const char* Line) String Command_DNS (struct EventStruct *event, const char* Line) { - return Command_GetORSetIP(event, F("DNS:"), Line, Settings.DNS, NetworkDnsIP(0), 1); + return Command_GetORSetIP(event, F("DNS:"), Line, Settings.DNS, ESPEasy::net::NetworkDnsIP(0), 1); } String Command_Gateway (struct EventStruct *event, const char* Line) { - return Command_GetORSetIP(event, F("Gateway:"), Line, Settings.Gateway, NetworkGatewayIP(),1); + return Command_GetORSetIP(event, F("Gateway:"), Line, Settings.Gateway, ESPEasy::net::NetworkGatewayIP(),1); } String Command_IP (struct EventStruct *event, const char* Line) { - return Command_GetORSetIP(event, F("IP:"), Line, Settings.IP, NetworkLocalIP(),1); + return Command_GetORSetIP(event, F("IP:"), Line, Settings.IP, ESPEasy::net::NetworkLocalIP(),1); } #if FEATURE_USE_IPV6 String Command_show_all_IP6 (struct EventStruct *event, const char* Line) { // Only get all IPv6 addresses - IP6Addresses_t addresses = NetworkAllIPv6(); + IP6Addresses_t addresses = ESPEasy::net::NetworkAllIPv6(); String res; res += '['; bool first = true; @@ -65,7 +65,7 @@ String Command_show_all_IP6 (struct EventStruct *event, const char* Line) String Command_Subnet (struct EventStruct *event, const char* Line) { - return Command_GetORSetIP(event, F("Subnet:"), Line, Settings.Subnet, NetworkSubnetMask(), 1); + return Command_GetORSetIP(event, F("Subnet:"), Line, Settings.Subnet, ESPEasy::net::NetworkSubnetMask(), 1); } #if FEATURE_ETHERNET @@ -139,7 +139,7 @@ String Command_ETH_Wifi_Mode (struct EventStruct *event, const char* Line) Settings.NetworkMedium = orig_medium; return return_command_failed(); } - setNetworkMedium(Settings.NetworkMedium); + ESPEasy::net::setNetworkMedium(Settings.NetworkMedium); } return result; @@ -148,11 +148,11 @@ String Command_ETH_Wifi_Mode (struct EventStruct *event, const char* Line) String Command_ETH_Disconnect (struct EventStruct *event, const char* Line) { - ethPower(0); + ESPEasy::net::eth::ethPower(0); delay(400); // ethPower(1); - setNetworkMedium(NetworkMedium_t::Ethernet); - ETHConnectRelaxed(); + ESPEasy::net::setNetworkMedium(NetworkMedium_t::Ethernet); + ESPEasy::net::eth::ETHConnectRelaxed(); return return_command_success(); } diff --git a/src/src/Commands/Settings.cpp b/src/src/Commands/Settings.cpp index cca0dd7f7..c89d9e402 100644 --- a/src/src/Commands/Settings.cpp +++ b/src/src/Commands/Settings.cpp @@ -6,7 +6,7 @@ #include "../CustomBuild/CompiletimeDefines.h" -#include "../ESPEasyCore/ESPEasyNetwork.h" +#include "../../ESPEasy/net/ESPEasyNetwork.h" #include "../ESPEasyCore/Serial.h" #include "../Globals/SecuritySettings.h" @@ -92,7 +92,7 @@ const __FlashStringHelper * Command_Settings_Print(struct EventStruct *event, co serialPrintln(); serialPrintln(F("System Info")); - serialPrint(F(" IP Address : ")); serialPrintln(formatIP(NetworkLocalIP())); + serialPrint(F(" IP Address : ")); serialPrintln(formatIP(ESPEasy::net::NetworkLocalIP())); serialPrint(F(" Build : ")); serialPrintln(String(get_build_nr()) + '/' + getSystemBuildString()); serialPrint(F(" Name : ")); serialPrintln(Settings.getName()); serialPrint(F(" Unit : ")); serialPrintln(String(static_cast(Settings.Unit))); diff --git a/src/src/Commands/UDP.cpp b/src/src/Commands/UDP.cpp index 60bb0a124..432585d95 100644 --- a/src/src/Commands/UDP.cpp +++ b/src/src/Commands/UDP.cpp @@ -4,7 +4,7 @@ #include "../../ESPEasy_common.h" #include "../Commands/Common.h" -#include "../ESPEasyCore/ESPEasyNetwork.h" +#include "../../ESPEasy/net/ESPEasyNetwork.h" #include "../../ESPEasy/net/Globals/NetworkState.h" #include "../Globals/Settings.h" #include "../Helpers/Misc.h" @@ -61,7 +61,7 @@ const __FlashStringHelper* Command_UDP_SendToUPDMix(struct EventStruct *event, c const __FlashStringHelper* Command_UDP_SendToUPD(struct EventStruct *event, const char *Line, const bool handleMix) { - if (NetworkConnected()) { + if (ESPEasy::net::NetworkConnected()) { const String ip = parseString(Line, 2); const int port = parseCommandArgumentInt(Line, 2, -1); diff --git a/src/src/DataStructs/ControllerSettingsStruct.cpp b/src/src/DataStructs/ControllerSettingsStruct.cpp index 9afc59e96..160b732d4 100644 --- a/src/src/DataStructs/ControllerSettingsStruct.cpp +++ b/src/src/DataStructs/ControllerSettingsStruct.cpp @@ -4,7 +4,7 @@ #include "../CustomBuild/ESPEasyLimits.h" #include "../ESPEasyCore/ESPEasy_Log.h" -#include "../ESPEasyCore/ESPEasyNetwork.h" +#include "../../ESPEasy/net/ESPEasyNetwork.h" #include "../Helpers/Misc.h" #include "../Helpers/Networking.h" #include "../Helpers/StringConverter.h" @@ -212,7 +212,7 @@ bool ControllerSettingsStruct::updateIPcache() { return true; } - if (!NetworkConnected()) { return false; } + if (!ESPEasy::net::NetworkConnected()) { return false; } IPAddress tmpIP; if (resolveHostByName(HostName, tmpIP, ClientTimeout)) { diff --git a/src/src/DataStructs/NodeStruct.cpp b/src/src/DataStructs/NodeStruct.cpp index 4f672457e..a3c852e02 100644 --- a/src/src/DataStructs/NodeStruct.cpp +++ b/src/src/DataStructs/NodeStruct.cpp @@ -5,7 +5,7 @@ #include "../DataTypes/NodeTypeID.h" -#include "../ESPEasyCore/ESPEasyNetwork.h" +#include "../../ESPEasy/net/ESPEasyNetwork.h" #include "../Globals/SecuritySettings.h" #include "../Globals/Settings.h" @@ -70,7 +70,7 @@ bool NodeStruct::validate(const IPAddress& remoteIP) { if (Settings.EnableIPv6() && hasIPv6_mac_based_link_global && remoteIP.type() == IPv6) { - const IPAddress this_global = NetworkGlobalIP6(); + const IPAddress this_global = ESPEasy::net::NetworkGlobalIP6(); // Check first 64 bit to see if we're in the same global scope for (int i = 0; i < 8 && hasIPv6_mac_based_link_global; ++i) { if (this_global[i] != remoteIP[i]) @@ -161,7 +161,7 @@ IPAddress NodeStruct::IPv6_link_local(bool stripZone) const if (Settings.EnableIPv6() && hasIPv6_mac_based_link_local) { // Base IPv6 on MAC address IPAddress ipv6; - if (IPv6_link_local_from_MAC(sta_mac, ipv6)) { + if (ESPEasy::net::IPv6_link_local_from_MAC(sta_mac, ipv6)) { if (stripZone) { return IPAddress(IPv6, &ipv6[0], 0); } @@ -176,7 +176,7 @@ IPAddress NodeStruct::IPv6_global() const if (Settings.EnableIPv6() && hasIPv6_mac_based_link_global) { // Base IPv6 on MAC address IPAddress ipv6; - if (IPv6_global_from_MAC(sta_mac, ipv6)) { + if (ESPEasy::net::IPv6_global_from_MAC(sta_mac, ipv6)) { return ipv6; } } @@ -319,9 +319,9 @@ bool NodeStruct::isThisNode() const { // Check to see if we process a node we've sent ourselves. #if FEATURE_WIFI - if (WifiSoftAPmacAddress() == ap_mac) return true; + if (ESPEasy::net::WifiSoftAPmacAddress() == ap_mac) return true; #endif - if (NetworkMacAddress() == sta_mac) return true; + if (ESPEasy::net::NetworkMacAddress() == sta_mac) return true; return false; } diff --git a/src/src/DataStructs/NodeStruct.h b/src/src/DataStructs/NodeStruct.h index 26025676b..2875e8445 100644 --- a/src/src/DataStructs/NodeStruct.h +++ b/src/src/DataStructs/NodeStruct.h @@ -5,7 +5,7 @@ #if FEATURE_ESPEASY_P2P #include "../Helpers/ESPEasy_time.h" -#include "../DataStructs/MAC_address.h" +#include "../../ESPEasy/net/DataStructs/MAC_address.h" #include #include diff --git a/src/src/DataStructs/NodesHandler.cpp b/src/src/DataStructs/NodesHandler.cpp index 972f092a2..e955da7ae 100644 --- a/src/src/DataStructs/NodesHandler.cpp +++ b/src/src/DataStructs/NodesHandler.cpp @@ -19,7 +19,7 @@ #endif #include "../ESPEasyCore/ESPEasy_Log.h" -#include "../ESPEasyCore/ESPEasyNetwork.h" +#include "../../ESPEasy/net/ESPEasyNetwork.h" #include "../Globals/ESPEasy_time.h" #include "../../ESPEasy/net/Globals/ESPEasyWiFiEvent.h" @@ -272,7 +272,7 @@ const NodeStruct* NodesHandler::getPreferredNode_notMatching(uint8_t unit_nr) co } const NodeStruct * NodesHandler::getPreferredNode_notMatching(const MAC_address& not_matching) const { - MAC_address this_mac = NetworkMacAddress(); + MAC_address this_mac = ESPEasy::net::NetworkMacAddress(); const NodeStruct *thisNode = getNodeByMac(this_mac); const NodeStruct *reject = getNodeByMac(not_matching); @@ -394,19 +394,19 @@ void NodesHandler::updateThisNode() { // Set local data { - MAC_address mac = NetworkMacAddress(); + MAC_address mac = ESPEasy::net::NetworkMacAddress(); mac.get(thisNode.sta_mac); } WiFi.softAPmacAddress(thisNode.ap_mac); { - const bool addIP = NetworkConnected(); + const bool addIP = ESPEasy::net::NetworkConnected(); #ifdef USES_ESPEASY_NOW if (use_EspEasy_now) { thisNode.useAP_ESPEasyNow = 1; } #endif if (addIP) { - const IPAddress localIP = NetworkLocalIP(); + const IPAddress localIP = ESPEasy::net::NetworkLocalIP(); for (uint8_t i = 0; i < 4; ++i) { thisNode.ip[i] = localIP[i]; @@ -512,8 +512,8 @@ void NodesHandler::updateThisNode() { #if FEATURE_USE_IPV6 thisNode.hasIPv4 = thisNode.IP() != INADDR_NONE; - thisNode.hasIPv6_mac_based_link_local = is_IPv6_link_local_from_MAC(thisNode.sta_mac); - thisNode.hasIPv6_mac_based_link_global = is_IPv6_global_from_MAC(thisNode.sta_mac); + thisNode.hasIPv6_mac_based_link_local = ESPEasy::net::is_IPv6_link_local_from_MAC(thisNode.sta_mac); + thisNode.hasIPv6_mac_based_link_global = ESPEasy::net::is_IPv6_global_from_MAC(thisNode.sta_mac); #endif #ifdef USES_ESPEASY_NOW @@ -530,7 +530,7 @@ void NodesHandler::updateThisNode() { const NodeStruct * NodesHandler::getThisNode() { // node_time.now(); updateThisNode(); - MAC_address this_mac = NetworkMacAddress(); + MAC_address this_mac = ESPEasy::net::NetworkMacAddress(); return getNodeByMac(this_mac.mac); } @@ -617,7 +617,7 @@ bool NodesHandler::isEndpoint() const } #endif - if (!NetworkConnected()) return false; + if (!ESPEasy::net::NetworkConnected()) return false; return false; } @@ -625,7 +625,7 @@ bool NodesHandler::isEndpoint() const #ifdef USES_ESPEASY_NOW uint8_t NodesHandler::getESPEasyNOW_channel() const { - if (active_network_medium == NetworkMedium_t::WIFI && NetworkConnected()) { + if (active_network_medium == NetworkMedium_t::WIFI && ESPEasy::net::NetworkConnected()) { return WiFi.channel(); } if (Settings.ForceESPEasyNOWchannel > 0) { diff --git a/src/src/DataStructs/NodesHandler.h b/src/src/DataStructs/NodesHandler.h index 79c16b188..6d6486528 100644 --- a/src/src/DataStructs/NodesHandler.h +++ b/src/src/DataStructs/NodesHandler.h @@ -4,7 +4,7 @@ #include "../../ESPEasy_common.h" #if FEATURE_ESPEASY_P2P -#include "../DataStructs/MAC_address.h" +#include "../../ESPEasy/net/DataStructs/MAC_address.h" #include "../DataStructs/NodeStruct.h" #include "../DataStructs/NTP_candidate.h" diff --git a/src/src/DataStructs/Web_StreamingBuffer.cpp b/src/src/DataStructs/Web_StreamingBuffer.cpp index a98f70f9f..baa5a2708 100644 --- a/src/src/DataStructs/Web_StreamingBuffer.cpp +++ b/src/src/DataStructs/Web_StreamingBuffer.cpp @@ -3,7 +3,7 @@ #include "../DataStructs/tcp_cleanup.h" #include "../DataTypes/ESPEasyTimeSource.h" #include "../ESPEasyCore/ESPEasy_Log.h" -#include "../ESPEasyCore/ESPEasyNetwork.h" +#include "../../ESPEasy/net/ESPEasyNetwork.h" // FIXME TD-er: Should keep a pointer to the webserver as a member, not use the global defined one. #include "../Globals/Services.h" diff --git a/src/src/DataStructs/WiFi_AP_Candidate.h b/src/src/DataStructs/WiFi_AP_Candidate.h index a552912fd..73e6eb253 100644 --- a/src/src/DataStructs/WiFi_AP_Candidate.h +++ b/src/src/DataStructs/WiFi_AP_Candidate.h @@ -3,7 +3,7 @@ #include "../../ESPEasy_common.h" -#include "../DataStructs/MAC_address.h" +#include "../../ESPEasy/net/DataStructs/MAC_address.h" struct WiFi_AP_Candidate { WiFi_AP_Candidate(); WiFi_AP_Candidate(const WiFi_AP_Candidate& other); diff --git a/src/src/ESPEasyCore/ESPEasyEth.h b/src/src/ESPEasyCore/ESPEasyEth.h deleted file mode 100644 index f1a1f18aa..000000000 --- a/src/src/ESPEasyCore/ESPEasyEth.h +++ /dev/null @@ -1,27 +0,0 @@ -#ifndef ESPEASY_ETH_H -#define ESPEASY_ETH_H - -#include "../../ESPEasy_common.h" - -#if FEATURE_ETHERNET - -#include "../DataStructs/MAC_address.h" - -#include - -bool ethUseStaticIP(); -void ethSetupStaticIPconfig(); -bool ethCheckSettings(); -bool ethPrepare(); -void ethPrintSettings(); -bool ETHConnectRelaxed(); -bool ETHConnected(); -void ethPower(bool enable); -void ethResetGPIOpins(); -MAC_address ETHMacAddress(); - -void removeEthEventHandler(); -void registerEthEventHandler(); - -#endif // if FEATURE_ETHERNET -#endif // ifndef ESPEASY_ETH_H diff --git a/src/src/ESPEasyCore/ESPEasyEthEvent.cpp b/src/src/ESPEasyCore/ESPEasyEthEvent.cpp deleted file mode 100644 index 0dd097560..000000000 --- a/src/src/ESPEasyCore/ESPEasyEthEvent.cpp +++ /dev/null @@ -1,64 +0,0 @@ -#include "../ESPEasyCore/ESPEasyEthEvent.h" - -#ifdef ESP32 -# if FEATURE_ETHERNET -# include - -#include "../ESPEasyCore/ESPEasyEth.h" -#include "../../ESPEasy/net/Globals/ESPEasyEthEvent.h" - - -// ******************************************************************************** -// Functions called on events. ** WARNING ** -// Make sure not to call anything in these functions that result in delay() or yield() -// ******************************************************************************** - -# include - -void EthEvent(WiFiEvent_t event, arduino_event_info_t info) { - switch (event) { - case ARDUINO_EVENT_ETH_START: - - if (ethPrepare()) { -// addLog(LOG_LEVEL_INFO, F("ETH event: Started")); -// } else { -// addLog(LOG_LEVEL_ERROR, F("ETH event: Could not prepare ETH!")); - } - break; - case ARDUINO_EVENT_ETH_CONNECTED: -// addLog(LOG_LEVEL_INFO, F("ETH event: Connected")); - EthEventData.markConnected(); - break; - case ARDUINO_EVENT_ETH_GOT_IP: - EthEventData.markGotIP(); -// addLog(LOG_LEVEL_INFO, F("ETH event: Got IP")); - break; - case ARDUINO_EVENT_ETH_DISCONNECTED: -// addLog(LOG_LEVEL_ERROR, F("ETH event: Disconnected")); - EthEventData.markDisconnect(); - break; - case ARDUINO_EVENT_ETH_STOP: -// addLog(LOG_LEVEL_INFO, F("ETH event: Stopped")); - break; - case ARDUINO_EVENT_ETH_GOT_IP6: - #if FEATURE_USE_IPV6 - { - ip_event_got_ip6_t * event = static_cast(&info.got_ip6); - IPAddress ip(IPv6, (const uint8_t*)event->ip6_info.ip.addr, event->ip6_info.ip.zone); - EthEventData.markGotIPv6(ip); -// addLog(LOG_LEVEL_INFO, String(F("ETH event: Got IP6 ")) + ip.toString(true)); - } - #else -// addLog(LOG_LEVEL_INFO, F("ETH event: Got IP6")); - #endif - break; - default: - { - break; - } - } -} - -# endif // if FEATURE_ETHERNET - -#endif // ifdef ESP32 diff --git a/src/src/ESPEasyCore/ESPEasyEthEvent.h b/src/src/ESPEasyCore/ESPEasyEthEvent.h deleted file mode 100644 index 6130eddfa..000000000 --- a/src/src/ESPEasyCore/ESPEasyEthEvent.h +++ /dev/null @@ -1,20 +0,0 @@ -#ifndef ESPEASY_ETH_EVENT_H -#define ESPEASY_ETH_EVENT_H - -#include "../../ESPEasy_common.h" - - -// ******************************************************************************** -// Functions called on Eth events. -// Make sure not to call anything in these functions that result in delay() or yield() -// ******************************************************************************** -#ifdef ESP32 -#if FEATURE_ETHERNET -#include -#include -void EthEvent(WiFiEvent_t event, arduino_event_info_t info); -#endif -#endif - - -#endif // ESPEASY_ETH_EVENT_H \ No newline at end of file diff --git a/src/src/ESPEasyCore/ESPEasy_backgroundtasks.cpp b/src/src/ESPEasyCore/ESPEasy_backgroundtasks.cpp index 98aae53d1..b6ff07688 100644 --- a/src/src/ESPEasyCore/ESPEasy_backgroundtasks.cpp +++ b/src/src/ESPEasyCore/ESPEasy_backgroundtasks.cpp @@ -4,7 +4,7 @@ #include "../../ESPEasy-Globals.h" #include "../DataStructs/TimingStats.h" -#include "../ESPEasyCore/ESPEasyNetwork.h" +#include "../../ESPEasy/net/ESPEasyNetwork.h" #include "../ESPEasyCore/Serial.h" #include "../../ESPEasy/net/Globals/NetworkState.h" #include "../Globals/Services.h" @@ -57,9 +57,9 @@ void backgroundtasks() START_TIMER #if FEATURE_MDNS || FEATURE_ESPEASY_P2P - const bool networkConnected = NetworkConnected(); + const bool networkConnected = ESPEasy::net::NetworkConnected(); #else - NetworkConnected(); + ESPEasy::net::NetworkConnected(); #endif runningBackgroundTasks = true; diff --git a/src/src/ESPEasyCore/ESPEasy_loop.cpp b/src/src/ESPEasyCore/ESPEasy_loop.cpp index 6a1b3c129..cd14d962d 100644 --- a/src/src/ESPEasyCore/ESPEasy_loop.cpp +++ b/src/src/ESPEasyCore/ESPEasy_loop.cpp @@ -4,7 +4,7 @@ #include "../../ESPEasy-Globals.h" #include "../Commands/ExecuteCommand.h" #include "../DataStructs/TimingStats.h" -#include "../ESPEasyCore/ESPEasyNetwork.h" +#include "../../ESPEasy/net/ESPEasyNetwork.h" #include "../../ESPEasy/net/wifi/ESPEasyWifi.h" #include "../../ESPEasy/net/wifi/ESPEasyWifi_ProcessEvent.h" #include "../ESPEasyCore/ESPEasy_backgroundtasks.h" @@ -77,7 +77,7 @@ void ESPEasy_loop() ESPEasy::net::wifi::handle_unprocessedNetworkEvents(); - bool firstLoopConnectionsEstablished = NetworkConnected() && firstLoop; + bool firstLoopConnectionsEstablished = ESPEasy::net::NetworkConnected() && firstLoop; if (firstLoopConnectionsEstablished) { #ifndef BUILD_MINIMAL_OTA diff --git a/src/src/ESPEasyCore/ESPEasy_setup.cpp b/src/src/ESPEasyCore/ESPEasy_setup.cpp index 076b0653c..d27d14acc 100644 --- a/src/src/ESPEasyCore/ESPEasy_setup.cpp +++ b/src/src/ESPEasyCore/ESPEasy_setup.cpp @@ -7,7 +7,7 @@ #include "../Commands/InternalCommands_decoder.h" #include "../CustomBuild/CompiletimeDefines.h" #include "../ESPEasyCore/ESPEasyGPIO.h" -#include "../ESPEasyCore/ESPEasyNetwork.h" +#include "../../ESPEasy/net/ESPEasyNetwork.h" #include "../ESPEasyCore/ESPEasyRules.h" #include "../../ESPEasy/net/wifi/ESPEasyWifi.h" @@ -449,7 +449,7 @@ void ESPEasy_setup() } #endif // if FEATURE_ETHERNET - setNetworkMedium(Settings.NetworkMedium); + ESPEasy::net::setNetworkMedium(Settings.NetworkMedium); bool initWiFi = active_network_medium == NetworkMedium_t::WIFI; @@ -635,7 +635,7 @@ void ESPEasy_setup() #endif // if FEATURE_ETHERNET - NetworkConnectRelaxed(); + ESPEasy::net::NetworkConnectRelaxed(); #ifndef BUILD_NO_RAM_TRACKER logMemUsageAfter(F("NetworkConnectRelaxed()")); #endif // ifndef BUILD_NO_RAM_TRACKER diff --git a/src/src/Helpers/DeepSleep.cpp b/src/src/Helpers/DeepSleep.cpp index 44ad9c31b..a5ac77b44 100644 --- a/src/src/Helpers/DeepSleep.cpp +++ b/src/src/Helpers/DeepSleep.cpp @@ -4,8 +4,8 @@ #include "../../ESPEasy-Globals.h" #include "../ESPEasyCore/ESPEasy_Log.h" -#include "../ESPEasyCore/ESPEasyEth.h" -#include "../ESPEasyCore/ESPEasyNetwork.h" +#include "../../ESPEasy/net/eth/ESPEasyEth.h" +#include "../../ESPEasy/net/ESPEasyNetwork.h" #include "../../ESPEasy/net/wifi/ESPEasyWifi.h" #include "../ESPEasyCore/ESPEasyRules.h" @@ -77,7 +77,7 @@ bool readyForSleep() return false; } - if (!NetworkConnected()) { + if (!ESPEasy::net::NetworkConnected()) { // Allow 12 seconds to establish connections return timeOutReached(timerAwakeFromDeepSleep + 12000); } diff --git a/src/src/Helpers/ESPEasy_Storage.cpp b/src/src/Helpers/ESPEasy_Storage.cpp index 95cf3c5d8..556027f69 100644 --- a/src/src/Helpers/ESPEasy_Storage.cpp +++ b/src/src/Helpers/ESPEasy_Storage.cpp @@ -15,7 +15,7 @@ # include "../ESPEasyCore/Controller.h" #endif // if FEATURE_MQTT #include "../ESPEasyCore/ESPEasy_Log.h" -#include "../ESPEasyCore/ESPEasyNetwork.h" +#include "../../ESPEasy/net/ESPEasyNetwork.h" #include "../../ESPEasy/net/wifi/ESPEasyWifi.h" #include "../ESPEasyCore/Serial.h" @@ -864,7 +864,7 @@ String SaveSecuritySettings(bool forFactoryReset) { if (!forFactoryReset) { if (SecuritySettings.hasWiFiCredentials() && (active_network_medium == NetworkMedium_t::WIFI)) { WiFi_AP_Candidates.force_reload(); // Force reload of the credentials and found APs from the last scan - if (!NetworkConnected()) { + if (!ESPEasy::net::NetworkConnected()) { WiFiEventData.wifiConnectAttemptNeeded = true; ESPEasy::net::wifi::resetWiFi(); ESPEasy::net::wifi::AttemptWiFiConnect(); @@ -952,7 +952,7 @@ void afterloadSettings() { eventQueue.clear(); } node_time.applyTimeZone(); - CheckRunningServices(); // To update changes in hostname. + ESPEasy::net::CheckRunningServices(); // To update changes in hostname. } /********************************************************************************************\ diff --git a/src/src/Helpers/ESPEasy_time.cpp b/src/src/Helpers/ESPEasy_time.cpp index 228a15881..ea0b691ea 100644 --- a/src/src/Helpers/ESPEasy_time.cpp +++ b/src/src/Helpers/ESPEasy_time.cpp @@ -12,7 +12,7 @@ #include "../DataTypes/TimeSource.h" #include "../ESPEasyCore/ESPEasy_Log.h" -#include "../ESPEasyCore/ESPEasyNetwork.h" +#include "../../ESPEasy/net/ESPEasyNetwork.h" #include "../Globals/EventQueue.h" #include "../../ESPEasy/net/Globals/NetworkState.h" @@ -668,7 +668,7 @@ bool ESPEasy_time::getNtpTime(double& unixTime_d) )); #endif // ifndef BUILD_NO_DEBUG } - CheckRunningServices(); // FIXME TD-er: Sometimes services can only be started after NTP is successful + ESPEasy::net::CheckRunningServices(); // FIXME TD-er: Sometimes services can only be started after NTP is successful STOP_TIMER(NTP_SUCCESS); return true; } diff --git a/src/src/Helpers/Improv_Helper.cpp b/src/src/Helpers/Improv_Helper.cpp index c646fa087..477f8e34c 100644 --- a/src/src/Helpers/Improv_Helper.cpp +++ b/src/src/Helpers/Improv_Helper.cpp @@ -2,7 +2,7 @@ #if FEATURE_IMPROV # include "../CustomBuild/CompiletimeDefines.h" -# include "../ESPEasyCore/ESPEasyNetwork.h" +# include "../../ESPEasy/net/ESPEasyNetwork.h" # include "../Globals/SecuritySettings.h" # include "../Helpers/ESPEasy_Storage.h" # include "../Helpers/Hardware_device_info.h" @@ -94,7 +94,7 @@ void Improv_Helper_t::init() _improv.setDeviceInfo( firmwareName.c_str(), buildString.c_str(), - NetworkGetHostNameFromSettings().c_str()); + ESPEasy::net::NetworkGetHostNameFromSettings().c_str()); String chipModel = getChipModel(); diff --git a/src/src/Helpers/MDNS_Helper.cpp b/src/src/Helpers/MDNS_Helper.cpp index 9f3a562df..bac51cbde 100644 --- a/src/src/Helpers/MDNS_Helper.cpp +++ b/src/src/Helpers/MDNS_Helper.cpp @@ -3,8 +3,8 @@ #if FEATURE_MDNS #include "../ESPEasyCore/ESPEasy_Log.h" -#include "../ESPEasyCore/ESPEasyEth.h" -#include "../ESPEasyCore/ESPEasyNetwork.h" +#include "../../ESPEasy/net/eth/ESPEasyEth.h" +#include "../../ESPEasy/net/ESPEasyNetwork.h" #include "../../ESPEasy/net/Globals/ESPEasyWiFiEvent.h" #include "../../ESPEasy/net/Globals/NetworkState.h" diff --git a/src/src/Helpers/Network.cpp b/src/src/Helpers/Network.cpp index b3824fecd..365be211b 100644 --- a/src/src/Helpers/Network.cpp +++ b/src/src/Helpers/Network.cpp @@ -4,7 +4,7 @@ #include "../../ESPEasy/net/wifi/ESPEasyWifi.h" -#include "../ESPEasyCore/ESPEasyNetwork.h" +#include "../../ESPEasy/net/ESPEasyNetwork.h" #include "../Globals/Settings.h" #include "../Globals/Services.h" @@ -57,7 +57,7 @@ void statusLED(bool traffic) } else { - if (NetworkConnected()) + if (ESPEasy::net::NetworkConnected()) { long int delta = timePassedSince(gnLastUpdate); diff --git a/src/src/Helpers/Networking.cpp b/src/src/Helpers/Networking.cpp index 6cc61fd2d..64bfbcafd 100644 --- a/src/src/Helpers/Networking.cpp +++ b/src/src/Helpers/Networking.cpp @@ -7,8 +7,8 @@ #include "../DataTypes/EventValueSource.h" #include "../ESPEasyCore/ESPEasy_Log.h" #include "../ESPEasyCore/ESPEasy_backgroundtasks.h" -#include "../ESPEasyCore/ESPEasyEth.h" -#include "../ESPEasyCore/ESPEasyNetwork.h" +#include "../../ESPEasy/net/eth/ESPEasyEth.h" +#include "../../ESPEasy/net/ESPEasyNetwork.h" #include "../../ESPEasy/net/wifi/ESPEasyWifi.h" #include "../ESPEasyCore/Serial.h" #include "../../ESPEasy/net/Globals/ESPEasyEthEvent.h" @@ -100,7 +100,7 @@ void etharp_gratuitous_r(struct netif *netif) { tcpip_callback_with_block((t \*********************************************************************************************/ void sendSyslog(uint8_t logLevel, const String& message) { - if ((Settings.Syslog_IP[0] != 0) && NetworkConnected()) + if ((Settings.Syslog_IP[0] != 0) && ESPEasy::net::NetworkConnected()) { IPAddress broadcastIP(Settings.Syslog_IP[0], Settings.Syslog_IP[1], Settings.Syslog_IP[2], Settings.Syslog_IP[3]); @@ -130,7 +130,7 @@ void sendSyslog(uint8_t logLevel, const String& message) header += '<'; header += prio; header += '>'; - header += NetworkCreateRFCCompliantHostname(true); + header += ESPEasy::net::NetworkCreateRFCCompliantHostname(true); header += F(" EspEasy: "); header.trim(); header.replace(' ', '_'); @@ -233,7 +233,7 @@ void updateUDPport(bool force) lastUsedUDPPort = 0; } - if (!NetworkConnected()) { + if (!ESPEasy::net::NetworkConnected()) { return; } @@ -259,7 +259,7 @@ boolean runningUPDCheck = false; void checkUDP() { - if (!NetworkConnected()) { + if (!ESPEasy::net::NetworkConnected()) { return; } @@ -989,8 +989,8 @@ bool getSubnetRange(IPAddress& low, IPAddress& high) return false; } - const IPAddress ip = NetworkLocalIP(); - const IPAddress subnet = NetworkSubnetMask(); + const IPAddress ip = ESPEasy::net::NetworkLocalIP(); + const IPAddress subnet = ESPEasy::net::NetworkSubnetMask(); low = ip; high = ip; @@ -1040,7 +1040,7 @@ bool useStaticIP() { #if FEATURE_ETHERNET if (active_network_medium == NetworkMedium_t::Ethernet) { - return ethUseStaticIP(); + return ESPEasy::net::eth::ethUseStaticIP(); } #endif // if FEATURE_ETHERNET return ESPEasy::net::wifi::WiFiUseStaticIP(); @@ -1048,7 +1048,7 @@ bool useStaticIP() { // Check connection. Maximum timeout 500 msec. bool NetworkConnected(uint32_t timeout_ms) { - if (NetworkConnected()) return true; + if (ESPEasy::net::NetworkConnected()) return true; #ifdef USES_ESPEASY_NOW @@ -1070,7 +1070,7 @@ bool NetworkConnected(uint32_t timeout_ms) { } // Apparently something needs network, perform check to see if it is ready now. - while (!NetworkConnected()) { + while (!ESPEasy::net::NetworkConnected()) { if (timeOutReached(timer)) { return false; } @@ -1080,7 +1080,7 @@ bool NetworkConnected(uint32_t timeout_ms) { } bool hostReachable(const IPAddress& ip) { - if (!NetworkConnected()) { return false; } + if (!ESPEasy::net::NetworkConnected()) { return false; } return true; // Disabled ping as requested here: // https://github.com/letscontrolit/ESPEasy/issues/1494#issuecomment-397872538 @@ -1128,7 +1128,7 @@ bool connectClient(WiFiClient& client, IPAddress ip, uint16_t port, uint32_t tim { START_TIMER; - if (!NetworkConnected()) { + if (!ESPEasy::net::NetworkConnected()) { client.stop(); return false; } @@ -1252,7 +1252,7 @@ bool setDNS(int index, const IPAddress& dns) { bool resolveHostByName(const char *aHostname, IPAddress& aResult, uint32_t timeout_ms) { START_TIMER; - if (!NetworkConnected()) { + if (!ESPEasy::net::NetworkConnected()) { return false; } @@ -1292,7 +1292,7 @@ bool hostReachable(const String& hostname) { // Create a random port for the UDP connection. // Return true when successful. bool beginWiFiUDP_randomPort(WiFiUDP& udp) { - if (!NetworkConnected()) { + if (!ESPEasy::net::NetworkConnected()) { return false; } unsigned int attempts = 3; @@ -1309,7 +1309,7 @@ bool beginWiFiUDP_randomPort(WiFiUDP& udp) { } void sendGratuitousARP() { - if (!NetworkConnected()) { + if (!ESPEasy::net::NetworkConnected()) { return; } #ifdef SUPPORT_ARP @@ -1617,7 +1617,7 @@ int http_authenticate(const String& logIdentifier, http.addHeader(F("Accept"), F("*/*;q=0.1")); // Add client IP - http.addHeader(F("X-Forwarded-For"), formatIP(NetworkLocalIP())); + http.addHeader(F("X-Forwarded-For"), formatIP(ESPEasy::net::NetworkLocalIP())); delay(0); scrubDNS(); diff --git a/src/src/Helpers/PeriodicalActions.cpp b/src/src/Helpers/PeriodicalActions.cpp index 8b093cfe0..72910384f 100644 --- a/src/src/Helpers/PeriodicalActions.cpp +++ b/src/src/Helpers/PeriodicalActions.cpp @@ -10,7 +10,7 @@ #include "../ESPEasyCore/Controller.h" #include "../ESPEasyCore/ESPEasyGPIO.h" #include "../ESPEasyCore/ESPEasy_Log.h" -#include "../ESPEasyCore/ESPEasyNetwork.h" +#include "../../ESPEasy/net/ESPEasyNetwork.h" #include "../ESPEasyCore/ESPEasyRules.h" #include "../ESPEasyCore/Serial.h" #include "../Globals/ESPEasy_Scheduler.h" @@ -109,7 +109,7 @@ void run10TimesPerSecond() { } #ifdef USES_C015 - if (NetworkConnected()) { + if (ESPEasy::net::NetworkConnected()) { Blynk_Run_c015(); } #endif @@ -196,7 +196,7 @@ void runOncePerSecond() #if FEATURE_MDNS #ifdef ESP8266 // Allow MDNS processing - if (NetworkConnected()) { + if (ESPEasy::net::NetworkConnected()) { MDNS.announce(); } #endif diff --git a/src/src/Helpers/StringProvider.cpp b/src/src/Helpers/StringProvider.cpp index 38a4414a5..c954099ea 100644 --- a/src/src/Helpers/StringProvider.cpp +++ b/src/src/Helpers/StringProvider.cpp @@ -8,11 +8,11 @@ #include "../CustomBuild/CompiletimeDefines.h" -#include "../ESPEasyCore/ESPEasyNetwork.h" +#include "../../ESPEasy/net/ESPEasyNetwork.h" #include "../../ESPEasy/net/wifi/ESPEasyWifi.h" #if FEATURE_ETHERNET -#include "../ESPEasyCore/ESPEasyEth.h" +#include "../../ESPEasy/net/eth/ESPEasyEth.h" #endif #include "../Globals/Device.h" @@ -329,7 +329,7 @@ String getValue(LabelType::Enum label) { } #endif // FEATURE_ZEROFILLED_UNITNUMBER case LabelType::UNIT_NAME: return Settings.getName(); // Only return the set name, no appended unit. - case LabelType::HOST_NAME: return NetworkGetHostname(); + case LabelType::HOST_NAME: return ESPEasy::net::NetworkGetHostname(); case LabelType::LOCAL_TIME: return node_time.getDateTimeString('-', ':', ' '); @@ -465,15 +465,15 @@ String getValue(LabelType::Enum label) { : getLabel(LabelType::IP_CONFIG_DYNAMIC); case LabelType::IP_CONFIG_STATIC: break; case LabelType::IP_CONFIG_DYNAMIC: break; - case LabelType::IP_ADDRESS: return formatIP(NetworkLocalIP()); - case LabelType::IP_SUBNET: return formatIP(NetworkSubnetMask()); + case LabelType::IP_ADDRESS: return formatIP(ESPEasy::net::NetworkLocalIP()); + case LabelType::IP_SUBNET: return formatIP(ESPEasy::net::NetworkSubnetMask()); case LabelType::IP_ADDRESS_SUBNET: return strformat(F("%s / %s"), getValue(LabelType::IP_ADDRESS).c_str(), getValue(LabelType::IP_SUBNET).c_str()); - case LabelType::GATEWAY: return formatIP(NetworkGatewayIP()); + case LabelType::GATEWAY: return formatIP(ESPEasy::net::NetworkGatewayIP()); #if FEATURE_USE_IPV6 - case LabelType::IP6_LOCAL: return formatIP(NetworkLocalIP6(), true); - case LabelType::IP6_GLOBAL: return formatIP(NetworkGlobalIP6()); + case LabelType::IP6_LOCAL: return formatIP(ESPEasy::net::NetworkLocalIP6(), true); + case LabelType::IP6_GLOBAL: return formatIP(ESPEasy::net::NetworkGlobalIP6()); #if FEATURE_ETHERNET - case LabelType::ETH_IP6_LOCAL: return formatIP(NetworkLocalIP6(), true); + case LabelType::ETH_IP6_LOCAL: return formatIP(ESPEasy::net::NetworkLocalIP6(), true); #endif /* case LabelType::IP6_ALL_ADDRESSES: @@ -500,12 +500,12 @@ String getValue(LabelType::Enum label) { case LabelType::M_DNS: return NetworkGetHostname() + F(".local"); #endif // if FEATURE_MDNS case LabelType::DNS: return strformat(F("%s / %s"), getValue(LabelType::DNS_1).c_str(), getValue(LabelType::DNS_2).c_str()); - case LabelType::DNS_1: return formatIP(NetworkDnsIP(0)); - case LabelType::DNS_2: return formatIP(NetworkDnsIP(1)); + case LabelType::DNS_1: return formatIP(ESPEasy::net::NetworkDnsIP(0)); + case LabelType::DNS_2: return formatIP(ESPEasy::net::NetworkDnsIP(1)); case LabelType::ALLOWED_IP_RANGE: return describeAllowedIPrange(); #if FEATURE_WIFI - case LabelType::STA_MAC: return WifiSTAmacAddress().toString(); - case LabelType::AP_MAC: return WifiSoftAPmacAddress().toString(); + case LabelType::STA_MAC: return ESPEasy::net::WifiSTAmacAddress().toString(); + case LabelType::AP_MAC: return ESPEasy::net::WifiSoftAPmacAddress().toString(); case LabelType::SSID: return WiFi.SSID(); case LabelType::BSSID: return WiFi.BSSIDstr(); case LabelType::CHANNEL: retval = WiFi.channel(); break; @@ -622,20 +622,20 @@ String getValue(LabelType::Enum label) { case LabelType::OTA_2STEP: break; case LabelType::OTA_POSSIBLE: break; #if FEATURE_ETHERNET - case LabelType::ETH_IP_ADDRESS: return formatIP(NetworkLocalIP()); - case LabelType::ETH_IP_SUBNET: return formatIP(NetworkSubnetMask()); + case LabelType::ETH_IP_ADDRESS: return formatIP(ESPEasy::net::NetworkLocalIP()); + case LabelType::ETH_IP_SUBNET: return formatIP(ESPEasy::net::NetworkSubnetMask()); case LabelType::ETH_IP_ADDRESS_SUBNET: return strformat( F("%s / %s"), getValue(LabelType::ETH_IP_ADDRESS).c_str(), getValue(LabelType::ETH_IP_SUBNET).c_str()); - case LabelType::ETH_IP_GATEWAY: return formatIP(NetworkGatewayIP()); - case LabelType::ETH_IP_DNS: return formatIP(NetworkDnsIP(0)); - case LabelType::ETH_MAC: return NetworkMacAddress().toString(); - case LabelType::ETH_DUPLEX: return EthLinkUp() ? (EthFullDuplex() ? F("Full Duplex") : F("Half Duplex")) : F("Link Down"); - case LabelType::ETH_SPEED: return EthLinkUp() ? getEthSpeed() : F("Link Down"); - case LabelType::ETH_STATE: return EthLinkUp() ? F("Link Up") : F("Link Down"); - case LabelType::ETH_SPEED_STATE: return EthLinkUp() ? getEthLinkSpeedState() : F("Link Down"); - case LabelType::ETH_CONNECTED: return ETHConnected() ? F("CONNECTED") : F("DISCONNECTED"); // 0=disconnected, 1=connected + case LabelType::ETH_IP_GATEWAY: return formatIP(ESPEasy::net::NetworkGatewayIP()); + case LabelType::ETH_IP_DNS: return formatIP(ESPEasy::net::NetworkDnsIP(0)); + case LabelType::ETH_MAC: return ESPEasy::net::NetworkMacAddress().toString(); + case LabelType::ETH_DUPLEX: return ESPEasy::net::EthLinkUp() ? (ESPEasy::net::EthFullDuplex() ? F("Full Duplex") : F("Half Duplex")) : F("Link Down"); + case LabelType::ETH_SPEED: return getEthSpeed(); + case LabelType::ETH_STATE: return ESPEasy::net::EthLinkUp() ? F("Link Up") : F("Link Down"); + case LabelType::ETH_SPEED_STATE: return getEthLinkSpeedState(); + case LabelType::ETH_CONNECTED: return ESPEasy::net::eth::ETHConnected() ? F("CONNECTED") : F("DISCONNECTED"); // 0=disconnected, 1=connected case LabelType::ETH_CHIP: return toString(Settings.ETH_Phy_Type); #endif // if FEATURE_ETHERNET # if FEATURE_ETHERNET || defined(USES_ESPEASY_NOW) @@ -662,11 +662,14 @@ String getValue(LabelType::Enum label) { #if FEATURE_ETHERNET String getEthSpeed() { - return strformat(F("%d [Mbps]"), EthLinkSpeed()); + if (ESPEasy::net::EthLinkUp()) { + return strformat(F("%d [Mbps]"), ESPEasy::net::EthLinkSpeed()); + } + return getValue(LabelType::ETH_STATE); } String getEthLinkSpeedState() { - if (EthLinkUp()) { + if (ESPEasy::net::EthLinkUp()) { return strformat(F("%s %s %s"), getValue(LabelType::ETH_STATE).c_str(), getValue(LabelType::ETH_DUPLEX).c_str(), diff --git a/src/src/Helpers/SystemVariables.cpp b/src/src/Helpers/SystemVariables.cpp index cb73baa88..a7b131da0 100644 --- a/src/src/Helpers/SystemVariables.cpp +++ b/src/src/Helpers/SystemVariables.cpp @@ -10,7 +10,7 @@ #include "../DataStructs/TimingStats.h" #include "../ESPEasyCore/ESPEasy_Log.h" -#include "../ESPEasyCore/ESPEasyNetwork.h" +#include "../../ESPEasy/net/ESPEasyNetwork.h" #include "../Globals/CRCValues.h" #include "../Globals/ESPEasy_time.h" @@ -162,7 +162,7 @@ String SystemVariables::getSystemVariable(SystemVariables::Enum enumval) { case BOOT_CAUSE: intvalue = lastBootCause; break; // Integer value to be used in rules case BSSID: return (WiFiEventData.WiFiDisconnected()) ? MAC_address().toString() : WiFi.BSSIDstr(); case CR: return String('\r'); - case IP4: intvalue = static_cast(NetworkLocalIP()[3]); break; // 4th IP octet + case IP4: intvalue = static_cast(ESPEasy::net::NetworkLocalIP()[3]); break; // 4th IP octet case ISVAR_DOUBLE: intvalue = #if FEATURE_USE_DOUBLE_AS_ESPEASY_RULES_FLOAT_TYPE 1; diff --git a/src/src/Helpers/_CPlugin_Helper.cpp b/src/src/Helpers/_CPlugin_Helper.cpp index 86effaf14..25a5f5425 100644 --- a/src/src/Helpers/_CPlugin_Helper.cpp +++ b/src/src/Helpers/_CPlugin_Helper.cpp @@ -13,8 +13,8 @@ #include "../ESPEasyCore/ESPEasy_backgroundtasks.h" #include "../ESPEasyCore/ESPEasy_Log.h" -#include "../ESPEasyCore/ESPEasyEth.h" -#include "../ESPEasyCore/ESPEasyNetwork.h" +#include "../../ESPEasy/net/eth/ESPEasyEth.h" +#include "../../ESPEasy/net/ESPEasyNetwork.h" #include "../../ESPEasy/net/wifi/ESPEasyWifi.h" #include "../Globals/Settings.h" @@ -131,7 +131,7 @@ bool count_connection_results(bool success, const __FlashStringHelper *prefix, c bool try_connect_host(cpluginID_t cpluginID, WiFiUDP& client, ControllerSettingsStruct& ControllerSettings) { const uint64_t statisticsTimerStart(getMicros64()); // START_TIMER; - if (!NetworkConnected()) { + if (!ESPEasy::net::NetworkConnected()) { client.stop(); return false; } @@ -175,7 +175,7 @@ bool try_connect_host(cpluginID_t cpluginID, const __FlashStringHelper *loglabel) { const uint64_t statisticsTimerStart(getMicros64()); // START_TIMER; - if (!NetworkConnected()) { + if (!ESPEasy::net::NetworkConnected()) { client.stop(); return false; } diff --git a/src/src/Helpers/_CPlugin_Helper.h b/src/src/Helpers/_CPlugin_Helper.h index 0b08d4f01..8d81aad71 100644 --- a/src/src/Helpers/_CPlugin_Helper.h +++ b/src/src/Helpers/_CPlugin_Helper.h @@ -8,7 +8,7 @@ #include "../ControllerQueue/DelayQueueElements.h" // Also forward declaring the do_process_cNNN_delay_queue #include "../DataStructs/ControllerSettingsStruct.h" #include "../ESPEasyCore/Controller.h" -#include "../ESPEasyCore/ESPEasyNetwork.h" +#include "../../ESPEasy/net/ESPEasyNetwork.h" #include "../Globals/CPlugins.h" #include "../Globals/ESPEasy_Scheduler.h" #include "../Globals/Services.h" diff --git a/src/src/PluginStructs/P020_data_struct.cpp b/src/src/PluginStructs/P020_data_struct.cpp index 647e3b6b0..e05ae2efd 100644 --- a/src/src/PluginStructs/P020_data_struct.cpp +++ b/src/src/PluginStructs/P020_data_struct.cpp @@ -3,7 +3,7 @@ #ifdef USES_P020 # include "../ESPEasyCore/Serial.h" -# include "../ESPEasyCore/ESPEasyNetwork.h" +# include "../../ESPEasy/net/ESPEasyNetwork.h" # include "../Globals/EventQueue.h" @@ -71,7 +71,7 @@ void P020_Task::startServer(uint16_t portnumber) { gatewayPort = portnumber; ser2netServer = new (std::nothrow) WiFiServer(portnumber); - if ((nullptr != ser2netServer) && NetworkConnected()) { + if ((nullptr != ser2netServer) && ESPEasy::net::NetworkConnected()) { ser2netServer->begin(); if (serverActive(ser2netServer)) { @@ -90,7 +90,7 @@ void P020_Task::startServer(uint16_t portnumber) { } void P020_Task::checkServer() { - if ((nullptr != ser2netServer) && !serverActive(ser2netServer) && NetworkConnected()) { + if ((nullptr != ser2netServer) && !serverActive(ser2netServer) && ESPEasy::net::NetworkConnected()) { ser2netServer->close(); ser2netServer->begin(); @@ -100,7 +100,7 @@ void P020_Task::checkServer() { } # if P020_USE_PROTOCOL - if ((nullptr != ser2netUdp) && !_udpInit && NetworkConnected()) { + if ((nullptr != ser2netUdp) && !_udpInit && ESPEasy::net::NetworkConnected()) { _udpInit = true; // Init only once if (ser2netUdp->begin(_udpport) == 0) { diff --git a/src/src/PluginStructs/P026_data_struct.cpp b/src/src/PluginStructs/P026_data_struct.cpp index 139c686d0..ede9cbec6 100644 --- a/src/src/PluginStructs/P026_data_struct.cpp +++ b/src/src/PluginStructs/P026_data_struct.cpp @@ -3,7 +3,7 @@ #ifdef USES_P026 # include "../DataStructs/ESPEasy_packed_raw_data.h" -# include "../ESPEasyCore/ESPEasyNetwork.h" +# include "../../ESPEasy/net/ESPEasyNetwork.h" # include "../../ESPEasy/net/Globals/ESPEasyWiFiEvent.h" # include "../Helpers/Memory.h" # include "../Helpers/Hardware_temperature_sensor.h" @@ -128,7 +128,7 @@ float P026_get_value(uint8_t type) case P026_VALUETYPE_ip2: case P026_VALUETYPE_ip3: case P026_VALUETYPE_ip4: - res = NetworkLocalIP()[type - P026_VALUETYPE_ip1]; + res = ESPEasy::net::NetworkLocalIP()[type - P026_VALUETYPE_ip1]; break; case P026_VALUETYPE_web: res = timePassedSince(lastWeb) / 1000.0f; diff --git a/src/src/PluginStructs/P036_data_struct.cpp b/src/src/PluginStructs/P036_data_struct.cpp index cdc551b78..ed50b507d 100644 --- a/src/src/PluginStructs/P036_data_struct.cpp +++ b/src/src/PluginStructs/P036_data_struct.cpp @@ -2,7 +2,7 @@ #ifdef USES_P036 -# include "../ESPEasyCore/ESPEasyNetwork.h" +# include "../../ESPEasy/net/ESPEasyNetwork.h" # include "../Globals/RTC.h" # include "../Helpers/ESPEasy_Storage.h" # include "../Helpers/Memory.h" @@ -295,7 +295,7 @@ bool P036_data_struct::init(taskIndex_t taskIndex, prepare_pagescrolling(ScrollSpeed, NrLines); } - bRunning = NetworkConnected(); + bRunning = ESPEasy::net::NetworkConnected(); return isInitialized(); } @@ -785,7 +785,7 @@ String P036_data_struct::create_display_header_text(eHeaderContent iHeaderConten switch (iHeaderContent) { case eHeaderContent::eSSID: - if (NetworkConnected()) { + if (ESPEasy::net::NetworkConnected()) { strHeader = WiFi.SSID(); use_newString_f = false; } @@ -1976,7 +1976,7 @@ bool P036_data_struct::display_wifibars() { return false; } - const bool connected = NetworkConnected(); + const bool connected = ESPEasy::net::NetworkConnected(); const int nbars_filled = (WiFi.RSSI() + 100) / 12; // all bars filled if RSSI better than -46dB const int newState = connected ? nbars_filled : P36_WIFI_STATE_NOT_CONNECTED; @@ -2001,7 +2001,7 @@ bool P036_data_struct::display_wifibars() { display->fillRect(x, y, size_x, size_y); display->setColor(WHITE); - if (NetworkConnected()) { + if (ESPEasy::net::NetworkConnected()) { for (uint8_t ibar = 0; ibar < nbars; ++ibar) { const int16_t height = size_y * (ibar + 1) / nbars; const int16_t xpos = x + ibar * width; @@ -2220,7 +2220,7 @@ void P036_data_struct::P036_DisplayPage(struct EventStruct *event) const bool bScrollWithoutWifi = bitRead(PCONFIG_LONG(0), 24); // Bit 24 const bool bScrollLines = bitRead(PCONFIG_LONG(0), 17); // Bit 17 - bRunning = NetworkConnected() || bScrollWithoutWifi; + bRunning = ESPEasy::net::NetworkConnected() || bScrollWithoutWifi; bLineScrollEnabled = ((bScrollLines # if P036_ENABLE_TICKER || bUseTicker diff --git a/src/src/PluginStructs/P044_data_struct.cpp b/src/src/PluginStructs/P044_data_struct.cpp index f61fe04bb..f98649734 100644 --- a/src/src/PluginStructs/P044_data_struct.cpp +++ b/src/src/PluginStructs/P044_data_struct.cpp @@ -3,7 +3,7 @@ #ifdef USES_P044_ORG # include "../ESPEasyCore/Serial.h" -# include "../ESPEasyCore/ESPEasyNetwork.h" +# include "../../ESPEasy/net/ESPEasyNetwork.h" # include "../Globals/EventQueue.h" @@ -50,7 +50,7 @@ void P044_Task::startServer(uint16_t portnumber) { gatewayPort = portnumber; P1GatewayServer = new (std::nothrow) WiFiServer(portnumber); - if ((nullptr != P1GatewayServer) && NetworkConnected()) { + if ((nullptr != P1GatewayServer) && ESPEasy::net::NetworkConnected()) { P1GatewayServer->begin(); if (serverActive(P1GatewayServer)) { @@ -64,7 +64,7 @@ void P044_Task::startServer(uint16_t portnumber) { } void P044_Task::checkServer() { - if ((nullptr != P1GatewayServer) && !serverActive(P1GatewayServer) && NetworkConnected()) { + if ((nullptr != P1GatewayServer) && !serverActive(P1GatewayServer) && ESPEasy::net::NetworkConnected()) { P1GatewayServer->close(); P1GatewayServer->begin(); diff --git a/src/src/PluginStructs/P089_data_struct.cpp b/src/src/PluginStructs/P089_data_struct.cpp index 6da7f59ed..fd1e99dbc 100644 --- a/src/src/PluginStructs/P089_data_struct.cpp +++ b/src/src/PluginStructs/P089_data_struct.cpp @@ -47,7 +47,7 @@ bool P089_data_struct::send_ping(struct EventStruct *event) { } /* This ping lost for sure */ - if (!NetworkConnected()) { + if (!ESPEasy::net::NetworkConnected()) { return true; } diff --git a/src/src/PluginStructs/P089_data_struct.h b/src/src/PluginStructs/P089_data_struct.h index 8e8cefa23..92c1f8a4b 100644 --- a/src/src/PluginStructs/P089_data_struct.h +++ b/src/src/PluginStructs/P089_data_struct.h @@ -21,7 +21,7 @@ extern "C" # include } -# include "src/ESPEasyCore/ESPEasyNetwork.h" +# include "ESPEasy/net/ESPEasyNetwork.h" struct P089_icmp_pcb { diff --git a/src/src/PluginStructs/P099_data_struct.cpp b/src/src/PluginStructs/P099_data_struct.cpp index c89004787..03fbbaa5a 100644 --- a/src/src/PluginStructs/P099_data_struct.cpp +++ b/src/src/PluginStructs/P099_data_struct.cpp @@ -1,7 +1,7 @@ #include "../PluginStructs/P099_data_struct.h" #ifdef USES_P099 -# include "../ESPEasyCore/ESPEasyNetwork.h" +# include "../../ESPEasy/net/ESPEasyNetwork.h" # include "../Helpers/ESPEasy_Storage.h" # include "../Helpers/Scheduler.h" # include "../Helpers/StringConverter.h" diff --git a/src/src/WebServer/AccessControl.cpp b/src/src/WebServer/AccessControl.cpp index c77ee940f..eae977692 100644 --- a/src/src/WebServer/AccessControl.cpp +++ b/src/src/WebServer/AccessControl.cpp @@ -3,7 +3,7 @@ #include "../DataTypes/FormSelectorOptions.h" #include "../ESPEasyCore/ESPEasy_Log.h" -#include "../ESPEasyCore/ESPEasyNetwork.h" +#include "../../ESPEasy/net/ESPEasyNetwork.h" #include "../../ESPEasy/net/wifi/ESPEasyWifi.h" diff --git a/src/src/WebServer/ConfigPage.cpp b/src/src/WebServer/ConfigPage.cpp index 58962c52c..366623f0e 100644 --- a/src/src/WebServer/ConfigPage.cpp +++ b/src/src/WebServer/ConfigPage.cpp @@ -15,7 +15,7 @@ #endif #include "../ESPEasyCore/Controller.h" -#include "../ESPEasyCore/ESPEasyNetwork.h" +#include "../../ESPEasy/net/ESPEasyNetwork.h" #include "../Globals/MQTT.h" #include "../Globals/Nodes.h" @@ -169,7 +169,7 @@ void handle_config() { Settings.Name[25] = 0; SecuritySettings.Password[25] = 0; addFormTextBox(F("Unit Name"), F("name"), Settings.Name, 25); - addFormNote(concat(F("Hostname: "), NetworkCreateRFCCompliantHostname())); + addFormNote(concat(F("Hostname: "), ESPEasy::net::NetworkCreateRFCCompliantHostname())); addFormNumericBox(F("Unit Number"), F("unit"), Settings.Unit, 0, UNIT_NUMBER_MAX); addFormCheckBox(F("Append Unit Number to hostname"), F("appendunittohostname"), Settings.appendUnitToHostname()); addFormPasswordBox(F("Admin Password"), F("password"), SecuritySettings.Password, 25); diff --git a/src/src/WebServer/ESPEasy_WebServer.cpp b/src/src/WebServer/ESPEasy_WebServer.cpp index 1b5614ad8..bd88f77fa 100644 --- a/src/src/WebServer/ESPEasy_WebServer.cpp +++ b/src/src/WebServer/ESPEasy_WebServer.cpp @@ -51,7 +51,7 @@ #include "../DataTypes/SettingsType.h" -#include "../ESPEasyCore/ESPEasyNetwork.h" +#include "../../ESPEasy/net/ESPEasyNetwork.h" #include "../ESPEasyCore/ESPEasyRules.h" #include "../../ESPEasy/net/wifi/ESPEasyWifi.h" @@ -180,7 +180,7 @@ bool captivePortal() { return false; } - if (!isIP(web_server.hostHeader()) && (web_server.hostHeader() != (NetworkGetHostname() + F(".local")))) { + if (!isIP(web_server.hostHeader()) && (web_server.hostHeader() != (ESPEasy::net::NetworkGetHostname() + F(".local")))) { String redirectURL = concat(F("http://"), formatIP(client_localIP)); #ifdef WEBSERVER_SETUP @@ -404,7 +404,7 @@ void setWebserverRunning(bool state) { #endif } webserverRunning = state; - CheckRunningServices(); // Uses webserverRunning state. + ESPEasy::net::CheckRunningServices(); // Uses webserverRunning state. } void getWebPageTemplateDefault(const String& tmplName, WebTemplateParser& parser) diff --git a/src/src/WebServer/Markup_Forms.h b/src/src/WebServer/Markup_Forms.h index 143945795..7b569711c 100644 --- a/src/src/WebServer/Markup_Forms.h +++ b/src/src/WebServer/Markup_Forms.h @@ -4,7 +4,7 @@ #include "../WebServer/common.h" #include "../DataTypes/FormSelectorOptions.h" -#include "../DataStructs/MAC_address.h" +#include "../../ESPEasy/net/DataStructs/MAC_address.h" #include "../Globals/Plugins.h" #include "../Helpers/StringGenerator_GPIO.h" diff --git a/src/src/WebServer/Metrics.cpp b/src/src/WebServer/Metrics.cpp index 969987979..87f5672cf 100644 --- a/src/src/WebServer/Metrics.cpp +++ b/src/src/WebServer/Metrics.cpp @@ -2,7 +2,7 @@ #include "../WebServer/ESPEasy_WebServer.h" #include "../../ESPEasy-Globals.h" #include "../Commands/Diagnostic.h" -#include "../ESPEasyCore/ESPEasyNetwork.h" +#include "../../ESPEasy/net/ESPEasyNetwork.h" #include "../../ESPEasy/net/wifi/ESPEasyWifi.h" #include "../../_Plugin_Helper.h" #include "../Helpers/ESPEasyStatistics.h" diff --git a/src/src/WebServer/RootPage.cpp b/src/src/WebServer/RootPage.cpp index 478380aa7..6eb5ed4f2 100644 --- a/src/src/WebServer/RootPage.cpp +++ b/src/src/WebServer/RootPage.cpp @@ -11,7 +11,7 @@ # include "../WebServer/Markup_Forms.h" # include "../Commands/ExecuteCommand.h" -# include "../ESPEasyCore/ESPEasyNetwork.h" +# include "../../ESPEasy/net/ESPEasyNetwork.h" # include "../Globals/ESPEasy_time.h" # include "../../ESPEasy/net/Globals/ESPEasyWiFiEvent.h" # include "../Globals/MainLoopCommand.h" diff --git a/src/src/WebServer/SetupPage.cpp b/src/src/WebServer/SetupPage.cpp index 73282a902..192c9ff8f 100644 --- a/src/src/WebServer/SetupPage.cpp +++ b/src/src/WebServer/SetupPage.cpp @@ -11,7 +11,7 @@ # include "../WebServer/Markup_Forms.h" # include "../WebServer/SysInfoPage.h" -# include "../ESPEasyCore/ESPEasyNetwork.h" +# include "../../ESPEasy/net/ESPEasyNetwork.h" # include "../../ESPEasy/net/wifi/ESPEasyWifi.h" @@ -50,7 +50,7 @@ void handle_setup() { // Do not check client IP range allowed. TXBuffer.startStream(); - const bool connected = NetworkConnected(); + const bool connected = ESPEasy::net::NetworkConnected(); // if (connected) { @@ -182,7 +182,7 @@ void handle_setup() { #if SETUP_PAGE_SHOW_CONFIG_BUTTON if (!clientIPinSubnet()) { - String host = formatIP(NetworkLocalIP()); + String host = formatIP(ESPEasy::net::NetworkLocalIP()); String url = F("http://"); url += host; url += F("/config"); diff --git a/src/src/WebServer/SysInfoPage.cpp b/src/src/WebServer/SysInfoPage.cpp index 948246ded..1d35d6f04 100644 --- a/src/src/WebServer/SysInfoPage.cpp +++ b/src/src/WebServer/SysInfoPage.cpp @@ -17,8 +17,8 @@ # include "../DataStructs/RTCStruct.h" -# include "../ESPEasyCore/ESPEasyEth.h" -# include "../ESPEasyCore/ESPEasyNetwork.h" +# include "../../ESPEasy/net/eth/ESPEasyEth.h" +# include "../../ESPEasy/net/ESPEasyNetwork.h" # include "../../ESPEasy/net/wifi/ESPEasyWifi.h" @@ -653,7 +653,7 @@ void handle_sysinfo_NetworkServices() { addTableSeparator(F("Network Services"), 2, 3); addRowLabel(F("Network Connected")); - addEnabled(NetworkConnected()); + addEnabled(ESPEasy::net::NetworkConnected()); addRowLabel(F("NTP Initialized")); addEnabled(statusNTPInitialized); From 9cb136a8e7d5d019e3cc0d6478e61ee3b7fe594a Mon Sep 17 00:00:00 2001 From: TD-er Date: Sun, 27 Jul 2025 16:56:19 +0200 Subject: [PATCH 149/564] [Network] Disable ETH for ESP32-xx Display builds to make builds fit --- platformio_esp32c3_envs.ini | 2 +- platformio_esp32c6_envs.ini | 2 +- platformio_esp32s2_envs.ini | 2 +- platformio_esp32s3_envs.ini | 2 +- src/ESPEasy/net/ESPEasyNetwork_ESP32.cpp | 2 +- src/ESPEasy/net/ESPEasyNetwork_ESP8266.cpp | 2 +- src/ESPEasy/net/eth/ESPEasyEth_ProcessEvent.cpp | 2 +- src/ESPEasy/net/wifi/ESPEasyWifi_ProcessEvent.cpp | 2 +- src/_C006.cpp | 2 +- src/_C013.cpp | 2 +- src/src/Commands/UDP.cpp | 2 +- src/src/CustomBuild/define_plugin_sets.h | 7 +++++++ src/src/ESPEasyCore/Controller.cpp | 2 +- src/src/ESPEasyCore/ESPEasy_backgroundtasks.cpp | 2 +- src/src/Helpers/{Network.cpp => NetworkStatusLED.cpp} | 6 +++++- src/src/Helpers/{Network.h => NetworkStatusLED.h} | 4 ---- src/src/Helpers/Networking.cpp | 2 +- src/src/Helpers/_CPlugin_Helper.cpp | 2 +- src/src/Helpers/_CPlugin_Helper.h | 2 +- src/src/WebServer/LoadFromFS.cpp | 2 +- 20 files changed, 29 insertions(+), 22 deletions(-) rename src/src/Helpers/{Network.cpp => NetworkStatusLED.cpp} (92%) rename src/src/Helpers/{Network.h => NetworkStatusLED.h} (62%) diff --git a/platformio_esp32c3_envs.ini b/platformio_esp32c3_envs.ini index 874ecd23d..acb48e0a2 100644 --- a/platformio_esp32c3_envs.ini +++ b/platformio_esp32c3_envs.ini @@ -77,7 +77,7 @@ build_flags = ${esp32c3_common_LittleFS.build_flags} -D PLUGIN_ENERGY_COLLECTION -[env:display_ESP32c3_4M316k_LittleFS_ETH] +[env:display_ESP32c3_4M316k_LittleFS] extends = esp32c3_common_LittleFS build_flags = ${esp32c3_common_LittleFS.build_flags} -D PLUGIN_DISPLAY_COLLECTION diff --git a/platformio_esp32c6_envs.ini b/platformio_esp32c6_envs.ini index 2ee850a0e..bcb552089 100644 --- a/platformio_esp32c6_envs.ini +++ b/platformio_esp32c6_envs.ini @@ -35,7 +35,7 @@ build_flags = ${esp32c6_common_LittleFS.build_flags} -D PLUGIN_ENERGY_COLLECTION -[env:display_ESP32c6_4M316k_LittleFS_ETH] +[env:display_ESP32c6_4M316k_LittleFS] extends = esp32c6_common_LittleFS build_flags = ${esp32c6_common_LittleFS.build_flags} -D PLUGIN_DISPLAY_COLLECTION diff --git a/platformio_esp32s2_envs.ini b/platformio_esp32s2_envs.ini index 98c9a46a8..72bf0ccb3 100644 --- a/platformio_esp32s2_envs.ini +++ b/platformio_esp32s2_envs.ini @@ -112,7 +112,7 @@ board = esp32s2cdc build_flags = ${esp32s2_common_LittleFS.build_flags} -D PLUGIN_ENERGY_COLLECTION -[env:display_ESP32s2_4M316k_LittleFS_ETH] +[env:display_ESP32s2_4M316k_LittleFS] extends = esp32s2_common_LittleFS board = esp32s2cdc build_flags = ${esp32s2_common_LittleFS.build_flags} diff --git a/platformio_esp32s3_envs.ini b/platformio_esp32s3_envs.ini index 23c5f0cde..79b97c9db 100644 --- a/platformio_esp32s3_envs.ini +++ b/platformio_esp32s3_envs.ini @@ -103,7 +103,7 @@ board = esp32s3cdc-qio_qspi build_flags = ${esp32s3_common_LittleFS.build_flags} -D PLUGIN_ENERGY_COLLECTION -[env:display_ESP32s3_4M316k_LittleFS_ETH] +[env:display_ESP32s3_4M316k_LittleFS] extends = esp32s3_common_LittleFS board = esp32s3cdc-qio_qspi build_flags = ${esp32s3_common_LittleFS.build_flags} diff --git a/src/ESPEasy/net/ESPEasyNetwork_ESP32.cpp b/src/ESPEasy/net/ESPEasyNetwork_ESP32.cpp index 671c5696f..2d9e53abe 100644 --- a/src/ESPEasy/net/ESPEasyNetwork_ESP32.cpp +++ b/src/ESPEasy/net/ESPEasyNetwork_ESP32.cpp @@ -13,7 +13,7 @@ #include "../../ESPEasy/net/Globals/ESPEasyEthEvent.h" -#include "../../src/Helpers/Network.h" +#include "../../src/Helpers/NetworkStatusLED.h" #include "../../src/Helpers/Networking.h" #include "../../src/Helpers/StringConverter.h" #include "../../src/Helpers/MDNS_Helper.h" diff --git a/src/ESPEasy/net/ESPEasyNetwork_ESP8266.cpp b/src/ESPEasy/net/ESPEasyNetwork_ESP8266.cpp index ddf27046a..1c6d93645 100644 --- a/src/ESPEasy/net/ESPEasyNetwork_ESP8266.cpp +++ b/src/ESPEasy/net/ESPEasyNetwork_ESP8266.cpp @@ -7,7 +7,7 @@ #include "../../src/Globals/ESPEasy_time.h" #include "../../src/Globals/Settings.h" -#include "../../src/Helpers/Network.h" +#include "../../src/Helpers/NetworkStatusLED.h" #include "../../src/Helpers/Networking.h" #include "../../src/Helpers/StringConverter.h" #include "../../src/Helpers/MDNS_Helper.h" diff --git a/src/ESPEasy/net/eth/ESPEasyEth_ProcessEvent.cpp b/src/ESPEasy/net/eth/ESPEasyEth_ProcessEvent.cpp index 4d3c0e14a..b0a0eaac7 100644 --- a/src/ESPEasy/net/eth/ESPEasyEth_ProcessEvent.cpp +++ b/src/ESPEasy/net/eth/ESPEasyEth_ProcessEvent.cpp @@ -18,7 +18,7 @@ # include "../../../src/Globals/Settings.h" # include "../../../src/Helpers/LongTermTimer.h" -# include "../../../src/Helpers/Network.h" +# include "../../../src/Helpers/NetworkStatusLED.h" # include "../../../src/Helpers/Networking.h" # include "../../../src/Helpers/PeriodicalActions.h" # include "../../../src/Helpers/StringConverter.h" diff --git a/src/ESPEasy/net/wifi/ESPEasyWifi_ProcessEvent.cpp b/src/ESPEasy/net/wifi/ESPEasyWifi_ProcessEvent.cpp index 6fc6b649f..4d6b14f21 100644 --- a/src/ESPEasy/net/wifi/ESPEasyWifi_ProcessEvent.cpp +++ b/src/ESPEasy/net/wifi/ESPEasyWifi_ProcessEvent.cpp @@ -21,7 +21,7 @@ # include "../../../src/Helpers/Convert.h" # include "../../../src/Helpers/ESPEasyRTC.h" # include "../../../src/Helpers/ESPEasy_Storage.h" -# include "../../../src/Helpers/Network.h" +# include "../../../src/Helpers/NetworkStatusLED.h" # include "../../../src/Helpers/Networking.h" # include "../../../src/Helpers/PeriodicalActions.h" # include "../../../src/Helpers/StringConverter.h" diff --git a/src/_C006.cpp b/src/_C006.cpp index ed248312c..2fa8617be 100644 --- a/src/_C006.cpp +++ b/src/_C006.cpp @@ -16,7 +16,7 @@ # include "src/ESPEasyCore/Controller.h" # include "src/Globals/Settings.h" # include "src/Helpers/_CPlugin_Helper_mqtt.h" -# include "src/Helpers/Network.h" +# include "src/Helpers/NetworkStatusLED.h" # include "src/Helpers/PeriodicalActions.h" # include "_Plugin_Helper.h" diff --git a/src/_C013.cpp b/src/_C013.cpp index 3e33bb2f8..c707e89a7 100644 --- a/src/_C013.cpp +++ b/src/_C013.cpp @@ -11,7 +11,7 @@ # include "src/DataStructs/C013_p2p_SensorInfoStruct.h" # include "src/ESPEasyCore/ESPEasyRules.h" # include "src/Helpers/Misc.h" -# include "src/Helpers/Network.h" +# include "src/Helpers/NetworkStatusLED.h" // ####################################################################################################### // ########################### Controller Plugin 013: ESPEasy P2P network ################################ diff --git a/src/src/Commands/UDP.cpp b/src/src/Commands/UDP.cpp index 432585d95..11159eae9 100644 --- a/src/src/Commands/UDP.cpp +++ b/src/src/Commands/UDP.cpp @@ -8,7 +8,7 @@ #include "../../ESPEasy/net/Globals/NetworkState.h" #include "../Globals/Settings.h" #include "../Helpers/Misc.h" -#include "../Helpers/Network.h" +#include "../Helpers/NetworkStatusLED.h" #include "../Helpers/Networking.h" #include "../Helpers/StringConverter.h" #include "../Helpers/StringParser.h" diff --git a/src/src/CustomBuild/define_plugin_sets.h b/src/src/CustomBuild/define_plugin_sets.h index 41ed5fc69..fb9deee88 100644 --- a/src/src/CustomBuild/define_plugin_sets.h +++ b/src/src/CustomBuild/define_plugin_sets.h @@ -159,6 +159,13 @@ To create/register a plugin, you have to : #endif #endif + +#if FEATURE_ETHERNET && defined(PLUGIN_DISPLAY_COLLECTION) + // Display builds are getting too large, so for now disable ETH for display buikds + #undef FEATURE_ETHERNET +#endif + + #ifdef MEMORY_ANALYSIS #ifdef MQTT_ONLY #define USES_C002 // Domoticz MQTT diff --git a/src/src/ESPEasyCore/Controller.cpp b/src/src/ESPEasyCore/Controller.cpp index 2cfdf0246..d50e310c5 100644 --- a/src/src/ESPEasyCore/Controller.cpp +++ b/src/src/ESPEasyCore/Controller.cpp @@ -30,7 +30,7 @@ // #include "../Helpers/Memory.h" #include "../Helpers/Misc.h" -#include "../Helpers/Network.h" +#include "../Helpers/NetworkStatusLED.h" #include "../Helpers/PeriodicalActions.h" #include "../Helpers/PortStatus.h" diff --git a/src/src/ESPEasyCore/ESPEasy_backgroundtasks.cpp b/src/src/ESPEasyCore/ESPEasy_backgroundtasks.cpp index b6ff07688..365acd411 100644 --- a/src/src/ESPEasyCore/ESPEasy_backgroundtasks.cpp +++ b/src/src/ESPEasyCore/ESPEasy_backgroundtasks.cpp @@ -13,7 +13,7 @@ #include "../Helpers/Audio.h" #endif // if FEATURE_RTTTL && FEATURE_ANYRTTTL_LIB && FEATURE_ANYRTTTL_ASYNC #include "../Helpers/ESPEasy_time_calc.h" -#include "../Helpers/Network.h" +#include "../Helpers/NetworkStatusLED.h" #include "../Helpers/Networking.h" diff --git a/src/src/Helpers/Network.cpp b/src/src/Helpers/NetworkStatusLED.cpp similarity index 92% rename from src/src/Helpers/Network.cpp rename to src/src/Helpers/NetworkStatusLED.cpp index 365be211b..1db172a3c 100644 --- a/src/src/Helpers/Network.cpp +++ b/src/src/Helpers/NetworkStatusLED.cpp @@ -1,4 +1,4 @@ -#include "../Helpers/Network.h" +#include "../Helpers/NetworkStatusLED.h" #include "../../ESPEasy_common.h" @@ -19,6 +19,10 @@ # include #endif // ifdef ESP32 +#define PWMRANGE_FULL 1023 +#define STATUS_PWM_NORMALVALUE (PWMRANGE_FULL >> 2) +#define STATUS_PWM_NORMALFADE (PWMRANGE_FULL >> 8) +#define STATUS_PWM_TRAFFICRISE (PWMRANGE_FULL >> 1) /********************************************************************************************\ Status LED diff --git a/src/src/Helpers/Network.h b/src/src/Helpers/NetworkStatusLED.h similarity index 62% rename from src/src/Helpers/Network.h rename to src/src/Helpers/NetworkStatusLED.h index c2b859848..ad4edb5ce 100644 --- a/src/src/Helpers/Network.h +++ b/src/src/Helpers/NetworkStatusLED.h @@ -4,10 +4,6 @@ /********************************************************************************************\ Status LED \*********************************************************************************************/ -#define PWMRANGE_FULL 1023 -#define STATUS_PWM_NORMALVALUE (PWMRANGE_FULL >> 2) -#define STATUS_PWM_NORMALFADE (PWMRANGE_FULL >> 8) -#define STATUS_PWM_TRAFFICRISE (PWMRANGE_FULL >> 1) void statusLED(bool traffic); diff --git a/src/src/Helpers/Networking.cpp b/src/src/Helpers/Networking.cpp index 64bfbcafd..2960533b6 100644 --- a/src/src/Helpers/Networking.cpp +++ b/src/src/Helpers/Networking.cpp @@ -28,7 +28,7 @@ #include "../Helpers/ESPEasy_time_calc.h" #include "../Helpers/Hardware.h" #include "../Helpers/Misc.h" -#include "../Helpers/Network.h" +#include "../Helpers/NetworkStatusLED.h" #include "../Helpers/Numerical.h" #include "../Helpers/StringConverter.h" #include "../Helpers/StringProvider.h" diff --git a/src/src/Helpers/_CPlugin_Helper.cpp b/src/src/Helpers/_CPlugin_Helper.cpp index 25a5f5425..34c42d0d9 100644 --- a/src/src/Helpers/_CPlugin_Helper.cpp +++ b/src/src/Helpers/_CPlugin_Helper.cpp @@ -23,7 +23,7 @@ #include "../Helpers/ESPEasy_time_calc.h" #include "../Helpers/Misc.h" -#include "../Helpers/Network.h" +#include "../Helpers/NetworkStatusLED.h" #include "../Helpers/Networking.h" #include "../Helpers/StringConverter.h" diff --git a/src/src/Helpers/_CPlugin_Helper.h b/src/src/Helpers/_CPlugin_Helper.h index 8d81aad71..28d9f018d 100644 --- a/src/src/Helpers/_CPlugin_Helper.h +++ b/src/src/Helpers/_CPlugin_Helper.h @@ -14,7 +14,7 @@ #include "../Globals/Services.h" #include "../Helpers/_CPlugin_init.h" #include "../Helpers/Misc.h" -#include "../Helpers/Network.h" +#include "../Helpers/NetworkStatusLED.h" #include "../Helpers/Networking.h" #include "../Helpers/Numerical.h" #include "../Helpers/StringConverter.h" diff --git a/src/src/WebServer/LoadFromFS.cpp b/src/src/WebServer/LoadFromFS.cpp index 0d815e99c..158ead854 100644 --- a/src/src/WebServer/LoadFromFS.cpp +++ b/src/src/WebServer/LoadFromFS.cpp @@ -6,7 +6,7 @@ #include "../Globals/RamTracker.h" #include "../Helpers/ESPEasy_Storage.h" -#include "../Helpers/Network.h" +#include "../Helpers/NetworkStatusLED.h" #include "../Helpers/Numerical.h" #include "../WebServer/CustomPage.h" From 2ebde4f0f6df6036d0ce4792f8187d34b93b388b Mon Sep 17 00:00:00 2001 From: TD-er Date: Sun, 27 Jul 2025 17:22:46 +0200 Subject: [PATCH 150/564] [Network] Fix ESP32-classic display build with ETH disabled --- platformio_esp32_envs.ini | 16 ++++++++++------ src/ESPEasy/net/ESPEasyNetwork.h | 4 ++-- src/ESPEasy/net/_NW003_ETH_RMII.cpp | 18 +++++++++--------- src/ESPEasy/net/_NW004_ETH_SPI.cpp | 18 +++++++++--------- src/ESPEasy/net/eth/ESPEasyEth.cpp | 14 +++++++------- src/src/Commands/InternalCommands.cpp | 2 +- src/src/Commands/InternalCommands_decoder.cpp | 2 +- src/src/Commands/InternalCommands_decoder.h | 2 +- src/src/Commands/Networks.cpp | 2 +- src/src/Commands/Networks.h | 2 +- src/src/CustomBuild/ESPEasyDefaults.h | 2 +- .../DataStructs/FactoryDefault_Network_NVS.cpp | 2 +- .../DataStructs/GpioFactorySettingsStruct.cpp | 4 ++-- src/src/DataStructs/SettingsStruct.h | 2 +- src/src/DataStructs_templ/SettingsStruct.cpp | 6 +++--- src/src/DataTypes/DeviceModel.h | 2 +- src/src/DataTypes/EthernetParameters.cpp | 12 ++++++------ src/src/DataTypes/EthernetParameters.h | 6 +++--- src/src/Helpers/Hardware.cpp | 10 +++++----- src/src/Helpers/StringGenerator_GPIO.cpp | 2 +- src/src/WebServer/HardwarePage.cpp | 16 ++++++++-------- 21 files changed, 74 insertions(+), 70 deletions(-) diff --git a/platformio_esp32_envs.ini b/platformio_esp32_envs.ini index d1d7b3979..f6b41b295 100644 --- a/platformio_esp32_envs.ini +++ b/platformio_esp32_envs.ini @@ -87,12 +87,10 @@ lib_ignore = ESP8266Ping ${esp32_base_idf5.lib_ignore} - -[esp32_common_LittleFS_ETH] +[esp32_common_LittleFS] extends = esp32_base_idf5 build_flags = ${esp32_base_idf5.build_flags} ; -mtext-section-literals - -DFEATURE_ETHERNET=1 -DESP32_CLASSIC -DUSE_LITTLEFS build_unflags = ${esp32_base_idf5.build_unflags} @@ -104,6 +102,12 @@ lib_ignore = ${esp32_always.lib_ignore} ${esp32_base_idf5.lib_ignore} +[esp32_common_LittleFS_ETH] +extends = esp32_common_LittleFS +build_flags = ${esp32_common_LittleFS.build_flags} + -DFEATURE_ETHERNET=1 + + [esp32_IRExt_LittleFS_ETH] extends = esp32_common_LittleFS_ETH lib_ignore = ${esp32_always.lib_ignore} @@ -275,10 +279,10 @@ build_flags = ${esp32_common_LittleFS_ETH.build_flags} -DPLUGIN_ENERGY_COLLECTION -[env:display_ESP32_4M316k_LittleFS_ETH] -extends = esp32_common_LittleFS_ETH +[env:display_ESP32_4M316k_LittleFS] +extends = esp32_common_LittleFS board = esp32_4M -build_flags = ${esp32_common_LittleFS_ETH.build_flags} +build_flags = ${esp32_common_LittleFS.build_flags} -DFEATURE_ARDUINO_OTA=1 -DPLUGIN_DISPLAY_COLLECTION -D ST7789_EXTRA_INIT=1 diff --git a/src/ESPEasy/net/ESPEasyNetwork.h b/src/ESPEasy/net/ESPEasyNetwork.h index 64cf1be33..cc8720664 100644 --- a/src/ESPEasy/net/ESPEasyNetwork.h +++ b/src/ESPEasy/net/ESPEasyNetwork.h @@ -59,5 +59,5 @@ uint8_t EthLinkSpeed(); #endif // if FEATURE_ETHERNET -} -} +} // namespace net +} // namespace ESPEasy diff --git a/src/ESPEasy/net/_NW003_ETH_RMII.cpp b/src/ESPEasy/net/_NW003_ETH_RMII.cpp index ee477493a..e4af6558e 100644 --- a/src/ESPEasy/net/_NW003_ETH_RMII.cpp +++ b/src/ESPEasy/net/_NW003_ETH_RMII.cpp @@ -108,7 +108,7 @@ bool NWPlugin_003(NWPlugin::Function function, EventStruct *event, String& strin Settings.ETH_Pin_mdio_irq = getFormItemInt(F("ethmdio")); Settings.ETH_Pin_power_rst = getFormItemInt(F("ethpower")); Settings.ETH_Phy_Type = static_cast(getFormItemInt(F("ethtype"))); -# if CONFIG_ETH_USE_ESP32_EMAC +# if CONFIG_ETH_USE_ESP32_EMAC && FEATURE_ETHERNET Settings.ETH_Clock_Mode = static_cast(getFormItemInt(F("ethclock"))); # endif Settings.NetworkMedium = static_cast(getFormItemInt(F("ethwifi"))); @@ -144,7 +144,7 @@ bool NWPlugin_003(NWPlugin::Function function, EventStruct *event, String& strin const __FlashStringHelper *ethPhyTypes[] = { toString(EthPhyType_t::notSet), -# if CONFIG_ETH_USE_ESP32_EMAC +# if CONFIG_ETH_USE_ESP32_EMAC && FEATURE_ETHERNET toString(EthPhyType_t::LAN8720), toString(EthPhyType_t::TLK110), toString(EthPhyType_t::RTL8201), @@ -154,7 +154,7 @@ bool NWPlugin_003(NWPlugin::Function function, EventStruct *event, String& strin toString(EthPhyType_t::DP83848), toString(EthPhyType_t::KSZ8041), toString(EthPhyType_t::KSZ8081), -# endif // if CONFIG_ETH_USE_ESP32_EMAC +# endif // if CONFIG_ETH_USE_ESP32_EMAC && FEATURE_ETHERNET # if ESP_IDF_VERSION_MAJOR >= 5 # if CONFIG_ETH_SPI_ETHERNET_DM9051 @@ -171,7 +171,7 @@ bool NWPlugin_003(NWPlugin::Function function, EventStruct *event, String& strin const int ethPhyTypes_index[] = { static_cast(EthPhyType_t::notSet), -# if CONFIG_ETH_USE_ESP32_EMAC +# if CONFIG_ETH_USE_ESP32_EMAC && FEATURE_ETHERNET static_cast(EthPhyType_t::LAN8720), static_cast(EthPhyType_t::TLK110), static_cast(EthPhyType_t::RTL8201), @@ -181,7 +181,7 @@ bool NWPlugin_003(NWPlugin::Function function, EventStruct *event, String& strin static_cast(EthPhyType_t::DP83848), static_cast(EthPhyType_t::KSZ8041), static_cast(EthPhyType_t::KSZ8081), -# endif // if CONFIG_ETH_USE_ESP32_EMAC +# endif // if CONFIG_ETH_USE_ESP32_EMAC && FEATURE_ETHERNET # if ESP_IDF_VERSION_MAJOR >= 5 # if CONFIG_ETH_SPI_ETHERNET_DM9051 @@ -222,7 +222,7 @@ bool NWPlugin_003(NWPlugin::Function function, EventStruct *event, String& strin # define MDC_CS_PIN_DESCR "Ethernet CS pin" # define MIO_IRQ_PIN_DESCR "Ethernet IRQ pin" # define PWR_RST_PIN_DESCR "Ethernet RST pin" -# else // #elif CONFIG_ETH_USE_ESP32_EMAC +# else // #elif CONFIG_ETH_USE_ESP32_EMAC && FEATURE_ETHERNET # define MDC_CS_PIN_DESCR "Ethernet MDC pin" # define MIO_IRQ_PIN_DESCR "Ethernet MIO pin" # define PWR_RST_PIN_DESCR "Ethernet Power pin" @@ -230,7 +230,7 @@ bool NWPlugin_003(NWPlugin::Function function, EventStruct *event, String& strin addFormNumericBox(F("Ethernet PHY Address"), F("ethphy"), Settings.ETH_Phy_Addr, -1, 127); addFormNote(F("I²C-address of Ethernet PHY" -# if CONFIG_ETH_USE_ESP32_EMAC +# if CONFIG_ETH_USE_ESP32_EMAC && FEATURE_ETHERNET " (0 or 1 for LAN8720, 31 for TLK110, -1 autodetect)" # endif )); @@ -243,7 +243,7 @@ bool NWPlugin_003(NWPlugin::Function function, EventStruct *event, String& strin addFormPinSelect(PinSelectPurpose::Ethernet, formatGpioName_output( F(PWR_RST_PIN_DESCR)), F("ethpower"), Settings.ETH_Pin_power_rst); -# if CONFIG_ETH_USE_ESP32_EMAC +# if CONFIG_ETH_USE_ESP32_EMAC && FEATURE_ETHERNET addRowLabel_tr_id(F("Ethernet Clock"), F("ethclock")); { # if CONFIG_IDF_TARGET_ESP32 @@ -278,7 +278,7 @@ bool NWPlugin_003(NWPlugin::Function function, EventStruct *event, String& strin indices); selector.addSelector(F("ethclock"), static_cast(Settings.ETH_Clock_Mode)); } -# endif // if CONFIG_ETH_USE_ESP32_EMAC +# endif // if CONFIG_ETH_USE_ESP32_EMAC && FEATURE_ETHERNET break; } diff --git a/src/ESPEasy/net/_NW004_ETH_SPI.cpp b/src/ESPEasy/net/_NW004_ETH_SPI.cpp index e41c8e64e..0e9009cf1 100644 --- a/src/ESPEasy/net/_NW004_ETH_SPI.cpp +++ b/src/ESPEasy/net/_NW004_ETH_SPI.cpp @@ -111,7 +111,7 @@ bool NWPlugin_004(NWPlugin::Function function, EventStruct *event, String& strin Settings.ETH_Pin_mdio_irq = getFormItemInt(F("ethmdio")); Settings.ETH_Pin_power_rst = getFormItemInt(F("ethpower")); Settings.ETH_Phy_Type = static_cast(getFormItemInt(F("ethtype"))); -# if CONFIG_ETH_USE_ESP32_EMAC +# if CONFIG_ETH_USE_ESP32_EMAC && FEATURE_ETHERNET Settings.ETH_Clock_Mode = static_cast(getFormItemInt(F("ethclock"))); # endif Settings.NetworkMedium = static_cast(getFormItemInt(F("ethwifi"))); @@ -147,7 +147,7 @@ bool NWPlugin_004(NWPlugin::Function function, EventStruct *event, String& strin const __FlashStringHelper *ethPhyTypes[] = { toString(EthPhyType_t::notSet), -# if CONFIG_ETH_USE_ESP32_EMAC +# if CONFIG_ETH_USE_ESP32_EMAC && FEATURE_ETHERNET toString(EthPhyType_t::LAN8720), toString(EthPhyType_t::TLK110), toString(EthPhyType_t::RTL8201), @@ -157,7 +157,7 @@ bool NWPlugin_004(NWPlugin::Function function, EventStruct *event, String& strin toString(EthPhyType_t::DP83848), toString(EthPhyType_t::KSZ8041), toString(EthPhyType_t::KSZ8081), -# endif // if CONFIG_ETH_USE_ESP32_EMAC +# endif // if CONFIG_ETH_USE_ESP32_EMAC && FEATURE_ETHERNET # if ESP_IDF_VERSION_MAJOR >= 5 # if CONFIG_ETH_SPI_ETHERNET_DM9051 @@ -174,7 +174,7 @@ bool NWPlugin_004(NWPlugin::Function function, EventStruct *event, String& strin const int ethPhyTypes_index[] = { static_cast(EthPhyType_t::notSet), -# if CONFIG_ETH_USE_ESP32_EMAC +# if CONFIG_ETH_USE_ESP32_EMAC && FEATURE_ETHERNET static_cast(EthPhyType_t::LAN8720), static_cast(EthPhyType_t::TLK110), static_cast(EthPhyType_t::RTL8201), @@ -184,7 +184,7 @@ bool NWPlugin_004(NWPlugin::Function function, EventStruct *event, String& strin static_cast(EthPhyType_t::DP83848), static_cast(EthPhyType_t::KSZ8041), static_cast(EthPhyType_t::KSZ8081), -# endif // if CONFIG_ETH_USE_ESP32_EMAC +# endif // if CONFIG_ETH_USE_ESP32_EMAC && FEATURE_ETHERNET # if ESP_IDF_VERSION_MAJOR >= 5 # if CONFIG_ETH_SPI_ETHERNET_DM9051 @@ -225,7 +225,7 @@ bool NWPlugin_004(NWPlugin::Function function, EventStruct *event, String& strin # define MDC_CS_PIN_DESCR "Ethernet CS pin" # define MIO_IRQ_PIN_DESCR "Ethernet IRQ pin" # define PWR_RST_PIN_DESCR "Ethernet RST pin" -# else // #elif CONFIG_ETH_USE_ESP32_EMAC +# else // #elif CONFIG_ETH_USE_ESP32_EMAC && FEATURE_ETHERNET # define MDC_CS_PIN_DESCR "Ethernet MDC pin" # define MIO_IRQ_PIN_DESCR "Ethernet MIO pin" # define PWR_RST_PIN_DESCR "Ethernet Power pin" @@ -233,7 +233,7 @@ bool NWPlugin_004(NWPlugin::Function function, EventStruct *event, String& strin addFormNumericBox(F("Ethernet PHY Address"), F("ethphy"), Settings.ETH_Phy_Addr, -1, 127); addFormNote(F("I²C-address of Ethernet PHY" -# if CONFIG_ETH_USE_ESP32_EMAC +# if CONFIG_ETH_USE_ESP32_EMAC && FEATURE_ETHERNET " (0 or 1 for LAN8720, 31 for TLK110, -1 autodetect)" # endif )); @@ -246,7 +246,7 @@ bool NWPlugin_004(NWPlugin::Function function, EventStruct *event, String& strin addFormPinSelect(PinSelectPurpose::Ethernet, formatGpioName_output( F(PWR_RST_PIN_DESCR)), F("ethpower"), Settings.ETH_Pin_power_rst); -# if CONFIG_ETH_USE_ESP32_EMAC +# if CONFIG_ETH_USE_ESP32_EMAC && FEATURE_ETHERNET addRowLabel_tr_id(F("Ethernet Clock"), F("ethclock")); { # if CONFIG_IDF_TARGET_ESP32 @@ -281,7 +281,7 @@ bool NWPlugin_004(NWPlugin::Function function, EventStruct *event, String& strin indices); selector.addSelector(F("ethclock"), static_cast(Settings.ETH_Clock_Mode)); } -# endif // if CONFIG_ETH_USE_ESP32_EMAC +# endif // if CONFIG_ETH_USE_ESP32_EMAC && FEATURE_ETHERNET break; } diff --git a/src/ESPEasy/net/eth/ESPEasyEth.cpp b/src/ESPEasy/net/eth/ESPEasyEth.cpp index 2b1ec1bc0..ffb22296a 100644 --- a/src/ESPEasy/net/eth/ESPEasyEth.cpp +++ b/src/ESPEasy/net/eth/ESPEasyEth.cpp @@ -63,7 +63,7 @@ void ethSetupStaticIPconfig() { bool ethCheckSettings() { return isValid(Settings.ETH_Phy_Type) -# if CONFIG_ETH_USE_ESP32_EMAC +# if CONFIG_ETH_USE_ESP32_EMAC && FEATURE_ETHERNET && (isValid(Settings.ETH_Clock_Mode) /* || isSPI_EthernetType(Settings.ETH_Phy_Type)*/) # endif && isValid(Settings.NetworkMedium) @@ -214,7 +214,7 @@ bool ETHConnectRelaxed() { # endif // if ETH_SPI_SUPPORTS_CUSTOM } } else { -# if CONFIG_ETH_USE_ESP32_EMAC +# if CONFIG_ETH_USE_ESP32_EMAC && FEATURE_ETHERNET # ifndef ESP32P4 ethResetGPIOpins(); # endif @@ -225,7 +225,7 @@ bool ETHConnectRelaxed() { Settings.ETH_Pin_mdio_irq, Settings.ETH_Pin_power_rst, (eth_clock_mode_t)Settings.ETH_Clock_Mode); -# endif // if CONFIG_ETH_USE_ESP32_EMAC +# endif // if CONFIG_ETH_USE_ESP32_EMAC && FEATURE_ETHERNET } # endif // if ESP_IDF_VERSION_MAJOR < 5 @@ -304,7 +304,7 @@ void ethPower(bool enable) { GPIO_Write(PLUGIN_GPIO, Settings.ETH_Pin_power_rst, enable ? 1 : 0); if (!enable) { -# if CONFIG_ETH_USE_ESP32_EMAC +# if CONFIG_ETH_USE_ESP32_EMAC && FEATURE_ETHERNET # if CONFIG_IDF_TARGET_ESP32P4 const bool isExternalCrystal = Settings.ETH_Clock_Mode == EthClockMode_t::Ext_crystal; # else @@ -315,7 +315,7 @@ void ethPower(bool enable) { delay(600); // Give some time to discharge any capacitors // Delay is needed to make sure no clock signal remains present which may cause the ESP to boot into flash mode. } -# endif // if CONFIG_ETH_USE_ESP32_EMAC +# endif // if CONFIG_ETH_USE_ESP32_EMAC && FEATURE_ETHERNET } else { delay(400); // LAN chip needs to initialize before calling Eth.begin() } @@ -333,7 +333,7 @@ void ethResetGPIOpins() { addLog(LOG_LEVEL_INFO, F("ethResetGPIOpins()")); gpio_reset_pin((gpio_num_t)Settings.ETH_Pin_mdc_cs); gpio_reset_pin((gpio_num_t)Settings.ETH_Pin_mdio_irq); -# if CONFIG_ETH_USE_ESP32_EMAC +# if CONFIG_ETH_USE_ESP32_EMAC && FEATURE_ETHERNET gpio_reset_pin(GPIO_NUM_19); // EMAC_TXD0 - hardcoded gpio_reset_pin(GPIO_NUM_21); // EMAC_TX_EN - hardcoded @@ -341,7 +341,7 @@ void ethResetGPIOpins() { gpio_reset_pin(GPIO_NUM_25); // EMAC_RXD0 - hardcoded gpio_reset_pin(GPIO_NUM_26); // EMAC_RXD1 - hardcoded gpio_reset_pin(GPIO_NUM_27); // EMAC_RX_CRS_DV - hardcoded -# endif // if CONFIG_ETH_USE_ESP32_EMAC +# endif // if CONFIG_ETH_USE_ESP32_EMAC && FEATURE_ETHERNET /* switch (Settings.ETH_Clock_Mode) { diff --git a/src/src/Commands/InternalCommands.cpp b/src/src/Commands/InternalCommands.cpp index 2138654f2..0623d4255 100644 --- a/src/src/Commands/InternalCommands.cpp +++ b/src/src/Commands/InternalCommands.cpp @@ -296,7 +296,7 @@ bool InternalCommands::executeInternalCommand() case ESPEasy_cmd_e::ethpinmdio: COMMAND_CASE_R(Command_ETH_Pin_mdio, 1); // Network Command case ESPEasy_cmd_e::ethpinpower: COMMAND_CASE_R(Command_ETH_Pin_power, 1); // Network Command case ESPEasy_cmd_e::ethphytype: COMMAND_CASE_R(Command_ETH_Phy_Type, 1); // Network Command -# if CONFIG_ETH_USE_ESP32_EMAC +# if CONFIG_ETH_USE_ESP32_EMAC && FEATURE_ETHERNET case ESPEasy_cmd_e::ethclockmode: COMMAND_CASE_R(Command_ETH_Clock_Mode, 1); // Network Command #endif case ESPEasy_cmd_e::ethip: COMMAND_CASE_R(Command_ETH_IP, 1); // Network Command diff --git a/src/src/Commands/InternalCommands_decoder.cpp b/src/src/Commands/InternalCommands_decoder.cpp index 39ebd4674..4b5e6c841 100644 --- a/src/src/Commands/InternalCommands_decoder.cpp +++ b/src/src/Commands/InternalCommands_decoder.cpp @@ -74,7 +74,7 @@ const char Internal_commands_e[] PROGMEM = "ethpinmdio|" "ethpinpower|" "ethphytype|" -# if CONFIG_ETH_USE_ESP32_EMAC +# if CONFIG_ETH_USE_ESP32_EMAC && FEATURE_ETHERNET "ethclockmode|" #endif "ethip|" diff --git a/src/src/Commands/InternalCommands_decoder.h b/src/src/Commands/InternalCommands_decoder.h index cac9545af..359ebacb6 100644 --- a/src/src/Commands/InternalCommands_decoder.h +++ b/src/src/Commands/InternalCommands_decoder.h @@ -51,7 +51,7 @@ enum class ESPEasy_cmd_e : uint8_t { ethpinmdio, ethpinpower, ethphytype, -# if CONFIG_ETH_USE_ESP32_EMAC +# if CONFIG_ETH_USE_ESP32_EMAC && FEATURE_ETHERNET ethclockmode, #endif ethip, diff --git a/src/src/Commands/Networks.cpp b/src/src/Commands/Networks.cpp index 5c7b292af..7f3d302fa 100644 --- a/src/src/Commands/Networks.cpp +++ b/src/src/Commands/Networks.cpp @@ -93,7 +93,7 @@ String Command_ETH_Phy_Type (struct EventStruct *event, const char* Line) { return Command_GetORSetInt8_t(event, F("ETH_Phy_Type:"), Line, reinterpret_cast(&Settings.ETH_Phy_Type),1); } -# if CONFIG_ETH_USE_ESP32_EMAC +# if CONFIG_ETH_USE_ESP32_EMAC && FEATURE_ETHERNET String Command_ETH_Clock_Mode (struct EventStruct *event, const char* Line) { return Command_GetORSetETH(event, diff --git a/src/src/Commands/Networks.h b/src/src/Commands/Networks.h index 28480bd7f..5dac1dcbc 100644 --- a/src/src/Commands/Networks.h +++ b/src/src/Commands/Networks.h @@ -19,7 +19,7 @@ String Command_ETH_Pin_mdc (struct EventStruct *event, const char* Line); String Command_ETH_Pin_mdio (struct EventStruct *event, const char* Line); String Command_ETH_Pin_power (struct EventStruct *event, const char* Line); String Command_ETH_Phy_Type (struct EventStruct *event, const char* Line); -# if CONFIG_ETH_USE_ESP32_EMAC +# if CONFIG_ETH_USE_ESP32_EMAC && FEATURE_ETHERNET String Command_ETH_Clock_Mode (struct EventStruct *event, const char* Line); #endif String Command_ETH_IP (struct EventStruct *event, const char* Line); diff --git a/src/src/CustomBuild/ESPEasyDefaults.h b/src/src/CustomBuild/ESPEasyDefaults.h index b8c105097..c992cde49 100644 --- a/src/src/CustomBuild/ESPEasyDefaults.h +++ b/src/src/CustomBuild/ESPEasyDefaults.h @@ -313,7 +313,7 @@ #endif #endif #ifndef DEFAULT_ETH_CLOCK_MODE -# if CONFIG_ETH_USE_ESP32_EMAC +# if CONFIG_ETH_USE_ESP32_EMAC && FEATURE_ETHERNET #define DEFAULT_ETH_CLOCK_MODE static_cast(0) #else #define DEFAULT_ETH_CLOCK_MODE (0) diff --git a/src/src/DataStructs/FactoryDefault_Network_NVS.cpp b/src/src/DataStructs/FactoryDefault_Network_NVS.cpp index 2d3b6bca7..5bcd4c1d3 100644 --- a/src/src/DataStructs/FactoryDefault_Network_NVS.cpp +++ b/src/src/DataStructs/FactoryDefault_Network_NVS.cpp @@ -43,7 +43,7 @@ bool FactoryDefault_Network_NVS::applyToSettings_from_NVS(ESPEasy_NVS_Helper& pr #else Settings.ETH_Phy_Type = 0; #endif -# if CONFIG_ETH_USE_ESP32_EMAC +# if CONFIG_ETH_USE_ESP32_EMAC && FEATURE_ETHERNET Settings.ETH_Clock_Mode = static_cast(bits.ETH_Clock_Mode); #endif Settings.NetworkMedium = static_cast(bits.NetworkMedium); diff --git a/src/src/DataStructs/GpioFactorySettingsStruct.cpp b/src/src/DataStructs/GpioFactorySettingsStruct.cpp index f42a7f6da..9dc60bbe7 100644 --- a/src/src/DataStructs/GpioFactorySettingsStruct.cpp +++ b/src/src/DataStructs/GpioFactorySettingsStruct.cpp @@ -112,7 +112,7 @@ GpioFactorySettingsStruct::GpioFactorySettingsStruct(DeviceModel model) # endif // if defined(ESP8266) -# if CONFIG_ETH_USE_ESP32_EMAC +# if CONFIG_ETH_USE_ESP32_EMAC && FEATURE_ETHERNET # if CONFIG_IDF_TARGET_ESP32 case DeviceModel::DeviceModel_Olimex_ESP32_PoE: button[0] = 34; // BUT1 Button @@ -208,7 +208,7 @@ GpioFactorySettingsStruct::GpioFactorySettingsStruct(DeviceModel model) # else // if CONFIG_IDF_TARGET_ESP32 default: break; # endif // if CONFIG_IDF_TARGET_ESP32 - # endif // if CONFIG_ETH_USE_ESP32_EMAC + # endif // if CONFIG_ETH_USE_ESP32_EMAC && FEATURE_ETHERNET case DeviceModel::DeviceModel_default: case DeviceModel::DeviceModel_MAX: diff --git a/src/src/DataStructs/SettingsStruct.h b/src/src/DataStructs/SettingsStruct.h index c6d12bf2c..eb349cf4b 100644 --- a/src/src/DataStructs/SettingsStruct.h +++ b/src/src/DataStructs/SettingsStruct.h @@ -580,7 +580,7 @@ public: int8_t ETH_Pin_power_rst = -1; #if FEATURE_ETHERNET EthPhyType_t ETH_Phy_Type = EthPhyType_t::notSet; -# if CONFIG_ETH_USE_ESP32_EMAC +# if CONFIG_ETH_USE_ESP32_EMAC && FEATURE_ETHERNET EthClockMode_t ETH_Clock_Mode = static_cast(0); #else uint8_t ETH_Clock_Mode{}; diff --git a/src/src/DataStructs_templ/SettingsStruct.cpp b/src/src/DataStructs_templ/SettingsStruct.cpp index 38733cef0..27d2f5d31 100644 --- a/src/src/DataStructs_templ/SettingsStruct.cpp +++ b/src/src/DataStructs_templ/SettingsStruct.cpp @@ -30,7 +30,7 @@ #include "include/esp32x_fixes.h" #endif -#if CONFIG_ETH_USE_ESP32_EMAC +#if CONFIG_ETH_USE_ESP32_EMAC && FEATURE_ETHERNET #include #endif @@ -1230,7 +1230,7 @@ bool SettingsStruct_tmpl::isEthernetPin(int8_t pin) const { if (pin < 0) return false; if (NetworkMedium == NetworkMedium_t::Ethernet && !isSPI_EthernetType(ETH_Phy_Type)) { - #if CONFIG_ETH_USE_ESP32_EMAC + #if CONFIG_ETH_USE_ESP32_EMAC && FEATURE_ETHERNET #ifdef ESP32P4 switch (pin) { // MDC/MDIO/Power can be configured by user @@ -1267,7 +1267,7 @@ bool SettingsStruct_tmpl::isEthernetPinOptional(int8_t pin) const { if (pin < 0) return false; if (NetworkMedium == NetworkMedium_t::Ethernet) { if (!isSPI_EthernetType(ETH_Phy_Type) -# if CONFIG_ETH_USE_ESP32_EMAC +# if CONFIG_ETH_USE_ESP32_EMAC && FEATURE_ETHERNET && isGpioUsedInETHClockMode(ETH_Clock_Mode, pin) #endif ) return true; diff --git a/src/src/DataTypes/DeviceModel.h b/src/src/DataTypes/DeviceModel.h index 3af8f1f45..fc67ff4c2 100644 --- a/src/src/DataTypes/DeviceModel.h +++ b/src/src/DataTypes/DeviceModel.h @@ -21,7 +21,7 @@ enum class DeviceModel : uint8_t { DeviceModel_Sonoff_POWr2, DeviceModel_Shelly1, DeviceModel_ShellyPLUG_S, -# if CONFIG_ETH_USE_ESP32_EMAC +# if CONFIG_ETH_USE_ESP32_EMAC && FEATURE_ETHERNET DeviceModel_Olimex_ESP32_PoE, DeviceModel_Olimex_ESP32_EVB, DeviceModel_Olimex_ESP32_GATEWAY, diff --git a/src/src/DataTypes/EthernetParameters.cpp b/src/src/DataTypes/EthernetParameters.cpp index a0ef6742c..208399a90 100644 --- a/src/src/DataTypes/EthernetParameters.cpp +++ b/src/src/DataTypes/EthernetParameters.cpp @@ -5,7 +5,7 @@ bool isValid(EthPhyType_t phyType) { switch (phyType) { -# if CONFIG_ETH_USE_ESP32_EMAC +# if CONFIG_ETH_USE_ESP32_EMAC && FEATURE_ETHERNET case EthPhyType_t::LAN8720: case EthPhyType_t::TLK110: case EthPhyType_t::RTL8201: @@ -16,7 +16,7 @@ bool isValid(EthPhyType_t phyType) { case EthPhyType_t::KSZ8041: case EthPhyType_t::KSZ8081: return true; -# endif // if CONFIG_ETH_USE_ESP32_EMAC +# endif // if CONFIG_ETH_USE_ESP32_EMAC && FEATURE_ETHERNET # if ESP_IDF_VERSION_MAJOR >= 5 # if CONFIG_ETH_SPI_ETHERNET_DM9051 @@ -59,7 +59,7 @@ eth_phy_type_t to_ESP_phy_type(EthPhyType_t phyType) { switch (phyType) { -# if CONFIG_ETH_USE_ESP32_EMAC +# if CONFIG_ETH_USE_ESP32_EMAC && FEATURE_ETHERNET case EthPhyType_t::LAN8720: return ETH_PHY_LAN8720; case EthPhyType_t::TLK110: return ETH_PHY_TLK110; case EthPhyType_t::RTL8201: return ETH_PHY_RTL8201; @@ -69,7 +69,7 @@ eth_phy_type_t to_ESP_phy_type(EthPhyType_t phyType) case EthPhyType_t::DP83848: return ETH_PHY_DP83848; case EthPhyType_t::KSZ8041: return ETH_PHY_KSZ8041; case EthPhyType_t::KSZ8081: return ETH_PHY_KSZ8081; -# endif // if CONFIG_ETH_USE_ESP32_EMAC +# endif // if CONFIG_ETH_USE_ESP32_EMAC && FEATURE_ETHERNET # if ESP_IDF_VERSION_MAJOR >= 5 # if CONFIG_ETH_SPI_ETHERNET_DM9051 @@ -93,7 +93,7 @@ eth_phy_type_t to_ESP_phy_type(EthPhyType_t phyType) const __FlashStringHelper* toString(EthPhyType_t phyType) { switch (phyType) { -# if CONFIG_ETH_USE_ESP32_EMAC +# if CONFIG_ETH_USE_ESP32_EMAC && FEATURE_ETHERNET case EthPhyType_t::LAN8720: return F("LAN8710 / LAN8720"); case EthPhyType_t::TLK110: return F("TLK110 / IP101"); case EthPhyType_t::RTL8201: return F("RTL8201"); @@ -103,7 +103,7 @@ const __FlashStringHelper* toString(EthPhyType_t phyType) { case EthPhyType_t::DP83848: return F("DP83848"); case EthPhyType_t::KSZ8041: return F("KSZ8041"); case EthPhyType_t::KSZ8081: return F("KSZ8081"); -# endif // if CONFIG_ETH_USE_ESP32_EMAC +# endif // if CONFIG_ETH_USE_ESP32_EMAC && FEATURE_ETHERNET # if ESP_IDF_VERSION_MAJOR >= 5 # if CONFIG_ETH_SPI_ETHERNET_DM9051 diff --git a/src/src/DataTypes/EthernetParameters.h b/src/src/DataTypes/EthernetParameters.h index 78f3b0607..44543858f 100644 --- a/src/src/DataTypes/EthernetParameters.h +++ b/src/src/DataTypes/EthernetParameters.h @@ -37,7 +37,7 @@ enum class EthClockMode_t : uint8_t { # endif // if CONFIG_IDF_TARGET_ESP32 -# if CONFIG_ETH_USE_ESP32_EMAC +# if CONFIG_ETH_USE_ESP32_EMAC && FEATURE_ETHERNET bool isValid(EthClockMode_t clockMode); @@ -49,7 +49,7 @@ bool isGpioUsedInETHClockMode(EthClockMode_t clockMode, // Is stored in settings enum class EthPhyType_t : uint8_t { -# if CONFIG_ETH_USE_ESP32_EMAC +# if CONFIG_ETH_USE_ESP32_EMAC && FEATURE_ETHERNET LAN8720 = 0, TLK110 = 1, RTL8201 = 2, @@ -59,7 +59,7 @@ enum class EthPhyType_t : uint8_t { DP83848 = 4, KSZ8041 = 5, KSZ8081 = 6, -# endif // if CONFIG_ETH_USE_ESP32_EMAC +# endif // if CONFIG_ETH_USE_ESP32_EMAC && FEATURE_ETHERNET # if ESP_IDF_VERSION_MAJOR >= 5 # if CONFIG_ETH_SPI_ETHERNET_DM9051 DM9051 = 10, diff --git a/src/src/Helpers/Hardware.cpp b/src/src/Helpers/Hardware.cpp index d46c15873..2b33a47e9 100644 --- a/src/src/Helpers/Hardware.cpp +++ b/src/src/Helpers/Hardware.cpp @@ -791,7 +791,7 @@ const __FlashStringHelper* getDeviceModelBrandString(DeviceModel model) { case DeviceModel::DeviceModel_Sonoff_POWr2: return F("Sonoff"); case DeviceModel::DeviceModel_Shelly1: case DeviceModel::DeviceModel_ShellyPLUG_S: return F("Shelly"); -# if CONFIG_ETH_USE_ESP32_EMAC +# if CONFIG_ETH_USE_ESP32_EMAC && FEATURE_ETHERNET case DeviceModel::DeviceModel_Olimex_ESP32_PoE: case DeviceModel::DeviceModel_Olimex_ESP32_EVB: case DeviceModel::DeviceModel_Olimex_ESP32_GATEWAY: @@ -844,13 +844,13 @@ const __FlashStringHelper* getDeviceModelTypeString(DeviceModel model) case DeviceModel::DeviceModel_ShellyPLUG_S: return F("default"); #endif // if defined(ESP8266) && !defined(LIMIT_BUILD_SIZE) -#if CONFIG_ETH_USE_ESP32_EMAC +#if CONFIG_ETH_USE_ESP32_EMAC && FEATURE_ETHERNET case DeviceModel::DeviceModel_Olimex_ESP32_PoE: return F(" ESP32-PoE"); case DeviceModel::DeviceModel_Olimex_ESP32_EVB: return F(" ESP32-EVB"); case DeviceModel::DeviceModel_Olimex_ESP32_GATEWAY: return F(" ESP32-GATEWAY"); case DeviceModel::DeviceModel_wESP32: break; case DeviceModel::DeviceModel_WT32_ETH01: return F(" add-on"); -#endif // if CONFIG_ETH_USE_ESP32_EMAC +#endif // if CONFIG_ETH_USE_ESP32_EMAC && FEATURE_ETHERNET case DeviceModel::DeviceModel_default: case DeviceModel::DeviceModel_MAX: return F("default"); @@ -903,7 +903,7 @@ bool modelMatchingFlashSize(DeviceModel model) { #endif // ifdef ESP8266 // These Olimex boards all have Ethernet -#if CONFIG_ETH_USE_ESP32_EMAC +#if CONFIG_ETH_USE_ESP32_EMAC && FEATURE_ETHERNET case DeviceModel::DeviceModel_Olimex_ESP32_PoE: case DeviceModel::DeviceModel_Olimex_ESP32_EVB: case DeviceModel::DeviceModel_Olimex_ESP32_GATEWAY: @@ -914,7 +914,7 @@ bool modelMatchingFlashSize(DeviceModel model) { # else // if defined(ESP32_CLASSIC) && FEATURE_ETHERNET return false; # endif // if defined(ESP32_CLASSIC) && FEATURE_ETHERNET -#endif // if CONFIG_ETH_USE_ESP32_EMAC +#endif // if CONFIG_ETH_USE_ESP32_EMAC && FEATURE_ETHERNET case DeviceModel::DeviceModel_default: case DeviceModel::DeviceModel_MAX: return true; diff --git a/src/src/Helpers/StringGenerator_GPIO.cpp b/src/src/Helpers/StringGenerator_GPIO.cpp index c06f9cff7..ab865c48b 100644 --- a/src/src/Helpers/StringGenerator_GPIO.cpp +++ b/src/src/Helpers/StringGenerator_GPIO.cpp @@ -390,7 +390,7 @@ const __FlashStringHelper* getConflictingUse(int gpio, PinSelectPurpose purpose, #endif if (includeEthernet && Settings.isEthernetPinOptional(gpio)) { -# if CONFIG_ETH_USE_ESP32_EMAC +# if CONFIG_ETH_USE_ESP32_EMAC && FEATURE_ETHERNET if (isGpioUsedInETHClockMode(Settings.ETH_Clock_Mode, gpio)) { return F("Eth Clock"); } if (Settings.ETH_Pin_mdc_cs == gpio) { return F("Eth MDC"); } diff --git a/src/src/WebServer/HardwarePage.cpp b/src/src/WebServer/HardwarePage.cpp index 6b41d0c13..288a6206f 100644 --- a/src/src/WebServer/HardwarePage.cpp +++ b/src/src/WebServer/HardwarePage.cpp @@ -128,7 +128,7 @@ void handle_hardware() { Settings.ETH_Pin_mdio_irq = getFormItemInt(F("ethmdio")); Settings.ETH_Pin_power_rst = getFormItemInt(F("ethpower")); Settings.ETH_Phy_Type = static_cast(getFormItemInt(F("ethtype"))); -#if CONFIG_ETH_USE_ESP32_EMAC +#if CONFIG_ETH_USE_ESP32_EMAC && FEATURE_ETHERNET Settings.ETH_Clock_Mode = static_cast(getFormItemInt(F("ethclock"))); #endif Settings.NetworkMedium = static_cast(getFormItemInt(F("ethwifi"))); @@ -347,7 +347,7 @@ void handle_hardware() { const __FlashStringHelper * ethPhyTypes[] = { toString(EthPhyType_t::notSet), -# if CONFIG_ETH_USE_ESP32_EMAC +# if CONFIG_ETH_USE_ESP32_EMAC && FEATURE_ETHERNET toString(EthPhyType_t::LAN8720), toString(EthPhyType_t::TLK110), toString(EthPhyType_t::RTL8201), @@ -357,7 +357,7 @@ void handle_hardware() { toString(EthPhyType_t::DP83848), toString(EthPhyType_t::KSZ8041), toString(EthPhyType_t::KSZ8081), -# endif // if CONFIG_ETH_USE_ESP32_EMAC +# endif // if CONFIG_ETH_USE_ESP32_EMAC && FEATURE_ETHERNET #if ESP_IDF_VERSION_MAJOR >= 5 # if CONFIG_ETH_SPI_ETHERNET_DM9051 @@ -374,7 +374,7 @@ void handle_hardware() { const int ethPhyTypes_index[] = { static_cast(EthPhyType_t::notSet), -# if CONFIG_ETH_USE_ESP32_EMAC +# if CONFIG_ETH_USE_ESP32_EMAC && FEATURE_ETHERNET static_cast(EthPhyType_t::LAN8720), static_cast(EthPhyType_t::TLK110), static_cast(EthPhyType_t::RTL8201), @@ -384,7 +384,7 @@ void handle_hardware() { static_cast(EthPhyType_t::DP83848), static_cast(EthPhyType_t::KSZ8041), static_cast(EthPhyType_t::KSZ8081), -# endif // if CONFIG_ETH_USE_ESP32_EMAC +# endif // if CONFIG_ETH_USE_ESP32_EMAC && FEATURE_ETHERNET #if ESP_IDF_VERSION_MAJOR >= 5 # if CONFIG_ETH_SPI_ETHERNET_DM9051 @@ -424,7 +424,7 @@ void handle_hardware() { #define MDC_CS_PIN_DESCR "Ethernet CS pin" #define MIO_IRQ_PIN_DESCR "Ethernet IRQ pin" #define PWR_RST_PIN_DESCR "Ethernet RST pin" -#else // #elif CONFIG_ETH_USE_ESP32_EMAC +#else // #elif CONFIG_ETH_USE_ESP32_EMAC && FEATURE_ETHERNET #define MDC_CS_PIN_DESCR "Ethernet MDC pin" #define MIO_IRQ_PIN_DESCR "Ethernet MIO pin" #define PWR_RST_PIN_DESCR "Ethernet Power pin" @@ -432,7 +432,7 @@ void handle_hardware() { addFormNumericBox(F("Ethernet PHY Address"), F("ethphy"), Settings.ETH_Phy_Addr, -1, 127); addFormNote(F("I²C-address of Ethernet PHY" -#if CONFIG_ETH_USE_ESP32_EMAC +#if CONFIG_ETH_USE_ESP32_EMAC && FEATURE_ETHERNET " (0 or 1 for LAN8720, 31 for TLK110, -1 autodetect)" #endif )); @@ -445,7 +445,7 @@ void handle_hardware() { addFormPinSelect(PinSelectPurpose::Ethernet, formatGpioName_output( F(PWR_RST_PIN_DESCR)), F("ethpower"), Settings.ETH_Pin_power_rst); -#if CONFIG_ETH_USE_ESP32_EMAC +#if CONFIG_ETH_USE_ESP32_EMAC && FEATURE_ETHERNET addRowLabel_tr_id(F("Ethernet Clock"), F("ethclock")); { const __FlashStringHelper * ethClockOptions[] = { From efc96ca6b7e6abeaee4083efb81d628abd18e2a9 Mon Sep 17 00:00:00 2001 From: TD-er Date: Sun, 27 Jul 2025 17:37:22 +0200 Subject: [PATCH 151/564] [Network] Move EthernetParameters to ESPEasy::net namespace --- .../net}/DataTypes/EthernetParameters.cpp | 52 +++++++++-------- .../net}/DataTypes/EthernetParameters.h | 23 ++++---- .../DataTypes/EthernetParameters_ESP32.cpp | 6 ++ .../DataTypes/EthernetParameters_ESP32P4.cpp | 6 ++ src/src/CustomBuild/ESPEasyDefaults.h | 6 +- .../FactoryDefault_Network_NVS.cpp | 4 +- .../DataStructs/GpioFactorySettingsStruct.cpp | 20 +++---- .../DataStructs/GpioFactorySettingsStruct.h | 10 ++-- src/src/DataStructs/SettingsStruct.h | 9 ++- src/src/DataStructs_templ/SettingsStruct.cpp | 6 +- src/src/Helpers/Hardware.cpp | 2 +- src/src/Helpers/StringGenerator_GPIO.cpp | 4 +- src/src/WebServer/HardwarePage.cpp | 58 +++++++++---------- 13 files changed, 113 insertions(+), 93 deletions(-) rename src/{src => ESPEasy/net}/DataTypes/EthernetParameters.cpp (78%) rename src/{src => ESPEasy/net}/DataTypes/EthernetParameters.h (88%) rename src/{src => ESPEasy/net}/DataTypes/EthernetParameters_ESP32.cpp (91%) rename src/{src => ESPEasy/net}/DataTypes/EthernetParameters_ESP32P4.cpp (94%) diff --git a/src/src/DataTypes/EthernetParameters.cpp b/src/ESPEasy/net/DataTypes/EthernetParameters.cpp similarity index 78% rename from src/src/DataTypes/EthernetParameters.cpp rename to src/ESPEasy/net/DataTypes/EthernetParameters.cpp index 208399a90..26b9ae020 100644 --- a/src/src/DataTypes/EthernetParameters.cpp +++ b/src/ESPEasy/net/DataTypes/EthernetParameters.cpp @@ -2,6 +2,9 @@ #if FEATURE_ETHERNET +namespace ESPEasy { +namespace net { + bool isValid(EthPhyType_t phyType) { switch (phyType) { @@ -35,61 +38,57 @@ bool isValid(EthPhyType_t phyType) { return false; } -# if FEATURE_ETHERNET - bool isSPI_EthernetType(EthPhyType_t phyType) { -# if ESP_IDF_VERSION_MAJOR >= 5 +# if ESP_IDF_VERSION_MAJOR >= 5 return -# if CONFIG_ETH_SPI_ETHERNET_DM9051 +# if CONFIG_ETH_SPI_ETHERNET_DM9051 phyType == EthPhyType_t::DM9051 || -# endif // if CONFIG_ETH_SPI_ETHERNET_DM9051 -# if CONFIG_ETH_SPI_ETHERNET_W5500 +# endif // if CONFIG_ETH_SPI_ETHERNET_DM9051 +# if CONFIG_ETH_SPI_ETHERNET_W5500 phyType == EthPhyType_t::W5500 || -# endif // if CONFIG_ETH_SPI_ETHERNET_W5500 -# if CONFIG_ETH_SPI_ETHERNET_KSZ8851SNL +# endif // if CONFIG_ETH_SPI_ETHERNET_W5500 +# if CONFIG_ETH_SPI_ETHERNET_KSZ8851SNL phyType == EthPhyType_t::KSZ8851 || -# endif // if CONFIG_ETH_SPI_ETHERNET_KSZ8851SNL +# endif // if CONFIG_ETH_SPI_ETHERNET_KSZ8851SNL false; -# else // if ESP_IDF_VERSION_MAJOR >= 5 +# else // if ESP_IDF_VERSION_MAJOR >= 5 return false; -# endif // if ESP_IDF_VERSION_MAJOR >= 5 +# endif // if ESP_IDF_VERSION_MAJOR >= 5 } eth_phy_type_t to_ESP_phy_type(EthPhyType_t phyType) { switch (phyType) { -# if CONFIG_ETH_USE_ESP32_EMAC && FEATURE_ETHERNET +# if CONFIG_ETH_USE_ESP32_EMAC && FEATURE_ETHERNET case EthPhyType_t::LAN8720: return ETH_PHY_LAN8720; case EthPhyType_t::TLK110: return ETH_PHY_TLK110; case EthPhyType_t::RTL8201: return ETH_PHY_RTL8201; -# if ETH_TYPE_JL1101_SUPPORTED +# if ETH_TYPE_JL1101_SUPPORTED case EthPhyType_t::JL1101: return ETH_PHY_JL1101; -# endif +# endif case EthPhyType_t::DP83848: return ETH_PHY_DP83848; case EthPhyType_t::KSZ8041: return ETH_PHY_KSZ8041; case EthPhyType_t::KSZ8081: return ETH_PHY_KSZ8081; -# endif // if CONFIG_ETH_USE_ESP32_EMAC && FEATURE_ETHERNET +# endif // if CONFIG_ETH_USE_ESP32_EMAC && FEATURE_ETHERNET -# if ESP_IDF_VERSION_MAJOR >= 5 -# if CONFIG_ETH_SPI_ETHERNET_DM9051 +# if ESP_IDF_VERSION_MAJOR >= 5 +# if CONFIG_ETH_SPI_ETHERNET_DM9051 case EthPhyType_t::DM9051: return ETH_PHY_DM9051; -# endif // if CONFIG_ETH_SPI_ETHERNET_DM9051 -# if CONFIG_ETH_SPI_ETHERNET_W5500 +# endif // if CONFIG_ETH_SPI_ETHERNET_DM9051 +# if CONFIG_ETH_SPI_ETHERNET_W5500 case EthPhyType_t::W5500: return ETH_PHY_W5500; -# endif // if CONFIG_ETH_SPI_ETHERNET_W5500 -# if CONFIG_ETH_SPI_ETHERNET_KSZ8851SNL +# endif // if CONFIG_ETH_SPI_ETHERNET_W5500 +# if CONFIG_ETH_SPI_ETHERNET_KSZ8851SNL case EthPhyType_t::KSZ8851: return ETH_PHY_KSZ8851; -# endif // if CONFIG_ETH_SPI_ETHERNET_KSZ8851SNL -# endif // if ESP_IDF_VERSION_MAJOR >= 5 +# endif // if CONFIG_ETH_SPI_ETHERNET_KSZ8851SNL +# endif // if ESP_IDF_VERSION_MAJOR >= 5 case EthPhyType_t::notSet: break; } return ETH_PHY_MAX; } -# endif // if FEATURE_ETHERNET - const __FlashStringHelper* toString(EthPhyType_t phyType) { switch (phyType) { @@ -124,4 +123,7 @@ const __FlashStringHelper* toString(EthPhyType_t phyType) { return F("- None -"); } +} // namespace net +} // namespace ESPEasy + #endif // if FEATURE_ETHERNET diff --git a/src/src/DataTypes/EthernetParameters.h b/src/ESPEasy/net/DataTypes/EthernetParameters.h similarity index 88% rename from src/src/DataTypes/EthernetParameters.h rename to src/ESPEasy/net/DataTypes/EthernetParameters.h index 44543858f..15e5ac3ac 100644 --- a/src/src/DataTypes/EthernetParameters.h +++ b/src/ESPEasy/net/DataTypes/EthernetParameters.h @@ -1,10 +1,15 @@ -#ifndef DATASTRUCTS_ETHERNETPARAMETERS_H -#define DATASTRUCTS_ETHERNETPARAMETERS_H +#pragma once -#include "../../ESPEasy_common.h" +#include "../../../ESPEasy_common.h" #if FEATURE_ETHERNET +# include + +namespace ESPEasy { +namespace net { + + // Is stored in settings # ifdef ESP32P4 @@ -45,7 +50,7 @@ const __FlashStringHelper* toString(EthClockMode_t clockMode); bool isGpioUsedInETHClockMode(EthClockMode_t clockMode, int8_t gpio); -#endif +# endif // if CONFIG_ETH_USE_ESP32_EMAC && FEATURE_ETHERNET // Is stored in settings enum class EthPhyType_t : uint8_t { @@ -75,18 +80,16 @@ enum class EthPhyType_t : uint8_t { }; -bool isValid(EthPhyType_t phyType); - -# if FEATURE_ETHERNET -# include +bool isValid(EthPhyType_t phyType); bool isSPI_EthernetType(EthPhyType_t phyType); // Convert to internal enum type as those enum values may not always be the same int value eth_phy_type_t to_ESP_phy_type(EthPhyType_t phyType); -# endif // if FEATURE_ETHERNET const __FlashStringHelper* toString(EthPhyType_t phyType); +} // namespace net +} // namespace ESPEasy + #endif // if FEATURE_ETHERNET -#endif // DATASTRUCTS_ETHERNETPARAMETERS_H diff --git a/src/src/DataTypes/EthernetParameters_ESP32.cpp b/src/ESPEasy/net/DataTypes/EthernetParameters_ESP32.cpp similarity index 91% rename from src/src/DataTypes/EthernetParameters_ESP32.cpp rename to src/ESPEasy/net/DataTypes/EthernetParameters_ESP32.cpp index 98ab8aefd..5fd4e17e8 100644 --- a/src/src/DataTypes/EthernetParameters_ESP32.cpp +++ b/src/ESPEasy/net/DataTypes/EthernetParameters_ESP32.cpp @@ -3,6 +3,9 @@ #if CONFIG_IDF_TARGET_ESP32 && FEATURE_ETHERNET +namespace ESPEasy { +namespace net { + bool isValid(EthClockMode_t clockMode) { switch (clockMode) { @@ -40,4 +43,7 @@ const __FlashStringHelper* toString(EthClockMode_t clockMode) { return F("Unknown"); } +} // namespace net +} // namespace ESPEasy + #endif // if CONFIG_IDF_TARGET_ESP32 diff --git a/src/src/DataTypes/EthernetParameters_ESP32P4.cpp b/src/ESPEasy/net/DataTypes/EthernetParameters_ESP32P4.cpp similarity index 94% rename from src/src/DataTypes/EthernetParameters_ESP32P4.cpp rename to src/ESPEasy/net/DataTypes/EthernetParameters_ESP32P4.cpp index 0c3575575..b8800c8e5 100644 --- a/src/src/DataTypes/EthernetParameters_ESP32P4.cpp +++ b/src/ESPEasy/net/DataTypes/EthernetParameters_ESP32P4.cpp @@ -5,6 +5,9 @@ # include +namespace ESPEasy { +namespace net { + bool isValid(EthClockMode_t clockMode) { switch (clockMode) { @@ -67,4 +70,7 @@ const __FlashStringHelper* toString(EthClockMode_t clockMode) { return F("Unknown"); } +} // namespace net +} // namespace ESPEasy + #endif // if CONFIG_IDF_TARGET_ESP32P4 diff --git a/src/src/CustomBuild/ESPEasyDefaults.h b/src/src/CustomBuild/ESPEasyDefaults.h index c992cde49..690a1c3a0 100644 --- a/src/src/CustomBuild/ESPEasyDefaults.h +++ b/src/src/CustomBuild/ESPEasyDefaults.h @@ -283,9 +283,9 @@ #ifndef DEFAULT_ETH_PHY_TYPE #if FEATURE_ETHERNET #ifdef ESP32P4 -#define DEFAULT_ETH_PHY_TYPE EthPhyType_t::TLK110 +#define DEFAULT_ETH_PHY_TYPE ESPEasy::net::EthPhyType_t::TLK110 #else -#define DEFAULT_ETH_PHY_TYPE EthPhyType_t::notSet +#define DEFAULT_ETH_PHY_TYPE ESPEasy::net::EthPhyType_t::notSet #endif #else #define DEFAULT_ETH_PHY_TYPE 0 @@ -314,7 +314,7 @@ #endif #ifndef DEFAULT_ETH_CLOCK_MODE # if CONFIG_ETH_USE_ESP32_EMAC && FEATURE_ETHERNET -#define DEFAULT_ETH_CLOCK_MODE static_cast(0) +#define DEFAULT_ETH_CLOCK_MODE static_cast(0) #else #define DEFAULT_ETH_CLOCK_MODE (0) #endif diff --git a/src/src/DataStructs/FactoryDefault_Network_NVS.cpp b/src/src/DataStructs/FactoryDefault_Network_NVS.cpp index 5bcd4c1d3..6f7f0d895 100644 --- a/src/src/DataStructs/FactoryDefault_Network_NVS.cpp +++ b/src/src/DataStructs/FactoryDefault_Network_NVS.cpp @@ -39,12 +39,12 @@ bool FactoryDefault_Network_NVS::applyToSettings_from_NVS(ESPEasy_NVS_Helper& pr Settings.ETH_Pin_mdio_irq = bits.ETH_Pin_mdio_irq; Settings.ETH_Pin_power_rst = bits.ETH_Pin_power_rst; #if FEATURE_ETHERNET - Settings.ETH_Phy_Type = static_cast(bits.ETH_Phy_Type); + Settings.ETH_Phy_Type = static_cast(bits.ETH_Phy_Type); #else Settings.ETH_Phy_Type = 0; #endif # if CONFIG_ETH_USE_ESP32_EMAC && FEATURE_ETHERNET - Settings.ETH_Clock_Mode = static_cast(bits.ETH_Clock_Mode); + Settings.ETH_Clock_Mode = static_cast(bits.ETH_Clock_Mode); #endif Settings.NetworkMedium = static_cast(bits.NetworkMedium); res = true; diff --git a/src/src/DataStructs/GpioFactorySettingsStruct.cpp b/src/src/DataStructs/GpioFactorySettingsStruct.cpp index 9dc60bbe7..fcd42f864 100644 --- a/src/src/DataStructs/GpioFactorySettingsStruct.cpp +++ b/src/src/DataStructs/GpioFactorySettingsStruct.cpp @@ -121,11 +121,11 @@ GpioFactorySettingsStruct::GpioFactorySettingsStruct(DeviceModel model) i2c_sda = 13; i2c_scl = 16; eth_phyaddr = 0; - eth_phytype = EthPhyType_t::LAN8720; + eth_phytype = ESPEasy::net::EthPhyType_t::LAN8720; eth_mdc = 23; eth_mdio = 18; eth_power = 12; - eth_clock_mode = EthClockMode_t::Int_50MHz_GPIO_17_inv; + eth_clock_mode = ESPEasy::net::EthClockMode_t::Int_50MHz_GPIO_17_inv; network_medium = NetworkMedium_t::Ethernet; break; case DeviceModel::DeviceModel_Olimex_ESP32_EVB: @@ -137,11 +137,11 @@ GpioFactorySettingsStruct::GpioFactorySettingsStruct(DeviceModel model) i2c_sda = 13; i2c_scl = 16; eth_phyaddr = 0; - eth_phytype = EthPhyType_t::LAN8720; + eth_phytype = ESPEasy::net::EthPhyType_t::LAN8720; eth_mdc = 23; eth_mdio = 18; eth_power = -1; // No Ethernet power pin - eth_clock_mode = EthClockMode_t::Ext_crystal_osc; + eth_clock_mode = ESPEasy::net::EthClockMode_t::Ext_crystal_osc; network_medium = NetworkMedium_t::Ethernet; break; @@ -152,11 +152,11 @@ GpioFactorySettingsStruct::GpioFactorySettingsStruct(DeviceModel model) i2c_sda = -1; i2c_scl = -1; eth_phyaddr = 0; - eth_phytype = EthPhyType_t::LAN8720; + eth_phytype = ESPEasy::net::EthPhyType_t::LAN8720; eth_mdc = 23; eth_mdio = 18; eth_power = 5; - eth_clock_mode = EthClockMode_t::Int_50MHz_GPIO_17_inv; + eth_clock_mode = ESPEasy::net::EthClockMode_t::Int_50MHz_GPIO_17_inv; network_medium = NetworkMedium_t::Ethernet; // Rev A to E: @@ -185,11 +185,11 @@ GpioFactorySettingsStruct::GpioFactorySettingsStruct(DeviceModel model) i2c_sda = 15; i2c_scl = 4; eth_phyaddr = 0; - eth_phytype = EthPhyType_t::LAN8720; + eth_phytype = ESPEasy::net::EthPhyType_t::LAN8720; eth_mdc = 16; eth_mdio = 17; eth_power = -1; - eth_clock_mode = EthClockMode_t::Ext_crystal_osc; + eth_clock_mode = ESPEasy::net::EthClockMode_t::Ext_crystal_osc; network_medium = NetworkMedium_t::Ethernet; break; @@ -198,11 +198,11 @@ GpioFactorySettingsStruct::GpioFactorySettingsStruct(DeviceModel model) i2c_sda = 21; i2c_scl = 22; eth_phyaddr = 1; - eth_phytype = EthPhyType_t::LAN8720; + eth_phytype = ESPEasy::net::EthPhyType_t::LAN8720; eth_mdc = 23; eth_mdio = 18; eth_power = 12; // TODO TD-er: Better to use GPIO-16? as shown here: https://letscontrolit.com/forum/viewtopic.php?p=50133#p50133 - eth_clock_mode = EthClockMode_t::Ext_crystal_osc; + eth_clock_mode = ESPEasy::net::EthClockMode_t::Ext_crystal_osc; network_medium = NetworkMedium_t::Ethernet; break; # else // if CONFIG_IDF_TARGET_ESP32 diff --git a/src/src/DataStructs/GpioFactorySettingsStruct.h b/src/src/DataStructs/GpioFactorySettingsStruct.h index 7c3ae7d66..783ac9a14 100644 --- a/src/src/DataStructs/GpioFactorySettingsStruct.h +++ b/src/src/DataStructs/GpioFactorySettingsStruct.h @@ -2,10 +2,10 @@ #define DATASTRUCTS_GPIOFACTORYSETTINGSSTRUCT_H #include "../DataTypes/DeviceModel.h" -#include "../DataTypes/EthernetParameters.h" #include "../DataTypes/NetworkMedium.h" - - +#if FEATURE_ETHERNET +#include "../../ESPEasy/net/DataTypes/EthernetParameters.h" +#endif struct GpioFactorySettingsStruct { GpioFactorySettingsStruct(DeviceModel model = DeviceModel::DeviceModel_default); @@ -17,7 +17,7 @@ struct GpioFactorySettingsStruct { int8_t i2c_scl; int8_t eth_phyaddr; #if FEATURE_ETHERNET - EthPhyType_t eth_phytype; + ESPEasy::net::EthPhyType_t eth_phytype; #else uint8_t eth_phytype{}; #endif @@ -25,7 +25,7 @@ struct GpioFactorySettingsStruct { int8_t eth_mdio; int8_t eth_power; #if FEATURE_ETHERNET && CONFIG_ETH_USE_ESP32_EMAC - EthClockMode_t eth_clock_mode; + ESPEasy::net::EthClockMode_t eth_clock_mode; #else uint8_t eth_clock_mode{}; #endif diff --git a/src/src/DataStructs/SettingsStruct.h b/src/src/DataStructs/SettingsStruct.h index eb349cf4b..a79bc4b55 100644 --- a/src/src/DataStructs/SettingsStruct.h +++ b/src/src/DataStructs/SettingsStruct.h @@ -8,7 +8,6 @@ #include "../DataStructs/ChecksumType.h" #include "../DataStructs/DeviceStruct.h" #include "../DataTypes/ControllerIndex.h" -#include "../DataTypes/EthernetParameters.h" #include "../DataTypes/NetworkMedium.h" #include "../ESPEasy/net/DataTypes/NWPluginID.h" #include "../ESPEasy/net/DataTypes/NetworkIndex.h" @@ -19,6 +18,10 @@ #include "../Globals/Plugins.h" #include "../ESPEasy/net/Globals/NWPlugins.h" +#if FEATURE_ETHERNET +#include "../../ESPEasy/net/DataTypes/EthernetParameters.h" +#endif + #ifdef ESP32 #include #endif @@ -579,9 +582,9 @@ public: int8_t ETH_Pin_mdio_irq = -1; int8_t ETH_Pin_power_rst = -1; #if FEATURE_ETHERNET - EthPhyType_t ETH_Phy_Type = EthPhyType_t::notSet; + ESPEasy::net::EthPhyType_t ETH_Phy_Type = ESPEasy::net::EthPhyType_t::notSet; # if CONFIG_ETH_USE_ESP32_EMAC && FEATURE_ETHERNET - EthClockMode_t ETH_Clock_Mode = static_cast(0); + ESPEasy::net::EthClockMode_t ETH_Clock_Mode = static_cast(0); #else uint8_t ETH_Clock_Mode{}; #endif diff --git a/src/src/DataStructs_templ/SettingsStruct.cpp b/src/src/DataStructs_templ/SettingsStruct.cpp index 27d2f5d31..877516c28 100644 --- a/src/src/DataStructs_templ/SettingsStruct.cpp +++ b/src/src/DataStructs_templ/SettingsStruct.cpp @@ -1229,7 +1229,7 @@ bool SettingsStruct_tmpl::isEthernetPin(int8_t pin) const { #if FEATURE_ETHERNET if (pin < 0) return false; if (NetworkMedium == NetworkMedium_t::Ethernet && - !isSPI_EthernetType(ETH_Phy_Type)) { + !ESPEasy::net::isSPI_EthernetType(ETH_Phy_Type)) { #if CONFIG_ETH_USE_ESP32_EMAC && FEATURE_ETHERNET #ifdef ESP32P4 switch (pin) { @@ -1266,9 +1266,9 @@ bool SettingsStruct_tmpl::isEthernetPinOptional(int8_t pin) const { #if FEATURE_ETHERNET if (pin < 0) return false; if (NetworkMedium == NetworkMedium_t::Ethernet) { - if (!isSPI_EthernetType(ETH_Phy_Type) + if (!ESPEasy::net::isSPI_EthernetType(ETH_Phy_Type) # if CONFIG_ETH_USE_ESP32_EMAC && FEATURE_ETHERNET - && isGpioUsedInETHClockMode(ETH_Clock_Mode, pin) + && ESPEasy::net::isGpioUsedInETHClockMode(ETH_Clock_Mode, pin) #endif ) return true; if (ETH_Pin_mdc_cs == pin) return true; diff --git a/src/src/Helpers/Hardware.cpp b/src/src/Helpers/Hardware.cpp index 2b33a47e9..26244dffb 100644 --- a/src/src/Helpers/Hardware.cpp +++ b/src/src/Helpers/Hardware.cpp @@ -214,7 +214,7 @@ void hardwareInit() #if FEATURE_ETHERNET if ((Settings.NetworkMedium == NetworkMedium_t::Ethernet) && isValid(Settings.ETH_Phy_Type) && - isSPI_EthernetType(Settings.ETH_Phy_Type)) + ESPEasy::net::isSPI_EthernetType(Settings.ETH_Phy_Type)) { #if !ETH_SPI_SUPPORTS_CUSTOM tryInitSPI = false; diff --git a/src/src/Helpers/StringGenerator_GPIO.cpp b/src/src/Helpers/StringGenerator_GPIO.cpp index ab865c48b..f204448e5 100644 --- a/src/src/Helpers/StringGenerator_GPIO.cpp +++ b/src/src/Helpers/StringGenerator_GPIO.cpp @@ -362,7 +362,7 @@ const __FlashStringHelper* getConflictingUse(int gpio, PinSelectPurpose purpose, #if FEATURE_ETHERNET - if (isSPI_EthernetType(Settings.ETH_Phy_Type)) { + if (ESPEasy::net::isSPI_EthernetType(Settings.ETH_Phy_Type)) { if (includeEthernet && Settings.isEthernetPinOptional(gpio)) { if (Settings.ETH_Pin_mdc_cs == gpio) { return F("Eth SPI CS"); } @@ -391,7 +391,7 @@ const __FlashStringHelper* getConflictingUse(int gpio, PinSelectPurpose purpose, if (includeEthernet && Settings.isEthernetPinOptional(gpio)) { # if CONFIG_ETH_USE_ESP32_EMAC && FEATURE_ETHERNET - if (isGpioUsedInETHClockMode(Settings.ETH_Clock_Mode, gpio)) { return F("Eth Clock"); } + if (ESPEasy::net::isGpioUsedInETHClockMode(Settings.ETH_Clock_Mode, gpio)) { return F("Eth Clock"); } if (Settings.ETH_Pin_mdc_cs == gpio) { return F("Eth MDC"); } diff --git a/src/src/WebServer/HardwarePage.cpp b/src/src/WebServer/HardwarePage.cpp index 288a6206f..80efda16d 100644 --- a/src/src/WebServer/HardwarePage.cpp +++ b/src/src/WebServer/HardwarePage.cpp @@ -127,9 +127,9 @@ void handle_hardware() { Settings.ETH_Pin_mdc_cs = getFormItemInt(F("ethmdc")); Settings.ETH_Pin_mdio_irq = getFormItemInt(F("ethmdio")); Settings.ETH_Pin_power_rst = getFormItemInt(F("ethpower")); - Settings.ETH_Phy_Type = static_cast(getFormItemInt(F("ethtype"))); + Settings.ETH_Phy_Type = static_cast(getFormItemInt(F("ethtype"))); #if CONFIG_ETH_USE_ESP32_EMAC && FEATURE_ETHERNET - Settings.ETH_Clock_Mode = static_cast(getFormItemInt(F("ethclock"))); + Settings.ETH_Clock_Mode = static_cast(getFormItemInt(F("ethclock"))); #endif Settings.NetworkMedium = static_cast(getFormItemInt(F("ethwifi"))); #endif // if FEATURE_ETHERNET @@ -345,56 +345,56 @@ void handle_hardware() { addFormNote(F("Change Switch between WiFi and Ethernet requires reboot to activate")); { const __FlashStringHelper * ethPhyTypes[] = { - toString(EthPhyType_t::notSet), + toString(ESPEasy::net::EthPhyType_t::notSet), # if CONFIG_ETH_USE_ESP32_EMAC && FEATURE_ETHERNET - toString(EthPhyType_t::LAN8720), - toString(EthPhyType_t::TLK110), - toString(EthPhyType_t::RTL8201), + toString(ESPEasy::net::EthPhyType_t::LAN8720), + toString(ESPEasy::net::EthPhyType_t::TLK110), + toString(ESPEasy::net::EthPhyType_t::RTL8201), #if ETH_TYPE_JL1101_SUPPORTED - toString(EthPhyType_t::JL1101), + toString(ESPEasy::net::EthPhyType_t::JL1101), #endif - toString(EthPhyType_t::DP83848), - toString(EthPhyType_t::KSZ8041), - toString(EthPhyType_t::KSZ8081), + toString(ESPEasy::net::EthPhyType_t::DP83848), + toString(ESPEasy::net::EthPhyType_t::KSZ8041), + toString(ESPEasy::net::EthPhyType_t::KSZ8081), # endif // if CONFIG_ETH_USE_ESP32_EMAC && FEATURE_ETHERNET #if ESP_IDF_VERSION_MAJOR >= 5 # if CONFIG_ETH_SPI_ETHERNET_DM9051 - toString(EthPhyType_t::DM9051), + toString(ESPEasy::net::EthPhyType_t::DM9051), # endif // if CONFIG_ETH_SPI_ETHERNET_DM9051 # if CONFIG_ETH_SPI_ETHERNET_W5500 - toString(EthPhyType_t::W5500), + toString(ESPEasy::net::EthPhyType_t::W5500), # endif // if CONFIG_ETH_SPI_ETHERNET_W5500 # if CONFIG_ETH_SPI_ETHERNET_KSZ8851SNL - toString(EthPhyType_t::KSZ8851), + toString(ESPEasy::net::EthPhyType_t::KSZ8851), # endif // if CONFIG_ETH_SPI_ETHERNET_KSZ8851SNL #endif }; const int ethPhyTypes_index[] = { - static_cast(EthPhyType_t::notSet), + static_cast(ESPEasy::net::EthPhyType_t::notSet), # if CONFIG_ETH_USE_ESP32_EMAC && FEATURE_ETHERNET - static_cast(EthPhyType_t::LAN8720), - static_cast(EthPhyType_t::TLK110), - static_cast(EthPhyType_t::RTL8201), + static_cast(ESPEasy::net::EthPhyType_t::LAN8720), + static_cast(ESPEasy::net::EthPhyType_t::TLK110), + static_cast(ESPEasy::net::EthPhyType_t::RTL8201), #if ETH_TYPE_JL1101_SUPPORTED - static_cast(EthPhyType_t::JL1101), + static_cast(ESPEasy::net::EthPhyType_t::JL1101), #endif - static_cast(EthPhyType_t::DP83848), - static_cast(EthPhyType_t::KSZ8041), - static_cast(EthPhyType_t::KSZ8081), + static_cast(ESPEasy::net::EthPhyType_t::DP83848), + static_cast(ESPEasy::net::EthPhyType_t::KSZ8041), + static_cast(ESPEasy::net::EthPhyType_t::KSZ8081), # endif // if CONFIG_ETH_USE_ESP32_EMAC && FEATURE_ETHERNET #if ESP_IDF_VERSION_MAJOR >= 5 # if CONFIG_ETH_SPI_ETHERNET_DM9051 - static_cast(EthPhyType_t::DM9051), + static_cast(ESPEasy::net::EthPhyType_t::DM9051), # endif // if CONFIG_ETH_SPI_ETHERNET_DM9051 # if CONFIG_ETH_SPI_ETHERNET_W5500 - static_cast(EthPhyType_t::W5500), + static_cast(ESPEasy::net::EthPhyType_t::W5500), # endif // if CONFIG_ETH_SPI_ETHERNET_W5500 # if CONFIG_ETH_SPI_ETHERNET_KSZ8851SNL - static_cast(EthPhyType_t::KSZ8851), + static_cast(ESPEasy::net::EthPhyType_t::KSZ8851), # endif // if CONFIG_ETH_SPI_ETHERNET_KSZ8851SNL #endif }; @@ -404,7 +404,7 @@ void handle_hardware() { const int choice = isValid(Settings.ETH_Phy_Type) ? static_cast(Settings.ETH_Phy_Type) - : static_cast(EthPhyType_t::notSet); + : static_cast(ESPEasy::net::EthPhyType_t::notSet); const FormSelectorOptions selector( nrItems, @@ -449,10 +449,10 @@ void handle_hardware() { addRowLabel_tr_id(F("Ethernet Clock"), F("ethclock")); { const __FlashStringHelper * ethClockOptions[] = { - toString(EthClockMode_t::Ext_crystal_osc), - toString(EthClockMode_t::Int_50MHz_GPIO_0), - toString(EthClockMode_t::Int_50MHz_GPIO_16), - toString(EthClockMode_t::Int_50MHz_GPIO_17_inv) + toString(ESPEasy::net::EthClockMode_t::Ext_crystal_osc), + toString(ESPEasy::net::EthClockMode_t::Int_50MHz_GPIO_0), + toString(ESPEasy::net::EthClockMode_t::Int_50MHz_GPIO_16), + toString(ESPEasy::net::EthClockMode_t::Int_50MHz_GPIO_17_inv) }; const FormSelectorOptions selector(NR_ELEMENTS(ethClockOptions), ethClockOptions); selector.addSelector(F("ethclock"), static_cast(Settings.ETH_Clock_Mode)); From 76b31ef091b1f754e8f1580f4f65a29bf02ffc98 Mon Sep 17 00:00:00 2001 From: TD-er Date: Sun, 27 Jul 2025 20:32:25 +0200 Subject: [PATCH 152/564] [Network] Move MetworkMedium to new ESPEasy::net:: namespace --- src/ESPEasy/net/DataTypes/NetworkMedium.cpp | 41 +++++++++++++++++++ src/ESPEasy/net/DataTypes/NetworkMedium.h | 25 +++++++++++ src/ESPEasy/net/Globals/NWPlugins.cpp | 2 +- src/ESPEasy/net/Globals/NetworkState.cpp | 2 +- src/ESPEasy/net/Globals/NetworkState.h | 2 +- .../net/Helpers/tcp_cleanup_ESP8266.cpp} | 2 +- .../net/Helpers/tcp_cleanup_ESP8266.h} | 9 +--- .../net/wifi/ESPEasyWiFi_state_machine.cpp | 2 +- src/src/Commands/Networks.cpp | 4 +- src/src/CustomBuild/ESPEasyDefaults.h | 7 ++-- .../FactoryDefault_Network_NVS.cpp | 2 +- .../DataStructs/GpioFactorySettingsStruct.cpp | 10 ++--- .../DataStructs/GpioFactorySettingsStruct.h | 4 +- src/src/DataStructs/NodesHandler.cpp | 4 +- src/src/DataStructs/SettingsStruct.h | 5 ++- src/src/DataStructs/Web_StreamingBuffer.cpp | 2 +- src/src/DataStructs_templ/SettingsStruct.cpp | 4 +- src/src/DataTypes/NetworkMedium.cpp | 33 --------------- src/src/ESPEasyCore/ESPEasy_setup.cpp | 6 +-- src/src/Helpers/ESPEasy_Storage.cpp | 2 +- src/src/Helpers/Hardware.cpp | 2 +- src/src/Helpers/Hardware_GPIO_ESP32.cpp | 2 +- src/src/Helpers/Networking.cpp | 4 +- src/src/Helpers/PeriodicalActions.cpp | 2 +- src/src/Helpers/StringProvider.cpp | 4 +- src/src/WebServer/HardwarePage.cpp | 6 +-- src/src/WebServer/NetworkPage.cpp | 2 +- src/src/WebServer/RootPage.cpp | 2 +- src/src/WebServer/SetupPage.cpp | 2 +- src/src/WebServer/SysInfoPage.cpp | 4 +- 30 files changed, 114 insertions(+), 84 deletions(-) create mode 100644 src/ESPEasy/net/DataTypes/NetworkMedium.cpp create mode 100644 src/ESPEasy/net/DataTypes/NetworkMedium.h rename src/{src/DataStructs/tcp_cleanup.cpp => ESPEasy/net/Helpers/tcp_cleanup_ESP8266.cpp} (84%) rename src/{src/DataStructs/tcp_cleanup.h => ESPEasy/net/Helpers/tcp_cleanup_ESP8266.h} (78%) delete mode 100644 src/src/DataTypes/NetworkMedium.cpp diff --git a/src/ESPEasy/net/DataTypes/NetworkMedium.cpp b/src/ESPEasy/net/DataTypes/NetworkMedium.cpp new file mode 100644 index 000000000..85b55bf61 --- /dev/null +++ b/src/ESPEasy/net/DataTypes/NetworkMedium.cpp @@ -0,0 +1,41 @@ + +#include "../DataTypes/NetworkMedium.h" + +namespace ESPEasy { +namespace net { + +bool isValid(ESPEasy::net::NetworkMedium_t medium) { + switch (medium) + { + case ESPEasy::net::NetworkMedium_t::WIFI: + case ESPEasy::net::NetworkMedium_t::Ethernet: +#ifdef USES_ESPEASY_NOW + case ESPEasy::net::NetworkMedium_t::ESPEasyNOW_only: +#endif + return true; + + case ESPEasy::net::NetworkMedium_t::NotSet: + return false; + + // Do not use default: as this allows the compiler to detect any missing cases. + } + return false; +} + +const __FlashStringHelper* toString(ESPEasy::net::NetworkMedium_t medium) { + switch (medium) + { + case ESPEasy::net::NetworkMedium_t::WIFI: return F("WiFi"); + case ESPEasy::net::NetworkMedium_t::Ethernet: return F("Ethernet"); +#ifdef USES_ESPEASY_NOW + case ESPEasy::net::NetworkMedium_t::ESPEasyNOW_only: return F(ESPEASY_NOW_NAME " only"); +#endif + case ESPEasy::net::NetworkMedium_t::NotSet: return F("Not Set"); + + // Do not use default: as this allows the compiler to detect any missing cases. + } + return F("Unknown"); +} + +} // namespace net +} // namespace ESPEasy diff --git a/src/ESPEasy/net/DataTypes/NetworkMedium.h b/src/ESPEasy/net/DataTypes/NetworkMedium.h new file mode 100644 index 000000000..704cfe569 --- /dev/null +++ b/src/ESPEasy/net/DataTypes/NetworkMedium.h @@ -0,0 +1,25 @@ +#pragma once + +#include "../../../ESPEasy_common.h" + +namespace ESPEasy { +namespace net { + + +// Is stored in settings +enum class NetworkMedium_t : uint8_t { + WIFI = 0, + Ethernet = 1, +#ifdef USES_ESPEASY_NOW + ESPEasyNOW_only = 2, +#endif + NotSet = 255 + +}; + +bool isValid(NetworkMedium_t medium); + +const __FlashStringHelper* toString(NetworkMedium_t medium); + +} // namespace net +} // namespace ESPEasy diff --git a/src/ESPEasy/net/Globals/NWPlugins.cpp b/src/ESPEasy/net/Globals/NWPlugins.cpp index 81f3e473c..ea3cc9727 100644 --- a/src/ESPEasy/net/Globals/NWPlugins.cpp +++ b/src/ESPEasy/net/Globals/NWPlugins.cpp @@ -78,7 +78,7 @@ bool NWPluginCall(NWPlugin::Function Function, EventStruct *event, String& str) } } } - break; + return success; } // calls to specific network diff --git a/src/ESPEasy/net/Globals/NetworkState.cpp b/src/ESPEasy/net/Globals/NetworkState.cpp index 67b88c136..a5de5ae28 100644 --- a/src/ESPEasy/net/Globals/NetworkState.cpp +++ b/src/ESPEasy/net/Globals/NetworkState.cpp @@ -4,7 +4,7 @@ // Ethernet Connection status -NetworkMedium_t active_network_medium = NetworkMedium_t::NotSet; +ESPEasy::net::NetworkMedium_t active_network_medium = ESPEasy::net::NetworkMedium_t::NotSet; bool webserverRunning(false); bool webserver_init(false); diff --git a/src/ESPEasy/net/Globals/NetworkState.h b/src/ESPEasy/net/Globals/NetworkState.h index 1ce17b29e..0c1b750a7 100644 --- a/src/ESPEasy/net/Globals/NetworkState.h +++ b/src/ESPEasy/net/Globals/NetworkState.h @@ -9,7 +9,7 @@ #include "../../../src/DataTypes/NetworkMedium.h" // Ethernet Connectiopn status -extern NetworkMedium_t active_network_medium; +extern ESPEasy::net::NetworkMedium_t active_network_medium; extern bool webserverRunning; extern bool webserver_init; diff --git a/src/src/DataStructs/tcp_cleanup.cpp b/src/ESPEasy/net/Helpers/tcp_cleanup_ESP8266.cpp similarity index 84% rename from src/src/DataStructs/tcp_cleanup.cpp rename to src/ESPEasy/net/Helpers/tcp_cleanup_ESP8266.cpp index 2f5a85d17..235d1cf2f 100644 --- a/src/src/DataStructs/tcp_cleanup.cpp +++ b/src/ESPEasy/net/Helpers/tcp_cleanup_ESP8266.cpp @@ -1,4 +1,4 @@ -#include "../DataStructs/tcp_cleanup.h" +#include "../Helpers/tcp_cleanup_ESP8266.h" diff --git a/src/src/DataStructs/tcp_cleanup.h b/src/ESPEasy/net/Helpers/tcp_cleanup_ESP8266.h similarity index 78% rename from src/src/DataStructs/tcp_cleanup.h rename to src/ESPEasy/net/Helpers/tcp_cleanup_ESP8266.h index a069e695b..8bfc99842 100644 --- a/src/src/DataStructs/tcp_cleanup.h +++ b/src/ESPEasy/net/Helpers/tcp_cleanup_ESP8266.h @@ -1,8 +1,7 @@ -#ifndef DATASTRUCTS_TCP_CLEANUP_H -#define DATASTRUCTS_TCP_CLEANUP_H +#pragma once -#include "../../ESPEasy_common.h" +#include "../../../ESPEasy_common.h" // clean up tcp connections that are in TIME_WAIT status, to conserve memory // In future versions of WiFiClient it should be possible to call abort(), but @@ -20,7 +19,3 @@ extern "C" void tcp_abort (struct tcp_pcb* pcb); void tcpCleanup(); #endif - - - -#endif // DATASTRUCTS_TCP_CLEANUP_H diff --git a/src/ESPEasy/net/wifi/ESPEasyWiFi_state_machine.cpp b/src/ESPEasy/net/wifi/ESPEasyWiFi_state_machine.cpp index 02ea17e1a..0bd5f6ade 100644 --- a/src/ESPEasy/net/wifi/ESPEasyWiFi_state_machine.cpp +++ b/src/ESPEasy/net/wifi/ESPEasyWiFi_state_machine.cpp @@ -356,9 +356,9 @@ bool ESPEasyWiFi_t::connectSTA() RTC.clearLastWiFi(); RTC.lastWiFiSettingsIndex = candidate.index; +# if FEATURE_SET_WIFI_TX_PWR float tx_pwr = 0; // Will be set higher based on RSSI when needed. // FIXME TD-er: Must check WiFiEventData.wifi_connect_attempt to increase TX power -# if FEATURE_SET_WIFI_TX_PWR if (Settings.UseMaxTXpowerForSending()) { tx_pwr = Settings.getWiFi_TX_power(); diff --git a/src/src/Commands/Networks.cpp b/src/src/Commands/Networks.cpp index 7f3d302fa..c26f0d614 100644 --- a/src/src/Commands/Networks.cpp +++ b/src/src/Commands/Networks.cpp @@ -127,7 +127,7 @@ String Command_ETH_DNS (struct EventStruct *event, const char* Line) String Command_ETH_Wifi_Mode (struct EventStruct *event, const char* Line) { - const NetworkMedium_t orig_medium = Settings.NetworkMedium; + const ESPEasy::net::NetworkMedium_t orig_medium = Settings.NetworkMedium; const String result = Command_GetORSetETH(event, F("NetworkMedium:"), toString(active_network_medium), @@ -151,7 +151,7 @@ String Command_ETH_Disconnect (struct EventStruct *event, const char* Line) ESPEasy::net::eth::ethPower(0); delay(400); // ethPower(1); - ESPEasy::net::setNetworkMedium(NetworkMedium_t::Ethernet); + ESPEasy::net::setNetworkMedium(ESPEasy::net::NetworkMedium_t::Ethernet); ESPEasy::net::eth::ETHConnectRelaxed(); return return_command_success(); diff --git a/src/src/CustomBuild/ESPEasyDefaults.h b/src/src/CustomBuild/ESPEasyDefaults.h index 690a1c3a0..a09c9160a 100644 --- a/src/src/CustomBuild/ESPEasyDefaults.h +++ b/src/src/CustomBuild/ESPEasyDefaults.h @@ -4,7 +4,8 @@ // Needed to make sure Custom.h is used. #include "../../ESPEasy_common.h" -#include "../DataTypes/NetworkMedium.h" +#include "../../ESPEasy/net/DataTypes/NetworkMedium.h" + #include "../Helpers/Hardware_defines.h" @@ -321,9 +322,9 @@ #endif #ifndef DEFAULT_NETWORK_MEDIUM #ifdef ESP32P4 - #define DEFAULT_NETWORK_MEDIUM NetworkMedium_t::Ethernet + #define DEFAULT_NETWORK_MEDIUM ESPEasy::net::NetworkMedium_t::Ethernet #else - #define DEFAULT_NETWORK_MEDIUM NetworkMedium_t::WIFI + #define DEFAULT_NETWORK_MEDIUM ESPEasy::net::NetworkMedium_t::WIFI #endif #endif #ifndef DEFAULT_JSON_BOOL_WITHOUT_QUOTES diff --git a/src/src/DataStructs/FactoryDefault_Network_NVS.cpp b/src/src/DataStructs/FactoryDefault_Network_NVS.cpp index 6f7f0d895..e93ea261b 100644 --- a/src/src/DataStructs/FactoryDefault_Network_NVS.cpp +++ b/src/src/DataStructs/FactoryDefault_Network_NVS.cpp @@ -46,7 +46,7 @@ bool FactoryDefault_Network_NVS::applyToSettings_from_NVS(ESPEasy_NVS_Helper& pr # if CONFIG_ETH_USE_ESP32_EMAC && FEATURE_ETHERNET Settings.ETH_Clock_Mode = static_cast(bits.ETH_Clock_Mode); #endif - Settings.NetworkMedium = static_cast(bits.NetworkMedium); + Settings.NetworkMedium = static_cast(bits.NetworkMedium); res = true; } # endif // ifdef FEATURE_ETHERNET diff --git a/src/src/DataStructs/GpioFactorySettingsStruct.cpp b/src/src/DataStructs/GpioFactorySettingsStruct.cpp index fcd42f864..c00ea9a6b 100644 --- a/src/src/DataStructs/GpioFactorySettingsStruct.cpp +++ b/src/src/DataStructs/GpioFactorySettingsStruct.cpp @@ -126,7 +126,7 @@ GpioFactorySettingsStruct::GpioFactorySettingsStruct(DeviceModel model) eth_mdio = 18; eth_power = 12; eth_clock_mode = ESPEasy::net::EthClockMode_t::Int_50MHz_GPIO_17_inv; - network_medium = NetworkMedium_t::Ethernet; + network_medium = ESPEasy::net::NetworkMedium_t::Ethernet; break; case DeviceModel::DeviceModel_Olimex_ESP32_EVB: button[0] = 34; // BUT1 Button @@ -142,7 +142,7 @@ GpioFactorySettingsStruct::GpioFactorySettingsStruct(DeviceModel model) eth_mdio = 18; eth_power = -1; // No Ethernet power pin eth_clock_mode = ESPEasy::net::EthClockMode_t::Ext_crystal_osc; - network_medium = NetworkMedium_t::Ethernet; + network_medium = ESPEasy::net::NetworkMedium_t::Ethernet; break; case DeviceModel::DeviceModel_Olimex_ESP32_GATEWAY: @@ -157,7 +157,7 @@ GpioFactorySettingsStruct::GpioFactorySettingsStruct(DeviceModel model) eth_mdio = 18; eth_power = 5; eth_clock_mode = ESPEasy::net::EthClockMode_t::Int_50MHz_GPIO_17_inv; - network_medium = NetworkMedium_t::Ethernet; + network_medium = ESPEasy::net::NetworkMedium_t::Ethernet; // Rev A to E: // GPIO 5, 17 can be used only if Ethernet functionality is not used @@ -190,7 +190,7 @@ GpioFactorySettingsStruct::GpioFactorySettingsStruct(DeviceModel model) eth_mdio = 17; eth_power = -1; eth_clock_mode = ESPEasy::net::EthClockMode_t::Ext_crystal_osc; - network_medium = NetworkMedium_t::Ethernet; + network_medium = ESPEasy::net::NetworkMedium_t::Ethernet; break; case DeviceModel::DeviceModel_WT32_ETH01: @@ -203,7 +203,7 @@ GpioFactorySettingsStruct::GpioFactorySettingsStruct(DeviceModel model) eth_mdio = 18; eth_power = 12; // TODO TD-er: Better to use GPIO-16? as shown here: https://letscontrolit.com/forum/viewtopic.php?p=50133#p50133 eth_clock_mode = ESPEasy::net::EthClockMode_t::Ext_crystal_osc; - network_medium = NetworkMedium_t::Ethernet; + network_medium = ESPEasy::net::NetworkMedium_t::Ethernet; break; # else // if CONFIG_IDF_TARGET_ESP32 default: break; diff --git a/src/src/DataStructs/GpioFactorySettingsStruct.h b/src/src/DataStructs/GpioFactorySettingsStruct.h index 783ac9a14..c4a7c9c04 100644 --- a/src/src/DataStructs/GpioFactorySettingsStruct.h +++ b/src/src/DataStructs/GpioFactorySettingsStruct.h @@ -2,7 +2,7 @@ #define DATASTRUCTS_GPIOFACTORYSETTINGSSTRUCT_H #include "../DataTypes/DeviceModel.h" -#include "../DataTypes/NetworkMedium.h" +#include "../../ESPEasy/net/DataTypes/NetworkMedium.h" #if FEATURE_ETHERNET #include "../../ESPEasy/net/DataTypes/EthernetParameters.h" #endif @@ -29,7 +29,7 @@ struct GpioFactorySettingsStruct { #else uint8_t eth_clock_mode{}; #endif - NetworkMedium_t network_medium; + ESPEasy::net::NetworkMedium_t network_medium; }; diff --git a/src/src/DataStructs/NodesHandler.cpp b/src/src/DataStructs/NodesHandler.cpp index e955da7ae..4b5e1be98 100644 --- a/src/src/DataStructs/NodesHandler.cpp +++ b/src/src/DataStructs/NodesHandler.cpp @@ -625,14 +625,14 @@ bool NodesHandler::isEndpoint() const #ifdef USES_ESPEASY_NOW uint8_t NodesHandler::getESPEasyNOW_channel() const { - if (active_network_medium == NetworkMedium_t::WIFI && ESPEasy::net::NetworkConnected()) { + if (active_network_medium == ESPEasy::net::NetworkMedium_t::WIFI && ESPEasy::net::NetworkConnected()) { return WiFi.channel(); } if (Settings.ForceESPEasyNOWchannel > 0) { return Settings.ForceESPEasyNOWchannel; } if (isEndpoint()) { - if (active_network_medium == NetworkMedium_t::WIFI) { + if (active_network_medium == ESPEasy::net::NetworkMedium_t::WIFI) { return WiFi.channel(); } } diff --git a/src/src/DataStructs/SettingsStruct.h b/src/src/DataStructs/SettingsStruct.h index a79bc4b55..749477571 100644 --- a/src/src/DataStructs/SettingsStruct.h +++ b/src/src/DataStructs/SettingsStruct.h @@ -8,7 +8,6 @@ #include "../DataStructs/ChecksumType.h" #include "../DataStructs/DeviceStruct.h" #include "../DataTypes/ControllerIndex.h" -#include "../DataTypes/NetworkMedium.h" #include "../ESPEasy/net/DataTypes/NWPluginID.h" #include "../ESPEasy/net/DataTypes/NetworkIndex.h" #include "../DataTypes/NPluginID.h" @@ -18,6 +17,8 @@ #include "../Globals/Plugins.h" #include "../ESPEasy/net/Globals/NWPlugins.h" +#include "../../ESPEasy/net/DataTypes/NetworkMedium.h" + #if FEATURE_ETHERNET #include "../../ESPEasy/net/DataTypes/EthernetParameters.h" #endif @@ -596,7 +597,7 @@ public: uint8_t ETH_Gateway[4] = {0}; uint8_t ETH_Subnet[4] = {0}; uint8_t ETH_DNS[4] = {0}; - NetworkMedium_t NetworkMedium = NetworkMedium_t::WIFI; + ESPEasy::net::NetworkMedium_t NetworkMedium = ESPEasy::net::NetworkMedium_t::WIFI; int8_t I2C_Multiplexer_Type = I2C_MULTIPLEXER_NONE; int8_t I2C_Multiplexer_Addr = -1; int8_t I2C_Multiplexer_Channel[N_TASKS]{}; diff --git a/src/src/DataStructs/Web_StreamingBuffer.cpp b/src/src/DataStructs/Web_StreamingBuffer.cpp index baa5a2708..83f54732e 100644 --- a/src/src/DataStructs/Web_StreamingBuffer.cpp +++ b/src/src/DataStructs/Web_StreamingBuffer.cpp @@ -1,9 +1,9 @@ #include "../DataStructs/Web_StreamingBuffer.h" -#include "../DataStructs/tcp_cleanup.h" #include "../DataTypes/ESPEasyTimeSource.h" #include "../ESPEasyCore/ESPEasy_Log.h" #include "../../ESPEasy/net/ESPEasyNetwork.h" +#include "../../ESPEasy/net/Helpers/tcp_cleanup_ESP8266.h" // FIXME TD-er: Should keep a pointer to the webserver as a member, not use the global defined one. #include "../Globals/Services.h" diff --git a/src/src/DataStructs_templ/SettingsStruct.cpp b/src/src/DataStructs_templ/SettingsStruct.cpp index 877516c28..e563c500b 100644 --- a/src/src/DataStructs_templ/SettingsStruct.cpp +++ b/src/src/DataStructs_templ/SettingsStruct.cpp @@ -1228,7 +1228,7 @@ template bool SettingsStruct_tmpl::isEthernetPin(int8_t pin) const { #if FEATURE_ETHERNET if (pin < 0) return false; - if (NetworkMedium == NetworkMedium_t::Ethernet && + if (NetworkMedium == ESPEasy::net::NetworkMedium_t::Ethernet && !ESPEasy::net::isSPI_EthernetType(ETH_Phy_Type)) { #if CONFIG_ETH_USE_ESP32_EMAC && FEATURE_ETHERNET #ifdef ESP32P4 @@ -1265,7 +1265,7 @@ template bool SettingsStruct_tmpl::isEthernetPinOptional(int8_t pin) const { #if FEATURE_ETHERNET if (pin < 0) return false; - if (NetworkMedium == NetworkMedium_t::Ethernet) { + if (NetworkMedium == ESPEasy::net::NetworkMedium_t::Ethernet) { if (!ESPEasy::net::isSPI_EthernetType(ETH_Phy_Type) # if CONFIG_ETH_USE_ESP32_EMAC && FEATURE_ETHERNET && ESPEasy::net::isGpioUsedInETHClockMode(ETH_Clock_Mode, pin) diff --git a/src/src/DataTypes/NetworkMedium.cpp b/src/src/DataTypes/NetworkMedium.cpp deleted file mode 100644 index b66d210e7..000000000 --- a/src/src/DataTypes/NetworkMedium.cpp +++ /dev/null @@ -1,33 +0,0 @@ - -#include "../DataTypes/NetworkMedium.h" - -bool isValid(NetworkMedium_t medium) { - switch (medium) { - case NetworkMedium_t::WIFI: - case NetworkMedium_t::Ethernet: -#ifdef USES_ESPEASY_NOW - case NetworkMedium_t::ESPEasyNOW_only: -#endif - return true; - - case NetworkMedium_t::NotSet: - return false; - - // Do not use default: as this allows the compiler to detect any missing cases. - } - return false; -} - -const __FlashStringHelper * toString(NetworkMedium_t medium) { - switch (medium) { - case NetworkMedium_t::WIFI: return F("WiFi"); - case NetworkMedium_t::Ethernet: return F("Ethernet"); -#ifdef USES_ESPEASY_NOW - case NetworkMedium_t::ESPEasyNOW_only: return F(ESPEASY_NOW_NAME " only"); -#endif - case NetworkMedium_t::NotSet: return F("Not Set"); - - // Do not use default: as this allows the compiler to detect any missing cases. - } - return F("Unknown"); -} \ No newline at end of file diff --git a/src/src/ESPEasyCore/ESPEasy_setup.cpp b/src/src/ESPEasyCore/ESPEasy_setup.cpp index d27d14acc..28cbf86f6 100644 --- a/src/src/ESPEasyCore/ESPEasy_setup.cpp +++ b/src/src/ESPEasyCore/ESPEasy_setup.cpp @@ -444,14 +444,14 @@ void ESPEasy_setup() active_network_medium = Settings.NetworkMedium; #else // if FEATURE_ETHERNET - if (Settings.NetworkMedium == NetworkMedium_t::Ethernet) { - Settings.NetworkMedium = NetworkMedium_t::WIFI; + if (Settings.NetworkMedium == ESPEasy::net::NetworkMedium_t::Ethernet) { + Settings.NetworkMedium = ESPEasy::net::NetworkMedium_t::WIFI; } #endif // if FEATURE_ETHERNET ESPEasy::net::setNetworkMedium(Settings.NetworkMedium); - bool initWiFi = active_network_medium == NetworkMedium_t::WIFI; + bool initWiFi = active_network_medium == ESPEasy::net::NetworkMedium_t::WIFI; // FIXME TD-er: Must add another check for 'delayed start WiFi' for poorly designed ESP8266 nodes. diff --git a/src/src/Helpers/ESPEasy_Storage.cpp b/src/src/Helpers/ESPEasy_Storage.cpp index 556027f69..f77ac9746 100644 --- a/src/src/Helpers/ESPEasy_Storage.cpp +++ b/src/src/Helpers/ESPEasy_Storage.cpp @@ -862,7 +862,7 @@ String SaveSecuritySettings(bool forFactoryReset) { // Security settings are saved, may be update of WiFi settings or hostname. if (!forFactoryReset) { - if (SecuritySettings.hasWiFiCredentials() && (active_network_medium == NetworkMedium_t::WIFI)) { + if (SecuritySettings.hasWiFiCredentials() && (active_network_medium == ESPEasy::net::NetworkMedium_t::WIFI)) { WiFi_AP_Candidates.force_reload(); // Force reload of the credentials and found APs from the last scan if (!ESPEasy::net::NetworkConnected()) { WiFiEventData.wifiConnectAttemptNeeded = true; diff --git a/src/src/Helpers/Hardware.cpp b/src/src/Helpers/Hardware.cpp index 26244dffb..41fdb3736 100644 --- a/src/src/Helpers/Hardware.cpp +++ b/src/src/Helpers/Hardware.cpp @@ -212,7 +212,7 @@ void hardwareInit() bool tryInitSPI = true; #if FEATURE_ETHERNET - if ((Settings.NetworkMedium == NetworkMedium_t::Ethernet) && + if ((Settings.NetworkMedium == ESPEasy::net::NetworkMedium_t::Ethernet) && isValid(Settings.ETH_Phy_Type) && ESPEasy::net::isSPI_EthernetType(Settings.ETH_Phy_Type)) { diff --git a/src/src/Helpers/Hardware_GPIO_ESP32.cpp b/src/src/Helpers/Hardware_GPIO_ESP32.cpp index 1a130f49c..809d10e36 100644 --- a/src/src/Helpers/Hardware_GPIO_ESP32.cpp +++ b/src/src/Helpers/Hardware_GPIO_ESP32.cpp @@ -48,7 +48,7 @@ bool getGpioInfo(int gpio, int& pinnr, bool& input, bool& output, bool& warning) # if FEATURE_ETHERNET // Check pins used for RMII Ethernet PHY - if (NetworkMedium_t::Ethernet == Settings.NetworkMedium) { + if (ESPEasy::net::NetworkMedium_t::Ethernet == Settings.NetworkMedium) { switch (gpio) { case 0: case 21: diff --git a/src/src/Helpers/Networking.cpp b/src/src/Helpers/Networking.cpp index 2960533b6..57c637f81 100644 --- a/src/src/Helpers/Networking.cpp +++ b/src/src/Helpers/Networking.cpp @@ -1039,7 +1039,7 @@ bool hasIPaddr() { bool useStaticIP() { #if FEATURE_ETHERNET - if (active_network_medium == NetworkMedium_t::Ethernet) { + if (active_network_medium == ESPEasy::net::NetworkMedium_t::Ethernet) { return ESPEasy::net::eth::ethUseStaticIP(); } #endif // if FEATURE_ETHERNET @@ -1179,7 +1179,7 @@ bool connectClient(WiFiClient& client, IPAddress ip, uint16_t port, uint32_t tim void scrubDNS() { #if FEATURE_ETHERNET - if (active_network_medium == NetworkMedium_t::Ethernet) { + if (active_network_medium == ESPEasy::net::NetworkMedium_t::Ethernet) { if (EthEventData.EthServicesInitialized()) { setDNS(0, EthEventData.dns0_cache); setDNS(1, EthEventData.dns1_cache); diff --git a/src/src/Helpers/PeriodicalActions.cpp b/src/src/Helpers/PeriodicalActions.cpp index 72910384f..b6c217400 100644 --- a/src/src/Helpers/PeriodicalActions.cpp +++ b/src/src/Helpers/PeriodicalActions.cpp @@ -227,7 +227,7 @@ void runEach30Seconds() FreeMem()); bool logWiFiStatus = true; #if FEATURE_ETHERNET - if(active_network_medium == NetworkMedium_t::Ethernet) { + if(active_network_medium == ESPEasy::net::NetworkMedium_t::Ethernet) { logWiFiStatus = false; log += F( " EthSpeedState "); log += getValue(LabelType::ETH_SPEED_STATE); diff --git a/src/src/Helpers/StringProvider.cpp b/src/src/Helpers/StringProvider.cpp index c954099ea..3808bc005 100644 --- a/src/src/Helpers/StringProvider.cpp +++ b/src/src/Helpers/StringProvider.cpp @@ -514,7 +514,7 @@ String getValue(LabelType::Enum label) { #endif case LabelType::CONNECTED: #if FEATURE_ETHERNET - if(active_network_medium == NetworkMedium_t::Ethernet) { + if(active_network_medium == ESPEasy::net::NetworkMedium_t::Ethernet) { return format_msec_duration(EthEventData.lastConnectMoment.millisPassedSince()); } #endif // if FEATURE_ETHERNET @@ -523,7 +523,7 @@ String getValue(LabelType::Enum label) { // Use only the nr of seconds to fit it in an int32, plus append '000' to have msec format again. case LabelType::CONNECTED_MSEC: #if FEATURE_ETHERNET - if(active_network_medium == NetworkMedium_t::Ethernet) { + if(active_network_medium == ESPEasy::net::NetworkMedium_t::Ethernet) { return String(static_cast(EthEventData.lastConnectMoment.millisPassedSince() / 1000ll)) + F("000"); } #endif // if FEATURE_ETHERNET diff --git a/src/src/WebServer/HardwarePage.cpp b/src/src/WebServer/HardwarePage.cpp index 80efda16d..57d9248d0 100644 --- a/src/src/WebServer/HardwarePage.cpp +++ b/src/src/WebServer/HardwarePage.cpp @@ -131,7 +131,7 @@ void handle_hardware() { #if CONFIG_ETH_USE_ESP32_EMAC && FEATURE_ETHERNET Settings.ETH_Clock_Mode = static_cast(getFormItemInt(F("ethclock"))); #endif - Settings.NetworkMedium = static_cast(getFormItemInt(F("ethwifi"))); + Settings.NetworkMedium = static_cast(getFormItemInt(F("ethwifi"))); #endif // if FEATURE_ETHERNET #endif int gpio = 0; @@ -336,8 +336,8 @@ void handle_hardware() { addRowLabel_tr_id(F("Preferred network medium"), F("ethwifi")); { const __FlashStringHelper * ethWifiOptions[2] = { - toString(NetworkMedium_t::WIFI), - toString(NetworkMedium_t::Ethernet) + toString(ESPEasy::net::NetworkMedium_t::WIFI), + toString(ESPEasy::net::NetworkMedium_t::Ethernet) }; const FormSelectorOptions selector(2, ethWifiOptions); selector.addSelector(F("ethwifi"), static_cast(Settings.NetworkMedium)); diff --git a/src/src/WebServer/NetworkPage.cpp b/src/src/WebServer/NetworkPage.cpp index 8c1ce6b6a..75cbef9ad 100644 --- a/src/src/WebServer/NetworkPage.cpp +++ b/src/src/WebServer/NetworkPage.cpp @@ -227,7 +227,7 @@ void handle_networks_ShowAllNetworksTable() NWPlugin::Function::NWPLUGIN_WEBFORM_SHOW_PORT }; - const networkDriverIndex_t NetworkDriverIndex = getNetworkDriverIndex_from_NetworkIndex(x); +// const networkDriverIndex_t NetworkDriverIndex = getNetworkDriverIndex_from_NetworkIndex(x); for (uint8_t i = 0; i < NR_ELEMENTS(functions); ++i) { html_TD(); diff --git a/src/src/WebServer/RootPage.cpp b/src/src/WebServer/RootPage.cpp index 6eb5ed4f2..1e2218388 100644 --- a/src/src/WebServer/RootPage.cpp +++ b/src/src/WebServer/RootPage.cpp @@ -223,7 +223,7 @@ void handle_root() { # if FEATURE_ETHERNET - if (active_network_medium == NetworkMedium_t::Ethernet) { + if (active_network_medium == ESPEasy::net::NetworkMedium_t::Ethernet) { addRowLabelValue(LabelType::ETH_SPEED_STATE); addRowLabelValue(LabelType::ETH_IP_ADDRESS); #if FEATURE_USE_IPV6 diff --git a/src/src/WebServer/SetupPage.cpp b/src/src/WebServer/SetupPage.cpp index 192c9ff8f..959af6f03 100644 --- a/src/src/WebServer/SetupPage.cpp +++ b/src/src/WebServer/SetupPage.cpp @@ -76,7 +76,7 @@ void handle_setup() { addFormHeader(F("WiFi credentials cleared, reboot now")); html_end_table(); } else { - // if (active_network_medium == NetworkMedium_t::WIFI) + // if (active_network_medium == ESPEasy::net::NetworkMedium_t::WIFI) // { static uint8_t status = HANDLE_SETUP_SCAN_STAGE; static uint8_t refreshCount = 0; diff --git a/src/src/WebServer/SysInfoPage.cpp b/src/src/WebServer/SysInfoPage.cpp index 1d35d6f04..69cd0ea0f 100644 --- a/src/src/WebServer/SysInfoPage.cpp +++ b/src/src/WebServer/SysInfoPage.cpp @@ -430,7 +430,7 @@ void handle_sysinfo_memory() { # if FEATURE_ETHERNET void handle_sysinfo_Ethernet() { - if (active_network_medium == NetworkMedium_t::Ethernet) { + if (active_network_medium == ESPEasy::net::NetworkMedium_t::Ethernet) { addTableSeparator(F("Ethernet"), 2, 3); static const LabelType::Enum labels[] PROGMEM = @@ -530,7 +530,7 @@ void handle_sysinfo_Network() { addHtml(getValue(LabelType::ENCRYPTION_TYPE_STA)); } else addHtml('-'); - if (active_network_medium == NetworkMedium_t::WIFI) + if (active_network_medium == ESPEasy::net::NetworkMedium_t::WIFI) { addRowLabel(LabelType::LAST_DISCONNECT_REASON); addHtml(getValue(LabelType::LAST_DISC_REASON_STR)); From 75ed59b299b80919a7c701bb64b0a531b431d344 Mon Sep 17 00:00:00 2001 From: TD-er Date: Sun, 27 Jul 2025 20:57:07 +0200 Subject: [PATCH 153/564] [Network] Move WiFiAPcandidates files to ESPEasy::net::wifi namespace --- src/ESPEasy/net/DataStructs/WiFiEventData.cpp | 4 +- .../net}/DataStructs/WiFi_AP_Candidate.cpp | 165 ++++++++------ .../net}/DataStructs/WiFi_AP_Candidate.h | 41 ++-- .../DataStructs/WiFi_AP_Candidates_NVS.cpp | 22 +- .../net/DataStructs/WiFi_AP_Candidates_NVS.h | 32 +++ .../net/Globals/WiFi_AP_Candidates.cpp | 16 ++ src/ESPEasy/net/Globals/WiFi_AP_Candidates.h | 18 ++ .../net}/Helpers/WiFi_AP_CandidatesList.cpp | 203 +++++++++++------- .../net}/Helpers/WiFi_AP_CandidatesList.h | 69 +++--- .../net/wifi/ESPEasyWiFiEvent_ESP32.cpp | 2 +- .../net/wifi/ESPEasyWiFiEvent_ESP8266.cpp | 2 +- .../net/wifi/ESPEasyWiFi_state_machine.cpp | 4 +- .../net/wifi/ESPEasyWiFi_state_machine.h | 2 +- src/ESPEasy/net/wifi/ESPEasyWifi.cpp | 2 +- src/ESPEasy/net/wifi/ESPEasyWifi.h | 2 +- .../net/wifi/ESPEasyWifi_ProcessEvent.cpp | 2 +- .../net/wifi/ESPEasyWifi_abstracted.cpp | 2 +- .../net/wifi/ESPEasyWifi_abstracted_ESP32.cpp | 2 +- .../wifi/ESPEasyWifi_abstracted_ESP8266.cpp | 2 +- src/src/DataStructs/Caches.cpp | 5 +- src/src/DataStructs/WiFi_AP_Candidates_NVS.h | 20 -- src/src/ESPEasyCore/ESPEasy_setup.cpp | 16 +- src/src/Globals/WiFi_AP_Candidates.cpp | 3 - src/src/Globals/WiFi_AP_Candidates.h | 10 - src/src/Helpers/ESPEasy_Storage.cpp | 4 +- src/src/Helpers/PeriodicalActions.cpp | 4 +- src/src/Helpers/StringProvider.cpp | 4 +- src/src/WebServer/SetupPage.cpp | 12 +- src/src/WebServer/WiFiScanner.cpp | 10 +- 29 files changed, 413 insertions(+), 267 deletions(-) rename src/{src => ESPEasy/net}/DataStructs/WiFi_AP_Candidate.cpp (72%) rename src/{src => ESPEasy/net}/DataStructs/WiFi_AP_Candidate.h (82%) rename src/{src => ESPEasy/net}/DataStructs/WiFi_AP_Candidates_NVS.cpp (84%) create mode 100644 src/ESPEasy/net/DataStructs/WiFi_AP_Candidates_NVS.h create mode 100644 src/ESPEasy/net/Globals/WiFi_AP_Candidates.cpp create mode 100644 src/ESPEasy/net/Globals/WiFi_AP_Candidates.h rename src/{src => ESPEasy/net}/Helpers/WiFi_AP_CandidatesList.cpp (76%) rename src/{src => ESPEasy/net}/Helpers/WiFi_AP_CandidatesList.h (62%) delete mode 100644 src/src/DataStructs/WiFi_AP_Candidates_NVS.h delete mode 100644 src/src/Globals/WiFi_AP_Candidates.cpp delete mode 100644 src/src/Globals/WiFi_AP_Candidates.h diff --git a/src/ESPEasy/net/DataStructs/WiFiEventData.cpp b/src/ESPEasy/net/DataStructs/WiFiEventData.cpp index 29b27dd50..a7d4b695c 100644 --- a/src/ESPEasy/net/DataStructs/WiFiEventData.cpp +++ b/src/ESPEasy/net/DataStructs/WiFiEventData.cpp @@ -6,7 +6,7 @@ # include "../../../src/Globals/RTC.h" # include "../../../src/Globals/Settings.h" -# include "../../../src/Globals/WiFi_AP_Candidates.h" +# include "../Globals/WiFi_AP_Candidates.h" # include "../../../src/Helpers/ESPEasy_Storage.h" # include "../../../src/Helpers/Networking.h" @@ -283,7 +283,7 @@ void WiFiEventData_t::markConnected(const String& ssid, const uint8_t bssid[6], channel_changed = RTC.lastWiFiChannel != channel; last_ssid = ssid; bssid_changed = false; - auth_mode = WiFi_AP_Candidates.getCurrent().enc_type; + auth_mode = ESPEasy::net::wifi::WiFi_AP_Candidates.getCurrent().enc_type; RTC.lastWiFiChannel = channel; diff --git a/src/src/DataStructs/WiFi_AP_Candidate.cpp b/src/ESPEasy/net/DataStructs/WiFi_AP_Candidate.cpp similarity index 72% rename from src/src/DataStructs/WiFi_AP_Candidate.cpp rename to src/ESPEasy/net/DataStructs/WiFi_AP_Candidate.cpp index c49572df3..f5c748549 100644 --- a/src/src/DataStructs/WiFi_AP_Candidate.cpp +++ b/src/ESPEasy/net/DataStructs/WiFi_AP_Candidate.cpp @@ -1,13 +1,14 @@ #include "../DataStructs/WiFi_AP_Candidate.h" -#include "../../ESPEasy/net/Globals/ESPEasyWiFiEvent.h" -#include "../Globals/SecuritySettings.h" -#include "../Globals/Statistics.h" -#include "../Helpers/ESPEasy_time_calc.h" -#include "../Helpers/Misc.h" -#include "../Helpers/StringConverter.h" -#include "../Helpers/StringGenerator_WiFi.h" -#include "../../ESPEasy_common.h" +#include "../../../ESPEasy_common.h" + +#include "../Globals/ESPEasyWiFiEvent.h" +#include "../../../src/Globals/SecuritySettings.h" +#include "../../../src/Globals/Statistics.h" +#include "../../../src/Helpers/ESPEasy_time_calc.h" +#include "../../../src/Helpers/Misc.h" +#include "../../../src/Helpers/StringConverter.h" +#include "../../../src/Helpers/StringGenerator_WiFi.h" #if defined(ESP8266) # include @@ -16,20 +17,28 @@ # include #endif // if defined(ESP32) -#define WIFI_AP_CANDIDATE_MAX_AGE 300000 // 5 minutes in msec + +#if FEATURE_WIFI + +namespace ESPEasy { +namespace net { +namespace wifi { + + +# define WIFI_AP_CANDIDATE_MAX_AGE 300000 // 5 minutes in msec WiFi_AP_Candidate::WiFi_AP_Candidate() : -#ifdef ESP32 -# if ESP_IDF_VERSION_MAJOR >= 5 +# ifdef ESP32 +# if ESP_IDF_VERSION_MAJOR >= 5 country({ - .cc = "01", - .schan = 1, - .nchan = 14, - .policy = WIFI_COUNTRY_POLICY_AUTO, -}), -# endif // if ESP_IDF_VERSION_MAJOR >= 5 -#endif // ifdef ESP32 + .cc = "01", + .schan = 1, + .nchan = 14, + .policy = WIFI_COUNTRY_POLICY_AUTO, + }), +# endif // if ESP_IDF_VERSION_MAJOR >= 5 +# endif // ifdef ESP32 last_seen(0), rssi(0), channel(0), index(0), enc_type(0) { _allBits = 0u; @@ -45,24 +54,24 @@ WiFi_AP_Candidate::WiFi_AP_Candidate(const WiFi_AP_Candidate& other) enc_type(other.enc_type) { _allBits = other._allBits; - #ifdef ESP32 - # if ESP_IDF_VERSION_MAJOR >= 5 + # ifdef ESP32 + # if ESP_IDF_VERSION_MAJOR >= 5 memcpy(&this->country, &other.country, sizeof(wifi_country_t)); - # endif - #endif // ifdef ESP32 + # endif + # endif // ifdef ESP32 } WiFi_AP_Candidate::WiFi_AP_Candidate(uint8_t index_c, const String& ssid_c) : -#ifdef ESP32 -# if ESP_IDF_VERSION_MAJOR >= 5 +# ifdef ESP32 +# if ESP_IDF_VERSION_MAJOR >= 5 country({ - .cc = "01", - .schan = 1, - .nchan = 14, - .policy = WIFI_COUNTRY_POLICY_AUTO, -}), -# endif // if ESP_IDF_VERSION_MAJOR >= 5 -#endif // ifdef ESP32 + .cc = "01", + .schan = 1, + .nchan = 14, + .policy = WIFI_COUNTRY_POLICY_AUTO, + }), +# endif // if ESP_IDF_VERSION_MAJOR >= 5 +# endif // ifdef ESP32 last_seen(0), rssi(0), channel(0), index(index_c), enc_type(0) { _allBits = 0u; @@ -89,9 +98,9 @@ WiFi_AP_Candidate::WiFi_AP_Candidate(uint8_t networkItem) : index(0) { channel = WiFi.channel(networkItem); bssid = WiFi.BSSID(networkItem); enc_type = WiFi.encryptionType(networkItem); - #ifdef ESP8266 + # ifdef ESP8266 bits.isHidden = WiFi.isHidden(networkItem); - # ifdef CORE_POST_3_0_0 + # ifdef CORE_POST_3_0_0 const bss_info *it = reinterpret_cast(WiFi.getScanInfoByIndex(networkItem)); if (it) { @@ -100,9 +109,9 @@ WiFi_AP_Candidate::WiFi_AP_Candidate(uint8_t networkItem) : index(0) { bits.phy_11n = it->phy_11n; bits.wps = it->wps; } - # endif // ifdef CORE_POST_3_0_0 - #endif // ifdef ESP8266 - #ifdef ESP32 + # endif // ifdef CORE_POST_3_0_0 + # endif // ifdef ESP8266 + # ifdef ESP32 bits.isHidden = ssid.isEmpty(); wifi_ap_record_t *it = reinterpret_cast(WiFi.getScanInfoByIndex(networkItem)); @@ -111,29 +120,29 @@ WiFi_AP_Candidate::WiFi_AP_Candidate(uint8_t networkItem) : index(0) { bits.phy_11g = it->phy_11g; bits.phy_11n = it->phy_11n; bits.phy_lr = it->phy_lr; -# if ESP_IDF_VERSION_MAJOR >= 5 +# if ESP_IDF_VERSION_MAJOR >= 5 bits.phy_11ax = it->phy_11ax; bits.ftm_initiator = it->ftm_initiator; bits.ftm_responder = it->ftm_responder; -#if CONFIG_SOC_WIFI_SUPPORT_5G - bits.phy_11a = it->phy_11a; - bits.phy_11ac = it->phy_11ac; -#endif -# endif // if ESP_IDF_VERSION_MAJOR >= 5 +# if CONFIG_SOC_WIFI_SUPPORT_5G + bits.phy_11a = it->phy_11a; + bits.phy_11ac = it->phy_11ac; +# endif // if CONFIG_SOC_WIFI_SUPPORT_5G +# endif // if ESP_IDF_VERSION_MAJOR >= 5 bits.wps = it->wps; // FIXME TD-er: Maybe also add other info like 2nd channel, ftm and phy_lr support? -# if ESP_IDF_VERSION_MAJOR >= 5 +# if ESP_IDF_VERSION_MAJOR >= 5 memcpy(&country, &(it->country), sizeof(wifi_country_t)); bandwidth = it->bandwidth; -# endif +# endif // if ESP_IDF_VERSION_MAJOR >= 5 } - #endif // ifdef ESP32 + # endif // ifdef ESP32 last_seen = millis(); } -#ifdef ESP8266 -# if FEATURE_ESP8266_DIRECT_WIFI_SCAN +# ifdef ESP8266 +# if FEATURE_ESP8266_DIRECT_WIFI_SCAN WiFi_AP_Candidate::WiFi_AP_Candidate(const bss_info& ap) : rssi(ap.rssi), channel(ap.channel), bssid(ap.bssid), index(0), enc_type(0), isHidden(ap.is_hidden), @@ -167,8 +176,8 @@ WiFi_AP_Candidate::WiFi_AP_Candidate(const bss_info& ap) : ssid = String(reinterpret_cast(tmp)); } -# endif // if FEATURE_ESP8266_DIRECT_WIFI_SCAN -#endif // ifdef ESP8266 +# endif // if FEATURE_ESP8266_DIRECT_WIFI_SCAN +# endif // ifdef ESP8266 bool WiFi_AP_Candidate::operator<(const WiFi_AP_Candidate& other) const { @@ -204,12 +213,12 @@ WiFi_AP_Candidate& WiFi_AP_Candidate::operator=(const WiFi_AP_Candidate& other) index = other.index; enc_type = other.enc_type; _allBits = other._allBits; - #ifdef ESP32 - # if ESP_IDF_VERSION_MAJOR >= 5 + # ifdef ESP32 + # if ESP_IDF_VERSION_MAJOR >= 5 memcpy(&this->country, &other.country, sizeof(wifi_country_t)); bandwidth = other.bandwidth; - # endif - #endif // ifdef ESP32 + # endif // if ESP_IDF_VERSION_MAJOR >= 5 + # endif // ifdef ESP32 return *this; } @@ -219,9 +228,9 @@ bool WiFi_AP_Candidate::usable() const { // if (key.isEmpty()) return false; if (bits.isEmergencyFallback) { int allowedUptimeMinutes = 10; - #ifdef CUSTOM_EMERGENCY_FALLBACK_ALLOW_MINUTES_UPTIME + # ifdef CUSTOM_EMERGENCY_FALLBACK_ALLOW_MINUTES_UPTIME allowedUptimeMinutes = CUSTOM_EMERGENCY_FALLBACK_ALLOW_MINUTES_UPTIME; - #endif // ifdef CUSTOM_EMERGENCY_FALLBACK_ALLOW_MINUTES_UPTIME + # endif // ifdef CUSTOM_EMERGENCY_FALLBACK_ALLOW_MINUTES_UPTIME if ((getUptimeMinutes() > allowedUptimeMinutes) || !SecuritySettings.hasWiFiCredentials() || @@ -258,13 +267,14 @@ String WiFi_AP_Candidate::toString(const String& separator) const { separator.c_str(), channel); -#if CONFIG_SOC_WIFI_SUPPORT_5G +# if CONFIG_SOC_WIFI_SUPPORT_5G + if (channel < 36) { result += F(" 2.4 GHz"); } else { result += F(" 5 GHz"); } -#endif +# endif // if CONFIG_SOC_WIFI_SUPPORT_5G if (rssi == -1) { result += F(" (RTC) "); @@ -274,8 +284,8 @@ String WiFi_AP_Candidate::toString(const String& separator) const { result += encryption_type(); -#ifdef ESP32 -# if ESP_IDF_VERSION_MAJOR >= 5 +# ifdef ESP32 +# if ESP_IDF_VERSION_MAJOR >= 5 // Country code string if ((country.cc[0] != '\0') && (country.cc[1] != '\0')) { @@ -294,11 +304,12 @@ String WiFi_AP_Candidate::toString(const String& separator) const { if (country.nchan > 0) { result += strformat(F(" ch: %d..%d"), country.schan, country.schan + country.nchan - 1); } -# endif // if ESP_IDF_VERSION_MAJOR >= 5 -#endif // ifdef ESP32 +# endif // if ESP_IDF_VERSION_MAJOR >= 5 +# endif // ifdef ESP32 if (phy_known()) { String phy_str; + // Order of items is kinda in order of age, oldest first. // first 2.4 GHz version @@ -313,7 +324,8 @@ String WiFi_AP_Candidate::toString(const String& separator) const { // Also used for 5 GHz to make it even more confusing // To top the naming confusion even worse, this is later called "Wi-Fi 4" if (bits.phy_11n) { phy_str += 'n'; } -#ifdef ESP32 +# ifdef ESP32 + // Add 5 GHz WiFi types, oldest first. // 802.11a was one of the first WiFi standards, using 5 GHz @@ -323,7 +335,7 @@ String WiFi_AP_Candidate::toString(const String& separator) const { // 802.11ac was the significantly faster version for 5 GHz WiFi. // Later called "Wi-Fi 5" if (bits.phy_11ac) { phy_str += F("/ac"); } - + // AX is WiFi-6, on both frequencies if (bits.phy_11ax) { phy_str += F("/ax"); } @@ -333,22 +345,27 @@ String WiFi_AP_Candidate::toString(const String& separator) const { if (bits.ftm_responder) { phy_str += F("/FTM_r"); } -#endif // ifdef ESP32 +# endif // ifdef ESP32 if (phy_str.length()) { -#ifdef ESP32 +# ifdef ESP32 + switch (bandwidth) { case WIFI_BW_HT20: break; - case WIFI_BW_HT40: phy_str += F(" 40 MHz"); break; - case WIFI_BW80: phy_str += F(" 80 MHz"); break; - case WIFI_BW160: phy_str += F(" 160 MHz"); break; - case WIFI_BW80_BW80: phy_str += F(" 80+80 MHz"); break; - + case WIFI_BW_HT40: phy_str += F(" 40 MHz"); + break; + case WIFI_BW80: phy_str += F(" 80 MHz"); + break; + case WIFI_BW160: phy_str += F(" 160 MHz"); + break; + case WIFI_BW80_BW80: phy_str += F(" 80+80 MHz"); + break; + default: break; } -#endif +# endif // ifdef ESP32 result += strformat(F(" (%s)"), phy_str.c_str()); } } @@ -358,3 +375,9 @@ String WiFi_AP_Candidate::toString(const String& separator) const { String WiFi_AP_Candidate::encryption_type() const { return WiFi_encryptionType(enc_type); } + +} // namespace wifi +} // namespace net +} // namespace ESPEasy + +#endif // if FEATURE_WIFI diff --git a/src/src/DataStructs/WiFi_AP_Candidate.h b/src/ESPEasy/net/DataStructs/WiFi_AP_Candidate.h similarity index 82% rename from src/src/DataStructs/WiFi_AP_Candidate.h rename to src/ESPEasy/net/DataStructs/WiFi_AP_Candidate.h index 73e6eb253..fbfb0a10d 100644 --- a/src/src/DataStructs/WiFi_AP_Candidate.h +++ b/src/ESPEasy/net/DataStructs/WiFi_AP_Candidate.h @@ -1,9 +1,16 @@ -#ifndef DATASTRUCTS_WIFI_AP_CANDIDATES_H -#define DATASTRUCTS_WIFI_AP_CANDIDATES_H +#pragma once + +#include "../../../ESPEasy_common.h" + +#include "../DataStructs/MAC_address.h" + +#if FEATURE_WIFI + +namespace ESPEasy { +namespace net { +namespace wifi { -#include "../../ESPEasy_common.h" -#include "../../ESPEasy/net/DataStructs/MAC_address.h" struct WiFi_AP_Candidate { WiFi_AP_Candidate(); WiFi_AP_Candidate(const WiFi_AP_Candidate& other); @@ -19,11 +26,11 @@ struct WiFi_AP_Candidate { // Construct using index from WiFi scan result WiFi_AP_Candidate(uint8_t networkItem); - #ifdef ESP8266 - # if FEATURE_ESP8266_DIRECT_WIFI_SCAN + # ifdef ESP8266 + # if FEATURE_ESP8266_DIRECT_WIFI_SCAN WiFi_AP_Candidate(const bss_info& ap); - # endif // if FEATURE_ESP8266_DIRECT_WIFI_SCAN - #endif // ifdef ESP8266 + # endif // if FEATURE_ESP8266_DIRECT_WIFI_SCAN + # endif // ifdef ESP8266 // Return true when this one is preferred over 'other'. @@ -72,12 +79,12 @@ struct WiFi_AP_Candidate { // String key; - #ifdef ESP32 - # if ESP_IDF_VERSION_MAJOR >= 5 - wifi_country_t country; - wifi_bandwidth_t bandwidth{WIFI_BW_HT20}; - # endif - #endif // ifdef ESP32 + # ifdef ESP32 + # if ESP_IDF_VERSION_MAJOR >= 5 + wifi_country_t country; + wifi_bandwidth_t bandwidth{ WIFI_BW_HT20 }; + # endif // if ESP_IDF_VERSION_MAJOR >= 5 + # endif // ifdef ESP32 unsigned long last_seen = 0u; MAC_address bssid; @@ -110,4 +117,8 @@ struct WiFi_AP_Candidate { }; -#endif // ifndef DATASTRUCTS_WIFI_AP_CANDIDATES_H +} // namespace wifi +} // namespace net +} // namespace ESPEasy + +#endif // if FEATURE_WIFI diff --git a/src/src/DataStructs/WiFi_AP_Candidates_NVS.cpp b/src/ESPEasy/net/DataStructs/WiFi_AP_Candidates_NVS.cpp similarity index 84% rename from src/src/DataStructs/WiFi_AP_Candidates_NVS.cpp rename to src/ESPEasy/net/DataStructs/WiFi_AP_Candidates_NVS.cpp index 9810c11a1..24596b049 100644 --- a/src/src/DataStructs/WiFi_AP_Candidates_NVS.cpp +++ b/src/ESPEasy/net/DataStructs/WiFi_AP_Candidates_NVS.cpp @@ -1,9 +1,17 @@ #include "../DataStructs/WiFi_AP_Candidates_NVS.h" #ifdef ESP32 -# include "../Helpers/ESPEasy_NVS_Helper.h" +# include "../../../src/Helpers/ESPEasy_NVS_Helper.h" -# define WIFI_AP_CANDIDATE_NVS_KEY "WIFICANDIDATE" + +# if FEATURE_WIFI + +namespace ESPEasy { +namespace net { +namespace wifi { + + +# define WIFI_AP_CANDIDATE_NVS_KEY "WIFICANDIDATE" struct WiFi_AP_Candidates_NVS_data_t { union { @@ -11,10 +19,13 @@ struct WiFi_AP_Candidates_NVS_data_t { uint8_t BSSID[6]; uint8_t lastWiFiChannel; uint8_t lastWiFiSettingsIndex; + } APdata; uint64_t rawdata{}; + }; + }; bool WiFi_AP_Candidates_NVS::loadCandidate_from_NVS(WiFi_AP_Candidate& candidate) @@ -32,6 +43,7 @@ bool WiFi_AP_Candidates_NVS::loadCandidate_from_NVS(WiFi_AP_Candidate& candidate return false; } } + candidate.bssid.set(fromNVS.APdata.BSSID); candidate.channel = fromNVS.APdata.lastWiFiChannel; candidate.index = fromNVS.APdata.lastWiFiSettingsIndex; @@ -61,4 +73,10 @@ void WiFi_AP_Candidates_NVS::clear_from_NVS() } } +} // namespace wifi +} // namespace net +} // namespace ESPEasy + +# endif // if FEATURE_WIFI + #endif // ifdef ESP32 diff --git a/src/ESPEasy/net/DataStructs/WiFi_AP_Candidates_NVS.h b/src/ESPEasy/net/DataStructs/WiFi_AP_Candidates_NVS.h new file mode 100644 index 000000000..2aebc2f24 --- /dev/null +++ b/src/ESPEasy/net/DataStructs/WiFi_AP_Candidates_NVS.h @@ -0,0 +1,32 @@ +#pragma once + +#include "../../../ESPEasy_common.h" + +#ifdef ESP32 +# include "../DataStructs/WiFi_AP_Candidate.h" + +# if FEATURE_WIFI + +namespace ESPEasy { +namespace net { +namespace wifi { + + +class WiFi_AP_Candidates_NVS +{ +public: + + static bool loadCandidate_from_NVS(WiFi_AP_Candidate& candidate); + + static void currentConnection_to_NVS(const WiFi_AP_Candidate& candidate); + + static void clear_from_NVS(); +}; + +} // namespace wifi +} // namespace net +} // namespace ESPEasy + +# endif // if FEATURE_WIFI + +#endif // ifdef ESP32 diff --git a/src/ESPEasy/net/Globals/WiFi_AP_Candidates.cpp b/src/ESPEasy/net/Globals/WiFi_AP_Candidates.cpp new file mode 100644 index 000000000..8932549d1 --- /dev/null +++ b/src/ESPEasy/net/Globals/WiFi_AP_Candidates.cpp @@ -0,0 +1,16 @@ +#include "../Globals/WiFi_AP_Candidates.h" + +#if FEATURE_WIFI + +namespace ESPEasy { +namespace net { +namespace wifi { + + +WiFi_AP_CandidatesList WiFi_AP_Candidates; + +} // namespace wifi +} // namespace net +} // namespace ESPEasy + +#endif // if FEATURE_WIFI diff --git a/src/ESPEasy/net/Globals/WiFi_AP_Candidates.h b/src/ESPEasy/net/Globals/WiFi_AP_Candidates.h new file mode 100644 index 000000000..11f8e5c4f --- /dev/null +++ b/src/ESPEasy/net/Globals/WiFi_AP_Candidates.h @@ -0,0 +1,18 @@ +#pragma once + +#include "../Helpers/WiFi_AP_CandidatesList.h" + +#if FEATURE_WIFI + +namespace ESPEasy { +namespace net { +namespace wifi { + + +extern WiFi_AP_CandidatesList WiFi_AP_Candidates; + +} // namespace wifi +} // namespace net +} // namespace ESPEasy + +#endif // if FEATURE_WIFI diff --git a/src/src/Helpers/WiFi_AP_CandidatesList.cpp b/src/ESPEasy/net/Helpers/WiFi_AP_CandidatesList.cpp similarity index 76% rename from src/src/Helpers/WiFi_AP_CandidatesList.cpp rename to src/ESPEasy/net/Helpers/WiFi_AP_CandidatesList.cpp index 5f737e6e2..3a833e76a 100644 --- a/src/src/Helpers/WiFi_AP_CandidatesList.cpp +++ b/src/ESPEasy/net/Helpers/WiFi_AP_CandidatesList.cpp @@ -1,16 +1,17 @@ #include "../Helpers/WiFi_AP_CandidatesList.h" #ifdef ESP32 -#include "../DataStructs/WiFi_AP_Candidates_NVS.h" +# include "../DataStructs/WiFi_AP_Candidates_NVS.h" #endif -#include "../ESPEasyCore/ESPEasy_Log.h" -#include "../../ESPEasy/net/Globals/ESPEasyWiFiEvent.h" -#include "../Globals/RTC.h" -#include "../Globals/SecuritySettings.h" -#include "../Globals/Settings.h" -#include "../Helpers/Misc.h" -#include "../Helpers/StringConverter.h" +#include "../Globals/ESPEasyWiFiEvent.h" + +#include "../../../src/ESPEasyCore/ESPEasy_Log.h" +#include "../../../src/Globals/RTC.h" +#include "../../../src/Globals/SecuritySettings.h" +#include "../../../src/Globals/Settings.h" +#include "../../../src/Helpers/Misc.h" +#include "../../../src/Helpers/StringConverter.h" #if defined(ESP8266) # include @@ -19,9 +20,17 @@ # include #endif // if defined(ESP32) -#define WIFI_CUSTOM_DEPLOYMENT_KEY_INDEX 3 -#define WIFI_CUSTOM_SUPPORT_KEY_INDEX 4 -#define WIFI_CREDENTIALS_FALLBACK_SSID_INDEX 5 + +#if FEATURE_WIFI + +namespace ESPEasy { +namespace net { +namespace wifi { + +# define WIFI_CUSTOM_DEPLOYMENT_KEY_INDEX 3 +# define WIFI_CUSTOM_SUPPORT_KEY_INDEX 4 +# define WIFI_CREDENTIALS_FALLBACK_SSID_INDEX 5 + WiFi_AP_CandidatesList::WiFi_AP_CandidatesList() { known.clear(); @@ -41,14 +50,16 @@ void WiFi_AP_CandidatesList::load_knownCredentials() { _mustLoadCredentials = false; known.clear(); candidates.clear(); -// attemptsLeft = WiFi_CONNECT_ATTEMPTS; + + // attemptsLeft = WiFi_CONNECT_ATTEMPTS; _addedKnownCandidate = false; -// addFromRTC(); + + // addFromRTC(); { // Add the known SSIDs - String ssid; - uint8_t index = 1; // Index 0 is the "unset" value + String ssid; + uint8_t index = 1; // Index 0 is the "unset" value bool done = false; @@ -60,6 +71,7 @@ void WiFi_AP_CandidatesList::load_knownCredentials() { # endif // ifdef USE_SECOND_HEAP known.emplace_back(index, ssid); + if (SettingsIndexMatchCustomCredentials(index)) { if (SettingsIndexMatchEmergencyFallback(index)) { known.back().bits.isEmergencyFallback = true; @@ -87,7 +99,6 @@ void WiFi_AP_CandidatesList::clearCache() { known_it = known.begin(); } - void WiFi_AP_CandidatesList::force_reload() { clearCache(); RTC.clearLastWiFi(); // Invalidate the RTC WiFi data. @@ -102,7 +113,7 @@ void WiFi_AP_CandidatesList::begin_sync_scan() { } void WiFi_AP_CandidatesList::purge_expired() { - for (auto it = scanned.begin(); it != scanned.end(); ) { + for (auto it = scanned.begin(); it != scanned.end();) { if (it->expired()) { it = scanned.erase(it); } else { @@ -111,7 +122,8 @@ void WiFi_AP_CandidatesList::purge_expired() { } } -#if !FEATURE_ESP8266_DIRECT_WIFI_SCAN +# if !FEATURE_ESP8266_DIRECT_WIFI_SCAN + void WiFi_AP_CandidatesList::process_WiFiscan(uint8_t scancount) { // Append or update found APs from scan. for (uint8_t i = 0; i < scancount; ++i) { @@ -122,16 +134,20 @@ void WiFi_AP_CandidatesList::process_WiFiscan(uint8_t scancount) { after_process_WiFiscan(); } -#endif -#ifdef ESP8266 -#if FEATURE_ESP8266_DIRECT_WIFI_SCAN +# endif // if !FEATURE_ESP8266_DIRECT_WIFI_SCAN + +# ifdef ESP8266 +# if FEATURE_ESP8266_DIRECT_WIFI_SCAN + void WiFi_AP_CandidatesList::process_WiFiscan(const bss_info& ap) { WiFi_AP_Candidate tmp(ap); + scanned_new.push_back(tmp); } -#endif -#endif + +# endif // if FEATURE_ESP8266_DIRECT_WIFI_SCAN +# endif // ifdef ESP8266 void WiFi_AP_CandidatesList::after_process_WiFiscan() { scanned_new.sort(); @@ -145,16 +161,16 @@ void WiFi_AP_CandidatesList::after_process_WiFiscan() { bool WiFi_AP_CandidatesList::getNext(bool scanAllowed) { load_knownCredentials(); - if (candidates.empty()) { + if (candidates.empty()) { return false; -/* if (scanAllowed) { - return false; - } - loadCandidatesFromScanned(); - attemptsLeft = WiFi_CONNECT_ATTEMPTS; - if (candidates.empty()) { return false; } - */ + /* if (scanAllowed) { + return false; + } + loadCandidatesFromScanned(); + attemptsLeft = WiFi_CONNECT_ATTEMPTS; + if (candidates.empty()) { return false; } + */ } currentCandidate = candidates.front(); @@ -178,7 +194,7 @@ bool WiFi_AP_CandidatesList::getNext(bool scanAllowed) { if (attemptsLeft == 0) { if (currentCandidate.bits.isHidden && !Settings.HiddenSSID_SlowConnectPerBSSID()) { // We tried to connect to hidden SSIDs in 1 run, so pop all hidden candidates. - for (auto cand_it = candidates.begin(); cand_it != candidates.end() && cand_it->bits.isHidden; ) { + for (auto cand_it = candidates.begin(); cand_it != candidates.end() && cand_it->bits.isHidden;) { cand_it = candidates.erase(cand_it); } } else { @@ -187,7 +203,7 @@ bool WiFi_AP_CandidatesList::getNext(bool scanAllowed) { } } - known_it = known.begin(); + known_it = known.begin(); attemptsLeft = WiFi_CONNECT_ATTEMPTS; } else { markAttempt(); @@ -200,8 +216,7 @@ const WiFi_AP_Candidate& WiFi_AP_CandidatesList::getCurrent() const { return currentCandidate; } -void WiFi_AP_CandidatesList::markAttempt() { - if (attemptsLeft > 0) attemptsLeft--; +void WiFi_AP_CandidatesList::markAttempt() { if (attemptsLeft > 0) { attemptsLeft--; } } WiFi_AP_Candidate WiFi_AP_CandidatesList::getBestCandidate() const { @@ -222,28 +237,34 @@ bool WiFi_AP_CandidatesList::hasCandidates() const { void WiFi_AP_CandidatesList::markCurrentConnectionStable() { clearCache(); + if (currentCandidate.enc_type == 0) { bool matchfound = false; + for (auto it = candidates.begin(); !matchfound && it != candidates.end(); ++it) { if (currentCandidate == *it) { // We may have gotten the enc_type of the active used candidate // Make sure to store the enc type before clearing the candidates list currentCandidate.enc_type = it->enc_type; - matchfound = true; + matchfound = true; } } } + if (currentCandidate.usable()) { // Store in RTC RTC.lastWiFiChannel = currentCandidate.channel; currentCandidate.bssid.get(RTC.lastBSSID); RTC.lastWiFiSettingsIndex = currentCandidate.index; -#ifdef ESP32 - if (Settings.UseLastWiFiFromRTC()) +# ifdef ESP32 + + if (Settings.UseLastWiFiFromRTC()) { WiFi_AP_Candidates_NVS::currentConnection_to_NVS(currentCandidate); - else + } + else { WiFi_AP_Candidates_NVS::clear_from_NVS(); -#endif + } +# endif // ifdef ESP32 } candidates.clear(); @@ -253,22 +274,26 @@ void WiFi_AP_CandidatesList::markCurrentConnectionStable() { int8_t WiFi_AP_CandidatesList::scanComplete() const { const int8_t scanCompleteStatus = WiFi.scanComplete(); + if (scanCompleteStatus == -1) { // Still scanning return scanCompleteStatus; } size_t found = 0; + for (auto scan = scanned.begin(); scan != scanned.end(); ++scan) { if (!scan->expired()) { ++found; } } + for (auto scan = scanned_new.begin(); scan != scanned_new.end(); ++scan) { if (!scan->expired()) { ++found; } } + if (found == 0) { if (scanCompleteStatus == -2) { // Not triggered @@ -280,16 +305,12 @@ int8_t WiFi_AP_CandidatesList::scanComplete() const { bool WiFi_AP_CandidatesList::SettingsIndexMatchCustomCredentials(uint8_t index) { - return (WIFI_CUSTOM_DEPLOYMENT_KEY_INDEX == index || - WIFI_CUSTOM_SUPPORT_KEY_INDEX == index || - SettingsIndexMatchEmergencyFallback(index)); -} - -bool WiFi_AP_CandidatesList::SettingsIndexMatchEmergencyFallback(uint8_t index) -{ - return (WIFI_CREDENTIALS_FALLBACK_SSID_INDEX == index); + return WIFI_CUSTOM_DEPLOYMENT_KEY_INDEX == index || + WIFI_CUSTOM_SUPPORT_KEY_INDEX == index || + SettingsIndexMatchEmergencyFallback(index); } +bool WiFi_AP_CandidatesList::SettingsIndexMatchEmergencyFallback(uint8_t index) { return WIFI_CREDENTIALS_FALLBACK_SSID_INDEX == index; } void WiFi_AP_CandidatesList::loadCandidatesFromScanned() { // Make sure list operations are not done on the 2nd heap @@ -300,12 +321,14 @@ void WiFi_AP_CandidatesList::loadCandidatesFromScanned() { if (scanned_new.size() > 0) { // We have new scans to process. purge_expired(); + for (auto scan = scanned_new.begin(); scan != scanned_new.end();) { - #ifndef BUILD_NO_DEBUG + # ifndef BUILD_NO_DEBUG + if (loglevelActiveFor(LOG_LEVEL_DEBUG)) { addLogMove(LOG_LEVEL_DEBUG, concat(F("WiFi : Scan result: "), scan->toString())); } - #endif // ifndef BUILD_NO_DEBUG + # endif // ifndef BUILD_NO_DEBUG // Check to see if it is already present, if so, remove existing one. for (auto tmp = scanned.begin(); tmp != scanned.end();) { @@ -328,6 +351,7 @@ void WiFi_AP_CandidatesList::loadCandidatesFromScanned() { // Do not mess with the current candidates order if > 1 present return; } + // Purge unusable from known list. for (auto it = known.begin(); it != known.end();) { if (it->usable()) { @@ -354,8 +378,8 @@ void WiFi_AP_CandidatesList::loadCandidatesFromScanned() { for (auto kn_it = known.begin(); kn_it != known.end(); ++kn_it) { if (scan->ssid.equals(kn_it->ssid)) { WiFi_AP_Candidate tmp = *scan; - tmp.index = kn_it->index; - tmp.bits.lowPriority = kn_it->bits.lowPriority; + tmp.index = kn_it->index; + tmp.bits.lowPriority = kn_it->bits.lowPriority; tmp.bits.isEmergencyFallback = kn_it->bits.isEmergencyFallback; if (tmp.usable()) { @@ -371,13 +395,15 @@ void WiFi_AP_CandidatesList::loadCandidatesFromScanned() { } } # ifndef BUILD_NO_DEBUG + if (loglevelActiveFor(LOG_LEVEL_INFO)) { const WiFi_AP_Candidate bestCandidate = getBestCandidate(); + if (bestCandidate.usable()) { addLogMove(LOG_LEVEL_INFO, concat(F("WiFi : Best AP candidate: "), bestCandidate.toString())); } } - #endif + # endif // ifndef BUILD_NO_DEBUG candidates.sort(); candidates.unique(); addFromRTC(); @@ -385,11 +411,14 @@ void WiFi_AP_CandidatesList::loadCandidatesFromScanned() { } void WiFi_AP_CandidatesList::addFromRTC() { - if (!Settings.UseLastWiFiFromRTC()) return; - if (!RTC.lastWiFi_set()) { - #ifdef ESP32 + if (!Settings.UseLastWiFiFromRTC()) { return; } + + if (!RTC.lastWiFi_set()) { + # ifdef ESP32 + // Try to load from NVS and store in RTC WiFi_AP_Candidate fromNVS; + if (WiFi_AP_Candidates_NVS::loadCandidate_from_NVS(fromNVS)) { RTC.lastWiFiChannel = currentCandidate.channel; currentCandidate.bssid.get(RTC.lastBSSID); @@ -397,13 +426,13 @@ void WiFi_AP_CandidatesList::addFromRTC() { } else { return; } - #else + # else // ifdef ESP32 return; - #endif + # endif // ifdef ESP32 } - if (SettingsIndexMatchCustomCredentials(RTC.lastWiFiSettingsIndex)) - { + if (SettingsIndexMatchCustomCredentials(RTC.lastWiFiSettingsIndex)) + { return; } @@ -421,7 +450,7 @@ void WiFi_AP_CandidatesList::addFromRTC() { return; } - if (candidates.size() > 0 && candidates.front().ssid.equals(fromRTC.ssid)) { + if ((candidates.size() > 0) && candidates.front().ssid.equals(fromRTC.ssid)) { // Front candidate was already from RTC. candidates.pop_front(); } @@ -429,9 +458,11 @@ void WiFi_AP_CandidatesList::addFromRTC() { // See if we may have a better candidate for the current network, with a significant better RSSI. auto bestMatch = candidates.end(); auto lastUsed = bestMatch; + for (auto it = candidates.begin(); lastUsed == candidates.end() && it != candidates.end(); ++it) { if (it->usable() && it->ssid.equals(fromRTC.ssid)) { const bool foundLastUsed = fromRTC.bssid_match(it->bssid); + if (foundLastUsed) { lastUsed = it; } else if (bestMatch == candidates.end()) { @@ -440,9 +471,10 @@ void WiFi_AP_CandidatesList::addFromRTC() { } } bool matchAdded = false; + if (bestMatch != candidates.end()) { // Found a best match, possibly better than the last used. - if (lastUsed == candidates.end() || (bestMatch->rssi > (lastUsed->rssi + 10))) { + if ((lastUsed == candidates.end()) || (bestMatch->rssi > (lastUsed->rssi + 10))) { // Last used was not found or // Other candidate has significant better RSSI matchAdded = true; @@ -452,12 +484,14 @@ void WiFi_AP_CandidatesList::addFromRTC() { matchAdded = true; candidates.push_front(*lastUsed); } + if (!matchAdded) { candidates.push_front(fromRTC); + // This is not taken from a scan, so no idea of the used encryption. // Try to find a matching BSSID to get the encryption. for (auto it = candidates.begin(); it != candidates.end(); ++it) { - if ((it->rssi != -1) && candidates.front() == *it) { + if ((it->rssi != -1) && (candidates.front() == *it)) { candidates.front().enc_type = it->enc_type; return; } @@ -484,6 +518,7 @@ void WiFi_AP_CandidatesList::purge_unusable() { it = candidates.erase(it); } } + if (candidates.size() > 1) { candidates.sort(); candidates.unique(); @@ -491,7 +526,8 @@ void WiFi_AP_CandidatesList::purge_unusable() { } bool WiFi_AP_CandidatesList::get_SSID_key(uint8_t index, String& ssid, String& key) { - switch (index) { + switch (index) + { case 1: ssid = SecuritySettings.WifiSSID; key = SecuritySettings.WifiKey; @@ -501,37 +537,38 @@ bool WiFi_AP_CandidatesList::get_SSID_key(uint8_t index, String& ssid, String& k key = SecuritySettings.WifiKey2; break; case WIFI_CUSTOM_DEPLOYMENT_KEY_INDEX: - #if !defined(CUSTOM_DEPLOYMENT_SSID) || !defined(CUSTOM_DEPLOYMENT_KEY) + # if !defined(CUSTOM_DEPLOYMENT_SSID) || !defined(CUSTOM_DEPLOYMENT_KEY) return false; - #else + # else ssid = F(CUSTOM_DEPLOYMENT_SSID); key = F(CUSTOM_DEPLOYMENT_KEY); - #endif + # endif // if !defined(CUSTOM_DEPLOYMENT_SSID) || !defined(CUSTOM_DEPLOYMENT_KEY) break; case WIFI_CUSTOM_SUPPORT_KEY_INDEX: - #if !defined(CUSTOM_SUPPORT_SSID) || !defined(CUSTOM_SUPPORT_KEY) + # if !defined(CUSTOM_SUPPORT_SSID) || !defined(CUSTOM_SUPPORT_KEY) return false; - #else + # else ssid = F(CUSTOM_SUPPORT_SSID); key = F(CUSTOM_SUPPORT_KEY); - #endif + # endif // if !defined(CUSTOM_SUPPORT_SSID) || !defined(CUSTOM_SUPPORT_KEY) break; case WIFI_CREDENTIALS_FALLBACK_SSID_INDEX: { - #if !defined(CUSTOM_EMERGENCY_FALLBACK_SSID) || !defined(CUSTOM_EMERGENCY_FALLBACK_KEY) + # if !defined(CUSTOM_EMERGENCY_FALLBACK_SSID) || !defined(CUSTOM_EMERGENCY_FALLBACK_KEY) return false; - #else + # else int allowedUptimeMinutes = 10; - #ifdef CUSTOM_EMERGENCY_FALLBACK_ALLOW_MINUTES_UPTIME + # ifdef CUSTOM_EMERGENCY_FALLBACK_ALLOW_MINUTES_UPTIME allowedUptimeMinutes = CUSTOM_EMERGENCY_FALLBACK_ALLOW_MINUTES_UPTIME; - #endif - if (getUptimeMinutes() < allowedUptimeMinutes && SecuritySettings.hasWiFiCredentials()) { + # endif + + if ((getUptimeMinutes() < allowedUptimeMinutes) && SecuritySettings.hasWiFiCredentials()) { ssid = F(CUSTOM_EMERGENCY_FALLBACK_SSID); key = F(CUSTOM_EMERGENCY_FALLBACK_KEY); } else { return false; } - #endif + # endif // if !defined(CUSTOM_EMERGENCY_FALLBACK_SSID) || !defined(CUSTOM_EMERGENCY_FALLBACK_KEY) break; } default: @@ -541,7 +578,6 @@ bool WiFi_AP_CandidatesList::get_SSID_key(uint8_t index, String& ssid, String& k // TODO TD-er: Read other credentials from extra file. - // Spaces are allowed in both SSID and pass phrase, so make sure to not trim the ssid and key. return true; } @@ -549,13 +585,22 @@ bool WiFi_AP_CandidatesList::get_SSID_key(uint8_t index, String& ssid, String& k bool WiFi_AP_CandidatesList::get_SSID(uint8_t index, String& ssid) { String key; + return get_SSID_key(index, ssid, key); } String WiFi_AP_CandidatesList::get_key(uint8_t index) { String ssid, key; - if (get_SSID_key(index, ssid, key)) + + if (get_SSID_key(index, ssid, key)) { return key; + } return EMPTY_STRING; -} \ No newline at end of file +} + +} // namespace wifi +} // namespace net +} // namespace ESPEasy + +#endif // if FEATURE_WIFI diff --git a/src/src/Helpers/WiFi_AP_CandidatesList.h b/src/ESPEasy/net/Helpers/WiFi_AP_CandidatesList.h similarity index 62% rename from src/src/Helpers/WiFi_AP_CandidatesList.h rename to src/ESPEasy/net/Helpers/WiFi_AP_CandidatesList.h index 9e6f29f1c..69264cbfd 100644 --- a/src/src/Helpers/WiFi_AP_CandidatesList.h +++ b/src/ESPEasy/net/Helpers/WiFi_AP_CandidatesList.h @@ -1,7 +1,6 @@ -#ifndef HELPERS_WIFI_AP_CANDIDATESLIST_H -#define HELPERS_WIFI_AP_CANDIDATESLIST_H +#pragma once -#include "../../ESPEasy_common.h" +#include "../../../ESPEasy_common.h" #include "../DataStructs/WiFi_AP_Candidate.h" @@ -9,6 +8,13 @@ #define WiFi_CONNECT_ATTEMPTS 1 +#if FEATURE_WIFI + +namespace ESPEasy { +namespace net { +namespace wifi { + + typedef std::list::const_iterator WiFi_AP_Candidate_const_iterator; struct WiFi_AP_CandidatesList { @@ -28,16 +34,17 @@ struct WiFi_AP_CandidatesList { void purge_expired(); -#if !FEATURE_ESP8266_DIRECT_WIFI_SCAN +# if !FEATURE_ESP8266_DIRECT_WIFI_SCAN + // Add found WiFi access points to the list if they are possible candidates. void process_WiFiscan(uint8_t scancount); -#endif +# endif // if !FEATURE_ESP8266_DIRECT_WIFI_SCAN -#ifdef ESP8266 -#if FEATURE_ESP8266_DIRECT_WIFI_SCAN +# ifdef ESP8266 +# if FEATURE_ESP8266_DIRECT_WIFI_SCAN void process_WiFiscan(const bss_info& ap); -#endif -#endif +# endif +# endif // ifdef ESP8266 void after_process_WiFiscan(); @@ -46,7 +53,7 @@ struct WiFi_AP_CandidatesList { bool getNext(bool scanAllowed); const WiFi_AP_Candidate& getCurrent() const; - + // Decrease attemptsLeft void markAttempt(); @@ -58,11 +65,11 @@ struct WiFi_AP_CandidatesList { // Make sure the current connection (from RTC) is set as first next candidate. // This will force a reconnect to the current AP if connection is lost. - void markCurrentConnectionStable(); + void markCurrentConnectionStable(); - bool addedKnownCandidate() const { return _addedKnownCandidate; } + bool addedKnownCandidate() const { return _addedKnownCandidate; } - int8_t scanComplete() const; + int8_t scanComplete() const; WiFi_AP_Candidate_const_iterator scanned_begin() const { return scanned.begin(); @@ -78,32 +85,33 @@ struct WiFi_AP_CandidatesList { private: - // Pick the possible - void loadCandidatesFromScanned(); + // Pick the possible + void loadCandidatesFromScanned(); - void addFromRTC(); + void addFromRTC(); - void purge_unusable(); + void purge_unusable(); // Load SSID and pass/key from the settings. - static bool get_SSID_key(uint8_t index, - String& ssid, - String& key); + static bool get_SSID_key(uint8_t index, + String& ssid, + String& key); public: - static bool get_SSID(uint8_t index, String& ssid); + static bool get_SSID(uint8_t index, + String& ssid); static String get_key(uint8_t index); private: - std::list candidates; + std::listcandidates; - std::list known; + std::listknown; - std::list scanned; - std::list scanned_new; + std::listscanned; + std::listscanned_new; WiFi_AP_Candidate_const_iterator known_it; @@ -111,8 +119,15 @@ private: bool _mustLoadCredentials = true; bool _addedKnownCandidate = false; + public: - int attemptsLeft = WiFi_CONNECT_ATTEMPTS; + + int attemptsLeft = WiFi_CONNECT_ATTEMPTS; + }; -#endif // ifndef HELPERS_WIFI_AP_CANDIDATESLIST_H +} // namespace wifi +} // namespace net +} // namespace ESPEasy + +#endif // if FEATURE_WIFI diff --git a/src/ESPEasy/net/wifi/ESPEasyWiFiEvent_ESP32.cpp b/src/ESPEasy/net/wifi/ESPEasyWiFiEvent_ESP32.cpp index ac24676f4..c92850fb6 100644 --- a/src/ESPEasy/net/wifi/ESPEasyWiFiEvent_ESP32.cpp +++ b/src/ESPEasy/net/wifi/ESPEasyWiFiEvent_ESP32.cpp @@ -14,7 +14,7 @@ # include "../../../src/DataTypes/ESPEasyTimeSource.h" # include "../../../src/ESPEasyCore/ESPEasy_Log.h" # include "../../../src/Globals/RTC.h" -# include "../../../src/Globals/WiFi_AP_Candidates.h" +# include "../Globals/WiFi_AP_Candidates.h" # include "../../../src/Helpers/ESPEasy_time_calc.h" # include "../../../src/Helpers/StringConverter.h" # include "../../net/ESPEasyNetwork.h" diff --git a/src/ESPEasy/net/wifi/ESPEasyWiFiEvent_ESP8266.cpp b/src/ESPEasy/net/wifi/ESPEasyWiFiEvent_ESP8266.cpp index be73fdeda..2c945bbb3 100644 --- a/src/ESPEasy/net/wifi/ESPEasyWiFiEvent_ESP8266.cpp +++ b/src/ESPEasy/net/wifi/ESPEasyWiFiEvent_ESP8266.cpp @@ -7,7 +7,7 @@ # include "../../../src/DataTypes/ESPEasyTimeSource.h" # include "../../../src/ESPEasyCore/ESPEasy_Log.h" # include "../../../src/Globals/RTC.h" -# include "../../../src/Globals/WiFi_AP_Candidates.h" +# include "../Globals/WiFi_AP_Candidates.h" # include "../../../src/Helpers/ESPEasy_time_calc.h" # include "../ESPEasyNetwork.h" diff --git a/src/ESPEasy/net/wifi/ESPEasyWiFi_state_machine.cpp b/src/ESPEasy/net/wifi/ESPEasyWiFi_state_machine.cpp index 0bd5f6ade..81e430287 100644 --- a/src/ESPEasy/net/wifi/ESPEasyWiFi_state_machine.cpp +++ b/src/ESPEasy/net/wifi/ESPEasyWiFi_state_machine.cpp @@ -2,15 +2,15 @@ #if FEATURE_WIFI -# include "../ESPEasyNetwork.h" // for setNetworkMedium, however this should not be part of the WiFi code # include "../../../src/ESPEasyCore/ESPEasy_Log.h" # include "../../../src/Globals/RTC.h" # include "../../../src/Globals/Settings.h" -# include "../../../src/Globals/WiFi_AP_Candidates.h" # include "../../../src/Helpers/StringConverter.h" # include "../../../src/Helpers/StringGenerator_WiFi.h" +# include "../ESPEasyNetwork.h" // for setNetworkMedium, however this should not be part of the WiFi code # include "../Globals/ESPEasyWiFiEvent.h" +# include "../Globals/WiFi_AP_Candidates.h" # include "../wifi/ESPEasyWifi.h" # include "../wifi/ESPEasyWifi_abstracted.h" diff --git a/src/ESPEasy/net/wifi/ESPEasyWiFi_state_machine.h b/src/ESPEasy/net/wifi/ESPEasyWiFi_state_machine.h index 39abaf9b6..d15e0885f 100644 --- a/src/ESPEasy/net/wifi/ESPEasyWiFi_state_machine.h +++ b/src/ESPEasy/net/wifi/ESPEasyWiFi_state_machine.h @@ -4,7 +4,7 @@ #if FEATURE_WIFI -# include "../../../src/DataStructs/WiFi_AP_Candidate.h" +# include "../DataStructs/WiFi_AP_Candidate.h" # include "../../../src/Helpers/LongTermTimer.h" # include "../wifi/WiFi_STA_connected_state.h" diff --git a/src/ESPEasy/net/wifi/ESPEasyWifi.cpp b/src/ESPEasy/net/wifi/ESPEasyWifi.cpp index 1d30ea4ac..3b1f93d7f 100644 --- a/src/ESPEasy/net/wifi/ESPEasyWifi.cpp +++ b/src/ESPEasy/net/wifi/ESPEasyWifi.cpp @@ -13,7 +13,7 @@ # include "../../../src/Globals/SecuritySettings.h" # include "../../../src/Globals/Services.h" # include "../../../src/Globals/Settings.h" -# include "../../../src/Globals/WiFi_AP_Candidates.h" +# include "../Globals/WiFi_AP_Candidates.h" # include "../../../src/Helpers/ESPEasy_time_calc.h" # include "../../../src/Helpers/Hardware_defines.h" # include "../../../src/Helpers/Misc.h" diff --git a/src/ESPEasy/net/wifi/ESPEasyWifi.h b/src/ESPEasy/net/wifi/ESPEasyWifi.h index c6218e77e..617d58e40 100644 --- a/src/ESPEasy/net/wifi/ESPEasyWifi.h +++ b/src/ESPEasy/net/wifi/ESPEasyWifi.h @@ -12,7 +12,7 @@ # endif // if defined(ESP32) # include "../wifi/WiFiConnectionProtocol.h" -# include "../../../src/DataStructs/WiFi_AP_Candidate.h" +# include "../DataStructs/WiFi_AP_Candidate.h" # include "../../../src/Helpers/LongTermTimer.h" diff --git a/src/ESPEasy/net/wifi/ESPEasyWifi_ProcessEvent.cpp b/src/ESPEasy/net/wifi/ESPEasyWifi_ProcessEvent.cpp index 4d6b14f21..b4c8cd16e 100644 --- a/src/ESPEasy/net/wifi/ESPEasyWifi_ProcessEvent.cpp +++ b/src/ESPEasy/net/wifi/ESPEasyWifi_ProcessEvent.cpp @@ -16,7 +16,7 @@ # include "../../../src/Globals/SecuritySettings.h" # include "../../../src/Globals/Services.h" # include "../../../src/Globals/Settings.h" -# include "../../../src/Globals/WiFi_AP_Candidates.h" +# include "../Globals/WiFi_AP_Candidates.h" # include "../../../src/Helpers/Convert.h" # include "../../../src/Helpers/ESPEasyRTC.h" diff --git a/src/ESPEasy/net/wifi/ESPEasyWifi_abstracted.cpp b/src/ESPEasy/net/wifi/ESPEasyWifi_abstracted.cpp index 560d94811..858ff2e45 100644 --- a/src/ESPEasy/net/wifi/ESPEasyWifi_abstracted.cpp +++ b/src/ESPEasy/net/wifi/ESPEasyWifi_abstracted.cpp @@ -7,7 +7,7 @@ # include "../../../src/Globals/SecuritySettings.h" # include "../../../src/Globals/Services.h" # include "../../../src/Globals/Settings.h" -# include "../../../src/Globals/WiFi_AP_Candidates.h" +# include "../Globals/WiFi_AP_Candidates.h" # include "../../../src/Helpers/StringConverter.h" # include "../Globals/ESPEasyWiFiEvent.h" # include "../Globals/ESPEasyWiFi.h" diff --git a/src/ESPEasy/net/wifi/ESPEasyWifi_abstracted_ESP32.cpp b/src/ESPEasy/net/wifi/ESPEasyWifi_abstracted_ESP32.cpp index 6df94a408..4f16c323c 100644 --- a/src/ESPEasy/net/wifi/ESPEasyWifi_abstracted_ESP32.cpp +++ b/src/ESPEasy/net/wifi/ESPEasyWifi_abstracted_ESP32.cpp @@ -6,7 +6,7 @@ # include "../../../src/DataStructs/TimingStats.h" # include "../../../src/Globals/EventQueue.h" # include "../../../src/Globals/Settings.h" -# include "../../../src/Globals/WiFi_AP_Candidates.h" +# include "../Globals/WiFi_AP_Candidates.h" # include "../../../src/Helpers/StringConverter.h" # include "../../net/ESPEasyNetwork.h" // Needed for NetworkCreateRFCCompliantHostname, WiFi code should not include network code diff --git a/src/ESPEasy/net/wifi/ESPEasyWifi_abstracted_ESP8266.cpp b/src/ESPEasy/net/wifi/ESPEasyWifi_abstracted_ESP8266.cpp index bb11f699c..3c487316e 100644 --- a/src/ESPEasy/net/wifi/ESPEasyWifi_abstracted_ESP8266.cpp +++ b/src/ESPEasy/net/wifi/ESPEasyWifi_abstracted_ESP8266.cpp @@ -6,7 +6,7 @@ # include "../../../src/DataStructs/TimingStats.h" # include "../../../src/Helpers/StringConverter.h" # include "../../../src/Globals/Settings.h" -# include "../../../src/Globals/WiFi_AP_Candidates.h" +# include "../Globals/WiFi_AP_Candidates.h" # include "../Globals/ESPEasyWiFiEvent.h" # include "../wifi/ESPEasyWiFiEvent_ESP8266.h" diff --git a/src/src/DataStructs/Caches.cpp b/src/src/DataStructs/Caches.cpp index b3fc6ac5c..9a9cff5bc 100644 --- a/src/src/DataStructs/Caches.cpp +++ b/src/src/DataStructs/Caches.cpp @@ -3,7 +3,8 @@ #include "../Globals/Device.h" #include "../Globals/ExtraTaskSettings.h" #include "../Globals/Settings.h" -#include "../Globals/WiFi_AP_Candidates.h" + +#include "../../ESPEasy/net/Globals/WiFi_AP_Candidates.h" #include "../Helpers/ESPEasy_Storage.h" #include "../Helpers/StringConverter.h" @@ -20,7 +21,7 @@ void Caches::clearAllCaches() void Caches::clearAllButTaskCaches() { clearFileCaches(); - WiFi_AP_Candidates.clearCache(); + ESPEasy::net::wifi::WiFi_AP_Candidates.clearCache(); rulesHelper.closeAllFiles(); } diff --git a/src/src/DataStructs/WiFi_AP_Candidates_NVS.h b/src/src/DataStructs/WiFi_AP_Candidates_NVS.h deleted file mode 100644 index 45e96d675..000000000 --- a/src/src/DataStructs/WiFi_AP_Candidates_NVS.h +++ /dev/null @@ -1,20 +0,0 @@ -#ifndef DATASTRUCTS_WIFI_AP_CANDIDATES_NVS_H -#define DATASTRUCTS_WIFI_AP_CANDIDATES_NVS_H - -#include "../../ESPEasy_common.h" - -#ifdef ESP32 -#include "../DataStructs/WiFi_AP_Candidate.h" - -class WiFi_AP_Candidates_NVS { -public: - - static bool loadCandidate_from_NVS(WiFi_AP_Candidate& candidate); - - static void currentConnection_to_NVS(const WiFi_AP_Candidate& candidate); - - static void clear_from_NVS(); -}; - -#endif -#endif \ No newline at end of file diff --git a/src/src/ESPEasyCore/ESPEasy_setup.cpp b/src/src/ESPEasyCore/ESPEasy_setup.cpp index 28cbf86f6..93976f9f0 100644 --- a/src/src/ESPEasyCore/ESPEasy_setup.cpp +++ b/src/src/ESPEasyCore/ESPEasy_setup.cpp @@ -20,7 +20,7 @@ #include "../../ESPEasy/net/Globals/NetworkState.h" #include "../Globals/RTC.h" #include "../Globals/Statistics.h" -#include "../Globals/WiFi_AP_Candidates.h" +#include "../../ESPEasy/net/Globals/WiFi_AP_Candidates.h" #include "../Helpers/_CPlugin_init.h" #include "../../ESPEasy/net/Helpers/_NWPlugin_init.h" #include "../Helpers/_NPlugin_init.h" @@ -463,11 +463,11 @@ void ESPEasy_setup() //check_and_update_WiFi_Calibration(); #endif - WiFi_AP_Candidates.clearCache(); - WiFi_AP_Candidates.load_knownCredentials(); + ESPEasy::net::wifi::WiFi_AP_Candidates.clearCache(); + ESPEasy::net::wifi::WiFi_AP_Candidates.load_knownCredentials(); ESPEasy::net::wifi::setSTA(true); - if (!WiFi_AP_Candidates.hasCandidateCredentials()) { + if (!ESPEasy::net::wifi::WiFi_AP_Candidates.hasCandidateCredentials()) { WiFiEventData.wifiSetup = true; RTC.clearLastWiFi(); // Must scan all channels // Wait until scan has finished to make sure as many as possible are found @@ -479,14 +479,14 @@ void ESPEasy_setup() // Always perform WiFi scan // It appears reconnecting from RTC may take just as long to be able to send first packet as performing a scan first and then connect. // Perhaps the WiFi radio needs some time to stabilize first? - if (!WiFi_AP_Candidates.hasCandidates()) { + if (!ESPEasy::net::wifi::WiFi_AP_Candidates.hasCandidates()) { ESPEasy::net::wifi::WifiScan(false, RTC.lastWiFiChannel); } - WiFi_AP_Candidates.clearCache(); + ESPEasy::net::wifi::WiFi_AP_Candidates.clearCache(); ESPEasy::net::wifi::processScanDone(); - WiFi_AP_Candidates.load_knownCredentials(); + ESPEasy::net::wifi::WiFi_AP_Candidates.load_knownCredentials(); - if (!WiFi_AP_Candidates.hasCandidates()) { + if (!ESPEasy::net::wifi::WiFi_AP_Candidates.hasCandidates()) { #ifndef BUILD_MINIMAL_OTA addLog(LOG_LEVEL_INFO, F("Setup: Scan all channels")); #endif diff --git a/src/src/Globals/WiFi_AP_Candidates.cpp b/src/src/Globals/WiFi_AP_Candidates.cpp deleted file mode 100644 index 0c188328a..000000000 --- a/src/src/Globals/WiFi_AP_Candidates.cpp +++ /dev/null @@ -1,3 +0,0 @@ -#include "../Globals/WiFi_AP_Candidates.h" - -WiFi_AP_CandidatesList WiFi_AP_Candidates; diff --git a/src/src/Globals/WiFi_AP_Candidates.h b/src/src/Globals/WiFi_AP_Candidates.h deleted file mode 100644 index 8e8019c82..000000000 --- a/src/src/Globals/WiFi_AP_Candidates.h +++ /dev/null @@ -1,10 +0,0 @@ -#ifndef GLOBALS_WIFI_AP_CANDIDATES_H -#define GLOBALS_WIFI_AP_CANDIDATES_H - -#include "../Helpers/WiFi_AP_CandidatesList.h" - - -extern WiFi_AP_CandidatesList WiFi_AP_Candidates; - - -#endif // ifndef GLOBALS_WIFI_AP_CANDIDATES_H diff --git a/src/src/Helpers/ESPEasy_Storage.cpp b/src/src/Helpers/ESPEasy_Storage.cpp index f77ac9746..d7be07c88 100644 --- a/src/src/Helpers/ESPEasy_Storage.cpp +++ b/src/src/Helpers/ESPEasy_Storage.cpp @@ -35,7 +35,7 @@ #include "../Globals/RuntimeData.h" #include "../Globals/SecuritySettings.h" #include "../Globals/Settings.h" -#include "../Globals/WiFi_AP_Candidates.h" +#include "../../ESPEasy/net/Globals/WiFi_AP_Candidates.h" #include "../Helpers/ESPEasyRTC.h" #include "../Helpers/ESPEasy_checks.h" @@ -863,7 +863,7 @@ String SaveSecuritySettings(bool forFactoryReset) { // Security settings are saved, may be update of WiFi settings or hostname. if (!forFactoryReset) { if (SecuritySettings.hasWiFiCredentials() && (active_network_medium == ESPEasy::net::NetworkMedium_t::WIFI)) { - WiFi_AP_Candidates.force_reload(); // Force reload of the credentials and found APs from the last scan + ESPEasy::net::wifi::WiFi_AP_Candidates.force_reload(); // Force reload of the credentials and found APs from the last scan if (!ESPEasy::net::NetworkConnected()) { WiFiEventData.wifiConnectAttemptNeeded = true; ESPEasy::net::wifi::resetWiFi(); diff --git a/src/src/Helpers/PeriodicalActions.cpp b/src/src/Helpers/PeriodicalActions.cpp index b6c217400..82e44dbb6 100644 --- a/src/src/Helpers/PeriodicalActions.cpp +++ b/src/src/Helpers/PeriodicalActions.cpp @@ -22,7 +22,7 @@ #include "../Globals/Services.h" #include "../Globals/Settings.h" #include "../Globals/Statistics.h" -#include "../Globals/WiFi_AP_Candidates.h" +#include "../../ESPEasy/net/Globals/WiFi_AP_Candidates.h" #include "../Helpers/ESPEasyRTC.h" #include "../Helpers/FS_Helper.h" #include "../Helpers/Hardware_temperature_sensor.h" @@ -248,7 +248,7 @@ void runEach30Seconds() // addLogMove(LOG_LEVEL_INFO, ESPEASY_SERIAL_CONSOLE_PORT.getLogString()); #endif } - WiFi_AP_Candidates.purge_expired(); + ESPEasy::net::wifi::WiFi_AP_Candidates.purge_expired(); #if FEATURE_ESPEASY_P2P sendSysInfoUDP(1); refreshNodeList(); diff --git a/src/src/Helpers/StringProvider.cpp b/src/src/Helpers/StringProvider.cpp index 3808bc005..eac010bf3 100644 --- a/src/src/Helpers/StringProvider.cpp +++ b/src/src/Helpers/StringProvider.cpp @@ -28,7 +28,7 @@ #include "../../ESPEasy/net/Globals/NetworkState.h" #include "../Globals/SecuritySettings.h" #include "../Globals/Settings.h" -#include "../Globals/WiFi_AP_Candidates.h" +#include "../../ESPEasy/net/Globals/WiFi_AP_Candidates.h" #include "../Helpers/Convert.h" #include "../Helpers/ESPEasy_Storage.h" @@ -509,7 +509,7 @@ String getValue(LabelType::Enum label) { case LabelType::SSID: return WiFi.SSID(); case LabelType::BSSID: return WiFi.BSSIDstr(); case LabelType::CHANNEL: retval = WiFi.channel(); break; - case LabelType::ENCRYPTION_TYPE_STA: return // WiFi_AP_Candidates.getCurrent().encryption_type(); + case LabelType::ENCRYPTION_TYPE_STA: return // ESPEasy::net::wifi::WiFi_AP_Candidates.getCurrent().encryption_type(); WiFi_encryptionType(WiFiEventData.auth_mode); #endif case LabelType::CONNECTED: diff --git a/src/src/WebServer/SetupPage.cpp b/src/src/WebServer/SetupPage.cpp index 959af6f03..7884c3522 100644 --- a/src/src/WebServer/SetupPage.cpp +++ b/src/src/WebServer/SetupPage.cpp @@ -20,7 +20,7 @@ # include "../Globals/RTC.h" # include "../Globals/Settings.h" # include "../Globals/SecuritySettings.h" -# include "../Globals/WiFi_AP_Candidates.h" +# include "../../ESPEasy/net/Globals/WiFi_AP_Candidates.h" # include "../Helpers/Misc.h" # include "../Helpers/Networking.h" @@ -121,7 +121,7 @@ void handle_setup() { addHtmlError(SaveSettings()); WiFiEventData.wifiSetupConnect = true; WiFiEventData.wifiConnectAttemptNeeded = true; - WiFi_AP_Candidates.force_reload(); // Force reload of the credentials and found APs from the last scan + ESPEasy::net::wifi::WiFi_AP_Candidates.force_reload(); // Force reload of the credentials and found APs from the last scan if (loglevelActiveFor(LOG_LEVEL_INFO)) { String reconnectlog = F("WIFI : Credentials Changed, retry connection. SSID: "); @@ -242,7 +242,7 @@ void handle_setup() { } void handle_setup_scan_and_show(const String& ssid, const String& other, const String& password) { - int8_t scanCompleteStatus = WiFi_AP_Candidates.scanComplete(); + int8_t scanCompleteStatus = ESPEasy::net::wifi::WiFi_AP_Candidates.scanComplete(); const bool needsRescan = (scanCompleteStatus == 0 || // No AP found scanCompleteStatus == -2) // Scan not triggered @@ -250,7 +250,7 @@ void handle_setup_scan_and_show(const String& ssid, const String& other, const S if (needsRescan) { WiFiMode_t cur_wifimode = WiFi.getMode(); ESPEasy::net::wifi::WifiScan(false); - scanCompleteStatus = WiFi_AP_Candidates.scanComplete(); + scanCompleteStatus = ESPEasy::net::wifi::WiFi_AP_Candidates.scanComplete(); ESPEasy::net::wifi::setWifiMode(cur_wifimode); } @@ -266,7 +266,7 @@ void handle_setup_scan_and_show(const String& ssid, const String& other, const S html_table_header(F("Network info")); html_table_header(F("RSSI"), 50); - for (auto it = WiFi_AP_Candidates.scanned_begin(); it != WiFi_AP_Candidates.scanned_end(); ++it) + for (auto it = ESPEasy::net::wifi::WiFi_AP_Candidates.scanned_begin(); it != ESPEasy::net::wifi::WiFi_AP_Candidates.scanned_end(); ++it) { html_TR_TD(); const String id = it->toString(""); @@ -289,7 +289,7 @@ void handle_setup_scan_and_show(const String& ssid, const String& other, const S { if (it->bssid_match(RTC.lastBSSID)) { - if (!WiFi_AP_Candidates.SettingsIndexMatchCustomCredentials(RTC.lastWiFiSettingsIndex)) { + if (!ESPEasy::net::wifi::WiFi_AP_Candidates.SettingsIndexMatchCustomCredentials(RTC.lastWiFiSettingsIndex)) { addHtml(F(" checked ")); } } diff --git a/src/src/WebServer/WiFiScanner.cpp b/src/src/WebServer/WiFiScanner.cpp index 84f03d644..9b73cb6b3 100644 --- a/src/src/WebServer/WiFiScanner.cpp +++ b/src/src/WebServer/WiFiScanner.cpp @@ -6,7 +6,7 @@ #include "../../ESPEasy/net/wifi/ESPEasyWifi.h" -#include "../Globals/WiFi_AP_Candidates.h" +#include "../../ESPEasy/net/Globals/WiFi_AP_Candidates.h" #include "../Helpers/StringGenerator_WiFi.h" #ifdef USES_ESPEASY_NOW @@ -29,13 +29,13 @@ void handle_wifiscanner_json() { addHtml('[', '{'); bool firstentry = true; - if (WiFi_AP_Candidates.scanComplete() <= 0) { + if (ESPEasy::net::wifi::WiFi_AP_Candidates.scanComplete() <= 0) { WiFiMode_t cur_wifimode = WiFi.getMode(); ESPEasy::net::wifi::WifiScan(false); ESPEasy::net::wifi::setWifiMode(cur_wifimode); } - for (auto it = WiFi_AP_Candidates.scanned_begin(); it != WiFi_AP_Candidates.scanned_end(); ++it) + for (auto it = ESPEasy::net::wifi::WiFi_AP_Candidates.scanned_begin(); it != ESPEasy::net::wifi::WiFi_AP_Candidates.scanned_end(); ++it) { if (firstentry) { firstentry = false; } else { addHtml(',', '{'); } @@ -68,7 +68,7 @@ void handle_wifiscanner() { WiFiMode_t cur_wifimode = WiFi.getMode(); ESPEasy::net::wifi::WifiScan(false); - int8_t scanCompleteStatus = WiFi_AP_Candidates.scanComplete(); + int8_t scanCompleteStatus = ESPEasy::net::wifi::WiFi_AP_Candidates.scanComplete(); ESPEasy::net::wifi::setWifiMode(cur_wifimode); navMenuIndex = MENU_INDEX_TOOLS; @@ -86,7 +86,7 @@ void handle_wifiscanner() { } else { - for (auto it = WiFi_AP_Candidates.scanned_begin(); it != WiFi_AP_Candidates.scanned_end(); ++it) + for (auto it = ESPEasy::net::wifi::WiFi_AP_Candidates.scanned_begin(); it != ESPEasy::net::wifi::WiFi_AP_Candidates.scanned_end(); ++it) { html_TR_TD(); addHtml(it->toString(F(""))); From d69fcdb505bc5c38854cbd38789b49b5d5663590 Mon Sep 17 00:00:00 2001 From: TD-er Date: Sun, 27 Jul 2025 21:43:44 +0200 Subject: [PATCH 154/564] [Network] Fix setting up last network/controller entry --- src/ESPEasy/net/eth/ESPEasyEth.cpp | 4 +++- src/src/WebServer/ControllerPage.cpp | 2 +- src/src/WebServer/NetworkPage.cpp | 10 +++++----- 3 files changed, 9 insertions(+), 7 deletions(-) diff --git a/src/ESPEasy/net/eth/ESPEasyEth.cpp b/src/ESPEasy/net/eth/ESPEasyEth.cpp index ffb22296a..935506334 100644 --- a/src/ESPEasy/net/eth/ESPEasyEth.cpp +++ b/src/ESPEasy/net/eth/ESPEasyEth.cpp @@ -96,10 +96,12 @@ void ethPrintSettings() { log += F(" PHY Addr: "); log += Settings.ETH_Phy_Addr; +# if CONFIG_ETH_USE_ESP32_EMAC && FEATURE_ETHERNET if (!isSPI_EthernetType(Settings.ETH_Phy_Type)) { log += F(" Eth Clock mode: "); - log += toString(Settings.ETH_Clock_Mode); + log += ESPEasy::net::toString(Settings.ETH_Clock_Mode); } +#endif log += strformat(isSPI_EthernetType(Settings.ETH_Phy_Type) ? F(" CS: %d IRQ: %d RST: %d") : F(" MDC: %d MIO: %d PWR: %d"), Settings.ETH_Pin_mdc_cs, diff --git a/src/src/WebServer/ControllerPage.cpp b/src/src/WebServer/ControllerPage.cpp index bd2a38bb6..8d452017a 100644 --- a/src/src/WebServer/ControllerPage.cpp +++ b/src/src/WebServer/ControllerPage.cpp @@ -45,7 +45,7 @@ void handle_controllers() { // 'index' value in the URL uint8_t controllerindex = getFormItemInt(F("index"), 0); - const bool controllerIndexSet = controllerindex != 0 && validControllerIndex(controllerindex); + const bool controllerIndexSet = controllerindex != 0 && validControllerIndex(controllerindex - 1); --controllerindex; // Index in URL is starting from 1, but starting from 0 in the array. const int protocol_webarg_value = getFormItemInt(F("protocol"), -1); diff --git a/src/src/WebServer/NetworkPage.cpp b/src/src/WebServer/NetworkPage.cpp index 75cbef9ad..2a5f9a4f3 100644 --- a/src/src/WebServer/NetworkPage.cpp +++ b/src/src/WebServer/NetworkPage.cpp @@ -34,13 +34,13 @@ void handle_networks() // 'index' value in the URL uint8_t networkindex = getFormItemInt(F("index"), 0); - boolean networkNotSet = networkindex == 0; + const bool networkIndexSet = networkindex != 0 && validNetworkIndex(networkindex - 1); --networkindex; // Index in URL is starting from 1, but starting from 0 in the array. const int networkDriver_webarg_value = getFormItemInt(F("networkDriver"), -1); // submitted data - if ((networkDriver_webarg_value != -1) && !networkNotSet) + if ((networkDriver_webarg_value != -1) && networkIndexSet) { bool mustInit = false; bool mustCallNWpluginSave = false; @@ -113,13 +113,13 @@ void handle_networks() html_add_form(); - if (networkNotSet) + if (networkIndexSet) { - handle_networks_ShowAllNetworksTable(); + handle_networks_NetworkSettingsPage(networkindex); } else { - handle_networks_NetworkSettingsPage(networkindex); + handle_networks_ShowAllNetworksTable(); } sendHeadandTail_stdtemplate(_TAIL); From 3a54863b61d821ca13739bdb5773436e9b2f70ab Mon Sep 17 00:00:00 2001 From: TD-er Date: Mon, 28 Jul 2025 00:59:20 +0200 Subject: [PATCH 155/564] [Network] Move WiFi init code to NW001_WiFi_STA plugin --- src/ESPEasy/net/_NW001_WiFi_STA.cpp | 61 +++++++++++++++++++++++++++ src/src/ESPEasyCore/ESPEasy_loop.cpp | 2 +- src/src/ESPEasyCore/ESPEasy_setup.cpp | 41 ++---------------- 3 files changed, 65 insertions(+), 39 deletions(-) diff --git a/src/ESPEasy/net/_NW001_WiFi_STA.cpp b/src/ESPEasy/net/_NW001_WiFi_STA.cpp index 5282d1df9..b3ef6a248 100644 --- a/src/ESPEasy/net/_NW001_WiFi_STA.cpp +++ b/src/ESPEasy/net/_NW001_WiFi_STA.cpp @@ -11,6 +11,7 @@ # define NWPLUGIN_NAME_001 "WiFi Station" # include "../../src/DataStructs/ESPEasy_EventStruct.h" +# include "../../src/Globals/RTC.h" # include "../../src/Globals/SecuritySettings.h" # include "../../src/Globals/Settings.h" # include "../../src/Helpers/ESPEasy_Storage.h" @@ -23,11 +24,14 @@ # include "../../src/WebServer/Markup_Forms.h" # include "../../src/WebServer/common.h" # include "../net/ESPEasyNetwork.h" +# include "../net/Globals/ESPEasyWiFiEvent.h" # include "../net/Globals/NWPlugins.h" +# include "../net/Globals/WiFi_AP_Candidates.h" # include "../net/Helpers/_NWPlugin_Helper_webform.h" # include "../net/Helpers/_NWPlugin_init.h" # include "../net/NWPluginStructs/NW001_WiFi_STA.h" # include "../net/wifi/ESPEasyWifi.h" +# include "../net/wifi/ESPEasyWifi_ProcessEvent.h" # ifdef ESP32P4 @@ -275,6 +279,55 @@ bool NWPlugin_001(NWPlugin::Function function, EventStruct *event, String& strin case NWPlugin::Function::NWPLUGIN_INIT: { + /* + // Taken from ESPEasy_setup() + // Might no longer be needed as we now have a proper WiFi state machine. + + # ifdef ESP32 + + // FIXME TD-er: Disabled for now, as this may not return and thus block the ESP forever. + // See: https://github.com/espressif/esp-idf/issues/15862 + // check_and_update_WiFi_Calibration(); + # endif // ifdef ESP32 + + ESPEasy::net::wifi::WiFi_AP_Candidates.clearCache(); + ESPEasy::net::wifi::WiFi_AP_Candidates.load_knownCredentials(); + ESPEasy::net::wifi::setSTA(true); + + if (!ESPEasy::net::wifi::WiFi_AP_Candidates.hasCandidateCredentials()) { + WiFiEventData.wifiSetup = true; + RTC.clearLastWiFi(); // Must scan all channels + // Wait until scan has finished to make sure as many as possible are found + // We're still in the setup phase, so nothing else is taking resources of the ESP. + ESPEasy::net::wifi::WifiScan(false); + WiFiEventData.lastScanMoment.clear(); + } + + + + // Always perform WiFi scan + // It appears reconnecting from RTC may take just as long to be able to send first packet as performing a scan first and then + #connect. + // Perhaps the WiFi radio needs some time to stabilize first? + if (!ESPEasy::net::wifi::WiFi_AP_Candidates.hasCandidates()) { + ESPEasy::net::wifi::WifiScan(false, RTC.lastWiFiChannel); + } + ESPEasy::net::wifi::WiFi_AP_Candidates.clearCache(); + ESPEasy::net::wifi::processScanDone(); + ESPEasy::net::wifi::WiFi_AP_Candidates.load_knownCredentials(); + + if (!ESPEasy::net::wifi::WiFi_AP_Candidates.hasCandidates()) { + # ifndef BUILD_MINIMAL_OTA + addLog(LOG_LEVEL_INFO, F("Setup: Scan all channels")); + # endif + ESPEasy::net::wifi::WifiScan(false); + } + + // ESPEasy::net::wifi::setWifiMode(WIFI_OFF); + */ + + ESPEasy::net::wifi::initWiFi(); + break; } @@ -283,6 +336,14 @@ bool NWPlugin_001(NWPlugin::Function function, EventStruct *event, String& strin break; } + case NWPlugin::Function::NWPLUGIN_FIFTY_PER_SECOND: + { + // FIXME TD-er: Also called in ESPEasy_loop() + // Is it still needed there? + ESPEasy::net::wifi::loopWiFi(); + break; + } + default: break; diff --git a/src/src/ESPEasyCore/ESPEasy_loop.cpp b/src/src/ESPEasyCore/ESPEasy_loop.cpp index cd14d962d..78c7c0c9a 100644 --- a/src/src/ESPEasyCore/ESPEasy_loop.cpp +++ b/src/src/ESPEasyCore/ESPEasy_loop.cpp @@ -73,7 +73,7 @@ void ESPEasy_loop() updateLoopStats(); - ESPEasy::net::wifi::loopWiFi(); +// ESPEasy::net::wifi::loopWiFi(); ESPEasy::net::wifi::handle_unprocessedNetworkEvents(); diff --git a/src/src/ESPEasyCore/ESPEasy_setup.cpp b/src/src/ESPEasyCore/ESPEasy_setup.cpp index 93976f9f0..f1f1543a8 100644 --- a/src/src/ESPEasyCore/ESPEasy_setup.cpp +++ b/src/src/ESPEasyCore/ESPEasy_setup.cpp @@ -449,52 +449,17 @@ void ESPEasy_setup() } #endif // if FEATURE_ETHERNET + // FIXME TD-er: This network medium setting may be obsolete as we need a priority scale/order ESPEasy::net::setNetworkMedium(Settings.NetworkMedium); - +/* bool initWiFi = active_network_medium == ESPEasy::net::NetworkMedium_t::WIFI; // FIXME TD-er: Must add another check for 'delayed start WiFi' for poorly designed ESP8266 nodes. if (initWiFi) { -#ifdef ESP32 - // FIXME TD-er: Disabled for now, as this may not return and thus block the ESP forever. - // See: https://github.com/espressif/esp-idf/issues/15862 - //check_and_update_WiFi_Calibration(); -#endif - - ESPEasy::net::wifi::WiFi_AP_Candidates.clearCache(); - ESPEasy::net::wifi::WiFi_AP_Candidates.load_knownCredentials(); - ESPEasy::net::wifi::setSTA(true); - - if (!ESPEasy::net::wifi::WiFi_AP_Candidates.hasCandidateCredentials()) { - WiFiEventData.wifiSetup = true; - RTC.clearLastWiFi(); // Must scan all channels - // Wait until scan has finished to make sure as many as possible are found - // We're still in the setup phase, so nothing else is taking resources of the ESP. - ESPEasy::net::wifi::WifiScan(false); - WiFiEventData.lastScanMoment.clear(); - } - - // Always perform WiFi scan - // It appears reconnecting from RTC may take just as long to be able to send first packet as performing a scan first and then connect. - // Perhaps the WiFi radio needs some time to stabilize first? - if (!ESPEasy::net::wifi::WiFi_AP_Candidates.hasCandidates()) { - ESPEasy::net::wifi::WifiScan(false, RTC.lastWiFiChannel); - } - ESPEasy::net::wifi::WiFi_AP_Candidates.clearCache(); - ESPEasy::net::wifi::processScanDone(); - ESPEasy::net::wifi::WiFi_AP_Candidates.load_knownCredentials(); - - if (!ESPEasy::net::wifi::WiFi_AP_Candidates.hasCandidates()) { - #ifndef BUILD_MINIMAL_OTA - addLog(LOG_LEVEL_INFO, F("Setup: Scan all channels")); - #endif - ESPEasy::net::wifi::WifiScan(false); - } - - // ESPEasy::net::wifi::setWifiMode(WIFI_OFF); } + */ #ifndef BUILD_NO_RAM_TRACKER logMemUsageAfter(F("WifiScan()")); #endif // ifndef BUILD_NO_RAM_TRACKER From b64534db7438bc19ab630ab357f450b8051aa256 Mon Sep 17 00:00:00 2001 From: TD-er Date: Mon, 28 Jul 2025 22:45:55 +0200 Subject: [PATCH 156/564] [MQTT AutoDiscovery] Fix merge issues --- src/ESPEasy/net/ESPEasyNetwork.cpp | 30 ++++++++++-------------- src/ESPEasy/net/ESPEasyNetwork.h | 1 + src/src/Helpers/_CPlugin_Helper_mqtt.cpp | 2 +- 3 files changed, 15 insertions(+), 18 deletions(-) diff --git a/src/ESPEasy/net/ESPEasyNetwork.cpp b/src/ESPEasy/net/ESPEasyNetwork.cpp index f474b632e..61c632282 100644 --- a/src/ESPEasy/net/ESPEasyNetwork.cpp +++ b/src/ESPEasy/net/ESPEasyNetwork.cpp @@ -24,53 +24,49 @@ String NetworkGetHostNameFromSettings(bool force_add_unitnr) } String NetworkCreateRFCCompliantHostname(bool force_add_unitnr) { - String hostname(NetworkGetHostNameFromSettings(force_add_unitnr)); - // Create hostname with - instead of spaces + return makeRFCCompliantName(NetworkGetHostNameFromSettings(force_add_unitnr)); +} - // See RFC952. +String makeRFCCompliantName(const String& name, const char replaceChar, const char allowedChar, const size_t maxlength) { + String hostname(name); + // See RFC952. (when using the default arguments: '-', '-', 24) // Allowed chars: // * letters (a-z, A-Z) // * numerals (0-9) // * Hyphen (-) - replaceUnicodeByChar(hostname, '-'); - + // * Max length 24 + replaceUnicodeByChar(hostname, replaceChar); for (size_t i = 0; i < hostname.length(); ++i) { const char c = hostname[i]; - - if (!isAlphaNumeric(c)) { - hostname[i] = '-'; + if (!isAlphaNumeric(c) && (c != allowedChar)) { + hostname[i] = replaceChar; } } // May not start or end with a hyphen - const String dash('-'); - + const String dash(replaceChar); while (hostname.startsWith(dash)) { hostname = hostname.substring(1); } - while (hostname.endsWith(dash)) { hostname = hostname.substring(0, hostname.length() - 1); } // May not contain only numerals bool onlyNumerals = true; - for (size_t i = 0; onlyNumerals && i < hostname.length(); ++i) { const char c = hostname[i]; - if (!isdigit(c)) { onlyNumerals = false; } } - if (onlyNumerals) { - hostname = concat(F("ESPEasy-"), hostname); + hostname = strformat(F("ESPEasy%c%s"), replaceChar, hostname.c_str()); } - if (hostname.length() > 24) { - hostname = hostname.substring(0, 24); + if ((maxlength > 0) && (hostname.length() > maxlength)) { + hostname = hostname.substring(0, maxlength); } return hostname; diff --git a/src/ESPEasy/net/ESPEasyNetwork.h b/src/ESPEasy/net/ESPEasyNetwork.h index cc8720664..abbbb5fa1 100644 --- a/src/ESPEasy/net/ESPEasyNetwork.h +++ b/src/ESPEasy/net/ESPEasyNetwork.h @@ -45,6 +45,7 @@ MAC_address NetworkMacAddress(); String NetworkGetHostNameFromSettings(bool force_add_unitnr = false); String NetworkGetHostname(); String NetworkCreateRFCCompliantHostname(bool force_add_unitnr = false); +String makeRFCCompliantName(const String& name, const char replaceChar = '-', const char allowedChar = '-', const size_t maxlength = 24); #if FEATURE_WIFI MAC_address WifiSoftAPmacAddress(); MAC_address WifiSTAmacAddress(); diff --git a/src/src/Helpers/_CPlugin_Helper_mqtt.cpp b/src/src/Helpers/_CPlugin_Helper_mqtt.cpp index 79df1977d..3a99717b7 100644 --- a/src/src/Helpers/_CPlugin_Helper_mqtt.cpp +++ b/src/src/Helpers/_CPlugin_Helper_mqtt.cpp @@ -406,7 +406,7 @@ int Plugin_QueryVType_Weight(uint8_t value_nr) { } String makeHomeAssistantCompliantName(const String& name) { - return makeRFCCompliantName(name, '_', '_', 0); + return ESPEasy::net::makeRFCCompliantName(name, '_', '_', 0); } # if FEATURE_MQTT_DEVICECLASS From 282feb85a5a8d80bc9bb6fdf0051649714184fb6 Mon Sep 17 00:00:00 2001 From: TD-er Date: Tue, 29 Jul 2025 21:43:45 +0200 Subject: [PATCH 157/564] [PPP modem] Make init of PPP modem more reliable --- .../net/DataStructs/EthernetEventData.cpp | 4 +- src/ESPEasy/net/ESPEasyNetwork_ESP32.cpp | 4 +- .../NW005_data_struct_PPP_modem.cpp | 159 +++++++++++++----- .../NW005_data_struct_PPP_modem.h | 41 +++-- src/ESPEasy/net/_NW005_PPP_modem.cpp | 5 + .../net/wifi/ESPEasyWiFiEvent_ESP32.cpp | 23 +-- .../net/wifi/ESPEasyWiFi_state_machine.cpp | 2 +- src/src/ESPEasyCore/Controller.cpp | 2 + src/src/Globals/MQTT.cpp | 2 +- src/src/Globals/MQTT.h | 2 + src/src/Helpers/LongTermOnOffTimer.cpp | 86 ++++++++++ src/src/Helpers/LongTermOnOffTimer.h | 51 ++++++ src/src/Helpers/PeriodicalActions.cpp | 6 + 13 files changed, 300 insertions(+), 87 deletions(-) create mode 100644 src/src/Helpers/LongTermOnOffTimer.cpp create mode 100644 src/src/Helpers/LongTermOnOffTimer.h diff --git a/src/ESPEasy/net/DataStructs/EthernetEventData.cpp b/src/ESPEasy/net/DataStructs/EthernetEventData.cpp index 4597964b4..5fcc7c3e3 100644 --- a/src/ESPEasy/net/DataStructs/EthernetEventData.cpp +++ b/src/ESPEasy/net/DataStructs/EthernetEventData.cpp @@ -178,7 +178,7 @@ void EthernetEventData_t::markDisconnect() { lastConnectMoment.clear(); processedDisconnect = false; #if ESP_IDF_VERSION_MAJOR >= 5 - WiFi.STA.setDefault(); +// WiFi.STA.setDefault(); #endif } @@ -186,7 +186,7 @@ void EthernetEventData_t::markConnected() { lastConnectMoment.setNow(); processedConnect = false; #if ESP_IDF_VERSION_MAJOR >= 5 - ETH.setDefault(); +// ETH.setDefault(); #endif #if FEATURE_USE_IPV6 diff --git a/src/ESPEasy/net/ESPEasyNetwork_ESP32.cpp b/src/ESPEasy/net/ESPEasyNetwork_ESP32.cpp index 2d9e53abe..bf495ea01 100644 --- a/src/ESPEasy/net/ESPEasyNetwork_ESP32.cpp +++ b/src/ESPEasy/net/ESPEasyNetwork_ESP32.cpp @@ -69,11 +69,11 @@ void setNetworkMedium(NetworkMedium_t new_medium) { switch (new_medium) { case NetworkMedium_t::WIFI: - WiFi.STA.setDefault(); + //WiFi.STA.setDefault(); break; case NetworkMedium_t::Ethernet: #if FEATURE_ETHERNET - ETH.setDefault(); + //ETH.setDefault(); #endif // if FEATURE_ETHERNET break; case NetworkMedium_t::NotSet: diff --git a/src/ESPEasy/net/NWPluginStructs/NW005_data_struct_PPP_modem.cpp b/src/ESPEasy/net/NWPluginStructs/NW005_data_struct_PPP_modem.cpp index c2456aefc..4686d21e9 100644 --- a/src/ESPEasy/net/NWPluginStructs/NW005_data_struct_PPP_modem.cpp +++ b/src/ESPEasy/net/NWPluginStructs/NW005_data_struct_PPP_modem.cpp @@ -4,6 +4,8 @@ # include "../../../src/Globals/Settings.h" +# include "../../../src/Helpers/ESPEasy_time_calc.h" +# include "../../../src/Helpers/LongTermOnOffTimer.h" # include "../../../src/Helpers/StringConverter.h" # include "../../../src/Helpers/_Plugin_Helper_serial.h" @@ -22,6 +24,13 @@ namespace ESPEasy { namespace net { namespace ppp { + +static LongTermOnOffTimer _startStopStats; +static LongTermOnOffTimer _connectedStats; +static LongTermOnOffTimer _gotIPStats; +static LongTermOnOffTimer _gotIP6Stats; + + // Keys as used in the Key-value-store # define NW005_KEY_SERIAL_PORT 1 # define NW005_KEY_PIN_RX 2 @@ -80,7 +89,12 @@ const __FlashStringHelper* NW005_getLabelString(uint32_t key, bool displayString NW005_data_struct_PPP_modem::NW005_data_struct_PPP_modem(networkIndex_t networkIndex) : NWPluginData_base(nwpluginID_t(5), networkIndex) -{} +{ + _connectedStats.clear(); + _gotIPStats.clear(); + _gotIP6Stats.clear(); + nw_event_id = Network.onEvent(NW005_data_struct_PPP_modem::onEvent); +} WebFormItemParams NW005_makeWebFormItemParams(uint32_t key) { ESPEasy_key_value_store::StorageType storageType; @@ -98,6 +112,11 @@ NW005_data_struct_PPP_modem::~NW005_data_struct_PPP_modem() { PPP.mode(ESP_MODEM_MODE_COMMAND); PPP.end(); _modem_task_data.modem_initialized = false; + + if (nw_event_id != 0) { + Network.removeEvent(nw_event_id); + } + nw_event_id = 0; } enum class NW005_modem_model { @@ -271,7 +290,15 @@ const __FlashStringHelper* NW005_decode_label(int sysmode_index, uint8_t i, Stri void NW005_data_struct_PPP_modem::webform_load_UE_system_information() { - String res = PPP.cmd("AT+CPSI?", 1000); + if (!PPP.attached()) { + // clear cached string + _modem_task_data.AT_CPSI.clear(); + return; + } + + String res = write_AT_cmd(F("AT+CPSI?"), 1000); + + if (res.isEmpty()) { res = _modem_task_data.AT_CPSI; } if (!res.isEmpty() /* && res.startsWith(F("+CPSI"))*/) { int start_index = 0; @@ -291,6 +318,9 @@ void NW005_data_struct_PPP_modem::webform_load_UE_system_information() if (sysmode_index == -1) { return; } + // Update cached string + _modem_task_data.AT_CPSI = res; + addFormSubHeader(F("UE System Information")); res += ','; // Add trailing comma so we're not missing the last element @@ -628,6 +658,10 @@ void NW005_data_struct_PPP_modem::webform_load(EventStruct *event) */ webform_load_UE_system_information(); + + if (PPP.attached()) { + PPP.mode(ESP_MODEM_MODE_DATA); + } } void NW005_data_struct_PPP_modem::webform_save(EventStruct *event) @@ -698,8 +732,8 @@ void NW005_begin_modem_task(void *parameter) NW005_modem_task_data*modem_task_data = static_cast(parameter); if (!modem_task_data->modem_initialized) { - modem_task_data->initializing = true; - modem_task_data->modem_initialized = + modem_task_data->initializing = true; + const bool res = PPP.begin( modem_task_data->model, modem_task_data->uart_num, @@ -710,7 +744,20 @@ void NW005_begin_modem_task(void *parameter) PPP.moduleName().c_str(), PPP.IMEI().c_str()); - // PPP.mode(ESP_MODEM_MODE_COMMAND); + if (res) { + + uint32_t start = millis(); + + do + { + delay(100); + } + while (timePassedSince(start) < 5000 && !PPP.attached()); + + PPP.mode(ESP_MODEM_MODE_CMUX); + modem_task_data->AT_CPSI = PPP.cmd(F("AT+CPSI?"), 3000); + } + modem_task_data->modem_initialized = res; } modem_task_data->modem_taskHandle = NULL; vTaskDelete(modem_task_data->modem_taskHandle); @@ -834,13 +881,69 @@ bool NW005_data_struct_PPP_modem::exit(EventStruct *event) return true; } -struct testStruct { - String foo1 = F("test123"); - int64_t foo2 = -123; - uint32_t foo3 = 123; +String NW005_data_struct_PPP_modem::write_AT_cmd(const String& cmd, int timeout) +{ + String res; + auto cur_mode = PPP.mode(); + if (PPP.mode() != ESP_MODEM_MODE_CMUX) { + PPP.mode(ESP_MODEM_MODE_CMUX); + res = PPP.cmd(cmd.c_str(), timeout); + } + PPP.mode(cur_mode); + return res; +} -}; +LongTermTimer::Duration NW005_data_struct_PPP_modem::getConnectedDuration_ms() const +{ + return _connectedStats.getLastOnDuration_ms(); +} + +void NW005_data_struct_PPP_modem::onEvent(arduino_event_id_t event, arduino_event_info_t info) { + // TODO TD-er: Must store flags from events in static (or global) object to act on it later. + switch (event) + { + case ARDUINO_EVENT_PPP_START: addLog(LOG_LEVEL_INFO, F("PPP Started")); + _startStopStats.setOn(); + PPP.setRoutePrio(200); + break; + case ARDUINO_EVENT_PPP_STOP: addLog(LOG_LEVEL_INFO, F("PPP Stopped")); + _startStopStats.setOff(); + break; + case ARDUINO_EVENT_PPP_CONNECTED: + _connectedStats.setOn(); + addLog(LOG_LEVEL_INFO, F("PPP Connected")); + + break; + case ARDUINO_EVENT_PPP_DISCONNECTED: + _connectedStats.setOff(); + addLog(LOG_LEVEL_INFO, concat(F("PPP Disconnected. Connected for: "), format_msec_duration(_connectedStats.getLastOnDuration_ms()))); + WiFi.AP.enableNAPT(false); + break; + case ARDUINO_EVENT_PPP_GOT_IP: + _gotIPStats.setOn(); + addLog(LOG_LEVEL_INFO, F("PPP Got IP")); + + // PPP.setDefault(); + + if (WiFi.AP.enableNAPT(true)) { + addLog(LOG_LEVEL_INFO, F("WiFi.AP.enableNAPT")); + } + break; + case ARDUINO_EVENT_PPP_GOT_IP6: + _gotIP6Stats.setOn(); + addLog(LOG_LEVEL_INFO, F("PPP Got IPv6")); + break; + case ARDUINO_EVENT_PPP_LOST_IP: + _gotIPStats.setOff(); + _gotIP6Stats.setOff(); + addLog(LOG_LEVEL_INFO, F("PPP Lost IP")); + WiFi.AP.enableNAPT(false); + break; + + default: break; + } +} String NW005_data_struct_PPP_modem::NW005_formatGpioLabel(uint32_t key, PinSelectPurpose& purpose, bool shortNotation) const { @@ -889,42 +992,6 @@ String NW005_data_struct_PPP_modem::NW005_formatGpioLabel(uint32_t key, PinSelec return label; } -void NW005_data_struct_PPP_modem::testWrite() -{ - if (!_KVS_initialized()) { return; } - - for (int i = 0; i < 30; ++i) { - testStruct _test{ .foo1 = concat(F("str_"), (3 * (i) + 1)), .foo2 = -1l * (3 * (i) + 2), .foo3 = 3 * (i) + 3 }; - _kvs->setValue(3 * (i) + 1, _test.foo1); - _kvs->setValue(3 * (i) + 2, _test.foo2); - _kvs->setValue(3 * (i) + 3, _test.foo3); - } - - _kvs->dump(); - - - // _kvs->clear(); - _store(); - - _load(); - - _kvs->dump(); - -} - -void NW005_data_struct_PPP_modem::testRead() -{ - if (!_KVS_initialized()) { return; } - _load(); - - for (uint32_t i = 1; i <= 30; ++i) { - String val; - _kvs->getValue(i, val); - addLog(LOG_LEVEL_INFO, strformat(F("KVS, foo%d: %s"), i, val.c_str())); - } - -} - } // namespace ppp } // namespace net } // namespace ESPEasy diff --git a/src/ESPEasy/net/NWPluginStructs/NW005_data_struct_PPP_modem.h b/src/ESPEasy/net/NWPluginStructs/NW005_data_struct_PPP_modem.h index 0db0f5872..4b3efde7d 100644 --- a/src/ESPEasy/net/NWPluginStructs/NW005_data_struct_PPP_modem.h +++ b/src/ESPEasy/net/NWPluginStructs/NW005_data_struct_PPP_modem.h @@ -3,6 +3,7 @@ #include "../_NWPlugin_Helper.h" #ifdef USES_NW005 +# include "../../../src/Helpers/LongTermTimer.h" # include "../../../src/Helpers/StringGenerator_GPIO.h" # include @@ -19,6 +20,7 @@ struct NW005_modem_task_data { bool initializing{}; bool modem_initialized{}; String logString; + String AT_CPSI; // Result from "AT+CPSI?" // This is C-code, so not set to nullptr, but to NULL TaskHandle_t modem_taskHandle = NULL; @@ -31,36 +33,41 @@ struct NW005_data_struct_PPP_modem : public NWPluginData_base { NW005_data_struct_PPP_modem(networkIndex_t networkIndex); ~NW005_data_struct_PPP_modem(); - String getRSSI() const; - String getBER() const; - bool attached() const; - String IMEI() const; - String operatorName() const; + String getRSSI() const; + String getBER() const; + bool attached() const; + String IMEI() const; + String operatorName() const; - void webform_load_UE_system_information(); + void webform_load_UE_system_information(); - void webform_load(EventStruct *event); - void webform_save(EventStruct *event); + void webform_load(EventStruct *event); + void webform_save(EventStruct *event); - bool webform_getPort(String& str); + bool webform_getPort(String& str); - bool init(EventStruct *event); + bool init(EventStruct *event); - bool exit(EventStruct *event); + bool exit(EventStruct *event); + String write_AT_cmd(const String& cmd, + int timeout = 1000); - void testWrite(); - - void testRead(); + LongTermTimer::Duration getConnectedDuration_ms() const; private: - String NW005_formatGpioLabel(uint32_t key, - PinSelectPurpose& purpose, - bool shortNotation = false) const; + static void onEvent(arduino_event_id_t event, + arduino_event_info_t info); + + String NW005_formatGpioLabel(uint32_t key, + PinSelectPurpose& purpose, + bool shortNotation = false) const; NW005_modem_task_data _modem_task_data; + network_event_handle_t nw_event_id = 0; + }; diff --git a/src/ESPEasy/net/_NW005_PPP_modem.cpp b/src/ESPEasy/net/_NW005_PPP_modem.cpp index 666fbf3e8..571f39a39 100644 --- a/src/ESPEasy/net/_NW005_PPP_modem.cpp +++ b/src/ESPEasy/net/_NW005_PPP_modem.cpp @@ -85,6 +85,11 @@ bool NWPlugin_005(NWPlugin::Function function, EventStruct *event, String& strin F("%s (%s dBm)"), NW_data->operatorName().c_str(), NW_data->getRSSI().c_str()); + + auto connectionDuration_ms = NW_data->getConnectedDuration_ms(); + if (connectionDuration_ms > 0) { + string += concat(F("
    "), format_msec_duration(connectionDuration_ms)); + } } } diff --git a/src/ESPEasy/net/wifi/ESPEasyWiFiEvent_ESP32.cpp b/src/ESPEasy/net/wifi/ESPEasyWiFiEvent_ESP32.cpp index c92850fb6..9556629b8 100644 --- a/src/ESPEasy/net/wifi/ESPEasyWiFiEvent_ESP32.cpp +++ b/src/ESPEasy/net/wifi/ESPEasyWiFiEvent_ESP32.cpp @@ -179,27 +179,14 @@ void WiFiEvent(WiFiEvent_t event_id, arduino_event_info_t info) { # endif // FEATURE_ETHERNET # if FEATURE_PPP_MODEM - case ARDUINO_EVENT_PPP_START: addLog(LOG_LEVEL_INFO, F("PPP Started")); - break; - case ARDUINO_EVENT_PPP_CONNECTED: addLog(LOG_LEVEL_INFO, F("PPP Connected")); - break; + + case ARDUINO_EVENT_PPP_START: + case ARDUINO_EVENT_PPP_CONNECTED: case ARDUINO_EVENT_PPP_GOT_IP: - addLog(LOG_LEVEL_INFO, F("PPP Got IP")); - PPP.setDefault(); - - if (WiFi.AP.enableNAPT(true)) { - addLog(LOG_LEVEL_INFO, F("WiFi.AP.enableNAPT")); - } - break; case ARDUINO_EVENT_PPP_LOST_IP: - addLog(LOG_LEVEL_INFO, F("PPP Lost IP")); - WiFi.AP.enableNAPT(false); - break; case ARDUINO_EVENT_PPP_DISCONNECTED: - addLog(LOG_LEVEL_INFO, F("PPP Disconnected")); - WiFi.AP.enableNAPT(false); - break; - case ARDUINO_EVENT_PPP_STOP: addLog(LOG_LEVEL_INFO, F("PPP Stopped")); + case ARDUINO_EVENT_PPP_STOP: + // Handled in NW005_data_struct_PPP_modem break; # endif // if FEATURE_PPP_MODEM diff --git a/src/ESPEasy/net/wifi/ESPEasyWiFi_state_machine.cpp b/src/ESPEasy/net/wifi/ESPEasyWiFi_state_machine.cpp index 81e430287..773256dcf 100644 --- a/src/ESPEasy/net/wifi/ESPEasyWiFi_state_machine.cpp +++ b/src/ESPEasy/net/wifi/ESPEasyWiFi_state_machine.cpp @@ -276,7 +276,7 @@ void ESPEasyWiFi_t::setState(WiFiState_e newState, uint32_t timeout) { # ifdef ESP32 // FIXME TD-er: Must move to ESP32-specific cpp file - WiFi.STA.setDefault(); + //WiFi.STA.setDefault(); # endif // ifdef ESP32 _last_seen_connected.setNow(); _state_timeout.clear(); diff --git a/src/src/ESPEasyCore/Controller.cpp b/src/src/ESPEasyCore/Controller.cpp index d50e310c5..21207b77e 100644 --- a/src/src/ESPEasyCore/Controller.cpp +++ b/src/src/ESPEasyCore/Controller.cpp @@ -160,6 +160,7 @@ void MQTTDisconnect() { if (MQTTclient.connected()) { MQTTclient.disconnect(); + MQTTclient_connected_stats.setOff(); addLog(LOG_LEVEL_INFO, F("MQTT : Disconnected from broker")); } updateMQTTclient_connected(); @@ -192,6 +193,7 @@ bool MQTTConnect(controllerIndex_t controller_idx) if (MQTTclient.connected()) { MQTTclient.disconnect(); + MQTTclient_connected_stats.setOff(); # if FEATURE_MQTT_TLS if (mqtt_tls != nullptr) { diff --git a/src/src/Globals/MQTT.cpp b/src/src/Globals/MQTT.cpp index 04d64d09a..2ba0fb472 100644 --- a/src/src/Globals/MQTT.cpp +++ b/src/src/Globals/MQTT.cpp @@ -4,7 +4,6 @@ #if FEATURE_MQTT - // MQTT client WiFiClient mqtt; # if FEATURE_MQTT_TLS @@ -23,6 +22,7 @@ String mqtt_fingerprint; # endif // if FEATURE_MQTT_TLS PubSubClient MQTTclient(mqtt); +LongTermOnOffTimer MQTTclient_connected_stats; bool MQTTclient_should_reconnect = true; bool MQTTclient_must_send_LWT_connected = false; bool MQTTclient_connected = false; diff --git a/src/src/Globals/MQTT.h b/src/src/Globals/MQTT.h index 59bf490f4..2f2a0990c 100644 --- a/src/src/Globals/MQTT.h +++ b/src/src/Globals/MQTT.h @@ -9,6 +9,7 @@ # include "../DataTypes/TaskIndex.h" # include "../Helpers/LongTermTimer.h" +# include "../Helpers/LongTermOnOffTimer.h" # include # include @@ -31,6 +32,7 @@ extern String mqtt_fingerprint; # endif // if FEATURE_MQTT_TLS extern PubSubClient MQTTclient; +extern LongTermOnOffTimer MQTTclient_connected_stats; extern bool MQTTclient_should_reconnect; extern bool MQTTclient_must_send_LWT_connected; extern bool MQTTclient_connected; diff --git a/src/src/Helpers/LongTermOnOffTimer.cpp b/src/src/Helpers/LongTermOnOffTimer.cpp new file mode 100644 index 000000000..100c443cd --- /dev/null +++ b/src/src/Helpers/LongTermOnOffTimer.cpp @@ -0,0 +1,86 @@ +#include "../Helpers/LongTermOnOffTimer.h" + +void LongTermOnOffTimer::clear() +{ + _onTimer.clear(); + _offTimer.clear(); + _prevDuration = 0; + resetCount(); +} + +bool LongTermOnOffTimer::setOn() +{ + if (isOn()) { return false; } + ++_changeToOnCount; + + if (isOff()) { + _prevDuration = _onTimer.timeDiff(_offTimer); + } + _onTimer.setNow(); + return true; +} + +bool LongTermOnOffTimer::setOff() +{ + if (isOff()) { return false; } + ++_changeToOffCount; + + if (isOn()) { + _prevDuration = _offTimer.timeDiff(_onTimer); + } + _offTimer.setNow(); + return true; +} + +bool LongTermOnOffTimer::set(bool onState) +{ + if (onState) return setOn(); + return setOff(); +} + +bool LongTermOnOffTimer::isSet() const +{ + return _onTimer.isSet() || _offTimer.isSet(); +} + +bool LongTermOnOffTimer::isOn() const +{ + if (!_onTimer.isSet()) { return false; } + + if (!_offTimer.isSet()) { return true; } + + // return true when 'onTimer' is later than 'offTimer' + return _offTimer < _onTimer; +} + +bool LongTermOnOffTimer::isOff() const +{ + if (!_offTimer.isSet()) { return false; } + + if (!_onTimer.isSet()) { return true; } + + // return true when 'offTimer' is later than 'onTimer' + return _offTimer > _onTimer; +} + +LongTermTimer::Duration LongTermOnOffTimer::getLastOnDuration_ms() const +{ + return getLastOnDuration_usec() / 1000ll; +} + +LongTermTimer::Duration LongTermOnOffTimer::getLastOffDuration_ms() const +{ + return getLastOffDuration_usec() / 1000ll; +} + +LongTermTimer::Duration LongTermOnOffTimer::getLastOnDuration_usec() const +{ + if (isOn()) return _onTimer.usecPassedSince(); + return _prevDuration; +} + +LongTermTimer::Duration LongTermOnOffTimer::getLastOffDuration_usec() const +{ + if (isOff()) return _offTimer.usecPassedSince(); + return _prevDuration; +} diff --git a/src/src/Helpers/LongTermOnOffTimer.h b/src/src/Helpers/LongTermOnOffTimer.h new file mode 100644 index 000000000..30d11d5c5 --- /dev/null +++ b/src/src/Helpers/LongTermOnOffTimer.h @@ -0,0 +1,51 @@ +#pragma once + +#include "../Helpers/LongTermTimer.h" + +class LongTermOnOffTimer +{ +public: + + void clear(); + + void resetCount() { _changeToOffCount = 0; _changeToOnCount = 0; } + + // Return true when state changed + bool setOn(); + + // Return true when state changed + bool setOff(); + + bool set(bool onState); + + // Return true if either 'on' or 'off' was set at least once (since 'clear()' or construction) + bool isSet() const; + + // Returns true if the last set state was to 'on' + bool isOn() const; + + // Returns true if the last set state was to 'off' + bool isOff() const; + + LongTermTimer::Duration getLastOnDuration_ms() const; + LongTermTimer::Duration getLastOffDuration_ms() const; + + LongTermTimer::Duration getLastOnDuration_usec() const; + LongTermTimer::Duration getLastOffDuration_usec() const; + + size_t getCycleCount() const { return (_changeToOnCount + _changeToOffCount) / 2; } + + size_t getChangeToOnCount() const { return _changeToOnCount; } + + size_t getChangeToOffCount() const { return _changeToOffCount; } + +private: + + LongTermTimer _onTimer; + LongTermTimer _offTimer; + + LongTermTimer::Duration _prevDuration{}; + size_t _changeToOnCount{}; + size_t _changeToOffCount{}; + +}; // class LongTermOnOffTimer diff --git a/src/src/Helpers/PeriodicalActions.cpp b/src/src/Helpers/PeriodicalActions.cpp index 82e44dbb6..0fa26bf73 100644 --- a/src/src/Helpers/PeriodicalActions.cpp +++ b/src/src/Helpers/PeriodicalActions.cpp @@ -368,6 +368,11 @@ void updateMQTTclient_connected() { if (loglevelActiveFor(LOG_LEVEL_ERROR)) { String connectionError = F("MQTT : Connection lost, state: "); connectionError += getMQTT_state(); + auto duration_ms = MQTTclient_connected_stats.getLastOnDuration_ms(); + if (duration_ms > 0) { + connectionError += concat(F(" Connected duration: "), format_msec_duration(duration_ms)); + connectionError += concat(F(" Reconnect Count: "), MQTTclient_connected_stats.getCycleCount()); + } addLogMove(LOG_LEVEL_ERROR, connectionError); } MQTTclient_must_send_LWT_connected = false; @@ -391,6 +396,7 @@ void updateMQTTclient_connected() { } else { timermqtt_interval = 100; } + MQTTclient_connected_stats.set(MQTTclient_connected); Scheduler.setIntervalTimer(SchedulerIntervalTimer_e::TIMER_MQTT); scheduleNextMQTTdelayQueue(); } From 8baeeb51a5df9c43b90e5956374956e820cdb7cc Mon Sep 17 00:00:00 2001 From: TD-er Date: Wed, 30 Jul 2025 11:08:44 +0200 Subject: [PATCH 158/564] [Network] Show connected duration in more readable format --- .../net/DataStructs/NWPluginData_base.cpp | 13 ++++++--- .../net/DataStructs/NWPluginData_base.h | 13 ++++++--- src/ESPEasy/net/DataStructs/WiFiEventData.cpp | 2 +- .../NW005_data_struct_PPP_modem.cpp | 4 ++- src/ESPEasy/net/_NW005_PPP_modem.cpp | 8 +++++- src/ESPEasy/net/_NWPlugin_Helper.cpp | 4 +++ src/src/CustomBuild/ESPEasyDefaults.h | 2 +- .../DataStructs/ControllerSettingsStruct.h | 4 +-- src/src/Helpers/Convert.cpp | 27 ++++++++++++------- src/src/Helpers/Convert.h | 7 ++--- src/src/Helpers/PeriodicalActions.cpp | 8 +++--- 11 files changed, 64 insertions(+), 28 deletions(-) diff --git a/src/ESPEasy/net/DataStructs/NWPluginData_base.cpp b/src/ESPEasy/net/DataStructs/NWPluginData_base.cpp index f20badba4..e7f6e0d74 100644 --- a/src/ESPEasy/net/DataStructs/NWPluginData_base.cpp +++ b/src/ESPEasy/net/DataStructs/NWPluginData_base.cpp @@ -1,37 +1,44 @@ #include "../DataStructs/NWPluginData_base.h" -#if FEATURE_STORE_NETWORK_INTERFACE_SETTINGS - # include "../../../src/Globals/RuntimeData.h" # include "../../../src/Globals/Settings.h" # include "../../../src/Helpers/StringConverter.h" +#if FEATURE_STORE_NETWORK_INTERFACE_SETTINGS # include "../../../src/Helpers/_ESPEasy_key_value_store.h" +#endif namespace ESPEasy { namespace net { NWPluginData_base::NWPluginData_base(nwpluginID_t nwpluginID, networkIndex_t networkIndex) : +#if FEATURE_STORE_NETWORK_INTERFACE_SETTINGS _kvs(nullptr), +#endif _nw_data_pluginID(nwpluginID), _networkIndex(networkIndex), _baseClassOnly(false) { +#if FEATURE_STORE_NETWORK_INTERFACE_SETTINGS if (_kvs == nullptr) { _kvs = new (std::nothrow) ESPEasy_key_value_store; } +#endif } NWPluginData_base::~NWPluginData_base() { +#if FEATURE_STORE_NETWORK_INTERFACE_SETTINGS if (_kvs) { delete _kvs; } _kvs = nullptr; +#endif } bool NWPluginData_base::plugin_write_base(EventStruct *event, const String& string) { return false; } +#if FEATURE_STORE_NETWORK_INTERFACE_SETTINGS bool NWPluginData_base::init_KVS() { if (!_KVS_initialized()) { return false; } @@ -61,8 +68,8 @@ bool NWPluginData_base::_store() 0, _nw_data_pluginID.value); } +#endif } // namespace net } // namespace ESPEasy -#endif // if FEATURE_STORE_NETWORK_INTERFACE_SETTINGS diff --git a/src/ESPEasy/net/DataStructs/NWPluginData_base.h b/src/ESPEasy/net/DataStructs/NWPluginData_base.h index dd3ffc325..a24b488bf 100644 --- a/src/ESPEasy/net/DataStructs/NWPluginData_base.h +++ b/src/ESPEasy/net/DataStructs/NWPluginData_base.h @@ -2,12 +2,14 @@ #include "../../../ESPEasy_common.h" -#if FEATURE_STORE_NETWORK_INTERFACE_SETTINGS -# include "../../../src/DataStructs/ESPEasy_EventStruct.h" -# include "../../../src/Helpers/_ESPEasy_key_value_store.h" # include "../DataTypes/NWPluginID.h" # include "../DataTypes/NetworkIndex.h" +# include "../../../src/DataStructs/ESPEasy_EventStruct.h" + +#if FEATURE_STORE_NETWORK_INTERFACE_SETTINGS +# include "../../../src/Helpers/_ESPEasy_key_value_store.h" +#endif namespace ESPEasy { namespace net { @@ -35,12 +37,15 @@ struct NWPluginData_base { // Should only be called from initNWPluginData +#if FEATURE_STORE_NETWORK_INTERFACE_SETTINGS bool init_KVS(); +#endif nwpluginID_t getNWPluginID() const { return _nw_data_pluginID; } protected: +#if FEATURE_STORE_NETWORK_INTERFACE_SETTINGS bool _KVS_initialized() const { return _kvs != nullptr; } // Load settings in the _kvs @@ -50,6 +55,7 @@ protected: bool _store(); ESPEasy_key_value_store *_kvs = nullptr; +#endif // We cannot use dynamic_cast, so we must keep track of the plugin ID to // perform checks on the casting. @@ -65,4 +71,3 @@ protected: } // namespace net } // namespace ESPEasy -#endif // if FEATURE_STORE_NETWORK_INTERFACE_SETTINGS diff --git a/src/ESPEasy/net/DataStructs/WiFiEventData.cpp b/src/ESPEasy/net/DataStructs/WiFiEventData.cpp index a7d4b695c..6daa7a369 100644 --- a/src/ESPEasy/net/DataStructs/WiFiEventData.cpp +++ b/src/ESPEasy/net/DataStructs/WiFiEventData.cpp @@ -16,7 +16,7 @@ # define WIFI_RECONNECT_WAIT 30000 // in milliSeconds -# define CONNECT_TIMEOUT_MAX 4000 // in milliSeconds +# define CONNECT_TIMEOUT_MAX 10000 // in milliSeconds # if FEATURE_USE_IPV6 diff --git a/src/ESPEasy/net/NWPluginStructs/NW005_data_struct_PPP_modem.cpp b/src/ESPEasy/net/NWPluginStructs/NW005_data_struct_PPP_modem.cpp index 4686d21e9..9d8e090c8 100644 --- a/src/ESPEasy/net/NWPluginStructs/NW005_data_struct_PPP_modem.cpp +++ b/src/ESPEasy/net/NWPluginStructs/NW005_data_struct_PPP_modem.cpp @@ -917,7 +917,9 @@ void NW005_data_struct_PPP_modem::onEvent(arduino_event_id_t event, arduino_even break; case ARDUINO_EVENT_PPP_DISCONNECTED: _connectedStats.setOff(); - addLog(LOG_LEVEL_INFO, concat(F("PPP Disconnected. Connected for: "), format_msec_duration(_connectedStats.getLastOnDuration_ms()))); + addLog(LOG_LEVEL_INFO, concat( + F("PPP Disconnected. Connected for: "), + format_msec_duration_HMS(_connectedStats.getLastOnDuration_ms()))); WiFi.AP.enableNAPT(false); break; case ARDUINO_EVENT_PPP_GOT_IP: diff --git a/src/ESPEasy/net/_NW005_PPP_modem.cpp b/src/ESPEasy/net/_NW005_PPP_modem.cpp index 571f39a39..23cdd8549 100644 --- a/src/ESPEasy/net/_NW005_PPP_modem.cpp +++ b/src/ESPEasy/net/_NW005_PPP_modem.cpp @@ -88,7 +88,9 @@ bool NWPlugin_005(NWPlugin::Function function, EventStruct *event, String& strin auto connectionDuration_ms = NW_data->getConnectedDuration_ms(); if (connectionDuration_ms > 0) { - string += concat(F("
    "), format_msec_duration(connectionDuration_ms)); + string += concat( + F("
    "), + format_msec_duration_HMS(connectionDuration_ms)); } } } @@ -132,7 +134,9 @@ bool NWPlugin_005(NWPlugin::Function function, EventStruct *event, String& strin if (mustCleanup) { NW_data = new (std::nothrow) ESPEasy::net::ppp::NW005_data_struct_PPP_modem(event->NetworkIndex); +#if FEATURE_STORE_NETWORK_INTERFACE_SETTINGS NW_data->init_KVS(); +#endif } if (NW_data) { @@ -153,7 +157,9 @@ bool NWPlugin_005(NWPlugin::Function function, EventStruct *event, String& strin if (mustCleanup) { NW_data = new (std::nothrow) ESPEasy::net::ppp::NW005_data_struct_PPP_modem(event->NetworkIndex); +#if FEATURE_STORE_NETWORK_INTERFACE_SETTINGS NW_data->init_KVS(); +#endif } if (NW_data) { diff --git a/src/ESPEasy/net/_NWPlugin_Helper.cpp b/src/ESPEasy/net/_NWPlugin_Helper.cpp index cfe503804..c20a4c550 100644 --- a/src/ESPEasy/net/_NWPlugin_Helper.cpp +++ b/src/ESPEasy/net/_NWPlugin_Helper.cpp @@ -47,12 +47,16 @@ bool initNWPluginData(ESPEasy::net::networkIndex_t networkIndex, NWPluginData_ba if (data != nullptr) { if (Settings.getNetworkEnabled(networkIndex)) { +#if FEATURE_STORE_NETWORK_INTERFACE_SETTINGS if (!data->init_KVS()) { delete data; data = nullptr; } else { NWPlugin_task_data[networkIndex] = data; } +#else + NWPlugin_task_data[networkIndex] = data; +#endif } else { delete data; data = nullptr; diff --git a/src/src/CustomBuild/ESPEasyDefaults.h b/src/src/CustomBuild/ESPEasyDefaults.h index a09c9160a..e9725380f 100644 --- a/src/src/CustomBuild/ESPEasyDefaults.h +++ b/src/src/CustomBuild/ESPEasyDefaults.h @@ -157,7 +157,7 @@ #define DEFAULT_CONTROLLER_PASS "" // Default controller Password #endif #ifndef DEFAULT_CONTROLLER_TIMEOUT -#define DEFAULT_CONTROLLER_TIMEOUT 100 +#define DEFAULT_CONTROLLER_TIMEOUT 500 #endif // using a default template, you also need to set a DEFAULT PROTOCOL to a suitable MQTT protocol ! diff --git a/src/src/DataStructs/ControllerSettingsStruct.h b/src/src/DataStructs/ControllerSettingsStruct.h index 065237e40..8d22a6ee9 100644 --- a/src/src/DataStructs/ControllerSettingsStruct.h +++ b/src/src/DataStructs/ControllerSettingsStruct.h @@ -48,10 +48,10 @@ // Timeout of the client in msec. #ifndef CONTROLLER_CLIENTTIMEOUT_MAX -# define CONTROLLER_CLIENTTIMEOUT_MAX 4000 // Not sure if this may trigger SW watchdog. +# define CONTROLLER_CLIENTTIMEOUT_MAX 10000 // Not sure if this may trigger SW watchdog. #endif // ifndef CONTROLLER_CLIENTTIMEOUT_MAX #ifndef CONTROLLER_CLIENTTIMEOUT_DFLT -# define CONTROLLER_CLIENTTIMEOUT_DFLT 100 +# define CONTROLLER_CLIENTTIMEOUT_DFLT DEFAULT_CONTROLLER_TIMEOUT #endif // ifndef CONTROLLER_CLIENTTIMEOUT_DFLT // MQTT Keep Alive Timeout diff --git a/src/src/Helpers/Convert.cpp b/src/src/Helpers/Convert.cpp index 1127858b1..1d335bd64 100644 --- a/src/src/Helpers/Convert.cpp +++ b/src/src/Helpers/Convert.cpp @@ -103,7 +103,7 @@ String minutesToHourColonMinute(int minutes) { return strformat(F("%02d:%02d"), hours, mins); } -String secondsToDayHourMinuteSecond(int seconds) { +String secondsToDayHourMinuteSecond(int seconds, bool useHMS) { const int sec = seconds % 60; const int minutes = seconds / 60; const int days = minutes / 1440; @@ -111,28 +111,35 @@ String secondsToDayHourMinuteSecond(int seconds) { const int hours = min_day / 60; const int mins = min_day % 60; if (days == 0) { - return strformat(F("%02d:%02d:%02d"), hours, mins, sec); + if (hours == 0 && useHMS) { + return strformat(F("%dm%02ds"), mins, sec); + } + return strformat( + useHMS ? F("%dh%02dm%02ds") : F("%02d:%02d:%02d"), + hours, mins, sec); } - return strformat(F("%dT%02d:%02d:%02d"), days, hours, mins, sec); + return strformat( + useHMS ? F("%dT%02dh%02dm%02ds") : F("%dT%02d:%02d:%02d"), + days, hours, mins, sec); } -String secondsToDayHourMinuteSecond_ms(int64_t systemMicros) +String secondsToDayHourMinuteSecond_ms(int64_t systemMicros, bool useHMS) { if (systemMicros < 0ll) { - return concat('-', secondsToDayHourMinuteSecond_ms(-1ll*systemMicros)); + return concat('-', secondsToDayHourMinuteSecond_ms(-1ll*systemMicros, useHMS)); } uint32_t usec{}; const uint32_t seconds = micros_to_sec_usec(systemMicros, usec); return strformat( F("%s.%03u"), - secondsToDayHourMinuteSecond(seconds).c_str(), + secondsToDayHourMinuteSecond(seconds, useHMS).c_str(), usec / 1000ul); } -String format_msec_duration(int64_t duration) { +String format_msec_duration(int64_t duration, bool useHMS) { if (duration < 0ll) { - return concat('-', format_msec_duration(-1ll*duration)); + return concat('-', format_msec_duration(-1ll*duration, useHMS)); } const uint32_t duration_s = duration / 1000ll; const int32_t duration_ms = duration % 1000ll; @@ -145,10 +152,12 @@ String format_msec_duration(int64_t duration) { } return strformat( F("%s.%03d"), - secondsToDayHourMinuteSecond(duration_s).c_str(), + secondsToDayHourMinuteSecond(duration_s, useHMS).c_str(), duration_ms); } +String format_msec_duration_HMS(int64_t duration) { return format_msec_duration(duration, true); } + // Compute the dew point temperature, given temperature and humidity (temp in Celsius) // Formula: http://www.ajdesigner.com/phphumidity/dewpoint_equation_dewpoint_temperature.php diff --git a/src/src/Helpers/Convert.h b/src/src/Helpers/Convert.h index 276c36ad5..6fe350a73 100644 --- a/src/src/Helpers/Convert.h +++ b/src/src/Helpers/Convert.h @@ -24,10 +24,11 @@ String minutesToDayHourMinute(int minutes); String minutesToHourColonMinute(int minutes); -String secondsToDayHourMinuteSecond(int seconds); -String secondsToDayHourMinuteSecond_ms(int64_t systemMicros); +String secondsToDayHourMinuteSecond(int seconds, bool useHMS = false); +String secondsToDayHourMinuteSecond_ms(int64_t systemMicros, bool useHMS = false); -String format_msec_duration(int64_t duration); +String format_msec_duration(int64_t duration, bool useHMS = false); +String format_msec_duration_HMS(int64_t duration); // Compute the dew point temperature, given temperature and humidity (temp in Celsius) // Formula: http://www.ajdesigner.com/phphumidity/dewpoint_equation_dewpoint_temperature.php diff --git a/src/src/Helpers/PeriodicalActions.cpp b/src/src/Helpers/PeriodicalActions.cpp index 0fa26bf73..8ef5063a8 100644 --- a/src/src/Helpers/PeriodicalActions.cpp +++ b/src/src/Helpers/PeriodicalActions.cpp @@ -364,15 +364,18 @@ void processMQTTdelayQueue() { void updateMQTTclient_connected() { if (MQTTclient_connected != MQTTclient.connected()) { MQTTclient_connected = !MQTTclient_connected; + MQTTclient_connected_stats.set(MQTTclient_connected); if (!MQTTclient_connected) { if (loglevelActiveFor(LOG_LEVEL_ERROR)) { String connectionError = F("MQTT : Connection lost, state: "); connectionError += getMQTT_state(); +#ifndef BUILD_NO_DEBUG auto duration_ms = MQTTclient_connected_stats.getLastOnDuration_ms(); if (duration_ms > 0) { - connectionError += concat(F(" Connected duration: "), format_msec_duration(duration_ms)); - connectionError += concat(F(" Reconnect Count: "), MQTTclient_connected_stats.getCycleCount()); + connectionError += concat(F(" Connected duration: "), format_msec_duration_HMS(duration_ms)); + connectionError += concat(F(" (successful) Reconnect Count: "), MQTTclient_connected_stats.getCycleCount()); } +#endif addLogMove(LOG_LEVEL_ERROR, connectionError); } MQTTclient_must_send_LWT_connected = false; @@ -396,7 +399,6 @@ void updateMQTTclient_connected() { } else { timermqtt_interval = 100; } - MQTTclient_connected_stats.set(MQTTclient_connected); Scheduler.setIntervalTimer(SchedulerIntervalTimer_e::TIMER_MQTT); scheduleNextMQTTdelayQueue(); } From 3e66509aed68f02830c68b8ea74f3d05e2a1fd72 Mon Sep 17 00:00:00 2001 From: TD-er Date: Thu, 31 Jul 2025 01:36:44 +0200 Subject: [PATCH 159/564] [Network] Add networkenable / -disable commands + fix for controllers --- .../net/DataStructs/NWPluginData_base.h | 4 + src/ESPEasy/net/Helpers/_NWPlugin_init.cpp | 16 ++ src/ESPEasy/net/Helpers/_NWPlugin_init.h | 4 + .../net/NWPluginStructs/NW001_WiFi_STA.cpp | 9 - .../net/NWPluginStructs/NW001_WiFi_STA.h | 22 --- .../NW001_data_struct_WiFi_STA.cpp | 158 ++++++++++++++++++ .../NW001_data_struct_WiFi_STA.h | 41 +++++ .../NW002_data_struct_WiFi_AP.cpp | 96 +++++++++++ .../NW002_data_struct_WiFi_AP.h | 41 +++++ src/ESPEasy/net/_NW001_WiFi_STA.cpp | 62 ++----- src/ESPEasy/net/_NW002_WiFi_AP.cpp | 21 ++- src/src/Commands/InternalCommands.cpp | 5 +- src/src/Commands/InternalCommands_decoder.cpp | 2 + src/src/Commands/InternalCommands_decoder.h | 2 + src/src/Commands/Networks.cpp | 23 +++ src/src/Commands/Networks.h | 7 + src/src/ESPEasyCore/Controller.cpp | 2 - src/src/Helpers/Misc.cpp | 40 +++++ src/src/Helpers/Misc.h | 8 + src/src/Helpers/PeriodicalActions.cpp | 7 +- src/src/Helpers/_CPlugin_init.cpp | 14 ++ src/src/Helpers/_CPlugin_init.h | 5 + src/src/WebServer/ControllerPage.cpp | 11 +- src/src/WebServer/NetworkPage.cpp | 11 +- static/espeasy.js | 2 +- 25 files changed, 497 insertions(+), 116 deletions(-) delete mode 100644 src/ESPEasy/net/NWPluginStructs/NW001_WiFi_STA.cpp delete mode 100644 src/ESPEasy/net/NWPluginStructs/NW001_WiFi_STA.h create mode 100644 src/ESPEasy/net/NWPluginStructs/NW001_data_struct_WiFi_STA.cpp create mode 100644 src/ESPEasy/net/NWPluginStructs/NW001_data_struct_WiFi_STA.h create mode 100644 src/ESPEasy/net/NWPluginStructs/NW002_data_struct_WiFi_AP.cpp create mode 100644 src/ESPEasy/net/NWPluginStructs/NW002_data_struct_WiFi_AP.h diff --git a/src/ESPEasy/net/DataStructs/NWPluginData_base.h b/src/ESPEasy/net/DataStructs/NWPluginData_base.h index a24b488bf..8348f44ae 100644 --- a/src/ESPEasy/net/DataStructs/NWPluginData_base.h +++ b/src/ESPEasy/net/DataStructs/NWPluginData_base.h @@ -64,7 +64,11 @@ protected: nwpluginID_t _nw_data_pluginID = INVALID_NW_PLUGIN_ID; networkIndex_t _networkIndex = INVALID_NETWORK_INDEX; +#if FEATURE_STORE_NETWORK_INTERFACE_SETTINGS bool _baseClassOnly = false; +#else + bool _baseClassOnly = true; +#endif }; diff --git a/src/ESPEasy/net/Helpers/_NWPlugin_init.cpp b/src/ESPEasy/net/Helpers/_NWPlugin_init.cpp index 67b40344f..8e7c44428 100644 --- a/src/ESPEasy/net/Helpers/_NWPlugin_init.cpp +++ b/src/ESPEasy/net/Helpers/_NWPlugin_init.cpp @@ -2169,5 +2169,21 @@ void NWPluginInit() NWPluginCall(NWPlugin::Function::NWPLUGIN_INIT_ALL, 0); } +void NWPlugin_Init_Exit(networkIndex_t networkIndex) +{ + const networkDriverIndex_t NetworkDriverIndex = + getNetworkDriverIndex_from_NetworkIndex(networkIndex); + + if (validNetworkDriverIndex(NetworkDriverIndex)) { + struct EventStruct TempEvent; + TempEvent.NetworkIndex = networkIndex; + String dummy; + NWPlugin::Function nfunction = + Settings.getNetworkEnabled(networkIndex) ? NWPlugin::Function::NWPLUGIN_INIT : NWPlugin::Function::NWPLUGIN_EXIT; + do_NWPluginCall(NetworkDriverIndex, nfunction, &TempEvent, dummy); + } +} + + } // namespace net } // namespace ESPEasy diff --git a/src/ESPEasy/net/Helpers/_NWPlugin_init.h b/src/ESPEasy/net/Helpers/_NWPlugin_init.h index d81132b39..c78071eb6 100644 --- a/src/ESPEasy/net/Helpers/_NWPlugin_init.h +++ b/src/ESPEasy/net/Helpers/_NWPlugin_init.h @@ -27,6 +27,10 @@ bool do_NWPluginCall(networkDriverIndex_t networkDriverIndex, NWPlugin::Function void NWPluginSetup(); void NWPluginInit(); +// Start or stop network as how it is set in the Settings +void NWPlugin_Init_Exit(networkIndex_t networkIndex); + + // Macro to forward declare the NWPlugin_NNN functions. // N.B. Some controllers also have a do_process_cNNN_delay_queue function. // Forward declaration of these is done in ControllerQueue/ControllerDelayHandlerStruct.h diff --git a/src/ESPEasy/net/NWPluginStructs/NW001_WiFi_STA.cpp b/src/ESPEasy/net/NWPluginStructs/NW001_WiFi_STA.cpp deleted file mode 100644 index ce313210e..000000000 --- a/src/ESPEasy/net/NWPluginStructs/NW001_WiFi_STA.cpp +++ /dev/null @@ -1,9 +0,0 @@ -#include "../NWPluginStructs/NW001_WiFi_STA.h" - -namespace ESPEasy { -namespace net { -namespace wifi { - -} // namespace wifi -} // namespace net -} // namespace ESPEasy diff --git a/src/ESPEasy/net/NWPluginStructs/NW001_WiFi_STA.h b/src/ESPEasy/net/NWPluginStructs/NW001_WiFi_STA.h deleted file mode 100644 index f7589a8dc..000000000 --- a/src/ESPEasy/net/NWPluginStructs/NW001_WiFi_STA.h +++ /dev/null @@ -1,22 +0,0 @@ -#pragma once - -#include "../_NWPlugin_Helper.h" -#ifdef USES_NW001 - -# if FEATURE_STORE_NETWORK_INTERFACE_SETTINGS - -namespace ESPEasy { -namespace net { -namespace wifi { - -struct NW001_data_struct_WiFi_STA : public NWPluginData_base { - -}; - - -} // namespace wifi -} // namespace net -} // namespace ESPEasy - -# endif // if FEATURE_STORE_NETWORK_INTERFACE_SETTINGS -#endif // ifdef USES_NW001 diff --git a/src/ESPEasy/net/NWPluginStructs/NW001_data_struct_WiFi_STA.cpp b/src/ESPEasy/net/NWPluginStructs/NW001_data_struct_WiFi_STA.cpp new file mode 100644 index 000000000..620ad21d5 --- /dev/null +++ b/src/ESPEasy/net/NWPluginStructs/NW001_data_struct_WiFi_STA.cpp @@ -0,0 +1,158 @@ +#include "../NWPluginStructs/NW001_data_struct_WiFi_STA.h" + +#ifdef USES_NW001 + +# include "../../../src/Globals/Settings.h" + +# include "../../../src/Helpers/ESPEasy_time_calc.h" +# include "../../../src/Helpers/LongTermOnOffTimer.h" +# include "../../../src/Helpers/StringConverter.h" + +# include "../wifi/ESPEasyWifi.h" + + +namespace ESPEasy { +namespace net { +namespace wifi { + +static LongTermOnOffTimer _startStopStats; +static LongTermOnOffTimer _connectedStats; +static LongTermOnOffTimer _gotIPStats; +static LongTermOnOffTimer _gotIP6Stats; + + +NW001_data_struct_WiFi_STA::NW001_data_struct_WiFi_STA(networkIndex_t networkIndex) + : NWPluginData_base(nwpluginID_t(1), networkIndex) +{ + _connectedStats.clear(); + _gotIPStats.clear(); + _gotIP6Stats.clear(); + nw_event_id = Network.onEvent(NW001_data_struct_WiFi_STA::onEvent); +} + +NW001_data_struct_WiFi_STA::~NW001_data_struct_WiFi_STA() +{ + if (nw_event_id != 0) { + Network.removeEvent(nw_event_id); + } + nw_event_id = 0; +} + +void NW001_data_struct_WiFi_STA::webform_load(EventStruct *event) {} + +void NW001_data_struct_WiFi_STA::webform_save(EventStruct *event) {} + +bool NW001_data_struct_WiFi_STA::webform_getPort(String& str) { return true; } + +bool NW001_data_struct_WiFi_STA::init(EventStruct *event) +{ + /* + // Taken from ESPEasy_setup() + // Might no longer be needed as we now have a proper WiFi state machine. + + # ifdef ESP32 + + // FIXME TD-er: Disabled for now, as this may not return and thus block the ESP forever. + // See: https://github.com/espressif/esp-idf/issues/15862 + // check_and_update_WiFi_Calibration(); + # endif // ifdef ESP32 + + ESPEasy::net::wifi::WiFi_AP_Candidates.clearCache(); + ESPEasy::net::wifi::WiFi_AP_Candidates.load_knownCredentials(); + ESPEasy::net::wifi::setSTA(true); + + if (!ESPEasy::net::wifi::WiFi_AP_Candidates.hasCandidateCredentials()) { + WiFiEventData.wifiSetup = true; + RTC.clearLastWiFi(); // Must scan all channels + // Wait until scan has finished to make sure as many as possible are found + // We're still in the setup phase, so nothing else is taking resources of the ESP. + ESPEasy::net::wifi::WifiScan(false); + WiFiEventData.lastScanMoment.clear(); + } + + + + // Always perform WiFi scan + // It appears reconnecting from RTC may take just as long to be able to send first packet as performing a scan first and then + #connect. + // Perhaps the WiFi radio needs some time to stabilize first? + if (!ESPEasy::net::wifi::WiFi_AP_Candidates.hasCandidates()) { + ESPEasy::net::wifi::WifiScan(false, RTC.lastWiFiChannel); + } + ESPEasy::net::wifi::WiFi_AP_Candidates.clearCache(); + ESPEasy::net::wifi::processScanDone(); + ESPEasy::net::wifi::WiFi_AP_Candidates.load_knownCredentials(); + + if (!ESPEasy::net::wifi::WiFi_AP_Candidates.hasCandidates()) { + # ifndef BUILD_MINIMAL_OTA + addLog(LOG_LEVEL_INFO, F("Setup: Scan all channels")); + # endif + ESPEasy::net::wifi::WifiScan(false); + } + + // ESPEasy::net::wifi::setWifiMode(WIFI_OFF); + */ + + ESPEasy::net::wifi::initWiFi(); + return true; +} + +bool NW001_data_struct_WiFi_STA::exit(EventStruct *event) { return true; } + +void NW001_data_struct_WiFi_STA::onEvent(arduino_event_id_t event, + arduino_event_info_t info) +{ + switch (event) + { + case ARDUINO_EVENT_WIFI_OFF: + addLog(LOG_LEVEL_INFO, F("WIFI_OFF")); + break; + case ARDUINO_EVENT_WIFI_READY: + addLog(LOG_LEVEL_INFO, F("WIFI_READY")); + break; + case ARDUINO_EVENT_WIFI_SCAN_DONE: + addLog(LOG_LEVEL_INFO, F("SCAN_DONE")); + break; + case ARDUINO_EVENT_WIFI_STA_START: + _startStopStats.setOn(); + addLog(LOG_LEVEL_INFO, F("STA_START")); + break; + case ARDUINO_EVENT_WIFI_STA_STOP: + _startStopStats.setOff(); + addLog(LOG_LEVEL_INFO, F("STA_STOP")); + break; + case ARDUINO_EVENT_WIFI_STA_CONNECTED: + _connectedStats.setOn(); + addLog(LOG_LEVEL_INFO, F("STA_CONNECTED")); + break; + case ARDUINO_EVENT_WIFI_STA_DISCONNECTED: + _connectedStats.setOff(); + addLog(LOG_LEVEL_INFO, F("STA_DISCONNECTED")); + break; + case ARDUINO_EVENT_WIFI_STA_AUTHMODE_CHANGE: + addLog(LOG_LEVEL_INFO, F("STA_AUTHMODE_CHANGE")); + break; + case ARDUINO_EVENT_WIFI_STA_GOT_IP: + _gotIPStats.setOn(); + addLog(LOG_LEVEL_INFO, F("STA_GOT_IP")); + break; + case ARDUINO_EVENT_WIFI_STA_GOT_IP6: + _gotIP6Stats.setOn(); + addLog(LOG_LEVEL_INFO, F("STA_GOT_IP6")); + break; + case ARDUINO_EVENT_WIFI_STA_LOST_IP: + _gotIPStats.setOff(); + _gotIP6Stats.setOff(); + + addLog(LOG_LEVEL_INFO, F("STA_LOST_IP")); + break; + + default: break; + } +} + +} // namespace wifi +} // namespace net +} // namespace ESPEasy + +#endif // ifdef USES_NW001 diff --git a/src/ESPEasy/net/NWPluginStructs/NW001_data_struct_WiFi_STA.h b/src/ESPEasy/net/NWPluginStructs/NW001_data_struct_WiFi_STA.h new file mode 100644 index 000000000..21b3b73f0 --- /dev/null +++ b/src/ESPEasy/net/NWPluginStructs/NW001_data_struct_WiFi_STA.h @@ -0,0 +1,41 @@ +#pragma once + +#include "../_NWPlugin_Helper.h" +#ifdef USES_NW001 + + +namespace ESPEasy { +namespace net { +namespace wifi { + +struct NW001_data_struct_WiFi_STA : public NWPluginData_base { + + NW001_data_struct_WiFi_STA(networkIndex_t networkIndex); + ~NW001_data_struct_WiFi_STA(); + + + void webform_load(EventStruct *event); + void webform_save(EventStruct *event); + + bool webform_getPort(String& str); + + bool init(EventStruct *event); + + bool exit(EventStruct *event); + +private: + + static void onEvent(arduino_event_id_t event, + arduino_event_info_t info); + + network_event_handle_t nw_event_id = 0; + +}; + + +} // namespace wifi +} // namespace net +} // namespace ESPEasy + + +#endif // ifdef USES_NW001 diff --git a/src/ESPEasy/net/NWPluginStructs/NW002_data_struct_WiFi_AP.cpp b/src/ESPEasy/net/NWPluginStructs/NW002_data_struct_WiFi_AP.cpp new file mode 100644 index 000000000..8308bb8d4 --- /dev/null +++ b/src/ESPEasy/net/NWPluginStructs/NW002_data_struct_WiFi_AP.cpp @@ -0,0 +1,96 @@ +#include "../NWPluginStructs/NW002_data_struct_WiFi_AP.h" + +#ifdef USES_NW002 + +# include "../../../src/Globals/Settings.h" + +# include "../../../src/Helpers/ESPEasy_time_calc.h" +# include "../../../src/Helpers/LongTermOnOffTimer.h" +# include "../../../src/Helpers/StringConverter.h" + +# include "../wifi/ESPEasyWifi.h" + +namespace ESPEasy { +namespace net { +namespace wifi { + +static LongTermOnOffTimer _startStopStats; + + +NW002_data_struct_WiFi_AP::NW002_data_struct_WiFi_AP(networkIndex_t networkIndex) + : NWPluginData_base(nwpluginID_t(2), networkIndex) +{ + nw_event_id = Network.onEvent(NW002_data_struct_WiFi_AP::onEvent); +} + +NW002_data_struct_WiFi_AP::~NW002_data_struct_WiFi_AP() +{ + if (nw_event_id != 0) { + Network.removeEvent(nw_event_id); + } + nw_event_id = 0; +} + +void NW002_data_struct_WiFi_AP::webform_load(EventStruct *event) {} + +void NW002_data_struct_WiFi_AP::webform_save(EventStruct *event) {} + +bool NW002_data_struct_WiFi_AP::webform_getPort(String& str) { return true; } + +bool NW002_data_struct_WiFi_AP::init(EventStruct *event) +{ + ESPEasy::net::wifi::setAPinternal(true); + return true; +} + +bool NW002_data_struct_WiFi_AP::exit(EventStruct *event) +{ +# ifdef ESP32 + WiFi.AP.end(); +# endif +# ifdef ESP8266 + + // WiFi.softAP +# endif // ifdef ESP8266 + + return true; +} + +void NW002_data_struct_WiFi_AP::onEvent(arduino_event_id_t event, + arduino_event_info_t info) +{ + switch (event) + { + case ARDUINO_EVENT_WIFI_AP_START: + _startStopStats.setOn(); + addLog(LOG_LEVEL_INFO, F("AP_START")); + break; + case ARDUINO_EVENT_WIFI_AP_STOP: + _startStopStats.setOff(); + addLog(LOG_LEVEL_INFO, F("AP_STOP")); + break; + case ARDUINO_EVENT_WIFI_AP_STACONNECTED: + addLog(LOG_LEVEL_INFO, F("AP_STACONNECTED")); + break; + case ARDUINO_EVENT_WIFI_AP_STADISCONNECTED: + addLog(LOG_LEVEL_INFO, F("AP_STADISCONNECTED")); + break; + case ARDUINO_EVENT_WIFI_AP_STAIPASSIGNED: + addLog(LOG_LEVEL_INFO, F("AP_STAIPASSIGNED")); + break; + case ARDUINO_EVENT_WIFI_AP_PROBEREQRECVED: + addLog(LOG_LEVEL_INFO, F("AP_PROBEREQRECVED")); + break; + case ARDUINO_EVENT_WIFI_AP_GOT_IP6: + addLog(LOG_LEVEL_INFO, F("AP_GOT_IP6")); + break; + + default: break; + } +} + +} // namespace wifi +} // namespace net +} // namespace ESPEasy + +#endif // ifdef USES_NW002 diff --git a/src/ESPEasy/net/NWPluginStructs/NW002_data_struct_WiFi_AP.h b/src/ESPEasy/net/NWPluginStructs/NW002_data_struct_WiFi_AP.h new file mode 100644 index 000000000..5428b8a0d --- /dev/null +++ b/src/ESPEasy/net/NWPluginStructs/NW002_data_struct_WiFi_AP.h @@ -0,0 +1,41 @@ +#pragma once + +#include "../_NWPlugin_Helper.h" +#ifdef USES_NW001 + + +namespace ESPEasy { +namespace net { +namespace wifi { + +struct NW002_data_struct_WiFi_AP : public NWPluginData_base { + + NW002_data_struct_WiFi_AP(networkIndex_t networkIndex); + ~NW002_data_struct_WiFi_AP(); + + + void webform_load(EventStruct *event); + void webform_save(EventStruct *event); + + bool webform_getPort(String& str); + + bool init(EventStruct *event); + + bool exit(EventStruct *event); + +private: + + static void onEvent(arduino_event_id_t event, + arduino_event_info_t info); + + network_event_handle_t nw_event_id = 0; + +}; + + +} // namespace wifi +} // namespace net +} // namespace ESPEasy + + +#endif // ifdef USES_NW001 diff --git a/src/ESPEasy/net/_NW001_WiFi_STA.cpp b/src/ESPEasy/net/_NW001_WiFi_STA.cpp index b3ef6a248..443d0b3f8 100644 --- a/src/ESPEasy/net/_NW001_WiFi_STA.cpp +++ b/src/ESPEasy/net/_NW001_WiFi_STA.cpp @@ -29,7 +29,7 @@ # include "../net/Globals/WiFi_AP_Candidates.h" # include "../net/Helpers/_NWPlugin_Helper_webform.h" # include "../net/Helpers/_NWPlugin_init.h" -# include "../net/NWPluginStructs/NW001_WiFi_STA.h" +# include "../net/NWPluginStructs/NW001_data_struct_WiFi_STA.h" # include "../net/wifi/ESPEasyWifi.h" # include "../net/wifi/ESPEasyWifi_ProcessEvent.h" @@ -279,60 +279,24 @@ bool NWPlugin_001(NWPlugin::Function function, EventStruct *event, String& strin case NWPlugin::Function::NWPLUGIN_INIT: { - /* - // Taken from ESPEasy_setup() - // Might no longer be needed as we now have a proper WiFi state machine. - - # ifdef ESP32 - - // FIXME TD-er: Disabled for now, as this may not return and thus block the ESP forever. - // See: https://github.com/espressif/esp-idf/issues/15862 - // check_and_update_WiFi_Calibration(); - # endif // ifdef ESP32 - - ESPEasy::net::wifi::WiFi_AP_Candidates.clearCache(); - ESPEasy::net::wifi::WiFi_AP_Candidates.load_knownCredentials(); - ESPEasy::net::wifi::setSTA(true); - - if (!ESPEasy::net::wifi::WiFi_AP_Candidates.hasCandidateCredentials()) { - WiFiEventData.wifiSetup = true; - RTC.clearLastWiFi(); // Must scan all channels - // Wait until scan has finished to make sure as many as possible are found - // We're still in the setup phase, so nothing else is taking resources of the ESP. - ESPEasy::net::wifi::WifiScan(false); - WiFiEventData.lastScanMoment.clear(); - } - - - - // Always perform WiFi scan - // It appears reconnecting from RTC may take just as long to be able to send first packet as performing a scan first and then - #connect. - // Perhaps the WiFi radio needs some time to stabilize first? - if (!ESPEasy::net::wifi::WiFi_AP_Candidates.hasCandidates()) { - ESPEasy::net::wifi::WifiScan(false, RTC.lastWiFiChannel); - } - ESPEasy::net::wifi::WiFi_AP_Candidates.clearCache(); - ESPEasy::net::wifi::processScanDone(); - ESPEasy::net::wifi::WiFi_AP_Candidates.load_knownCredentials(); - - if (!ESPEasy::net::wifi::WiFi_AP_Candidates.hasCandidates()) { - # ifndef BUILD_MINIMAL_OTA - addLog(LOG_LEVEL_INFO, F("Setup: Scan all channels")); - # endif - ESPEasy::net::wifi::WifiScan(false); - } - - // ESPEasy::net::wifi::setWifiMode(WIFI_OFF); - */ - - ESPEasy::net::wifi::initWiFi(); + initNWPluginData(event->NetworkIndex, new (std::nothrow) ESPEasy::net::wifi::NW001_data_struct_WiFi_STA(event->NetworkIndex)); + ESPEasy::net::wifi::NW001_data_struct_WiFi_STA *NW_data = + static_cast(getNWPluginData(event->NetworkIndex)); + if (NW_data) { + success = NW_data->init(event); + } break; } case NWPlugin::Function::NWPLUGIN_EXIT: { + ESPEasy::net::wifi::NW001_data_struct_WiFi_STA *NW_data = + static_cast(getNWPluginData(event->NetworkIndex)); + + if (NW_data) { + success = NW_data->exit(event); + } break; } diff --git a/src/ESPEasy/net/_NW002_WiFi_AP.cpp b/src/ESPEasy/net/_NW002_WiFi_AP.cpp index c561f50d0..d541058ae 100644 --- a/src/ESPEasy/net/_NW002_WiFi_AP.cpp +++ b/src/ESPEasy/net/_NW002_WiFi_AP.cpp @@ -26,7 +26,7 @@ # include "../net/Globals/NWPlugins.h" # include "../net/Helpers/_NWPlugin_Helper_webform.h" # include "../net/Helpers/_NWPlugin_init.h" - +# include "../net/NWPluginStructs/NW002_data_struct_WiFi_AP.h" // TODO TD-er: This code should be moved to this NW002 plugin @@ -160,21 +160,24 @@ bool NWPlugin_002(NWPlugin::Function function, EventStruct *event, String& strin case NWPlugin::Function::NWPLUGIN_INIT: { - ESPEasy::net::wifi::setAPinternal(true); + initNWPluginData(event->NetworkIndex, new (std::nothrow) ESPEasy::net::wifi::NW002_data_struct_WiFi_AP(event->NetworkIndex)); + ESPEasy::net::wifi::NW002_data_struct_WiFi_AP *NW_data = + static_cast(getNWPluginData(event->NetworkIndex)); - // WiFi.AP.begin(); + if (NW_data) { + success = NW_data->init(event); + } break; } case NWPlugin::Function::NWPLUGIN_EXIT: { -# ifdef ESP32 - WiFi.AP.end(); -# endif -# ifdef ESP8266 + ESPEasy::net::wifi::NW002_data_struct_WiFi_AP *NW_data = + static_cast(getNWPluginData(event->NetworkIndex)); - // WiFi.softAP -# endif // ifdef ESP8266 + if (NW_data) { + success = NW_data->exit(event); + } break; } diff --git a/src/src/Commands/InternalCommands.cpp b/src/src/Commands/InternalCommands.cpp index 0623d4255..8f33d01a9 100644 --- a/src/src/Commands/InternalCommands.cpp +++ b/src/src/Commands/InternalCommands.cpp @@ -361,7 +361,10 @@ bool InternalCommands::executeInternalCommand() case ESPEasy_cmd_e::meminfo: COMMAND_CASE_A(Command_MemInfo, 0); // Diagnostic.h case ESPEasy_cmd_e::meminfodetail: COMMAND_CASE_A(Command_MemInfo_detail, 0); // Diagnostic.h #endif // ifndef BUILD_NO_DIAGNOSTIC_COMMANDS - case ESPEasy_cmd_e::name: COMMAND_CASE_R(Command_Settings_Name, 1); // Settings.h + case ESPEasy_cmd_e::name: COMMAND_CASE_R(Command_Settings_Name, 1); // Settings.h + case ESPEasy_cmd_e::networkdisable: COMMAND_CASE_R(Command_Network_Disable, 1); // Networks.h + case ESPEasy_cmd_e::networkenable: COMMAND_CASE_R(Command_Network_Enable, 1); // Networks.h + case ESPEasy_cmd_e::nosleep: COMMAND_CASE_R(Command_System_NoSleep, 1); // System.h #if FEATURE_NOTIFIER case ESPEasy_cmd_e::notify: COMMAND_CASE_R(Command_Notifications_Notify, -1); // Notifications.h diff --git a/src/src/Commands/InternalCommands_decoder.cpp b/src/src/Commands/InternalCommands_decoder.cpp index 4b5e6c841..b5418bbb3 100644 --- a/src/src/Commands/InternalCommands_decoder.cpp +++ b/src/src/Commands/InternalCommands_decoder.cpp @@ -151,6 +151,8 @@ const char Internal_commands_m[] PROGMEM = #define Int_cmd_no_offset ESPEasy_cmd_e::name const char Internal_commands_no[] PROGMEM = "name|" + "networkdisable|" + "networkenable|" "nosleep|" #if FEATURE_NOTIFIER "notify|" diff --git a/src/src/Commands/InternalCommands_decoder.h b/src/src/Commands/InternalCommands_decoder.h index 359ebacb6..7ff4da379 100644 --- a/src/src/Commands/InternalCommands_decoder.h +++ b/src/src/Commands/InternalCommands_decoder.h @@ -118,6 +118,8 @@ enum class ESPEasy_cmd_e : uint8_t { #endif // ifndef BUILD_NO_DIAGNOSTIC_COMMANDS name, + networkdisable, + networkenable, nosleep, #if FEATURE_NOTIFIER notify, diff --git a/src/src/Commands/Networks.cpp b/src/src/Commands/Networks.cpp index c26f0d614..30789c074 100644 --- a/src/src/Commands/Networks.cpp +++ b/src/src/Commands/Networks.cpp @@ -4,6 +4,7 @@ #include "../Commands/Common.h" #include "../../ESPEasy/net/ESPEasyNetwork.h" #include "../../ESPEasy/net/eth/ESPEasyEth.h" +#include "../../ESPEasy/net/DataTypes/NetworkIndex.h" #include "../../ESPEasy/net/Globals/NetworkState.h" #include "../Globals/Settings.h" #include "../Helpers/StringConverter.h" @@ -14,6 +15,28 @@ #include #endif + +// networkIndex = (event->Par1 - 1); Par1 is here for 1 ... NETWORK_MAX +bool validNetworkVar(struct EventStruct *event, ESPEasy::net::networkIndex_t& networkIndex) +{ + if (event->Par1 <= 0) { return false; } + networkIndex = static_cast(event->Par1 - 1); + return validNetworkIndex(networkIndex); +} + +const __FlashStringHelper * Command_Network_Disable(struct EventStruct *event, const char *Line) +{ + ESPEasy::net::networkIndex_t networkIndex; + return return_command_boolean_result_flashstr(validNetworkVar(event, networkIndex) && setNetworkEnableStatus(networkIndex, false)); +} + +const __FlashStringHelper * Command_Network_Enable(struct EventStruct *event, const char *Line) +{ + ESPEasy::net::networkIndex_t networkIndex; + return return_command_boolean_result_flashstr(validNetworkVar(event, networkIndex) && setNetworkEnableStatus(networkIndex, true)); +} + + String Command_AccessInfo_Ls(struct EventStruct *event, const char* Line) { return return_result(event, concat(F("Allowed IP range : "), describeAllowedIPrange())); diff --git a/src/src/Commands/Networks.h b/src/src/Commands/Networks.h index 5dac1dcbc..853170bc3 100644 --- a/src/src/Commands/Networks.h +++ b/src/src/Commands/Networks.h @@ -1,9 +1,16 @@ #ifndef COMMAND_NETWORKS_H #define COMMAND_NETWORKS_H +#include "../../ESPEasy_common.h" + class String; +const __FlashStringHelper* Command_Network_Disable(struct EventStruct *event, + const char *Line); +const __FlashStringHelper* Command_Network_Enable(struct EventStruct *event, + const char *Line); + String Command_AccessInfo_Ls(struct EventStruct *event, const char* Line); String Command_AccessInfo_Clear (struct EventStruct *event, const char* Line); String Command_DNS (struct EventStruct *event, const char* Line); diff --git a/src/src/ESPEasyCore/Controller.cpp b/src/src/ESPEasyCore/Controller.cpp index 21207b77e..d50e310c5 100644 --- a/src/src/ESPEasyCore/Controller.cpp +++ b/src/src/ESPEasyCore/Controller.cpp @@ -160,7 +160,6 @@ void MQTTDisconnect() { if (MQTTclient.connected()) { MQTTclient.disconnect(); - MQTTclient_connected_stats.setOff(); addLog(LOG_LEVEL_INFO, F("MQTT : Disconnected from broker")); } updateMQTTclient_connected(); @@ -193,7 +192,6 @@ bool MQTTConnect(controllerIndex_t controller_idx) if (MQTTclient.connected()) { MQTTclient.disconnect(); - MQTTclient_connected_stats.setOff(); # if FEATURE_MQTT_TLS if (mqtt_tls != nullptr) { diff --git a/src/src/Helpers/Misc.cpp b/src/src/Helpers/Misc.cpp index 6ce9bf7dc..4c21f6e55 100644 --- a/src/src/Helpers/Misc.cpp +++ b/src/src/Helpers/Misc.cpp @@ -68,6 +68,36 @@ void delayBackground(unsigned long dsdelay) } } +/********************************************************************************************\ + Toggle network enabled state + \*********************************************************************************************/ +bool setNetworkEnableStatus(ESPEasy::net::networkIndex_t networkIndex, bool enabled) +{ + if (!validNetworkIndex(networkIndex)) { return false; } + #ifndef BUILD_NO_RAM_TRACKER + checkRAM(F("setNetworkEnableStatus")); + #endif // ifndef BUILD_NO_RAM_TRACKER + + // Only enable network if it has a network interface configured + if (Settings.getNWPluginID_for_network(networkIndex) != ESPEasy::net::INVALID_NW_PLUGIN_ID || !enabled) { + struct EventStruct TempEvent; + TempEvent.NetworkIndex = networkIndex; + String dummy; + + if (!enabled) { + ESPEasy::net::NWPluginCall(NWPlugin::Function::NWPLUGIN_EXIT, &TempEvent, dummy); + } + Settings.setNetworkEnabled(networkIndex, enabled); + if (enabled) { + ESPEasy::net::NWPluginCall(NWPlugin::Function::NWPLUGIN_INIT, &TempEvent, dummy); + } + + return true; + } + return false; +} + + /********************************************************************************************\ Toggle controller enabled state \*********************************************************************************************/ @@ -80,7 +110,17 @@ bool setControllerEnableStatus(controllerIndex_t controllerIndex, bool enabled) // Only enable controller if it has a protocol configured if ((Settings.Protocol[controllerIndex] != 0) || !enabled) { + struct EventStruct TempEvent; + TempEvent.ControllerIndex = controllerIndex; + String dummy; + if (!enabled) { + CPluginCall(CPlugin::Function::CPLUGIN_EXIT, &TempEvent, dummy); + } + Settings.ControllerEnabled[controllerIndex] = enabled; + if (enabled) { + CPluginCall(CPlugin::Function::CPLUGIN_INIT, &TempEvent, dummy); + } return true; } return false; diff --git a/src/src/Helpers/Misc.h b/src/src/Helpers/Misc.h index 0f94ffad4..15abec6e5 100644 --- a/src/src/Helpers/Misc.h +++ b/src/src/Helpers/Misc.h @@ -9,6 +9,8 @@ #include "../DataTypes/TaskIndex.h" #include "../Helpers/Scheduler.h" +#include "../../ESPEasy/net/DataTypes/NetworkIndex.h" + #define bitSetULL(value, bit) ((value) |= (1ULL << (bit))) #define bitClearULL(value, bit) ((value) &= ~(1ULL << (bit))) @@ -40,6 +42,12 @@ bool remoteConfig(struct EventStruct *event, \*********************************************************************************************/ void delayBackground(unsigned long dsdelay); +/********************************************************************************************\ + Toggle network enabled state + \*********************************************************************************************/ +bool setNetworkEnableStatus(ESPEasy::net::networkIndex_t networkIndex, + bool enabled); + /********************************************************************************************\ Toggle controller enabled state diff --git a/src/src/Helpers/PeriodicalActions.cpp b/src/src/Helpers/PeriodicalActions.cpp index 8ef5063a8..aadb426b2 100644 --- a/src/src/Helpers/PeriodicalActions.cpp +++ b/src/src/Helpers/PeriodicalActions.cpp @@ -362,9 +362,10 @@ void processMQTTdelayQueue() { } void updateMQTTclient_connected() { - if (MQTTclient_connected != MQTTclient.connected()) { - MQTTclient_connected = !MQTTclient_connected; - MQTTclient_connected_stats.set(MQTTclient_connected); + const bool actual_MQTTclient_connected = MQTTclient.connected(); + if (MQTTclient_connected != actual_MQTTclient_connected) { + MQTTclient_connected = actual_MQTTclient_connected; + MQTTclient_connected_stats.set(actual_MQTTclient_connected); if (!MQTTclient_connected) { if (loglevelActiveFor(LOG_LEVEL_ERROR)) { String connectionError = F("MQTT : Connection lost, state: "); diff --git a/src/src/Helpers/_CPlugin_init.cpp b/src/src/Helpers/_CPlugin_init.cpp index bc3997be5..5df340bbb 100644 --- a/src/src/Helpers/_CPlugin_init.cpp +++ b/src/src/Helpers/_CPlugin_init.cpp @@ -2169,3 +2169,17 @@ void CPluginInit() } CPluginCall(CPlugin::Function::CPLUGIN_INIT_ALL, 0); } + +void CPlugin_Init_Exit(controllerIndex_t controllerIndex) +{ + protocolIndex_t ProtocolIndex = getProtocolIndex_from_ControllerIndex(controllerIndex); + + if (validProtocolIndex(ProtocolIndex)) { + struct EventStruct TempEvent; + TempEvent.ControllerIndex = controllerIndex; + String dummy; + CPlugin::Function cfunction = + Settings.ControllerEnabled[controllerIndex] ? CPlugin::Function::CPLUGIN_INIT : CPlugin::Function::CPLUGIN_EXIT; + do_CPluginCall(ProtocolIndex, cfunction, &TempEvent, dummy); + } +} \ No newline at end of file diff --git a/src/src/Helpers/_CPlugin_init.h b/src/src/Helpers/_CPlugin_init.h index 1daab49f5..69bc3dcaa 100644 --- a/src/src/Helpers/_CPlugin_init.h +++ b/src/src/Helpers/_CPlugin_init.h @@ -5,6 +5,7 @@ #include "../DataTypes/ESPEasy_plugin_functions.h" +#include "../DataTypes/ControllerIndex.h" #include "../DataTypes/CPluginID.h" #include "../DataTypes/ProtocolIndex.h" #include "../DataStructs/ProtocolStruct.h" @@ -26,6 +27,10 @@ bool do_CPluginCall(protocolIndex_t protocolIndex, CPlugin::Function Function, s void CPluginSetup(); void CPluginInit(); +// Start or stop controller as how it is set in the Settings +void CPlugin_Init_Exit(controllerIndex_t controllerIndex); + + // Macro to forward declare the CPlugin_NNN functions. // N.B. Some controllers also have a do_process_cNNN_delay_queue function. // Forward declaration of these is done in ControllerQueue/ControllerDelayHandlerStruct.h diff --git a/src/src/WebServer/ControllerPage.cpp b/src/src/WebServer/ControllerPage.cpp index 17ab42329..cd8c9e85d 100644 --- a/src/src/WebServer/ControllerPage.cpp +++ b/src/src/WebServer/ControllerPage.cpp @@ -123,16 +123,7 @@ void handle_controllers() { if (mustInit) { // Init controller plugin using the new settings. - protocolIndex_t ProtocolIndex = getProtocolIndex_from_ControllerIndex(controllerindex); - - if (validProtocolIndex(ProtocolIndex)) { - struct EventStruct TempEvent; - TempEvent.ControllerIndex = controllerindex; - String dummy; - CPlugin::Function cfunction = - Settings.ControllerEnabled[controllerindex] ? CPlugin::Function::CPLUGIN_INIT : CPlugin::Function::CPLUGIN_EXIT; - do_CPluginCall(ProtocolIndex, cfunction, &TempEvent, dummy); - } + CPlugin_Init_Exit(controllerindex); } } diff --git a/src/src/WebServer/NetworkPage.cpp b/src/src/WebServer/NetworkPage.cpp index 2a5f9a4f3..f4ae83c6b 100644 --- a/src/src/WebServer/NetworkPage.cpp +++ b/src/src/WebServer/NetworkPage.cpp @@ -97,16 +97,7 @@ void handle_networks() if (mustInit) { // Init network plugin using the new settings. - networkDriverIndex_t NetworkDriverIndex = getNetworkDriverIndex_from_NWPluginID(nwpluginID); - - if (validNetworkDriverIndex(NetworkDriverIndex)) { - struct EventStruct TempEvent; - TempEvent.NetworkIndex = networkindex; - String dummy; - NWPlugin::Function nfunction = - Settings.getNetworkEnabled(networkindex) ? NWPlugin::Function::NWPLUGIN_INIT : NWPlugin::Function::NWPLUGIN_EXIT; - do_NWPluginCall(NetworkDriverIndex, nfunction, &TempEvent, dummy); - } + NWPlugin_Init_Exit(networkindex); } } diff --git a/static/espeasy.js b/static/espeasy.js index 8a771bbdc..057469d0a 100644 --- a/static/espeasy.js +++ b/static/espeasy.js @@ -6,7 +6,7 @@ var commonAtoms = ["And", "Or"]; var commonKeywords = ["If", "Else", "Elseif", "Endif"]; var commonCommands = ["AccessInfo", "Background", "Build", "ClearAccessBlock", "ClearRTCam", "Config", "ControllerDisable", "ControllerEnable", "DateTime", "Debug", "Dec", "DeepSleep", "DisablePriorityTask", "DNS", "DST", "EraseSDKWiFi", "ExecuteRules", "FactoryReset", "Gateway", "I2Cscanner", "Inc", - "IP", "Let", "LetStr", "Load", "LogEntry", "LogPortStatus", "LoopTimerSet", "LoopTimerSet_ms", "LoopTimerSetAndRun", "LoopTimerSetAndRun_ms", "MemInfo", "MemInfoDetail", "Name", "Password", "PostToHTTP", "Publish", "PublishR", + "IP", "Let", "LetStr", "Load", "LogEntry", "LogPortStatus", "LoopTimerSet", "LoopTimerSet_ms", "LoopTimerSetAndRun", "LoopTimerSetAndRun_ms", "MemInfo", "MemInfoDetail", "Name", "NetworkDisable", "NetworkEnable", "Password", "PostToHTTP", "Publish", "PublishR", "Reboot", "Save", "SendTo", "SendToHTTP", "SendToUDP", "SendToUDPMix", "Settings", "Subnet", "Subscribe", "TaskClear", "TaskClearAll", "TaskDisable", "TaskEnable", "TaskRun", "TaskValueSet", "TaskValueSetAndRun", "TaskValueSetDerived", "TaskValueSetPresentation", "TimerPause", "TimerResume", "TimerSet", "TimerSet_ms", "TimeZone", "UdpPort", "UdpTest", "Unit", "UseNTP", "WdConfig", "WdRead", "WiFi", "WiFiAllowAP", "WiFiAPMode", "WiFiConnect", "WiFiDisconnect", "WiFiKey", From 8b0906b9eed8337ed6de58438236783b633e3cd7 Mon Sep 17 00:00:00 2001 From: TD-er Date: Thu, 31 Jul 2025 11:56:37 +0200 Subject: [PATCH 160/564] [Controller] Fix proper checking when calling CPLUGIN_xxx functions --- src/ESPEasy/net/Globals/NWPlugins.cpp | 2 +- src/ESPEasy/net/Helpers/_NWPlugin_init.cpp | 19 +++++++++++++++ src/_C018.cpp | 3 +-- .../Scheduler_SystemEventQueueTimerID.cpp | 2 +- src/src/ESPEasyCore/Controller.cpp | 14 +++++++---- src/src/Globals/CPlugins.cpp | 23 +++++++++++++------ src/src/Helpers/Scheduler.h | 4 ++-- .../Helpers/Scheduler_SystemEventTimer.cpp | 17 +++++++------- src/src/Helpers/_CPlugin_Helper_webform.cpp | 1 + src/src/Helpers/_CPlugin_init.cpp | 18 +++++++++++++++ src/src/PluginStructs/P146_data_struct.cpp | 2 ++ src/src/WebServer/ControllerPage.cpp | 13 +++++++---- src/src/WebServer/DevicesPage.cpp | 3 +-- 13 files changed, 88 insertions(+), 33 deletions(-) diff --git a/src/ESPEasy/net/Globals/NWPlugins.cpp b/src/ESPEasy/net/Globals/NWPlugins.cpp index ea3cc9727..40e289323 100644 --- a/src/ESPEasy/net/Globals/NWPlugins.cpp +++ b/src/ESPEasy/net/Globals/NWPlugins.cpp @@ -172,7 +172,7 @@ bool NWPluginCall(NWPlugin::Function Function, EventStruct *event, String& str) } #ifdef ESP32 - if (Function == NWPlugin::Function::NWPLUGIN_EXIT) { + if (success && Function == NWPlugin::Function::NWPLUGIN_EXIT) { // Cache.clearNetworkSettings(networkIndex); } #endif // ifdef ESP32 diff --git a/src/ESPEasy/net/Helpers/_NWPlugin_init.cpp b/src/ESPEasy/net/Helpers/_NWPlugin_init.cpp index 8e7c44428..18960862b 100644 --- a/src/ESPEasy/net/Helpers/_NWPlugin_init.cpp +++ b/src/ESPEasy/net/Helpers/_NWPlugin_init.cpp @@ -5,6 +5,7 @@ #include "../../../src/DataTypes/ESPEasy_plugin_functions.h" #include "../../../src/Globals/Settings.h" #include "../../../src/Helpers/Misc.h" +#include "../../../src/Helpers/StringConverter.h" #include "../Globals/NWPlugins.h" namespace ESPEasy { @@ -2119,8 +2120,26 @@ nwpluginID_t getHighestIncludedNWPluginID() { return nwpluginID_t::toPluginID(Hi bool do_NWPluginCall(networkDriverIndex_t networkDriverIndex, NWPlugin::Function Function, EventStruct *event, String& string) { + static uint32_t networkIndex_initialized{}; if (networkDriverIndex.value < NetworkDriverIndex_to_NWPlugin_id_size) { + if (Function == NWPlugin::Function::NWPLUGIN_INIT) { + if (bitRead(networkIndex_initialized, event->NetworkIndex)) { + // FIXME TD-er: What to do here? Was already initialized + addLog(LOG_LEVEL_ERROR, strformat(F("Network %d was already initialized"), event->NetworkIndex + 1)); + return false; + } + bitSet(networkIndex_initialized, event->NetworkIndex); + } else if (Function == NWPlugin::Function::NWPLUGIN_EXIT) { + if (!bitRead(networkIndex_initialized, event->NetworkIndex)) { + // FIXME TD-er: What to do here? Was not (yet) initialized + addLog(LOG_LEVEL_ERROR, strformat(F("Network %d was not (yet) initialized"), event->NetworkIndex + 1)); + return false; + } + bitClear(networkIndex_initialized, event->NetworkIndex); + } + + START_TIMER; NWPlugin_ptr_t nwplugin_call = (NWPlugin_ptr_t)pgm_read_ptr(NWPlugin_ptr + networkDriverIndex.value); const bool res = nwplugin_call(Function, event, string); diff --git a/src/_C018.cpp b/src/_C018.cpp index cd47ed974..326b19389 100644 --- a/src/_C018.cpp +++ b/src/_C018.cpp @@ -225,8 +225,7 @@ bool CPlugin_018(CPlugin::Function function, struct EventStruct *event, String& case CPlugin::Function::CPLUGIN_PROTOCOL_RECV: { // FIXME TD-er: WHen should this be scheduled? - // protocolIndex_t ProtocolIndex = getProtocolIndex_from_ControllerIndex(event->ControllerIndex); - // schedule_controller_event_timer(ProtocolIndex, CPlugin::Function::CPLUGIN_PROTOCOL_RECV, event); + // schedule_controller_event_timer(event->ControllerIndex, CPlugin::Function::CPLUGIN_PROTOCOL_RECV, event); break; } diff --git a/src/src/DataStructs/Scheduler_SystemEventQueueTimerID.cpp b/src/src/DataStructs/Scheduler_SystemEventQueueTimerID.cpp index a241920c4..03beb6bf4 100644 --- a/src/src/DataStructs/Scheduler_SystemEventQueueTimerID.cpp +++ b/src/src/DataStructs/Scheduler_SystemEventQueueTimerID.cpp @@ -24,7 +24,7 @@ String SystemEventQueueTimerID::decode() const result += ','; if (ptr_type == SchedulerPluginPtrType_e::ControllerPlugin) { - result += getCPluginNameFromProtocolIndex(index); + result += getCPluginID_from_ControllerIndex(index); } else if (ptr_type == SchedulerPluginPtrType_e::TaskPlugin) { const deviceIndex_t dev_index = deviceIndex_t::toDeviceIndex(index); result += getPluginNameFromDeviceIndex(dev_index); diff --git a/src/src/ESPEasyCore/Controller.cpp b/src/src/ESPEasyCore/Controller.cpp index d50e310c5..17de2b103 100644 --- a/src/src/ESPEasyCore/Controller.cpp +++ b/src/src/ESPEasyCore/Controller.cpp @@ -65,16 +65,17 @@ void sendData(struct EventStruct *event, bool sendEvents) Settings.Protocol[x]) { event->ControllerIndex = x; - const protocolIndex_t ProtocolIndex = getProtocolIndex_from_ControllerIndex(event->ControllerIndex); event->idx = Settings.TaskDeviceID[x][event->TaskIndex]; if (validUserVar(event)) { String dummy; - do_CPluginCall(ProtocolIndex, CPlugin::Function::CPLUGIN_PROTOCOL_SEND, event, dummy); + CPluginCall(CPlugin::Function::CPLUGIN_PROTOCOL_SEND, event, dummy); } #ifndef BUILD_NO_DEBUG else { if (loglevelActiveFor(LOG_LEVEL_DEBUG)) { + const protocolIndex_t ProtocolIndex = getProtocolIndex_from_ControllerIndex(event->ControllerIndex); + String log = F("Invalid value detected for controller "); log += getCPluginNameFromProtocolIndex(ProtocolIndex); addLogMove(LOG_LEVEL_DEBUG, log); @@ -130,10 +131,8 @@ void incoming_mqtt_callback(char *c_topic, uint8_t *b_payload, unsigned int leng } // TD-er: This one cannot set the TaskIndex, but that may seem to work out.... hopefully. - protocolIndex_t ProtocolIndex = getProtocolIndex_from_ControllerIndex(enabledMqttController); - Scheduler.schedule_mqtt_controller_event_timer( - ProtocolIndex, + enabledMqttController, CPlugin::Function::CPLUGIN_PROTOCOL_RECV, c_topic, b_payload, length); @@ -461,6 +460,11 @@ bool MQTTConnect(controllerIndex_t controller_idx) mqtt_tls->clearLastError(); # endif // ifdef ESP32 // mqtt_tls_last_errorstr = buf; + if (mqtt_tls_last_error == ERR_OOM) mqtt_tls_last_errorstr = F("OutOfMemory"); + if (mqtt_tls_last_error == ERR_CANT_RESOLVE_IP) mqtt_tls_last_errorstr = F("Can't resolve IP"); + if (mqtt_tls_last_error == ERR_TCP_CONNECT) mqtt_tls_last_errorstr = F("TCP Connect error"); + if (mqtt_tls_last_error == ERR_MISSING_CA) mqtt_tls_last_errorstr = F("Missing CA"); + } # ifdef ESP32 diff --git a/src/src/Globals/CPlugins.cpp b/src/src/Globals/CPlugins.cpp index 660a7f685..3856ccec9 100644 --- a/src/src/Globals/CPlugins.cpp +++ b/src/src/Globals/CPlugins.cpp @@ -84,24 +84,33 @@ bool CPluginCall(CPlugin::Function Function, struct EventStruct *event, String& return success; } - // calls to specific controller + // calls to specific controller which need to be enabled before calling case CPlugin::Function::CPLUGIN_INIT: - case CPlugin::Function::CPLUGIN_EXIT: - case CPlugin::Function::CPLUGIN_PROTOCOL_TEMPLATE: case CPlugin::Function::CPLUGIN_PROTOCOL_SEND: case CPlugin::Function::CPLUGIN_PROTOCOL_RECV: + case CPlugin::Function::CPLUGIN_TASK_CHANGE_NOTIFICATION: + if (!validControllerIndex(event->ControllerIndex) + || !Settings.ControllerEnabled[event->ControllerIndex]) + { + return false; + } + // fall through + + + // calls to specific controller which might not be enabled when calling this function + case CPlugin::Function::CPLUGIN_EXIT: case CPlugin::Function::CPLUGIN_GET_DEVICENAME: + case CPlugin::Function::CPLUGIN_PROTOCOL_TEMPLATE: case CPlugin::Function::CPLUGIN_WEBFORM_LOAD: case CPlugin::Function::CPLUGIN_WEBFORM_SAVE: case CPlugin::Function::CPLUGIN_GET_PROTOCOL_DISPLAY_NAME: - case CPlugin::Function::CPLUGIN_TASK_CHANGE_NOTIFICATION: case CPlugin::Function::CPLUGIN_WEBFORM_SHOW_HOST_CONFIG: { const controllerIndex_t controllerindex = event->ControllerIndex; bool success = false; if (validControllerIndex(controllerindex)) { - if (Settings.ControllerEnabled[controllerindex] && supportedCPluginID(Settings.Protocol[controllerindex])) + if (supportedCPluginID(Settings.Protocol[controllerindex])) { if (Function == CPlugin::Function::CPLUGIN_PROTOCOL_SEND) { checkDeviceVTypeForTask(event); @@ -114,13 +123,13 @@ bool CPluginCall(CPlugin::Function Function, struct EventStruct *event, String& } #ifdef ESP32 - if (Function == CPlugin::Function::CPLUGIN_EXIT) { + if (success && Function == CPlugin::Function::CPLUGIN_EXIT) { Cache.clearControllerSettings(controllerindex); } #endif // ifdef ESP32 #if FEATURE_MQTT_DISCOVER - if (Function == CPlugin::Function::CPLUGIN_EXIT) { + if (success && Function == CPlugin::Function::CPLUGIN_EXIT) { if (mqttDiscoveryController == controllerindex) { mqttDiscoveryController = INVALID_CONTROLLER_INDEX; // Reset mqttDiscoverOnlyTask = INVALID_TASK_INDEX; diff --git a/src/src/Helpers/Scheduler.h b/src/src/Helpers/Scheduler.h index 56d08670a..7db719416 100644 --- a/src/src/Helpers/Scheduler.h +++ b/src/src/Helpers/Scheduler.h @@ -253,12 +253,12 @@ void setPluginTaskTimer(unsigned long msecFromNow, // Note: the event will be moved - void schedule_controller_event_timer(protocolIndex_t ProtocolIndex, + void schedule_controller_event_timer(controllerIndex_t ControllerIndex, uint8_t Function, struct EventStruct&& event); #if FEATURE_MQTT - void schedule_mqtt_controller_event_timer(protocolIndex_t ProtocolIndex, + void schedule_mqtt_controller_event_timer(controllerIndex_t ControllerIndex, CPlugin::Function Function, const char *c_topic, const uint8_t *b_payload, diff --git a/src/src/Helpers/Scheduler_SystemEventTimer.cpp b/src/src/Helpers/Scheduler_SystemEventTimer.cpp index 17238008e..f2fe623dc 100644 --- a/src/src/Helpers/Scheduler_SystemEventTimer.cpp +++ b/src/src/Helpers/Scheduler_SystemEventTimer.cpp @@ -75,13 +75,14 @@ void ESPEasy_Scheduler::schedule_mqtt_plugin_import_event_timer( #endif // if FEATURE_MQTT void ESPEasy_Scheduler::schedule_controller_event_timer( - protocolIndex_t ProtocolIndex, + controllerIndex_t ControllerIndex, uint8_t Function, struct EventStruct&& event) { - if (validProtocolIndex(ProtocolIndex)) { + if (validControllerIndex(ControllerIndex)) { + event.ControllerIndex = ControllerIndex; schedule_event_timer( SchedulerPluginPtrType_e::ControllerPlugin, - ProtocolIndex, + ControllerIndex, Function, std::move(event)); } @@ -89,13 +90,14 @@ void ESPEasy_Scheduler::schedule_controller_event_timer( #if FEATURE_MQTT void ESPEasy_Scheduler::schedule_mqtt_controller_event_timer( - protocolIndex_t ProtocolIndex, + controllerIndex_t ControllerIndex, CPlugin::Function Function, const char *c_topic, const uint8_t *b_payload, unsigned int length) { - if (validProtocolIndex(ProtocolIndex) && c_topic && b_payload) { + if (validControllerIndex(ControllerIndex) && c_topic && b_payload) { EventStruct event; + event.ControllerIndex = ControllerIndex; const size_t topic_length = strlen_P(c_topic); // This is being called from a callback function, so do not try to allocate this on the 2nd heap, but rather on the default heap. @@ -111,7 +113,7 @@ void ESPEasy_Scheduler::schedule_mqtt_controller_event_timer( // This makes sure the relatively large event will not be in memory twice. const SystemEventQueueTimerID timerID( SchedulerPluginPtrType_e::ControllerPlugin, - ProtocolIndex, + ControllerIndex, static_cast(Function)); { @@ -208,8 +210,7 @@ void ESPEasy_Scheduler::process_system_event_queue() { break; } case SchedulerPluginPtrType_e::ControllerPlugin: - do_CPluginCall(Index, - static_cast(Function), + CPluginCall(static_cast(Function), &ScheduledEventQueue.front().event, tmpString); break; diff --git a/src/src/Helpers/_CPlugin_Helper_webform.cpp b/src/src/Helpers/_CPlugin_Helper_webform.cpp index 80324eb86..c353d4851 100644 --- a/src/src/Helpers/_CPlugin_Helper_webform.cpp +++ b/src/src/Helpers/_CPlugin_Helper_webform.cpp @@ -92,6 +92,7 @@ String getControllerParameterName(protocolIndex_t ProtocolInde EventStruct tmpEvent; tmpEvent.idx = parameterIdx; + // Need to call the do_CPluginCall function here as this may be called when the controller is not (yet) enabled if (do_CPluginCall(ProtocolIndex, CPlugin::Function::CPLUGIN_GET_PROTOCOL_DISPLAY_NAME, &tmpEvent, name)) { // Found an alternative name for it. isAlternative = true; diff --git a/src/src/Helpers/_CPlugin_init.cpp b/src/src/Helpers/_CPlugin_init.cpp index 5df340bbb..8fec6424e 100644 --- a/src/src/Helpers/_CPlugin_init.cpp +++ b/src/src/Helpers/_CPlugin_init.cpp @@ -9,6 +9,7 @@ #include "../Globals/Settings.h" #include "../Helpers/Misc.h" +#include "../Helpers/StringConverter.h" // ******************************************************************************** // Initialize all Controller CPlugins that where defined earlier @@ -2122,8 +2123,25 @@ cpluginID_t getHighestIncludedCPluginID() bool do_CPluginCall(protocolIndex_t protocolIndex, CPlugin::Function Function, struct EventStruct *event, String& string) { + static uint32_t controllerIndex_initialized{}; if (protocolIndex < ProtocolIndex_to_CPlugin_id_size) { + if (Function == CPlugin::Function::CPLUGIN_INIT) { + if (bitRead(controllerIndex_initialized, event->ControllerIndex)) { + // FIXME TD-er: What to do here? Was already initialized + addLog(LOG_LEVEL_ERROR, strformat(F("Controller %d was already initialized"), event->ControllerIndex + 1)); + return false; + } + bitSet(controllerIndex_initialized, event->ControllerIndex); + } else if (Function == CPlugin::Function::CPLUGIN_EXIT) { + if (!bitRead(controllerIndex_initialized, event->ControllerIndex)) { + // FIXME TD-er: What to do here? Was not (yet) initialized + addLog(LOG_LEVEL_ERROR, strformat(F("Controller %d was not (yet) initialized"), event->ControllerIndex + 1)); + return false; + } + bitClear(controllerIndex_initialized, event->ControllerIndex); + } + START_TIMER; CPlugin_ptr_t cplugin_call = (CPlugin_ptr_t)pgm_read_ptr(CPlugin_ptr + protocolIndex); const bool res = cplugin_call(Function, event, string); diff --git a/src/src/PluginStructs/P146_data_struct.cpp b/src/src/PluginStructs/P146_data_struct.cpp index 76266ff2b..00f2b178a 100644 --- a/src/src/PluginStructs/P146_data_struct.cpp +++ b/src/src/PluginStructs/P146_data_struct.cpp @@ -385,6 +385,8 @@ bool P146_data_struct::sendViaOriginalTask( String dummy; // FIXME TD-er: Must think about how to include the timestamp + // FIXME TD-er: Must this one call CPluginCall instead of do_CPluginCall ???? + // Device VType might not be correct when calling do_CPluginCall if (do_CPluginCall(ProtocolIndex, CPlugin::Function::CPLUGIN_PROTOCOL_SEND, &tmpEvent, dummy)) { // FIXME TD-er: What to do when multiple controllers are selected and one fails? // Also, what if we only sent 1 value instead of all? diff --git a/src/src/WebServer/ControllerPage.cpp b/src/src/WebServer/ControllerPage.cpp index cd8c9e85d..dc63b44a8 100644 --- a/src/src/WebServer/ControllerPage.cpp +++ b/src/src/WebServer/ControllerPage.cpp @@ -164,13 +164,14 @@ void handle_controllers_clearLoadDefaults(uint8_t controllerindex, ControllerSet // Load some templates from the controller. struct EventStruct TempEvent; + TempEvent.ControllerIndex = controllerindex; // Hand over the controller settings in the Data pointer, so the controller can set some defaults. TempEvent.Data = (uint8_t *)(&ControllerSettings); if (proto.usesTemplate) { String dummy; - do_CPluginCall(ProtocolIndex, CPlugin::Function::CPLUGIN_PROTOCOL_TEMPLATE, &TempEvent, dummy); + CPluginCall(CPlugin::Function::CPLUGIN_PROTOCOL_TEMPLATE, &TempEvent, dummy); } safe_strncpy(ControllerSettings.Subscribe, TempEvent.String1.c_str(), sizeof(ControllerSettings.Subscribe)); safe_strncpy(ControllerSettings.Publish, TempEvent.String2.c_str(), sizeof(ControllerSettings.Publish)); @@ -209,7 +210,7 @@ void handle_controllers_CopySubmittedSettings_CPluginCall(uint8_t controllerinde // Call controller plugin to save CustomControllerSettings String dummy; - do_CPluginCall(ProtocolIndex, CPlugin::Function::CPLUGIN_WEBFORM_SAVE, &TempEvent, dummy); + CPluginCall(CPlugin::Function::CPLUGIN_WEBFORM_SAVE, &TempEvent, dummy); } } @@ -265,10 +266,11 @@ void handle_controllers_ShowAllControllersTable() html_TD(); addHtml(getCPluginNameFromCPluginID(Settings.Protocol[x])); html_TD(); - const protocolIndex_t ProtocolIndex = getProtocolIndex_from_ControllerIndex(x); { String hostDescription; - do_CPluginCall(ProtocolIndex, CPlugin::Function::CPLUGIN_WEBFORM_SHOW_HOST_CONFIG, 0, hostDescription); + EventStruct TempEvent; + TempEvent.ControllerIndex = x; + CPluginCall(CPlugin::Function::CPLUGIN_WEBFORM_SHOW_HOST_CONFIG, &TempEvent, hostDescription); if (!hostDescription.isEmpty()) { addHtml(hostDescription); @@ -278,6 +280,7 @@ void handle_controllers_ShowAllControllersTable() } html_TD(); + const protocolIndex_t ProtocolIndex = getProtocolIndex_from_ControllerIndex(x); const ProtocolStruct& proto = getProtocolStruct(ProtocolIndex); if ((INVALID_PROTOCOL_INDEX == ProtocolIndex) || proto.usesPort) { @@ -489,7 +492,7 @@ void handle_controllers_ControllerSettingsPage(controllerIndex_t controllerindex TempEvent.ControllerIndex = controllerindex; String webformLoadString; - do_CPluginCall(ProtocolIndex, CPlugin::Function::CPLUGIN_WEBFORM_LOAD, &TempEvent, webformLoadString); + CPluginCall(CPlugin::Function::CPLUGIN_WEBFORM_LOAD, &TempEvent, webformLoadString); if (webformLoadString.length() > 0) { addHtmlError(F("Bug in CPlugin::Function::CPLUGIN_WEBFORM_LOAD, should not append to string, use addHtml() instead")); diff --git a/src/src/WebServer/DevicesPage.cpp b/src/src/WebServer/DevicesPage.cpp index 4edd71803..9e0a5faeb 100644 --- a/src/src/WebServer/DevicesPage.cpp +++ b/src/src/WebServer/DevicesPage.cpp @@ -522,9 +522,8 @@ void handle_devices_CopySubmittedSettings(taskIndex_t taskIndex, pluginID_t task if (Settings.TaskDeviceSendData[TempEvent.ControllerIndex][TempEvent.TaskIndex] && Settings.ControllerEnabled[TempEvent.ControllerIndex] && Settings.Protocol[TempEvent.ControllerIndex]) { - protocolIndex_t ProtocolIndex = getProtocolIndex_from_ControllerIndex(TempEvent.ControllerIndex); String dummy; - do_CPluginCall(ProtocolIndex, CPlugin::Function::CPLUGIN_TASK_CHANGE_NOTIFICATION, &TempEvent, dummy); + CPluginCall(CPlugin::Function::CPLUGIN_TASK_CHANGE_NOTIFICATION, &TempEvent, dummy); } } From 41041b827b0662831fe6c22f44ff9c68fe2efa20 Mon Sep 17 00:00:00 2001 From: TD-er Date: Thu, 31 Jul 2025 12:24:07 +0200 Subject: [PATCH 161/564] [Network] Fix build on ESP8266 --- .../net/NWPluginStructs/NW001_data_struct_WiFi_STA.cpp | 6 ++++++ .../net/NWPluginStructs/NW001_data_struct_WiFi_STA.h | 4 ++-- .../net/NWPluginStructs/NW002_data_struct_WiFi_AP.cpp | 6 ++++++ src/ESPEasy/net/NWPluginStructs/NW002_data_struct_WiFi_AP.h | 2 ++ src/ESPEasy/net/_NWPlugin_Helper.cpp | 4 ---- src/ESPEasy/net/_NWPlugin_Helper.h | 4 ---- 6 files changed, 16 insertions(+), 10 deletions(-) diff --git a/src/ESPEasy/net/NWPluginStructs/NW001_data_struct_WiFi_STA.cpp b/src/ESPEasy/net/NWPluginStructs/NW001_data_struct_WiFi_STA.cpp index 620ad21d5..87b735f52 100644 --- a/src/ESPEasy/net/NWPluginStructs/NW001_data_struct_WiFi_STA.cpp +++ b/src/ESPEasy/net/NWPluginStructs/NW001_data_struct_WiFi_STA.cpp @@ -27,15 +27,19 @@ NW001_data_struct_WiFi_STA::NW001_data_struct_WiFi_STA(networkIndex_t networkInd _connectedStats.clear(); _gotIPStats.clear(); _gotIP6Stats.clear(); +#ifdef ESP32 nw_event_id = Network.onEvent(NW001_data_struct_WiFi_STA::onEvent); +#endif } NW001_data_struct_WiFi_STA::~NW001_data_struct_WiFi_STA() { +#ifdef ESP32 if (nw_event_id != 0) { Network.removeEvent(nw_event_id); } nw_event_id = 0; +#endif } void NW001_data_struct_WiFi_STA::webform_load(EventStruct *event) {} @@ -99,6 +103,7 @@ bool NW001_data_struct_WiFi_STA::init(EventStruct *event) bool NW001_data_struct_WiFi_STA::exit(EventStruct *event) { return true; } +#ifdef ESP32 void NW001_data_struct_WiFi_STA::onEvent(arduino_event_id_t event, arduino_event_info_t info) { @@ -150,6 +155,7 @@ void NW001_data_struct_WiFi_STA::onEvent(arduino_event_id_t event, default: break; } } +#endif } // namespace wifi } // namespace net diff --git a/src/ESPEasy/net/NWPluginStructs/NW001_data_struct_WiFi_STA.h b/src/ESPEasy/net/NWPluginStructs/NW001_data_struct_WiFi_STA.h index 21b3b73f0..21e628639 100644 --- a/src/ESPEasy/net/NWPluginStructs/NW001_data_struct_WiFi_STA.h +++ b/src/ESPEasy/net/NWPluginStructs/NW001_data_struct_WiFi_STA.h @@ -24,12 +24,12 @@ struct NW001_data_struct_WiFi_STA : public NWPluginData_base { bool exit(EventStruct *event); private: - +#ifdef ESP32 static void onEvent(arduino_event_id_t event, arduino_event_info_t info); network_event_handle_t nw_event_id = 0; - +#endif }; diff --git a/src/ESPEasy/net/NWPluginStructs/NW002_data_struct_WiFi_AP.cpp b/src/ESPEasy/net/NWPluginStructs/NW002_data_struct_WiFi_AP.cpp index 8308bb8d4..5feac9789 100644 --- a/src/ESPEasy/net/NWPluginStructs/NW002_data_struct_WiFi_AP.cpp +++ b/src/ESPEasy/net/NWPluginStructs/NW002_data_struct_WiFi_AP.cpp @@ -20,15 +20,19 @@ static LongTermOnOffTimer _startStopStats; NW002_data_struct_WiFi_AP::NW002_data_struct_WiFi_AP(networkIndex_t networkIndex) : NWPluginData_base(nwpluginID_t(2), networkIndex) { +#ifdef ESP32 nw_event_id = Network.onEvent(NW002_data_struct_WiFi_AP::onEvent); +#endif } NW002_data_struct_WiFi_AP::~NW002_data_struct_WiFi_AP() { +#ifdef ESP32 if (nw_event_id != 0) { Network.removeEvent(nw_event_id); } nw_event_id = 0; +#endif } void NW002_data_struct_WiFi_AP::webform_load(EventStruct *event) {} @@ -56,6 +60,7 @@ bool NW002_data_struct_WiFi_AP::exit(EventStruct *event) return true; } +#ifdef ESP32 void NW002_data_struct_WiFi_AP::onEvent(arduino_event_id_t event, arduino_event_info_t info) { @@ -88,6 +93,7 @@ void NW002_data_struct_WiFi_AP::onEvent(arduino_event_id_t event, default: break; } } +#endif } // namespace wifi } // namespace net diff --git a/src/ESPEasy/net/NWPluginStructs/NW002_data_struct_WiFi_AP.h b/src/ESPEasy/net/NWPluginStructs/NW002_data_struct_WiFi_AP.h index 5428b8a0d..f45432b4e 100644 --- a/src/ESPEasy/net/NWPluginStructs/NW002_data_struct_WiFi_AP.h +++ b/src/ESPEasy/net/NWPluginStructs/NW002_data_struct_WiFi_AP.h @@ -25,10 +25,12 @@ struct NW002_data_struct_WiFi_AP : public NWPluginData_base { private: +#ifdef ESP32 static void onEvent(arduino_event_id_t event, arduino_event_info_t info); network_event_handle_t nw_event_id = 0; +#endif }; diff --git a/src/ESPEasy/net/_NWPlugin_Helper.cpp b/src/ESPEasy/net/_NWPlugin_Helper.cpp index c20a4c550..b615409df 100644 --- a/src/ESPEasy/net/_NWPlugin_Helper.cpp +++ b/src/ESPEasy/net/_NWPlugin_Helper.cpp @@ -1,7 +1,5 @@ #include "../net/_NWPlugin_Helper.h" -#if FEATURE_STORE_NETWORK_INTERFACE_SETTINGS - # include "../../src/CustomBuild/ESPEasyLimits.h" # include "../net/Globals/NWPlugins.h" @@ -92,5 +90,3 @@ bool nwpluginTaskData_initialized(ESPEasy::net::networkIndex_t networkIndex) { } // namespace net } // namespace ESPEasy - -#endif // if FEATURE_STORE_NETWORK_INTERFACE_SETTINGS diff --git a/src/ESPEasy/net/_NWPlugin_Helper.h b/src/ESPEasy/net/_NWPlugin_Helper.h index b6c8fc8f4..8f848dd08 100644 --- a/src/ESPEasy/net/_NWPlugin_Helper.h +++ b/src/ESPEasy/net/_NWPlugin_Helper.h @@ -2,8 +2,6 @@ #include "../../ESPEasy_common.h" -#if FEATURE_STORE_NETWORK_INTERFACE_SETTINGS - # include "../../src/CustomBuild/ESPEasyLimits.h" # include "../../src/DataStructs/ESPEasy_EventStruct.h" # include "../net/DataStructs/NWPluginData_base.h" @@ -38,5 +36,3 @@ bool nwpluginTaskData_initialized(ESPEasy::net::networkIndex_t networkIndex); } // namespace net } // namespace ESPEasy - -#endif // if FEATURE_STORE_NETWORK_INTERFACE_SETTINGS From 38b9597e0e173198e49b674fbaf74bafacfa9dbc Mon Sep 17 00:00:00 2001 From: TD-er Date: Thu, 31 Jul 2025 13:46:36 +0200 Subject: [PATCH 162/564] [Controllers] Call [C/NW]PLUGIN_EXIT before _INIT when saving settings --- src/ESPEasy/net/Globals/NWPlugins.cpp | 47 ++++++++++++------- .../net/Helpers/_NWPlugin_Helper_webform.cpp | 1 + src/ESPEasy/net/Helpers/_NWPlugin_init.cpp | 18 ++++--- src/ESPEasy/net/Helpers/_NWPlugin_init.h | 2 +- src/src/DataStructs/TimingStats.cpp | 9 ++-- src/src/DataTypes/ESPEasy_plugin_functions.h | 1 + src/src/Globals/CPlugins.cpp | 17 +++++-- src/src/Helpers/LongTermOnOffTimer.cpp | 20 ++++---- src/src/Helpers/PeriodicalActions.cpp | 1 + src/src/Helpers/_CPlugin_Helper_webform.cpp | 2 +- src/src/Helpers/_CPlugin_init.cpp | 13 +++-- src/src/Helpers/_CPlugin_init.h | 2 +- src/src/Helpers/_ESPEasy_key_value_store.cpp | 3 ++ src/src/WebServer/ControllerPage.cpp | 2 +- src/src/WebServer/NetworkPage.cpp | 13 ++--- 15 files changed, 95 insertions(+), 56 deletions(-) diff --git a/src/ESPEasy/net/Globals/NWPlugins.cpp b/src/ESPEasy/net/Globals/NWPlugins.cpp index 40e289323..a5d180ac8 100644 --- a/src/ESPEasy/net/Globals/NWPlugins.cpp +++ b/src/ESPEasy/net/Globals/NWPlugins.cpp @@ -40,6 +40,10 @@ bool NWPluginCall(NWPlugin::Function Function, EventStruct *event, String& str) // only called from NWPluginSetup() directly using networkDriverIndex break; + case NWPlugin::Function::NWPLUGIN_GET_PARAMETER_DISPLAY_NAME: + // Only called from _NWPlugin_Helper_webform getNetworkParameterName + break; + // calls to all active networks case NWPlugin::Function::NWPLUGIN_INIT_ALL: case NWPlugin::Function::NWPLUGIN_EXIT_ALL: @@ -58,7 +62,10 @@ bool NWPluginCall(NWPlugin::Function Function, EventStruct *event, String& str) } for (networkIndex_t x = 0; x < NETWORK_MAX; x++) { - if (Settings.getNWPluginID_for_network(x) && Settings.getNetworkEnabled(x)) { + const bool checkedEnabled = + Settings.getNetworkEnabled(x) || + Function == NWPlugin::Function::NWPLUGIN_EXIT; + if (Settings.getNWPluginID_for_network(x) && checkedEnabled) { event->NetworkIndex = x; String command; @@ -81,32 +88,38 @@ bool NWPluginCall(NWPlugin::Function Function, EventStruct *event, String& str) return success; } - // calls to specific network - case NWPlugin::Function::NWPLUGIN_LOAD_DEFAULTS: + // calls to specific network which need to be enabled before calling case NWPlugin::Function::NWPLUGIN_INIT: - case NWPlugin::Function::NWPLUGIN_EXIT: - case NWPlugin::Function::NWPLUGIN_GET_DEVICENAME: - case NWPlugin::Function::NWPLUGIN_WEBFORM_LOAD: - case NWPlugin::Function::NWPLUGIN_WEBFORM_SAVE: + case NWPlugin::Function::NWPLUGIN_CONNECT_SUCCESS: + case NWPlugin::Function::NWPLUGIN_CONNECT_FAIL: + case NWPlugin::Function::NWPLUGIN_WEBFORM_SHOW_CONNECTED: + case NWPlugin::Function::NWPLUGIN_WEBFORM_SHOW_HW_ADDRESS: + case NWPlugin::Function::NWPLUGIN_WEBFORM_SHOW_IP: + case NWPlugin::Function::NWPLUGIN_WEBFORM_SHOW_PORT: + case NWPlugin::Function::NWPLUGIN_WEBFORM_SHOW_HOSTNAME: #ifdef ESP32 case NWPlugin::Function::NWPLUGIN_GET_INTERFACE: case NWPlugin::Function::NWPLUGIN_WEBFORM_SHOW_ROUTE_PRIO: #endif // ifdef ESP32 - case NWPlugin::Function::NWPLUGIN_CONNECT_SUCCESS: - case NWPlugin::Function::NWPLUGIN_CONNECT_FAIL: + + if (!validNetworkIndex(event->NetworkIndex) || + !Settings.getNetworkEnabled(event->NetworkIndex)) { return false; } + + // fall through + + // calls to specific network + case NWPlugin::Function::NWPLUGIN_LOAD_DEFAULTS: + case NWPlugin::Function::NWPLUGIN_EXIT: + case NWPlugin::Function::NWPLUGIN_GET_DEVICENAME: + case NWPlugin::Function::NWPLUGIN_WEBFORM_LOAD: + case NWPlugin::Function::NWPLUGIN_WEBFORM_SAVE: case NWPlugin::Function::NWPLUGIN_DRIVER_TEMPLATE: - case NWPlugin::Function::NWPLUGIN_GET_PARAMETER_DISPLAY_NAME: - case NWPlugin::Function::NWPLUGIN_WEBFORM_SHOW_CONNECTED: - case NWPlugin::Function::NWPLUGIN_WEBFORM_SHOW_HOSTNAME: - case NWPlugin::Function::NWPLUGIN_WEBFORM_SHOW_HW_ADDRESS: - case NWPlugin::Function::NWPLUGIN_WEBFORM_SHOW_IP: - case NWPlugin::Function::NWPLUGIN_WEBFORM_SHOW_PORT: { const networkIndex_t networkIndex = event->NetworkIndex; bool success = false; if (validNetworkIndex(networkIndex)) { - if (Settings.getNetworkEnabled(networkIndex) && supportedNWPluginID(Settings.getNWPluginID_for_network(networkIndex))) + if (supportedNWPluginID(Settings.getNWPluginID_for_network(networkIndex))) { const networkDriverIndex_t networkDriverIndex = getNetworkDriverIndex_from_NetworkIndex(networkIndex); @@ -172,7 +185,7 @@ bool NWPluginCall(NWPlugin::Function Function, EventStruct *event, String& str) } #ifdef ESP32 - if (success && Function == NWPlugin::Function::NWPLUGIN_EXIT) { + if (success && (Function == NWPlugin::Function::NWPLUGIN_EXIT)) { // Cache.clearNetworkSettings(networkIndex); } #endif // ifdef ESP32 diff --git a/src/ESPEasy/net/Helpers/_NWPlugin_Helper_webform.cpp b/src/ESPEasy/net/Helpers/_NWPlugin_Helper_webform.cpp index 91b058c19..dd712cb15 100644 --- a/src/ESPEasy/net/Helpers/_NWPlugin_Helper_webform.cpp +++ b/src/ESPEasy/net/Helpers/_NWPlugin_Helper_webform.cpp @@ -48,6 +48,7 @@ String getNetworkParameterName(networkDriverIndex_t NetworkDriverIndex EventStruct tmpEvent; tmpEvent.idx = parameterIdx; + // Only Network Driver specific call, so may call do_NWPluginCall directly if (do_NWPluginCall(NetworkDriverIndex, NWPlugin::Function::NWPLUGIN_GET_PARAMETER_DISPLAY_NAME, &tmpEvent, name)) { // Found an alternative name for it. isAlternative = true; diff --git a/src/ESPEasy/net/Helpers/_NWPlugin_init.cpp b/src/ESPEasy/net/Helpers/_NWPlugin_init.cpp index 18960862b..c29d5c706 100644 --- a/src/ESPEasy/net/Helpers/_NWPlugin_init.cpp +++ b/src/ESPEasy/net/Helpers/_NWPlugin_init.cpp @@ -2121,6 +2121,7 @@ nwpluginID_t getHighestIncludedNWPluginID() { return nwpluginID_t::toPluginID(Hi bool do_NWPluginCall(networkDriverIndex_t networkDriverIndex, NWPlugin::Function Function, EventStruct *event, String& string) { static uint32_t networkIndex_initialized{}; + if (networkDriverIndex.value < NetworkDriverIndex_to_NWPlugin_id_size) { if (Function == NWPlugin::Function::NWPLUGIN_INIT) { @@ -2188,21 +2189,24 @@ void NWPluginInit() NWPluginCall(NWPlugin::Function::NWPLUGIN_INIT_ALL, 0); } -void NWPlugin_Init_Exit(networkIndex_t networkIndex) +void NWPlugin_Exit_Init(networkIndex_t networkIndex) { - const networkDriverIndex_t NetworkDriverIndex = - getNetworkDriverIndex_from_NetworkIndex(networkIndex); + const networkDriverIndex_t NetworkDriverIndex = + getNetworkDriverIndex_from_NetworkIndex(networkIndex); if (validNetworkDriverIndex(NetworkDriverIndex)) { struct EventStruct TempEvent; TempEvent.NetworkIndex = networkIndex; String dummy; - NWPlugin::Function nfunction = - Settings.getNetworkEnabled(networkIndex) ? NWPlugin::Function::NWPLUGIN_INIT : NWPlugin::Function::NWPLUGIN_EXIT; - do_NWPluginCall(NetworkDriverIndex, nfunction, &TempEvent, dummy); + + // May need to call init later, so make sure exit is called first + NWPluginCall(NWPlugin::Function::NWPLUGIN_EXIT, &TempEvent, dummy); + + if (Settings.getNetworkEnabled(networkIndex)) { + NWPluginCall(NWPlugin::Function::NWPLUGIN_INIT, &TempEvent, dummy); + } } } - } // namespace net } // namespace ESPEasy diff --git a/src/ESPEasy/net/Helpers/_NWPlugin_init.h b/src/ESPEasy/net/Helpers/_NWPlugin_init.h index c78071eb6..3683220e1 100644 --- a/src/ESPEasy/net/Helpers/_NWPlugin_init.h +++ b/src/ESPEasy/net/Helpers/_NWPlugin_init.h @@ -28,7 +28,7 @@ void NWPluginSetup(); void NWPluginInit(); // Start or stop network as how it is set in the Settings -void NWPlugin_Init_Exit(networkIndex_t networkIndex); +void NWPlugin_Exit_Init(networkIndex_t networkIndex); // Macro to forward declare the NWPlugin_NNN functions. diff --git a/src/src/DataStructs/TimingStats.cpp b/src/src/DataStructs/TimingStats.cpp index caf56ad2a..9a5e985e7 100644 --- a/src/src/DataStructs/TimingStats.cpp +++ b/src/src/DataStructs/TimingStats.cpp @@ -155,7 +155,6 @@ const __FlashStringHelper* getCPluginCFunctionName(CPlugin::Function function) { case CPlugin::Function::CPLUGIN_FLUSH: return F("CPLUGIN_FLUSH"); case CPlugin::Function::CPLUGIN_TEN_PER_SECOND: return F("CPLUGIN_TEN_PER_SECOND"); case CPlugin::Function::CPLUGIN_FIFTY_PER_SECOND: return F("CPLUGIN_FIFTY_PER_SECOND"); - case CPlugin::Function::CPLUGIN_INIT_ALL: return F("CPLUGIN_INIT_ALL"); case CPlugin::Function::CPLUGIN_EXIT: return F("CPLUGIN_EXIT"); case CPlugin::Function::CPLUGIN_WRITE: return F("CPLUGIN_WRITE"); @@ -164,6 +163,9 @@ const __FlashStringHelper* getCPluginCFunctionName(CPlugin::Function function) { case CPlugin::Function::CPLUGIN_INTERVAL: case CPlugin::Function::CPLUGIN_ACKNOWLEDGE: case CPlugin::Function::CPLUGIN_WEBFORM_SHOW_HOST_CONFIG: + case CPlugin::Function::CPLUGIN_INIT_ALL: + case CPlugin::Function::CPLUGIN_EXIT_ALL: + break; } return F("Unknown"); @@ -182,14 +184,12 @@ bool mustLogCFunction(CPlugin::Function function) { case CPlugin::Function::CPLUGIN_GET_DEVICENAME: return false; case CPlugin::Function::CPLUGIN_WEBFORM_SAVE: return false; case CPlugin::Function::CPLUGIN_WEBFORM_LOAD: return false; - case CPlugin::Function::CPLUGIN_GET_PROTOCOL_DISPLAY_NAME: return false; case CPlugin::Function::CPLUGIN_TASK_CHANGE_NOTIFICATION: return false; case CPlugin::Function::CPLUGIN_INIT: return false; case CPlugin::Function::CPLUGIN_UDP_IN: return true; case CPlugin::Function::CPLUGIN_FLUSH: return false; case CPlugin::Function::CPLUGIN_TEN_PER_SECOND: return true; case CPlugin::Function::CPLUGIN_FIFTY_PER_SECOND: return true; - case CPlugin::Function::CPLUGIN_INIT_ALL: return false; case CPlugin::Function::CPLUGIN_EXIT: return false; case CPlugin::Function::CPLUGIN_WRITE: return true; @@ -198,6 +198,9 @@ bool mustLogCFunction(CPlugin::Function function) { case CPlugin::Function::CPLUGIN_INTERVAL: case CPlugin::Function::CPLUGIN_ACKNOWLEDGE: case CPlugin::Function::CPLUGIN_WEBFORM_SHOW_HOST_CONFIG: + case CPlugin::Function::CPLUGIN_GET_PROTOCOL_DISPLAY_NAME: + case CPlugin::Function::CPLUGIN_INIT_ALL: + case CPlugin::Function::CPLUGIN_EXIT_ALL: break; } return false; diff --git a/src/src/DataTypes/ESPEasy_plugin_functions.h b/src/src/DataTypes/ESPEasy_plugin_functions.h index 93e4c40e6..1de3ca524 100644 --- a/src/src/DataTypes/ESPEasy_plugin_functions.h +++ b/src/src/DataTypes/ESPEasy_plugin_functions.h @@ -103,6 +103,7 @@ public: CPLUGIN_TEN_PER_SECOND, // Called 10x per second (typical for checking new data instead of waiting) CPLUGIN_FIFTY_PER_SECOND, // Called 50x per second (typical for checking new data instead of waiting) CPLUGIN_INIT_ALL, + CPLUGIN_EXIT_ALL, CPLUGIN_EXIT, CPLUGIN_WRITE, // Send commands to a controller. diff --git a/src/src/Globals/CPlugins.cpp b/src/src/Globals/CPlugins.cpp index 3856ccec9..a9888a82c 100644 --- a/src/src/Globals/CPlugins.cpp +++ b/src/src/Globals/CPlugins.cpp @@ -43,8 +43,13 @@ bool CPluginCall(CPlugin::Function Function, struct EventStruct *event, String& // only called from CPluginSetup() directly using protocolIndex break; + case CPlugin::Function::CPLUGIN_GET_PROTOCOL_DISPLAY_NAME: + // Only called from _CPlugin_Helper_webform getControllerParameterName + break; + // calls to all active controllers case CPlugin::Function::CPLUGIN_INIT_ALL: + case CPlugin::Function::CPLUGIN_EXIT_ALL: case CPlugin::Function::CPLUGIN_UDP_IN: case CPlugin::Function::CPLUGIN_INTERVAL: // calls to send stats information case CPlugin::Function::CPLUGIN_GOT_CONNECTED: // calls to send autodetect information @@ -59,9 +64,16 @@ bool CPluginCall(CPlugin::Function Function, struct EventStruct *event, String& if (Function == CPlugin::Function::CPLUGIN_INIT_ALL) { Function = CPlugin::Function::CPLUGIN_INIT; } + if (Function == CPlugin::Function::CPLUGIN_EXIT_ALL) { + Function = CPlugin::Function::CPLUGIN_EXIT; + } for (controllerIndex_t x = 0; x < CONTROLLER_MAX; x++) { - if ((Settings.Protocol[x] != 0) && Settings.ControllerEnabled[x]) { + const bool checkedEnabled = + Settings.ControllerEnabled[x] || + Function == CPlugin::Function::CPLUGIN_EXIT; + + if ((Settings.Protocol[x] != 0) && checkedEnabled) { event->ControllerIndex = x; String command; @@ -84,7 +96,7 @@ bool CPluginCall(CPlugin::Function Function, struct EventStruct *event, String& return success; } - // calls to specific controller which need to be enabled before calling + // calls to specific controller which need to be enabled before calling case CPlugin::Function::CPLUGIN_INIT: case CPlugin::Function::CPLUGIN_PROTOCOL_SEND: case CPlugin::Function::CPLUGIN_PROTOCOL_RECV: @@ -103,7 +115,6 @@ bool CPluginCall(CPlugin::Function Function, struct EventStruct *event, String& case CPlugin::Function::CPLUGIN_PROTOCOL_TEMPLATE: case CPlugin::Function::CPLUGIN_WEBFORM_LOAD: case CPlugin::Function::CPLUGIN_WEBFORM_SAVE: - case CPlugin::Function::CPLUGIN_GET_PROTOCOL_DISPLAY_NAME: case CPlugin::Function::CPLUGIN_WEBFORM_SHOW_HOST_CONFIG: { const controllerIndex_t controllerindex = event->ControllerIndex; diff --git a/src/src/Helpers/LongTermOnOffTimer.cpp b/src/src/Helpers/LongTermOnOffTimer.cpp index 100c443cd..ddbbde0e8 100644 --- a/src/src/Helpers/LongTermOnOffTimer.cpp +++ b/src/src/Helpers/LongTermOnOffTimer.cpp @@ -14,7 +14,7 @@ bool LongTermOnOffTimer::setOn() ++_changeToOnCount; if (isOff()) { - _prevDuration = _onTimer.timeDiff(_offTimer); + _prevDuration = _offTimer.usecPassedSince(); } _onTimer.setNow(); return true; @@ -26,7 +26,7 @@ bool LongTermOnOffTimer::setOff() ++_changeToOffCount; if (isOn()) { - _prevDuration = _offTimer.timeDiff(_onTimer); + _prevDuration = _onTimer.usecPassedSince(); } _offTimer.setNow(); return true; @@ -34,8 +34,8 @@ bool LongTermOnOffTimer::setOff() bool LongTermOnOffTimer::set(bool onState) { - if (onState) return setOn(); - return setOff(); + if (onState) { return setOn(); } + return setOff(); } bool LongTermOnOffTimer::isSet() const @@ -65,22 +65,22 @@ bool LongTermOnOffTimer::isOff() const LongTermTimer::Duration LongTermOnOffTimer::getLastOnDuration_ms() const { - return getLastOnDuration_usec() / 1000ll; + return getLastOnDuration_usec() / 1000ll; } LongTermTimer::Duration LongTermOnOffTimer::getLastOffDuration_ms() const { - return getLastOffDuration_usec() / 1000ll; + return getLastOffDuration_usec() / 1000ll; } LongTermTimer::Duration LongTermOnOffTimer::getLastOnDuration_usec() const { - if (isOn()) return _onTimer.usecPassedSince(); - return _prevDuration; + if (isOn()) { return _onTimer.usecPassedSince(); } + return _prevDuration; } LongTermTimer::Duration LongTermOnOffTimer::getLastOffDuration_usec() const { - if (isOff()) return _offTimer.usecPassedSince(); - return _prevDuration; + if (isOff()) { return _offTimer.usecPassedSince(); } + return _prevDuration; } diff --git a/src/src/Helpers/PeriodicalActions.cpp b/src/src/Helpers/PeriodicalActions.cpp index aadb426b2..856cb25f2 100644 --- a/src/src/Helpers/PeriodicalActions.cpp +++ b/src/src/Helpers/PeriodicalActions.cpp @@ -517,6 +517,7 @@ void prepareShutdown(IntendedRebootReason_e reason) process_serialWriteBuffer(); flushAndDisconnectAllClients(); saveUserVarToRTC(); + CPluginCall(CPlugin::Function::CPLUGIN_EXIT_ALL, 0); ESPEasy::net::NWPluginCall(NWPlugin::Function::NWPLUGIN_EXIT_ALL, 0); // ESPEasy::net::wifi::setWifiMode(WIFI_OFF); ESPEASY_FS.end(); diff --git a/src/src/Helpers/_CPlugin_Helper_webform.cpp b/src/src/Helpers/_CPlugin_Helper_webform.cpp index c353d4851..fd7e11141 100644 --- a/src/src/Helpers/_CPlugin_Helper_webform.cpp +++ b/src/src/Helpers/_CPlugin_Helper_webform.cpp @@ -92,7 +92,7 @@ String getControllerParameterName(protocolIndex_t ProtocolInde EventStruct tmpEvent; tmpEvent.idx = parameterIdx; - // Need to call the do_CPluginCall function here as this may be called when the controller is not (yet) enabled + // Only Controller Plugin specific call, so may call do_CPluginCall directly if (do_CPluginCall(ProtocolIndex, CPlugin::Function::CPLUGIN_GET_PROTOCOL_DISPLAY_NAME, &tmpEvent, name)) { // Found an alternative name for it. isAlternative = true; diff --git a/src/src/Helpers/_CPlugin_init.cpp b/src/src/Helpers/_CPlugin_init.cpp index 8fec6424e..c3ceb05cc 100644 --- a/src/src/Helpers/_CPlugin_init.cpp +++ b/src/src/Helpers/_CPlugin_init.cpp @@ -2188,7 +2188,7 @@ void CPluginInit() CPluginCall(CPlugin::Function::CPLUGIN_INIT_ALL, 0); } -void CPlugin_Init_Exit(controllerIndex_t controllerIndex) +void CPlugin_Exit_Init(controllerIndex_t controllerIndex) { protocolIndex_t ProtocolIndex = getProtocolIndex_from_ControllerIndex(controllerIndex); @@ -2196,8 +2196,13 @@ void CPlugin_Init_Exit(controllerIndex_t controllerIndex) struct EventStruct TempEvent; TempEvent.ControllerIndex = controllerIndex; String dummy; - CPlugin::Function cfunction = - Settings.ControllerEnabled[controllerIndex] ? CPlugin::Function::CPLUGIN_INIT : CPlugin::Function::CPLUGIN_EXIT; - do_CPluginCall(ProtocolIndex, cfunction, &TempEvent, dummy); + + + // May need to call init later, so make sure exit is called first + CPluginCall(CPlugin::Function::CPLUGIN_EXIT, &TempEvent, dummy); + + if (Settings.ControllerEnabled[controllerIndex]) { + CPluginCall(CPlugin::Function::CPLUGIN_INIT, &TempEvent, dummy); + } } } \ No newline at end of file diff --git a/src/src/Helpers/_CPlugin_init.h b/src/src/Helpers/_CPlugin_init.h index 69bc3dcaa..17470757d 100644 --- a/src/src/Helpers/_CPlugin_init.h +++ b/src/src/Helpers/_CPlugin_init.h @@ -28,7 +28,7 @@ void CPluginSetup(); void CPluginInit(); // Start or stop controller as how it is set in the Settings -void CPlugin_Init_Exit(controllerIndex_t controllerIndex); +void CPlugin_Exit_Init(controllerIndex_t controllerIndex); // Macro to forward declare the CPlugin_NNN functions. diff --git a/src/src/Helpers/_ESPEasy_key_value_store.cpp b/src/src/Helpers/_ESPEasy_key_value_store.cpp index 08332b7ff..c6e0d0a53 100644 --- a/src/src/Helpers/_ESPEasy_key_value_store.cpp +++ b/src/src/Helpers/_ESPEasy_key_value_store.cpp @@ -48,6 +48,8 @@ size_t getStorageSizePerType(ESPEasy_key_value_store::StorageType storageType) case ESPEasy_key_value_store::StorageType::MAX_Type: break; case ESPEasy_key_value_store::StorageType::bool_true: case ESPEasy_key_value_store::StorageType::bool_false: return 4 + 0; + + case ESPEasy_key_value_store::StorageType::binary: break; } return 0; } @@ -863,6 +865,7 @@ bool ESPEasy_key_value_store::getValueAsString(const StorageType& storageType, u case ESPEasy_key_value_store::StorageType::not_set: case ESPEasy_key_value_store::StorageType::bool_true: case ESPEasy_key_value_store::StorageType::bool_false: + case ESPEasy_key_value_store::StorageType::binary: case ESPEasy_key_value_store::StorageType::MAX_Type: break; } diff --git a/src/src/WebServer/ControllerPage.cpp b/src/src/WebServer/ControllerPage.cpp index dc63b44a8..aad881e77 100644 --- a/src/src/WebServer/ControllerPage.cpp +++ b/src/src/WebServer/ControllerPage.cpp @@ -123,7 +123,7 @@ void handle_controllers() { if (mustInit) { // Init controller plugin using the new settings. - CPlugin_Init_Exit(controllerindex); + CPlugin_Exit_Init(controllerindex); } } diff --git a/src/src/WebServer/NetworkPage.cpp b/src/src/WebServer/NetworkPage.cpp index f4ae83c6b..9d3555f29 100644 --- a/src/src/WebServer/NetworkPage.cpp +++ b/src/src/WebServer/NetworkPage.cpp @@ -97,7 +97,7 @@ void handle_networks() if (mustInit) { // Init network plugin using the new settings. - NWPlugin_Init_Exit(networkindex); + NWPlugin_Exit_Init(networkindex); } } @@ -125,9 +125,7 @@ void handle_networks_clearLoadDefaults(ESPEasy::net::networkIndex_t networkindex TempEvent.NetworkIndex = networkindex; String dummy; - do_NWPluginCall( - NetworkDriverIndex, - NWPlugin::Function::NWPLUGIN_LOAD_DEFAULTS, &TempEvent, dummy); + NWPluginCall(NWPlugin::Function::NWPLUGIN_LOAD_DEFAULTS, &TempEvent, dummy); } // TODO TD-er: Must also check NetworkDriverStruct to see if something else must be done @@ -153,7 +151,7 @@ void handle_networks_CopySubmittedSettings_NWPluginCall(ESPEasy::net::networkInd // Call network plugin to save CustomNetworkSettings addLog(LOG_LEVEL_INFO, F("Call network plugin to save CustomNetworkSettings")); String dummy; - do_NWPluginCall(NetworkDriverIndex, NWPlugin::Function::NWPLUGIN_WEBFORM_SAVE, &TempEvent, dummy); + NWPluginCall(NWPlugin::Function::NWPLUGIN_WEBFORM_SAVE, &TempEvent, dummy); } } @@ -227,7 +225,6 @@ void handle_networks_ShowAllNetworksTable() String str; - // const bool res = do_NWPluginCall(NetworkDriverIndex, functions[i], &TempEvent, str); const bool res = NWPluginCall(functions[i], &TempEvent, str); #ifdef ESP32 if (functions[i] == NWPlugin::Function::NWPLUGIN_WEBFORM_SHOW_ROUTE_PRIO) { @@ -336,10 +333,10 @@ void handle_networks_NetworkSettingsPage(ESPEasy::net::networkIndex_t networkind TempEvent.NetworkIndex = networkindex; String str; - do_NWPluginCall(networkDriverIndex, NWPlugin::Function::NWPLUGIN_WEBFORM_LOAD, &TempEvent, str); + NWPluginCall(NWPlugin::Function::NWPLUGIN_WEBFORM_LOAD, &TempEvent, str); # ifdef ESP32 - if (do_NWPluginCall(networkDriverIndex, NWPlugin::Function::NWPLUGIN_GET_INTERFACE, &TempEvent, str)) + if (NWPluginCall(NWPlugin::Function::NWPLUGIN_GET_INTERFACE, &TempEvent, str)) { { addFormSubHeader(F("Network Interface")); From 45002d9bf330c9bf20551dda6cb8cceeb8d94971 Mon Sep 17 00:00:00 2001 From: TD-er Date: Thu, 31 Jul 2025 15:38:12 +0200 Subject: [PATCH 163/564] [Tasks] Fix scheduled Plugin Task Timer & proper task exit/init --- src/ESPEasy/net/Helpers/_NWPlugin_init.cpp | 2 +- .../Scheduler_SystemEventQueueTimerID.cpp | 3 +-- src/src/Globals/Plugins.cpp | 2 +- src/src/Helpers/Misc.cpp | 6 ++++-- src/src/Helpers/Misc.h | 2 +- src/src/Helpers/PeriodicalActions.cpp | 5 ++++- src/src/Helpers/Scheduler.h | 2 +- .../Helpers/Scheduler_SystemEventTimer.cpp | 13 ++++++------- src/src/Helpers/_CPlugin_init.cpp | 2 +- src/src/Helpers/_Plugin_init.cpp | 19 +++++++++++++++++++ src/src/WebServer/DevicesPage.cpp | 7 ++++--- 11 files changed, 43 insertions(+), 20 deletions(-) diff --git a/src/ESPEasy/net/Helpers/_NWPlugin_init.cpp b/src/ESPEasy/net/Helpers/_NWPlugin_init.cpp index c29d5c706..c01d2cfc5 100644 --- a/src/ESPEasy/net/Helpers/_NWPlugin_init.cpp +++ b/src/ESPEasy/net/Helpers/_NWPlugin_init.cpp @@ -2134,7 +2134,7 @@ bool do_NWPluginCall(networkDriverIndex_t networkDriverIndex, NWPlugin:: } else if (Function == NWPlugin::Function::NWPLUGIN_EXIT) { if (!bitRead(networkIndex_initialized, event->NetworkIndex)) { // FIXME TD-er: What to do here? Was not (yet) initialized - addLog(LOG_LEVEL_ERROR, strformat(F("Network %d was not (yet) initialized"), event->NetworkIndex + 1)); + // addLog(LOG_LEVEL_ERROR, strformat(F("Network %d was not (yet) initialized"), event->NetworkIndex + 1)); return false; } bitClear(networkIndex_initialized, event->NetworkIndex); diff --git a/src/src/DataStructs/Scheduler_SystemEventQueueTimerID.cpp b/src/src/DataStructs/Scheduler_SystemEventQueueTimerID.cpp index 03beb6bf4..564022ad5 100644 --- a/src/src/DataStructs/Scheduler_SystemEventQueueTimerID.cpp +++ b/src/src/DataStructs/Scheduler_SystemEventQueueTimerID.cpp @@ -26,8 +26,7 @@ String SystemEventQueueTimerID::decode() const if (ptr_type == SchedulerPluginPtrType_e::ControllerPlugin) { result += getCPluginID_from_ControllerIndex(index); } else if (ptr_type == SchedulerPluginPtrType_e::TaskPlugin) { - const deviceIndex_t dev_index = deviceIndex_t::toDeviceIndex(index); - result += getPluginNameFromDeviceIndex(dev_index); + result += getPluginNameFromPluginID(getPluginID_from_TaskIndex(index)); } else { result += (index + 1); } diff --git a/src/src/Globals/Plugins.cpp b/src/src/Globals/Plugins.cpp index 179bbe9de..1785e14ae 100644 --- a/src/src/Globals/Plugins.cpp +++ b/src/src/Globals/Plugins.cpp @@ -281,7 +281,7 @@ void queueTaskEvent(const String& eventName, taskIndex_t taskIndex, const String event += ','; event += wrapWithQuotesIfContainsParameterSeparatorChar(value_str); } - eventQueue.addMove(std::move(event)); + eventQueue.addMove(std::move(event), true); } } diff --git a/src/src/Helpers/Misc.cpp b/src/src/Helpers/Misc.cpp index 4c21f6e55..5ea1130fb 100644 --- a/src/src/Helpers/Misc.cpp +++ b/src/src/Helpers/Misc.cpp @@ -89,7 +89,8 @@ bool setNetworkEnableStatus(ESPEasy::net::networkIndex_t networkIndex, bool enab } Settings.setNetworkEnabled(networkIndex, enabled); if (enabled) { - ESPEasy::net::NWPluginCall(NWPlugin::Function::NWPLUGIN_INIT, &TempEvent, dummy); + if (!ESPEasy::net::NWPluginCall(NWPlugin::Function::NWPLUGIN_INIT, &TempEvent, dummy)) + return false; } return true; @@ -119,7 +120,8 @@ bool setControllerEnableStatus(controllerIndex_t controllerIndex, bool enabled) Settings.ControllerEnabled[controllerIndex] = enabled; if (enabled) { - CPluginCall(CPlugin::Function::CPLUGIN_INIT, &TempEvent, dummy); + if (!CPluginCall(CPlugin::Function::CPLUGIN_INIT, &TempEvent, dummy)) + return false; } return true; } diff --git a/src/src/Helpers/Misc.h b/src/src/Helpers/Misc.h index 15abec6e5..5b263a374 100644 --- a/src/src/Helpers/Misc.h +++ b/src/src/Helpers/Misc.h @@ -11,7 +11,7 @@ #include "../../ESPEasy/net/DataTypes/NetworkIndex.h" - +#define bitReadULL(value, bit) ((value) >> (bit) & 1) #define bitSetULL(value, bit) ((value) |= (1ULL << (bit))) #define bitClearULL(value, bit) ((value) &= ~(1ULL << (bit))) #define bitWriteULL(value, bit, bitvalue) (bitvalue ? bitSetULL(value, bit) : bitClearULL(value, bit)) diff --git a/src/src/Helpers/PeriodicalActions.cpp b/src/src/Helpers/PeriodicalActions.cpp index 856cb25f2..e68d02d4e 100644 --- a/src/src/Helpers/PeriodicalActions.cpp +++ b/src/src/Helpers/PeriodicalActions.cpp @@ -300,7 +300,10 @@ void schedule_all_MQTTimport_tasks() { // Schedule a call to each enabled MQTT import plugin to notify the broker connection state EventStruct event(task); event.Par1 = MQTTclient_connected ? 1 : 0; - Scheduler.schedule_plugin_task_event_timer(DeviceIndex, PLUGIN_MQTT_CONNECTION_STATE, std::move(event)); + Scheduler.schedule_plugin_task_event_timer( + task, + PLUGIN_MQTT_CONNECTION_STATE, + std::move(event)); } } } diff --git a/src/src/Helpers/Scheduler.h b/src/src/Helpers/Scheduler.h index 7db719416..4266d3ebf 100644 --- a/src/src/Helpers/Scheduler.h +++ b/src/src/Helpers/Scheduler.h @@ -238,7 +238,7 @@ void setPluginTaskTimer(unsigned long msecFromNow, \*********************************************************************************************/ // Note: event will be moved - void schedule_plugin_task_event_timer(deviceIndex_t DeviceIndex, + void schedule_plugin_task_event_timer(taskIndex_t taskIndex, uint8_t Function, struct EventStruct&& event); diff --git a/src/src/Helpers/Scheduler_SystemEventTimer.cpp b/src/src/Helpers/Scheduler_SystemEventTimer.cpp index f2fe623dc..73eea0af5 100644 --- a/src/src/Helpers/Scheduler_SystemEventTimer.cpp +++ b/src/src/Helpers/Scheduler_SystemEventTimer.cpp @@ -22,13 +22,13 @@ * Proper use case is calling from a callback function, since those cannot use yield() or delay() \*********************************************************************************************/ void ESPEasy_Scheduler::schedule_plugin_task_event_timer( - deviceIndex_t DeviceIndex, + taskIndex_t taskIndex, uint8_t Function, struct EventStruct&& event) { - if (validDeviceIndex(DeviceIndex)) { + if (validDeviceIndex(getDeviceIndex_from_TaskIndex(taskIndex))) { schedule_event_timer( SchedulerPluginPtrType_e::TaskPlugin, - DeviceIndex.value, + taskIndex, Function, std::move(event)); } @@ -58,7 +58,7 @@ void ESPEasy_Scheduler::schedule_mqtt_plugin_import_event_timer( // This makes sure the relatively large event will not be in memory twice. const SystemEventQueueTimerID timerID( SchedulerPluginPtrType_e::TaskPlugin, - DeviceIndex.value, + TaskIndex, static_cast(Function)); { @@ -192,7 +192,7 @@ void ESPEasy_Scheduler::process_system_event_queue() { switch (ptr_type) { case SchedulerPluginPtrType_e::TaskPlugin: { - const deviceIndex_t deviceIndex = deviceIndex_t::toDeviceIndex(Index); + const deviceIndex_t deviceIndex = getDeviceIndex_from_TaskIndex(Index); if (validDeviceIndex(deviceIndex)) { if (((Function != PLUGIN_READ) && @@ -202,8 +202,7 @@ void ESPEasy_Scheduler::process_system_event_queue() { // FIXME TD-er: LoadTaskSettings should only be called when needed, not pre-emptive. LoadTaskSettings(ScheduledEventQueue.front().event.TaskIndex); } - do_PluginCall(deviceIndex, - Function, + PluginCall(Function, &ScheduledEventQueue.front().event, tmpString); } diff --git a/src/src/Helpers/_CPlugin_init.cpp b/src/src/Helpers/_CPlugin_init.cpp index c3ceb05cc..6fde51e14 100644 --- a/src/src/Helpers/_CPlugin_init.cpp +++ b/src/src/Helpers/_CPlugin_init.cpp @@ -2136,7 +2136,7 @@ bool do_CPluginCall(protocolIndex_t protocolIndex, CPlugin::Function Function, s } else if (Function == CPlugin::Function::CPLUGIN_EXIT) { if (!bitRead(controllerIndex_initialized, event->ControllerIndex)) { // FIXME TD-er: What to do here? Was not (yet) initialized - addLog(LOG_LEVEL_ERROR, strformat(F("Controller %d was not (yet) initialized"), event->ControllerIndex + 1)); +// addLog(LOG_LEVEL_ERROR, strformat(F("Controller %d was not (yet) initialized"), event->ControllerIndex + 1)); return false; } bitClear(controllerIndex_initialized, event->ControllerIndex); diff --git a/src/src/Helpers/_Plugin_init.cpp b/src/src/Helpers/_Plugin_init.cpp index 76401f6d6..e7142c8ca 100644 --- a/src/src/Helpers/_Plugin_init.cpp +++ b/src/src/Helpers/_Plugin_init.cpp @@ -6,6 +6,7 @@ #include "../Globals/Settings.h" #include "../Helpers/Misc.h" +#include "../Helpers/StringConverter.h" // ******************************************************************************** @@ -2199,8 +2200,26 @@ deviceIndex_t getDeviceIndex_sorted(deviceIndex_t deviceIndex) boolean do_PluginCall(deviceIndex_t deviceIndex, uint8_t function, struct EventStruct *event, String& string) { + // TODO TD-er: May need to be changed to some other type when we ever will have > 64 tasks + static uint64_t taskIndex_initialized{}; if (do_check_validDeviceIndex(deviceIndex)) { + if (function == PLUGIN_INIT) { + if (bitReadULL(taskIndex_initialized, event->TaskIndex)) { + // FIXME TD-er: What to do here? Was already initialized + addLog(LOG_LEVEL_ERROR, strformat(F("Task %d was already initialized"), event->TaskIndex + 1)); + return false; + } + bitSetULL(taskIndex_initialized, event->TaskIndex); + } else if (function == PLUGIN_EXIT) { + if (!bitReadULL(taskIndex_initialized, event->TaskIndex)) { + // FIXME TD-er: What to do here? Was not (yet) initialized +// addLog(LOG_LEVEL_ERROR, strformat(F("Task %d was not (yet) initialized"), event->TaskIndex + 1)); + return false; + } + bitClearULL(taskIndex_initialized, event->TaskIndex); + } + Plugin_ptr_t plugin_call = (Plugin_ptr_t)pgm_read_ptr(Plugin_ptr + deviceIndex.value); return plugin_call(function, event, string); } diff --git a/src/src/WebServer/DevicesPage.cpp b/src/src/WebServer/DevicesPage.cpp index 9e0a5faeb..4210fca9c 100644 --- a/src/src/WebServer/DevicesPage.cpp +++ b/src/src/WebServer/DevicesPage.cpp @@ -180,12 +180,13 @@ void handle_devices() { struct EventStruct TempEvent(taskIndex); String dummy; + // May need to call PLUGIN_INIT, however we must make sure it is exited first + PluginCall(PLUGIN_EXIT, &TempEvent, dummy); + if (Settings.TaskDeviceEnabled[taskIndex]) { if (PluginCall(PLUGIN_INIT, &TempEvent, dummy)) { PluginCall(PLUGIN_READ, &TempEvent, dummy); } - } else { - PluginCall(PLUGIN_EXIT, &TempEvent, dummy); } } } @@ -476,7 +477,7 @@ void handle_devices_CopySubmittedSettings(taskIndex_t taskIndex, pluginID_t task if (device.ErrorStateValues) { // FIXME TD-er: Must collect these from the web page. - do_PluginCall(DeviceIndex, PLUGIN_INIT_VALUE_RANGES, &TempEvent, dummy); + PluginCall(PLUGIN_INIT_VALUE_RANGES, &TempEvent, dummy); } // Make sure the task needs to reload using the new settings. From 7da47fdb107b4c3e715b452ecb8ab2e52cd1618f Mon Sep 17 00:00:00 2001 From: TD-er Date: Thu, 31 Jul 2025 15:47:11 +0200 Subject: [PATCH 164/564] [Build] Fix failing ESP8266 custom build --- tools/pio/pre_custom_esp82xx.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/pio/pre_custom_esp82xx.py b/tools/pio/pre_custom_esp82xx.py index 1d1768bd3..d51a29556 100644 --- a/tools/pio/pre_custom_esp82xx.py +++ b/tools/pio/pre_custom_esp82xx.py @@ -53,7 +53,7 @@ else: # "-DUSES_P107", # SI1145 UV index "-DUSES_P146", # Cache Reader - "-DUSES_P169", # AS3935 Lightning Detector +# "-DUSES_P169", # AS3935 Lightning Detector "-DUSES_C016", # Cache Controller # "-DUSES_C018", # TTN/RN2483 From 881227c4ef8c58863f2531a42bebcc172e4670d6 Mon Sep 17 00:00:00 2001 From: TD-er Date: Thu, 31 Jul 2025 16:19:10 +0200 Subject: [PATCH 165/564] [Build] Reduce build size for ESP8266 builds --- .../net/Helpers/_NWPlugin_Helper_webform.cpp | 2 ++ src/_C014.cpp | 3 ++- src/_P006_BMP085.ino | 3 ++- src/_P007_PCF8591.ino | 3 ++- src/_P009_MCP.ino | 2 ++ src/_P010_BH1750.ino | 3 ++- src/_P014_SI70xx.ino | 4 ++-- src/_P017_PN532.ino | 5 ++++- src/_P019_PCF8574.ino | 2 ++ src/_P020_Ser2Net.ino | 2 ++ src/_P022_PCA9685.ino | 3 ++- src/_P024_MLX90614.ino | 3 ++- src/_P032_MS5611.ino | 3 ++- src/_P043_ClkOutput.ino | 3 ++- src/_P048_Motorshield_v2.ino | 19 ++++++++++++------- src/_P049_MHZ19.ino | 7 ++++++- src/_P056_SDS011-Dust.ino | 6 ++++-- src/_P059_Encoder.ino | 6 ++++-- src/_P062_MPR121_KeyPad.ino | 3 ++- src/_P063_TTP229_KeyPad.ino | 3 ++- src/_P069_LM75A.ino | 3 ++- src/_P075_Nextion.ino | 4 +++- src/_P079_Wemos_Motorshield.ino | 4 ++-- 23 files changed, 67 insertions(+), 29 deletions(-) diff --git a/src/ESPEasy/net/Helpers/_NWPlugin_Helper_webform.cpp b/src/ESPEasy/net/Helpers/_NWPlugin_Helper_webform.cpp index dd712cb15..637d1a022 100644 --- a/src/ESPEasy/net/Helpers/_NWPlugin_Helper_webform.cpp +++ b/src/ESPEasy/net/Helpers/_NWPlugin_Helper_webform.cpp @@ -212,9 +212,11 @@ void saveNetworkParameterForm(NetworkSettingsStruct & NetworkSettings, case NetworkSettingsStruct::NETWORK_ENABLED: Settings.setNetworkEnabled(networkindex, isFormItemChecked(internalName)); +#ifndef BUILD_NO_DEBUG addLog(LOG_LEVEL_INFO, concat(F("Save NW_Enabled: "), internalName) + ' ' + isFormItemChecked(internalName) + ' ' + Settings.getNetworkEnabled(networkindex)); +#endif break; } } diff --git a/src/_C014.cpp b/src/_C014.cpp index 63ce7252e..a99c273c3 100644 --- a/src/_C014.cpp +++ b/src/_C014.cpp @@ -685,7 +685,7 @@ bool CPlugin_014(CPlugin::Function function, struct EventStruct *event, String& CPlugin_014_sendMQTTdevice(pubname, event->TaskIndex, F("$state"), F("ready"), errorCounter); success = true; } - +#ifndef BUILD_NO_DEBUG if (loglevelActiveFor(LOG_LEVEL_INFO)) { addLog(LOG_LEVEL_INFO, strformat(F("C014 : autodiscover information of %d Devices and %d Nodes sent with %s errors! (%d messages)"), @@ -695,6 +695,7 @@ bool CPlugin_014(CPlugin::Function function, struct EventStruct *event, String& msgCounter) ); } +#endif msgCounter = 0; errorCounter = 0; break; diff --git a/src/_P006_BMP085.ino b/src/_P006_BMP085.ino index c44177a09..f2a0517c4 100644 --- a/src/_P006_BMP085.ino +++ b/src/_P006_BMP085.ino @@ -104,11 +104,12 @@ boolean Plugin_006(uint8_t function, struct EventStruct *event, String& string) pressure = pressureElevation(pressure, elev); } UserVar.setFloat(event->TaskIndex, 1, pressure); - +#ifndef BUILD_NO_DEBUG if (loglevelActiveFor(LOG_LEVEL_INFO)) { addLog(LOG_LEVEL_INFO, concat(F("BMP : Temperature: "), formatUserVarNoCheck(event, 0))); addLog(LOG_LEVEL_INFO, concat(F("BMP : Barometric Pressure: "), formatUserVarNoCheck(event, 1))); } +#endif success = true; } } diff --git a/src/_P007_PCF8591.ino b/src/_P007_PCF8591.ino index 4db7cfa8e..a929635c8 100644 --- a/src/_P007_PCF8591.ino +++ b/src/_P007_PCF8591.ino @@ -215,7 +215,7 @@ boolean Plugin_007(uint8_t function, struct EventStruct *event, String& string) { Wire.read(); // Read older value first (stored in chip) UserVar.setFloat(event->TaskIndex, var, Wire.read()); // now read actual value and store into Value var - +#ifndef BUILD_NO_DEBUG if (loglevelActiveFor(LOG_LEVEL_INFO)) { addLog(LOG_LEVEL_INFO, strformat( F("PCF : Analog port: A%d value %d: %s"), @@ -223,6 +223,7 @@ boolean Plugin_007(uint8_t function, struct EventStruct *event, String& string) var + 1, formatUserVarNoCheck(event, var).c_str())); } +#endif success = true; } } else { diff --git a/src/_P009_MCP.ino b/src/_P009_MCP.ino index 9e46e207f..1d38ef4f8 100644 --- a/src/_P009_MCP.ino +++ b/src/_P009_MCP.ino @@ -182,10 +182,12 @@ boolean Plugin_009(uint8_t function, struct EventStruct *event, String& string) { // We do not actually read the pin state as this is already done 10x/second // Instead we just send the last known state stored in Uservar +#ifndef BUILD_NO_DEBUG if (loglevelActiveFor(LOG_LEVEL_INFO)) { addLog(LOG_LEVEL_INFO, strformat(F("MCP : Port=%d State=%d"), CONFIG_PORT, UserVar[event->BaseVarIndex])); } +#endif success = true; break; } diff --git a/src/_P010_BH1750.ino b/src/_P010_BH1750.ino index 352be8341..d92bd99d0 100644 --- a/src/_P010_BH1750.ino +++ b/src/_P010_BH1750.ino @@ -142,13 +142,14 @@ boolean Plugin_010(uint8_t function, struct EventStruct *event, String& string) if (lux != -1.0f) { UserVar.setFloat(event->TaskIndex, 0, lux); - +#ifndef BUILD_NO_DEBUG if (loglevelActiveFor(LOG_LEVEL_INFO)) { addLog(LOG_LEVEL_INFO, strformat(F("BH1750 Address: 0x%02x Mode: 0x%02x : Light intensity: %s"), PCONFIG(0), PCONFIG(1), formatUserVarNoCheck(event, 0).c_str())); } +#endif success = true; } break; diff --git a/src/_P014_SI70xx.ino b/src/_P014_SI70xx.ino index 86fa1c9f8..099c65cda 100644 --- a/src/_P014_SI70xx.ino +++ b/src/_P014_SI70xx.ino @@ -211,7 +211,7 @@ boolean Plugin_014(uint8_t function, struct EventStruct *event, String& string) if (P014_data->chip_id == CHIP_ID_SI7013) { UserVar.setFloat(event->TaskIndex, 2, (P014_data->adc) >> P014_FILTER_POWER); } - +#ifndef BUILD_NO_DEBUG if (loglevelActiveFor(LOG_LEVEL_INFO)) { String log = strformat(F("P014: Temperature: %.2f Humidity: %.2f"), UserVar[event->BaseVarIndex + 0], @@ -222,7 +222,7 @@ boolean Plugin_014(uint8_t function, struct EventStruct *event, String& string) } addLog(LOG_LEVEL_INFO, log); } - +#endif P014_data->state = P014_state::Ready; // getting ready for another read cycle success = true; } diff --git a/src/_P017_PN532.ino b/src/_P017_PN532.ino index 27d118486..9da5e31b0 100644 --- a/src/_P017_PN532.ino +++ b/src/_P017_PN532.ino @@ -354,13 +354,14 @@ bool P017_handle_timer_in(struct EventStruct *event) } tempcounter++; - +#ifndef BUILD_NO_DEBUG if (loglevelActiveFor(LOG_LEVEL_INFO)) { addLog(LOG_LEVEL_INFO, strformat(F("PN532: %s Tag: %d %u"), FsP(new_key ? F("New") : F("Old")), key, tempcounter)); } +#endif if (new_key) { sendData(event); } uint32_t resetTimer = P017_REMOVAL_TIMEOUT; @@ -413,6 +414,7 @@ boolean Plugin_017_Init(int8_t resetPin) uint32_t versiondata = getFirmwareVersion(); if (versiondata) { +#ifndef BUILD_NO_DEBUG if (loglevelActiveFor(LOG_LEVEL_INFO)) { addLog(LOG_LEVEL_INFO, strformat(F("PN532: Found chip PN5%s FW: %s.%s"), @@ -420,6 +422,7 @@ boolean Plugin_017_Init(int8_t resetPin) formatToHex_no_prefix((versiondata >> 16) & 0xFF, 2).c_str(), formatToHex_no_prefix((versiondata >> 8) & 0xFF, 2).c_str())); } +#endif } else { # ifdef P017_DEBUG_LOGIC_ANALYZER_PIN_INIT diff --git a/src/_P019_PCF8574.ino b/src/_P019_PCF8574.ino index 0bd11882a..f046a426c 100644 --- a/src/_P019_PCF8574.ino +++ b/src/_P019_PCF8574.ino @@ -186,10 +186,12 @@ boolean Plugin_019(uint8_t function, struct EventStruct *event, String& string) { // We do not actually read the pin state as this is already done 10x/second // Instead we just send the last known state stored in Uservar +#ifndef BUILD_NO_DEBUG if (loglevelActiveFor(LOG_LEVEL_INFO)) { addLog(LOG_LEVEL_INFO, strformat(F("PCF : Port=%d State=%d"), CONFIG_PORT, UserVar[event->BaseVarIndex])); } +#endif success = true; break; } diff --git a/src/_P020_Ser2Net.ino b/src/_P020_Ser2Net.ino index eca59c003..a7b73e0f9 100644 --- a/src/_P020_Ser2Net.ino +++ b/src/_P020_Ser2Net.ino @@ -350,7 +350,9 @@ boolean Plugin_020(uint8_t function, struct EventStruct *event, String& string) // P044 Settings to convert? if (P020_Emulate_P044 && P020_ConvertP044Settings(event)) { +#ifndef BUILD_NO_DEBUG addLog(LOG_LEVEL_INFO, F("P1 : Automatic settings conversion, please save settings manually.")); +#endif bitSet(P020_FLAGS, P020_FLAG_P044_MODE_SAVED); // Set to P044 configuration done on next save } # endif // ifdef USES_P044 diff --git a/src/_P022_PCA9685.ino b/src/_P022_PCA9685.ino index 206e16e34..c64c29fb7 100644 --- a/src/_P022_PCA9685.ino +++ b/src/_P022_PCA9685.ino @@ -335,10 +335,11 @@ boolean Plugin_022(uint8_t function, struct EventStruct *event, String& string) P022_data->Plugin_022_Frequency(address, freq); } P022_data->Plugin_022_writeRegister(address, PCA9685_MODE2, event->Par1); - +#ifndef BUILD_NO_DEBUG addLog(LOG_LEVEL_INFO, strformat(F("%s%s"), P022_data_struct::P022_logPrefix(address, F("MODE2 0x")).c_str(), formatToHex(event->Par1, 2).c_str())); +#endif } else { addLog(LOG_LEVEL_ERROR, diff --git a/src/_P024_MLX90614.ino b/src/_P024_MLX90614.ino index 4f098b5f2..2bc11b99b 100644 --- a/src/_P024_MLX90614.ino +++ b/src/_P024_MLX90614.ino @@ -119,10 +119,11 @@ boolean Plugin_024(uint8_t function, struct EventStruct *event, String& string) if (nullptr != P024_data) { UserVar.setFloat(event->TaskIndex, 0, P024_data->readTemperature(PCONFIG(0))); - +#ifndef BUILD_NO_DEBUG if (loglevelActiveFor(LOG_LEVEL_INFO)) { addLog(LOG_LEVEL_INFO, concat(F("MLX90614 : Temperature: "), formatUserVarNoCheck(event, 0))); } +#endif // send(msgObjTemp024->set(UserVar[event->BaseVarIndex], 1)); // Mysensors success = true; diff --git a/src/_P032_MS5611.ino b/src/_P032_MS5611.ino index b0f289d66..680117f9c 100644 --- a/src/_P032_MS5611.ino +++ b/src/_P032_MS5611.ino @@ -122,13 +122,14 @@ boolean Plugin_032(uint8_t function, struct EventStruct *event, String& string) } else { UserVar.setFloat(event->TaskIndex, 1, P032_data->ms5611_pressure); } - +#ifndef BUILD_NO_DEBUG if (loglevelActiveFor(LOG_LEVEL_INFO)) { addLog(LOG_LEVEL_INFO, concat(F("MS5611 : Temperature: "), formatUserVarNoCheck(event, 0))); addLog(LOG_LEVEL_INFO, concat(F("MS5611 : Barometric Pressure: "), formatUserVarNoCheck(event, 1))); } +#endif success = true; } } diff --git a/src/_P043_ClkOutput.ino b/src/_P043_ClkOutput.ino index 589e57557..c9c60b330 100644 --- a/src/_P043_ClkOutput.ino +++ b/src/_P043_ClkOutput.ino @@ -270,10 +270,11 @@ boolean Plugin_043(uint8_t function, struct EventStruct *event, String& string) UserVar.setFloat(event->TaskIndex, 0, x + 1); UserVar.setFloat(event->TaskIndex, 1, state); } - +#ifndef BUILD_NO_DEBUG if (loglevelActiveFor(LOG_LEVEL_INFO)) { addLog(LOG_LEVEL_INFO, strformat(F("TCLK : State %d"), state)); } +#endif sendData(event); } } diff --git a/src/_P048_Motorshield_v2.ino b/src/_P048_Motorshield_v2.ino index 666c545d4..749d8649b 100644 --- a/src/_P048_Motorshield_v2.ino +++ b/src/_P048_Motorshield_v2.ino @@ -154,10 +154,11 @@ boolean Plugin_048(uint8_t function, struct EventStruct *event, String& string) speed = p4_int; } AFMS.begin(); - +#ifndef BUILD_NO_DEBUG if (loglevelActiveFor(LOG_LEVEL_INFO)) { addLog(LOG_LEVEL_INFO, strformat(F("DCMotor%s->Forward Speed: %d"), param2.c_str(), speed)); } +#endif myMotor->setSpeed(speed); myMotor->run(FORWARD); success = true; @@ -171,11 +172,11 @@ boolean Plugin_048(uint8_t function, struct EventStruct *event, String& string) speed = p4_int; } AFMS.begin(); - +#ifndef BUILD_NO_DEBUG if (loglevelActiveFor(LOG_LEVEL_INFO)) { addLog(LOG_LEVEL_INFO, strformat(F("DCMotor%s->Backward Speed: %d"), param2.c_str(), speed)); } - +#endif myMotor->setSpeed(speed); myMotor->run(BACKWARD); success = true; @@ -184,10 +185,11 @@ boolean Plugin_048(uint8_t function, struct EventStruct *event, String& string) if (equals(param3, F("release"))) { AFMS.begin(); - +#ifndef BUILD_NO_DEBUG if (loglevelActiveFor(LOG_LEVEL_INFO)) { addLog(LOG_LEVEL_INFO, strformat(F("DCMotor%s->Release"), param2.c_str())); } +#endif myMotor->run(RELEASE); success = true; } @@ -247,10 +249,11 @@ boolean Plugin_048(uint8_t function, struct EventStruct *event, String& string) myStepper->step(steps, FORWARD, MICROSTEP); success = true; } - +#ifndef BUILD_NO_DEBUG if (success && loglevelActiveFor(LOG_LEVEL_INFO)) { addLog(LOG_LEVEL_INFO, strformat(F("Stepper%s->Forward Steps: %d %s"), param2.c_str(), steps, param5.c_str())); } +#endif } } @@ -287,20 +290,22 @@ boolean Plugin_048(uint8_t function, struct EventStruct *event, String& string) myStepper->step(steps, BACKWARD, MICROSTEP); success = true; } - +#ifndef BUILD_NO_DEBUG if (success && loglevelActiveFor(LOG_LEVEL_INFO)) { addLog(LOG_LEVEL_INFO, strformat(F("Stepper%s->Backward Steps: %d %s"), param2.c_str(), steps, param5.c_str())); } +#endif } } if (equals(param3, F("release"))) { AFMS.begin(); - +#ifndef BUILD_NO_DEBUG if (loglevelActiveFor(LOG_LEVEL_INFO)) { addLog(LOG_LEVEL_INFO, strformat(F("Stepper%s->Release."), param2.c_str())); } +#endif myStepper->release(); success = true; } diff --git a/src/_P049_MHZ19.ino b/src/_P049_MHZ19.ino index e3345a84d..ff480c9a5 100644 --- a/src/_P049_MHZ19.ino +++ b/src/_P049_MHZ19.ino @@ -234,23 +234,26 @@ boolean Plugin_049(uint8_t function, struct EventStruct *event, String& string) P049_data->ABC_MustApply = false; } } - +#ifndef BUILD_NO_DEBUG if (mustLog) { // Log values in all cases addLog(LOG_LEVEL_INFO, strformat(F("PPM value: %d Temp/S/U values: %d/%d/%.2f"), ppm, temp, s, u)); } +#endif break; // #ifdef ENABLE_DETECTION_RANGE_COMMANDS // Sensor responds with 0x99 whenever we send it a measurement range adjustment } else if (P049_data->receivedCommandAcknowledgement(expectReset)) { +#ifndef BUILD_NO_DEBUG addLog(LOG_LEVEL_INFO, F("MHZ19: Received command acknowledgment! ")); if (expectReset) { addLog(LOG_LEVEL_INFO, F("Expecting sensor reset...")); } +#endif success = false; break; @@ -258,10 +261,12 @@ boolean Plugin_049(uint8_t function, struct EventStruct *event, String& string) // log verbosely anything else that the sensor reports } else { +#ifndef BUILD_NO_DEBUG if (mustLog) { addLog(LOG_LEVEL_INFO, concat(F("MHZ19: Unknown response:"), P049_data->getBufferHexDump())); } +#endif // Check for stable reads and allow unstable reads the first 3 minutes after reset. if ((P049_data->nrUnknownResponses > 10) && P049_data->initTimePassed) { diff --git a/src/_P056_SDS011-Dust.ino b/src/_P056_SDS011-Dust.ino index dff2c2cbd..f3f6b3d14 100644 --- a/src/_P056_SDS011-Dust.ino +++ b/src/_P056_SDS011-Dust.ino @@ -124,10 +124,11 @@ boolean Plugin_056(uint8_t function, struct EventStruct *event, String& string) const ESPEasySerialPort port = static_cast(CONFIG_PORT); Plugin_056_SDS = new (std::nothrow) CjkSDS011(port, CONFIG_PIN1, CONFIG_PIN2); - +#ifndef BUILD_NO_DEBUG if (loglevelActiveFor(LOG_LEVEL_INFO)) { addLog(LOG_LEVEL_INFO, strformat(F("SDS : Init OK ESP GPIO-pin RX:%d TX:%d"), CONFIG_PIN1, CONFIG_PIN2)); } +#endif success = true; break; @@ -225,10 +226,11 @@ void Plugin_056_setWorkingPeriod(int minutes) { return; } Plugin_056_SDS->SetWorkingPeriod(minutes); - +#ifndef BUILD_NO_DEBUG if (loglevelActiveFor(LOG_LEVEL_INFO)) { addLog(LOG_LEVEL_INFO, concat(F("SDS : Working Period set to: "), Plugin_056_WorkingPeriodToString(minutes))); } +#endif } // #endif diff --git a/src/_P059_Encoder.ino b/src/_P059_Encoder.ino index bede9ca18..c89a7c7ff 100644 --- a/src/_P059_Encoder.ino +++ b/src/_P059_Encoder.ino @@ -180,11 +180,11 @@ boolean Plugin_059(uint8_t function, struct EventStruct *event, String& string) { const long c = P_059_sensordefs[event->TaskIndex]->read(); UserVar.setFloat(event->TaskIndex, 0, c); - +#ifndef BUILD_NO_DEBUG if (loglevelActiveFor(LOG_LEVEL_INFO)) { addLog(LOG_LEVEL_INFO, concat(F("QEI : "), c)); } - +#endif sendData(event); } } @@ -212,9 +212,11 @@ boolean Plugin_059(uint8_t function, struct EventStruct *event, String& string) { if (event->Par1 >= 0) { +#ifndef BUILD_NO_DEBUG if (loglevelActiveFor(LOG_LEVEL_INFO)) { addLog(LOG_LEVEL_INFO, concat(F("QEI : "), string)); } +#endif P_059_sensordefs[event->TaskIndex]->write(event->Par1); Scheduler.schedule_task_device_timer(event->TaskIndex, millis()); } diff --git a/src/_P062_MPR121_KeyPad.ino b/src/_P062_MPR121_KeyPad.ino index 48be1a9d7..e4b1acbc8 100644 --- a/src/_P062_MPR121_KeyPad.ino +++ b/src/_P062_MPR121_KeyPad.ino @@ -359,10 +359,11 @@ boolean Plugin_062(uint8_t function, struct EventStruct *event, String& string) uint16_t min = 0; uint16_t max = 0; P062_data->getCalibrationData(col, ¤t, &min, &max); +#ifndef BUILD_NO_DEBUG addLog(LOG_LEVEL_INFO, strformat(F("P062 touch #%d current: %d min: %d max: %d"), col, current, min, max)); - +#endif if (!PCONFIG(1)) { break; } diff --git a/src/_P063_TTP229_KeyPad.ino b/src/_P063_TTP229_KeyPad.ino index 8bf292722..39d992135 100644 --- a/src/_P063_TTP229_KeyPad.ino +++ b/src/_P063_TTP229_KeyPad.ino @@ -148,10 +148,11 @@ boolean Plugin_063(uint8_t function, struct EventStruct *event, String& string) int16_t pinSCL = CONFIG_PIN1; int16_t pinSDO = CONFIG_PIN2; - +#ifndef BUILD_NO_DEBUG if (loglevelActiveFor(LOG_LEVEL_INFO)) { addLog(LOG_LEVEL_INFO, strformat(F("Tkey : GPIO: %d %d"), pinSCL, pinSDO)); } +#endif if (validGpio(pinSCL) && validGpio(pinSDO)) { diff --git a/src/_P069_LM75A.ino b/src/_P069_LM75A.ino index ec5b78801..18f786cd2 100644 --- a/src/_P069_LM75A.ino +++ b/src/_P069_LM75A.ino @@ -119,7 +119,7 @@ boolean Plugin_069(uint8_t function, struct EventStruct *event, String& string) const float tempC = P069_data->getTemperatureInDegrees(); UserVar.setFloat(event->TaskIndex, 0, tempC); success = !isnan(tempC); - +#ifndef BUILD_NO_DEBUG if (loglevelActiveFor(LOG_LEVEL_INFO)) { if (!success) { addLog(LOG_LEVEL_INFO, F("LM75A: No reading!")); @@ -129,6 +129,7 @@ boolean Plugin_069(uint8_t function, struct EventStruct *event, String& string) addLogMove(LOG_LEVEL_INFO, concat(F("LM75A: Temperature: "), formatUserVarNoCheck(event, 0))); } } +#endif break; } } diff --git a/src/_P075_Nextion.ino b/src/_P075_Nextion.ino index b50853d7d..d3ed47997 100644 --- a/src/_P075_Nextion.ino +++ b/src/_P075_Nextion.ino @@ -296,7 +296,7 @@ boolean Plugin_075(uint8_t function, struct EventStruct *event, String& string) } if (!validGpio(P075_data->rxPin)) { - addLog(LOG_LEVEL_INFO, F("NEXTION075 : Missing RxD Pin, aborted serial receive")); +// addLog(LOG_LEVEL_INFO, F("NEXTION075 : Missing RxD Pin, aborted serial receive")); break; } @@ -469,9 +469,11 @@ void P075_sendCommand(taskIndex_t taskIndex, const char *cmd) P075_data->easySerial->write(0xff); P075_data->easySerial->write(0xff); } +#ifndef BUILD_NO_DEBUG else { addLog(LOG_LEVEL_INFO, F("NEXTION075 : P075_data->easySerial error, aborted sendCommand")); } +#endif } } diff --git a/src/_P079_Wemos_Motorshield.ino b/src/_P079_Wemos_Motorshield.ino index db6c4f66d..b1cbc27a0 100644 --- a/src/_P079_Wemos_Motorshield.ino +++ b/src/_P079_Wemos_Motorshield.ino @@ -387,14 +387,14 @@ boolean Plugin_079(uint8_t function, struct EventStruct *event, String& string) } } } - +#ifndef BUILD_NO_DEBUG if (loglevelActiveFor(LOG_LEVEL_INFO)) { addLog(LOG_LEVEL_INFO, strformat(F("%s: Addr=0x%02x: Mtr=%s, Dir=%s, Spd=%s"), ModeStr.c_str(), I2C_ADDR_PCFG_P079, paramMotor.c_str(), paramDirection.c_str(), paramSpeed.c_str())); } - +#endif success = true; } break; From 12aa32892e4232a2736410504dac78cbd190ccfa Mon Sep 17 00:00:00 2001 From: TD-er Date: Thu, 31 Jul 2025 17:07:46 +0200 Subject: [PATCH 166/564] [ESP-IDF] Update to latest ESP-IDF/Arduino for ESP32-xx --- platformio_core_defs.ini | 4 ++-- src/ESPEasy/net/Globals/NWPlugins.cpp | 2 +- .../net/NWPluginStructs/NW005_data_struct_PPP_modem.cpp | 2 ++ 3 files changed, 5 insertions(+), 3 deletions(-) diff --git a/platformio_core_defs.ini b/platformio_core_defs.ini index 995f8dc1b..8eeff75ec 100644 --- a/platformio_core_defs.ini +++ b/platformio_core_defs.ini @@ -166,7 +166,7 @@ extra_scripts = ${esp82xx_common.extra_scripts} ; ESP_IDF 5.4.1 [core_esp32_IDF5_4_1__3_2_0_LittleFS] platform = https://github.com/Jason2866/platform-espressif32.git#Arduino/IDF54 -platform_packages = framework-arduinoespressif32 @ https://github.com/Jason2866/esp32-arduino-lib-builder/releases/download/3772/framework-arduinoespressif32-all-release_v5.4-ef69115d.zip +platform_packages = framework-arduinoespressif32 @ https://github.com/Jason2866/esp32-arduino-lib-builder/releases/download/3107-1354-5.4/framework-arduinoespressif32-release_v5.4-849ef459.zip build_flags = -DESP32_STAGE -DESP_IDF_VERSION_MAJOR=5 -DLIBRARIES_NO_LOG=1 @@ -195,7 +195,7 @@ lib_extra_dirs = ; ESP_IDF 5.5.0 [core_esp32_IDF5_5_0__3_2_0_LittleFS] platform = https://github.com/Jason2866/platform-espressif32.git#Arduino/IDF55 -platform_packages = framework-arduinoespressif32 @ https://github.com/Jason2866/esp32-arduino-lib-builder/releases/download/2107-2206-5.5/framework-arduinoespressif32-release_v5.5-01bfc7c1.zip +platform_packages = framework-arduinoespressif32 @ https://github.com/Jason2866/esp32-arduino-lib-builder/releases/download/3107-1140-5.5/framework-arduinoespressif32-release_v5.5-a2251f33.zip build_flags = -DESP32_STAGE -DESP_IDF_VERSION_MAJOR=5 -DLIBRARIES_NO_LOG=1 diff --git a/src/ESPEasy/net/Globals/NWPlugins.cpp b/src/ESPEasy/net/Globals/NWPlugins.cpp index a5d180ac8..8829eecec 100644 --- a/src/ESPEasy/net/Globals/NWPlugins.cpp +++ b/src/ESPEasy/net/Globals/NWPlugins.cpp @@ -143,7 +143,7 @@ bool NWPluginCall(NWPlugin::Function Function, EventStruct *event, String& str) switch (Function) { case NWPlugin::Function::NWPLUGIN_WEBFORM_SHOW_ROUTE_PRIO: -# if ESP_IDF_VERSION >= ESP_IDF_VERSION_VAL(5, 5, 0) +# if ESP_IDF_VERSION >= ESP_IDF_VERSION_VAL(5, 4, 2) // TODO TD-er: Must also add option to set route prio // See: https://github.com/espressif/arduino-esp32/pull/11617 diff --git a/src/ESPEasy/net/NWPluginStructs/NW005_data_struct_PPP_modem.cpp b/src/ESPEasy/net/NWPluginStructs/NW005_data_struct_PPP_modem.cpp index 9d8e090c8..57bf910a9 100644 --- a/src/ESPEasy/net/NWPluginStructs/NW005_data_struct_PPP_modem.cpp +++ b/src/ESPEasy/net/NWPluginStructs/NW005_data_struct_PPP_modem.cpp @@ -905,7 +905,9 @@ void NW005_data_struct_PPP_modem::onEvent(arduino_event_id_t event, arduino_even { case ARDUINO_EVENT_PPP_START: addLog(LOG_LEVEL_INFO, F("PPP Started")); _startStopStats.setOn(); +# if ESP_IDF_VERSION >= ESP_IDF_VERSION_VAL(5, 5, 0) PPP.setRoutePrio(200); +#endif break; case ARDUINO_EVENT_PPP_STOP: addLog(LOG_LEVEL_INFO, F("PPP Stopped")); _startStopStats.setOff(); From 9b30fe1b571ced6c5001fc0e63ad7e5585945ad5 Mon Sep 17 00:00:00 2001 From: TD-er Date: Thu, 31 Jul 2025 20:04:21 +0200 Subject: [PATCH 167/564] [PPP Modem] Disable PPP Modem on platforms that don't support it --- src/src/CustomBuild/define_plugin_sets.h | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/src/CustomBuild/define_plugin_sets.h b/src/src/CustomBuild/define_plugin_sets.h index fb9deee88..505bf8ccf 100644 --- a/src/src/CustomBuild/define_plugin_sets.h +++ b/src/src/CustomBuild/define_plugin_sets.h @@ -3244,7 +3244,11 @@ To create/register a plugin, you have to : // For now we need to keep build size in mind #define FEATURE_PPP_MODEM 0 #else +#if CONFIG_LWIP_PPP_SUPPORT && ARDUINO_HAS_ESP_MODEM #define FEATURE_PPP_MODEM 1 +#else +#define FEATURE_PPP_MODEM 0 +#endif #endif #else #define FEATURE_PPP_MODEM 0 From 7d09d021134ee6bfbf679f2c81bafcecf7f4ffe9 Mon Sep 17 00:00:00 2001 From: TD-er Date: Fri, 1 Aug 2025 12:01:50 +0200 Subject: [PATCH 168/564] [Network] Add mechanism to restore cached DNS servers --- platformio_esp32s3_envs.ini | 1 + src/ESPEasy/net/Globals/NWPlugins.cpp | 17 ++- .../NW001_data_struct_WiFi_STA.cpp | 57 ++++++-- .../NW001_data_struct_WiFi_STA.h | 4 + .../NW003_data_struct_ETH_RMII.cpp | 127 +++++++++++++++++ .../NW003_data_struct_ETH_RMII.h | 44 ++++++ .../NW004_data_struct_ETH_SPI.cpp | 130 ++++++++++++++++++ .../NW004_data_struct_ETH_SPI.h | 43 ++++++ .../NW005_data_struct_PPP_modem.cpp | 34 +++++ .../NW005_data_struct_PPP_modem.h | 2 + src/ESPEasy/net/_NW001_WiFi_STA.cpp | 11 ++ src/ESPEasy/net/_NW003_ETH_RMII.cpp | 15 ++ src/ESPEasy/net/_NW004_ETH_SPI.cpp | 15 ++ src/ESPEasy/net/_NW005_PPP_modem.cpp | 32 ++++- .../net/wifi/ESPEasyWiFi_state_machine.cpp | 2 +- src/ESPEasy/net/wifi/ESPEasyWifi.cpp | 2 + src/ESPEasy/net/wifi/ESPEasyWifi.h | 1 + src/src/CustomBuild/define_plugin_sets.h | 2 +- src/src/DataTypes/ESPEasy_plugin_functions.h | 1 + src/src/Helpers/PeriodicalActions.cpp | 31 +++-- 20 files changed, 543 insertions(+), 28 deletions(-) create mode 100644 src/ESPEasy/net/NWPluginStructs/NW003_data_struct_ETH_RMII.cpp create mode 100644 src/ESPEasy/net/NWPluginStructs/NW003_data_struct_ETH_RMII.h create mode 100644 src/ESPEasy/net/NWPluginStructs/NW004_data_struct_ETH_SPI.cpp create mode 100644 src/ESPEasy/net/NWPluginStructs/NW004_data_struct_ETH_SPI.h diff --git a/platformio_esp32s3_envs.ini b/platformio_esp32s3_envs.ini index 79b97c9db..aca9a4cc0 100644 --- a/platformio_esp32s3_envs.ini +++ b/platformio_esp32s3_envs.ini @@ -186,6 +186,7 @@ build_flags = ${esp32s3_common_LittleFS.build_flags} -D ST7789_EXTRA_INIT=1 -D P116_EXTRA_ST7789=1 extra_scripts = ${esp32s3_common_LittleFS.extra_scripts} +;custom_sdkconfig = '# CONFIG_ESP_MODEM_CMUX_DEFRAGMENT_PAYLOAD is not set' [env:max_ESP32s3_16M8M_LittleFS_OPI_PSRAM_ETH] diff --git a/src/ESPEasy/net/Globals/NWPlugins.cpp b/src/ESPEasy/net/Globals/NWPlugins.cpp index 8829eecec..fd9783dd9 100644 --- a/src/ESPEasy/net/Globals/NWPlugins.cpp +++ b/src/ESPEasy/net/Globals/NWPlugins.cpp @@ -50,8 +50,15 @@ bool NWPluginCall(NWPlugin::Function Function, EventStruct *event, String& str) case NWPlugin::Function::NWPLUGIN_TEN_PER_SECOND: case NWPlugin::Function::NWPLUGIN_FIFTY_PER_SECOND: case NWPlugin::Function::NWPLUGIN_WRITE: +#ifdef ESP32 + case NWPlugin::Function::NWPLUGIN_PRIORITY_ROUTE_CHANGED: +#endif { - const bool success = Function != NWPlugin::Function::NWPLUGIN_WRITE; + const bool success = + Function != NWPlugin::Function::NWPLUGIN_WRITE +#ifdef ESP32 + && Function != NWPlugin::Function::NWPLUGIN_PRIORITY_ROUTE_CHANGED; +#endif if (Function == NWPlugin::Function::NWPLUGIN_INIT_ALL) { Function = NWPlugin::Function::NWPLUGIN_INIT; @@ -78,8 +85,12 @@ bool NWPluginCall(NWPlugin::Function Function, EventStruct *event, String& str) Function, event, command)) { - if (Function == NWPlugin::Function::NWPLUGIN_WRITE) { - // Need to stop when write call was handled + if (Function == NWPlugin::Function::NWPLUGIN_WRITE +#ifdef ESP32 + || Function == NWPlugin::Function::NWPLUGIN_PRIORITY_ROUTE_CHANGED +#endif + ) { + // Need to stop when call was handled return true; } } diff --git a/src/ESPEasy/net/NWPluginStructs/NW001_data_struct_WiFi_STA.cpp b/src/ESPEasy/net/NWPluginStructs/NW001_data_struct_WiFi_STA.cpp index 87b735f52..26be252b6 100644 --- a/src/ESPEasy/net/NWPluginStructs/NW001_data_struct_WiFi_STA.cpp +++ b/src/ESPEasy/net/NWPluginStructs/NW001_data_struct_WiFi_STA.cpp @@ -18,8 +18,10 @@ namespace wifi { static LongTermOnOffTimer _startStopStats; static LongTermOnOffTimer _connectedStats; static LongTermOnOffTimer _gotIPStats; +# ifdef ESP32 static LongTermOnOffTimer _gotIP6Stats; - +static IPAddress _dns_cache[2]{}; +# endif // ifdef ESP32 NW001_data_struct_WiFi_STA::NW001_data_struct_WiFi_STA(networkIndex_t networkIndex) : NWPluginData_base(nwpluginID_t(1), networkIndex) @@ -27,19 +29,20 @@ NW001_data_struct_WiFi_STA::NW001_data_struct_WiFi_STA(networkIndex_t networkInd _connectedStats.clear(); _gotIPStats.clear(); _gotIP6Stats.clear(); -#ifdef ESP32 +# ifdef ESP32 nw_event_id = Network.onEvent(NW001_data_struct_WiFi_STA::onEvent); -#endif +# endif } NW001_data_struct_WiFi_STA::~NW001_data_struct_WiFi_STA() { -#ifdef ESP32 +# ifdef ESP32 + if (nw_event_id != 0) { Network.removeEvent(nw_event_id); } nw_event_id = 0; -#endif +# endif // ifdef ESP32 } void NW001_data_struct_WiFi_STA::webform_load(EventStruct *event) {} @@ -101,9 +104,36 @@ bool NW001_data_struct_WiFi_STA::init(EventStruct *event) return true; } -bool NW001_data_struct_WiFi_STA::exit(EventStruct *event) { return true; } +bool NW001_data_struct_WiFi_STA::exit(EventStruct *event) { + ESPEasy::net::wifi::exitWiFi(); + return true; +} + +# ifdef ESP32 + +bool NW001_data_struct_WiFi_STA::handle_priority_route_changed() +{ + bool res{}; + + if (WiFi.STA.isDefault()) { + // Check to see if we may need to restore any cached DNS server + for (size_t i = 0; i < NR_ELEMENTS(_dns_cache); ++i) { + auto tmp = WiFi.STA.dnsIP(i); + + if ((_dns_cache[i] != INADDR_NONE) && (_dns_cache[i] != tmp)) { + WiFi.STA.dnsIP(i, _dns_cache[i]); + res = true; + } + } + } + return res; +} + +# endif // ifdef ESP32 + + +# ifdef ESP32 -#ifdef ESP32 void NW001_data_struct_WiFi_STA::onEvent(arduino_event_id_t event, arduino_event_info_t info) { @@ -138,6 +168,16 @@ void NW001_data_struct_WiFi_STA::onEvent(arduino_event_id_t event, addLog(LOG_LEVEL_INFO, F("STA_AUTHMODE_CHANGE")); break; case ARDUINO_EVENT_WIFI_STA_GOT_IP: + + for (size_t i = 0; i < NR_ELEMENTS(_dns_cache); ++i) { + auto tmp = WiFi.STA.dnsIP(i); + + if (tmp != INADDR_NONE) { + _dns_cache[i] = tmp; + addLog(LOG_LEVEL_INFO, strformat(F("DNS Cache %d set to %s"), i, tmp.toString(true).c_str())); + } + + } _gotIPStats.setOn(); addLog(LOG_LEVEL_INFO, F("STA_GOT_IP")); break; @@ -155,7 +195,8 @@ void NW001_data_struct_WiFi_STA::onEvent(arduino_event_id_t event, default: break; } } -#endif + +# endif // ifdef ESP32 } // namespace wifi } // namespace net diff --git a/src/ESPEasy/net/NWPluginStructs/NW001_data_struct_WiFi_STA.h b/src/ESPEasy/net/NWPluginStructs/NW001_data_struct_WiFi_STA.h index 21e628639..0f9b11656 100644 --- a/src/ESPEasy/net/NWPluginStructs/NW001_data_struct_WiFi_STA.h +++ b/src/ESPEasy/net/NWPluginStructs/NW001_data_struct_WiFi_STA.h @@ -23,6 +23,10 @@ struct NW001_data_struct_WiFi_STA : public NWPluginData_base { bool exit(EventStruct *event); +#ifdef ESP32 + bool handle_priority_route_changed(); +#endif + private: #ifdef ESP32 static void onEvent(arduino_event_id_t event, diff --git a/src/ESPEasy/net/NWPluginStructs/NW003_data_struct_ETH_RMII.cpp b/src/ESPEasy/net/NWPluginStructs/NW003_data_struct_ETH_RMII.cpp new file mode 100644 index 000000000..81ffebdb2 --- /dev/null +++ b/src/ESPEasy/net/NWPluginStructs/NW003_data_struct_ETH_RMII.cpp @@ -0,0 +1,127 @@ +#include "../NWPluginStructs/NW003_data_struct_ETH_RMII.h" + +#ifdef USES_NW003 + +# include "../../../src/Globals/Settings.h" + +# include "../../../src/Helpers/ESPEasy_time_calc.h" +# include "../../../src/Helpers/LongTermOnOffTimer.h" +# include "../../../src/Helpers/StringConverter.h" + + +namespace ESPEasy { +namespace net { +namespace eth { + +static LongTermOnOffTimer _startStopStats; +static LongTermOnOffTimer _connectedStats; +static LongTermOnOffTimer _gotIPStats; +# if FEATURE_USE_IPV6 +static LongTermOnOffTimer _gotIP6Stats; +# endif +static IPAddress _dns_cache[2]{}; + +NW003_data_struct_ETH_RMII::NW003_data_struct_ETH_RMII(networkIndex_t networkIndex) + : NWPluginData_base(nwpluginID_t(1), networkIndex) +{ + _connectedStats.clear(); + _gotIPStats.clear(); + _gotIP6Stats.clear(); + + nw_event_id = Network.onEvent(NW003_data_struct_ETH_RMII::onEvent); +} + +NW003_data_struct_ETH_RMII::~NW003_data_struct_ETH_RMII() +{ + if (nw_event_id != 0) { + Network.removeEvent(nw_event_id); + } + nw_event_id = 0; +} + +void NW003_data_struct_ETH_RMII::webform_load(EventStruct *event) {} + +void NW003_data_struct_ETH_RMII::webform_save(EventStruct *event) {} + +bool NW003_data_struct_ETH_RMII::webform_getPort(String& str) { return true; } + +bool NW003_data_struct_ETH_RMII::init(EventStruct *event) { return true; } + +bool NW003_data_struct_ETH_RMII::exit(EventStruct *event) { + + return true; +} + +bool NW003_data_struct_ETH_RMII::handle_priority_route_changed() +{ + bool res{}; + + if (ETH.isDefault()) { + // Check to see if we may need to restore any cached DNS server + for (size_t i = 0; i < NR_ELEMENTS(_dns_cache); ++i) { + auto tmp = ETH.dnsIP(i); + + if ((_dns_cache[i] != INADDR_NONE) && (_dns_cache[i] != tmp)) { + ETH.dnsIP(i, _dns_cache[i]); + res = true; + } + } + } + return res; +} + +void NW003_data_struct_ETH_RMII::onEvent(arduino_event_id_t event, + arduino_event_info_t info) +{ + switch (event) + { + case ARDUINO_EVENT_ETH_START: + _startStopStats.setOn(); + addLog(LOG_LEVEL_INFO, F("ETH_START")); + break; + case ARDUINO_EVENT_ETH_STOP: + _startStopStats.setOff(); + addLog(LOG_LEVEL_INFO, F("ETH_STOP")); + break; + case ARDUINO_EVENT_ETH_CONNECTED: + _connectedStats.setOn(); + addLog(LOG_LEVEL_INFO, F("ETH_CONNECTED")); + break; + case ARDUINO_EVENT_ETH_DISCONNECTED: + _connectedStats.setOff(); + addLog(LOG_LEVEL_INFO, F("ETH_DISCONNECTED")); + break; + case ARDUINO_EVENT_ETH_GOT_IP: + + for (size_t i = 0; i < NR_ELEMENTS(_dns_cache); ++i) { + auto tmp = ETH.dnsIP(i); + + if (tmp != INADDR_NONE) { + _dns_cache[i] = tmp; + addLog(LOG_LEVEL_INFO, strformat(F("DNS Cache %d set to %s"), i, tmp.toString(true).c_str())); + } + + } + _gotIPStats.setOn(); + addLog(LOG_LEVEL_INFO, F("ETH_GOT_IP")); + break; + case ARDUINO_EVENT_ETH_GOT_IP6: + _gotIP6Stats.setOn(); + addLog(LOG_LEVEL_INFO, F("ETH_GOT_IP6")); + break; + case ARDUINO_EVENT_ETH_LOST_IP: + _gotIPStats.setOff(); + _gotIP6Stats.setOff(); + + addLog(LOG_LEVEL_INFO, F("ETH_LOST_IP")); + break; + + default: break; + } +} + +} // namespace eth +} // namespace net +} // namespace ESPEasy + +#endif // ifdef USES_NW003 diff --git a/src/ESPEasy/net/NWPluginStructs/NW003_data_struct_ETH_RMII.h b/src/ESPEasy/net/NWPluginStructs/NW003_data_struct_ETH_RMII.h new file mode 100644 index 000000000..2c388fba1 --- /dev/null +++ b/src/ESPEasy/net/NWPluginStructs/NW003_data_struct_ETH_RMII.h @@ -0,0 +1,44 @@ +#pragma once + +#include "../_NWPlugin_Helper.h" +#ifdef USES_NW003 + + +namespace ESPEasy { +namespace net { +namespace eth { + +struct NW003_data_struct_ETH_RMII : public NWPluginData_base { + + NW003_data_struct_ETH_RMII(networkIndex_t networkIndex); + ~NW003_data_struct_ETH_RMII(); + + + void webform_load(EventStruct *event); + void webform_save(EventStruct *event); + + bool webform_getPort(String& str); + + bool init(EventStruct *event); + + bool exit(EventStruct *event); + + + bool handle_priority_route_changed(); + +private: + + static void onEvent(arduino_event_id_t event, + arduino_event_info_t info); + + network_event_handle_t nw_event_id = 0; + +}; + + +} // namespace eth +} // namespace net +} // namespace ESPEasy + + +#endif // ifdef USES_NW003 diff --git a/src/ESPEasy/net/NWPluginStructs/NW004_data_struct_ETH_SPI.cpp b/src/ESPEasy/net/NWPluginStructs/NW004_data_struct_ETH_SPI.cpp new file mode 100644 index 000000000..940f789b1 --- /dev/null +++ b/src/ESPEasy/net/NWPluginStructs/NW004_data_struct_ETH_SPI.cpp @@ -0,0 +1,130 @@ +#include "../NWPluginStructs/NW004_data_struct_ETH_SPI.h" + +#ifdef USES_NW004 + +# include "../../../src/Globals/Settings.h" + +# include "../../../src/Helpers/ESPEasy_time_calc.h" +# include "../../../src/Helpers/LongTermOnOffTimer.h" +# include "../../../src/Helpers/StringConverter.h" + + +namespace ESPEasy { +namespace net { +namespace eth { + +static LongTermOnOffTimer _startStopStats; +static LongTermOnOffTimer _connectedStats; +static LongTermOnOffTimer _gotIPStats; +# if FEATURE_USE_IPV6 +static LongTermOnOffTimer _gotIP6Stats; +# endif +static IPAddress _dns_cache[2]{}; + +NW004_data_struct_ETH_SPI::NW004_data_struct_ETH_SPI(networkIndex_t networkIndex) + : NWPluginData_base(nwpluginID_t(1), networkIndex) +{ + _connectedStats.clear(); + _gotIPStats.clear(); + _gotIP6Stats.clear(); + nw_event_id = Network.onEvent(NW004_data_struct_ETH_SPI::onEvent); +} + +NW004_data_struct_ETH_SPI::~NW004_data_struct_ETH_SPI() +{ + if (nw_event_id != 0) { + Network.removeEvent(nw_event_id); + } + nw_event_id = 0; +} + +void NW004_data_struct_ETH_SPI::webform_load(EventStruct *event) {} + +void NW004_data_struct_ETH_SPI::webform_save(EventStruct *event) {} + +bool NW004_data_struct_ETH_SPI::webform_getPort(String& str) { return true; } + +bool NW004_data_struct_ETH_SPI::init(EventStruct *event) +{ + + return true; +} + +bool NW004_data_struct_ETH_SPI::exit(EventStruct *event) { + + return true; +} + +bool NW004_data_struct_ETH_SPI::handle_priority_route_changed() +{ + bool res{}; + + if (ETH.isDefault()) { + // Check to see if we may need to restore any cached DNS server + for (size_t i = 0; i < NR_ELEMENTS(_dns_cache); ++i) { + auto tmp = ETH.dnsIP(i); + + if ((_dns_cache[i] != INADDR_NONE) && (_dns_cache[i] != tmp)) { + ETH.dnsIP(i, _dns_cache[i]); + res = true; + } + } + } + return res; +} + +void NW004_data_struct_ETH_SPI::onEvent(arduino_event_id_t event, + arduino_event_info_t info) +{ + switch (event) + { + case ARDUINO_EVENT_ETH_START: + _startStopStats.setOn(); + addLog(LOG_LEVEL_INFO, F("ETH_START")); + break; + case ARDUINO_EVENT_ETH_STOP: + _startStopStats.setOff(); + addLog(LOG_LEVEL_INFO, F("ETH_STOP")); + break; + case ARDUINO_EVENT_ETH_CONNECTED: + _connectedStats.setOn(); + addLog(LOG_LEVEL_INFO, F("ETH_CONNECTED")); + break; + case ARDUINO_EVENT_ETH_DISCONNECTED: + _connectedStats.setOff(); + addLog(LOG_LEVEL_INFO, F("ETH_DISCONNECTED")); + break; + case ARDUINO_EVENT_ETH_GOT_IP: + + for (size_t i = 0; i < NR_ELEMENTS(_dns_cache); ++i) { + auto tmp = ETH.dnsIP(i); + + if (tmp != INADDR_NONE) { + _dns_cache[i] = tmp; + addLog(LOG_LEVEL_INFO, strformat(F("DNS Cache %d set to %s"), i, tmp.toString(true).c_str())); + } + + } + _gotIPStats.setOn(); + addLog(LOG_LEVEL_INFO, F("ETH_GOT_IP")); + break; + case ARDUINO_EVENT_ETH_GOT_IP6: + _gotIP6Stats.setOn(); + addLog(LOG_LEVEL_INFO, F("ETH_GOT_IP6")); + break; + case ARDUINO_EVENT_ETH_LOST_IP: + _gotIPStats.setOff(); + _gotIP6Stats.setOff(); + + addLog(LOG_LEVEL_INFO, F("ETH_LOST_IP")); + break; + + default: break; + } +} + +} // namespace eth +} // namespace net +} // namespace ESPEasy + +#endif // ifdef USES_NW004 diff --git a/src/ESPEasy/net/NWPluginStructs/NW004_data_struct_ETH_SPI.h b/src/ESPEasy/net/NWPluginStructs/NW004_data_struct_ETH_SPI.h new file mode 100644 index 000000000..972ae4d97 --- /dev/null +++ b/src/ESPEasy/net/NWPluginStructs/NW004_data_struct_ETH_SPI.h @@ -0,0 +1,43 @@ +#pragma once + +#include "../_NWPlugin_Helper.h" +#ifdef USES_NW004 + + +namespace ESPEasy { +namespace net { +namespace eth { + +struct NW004_data_struct_ETH_SPI : public NWPluginData_base { + + NW004_data_struct_ETH_SPI(networkIndex_t networkIndex); + ~NW004_data_struct_ETH_SPI(); + + + void webform_load(EventStruct *event); + void webform_save(EventStruct *event); + + bool webform_getPort(String& str); + + bool init(EventStruct *event); + + bool exit(EventStruct *event); + + bool handle_priority_route_changed(); + +private: + + static void onEvent(arduino_event_id_t event, + arduino_event_info_t info); + + network_event_handle_t nw_event_id = 0; + +}; + + +} // namespace eth +} // namespace net +} // namespace ESPEasy + + +#endif // ifdef USES_NW004 diff --git a/src/ESPEasy/net/NWPluginStructs/NW005_data_struct_PPP_modem.cpp b/src/ESPEasy/net/NWPluginStructs/NW005_data_struct_PPP_modem.cpp index 57bf910a9..24a75c4d7 100644 --- a/src/ESPEasy/net/NWPluginStructs/NW005_data_struct_PPP_modem.cpp +++ b/src/ESPEasy/net/NWPluginStructs/NW005_data_struct_PPP_modem.cpp @@ -28,7 +28,12 @@ namespace ppp { static LongTermOnOffTimer _startStopStats; static LongTermOnOffTimer _connectedStats; static LongTermOnOffTimer _gotIPStats; +#if FEATURE_USE_IPV6 static LongTermOnOffTimer _gotIP6Stats; +#endif +static IPAddress _dns_cache[2]{}; + + // Keys as used in the Key-value-store @@ -881,6 +886,25 @@ bool NW005_data_struct_PPP_modem::exit(EventStruct *event) return true; } +bool NW005_data_struct_PPP_modem::handle_priority_route_changed() +{ + bool res{}; + + if (PPP.isDefault()) { + // Check to see if we may need to restore any cached DNS server + for (size_t i = 0; i < NR_ELEMENTS(_dns_cache); ++i) { + auto tmp = PPP.dnsIP(i); + + if ((_dns_cache[i] != INADDR_NONE) && (_dns_cache[i] != tmp)) { + PPP.dnsIP(i, _dns_cache[i]); + res = true; + } + } + } + return res; +} + + String NW005_data_struct_PPP_modem::write_AT_cmd(const String& cmd, int timeout) { String res; @@ -925,6 +949,16 @@ void NW005_data_struct_PPP_modem::onEvent(arduino_event_id_t event, arduino_even WiFi.AP.enableNAPT(false); break; case ARDUINO_EVENT_PPP_GOT_IP: + for (size_t i = 0; i < NR_ELEMENTS(_dns_cache); ++i) { + auto tmp = WiFi.STA.dnsIP(i); + + if (tmp != INADDR_NONE) { + _dns_cache[i] = tmp; + addLog(LOG_LEVEL_INFO, strformat(F("DNS Cache %d set to %s"), i, tmp.toString(true).c_str())); + } + + } + _gotIPStats.setOn(); addLog(LOG_LEVEL_INFO, F("PPP Got IP")); diff --git a/src/ESPEasy/net/NWPluginStructs/NW005_data_struct_PPP_modem.h b/src/ESPEasy/net/NWPluginStructs/NW005_data_struct_PPP_modem.h index 4b3efde7d..79148afe0 100644 --- a/src/ESPEasy/net/NWPluginStructs/NW005_data_struct_PPP_modem.h +++ b/src/ESPEasy/net/NWPluginStructs/NW005_data_struct_PPP_modem.h @@ -50,6 +50,8 @@ struct NW005_data_struct_PPP_modem : public NWPluginData_base { bool exit(EventStruct *event); + bool handle_priority_route_changed(); + String write_AT_cmd(const String& cmd, int timeout = 1000); diff --git a/src/ESPEasy/net/_NW001_WiFi_STA.cpp b/src/ESPEasy/net/_NW001_WiFi_STA.cpp index 443d0b3f8..885d221d6 100644 --- a/src/ESPEasy/net/_NW001_WiFi_STA.cpp +++ b/src/ESPEasy/net/_NW001_WiFi_STA.cpp @@ -307,7 +307,18 @@ bool NWPlugin_001(NWPlugin::Function function, EventStruct *event, String& strin ESPEasy::net::wifi::loopWiFi(); break; } +# ifdef ESP32 + case NWPlugin::Function::NWPLUGIN_PRIORITY_ROUTE_CHANGED: + { + ESPEasy::net::wifi::NW001_data_struct_WiFi_STA *NW_data = + static_cast(getNWPluginData(event->NetworkIndex)); + if (NW_data) { + success = NW_data->handle_priority_route_changed(); + } + break; + } +# endif // ifdef ESP32 default: break; diff --git a/src/ESPEasy/net/_NW003_ETH_RMII.cpp b/src/ESPEasy/net/_NW003_ETH_RMII.cpp index e4af6558e..a7bcfd33c 100644 --- a/src/ESPEasy/net/_NW003_ETH_RMII.cpp +++ b/src/ESPEasy/net/_NW003_ETH_RMII.cpp @@ -27,6 +27,8 @@ # include "../net/Helpers/_NWPlugin_Helper_webform.h" # include "../net/Helpers/_NWPlugin_init.h" +# include "../net/NWPluginStructs/NW003_data_struct_ETH_RMII.h" + # include namespace ESPEasy { @@ -295,6 +297,19 @@ bool NWPlugin_003(NWPlugin::Function function, EventStruct *event, String& strin break; } + case NWPlugin::Function::NWPLUGIN_TEN_PER_SECOND: + // FIXME TD-er: Must make this act on DNS updates from other interfaces + // Fall through + case NWPlugin::Function::NWPLUGIN_PRIORITY_ROUTE_CHANGED: + { + ESPEasy::net::eth::NW003_data_struct_ETH_RMII *NW_data = + static_cast(getNWPluginData(event->NetworkIndex)); + + if (NW_data) { + success = NW_data->handle_priority_route_changed(); + } + break; + } default: break; diff --git a/src/ESPEasy/net/_NW004_ETH_SPI.cpp b/src/ESPEasy/net/_NW004_ETH_SPI.cpp index 0e9009cf1..28b64b163 100644 --- a/src/ESPEasy/net/_NW004_ETH_SPI.cpp +++ b/src/ESPEasy/net/_NW004_ETH_SPI.cpp @@ -27,6 +27,8 @@ # include "../net/Helpers/_NWPlugin_Helper_webform.h" # include "../net/Helpers/_NWPlugin_init.h" +# include "../net/NWPluginStructs/NW004_data_struct_ETH_SPI.h" + # include @@ -298,6 +300,19 @@ bool NWPlugin_004(NWPlugin::Function function, EventStruct *event, String& strin break; } + case NWPlugin::Function::NWPLUGIN_TEN_PER_SECOND: + // FIXME TD-er: Must make this act on DNS updates from other interfaces + // Fall through + case NWPlugin::Function::NWPLUGIN_PRIORITY_ROUTE_CHANGED: + { + ESPEasy::net::eth::NW004_data_struct_ETH_SPI *NW_data = + static_cast(getNWPluginData(event->NetworkIndex)); + + if (NW_data) { + success = NW_data->handle_priority_route_changed(); + } + break; + } default: break; diff --git a/src/ESPEasy/net/_NW005_PPP_modem.cpp b/src/ESPEasy/net/_NW005_PPP_modem.cpp index 23cdd8549..ab609e980 100644 --- a/src/ESPEasy/net/_NW005_PPP_modem.cpp +++ b/src/ESPEasy/net/_NW005_PPP_modem.cpp @@ -87,9 +87,10 @@ bool NWPlugin_005(NWPlugin::Function function, EventStruct *event, String& strin NW_data->getRSSI().c_str()); auto connectionDuration_ms = NW_data->getConnectedDuration_ms(); + if (connectionDuration_ms > 0) { string += concat( - F("
    "), + F("
    "), format_msec_duration_HMS(connectionDuration_ms)); } } @@ -134,9 +135,9 @@ bool NWPlugin_005(NWPlugin::Function function, EventStruct *event, String& strin if (mustCleanup) { NW_data = new (std::nothrow) ESPEasy::net::ppp::NW005_data_struct_PPP_modem(event->NetworkIndex); -#if FEATURE_STORE_NETWORK_INTERFACE_SETTINGS +# if FEATURE_STORE_NETWORK_INTERFACE_SETTINGS NW_data->init_KVS(); -#endif +# endif } if (NW_data) { @@ -157,9 +158,9 @@ bool NWPlugin_005(NWPlugin::Function function, EventStruct *event, String& strin if (mustCleanup) { NW_data = new (std::nothrow) ESPEasy::net::ppp::NW005_data_struct_PPP_modem(event->NetworkIndex); -#if FEATURE_STORE_NETWORK_INTERFACE_SETTINGS +# if FEATURE_STORE_NETWORK_INTERFACE_SETTINGS NW_data->init_KVS(); -#endif +# endif } if (NW_data) { @@ -196,6 +197,27 @@ bool NWPlugin_005(NWPlugin::Function function, EventStruct *event, String& strin break; } + + case NWPlugin::Function::NWPLUGIN_FIFTY_PER_SECOND: + { + break; + } + + case NWPlugin::Function::NWPLUGIN_TEN_PER_SECOND: + // FIXME TD-er: Must make this act on DNS updates from other interfaces + // Fall through + case NWPlugin::Function::NWPLUGIN_PRIORITY_ROUTE_CHANGED: + { + ESPEasy::net::ppp::NW005_data_struct_PPP_modem *NW_data = + static_cast(getNWPluginData(event->NetworkIndex)); + + if (NW_data) { + success = NW_data->handle_priority_route_changed(); + } + break; + } + + default: break; diff --git a/src/ESPEasy/net/wifi/ESPEasyWiFi_state_machine.cpp b/src/ESPEasy/net/wifi/ESPEasyWiFi_state_machine.cpp index 773256dcf..44ff98f20 100644 --- a/src/ESPEasy/net/wifi/ESPEasyWiFi_state_machine.cpp +++ b/src/ESPEasy/net/wifi/ESPEasyWiFi_state_machine.cpp @@ -42,7 +42,7 @@ void ESPEasyWiFi_t::setup() { void ESPEasyWiFi_t::enable() {} -void ESPEasyWiFi_t::disable() {} +void ESPEasyWiFi_t::disable() { setState(WiFiState_e::Disabled, 100); } void ESPEasyWiFi_t::begin() { setState(WiFiState_e::IdleWaiting, 100); } diff --git a/src/ESPEasy/net/wifi/ESPEasyWifi.cpp b/src/ESPEasy/net/wifi/ESPEasyWifi.cpp index 3b1f93d7f..c55adc822 100644 --- a/src/ESPEasy/net/wifi/ESPEasyWifi.cpp +++ b/src/ESPEasy/net/wifi/ESPEasyWifi.cpp @@ -166,6 +166,8 @@ void resetWiFi() { void initWiFi() { ESPEasyWiFi.setup(); } +void exitWiFi() { ESPEasyWiFi.disable(); } + void loopWiFi() { ESPEasyWiFi.loop(); } // ******************************************************************************** diff --git a/src/ESPEasy/net/wifi/ESPEasyWifi.h b/src/ESPEasy/net/wifi/ESPEasyWifi.h index 617d58e40..af0275005 100644 --- a/src/ESPEasy/net/wifi/ESPEasyWifi.h +++ b/src/ESPEasy/net/wifi/ESPEasyWifi.h @@ -39,6 +39,7 @@ bool prepareWiFi(); bool checkAndResetWiFi(); void resetWiFi(); void initWiFi(); +void exitWiFi(); void loopWiFi(); # if FEATURE_SET_WIFI_TX_PWR diff --git a/src/src/CustomBuild/define_plugin_sets.h b/src/src/CustomBuild/define_plugin_sets.h index 505bf8ccf..7153fd3ca 100644 --- a/src/src/CustomBuild/define_plugin_sets.h +++ b/src/src/CustomBuild/define_plugin_sets.h @@ -3244,7 +3244,7 @@ To create/register a plugin, you have to : // For now we need to keep build size in mind #define FEATURE_PPP_MODEM 0 #else -#if CONFIG_LWIP_PPP_SUPPORT && ARDUINO_HAS_ESP_MODEM +#if CONFIG_LWIP_PPP_SUPPORT #define FEATURE_PPP_MODEM 1 #else #define FEATURE_PPP_MODEM 0 diff --git a/src/src/DataTypes/ESPEasy_plugin_functions.h b/src/src/DataTypes/ESPEasy_plugin_functions.h index 1de3ca524..2e8128516 100644 --- a/src/src/DataTypes/ESPEasy_plugin_functions.h +++ b/src/src/DataTypes/ESPEasy_plugin_functions.h @@ -161,6 +161,7 @@ public: #ifdef ESP32 NWPLUGIN_GET_INTERFACE, NWPLUGIN_WEBFORM_SHOW_ROUTE_PRIO, + NWPLUGIN_PRIORITY_ROUTE_CHANGED, // The default interface was changed, let other interfaces check to see if they need to do something. #endif NWPLUGIN_PROCESS_EVENT, // Process received event arduino_event_id_t NWPLUGIN_WEBFORM_SHOW_CONNECTED, // Used for showing connected state/speed diff --git a/src/src/Helpers/PeriodicalActions.cpp b/src/src/Helpers/PeriodicalActions.cpp index e68d02d4e..4e6987d62 100644 --- a/src/src/Helpers/PeriodicalActions.cpp +++ b/src/src/Helpers/PeriodicalActions.cpp @@ -56,6 +56,22 @@ void run50TimesPerSecond() { String dummy; + { + // Do network calls first, so any needed checks or updates are done + // before any controller may need to use the network +#ifdef ESP32 + static const NetworkInterface *lastDefaultInterface = nullptr; + NetworkInterface * currentDefaultInterface = Network.getDefaultInterface(); + if (lastDefaultInterface != currentDefaultInterface) { + ESPEasy::net::NWPluginCall(NWPlugin::Function::NWPLUGIN_PRIORITY_ROUTE_CHANGED, 0, dummy); + lastDefaultInterface = currentDefaultInterface; + } +#endif + + START_TIMER; + ESPEasy::net::NWPluginCall(NWPlugin::Function::NWPLUGIN_FIFTY_PER_SECOND, 0, dummy); + STOP_TIMER(NWPLUGIN_CALL_50PS); + } { START_TIMER; PluginCall(PLUGIN_FIFTY_PER_SECOND, 0, dummy); @@ -66,11 +82,6 @@ void run50TimesPerSecond() { CPluginCall(CPlugin::Function::CPLUGIN_FIFTY_PER_SECOND, 0, dummy); STOP_TIMER(CPLUGIN_CALL_50PS); } - { - START_TIMER; - ESPEasy::net::NWPluginCall(NWPlugin::Function::NWPLUGIN_FIFTY_PER_SECOND, 0, dummy); - STOP_TIMER(NWPLUGIN_CALL_50PS); - } processNextEvent(); } @@ -86,6 +97,11 @@ void run10TimesPerSecond() { GPIO_Monitor10xSec(); STOP_TIMER(PLUGIN_CALL_10PSU); } + { + START_TIMER; + ESPEasy::net::NWPluginCall(NWPlugin::Function::NWPLUGIN_TEN_PER_SECOND, 0, dummy); + STOP_TIMER(NWPLUGIN_CALL_10PS); + } { START_TIMER; PluginCall(PLUGIN_TEN_PER_SECOND, 0, dummy); @@ -102,11 +118,6 @@ void run10TimesPerSecond() { CPluginCall(CPlugin::Function::CPLUGIN_TEN_PER_SECOND, 0, dummy); STOP_TIMER(CPLUGIN_CALL_10PS); } - { - START_TIMER; - ESPEasy::net::NWPluginCall(NWPlugin::Function::NWPLUGIN_TEN_PER_SECOND, 0, dummy); - STOP_TIMER(NWPLUGIN_CALL_10PS); - } #ifdef USES_C015 if (ESPEasy::net::NetworkConnected()) { From cce96082f1a4a1708cd77a43c2447eaa26ac85f3 Mon Sep 17 00:00:00 2001 From: TD-er Date: Fri, 1 Aug 2025 15:09:40 +0200 Subject: [PATCH 169/564] [Network] Fix ESP8266 build + add log when DNS is restored from cache --- src/ESPEasy/net/Globals/NWPlugins.cpp | 14 +++--- .../NW001_data_struct_WiFi_STA.cpp | 43 +++++++++++++++++-- .../NW001_data_struct_WiFi_STA.h | 10 +++-- .../NW002_data_struct_WiFi_AP.cpp | 33 +++++++++++--- .../NW002_data_struct_WiFi_AP.h | 8 +++- .../NW003_data_struct_ETH_RMII.cpp | 16 ++++++- .../NW004_data_struct_ETH_SPI.cpp | 16 ++++++- .../NW005_data_struct_PPP_modem.cpp | 33 +++++++++----- .../NW005_data_struct_PPP_modem.h | 2 +- src/ESPEasy/net/_NW002_WiFi_AP.cpp | 14 ++++++ 10 files changed, 151 insertions(+), 38 deletions(-) diff --git a/src/ESPEasy/net/Globals/NWPlugins.cpp b/src/ESPEasy/net/Globals/NWPlugins.cpp index fd9783dd9..8d322c79a 100644 --- a/src/ESPEasy/net/Globals/NWPlugins.cpp +++ b/src/ESPEasy/net/Globals/NWPlugins.cpp @@ -54,11 +54,12 @@ bool NWPluginCall(NWPlugin::Function Function, EventStruct *event, String& str) case NWPlugin::Function::NWPLUGIN_PRIORITY_ROUTE_CHANGED: #endif { - const bool success = - Function != NWPlugin::Function::NWPLUGIN_WRITE + // Set to true where return value doesn't matter + bool success = #ifdef ESP32 - && Function != NWPlugin::Function::NWPLUGIN_PRIORITY_ROUTE_CHANGED; + Function != NWPlugin::Function::NWPLUGIN_PRIORITY_ROUTE_CHANGED && #endif + Function != NWPlugin::Function::NWPLUGIN_WRITE; if (Function == NWPlugin::Function::NWPLUGIN_INIT_ALL) { Function = NWPlugin::Function::NWPLUGIN_INIT; @@ -85,14 +86,11 @@ bool NWPluginCall(NWPlugin::Function Function, EventStruct *event, String& str) Function, event, command)) { - if (Function == NWPlugin::Function::NWPLUGIN_WRITE -#ifdef ESP32 - || Function == NWPlugin::Function::NWPLUGIN_PRIORITY_ROUTE_CHANGED -#endif - ) { + if (Function == NWPlugin::Function::NWPLUGIN_WRITE) { // Need to stop when call was handled return true; } + success = true; } } } diff --git a/src/ESPEasy/net/NWPluginStructs/NW001_data_struct_WiFi_STA.cpp b/src/ESPEasy/net/NWPluginStructs/NW001_data_struct_WiFi_STA.cpp index 26be252b6..4d7bd2be6 100644 --- a/src/ESPEasy/net/NWPluginStructs/NW001_data_struct_WiFi_STA.cpp +++ b/src/ESPEasy/net/NWPluginStructs/NW001_data_struct_WiFi_STA.cpp @@ -9,7 +9,9 @@ # include "../../../src/Helpers/StringConverter.h" # include "../wifi/ESPEasyWifi.h" +# include "../wifi/WiFiDisconnectReason.h" +# define NW_PLUGIN_ID 1 namespace ESPEasy { namespace net { @@ -19,19 +21,26 @@ static LongTermOnOffTimer _startStopStats; static LongTermOnOffTimer _connectedStats; static LongTermOnOffTimer _gotIPStats; # ifdef ESP32 +# if FEATURE_USE_IPV6 static LongTermOnOffTimer _gotIP6Stats; +# endif static IPAddress _dns_cache[2]{}; +static wifi_event_sta_connected_t _wifi_event_sta_connected; +static WiFiDisconnectReason _wifi_disconnect_reason = WiFiDisconnectReason::WIFI_DISCONNECT_REASON_UNSPECIFIED; # endif // ifdef ESP32 NW001_data_struct_WiFi_STA::NW001_data_struct_WiFi_STA(networkIndex_t networkIndex) - : NWPluginData_base(nwpluginID_t(1), networkIndex) + : NWPluginData_base(nwpluginID_t(NW_PLUGIN_ID), networkIndex) { _connectedStats.clear(); _gotIPStats.clear(); - _gotIP6Stats.clear(); # ifdef ESP32 +# if FEATURE_USE_IPV6 + _gotIP6Stats.clear(); +# endif nw_event_id = Network.onEvent(NW001_data_struct_WiFi_STA::onEvent); -# endif + memset(&_wifi_event_sta_connected, 0, sizeof(_wifi_event_sta_connected)); +# endif // ifdef ESP32 } NW001_data_struct_WiFi_STA::~NW001_data_struct_WiFi_STA() @@ -121,6 +130,12 @@ bool NW001_data_struct_WiFi_STA::handle_priority_route_changed() auto tmp = WiFi.STA.dnsIP(i); if ((_dns_cache[i] != INADDR_NONE) && (_dns_cache[i] != tmp)) { + addLog(LOG_LEVEL_INFO, strformat( + F("NW001: Restore cached DNS server %d from %s to %s"), + i, + tmp.toString().c_str(), + _dns_cache[i].toString().c_str() + )); WiFi.STA.dnsIP(i, _dns_cache[i]); res = true; } @@ -137,34 +152,44 @@ bool NW001_data_struct_WiFi_STA::handle_priority_route_changed() void NW001_data_struct_WiFi_STA::onEvent(arduino_event_id_t event, arduino_event_info_t info) { + bool clear_wifi_event_sta_connected = false; + switch (event) { case ARDUINO_EVENT_WIFI_OFF: + clear_wifi_event_sta_connected = true; addLog(LOG_LEVEL_INFO, F("WIFI_OFF")); break; case ARDUINO_EVENT_WIFI_READY: + // clear_wifi_event_sta_connected = true; addLog(LOG_LEVEL_INFO, F("WIFI_READY")); break; case ARDUINO_EVENT_WIFI_SCAN_DONE: addLog(LOG_LEVEL_INFO, F("SCAN_DONE")); break; case ARDUINO_EVENT_WIFI_STA_START: + clear_wifi_event_sta_connected = true; _startStopStats.setOn(); addLog(LOG_LEVEL_INFO, F("STA_START")); break; case ARDUINO_EVENT_WIFI_STA_STOP: + clear_wifi_event_sta_connected = true; _startStopStats.setOff(); addLog(LOG_LEVEL_INFO, F("STA_STOP")); break; case ARDUINO_EVENT_WIFI_STA_CONNECTED: + memcpy(&_wifi_event_sta_connected, &info.wifi_sta_connected, sizeof(_wifi_event_sta_connected)); _connectedStats.setOn(); addLog(LOG_LEVEL_INFO, F("STA_CONNECTED")); break; case ARDUINO_EVENT_WIFI_STA_DISCONNECTED: + clear_wifi_event_sta_connected = true; + _wifi_disconnect_reason = static_cast(info.wifi_sta_disconnected.reason); _connectedStats.setOff(); addLog(LOG_LEVEL_INFO, F("STA_DISCONNECTED")); break; case ARDUINO_EVENT_WIFI_STA_AUTHMODE_CHANGE: + _wifi_event_sta_connected.authmode = info.wifi_sta_authmode_change.new_mode; addLog(LOG_LEVEL_INFO, F("STA_AUTHMODE_CHANGE")); break; case ARDUINO_EVENT_WIFI_STA_GOT_IP: @@ -181,18 +206,28 @@ void NW001_data_struct_WiFi_STA::onEvent(arduino_event_id_t event, _gotIPStats.setOn(); addLog(LOG_LEVEL_INFO, F("STA_GOT_IP")); break; +# if FEATURE_USE_IPV6 case ARDUINO_EVENT_WIFI_STA_GOT_IP6: _gotIP6Stats.setOn(); + addLog(LOG_LEVEL_INFO, F("STA_GOT_IP6")); break; +# endif // if FEATURE_USE_IPV6 case ARDUINO_EVENT_WIFI_STA_LOST_IP: _gotIPStats.setOff(); +# if FEATURE_USE_IPV6 _gotIP6Stats.setOff(); +# endif addLog(LOG_LEVEL_INFO, F("STA_LOST_IP")); break; - default: break; + default: + break; + } + + if (clear_wifi_event_sta_connected) { + memset(&_wifi_event_sta_connected, 0, sizeof(_wifi_event_sta_connected)); } } diff --git a/src/ESPEasy/net/NWPluginStructs/NW001_data_struct_WiFi_STA.h b/src/ESPEasy/net/NWPluginStructs/NW001_data_struct_WiFi_STA.h index 0f9b11656..6a57c207e 100644 --- a/src/ESPEasy/net/NWPluginStructs/NW001_data_struct_WiFi_STA.h +++ b/src/ESPEasy/net/NWPluginStructs/NW001_data_struct_WiFi_STA.h @@ -23,17 +23,19 @@ struct NW001_data_struct_WiFi_STA : public NWPluginData_base { bool exit(EventStruct *event); -#ifdef ESP32 +# ifdef ESP32 bool handle_priority_route_changed(); -#endif +# endif private: -#ifdef ESP32 + +# ifdef ESP32 static void onEvent(arduino_event_id_t event, arduino_event_info_t info); network_event_handle_t nw_event_id = 0; -#endif +# endif // ifdef ESP32 + }; diff --git a/src/ESPEasy/net/NWPluginStructs/NW002_data_struct_WiFi_AP.cpp b/src/ESPEasy/net/NWPluginStructs/NW002_data_struct_WiFi_AP.cpp index 5feac9789..b56bb0f66 100644 --- a/src/ESPEasy/net/NWPluginStructs/NW002_data_struct_WiFi_AP.cpp +++ b/src/ESPEasy/net/NWPluginStructs/NW002_data_struct_WiFi_AP.cpp @@ -10,6 +10,8 @@ # include "../wifi/ESPEasyWifi.h" +# define NW_PLUGIN_ID 2 + namespace ESPEasy { namespace net { namespace wifi { @@ -18,21 +20,22 @@ static LongTermOnOffTimer _startStopStats; NW002_data_struct_WiFi_AP::NW002_data_struct_WiFi_AP(networkIndex_t networkIndex) - : NWPluginData_base(nwpluginID_t(2), networkIndex) + : NWPluginData_base(nwpluginID_t(NW_PLUGIN_ID), networkIndex) { -#ifdef ESP32 +# ifdef ESP32 nw_event_id = Network.onEvent(NW002_data_struct_WiFi_AP::onEvent); -#endif +# endif } NW002_data_struct_WiFi_AP::~NW002_data_struct_WiFi_AP() { -#ifdef ESP32 +# ifdef ESP32 + if (nw_event_id != 0) { Network.removeEvent(nw_event_id); } nw_event_id = 0; -#endif +# endif // ifdef ESP32 } void NW002_data_struct_WiFi_AP::webform_load(EventStruct *event) {} @@ -60,7 +63,22 @@ bool NW002_data_struct_WiFi_AP::exit(EventStruct *event) return true; } -#ifdef ESP32 +# ifdef ESP32 + +bool NW002_data_struct_WiFi_AP::handle_priority_route_changed() +{ + bool res{}; + + // WiFi.AP.enableNAPT(false); + + if (!WiFi.AP.isDefault()) { + // FIXME TD-er: May need to stop/start NAPT on WiFi.AP + // WiFi.AP.enableNAPT(true); + } + + return res; +} + void NW002_data_struct_WiFi_AP::onEvent(arduino_event_id_t event, arduino_event_info_t info) { @@ -93,7 +111,8 @@ void NW002_data_struct_WiFi_AP::onEvent(arduino_event_id_t event, default: break; } } -#endif + +# endif // ifdef ESP32 } // namespace wifi } // namespace net diff --git a/src/ESPEasy/net/NWPluginStructs/NW002_data_struct_WiFi_AP.h b/src/ESPEasy/net/NWPluginStructs/NW002_data_struct_WiFi_AP.h index f45432b4e..11097c125 100644 --- a/src/ESPEasy/net/NWPluginStructs/NW002_data_struct_WiFi_AP.h +++ b/src/ESPEasy/net/NWPluginStructs/NW002_data_struct_WiFi_AP.h @@ -23,14 +23,18 @@ struct NW002_data_struct_WiFi_AP : public NWPluginData_base { bool exit(EventStruct *event); +# ifdef ESP32 + bool handle_priority_route_changed(); +# endif + private: -#ifdef ESP32 +# ifdef ESP32 static void onEvent(arduino_event_id_t event, arduino_event_info_t info); network_event_handle_t nw_event_id = 0; -#endif +# endif // ifdef ESP32 }; diff --git a/src/ESPEasy/net/NWPluginStructs/NW003_data_struct_ETH_RMII.cpp b/src/ESPEasy/net/NWPluginStructs/NW003_data_struct_ETH_RMII.cpp index 81ffebdb2..136050b22 100644 --- a/src/ESPEasy/net/NWPluginStructs/NW003_data_struct_ETH_RMII.cpp +++ b/src/ESPEasy/net/NWPluginStructs/NW003_data_struct_ETH_RMII.cpp @@ -8,6 +8,7 @@ # include "../../../src/Helpers/LongTermOnOffTimer.h" # include "../../../src/Helpers/StringConverter.h" +# define NW_PLUGIN_ID 3 namespace ESPEasy { namespace net { @@ -22,11 +23,13 @@ static LongTermOnOffTimer _gotIP6Stats; static IPAddress _dns_cache[2]{}; NW003_data_struct_ETH_RMII::NW003_data_struct_ETH_RMII(networkIndex_t networkIndex) - : NWPluginData_base(nwpluginID_t(1), networkIndex) + : NWPluginData_base(nwpluginID_t(NW_PLUGIN_ID), networkIndex) { _connectedStats.clear(); _gotIPStats.clear(); +# if FEATURE_USE_IPV6 _gotIP6Stats.clear(); +# endif nw_event_id = Network.onEvent(NW003_data_struct_ETH_RMII::onEvent); } @@ -62,6 +65,13 @@ bool NW003_data_struct_ETH_RMII::handle_priority_route_changed() auto tmp = ETH.dnsIP(i); if ((_dns_cache[i] != INADDR_NONE) && (_dns_cache[i] != tmp)) { + addLog(LOG_LEVEL_INFO, strformat( + F("NW003: Restore cached DNS server %d from %s to %s"), + i, + tmp.toString().c_str(), + _dns_cache[i].toString().c_str() + )); + ETH.dnsIP(i, _dns_cache[i]); res = true; } @@ -105,13 +115,17 @@ void NW003_data_struct_ETH_RMII::onEvent(arduino_event_id_t event, _gotIPStats.setOn(); addLog(LOG_LEVEL_INFO, F("ETH_GOT_IP")); break; +# if FEATURE_USE_IPV6 case ARDUINO_EVENT_ETH_GOT_IP6: _gotIP6Stats.setOn(); addLog(LOG_LEVEL_INFO, F("ETH_GOT_IP6")); break; +# endif // if FEATURE_USE_IPV6 case ARDUINO_EVENT_ETH_LOST_IP: _gotIPStats.setOff(); +# if FEATURE_USE_IPV6 _gotIP6Stats.setOff(); +# endif addLog(LOG_LEVEL_INFO, F("ETH_LOST_IP")); break; diff --git a/src/ESPEasy/net/NWPluginStructs/NW004_data_struct_ETH_SPI.cpp b/src/ESPEasy/net/NWPluginStructs/NW004_data_struct_ETH_SPI.cpp index 940f789b1..8a10c1ac7 100644 --- a/src/ESPEasy/net/NWPluginStructs/NW004_data_struct_ETH_SPI.cpp +++ b/src/ESPEasy/net/NWPluginStructs/NW004_data_struct_ETH_SPI.cpp @@ -8,6 +8,7 @@ # include "../../../src/Helpers/LongTermOnOffTimer.h" # include "../../../src/Helpers/StringConverter.h" +# define NW_PLUGIN_ID 4 namespace ESPEasy { namespace net { @@ -22,11 +23,13 @@ static LongTermOnOffTimer _gotIP6Stats; static IPAddress _dns_cache[2]{}; NW004_data_struct_ETH_SPI::NW004_data_struct_ETH_SPI(networkIndex_t networkIndex) - : NWPluginData_base(nwpluginID_t(1), networkIndex) + : NWPluginData_base(nwpluginID_t(NW_PLUGIN_ID), networkIndex) { _connectedStats.clear(); _gotIPStats.clear(); +# if FEATURE_USE_IPV6 _gotIP6Stats.clear(); +# endif nw_event_id = Network.onEvent(NW004_data_struct_ETH_SPI::onEvent); } @@ -65,6 +68,13 @@ bool NW004_data_struct_ETH_SPI::handle_priority_route_changed() auto tmp = ETH.dnsIP(i); if ((_dns_cache[i] != INADDR_NONE) && (_dns_cache[i] != tmp)) { + addLog(LOG_LEVEL_INFO, strformat( + F("NW004: Restore cached DNS server %d from %s to %s"), + i, + tmp.toString().c_str(), + _dns_cache[i].toString().c_str() + )); + ETH.dnsIP(i, _dns_cache[i]); res = true; } @@ -108,13 +118,17 @@ void NW004_data_struct_ETH_SPI::onEvent(arduino_event_id_t event, _gotIPStats.setOn(); addLog(LOG_LEVEL_INFO, F("ETH_GOT_IP")); break; +# if FEATURE_USE_IPV6 case ARDUINO_EVENT_ETH_GOT_IP6: _gotIP6Stats.setOn(); addLog(LOG_LEVEL_INFO, F("ETH_GOT_IP6")); break; +# endif // if FEATURE_USE_IPV6 case ARDUINO_EVENT_ETH_LOST_IP: _gotIPStats.setOff(); +# if FEATURE_USE_IPV6 _gotIP6Stats.setOff(); +# endif addLog(LOG_LEVEL_INFO, F("ETH_LOST_IP")); break; diff --git a/src/ESPEasy/net/NWPluginStructs/NW005_data_struct_PPP_modem.cpp b/src/ESPEasy/net/NWPluginStructs/NW005_data_struct_PPP_modem.cpp index 24a75c4d7..a20d8c1a6 100644 --- a/src/ESPEasy/net/NWPluginStructs/NW005_data_struct_PPP_modem.cpp +++ b/src/ESPEasy/net/NWPluginStructs/NW005_data_struct_PPP_modem.cpp @@ -20,6 +20,8 @@ // # include // #include +# define NW_PLUGIN_ID 5 + namespace ESPEasy { namespace net { namespace ppp { @@ -28,14 +30,12 @@ namespace ppp { static LongTermOnOffTimer _startStopStats; static LongTermOnOffTimer _connectedStats; static LongTermOnOffTimer _gotIPStats; -#if FEATURE_USE_IPV6 +# if FEATURE_USE_IPV6 static LongTermOnOffTimer _gotIP6Stats; -#endif +# endif static IPAddress _dns_cache[2]{}; - - // Keys as used in the Key-value-store # define NW005_KEY_SERIAL_PORT 1 # define NW005_KEY_PIN_RX 2 @@ -93,11 +93,13 @@ const __FlashStringHelper* NW005_getLabelString(uint32_t key, bool displayString } NW005_data_struct_PPP_modem::NW005_data_struct_PPP_modem(networkIndex_t networkIndex) - : NWPluginData_base(nwpluginID_t(5), networkIndex) + : NWPluginData_base(nwpluginID_t(NW_PLUGIN_ID), networkIndex) { _connectedStats.clear(); _gotIPStats.clear(); +# if FEATURE_USE_IPV6 _gotIP6Stats.clear(); +# endif nw_event_id = Network.onEvent(NW005_data_struct_PPP_modem::onEvent); } @@ -896,6 +898,13 @@ bool NW005_data_struct_PPP_modem::handle_priority_route_changed() auto tmp = PPP.dnsIP(i); if ((_dns_cache[i] != INADDR_NONE) && (_dns_cache[i] != tmp)) { + addLog(LOG_LEVEL_INFO, strformat( + F("NW005: Restore cached DNS server %d from %s to %s"), + i, + tmp.toString().c_str(), + _dns_cache[i].toString().c_str() + )); + PPP.dnsIP(i, _dns_cache[i]); res = true; } @@ -904,7 +913,6 @@ bool NW005_data_struct_PPP_modem::handle_priority_route_changed() return res; } - String NW005_data_struct_PPP_modem::write_AT_cmd(const String& cmd, int timeout) { String res; @@ -931,7 +939,7 @@ void NW005_data_struct_PPP_modem::onEvent(arduino_event_id_t event, arduino_even _startStopStats.setOn(); # if ESP_IDF_VERSION >= ESP_IDF_VERSION_VAL(5, 5, 0) PPP.setRoutePrio(200); -#endif +# endif break; case ARDUINO_EVENT_PPP_STOP: addLog(LOG_LEVEL_INFO, F("PPP Stopped")); _startStopStats.setOff(); @@ -944,13 +952,14 @@ void NW005_data_struct_PPP_modem::onEvent(arduino_event_id_t event, arduino_even case ARDUINO_EVENT_PPP_DISCONNECTED: _connectedStats.setOff(); addLog(LOG_LEVEL_INFO, concat( - F("PPP Disconnected. Connected for: "), - format_msec_duration_HMS(_connectedStats.getLastOnDuration_ms()))); + F("PPP Disconnected. Connected for: "), + format_msec_duration_HMS(_connectedStats.getLastOnDuration_ms()))); WiFi.AP.enableNAPT(false); break; case ARDUINO_EVENT_PPP_GOT_IP: + for (size_t i = 0; i < NR_ELEMENTS(_dns_cache); ++i) { - auto tmp = WiFi.STA.dnsIP(i); + auto tmp = PPP.dnsIP(i); if (tmp != INADDR_NONE) { _dns_cache[i] = tmp; @@ -968,13 +977,17 @@ void NW005_data_struct_PPP_modem::onEvent(arduino_event_id_t event, arduino_even addLog(LOG_LEVEL_INFO, F("WiFi.AP.enableNAPT")); } break; +# if FEATURE_USE_IPV6 case ARDUINO_EVENT_PPP_GOT_IP6: _gotIP6Stats.setOn(); addLog(LOG_LEVEL_INFO, F("PPP Got IPv6")); break; +# endif // if FEATURE_USE_IPV6 case ARDUINO_EVENT_PPP_LOST_IP: _gotIPStats.setOff(); +# if FEATURE_USE_IPV6 _gotIP6Stats.setOff(); +# endif addLog(LOG_LEVEL_INFO, F("PPP Lost IP")); WiFi.AP.enableNAPT(false); break; diff --git a/src/ESPEasy/net/NWPluginStructs/NW005_data_struct_PPP_modem.h b/src/ESPEasy/net/NWPluginStructs/NW005_data_struct_PPP_modem.h index 79148afe0..7beed2623 100644 --- a/src/ESPEasy/net/NWPluginStructs/NW005_data_struct_PPP_modem.h +++ b/src/ESPEasy/net/NWPluginStructs/NW005_data_struct_PPP_modem.h @@ -50,7 +50,7 @@ struct NW005_data_struct_PPP_modem : public NWPluginData_base { bool exit(EventStruct *event); - bool handle_priority_route_changed(); + bool handle_priority_route_changed(); String write_AT_cmd(const String& cmd, int timeout = 1000); diff --git a/src/ESPEasy/net/_NW002_WiFi_AP.cpp b/src/ESPEasy/net/_NW002_WiFi_AP.cpp index d541058ae..52df19847 100644 --- a/src/ESPEasy/net/_NW002_WiFi_AP.cpp +++ b/src/ESPEasy/net/_NW002_WiFi_AP.cpp @@ -181,6 +181,20 @@ bool NWPlugin_002(NWPlugin::Function function, EventStruct *event, String& strin break; } +# ifdef ESP32 + case NWPlugin::Function::NWPLUGIN_PRIORITY_ROUTE_CHANGED: + { + ESPEasy::net::wifi::NW002_data_struct_WiFi_AP *NW_data = + static_cast(getNWPluginData(event->NetworkIndex)); + + if (NW_data) { + success = NW_data->handle_priority_route_changed(); + } + break; + } +# endif // ifdef ESP32 + + default: break; From abe872502b8b02c3fd20e452aec6f6899ea881cb Mon Sep 17 00:00:00 2001 From: TD-er Date: Fri, 1 Aug 2025 22:41:21 +0200 Subject: [PATCH 170/564] [Network] Fix mangled DNS servers when switching default route interface --- src/ESPEasy/net/ESPEasyNetwork.h | 2 +- src/ESPEasy/net/ESPEasyNetwork_ESP32.cpp | 4 +- src/ESPEasy/net/ESPEasyNetwork_ESP8266.cpp | 8 +- src/ESPEasy/net/Globals/ESPEasyWiFiEvent.cpp | 2 + .../NW001_data_struct_WiFi_STA.cpp | 144 +------ .../NW001_data_struct_WiFi_STA.h | 14 +- .../NW002_data_struct_WiFi_AP.cpp | 11 +- .../NW003_data_struct_ETH_RMII.cpp | 18 +- .../NW004_data_struct_ETH_SPI.cpp | 18 +- .../NW005_data_struct_PPP_modem.cpp | 106 +++--- .../net/eth/ESPEasyEth_ProcessEvent.cpp | 2 +- .../net/wifi/ESPEasyWiFiEvent_ESP32.cpp | 206 ---------- src/ESPEasy/net/wifi/ESPEasyWiFiEvent_ESP32.h | 46 --- .../net/wifi/ESPEasyWiFiEvent_ESP8266.cpp | 118 ------ .../net/wifi/ESPEasyWiFiEvent_ESP8266.h | 65 ---- .../net/wifi/ESPEasyWiFi_STA_Event_ESP32.cpp | 359 ++++++++++++++++++ .../net/wifi/ESPEasyWiFi_STA_Event_ESP32.h | 71 ++++ .../wifi/ESPEasyWiFi_STA_Event_ESP8266.cpp | 170 +++++++++ .../net/wifi/ESPEasyWiFi_STA_Event_ESP8266.h | 75 ++++ .../net/wifi/ESPEasyWiFi_state_machine.cpp | 3 +- src/ESPEasy/net/wifi/ESPEasyWifi.cpp | 10 +- src/ESPEasy/net/wifi/ESPEasyWifi.h | 4 +- .../net/wifi/ESPEasyWifi_ProcessEvent.cpp | 2 +- src/ESPEasy/net/wifi/ESPEasyWifi_abstracted.h | 11 +- .../net/wifi/ESPEasyWifi_abstracted_ESP32.cpp | 36 +- .../wifi/ESPEasyWifi_abstracted_ESP8266.cpp | 41 +- .../DataTypes/ESPEasy_plugin_functions.cpp | 28 ++ src/src/DataTypes/ESPEasy_plugin_functions.h | 3 + src/src/ESPEasyCore/ESPEasy_setup.cpp | 13 +- src/src/Helpers/ESPEasy_Storage.cpp | 4 +- src/src/WebServer/SetupPage.cpp | 4 +- 31 files changed, 866 insertions(+), 732 deletions(-) delete mode 100644 src/ESPEasy/net/wifi/ESPEasyWiFiEvent_ESP32.cpp delete mode 100644 src/ESPEasy/net/wifi/ESPEasyWiFiEvent_ESP32.h delete mode 100644 src/ESPEasy/net/wifi/ESPEasyWiFiEvent_ESP8266.cpp delete mode 100644 src/ESPEasy/net/wifi/ESPEasyWiFiEvent_ESP8266.h create mode 100644 src/ESPEasy/net/wifi/ESPEasyWiFi_STA_Event_ESP32.cpp create mode 100644 src/ESPEasy/net/wifi/ESPEasyWiFi_STA_Event_ESP32.h create mode 100644 src/ESPEasy/net/wifi/ESPEasyWiFi_STA_Event_ESP8266.cpp create mode 100644 src/ESPEasy/net/wifi/ESPEasyWiFi_STA_Event_ESP8266.h diff --git a/src/ESPEasy/net/ESPEasyNetwork.h b/src/ESPEasy/net/ESPEasyNetwork.h index abbbb5fa1..11a71316b 100644 --- a/src/ESPEasy/net/ESPEasyNetwork.h +++ b/src/ESPEasy/net/ESPEasyNetwork.h @@ -19,7 +19,7 @@ namespace net { void setNetworkMedium(NetworkMedium_t medium); -void NetworkConnectRelaxed(); +//void NetworkConnectRelaxed(); bool NetworkConnected(); IPAddress NetworkLocalIP(); IPAddress NetworkSubnetMask(); diff --git a/src/ESPEasy/net/ESPEasyNetwork_ESP32.cpp b/src/ESPEasy/net/ESPEasyNetwork_ESP32.cpp index bf495ea01..c9ae95f4a 100644 --- a/src/ESPEasy/net/ESPEasyNetwork_ESP32.cpp +++ b/src/ESPEasy/net/ESPEasyNetwork_ESP32.cpp @@ -87,6 +87,7 @@ void setNetworkMedium(NetworkMedium_t new_medium) { /*********************************************************************************************\ Ethernet or Wifi Support for ESP32 Build flag FEATURE_ETHERNET \*********************************************************************************************/ +/* void NetworkConnectRelaxed() { if (ESPEasy::net::NetworkConnected()) { return; } #if FEATURE_ETHERNET @@ -104,8 +105,9 @@ void NetworkConnectRelaxed() { // Failed to start the Ethernet network, probably not present of wrong parameters. // So set the runtime active medium to WiFi to try connecting to WiFi or at least start the AP. - ESPEasy::net::wifi::WiFiConnectRelaxed(); +// ESPEasy::net::wifi::WiFiConnectRelaxed(); } +*/ NetworkInterface* getDefaultNonAP_interface() { diff --git a/src/ESPEasy/net/ESPEasyNetwork_ESP8266.cpp b/src/ESPEasy/net/ESPEasyNetwork_ESP8266.cpp index 1c6d93645..1d5f72091 100644 --- a/src/ESPEasy/net/ESPEasyNetwork_ESP8266.cpp +++ b/src/ESPEasy/net/ESPEasyNetwork_ESP8266.cpp @@ -48,10 +48,10 @@ void setNetworkMedium(NetworkMedium_t new_medium) { /*********************************************************************************************\ Ethernet or Wifi Support for ESP32 Build flag FEATURE_ETHERNET \*********************************************************************************************/ -void NetworkConnectRelaxed() { - if (!ESPEasy::net::NetworkConnected()) - ESPEasy::net::wifi::WiFiConnectRelaxed(); -} +//void NetworkConnectRelaxed() { +// if (!ESPEasy::net::NetworkConnected()) +// ESPEasy::net::wifi::WiFiConnectRelaxed(); +//} bool NetworkConnected() { return ESPEasy::net::wifi::WiFiConnected(); } diff --git a/src/ESPEasy/net/Globals/ESPEasyWiFiEvent.cpp b/src/ESPEasy/net/Globals/ESPEasyWiFiEvent.cpp index e6a7cacff..df10b77b2 100644 --- a/src/ESPEasy/net/Globals/ESPEasyWiFiEvent.cpp +++ b/src/ESPEasy/net/Globals/ESPEasyWiFiEvent.cpp @@ -14,6 +14,8 @@ WiFiEventHandler APModeStationConnectedHandler; WiFiEventHandler APModeStationDisconnectedHandler; # endif // ifdef ESP8266 + +// TODO TD-er: Must remove WiFiEventData_t WiFiEventData; #endif // if FEATURE_WIFI diff --git a/src/ESPEasy/net/NWPluginStructs/NW001_data_struct_WiFi_STA.cpp b/src/ESPEasy/net/NWPluginStructs/NW001_data_struct_WiFi_STA.cpp index 4d7bd2be6..cfdfa5593 100644 --- a/src/ESPEasy/net/NWPluginStructs/NW001_data_struct_WiFi_STA.cpp +++ b/src/ESPEasy/net/NWPluginStructs/NW001_data_struct_WiFi_STA.cpp @@ -9,50 +9,21 @@ # include "../../../src/Helpers/StringConverter.h" # include "../wifi/ESPEasyWifi.h" -# include "../wifi/WiFiDisconnectReason.h" # define NW_PLUGIN_ID 1 +# define NW_PLUGIN_INTERFACE WiFi.STA namespace ESPEasy { namespace net { namespace wifi { -static LongTermOnOffTimer _startStopStats; -static LongTermOnOffTimer _connectedStats; -static LongTermOnOffTimer _gotIPStats; -# ifdef ESP32 -# if FEATURE_USE_IPV6 -static LongTermOnOffTimer _gotIP6Stats; -# endif -static IPAddress _dns_cache[2]{}; -static wifi_event_sta_connected_t _wifi_event_sta_connected; -static WiFiDisconnectReason _wifi_disconnect_reason = WiFiDisconnectReason::WIFI_DISCONNECT_REASON_UNSPECIFIED; -# endif // ifdef ESP32 NW001_data_struct_WiFi_STA::NW001_data_struct_WiFi_STA(networkIndex_t networkIndex) : NWPluginData_base(nwpluginID_t(NW_PLUGIN_ID), networkIndex) -{ - _connectedStats.clear(); - _gotIPStats.clear(); -# ifdef ESP32 -# if FEATURE_USE_IPV6 - _gotIP6Stats.clear(); -# endif - nw_event_id = Network.onEvent(NW001_data_struct_WiFi_STA::onEvent); - memset(&_wifi_event_sta_connected, 0, sizeof(_wifi_event_sta_connected)); -# endif // ifdef ESP32 -} +{} NW001_data_struct_WiFi_STA::~NW001_data_struct_WiFi_STA() -{ -# ifdef ESP32 - - if (nw_event_id != 0) { - Network.removeEvent(nw_event_id); - } - nw_event_id = 0; -# endif // ifdef ESP32 -} +{} void NW001_data_struct_WiFi_STA::webform_load(EventStruct *event) {} @@ -122,117 +93,16 @@ bool NW001_data_struct_WiFi_STA::exit(EventStruct *event) { bool NW001_data_struct_WiFi_STA::handle_priority_route_changed() { - bool res{}; - - if (WiFi.STA.isDefault()) { - // Check to see if we may need to restore any cached DNS server - for (size_t i = 0; i < NR_ELEMENTS(_dns_cache); ++i) { - auto tmp = WiFi.STA.dnsIP(i); - - if ((_dns_cache[i] != INADDR_NONE) && (_dns_cache[i] != tmp)) { - addLog(LOG_LEVEL_INFO, strformat( - F("NW001: Restore cached DNS server %d from %s to %s"), - i, - tmp.toString().c_str(), - _dns_cache[i].toString().c_str() - )); - WiFi.STA.dnsIP(i, _dns_cache[i]); - res = true; - } - } + if (NW_PLUGIN_INTERFACE.isDefault()) { + if (NWPlugin::forceDHCP_request(&NW_PLUGIN_INTERFACE)) { return true; } + return _WiFiEventHandler.restore_dns_from_cache(); } - return res; + return false; } # endif // ifdef ESP32 -# ifdef ESP32 - -void NW001_data_struct_WiFi_STA::onEvent(arduino_event_id_t event, - arduino_event_info_t info) -{ - bool clear_wifi_event_sta_connected = false; - - switch (event) - { - case ARDUINO_EVENT_WIFI_OFF: - clear_wifi_event_sta_connected = true; - addLog(LOG_LEVEL_INFO, F("WIFI_OFF")); - break; - case ARDUINO_EVENT_WIFI_READY: - // clear_wifi_event_sta_connected = true; - addLog(LOG_LEVEL_INFO, F("WIFI_READY")); - break; - case ARDUINO_EVENT_WIFI_SCAN_DONE: - addLog(LOG_LEVEL_INFO, F("SCAN_DONE")); - break; - case ARDUINO_EVENT_WIFI_STA_START: - clear_wifi_event_sta_connected = true; - _startStopStats.setOn(); - addLog(LOG_LEVEL_INFO, F("STA_START")); - break; - case ARDUINO_EVENT_WIFI_STA_STOP: - clear_wifi_event_sta_connected = true; - _startStopStats.setOff(); - addLog(LOG_LEVEL_INFO, F("STA_STOP")); - break; - case ARDUINO_EVENT_WIFI_STA_CONNECTED: - memcpy(&_wifi_event_sta_connected, &info.wifi_sta_connected, sizeof(_wifi_event_sta_connected)); - _connectedStats.setOn(); - addLog(LOG_LEVEL_INFO, F("STA_CONNECTED")); - break; - case ARDUINO_EVENT_WIFI_STA_DISCONNECTED: - clear_wifi_event_sta_connected = true; - _wifi_disconnect_reason = static_cast(info.wifi_sta_disconnected.reason); - _connectedStats.setOff(); - addLog(LOG_LEVEL_INFO, F("STA_DISCONNECTED")); - break; - case ARDUINO_EVENT_WIFI_STA_AUTHMODE_CHANGE: - _wifi_event_sta_connected.authmode = info.wifi_sta_authmode_change.new_mode; - addLog(LOG_LEVEL_INFO, F("STA_AUTHMODE_CHANGE")); - break; - case ARDUINO_EVENT_WIFI_STA_GOT_IP: - - for (size_t i = 0; i < NR_ELEMENTS(_dns_cache); ++i) { - auto tmp = WiFi.STA.dnsIP(i); - - if (tmp != INADDR_NONE) { - _dns_cache[i] = tmp; - addLog(LOG_LEVEL_INFO, strformat(F("DNS Cache %d set to %s"), i, tmp.toString(true).c_str())); - } - - } - _gotIPStats.setOn(); - addLog(LOG_LEVEL_INFO, F("STA_GOT_IP")); - break; -# if FEATURE_USE_IPV6 - case ARDUINO_EVENT_WIFI_STA_GOT_IP6: - _gotIP6Stats.setOn(); - - addLog(LOG_LEVEL_INFO, F("STA_GOT_IP6")); - break; -# endif // if FEATURE_USE_IPV6 - case ARDUINO_EVENT_WIFI_STA_LOST_IP: - _gotIPStats.setOff(); -# if FEATURE_USE_IPV6 - _gotIP6Stats.setOff(); -# endif - - addLog(LOG_LEVEL_INFO, F("STA_LOST_IP")); - break; - - default: - break; - } - - if (clear_wifi_event_sta_connected) { - memset(&_wifi_event_sta_connected, 0, sizeof(_wifi_event_sta_connected)); - } -} - -# endif // ifdef ESP32 - } // namespace wifi } // namespace net } // namespace ESPEasy diff --git a/src/ESPEasy/net/NWPluginStructs/NW001_data_struct_WiFi_STA.h b/src/ESPEasy/net/NWPluginStructs/NW001_data_struct_WiFi_STA.h index 6a57c207e..ecbfc5e96 100644 --- a/src/ESPEasy/net/NWPluginStructs/NW001_data_struct_WiFi_STA.h +++ b/src/ESPEasy/net/NWPluginStructs/NW001_data_struct_WiFi_STA.h @@ -3,6 +3,13 @@ #include "../_NWPlugin_Helper.h" #ifdef USES_NW001 +#ifdef ESP8266 +#include "../wifi/ESPEasyWiFi_STA_Event_ESP8266.h" +#endif +#ifdef ESP32 +#include "../wifi/ESPEasyWiFi_STA_Event_ESP32.h" +#endif + namespace ESPEasy { namespace net { @@ -29,12 +36,7 @@ struct NW001_data_struct_WiFi_STA : public NWPluginData_base { private: -# ifdef ESP32 - static void onEvent(arduino_event_id_t event, - arduino_event_info_t info); - - network_event_handle_t nw_event_id = 0; -# endif // ifdef ESP32 +ESPEasyWiFi_STA_EventHandler _WiFiEventHandler{}; }; diff --git a/src/ESPEasy/net/NWPluginStructs/NW002_data_struct_WiFi_AP.cpp b/src/ESPEasy/net/NWPluginStructs/NW002_data_struct_WiFi_AP.cpp index b56bb0f66..62b42241d 100644 --- a/src/ESPEasy/net/NWPluginStructs/NW002_data_struct_WiFi_AP.cpp +++ b/src/ESPEasy/net/NWPluginStructs/NW002_data_struct_WiFi_AP.cpp @@ -11,12 +11,13 @@ # include "../wifi/ESPEasyWifi.h" # define NW_PLUGIN_ID 2 +# define NW_PLUGIN_INTERFACE WiFi.AP namespace ESPEasy { namespace net { namespace wifi { -static LongTermOnOffTimer _startStopStats; +static LongTermOnOffTimer _startStopStats{}; NW002_data_struct_WiFi_AP::NW002_data_struct_WiFi_AP(networkIndex_t networkIndex) @@ -53,7 +54,7 @@ bool NW002_data_struct_WiFi_AP::init(EventStruct *event) bool NW002_data_struct_WiFi_AP::exit(EventStruct *event) { # ifdef ESP32 - WiFi.AP.end(); + NW_PLUGIN_INTERFACE.end(); # endif # ifdef ESP8266 @@ -69,11 +70,11 @@ bool NW002_data_struct_WiFi_AP::handle_priority_route_changed() { bool res{}; - // WiFi.AP.enableNAPT(false); + // NW_PLUGIN_INTERFACE.enableNAPT(false); - if (!WiFi.AP.isDefault()) { + if (!NW_PLUGIN_INTERFACE.isDefault()) { // FIXME TD-er: May need to stop/start NAPT on WiFi.AP - // WiFi.AP.enableNAPT(true); + // NW_PLUGIN_INTERFACE.enableNAPT(true); } return res; diff --git a/src/ESPEasy/net/NWPluginStructs/NW003_data_struct_ETH_RMII.cpp b/src/ESPEasy/net/NWPluginStructs/NW003_data_struct_ETH_RMII.cpp index 136050b22..eea092ddd 100644 --- a/src/ESPEasy/net/NWPluginStructs/NW003_data_struct_ETH_RMII.cpp +++ b/src/ESPEasy/net/NWPluginStructs/NW003_data_struct_ETH_RMII.cpp @@ -9,16 +9,17 @@ # include "../../../src/Helpers/StringConverter.h" # define NW_PLUGIN_ID 3 +# define NW_PLUGIN_INTERFACE ETH namespace ESPEasy { namespace net { namespace eth { -static LongTermOnOffTimer _startStopStats; -static LongTermOnOffTimer _connectedStats; -static LongTermOnOffTimer _gotIPStats; +static LongTermOnOffTimer _startStopStats{}; +static LongTermOnOffTimer _connectedStats{}; +static LongTermOnOffTimer _gotIPStats{}; # if FEATURE_USE_IPV6 -static LongTermOnOffTimer _gotIP6Stats; +static LongTermOnOffTimer _gotIP6Stats{}; # endif static IPAddress _dns_cache[2]{}; @@ -59,10 +60,11 @@ bool NW003_data_struct_ETH_RMII::handle_priority_route_changed() { bool res{}; - if (ETH.isDefault()) { + if (NW_PLUGIN_INTERFACE.isDefault()) { + if (NWPlugin::forceDHCP_request(&NW_PLUGIN_INTERFACE)) return true; // Check to see if we may need to restore any cached DNS server for (size_t i = 0; i < NR_ELEMENTS(_dns_cache); ++i) { - auto tmp = ETH.dnsIP(i); + auto tmp = NW_PLUGIN_INTERFACE.dnsIP(i); if ((_dns_cache[i] != INADDR_NONE) && (_dns_cache[i] != tmp)) { addLog(LOG_LEVEL_INFO, strformat( @@ -72,7 +74,7 @@ bool NW003_data_struct_ETH_RMII::handle_priority_route_changed() _dns_cache[i].toString().c_str() )); - ETH.dnsIP(i, _dns_cache[i]); + NW_PLUGIN_INTERFACE.dnsIP(i, _dns_cache[i]); res = true; } } @@ -104,7 +106,7 @@ void NW003_data_struct_ETH_RMII::onEvent(arduino_event_id_t event, case ARDUINO_EVENT_ETH_GOT_IP: for (size_t i = 0; i < NR_ELEMENTS(_dns_cache); ++i) { - auto tmp = ETH.dnsIP(i); + auto tmp = NW_PLUGIN_INTERFACE.dnsIP(i); if (tmp != INADDR_NONE) { _dns_cache[i] = tmp; diff --git a/src/ESPEasy/net/NWPluginStructs/NW004_data_struct_ETH_SPI.cpp b/src/ESPEasy/net/NWPluginStructs/NW004_data_struct_ETH_SPI.cpp index 8a10c1ac7..61cb7105a 100644 --- a/src/ESPEasy/net/NWPluginStructs/NW004_data_struct_ETH_SPI.cpp +++ b/src/ESPEasy/net/NWPluginStructs/NW004_data_struct_ETH_SPI.cpp @@ -9,16 +9,17 @@ # include "../../../src/Helpers/StringConverter.h" # define NW_PLUGIN_ID 4 +# define NW_PLUGIN_INTERFACE ETH namespace ESPEasy { namespace net { namespace eth { -static LongTermOnOffTimer _startStopStats; -static LongTermOnOffTimer _connectedStats; -static LongTermOnOffTimer _gotIPStats; +static LongTermOnOffTimer _startStopStats{}; +static LongTermOnOffTimer _connectedStats{}; +static LongTermOnOffTimer _gotIPStats{}; # if FEATURE_USE_IPV6 -static LongTermOnOffTimer _gotIP6Stats; +static LongTermOnOffTimer _gotIP6Stats{}; # endif static IPAddress _dns_cache[2]{}; @@ -62,10 +63,11 @@ bool NW004_data_struct_ETH_SPI::handle_priority_route_changed() { bool res{}; - if (ETH.isDefault()) { + if (NW_PLUGIN_INTERFACE.isDefault()) { + if (NWPlugin::forceDHCP_request(&NW_PLUGIN_INTERFACE)) return true; // Check to see if we may need to restore any cached DNS server for (size_t i = 0; i < NR_ELEMENTS(_dns_cache); ++i) { - auto tmp = ETH.dnsIP(i); + auto tmp = NW_PLUGIN_INTERFACE.dnsIP(i); if ((_dns_cache[i] != INADDR_NONE) && (_dns_cache[i] != tmp)) { addLog(LOG_LEVEL_INFO, strformat( @@ -75,7 +77,7 @@ bool NW004_data_struct_ETH_SPI::handle_priority_route_changed() _dns_cache[i].toString().c_str() )); - ETH.dnsIP(i, _dns_cache[i]); + NW_PLUGIN_INTERFACE.dnsIP(i, _dns_cache[i]); res = true; } } @@ -107,7 +109,7 @@ void NW004_data_struct_ETH_SPI::onEvent(arduino_event_id_t event, case ARDUINO_EVENT_ETH_GOT_IP: for (size_t i = 0; i < NR_ELEMENTS(_dns_cache); ++i) { - auto tmp = ETH.dnsIP(i); + auto tmp = NW_PLUGIN_INTERFACE.dnsIP(i); if (tmp != INADDR_NONE) { _dns_cache[i] = tmp; diff --git a/src/ESPEasy/net/NWPluginStructs/NW005_data_struct_PPP_modem.cpp b/src/ESPEasy/net/NWPluginStructs/NW005_data_struct_PPP_modem.cpp index a20d8c1a6..2f9886331 100644 --- a/src/ESPEasy/net/NWPluginStructs/NW005_data_struct_PPP_modem.cpp +++ b/src/ESPEasy/net/NWPluginStructs/NW005_data_struct_PPP_modem.cpp @@ -21,17 +21,18 @@ // #include # define NW_PLUGIN_ID 5 +# define NW_PLUGIN_INTERFACE PPP namespace ESPEasy { namespace net { namespace ppp { -static LongTermOnOffTimer _startStopStats; -static LongTermOnOffTimer _connectedStats; -static LongTermOnOffTimer _gotIPStats; +static LongTermOnOffTimer _startStopStats{}; +static LongTermOnOffTimer _connectedStats{}; +static LongTermOnOffTimer _gotIPStats{}; # if FEATURE_USE_IPV6 -static LongTermOnOffTimer _gotIP6Stats; +static LongTermOnOffTimer _gotIP6Stats{}; # endif static IPAddress _dns_cache[2]{}; @@ -116,8 +117,8 @@ NW005_data_struct_PPP_modem::~NW005_data_struct_PPP_modem() { vTaskDelete(_modem_task_data.modem_taskHandle); _modem_task_data.modem_taskHandle = NULL; } - PPP.mode(ESP_MODEM_MODE_COMMAND); - PPP.end(); + NW_PLUGIN_INTERFACE.mode(ESP_MODEM_MODE_COMMAND); + NW_PLUGIN_INTERFACE.end(); _modem_task_data.modem_initialized = false; if (nw_event_id != 0) { @@ -167,7 +168,7 @@ ppp_modem_model_t to_ppp_modem_model_t(NW005_modem_model NW005_modemmodel) String NW005_data_struct_PPP_modem::getRSSI() const { if (!_modem_task_data.modem_initialized) { return F("-"); } - const int rssi_raw = PPP.RSSI(); + const int rssi_raw = NW_PLUGIN_INTERFACE.RSSI(); if (rssi_raw == 99) { return F("-"); } // Not known or not detectable @@ -180,7 +181,7 @@ String NW005_data_struct_PPP_modem::getRSSI() const String NW005_data_struct_PPP_modem::getBER() const { if (_modem_task_data.modem_initialized) { - switch (PPP.BER()) + switch (NW_PLUGIN_INTERFACE.BER()) { case 0: return F("<0.01 %"); case 1: return F("0.01 % ... 0.1 %"); @@ -199,19 +200,19 @@ String NW005_data_struct_PPP_modem::getBER() const bool NW005_data_struct_PPP_modem::attached() const { if (!_modem_task_data.modem_initialized) { return false; } - return PPP.attached(); + return NW_PLUGIN_INTERFACE.attached(); } String NW005_data_struct_PPP_modem::IMEI() const { if (!_modem_task_data.modem_initialized) { return EMPTY_STRING; } - return PPP.IMEI(); + return NW_PLUGIN_INTERFACE.IMEI(); } String NW005_data_struct_PPP_modem::operatorName() const { if (!_modem_task_data.modem_initialized) { return EMPTY_STRING; } - return PPP.operatorName(); + return NW_PLUGIN_INTERFACE.operatorName(); } const __FlashStringHelper* NW005_decode_label(int sysmode_index, uint8_t i, String& value_str) @@ -297,7 +298,7 @@ const __FlashStringHelper* NW005_decode_label(int sysmode_index, uint8_t i, Stri void NW005_data_struct_PPP_modem::webform_load_UE_system_information() { - if (!PPP.attached()) { + if (!NW_PLUGIN_INTERFACE.attached()) { // clear cached string _modem_task_data.AT_CPSI.clear(); return; @@ -506,28 +507,28 @@ void NW005_data_struct_PPP_modem::webform_load(EventStruct *event) return; } - addHtml_pre(PPP.moduleName()); + addHtml_pre(NW_PLUGIN_INTERFACE.moduleName()); addRowLabel(F("IMEI")); - addHtml_pre(PPP.IMEI()); + addHtml_pre(NW_PLUGIN_INTERFACE.IMEI()); addRowLabel(F("IMSI")); - addHtml_pre(PPP.IMSI()); + addHtml_pre(NW_PLUGIN_INTERFACE.IMSI()); - if (PPP.attached()) { - const String operatorName = PPP.operatorName(); + if (NW_PLUGIN_INTERFACE.attached()) { + const String operatorName = NW_PLUGIN_INTERFACE.operatorName(); addRowLabel(F("Mobile Country Code (MCC)")); addHtml_pre(operatorName.substring(0, 3)); addRowLabel(F("Mobile Network Code (MNC)")); addHtml_pre(operatorName.substring(3)); addFormNote(F("See Wikipedia - Mobile Country Code")); - if (PPP.mode() != ESP_MODEM_MODE_CMUX) { - PPP.mode(ESP_MODEM_MODE_CMUX); + if (NW_PLUGIN_INTERFACE.mode() != ESP_MODEM_MODE_CMUX) { + NW_PLUGIN_INTERFACE.mode(ESP_MODEM_MODE_CMUX); } /* { - String res = PPP.cmd("AT+CPSI?", 1000); + String res = NW_PLUGIN_INTERFACE.cmd("AT+CPSI?", 1000); if (!res.isEmpty()) { addRowLabel(F("AT+CPSI?")); @@ -536,7 +537,7 @@ void NW005_data_struct_PPP_modem::webform_load(EventStruct *event) }*/ /* { - String res = PPP.cmd("AT+CPSITD?", 1000); + String res = NW_PLUGIN_INTERFACE.cmd("AT+CPSITD?", 1000); if (!res.isEmpty()) { addRowLabel(F("AT+CPSITD?")); @@ -555,9 +556,9 @@ void NW005_data_struct_PPP_modem::webform_load(EventStruct *event) addHtml(getBER()); addRowLabel(F("Radio State")); - addHtml((PPP.radioState() == 0) ? F("Minimal") : F("Full")); + addHtml((NW_PLUGIN_INTERFACE.radioState() == 0) ? F("Minimal") : F("Full")); - int networkMode = PPP.networkMode(); + int networkMode = NW_PLUGIN_INTERFACE.networkMode(); if (networkMode >= 0) { addRowLabel(F("Network Mode")); @@ -589,7 +590,7 @@ void NW005_data_struct_PPP_modem::webform_load(EventStruct *event) } { - int batStatus = PPP.batteryStatus(); + int batStatus = NW_PLUGIN_INTERFACE.batteryStatus(); addRowLabel(F("Battery Status")); const __FlashStringHelper*str = F("Not Available"); @@ -605,7 +606,7 @@ void NW005_data_struct_PPP_modem::webform_load(EventStruct *event) addHtml(str); if (batStatus >= 0) { - int batVolt = PPP.batteryVoltage(); + int batVolt = NW_PLUGIN_INTERFACE.batteryVoltage(); if (batVolt >= 0) { addRowLabel(F("Battery Voltage")); @@ -613,7 +614,7 @@ void NW005_data_struct_PPP_modem::webform_load(EventStruct *event) addUnit(F("mV")); } - int batLevel = PPP.batteryLevel(); + int batLevel = NW_PLUGIN_INTERFACE.batteryLevel(); if (batLevel >= 0) { addRowLabel(F("Battery Level")); @@ -625,7 +626,7 @@ void NW005_data_struct_PPP_modem::webform_load(EventStruct *event) // TODO TD-er: Disabled for now, missing PdpContext /* - esp_modem_dce_t *handle = PPP.handle(); + esp_modem_dce_t *handle = NW_PLUGIN_INTERFACE.handle(); if (handle) { int state{}; @@ -666,8 +667,8 @@ void NW005_data_struct_PPP_modem::webform_load(EventStruct *event) webform_load_UE_system_information(); - if (PPP.attached()) { - PPP.mode(ESP_MODEM_MODE_DATA); + if (NW_PLUGIN_INTERFACE.attached()) { + NW_PLUGIN_INTERFACE.mode(ESP_MODEM_MODE_DATA); } } @@ -741,15 +742,15 @@ void NW005_begin_modem_task(void *parameter) if (!modem_task_data->modem_initialized) { modem_task_data->initializing = true; const bool res = - PPP.begin( + NW_PLUGIN_INTERFACE.begin( modem_task_data->model, modem_task_data->uart_num, modem_task_data->baud_rate); modem_task_data->initializing = false; modem_task_data->logString = strformat( F("PPP: Module Name: %s, IMEI: %s"), - PPP.moduleName().c_str(), - PPP.IMEI().c_str()); + NW_PLUGIN_INTERFACE.moduleName().c_str(), + NW_PLUGIN_INTERFACE.IMEI().c_str()); if (res) { @@ -759,10 +760,10 @@ void NW005_begin_modem_task(void *parameter) { delay(100); } - while (timePassedSince(start) < 5000 && !PPP.attached()); + while (timePassedSince(start) < 5000 && !NW_PLUGIN_INTERFACE.attached()); - PPP.mode(ESP_MODEM_MODE_CMUX); - modem_task_data->AT_CPSI = PPP.cmd(F("AT+CPSI?"), 3000); + NW_PLUGIN_INTERFACE.mode(ESP_MODEM_MODE_CMUX); + modem_task_data->AT_CPSI = NW_PLUGIN_INTERFACE.cmd(F("AT+CPSI?"), 3000); } modem_task_data->modem_initialized = res; } @@ -782,7 +783,7 @@ bool NW005_data_struct_PPP_modem::init(EventStruct *event) return false; } - PPP.setResetPin( + NW_PLUGIN_INTERFACE.setResetPin( _kvs->getValueAsInt_or_default(NW005_KEY_PIN_RESET, -1), _kvs->getValueAsInt_or_default(NW005_KEY_PIN_RESET_ACTIVE_LOW, 0), _kvs->getValueAsInt_or_default(NW005_KEY_PIN_RESET_DELAY, 200)); @@ -799,7 +800,7 @@ bool NW005_data_struct_PPP_modem::init(EventStruct *event) } } - if (!PPP.setPins( + if (!NW_PLUGIN_INTERFACE.setPins( _kvs->getValueAsInt_or_default(NW005_KEY_PIN_TX, -1), _kvs->getValueAsInt_or_default(NW005_KEY_PIN_RX, -1), rtsPin, @@ -812,14 +813,14 @@ bool NW005_data_struct_PPP_modem::init(EventStruct *event) { String apn; _kvs->getValue(NW005_KEY_APN, apn); - PPP.setApn(apn.c_str()); + NW_PLUGIN_INTERFACE.setApn(apn.c_str()); } { String pin; _kvs->getValue(NW005_KEY_SIM_PIN, pin); if (pin.length() >= 4) { - PPP.setPin(pin.c_str()); + NW_PLUGIN_INTERFACE.setPin(pin.c_str()); } } @@ -882,8 +883,8 @@ bool NW005_data_struct_PPP_modem::exit(EventStruct *event) vTaskDelete(_modem_task_data.modem_taskHandle); _modem_task_data.modem_taskHandle = NULL; } - PPP.mode(ESP_MODEM_MODE_COMMAND); - PPP.end(); + NW_PLUGIN_INTERFACE.mode(ESP_MODEM_MODE_COMMAND); + NW_PLUGIN_INTERFACE.end(); _modem_task_data.modem_initialized = false; return true; } @@ -892,10 +893,11 @@ bool NW005_data_struct_PPP_modem::handle_priority_route_changed() { bool res{}; - if (PPP.isDefault()) { + if (NW_PLUGIN_INTERFACE.isDefault()) { + if (NWPlugin::forceDHCP_request(&NW_PLUGIN_INTERFACE)) { return true; } // Check to see if we may need to restore any cached DNS server for (size_t i = 0; i < NR_ELEMENTS(_dns_cache); ++i) { - auto tmp = PPP.dnsIP(i); + auto tmp = NW_PLUGIN_INTERFACE.dnsIP(i); if ((_dns_cache[i] != INADDR_NONE) && (_dns_cache[i] != tmp)) { addLog(LOG_LEVEL_INFO, strformat( @@ -905,7 +907,7 @@ bool NW005_data_struct_PPP_modem::handle_priority_route_changed() _dns_cache[i].toString().c_str() )); - PPP.dnsIP(i, _dns_cache[i]); + NW_PLUGIN_INTERFACE.dnsIP(i, _dns_cache[i]); res = true; } } @@ -916,13 +918,13 @@ bool NW005_data_struct_PPP_modem::handle_priority_route_changed() String NW005_data_struct_PPP_modem::write_AT_cmd(const String& cmd, int timeout) { String res; - auto cur_mode = PPP.mode(); + auto cur_mode = NW_PLUGIN_INTERFACE.mode(); - if (PPP.mode() != ESP_MODEM_MODE_CMUX) { - PPP.mode(ESP_MODEM_MODE_CMUX); - res = PPP.cmd(cmd.c_str(), timeout); + if (NW_PLUGIN_INTERFACE.mode() != ESP_MODEM_MODE_CMUX) { + NW_PLUGIN_INTERFACE.mode(ESP_MODEM_MODE_CMUX); + res = NW_PLUGIN_INTERFACE.cmd(cmd.c_str(), timeout); } - PPP.mode(cur_mode); + NW_PLUGIN_INTERFACE.mode(cur_mode); return res; } @@ -938,7 +940,7 @@ void NW005_data_struct_PPP_modem::onEvent(arduino_event_id_t event, arduino_even case ARDUINO_EVENT_PPP_START: addLog(LOG_LEVEL_INFO, F("PPP Started")); _startStopStats.setOn(); # if ESP_IDF_VERSION >= ESP_IDF_VERSION_VAL(5, 5, 0) - PPP.setRoutePrio(200); + NW_PLUGIN_INTERFACE.setRoutePrio(200); # endif break; case ARDUINO_EVENT_PPP_STOP: addLog(LOG_LEVEL_INFO, F("PPP Stopped")); @@ -959,7 +961,7 @@ void NW005_data_struct_PPP_modem::onEvent(arduino_event_id_t event, arduino_even case ARDUINO_EVENT_PPP_GOT_IP: for (size_t i = 0; i < NR_ELEMENTS(_dns_cache); ++i) { - auto tmp = PPP.dnsIP(i); + auto tmp = NW_PLUGIN_INTERFACE.dnsIP(i); if (tmp != INADDR_NONE) { _dns_cache[i] = tmp; @@ -971,7 +973,7 @@ void NW005_data_struct_PPP_modem::onEvent(arduino_event_id_t event, arduino_even _gotIPStats.setOn(); addLog(LOG_LEVEL_INFO, F("PPP Got IP")); - // PPP.setDefault(); + // NW_PLUGIN_INTERFACE.setDefault(); if (WiFi.AP.enableNAPT(true)) { addLog(LOG_LEVEL_INFO, F("WiFi.AP.enableNAPT")); diff --git a/src/ESPEasy/net/eth/ESPEasyEth_ProcessEvent.cpp b/src/ESPEasy/net/eth/ESPEasyEth_ProcessEvent.cpp index b0a0eaac7..d182d311d 100644 --- a/src/ESPEasy/net/eth/ESPEasyEth_ProcessEvent.cpp +++ b/src/ESPEasy/net/eth/ESPEasyEth_ProcessEvent.cpp @@ -62,7 +62,7 @@ void handle_unprocessedEthEvents() { if (!EthEventData.EthServicesInitialized() || EthEventData.unprocessedEthEvents()) { if (!EthEventData.unprocessedEthEvents() && EthEventData.EthConnectAllowed()) { - NetworkConnectRelaxed(); +// NetworkConnectRelaxed(); } if (!EthEventData.processedGotIP) { diff --git a/src/ESPEasy/net/wifi/ESPEasyWiFiEvent_ESP32.cpp b/src/ESPEasy/net/wifi/ESPEasyWiFiEvent_ESP32.cpp deleted file mode 100644 index 9556629b8..000000000 --- a/src/ESPEasy/net/wifi/ESPEasyWiFiEvent_ESP32.cpp +++ /dev/null @@ -1,206 +0,0 @@ -#include "../wifi/ESPEasyWiFiEvent_ESP32.h" - -#if FEATURE_WIFI - -# ifdef ESP32 -# if FEATURE_ETHERNET -# include -# endif // if FEATURE_ETHERNET -# if FEATURE_PPP_MODEM -# include -# endif - -# include "../../../src/DataStructs/RTCStruct.h" -# include "../../../src/DataTypes/ESPEasyTimeSource.h" -# include "../../../src/ESPEasyCore/ESPEasy_Log.h" -# include "../../../src/Globals/RTC.h" -# include "../Globals/WiFi_AP_Candidates.h" -# include "../../../src/Helpers/ESPEasy_time_calc.h" -# include "../../../src/Helpers/StringConverter.h" -# include "../../net/ESPEasyNetwork.h" -# include "../Globals/ESPEasyWiFiEvent.h" -# include "../Globals/NetworkState.h" -# include "../eth/ESPEasyEth.h" -# include "../wifi/ESPEasyWifi.h" -# include "../wifi/ESPEasyWifi_ProcessEvent.h" - -# if FEATURE_ETHERNET -# include "../Globals/ESPEasyEthEvent.h" -# endif // if FEATURE_ETHERNET - -namespace ESPEasy { -namespace net { -namespace wifi { - -void setUseStaticIP(bool enabled) {} - -// ******************************************************************************** -// Functions called on events. -// Make sure not to call anything in these functions that result in delay() or yield() -// ******************************************************************************** -# include - -static bool ignoreDisconnectEvent = false; - -void WiFiEvent(WiFiEvent_t event_id, arduino_event_info_t info) { - switch (event_id) - { - case ARDUINO_EVENT_WIFI_READY: - // ESP32 WiFi ready - break; - case ARDUINO_EVENT_WIFI_STA_START: - # ifndef BUILD_NO_DEBUG - - // addLog(LOG_LEVEL_INFO, F("WiFi : Event STA Started")); - # endif // ifndef BUILD_NO_DEBUG - break; - case ARDUINO_EVENT_WIFI_STA_STOP: - # ifndef BUILD_NO_DEBUG - - // addLog(LOG_LEVEL_INFO, F("WiFi : Event STA Stopped")); - # endif // ifndef BUILD_NO_DEBUG - break; - case ARDUINO_EVENT_WIFI_OFF: - # ifndef BUILD_NO_DEBUG - - // addLog(LOG_LEVEL_INFO, F("WiFi : Event WIFI off")); - # endif // ifndef BUILD_NO_DEBUG - break; - - case ARDUINO_EVENT_WIFI_AP_START: - # ifndef BUILD_NO_DEBUG - - // addLog(LOG_LEVEL_INFO, F("WiFi : Event AP Started")); - # endif // ifndef BUILD_NO_DEBUG - break; - case ARDUINO_EVENT_WIFI_AP_STOP: - # ifndef BUILD_NO_DEBUG - - // addLog(LOG_LEVEL_INFO, F("WiFi : Event AP Stopped")); - # endif // ifndef BUILD_NO_DEBUG - break; - case ARDUINO_EVENT_WIFI_STA_LOST_IP: - // ESP32 station lost IP and the IP is reset to 0 - # if FEATURE_ETHERNET - - if (active_network_medium == NetworkMedium_t::Ethernet) { - // DNS records are shared among WiFi and Ethernet (very bad design!) - // So we must restore the DNS records for Ethernet in case we started with WiFi and then plugged in Ethernet. - // As soon as WiFi is turned off, the DNS entry for Ethernet is cleared. - EthEventData.markLostIP(); - } - # endif // if FEATURE_ETHERNET - WiFiEventData.markLostIP(); - # ifndef BUILD_NO_DEBUG - - // addLog(LOG_LEVEL_INFO, - - /* - active_network_medium == NetworkMedium_t::Ethernet ? - F("ETH : Event Lost IP") : - */ - - // F("WiFi : Event Lost IP")); - # endif // ifndef BUILD_NO_DEBUG - break; - - case ARDUINO_EVENT_WIFI_AP_PROBEREQRECVED: - // Receive probe request packet in soft-AP interface - // TODO TD-er: Must implement like onProbeRequestAPmode for ESP8266 - # ifndef BUILD_NO_DEBUG - - // addLog(LOG_LEVEL_INFO, F("WiFi : Event AP got probed")); - # endif // ifndef BUILD_NO_DEBUG - break; - - case ARDUINO_EVENT_WIFI_STA_AUTHMODE_CHANGE: - WiFiEventData.setAuthMode(info.wifi_sta_authmode_change.new_mode); - break; - - case ARDUINO_EVENT_WIFI_STA_CONNECTED: - { - char ssid_copy[33]; // Ensure space for maximum len SSID (32) plus trailing 0 - memcpy(ssid_copy, info.wifi_sta_connected.ssid, info.wifi_sta_connected.ssid_len); - ssid_copy[32] = 0; // Potentially add 0-termination if none present earlier - WiFiEventData.markConnected((const char *)ssid_copy, info.wifi_sta_connected.bssid, info.wifi_sta_connected.channel); - WiFiEventData.setAuthMode(info.wifi_sta_connected.authmode); - - // addLog(LOG_LEVEL_INFO, F("WiFi : Event WIFI_STA_CONNECTED")); - break; - } - case ARDUINO_EVENT_WIFI_STA_DISCONNECTED: - WiFiEventData.markDisconnect(static_cast(info.wifi_sta_disconnected.reason)); - break; - case ARDUINO_EVENT_WIFI_STA_GOT_IP: - { - // FIXME TD-er: Must also check event->esp_netif to see which interface got this event. - ignoreDisconnectEvent = false; - ip_event_got_ip_t *event = static_cast(&info.got_ip); - const IPAddress ip(event->ip_info.ip.addr); - const IPAddress netmask(event->ip_info.netmask.addr); - const IPAddress gw(event->ip_info.gw.addr); - WiFiEventData.markGotIP(ip, netmask, gw); - break; - } - # if FEATURE_USE_IPV6 - case ARDUINO_EVENT_WIFI_STA_GOT_IP6: - { - ip_event_got_ip6_t *event = static_cast(&info.got_ip6); - const IPAddress ip(IPv6, (const uint8_t *)event->ip6_info.ip.addr, event->ip6_info.ip.zone); - WiFiEventData.markGotIPv6(ip); - break; - } - case ARDUINO_EVENT_WIFI_AP_GOT_IP6: - addLog(LOG_LEVEL_INFO, F("WIFI : AP got IP6")); - break; - # endif // if FEATURE_USE_IPV6 - case ARDUINO_EVENT_WIFI_AP_STAIPASSIGNED: - addLog(LOG_LEVEL_INFO, F("WIFI : AP assigned IP to STA")); - break; - case ARDUINO_EVENT_WIFI_AP_STACONNECTED: - WiFiEventData.markConnectedAPmode(info.wifi_ap_staconnected.mac); - break; - case ARDUINO_EVENT_WIFI_AP_STADISCONNECTED: - WiFiEventData.markDisconnectedAPmode(info.wifi_ap_stadisconnected.mac); - break; - case ARDUINO_EVENT_WIFI_SCAN_DONE: - WiFiEventData.processedScanDone = false; - break; -# if FEATURE_ETHERNET - case ARDUINO_EVENT_ETH_START: - case ARDUINO_EVENT_ETH_CONNECTED: - case ARDUINO_EVENT_ETH_GOT_IP: - case ARDUINO_EVENT_ETH_DISCONNECTED: - case ARDUINO_EVENT_ETH_STOP: - case ARDUINO_EVENT_ETH_GOT_IP6: - - // Handled in EthEvent - break; -# endif // FEATURE_ETHERNET - -# if FEATURE_PPP_MODEM - - case ARDUINO_EVENT_PPP_START: - case ARDUINO_EVENT_PPP_CONNECTED: - case ARDUINO_EVENT_PPP_GOT_IP: - case ARDUINO_EVENT_PPP_LOST_IP: - case ARDUINO_EVENT_PPP_DISCONNECTED: - case ARDUINO_EVENT_PPP_STOP: - // Handled in NW005_data_struct_PPP_modem - break; - -# endif // if FEATURE_PPP_MODEM - - default: - { - addLogMove(LOG_LEVEL_ERROR, concat(F("UNKNOWN WIFI/ETH EVENT: "), event_id)); - break; - } - } -} - -} // namespace wifi -} // namespace net -} // namespace ESPEasy -# endif // ifdef ESP32 -#endif // if FEATURE_WIFI diff --git a/src/ESPEasy/net/wifi/ESPEasyWiFiEvent_ESP32.h b/src/ESPEasy/net/wifi/ESPEasyWiFiEvent_ESP32.h deleted file mode 100644 index decdb05d9..000000000 --- a/src/ESPEasy/net/wifi/ESPEasyWiFiEvent_ESP32.h +++ /dev/null @@ -1,46 +0,0 @@ -#pragma once - -#include "../../../ESPEasy_common.h" - -#if FEATURE_WIFI -# ifdef ESP32 - -# include - -// ******************************************************************************** - -// Work-around for setting _useStaticIP -// See reported issue: https://github.com/esp8266/Arduino/issues/4114 -// ******************************************************************************** -# include -# include -# include -# include - -namespace ESPEasy { -namespace net { -namespace wifi { - -class WiFi_Access_Static_IP : public WiFiSTAClass -{ -public: - - void set_use_static_ip(bool enabled); -}; - -void setUseStaticIP(bool enabled); - - -// ******************************************************************************** -// Functions called on events. -// Make sure not to call anything in these functions that result in delay() or yield() -// ******************************************************************************** -void WiFiEvent(WiFiEvent_t event, - arduino_event_info_t info); - -} // namespace wifi -} // namespace net -} // namespace ESPEasy - -# endif // ifdef ESP32 -#endif // if FEATURE_WIFI diff --git a/src/ESPEasy/net/wifi/ESPEasyWiFiEvent_ESP8266.cpp b/src/ESPEasy/net/wifi/ESPEasyWiFiEvent_ESP8266.cpp deleted file mode 100644 index 2c945bbb3..000000000 --- a/src/ESPEasy/net/wifi/ESPEasyWiFiEvent_ESP8266.cpp +++ /dev/null @@ -1,118 +0,0 @@ -#include "../wifi/ESPEasyWiFiEvent_ESP8266.h" - -#if FEATURE_WIFI -# ifdef ESP8266 - -# include "../../../src/DataStructs/RTCStruct.h" -# include "../../../src/DataTypes/ESPEasyTimeSource.h" -# include "../../../src/ESPEasyCore/ESPEasy_Log.h" -# include "../../../src/Globals/RTC.h" -# include "../Globals/WiFi_AP_Candidates.h" -# include "../../../src/Helpers/ESPEasy_time_calc.h" - -# include "../ESPEasyNetwork.h" -# include "../wifi/ESPEasyWifi.h" -# include "../wifi/ESPEasyWifi_ProcessEvent.h" - -# include "../Globals/ESPEasyWiFiEvent.h" -# include "../Globals/NetworkState.h" - - -namespace ESPEasy { -namespace net { -namespace wifi { - -void WiFi_Access_Static_IP::set_use_static_ip(bool enabled) { _useStaticIp = enabled; } - -void setUseStaticIP(bool enabled) { - WiFi_Access_Static_IP tmp_wifi; - - tmp_wifi.set_use_static_ip(enabled); -} - -// ******************************************************************************** -// Functions called on events. -// Make sure not to call anything in these functions that result in delay() or yield() -// ******************************************************************************** -void onConnected(const WiFiEventStationModeConnected& event) { WiFiEventData.markConnected(event.ssid, event.bssid, event.channel); } - -void onDisconnect(const WiFiEventStationModeDisconnected& event) { - WiFiEventData.markDisconnect(event.reason); - - if (WiFi.status() == WL_CONNECTED) { - // See https://github.com/esp8266/Arduino/issues/5912 - WiFi.persistent(false); - WiFi.disconnect(false); - delay(0); - } -} - -void onGotIP(const WiFiEventStationModeGotIP& event) -{ - WiFiEventData.markGotIP( - event.ip, - event.mask, - event.gw); -} - -void onDHCPTimeout() { WiFiEventData.processedDHCPTimeout = false; } - -void onConnectedAPmode(const WiFiEventSoftAPModeStationConnected& event) { WiFiEventData.markConnectedAPmode(event.mac); } - -void onDisconnectedAPmode(const WiFiEventSoftAPModeStationDisconnected& event) { WiFiEventData.markDisconnectedAPmode(event.mac); } - -void onStationModeAuthModeChanged(const WiFiEventStationModeAuthModeChanged& event) { WiFiEventData.setAuthMode(event.newMode); } - -# if FEATURE_ESP8266_DIRECT_WIFI_SCAN - -void onWiFiScanDone(void *arg, STATUS status) { - if (status == OK) { - auto *head = reinterpret_cast(arg); - int scanCount = 0; - - for (bss_info *it = head; it != nullptr; it = STAILQ_NEXT(it, next)) { - WiFi_AP_Candidates.process_WiFiscan(*it); - ++scanCount; - } - WiFi_AP_Candidates.after_process_WiFiscan(); - WiFiEventData.lastGetScanMoment.setNow(); - - // WiFiEventData.processedScanDone = true; -# ifndef BUILD_NO_DEBUG - - /* - if (loglevelActiveFor(LOG_LEVEL_INFO)) { - addLogMove(LOG_LEVEL_INFO, concat(F("WiFi : Scan finished (ESP8266), found: "), scanCount)); - } - */ -# endif // ifndef BUILD_NO_DEBUG - WiFi_AP_Candidates.load_knownCredentials(); - - if (WiFi_AP_Candidates.addedKnownCandidate() || !NetworkConnected()) { - WiFiEventData.wifiConnectAttemptNeeded = true; - # ifndef BUILD_NO_DEBUG - - if (WiFi_AP_Candidates.addedKnownCandidate()) { - // addLog(LOG_LEVEL_INFO, F("WiFi : Added known candidate, try to connect")); - } - # endif // ifndef BUILD_NO_DEBUG - NetworkConnectRelaxed(); - } - - } - - WiFiMode_t mode = WiFi.getMode(); - ESPEasy::net::wifi::setWifiMode(WIFI_OFF); - delay(1); - ESPEasy::net::wifi::setWifiMode(mode); - delay(1); -} - -# endif // if FEATURE_ESP8266_DIRECT_WIFI_SCAN - -} // namespace wifi -} // namespace net -} // namespace ESPEasy - -# endif // ifdef ESP8266 -#endif // if FEATURE_WIFI diff --git a/src/ESPEasy/net/wifi/ESPEasyWiFiEvent_ESP8266.h b/src/ESPEasy/net/wifi/ESPEasyWiFiEvent_ESP8266.h deleted file mode 100644 index a55b6eb2b..000000000 --- a/src/ESPEasy/net/wifi/ESPEasyWiFiEvent_ESP8266.h +++ /dev/null @@ -1,65 +0,0 @@ -#pragma once - -#include "../../../ESPEasy_common.h" - -#if FEATURE_WIFI - - -# ifdef ESP8266 - - -# include - -// ******************************************************************************** - -// Work-around for setting _useStaticIP -// See reported issue: https://github.com/esp8266/Arduino/issues/4114 -// ******************************************************************************** - -# include -# include - -namespace ESPEasy { -namespace net { -namespace wifi { - -class WiFi_Access_Static_IP : public ESP8266WiFiSTAClass -{ -public: - - void set_use_static_ip(bool enabled); -}; - -void setUseStaticIP(bool enabled); - - -// ******************************************************************************** -// Functions called on events. -// Make sure not to call anything in these functions that result in delay() or yield() -// ******************************************************************************** -void onConnected(const WiFiEventStationModeConnected& event); - -void onDisconnect(const WiFiEventStationModeDisconnected& event); - -void onGotIP(const WiFiEventStationModeGotIP& event); - -void onDHCPTimeout(); - -void onConnectedAPmode(const WiFiEventSoftAPModeStationConnected& event); - -void onDisconnectedAPmode(const WiFiEventSoftAPModeStationDisconnected& event); - -void onStationModeAuthModeChanged(const WiFiEventStationModeAuthModeChanged& event); - -# if FEATURE_ESP8266_DIRECT_WIFI_SCAN -void onWiFiScanDone(void *arg, - STATUS status); -# endif // if FEATURE_ESP8266_DIRECT_WIFI_SCAN - -} // namespace wifi -} // namespace net -} // namespace ESPEasy - -# endif // ifdef ESP8266 - -#endif // if FEATURE_WIFI diff --git a/src/ESPEasy/net/wifi/ESPEasyWiFi_STA_Event_ESP32.cpp b/src/ESPEasy/net/wifi/ESPEasyWiFi_STA_Event_ESP32.cpp new file mode 100644 index 000000000..52872a98f --- /dev/null +++ b/src/ESPEasy/net/wifi/ESPEasyWiFi_STA_Event_ESP32.cpp @@ -0,0 +1,359 @@ +#include "../wifi/ESPEasyWiFi_STA_Event_ESP32.h" + +#if FEATURE_WIFI + +# ifdef ESP32 +# if FEATURE_ETHERNET +# include +# endif // if FEATURE_ETHERNET +# if FEATURE_PPP_MODEM +# include +# endif + +# include "../../../src/DataStructs/RTCStruct.h" +# include "../../../src/DataTypes/ESPEasyTimeSource.h" +# include "../../../src/ESPEasyCore/ESPEasy_Log.h" +# include "../../../src/Globals/RTC.h" +# include "../../../src/Helpers/ESPEasy_time_calc.h" +# include "../../../src/Helpers/StringConverter.h" +# include "../../net/ESPEasyNetwork.h" +# include "../Globals/ESPEasyWiFiEvent.h" +# include "../Globals/NetworkState.h" +# include "../Globals/WiFi_AP_Candidates.h" +# include "../eth/ESPEasyEth.h" +# include "../wifi/ESPEasyWifi.h" +# include "../wifi/ESPEasyWifi_ProcessEvent.h" + +# if FEATURE_ETHERNET +# include "../Globals/ESPEasyEthEvent.h" +# endif // if FEATURE_ETHERNET + +namespace ESPEasy { +namespace net { +namespace wifi { + + +static LongTermOnOffTimer _startStopStats{}; +static LongTermOnOffTimer _connectedStats{}; +static LongTermOnOffTimer _gotIPStats{}; +# if FEATURE_USE_IPV6 +static LongTermOnOffTimer _gotIP6Stats{}; +# endif +static IPAddress _dns_cache[2]{}; +static wifi_event_sta_connected_t _wifi_event_sta_connected; +static WiFiDisconnectReason _wifi_disconnect_reason = WiFiDisconnectReason::WIFI_DISCONNECT_REASON_UNSPECIFIED; + +static bool _ESPEasyWiFi_STA_EventHandler_initialized{}; + +ESPEasyWiFi_STA_EventHandler::ESPEasyWiFi_STA_EventHandler() +{ + _connectedStats.clear(); + _gotIPStats.clear(); +# if FEATURE_USE_IPV6 + _gotIP6Stats.clear(); +# endif + nw_event_id = Network.onEvent(ESPEasyWiFi_STA_EventHandler::WiFiEvent); + memset(&_wifi_event_sta_connected, 0, sizeof(_wifi_event_sta_connected)); + _ESPEasyWiFi_STA_EventHandler_initialized = true; +} + +ESPEasyWiFi_STA_EventHandler::~ESPEasyWiFi_STA_EventHandler() +{ + if (nw_event_id != 0) { + Network.removeEvent(nw_event_id); + } + nw_event_id = 0; + _ESPEasyWiFi_STA_EventHandler_initialized = false; +} + +bool ESPEasyWiFi_STA_EventHandler::initialized() { return _ESPEasyWiFi_STA_EventHandler_initialized; } + +LongTermOnOffTimer ESPEasyWiFi_STA_EventHandler::getEnabled_OnOffTimer() const { return _startStopStats; } + +LongTermOnOffTimer ESPEasyWiFi_STA_EventHandler::getConnected_OnOffTimer() const { return _connectedStats; } + +LongTermOnOffTimer ESPEasyWiFi_STA_EventHandler::getGotIp_OnOffTimer() const { return _gotIPStats; } + +# if FEATURE_USE_IPV6 + +LongTermOnOffTimer ESPEasyWiFi_STA_EventHandler::getGotIp6_OnOffTimer() const { return _gotIP6Stats; } + +# endif // if FEATURE_USE_IPV6 + +WiFiDisconnectReason ESPEasyWiFi_STA_EventHandler::getLastDisconnectReason() const { return _wifi_disconnect_reason; } + +uint8_t ESPEasyWiFi_STA_EventHandler::getAuthMode() const { return _wifi_event_sta_connected.authmode; } + +bool ESPEasyWiFi_STA_EventHandler::restore_dns_from_cache() const +{ + bool res{}; + + if (WiFi.STA.isDefault()) { + // Check to see if we may need to restore any cached DNS server + for (size_t i = 0; i < NR_ELEMENTS(_dns_cache); ++i) { + auto tmp = WiFi.STA.dnsIP(i); + + if ((_dns_cache[i] != INADDR_NONE) && (_dns_cache[i] != tmp)) { + addLog(LOG_LEVEL_INFO, strformat( + F("WiFi STA: Restore cached DNS server %d from %s to %s"), + i, + tmp.toString().c_str(), + _dns_cache[i].toString().c_str() + )); + WiFi.STA.dnsIP(i, _dns_cache[i]); + res = true; + } + } + } + return res; +} + +// ******************************************************************************** +// Functions called on events. +// Make sure not to call anything in these functions that result in delay() or yield() +// ******************************************************************************** +# include + +static bool ignoreDisconnectEvent = false; + +void ESPEasyWiFi_STA_EventHandler::WiFiEvent(WiFiEvent_t event_id, arduino_event_info_t info) { + bool clear_wifi_event_sta_connected = false; + + switch (event_id) + { + case ARDUINO_EVENT_WIFI_OFF: + clear_wifi_event_sta_connected = true; + addLog(LOG_LEVEL_INFO, F("WIFI_OFF")); + break; + case ARDUINO_EVENT_WIFI_READY: + // clear_wifi_event_sta_connected = true; + addLog(LOG_LEVEL_INFO, F("WIFI_READY")); + break; + case ARDUINO_EVENT_WIFI_SCAN_DONE: + addLog(LOG_LEVEL_INFO, F("SCAN_DONE")); + break; + case ARDUINO_EVENT_WIFI_STA_START: + clear_wifi_event_sta_connected = true; + _startStopStats.setOn(); + addLog(LOG_LEVEL_INFO, F("STA_START")); + break; + case ARDUINO_EVENT_WIFI_STA_STOP: + clear_wifi_event_sta_connected = true; + _startStopStats.setOff(); + addLog(LOG_LEVEL_INFO, F("STA_STOP")); + break; + case ARDUINO_EVENT_WIFI_STA_CONNECTED: + memcpy(&_wifi_event_sta_connected, &info.wifi_sta_connected, sizeof(_wifi_event_sta_connected)); + _connectedStats.setOn(); + addLog(LOG_LEVEL_INFO, F("STA_CONNECTED")); + break; + case ARDUINO_EVENT_WIFI_STA_DISCONNECTED: + clear_wifi_event_sta_connected = true; + _wifi_disconnect_reason = static_cast(info.wifi_sta_disconnected.reason); + _connectedStats.setOff(); + addLog(LOG_LEVEL_INFO, F("STA_DISCONNECTED")); + break; + case ARDUINO_EVENT_WIFI_STA_AUTHMODE_CHANGE: + _wifi_event_sta_connected.authmode = info.wifi_sta_authmode_change.new_mode; + addLog(LOG_LEVEL_INFO, F("STA_AUTHMODE_CHANGE")); + break; + case ARDUINO_EVENT_WIFI_STA_GOT_IP: + + for (size_t i = 0; i < NR_ELEMENTS(_dns_cache); ++i) { + auto tmp = WiFi.STA.dnsIP(i); + + _dns_cache[i] = tmp; // Also set the 'empty' ones so we won't set left-over DNS server from when another interface was active. + + if (tmp != INADDR_NONE) { + addLog(LOG_LEVEL_INFO, strformat(F("DNS Cache %d set to %s"), i, tmp.toString(true).c_str())); + } + + } + + // Set OnOffTimer to off so we can also count how often we het new IP + _gotIPStats.setOff(); + _gotIPStats.setOn(); + addLog(LOG_LEVEL_INFO, F("STA_GOT_IP")); + break; +# if FEATURE_USE_IPV6 + case ARDUINO_EVENT_WIFI_STA_GOT_IP6: + _gotIP6Stats.setOn(); + + addLog(LOG_LEVEL_INFO, F("STA_GOT_IP6")); + break; +# endif // if FEATURE_USE_IPV6 + case ARDUINO_EVENT_WIFI_STA_LOST_IP: + _gotIPStats.setOff(); +# if FEATURE_USE_IPV6 + _gotIP6Stats.setOff(); +# endif + + addLog(LOG_LEVEL_INFO, F("STA_LOST_IP")); + break; + + default: + break; + } + + if (clear_wifi_event_sta_connected) { + memset(&_wifi_event_sta_connected, 0, sizeof(_wifi_event_sta_connected)); + } + + /* + switch (event_id) + { + case ARDUINO_EVENT_WIFI_READY: + // ESP32 WiFi ready + break; + case ARDUINO_EVENT_WIFI_STA_START: + # ifndef BUILD_NO_DEBUG + + // addLog(LOG_LEVEL_INFO, F("WiFi : Event STA Started")); + # endif // ifndef BUILD_NO_DEBUG + break; + case ARDUINO_EVENT_WIFI_STA_STOP: + # ifndef BUILD_NO_DEBUG + + // addLog(LOG_LEVEL_INFO, F("WiFi : Event STA Stopped")); + # endif // ifndef BUILD_NO_DEBUG + break; + case ARDUINO_EVENT_WIFI_OFF: + # ifndef BUILD_NO_DEBUG + + // addLog(LOG_LEVEL_INFO, F("WiFi : Event WIFI off")); + # endif // ifndef BUILD_NO_DEBUG + break; + + case ARDUINO_EVENT_WIFI_AP_START: + # ifndef BUILD_NO_DEBUG + + // addLog(LOG_LEVEL_INFO, F("WiFi : Event AP Started")); + # endif // ifndef BUILD_NO_DEBUG + break; + case ARDUINO_EVENT_WIFI_AP_STOP: + # ifndef BUILD_NO_DEBUG + + // addLog(LOG_LEVEL_INFO, F("WiFi : Event AP Stopped")); + # endif // ifndef BUILD_NO_DEBUG + break; + case ARDUINO_EVENT_WIFI_STA_LOST_IP: + // ESP32 station lost IP and the IP is reset to 0 + # if FEATURE_ETHERNET + + if (active_network_medium == NetworkMedium_t::Ethernet) { + // DNS records are shared among WiFi and Ethernet (very bad design!) + // So we must restore the DNS records for Ethernet in case we started with WiFi and then plugged in Ethernet. + // As soon as WiFi is turned off, the DNS entry for Ethernet is cleared. + EthEventData.markLostIP(); + } + # endif // if FEATURE_ETHERNET + WiFiEventData.markLostIP(); + # ifndef BUILD_NO_DEBUG + + // addLog(LOG_LEVEL_INFO, + + // F("WiFi : Event Lost IP")); + # endif // ifndef BUILD_NO_DEBUG + break; + + case ARDUINO_EVENT_WIFI_AP_PROBEREQRECVED: + // Receive probe request packet in soft-AP interface + // TODO TD-er: Must implement like onProbeRequestAPmode for ESP8266 + # ifndef BUILD_NO_DEBUG + + // addLog(LOG_LEVEL_INFO, F("WiFi : Event AP got probed")); + # endif // ifndef BUILD_NO_DEBUG + break; + + case ARDUINO_EVENT_WIFI_STA_AUTHMODE_CHANGE: + WiFiEventData.setAuthMode(info.wifi_sta_authmode_change.new_mode); + break; + + case ARDUINO_EVENT_WIFI_STA_CONNECTED: + { + char ssid_copy[33]; // Ensure space for maximum len SSID (32) plus trailing 0 + memcpy(ssid_copy, info.wifi_sta_connected.ssid, info.wifi_sta_connected.ssid_len); + ssid_copy[32] = 0; // Potentially add 0-termination if none present earlier + WiFiEventData.markConnected((const char *)ssid_copy, info.wifi_sta_connected.bssid, info.wifi_sta_connected.channel); + WiFiEventData.setAuthMode(info.wifi_sta_connected.authmode); + + // addLog(LOG_LEVEL_INFO, F("WiFi : Event WIFI_STA_CONNECTED")); + break; + } + case ARDUINO_EVENT_WIFI_STA_DISCONNECTED: + WiFiEventData.markDisconnect(static_cast(info.wifi_sta_disconnected.reason)); + break; + case ARDUINO_EVENT_WIFI_STA_GOT_IP: + { + // FIXME TD-er: Must also check event->esp_netif to see which interface got this event. + ignoreDisconnectEvent = false; + ip_event_got_ip_t *event = static_cast(&info.got_ip); + const IPAddress ip(event->ip_info.ip.addr); + const IPAddress netmask(event->ip_info.netmask.addr); + const IPAddress gw(event->ip_info.gw.addr); + WiFiEventData.markGotIP(ip, netmask, gw); + break; + } + # if FEATURE_USE_IPV6 + case ARDUINO_EVENT_WIFI_STA_GOT_IP6: + { + ip_event_got_ip6_t *event = static_cast(&info.got_ip6); + const IPAddress ip(IPv6, (const uint8_t *)event->ip6_info.ip.addr, event->ip6_info.ip.zone); + WiFiEventData.markGotIPv6(ip); + break; + } + case ARDUINO_EVENT_WIFI_AP_GOT_IP6: + addLog(LOG_LEVEL_INFO, F("WIFI : AP got IP6")); + break; + # endif // if FEATURE_USE_IPV6 + case ARDUINO_EVENT_WIFI_AP_STAIPASSIGNED: + addLog(LOG_LEVEL_INFO, F("WIFI : AP assigned IP to STA")); + break; + case ARDUINO_EVENT_WIFI_AP_STACONNECTED: + WiFiEventData.markConnectedAPmode(info.wifi_ap_staconnected.mac); + break; + case ARDUINO_EVENT_WIFI_AP_STADISCONNECTED: + WiFiEventData.markDisconnectedAPmode(info.wifi_ap_stadisconnected.mac); + break; + case ARDUINO_EVENT_WIFI_SCAN_DONE: + WiFiEventData.processedScanDone = false; + break; + # if FEATURE_ETHERNET + case ARDUINO_EVENT_ETH_START: + case ARDUINO_EVENT_ETH_CONNECTED: + case ARDUINO_EVENT_ETH_GOT_IP: + case ARDUINO_EVENT_ETH_DISCONNECTED: + case ARDUINO_EVENT_ETH_STOP: + case ARDUINO_EVENT_ETH_GOT_IP6: + + // Handled in EthEvent + break; + # endif // FEATURE_ETHERNET + + # if FEATURE_PPP_MODEM + + case ARDUINO_EVENT_PPP_START: + case ARDUINO_EVENT_PPP_CONNECTED: + case ARDUINO_EVENT_PPP_GOT_IP: + case ARDUINO_EVENT_PPP_LOST_IP: + case ARDUINO_EVENT_PPP_DISCONNECTED: + case ARDUINO_EVENT_PPP_STOP: + // Handled in NW005_data_struct_PPP_modem + break; + + # endif // if FEATURE_PPP_MODEM + + default: + { + addLogMove(LOG_LEVEL_ERROR, concat(F("UNKNOWN WIFI/ETH EVENT: "), event_id)); + break; + } + } + */ +} + +} // namespace wifi +} // namespace net +} // namespace ESPEasy +# endif // ifdef ESP32 +#endif // if FEATURE_WIFI diff --git a/src/ESPEasy/net/wifi/ESPEasyWiFi_STA_Event_ESP32.h b/src/ESPEasy/net/wifi/ESPEasyWiFi_STA_Event_ESP32.h new file mode 100644 index 000000000..725725423 --- /dev/null +++ b/src/ESPEasy/net/wifi/ESPEasyWiFi_STA_Event_ESP32.h @@ -0,0 +1,71 @@ +#pragma once + +#include "../../../ESPEasy_common.h" + +#if FEATURE_WIFI +# ifdef ESP32 + +# include "../../../src/Helpers/LongTermOnOffTimer.h" + +# include + +// ******************************************************************************** + +// Work-around for setting _useStaticIP +// See reported issue: https://github.com/esp8266/Arduino/issues/4114 +// ******************************************************************************** +# include +# include +# include +# include + +# include "../wifi/WiFiDisconnectReason.h" + + +namespace ESPEasy { +namespace net { +namespace wifi { + + +class ESPEasyWiFi_STA_EventHandler +{ +public: + + ESPEasyWiFi_STA_EventHandler(); + ~ESPEasyWiFi_STA_EventHandler(); + + static bool initialized(); + + LongTermOnOffTimer getEnabled_OnOffTimer() const; + LongTermOnOffTimer getConnected_OnOffTimer() const; + LongTermOnOffTimer getGotIp_OnOffTimer() const; +# if FEATURE_USE_IPV6 + LongTermOnOffTimer getGotIp6_OnOffTimer() const; +# endif + + WiFiDisconnectReason getLastDisconnectReason() const; + + uint8_t getAuthMode() const; + + bool restore_dns_from_cache() const; + +private: + + // ******************************************************************************** + // Functions called on events. + // Make sure not to call anything in these functions that result in delay() or yield() + // ******************************************************************************** + static void WiFiEvent(WiFiEvent_t event, + arduino_event_info_t info); + + network_event_handle_t nw_event_id = 0; + + +}; // class ESPEasyWiFi_STA_EventHandler + +} // namespace wifi +} // namespace net +} // namespace ESPEasy + +# endif // ifdef ESP32 +#endif // if FEATURE_WIFI diff --git a/src/ESPEasy/net/wifi/ESPEasyWiFi_STA_Event_ESP8266.cpp b/src/ESPEasy/net/wifi/ESPEasyWiFi_STA_Event_ESP8266.cpp new file mode 100644 index 000000000..8c0b259a7 --- /dev/null +++ b/src/ESPEasy/net/wifi/ESPEasyWiFi_STA_Event_ESP8266.cpp @@ -0,0 +1,170 @@ +#include "../wifi/ESPEasyWiFi_STA_Event_ESP8266.h" + +#if FEATURE_WIFI +# ifdef ESP8266 + +# include "../../../src/DataStructs/RTCStruct.h" +# include "../../../src/DataTypes/ESPEasyTimeSource.h" +# include "../../../src/ESPEasyCore/ESPEasy_Log.h" +# include "../../../src/Globals/RTC.h" +# include "../../../src/Helpers/ESPEasy_time_calc.h" + +# include "../ESPEasyNetwork.h" +# include "../wifi/ESPEasyWifi.h" +# include "../wifi/ESPEasyWifi_ProcessEvent.h" + +# include "../Globals/ESPEasyWiFiEvent.h" +# include "../Globals/NetworkState.h" +# include "../Globals/WiFi_AP_Candidates.h" + + +namespace ESPEasy { +namespace net { +namespace wifi { + + +static LongTermOnOffTimer _startStopStats; +static LongTermOnOffTimer _connectedStats; +static LongTermOnOffTimer _gotIPStats; +static WiFiDisconnectReason _wifi_disconnect_reason = WiFiDisconnectReason::WIFI_DISCONNECT_REASON_UNSPECIFIED; + +static uint8_t _authmode{}; + +static bool _ESPEasyWiFi_STA_EventHandler_initialized{}; + +ESPEasyWiFi_STA_EventHandler::ESPEasyWiFi_STA_EventHandler() +{ + _connectedStats.clear(); + _gotIPStats.clear(); + + // WiFi event handlers + + if (!_ESPEasyWiFi_STA_EventHandler_initialized) { + stationConnectedHandler = WiFi.onStationModeConnected(onConnected); + stationDisconnectedHandler = WiFi.onStationModeDisconnected(onDisconnect); + stationGotIpHandler = WiFi.onStationModeGotIP(onGotIP); + stationModeDHCPTimeoutHandler = WiFi.onStationModeDHCPTimeout(onDHCPTimeout); + stationModeAuthModeChangeHandler = WiFi.onStationModeAuthModeChanged(onStationModeAuthModeChanged); + APModeStationConnectedHandler = WiFi.onSoftAPModeStationConnected(onConnectedAPmode); + APModeStationDisconnectedHandler = WiFi.onSoftAPModeStationDisconnected(onDisconnectedAPmode); + _ESPEasyWiFi_STA_EventHandler_initialized = true; + } +} + +ESPEasyWiFi_STA_EventHandler::~ESPEasyWiFi_STA_EventHandler() +{} + +bool ESPEasyWiFi_STA_EventHandler::initialized() { return _ESPEasyWiFi_STA_EventHandler_initialized; } + +LongTermOnOffTimer ESPEasyWiFi_STA_EventHandler::getEnabled_OnOffTimer() const { return _startStopStats; } + +LongTermOnOffTimer ESPEasyWiFi_STA_EventHandler::getConnected_OnOffTimer() const { return _connectedStats; } + +LongTermOnOffTimer ESPEasyWiFi_STA_EventHandler::getGotIp_OnOffTimer() const { return _gotIPStats; } + +WiFiDisconnectReason ESPEasyWiFi_STA_EventHandler::getLastDisconnectReason() const { return _wifi_disconnect_reason; } + +uint8_t ESPEasyWiFi_STA_EventHandler::getAuthMode() const { return _authmode; } + + +// ******************************************************************************** +// Functions called on events. +// Make sure not to call anything in these functions that result in delay() or yield() +// ******************************************************************************** +void ESPEasyWiFi_STA_EventHandler::onConnected(const WiFiEventStationModeConnected& event) { + _connectedStats.setOn(); +// WiFiEventData.markConnected(event.ssid, event.bssid, event.channel); +} + +void ESPEasyWiFi_STA_EventHandler::onDisconnect(const WiFiEventStationModeDisconnected& event) { + _connectedStats.setOff(); + _gotIPStats.setOff(); +// WiFiEventData.markDisconnect(event.reason); + + if (WiFi.status() == WL_CONNECTED) { + // See https://github.com/esp8266/Arduino/issues/5912 + WiFi.persistent(false); + WiFi.disconnect(false); + delay(0); + } +} + +void ESPEasyWiFi_STA_EventHandler::onGotIP(const WiFiEventStationModeGotIP& event) +{ + // Set OnOffTimer to off so we can also count how often we het new IP + _gotIPStats.setOff(); + _gotIPStats.setOn(); + + //WiFiEventData.markGotIP(event.ip, event.mask, event.gw); +} + +void ESPEasyWiFi_STA_EventHandler::onDHCPTimeout() { +// WiFiEventData.processedDHCPTimeout = false; +} + +void ESPEasyWiFi_STA_EventHandler::onConnectedAPmode(const WiFiEventSoftAPModeStationConnected& event) { +// WiFiEventData.markConnectedAPmode(event.mac); +} + +void ESPEasyWiFi_STA_EventHandler::onDisconnectedAPmode(const WiFiEventSoftAPModeStationDisconnected& event) { +// WiFiEventData.markDisconnectedAPmode(event.mac); +} + +void ESPEasyWiFi_STA_EventHandler::onStationModeAuthModeChanged(const WiFiEventStationModeAuthModeChanged& event) { + _authmode = event.newMode; +// WiFiEventData.setAuthMode(event.newMode); +} + +# if FEATURE_ESP8266_DIRECT_WIFI_SCAN + +void ESPEasyWiFi_STA_EventHandler::onWiFiScanDone(void ESPEasyWiFi_STA_EventHandler::*arg, STATUS status) { + if (status == OK) { + auto *head = reinterpret_cast(arg); + int scanCount = 0; + + for (bss_info *it = head; it != nullptr; it = STAILQ_NEXT(it, next)) { + WiFi_AP_Candidates.process_WiFiscan(*it); + ++scanCount; + } + WiFi_AP_Candidates.after_process_WiFiscan(); + WiFiEventData.lastGetScanMoment.setNow(); + + // WiFiEventData.processedScanDone = true; +# ifndef BUILD_NO_DEBUG + + /* + if (loglevelActiveFor(LOG_LEVEL_INFO)) { + addLogMove(LOG_LEVEL_INFO, concat(F("WiFi : Scan finished (ESP8266), found: "), scanCount)); + } + */ +# endif // ifndef BUILD_NO_DEBUG + WiFi_AP_Candidates.load_knownCredentials(); + + if (WiFi_AP_Candidates.addedKnownCandidate() || !NetworkConnected()) { + WiFiEventData.wifiConnectAttemptNeeded = true; + # ifndef BUILD_NO_DEBUG + + if (WiFi_AP_Candidates.addedKnownCandidate()) { + // addLog(LOG_LEVEL_INFO, F("WiFi : Added known candidate, try to connect")); + } + # endif // ifndef BUILD_NO_DEBUG +// NetworkConnectRelaxed(); + } + + } + + WiFiMode_t mode = WiFi.getMode(); + ESPEasy::net::wifi::setWifiMode(WIFI_OFF); + delay(1); + ESPEasy::net::wifi::setWifiMode(mode); + delay(1); +} + +# endif // if FEATURE_ESP8266_DIRECT_WIFI_SCAN + +} // namespace wifi +} // namespace net +} // namespace ESPEasy + +# endif // ifdef ESP8266 +#endif // if FEATURE_WIFI diff --git a/src/ESPEasy/net/wifi/ESPEasyWiFi_STA_Event_ESP8266.h b/src/ESPEasy/net/wifi/ESPEasyWiFi_STA_Event_ESP8266.h new file mode 100644 index 000000000..3f9816fb1 --- /dev/null +++ b/src/ESPEasy/net/wifi/ESPEasyWiFi_STA_Event_ESP8266.h @@ -0,0 +1,75 @@ +#pragma once + +#include "../../../ESPEasy_common.h" + +#if FEATURE_WIFI + + +# ifdef ESP8266 + +# include "../../../src/Helpers/LongTermOnOffTimer.h" + +# include + +// ******************************************************************************** + +// Work-around for setting _useStaticIP +// See reported issue: https://github.com/esp8266/Arduino/issues/4114 +// ******************************************************************************** + +# include +# include + +namespace ESPEasy { +namespace net { +namespace wifi { + + +class ESPEasyWiFi_STA_EventHandler +{ +public: + + ESPEasyWiFi_STA_EventHandler(); + ~ESPEasyWiFi_STA_EventHandler(); + + static bool initialized(); + + LongTermOnOffTimer getEnabled_OnOffTimer() const; + LongTermOnOffTimer getConnected_OnOffTimer() const; + LongTermOnOffTimer getGotIp_OnOffTimer() const; + WiFiDisconnectReason getLastDisconnectReason() const; + uint8_t getAuthMode() const; + + + // ******************************************************************************** + // Functions called on events. + // Make sure not to call anything in these functions that result in delay() or yield() + // ******************************************************************************** + static void onConnected(const WiFiEventStationModeConnected& event); + + static void onDisconnect(const WiFiEventStationModeDisconnected& event); + + static void onGotIP(const WiFiEventStationModeGotIP& event); + + static void onDHCPTimeout(); + + static void onConnectedAPmode(const WiFiEventSoftAPModeStationConnected& event); + + static void onDisconnectedAPmode(const WiFiEventSoftAPModeStationDisconnected& event); + + static void onStationModeAuthModeChanged(const WiFiEventStationModeAuthModeChanged& event); + +# if FEATURE_ESP8266_DIRECT_WIFI_SCAN + static void onWiFiScanDone(void *arg, + STATUS status); +# endif // if FEATURE_ESP8266_DIRECT_WIFI_SCAN + +}; // class ESPEasyWiFi_STA_EventHandler + +} // namespace wifi +} // namespace net +} // namespace ESPEasy + +# endif // ifdef ESP8266 + +#endif // if FEATURE_WIFI diff --git a/src/ESPEasy/net/wifi/ESPEasyWiFi_state_machine.cpp b/src/ESPEasy/net/wifi/ESPEasyWiFi_state_machine.cpp index 44ff98f20..90f34d43c 100644 --- a/src/ESPEasy/net/wifi/ESPEasyWiFi_state_machine.cpp +++ b/src/ESPEasy/net/wifi/ESPEasyWiFi_state_machine.cpp @@ -36,8 +36,7 @@ void ESPEasyWiFi_t::setup() { return; } - WiFi_pre_setup(); - begin(); + if (WiFi_pre_setup()) { begin(); } } void ESPEasyWiFi_t::enable() {} diff --git a/src/ESPEasy/net/wifi/ESPEasyWifi.cpp b/src/ESPEasy/net/wifi/ESPEasyWifi.cpp index c55adc822..8ba9f44b9 100644 --- a/src/ESPEasy/net/wifi/ESPEasyWifi.cpp +++ b/src/ESPEasy/net/wifi/ESPEasyWifi.cpp @@ -125,14 +125,8 @@ bool WiFiConnected() { return ESPEasyWiFi.connected(); } -void WiFiConnectRelaxed() { AttemptWiFiConnect(); } +//void WiFiConnectRelaxed() { AttemptWiFiConnect(); } -void AttemptWiFiConnect() { - if (!WiFiConnected()) { - ESPEasyWiFi.setup(); - } - logConnectionStatus(); -} // ******************************************************************************** // Set Wifi config @@ -269,6 +263,8 @@ void WiFiScan_log_to_serial() // Only internal scope void setAPinternal(bool enable) { doSetAPinternal(enable); } +void setUseStaticIP(bool enabled) { doSetUseStaticIP(enabled); } + bool WiFiUseStaticIP() { return Settings.IP[0] != 0 && Settings.IP[0] != 255; } bool wifiAPmodeActivelyUsed() diff --git a/src/ESPEasy/net/wifi/ESPEasyWifi.h b/src/ESPEasy/net/wifi/ESPEasyWifi.h index af0275005..ae1eb84ef 100644 --- a/src/ESPEasy/net/wifi/ESPEasyWifi.h +++ b/src/ESPEasy/net/wifi/ESPEasyWifi.h @@ -33,8 +33,7 @@ namespace wifi { bool WiFiConnected(); -void WiFiConnectRelaxed(); -void AttemptWiFiConnect(); +//void WiFiConnectRelaxed(); bool prepareWiFi(); bool checkAndResetWiFi(); void resetWiFi(); @@ -68,6 +67,7 @@ void WiFiScan_log_to_serial(); void setAPinternal(bool enable); // FIXME TD-er: Move to ESPEasyWifi_abstracted... +void setUseStaticIP(bool enabled); bool WiFiUseStaticIP(); bool wifiAPmodeActivelyUsed(); void setupStaticIPconfig(); diff --git a/src/ESPEasy/net/wifi/ESPEasyWifi_ProcessEvent.cpp b/src/ESPEasy/net/wifi/ESPEasyWifi_ProcessEvent.cpp index b4c8cd16e..9b0952fd4 100644 --- a/src/ESPEasy/net/wifi/ESPEasyWifi_ProcessEvent.cpp +++ b/src/ESPEasy/net/wifi/ESPEasyWifi_ProcessEvent.cpp @@ -447,7 +447,7 @@ void processScanDone() { // ESPEasy::net::wifi::setSTA(false); # endif // ifdef ESP32 - NetworkConnectRelaxed(); +// NetworkConnectRelaxed(); # ifdef USES_ESPEASY_NOW temp_disable_EspEasy_now_timer = millis() + 20000; # endif diff --git a/src/ESPEasy/net/wifi/ESPEasyWifi_abstracted.h b/src/ESPEasy/net/wifi/ESPEasyWifi_abstracted.h index b30c4bd53..58a7d214e 100644 --- a/src/ESPEasy/net/wifi/ESPEasyWifi_abstracted.h +++ b/src/ESPEasy/net/wifi/ESPEasyWifi_abstracted.h @@ -10,11 +10,11 @@ # if defined(ESP8266) -# include "../wifi/ESPEasyWiFiEvent_ESP8266.h" +# include "../wifi/ESPEasyWiFi_STA_Event_ESP8266.h" # include # endif // if defined(ESP8266) # if defined(ESP32) -# include "../wifi/ESPEasyWiFiEvent_ESP32.h" +# include "../wifi/ESPEasyWiFi_STA_Event_ESP32.h" # include # include # endif // if defined(ESP32) @@ -66,10 +66,6 @@ void doSetAPinternal(bool enable); // Event handlers // ******************************************************************************** -void removeWiFiEventHandler(); -void registerWiFiEventHandler(); - - WiFiConnectionProtocol doGetConnectionProtocol(); float doGetRSSIthreshold(float& maxTXpwr); @@ -105,6 +101,9 @@ void doSetWiFiDefaultPowerMode(); void doSetWiFiCountryPolicyManual(); + +void doSetUseStaticIP(bool enabled); + } // namespace wifi } // namespace net } // namespace ESPEasy diff --git a/src/ESPEasy/net/wifi/ESPEasyWifi_abstracted_ESP32.cpp b/src/ESPEasy/net/wifi/ESPEasyWifi_abstracted_ESP32.cpp index 4f16c323c..d60f2f051 100644 --- a/src/ESPEasy/net/wifi/ESPEasyWifi_abstracted_ESP32.cpp +++ b/src/ESPEasy/net/wifi/ESPEasyWifi_abstracted_ESP32.cpp @@ -11,7 +11,7 @@ # include "../../net/ESPEasyNetwork.h" // Needed for NetworkCreateRFCCompliantHostname, WiFi code should not include network code # include "../Globals/ESPEasyWiFiEvent.h" -# include "../wifi/ESPEasyWiFiEvent_ESP32.h" +# include "../wifi/ESPEasyWiFi_STA_Event_ESP32.h" # include "../wifi/ESPEasyWifi_ProcessEvent.h" # include @@ -27,8 +27,9 @@ namespace net { namespace wifi { bool WiFi_pre_setup() { + if (!ESPEasyWiFi_STA_EventHandler::initialized()) return false; - registerWiFiEventHandler(); +// registerWiFiEventHandler(); WiFi.persistent(false); return doSetSTA_AP(false, false); @@ -44,7 +45,6 @@ bool WiFi_pre_STA_setup() } void doWiFiDisconnect() { - // removeWiFiEventHandler(); WiFi.disconnect(Settings.WiFiRestart_connection_lost()); delay(100); { @@ -69,7 +69,7 @@ bool doSetWifiMode(WiFiMode_t new_mode) if (cur_mode == new_mode) { if (cur_mode != WIFI_OFF) { - registerWiFiEventHandler(); +// registerWiFiEventHandler(); } return true; } @@ -82,8 +82,6 @@ bool doSetWifiMode(WiFiMode_t new_mode) if (cur_mode == WIFI_OFF) { - registerWiFiEventHandler(); - // Needs to be set while WiFi is off WiFi.hostname(NetworkCreateRFCCompliantHostname()); WiFiEventData.markWiFiTurnOn(); @@ -102,7 +100,6 @@ bool doSetWifiMode(WiFiMode_t new_mode) // delay(100); processDisconnect(); WiFiEventData.clear_processed_flags(); - removeWiFiEventHandler(); } addLog(LOG_LEVEL_INFO, concat(F("WIFI : Set WiFi to "), doGetWifiModeString(new_mode))); @@ -293,19 +290,6 @@ void doWifiScan(bool async, uint8_t channel) { # endif // if CONFIG_SOC_WIFI_SUPPORT_5G } -void removeWiFiEventHandler() -{ - WiFi.removeEvent(WiFiEventData.wm_event_id); - WiFiEventData.wm_event_id = 0; -} - -void registerWiFiEventHandler() -{ - if (WiFiEventData.wm_event_id != 0) { - removeWiFiEventHandler(); - } - WiFiEventData.wm_event_id = WiFi.onEvent(WiFiEvent); -} float doGetRSSIthreshold(float& maxTXpwr) { maxTXpwr = Settings.getWiFi_TX_power(); @@ -593,6 +577,18 @@ void doSetWiFiCountryPolicyManual() */ } +/* +class WiFi_Access_Static_IP : public WiFiSTAClass +{ +public: + + void set_use_static_ip(bool enabled); +}; +*/ + +void doSetUseStaticIP(bool enabled) +{} + } // namespace wifi } // namespace net } // namespace ESPEasy diff --git a/src/ESPEasy/net/wifi/ESPEasyWifi_abstracted_ESP8266.cpp b/src/ESPEasy/net/wifi/ESPEasyWifi_abstracted_ESP8266.cpp index 3c487316e..4f1f4791f 100644 --- a/src/ESPEasy/net/wifi/ESPEasyWifi_abstracted_ESP8266.cpp +++ b/src/ESPEasy/net/wifi/ESPEasyWifi_abstracted_ESP8266.cpp @@ -9,7 +9,7 @@ # include "../Globals/WiFi_AP_Candidates.h" # include "../Globals/ESPEasyWiFiEvent.h" -# include "../wifi/ESPEasyWiFiEvent_ESP8266.h" +# include "../wifi/ESPEasyWiFi_STA_Event_ESP8266.h" # include "../wifi/ESPEasyWifi_ProcessEvent.h" // # include "../wifi/ESPEasyWifi.h" @@ -18,8 +18,8 @@ namespace ESPEasy { namespace net { namespace wifi { -bool WiFi_pre_setup() { - registerWiFiEventHandler(); +bool WiFi_pre_setup() { + if (!ESPEasyWiFi_STA_EventHandler::initialized()) return false; doSetSTA_AP(false, false); delay(100); @@ -209,26 +209,6 @@ void doWifiScan(bool async, uint8_t channel) { } -void removeWiFiEventHandler() { - // Not needed for ESP8266 -} - -void registerWiFiEventHandler() -{ - // WiFi event handlers - static bool handlers_initialized = false; - - if (!handlers_initialized) { - stationConnectedHandler = WiFi.onStationModeConnected(onConnected); - stationDisconnectedHandler = WiFi.onStationModeDisconnected(onDisconnect); - stationGotIpHandler = WiFi.onStationModeGotIP(onGotIP); - stationModeDHCPTimeoutHandler = WiFi.onStationModeDHCPTimeout(onDHCPTimeout); - stationModeAuthModeChangeHandler = WiFi.onStationModeAuthModeChanged(onStationModeAuthModeChanged); - APModeStationConnectedHandler = WiFi.onSoftAPModeStationConnected(onConnectedAPmode); - APModeStationDisconnectedHandler = WiFi.onSoftAPModeStationDisconnected(onDisconnectedAPmode); - handlers_initialized = true; - } -} float doGetRSSIthreshold(float& maxTXpwr) { maxTXpwr = Settings.getWiFi_TX_power(); @@ -343,6 +323,21 @@ void doSetWiFiCountryPolicyManual() { // Not yet implemented/required for ESP8266 } + +class WiFi_Access_Static_IP : public ESP8266WiFiSTAClass +{ +public: + + void set_use_static_ip(bool enabled); +}; + +void WiFi_Access_Static_IP::set_use_static_ip(bool enabled) { _useStaticIp = enabled; } + +void doSetUseStaticIP(bool enabled) { + WiFi_Access_Static_IP tmp; + tmp.set_use_static_ip(enabled); +} + } // namespace wifi } // namespace net } // namespace ESPEasy diff --git a/src/src/DataTypes/ESPEasy_plugin_functions.cpp b/src/src/DataTypes/ESPEasy_plugin_functions.cpp index 2c6dd083d..48925e7a4 100644 --- a/src/src/DataTypes/ESPEasy_plugin_functions.cpp +++ b/src/src/DataTypes/ESPEasy_plugin_functions.cpp @@ -2,6 +2,8 @@ #ifdef ESP32 +#include "../Helpers/StringConverter.h" + # include bool NWPlugin::canQueryViaNetworkInterface(NWPlugin::Function function) @@ -173,4 +175,30 @@ bool NWPlugin::isFlagSet(NWPlugin::NetforkFlags flag, NetworkInterface*networkIn return flags & mask; } +bool NWPlugin::forceDHCP_request(NetworkInterface*networkInterface) +{ + if (!NWPlugin::isFlagSet(NWPlugin::NetforkFlags::DHCP_client, networkInterface)) { + return false; + } + + auto netif = networkInterface->netif(); + + if (netif == nullptr) { return false; } + + const char* desc = esp_netif_get_desc(netif); + esp_err_t err = esp_netif_dhcpc_stop(netif); + if (err != 0) { + addLog(LOG_LEVEL_ERROR, strformat(F("%s: DHCPc could not be stopped! Error: 0x%04x: %s"), desc, err, esp_err_to_name(err))); + return false; + } + addLog(LOG_LEVEL_INFO, strformat(F("%s: DHCPc stopped"), desc)); + err = esp_netif_dhcpc_start(netif); + if (err != ESP_OK && err != ESP_ERR_ESP_NETIF_DHCP_ALREADY_STARTED) { + addLog(LOG_LEVEL_ERROR, strformat(F("%s: DHCPc could not be started! Error: 0x%04x: %s"), desc, err, esp_err_to_name(err))); + return false; + } + addLog(LOG_LEVEL_INFO, strformat(F("%s: DHCPc Client started"), desc)); + return true; +} + #endif // ifdef ESP32 diff --git a/src/src/DataTypes/ESPEasy_plugin_functions.h b/src/src/DataTypes/ESPEasy_plugin_functions.h index 2e8128516..6d9eb50a3 100644 --- a/src/src/DataTypes/ESPEasy_plugin_functions.h +++ b/src/src/DataTypes/ESPEasy_plugin_functions.h @@ -158,6 +158,7 @@ public: NWPLUGIN_EXIT_ALL, // Exit all network interfaces NWPLUGIN_EXIT, NWPLUGIN_WRITE, // Send commands to a network adapter. + NWPLUGIN_CREDENTIALS_CHANGED, #ifdef ESP32 NWPLUGIN_GET_INTERFACE, NWPLUGIN_WEBFORM_SHOW_ROUTE_PRIO, @@ -222,6 +223,8 @@ public: static bool isFlagSet(NetforkFlags flag, NetworkInterface*networkInterface); + + static bool forceDHCP_request(NetworkInterface*networkInterface); #endif // ifdef ESP32 diff --git a/src/src/ESPEasyCore/ESPEasy_setup.cpp b/src/src/ESPEasyCore/ESPEasy_setup.cpp index f1f1543a8..40f8b6faf 100644 --- a/src/src/ESPEasyCore/ESPEasy_setup.cpp +++ b/src/src/ESPEasyCore/ESPEasy_setup.cpp @@ -229,7 +229,7 @@ void ESPEasy_setup() CPluginSetup(); ESPEasy::net::NWPluginSetup(); - ESPEasy::net::wifi::initWiFi(); +// ESPEasy::net::wifi::initWiFi(); WiFiEventData.clearAll(); #ifndef BUILD_MINIMAL_OTA @@ -451,15 +451,6 @@ void ESPEasy_setup() // FIXME TD-er: This network medium setting may be obsolete as we need a priority scale/order ESPEasy::net::setNetworkMedium(Settings.NetworkMedium); -/* - bool initWiFi = active_network_medium == ESPEasy::net::NetworkMedium_t::WIFI; - - // FIXME TD-er: Must add another check for 'delayed start WiFi' for poorly designed ESP8266 nodes. - - - if (initWiFi) { - } - */ #ifndef BUILD_NO_RAM_TRACKER logMemUsageAfter(F("WifiScan()")); #endif // ifndef BUILD_NO_RAM_TRACKER @@ -600,7 +591,7 @@ void ESPEasy_setup() #endif // if FEATURE_ETHERNET - ESPEasy::net::NetworkConnectRelaxed(); +// ESPEasy::net::NetworkConnectRelaxed(); #ifndef BUILD_NO_RAM_TRACKER logMemUsageAfter(F("NetworkConnectRelaxed()")); #endif // ifndef BUILD_NO_RAM_TRACKER diff --git a/src/src/Helpers/ESPEasy_Storage.cpp b/src/src/Helpers/ESPEasy_Storage.cpp index d7be07c88..d3a118b11 100644 --- a/src/src/Helpers/ESPEasy_Storage.cpp +++ b/src/src/Helpers/ESPEasy_Storage.cpp @@ -867,7 +867,9 @@ String SaveSecuritySettings(bool forFactoryReset) { if (!ESPEasy::net::NetworkConnected()) { WiFiEventData.wifiConnectAttemptNeeded = true; ESPEasy::net::wifi::resetWiFi(); - ESPEasy::net::wifi::AttemptWiFiConnect(); + String dummy; + ESPEasy::net::NWPluginCall( + NWPlugin::Function::NWPLUGIN_CREDENTIALS_CHANGED, 0, dummy); } } } diff --git a/src/src/WebServer/SetupPage.cpp b/src/src/WebServer/SetupPage.cpp index 7884c3522..d1aa4cf34 100644 --- a/src/src/WebServer/SetupPage.cpp +++ b/src/src/WebServer/SetupPage.cpp @@ -130,7 +130,9 @@ void handle_setup() { } status = HANDLE_SETUP_CONNECTING_STAGE; refreshCount = 0; - ESPEasy::net::wifi::AttemptWiFiConnect(); + String dummy; + ESPEasy::net::NWPluginCall( + NWPlugin::Function::NWPLUGIN_CREDENTIALS_CHANGED, 0, dummy); } } } From 56cc30678a4e8b934edd0d11fea50a8e11a2a771 Mon Sep 17 00:00:00 2001 From: TD-er Date: Sat, 2 Aug 2025 00:22:14 +0200 Subject: [PATCH 171/564] [Network] Trigger checking for DNS server on default NW-IF after event --- src/ESPEasy/net/ESPEasyNetwork.cpp | 12 +++++- src/ESPEasy/net/ESPEasyNetwork.h | 19 ++++++---- src/ESPEasy/net/ESPEasyNetwork_ESP32.cpp | 37 +++++++++--------- src/ESPEasy/net/ESPEasyNetwork_ESP8266.cpp | 11 +++--- src/ESPEasy/net/Globals/NetworkState.cpp | 3 ++ src/ESPEasy/net/Globals/NetworkState.h | 3 ++ .../NW003_data_struct_ETH_RMII.cpp | 6 +++ .../NW004_data_struct_ETH_SPI.cpp | 6 +++ .../NW005_data_struct_PPP_modem.cpp | 6 +++ src/ESPEasy/net/_NW004_ETH_SPI.cpp | 3 -- src/ESPEasy/net/_NW005_PPP_modem.cpp | 3 -- .../net/wifi/ESPEasyWiFi_STA_Event_ESP32.cpp | 8 ++++ .../net/wifi/ESPEasyWiFi_STA_Event_ESP32.h | 6 +-- .../wifi/ESPEasyWiFi_STA_Event_ESP8266.cpp | 38 ++++++++++--------- .../net/wifi/ESPEasyWiFi_STA_Event_ESP8266.h | 12 +++--- .../net/wifi/ESPEasyWiFi_state_machine.cpp | 2 +- .../net/wifi/ESPEasyWifi_abstracted_ESP32.cpp | 23 +++++------ .../wifi/ESPEasyWifi_abstracted_ESP8266.cpp | 5 +-- src/src/Helpers/PeriodicalActions.cpp | 3 +- 19 files changed, 121 insertions(+), 85 deletions(-) diff --git a/src/ESPEasy/net/ESPEasyNetwork.cpp b/src/ESPEasy/net/ESPEasyNetwork.cpp index 61c632282..359352ba3 100644 --- a/src/ESPEasy/net/ESPEasyNetwork.cpp +++ b/src/ESPEasy/net/ESPEasyNetwork.cpp @@ -30,6 +30,7 @@ String NetworkCreateRFCCompliantHostname(bool force_add_unitnr) { String makeRFCCompliantName(const String& name, const char replaceChar, const char allowedChar, const size_t maxlength) { String hostname(name); + // See RFC952. (when using the default arguments: '-', '-', 24) // Allowed chars: // * letters (a-z, A-Z) @@ -37,8 +38,10 @@ String makeRFCCompliantName(const String& name, const char replaceChar, const ch // * Hyphen (-) // * Max length 24 replaceUnicodeByChar(hostname, replaceChar); + for (size_t i = 0; i < hostname.length(); ++i) { const char c = hostname[i]; + if (!isAlphaNumeric(c) && (c != allowedChar)) { hostname[i] = replaceChar; } @@ -46,21 +49,26 @@ String makeRFCCompliantName(const String& name, const char replaceChar, const ch // May not start or end with a hyphen const String dash(replaceChar); + while (hostname.startsWith(dash)) { hostname = hostname.substring(1); } + while (hostname.endsWith(dash)) { hostname = hostname.substring(0, hostname.length() - 1); } // May not contain only numerals bool onlyNumerals = true; + for (size_t i = 0; onlyNumerals && i < hostname.length(); ++i) { const char c = hostname[i]; + if (!isdigit(c)) { onlyNumerals = false; } } + if (onlyNumerals) { hostname = strformat(F("ESPEasy%c%s"), replaceChar, hostname.c_str()); } @@ -93,5 +101,5 @@ void CheckRunningServices() { #endif } -} -} +} // namespace net +} // namespace ESPEasy diff --git a/src/ESPEasy/net/ESPEasyNetwork.h b/src/ESPEasy/net/ESPEasyNetwork.h index 11a71316b..5b72f7b0f 100644 --- a/src/ESPEasy/net/ESPEasyNetwork.h +++ b/src/ESPEasy/net/ESPEasyNetwork.h @@ -19,7 +19,7 @@ namespace net { void setNetworkMedium(NetworkMedium_t medium); -//void NetworkConnectRelaxed(); +// void NetworkConnectRelaxed(); bool NetworkConnected(); IPAddress NetworkLocalIP(); IPAddress NetworkSubnetMask(); @@ -45,18 +45,21 @@ MAC_address NetworkMacAddress(); String NetworkGetHostNameFromSettings(bool force_add_unitnr = false); String NetworkGetHostname(); String NetworkCreateRFCCompliantHostname(bool force_add_unitnr = false); -String makeRFCCompliantName(const String& name, const char replaceChar = '-', const char allowedChar = '-', const size_t maxlength = 24); +String makeRFCCompliantName(const String& name, + const char replaceChar = '-', + const char allowedChar = '-', + const size_t maxlength = 24); #if FEATURE_WIFI -MAC_address WifiSoftAPmacAddress(); -MAC_address WifiSTAmacAddress(); +MAC_address WifiSoftAPmacAddress(); +MAC_address WifiSTAmacAddress(); #endif // if FEATURE_WIFI -void CheckRunningServices(); +void CheckRunningServices(); #if FEATURE_ETHERNET -bool EthFullDuplex(); -bool EthLinkUp(); -uint8_t EthLinkSpeed(); +bool EthFullDuplex(); +bool EthLinkUp(); +uint8_t EthLinkSpeed(); #endif // if FEATURE_ETHERNET diff --git a/src/ESPEasy/net/ESPEasyNetwork_ESP32.cpp b/src/ESPEasy/net/ESPEasyNetwork_ESP32.cpp index c9ae95f4a..71379d0d7 100644 --- a/src/ESPEasy/net/ESPEasyNetwork_ESP32.cpp +++ b/src/ESPEasy/net/ESPEasyNetwork_ESP32.cpp @@ -35,11 +35,9 @@ NetworkInterface* getNetifByID(Network_Interface_ID id); - namespace ESPEasy { namespace net { - void setNetworkMedium(NetworkMedium_t new_medium) { #if !(FEATURE_ETHERNET) @@ -69,11 +67,12 @@ void setNetworkMedium(NetworkMedium_t new_medium) { switch (new_medium) { case NetworkMedium_t::WIFI: - //WiFi.STA.setDefault(); + // WiFi.STA.setDefault(); break; case NetworkMedium_t::Ethernet: #if FEATURE_ETHERNET - //ETH.setDefault(); + + // ETH.setDefault(); #endif // if FEATURE_ETHERNET break; case NetworkMedium_t::NotSet: @@ -87,12 +86,13 @@ void setNetworkMedium(NetworkMedium_t new_medium) { /*********************************************************************************************\ Ethernet or Wifi Support for ESP32 Build flag FEATURE_ETHERNET \*********************************************************************************************/ -/* -void NetworkConnectRelaxed() { - if (ESPEasy::net::NetworkConnected()) { return; } -#if FEATURE_ETHERNET - if (active_network_medium == NetworkMedium_t::Ethernet) { +/* + void NetworkConnectRelaxed() { + if (ESPEasy::net::NetworkConnected()) { return; } + #if FEATURE_ETHERNET + + if (active_network_medium == NetworkMedium_t::Ethernet) { if (ESPEasy::net::eth::ETHConnectRelaxed()) { return; } @@ -100,15 +100,14 @@ void NetworkConnectRelaxed() { // Failed to start the Ethernet network, probably not present of wrong parameters. // So set the runtime active medium to WiFi to try connecting to WiFi or at least start the AP. setNetworkMedium(NetworkMedium_t::WIFI); - } -#endif // if FEATURE_ETHERNET - - // Failed to start the Ethernet network, probably not present of wrong parameters. - // So set the runtime active medium to WiFi to try connecting to WiFi or at least start the AP. -// ESPEasy::net::wifi::WiFiConnectRelaxed(); -} -*/ + } + #endif // if FEATURE_ETHERNET + // Failed to start the Ethernet network, probably not present of wrong parameters. + // So set the runtime active medium to WiFi to try connecting to WiFi or at least start the AP. + // ESPEasy::net::wifi::WiFiConnectRelaxed(); + } + */ NetworkInterface* getDefaultNonAP_interface() { auto network_if = Network.getDefaultInterface(); @@ -331,7 +330,7 @@ uint8_t EthLinkSpeed() #endif // if FEATURE_ETHERNET -} -} +} // namespace net +} // namespace ESPEasy #endif // ifdef ESP32 diff --git a/src/ESPEasy/net/ESPEasyNetwork_ESP8266.cpp b/src/ESPEasy/net/ESPEasyNetwork_ESP8266.cpp index 1d5f72091..aedca5a17 100644 --- a/src/ESPEasy/net/ESPEasyNetwork_ESP8266.cpp +++ b/src/ESPEasy/net/ESPEasyNetwork_ESP8266.cpp @@ -48,10 +48,11 @@ void setNetworkMedium(NetworkMedium_t new_medium) { /*********************************************************************************************\ Ethernet or Wifi Support for ESP32 Build flag FEATURE_ETHERNET \*********************************************************************************************/ -//void NetworkConnectRelaxed() { -// if (!ESPEasy::net::NetworkConnected()) + +// void NetworkConnectRelaxed() { +// if (!ESPEasy::net::NetworkConnected()) // ESPEasy::net::wifi::WiFiConnectRelaxed(); -//} +// } bool NetworkConnected() { return ESPEasy::net::wifi::WiFiConnected(); } @@ -90,7 +91,7 @@ MAC_address WifiSTAmacAddress() { #endif // if FEATURE_WIFI -} -} +} // namespace net +} // namespace ESPEasy #endif // ifdef ESP8266 diff --git a/src/ESPEasy/net/Globals/NetworkState.cpp b/src/ESPEasy/net/Globals/NetworkState.cpp index a5de5ae28..c4a60567b 100644 --- a/src/ESPEasy/net/Globals/NetworkState.cpp +++ b/src/ESPEasy/net/Globals/NetworkState.cpp @@ -25,3 +25,6 @@ IPAddress apIP(DEFAULT_AP_IP); // udp protocol stuff (syslog, global sync, node info list, ntp time) WiFiUDP portUDP; +#ifdef ESP32 +bool nonDefaultNetworkInterface_gotIP{}; +#endif \ No newline at end of file diff --git a/src/ESPEasy/net/Globals/NetworkState.h b/src/ESPEasy/net/Globals/NetworkState.h index 0c1b750a7..b579c6f13 100644 --- a/src/ESPEasy/net/Globals/NetworkState.h +++ b/src/ESPEasy/net/Globals/NetworkState.h @@ -28,3 +28,6 @@ extern IPAddress apIP; // udp protocol stuff (syslog, global sync, node info list, ntp time) extern WiFiUDP portUDP; +#ifdef ESP32 +extern bool nonDefaultNetworkInterface_gotIP; +#endif \ No newline at end of file diff --git a/src/ESPEasy/net/NWPluginStructs/NW003_data_struct_ETH_RMII.cpp b/src/ESPEasy/net/NWPluginStructs/NW003_data_struct_ETH_RMII.cpp index eea092ddd..73b4126a1 100644 --- a/src/ESPEasy/net/NWPluginStructs/NW003_data_struct_ETH_RMII.cpp +++ b/src/ESPEasy/net/NWPluginStructs/NW003_data_struct_ETH_RMII.cpp @@ -8,6 +8,8 @@ # include "../../../src/Helpers/LongTermOnOffTimer.h" # include "../../../src/Helpers/StringConverter.h" +#include "../Globals/NetworkState.h" + # define NW_PLUGIN_ID 3 # define NW_PLUGIN_INTERFACE ETH @@ -105,6 +107,10 @@ void NW003_data_struct_ETH_RMII::onEvent(arduino_event_id_t event, break; case ARDUINO_EVENT_ETH_GOT_IP: + if (!NW_PLUGIN_INTERFACE.isDefault()) { + nonDefaultNetworkInterface_gotIP = true; + } + for (size_t i = 0; i < NR_ELEMENTS(_dns_cache); ++i) { auto tmp = NW_PLUGIN_INTERFACE.dnsIP(i); diff --git a/src/ESPEasy/net/NWPluginStructs/NW004_data_struct_ETH_SPI.cpp b/src/ESPEasy/net/NWPluginStructs/NW004_data_struct_ETH_SPI.cpp index 61cb7105a..e4c4a8fb2 100644 --- a/src/ESPEasy/net/NWPluginStructs/NW004_data_struct_ETH_SPI.cpp +++ b/src/ESPEasy/net/NWPluginStructs/NW004_data_struct_ETH_SPI.cpp @@ -8,6 +8,8 @@ # include "../../../src/Helpers/LongTermOnOffTimer.h" # include "../../../src/Helpers/StringConverter.h" +#include "../Globals/NetworkState.h" + # define NW_PLUGIN_ID 4 # define NW_PLUGIN_INTERFACE ETH @@ -108,6 +110,10 @@ void NW004_data_struct_ETH_SPI::onEvent(arduino_event_id_t event, break; case ARDUINO_EVENT_ETH_GOT_IP: + if (!NW_PLUGIN_INTERFACE.isDefault()) { + nonDefaultNetworkInterface_gotIP = true; + } + for (size_t i = 0; i < NR_ELEMENTS(_dns_cache); ++i) { auto tmp = NW_PLUGIN_INTERFACE.dnsIP(i); diff --git a/src/ESPEasy/net/NWPluginStructs/NW005_data_struct_PPP_modem.cpp b/src/ESPEasy/net/NWPluginStructs/NW005_data_struct_PPP_modem.cpp index 2f9886331..d9a92c122 100644 --- a/src/ESPEasy/net/NWPluginStructs/NW005_data_struct_PPP_modem.cpp +++ b/src/ESPEasy/net/NWPluginStructs/NW005_data_struct_PPP_modem.cpp @@ -14,6 +14,8 @@ # include "../../../src/WebServer/Markup_Forms.h" # include "../../../src/WebServer/ESPEasy_key_value_store_webform.h" +#include "../Globals/NetworkState.h" + # include # include @@ -960,6 +962,10 @@ void NW005_data_struct_PPP_modem::onEvent(arduino_event_id_t event, arduino_even break; case ARDUINO_EVENT_PPP_GOT_IP: + if (!NW_PLUGIN_INTERFACE.isDefault()) { + nonDefaultNetworkInterface_gotIP = true; + } + for (size_t i = 0; i < NR_ELEMENTS(_dns_cache); ++i) { auto tmp = NW_PLUGIN_INTERFACE.dnsIP(i); diff --git a/src/ESPEasy/net/_NW004_ETH_SPI.cpp b/src/ESPEasy/net/_NW004_ETH_SPI.cpp index 28b64b163..bf04eb925 100644 --- a/src/ESPEasy/net/_NW004_ETH_SPI.cpp +++ b/src/ESPEasy/net/_NW004_ETH_SPI.cpp @@ -300,9 +300,6 @@ bool NWPlugin_004(NWPlugin::Function function, EventStruct *event, String& strin break; } - case NWPlugin::Function::NWPLUGIN_TEN_PER_SECOND: - // FIXME TD-er: Must make this act on DNS updates from other interfaces - // Fall through case NWPlugin::Function::NWPLUGIN_PRIORITY_ROUTE_CHANGED: { ESPEasy::net::eth::NW004_data_struct_ETH_SPI *NW_data = diff --git a/src/ESPEasy/net/_NW005_PPP_modem.cpp b/src/ESPEasy/net/_NW005_PPP_modem.cpp index ab609e980..cfec513e7 100644 --- a/src/ESPEasy/net/_NW005_PPP_modem.cpp +++ b/src/ESPEasy/net/_NW005_PPP_modem.cpp @@ -203,9 +203,6 @@ bool NWPlugin_005(NWPlugin::Function function, EventStruct *event, String& strin break; } - case NWPlugin::Function::NWPLUGIN_TEN_PER_SECOND: - // FIXME TD-er: Must make this act on DNS updates from other interfaces - // Fall through case NWPlugin::Function::NWPLUGIN_PRIORITY_ROUTE_CHANGED: { ESPEasy::net::ppp::NW005_data_struct_PPP_modem *NW_data = diff --git a/src/ESPEasy/net/wifi/ESPEasyWiFi_STA_Event_ESP32.cpp b/src/ESPEasy/net/wifi/ESPEasyWiFi_STA_Event_ESP32.cpp index 52872a98f..38d47d87d 100644 --- a/src/ESPEasy/net/wifi/ESPEasyWiFi_STA_Event_ESP32.cpp +++ b/src/ESPEasy/net/wifi/ESPEasyWiFi_STA_Event_ESP32.cpp @@ -167,7 +167,10 @@ void ESPEasyWiFi_STA_EventHandler::WiFiEvent(WiFiEvent_t event_id, arduino_event if (tmp != INADDR_NONE) { addLog(LOG_LEVEL_INFO, strformat(F("DNS Cache %d set to %s"), i, tmp.toString(true).c_str())); } + } + if (!WiFi.STA.isDefault()) { + nonDefaultNetworkInterface_gotIP = true; } // Set OnOffTimer to off so we can also count how often we het new IP @@ -177,6 +180,11 @@ void ESPEasyWiFi_STA_EventHandler::WiFiEvent(WiFiEvent_t event_id, arduino_event break; # if FEATURE_USE_IPV6 case ARDUINO_EVENT_WIFI_STA_GOT_IP6: + + if (!WiFi.STA.isDefault()) { + nonDefaultNetworkInterface_gotIP = true; + } + _gotIP6Stats.setOn(); addLog(LOG_LEVEL_INFO, F("STA_GOT_IP6")); diff --git a/src/ESPEasy/net/wifi/ESPEasyWiFi_STA_Event_ESP32.h b/src/ESPEasy/net/wifi/ESPEasyWiFi_STA_Event_ESP32.h index 725725423..e71aeff6e 100644 --- a/src/ESPEasy/net/wifi/ESPEasyWiFi_STA_Event_ESP32.h +++ b/src/ESPEasy/net/wifi/ESPEasyWiFi_STA_Event_ESP32.h @@ -19,7 +19,7 @@ # include # include -# include "../wifi/WiFiDisconnectReason.h" +# include "../wifi/WiFiDisconnectReason.h" namespace ESPEasy { @@ -34,7 +34,7 @@ public: ESPEasyWiFi_STA_EventHandler(); ~ESPEasyWiFi_STA_EventHandler(); - static bool initialized(); + static bool initialized(); LongTermOnOffTimer getEnabled_OnOffTimer() const; LongTermOnOffTimer getConnected_OnOffTimer() const; @@ -45,7 +45,7 @@ public: WiFiDisconnectReason getLastDisconnectReason() const; - uint8_t getAuthMode() const; + uint8_t getAuthMode() const; bool restore_dns_from_cache() const; diff --git a/src/ESPEasy/net/wifi/ESPEasyWiFi_STA_Event_ESP8266.cpp b/src/ESPEasy/net/wifi/ESPEasyWiFi_STA_Event_ESP8266.cpp index 8c0b259a7..98606e2f4 100644 --- a/src/ESPEasy/net/wifi/ESPEasyWiFi_STA_Event_ESP8266.cpp +++ b/src/ESPEasy/net/wifi/ESPEasyWiFi_STA_Event_ESP8266.cpp @@ -40,13 +40,13 @@ ESPEasyWiFi_STA_EventHandler::ESPEasyWiFi_STA_EventHandler() // WiFi event handlers if (!_ESPEasyWiFi_STA_EventHandler_initialized) { - stationConnectedHandler = WiFi.onStationModeConnected(onConnected); - stationDisconnectedHandler = WiFi.onStationModeDisconnected(onDisconnect); - stationGotIpHandler = WiFi.onStationModeGotIP(onGotIP); - stationModeDHCPTimeoutHandler = WiFi.onStationModeDHCPTimeout(onDHCPTimeout); - stationModeAuthModeChangeHandler = WiFi.onStationModeAuthModeChanged(onStationModeAuthModeChanged); - APModeStationConnectedHandler = WiFi.onSoftAPModeStationConnected(onConnectedAPmode); - APModeStationDisconnectedHandler = WiFi.onSoftAPModeStationDisconnected(onDisconnectedAPmode); + stationConnectedHandler = WiFi.onStationModeConnected(onConnected); + stationDisconnectedHandler = WiFi.onStationModeDisconnected(onDisconnect); + stationGotIpHandler = WiFi.onStationModeGotIP(onGotIP); + stationModeDHCPTimeoutHandler = WiFi.onStationModeDHCPTimeout(onDHCPTimeout); + stationModeAuthModeChangeHandler = WiFi.onStationModeAuthModeChanged(onStationModeAuthModeChanged); + APModeStationConnectedHandler = WiFi.onSoftAPModeStationConnected(onConnectedAPmode); + APModeStationDisconnectedHandler = WiFi.onSoftAPModeStationDisconnected(onDisconnectedAPmode); _ESPEasyWiFi_STA_EventHandler_initialized = true; } } @@ -54,7 +54,7 @@ ESPEasyWiFi_STA_EventHandler::ESPEasyWiFi_STA_EventHandler() ESPEasyWiFi_STA_EventHandler::~ESPEasyWiFi_STA_EventHandler() {} -bool ESPEasyWiFi_STA_EventHandler::initialized() { return _ESPEasyWiFi_STA_EventHandler_initialized; } +bool ESPEasyWiFi_STA_EventHandler::initialized() { return _ESPEasyWiFi_STA_EventHandler_initialized; } LongTermOnOffTimer ESPEasyWiFi_STA_EventHandler::getEnabled_OnOffTimer() const { return _startStopStats; } @@ -64,8 +64,7 @@ LongTermOnOffTimer ESPEasyWiFi_STA_EventHandler::getGotIp_OnOffTimer() const WiFiDisconnectReason ESPEasyWiFi_STA_EventHandler::getLastDisconnectReason() const { return _wifi_disconnect_reason; } -uint8_t ESPEasyWiFi_STA_EventHandler::getAuthMode() const { return _authmode; } - +uint8_t ESPEasyWiFi_STA_EventHandler::getAuthMode() const { return _authmode; } // ******************************************************************************** // Functions called on events. @@ -73,13 +72,15 @@ uint8_t ESPEasyWiFi_STA_EventHandler::getAuthMode() const { return _authmode; } // ******************************************************************************** void ESPEasyWiFi_STA_EventHandler::onConnected(const WiFiEventStationModeConnected& event) { _connectedStats.setOn(); -// WiFiEventData.markConnected(event.ssid, event.bssid, event.channel); + + // WiFiEventData.markConnected(event.ssid, event.bssid, event.channel); } void ESPEasyWiFi_STA_EventHandler::onDisconnect(const WiFiEventStationModeDisconnected& event) { _connectedStats.setOff(); _gotIPStats.setOff(); -// WiFiEventData.markDisconnect(event.reason); + + // WiFiEventData.markDisconnect(event.reason); if (WiFi.status() == WL_CONNECTED) { // See https://github.com/esp8266/Arduino/issues/5912 @@ -95,24 +96,25 @@ void ESPEasyWiFi_STA_EventHandler::onGotIP(const WiFiEventStationModeGotIP& even _gotIPStats.setOff(); _gotIPStats.setOn(); - //WiFiEventData.markGotIP(event.ip, event.mask, event.gw); + // WiFiEventData.markGotIP(event.ip, event.mask, event.gw); } void ESPEasyWiFi_STA_EventHandler::onDHCPTimeout() { -// WiFiEventData.processedDHCPTimeout = false; + // WiFiEventData.processedDHCPTimeout = false; } void ESPEasyWiFi_STA_EventHandler::onConnectedAPmode(const WiFiEventSoftAPModeStationConnected& event) { -// WiFiEventData.markConnectedAPmode(event.mac); + // WiFiEventData.markConnectedAPmode(event.mac); } void ESPEasyWiFi_STA_EventHandler::onDisconnectedAPmode(const WiFiEventSoftAPModeStationDisconnected& event) { -// WiFiEventData.markDisconnectedAPmode(event.mac); + // WiFiEventData.markDisconnectedAPmode(event.mac); } void ESPEasyWiFi_STA_EventHandler::onStationModeAuthModeChanged(const WiFiEventStationModeAuthModeChanged& event) { _authmode = event.newMode; -// WiFiEventData.setAuthMode(event.newMode); + + // WiFiEventData.setAuthMode(event.newMode); } # if FEATURE_ESP8266_DIRECT_WIFI_SCAN @@ -148,7 +150,7 @@ void ESPEasyWiFi_STA_EventHandler::onWiFiScanDone(void ESPEasyWiFi_STA_EventHand // addLog(LOG_LEVEL_INFO, F("WiFi : Added known candidate, try to connect")); } # endif // ifndef BUILD_NO_DEBUG -// NetworkConnectRelaxed(); + // NetworkConnectRelaxed(); } } diff --git a/src/ESPEasy/net/wifi/ESPEasyWiFi_STA_Event_ESP8266.h b/src/ESPEasy/net/wifi/ESPEasyWiFi_STA_Event_ESP8266.h index 3f9816fb1..443ad6bbe 100644 --- a/src/ESPEasy/net/wifi/ESPEasyWiFi_STA_Event_ESP8266.h +++ b/src/ESPEasy/net/wifi/ESPEasyWiFi_STA_Event_ESP8266.h @@ -32,13 +32,13 @@ public: ESPEasyWiFi_STA_EventHandler(); ~ESPEasyWiFi_STA_EventHandler(); - static bool initialized(); - - LongTermOnOffTimer getEnabled_OnOffTimer() const; - LongTermOnOffTimer getConnected_OnOffTimer() const; - LongTermOnOffTimer getGotIp_OnOffTimer() const; + static bool initialized(); + + LongTermOnOffTimer getEnabled_OnOffTimer() const; + LongTermOnOffTimer getConnected_OnOffTimer() const; + LongTermOnOffTimer getGotIp_OnOffTimer() const; WiFiDisconnectReason getLastDisconnectReason() const; - uint8_t getAuthMode() const; + uint8_t getAuthMode() const; // ******************************************************************************** diff --git a/src/ESPEasy/net/wifi/ESPEasyWiFi_state_machine.cpp b/src/ESPEasy/net/wifi/ESPEasyWiFi_state_machine.cpp index 90f34d43c..8d9cf2237 100644 --- a/src/ESPEasy/net/wifi/ESPEasyWiFi_state_machine.cpp +++ b/src/ESPEasy/net/wifi/ESPEasyWiFi_state_machine.cpp @@ -275,7 +275,7 @@ void ESPEasyWiFi_t::setState(WiFiState_e newState, uint32_t timeout) { # ifdef ESP32 // FIXME TD-er: Must move to ESP32-specific cpp file - //WiFi.STA.setDefault(); + // WiFi.STA.setDefault(); # endif // ifdef ESP32 _last_seen_connected.setNow(); _state_timeout.clear(); diff --git a/src/ESPEasy/net/wifi/ESPEasyWifi_abstracted_ESP32.cpp b/src/ESPEasy/net/wifi/ESPEasyWifi_abstracted_ESP32.cpp index d60f2f051..861f1e410 100644 --- a/src/ESPEasy/net/wifi/ESPEasyWifi_abstracted_ESP32.cpp +++ b/src/ESPEasy/net/wifi/ESPEasyWifi_abstracted_ESP32.cpp @@ -27,9 +27,9 @@ namespace net { namespace wifi { bool WiFi_pre_setup() { - if (!ESPEasyWiFi_STA_EventHandler::initialized()) return false; + if (!ESPEasyWiFi_STA_EventHandler::initialized()) { return false; } -// registerWiFiEventHandler(); + // registerWiFiEventHandler(); WiFi.persistent(false); return doSetSTA_AP(false, false); @@ -69,7 +69,7 @@ bool doSetWifiMode(WiFiMode_t new_mode) if (cur_mode == new_mode) { if (cur_mode != WIFI_OFF) { -// registerWiFiEventHandler(); + // registerWiFiEventHandler(); } return true; } @@ -290,7 +290,6 @@ void doWifiScan(bool async, uint8_t channel) { # endif // if CONFIG_SOC_WIFI_SUPPORT_5G } - float doGetRSSIthreshold(float& maxTXpwr) { maxTXpwr = Settings.getWiFi_TX_power(); @@ -578,16 +577,14 @@ void doSetWiFiCountryPolicyManual() } /* -class WiFi_Access_Static_IP : public WiFiSTAClass -{ -public: + class WiFi_Access_Static_IP : public WiFiSTAClass + { + public: - void set_use_static_ip(bool enabled); -}; -*/ - -void doSetUseStaticIP(bool enabled) -{} + void set_use_static_ip(bool enabled); + }; + */ +void doSetUseStaticIP(bool enabled) {} } // namespace wifi } // namespace net diff --git a/src/ESPEasy/net/wifi/ESPEasyWifi_abstracted_ESP8266.cpp b/src/ESPEasy/net/wifi/ESPEasyWifi_abstracted_ESP8266.cpp index 4f1f4791f..1abdfad88 100644 --- a/src/ESPEasy/net/wifi/ESPEasyWifi_abstracted_ESP8266.cpp +++ b/src/ESPEasy/net/wifi/ESPEasyWifi_abstracted_ESP8266.cpp @@ -19,7 +19,7 @@ namespace net { namespace wifi { bool WiFi_pre_setup() { - if (!ESPEasyWiFi_STA_EventHandler::initialized()) return false; + if (!ESPEasyWiFi_STA_EventHandler::initialized()) { return false; } doSetSTA_AP(false, false); delay(100); @@ -209,7 +209,6 @@ void doWifiScan(bool async, uint8_t channel) { } - float doGetRSSIthreshold(float& maxTXpwr) { maxTXpwr = Settings.getWiFi_TX_power(); @@ -323,7 +322,6 @@ void doSetWiFiCountryPolicyManual() { // Not yet implemented/required for ESP8266 } - class WiFi_Access_Static_IP : public ESP8266WiFiSTAClass { public: @@ -335,6 +333,7 @@ void WiFi_Access_Static_IP::set_use_static_ip(bool enabled) { _useStaticIp = ena void doSetUseStaticIP(bool enabled) { WiFi_Access_Static_IP tmp; + tmp.set_use_static_ip(enabled); } diff --git a/src/src/Helpers/PeriodicalActions.cpp b/src/src/Helpers/PeriodicalActions.cpp index 4e6987d62..afdbe6a0e 100644 --- a/src/src/Helpers/PeriodicalActions.cpp +++ b/src/src/Helpers/PeriodicalActions.cpp @@ -62,7 +62,8 @@ void run50TimesPerSecond() { #ifdef ESP32 static const NetworkInterface *lastDefaultInterface = nullptr; NetworkInterface * currentDefaultInterface = Network.getDefaultInterface(); - if (lastDefaultInterface != currentDefaultInterface) { + if (nonDefaultNetworkInterface_gotIP || lastDefaultInterface != currentDefaultInterface) { + nonDefaultNetworkInterface_gotIP = false; ESPEasy::net::NWPluginCall(NWPlugin::Function::NWPLUGIN_PRIORITY_ROUTE_CHANGED, 0, dummy); lastDefaultInterface = currentDefaultInterface; } From 5559d5fde3d1d4e98d4912d9bc40a75840294c60 Mon Sep 17 00:00:00 2001 From: TD-er Date: Sat, 2 Aug 2025 01:48:45 +0200 Subject: [PATCH 172/564] [Network] Make connected info more consistent among network interfaces --- .../NW001_data_struct_WiFi_STA.cpp | 4 ++++ .../NW001_data_struct_WiFi_STA.h | 2 ++ .../NW003_data_struct_ETH_RMII.cpp | 5 +++++ .../NW003_data_struct_ETH_RMII.h | 2 ++ .../NW004_data_struct_ETH_SPI.cpp | 5 +++++ .../NW004_data_struct_ETH_SPI.h | 2 ++ .../NW005_data_struct_PPP_modem.h | 1 - src/ESPEasy/net/_NW001_WiFi_STA.cpp | 16 +++++++++++++++ src/ESPEasy/net/_NW002_WiFi_AP.cpp | 20 ++++++++++++++++++- src/ESPEasy/net/_NW003_ETH_RMII.cpp | 13 ++++++++++++ src/ESPEasy/net/_NW004_ETH_SPI.cpp | 13 ++++++++++++ src/ESPEasy/net/_NW005_PPP_modem.cpp | 2 +- src/ESPEasy/net/_NWPlugin_Helper.h | 1 + src/src/WebServer/NetworkPage.cpp | 11 ++++++++++ 14 files changed, 94 insertions(+), 3 deletions(-) diff --git a/src/ESPEasy/net/NWPluginStructs/NW001_data_struct_WiFi_STA.cpp b/src/ESPEasy/net/NWPluginStructs/NW001_data_struct_WiFi_STA.cpp index cfdfa5593..e22f5fb31 100644 --- a/src/ESPEasy/net/NWPluginStructs/NW001_data_struct_WiFi_STA.cpp +++ b/src/ESPEasy/net/NWPluginStructs/NW001_data_struct_WiFi_STA.cpp @@ -102,6 +102,10 @@ bool NW001_data_struct_WiFi_STA::handle_priority_route_changed() # endif // ifdef ESP32 +LongTermTimer::Duration NW001_data_struct_WiFi_STA::getConnectedDuration_ms() const +{ + return _WiFiEventHandler.getConnected_OnOffTimer().getLastOnDuration_ms(); +} } // namespace wifi } // namespace net diff --git a/src/ESPEasy/net/NWPluginStructs/NW001_data_struct_WiFi_STA.h b/src/ESPEasy/net/NWPluginStructs/NW001_data_struct_WiFi_STA.h index ecbfc5e96..202fbe629 100644 --- a/src/ESPEasy/net/NWPluginStructs/NW001_data_struct_WiFi_STA.h +++ b/src/ESPEasy/net/NWPluginStructs/NW001_data_struct_WiFi_STA.h @@ -34,6 +34,8 @@ struct NW001_data_struct_WiFi_STA : public NWPluginData_base { bool handle_priority_route_changed(); # endif + LongTermTimer::Duration getConnectedDuration_ms() const; + private: ESPEasyWiFi_STA_EventHandler _WiFiEventHandler{}; diff --git a/src/ESPEasy/net/NWPluginStructs/NW003_data_struct_ETH_RMII.cpp b/src/ESPEasy/net/NWPluginStructs/NW003_data_struct_ETH_RMII.cpp index 73b4126a1..57563cfd9 100644 --- a/src/ESPEasy/net/NWPluginStructs/NW003_data_struct_ETH_RMII.cpp +++ b/src/ESPEasy/net/NWPluginStructs/NW003_data_struct_ETH_RMII.cpp @@ -84,6 +84,11 @@ bool NW003_data_struct_ETH_RMII::handle_priority_route_changed() return res; } +LongTermTimer::Duration NW003_data_struct_ETH_RMII::getConnectedDuration_ms() const +{ + return _connectedStats.getLastOnDuration_ms(); +} + void NW003_data_struct_ETH_RMII::onEvent(arduino_event_id_t event, arduino_event_info_t info) { diff --git a/src/ESPEasy/net/NWPluginStructs/NW003_data_struct_ETH_RMII.h b/src/ESPEasy/net/NWPluginStructs/NW003_data_struct_ETH_RMII.h index 2c388fba1..d90037ccc 100644 --- a/src/ESPEasy/net/NWPluginStructs/NW003_data_struct_ETH_RMII.h +++ b/src/ESPEasy/net/NWPluginStructs/NW003_data_struct_ETH_RMII.h @@ -26,6 +26,8 @@ struct NW003_data_struct_ETH_RMII : public NWPluginData_base { bool handle_priority_route_changed(); + LongTermTimer::Duration getConnectedDuration_ms() const; + private: static void onEvent(arduino_event_id_t event, diff --git a/src/ESPEasy/net/NWPluginStructs/NW004_data_struct_ETH_SPI.cpp b/src/ESPEasy/net/NWPluginStructs/NW004_data_struct_ETH_SPI.cpp index e4c4a8fb2..9bff6da8f 100644 --- a/src/ESPEasy/net/NWPluginStructs/NW004_data_struct_ETH_SPI.cpp +++ b/src/ESPEasy/net/NWPluginStructs/NW004_data_struct_ETH_SPI.cpp @@ -87,6 +87,11 @@ bool NW004_data_struct_ETH_SPI::handle_priority_route_changed() return res; } +LongTermTimer::Duration NW004_data_struct_ETH_SPI::getConnectedDuration_ms() const +{ + return _connectedStats.getLastOnDuration_ms(); +} + void NW004_data_struct_ETH_SPI::onEvent(arduino_event_id_t event, arduino_event_info_t info) { diff --git a/src/ESPEasy/net/NWPluginStructs/NW004_data_struct_ETH_SPI.h b/src/ESPEasy/net/NWPluginStructs/NW004_data_struct_ETH_SPI.h index 972ae4d97..e5a02aa89 100644 --- a/src/ESPEasy/net/NWPluginStructs/NW004_data_struct_ETH_SPI.h +++ b/src/ESPEasy/net/NWPluginStructs/NW004_data_struct_ETH_SPI.h @@ -25,6 +25,8 @@ struct NW004_data_struct_ETH_SPI : public NWPluginData_base { bool handle_priority_route_changed(); + LongTermTimer::Duration getConnectedDuration_ms() const; + private: static void onEvent(arduino_event_id_t event, diff --git a/src/ESPEasy/net/NWPluginStructs/NW005_data_struct_PPP_modem.h b/src/ESPEasy/net/NWPluginStructs/NW005_data_struct_PPP_modem.h index 7beed2623..ff4251098 100644 --- a/src/ESPEasy/net/NWPluginStructs/NW005_data_struct_PPP_modem.h +++ b/src/ESPEasy/net/NWPluginStructs/NW005_data_struct_PPP_modem.h @@ -3,7 +3,6 @@ #include "../_NWPlugin_Helper.h" #ifdef USES_NW005 -# include "../../../src/Helpers/LongTermTimer.h" # include "../../../src/Helpers/StringGenerator_GPIO.h" # include diff --git a/src/ESPEasy/net/_NW001_WiFi_STA.cpp b/src/ESPEasy/net/_NW001_WiFi_STA.cpp index 885d221d6..7e5cb082b 100644 --- a/src/ESPEasy/net/_NW001_WiFi_STA.cpp +++ b/src/ESPEasy/net/_NW001_WiFi_STA.cpp @@ -91,6 +91,22 @@ bool NWPlugin_001(NWPlugin::Function function, EventStruct *event, String& strin WiFi.BSSIDstr().c_str()); } # endif // ifdef ESP32 + + if (success) { + ESPEasy::net::wifi::NW001_data_struct_WiFi_STA *NW_data = + static_cast(getNWPluginData(event->NetworkIndex)); + + if (NW_data) { + auto connectionDuration_ms = NW_data->getConnectedDuration_ms(); + + if (connectionDuration_ms > 0) { + string += concat( + '\n', + format_msec_duration_HMS(connectionDuration_ms)); + } + } + } + break; } diff --git a/src/ESPEasy/net/_NW002_WiFi_AP.cpp b/src/ESPEasy/net/_NW002_WiFi_AP.cpp index 52df19847..2db405245 100644 --- a/src/ESPEasy/net/_NW002_WiFi_AP.cpp +++ b/src/ESPEasy/net/_NW002_WiFi_AP.cpp @@ -70,10 +70,27 @@ bool NWPlugin_002(NWPlugin::Function function, EventStruct *event, String& strin { # ifdef ESP32 const uint8_t num = WiFi.AP.stationCount(); + /* + auto netif = WiFi.AP.netif(); + for (size_t i = 0; i < num; ++i) { + esp_netif_pair_mac_ip_t mac_ip_pair{}; + if (esp_netif_dhcps_get_clients_by_mac(netif, i, &mac_ip_pair) == 0) { + if (string.length() > 0) { + string += '\n'; + } + const MAC_address mac(mac_ip_pair.mac); + const IPAddress ip(mac_ip_pair.ip.addr); + string += strformat( + F("%s IP: %s"), + mac.toString().c_str(), + ip.toString().c_str() + ); + } + } + */ # else const uint8_t num = WiFi.softAPgetStationNum(); # endif // ifdef ESP32 - if (num > 0) { success = true; string = num; @@ -81,6 +98,7 @@ bool NWPlugin_002(NWPlugin::Function function, EventStruct *event, String& strin if (num > 1) { string += 's'; } } + success = string.length() > 0; break; } diff --git a/src/ESPEasy/net/_NW003_ETH_RMII.cpp b/src/ESPEasy/net/_NW003_ETH_RMII.cpp index a7bcfd33c..bf37e3862 100644 --- a/src/ESPEasy/net/_NW003_ETH_RMII.cpp +++ b/src/ESPEasy/net/_NW003_ETH_RMII.cpp @@ -88,6 +88,19 @@ bool NWPlugin_003(NWPlugin::Function function, EventStruct *event, String& strin string += ETH.fullDuplex() ? F("Mbps FD") : F("Mbps HD"); if (!ETH.autoNegotiation()) { string += F("(manual)"); } + + ESPEasy::net::eth::NW003_data_struct_ETH_RMII *NW_data = + static_cast(getNWPluginData(event->NetworkIndex)); + + if (NW_data) { + auto connectionDuration_ms = NW_data->getConnectedDuration_ms(); + + if (connectionDuration_ms > 0) { + string += concat( + '\n', + format_msec_duration_HMS(connectionDuration_ms)); + } + } } break; } diff --git a/src/ESPEasy/net/_NW004_ETH_SPI.cpp b/src/ESPEasy/net/_NW004_ETH_SPI.cpp index bf04eb925..dc731607f 100644 --- a/src/ESPEasy/net/_NW004_ETH_SPI.cpp +++ b/src/ESPEasy/net/_NW004_ETH_SPI.cpp @@ -91,6 +91,19 @@ bool NWPlugin_004(NWPlugin::Function function, EventStruct *event, String& strin string += ETH.fullDuplex() ? F("Mbps FD") : F("Mbps HD"); if (!ETH.autoNegotiation()) { string += F("(manual)"); } + ESPEasy::net::eth::NW004_data_struct_ETH_SPI *NW_data = + static_cast(getNWPluginData(event->NetworkIndex)); + + if (NW_data) { + auto connectionDuration_ms = NW_data->getConnectedDuration_ms(); + + if (connectionDuration_ms > 0) { + string += concat( + '\n', + format_msec_duration_HMS(connectionDuration_ms)); + } + } + } break; } diff --git a/src/ESPEasy/net/_NW005_PPP_modem.cpp b/src/ESPEasy/net/_NW005_PPP_modem.cpp index cfec513e7..4b7df09ac 100644 --- a/src/ESPEasy/net/_NW005_PPP_modem.cpp +++ b/src/ESPEasy/net/_NW005_PPP_modem.cpp @@ -90,7 +90,7 @@ bool NWPlugin_005(NWPlugin::Function function, EventStruct *event, String& strin if (connectionDuration_ms > 0) { string += concat( - F("
    "), + '\n', format_msec_duration_HMS(connectionDuration_ms)); } } diff --git a/src/ESPEasy/net/_NWPlugin_Helper.h b/src/ESPEasy/net/_NWPlugin_Helper.h index 8f848dd08..de4214204 100644 --- a/src/ESPEasy/net/_NWPlugin_Helper.h +++ b/src/ESPEasy/net/_NWPlugin_Helper.h @@ -4,6 +4,7 @@ # include "../../src/CustomBuild/ESPEasyLimits.h" # include "../../src/DataStructs/ESPEasy_EventStruct.h" +# include "../../src/Helpers/LongTermTimer.h" # include "../net/DataStructs/NWPluginData_base.h" namespace ESPEasy { diff --git a/src/src/WebServer/NetworkPage.cpp b/src/src/WebServer/NetworkPage.cpp index 9d3555f29..2b5105b5e 100644 --- a/src/src/WebServer/NetworkPage.cpp +++ b/src/src/WebServer/NetworkPage.cpp @@ -341,6 +341,17 @@ void handle_networks_NetworkSettingsPage(ESPEasy::net::networkIndex_t networkind { addFormSubHeader(F("Network Interface")); + { + String str; + const bool res = NWPluginCall(NWPlugin::Function::NWPLUGIN_WEBFORM_SHOW_CONNECTED, &TempEvent, str); + + if (res && !str.isEmpty()) { + addRowLabel(F("Connected")); + str.replace(F("\n"), F("
    ")); + addHtml_pre(str); + } + } + { String str; const bool res = NWPluginCall(NWPlugin::Function::NWPLUGIN_WEBFORM_SHOW_HW_ADDRESS, &TempEvent, str); From f941908db97567869a020cb5603658ef3c53f760 Mon Sep 17 00:00:00 2001 From: TD-er Date: Sun, 3 Aug 2025 17:49:02 +0200 Subject: [PATCH 173/564] [Network] Move common code to collect connection stats to base class --- .../net/DataStructs/NWPluginData_base.cpp | 155 +++++++++++++++++- .../net/DataStructs/NWPluginData_base.h | 43 ++++- .../NWPluginData_static_runtime.cpp | 19 +++ .../DataStructs/NWPluginData_static_runtime.h | 40 +++++ .../NW001_data_struct_WiFi_STA.cpp | 21 ++- .../NW001_data_struct_WiFi_STA.h | 28 ++-- .../NW002_data_struct_WiFi_AP.cpp | 26 ++- .../NW002_data_struct_WiFi_AP.h | 14 +- .../NW003_data_struct_ETH_RMII.cpp | 87 ++-------- .../NW003_data_struct_ETH_RMII.h | 15 +- .../NW004_data_struct_ETH_SPI.cpp | 87 ++-------- .../NW004_data_struct_ETH_SPI.h | 14 +- .../NW005_data_struct_PPP_modem.cpp | 90 ++-------- .../NW005_data_struct_PPP_modem.h | 30 ++-- .../net/wifi/ESPEasyWiFi_STA_Event_ESP32.cpp | 72 ++++---- .../net/wifi/ESPEasyWiFi_STA_Event_ESP32.h | 17 +- .../wifi/ESPEasyWiFi_STA_Event_ESP8266.cpp | 30 ++-- .../net/wifi/ESPEasyWiFi_STA_Event_ESP8266.h | 13 +- 18 files changed, 427 insertions(+), 374 deletions(-) create mode 100644 src/ESPEasy/net/DataStructs/NWPluginData_static_runtime.cpp create mode 100644 src/ESPEasy/net/DataStructs/NWPluginData_static_runtime.h diff --git a/src/ESPEasy/net/DataStructs/NWPluginData_base.cpp b/src/ESPEasy/net/DataStructs/NWPluginData_base.cpp index e7f6e0d74..cc25b5e7c 100644 --- a/src/ESPEasy/net/DataStructs/NWPluginData_base.cpp +++ b/src/ESPEasy/net/DataStructs/NWPluginData_base.cpp @@ -1,44 +1,58 @@ #include "../DataStructs/NWPluginData_base.h" -# include "../../../src/Globals/RuntimeData.h" -# include "../../../src/Globals/Settings.h" -# include "../../../src/Helpers/StringConverter.h" +#include "../../../src/Globals/RuntimeData.h" +#include "../../../src/Globals/Settings.h" +#include "../../../src/Helpers/StringConverter.h" #if FEATURE_STORE_NETWORK_INTERFACE_SETTINGS # include "../../../src/Helpers/_ESPEasy_key_value_store.h" #endif +#ifdef ESP32 +# include "../Globals/NetworkState.h" +#endif namespace ESPEasy { namespace net { -NWPluginData_base::NWPluginData_base(nwpluginID_t nwpluginID, networkIndex_t networkIndex) : +NWPluginData_base::NWPluginData_base( + nwpluginID_t nwpluginID, networkIndex_t networkIndex +#ifdef ESP32 + , NetworkInterface *netif +#endif + ) : #if FEATURE_STORE_NETWORK_INTERFACE_SETTINGS _kvs(nullptr), #endif _nw_data_pluginID(nwpluginID), _networkIndex(networkIndex), _baseClassOnly(false) +#ifdef ESP32 + , _netif(netif) +#endif { #if FEATURE_STORE_NETWORK_INTERFACE_SETTINGS + if (_kvs == nullptr) { _kvs = new (std::nothrow) ESPEasy_key_value_store; } -#endif +#endif // if FEATURE_STORE_NETWORK_INTERFACE_SETTINGS } NWPluginData_base::~NWPluginData_base() { #if FEATURE_STORE_NETWORK_INTERFACE_SETTINGS + if (_kvs) { delete _kvs; } _kvs = nullptr; -#endif +#endif // if FEATURE_STORE_NETWORK_INTERFACE_SETTINGS } bool NWPluginData_base::plugin_write_base(EventStruct *event, const String& string) { return false; } #if FEATURE_STORE_NETWORK_INTERFACE_SETTINGS + bool NWPluginData_base::init_KVS() { if (!_KVS_initialized()) { return false; } @@ -49,6 +63,131 @@ bool NWPluginData_base::init_KVS() return true; } +#endif // if FEATURE_STORE_NETWORK_INTERFACE_SETTINGS + +LongTermTimer::Duration NWPluginData_base::getConnectedDuration_ms() { + return getNWPluginData_static_runtime()._connectedStats.getLastOnDuration_ms(); +} + +#ifdef ESP32 + +bool NWPluginData_base::handle_priority_route_changed() +{ + bool res{}; + + if ((_netif != nullptr) && _netif->isDefault()) { + if (NWPlugin::forceDHCP_request(_netif)) { return true; } + + NWPluginData_static_runtime& cache = getNWPluginData_static_runtime(); + + // Check to see if we may need to restore any cached DNS server + for (size_t i = 0; i < NR_ELEMENTS(cache._dns_cache); ++i) { + auto tmp = _netif->dnsIP(i); + + if ((cache._dns_cache[i] != INADDR_NONE) && (cache._dns_cache[i] != tmp)) { + addLog(LOG_LEVEL_INFO, strformat( + F("%s: Restore cached DNS server %d from %s to %s"), + esp_netif_get_desc(_netif->netif()), + i, + tmp.toString().c_str(), + cache._dns_cache[i].toString().c_str() + )); + + _netif->dnsIP(i, cache._dns_cache[i]); + res = true; + } + } + } + return res; +} + +#endif // ifdef ESP32 + + +#ifdef ESP32 + +void NWPluginData_base::_mark_got_IP(NWPluginData_static_runtime& cache) +{ + if (!cache._netif->isDefault()) { + nonDefaultNetworkInterface_gotIP = true; + } + + for (size_t i = 0; i < NR_ELEMENTS(cache._dns_cache); ++i) { + auto tmp = cache._netif->dnsIP(i); + + if (tmp != INADDR_NONE) { + cache._dns_cache[i] = tmp; + addLog(LOG_LEVEL_INFO, strformat( + F("%s: DNS Cache %d set to %s"), + esp_netif_get_desc(cache._netif->netif()), + i, + tmp.toString(true).c_str())); + } + } + addLog(LOG_LEVEL_INFO, strformat( + F("%s: Got IP: %s"), + esp_netif_get_desc(cache._netif->netif()), + cache._netif->localIP().toString().c_str() + )); +} + +#else // ifdef ESP32 + +void NWPluginData_base::_mark_got_IP(NWPluginData_static_runtime& cache) { addLog(LOG_LEVEL_INFO, F("STA: Got IP")); } + +#endif // ifdef ESP32 + +void NWPluginData_base::_mark_disconnected(const NWPluginData_static_runtime& cache) +{ + #ifdef ESP32 + addLog(LOG_LEVEL_INFO, strformat( + F("%s: Disconnected. Connected for: "), + esp_netif_get_desc(cache._netif->netif()), + format_msec_duration_HMS( + cache._connectedStats.getLastOnDuration_ms()))); +#else // ifdef ESP32 + addLog(LOG_LEVEL_INFO, concat( + F("STA: Disconnected. Connected for: "), + format_msec_duration_HMS(cache._connectedStats.getLastOnDuration_ms()))); +#endif // ifdef ESP32 +} + +#ifdef ESP32 + +bool NWPluginData_base::_restore_DNS_cache() +{ + bool res{}; + + if ((_netif != nullptr) && _netif->isDefault()) { + if (NWPlugin::forceDHCP_request(_netif)) { return true; } + + NWPluginData_static_runtime& cache = getNWPluginData_static_runtime(); + + // Check to see if we may need to restore any cached DNS server + for (size_t i = 0; i < NR_ELEMENTS(cache._dns_cache); ++i) { + auto tmp = _netif->dnsIP(i); + + if ((cache._dns_cache[i] != INADDR_NONE) && (cache._dns_cache[i] != tmp)) { + addLog(LOG_LEVEL_INFO, strformat( + F("NW%03%d: Restore cached DNS server %d from %s to %s"), + _nw_data_pluginID, + i, + tmp.toString().c_str(), + cache._dns_cache[i].toString().c_str() + )); + + _netif->dnsIP(i, cache._dns_cache[i]); + res = true; + } + } + } + return res; +} + +#endif // ifdef ESP32 + +#if FEATURE_STORE_NETWORK_INTERFACE_SETTINGS + bool NWPluginData_base::_load() { if (!_kvs) { return false; } @@ -68,8 +207,8 @@ bool NWPluginData_base::_store() 0, _nw_data_pluginID.value); } -#endif + +#endif // if FEATURE_STORE_NETWORK_INTERFACE_SETTINGS } // namespace net } // namespace ESPEasy - diff --git a/src/ESPEasy/net/DataStructs/NWPluginData_base.h b/src/ESPEasy/net/DataStructs/NWPluginData_base.h index 8348f44ae..5115ccd65 100644 --- a/src/ESPEasy/net/DataStructs/NWPluginData_base.h +++ b/src/ESPEasy/net/DataStructs/NWPluginData_base.h @@ -3,9 +3,10 @@ #include "../../../ESPEasy_common.h" -# include "../DataTypes/NWPluginID.h" -# include "../DataTypes/NetworkIndex.h" -# include "../../../src/DataStructs/ESPEasy_EventStruct.h" +#include "../DataTypes/NWPluginID.h" +#include "../DataTypes/NetworkIndex.h" +#include "../../../src/DataStructs/ESPEasy_EventStruct.h" +#include "../DataStructs/NWPluginData_static_runtime.h" #if FEATURE_STORE_NETWORK_INTERFACE_SETTINGS # include "../../../src/Helpers/_ESPEasy_key_value_store.h" @@ -23,8 +24,13 @@ namespace net { // N.B. in order to use this, a data object must inherit from this base class. // This is a compile time check. struct NWPluginData_base { - NWPluginData_base(nwpluginID_t nwpluginID, - networkIndex_t networkIndex); + NWPluginData_base(nwpluginID_t nwpluginID, + networkIndex_t networkIndex +#ifdef ESP32 + , + NetworkInterface *netif +#endif // ifdef ESP32 + ); virtual ~NWPluginData_base(); @@ -38,14 +44,30 @@ struct NWPluginData_base { // Should only be called from initNWPluginData #if FEATURE_STORE_NETWORK_INTERFACE_SETTINGS - bool init_KVS(); + bool init_KVS(); #endif - nwpluginID_t getNWPluginID() const { return _nw_data_pluginID; } + nwpluginID_t getNWPluginID() const { return _nw_data_pluginID; } + + virtual LongTermTimer::Duration getConnectedDuration_ms(); + +#ifdef ESP32 + virtual bool handle_priority_route_changed(); +#endif + + virtual NWPluginData_static_runtime& getNWPluginData_static_runtime() = 0; protected: + static void _mark_got_IP(NWPluginData_static_runtime& cache); + static void _mark_disconnected(const NWPluginData_static_runtime& cache); + +#ifdef ESP32 + bool _restore_DNS_cache(); +#endif + #if FEATURE_STORE_NETWORK_INTERFACE_SETTINGS + bool _KVS_initialized() const { return _kvs != nullptr; } // Load settings in the _kvs @@ -55,7 +77,7 @@ protected: bool _store(); ESPEasy_key_value_store *_kvs = nullptr; -#endif +#endif // if FEATURE_STORE_NETWORK_INTERFACE_SETTINGS // We cannot use dynamic_cast, so we must keep track of the plugin ID to // perform checks on the casting. @@ -68,10 +90,13 @@ protected: bool _baseClassOnly = false; #else bool _baseClassOnly = true; +#endif // if FEATURE_STORE_NETWORK_INTERFACE_SETTINGS + +#ifdef ESP32 + NetworkInterface *_netif{}; #endif }; } // namespace net } // namespace ESPEasy - diff --git a/src/ESPEasy/net/DataStructs/NWPluginData_static_runtime.cpp b/src/ESPEasy/net/DataStructs/NWPluginData_static_runtime.cpp new file mode 100644 index 000000000..25ffd0e15 --- /dev/null +++ b/src/ESPEasy/net/DataStructs/NWPluginData_static_runtime.cpp @@ -0,0 +1,19 @@ +#include "../DataStructs/NWPluginData_static_runtime.h" + + +namespace ESPEasy { +namespace net { + +void NWPluginData_static_runtime::clear() +{ + _connectedStats.clear(); + _gotIPStats.clear(); +#if FEATURE_USE_IPV6 + _gotIP6Stats.clear(); +#endif + + // FIXME TD-er: Should also clear dns cache? +} + +} // namespace net +} // namespace ESPEasy diff --git a/src/ESPEasy/net/DataStructs/NWPluginData_static_runtime.h b/src/ESPEasy/net/DataStructs/NWPluginData_static_runtime.h new file mode 100644 index 000000000..f1daa931b --- /dev/null +++ b/src/ESPEasy/net/DataStructs/NWPluginData_static_runtime.h @@ -0,0 +1,40 @@ +#pragma once + +#include "../../../src/Helpers/LongTermOnOffTimer.h" +#include +#ifdef ESP32 +# include +#endif + +namespace ESPEasy { +namespace net { + +struct NWPluginData_static_runtime { +#ifdef ESP32 + NWPluginData_static_runtime(NetworkInterface *netif) : _netif(netif) {} + +#else // ifdef ESP32 + NWPluginData_static_runtime() {} + +#endif // ifdef ESP32 + + void clear(); + + + LongTermOnOffTimer _startStopStats{}; + LongTermOnOffTimer _connectedStats{}; + LongTermOnOffTimer _gotIPStats{}; +#if FEATURE_USE_IPV6 + LongTermOnOffTimer _gotIP6Stats{}; +#endif +#ifdef ESP32 + IPAddress _dns_cache[2]{}; + int _route_prio = -1; + NetworkInterface *_netif{}; +#endif // ifdef ESP32 + +}; + + +} // namespace net +} // namespace ESPEasy diff --git a/src/ESPEasy/net/NWPluginStructs/NW001_data_struct_WiFi_STA.cpp b/src/ESPEasy/net/NWPluginStructs/NW001_data_struct_WiFi_STA.cpp index e22f5fb31..9bbd4c9d3 100644 --- a/src/ESPEasy/net/NWPluginStructs/NW001_data_struct_WiFi_STA.cpp +++ b/src/ESPEasy/net/NWPluginStructs/NW001_data_struct_WiFi_STA.cpp @@ -11,7 +11,9 @@ # include "../wifi/ESPEasyWifi.h" # define NW_PLUGIN_ID 1 -# define NW_PLUGIN_INTERFACE WiFi.STA +# ifdef ESP32 +# define NW_PLUGIN_INTERFACE WiFi.STA +# endif namespace ESPEasy { namespace net { @@ -19,7 +21,13 @@ namespace wifi { NW001_data_struct_WiFi_STA::NW001_data_struct_WiFi_STA(networkIndex_t networkIndex) - : NWPluginData_base(nwpluginID_t(NW_PLUGIN_ID), networkIndex) + : NWPluginData_base( + nwpluginID_t(NW_PLUGIN_ID) + , networkIndex +# ifdef ESP32 + , &NW_PLUGIN_INTERFACE +# endif + ) {} NW001_data_struct_WiFi_STA::~NW001_data_struct_WiFi_STA() @@ -89,6 +97,11 @@ bool NW001_data_struct_WiFi_STA::exit(EventStruct *event) { return true; } +NWPluginData_static_runtime& NW001_data_struct_WiFi_STA::getNWPluginData_static_runtime() { + return _WiFiEventHandler.getNWPluginData_static_runtime(); +} + + # ifdef ESP32 bool NW001_data_struct_WiFi_STA::handle_priority_route_changed() @@ -102,10 +115,6 @@ bool NW001_data_struct_WiFi_STA::handle_priority_route_changed() # endif // ifdef ESP32 -LongTermTimer::Duration NW001_data_struct_WiFi_STA::getConnectedDuration_ms() const -{ - return _WiFiEventHandler.getConnected_OnOffTimer().getLastOnDuration_ms(); -} } // namespace wifi } // namespace net diff --git a/src/ESPEasy/net/NWPluginStructs/NW001_data_struct_WiFi_STA.h b/src/ESPEasy/net/NWPluginStructs/NW001_data_struct_WiFi_STA.h index 202fbe629..571fddf90 100644 --- a/src/ESPEasy/net/NWPluginStructs/NW001_data_struct_WiFi_STA.h +++ b/src/ESPEasy/net/NWPluginStructs/NW001_data_struct_WiFi_STA.h @@ -3,12 +3,12 @@ #include "../_NWPlugin_Helper.h" #ifdef USES_NW001 -#ifdef ESP8266 -#include "../wifi/ESPEasyWiFi_STA_Event_ESP8266.h" -#endif -#ifdef ESP32 -#include "../wifi/ESPEasyWiFi_STA_Event_ESP32.h" -#endif +# ifdef ESP8266 +# include "../wifi/ESPEasyWiFi_STA_Event_ESP8266.h" +# endif +# ifdef ESP32 +# include "../wifi/ESPEasyWiFi_STA_Event_ESP32.h" +# endif namespace ESPEasy { @@ -21,24 +21,24 @@ struct NW001_data_struct_WiFi_STA : public NWPluginData_base { ~NW001_data_struct_WiFi_STA(); - void webform_load(EventStruct *event); - void webform_save(EventStruct *event); + void webform_load(EventStruct *event); + void webform_save(EventStruct *event); - bool webform_getPort(String& str); + bool webform_getPort(String& str); - bool init(EventStruct *event); + bool init(EventStruct *event); - bool exit(EventStruct *event); + bool exit(EventStruct *event); # ifdef ESP32 - bool handle_priority_route_changed(); + bool handle_priority_route_changed() override; # endif - LongTermTimer::Duration getConnectedDuration_ms() const; + NWPluginData_static_runtime& getNWPluginData_static_runtime(); private: -ESPEasyWiFi_STA_EventHandler _WiFiEventHandler{}; + ESPEasyWiFi_STA_EventHandler _WiFiEventHandler{}; }; diff --git a/src/ESPEasy/net/NWPluginStructs/NW002_data_struct_WiFi_AP.cpp b/src/ESPEasy/net/NWPluginStructs/NW002_data_struct_WiFi_AP.cpp index 62b42241d..38f25e591 100644 --- a/src/ESPEasy/net/NWPluginStructs/NW002_data_struct_WiFi_AP.cpp +++ b/src/ESPEasy/net/NWPluginStructs/NW002_data_struct_WiFi_AP.cpp @@ -11,18 +11,31 @@ # include "../wifi/ESPEasyWifi.h" # define NW_PLUGIN_ID 2 -# define NW_PLUGIN_INTERFACE WiFi.AP +# ifdef ESP32 +# define NW_PLUGIN_INTERFACE WiFi.AP +# endif namespace ESPEasy { namespace net { namespace wifi { -static LongTermOnOffTimer _startStopStats{}; +# ifdef ESP32 +static NWPluginData_static_runtime stats_and_cache(&NW_PLUGIN_INTERFACE); +# else +static NWPluginData_static_runtime stats_and_cache{}; +# endif // ifdef ESP32 NW002_data_struct_WiFi_AP::NW002_data_struct_WiFi_AP(networkIndex_t networkIndex) - : NWPluginData_base(nwpluginID_t(NW_PLUGIN_ID), networkIndex) + : NWPluginData_base( + nwpluginID_t(NW_PLUGIN_ID) + , networkIndex +# ifdef ESP32 + , &NW_PLUGIN_INTERFACE +# endif + ) { + stats_and_cache.clear(); # ifdef ESP32 nw_event_id = Network.onEvent(NW002_data_struct_WiFi_AP::onEvent); # endif @@ -64,6 +77,9 @@ bool NW002_data_struct_WiFi_AP::exit(EventStruct *event) return true; } +NWPluginData_static_runtime& NW002_data_struct_WiFi_AP::getNWPluginData_static_runtime() { return stats_and_cache; } + + # ifdef ESP32 bool NW002_data_struct_WiFi_AP::handle_priority_route_changed() @@ -86,11 +102,11 @@ void NW002_data_struct_WiFi_AP::onEvent(arduino_event_id_t event, switch (event) { case ARDUINO_EVENT_WIFI_AP_START: - _startStopStats.setOn(); + stats_and_cache._startStopStats.setOn(); addLog(LOG_LEVEL_INFO, F("AP_START")); break; case ARDUINO_EVENT_WIFI_AP_STOP: - _startStopStats.setOff(); + stats_and_cache._startStopStats.setOff(); addLog(LOG_LEVEL_INFO, F("AP_STOP")); break; case ARDUINO_EVENT_WIFI_AP_STACONNECTED: diff --git a/src/ESPEasy/net/NWPluginStructs/NW002_data_struct_WiFi_AP.h b/src/ESPEasy/net/NWPluginStructs/NW002_data_struct_WiFi_AP.h index 11097c125..17c5b3266 100644 --- a/src/ESPEasy/net/NWPluginStructs/NW002_data_struct_WiFi_AP.h +++ b/src/ESPEasy/net/NWPluginStructs/NW002_data_struct_WiFi_AP.h @@ -14,19 +14,21 @@ struct NW002_data_struct_WiFi_AP : public NWPluginData_base { ~NW002_data_struct_WiFi_AP(); - void webform_load(EventStruct *event); - void webform_save(EventStruct *event); + void webform_load(EventStruct *event); + void webform_save(EventStruct *event); - bool webform_getPort(String& str); + bool webform_getPort(String& str); - bool init(EventStruct *event); + bool init(EventStruct *event); - bool exit(EventStruct *event); + bool exit(EventStruct *event); # ifdef ESP32 - bool handle_priority_route_changed(); + bool handle_priority_route_changed() override; # endif + NWPluginData_static_runtime& getNWPluginData_static_runtime(); + private: # ifdef ESP32 diff --git a/src/ESPEasy/net/NWPluginStructs/NW003_data_struct_ETH_RMII.cpp b/src/ESPEasy/net/NWPluginStructs/NW003_data_struct_ETH_RMII.cpp index 57563cfd9..e81aa1c24 100644 --- a/src/ESPEasy/net/NWPluginStructs/NW003_data_struct_ETH_RMII.cpp +++ b/src/ESPEasy/net/NWPluginStructs/NW003_data_struct_ETH_RMII.cpp @@ -8,7 +8,7 @@ # include "../../../src/Helpers/LongTermOnOffTimer.h" # include "../../../src/Helpers/StringConverter.h" -#include "../Globals/NetworkState.h" +# include "../Globals/NetworkState.h" # define NW_PLUGIN_ID 3 # define NW_PLUGIN_INTERFACE ETH @@ -17,22 +17,12 @@ namespace ESPEasy { namespace net { namespace eth { -static LongTermOnOffTimer _startStopStats{}; -static LongTermOnOffTimer _connectedStats{}; -static LongTermOnOffTimer _gotIPStats{}; -# if FEATURE_USE_IPV6 -static LongTermOnOffTimer _gotIP6Stats{}; -# endif -static IPAddress _dns_cache[2]{}; +static NWPluginData_static_runtime stats_and_cache(&NW_PLUGIN_INTERFACE); NW003_data_struct_ETH_RMII::NW003_data_struct_ETH_RMII(networkIndex_t networkIndex) - : NWPluginData_base(nwpluginID_t(NW_PLUGIN_ID), networkIndex) + : NWPluginData_base(nwpluginID_t(NW_PLUGIN_ID), networkIndex, &NW_PLUGIN_INTERFACE) { - _connectedStats.clear(); - _gotIPStats.clear(); -# if FEATURE_USE_IPV6 - _gotIP6Stats.clear(); -# endif + stats_and_cache.clear(); nw_event_id = Network.onEvent(NW003_data_struct_ETH_RMII::onEvent); } @@ -58,86 +48,43 @@ bool NW003_data_struct_ETH_RMII::exit(EventStruct *event) { return true; } -bool NW003_data_struct_ETH_RMII::handle_priority_route_changed() -{ - bool res{}; +NWPluginData_static_runtime& NW003_data_struct_ETH_RMII::getNWPluginData_static_runtime() { return stats_and_cache; } - if (NW_PLUGIN_INTERFACE.isDefault()) { - if (NWPlugin::forceDHCP_request(&NW_PLUGIN_INTERFACE)) return true; - // Check to see if we may need to restore any cached DNS server - for (size_t i = 0; i < NR_ELEMENTS(_dns_cache); ++i) { - auto tmp = NW_PLUGIN_INTERFACE.dnsIP(i); - - if ((_dns_cache[i] != INADDR_NONE) && (_dns_cache[i] != tmp)) { - addLog(LOG_LEVEL_INFO, strformat( - F("NW003: Restore cached DNS server %d from %s to %s"), - i, - tmp.toString().c_str(), - _dns_cache[i].toString().c_str() - )); - - NW_PLUGIN_INTERFACE.dnsIP(i, _dns_cache[i]); - res = true; - } - } - } - return res; -} - -LongTermTimer::Duration NW003_data_struct_ETH_RMII::getConnectedDuration_ms() const -{ - return _connectedStats.getLastOnDuration_ms(); -} - -void NW003_data_struct_ETH_RMII::onEvent(arduino_event_id_t event, - arduino_event_info_t info) +void NW003_data_struct_ETH_RMII::onEvent(arduino_event_id_t event, + arduino_event_info_t info) { switch (event) { case ARDUINO_EVENT_ETH_START: - _startStopStats.setOn(); + stats_and_cache._startStopStats.setOn(); addLog(LOG_LEVEL_INFO, F("ETH_START")); break; case ARDUINO_EVENT_ETH_STOP: - _startStopStats.setOff(); + stats_and_cache._startStopStats.setOff(); addLog(LOG_LEVEL_INFO, F("ETH_STOP")); break; case ARDUINO_EVENT_ETH_CONNECTED: - _connectedStats.setOn(); + stats_and_cache._connectedStats.setOn(); addLog(LOG_LEVEL_INFO, F("ETH_CONNECTED")); break; case ARDUINO_EVENT_ETH_DISCONNECTED: - _connectedStats.setOff(); - addLog(LOG_LEVEL_INFO, F("ETH_DISCONNECTED")); + stats_and_cache._connectedStats.setOff(); + NWPluginData_base::_mark_disconnected(stats_and_cache); break; case ARDUINO_EVENT_ETH_GOT_IP: - - if (!NW_PLUGIN_INTERFACE.isDefault()) { - nonDefaultNetworkInterface_gotIP = true; - } - - for (size_t i = 0; i < NR_ELEMENTS(_dns_cache); ++i) { - auto tmp = NW_PLUGIN_INTERFACE.dnsIP(i); - - if (tmp != INADDR_NONE) { - _dns_cache[i] = tmp; - addLog(LOG_LEVEL_INFO, strformat(F("DNS Cache %d set to %s"), i, tmp.toString(true).c_str())); - } - - } - _gotIPStats.setOn(); - addLog(LOG_LEVEL_INFO, F("ETH_GOT_IP")); + NWPluginData_base::_mark_got_IP(stats_and_cache); + stats_and_cache._gotIPStats.setOn(); break; # if FEATURE_USE_IPV6 case ARDUINO_EVENT_ETH_GOT_IP6: - _gotIP6Stats.setOn(); + stats_and_cache._gotIP6Stats.setOn(); addLog(LOG_LEVEL_INFO, F("ETH_GOT_IP6")); break; # endif // if FEATURE_USE_IPV6 case ARDUINO_EVENT_ETH_LOST_IP: - _gotIPStats.setOff(); + stats_and_cache._gotIPStats.setOff(); # if FEATURE_USE_IPV6 - _gotIP6Stats.setOff(); + stats_and_cache._gotIP6Stats.setOff(); # endif addLog(LOG_LEVEL_INFO, F("ETH_LOST_IP")); diff --git a/src/ESPEasy/net/NWPluginStructs/NW003_data_struct_ETH_RMII.h b/src/ESPEasy/net/NWPluginStructs/NW003_data_struct_ETH_RMII.h index d90037ccc..4b337a672 100644 --- a/src/ESPEasy/net/NWPluginStructs/NW003_data_struct_ETH_RMII.h +++ b/src/ESPEasy/net/NWPluginStructs/NW003_data_struct_ETH_RMII.h @@ -14,19 +14,16 @@ struct NW003_data_struct_ETH_RMII : public NWPluginData_base { ~NW003_data_struct_ETH_RMII(); - void webform_load(EventStruct *event); - void webform_save(EventStruct *event); + void webform_load(EventStruct *event); + void webform_save(EventStruct *event); - bool webform_getPort(String& str); + bool webform_getPort(String& str); - bool init(EventStruct *event); + bool init(EventStruct *event); - bool exit(EventStruct *event); + bool exit(EventStruct *event); - - bool handle_priority_route_changed(); - - LongTermTimer::Duration getConnectedDuration_ms() const; + NWPluginData_static_runtime& getNWPluginData_static_runtime(); private: diff --git a/src/ESPEasy/net/NWPluginStructs/NW004_data_struct_ETH_SPI.cpp b/src/ESPEasy/net/NWPluginStructs/NW004_data_struct_ETH_SPI.cpp index 9bff6da8f..a4dbc7f3d 100644 --- a/src/ESPEasy/net/NWPluginStructs/NW004_data_struct_ETH_SPI.cpp +++ b/src/ESPEasy/net/NWPluginStructs/NW004_data_struct_ETH_SPI.cpp @@ -8,7 +8,7 @@ # include "../../../src/Helpers/LongTermOnOffTimer.h" # include "../../../src/Helpers/StringConverter.h" -#include "../Globals/NetworkState.h" +# include "../Globals/NetworkState.h" # define NW_PLUGIN_ID 4 # define NW_PLUGIN_INTERFACE ETH @@ -17,22 +17,12 @@ namespace ESPEasy { namespace net { namespace eth { -static LongTermOnOffTimer _startStopStats{}; -static LongTermOnOffTimer _connectedStats{}; -static LongTermOnOffTimer _gotIPStats{}; -# if FEATURE_USE_IPV6 -static LongTermOnOffTimer _gotIP6Stats{}; -# endif -static IPAddress _dns_cache[2]{}; +static NWPluginData_static_runtime stats_and_cache(&NW_PLUGIN_INTERFACE); NW004_data_struct_ETH_SPI::NW004_data_struct_ETH_SPI(networkIndex_t networkIndex) - : NWPluginData_base(nwpluginID_t(NW_PLUGIN_ID), networkIndex) + : NWPluginData_base(nwpluginID_t(NW_PLUGIN_ID), networkIndex, &NW_PLUGIN_INTERFACE) { - _connectedStats.clear(); - _gotIPStats.clear(); -# if FEATURE_USE_IPV6 - _gotIP6Stats.clear(); -# endif + stats_and_cache.clear(); nw_event_id = Network.onEvent(NW004_data_struct_ETH_SPI::onEvent); } @@ -61,86 +51,43 @@ bool NW004_data_struct_ETH_SPI::exit(EventStruct *event) { return true; } -bool NW004_data_struct_ETH_SPI::handle_priority_route_changed() -{ - bool res{}; +NWPluginData_static_runtime& NW004_data_struct_ETH_SPI::getNWPluginData_static_runtime() { return stats_and_cache; } - if (NW_PLUGIN_INTERFACE.isDefault()) { - if (NWPlugin::forceDHCP_request(&NW_PLUGIN_INTERFACE)) return true; - // Check to see if we may need to restore any cached DNS server - for (size_t i = 0; i < NR_ELEMENTS(_dns_cache); ++i) { - auto tmp = NW_PLUGIN_INTERFACE.dnsIP(i); - - if ((_dns_cache[i] != INADDR_NONE) && (_dns_cache[i] != tmp)) { - addLog(LOG_LEVEL_INFO, strformat( - F("NW004: Restore cached DNS server %d from %s to %s"), - i, - tmp.toString().c_str(), - _dns_cache[i].toString().c_str() - )); - - NW_PLUGIN_INTERFACE.dnsIP(i, _dns_cache[i]); - res = true; - } - } - } - return res; -} - -LongTermTimer::Duration NW004_data_struct_ETH_SPI::getConnectedDuration_ms() const -{ - return _connectedStats.getLastOnDuration_ms(); -} - -void NW004_data_struct_ETH_SPI::onEvent(arduino_event_id_t event, - arduino_event_info_t info) +void NW004_data_struct_ETH_SPI::onEvent(arduino_event_id_t event, + arduino_event_info_t info) { switch (event) { case ARDUINO_EVENT_ETH_START: - _startStopStats.setOn(); + stats_and_cache._startStopStats.setOn(); addLog(LOG_LEVEL_INFO, F("ETH_START")); break; case ARDUINO_EVENT_ETH_STOP: - _startStopStats.setOff(); + stats_and_cache._startStopStats.setOff(); addLog(LOG_LEVEL_INFO, F("ETH_STOP")); break; case ARDUINO_EVENT_ETH_CONNECTED: - _connectedStats.setOn(); + stats_and_cache._connectedStats.setOn(); addLog(LOG_LEVEL_INFO, F("ETH_CONNECTED")); break; case ARDUINO_EVENT_ETH_DISCONNECTED: - _connectedStats.setOff(); - addLog(LOG_LEVEL_INFO, F("ETH_DISCONNECTED")); + stats_and_cache._connectedStats.setOff(); + NWPluginData_base::_mark_disconnected(stats_and_cache); break; case ARDUINO_EVENT_ETH_GOT_IP: - - if (!NW_PLUGIN_INTERFACE.isDefault()) { - nonDefaultNetworkInterface_gotIP = true; - } - - for (size_t i = 0; i < NR_ELEMENTS(_dns_cache); ++i) { - auto tmp = NW_PLUGIN_INTERFACE.dnsIP(i); - - if (tmp != INADDR_NONE) { - _dns_cache[i] = tmp; - addLog(LOG_LEVEL_INFO, strformat(F("DNS Cache %d set to %s"), i, tmp.toString(true).c_str())); - } - - } - _gotIPStats.setOn(); - addLog(LOG_LEVEL_INFO, F("ETH_GOT_IP")); + NWPluginData_base::_mark_got_IP(stats_and_cache); + stats_and_cache._gotIPStats.setOn(); break; # if FEATURE_USE_IPV6 case ARDUINO_EVENT_ETH_GOT_IP6: - _gotIP6Stats.setOn(); + stats_and_cache._gotIP6Stats.setOn(); addLog(LOG_LEVEL_INFO, F("ETH_GOT_IP6")); break; # endif // if FEATURE_USE_IPV6 case ARDUINO_EVENT_ETH_LOST_IP: - _gotIPStats.setOff(); + stats_and_cache._gotIPStats.setOff(); # if FEATURE_USE_IPV6 - _gotIP6Stats.setOff(); + stats_and_cache._gotIP6Stats.setOff(); # endif addLog(LOG_LEVEL_INFO, F("ETH_LOST_IP")); diff --git a/src/ESPEasy/net/NWPluginStructs/NW004_data_struct_ETH_SPI.h b/src/ESPEasy/net/NWPluginStructs/NW004_data_struct_ETH_SPI.h index e5a02aa89..616a6f640 100644 --- a/src/ESPEasy/net/NWPluginStructs/NW004_data_struct_ETH_SPI.h +++ b/src/ESPEasy/net/NWPluginStructs/NW004_data_struct_ETH_SPI.h @@ -14,18 +14,16 @@ struct NW004_data_struct_ETH_SPI : public NWPluginData_base { ~NW004_data_struct_ETH_SPI(); - void webform_load(EventStruct *event); - void webform_save(EventStruct *event); + void webform_load(EventStruct *event); + void webform_save(EventStruct *event); - bool webform_getPort(String& str); + bool webform_getPort(String& str); - bool init(EventStruct *event); + bool init(EventStruct *event); - bool exit(EventStruct *event); + bool exit(EventStruct *event); - bool handle_priority_route_changed(); - - LongTermTimer::Duration getConnectedDuration_ms() const; + NWPluginData_static_runtime& getNWPluginData_static_runtime(); private: diff --git a/src/ESPEasy/net/NWPluginStructs/NW005_data_struct_PPP_modem.cpp b/src/ESPEasy/net/NWPluginStructs/NW005_data_struct_PPP_modem.cpp index d9a92c122..aea2e2414 100644 --- a/src/ESPEasy/net/NWPluginStructs/NW005_data_struct_PPP_modem.cpp +++ b/src/ESPEasy/net/NWPluginStructs/NW005_data_struct_PPP_modem.cpp @@ -5,7 +5,6 @@ # include "../../../src/Globals/Settings.h" # include "../../../src/Helpers/ESPEasy_time_calc.h" -# include "../../../src/Helpers/LongTermOnOffTimer.h" # include "../../../src/Helpers/StringConverter.h" # include "../../../src/Helpers/_Plugin_Helper_serial.h" @@ -14,7 +13,7 @@ # include "../../../src/WebServer/Markup_Forms.h" # include "../../../src/WebServer/ESPEasy_key_value_store_webform.h" -#include "../Globals/NetworkState.h" +# include "../Globals/NetworkState.h" # include # include @@ -29,14 +28,7 @@ namespace ESPEasy { namespace net { namespace ppp { - -static LongTermOnOffTimer _startStopStats{}; -static LongTermOnOffTimer _connectedStats{}; -static LongTermOnOffTimer _gotIPStats{}; -# if FEATURE_USE_IPV6 -static LongTermOnOffTimer _gotIP6Stats{}; -# endif -static IPAddress _dns_cache[2]{}; +static NWPluginData_static_runtime stats_and_cache(&NW_PLUGIN_INTERFACE); // Keys as used in the Key-value-store @@ -96,13 +88,9 @@ const __FlashStringHelper* NW005_getLabelString(uint32_t key, bool displayString } NW005_data_struct_PPP_modem::NW005_data_struct_PPP_modem(networkIndex_t networkIndex) - : NWPluginData_base(nwpluginID_t(NW_PLUGIN_ID), networkIndex) + : NWPluginData_base(nwpluginID_t(NW_PLUGIN_ID), networkIndex, &NW_PLUGIN_INTERFACE) { - _connectedStats.clear(); - _gotIPStats.clear(); -# if FEATURE_USE_IPV6 - _gotIP6Stats.clear(); -# endif + stats_and_cache.clear(); nw_event_id = Network.onEvent(NW005_data_struct_PPP_modem::onEvent); } @@ -891,32 +879,6 @@ bool NW005_data_struct_PPP_modem::exit(EventStruct *event) return true; } -bool NW005_data_struct_PPP_modem::handle_priority_route_changed() -{ - bool res{}; - - if (NW_PLUGIN_INTERFACE.isDefault()) { - if (NWPlugin::forceDHCP_request(&NW_PLUGIN_INTERFACE)) { return true; } - // Check to see if we may need to restore any cached DNS server - for (size_t i = 0; i < NR_ELEMENTS(_dns_cache); ++i) { - auto tmp = NW_PLUGIN_INTERFACE.dnsIP(i); - - if ((_dns_cache[i] != INADDR_NONE) && (_dns_cache[i] != tmp)) { - addLog(LOG_LEVEL_INFO, strformat( - F("NW005: Restore cached DNS server %d from %s to %s"), - i, - tmp.toString().c_str(), - _dns_cache[i].toString().c_str() - )); - - NW_PLUGIN_INTERFACE.dnsIP(i, _dns_cache[i]); - res = true; - } - } - } - return res; -} - String NW005_data_struct_PPP_modem::write_AT_cmd(const String& cmd, int timeout) { String res; @@ -930,54 +892,34 @@ String NW005_data_struct_PPP_modem::write_AT_cmd(const String& cmd, int timeout) return res; } -LongTermTimer::Duration NW005_data_struct_PPP_modem::getConnectedDuration_ms() const -{ - return _connectedStats.getLastOnDuration_ms(); -} +NWPluginData_static_runtime& NW005_data_struct_PPP_modem::getNWPluginData_static_runtime() { return stats_and_cache; } -void NW005_data_struct_PPP_modem::onEvent(arduino_event_id_t event, arduino_event_info_t info) { +void NW005_data_struct_PPP_modem::onEvent(arduino_event_id_t event, arduino_event_info_t info) { // TODO TD-er: Must store flags from events in static (or global) object to act on it later. switch (event) { case ARDUINO_EVENT_PPP_START: addLog(LOG_LEVEL_INFO, F("PPP Started")); - _startStopStats.setOn(); + stats_and_cache._startStopStats.setOn(); # if ESP_IDF_VERSION >= ESP_IDF_VERSION_VAL(5, 5, 0) NW_PLUGIN_INTERFACE.setRoutePrio(200); # endif break; case ARDUINO_EVENT_PPP_STOP: addLog(LOG_LEVEL_INFO, F("PPP Stopped")); - _startStopStats.setOff(); + stats_and_cache._startStopStats.setOff(); break; case ARDUINO_EVENT_PPP_CONNECTED: - _connectedStats.setOn(); + stats_and_cache._connectedStats.setOn(); addLog(LOG_LEVEL_INFO, F("PPP Connected")); break; case ARDUINO_EVENT_PPP_DISCONNECTED: - _connectedStats.setOff(); - addLog(LOG_LEVEL_INFO, concat( - F("PPP Disconnected. Connected for: "), - format_msec_duration_HMS(_connectedStats.getLastOnDuration_ms()))); + stats_and_cache._connectedStats.setOff(); + NWPluginData_base::_mark_disconnected(stats_and_cache); WiFi.AP.enableNAPT(false); break; case ARDUINO_EVENT_PPP_GOT_IP: - - if (!NW_PLUGIN_INTERFACE.isDefault()) { - nonDefaultNetworkInterface_gotIP = true; - } - - for (size_t i = 0; i < NR_ELEMENTS(_dns_cache); ++i) { - auto tmp = NW_PLUGIN_INTERFACE.dnsIP(i); - - if (tmp != INADDR_NONE) { - _dns_cache[i] = tmp; - addLog(LOG_LEVEL_INFO, strformat(F("DNS Cache %d set to %s"), i, tmp.toString(true).c_str())); - } - - } - - _gotIPStats.setOn(); - addLog(LOG_LEVEL_INFO, F("PPP Got IP")); + NWPluginData_base::_mark_got_IP(stats_and_cache); + stats_and_cache._gotIPStats.setOn(); // NW_PLUGIN_INTERFACE.setDefault(); @@ -987,14 +929,14 @@ void NW005_data_struct_PPP_modem::onEvent(arduino_event_id_t event, arduino_even break; # if FEATURE_USE_IPV6 case ARDUINO_EVENT_PPP_GOT_IP6: - _gotIP6Stats.setOn(); + stats_and_cache._gotIP6Stats.setOn(); addLog(LOG_LEVEL_INFO, F("PPP Got IPv6")); break; # endif // if FEATURE_USE_IPV6 case ARDUINO_EVENT_PPP_LOST_IP: - _gotIPStats.setOff(); + stats_and_cache._gotIPStats.setOff(); # if FEATURE_USE_IPV6 - _gotIP6Stats.setOff(); + stats_and_cache._gotIP6Stats.setOff(); # endif addLog(LOG_LEVEL_INFO, F("PPP Lost IP")); WiFi.AP.enableNAPT(false); diff --git a/src/ESPEasy/net/NWPluginStructs/NW005_data_struct_PPP_modem.h b/src/ESPEasy/net/NWPluginStructs/NW005_data_struct_PPP_modem.h index ff4251098..2e4a0ffc1 100644 --- a/src/ESPEasy/net/NWPluginStructs/NW005_data_struct_PPP_modem.h +++ b/src/ESPEasy/net/NWPluginStructs/NW005_data_struct_PPP_modem.h @@ -32,29 +32,27 @@ struct NW005_data_struct_PPP_modem : public NWPluginData_base { NW005_data_struct_PPP_modem(networkIndex_t networkIndex); ~NW005_data_struct_PPP_modem(); - String getRSSI() const; - String getBER() const; - bool attached() const; - String IMEI() const; - String operatorName() const; + String getRSSI() const; + String getBER() const; + bool attached() const; + String IMEI() const; + String operatorName() const; - void webform_load_UE_system_information(); + void webform_load_UE_system_information(); - void webform_load(EventStruct *event); - void webform_save(EventStruct *event); + void webform_load(EventStruct *event); + void webform_save(EventStruct *event); - bool webform_getPort(String& str); + bool webform_getPort(String& str); - bool init(EventStruct *event); + bool init(EventStruct *event); - bool exit(EventStruct *event); + bool exit(EventStruct *event); - bool handle_priority_route_changed(); + String write_AT_cmd(const String& cmd, + int timeout = 1000); - String write_AT_cmd(const String& cmd, - int timeout = 1000); - - LongTermTimer::Duration getConnectedDuration_ms() const; + NWPluginData_static_runtime& getNWPluginData_static_runtime(); private: diff --git a/src/ESPEasy/net/wifi/ESPEasyWiFi_STA_Event_ESP32.cpp b/src/ESPEasy/net/wifi/ESPEasyWiFi_STA_Event_ESP32.cpp index 38d47d87d..9fe73b27e 100644 --- a/src/ESPEasy/net/wifi/ESPEasyWiFi_STA_Event_ESP32.cpp +++ b/src/ESPEasy/net/wifi/ESPEasyWiFi_STA_Event_ESP32.cpp @@ -17,6 +17,7 @@ # include "../../../src/Helpers/ESPEasy_time_calc.h" # include "../../../src/Helpers/StringConverter.h" # include "../../net/ESPEasyNetwork.h" +# include "../DataStructs/NWPluginData_static_runtime.h" # include "../Globals/ESPEasyWiFiEvent.h" # include "../Globals/NetworkState.h" # include "../Globals/WiFi_AP_Candidates.h" @@ -32,14 +33,12 @@ namespace ESPEasy { namespace net { namespace wifi { +# ifdef ESP32 +static NWPluginData_static_runtime stats_and_cache(&WiFi.STA); +# else +static NWPluginData_static_runtime stats_and_cache{}; +# endif // ifdef ESP32 -static LongTermOnOffTimer _startStopStats{}; -static LongTermOnOffTimer _connectedStats{}; -static LongTermOnOffTimer _gotIPStats{}; -# if FEATURE_USE_IPV6 -static LongTermOnOffTimer _gotIP6Stats{}; -# endif -static IPAddress _dns_cache[2]{}; static wifi_event_sta_connected_t _wifi_event_sta_connected; static WiFiDisconnectReason _wifi_disconnect_reason = WiFiDisconnectReason::WIFI_DISCONNECT_REASON_UNSPECIFIED; @@ -47,11 +46,7 @@ static bool _ESPEasyWiFi_STA_EventHandler_initialized{}; ESPEasyWiFi_STA_EventHandler::ESPEasyWiFi_STA_EventHandler() { - _connectedStats.clear(); - _gotIPStats.clear(); -# if FEATURE_USE_IPV6 - _gotIP6Stats.clear(); -# endif + stats_and_cache.clear(); nw_event_id = Network.onEvent(ESPEasyWiFi_STA_EventHandler::WiFiEvent); memset(&_wifi_event_sta_connected, 0, sizeof(_wifi_event_sta_connected)); _ESPEasyWiFi_STA_EventHandler_initialized = true; @@ -66,41 +61,31 @@ ESPEasyWiFi_STA_EventHandler::~ESPEasyWiFi_STA_EventHandler() _ESPEasyWiFi_STA_EventHandler_initialized = false; } -bool ESPEasyWiFi_STA_EventHandler::initialized() { return _ESPEasyWiFi_STA_EventHandler_initialized; } +bool ESPEasyWiFi_STA_EventHandler::initialized() { return _ESPEasyWiFi_STA_EventHandler_initialized; } -LongTermOnOffTimer ESPEasyWiFi_STA_EventHandler::getEnabled_OnOffTimer() const { return _startStopStats; } +NWPluginData_static_runtime& ESPEasyWiFi_STA_EventHandler::getNWPluginData_static_runtime() { return stats_and_cache; } -LongTermOnOffTimer ESPEasyWiFi_STA_EventHandler::getConnected_OnOffTimer() const { return _connectedStats; } +WiFiDisconnectReason ESPEasyWiFi_STA_EventHandler::getLastDisconnectReason() const { return _wifi_disconnect_reason; } -LongTermOnOffTimer ESPEasyWiFi_STA_EventHandler::getGotIp_OnOffTimer() const { return _gotIPStats; } +uint8_t ESPEasyWiFi_STA_EventHandler::getAuthMode() const { return _wifi_event_sta_connected.authmode; } -# if FEATURE_USE_IPV6 - -LongTermOnOffTimer ESPEasyWiFi_STA_EventHandler::getGotIp6_OnOffTimer() const { return _gotIP6Stats; } - -# endif // if FEATURE_USE_IPV6 - -WiFiDisconnectReason ESPEasyWiFi_STA_EventHandler::getLastDisconnectReason() const { return _wifi_disconnect_reason; } - -uint8_t ESPEasyWiFi_STA_EventHandler::getAuthMode() const { return _wifi_event_sta_connected.authmode; } - -bool ESPEasyWiFi_STA_EventHandler::restore_dns_from_cache() const +bool ESPEasyWiFi_STA_EventHandler::restore_dns_from_cache() const { bool res{}; if (WiFi.STA.isDefault()) { // Check to see if we may need to restore any cached DNS server - for (size_t i = 0; i < NR_ELEMENTS(_dns_cache); ++i) { + for (size_t i = 0; i < NR_ELEMENTS(stats_and_cache._dns_cache); ++i) { auto tmp = WiFi.STA.dnsIP(i); - if ((_dns_cache[i] != INADDR_NONE) && (_dns_cache[i] != tmp)) { + if ((stats_and_cache._dns_cache[i] != INADDR_NONE) && (stats_and_cache._dns_cache[i] != tmp)) { addLog(LOG_LEVEL_INFO, strformat( F("WiFi STA: Restore cached DNS server %d from %s to %s"), i, tmp.toString().c_str(), - _dns_cache[i].toString().c_str() + stats_and_cache._dns_cache[i].toString().c_str() )); - WiFi.STA.dnsIP(i, _dns_cache[i]); + WiFi.STA.dnsIP(i, stats_and_cache._dns_cache[i]); res = true; } } @@ -134,23 +119,23 @@ void ESPEasyWiFi_STA_EventHandler::WiFiEvent(WiFiEvent_t event_id, arduino_event break; case ARDUINO_EVENT_WIFI_STA_START: clear_wifi_event_sta_connected = true; - _startStopStats.setOn(); + stats_and_cache._startStopStats.setOn(); addLog(LOG_LEVEL_INFO, F("STA_START")); break; case ARDUINO_EVENT_WIFI_STA_STOP: clear_wifi_event_sta_connected = true; - _startStopStats.setOff(); + stats_and_cache._startStopStats.setOff(); addLog(LOG_LEVEL_INFO, F("STA_STOP")); break; case ARDUINO_EVENT_WIFI_STA_CONNECTED: memcpy(&_wifi_event_sta_connected, &info.wifi_sta_connected, sizeof(_wifi_event_sta_connected)); - _connectedStats.setOn(); + stats_and_cache._connectedStats.setOn(); addLog(LOG_LEVEL_INFO, F("STA_CONNECTED")); break; case ARDUINO_EVENT_WIFI_STA_DISCONNECTED: clear_wifi_event_sta_connected = true; _wifi_disconnect_reason = static_cast(info.wifi_sta_disconnected.reason); - _connectedStats.setOff(); + stats_and_cache._connectedStats.setOff(); addLog(LOG_LEVEL_INFO, F("STA_DISCONNECTED")); break; case ARDUINO_EVENT_WIFI_STA_AUTHMODE_CHANGE: @@ -159,10 +144,11 @@ void ESPEasyWiFi_STA_EventHandler::WiFiEvent(WiFiEvent_t event_id, arduino_event break; case ARDUINO_EVENT_WIFI_STA_GOT_IP: - for (size_t i = 0; i < NR_ELEMENTS(_dns_cache); ++i) { + for (size_t i = 0; i < NR_ELEMENTS(stats_and_cache._dns_cache); ++i) { auto tmp = WiFi.STA.dnsIP(i); - _dns_cache[i] = tmp; // Also set the 'empty' ones so we won't set left-over DNS server from when another interface was active. + stats_and_cache._dns_cache[i] = tmp; // Also set the 'empty' ones so we won't set left-over DNS server from when another interface + // was active. if (tmp != INADDR_NONE) { addLog(LOG_LEVEL_INFO, strformat(F("DNS Cache %d set to %s"), i, tmp.toString(true).c_str())); @@ -174,8 +160,8 @@ void ESPEasyWiFi_STA_EventHandler::WiFiEvent(WiFiEvent_t event_id, arduino_event } // Set OnOffTimer to off so we can also count how often we het new IP - _gotIPStats.setOff(); - _gotIPStats.setOn(); + stats_and_cache._gotIPStats.setOff(); + stats_and_cache._gotIPStats.setOn(); addLog(LOG_LEVEL_INFO, F("STA_GOT_IP")); break; # if FEATURE_USE_IPV6 @@ -185,15 +171,15 @@ void ESPEasyWiFi_STA_EventHandler::WiFiEvent(WiFiEvent_t event_id, arduino_event nonDefaultNetworkInterface_gotIP = true; } - _gotIP6Stats.setOn(); + stats_and_cache._gotIP6Stats.setOn(); addLog(LOG_LEVEL_INFO, F("STA_GOT_IP6")); break; # endif // if FEATURE_USE_IPV6 case ARDUINO_EVENT_WIFI_STA_LOST_IP: - _gotIPStats.setOff(); + stats_and_cache._gotIPStats.setOff(); # if FEATURE_USE_IPV6 - _gotIP6Stats.setOff(); + stats_and_cache._gotIP6Stats.setOff(); # endif addLog(LOG_LEVEL_INFO, F("STA_LOST_IP")); @@ -346,7 +332,7 @@ void ESPEasyWiFi_STA_EventHandler::WiFiEvent(WiFiEvent_t event_id, arduino_event case ARDUINO_EVENT_PPP_LOST_IP: case ARDUINO_EVENT_PPP_DISCONNECTED: case ARDUINO_EVENT_PPP_STOP: - // Handled in NW005_data_struct_PPP_modem + // Handled in ESPEasyWiFi_STA_EventHandler break; # endif // if FEATURE_PPP_MODEM diff --git a/src/ESPEasy/net/wifi/ESPEasyWiFi_STA_Event_ESP32.h b/src/ESPEasy/net/wifi/ESPEasyWiFi_STA_Event_ESP32.h index e71aeff6e..5289c6d7d 100644 --- a/src/ESPEasy/net/wifi/ESPEasyWiFi_STA_Event_ESP32.h +++ b/src/ESPEasy/net/wifi/ESPEasyWiFi_STA_Event_ESP32.h @@ -19,6 +19,7 @@ # include # include +# include "../DataStructs/NWPluginData_static_runtime.h" # include "../wifi/WiFiDisconnectReason.h" @@ -34,20 +35,16 @@ public: ESPEasyWiFi_STA_EventHandler(); ~ESPEasyWiFi_STA_EventHandler(); - static bool initialized(); + static bool initialized(); - LongTermOnOffTimer getEnabled_OnOffTimer() const; - LongTermOnOffTimer getConnected_OnOffTimer() const; - LongTermOnOffTimer getGotIp_OnOffTimer() const; -# if FEATURE_USE_IPV6 - LongTermOnOffTimer getGotIp6_OnOffTimer() const; -# endif + NWPluginData_static_runtime& getNWPluginData_static_runtime(); - WiFiDisconnectReason getLastDisconnectReason() const; - uint8_t getAuthMode() const; + WiFiDisconnectReason getLastDisconnectReason() const; - bool restore_dns_from_cache() const; + uint8_t getAuthMode() const; + + bool restore_dns_from_cache() const; private: diff --git a/src/ESPEasy/net/wifi/ESPEasyWiFi_STA_Event_ESP8266.cpp b/src/ESPEasy/net/wifi/ESPEasyWiFi_STA_Event_ESP8266.cpp index 98606e2f4..a479bdf8e 100644 --- a/src/ESPEasy/net/wifi/ESPEasyWiFi_STA_Event_ESP8266.cpp +++ b/src/ESPEasy/net/wifi/ESPEasyWiFi_STA_Event_ESP8266.cpp @@ -22,10 +22,7 @@ namespace ESPEasy { namespace net { namespace wifi { - -static LongTermOnOffTimer _startStopStats; -static LongTermOnOffTimer _connectedStats; -static LongTermOnOffTimer _gotIPStats; +static NWPluginData_static_runtime stats_and_cache{}; static WiFiDisconnectReason _wifi_disconnect_reason = WiFiDisconnectReason::WIFI_DISCONNECT_REASON_UNSPECIFIED; static uint8_t _authmode{}; @@ -34,8 +31,7 @@ static bool _ESPEasyWiFi_STA_EventHandler_initialized{}; ESPEasyWiFi_STA_EventHandler::ESPEasyWiFi_STA_EventHandler() { - _connectedStats.clear(); - _gotIPStats.clear(); + stats_and_cache.clear(); // WiFi event handlers @@ -54,31 +50,27 @@ ESPEasyWiFi_STA_EventHandler::ESPEasyWiFi_STA_EventHandler() ESPEasyWiFi_STA_EventHandler::~ESPEasyWiFi_STA_EventHandler() {} -bool ESPEasyWiFi_STA_EventHandler::initialized() { return _ESPEasyWiFi_STA_EventHandler_initialized; } +bool ESPEasyWiFi_STA_EventHandler::initialized() { return _ESPEasyWiFi_STA_EventHandler_initialized; } -LongTermOnOffTimer ESPEasyWiFi_STA_EventHandler::getEnabled_OnOffTimer() const { return _startStopStats; } +NWPluginData_static_runtime& ESPEasyWiFi_STA_EventHandler::getNWPluginData_static_runtime() { return stats_and_cache; } -LongTermOnOffTimer ESPEasyWiFi_STA_EventHandler::getConnected_OnOffTimer() const { return _connectedStats; } +WiFiDisconnectReason ESPEasyWiFi_STA_EventHandler::getLastDisconnectReason() const { return _wifi_disconnect_reason; } -LongTermOnOffTimer ESPEasyWiFi_STA_EventHandler::getGotIp_OnOffTimer() const { return _gotIPStats; } - -WiFiDisconnectReason ESPEasyWiFi_STA_EventHandler::getLastDisconnectReason() const { return _wifi_disconnect_reason; } - -uint8_t ESPEasyWiFi_STA_EventHandler::getAuthMode() const { return _authmode; } +uint8_t ESPEasyWiFi_STA_EventHandler::getAuthMode() const { return _authmode; } // ******************************************************************************** // Functions called on events. // Make sure not to call anything in these functions that result in delay() or yield() // ******************************************************************************** void ESPEasyWiFi_STA_EventHandler::onConnected(const WiFiEventStationModeConnected& event) { - _connectedStats.setOn(); + stats_and_cache._connectedStats.setOn(); // WiFiEventData.markConnected(event.ssid, event.bssid, event.channel); } void ESPEasyWiFi_STA_EventHandler::onDisconnect(const WiFiEventStationModeDisconnected& event) { - _connectedStats.setOff(); - _gotIPStats.setOff(); + stats_and_cache._connectedStats.setOff(); + stats_and_cache._gotIPStats.setOff(); // WiFiEventData.markDisconnect(event.reason); @@ -93,8 +85,8 @@ void ESPEasyWiFi_STA_EventHandler::onDisconnect(const WiFiEventStationModeDiscon void ESPEasyWiFi_STA_EventHandler::onGotIP(const WiFiEventStationModeGotIP& event) { // Set OnOffTimer to off so we can also count how often we het new IP - _gotIPStats.setOff(); - _gotIPStats.setOn(); + stats_and_cache._gotIPStats.setOff(); + stats_and_cache._gotIPStats.setOn(); // WiFiEventData.markGotIP(event.ip, event.mask, event.gw); } diff --git a/src/ESPEasy/net/wifi/ESPEasyWiFi_STA_Event_ESP8266.h b/src/ESPEasy/net/wifi/ESPEasyWiFi_STA_Event_ESP8266.h index 443ad6bbe..c6f89171f 100644 --- a/src/ESPEasy/net/wifi/ESPEasyWiFi_STA_Event_ESP8266.h +++ b/src/ESPEasy/net/wifi/ESPEasyWiFi_STA_Event_ESP8266.h @@ -7,7 +7,7 @@ # ifdef ESP8266 -# include "../../../src/Helpers/LongTermOnOffTimer.h" +# include "../DataStructs/NWPluginData_static_runtime.h" # include @@ -32,13 +32,12 @@ public: ESPEasyWiFi_STA_EventHandler(); ~ESPEasyWiFi_STA_EventHandler(); - static bool initialized(); + static bool initialized(); - LongTermOnOffTimer getEnabled_OnOffTimer() const; - LongTermOnOffTimer getConnected_OnOffTimer() const; - LongTermOnOffTimer getGotIp_OnOffTimer() const; - WiFiDisconnectReason getLastDisconnectReason() const; - uint8_t getAuthMode() const; + NWPluginData_static_runtime& getNWPluginData_static_runtime(); + + WiFiDisconnectReason getLastDisconnectReason() const; + uint8_t getAuthMode() const; // ******************************************************************************** From 70b7b8921cebcbfc103123b04e93037cddae140b Mon Sep 17 00:00:00 2001 From: TD-er Date: Mon, 4 Aug 2025 00:10:26 +0200 Subject: [PATCH 174/564] [Network] Add test to see if we can track interface traffic count --- .../net/DataStructs/NWPluginData_base.cpp | 66 +++++++++++++++++++ .../net/DataStructs/NWPluginData_base.h | 1 + src/ESPEasy/net/Globals/NWPlugins.cpp | 1 + src/ESPEasy/net/_NW001_WiFi_STA.cpp | 16 +++++ src/src/DataTypes/ESPEasy_plugin_functions.h | 1 + src/src/WebServer/NetworkPage.cpp | 32 +++++---- 6 files changed, 106 insertions(+), 11 deletions(-) diff --git a/src/ESPEasy/net/DataStructs/NWPluginData_base.cpp b/src/ESPEasy/net/DataStructs/NWPluginData_base.cpp index cc25b5e7c..644f8208d 100644 --- a/src/ESPEasy/net/DataStructs/NWPluginData_base.cpp +++ b/src/ESPEasy/net/DataStructs/NWPluginData_base.cpp @@ -14,6 +14,42 @@ namespace ESPEasy { namespace net { +#ifdef ESP32 +struct TX_RX_traffic_count { + + void clear() { _tx_count = 0; _rx_count = 0; } + + uint64_t _tx_count{}; + uint64_t _rx_count{}; + +}; + +typedef std::map InterfaceTrafficCount_t; + +static InterfaceTrafficCount_t interfaceTrafficCount; + +static void tx_rx_event_handler(void *arg, esp_event_base_t event_base, + int32_t event_id, void *event_data) +{ + ip_event_tx_rx_t *event = (ip_event_tx_rx_t *)event_data; + const int key = esp_netif_get_netif_impl_index(event->esp_netif); + + if (event->dir == ESP_NETIF_TX) { + interfaceTrafficCount[key]._tx_count += event->len; + } else if (event->dir == ESP_NETIF_RX) { + interfaceTrafficCount[key]._rx_count += event->len; + addLog(LOG_LEVEL_INFO, strformat( + F("RX: %s key: %d len: %d total: %d"), + esp_netif_get_desc(event->esp_netif), + key, + event->len, + interfaceTrafficCount[key]._rx_count + )); + } +} + +#endif // ifdef ESP32 + NWPluginData_base::NWPluginData_base( nwpluginID_t nwpluginID, networkIndex_t networkIndex @@ -31,6 +67,18 @@ NWPluginData_base::NWPluginData_base( , _netif(netif) #endif { + #ifdef ESP32 + const int key = esp_netif_get_netif_impl_index(_netif->netif()); + interfaceTrafficCount[key].clear(); + static bool registered_IP_EVENT_TX_RX = false; + esp_netif_tx_rx_event_enable(_netif->netif()); + + if (!registered_IP_EVENT_TX_RX) { + esp_event_handler_register(IP_EVENT, IP_EVENT_TX_RX, &tx_rx_event_handler, NULL); + registered_IP_EVENT_TX_RX = true; + } + + #endif // ifdef ESP32 #if FEATURE_STORE_NETWORK_INTERFACE_SETTINGS if (_kvs == nullptr) { @@ -41,6 +89,13 @@ NWPluginData_base::NWPluginData_base( NWPluginData_base::~NWPluginData_base() { +#ifdef ESP32 + esp_netif_tx_rx_event_disable(_netif->netif()); + const int key = esp_netif_get_netif_impl_index(_netif->netif()); + auto it = interfaceTrafficCount.find(key); + + if (it != interfaceTrafficCount.end()) { interfaceTrafficCount.erase(it); } +#endif // ifdef ESP32 #if FEATURE_STORE_NETWORK_INTERFACE_SETTINGS if (_kvs) { delete _kvs; } @@ -101,6 +156,17 @@ bool NWPluginData_base::handle_priority_route_changed() return res; } +bool NWPluginData_base::getTrafficCount(uint64_t& tx, uint64_t& rx) const +{ + const int key = esp_netif_get_netif_impl_index(_netif->netif()); + auto it = interfaceTrafficCount.find(key); + + if (it == interfaceTrafficCount.end()) { return false; } + tx = it->second._tx_count; + rx = it->second._rx_count; + return true; +} + #endif // ifdef ESP32 diff --git a/src/ESPEasy/net/DataStructs/NWPluginData_base.h b/src/ESPEasy/net/DataStructs/NWPluginData_base.h index 5115ccd65..c9b10c848 100644 --- a/src/ESPEasy/net/DataStructs/NWPluginData_base.h +++ b/src/ESPEasy/net/DataStructs/NWPluginData_base.h @@ -53,6 +53,7 @@ struct NWPluginData_base { #ifdef ESP32 virtual bool handle_priority_route_changed(); + bool getTrafficCount(uint64_t& tx, uint64_t& rx) const; #endif virtual NWPluginData_static_runtime& getNWPluginData_static_runtime() = 0; diff --git a/src/ESPEasy/net/Globals/NWPlugins.cpp b/src/ESPEasy/net/Globals/NWPlugins.cpp index 8d322c79a..58227b00f 100644 --- a/src/ESPEasy/net/Globals/NWPlugins.cpp +++ b/src/ESPEasy/net/Globals/NWPlugins.cpp @@ -109,6 +109,7 @@ bool NWPluginCall(NWPlugin::Function Function, EventStruct *event, String& str) #ifdef ESP32 case NWPlugin::Function::NWPLUGIN_GET_INTERFACE: case NWPlugin::Function::NWPLUGIN_WEBFORM_SHOW_ROUTE_PRIO: + case NWPlugin::Function::NWPLUGIN_GET_TRAFFIC_COUNT: #endif // ifdef ESP32 if (!validNetworkIndex(event->NetworkIndex) || diff --git a/src/ESPEasy/net/_NW001_WiFi_STA.cpp b/src/ESPEasy/net/_NW001_WiFi_STA.cpp index 7e5cb082b..ed0c58f7f 100644 --- a/src/ESPEasy/net/_NW001_WiFi_STA.cpp +++ b/src/ESPEasy/net/_NW001_WiFi_STA.cpp @@ -68,6 +68,22 @@ bool NWPlugin_001(NWPlugin::Function function, EventStruct *event, String& strin success = event->networkInterface != nullptr; break; } + case NWPlugin::Function::NWPLUGIN_GET_TRAFFIC_COUNT: + { + auto *NW_data = getNWPluginData(event->NetworkIndex); + + if (NW_data) { + uint64_t tx{}; + uint64_t rx{}; + + if (NW_data->getTrafficCount(tx, rx)) { + event->Par1 = tx; + event->Par2 = rx; + success = true; + } + } + break; + } # endif // ifdef ESP32 case NWPlugin::Function::NWPLUGIN_WEBFORM_SHOW_CONNECTED: diff --git a/src/src/DataTypes/ESPEasy_plugin_functions.h b/src/src/DataTypes/ESPEasy_plugin_functions.h index 6d9eb50a3..5c6b0919e 100644 --- a/src/src/DataTypes/ESPEasy_plugin_functions.h +++ b/src/src/DataTypes/ESPEasy_plugin_functions.h @@ -163,6 +163,7 @@ public: NWPLUGIN_GET_INTERFACE, NWPLUGIN_WEBFORM_SHOW_ROUTE_PRIO, NWPLUGIN_PRIORITY_ROUTE_CHANGED, // The default interface was changed, let other interfaces check to see if they need to do something. + NWPLUGIN_GET_TRAFFIC_COUNT, // TX/RX count in event->Par1, resp. event->Par2 #endif NWPLUGIN_PROCESS_EVENT, // Process received event arduino_event_id_t NWPLUGIN_WEBFORM_SHOW_CONNECTED, // Used for showing connected state/speed diff --git a/src/src/WebServer/NetworkPage.cpp b/src/src/WebServer/NetworkPage.cpp index 2b5105b5e..f5ee88e1e 100644 --- a/src/src/WebServer/NetworkPage.cpp +++ b/src/src/WebServer/NetworkPage.cpp @@ -341,17 +341,6 @@ void handle_networks_NetworkSettingsPage(ESPEasy::net::networkIndex_t networkind { addFormSubHeader(F("Network Interface")); - { - String str; - const bool res = NWPluginCall(NWPlugin::Function::NWPLUGIN_WEBFORM_SHOW_CONNECTED, &TempEvent, str); - - if (res && !str.isEmpty()) { - addRowLabel(F("Connected")); - str.replace(F("\n"), F("
    ")); - addHtml_pre(str); - } - } - { String str; const bool res = NWPluginCall(NWPlugin::Function::NWPLUGIN_WEBFORM_SHOW_HW_ADDRESS, &TempEvent, str); @@ -431,6 +420,27 @@ void handle_networks_NetworkSettingsPage(ESPEasy::net::networkIndex_t networkind } } } + { + String str; + const bool res = NWPluginCall(NWPlugin::Function::NWPLUGIN_WEBFORM_SHOW_CONNECTED, &TempEvent, str); + + if (res && !str.isEmpty()) { + addFormSubHeader(F("Connection")); + + addRowLabel(F("Connected")); + str.replace(F("\n"), F("
    ")); + addHtml_pre(str); + + + + if (NWPluginCall(NWPlugin::Function::NWPLUGIN_GET_TRAFFIC_COUNT, &TempEvent, str)) { + addRowLabel(F("TX Bytes Total")); + addHtmlInt(TempEvent.Par1); + addRowLabel(F("RX Bytes Total")); + addHtmlInt(TempEvent.Par2); + } + } + } } # endif // ifdef ESP32 From 5ea9b3f81db93aea87492e8bf5fa403c53c2d3f3 Mon Sep 17 00:00:00 2001 From: TD-er Date: Mon, 4 Aug 2025 01:34:37 +0200 Subject: [PATCH 175/564] [Build] Fix ESP32 build due to missing include --- src/ESPEasy/net/DataStructs/NWPluginData_base.cpp | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/ESPEasy/net/DataStructs/NWPluginData_base.cpp b/src/ESPEasy/net/DataStructs/NWPluginData_base.cpp index 644f8208d..b784edbf1 100644 --- a/src/ESPEasy/net/DataStructs/NWPluginData_base.cpp +++ b/src/ESPEasy/net/DataStructs/NWPluginData_base.cpp @@ -9,6 +9,9 @@ #endif #ifdef ESP32 # include "../Globals/NetworkState.h" + +# include +# include #endif namespace ESPEasy { @@ -77,6 +80,7 @@ NWPluginData_base::NWPluginData_base( esp_event_handler_register(IP_EVENT, IP_EVENT_TX_RX, &tx_rx_event_handler, NULL); registered_IP_EVENT_TX_RX = true; } + esp_netif_tx_rx_event_enable(_netif->netif()); #endif // ifdef ESP32 #if FEATURE_STORE_NETWORK_INTERFACE_SETTINGS From 1d2aa492c7cce1616ec60109f0c4340c216f014c Mon Sep 17 00:00:00 2001 From: TD-er Date: Mon, 4 Aug 2025 10:28:27 +0200 Subject: [PATCH 176/564] [Network] Show connection info for each interface --- .../net/DataStructs/NWPluginData_base.cpp | 1 + .../net/DataStructs/NWPluginData_base.h | 18 ++++-- src/ESPEasy/net/Globals/NWPlugins.cpp | 57 +++++++++++++++++-- src/ESPEasy/net/_NW001_WiFi_STA.cpp | 16 ------ src/src/DataStructs/ESPEasy_EventStruct.h | 9 ++- src/src/DataTypes/ESPEasy_plugin_functions.h | 15 ++--- src/src/Helpers/ESPEasy_checks.cpp | 4 +- src/src/WebServer/NetworkPage.cpp | 6 ++ 8 files changed, 90 insertions(+), 36 deletions(-) diff --git a/src/ESPEasy/net/DataStructs/NWPluginData_base.cpp b/src/ESPEasy/net/DataStructs/NWPluginData_base.cpp index b784edbf1..d263df356 100644 --- a/src/ESPEasy/net/DataStructs/NWPluginData_base.cpp +++ b/src/ESPEasy/net/DataStructs/NWPluginData_base.cpp @@ -81,6 +81,7 @@ NWPluginData_base::NWPluginData_base( registered_IP_EVENT_TX_RX = true; } esp_netif_tx_rx_event_enable(_netif->netif()); +// _netif->netif()->tx_rx_events_enabled = true; #endif // ifdef ESP32 #if FEATURE_STORE_NETWORK_INTERFACE_SETTINGS diff --git a/src/ESPEasy/net/DataStructs/NWPluginData_base.h b/src/ESPEasy/net/DataStructs/NWPluginData_base.h index c9b10c848..2625d5347 100644 --- a/src/ESPEasy/net/DataStructs/NWPluginData_base.h +++ b/src/ESPEasy/net/DataStructs/NWPluginData_base.h @@ -34,6 +34,11 @@ struct NWPluginData_base { virtual ~NWPluginData_base(); +virtual bool init(EventStruct *event) = 0; + +virtual bool exit(EventStruct *event) = 0; + + bool baseClassOnly() const { return _baseClassOnly; } @@ -44,17 +49,18 @@ struct NWPluginData_base { // Should only be called from initNWPluginData #if FEATURE_STORE_NETWORK_INTERFACE_SETTINGS - bool init_KVS(); + bool init_KVS(); #endif - nwpluginID_t getNWPluginID() const { return _nw_data_pluginID; } + nwpluginID_t getNWPluginID() const { return _nw_data_pluginID; } - virtual LongTermTimer::Duration getConnectedDuration_ms(); + virtual LongTermTimer::Duration getConnectedDuration_ms(); #ifdef ESP32 - virtual bool handle_priority_route_changed(); - bool getTrafficCount(uint64_t& tx, uint64_t& rx) const; -#endif + virtual bool handle_priority_route_changed(); + bool getTrafficCount(uint64_t& tx, + uint64_t& rx) const; +#endif // ifdef ESP32 virtual NWPluginData_static_runtime& getNWPluginData_static_runtime() = 0; diff --git a/src/ESPEasy/net/Globals/NWPlugins.cpp b/src/ESPEasy/net/Globals/NWPlugins.cpp index 58227b00f..6ee93ec88 100644 --- a/src/ESPEasy/net/Globals/NWPlugins.cpp +++ b/src/ESPEasy/net/Globals/NWPlugins.cpp @@ -8,6 +8,7 @@ #include "../../../src/Globals/Settings.h" #include "../../../src/Helpers/PrintToString.h" #include "../Helpers/_NWPlugin_init.h" +#include "../_NWPlugin_Helper.h" namespace ESPEasy { namespace net { @@ -55,7 +56,7 @@ bool NWPluginCall(NWPlugin::Function Function, EventStruct *event, String& str) #endif { // Set to true where return value doesn't matter - bool success = + bool success = #ifdef ESP32 Function != NWPlugin::Function::NWPLUGIN_PRIORITY_ROUTE_CHANGED && #endif @@ -70,9 +71,10 @@ bool NWPluginCall(NWPlugin::Function Function, EventStruct *event, String& str) } for (networkIndex_t x = 0; x < NETWORK_MAX; x++) { - const bool checkedEnabled = - Settings.getNetworkEnabled(x) || + const bool checkedEnabled = + Settings.getNetworkEnabled(x) || Function == NWPlugin::Function::NWPLUGIN_EXIT; + if (Settings.getNWPluginID_for_network(x) && checkedEnabled) { event->NetworkIndex = x; String command; @@ -97,6 +99,54 @@ bool NWPluginCall(NWPlugin::Function Function, EventStruct *event, String& str) return success; } + // calls to specific network's NWPluginData_base (must be enabled) +#ifdef ESP32 + case NWPlugin::Function::NWPLUGIN_GET_TRAFFIC_COUNT: +#endif // ifdef ESP32 + case NWPlugin::Function::NWPLUGIN_GET_CONNECTED_DURATION: + { + bool success = false; + if (!validNetworkIndex(event->NetworkIndex) || + !Settings.getNetworkEnabled(event->NetworkIndex)) { return false; } + + auto *NW_data = getNWPluginData(event->NetworkIndex); + + if (NW_data) { + switch (Function) + { +#ifdef ESP32 + case NWPlugin::Function::NWPLUGIN_GET_TRAFFIC_COUNT: + { + uint64_t tx{}; + uint64_t rx{}; + + if (NW_data->getTrafficCount(tx, rx)) { + event->Par64_1 = tx; + event->Par64_2 = rx; + success = true; + } + break; + } +#endif // ifdef ESP32 + case NWPlugin::Function::NWPLUGIN_GET_CONNECTED_DURATION: + { + NWPluginData_static_runtime& runtime_data = NW_data->getNWPluginData_static_runtime(); + auto duration = runtime_data._connectedStats.getLastOnDuration_ms(); + event->String1 = format_msec_duration_HMS(duration); + event->Par64_1 = duration; + event->Par64_2 = runtime_data._connectedStats.getCycleCount(); + success = true; + + break; + } + default: break; + } + } + + return success; + } + + // calls to specific network which need to be enabled before calling case NWPlugin::Function::NWPLUGIN_INIT: case NWPlugin::Function::NWPLUGIN_CONNECT_SUCCESS: @@ -109,7 +159,6 @@ bool NWPluginCall(NWPlugin::Function Function, EventStruct *event, String& str) #ifdef ESP32 case NWPlugin::Function::NWPLUGIN_GET_INTERFACE: case NWPlugin::Function::NWPLUGIN_WEBFORM_SHOW_ROUTE_PRIO: - case NWPlugin::Function::NWPLUGIN_GET_TRAFFIC_COUNT: #endif // ifdef ESP32 if (!validNetworkIndex(event->NetworkIndex) || diff --git a/src/ESPEasy/net/_NW001_WiFi_STA.cpp b/src/ESPEasy/net/_NW001_WiFi_STA.cpp index ed0c58f7f..7e5cb082b 100644 --- a/src/ESPEasy/net/_NW001_WiFi_STA.cpp +++ b/src/ESPEasy/net/_NW001_WiFi_STA.cpp @@ -68,22 +68,6 @@ bool NWPlugin_001(NWPlugin::Function function, EventStruct *event, String& strin success = event->networkInterface != nullptr; break; } - case NWPlugin::Function::NWPLUGIN_GET_TRAFFIC_COUNT: - { - auto *NW_data = getNWPluginData(event->NetworkIndex); - - if (NW_data) { - uint64_t tx{}; - uint64_t rx{}; - - if (NW_data->getTrafficCount(tx, rx)) { - event->Par1 = tx; - event->Par2 = rx; - success = true; - } - } - break; - } # endif // ifdef ESP32 case NWPlugin::Function::NWPLUGIN_WEBFORM_SHOW_CONNECTED: diff --git a/src/src/DataStructs/ESPEasy_EventStruct.h b/src/src/DataStructs/ESPEasy_EventStruct.h index 67de080f1..6bdcbc137 100644 --- a/src/src/DataStructs/ESPEasy_EventStruct.h +++ b/src/src/DataStructs/ESPEasy_EventStruct.h @@ -58,6 +58,7 @@ public: String String3; String String4; String String5; + String String6; #ifdef ESP32 NetworkInterface* networkInterface = nullptr; #endif @@ -74,8 +75,14 @@ public: int Par3; int Par4; int Par5; + int Par6; }; - int ParN[5] = { 0 }; + struct { + int64_t Par64_1; + int64_t Par64_2; + int64_t Par64_3; + }; + int ParN[6] = { 0 }; }; // The origin of the values in the event. See EventValueSource.h diff --git a/src/src/DataTypes/ESPEasy_plugin_functions.h b/src/src/DataTypes/ESPEasy_plugin_functions.h index 5c6b0919e..4d1f4ae72 100644 --- a/src/src/DataTypes/ESPEasy_plugin_functions.h +++ b/src/src/DataTypes/ESPEasy_plugin_functions.h @@ -163,14 +163,15 @@ public: NWPLUGIN_GET_INTERFACE, NWPLUGIN_WEBFORM_SHOW_ROUTE_PRIO, NWPLUGIN_PRIORITY_ROUTE_CHANGED, // The default interface was changed, let other interfaces check to see if they need to do something. - NWPLUGIN_GET_TRAFFIC_COUNT, // TX/RX count in event->Par1, resp. event->Par2 + NWPLUGIN_GET_TRAFFIC_COUNT, // TX/RX count in event->Par64_1, resp. event->Par64_2 #endif - NWPLUGIN_PROCESS_EVENT, // Process received event arduino_event_id_t - NWPLUGIN_WEBFORM_SHOW_CONNECTED, // Used for showing connected state/speed - NWPLUGIN_WEBFORM_SHOW_HOSTNAME, // Used for showing hostname - NWPLUGIN_WEBFORM_SHOW_HW_ADDRESS, // Used for showing MAC - NWPLUGIN_WEBFORM_SHOW_IP, // Used for showing IP - NWPLUGIN_WEBFORM_SHOW_PORT // Used for showing host information for the network adapter. + NWPLUGIN_GET_CONNECTED_DURATION, + NWPLUGIN_PROCESS_EVENT, // Process received event arduino_event_id_t + NWPLUGIN_WEBFORM_SHOW_CONNECTED, // Used for showing connected state/speed + NWPLUGIN_WEBFORM_SHOW_HOSTNAME, // Used for showing hostname + NWPLUGIN_WEBFORM_SHOW_HW_ADDRESS, // Used for showing MAC + NWPLUGIN_WEBFORM_SHOW_IP, // Used for showing IP + NWPLUGIN_WEBFORM_SHOW_PORT // Used for showing host information for the network adapter. }; diff --git a/src/src/Helpers/ESPEasy_checks.cpp b/src/src/Helpers/ESPEasy_checks.cpp index da01f3204..cbd5e945a 100644 --- a/src/src/Helpers/ESPEasy_checks.cpp +++ b/src/src/Helpers/ESPEasy_checks.cpp @@ -104,9 +104,9 @@ void run_compiletime_checks() { check_max_size(); #ifdef ESP32 // ESP_IDF_VERSION_MAJOR > 3 // String class has increased with 4 bytes - check_size(); // Is not stored + check_size(); // Is not stored #else - check_size(); // Is not stored + check_size(); // Is not stored #endif diff --git a/src/src/WebServer/NetworkPage.cpp b/src/src/WebServer/NetworkPage.cpp index f5ee88e1e..8921cc3c3 100644 --- a/src/src/WebServer/NetworkPage.cpp +++ b/src/src/WebServer/NetworkPage.cpp @@ -431,6 +431,12 @@ void handle_networks_NetworkSettingsPage(ESPEasy::net::networkIndex_t networkind str.replace(F("\n"), F("
    ")); addHtml_pre(str); + if (NWPluginCall(NWPlugin::Function::NWPLUGIN_GET_CONNECTED_DURATION, &TempEvent, str)) { + addRowLabel(F("Connection Duration")); + addHtml(TempEvent.String1); + addRowLabel(F("Number of Reconnects")); + addHtml(TempEvent.Par64_2); + } if (NWPluginCall(NWPlugin::Function::NWPLUGIN_GET_TRAFFIC_COUNT, &TempEvent, str)) { From 5e9bfc6b89f2875fed4a141e6821e04ecb0c3557 Mon Sep 17 00:00:00 2001 From: TD-er Date: Mon, 4 Aug 2025 13:03:39 +0200 Subject: [PATCH 177/564] [Network] Reduce code duplication showing connection info --- src/ESPEasy/net/Globals/NWPlugins.cpp | 11 +++++----- .../NW005_data_struct_PPP_modem.cpp | 3 ++- src/ESPEasy/net/_NW001_WiFi_STA.cpp | 15 ------------- src/ESPEasy/net/_NW003_ETH_RMII.cpp | 13 ------------ src/ESPEasy/net/_NW004_ETH_SPI.cpp | 13 ------------ src/ESPEasy/net/_NW005_PPP_modem.cpp | 8 ------- src/src/Helpers/Convert.cpp | 6 +++++- src/src/WebServer/ControllerPage.cpp | 19 ++++++++++++++--- src/src/WebServer/NetworkPage.cpp | 21 ++++++++++++++----- 9 files changed, 45 insertions(+), 64 deletions(-) diff --git a/src/ESPEasy/net/Globals/NWPlugins.cpp b/src/ESPEasy/net/Globals/NWPlugins.cpp index 6ee93ec88..9a425b513 100644 --- a/src/ESPEasy/net/Globals/NWPlugins.cpp +++ b/src/ESPEasy/net/Globals/NWPlugins.cpp @@ -132,11 +132,12 @@ bool NWPluginCall(NWPlugin::Function Function, EventStruct *event, String& str) { NWPluginData_static_runtime& runtime_data = NW_data->getNWPluginData_static_runtime(); auto duration = runtime_data._connectedStats.getLastOnDuration_ms(); - event->String1 = format_msec_duration_HMS(duration); - event->Par64_1 = duration; - event->Par64_2 = runtime_data._connectedStats.getCycleCount(); - success = true; - + if (duration > 0) { + str = format_msec_duration_HMS(duration); + event->Par64_1 = duration; + event->Par64_2 = runtime_data._connectedStats.getCycleCount(); + success = true; + } break; } default: break; diff --git a/src/ESPEasy/net/NWPluginStructs/NW005_data_struct_PPP_modem.cpp b/src/ESPEasy/net/NWPluginStructs/NW005_data_struct_PPP_modem.cpp index aea2e2414..71291fe62 100644 --- a/src/ESPEasy/net/NWPluginStructs/NW005_data_struct_PPP_modem.cpp +++ b/src/ESPEasy/net/NWPluginStructs/NW005_data_struct_PPP_modem.cpp @@ -470,11 +470,12 @@ void NW005_data_struct_PPP_modem::webform_load(EventStruct *event) showWebformItem(*_kvs, params); } - addFormSubHeader(F("Connection")); + addFormSubHeader(F("Connection Settings")); { auto params = NW005_makeWebFormItemParams(NW005_KEY_APN); params._maxLength = 64; showWebformItem(*_kvs, params); + addFormNote(F("Optional, can be left empty")); } { auto params = NW005_makeWebFormItemParams(NW005_KEY_SIM_PIN); diff --git a/src/ESPEasy/net/_NW001_WiFi_STA.cpp b/src/ESPEasy/net/_NW001_WiFi_STA.cpp index 7e5cb082b..44d69fb87 100644 --- a/src/ESPEasy/net/_NW001_WiFi_STA.cpp +++ b/src/ESPEasy/net/_NW001_WiFi_STA.cpp @@ -92,21 +92,6 @@ bool NWPlugin_001(NWPlugin::Function function, EventStruct *event, String& strin } # endif // ifdef ESP32 - if (success) { - ESPEasy::net::wifi::NW001_data_struct_WiFi_STA *NW_data = - static_cast(getNWPluginData(event->NetworkIndex)); - - if (NW_data) { - auto connectionDuration_ms = NW_data->getConnectedDuration_ms(); - - if (connectionDuration_ms > 0) { - string += concat( - '\n', - format_msec_duration_HMS(connectionDuration_ms)); - } - } - } - break; } diff --git a/src/ESPEasy/net/_NW003_ETH_RMII.cpp b/src/ESPEasy/net/_NW003_ETH_RMII.cpp index bf37e3862..a7bcfd33c 100644 --- a/src/ESPEasy/net/_NW003_ETH_RMII.cpp +++ b/src/ESPEasy/net/_NW003_ETH_RMII.cpp @@ -88,19 +88,6 @@ bool NWPlugin_003(NWPlugin::Function function, EventStruct *event, String& strin string += ETH.fullDuplex() ? F("Mbps FD") : F("Mbps HD"); if (!ETH.autoNegotiation()) { string += F("(manual)"); } - - ESPEasy::net::eth::NW003_data_struct_ETH_RMII *NW_data = - static_cast(getNWPluginData(event->NetworkIndex)); - - if (NW_data) { - auto connectionDuration_ms = NW_data->getConnectedDuration_ms(); - - if (connectionDuration_ms > 0) { - string += concat( - '\n', - format_msec_duration_HMS(connectionDuration_ms)); - } - } } break; } diff --git a/src/ESPEasy/net/_NW004_ETH_SPI.cpp b/src/ESPEasy/net/_NW004_ETH_SPI.cpp index dc731607f..bf04eb925 100644 --- a/src/ESPEasy/net/_NW004_ETH_SPI.cpp +++ b/src/ESPEasy/net/_NW004_ETH_SPI.cpp @@ -91,19 +91,6 @@ bool NWPlugin_004(NWPlugin::Function function, EventStruct *event, String& strin string += ETH.fullDuplex() ? F("Mbps FD") : F("Mbps HD"); if (!ETH.autoNegotiation()) { string += F("(manual)"); } - ESPEasy::net::eth::NW004_data_struct_ETH_SPI *NW_data = - static_cast(getNWPluginData(event->NetworkIndex)); - - if (NW_data) { - auto connectionDuration_ms = NW_data->getConnectedDuration_ms(); - - if (connectionDuration_ms > 0) { - string += concat( - '\n', - format_msec_duration_HMS(connectionDuration_ms)); - } - } - } break; } diff --git a/src/ESPEasy/net/_NW005_PPP_modem.cpp b/src/ESPEasy/net/_NW005_PPP_modem.cpp index 4b7df09ac..a5e7fc439 100644 --- a/src/ESPEasy/net/_NW005_PPP_modem.cpp +++ b/src/ESPEasy/net/_NW005_PPP_modem.cpp @@ -85,14 +85,6 @@ bool NWPlugin_005(NWPlugin::Function function, EventStruct *event, String& strin F("%s (%s dBm)"), NW_data->operatorName().c_str(), NW_data->getRSSI().c_str()); - - auto connectionDuration_ms = NW_data->getConnectedDuration_ms(); - - if (connectionDuration_ms > 0) { - string += concat( - '\n', - format_msec_duration_HMS(connectionDuration_ms)); - } } } diff --git a/src/src/Helpers/Convert.cpp b/src/src/Helpers/Convert.cpp index 1d335bd64..01a8f6389 100644 --- a/src/src/Helpers/Convert.cpp +++ b/src/src/Helpers/Convert.cpp @@ -146,10 +146,14 @@ String format_msec_duration(int64_t duration, bool useHMS) { if (duration_s < 60) { return strformat( - F("%02d.%03d"), + useHMS ? F("%02ds.%03d") : F("%02d.%03d"), duration_s, duration_ms); } + if (useHMS && duration_s > 60) { + // No need to show msec when time is over 1 minute + return secondsToDayHourMinuteSecond(duration_s, useHMS); + } return strformat( F("%s.%03d"), secondsToDayHourMinuteSecond(duration_s, useHMS).c_str(), diff --git a/src/src/WebServer/ControllerPage.cpp b/src/src/WebServer/ControllerPage.cpp index aad881e77..ce5a4c868 100644 --- a/src/src/WebServer/ControllerPage.cpp +++ b/src/src/WebServer/ControllerPage.cpp @@ -44,7 +44,7 @@ void handle_controllers() { sendHeadandTail_stdtemplate(_HEAD); // 'index' value in the URL - uint8_t controllerindex = getFormItemInt(F("index"), 0); + uint8_t controllerindex = getFormItemInt(F("index"), 0); const bool controllerIndexSet = controllerindex != 0 && validControllerIndex(controllerindex - 1); --controllerindex; // Index in URL is starting from 1, but starting from 0 in the array. @@ -281,7 +281,7 @@ void handle_controllers_ShowAllControllersTable() html_TD(); const protocolIndex_t ProtocolIndex = getProtocolIndex_from_ControllerIndex(x); - const ProtocolStruct& proto = getProtocolStruct(ProtocolIndex); + const ProtocolStruct& proto = getProtocolStruct(ProtocolIndex); if ((INVALID_PROTOCOL_INDEX == ProtocolIndex) || proto.usesPort) { addHtmlInt(13 == Settings.Protocol[x] ? Settings.UDPPort : ControllerSettings->Port); // P2P/C013 exception @@ -476,7 +476,8 @@ void handle_controllers_ControllerSettingsPage(controllerIndex_t controllerindex addControllerParameterForm(*ControllerSettings, controllerindex, ControllerSettingsStruct::CONTROLLER_AUTO_DISCOVERY_TRIGGER); addControllerParameterForm(*ControllerSettings, controllerindex, ControllerSettingsStruct::CONTROLLER_AUTO_DISCOVERY_TOPIC); addControllerParameterForm(*ControllerSettings, controllerindex, ControllerSettingsStruct::CONTROLLER_AUTO_DISCOVERY_CONFIG); - addControllerParameterForm(*ControllerSettings, controllerindex, ControllerSettingsStruct::CONTROLLER_RETAINED_DISCOVERY_OPTION); + addControllerParameterForm(*ControllerSettings, controllerindex, + ControllerSettingsStruct::CONTROLLER_RETAINED_DISCOVERY_OPTION); } # endif // if FEATURE_MQTT_DISCOVER } @@ -506,6 +507,18 @@ void handle_controllers_ControllerSettingsPage(controllerIndex_t controllerindex addRowLabel(F("MQTT Client Connected")); addEnabled(MQTTclient_connected); + if (MQTTclient_connected) { + auto conn_duration = MQTTclient_connected_stats.getLastOnDuration_ms(); + + if (conn_duration > 0) { + addRowLabel(F("Connection Duration")); + addHtml(format_msec_duration_HMS(conn_duration)); + addRowLabel(F("Number of Reconnects")); + addHtmlInt(MQTTclient_connected_stats.getCycleCount()); + } + + } + # if FEATURE_MQTT_TLS if (proto.usesTLS) { diff --git a/src/src/WebServer/NetworkPage.cpp b/src/src/WebServer/NetworkPage.cpp index 8921cc3c3..9dd184844 100644 --- a/src/src/WebServer/NetworkPage.cpp +++ b/src/src/WebServer/NetworkPage.cpp @@ -239,6 +239,14 @@ void handle_networks_ShowAllNetworksTable() if (functions[i] == NWPlugin::Function::NWPLUGIN_WEBFORM_SHOW_CONNECTED) { if (!res || str.isEmpty()) { addEnabled(res); + } else { + String conn_duration; + if (NWPluginCall(NWPlugin::Function::NWPLUGIN_GET_CONNECTED_DURATION, &TempEvent, conn_duration)) { + if (conn_duration.length()) { + str += '\n'; + str += conn_duration; + } + } } } else if (functions[i] == NWPlugin::Function::NWPLUGIN_WEBFORM_SHOW_HW_ADDRESS) { if (res && !TempEvent.String1.isEmpty() && !str.isEmpty()) { @@ -425,26 +433,29 @@ void handle_networks_NetworkSettingsPage(ESPEasy::net::networkIndex_t networkind const bool res = NWPluginCall(NWPlugin::Function::NWPLUGIN_WEBFORM_SHOW_CONNECTED, &TempEvent, str); if (res && !str.isEmpty()) { - addFormSubHeader(F("Connection")); + addFormSubHeader(F("Connection Information")); addRowLabel(F("Connected")); str.replace(F("\n"), F("
    ")); addHtml_pre(str); - if (NWPluginCall(NWPlugin::Function::NWPLUGIN_GET_CONNECTED_DURATION, &TempEvent, str)) { + String conn_duration; + + if (NWPluginCall(NWPlugin::Function::NWPLUGIN_GET_CONNECTED_DURATION, &TempEvent, conn_duration)) { addRowLabel(F("Connection Duration")); - addHtml(TempEvent.String1); + addHtml(conn_duration); addRowLabel(F("Number of Reconnects")); - addHtml(TempEvent.Par64_2); + addHtmlInt(TempEvent.Par64_2); } - +#ifdef ESP32 if (NWPluginCall(NWPlugin::Function::NWPLUGIN_GET_TRAFFIC_COUNT, &TempEvent, str)) { addRowLabel(F("TX Bytes Total")); addHtmlInt(TempEvent.Par1); addRowLabel(F("RX Bytes Total")); addHtmlInt(TempEvent.Par2); } +#endif } } } From e3385ed8dc38366f4e0f54faedd8373ab57b9633 Mon Sep 17 00:00:00 2001 From: TD-er Date: Mon, 4 Aug 2025 13:04:38 +0200 Subject: [PATCH 178/564] [Build] Fix ESP-IDF 5.5 platform to specific one before pip -> uv change --- platformio_core_defs.ini | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/platformio_core_defs.ini b/platformio_core_defs.ini index 8eeff75ec..31f4c2aa7 100644 --- a/platformio_core_defs.ini +++ b/platformio_core_defs.ini @@ -194,7 +194,8 @@ lib_extra_dirs = ; ESP_IDF 5.5.0 [core_esp32_IDF5_5_0__3_2_0_LittleFS] -platform = https://github.com/Jason2866/platform-espressif32.git#Arduino/IDF55 +platform = https://github.com/Jason2866/platform-espressif32.git#0b2bdf30cd0744b0b37907ee022ee7e30bb8f8bc +;platform = https://github.com/Jason2866/platform-espressif32.git#Arduino/IDF55 platform_packages = framework-arduinoespressif32 @ https://github.com/Jason2866/esp32-arduino-lib-builder/releases/download/3107-1140-5.5/framework-arduinoespressif32-release_v5.5-a2251f33.zip build_flags = -DESP32_STAGE -DESP_IDF_VERSION_MAJOR=5 From 8f7a465d635f66833084696bde7c3b1781b06174 Mon Sep 17 00:00:00 2001 From: TD-er Date: Mon, 4 Aug 2025 13:52:05 +0200 Subject: [PATCH 179/564] [WiFi] Show WiFi Auth mode in connection info --- .../NW001_data_struct_WiFi_STA.cpp | 5 ++++ .../NW001_data_struct_WiFi_STA.h | 1 + src/ESPEasy/net/_NW001_WiFi_STA.cpp | 10 ++++++++ .../net/wifi/ESPEasyWiFi_STA_Event_ESP32.cpp | 6 +++++ .../net/wifi/ESPEasyWiFi_STA_Event_ESP32.h | 2 ++ .../wifi/ESPEasyWiFi_STA_Event_ESP8266.cpp | 6 +++++ .../net/wifi/ESPEasyWiFi_STA_Event_ESP8266.h | 2 ++ src/src/Helpers/StringGenerator_WiFi.cpp | 23 ++++++++++++++----- 8 files changed, 49 insertions(+), 6 deletions(-) diff --git a/src/ESPEasy/net/NWPluginStructs/NW001_data_struct_WiFi_STA.cpp b/src/ESPEasy/net/NWPluginStructs/NW001_data_struct_WiFi_STA.cpp index 9bbd4c9d3..c0c49d098 100644 --- a/src/ESPEasy/net/NWPluginStructs/NW001_data_struct_WiFi_STA.cpp +++ b/src/ESPEasy/net/NWPluginStructs/NW001_data_struct_WiFi_STA.cpp @@ -101,6 +101,11 @@ NWPluginData_static_runtime& NW001_data_struct_WiFi_STA::getNWPluginData_static_ return _WiFiEventHandler.getNWPluginData_static_runtime(); } +const __FlashStringHelper * NW001_data_struct_WiFi_STA::getWiFi_encryptionType() const +{ + return _WiFiEventHandler.getWiFi_encryptionType(); +} + # ifdef ESP32 diff --git a/src/ESPEasy/net/NWPluginStructs/NW001_data_struct_WiFi_STA.h b/src/ESPEasy/net/NWPluginStructs/NW001_data_struct_WiFi_STA.h index 571fddf90..c69a60ad8 100644 --- a/src/ESPEasy/net/NWPluginStructs/NW001_data_struct_WiFi_STA.h +++ b/src/ESPEasy/net/NWPluginStructs/NW001_data_struct_WiFi_STA.h @@ -35,6 +35,7 @@ struct NW001_data_struct_WiFi_STA : public NWPluginData_base { # endif NWPluginData_static_runtime& getNWPluginData_static_runtime(); + const __FlashStringHelper * getWiFi_encryptionType() const; private: diff --git a/src/ESPEasy/net/_NW001_WiFi_STA.cpp b/src/ESPEasy/net/_NW001_WiFi_STA.cpp index 44d69fb87..3b73c19c5 100644 --- a/src/ESPEasy/net/_NW001_WiFi_STA.cpp +++ b/src/ESPEasy/net/_NW001_WiFi_STA.cpp @@ -92,6 +92,16 @@ bool NWPlugin_001(NWPlugin::Function function, EventStruct *event, String& strin } # endif // ifdef ESP32 + if (success) { + ESPEasy::net::wifi::NW001_data_struct_WiFi_STA *NW_data = + static_cast(getNWPluginData(event->NetworkIndex)); + + if (NW_data) { + string += '\n'; + string += NW_data->getWiFi_encryptionType(); + } + } + break; } diff --git a/src/ESPEasy/net/wifi/ESPEasyWiFi_STA_Event_ESP32.cpp b/src/ESPEasy/net/wifi/ESPEasyWiFi_STA_Event_ESP32.cpp index 9fe73b27e..62f84be32 100644 --- a/src/ESPEasy/net/wifi/ESPEasyWiFi_STA_Event_ESP32.cpp +++ b/src/ESPEasy/net/wifi/ESPEasyWiFi_STA_Event_ESP32.cpp @@ -16,6 +16,7 @@ # include "../../../src/Globals/RTC.h" # include "../../../src/Helpers/ESPEasy_time_calc.h" # include "../../../src/Helpers/StringConverter.h" +# include "../../../src/Helpers/StringGenerator_WiFi.h" # include "../../net/ESPEasyNetwork.h" # include "../DataStructs/NWPluginData_static_runtime.h" # include "../Globals/ESPEasyWiFiEvent.h" @@ -93,6 +94,11 @@ bool ESPEasyWiFi_STA_EventHandler::restore_dns_from_cach return res; } +const __FlashStringHelper * ESPEasyWiFi_STA_EventHandler::getWiFi_encryptionType() const +{ + return WiFi_encryptionType(_wifi_event_sta_connected.authmode); +} + // ******************************************************************************** // Functions called on events. // Make sure not to call anything in these functions that result in delay() or yield() diff --git a/src/ESPEasy/net/wifi/ESPEasyWiFi_STA_Event_ESP32.h b/src/ESPEasy/net/wifi/ESPEasyWiFi_STA_Event_ESP32.h index 5289c6d7d..a91dc2aed 100644 --- a/src/ESPEasy/net/wifi/ESPEasyWiFi_STA_Event_ESP32.h +++ b/src/ESPEasy/net/wifi/ESPEasyWiFi_STA_Event_ESP32.h @@ -46,6 +46,8 @@ public: bool restore_dns_from_cache() const; + const __FlashStringHelper * getWiFi_encryptionType() const; + private: // ******************************************************************************** diff --git a/src/ESPEasy/net/wifi/ESPEasyWiFi_STA_Event_ESP8266.cpp b/src/ESPEasy/net/wifi/ESPEasyWiFi_STA_Event_ESP8266.cpp index a479bdf8e..499c24bbd 100644 --- a/src/ESPEasy/net/wifi/ESPEasyWiFi_STA_Event_ESP8266.cpp +++ b/src/ESPEasy/net/wifi/ESPEasyWiFi_STA_Event_ESP8266.cpp @@ -58,6 +58,12 @@ WiFiDisconnectReason ESPEasyWiFi_STA_EventHandler::getLastDisconnectReas uint8_t ESPEasyWiFi_STA_EventHandler::getAuthMode() const { return _authmode; } +const __FlashStringHelper * ESPEasyWiFi_STA_EventHandler::getWiFi_encryptionType() const +{ + return WiFi_encryptionType(_authmode); +} + + // ******************************************************************************** // Functions called on events. // Make sure not to call anything in these functions that result in delay() or yield() diff --git a/src/ESPEasy/net/wifi/ESPEasyWiFi_STA_Event_ESP8266.h b/src/ESPEasy/net/wifi/ESPEasyWiFi_STA_Event_ESP8266.h index c6f89171f..92c4be4aa 100644 --- a/src/ESPEasy/net/wifi/ESPEasyWiFi_STA_Event_ESP8266.h +++ b/src/ESPEasy/net/wifi/ESPEasyWiFi_STA_Event_ESP8266.h @@ -39,6 +39,8 @@ public: WiFiDisconnectReason getLastDisconnectReason() const; uint8_t getAuthMode() const; + const __FlashStringHelper * getWiFi_encryptionType() const; + // ******************************************************************************** // Functions called on events. diff --git a/src/src/Helpers/StringGenerator_WiFi.cpp b/src/src/Helpers/StringGenerator_WiFi.cpp index a3389637a..cab552027 100644 --- a/src/src/Helpers/StringGenerator_WiFi.cpp +++ b/src/src/Helpers/StringGenerator_WiFi.cpp @@ -11,12 +11,23 @@ const __FlashStringHelper * WiFi_encryptionType(uint8_t encryptionType) { switch (encryptionType) { #ifdef ESP32 - case WIFI_AUTH_OPEN: return F("open"); - case WIFI_AUTH_WEP: return F("WEP"); - case WIFI_AUTH_WPA_PSK: return F("WPA/PSK"); - case WIFI_AUTH_WPA2_PSK: return F("WPA2/PSK"); - case WIFI_AUTH_WPA_WPA2_PSK: return F("WPA/WPA2/PSK"); - case WIFI_AUTH_WPA2_ENTERPRISE: return F("WPA2 Enterprise"); + case WIFI_AUTH_OPEN: return F("open"); + case WIFI_AUTH_WEP: return F("WEP"); + case WIFI_AUTH_WPA_PSK: return F("WPA PSK"); + case WIFI_AUTH_WPA2_PSK: return F("WPA2 PSK"); + case WIFI_AUTH_WPA_WPA2_PSK: return F("WPA/WPA2 PSK"); + case WIFI_AUTH_WPA2_ENTERPRISE: return F("WPA2-Enterprise"); + case WIFI_AUTH_WPA3_EXT_PSK: // This authentication mode will yield same result as WIFI_AUTH_WPA3_PSK and not recommended to be used. It will be deprecated in future: please use WIFI_AUTH_WPA3_PSK instead. + case WIFI_AUTH_WPA3_EXT_PSK_MIXED_MODE: // This authentication mode will yield same result as WIFI_AUTH_WPA3_PSK and not recommended to be used. It will be deprecated in future: please use WIFI_AUTH_WPA3_PSK instead. + case WIFI_AUTH_WPA3_PSK: return F("WPA3 PSK"); + case WIFI_AUTH_WPA2_WPA3_PSK: return F("WPA2/WPA3 PSK"); + case WIFI_AUTH_WAPI_PSK: return F("WAPI PSK"); + case WIFI_AUTH_OWE: return F("OWE"); + case WIFI_AUTH_WPA3_ENT_192: return F("WPA3 ENT SUITE B 192 BIT"); + case WIFI_AUTH_DPP: return F("DPP"); + case WIFI_AUTH_WPA3_ENTERPRISE: return F("WPA3-Enterprise Only Mode"); + case WIFI_AUTH_WPA2_WPA3_ENTERPRISE: return F("WPA3-Enterprise Transition Mode"); + case WIFI_AUTH_WPA_ENTERPRISE: return F("WPA-Enterprise"); #else // ifdef ESP32 case ENC_TYPE_WEP: return F("WEP"); case ENC_TYPE_TKIP: return F("WPA/PSK"); From 05ca23803590ef02dc58ba61650acd39101a1661 Mon Sep 17 00:00:00 2001 From: TD-er Date: Mon, 4 Aug 2025 20:07:04 +0200 Subject: [PATCH 180/564] [Network] Start removing connected checks from WiFi/Eth EventData --- .../net/DataStructs/NWPluginData_base.h | 13 +++++------ .../DataStructs/NWPluginData_static_runtime.h | 9 +++++++- .../NWPluginData_static_runtime_ESP32.cpp | 23 +++++++++++++++++++ .../NWPluginData_static_runtime_ESP8266.cpp | 23 +++++++++++++++++++ src/ESPEasy/net/Globals/NWPlugins.cpp | 7 ++++++ src/ESPEasy/net/Globals/NWPlugins.h | 3 +++ .../NW002_data_struct_WiFi_AP.cpp | 2 +- src/ESPEasy/net/_NW001_WiFi_STA.cpp | 5 ++++ .../net/wifi/ESPEasyWiFi_STA_Event_ESP32.cpp | 5 +--- .../wifi/ESPEasyWiFi_STA_Event_ESP8266.cpp | 10 +++++--- 10 files changed, 84 insertions(+), 16 deletions(-) create mode 100644 src/ESPEasy/net/DataStructs/NWPluginData_static_runtime_ESP32.cpp create mode 100644 src/ESPEasy/net/DataStructs/NWPluginData_static_runtime_ESP8266.cpp diff --git a/src/ESPEasy/net/DataStructs/NWPluginData_base.h b/src/ESPEasy/net/DataStructs/NWPluginData_base.h index 2625d5347..790550664 100644 --- a/src/ESPEasy/net/DataStructs/NWPluginData_base.h +++ b/src/ESPEasy/net/DataStructs/NWPluginData_base.h @@ -16,7 +16,7 @@ namespace ESPEasy { namespace net { -// ============================================== +// ============================================= // Data used by instances of NW-plugins. // ============================================= @@ -34,10 +34,9 @@ struct NWPluginData_base { virtual ~NWPluginData_base(); -virtual bool init(EventStruct *event) = 0; - -virtual bool exit(EventStruct *event) = 0; + virtual bool init(EventStruct *event) = 0; + virtual bool exit(EventStruct *event) = 0; bool baseClassOnly() const { return _baseClassOnly; @@ -66,11 +65,11 @@ virtual bool exit(EventStruct *event) = 0; protected: - static void _mark_got_IP(NWPluginData_static_runtime& cache); - static void _mark_disconnected(const NWPluginData_static_runtime& cache); + static void _mark_got_IP(NWPluginData_static_runtime& cache); + static void _mark_disconnected(const NWPluginData_static_runtime& cache); #ifdef ESP32 - bool _restore_DNS_cache(); + bool _restore_DNS_cache(); #endif #if FEATURE_STORE_NETWORK_INTERFACE_SETTINGS diff --git a/src/ESPEasy/net/DataStructs/NWPluginData_static_runtime.h b/src/ESPEasy/net/DataStructs/NWPluginData_static_runtime.h index f1daa931b..81c1dc60a 100644 --- a/src/ESPEasy/net/DataStructs/NWPluginData_static_runtime.h +++ b/src/ESPEasy/net/DataStructs/NWPluginData_static_runtime.h @@ -14,12 +14,16 @@ struct NWPluginData_static_runtime { NWPluginData_static_runtime(NetworkInterface *netif) : _netif(netif) {} #else // ifdef ESP32 - NWPluginData_static_runtime() {} + NWPluginData_static_runtime(bool isSTA) : _isSTA(isSTA) {} #endif // ifdef ESP32 void clear(); + bool connected() const; + + bool isDefaultRoute() const; + LongTermOnOffTimer _startStopStats{}; LongTermOnOffTimer _connectedStats{}; @@ -32,6 +36,9 @@ struct NWPluginData_static_runtime { int _route_prio = -1; NetworkInterface *_netif{}; #endif // ifdef ESP32 +#ifdef ESP8266 + const bool _isSTA; +#endif }; diff --git a/src/ESPEasy/net/DataStructs/NWPluginData_static_runtime_ESP32.cpp b/src/ESPEasy/net/DataStructs/NWPluginData_static_runtime_ESP32.cpp new file mode 100644 index 000000000..2ed59ab4e --- /dev/null +++ b/src/ESPEasy/net/DataStructs/NWPluginData_static_runtime_ESP32.cpp @@ -0,0 +1,23 @@ +#include "../DataStructs/NWPluginData_static_runtime.h" + +#ifdef ESP32 + +namespace ESPEasy { +namespace net { + +bool NWPluginData_static_runtime::connected() const +{ + if (!_netif) { return false; } + return _netif->connected(); +} + +bool NWPluginData_static_runtime::isDefaultRoute() const +{ + if (!_netif) { return false; } + return _netif->isDefault(); +} + +} // namespace net +} // namespace ESPEasy + +#endif // ifdef ESP32 diff --git a/src/ESPEasy/net/DataStructs/NWPluginData_static_runtime_ESP8266.cpp b/src/ESPEasy/net/DataStructs/NWPluginData_static_runtime_ESP8266.cpp new file mode 100644 index 000000000..efa21e820 --- /dev/null +++ b/src/ESPEasy/net/DataStructs/NWPluginData_static_runtime_ESP8266.cpp @@ -0,0 +1,23 @@ +#include "../DataStructs/NWPluginData_static_runtime.h" + +#ifdef ESP8266 + +namespace ESPEasy { +namespace net { + +bool NWPluginData_static_runtime::connected() const +{ + if (_isSTA) { return WiFi.status() == WL_CONNECTED; } + return false; +} + +bool NWPluginData_static_runtime::isDefaultRoute() const +{ + // FIXME TD-er: Should I just return connected() here? + return _isSTA; +} + +} // namespace net +} // namespace ESPEasy + +#endif // ifdef ESP8266 diff --git a/src/ESPEasy/net/Globals/NWPlugins.cpp b/src/ESPEasy/net/Globals/NWPlugins.cpp index 9a425b513..53bc5e0a1 100644 --- a/src/ESPEasy/net/Globals/NWPlugins.cpp +++ b/src/ESPEasy/net/Globals/NWPlugins.cpp @@ -316,5 +316,12 @@ String getNWPluginNameFromNWPluginID(nwpluginID_t nwpluginID) { return getNWPluginNameFromNetworkDriverIndex(networkDriverIndex); } +const NWPluginData_static_runtime* getNWPluginData_static_runtime(networkIndex_t index) +{ + auto NW_data = getNWPluginData(index); + if (!NW_data) return nullptr; + return &NW_data->getNWPluginData_static_runtime(); +} + } // namespace net } // namespace ESPEasy diff --git a/src/ESPEasy/net/Globals/NWPlugins.h b/src/ESPEasy/net/Globals/NWPlugins.h index 08a8df201..eb18e5747 100644 --- a/src/ESPEasy/net/Globals/NWPlugins.h +++ b/src/ESPEasy/net/Globals/NWPlugins.h @@ -8,6 +8,7 @@ #include "../DataTypes/NWPluginID.h" #include "../DataTypes/NetworkIndex.h" #include "../DataTypes/NetworkDriverIndex.h" +#include "../DataStructs/NWPluginData_static_runtime.h" namespace ESPEasy { namespace net { @@ -42,5 +43,7 @@ nwpluginID_t getNWPluginID_from_NetworkIndex(networkIndex_t index); String getNWPluginNameFromNetworkDriverIndex(networkDriverIndex_t NetworkDriverIndex); String getNWPluginNameFromNWPluginID(nwpluginID_t nwpluginID); +const NWPluginData_static_runtime* getNWPluginData_static_runtime(networkIndex_t index); + } // namespace net } // namespace ESPEasy diff --git a/src/ESPEasy/net/NWPluginStructs/NW002_data_struct_WiFi_AP.cpp b/src/ESPEasy/net/NWPluginStructs/NW002_data_struct_WiFi_AP.cpp index 38f25e591..0bbfa1a3a 100644 --- a/src/ESPEasy/net/NWPluginStructs/NW002_data_struct_WiFi_AP.cpp +++ b/src/ESPEasy/net/NWPluginStructs/NW002_data_struct_WiFi_AP.cpp @@ -22,7 +22,7 @@ namespace wifi { # ifdef ESP32 static NWPluginData_static_runtime stats_and_cache(&NW_PLUGIN_INTERFACE); # else -static NWPluginData_static_runtime stats_and_cache{}; +static NWPluginData_static_runtime stats_and_cache(false); # endif // ifdef ESP32 diff --git a/src/ESPEasy/net/_NW001_WiFi_STA.cpp b/src/ESPEasy/net/_NW001_WiFi_STA.cpp index 3b73c19c5..d445420c9 100644 --- a/src/ESPEasy/net/_NW001_WiFi_STA.cpp +++ b/src/ESPEasy/net/_NW001_WiFi_STA.cpp @@ -93,6 +93,11 @@ bool NWPlugin_001(NWPlugin::Function function, EventStruct *event, String& strin # endif // ifdef ESP32 if (success) { + string += strformat( + F("\n%s\nRSSI: %d dBm"), + FsP(toString(ESPEasy::net::wifi::getConnectionProtocol())), + WiFi.RSSI()); + ESPEasy::net::wifi::NW001_data_struct_WiFi_STA *NW_data = static_cast(getNWPluginData(event->NetworkIndex)); diff --git a/src/ESPEasy/net/wifi/ESPEasyWiFi_STA_Event_ESP32.cpp b/src/ESPEasy/net/wifi/ESPEasyWiFi_STA_Event_ESP32.cpp index 62f84be32..8d3967bbd 100644 --- a/src/ESPEasy/net/wifi/ESPEasyWiFi_STA_Event_ESP32.cpp +++ b/src/ESPEasy/net/wifi/ESPEasyWiFi_STA_Event_ESP32.cpp @@ -34,11 +34,7 @@ namespace ESPEasy { namespace net { namespace wifi { -# ifdef ESP32 static NWPluginData_static_runtime stats_and_cache(&WiFi.STA); -# else -static NWPluginData_static_runtime stats_and_cache{}; -# endif // ifdef ESP32 static wifi_event_sta_connected_t _wifi_event_sta_connected; static WiFiDisconnectReason _wifi_disconnect_reason = WiFiDisconnectReason::WIFI_DISCONNECT_REASON_UNSPECIFIED; @@ -55,6 +51,7 @@ ESPEasyWiFi_STA_EventHandler::ESPEasyWiFi_STA_EventHandler() ESPEasyWiFi_STA_EventHandler::~ESPEasyWiFi_STA_EventHandler() { + stats_and_cache.clear(); if (nw_event_id != 0) { Network.removeEvent(nw_event_id); } diff --git a/src/ESPEasy/net/wifi/ESPEasyWiFi_STA_Event_ESP8266.cpp b/src/ESPEasy/net/wifi/ESPEasyWiFi_STA_Event_ESP8266.cpp index 499c24bbd..265cd33eb 100644 --- a/src/ESPEasy/net/wifi/ESPEasyWiFi_STA_Event_ESP8266.cpp +++ b/src/ESPEasy/net/wifi/ESPEasyWiFi_STA_Event_ESP8266.cpp @@ -8,6 +8,8 @@ # include "../../../src/ESPEasyCore/ESPEasy_Log.h" # include "../../../src/Globals/RTC.h" # include "../../../src/Helpers/ESPEasy_time_calc.h" +# include "../../../src/Helpers/StringGenerator_WiFi.h" + # include "../ESPEasyNetwork.h" # include "../wifi/ESPEasyWifi.h" @@ -22,7 +24,7 @@ namespace ESPEasy { namespace net { namespace wifi { -static NWPluginData_static_runtime stats_and_cache{}; +static NWPluginData_static_runtime stats_and_cache(true); static WiFiDisconnectReason _wifi_disconnect_reason = WiFiDisconnectReason::WIFI_DISCONNECT_REASON_UNSPECIFIED; static uint8_t _authmode{}; @@ -48,7 +50,9 @@ ESPEasyWiFi_STA_EventHandler::ESPEasyWiFi_STA_EventHandler() } ESPEasyWiFi_STA_EventHandler::~ESPEasyWiFi_STA_EventHandler() -{} +{ + stats_and_cache.clear(); +} bool ESPEasyWiFi_STA_EventHandler::initialized() { return _ESPEasyWiFi_STA_EventHandler_initialized; } @@ -90,7 +94,7 @@ void ESPEasyWiFi_STA_EventHandler::onDisconnect(const WiFiEventStationModeDiscon void ESPEasyWiFi_STA_EventHandler::onGotIP(const WiFiEventStationModeGotIP& event) { - // Set OnOffTimer to off so we can also count how often we het new IP + // Set OnOffTimer to off so we can also count how often we get new IP stats_and_cache._gotIPStats.setOff(); stats_and_cache._gotIPStats.setOn(); From 76289fd1b9b6b066c5833b559e09d8c972fbb37c Mon Sep 17 00:00:00 2001 From: TD-er Date: Tue, 5 Aug 2025 00:43:37 +0200 Subject: [PATCH 181/564] [Network] Clean up code duplication handling network events --- .../net/DataStructs/NWPluginData_base.cpp | 53 +----- .../net/DataStructs/NWPluginData_base.h | 9 +- .../NWPluginData_static_runtime.cpp | 71 +++++++- .../DataStructs/NWPluginData_static_runtime.h | 87 +++++++++- .../NWPluginData_static_runtime_ESP32.cpp | 153 ++++++++++++++++++ .../NWPluginData_static_runtime_ESP8266.cpp | 52 ++++++ src/ESPEasy/net/Globals/NWPlugins.cpp | 10 ++ src/ESPEasy/net/Globals/NWPlugins.h | 1 + .../NW001_data_struct_WiFi_STA.cpp | 6 +- .../NW001_data_struct_WiFi_STA.h | 4 +- .../NW002_data_struct_WiFi_AP.cpp | 9 +- .../NW003_data_struct_ETH_RMII.cpp | 28 ++-- .../NW004_data_struct_ETH_SPI.cpp | 28 ++-- .../NW005_data_struct_PPP_modem.cpp | 33 ++-- src/ESPEasy/net/_NW002_WiFi_AP.cpp | 18 ++- src/ESPEasy/net/_NWPlugin_Helper.cpp | 15 +- src/ESPEasy/net/_NWPlugin_Helper.h | 11 +- .../net/wifi/ESPEasyWiFi_STA_Event_ESP32.cpp | 55 ++----- .../net/wifi/ESPEasyWiFi_STA_Event_ESP32.h | 2 +- .../wifi/ESPEasyWiFi_STA_Event_ESP8266.cpp | 20 +-- .../net/wifi/ESPEasyWiFi_STA_Event_ESP8266.h | 2 +- 21 files changed, 457 insertions(+), 210 deletions(-) diff --git a/src/ESPEasy/net/DataStructs/NWPluginData_base.cpp b/src/ESPEasy/net/DataStructs/NWPluginData_base.cpp index d263df356..4241f29c2 100644 --- a/src/ESPEasy/net/DataStructs/NWPluginData_base.cpp +++ b/src/ESPEasy/net/DataStructs/NWPluginData_base.cpp @@ -12,7 +12,7 @@ # include # include -#endif +#endif // ifdef ESP32 namespace ESPEasy { namespace net { @@ -81,7 +81,8 @@ NWPluginData_base::NWPluginData_base( registered_IP_EVENT_TX_RX = true; } esp_netif_tx_rx_event_enable(_netif->netif()); -// _netif->netif()->tx_rx_events_enabled = true; + + // _netif->netif()->tx_rx_events_enabled = true; #endif // ifdef ESP32 #if FEATURE_STORE_NETWORK_INTERFACE_SETTINGS @@ -175,54 +176,6 @@ bool NWPluginData_base::getTrafficCount(uint64_t& tx, uint64_t& rx) const #endif // ifdef ESP32 -#ifdef ESP32 - -void NWPluginData_base::_mark_got_IP(NWPluginData_static_runtime& cache) -{ - if (!cache._netif->isDefault()) { - nonDefaultNetworkInterface_gotIP = true; - } - - for (size_t i = 0; i < NR_ELEMENTS(cache._dns_cache); ++i) { - auto tmp = cache._netif->dnsIP(i); - - if (tmp != INADDR_NONE) { - cache._dns_cache[i] = tmp; - addLog(LOG_LEVEL_INFO, strformat( - F("%s: DNS Cache %d set to %s"), - esp_netif_get_desc(cache._netif->netif()), - i, - tmp.toString(true).c_str())); - } - } - addLog(LOG_LEVEL_INFO, strformat( - F("%s: Got IP: %s"), - esp_netif_get_desc(cache._netif->netif()), - cache._netif->localIP().toString().c_str() - )); -} - -#else // ifdef ESP32 - -void NWPluginData_base::_mark_got_IP(NWPluginData_static_runtime& cache) { addLog(LOG_LEVEL_INFO, F("STA: Got IP")); } - -#endif // ifdef ESP32 - -void NWPluginData_base::_mark_disconnected(const NWPluginData_static_runtime& cache) -{ - #ifdef ESP32 - addLog(LOG_LEVEL_INFO, strformat( - F("%s: Disconnected. Connected for: "), - esp_netif_get_desc(cache._netif->netif()), - format_msec_duration_HMS( - cache._connectedStats.getLastOnDuration_ms()))); -#else // ifdef ESP32 - addLog(LOG_LEVEL_INFO, concat( - F("STA: Disconnected. Connected for: "), - format_msec_duration_HMS(cache._connectedStats.getLastOnDuration_ms()))); -#endif // ifdef ESP32 -} - #ifdef ESP32 bool NWPluginData_base::_restore_DNS_cache() diff --git a/src/ESPEasy/net/DataStructs/NWPluginData_base.h b/src/ESPEasy/net/DataStructs/NWPluginData_base.h index 790550664..9c9d6b4e5 100644 --- a/src/ESPEasy/net/DataStructs/NWPluginData_base.h +++ b/src/ESPEasy/net/DataStructs/NWPluginData_base.h @@ -38,7 +38,7 @@ struct NWPluginData_base { virtual bool exit(EventStruct *event) = 0; - bool baseClassOnly() const { + bool baseClassOnly() const { return _baseClassOnly; } @@ -65,11 +65,8 @@ struct NWPluginData_base { protected: - static void _mark_got_IP(NWPluginData_static_runtime& cache); - static void _mark_disconnected(const NWPluginData_static_runtime& cache); - #ifdef ESP32 - bool _restore_DNS_cache(); + bool _restore_DNS_cache(); #endif #if FEATURE_STORE_NETWORK_INTERFACE_SETTINGS @@ -90,7 +87,7 @@ protected: // This is also a check to only use these functions and not to insert pointers // at random in the Plugin_task_data array. nwpluginID_t _nw_data_pluginID = INVALID_NW_PLUGIN_ID; - networkIndex_t _networkIndex = INVALID_NETWORK_INDEX; + networkIndex_t _networkIndex = INVALID_NETWORK_INDEX; #if FEATURE_STORE_NETWORK_INTERFACE_SETTINGS bool _baseClassOnly = false; diff --git a/src/ESPEasy/net/DataStructs/NWPluginData_static_runtime.cpp b/src/ESPEasy/net/DataStructs/NWPluginData_static_runtime.cpp index 25ffd0e15..b79bd37d9 100644 --- a/src/ESPEasy/net/DataStructs/NWPluginData_static_runtime.cpp +++ b/src/ESPEasy/net/DataStructs/NWPluginData_static_runtime.cpp @@ -4,16 +4,85 @@ namespace ESPEasy { namespace net { -void NWPluginData_static_runtime::clear() +#define CONNECTION_CONSIDERED_STABLE_MSEC 60000 +#define CONNECT_TIMEOUT_MAX 10000 // in milliSeconds + +void NWPluginData_static_runtime::clear(networkIndex_t networkIndex) { _connectedStats.clear(); _gotIPStats.clear(); #if FEATURE_USE_IPV6 _gotIP6Stats.clear(); #endif + _networkIndex = networkIndex; // FIXME TD-er: Should also clear dns cache? } +bool NWPluginData_static_runtime::operational() const +{ + return _startStopStats.isOn() && connected() && hasIP(); +} + +String NWPluginData_static_runtime::statusToString() const +{ + String log; + + if (connected()) { + log += F("Conn. "); + } + + if (hasIP()) { + log += F("IP "); + } + + if (operational()) { + log += F("Init"); + } + + if (log.isEmpty()) { log = F("DISCONNECTED"); } + return log; +} + +bool NWPluginData_static_runtime::stableConnection() const +{ + return _connectedStats.isOn() && _connectedStats.getLastOnDuration_ms() > CONNECTION_CONSIDERED_STABLE_MSEC; +} + +uint32_t NWPluginData_static_runtime::getSuggestedTimeout( + int index, + uint32_t minimum_timeout) const +{ + auto it = _connectDurations.find(index); + + if (it == _connectDurations.end()) { + // Store the suggested timeout as negative value, + // to make clear it was last suggested, but not yet confirmed. + _connectDurations[index] = -3 * minimum_timeout; + return 3 * minimum_timeout; + } + const uint32_t returnvalue = constrain(std::abs(3 * it->second), minimum_timeout, CONNECT_TIMEOUT_MAX); + + if (it->second < 0) { + _connectDurations[index] = -1 * returnvalue; + } else { + _connectDurations[index] = returnvalue; + } + return returnvalue; +} + +void NWPluginData_static_runtime::setConnectionDuration( + int index, + uint32_t duration_ms) const +{ + auto it = _connectDurations.find(index); + + if ((it == _connectDurations.end()) || (it->second < 0)) { _connectDurations[index] = duration_ms; } + + // Apply some slight filtering so we won't get into trouble when a connection suddenly was faster. + _connectDurations[index] += 2 * duration_ms; + _connectDurations[index] /= 3; +} + } // namespace net } // namespace ESPEasy diff --git a/src/ESPEasy/net/DataStructs/NWPluginData_static_runtime.h b/src/ESPEasy/net/DataStructs/NWPluginData_static_runtime.h index 81c1dc60a..85284b0b5 100644 --- a/src/ESPEasy/net/DataStructs/NWPluginData_static_runtime.h +++ b/src/ESPEasy/net/DataStructs/NWPluginData_static_runtime.h @@ -1,11 +1,16 @@ #pragma once +#include "../DataTypes/NetworkIndex.h" + #include "../../../src/Helpers/LongTermOnOffTimer.h" + #include #ifdef ESP32 # include #endif +#include + namespace ESPEasy { namespace net { @@ -18,12 +23,67 @@ struct NWPluginData_static_runtime { #endif // ifdef ESP32 - void clear(); + void clear(networkIndex_t networkIndex = INVALID_NETWORK_INDEX); - bool connected() const; + bool connected() const; - bool isDefaultRoute() const; + bool isDefaultRoute() const; + bool hasIP() const; + +#if FEATURE_USE_IPV6 + bool hasIPv6() const; +#endif + + bool operational() const; + + String statusToString() const; + + // Return true when connected over 1 minute. + bool stableConnection() const; + + + // ============================================= + // mark_xxx() to act on typical events + // ============================================= + void mark_start(); + + void mark_stop(); + + void mark_got_IP(); +#if FEATURE_USE_IPV6 + void mark_got_IPv6(); +#endif + + void mark_lost_IP(); + + void mark_connected(); + + void mark_disconnected(); + + + // ============================================= + // Keep track of connection durations + // per host/interface + // + // When a suggested timeout is not 'acknowledged' + // a next suggested timeout will be 3x longer. + // ============================================= + + // Return a suggested timeout + uint32_t getSuggestedTimeout(int index, + uint32_t minimum_timeout) const; + + void setConnectionDuration(int index, + uint32_t duration_ms) const; + + // ============================================= + // OnOffTimers for keeping track of: + // - start/stop of interface + // - Connected/Disconnected state + // - GotIP/LostIP + // - GotIPv6/LostIP + // ============================================= LongTermOnOffTimer _startStopStats{}; LongTermOnOffTimer _connectedStats{}; @@ -31,15 +91,32 @@ struct NWPluginData_static_runtime { #if FEATURE_USE_IPV6 LongTermOnOffTimer _gotIP6Stats{}; #endif + + // ============================================= + // Cached DNS servers & Route Prio + // ============================================= +#ifdef ESP32 + IPAddress _dns_cache[2]{}; + int _route_prio = -1; +#endif // ifdef ESP32 + +private: + #ifdef ESP32 - IPAddress _dns_cache[2]{}; - int _route_prio = -1; NetworkInterface *_netif{}; #endif // ifdef ESP32 + + networkIndex_t _networkIndex = INVALID_NETWORK_INDEX; #ifdef ESP8266 const bool _isSTA; #endif + // Store durations it took to connect to some host. + // This depends on host and interface. + // Duration is negative when it was suggested but not actually set. + // Duration is positive when actually being set + mutable std::map_connectDurations; + }; diff --git a/src/ESPEasy/net/DataStructs/NWPluginData_static_runtime_ESP32.cpp b/src/ESPEasy/net/DataStructs/NWPluginData_static_runtime_ESP32.cpp index 2ed59ab4e..7b4855c5c 100644 --- a/src/ESPEasy/net/DataStructs/NWPluginData_static_runtime_ESP32.cpp +++ b/src/ESPEasy/net/DataStructs/NWPluginData_static_runtime_ESP32.cpp @@ -2,6 +2,14 @@ #ifdef ESP32 +# include "../../../src/Helpers/StringConverter.h" + +# include "../Globals/NetworkState.h" + +# include +# include + + namespace ESPEasy { namespace net { @@ -17,6 +25,151 @@ bool NWPluginData_static_runtime::isDefaultRoute() const return _netif->isDefault(); } +bool NWPluginData_static_runtime::hasIP() const +{ + if (!_netif) { return false; } + return _netif->hasIP(); +} + +# if FEATURE_USE_IPV6 + +bool NWPluginData_static_runtime::hasIPv6() const +{ + if (!_netif) { return false; } + return _netif->hasGlobalIPv6() || _netif->hasLinkLocalIPv6(); +} + +# endif // if FEATURE_USE_IPV6 + +void NWPluginData_static_runtime::mark_start() +{ + _startStopStats.setOn(); + + if (!_netif) { return; } +# if ESP_IDF_VERSION >= ESP_IDF_VERSION_VAL(5, 5, 0) + + if (_route_prio > 0) { + _netif->setRoutePrio(_route_prio); + } +# endif // if ESP_IDF_VERSION >= ESP_IDF_VERSION_VAL(5, 5, 0) + + if (loglevelActiveFor(LOG_LEVEL_INFO)) { + addLog(LOG_LEVEL_INFO, strformat( + F("%s: Started"), + esp_netif_get_desc(_netif->netif()))); + } +} + +void NWPluginData_static_runtime::mark_stop() +{ + _startStopStats.setOff(); + + if (_netif && loglevelActiveFor(LOG_LEVEL_INFO)) { + addLog(LOG_LEVEL_INFO, strformat( + F("%s: Stopped"), + esp_netif_get_desc(_netif->netif()))); + } +} + +void NWPluginData_static_runtime::mark_got_IP() +{ + // Set OnOffTimer to off so we can also count how often we het new IP + _gotIPStats.setOff(); + + _gotIPStats.setOn(); + + if (!_netif) { return; } + + if (!_netif->isDefault()) { + nonDefaultNetworkInterface_gotIP = true; + } + + for (size_t i = 0; i < NR_ELEMENTS(_dns_cache); ++i) { + auto tmp = _netif->dnsIP(i); + + _dns_cache[i] = tmp; // Also set the 'empty' ones so we won't set left-over DNS server from when another interface was active. + + if ((tmp != INADDR_NONE) && loglevelActiveFor(LOG_LEVEL_INFO)) { + addLog(LOG_LEVEL_INFO, strformat( + F("%s: DNS Cache %d set to %s"), + esp_netif_get_desc(_netif->netif()), + i, + tmp.toString(true).c_str())); + } + } + + if (loglevelActiveFor(LOG_LEVEL_INFO)) { + addLog(LOG_LEVEL_INFO, strformat( + F("%s: Got IP: %s"), + esp_netif_get_desc(_netif->netif()), + _netif->localIP().toString().c_str() + )); + } + +} + +# if FEATURE_USE_IPV6 + +void NWPluginData_static_runtime::mark_got_IPv6() +{ + _gotIP6Stats.setOn(); + + if (!_netif) { return; } + + if (!_netif->isDefault()) { + nonDefaultNetworkInterface_gotIP = true; + } + + if (loglevelActiveFor(LOG_LEVEL_INFO)) { + addLog(LOG_LEVEL_INFO, strformat( + F("%s: Got IPv6"), + esp_netif_get_desc(_netif->netif()))); + } + +} + +# endif // if FEATURE_USE_IPV6 + +void NWPluginData_static_runtime::mark_lost_IP() +{ + _gotIPStats.setOff(); +# if FEATURE_USE_IPV6 + _gotIP6Stats.setOff(); +# endif + + if (_netif && loglevelActiveFor(LOG_LEVEL_INFO)) { + addLog(LOG_LEVEL_INFO, strformat( + F("%s: Lost IP"), + esp_netif_get_desc(_netif->netif()))); + } +} + +void NWPluginData_static_runtime::mark_connected() +{ + _connectedStats.setOn(); + + if (_netif && loglevelActiveFor(LOG_LEVEL_INFO)) { + addLog(LOG_LEVEL_INFO, strformat( + F("%s: Connected"), + esp_netif_get_desc(_netif->netif()))); + } +} + +void NWPluginData_static_runtime::mark_disconnected() +{ + _connectedStats.setOff(); + + // TODO TD-er: Also clear _gotIPStats and _gotIP6Stats ? + + if (_netif && loglevelActiveFor(LOG_LEVEL_INFO)) { + addLog(LOG_LEVEL_INFO, strformat( + F("%s: Disconnected. Connected for: "), + esp_netif_get_desc(_netif->netif()), + format_msec_duration_HMS( + _connectedStats.getLastOnDuration_ms()))); + } +} + } // namespace net } // namespace ESPEasy diff --git a/src/ESPEasy/net/DataStructs/NWPluginData_static_runtime_ESP8266.cpp b/src/ESPEasy/net/DataStructs/NWPluginData_static_runtime_ESP8266.cpp index efa21e820..bacf67dae 100644 --- a/src/ESPEasy/net/DataStructs/NWPluginData_static_runtime_ESP8266.cpp +++ b/src/ESPEasy/net/DataStructs/NWPluginData_static_runtime_ESP8266.cpp @@ -2,6 +2,8 @@ #ifdef ESP8266 +# include "../../../src/Helpers/StringConverter.h" + namespace ESPEasy { namespace net { @@ -17,6 +19,56 @@ bool NWPluginData_static_runtime::isDefaultRoute() const return _isSTA; } +bool NWPluginData_static_runtime::hasIP() const +{ + return _gotIPStats.isOn(); +} + +void NWPluginData_static_runtime::mark_start() +{ + _startStopStats.setOn(); + addLog(LOG_LEVEL_INFO, _isSTA ? F("STA: Started") : F("AP: Started")); +} + +void NWPluginData_static_runtime::mark_stop() +{ + _startStopStats.setOff(); + addLog(LOG_LEVEL_INFO, _isSTA ? F("STA: Stopped") : F("AP: Stopped")); +} + +void NWPluginData_static_runtime::mark_got_IP() +{ + // Set OnOffTimer to off so we can also count how often we het new IP + _gotIPStats.setOff(); + + _gotIPStats.setOn(); + + addLog(LOG_LEVEL_INFO, _isSTA ? F("STA: Got IP") : F("AP: Got IP")); +} + +void NWPluginData_static_runtime::mark_lost_IP() +{ + _gotIPStats.setOff(); + addLog(LOG_LEVEL_INFO, _isSTA ? F("STA: Lost IP") : F("AP: Lost IP")); +} + +void NWPluginData_static_runtime::mark_connected() +{ + _connectedStats.setOn(); + addLog(LOG_LEVEL_INFO, F("STA: Connected")); +} + +void NWPluginData_static_runtime::mark_disconnected() +{ + _connectedStats.setOff(); + + if (_isSTA) { + addLog(LOG_LEVEL_INFO, concat( + F("STA: Disconnected. Connected for: "), + format_msec_duration_HMS(_connectedStats.getLastOnDuration_ms()))); + } +} + } // namespace net } // namespace ESPEasy diff --git a/src/ESPEasy/net/Globals/NWPlugins.cpp b/src/ESPEasy/net/Globals/NWPlugins.cpp index 53bc5e0a1..2a8fe2c71 100644 --- a/src/ESPEasy/net/Globals/NWPlugins.cpp +++ b/src/ESPEasy/net/Globals/NWPlugins.cpp @@ -323,5 +323,15 @@ const NWPluginData_static_runtime* getNWPluginData_static_runtime(networkIndex_t return &NW_data->getNWPluginData_static_runtime(); } +const NWPluginData_static_runtime* getDefaultRoute_NWPluginData_static_runtime() +{ + for (networkIndex_t i = 0; validNetworkIndex(i); ++i) { + auto NW_data = getNWPluginData_static_runtime(i); + if (NW_data && NW_data->isDefaultRoute()) return NW_data; + } + return nullptr; +} + + } // namespace net } // namespace ESPEasy diff --git a/src/ESPEasy/net/Globals/NWPlugins.h b/src/ESPEasy/net/Globals/NWPlugins.h index eb18e5747..f9195594c 100644 --- a/src/ESPEasy/net/Globals/NWPlugins.h +++ b/src/ESPEasy/net/Globals/NWPlugins.h @@ -44,6 +44,7 @@ String getNWPluginNameFromNetworkDriverIndex(networkDriverIndex_t String getNWPluginNameFromNWPluginID(nwpluginID_t nwpluginID); const NWPluginData_static_runtime* getNWPluginData_static_runtime(networkIndex_t index); +const NWPluginData_static_runtime* getDefaultRoute_NWPluginData_static_runtime(); } // namespace net } // namespace ESPEasy diff --git a/src/ESPEasy/net/NWPluginStructs/NW001_data_struct_WiFi_STA.cpp b/src/ESPEasy/net/NWPluginStructs/NW001_data_struct_WiFi_STA.cpp index c0c49d098..7b7425d25 100644 --- a/src/ESPEasy/net/NWPluginStructs/NW001_data_struct_WiFi_STA.cpp +++ b/src/ESPEasy/net/NWPluginStructs/NW001_data_struct_WiFi_STA.cpp @@ -27,7 +27,8 @@ NW001_data_struct_WiFi_STA::NW001_data_struct_WiFi_STA(networkIndex_t networkInd # ifdef ESP32 , &NW_PLUGIN_INTERFACE # endif - ) + ), + _WiFiEventHandler(networkIndex) {} NW001_data_struct_WiFi_STA::~NW001_data_struct_WiFi_STA() @@ -101,12 +102,11 @@ NWPluginData_static_runtime& NW001_data_struct_WiFi_STA::getNWPluginData_static_ return _WiFiEventHandler.getNWPluginData_static_runtime(); } -const __FlashStringHelper * NW001_data_struct_WiFi_STA::getWiFi_encryptionType() const +const __FlashStringHelper * NW001_data_struct_WiFi_STA::getWiFi_encryptionType() const { return _WiFiEventHandler.getWiFi_encryptionType(); } - # ifdef ESP32 bool NW001_data_struct_WiFi_STA::handle_priority_route_changed() diff --git a/src/ESPEasy/net/NWPluginStructs/NW001_data_struct_WiFi_STA.h b/src/ESPEasy/net/NWPluginStructs/NW001_data_struct_WiFi_STA.h index c69a60ad8..4ceb7f2bc 100644 --- a/src/ESPEasy/net/NWPluginStructs/NW001_data_struct_WiFi_STA.h +++ b/src/ESPEasy/net/NWPluginStructs/NW001_data_struct_WiFi_STA.h @@ -35,11 +35,11 @@ struct NW001_data_struct_WiFi_STA : public NWPluginData_base { # endif NWPluginData_static_runtime& getNWPluginData_static_runtime(); - const __FlashStringHelper * getWiFi_encryptionType() const; + const __FlashStringHelper* getWiFi_encryptionType() const; private: - ESPEasyWiFi_STA_EventHandler _WiFiEventHandler{}; + ESPEasyWiFi_STA_EventHandler _WiFiEventHandler; }; diff --git a/src/ESPEasy/net/NWPluginStructs/NW002_data_struct_WiFi_AP.cpp b/src/ESPEasy/net/NWPluginStructs/NW002_data_struct_WiFi_AP.cpp index 0bbfa1a3a..52ac0e0e2 100644 --- a/src/ESPEasy/net/NWPluginStructs/NW002_data_struct_WiFi_AP.cpp +++ b/src/ESPEasy/net/NWPluginStructs/NW002_data_struct_WiFi_AP.cpp @@ -35,7 +35,7 @@ NW002_data_struct_WiFi_AP::NW002_data_struct_WiFi_AP(networkIndex_t networkIndex # endif ) { - stats_and_cache.clear(); + stats_and_cache.clear(networkIndex); # ifdef ESP32 nw_event_id = Network.onEvent(NW002_data_struct_WiFi_AP::onEvent); # endif @@ -50,6 +50,7 @@ NW002_data_struct_WiFi_AP::~NW002_data_struct_WiFi_AP() } nw_event_id = 0; # endif // ifdef ESP32 + stats_and_cache.clear(); } void NW002_data_struct_WiFi_AP::webform_load(EventStruct *event) {} @@ -102,12 +103,10 @@ void NW002_data_struct_WiFi_AP::onEvent(arduino_event_id_t event, switch (event) { case ARDUINO_EVENT_WIFI_AP_START: - stats_and_cache._startStopStats.setOn(); - addLog(LOG_LEVEL_INFO, F("AP_START")); + stats_and_cache.mark_start(); break; case ARDUINO_EVENT_WIFI_AP_STOP: - stats_and_cache._startStopStats.setOff(); - addLog(LOG_LEVEL_INFO, F("AP_STOP")); + stats_and_cache.mark_stop(); break; case ARDUINO_EVENT_WIFI_AP_STACONNECTED: addLog(LOG_LEVEL_INFO, F("AP_STACONNECTED")); diff --git a/src/ESPEasy/net/NWPluginStructs/NW003_data_struct_ETH_RMII.cpp b/src/ESPEasy/net/NWPluginStructs/NW003_data_struct_ETH_RMII.cpp index e81aa1c24..a572a57be 100644 --- a/src/ESPEasy/net/NWPluginStructs/NW003_data_struct_ETH_RMII.cpp +++ b/src/ESPEasy/net/NWPluginStructs/NW003_data_struct_ETH_RMII.cpp @@ -22,7 +22,7 @@ static NWPluginData_static_runtime stats_and_cache(&NW_PLUGIN_INTERFACE); NW003_data_struct_ETH_RMII::NW003_data_struct_ETH_RMII(networkIndex_t networkIndex) : NWPluginData_base(nwpluginID_t(NW_PLUGIN_ID), networkIndex, &NW_PLUGIN_INTERFACE) { - stats_and_cache.clear(); + stats_and_cache.clear(networkIndex); nw_event_id = Network.onEvent(NW003_data_struct_ETH_RMII::onEvent); } @@ -33,6 +33,7 @@ NW003_data_struct_ETH_RMII::~NW003_data_struct_ETH_RMII() Network.removeEvent(nw_event_id); } nw_event_id = 0; + stats_and_cache.clear(); } void NW003_data_struct_ETH_RMII::webform_load(EventStruct *event) {} @@ -56,38 +57,27 @@ void NW003_data_struct_ETH_RMII::onEvent(arduino_event_i switch (event) { case ARDUINO_EVENT_ETH_START: - stats_and_cache._startStopStats.setOn(); - addLog(LOG_LEVEL_INFO, F("ETH_START")); + stats_and_cache.mark_start(); break; case ARDUINO_EVENT_ETH_STOP: - stats_and_cache._startStopStats.setOff(); - addLog(LOG_LEVEL_INFO, F("ETH_STOP")); + stats_and_cache.mark_stop(); break; case ARDUINO_EVENT_ETH_CONNECTED: - stats_and_cache._connectedStats.setOn(); - addLog(LOG_LEVEL_INFO, F("ETH_CONNECTED")); + stats_and_cache.mark_connected(); break; case ARDUINO_EVENT_ETH_DISCONNECTED: - stats_and_cache._connectedStats.setOff(); - NWPluginData_base::_mark_disconnected(stats_and_cache); + stats_and_cache.mark_disconnected(); break; case ARDUINO_EVENT_ETH_GOT_IP: - NWPluginData_base::_mark_got_IP(stats_and_cache); - stats_and_cache._gotIPStats.setOn(); + stats_and_cache.mark_got_IP(); break; # if FEATURE_USE_IPV6 case ARDUINO_EVENT_ETH_GOT_IP6: - stats_and_cache._gotIP6Stats.setOn(); - addLog(LOG_LEVEL_INFO, F("ETH_GOT_IP6")); + stats_and_cache.mark_got_IPv6(); break; # endif // if FEATURE_USE_IPV6 case ARDUINO_EVENT_ETH_LOST_IP: - stats_and_cache._gotIPStats.setOff(); -# if FEATURE_USE_IPV6 - stats_and_cache._gotIP6Stats.setOff(); -# endif - - addLog(LOG_LEVEL_INFO, F("ETH_LOST_IP")); + stats_and_cache.mark_lost_IP(); break; default: break; diff --git a/src/ESPEasy/net/NWPluginStructs/NW004_data_struct_ETH_SPI.cpp b/src/ESPEasy/net/NWPluginStructs/NW004_data_struct_ETH_SPI.cpp index a4dbc7f3d..839742c9e 100644 --- a/src/ESPEasy/net/NWPluginStructs/NW004_data_struct_ETH_SPI.cpp +++ b/src/ESPEasy/net/NWPluginStructs/NW004_data_struct_ETH_SPI.cpp @@ -22,7 +22,7 @@ static NWPluginData_static_runtime stats_and_cache(&NW_PLUGIN_INTERFACE); NW004_data_struct_ETH_SPI::NW004_data_struct_ETH_SPI(networkIndex_t networkIndex) : NWPluginData_base(nwpluginID_t(NW_PLUGIN_ID), networkIndex, &NW_PLUGIN_INTERFACE) { - stats_and_cache.clear(); + stats_and_cache.clear(networkIndex); nw_event_id = Network.onEvent(NW004_data_struct_ETH_SPI::onEvent); } @@ -32,6 +32,7 @@ NW004_data_struct_ETH_SPI::~NW004_data_struct_ETH_SPI() Network.removeEvent(nw_event_id); } nw_event_id = 0; + stats_and_cache.clear(); } void NW004_data_struct_ETH_SPI::webform_load(EventStruct *event) {} @@ -59,38 +60,27 @@ void NW004_data_struct_ETH_SPI::onEvent(arduino_event_id switch (event) { case ARDUINO_EVENT_ETH_START: - stats_and_cache._startStopStats.setOn(); - addLog(LOG_LEVEL_INFO, F("ETH_START")); + stats_and_cache.mark_start(); break; case ARDUINO_EVENT_ETH_STOP: - stats_and_cache._startStopStats.setOff(); - addLog(LOG_LEVEL_INFO, F("ETH_STOP")); + stats_and_cache.mark_stop(); break; case ARDUINO_EVENT_ETH_CONNECTED: - stats_and_cache._connectedStats.setOn(); - addLog(LOG_LEVEL_INFO, F("ETH_CONNECTED")); + stats_and_cache.mark_connected(); break; case ARDUINO_EVENT_ETH_DISCONNECTED: - stats_and_cache._connectedStats.setOff(); - NWPluginData_base::_mark_disconnected(stats_and_cache); + stats_and_cache.mark_disconnected(); break; case ARDUINO_EVENT_ETH_GOT_IP: - NWPluginData_base::_mark_got_IP(stats_and_cache); - stats_and_cache._gotIPStats.setOn(); + stats_and_cache.mark_got_IP(); break; # if FEATURE_USE_IPV6 case ARDUINO_EVENT_ETH_GOT_IP6: - stats_and_cache._gotIP6Stats.setOn(); - addLog(LOG_LEVEL_INFO, F("ETH_GOT_IP6")); + stats_and_cache.mark_got_IPv6(); break; # endif // if FEATURE_USE_IPV6 case ARDUINO_EVENT_ETH_LOST_IP: - stats_and_cache._gotIPStats.setOff(); -# if FEATURE_USE_IPV6 - stats_and_cache._gotIP6Stats.setOff(); -# endif - - addLog(LOG_LEVEL_INFO, F("ETH_LOST_IP")); + stats_and_cache.mark_lost_IP(); break; default: break; diff --git a/src/ESPEasy/net/NWPluginStructs/NW005_data_struct_PPP_modem.cpp b/src/ESPEasy/net/NWPluginStructs/NW005_data_struct_PPP_modem.cpp index 71291fe62..3453da41a 100644 --- a/src/ESPEasy/net/NWPluginStructs/NW005_data_struct_PPP_modem.cpp +++ b/src/ESPEasy/net/NWPluginStructs/NW005_data_struct_PPP_modem.cpp @@ -90,7 +90,7 @@ const __FlashStringHelper* NW005_getLabelString(uint32_t key, bool displayString NW005_data_struct_PPP_modem::NW005_data_struct_PPP_modem(networkIndex_t networkIndex) : NWPluginData_base(nwpluginID_t(NW_PLUGIN_ID), networkIndex, &NW_PLUGIN_INTERFACE) { - stats_and_cache.clear(); + stats_and_cache.clear(networkIndex); nw_event_id = Network.onEvent(NW005_data_struct_PPP_modem::onEvent); } @@ -115,6 +115,7 @@ NW005_data_struct_PPP_modem::~NW005_data_struct_PPP_modem() { Network.removeEvent(nw_event_id); } nw_event_id = 0; + stats_and_cache.clear(); } enum class NW005_modem_model { @@ -899,28 +900,21 @@ void NW005_data_struct_PPP_modem::onEvent(arduino_event_ // TODO TD-er: Must store flags from events in static (or global) object to act on it later. switch (event) { - case ARDUINO_EVENT_PPP_START: addLog(LOG_LEVEL_INFO, F("PPP Started")); - stats_and_cache._startStopStats.setOn(); -# if ESP_IDF_VERSION >= ESP_IDF_VERSION_VAL(5, 5, 0) - NW_PLUGIN_INTERFACE.setRoutePrio(200); -# endif + case ARDUINO_EVENT_PPP_START: + stats_and_cache.mark_start(); break; - case ARDUINO_EVENT_PPP_STOP: addLog(LOG_LEVEL_INFO, F("PPP Stopped")); - stats_and_cache._startStopStats.setOff(); + case ARDUINO_EVENT_PPP_STOP: + stats_and_cache.mark_stop(); break; case ARDUINO_EVENT_PPP_CONNECTED: - stats_and_cache._connectedStats.setOn(); - addLog(LOG_LEVEL_INFO, F("PPP Connected")); - + stats_and_cache.mark_connected(); break; case ARDUINO_EVENT_PPP_DISCONNECTED: - stats_and_cache._connectedStats.setOff(); - NWPluginData_base::_mark_disconnected(stats_and_cache); + stats_and_cache.mark_disconnected(); WiFi.AP.enableNAPT(false); break; case ARDUINO_EVENT_PPP_GOT_IP: - NWPluginData_base::_mark_got_IP(stats_and_cache); - stats_and_cache._gotIPStats.setOn(); + stats_and_cache.mark_got_IP(); // NW_PLUGIN_INTERFACE.setDefault(); @@ -930,16 +924,11 @@ void NW005_data_struct_PPP_modem::onEvent(arduino_event_ break; # if FEATURE_USE_IPV6 case ARDUINO_EVENT_PPP_GOT_IP6: - stats_and_cache._gotIP6Stats.setOn(); - addLog(LOG_LEVEL_INFO, F("PPP Got IPv6")); + stats_and_cache.mark_got_IPv6(); break; # endif // if FEATURE_USE_IPV6 case ARDUINO_EVENT_PPP_LOST_IP: - stats_and_cache._gotIPStats.setOff(); -# if FEATURE_USE_IPV6 - stats_and_cache._gotIP6Stats.setOff(); -# endif - addLog(LOG_LEVEL_INFO, F("PPP Lost IP")); + stats_and_cache.mark_lost_IP(); WiFi.AP.enableNAPT(false); break; diff --git a/src/ESPEasy/net/_NW002_WiFi_AP.cpp b/src/ESPEasy/net/_NW002_WiFi_AP.cpp index 2db405245..3de29b9e2 100644 --- a/src/ESPEasy/net/_NW002_WiFi_AP.cpp +++ b/src/ESPEasy/net/_NW002_WiFi_AP.cpp @@ -70,11 +70,12 @@ bool NWPlugin_002(NWPlugin::Function function, EventStruct *event, String& strin { # ifdef ESP32 const uint8_t num = WiFi.AP.stationCount(); + /* - auto netif = WiFi.AP.netif(); - for (size_t i = 0; i < num; ++i) { - esp_netif_pair_mac_ip_t mac_ip_pair{}; - if (esp_netif_dhcps_get_clients_by_mac(netif, i, &mac_ip_pair) == 0) { + auto netif = WiFi.AP.netif(); + for (size_t i = 0; i < num; ++i) { + esp_netif_pair_mac_ip_t mac_ip_pair{}; + if (esp_netif_dhcps_get_clients_by_mac(netif, i, &mac_ip_pair) == 0) { if (string.length() > 0) { string += '\n'; } @@ -85,12 +86,13 @@ bool NWPlugin_002(NWPlugin::Function function, EventStruct *event, String& strin mac.toString().c_str(), ip.toString().c_str() ); - } - } - */ -# else + } + } + */ +# else // ifdef ESP32 const uint8_t num = WiFi.softAPgetStationNum(); # endif // ifdef ESP32 + if (num > 0) { success = true; string = num; diff --git a/src/ESPEasy/net/_NWPlugin_Helper.cpp b/src/ESPEasy/net/_NWPlugin_Helper.cpp index b615409df..7427e1edf 100644 --- a/src/ESPEasy/net/_NWPlugin_Helper.cpp +++ b/src/ESPEasy/net/_NWPlugin_Helper.cpp @@ -1,9 +1,9 @@ #include "../net/_NWPlugin_Helper.h" -# include "../../src/CustomBuild/ESPEasyLimits.h" +#include "../../src/CustomBuild/ESPEasyLimits.h" -# include "../net/Globals/NWPlugins.h" -# include "../../src/Globals/Settings.h" +#include "../net/Globals/NWPlugins.h" +#include "../../src/Globals/Settings.h" namespace ESPEasy { namespace net { @@ -36,9 +36,9 @@ bool initNWPluginData(ESPEasy::net::networkIndex_t networkIndex, NWPluginData_ba } // 2nd heap may have been active to allocate the NWPluginData, but here we need to keep the default heap active - # ifdef USE_SECOND_HEAP + #ifdef USE_SECOND_HEAP HeapSelectDram ephemeral; - # endif // ifdef USE_SECOND_HEAP + #endif // ifdef USE_SECOND_HEAP clearNWPluginData(networkIndex); @@ -46,15 +46,16 @@ bool initNWPluginData(ESPEasy::net::networkIndex_t networkIndex, NWPluginData_ba if (data != nullptr) { if (Settings.getNetworkEnabled(networkIndex)) { #if FEATURE_STORE_NETWORK_INTERFACE_SETTINGS + if (!data->init_KVS()) { delete data; data = nullptr; } else { NWPlugin_task_data[networkIndex] = data; } -#else +#else // if FEATURE_STORE_NETWORK_INTERFACE_SETTINGS NWPlugin_task_data[networkIndex] = data; -#endif +#endif // if FEATURE_STORE_NETWORK_INTERFACE_SETTINGS } else { delete data; data = nullptr; diff --git a/src/ESPEasy/net/_NWPlugin_Helper.h b/src/ESPEasy/net/_NWPlugin_Helper.h index de4214204..fa2c33701 100644 --- a/src/ESPEasy/net/_NWPlugin_Helper.h +++ b/src/ESPEasy/net/_NWPlugin_Helper.h @@ -2,10 +2,10 @@ #include "../../ESPEasy_common.h" -# include "../../src/CustomBuild/ESPEasyLimits.h" -# include "../../src/DataStructs/ESPEasy_EventStruct.h" -# include "../../src/Helpers/LongTermTimer.h" -# include "../net/DataStructs/NWPluginData_base.h" +#include "../../src/CustomBuild/ESPEasyLimits.h" +#include "../../src/DataStructs/ESPEasy_EventStruct.h" +#include "../../src/Helpers/LongTermTimer.h" +#include "../net/DataStructs/NWPluginData_base.h" namespace ESPEasy { namespace net { @@ -14,7 +14,7 @@ namespace net { extern NWPluginData_base *NWPlugin_task_data[NETWORK_MAX]; // Try to allocate in PSRAM or 2nd heap if possible -# define special_initNWPluginData(I, T) void *ptr = special_calloc(1, sizeof(T)); \ +#define special_initNWPluginData(I, T) void *ptr = special_calloc(1, sizeof(T)); \ if (ptr) { initNWPluginData(I, new (ptr) T()); } @@ -36,4 +36,3 @@ bool nwpluginTaskData_initialized(ESPEasy::net::networkIndex_t networkIndex); } // namespace net } // namespace ESPEasy - diff --git a/src/ESPEasy/net/wifi/ESPEasyWiFi_STA_Event_ESP32.cpp b/src/ESPEasy/net/wifi/ESPEasyWiFi_STA_Event_ESP32.cpp index 8d3967bbd..764b59a03 100644 --- a/src/ESPEasy/net/wifi/ESPEasyWiFi_STA_Event_ESP32.cpp +++ b/src/ESPEasy/net/wifi/ESPEasyWiFi_STA_Event_ESP32.cpp @@ -41,9 +41,9 @@ static WiFiDisconnectReason _wifi_disconnect_reason = WiFiDisconnectReason::WIFI static bool _ESPEasyWiFi_STA_EventHandler_initialized{}; -ESPEasyWiFi_STA_EventHandler::ESPEasyWiFi_STA_EventHandler() +ESPEasyWiFi_STA_EventHandler::ESPEasyWiFi_STA_EventHandler(networkIndex_t networkIndex) { - stats_and_cache.clear(); + stats_and_cache.clear(networkIndex); nw_event_id = Network.onEvent(ESPEasyWiFi_STA_EventHandler::WiFiEvent); memset(&_wifi_event_sta_connected, 0, sizeof(_wifi_event_sta_connected)); _ESPEasyWiFi_STA_EventHandler_initialized = true; @@ -51,12 +51,12 @@ ESPEasyWiFi_STA_EventHandler::ESPEasyWiFi_STA_EventHandler() ESPEasyWiFi_STA_EventHandler::~ESPEasyWiFi_STA_EventHandler() { - stats_and_cache.clear(); if (nw_event_id != 0) { Network.removeEvent(nw_event_id); } nw_event_id = 0; _ESPEasyWiFi_STA_EventHandler_initialized = false; + stats_and_cache.clear(); } bool ESPEasyWiFi_STA_EventHandler::initialized() { return _ESPEasyWiFi_STA_EventHandler_initialized; } @@ -122,70 +122,35 @@ void ESPEasyWiFi_STA_EventHandler::WiFiEvent(WiFiEvent_t event_id, arduino_event break; case ARDUINO_EVENT_WIFI_STA_START: clear_wifi_event_sta_connected = true; - stats_and_cache._startStopStats.setOn(); - addLog(LOG_LEVEL_INFO, F("STA_START")); + stats_and_cache.mark_start(); break; case ARDUINO_EVENT_WIFI_STA_STOP: clear_wifi_event_sta_connected = true; - stats_and_cache._startStopStats.setOff(); - addLog(LOG_LEVEL_INFO, F("STA_STOP")); + stats_and_cache.mark_stop(); break; case ARDUINO_EVENT_WIFI_STA_CONNECTED: memcpy(&_wifi_event_sta_connected, &info.wifi_sta_connected, sizeof(_wifi_event_sta_connected)); - stats_and_cache._connectedStats.setOn(); - addLog(LOG_LEVEL_INFO, F("STA_CONNECTED")); + stats_and_cache.mark_connected(); break; case ARDUINO_EVENT_WIFI_STA_DISCONNECTED: clear_wifi_event_sta_connected = true; _wifi_disconnect_reason = static_cast(info.wifi_sta_disconnected.reason); - stats_and_cache._connectedStats.setOff(); - addLog(LOG_LEVEL_INFO, F("STA_DISCONNECTED")); + stats_and_cache.mark_disconnected(); break; case ARDUINO_EVENT_WIFI_STA_AUTHMODE_CHANGE: _wifi_event_sta_connected.authmode = info.wifi_sta_authmode_change.new_mode; addLog(LOG_LEVEL_INFO, F("STA_AUTHMODE_CHANGE")); break; case ARDUINO_EVENT_WIFI_STA_GOT_IP: - - for (size_t i = 0; i < NR_ELEMENTS(stats_and_cache._dns_cache); ++i) { - auto tmp = WiFi.STA.dnsIP(i); - - stats_and_cache._dns_cache[i] = tmp; // Also set the 'empty' ones so we won't set left-over DNS server from when another interface - // was active. - - if (tmp != INADDR_NONE) { - addLog(LOG_LEVEL_INFO, strformat(F("DNS Cache %d set to %s"), i, tmp.toString(true).c_str())); - } - } - - if (!WiFi.STA.isDefault()) { - nonDefaultNetworkInterface_gotIP = true; - } - - // Set OnOffTimer to off so we can also count how often we het new IP - stats_and_cache._gotIPStats.setOff(); - stats_and_cache._gotIPStats.setOn(); - addLog(LOG_LEVEL_INFO, F("STA_GOT_IP")); + stats_and_cache.mark_got_IP(); break; # if FEATURE_USE_IPV6 case ARDUINO_EVENT_WIFI_STA_GOT_IP6: - - if (!WiFi.STA.isDefault()) { - nonDefaultNetworkInterface_gotIP = true; - } - - stats_and_cache._gotIP6Stats.setOn(); - - addLog(LOG_LEVEL_INFO, F("STA_GOT_IP6")); + stats_and_cache.mark_got_IPv6(); break; # endif // if FEATURE_USE_IPV6 case ARDUINO_EVENT_WIFI_STA_LOST_IP: - stats_and_cache._gotIPStats.setOff(); -# if FEATURE_USE_IPV6 - stats_and_cache._gotIP6Stats.setOff(); -# endif - - addLog(LOG_LEVEL_INFO, F("STA_LOST_IP")); + stats_and_cache.mark_lost_IP(); break; default: diff --git a/src/ESPEasy/net/wifi/ESPEasyWiFi_STA_Event_ESP32.h b/src/ESPEasy/net/wifi/ESPEasyWiFi_STA_Event_ESP32.h index a91dc2aed..c816805eb 100644 --- a/src/ESPEasy/net/wifi/ESPEasyWiFi_STA_Event_ESP32.h +++ b/src/ESPEasy/net/wifi/ESPEasyWiFi_STA_Event_ESP32.h @@ -32,7 +32,7 @@ class ESPEasyWiFi_STA_EventHandler { public: - ESPEasyWiFi_STA_EventHandler(); + ESPEasyWiFi_STA_EventHandler(networkIndex_t networkIndex); ~ESPEasyWiFi_STA_EventHandler(); static bool initialized(); diff --git a/src/ESPEasy/net/wifi/ESPEasyWiFi_STA_Event_ESP8266.cpp b/src/ESPEasy/net/wifi/ESPEasyWiFi_STA_Event_ESP8266.cpp index 265cd33eb..0f280b0a7 100644 --- a/src/ESPEasy/net/wifi/ESPEasyWiFi_STA_Event_ESP8266.cpp +++ b/src/ESPEasy/net/wifi/ESPEasyWiFi_STA_Event_ESP8266.cpp @@ -31,9 +31,9 @@ static uint8_t _authmode{}; static bool _ESPEasyWiFi_STA_EventHandler_initialized{}; -ESPEasyWiFi_STA_EventHandler::ESPEasyWiFi_STA_EventHandler() +ESPEasyWiFi_STA_EventHandler::ESPEasyWiFi_STA_EventHandler(networkIndex_t networkIndex) { - stats_and_cache.clear(); + stats_and_cache.clear(networkIndex); // WiFi event handlers @@ -54,7 +54,9 @@ ESPEasyWiFi_STA_EventHandler::~ESPEasyWiFi_STA_EventHandler() stats_and_cache.clear(); } -bool ESPEasyWiFi_STA_EventHandler::initialized() { return _ESPEasyWiFi_STA_EventHandler_initialized; } +bool ESPEasyWiFi_STA_EventHandler::initialized() { + return _ESPEasyWiFi_STA_EventHandler_initialized; +} NWPluginData_static_runtime& ESPEasyWiFi_STA_EventHandler::getNWPluginData_static_runtime() { return stats_and_cache; } @@ -67,20 +69,20 @@ const __FlashStringHelper * ESPEasyWiFi_STA_EventHandler::getWiFi_encryptionTyp return WiFi_encryptionType(_authmode); } - // ******************************************************************************** // Functions called on events. // Make sure not to call anything in these functions that result in delay() or yield() // ******************************************************************************** void ESPEasyWiFi_STA_EventHandler::onConnected(const WiFiEventStationModeConnected& event) { - stats_and_cache._connectedStats.setOn(); + stats_and_cache.mark_connected(); // WiFiEventData.markConnected(event.ssid, event.bssid, event.channel); } void ESPEasyWiFi_STA_EventHandler::onDisconnect(const WiFiEventStationModeDisconnected& event) { - stats_and_cache._connectedStats.setOff(); - stats_and_cache._gotIPStats.setOff(); + stats_and_cache.mark_disconnected(); + stats_and_cache.mark_lost_IP(); // ESP8266 doesn't have a separate event for lost IP + _wifi_disconnect_reason = event.reason; // WiFiEventData.markDisconnect(event.reason); @@ -94,9 +96,7 @@ void ESPEasyWiFi_STA_EventHandler::onDisconnect(const WiFiEventStationModeDiscon void ESPEasyWiFi_STA_EventHandler::onGotIP(const WiFiEventStationModeGotIP& event) { - // Set OnOffTimer to off so we can also count how often we get new IP - stats_and_cache._gotIPStats.setOff(); - stats_and_cache._gotIPStats.setOn(); + stats_and_cache.mark_got_IP(); // WiFiEventData.markGotIP(event.ip, event.mask, event.gw); } diff --git a/src/ESPEasy/net/wifi/ESPEasyWiFi_STA_Event_ESP8266.h b/src/ESPEasy/net/wifi/ESPEasyWiFi_STA_Event_ESP8266.h index 92c4be4aa..f158059b9 100644 --- a/src/ESPEasy/net/wifi/ESPEasyWiFi_STA_Event_ESP8266.h +++ b/src/ESPEasy/net/wifi/ESPEasyWiFi_STA_Event_ESP8266.h @@ -29,7 +29,7 @@ class ESPEasyWiFi_STA_EventHandler { public: - ESPEasyWiFi_STA_EventHandler(); + ESPEasyWiFi_STA_EventHandler(networkIndex_t networkIndex); ~ESPEasyWiFi_STA_EventHandler(); static bool initialized(); From d022b1b9360ccf1dbb927a9b4665d1795028104d Mon Sep 17 00:00:00 2001 From: TD-er Date: Tue, 5 Aug 2025 01:37:59 +0200 Subject: [PATCH 182/564] [Controller] Make connection timeout dynamic per host & networkinterface --- src/ESPEasy/net/DataStructs/WiFiEventData.cpp | 9 --------- src/ESPEasy/net/DataStructs/WiFiEventData.h | 4 ---- .../DataStructs/ControllerSettingsStruct.cpp | 13 ++++++++++++ .../DataStructs/ControllerSettingsStruct.h | 4 +++- src/src/ESPEasyCore/Controller.cpp | 14 +++++-------- src/src/Helpers/_CPlugin_Helper.cpp | 20 +++++++++---------- 6 files changed, 30 insertions(+), 34 deletions(-) diff --git a/src/ESPEasy/net/DataStructs/WiFiEventData.cpp b/src/ESPEasy/net/DataStructs/WiFiEventData.cpp index 6daa7a369..febebf0bf 100644 --- a/src/ESPEasy/net/DataStructs/WiFiEventData.cpp +++ b/src/ESPEasy/net/DataStructs/WiFiEventData.cpp @@ -332,15 +332,6 @@ String WiFiEventData_t::ESPeasyWifiStatusToString() const { return log; } -uint32_t WiFiEventData_t::getSuggestedTimeout(int index, uint32_t minimum_timeout) const { - auto it = connectDurations.find(index); - - if (it == connectDurations.end()) { - return 3 * minimum_timeout; - } - const uint32_t res = 3 * it->second; - return constrain(res, minimum_timeout, CONNECT_TIMEOUT_MAX); -} # ifdef ESP8266 diff --git a/src/ESPEasy/net/DataStructs/WiFiEventData.h b/src/ESPEasy/net/DataStructs/WiFiEventData.h index 850dd99f3..f9d315d90 100644 --- a/src/ESPEasy/net/DataStructs/WiFiEventData.h +++ b/src/ESPEasy/net/DataStructs/WiFiEventData.h @@ -80,9 +80,6 @@ struct WiFiEventData_t { String ESPeasyWifiStatusToString() const; - uint32_t getSuggestedTimeout(int index, - uint32_t minimum_timeout) const; - // WiFi related data bool wifiSetup = false; @@ -149,7 +146,6 @@ struct WiFiEventData_t { unsigned long connectionFailures = 0; - std::mapconnectDurations; # ifdef ESP32 WiFiEventId_t wm_event_id = 0; diff --git a/src/src/DataStructs/ControllerSettingsStruct.cpp b/src/src/DataStructs/ControllerSettingsStruct.cpp index 160b732d4..6ec0e7038 100644 --- a/src/src/DataStructs/ControllerSettingsStruct.cpp +++ b/src/src/DataStructs/ControllerSettingsStruct.cpp @@ -5,6 +5,7 @@ #include "../CustomBuild/ESPEasyLimits.h" #include "../ESPEasyCore/ESPEasy_Log.h" #include "../../ESPEasy/net/ESPEasyNetwork.h" +#include "../../ESPEasy/net/Globals/NWPlugins.h" #include "../Helpers/Misc.h" #include "../Helpers/Networking.h" #include "../Helpers/StringConverter.h" @@ -369,3 +370,15 @@ String ControllerSettingsStruct::getCertificateFilename(TLS_types tls_type) cons return certFile; } #endif + + +uint32_t ControllerSettingsStruct::getSuggestedTimeout(int index) const +{ + if (MustCheckReply) { + auto data = ESPEasy::net::getDefaultRoute_NWPluginData_static_runtime(); + if (data) { + return data->getSuggestedTimeout(index, ClientTimeout); + } + } + return ClientTimeout; +} diff --git a/src/src/DataStructs/ControllerSettingsStruct.h b/src/src/DataStructs/ControllerSettingsStruct.h index 8d22a6ee9..675cdc77d 100644 --- a/src/src/DataStructs/ControllerSettingsStruct.h +++ b/src/src/DataStructs/ControllerSettingsStruct.h @@ -200,7 +200,9 @@ struct ControllerSettingsStruct String getCertificateFilename() const; String getCertificateFilename(TLS_types tls_type) const; #endif - + + uint32_t getSuggestedTimeout(int index) const; + bool UseDNS; uint8_t IP[4]; diff --git a/src/src/ESPEasyCore/Controller.cpp b/src/src/ESPEasyCore/Controller.cpp index 17de2b103..5810f2fed 100644 --- a/src/src/ESPEasyCore/Controller.cpp +++ b/src/src/ESPEasyCore/Controller.cpp @@ -242,9 +242,8 @@ bool MQTTConnect(controllerIndex_t controller_idx) // For example because the server does not give an acknowledgement. // This way, we always need the set amount of timeout to handle the request. // Thus we should not make the timeout dynamic here if set to ignore ack. - const uint32_t timeout = ControllerSettings->MustCheckReply - ? WiFiEventData.getSuggestedTimeout(Settings.Protocol[controller_idx], ControllerSettings->ClientTimeout) - : ControllerSettings->ClientTimeout; + + const uint32_t timeout = ControllerSettings->getSuggestedTimeout(Settings.Protocol[controller_idx]); # ifdef MUSTFIX_CLIENT_TIMEOUT_IN_SECONDS @@ -343,9 +342,8 @@ bool MQTTConnect(controllerIndex_t controller_idx) // For example because the server does not give an acknowledgement. // This way, we always need the set amount of timeout to handle the request. // Thus we should not make the timeout dynamic here if set to ignore ack. - const uint32_t timeout = ControllerSettings->MustCheckReply - ? WiFiEventData.getSuggestedTimeout(Settings.Protocol[controller_idx], ControllerSettings->ClientTimeout) - : ControllerSettings->ClientTimeout; + const uint32_t timeout = ControllerSettings->getSuggestedTimeout(Settings.Protocol[controller_idx]); + # ifdef MUSTFIX_CLIENT_TIMEOUT_IN_SECONDS @@ -380,9 +378,7 @@ bool MQTTConnect(controllerIndex_t controller_idx) // For example because the server does not give an acknowledgement. // This way, we always need the set amount of timeout to handle the request. // Thus we should not make the timeout dynamic here if set to ignore ack. - const uint32_t timeout = ControllerSettings->MustCheckReply - ? WiFiEventData.getSuggestedTimeout(Settings.Protocol[controller_idx], ControllerSettings->ClientTimeout) - : ControllerSettings->ClientTimeout; + const uint32_t timeout = ControllerSettings->getSuggestedTimeout(Settings.Protocol[controller_idx]); # ifdef MUSTFIX_CLIENT_TIMEOUT_IN_SECONDS diff --git a/src/src/Helpers/_CPlugin_Helper.cpp b/src/src/Helpers/_CPlugin_Helper.cpp index 34c42d0d9..a9051ca9d 100644 --- a/src/src/Helpers/_CPlugin_Helper.cpp +++ b/src/src/Helpers/_CPlugin_Helper.cpp @@ -118,7 +118,11 @@ bool count_connection_results(bool success, const __FlashStringHelper *prefix, c STOP_TIMER_CONTROLLER(protocolIndex, CPlugin::Function::CPLUGIN_CONNECT_FAIL); return false; } - WiFiEventData.connectDurations[cpluginID] = usecPassedSince(statisticsTimerStart) / 1000ul; + auto data = ESPEasy::net::getDefaultRoute_NWPluginData_static_runtime(); + if (data) { + data->setConnectionDuration(cpluginID, usecPassedSince(statisticsTimerStart) / 1000ul); + } + STOP_TIMER_CONTROLLER(protocolIndex, CPlugin::Function::CPLUGIN_CONNECT_SUCCESS); statusLED(true); @@ -140,9 +144,7 @@ bool try_connect_host(cpluginID_t cpluginID, WiFiUDP& client, ControllerSettings // For example because the server does not give an acknowledgement. // This way, we always need the set amount of timeout to handle the request. // Thus we should not make the timeout dynamic here if set to ignore ack. - const uint32_t timeout = ControllerSettings.MustCheckReply - ? WiFiEventData.getSuggestedTimeout(cpluginID, ControllerSettings.ClientTimeout) - : ControllerSettings.ClientTimeout; + const uint32_t timeout = ControllerSettings.getSuggestedTimeout(cpluginID); client.setTimeout(timeout); // in msec as it should be! delay(0); @@ -187,9 +189,7 @@ bool try_connect_host(cpluginID_t cpluginID, // For example because the server does not give an acknowledgement. // This way, we always need the set amount of timeout to handle the request. // Thus we should not make the timeout dynamic here if set to ignore ack. - const uint32_t timeout = ControllerSettings.MustCheckReply - ? WiFiEventData.getSuggestedTimeout(cpluginID, ControllerSettings.ClientTimeout) - : ControllerSettings.ClientTimeout; + const uint32_t timeout = ControllerSettings.getSuggestedTimeout(cpluginID); # ifdef MUSTFIX_CLIENT_TIMEOUT_IN_SECONDS @@ -239,10 +239,8 @@ String send_via_http(int cpluginID, // For example because the server does not give an acknowledgement. // This way, we always need the set amount of timeout to handle the request. // Thus we should not make the timeout dynamic here if set to ignore ack. - const uint32_t timeout = ControllerSettings.MustCheckReply - ? WiFiEventData.getSuggestedTimeout(cpluginID, ControllerSettings.ClientTimeout) - : ControllerSettings.ClientTimeout; - + const uint32_t timeout = ControllerSettings.getSuggestedTimeout(cpluginID); + const uint64_t statisticsTimerStart(getMicros64()); const String result = send_via_http( get_formatted_Controller_number(cpluginID), From aa066e92309052a8ec468d65dbed7204cef3d26f Mon Sep 17 00:00:00 2001 From: TD-er Date: Tue, 5 Aug 2025 17:39:13 +0200 Subject: [PATCH 183/564] [Network] Remove more legacy WiFiEventData code --- .../net/DataStructs/EthernetEventData.h | 1 - .../NWPluginData_static_runtime.cpp | 20 +++++- .../DataStructs/NWPluginData_static_runtime.h | 14 +++- .../NWPluginData_static_runtime_ESP32.cpp | 28 ++++++-- .../NWPluginData_static_runtime_ESP8266.cpp | 22 ++++-- src/ESPEasy/net/DataStructs/WiFiEventData.h | 1 - src/ESPEasy/net/Globals/NWPlugins.cpp | 11 ++- src/ESPEasy/net/Globals/NWPlugins.h | 4 +- .../NW005_data_struct_PPP_modem.cpp | 2 + src/ESPEasy/net/_NW003_ETH_RMII.cpp | 3 + src/ESPEasy/net/_NW004_ETH_SPI.cpp | 4 ++ src/ESPEasy/net/_NW005_PPP_modem.cpp | 14 ++-- .../net/wifi/ESPEasyWiFi_state_machine.cpp | 26 ++++--- .../net/wifi/ESPEasyWiFi_state_machine.h | 3 +- .../net/wifi/ESPEasyWifi_abstracted_ESP32.cpp | 11 +-- .../wifi/ESPEasyWifi_abstracted_ESP8266.cpp | 1 + src/src/Helpers/Convert.cpp | 2 +- src/src/Helpers/LongTermOnOffTimer.cpp | 6 ++ src/src/Helpers/LongTermOnOffTimer.h | 3 + src/src/Helpers/PeriodicalActions.cpp | 72 +++++++++++-------- src/src/Helpers/_CPlugin_Helper.cpp | 42 +++++------ src/src/Helpers/_CPlugin_Helper.h | 2 - 22 files changed, 200 insertions(+), 92 deletions(-) diff --git a/src/ESPEasy/net/DataStructs/EthernetEventData.h b/src/ESPEasy/net/DataStructs/EthernetEventData.h index 9d02712b5..4fadd5426 100644 --- a/src/ESPEasy/net/DataStructs/EthernetEventData.h +++ b/src/ESPEasy/net/DataStructs/EthernetEventData.h @@ -85,7 +85,6 @@ struct EthernetEventData_t { bool ethInitSuccess = false; - unsigned long connectionFailures = 0; #ifdef ESP32 WiFiEventId_t wm_event_id = 0; diff --git a/src/ESPEasy/net/DataStructs/NWPluginData_static_runtime.cpp b/src/ESPEasy/net/DataStructs/NWPluginData_static_runtime.cpp index b79bd37d9..d4fbee78c 100644 --- a/src/ESPEasy/net/DataStructs/NWPluginData_static_runtime.cpp +++ b/src/ESPEasy/net/DataStructs/NWPluginData_static_runtime.cpp @@ -16,6 +16,8 @@ void NWPluginData_static_runtime::clear(networkIndex_t networkIndex) #endif _networkIndex = networkIndex; + _connectionFailures = 0; + // FIXME TD-er: Should also clear dns cache? } @@ -71,7 +73,7 @@ uint32_t NWPluginData_static_runtime::getSuggestedTimeout( return returnvalue; } -void NWPluginData_static_runtime::setConnectionDuration( +void NWPluginData_static_runtime::markConnectionSuccess( int index, uint32_t duration_ms) const { @@ -82,6 +84,22 @@ void NWPluginData_static_runtime::setConnectionDuration( // Apply some slight filtering so we won't get into trouble when a connection suddenly was faster. _connectDurations[index] += 2 * duration_ms; _connectDurations[index] /= 3; + + if (_connectionFailures > 0) { + --_connectionFailures; + } +} + +void NWPluginData_static_runtime::markPublishSuccess() const +{ + if (_connectionFailures > 0) { + --_connectionFailures; + } +} + +void NWPluginData_static_runtime::markConnectionFailed(int index) const +{ + ++_connectionFailures; } } // namespace net diff --git a/src/ESPEasy/net/DataStructs/NWPluginData_static_runtime.h b/src/ESPEasy/net/DataStructs/NWPluginData_static_runtime.h index 85284b0b5..967e2fdc7 100644 --- a/src/ESPEasy/net/DataStructs/NWPluginData_static_runtime.h +++ b/src/ESPEasy/net/DataStructs/NWPluginData_static_runtime.h @@ -57,6 +57,8 @@ struct NWPluginData_static_runtime { void mark_lost_IP(); + void mark_begin_establish_connection(); + void mark_connected(); void mark_disconnected(); @@ -74,9 +76,16 @@ struct NWPluginData_static_runtime { uint32_t getSuggestedTimeout(int index, uint32_t minimum_timeout) const; - void setConnectionDuration(int index, + void markConnectionSuccess(int index, uint32_t duration_ms) const; + void markPublishSuccess() const; + + void markConnectionFailed(int index) const; + + uint32_t getConnectionFailures() const { return _connectionFailures; } + + // ============================================= // OnOffTimers for keeping track of: // - start/stop of interface @@ -86,6 +95,7 @@ struct NWPluginData_static_runtime { // ============================================= LongTermOnOffTimer _startStopStats{}; + LongTermOnOffTimer _establishConnectStats{}; LongTermOnOffTimer _connectedStats{}; LongTermOnOffTimer _gotIPStats{}; #if FEATURE_USE_IPV6 @@ -117,6 +127,8 @@ private: // Duration is positive when actually being set mutable std::map_connectDurations; + mutable uint32_t _connectionFailures{}; + }; diff --git a/src/ESPEasy/net/DataStructs/NWPluginData_static_runtime_ESP32.cpp b/src/ESPEasy/net/DataStructs/NWPluginData_static_runtime_ESP32.cpp index 7b4855c5c..04c772254 100644 --- a/src/ESPEasy/net/DataStructs/NWPluginData_static_runtime_ESP32.cpp +++ b/src/ESPEasy/net/DataStructs/NWPluginData_static_runtime_ESP32.cpp @@ -74,9 +74,7 @@ void NWPluginData_static_runtime::mark_stop() void NWPluginData_static_runtime::mark_got_IP() { // Set OnOffTimer to off so we can also count how often we het new IP - _gotIPStats.setOff(); - - _gotIPStats.setOn(); + _gotIPStats.forceSet(true); if (!_netif) { return; } @@ -144,15 +142,33 @@ void NWPluginData_static_runtime::mark_lost_IP() } } +void NWPluginData_static_runtime::mark_begin_establish_connection() +{ + _establishConnectStats.forceSet(true); + +} + + void NWPluginData_static_runtime::mark_connected() { + const bool logDuration = _establishConnectStats.isOn(); + + _establishConnectStats.setOff(); _connectedStats.setOn(); - if (_netif && loglevelActiveFor(LOG_LEVEL_INFO)) { + if (logDuration) { + addLog(LOG_LEVEL_INFO, strformat( + F("%s: Connected, took: %s in %d attempts"), + esp_netif_get_desc(_netif->netif()), + format_msec_duration_HMS( + _establishConnectStats.getLastOnDuration_ms()).c_str(), + _establishConnectStats.getCycleCount())); + } else { addLog(LOG_LEVEL_INFO, strformat( F("%s: Connected"), esp_netif_get_desc(_netif->netif()))); } + _establishConnectStats.resetCount(); } void NWPluginData_static_runtime::mark_disconnected() @@ -163,10 +179,10 @@ void NWPluginData_static_runtime::mark_disconnected() if (_netif && loglevelActiveFor(LOG_LEVEL_INFO)) { addLog(LOG_LEVEL_INFO, strformat( - F("%s: Disconnected. Connected for: "), + F("%s: Disconnected. Connected for: %s"), esp_netif_get_desc(_netif->netif()), format_msec_duration_HMS( - _connectedStats.getLastOnDuration_ms()))); + _connectedStats.getLastOnDuration_ms()).c_str())); } } diff --git a/src/ESPEasy/net/DataStructs/NWPluginData_static_runtime_ESP8266.cpp b/src/ESPEasy/net/DataStructs/NWPluginData_static_runtime_ESP8266.cpp index bacf67dae..d59501be8 100644 --- a/src/ESPEasy/net/DataStructs/NWPluginData_static_runtime_ESP8266.cpp +++ b/src/ESPEasy/net/DataStructs/NWPluginData_static_runtime_ESP8266.cpp @@ -39,9 +39,7 @@ void NWPluginData_static_runtime::mark_stop() void NWPluginData_static_runtime::mark_got_IP() { // Set OnOffTimer to off so we can also count how often we het new IP - _gotIPStats.setOff(); - - _gotIPStats.setOn(); + _gotIPStats.forceSet(true); addLog(LOG_LEVEL_INFO, _isSTA ? F("STA: Got IP") : F("AP: Got IP")); } @@ -52,10 +50,26 @@ void NWPluginData_static_runtime::mark_lost_IP() addLog(LOG_LEVEL_INFO, _isSTA ? F("STA: Lost IP") : F("AP: Lost IP")); } +void NWPluginData_static_runtime::mark_begin_establish_connection() +{ + _establishConnectStats.forceSet(true); + +} + void NWPluginData_static_runtime::mark_connected() { + const bool logDuration = _establishConnectStats.isOn(); + _establishConnectStats.setOff(); _connectedStats.setOn(); - addLog(LOG_LEVEL_INFO, F("STA: Connected")); + + if (logDuration) { + addLog(LOG_LEVEL_INFO, concat( + F("STA: Connected, took: "), + format_msec_duration_HMS( + _establishConnectStats.getLastOnDuration_ms()))); + } else { + addLog(LOG_LEVEL_INFO, F("STA: Connected")); + } } void NWPluginData_static_runtime::mark_disconnected() diff --git a/src/ESPEasy/net/DataStructs/WiFiEventData.h b/src/ESPEasy/net/DataStructs/WiFiEventData.h index f9d315d90..4d0a0d003 100644 --- a/src/ESPEasy/net/DataStructs/WiFiEventData.h +++ b/src/ESPEasy/net/DataStructs/WiFiEventData.h @@ -144,7 +144,6 @@ struct WiFiEventData_t { bool performedClearWiFiCredentials = false; - unsigned long connectionFailures = 0; # ifdef ESP32 diff --git a/src/ESPEasy/net/Globals/NWPlugins.cpp b/src/ESPEasy/net/Globals/NWPlugins.cpp index 2a8fe2c71..eedb1ef87 100644 --- a/src/ESPEasy/net/Globals/NWPlugins.cpp +++ b/src/ESPEasy/net/Globals/NWPlugins.cpp @@ -13,6 +13,8 @@ namespace ESPEasy { namespace net { +# define NETWORK_INDEX_WIFI_STA 0 // Always the first network index + bool NWPluginCall(NWPlugin::Function Function, EventStruct *event) { #ifdef USE_SECOND_HEAP HeapSelectDram ephemeral; @@ -316,7 +318,14 @@ String getNWPluginNameFromNWPluginID(nwpluginID_t nwpluginID) { return getNWPluginNameFromNetworkDriverIndex(networkDriverIndex); } -const NWPluginData_static_runtime* getNWPluginData_static_runtime(networkIndex_t index) +NWPluginData_static_runtime* getWiFi_STA_NWPluginData_static_runtime() +{ + auto NW_data = getNWPluginData(NETWORK_INDEX_WIFI_STA); + if (!NW_data) return nullptr; + return &NW_data->getNWPluginData_static_runtime(); +} + +NWPluginData_static_runtime* getNWPluginData_static_runtime(networkIndex_t index) { auto NW_data = getNWPluginData(index); if (!NW_data) return nullptr; diff --git a/src/ESPEasy/net/Globals/NWPlugins.h b/src/ESPEasy/net/Globals/NWPlugins.h index f9195594c..becaead78 100644 --- a/src/ESPEasy/net/Globals/NWPlugins.h +++ b/src/ESPEasy/net/Globals/NWPlugins.h @@ -13,6 +13,7 @@ namespace ESPEasy { namespace net { + bool NWPluginCall(NWPlugin::Function Function, EventStruct *event); bool NWPluginCall(NWPlugin::Function Function, @@ -43,7 +44,8 @@ nwpluginID_t getNWPluginID_from_NetworkIndex(networkIndex_t index); String getNWPluginNameFromNetworkDriverIndex(networkDriverIndex_t NetworkDriverIndex); String getNWPluginNameFromNWPluginID(nwpluginID_t nwpluginID); -const NWPluginData_static_runtime* getNWPluginData_static_runtime(networkIndex_t index); +NWPluginData_static_runtime* getWiFi_STA_NWPluginData_static_runtime(); +NWPluginData_static_runtime* getNWPluginData_static_runtime(networkIndex_t index); const NWPluginData_static_runtime* getDefaultRoute_NWPluginData_static_runtime(); } // namespace net diff --git a/src/ESPEasy/net/NWPluginStructs/NW005_data_struct_PPP_modem.cpp b/src/ESPEasy/net/NWPluginStructs/NW005_data_struct_PPP_modem.cpp index 3453da41a..151d19adc 100644 --- a/src/ESPEasy/net/NWPluginStructs/NW005_data_struct_PPP_modem.cpp +++ b/src/ESPEasy/net/NWPluginStructs/NW005_data_struct_PPP_modem.cpp @@ -856,6 +856,8 @@ bool NW005_data_struct_PPP_modem::init(EventStruct *event) _modem_task_data.modem_initialized = false; _modem_task_data.initializing = false; + stats_and_cache.mark_begin_establish_connection(); + xTaskCreatePinnedToCore( NW005_begin_modem_task, // Function that should be called "PPP.begin()", // Name of the task (for debugging) diff --git a/src/ESPEasy/net/_NW003_ETH_RMII.cpp b/src/ESPEasy/net/_NW003_ETH_RMII.cpp index a7bcfd33c..cdfef2af5 100644 --- a/src/ESPEasy/net/_NW003_ETH_RMII.cpp +++ b/src/ESPEasy/net/_NW003_ETH_RMII.cpp @@ -287,6 +287,9 @@ bool NWPlugin_003(NWPlugin::Function function, EventStruct *event, String& strin case NWPlugin::Function::NWPLUGIN_INIT: { + auto data = getNWPluginData_static_runtime(event->NetworkIndex); + + if (data) { data->mark_begin_establish_connection(); } ESPEasy::net::eth::ETHConnectRelaxed(); break; } diff --git a/src/ESPEasy/net/_NW004_ETH_SPI.cpp b/src/ESPEasy/net/_NW004_ETH_SPI.cpp index bf04eb925..926b41423 100644 --- a/src/ESPEasy/net/_NW004_ETH_SPI.cpp +++ b/src/ESPEasy/net/_NW004_ETH_SPI.cpp @@ -290,6 +290,10 @@ bool NWPlugin_004(NWPlugin::Function function, EventStruct *event, String& strin case NWPlugin::Function::NWPLUGIN_INIT: { + auto data = getNWPluginData_static_runtime(event->NetworkIndex); + + if (data) { data->mark_begin_establish_connection(); } + ESPEasy::net::eth::ETHConnectRelaxed(); break; } diff --git a/src/ESPEasy/net/_NW005_PPP_modem.cpp b/src/ESPEasy/net/_NW005_PPP_modem.cpp index a5e7fc439..e03b2e61e 100644 --- a/src/ESPEasy/net/_NW005_PPP_modem.cpp +++ b/src/ESPEasy/net/_NW005_PPP_modem.cpp @@ -128,8 +128,11 @@ bool NWPlugin_005(NWPlugin::Function function, EventStruct *event, String& strin if (mustCleanup) { NW_data = new (std::nothrow) ESPEasy::net::ppp::NW005_data_struct_PPP_modem(event->NetworkIndex); # if FEATURE_STORE_NETWORK_INTERFACE_SETTINGS - NW_data->init_KVS(); -# endif + + if (NW_data) { + NW_data->init_KVS(); + } +# endif // if FEATURE_STORE_NETWORK_INTERFACE_SETTINGS } if (NW_data) { @@ -151,8 +154,11 @@ bool NWPlugin_005(NWPlugin::Function function, EventStruct *event, String& strin if (mustCleanup) { NW_data = new (std::nothrow) ESPEasy::net::ppp::NW005_data_struct_PPP_modem(event->NetworkIndex); # if FEATURE_STORE_NETWORK_INTERFACE_SETTINGS - NW_data->init_KVS(); -# endif + + if (NW_data) { + NW_data->init_KVS(); + } +# endif // if FEATURE_STORE_NETWORK_INTERFACE_SETTINGS } if (NW_data) { diff --git a/src/ESPEasy/net/wifi/ESPEasyWiFi_state_machine.cpp b/src/ESPEasy/net/wifi/ESPEasyWiFi_state_machine.cpp index 8d9cf2237..22020267d 100644 --- a/src/ESPEasy/net/wifi/ESPEasyWiFi_state_machine.cpp +++ b/src/ESPEasy/net/wifi/ESPEasyWiFi_state_machine.cpp @@ -48,6 +48,8 @@ void ESPEasyWiFi_t::begin() { setState(WiFiState_e::IdleWaiting, 100); } void ESPEasyWiFi_t::loop() { // TODO TD-er: Must inspect WiFiEventData to see if we need to update some state here. + auto wifi_STA_data = getWiFi_STA_NWPluginData_static_runtime(); + if (!wifi_STA_data) return; if (_state != WiFiState_e::IdleWaiting) { @@ -113,8 +115,7 @@ void ESPEasyWiFi_t::loop() WiFiEventData.warnedNoValidWiFiSettings = true; } - WiFiEventData.last_wifi_connect_attempt_moment.clear(); - WiFiEventData.wifi_connect_attempt = 1; + wifi_STA_data->_establishConnectStats.clear(); WiFiEventData.wifiConnectAttemptNeeded = false; setState(WiFiState_e::AP_only, WIFI_STATE_MACHINE_AP_ONLY_TIMEOUT); } @@ -295,6 +296,12 @@ void ESPEasyWiFi_t::startScanning() bool ESPEasyWiFi_t::connectSTA() { + auto wifi_STA_data = getWiFi_STA_NWPluginData_static_runtime(); + if (!wifi_STA_data) return false; + + // Make sure the timer is set to off. + // TODO TD-er: Should we check to see if it is still on and then do what???? + wifi_STA_data->_establishConnectStats.setOff(); if (!WiFi_AP_Candidates.hasCandidateCredentials()) { if (!WiFiEventData.warnedNoValidWiFiSettings) @@ -302,8 +309,9 @@ bool ESPEasyWiFi_t::connectSTA() addLog(LOG_LEVEL_ERROR, F("WIFI : No valid wifi settings")); WiFiEventData.warnedNoValidWiFiSettings = true; } - WiFiEventData.last_wifi_connect_attempt_moment.clear(); - WiFiEventData.wifi_connect_attempt = 1; + wifi_STA_data->_establishConnectStats.clear(); +// WiFiEventData.last_wifi_connect_attempt_moment.clear(); +// _connect_attempt = 1; WiFiEventData.wifiConnectAttemptNeeded = false; // No need to wait longer to start AP mode. @@ -346,9 +354,9 @@ bool ESPEasyWiFi_t::connectSTA() addLogMove(LOG_LEVEL_INFO, strformat( F("WIFI : Connecting %s attempt #%u"), candidate.toString().c_str(), - WiFiEventData.wifi_connect_attempt)); + wifi_STA_data->_establishConnectStats.getCycleCount() + 1)); } - WiFiEventData.markWiFiBegin(); + //WiFiEventData.markWiFiBegin(); if (prepareWiFi()) { setNetworkMedium(NetworkMedium_t::WIFI); @@ -357,7 +365,7 @@ bool ESPEasyWiFi_t::connectSTA() # if FEATURE_SET_WIFI_TX_PWR float tx_pwr = 0; // Will be set higher based on RSSI when needed. - // FIXME TD-er: Must check WiFiEventData.wifi_connect_attempt to increase TX power + // FIXME TD-er: Must check wifi_STA_data->_establishConnectStats.getCycleCount() to increase TX power if (Settings.UseMaxTXpowerForSending()) { tx_pwr = Settings.getWiFi_TX_power(); @@ -367,7 +375,7 @@ bool ESPEasyWiFi_t::connectSTA() // Start connect attempt now, so no longer needed to attempt new connection. WiFiEventData.wifiConnectAttemptNeeded = false; - WiFiEventData.wifiConnectInProgress = true; +// WiFiEventData.wifiConnectInProgress = true; const String key = WiFi_AP_CandidatesList::get_key(candidate.index); # if FEATURE_USE_IPV6 @@ -383,7 +391,7 @@ bool ESPEasyWiFi_t::connectSTA() doSetWiFiCountryPolicyManual(); } # endif // ifdef ESP32 - + wifi_STA_data->mark_begin_establish_connection(); if (candidate.bits.isHidden /*&& Settings.HiddenSSID_SlowConnectPerBSSID()*/) { // WiFi.disconnect(false, true); # ifdef ESP32 diff --git a/src/ESPEasy/net/wifi/ESPEasyWiFi_state_machine.h b/src/ESPEasy/net/wifi/ESPEasyWiFi_state_machine.h index d15e0885f..5be090e07 100644 --- a/src/ESPEasy/net/wifi/ESPEasyWiFi_state_machine.h +++ b/src/ESPEasy/net/wifi/ESPEasyWiFi_state_machine.h @@ -6,6 +6,7 @@ # include "../DataStructs/WiFi_AP_Candidate.h" # include "../../../src/Helpers/LongTermTimer.h" +# include "../../../src/Helpers/LongTermOnOffTimer.h" # include "../wifi/WiFi_STA_connected_state.h" # include "../wifi/WiFi_State.h" @@ -86,7 +87,7 @@ private: // LongTermTimer _AP_start_timestamp; - // uint32_t _connect_attempt = 0; + //uint32_t _connect_attempt = 0; // uint32_t _nrReconnects = 0; diff --git a/src/ESPEasy/net/wifi/ESPEasyWifi_abstracted_ESP32.cpp b/src/ESPEasy/net/wifi/ESPEasyWifi_abstracted_ESP32.cpp index 861f1e410..ea289a742 100644 --- a/src/ESPEasy/net/wifi/ESPEasyWifi_abstracted_ESP32.cpp +++ b/src/ESPEasy/net/wifi/ESPEasyWifi_abstracted_ESP32.cpp @@ -26,6 +26,7 @@ namespace ESPEasy { namespace net { namespace wifi { + bool WiFi_pre_setup() { if (!ESPEasyWiFi_STA_EventHandler::initialized()) { return false; } @@ -84,7 +85,7 @@ bool doSetWifiMode(WiFiMode_t new_mode) if (cur_mode == WIFI_OFF) { // Needs to be set while WiFi is off WiFi.hostname(NetworkCreateRFCCompliantHostname()); - WiFiEventData.markWiFiTurnOn(); +// WiFiEventData.markWiFiTurnOn(); } if (new_mode != WIFI_OFF) { @@ -99,7 +100,7 @@ bool doSetWifiMode(WiFiMode_t new_mode) // delay(100); processDisconnect(); - WiFiEventData.clear_processed_flags(); +// WiFiEventData.clear_processed_flags(); } addLog(LOG_LEVEL_INFO, concat(F("WIFI : Set WiFi to "), doGetWifiModeString(new_mode))); @@ -129,7 +130,7 @@ bool doSetWifiMode(WiFiMode_t new_mode) if (new_mode == WIFI_OFF) { // FIXME TD-er: Is this correct to mark Turn ON ???? - WiFiEventData.markWiFiTurnOn(); +// WiFiEventData.markWiFiTurnOn(); // Needs to be set while WiFi is off WiFi.hostname(NetworkCreateRFCCompliantHostname()); @@ -446,7 +447,7 @@ void doSetConnectionSpeed(bool ForceWiFi_bg_mode) if (ForceWiFi_bg_mode) { protocol = WIFI_PROTOCOL_11B | WIFI_PROTOCOL_11G; // Default to BG } - +/* if (WiFiEventData.connectionFailures > 10) { // Set to allow all protocols protocol = WIFI_PROTOCOL_11B | WIFI_PROTOCOL_11G | WIFI_PROTOCOL_11N; @@ -454,7 +455,7 @@ void doSetConnectionSpeed(bool ForceWiFi_bg_mode) protocol |= WIFI_PROTOCOL_11AX; # endif } - +*/ const WiFi_AP_Candidate candidate = WiFi_AP_Candidates.getCurrent(); if (candidate.phy_known()) { diff --git a/src/ESPEasy/net/wifi/ESPEasyWifi_abstracted_ESP8266.cpp b/src/ESPEasy/net/wifi/ESPEasyWifi_abstracted_ESP8266.cpp index 1abdfad88..0d72992c8 100644 --- a/src/ESPEasy/net/wifi/ESPEasyWifi_abstracted_ESP8266.cpp +++ b/src/ESPEasy/net/wifi/ESPEasyWifi_abstracted_ESP8266.cpp @@ -18,6 +18,7 @@ namespace ESPEasy { namespace net { namespace wifi { + bool WiFi_pre_setup() { if (!ESPEasyWiFi_STA_EventHandler::initialized()) { return false; } diff --git a/src/src/Helpers/Convert.cpp b/src/src/Helpers/Convert.cpp index 01a8f6389..ee2f9f73b 100644 --- a/src/src/Helpers/Convert.cpp +++ b/src/src/Helpers/Convert.cpp @@ -146,7 +146,7 @@ String format_msec_duration(int64_t duration, bool useHMS) { if (duration_s < 60) { return strformat( - useHMS ? F("%02ds.%03d") : F("%02d.%03d"), + useHMS ? F("%02d.%03d sec") : F("%02d.%03d"), duration_s, duration_ms); } diff --git a/src/src/Helpers/LongTermOnOffTimer.cpp b/src/src/Helpers/LongTermOnOffTimer.cpp index ddbbde0e8..f71de5044 100644 --- a/src/src/Helpers/LongTermOnOffTimer.cpp +++ b/src/src/Helpers/LongTermOnOffTimer.cpp @@ -38,6 +38,12 @@ bool LongTermOnOffTimer::set(bool onState) return setOff(); } +bool LongTermOnOffTimer::forceSet(bool onState) +{ + set(!onState); + return set(onState); +} + bool LongTermOnOffTimer::isSet() const { return _onTimer.isSet() || _offTimer.isSet(); diff --git a/src/src/Helpers/LongTermOnOffTimer.h b/src/src/Helpers/LongTermOnOffTimer.h index 30d11d5c5..1261fa6b6 100644 --- a/src/src/Helpers/LongTermOnOffTimer.h +++ b/src/src/Helpers/LongTermOnOffTimer.h @@ -18,6 +18,9 @@ public: bool set(bool onState); + // Set to specific on/off state + reset last change timer to now + bool forceSet(bool onState); + // Return true if either 'on' or 'off' was set at least once (since 'clear()' or construction) bool isSet() const; diff --git a/src/src/Helpers/PeriodicalActions.cpp b/src/src/Helpers/PeriodicalActions.cpp index afdbe6a0e..c6d3db370 100644 --- a/src/src/Helpers/PeriodicalActions.cpp +++ b/src/src/Helpers/PeriodicalActions.cpp @@ -151,10 +151,11 @@ void runOncePerSecond() #endif } - if (Settings.ConnectionFailuresThreshold) - if (WiFiEventData.connectionFailures > Settings.ConnectionFailuresThreshold) + if (Settings.ConnectionFailuresThreshold) { + auto data = ESPEasy::net::getDefaultRoute_NWPluginData_static_runtime(); + if (data && data->getConnectionFailures() > Settings.ConnectionFailuresThreshold) delayedReboot(60, IntendedRebootReason_e::DelayedReboot); - + } if (cmd_within_mainloop != 0) { switch (cmd_within_mainloop) @@ -231,34 +232,42 @@ void runEach30Seconds() checkRAMtoLog(); #endif wdcounter++; - if (loglevelActiveFor(LOG_LEVEL_INFO)) { - String log = strformat( - F("WD : Uptime %d ConnectFailures %u FreeMem %u"), - getUptimeMinutes(), - WiFiEventData.connectionFailures, - FreeMem()); - bool logWiFiStatus = true; - #if FEATURE_ETHERNET - if(active_network_medium == ESPEasy::net::NetworkMedium_t::Ethernet) { - logWiFiStatus = false; - log += F( " EthSpeedState "); - log += getValue(LabelType::ETH_SPEED_STATE); - log += F(" ETH status: "); - log += EthEventData.ESPEasyEthStatusToString(); - } - #endif // if FEATURE_ETHERNET - if (logWiFiStatus) { - log += strformat( - F(" WiFiStatus: %s ESPeasy internal wifi status: %s"), - ArduinoWifiStatusToString(WiFi.status()).c_str(), - WiFiEventData.ESPeasyWifiStatusToString().c_str()); - } -// log += F(" ListenInterval "); -// log += WiFi.getListenInterval(); - addLogMove(LOG_LEVEL_INFO, log); + if (loglevelActiveFor(LOG_LEVEL_INFO)) { + auto data = ESPEasy::net::getDefaultRoute_NWPluginData_static_runtime(); + if (!data) { + addLogMove(LOG_LEVEL_INFO, strformat( + F("WD : Uptime %d FreeMem %u"), + getUptimeMinutes(), + FreeMem())); + } else { + String log = strformat( + F("WD : Uptime %d ConnectFailures %u FreeMem %u"), + getUptimeMinutes(), + data->getConnectionFailures(), + FreeMem()); + bool logWiFiStatus = true; + #if FEATURE_ETHERNET + if(active_network_medium == ESPEasy::net::NetworkMedium_t::Ethernet) { + logWiFiStatus = false; + log += F( " EthSpeedState "); + log += getValue(LabelType::ETH_SPEED_STATE); + log += F(" ETH status: "); + log += EthEventData.ESPEasyEthStatusToString(); + } + #endif // if FEATURE_ETHERNET + if (logWiFiStatus) { + log += strformat( + F(" WiFiStatus: %s ESPeasy internal wifi status: %s"), + ArduinoWifiStatusToString(WiFi.status()).c_str(), + WiFiEventData.ESPeasyWifiStatusToString().c_str()); + } + // log += F(" ListenInterval "); + // log += WiFi.getListenInterval(); + addLogMove(LOG_LEVEL_INFO, log); #if FEATURE_DEFINE_SERIAL_CONSOLE_PORT -// addLogMove(LOG_LEVEL_INFO, ESPEASY_SERIAL_CONSOLE_PORT.getLogString()); + // addLogMove(LOG_LEVEL_INFO, ESPEASY_SERIAL_CONSOLE_PORT.getLogString()); #endif + } } ESPEasy::net::wifi::WiFi_AP_Candidates.purge_expired(); #if FEATURE_ESPEASY_P2P @@ -354,8 +363,9 @@ void processMQTTdelayQueue() { } else if (!handled) { if (MQTTclient.publish(element->_topic.c_str(), element->_payload.c_str(), element->_retained)) { - if (WiFiEventData.connectionFailures > 0) { - --WiFiEventData.connectionFailures; + auto data = ESPEasy::net::getDefaultRoute_NWPluginData_static_runtime(); + if (data) { + data->markPublishSuccess(); } MQTTDelayHandler->markProcessed(true); } else { diff --git a/src/src/Helpers/_CPlugin_Helper.cpp b/src/src/Helpers/_CPlugin_Helper.cpp index a9051ca9d..5ac3f2a33 100644 --- a/src/src/Helpers/_CPlugin_Helper.cpp +++ b/src/src/Helpers/_CPlugin_Helper.cpp @@ -30,7 +30,6 @@ #include #include - bool safeReadStringUntil(Stream & input, String & str, char terminator, @@ -45,7 +44,8 @@ bool safeReadStringUntil(Stream & input, // FIXME TD-er: Should this also de-allocate internal buffer? str.clear(); - do { + do + { // read character if (input.available()) { c = input.read(); @@ -83,6 +83,7 @@ bool safeReadStringUntil(Stream & input, } #ifndef BUILD_NO_DEBUG + void log_connecting_to(const __FlashStringHelper *prefix, cpluginID_t cpluginID, ControllerSettingsStruct& ControllerSettings) { if (loglevelActiveFor(LOG_LEVEL_DEBUG)) { addLogMove(LOG_LEVEL_DEBUG, @@ -95,40 +96,35 @@ void log_connecting_to(const __FlashStringHelper *prefix, cpluginID_t cpluginID, #endif // ifndef BUILD_NO_DEBUG -void log_connecting_fail(const __FlashStringHelper *prefix, cpluginID_t cpluginID) { - if (loglevelActiveFor(LOG_LEVEL_ERROR)) { - addLogMove(LOG_LEVEL_ERROR, - strformat(F("%s%s connection failed (%d/%d)"), - prefix, - get_formatted_Controller_number(cpluginID).c_str(), - WiFiEventData.connectionFailures, - Settings.ConnectionFailuresThreshold)); - } -} - bool count_connection_results(bool success, const __FlashStringHelper *prefix, cpluginID_t cpluginID, uint64_t statisticsTimerStart) { #if FEATURE_TIMING_STATS const protocolIndex_t protocolIndex = getProtocolIndex_from_CPluginID(cpluginID); #endif + auto data = ESPEasy::net::getDefaultRoute_NWPluginData_static_runtime(); if (!success) { - ++WiFiEventData.connectionFailures; - log_connecting_fail(prefix, cpluginID); + if (data) { + data->markConnectionFailed(cpluginID); + addLogMove(LOG_LEVEL_ERROR, + strformat(F("%s%s connection failed (%d/%d)"), + prefix, + get_formatted_Controller_number(cpluginID).c_str(), + data->getConnectionFailures(), + Settings.ConnectionFailuresThreshold)); + } + STOP_TIMER_CONTROLLER(protocolIndex, CPlugin::Function::CPLUGIN_CONNECT_FAIL); return false; } - auto data = ESPEasy::net::getDefaultRoute_NWPluginData_static_runtime(); + if (data) { - data->setConnectionDuration(cpluginID, usecPassedSince(statisticsTimerStart) / 1000ul); + data->markConnectionSuccess(cpluginID, usecPassedSince(statisticsTimerStart) / 1000ul); } STOP_TIMER_CONTROLLER(protocolIndex, CPlugin::Function::CPLUGIN_CONNECT_SUCCESS); statusLED(true); - if (WiFiEventData.connectionFailures > 0) { - --WiFiEventData.connectionFailures; - } return true; } @@ -167,6 +163,7 @@ bool try_connect_host(cpluginID_t cpluginID, WiFiUDP& client, ControllerSettings } #if FEATURE_HTTP_CLIENT + bool try_connect_host(cpluginID_t cpluginID, WiFiClient& client, ControllerSettingsStruct& ControllerSettings) { return try_connect_host(cpluginID, client, ControllerSettings, F("HTTP : ")); } @@ -240,9 +237,9 @@ String send_via_http(int cpluginID, // This way, we always need the set amount of timeout to handle the request. // Thus we should not make the timeout dynamic here if set to ignore ack. const uint32_t timeout = ControllerSettings.getSuggestedTimeout(cpluginID); - + const uint64_t statisticsTimerStart(getMicros64()); - const String result = send_via_http( + const String result = send_via_http( get_formatted_Controller_number(cpluginID), timeout, getControllerUser(controller_idx, ControllerSettings), @@ -271,7 +268,6 @@ String send_via_http(int cpluginID, #endif // FEATURE_HTTP_CLIENT - String getControllerUser(controllerIndex_t controller_idx, const ControllerSettingsStruct& ControllerSettings, bool doParseTemplate) { if (!validControllerIndex(controller_idx)) { return EMPTY_STRING; } diff --git a/src/src/Helpers/_CPlugin_Helper.h b/src/src/Helpers/_CPlugin_Helper.h index 28d9f018d..07ab6c270 100644 --- a/src/src/Helpers/_CPlugin_Helper.h +++ b/src/src/Helpers/_CPlugin_Helper.h @@ -36,8 +36,6 @@ bool safeReadStringUntil(Stream & input, void log_connecting_to(const __FlashStringHelper * prefix, cpluginID_t cpluginID, ControllerSettingsStruct& ControllerSettings); #endif // ifndef BUILD_NO_DEBUG -void log_connecting_fail(const __FlashStringHelper * prefix, cpluginID_t cpluginID); - bool count_connection_results(bool success, const __FlashStringHelper * prefix, cpluginID_t cpluginID, uint64_t statisticsTimerStart); #if FEATURE_HTTP_CLIENT From ab8823a80d2d7b323dfcb20e646052a5e9e00ee8 Mon Sep 17 00:00:00 2001 From: Ton Huisman Date: Tue, 5 Aug 2025 22:41:26 +0200 Subject: [PATCH 184/564] [P102] Add support for PZEM-017v1 --- lib/PZEM-004T-v30-master/PZEM004Tv30.cpp | 200 ++++++++++++++++++----- lib/PZEM-004T-v30-master/PZEM004Tv30.h | 35 +++- src/_P102_PZEM004Tv3.ino | 74 ++++++--- 3 files changed, 238 insertions(+), 71 deletions(-) diff --git a/lib/PZEM-004T-v30-master/PZEM004Tv30.cpp b/lib/PZEM-004T-v30-master/PZEM004Tv30.cpp index fd834487f..13c500f40 100644 --- a/lib/PZEM-004T-v30-master/PZEM004Tv30.cpp +++ b/lib/PZEM-004T-v30-master/PZEM004Tv30.cpp @@ -14,6 +14,10 @@ #define REG_PF 0x0008 #define REG_ALARM 0x0009 +#define REG_CURRENT 0x0001 +#define REG_HVALARM 0x0006 +#define REG_LVALARM 0x0007 + #define CMD_RHR 0x03 #define CMD_RIR 0X04 #define CMD_WSR 0x06 @@ -24,6 +28,9 @@ #define WREG_ALARM_THR 0x0001 #define WREG_ADDR 0x0002 +#define WREG_HV_ALARM_THR 0x0000 +#define WREG_LV_ALARM_THR 0x0001 + #define UPDATE_TIME 200 #define RESPONSE_SIZE 32 @@ -84,6 +91,23 @@ PZEM004Tv30::~PZEM004Tv30() // delete this->_serial; } + +void PZEM004Tv30::setModel(PZEM_model model) { + if (model == _model) { + return; + } + _model = model; + switch (_model) { + case PZEM_model::PZEM004Tv30: + _expectedResponse = PZEM004Tv30_EXPECTED_RESPONSE; + _requestRegisters = PZEM004Tv30_REQUEST_REGISTERS; + break; + case PZEM_model::PZEM017Tv1: + _expectedResponse = PZEM017v1_EXPECTED_RESPONSE; + _requestRegisters = PZEM017v1_REQUEST_REGISTERS; + break; + } +} /*! * PZEM004Tv30::voltage * * Get line voltage in Volts * * @return current L-N volage*/ @@ -222,28 +246,97 @@ uint8_t PZEM004Tv30::getAddress() * Set power alarm threshold in watts * * @param[in] watts Alamr theshold * * @return success*/ -bool PZEM004Tv30::setPowerAlarm(uint16_t watts) -{ - if (watts > 25000){ // Sanitych check - watts = 25000; - } +// bool PZEM004Tv30::setPowerAlarm(uint16_t watts) +// { +// if (watts > 25000){ // Sanitych check +// watts = 25000; +// } - // Write the watts threshold to the Alarm register - if(!sendCmd8(CMD_WSR, WREG_ALARM_THR, watts, true)) - return false; - return true; -} +// // Write the watts threshold to the Alarm register +// if(!sendCmd8(CMD_WSR, WREG_ALARM_THR, watts, true)) +// return false; +// return true; +// } /*! * PZEM004Tv30::getPowerAlarm * * Is the power alarm set * * * @return arlam triggerd*/ -bool PZEM004Tv30::getPowerAlarm() -{ - if(!updateValues()) // Update vales if necessary - return NAN; // Update did not work, return NAN +// bool PZEM004Tv30::getPowerAlarm() +// { +// if(!updateValues()) // Update vales if necessary +// return NAN; // Update did not work, return NAN + +// return _currentValues.alarms != 0x0000; +// } + + /*! + * PZEM004Tv30::setHighVoltAlarm + * Set HV alarm threshold in volts + * @param[in] volt Alarm theshold + * @return success */ +// bool PZEM004Tv30::setHighvoltAlarm(uint16_t volts) +// { +// if (volts < 500){ // Sanity check +// volts = 500; +// } + +// if (volts > 34999){ // Sanity check +// volts = 34999; +// } + +// // Write the volts threshold to the alarm register +// if(!sendCmd8(CMD_WSR, WREG_HV_ALARM_THR, volts, true)) +// return false; + +// return true; +// } + +/*! + * PZEM004Tv30::setLowVoltAlarm + * Set LV alarm threshold in volts + * @param[in] volt Alarm theshold + * @return success */ +// bool PZEM004Tv30::setLowvoltAlarm(uint16_t volts) +// { +// if (volts < 100){ // Sanity check +// volts = 100; +// } + +// if (volts > 34999){ // Sanity check +// volts = 34999; +// } + +// // Write the volts threshold to the alarm register +// if(!sendCmd8(CMD_WSR, WREG_LV_ALARM_THR, volts, true)) +// return false; + +// return true; +// } + +/*! + * PZEM004Tv30::isHighVoltAlarmOn GET + * Is the HV alarm set + * @return alarm triggerd*/ +// bool PZEM004Tv30::isHighvoltAlarmOn() +// { +// if(!updateValues()) // Update vales if necessary +// return NAN; // Update did not work, return NAN + +// return _currentValues.HVAlarms != 0x0000; +// } + +/*! + * PZEM004Tv30::isLowVoltAlarmOn GET + * Is the LV alarm set + * @return alarm triggerd*/ +// bool PZEM004Tv30::isLowvoltAlarmOn() +// { +// if(!updateValues()) // Update vales if necessary +// return NAN; // Update did not work, return NAN + +// return _currentValues.LVAlarms != 0x0000; +// } - return _currentValues.alarms != 0x0000; -} /*! * PZEM004Tv30::init * * initialization common to all consturctors * @@ -266,52 +359,75 @@ void PZEM004Tv30::init(uint8_t addr){ * @return success*/ bool PZEM004Tv30::updateValues() { - //static uint8_t buffer[] = {0x00, CMD_RIR, 0x00, 0x00, 0x00, 0x0A, 0x00, 0x00}; - static uint8_t response[25]; - // If we read before the update time limit, do not update if(_lastRead + UPDATE_TIME > millis()){ return true; } - // Read 10 registers starting at 0x00 (no check) - sendCmd8(CMD_RIR, 0x00, 0x0A, false); + // Read registers starting at 0x00 (no check) + sendCmd8(CMD_RIR, 0x00, _requestRegisters, false); - if(recieve(response, 25) != 25){ // Something went wrong + if(recieve(_response, _expectedResponse) != _expectedResponse){ // Something went wrong return false; } // Update the current values - _currentValues.voltage = ((uint32_t)response[3] << 8 | // Raw voltage in 0.1V - (uint32_t)response[4])/10.0; + switch(_model) { + case PZEM_model::PZEM004Tv30: + _currentValues.voltage = ((uint32_t)_response[3] << 8 | // Raw voltage in 0.1V + (uint32_t)_response[4]) / 10.0; - _currentValues.current = ((uint32_t)response[5] << 8 | // Raw current in 0.001A - (uint32_t)response[6] | - (uint32_t)response[7] << 24 | - (uint32_t)response[8] << 16) / 1000.0; + _currentValues.current = ((uint32_t)_response[5] << 8 | // Raw current in 0.001A + (uint32_t)_response[6] | + (uint32_t)_response[7] << 24 | + (uint32_t)_response[8] << 16) / 1000.0; - _currentValues.power = ((uint32_t)response[9] << 8 | // Raw power in 0.1W - (uint32_t)response[10] | - (uint32_t)response[11] << 24 | - (uint32_t)response[12] << 16) / 10.0; + _currentValues.power = ((uint32_t)_response[9] << 8 | // Raw power in 0.1W + (uint32_t)_response[10] | + (uint32_t)_response[11] << 24 | + (uint32_t)_response[12] << 16) / 10.0; - _currentValues.energy = ((uint32_t)response[13] << 8 | // Raw Energy in 1Wh - (uint32_t)response[14] | - (uint32_t)response[15] << 24 | - (uint32_t)response[16] << 16) / 1000.0; + _currentValues.energy = ((uint32_t)_response[13] << 8 | // Raw Energy in 1Wh + (uint32_t)_response[14] | + (uint32_t)_response[15] << 24 | + (uint32_t)_response[16] << 16) / 1000.0; - _currentValues.frequeny =((uint32_t)response[17] << 8 | // Raw Frequency in 0.1Hz - (uint32_t)response[18]) / 10.0; + _currentValues.frequeny =((uint32_t)_response[17] << 8 | // Raw Frequency in 0.1Hz + (uint32_t)_response[18]) / 10.0; - _currentValues.pf = ((uint32_t)response[19] << 8 | // Raw pf in 0.01 - (uint32_t)response[20])/100.0; + _currentValues.pf = ((uint32_t)_response[19] << 8 | // Raw pf in 0.01 + (uint32_t)_response[20]) / 100.0; - _currentValues.alarms = ((uint32_t)response[21] << 8 | // Raw alarm value - (uint32_t)response[22]); + _currentValues.alarms = ((uint32_t)_response[21] << 8 | // Raw alarm value + (uint32_t)_response[22]); + break; + case PZEM_model::PZEM017Tv1: + _currentValues.voltage = ((uint32_t)_response[3] << 8 | // Raw voltage in 0.01V + (uint32_t)_response[4]) / 100.0; + _currentValues.current = ((uint32_t)_response[5] << 8 | // Raw voltage in 0.01A + (uint32_t)_response[6]) / 100.0; + + _currentValues.power = ((uint32_t)_response[7] << 8 | // Raw power in 0.1W + (uint32_t)_response[8] | + (uint32_t)_response[9] << 24 | + (uint32_t)_response[10] << 16) / 10.0; + + _currentValues.energy = ((uint32_t)_response[11] << 8 | // Raw Energy in 1Wh + (uint32_t)_response[12] | + (uint32_t)_response[13] << 24 | + (uint32_t)_response[14] << 16) / 1000.0; + + _currentValues.HVAlarms = ((uint32_t)_response[15] << 8 | // Raw alarm value + (uint32_t)_response[16]); + + _currentValues.LVAlarms = ((uint32_t)_response[17] << 8 | // Raw alarm value + (uint32_t)_response[18]); + break; + } // Record current time as _lastRead _lastRead = millis(); diff --git a/lib/PZEM-004T-v30-master/PZEM004Tv30.h b/lib/PZEM-004T-v30-master/PZEM004Tv30.h index 6579b0418..c5a65e9c3 100644 --- a/lib/PZEM-004T-v30-master/PZEM004Tv30.h +++ b/lib/PZEM-004T-v30-master/PZEM004Tv30.h @@ -28,9 +28,20 @@ #include #endif +#define PZEM004Tv30_EXPECTED_RESPONSE 25 +#define PZEM004Tv30_REQUEST_REGISTERS 10 + +#define PZEM017v1_EXPECTED_RESPONSE 21 +#define PZEM017v1_REQUEST_REGISTERS 8 #define PZEM_DEFAULT_ADDR 0xF8 +#define PZEM_MAX_EXPECTED_RESPONSE 25 // PZEM004v30 needs this buffer size, adjust for models that need a bigger buffer + +enum class PZEM_model : uint8_t { + PZEM004Tv30 = 0, // Buffer size 25, request 10 registers + PZEM017Tv1 = 1, // Buffer size 21, request 8 registers +}; class PZEM004Tv30 { @@ -40,6 +51,7 @@ public: #endif ~PZEM004Tv30(); + void setModel(PZEM_model model); // Sets some communication buffer params float voltage(); float current(); @@ -52,8 +64,14 @@ public: bool setAddress(uint8_t addr); uint8_t getAddress(); - bool setPowerAlarm(uint16_t watts); - bool getPowerAlarm(); + // Unused methods: + // bool setPowerAlarm(uint16_t watts); + // bool getPowerAlarm(); + + // bool setHighvoltAlarm(uint16_t volts); //moja uprava + // bool setLowvoltAlarm(uint16_t volts); //moja uprava + // bool isHighvoltAlarmOn(); //upravil som + // bool isLowvoltAlarmOn(); //upravil som bool resetEnergy(); void init(uint8_t addr); // Init common to all constructors @@ -64,15 +82,22 @@ private: bool _isSoft; // Is serial interface software uint8_t _addr; // Device address + PZEM_model _model = PZEM_model::PZEM004Tv30; // Current default + + uint8_t _response[PZEM_MAX_EXPECTED_RESPONSE]; + uint8_t _expectedResponse = PZEM004Tv30_EXPECTED_RESPONSE; + uint8_t _requestRegisters = PZEM004Tv30_REQUEST_REGISTERS; struct { float voltage; float current; float power; float energy; - float frequeny; - float pf; - uint16_t alarms; + float frequeny; // PZEM004 + float pf; // PZEM004 + uint16_t alarms; // PZEM004 + uint16_t HVAlarms; //upravil som PZEM017 + uint16_t LVAlarms; //upravil sOM PZEM017 } _currentValues; // Measured values uint64_t _lastRead; // Last time values were updated diff --git a/src/_P102_PZEM004Tv3.ino b/src/_P102_PZEM004Tv3.ino index 545d5471e..a2fd17e5e 100644 --- a/src/_P102_PZEM004Tv3.ino +++ b/src/_P102_PZEM004Tv3.ino @@ -8,6 +8,8 @@ // /** Changelog: + * 2025-08-05 tonhuisman: Add support for PZEM-017v1 from a forum suggestion: + * https://www.letscontrolit.com/forum/viewtopic.php?p=74069#p74064 * 2025-01-17 tonhuisman: Implement support for MQTT AutoDiscovery (partially) * 2025-01-12 tonhuisman: Add support for MQTT AutoDiscovery (not supported yet for PZEM00x) */ @@ -21,7 +23,7 @@ # define PLUGIN_102 # define PLUGIN_ID_102 102 # define PLUGIN_102_DEBUG true // activate extra log info in the debug -# define PLUGIN_NAME_102 "Energy (AC) - PZEM-004Tv30-Multiple" +# define PLUGIN_NAME_102 "Energy (AC) - PZEM-004Tv30 / PZEM-017v1" # define P102_PZEM_mode PCONFIG(1) // 0=read value ; 1=reset energy; 2=programm address # define P102_PZEM_ADDR PCONFIG(2) @@ -32,6 +34,7 @@ # define P102_QUERY4 PCONFIG(6) # define P102_PZEM_FIRST PCONFIG(7) # define P102_PZEM_ATTEMPT PCONFIG_LONG(1) +# define P102_PZEM_TYPE PCONFIG_LONG(0) # define P102_PZEM_mode_DFLT 0 // Read value # define P102_QUERY1_DFLT 0 // Voltage (V) @@ -44,6 +47,10 @@ # define P102_PZEM_MAX_ATTEMPT 3 // Number of tentative before declaring NAN value +# define P102_PZEM004_VALUE_COUNT 6 +# define P102_PZEM017_VALUE_COUNT 4 + + PZEM004Tv30 * P102_PZEM_sensor = nullptr; boolean Plugin_102_init = false; @@ -56,7 +63,7 @@ const __FlashStringHelper* p102_getQueryString(uint8_t query); boolean Plugin_102(uint8_t function, struct EventStruct *event, String& string) { - boolean success = false; + bool success = false; switch (function) { @@ -126,6 +133,7 @@ boolean Plugin_102(uint8_t function, struct EventStruct *even case PLUGIN_WEBFORM_SHOW_CONFIG: { string += serialHelper_getSerialTypeLabel(event); + string += strformat(F("
    addr: 0x%02x"), P102_PZEM_ADDR); // Show modbus address success = true; break; } @@ -134,14 +142,17 @@ boolean Plugin_102(uint8_t function, struct EventStruct *even { // To select the data in the 4 fields. const __FlashStringHelper *options[P102_NR_OUTPUT_OPTIONS]; + const uint8_t nrOptions = PZEM_model::PZEM004Tv30 == static_cast(P102_PZEM_TYPE) + ? P102_PZEM004_VALUE_COUNT + : P102_PZEM017_VALUE_COUNT; - for (uint8_t i = 0; i < P102_NR_OUTPUT_OPTIONS; ++i) { + for (uint8_t i = 0; i < nrOptions; ++i) { options[i] = p102_getQueryString(i); } for (uint8_t i = 0; i < P102_NR_OUTPUT_VALUES; ++i) { const uint8_t pconfigIndex = i + P102_QUERY1_CONFIG_POS; - sensorTypeHelper_loadOutputSelector(event, pconfigIndex, i, P102_NR_OUTPUT_OPTIONS, options); + sensorTypeHelper_loadOutputSelector(event, pconfigIndex, i, nrOptions, options); } success = true; @@ -149,7 +160,19 @@ boolean Plugin_102(uint8_t function, struct EventStruct *even break; } - case PLUGIN_WEBFORM_LOAD: { + case PLUGIN_WEBFORM_LOAD: + { + { + const __FlashStringHelper*pzemModels[] = { + F("PZEM004Tv30"), + F("PZEM017v1"), + }; + constexpr int pzemCount = NR_ELEMENTS(pzemModels); + FormSelectorOptions selector(pzemCount, pzemModels); + selector.reloadonchange = true; + selector.addFormSelector(F("PZEM Model"), F("pztype"), P102_PZEM_TYPE); + } + if (P102_PZEM_sensor == nullptr) { P102_PZEM_FIRST = event->TaskIndex; // To detect if first PZEM or not } @@ -168,8 +191,8 @@ boolean Plugin_102(uint8_t function, struct EventStruct *even if (P102_PZEM_mode == 2) { - addHtml(F("
    When programming an address, only one PZEMv30 must be connected. " - "Otherwise, all connected PZEMv30s will get the same address, which would cause a conflict during reading.    ")); + addHtml(F("
    When programming an address, only one PZEM must be connected. " + "Otherwise, all connected PZEMs will get the same address, which would cause a conflict during reading.    ")); { const __FlashStringHelper *options_confirm[] = { F("NO"), F("YES") }; constexpr size_t optionCount = NR_ELEMENTS(options_confirm); @@ -182,7 +205,7 @@ boolean Plugin_102(uint8_t function, struct EventStruct *even else { addFormNumericBox(F("Address of PZEM"), F("PZEM_addr"), P102_PZEM_ADDR, 0, 247); - addHtml(F(" Address 0 allows to communicate with any single PZEMv30 whatever its address")); + addHtml(F(" Address 0 allows to communicate with any single PZEM whatever its address")); } if (P102_PZEM_ADDR_SET == 3) // If address programming done @@ -216,7 +239,8 @@ boolean Plugin_102(uint8_t function, struct EventStruct *even break; } - case PLUGIN_WEBFORM_SAVE: { + case PLUGIN_WEBFORM_SAVE: + { serialHelper_webformSave(event); // Save output selector parameters. @@ -225,6 +249,7 @@ boolean Plugin_102(uint8_t function, struct EventStruct *even const uint8_t choice = PCONFIG(pconfigIndex); sensorTypeHelper_saveOutputSelector(event, pconfigIndex, i, p102_getQueryString(choice)); } + P102_PZEM_TYPE = getFormItemInt(F("pztype")); P102_PZEM_mode = getFormItemInt(F("PZEM_mode")); P102_PZEM_ADDR = getFormItemInt(F("PZEM_addr")); P102_PZEM_ADDR_SET = getFormItemInt(F("PZEM_addr_set")); @@ -346,13 +371,18 @@ boolean Plugin_102(uint8_t function, struct EventStruct *even // FIXME TD-er: Calling these functions is probably done within the 200 msec timeout used in the library. // If not, this should be cached in a task data struct. - string += LoRa_addFloat(P102_PZEM_sensor->voltage(), PackedData_int16_1e1); - string += LoRa_addFloat(P102_PZEM_sensor->current(), PackedData_int32_1e3); - string += LoRa_addFloat(P102_PZEM_sensor->power(), PackedData_int32_1e1); - string += LoRa_addFloat(P102_PZEM_sensor->energy(), PackedData_int32_1e1); - string += LoRa_addFloat(P102_PZEM_sensor->pf(), PackedData_uint16_1e2); - string += LoRa_addFloat(P102_PZEM_sensor->frequency() - 40, PackedData_uint8_1e1); - event->Par1 = 6; // valuecount + string += LoRa_addFloat(P102_PZEM_sensor->voltage(), PackedData_int16_1e1); + string += LoRa_addFloat(P102_PZEM_sensor->current(), PackedData_int32_1e3); + string += LoRa_addFloat(P102_PZEM_sensor->power(), PackedData_int32_1e1); + string += LoRa_addFloat(P102_PZEM_sensor->energy(), PackedData_int32_1e1); + + if (PZEM_model::PZEM004Tv30 == static_cast(P102_PZEM_TYPE)) { + string += LoRa_addFloat(P102_PZEM_sensor->pf(), PackedData_uint16_1e2); + string += LoRa_addFloat(P102_PZEM_sensor->frequency() - 40, PackedData_uint8_1e1); + event->Par1 = P102_PZEM004_VALUE_COUNT; // valuecount + } else { + event->Par1 = P102_PZEM017_VALUE_COUNT; // valuecount + } success = true; break; @@ -366,14 +396,10 @@ boolean Plugin_102(uint8_t function, struct EventStruct *even { const String command = parseString(string, 1); - if ((equals(command, F("resetenergy"))) && (P102_PZEM_FIRST == event->TaskIndex)) - { - if ((event->Par1 >= 0) && (event->Par1 <= 247)) - { - P102_PZEM_sensor->init(event->Par1); - P102_PZEM_sensor->resetEnergy(); - success = true; - } + if (equals(command, F("resetenergy")) && (event->Par1 >= 0) && (event->Par1 <= 247)) { + P102_PZEM_sensor->init(event->Par1); + P102_PZEM_sensor->resetEnergy(); + success = true; } } From de5acb32656a2bd9681da6d4077d0862a3781d7e Mon Sep 17 00:00:00 2001 From: Ton Huisman Date: Wed, 6 Aug 2025 15:51:21 +0200 Subject: [PATCH 185/564] [P102] UI updates and corrections --- src/_P102_PZEM004Tv3.ino | 35 ++++++++++++++++++++--------------- 1 file changed, 20 insertions(+), 15 deletions(-) diff --git a/src/_P102_PZEM004Tv3.ino b/src/_P102_PZEM004Tv3.ino index a2fd17e5e..22f431a69 100644 --- a/src/_P102_PZEM004Tv3.ino +++ b/src/_P102_PZEM004Tv3.ino @@ -3,11 +3,12 @@ #ifdef USES_P102 // ####################################################################################################### -// #################################### Plugin 102: PZEM004T v30 with modbus mgt########################## +// ######################## Plugin 102: PZEM004Tv30 / PZEM-017v1 with modbus mgt ######################## // ####################################################################################################### // /** Changelog: + * 2025-08-06 tonhuisman: Change plugin name to "Energy - PZEM-004T (AC) / PZEM-017 (DC)" * 2025-08-05 tonhuisman: Add support for PZEM-017v1 from a forum suggestion: * https://www.letscontrolit.com/forum/viewtopic.php?p=74069#p74064 * 2025-01-17 tonhuisman: Implement support for MQTT AutoDiscovery (partially) @@ -23,7 +24,7 @@ # define PLUGIN_102 # define PLUGIN_ID_102 102 # define PLUGIN_102_DEBUG true // activate extra log info in the debug -# define PLUGIN_NAME_102 "Energy (AC) - PZEM-004Tv30 / PZEM-017v1" +# define PLUGIN_NAME_102 "Energy - PZEM-004T (AC) / PZEM-017 (DC)" # define P102_PZEM_mode PCONFIG(1) // 0=read value ; 1=reset energy; 2=programm address # define P102_PZEM_ADDR PCONFIG(2) @@ -164,8 +165,8 @@ boolean Plugin_102(uint8_t function, struct EventStruct *even { { const __FlashStringHelper*pzemModels[] = { - F("PZEM004Tv30"), - F("PZEM017v1"), + F("PZEM-004Tv30 (AC)"), + F("PZEM-017v1 (DC)"), }; constexpr int pzemCount = NR_ELEMENTS(pzemModels); FormSelectorOptions selector(pzemCount, pzemModels); @@ -183,7 +184,7 @@ boolean Plugin_102(uint8_t function, struct EventStruct *even "don't use HW serial (or invert Tx and Rx to configure as SW serial).    ")); addFormSubHeader(F("PZEM actions")); { - const __FlashStringHelper *options_model[] = { F("Read_value"), F("Reset_Energy"), F("Program_adress") }; + const __FlashStringHelper *options_model[] = { F("Read value"), F("Reset Energy"), F("Program address") }; constexpr size_t optionCount = NR_ELEMENTS(options_model); const FormSelectorOptions selector(optionCount, options_model); selector.addFormSelector(F("PZEM Mode"), F("PZEM_mode"), P102_PZEM_mode); @@ -204,13 +205,13 @@ boolean Plugin_102(uint8_t function, struct EventStruct *even } else { - addFormNumericBox(F("Address of PZEM"), F("PZEM_addr"), P102_PZEM_ADDR, 0, 247); - addHtml(F(" Address 0 allows to communicate with any single PZEM whatever its address")); + addFormNumericBox(F("Address of PZEM"), F("PZEM_addr"), P102_PZEM_ADDR, 0x00, 0xF7); + addHtml(F(" Address 0 allows to communicate with any single PZEM whatever its address")); } if (P102_PZEM_ADDR_SET == 3) // If address programming done { - addHtml(F("
    Address programming done !     ")); + addHtml(F("
    Address programming done !     ")); P102_PZEM_ADDR_SET = 0; // Reset programming confirmation } } @@ -218,23 +219,23 @@ boolean Plugin_102(uint8_t function, struct EventStruct *even { addFormSubHeader(F("PZEM actions")); { - const __FlashStringHelper *options_model[] = { F("Read_value"), F("Reset_Energy") }; + const __FlashStringHelper *options_model[] = { F("Read value"), F("Reset Energy") }; constexpr size_t optionCount = NR_ELEMENTS(options_model); const FormSelectorOptions selector(optionCount, options_model); selector.addFormSelector(F("PZEM Mode"), F("PZEM_mode"), P102_PZEM_mode); } - addHtml(F(" Tx/Rx Pins config disabled: Configuration is available in the first PZEM plugin.
    ")); - addFormNumericBox(F("Address of PZEM"), F("PZEM_addr"), P102_PZEM_ADDR, 1, 247); + addHtml(F(" Tx/Rx Pins config ignored: Configuration is available in the first PZEM plugin.
    ")); + addFormNumericBox(F("Address of PZEM"), F("PZEM_addr"), P102_PZEM_ADDR, 0x01, 0xF7); } - addHtml(F("

    Reset energy can be done also by: http://*espeasyip*/control?cmd=resetenergy,*PZEM address*")); - if (P102_PZEM_ADDR_SET == 4) { addHtml(F("
    Energy reset on current PZEM !     ")); P102_PZEM_ADDR_SET = 0; // Reset programming confirmation } + addFormNote(F("Reset Energy can also be done by: http://*espeasyip*/control?cmd=resetenergy,*PZEM address*")); + success = true; break; } @@ -357,10 +358,14 @@ boolean Plugin_102(uint8_t function, struct EventStruct *even # if FEATURE_PACKED_RAW_DATA case PLUGIN_GET_PACKED_RAW_DATA: { - // Matching JS code: + // Matching JS code for PZEM-004T: // return decode(bytes, [header, int16_1e1, int32_1e3, int32_1e1, int32_1e1, uint16_1e2, uint8_1e1], // ['header', 'voltage', 'current', 'power', 'energy', 'powerfactor', 'frequency']); // + // Matching JS code for PZEM-017: + // return decode(bytes, [header, int16_1e1, int32_1e3, int32_1e1, int32_1e1], + // ['header', 'voltage', 'current', 'power', 'energy']); + // // Resolutions: // Voltage: 0.1V => int16_1e1 (range 80-260V) // Current: 0.001A => int32_1e3 @@ -417,7 +422,7 @@ const __FlashStringHelper* p102_getQueryString(uint8_t query) { case 2: return F("Power_W"); case 3: return F("Energy_kWh"); case 4: return F("Power_Factor_cosphi"); - case 5: return F("Frequency Hz"); + case 5: return F("Frequency_Hz"); } return F(""); } From 98db7e78bf334e39913cf9447ef15a6012a83b1d Mon Sep 17 00:00:00 2001 From: Ton Huisman Date: Wed, 6 Aug 2025 15:51:40 +0200 Subject: [PATCH 186/564] [P102] Add documentation --- docs/source/Plugin/P102.rst | 217 +++++++++++++++++- .../Plugin/P102_DeviceConfiguration.png | Bin 0 -> 83858 bytes docs/source/Plugin/P102_ProgramAddress.png | Bin 0 -> 20505 bytes docs/source/Plugin/P102_ResetEnergyDone.png | Bin 0 -> 13403 bytes .../Plugin/P102_SecondConfiguration.png | Bin 0 -> 18325 bytes docs/source/Plugin/P102_commands.repl | 15 ++ docs/source/Plugin/_plugin_categories.repl | 4 +- .../Plugin/_plugin_substitutions_p10x.repl | 10 +- 8 files changed, 238 insertions(+), 8 deletions(-) create mode 100644 docs/source/Plugin/P102_DeviceConfiguration.png create mode 100644 docs/source/Plugin/P102_ProgramAddress.png create mode 100644 docs/source/Plugin/P102_ResetEnergyDone.png create mode 100644 docs/source/Plugin/P102_SecondConfiguration.png create mode 100644 docs/source/Plugin/P102_commands.repl diff --git a/docs/source/Plugin/P102.rst b/docs/source/Plugin/P102.rst index 12030e886..9d93c1dfb 100644 --- a/docs/source/Plugin/P102.rst +++ b/docs/source/Plugin/P102.rst @@ -24,7 +24,7 @@ Used libraries: |P102_usedlibraries| Description ----------- -PZEM-004T V3.0 or Version 3.0 is the upgraded version to replace the old PZEM004T V1.0. +PZEM-004T (AC) V3.0 or Version 3.0 is the upgraded version to replace the old PZEM004T V1.0. The old version has been sold out in most of the online store and is no longer being produced. Improvements over V1: @@ -99,18 +99,231 @@ Active Energy * Resolution: 1Wh * Measurement accuracy: 0.5% +Description +----------- + +PZEM-017 v1.0/v2.0 (DC) For measuring DC loads. When the voltage is below 7V, an independent (**not from PC USB port!**) USB powersupply should be used on the USB input connector. + +Specifications +-------------- + +Voltage +^^^^^^^ + +* Measuring range: 0.05 - 300V +* Resolution: 0.01V +* Measurement accuracy: 1% + +Current +^^^^^^^ + +* Measuring range: + + * 0.02 - 50/100/200/300A(Depending on shunt) + +* Resolution: 0.01A + +* Measurement accuracy: 1% + + +Active power +^^^^^^^^^^^^ + +* Measuring range: + + * 0.2 - 90kW(Depending on shunt) + +* Starting measure power: 0.2W +* Resolution: 0.1W +* Measurement accuracy: 1% + + +Active Energy +^^^^^^^^^^^^^ + +* Measuring range: 0 - 9999.99kWh +* Resolution: 1Wh +* Measurement accuracy: 1% + +Installation and configuration +------------------------------ + +When installing multiple PZEM devices on a single ESP unit, some specific order of configuration is required to be able to correctly configure a second, third, etc. PZEM. + +This is described below, in the :cyan:`Installing multiple PZEM units on a single ESP` paragraph. + +Configuration +------------- + +.. image:: P102_DeviceConfiguration.png + +Task Settings +^^^^^^^^^^^^^ + +* **Name**: Required by ESPEasy, must be unique among the list of available devices/tasks. + +* **Enabled**: The device can be disabled or enabled. When not enabled the device should not use any resources. + Sensor ^^^^^^ See: :ref:`SerialHelper_page` +Device Settings +^^^^^^^^^^^^^^^ + +* **PZEM Model**: Select the PZEM model that is to be handled by this task. (For changing the Address the model doesn't matter as they use the same command.) + +Available options: + +* *PZEM-004Tv30 (AC)*: The AC model, and default setting. +* *PZEM-017v1 (DC)*: The DC model. Also compatible with later v2/2.0 models. + +For reading the correct values from a PZEM-017, that Model *must* be selected as it uses a different data format to fetch the results. + +PZEM Actions +^^^^^^^^^^^^ + +* **PZEM Mode**: By default, the ``Read value`` option is selected. + +Available options: + +* *Read value*: Normal operating mode, for reading the configured values from the PZEM. +* *Reset Energy*: For resetting the counted total energy, this option can be selected. See below for a description. +* *Program address*: Only available on the *first* PZEM device, for changing the PZEM unit MODBUS address, as described below. + +| + +* **Address of PZEM**: Set to the address of the PZEM unit to be used. When only a single device is connected, can be set to 0, as a sort of 'universal' address. + +Available address range for the *first* PZEM device: 0 .. 247, on subsequent PZEM devices: 1 .. 247. + +Output Configuration +^^^^^^^^^^^^^^^^^^^^ + +For all 4 available Values slots for this task, a value to use can be selected here. The available options depend om the **PZEM Model** setting: + +* *Voltage_V* +* *Current_A* +* *Power_W* +* *Energy_kWh* +* *Power_Factor_cosphi*: for ``PZEM-004Tv30 (AC)`` only. +* *Frequency_Hz*: for ``PZEM-004Tv30 (AC)`` only. + .. include:: DataAcquisition.repl +* **Interval**: By default, Interval will be set to 60 sec for this plugin. It is the frequency used to read sensor values and send these to any Controllers configured for this device. + +Values +^^^^^^ + +The measured values are configured above, and get their names based on the selection made there. + +For a complete description of all available columns see the `Plugin - Values <_Plugin.html#values>`_ section. + +| + + .. Events .. ~~~~~~ .. .. include:: P102_events.repl +Resetting the Energy counter +---------------------------- + +For resetting the counted Energy value in the PZEM unit, there are 2 methods: + +1. Use the *Reset Energy* **PZEM Mode** setting. +2. Send the command ``resetenergy,`` to the ESP unit. This can be done via the Command entry on the Tools page, from Rules, or via a url command as shown in the configuration page. + +Use the *Reset Energy* **PZEM Mode** setting +^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ + +For resetting the incrementing Energy counter in the PZEM unit, this PZEM Mode option can be used. + +* Set **PZEM Mode** to ``Reset Energy``, and :cyan:`Submit` the page. + +The command will be executed immediately, and afterward the status will shown: + +.. image:: P102_ResetEnergyDone.png + +The blue message showing that the command was sent. The **PZEM Mode** is already reset to ``Read value``. + +Installing multiple PZEM units on a single ESP +---------------------------------------------- + +Configuring separate MODBUS addresses on each device +^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ + +To uniquely identify each PZEM unit on the bus, it has to be configured to use a unique address. The range of these addresses is 1 .. 247. + +* Add the, numerically, first PZEM task, f.e. in Devices slot 1. + +* Configure the serial port, and on ESP32 also the GPIO pins, to be used, enable the plugin, and connect a single PZEM to the RS485 converter. When using ``HW Serial0``, the Serial Console Settings, on the Tools/Advanced page, have to be disabled to avoid issues with his port. + +* Set **PZEM Mode** to ``Program address`` and :cyan:`Submit` the page. + +.. image:: P102_ProgramAddress.png + +Fill the desired address in the **Address of PZEM** field, change the **Confirm address programming ?** field to ``YES``, and again :cyan:`Submit` the page. + +When successful, a message :green:`Address programming done !` is displayed, and the **PZEM Mode** is set to the default ``Read value`` setting. + +* Disconnect the PZEM unit from the RS485 bus, connect the next PZEM unit, and repeat above steps, using a diferent **Address of PZEM** value, for all units to be connected. + +N.B.: The last set Address of PZEM will be kept in the configuration, but can be changed to the desired first PZEM unit. + +N.B.2: To correctly store the **PZEM Mode** setting, the configuration should be saved once more, using the :cyan:`Submit` button! + +Configuring a secondary PZEM unit +^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ + +The first PZEM unit can be configured as shown above in the generic Configuration paragraph. Once thats completed, with the correct, unique, MODBUS Address set, both in all PZEM units to connect and the task configuration for the first PZEM task, that task should be Enabled, so the next task added can detect that it will be the second (or third, etc.) device on the MODBUS chain. + +After that task is running, a new PZEM task can be added, with a task number higher than the *first* PZEM task. + +.. warning:: This is crucial for the PZEM tasks to start correctly, and in the correct order, on reboot or power-up of the ESP! + +These secondary PZEM tasks do not use the Serial configuration, as they use the same connection as the *first* PZEM task. + +.. image:: P102_SecondConfiguration.png + +Sensor +^^^^^^ + +This selector should not be used, as it is ignored. + +Device Settings +^^^^^^^^^^^^^^^ + +* **PZEM Model**: Select the PZEM model that is to be handled by this task. (Changing the selection will save the new setting and reload the page.) + +For reading the correct values from a PZEM-017, that Model *must* be selected as it uses a different data format to fetch the results. + +PZEM Actions +^^^^^^^^^^^^ + +* **PZEM Mode**: By default, the ``Read value`` option is selected. + +Available options: + +* *Read value*: Normal operating mode, for reading the configured values from the PZEM. +* *Reset Energy*: For resetting the counted total energy, this option can be selected. See above for a description. + +* **Address of PZEM**: Set to the address of the PZEM unit to be used. + +Available address range: 1 .. 247. + +When using the same address as the *first* PZEM task, and the **PZEM Model** connected is a ``PZEM-004Tv30 (AC)``, the extra values ``Power_Factor_cosphi`` and ``Frequency_Hz`` can be made available in a task, for sending to a controller. + +| + +Commands +-------- + +.. include:: P102_commands.repl + Change log @@ -119,4 +332,6 @@ Change log .. versionchanged:: 2.0 ... + |added| 2025-08-06: Support for PZEM-017, updated documentation. + |added| 2020-04-25 diff --git a/docs/source/Plugin/P102_DeviceConfiguration.png b/docs/source/Plugin/P102_DeviceConfiguration.png new file mode 100644 index 0000000000000000000000000000000000000000..95b8c81d4a8352653b57ecab60a43cd9fd657275 GIT binary patch literal 83858 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 H=m-A-P=^vE literal 0 HcmV?d00001 diff --git a/docs/source/Plugin/P102_ResetEnergyDone.png b/docs/source/Plugin/P102_ResetEnergyDone.png new file mode 100644 index 0000000000000000000000000000000000000000..c5d3f366e5c07379dde01d67a5549bd3b03d3b57 GIT binary patch literal 13403 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 J+wVsHopavv=aWmX+}!tk+su4t=KGns^YjkL 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 Date: Fri, 8 Aug 2025 10:15:05 +0200 Subject: [PATCH 187/564] [P102] Small typo in documentation --- docs/source/Plugin/P102_commands.repl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/source/Plugin/P102_commands.repl b/docs/source/Plugin/P102_commands.repl index f8d8a7f35..caac65d7e 100644 --- a/docs/source/Plugin/P102_commands.repl +++ b/docs/source/Plugin/P102_commands.repl @@ -4,7 +4,7 @@ " - | ``ResetEnergy,`` "," From ea1121f8330b26cb4212ccc76bc27af482858248 Mon Sep 17 00:00:00 2001 From: TD-er Date: Sun, 10 Aug 2025 01:14:47 +0200 Subject: [PATCH 188/564] [Network] Cleanup + add charts for RSSI/TX-pwr, traffic, etc. --- .../net/DataStructs/NWPluginData_base.cpp | 278 +++++++++++++++++- .../net/DataStructs/NWPluginData_base.h | 83 +++++- .../NWPluginData_static_runtime_ESP32.cpp | 18 +- src/ESPEasy/net/DataTypes/NetworkIndex.cpp | 3 +- src/ESPEasy/net/DataTypes/NetworkIndex.h | 5 +- src/ESPEasy/net/Globals/NWPlugins.cpp | 37 ++- .../NW001_data_struct_WiFi_STA.cpp | 80 +++++ .../NW001_data_struct_WiFi_STA.h | 18 +- .../NW005_data_struct_PPP_modem.cpp | 67 +++++ .../NW005_data_struct_PPP_modem.h | 33 ++- src/ESPEasy/net/_NW001_WiFi_STA.cpp | 1 + src/ESPEasy/net/_NWPlugin_Helper.cpp | 5 + .../net/wifi/ESPEasyWiFi_state_machine.cpp | 124 ++++++-- .../net/wifi/ESPEasyWiFi_state_machine.h | 2 + src/ESPEasy/net/wifi/ESPEasyWifi.cpp | 13 +- src/ESPEasy/net/wifi/ESPEasyWifi.h | 1 + .../net/wifi/ESPEasyWifi_ProcessEvent.cpp | 2 +- src/ESPEasy/net/wifi/ESPEasyWifi_abstracted.h | 2 + .../net/wifi/ESPEasyWifi_abstracted_ESP32.cpp | 43 ++- .../wifi/ESPEasyWifi_abstracted_ESP8266.cpp | 2 + src/_Plugin_Helper.cpp | 2 +- src/src/DataStructs/ESPEasy_EventStruct.h | 78 +++-- src/src/DataStructs/PluginStats_array.cpp | 135 +++++---- src/src/DataStructs/PluginStats_array.h | 20 +- src/src/DataStructs/PluginTaskData_base.cpp | 4 +- src/src/DataStructs/PluginTaskData_base.h | 2 +- src/src/DataTypes/ESPEasy_plugin_functions.h | 4 + src/src/Helpers/ESPEasy_Storage.cpp | 2 +- src/src/Helpers/ESPEasy_time.cpp | 12 + src/src/Helpers/PeriodicalActions.cpp | 11 +- src/src/WebServer/NetworkPage.cpp | 60 +++- 31 files changed, 941 insertions(+), 206 deletions(-) diff --git a/src/ESPEasy/net/DataStructs/NWPluginData_base.cpp b/src/ESPEasy/net/DataStructs/NWPluginData_base.cpp index 4241f29c2..d8dd2bd1f 100644 --- a/src/ESPEasy/net/DataStructs/NWPluginData_base.cpp +++ b/src/ESPEasy/net/DataStructs/NWPluginData_base.cpp @@ -1,6 +1,6 @@ #include "../DataStructs/NWPluginData_base.h" - +#include "../../../src/DataStructs/ESPEasy_EventStruct.h" #include "../../../src/Globals/RuntimeData.h" #include "../../../src/Globals/Settings.h" #include "../../../src/Helpers/StringConverter.h" @@ -60,6 +60,10 @@ NWPluginData_base::NWPluginData_base( , NetworkInterface *netif #endif ) : +#if FEATURE_PLUGIN_STATS + _plugin_stats_array(nullptr), +#endif // if FEATURE_PLUGIN_STATS + #if FEATURE_STORE_NETWORK_INTERFACE_SETTINGS _kvs(nullptr), #endif @@ -71,16 +75,19 @@ NWPluginData_base::NWPluginData_base( #endif { #ifdef ESP32 - const int key = esp_netif_get_netif_impl_index(_netif->netif()); + const int key = _netif->impl_index(); interfaceTrafficCount[key].clear(); - static bool registered_IP_EVENT_TX_RX = false; - esp_netif_tx_rx_event_enable(_netif->netif()); - if (!registered_IP_EVENT_TX_RX) { - esp_event_handler_register(IP_EVENT, IP_EVENT_TX_RX, &tx_rx_event_handler, NULL); - registered_IP_EVENT_TX_RX = true; + if (_netif->netif()) { + static bool registered_IP_EVENT_TX_RX = false; + esp_netif_tx_rx_event_enable(_netif->netif()); + + if (!registered_IP_EVENT_TX_RX) { + esp_event_handler_register(IP_EVENT, IP_EVENT_TX_RX, &tx_rx_event_handler, NULL); + registered_IP_EVENT_TX_RX = true; + } + esp_netif_tx_rx_event_enable(_netif->netif()); } - esp_netif_tx_rx_event_enable(_netif->netif()); // _netif->netif()->tx_rx_events_enabled = true; @@ -95,9 +102,17 @@ NWPluginData_base::NWPluginData_base( NWPluginData_base::~NWPluginData_base() { +#if FEATURE_PLUGIN_STATS + delete _plugin_stats_array; + _plugin_stats_array = nullptr; +#endif // if FEATURE_PLUGIN_STATS + #ifdef ESP32 - esp_netif_tx_rx_event_disable(_netif->netif()); - const int key = esp_netif_get_netif_impl_index(_netif->netif()); + + if (_netif->netif()) { + esp_netif_tx_rx_event_disable(_netif->netif()); + } + const int key = _netif->impl_index(); auto it = interfaceTrafficCount.find(key); if (it != interfaceTrafficCount.end()) { interfaceTrafficCount.erase(it); } @@ -109,8 +124,226 @@ NWPluginData_base::~NWPluginData_base() #endif // if FEATURE_STORE_NETWORK_INTERFACE_SETTINGS } +bool NWPluginData_base::hasPluginStats() const { +#if FEATURE_PLUGIN_STATS + + if (_plugin_stats_array != nullptr) { + return _plugin_stats_array->hasStats(); + } +#endif // if FEATURE_PLUGIN_STATS + return false; +} + +bool NWPluginData_base::hasPeaks() const { +#if FEATURE_PLUGIN_STATS + + if (_plugin_stats_array != nullptr) { + return _plugin_stats_array->hasPeaks(); + } +#endif // if FEATURE_PLUGIN_STATS + return false; +} + +size_t NWPluginData_base::nrSamplesPresent() const { +#if FEATURE_PLUGIN_STATS + + if (_plugin_stats_array != nullptr) { + return _plugin_stats_array->nrSamplesPresent(); + } +#endif // if FEATURE_PLUGIN_STATS + return 0; +} + +#if FEATURE_PLUGIN_STATS + +void NWPluginData_base::initPluginStats( + networkStatsVarIndex_t networkStatsVarIndex, + const String & label, + uint8_t nrDecimals, + float errorValue, + const PluginStats_Config_t& displayConfig) +{ + if (networkStatsVarIndex < INVALID_NETWORK_STATS_VAR_INDEX) { + if (_plugin_stats_array == nullptr) { + constexpr unsigned size = sizeof(PluginStats_array); + void *ptr = special_calloc(1, size); + + if (ptr != nullptr) { + _plugin_stats_array = new (ptr) PluginStats_array(); + } + } + + if (_plugin_stats_array != nullptr) { + _plugin_stats_array->initPluginStats( + networkStatsVarIndex, + label, + nrDecimals, + errorValue, + displayConfig); + } + } +} + +# ifdef ESP32 + +void NWPluginData_base::initPluginStats_trafficCount(networkStatsVarIndex_t networkStatsVarIndex, bool isTX) +{ + PluginStats_Config_t displayConfig; + + displayConfig.setAxisPosition(PluginStats_Config_t::AxisPosition::Left); + displayConfig.setEnabled(true); + displayConfig.setAxisIndex(3); // Set to a fixed index so RX/TX are on the same axis index + initPluginStats( + networkStatsVarIndex, + isTX ? F("TX") : F("RX"), + 0, + NAN, + displayConfig); +} + +# endif // ifdef ESP32 + +bool NWPluginData_base::initPluginStats() +{ +# ifdef ESP32 + initPluginStats_trafficCount(0, true); // TX + initPluginStats_trafficCount(1, false); // RX + return true; +# else // ifdef ESP32 + return false; +# endif // ifdef ESP32 +} + +void NWPluginData_base::clearPluginStats(networkStatsVarIndex_t networkStatsVarIndex) +{ + if ((networkStatsVarIndex < INVALID_NETWORK_STATS_VAR_INDEX) && _plugin_stats_array) { + _plugin_stats_array->clearPluginStats(networkStatsVarIndex); + + if (!_plugin_stats_array->hasStats()) { + delete _plugin_stats_array; + _plugin_stats_array = nullptr; + } + } +} + +void NWPluginData_base::processTimeSet(const double& time_offset) +{ + if (_plugin_stats_array != nullptr) { + _plugin_stats_array->processTimeSet(time_offset); + } +} + +#endif // if FEATURE_PLUGIN_STATS + +bool NWPluginData_base::pushStatsValues(EventStruct *event, + size_t valueCount, + bool trackPeaks, + bool onlyUpdateTimestampWhenSame) +{ +#if FEATURE_PLUGIN_STATS + + if (_plugin_stats_array != nullptr) { +# ifdef ESP32 + + // Include traffic + uint64_t tx{}; + uint64_t rx{}; + + if (getTrafficCount(tx, rx)) { + // Only set value when _prevRX/TX was set to make sure there isn't an enormous spike + event->ParfN[valueCount++] = _prevTX == 0 ? 0 : tx - _prevTX; + event->ParfN[valueCount++] = _prevRX == 0 ? 0 : rx - _prevRX; + _prevRX = rx; + _prevTX = tx; + } +# endif // ifdef ESP32 + + if (valueCount) { + return _plugin_stats_array->pushStatsValues(event, valueCount, trackPeaks, onlyUpdateTimestampWhenSame); + } + } +#endif // if FEATURE_PLUGIN_STATS + return false; +} + bool NWPluginData_base::plugin_write_base(EventStruct *event, - const String& string) { return false; } + const String& string) +{ +#if FEATURE_PLUGIN_STATS + + if (_plugin_stats_array != nullptr) { + return _plugin_stats_array->plugin_write_base(event, string); + } +#endif // if FEATURE_PLUGIN_STATS + + return false; +} + +#if FEATURE_PLUGIN_STATS + +bool NWPluginData_base::record_stats() +{ + if (_plugin_stats_array != nullptr) { + # ifdef ESP32 + + EventStruct tmpEvent; + size_t valueCount{}; + bool trackPeaks = true; + bool onlyUpdateTimestampWhenSame = true; + return pushStatsValues(&tmpEvent, valueCount, trackPeaks, onlyUpdateTimestampWhenSame); +# endif // ifdef ESP32 + } + return false; +} + +bool NWPluginData_base::webformLoad_show_stats(EventStruct *event) const +{ + if (_plugin_stats_array != nullptr) { + return _plugin_stats_array->webformLoad_show_stats(event); + } + return false; +} + +# if FEATURE_CHART_JS + +void NWPluginData_base::plot_ChartJS(bool onlyJSON) const +{ + if (_plugin_stats_array != nullptr) { + _plugin_stats_array->plot_ChartJS(onlyJSON); + } +} + +void NWPluginData_base::plot_ChartJS_scatter( + networkStatsVarIndex_t values_X_axis_index, + networkStatsVarIndex_t values_Y_axis_index, + const __FlashStringHelper *id, + const ChartJS_title & chartTitle, + const ChartJS_dataset_config& datasetConfig, + int width, + int height, + bool showAverage, + const String & options, + bool onlyJSON) const +{ + if (_plugin_stats_array != nullptr) { + // TODO TD-er: Show TX-power vs. RSSI as scatter plot + _plugin_stats_array->plot_ChartJS_scatter( + values_X_axis_index, + values_Y_axis_index, + id, + chartTitle, + datasetConfig, + width, + height, + showAverage, + options, + onlyJSON); + } +} + +# endif // if FEATURE_CHART_JS +#endif // if FEATURE_PLUGIN_STATS + #if FEATURE_STORE_NETWORK_INTERFACE_SETTINGS @@ -148,7 +381,7 @@ bool NWPluginData_base::handle_priority_route_changed() if ((cache._dns_cache[i] != INADDR_NONE) && (cache._dns_cache[i] != tmp)) { addLog(LOG_LEVEL_INFO, strformat( F("%s: Restore cached DNS server %d from %s to %s"), - esp_netif_get_desc(_netif->netif()), + _netif->desc(), i, tmp.toString().c_str(), cache._dns_cache[i].toString().c_str() @@ -164,7 +397,7 @@ bool NWPluginData_base::handle_priority_route_changed() bool NWPluginData_base::getTrafficCount(uint64_t& tx, uint64_t& rx) const { - const int key = esp_netif_get_netif_impl_index(_netif->netif()); + const int key = _netif->impl_index(); auto it = interfaceTrafficCount.find(key); if (it == interfaceTrafficCount.end()) { return false; } @@ -175,6 +408,25 @@ bool NWPluginData_base::getTrafficCount(uint64_t& tx, uint64_t& rx) const #endif // ifdef ESP32 +#if FEATURE_PLUGIN_STATS + +PluginStats * NWPluginData_base::getPluginStats(networkStatsVarIndex_t networkStatsVarIndex) const +{ + if (_plugin_stats_array != nullptr) { + return _plugin_stats_array->getPluginStats(networkStatsVarIndex); + } + return nullptr; +} + +PluginStats * NWPluginData_base::getPluginStats(networkStatsVarIndex_t networkStatsVarIndex) +{ + if (_plugin_stats_array != nullptr) { + return _plugin_stats_array->getPluginStats(networkStatsVarIndex); + } + return nullptr; +} + +#endif // if FEATURE_PLUGIN_STATS #ifdef ESP32 diff --git a/src/ESPEasy/net/DataStructs/NWPluginData_base.h b/src/ESPEasy/net/DataStructs/NWPluginData_base.h index 9c9d6b4e5..38c3d16aa 100644 --- a/src/ESPEasy/net/DataStructs/NWPluginData_base.h +++ b/src/ESPEasy/net/DataStructs/NWPluginData_base.h @@ -2,11 +2,11 @@ #include "../../../ESPEasy_common.h" - #include "../DataTypes/NWPluginID.h" #include "../DataTypes/NetworkIndex.h" -#include "../../../src/DataStructs/ESPEasy_EventStruct.h" #include "../DataStructs/NWPluginData_static_runtime.h" +#include "../../../src/DataStructs/ESPEasy_EventStruct.h" +#include "../../../src/DataStructs/PluginStats_array.h" #if FEATURE_STORE_NETWORK_INTERFACE_SETTINGS # include "../../../src/Helpers/_ESPEasy_key_value_store.h" @@ -42,8 +42,52 @@ struct NWPluginData_base { return _baseClassOnly; } - bool plugin_write_base(EventStruct *event, - const String& string); + bool hasPluginStats() const; + + bool hasPeaks() const; + + size_t nrSamplesPresent() const; + + #if FEATURE_PLUGIN_STATS + virtual bool initPluginStats(); + + void clearPluginStats(networkStatsVarIndex_t networkStatsVarIndex); + + // Update any logged timestamp with this newly set system time. + void processTimeSet(const double& time_offset); + #endif // if FEATURE_PLUGIN_STATS + + + bool pushStatsValues(EventStruct *event, + size_t valueCount, + bool trackPeaks, + bool onlyUpdateTimestampWhenSame); + + + bool plugin_write_base(EventStruct *event, + const String & string); + +#if FEATURE_PLUGIN_STATS + virtual bool record_stats(); + virtual bool webformLoad_show_stats(EventStruct *event) const; + +# if FEATURE_CHART_JS + void plot_ChartJS(bool onlyJSON = false) const; + + void plot_ChartJS_scatter( + networkStatsVarIndex_t values_X_axis_index, + networkStatsVarIndex_t values_Y_axis_index, + const __FlashStringHelper *id, + const ChartJS_title & chartTitle, + const ChartJS_dataset_config& datasetConfig, + int width, + int height, + bool showAverage = true, + const String & options = EMPTY_STRING, + bool onlyJSON = false) const; + +# endif // if FEATURE_CHART_JS +#endif // if FEATURE_PLUGIN_STATS // Should only be called from initNWPluginData @@ -63,6 +107,31 @@ struct NWPluginData_base { virtual NWPluginData_static_runtime& getNWPluginData_static_runtime() = 0; + +#if FEATURE_PLUGIN_STATS + + PluginStats* getPluginStats(networkStatsVarIndex_t networkStatsVarIndex) const; + + PluginStats* getPluginStats(networkStatsVarIndex_t networkStatsVarIndex); + +protected: + + void initPluginStats( + networkStatsVarIndex_t networkStatsVarIndex, + const String & label, + uint8_t nrDecimals, + float errorValue, + const PluginStats_Config_t& displayConfig); + +#ifdef ESP32 +void initPluginStats_trafficCount(networkStatsVarIndex_t networkStatsVarIndex, bool isTX); +#endif + + + // Array of pointers to PluginStats. One per task value. + PluginStats_array *_plugin_stats_array = nullptr; +#endif // if FEATURE_PLUGIN_STATS + protected: #ifdef ESP32 @@ -97,7 +166,11 @@ protected: #ifdef ESP32 NetworkInterface *_netif{}; -#endif +# if FEATURE_PLUGIN_STATS + uint64_t _prevTX{}; + uint64_t _prevRX{}; +# endif // if FEATURE_PLUGIN_STATS +#endif // ifdef ESP32 }; diff --git a/src/ESPEasy/net/DataStructs/NWPluginData_static_runtime_ESP32.cpp b/src/ESPEasy/net/DataStructs/NWPluginData_static_runtime_ESP32.cpp index 04c772254..985ec6bf6 100644 --- a/src/ESPEasy/net/DataStructs/NWPluginData_static_runtime_ESP32.cpp +++ b/src/ESPEasy/net/DataStructs/NWPluginData_static_runtime_ESP32.cpp @@ -56,7 +56,7 @@ void NWPluginData_static_runtime::mark_start() if (loglevelActiveFor(LOG_LEVEL_INFO)) { addLog(LOG_LEVEL_INFO, strformat( F("%s: Started"), - esp_netif_get_desc(_netif->netif()))); + _netif->desc())); } } @@ -67,7 +67,7 @@ void NWPluginData_static_runtime::mark_stop() if (_netif && loglevelActiveFor(LOG_LEVEL_INFO)) { addLog(LOG_LEVEL_INFO, strformat( F("%s: Stopped"), - esp_netif_get_desc(_netif->netif()))); + _netif->desc())); } } @@ -90,7 +90,7 @@ void NWPluginData_static_runtime::mark_got_IP() if ((tmp != INADDR_NONE) && loglevelActiveFor(LOG_LEVEL_INFO)) { addLog(LOG_LEVEL_INFO, strformat( F("%s: DNS Cache %d set to %s"), - esp_netif_get_desc(_netif->netif()), + _netif->desc(), i, tmp.toString(true).c_str())); } @@ -99,7 +99,7 @@ void NWPluginData_static_runtime::mark_got_IP() if (loglevelActiveFor(LOG_LEVEL_INFO)) { addLog(LOG_LEVEL_INFO, strformat( F("%s: Got IP: %s"), - esp_netif_get_desc(_netif->netif()), + _netif->desc(), _netif->localIP().toString().c_str() )); } @@ -121,7 +121,7 @@ void NWPluginData_static_runtime::mark_got_IPv6() if (loglevelActiveFor(LOG_LEVEL_INFO)) { addLog(LOG_LEVEL_INFO, strformat( F("%s: Got IPv6"), - esp_netif_get_desc(_netif->netif()))); + _netif->desc())); } } @@ -138,7 +138,7 @@ void NWPluginData_static_runtime::mark_lost_IP() if (_netif && loglevelActiveFor(LOG_LEVEL_INFO)) { addLog(LOG_LEVEL_INFO, strformat( F("%s: Lost IP"), - esp_netif_get_desc(_netif->netif()))); + _netif->desc())); } } @@ -159,14 +159,14 @@ void NWPluginData_static_runtime::mark_connected() if (logDuration) { addLog(LOG_LEVEL_INFO, strformat( F("%s: Connected, took: %s in %d attempts"), - esp_netif_get_desc(_netif->netif()), + _netif->desc(), format_msec_duration_HMS( _establishConnectStats.getLastOnDuration_ms()).c_str(), _establishConnectStats.getCycleCount())); } else { addLog(LOG_LEVEL_INFO, strformat( F("%s: Connected"), - esp_netif_get_desc(_netif->netif()))); + _netif->desc())); } _establishConnectStats.resetCount(); } @@ -180,7 +180,7 @@ void NWPluginData_static_runtime::mark_disconnected() if (_netif && loglevelActiveFor(LOG_LEVEL_INFO)) { addLog(LOG_LEVEL_INFO, strformat( F("%s: Disconnected. Connected for: %s"), - esp_netif_get_desc(_netif->netif()), + _netif->desc(), format_msec_duration_HMS( _connectedStats.getLastOnDuration_ms()).c_str())); } diff --git a/src/ESPEasy/net/DataTypes/NetworkIndex.cpp b/src/ESPEasy/net/DataTypes/NetworkIndex.cpp index 977e968d6..3a8ff57bf 100644 --- a/src/ESPEasy/net/DataTypes/NetworkIndex.cpp +++ b/src/ESPEasy/net/DataTypes/NetworkIndex.cpp @@ -5,7 +5,8 @@ namespace ESPEasy { namespace net { -networkIndex_t INVALID_NETWORK_INDEX = NETWORK_MAX; +const networkIndex_t INVALID_NETWORK_INDEX = NETWORK_MAX; +const networkStatsVarIndex_t INVALID_NETWORK_STATS_VAR_INDEX = 4; // TODO TD-er: Must see how much values we have to record } // namespace net } // namespace ESPEasy diff --git a/src/ESPEasy/net/DataTypes/NetworkIndex.h b/src/ESPEasy/net/DataTypes/NetworkIndex.h index f9009649e..6219ac0aa 100644 --- a/src/ESPEasy/net/DataTypes/NetworkIndex.h +++ b/src/ESPEasy/net/DataTypes/NetworkIndex.h @@ -6,8 +6,11 @@ namespace ESPEasy { namespace net { typedef uint8_t networkIndex_t; +typedef uint16_t networkStatsVarIndex_t; -extern networkIndex_t INVALID_NETWORK_INDEX; + +extern const networkIndex_t INVALID_NETWORK_INDEX; +extern const networkStatsVarIndex_t INVALID_NETWORK_STATS_VAR_INDEX; } // namespace net } // namespace ESPEasy diff --git a/src/ESPEasy/net/Globals/NWPlugins.cpp b/src/ESPEasy/net/Globals/NWPlugins.cpp index eedb1ef87..2309610df 100644 --- a/src/ESPEasy/net/Globals/NWPlugins.cpp +++ b/src/ESPEasy/net/Globals/NWPlugins.cpp @@ -13,7 +13,7 @@ namespace ESPEasy { namespace net { -# define NETWORK_INDEX_WIFI_STA 0 // Always the first network index +#define NETWORK_INDEX_WIFI_STA 0 // Always the first network index bool NWPluginCall(NWPlugin::Function Function, EventStruct *event) { #ifdef USE_SECOND_HEAP @@ -101,13 +101,18 @@ bool NWPluginCall(NWPlugin::Function Function, EventStruct *event, String& str) return success; } - // calls to specific network's NWPluginData_base (must be enabled) + // calls to specific network's NWPluginData_base (must be enabled) #ifdef ESP32 case NWPlugin::Function::NWPLUGIN_GET_TRAFFIC_COUNT: #endif // ifdef ESP32 +#if FEATURE_PLUGIN_STATS + case NWPlugin::Function::NWPLUGIN_RECORD_STATS: + case NWPlugin::Function::NWPLUGIN_WEBFORM_LOAD_SHOW_STATS: +#endif // if FEATURE_PLUGIN_STATS case NWPlugin::Function::NWPLUGIN_GET_CONNECTED_DURATION: { bool success = false; + if (!validNetworkIndex(event->NetworkIndex) || !Settings.getNetworkEnabled(event->NetworkIndex)) { return false; } @@ -130,12 +135,28 @@ bool NWPluginCall(NWPlugin::Function Function, EventStruct *event, String& str) break; } #endif // ifdef ESP32 +#if FEATURE_PLUGIN_STATS + case NWPlugin::Function::NWPLUGIN_RECORD_STATS: + { + NWPluginData_static_runtime& runtime_data = NW_data->getNWPluginData_static_runtime(); + success = NW_data->record_stats(); + break; + } + case NWPlugin::Function::NWPLUGIN_WEBFORM_LOAD_SHOW_STATS: + { + NWPluginData_static_runtime& runtime_data = NW_data->getNWPluginData_static_runtime(); + success = NW_data->webformLoad_show_stats(event); + break; + } +#endif // if FEATURE_PLUGIN_STATS + case NWPlugin::Function::NWPLUGIN_GET_CONNECTED_DURATION: { NWPluginData_static_runtime& runtime_data = NW_data->getNWPluginData_static_runtime(); auto duration = runtime_data._connectedStats.getLastOnDuration_ms(); + if (duration > 0) { - str = format_msec_duration_HMS(duration); + str = format_msec_duration_HMS(duration); event->Par64_1 = duration; event->Par64_2 = runtime_data._connectedStats.getCycleCount(); success = true; @@ -321,14 +342,16 @@ String getNWPluginNameFromNWPluginID(nwpluginID_t nwpluginID) { NWPluginData_static_runtime* getWiFi_STA_NWPluginData_static_runtime() { auto NW_data = getNWPluginData(NETWORK_INDEX_WIFI_STA); - if (!NW_data) return nullptr; + + if (!NW_data) { return nullptr; } return &NW_data->getNWPluginData_static_runtime(); } NWPluginData_static_runtime* getNWPluginData_static_runtime(networkIndex_t index) { auto NW_data = getNWPluginData(index); - if (!NW_data) return nullptr; + + if (!NW_data) { return nullptr; } return &NW_data->getNWPluginData_static_runtime(); } @@ -336,11 +359,11 @@ const NWPluginData_static_runtime* getDefaultRoute_NWPluginData_static_runtime() { for (networkIndex_t i = 0; validNetworkIndex(i); ++i) { auto NW_data = getNWPluginData_static_runtime(i); - if (NW_data && NW_data->isDefaultRoute()) return NW_data; + + if (NW_data && NW_data->isDefaultRoute()) { return NW_data; } } return nullptr; } - } // namespace net } // namespace ESPEasy diff --git a/src/ESPEasy/net/NWPluginStructs/NW001_data_struct_WiFi_STA.cpp b/src/ESPEasy/net/NWPluginStructs/NW001_data_struct_WiFi_STA.cpp index 7b7425d25..2ffe0c5e3 100644 --- a/src/ESPEasy/net/NWPluginStructs/NW001_data_struct_WiFi_STA.cpp +++ b/src/ESPEasy/net/NWPluginStructs/NW001_data_struct_WiFi_STA.cpp @@ -15,6 +15,10 @@ # define NW_PLUGIN_INTERFACE WiFi.STA # endif +# define NW001_RSSI_STATS_INDEX 0 +# define NW001_TX_PWR_STATS_INDEX 1 + + namespace ESPEasy { namespace net { namespace wifi { @@ -120,6 +124,82 @@ bool NW001_data_struct_WiFi_STA::handle_priority_route_changed() # endif // ifdef ESP32 +# if FEATURE_PLUGIN_STATS + +bool NW001_data_struct_WiFi_STA::initPluginStats() +{ + networkStatsVarIndex_t networkStatsVarIndex{}; + PluginStats_Config_t displayConfig; + + displayConfig.setAxisPosition(PluginStats_Config_t::AxisPosition::Right); + displayConfig.setEnabled(true); + + displayConfig.setAxisIndex(networkStatsVarIndex); + NWPluginData_base::initPluginStats( + networkStatsVarIndex, + F("RSSI"), + 1, + NAN, + displayConfig); +# if FEATURE_SET_WIFI_TX_PWR + ++networkStatsVarIndex; + displayConfig.setAxisIndex(networkStatsVarIndex); + NWPluginData_base::initPluginStats( + networkStatsVarIndex, + F("TX Power"), + 1, + NAN, + displayConfig); +# endif // if FEATURE_SET_WIFI_TX_PWR +# ifdef ESP32 + initPluginStats_trafficCount(++networkStatsVarIndex, true); // TX + initPluginStats_trafficCount(++networkStatsVarIndex, false); // RX +# endif // ifdef ESP32 + return true; +} + +bool NW001_data_struct_WiFi_STA::record_stats() +{ + if (_plugin_stats_array != nullptr) { +# ifdef ESP32 + + EventStruct tmpEvent; + size_t valueCount{}; + tmpEvent.ParfN[valueCount++] = WiFi.STA.RSSI(); +# if FEATURE_SET_WIFI_TX_PWR + tmpEvent.ParfN[valueCount++] = ESPEasy::net::wifi::GetWiFiTXpower(); +# endif + + bool trackPeaks = true; + bool onlyUpdateTimestampWhenSame = true; + return pushStatsValues(&tmpEvent, valueCount, trackPeaks, onlyUpdateTimestampWhenSame); +# endif // ifdef ESP32 + } + return false; +} + +bool NW001_data_struct_WiFi_STA::webformLoad_show_stats(struct EventStruct *event) const +{ + if (_plugin_stats_array != nullptr) { +# if FEATURE_SET_WIFI_TX_PWR +# if FEATURE_CHART_JS + plot_ChartJS_scatter( + NW001_RSSI_STATS_INDEX, + NW001_TX_PWR_STATS_INDEX, + F("rssitxpwrscatter"), + { F("RSSI/TX pwr Scatter Plot") }, + { F("rssi/tx_pwr"), F("rgb(255, 99, 132)") }, + 500, + 500); +# endif // if FEATURE_CHART_JS +# endif // if FEATURE_SET_WIFI_TX_PWR + return _plugin_stats_array->webformLoad_show_stats(event); + } + return false; +} + +# endif // if FEATURE_PLUGIN_STATS + } // namespace wifi } // namespace net diff --git a/src/ESPEasy/net/NWPluginStructs/NW001_data_struct_WiFi_STA.h b/src/ESPEasy/net/NWPluginStructs/NW001_data_struct_WiFi_STA.h index 4ceb7f2bc..29935727e 100644 --- a/src/ESPEasy/net/NWPluginStructs/NW001_data_struct_WiFi_STA.h +++ b/src/ESPEasy/net/NWPluginStructs/NW001_data_struct_WiFi_STA.h @@ -21,19 +21,25 @@ struct NW001_data_struct_WiFi_STA : public NWPluginData_base { ~NW001_data_struct_WiFi_STA(); - void webform_load(EventStruct *event); - void webform_save(EventStruct *event); + void webform_load(EventStruct *event); + void webform_save(EventStruct *event); - bool webform_getPort(String& str); + bool webform_getPort(String& str); - bool init(EventStruct *event); + bool init(EventStruct *event); - bool exit(EventStruct *event); + bool exit(EventStruct *event); # ifdef ESP32 - bool handle_priority_route_changed() override; + bool handle_priority_route_changed() override; # endif +# if FEATURE_PLUGIN_STATS + bool initPluginStats() override; + bool record_stats() override; + bool webformLoad_show_stats(struct EventStruct *event) const override; +# endif // if FEATURE_PLUGIN_STATS + NWPluginData_static_runtime& getNWPluginData_static_runtime(); const __FlashStringHelper* getWiFi_encryptionType() const; diff --git a/src/ESPEasy/net/NWPluginStructs/NW005_data_struct_PPP_modem.cpp b/src/ESPEasy/net/NWPluginStructs/NW005_data_struct_PPP_modem.cpp index 151d19adc..f55fcc8b7 100644 --- a/src/ESPEasy/net/NWPluginStructs/NW005_data_struct_PPP_modem.cpp +++ b/src/ESPEasy/net/NWPluginStructs/NW005_data_struct_PPP_modem.cpp @@ -188,6 +188,25 @@ String NW005_data_struct_PPP_modem::getBER() const return F("-"); } +float NW005_data_struct_PPP_modem::getBER_float() const +{ + if (_modem_task_data.modem_initialized) { + switch (NW_PLUGIN_INTERFACE.BER()) + { + case 0: return 0.01f; // F("<0.01 %"); + case 1: return 0.1f; // F("0.01 % ... 0.1 %"); + case 2: return 0.5f; // F("0.1 % ... 0.5 %"); + case 3: return 1.0f; // F("0.5 % ... 1 %"); + case 4: return 2.0f; // F("1 % ... 2 %"); + case 5: return 4.0f; // F("2 % ... 4 %"); + case 6: return 8.0f; // F("4 % ... 8 %"); + case 7: return 16.0f; // F(">= 8 %"); + case 99: break; // Not known or not detectable + } + } + return NAN; +} + bool NW005_data_struct_PPP_modem::attached() const { if (!_modem_task_data.modem_initialized) { return false; } @@ -896,6 +915,54 @@ String NW005_data_struct_PPP_modem::write_AT_cmd(const String& cmd, int timeout) return res; } +# if FEATURE_PLUGIN_STATS + +bool NW005_data_struct_PPP_modem::initPluginStats() +{ + networkStatsVarIndex_t networkStatsVarIndex{}; + PluginStats_Config_t displayConfig; + + displayConfig.setAxisPosition(PluginStats_Config_t::AxisPosition::Right); + displayConfig.setEnabled(true); + + displayConfig.setAxisIndex(networkStatsVarIndex); + NWPluginData_base::initPluginStats( + networkStatsVarIndex, + F("RSSI"), + 1, + NAN, + displayConfig); + + ++networkStatsVarIndex; + displayConfig.setAxisIndex(networkStatsVarIndex); + NWPluginData_base::initPluginStats( + networkStatsVarIndex, + F("Bit Error Rate (BER)"), + 1, + NAN, + displayConfig); + + initPluginStats_trafficCount(++networkStatsVarIndex, true); // TX + initPluginStats_trafficCount(++networkStatsVarIndex, false); // RX + return true; +} + +bool NW005_data_struct_PPP_modem::record_stats() +{ + if (_plugin_stats_array != nullptr) { + EventStruct tmpEvent; + size_t valueCount{}; + tmpEvent.ParfN[valueCount++] = NW_PLUGIN_INTERFACE.RSSI(); + tmpEvent.ParfN[valueCount++] = getBER_float(); + bool trackPeaks = true; + bool onlyUpdateTimestampWhenSame = true; + return pushStatsValues(&tmpEvent, valueCount, trackPeaks, onlyUpdateTimestampWhenSame); + } + return false; +} + +# endif // if FEATURE_PLUGIN_STATS + NWPluginData_static_runtime& NW005_data_struct_PPP_modem::getNWPluginData_static_runtime() { return stats_and_cache; } void NW005_data_struct_PPP_modem::onEvent(arduino_event_id_t event, arduino_event_info_t info) { diff --git a/src/ESPEasy/net/NWPluginStructs/NW005_data_struct_PPP_modem.h b/src/ESPEasy/net/NWPluginStructs/NW005_data_struct_PPP_modem.h index 2e4a0ffc1..ec3e18341 100644 --- a/src/ESPEasy/net/NWPluginStructs/NW005_data_struct_PPP_modem.h +++ b/src/ESPEasy/net/NWPluginStructs/NW005_data_struct_PPP_modem.h @@ -32,25 +32,32 @@ struct NW005_data_struct_PPP_modem : public NWPluginData_base { NW005_data_struct_PPP_modem(networkIndex_t networkIndex); ~NW005_data_struct_PPP_modem(); - String getRSSI() const; - String getBER() const; - bool attached() const; - String IMEI() const; - String operatorName() const; + String getRSSI() const; + String getBER() const; + float getBER_float() const; + bool attached() const; + String IMEI() const; + String operatorName() const; - void webform_load_UE_system_information(); + void webform_load_UE_system_information(); - void webform_load(EventStruct *event); - void webform_save(EventStruct *event); + void webform_load(EventStruct *event); + void webform_save(EventStruct *event); - bool webform_getPort(String& str); + bool webform_getPort(String& str); - bool init(EventStruct *event); + bool init(EventStruct *event); - bool exit(EventStruct *event); + bool exit(EventStruct *event); + + String write_AT_cmd(const String& cmd, + int timeout = 1000); + +# if FEATURE_PLUGIN_STATS + bool initPluginStats() override; + bool record_stats() override; +# endif // if FEATURE_PLUGIN_STATS - String write_AT_cmd(const String& cmd, - int timeout = 1000); NWPluginData_static_runtime& getNWPluginData_static_runtime(); diff --git a/src/ESPEasy/net/_NW001_WiFi_STA.cpp b/src/ESPEasy/net/_NW001_WiFi_STA.cpp index d445420c9..f4319b419 100644 --- a/src/ESPEasy/net/_NW001_WiFi_STA.cpp +++ b/src/ESPEasy/net/_NW001_WiFi_STA.cpp @@ -38,6 +38,7 @@ # include # endif + namespace ESPEasy { namespace net { diff --git a/src/ESPEasy/net/_NWPlugin_Helper.cpp b/src/ESPEasy/net/_NWPlugin_Helper.cpp index 7427e1edf..ed3400a1d 100644 --- a/src/ESPEasy/net/_NWPlugin_Helper.cpp +++ b/src/ESPEasy/net/_NWPlugin_Helper.cpp @@ -56,6 +56,11 @@ bool initNWPluginData(ESPEasy::net::networkIndex_t networkIndex, NWPluginData_ba #else // if FEATURE_STORE_NETWORK_INTERFACE_SETTINGS NWPlugin_task_data[networkIndex] = data; #endif // if FEATURE_STORE_NETWORK_INTERFACE_SETTINGS +#if FEATURE_PLUGIN_STATS + + NWPlugin_task_data[networkIndex]->initPluginStats(); +#endif // if FEATURE_PLUGIN_STATS + } else { delete data; data = nullptr; diff --git a/src/ESPEasy/net/wifi/ESPEasyWiFi_state_machine.cpp b/src/ESPEasy/net/wifi/ESPEasyWiFi_state_machine.cpp index 22020267d..b2d36199b 100644 --- a/src/ESPEasy/net/wifi/ESPEasyWiFi_state_machine.cpp +++ b/src/ESPEasy/net/wifi/ESPEasyWiFi_state_machine.cpp @@ -48,8 +48,9 @@ void ESPEasyWiFi_t::begin() { setState(WiFiState_e::IdleWaiting, 100); } void ESPEasyWiFi_t::loop() { // TODO TD-er: Must inspect WiFiEventData to see if we need to update some state here. - auto wifi_STA_data = getWiFi_STA_NWPluginData_static_runtime(); - if (!wifi_STA_data) return; + auto wifi_STA_data = getWiFi_STA_NWPluginData_static_runtime(); + + if (!wifi_STA_data) { return; } if (_state != WiFiState_e::IdleWaiting) { @@ -92,20 +93,7 @@ void ESPEasyWiFi_t::loop() // Do we have candidate to connect to ? if (WiFi_AP_Candidates.hasCandidates()) { setState(WiFiState_e::STA_Connecting, WIFI_STATE_MACHINE_STA_CONNECTING_TIMEOUT); - } else if (WiFi_AP_Candidates.scanComplete() == 0 -# ifdef ESP32 -# if ESP_IDF_VERSION >= ESP_IDF_VERSION_VAL(5, 1, 2) - || WiFi.status() == WL_STOPPED -# endif -# endif // ifdef ESP32 - ) { - if (WifiIsAP(WiFi.getMode())) { - // TODO TD-er: Must check if any client is connected. - // If not, then we can disable AP mode and switch to WiFiState_e::STA_Scanning - setState(WiFiState_e::STA_AP_Scanning, WIFI_STATE_MACHINE_STA_AP_SCANNING_TIMEOUT); - } else { - setState(WiFiState_e::STA_Scanning, WIFI_STATE_MACHINE_STA_SCANNING_TIMEOUT); - } +/* } else if (!WiFi_AP_Candidates.hasCandidateCredentials() || !Settings.DoNotStartAP()) { if (!WiFi_AP_Candidates.hasCandidateCredentials() && @@ -118,11 +106,40 @@ void ESPEasyWiFi_t::loop() wifi_STA_data->_establishConnectStats.clear(); WiFiEventData.wifiConnectAttemptNeeded = false; setState(WiFiState_e::AP_only, WIFI_STATE_MACHINE_AP_ONLY_TIMEOUT); +*/ + } else if (WiFi_AP_Candidates.scanComplete() == 0 +# ifdef ESP32 +# if ESP_IDF_VERSION >= ESP_IDF_VERSION_VAL(5, 1, 2) + || WiFi.status() == WL_STOPPED +# endif +# endif // ifdef ESP32 + ) { + if (WifiIsAP(WiFi.getMode())) { + // TODO TD-er: Must check if any client is connected. + // If not, then we can disable AP mode and switch to WiFiState_e::STA_Scanning + setState(WiFiState_e::STA_AP_Scanning, WIFI_STATE_MACHINE_STA_AP_SCANNING_TIMEOUT); + } else { +// setState(WiFiState_e::STA_AP_Scanning, WIFI_STATE_MACHINE_STA_AP_SCANNING_TIMEOUT); + setState(WiFiState_e::STA_Scanning, WIFI_STATE_MACHINE_STA_SCANNING_TIMEOUT); + } + // Move up? + } else if (!WiFi_AP_Candidates.hasCandidateCredentials() || + !Settings.DoNotStartAP()) { + if (!WiFi_AP_Candidates.hasCandidateCredentials() && + !WiFiEventData.warnedNoValidWiFiSettings) + { + addLog(LOG_LEVEL_ERROR, F("WIFI : No valid wifi settings")); + WiFiEventData.warnedNoValidWiFiSettings = true; + } + + wifi_STA_data->_establishConnectStats.clear(); + WiFiEventData.wifiConnectAttemptNeeded = false; + setState(WiFiState_e::AP_only, WIFI_STATE_MACHINE_AP_ONLY_TIMEOUT); + // end move up?? } } break; case WiFiState_e::STA_Scanning: - case WiFiState_e::STA_AP_Scanning: { // -1 if scan not finished auto scanCompleteStatus = WiFi.scanComplete(); @@ -145,13 +162,55 @@ void ESPEasyWiFi_t::loop() if (_state_timeout.timeReached() || (scanCompleteStatus >= 0)) { WiFi.scanDelete(); + if (_state_timeout.timeReached()) { +# ifndef BUILD_NO_DEBUG + addLog(LOG_LEVEL_ERROR, F("WiFi : Scan Running Timeout")); +# endif + } setState(WiFiState_e::WiFiOFF, 100); + WiFiEventData.processedScanDone = true; + + } + break; + } + case WiFiState_e::STA_AP_Scanning: + { + // -1 if scan not finished + auto scanCompleteStatus = WiFi.scanComplete(); + + if (scanCompleteStatus >= 0) { + WiFi_AP_Candidates.load_knownCredentials(); +# if !FEATURE_ESP8266_DIRECT_WIFI_SCAN + WiFi_AP_Candidates.process_WiFiscan(scanCompleteStatus); +# endif + addLog(LOG_LEVEL_INFO, strformat( + F("WiFi : Scan channel %d done, found %d APs"), + _scan_channel, + WiFi_AP_Candidates.scanComplete())); + } else if (scanCompleteStatus == -2) { // WIFI_SCAN_FAILED + addLog(LOG_LEVEL_ERROR, F("WiFi : Scan failed")); + WiFi.scanDelete(); + setState(WiFiState_e::WiFiOFF, 1000); + WiFiEventData.processedScanDone = true; + } + + if (_state_timeout.timeReached() || (scanCompleteStatus >= 0)) { + WiFi.scanDelete(); if (_state_timeout.timeReached()) { # ifndef BUILD_NO_DEBUG addLog(LOG_LEVEL_ERROR, F("WiFi : Scan Running Timeout")); # endif } + ++_scan_channel; + + if (_scan_channel > 14) { + _scan_channel = 0; + setState(WiFiState_e::WiFiOFF, 100); + } + else { + setState(WiFiState_e::STA_AP_Scanning, 500); + } WiFiEventData.processedScanDone = true; } @@ -255,13 +314,16 @@ void ESPEasyWiFi_t::setState(WiFiState_e newState, uint32_t timeout) { case WiFiState_e::IdleWaiting: // Do nothing here as we're waiting till the timeout is over break; + case WiFiState_e::STA_AP_Scanning: + + // Start scanning per channel + if (_scan_channel == 0) { _scan_channel = 1; } + + // break; case WiFiState_e::STA_Scanning: // Start scanning startScanning(); break; - case WiFiState_e::STA_AP_Scanning: - // Start scanning per channel - break; case WiFiState_e::STA_Connecting: case WiFiState_e::STA_Reconnecting: @@ -288,20 +350,22 @@ void ESPEasyWiFi_t::checkConnectProgress() {} void ESPEasyWiFi_t::startScanning() { - _state = WiFiState_e::STA_Scanning; + _state = _scan_channel == 0 ? WiFiState_e::STA_Scanning : WiFiState_e::STA_AP_Scanning; setSTA(true); - WifiScan(true); + WifiScan(true, _scan_channel); _last_state_change.setNow(); } bool ESPEasyWiFi_t::connectSTA() { auto wifi_STA_data = getWiFi_STA_NWPluginData_static_runtime(); - if (!wifi_STA_data) return false; + + if (!wifi_STA_data) { return false; } // Make sure the timer is set to off. // TODO TD-er: Should we check to see if it is still on and then do what???? wifi_STA_data->_establishConnectStats.setOff(); + if (!WiFi_AP_Candidates.hasCandidateCredentials()) { if (!WiFiEventData.warnedNoValidWiFiSettings) @@ -310,14 +374,15 @@ bool ESPEasyWiFi_t::connectSTA() WiFiEventData.warnedNoValidWiFiSettings = true; } wifi_STA_data->_establishConnectStats.clear(); -// WiFiEventData.last_wifi_connect_attempt_moment.clear(); -// _connect_attempt = 1; + + // WiFiEventData.last_wifi_connect_attempt_moment.clear(); + // _connect_attempt = 1; WiFiEventData.wifiConnectAttemptNeeded = false; // No need to wait longer to start AP mode. if (!Settings.DoNotStartAP()) { - setAP(true); + setAPinternal(true); } return false; } @@ -356,7 +421,8 @@ bool ESPEasyWiFi_t::connectSTA() candidate.toString().c_str(), wifi_STA_data->_establishConnectStats.getCycleCount() + 1)); } - //WiFiEventData.markWiFiBegin(); + + // WiFiEventData.markWiFiBegin(); if (prepareWiFi()) { setNetworkMedium(NetworkMedium_t::WIFI); @@ -375,7 +441,8 @@ bool ESPEasyWiFi_t::connectSTA() // Start connect attempt now, so no longer needed to attempt new connection. WiFiEventData.wifiConnectAttemptNeeded = false; -// WiFiEventData.wifiConnectInProgress = true; + + // WiFiEventData.wifiConnectInProgress = true; const String key = WiFi_AP_CandidatesList::get_key(candidate.index); # if FEATURE_USE_IPV6 @@ -392,6 +459,7 @@ bool ESPEasyWiFi_t::connectSTA() } # endif // ifdef ESP32 wifi_STA_data->mark_begin_establish_connection(); + if (candidate.bits.isHidden /*&& Settings.HiddenSSID_SlowConnectPerBSSID()*/) { // WiFi.disconnect(false, true); # ifdef ESP32 diff --git a/src/ESPEasy/net/wifi/ESPEasyWiFi_state_machine.h b/src/ESPEasy/net/wifi/ESPEasyWiFi_state_machine.h index 5be090e07..47c81c8bb 100644 --- a/src/ESPEasy/net/wifi/ESPEasyWiFi_state_machine.h +++ b/src/ESPEasy/net/wifi/ESPEasyWiFi_state_machine.h @@ -85,6 +85,8 @@ private: LongTermTimer _state_timeout; LongTermTimer _last_seen_connected; + uint8_t _scan_channel{}; + // LongTermTimer _AP_start_timestamp; //uint32_t _connect_attempt = 0; diff --git a/src/ESPEasy/net/wifi/ESPEasyWifi.cpp b/src/ESPEasy/net/wifi/ESPEasyWifi.cpp index 8ba9f44b9..57816c772 100644 --- a/src/ESPEasy/net/wifi/ESPEasyWifi.cpp +++ b/src/ESPEasy/net/wifi/ESPEasyWifi.cpp @@ -125,8 +125,7 @@ bool WiFiConnected() { return ESPEasyWiFi.connected(); } -//void WiFiConnectRelaxed() { AttemptWiFiConnect(); } - +// void WiFiConnectRelaxed() { AttemptWiFiConnect(); } // ******************************************************************************** // Set Wifi config @@ -173,9 +172,11 @@ void SetWiFiTXpower() { SetWiFiTXpower(0); // Just some minimal value, will be adjusted in SetWiFiTXpower } -void SetWiFiTXpower(float dBm) { doSetWiFiTXpower(dBm, WiFi.RSSI()); } +void SetWiFiTXpower(float dBm) { doSetWiFiTXpower(dBm, WiFi.RSSI()); } -void SetWiFiTXpower(float dBm, float rssi) { doSetWiFiTXpower(dBm, rssi); } +void SetWiFiTXpower(float dBm, float rssi) { doSetWiFiTXpower(dBm, rssi); } + +float GetWiFiTXpower() { return doGetWiFiTXpower(); } # endif // if FEATURE_SET_WIFI_TX_PWR @@ -261,11 +262,11 @@ void WiFiScan_log_to_serial() } // Only internal scope -void setAPinternal(bool enable) { doSetAPinternal(enable); } +void setAPinternal(bool enable) { doSetAPinternal(enable); } void setUseStaticIP(bool enabled) { doSetUseStaticIP(enabled); } -bool WiFiUseStaticIP() { return Settings.IP[0] != 0 && Settings.IP[0] != 255; } +bool WiFiUseStaticIP() { return Settings.IP[0] != 0 && Settings.IP[0] != 255; } bool wifiAPmodeActivelyUsed() { diff --git a/src/ESPEasy/net/wifi/ESPEasyWifi.h b/src/ESPEasy/net/wifi/ESPEasyWifi.h index ae1eb84ef..69fb8effb 100644 --- a/src/ESPEasy/net/wifi/ESPEasyWifi.h +++ b/src/ESPEasy/net/wifi/ESPEasyWifi.h @@ -46,6 +46,7 @@ void SetWiFiTXpower(); void SetWiFiTXpower(float dBm); // 0-20.5 void SetWiFiTXpower(float dBm, float rssi); +float GetWiFiTXpower(); # endif // if FEATURE_SET_WIFI_TX_PWR float GetRSSIthreshold(float& maxTXpwr); diff --git a/src/ESPEasy/net/wifi/ESPEasyWifi_ProcessEvent.cpp b/src/ESPEasy/net/wifi/ESPEasyWifi_ProcessEvent.cpp index 9b0952fd4..d1ff47f8a 100644 --- a/src/ESPEasy/net/wifi/ESPEasyWifi_ProcessEvent.cpp +++ b/src/ESPEasy/net/wifi/ESPEasyWifi_ProcessEvent.cpp @@ -414,7 +414,7 @@ void processScanDone() { } return; case -2: // WIFI_SCAN_FAILED - addLog(LOG_LEVEL_ERROR, F("WiFi : Scan failed")); + addLog(LOG_LEVEL_ERROR, F("WiFi : Scan failed (old)")); WiFi.scanDelete(); WiFiEventData.processedScanDone = true; return; diff --git a/src/ESPEasy/net/wifi/ESPEasyWifi_abstracted.h b/src/ESPEasy/net/wifi/ESPEasyWifi_abstracted.h index 58a7d214e..d5abe21e2 100644 --- a/src/ESPEasy/net/wifi/ESPEasyWifi_abstracted.h +++ b/src/ESPEasy/net/wifi/ESPEasyWifi_abstracted.h @@ -84,6 +84,8 @@ void doSetWiFiTXpower(); void doSetWiFiTXpower(float dBm, float rssi); +float doGetWiFiTXpower(); + # endif // if FEATURE_SET_WIFI_TX_PWR diff --git a/src/ESPEasy/net/wifi/ESPEasyWifi_abstracted_ESP32.cpp b/src/ESPEasy/net/wifi/ESPEasyWifi_abstracted_ESP32.cpp index ea289a742..8abe729dd 100644 --- a/src/ESPEasy/net/wifi/ESPEasyWifi_abstracted_ESP32.cpp +++ b/src/ESPEasy/net/wifi/ESPEasyWifi_abstracted_ESP32.cpp @@ -26,7 +26,6 @@ namespace ESPEasy { namespace net { namespace wifi { - bool WiFi_pre_setup() { if (!ESPEasyWiFi_STA_EventHandler::initialized()) { return false; } @@ -85,7 +84,8 @@ bool doSetWifiMode(WiFiMode_t new_mode) if (cur_mode == WIFI_OFF) { // Needs to be set while WiFi is off WiFi.hostname(NetworkCreateRFCCompliantHostname()); -// WiFiEventData.markWiFiTurnOn(); + + // WiFiEventData.markWiFiTurnOn(); } if (new_mode != WIFI_OFF) { @@ -100,7 +100,8 @@ bool doSetWifiMode(WiFiMode_t new_mode) // delay(100); processDisconnect(); -// WiFiEventData.clear_processed_flags(); + + // WiFiEventData.clear_processed_flags(); } addLog(LOG_LEVEL_INFO, concat(F("WIFI : Set WiFi to "), doGetWifiModeString(new_mode))); @@ -130,7 +131,7 @@ bool doSetWifiMode(WiFiMode_t new_mode) if (new_mode == WIFI_OFF) { // FIXME TD-er: Is this correct to mark Turn ON ???? -// WiFiEventData.markWiFiTurnOn(); + // WiFiEventData.markWiFiTurnOn(); // Needs to be set while WiFi is off WiFi.hostname(NetworkCreateRFCCompliantHostname()); @@ -209,7 +210,7 @@ void doWifiScan(bool async, uint8_t channel) { // Since IDF 4.4 it seems like the active channel may be messed up when running async scan // Perform a disconnect after scanning. // See: https://github.com/letscontrolit/ESPEasy/pull/3579#issuecomment-967021347 - async = false; + // async = false; if (Settings.IncludeHiddenSSID()) { doSetWiFiCountryPolicyManual(); @@ -369,6 +370,19 @@ void doSetWiFiTXpower(float& dBm) } } +float doGetWiFiTXpower() +{ + int8_t power{}; + + if (esp_wifi_get_max_tx_power(&power) == ESP_OK) { + float res = power; + res /= 4.0f; + return res; + } + + return NAN; +} + # endif // if FEATURE_SET_WIFI_TX_PWR # if CONFIG_SOC_WIFI_SUPPORT_5G @@ -447,15 +461,16 @@ void doSetConnectionSpeed(bool ForceWiFi_bg_mode) if (ForceWiFi_bg_mode) { protocol = WIFI_PROTOCOL_11B | WIFI_PROTOCOL_11G; // Default to BG } -/* - if (WiFiEventData.connectionFailures > 10) { - // Set to allow all protocols - protocol = WIFI_PROTOCOL_11B | WIFI_PROTOCOL_11G | WIFI_PROTOCOL_11N; -# if CONFIG_SOC_WIFI_HE_SUPPORT - protocol |= WIFI_PROTOCOL_11AX; -# endif - } -*/ + + /* + if (WiFiEventData.connectionFailures > 10) { + // Set to allow all protocols + protocol = WIFI_PROTOCOL_11B | WIFI_PROTOCOL_11G | WIFI_PROTOCOL_11N; + # if CONFIG_SOC_WIFI_HE_SUPPORT + protocol |= WIFI_PROTOCOL_11AX; + # endif + } + */ const WiFi_AP_Candidate candidate = WiFi_AP_Candidates.getCurrent(); if (candidate.phy_known()) { diff --git a/src/ESPEasy/net/wifi/ESPEasyWifi_abstracted_ESP8266.cpp b/src/ESPEasy/net/wifi/ESPEasyWifi_abstracted_ESP8266.cpp index 0d72992c8..faa8bf02f 100644 --- a/src/ESPEasy/net/wifi/ESPEasyWifi_abstracted_ESP8266.cpp +++ b/src/ESPEasy/net/wifi/ESPEasyWifi_abstracted_ESP8266.cpp @@ -258,6 +258,8 @@ WiFiConnectionProtocol doGetConnectionProtocol() void doSetWiFiTXpower(float& dBm) { WiFi.setOutputPower(dBm); } +float doGetWiFiTXpower() { return WiFi.getOutputPower(); } + # endif // if FEATURE_SET_WIFI_TX_PWR void doSetConnectionSpeed(bool ForceWiFi_bg_mode) { diff --git a/src/_Plugin_Helper.cpp b/src/_Plugin_Helper.cpp index 5e49b5512..5c720cc64 100644 --- a/src/_Plugin_Helper.cpp +++ b/src/_Plugin_Helper.cpp @@ -63,7 +63,7 @@ bool initPluginTaskData(taskIndex_t taskIndex, PluginTaskData_base *data) { const uint8_t valueCount = getValueCountForTask(taskIndex); for (size_t i = 0; i < valueCount; ++i) { if (Cache.enabledPluginStats(taskIndex, i)) { - Plugin_task_data[taskIndex]->initPluginStats(taskIndex, i); + Plugin_task_data[taskIndex]->initPluginStats(i); } } #endif diff --git a/src/src/DataStructs/ESPEasy_EventStruct.h b/src/src/DataStructs/ESPEasy_EventStruct.h index 6bdcbc137..0889455b1 100644 --- a/src/src/DataStructs/ESPEasy_EventStruct.h +++ b/src/src/DataStructs/ESPEasy_EventStruct.h @@ -11,7 +11,7 @@ #include "../DataStructs/DeviceStruct.h" #ifdef ESP32 -#include +# include #endif /*********************************************************************************************\ @@ -22,29 +22,34 @@ struct EventStruct { EventStruct() = default; + // Delete the copy constructor - EventStruct(const struct EventStruct& event) = delete; + EventStruct(const struct EventStruct&event) = delete; + private: + // Hide the copy assignment operator by making it private - EventStruct& operator=(const EventStruct&) = default; + EventStruct& operator=(const EventStruct&) = default; public: - EventStruct(struct EventStruct&& event) = default; - EventStruct& operator=(struct EventStruct&& other) = default; + + EventStruct(struct EventStruct&&event) = default; + EventStruct& operator=(struct EventStruct&&other) = default; explicit EventStruct(taskIndex_t taskIndex); // Explicit deep_copy function to make sure this object is not accidentally copied using the copy-constructor // Copy constructor and assignment operator should not be used. - void deep_copy(const struct EventStruct& other); - void deep_copy(const struct EventStruct* other); + void deep_copy(const struct EventStruct&other); + void deep_copy(const struct EventStruct*other); + // explicit EventStruct(const struct EventStruct& event); // EventStruct& operator=(const struct EventStruct& other); - void setTaskIndex(taskIndex_t taskIndex); + void setTaskIndex(taskIndex_t taskIndex); - void clear(); + void clear(); // Check (and update) sensorType if not set, plus return (corrected) sensorType Sensor_VType getSensorType(); @@ -53,21 +58,21 @@ public: void setUnixTimeTimestamp(); void setLocalTimeTimestamp(); - String String1; - String String2; - String String3; - String String4; - String String5; - String String6; + String String1; + String String2; + String String3; + String String4; + String String5; + String String6; #ifdef ESP32 - NetworkInterface* networkInterface = nullptr; + NetworkInterface*networkInterface = nullptr; #endif - uint32_t timestamp_sec = 0u; - uint32_t timestamp_frac = 0u; - uint8_t *Data = nullptr; - int idx = 0; + uint32_t timestamp_sec = 0u; + uint32_t timestamp_frac = 0u; + uint8_t *Data = nullptr; + int idx = 0; union { struct { int Par1; @@ -76,26 +81,43 @@ public: int Par4; int Par5; int Par6; + }; + + struct { + float Parf_1; + float Parf_2; + float Parf_3; + float Parf_4; + float Parf_5; + float Parf_6; + + }; + + float ParfN[6]; struct { int64_t Par64_1; int64_t Par64_2; int64_t Par64_3; + }; + int ParN[6] = { 0 }; + }; // The origin of the values in the event. See EventValueSource.h - EventValueSource::Enum Source = EventValueSource::Enum::VALUE_SOURCE_NOT_SET; - taskIndex_t TaskIndex = INVALID_TASK_INDEX; // index position in TaskSettings array, 0-11 - controllerIndex_t ControllerIndex = INVALID_CONTROLLER_INDEX; // index position in Settings.Controller, 0-3 + EventValueSource::Enum Source = EventValueSource::Enum::VALUE_SOURCE_NOT_SET; + taskIndex_t TaskIndex = INVALID_TASK_INDEX; // index position in TaskSettings array, 0-11 + controllerIndex_t ControllerIndex = INVALID_CONTROLLER_INDEX; // index position in Settings.Controller, 0-3 #if FEATURE_NOTIFIER - notifierIndex_t NotificationIndex = INVALID_NOTIFIER_INDEX; // index position in Settings.Notification, 0-3 + notifierIndex_t NotificationIndex = INVALID_NOTIFIER_INDEX; // index position in Settings.Notification, 0-3 #endif - ESPEasy::net::networkIndex_t NetworkIndex = ESPEasy::net::INVALID_NETWORK_INDEX; // index position in Settings.NWPluginID, 0-7 - uint8_t BaseVarIndex = 0; - Sensor_VType sensorType = Sensor_VType::SENSOR_TYPE_NOT_SET; - uint8_t OriginTaskIndex = 0; + ESPEasy::net::networkIndex_t NetworkIndex = ESPEasy::net::INVALID_NETWORK_INDEX; // index position in Settings.NWPluginID, 0-7 + uint8_t BaseVarIndex = 0; + Sensor_VType sensorType = Sensor_VType::SENSOR_TYPE_NOT_SET; + uint8_t OriginTaskIndex = 0; + }; #endif // DATASTRUCTS_ESPEASY_EVENTSTRUCT_H diff --git a/src/src/DataStructs/PluginStats_array.cpp b/src/src/DataStructs/PluginStats_array.cpp index 14a7d4782..2f4b6b496 100644 --- a/src/src/DataStructs/PluginStats_array.cpp +++ b/src/src/DataStructs/PluginStats_array.cpp @@ -29,7 +29,36 @@ PluginStats_array::~PluginStats_array() } } -void PluginStats_array::initPluginStats(taskIndex_t taskIndex, taskVarIndex_t taskVarIndex) +void PluginStats_array::initPluginStats(taskVarIndex_t taskVarIndex) +{ + if (taskVarIndex < VARS_PER_TASK) { + + String label; + if (ExtraTaskSettings.enabledPluginStats(taskVarIndex)) { + label = ExtraTaskSettings.TaskDeviceValueNames[taskVarIndex]; +# if FEATURE_TASKVALUE_UNIT_OF_MEASURE + const uint8_t uomIndex = ExtraTaskSettings.getTaskVarUnitOfMeasure(taskVarIndex); + + if (uomIndex != 0) { + label = strformat(F("%s (%s)"), ExtraTaskSettings.TaskDeviceValueNames[taskVarIndex], toUnitOfMeasureName(uomIndex).c_str()); + } +# endif // if FEATURE_TASKVALUE_UNIT_OF_MEASURE + } + initPluginStats( + taskVarIndex, + label, + ExtraTaskSettings.TaskDeviceValueDecimals[taskVarIndex], + ExtraTaskSettings.TaskDeviceErrorValue[taskVarIndex], + ExtraTaskSettings.getPluginStatsConfig(taskVarIndex)); + } +} + +void PluginStats_array::initPluginStats( + taskVarIndex_t taskVarIndex, + const String& label, + uint8_t nrDecimals, + float errorValue, + const PluginStats_Config_t& displayConfig) { if (taskVarIndex < VARS_PER_TASK) { delete _plugin_stats[taskVarIndex]; @@ -42,35 +71,24 @@ void PluginStats_array::initPluginStats(taskIndex_t taskIndex, taskVarIndex_t ta } } - if (ExtraTaskSettings.enabledPluginStats(taskVarIndex)) { + if (label.length()) { // Try to allocate in PSRAM or 2nd heap if possible constexpr unsigned size = sizeof(PluginStats); void *ptr = special_calloc(1, size); if (ptr == nullptr) { _plugin_stats[taskVarIndex] = nullptr; } else { - _plugin_stats[taskVarIndex] = new (ptr) PluginStats( - ExtraTaskSettings.TaskDeviceValueDecimals[taskVarIndex], - ExtraTaskSettings.TaskDeviceErrorValue[taskVarIndex]); + _plugin_stats[taskVarIndex] = + new (ptr) PluginStats(nrDecimals, errorValue); } if (_plugin_stats[taskVarIndex] != nullptr) { - # if FEATURE_TASKVALUE_UNIT_OF_MEASURE - const uint8_t uomIndex = ExtraTaskSettings.getTaskVarUnitOfMeasure(taskVarIndex); - String label(ExtraTaskSettings.TaskDeviceValueNames[taskVarIndex]); - - if (uomIndex != 0) { - label = strformat(F("%s (%s)"), ExtraTaskSettings.TaskDeviceValueNames[taskVarIndex], toUnitOfMeasureName(uomIndex).c_str()); - } _plugin_stats[taskVarIndex]->setLabel(label); - # else // if FEATURE_TASKVALUE_UNIT_OF_MEASURE - _plugin_stats[taskVarIndex]->setLabel(ExtraTaskSettings.TaskDeviceValueNames[taskVarIndex]); - # endif // if FEATURE_TASKVALUE_UNIT_OF_MEASURE # if FEATURE_CHART_JS const __FlashStringHelper *colors[] = { F("#A52422"), F("#BEA57D"), F("#0F4C5C"), F("#A4BAB7") }; _plugin_stats[taskVarIndex]->_ChartJS_dataset_config.color = colors[taskVarIndex]; - _plugin_stats[taskVarIndex]->_ChartJS_dataset_config.displayConfig = ExtraTaskSettings.getPluginStatsConfig(taskVarIndex); + _plugin_stats[taskVarIndex]->_ChartJS_dataset_config.displayConfig = displayConfig; # endif // if FEATURE_CHART_JS if (_plugin_stats_timestamps != nullptr) { @@ -99,6 +117,8 @@ void PluginStats_array::initPluginStats(taskIndex_t taskIndex, taskVarIndex_t ta } } + + void PluginStats_array::clearPluginStats(taskVarIndex_t taskVarIndex) { if (taskVarIndex < VARS_PER_TASK) { @@ -192,47 +212,60 @@ void PluginStats_array::pushPluginStatsValues( if (valueCount > 0) { const Sensor_VType sensorType = event->getSensorType(); - const int64_t timestamp_sysmicros = event->getTimestamp_as_systemMicros(); - - if (onlyUpdateTimestampWhenSame && (_plugin_stats_timestamps != nullptr)) { - // When only updating the timestamp of the last entry, - // we should look at the last 2 entries to see if they are the same. - bool isSame = true; - size_t i = 0; - - while (isSame && i < valueCount) { - if (_plugin_stats[i] != nullptr) { - const float value = UserVar.getAsDouble(event->TaskIndex, i, sensorType); - - if (!_plugin_stats[i]->matchesLastTwoEntries(value)) { - isSame = false; - } - } - ++i; - } - - if (isSame) { - _plugin_stats_timestamps->updateLast(timestamp_sysmicros); - return; - } - } - - if (_plugin_stats_timestamps != nullptr) { - _plugin_stats_timestamps->push(timestamp_sysmicros); - } + EventStruct tempEvent; for (size_t i = 0; i < valueCount; ++i) { if (_plugin_stats[i] != nullptr) { - const float value = UserVar.getAsDouble(event->TaskIndex, i, sensorType); - _plugin_stats[i]->push(value); - - if (trackPeaks) { - _plugin_stats[i]->trackPeak(value, timestamp_sysmicros); - } + tempEvent.ParfN[i] = UserVar.getAsDouble(event->TaskIndex, i, sensorType); } } + pushStatsValues(&tempEvent, valueCount, trackPeaks, onlyUpdateTimestampWhenSame); + } + } +} + +bool PluginStats_array::pushStatsValues(struct EventStruct *event, + size_t valueCount, + bool trackPeaks, + bool onlyUpdateTimestampWhenSame) +{ + const int64_t timestamp_sysmicros = event->getTimestamp_as_systemMicros(); + + if (onlyUpdateTimestampWhenSame && (_plugin_stats_timestamps != nullptr)) { + // When only updating the timestamp of the last entry, + // we should look at the last 2 entries to see if they are the same. + bool isSame = true; + size_t i = 0; + + while (isSame && i < valueCount) { + if (_plugin_stats[i] != nullptr) { + if (!_plugin_stats[i]->matchesLastTwoEntries(event->ParfN[i])) { + isSame = false; + } + } + ++i; + } + + if (isSame) { + _plugin_stats_timestamps->updateLast(timestamp_sysmicros); + return false; + } + } + + if (_plugin_stats_timestamps != nullptr) { + _plugin_stats_timestamps->push(timestamp_sysmicros); + } + + for (size_t i = 0; i < valueCount; ++i) { + if (_plugin_stats[i] != nullptr) { + _plugin_stats[i]->push(event->ParfN[i]); + + if (trackPeaks) { + _plugin_stats[i]->trackPeak(event->ParfN[i], timestamp_sysmicros); + } } } + return true; } bool PluginStats_array::plugin_get_config_value_base(struct EventStruct *event, @@ -323,6 +356,7 @@ bool PluginStats_array::webformLoad_show_stats(struct EventStruct *event, bool s } # if FEATURE_CHART_JS + void PluginStats_array::plot_ChartJS(bool onlyJSON) const { const size_t nrSamples = nrSamplesPresent(); @@ -500,7 +534,6 @@ void PluginStats_array::plot_ChartJS_scatter( # endif // if FEATURE_CHART_JS - PluginStats * PluginStats_array::getPluginStats(taskVarIndex_t taskVarIndex) const { if ((taskVarIndex < VARS_PER_TASK)) { diff --git a/src/src/DataStructs/PluginStats_array.h b/src/src/DataStructs/PluginStats_array.h index ec3e1df71..89fad885c 100644 --- a/src/src/DataStructs/PluginStats_array.h +++ b/src/src/DataStructs/PluginStats_array.h @@ -17,14 +17,20 @@ # endif // if FEATURE_CHART_JS -class PluginStats_array { +class PluginStats_array +{ public: PluginStats_array() = default; ~PluginStats_array(); - void initPluginStats(taskIndex_t taskIndex, - taskVarIndex_t taskVarIndex); + void initPluginStats(taskVarIndex_t taskVarIndex); + void initPluginStats( + taskVarIndex_t taskVarIndex, + const String& label, + uint8_t nrDecimals, + float errorValue, + const PluginStats_Config_t& displayConfig); void clearPluginStats(taskVarIndex_t taskVarIndex); // Update any logged timestamp with this newly set system time. @@ -44,6 +50,12 @@ public: bool trackPeaks, bool onlyUpdateTimestampWhenSame); + bool pushStatsValues(struct EventStruct *event, + size_t valueCount, + bool trackPeaks, + bool onlyUpdateTimestampWhenSame); + + bool plugin_get_config_value_base(struct EventStruct *event, String & string) const; @@ -80,7 +92,7 @@ private: PluginStats *_plugin_stats[VARS_PER_TASK] = {}; PluginStats_timestamp *_plugin_stats_timestamps = nullptr; -}; +}; // class PluginStats_array #endif // if FEATURE_PLUGIN_STATS #endif // ifndef HELPERS_PLUGINSTATS_ARRAY_H diff --git a/src/src/DataStructs/PluginTaskData_base.cpp b/src/src/DataStructs/PluginTaskData_base.cpp index 99e8346f4..5f42459df 100644 --- a/src/src/DataStructs/PluginTaskData_base.cpp +++ b/src/src/DataStructs/PluginTaskData_base.cpp @@ -56,7 +56,7 @@ size_t PluginTaskData_base::nrSamplesPresent() const { } #if FEATURE_PLUGIN_STATS -void PluginTaskData_base::initPluginStats(taskIndex_t taskIndex, taskVarIndex_t taskVarIndex) +void PluginTaskData_base::initPluginStats(taskVarIndex_t taskVarIndex) { if (taskVarIndex < VARS_PER_TASK) { if (_plugin_stats_array == nullptr) { @@ -69,7 +69,7 @@ void PluginTaskData_base::initPluginStats(taskIndex_t taskIndex, taskVarIndex_t } if (_plugin_stats_array != nullptr) { - _plugin_stats_array->initPluginStats(taskIndex, taskVarIndex); + _plugin_stats_array->initPluginStats(taskVarIndex); } } } diff --git a/src/src/DataStructs/PluginTaskData_base.h b/src/src/DataStructs/PluginTaskData_base.h index f8fa2f287..a6227eecc 100644 --- a/src/src/DataStructs/PluginTaskData_base.h +++ b/src/src/DataStructs/PluginTaskData_base.h @@ -32,7 +32,7 @@ struct PluginTaskData_base { size_t nrSamplesPresent() const; #if FEATURE_PLUGIN_STATS - void initPluginStats(taskIndex_t taskIndex, taskVarIndex_t taskVarIndex); + void initPluginStats(taskVarIndex_t taskVarIndex); void clearPluginStats(taskVarIndex_t taskVarIndex); // Update any logged timestamp with this newly set system time. diff --git a/src/src/DataTypes/ESPEasy_plugin_functions.h b/src/src/DataTypes/ESPEasy_plugin_functions.h index 4d1f4ae72..4bb8d4fe0 100644 --- a/src/src/DataTypes/ESPEasy_plugin_functions.h +++ b/src/src/DataTypes/ESPEasy_plugin_functions.h @@ -167,6 +167,10 @@ public: #endif NWPLUGIN_GET_CONNECTED_DURATION, NWPLUGIN_PROCESS_EVENT, // Process received event arduino_event_id_t +#if FEATURE_PLUGIN_STATS + NWPLUGIN_RECORD_STATS, + NWPLUGIN_WEBFORM_LOAD_SHOW_STATS, +#endif NWPLUGIN_WEBFORM_SHOW_CONNECTED, // Used for showing connected state/speed NWPLUGIN_WEBFORM_SHOW_HOSTNAME, // Used for showing hostname NWPLUGIN_WEBFORM_SHOW_HW_ADDRESS, // Used for showing MAC diff --git a/src/src/Helpers/ESPEasy_Storage.cpp b/src/src/Helpers/ESPEasy_Storage.cpp index d3a118b11..f253c599f 100644 --- a/src/src/Helpers/ESPEasy_Storage.cpp +++ b/src/src/Helpers/ESPEasy_Storage.cpp @@ -945,7 +945,7 @@ void afterloadSettings() { applyFactoryDefaultPref(); Scheduler.setEcoMode(Settings.EcoPowerMode()); #ifdef ESP32 - #ifndef ESP32P4 + #if !defined(CORE32SOLO1) && !defined(ESP32P4) setCpuFrequencyMhz(Settings.EcoPowerMode() ? getCPU_MinFreqMHz() : getCPU_MaxFreqMHz()); #endif #endif // ifdef ESP32 diff --git a/src/src/Helpers/ESPEasy_time.cpp b/src/src/Helpers/ESPEasy_time.cpp index ea0b691ea..bd4478d38 100644 --- a/src/src/Helpers/ESPEasy_time.cpp +++ b/src/src/Helpers/ESPEasy_time.cpp @@ -16,6 +16,9 @@ #include "../Globals/EventQueue.h" #include "../../ESPEasy/net/Globals/NetworkState.h" +#include "../../ESPEasy/net/DataTypes/NetworkIndex.h" +#include "../../ESPEasy/net/_NWPlugin_Helper.h" + #include "../Globals/Nodes.h" #include "../Globals/RTC.h" #include "../Globals/Settings.h" @@ -337,6 +340,15 @@ unsigned long ESPEasy_time::now_() { taskData->processTimeSet(externalUnixTime_offset_usec / 1000000.0); } } + // Process for network interfaces too + for (ESPEasy::net::networkIndex_t networkIndex = 0; networkIndex < NETWORK_MAX; networkIndex++) + { + ESPEasy::net::NWPluginData_base *NWdata = ESPEasy::net::getNWPluginDataBaseClassOnly(networkIndex); + + if (NWdata != nullptr) { + NWdata->processTimeSet(externalUnixTime_offset_usec / 1000000.0); + } + } } } diff --git a/src/src/Helpers/PeriodicalActions.cpp b/src/src/Helpers/PeriodicalActions.cpp index c6d3db370..b455e804f 100644 --- a/src/src/Helpers/PeriodicalActions.cpp +++ b/src/src/Helpers/PeriodicalActions.cpp @@ -39,6 +39,7 @@ #include "../../ESPEasy/net/Globals/ESPEasyEthEvent.h" #endif #include "../../ESPEasy/net/Globals/NetworkState.h" +#include "../../ESPEasy/net/Globals/NWPlugins.h" #ifdef USES_C015 @@ -125,7 +126,8 @@ void run10TimesPerSecond() { Blynk_Run_c015(); } #endif - if (!UseRTOSMultitasking) { + if (!UseRTOSMultitasking && (ESPEasy::net::NetworkConnected() || WiFi.AP.stationCount())) { + // FIXME TD-er: What about client connected via AP? START_TIMER web_server.handleClient(); STOP_TIMER(WEBSERVER_HANDLE_CLIENT); @@ -196,6 +198,13 @@ void runOncePerSecond() PluginCall(PLUGIN_ONCE_A_SECOND, 0, dummy); // unsigned long elapsed = micros() - start; + for (ESPEasy::net::networkIndex_t x = 0; x < NETWORK_MAX; x++) { + if (Settings.getNetworkEnabled(x)) { + EventStruct tempEvent; + tempEvent.NetworkIndex = x; + ESPEasy::net::NWPluginCall(NWPlugin::Function::NWPLUGIN_RECORD_STATS, &tempEvent); + } + } // I2C Watchdog feed if (Settings.WDI2CAddress != 0) diff --git a/src/src/WebServer/NetworkPage.cpp b/src/src/WebServer/NetworkPage.cpp index 9dd184844..3d387e35d 100644 --- a/src/src/WebServer/NetworkPage.cpp +++ b/src/src/WebServer/NetworkPage.cpp @@ -17,6 +17,8 @@ # include "../../ESPEasy/net/Globals/NWPlugins.h" # include "../../ESPEasy/net/Helpers/_NWPlugin_Helper_webform.h" # include "../../ESPEasy/net/Helpers/_NWPlugin_init.h" +# include "../../ESPEasy/net/_NWPlugin_Helper.h" + using namespace ESPEasy::net; @@ -33,7 +35,7 @@ void handle_networks() // 'index' value in the URL - uint8_t networkindex = getFormItemInt(F("index"), 0); + uint8_t networkindex = getFormItemInt(F("index"), 0); const bool networkIndexSet = networkindex != 0 && validNetworkIndex(networkindex - 1); --networkindex; // Index in URL is starting from 1, but starting from 0 in the array. @@ -163,9 +165,9 @@ void handle_networks_ShowAllNetworksTable() html_table_header(F(""), 70); html_table_header(F("Enabled"), 100); html_table_header(F("Network Adapter")); - #ifdef ESP32 - html_table_header(F("Prio"), 50); - #endif + # ifdef ESP32 + html_table_header(F("Prio"), 50); + # endif html_table_header(F("Connected")); html_table_header(F("Hostname/SSID")); html_table_header(F("HW Address")); @@ -206,9 +208,9 @@ void handle_networks_ShowAllNetworksTable() addHtml(getNWPluginNameFromNWPluginID(Settings.getNWPluginID_for_network(x))); const NWPlugin::Function functions[] { -#ifdef ESP32 +# ifdef ESP32 NWPlugin::Function::NWPLUGIN_WEBFORM_SHOW_ROUTE_PRIO, -#endif +# endif NWPlugin::Function::NWPLUGIN_WEBFORM_SHOW_CONNECTED, NWPlugin::Function::NWPLUGIN_WEBFORM_SHOW_HOSTNAME, NWPlugin::Function::NWPLUGIN_WEBFORM_SHOW_HW_ADDRESS, @@ -216,7 +218,7 @@ void handle_networks_ShowAllNetworksTable() NWPlugin::Function::NWPLUGIN_WEBFORM_SHOW_PORT }; -// const networkDriverIndex_t NetworkDriverIndex = getNetworkDriverIndex_from_NetworkIndex(x); + // const networkDriverIndex_t NetworkDriverIndex = getNetworkDriverIndex_from_NetworkIndex(x); for (uint8_t i = 0; i < NR_ELEMENTS(functions); ++i) { html_TD(); @@ -226,21 +228,25 @@ void handle_networks_ShowAllNetworksTable() String str; const bool res = NWPluginCall(functions[i], &TempEvent, str); -#ifdef ESP32 +# ifdef ESP32 + if (functions[i] == NWPlugin::Function::NWPLUGIN_WEBFORM_SHOW_ROUTE_PRIO) { if (TempEvent.Par1 > 0) { addHtmlInt(TempEvent.Par1); + if (TempEvent.Par2) { addHtml(F("(*)")); } } - } else -#endif + } else +# endif // ifdef ESP32 + if (functions[i] == NWPlugin::Function::NWPLUGIN_WEBFORM_SHOW_CONNECTED) { if (!res || str.isEmpty()) { addEnabled(res); } else { String conn_duration; + if (NWPluginCall(NWPlugin::Function::NWPLUGIN_GET_CONNECTED_DURATION, &TempEvent, conn_duration)) { if (conn_duration.length()) { str += '\n'; @@ -279,7 +285,8 @@ void handle_networks_ShowAllNetworksTable() html_end_form(); } -void handle_networks_NetworkSettingsPage(ESPEasy::net::networkIndex_t networkindex) { +void handle_networks_NetworkSettingsPage(ESPEasy::net::networkIndex_t networkindex) +{ if (!validNetworkIndex(networkindex)) { return; } const networkDriverIndex_t networkDriverIndex = @@ -448,18 +455,45 @@ void handle_networks_NetworkSettingsPage(ESPEasy::net::networkIndex_t networkind addHtmlInt(TempEvent.Par64_2); } -#ifdef ESP32 +# ifdef ESP32 + if (NWPluginCall(NWPlugin::Function::NWPLUGIN_GET_TRAFFIC_COUNT, &TempEvent, str)) { addRowLabel(F("TX Bytes Total")); addHtmlInt(TempEvent.Par1); addRowLabel(F("RX Bytes Total")); addHtmlInt(TempEvent.Par2); } -#endif +# endif // ifdef ESP32 } } } # endif // ifdef ESP32 +# if FEATURE_PLUGIN_STATS + { + // Task statistics and historic data in a chart + auto *NW_data = ESPEasy::net::getNWPluginData(TempEvent.NetworkIndex); + + if (NW_data && NW_data->hasPluginStats()) { + addFormSubHeader(F("Statistics")); +# if FEATURE_CHART_JS + + if (NW_data->nrSamplesPresent() > 0) { + addRowLabel(F("Historic data")); + NW_data->plot_ChartJS(); + } +# endif // if FEATURE_CHART_JS + String dummy; + bool somethingAdded = false; + + if (!ESPEasy::net::NWPluginCall(NWPlugin::Function::NWPLUGIN_WEBFORM_LOAD_SHOW_STATS, &TempEvent, dummy)) { + somethingAdded = NW_data->webformLoad_show_stats(&TempEvent); + } else { somethingAdded = true; } + } + } + +# endif // if FEATURE_PLUGIN_STATS + + addFormSeparator(2); From dc8b8ef7bca11038feed165483a74f58bf1312bf Mon Sep 17 00:00:00 2001 From: TD-er Date: Sun, 10 Aug 2025 01:27:40 +0200 Subject: [PATCH 189/564] [Network] Fix ESP8266 build issues --- src/ESPEasy/net/wifi/ESPEasyWifi_abstracted_ESP8266.cpp | 2 ++ src/src/Helpers/PeriodicalActions.cpp | 9 ++++++++- 2 files changed, 10 insertions(+), 1 deletion(-) diff --git a/src/ESPEasy/net/wifi/ESPEasyWifi_abstracted_ESP8266.cpp b/src/ESPEasy/net/wifi/ESPEasyWifi_abstracted_ESP8266.cpp index faa8bf02f..57c4eb97b 100644 --- a/src/ESPEasy/net/wifi/ESPEasyWifi_abstracted_ESP8266.cpp +++ b/src/ESPEasy/net/wifi/ESPEasyWifi_abstracted_ESP8266.cpp @@ -278,12 +278,14 @@ void doSetConnectionSpeed(bool ForceWiFi_bg_mode) { phyMode = WIFI_PHY_MODE_11G; addLog(LOG_LEVEL_INFO, F("WIFI : AP is set to 802.11g only")); } +/* } else { bool useAlternate = WiFiEventData.connectionFailures > 10; if (useAlternate) { phyMode = (WIFI_PHY_MODE_11G == phyMode) ? WIFI_PHY_MODE_11N : WIFI_PHY_MODE_11G; } +*/ } } else { // No need to perform a next attempt. diff --git a/src/src/Helpers/PeriodicalActions.cpp b/src/src/Helpers/PeriodicalActions.cpp index b455e804f..931d3a53f 100644 --- a/src/src/Helpers/PeriodicalActions.cpp +++ b/src/src/Helpers/PeriodicalActions.cpp @@ -126,7 +126,14 @@ void run10TimesPerSecond() { Blynk_Run_c015(); } #endif - if (!UseRTOSMultitasking && (ESPEasy::net::NetworkConnected() || WiFi.AP.stationCount())) { + if (!UseRTOSMultitasking && + (ESPEasy::net::NetworkConnected() || + #ifdef ESP32 + WiFi.AP.stationCount() + #else + WiFi.softAPgetStationNum() + #endif + )) { // FIXME TD-er: What about client connected via AP? START_TIMER web_server.handleClient(); From 8796ce1794835105f6ae2c30e04360694086da79 Mon Sep 17 00:00:00 2001 From: TD-er Date: Sun, 10 Aug 2025 01:44:51 +0200 Subject: [PATCH 190/564] [Network] Fix build on ESP8266 1M build --- src/ESPEasy/net/Globals/NWPlugins.cpp | 4 ++-- src/src/Helpers/PeriodicalActions.cpp | 2 ++ 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/src/ESPEasy/net/Globals/NWPlugins.cpp b/src/ESPEasy/net/Globals/NWPlugins.cpp index 2309610df..6c02b6edd 100644 --- a/src/ESPEasy/net/Globals/NWPlugins.cpp +++ b/src/ESPEasy/net/Globals/NWPlugins.cpp @@ -138,13 +138,13 @@ bool NWPluginCall(NWPlugin::Function Function, EventStruct *event, String& str) #if FEATURE_PLUGIN_STATS case NWPlugin::Function::NWPLUGIN_RECORD_STATS: { - NWPluginData_static_runtime& runtime_data = NW_data->getNWPluginData_static_runtime(); +// NWPluginData_static_runtime& runtime_data = NW_data->getNWPluginData_static_runtime(); success = NW_data->record_stats(); break; } case NWPlugin::Function::NWPLUGIN_WEBFORM_LOAD_SHOW_STATS: { - NWPluginData_static_runtime& runtime_data = NW_data->getNWPluginData_static_runtime(); +// NWPluginData_static_runtime& runtime_data = NW_data->getNWPluginData_static_runtime(); success = NW_data->webformLoad_show_stats(event); break; } diff --git a/src/src/Helpers/PeriodicalActions.cpp b/src/src/Helpers/PeriodicalActions.cpp index 931d3a53f..548a17c25 100644 --- a/src/src/Helpers/PeriodicalActions.cpp +++ b/src/src/Helpers/PeriodicalActions.cpp @@ -205,6 +205,7 @@ void runOncePerSecond() PluginCall(PLUGIN_ONCE_A_SECOND, 0, dummy); // unsigned long elapsed = micros() - start; +#if FEATURE_PLUGIN_STATS for (ESPEasy::net::networkIndex_t x = 0; x < NETWORK_MAX; x++) { if (Settings.getNetworkEnabled(x)) { EventStruct tempEvent; @@ -212,6 +213,7 @@ void runOncePerSecond() ESPEasy::net::NWPluginCall(NWPlugin::Function::NWPLUGIN_RECORD_STATS, &tempEvent); } } +#endif // I2C Watchdog feed if (Settings.WDI2CAddress != 0) From df0e663f1b44662b91cb2b94c66ea6f8f8f533be Mon Sep 17 00:00:00 2001 From: TD-er Date: Sun, 10 Aug 2025 14:42:22 +0200 Subject: [PATCH 191/564] [Build] Reduce build size on ESP8266 builds --- .../NWPluginData_static_runtime_ESP8266.cpp | 17 ++++++++++++++--- .../net/Helpers/_NWPlugin_Helper_webform.cpp | 8 ++++---- .../net/wifi/ESPEasyWiFi_state_machine.cpp | 6 ++++++ .../net/wifi/ESPEasyWifi_abstracted_ESP8266.cpp | 11 ++++++++++- src/src/Commands/Diagnostic.cpp | 8 ++++---- src/src/Commands/Diagnostic.h | 2 +- src/src/Commands/GPIO.cpp | 6 +++--- src/src/Commands/Servo.cpp | 2 ++ src/src/CustomBuild/define_plugin_sets.h | 4 ++-- src/src/DataStructs/NodesHandler.cpp | 3 ++- src/src/DataStructs/SecurityStruct.cpp | 2 +- src/src/DataStructs/SystemTimerStruct.cpp | 2 +- src/src/DataTypes/SettingsType.cpp | 2 +- src/src/DataTypes/SettingsType.h | 4 ++-- src/src/ESPEasyCore/Controller.cpp | 2 +- src/src/ESPEasyCore/ESPEasy_Console.cpp | 2 +- src/src/ESPEasyCore/ESPEasy_loop.cpp | 2 +- src/src/ESPEasyCore/ESPEasy_setup.cpp | 12 ++++++++++-- src/src/Helpers/ESPEasy_Storage.cpp | 9 ++++----- src/src/Helpers/ESPEasy_checks.cpp | 8 +------- src/src/Helpers/ESPEasy_checks.h | 2 +- src/src/Helpers/Hardware_I2C.cpp | 2 +- src/src/Helpers/Misc.cpp | 2 +- src/src/Helpers/PeriodicalActions.cpp | 2 +- src/src/Helpers/Scheduler_RulesTimer.cpp | 4 ++-- src/src/WebServer/ConfigPage.cpp | 2 +- src/src/WebServer/ESPEasy_WebServer.cpp | 4 ++-- src/src/WebServer/LoadFromFS.cpp | 2 +- src/src/WebServer/Markup_Buttons.cpp | 4 ++-- src/src/WebServer/NetworkPage.cpp | 6 ++++++ src/src/WebServer/RootPage.cpp | 6 +++--- 31 files changed, 92 insertions(+), 56 deletions(-) diff --git a/src/ESPEasy/net/DataStructs/NWPluginData_static_runtime_ESP8266.cpp b/src/ESPEasy/net/DataStructs/NWPluginData_static_runtime_ESP8266.cpp index d59501be8..244bc9e1d 100644 --- a/src/ESPEasy/net/DataStructs/NWPluginData_static_runtime_ESP8266.cpp +++ b/src/ESPEasy/net/DataStructs/NWPluginData_static_runtime_ESP8266.cpp @@ -27,27 +27,34 @@ bool NWPluginData_static_runtime::hasIP() const void NWPluginData_static_runtime::mark_start() { _startStopStats.setOn(); + #ifndef BUILD_NO_DEBUG addLog(LOG_LEVEL_INFO, _isSTA ? F("STA: Started") : F("AP: Started")); + #endif } void NWPluginData_static_runtime::mark_stop() { _startStopStats.setOff(); + #ifndef BUILD_NO_DEBUG addLog(LOG_LEVEL_INFO, _isSTA ? F("STA: Stopped") : F("AP: Stopped")); + #endif } void NWPluginData_static_runtime::mark_got_IP() { // Set OnOffTimer to off so we can also count how often we het new IP _gotIPStats.forceSet(true); - + #ifndef BUILD_NO_DEBUG addLog(LOG_LEVEL_INFO, _isSTA ? F("STA: Got IP") : F("AP: Got IP")); + #endif } void NWPluginData_static_runtime::mark_lost_IP() { _gotIPStats.setOff(); + #ifndef BUILD_NO_DEBUG addLog(LOG_LEVEL_INFO, _isSTA ? F("STA: Lost IP") : F("AP: Lost IP")); + #endif } void NWPluginData_static_runtime::mark_begin_establish_connection() @@ -58,10 +65,12 @@ void NWPluginData_static_runtime::mark_begin_establish_connection() void NWPluginData_static_runtime::mark_connected() { +#ifndef BUILD_NO_DEBUG const bool logDuration = _establishConnectStats.isOn(); +#endif _establishConnectStats.setOff(); _connectedStats.setOn(); - +#ifndef BUILD_NO_DEBUG if (logDuration) { addLog(LOG_LEVEL_INFO, concat( F("STA: Connected, took: "), @@ -70,17 +79,19 @@ void NWPluginData_static_runtime::mark_connected() } else { addLog(LOG_LEVEL_INFO, F("STA: Connected")); } +#endif } void NWPluginData_static_runtime::mark_disconnected() { _connectedStats.setOff(); - +#ifndef BUILD_NO_DEBUG if (_isSTA) { addLog(LOG_LEVEL_INFO, concat( F("STA: Disconnected. Connected for: "), format_msec_duration_HMS(_connectedStats.getLastOnDuration_ms()))); } +#endif } } // namespace net diff --git a/src/ESPEasy/net/Helpers/_NWPlugin_Helper_webform.cpp b/src/ESPEasy/net/Helpers/_NWPlugin_Helper_webform.cpp index 637d1a022..5fd57e880 100644 --- a/src/ESPEasy/net/Helpers/_NWPlugin_Helper_webform.cpp +++ b/src/ESPEasy/net/Helpers/_NWPlugin_Helper_webform.cpp @@ -23,10 +23,10 @@ const __FlashStringHelper* toString(NetworkSettingsStruct::VarType parameterIdx, { switch (parameterIdx) { - case NetworkSettingsStruct::NETWORK_IP: return F("Network IP"); - case NetworkSettingsStruct::NETWORK_PORT: return F("Network Port"); - case NetworkSettingsStruct::NETWORK_USER: return F("Network User"); - case NetworkSettingsStruct::NETWORK_PASS: return F("Network Password"); + case NetworkSettingsStruct::NETWORK_IP: return F("IP"); + case NetworkSettingsStruct::NETWORK_PORT: return F("Port"); + case NetworkSettingsStruct::NETWORK_USER: return F("User"); + case NetworkSettingsStruct::NETWORK_PASS: return F("Password"); case NetworkSettingsStruct::NETWORK_ENABLED: if (displayName) { return F("Enabled"); } diff --git a/src/ESPEasy/net/wifi/ESPEasyWiFi_state_machine.cpp b/src/ESPEasy/net/wifi/ESPEasyWiFi_state_machine.cpp index b2d36199b..6893bb422 100644 --- a/src/ESPEasy/net/wifi/ESPEasyWiFi_state_machine.cpp +++ b/src/ESPEasy/net/wifi/ESPEasyWiFi_state_machine.cpp @@ -149,9 +149,11 @@ void ESPEasyWiFi_t::loop() # if !FEATURE_ESP8266_DIRECT_WIFI_SCAN WiFi_AP_Candidates.process_WiFiscan(scanCompleteStatus); # endif +#ifndef BUILD_NO_DEBUG addLog(LOG_LEVEL_INFO, strformat( F("WiFi : Scan done, found %d APs"), WiFi_AP_Candidates.scanComplete())); +#endif } else if (scanCompleteStatus == -2) { // WIFI_SCAN_FAILED addLog(LOG_LEVEL_ERROR, F("WiFi : Scan failed")); WiFi.scanDelete(); @@ -183,10 +185,12 @@ void ESPEasyWiFi_t::loop() # if !FEATURE_ESP8266_DIRECT_WIFI_SCAN WiFi_AP_Candidates.process_WiFiscan(scanCompleteStatus); # endif +#ifndef BUILD_NO_DEBUG addLog(LOG_LEVEL_INFO, strformat( F("WiFi : Scan channel %d done, found %d APs"), _scan_channel, WiFi_AP_Candidates.scanComplete())); +#endif } else if (scanCompleteStatus == -2) { // WIFI_SCAN_FAILED addLog(LOG_LEVEL_ERROR, F("WiFi : Scan failed")); WiFi.scanDelete(); @@ -388,9 +392,11 @@ bool ESPEasyWiFi_t::connectSTA() } if (WiFiEventData.lastDisconnectReason != WIFI_DISCONNECT_REASON_UNSPECIFIED) { +#ifndef BUILD_NO_DEBUG addLog(LOG_LEVEL_INFO, concat( F("WiFi : Disconnect reason: "), getLastDisconnectReason())); +#endif WiFiEventData.processedDisconnect = true; } diff --git a/src/ESPEasy/net/wifi/ESPEasyWifi_abstracted_ESP8266.cpp b/src/ESPEasy/net/wifi/ESPEasyWifi_abstracted_ESP8266.cpp index 57c4eb97b..eda6c8ab7 100644 --- a/src/ESPEasy/net/wifi/ESPEasyWifi_abstracted_ESP8266.cpp +++ b/src/ESPEasy/net/wifi/ESPEasyWifi_abstracted_ESP8266.cpp @@ -87,8 +87,9 @@ bool doSetWifiMode(WiFiMode_t new_mode) WiFi.forceSleepWake(); // Make sure WiFi is really active. delay(100); } - +#ifndef BUILD_NO_DEBUG addLog(LOG_LEVEL_INFO, concat(F("WIFI : Set WiFi to "), doGetWifiModeString(new_mode))); +#endif int retry = 2; @@ -99,13 +100,17 @@ bool doSetWifiMode(WiFiMode_t new_mode) retry = 2; while (WiFi.getMode() != new_mode && retry > 0) { +#ifndef BUILD_NO_DEBUG addLog(LOG_LEVEL_INFO, F("WIFI : mode not yet set")); +#endif delay(100); --retry; } if (WiFi.getMode() != new_mode) { +#ifndef BUILD_NO_DEBUG addLog(LOG_LEVEL_ERROR, F("WIFI : Cannot set mode!!!!!")); +#endif return false; } @@ -273,10 +278,14 @@ void doSetConnectionSpeed(bool ForceWiFi_bg_mode) { if (candidate.phy_known() && (candidate.bits.phy_11g != candidate.bits.phy_11n)) { if ((WIFI_PHY_MODE_11G == phyMode) && !candidate.bits.phy_11g) { phyMode = WIFI_PHY_MODE_11N; +#ifndef BUILD_NO_DEBUG addLog(LOG_LEVEL_INFO, F("WIFI : AP is set to 802.11n only")); +#endif } else if ((WIFI_PHY_MODE_11N == phyMode) && !candidate.bits.phy_11n) { phyMode = WIFI_PHY_MODE_11G; +#ifndef BUILD_NO_DEBUG addLog(LOG_LEVEL_INFO, F("WIFI : AP is set to 802.11g only")); +#endif } /* } else { diff --git a/src/src/Commands/Diagnostic.cpp b/src/src/Commands/Diagnostic.cpp index a402c6312..e5763d4f9 100644 --- a/src/src/Commands/Diagnostic.cpp +++ b/src/src/Commands/Diagnostic.cpp @@ -31,9 +31,9 @@ #include -#ifndef BUILD_MINIMAL_OTA +#ifndef BUILD_NO_DEBUG bool showSettingsFileLayout = false; -#endif // ifndef BUILD_MINIMAL_OTA +#endif #ifndef BUILD_NO_DIAGNOSTIC_COMMANDS String Command_Lowmem(struct EventStruct *event, const char *Line) @@ -91,7 +91,7 @@ const __FlashStringHelper * Command_MemInfo(struct EventStruct *event, const cha const __FlashStringHelper * Command_MemInfo_detail(struct EventStruct *event, const char *Line) { -#ifndef BUILD_MINIMAL_OTA +#ifndef BUILD_NO_DEBUG showSettingsFileLayout = true; Command_MemInfo(event, Line); @@ -124,7 +124,7 @@ const __FlashStringHelper * Command_MemInfo_detail(struct EventStruct *event, co return return_see_serial(event); #else return return_command_failed_flashstr(); - #endif // ifndef BUILD_MINIMAL_OTA + #endif } const __FlashStringHelper * Command_Background(struct EventStruct *event, const char *Line) diff --git a/src/src/Commands/Diagnostic.h b/src/src/Commands/Diagnostic.h index fa3a84c7a..8803edd92 100644 --- a/src/src/Commands/Diagnostic.h +++ b/src/src/Commands/Diagnostic.h @@ -28,7 +28,7 @@ const __FlashStringHelper * Command_logPortStatus(struct EventStruct *event, con #endif -#ifndef BUILD_MINIMAL_OTA +#ifndef BUILD_NO_DEBUG // Show settings file layout in charts on sysinfo page. // Will be enabled after running command "meminfodetail" extern bool showSettingsFileLayout; diff --git a/src/src/Commands/GPIO.cpp b/src/src/Commands/GPIO.cpp index bb66cd550..ac18d3ee2 100644 --- a/src/src/Commands/GPIO.cpp +++ b/src/src/Commands/GPIO.cpp @@ -100,7 +100,7 @@ bool gpio_monitor_helper(int port, struct EventStruct *event, const char *Line) globalMapPortStatus[key].state = state; if (state == -1) { globalMapPortStatus[key].mode = PIN_MODE_OFFLINE; } - #ifndef BUILD_MINIMAL_OTA + #ifndef BUILD_NO_DEBUG if (loglevelActiveFor(LOG_LEVEL_INFO)) { addLog(LOG_LEVEL_INFO, concat( logPrefix, @@ -148,7 +148,7 @@ bool gpio_unmonitor_helper(int port, struct EventStruct *event, const char *Line SendStatusOnlyIfNeeded(event, SEARCH_PIN_STATE, key, dummy, 0); removeMonitorFromPort(key); - #ifndef BUILD_MINIMAL_OTA + #ifndef BUILD_NO_DEBUG if (loglevelActiveFor(LOG_LEVEL_INFO)) { addLog(LOG_LEVEL_INFO, concat( logPrefix, @@ -417,7 +417,7 @@ const __FlashStringHelper * Command_GPIO_RTTTL(struct EventStruct *event, const return return_command_success_flashstr(); } #else // if FEATURE_RTTTL - #ifndef BUILD_MINIMAL_OTA + #ifndef BUILD_NO_DEBUG addLog(LOG_LEVEL_ERROR, F("RTTTL: command not included in build")); #endif #endif // if FEATURE_RTTTL diff --git a/src/src/Commands/Servo.cpp b/src/src/Commands/Servo.cpp index 1b8f6008a..47adbb826 100644 --- a/src/src/Commands/Servo.cpp +++ b/src/src/Commands/Servo.cpp @@ -59,7 +59,9 @@ const __FlashStringHelper * Command_Servo(struct EventStruct *event, const char tempStatus.monitor = 0; tempStatus.command = 0; savePortStatus(key, tempStatus); +#ifndef BUILD_NO_DEBUG addLog(LOG_LEVEL_INFO, concat(log, F(" Servo detached"))); +#endif return return_command_success_flashstr(); } diff --git a/src/src/CustomBuild/define_plugin_sets.h b/src/src/CustomBuild/define_plugin_sets.h index 7153fd3ca..9fd5993b5 100644 --- a/src/src/CustomBuild/define_plugin_sets.h +++ b/src/src/CustomBuild/define_plugin_sets.h @@ -3495,7 +3495,7 @@ To create/register a plugin, you have to : #endif #ifndef FEATURE_DEFINE_SERIAL_CONSOLE_PORT - #ifdef ESP8266_1M + #if defined(ESP8266_1M) || defined(LIMIT_BUILD_SIZE) #define FEATURE_DEFINE_SERIAL_CONSOLE_PORT 0 #else #define FEATURE_DEFINE_SERIAL_CONSOLE_PORT 1 @@ -3602,7 +3602,7 @@ To create/register a plugin, you have to : #endif #ifndef FEATURE_CHART_STORAGE_LAYOUT - #if defined(LIMIT_BUILD_SIZE) || defined(BUILD_MINIMAL_OTA) + #if defined(LIMIT_BUILD_SIZE) || defined(BUILD_MINIMAL_OTA) || defined(BUILD_NO_DEBUG) #define FEATURE_CHART_STORAGE_LAYOUT 0 #else #define FEATURE_CHART_STORAGE_LAYOUT 1 diff --git a/src/src/DataStructs/NodesHandler.cpp b/src/src/DataStructs/NodesHandler.cpp index 4b5e1be98..b35b2e3db 100644 --- a/src/src/DataStructs/NodesHandler.cpp +++ b/src/src/DataStructs/NodesHandler.cpp @@ -155,7 +155,7 @@ bool NodesHandler::addNode(const NodeStruct& node, const ESPEasy_now_traceroute_ } ESPEasy_now_peermanager.addPeer(node.ESPEasy_Now_MAC(), node.channel); - +#ifndef BUILD_NO_DEBUG if (!node.isThisNode()) { if (traceRoute.getDistance() != 255) { if (loglevelActiveFor(LOG_LEVEL_INFO)) { @@ -171,6 +171,7 @@ bool NodesHandler::addNode(const NodeStruct& node, const ESPEasy_now_traceroute_ } } else {} } +#endif return isNewNode; } #endif diff --git a/src/src/DataStructs/SecurityStruct.cpp b/src/src/DataStructs/SecurityStruct.cpp index 42510b2ee..25f6e3dad 100644 --- a/src/src/DataStructs/SecurityStruct.cpp +++ b/src/src/DataStructs/SecurityStruct.cpp @@ -63,7 +63,7 @@ void SecurityStruct::clearWiFiCredentials() { ZERO_FILL(WifiKey); ZERO_FILL(WifiSSID2); ZERO_FILL(WifiKey2); - #ifndef BUILD_MINIMAL_OTA + #ifndef BUILD_NO_DEBUG addLog(LOG_LEVEL_INFO, F("WiFi : Clear WiFi credentials from settings")); #endif } diff --git a/src/src/DataStructs/SystemTimerStruct.cpp b/src/src/DataStructs/SystemTimerStruct.cpp index 4b5555b4d..11b69280c 100644 --- a/src/src/DataStructs/SystemTimerStruct.cpp +++ b/src/src/DataStructs/SystemTimerStruct.cpp @@ -19,7 +19,7 @@ systemTimerStruct::systemTimerStruct(int recurringCount, unsigned long msecFromN // Create a new timer which should be "scheduled" now to clear up any data _recurringCount = 0; // Do not reschedule _loopCount = 0; // Do not execute - #ifndef BUILD_MINIMAL_OTA + #ifndef BUILD_NO_DEBUG addLog(LOG_LEVEL_INFO, F("TIMER: disable timer")); #endif } diff --git a/src/src/DataTypes/SettingsType.cpp b/src/src/DataTypes/SettingsType.cpp index 9859495a0..88c215869 100644 --- a/src/src/DataTypes/SettingsType.cpp +++ b/src/src/DataTypes/SettingsType.cpp @@ -195,7 +195,7 @@ int SettingsType::getFileSize(Enum settingsType) { return max_file_pos; } -#ifndef BUILD_MINIMAL_OTA +#ifndef BUILD_NO_DEBUG unsigned int SettingsType::getSVGcolor(Enum settingsType) { switch (settingsType) { case Enum::BasicSettings_Type: diff --git a/src/src/DataTypes/SettingsType.h b/src/src/DataTypes/SettingsType.h index 37fd2982c..3008bda09 100644 --- a/src/src/DataTypes/SettingsType.h +++ b/src/src/DataTypes/SettingsType.h @@ -49,9 +49,9 @@ public: static int getMaxFilePos(Enum settingsType); static int getFileSize(Enum settingsType); -#ifndef BUILD_MINIMAL_OTA +#ifndef BUILD_NO_DEBUG static unsigned int getSVGcolor(Enum settingsType); -#endif // ifndef BUILD_MINIMAL_OTA +#endif static SettingsFileEnum getSettingsFile(Enum settingsType); static String getSettingsFileName(Enum settingsType, diff --git a/src/src/ESPEasyCore/Controller.cpp b/src/src/ESPEasyCore/Controller.cpp index 5810f2fed..455e06adc 100644 --- a/src/src/ESPEasyCore/Controller.cpp +++ b/src/src/ESPEasyCore/Controller.cpp @@ -178,7 +178,7 @@ bool MQTTConnect(controllerIndex_t controller_idx) MakeControllerSettings(ControllerSettings); // -V522 if (!AllocatedControllerSettings()) { - #ifndef BUILD_MINIMAL_OTA + #ifndef BUILD_NO_DEBUG addLog(LOG_LEVEL_ERROR, F("MQTT : Cannot connect, out of RAM")); #endif return false; diff --git a/src/src/ESPEasyCore/ESPEasy_Console.cpp b/src/src/ESPEasyCore/ESPEasy_Console.cpp index d0ee0202c..95e78c611 100644 --- a/src/src/ESPEasyCore/ESPEasy_Console.cpp +++ b/src/src/ESPEasyCore/ESPEasy_Console.cpp @@ -208,7 +208,7 @@ void EspEasy_Console_t::begin(uint32_t baudrate) #else // if FEATURE_DEFINE_SERIAL_CONSOLE_PORT # ifdef ESP8266 _mainSerial._serial->begin(baudrate); - #ifndef BUILD_MINIMAL_OTA + #ifdef BUILD_NO_DEBUG addLog(LOG_LEVEL_INFO, F("ESPEasy console using HW Serial")); #endif # endif // ifdef ESP8266 diff --git a/src/src/ESPEasyCore/ESPEasy_loop.cpp b/src/src/ESPEasyCore/ESPEasy_loop.cpp index 78c7c0c9a..71166c1ee 100644 --- a/src/src/ESPEasyCore/ESPEasy_loop.cpp +++ b/src/src/ESPEasyCore/ESPEasy_loop.cpp @@ -80,7 +80,7 @@ void ESPEasy_loop() bool firstLoopConnectionsEstablished = ESPEasy::net::NetworkConnected() && firstLoop; if (firstLoopConnectionsEstablished) { - #ifndef BUILD_MINIMAL_OTA + #ifndef LIMIT_BUILD_SIZE addLog(LOG_LEVEL_INFO, F("firstLoopConnectionsEstablished")); #endif firstLoop = false; diff --git a/src/src/ESPEasyCore/ESPEasy_setup.cpp b/src/src/ESPEasyCore/ESPEasy_setup.cpp index 40f8b6faf..866ab3dd1 100644 --- a/src/src/ESPEasyCore/ESPEasy_setup.cpp +++ b/src/src/ESPEasyCore/ESPEasy_setup.cpp @@ -173,6 +173,14 @@ void ESPEasy_setup() switch (pkg_version) { + case EFUSE_RD_CHIP_VER_PKG_ESP32U4WDH: + // Very strange model as the same model exists as: + // - Single core @160 MHz + // - Dual core @240 MHz + // See: https://www.letscontrolit.com/forum/viewtopic.php?t=10735 + gpio_num_t PSRAM_CLK = GPIO_NUM_NC; //GPIO_NUM_17; + gpio_num_t PSRAM_CS = GPIO_NUM_NC; //GPIO_NUM_16; + break; case EFUSE_RD_CHIP_VER_PKG_ESP32D2WDQ5: PSRAM_CLK = static_cast(CONFIG_D2WD_PSRAM_CLK_IO); PSRAM_CS = static_cast(CONFIG_D2WD_PSRAM_CS_IO); @@ -232,9 +240,9 @@ void ESPEasy_setup() // ESPEasy::net::wifi::initWiFi(); WiFiEventData.clearAll(); -#ifndef BUILD_MINIMAL_OTA +#ifndef LIMIT_BUILD_SIZE run_compiletime_checks(); -#endif // ifndef BUILD_MINIMAL_OTA +#endif #ifdef ESP8266 // ets_isr_attach(8, sw_watchdog_callback, nullptr); // Set a callback for feeding the watchdog. diff --git a/src/src/Helpers/ESPEasy_Storage.cpp b/src/src/Helpers/ESPEasy_Storage.cpp index f253c599f..9699b3d84 100644 --- a/src/src/Helpers/ESPEasy_Storage.cpp +++ b/src/src/Helpers/ESPEasy_Storage.cpp @@ -686,7 +686,7 @@ bool Erase_WiFi_Calibration() { ESPEasy::net::wifi::setWifiMode(WIFI_OFF); if (!ESP.eraseConfig()) return false; - #ifndef BUILD_MINIMAL_OTA + #ifndef LIMIT_BUILD_SIZE addLog(LOG_LEVEL_INFO, F("WiFi : Erased WiFi calibration data")); #endif #endif @@ -829,12 +829,12 @@ String SaveSettings(bool forFactoryReset) return err; } -#ifndef BUILD_MINIMAL_OTA +#ifndef LIMIT_BUILD_SIZE // Must check this after saving, or else it is not possible to fix multiple // issues which can only corrected on different pages. if (!SettingsCheck(err)) { return err; } -#endif // ifndef BUILD_MINIMAL_OTA +#endif // } @@ -1405,8 +1405,7 @@ String SaveTaskSettings(taskIndex_t TaskIndex) reinterpret_cast(&ExtraTaskSettings), sizeof(struct ExtraTaskSettingsStruct)); -#if !defined(PLUGIN_BUILD_MINIMAL_OTA) && !defined(ESP8266_1M) - +#ifndef LIMIT_BUILD_SIZE if (err.isEmpty()) { err = checkTaskSettings(TaskIndex); } diff --git a/src/src/Helpers/ESPEasy_checks.cpp b/src/src/Helpers/ESPEasy_checks.cpp index cbd5e945a..869336e5d 100644 --- a/src/src/Helpers/ESPEasy_checks.cpp +++ b/src/src/Helpers/ESPEasy_checks.cpp @@ -2,7 +2,7 @@ #include "../../ESPEasy_common.h" -#ifndef BUILD_MINIMAL_OTA +#ifndef LIMIT_BUILD_SIZE #include "../DataStructs/CRCStruct.h" #include "../DataStructs/ControllerSettingsStruct.h" @@ -79,7 +79,6 @@ void check_max_size() { // ******************************************************************************** void run_compiletime_checks() { - #ifndef LIMIT_BUILD_SIZE check_size(); check_size(); check_max_size(); @@ -197,11 +196,7 @@ void run_compiletime_checks() { // to determine nr of bits in a struct. static_assert(GPIO_DIRECTION_NR_BITS== NR_BITS(static_cast(gpio_direction::gpio_direction_MAX)), "Correct GPIO_DIRECTION_NR_BITS"); - - #endif } - -#ifndef LIMIT_BUILD_SIZE String ReportOffsetErrorInStruct(const String& structname, size_t offset) { String error; if (error.reserve(48 + structname.length())) { @@ -211,7 +206,6 @@ String ReportOffsetErrorInStruct(const String& structname, size_t offset) { } return error; } -#endif /*********************************************************************************************\ * Analyze SettingsStruct and report inconsistencies diff --git a/src/src/Helpers/ESPEasy_checks.h b/src/src/Helpers/ESPEasy_checks.h index 070e36e73..a6a55c51e 100644 --- a/src/src/Helpers/ESPEasy_checks.h +++ b/src/src/Helpers/ESPEasy_checks.h @@ -3,7 +3,7 @@ #include "../../ESPEasy_common.h" -#ifndef BUILD_MINIMAL_OTA +#ifndef LIMIT_BUILD_SIZE #include "../Globals/Plugins.h" void run_compiletime_checks(); diff --git a/src/src/Helpers/Hardware_I2C.cpp b/src/src/Helpers/Hardware_I2C.cpp index 733ecb444..b4c210c6b 100644 --- a/src/src/Helpers/Hardware_I2C.cpp +++ b/src/src/Helpers/Hardware_I2C.cpp @@ -32,7 +32,7 @@ void initI2C() { #endif // if !FEATURE_I2C_MULTIPLE { if (Settings.isI2CEnabled(i2cBus)) { - #ifndef BUILD_MINIMAL_OTA + #ifndef LIMIT_BUILD_SIZE #if !FEATURE_I2C_MULTIPLE addLog(LOG_LEVEL_INFO, F("INIT : I2C Bus")); #else // if !FEATURE_I2C_MULTIPLE diff --git a/src/src/Helpers/Misc.cpp b/src/src/Helpers/Misc.cpp index 5ea1130fb..30099594f 100644 --- a/src/src/Helpers/Misc.cpp +++ b/src/src/Helpers/Misc.cpp @@ -186,7 +186,7 @@ void taskClear(taskIndex_t taskIndex, bool save) ExtraTaskSettings.TaskIndex = taskIndex; if (save) { - #ifndef BUILD_MINIMAL_OTA + #ifndef LIMIT_BUILD_SIZE addLog(LOG_LEVEL_INFO, F("taskClear() save settings")); #endif // ifndef BUILD_MINIMAL_OTA SaveTaskSettings(taskIndex); diff --git a/src/src/Helpers/PeriodicalActions.cpp b/src/src/Helpers/PeriodicalActions.cpp index 548a17c25..cf08e1f58 100644 --- a/src/src/Helpers/PeriodicalActions.cpp +++ b/src/src/Helpers/PeriodicalActions.cpp @@ -155,7 +155,7 @@ void runOncePerSecond() RTC.flashDayCounter=0; saveToRTC(); dailyResetCounter=0; - #ifndef BUILD_MINIMAL_OTA + #ifndef LIMIT_BUILD_SIZE addLog(LOG_LEVEL_INFO, F("SYS : Reset 24h counters")); #endif } diff --git a/src/src/Helpers/Scheduler_RulesTimer.cpp b/src/src/Helpers/Scheduler_RulesTimer.cpp index 3c3795cf4..8c568b5ad 100644 --- a/src/src/Helpers/Scheduler_RulesTimer.cpp +++ b/src/src/Helpers/Scheduler_RulesTimer.cpp @@ -86,7 +86,7 @@ bool ESPEasy_Scheduler::pause_rules_timer(unsigned long timerIndex) { auto it = systemTimers.find(timerID.mixed_id); if (it == systemTimers.end()) { - #ifndef BUILD_MINIMAL_OTA + #ifndef LIMIT_BUILD_SIZE addLog(LOG_LEVEL_INFO, F("TIMER: no timer set")); #endif return false; @@ -96,7 +96,7 @@ bool ESPEasy_Scheduler::pause_rules_timer(unsigned long timerIndex) { if (msecTimerHandler.getTimerForId(timerID.mixed_id, timer)) { if (it->second.isPaused()) { - #ifndef BUILD_MINIMAL_OTA + #ifndef LIMIT_BUILD_SIZE addLog(LOG_LEVEL_INFO, F("TIMER: already paused")); #endif } else { diff --git a/src/src/WebServer/ConfigPage.cpp b/src/src/WebServer/ConfigPage.cpp index 366623f0e..5f3c70317 100644 --- a/src/src/WebServer/ConfigPage.cpp +++ b/src/src/WebServer/ConfigPage.cpp @@ -52,7 +52,7 @@ void handle_config() { Settings.Unit = getFormItemInt(F("unit"), Settings.Unit); if (strcmp(Settings.Name, name.c_str()) != 0) { - #ifndef BUILD_MINIMAL_OTA + #ifndef LIMIT_BUILD_SIZE addLog(LOG_LEVEL_INFO, F("Unit Name changed.")); #endif diff --git a/src/src/WebServer/ESPEasy_WebServer.cpp b/src/src/WebServer/ESPEasy_WebServer.cpp index bd88f77fa..d31df786c 100644 --- a/src/src/WebServer/ESPEasy_WebServer.cpp +++ b/src/src/WebServer/ESPEasy_WebServer.cpp @@ -393,13 +393,13 @@ void setWebserverRunning(bool state) { if (state) { WebServerInit(); web_server.begin(Settings.WebserverPort); - #ifndef BUILD_MINIMAL_OTA + #ifndef LIMIT_BUILD_SIZE addLog(LOG_LEVEL_INFO, F("Webserver: start")); #endif } else { web_server.client().stop(); web_server.stop(); - #ifndef BUILD_MINIMAL_OTA + #ifndef LIMIT_BUILD_SIZE addLog(LOG_LEVEL_INFO, F("Webserver: stop")); #endif } diff --git a/src/src/WebServer/LoadFromFS.cpp b/src/src/WebServer/LoadFromFS.cpp index 158ead854..080abe77d 100644 --- a/src/src/WebServer/LoadFromFS.cpp +++ b/src/src/WebServer/LoadFromFS.cpp @@ -298,7 +298,7 @@ bool loadFromFS(String path) { } if (!web_server.client().connected()) { - #ifndef BUILD_MINIMAL_OTA + #ifndef LIMIT_BUILD_SIZE addLog(LOG_LEVEL_INFO, strformat( F("loadFromFS: Client %s not connected"), web_server.client().remoteIP().toString().c_str() diff --git a/src/src/WebServer/Markup_Buttons.cpp b/src/src/WebServer/Markup_Buttons.cpp index 0b074508c..959854c17 100644 --- a/src/src/WebServer/Markup_Buttons.cpp +++ b/src/src/WebServer/Markup_Buttons.cpp @@ -44,7 +44,7 @@ void addButtonWithSvg(const String& url, const String& label, const String& svgP addHtml(F(" 0; if (hasSVG) @@ -58,7 +58,7 @@ void addButtonWithSvg(const String& url, const String& label, const String& svgP } addHtml('>'); - #ifndef BUILD_MINIMAL_OTA + #ifndef LIMIT_BUILD_SIZE if (hasSVG) { addHtml(F("")); diff --git a/src/src/WebServer/NetworkPage.cpp b/src/src/WebServer/NetworkPage.cpp index 3d387e35d..8ce7af3f1 100644 --- a/src/src/WebServer/NetworkPage.cpp +++ b/src/src/WebServer/NetworkPage.cpp @@ -54,10 +54,12 @@ void handle_networks() if (Settings.getNWPluginID_for_network(networkindex) != nwpluginID) { +#ifndef LIMIT_BUILD_SIZE addLog(LOG_LEVEL_INFO, strformat( F("HandleNW: Driver changed from %d to %d"), Settings.getNWPluginID_for_network(networkindex).value, nwpluginID.value)); +#endif // NetworkDriver has changed. Settings.setNWPluginID_for_network(networkindex, nwpluginID); @@ -75,9 +77,11 @@ void handle_networks() else { // there is a networkDriverIndex selected +#ifndef LIMIT_BUILD_SIZE addLog(LOG_LEVEL_INFO, concat( F("HandleNW: Driver selected: "), nwpluginID.value) + (nwpluginID.isValid() ? F("valid") : F("invalid"))); +#endif if (nwpluginID.isValid()) { @@ -151,7 +155,9 @@ void handle_networks_CopySubmittedSettings_NWPluginCall(ESPEasy::net::networkInd TempEvent.NetworkIndex = networkindex; // Call network plugin to save CustomNetworkSettings +#ifndef LIMIT_BUILD_SIZE addLog(LOG_LEVEL_INFO, F("Call network plugin to save CustomNetworkSettings")); +#endif String dummy; NWPluginCall(NWPlugin::Function::NWPLUGIN_WEBFORM_SAVE, &TempEvent, dummy); } diff --git a/src/src/WebServer/RootPage.cpp b/src/src/WebServer/RootPage.cpp index 1e2218388..4a6ecb36f 100644 --- a/src/src/WebServer/RootPage.cpp +++ b/src/src/WebServer/RootPage.cpp @@ -107,14 +107,14 @@ void handle_root() { // disconnect here could result into a crash/reboot... if (strcasecmp_P(sCommand.c_str(), PSTR("wifidisconnect")) == 0) { - #ifndef BUILD_MINIMAL_OTA + #ifndef LIMIT_BUILD_SIZE addLog(LOG_LEVEL_INFO, F("WIFI : Disconnecting...")); #endif cmd_within_mainloop = CMD_WIFI_DISCONNECT; addHtml(F("OK")); } else if (strcasecmp_P(sCommand.c_str(), PSTR("reboot")) == 0) { - #ifndef BUILD_MINIMAL_OTA + #ifndef LIMIT_BUILD_SIZE addLog(LOG_LEVEL_INFO, F(" : Rebooting...")); #endif cmd_within_mainloop = CMD_REBOOT; @@ -122,7 +122,7 @@ void handle_root() { } else if (strcasecmp_P(sCommand.c_str(), PSTR("reset")) == 0) { if (loggedIn) { - #ifndef BUILD_MINIMAL_OTA + #ifndef LIMIT_BUILD_SIZE addLog(LOG_LEVEL_INFO, F(" : factory reset...")); #endif cmd_within_mainloop = CMD_REBOOT; From 9622eb10142e95c4e49969f11ce8773ff2be4a18 Mon Sep 17 00:00:00 2001 From: TD-er Date: Sun, 10 Aug 2025 15:09:13 +0200 Subject: [PATCH 192/564] [Build] Fix copy/paste error on ESP32 builds --- src/src/ESPEasyCore/ESPEasy_setup.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/src/ESPEasyCore/ESPEasy_setup.cpp b/src/src/ESPEasyCore/ESPEasy_setup.cpp index 866ab3dd1..52b98a5e0 100644 --- a/src/src/ESPEasyCore/ESPEasy_setup.cpp +++ b/src/src/ESPEasyCore/ESPEasy_setup.cpp @@ -178,8 +178,8 @@ void ESPEasy_setup() // - Single core @160 MHz // - Dual core @240 MHz // See: https://www.letscontrolit.com/forum/viewtopic.php?t=10735 - gpio_num_t PSRAM_CLK = GPIO_NUM_NC; //GPIO_NUM_17; - gpio_num_t PSRAM_CS = GPIO_NUM_NC; //GPIO_NUM_16; + PSRAM_CLK = GPIO_NUM_NC; //GPIO_NUM_17; + PSRAM_CS = GPIO_NUM_NC; //GPIO_NUM_16; break; case EFUSE_RD_CHIP_VER_PKG_ESP32D2WDQ5: PSRAM_CLK = static_cast(CONFIG_D2WD_PSRAM_CLK_IO); From c1dc56943301932eb6e264619cd719b236558f00 Mon Sep 17 00:00:00 2001 From: TD-er Date: Sun, 10 Aug 2025 16:43:47 +0200 Subject: [PATCH 193/564] [Network] Fix corrupting settings on ESP8266 --- src/src/DataTypes/SchedulerIntervalTimer.cpp | 8 ++------ src/src/DataTypes/SettingsType.cpp | 2 +- 2 files changed, 3 insertions(+), 7 deletions(-) diff --git a/src/src/DataTypes/SchedulerIntervalTimer.cpp b/src/src/DataTypes/SchedulerIntervalTimer.cpp index bef495696..b5cc0e24f 100644 --- a/src/src/DataTypes/SchedulerIntervalTimer.cpp +++ b/src/src/DataTypes/SchedulerIntervalTimer.cpp @@ -29,12 +29,8 @@ String toString(SchedulerIntervalTimer_e timer) { timer <= SchedulerIntervalTimer_e::TIMER_C025_DELAY_QUEUE) { const int id = static_cast(timer) - static_cast(SchedulerIntervalTimer_e::TIMER_C001_DELAY_QUEUE) + 1; - String res; - res.reserve(24); - res = F("TIMER_"); - res += get_formatted_Controller_number(id); - res += F("_DELAY_QUEUE"); - return res; + + return strformat(F("TIMER_C%03d_DELAY_QUEUE"), id); } return toString_f(timer); #endif // ifdef BUILD_NO_DEBUG diff --git a/src/src/DataTypes/SettingsType.cpp b/src/src/DataTypes/SettingsType.cpp index 88c215869..679782a37 100644 --- a/src/src/DataTypes/SettingsType.cpp +++ b/src/src/DataTypes/SettingsType.cpp @@ -244,8 +244,8 @@ SettingsType::SettingsFileEnum SettingsType::getSettingsFile(Enum settingsType) #endif #if FEATURE_STORE_NETWORK_INTERFACE_SETTINGS case Enum::NetworkInterfaceSettings_Type: - return SettingsFileEnum::FILE_CONFIG_type; #endif + return SettingsFileEnum::FILE_CONFIG_type; case Enum::NotificationSettings_Type: return SettingsFileEnum::FILE_NOTIFICATION_type; case Enum::SecuritySettings_Type: From 6b33f57c3105988953acce81449d06c34833752a Mon Sep 17 00:00:00 2001 From: TD-er Date: Sun, 10 Aug 2025 18:03:28 +0200 Subject: [PATCH 194/564] [Network] Add Route Prio setting for each network interface (ESP32-xx) --- .../NWPluginData_static_runtime.cpp | 4 + .../NW001_data_struct_WiFi_STA.cpp | 6 +- .../NW005_data_struct_PPP_modem.cpp | 14 ++-- src/ESPEasy/net/_NW001_WiFi_STA.cpp | 8 ++ src/ESPEasy/net/_NW002_WiFi_AP.cpp | 8 ++ src/ESPEasy/net/_NW003_ETH_RMII.cpp | 1 + src/ESPEasy/net/_NW004_ETH_SPI.cpp | 3 + src/ESPEasy/net/_NW005_PPP_modem.cpp | 8 ++ src/src/DataStructs/SettingsStruct.h | 9 +- src/src/DataStructs_templ/SettingsStruct.cpp | 22 +++++ src/src/Helpers/ESPEasy_checks.cpp | 2 +- src/src/WebServer/NetworkPage.cpp | 82 +++++++++++-------- 12 files changed, 124 insertions(+), 43 deletions(-) diff --git a/src/ESPEasy/net/DataStructs/NWPluginData_static_runtime.cpp b/src/ESPEasy/net/DataStructs/NWPluginData_static_runtime.cpp index d4fbee78c..37b712dea 100644 --- a/src/ESPEasy/net/DataStructs/NWPluginData_static_runtime.cpp +++ b/src/ESPEasy/net/DataStructs/NWPluginData_static_runtime.cpp @@ -1,5 +1,6 @@ #include "../DataStructs/NWPluginData_static_runtime.h" +#include "../../../src/Globals/Settings.h" namespace ESPEasy { namespace net { @@ -15,6 +16,9 @@ void NWPluginData_static_runtime::clear(networkIndex_t networkIndex) _gotIP6Stats.clear(); #endif _networkIndex = networkIndex; +#ifdef ESP32 + _route_prio = Settings.getRoutePrio_for_network(_networkIndex); +#endif _connectionFailures = 0; diff --git a/src/ESPEasy/net/NWPluginStructs/NW001_data_struct_WiFi_STA.cpp b/src/ESPEasy/net/NWPluginStructs/NW001_data_struct_WiFi_STA.cpp index 2ffe0c5e3..ffce7c6aa 100644 --- a/src/ESPEasy/net/NWPluginStructs/NW001_data_struct_WiFi_STA.cpp +++ b/src/ESPEasy/net/NWPluginStructs/NW001_data_struct_WiFi_STA.cpp @@ -38,7 +38,11 @@ NW001_data_struct_WiFi_STA::NW001_data_struct_WiFi_STA(networkIndex_t networkInd NW001_data_struct_WiFi_STA::~NW001_data_struct_WiFi_STA() {} -void NW001_data_struct_WiFi_STA::webform_load(EventStruct *event) {} +void NW001_data_struct_WiFi_STA::webform_load(EventStruct *event) +{ + + +} void NW001_data_struct_WiFi_STA::webform_save(EventStruct *event) {} diff --git a/src/ESPEasy/net/NWPluginStructs/NW005_data_struct_PPP_modem.cpp b/src/ESPEasy/net/NWPluginStructs/NW005_data_struct_PPP_modem.cpp index f55fcc8b7..4ba924332 100644 --- a/src/ESPEasy/net/NWPluginStructs/NW005_data_struct_PPP_modem.cpp +++ b/src/ESPEasy/net/NWPluginStructs/NW005_data_struct_PPP_modem.cpp @@ -194,14 +194,14 @@ float NW005_data_struct_PPP_modem::getBER_float() const switch (NW_PLUGIN_INTERFACE.BER()) { case 0: return 0.01f; // F("<0.01 %"); - case 1: return 0.1f; // F("0.01 % ... 0.1 %"); - case 2: return 0.5f; // F("0.1 % ... 0.5 %"); - case 3: return 1.0f; // F("0.5 % ... 1 %"); - case 4: return 2.0f; // F("1 % ... 2 %"); - case 5: return 4.0f; // F("2 % ... 4 %"); - case 6: return 8.0f; // F("4 % ... 8 %"); + case 1: return 0.1f; // F("0.01 % ... 0.1 %"); + case 2: return 0.5f; // F("0.1 % ... 0.5 %"); + case 3: return 1.0f; // F("0.5 % ... 1 %"); + case 4: return 2.0f; // F("1 % ... 2 %"); + case 5: return 4.0f; // F("2 % ... 4 %"); + case 6: return 8.0f; // F("4 % ... 8 %"); case 7: return 16.0f; // F(">= 8 %"); - case 99: break; // Not known or not detectable + case 99: break; // Not known or not detectable } } return NAN; diff --git a/src/ESPEasy/net/_NW001_WiFi_STA.cpp b/src/ESPEasy/net/_NW001_WiFi_STA.cpp index f4319b419..235f92efb 100644 --- a/src/ESPEasy/net/_NW001_WiFi_STA.cpp +++ b/src/ESPEasy/net/_NW001_WiFi_STA.cpp @@ -57,6 +57,14 @@ bool NWPlugin_001(NWPlugin::Function function, EventStruct *event, String& strin break; } +# ifdef ESP32 + case NWPlugin::Function::NWPLUGIN_LOAD_DEFAULTS: + { + Settings.setRoutePrio_for_network(event->NetworkIndex, 100); + break; + } +# endif // ifdef ESP32 + case NWPlugin::Function::NWPLUGIN_GET_DEVICENAME: { string = F(NWPLUGIN_NAME_001); diff --git a/src/ESPEasy/net/_NW002_WiFi_AP.cpp b/src/ESPEasy/net/_NW002_WiFi_AP.cpp index 3de29b9e2..08d3ac9d7 100644 --- a/src/ESPEasy/net/_NW002_WiFi_AP.cpp +++ b/src/ESPEasy/net/_NW002_WiFi_AP.cpp @@ -50,6 +50,14 @@ bool NWPlugin_002(NWPlugin::Function function, EventStruct *event, String& strin break; } +# ifdef ESP32 + case NWPlugin::Function::NWPLUGIN_LOAD_DEFAULTS: + { + Settings.setRoutePrio_for_network(event->NetworkIndex, 10); + break; + } +# endif // ifdef ESP32 + case NWPlugin::Function::NWPLUGIN_GET_DEVICENAME: { string = F(NWPLUGIN_NAME_002); diff --git a/src/ESPEasy/net/_NW003_ETH_RMII.cpp b/src/ESPEasy/net/_NW003_ETH_RMII.cpp index cdfef2af5..a83a727ce 100644 --- a/src/ESPEasy/net/_NW003_ETH_RMII.cpp +++ b/src/ESPEasy/net/_NW003_ETH_RMII.cpp @@ -50,6 +50,7 @@ bool NWPlugin_003(NWPlugin::Function function, EventStruct *event, String& strin case NWPlugin::Function::NWPLUGIN_LOAD_DEFAULTS: { + Settings.setRoutePrio_for_network(event->NetworkIndex, 50); # if CONFIG_IDF_TARGET_ESP32P4 Settings.ETH_Clock_Mode = EthClockMode_t::Ext_crystal; Settings.ETH_Phy_Type = EthPhyType_t::TLK110; diff --git a/src/ESPEasy/net/_NW004_ETH_SPI.cpp b/src/ESPEasy/net/_NW004_ETH_SPI.cpp index 926b41423..b0f15a2f7 100644 --- a/src/ESPEasy/net/_NW004_ETH_SPI.cpp +++ b/src/ESPEasy/net/_NW004_ETH_SPI.cpp @@ -49,8 +49,11 @@ bool NWPlugin_004(NWPlugin::Function function, EventStruct *event, String& strin break; } + case NWPlugin::Function::NWPLUGIN_LOAD_DEFAULTS: { + Settings.setRoutePrio_for_network(event->NetworkIndex, 50); + /* # if CONFIG_IDF_TARGET_ESP32P4 Settings.ETH_Clock_Mode = EthClockMode_t::Ext_crystal; diff --git a/src/ESPEasy/net/_NW005_PPP_modem.cpp b/src/ESPEasy/net/_NW005_PPP_modem.cpp index e03b2e61e..916bc210f 100644 --- a/src/ESPEasy/net/_NW005_PPP_modem.cpp +++ b/src/ESPEasy/net/_NW005_PPP_modem.cpp @@ -51,6 +51,14 @@ bool NWPlugin_005(NWPlugin::Function function, EventStruct *event, String& strin break; } + case NWPlugin::Function::NWPLUGIN_LOAD_DEFAULTS: + { + # ifdef ESP32 + Settings.setRoutePrio_for_network(event->NetworkIndex, 20); + # endif + break; + } + case NWPlugin::Function::NWPLUGIN_GET_DEVICENAME: { string = F(NWPLUGIN_NAME_005); diff --git a/src/src/DataStructs/SettingsStruct.h b/src/src/DataStructs/SettingsStruct.h index 749477571..bf32f1914 100644 --- a/src/src/DataStructs/SettingsStruct.h +++ b/src/src/DataStructs/SettingsStruct.h @@ -424,6 +424,11 @@ public: void setNWPluginID_for_network(ESPEasy::net::networkIndex_t index, ESPEasy::net::nwpluginID_t id); +#ifdef ESP32 + uint8_t getRoutePrio_for_network(ESPEasy::net::networkIndex_t index) const; + + void setRoutePrio_for_network(ESPEasy::net::networkIndex_t index, uint8_t prio); +#endif unsigned long PID = 0; int Version = 0; @@ -671,7 +676,9 @@ public: uint8_t NetworkUnused_1{}; uint8_t NetworkUnused_2{}; uint8_t NetworkUnused_3{}; - +#ifdef ESP32 + uint8_t NetworkRoutePrio[NETWORK_MAX] = {0}; +#endif // Try to extend settings to make the checksum 4-uint8_t aligned. diff --git a/src/src/DataStructs_templ/SettingsStruct.cpp b/src/src/DataStructs_templ/SettingsStruct.cpp index e563c500b..0358c86f2 100644 --- a/src/src/DataStructs_templ/SettingsStruct.cpp +++ b/src/src/DataStructs_templ/SettingsStruct.cpp @@ -1333,4 +1333,26 @@ void SettingsStruct_tmpl::setNWPluginID_for_network(ESPEasy::net::netwo } + +#ifdef ESP32 +template +uint8_t SettingsStruct_tmpl::getRoutePrio_for_network(ESPEasy::net::networkIndex_t index) const +{ + if (validNetworkIndex(index)) { + return NetworkRoutePrio[index]; + } + return 0; +} + +template +void SettingsStruct_tmpl::setRoutePrio_for_network(ESPEasy::net::networkIndex_t index, uint8_t prio) +{ + if (validNetworkIndex(index)) { + NetworkRoutePrio[index] = prio; + } +} +#endif + + + #endif // ifndef DATASTRUCTS_SETTINGSSTRUCT_CPP diff --git a/src/src/Helpers/ESPEasy_checks.cpp b/src/src/Helpers/ESPEasy_checks.cpp index 869336e5d..0388d0171 100644 --- a/src/src/Helpers/ESPEasy_checks.cpp +++ b/src/src/Helpers/ESPEasy_checks.cpp @@ -83,7 +83,7 @@ void run_compiletime_checks() { check_size(); check_max_size(); #ifdef ESP32 - constexpr unsigned int SettingsStructSize = (352 + 84 * TASKS_MAX); + constexpr unsigned int SettingsStructSize = (360 + 84 * TASKS_MAX); #endif #ifdef ESP8266 constexpr unsigned int SettingsStructSize = (328 + 84 * TASKS_MAX); diff --git a/src/src/WebServer/NetworkPage.cpp b/src/src/WebServer/NetworkPage.cpp index 8ce7af3f1..6a9b9bbb8 100644 --- a/src/src/WebServer/NetworkPage.cpp +++ b/src/src/WebServer/NetworkPage.cpp @@ -54,12 +54,12 @@ void handle_networks() if (Settings.getNWPluginID_for_network(networkindex) != nwpluginID) { -#ifndef LIMIT_BUILD_SIZE +# ifndef LIMIT_BUILD_SIZE addLog(LOG_LEVEL_INFO, strformat( F("HandleNW: Driver changed from %d to %d"), Settings.getNWPluginID_for_network(networkindex).value, nwpluginID.value)); -#endif +# endif // ifndef LIMIT_BUILD_SIZE // NetworkDriver has changed. Settings.setNWPluginID_for_network(networkindex, nwpluginID); @@ -77,11 +77,11 @@ void handle_networks() else { // there is a networkDriverIndex selected -#ifndef LIMIT_BUILD_SIZE +# ifndef LIMIT_BUILD_SIZE addLog(LOG_LEVEL_INFO, concat( F("HandleNW: Driver selected: "), nwpluginID.value) + (nwpluginID.isValid() ? F("valid") : F("invalid"))); -#endif +# endif // ifndef LIMIT_BUILD_SIZE if (nwpluginID.isValid()) { @@ -155,9 +155,12 @@ void handle_networks_CopySubmittedSettings_NWPluginCall(ESPEasy::net::networkInd TempEvent.NetworkIndex = networkindex; // Call network plugin to save CustomNetworkSettings -#ifndef LIMIT_BUILD_SIZE +# ifndef LIMIT_BUILD_SIZE addLog(LOG_LEVEL_INFO, F("Call network plugin to save CustomNetworkSettings")); -#endif +# endif +# ifdef ESP32 + Settings.setRoutePrio_for_network(networkindex, getFormItemInt(F("routeprio"), 0)); +# endif String dummy; NWPluginCall(NWPlugin::Function::NWPLUGIN_WEBFORM_SAVE, &TempEvent, dummy); } @@ -291,7 +294,7 @@ void handle_networks_ShowAllNetworksTable() html_end_form(); } -void handle_networks_NetworkSettingsPage(ESPEasy::net::networkIndex_t networkindex) +void handle_networks_NetworkSettingsPage(ESPEasy::net::networkIndex_t networkindex) { if (!validNetworkIndex(networkindex)) { return; } @@ -353,8 +356,47 @@ void handle_networks_NetworkSettingsPage(ESPEasy::net::networkIndex_t networkind struct EventStruct TempEvent; TempEvent.NetworkIndex = networkindex; +# ifdef ESP32 + addFormNumericBox( + F("Route Priority"), + F("routeprio"), + Settings.getRoutePrio_for_network(networkindex), + 0, 255); + addFormNote(F("The active interface with highest priority will be used for default route (gateway).")); +# endif // ifdef ESP32 + String str; NWPluginCall(NWPlugin::Function::NWPLUGIN_WEBFORM_LOAD, &TempEvent, str); + +# if FEATURE_PLUGIN_STATS + { + // Task statistics and historic data in a chart + auto *NW_data = ESPEasy::net::getNWPluginData(TempEvent.NetworkIndex); + + if (NW_data && NW_data->hasPluginStats()) { + addFormSubHeader(F("Statistics")); +# if FEATURE_CHART_JS + + if (NW_data->nrSamplesPresent() > 0) { + addRowLabel(F("Historic data")); + NW_data->plot_ChartJS(); + } +# endif // if FEATURE_CHART_JS + String dummy; + + // bool somethingAdded = false; + + if (!ESPEasy::net::NWPluginCall(NWPlugin::Function::NWPLUGIN_WEBFORM_LOAD_SHOW_STATS, &TempEvent, dummy)) { + /*somethingAdded =*/ NW_data->webformLoad_show_stats(&TempEvent); + + // } else { + // somethingAdded = true; + } + } + } + +# endif // if FEATURE_PLUGIN_STATS + # ifdef ESP32 if (NWPluginCall(NWPlugin::Function::NWPLUGIN_GET_INTERFACE, &TempEvent, str)) @@ -474,32 +516,6 @@ void handle_networks_NetworkSettingsPage(ESPEasy::net::networkIndex_t networkind } } # endif // ifdef ESP32 -# if FEATURE_PLUGIN_STATS - { - // Task statistics and historic data in a chart - auto *NW_data = ESPEasy::net::getNWPluginData(TempEvent.NetworkIndex); - - if (NW_data && NW_data->hasPluginStats()) { - addFormSubHeader(F("Statistics")); -# if FEATURE_CHART_JS - - if (NW_data->nrSamplesPresent() > 0) { - addRowLabel(F("Historic data")); - NW_data->plot_ChartJS(); - } -# endif // if FEATURE_CHART_JS - String dummy; - bool somethingAdded = false; - - if (!ESPEasy::net::NWPluginCall(NWPlugin::Function::NWPLUGIN_WEBFORM_LOAD_SHOW_STATS, &TempEvent, dummy)) { - somethingAdded = NW_data->webformLoad_show_stats(&TempEvent); - } else { somethingAdded = true; } - } - } - -# endif // if FEATURE_PLUGIN_STATS - - addFormSeparator(2); From f13e8a08749629ae0aa06bbde9f9da7ed8114202 Mon Sep 17 00:00:00 2001 From: TD-er Date: Wed, 13 Aug 2025 11:20:19 +0200 Subject: [PATCH 195/564] [Network] Fix access control check for accessing web config --- .../NWPluginData_static_runtime_ESP32.cpp | 2 +- src/ESPEasy/net/ESPEasyNetwork.h | 2 + src/ESPEasy/net/ESPEasyNetwork_ESP32.cpp | 20 ++ src/ESPEasy/net/ESPEasyNetwork_ESP8266.cpp | 26 ++- src/ESPEasy/net/Globals/NWPlugins.cpp | 29 ++- src/ESPEasy/net/Helpers/NWAccessControl.cpp | 73 +++++++ src/ESPEasy/net/Helpers/NWAccessControl.h | 23 +++ .../NW005_data_struct_PPP_modem.cpp | 13 +- src/ESPEasy/net/_NW001_WiFi_STA.cpp | 26 ++- src/ESPEasy/net/_NW002_WiFi_AP.cpp | 26 ++- src/ESPEasy/net/_NW003_ETH_RMII.cpp | 1 + src/ESPEasy/net/_NW004_ETH_SPI.cpp | 1 + src/ESPEasy/net/_NW005_PPP_modem.cpp | 6 +- .../wifi/ESPEasyWiFi_state_machine_ESP32.cpp | 3 +- .../ESPEasyWiFi_state_machine_ESP8266.cpp | 2 + src/src/Commands/Networks.cpp | 12 +- src/src/DataStructs/SettingsStruct.h | 13 +- .../DataTypes/ESPEasy_plugin_functions.cpp | 139 +++++++++++++- src/src/DataTypes/ESPEasy_plugin_functions.h | 181 +++++++++++------- src/src/Helpers/Networking.cpp | 21 +- src/src/Helpers/StringProvider.cpp | 3 +- src/src/WebServer/AccessControl.cpp | 97 ++-------- src/src/WebServer/AccessControl.h | 16 +- src/src/WebServer/ConfigPage.cpp | 39 ++-- src/src/WebServer/ESPEasy_WebServer.cpp | 2 +- src/src/WebServer/NetworkPage.cpp | 3 + src/src/WebServer/SetupPage.cpp | 2 +- src/src/WebServer/SysInfoPage.cpp | 5 +- 28 files changed, 526 insertions(+), 260 deletions(-) create mode 100644 src/ESPEasy/net/Helpers/NWAccessControl.cpp create mode 100644 src/ESPEasy/net/Helpers/NWAccessControl.h diff --git a/src/ESPEasy/net/DataStructs/NWPluginData_static_runtime_ESP32.cpp b/src/ESPEasy/net/DataStructs/NWPluginData_static_runtime_ESP32.cpp index 985ec6bf6..c1dbddc70 100644 --- a/src/ESPEasy/net/DataStructs/NWPluginData_static_runtime_ESP32.cpp +++ b/src/ESPEasy/net/DataStructs/NWPluginData_static_runtime_ESP32.cpp @@ -73,7 +73,7 @@ void NWPluginData_static_runtime::mark_stop() void NWPluginData_static_runtime::mark_got_IP() { - // Set OnOffTimer to off so we can also count how often we het new IP + // Set OnOffTimer to off so we can also count how often we get new IP _gotIPStats.forceSet(true); if (!_netif) { return; } diff --git a/src/ESPEasy/net/ESPEasyNetwork.h b/src/ESPEasy/net/ESPEasyNetwork.h index 5b72f7b0f..4e48f8489 100644 --- a/src/ESPEasy/net/ESPEasyNetwork.h +++ b/src/ESPEasy/net/ESPEasyNetwork.h @@ -22,6 +22,8 @@ void setNetworkMedium(NetworkMedium_t medium); // void NetworkConnectRelaxed(); bool NetworkConnected(); IPAddress NetworkLocalIP(); +IPAddress NetworkID(); +IPAddress NetworkBroadcast(); IPAddress NetworkSubnetMask(); IPAddress NetworkGatewayIP(); IPAddress NetworkDnsIP(uint8_t dns_no); diff --git a/src/ESPEasy/net/ESPEasyNetwork_ESP32.cpp b/src/ESPEasy/net/ESPEasyNetwork_ESP32.cpp index 71379d0d7..0db812248 100644 --- a/src/ESPEasy/net/ESPEasyNetwork_ESP32.cpp +++ b/src/ESPEasy/net/ESPEasyNetwork_ESP32.cpp @@ -143,6 +143,26 @@ IPAddress NetworkLocalIP() { return network_if->localIP(); } +IPAddress NetworkID() +{ + auto network_if = getDefaultNonAP_interface(); + + if (network_if == nullptr) { + return IPAddress(); + } + return network_if->networkID(); +} + +IPAddress NetworkBroadcast() +{ + auto network_if = getDefaultNonAP_interface(); + + if (network_if == nullptr) { + return IPAddress(); + } + return network_if->broadcastIP(); +} + IPAddress NetworkSubnetMask() { auto network_if = getDefaultNonAP_interface(); diff --git a/src/ESPEasy/net/ESPEasyNetwork_ESP8266.cpp b/src/ESPEasy/net/ESPEasyNetwork_ESP8266.cpp index aedca5a17..b1eab19b9 100644 --- a/src/ESPEasy/net/ESPEasyNetwork_ESP8266.cpp +++ b/src/ESPEasy/net/ESPEasyNetwork_ESP8266.cpp @@ -54,9 +54,31 @@ void setNetworkMedium(NetworkMedium_t new_medium) { // ESPEasy::net::wifi::WiFiConnectRelaxed(); // } -bool NetworkConnected() { return ESPEasy::net::wifi::WiFiConnected(); } +bool NetworkConnected() { return ESPEasy::net::wifi::WiFiConnected(); } -IPAddress NetworkLocalIP() { return WiFi.localIP(); } +IPAddress NetworkLocalIP() { return WiFi.localIP(); } + +IPAddress NetworkID() +{ + const IPAddress subnet = NetworkSubnetMask(); + IPAddress networkID = NetworkLocalIP(); + + for (uint8_t i = 0; i < 4; ++i) { + networkID[i] &= subnet[i]; + } + return networkID; +} + +IPAddress NetworkBroadcast() +{ + const IPAddress subnet = NetworkSubnetMask(); + IPAddress broadcast = NetworkLocalIP(); + + for (uint8_t i = 0; i < 4; ++i) { + broadcast[i] |= ~subnet[i]; + } + return broadcast; +} IPAddress NetworkSubnetMask() { return WiFi.subnetMask(); } diff --git a/src/ESPEasy/net/Globals/NWPlugins.cpp b/src/ESPEasy/net/Globals/NWPlugins.cpp index 6c02b6edd..c757ea876 100644 --- a/src/ESPEasy/net/Globals/NWPlugins.cpp +++ b/src/ESPEasy/net/Globals/NWPlugins.cpp @@ -5,9 +5,11 @@ #include "../../../src/DataStructs/TimingStats.h" #include "../../../src/DataTypes/ESPEasy_plugin_functions.h" #include "../../../src/ESPEasyCore/ESPEasy_Log.h" +#include "../../../src/Globals/SecuritySettings.h" #include "../../../src/Globals/Settings.h" #include "../../../src/Helpers/PrintToString.h" #include "../Helpers/_NWPlugin_init.h" +#include "../Helpers/NWAccessControl.h" #include "../_NWPlugin_Helper.h" namespace ESPEasy { @@ -138,13 +140,13 @@ bool NWPluginCall(NWPlugin::Function Function, EventStruct *event, String& str) #if FEATURE_PLUGIN_STATS case NWPlugin::Function::NWPLUGIN_RECORD_STATS: { -// NWPluginData_static_runtime& runtime_data = NW_data->getNWPluginData_static_runtime(); + // NWPluginData_static_runtime& runtime_data = NW_data->getNWPluginData_static_runtime(); success = NW_data->record_stats(); break; } case NWPlugin::Function::NWPLUGIN_WEBFORM_LOAD_SHOW_STATS: { -// NWPluginData_static_runtime& runtime_data = NW_data->getNWPluginData_static_runtime(); + // NWPluginData_static_runtime& runtime_data = NW_data->getNWPluginData_static_runtime(); success = NW_data->webformLoad_show_stats(event); break; } @@ -180,6 +182,8 @@ bool NWPluginCall(NWPlugin::Function Function, EventStruct *event, String& str) case NWPlugin::Function::NWPLUGIN_WEBFORM_SHOW_IP: case NWPlugin::Function::NWPLUGIN_WEBFORM_SHOW_PORT: case NWPlugin::Function::NWPLUGIN_WEBFORM_SHOW_HOSTNAME: + case NWPlugin::Function::NWPLUGIN_CLIENT_IP_WEB_ACCESS_ALLOWED: + #ifdef ESP32 case NWPlugin::Function::NWPLUGIN_GET_INTERFACE: case NWPlugin::Function::NWPLUGIN_WEBFORM_SHOW_ROUTE_PRIO: @@ -259,6 +263,27 @@ bool NWPluginCall(NWPlugin::Function Function, EventStruct *event, String& str) str = prstr.get(); break; } + + case NWPlugin::Function::NWPLUGIN_CLIENT_IP_WEB_ACCESS_ALLOWED: + { + IPAddress client_ip; + client_ip.fromString(str); + + if ((SecuritySettings.IPblockLevel == LOCAL_SUBNET_ALLOWED) && + !Settings.getNetworkInterfaceSubnetBlockClientIP(event->NetworkIndex)) { + success = NWPlugin::IP_in_subnet(client_ip, event->networkInterface); + } else if (SecuritySettings.IPblockLevel == ONLY_IP_RANGE_ALLOWED) { + const IPAddress low(SecuritySettings.AllowedIPrangeLow); + const IPAddress high(SecuritySettings.AllowedIPrangeHigh); + success = NWPlugin::ipInRange(client_ip, low, high) && + NWPlugin::IP_in_subnet(low, event->networkInterface) && + NWPlugin::IP_in_subnet(high, event->networkInterface); + } else { + success = true; + } + break; + } + default: break; } } diff --git a/src/ESPEasy/net/Helpers/NWAccessControl.cpp b/src/ESPEasy/net/Helpers/NWAccessControl.cpp new file mode 100644 index 000000000..ed0d8b9f0 --- /dev/null +++ b/src/ESPEasy/net/Helpers/NWAccessControl.cpp @@ -0,0 +1,73 @@ +#include "../Helpers/NWAccessControl.h" + +#include "../ESPEasyNetwork.h" +#include "../Globals/NWPlugins.h" + +#include "../../../src/Globals/SecuritySettings.h" +#include "../../../src/Helpers/StringConverter.h" + +namespace ESPEasy { +namespace net { + + +// ******************************************************************************** +// Allowed IP range check +// ******************************************************************************** + +bool ipInAllowedSubnet(const IPAddress& ip) +{ + String ip_str = ip.toString(); + + for (networkIndex_t x = 0; x < NETWORK_MAX; x++) { + EventStruct tempEvent; + tempEvent.NetworkIndex = x; + + if (NWPluginCall(NWPlugin::Function::NWPLUGIN_CLIENT_IP_WEB_ACCESS_ALLOWED, &tempEvent, ip_str)) { + return true; + } + } + return false; +} + +String describeAllowedIPrange() { + String reply; + + switch (SecuritySettings.IPblockLevel) + { + case ALL_ALLOWED: + reply += F("All Allowed"); + break; + default: + { + IPAddress low, high; + getIPallowedRange(low, high); + reply += formatIP(low); + reply += F(" - "); + reply += formatIP(high); + } + } + return reply; +} + +bool getIPallowedRange(IPAddress& low, IPAddress& high) +{ + switch (SecuritySettings.IPblockLevel) + { + case LOCAL_SUBNET_ALLOWED: + low = NetworkID(); + high = NetworkBroadcast(); + return true; + case ONLY_IP_RANGE_ALLOWED: + low = IPAddress(SecuritySettings.AllowedIPrangeLow); + high = IPAddress(SecuritySettings.AllowedIPrangeHigh); + break; + default: + low = IPAddress(0, 0, 0, 0); + high = IPAddress(255, 255, 255, 255); + return false; + } + return true; +} + +} // namespace net +} // namespace ESPEasy diff --git a/src/ESPEasy/net/Helpers/NWAccessControl.h b/src/ESPEasy/net/Helpers/NWAccessControl.h new file mode 100644 index 000000000..035ce428d --- /dev/null +++ b/src/ESPEasy/net/Helpers/NWAccessControl.h @@ -0,0 +1,23 @@ +#pragma once + +#include + +namespace ESPEasy { +namespace net { + +// ******************************************************************************** +// Allowed IP range check +// ******************************************************************************** +#define ALL_ALLOWED 0 +#define LOCAL_SUBNET_ALLOWED 1 +#define ONLY_IP_RANGE_ALLOWED 2 + +bool ipInAllowedSubnet(const IPAddress& ip); + +String describeAllowedIPrange(); + +bool getIPallowedRange(IPAddress& low, IPAddress& high); + + +} // namespace net +} // namespace ESPEasy diff --git a/src/ESPEasy/net/NWPluginStructs/NW005_data_struct_PPP_modem.cpp b/src/ESPEasy/net/NWPluginStructs/NW005_data_struct_PPP_modem.cpp index 4ba924332..e807b851d 100644 --- a/src/ESPEasy/net/NWPluginStructs/NW005_data_struct_PPP_modem.cpp +++ b/src/ESPEasy/net/NWPluginStructs/NW005_data_struct_PPP_modem.cpp @@ -45,7 +45,6 @@ static NWPluginData_static_runtime stats_and_cache(&NW_PLUGIN_INTERFACE); # define NW005_KEY_MODEM_MODEL 11 # define NW005_KEY_APN 12 # define NW005_KEY_SIM_PIN 13 -# define NW005_KEY_SET_DEFAULT_ROUTE 14 const __FlashStringHelper* NW005_getLabelString(uint32_t key, bool displayString, ESPEasy_key_value_store::StorageType& storageType) { @@ -78,10 +77,6 @@ const __FlashStringHelper* NW005_getLabelString(uint32_t key, bool displayString case NW005_KEY_SIM_PIN: storageType = ESPEasy_key_value_store::StorageType::string_type; return displayString ? F("SIM Card Pin") : F("pin"); - case NW005_KEY_SET_DEFAULT_ROUTE: - storageType = ESPEasy_key_value_store::StorageType::bool_type; - return displayString ? F("Set as Default Route") : F("default_route"); - } return F(""); @@ -370,11 +365,6 @@ void NW005_data_struct_PPP_modem::webform_load(EventStruct *event) { _load(); - showWebformItem( - *_kvs, - NW005_makeWebFormItemParams(NW005_KEY_SET_DEFAULT_ROUTE)); - - addFormSubHeader(F("Device Settings")); { const int ids[] = { @@ -698,8 +688,7 @@ void NW005_data_struct_PPP_modem::webform_save(EventStruct *event) NW005_KEY_FLOWCTRL, NW005_KEY_MODEM_MODEL, NW005_KEY_APN, - NW005_KEY_SIM_PIN, - NW005_KEY_SET_DEFAULT_ROUTE + NW005_KEY_SIM_PIN }; diff --git a/src/ESPEasy/net/_NW001_WiFi_STA.cpp b/src/ESPEasy/net/_NW001_WiFi_STA.cpp index 235f92efb..668255c33 100644 --- a/src/ESPEasy/net/_NW001_WiFi_STA.cpp +++ b/src/ESPEasy/net/_NW001_WiFi_STA.cpp @@ -33,6 +33,9 @@ # include "../net/wifi/ESPEasyWifi.h" # include "../net/wifi/ESPEasyWifi_ProcessEvent.h" +# ifdef ESP8266 +# include "../net/Helpers/NWAccessControl.h" +# endif # ifdef ESP32P4 # include @@ -57,13 +60,14 @@ bool NWPlugin_001(NWPlugin::Function function, EventStruct *event, String& strin break; } -# ifdef ESP32 case NWPlugin::Function::NWPLUGIN_LOAD_DEFAULTS: { +# ifdef ESP32 Settings.setRoutePrio_for_network(event->NetworkIndex, 100); +# endif // ifdef ESP32 + Settings.setNetworkInterfaceSubnetBlockClientIP(event->NetworkIndex, false); break; } -# endif // ifdef ESP32 case NWPlugin::Function::NWPLUGIN_GET_DEVICENAME: { @@ -140,6 +144,24 @@ bool NWPlugin_001(NWPlugin::Function function, EventStruct *event, String& strin success = true; break; } + + case NWPlugin::Function::NWPLUGIN_CLIENT_IP_WEB_ACCESS_ALLOWED: + { + IPAddress client_ip; + client_ip.fromString(string); + + if ((SecuritySettings.IPblockLevel == LOCAL_SUBNET_ALLOWED) && + !Settings.getNetworkInterfaceSubnetBlockClientIP(event->NetworkIndex)) { + success = NWPlugin::ipInRange(client_ip, NetworkID(), NetworkBroadcast()); + } else if (SecuritySettings.IPblockLevel == ONLY_IP_RANGE_ALLOWED) { + const IPAddress low(SecuritySettings.AllowedIPrangeLow); + const IPAddress high(SecuritySettings.AllowedIPrangeHigh); + success = NWPlugin::ipInRange(client_ip, low, high); + } else { + success = true; + } + break; + } # endif // ifdef ESP8266 case NWPlugin::Function::NWPLUGIN_WEBFORM_SHOW_PORT: diff --git a/src/ESPEasy/net/_NW002_WiFi_AP.cpp b/src/ESPEasy/net/_NW002_WiFi_AP.cpp index 08d3ac9d7..540f55f28 100644 --- a/src/ESPEasy/net/_NW002_WiFi_AP.cpp +++ b/src/ESPEasy/net/_NW002_WiFi_AP.cpp @@ -50,13 +50,14 @@ bool NWPlugin_002(NWPlugin::Function function, EventStruct *event, String& strin break; } -# ifdef ESP32 case NWPlugin::Function::NWPLUGIN_LOAD_DEFAULTS: { +# ifdef ESP32 Settings.setRoutePrio_for_network(event->NetworkIndex, 10); +# endif + Settings.setNetworkInterfaceSubnetBlockClientIP(event->NetworkIndex, false); break; } -# endif // ifdef ESP32 case NWPlugin::Function::NWPLUGIN_GET_DEVICENAME: { @@ -137,6 +138,27 @@ bool NWPlugin_002(NWPlugin::Function function, EventStruct *event, String& strin success = true; break; } + + case NWPlugin::Function::NWPLUGIN_CLIENT_IP_WEB_ACCESS_ALLOWED: + { + // FIXME TD-er: Shouldn't we just always allow access from AP? + if (!Settings.getNetworkInterfaceSubnetBlockClientIP(event->NetworkIndex)) { + IPAddress client_ip; + client_ip.fromString(string); + + // FIXME TD-er: Do we allow to set the subnetmask for AP to anything else? + const IPAddress subnet(255, 255, 255, 0); + const IPAddress localIP = WiFi.softAPIP(); + bool success = true; + + for (uint8_t i = 0; success && i < 4; ++i) { + if ((localIP[i] & subnet[i]) != (client_ip[i] & subnet[i])) { + success = false; + } + } + } + break; + } # endif // ifdef ESP8266 case NWPlugin::Function::NWPLUGIN_WEBFORM_SHOW_PORT: diff --git a/src/ESPEasy/net/_NW003_ETH_RMII.cpp b/src/ESPEasy/net/_NW003_ETH_RMII.cpp index a83a727ce..65249b863 100644 --- a/src/ESPEasy/net/_NW003_ETH_RMII.cpp +++ b/src/ESPEasy/net/_NW003_ETH_RMII.cpp @@ -51,6 +51,7 @@ bool NWPlugin_003(NWPlugin::Function function, EventStruct *event, String& strin case NWPlugin::Function::NWPLUGIN_LOAD_DEFAULTS: { Settings.setRoutePrio_for_network(event->NetworkIndex, 50); + Settings.setNetworkInterfaceSubnetBlockClientIP(event->NetworkIndex, false); # if CONFIG_IDF_TARGET_ESP32P4 Settings.ETH_Clock_Mode = EthClockMode_t::Ext_crystal; Settings.ETH_Phy_Type = EthPhyType_t::TLK110; diff --git a/src/ESPEasy/net/_NW004_ETH_SPI.cpp b/src/ESPEasy/net/_NW004_ETH_SPI.cpp index b0f15a2f7..db451759e 100644 --- a/src/ESPEasy/net/_NW004_ETH_SPI.cpp +++ b/src/ESPEasy/net/_NW004_ETH_SPI.cpp @@ -53,6 +53,7 @@ bool NWPlugin_004(NWPlugin::Function function, EventStruct *event, String& strin case NWPlugin::Function::NWPLUGIN_LOAD_DEFAULTS: { Settings.setRoutePrio_for_network(event->NetworkIndex, 50); + Settings.setNetworkInterfaceSubnetBlockClientIP(event->NetworkIndex, false); /* # if CONFIG_IDF_TARGET_ESP32P4 diff --git a/src/ESPEasy/net/_NW005_PPP_modem.cpp b/src/ESPEasy/net/_NW005_PPP_modem.cpp index 916bc210f..f11162575 100644 --- a/src/ESPEasy/net/_NW005_PPP_modem.cpp +++ b/src/ESPEasy/net/_NW005_PPP_modem.cpp @@ -53,9 +53,8 @@ bool NWPlugin_005(NWPlugin::Function function, EventStruct *event, String& strin case NWPlugin::Function::NWPLUGIN_LOAD_DEFAULTS: { - # ifdef ESP32 Settings.setRoutePrio_for_network(event->NetworkIndex, 20); - # endif + Settings.setNetworkInterfaceSubnetBlockClientIP(event->NetworkIndex, true); break; } @@ -65,7 +64,6 @@ bool NWPlugin_005(NWPlugin::Function function, EventStruct *event, String& strin break; } -# ifdef ESP32 case NWPlugin::Function::NWPLUGIN_GET_INTERFACE: { ESPEasy::net::ppp::NW005_data_struct_PPP_modem *NW_data = @@ -77,8 +75,6 @@ bool NWPlugin_005(NWPlugin::Function function, EventStruct *event, String& strin } break; } -# endif // ifdef ESP32 - case NWPlugin::Function::NWPLUGIN_WEBFORM_SHOW_CONNECTED: { diff --git a/src/ESPEasy/net/wifi/ESPEasyWiFi_state_machine_ESP32.cpp b/src/ESPEasy/net/wifi/ESPEasyWiFi_state_machine_ESP32.cpp index f54db9060..986fb1ee2 100644 --- a/src/ESPEasy/net/wifi/ESPEasyWiFi_state_machine_ESP32.cpp +++ b/src/ESPEasy/net/wifi/ESPEasyWiFi_state_machine_ESP32.cpp @@ -26,10 +26,11 @@ IPAddress ESPEasyWiFi_t::getIP() const if (WiFi.STA.hasIP()) { return WiFi.STA.localIP(); } - +/* if (WiFi.AP.hasIP()) { return WiFi.AP.localIP(); } +*/ return IPAddress(); } diff --git a/src/ESPEasy/net/wifi/ESPEasyWiFi_state_machine_ESP8266.cpp b/src/ESPEasy/net/wifi/ESPEasyWiFi_state_machine_ESP8266.cpp index fb5ff2516..5715fefaa 100644 --- a/src/ESPEasy/net/wifi/ESPEasyWiFi_state_machine_ESP8266.cpp +++ b/src/ESPEasy/net/wifi/ESPEasyWiFi_state_machine_ESP8266.cpp @@ -16,11 +16,13 @@ IPAddress ESPEasyWiFi_t::getIP() const if (ip.isSet()) { return ip; } +/* ip = WiFi.softAPIP(); if (ip.isSet()) { return ip; } +*/ return IPAddress(); } diff --git a/src/src/Commands/Networks.cpp b/src/src/Commands/Networks.cpp index 30789c074..9ba90124b 100644 --- a/src/src/Commands/Networks.cpp +++ b/src/src/Commands/Networks.cpp @@ -1,16 +1,16 @@ #include "../Commands/Networks.h" +#include "../../ESPEasy/net/DataTypes/NetworkIndex.h" +#include "../../ESPEasy/net/ESPEasyNetwork.h" +#include "../../ESPEasy/net/Globals/NetworkState.h" +#include "../../ESPEasy/net/Helpers/NWAccessControl.h" +#include "../../ESPEasy/net/eth/ESPEasyEth.h" #include "../../ESPEasy_common.h" #include "../Commands/Common.h" -#include "../../ESPEasy/net/ESPEasyNetwork.h" -#include "../../ESPEasy/net/eth/ESPEasyEth.h" -#include "../../ESPEasy/net/DataTypes/NetworkIndex.h" -#include "../../ESPEasy/net/Globals/NetworkState.h" #include "../Globals/Settings.h" #include "../Helpers/StringConverter.h" #include "../WebServer/AccessControl.h" - #if FEATURE_ETHERNET #include #endif @@ -39,7 +39,7 @@ const __FlashStringHelper * Command_Network_Enable(struct EventStruct *event, co String Command_AccessInfo_Ls(struct EventStruct *event, const char* Line) { - return return_result(event, concat(F("Allowed IP range : "), describeAllowedIPrange())); + return return_result(event, concat(F("Allowed IP range : "), ESPEasy::net::describeAllowedIPrange())); } String Command_AccessInfo_Clear (struct EventStruct *event, const char* Line) diff --git a/src/src/DataStructs/SettingsStruct.h b/src/src/DataStructs/SettingsStruct.h index bf32f1914..2bcc1e5ed 100644 --- a/src/src/DataStructs/SettingsStruct.h +++ b/src/src/DataStructs/SettingsStruct.h @@ -420,6 +420,17 @@ public: } } + bool getNetworkInterfaceSubnetBlockClientIP(ESPEasy::net::networkIndex_t index) const { + if (validNetworkIndex(index)) return bitRead(NetworkInterfaceSubnetBlockClientIP_bits, index); + return false; + } + + void setNetworkInterfaceSubnetBlockClientIP(ESPEasy::net::networkIndex_t index, bool enabled) { + if (validNetworkIndex(index)) { + bitWrite(NetworkInterfaceSubnetBlockClientIP_bits, index, enabled); + } + } + ESPEasy::net::nwpluginID_t getNWPluginID_for_network(ESPEasy::net::networkIndex_t index) const; void setNWPluginID_for_network(ESPEasy::net::networkIndex_t index, ESPEasy::net::nwpluginID_t id); @@ -673,7 +684,7 @@ public: // FIXME TD-er: Must change to nwpluginID_t, but then also another check must be added since changing the pluginID_t will also render settings incompatible uint8_t NWPluginID[NETWORK_MAX] = {0}; uint8_t NetworkEnabled_bits{}; - uint8_t NetworkUnused_1{}; + uint8_t NetworkInterfaceSubnetBlockClientIP_bits{}; // Client IP Block Level. Allow from subnet of this interface uint8_t NetworkUnused_2{}; uint8_t NetworkUnused_3{}; #ifdef ESP32 diff --git a/src/src/DataTypes/ESPEasy_plugin_functions.cpp b/src/src/DataTypes/ESPEasy_plugin_functions.cpp index 48925e7a4..8748f7e12 100644 --- a/src/src/DataTypes/ESPEasy_plugin_functions.cpp +++ b/src/src/DataTypes/ESPEasy_plugin_functions.cpp @@ -2,7 +2,7 @@ #ifdef ESP32 -#include "../Helpers/StringConverter.h" +# include "../Helpers/StringConverter.h" # include @@ -15,6 +15,8 @@ bool NWPlugin::canQueryViaNetworkInterface(NWPlugin::Function function) case NWPlugin::Function::NWPLUGIN_WEBFORM_SHOW_HOSTNAME: case NWPlugin::Function::NWPLUGIN_WEBFORM_SHOW_HW_ADDRESS: case NWPlugin::Function::NWPLUGIN_WEBFORM_SHOW_IP: + case NWPlugin::Function::NWPLUGIN_CLIENT_IP_WEB_ACCESS_ALLOWED: + return true; default: break; } @@ -27,7 +29,7 @@ const __FlashStringHelper * NWPlugin::toString(ConnectionState connectionState, switch (connectionState) { case NWPlugin::ConnectionState::Disabled: return F("❌"); // Same icon as used everywhere else in ESPEasy to - // indicate disabled + // indicate disabled case NWPlugin::ConnectionState::Error: return F("⚠"); // Warning Emoji case NWPlugin::ConnectionState::Initializing: return F("⏳"); // Hourglass Not Done Emoji case NWPlugin::ConnectionState::Connecting: return F("⏶⏳"); // LinkUp & Initializing @@ -145,6 +147,131 @@ IPAddress NWPlugin::get_IP_address(NWPlugin::IP_type ip_type, NetworkInterface*n return ip; } +bool NWPlugin::get_subnet(NWPlugin::IP_type ip_type, NetworkInterface*networkInterface, IPAddress& networkID, IPAddress& broadcast) +{ + if (!networkInterface) { return false; } + IPAddress ip = get_IP_address(ip_type, networkInterface); + + if (ip == INADDR_NONE) { return false; } + +# if CONFIG_LWIP_IPV6 + + if (ip.type() == IPv6) { + // FIXME TD-er: For now, just assume /64 subnets until we have actually access to some subnet info. + networkID = ip; + broadcast = ip; + + uint8_t i = 8; + + if ((ip[0] == 0xFD) || (ip[0] == 0xFE)) { + // /8 subnet for local IPv6 + // 0xFD: Unique Local + // 0xFE: Link Local + i = 1; + } + + for (; i < 16; ++i) { + networkID[i] = 0; + broadcast[i] = 0xFF; + } + return true; + } +# endif // if CONFIG_LWIP_IPV6 + + networkID = networkInterface->networkID(); + broadcast = networkInterface->broadcastIP(); + return true; +} +#endif + +bool NWPlugin::ipLessEqual(const IPAddress& ip, const IPAddress& high) +{ + // FIXME TD-er: Must check whether both are of same type and check full range IPv6 + int nrOctets = 4; + + # if FEATURE_USE_IPV6 + + if (ip.type() != high.type()) { return false; } + + if (ip.type() == IPv6) { + nrOctets = 16; + } + # endif // if FEATURE_USE_IPV6 + + for (int i = 0; i < nrOctets; ++i) { + if (ip[i] != high[i]) { + return ip[i] < high[i]; + } + } + + // Is equal + return true; +} + +bool NWPlugin::ipInRange(const IPAddress& ip, const IPAddress& low, const IPAddress& high) { + return ipLessEqual(low, ip) && ipLessEqual(ip, high); +} + +#ifdef ESP32 +bool NWPlugin::IP_in_subnet(const IPAddress & ip, + NetworkInterface *networkInterface) +{ + const NWPlugin::IP_type ip_type = get_IP_type(ip); + IPAddress networkID; + IPAddress broadcast; + + if (!get_subnet(ip_type, networkInterface, networkID, broadcast)) { + return false; + } +#if FEATURE_USE_IPV6 + if (ip_type == NWPlugin::IP_type::ipv6_link_local) { + // Must match zone, or else it will always match. + return (ip.zone() == networkID.zone()); + } +#endif + + return ipLessEqual(networkID, ip) && ipLessEqual(ip, broadcast); +} + +NWPlugin::IP_type NWPlugin::get_IP_type(const IPAddress& ip) +{ +# if FEATURE_USE_IPV6 + + if (ip.type() == IPv6) { + switch (ip.addr_type()) + { + case ESP_IP6_ADDR_IS_UNKNOWN: + { + return NWPlugin::IP_type::ipv6_unknown; + } + case ESP_IP6_ADDR_IS_GLOBAL: + { + return NWPlugin::IP_type::ipv6_global; + } + case ESP_IP6_ADDR_IS_LINK_LOCAL: + { + return NWPlugin::IP_type::ipv6_link_local; + } + case ESP_IP6_ADDR_IS_SITE_LOCAL: + { + return NWPlugin::IP_type::ipv6_site_local; + } + case ESP_IP6_ADDR_IS_UNIQUE_LOCAL: + { + return NWPlugin::IP_type::ipv6_unique_local; + } + case ESP_IP6_ADDR_IS_IPV4_MAPPED_IPV6: + { + return NWPlugin::IP_type::ipv4_mapped_ipv6; + } + } + } +# endif // if FEATURE_USE_IPV6 + + // FIXME TD-er: Maybe also try to determine whether we have a netmask/broadcast/etc? + return NWPlugin::IP_type::inet; +} + const __FlashStringHelper * NWPlugin::toString(NWPlugin::NetforkFlags flag) { switch (flag) @@ -185,15 +312,17 @@ bool NWPlugin::forceDHCP_request(NetworkInterface*networkInterface) if (netif == nullptr) { return false; } - const char* desc = esp_netif_get_desc(netif); - esp_err_t err = esp_netif_dhcpc_stop(netif); + const char*desc = esp_netif_get_desc(netif); + esp_err_t err = esp_netif_dhcpc_stop(netif); + if (err != 0) { addLog(LOG_LEVEL_ERROR, strformat(F("%s: DHCPc could not be stopped! Error: 0x%04x: %s"), desc, err, esp_err_to_name(err))); return false; } addLog(LOG_LEVEL_INFO, strformat(F("%s: DHCPc stopped"), desc)); err = esp_netif_dhcpc_start(netif); - if (err != ESP_OK && err != ESP_ERR_ESP_NETIF_DHCP_ALREADY_STARTED) { + + if ((err != ESP_OK) && (err != ESP_ERR_ESP_NETIF_DHCP_ALREADY_STARTED)) { addLog(LOG_LEVEL_ERROR, strformat(F("%s: DHCPc could not be started! Error: 0x%04x: %s"), desc, err, esp_err_to_name(err))); return false; } diff --git a/src/src/DataTypes/ESPEasy_plugin_functions.h b/src/src/DataTypes/ESPEasy_plugin_functions.h index 4bb8d4fe0..c11576fb0 100644 --- a/src/src/DataTypes/ESPEasy_plugin_functions.h +++ b/src/src/DataTypes/ESPEasy_plugin_functions.h @@ -8,69 +8,76 @@ // Plugin (Task) function calls // ******************************************************************************** enum PluginFunctions_e { - PLUGIN_INIT_ALL , // Not implemented in a plugin, only called during boot - PLUGIN_INIT , // Init the task, called when task is set to enabled (also at boot) - PLUGIN_READ , // This call can yield new data (when success = true) and then send to controllers - PLUGIN_ONCE_A_SECOND , // Called once a second - PLUGIN_TEN_PER_SECOND , // Called 10x per second (typical for checking new data instead of waiting) - PLUGIN_DEVICE_ADD , // Called at boot for letting a plugin adding itself to list of available plugins/devices - PLUGIN_EVENTLIST_ADD , // Not used. - PLUGIN_WEBFORM_SAVE , // Call from web interface to save settings - PLUGIN_WEBFORM_LOAD , // Call from web interface for presenting settings and status of plugin - PLUGIN_WEBFORM_SHOW_VALUES , // Call from devices overview page to format values in HTML - PLUGIN_GET_DEVICENAME , // Call to get the plugin description (e.g. "Switch input - Switch") - PLUGIN_GET_DEVICEVALUENAMES , // Call to let the plugin generate some default value names when not defined. - PLUGIN_GET_DEVICEVALUECOUNT , // Optional function call to allow tasks to specify the number of output values (e.g. P026_Sysinfo.ino) - PLUGIN_GET_DEVICEVTYPE , // Only needed when Device[deviceCount].OutputDataType is not Output_Data_type_t::Default - PLUGIN_WRITE , // Called to allow a task to process a command. Must return success = true when it can handle the command. -// PLUGIN_EVENT_OUT , // Does not seem to be used - PLUGIN_WEBFORM_SHOW_CONFIG , // Called to show non default pin assignment or addresses like for plugins using serial or 1-Wire - PLUGIN_SERIAL_IN , // Called on received data via serial port Serial0 (N.B. this may conflict with sending commands via serial) - PLUGIN_UDP_IN , // Called for received UDP data via ESPEasy p2p which isn't a standard p2p packet. (See C013 for handling standard p2p packets) - PLUGIN_CLOCK_IN , // Called every new minute - PLUGIN_TASKTIMER_IN , // Called with a previously defined event at a specific time, set via setPluginTaskTimer - PLUGIN_FIFTY_PER_SECOND , // Called 50 times per second - PLUGIN_SET_CONFIG , // Counterpart of PLUGIN_GET_CONFIG_VALUE to allow to set a config via a command. - PLUGIN_GET_DEVICEGPIONAMES , // Allow for specific formatting of the label for standard pin configuration (e.g. "GPIO <- TX") - PLUGIN_EXIT , // Called when a task no longer is enabled (or deleted) - PLUGIN_GET_CONFIG_VALUE , // Similar to PLUGIN_WRITE, but meant to fetch some information. Must return success = true when it can handle the command. Can also be used to access extra unused task values. -// PLUGIN_UNCONDITIONAL_POLL , // Used to be called 10x per sec, but no longer used as GPIO related plugins now use a different technique. - PLUGIN_REQUEST , // Specific command to fetch a state (FIXME TD-er: Seems very similar to PLUGIN_GET_CONFIG_VALUE) - PLUGIN_TIME_CHANGE , // Called when system time is set (e.g. via NTP) - PLUGIN_MONITOR , // Replaces PLUGIN_UNCONDITIONAL_POLL - PLUGIN_SET_DEFAULTS , // Called when assigning a plugin to a task, to set some default config. - PLUGIN_GET_PACKED_RAW_DATA , // Return all data in a compact binary format specific for that plugin. - // Needs FEATURE_PACKED_RAW_DATA - PLUGIN_DEVICETIMER_IN , // Similar to PLUGIN_TASKTIMER_IN, addressed to a plugin instead of a task. - PLUGIN_WEBFORM_SHOW_I2C_PARAMS , // Show I2C parameters like address. - PLUGIN_WEBFORM_SHOW_SERIAL_PARAMS , // When needed, show additional parameters like baudrate or specific serial config - PLUGIN_MQTT_CONNECTION_STATE , // Signal when connection to MQTT broker is re-established - PLUGIN_MQTT_IMPORT , // For P037 MQTT import - PLUGIN_FORMAT_USERVAR , // Allow plugin specific formatting of a task variable (event->idx = variable) - PLUGIN_WEBFORM_SHOW_GPIO_DESCR , // Show GPIO description on devices overview tab + PLUGIN_INIT_ALL, // Not implemented in a plugin, only called during boot + PLUGIN_INIT, // Init the task, called when task is set to enabled (also at boot) + PLUGIN_READ, // This call can yield new data (when success = true) and then send to controllers + PLUGIN_ONCE_A_SECOND, // Called once a second + PLUGIN_TEN_PER_SECOND, // Called 10x per second (typical for checking new data instead of waiting) + PLUGIN_DEVICE_ADD, // Called at boot for letting a plugin adding itself to list of available plugins/devices + PLUGIN_EVENTLIST_ADD, // Not used. + PLUGIN_WEBFORM_SAVE, // Call from web interface to save settings + PLUGIN_WEBFORM_LOAD, // Call from web interface for presenting settings and status of plugin + PLUGIN_WEBFORM_SHOW_VALUES, // Call from devices overview page to format values in HTML + PLUGIN_GET_DEVICENAME, // Call to get the plugin description (e.g. "Switch input - Switch") + PLUGIN_GET_DEVICEVALUENAMES, // Call to let the plugin generate some default value names when not defined. + PLUGIN_GET_DEVICEVALUECOUNT, // Optional function call to allow tasks to specify the number of output values (e.g. + // P026_Sysinfo.ino) + PLUGIN_GET_DEVICEVTYPE, // Only needed when Device[deviceCount].OutputDataType is not Output_Data_type_t::Default + PLUGIN_WRITE, // Called to allow a task to process a command. Must return success = true when it can handle the + // command. + // PLUGIN_EVENT_OUT , // Does not seem to be used + PLUGIN_WEBFORM_SHOW_CONFIG, // Called to show non default pin assignment or addresses like for plugins using serial or 1-Wire + PLUGIN_SERIAL_IN, // Called on received data via serial port Serial0 (N.B. this may conflict with sending commands via + // serial) + PLUGIN_UDP_IN, // Called for received UDP data via ESPEasy p2p which isn't a standard p2p packet. (See C013 for + // handling standard p2p packets) + PLUGIN_CLOCK_IN, // Called every new minute + PLUGIN_TASKTIMER_IN, // Called with a previously defined event at a specific time, set via setPluginTaskTimer + PLUGIN_FIFTY_PER_SECOND, // Called 50 times per second + PLUGIN_SET_CONFIG, // Counterpart of PLUGIN_GET_CONFIG_VALUE to allow to set a config via a command. + PLUGIN_GET_DEVICEGPIONAMES, // Allow for specific formatting of the label for standard pin configuration (e.g. "GPIO <- TX") + PLUGIN_EXIT, // Called when a task no longer is enabled (or deleted) + PLUGIN_GET_CONFIG_VALUE, // Similar to PLUGIN_WRITE, but meant to fetch some information. Must return success = true when it + // can handle the command. Can also be used to access extra unused task values. + // PLUGIN_UNCONDITIONAL_POLL , // Used to be called 10x per sec, but no longer used as GPIO related plugins now use a different + // technique. + PLUGIN_REQUEST, // Specific command to fetch a state (FIXME TD-er: Seems very similar to PLUGIN_GET_CONFIG_VALUE) + PLUGIN_TIME_CHANGE, // Called when system time is set (e.g. via NTP) + PLUGIN_MONITOR, // Replaces PLUGIN_UNCONDITIONAL_POLL + PLUGIN_SET_DEFAULTS, // Called when assigning a plugin to a task, to set some default config. + PLUGIN_GET_PACKED_RAW_DATA, // Return all data in a compact binary format specific for that plugin. + // Needs FEATURE_PACKED_RAW_DATA + PLUGIN_DEVICETIMER_IN, // Similar to PLUGIN_TASKTIMER_IN, addressed to a plugin instead of a task. + PLUGIN_WEBFORM_SHOW_I2C_PARAMS, // Show I2C parameters like address. + PLUGIN_WEBFORM_SHOW_SERIAL_PARAMS, // When needed, show additional parameters like baudrate or specific serial config + PLUGIN_MQTT_CONNECTION_STATE, // Signal when connection to MQTT broker is re-established + PLUGIN_MQTT_IMPORT, // For P037 MQTT import + PLUGIN_FORMAT_USERVAR, // Allow plugin specific formatting of a task variable (event->idx = variable) + PLUGIN_WEBFORM_SHOW_GPIO_DESCR, // Show GPIO description on devices overview tab #if FEATURE_PLUGIN_STATS - PLUGIN_WEBFORM_LOAD_SHOW_STATS , // Show PluginStats on task config page + PLUGIN_WEBFORM_LOAD_SHOW_STATS, // Show PluginStats on task config page #endif // if FEATURE_PLUGIN_STATS - PLUGIN_I2C_HAS_ADDRESS , // Check the I2C addresses from the plugin, output in 'success' - PLUGIN_I2C_GET_ADDRESS , // Get the current I2C addresses from the plugin, output in 'event->Par1' and 'success' - PLUGIN_GET_DISPLAY_PARAMETERS , // Fetch X/Y resolution and Rotation setting from the plugin, output in 'success' - PLUGIN_WEBFORM_SHOW_ERRORSTATE_OPT , // Show Error State Value options, so be saved during PLUGIN_WEBFORM_SAVE - PLUGIN_INIT_VALUE_RANGES , // Initialize the ranges of values, called just before PLUGIN_INIT - PLUGIN_READ_ERROR_OCCURED , // Function returns "true" when last measurement was an error, called when PLUGIN_READ returns false - PLUGIN_WEBFORM_LOAD_OUTPUT_SELECTOR, // Show the configuration for output type and what value to set to which taskvalue - PLUGIN_PROCESS_CONTROLLER_DATA , // Can be called from the controller to signal the plugin to generate (or handle) sending the data. - PLUGIN_PRIORITY_INIT_ALL , // Pre-initialize all plugins that are set to PowerManager priority (not implemented in plugins) - PLUGIN_PRIORITY_INIT , // Pre-initialize a singe plugins that is set to PowerManager priority - PLUGIN_WEBFORM_LOAD_ALWAYS , // Loaded *after* PLUGIN_WEBFORM_LOAD, also shown for remote data-feed devices + PLUGIN_I2C_HAS_ADDRESS, // Check the I2C addresses from the plugin, output in 'success' + PLUGIN_I2C_GET_ADDRESS, // Get the current I2C addresses from the plugin, output in 'event->Par1' and 'success' + PLUGIN_GET_DISPLAY_PARAMETERS, // Fetch X/Y resolution and Rotation setting from the plugin, output in 'success' + PLUGIN_WEBFORM_SHOW_ERRORSTATE_OPT, // Show Error State Value options, so be saved during PLUGIN_WEBFORM_SAVE + PLUGIN_INIT_VALUE_RANGES, // Initialize the ranges of values, called just before PLUGIN_INIT + PLUGIN_READ_ERROR_OCCURED, // Function returns "true" when last measurement was an error, called when PLUGIN_READ returns false + PLUGIN_WEBFORM_LOAD_OUTPUT_SELECTOR, // Show the configuration for output type and what value to set to which taskvalue + PLUGIN_PROCESS_CONTROLLER_DATA, // Can be called from the controller to signal the plugin to generate (or handle) sending the data. + PLUGIN_PRIORITY_INIT_ALL, // Pre-initialize all plugins that are set to PowerManager priority (not implemented in plugins) + PLUGIN_PRIORITY_INIT, // Pre-initialize a singe plugins that is set to PowerManager priority + PLUGIN_WEBFORM_LOAD_ALWAYS, // Loaded *after* PLUGIN_WEBFORM_LOAD, also shown for remote data-feed devices #ifdef USES_ESPEASY_NOW - PLUGIN_FILTEROUT_CONTROLLER_DATA , // Can be called from the controller to query a task whether the data should be processed further. + PLUGIN_FILTEROUT_CONTROLLER_DATA, // Can be called from the controller to query a task whether the data should be processed further. #endif - PLUGIN_WEBFORM_PRE_SERIAL_PARAMS , // Before serial parameters, convert additional parameters like baudrate or specific serial config + PLUGIN_WEBFORM_PRE_SERIAL_PARAMS, // Before serial parameters, convert additional parameters like baudrate or specific serial config #if FEATURE_MQTT_DISCOVER || FEATURE_CUSTOM_TASKVAR_VTYPE - PLUGIN_GET_DISCOVERY_VTYPES , // Fetch the Sensor_VType values for dynamic value configurations in event->Par1..Par4 + PLUGIN_GET_DISCOVERY_VTYPES, // Fetch the Sensor_VType values for dynamic value configurations in event->Par1..Par4 #endif // IF FEATURE_MQTT_DISCOVER || FEATURE_CUSTOM_TASKVAR_VTYPE - PLUGIN_MAX_FUNCTION // Leave as last one. + PLUGIN_MAX_FUNCTION // Leave as last one. + }; @@ -80,15 +87,16 @@ enum PluginFunctions_e { // CPlugin (Controller) function calls // ******************************************************************************** -class CPlugin { +class CPlugin +{ public: // As these function values are also used in the timing stats, make sure there is no overlap with the PLUGIN_xxx numbering. enum class Function { CPLUGIN_PROTOCOL_ADD = 127, // Called at boot for letting a controller adding itself to list of available controllers - CPLUGIN_CONNECT_SUCCESS, // Only used for timing stats - CPLUGIN_CONNECT_FAIL, // Only used for timing stats + CPLUGIN_CONNECT_SUCCESS, // Only used for timing stats + CPLUGIN_CONNECT_FAIL, // Only used for timing stats CPLUGIN_PROTOCOL_TEMPLATE, CPLUGIN_PROTOCOL_SEND, CPLUGIN_PROTOCOL_RECV, @@ -105,7 +113,7 @@ public: CPLUGIN_INIT_ALL, CPLUGIN_EXIT_ALL, CPLUGIN_EXIT, - CPLUGIN_WRITE, // Send commands to a controller. + CPLUGIN_WRITE, // Send commands to a controller. // new messages for autodiscover controller plugins (experimental) i.e. C014 @@ -116,8 +124,10 @@ public: CPLUGIN_ACKNOWLEDGE, // call for sending acknowledges !ToDo done by direct function call in PluginCall() for now. CPLUGIN_WEBFORM_SHOW_HOST_CONFIG // Used for showing host information for the controller. + }; -}; + +}; // class CPlugin // ******************************************************************************** // NWPlugin (Network) function calls @@ -134,9 +144,11 @@ public: LinkDown, LinkUp, Connected + }; - static const __FlashStringHelper* toString(ConnectionState connectionState, bool asUnicodeSymbol = false); + static const __FlashStringHelper* toString(ConnectionState connectionState, + bool asUnicodeSymbol = false); // As these function values are also used in the timing stats, make sure there is no overlap with the PLUGIN_xxx numbering. @@ -148,6 +160,7 @@ public: NWPLUGIN_DRIVER_TEMPLATE, NWPLUGIN_LOAD_DEFAULTS, NWPLUGIN_GET_DEVICENAME, + NWPLUGIN_CLIENT_IP_WEB_ACCESS_ALLOWED, NWPLUGIN_WEBFORM_SAVE, NWPLUGIN_WEBFORM_LOAD, NWPLUGIN_GET_PARAMETER_DISPLAY_NAME, @@ -158,19 +171,19 @@ public: NWPLUGIN_EXIT_ALL, // Exit all network interfaces NWPLUGIN_EXIT, NWPLUGIN_WRITE, // Send commands to a network adapter. - NWPLUGIN_CREDENTIALS_CHANGED, + NWPLUGIN_CREDENTIALS_CHANGED, #ifdef ESP32 NWPLUGIN_GET_INTERFACE, NWPLUGIN_WEBFORM_SHOW_ROUTE_PRIO, - NWPLUGIN_PRIORITY_ROUTE_CHANGED, // The default interface was changed, let other interfaces check to see if they need to do something. - NWPLUGIN_GET_TRAFFIC_COUNT, // TX/RX count in event->Par64_1, resp. event->Par64_2 - #endif + NWPLUGIN_PRIORITY_ROUTE_CHANGED, // The default interface was changed, let other interfaces check to see if they need to do something. + NWPLUGIN_GET_TRAFFIC_COUNT, // TX/RX count in event->Par64_1, resp. event->Par64_2 + #endif // ifdef ESP32 NWPLUGIN_GET_CONNECTED_DURATION, - NWPLUGIN_PROCESS_EVENT, // Process received event arduino_event_id_t + NWPLUGIN_PROCESS_EVENT, // Process received event arduino_event_id_t #if FEATURE_PLUGIN_STATS NWPLUGIN_RECORD_STATS, NWPLUGIN_WEBFORM_LOAD_SHOW_STATS, -#endif +#endif // if FEATURE_PLUGIN_STATS NWPLUGIN_WEBFORM_SHOW_CONNECTED, // Used for showing connected state/speed NWPLUGIN_WEBFORM_SHOW_HOSTNAME, // Used for showing hostname NWPLUGIN_WEBFORM_SHOW_HW_ADDRESS, // Used for showing MAC @@ -204,6 +217,7 @@ public: static const __FlashStringHelper* toString(IP_type ip_type); + static IPAddress get_IP_address(NWPlugin::IP_type ip_type, NetworkInterface *networkInterface); @@ -211,6 +225,25 @@ public: NetworkInterface *networkInterface, Print & out); + static bool get_subnet(NWPlugin::IP_type ip_type, + NetworkInterface *networkInterface, + IPAddress & networkID, + IPAddress & broadcast); +#endif // ifdef ESP32 + + static bool ipLessEqual(const IPAddress& ip, + const IPAddress& high); + + static bool ipInRange(const IPAddress& ip, + const IPAddress& low, + const IPAddress& high); + +#ifdef ESP32 + static bool IP_in_subnet(const IPAddress & ip, + NetworkInterface *networkInterface); + + static NWPlugin::IP_type get_IP_type(const IPAddress& ip); + enum class NetforkFlags { DHCP_client = ESP_NETIF_DHCP_CLIENT, @@ -229,19 +262,21 @@ public: static bool isFlagSet(NetforkFlags flag, NetworkInterface*networkInterface); - - static bool forceDHCP_request(NetworkInterface*networkInterface); + + static bool forceDHCP_request(NetworkInterface*networkInterface); #endif // ifdef ESP32 + }; // class NWPlugin // ******************************************************************************** // NPlugin (Notification) function calls // ******************************************************************************** -class NPlugin { +class NPlugin +{ public: enum class Function { @@ -251,8 +286,10 @@ public: NPLUGIN_WEBFORM_LOAD, NPLUGIN_WRITE, NPLUGIN_NOTIFY + }; -}; + +}; // class NPlugin #endif // DATATYPES_ESPEASY_PLUGIN_DEFS_H diff --git a/src/src/Helpers/Networking.cpp b/src/src/Helpers/Networking.cpp index 57c637f81..c2567ef16 100644 --- a/src/src/Helpers/Networking.cpp +++ b/src/src/Helpers/Networking.cpp @@ -981,27 +981,12 @@ void SSDP_update() { #endif // if defined(ESP8266) // ******************************************************************************** -// Return subnet range of WiFi. +// Return subnet range of active network interface. // ******************************************************************************** bool getSubnetRange(IPAddress& low, IPAddress& high) { - if (!WiFiEventData.WiFiGotIP()) { - return false; - } - - const IPAddress ip = ESPEasy::net::NetworkLocalIP(); - const IPAddress subnet = ESPEasy::net::NetworkSubnetMask(); - - low = ip; - high = ip; - - // Compute subnet range. - for (uint8_t i = 0; i < 4; ++i) { - if (subnet[i] != 255) { - low[i] = low[i] & subnet[i]; - high[i] = high[i] | ~subnet[i]; - } - } + low = ESPEasy::net::NetworkID(); + high = ESPEasy::net::NetworkBroadcast(); return true; } diff --git a/src/src/Helpers/StringProvider.cpp b/src/src/Helpers/StringProvider.cpp index eac010bf3..4ae8312b6 100644 --- a/src/src/Helpers/StringProvider.cpp +++ b/src/src/Helpers/StringProvider.cpp @@ -9,6 +9,7 @@ #include "../CustomBuild/CompiletimeDefines.h" #include "../../ESPEasy/net/ESPEasyNetwork.h" +#include "../../ESPEasy/net/Helpers/NWAccessControl.h" #include "../../ESPEasy/net/wifi/ESPEasyWifi.h" #if FEATURE_ETHERNET @@ -502,7 +503,7 @@ String getValue(LabelType::Enum label) { case LabelType::DNS: return strformat(F("%s / %s"), getValue(LabelType::DNS_1).c_str(), getValue(LabelType::DNS_2).c_str()); case LabelType::DNS_1: return formatIP(ESPEasy::net::NetworkDnsIP(0)); case LabelType::DNS_2: return formatIP(ESPEasy::net::NetworkDnsIP(1)); - case LabelType::ALLOWED_IP_RANGE: return describeAllowedIPrange(); + case LabelType::ALLOWED_IP_RANGE: return ESPEasy::net::describeAllowedIPrange(); #if FEATURE_WIFI case LabelType::STA_MAC: return ESPEasy::net::WifiSTAmacAddress().toString(); case LabelType::AP_MAC: return ESPEasy::net::WifiSoftAPmacAddress().toString(); diff --git a/src/src/WebServer/AccessControl.cpp b/src/src/WebServer/AccessControl.cpp index eae977692..6dd5c821f 100644 --- a/src/src/WebServer/AccessControl.cpp +++ b/src/src/WebServer/AccessControl.cpp @@ -15,92 +15,23 @@ #include "../WebServer/Markup.h" -// ******************************************************************************** -// Allowed IP range check -// ******************************************************************************** +#include "../../ESPEasy/net/Helpers/NWAccessControl.h" -boolean ipLessEqual(const IPAddress& ip, const IPAddress& high) -{ - // FIXME TD-er: Must check whether both are of same type and check full range IPv6 - for (int i = 0; i < 4; ++i) { - if (ip[i] != high[i]) { - return ip[i] < high[i]; - } - } - // Is equal - return true; + + +bool clientIPinSubnetDefaultNetwork() { + return NWPlugin::ipInRange( + web_server.client().remoteIP(), + ESPEasy::net::NetworkID(), + ESPEasy::net::NetworkBroadcast()); } -boolean ipInRange(const IPAddress& ip, const IPAddress& low, const IPAddress& high) -{ - return ipLessEqual(low, ip) && ipLessEqual(ip, high); -} - -String describeAllowedIPrange() { - String reply; - - switch (SecuritySettings.IPblockLevel) { - case ALL_ALLOWED: - reply += F("All Allowed"); - break; - default: - { - IPAddress low, high; - getIPallowedRange(low, high); - reply += formatIP(low); - reply += F(" - "); - reply += formatIP(high); - } - } - return reply; -} - -bool getIPallowedRange(IPAddress& low, IPAddress& high) -{ - switch (SecuritySettings.IPblockLevel) { - case LOCAL_SUBNET_ALLOWED: - - if ( ESPEasy::net::wifi::WifiIsAP(WiFi.getMode())) { - // WiFi is active as accesspoint, do not check. - return false; - } - return getSubnetRange(low, high); - case ONLY_IP_RANGE_ALLOWED: - low = IPAddress(SecuritySettings.AllowedIPrangeLow); - high = IPAddress(SecuritySettings.AllowedIPrangeHigh); - break; - default: - low = IPAddress(0, 0, 0, 0); - high = IPAddress(255, 255, 255, 255); - return false; - } - return true; -} - -bool clientIPinSubnet() { - IPAddress low, high; - - if (!getSubnetRange(low, high)) { - // Could not determine subnet. - return false; - } - return ipInRange(web_server.client().remoteIP(), low, high); -} - -boolean clientIPallowed() +bool clientIPallowed() { #if ESP_IDF_VERSION_MAJOR>=5 // FIXME TD-er: remoteIP() is reporting incorrect value // return true; #endif - // TD-er Must implement "safe time after boot" - IPAddress low, high; - - if (!getIPallowedRange(low, high)) - { - // No subnet range determined, cannot filter on IP - return true; - } const IPAddress remoteIP = web_server.client().remoteIP(); if (remoteIP == IPAddress(0, 0, 0, 0) #if ESP_IDF_VERSION_MAJOR>=5 @@ -112,8 +43,7 @@ boolean clientIPallowed() // FIXME TD-er: Must see what's going on here, why the client doesn't send remote IP for some reason return true; } - - if (ipInRange(remoteIP, low, high)) { + if (ESPEasy::net::ipInAllowedSubnet(remoteIP)) { return true; } @@ -121,15 +51,12 @@ boolean clientIPallowed() // @TD-er Fixme: Should match subnet of SoftAP. return true; } - String response = F("IP blocked: "); - response += formatIP(remoteIP); + String response = concat(F("IP blocked: "), formatIP(remoteIP)); web_server.send(403, F("text/html"), response); if (loglevelActiveFor(LOG_LEVEL_ERROR)) { response += F(" Allowed: "); - response += formatIP(low); - response += F(" - "); - response += formatIP(high); + response += ESPEasy::net::describeAllowedIPrange(); addLogMove(LOG_LEVEL_ERROR, response); } return false; diff --git a/src/src/WebServer/AccessControl.h b/src/src/WebServer/AccessControl.h index bbb5c2466..abb997552 100644 --- a/src/src/WebServer/AccessControl.h +++ b/src/src/WebServer/AccessControl.h @@ -8,21 +8,9 @@ // ******************************************************************************** // Allowed IP range check // ******************************************************************************** -#define ALL_ALLOWED 0 -#define LOCAL_SUBNET_ALLOWED 1 -#define ONLY_IP_RANGE_ALLOWED 2 +bool clientIPinSubnetDefaultNetwork(); -boolean ipLessEqual(const IPAddress& ip, const IPAddress& high); - -boolean ipInRange(const IPAddress& ip, const IPAddress& low, const IPAddress& high); - -String describeAllowedIPrange(); - -bool getIPallowedRange(IPAddress& low, IPAddress& high); - -bool clientIPinSubnet(); - -boolean clientIPallowed(); +bool clientIPallowed(); void clearAccessBlock(); diff --git a/src/src/WebServer/ConfigPage.cpp b/src/src/WebServer/ConfigPage.cpp index 5f3c70317..8f2fa3fc8 100644 --- a/src/src/WebServer/ConfigPage.cpp +++ b/src/src/WebServer/ConfigPage.cpp @@ -16,6 +16,7 @@ #include "../ESPEasyCore/Controller.h" #include "../../ESPEasy/net/ESPEasyNetwork.h" +#include "../../ESPEasy/net/Helpers/NWAccessControl.h" #include "../Globals/MQTT.h" #include "../Globals/Nodes.h" @@ -102,24 +103,14 @@ void handle_config() { // TD-er Read access control from form. SecuritySettings.IPblockLevel = getFormItemInt(F("ipblocklevel")); - switch (SecuritySettings.IPblockLevel) { - case LOCAL_SUBNET_ALLOWED: - { - IPAddress low, high; - getSubnetRange(low, high); - - for (uint8_t i = 0; i < 4; ++i) { - SecuritySettings.AllowedIPrangeLow[i] = low[i]; - SecuritySettings.AllowedIPrangeHigh[i] = high[i]; - } - break; - } - case ONLY_IP_RANGE_ALLOWED: - case ALL_ALLOWED: - + if (SecuritySettings.IPblockLevel == ONLY_IP_RANGE_ALLOWED) { webArg2ip(F("iprangelow"), SecuritySettings.AllowedIPrangeLow); webArg2ip(F("iprangehigh"), SecuritySettings.AllowedIPrangeHigh); - break; + } else { + for (size_t i = 0; i < 4; ++i) { + SecuritySettings.AllowedIPrangeLow[i] = 0; + SecuritySettings.AllowedIPrangeHigh[i] = 255; + } } #ifdef USES_ESPEASY_NOW @@ -209,18 +200,12 @@ void handle_config() { // TD-er add IP access box F("ipblocklevel") addFormSubHeader(F("Client IP filtering")); { - IPAddress low, high; - getIPallowedRange(low, high); - uint8_t iplow[4]; - uint8_t iphigh[4]; - - for (uint8_t i = 0; i < 4; ++i) { - iplow[i] = low[i]; - iphigh[i] = high[i]; - } addFormIPaccessControlSelect(F("Client IP block level"), F("ipblocklevel"), SecuritySettings.IPblockLevel); - addFormIPBox(F("Access IP lower range"), F("iprangelow"), iplow); - addFormIPBox(F("Access IP upper range"), F("iprangehigh"), iphigh); + + if (SecuritySettings.IPblockLevel == ONLY_IP_RANGE_ALLOWED) { + addFormIPBox(F("Access IP lower range"), F("iprangelow"), SecuritySettings.AllowedIPrangeLow); + addFormIPBox(F("Access IP upper range"), F("iprangehigh"), SecuritySettings.AllowedIPrangeHigh); + } } #ifndef WEBSERVER_NETWORK addFormSubHeader(F("WiFi IP Settings")); diff --git a/src/src/WebServer/ESPEasy_WebServer.cpp b/src/src/WebServer/ESPEasy_WebServer.cpp index d31df786c..8f81adbf8 100644 --- a/src/src/WebServer/ESPEasy_WebServer.cpp +++ b/src/src/WebServer/ESPEasy_WebServer.cpp @@ -129,7 +129,7 @@ void sendHeadandTail_stdtemplate(bool Tail, bool rebooting) { sendHeadandTail(F("TmplStd"), Tail, rebooting); if (!Tail) { - if (!clientIPinSubnet() && ESPEasy::net::wifi::WifiIsAP(WiFi.getMode()) && (WiFi.softAPgetStationNum() > 0)) { + if (!clientIPinSubnetDefaultNetwork() && ESPEasy::net::wifi::WifiIsAP(WiFi.getMode()) && (WiFi.softAPgetStationNum() > 0)) { addHtmlError(F("Warning: Connected via AP")); } diff --git a/src/src/WebServer/NetworkPage.cpp b/src/src/WebServer/NetworkPage.cpp index 6a9b9bbb8..574a7bffc 100644 --- a/src/src/WebServer/NetworkPage.cpp +++ b/src/src/WebServer/NetworkPage.cpp @@ -160,6 +160,7 @@ void handle_networks_CopySubmittedSettings_NWPluginCall(ESPEasy::net::networkInd # endif # ifdef ESP32 Settings.setRoutePrio_for_network(networkindex, getFormItemInt(F("routeprio"), 0)); + Settings.setNetworkInterfaceSubnetBlockClientIP(networkindex, isFormItemChecked(F("block_web_access"))); # endif String dummy; NWPluginCall(NWPlugin::Function::NWPLUGIN_WEBFORM_SAVE, &TempEvent, dummy); @@ -364,6 +365,8 @@ void handle_networks_NetworkSettingsPage(ESPEasy::net::networkIndex_t networkind 0, 255); addFormNote(F("The active interface with highest priority will be used for default route (gateway).")); # endif // ifdef ESP32 + addFormCheckBox(F("Block Web Access"), F("block_web_access"), Settings.getNetworkInterfaceSubnetBlockClientIP(networkindex)); + addFormNote(F("When checked, any host from a subnet on this network interface will be blocked")); String str; NWPluginCall(NWPlugin::Function::NWPLUGIN_WEBFORM_LOAD, &TempEvent, str); diff --git a/src/src/WebServer/SetupPage.cpp b/src/src/WebServer/SetupPage.cpp index d1aa4cf34..5ded7fb1b 100644 --- a/src/src/WebServer/SetupPage.cpp +++ b/src/src/WebServer/SetupPage.cpp @@ -183,7 +183,7 @@ void handle_setup() { html_TD(); #if SETUP_PAGE_SHOW_CONFIG_BUTTON - if (!clientIPinSubnet()) { + if (!clientIPinSubnetDefaultNetwork()) { String host = formatIP(ESPEasy::net::NetworkLocalIP()); String url = F("http://"); url += host; diff --git a/src/src/WebServer/SysInfoPage.cpp b/src/src/WebServer/SysInfoPage.cpp index 69cd0ea0f..7c1863cd3 100644 --- a/src/src/WebServer/SysInfoPage.cpp +++ b/src/src/WebServer/SysInfoPage.cpp @@ -19,13 +19,14 @@ # include "../../ESPEasy/net/eth/ESPEasyEth.h" # include "../../ESPEasy/net/ESPEasyNetwork.h" +# include "../../ESPEasy/net/Helpers/NWAccessControl.h" # include "../../ESPEasy/net/wifi/ESPEasyWifi.h" # include "../Globals/CRCValues.h" # include "../Globals/ESPEasy_time.h" # include "../../ESPEasy/net/Globals/ESPEasyWiFiEvent.h" -#include "../../ESPEasy/net/Globals/NetworkState.h" +# include "../../ESPEasy/net/Globals/NetworkState.h" # include "../Globals/RTC.h" # include "../Globals/Settings.h" @@ -140,7 +141,7 @@ void handle_sysinfo_json() { json_prop(F("gw"), getValue(LabelType::GATEWAY)); json_prop(F("dns1"), getValue(LabelType::DNS_1)); json_prop(F("dns2"), getValue(LabelType::DNS_2)); - json_prop(F("allowed_range"), describeAllowedIPrange()); + json_prop(F("allowed_range"), ESPEasy::net::describeAllowedIPrange()); json_prop(F("sta_mac"), getValue(LabelType::STA_MAC)); json_prop(F("ap_mac"), getValue(LabelType::AP_MAC)); json_prop(F("ssid"), getValue(LabelType::SSID)); From d628af5c88b08fb9ed534a7492ad7bf4911cd53c Mon Sep 17 00:00:00 2001 From: TD-er Date: Wed, 13 Aug 2025 19:46:11 +0200 Subject: [PATCH 196/564] [Network] Add column with interface number to Network overview page --- src/src/WebServer/NetworkPage.cpp | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/src/src/WebServer/NetworkPage.cpp b/src/src/WebServer/NetworkPage.cpp index 574a7bffc..0708d4770 100644 --- a/src/src/WebServer/NetworkPage.cpp +++ b/src/src/WebServer/NetworkPage.cpp @@ -173,10 +173,11 @@ void handle_networks_ShowAllNetworksTable() html_table_class_multirow(); html_TR(); html_table_header(F(""), 70); + html_table_header(F("Nr"), 50); html_table_header(F("Enabled"), 100); html_table_header(F("Network Adapter")); # ifdef ESP32 - html_table_header(F("Prio"), 50); + html_table_header(F("Route Prio"), 50); # endif html_table_header(F("Connected")); html_table_header(F("Hostname/SSID")); @@ -207,6 +208,8 @@ void handle_networks_ShowAllNetworksTable() addHtml(F("Add")); } addHtml(F("")); + addHtmlInt(x + 1); + html_TD(); } if (nwplugin_set) From 15b38c61f62e7941e81d301562a4bd246a4fea1d Mon Sep 17 00:00:00 2001 From: TD-er Date: Wed, 13 Aug 2025 19:47:05 +0200 Subject: [PATCH 197/564] [Network] Fix NAPT forwarding when client connects/disconnects --- .../NW001_data_struct_WiFi_STA.cpp | 10 +- .../NW002_data_struct_WiFi_AP.cpp | 101 +++++++++++++++--- .../NW002_data_struct_WiFi_AP.h | 6 ++ .../net/wifi/ESPEasyWifi_abstracted.cpp | 1 + 4 files changed, 100 insertions(+), 18 deletions(-) diff --git a/src/ESPEasy/net/NWPluginStructs/NW001_data_struct_WiFi_STA.cpp b/src/ESPEasy/net/NWPluginStructs/NW001_data_struct_WiFi_STA.cpp index ffce7c6aa..36505e02b 100644 --- a/src/ESPEasy/net/NWPluginStructs/NW001_data_struct_WiFi_STA.cpp +++ b/src/ESPEasy/net/NWPluginStructs/NW001_data_struct_WiFi_STA.cpp @@ -165,11 +165,14 @@ bool NW001_data_struct_WiFi_STA::initPluginStats() bool NW001_data_struct_WiFi_STA::record_stats() { if (_plugin_stats_array != nullptr) { -# ifdef ESP32 - EventStruct tmpEvent; size_t valueCount{}; - tmpEvent.ParfN[valueCount++] = WiFi.STA.RSSI(); + tmpEvent.ParfN[valueCount++] = + #ifdef ESP32 + WiFi.STA.RSSI(); + #else + WiFi.RSSI(); + #endif # if FEATURE_SET_WIFI_TX_PWR tmpEvent.ParfN[valueCount++] = ESPEasy::net::wifi::GetWiFiTXpower(); # endif @@ -177,7 +180,6 @@ bool NW001_data_struct_WiFi_STA::record_stats() bool trackPeaks = true; bool onlyUpdateTimestampWhenSame = true; return pushStatsValues(&tmpEvent, valueCount, trackPeaks, onlyUpdateTimestampWhenSame); -# endif // ifdef ESP32 } return false; } diff --git a/src/ESPEasy/net/NWPluginStructs/NW002_data_struct_WiFi_AP.cpp b/src/ESPEasy/net/NWPluginStructs/NW002_data_struct_WiFi_AP.cpp index 52ac0e0e2..83737662a 100644 --- a/src/ESPEasy/net/NWPluginStructs/NW002_data_struct_WiFi_AP.cpp +++ b/src/ESPEasy/net/NWPluginStructs/NW002_data_struct_WiFi_AP.cpp @@ -15,6 +15,8 @@ # define NW_PLUGIN_INTERFACE WiFi.AP # endif +# define NW002_STATION_COUNT_STATS_INDEX 0 + namespace ESPEasy { namespace net { namespace wifi { @@ -25,6 +27,21 @@ static NWPluginData_static_runtime stats_and_cache(&NW_PLUGIN_INTERFACE); static NWPluginData_static_runtime stats_and_cache(false); # endif // ifdef ESP32 +# ifdef ESP32 +static bool nw002_enable_NAPT{}; + +static bool NW002_update_NAPT() { + NW_PLUGIN_INTERFACE.enableNAPT(false); + + if (nw002_enable_NAPT && NW_PLUGIN_INTERFACE.stationCount()) { + NW_PLUGIN_INTERFACE.enableNAPT(true); + return true; + } + + return false; +} + +# endif // ifdef ESP32 NW002_data_struct_WiFi_AP::NW002_data_struct_WiFi_AP(networkIndex_t networkIndex) : NWPluginData_base( @@ -37,13 +54,15 @@ NW002_data_struct_WiFi_AP::NW002_data_struct_WiFi_AP(networkIndex_t networkIndex { stats_and_cache.clear(networkIndex); # ifdef ESP32 - nw_event_id = Network.onEvent(NW002_data_struct_WiFi_AP::onEvent); -# endif + nw002_enable_NAPT = Settings.WiFi_AP_enable_NAPT(); + nw_event_id = Network.onEvent(NW002_data_struct_WiFi_AP::onEvent); +# endif // ifdef ESP32 } NW002_data_struct_WiFi_AP::~NW002_data_struct_WiFi_AP() { # ifdef ESP32 + nw002_enable_NAPT = false; if (nw_event_id != 0) { Network.removeEvent(nw_event_id); @@ -61,18 +80,24 @@ bool NW002_data_struct_WiFi_AP::webform_getPort(String& str) { return true; bool NW002_data_struct_WiFi_AP::init(EventStruct *event) { +# ifdef ESP32 + nw002_enable_NAPT = Settings.WiFi_AP_enable_NAPT(); +# endif ESPEasy::net::wifi::setAPinternal(true); +# ifdef ESP32 + NW002_update_NAPT(); +# endif return true; } bool NW002_data_struct_WiFi_AP::exit(EventStruct *event) { # ifdef ESP32 + NW_PLUGIN_INTERFACE.enableNAPT(false); NW_PLUGIN_INTERFACE.end(); -# endif +# endif // ifdef ESP32 # ifdef ESP8266 - - // WiFi.softAP + WiFi.softAPdisconnect(); # endif // ifdef ESP8266 return true; @@ -83,20 +108,66 @@ NWPluginData_static_runtime& NW002_data_struct_WiFi_AP::getNWPluginData_static_r # ifdef ESP32 -bool NW002_data_struct_WiFi_AP::handle_priority_route_changed() +bool NW002_data_struct_WiFi_AP::handle_priority_route_changed() { return NW002_update_NAPT(); } + +# endif // ifdef ESP32 + + +# if FEATURE_PLUGIN_STATS + +bool NW002_data_struct_WiFi_AP::initPluginStats() { - bool res{}; + networkStatsVarIndex_t networkStatsVarIndex{}; + PluginStats_Config_t displayConfig; - // NW_PLUGIN_INTERFACE.enableNAPT(false); + displayConfig.setAxisPosition(PluginStats_Config_t::AxisPosition::Right); + displayConfig.setEnabled(true); - if (!NW_PLUGIN_INTERFACE.isDefault()) { - // FIXME TD-er: May need to stop/start NAPT on WiFi.AP - // NW_PLUGIN_INTERFACE.enableNAPT(true); - } - - return res; + displayConfig.setAxisIndex(networkStatsVarIndex); + NWPluginData_base::initPluginStats( + networkStatsVarIndex, + F("Station Count"), + 1, + NAN, + displayConfig); +# ifdef ESP32 + initPluginStats_trafficCount(++networkStatsVarIndex, true); // TX + initPluginStats_trafficCount(++networkStatsVarIndex, false); // RX +# endif // ifdef ESP32 + return true; } +bool NW002_data_struct_WiFi_AP::record_stats() +{ + if (_plugin_stats_array != nullptr) { + EventStruct tmpEvent; + size_t valueCount{}; + tmpEvent.ParfN[valueCount++] = + # ifdef ESP32 + NW_PLUGIN_INTERFACE.stationCount(); + # else + WiFi.softAPgetStationNum(); + # endif // ifdef ESP32 + + bool trackPeaks = true; + bool onlyUpdateTimestampWhenSame = true; + return pushStatsValues(&tmpEvent, valueCount, trackPeaks, onlyUpdateTimestampWhenSame); + } + return false; +} + +bool NW002_data_struct_WiFi_AP::webformLoad_show_stats(struct EventStruct *event) const +{ + if (_plugin_stats_array != nullptr) { + return _plugin_stats_array->webformLoad_show_stats(event); + } + return false; +} + +# endif // if FEATURE_PLUGIN_STATS + +# ifdef ESP32 + void NW002_data_struct_WiFi_AP::onEvent(arduino_event_id_t event, arduino_event_info_t info) { @@ -109,9 +180,11 @@ void NW002_data_struct_WiFi_AP::onEvent(arduino_event_id_t event, stats_and_cache.mark_stop(); break; case ARDUINO_EVENT_WIFI_AP_STACONNECTED: + NW002_update_NAPT(); addLog(LOG_LEVEL_INFO, F("AP_STACONNECTED")); break; case ARDUINO_EVENT_WIFI_AP_STADISCONNECTED: + NW002_update_NAPT(); addLog(LOG_LEVEL_INFO, F("AP_STADISCONNECTED")); break; case ARDUINO_EVENT_WIFI_AP_STAIPASSIGNED: diff --git a/src/ESPEasy/net/NWPluginStructs/NW002_data_struct_WiFi_AP.h b/src/ESPEasy/net/NWPluginStructs/NW002_data_struct_WiFi_AP.h index 17c5b3266..7e033f0ea 100644 --- a/src/ESPEasy/net/NWPluginStructs/NW002_data_struct_WiFi_AP.h +++ b/src/ESPEasy/net/NWPluginStructs/NW002_data_struct_WiFi_AP.h @@ -27,6 +27,12 @@ struct NW002_data_struct_WiFi_AP : public NWPluginData_base { bool handle_priority_route_changed() override; # endif +# if FEATURE_PLUGIN_STATS + bool initPluginStats() override; + bool record_stats() override; + bool webformLoad_show_stats(struct EventStruct *event) const override; +# endif // if FEATURE_PLUGIN_STATS + NWPluginData_static_runtime& getNWPluginData_static_runtime(); private: diff --git a/src/ESPEasy/net/wifi/ESPEasyWifi_abstracted.cpp b/src/ESPEasy/net/wifi/ESPEasyWifi_abstracted.cpp index 858ff2e45..dd108c15f 100644 --- a/src/ESPEasy/net/wifi/ESPEasyWifi_abstracted.cpp +++ b/src/ESPEasy/net/wifi/ESPEasyWifi_abstracted.cpp @@ -95,6 +95,7 @@ void doSetAPinternal(bool enable) dns.toString().c_str()) ); } + WiFi.AP.bandwidth(WIFI_BW_HT20); # endif // ifdef ESP32 # ifdef ESP8266 From 37a9379f4545545d6ba3e4cde1723e9f0a37a5e3 Mon Sep 17 00:00:00 2001 From: TD-er Date: Thu, 14 Aug 2025 08:51:28 +0200 Subject: [PATCH 198/564] [Network] Show connected clients to AP + cleanup charts/stats --- .../net/DataStructs/NWPluginData_base.cpp | 5 ++ .../NW001_data_struct_WiFi_STA.cpp | 1 + .../NW002_data_struct_WiFi_AP.cpp | 37 ++++++++++ .../NW005_data_struct_PPP_modem.cpp | 1 + src/ESPEasy/net/_NW002_WiFi_AP.cpp | 73 ++++++++++++++----- .../net/wifi/ESPEasyWifi_abstracted.cpp | 10 +++ src/src/DataStructs/PluginStats.cpp | 21 ++++++ src/src/DataStructs/PluginStats.h | 2 + 8 files changed, 130 insertions(+), 20 deletions(-) diff --git a/src/ESPEasy/net/DataStructs/NWPluginData_base.cpp b/src/ESPEasy/net/DataStructs/NWPluginData_base.cpp index d8dd2bd1f..4a6fd0d25 100644 --- a/src/ESPEasy/net/DataStructs/NWPluginData_base.cpp +++ b/src/ESPEasy/net/DataStructs/NWPluginData_base.cpp @@ -255,6 +255,11 @@ bool NWPluginData_base::pushStatsValues(EventStruct *event, event->ParfN[valueCount++] = _prevRX == 0 ? 0 : rx - _prevRX; _prevRX = rx; _prevTX = tx; + } else { + event->ParfN[valueCount++] = NAN; + event->ParfN[valueCount++] = NAN; + _prevTX = 0; + _prevRX = 0; } # endif // ifdef ESP32 diff --git a/src/ESPEasy/net/NWPluginStructs/NW001_data_struct_WiFi_STA.cpp b/src/ESPEasy/net/NWPluginStructs/NW001_data_struct_WiFi_STA.cpp index 36505e02b..6dcde4ec0 100644 --- a/src/ESPEasy/net/NWPluginStructs/NW001_data_struct_WiFi_STA.cpp +++ b/src/ESPEasy/net/NWPluginStructs/NW001_data_struct_WiFi_STA.cpp @@ -148,6 +148,7 @@ bool NW001_data_struct_WiFi_STA::initPluginStats() # if FEATURE_SET_WIFI_TX_PWR ++networkStatsVarIndex; displayConfig.setAxisIndex(networkStatsVarIndex); + displayConfig.setHidden(true); NWPluginData_base::initPluginStats( networkStatsVarIndex, F("TX Power"), diff --git a/src/ESPEasy/net/NWPluginStructs/NW002_data_struct_WiFi_AP.cpp b/src/ESPEasy/net/NWPluginStructs/NW002_data_struct_WiFi_AP.cpp index 83737662a..01a904135 100644 --- a/src/ESPEasy/net/NWPluginStructs/NW002_data_struct_WiFi_AP.cpp +++ b/src/ESPEasy/net/NWPluginStructs/NW002_data_struct_WiFi_AP.cpp @@ -10,6 +10,11 @@ # include "../wifi/ESPEasyWifi.h" +# ifdef ESP32 +# include +# include +# endif + # define NW_PLUGIN_ID 2 # ifdef ESP32 # define NW_PLUGIN_INTERFACE WiFi.AP @@ -124,6 +129,7 @@ bool NW002_data_struct_WiFi_AP::initPluginStats() displayConfig.setEnabled(true); displayConfig.setAxisIndex(networkStatsVarIndex); + displayConfig.setHidden(true); NWPluginData_base::initPluginStats( networkStatsVarIndex, F("Station Count"), @@ -131,6 +137,17 @@ bool NW002_data_struct_WiFi_AP::initPluginStats() NAN, displayConfig); # ifdef ESP32 + ++networkStatsVarIndex; + displayConfig.setHidden(false); + displayConfig.setAxisIndex(networkStatsVarIndex); + NWPluginData_base::initPluginStats( + networkStatsVarIndex, + F("RSSI"), + 1, + NAN, + displayConfig); + + initPluginStats_trafficCount(++networkStatsVarIndex, true); // TX initPluginStats_trafficCount(++networkStatsVarIndex, false); // RX # endif // ifdef ESP32 @@ -149,6 +166,21 @@ bool NW002_data_struct_WiFi_AP::record_stats() WiFi.softAPgetStationNum(); # endif // ifdef ESP32 +# ifdef ESP32 + { + wifi_sta_list_t wifi_sta_list = { 0 }; + esp_wifi_ap_get_sta_list(&wifi_sta_list); + + if (wifi_sta_list.num == 0) { + tmpEvent.ParfN[valueCount++] = NAN; + } else { + // FIXME TD-er: Should we list the 1st one, average or best/worst value? + // For now, just use the first one, which is likely the only user scenario actually being used + tmpEvent.ParfN[valueCount++] = wifi_sta_list.sta[0].rssi; + } + } +# endif // ifdef ESP32 + bool trackPeaks = true; bool onlyUpdateTimestampWhenSame = true; return pushStatsValues(&tmpEvent, valueCount, trackPeaks, onlyUpdateTimestampWhenSame); @@ -180,10 +212,15 @@ void NW002_data_struct_WiFi_AP::onEvent(arduino_event_id_t event, stats_and_cache.mark_stop(); break; case ARDUINO_EVENT_WIFI_AP_STACONNECTED: + stats_and_cache.mark_connected(); NW002_update_NAPT(); addLog(LOG_LEVEL_INFO, F("AP_STACONNECTED")); break; case ARDUINO_EVENT_WIFI_AP_STADISCONNECTED: + + if (WiFi.AP.stationCount() == 0) { + stats_and_cache.mark_disconnected(); + } NW002_update_NAPT(); addLog(LOG_LEVEL_INFO, F("AP_STADISCONNECTED")); break; diff --git a/src/ESPEasy/net/NWPluginStructs/NW005_data_struct_PPP_modem.cpp b/src/ESPEasy/net/NWPluginStructs/NW005_data_struct_PPP_modem.cpp index e807b851d..89d895da5 100644 --- a/src/ESPEasy/net/NWPluginStructs/NW005_data_struct_PPP_modem.cpp +++ b/src/ESPEasy/net/NWPluginStructs/NW005_data_struct_PPP_modem.cpp @@ -924,6 +924,7 @@ bool NW005_data_struct_PPP_modem::initPluginStats() ++networkStatsVarIndex; displayConfig.setAxisIndex(networkStatsVarIndex); + displayConfig.setHidden(true); NWPluginData_base::initPluginStats( networkStatsVarIndex, F("Bit Error Rate (BER)"), diff --git a/src/ESPEasy/net/_NW002_WiFi_AP.cpp b/src/ESPEasy/net/_NW002_WiFi_AP.cpp index 540f55f28..0a8a05cbf 100644 --- a/src/ESPEasy/net/_NW002_WiFi_AP.cpp +++ b/src/ESPEasy/net/_NW002_WiFi_AP.cpp @@ -32,6 +32,11 @@ // TODO TD-er: This code should be moved to this NW002 plugin # include "../net/wifi/ESPEasyWifi.h" +# ifdef ESP32 +# include +# include +# endif // ifdef ESP32 + namespace ESPEasy { namespace net { @@ -78,30 +83,56 @@ bool NWPlugin_002(NWPlugin::Function function, EventStruct *event, String& strin case NWPlugin::Function::NWPLUGIN_WEBFORM_SHOW_CONNECTED: { # ifdef ESP32 - const uint8_t num = WiFi.AP.stationCount(); + wifi_sta_list_t wifi_sta_list = { 0 }; + wifi_sta_mac_ip_list_t wifi_sta_mac_ip_list = { 0 }; - /* - auto netif = WiFi.AP.netif(); - for (size_t i = 0; i < num; ++i) { - esp_netif_pair_mac_ip_t mac_ip_pair{}; - if (esp_netif_dhcps_get_clients_by_mac(netif, i, &mac_ip_pair) == 0) { - if (string.length() > 0) { - string += '\n'; - } - const MAC_address mac(mac_ip_pair.mac); - const IPAddress ip(mac_ip_pair.ip.addr); - string += strformat( - F("%s IP: %s"), - mac.toString().c_str(), - ip.toString().c_str() + esp_wifi_ap_get_sta_list(&wifi_sta_list); + esp_wifi_ap_get_sta_list_with_ip(&wifi_sta_list, &wifi_sta_mac_ip_list); + + for (int i = 0; i < wifi_sta_mac_ip_list.num; i++) + { + const MAC_address mac(wifi_sta_mac_ip_list.sta[i].mac); + const IPAddress ip(wifi_sta_mac_ip_list.sta[i].ip.addr); + + if (string.length() > 0) { + string += '\n'; + } + + string += strformat( + F("%s IP:%s (%d dBm)"), + mac.toString().c_str(), + ip.toString().c_str(), + wifi_sta_list.sta[i].rssi ); - } - } - */ -# else // ifdef ESP32 - const uint8_t num = WiFi.softAPgetStationNum(); + } # endif // ifdef ESP32 +# ifdef ESP8266 +# ifndef LIMIT_BUILD_SIZE + struct station_info *station = wifi_softap_get_station_info(); + + while (station) + { + const MAC_address mac(station->bssid); + const IPAddress ip(station->ip.addr); + + if (string.length() > 0) { + string += '\n'; + } + + string += strformat( + F("%s IP:%s"), + mac.toString().c_str(), + ip.toString().c_str() + ); + + station = STAILQ_NEXT(station, next); + } + wifi_softap_free_station_info(); + +# else // ifndef LIMIT_BUILD_SIZE + const uint8_t num = WiFi.softAPgetStationNum(); + if (num > 0) { success = true; string = num; @@ -109,6 +140,8 @@ bool NWPlugin_002(NWPlugin::Function function, EventStruct *event, String& strin if (num > 1) { string += 's'; } } +# endif // ifndef LIMIT_BUILD_SIZE +# endif // ifdef ESP8266 success = string.length() > 0; break; } diff --git a/src/ESPEasy/net/wifi/ESPEasyWifi_abstracted.cpp b/src/ESPEasy/net/wifi/ESPEasyWifi_abstracted.cpp index dd108c15f..d6d875993 100644 --- a/src/ESPEasy/net/wifi/ESPEasyWifi_abstracted.cpp +++ b/src/ESPEasy/net/wifi/ESPEasyWifi_abstracted.cpp @@ -134,6 +134,16 @@ void doSetAPinternal(bool enable) } } # ifdef ESP32 + # if ESP_IDF_VERSION >= ESP_IDF_VERSION_VAL(5, 4, 2) + + if (WiFi.AP.enableDhcpCaptivePortal()) { + addLog(LOG_LEVEL_INFO, F("WIFI : AP Captive Portal enabled")); + } + else { + addLog(LOG_LEVEL_ERROR, F("WIFI : Failed to enable AP Captive Portal")); + } + # endif // if ESP_IDF_VERSION >= ESP_IDF_VERSION_VAL(5, 4, 2) + # else // ifdef ESP32 diff --git a/src/src/DataStructs/PluginStats.cpp b/src/src/DataStructs/PluginStats.cpp index c836af50a..6234d65d8 100644 --- a/src/src/DataStructs/PluginStats.cpp +++ b/src/src/DataStructs/PluginStats.cpp @@ -141,6 +141,23 @@ size_t PluginStats::getNrSamples() const { return _samples->size(); } +size_t PluginStats::getNrUsableSamples() const +{ + const size_t nrSamples = getNrSamples(); + PluginStatsBuffer_t::index_t samplesUsed = 0; + + PluginStatsBuffer_t::index_t i = 0; + + for (; i < nrSamples; ++i) { + const float sample((*_samples)[i]); + + if (usableValue(sample)) { + ++samplesUsed; + } + } + return samplesUsed; +} + float PluginStats::getSampleAvg() const { return getSampleAvg(getNrSamples()); } @@ -441,6 +458,9 @@ bool PluginStats::plugin_get_config_value_base(struct EventStruct *event, String bool PluginStats::webformLoad_show_stats(struct EventStruct *event) const { + if (getNrUsableSamples() == 0) { + return false; + } bool somethingAdded = false; if (webformLoad_show_avg(event)) { somethingAdded = true; } @@ -566,6 +586,7 @@ void PluginStats::webformLoad_show_val( } # if FEATURE_CHART_JS + void PluginStats::plot_ChartJS_dataset() const { add_ChartJS_dataset_header(_ChartJS_dataset_config); diff --git a/src/src/DataStructs/PluginStats.h b/src/src/DataStructs/PluginStats.h index 2a320eb80..5651fcbad 100644 --- a/src/src/DataStructs/PluginStats.h +++ b/src/src/DataStructs/PluginStats.h @@ -74,6 +74,8 @@ public: size_t getNrSamples() const; + size_t getNrUsableSamples() const; + // Compute average over all stored values float getSampleAvg() const; From b3c15c0127d00b5473b7a5cf2063231df3e18daf Mon Sep 17 00:00:00 2001 From: TD-er Date: Thu, 14 Aug 2025 08:52:15 +0200 Subject: [PATCH 199/564] [cleanup] Remove duplicate code in xPlugin tables --- src/src/WebServer/ControllerPage.cpp | 20 +----------------- src/src/WebServer/Markup_Buttons.cpp | 27 ++++++++++++++++++++++++ src/src/WebServer/Markup_Buttons.h | 2 ++ src/src/WebServer/NetworkPage.cpp | 29 ++++++++------------------ src/src/WebServer/NotificationPage.cpp | 20 ++++++++---------- 5 files changed, 48 insertions(+), 50 deletions(-) diff --git a/src/src/WebServer/ControllerPage.cpp b/src/src/WebServer/ControllerPage.cpp index ce5a4c868..4380f63f5 100644 --- a/src/src/WebServer/ControllerPage.cpp +++ b/src/src/WebServer/ControllerPage.cpp @@ -239,25 +239,7 @@ void handle_controllers_ShowAllControllersTable() LoadControllerSettings(x, *ControllerSettings); html_TR_TD(); - if (cplugin_set && !supportedCPluginID(Settings.Protocol[x])) { - html_add_button_prefix(F("red"), true); - } else { - html_add_button_prefix(); - } - { - addHtml(F("controllers?index=")); - addHtmlInt(x + 1); - addHtml(F("'>")); - - if (cplugin_set) { - addHtml(F("Edit")); - } else { - addHtml(F("Add")); - } - addHtml(F("")); - addHtml(getControllerSymbol(x)); - } - html_TD(); + addPlugin_Add_Edit_Button(F("controllers"), x, cplugin_set, supportedCPluginID(Settings.Protocol[x]), getControllerSymbol(x)); if (cplugin_set) { diff --git a/src/src/WebServer/Markup_Buttons.cpp b/src/src/WebServer/Markup_Buttons.cpp index 959854c17..6ae11988c 100644 --- a/src/src/WebServer/Markup_Buttons.cpp +++ b/src/src/WebServer/Markup_Buttons.cpp @@ -186,3 +186,30 @@ void addCopyButton(const String& value, const String& delimiter, const String& n html_copyText_marker(); addHtml(F(")")); } + +void addPlugin_Add_Edit_Button(const __FlashStringHelper * urlPrefix, size_t index, bool plugin_set, bool plugin_supported, const String& symbol) +{ + if (plugin_set && !plugin_supported) { + html_add_button_prefix(F("red"), true); + } else { + html_add_button_prefix(); + } + + addHtml(urlPrefix); + addHtml(F("?index=")); + addHtmlInt(index + 1); + addHtml(F("'>")); + + if (plugin_set) { + addHtml(F("Edit")); + } else { + addHtml(F("Add")); + } + addHtml(F("")); + if (symbol.isEmpty()) { + addHtmlInt(index + 1); + } else { + addHtml(symbol); + } + html_TD(); +} \ No newline at end of file diff --git a/src/src/WebServer/Markup_Buttons.h b/src/src/WebServer/Markup_Buttons.h index eb6c323f6..375308a82 100644 --- a/src/src/WebServer/Markup_Buttons.h +++ b/src/src/WebServer/Markup_Buttons.h @@ -40,5 +40,7 @@ void addSubmitButton(const String& value, const String& name, const String& clas void addCopyButton(const String& value, const String& delimiter, const String& name); +void addPlugin_Add_Edit_Button(const __FlashStringHelper * urlPrefix, size_t index, bool plugin_set, bool plugin_supported, const String& symbol = EMPTY_STRING); + #endif \ No newline at end of file diff --git a/src/src/WebServer/NetworkPage.cpp b/src/src/WebServer/NetworkPage.cpp index 0708d4770..cb9933253 100644 --- a/src/src/WebServer/NetworkPage.cpp +++ b/src/src/WebServer/NetworkPage.cpp @@ -19,6 +19,13 @@ # include "../../ESPEasy/net/Helpers/_NWPlugin_init.h" # include "../../ESPEasy/net/_NWPlugin_Helper.h" +#ifdef ESP8266 +#define MAX_NR_NETWORKS_IN_TABLE 2 +#endif +#ifdef ESP32 +#define MAX_NR_NETWORKS_IN_TABLE NETWORK_MAX +#endif + using namespace ESPEasy::net; @@ -185,32 +192,14 @@ void handle_networks_ShowAllNetworksTable() html_table_header(F("IP")); html_table_header(F("Port")); - for (ESPEasy::net::networkIndex_t x = 0; x < NETWORK_MAX; x++) + for (ESPEasy::net::networkIndex_t x = 0; x < MAX_NR_NETWORKS_IN_TABLE; x++) { const nwpluginID_t nwpluginID = Settings.getNWPluginID_for_network(x); const bool nwplugin_set = nwpluginID.isValid(); html_TR_TD(); - if (nwplugin_set && !supportedNWPluginID(nwpluginID)) { - html_add_button_prefix(F("red"), true); - } else { - html_add_button_prefix(); - } - { - addHtml(F("network?index=")); - addHtmlInt(x + 1); - addHtml(F("'>")); - - if (nwplugin_set) { - addHtml(F("Edit")); - } else { - addHtml(F("Add")); - } - addHtml(F("")); - addHtmlInt(x + 1); - html_TD(); - } + addPlugin_Add_Edit_Button(F("network"), x, nwplugin_set, supportedNWPluginID(nwpluginID)); if (nwplugin_set) { diff --git a/src/src/WebServer/NotificationPage.cpp b/src/src/WebServer/NotificationPage.cpp index 7852bd71a..4b92f20be 100644 --- a/src/src/WebServer/NotificationPage.cpp +++ b/src/src/WebServer/NotificationPage.cpp @@ -152,22 +152,20 @@ void handle_notifications() { { LoadNotificationSettings(x, reinterpret_cast(NotificationSettings.get()), sizeof(NotificationSettingsStruct)); NotificationSettings->validate(); - html_TR_TD(); - html_add_button_prefix(); - addHtml(F("notifications?index=")); - addHtmlInt(x + 1); - addHtml(F("'>Edit")); - html_TD(); - addHtmlInt(x + 1); - html_TD(); + const bool nplugin_set = Settings.Notification[x] != INVALID_N_PLUGIN_ID.value; - if (Settings.Notification[x] != INVALID_N_PLUGIN_ID.value) + uint8_t NotificationProtocolIndex = getNProtocolIndex(npluginID_t::toPluginID(Settings.Notification[x])); + + html_TR_TD(); + + addPlugin_Add_Edit_Button(F("notifications"), x, nplugin_set, validNProtocolIndex(NotificationProtocolIndex)); + + if (nplugin_set) { addEnabled(Settings.NotificationEnabled[x]); html_TD(); - uint8_t NotificationProtocolIndex = getNProtocolIndex(npluginID_t::toPluginID(Settings.Notification[x])); - String NotificationName = F("(plugin not found?)"); + String NotificationName = F("(plugin not found?)"); if (validNProtocolIndex(NotificationProtocolIndex)) { From 4c9c847f8df8e776a1c5196edc2b2487e563022c Mon Sep 17 00:00:00 2001 From: TD-er Date: Thu, 14 Aug 2025 23:31:41 +0200 Subject: [PATCH 200/564] [network] Fix 'Enable' checkbox consistency & bootloop with AP disabled --- .../net/DataStructs/NWPluginData_base.cpp | 77 +++++++++++-------- .../net/DataStructs/NWPluginData_base.h | 2 +- src/ESPEasy/net/Globals/NWPlugins.cpp | 21 ++--- .../NW001_data_struct_WiFi_STA.cpp | 2 +- .../NW001_data_struct_WiFi_STA.h | 2 +- .../NW002_data_struct_WiFi_AP.cpp | 21 +++-- .../NW002_data_struct_WiFi_AP.h | 2 +- .../NW003_data_struct_ETH_RMII.cpp | 2 +- .../NW003_data_struct_ETH_RMII.h | 2 +- .../NW004_data_struct_ETH_SPI.cpp | 2 +- .../NW004_data_struct_ETH_SPI.h | 2 +- .../NW005_data_struct_PPP_modem.cpp | 2 +- .../NW005_data_struct_PPP_modem.h | 2 +- src/ESPEasy/net/_NW001_WiFi_STA.cpp | 1 + src/ESPEasy/net/_NW002_WiFi_AP.cpp | 1 + src/ESPEasy/net/_NW003_ETH_RMII.cpp | 1 + src/ESPEasy/net/_NW004_ETH_SPI.cpp | 1 + src/ESPEasy/net/_NW005_PPP_modem.cpp | 1 + src/ESPEasy/net/_NWPlugin_Helper.cpp | 2 +- .../net/wifi/ESPEasyWiFi_STA_Event_ESP32.cpp | 2 +- .../net/wifi/ESPEasyWiFi_STA_Event_ESP32.h | 2 +- .../wifi/ESPEasyWiFi_STA_Event_ESP8266.cpp | 2 +- .../net/wifi/ESPEasyWiFi_STA_Event_ESP8266.h | 2 +- src/src/DataStructs/SettingsStruct.h | 7 ++ src/src/DataStructs_templ/SettingsStruct.cpp | 16 ++++ src/src/ESPEasyCore/ESPEasy_loop.cpp | 12 +-- src/src/ESPEasyCore/ESPEasy_setup.cpp | 2 +- src/src/Helpers/ESPEasy_checks.cpp | 4 +- src/src/WebServer/ControllerPage.cpp | 8 +- src/src/WebServer/DevicesPage.cpp | 1 + src/src/WebServer/NetworkPage.cpp | 14 ++-- src/src/WebServer/NotificationPage.cpp | 7 +- 32 files changed, 143 insertions(+), 82 deletions(-) diff --git a/src/ESPEasy/net/DataStructs/NWPluginData_base.cpp b/src/ESPEasy/net/DataStructs/NWPluginData_base.cpp index 4a6fd0d25..2d55e2e75 100644 --- a/src/ESPEasy/net/DataStructs/NWPluginData_base.cpp +++ b/src/ESPEasy/net/DataStructs/NWPluginData_base.cpp @@ -34,6 +34,7 @@ static InterfaceTrafficCount_t interfaceTrafficCount; static void tx_rx_event_handler(void *arg, esp_event_base_t event_base, int32_t event_id, void *event_data) { + if (event_data == nullptr) { return; } ip_event_tx_rx_t *event = (ip_event_tx_rx_t *)event_data; const int key = esp_netif_get_netif_impl_index(event->esp_netif); @@ -75,22 +76,24 @@ NWPluginData_base::NWPluginData_base( #endif { #ifdef ESP32 - const int key = _netif->impl_index(); - interfaceTrafficCount[key].clear(); - if (_netif->netif()) { - static bool registered_IP_EVENT_TX_RX = false; - esp_netif_tx_rx_event_enable(_netif->netif()); + if (_netif) { + const int key = _netif->impl_index(); + interfaceTrafficCount[key].clear(); - if (!registered_IP_EVENT_TX_RX) { - esp_event_handler_register(IP_EVENT, IP_EVENT_TX_RX, &tx_rx_event_handler, NULL); - registered_IP_EVENT_TX_RX = true; + if (_netif->netif()) { + static bool registered_IP_EVENT_TX_RX = false; + esp_netif_tx_rx_event_enable(_netif->netif()); + + if (!registered_IP_EVENT_TX_RX) { + esp_event_handler_register(IP_EVENT, IP_EVENT_TX_RX, &tx_rx_event_handler, NULL); + registered_IP_EVENT_TX_RX = true; + } + esp_netif_tx_rx_event_enable(_netif->netif()); } - esp_netif_tx_rx_event_enable(_netif->netif()); + + // _netif->netif()->tx_rx_events_enabled = true; } - - // _netif->netif()->tx_rx_events_enabled = true; - #endif // ifdef ESP32 #if FEATURE_STORE_NETWORK_INTERFACE_SETTINGS @@ -109,13 +112,15 @@ NWPluginData_base::~NWPluginData_base() #ifdef ESP32 - if (_netif->netif()) { - esp_netif_tx_rx_event_disable(_netif->netif()); - } - const int key = _netif->impl_index(); - auto it = interfaceTrafficCount.find(key); + if (_netif) { + if (_netif->netif()) { + esp_netif_tx_rx_event_disable(_netif->netif()); + } + const int key = _netif->impl_index(); + auto it = interfaceTrafficCount.find(key); - if (it != interfaceTrafficCount.end()) { interfaceTrafficCount.erase(it); } + if (it != interfaceTrafficCount.end()) { interfaceTrafficCount.erase(it); } + } #endif // ifdef ESP32 #if FEATURE_STORE_NETWORK_INTERFACE_SETTINGS @@ -258,8 +263,8 @@ bool NWPluginData_base::pushStatsValues(EventStruct *event, } else { event->ParfN[valueCount++] = NAN; event->ParfN[valueCount++] = NAN; - _prevTX = 0; - _prevRX = 0; + _prevTX = 0; + _prevRX = 0; } # endif // ifdef ESP32 @@ -365,7 +370,12 @@ bool NWPluginData_base::init_KVS() #endif // if FEATURE_STORE_NETWORK_INTERFACE_SETTINGS LongTermTimer::Duration NWPluginData_base::getConnectedDuration_ms() { - return getNWPluginData_static_runtime()._connectedStats.getLastOnDuration_ms(); + auto data = getNWPluginData_static_runtime(); + + if (data) { + return data->_connectedStats.getLastOnDuration_ms(); + } + return 0; } #ifdef ESP32 @@ -377,22 +387,24 @@ bool NWPluginData_base::handle_priority_route_changed() if ((_netif != nullptr) && _netif->isDefault()) { if (NWPlugin::forceDHCP_request(_netif)) { return true; } - NWPluginData_static_runtime& cache = getNWPluginData_static_runtime(); + auto cache = getNWPluginData_static_runtime(); + + if (!cache) { res; } // Check to see if we may need to restore any cached DNS server - for (size_t i = 0; i < NR_ELEMENTS(cache._dns_cache); ++i) { + for (size_t i = 0; i < NR_ELEMENTS(cache->_dns_cache); ++i) { auto tmp = _netif->dnsIP(i); - if ((cache._dns_cache[i] != INADDR_NONE) && (cache._dns_cache[i] != tmp)) { + if ((cache->_dns_cache[i] != INADDR_NONE) && (cache->_dns_cache[i] != tmp)) { addLog(LOG_LEVEL_INFO, strformat( F("%s: Restore cached DNS server %d from %s to %s"), _netif->desc(), i, tmp.toString().c_str(), - cache._dns_cache[i].toString().c_str() + cache->_dns_cache[i].toString().c_str() )); - _netif->dnsIP(i, cache._dns_cache[i]); + _netif->dnsIP(i, cache->_dns_cache[i]); res = true; } } @@ -402,6 +414,7 @@ bool NWPluginData_base::handle_priority_route_changed() bool NWPluginData_base::getTrafficCount(uint64_t& tx, uint64_t& rx) const { + if (!_netif) { return false; } const int key = _netif->impl_index(); auto it = interfaceTrafficCount.find(key); @@ -442,22 +455,24 @@ bool NWPluginData_base::_restore_DNS_cache() if ((_netif != nullptr) && _netif->isDefault()) { if (NWPlugin::forceDHCP_request(_netif)) { return true; } - NWPluginData_static_runtime& cache = getNWPluginData_static_runtime(); + auto cache = getNWPluginData_static_runtime(); + + if (!cache) { return res; } // Check to see if we may need to restore any cached DNS server - for (size_t i = 0; i < NR_ELEMENTS(cache._dns_cache); ++i) { + for (size_t i = 0; i < NR_ELEMENTS(cache->_dns_cache); ++i) { auto tmp = _netif->dnsIP(i); - if ((cache._dns_cache[i] != INADDR_NONE) && (cache._dns_cache[i] != tmp)) { + if ((cache->_dns_cache[i] != INADDR_NONE) && (cache->_dns_cache[i] != tmp)) { addLog(LOG_LEVEL_INFO, strformat( F("NW%03%d: Restore cached DNS server %d from %s to %s"), _nw_data_pluginID, i, tmp.toString().c_str(), - cache._dns_cache[i].toString().c_str() + cache->_dns_cache[i].toString().c_str() )); - _netif->dnsIP(i, cache._dns_cache[i]); + _netif->dnsIP(i, cache->_dns_cache[i]); res = true; } } diff --git a/src/ESPEasy/net/DataStructs/NWPluginData_base.h b/src/ESPEasy/net/DataStructs/NWPluginData_base.h index 38c3d16aa..661707f04 100644 --- a/src/ESPEasy/net/DataStructs/NWPluginData_base.h +++ b/src/ESPEasy/net/DataStructs/NWPluginData_base.h @@ -105,7 +105,7 @@ struct NWPluginData_base { uint64_t& rx) const; #endif // ifdef ESP32 - virtual NWPluginData_static_runtime& getNWPluginData_static_runtime() = 0; + virtual NWPluginData_static_runtime* getNWPluginData_static_runtime() = 0; #if FEATURE_PLUGIN_STATS diff --git a/src/ESPEasy/net/Globals/NWPlugins.cpp b/src/ESPEasy/net/Globals/NWPlugins.cpp index c757ea876..933d0fce0 100644 --- a/src/ESPEasy/net/Globals/NWPlugins.cpp +++ b/src/ESPEasy/net/Globals/NWPlugins.cpp @@ -154,14 +154,17 @@ bool NWPluginCall(NWPlugin::Function Function, EventStruct *event, String& str) case NWPlugin::Function::NWPLUGIN_GET_CONNECTED_DURATION: { - NWPluginData_static_runtime& runtime_data = NW_data->getNWPluginData_static_runtime(); - auto duration = runtime_data._connectedStats.getLastOnDuration_ms(); + auto runtime_data = NW_data->getNWPluginData_static_runtime(); - if (duration > 0) { - str = format_msec_duration_HMS(duration); - event->Par64_1 = duration; - event->Par64_2 = runtime_data._connectedStats.getCycleCount(); - success = true; + if (runtime_data) { + auto duration = runtime_data->_connectedStats.getLastOnDuration_ms(); + + if (duration > 0) { + str = format_msec_duration_HMS(duration); + event->Par64_1 = duration; + event->Par64_2 = runtime_data->_connectedStats.getCycleCount(); + success = true; + } } break; } @@ -369,7 +372,7 @@ NWPluginData_static_runtime* getWiFi_STA_NWPluginData_static_runtime() auto NW_data = getNWPluginData(NETWORK_INDEX_WIFI_STA); if (!NW_data) { return nullptr; } - return &NW_data->getNWPluginData_static_runtime(); + return NW_data->getNWPluginData_static_runtime(); } NWPluginData_static_runtime* getNWPluginData_static_runtime(networkIndex_t index) @@ -377,7 +380,7 @@ NWPluginData_static_runtime* getNWPluginData_static_runtime(networkIndex_t index auto NW_data = getNWPluginData(index); if (!NW_data) { return nullptr; } - return &NW_data->getNWPluginData_static_runtime(); + return NW_data->getNWPluginData_static_runtime(); } const NWPluginData_static_runtime* getDefaultRoute_NWPluginData_static_runtime() diff --git a/src/ESPEasy/net/NWPluginStructs/NW001_data_struct_WiFi_STA.cpp b/src/ESPEasy/net/NWPluginStructs/NW001_data_struct_WiFi_STA.cpp index 6dcde4ec0..a667eb07a 100644 --- a/src/ESPEasy/net/NWPluginStructs/NW001_data_struct_WiFi_STA.cpp +++ b/src/ESPEasy/net/NWPluginStructs/NW001_data_struct_WiFi_STA.cpp @@ -106,7 +106,7 @@ bool NW001_data_struct_WiFi_STA::exit(EventStruct *event) { return true; } -NWPluginData_static_runtime& NW001_data_struct_WiFi_STA::getNWPluginData_static_runtime() { +NWPluginData_static_runtime* NW001_data_struct_WiFi_STA::getNWPluginData_static_runtime() { return _WiFiEventHandler.getNWPluginData_static_runtime(); } diff --git a/src/ESPEasy/net/NWPluginStructs/NW001_data_struct_WiFi_STA.h b/src/ESPEasy/net/NWPluginStructs/NW001_data_struct_WiFi_STA.h index 29935727e..8fd210633 100644 --- a/src/ESPEasy/net/NWPluginStructs/NW001_data_struct_WiFi_STA.h +++ b/src/ESPEasy/net/NWPluginStructs/NW001_data_struct_WiFi_STA.h @@ -40,7 +40,7 @@ struct NW001_data_struct_WiFi_STA : public NWPluginData_base { bool webformLoad_show_stats(struct EventStruct *event) const override; # endif // if FEATURE_PLUGIN_STATS - NWPluginData_static_runtime& getNWPluginData_static_runtime(); + NWPluginData_static_runtime* getNWPluginData_static_runtime(); const __FlashStringHelper* getWiFi_encryptionType() const; private: diff --git a/src/ESPEasy/net/NWPluginStructs/NW002_data_struct_WiFi_AP.cpp b/src/ESPEasy/net/NWPluginStructs/NW002_data_struct_WiFi_AP.cpp index 01a904135..0c7a1a145 100644 --- a/src/ESPEasy/net/NWPluginStructs/NW002_data_struct_WiFi_AP.cpp +++ b/src/ESPEasy/net/NWPluginStructs/NW002_data_struct_WiFi_AP.cpp @@ -31,16 +31,18 @@ static NWPluginData_static_runtime stats_and_cache(&NW_PLUGIN_INTERFACE); # else static NWPluginData_static_runtime stats_and_cache(false); # endif // ifdef ESP32 - +static bool nw002_initialized{}; # ifdef ESP32 static bool nw002_enable_NAPT{}; static bool NW002_update_NAPT() { - NW_PLUGIN_INTERFACE.enableNAPT(false); + if (nw002_initialized) { + NW_PLUGIN_INTERFACE.enableNAPT(false); - if (nw002_enable_NAPT && NW_PLUGIN_INTERFACE.stationCount()) { - NW_PLUGIN_INTERFACE.enableNAPT(true); - return true; + if (nw002_enable_NAPT && NW_PLUGIN_INTERFACE.stationCount()) { + NW_PLUGIN_INTERFACE.enableNAPT(true); + return true; + } } return false; @@ -62,10 +64,12 @@ NW002_data_struct_WiFi_AP::NW002_data_struct_WiFi_AP(networkIndex_t networkIndex nw002_enable_NAPT = Settings.WiFi_AP_enable_NAPT(); nw_event_id = Network.onEvent(NW002_data_struct_WiFi_AP::onEvent); # endif // ifdef ESP32 + nw002_initialized = true; } NW002_data_struct_WiFi_AP::~NW002_data_struct_WiFi_AP() { + nw002_initialized = false; # ifdef ESP32 nw002_enable_NAPT = false; @@ -108,7 +112,12 @@ bool NW002_data_struct_WiFi_AP::exit(EventStruct *event) return true; } -NWPluginData_static_runtime& NW002_data_struct_WiFi_AP::getNWPluginData_static_runtime() { return stats_and_cache; } +NWPluginData_static_runtime* NW002_data_struct_WiFi_AP::getNWPluginData_static_runtime() +{ + if (nw002_initialized) + return &stats_and_cache; + return nullptr; +} # ifdef ESP32 diff --git a/src/ESPEasy/net/NWPluginStructs/NW002_data_struct_WiFi_AP.h b/src/ESPEasy/net/NWPluginStructs/NW002_data_struct_WiFi_AP.h index 7e033f0ea..5d194ae91 100644 --- a/src/ESPEasy/net/NWPluginStructs/NW002_data_struct_WiFi_AP.h +++ b/src/ESPEasy/net/NWPluginStructs/NW002_data_struct_WiFi_AP.h @@ -33,7 +33,7 @@ struct NW002_data_struct_WiFi_AP : public NWPluginData_base { bool webformLoad_show_stats(struct EventStruct *event) const override; # endif // if FEATURE_PLUGIN_STATS - NWPluginData_static_runtime& getNWPluginData_static_runtime(); + NWPluginData_static_runtime* getNWPluginData_static_runtime(); private: diff --git a/src/ESPEasy/net/NWPluginStructs/NW003_data_struct_ETH_RMII.cpp b/src/ESPEasy/net/NWPluginStructs/NW003_data_struct_ETH_RMII.cpp index a572a57be..333dbeec1 100644 --- a/src/ESPEasy/net/NWPluginStructs/NW003_data_struct_ETH_RMII.cpp +++ b/src/ESPEasy/net/NWPluginStructs/NW003_data_struct_ETH_RMII.cpp @@ -49,7 +49,7 @@ bool NW003_data_struct_ETH_RMII::exit(EventStruct *event) { return true; } -NWPluginData_static_runtime& NW003_data_struct_ETH_RMII::getNWPluginData_static_runtime() { return stats_and_cache; } +NWPluginData_static_runtime* NW003_data_struct_ETH_RMII::getNWPluginData_static_runtime() { return &stats_and_cache; } void NW003_data_struct_ETH_RMII::onEvent(arduino_event_id_t event, arduino_event_info_t info) diff --git a/src/ESPEasy/net/NWPluginStructs/NW003_data_struct_ETH_RMII.h b/src/ESPEasy/net/NWPluginStructs/NW003_data_struct_ETH_RMII.h index 4b337a672..4bc81846b 100644 --- a/src/ESPEasy/net/NWPluginStructs/NW003_data_struct_ETH_RMII.h +++ b/src/ESPEasy/net/NWPluginStructs/NW003_data_struct_ETH_RMII.h @@ -23,7 +23,7 @@ struct NW003_data_struct_ETH_RMII : public NWPluginData_base { bool exit(EventStruct *event); - NWPluginData_static_runtime& getNWPluginData_static_runtime(); + NWPluginData_static_runtime* getNWPluginData_static_runtime(); private: diff --git a/src/ESPEasy/net/NWPluginStructs/NW004_data_struct_ETH_SPI.cpp b/src/ESPEasy/net/NWPluginStructs/NW004_data_struct_ETH_SPI.cpp index 839742c9e..61c6a63d1 100644 --- a/src/ESPEasy/net/NWPluginStructs/NW004_data_struct_ETH_SPI.cpp +++ b/src/ESPEasy/net/NWPluginStructs/NW004_data_struct_ETH_SPI.cpp @@ -52,7 +52,7 @@ bool NW004_data_struct_ETH_SPI::exit(EventStruct *event) { return true; } -NWPluginData_static_runtime& NW004_data_struct_ETH_SPI::getNWPluginData_static_runtime() { return stats_and_cache; } +NWPluginData_static_runtime* NW004_data_struct_ETH_SPI::getNWPluginData_static_runtime() { return &stats_and_cache; } void NW004_data_struct_ETH_SPI::onEvent(arduino_event_id_t event, arduino_event_info_t info) diff --git a/src/ESPEasy/net/NWPluginStructs/NW004_data_struct_ETH_SPI.h b/src/ESPEasy/net/NWPluginStructs/NW004_data_struct_ETH_SPI.h index 616a6f640..ade588b38 100644 --- a/src/ESPEasy/net/NWPluginStructs/NW004_data_struct_ETH_SPI.h +++ b/src/ESPEasy/net/NWPluginStructs/NW004_data_struct_ETH_SPI.h @@ -23,7 +23,7 @@ struct NW004_data_struct_ETH_SPI : public NWPluginData_base { bool exit(EventStruct *event); - NWPluginData_static_runtime& getNWPluginData_static_runtime(); + NWPluginData_static_runtime* getNWPluginData_static_runtime(); private: diff --git a/src/ESPEasy/net/NWPluginStructs/NW005_data_struct_PPP_modem.cpp b/src/ESPEasy/net/NWPluginStructs/NW005_data_struct_PPP_modem.cpp index 89d895da5..47ec771bd 100644 --- a/src/ESPEasy/net/NWPluginStructs/NW005_data_struct_PPP_modem.cpp +++ b/src/ESPEasy/net/NWPluginStructs/NW005_data_struct_PPP_modem.cpp @@ -953,7 +953,7 @@ bool NW005_data_struct_PPP_modem::record_stats() # endif // if FEATURE_PLUGIN_STATS -NWPluginData_static_runtime& NW005_data_struct_PPP_modem::getNWPluginData_static_runtime() { return stats_and_cache; } +NWPluginData_static_runtime* NW005_data_struct_PPP_modem::getNWPluginData_static_runtime() { return &stats_and_cache; } void NW005_data_struct_PPP_modem::onEvent(arduino_event_id_t event, arduino_event_info_t info) { // TODO TD-er: Must store flags from events in static (or global) object to act on it later. diff --git a/src/ESPEasy/net/NWPluginStructs/NW005_data_struct_PPP_modem.h b/src/ESPEasy/net/NWPluginStructs/NW005_data_struct_PPP_modem.h index ec3e18341..2784b8412 100644 --- a/src/ESPEasy/net/NWPluginStructs/NW005_data_struct_PPP_modem.h +++ b/src/ESPEasy/net/NWPluginStructs/NW005_data_struct_PPP_modem.h @@ -59,7 +59,7 @@ struct NW005_data_struct_PPP_modem : public NWPluginData_base { # endif // if FEATURE_PLUGIN_STATS - NWPluginData_static_runtime& getNWPluginData_static_runtime(); + NWPluginData_static_runtime* getNWPluginData_static_runtime(); private: diff --git a/src/ESPEasy/net/_NW001_WiFi_STA.cpp b/src/ESPEasy/net/_NW001_WiFi_STA.cpp index 668255c33..80f2f94c7 100644 --- a/src/ESPEasy/net/_NW001_WiFi_STA.cpp +++ b/src/ESPEasy/net/_NW001_WiFi_STA.cpp @@ -66,6 +66,7 @@ bool NWPlugin_001(NWPlugin::Function function, EventStruct *event, String& strin Settings.setRoutePrio_for_network(event->NetworkIndex, 100); # endif // ifdef ESP32 Settings.setNetworkInterfaceSubnetBlockClientIP(event->NetworkIndex, false); + Settings.setNetworkInterfaceStartupDelayAtBoot(event->NetworkIndex, 1000); break; } diff --git a/src/ESPEasy/net/_NW002_WiFi_AP.cpp b/src/ESPEasy/net/_NW002_WiFi_AP.cpp index 0a8a05cbf..8f380bc10 100644 --- a/src/ESPEasy/net/_NW002_WiFi_AP.cpp +++ b/src/ESPEasy/net/_NW002_WiFi_AP.cpp @@ -61,6 +61,7 @@ bool NWPlugin_002(NWPlugin::Function function, EventStruct *event, String& strin Settings.setRoutePrio_for_network(event->NetworkIndex, 10); # endif Settings.setNetworkInterfaceSubnetBlockClientIP(event->NetworkIndex, false); + Settings.setNetworkInterfaceStartupDelayAtBoot(event->NetworkIndex, 10000); break; } diff --git a/src/ESPEasy/net/_NW003_ETH_RMII.cpp b/src/ESPEasy/net/_NW003_ETH_RMII.cpp index 65249b863..1f885606a 100644 --- a/src/ESPEasy/net/_NW003_ETH_RMII.cpp +++ b/src/ESPEasy/net/_NW003_ETH_RMII.cpp @@ -52,6 +52,7 @@ bool NWPlugin_003(NWPlugin::Function function, EventStruct *event, String& strin { Settings.setRoutePrio_for_network(event->NetworkIndex, 50); Settings.setNetworkInterfaceSubnetBlockClientIP(event->NetworkIndex, false); + Settings.setNetworkInterfaceStartupDelayAtBoot(event->NetworkIndex, 500 * event->NetworkIndex); # if CONFIG_IDF_TARGET_ESP32P4 Settings.ETH_Clock_Mode = EthClockMode_t::Ext_crystal; Settings.ETH_Phy_Type = EthPhyType_t::TLK110; diff --git a/src/ESPEasy/net/_NW004_ETH_SPI.cpp b/src/ESPEasy/net/_NW004_ETH_SPI.cpp index db451759e..6aad0f553 100644 --- a/src/ESPEasy/net/_NW004_ETH_SPI.cpp +++ b/src/ESPEasy/net/_NW004_ETH_SPI.cpp @@ -54,6 +54,7 @@ bool NWPlugin_004(NWPlugin::Function function, EventStruct *event, String& strin { Settings.setRoutePrio_for_network(event->NetworkIndex, 50); Settings.setNetworkInterfaceSubnetBlockClientIP(event->NetworkIndex, false); + Settings.setNetworkInterfaceStartupDelayAtBoot(event->NetworkIndex, 500 * event->NetworkIndex); /* # if CONFIG_IDF_TARGET_ESP32P4 diff --git a/src/ESPEasy/net/_NW005_PPP_modem.cpp b/src/ESPEasy/net/_NW005_PPP_modem.cpp index f11162575..526bf988b 100644 --- a/src/ESPEasy/net/_NW005_PPP_modem.cpp +++ b/src/ESPEasy/net/_NW005_PPP_modem.cpp @@ -55,6 +55,7 @@ bool NWPlugin_005(NWPlugin::Function function, EventStruct *event, String& strin { Settings.setRoutePrio_for_network(event->NetworkIndex, 20); Settings.setNetworkInterfaceSubnetBlockClientIP(event->NetworkIndex, true); + Settings.setNetworkInterfaceStartupDelayAtBoot(event->NetworkIndex, 500 * event->NetworkIndex); break; } diff --git a/src/ESPEasy/net/_NWPlugin_Helper.cpp b/src/ESPEasy/net/_NWPlugin_Helper.cpp index ed3400a1d..31d0d055a 100644 --- a/src/ESPEasy/net/_NWPlugin_Helper.cpp +++ b/src/ESPEasy/net/_NWPlugin_Helper.cpp @@ -9,7 +9,7 @@ namespace ESPEasy { namespace net { -NWPluginData_base *NWPlugin_task_data[NETWORK_MAX]; +NWPluginData_base *NWPlugin_task_data[NETWORK_MAX]{0}; void resetNWPluginData() { for (ESPEasy::net::networkIndex_t i = 0; i < NR_ELEMENTS(NWPlugin_task_data); ++i) { diff --git a/src/ESPEasy/net/wifi/ESPEasyWiFi_STA_Event_ESP32.cpp b/src/ESPEasy/net/wifi/ESPEasyWiFi_STA_Event_ESP32.cpp index 764b59a03..69552435d 100644 --- a/src/ESPEasy/net/wifi/ESPEasyWiFi_STA_Event_ESP32.cpp +++ b/src/ESPEasy/net/wifi/ESPEasyWiFi_STA_Event_ESP32.cpp @@ -61,7 +61,7 @@ ESPEasyWiFi_STA_EventHandler::~ESPEasyWiFi_STA_EventHandler() bool ESPEasyWiFi_STA_EventHandler::initialized() { return _ESPEasyWiFi_STA_EventHandler_initialized; } -NWPluginData_static_runtime& ESPEasyWiFi_STA_EventHandler::getNWPluginData_static_runtime() { return stats_and_cache; } +NWPluginData_static_runtime* ESPEasyWiFi_STA_EventHandler::getNWPluginData_static_runtime() { return &stats_and_cache; } WiFiDisconnectReason ESPEasyWiFi_STA_EventHandler::getLastDisconnectReason() const { return _wifi_disconnect_reason; } diff --git a/src/ESPEasy/net/wifi/ESPEasyWiFi_STA_Event_ESP32.h b/src/ESPEasy/net/wifi/ESPEasyWiFi_STA_Event_ESP32.h index c816805eb..e79eea1cb 100644 --- a/src/ESPEasy/net/wifi/ESPEasyWiFi_STA_Event_ESP32.h +++ b/src/ESPEasy/net/wifi/ESPEasyWiFi_STA_Event_ESP32.h @@ -37,7 +37,7 @@ public: static bool initialized(); - NWPluginData_static_runtime& getNWPluginData_static_runtime(); + NWPluginData_static_runtime* getNWPluginData_static_runtime(); WiFiDisconnectReason getLastDisconnectReason() const; diff --git a/src/ESPEasy/net/wifi/ESPEasyWiFi_STA_Event_ESP8266.cpp b/src/ESPEasy/net/wifi/ESPEasyWiFi_STA_Event_ESP8266.cpp index 0f280b0a7..0ab349e16 100644 --- a/src/ESPEasy/net/wifi/ESPEasyWiFi_STA_Event_ESP8266.cpp +++ b/src/ESPEasy/net/wifi/ESPEasyWiFi_STA_Event_ESP8266.cpp @@ -58,7 +58,7 @@ bool ESPEasyWiFi_STA_EventHandler::initialized() return _ESPEasyWiFi_STA_EventHandler_initialized; } -NWPluginData_static_runtime& ESPEasyWiFi_STA_EventHandler::getNWPluginData_static_runtime() { return stats_and_cache; } +NWPluginData_static_runtime* ESPEasyWiFi_STA_EventHandler::getNWPluginData_static_runtime() { return &stats_and_cache; } WiFiDisconnectReason ESPEasyWiFi_STA_EventHandler::getLastDisconnectReason() const { return _wifi_disconnect_reason; } diff --git a/src/ESPEasy/net/wifi/ESPEasyWiFi_STA_Event_ESP8266.h b/src/ESPEasy/net/wifi/ESPEasyWiFi_STA_Event_ESP8266.h index f158059b9..1c33ef841 100644 --- a/src/ESPEasy/net/wifi/ESPEasyWiFi_STA_Event_ESP8266.h +++ b/src/ESPEasy/net/wifi/ESPEasyWiFi_STA_Event_ESP8266.h @@ -34,7 +34,7 @@ public: static bool initialized(); - NWPluginData_static_runtime& getNWPluginData_static_runtime(); + NWPluginData_static_runtime* getNWPluginData_static_runtime(); WiFiDisconnectReason getLastDisconnectReason() const; uint8_t getAuthMode() const; diff --git a/src/src/DataStructs/SettingsStruct.h b/src/src/DataStructs/SettingsStruct.h index 2bcc1e5ed..fa46ca9ac 100644 --- a/src/src/DataStructs/SettingsStruct.h +++ b/src/src/DataStructs/SettingsStruct.h @@ -410,6 +410,7 @@ public: } bool getNetworkEnabled(ESPEasy::net::networkIndex_t index) const { + //if (index == 1) return true; if (validNetworkIndex(index)) return bitRead(NetworkEnabled_bits, index); return false; } @@ -441,6 +442,10 @@ public: void setRoutePrio_for_network(ESPEasy::net::networkIndex_t index, uint8_t prio); #endif + uint32_t getNetworkInterfaceStartupDelayAtBoot(ESPEasy::net::networkIndex_t index) const; + + void setNetworkInterfaceStartupDelayAtBoot(ESPEasy::net::networkIndex_t index, uint32_t delay_ms); + unsigned long PID = 0; int Version = 0; int16_t Build = 0; @@ -690,6 +695,8 @@ public: #ifdef ESP32 uint8_t NetworkRoutePrio[NETWORK_MAX] = {0}; #endif + // TODO TD-er: For ESP8266 we may likely ever use upto 2 or 3 network interfaces, so maybe re-use the rest later? + uint16_t NetworkInterfaceStartupDelayAtBoot[NETWORK_MAX]{}; // Try to extend settings to make the checksum 4-uint8_t aligned. diff --git a/src/src/DataStructs_templ/SettingsStruct.cpp b/src/src/DataStructs_templ/SettingsStruct.cpp index 0358c86f2..44a541d68 100644 --- a/src/src/DataStructs_templ/SettingsStruct.cpp +++ b/src/src/DataStructs_templ/SettingsStruct.cpp @@ -1353,6 +1353,22 @@ void SettingsStruct_tmpl::setRoutePrio_for_network(ESPEasy::net::networ } #endif +template +uint32_t SettingsStruct_tmpl::getNetworkInterfaceStartupDelayAtBoot(ESPEasy::net::networkIndex_t index) const +{ + if (validNetworkIndex(index)) { + return static_cast(NetworkInterfaceStartupDelayAtBoot[index]) * 10ul; + } + return 0; +} + +template +void SettingsStruct_tmpl::setNetworkInterfaceStartupDelayAtBoot(ESPEasy::net::networkIndex_t index, uint32_t delay_ms) +{ + if (validNetworkIndex(index)) { + NetworkInterfaceStartupDelayAtBoot[index] = delay_ms/10ul; + } +} #endif // ifndef DATASTRUCTS_SETTINGSSTRUCT_CPP diff --git a/src/src/ESPEasyCore/ESPEasy_loop.cpp b/src/src/ESPEasyCore/ESPEasy_loop.cpp index 71166c1ee..5584b7fbf 100644 --- a/src/src/ESPEasyCore/ESPEasy_loop.cpp +++ b/src/src/ESPEasyCore/ESPEasy_loop.cpp @@ -2,13 +2,14 @@ #include "../../ESPEasy-Globals.h" -#include "../Commands/ExecuteCommand.h" -#include "../DataStructs/TimingStats.h" #include "../../ESPEasy/net/ESPEasyNetwork.h" #include "../../ESPEasy/net/wifi/ESPEasyWifi.h" #include "../../ESPEasy/net/wifi/ESPEasyWifi_ProcessEvent.h" -#include "../ESPEasyCore/ESPEasy_backgroundtasks.h" +#include "../Commands/ExecuteCommand.h" +#include "../Commands/InternalCommands_decoder.h" +#include "../DataStructs/TimingStats.h" #include "../ESPEasyCore/ESPEasy_Log.h" +#include "../ESPEasyCore/ESPEasy_backgroundtasks.h" #include "../Globals/ESPEasy_Scheduler.h" #include "../Globals/EventQueue.h" #include "../Globals/RTC.h" @@ -22,9 +23,7 @@ #include "../Helpers/Networking.h" #include "../Helpers/PeriodicalActions.h" #include "../Helpers/StringConverter.h" - - -#include "../Commands/InternalCommands_decoder.h" +#include "../WebServer/ESPEasy_WebServer.h" void updateLoopStats() { ++loopCounter; @@ -93,6 +92,7 @@ void ESPEasy_loop() event += Settings.deepSleep_wakeTime; eventQueue.addMove(std::move(event)); } + setWebserverRunning(true); #ifndef BUILD_NO_DEBUG checkAll_internalCommands(); diff --git a/src/src/ESPEasyCore/ESPEasy_setup.cpp b/src/src/ESPEasyCore/ESPEasy_setup.cpp index 3568ed157..89d4cb134 100644 --- a/src/src/ESPEasyCore/ESPEasy_setup.cpp +++ b/src/src/ESPEasyCore/ESPEasy_setup.cpp @@ -604,7 +604,7 @@ void ESPEasy_setup() logMemUsageAfter(F("NetworkConnectRelaxed()")); #endif // ifndef BUILD_NO_RAM_TRACKER - setWebserverRunning(true); +// setWebserverRunning(true); #ifndef BUILD_NO_RAM_TRACKER logMemUsageAfter(F("setWebserverRunning()")); #endif // ifndef BUILD_NO_RAM_TRACKER diff --git a/src/src/Helpers/ESPEasy_checks.cpp b/src/src/Helpers/ESPEasy_checks.cpp index 0388d0171..814daafa6 100644 --- a/src/src/Helpers/ESPEasy_checks.cpp +++ b/src/src/Helpers/ESPEasy_checks.cpp @@ -83,10 +83,10 @@ void run_compiletime_checks() { check_size(); check_max_size(); #ifdef ESP32 - constexpr unsigned int SettingsStructSize = (360 + 84 * TASKS_MAX); + constexpr unsigned int SettingsStructSize = (376 + 84 * TASKS_MAX); #endif #ifdef ESP8266 - constexpr unsigned int SettingsStructSize = (328 + 84 * TASKS_MAX); + constexpr unsigned int SettingsStructSize = (344 + 84 * TASKS_MAX); #endif #if FEATURE_CUSTOM_PROVISIONING check_size(); diff --git a/src/src/WebServer/ControllerPage.cpp b/src/src/WebServer/ControllerPage.cpp index 4380f63f5..6a94e0078 100644 --- a/src/src/WebServer/ControllerPage.cpp +++ b/src/src/WebServer/ControllerPage.cpp @@ -321,6 +321,10 @@ void handle_controllers_ControllerSettingsPage(controllerIndex_t controllerindex if (Settings.Protocol[controllerindex]) { + // Separate enabled checkbox as it doesn't need to use the ControllerSettings. + // So ControllerSettings object can be destructed before controller specific settings are loaded. + addControllerEnabledForm(controllerindex); + addFormSeparator(2); { MakeControllerSettings(ControllerSettings); // -V522 @@ -615,10 +619,6 @@ void handle_controllers_ControllerSettingsPage(controllerIndex_t controllerindex } # endif // if FEATURE_MQTT } - - // Separate enabled checkbox as it doesn't need to use the ControllerSettings. - // So ControllerSettings object can be destructed before controller specific settings are loaded. - addControllerEnabledForm(controllerindex); } addFormSeparator(2); diff --git a/src/src/WebServer/DevicesPage.cpp b/src/src/WebServer/DevicesPage.cpp index 4210fca9c..cb75e7112 100644 --- a/src/src/WebServer/DevicesPage.cpp +++ b/src/src/WebServer/DevicesPage.cpp @@ -1080,6 +1080,7 @@ void handle_devices_TaskSettingsPage(taskIndex_t taskIndex, uint8_t page) // Settings.TaskDeviceEnabled[taskIndex].enabled, Settings.isTaskEnableReadonly(taskIndex)); // ="taskdeviceenabled" + addFormSeparator(2); # if FEATURE_PLUGIN_PRIORITY diff --git a/src/src/WebServer/NetworkPage.cpp b/src/src/WebServer/NetworkPage.cpp index cb9933253..0ea3a3dc4 100644 --- a/src/src/WebServer/NetworkPage.cpp +++ b/src/src/WebServer/NetworkPage.cpp @@ -169,6 +169,7 @@ void handle_networks_CopySubmittedSettings_NWPluginCall(ESPEasy::net::networkInd Settings.setRoutePrio_for_network(networkindex, getFormItemInt(F("routeprio"), 0)); Settings.setNetworkInterfaceSubnetBlockClientIP(networkindex, isFormItemChecked(F("block_web_access"))); # endif + Settings.setNetworkInterfaceStartupDelayAtBoot(networkindex, getFormItemInt(F("delay_start"))); String dummy; NWPluginCall(NWPlugin::Function::NWPLUGIN_WEBFORM_SAVE, &TempEvent, dummy); } @@ -343,6 +344,11 @@ void handle_networks_NetworkSettingsPage(ESPEasy::net::networkIndex_t networkind # endif // ifndef LIMIT_BUILD_SIZE if (Settings.getNWPluginID_for_network(networkindex)) { + // Separate enabled checkbox as it doesn't need to use the NetworkSettings. + // So NetworkSettings object can be destructed before network specific settings are loaded. + addNetworkEnabledForm(networkindex); + addFormSeparator(2); + // TODO TD-er: Add driver specifics from NetworkDriverStruct // Load network specific settings @@ -359,11 +365,14 @@ void handle_networks_NetworkSettingsPage(ESPEasy::net::networkIndex_t networkind # endif // ifdef ESP32 addFormCheckBox(F("Block Web Access"), F("block_web_access"), Settings.getNetworkInterfaceSubnetBlockClientIP(networkindex)); addFormNote(F("When checked, any host from a subnet on this network interface will be blocked")); + addFormNumericBox(F("Delay Startup At Boot"), F("delay_start"), Settings.getNetworkInterfaceStartupDelayAtBoot(networkindex), 0, 60000); + addUnit(F("ms")); String str; NWPluginCall(NWPlugin::Function::NWPLUGIN_WEBFORM_LOAD, &TempEvent, str); # if FEATURE_PLUGIN_STATS + if (Settings.getNetworkEnabled(TempEvent.NetworkIndex)) { // Task statistics and historic data in a chart auto *NW_data = ESPEasy::net::getNWPluginData(TempEvent.NetworkIndex); @@ -512,11 +521,6 @@ void handle_networks_NetworkSettingsPage(ESPEasy::net::networkIndex_t networkind } # endif // ifdef ESP32 - addFormSeparator(2); - - // Separate enabled checkbox as it doesn't need to use the NetworkSettings. - // So NetworkSettings object can be destructed before network specific settings are loaded. - addNetworkEnabledForm(networkindex); } addFormSeparator(2); diff --git a/src/src/WebServer/NotificationPage.cpp b/src/src/WebServer/NotificationPage.cpp index 4b92f20be..6014f2ce5 100644 --- a/src/src/WebServer/NotificationPage.cpp +++ b/src/src/WebServer/NotificationPage.cpp @@ -221,6 +221,10 @@ void handle_notifications() { if (Settings.Notification[notificationindex] != INVALID_N_PLUGIN_ID.value) { + addRowLabel(F("Enabled")); + addCheckBox(F("notificationenabled"), Settings.NotificationEnabled[notificationindex]); + addFormSeparator(2); + MakeNotificationSettings(NotificationSettings); if (!AllocatedNotificationSettings()) { @@ -299,9 +303,6 @@ void handle_notifications() { addPinSelect(PinSelectPurpose::Generic, F("pin1"), NotificationSettings->Pin1); } - addRowLabel(F("Enabled")); - addCheckBox(F("notificationenabled"), Settings.NotificationEnabled[notificationindex]); - TempEvent.NotificationIndex = notificationindex; String webformLoadString; NPlugin_ptr[NotificationProtocolIndex](NPlugin::Function::NPLUGIN_WEBFORM_LOAD, &TempEvent, webformLoadString); From 5e45bc7028b0fc693a9b66d72b480deb1ceb4115 Mon Sep 17 00:00:00 2001 From: TD-er Date: Fri, 15 Aug 2025 09:25:01 +0200 Subject: [PATCH 201/564] [Network] Fix crashes when toggling WiFi/AP on/off --- .../net/DataStructs/NWPluginData_base.cpp | 2 +- src/ESPEasy/net/ESPEasyNetwork.cpp | 13 +++++++----- src/ESPEasy/net/Globals/NWPlugins.cpp | 7 +++++-- src/ESPEasy/net/Globals/NWPlugins.h | 2 +- src/ESPEasy/net/_NW001_WiFi_STA.cpp | 10 +++++++++ src/ESPEasy/net/_NW002_WiFi_AP.cpp | 10 +++++++++ src/ESPEasy/net/_NW003_ETH_RMII.cpp | 5 +++++ src/ESPEasy/net/_NW004_ETH_SPI.cpp | 5 +++++ src/ESPEasy/net/_NW005_PPP_modem.cpp | 7 +++++++ src/src/DataTypes/ESPEasy_plugin_functions.h | 1 + src/src/ESPEasyCore/ESPEasy_loop.cpp | 6 +++++- src/src/ESPEasyCore/ESPEasy_setup.cpp | 6 ------ src/src/Helpers/Networking.cpp | 21 ++++++++++++------- src/src/WebServer/ESPEasy_WebServer.cpp | 1 + 14 files changed, 73 insertions(+), 23 deletions(-) diff --git a/src/ESPEasy/net/DataStructs/NWPluginData_base.cpp b/src/ESPEasy/net/DataStructs/NWPluginData_base.cpp index 2d55e2e75..25de4a4ea 100644 --- a/src/ESPEasy/net/DataStructs/NWPluginData_base.cpp +++ b/src/ESPEasy/net/DataStructs/NWPluginData_base.cpp @@ -389,7 +389,7 @@ bool NWPluginData_base::handle_priority_route_changed() auto cache = getNWPluginData_static_runtime(); - if (!cache) { res; } + if (!cache) { return res; } // Check to see if we may need to restore any cached DNS server for (size_t i = 0; i < NR_ELEMENTS(cache->_dns_cache); ++i) { diff --git a/src/ESPEasy/net/ESPEasyNetwork.cpp b/src/ESPEasy/net/ESPEasyNetwork.cpp index 359352ba3..fe1e4cca8 100644 --- a/src/ESPEasy/net/ESPEasyNetwork.cpp +++ b/src/ESPEasy/net/ESPEasyNetwork.cpp @@ -1,13 +1,12 @@ #include "../net/ESPEasyNetwork.h" -#include "../../ESPEasy/net/wifi/ESPEasyWifi.h" - - -#include "../../ESPEasy/net/Globals/NetworkState.h" -#include "../../src/Globals/Settings.h" +#include "../net/wifi/ESPEasyWifi.h" +#include "../net/Globals/NetworkState.h" #include "../../src/Globals/ESPEasy_time.h" +#include "../../src/Globals/Settings.h" +#include "../../src/Helpers/Networking.h" #include "../../src/Helpers/StringConverter.h" #include "../../src/Helpers/MDNS_Helper.h" @@ -86,6 +85,10 @@ void CheckRunningServices() { node_time.lastNTPSyncTime_ms = 0; node_time.initTime(); } +#if FEATURE_ESPEASY_P2P + updateUDPport(true); +#endif + #if FEATURE_WIFI # if FEATURE_SET_WIFI_TX_PWR diff --git a/src/ESPEasy/net/Globals/NWPlugins.cpp b/src/ESPEasy/net/Globals/NWPlugins.cpp index 933d0fce0..fa0ad93d4 100644 --- a/src/ESPEasy/net/Globals/NWPlugins.cpp +++ b/src/ESPEasy/net/Globals/NWPlugins.cpp @@ -55,6 +55,7 @@ bool NWPluginCall(NWPlugin::Function Function, EventStruct *event, String& str) case NWPlugin::Function::NWPLUGIN_TEN_PER_SECOND: case NWPlugin::Function::NWPLUGIN_FIFTY_PER_SECOND: case NWPlugin::Function::NWPLUGIN_WRITE: + case NWPlugin::Function::NWPLUGIN_WEBSERVER_SHOULD_RUN: #ifdef ESP32 case NWPlugin::Function::NWPLUGIN_PRIORITY_ROUTE_CHANGED: #endif @@ -64,7 +65,8 @@ bool NWPluginCall(NWPlugin::Function Function, EventStruct *event, String& str) #ifdef ESP32 Function != NWPlugin::Function::NWPLUGIN_PRIORITY_ROUTE_CHANGED && #endif - Function != NWPlugin::Function::NWPLUGIN_WRITE; + Function != NWPlugin::Function::NWPLUGIN_WRITE && + Function != NWPlugin::Function::NWPLUGIN_WEBSERVER_SHOULD_RUN; if (Function == NWPlugin::Function::NWPLUGIN_INIT_ALL) { Function = NWPlugin::Function::NWPLUGIN_INIT; @@ -92,7 +94,8 @@ bool NWPluginCall(NWPlugin::Function Function, EventStruct *event, String& str) Function, event, command)) { - if (Function == NWPlugin::Function::NWPLUGIN_WRITE) { + if (Function == NWPlugin::Function::NWPLUGIN_WRITE || + Function == NWPlugin::Function::NWPLUGIN_WEBSERVER_SHOULD_RUN) { // Need to stop when call was handled return true; } diff --git a/src/ESPEasy/net/Globals/NWPlugins.h b/src/ESPEasy/net/Globals/NWPlugins.h index becaead78..15a822515 100644 --- a/src/ESPEasy/net/Globals/NWPlugins.h +++ b/src/ESPEasy/net/Globals/NWPlugins.h @@ -15,7 +15,7 @@ namespace net { bool NWPluginCall(NWPlugin::Function Function, - EventStruct *event); + EventStruct *event = nullptr); bool NWPluginCall(NWPlugin::Function Function, EventStruct *event, String & str); diff --git a/src/ESPEasy/net/_NW001_WiFi_STA.cpp b/src/ESPEasy/net/_NW001_WiFi_STA.cpp index 80f2f94c7..d45d4e098 100644 --- a/src/ESPEasy/net/_NW001_WiFi_STA.cpp +++ b/src/ESPEasy/net/_NW001_WiFi_STA.cpp @@ -84,6 +84,16 @@ bool NWPlugin_001(NWPlugin::Function function, EventStruct *event, String& strin } # endif // ifdef ESP32 + case NWPlugin::Function::NWPLUGIN_WEBSERVER_SHOULD_RUN: + { +# ifdef ESP32 + success = WiFi.STA.connected(); +# else // ifdef ESP32 + success = WiFi.isConnected(); +# endif // ifdef ESP32 + break; + } + case NWPlugin::Function::NWPLUGIN_WEBFORM_SHOW_CONNECTED: { # ifdef ESP32 diff --git a/src/ESPEasy/net/_NW002_WiFi_AP.cpp b/src/ESPEasy/net/_NW002_WiFi_AP.cpp index 8f380bc10..812575415 100644 --- a/src/ESPEasy/net/_NW002_WiFi_AP.cpp +++ b/src/ESPEasy/net/_NW002_WiFi_AP.cpp @@ -80,6 +80,16 @@ bool NWPlugin_002(NWPlugin::Function function, EventStruct *event, String& strin } # endif // ifdef ESP32 + case NWPlugin::Function::NWPLUGIN_WEBSERVER_SHOULD_RUN: + { +# ifdef ESP32 + success = WiFi.AP.stationCount() > 0; +# else + success = WiFi.softAPgetStationNum() > 0; +# endif // ifdef ESP32 + + break; + } case NWPlugin::Function::NWPLUGIN_WEBFORM_SHOW_CONNECTED: { diff --git a/src/ESPEasy/net/_NW003_ETH_RMII.cpp b/src/ESPEasy/net/_NW003_ETH_RMII.cpp index 1f885606a..71bb1b1bc 100644 --- a/src/ESPEasy/net/_NW003_ETH_RMII.cpp +++ b/src/ESPEasy/net/_NW003_ETH_RMII.cpp @@ -81,6 +81,11 @@ bool NWPlugin_003(NWPlugin::Function function, EventStruct *event, String& strin } # endif // ifdef ESP32 + case NWPlugin::Function::NWPLUGIN_WEBSERVER_SHOULD_RUN: + { + success = ETH.connected(); + break; + } case NWPlugin::Function::NWPLUGIN_WEBFORM_SHOW_CONNECTED: { diff --git a/src/ESPEasy/net/_NW004_ETH_SPI.cpp b/src/ESPEasy/net/_NW004_ETH_SPI.cpp index 6aad0f553..888b0a3b1 100644 --- a/src/ESPEasy/net/_NW004_ETH_SPI.cpp +++ b/src/ESPEasy/net/_NW004_ETH_SPI.cpp @@ -86,6 +86,11 @@ bool NWPlugin_004(NWPlugin::Function function, EventStruct *event, String& strin } # endif // ifdef ESP32 + case NWPlugin::Function::NWPLUGIN_WEBSERVER_SHOULD_RUN: + { + success = ETH.connected(); + break; + } case NWPlugin::Function::NWPLUGIN_WEBFORM_SHOW_CONNECTED: { diff --git a/src/ESPEasy/net/_NW005_PPP_modem.cpp b/src/ESPEasy/net/_NW005_PPP_modem.cpp index 526bf988b..26ef231c6 100644 --- a/src/ESPEasy/net/_NW005_PPP_modem.cpp +++ b/src/ESPEasy/net/_NW005_PPP_modem.cpp @@ -77,6 +77,13 @@ bool NWPlugin_005(NWPlugin::Function function, EventStruct *event, String& strin break; } + case NWPlugin::Function::NWPLUGIN_WEBSERVER_SHOULD_RUN: + { + // Webserver should not be accessed from PPP modem + success = false; + break; + } + case NWPlugin::Function::NWPLUGIN_WEBFORM_SHOW_CONNECTED: { ESPEasy::net::ppp::NW005_data_struct_PPP_modem *NW_data = diff --git a/src/src/DataTypes/ESPEasy_plugin_functions.h b/src/src/DataTypes/ESPEasy_plugin_functions.h index c11576fb0..91a5700ca 100644 --- a/src/src/DataTypes/ESPEasy_plugin_functions.h +++ b/src/src/DataTypes/ESPEasy_plugin_functions.h @@ -180,6 +180,7 @@ public: #endif // ifdef ESP32 NWPLUGIN_GET_CONNECTED_DURATION, NWPLUGIN_PROCESS_EVENT, // Process received event arduino_event_id_t + NWPLUGIN_WEBSERVER_SHOULD_RUN, // Check whether the addressed interface is active and needs the webserver to be active #if FEATURE_PLUGIN_STATS NWPLUGIN_RECORD_STATS, NWPLUGIN_WEBFORM_LOAD_SHOW_STATS, diff --git a/src/src/ESPEasyCore/ESPEasy_loop.cpp b/src/src/ESPEasyCore/ESPEasy_loop.cpp index 5584b7fbf..fd229354c 100644 --- a/src/src/ESPEasyCore/ESPEasy_loop.cpp +++ b/src/src/ESPEasyCore/ESPEasy_loop.cpp @@ -3,6 +3,7 @@ #include "../../ESPEasy-Globals.h" #include "../../ESPEasy/net/ESPEasyNetwork.h" +#include "../../ESPEasy/net/Globals/NWPlugins.h" #include "../../ESPEasy/net/wifi/ESPEasyWifi.h" #include "../../ESPEasy/net/wifi/ESPEasyWifi_ProcessEvent.h" #include "../Commands/ExecuteCommand.h" @@ -92,7 +93,6 @@ void ESPEasy_loop() event += Settings.deepSleep_wakeTime; eventQueue.addMove(std::move(event)); } - setWebserverRunning(true); #ifndef BUILD_NO_DEBUG checkAll_internalCommands(); @@ -105,6 +105,10 @@ void ESPEasy_loop() sendSysInfoUDP(1); #endif } + + setWebserverRunning(ESPEasy::net::NWPluginCall(NWPlugin::Function::NWPLUGIN_WEBSERVER_SHOULD_RUN)); + + #if FEATURE_CLEAR_I2C_STUCK if (Settings.EnableClearHangingI2Cbus()) { diff --git a/src/src/ESPEasyCore/ESPEasy_setup.cpp b/src/src/ESPEasyCore/ESPEasy_setup.cpp index 89d4cb134..2c233554a 100644 --- a/src/src/ESPEasyCore/ESPEasy_setup.cpp +++ b/src/src/ESPEasyCore/ESPEasy_setup.cpp @@ -604,12 +604,6 @@ void ESPEasy_setup() logMemUsageAfter(F("NetworkConnectRelaxed()")); #endif // ifndef BUILD_NO_RAM_TRACKER -// setWebserverRunning(true); - #ifndef BUILD_NO_RAM_TRACKER - logMemUsageAfter(F("setWebserverRunning()")); - #endif // ifndef BUILD_NO_RAM_TRACKER - - #if FEATURE_REPORTING ReportStatus(); #endif // if FEATURE_REPORTING diff --git a/src/src/Helpers/Networking.cpp b/src/src/Helpers/Networking.cpp index c2567ef16..7a3eb5f06 100644 --- a/src/src/Helpers/Networking.cpp +++ b/src/src/Helpers/Networking.cpp @@ -228,13 +228,20 @@ void updateUDPport(bool force) return; } - if (lastUsedUDPPort != 0) { - portUDP.stop(); - lastUsedUDPPort = 0; - } - - if (!ESPEasy::net::NetworkConnected()) { - return; + // FIXME TD-er: For now, all interfaces that can handle UDP are the same as those that need the webserver to run + // May need a separate NWPlugin function for check if default interface can handle UDP p2p packets + // Or we may need to look into AsyncUDP as that allows to send to specific interfaces. + const bool connected = ESPEasy::net::NWPluginCall(NWPlugin::Function::NWPLUGIN_WEBSERVER_SHOULD_RUN); + //const bool connected = ESPEasy::net::NetworkConnected(); + if (!connected || lastUsedUDPPort != 0) { + if (lastUsedUDPPort != 0) { + portUDP.stop(); + lastUsedUDPPort = 0; + addLogMove(LOG_LEVEL_INFO, concat(F("UDP : Stop listening on port "), Settings.UDPPort)); + } + if (!connected) { + return; + } } if (Settings.UDPPort != 0) { diff --git a/src/src/WebServer/ESPEasy_WebServer.cpp b/src/src/WebServer/ESPEasy_WebServer.cpp index 8f81adbf8..757606d85 100644 --- a/src/src/WebServer/ESPEasy_WebServer.cpp +++ b/src/src/WebServer/ESPEasy_WebServer.cpp @@ -399,6 +399,7 @@ void setWebserverRunning(bool state) { } else { web_server.client().stop(); web_server.stop(); + #ifndef LIMIT_BUILD_SIZE addLog(LOG_LEVEL_INFO, F("Webserver: stop")); #endif From 142fe34714bb42170be03e016c3d9fc5f17e2964 Mon Sep 17 00:00:00 2001 From: TD-er Date: Fri, 15 Aug 2025 10:26:42 +0200 Subject: [PATCH 202/564] [network] Show detailed received IPv6 info in the logs --- .../DataStructs/NWPluginData_static_runtime.h | 2 +- .../NWPluginData_static_runtime_ESP32.cpp | 27 +++++++++++++------ .../NW003_data_struct_ETH_RMII.cpp | 8 +++--- .../NW004_data_struct_ETH_SPI.cpp | 8 +++--- .../NW005_data_struct_PPP_modem.cpp | 6 ++--- .../net/wifi/ESPEasyWiFi_STA_Event_ESP32.cpp | 16 ++++++----- src/src/WebServer/Markup_Buttons.cpp | 2 +- 7 files changed, 41 insertions(+), 28 deletions(-) diff --git a/src/ESPEasy/net/DataStructs/NWPluginData_static_runtime.h b/src/ESPEasy/net/DataStructs/NWPluginData_static_runtime.h index 967e2fdc7..64c962a64 100644 --- a/src/ESPEasy/net/DataStructs/NWPluginData_static_runtime.h +++ b/src/ESPEasy/net/DataStructs/NWPluginData_static_runtime.h @@ -52,7 +52,7 @@ struct NWPluginData_static_runtime { void mark_got_IP(); #if FEATURE_USE_IPV6 - void mark_got_IPv6(); + void mark_got_IPv6(ip_event_got_ip6_t *event); #endif void mark_lost_IP(); diff --git a/src/ESPEasy/net/DataStructs/NWPluginData_static_runtime_ESP32.cpp b/src/ESPEasy/net/DataStructs/NWPluginData_static_runtime_ESP32.cpp index c1dbddc70..1c75b7188 100644 --- a/src/ESPEasy/net/DataStructs/NWPluginData_static_runtime_ESP32.cpp +++ b/src/ESPEasy/net/DataStructs/NWPluginData_static_runtime_ESP32.cpp @@ -108,7 +108,7 @@ void NWPluginData_static_runtime::mark_got_IP() # if FEATURE_USE_IPV6 -void NWPluginData_static_runtime::mark_got_IPv6() +void NWPluginData_static_runtime::mark_got_IPv6(ip_event_got_ip6_t *event) { _gotIP6Stats.setOn(); @@ -119,11 +119,23 @@ void NWPluginData_static_runtime::mark_got_IPv6() } if (loglevelActiveFor(LOG_LEVEL_INFO)) { - addLog(LOG_LEVEL_INFO, strformat( - F("%s: Got IPv6"), - _netif->desc())); + if (event) { + esp_ip6_addr_type_t addr_type = esp_netif_ip6_get_addr_type(&event->ip6_info.ip); + static const char *addr_types[] = { "UNKNOWN", "GLOBAL", "LINK_LOCAL", "SITE_LOCAL", "UNIQUE_LOCAL", "IPV4_MAPPED_IPV6" }; + addLog(LOG_LEVEL_INFO, strformat( + F("%s: Got IPv6: IP Index: %d, Type: %s, Zone: %d, Address: " IPV6STR), + _netif->desc(), + event->ip_index, + addr_types[addr_type], + event->ip6_info.ip.zone, + IPV62STR(event->ip6_info.ip) + )); + } else { + addLog(LOG_LEVEL_INFO, strformat( + F("%s: Got IPv6"), + _netif->desc())); + } } - } # endif // if FEATURE_USE_IPV6 @@ -145,9 +157,8 @@ void NWPluginData_static_runtime::mark_lost_IP() void NWPluginData_static_runtime::mark_begin_establish_connection() { _establishConnectStats.forceSet(true); - -} +} void NWPluginData_static_runtime::mark_connected() { @@ -162,7 +173,7 @@ void NWPluginData_static_runtime::mark_connected() _netif->desc(), format_msec_duration_HMS( _establishConnectStats.getLastOnDuration_ms()).c_str(), - _establishConnectStats.getCycleCount())); + _establishConnectStats.getCycleCount())); } else { addLog(LOG_LEVEL_INFO, strformat( F("%s: Connected"), diff --git a/src/ESPEasy/net/NWPluginStructs/NW003_data_struct_ETH_RMII.cpp b/src/ESPEasy/net/NWPluginStructs/NW003_data_struct_ETH_RMII.cpp index 333dbeec1..1565a1581 100644 --- a/src/ESPEasy/net/NWPluginStructs/NW003_data_struct_ETH_RMII.cpp +++ b/src/ESPEasy/net/NWPluginStructs/NW003_data_struct_ETH_RMII.cpp @@ -49,10 +49,10 @@ bool NW003_data_struct_ETH_RMII::exit(EventStruct *event) { return true; } -NWPluginData_static_runtime* NW003_data_struct_ETH_RMII::getNWPluginData_static_runtime() { return &stats_and_cache; } +NWPluginData_static_runtime * NW003_data_struct_ETH_RMII::getNWPluginData_static_runtime() { return &stats_and_cache; } -void NW003_data_struct_ETH_RMII::onEvent(arduino_event_id_t event, - arduino_event_info_t info) +void NW003_data_struct_ETH_RMII::onEvent(arduino_event_id_t event, + arduino_event_info_t info) { switch (event) { @@ -73,7 +73,7 @@ void NW003_data_struct_ETH_RMII::onEvent(arduino_event_i break; # if FEATURE_USE_IPV6 case ARDUINO_EVENT_ETH_GOT_IP6: - stats_and_cache.mark_got_IPv6(); + stats_and_cache.mark_got_IPv6(&info.got_ip6); break; # endif // if FEATURE_USE_IPV6 case ARDUINO_EVENT_ETH_LOST_IP: diff --git a/src/ESPEasy/net/NWPluginStructs/NW004_data_struct_ETH_SPI.cpp b/src/ESPEasy/net/NWPluginStructs/NW004_data_struct_ETH_SPI.cpp index 61c6a63d1..1804761db 100644 --- a/src/ESPEasy/net/NWPluginStructs/NW004_data_struct_ETH_SPI.cpp +++ b/src/ESPEasy/net/NWPluginStructs/NW004_data_struct_ETH_SPI.cpp @@ -52,10 +52,10 @@ bool NW004_data_struct_ETH_SPI::exit(EventStruct *event) { return true; } -NWPluginData_static_runtime* NW004_data_struct_ETH_SPI::getNWPluginData_static_runtime() { return &stats_and_cache; } +NWPluginData_static_runtime * NW004_data_struct_ETH_SPI::getNWPluginData_static_runtime() { return &stats_and_cache; } -void NW004_data_struct_ETH_SPI::onEvent(arduino_event_id_t event, - arduino_event_info_t info) +void NW004_data_struct_ETH_SPI::onEvent(arduino_event_id_t event, + arduino_event_info_t info) { switch (event) { @@ -76,7 +76,7 @@ void NW004_data_struct_ETH_SPI::onEvent(arduino_event_id break; # if FEATURE_USE_IPV6 case ARDUINO_EVENT_ETH_GOT_IP6: - stats_and_cache.mark_got_IPv6(); + stats_and_cache.mark_got_IPv6(&info.got_ip6); break; # endif // if FEATURE_USE_IPV6 case ARDUINO_EVENT_ETH_LOST_IP: diff --git a/src/ESPEasy/net/NWPluginStructs/NW005_data_struct_PPP_modem.cpp b/src/ESPEasy/net/NWPluginStructs/NW005_data_struct_PPP_modem.cpp index 47ec771bd..4187e3b8c 100644 --- a/src/ESPEasy/net/NWPluginStructs/NW005_data_struct_PPP_modem.cpp +++ b/src/ESPEasy/net/NWPluginStructs/NW005_data_struct_PPP_modem.cpp @@ -953,9 +953,9 @@ bool NW005_data_struct_PPP_modem::record_stats() # endif // if FEATURE_PLUGIN_STATS -NWPluginData_static_runtime* NW005_data_struct_PPP_modem::getNWPluginData_static_runtime() { return &stats_and_cache; } +NWPluginData_static_runtime * NW005_data_struct_PPP_modem::getNWPluginData_static_runtime() { return &stats_and_cache; } -void NW005_data_struct_PPP_modem::onEvent(arduino_event_id_t event, arduino_event_info_t info) { +void NW005_data_struct_PPP_modem::onEvent(arduino_event_id_t event, arduino_event_info_t info) { // TODO TD-er: Must store flags from events in static (or global) object to act on it later. switch (event) { @@ -983,7 +983,7 @@ void NW005_data_struct_PPP_modem::onEvent(arduino_event_ break; # if FEATURE_USE_IPV6 case ARDUINO_EVENT_PPP_GOT_IP6: - stats_and_cache.mark_got_IPv6(); + stats_and_cache.mark_got_IPv6(&info.got_ip6); break; # endif // if FEATURE_USE_IPV6 case ARDUINO_EVENT_PPP_LOST_IP: diff --git a/src/ESPEasy/net/wifi/ESPEasyWiFi_STA_Event_ESP32.cpp b/src/ESPEasy/net/wifi/ESPEasyWiFi_STA_Event_ESP32.cpp index 69552435d..0955f6e14 100644 --- a/src/ESPEasy/net/wifi/ESPEasyWiFi_STA_Event_ESP32.cpp +++ b/src/ESPEasy/net/wifi/ESPEasyWiFi_STA_Event_ESP32.cpp @@ -59,15 +59,17 @@ ESPEasyWiFi_STA_EventHandler::~ESPEasyWiFi_STA_EventHandler() stats_and_cache.clear(); } -bool ESPEasyWiFi_STA_EventHandler::initialized() { return _ESPEasyWiFi_STA_EventHandler_initialized; } +bool ESPEasyWiFi_STA_EventHandler::initialized() { + return _ESPEasyWiFi_STA_EventHandler_initialized; +} -NWPluginData_static_runtime* ESPEasyWiFi_STA_EventHandler::getNWPluginData_static_runtime() { return &stats_and_cache; } +NWPluginData_static_runtime * ESPEasyWiFi_STA_EventHandler::getNWPluginData_static_runtime() { return &stats_and_cache; } -WiFiDisconnectReason ESPEasyWiFi_STA_EventHandler::getLastDisconnectReason() const { return _wifi_disconnect_reason; } +WiFiDisconnectReason ESPEasyWiFi_STA_EventHandler::getLastDisconnectReason() const { return _wifi_disconnect_reason; } -uint8_t ESPEasyWiFi_STA_EventHandler::getAuthMode() const { return _wifi_event_sta_connected.authmode; } +uint8_t ESPEasyWiFi_STA_EventHandler::getAuthMode() const { return _wifi_event_sta_connected.authmode; } -bool ESPEasyWiFi_STA_EventHandler::restore_dns_from_cache() const +bool ESPEasyWiFi_STA_EventHandler::restore_dns_from_cache() const { bool res{}; @@ -91,7 +93,7 @@ bool ESPEasyWiFi_STA_EventHandler::restore_dns_from_cach return res; } -const __FlashStringHelper * ESPEasyWiFi_STA_EventHandler::getWiFi_encryptionType() const +const __FlashStringHelper * ESPEasyWiFi_STA_EventHandler::getWiFi_encryptionType() const { return WiFi_encryptionType(_wifi_event_sta_connected.authmode); } @@ -146,7 +148,7 @@ void ESPEasyWiFi_STA_EventHandler::WiFiEvent(WiFiEvent_t event_id, arduino_event break; # if FEATURE_USE_IPV6 case ARDUINO_EVENT_WIFI_STA_GOT_IP6: - stats_and_cache.mark_got_IPv6(); + stats_and_cache.mark_got_IPv6(&info.got_ip6); break; # endif // if FEATURE_USE_IPV6 case ARDUINO_EVENT_WIFI_STA_LOST_IP: diff --git a/src/src/WebServer/Markup_Buttons.cpp b/src/src/WebServer/Markup_Buttons.cpp index 6ae11988c..f06a41ad6 100644 --- a/src/src/WebServer/Markup_Buttons.cpp +++ b/src/src/WebServer/Markup_Buttons.cpp @@ -198,7 +198,7 @@ void addPlugin_Add_Edit_Button(const __FlashStringHelper * urlPrefix, size_t ind addHtml(urlPrefix); addHtml(F("?index=")); addHtmlInt(index + 1); - addHtml(F("'>")); + addHtml('\'', '>'); if (plugin_set) { addHtml(F("Edit")); From 0c1cb690c452b4866b5677cea1ae09407656d89b Mon Sep 17 00:00:00 2001 From: Ton Huisman Date: Sun, 17 Aug 2025 13:28:13 +0200 Subject: [PATCH 203/564] [P021] Emphasize warning to prevent saving settings too often --- docs/source/Plugin/P021.rst | 2 ++ 1 file changed, 2 insertions(+) diff --git a/docs/source/Plugin/P021.rst b/docs/source/Plugin/P021.rst index 3578f33af..ab8884f95 100644 --- a/docs/source/Plugin/P021.rst +++ b/docs/source/Plugin/P021.rst @@ -136,6 +136,8 @@ Sensor * **Auto-save interval** Here a time in minutes can be set after which any changed 'Set Level' via the ``config,task,,SetLevel,`` command will be saved. This *requires* that the above setting **Save 'Set Level' after change via config command** is **disabled**! When used, a setting of ca. 30 minutes, or even longer when the Set Level is changed often, seems apropriate, unless the unit often reboots, but then that cause should be investigated and solved. The timer, when activated, should survive a warm reboot. +.. warning:: Saving settings too often will cause damage to the Flash memory of the unit! + * **Extended functionality**:sup:`1)` Enable new functionality. Changing this will reload the form showing/hiding the new options below. * **Long time span**:sup:`1)` Timer values are per default entered in [seconds], enabling this option timing settings are tuned to long intervals using [hours] or [seconds]. Changing this will reload the form showing rescaled values and new units. From 2d3996923eca1c0f1061facfa76a3fea46e8de61 Mon Sep 17 00:00:00 2001 From: Ton Huisman Date: Sun, 17 Aug 2025 22:49:13 +0200 Subject: [PATCH 204/564] [P039] Update SPI and GPIO documentation --- docs/source/Plugin/P039.rst | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/docs/source/Plugin/P039.rst b/docs/source/Plugin/P039.rst index dbb625303..3fbcd1bac 100644 --- a/docs/source/Plugin/P039.rst +++ b/docs/source/Plugin/P039.rst @@ -54,7 +54,7 @@ Description This Plugin reads the data from Thermocouples and Resistor Temperature Detector sensors. You have to use an Adapter Board with a respective adapter/converter in order to read the values. Take a look at the usual sources to find such boards. -You can only use ESP8266 boards which expose the SPI Interface. This Plugin uses only the Hardware SPI Interface - no software SPI at the moment. +You can use any board which expose the SPI Interface. This Plugin uses only the selected SPI Interface. Nevertheless you need at least 3 Pins to use SPI. So using an very simple ESP-01 is unfortunately no option. **Basic Information on Thermocouples** @@ -68,7 +68,7 @@ Wiring Basic Information on SPI Bus you can find in `Wikipedia: SPI Bus `_ -You need an ESP8266 device with accessible SPI Pins. These Pins are: +You need an **ESP8266** device with accessible SPI Pins. These Pins are: ==== ============= ====== ======== ========================================================================= Name Description PIO NodeMCU Notes @@ -81,6 +81,8 @@ CS Chip Select GPIO15 D8 Hardware SPI (CS is configurable through .. note:: Write Access to device registers is required for MAX 31856 and MAX 31865 devices so far. +For **ESP32** you can use any VSPI, HSPI or User Defined configuration, as the GPIO multiplexer in ESP32 chips can handle any GPIO pin with Input and Output capability for SPI. + Supported Hardware ------------------ From 3ea27511797a24148985083d9a03dd63cc543f34 Mon Sep 17 00:00:00 2001 From: Gijs Noorlander Date: Tue, 19 Aug 2025 21:13:53 +0600 Subject: [PATCH 205/564] [MFRC522] Speedup reading tag --- src/src/PluginStructs/P111_data_struct.cpp | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/src/src/PluginStructs/P111_data_struct.cpp b/src/src/PluginStructs/P111_data_struct.cpp index 2f5fcebc6..49f735c67 100644 --- a/src/src/PluginStructs/P111_data_struct.cpp +++ b/src/src/PluginStructs/P111_data_struct.cpp @@ -2,6 +2,7 @@ #ifdef USES_P111 +# include "../ESPEasyCore/ESPEasyRules.h" # include "../PluginStructs/P111_data_struct.h" # include "../Helpers/PrintToString.h" @@ -276,7 +277,7 @@ bool P111_data_struct::loop(struct EventStruct *event) { const bool ComIrqReg_bits = (mfrc522->PCD_ReadRegister(MFRC522::ComIrqReg) & (1<<5)) != 0; mfrc522->PCD_WriteRegister(MFRC522::ComIrqReg, 0x34); - if (counter >= 10 || ComIrqReg_bits) { // Only every 3rd 0.1 second we do a read + if (counter >= 5 || ComIrqReg_bits) { // Only every 3rd 0.1 second we do a read counter = 0; uint32_t key = P111_NO_KEY; @@ -297,6 +298,11 @@ bool P111_data_struct::loop(struct EventStruct *event) { if ((old_key != key) && (key != P111_NO_KEY)) { UserVar.setSensorTypeLong(event->TaskIndex, key); new_key = true; + if (Settings.UseRules) + { + String event = strformat(F("MFRC522#tag=%u,%u"), key, old_key); + rulesProcessing(event); // TD-er: Process event of read key now. + } } if (loglevelActiveFor(LOG_LEVEL_INFO) && (key != P111_NO_KEY)) { From 0f38b9e34a5b1a30c9803f9cd8b720d93245d9af Mon Sep 17 00:00:00 2001 From: Gijs Noorlander Date: Tue, 19 Aug 2025 21:46:12 +0600 Subject: [PATCH 206/564] [network] Fix wifi#connected and wifi#disconnected events --- .../net/wifi/ESPEasyWiFi_state_machine.cpp | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/src/ESPEasy/net/wifi/ESPEasyWiFi_state_machine.cpp b/src/ESPEasy/net/wifi/ESPEasyWiFi_state_machine.cpp index 6893bb422..8beefae3a 100644 --- a/src/ESPEasy/net/wifi/ESPEasyWiFi_state_machine.cpp +++ b/src/ESPEasy/net/wifi/ESPEasyWiFi_state_machine.cpp @@ -3,11 +3,14 @@ #if FEATURE_WIFI # include "../../../src/ESPEasyCore/ESPEasy_Log.h" +# include "../../../src/Globals/EventQueue.h" # include "../../../src/Globals/RTC.h" # include "../../../src/Globals/Settings.h" +# include "../../../src/Helpers/NetworkStatusLED.h" # include "../../../src/Helpers/StringConverter.h" # include "../../../src/Helpers/StringGenerator_WiFi.h" + # include "../ESPEasyNetwork.h" // for setNetworkMedium, however this should not be part of the WiFi code # include "../Globals/ESPEasyWiFiEvent.h" # include "../Globals/WiFi_AP_Candidates.h" @@ -247,6 +250,12 @@ void ESPEasyWiFi_t::loop() // Check if still connected if (getSTA_connected_state() != STA_connected_state::Connected) { setState(WiFiState_e::WiFiOFF); + if (Settings.UseRules) + { + eventQueue.add(F("WiFi#Disonnected")); + } + statusLED(false); + } else { // Else mark last timestamp seen as connected _last_seen_connected.setNow(); @@ -346,6 +355,12 @@ void ESPEasyWiFi_t::setState(WiFiState_e newState, uint32_t timeout) { # endif // ifdef ESP32 _last_seen_connected.setNow(); _state_timeout.clear(); + if (Settings.UseRules) + { + eventQueue.add(F("WiFi#Connected")); + } + statusLED(true); + break; } } From a7ddb44a368d919dafacc62ed409e249c4690f07 Mon Sep 17 00:00:00 2001 From: Gijs Noorlander Date: Tue, 19 Aug 2025 22:11:02 +0600 Subject: [PATCH 207/564] [network] Fix typo in event --- .../net/wifi/ESPEasyWiFi_state_machine.cpp | 20 +++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/src/ESPEasy/net/wifi/ESPEasyWiFi_state_machine.cpp b/src/ESPEasy/net/wifi/ESPEasyWiFi_state_machine.cpp index 8beefae3a..2ad152089 100644 --- a/src/ESPEasy/net/wifi/ESPEasyWiFi_state_machine.cpp +++ b/src/ESPEasy/net/wifi/ESPEasyWiFi_state_machine.cpp @@ -250,11 +250,11 @@ void ESPEasyWiFi_t::loop() // Check if still connected if (getSTA_connected_state() != STA_connected_state::Connected) { setState(WiFiState_e::WiFiOFF); - if (Settings.UseRules) - { - eventQueue.add(F("WiFi#Disonnected")); - } - statusLED(false); + if (Settings.UseRules) + { + eventQueue.add(F("WiFi#Disconnected")); + } + statusLED(false); } else { // Else mark last timestamp seen as connected @@ -355,11 +355,11 @@ void ESPEasyWiFi_t::setState(WiFiState_e newState, uint32_t timeout) { # endif // ifdef ESP32 _last_seen_connected.setNow(); _state_timeout.clear(); - if (Settings.UseRules) - { - eventQueue.add(F("WiFi#Connected")); - } - statusLED(true); + if (Settings.UseRules) + { + eventQueue.add(F("WiFi#Connected")); + } + statusLED(true); break; } From 9f949f6e29df57abf29398a4aa97d352f0e17d48 Mon Sep 17 00:00:00 2001 From: Gijs Noorlander Date: Thu, 21 Aug 2025 16:39:33 +0600 Subject: [PATCH 208/564] [Network] Add AT command write to PPP modem --- .../net/DataStructs/NWPluginData_base.cpp | 5 ++++ .../net/DataStructs/NWPluginData_base.h | 1 + .../NWPluginData_static_runtime_ESP32.cpp | 25 +++++++++++------ .../NW005_data_struct_PPP_modem.cpp | 27 ++++++++++++++++++- .../NW005_data_struct_PPP_modem.h | 2 ++ src/ESPEasy/net/_NW005_PPP_modem.cpp | 10 +++++++ src/src/Commands/ExecuteCommand.cpp | 10 +++++++ 7 files changed, 71 insertions(+), 9 deletions(-) diff --git a/src/ESPEasy/net/DataStructs/NWPluginData_base.cpp b/src/ESPEasy/net/DataStructs/NWPluginData_base.cpp index 25de4a4ea..ed2fa15ac 100644 --- a/src/ESPEasy/net/DataStructs/NWPluginData_base.cpp +++ b/src/ESPEasy/net/DataStructs/NWPluginData_base.cpp @@ -378,6 +378,11 @@ LongTermTimer::Duration NWPluginData_base::getConnectedDuration_ms() { return 0; } +bool NWPluginData_base::handle_nwplugin_write(EventStruct *event, String& str) +{ + return false; +} + #ifdef ESP32 bool NWPluginData_base::handle_priority_route_changed() diff --git a/src/ESPEasy/net/DataStructs/NWPluginData_base.h b/src/ESPEasy/net/DataStructs/NWPluginData_base.h index 661707f04..3f08b9805 100644 --- a/src/ESPEasy/net/DataStructs/NWPluginData_base.h +++ b/src/ESPEasy/net/DataStructs/NWPluginData_base.h @@ -98,6 +98,7 @@ struct NWPluginData_base { nwpluginID_t getNWPluginID() const { return _nw_data_pluginID; } virtual LongTermTimer::Duration getConnectedDuration_ms(); + virtual bool handle_nwplugin_write(EventStruct *event, String& str); #ifdef ESP32 virtual bool handle_priority_route_changed(); diff --git a/src/ESPEasy/net/DataStructs/NWPluginData_static_runtime_ESP32.cpp b/src/ESPEasy/net/DataStructs/NWPluginData_static_runtime_ESP32.cpp index 1c75b7188..6519a1e2f 100644 --- a/src/ESPEasy/net/DataStructs/NWPluginData_static_runtime_ESP32.cpp +++ b/src/ESPEasy/net/DataStructs/NWPluginData_static_runtime_ESP32.cpp @@ -9,6 +9,7 @@ # include # include +#define NW_PLUGIN_LOG_EVENTS false namespace ESPEasy { namespace net { @@ -52,23 +53,25 @@ void NWPluginData_static_runtime::mark_start() _netif->setRoutePrio(_route_prio); } # endif // if ESP_IDF_VERSION >= ESP_IDF_VERSION_VAL(5, 5, 0) - +#if NW_PLUGIN_LOG_EVENTS if (loglevelActiveFor(LOG_LEVEL_INFO)) { addLog(LOG_LEVEL_INFO, strformat( F("%s: Started"), _netif->desc())); } +#endif } void NWPluginData_static_runtime::mark_stop() { _startStopStats.setOff(); - +#if NW_PLUGIN_LOG_EVENTS if (_netif && loglevelActiveFor(LOG_LEVEL_INFO)) { addLog(LOG_LEVEL_INFO, strformat( F("%s: Stopped"), _netif->desc())); } +#endif } void NWPluginData_static_runtime::mark_got_IP() @@ -86,7 +89,7 @@ void NWPluginData_static_runtime::mark_got_IP() auto tmp = _netif->dnsIP(i); _dns_cache[i] = tmp; // Also set the 'empty' ones so we won't set left-over DNS server from when another interface was active. - +#if NW_PLUGIN_LOG_EVENTS if ((tmp != INADDR_NONE) && loglevelActiveFor(LOG_LEVEL_INFO)) { addLog(LOG_LEVEL_INFO, strformat( F("%s: DNS Cache %d set to %s"), @@ -94,8 +97,9 @@ void NWPluginData_static_runtime::mark_got_IP() i, tmp.toString(true).c_str())); } +#endif } - +#if NW_PLUGIN_LOG_EVENTS if (loglevelActiveFor(LOG_LEVEL_INFO)) { addLog(LOG_LEVEL_INFO, strformat( F("%s: Got IP: %s"), @@ -103,6 +107,7 @@ void NWPluginData_static_runtime::mark_got_IP() _netif->localIP().toString().c_str() )); } +#endif } @@ -117,7 +122,7 @@ void NWPluginData_static_runtime::mark_got_IPv6(ip_event_got_ip6_t *event) if (!_netif->isDefault()) { nonDefaultNetworkInterface_gotIP = true; } - +#if NW_PLUGIN_LOG_EVENTS if (loglevelActiveFor(LOG_LEVEL_INFO)) { if (event) { esp_ip6_addr_type_t addr_type = esp_netif_ip6_get_addr_type(&event->ip6_info.ip); @@ -136,6 +141,7 @@ void NWPluginData_static_runtime::mark_got_IPv6(ip_event_got_ip6_t *event) _netif->desc())); } } +#endif } # endif // if FEATURE_USE_IPV6 @@ -146,12 +152,13 @@ void NWPluginData_static_runtime::mark_lost_IP() # if FEATURE_USE_IPV6 _gotIP6Stats.setOff(); # endif - +#if NW_PLUGIN_LOG_EVENTS if (_netif && loglevelActiveFor(LOG_LEVEL_INFO)) { addLog(LOG_LEVEL_INFO, strformat( F("%s: Lost IP"), _netif->desc())); } +#endif } void NWPluginData_static_runtime::mark_begin_establish_connection() @@ -166,7 +173,7 @@ void NWPluginData_static_runtime::mark_connected() _establishConnectStats.setOff(); _connectedStats.setOn(); - +#if NW_PLUGIN_LOG_EVENTS if (logDuration) { addLog(LOG_LEVEL_INFO, strformat( F("%s: Connected, took: %s in %d attempts"), @@ -179,6 +186,7 @@ void NWPluginData_static_runtime::mark_connected() F("%s: Connected"), _netif->desc())); } +#endif _establishConnectStats.resetCount(); } @@ -187,7 +195,7 @@ void NWPluginData_static_runtime::mark_disconnected() _connectedStats.setOff(); // TODO TD-er: Also clear _gotIPStats and _gotIP6Stats ? - +#if NW_PLUGIN_LOG_EVENTS if (_netif && loglevelActiveFor(LOG_LEVEL_INFO)) { addLog(LOG_LEVEL_INFO, strformat( F("%s: Disconnected. Connected for: %s"), @@ -195,6 +203,7 @@ void NWPluginData_static_runtime::mark_disconnected() format_msec_duration_HMS( _connectedStats.getLastOnDuration_ms()).c_str())); } +#endif } } // namespace net diff --git a/src/ESPEasy/net/NWPluginStructs/NW005_data_struct_PPP_modem.cpp b/src/ESPEasy/net/NWPluginStructs/NW005_data_struct_PPP_modem.cpp index 4187e3b8c..4451f9fd4 100644 --- a/src/ESPEasy/net/NWPluginStructs/NW005_data_struct_PPP_modem.cpp +++ b/src/ESPEasy/net/NWPluginStructs/NW005_data_struct_PPP_modem.cpp @@ -2,6 +2,8 @@ #ifdef USES_NW005 +# include "../../../src/ESPEasyCore/Controller.h" // For SendStatus (should we move that function?) + # include "../../../src/Globals/Settings.h" # include "../../../src/Helpers/ESPEasy_time_calc.h" @@ -898,12 +900,35 @@ String NW005_data_struct_PPP_modem::write_AT_cmd(const String& cmd, int timeout) if (NW_PLUGIN_INTERFACE.mode() != ESP_MODEM_MODE_CMUX) { NW_PLUGIN_INTERFACE.mode(ESP_MODEM_MODE_CMUX); - res = NW_PLUGIN_INTERFACE.cmd(cmd.c_str(), timeout); } + res = NW_PLUGIN_INTERFACE.cmd(cmd.c_str(), timeout); NW_PLUGIN_INTERFACE.mode(cur_mode); return res; } +bool NW005_data_struct_PPP_modem::handle_nwplugin_write(EventStruct *event, String& str) +{ + bool success = false; + const String command = parseString(str, 1); + + if (equals(command, F("ppp"))) { + const String subcommand = parseString(str, 2); + + if (equals(subcommand, F("write"))) { + const String writeCommand = parseStringToEnd(str, 3); + const String res = write_AT_cmd(writeCommand); + addLog(LOG_LEVEL_INFO, strformat( + F("PPP cmd: %s -> %s"), + writeCommand.c_str(), + res.c_str())); + success = true; + SendStatus(event, res); + } + } + return success; +} + + # if FEATURE_PLUGIN_STATS bool NW005_data_struct_PPP_modem::initPluginStats() diff --git a/src/ESPEasy/net/NWPluginStructs/NW005_data_struct_PPP_modem.h b/src/ESPEasy/net/NWPluginStructs/NW005_data_struct_PPP_modem.h index 2784b8412..a6b45b4ed 100644 --- a/src/ESPEasy/net/NWPluginStructs/NW005_data_struct_PPP_modem.h +++ b/src/ESPEasy/net/NWPluginStructs/NW005_data_struct_PPP_modem.h @@ -50,6 +50,8 @@ struct NW005_data_struct_PPP_modem : public NWPluginData_base { bool exit(EventStruct *event); + bool handle_nwplugin_write(EventStruct *event, String& str) override; + String write_AT_cmd(const String& cmd, int timeout = 1000); diff --git a/src/ESPEasy/net/_NW005_PPP_modem.cpp b/src/ESPEasy/net/_NW005_PPP_modem.cpp index 26ef231c6..928927af9 100644 --- a/src/ESPEasy/net/_NW005_PPP_modem.cpp +++ b/src/ESPEasy/net/_NW005_PPP_modem.cpp @@ -224,6 +224,16 @@ bool NWPlugin_005(NWPlugin::Function function, EventStruct *event, String& strin break; } + case NWPlugin::Function::NWPLUGIN_WRITE: + { + auto *NW_data = getNWPluginData(event->NetworkIndex); + + if (NW_data) { + success = NW_data->handle_nwplugin_write(event, string); + } + break; + } + default: break; diff --git a/src/src/Commands/ExecuteCommand.cpp b/src/src/Commands/ExecuteCommand.cpp index 045d9e543..37d16f694 100644 --- a/src/src/Commands/ExecuteCommand.cpp +++ b/src/src/Commands/ExecuteCommand.cpp @@ -12,6 +12,9 @@ #include "../Helpers/StringConverter.h" #include "../Helpers/StringParser.h" +#include "../../ESPEasy/net/Globals/NWPlugins.h" + + ExecuteCommandArgs::ExecuteCommandArgs(EventValueSource::Enum source, const char *Line) : _taskIndex(INVALID_TASK_INDEX), @@ -267,6 +270,13 @@ bool ExecuteCommand(ExecuteCommandArgs&& args, bool addToQueue) // if (handled) addLog(LOG_LEVEL_INFO, F("CPLUGIN_WRITE accepted")); } + if (!handled) { + // Try a controller + handled = ESPEasy::net::NWPluginCall(NWPlugin::Function::NWPLUGIN_WRITE, &TempEvent, tmpAction); + + // if (handled) addLog(LOG_LEVEL_INFO, F("CPLUGIN_WRITE accepted")); + } + if (handled) { SendStatus(&TempEvent, return_command_success()); return true; From f9c7ffc8f35ccd18c745abb51e9196232fa6afc8 Mon Sep 17 00:00:00 2001 From: Ton Huisman Date: Sat, 23 Aug 2025 11:28:38 +0200 Subject: [PATCH 209/564] [P102] Don't check non-available values for NaN --- src/_P102_PZEM004Tv3.ino | 19 +++++++++++-------- 1 file changed, 11 insertions(+), 8 deletions(-) diff --git a/src/_P102_PZEM004Tv3.ino b/src/_P102_PZEM004Tv3.ino index 22f431a69..627988306 100644 --- a/src/_P102_PZEM004Tv3.ino +++ b/src/_P102_PZEM004Tv3.ino @@ -331,12 +331,15 @@ boolean Plugin_102(uint8_t function, struct EventStruct *even PZEM[4] = P102_PZEM_sensor->pf(); PZEM[5] = P102_PZEM_sensor->frequency(); - for (uint8_t i = 0; i < 6; i++) // Check each PZEM field + // Skip non-available values + const uint8_t toCheckMax = PZEM_model::PZEM004Tv30 == static_cast(P102_PZEM_TYPE) ? 6 : 4; + + for (uint8_t i = 0; i < toCheckMax; i++) // Check each PZEM field { - if (PZEM[i] != PZEM[i]) // Check if NAN + if (PZEM[i] != PZEM[i]) // Check if NAN { P102_PZEM_ATTEMPT == P102_PZEM_MAX_ATTEMPT ? P102_PZEM_ATTEMPT = 0 : P102_PZEM_ATTEMPT++; - break; // if one is Not A Number, break + break; // if one is Not A Number, break } P102_PZEM_ATTEMPT = 0; } @@ -376,13 +379,13 @@ boolean Plugin_102(uint8_t function, struct EventStruct *even // FIXME TD-er: Calling these functions is probably done within the 200 msec timeout used in the library. // If not, this should be cached in a task data struct. - string += LoRa_addFloat(P102_PZEM_sensor->voltage(), PackedData_int16_1e1); - string += LoRa_addFloat(P102_PZEM_sensor->current(), PackedData_int32_1e3); - string += LoRa_addFloat(P102_PZEM_sensor->power(), PackedData_int32_1e1); - string += LoRa_addFloat(P102_PZEM_sensor->energy(), PackedData_int32_1e1); + string += LoRa_addFloat(P102_PZEM_sensor->voltage(), PackedData_int16_1e1); + string += LoRa_addFloat(P102_PZEM_sensor->current(), PackedData_int32_1e3); + string += LoRa_addFloat(P102_PZEM_sensor->power(), PackedData_int32_1e1); + string += LoRa_addFloat(P102_PZEM_sensor->energy(), PackedData_int32_1e1); if (PZEM_model::PZEM004Tv30 == static_cast(P102_PZEM_TYPE)) { - string += LoRa_addFloat(P102_PZEM_sensor->pf(), PackedData_uint16_1e2); + string += LoRa_addFloat(P102_PZEM_sensor->pf(), PackedData_uint16_1e2); string += LoRa_addFloat(P102_PZEM_sensor->frequency() - 40, PackedData_uint8_1e1); event->Par1 = P102_PZEM004_VALUE_COUNT; // valuecount } else { From 9ab134106d4d295a6911032675266ac8d118c365 Mon Sep 17 00:00:00 2001 From: Ton Huisman Date: Sat, 23 Aug 2025 11:29:10 +0200 Subject: [PATCH 210/564] [P102] Correct documentation small typos --- docs/source/Plugin/P102_commands.repl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/source/Plugin/P102_commands.repl b/docs/source/Plugin/P102_commands.repl index caac65d7e..1ebe20567 100644 --- a/docs/source/Plugin/P102_commands.repl +++ b/docs/source/Plugin/P102_commands.repl @@ -10,6 +10,6 @@ | This command will reset the Energy counter for the PZEM unit (value is stored in the unit). The value retrieved on the next read should return the updated value. (Can be 0 if no energy is flowing, or the energy counted since the reset command was executed.) - | This command can be executed by any task is multiple PZEM tasks are configured, as they all share the same MODBUS Serial configuration of the *first* PZEM task. + | This command can be executed by any task if multiple PZEM tasks are configured, as they all share the single MODBUS Serial configuration of the *first* PZEM task. " From cdbf0fe130c2566d5dfab81a7177b3041532ee7e Mon Sep 17 00:00:00 2001 From: Ton Huisman Date: Sat, 23 Aug 2025 19:52:16 +0200 Subject: [PATCH 211/564] [MQTT] Handle connecting to broker as a background process --- src/_C002.cpp | 9 ++ src/_C005.cpp | 9 +- src/_C006.cpp | 16 +++- src/_C014.cpp | 9 ++ src/src/CustomBuild/define_plugin_sets.h | 13 +++ src/src/DataStructs/SettingsStruct.h | 7 +- src/src/ESPEasyCore/Controller.cpp | 111 +++++++++++++++++++++++ src/src/ESPEasyCore/Controller.h | 5 + src/src/Globals/MQTT.cpp | 4 + src/src/Globals/MQTT.h | 24 +++++ src/src/Helpers/Misc.cpp | 11 ++- src/src/Helpers/PeriodicalActions.cpp | 17 ++++ src/src/Helpers/StringProvider.cpp | 6 ++ src/src/Helpers/StringProvider.h | 3 + src/src/WebServer/AdvancedConfigPage.cpp | 7 ++ 15 files changed, 244 insertions(+), 7 deletions(-) diff --git a/src/_C002.cpp b/src/_C002.cpp index db832c2fc..0a61ed4eb 100644 --- a/src/_C002.cpp +++ b/src/_C002.cpp @@ -8,6 +8,7 @@ // ####################################################################################################### /** Changelog: + * 2025-08-23 tonhuisman: Add 10/sec call to poll background connection process while not connected * 2024-03-24 tonhuisman: Add support for 'Invert On/Off value' in P029 - Domoticz MQTT Helper * 2024-03-24 tonhuisman: Start Changelog (newest on top) */ @@ -231,6 +232,14 @@ bool CPlugin_002(CPlugin::Function function, struct EventStruct *event, String& break; } + # if FEATURE_MQTT_CONNECT_BACKGROUND + case CPlugin::Function::CPLUGIN_TEN_PER_SECOND: + { + MQTTConnectInBackground(CONTROLLER_MAX, true); // Report state + break; + } + # endif // if FEATURE_MQTT_CONNECT_BACKGROUND + default: break; } diff --git a/src/_C005.cpp b/src/_C005.cpp index 85dede67c..65a7e89a6 100644 --- a/src/_C005.cpp +++ b/src/_C005.cpp @@ -16,6 +16,7 @@ // ####################################################################################################### /** Changelog: + * 2025-08-23 tonhuisman: Add 10/sec call to poll background connection process while not connected * 2025-06-17 tonhuisman: Enable sending Derived values when available * 2024-11-29 tonhuisman: Add Discovery trigger setting * 2024-11-11 tonhuisman: Add AutoDiscovery options @@ -103,9 +104,10 @@ bool CPlugin_005(CPlugin::Function function, struct EventStruct *event, String& break; } - # if FEATURE_MQTT_DISCOVER case CPlugin::Function::CPLUGIN_TEN_PER_SECOND: { + # if FEATURE_MQTT_DISCOVER + if ((mqttDiscoveryTimeout > 0) && MQTTclient_connected) { mqttDiscoveryTimeout--; @@ -116,9 +118,12 @@ bool CPlugin_005(CPlugin::Function function, struct EventStruct *event, String& success = MQTT_SendAutoDiscovery(event->ControllerIndex, CPLUGIN_ID_005); } } + # endif // if FEATURE_MQTT_DISCOVER + # if FEATURE_MQTT_CONNECT_BACKGROUND + MQTTConnectInBackground(CONTROLLER_MAX, true); // Report state + # endif // if FEATURE_MQTT_CONNECT_BACKGROUND break; } - # endif // if FEATURE_MQTT_DISCOVER case CPlugin::Function::CPLUGIN_EXIT: { diff --git a/src/_C006.cpp b/src/_C006.cpp index ed248312c..466dd5a03 100644 --- a/src/_C006.cpp +++ b/src/_C006.cpp @@ -6,11 +6,13 @@ // ####################################################################################################### /** Changelog: + * 2025-08-23 tonhuisman: Add 10/sec call to poll background connection process while not connected * 2025-06-17 tonhuisman: Enable sending Derived values when available and enabled * 2023-08-18 tonhuisman: Clean up source for pull request * 2023-03-15 tonhuisman: Handle setting payload to (Dummy) Devices via topic SysName/TaskName/ValueName/set * 2023-03 Changelog started */ + // # include "src/Commands/InternalCommands.h" # include "src/Commands/ExecuteCommand.h" # include "src/ESPEasyCore/Controller.h" @@ -44,9 +46,9 @@ bool CPlugin_006(CPlugin::Function function, struct EventStruct *event, String& proto.usesExtCreds = true; proto.defaultPort = 1883; proto.usesID = false; - #if FEATURE_MQTT_TLS - proto.usesTLS = true; - #endif + # if FEATURE_MQTT_TLS + proto.usesTLS = true; + # endif // if FEATURE_MQTT_TLS # if FEATURE_STRING_VARIABLES proto.allowSendDerived = true; # endif // if FEATURE_STRING_VARIABLES @@ -142,6 +144,14 @@ bool CPlugin_006(CPlugin::Function function, struct EventStruct *event, String& break; } + # if FEATURE_MQTT_CONNECT_BACKGROUND + case CPlugin::Function::CPLUGIN_TEN_PER_SECOND: + { + MQTTConnectInBackground(CONTROLLER_MAX, true); // Report state + break; + } + # endif // if FEATURE_MQTT_CONNECT_BACKGROUND + default: break; } diff --git a/src/_C014.cpp b/src/_C014.cpp index ff73bc5b6..e5bcbcc32 100644 --- a/src/_C014.cpp +++ b/src/_C014.cpp @@ -16,6 +16,7 @@ // ####################################################################################################### /** Changelog: + * 2025-08-23 tonhuisman: Add 10/sec call to poll background connection process while not connected * 2025-06-18 tonhuisman: Add support for Unit of Measure attribute, when available in the build, sent in AutoDiscovery * Enable sending Derived values when available * 2024-03-02 tonhuisman: Fix using parseSystemVariables() for processing %sysname%. Might still break the same configurations, @@ -983,6 +984,14 @@ bool CPlugin_014(CPlugin::Function function, struct EventStruct *event, String& break; } + # if FEATURE_MQTT_CONNECT_BACKGROUND + case CPlugin::Function::CPLUGIN_TEN_PER_SECOND: + { + MQTTConnectInBackground(CONTROLLER_MAX, true); // Report state + break; + } + # endif // if FEATURE_MQTT_CONNECT_BACKGROUND + default: break; } diff --git a/src/src/CustomBuild/define_plugin_sets.h b/src/src/CustomBuild/define_plugin_sets.h index 9a6a2bc2f..b672326d7 100644 --- a/src/src/CustomBuild/define_plugin_sets.h +++ b/src/src/CustomBuild/define_plugin_sets.h @@ -3769,6 +3769,19 @@ To create/register a plugin, you have to : #endif #endif // if FEATURE_TASKVALUE_ATTRIBUTES +#ifndef FEATURE_MQTT_CONNECT_BACKGROUND + #ifdef ESP32 + #define FEATURE_MQTT_CONNECT_BACKGROUND 1 + #endif + #ifdef ESP8266 + #define FEATURE_MQTT_CONNECT_BACKGROUND 0 // Disabled explicitly on ESP8266 + #endif +#endif // if FEATURE_MQTT_CONNECT_BACKGROUND +#if defined(ESP8266) && FEATURE_MQTT_CONNECT_BACKGROUND + #undef FEATURE_MQTT_CONNECT_BACKGROUND + #define FEATURE_MQTT_CONNECT_BACKGROUND 0 // Disable always on ESP8266 +#endif // if defined(ESP8266) && FEATURE_MQTT_CONNECT_BACKGROUND + //-------------------HTTPResponseParser Section---------------- #ifndef FEATURE_THINGSPEAK_EVENT #if defined(PLUGIN_BUILD_MAX_ESP32) diff --git a/src/src/DataStructs/SettingsStruct.h b/src/src/DataStructs/SettingsStruct.h index 8c2a31699..d6ede2c24 100644 --- a/src/src/DataStructs/SettingsStruct.h +++ b/src/src/DataStructs/SettingsStruct.h @@ -218,6 +218,11 @@ class SettingsStruct_tmpl void ShowUnitOfMeasureOnDevicesPage(bool value) { VariousBits_2.ShowUnitOfMeasureOnDevicesPage = !value; } #endif // if FEATURE_TASKVALUE_UNIT_OF_MEASURE + #if FEATURE_MQTT_CONNECT_BACKGROUND + bool MQTTConnectInBackground() const { return !VariousBits_2.MQTTConnectInBackground; } // Inverted! + void MQTTConnectInBackground(bool value) { VariousBits_2.MQTTConnectInBackground = !value; } + #endif // if FEATURE_MQTT_CONNECT_BACKGROUND + // Flag indicating whether all task values should be sent in a single event or one event per task value (default behavior) bool CombineTaskValues_SingleEvent(taskIndex_t taskIndex) const; void CombineTaskValues_SingleEvent(taskIndex_t taskIndex, bool value); @@ -587,7 +592,7 @@ public: uint32_t ShowUnitOfMeasureOnDevicesPage : 1; // Bit 07 // inverted uint32_t unused_08 : 1; // Bit 08 uint32_t unused_09 : 1; // Bit 09 - uint32_t unused_10 : 1; // Bit 10 + uint32_t MQTTConnectInBackground : 1; // Bit 10 // inverted uint32_t unused_11 : 1; // Bit 11 uint32_t unused_12 : 1; // Bit 12 uint32_t unused_13 : 1; // Bit 13 diff --git a/src/src/ESPEasyCore/Controller.cpp b/src/src/ESPEasyCore/Controller.cpp index 36a1b238c..18bc87562 100644 --- a/src/src/ESPEasyCore/Controller.cpp +++ b/src/src/ESPEasyCore/Controller.cpp @@ -159,6 +159,13 @@ void incoming_mqtt_callback(char *c_topic, uint8_t *b_payload, unsigned int leng void MQTTDisconnect() { if (MQTTclient.connected()) { + #if FEATURE_MQTT_CONNECT_BACKGROUND + if (MQTT_task_data.taskHandle) { + vTaskDelete(MQTT_task_data.taskHandle); + MQTT_task_data.taskHandle = NULL; + } + MQTT_task_data.status = MQTT_connect_status_e::Disconnected; + #endif // if FEATURE_MQTT_CONNECT_BACKGROUND MQTTclient.disconnect(); addLog(LOG_LEVEL_INFO, F("MQTT : Disconnected from broker")); } @@ -191,6 +198,11 @@ bool MQTTConnect(controllerIndex_t controller_idx) } if (MQTTclient.connected()) { + #if FEATURE_MQTT_CONNECT_BACKGROUND + if (MQTT_task_data.status != MQTT_connect_status_e::Connecting) { + MQTT_task_data.status = MQTT_connect_status_e::Disconnected; + } + #endif // if FEATURE_MQTT_CONNECT_BACKGROUND MQTTclient.disconnect(); # if FEATURE_MQTT_TLS @@ -401,8 +413,18 @@ bool MQTTConnect(controllerIndex_t controller_idx) # endif // if FEATURE_MQTT_TLS if (ControllerSettings->UseDNS) { + #if !defined(BUILD_NO_DEBUG) && FEATURE_MQTT_CONNECT_BACKGROUND + if (loglevelActiveFor(LOG_LEVEL_INFO)) { + addLog(LOG_LEVEL_INFO, strformat(F("MQTT : Connecting to: %s:%u"), ControllerSettings->getHost().c_str(), ControllerSettings->Port)); + } + #endif // if !defined(BUILD_NO_DEBUG) && FEATURE_MQTT_CONNECT_BACKGROUND MQTTclient.setServer(ControllerSettings->getHost().c_str(), ControllerSettings->Port); } else { + #if !defined(BUILD_NO_DEBUG) && FEATURE_MQTT_CONNECT_BACKGROUND + if (loglevelActiveFor(LOG_LEVEL_INFO)) { + addLog(LOG_LEVEL_INFO, strformat(F("MQTT : Connecting to: %s:%u"), ControllerSettings->getIP().toString().c_str(), ControllerSettings->Port)); + } + #endif // if !defined(BUILD_NO_DEBUG) && FEATURE_MQTT_CONNECT_BACKGROUND MQTTclient.setServer(ControllerSettings->getIP(), ControllerSettings->Port); } MQTTclient.setCallback(incoming_mqtt_callback); @@ -522,6 +544,11 @@ bool MQTTConnect(controllerIndex_t controller_idx) } # endif // if FEATURE_MQTT_TLS + #if FEATURE_MQTT_CONNECT_BACKGROUND + if (MQTT_task_data.status != MQTT_connect_status_e::Connecting) { + MQTT_task_data.status = MQTT_connect_status_e::Disconnected; + } + #endif // if FEATURE_MQTT_CONNECT_BACKGROUND MQTTclient.disconnect(); # if FEATURE_MQTT_TLS @@ -623,6 +650,85 @@ String getMQTTclientID(const ControllerSettingsStruct& ControllerSettings) { return clientid; } +#if FEATURE_MQTT_CONNECT_BACKGROUND +void MQTT_execute_connect_task(void *parameter) +{ + MQTT_connect_request*MQTT_task_data = static_cast(parameter); + + while (!MQTTConnect(MQTT_task_data->ControllerIndex) + # if FEATURE_MQTT_TLS + && mqtt_tls_last_errorstr.isEmpty() + # endif // if FEATURE_MQTT_TLS + && !MQTTclient.connected() + ) { + delay(1); + } + MQTT_task_data->result = MQTTclient.connected(); + MQTT_task_data->status = MQTT_task_data->result + ? MQTT_connect_status_e::Connected + : MQTT_connect_status_e::Failure; + MQTT_task_data->endTime = millis(); + MQTT_task_data->taskHandle = NULL; + vTaskDelete(MQTT_task_data->taskHandle); +} + +bool MQTTConnectInBackground(controllerIndex_t controller_idx, bool reportOnly) { + if ((MQTT_task_data.status == MQTT_connect_status_e::Connected) || (MQTT_task_data.status == MQTT_connect_status_e::Failure)) { + if (loglevelActiveFor(LOG_LEVEL_INFO)) { + addLog(LOG_LEVEL_INFO, strformat(F("MQTT : Background Connect request %s, took %d msec"), + FsP(MQTT_task_data.result ? F("success") : F("FAILED")), + MQTT_task_data.endTime - MQTT_task_data.startTime + )); + } + MQTT_task_data.status = MQTT_connect_status_e::Ready; + return MQTT_task_data.result; + } + + if (MQTT_task_data.status == MQTT_connect_status_e::Ready) { + if (!MQTT_task_data.logged && loglevelActiveFor(LOG_LEVEL_INFO)) { + addLog(LOG_LEVEL_INFO, F("MQTT : Background Connect request Ready")); + } + MQTT_task_data.logged = true; + return MQTT_task_data.result; + } + + if (MQTT_task_data.status == MQTT_connect_status_e::Connecting) { + if (timePassedSince(MQTT_task_data.loopTime) > 1000) { + if (loglevelActiveFor(LOG_LEVEL_INFO)) { + addLog(LOG_LEVEL_INFO, strformat(F("MQTT : Background waiting to Connect, %d sec"), + timePassedSince(MQTT_task_data.startTime) / 1000 + )); + } + MQTT_task_data.loopTime = millis(); + } + return false; // Not ready yet + } + + if (!reportOnly && (MQTT_task_data.status == MQTT_connect_status_e::Disconnected)) { + if (loglevelActiveFor(LOG_LEVEL_INFO)) { + addLog(LOG_LEVEL_INFO, strformat(F("MQTT : Start background connect for controller %d"), controller_idx + 1)); + } + MQTT_task_data.status = MQTT_connect_status_e::Connecting; + MQTT_task_data.result = false; + MQTT_task_data.logged = false; + MQTT_task_data.ControllerIndex = controller_idx; + MQTT_task_data.startTime = millis(); + MQTT_task_data.loopTime = millis(); + + xTaskCreatePinnedToCore( + MQTT_execute_connect_task, // Function that should be called + "MQTTConnect()", // Name of the task (for debugging) + 8192, // Stack size (bytes) + &MQTT_task_data, // Parameter to pass + 1, // Task priority + &MQTT_task_data.taskHandle, // Task handle + xPortGetCoreID() // Core you want to run the task on (0 or 1) + ); + } + return false; +} +#endif // if FEATURE_MQTT_CONNECT_BACKGROUND + /*********************************************************************************************\ * Check connection MQTT message broker \*********************************************************************************************/ @@ -678,6 +784,11 @@ bool MQTTCheck(controllerIndex_t controller_idx) if (MQTTclient_should_reconnect || !MQTTclient.connected()) { + #if FEATURE_MQTT_CONNECT_BACKGROUND + if (Settings.MQTTConnectInBackground()) { + return MQTTConnectInBackground(controller_idx, false); + } + #endif // ifdef ESP32 return MQTTConnect(controller_idx); } diff --git a/src/src/ESPEasyCore/Controller.h b/src/src/ESPEasyCore/Controller.h index 91825acd0..6b5f4ebb4 100644 --- a/src/src/ESPEasyCore/Controller.h +++ b/src/src/ESPEasyCore/Controller.h @@ -29,6 +29,11 @@ void MQTTDisconnect(); /*********************************************************************************************\ * Connect to MQTT message broker \*********************************************************************************************/ +#if FEATURE_MQTT_CONNECT_BACKGROUND +bool MQTTConnectInBackground(controllerIndex_t controller_idx, + bool reportOnly); +#endif // if FEATURE_MQTT_CONNECT_BACKGROUND + bool MQTTConnect(controllerIndex_t controller_idx); void MQTTparseSystemVariablesAndSubscribe(String subscribeTo); diff --git a/src/src/Globals/MQTT.cpp b/src/src/Globals/MQTT.cpp index 04d64d09a..4820d948e 100644 --- a/src/src/Globals/MQTT.cpp +++ b/src/src/Globals/MQTT.cpp @@ -29,6 +29,10 @@ bool MQTTclient_connected = false; int mqtt_reconnect_count = 0; LongTermTimer MQTTclient_next_connect_attempt; +# if FEATURE_MQTT_CONNECT_BACKGROUND +MQTT_connect_request MQTT_task_data; +# endif // if FEATURE_MQTT_CONNECT_BACKGROUND + # if FEATURE_MQTT_DISCOVER controllerIndex_t mqttDiscoveryController = INVALID_CONTROLLER_INDEX; diff --git a/src/src/Globals/MQTT.h b/src/src/Globals/MQTT.h index 59bf490f4..7aa1a459d 100644 --- a/src/src/Globals/MQTT.h +++ b/src/src/Globals/MQTT.h @@ -17,6 +17,30 @@ # include # endif // if FEATURE_MQTT_TLS +# if FEATURE_MQTT_CONNECT_BACKGROUND +enum MQTT_connect_status_e : uint8_t { + Disconnected = 0, + Connecting = 1, + Connected = 2, + Failure = 3, + Ready = 4, +}; + +struct MQTT_connect_request { + MQTT_connect_status_e status = MQTT_connect_status_e::Disconnected; + controllerIndex_t ControllerIndex = INVALID_CONTROLLER_INDEX; + uint32_t startTime{}; + uint32_t loopTime{}; + uint32_t endTime{}; + bool result{}; + bool logged{}; + + // This is C-code, so not set to nullptr, but to NULL + TaskHandle_t taskHandle = NULL; +}; +extern MQTT_connect_request MQTT_task_data; +# endif // if FEATURE_MQTT_CONNECT_BACKGROUND + // MQTT client extern WiFiClient mqtt; # if FEATURE_MQTT_TLS diff --git a/src/src/Helpers/Misc.cpp b/src/src/Helpers/Misc.cpp index 6ce9bf7dc..15e1947a4 100644 --- a/src/src/Helpers/Misc.cpp +++ b/src/src/Helpers/Misc.cpp @@ -81,7 +81,16 @@ bool setControllerEnableStatus(controllerIndex_t controllerIndex, bool enabled) // Only enable controller if it has a protocol configured if ((Settings.Protocol[controllerIndex] != 0) || !enabled) { Settings.ControllerEnabled[controllerIndex] = enabled; - return true; + const protocolIndex_t ProtocolIndex = getProtocolIndex_from_ControllerIndex(controllerIndex); + + if (validProtocolIndex(ProtocolIndex)) { + struct EventStruct TempEvent; + TempEvent.ControllerIndex = controllerIndex; + String dummy; + const CPlugin::Function cfunction = + enabled ? CPlugin::Function::CPLUGIN_INIT : CPlugin::Function::CPLUGIN_EXIT; + return CPluginCall(ProtocolIndex, cfunction, &TempEvent, dummy) || CPlugin::Function::CPLUGIN_EXIT == cfunction; + } } return false; } diff --git a/src/src/Helpers/PeriodicalActions.cpp b/src/src/Helpers/PeriodicalActions.cpp index 8c0f3bc22..c968da039 100644 --- a/src/src/Helpers/PeriodicalActions.cpp +++ b/src/src/Helpers/PeriodicalActions.cpp @@ -380,6 +380,9 @@ void updateMQTTclient_connected() { } Scheduler.setIntervalTimer(SchedulerIntervalTimer_e::TIMER_MQTT); scheduleNextMQTTdelayQueue(); + #if FEATURE_MQTT_CONNECT_BACKGROUND + MQTTConnectInBackground(CONTROLLER_MAX, true); // Report state + #endif // if FEATURE_MQTT_CONNECT_BACKGROUND } void runPeriodicalMQTT() { @@ -399,6 +402,13 @@ void runPeriodicalMQTT() { } } else { if (MQTTclient.connected()) { + #if FEATURE_MQTT_CONNECT_BACKGROUND + if (MQTT_task_data.taskHandle) { + vTaskDelete(MQTT_task_data.taskHandle); + MQTT_task_data.taskHandle = NULL; + } + MQTT_task_data.status = MQTT_connect_status_e::Disconnected; + #endif // if FEATURE_MQTT_CONNECT_BACKGROUND MQTTclient.disconnect(); updateMQTTclient_connected(); } @@ -475,6 +485,13 @@ void flushAndDisconnectAllClients() { } #if FEATURE_MQTT if (mqttControllerEnabled && MQTTclient.connected()) { + #if FEATURE_MQTT_CONNECT_BACKGROUND + if (MQTT_task_data.taskHandle) { + vTaskDelete(MQTT_task_data.taskHandle); + MQTT_task_data.taskHandle = NULL; + } + MQTT_task_data.status = MQTT_connect_status_e::Disconnected; + #endif // if FEATURE_MQTT_CONNECT_BACKGROUND MQTTclient.disconnect(); updateMQTTclient_connected(); } diff --git a/src/src/Helpers/StringProvider.cpp b/src/src/Helpers/StringProvider.cpp index c9f6bdeca..0f6f2379e 100644 --- a/src/src/Helpers/StringProvider.cpp +++ b/src/src/Helpers/StringProvider.cpp @@ -145,6 +145,9 @@ const __FlashStringHelper * getLabel(LabelType::Enum label) { #if FEATURE_TASKVALUE_UNIT_OF_MEASURE case LabelType::SHOW_UOM_ON_DEVICES_PAGE: return F("Show Unit of Measure"); #endif // if FEATURE_TASKVALUE_UNIT_OF_MEASURE + #if FEATURE_MQTT_CONNECT_BACKGROUND + case LabelType::MQTT_CONNECT_IN_BACKGROUND: return F("MQTT Connect in background"); + #endif // if FEATURE_MQTT_CONNECT_BACKGROUND case LabelType::BOOT_TYPE: return F("Last Boot Cause"); case LabelType::BOOT_COUNT: return F("Boot Count"); @@ -441,6 +444,9 @@ String getValue(LabelType::Enum label) { #if FEATURE_TASKVALUE_UNIT_OF_MEASURE case LabelType::SHOW_UOM_ON_DEVICES_PAGE: return jsonBool(Settings.ShowUnitOfMeasureOnDevicesPage()); #endif // if FEATURE_TASKVALUE_UNIT_OF_MEASURE + #if FEATURE_MQTT_CONNECT_BACKGROUND + case LabelType::MQTT_CONNECT_IN_BACKGROUND: return jsonBool(Settings.MQTTConnectInBackground()); + #endif // if FEATURE_MQTT_CONNECT_BACKGROUND case LabelType::BOOT_TYPE: return getLastBootCauseString(); case LabelType::BOOT_COUNT: break; diff --git a/src/src/Helpers/StringProvider.h b/src/src/Helpers/StringProvider.h index f15d3bc81..49d1f3f9b 100644 --- a/src/src/Helpers/StringProvider.h +++ b/src/src/Helpers/StringProvider.h @@ -93,6 +93,9 @@ struct LabelType { #if FEATURE_TASKVALUE_UNIT_OF_MEASURE SHOW_UOM_ON_DEVICES_PAGE, #endif // if FEATURE_TASKVALUE_UNIT_OF_MEASURE + #if FEATURE_MQTT_CONNECT_BACKGROUND + MQTT_CONNECT_IN_BACKGROUND, + #endif // if FEATURE_MQTT_CONNECT_BACKGROUND BOOT_TYPE, // Cold boot BOOT_COUNT, // 0 diff --git a/src/src/WebServer/AdvancedConfigPage.cpp b/src/src/WebServer/AdvancedConfigPage.cpp index 4e22f5852..67a958d06 100644 --- a/src/src/WebServer/AdvancedConfigPage.cpp +++ b/src/src/WebServer/AdvancedConfigPage.cpp @@ -179,6 +179,9 @@ void handle_advanced() { #if FEATURE_TASKVALUE_UNIT_OF_MEASURE Settings.ShowUnitOfMeasureOnDevicesPage(isFormItemChecked(LabelType::SHOW_UOM_ON_DEVICES_PAGE)); #endif // if FEATURE_TASKVALUE_UNIT_OF_MEASURE + #if FEATURE_MQTT_CONNECT_BACKGROUND + Settings.MQTTConnectInBackground(isFormItemChecked(LabelType::MQTT_CONNECT_IN_BACKGROUND)); + #endif // if FEATURE_MQTT_CONNECT_BACKGROUND addHtmlError(SaveSettings()); @@ -355,6 +358,10 @@ void handle_advanced() { addFormCheckBox(LabelType::SHOW_UOM_ON_DEVICES_PAGE, Settings.ShowUnitOfMeasureOnDevicesPage()); #endif // if FEATURE_TASKVALUE_UNIT_OF_MEASURE + #if FEATURE_MQTT_CONNECT_BACKGROUND + addFormCheckBox(LabelType::MQTT_CONNECT_IN_BACKGROUND, Settings.MQTTConnectInBackground()); + #endif // if FEATURE_MQTT_CONNECT_BACKGROUND + # ifndef NO_HTTP_UPDATER addFormCheckBox(LabelType::ALLOW_OTA_UNLIMITED, Settings.AllowOTAUnlimited()); # endif // ifndef NO_HTTP_UPDATER From aa6ad603704efabed0616526d2c22d2b2f070c28 Mon Sep 17 00:00:00 2001 From: Ton Huisman Date: Sat, 23 Aug 2025 19:53:03 +0200 Subject: [PATCH 212/564] [Tools] Update documentation for MQTT Connect in background --- docs/source/Tools/Tools.rst | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/docs/source/Tools/Tools.rst b/docs/source/Tools/Tools.rst index d7160eec2..299b7caf3 100644 --- a/docs/source/Tools/Tools.rst +++ b/docs/source/Tools/Tools.rst @@ -482,6 +482,16 @@ If the Unit of Measure, configurable per Task Value, should not be displayed on NB: This option is excluded from the build if this feature is not enabled. +MQTT Connect in background +^^^^^^^^^^^^^^^^^^^^^^^^^^ + +Added: 2025-08-23 + +Depending on the internet connection, f.e. when connecting via a low-end mobile network or other slow connection type, starting a connection to a MQTT Broker can take quite some time. + +On ESP32, tasks like starting the MQTT connection can be delegated to an independent background task, to avoid blocking the normal working of ESPEasy, that will report the result when completed. This feature is enabled by default, as it is the preferred setting, but when this way of connecting is causing issues, it can be disabled. + + Allow OTA without size-check ^^^^^^^^^^^^^^^^^^^^^^^^^^^^ From b65fba27757b2d14a37f4b944e9dec40d33ee3ef Mon Sep 17 00:00:00 2001 From: Gijs Noorlander Date: Sun, 24 Aug 2025 00:28:31 +0600 Subject: [PATCH 213/564] [Network] Add connected/disconnected event handling for all interfaces --- .gitignore | 2 + .../NWPluginData_static_runtime.cpp | 48 ++++++++++++++++++- .../DataStructs/NWPluginData_static_runtime.h | 25 ++++++++-- .../NWPluginData_static_runtime_ESP32.cpp | 48 ++++++++++++------- .../NWPluginData_static_runtime_ESP8266.cpp | 34 +++++++++---- src/ESPEasy/net/Globals/NWPlugins.cpp | 28 +++++++++++ src/ESPEasy/net/Globals/NWPlugins.h | 2 + .../NW002_data_struct_WiFi_AP.cpp | 6 ++- .../NW003_data_struct_ETH_RMII.cpp | 4 +- .../NW004_data_struct_ETH_SPI.cpp | 2 +- .../NW005_data_struct_PPP_modem.cpp | 15 ++++-- .../net/wifi/ESPEasyWiFi_STA_Event_ESP32.cpp | 4 +- .../wifi/ESPEasyWiFi_STA_Event_ESP8266.cpp | 4 +- src/src/DataStructs/TimingStats.cpp | 1 + src/src/DataStructs/TimingStats.h | 1 + src/src/ESPEasyCore/ESPEasy_loop.cpp | 2 +- src/src/Helpers/LongTermOnOffTimer.cpp | 3 ++ src/src/Helpers/LongTermOnOffTimer.h | 13 +++++ src/src/Helpers/PeriodicalActions.cpp | 3 ++ 19 files changed, 203 insertions(+), 42 deletions(-) diff --git a/.gitignore b/.gitignore index a23e4363d..dc91c45bc 100644 --- a/.gitignore +++ b/.gitignore @@ -88,3 +88,5 @@ dependencies.lock .cache/ src/src/CustomBuild/CompiletimeDefines_generated.h + +bhutan_16m.bin diff --git a/src/ESPEasy/net/DataStructs/NWPluginData_static_runtime.cpp b/src/ESPEasy/net/DataStructs/NWPluginData_static_runtime.cpp index 37b712dea..3fec10564 100644 --- a/src/ESPEasy/net/DataStructs/NWPluginData_static_runtime.cpp +++ b/src/ESPEasy/net/DataStructs/NWPluginData_static_runtime.cpp @@ -1,7 +1,11 @@ #include "../DataStructs/NWPluginData_static_runtime.h" +#include "../../../src/Globals/EventQueue.h" #include "../../../src/Globals/Settings.h" +#include "../../../src/Helpers/NetworkStatusLED.h" +#include "../../../src/Helpers/StringConverter.h" + namespace ESPEasy { namespace net { @@ -25,9 +29,51 @@ void NWPluginData_static_runtime::clear(networkIndex_t networkIndex) // FIXME TD-er: Should also clear dns cache? } +void NWPluginData_static_runtime::processEvent_and_clear() +{ + processEvents(); + clear(); +} + + bool NWPluginData_static_runtime::operational() const { - return _startStopStats.isOn() && connected() && hasIP(); + return started() && connected() && hasIP() + && Settings.getNetworkEnabled(_networkIndex); + // FIXME TD-er: WiFi STA keeps reporting it is + // connected and has IP even after call to networkdisable,1 +} + +void NWPluginData_static_runtime::processEvents() +{ + if (_establishConnectStats.changedSinceLastCheck_and_clear()) + { + if (_establishConnectStats.isOn()) { + log_connected(); +// _establishConnectStats.resetCount(); + } else { + log_disconnected(); + } + } + + + _operationalStats.set(operational()); + if (_operationalStats.changedSinceLastCheck_and_clear()) { + // Send out event + if (Settings.UseRules && _eventInterfaceName.length()) + { + if (_operationalStats.isOn()) { + eventQueue.add(concat( + _eventInterfaceName, + F("#Connected"))); + } else { + eventQueue.add(concat( + _eventInterfaceName, + F("#Disconnected"))); + } + } + statusLED(true); + } } String NWPluginData_static_runtime::statusToString() const diff --git a/src/ESPEasy/net/DataStructs/NWPluginData_static_runtime.h b/src/ESPEasy/net/DataStructs/NWPluginData_static_runtime.h index 64c962a64..14f1fc9cc 100644 --- a/src/ESPEasy/net/DataStructs/NWPluginData_static_runtime.h +++ b/src/ESPEasy/net/DataStructs/NWPluginData_static_runtime.h @@ -2,6 +2,8 @@ #include "../DataTypes/NetworkIndex.h" +#include "../../../ESPEasy_common.h" + #include "../../../src/Helpers/LongTermOnOffTimer.h" #include @@ -16,15 +18,27 @@ namespace net { struct NWPluginData_static_runtime { #ifdef ESP32 - NWPluginData_static_runtime(NetworkInterface *netif) : _netif(netif) {} + NWPluginData_static_runtime(NetworkInterface *netif, const String& eventInterfaceName = EMPTY_STRING) + : _netif(netif), _eventInterfaceName(eventInterfaceName) + { + if (_eventInterfaceName.length() == 0 && _netif) { + _eventInterfaceName = _netif->desc(); + _eventInterfaceName.toUpperCase(); + } + } #else // ifdef ESP32 - NWPluginData_static_runtime(bool isSTA) : _isSTA(isSTA) {} + NWPluginData_static_runtime(bool isSTA, String& eventInterfaceName) + : _isSTA(isSTA), _eventInterfaceName(eventInterfaceName) {} #endif // ifdef ESP32 void clear(networkIndex_t networkIndex = INVALID_NETWORK_INDEX); + void processEvent_and_clear(); + + bool started() const; + bool connected() const; bool isDefaultRoute() const; @@ -60,9 +74,10 @@ struct NWPluginData_static_runtime { void mark_begin_establish_connection(); void mark_connected(); + void log_connected(); void mark_disconnected(); - + void log_disconnected(); // ============================================= // Keep track of connection durations @@ -85,6 +100,7 @@ struct NWPluginData_static_runtime { uint32_t getConnectionFailures() const { return _connectionFailures; } + void processEvents(); // ============================================= // OnOffTimers for keeping track of: @@ -101,6 +117,7 @@ struct NWPluginData_static_runtime { #if FEATURE_USE_IPV6 LongTermOnOffTimer _gotIP6Stats{}; #endif + LongTermOnOffTimer _operationalStats{}; // is started, connected and had IP // ============================================= // Cached DNS servers & Route Prio @@ -121,6 +138,8 @@ private: const bool _isSTA; #endif + String _eventInterfaceName; + // Store durations it took to connect to some host. // This depends on host and interface. // Duration is negative when it was suggested but not actually set. diff --git a/src/ESPEasy/net/DataStructs/NWPluginData_static_runtime_ESP32.cpp b/src/ESPEasy/net/DataStructs/NWPluginData_static_runtime_ESP32.cpp index 6519a1e2f..479edf1ce 100644 --- a/src/ESPEasy/net/DataStructs/NWPluginData_static_runtime_ESP32.cpp +++ b/src/ESPEasy/net/DataStructs/NWPluginData_static_runtime_ESP32.cpp @@ -14,6 +14,12 @@ namespace ESPEasy { namespace net { +bool NWPluginData_static_runtime::started() const +{ + if (!_netif) { return false; } + return _netif->started(); +} + bool NWPluginData_static_runtime::connected() const { if (!_netif) { return false; } @@ -173,29 +179,37 @@ void NWPluginData_static_runtime::mark_connected() _establishConnectStats.setOff(); _connectedStats.setOn(); -#if NW_PLUGIN_LOG_EVENTS - if (logDuration) { - addLog(LOG_LEVEL_INFO, strformat( - F("%s: Connected, took: %s in %d attempts"), - _netif->desc(), - format_msec_duration_HMS( - _establishConnectStats.getLastOnDuration_ms()).c_str(), - _establishConnectStats.getCycleCount())); - } else { - addLog(LOG_LEVEL_INFO, strformat( - F("%s: Connected"), - _netif->desc())); - } -#endif - _establishConnectStats.resetCount(); } +void NWPluginData_static_runtime::log_connected() +{ + if (_netif && loglevelActiveFor(LOG_LEVEL_INFO)) { + if (_establishConnectStats.getCycleCount()) { + // Log duration + addLog(LOG_LEVEL_INFO, strformat( + F("%s: Connected, took: %s in %d attempts"), + _netif->desc(), + format_msec_duration_HMS( + _establishConnectStats.getLastOnDuration_ms()).c_str(), + _establishConnectStats.getCycleCount())); + } else { + addLog(LOG_LEVEL_INFO, strformat( + F("%s: Connected"), + _netif->desc())); + } + } +} + + void NWPluginData_static_runtime::mark_disconnected() { _connectedStats.setOff(); // TODO TD-er: Also clear _gotIPStats and _gotIP6Stats ? -#if NW_PLUGIN_LOG_EVENTS +} + +void NWPluginData_static_runtime::log_disconnected() +{ if (_netif && loglevelActiveFor(LOG_LEVEL_INFO)) { addLog(LOG_LEVEL_INFO, strformat( F("%s: Disconnected. Connected for: %s"), @@ -203,9 +217,9 @@ void NWPluginData_static_runtime::mark_disconnected() format_msec_duration_HMS( _connectedStats.getLastOnDuration_ms()).c_str())); } -#endif } + } // namespace net } // namespace ESPEasy diff --git a/src/ESPEasy/net/DataStructs/NWPluginData_static_runtime_ESP8266.cpp b/src/ESPEasy/net/DataStructs/NWPluginData_static_runtime_ESP8266.cpp index 244bc9e1d..ccb09b5ec 100644 --- a/src/ESPEasy/net/DataStructs/NWPluginData_static_runtime_ESP8266.cpp +++ b/src/ESPEasy/net/DataStructs/NWPluginData_static_runtime_ESP8266.cpp @@ -7,6 +7,12 @@ namespace ESPEasy { namespace net { +bool NWPluginData_static_runtime::started() const +{ + // FIXME TD-er: Does this work reliable on ESP8266? + return _startStopStats.isOn(); +} + bool NWPluginData_static_runtime::connected() const { if (_isSTA) { return WiFi.status() == WL_CONNECTED; } @@ -70,14 +76,20 @@ void NWPluginData_static_runtime::mark_connected() #endif _establishConnectStats.setOff(); _connectedStats.setOn(); +} + +void NWPluginData_static_runtime::log_connected() +{ #ifndef BUILD_NO_DEBUG - if (logDuration) { - addLog(LOG_LEVEL_INFO, concat( - F("STA: Connected, took: "), - format_msec_duration_HMS( - _establishConnectStats.getLastOnDuration_ms()))); - } else { - addLog(LOG_LEVEL_INFO, F("STA: Connected")); + if (loglevelActiveFor(LOG_LEVEL_INFO)) { + if (_establishConnectStats.getCycleCount()) { + addLog(LOG_LEVEL_INFO, concat( + F("STA: Connected, took: "), + format_msec_duration_HMS( + _establishConnectStats.getLastOnDuration_ms()))); + } else { + addLog(LOG_LEVEL_INFO, F("STA: Connected")); + } } #endif } @@ -86,7 +98,13 @@ void NWPluginData_static_runtime::mark_disconnected() { _connectedStats.setOff(); #ifndef BUILD_NO_DEBUG - if (_isSTA) { +#endif +} + +void NWPluginData_static_runtime::log_disconnected() +{ +#ifndef BUILD_NO_DEBUG + if (_isSTA && loglevelActiveFor(LOG_LEVEL_INFO)) { addLog(LOG_LEVEL_INFO, concat( F("STA: Disconnected. Connected for: "), format_msec_duration_HMS(_connectedStats.getLastOnDuration_ms()))); diff --git a/src/ESPEasy/net/Globals/NWPlugins.cpp b/src/ESPEasy/net/Globals/NWPlugins.cpp index fa0ad93d4..d4b4f2742 100644 --- a/src/ESPEasy/net/Globals/NWPlugins.cpp +++ b/src/ESPEasy/net/Globals/NWPlugins.cpp @@ -114,6 +114,7 @@ bool NWPluginCall(NWPlugin::Function Function, EventStruct *event, String& str) case NWPlugin::Function::NWPLUGIN_RECORD_STATS: case NWPlugin::Function::NWPLUGIN_WEBFORM_LOAD_SHOW_STATS: #endif // if FEATURE_PLUGIN_STATS + case NWPlugin::Function::NWPLUGIN_PROCESS_EVENT: case NWPlugin::Function::NWPLUGIN_GET_CONNECTED_DURATION: { bool success = false; @@ -155,6 +156,15 @@ bool NWPluginCall(NWPlugin::Function Function, EventStruct *event, String& str) } #endif // if FEATURE_PLUGIN_STATS + case NWPlugin::Function::NWPLUGIN_PROCESS_EVENT: + { + auto runtimeData = NW_data->getNWPluginData_static_runtime(); + if (runtimeData) { + runtimeData->processEvents(); + } + break; + } + case NWPlugin::Function::NWPLUGIN_GET_CONNECTED_DURATION: { auto runtime_data = NW_data->getNWPluginData_static_runtime(); @@ -301,6 +311,13 @@ bool NWPluginCall(NWPlugin::Function Function, EventStruct *event, String& str) if (success && (Function == NWPlugin::Function::NWPLUGIN_EXIT)) { // Cache.clearNetworkSettings(networkIndex); + auto data = getNWPluginData_static_runtime(event->NetworkIndex); + + if (data) { + delay(100); // Allow some time to process events + data->processEvent_and_clear(); + } + } #endif // ifdef ESP32 } @@ -396,5 +413,16 @@ const NWPluginData_static_runtime* getDefaultRoute_NWPluginData_static_runtime() return nullptr; } +void processNetworkEvents() +{ + START_TIMER; + for (networkIndex_t i = 0; i < NETWORK_MAX; ++i) { + EventStruct tmpEvent; + tmpEvent.NetworkIndex = i; + NWPluginCall(NWPlugin::Function::NWPLUGIN_PROCESS_EVENT, &tmpEvent); + } + STOP_TIMER(NWPLUGIN_PROCESS_NETWORK_EVENTS); +} + } // namespace net } // namespace ESPEasy diff --git a/src/ESPEasy/net/Globals/NWPlugins.h b/src/ESPEasy/net/Globals/NWPlugins.h index 15a822515..56fd1f777 100644 --- a/src/ESPEasy/net/Globals/NWPlugins.h +++ b/src/ESPEasy/net/Globals/NWPlugins.h @@ -48,5 +48,7 @@ NWPluginData_static_runtime* getWiFi_STA_NWPluginData_static_runtime(); NWPluginData_static_runtime* getNWPluginData_static_runtime(networkIndex_t index); const NWPluginData_static_runtime* getDefaultRoute_NWPluginData_static_runtime(); +void processNetworkEvents(); + } // namespace net } // namespace ESPEasy diff --git a/src/ESPEasy/net/NWPluginStructs/NW002_data_struct_WiFi_AP.cpp b/src/ESPEasy/net/NWPluginStructs/NW002_data_struct_WiFi_AP.cpp index 0c7a1a145..33b53f0c5 100644 --- a/src/ESPEasy/net/NWPluginStructs/NW002_data_struct_WiFi_AP.cpp +++ b/src/ESPEasy/net/NWPluginStructs/NW002_data_struct_WiFi_AP.cpp @@ -29,7 +29,7 @@ namespace wifi { # ifdef ESP32 static NWPluginData_static_runtime stats_and_cache(&NW_PLUGIN_INTERFACE); # else -static NWPluginData_static_runtime stats_and_cache(false); +static NWPluginData_static_runtime stats_and_cache(false, F("AP")); # endif // ifdef ESP32 static bool nw002_initialized{}; # ifdef ESP32 @@ -78,7 +78,7 @@ NW002_data_struct_WiFi_AP::~NW002_data_struct_WiFi_AP() } nw_event_id = 0; # endif // ifdef ESP32 - stats_and_cache.clear(); + stats_and_cache.processEvent_and_clear(); } void NW002_data_struct_WiFi_AP::webform_load(EventStruct *event) {} @@ -109,6 +109,8 @@ bool NW002_data_struct_WiFi_AP::exit(EventStruct *event) WiFi.softAPdisconnect(); # endif // ifdef ESP8266 + stats_and_cache.processEvents(); + return true; } diff --git a/src/ESPEasy/net/NWPluginStructs/NW003_data_struct_ETH_RMII.cpp b/src/ESPEasy/net/NWPluginStructs/NW003_data_struct_ETH_RMII.cpp index 1565a1581..47e5bf817 100644 --- a/src/ESPEasy/net/NWPluginStructs/NW003_data_struct_ETH_RMII.cpp +++ b/src/ESPEasy/net/NWPluginStructs/NW003_data_struct_ETH_RMII.cpp @@ -33,7 +33,7 @@ NW003_data_struct_ETH_RMII::~NW003_data_struct_ETH_RMII() Network.removeEvent(nw_event_id); } nw_event_id = 0; - stats_and_cache.clear(); + stats_and_cache.processEvent_and_clear(); } void NW003_data_struct_ETH_RMII::webform_load(EventStruct *event) {} @@ -45,7 +45,7 @@ bool NW003_data_struct_ETH_RMII::webform_getPort(String& str) { return true; bool NW003_data_struct_ETH_RMII::init(EventStruct *event) { return true; } bool NW003_data_struct_ETH_RMII::exit(EventStruct *event) { - + stats_and_cache.processEvents(); return true; } diff --git a/src/ESPEasy/net/NWPluginStructs/NW004_data_struct_ETH_SPI.cpp b/src/ESPEasy/net/NWPluginStructs/NW004_data_struct_ETH_SPI.cpp index 1804761db..45b1a6621 100644 --- a/src/ESPEasy/net/NWPluginStructs/NW004_data_struct_ETH_SPI.cpp +++ b/src/ESPEasy/net/NWPluginStructs/NW004_data_struct_ETH_SPI.cpp @@ -32,7 +32,7 @@ NW004_data_struct_ETH_SPI::~NW004_data_struct_ETH_SPI() Network.removeEvent(nw_event_id); } nw_event_id = 0; - stats_and_cache.clear(); + stats_and_cache.processEvent_and_clear(); } void NW004_data_struct_ETH_SPI::webform_load(EventStruct *event) {} diff --git a/src/ESPEasy/net/NWPluginStructs/NW005_data_struct_PPP_modem.cpp b/src/ESPEasy/net/NWPluginStructs/NW005_data_struct_PPP_modem.cpp index 4451f9fd4..5c88eeec4 100644 --- a/src/ESPEasy/net/NWPluginStructs/NW005_data_struct_PPP_modem.cpp +++ b/src/ESPEasy/net/NWPluginStructs/NW005_data_struct_PPP_modem.cpp @@ -30,7 +30,7 @@ namespace ESPEasy { namespace net { namespace ppp { -static NWPluginData_static_runtime stats_and_cache(&NW_PLUGIN_INTERFACE); +static NWPluginData_static_runtime stats_and_cache(&NW_PLUGIN_INTERFACE, F("PPP")); // Keys as used in the Key-value-store @@ -112,7 +112,7 @@ NW005_data_struct_PPP_modem::~NW005_data_struct_PPP_modem() { Network.removeEvent(nw_event_id); } nw_event_id = 0; - stats_and_cache.clear(); + stats_and_cache.processEvent_and_clear(); } enum class NW005_modem_model { @@ -153,6 +153,14 @@ ppp_modem_model_t to_ppp_modem_model_t(NW005_modem_model NW005_modemmodel) return PPP_MODEM_GENERIC; } +int doGetRSSI() +{ + const int rssi_raw = NW_PLUGIN_INTERFACE.RSSI(); + if (rssi_raw == 0) return -113; + if (rssi_raw == 99) return 0; + return map(rssi_raw, 2, 30, -109, -53); +} + String NW005_data_struct_PPP_modem::getRSSI() const { if (!_modem_task_data.modem_initialized) { return F("-"); } @@ -967,7 +975,8 @@ bool NW005_data_struct_PPP_modem::record_stats() if (_plugin_stats_array != nullptr) { EventStruct tmpEvent; size_t valueCount{}; - tmpEvent.ParfN[valueCount++] = NW_PLUGIN_INTERFACE.RSSI(); + const int rssi = doGetRSSI(); + tmpEvent.ParfN[valueCount++] = rssi == 0 ? NAN : rssi; tmpEvent.ParfN[valueCount++] = getBER_float(); bool trackPeaks = true; bool onlyUpdateTimestampWhenSame = true; diff --git a/src/ESPEasy/net/wifi/ESPEasyWiFi_STA_Event_ESP32.cpp b/src/ESPEasy/net/wifi/ESPEasyWiFi_STA_Event_ESP32.cpp index 0955f6e14..e3bd97683 100644 --- a/src/ESPEasy/net/wifi/ESPEasyWiFi_STA_Event_ESP32.cpp +++ b/src/ESPEasy/net/wifi/ESPEasyWiFi_STA_Event_ESP32.cpp @@ -34,7 +34,7 @@ namespace ESPEasy { namespace net { namespace wifi { -static NWPluginData_static_runtime stats_and_cache(&WiFi.STA); +static NWPluginData_static_runtime stats_and_cache(&WiFi.STA, F("WiFi")); static wifi_event_sta_connected_t _wifi_event_sta_connected; static WiFiDisconnectReason _wifi_disconnect_reason = WiFiDisconnectReason::WIFI_DISCONNECT_REASON_UNSPECIFIED; @@ -56,7 +56,7 @@ ESPEasyWiFi_STA_EventHandler::~ESPEasyWiFi_STA_EventHandler() } nw_event_id = 0; _ESPEasyWiFi_STA_EventHandler_initialized = false; - stats_and_cache.clear(); + stats_and_cache.processEvent_and_clear(); } bool ESPEasyWiFi_STA_EventHandler::initialized() { diff --git a/src/ESPEasy/net/wifi/ESPEasyWiFi_STA_Event_ESP8266.cpp b/src/ESPEasy/net/wifi/ESPEasyWiFi_STA_Event_ESP8266.cpp index 0ab349e16..fbd25675f 100644 --- a/src/ESPEasy/net/wifi/ESPEasyWiFi_STA_Event_ESP8266.cpp +++ b/src/ESPEasy/net/wifi/ESPEasyWiFi_STA_Event_ESP8266.cpp @@ -24,7 +24,7 @@ namespace ESPEasy { namespace net { namespace wifi { -static NWPluginData_static_runtime stats_and_cache(true); +static NWPluginData_static_runtime stats_and_cache(true, F("WiFi")); static WiFiDisconnectReason _wifi_disconnect_reason = WiFiDisconnectReason::WIFI_DISCONNECT_REASON_UNSPECIFIED; static uint8_t _authmode{}; @@ -51,7 +51,7 @@ ESPEasyWiFi_STA_EventHandler::ESPEasyWiFi_STA_EventHandler(networkIndex_t networ ESPEasyWiFi_STA_EventHandler::~ESPEasyWiFi_STA_EventHandler() { - stats_and_cache.clear(); + stats_and_cache.processEvent_and_clear(); } bool ESPEasyWiFi_STA_EventHandler::initialized() { diff --git a/src/src/DataStructs/TimingStats.cpp b/src/src/DataStructs/TimingStats.cpp index 9a5e985e7..b8748bccf 100644 --- a/src/src/DataStructs/TimingStats.cpp +++ b/src/src/DataStructs/TimingStats.cpp @@ -228,6 +228,7 @@ const __FlashStringHelper* getMiscStatsName_F(TimingStatsElements stat) { case TimingStatsElements::CPLUGIN_CALL_10PS: return F("CPlugin call 10 p/s"); case TimingStatsElements::NWPLUGIN_CALL_50PS: return F("NWPlugin call 50 p/s"); case TimingStatsElements::NWPLUGIN_CALL_10PS: return F("NWPlugin call 10 p/s"); + case TimingStatsElements::NWPLUGIN_PROCESS_NETWORK_EVENTS: return F("NWPlugin process events"); case TimingStatsElements::SENSOR_SEND_TASK: return F("SensorSendTask()"); case TimingStatsElements::COMMAND_EXEC_INTERNAL: return F("Exec Internal Command"); case TimingStatsElements::COMMAND_DECODE_INTERNAL: return F("Decode Internal Command"); diff --git a/src/src/DataStructs/TimingStats.h b/src/src/DataStructs/TimingStats.h index 3ff6101e7..39cacfd03 100644 --- a/src/src/DataStructs/TimingStats.h +++ b/src/src/DataStructs/TimingStats.h @@ -68,6 +68,7 @@ enum class TimingStatsElements { CPLUGIN_CALL_50PS, NWPLUGIN_CALL_10PS, NWPLUGIN_CALL_50PS, + NWPLUGIN_PROCESS_NETWORK_EVENTS, SENSOR_SEND_TASK, SEND_DATA_STATS, COMPUTE_FORMULA_STATS, diff --git a/src/src/ESPEasyCore/ESPEasy_loop.cpp b/src/src/ESPEasyCore/ESPEasy_loop.cpp index fd229354c..6dffd43b0 100644 --- a/src/src/ESPEasyCore/ESPEasy_loop.cpp +++ b/src/src/ESPEasyCore/ESPEasy_loop.cpp @@ -107,7 +107,7 @@ void ESPEasy_loop() } setWebserverRunning(ESPEasy::net::NWPluginCall(NWPlugin::Function::NWPLUGIN_WEBSERVER_SHOULD_RUN)); - + // ESPEasy::net::processNetworkEvents(); #if FEATURE_CLEAR_I2C_STUCK if (Settings.EnableClearHangingI2Cbus()) diff --git a/src/src/Helpers/LongTermOnOffTimer.cpp b/src/src/Helpers/LongTermOnOffTimer.cpp index f71de5044..2605d0706 100644 --- a/src/src/Helpers/LongTermOnOffTimer.cpp +++ b/src/src/Helpers/LongTermOnOffTimer.cpp @@ -5,12 +5,14 @@ void LongTermOnOffTimer::clear() _onTimer.clear(); _offTimer.clear(); _prevDuration = 0; + _changedSinceLastCheck = false; resetCount(); } bool LongTermOnOffTimer::setOn() { if (isOn()) { return false; } + _changedSinceLastCheck = true; ++_changeToOnCount; if (isOff()) { @@ -23,6 +25,7 @@ bool LongTermOnOffTimer::setOn() bool LongTermOnOffTimer::setOff() { if (isOff()) { return false; } + _changedSinceLastCheck = true; ++_changeToOffCount; if (isOn()) { diff --git a/src/src/Helpers/LongTermOnOffTimer.h b/src/src/Helpers/LongTermOnOffTimer.h index 1261fa6b6..afe892ea4 100644 --- a/src/src/Helpers/LongTermOnOffTimer.h +++ b/src/src/Helpers/LongTermOnOffTimer.h @@ -42,6 +42,17 @@ public: size_t getChangeToOffCount() const { return _changeToOffCount; } + bool changedSinceLastCheck() const { return _changedSinceLastCheck; } + + bool changedSinceLastCheck_and_clear() + { + if (_changedSinceLastCheck) { + _changedSinceLastCheck = false; + return true; + } + return false; + } + private: LongTermTimer _onTimer; @@ -51,4 +62,6 @@ private: size_t _changeToOnCount{}; size_t _changeToOffCount{}; + bool _changedSinceLastCheck{}; + }; // class LongTermOnOffTimer diff --git a/src/src/Helpers/PeriodicalActions.cpp b/src/src/Helpers/PeriodicalActions.cpp index cf08e1f58..653721827 100644 --- a/src/src/Helpers/PeriodicalActions.cpp +++ b/src/src/Helpers/PeriodicalActions.cpp @@ -74,6 +74,9 @@ void run50TimesPerSecond() { ESPEasy::net::NWPluginCall(NWPlugin::Function::NWPLUGIN_FIFTY_PER_SECOND, 0, dummy); STOP_TIMER(NWPLUGIN_CALL_50PS); } + { + ESPEasy::net::processNetworkEvents(); + } { START_TIMER; PluginCall(PLUGIN_FIFTY_PER_SECOND, 0, dummy); From d253f0a1795ab3084d01764031620c7accc28170 Mon Sep 17 00:00:00 2001 From: Ton Huisman Date: Mon, 25 Aug 2025 12:40:23 +0200 Subject: [PATCH 214/564] [MQTT] Move Settings attribute to next available bit --- src/src/DataStructs/SettingsStruct.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/src/DataStructs/SettingsStruct.h b/src/src/DataStructs/SettingsStruct.h index d6ede2c24..1185d3573 100644 --- a/src/src/DataStructs/SettingsStruct.h +++ b/src/src/DataStructs/SettingsStruct.h @@ -592,10 +592,10 @@ public: uint32_t ShowUnitOfMeasureOnDevicesPage : 1; // Bit 07 // inverted uint32_t unused_08 : 1; // Bit 08 uint32_t unused_09 : 1; // Bit 09 - uint32_t MQTTConnectInBackground : 1; // Bit 10 // inverted + uint32_t unused_10 : 1; // Bit 10 uint32_t unused_11 : 1; // Bit 11 uint32_t unused_12 : 1; // Bit 12 - uint32_t unused_13 : 1; // Bit 13 + uint32_t MQTTConnectInBackground : 1; // Bit 13 // inverted uint32_t unused_14 : 1; // Bit 14 uint32_t unused_15 : 1; // Bit 15 uint32_t unused_16 : 1; // Bit 16 From 5f3827481e28e8768daafaadeff4ef4ede702076 Mon Sep 17 00:00:00 2001 From: Gijs Noorlander Date: Tue, 26 Aug 2025 10:40:40 +0600 Subject: [PATCH 215/564] [network] Reduce CPU load + fix init NW interface event names --- .../net/DataStructs/NWPluginData_static_runtime.cpp | 6 ++++++ src/ESPEasy/net/DataStructs/NWPluginData_static_runtime.h | 7 +------ src/ESPEasy/net/ESPEasyNetwork_ESP32.cpp | 1 + src/ESPEasy/net/ESPEasyNetwork_ESP8266.cpp | 4 +++- src/ESPEasy/net/wifi/ESPEasyWiFi_state_machine.cpp | 8 +++++++- src/src/DataStructs/SettingsStruct.h | 2 +- src/src/ESPEasyCore/ESPEasy_loop.cpp | 2 +- src/src/WebServer/ESPEasy_WebServer.cpp | 1 + 8 files changed, 21 insertions(+), 10 deletions(-) diff --git a/src/ESPEasy/net/DataStructs/NWPluginData_static_runtime.cpp b/src/ESPEasy/net/DataStructs/NWPluginData_static_runtime.cpp index 3fec10564..db05cc5ff 100644 --- a/src/ESPEasy/net/DataStructs/NWPluginData_static_runtime.cpp +++ b/src/ESPEasy/net/DataStructs/NWPluginData_static_runtime.cpp @@ -22,6 +22,12 @@ void NWPluginData_static_runtime::clear(networkIndex_t networkIndex) _networkIndex = networkIndex; #ifdef ESP32 _route_prio = Settings.getRoutePrio_for_network(_networkIndex); + if (_netif) { + if (_eventInterfaceName.length() == 0 && _netif) { + _eventInterfaceName = _netif->desc(); + _eventInterfaceName.toUpperCase(); + } + } #endif _connectionFailures = 0; diff --git a/src/ESPEasy/net/DataStructs/NWPluginData_static_runtime.h b/src/ESPEasy/net/DataStructs/NWPluginData_static_runtime.h index 14f1fc9cc..aae97b474 100644 --- a/src/ESPEasy/net/DataStructs/NWPluginData_static_runtime.h +++ b/src/ESPEasy/net/DataStructs/NWPluginData_static_runtime.h @@ -20,12 +20,7 @@ struct NWPluginData_static_runtime { #ifdef ESP32 NWPluginData_static_runtime(NetworkInterface *netif, const String& eventInterfaceName = EMPTY_STRING) : _netif(netif), _eventInterfaceName(eventInterfaceName) - { - if (_eventInterfaceName.length() == 0 && _netif) { - _eventInterfaceName = _netif->desc(); - _eventInterfaceName.toUpperCase(); - } - } + {} #else // ifdef ESP32 NWPluginData_static_runtime(bool isSTA, String& eventInterfaceName) diff --git a/src/ESPEasy/net/ESPEasyNetwork_ESP32.cpp b/src/ESPEasy/net/ESPEasyNetwork_ESP32.cpp index 0db812248..5465e5476 100644 --- a/src/ESPEasy/net/ESPEasyNetwork_ESP32.cpp +++ b/src/ESPEasy/net/ESPEasyNetwork_ESP32.cpp @@ -131,6 +131,7 @@ bool NetworkConnected() { if (network_if == nullptr) { return false; } + processNetworkEvents(); return network_if->connected(); } diff --git a/src/ESPEasy/net/ESPEasyNetwork_ESP8266.cpp b/src/ESPEasy/net/ESPEasyNetwork_ESP8266.cpp index b1eab19b9..e8f5ced3b 100644 --- a/src/ESPEasy/net/ESPEasyNetwork_ESP8266.cpp +++ b/src/ESPEasy/net/ESPEasyNetwork_ESP8266.cpp @@ -54,7 +54,9 @@ void setNetworkMedium(NetworkMedium_t new_medium) { // ESPEasy::net::wifi::WiFiConnectRelaxed(); // } -bool NetworkConnected() { return ESPEasy::net::wifi::WiFiConnected(); } +bool NetworkConnected() { + processNetworkEvents(); + return ESPEasy::net::wifi::WiFiConnected(); } IPAddress NetworkLocalIP() { return WiFi.localIP(); } diff --git a/src/ESPEasy/net/wifi/ESPEasyWiFi_state_machine.cpp b/src/ESPEasy/net/wifi/ESPEasyWiFi_state_machine.cpp index 2ad152089..6b05ffd13 100644 --- a/src/ESPEasy/net/wifi/ESPEasyWiFi_state_machine.cpp +++ b/src/ESPEasy/net/wifi/ESPEasyWiFi_state_machine.cpp @@ -249,12 +249,15 @@ void ESPEasyWiFi_t::loop() // Check if still connected if (getSTA_connected_state() != STA_connected_state::Connected) { - setState(WiFiState_e::WiFiOFF); +// setState(WiFiState_e::WiFiOFF); + setState(WiFiState_e::Disabled); + /* if (Settings.UseRules) { eventQueue.add(F("WiFi#Disconnected")); } statusLED(false); + */ } else { // Else mark last timestamp seen as connected @@ -316,6 +319,7 @@ void ESPEasyWiFi_t::setState(WiFiState_e newState, uint32_t timeout) { { case WiFiState_e::Disabled: // Do nothing here, as the device is disabled. + setSTA(false); break; case WiFiState_e::WiFiOFF: // TODO TD-er: Must cancel all and turn off WiFi. @@ -355,11 +359,13 @@ void ESPEasyWiFi_t::setState(WiFiState_e newState, uint32_t timeout) { # endif // ifdef ESP32 _last_seen_connected.setNow(); _state_timeout.clear(); + /* if (Settings.UseRules) { eventQueue.add(F("WiFi#Connected")); } statusLED(true); + */ break; } diff --git a/src/src/DataStructs/SettingsStruct.h b/src/src/DataStructs/SettingsStruct.h index fa46ca9ac..10d6d8adc 100644 --- a/src/src/DataStructs/SettingsStruct.h +++ b/src/src/DataStructs/SettingsStruct.h @@ -655,7 +655,7 @@ public: uint32_t WiFi_AP_enable_NAPT : 1; // Bit 10 // inverted uint32_t unused_11 : 1; // Bit 11 uint32_t unused_12 : 1; // Bit 12 - uint32_t unused_13 : 1; // Bit 13 + uint32_t MQTTConnectInBackground : 1; // Bit 13 // inverted uint32_t unused_14 : 1; // Bit 14 uint32_t unused_15 : 1; // Bit 15 uint32_t unused_16 : 1; // Bit 16 diff --git a/src/src/ESPEasyCore/ESPEasy_loop.cpp b/src/src/ESPEasyCore/ESPEasy_loop.cpp index 6dffd43b0..d1c1aa5e5 100644 --- a/src/src/ESPEasyCore/ESPEasy_loop.cpp +++ b/src/src/ESPEasyCore/ESPEasy_loop.cpp @@ -77,7 +77,7 @@ void ESPEasy_loop() ESPEasy::net::wifi::handle_unprocessedNetworkEvents(); - bool firstLoopConnectionsEstablished = ESPEasy::net::NetworkConnected() && firstLoop; + bool firstLoopConnectionsEstablished = firstLoop && ESPEasy::net::NetworkConnected(); if (firstLoopConnectionsEstablished) { #ifndef LIMIT_BUILD_SIZE diff --git a/src/src/WebServer/ESPEasy_WebServer.cpp b/src/src/WebServer/ESPEasy_WebServer.cpp index 757606d85..ea0aeaa6b 100644 --- a/src/src/WebServer/ESPEasy_WebServer.cpp +++ b/src/src/WebServer/ESPEasy_WebServer.cpp @@ -389,6 +389,7 @@ void setWebserverRunning(bool state) { if (webserverRunning == state) { return; } + ESPEasy::net::processNetworkEvents(); if (state) { WebServerInit(); From 5105053589a33210129d3b6fbac06272b84876f4 Mon Sep 17 00:00:00 2001 From: Gijs Noorlander Date: Tue, 26 Aug 2025 11:33:25 +0600 Subject: [PATCH 216/564] [MQTT] Fix merge issues --- src/src/Helpers/Misc.cpp | 2 +- src/src/Helpers/_CPlugin_Helper.cpp | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/src/Helpers/Misc.cpp b/src/src/Helpers/Misc.cpp index 3ee7cd004..3fd4e972c 100644 --- a/src/src/Helpers/Misc.cpp +++ b/src/src/Helpers/Misc.cpp @@ -127,7 +127,7 @@ bool setControllerEnableStatus(controllerIndex_t controllerIndex, bool enabled) String dummy; const CPlugin::Function cfunction = enabled ? CPlugin::Function::CPLUGIN_INIT : CPlugin::Function::CPLUGIN_EXIT; - return CPluginCall(ProtocolIndex, cfunction, &TempEvent, dummy) || CPlugin::Function::CPLUGIN_EXIT == cfunction; + return do_CPluginCall(ProtocolIndex, cfunction, &TempEvent, dummy) || CPlugin::Function::CPLUGIN_EXIT == cfunction; } } return false; diff --git a/src/src/Helpers/_CPlugin_Helper.cpp b/src/src/Helpers/_CPlugin_Helper.cpp index 5ac3f2a33..cfcb14321 100644 --- a/src/src/Helpers/_CPlugin_Helper.cpp +++ b/src/src/Helpers/_CPlugin_Helper.cpp @@ -108,7 +108,7 @@ bool count_connection_results(bool success, const __FlashStringHelper *prefix, c data->markConnectionFailed(cpluginID); addLogMove(LOG_LEVEL_ERROR, strformat(F("%s%s connection failed (%d/%d)"), - prefix, + FsP(prefix), get_formatted_Controller_number(cpluginID).c_str(), data->getConnectionFailures(), Settings.ConnectionFailuresThreshold)); From 92648a260e3c7895c5e708446aa9cecf5519a685 Mon Sep 17 00:00:00 2001 From: Ton Huisman Date: Tue, 26 Aug 2025 11:17:59 +0200 Subject: [PATCH 217/564] [MQTT] Reconnect on unexpected network interruptions --- src/src/ESPEasyCore/Controller.cpp | 17 +++++++++++++++-- 1 file changed, 15 insertions(+), 2 deletions(-) diff --git a/src/src/ESPEasyCore/Controller.cpp b/src/src/ESPEasyCore/Controller.cpp index 18bc87562..bab18a621 100644 --- a/src/src/ESPEasyCore/Controller.cpp +++ b/src/src/ESPEasyCore/Controller.cpp @@ -673,6 +673,8 @@ void MQTT_execute_connect_task(void *parameter) } bool MQTTConnectInBackground(controllerIndex_t controller_idx, bool reportOnly) { + if (!Settings.MQTTConnectInBackground()) { return false; } + if ((MQTT_task_data.status == MQTT_connect_status_e::Connected) || (MQTT_task_data.status == MQTT_connect_status_e::Failure)) { if (loglevelActiveFor(LOG_LEVEL_INFO)) { addLog(LOG_LEVEL_INFO, strformat(F("MQTT : Background Connect request %s, took %d msec"), @@ -684,7 +686,7 @@ bool MQTTConnectInBackground(controllerIndex_t controller_idx, bool reportOnly) return MQTT_task_data.result; } - if (MQTT_task_data.status == MQTT_connect_status_e::Ready) { + if ((MQTT_task_data.status == MQTT_connect_status_e::Ready) && MQTTclient.connected()) { if (!MQTT_task_data.logged && loglevelActiveFor(LOG_LEVEL_INFO)) { addLog(LOG_LEVEL_INFO, F("MQTT : Background Connect request Ready")); } @@ -704,7 +706,18 @@ bool MQTTConnectInBackground(controllerIndex_t controller_idx, bool reportOnly) return false; // Not ready yet } - if (!reportOnly && (MQTT_task_data.status == MQTT_connect_status_e::Disconnected)) { + if ((MQTT_task_data.status == MQTT_connect_status_e::Ready) && + MQTTclient_should_reconnect && + !MQTTclient.connected() && + NetworkConnected(10)) { // Unexpected network disconnect and reconnect? + MQTT_task_data.status = MQTT_connect_status_e::Disconnected; + reportOnly = false; // Reconnect ASAP + if (CONTROLLER_MAX == controller_idx) { + controller_idx = firstEnabledMQTT_ControllerIndex(); + } + } + + if (!reportOnly && (MQTT_task_data.status == MQTT_connect_status_e::Disconnected) && (controller_idx < CONTROLLER_MAX)) { if (loglevelActiveFor(LOG_LEVEL_INFO)) { addLog(LOG_LEVEL_INFO, strformat(F("MQTT : Start background connect for controller %d"), controller_idx + 1)); } From 7dbed4c1f1ae76a5aa6b6a015bb8d61ebce1c262 Mon Sep 17 00:00:00 2001 From: Ton Huisman Date: Tue, 26 Aug 2025 11:17:59 +0200 Subject: [PATCH 218/564] [MQTT] Reconnect on unexpected network interruptions --- src/src/ESPEasyCore/Controller.cpp | 17 +++++++++++++++-- 1 file changed, 15 insertions(+), 2 deletions(-) diff --git a/src/src/ESPEasyCore/Controller.cpp b/src/src/ESPEasyCore/Controller.cpp index 2671b5e3d..07ef3c571 100644 --- a/src/src/ESPEasyCore/Controller.cpp +++ b/src/src/ESPEasyCore/Controller.cpp @@ -673,6 +673,8 @@ void MQTT_execute_connect_task(void *parameter) } bool MQTTConnectInBackground(controllerIndex_t controller_idx, bool reportOnly) { + if (!Settings.MQTTConnectInBackground()) { return false; } + if ((MQTT_task_data.status == MQTT_connect_status_e::Connected) || (MQTT_task_data.status == MQTT_connect_status_e::Failure)) { if (loglevelActiveFor(LOG_LEVEL_INFO)) { addLog(LOG_LEVEL_INFO, strformat(F("MQTT : Background Connect request %s, took %d msec"), @@ -684,7 +686,7 @@ bool MQTTConnectInBackground(controllerIndex_t controller_idx, bool reportOnly) return MQTT_task_data.result; } - if (MQTT_task_data.status == MQTT_connect_status_e::Ready) { + if ((MQTT_task_data.status == MQTT_connect_status_e::Ready) && MQTTclient.connected()) { if (!MQTT_task_data.logged && loglevelActiveFor(LOG_LEVEL_INFO)) { addLog(LOG_LEVEL_INFO, F("MQTT : Background Connect request Ready")); } @@ -704,7 +706,18 @@ bool MQTTConnectInBackground(controllerIndex_t controller_idx, bool reportOnly) return false; // Not ready yet } - if (!reportOnly && (MQTT_task_data.status == MQTT_connect_status_e::Disconnected)) { + if ((MQTT_task_data.status == MQTT_connect_status_e::Ready) && + MQTTclient_should_reconnect && + !MQTTclient.connected() && + NetworkConnected(10)) { // Unexpected network disconnect and reconnect? + MQTT_task_data.status = MQTT_connect_status_e::Disconnected; + reportOnly = false; // Reconnect ASAP + if (CONTROLLER_MAX == controller_idx) { + controller_idx = firstEnabledMQTT_ControllerIndex(); + } + } + + if (!reportOnly && (MQTT_task_data.status == MQTT_connect_status_e::Disconnected) && (controller_idx < CONTROLLER_MAX)) { if (loglevelActiveFor(LOG_LEVEL_INFO)) { addLog(LOG_LEVEL_INFO, strformat(F("MQTT : Start background connect for controller %d"), controller_idx + 1)); } From 585faf7235dad9894d0eb5724f4e6baaaa5a9137 Mon Sep 17 00:00:00 2001 From: Ton Huisman Date: Tue, 26 Aug 2025 14:51:13 +0200 Subject: [PATCH 219/564] [MQTT] Cancel background connection request after 2 minutes when still not connected --- src/src/ESPEasyCore/Controller.cpp | 3 +++ 1 file changed, 3 insertions(+) diff --git a/src/src/ESPEasyCore/Controller.cpp b/src/src/ESPEasyCore/Controller.cpp index bab18a621..e3f602339 100644 --- a/src/src/ESPEasyCore/Controller.cpp +++ b/src/src/ESPEasyCore/Controller.cpp @@ -662,6 +662,9 @@ void MQTT_execute_connect_task(void *parameter) && !MQTTclient.connected() ) { delay(1); + if (timePassedSince(MQTT_task_data->startTime) > 120000) { // Quit after 120 seconds + break; + } } MQTT_task_data->result = MQTTclient.connected(); MQTT_task_data->status = MQTT_task_data->result From 6043fbbed621dfde71806964aac4bfad51902f12 Mon Sep 17 00:00:00 2001 From: Ton Huisman Date: Wed, 27 Aug 2025 13:00:58 +0200 Subject: [PATCH 220/564] [MQTT] Fix reconnect on unexpected network interruptions --- src/src/ESPEasyCore/Controller.cpp | 1 - 1 file changed, 1 deletion(-) diff --git a/src/src/ESPEasyCore/Controller.cpp b/src/src/ESPEasyCore/Controller.cpp index e3f602339..bf50a8697 100644 --- a/src/src/ESPEasyCore/Controller.cpp +++ b/src/src/ESPEasyCore/Controller.cpp @@ -710,7 +710,6 @@ bool MQTTConnectInBackground(controllerIndex_t controller_idx, bool reportOnly) } if ((MQTT_task_data.status == MQTT_connect_status_e::Ready) && - MQTTclient_should_reconnect && !MQTTclient.connected() && NetworkConnected(10)) { // Unexpected network disconnect and reconnect? MQTT_task_data.status = MQTT_connect_status_e::Disconnected; From efb94d32a2fc51a1e014c66c05e3fbb6199e6fe0 Mon Sep 17 00:00:00 2001 From: Ton Huisman Date: Wed, 27 Aug 2025 13:01:56 +0200 Subject: [PATCH 221/564] [Discovery] Avoid setting the timeout more than once --- src/_C005.cpp | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/src/_C005.cpp b/src/_C005.cpp index 65a7e89a6..1b38e987c 100644 --- a/src/_C005.cpp +++ b/src/_C005.cpp @@ -87,9 +87,8 @@ bool CPlugin_005(CPlugin::Function function, struct EventStruct *event, String& LoadControllerSettings(event->ControllerIndex, *ControllerSettings); if (ControllerSettings->mqtt_autoDiscovery() && - - // (ControllerSettings->MqttAutoDiscoveryTrigger[0] != 0) && - (ControllerSettings->MqttAutoDiscoveryTopic[0] != 0)) { + (ControllerSettings->MqttAutoDiscoveryTopic[0] != 0) && + (0 == mqttDiscoveryTimeout)) { mqttDiscoveryController = event->ControllerIndex; mqttDiscoveryTimeout = random(10, MQTT_DISCOVERY_MAX_DELAY_0_1_SECONDS); From 28048dc2dce6e7da69d41accac36c73abe883acd Mon Sep 17 00:00:00 2001 From: Ton Huisman Date: Fri, 29 Aug 2025 21:18:53 +0200 Subject: [PATCH 222/564] [MQTT] Use client timeout for delay between connection attempts --- src/src/ESPEasyCore/Controller.cpp | 23 ++++++++++++++++++++++- 1 file changed, 22 insertions(+), 1 deletion(-) diff --git a/src/src/ESPEasyCore/Controller.cpp b/src/src/ESPEasyCore/Controller.cpp index bf50a8697..d4f089354 100644 --- a/src/src/ESPEasyCore/Controller.cpp +++ b/src/src/ESPEasyCore/Controller.cpp @@ -655,13 +655,34 @@ void MQTT_execute_connect_task(void *parameter) { MQTT_connect_request*MQTT_task_data = static_cast(parameter); + MakeControllerSettings(ControllerSettings); // -V522 + + if (!AllocatedControllerSettings()) { + #ifndef BUILD_MINIMAL_OTA + addLog(LOG_LEVEL_ERROR, F("MQTT : Cannot load Controller settings, out of RAM")); + #endif + MQTT_task_data->taskHandle = NULL; + vTaskDelete(MQTT_task_data->taskHandle); + return; + } + LoadControllerSettings(MQTT_task_data->ControllerIndex, *ControllerSettings); + + uint32_t timeout = ControllerSettings->MustCheckReply + ? WiFiEventData.getSuggestedTimeout(Settings.Protocol[MQTT_task_data->ControllerIndex], ControllerSettings->ClientTimeout) + : ControllerSettings->ClientTimeout; + uint8_t incr = 5; // Increment timeout between connection attempts 5 times by 100 msec + while (!MQTTConnect(MQTT_task_data->ControllerIndex) # if FEATURE_MQTT_TLS && mqtt_tls_last_errorstr.isEmpty() # endif // if FEATURE_MQTT_TLS && !MQTTclient.connected() ) { - delay(1); + delay(timeout); // Use regular controller timeout also for delay between connection attempts (range 10..4000) + if (incr > 0) { + timeout += 100; // Increment next few (5) times with 100 msec + incr--; + } if (timePassedSince(MQTT_task_data->startTime) > 120000) { // Quit after 120 seconds break; } From dda9ac4dc3c5d78cad03c4831af75902afff44f7 Mon Sep 17 00:00:00 2001 From: Ton Huisman Date: Tue, 26 Aug 2025 14:51:13 +0200 Subject: [PATCH 223/564] [MQTT] Cancel background connection request after 2 minutes when still not connected --- src/src/ESPEasyCore/Controller.cpp | 3 +++ 1 file changed, 3 insertions(+) diff --git a/src/src/ESPEasyCore/Controller.cpp b/src/src/ESPEasyCore/Controller.cpp index 07ef3c571..8af603c50 100644 --- a/src/src/ESPEasyCore/Controller.cpp +++ b/src/src/ESPEasyCore/Controller.cpp @@ -662,6 +662,9 @@ void MQTT_execute_connect_task(void *parameter) && !MQTTclient.connected() ) { delay(1); + if (timePassedSince(MQTT_task_data->startTime) > 120000) { // Quit after 120 seconds + break; + } } MQTT_task_data->result = MQTTclient.connected(); MQTT_task_data->status = MQTT_task_data->result From e4bfdef173a1b26856a2227356ee01d38f828af2 Mon Sep 17 00:00:00 2001 From: Ton Huisman Date: Wed, 27 Aug 2025 13:00:58 +0200 Subject: [PATCH 224/564] [MQTT] Fix reconnect on unexpected network interruptions --- src/src/ESPEasyCore/Controller.cpp | 1 - 1 file changed, 1 deletion(-) diff --git a/src/src/ESPEasyCore/Controller.cpp b/src/src/ESPEasyCore/Controller.cpp index 8af603c50..88fe2b483 100644 --- a/src/src/ESPEasyCore/Controller.cpp +++ b/src/src/ESPEasyCore/Controller.cpp @@ -710,7 +710,6 @@ bool MQTTConnectInBackground(controllerIndex_t controller_idx, bool reportOnly) } if ((MQTT_task_data.status == MQTT_connect_status_e::Ready) && - MQTTclient_should_reconnect && !MQTTclient.connected() && NetworkConnected(10)) { // Unexpected network disconnect and reconnect? MQTT_task_data.status = MQTT_connect_status_e::Disconnected; From 559c2bb0f55afd8a380a269fc05677feb35b4fa6 Mon Sep 17 00:00:00 2001 From: Ton Huisman Date: Wed, 27 Aug 2025 13:01:56 +0200 Subject: [PATCH 225/564] [Discovery] Avoid setting the timeout more than once --- src/_C005.cpp | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/src/_C005.cpp b/src/_C005.cpp index 65a7e89a6..1b38e987c 100644 --- a/src/_C005.cpp +++ b/src/_C005.cpp @@ -87,9 +87,8 @@ bool CPlugin_005(CPlugin::Function function, struct EventStruct *event, String& LoadControllerSettings(event->ControllerIndex, *ControllerSettings); if (ControllerSettings->mqtt_autoDiscovery() && - - // (ControllerSettings->MqttAutoDiscoveryTrigger[0] != 0) && - (ControllerSettings->MqttAutoDiscoveryTopic[0] != 0)) { + (ControllerSettings->MqttAutoDiscoveryTopic[0] != 0) && + (0 == mqttDiscoveryTimeout)) { mqttDiscoveryController = event->ControllerIndex; mqttDiscoveryTimeout = random(10, MQTT_DISCOVERY_MAX_DELAY_0_1_SECONDS); From bdd4b75e8c793fd555356c70d2fdd811d927a329 Mon Sep 17 00:00:00 2001 From: Ton Huisman Date: Fri, 29 Aug 2025 21:18:53 +0200 Subject: [PATCH 226/564] [MQTT] Use client timeout for delay between connection attempts --- src/src/ESPEasyCore/Controller.cpp | 23 ++++++++++++++++++++++- 1 file changed, 22 insertions(+), 1 deletion(-) diff --git a/src/src/ESPEasyCore/Controller.cpp b/src/src/ESPEasyCore/Controller.cpp index 88fe2b483..4f8a8f047 100644 --- a/src/src/ESPEasyCore/Controller.cpp +++ b/src/src/ESPEasyCore/Controller.cpp @@ -655,13 +655,34 @@ void MQTT_execute_connect_task(void *parameter) { MQTT_connect_request*MQTT_task_data = static_cast(parameter); + MakeControllerSettings(ControllerSettings); // -V522 + + if (!AllocatedControllerSettings()) { + #ifndef BUILD_MINIMAL_OTA + addLog(LOG_LEVEL_ERROR, F("MQTT : Cannot load Controller settings, out of RAM")); + #endif + MQTT_task_data->taskHandle = NULL; + vTaskDelete(MQTT_task_data->taskHandle); + return; + } + LoadControllerSettings(MQTT_task_data->ControllerIndex, *ControllerSettings); + + uint32_t timeout = ControllerSettings->MustCheckReply + ? WiFiEventData.getSuggestedTimeout(Settings.Protocol[MQTT_task_data->ControllerIndex], ControllerSettings->ClientTimeout) + : ControllerSettings->ClientTimeout; + uint8_t incr = 5; // Increment timeout between connection attempts 5 times by 100 msec + while (!MQTTConnect(MQTT_task_data->ControllerIndex) # if FEATURE_MQTT_TLS && mqtt_tls_last_errorstr.isEmpty() # endif // if FEATURE_MQTT_TLS && !MQTTclient.connected() ) { - delay(1); + delay(timeout); // Use regular controller timeout also for delay between connection attempts (range 10..4000) + if (incr > 0) { + timeout += 100; // Increment next few (5) times with 100 msec + incr--; + } if (timePassedSince(MQTT_task_data->startTime) > 120000) { // Quit after 120 seconds break; } From 4c9c3c13124e36b8604345b21777c3842c7955ef Mon Sep 17 00:00:00 2001 From: TD-er Date: Sun, 31 Aug 2025 07:57:19 +0200 Subject: [PATCH 227/564] [Network] Fix ESP8266 build --- .../DataStructs/NWPluginData_static_runtime.h | 10 ++-- .../NWPluginData_static_runtime_ESP32.cpp | 52 +++++++++++-------- .../NWPluginData_static_runtime_ESP8266.cpp | 43 ++++++++------- .../NW002_data_struct_WiFi_AP.cpp | 2 +- .../wifi/ESPEasyWiFi_STA_Event_ESP8266.cpp | 2 +- 5 files changed, 60 insertions(+), 49 deletions(-) diff --git a/src/ESPEasy/net/DataStructs/NWPluginData_static_runtime.h b/src/ESPEasy/net/DataStructs/NWPluginData_static_runtime.h index aae97b474..d10af1224 100644 --- a/src/ESPEasy/net/DataStructs/NWPluginData_static_runtime.h +++ b/src/ESPEasy/net/DataStructs/NWPluginData_static_runtime.h @@ -18,13 +18,11 @@ namespace net { struct NWPluginData_static_runtime { #ifdef ESP32 - NWPluginData_static_runtime(NetworkInterface *netif, const String& eventInterfaceName = EMPTY_STRING) - : _netif(netif), _eventInterfaceName(eventInterfaceName) - {} - + NWPluginData_static_runtime(NetworkInterface *netif, + const String & eventInterfaceName = EMPTY_STRING); #else // ifdef ESP32 - NWPluginData_static_runtime(bool isSTA, String& eventInterfaceName) - : _isSTA(isSTA), _eventInterfaceName(eventInterfaceName) {} + NWPluginData_static_runtime(bool isSTA, + const char * eventInterfaceName); #endif // ifdef ESP32 diff --git a/src/ESPEasy/net/DataStructs/NWPluginData_static_runtime_ESP32.cpp b/src/ESPEasy/net/DataStructs/NWPluginData_static_runtime_ESP32.cpp index 479edf1ce..226eec3f2 100644 --- a/src/ESPEasy/net/DataStructs/NWPluginData_static_runtime_ESP32.cpp +++ b/src/ESPEasy/net/DataStructs/NWPluginData_static_runtime_ESP32.cpp @@ -9,11 +9,15 @@ # include # include -#define NW_PLUGIN_LOG_EVENTS false +# define NW_PLUGIN_LOG_EVENTS false namespace ESPEasy { namespace net { +NWPluginData_static_runtime::NWPluginData_static_runtime(NetworkInterface *netif, const String& eventInterfaceName) + : _netif(netif), _eventInterfaceName(eventInterfaceName) +{} + bool NWPluginData_static_runtime::started() const { if (!_netif) { return false; } @@ -59,25 +63,27 @@ void NWPluginData_static_runtime::mark_start() _netif->setRoutePrio(_route_prio); } # endif // if ESP_IDF_VERSION >= ESP_IDF_VERSION_VAL(5, 5, 0) -#if NW_PLUGIN_LOG_EVENTS +# if NW_PLUGIN_LOG_EVENTS + if (loglevelActiveFor(LOG_LEVEL_INFO)) { addLog(LOG_LEVEL_INFO, strformat( F("%s: Started"), _netif->desc())); } -#endif +# endif // if NW_PLUGIN_LOG_EVENTS } void NWPluginData_static_runtime::mark_stop() { _startStopStats.setOff(); -#if NW_PLUGIN_LOG_EVENTS +# if NW_PLUGIN_LOG_EVENTS + if (_netif && loglevelActiveFor(LOG_LEVEL_INFO)) { addLog(LOG_LEVEL_INFO, strformat( F("%s: Stopped"), _netif->desc())); } -#endif +# endif // if NW_PLUGIN_LOG_EVENTS } void NWPluginData_static_runtime::mark_got_IP() @@ -95,7 +101,8 @@ void NWPluginData_static_runtime::mark_got_IP() auto tmp = _netif->dnsIP(i); _dns_cache[i] = tmp; // Also set the 'empty' ones so we won't set left-over DNS server from when another interface was active. -#if NW_PLUGIN_LOG_EVENTS +# if NW_PLUGIN_LOG_EVENTS + if ((tmp != INADDR_NONE) && loglevelActiveFor(LOG_LEVEL_INFO)) { addLog(LOG_LEVEL_INFO, strformat( F("%s: DNS Cache %d set to %s"), @@ -103,9 +110,10 @@ void NWPluginData_static_runtime::mark_got_IP() i, tmp.toString(true).c_str())); } -#endif +# endif // if NW_PLUGIN_LOG_EVENTS } -#if NW_PLUGIN_LOG_EVENTS +# if NW_PLUGIN_LOG_EVENTS + if (loglevelActiveFor(LOG_LEVEL_INFO)) { addLog(LOG_LEVEL_INFO, strformat( F("%s: Got IP: %s"), @@ -113,7 +121,7 @@ void NWPluginData_static_runtime::mark_got_IP() _netif->localIP().toString().c_str() )); } -#endif +# endif // if NW_PLUGIN_LOG_EVENTS } @@ -128,7 +136,8 @@ void NWPluginData_static_runtime::mark_got_IPv6(ip_event_got_ip6_t *event) if (!_netif->isDefault()) { nonDefaultNetworkInterface_gotIP = true; } -#if NW_PLUGIN_LOG_EVENTS +# if NW_PLUGIN_LOG_EVENTS + if (loglevelActiveFor(LOG_LEVEL_INFO)) { if (event) { esp_ip6_addr_type_t addr_type = esp_netif_ip6_get_addr_type(&event->ip6_info.ip); @@ -147,7 +156,7 @@ void NWPluginData_static_runtime::mark_got_IPv6(ip_event_got_ip6_t *event) _netif->desc())); } } -#endif +# endif // if NW_PLUGIN_LOG_EVENTS } # endif // if FEATURE_USE_IPV6 @@ -158,13 +167,14 @@ void NWPluginData_static_runtime::mark_lost_IP() # if FEATURE_USE_IPV6 _gotIP6Stats.setOff(); # endif -#if NW_PLUGIN_LOG_EVENTS +# if NW_PLUGIN_LOG_EVENTS + if (_netif && loglevelActiveFor(LOG_LEVEL_INFO)) { addLog(LOG_LEVEL_INFO, strformat( F("%s: Lost IP"), _netif->desc())); } -#endif +# endif // if NW_PLUGIN_LOG_EVENTS } void NWPluginData_static_runtime::mark_begin_establish_connection() @@ -187,20 +197,19 @@ void NWPluginData_static_runtime::log_connected() if (_establishConnectStats.getCycleCount()) { // Log duration addLog(LOG_LEVEL_INFO, strformat( - F("%s: Connected, took: %s in %d attempts"), - _netif->desc(), - format_msec_duration_HMS( - _establishConnectStats.getLastOnDuration_ms()).c_str(), - _establishConnectStats.getCycleCount())); + F("%s: Connected, took: %s in %d attempts"), + _netif->desc(), + format_msec_duration_HMS( + _establishConnectStats.getLastOnDuration_ms()).c_str(), + _establishConnectStats.getCycleCount())); } else { addLog(LOG_LEVEL_INFO, strformat( - F("%s: Connected"), - _netif->desc())); + F("%s: Connected"), + _netif->desc())); } } } - void NWPluginData_static_runtime::mark_disconnected() { _connectedStats.setOff(); @@ -219,7 +228,6 @@ void NWPluginData_static_runtime::log_disconnected() } } - } // namespace net } // namespace ESPEasy diff --git a/src/ESPEasy/net/DataStructs/NWPluginData_static_runtime_ESP8266.cpp b/src/ESPEasy/net/DataStructs/NWPluginData_static_runtime_ESP8266.cpp index ccb09b5ec..67bb589a3 100644 --- a/src/ESPEasy/net/DataStructs/NWPluginData_static_runtime_ESP8266.cpp +++ b/src/ESPEasy/net/DataStructs/NWPluginData_static_runtime_ESP8266.cpp @@ -7,6 +7,9 @@ namespace ESPEasy { namespace net { +NWPluginData_static_runtime::NWPluginData_static_runtime(bool isSTA, const char * eventInterfaceName) + : _isSTA(isSTA), _eventInterfaceName(eventInterfaceName) {} + bool NWPluginData_static_runtime::started() const { // FIXME TD-er: Does this work reliable on ESP8266? @@ -33,34 +36,34 @@ bool NWPluginData_static_runtime::hasIP() const void NWPluginData_static_runtime::mark_start() { _startStopStats.setOn(); - #ifndef BUILD_NO_DEBUG + # ifndef BUILD_NO_DEBUG addLog(LOG_LEVEL_INFO, _isSTA ? F("STA: Started") : F("AP: Started")); - #endif + # endif } void NWPluginData_static_runtime::mark_stop() { _startStopStats.setOff(); - #ifndef BUILD_NO_DEBUG + # ifndef BUILD_NO_DEBUG addLog(LOG_LEVEL_INFO, _isSTA ? F("STA: Stopped") : F("AP: Stopped")); - #endif + # endif } void NWPluginData_static_runtime::mark_got_IP() { // Set OnOffTimer to off so we can also count how often we het new IP _gotIPStats.forceSet(true); - #ifndef BUILD_NO_DEBUG + # ifndef BUILD_NO_DEBUG addLog(LOG_LEVEL_INFO, _isSTA ? F("STA: Got IP") : F("AP: Got IP")); - #endif + # endif } void NWPluginData_static_runtime::mark_lost_IP() { _gotIPStats.setOff(); - #ifndef BUILD_NO_DEBUG + # ifndef BUILD_NO_DEBUG addLog(LOG_LEVEL_INFO, _isSTA ? F("STA: Lost IP") : F("AP: Lost IP")); - #endif + # endif } void NWPluginData_static_runtime::mark_begin_establish_connection() @@ -71,45 +74,47 @@ void NWPluginData_static_runtime::mark_begin_establish_connection() void NWPluginData_static_runtime::mark_connected() { -#ifndef BUILD_NO_DEBUG +# ifndef BUILD_NO_DEBUG const bool logDuration = _establishConnectStats.isOn(); -#endif +# endif _establishConnectStats.setOff(); _connectedStats.setOn(); } void NWPluginData_static_runtime::log_connected() { -#ifndef BUILD_NO_DEBUG +# ifndef BUILD_NO_DEBUG + if (loglevelActiveFor(LOG_LEVEL_INFO)) { if (_establishConnectStats.getCycleCount()) { addLog(LOG_LEVEL_INFO, concat( - F("STA: Connected, took: "), - format_msec_duration_HMS( - _establishConnectStats.getLastOnDuration_ms()))); + F("STA: Connected, took: "), + format_msec_duration_HMS( + _establishConnectStats.getLastOnDuration_ms()))); } else { addLog(LOG_LEVEL_INFO, F("STA: Connected")); } } -#endif +# endif // ifndef BUILD_NO_DEBUG } void NWPluginData_static_runtime::mark_disconnected() { _connectedStats.setOff(); -#ifndef BUILD_NO_DEBUG -#endif +# ifndef BUILD_NO_DEBUG +# endif } void NWPluginData_static_runtime::log_disconnected() { -#ifndef BUILD_NO_DEBUG +# ifndef BUILD_NO_DEBUG + if (_isSTA && loglevelActiveFor(LOG_LEVEL_INFO)) { addLog(LOG_LEVEL_INFO, concat( F("STA: Disconnected. Connected for: "), format_msec_duration_HMS(_connectedStats.getLastOnDuration_ms()))); } -#endif +# endif // ifndef BUILD_NO_DEBUG } } // namespace net diff --git a/src/ESPEasy/net/NWPluginStructs/NW002_data_struct_WiFi_AP.cpp b/src/ESPEasy/net/NWPluginStructs/NW002_data_struct_WiFi_AP.cpp index 33b53f0c5..2351f6328 100644 --- a/src/ESPEasy/net/NWPluginStructs/NW002_data_struct_WiFi_AP.cpp +++ b/src/ESPEasy/net/NWPluginStructs/NW002_data_struct_WiFi_AP.cpp @@ -29,7 +29,7 @@ namespace wifi { # ifdef ESP32 static NWPluginData_static_runtime stats_and_cache(&NW_PLUGIN_INTERFACE); # else -static NWPluginData_static_runtime stats_and_cache(false, F("AP")); +static NWPluginData_static_runtime stats_and_cache(false, "AP"); // Cannot use flash strings during init of static objects # endif // ifdef ESP32 static bool nw002_initialized{}; # ifdef ESP32 diff --git a/src/ESPEasy/net/wifi/ESPEasyWiFi_STA_Event_ESP8266.cpp b/src/ESPEasy/net/wifi/ESPEasyWiFi_STA_Event_ESP8266.cpp index fbd25675f..b9c465588 100644 --- a/src/ESPEasy/net/wifi/ESPEasyWiFi_STA_Event_ESP8266.cpp +++ b/src/ESPEasy/net/wifi/ESPEasyWiFi_STA_Event_ESP8266.cpp @@ -24,7 +24,7 @@ namespace ESPEasy { namespace net { namespace wifi { -static NWPluginData_static_runtime stats_and_cache(true, F("WiFi")); +static NWPluginData_static_runtime stats_and_cache(true, "WiFi"); // Cannot use flash strings during init of static objects static WiFiDisconnectReason _wifi_disconnect_reason = WiFiDisconnectReason::WIFI_DISCONNECT_REASON_UNSPECIFIED; static uint8_t _authmode{}; From 920d54afeb1606e1cb39c93e3a8eeda778f58d78 Mon Sep 17 00:00:00 2001 From: TD-er Date: Sun, 31 Aug 2025 08:00:57 +0200 Subject: [PATCH 228/564] [Network] Fix merge-conflict on ESP32-build --- src/src/ESPEasyCore/Controller.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/src/ESPEasyCore/Controller.cpp b/src/src/ESPEasyCore/Controller.cpp index 4f8a8f047..dcf82ccb4 100644 --- a/src/src/ESPEasyCore/Controller.cpp +++ b/src/src/ESPEasyCore/Controller.cpp @@ -668,7 +668,7 @@ void MQTT_execute_connect_task(void *parameter) LoadControllerSettings(MQTT_task_data->ControllerIndex, *ControllerSettings); uint32_t timeout = ControllerSettings->MustCheckReply - ? WiFiEventData.getSuggestedTimeout(Settings.Protocol[MQTT_task_data->ControllerIndex], ControllerSettings->ClientTimeout) + ? ControllerSettings->getSuggestedTimeout(Settings.Protocol[MQTT_task_data->ControllerIndex]) : ControllerSettings->ClientTimeout; uint8_t incr = 5; // Increment timeout between connection attempts 5 times by 100 msec From fa8b6ac807ee0d7d7616ba9d17f4388996cb765c Mon Sep 17 00:00:00 2001 From: TD-er Date: Sun, 31 Aug 2025 08:23:11 +0200 Subject: [PATCH 229/564] [ESP-IDF] Move to IDF5.5 for all ESP32-xx builds --- platformio_core_defs.ini | 31 ------------------------ platformio_esp32_envs.ini | 47 +++++-------------------------------- platformio_esp32_solo1.ini | 10 ++++---- platformio_esp32c2_envs.ini | 10 ++++---- platformio_esp32c3_envs.ini | 10 ++++---- platformio_esp32c6_envs.ini | 10 ++++---- platformio_esp32s2_envs.ini | 10 ++++---- platformio_special_envs.ini | 16 ++++++------- 8 files changed, 39 insertions(+), 105 deletions(-) diff --git a/platformio_core_defs.ini b/platformio_core_defs.ini index 9229ba986..ebcfd8a4c 100644 --- a/platformio_core_defs.ini +++ b/platformio_core_defs.ini @@ -162,37 +162,6 @@ extra_scripts = ${esp82xx_common.extra_scripts} - -; ESP_IDF 5.4.1 -[core_esp32_IDF5_4_1__3_2_0_LittleFS] -platform = https://github.com/Jason2866/platform-espressif32.git#Arduino/IDF54 -platform_packages = -;platform_packages = framework-arduinoespressif32 @ https://github.com/Jason2866/esp32-arduino-lib-builder/releases/download/3743/framework-arduinoespressif32-all-release_v5.4-a4437683.zip -build_flags = -DESP32_STAGE - -DESP_IDF_VERSION_MAJOR=5 - -DLIBRARIES_NO_LOG=1 - -DDISABLE_SC16IS752_SPI -; -DCONFIG_PM_ENABLE=0 - -DETH_TYPE_JL1101_SUPPORTED - ; PR_9453_FLUSH_TO_CLEAR_REVERTED - -DPR_9453_FLUSH_TO_CLEAR=clear -; -DCONFIG_LWIP_L2_TO_L3_COPY -; -DETH_SPI_SUPPORTS_NO_IRQ=1 - -DCONFIG_FREERTOS_USE_TICKLESS_IDLE=1 - -DCONFIG_FREERTOS_IDLE_TIME_BEFORE_SLEEP=3 - -DNEOPIXEL_ESP32_RMT_DEFAULT - -DCRON_USE_LOCAL_TIME - -I$PROJECT_DIR/src/include - -include "sdkconfig.h" - -include "ESPEasy_config.h" - -include "esp32x_fixes.h" - -DUPDATE_NOCRYPT -; -Wnull-dereference -lib_ignore = -lib_extra_dirs = - lib/lib_ssl - - ; ESP_IDF 5.5.0 [core_esp32_IDF5_5_0__3_2_0_LittleFS] platform = https://github.com/Jason2866/platform-espressif32.git#0b2bdf30cd0744b0b37907ee022ee7e30bb8f8bc diff --git a/platformio_esp32_envs.ini b/platformio_esp32_envs.ini index f6b41b295..0caafd2b0 100644 --- a/platformio_esp32_envs.ini +++ b/platformio_esp32_envs.ini @@ -1,38 +1,3 @@ -[esp32_base_idf5] -extends = common, core_esp32_IDF5_4_1__3_2_0_LittleFS -upload_speed = 460800 -upload_before_reset = default_reset -upload_after_reset = hard_reset -extra_scripts = pre:tools/pio/pre_esp32.py - post:tools/pio/post_esp32.py - ${extra_scripts_default.extra_scripts} - post:tools/pio/copy_files.py -; you can disable debug linker flag to reduce binary size (comment out line below), but the backtraces will become less readable -; tools/pio/extra_linker_flags.py -; fix the platform package to use gcc-ar and gcc-ranlib to enable lto linker plugin -; more detail: https://embeddedartistry.com/blog/2020/04/13/prefer-gcc-ar-to-ar-in-your-buildsystems/ -; pre:tools/pio/apply_patches.py - -; When using LTO, make sure NOT to use -mtext-section-literals -; -mtext-section-literals may be required when building large builds -; However LTO cannot optimize builds with text section literals and thus will result in quite a lot larger builds (80k - 140k larger) -build_unflags = -Wall - -fno-lto -build_flags = ${core_esp32_IDF5_4_1__3_2_0_LittleFS.build_flags} -; ${mqtt_flags.build_flags} - -DMQTT_MAX_PACKET_SIZE=2048 - -DCONFIG_FREERTOS_ASSERT_DISABLE - -DCONFIG_LWIP_ESP_GRATUITOUS_ARP - -fno-strict-aliasing - -flto=auto - -Wswitch - -DCORE_DEBUG_LEVEL=ARDUHAL_LOG_LEVEL_NONE -; -DCORE_DEBUG_LEVEL=ARDUHAL_LOG_LEVEL_INFO -; -DCORE_DEBUG_LEVEL=ARDUHAL_LOG_LEVEL_VERBOSE - -DLWIP_IPV6=1 -monitor_filters = esp32_exception_decoder -lib_ignore = - ${core_esp32_IDF5_4_1__3_2_0_LittleFS.lib_ignore} [esp32_base_idf5_5] @@ -84,22 +49,22 @@ lib_ignore = ESP8266Ping TinyWireM LittleFS_esp32 Adafruit NeoPixel - ${esp32_base_idf5.lib_ignore} + ${esp32_base_idf5_5.lib_ignore} [esp32_common_LittleFS] -extends = esp32_base_idf5 -build_flags = ${esp32_base_idf5.build_flags} +extends = esp32_base_idf5_5 +build_flags = ${esp32_base_idf5_5.build_flags} ; -mtext-section-literals -DESP32_CLASSIC -DUSE_LITTLEFS -build_unflags = ${esp32_base_idf5.build_unflags} -extra_scripts = ${esp32_base_idf5.extra_scripts} +build_unflags = ${esp32_base_idf5_5.build_unflags} +extra_scripts = ${esp32_base_idf5_5.extra_scripts} board_build.filesystem = littlefs lib_ignore = ${esp32_always.lib_ignore} ESP32_ping ESP32 BLE Arduino - ${esp32_base_idf5.lib_ignore} + ${esp32_base_idf5_5.lib_ignore} [esp32_common_LittleFS_ETH] diff --git a/platformio_esp32_solo1.ini b/platformio_esp32_solo1.ini index 0c755e934..9ef308bf0 100644 --- a/platformio_esp32_solo1.ini +++ b/platformio_esp32_solo1.ini @@ -1,17 +1,17 @@ ; IDF 5.3.1 [esp32_solo1_common_LittleFS] -extends = esp32_base_idf5 +extends = esp32_base_idf5_5 board = esp32_solo1_4M ;platform = https://github.com/Jason2866/platform-espressif32.git#Arduino/IDF53 ;platform_packages = framework-arduino-solo1 @ https://github.com/Jason2866/esp32-arduino-lib-builder/releases/download/3507/framework-arduinoespressif32-solo1-release_v5.3-2952ac93.zip -build_flags = ${esp32_base_idf5.build_flags} +build_flags = ${esp32_base_idf5_5.build_flags} -DFEATURE_ARDUINO_OTA=1 -DUSE_LITTLEFS -DCORE32SOLO1 -lib_ignore = ${esp32_base_idf5.lib_ignore} -extra_scripts = ${esp32_base_idf5.extra_scripts} -build_unflags = ${esp32_base_idf5.build_unflags} +lib_ignore = ${esp32_base_idf5_5.lib_ignore} +extra_scripts = ${esp32_base_idf5_5.extra_scripts} +build_unflags = ${esp32_base_idf5_5.build_unflags} -fexceptions board_build.filesystem = littlefs diff --git a/platformio_esp32c2_envs.ini b/platformio_esp32c2_envs.ini index 44a27d902..fdebe7b23 100644 --- a/platformio_esp32c2_envs.ini +++ b/platformio_esp32c2_envs.ini @@ -1,15 +1,15 @@ ; No Ethernet for ESP32-C2 as this one already hasn't much RAM. ; Thus Jason removed Ethernet support for ESP32-C2 from the PIO platform_packages [esp32c2_common_LittleFS] -extends = esp32_base_idf5 -build_flags = ${esp32_base_idf5.build_flags} +extends = esp32_base_idf5_5 +build_flags = ${esp32_base_idf5_5.build_flags} -DFEATURE_ARDUINO_OTA=1 -DESP32C2 -extra_scripts = ${esp32_base_idf5.extra_scripts} -build_unflags = ${esp32_base_idf5.build_unflags} +extra_scripts = ${esp32_base_idf5_5.extra_scripts} +build_unflags = ${esp32_base_idf5_5.build_unflags} -fexceptions board_build.filesystem = littlefs -lib_ignore = ${esp32_base_idf5.lib_ignore} +lib_ignore = ${esp32_base_idf5_5.lib_ignore} NeoPixelBus NeoPixelBus_wrapper Adafruit NeoMatrix via NeoPixelBus diff --git a/platformio_esp32c3_envs.ini b/platformio_esp32c3_envs.ini index acb48e0a2..c28075886 100644 --- a/platformio_esp32c3_envs.ini +++ b/platformio_esp32c3_envs.ini @@ -1,15 +1,15 @@ [esp32c3_common_LittleFS] -extends = esp32_base_idf5 -build_flags = ${esp32_base_idf5.build_flags} +extends = esp32_base_idf5_5 +build_flags = ${esp32_base_idf5_5.build_flags} -DFEATURE_ARDUINO_OTA=1 -DFEATURE_ETHERNET=1 -DUSE_LITTLEFS -DESP32C3 -extra_scripts = ${esp32_base_idf5.extra_scripts} -build_unflags = ${esp32_base_idf5.build_unflags} +extra_scripts = ${esp32_base_idf5_5.extra_scripts} +build_unflags = ${esp32_base_idf5_5.build_unflags} -fexceptions board_build.filesystem = littlefs -lib_ignore = ${esp32_base_idf5.lib_ignore} +lib_ignore = ${esp32_base_idf5_5.lib_ignore} board = esp32c3cdc diff --git a/platformio_esp32c6_envs.ini b/platformio_esp32c6_envs.ini index bcb552089..85fae4c22 100644 --- a/platformio_esp32c6_envs.ini +++ b/platformio_esp32c6_envs.ini @@ -1,15 +1,15 @@ [esp32c6_common_LittleFS] -extends = esp32_base_idf5 -build_flags = ${esp32_base_idf5.build_flags} +extends = esp32_base_idf5_5 +build_flags = ${esp32_base_idf5_5.build_flags} -DFEATURE_ARDUINO_OTA=1 -DUSE_LITTLEFS -DESP32C6 -DFEATURE_ETHERNET -extra_scripts = ${esp32_base_idf5.extra_scripts} -build_unflags = ${esp32_base_idf5.build_unflags} +extra_scripts = ${esp32_base_idf5_5.extra_scripts} +build_unflags = ${esp32_base_idf5_5.build_unflags} -fexceptions board_build.filesystem = littlefs -lib_ignore = ${esp32_base_idf5.lib_ignore} +lib_ignore = ${esp32_base_idf5_5.lib_ignore} board = esp32c6cdc diff --git a/platformio_esp32s2_envs.ini b/platformio_esp32s2_envs.ini index 72bf0ccb3..b9e6c8353 100644 --- a/platformio_esp32s2_envs.ini +++ b/platformio_esp32s2_envs.ini @@ -1,15 +1,15 @@ [esp32s2_common_LittleFS] -extends = esp32_base_idf5 -build_flags = ${esp32_base_idf5.build_flags} +extends = esp32_base_idf5_5 +build_flags = ${esp32_base_idf5_5.build_flags} -DFEATURE_ARDUINO_OTA=1 -DFEATURE_ETHERNET=1 -DUSE_LITTLEFS -DESP32S2 -extra_scripts = ${esp32_base_idf5.extra_scripts} -build_unflags = ${esp32_base_idf5.build_unflags} +extra_scripts = ${esp32_base_idf5_5.extra_scripts} +build_unflags = ${esp32_base_idf5_5.build_unflags} -fexceptions board_build.filesystem = littlefs -lib_ignore = ${esp32_base_idf5.lib_ignore} +lib_ignore = ${esp32_base_idf5_5.lib_ignore} [env:neopixel_ESP32s2_4M316k_LittleFS_ETH] diff --git a/platformio_special_envs.ini b/platformio_special_envs.ini index 179b27b68..fe6545124 100644 --- a/platformio_special_envs.ini +++ b/platformio_special_envs.ini @@ -61,12 +61,12 @@ extra_scripts = ${esp32_common_LittleFS_ETH.extra_scripts} pre:tools/pio/pre_custom_esp32.py [env:spec_debug_max_ESP32_16M8M] -extends = esp32_base_idf5 +extends = esp32_base_idf5_5 build_type = ${debug_pio.build_type} check_tool = ${debug_pio.check_tool} check_flags = ${debug_pio.check_flags} lib_ignore = ${esp32_common_LittleFS_ETH.lib_ignore} -build_flags = ${esp32_base_idf5.build_flags} +build_flags = ${esp32_base_idf5_5.build_flags} ${debug_pio.build_flags} -DESP32_CLASSIC -DUSE_LITTLEFS @@ -83,12 +83,12 @@ board = esp32_16M8M [env:spec_debug_minimal_ESP32_16M8M] -extends = esp32_base_idf5 +extends = esp32_base_idf5_5 build_type = ${debug_pio.build_type} check_tool = ${debug_pio.check_tool} check_flags = ${debug_pio.check_flags} lib_ignore = ${esp32_common_LittleFS_ETH.lib_ignore} -build_flags = ${esp32_base_idf5.build_flags} +build_flags = ${esp32_base_idf5_5.build_flags} ${debug_pio.build_flags} -DESP32_CLASSIC -DUSE_LITTLEFS @@ -103,12 +103,12 @@ board = esp32_16M8M [env:spec_debug_display_ESP32_16M8M] -extends = esp32_base_idf5 +extends = esp32_base_idf5_5 build_type = ${debug_pio.build_type} check_tool = ${debug_pio.check_tool} check_flags = ${debug_pio.check_flags} lib_ignore = ${esp32_common_LittleFS_ETH.lib_ignore} -build_flags = ${esp32_base_idf5.build_flags} +build_flags = ${esp32_base_idf5_5.build_flags} ${debug_pio.build_flags} -DESP32_CLASSIC -DUSE_LITTLEFS @@ -124,12 +124,12 @@ board_build.filesystem = littlefs board = esp32_16M8M [env:spec_debug_neopixel_ESP32_16M8M] -extends = esp32_base_idf5 +extends = esp32_base_idf5_5 build_type = ${debug_pio.build_type} check_tool = ${debug_pio.check_tool} check_flags = ${debug_pio.check_flags} lib_ignore = ${esp32_common_LittleFS_ETH.lib_ignore} -build_flags = ${esp32_base_idf5.build_flags} +build_flags = ${esp32_base_idf5_5.build_flags} ${debug_pio.build_flags} -DESP32_CLASSIC -DUSE_LITTLEFS From 0e2a3e4368a7f599a14de0fa1a64dba82f0ddb82 Mon Sep 17 00:00:00 2001 From: TD-er Date: Sun, 31 Aug 2025 08:44:39 +0200 Subject: [PATCH 230/564] [Build] Fix missing include --- src/src/Helpers/Misc.cpp | 1 + src/src/PluginStructs/P146_data_struct.cpp | 1 + 2 files changed, 2 insertions(+) diff --git a/src/src/Helpers/Misc.cpp b/src/src/Helpers/Misc.cpp index 3fd4e972c..b45e1bb47 100644 --- a/src/src/Helpers/Misc.cpp +++ b/src/src/Helpers/Misc.cpp @@ -7,6 +7,7 @@ #include "../ESPEasyCore/Serial.h" #include "../Globals/ESPEasy_time.h" #include "../Globals/Statistics.h" +#include "../Helpers/_CPlugin_init.h" #include "../Helpers/ESPEasy_FactoryDefault.h" #include "../Helpers/ESPEasy_Storage.h" #include "../Helpers/Numerical.h" diff --git a/src/src/PluginStructs/P146_data_struct.cpp b/src/src/PluginStructs/P146_data_struct.cpp index 00f2b178a..216b0b9c8 100644 --- a/src/src/PluginStructs/P146_data_struct.cpp +++ b/src/src/PluginStructs/P146_data_struct.cpp @@ -5,6 +5,7 @@ # include "../ControllerQueue/C016_queue_element.h" # include "../Globals/C016_ControllerCache.h" # include "../Globals/MQTT.h" +# include "../Helpers/_CPlugin_init.h" P146_data_struct::P146_data_struct(struct EventStruct *event) From 6b52b0a831cc64b8d2663179b23ae14ef90b53ac Mon Sep 17 00:00:00 2001 From: TD-er Date: Sun, 31 Aug 2025 10:03:42 +0200 Subject: [PATCH 231/564] [Build] Define BUILD_NO_DEBUG for Collection_E builds --- src/src/CustomBuild/define_plugin_sets.h | 1 + 1 file changed, 1 insertion(+) diff --git a/src/src/CustomBuild/define_plugin_sets.h b/src/src/CustomBuild/define_plugin_sets.h index 314f7710a..651ce6746 100644 --- a/src/src/CustomBuild/define_plugin_sets.h +++ b/src/src/CustomBuild/define_plugin_sets.h @@ -1021,6 +1021,7 @@ To create/register a plugin, you have to : #endif #ifdef PLUGIN_SET_COLLECTION_E_ESP32 + #define BUILD_NO_DEBUG #ifndef PLUGIN_DESCR // COLLECTION_E_ESP32_IRExt also passes here #define PLUGIN_DESCR "Collection_E ESP32" #endif From 7313a905bb28a292541f1b5145a2c4fcbdebefef Mon Sep 17 00:00:00 2001 From: Ton Huisman Date: Sun, 31 Aug 2025 11:59:21 +0200 Subject: [PATCH 232/564] [Build] Fix missing include --- src/src/Helpers/Misc.cpp | 1 + src/src/PluginStructs/P146_data_struct.cpp | 1 + 2 files changed, 2 insertions(+) diff --git a/src/src/Helpers/Misc.cpp b/src/src/Helpers/Misc.cpp index 15e1947a4..51ff9e93e 100644 --- a/src/src/Helpers/Misc.cpp +++ b/src/src/Helpers/Misc.cpp @@ -7,6 +7,7 @@ #include "../ESPEasyCore/Serial.h" #include "../Globals/ESPEasy_time.h" #include "../Globals/Statistics.h" +#include "../Helpers/_CPlugin_init.h" #include "../Helpers/ESPEasy_FactoryDefault.h" #include "../Helpers/ESPEasy_Storage.h" #include "../Helpers/Numerical.h" diff --git a/src/src/PluginStructs/P146_data_struct.cpp b/src/src/PluginStructs/P146_data_struct.cpp index 680d1b2f1..b80feb352 100644 --- a/src/src/PluginStructs/P146_data_struct.cpp +++ b/src/src/PluginStructs/P146_data_struct.cpp @@ -5,6 +5,7 @@ # include "../ControllerQueue/C016_queue_element.h" # include "../Globals/C016_ControllerCache.h" # include "../Globals/MQTT.h" +# include "../Helpers/_CPlugin_init.h" P146_data_struct::P146_data_struct(struct EventStruct *event) From b5581a2d3027db677eb00cb5cbd10feee784a179 Mon Sep 17 00:00:00 2001 From: TD-er Date: Sun, 31 Aug 2025 21:55:39 +0200 Subject: [PATCH 233/564] [ESP-IDF] update to latest ESP-IDF5.5 --- platformio_core_defs.ini | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/platformio_core_defs.ini b/platformio_core_defs.ini index ebcfd8a4c..4a270112e 100644 --- a/platformio_core_defs.ini +++ b/platformio_core_defs.ini @@ -166,7 +166,7 @@ extra_scripts = ${esp82xx_common.extra_scripts} [core_esp32_IDF5_5_0__3_2_0_LittleFS] platform = https://github.com/Jason2866/platform-espressif32.git#0b2bdf30cd0744b0b37907ee022ee7e30bb8f8bc ;platform = https://github.com/Jason2866/platform-espressif32.git#Arduino/IDF55 -platform_packages = framework-arduinoespressif32 @ https://github.com/Jason2866/esp32-arduino-lib-builder/releases/download/3107-1140-5.5/framework-arduinoespressif32-release_v5.5-a2251f33.zip +platform_packages = framework-arduinoespressif32 @ https://github.com/Jason2866/esp32-arduino-lib-builder/releases/download/3008-1439-5.5/framework-arduinoespressif32-release_v5.5-717d5bca.zip build_flags = -DESP32_STAGE -DESP_IDF_VERSION_MAJOR=5 -DLIBRARIES_NO_LOG=1 From 13bb2550cc9d3062050b9d562a67e7e7b4ad9d84 Mon Sep 17 00:00:00 2001 From: TD-er Date: Sun, 31 Aug 2025 21:56:20 +0200 Subject: [PATCH 234/564] [Build] Define BUILD_NO_DEBUG for all collection builds --- src/src/CustomBuild/define_plugin_sets.h | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/src/src/CustomBuild/define_plugin_sets.h b/src/src/CustomBuild/define_plugin_sets.h index 651ce6746..415ba96d9 100644 --- a/src/src/CustomBuild/define_plugin_sets.h +++ b/src/src/CustomBuild/define_plugin_sets.h @@ -894,6 +894,12 @@ To create/register a plugin, you have to : #define USES_P028 // BME280 #endif +#if defined(PLUGIN_SET_COLLECTION_B_ESP32) || defined(PLUGIN_SET_COLLECTION_C_ESP32) || defined(PLUGIN_SET_COLLECTION_D_ESP32) || defined(PLUGIN_SET_COLLECTION_E_ESP32) || defined(PLUGIN_SET_COLLECTION_F_ESP32) || defined(PLUGIN_SET_COLLECTION_G_ESP32) +# ifndef BUILD_NO_DEBUG +# define BUILD_NO_DEBUG +# endif +#endif + #ifdef PLUGIN_SET_COLLECTION_ESP32 #if !defined(PLUGIN_SET_COLLECTION_B_ESP32) && !defined(PLUGIN_SET_COLLECTION_C_ESP32) && !defined(PLUGIN_SET_COLLECTION_D_ESP32) && !defined(PLUGIN_SET_COLLECTION_E_ESP32) && !defined(PLUGIN_SET_COLLECTION_F_ESP32) && !defined(PLUGIN_SET_COLLECTION_G_ESP32) #ifndef PLUGIN_DESCR // COLLECTION_A_ESP32_IRExt also passes here @@ -1021,7 +1027,6 @@ To create/register a plugin, you have to : #endif #ifdef PLUGIN_SET_COLLECTION_E_ESP32 - #define BUILD_NO_DEBUG #ifndef PLUGIN_DESCR // COLLECTION_E_ESP32_IRExt also passes here #define PLUGIN_DESCR "Collection_E ESP32" #endif From cb6dd6006e5d80b335f7b59da9461f24fa544d59 Mon Sep 17 00:00:00 2001 From: TD-er Date: Tue, 2 Sep 2025 08:47:43 +0200 Subject: [PATCH 235/564] [USBCDC] Fix USB-CDC for ESP32S2 builds --- boards/esp32s2cdc.json | 2 +- .../Port_ESPEasySerial_USBCDC.cpp | 39 ++++++++++++++----- lib/ESPEasySerial/Port_ESPEasySerial_USBCDC.h | 11 ++++-- platformio_core_defs.ini | 2 +- 4 files changed, 39 insertions(+), 15 deletions(-) diff --git a/boards/esp32s2cdc.json b/boards/esp32s2cdc.json index 1f71388af..b53dd82e4 100644 --- a/boards/esp32s2cdc.json +++ b/boards/esp32s2cdc.json @@ -5,7 +5,7 @@ "memory_type": "dio_qspi" }, "core": "esp32", - "extra_flags": "-DARDUINO_TASMOTA -DBOARD_HAS_PSRAM -DESP32_4M -DESP32S2 -DCONFIG_IDF_TARGET_ESP32S2=1 -DUSE_USB_CDC_CONSOLE -DARDUINO_USB_CDC_ON_BOOT=1", + "extra_flags": "-DARDUINO_TASMOTA -DBOARD_HAS_PSRAM -DESP32_4M -DESP32S2 -DCONFIG_IDF_TARGET_ESP32S2=1 -DUSE_USB_CDC_CONSOLE -DARDUINO_USB_CDC_ON_BOOT=1 -DCONFIG_TINYUSB_CDC_ENABLED=1", "f_cpu": "240000000L", "f_flash": "80000000L", "flash_mode": "dio", diff --git a/lib/ESPEasySerial/Port_ESPEasySerial_USBCDC.cpp b/lib/ESPEasySerial/Port_ESPEasySerial_USBCDC.cpp index 633ff2b83..5a3baff2e 100644 --- a/lib/ESPEasySerial/Port_ESPEasySerial_USBCDC.cpp +++ b/lib/ESPEasySerial/Port_ESPEasySerial_USBCDC.cpp @@ -3,12 +3,14 @@ #if USES_USBCDC +#include + # if !ARDUINO_USB_CDC_ON_BOOT USBCDC ESPEasySerial_USBCDC_port0(0); // USBCDC ESPEasySerial_USBCDC_port1(1); # endif // if !ARDUINO_USB_CDC_ON_BOOT - +/* volatile bool usbActive = false; volatile int32_t eventidTriggered = ESP_EVENT_ANY_ID; @@ -59,15 +61,15 @@ static void usbcdcEventCallback(void *arg, esp_event_base_t event_base, int32_t usbActive = true; break; case ARDUINO_USB_CDC_RX_EVENT: - /* - Serial.printf("CDC RX EVENT [%u]: ", data->rx.len); - { - uint8_t buf[data->rx.len]; - size_t len = Serial.read(buf, data->rx.len); - Serial.write(buf, len); - } - Serial.println(); - */ + +// Serial.printf("CDC RX EVENT [%u]: ", data->rx.len); +// { +// uint8_t buf[data->rx.len]; +// size_t len = Serial.read(buf, data->rx.len); +// Serial.write(buf, len); +// } +// Serial.println(); + usbActive = true; break; case ARDUINO_USB_CDC_TX_EVENT: @@ -83,6 +85,23 @@ static void usbcdcEventCallback(void *arg, esp_event_base_t event_base, int32_t } } } +*/ + +extern "C" { + +// Stub implementation of the HID report received callback +// This is required by TinyUSB HID host but not used in ESPEasy +void tuh_hid_report_received_cb(uint8_t dev_addr, uint8_t idx, uint8_t const*report, uint16_t len) +{ + // Empty implementation - HID host functionality is not used in ESPEasy + // Thanks Jason8266 for this fix :) + (void)dev_addr; + (void)idx; + (void)report; + (void)len; +} + +} Port_ESPEasySerial_USBCDC_t::Port_ESPEasySerial_USBCDC_t(const ESPEasySerialConfig& config) { diff --git a/lib/ESPEasySerial/Port_ESPEasySerial_USBCDC.h b/lib/ESPEasySerial/Port_ESPEasySerial_USBCDC.h index 1a6ae9b4b..9fd42abd0 100644 --- a/lib/ESPEasySerial/Port_ESPEasySerial_USBCDC.h +++ b/lib/ESPEasySerial/Port_ESPEasySerial_USBCDC.h @@ -11,7 +11,11 @@ # include "Port_ESPEasySerial_base.h" -class Port_ESPEasySerial_USBCDC_t : public Port_ESPEasySerial_base { +# include + + +class Port_ESPEasySerial_USBCDC_t : public Port_ESPEasySerial_base +{ public: Port_ESPEasySerial_USBCDC_t(const ESPEasySerialConfig& config); @@ -41,7 +45,8 @@ public: size_t setRxBufferSize(size_t new_size); size_t setTxBufferSize(size_t new_size); - bool setRS485Mode(int8_t rtsPin, bool enableCollisionDetection = false); + bool setRS485Mode(int8_t rtsPin, + bool enableCollisionDetection = false); virtual int getBaudRate() const override; @@ -52,7 +57,7 @@ private: # else // if ARDUINO_USB_CDC_ON_BOOT USBCDC *_serial = nullptr; # endif // if ARDUINO_USB_CDC_ON_BOOT -}; +}; // class Port_ESPEasySerial_USBCDC_t // Need to define these objects as extern as they need to be defined before setup() is being called. diff --git a/platformio_core_defs.ini b/platformio_core_defs.ini index 4a270112e..f2d6b7b6e 100644 --- a/platformio_core_defs.ini +++ b/platformio_core_defs.ini @@ -166,7 +166,7 @@ extra_scripts = ${esp82xx_common.extra_scripts} [core_esp32_IDF5_5_0__3_2_0_LittleFS] platform = https://github.com/Jason2866/platform-espressif32.git#0b2bdf30cd0744b0b37907ee022ee7e30bb8f8bc ;platform = https://github.com/Jason2866/platform-espressif32.git#Arduino/IDF55 -platform_packages = framework-arduinoespressif32 @ https://github.com/Jason2866/esp32-arduino-lib-builder/releases/download/3008-1439-5.5/framework-arduinoespressif32-release_v5.5-717d5bca.zip +platform_packages = framework-arduinoespressif32 @ https://github.com/Jason2866/esp32-arduino-lib-builder/releases/download/0109-1248-5.5/framework-arduinoespressif32-release_v5.5-717d5bca.zip build_flags = -DESP32_STAGE -DESP_IDF_VERSION_MAJOR=5 -DLIBRARIES_NO_LOG=1 From 7f032495b23de7cecea92a73775c6e41fdc313cf Mon Sep 17 00:00:00 2001 From: TD-er Date: Tue, 2 Sep 2025 09:30:46 +0200 Subject: [PATCH 236/564] [Build] Define BUILD_NO_DEBUG for ESP32 Collection A builds --- platformio_esp32_envs.ini | 2 ++ platformio_esp32c3_envs.ini | 1 + platformio_esp32s2_envs.ini | 1 + platformio_esp32s3_envs.ini | 1 + src/src/CustomBuild/define_plugin_sets.h | 10 +++++++++- 5 files changed, 14 insertions(+), 1 deletion(-) diff --git a/platformio_esp32_envs.ini b/platformio_esp32_envs.ini index 0caafd2b0..93412c0b1 100644 --- a/platformio_esp32_envs.ini +++ b/platformio_esp32_envs.ini @@ -136,6 +136,7 @@ board = esp32_4M build_flags = ${esp32_common_LittleFS_ETH.build_flags} -DFEATURE_ARDUINO_OTA=1 -DPLUGIN_SET_COLLECTION_ESP32 + -DPLUGIN_SET_COLLECTION_A_ESP32 -DCOLLECTION_FEATURE_RTTTL=1 @@ -199,6 +200,7 @@ extends = esp32_IRExt_LittleFS_ETH board = esp32_4M build_flags = ${esp32_IRExt_LittleFS_ETH.build_flags} -DPLUGIN_SET_COLLECTION_ESP32 + -DPLUGIN_SET_COLLECTION_A_ESP32 [env:collection_B_ESP32_IRExt_4M316k_LittleFS_ETH] extends = esp32_IRExt_LittleFS_ETH diff --git a/platformio_esp32c3_envs.ini b/platformio_esp32c3_envs.ini index c28075886..6648747ca 100644 --- a/platformio_esp32c3_envs.ini +++ b/platformio_esp32c3_envs.ini @@ -32,6 +32,7 @@ lib_ignore = ${esp32c3_common_LittleFS.lib_ignore} extends = esp32c3_common_LittleFS build_flags = ${esp32c3_common_LittleFS.build_flags} -DPLUGIN_SET_COLLECTION_ESP32 + -DPLUGIN_SET_COLLECTION_A_ESP32 -DCOLLECTION_FEATURE_RTTTL=1 [env:collection_B_ESP32c3_4M316k_LittleFS_ETH] diff --git a/platformio_esp32s2_envs.ini b/platformio_esp32s2_envs.ini index b9e6c8353..da88c2428 100644 --- a/platformio_esp32s2_envs.ini +++ b/platformio_esp32s2_envs.ini @@ -61,6 +61,7 @@ extends = esp32s2_common_LittleFS board = esp32s2cdc build_flags = ${esp32s2_common_LittleFS.build_flags} -DPLUGIN_SET_COLLECTION_ESP32 + -DPLUGIN_SET_COLLECTION_A_ESP32 -DCOLLECTION_FEATURE_RTTTL=1 [env:collection_B_ESP32s2_4M316k_LittleFS_ETH] diff --git a/platformio_esp32s3_envs.ini b/platformio_esp32s3_envs.ini index aca9a4cc0..276e2a6e1 100644 --- a/platformio_esp32s3_envs.ini +++ b/platformio_esp32s3_envs.ini @@ -52,6 +52,7 @@ extends = esp32s3_common_LittleFS board = esp32s3cdc-qio_qspi build_flags = ${esp32s3_common_LittleFS.build_flags} -DPLUGIN_SET_COLLECTION_ESP32 + -DPLUGIN_SET_COLLECTION_A_ESP32 -DCOLLECTION_FEATURE_RTTTL=1 [env:collection_B_ESP32s3_4M316k_LittleFS_ETH] diff --git a/src/src/CustomBuild/define_plugin_sets.h b/src/src/CustomBuild/define_plugin_sets.h index 415ba96d9..72aa10b73 100644 --- a/src/src/CustomBuild/define_plugin_sets.h +++ b/src/src/CustomBuild/define_plugin_sets.h @@ -894,7 +894,15 @@ To create/register a plugin, you have to : #define USES_P028 // BME280 #endif -#if defined(PLUGIN_SET_COLLECTION_B_ESP32) || defined(PLUGIN_SET_COLLECTION_C_ESP32) || defined(PLUGIN_SET_COLLECTION_D_ESP32) || defined(PLUGIN_SET_COLLECTION_E_ESP32) || defined(PLUGIN_SET_COLLECTION_F_ESP32) || defined(PLUGIN_SET_COLLECTION_G_ESP32) +/* +#if defined(PLUGIN_SET_COLLECTION_A_ESP32) +# ifndef LIMIT_BUILD_SIZE +#define LIMIT_BUILD_SIZE +#endif +#endif +*/ + +#if defined(PLUGIN_SET_COLLECTION_A_ESP32) || defined(PLUGIN_SET_COLLECTION_B_ESP32) || defined(PLUGIN_SET_COLLECTION_C_ESP32) || defined(PLUGIN_SET_COLLECTION_D_ESP32) || defined(PLUGIN_SET_COLLECTION_E_ESP32) || defined(PLUGIN_SET_COLLECTION_F_ESP32) || defined(PLUGIN_SET_COLLECTION_G_ESP32) # ifndef BUILD_NO_DEBUG # define BUILD_NO_DEBUG # endif From a582ee2967cf42d7b44efb040f1668ac64415f16 Mon Sep 17 00:00:00 2001 From: TD-er Date: Tue, 2 Sep 2025 11:47:06 +0200 Subject: [PATCH 237/564] [Network] Fix collecting RX/TX traffic data --- .../net/DataStructs/NWPluginData_base.cpp | 91 +++---------------- .../net/DataStructs/NWPluginData_base.h | 3 +- .../NWPluginData_static_runtime.cpp | 80 ++++++++++++++++ .../DataStructs/NWPluginData_static_runtime.h | 6 ++ .../net/wifi/ESPEasyWifi_abstracted_ESP32.cpp | 9 +- 5 files changed, 107 insertions(+), 82 deletions(-) diff --git a/src/ESPEasy/net/DataStructs/NWPluginData_base.cpp b/src/ESPEasy/net/DataStructs/NWPluginData_base.cpp index ed2fa15ac..6fca9e3e5 100644 --- a/src/ESPEasy/net/DataStructs/NWPluginData_base.cpp +++ b/src/ESPEasy/net/DataStructs/NWPluginData_base.cpp @@ -17,44 +17,6 @@ namespace ESPEasy { namespace net { -#ifdef ESP32 -struct TX_RX_traffic_count { - - void clear() { _tx_count = 0; _rx_count = 0; } - - uint64_t _tx_count{}; - uint64_t _rx_count{}; - -}; - -typedef std::map InterfaceTrafficCount_t; - -static InterfaceTrafficCount_t interfaceTrafficCount; - -static void tx_rx_event_handler(void *arg, esp_event_base_t event_base, - int32_t event_id, void *event_data) -{ - if (event_data == nullptr) { return; } - ip_event_tx_rx_t *event = (ip_event_tx_rx_t *)event_data; - const int key = esp_netif_get_netif_impl_index(event->esp_netif); - - if (event->dir == ESP_NETIF_TX) { - interfaceTrafficCount[key]._tx_count += event->len; - } else if (event->dir == ESP_NETIF_RX) { - interfaceTrafficCount[key]._rx_count += event->len; - addLog(LOG_LEVEL_INFO, strformat( - F("RX: %s key: %d len: %d total: %d"), - esp_netif_get_desc(event->esp_netif), - key, - event->len, - interfaceTrafficCount[key]._rx_count - )); - } -} - -#endif // ifdef ESP32 - - NWPluginData_base::NWPluginData_base( nwpluginID_t nwpluginID, networkIndex_t networkIndex #ifdef ESP32 @@ -75,26 +37,6 @@ NWPluginData_base::NWPluginData_base( , _netif(netif) #endif { - #ifdef ESP32 - - if (_netif) { - const int key = _netif->impl_index(); - interfaceTrafficCount[key].clear(); - - if (_netif->netif()) { - static bool registered_IP_EVENT_TX_RX = false; - esp_netif_tx_rx_event_enable(_netif->netif()); - - if (!registered_IP_EVENT_TX_RX) { - esp_event_handler_register(IP_EVENT, IP_EVENT_TX_RX, &tx_rx_event_handler, NULL); - registered_IP_EVENT_TX_RX = true; - } - esp_netif_tx_rx_event_enable(_netif->netif()); - } - - // _netif->netif()->tx_rx_events_enabled = true; - } - #endif // ifdef ESP32 #if FEATURE_STORE_NETWORK_INTERFACE_SETTINGS if (_kvs == nullptr) { @@ -110,18 +52,6 @@ NWPluginData_base::~NWPluginData_base() _plugin_stats_array = nullptr; #endif // if FEATURE_PLUGIN_STATS -#ifdef ESP32 - - if (_netif) { - if (_netif->netif()) { - esp_netif_tx_rx_event_disable(_netif->netif()); - } - const int key = _netif->impl_index(); - auto it = interfaceTrafficCount.find(key); - - if (it != interfaceTrafficCount.end()) { interfaceTrafficCount.erase(it); } - } -#endif // ifdef ESP32 #if FEATURE_STORE_NETWORK_INTERFACE_SETTINGS if (_kvs) { delete _kvs; } @@ -200,7 +130,7 @@ void NWPluginData_base::initPluginStats_trafficCount(networkStatsVarIndex_t netw displayConfig.setAxisIndex(3); // Set to a fixed index so RX/TX are on the same axis index initPluginStats( networkStatsVarIndex, - isTX ? F("TX") : F("RX"), + isTX ? F("Traffic TX") : F("Traffic RX"), 0, NAN, displayConfig); @@ -417,16 +347,19 @@ bool NWPluginData_base::handle_priority_route_changed() return res; } -bool NWPluginData_base::getTrafficCount(uint64_t& tx, uint64_t& rx) const +void NWPluginData_base::enable_txrx_events() +{ + auto cache = getNWPluginData_static_runtime(); + if (cache) { + cache->enable_txrx_events(); + } +} + +bool NWPluginData_base::getTrafficCount(uint64_t& tx, uint64_t& rx) { if (!_netif) { return false; } - const int key = _netif->impl_index(); - auto it = interfaceTrafficCount.find(key); - - if (it == interfaceTrafficCount.end()) { return false; } - tx = it->second._tx_count; - rx = it->second._rx_count; - return true; + auto cache = getNWPluginData_static_runtime(); + return (cache && cache->getTrafficCount(tx, rx)); } #endif // ifdef ESP32 diff --git a/src/ESPEasy/net/DataStructs/NWPluginData_base.h b/src/ESPEasy/net/DataStructs/NWPluginData_base.h index 3f08b9805..bf047ce62 100644 --- a/src/ESPEasy/net/DataStructs/NWPluginData_base.h +++ b/src/ESPEasy/net/DataStructs/NWPluginData_base.h @@ -102,8 +102,9 @@ struct NWPluginData_base { #ifdef ESP32 virtual bool handle_priority_route_changed(); + void enable_txrx_events(); bool getTrafficCount(uint64_t& tx, - uint64_t& rx) const; + uint64_t& rx); #endif // ifdef ESP32 virtual NWPluginData_static_runtime* getNWPluginData_static_runtime() = 0; diff --git a/src/ESPEasy/net/DataStructs/NWPluginData_static_runtime.cpp b/src/ESPEasy/net/DataStructs/NWPluginData_static_runtime.cpp index db05cc5ff..a1fe779d8 100644 --- a/src/ESPEasy/net/DataStructs/NWPluginData_static_runtime.cpp +++ b/src/ESPEasy/net/DataStructs/NWPluginData_static_runtime.cpp @@ -12,6 +12,84 @@ namespace net { #define CONNECTION_CONSIDERED_STABLE_MSEC 60000 #define CONNECT_TIMEOUT_MAX 10000 // in milliSeconds +#ifdef ESP32 +struct TX_RX_traffic_count { + + void clear() { _tx_count = 0; _rx_count = 0; } + + uint64_t _tx_count{}; + uint64_t _rx_count{}; + +}; + +typedef std::map InterfaceTrafficCount_t; + +static InterfaceTrafficCount_t interfaceTrafficCount; + +static void tx_rx_event_handler(void *arg, esp_event_base_t event_base, + int32_t event_id, void *event_data) +{ + if (event_data == nullptr) { return; } + ip_event_tx_rx_t *event = (ip_event_tx_rx_t *)event_data; + const int key = esp_netif_get_netif_impl_index(event->esp_netif); + + if (event->dir == ESP_NETIF_TX) { + interfaceTrafficCount[key]._tx_count += event->len; + } else if (event->dir == ESP_NETIF_RX) { + interfaceTrafficCount[key]._rx_count += event->len; +/* + addLog(LOG_LEVEL_INFO, strformat( + F("RX: %s key: %d len: %d total: %d"), + esp_netif_get_desc(event->esp_netif), + key, + event->len, + interfaceTrafficCount[key]._rx_count + )); +*/ + } +} + +#endif // ifdef ESP32 + + +#ifdef ESP32 +void NWPluginData_static_runtime::enable_txrx_events() +{ + if (_netif) { + const int key = _netif->impl_index(); + interfaceTrafficCount[key].clear(); + + if (_netif->netif()) { + static bool registered_IP_EVENT_TX_RX = false; + const int key = esp_netif_get_netif_impl_index(_netif->netif()); + interfaceTrafficCount[key].clear(); + esp_netif_tx_rx_event_enable(_netif->netif()); + + if (!registered_IP_EVENT_TX_RX) { + esp_event_handler_register(IP_EVENT, IP_EVENT_TX_RX, &tx_rx_event_handler, NULL); + registered_IP_EVENT_TX_RX = true; + } + esp_netif_tx_rx_event_enable(_netif->netif()); + } + + // _netif->netif()->tx_rx_events_enabled = true; + } +} + +bool NWPluginData_static_runtime::getTrafficCount(uint64_t& tx, uint64_t& rx) const +{ + const int key = _netif->impl_index(); + auto it = interfaceTrafficCount.find(key); + + if (it == interfaceTrafficCount.end()) { return false; } + tx = it->second._tx_count; + rx = it->second._rx_count; + return true; +} + +#endif + + void NWPluginData_static_runtime::clear(networkIndex_t networkIndex) { _connectedStats.clear(); @@ -19,6 +97,7 @@ void NWPluginData_static_runtime::clear(networkIndex_t networkIndex) #if FEATURE_USE_IPV6 _gotIP6Stats.clear(); #endif + _operationalStats.clear(); _networkIndex = networkIndex; #ifdef ESP32 _route_prio = Settings.getRoutePrio_for_network(_networkIndex); @@ -65,6 +144,7 @@ void NWPluginData_static_runtime::processEvents() _operationalStats.set(operational()); if (_operationalStats.changedSinceLastCheck_and_clear()) { + enable_txrx_events(); // Send out event if (Settings.UseRules && _eventInterfaceName.length()) { diff --git a/src/ESPEasy/net/DataStructs/NWPluginData_static_runtime.h b/src/ESPEasy/net/DataStructs/NWPluginData_static_runtime.h index d10af1224..bf54477ff 100644 --- a/src/ESPEasy/net/DataStructs/NWPluginData_static_runtime.h +++ b/src/ESPEasy/net/DataStructs/NWPluginData_static_runtime.h @@ -26,6 +26,12 @@ struct NWPluginData_static_runtime { #endif // ifdef ESP32 +#ifdef ESP32 + void enable_txrx_events(); + + bool getTrafficCount(uint64_t& tx, uint64_t& rx) const; +#endif + void clear(networkIndex_t networkIndex = INVALID_NETWORK_INDEX); void processEvent_and_clear(); diff --git a/src/ESPEasy/net/wifi/ESPEasyWifi_abstracted_ESP32.cpp b/src/ESPEasy/net/wifi/ESPEasyWifi_abstracted_ESP32.cpp index 8abe729dd..97efdd39c 100644 --- a/src/ESPEasy/net/wifi/ESPEasyWifi_abstracted_ESP32.cpp +++ b/src/ESPEasy/net/wifi/ESPEasyWifi_abstracted_ESP32.cpp @@ -45,8 +45,12 @@ bool WiFi_pre_STA_setup() } void doWiFiDisconnect() { - WiFi.disconnect(Settings.WiFiRestart_connection_lost()); - delay(100); + uint8_t retry = 3; + while (!WiFi.disconnect(Settings.WiFiRestart_connection_lost()) && retry) { + --retry; + delay(100); + } +/* { const IPAddress ip; const IPAddress gw; @@ -54,6 +58,7 @@ void doWiFiDisconnect() { const IPAddress dns; WiFi.config(ip, gw, subnet, dns); } +*/ } bool doWifiIsAP(WiFiMode_t wifimode) { return (wifimode == WIFI_MODE_AP) || (wifimode == WIFI_MODE_APSTA); } From 18300f47a1f845c7d13d4caf923e88261b963523 Mon Sep 17 00:00:00 2001 From: TD-er Date: Tue, 2 Sep 2025 13:08:27 +0200 Subject: [PATCH 238/564] [Network] Add FEATURE_NETWORK_TRAFFIC_COUNT to toggle tracking traffic --- .../net/DataStructs/NWPluginData_base.cpp | 21 +++++++++++-------- .../net/DataStructs/NWPluginData_base.h | 10 +++++---- .../NWPluginData_static_runtime.cpp | 12 +++++------ .../DataStructs/NWPluginData_static_runtime.h | 2 +- src/ESPEasy/net/Globals/NWPlugins.cpp | 8 +++---- .../NW001_data_struct_WiFi_STA.cpp | 6 +++--- .../NW002_data_struct_WiFi_AP.cpp | 5 +++-- .../NW005_data_struct_PPP_modem.cpp | 5 +++-- .../net/wifi/ESPEasyWiFi_state_machine.cpp | 1 - src/src/DataTypes/ESPEasy_plugin_functions.h | 6 ++++-- src/src/WebServer/NetworkPage.cpp | 5 ++--- 11 files changed, 44 insertions(+), 37 deletions(-) diff --git a/src/ESPEasy/net/DataStructs/NWPluginData_base.cpp b/src/ESPEasy/net/DataStructs/NWPluginData_base.cpp index 6fca9e3e5..b77072da2 100644 --- a/src/ESPEasy/net/DataStructs/NWPluginData_base.cpp +++ b/src/ESPEasy/net/DataStructs/NWPluginData_base.cpp @@ -119,13 +119,13 @@ void NWPluginData_base::initPluginStats( } } -# ifdef ESP32 +#if FEATURE_NETWORK_TRAFFIC_COUNT void NWPluginData_base::initPluginStats_trafficCount(networkStatsVarIndex_t networkStatsVarIndex, bool isTX) { PluginStats_Config_t displayConfig; - displayConfig.setAxisPosition(PluginStats_Config_t::AxisPosition::Left); + displayConfig.setAxisPosition(PluginStats_Config_t::AxisPosition::Right); displayConfig.setEnabled(true); displayConfig.setAxisIndex(3); // Set to a fixed index so RX/TX are on the same axis index initPluginStats( @@ -136,17 +136,18 @@ void NWPluginData_base::initPluginStats_trafficCount(networkStatsVarIndex_t netw displayConfig); } -# endif // ifdef ESP32 +# endif bool NWPluginData_base::initPluginStats() { -# ifdef ESP32 +#if FEATURE_NETWORK_TRAFFIC_COUNT + // Virtual function has no override in derived class, so only init traffic count initPluginStats_trafficCount(0, true); // TX initPluginStats_trafficCount(1, false); // RX return true; -# else // ifdef ESP32 +# else return false; -# endif // ifdef ESP32 +# endif } void NWPluginData_base::clearPluginStats(networkStatsVarIndex_t networkStatsVarIndex) @@ -178,7 +179,7 @@ bool NWPluginData_base::pushStatsValues(EventStruct *event, #if FEATURE_PLUGIN_STATS if (_plugin_stats_array != nullptr) { -# ifdef ESP32 +#if FEATURE_NETWORK_TRAFFIC_COUNT // Include traffic uint64_t tx{}; @@ -196,7 +197,7 @@ bool NWPluginData_base::pushStatsValues(EventStruct *event, _prevTX = 0; _prevRX = 0; } -# endif // ifdef ESP32 +# endif if (valueCount) { return _plugin_stats_array->pushStatsValues(event, valueCount, trackPeaks, onlyUpdateTimestampWhenSame); @@ -346,7 +347,9 @@ bool NWPluginData_base::handle_priority_route_changed() } return res; } +#endif +#if FEATURE_NETWORK_TRAFFIC_COUNT void NWPluginData_base::enable_txrx_events() { auto cache = getNWPluginData_static_runtime(); @@ -362,7 +365,7 @@ bool NWPluginData_base::getTrafficCount(uint64_t& tx, uint64_t& rx) return (cache && cache->getTrafficCount(tx, rx)); } -#endif // ifdef ESP32 +#endif #if FEATURE_PLUGIN_STATS diff --git a/src/ESPEasy/net/DataStructs/NWPluginData_base.h b/src/ESPEasy/net/DataStructs/NWPluginData_base.h index bf047ce62..0bb09e560 100644 --- a/src/ESPEasy/net/DataStructs/NWPluginData_base.h +++ b/src/ESPEasy/net/DataStructs/NWPluginData_base.h @@ -102,10 +102,12 @@ struct NWPluginData_base { #ifdef ESP32 virtual bool handle_priority_route_changed(); +#endif +#if FEATURE_NETWORK_TRAFFIC_COUNT void enable_txrx_events(); bool getTrafficCount(uint64_t& tx, uint64_t& rx); -#endif // ifdef ESP32 +#endif virtual NWPluginData_static_runtime* getNWPluginData_static_runtime() = 0; @@ -125,7 +127,7 @@ protected: float errorValue, const PluginStats_Config_t& displayConfig); -#ifdef ESP32 +#if FEATURE_NETWORK_TRAFFIC_COUNT void initPluginStats_trafficCount(networkStatsVarIndex_t networkStatsVarIndex, bool isTX); #endif @@ -168,10 +170,10 @@ protected: #ifdef ESP32 NetworkInterface *_netif{}; -# if FEATURE_PLUGIN_STATS +# if FEATURE_PLUGIN_STATS && FEATURE_NETWORK_TRAFFIC_COUNT uint64_t _prevTX{}; uint64_t _prevRX{}; -# endif // if FEATURE_PLUGIN_STATS +# endif #endif // ifdef ESP32 }; diff --git a/src/ESPEasy/net/DataStructs/NWPluginData_static_runtime.cpp b/src/ESPEasy/net/DataStructs/NWPluginData_static_runtime.cpp index a1fe779d8..3f06b302b 100644 --- a/src/ESPEasy/net/DataStructs/NWPluginData_static_runtime.cpp +++ b/src/ESPEasy/net/DataStructs/NWPluginData_static_runtime.cpp @@ -12,7 +12,7 @@ namespace net { #define CONNECTION_CONSIDERED_STABLE_MSEC 60000 #define CONNECT_TIMEOUT_MAX 10000 // in milliSeconds -#ifdef ESP32 +#if FEATURE_NETWORK_TRAFFIC_COUNT struct TX_RX_traffic_count { void clear() { _tx_count = 0; _rx_count = 0; } @@ -49,10 +49,6 @@ static void tx_rx_event_handler(void *arg, esp_event_base_t event_base, } } -#endif // ifdef ESP32 - - -#ifdef ESP32 void NWPluginData_static_runtime::enable_txrx_events() { if (_netif) { @@ -144,7 +140,11 @@ void NWPluginData_static_runtime::processEvents() _operationalStats.set(operational()); if (_operationalStats.changedSinceLastCheck_and_clear()) { - enable_txrx_events(); +#if FEATURE_NETWORK_TRAFFIC_COUNT + if (_operationalStats.isOn()) { + enable_txrx_events(); + } +#endif // Send out event if (Settings.UseRules && _eventInterfaceName.length()) { diff --git a/src/ESPEasy/net/DataStructs/NWPluginData_static_runtime.h b/src/ESPEasy/net/DataStructs/NWPluginData_static_runtime.h index bf54477ff..b135a8aa2 100644 --- a/src/ESPEasy/net/DataStructs/NWPluginData_static_runtime.h +++ b/src/ESPEasy/net/DataStructs/NWPluginData_static_runtime.h @@ -26,7 +26,7 @@ struct NWPluginData_static_runtime { #endif // ifdef ESP32 -#ifdef ESP32 +#if FEATURE_NETWORK_TRAFFIC_COUNT void enable_txrx_events(); bool getTrafficCount(uint64_t& tx, uint64_t& rx) const; diff --git a/src/ESPEasy/net/Globals/NWPlugins.cpp b/src/ESPEasy/net/Globals/NWPlugins.cpp index d4b4f2742..80a95b035 100644 --- a/src/ESPEasy/net/Globals/NWPlugins.cpp +++ b/src/ESPEasy/net/Globals/NWPlugins.cpp @@ -107,9 +107,9 @@ bool NWPluginCall(NWPlugin::Function Function, EventStruct *event, String& str) } // calls to specific network's NWPluginData_base (must be enabled) -#ifdef ESP32 +#if FEATURE_NETWORK_TRAFFIC_COUNT case NWPlugin::Function::NWPLUGIN_GET_TRAFFIC_COUNT: -#endif // ifdef ESP32 +#endif #if FEATURE_PLUGIN_STATS case NWPlugin::Function::NWPLUGIN_RECORD_STATS: case NWPlugin::Function::NWPLUGIN_WEBFORM_LOAD_SHOW_STATS: @@ -127,7 +127,7 @@ bool NWPluginCall(NWPlugin::Function Function, EventStruct *event, String& str) if (NW_data) { switch (Function) { -#ifdef ESP32 +#if FEATURE_NETWORK_TRAFFIC_COUNT case NWPlugin::Function::NWPLUGIN_GET_TRAFFIC_COUNT: { uint64_t tx{}; @@ -140,7 +140,7 @@ bool NWPluginCall(NWPlugin::Function Function, EventStruct *event, String& str) } break; } -#endif // ifdef ESP32 +#endif #if FEATURE_PLUGIN_STATS case NWPlugin::Function::NWPLUGIN_RECORD_STATS: { diff --git a/src/ESPEasy/net/NWPluginStructs/NW001_data_struct_WiFi_STA.cpp b/src/ESPEasy/net/NWPluginStructs/NW001_data_struct_WiFi_STA.cpp index a667eb07a..abf51f06d 100644 --- a/src/ESPEasy/net/NWPluginStructs/NW001_data_struct_WiFi_STA.cpp +++ b/src/ESPEasy/net/NWPluginStructs/NW001_data_struct_WiFi_STA.cpp @@ -135,7 +135,7 @@ bool NW001_data_struct_WiFi_STA::initPluginStats() networkStatsVarIndex_t networkStatsVarIndex{}; PluginStats_Config_t displayConfig; - displayConfig.setAxisPosition(PluginStats_Config_t::AxisPosition::Right); + displayConfig.setAxisPosition(PluginStats_Config_t::AxisPosition::Left); displayConfig.setEnabled(true); displayConfig.setAxisIndex(networkStatsVarIndex); @@ -156,10 +156,10 @@ bool NW001_data_struct_WiFi_STA::initPluginStats() NAN, displayConfig); # endif // if FEATURE_SET_WIFI_TX_PWR -# ifdef ESP32 +#if FEATURE_NETWORK_TRAFFIC_COUNT initPluginStats_trafficCount(++networkStatsVarIndex, true); // TX initPluginStats_trafficCount(++networkStatsVarIndex, false); // RX -# endif // ifdef ESP32 +# endif return true; } diff --git a/src/ESPEasy/net/NWPluginStructs/NW002_data_struct_WiFi_AP.cpp b/src/ESPEasy/net/NWPluginStructs/NW002_data_struct_WiFi_AP.cpp index 2351f6328..7d488b1a5 100644 --- a/src/ESPEasy/net/NWPluginStructs/NW002_data_struct_WiFi_AP.cpp +++ b/src/ESPEasy/net/NWPluginStructs/NW002_data_struct_WiFi_AP.cpp @@ -136,7 +136,7 @@ bool NW002_data_struct_WiFi_AP::initPluginStats() networkStatsVarIndex_t networkStatsVarIndex{}; PluginStats_Config_t displayConfig; - displayConfig.setAxisPosition(PluginStats_Config_t::AxisPosition::Right); + displayConfig.setAxisPosition(PluginStats_Config_t::AxisPosition::Left); displayConfig.setEnabled(true); displayConfig.setAxisIndex(networkStatsVarIndex); @@ -158,9 +158,10 @@ bool NW002_data_struct_WiFi_AP::initPluginStats() NAN, displayConfig); - +#if FEATURE_NETWORK_TRAFFIC_COUNT initPluginStats_trafficCount(++networkStatsVarIndex, true); // TX initPluginStats_trafficCount(++networkStatsVarIndex, false); // RX +#endif # endif // ifdef ESP32 return true; } diff --git a/src/ESPEasy/net/NWPluginStructs/NW005_data_struct_PPP_modem.cpp b/src/ESPEasy/net/NWPluginStructs/NW005_data_struct_PPP_modem.cpp index 5c88eeec4..fa00c99eb 100644 --- a/src/ESPEasy/net/NWPluginStructs/NW005_data_struct_PPP_modem.cpp +++ b/src/ESPEasy/net/NWPluginStructs/NW005_data_struct_PPP_modem.cpp @@ -944,7 +944,7 @@ bool NW005_data_struct_PPP_modem::initPluginStats() networkStatsVarIndex_t networkStatsVarIndex{}; PluginStats_Config_t displayConfig; - displayConfig.setAxisPosition(PluginStats_Config_t::AxisPosition::Right); + displayConfig.setAxisPosition(PluginStats_Config_t::AxisPosition::Left); displayConfig.setEnabled(true); displayConfig.setAxisIndex(networkStatsVarIndex); @@ -964,9 +964,10 @@ bool NW005_data_struct_PPP_modem::initPluginStats() 1, NAN, displayConfig); - +#if FEATURE_NETWORK_TRAFFIC_COUNT initPluginStats_trafficCount(++networkStatsVarIndex, true); // TX initPluginStats_trafficCount(++networkStatsVarIndex, false); // RX +#endif return true; } diff --git a/src/ESPEasy/net/wifi/ESPEasyWiFi_state_machine.cpp b/src/ESPEasy/net/wifi/ESPEasyWiFi_state_machine.cpp index 6b05ffd13..ae7d56a4c 100644 --- a/src/ESPEasy/net/wifi/ESPEasyWiFi_state_machine.cpp +++ b/src/ESPEasy/net/wifi/ESPEasyWiFi_state_machine.cpp @@ -55,7 +55,6 @@ void ESPEasyWiFi_t::loop() if (!wifi_STA_data) { return; } - if (_state != WiFiState_e::IdleWaiting) { if (_callbackError || (_state_timeout.isSet() && _state_timeout.timeReached())) diff --git a/src/src/DataTypes/ESPEasy_plugin_functions.h b/src/src/DataTypes/ESPEasy_plugin_functions.h index 91a5700ca..17199614c 100644 --- a/src/src/DataTypes/ESPEasy_plugin_functions.h +++ b/src/src/DataTypes/ESPEasy_plugin_functions.h @@ -172,12 +172,14 @@ public: NWPLUGIN_EXIT, NWPLUGIN_WRITE, // Send commands to a network adapter. NWPLUGIN_CREDENTIALS_CHANGED, - #ifdef ESP32 +#ifdef ESP32 NWPLUGIN_GET_INTERFACE, NWPLUGIN_WEBFORM_SHOW_ROUTE_PRIO, NWPLUGIN_PRIORITY_ROUTE_CHANGED, // The default interface was changed, let other interfaces check to see if they need to do something. +#endif +#if FEATURE_NETWORK_TRAFFIC_COUNT NWPLUGIN_GET_TRAFFIC_COUNT, // TX/RX count in event->Par64_1, resp. event->Par64_2 - #endif // ifdef ESP32 +#endif NWPLUGIN_GET_CONNECTED_DURATION, NWPLUGIN_PROCESS_EVENT, // Process received event arduino_event_id_t NWPLUGIN_WEBSERVER_SHOULD_RUN, // Check whether the addressed interface is active and needs the webserver to be active diff --git a/src/src/WebServer/NetworkPage.cpp b/src/src/WebServer/NetworkPage.cpp index 0ea3a3dc4..312107e4e 100644 --- a/src/src/WebServer/NetworkPage.cpp +++ b/src/src/WebServer/NetworkPage.cpp @@ -507,15 +507,14 @@ void handle_networks_NetworkSettingsPage(ESPEasy::net::networkIndex_t networkind addHtmlInt(TempEvent.Par64_2); } -# ifdef ESP32 - +# if FEATURE_NETWORK_TRAFFIC_COUNT if (NWPluginCall(NWPlugin::Function::NWPLUGIN_GET_TRAFFIC_COUNT, &TempEvent, str)) { addRowLabel(F("TX Bytes Total")); addHtmlInt(TempEvent.Par1); addRowLabel(F("RX Bytes Total")); addHtmlInt(TempEvent.Par2); } -# endif // ifdef ESP32 +# endif } } } From 5f484c698bfa38f0bdd9fcb60b9e2527afa8ec4e Mon Sep 17 00:00:00 2001 From: TD-er Date: Tue, 2 Sep 2025 13:12:00 +0200 Subject: [PATCH 239/564] [Network] Add FEATURE_NETWORK_STATS to toggle collecting network stats --- .../net/DataStructs/NWPluginData_base.cpp | 69 ++++++++++--------- .../net/DataStructs/NWPluginData_base.h | 62 +++++++++-------- .../NWPluginData_static_runtime.cpp | 53 +++++++------- .../DataStructs/NWPluginData_static_runtime.h | 11 +-- src/ESPEasy/net/Globals/NWPlugins.cpp | 20 +++--- .../NW001_data_struct_WiFi_STA.cpp | 22 +++--- .../NW001_data_struct_WiFi_STA.h | 4 +- .../NW002_data_struct_WiFi_AP.cpp | 20 +++--- .../NW002_data_struct_WiFi_AP.h | 16 ++--- .../NW005_data_struct_PPP_modem.cpp | 25 +++---- .../NW005_data_struct_PPP_modem.h | 7 +- src/ESPEasy/net/_NWPlugin_Helper.cpp | 4 +- src/src/CustomBuild/define_plugin_sets.h | 21 ++++++ src/src/DataTypes/ESPEasy_plugin_functions.h | 8 +-- src/src/Helpers/ESPEasy_time.cpp | 2 + src/src/Helpers/PeriodicalActions.cpp | 2 +- src/src/WebServer/NetworkPage.cpp | 30 ++++---- 17 files changed, 207 insertions(+), 169 deletions(-) diff --git a/src/ESPEasy/net/DataStructs/NWPluginData_base.cpp b/src/ESPEasy/net/DataStructs/NWPluginData_base.cpp index b77072da2..30d92edce 100644 --- a/src/ESPEasy/net/DataStructs/NWPluginData_base.cpp +++ b/src/ESPEasy/net/DataStructs/NWPluginData_base.cpp @@ -23,9 +23,9 @@ NWPluginData_base::NWPluginData_base( , NetworkInterface *netif #endif ) : -#if FEATURE_PLUGIN_STATS +#if FEATURE_NETWORK_STATS _plugin_stats_array(nullptr), -#endif // if FEATURE_PLUGIN_STATS +#endif // if FEATURE_NETWORK_STATS #if FEATURE_STORE_NETWORK_INTERFACE_SETTINGS _kvs(nullptr), @@ -47,10 +47,10 @@ NWPluginData_base::NWPluginData_base( NWPluginData_base::~NWPluginData_base() { -#if FEATURE_PLUGIN_STATS +#if FEATURE_NETWORK_STATS delete _plugin_stats_array; _plugin_stats_array = nullptr; -#endif // if FEATURE_PLUGIN_STATS +#endif // if FEATURE_NETWORK_STATS #if FEATURE_STORE_NETWORK_INTERFACE_SETTINGS @@ -60,36 +60,36 @@ NWPluginData_base::~NWPluginData_base() } bool NWPluginData_base::hasPluginStats() const { -#if FEATURE_PLUGIN_STATS +#if FEATURE_NETWORK_STATS if (_plugin_stats_array != nullptr) { return _plugin_stats_array->hasStats(); } -#endif // if FEATURE_PLUGIN_STATS +#endif // if FEATURE_NETWORK_STATS return false; } bool NWPluginData_base::hasPeaks() const { -#if FEATURE_PLUGIN_STATS +#if FEATURE_NETWORK_STATS if (_plugin_stats_array != nullptr) { return _plugin_stats_array->hasPeaks(); } -#endif // if FEATURE_PLUGIN_STATS +#endif // if FEATURE_NETWORK_STATS return false; } size_t NWPluginData_base::nrSamplesPresent() const { -#if FEATURE_PLUGIN_STATS +#if FEATURE_NETWORK_STATS if (_plugin_stats_array != nullptr) { return _plugin_stats_array->nrSamplesPresent(); } -#endif // if FEATURE_PLUGIN_STATS +#endif // if FEATURE_NETWORK_STATS return 0; } -#if FEATURE_PLUGIN_STATS +#if FEATURE_NETWORK_STATS void NWPluginData_base::initPluginStats( networkStatsVarIndex_t networkStatsVarIndex, @@ -119,7 +119,7 @@ void NWPluginData_base::initPluginStats( } } -#if FEATURE_NETWORK_TRAFFIC_COUNT +# if FEATURE_NETWORK_TRAFFIC_COUNT void NWPluginData_base::initPluginStats_trafficCount(networkStatsVarIndex_t networkStatsVarIndex, bool isTX) { @@ -136,18 +136,19 @@ void NWPluginData_base::initPluginStats_trafficCount(networkStatsVarIndex_t netw displayConfig); } -# endif +# endif // if FEATURE_NETWORK_TRAFFIC_COUNT bool NWPluginData_base::initPluginStats() { -#if FEATURE_NETWORK_TRAFFIC_COUNT +# if FEATURE_NETWORK_TRAFFIC_COUNT + // Virtual function has no override in derived class, so only init traffic count initPluginStats_trafficCount(0, true); // TX initPluginStats_trafficCount(1, false); // RX return true; -# else +# else // if FEATURE_NETWORK_TRAFFIC_COUNT return false; -# endif +# endif // if FEATURE_NETWORK_TRAFFIC_COUNT } void NWPluginData_base::clearPluginStats(networkStatsVarIndex_t networkStatsVarIndex) @@ -169,17 +170,17 @@ void NWPluginData_base::processTimeSet(const double& time_offset) } } -#endif // if FEATURE_PLUGIN_STATS +#endif // if FEATURE_NETWORK_STATS bool NWPluginData_base::pushStatsValues(EventStruct *event, size_t valueCount, bool trackPeaks, bool onlyUpdateTimestampWhenSame) { -#if FEATURE_PLUGIN_STATS +#if FEATURE_NETWORK_STATS if (_plugin_stats_array != nullptr) { -#if FEATURE_NETWORK_TRAFFIC_COUNT +# if FEATURE_NETWORK_TRAFFIC_COUNT // Include traffic uint64_t tx{}; @@ -197,30 +198,30 @@ bool NWPluginData_base::pushStatsValues(EventStruct *event, _prevTX = 0; _prevRX = 0; } -# endif +# endif // if FEATURE_NETWORK_TRAFFIC_COUNT if (valueCount) { return _plugin_stats_array->pushStatsValues(event, valueCount, trackPeaks, onlyUpdateTimestampWhenSame); } } -#endif // if FEATURE_PLUGIN_STATS +#endif // if FEATURE_NETWORK_STATS return false; } bool NWPluginData_base::plugin_write_base(EventStruct *event, const String& string) { -#if FEATURE_PLUGIN_STATS +#if FEATURE_NETWORK_STATS if (_plugin_stats_array != nullptr) { return _plugin_stats_array->plugin_write_base(event, string); } -#endif // if FEATURE_PLUGIN_STATS +#endif // if FEATURE_NETWORK_STATS return false; } -#if FEATURE_PLUGIN_STATS +#if FEATURE_NETWORK_STATS bool NWPluginData_base::record_stats() { @@ -283,7 +284,7 @@ void NWPluginData_base::plot_ChartJS_scatter( } # endif // if FEATURE_CHART_JS -#endif // if FEATURE_PLUGIN_STATS +#endif // if FEATURE_NETWORK_STATS #if FEATURE_STORE_NETWORK_INTERFACE_SETTINGS @@ -309,10 +310,7 @@ LongTermTimer::Duration NWPluginData_base::getConnectedDuration_ms() { return 0; } -bool NWPluginData_base::handle_nwplugin_write(EventStruct *event, String& str) -{ - return false; -} +bool NWPluginData_base::handle_nwplugin_write(EventStruct *event, String& str) { return false; } #ifdef ESP32 @@ -347,12 +345,15 @@ bool NWPluginData_base::handle_priority_route_changed() } return res; } -#endif + +#endif // ifdef ESP32 #if FEATURE_NETWORK_TRAFFIC_COUNT + void NWPluginData_base::enable_txrx_events() { auto cache = getNWPluginData_static_runtime(); + if (cache) { cache->enable_txrx_events(); } @@ -362,12 +363,12 @@ bool NWPluginData_base::getTrafficCount(uint64_t& tx, uint64_t& rx) { if (!_netif) { return false; } auto cache = getNWPluginData_static_runtime(); - return (cache && cache->getTrafficCount(tx, rx)); + return cache && cache->getTrafficCount(tx, rx); } -#endif +#endif // if FEATURE_NETWORK_TRAFFIC_COUNT -#if FEATURE_PLUGIN_STATS +#if FEATURE_NETWORK_STATS PluginStats * NWPluginData_base::getPluginStats(networkStatsVarIndex_t networkStatsVarIndex) const { @@ -385,7 +386,7 @@ PluginStats * NWPluginData_base::getPluginStats(networkStatsVarIndex_t networkSt return nullptr; } -#endif // if FEATURE_PLUGIN_STATS +#endif // if FEATURE_NETWORK_STATS #ifdef ESP32 diff --git a/src/ESPEasy/net/DataStructs/NWPluginData_base.h b/src/ESPEasy/net/DataStructs/NWPluginData_base.h index 0bb09e560..0f3910392 100644 --- a/src/ESPEasy/net/DataStructs/NWPluginData_base.h +++ b/src/ESPEasy/net/DataStructs/NWPluginData_base.h @@ -42,39 +42,39 @@ struct NWPluginData_base { return _baseClassOnly; } - bool hasPluginStats() const; + bool hasPluginStats() const; - bool hasPeaks() const; + bool hasPeaks() const; - size_t nrSamplesPresent() const; + size_t nrSamplesPresent() const; - #if FEATURE_PLUGIN_STATS + #if FEATURE_NETWORK_STATS virtual bool initPluginStats(); - void clearPluginStats(networkStatsVarIndex_t networkStatsVarIndex); + void clearPluginStats(networkStatsVarIndex_t networkStatsVarIndex); // Update any logged timestamp with this newly set system time. - void processTimeSet(const double& time_offset); - #endif // if FEATURE_PLUGIN_STATS + void processTimeSet(const double& time_offset); + #endif // if FEATURE_NETWORK_STATS bool pushStatsValues(EventStruct *event, - size_t valueCount, - bool trackPeaks, - bool onlyUpdateTimestampWhenSame); + size_t valueCount, + bool trackPeaks, + bool onlyUpdateTimestampWhenSame); - bool plugin_write_base(EventStruct *event, - const String & string); + bool plugin_write_base(EventStruct *event, + const String& string); -#if FEATURE_PLUGIN_STATS +#if FEATURE_NETWORK_STATS virtual bool record_stats(); virtual bool webformLoad_show_stats(EventStruct *event) const; # if FEATURE_CHART_JS - void plot_ChartJS(bool onlyJSON = false) const; + void plot_ChartJS(bool onlyJSON = false) const; - void plot_ChartJS_scatter( + void plot_ChartJS_scatter( networkStatsVarIndex_t values_X_axis_index, networkStatsVarIndex_t values_Y_axis_index, const __FlashStringHelper *id, @@ -87,7 +87,7 @@ struct NWPluginData_base { bool onlyJSON = false) const; # endif // if FEATURE_CHART_JS -#endif // if FEATURE_PLUGIN_STATS +#endif // if FEATURE_NETWORK_STATS // Should only be called from initNWPluginData @@ -98,21 +98,22 @@ struct NWPluginData_base { nwpluginID_t getNWPluginID() const { return _nw_data_pluginID; } virtual LongTermTimer::Duration getConnectedDuration_ms(); - virtual bool handle_nwplugin_write(EventStruct *event, String& str); + virtual bool handle_nwplugin_write(EventStruct *event, + String & str); #ifdef ESP32 - virtual bool handle_priority_route_changed(); + virtual bool handle_priority_route_changed(); #endif #if FEATURE_NETWORK_TRAFFIC_COUNT - void enable_txrx_events(); - bool getTrafficCount(uint64_t& tx, - uint64_t& rx); -#endif + void enable_txrx_events(); + bool getTrafficCount(uint64_t& tx, + uint64_t& rx); +#endif // if FEATURE_NETWORK_TRAFFIC_COUNT virtual NWPluginData_static_runtime* getNWPluginData_static_runtime() = 0; -#if FEATURE_PLUGIN_STATS +#if FEATURE_NETWORK_STATS PluginStats* getPluginStats(networkStatsVarIndex_t networkStatsVarIndex) const; @@ -120,21 +121,22 @@ struct NWPluginData_base { protected: - void initPluginStats( + void initPluginStats( networkStatsVarIndex_t networkStatsVarIndex, const String & label, uint8_t nrDecimals, float errorValue, const PluginStats_Config_t& displayConfig); -#if FEATURE_NETWORK_TRAFFIC_COUNT -void initPluginStats_trafficCount(networkStatsVarIndex_t networkStatsVarIndex, bool isTX); -#endif +# if FEATURE_NETWORK_TRAFFIC_COUNT + void initPluginStats_trafficCount(networkStatsVarIndex_t networkStatsVarIndex, + bool isTX); +# endif // if FEATURE_NETWORK_TRAFFIC_COUNT // Array of pointers to PluginStats. One per task value. PluginStats_array *_plugin_stats_array = nullptr; -#endif // if FEATURE_PLUGIN_STATS +#endif // if FEATURE_NETWORK_STATS protected: @@ -170,10 +172,10 @@ protected: #ifdef ESP32 NetworkInterface *_netif{}; -# if FEATURE_PLUGIN_STATS && FEATURE_NETWORK_TRAFFIC_COUNT +# if FEATURE_NETWORK_STATS && FEATURE_NETWORK_TRAFFIC_COUNT uint64_t _prevTX{}; uint64_t _prevRX{}; -# endif +# endif // if FEATURE_NETWORK_STATS && FEATURE_NETWORK_TRAFFIC_COUNT #endif // ifdef ESP32 }; diff --git a/src/ESPEasy/net/DataStructs/NWPluginData_static_runtime.cpp b/src/ESPEasy/net/DataStructs/NWPluginData_static_runtime.cpp index 3f06b302b..add0b3911 100644 --- a/src/ESPEasy/net/DataStructs/NWPluginData_static_runtime.cpp +++ b/src/ESPEasy/net/DataStructs/NWPluginData_static_runtime.cpp @@ -37,15 +37,16 @@ static void tx_rx_event_handler(void *arg, esp_event_base_t event_base, interfaceTrafficCount[key]._tx_count += event->len; } else if (event->dir == ESP_NETIF_RX) { interfaceTrafficCount[key]._rx_count += event->len; -/* - addLog(LOG_LEVEL_INFO, strformat( - F("RX: %s key: %d len: %d total: %d"), - esp_netif_get_desc(event->esp_netif), - key, - event->len, - interfaceTrafficCount[key]._rx_count - )); -*/ + + /* + addLog(LOG_LEVEL_INFO, strformat( + F("RX: %s key: %d len: %d total: %d"), + esp_netif_get_desc(event->esp_netif), + key, + event->len, + interfaceTrafficCount[key]._rx_count + )); + */ } } @@ -57,7 +58,7 @@ void NWPluginData_static_runtime::enable_txrx_events() if (_netif->netif()) { static bool registered_IP_EVENT_TX_RX = false; - const int key = esp_netif_get_netif_impl_index(_netif->netif()); + const int key = esp_netif_get_netif_impl_index(_netif->netif()); interfaceTrafficCount[key].clear(); esp_netif_tx_rx_event_enable(_netif->netif()); @@ -83,8 +84,7 @@ bool NWPluginData_static_runtime::getTrafficCount(uint64_t& tx, uint64_t& rx) co return true; } -#endif - +#endif // if FEATURE_NETWORK_TRAFFIC_COUNT void NWPluginData_static_runtime::clear(networkIndex_t networkIndex) { @@ -97,13 +97,14 @@ void NWPluginData_static_runtime::clear(networkIndex_t networkIndex) _networkIndex = networkIndex; #ifdef ESP32 _route_prio = Settings.getRoutePrio_for_network(_networkIndex); + if (_netif) { - if (_eventInterfaceName.length() == 0 && _netif) { + if ((_eventInterfaceName.length() == 0) && _netif) { _eventInterfaceName = _netif->desc(); _eventInterfaceName.toUpperCase(); } } -#endif +#endif // ifdef ESP32 _connectionFailures = 0; @@ -116,13 +117,13 @@ void NWPluginData_static_runtime::processEvent_and_clear() clear(); } - bool NWPluginData_static_runtime::operational() const { return started() && connected() && hasIP() - && Settings.getNetworkEnabled(_networkIndex); - // FIXME TD-er: WiFi STA keeps reporting it is - // connected and has IP even after call to networkdisable,1 + && Settings.getNetworkEnabled(_networkIndex); + + // FIXME TD-er: WiFi STA keeps reporting it is + // connected and has IP even after call to networkdisable,1 } void NWPluginData_static_runtime::processEvents() @@ -131,7 +132,8 @@ void NWPluginData_static_runtime::processEvents() { if (_establishConnectStats.isOn()) { log_connected(); -// _establishConnectStats.resetCount(); + + // _establishConnectStats.resetCount(); } else { log_disconnected(); } @@ -139,23 +141,26 @@ void NWPluginData_static_runtime::processEvents() _operationalStats.set(operational()); + if (_operationalStats.changedSinceLastCheck_and_clear()) { #if FEATURE_NETWORK_TRAFFIC_COUNT + if (_operationalStats.isOn()) { enable_txrx_events(); } -#endif +#endif // if FEATURE_NETWORK_TRAFFIC_COUNT + // Send out event if (Settings.UseRules && _eventInterfaceName.length()) { if (_operationalStats.isOn()) { eventQueue.add(concat( - _eventInterfaceName, - F("#Connected"))); + _eventInterfaceName, + F("#Connected"))); } else { eventQueue.add(concat( - _eventInterfaceName, - F("#Disconnected"))); + _eventInterfaceName, + F("#Disconnected"))); } } statusLED(true); diff --git a/src/ESPEasy/net/DataStructs/NWPluginData_static_runtime.h b/src/ESPEasy/net/DataStructs/NWPluginData_static_runtime.h index b135a8aa2..647244dc3 100644 --- a/src/ESPEasy/net/DataStructs/NWPluginData_static_runtime.h +++ b/src/ESPEasy/net/DataStructs/NWPluginData_static_runtime.h @@ -21,16 +21,17 @@ struct NWPluginData_static_runtime { NWPluginData_static_runtime(NetworkInterface *netif, const String & eventInterfaceName = EMPTY_STRING); #else // ifdef ESP32 - NWPluginData_static_runtime(bool isSTA, - const char * eventInterfaceName); + NWPluginData_static_runtime(bool isSTA, + const char *eventInterfaceName); #endif // ifdef ESP32 #if FEATURE_NETWORK_TRAFFIC_COUNT - void enable_txrx_events(); + void enable_txrx_events(); - bool getTrafficCount(uint64_t& tx, uint64_t& rx) const; -#endif + bool getTrafficCount(uint64_t& tx, + uint64_t& rx) const; +#endif // if FEATURE_NETWORK_TRAFFIC_COUNT void clear(networkIndex_t networkIndex = INVALID_NETWORK_INDEX); diff --git a/src/ESPEasy/net/Globals/NWPlugins.cpp b/src/ESPEasy/net/Globals/NWPlugins.cpp index 80a95b035..7ec41be27 100644 --- a/src/ESPEasy/net/Globals/NWPlugins.cpp +++ b/src/ESPEasy/net/Globals/NWPlugins.cpp @@ -94,8 +94,8 @@ bool NWPluginCall(NWPlugin::Function Function, EventStruct *event, String& str) Function, event, command)) { - if (Function == NWPlugin::Function::NWPLUGIN_WRITE || - Function == NWPlugin::Function::NWPLUGIN_WEBSERVER_SHOULD_RUN) { + if ((Function == NWPlugin::Function::NWPLUGIN_WRITE) || + (Function == NWPlugin::Function::NWPLUGIN_WEBSERVER_SHOULD_RUN)) { // Need to stop when call was handled return true; } @@ -110,10 +110,10 @@ bool NWPluginCall(NWPlugin::Function Function, EventStruct *event, String& str) #if FEATURE_NETWORK_TRAFFIC_COUNT case NWPlugin::Function::NWPLUGIN_GET_TRAFFIC_COUNT: #endif -#if FEATURE_PLUGIN_STATS +#if FEATURE_NETWORK_STATS case NWPlugin::Function::NWPLUGIN_RECORD_STATS: case NWPlugin::Function::NWPLUGIN_WEBFORM_LOAD_SHOW_STATS: -#endif // if FEATURE_PLUGIN_STATS +#endif // if FEATURE_NETWORK_STATS case NWPlugin::Function::NWPLUGIN_PROCESS_EVENT: case NWPlugin::Function::NWPLUGIN_GET_CONNECTED_DURATION: { @@ -140,8 +140,8 @@ bool NWPluginCall(NWPlugin::Function Function, EventStruct *event, String& str) } break; } -#endif -#if FEATURE_PLUGIN_STATS +#endif // if FEATURE_NETWORK_TRAFFIC_COUNT +#if FEATURE_NETWORK_STATS case NWPlugin::Function::NWPLUGIN_RECORD_STATS: { // NWPluginData_static_runtime& runtime_data = NW_data->getNWPluginData_static_runtime(); @@ -154,11 +154,12 @@ bool NWPluginCall(NWPlugin::Function Function, EventStruct *event, String& str) success = NW_data->webformLoad_show_stats(event); break; } -#endif // if FEATURE_PLUGIN_STATS +#endif // if FEATURE_NETWORK_STATS case NWPlugin::Function::NWPLUGIN_PROCESS_EVENT: { auto runtimeData = NW_data->getNWPluginData_static_runtime(); + if (runtimeData) { runtimeData->processEvents(); } @@ -313,9 +314,9 @@ bool NWPluginCall(NWPlugin::Function Function, EventStruct *event, String& str) // Cache.clearNetworkSettings(networkIndex); auto data = getNWPluginData_static_runtime(event->NetworkIndex); - if (data) { + if (data) { delay(100); // Allow some time to process events - data->processEvent_and_clear(); + data->processEvent_and_clear(); } } @@ -416,6 +417,7 @@ const NWPluginData_static_runtime* getDefaultRoute_NWPluginData_static_runtime() void processNetworkEvents() { START_TIMER; + for (networkIndex_t i = 0; i < NETWORK_MAX; ++i) { EventStruct tmpEvent; tmpEvent.NetworkIndex = i; diff --git a/src/ESPEasy/net/NWPluginStructs/NW001_data_struct_WiFi_STA.cpp b/src/ESPEasy/net/NWPluginStructs/NW001_data_struct_WiFi_STA.cpp index abf51f06d..0dc1dca30 100644 --- a/src/ESPEasy/net/NWPluginStructs/NW001_data_struct_WiFi_STA.cpp +++ b/src/ESPEasy/net/NWPluginStructs/NW001_data_struct_WiFi_STA.cpp @@ -106,7 +106,7 @@ bool NW001_data_struct_WiFi_STA::exit(EventStruct *event) { return true; } -NWPluginData_static_runtime* NW001_data_struct_WiFi_STA::getNWPluginData_static_runtime() { +NWPluginData_static_runtime * NW001_data_struct_WiFi_STA::getNWPluginData_static_runtime() { return _WiFiEventHandler.getNWPluginData_static_runtime(); } @@ -128,7 +128,7 @@ bool NW001_data_struct_WiFi_STA::handle_priority_route_changed() # endif // ifdef ESP32 -# if FEATURE_PLUGIN_STATS +# if FEATURE_NETWORK_STATS bool NW001_data_struct_WiFi_STA::initPluginStats() { @@ -156,10 +156,10 @@ bool NW001_data_struct_WiFi_STA::initPluginStats() NAN, displayConfig); # endif // if FEATURE_SET_WIFI_TX_PWR -#if FEATURE_NETWORK_TRAFFIC_COUNT +# if FEATURE_NETWORK_TRAFFIC_COUNT initPluginStats_trafficCount(++networkStatsVarIndex, true); // TX initPluginStats_trafficCount(++networkStatsVarIndex, false); // RX -# endif +# endif // if FEATURE_NETWORK_TRAFFIC_COUNT return true; } @@ -168,15 +168,15 @@ bool NW001_data_struct_WiFi_STA::record_stats() if (_plugin_stats_array != nullptr) { EventStruct tmpEvent; size_t valueCount{}; - tmpEvent.ParfN[valueCount++] = - #ifdef ESP32 + tmpEvent.ParfN[valueCount++] = + # ifdef ESP32 WiFi.STA.RSSI(); - #else + # else WiFi.RSSI(); - #endif -# if FEATURE_SET_WIFI_TX_PWR + # endif // ifdef ESP32 +# if FEATURE_SET_WIFI_TX_PWR tmpEvent.ParfN[valueCount++] = ESPEasy::net::wifi::GetWiFiTXpower(); -# endif +# endif bool trackPeaks = true; bool onlyUpdateTimestampWhenSame = true; @@ -205,7 +205,7 @@ bool NW001_data_struct_WiFi_STA::webformLoad_show_stats(struct EventStruct *even return false; } -# endif // if FEATURE_PLUGIN_STATS +# endif // if FEATURE_NETWORK_STATS } // namespace wifi diff --git a/src/ESPEasy/net/NWPluginStructs/NW001_data_struct_WiFi_STA.h b/src/ESPEasy/net/NWPluginStructs/NW001_data_struct_WiFi_STA.h index 8fd210633..e1f894f92 100644 --- a/src/ESPEasy/net/NWPluginStructs/NW001_data_struct_WiFi_STA.h +++ b/src/ESPEasy/net/NWPluginStructs/NW001_data_struct_WiFi_STA.h @@ -34,11 +34,11 @@ struct NW001_data_struct_WiFi_STA : public NWPluginData_base { bool handle_priority_route_changed() override; # endif -# if FEATURE_PLUGIN_STATS +# if FEATURE_NETWORK_STATS bool initPluginStats() override; bool record_stats() override; bool webformLoad_show_stats(struct EventStruct *event) const override; -# endif // if FEATURE_PLUGIN_STATS +# endif // if FEATURE_NETWORK_STATS NWPluginData_static_runtime* getNWPluginData_static_runtime(); const __FlashStringHelper* getWiFi_encryptionType() const; diff --git a/src/ESPEasy/net/NWPluginStructs/NW002_data_struct_WiFi_AP.cpp b/src/ESPEasy/net/NWPluginStructs/NW002_data_struct_WiFi_AP.cpp index 7d488b1a5..96f151ba4 100644 --- a/src/ESPEasy/net/NWPluginStructs/NW002_data_struct_WiFi_AP.cpp +++ b/src/ESPEasy/net/NWPluginStructs/NW002_data_struct_WiFi_AP.cpp @@ -13,7 +13,7 @@ # ifdef ESP32 # include # include -# endif +# endif // ifdef ESP32 # define NW_PLUGIN_ID 2 # ifdef ESP32 @@ -114,14 +114,14 @@ bool NW002_data_struct_WiFi_AP::exit(EventStruct *event) return true; } -NWPluginData_static_runtime* NW002_data_struct_WiFi_AP::getNWPluginData_static_runtime() -{ - if (nw002_initialized) - return &stats_and_cache; +NWPluginData_static_runtime * NW002_data_struct_WiFi_AP::getNWPluginData_static_runtime() +{ + if (nw002_initialized) { + return &stats_and_cache; + } return nullptr; } - # ifdef ESP32 bool NW002_data_struct_WiFi_AP::handle_priority_route_changed() { return NW002_update_NAPT(); } @@ -129,7 +129,7 @@ bool NW002_data_struct_WiFi_AP::handle_priority_route_changed() { return NW002_u # endif // ifdef ESP32 -# if FEATURE_PLUGIN_STATS +# if FEATURE_NETWORK_STATS bool NW002_data_struct_WiFi_AP::initPluginStats() { @@ -158,10 +158,10 @@ bool NW002_data_struct_WiFi_AP::initPluginStats() NAN, displayConfig); -#if FEATURE_NETWORK_TRAFFIC_COUNT +# if FEATURE_NETWORK_TRAFFIC_COUNT initPluginStats_trafficCount(++networkStatsVarIndex, true); // TX initPluginStats_trafficCount(++networkStatsVarIndex, false); // RX -#endif +# endif // if FEATURE_NETWORK_TRAFFIC_COUNT # endif // ifdef ESP32 return true; } @@ -208,7 +208,7 @@ bool NW002_data_struct_WiFi_AP::webformLoad_show_stats(struct EventStruct *event return false; } -# endif // if FEATURE_PLUGIN_STATS +# endif // if FEATURE_NETWORK_STATS # ifdef ESP32 diff --git a/src/ESPEasy/net/NWPluginStructs/NW002_data_struct_WiFi_AP.h b/src/ESPEasy/net/NWPluginStructs/NW002_data_struct_WiFi_AP.h index 5d194ae91..351ae8a61 100644 --- a/src/ESPEasy/net/NWPluginStructs/NW002_data_struct_WiFi_AP.h +++ b/src/ESPEasy/net/NWPluginStructs/NW002_data_struct_WiFi_AP.h @@ -14,24 +14,24 @@ struct NW002_data_struct_WiFi_AP : public NWPluginData_base { ~NW002_data_struct_WiFi_AP(); - void webform_load(EventStruct *event); - void webform_save(EventStruct *event); + void webform_load(EventStruct *event); + void webform_save(EventStruct *event); - bool webform_getPort(String& str); + bool webform_getPort(String& str); - bool init(EventStruct *event); + bool init(EventStruct *event); - bool exit(EventStruct *event); + bool exit(EventStruct *event); # ifdef ESP32 - bool handle_priority_route_changed() override; + bool handle_priority_route_changed() override; # endif -# if FEATURE_PLUGIN_STATS +# if FEATURE_NETWORK_STATS bool initPluginStats() override; bool record_stats() override; bool webformLoad_show_stats(struct EventStruct *event) const override; -# endif // if FEATURE_PLUGIN_STATS +# endif // if FEATURE_NETWORK_STATS NWPluginData_static_runtime* getNWPluginData_static_runtime(); diff --git a/src/ESPEasy/net/NWPluginStructs/NW005_data_struct_PPP_modem.cpp b/src/ESPEasy/net/NWPluginStructs/NW005_data_struct_PPP_modem.cpp index fa00c99eb..067f6ab44 100644 --- a/src/ESPEasy/net/NWPluginStructs/NW005_data_struct_PPP_modem.cpp +++ b/src/ESPEasy/net/NWPluginStructs/NW005_data_struct_PPP_modem.cpp @@ -156,8 +156,10 @@ ppp_modem_model_t to_ppp_modem_model_t(NW005_modem_model NW005_modemmodel) int doGetRSSI() { const int rssi_raw = NW_PLUGIN_INTERFACE.RSSI(); - if (rssi_raw == 0) return -113; - if (rssi_raw == 99) return 0; + + if (rssi_raw == 0) { return -113; } + + if (rssi_raw == 99) { return 0; } return map(rssi_raw, 2, 30, -109, -53); } @@ -914,9 +916,9 @@ String NW005_data_struct_PPP_modem::write_AT_cmd(const String& cmd, int timeout) return res; } -bool NW005_data_struct_PPP_modem::handle_nwplugin_write(EventStruct *event, String& str) +bool NW005_data_struct_PPP_modem::handle_nwplugin_write(EventStruct *event, String& str) { - bool success = false; + bool success = false; const String command = parseString(str, 1); if (equals(command, F("ppp"))) { @@ -926,9 +928,9 @@ bool NW005_data_struct_PPP_modem::handle_nwplugin_write(EventStruct *event, Str const String writeCommand = parseStringToEnd(str, 3); const String res = write_AT_cmd(writeCommand); addLog(LOG_LEVEL_INFO, strformat( - F("PPP cmd: %s -> %s"), - writeCommand.c_str(), - res.c_str())); + F("PPP cmd: %s -> %s"), + writeCommand.c_str(), + res.c_str())); success = true; SendStatus(event, res); } @@ -936,8 +938,7 @@ bool NW005_data_struct_PPP_modem::handle_nwplugin_write(EventStruct *event, Str return success; } - -# if FEATURE_PLUGIN_STATS +# if FEATURE_NETWORK_STATS bool NW005_data_struct_PPP_modem::initPluginStats() { @@ -964,10 +965,10 @@ bool NW005_data_struct_PPP_modem::initPluginStats() 1, NAN, displayConfig); -#if FEATURE_NETWORK_TRAFFIC_COUNT +# if FEATURE_NETWORK_TRAFFIC_COUNT initPluginStats_trafficCount(++networkStatsVarIndex, true); // TX initPluginStats_trafficCount(++networkStatsVarIndex, false); // RX -#endif +# endif // if FEATURE_NETWORK_TRAFFIC_COUNT return true; } @@ -986,7 +987,7 @@ bool NW005_data_struct_PPP_modem::record_stats() return false; } -# endif // if FEATURE_PLUGIN_STATS +# endif // if FEATURE_NETWORK_STATS NWPluginData_static_runtime * NW005_data_struct_PPP_modem::getNWPluginData_static_runtime() { return &stats_and_cache; } diff --git a/src/ESPEasy/net/NWPluginStructs/NW005_data_struct_PPP_modem.h b/src/ESPEasy/net/NWPluginStructs/NW005_data_struct_PPP_modem.h index a6b45b4ed..4c320fc10 100644 --- a/src/ESPEasy/net/NWPluginStructs/NW005_data_struct_PPP_modem.h +++ b/src/ESPEasy/net/NWPluginStructs/NW005_data_struct_PPP_modem.h @@ -50,15 +50,16 @@ struct NW005_data_struct_PPP_modem : public NWPluginData_base { bool exit(EventStruct *event); - bool handle_nwplugin_write(EventStruct *event, String& str) override; + bool handle_nwplugin_write(EventStruct *event, + String & str) override; String write_AT_cmd(const String& cmd, int timeout = 1000); -# if FEATURE_PLUGIN_STATS +# if FEATURE_NETWORK_STATS bool initPluginStats() override; bool record_stats() override; -# endif // if FEATURE_PLUGIN_STATS +# endif // if FEATURE_NETWORK_STATS NWPluginData_static_runtime* getNWPluginData_static_runtime(); diff --git a/src/ESPEasy/net/_NWPlugin_Helper.cpp b/src/ESPEasy/net/_NWPlugin_Helper.cpp index 31d0d055a..8f83b49da 100644 --- a/src/ESPEasy/net/_NWPlugin_Helper.cpp +++ b/src/ESPEasy/net/_NWPlugin_Helper.cpp @@ -56,10 +56,10 @@ bool initNWPluginData(ESPEasy::net::networkIndex_t networkIndex, NWPluginData_ba #else // if FEATURE_STORE_NETWORK_INTERFACE_SETTINGS NWPlugin_task_data[networkIndex] = data; #endif // if FEATURE_STORE_NETWORK_INTERFACE_SETTINGS -#if FEATURE_PLUGIN_STATS +#if FEATURE_NETWORK_STATS NWPlugin_task_data[networkIndex]->initPluginStats(); -#endif // if FEATURE_PLUGIN_STATS +#endif } else { delete data; diff --git a/src/src/CustomBuild/define_plugin_sets.h b/src/src/CustomBuild/define_plugin_sets.h index 72aa10b73..b947a614b 100644 --- a/src/src/CustomBuild/define_plugin_sets.h +++ b/src/src/CustomBuild/define_plugin_sets.h @@ -1156,6 +1156,12 @@ To create/register a plugin, you have to : #ifndef FEATURE_PLUGIN_STATS #define FEATURE_PLUGIN_STATS 1 #endif + #ifndef FEATURE_NETWORK_STATS + #define FEATURE_NETWORK_STATS 1 + #endif + #ifndef FEATURE_NETWORK_TRAFFIC_COUNT + #define FEATURE_NETWORK_TRAFFIC_COUNT 1 + #endif #ifndef FEATURE_CHART_JS #define FEATURE_CHART_JS 1 #endif @@ -3350,6 +3356,21 @@ To create/register a plugin, you have to : #define FEATURE_PLUGIN_STATS 0 #endif +#if FEATURE_NETWORK_STATS && !FEATURE_PLUGIN_STATS +// FEATURE_NETWORK_STATS requires FEATURE_PLUGIN_STATS +#undef FEATURE_NETWORK_STATS +#endif + + +#ifndef FEATURE_NETWORK_STATS +#define FEATURE_NETWORK_STATS 0 +#endif + +#ifndef FEATURE_NETWORK_TRAFFIC_COUNT +#define FEATURE_NETWORK_TRAFFIC_COUNT 0 +#endif + + #ifndef FEATURE_REPORTING #define FEATURE_REPORTING 0 #endif diff --git a/src/src/DataTypes/ESPEasy_plugin_functions.h b/src/src/DataTypes/ESPEasy_plugin_functions.h index 17199614c..e3dcfa640 100644 --- a/src/src/DataTypes/ESPEasy_plugin_functions.h +++ b/src/src/DataTypes/ESPEasy_plugin_functions.h @@ -176,17 +176,17 @@ public: NWPLUGIN_GET_INTERFACE, NWPLUGIN_WEBFORM_SHOW_ROUTE_PRIO, NWPLUGIN_PRIORITY_ROUTE_CHANGED, // The default interface was changed, let other interfaces check to see if they need to do something. -#endif +#endif // ifdef ESP32 #if FEATURE_NETWORK_TRAFFIC_COUNT NWPLUGIN_GET_TRAFFIC_COUNT, // TX/RX count in event->Par64_1, resp. event->Par64_2 -#endif +#endif NWPLUGIN_GET_CONNECTED_DURATION, NWPLUGIN_PROCESS_EVENT, // Process received event arduino_event_id_t NWPLUGIN_WEBSERVER_SHOULD_RUN, // Check whether the addressed interface is active and needs the webserver to be active -#if FEATURE_PLUGIN_STATS +#if FEATURE_NETWORK_STATS NWPLUGIN_RECORD_STATS, NWPLUGIN_WEBFORM_LOAD_SHOW_STATS, -#endif // if FEATURE_PLUGIN_STATS +#endif NWPLUGIN_WEBFORM_SHOW_CONNECTED, // Used for showing connected state/speed NWPLUGIN_WEBFORM_SHOW_HOSTNAME, // Used for showing hostname NWPLUGIN_WEBFORM_SHOW_HW_ADDRESS, // Used for showing MAC diff --git a/src/src/Helpers/ESPEasy_time.cpp b/src/src/Helpers/ESPEasy_time.cpp index bd4478d38..3c1e00da3 100644 --- a/src/src/Helpers/ESPEasy_time.cpp +++ b/src/src/Helpers/ESPEasy_time.cpp @@ -340,6 +340,7 @@ unsigned long ESPEasy_time::now_() { taskData->processTimeSet(externalUnixTime_offset_usec / 1000000.0); } } +#if FEATURE_NETWORK_STATS // Process for network interfaces too for (ESPEasy::net::networkIndex_t networkIndex = 0; networkIndex < NETWORK_MAX; networkIndex++) { @@ -349,6 +350,7 @@ unsigned long ESPEasy_time::now_() { NWdata->processTimeSet(externalUnixTime_offset_usec / 1000000.0); } } +#endif } } diff --git a/src/src/Helpers/PeriodicalActions.cpp b/src/src/Helpers/PeriodicalActions.cpp index 04a7e5869..b1e87d8ff 100644 --- a/src/src/Helpers/PeriodicalActions.cpp +++ b/src/src/Helpers/PeriodicalActions.cpp @@ -208,7 +208,7 @@ void runOncePerSecond() PluginCall(PLUGIN_ONCE_A_SECOND, 0, dummy); // unsigned long elapsed = micros() - start; -#if FEATURE_PLUGIN_STATS +#if FEATURE_NETWORK_STATS for (ESPEasy::net::networkIndex_t x = 0; x < NETWORK_MAX; x++) { if (Settings.getNetworkEnabled(x)) { EventStruct tempEvent; diff --git a/src/src/WebServer/NetworkPage.cpp b/src/src/WebServer/NetworkPage.cpp index 312107e4e..c1f6552f3 100644 --- a/src/src/WebServer/NetworkPage.cpp +++ b/src/src/WebServer/NetworkPage.cpp @@ -19,12 +19,12 @@ # include "../../ESPEasy/net/Helpers/_NWPlugin_init.h" # include "../../ESPEasy/net/_NWPlugin_Helper.h" -#ifdef ESP8266 -#define MAX_NR_NETWORKS_IN_TABLE 2 -#endif -#ifdef ESP32 -#define MAX_NR_NETWORKS_IN_TABLE NETWORK_MAX -#endif +# ifdef ESP8266 +# define MAX_NR_NETWORKS_IN_TABLE 2 +# endif +# ifdef ESP32 +# define MAX_NR_NETWORKS_IN_TABLE NETWORK_MAX +# endif using namespace ESPEasy::net; @@ -168,7 +168,7 @@ void handle_networks_CopySubmittedSettings_NWPluginCall(ESPEasy::net::networkInd # ifdef ESP32 Settings.setRoutePrio_for_network(networkindex, getFormItemInt(F("routeprio"), 0)); Settings.setNetworkInterfaceSubnetBlockClientIP(networkindex, isFormItemChecked(F("block_web_access"))); -# endif +# endif // ifdef ESP32 Settings.setNetworkInterfaceStartupDelayAtBoot(networkindex, getFormItemInt(F("delay_start"))); String dummy; NWPluginCall(NWPlugin::Function::NWPLUGIN_WEBFORM_SAVE, &TempEvent, dummy); @@ -180,12 +180,12 @@ void handle_networks_ShowAllNetworksTable() { html_table_class_multirow(); html_TR(); - html_table_header(F(""), 70); - html_table_header(F("Nr"), 50); - html_table_header(F("Enabled"), 100); + html_table_header(F(""), 70); + html_table_header(F("Nr"), 50); + html_table_header(F("Enabled"), 100); html_table_header(F("Network Adapter")); # ifdef ESP32 - html_table_header(F("Route Prio"), 50); + html_table_header(F("Route Prio"), 50); # endif html_table_header(F("Connected")); html_table_header(F("Hostname/SSID")); @@ -371,7 +371,8 @@ void handle_networks_NetworkSettingsPage(ESPEasy::net::networkIndex_t networkind String str; NWPluginCall(NWPlugin::Function::NWPLUGIN_WEBFORM_LOAD, &TempEvent, str); -# if FEATURE_PLUGIN_STATS +# if FEATURE_NETWORK_STATS + if (Settings.getNetworkEnabled(TempEvent.NetworkIndex)) { // Task statistics and historic data in a chart @@ -399,7 +400,7 @@ void handle_networks_NetworkSettingsPage(ESPEasy::net::networkIndex_t networkind } } -# endif // if FEATURE_PLUGIN_STATS +# endif // if FEATURE_NETWORK_STATS # ifdef ESP32 @@ -508,13 +509,14 @@ void handle_networks_NetworkSettingsPage(ESPEasy::net::networkIndex_t networkind } # if FEATURE_NETWORK_TRAFFIC_COUNT + if (NWPluginCall(NWPlugin::Function::NWPLUGIN_GET_TRAFFIC_COUNT, &TempEvent, str)) { addRowLabel(F("TX Bytes Total")); addHtmlInt(TempEvent.Par1); addRowLabel(F("RX Bytes Total")); addHtmlInt(TempEvent.Par2); } -# endif +# endif // if FEATURE_NETWORK_TRAFFIC_COUNT } } } From 15b118f27baa6cd55e4e38ae16919591288658f3 Mon Sep 17 00:00:00 2001 From: TD-er Date: Tue, 2 Sep 2025 13:23:43 +0200 Subject: [PATCH 240/564] [Network] Fix reported traffic RX/TX Bytes --- src/ESPEasy/net/DataStructs/NWPluginData_base.cpp | 2 +- src/src/WebServer/NetworkPage.cpp | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/ESPEasy/net/DataStructs/NWPluginData_base.cpp b/src/ESPEasy/net/DataStructs/NWPluginData_base.cpp index 30d92edce..2877fe9e4 100644 --- a/src/ESPEasy/net/DataStructs/NWPluginData_base.cpp +++ b/src/ESPEasy/net/DataStructs/NWPluginData_base.cpp @@ -130,7 +130,7 @@ void NWPluginData_base::initPluginStats_trafficCount(networkStatsVarIndex_t netw displayConfig.setAxisIndex(3); // Set to a fixed index so RX/TX are on the same axis index initPluginStats( networkStatsVarIndex, - isTX ? F("Traffic TX") : F("Traffic RX"), + concat(isTX ? F("TX") : F("RX"), F(" Bytes")), 0, NAN, displayConfig); diff --git a/src/src/WebServer/NetworkPage.cpp b/src/src/WebServer/NetworkPage.cpp index c1f6552f3..fbb18995e 100644 --- a/src/src/WebServer/NetworkPage.cpp +++ b/src/src/WebServer/NetworkPage.cpp @@ -512,9 +512,9 @@ void handle_networks_NetworkSettingsPage(ESPEasy::net::networkIndex_t networkind if (NWPluginCall(NWPlugin::Function::NWPLUGIN_GET_TRAFFIC_COUNT, &TempEvent, str)) { addRowLabel(F("TX Bytes Total")); - addHtmlInt(TempEvent.Par1); + addHtmlInt(TempEvent.Par64_1); addRowLabel(F("RX Bytes Total")); - addHtmlInt(TempEvent.Par2); + addHtmlInt(TempEvent.Par64_2); } # endif // if FEATURE_NETWORK_TRAFFIC_COUNT } From 3bbff03497d7f41fad11d77dcc5c83547e43252d Mon Sep 17 00:00:00 2001 From: TD-er Date: Tue, 2 Sep 2025 13:45:30 +0200 Subject: [PATCH 241/564] [USBCDC] Properly fix USB CDC issues on ESP32-S2 --- lib/ESPEasySerial/Port_ESPEasySerial_USBCDC.cpp | 16 ---------------- platformio_core_defs.ini | 2 +- 2 files changed, 1 insertion(+), 17 deletions(-) diff --git a/lib/ESPEasySerial/Port_ESPEasySerial_USBCDC.cpp b/lib/ESPEasySerial/Port_ESPEasySerial_USBCDC.cpp index 5a3baff2e..d10a92390 100644 --- a/lib/ESPEasySerial/Port_ESPEasySerial_USBCDC.cpp +++ b/lib/ESPEasySerial/Port_ESPEasySerial_USBCDC.cpp @@ -87,22 +87,6 @@ static void usbcdcEventCallback(void *arg, esp_event_base_t event_base, int32_t } */ -extern "C" { - -// Stub implementation of the HID report received callback -// This is required by TinyUSB HID host but not used in ESPEasy -void tuh_hid_report_received_cb(uint8_t dev_addr, uint8_t idx, uint8_t const*report, uint16_t len) -{ - // Empty implementation - HID host functionality is not used in ESPEasy - // Thanks Jason8266 for this fix :) - (void)dev_addr; - (void)idx; - (void)report; - (void)len; -} - -} - Port_ESPEasySerial_USBCDC_t::Port_ESPEasySerial_USBCDC_t(const ESPEasySerialConfig& config) { # if ARDUINO_USB_CDC_ON_BOOT diff --git a/platformio_core_defs.ini b/platformio_core_defs.ini index f2d6b7b6e..0f43fe666 100644 --- a/platformio_core_defs.ini +++ b/platformio_core_defs.ini @@ -166,7 +166,7 @@ extra_scripts = ${esp82xx_common.extra_scripts} [core_esp32_IDF5_5_0__3_2_0_LittleFS] platform = https://github.com/Jason2866/platform-espressif32.git#0b2bdf30cd0744b0b37907ee022ee7e30bb8f8bc ;platform = https://github.com/Jason2866/platform-espressif32.git#Arduino/IDF55 -platform_packages = framework-arduinoespressif32 @ https://github.com/Jason2866/esp32-arduino-lib-builder/releases/download/0109-1248-5.5/framework-arduinoespressif32-release_v5.5-717d5bca.zip +platform_packages = framework-arduinoespressif32 @ https://github.com/Jason2866/esp32-arduino-lib-builder/releases/download/0209-1054-5.5/framework-arduinoespressif32-release_v5.5-717d5bca.zip build_flags = -DESP32_STAGE -DESP_IDF_VERSION_MAJOR=5 -DLIBRARIES_NO_LOG=1 From ced714c2711d6ec6a37f9b97bf3a855bf81d077a Mon Sep 17 00:00:00 2001 From: TD-er Date: Tue, 2 Sep 2025 17:27:25 +0200 Subject: [PATCH 242/564] [Build] Define BUILD_NO_DEBUG for Display builds --- src/src/CustomBuild/define_plugin_sets.h | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/src/src/CustomBuild/define_plugin_sets.h b/src/src/CustomBuild/define_plugin_sets.h index b947a614b..b646948dd 100644 --- a/src/src/CustomBuild/define_plugin_sets.h +++ b/src/src/CustomBuild/define_plugin_sets.h @@ -160,9 +160,14 @@ To create/register a plugin, you have to : #endif -#if FEATURE_ETHERNET && defined(PLUGIN_DISPLAY_COLLECTION) +#if defined(PLUGIN_DISPLAY_COLLECTION) // Display builds are getting too large, so for now disable ETH for display buikds + #if FEATURE_ETHERNET #undef FEATURE_ETHERNET + #endif + #ifndef BUILD_NO_DEBUG + #define BUILD_NO_DEBUG + #endif #endif From 3b622bad4d7e3bf4360e92e691fe69f2d7028ff8 Mon Sep 17 00:00:00 2001 From: TD-er Date: Wed, 3 Sep 2025 14:26:02 +0200 Subject: [PATCH 243/564] [Network] Fix xxx#Connected / #Disconnected events --- .../NWPluginData_static_runtime.cpp | 34 +++++-- .../NWPluginData_static_runtime_ESP32.cpp | 8 +- .../NWPluginData_static_runtime_ESP8266.cpp | 10 +- src/ESPEasy/net/Globals/NWPlugins.cpp | 4 +- .../NW003_data_struct_ETH_RMII.cpp | 13 ++- .../NW004_data_struct_ETH_SPI.cpp | 11 ++- src/ESPEasy/net/_NW001_WiFi_STA.cpp | 9 +- src/ESPEasy/net/_NW002_WiFi_AP.cpp | 3 +- src/ESPEasy/net/_NW003_ETH_RMII.cpp | 15 ++- src/ESPEasy/net/_NW004_ETH_SPI.cpp | 17 +++- src/ESPEasy/net/_NW005_PPP_modem.cpp | 3 +- .../net/wifi/ESPEasyWiFi_state_machine.cpp | 95 ++++++++++++------- src/src/Helpers/LongTermOnOffTimer.cpp | 2 +- 13 files changed, 151 insertions(+), 73 deletions(-) diff --git a/src/ESPEasy/net/DataStructs/NWPluginData_static_runtime.cpp b/src/ESPEasy/net/DataStructs/NWPluginData_static_runtime.cpp index add0b3911..6ead206f7 100644 --- a/src/ESPEasy/net/DataStructs/NWPluginData_static_runtime.cpp +++ b/src/ESPEasy/net/DataStructs/NWPluginData_static_runtime.cpp @@ -94,6 +94,13 @@ void NWPluginData_static_runtime::clear(networkIndex_t networkIndex) _gotIP6Stats.clear(); #endif _operationalStats.clear(); +#if FEATURE_NETWORK_TRAFFIC_COUNT + if (_netif) { + const int key = _netif->impl_index(); + interfaceTrafficCount[key].clear(); + } +#endif + _networkIndex = networkIndex; #ifdef ESP32 _route_prio = Settings.getRoutePrio_for_network(_networkIndex); @@ -119,7 +126,7 @@ void NWPluginData_static_runtime::processEvent_and_clear() bool NWPluginData_static_runtime::operational() const { - return started() && connected() && hasIP() + return connected() && hasIP() && Settings.getNetworkEnabled(_networkIndex); // FIXME TD-er: WiFi STA keeps reporting it is @@ -128,19 +135,32 @@ bool NWPluginData_static_runtime::operational() const void NWPluginData_static_runtime::processEvents() { - if (_establishConnectStats.changedSinceLastCheck_and_clear()) + // TD-er: Just set these just to be sure we didn't miss any events. + _connectedStats.set(connected()); + _gotIPStats.set(hasIP()); +#if FEATURE_USE_IPV6 + _gotIP6Stats.set(hasIPv6()); +#endif + const bool connected_changed = _connectedStats.changedSinceLastCheck_and_clear(); + const bool establishConnect_changed = _establishConnectStats.changedSinceLastCheck_and_clear(); + const bool gotIP_changed = _gotIPStats.changedSinceLastCheck_and_clear(); + + if (connected_changed || establishConnect_changed) { - if (_establishConnectStats.isOn()) { + if (_connectedStats.isOn()) { log_connected(); // _establishConnectStats.resetCount(); - } else { + } else if (_connectedStats.isOff()) { log_disconnected(); } } - - _operationalStats.set(operational()); +// if (connected_changed || establishConnect_changed || gotIP_changed) { +// _operationalStats.forceSet(operational()); +// } else { + _operationalStats.set(operational()); +// } if (_operationalStats.changedSinceLastCheck_and_clear()) { #if FEATURE_NETWORK_TRAFFIC_COUNT @@ -157,7 +177,7 @@ void NWPluginData_static_runtime::processEvents() eventQueue.add(concat( _eventInterfaceName, F("#Connected"))); - } else { + } else if (_operationalStats.isOff()) { eventQueue.add(concat( _eventInterfaceName, F("#Disconnected"))); diff --git a/src/ESPEasy/net/DataStructs/NWPluginData_static_runtime_ESP32.cpp b/src/ESPEasy/net/DataStructs/NWPluginData_static_runtime_ESP32.cpp index 226eec3f2..ed104e820 100644 --- a/src/ESPEasy/net/DataStructs/NWPluginData_static_runtime_ESP32.cpp +++ b/src/ESPEasy/net/DataStructs/NWPluginData_static_runtime_ESP32.cpp @@ -180,15 +180,15 @@ void NWPluginData_static_runtime::mark_lost_IP() void NWPluginData_static_runtime::mark_begin_establish_connection() { _establishConnectStats.forceSet(true); + _connectedStats.setOff(); + _operationalStats.setOff(); } void NWPluginData_static_runtime::mark_connected() { - const bool logDuration = _establishConnectStats.isOn(); - _establishConnectStats.setOff(); - _connectedStats.setOn(); + _connectedStats.forceSet(true); } void NWPluginData_static_runtime::log_connected() @@ -212,7 +212,9 @@ void NWPluginData_static_runtime::log_connected() void NWPluginData_static_runtime::mark_disconnected() { + _establishConnectStats.setOff(); _connectedStats.setOff(); + _operationalStats.setOff(); // TODO TD-er: Also clear _gotIPStats and _gotIP6Stats ? } diff --git a/src/ESPEasy/net/DataStructs/NWPluginData_static_runtime_ESP8266.cpp b/src/ESPEasy/net/DataStructs/NWPluginData_static_runtime_ESP8266.cpp index 67bb589a3..5fa2fe01b 100644 --- a/src/ESPEasy/net/DataStructs/NWPluginData_static_runtime_ESP8266.cpp +++ b/src/ESPEasy/net/DataStructs/NWPluginData_static_runtime_ESP8266.cpp @@ -69,14 +69,12 @@ void NWPluginData_static_runtime::mark_lost_IP() void NWPluginData_static_runtime::mark_begin_establish_connection() { _establishConnectStats.forceSet(true); - + _connectedStats.setOff(); + _operationalStats.setOff(); } void NWPluginData_static_runtime::mark_connected() { -# ifndef BUILD_NO_DEBUG - const bool logDuration = _establishConnectStats.isOn(); -# endif _establishConnectStats.setOff(); _connectedStats.setOn(); } @@ -100,9 +98,9 @@ void NWPluginData_static_runtime::log_connected() void NWPluginData_static_runtime::mark_disconnected() { + _establishConnectStats.setOff(); _connectedStats.setOff(); -# ifndef BUILD_NO_DEBUG -# endif + _operationalStats.setOff(); } void NWPluginData_static_runtime::log_disconnected() diff --git a/src/ESPEasy/net/Globals/NWPlugins.cpp b/src/ESPEasy/net/Globals/NWPlugins.cpp index 7ec41be27..66ade9e70 100644 --- a/src/ESPEasy/net/Globals/NWPlugins.cpp +++ b/src/ESPEasy/net/Globals/NWPlugins.cpp @@ -310,7 +310,7 @@ bool NWPluginCall(NWPlugin::Function Function, EventStruct *event, String& str) } #ifdef ESP32 - if (success && (Function == NWPlugin::Function::NWPLUGIN_EXIT)) { + if (Function == NWPlugin::Function::NWPLUGIN_EXIT) { // Cache.clearNetworkSettings(networkIndex); auto data = getNWPluginData_static_runtime(event->NetworkIndex); @@ -318,7 +318,7 @@ bool NWPluginCall(NWPlugin::Function Function, EventStruct *event, String& str) delay(100); // Allow some time to process events data->processEvent_and_clear(); } - + clearNWPluginData(event->NetworkIndex); } #endif // ifdef ESP32 } diff --git a/src/ESPEasy/net/NWPluginStructs/NW003_data_struct_ETH_RMII.cpp b/src/ESPEasy/net/NWPluginStructs/NW003_data_struct_ETH_RMII.cpp index 47e5bf817..c2054de1d 100644 --- a/src/ESPEasy/net/NWPluginStructs/NW003_data_struct_ETH_RMII.cpp +++ b/src/ESPEasy/net/NWPluginStructs/NW003_data_struct_ETH_RMII.cpp @@ -10,6 +10,8 @@ # include "../Globals/NetworkState.h" +# include "../eth/ESPEasyEth.h" + # define NW_PLUGIN_ID 3 # define NW_PLUGIN_INTERFACE ETH @@ -42,9 +44,18 @@ void NW003_data_struct_ETH_RMII::webform_save(EventStruct *event) {} bool NW003_data_struct_ETH_RMII::webform_getPort(String& str) { return true; } -bool NW003_data_struct_ETH_RMII::init(EventStruct *event) { return true; } +bool NW003_data_struct_ETH_RMII::init(EventStruct *event) +{ + auto data = getNWPluginData_static_runtime(); + + if (data) { data->mark_begin_establish_connection(); } + ESPEasy::net::eth::ETHConnectRelaxed(); + + return true; +} bool NW003_data_struct_ETH_RMII::exit(EventStruct *event) { + ETH.end(); stats_and_cache.processEvents(); return true; } diff --git a/src/ESPEasy/net/NWPluginStructs/NW004_data_struct_ETH_SPI.cpp b/src/ESPEasy/net/NWPluginStructs/NW004_data_struct_ETH_SPI.cpp index 45b1a6621..ec636674c 100644 --- a/src/ESPEasy/net/NWPluginStructs/NW004_data_struct_ETH_SPI.cpp +++ b/src/ESPEasy/net/NWPluginStructs/NW004_data_struct_ETH_SPI.cpp @@ -10,6 +10,8 @@ # include "../Globals/NetworkState.h" +# include "../eth/ESPEasyEth.h" + # define NW_PLUGIN_ID 4 # define NW_PLUGIN_INTERFACE ETH @@ -43,11 +45,18 @@ bool NW004_data_struct_ETH_SPI::webform_getPort(String& str) { return true; bool NW004_data_struct_ETH_SPI::init(EventStruct *event) { + auto data = getNWPluginData_static_runtime(); + + if (data) { data->mark_begin_establish_connection(); } + ESPEasy::net::eth::ETHConnectRelaxed(); return true; } -bool NW004_data_struct_ETH_SPI::exit(EventStruct *event) { +bool NW004_data_struct_ETH_SPI::exit(EventStruct *event) +{ + ETH.end(); + stats_and_cache.processEvents(); return true; } diff --git a/src/ESPEasy/net/_NW001_WiFi_STA.cpp b/src/ESPEasy/net/_NW001_WiFi_STA.cpp index d45d4e098..14f532e96 100644 --- a/src/ESPEasy/net/_NW001_WiFi_STA.cpp +++ b/src/ESPEasy/net/_NW001_WiFi_STA.cpp @@ -338,8 +338,7 @@ bool NWPlugin_001(NWPlugin::Function function, EventStruct *event, String& strin case NWPlugin::Function::NWPLUGIN_INIT: { initNWPluginData(event->NetworkIndex, new (std::nothrow) ESPEasy::net::wifi::NW001_data_struct_WiFi_STA(event->NetworkIndex)); - ESPEasy::net::wifi::NW001_data_struct_WiFi_STA *NW_data = - static_cast(getNWPluginData(event->NetworkIndex)); + auto *NW_data = getNWPluginData(event->NetworkIndex); if (NW_data) { success = NW_data->init(event); @@ -349,12 +348,12 @@ bool NWPlugin_001(NWPlugin::Function function, EventStruct *event, String& strin case NWPlugin::Function::NWPLUGIN_EXIT: { - ESPEasy::net::wifi::NW001_data_struct_WiFi_STA *NW_data = - static_cast(getNWPluginData(event->NetworkIndex)); + auto *NW_data = getNWPluginData(event->NetworkIndex); if (NW_data) { - success = NW_data->exit(event); + NW_data->exit(event); } + success = true; break; } diff --git a/src/ESPEasy/net/_NW002_WiFi_AP.cpp b/src/ESPEasy/net/_NW002_WiFi_AP.cpp index 812575415..8e475a4f0 100644 --- a/src/ESPEasy/net/_NW002_WiFi_AP.cpp +++ b/src/ESPEasy/net/_NW002_WiFi_AP.cpp @@ -270,8 +270,9 @@ bool NWPlugin_002(NWPlugin::Function function, EventStruct *event, String& strin static_cast(getNWPluginData(event->NetworkIndex)); if (NW_data) { - success = NW_data->exit(event); + NW_data->exit(event); } + success = true; break; } diff --git a/src/ESPEasy/net/_NW003_ETH_RMII.cpp b/src/ESPEasy/net/_NW003_ETH_RMII.cpp index 71bb1b1bc..25f92c756 100644 --- a/src/ESPEasy/net/_NW003_ETH_RMII.cpp +++ b/src/ESPEasy/net/_NW003_ETH_RMII.cpp @@ -295,16 +295,23 @@ bool NWPlugin_003(NWPlugin::Function function, EventStruct *event, String& strin case NWPlugin::Function::NWPLUGIN_INIT: { - auto data = getNWPluginData_static_runtime(event->NetworkIndex); + initNWPluginData(event->NetworkIndex, new (std::nothrow) ESPEasy::net::eth::NW003_data_struct_ETH_RMII(event->NetworkIndex)); + auto *NW_data = getNWPluginData(event->NetworkIndex); - if (data) { data->mark_begin_establish_connection(); } - ESPEasy::net::eth::ETHConnectRelaxed(); + if (NW_data) { + success = NW_data->init(event); + } break; } case NWPlugin::Function::NWPLUGIN_EXIT: { - ETH.end(); + auto *NW_data = getNWPluginData(event->NetworkIndex); + + if (NW_data) { + NW_data->exit(event); + } + success = true; break; } diff --git a/src/ESPEasy/net/_NW004_ETH_SPI.cpp b/src/ESPEasy/net/_NW004_ETH_SPI.cpp index 888b0a3b1..9555f5bc3 100644 --- a/src/ESPEasy/net/_NW004_ETH_SPI.cpp +++ b/src/ESPEasy/net/_NW004_ETH_SPI.cpp @@ -298,19 +298,26 @@ bool NWPlugin_004(NWPlugin::Function function, EventStruct *event, String& strin break; } + case NWPlugin::Function::NWPLUGIN_INIT: { - auto data = getNWPluginData_static_runtime(event->NetworkIndex); + initNWPluginData(event->NetworkIndex, new (std::nothrow) ESPEasy::net::eth::NW004_data_struct_ETH_SPI(event->NetworkIndex)); + auto *NW_data = getNWPluginData(event->NetworkIndex); - if (data) { data->mark_begin_establish_connection(); } - - ESPEasy::net::eth::ETHConnectRelaxed(); + if (NW_data) { + success = NW_data->init(event); + } break; } case NWPlugin::Function::NWPLUGIN_EXIT: { - ETH.end(); + auto *NW_data = getNWPluginData(event->NetworkIndex); + + if (NW_data) { + NW_data->exit(event); + } + success = true; break; } diff --git a/src/ESPEasy/net/_NW005_PPP_modem.cpp b/src/ESPEasy/net/_NW005_PPP_modem.cpp index 928927af9..5fe497da0 100644 --- a/src/ESPEasy/net/_NW005_PPP_modem.cpp +++ b/src/ESPEasy/net/_NW005_PPP_modem.cpp @@ -202,8 +202,9 @@ bool NWPlugin_005(NWPlugin::Function function, EventStruct *event, String& strin static_cast(getNWPluginData(event->NetworkIndex)); if (NW_data) { - success = NW_data->exit(event); + NW_data->exit(event); } + success = true; break; } diff --git a/src/ESPEasy/net/wifi/ESPEasyWiFi_state_machine.cpp b/src/ESPEasy/net/wifi/ESPEasyWiFi_state_machine.cpp index ae7d56a4c..01ba98a7b 100644 --- a/src/ESPEasy/net/wifi/ESPEasyWiFi_state_machine.cpp +++ b/src/ESPEasy/net/wifi/ESPEasyWiFi_state_machine.cpp @@ -95,20 +95,21 @@ void ESPEasyWiFi_t::loop() // Do we have candidate to connect to ? if (WiFi_AP_Candidates.hasCandidates()) { setState(WiFiState_e::STA_Connecting, WIFI_STATE_MACHINE_STA_CONNECTING_TIMEOUT); -/* - } else if (!WiFi_AP_Candidates.hasCandidateCredentials() || - !Settings.DoNotStartAP()) { - if (!WiFi_AP_Candidates.hasCandidateCredentials() && - !WiFiEventData.warnedNoValidWiFiSettings) - { - addLog(LOG_LEVEL_ERROR, F("WIFI : No valid wifi settings")); - WiFiEventData.warnedNoValidWiFiSettings = true; - } - wifi_STA_data->_establishConnectStats.clear(); - WiFiEventData.wifiConnectAttemptNeeded = false; - setState(WiFiState_e::AP_only, WIFI_STATE_MACHINE_AP_ONLY_TIMEOUT); -*/ + /* + } else if (!WiFi_AP_Candidates.hasCandidateCredentials() || + !Settings.DoNotStartAP()) { + if (!WiFi_AP_Candidates.hasCandidateCredentials() && + !WiFiEventData.warnedNoValidWiFiSettings) + { + addLog(LOG_LEVEL_ERROR, F("WIFI : No valid wifi settings")); + WiFiEventData.warnedNoValidWiFiSettings = true; + } + + wifi_STA_data->_establishConnectStats.clear(); + WiFiEventData.wifiConnectAttemptNeeded = false; + setState(WiFiState_e::AP_only, WIFI_STATE_MACHINE_AP_ONLY_TIMEOUT); + */ } else if (WiFi_AP_Candidates.scanComplete() == 0 # ifdef ESP32 # if ESP_IDF_VERSION >= ESP_IDF_VERSION_VAL(5, 1, 2) @@ -121,9 +122,10 @@ void ESPEasyWiFi_t::loop() // If not, then we can disable AP mode and switch to WiFiState_e::STA_Scanning setState(WiFiState_e::STA_AP_Scanning, WIFI_STATE_MACHINE_STA_AP_SCANNING_TIMEOUT); } else { -// setState(WiFiState_e::STA_AP_Scanning, WIFI_STATE_MACHINE_STA_AP_SCANNING_TIMEOUT); + // setState(WiFiState_e::STA_AP_Scanning, WIFI_STATE_MACHINE_STA_AP_SCANNING_TIMEOUT); setState(WiFiState_e::STA_Scanning, WIFI_STATE_MACHINE_STA_SCANNING_TIMEOUT); } + // Move up? } else if (!WiFi_AP_Candidates.hasCandidateCredentials() || !Settings.DoNotStartAP()) { @@ -137,6 +139,7 @@ void ESPEasyWiFi_t::loop() wifi_STA_data->_establishConnectStats.clear(); WiFiEventData.wifiConnectAttemptNeeded = false; setState(WiFiState_e::AP_only, WIFI_STATE_MACHINE_AP_ONLY_TIMEOUT); + // end move up?? } } @@ -151,11 +154,11 @@ void ESPEasyWiFi_t::loop() # if !FEATURE_ESP8266_DIRECT_WIFI_SCAN WiFi_AP_Candidates.process_WiFiscan(scanCompleteStatus); # endif -#ifndef BUILD_NO_DEBUG +# ifndef BUILD_NO_DEBUG addLog(LOG_LEVEL_INFO, strformat( F("WiFi : Scan done, found %d APs"), WiFi_AP_Candidates.scanComplete())); -#endif +# endif // ifndef BUILD_NO_DEBUG } else if (scanCompleteStatus == -2) { // WIFI_SCAN_FAILED addLog(LOG_LEVEL_ERROR, F("WiFi : Scan failed")); WiFi.scanDelete(); @@ -187,12 +190,12 @@ void ESPEasyWiFi_t::loop() # if !FEATURE_ESP8266_DIRECT_WIFI_SCAN WiFi_AP_Candidates.process_WiFiscan(scanCompleteStatus); # endif -#ifndef BUILD_NO_DEBUG +# ifndef BUILD_NO_DEBUG addLog(LOG_LEVEL_INFO, strformat( F("WiFi : Scan channel %d done, found %d APs"), _scan_channel, WiFi_AP_Candidates.scanComplete())); -#endif +# endif // ifndef BUILD_NO_DEBUG } else if (scanCompleteStatus == -2) { // WIFI_SCAN_FAILED addLog(LOG_LEVEL_ERROR, F("WiFi : Scan failed")); WiFi.scanDelete(); @@ -248,15 +251,16 @@ void ESPEasyWiFi_t::loop() // Check if still connected if (getSTA_connected_state() != STA_connected_state::Connected) { -// setState(WiFiState_e::WiFiOFF); + // setState(WiFiState_e::WiFiOFF); setState(WiFiState_e::Disabled); + /* - if (Settings.UseRules) - { - eventQueue.add(F("WiFi#Disconnected")); - } - statusLED(false); - */ + if (Settings.UseRules) + { + eventQueue.add(F("WiFi#Disconnected")); + } + statusLED(false); + */ } else { // Else mark last timestamp seen as connected @@ -283,6 +287,7 @@ bool ESPEasyWiFi_t::connected() const void ESPEasyWiFi_t::disconnect() { doWiFiDisconnect(); } void ESPEasyWiFi_t::setState(WiFiState_e newState, uint32_t timeout) { + if (newState == _state) return; if (loglevelActiveFor(LOG_LEVEL_INFO)) { addLog( LOG_LEVEL_INFO, @@ -296,6 +301,15 @@ void ESPEasyWiFi_t::setState(WiFiState_e newState, uint32_t timeout) { setAP(false); } + if (_state == WiFiState_e::STA_Connected) + { + auto wifi_STA_data = getWiFi_STA_NWPluginData_static_runtime(); + + if (wifi_STA_data) { + wifi_STA_data->mark_disconnected(); + } + } + if ((_state == WiFiState_e::STA_AP_Scanning) || (_state == WiFiState_e::STA_Scanning)) { @@ -351,22 +365,31 @@ void ESPEasyWiFi_t::setState(WiFiState_e newState, uint32_t timeout) { } break; case WiFiState_e::STA_Connected: - # ifdef ESP32 + { +# ifdef ESP32 // FIXME TD-er: Must move to ESP32-specific cpp file // WiFi.STA.setDefault(); - # endif // ifdef ESP32 +# endif // ifdef ESP32 _last_seen_connected.setNow(); _state_timeout.clear(); - /* - if (Settings.UseRules) - { - eventQueue.add(F("WiFi#Connected")); - } - statusLED(true); - */ + auto wifi_STA_data = getWiFi_STA_NWPluginData_static_runtime(); + if (wifi_STA_data) { + wifi_STA_data->mark_connected(); + } + + + /* + if (Settings.UseRules) + { + eventQueue.add(F("WiFi#Connected")); + } + statusLED(true); + */ break; + + } } } @@ -412,11 +435,11 @@ bool ESPEasyWiFi_t::connectSTA() } if (WiFiEventData.lastDisconnectReason != WIFI_DISCONNECT_REASON_UNSPECIFIED) { -#ifndef BUILD_NO_DEBUG +# ifndef BUILD_NO_DEBUG addLog(LOG_LEVEL_INFO, concat( F("WiFi : Disconnect reason: "), getLastDisconnectReason())); -#endif +# endif // ifndef BUILD_NO_DEBUG WiFiEventData.processedDisconnect = true; } diff --git a/src/src/Helpers/LongTermOnOffTimer.cpp b/src/src/Helpers/LongTermOnOffTimer.cpp index 2605d0706..9569c1ccd 100644 --- a/src/src/Helpers/LongTermOnOffTimer.cpp +++ b/src/src/Helpers/LongTermOnOffTimer.cpp @@ -2,10 +2,10 @@ void LongTermOnOffTimer::clear() { + _changedSinceLastCheck = _onTimer.isSet() || _offTimer.isSet(); _onTimer.clear(); _offTimer.clear(); _prevDuration = 0; - _changedSinceLastCheck = false; resetCount(); } From 52afb24a4969dd5564d3fbcfc6fa2b01b1b5cfbd Mon Sep 17 00:00:00 2001 From: Ton Huisman Date: Thu, 4 Sep 2025 23:21:07 +0200 Subject: [PATCH 244/564] [MQTT] Refactor background connection process to avoid logging from background task --- src/src/ESPEasyCore/Controller.cpp | 183 ++++++++++++++++++----------- 1 file changed, 114 insertions(+), 69 deletions(-) diff --git a/src/src/ESPEasyCore/Controller.cpp b/src/src/ESPEasyCore/Controller.cpp index d4f089354..2fdb3b788 100644 --- a/src/src/ESPEasyCore/Controller.cpp +++ b/src/src/ESPEasyCore/Controller.cpp @@ -172,17 +172,7 @@ void MQTTDisconnect() updateMQTTclient_connected(); } -/*********************************************************************************************\ -* Connect to MQTT message broker -\*********************************************************************************************/ -bool MQTTConnect(controllerIndex_t controller_idx) -{ - if (MQTTclient_next_connect_attempt.isSet() && !MQTTclient_next_connect_attempt.timeoutReached(timermqtt_interval)) { - return false; - } - MQTTclient_next_connect_attempt.setNow(); - ++mqtt_reconnect_count; - +bool MQTTConnect_prepareClient(controllerIndex_t controller_idx) { MakeControllerSettings(ControllerSettings); // -V522 if (!AllocatedControllerSettings()) { @@ -429,43 +419,48 @@ bool MQTTConnect(controllerIndex_t controller_idx) } MQTTclient.setCallback(incoming_mqtt_callback); + if (MQTTclient_should_reconnect) { + addLog(LOG_LEVEL_ERROR, F("MQTT : Intentional reconnect")); + } + + return true; +} + +bool MQTTConnect_clientConnect(controllerIndex_t controller_idx) { + MakeControllerSettings(ControllerSettings); // -V522 + + if (!AllocatedControllerSettings()) { + #ifndef BUILD_MINIMAL_OTA + addLog(LOG_LEVEL_ERROR, F("MQTT : Cannot connect, out of RAM")); + #endif + return false; + } + LoadControllerSettings(controller_idx, *ControllerSettings); + + bool MQTTresult = false; + // MQTT needs a unique clientname to subscribe to broker const String clientid = getMQTTclientID(*ControllerSettings); const String LWTTopic = getLWT_topic(*ControllerSettings); const String LWTMessageDisconnect = getLWT_messageDisconnect(*ControllerSettings); - bool MQTTresult = false; const uint8_t willQos = 0; const bool willRetain = ControllerSettings->mqtt_willRetain() && ControllerSettings->mqtt_sendLWT(); - const bool cleanSession = ControllerSettings->mqtt_cleanSession(); // As suggested here: - - if (MQTTclient_should_reconnect) { - addLog(LOG_LEVEL_ERROR, F("MQTT : Intentional reconnect")); - } + // As suggested here: https://github.com/knolleary/pubsubclient/issues/458#issuecomment-493875150 + const bool cleanSession = ControllerSettings->mqtt_cleanSession(); + const bool hasCredentials = hasControllerCredentialsSet(controller_idx, *ControllerSettings); const uint64_t statisticsTimerStart(getMicros64()); - // https://github.com/knolleary/pubsubclient/issues/458#issuecomment-493875150 - if (hasControllerCredentialsSet(controller_idx, *ControllerSettings)) { - MQTTresult = + MQTTresult = MQTTclient.connect(clientid.c_str(), - getControllerUser(controller_idx, *ControllerSettings).c_str(), - getControllerPass(controller_idx, *ControllerSettings).c_str(), - ControllerSettings->mqtt_sendLWT() ? LWTTopic.c_str() : nullptr, - willQos, - willRetain, - ControllerSettings->mqtt_sendLWT() ? LWTMessageDisconnect.c_str() : nullptr, - cleanSession); - } else { - MQTTresult = MQTTclient.connect(clientid.c_str(), - nullptr, - nullptr, - ControllerSettings->mqtt_sendLWT() ? LWTTopic.c_str() : nullptr, - willQos, - willRetain, - ControllerSettings->mqtt_sendLWT() ? LWTMessageDisconnect.c_str() : nullptr, - cleanSession); - } + hasCredentials ? getControllerUser(controller_idx, *ControllerSettings).c_str() : nullptr, + hasCredentials ? getControllerPass(controller_idx, *ControllerSettings).c_str() : nullptr, + ControllerSettings->mqtt_sendLWT() ? LWTTopic.c_str() : nullptr, + willQos, + willRetain, + ControllerSettings->mqtt_sendLWT() ? LWTMessageDisconnect.c_str() : nullptr, + cleanSession); delay(0); count_connection_results( @@ -474,8 +469,28 @@ bool MQTTConnect(controllerIndex_t controller_idx) Settings.Protocol[controller_idx], statisticsTimerStart); + return MQTTresult; +} + +bool MQTTConnect_wrapUpConnect(controllerIndex_t controller_idx, bool MQTTresult) { + MakeControllerSettings(ControllerSettings); // -V522 + + if (!AllocatedControllerSettings()) { + #ifndef BUILD_MINIMAL_OTA + addLog(LOG_LEVEL_ERROR, F("MQTT : Cannot connect, out of RAM")); + #endif + return false; + } + LoadControllerSettings(controller_idx, *ControllerSettings); + + const String clientid = getMQTTclientID(*ControllerSettings); + const String LWTTopic = getLWT_topic(*ControllerSettings); + const bool willRetain = ControllerSettings->mqtt_willRetain() && ControllerSettings->mqtt_sendLWT(); + # if FEATURE_MQTT_TLS + const TLS_types TLS_type = ControllerSettings->TLStype(); + if (mqtt_tls != nullptr) { # ifdef ESP32 @@ -614,6 +629,26 @@ bool MQTTConnect(controllerIndex_t controller_idx) return true; } +/*********************************************************************************************\ +* Connect to MQTT message broker +\*********************************************************************************************/ +bool MQTTConnect(controllerIndex_t controller_idx) +{ + if (MQTTclient_next_connect_attempt.isSet() && !MQTTclient_next_connect_attempt.timeoutReached(timermqtt_interval)) { + return false; + } + MQTTclient_next_connect_attempt.setNow(); + ++mqtt_reconnect_count; + + if (!MQTTConnect_prepareClient(controller_idx)) { + return false; + } + + bool MQTTresult = MQTTConnect_clientConnect(controller_idx); + + return MQTTConnect_wrapUpConnect(controller_idx, MQTTresult); +} + void MQTTparseSystemVariablesAndSubscribe(String subscribeTo) { if (subscribeTo.isEmpty()) { return; } parseSystemVariables(subscribeTo, false); @@ -623,7 +658,7 @@ void MQTTparseSystemVariablesAndSubscribe(String subscribeTo) { MQTTclient.subscribe(subscribeTo.c_str()); if (loglevelActiveFor(LOG_LEVEL_INFO)) { - addLogMove(LOG_LEVEL_INFO, concat(F("Subscribed to: "), subscribeTo)); + addLogMove(LOG_LEVEL_INFO, concat(F("MQTT : Subscribed to: "), subscribeTo)); } } } @@ -672,21 +707,16 @@ void MQTT_execute_connect_task(void *parameter) : ControllerSettings->ClientTimeout; uint8_t incr = 5; // Increment timeout between connection attempts 5 times by 100 msec - while (!MQTTConnect(MQTT_task_data->ControllerIndex) - # if FEATURE_MQTT_TLS - && mqtt_tls_last_errorstr.isEmpty() - # endif // if FEATURE_MQTT_TLS - && !MQTTclient.connected() - ) { - delay(timeout); // Use regular controller timeout also for delay between connection attempts (range 10..4000) - if (incr > 0) { - timeout += 100; // Increment next few (5) times with 100 msec - incr--; - } - if (timePassedSince(MQTT_task_data->startTime) > 120000) { // Quit after 120 seconds - break; - } - } + while (!MQTTConnect_clientConnect(MQTT_task_data->ControllerIndex) && !MQTTclient.connected()) { + delay(timeout); // Use regular controller timeout also for delay between connection attempts (range 10..4000) + if (incr > 0) { + timeout += 100; // Increment next few (5) times with 100 msec + incr--; + } + if (timePassedSince(MQTT_task_data->startTime) > 120000) { // Quit after 120 seconds + break; + } + } MQTT_task_data->result = MQTTclient.connected(); MQTT_task_data->status = MQTT_task_data->result ? MQTT_connect_status_e::Connected @@ -700,14 +730,18 @@ bool MQTTConnectInBackground(controllerIndex_t controller_idx, bool reportOnly) if (!Settings.MQTTConnectInBackground()) { return false; } if ((MQTT_task_data.status == MQTT_connect_status_e::Connected) || (MQTT_task_data.status == MQTT_connect_status_e::Failure)) { + MQTT_task_data.status = MQTT_connect_status_e::Ready; // Set status first to avoid re-entry + + const bool result = MQTTConnect_wrapUpConnect(MQTT_task_data.ControllerIndex, MQTT_task_data.result); + if (loglevelActiveFor(LOG_LEVEL_INFO)) { addLog(LOG_LEVEL_INFO, strformat(F("MQTT : Background Connect request %s, took %d msec"), FsP(MQTT_task_data.result ? F("success") : F("FAILED")), MQTT_task_data.endTime - MQTT_task_data.startTime )); } - MQTT_task_data.status = MQTT_connect_status_e::Ready; - return MQTT_task_data.result; + + return result && MQTT_task_data.result; } if ((MQTT_task_data.status == MQTT_connect_status_e::Ready) && MQTTclient.connected()) { @@ -741,25 +775,36 @@ bool MQTTConnectInBackground(controllerIndex_t controller_idx, bool reportOnly) } if (!reportOnly && (MQTT_task_data.status == MQTT_connect_status_e::Disconnected) && (controller_idx < CONTROLLER_MAX)) { + if (MQTTclient_next_connect_attempt.isSet() && !MQTTclient_next_connect_attempt.timeoutReached(timermqtt_interval)) { + return false; + } + MQTTclient_next_connect_attempt.setNow(); + ++mqtt_reconnect_count; + if (loglevelActiveFor(LOG_LEVEL_INFO)) { addLog(LOG_LEVEL_INFO, strformat(F("MQTT : Start background connect for controller %d"), controller_idx + 1)); } - MQTT_task_data.status = MQTT_connect_status_e::Connecting; MQTT_task_data.result = false; - MQTT_task_data.logged = false; - MQTT_task_data.ControllerIndex = controller_idx; - MQTT_task_data.startTime = millis(); - MQTT_task_data.loopTime = millis(); - xTaskCreatePinnedToCore( - MQTT_execute_connect_task, // Function that should be called - "MQTTConnect()", // Name of the task (for debugging) - 8192, // Stack size (bytes) - &MQTT_task_data, // Parameter to pass - 1, // Task priority - &MQTT_task_data.taskHandle, // Task handle - xPortGetCoreID() // Core you want to run the task on (0 or 1) - ); + if (MQTTConnect_prepareClient(controller_idx)) { + MQTT_task_data.status = MQTT_connect_status_e::Connecting; + MQTT_task_data.logged = false; + MQTT_task_data.ControllerIndex = controller_idx; + MQTT_task_data.startTime = millis(); + MQTT_task_data.loopTime = millis(); + + xTaskCreatePinnedToCore( + MQTT_execute_connect_task, // Function that should be called + "MQTTClient.connect()", // Name of the task (for debugging) + 8192, // Stack size (bytes) + &MQTT_task_data, // Parameter to pass + 1, // Task priority + &MQTT_task_data.taskHandle, // Task handle + xPortGetCoreID() // Core you want to run the task on (0 or 1) + ); + } else { + MQTT_task_data.status = MQTT_connect_status_e::Failure; + } } return false; } From 0e9f5dc9c389e808f0e17cede965eeaa18085552 Mon Sep 17 00:00:00 2001 From: TD-er Date: Sun, 7 Sep 2025 23:09:33 +0200 Subject: [PATCH 245/564] [Build] Fix merge issues --- src/src/PluginStructs/P089_data_struct.cpp | 2 +- src/src/WebServer/DevicesPage.cpp | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/src/PluginStructs/P089_data_struct.cpp b/src/src/PluginStructs/P089_data_struct.cpp index c8da18898..d7f51e4f6 100644 --- a/src/src/PluginStructs/P089_data_struct.cpp +++ b/src/src/PluginStructs/P089_data_struct.cpp @@ -34,7 +34,7 @@ P089_data_struct::~P089_data_struct() { bool P089_data_struct::send_ping(struct EventStruct *event) { /* This ping lost for sure */ - if (!isInitialized() || !NetworkConnected()) { + if (!isInitialized() || !ESPEasy::net::NetworkConnected()) { return true; } diff --git a/src/src/WebServer/DevicesPage.cpp b/src/src/WebServer/DevicesPage.cpp index 09960f5fa..64fa16f43 100644 --- a/src/src/WebServer/DevicesPage.cpp +++ b/src/src/WebServer/DevicesPage.cpp @@ -1617,7 +1617,7 @@ void devicePage_show_controller_config(taskIndex_t taskIndex, deviceIndex_t Devi getPluginCustomArgName(F("TDID"), controllerNr), // ="taskdeviceid" Settings.TaskDeviceID[controllerNr][taskIndex], 0, DOMOTICZ_MAX_IDX); } - #if FEATURE_MQTT + #if FEATURE_MQTT && FEATURE_MQTT_DISCOVER if (showMqttGroup) { html_TD(); addHtml(F("Retained:")); @@ -1628,7 +1628,7 @@ void devicePage_show_controller_config(taskIndex_t taskIndex, deviceIndex_t Devi # endif // if FEATURE_TOOLTIPS ); } - #endif // if FEATURE_MQTT + #endif // if FEATURE_MQTT && FEATURE_MQTT_DISCOVER # if FEATURE_STRING_VARIABLES if (allowSendDerived) { html_TD(); From 339d8f88750b0021e351a87ba6bd467f73c4c075 Mon Sep 17 00:00:00 2001 From: Ton Huisman Date: Thu, 11 Sep 2025 20:24:55 +0200 Subject: [PATCH 246/564] [P102] Use added setModel() method when needed --- src/_P102_PZEM004Tv3.ino | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/_P102_PZEM004Tv3.ino b/src/_P102_PZEM004Tv3.ino index 78daa90d3..58069b228 100644 --- a/src/_P102_PZEM004Tv3.ino +++ b/src/_P102_PZEM004Tv3.ino @@ -289,6 +289,7 @@ boolean Plugin_102(uint8_t function, struct EventStruct *even if (P102_PZEM_sensor != nullptr) { P102_PZEM_sensor->init(P102_PZEM_ADDR); + P102_PZEM_sensor->setModel(static_cast(P102_PZEM_TYPE)); // Sequence for reseting PZEM energy if (P102_PZEM_mode == 1) @@ -323,6 +324,7 @@ boolean Plugin_102(uint8_t function, struct EventStruct *even { // When new data is available, return true P102_PZEM_sensor->init(P102_PZEM_ADDR); + P102_PZEM_sensor->setModel(static_cast(P102_PZEM_TYPE)); float PZEM[6]; PZEM[0] = P102_PZEM_sensor->voltage(); From b52aca74c43b13f5829e822ed30af5a983ff5446 Mon Sep 17 00:00:00 2001 From: Ton Huisman Date: Thu, 11 Sep 2025 23:24:24 +0200 Subject: [PATCH 247/564] [P033] Enable formula field --- src/_P033_Dummy.ino | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/_P033_Dummy.ino b/src/_P033_Dummy.ino index 79fc3336b..08a8cc808 100644 --- a/src/_P033_Dummy.ino +++ b/src/_P033_Dummy.ino @@ -6,6 +6,7 @@ // ####################################################################################################### /** Changelog: + * 2025-09-11 tonhuisman: Enable Formula field * 2025-06-14 tonhuisman: Add support for Custom Value Type per task value * 2025-01-12 tonhuisman: Add support for MQTT AutoDiscovery (not supported yet for Dummy Device) */ @@ -14,6 +15,7 @@ # define PLUGIN_ID_033 33 # define PLUGIN_NAME_033 "Generic - Dummy Device" # define PLUGIN_VALUENAME1_033 "Dummy" + boolean Plugin_033(uint8_t function, struct EventStruct *event, String& string) { boolean success = false; @@ -26,7 +28,7 @@ boolean Plugin_033(uint8_t function, struct EventStruct *event, String& string) dev.Number = PLUGIN_ID_033; dev.Type = DEVICE_TYPE_DUMMY; dev.VType = Sensor_VType::SENSOR_TYPE_SINGLE; - dev.DecimalsOnly = true; + dev.FormulaOption = true; dev.ValueCount = 4; dev.SendDataOption = true; dev.TimerOption = true; From 92f8cf6a9eb26d25b7cabb5e804faa6ce060e558 Mon Sep 17 00:00:00 2001 From: TD-er Date: Fri, 12 Sep 2025 12:32:38 +0200 Subject: [PATCH 248/564] [WiFi] Fix WiFi reconnect issues --- .../NWPluginData_static_runtime.cpp | 2 +- .../DataStructs/NWPluginData_static_runtime.h | 4 ++ src/ESPEasy/net/DataStructs/WiFiEventData.cpp | 9 +-- .../net/DataStructs/WiFi_AP_Candidate.cpp | 2 +- .../net/DataStructs/WiFi_AP_Candidate.h | 2 + src/ESPEasy/net/ESPEasyNetwork_ESP32.cpp | 16 +++-- src/ESPEasy/net/ESPEasyNetwork_ESP8266.cpp | 11 +++- src/ESPEasy/net/Globals/NWPlugins.cpp | 44 ++++++------- .../net/Helpers/WiFi_AP_CandidatesList.cpp | 14 ++-- .../net/Helpers/WiFi_AP_CandidatesList.h | 10 ++- .../NW001_data_struct_WiFi_STA.cpp | 10 +-- .../net/wifi/ESPEasyWiFi_state_machine.cpp | 34 +++++++--- .../net/wifi/ESPEasyWifi_ProcessEvent.cpp | 12 +--- .../net/wifi/ESPEasyWifi_ProcessEvent.h | 2 +- .../net/wifi/ESPEasyWifi_abstracted_ESP32.cpp | 2 +- .../wifi/ESPEasyWifi_abstracted_ESP8266.cpp | 6 +- .../DataStructs/Scheduler_NWPluginTimerID.cpp | 52 +++++++++++++++ .../DataStructs/Scheduler_NWPluginTimerID.h | 27 ++++++++ src/src/DataStructs/SettingsStruct.h | 2 +- src/src/DataStructs/SystemTimerStruct.cpp | 20 +++++- src/src/DataStructs/SystemTimerStruct.h | 6 +- src/src/DataTypes/ESPEasy_plugin_functions.h | 9 ++- src/src/DataTypes/SchedulerTimerType.cpp | 1 + src/src/DataTypes/SchedulerTimerType.h | 1 + src/src/ESPEasyCore/ESPEasy_loop.cpp | 2 +- src/src/Helpers/ESPEasy_Storage.cpp | 2 +- src/src/Helpers/ESPEasy_checks.cpp | 2 +- src/src/Helpers/PeriodicalActions.cpp | 2 +- src/src/Helpers/Scheduler.cpp | 3 + src/src/Helpers/Scheduler.h | 23 ++++++- src/src/Helpers/Scheduler_NetworkTimer.cpp | 64 +++++++++++++++++++ src/src/Helpers/Scheduler_PluginTaskTimer.cpp | 4 +- src/src/PluginStructs/P056_data_struct.cpp | 4 ++ src/src/PluginStructs/P089_data_struct.cpp | 3 +- 34 files changed, 319 insertions(+), 88 deletions(-) create mode 100644 src/src/DataStructs/Scheduler_NWPluginTimerID.cpp create mode 100644 src/src/DataStructs/Scheduler_NWPluginTimerID.h create mode 100644 src/src/Helpers/Scheduler_NetworkTimer.cpp diff --git a/src/ESPEasy/net/DataStructs/NWPluginData_static_runtime.cpp b/src/ESPEasy/net/DataStructs/NWPluginData_static_runtime.cpp index 6ead206f7..b7bb374d3 100644 --- a/src/ESPEasy/net/DataStructs/NWPluginData_static_runtime.cpp +++ b/src/ESPEasy/net/DataStructs/NWPluginData_static_runtime.cpp @@ -63,7 +63,7 @@ void NWPluginData_static_runtime::enable_txrx_events() esp_netif_tx_rx_event_enable(_netif->netif()); if (!registered_IP_EVENT_TX_RX) { - esp_event_handler_register(IP_EVENT, IP_EVENT_TX_RX, &tx_rx_event_handler, NULL); + esp_event_handler_instance_register(IP_EVENT, IP_EVENT_TX_RX, &tx_rx_event_handler, NULL, &_handler_inst); registered_IP_EVENT_TX_RX = true; } esp_netif_tx_rx_event_enable(_netif->netif()); diff --git a/src/ESPEasy/net/DataStructs/NWPluginData_static_runtime.h b/src/ESPEasy/net/DataStructs/NWPluginData_static_runtime.h index 647244dc3..fd4f6cf66 100644 --- a/src/ESPEasy/net/DataStructs/NWPluginData_static_runtime.h +++ b/src/ESPEasy/net/DataStructs/NWPluginData_static_runtime.h @@ -148,6 +148,10 @@ private: mutable uint32_t _connectionFailures{}; +#if FEATURE_NETWORK_TRAFFIC_COUNT + esp_event_handler_instance_t _handler_inst{}; +#endif + }; diff --git a/src/ESPEasy/net/DataStructs/WiFiEventData.cpp b/src/ESPEasy/net/DataStructs/WiFiEventData.cpp index febebf0bf..165ddc81b 100644 --- a/src/ESPEasy/net/DataStructs/WiFiEventData.cpp +++ b/src/ESPEasy/net/DataStructs/WiFiEventData.cpp @@ -186,7 +186,7 @@ void WiFiEventData_t::setWiFiServicesInitialized() { setWiFiGotIP(); } - if (/*!unprocessedWifiEvents() && */ WiFiConnected() && WiFiGotIP()) { + if ( WiFiConnected() && WiFiGotIP()) { # ifndef BUILD_NO_DEBUG // addLog(LOG_LEVEL_DEBUG, F("WiFi : WiFi services initialized")); @@ -250,13 +250,6 @@ void WiFiEventData_t::markLostIP() { } void WiFiEventData_t::markDisconnect(WiFiDisconnectReason reason) { - /* - #if defined(ESP32) - if ((WiFi.getMode() & WIFI_MODE_STA) == 0) return; - #else // if defined(ESP32) - if ((WiFi.getMode() & WIFI_STA) == 0) return; - #endif // if defined(ESP32) - */ lastDisconnectMoment.setNow(); usedChannel = 0; diff --git a/src/ESPEasy/net/DataStructs/WiFi_AP_Candidate.cpp b/src/ESPEasy/net/DataStructs/WiFi_AP_Candidate.cpp index f5c748549..4da1769f7 100644 --- a/src/ESPEasy/net/DataStructs/WiFi_AP_Candidate.cpp +++ b/src/ESPEasy/net/DataStructs/WiFi_AP_Candidate.cpp @@ -25,7 +25,7 @@ namespace net { namespace wifi { -# define WIFI_AP_CANDIDATE_MAX_AGE 300000 // 5 minutes in msec + WiFi_AP_Candidate::WiFi_AP_Candidate() : diff --git a/src/ESPEasy/net/DataStructs/WiFi_AP_Candidate.h b/src/ESPEasy/net/DataStructs/WiFi_AP_Candidate.h index fbfb0a10d..11973303f 100644 --- a/src/ESPEasy/net/DataStructs/WiFi_AP_Candidate.h +++ b/src/ESPEasy/net/DataStructs/WiFi_AP_Candidate.h @@ -11,6 +11,8 @@ namespace net { namespace wifi { +# define WIFI_AP_CANDIDATE_MAX_AGE 300000 // 5 minutes in msec + struct WiFi_AP_Candidate { WiFi_AP_Candidate(); WiFi_AP_Candidate(const WiFi_AP_Candidate& other); diff --git a/src/ESPEasy/net/ESPEasyNetwork_ESP32.cpp b/src/ESPEasy/net/ESPEasyNetwork_ESP32.cpp index 5465e5476..c0c314492 100644 --- a/src/ESPEasy/net/ESPEasyNetwork_ESP32.cpp +++ b/src/ESPEasy/net/ESPEasyNetwork_ESP32.cpp @@ -126,13 +126,19 @@ NetworkInterface* getDefaultNonAP_interface() } bool NetworkConnected() { - auto network_if = getDefaultNonAP_interface(); + static bool last_result = false; + static uint32_t last_check_millis = 0; + if (timePassedSince(last_check_millis) > 50 || last_check_millis == 0) { + last_check_millis = millis(); + auto network_if = getDefaultNonAP_interface(); - if (network_if == nullptr) { - return false; + if (network_if == nullptr) { + return false; + } + processNetworkEvents(); + last_result = network_if->connected(); } - processNetworkEvents(); - return network_if->connected(); + return last_result; } IPAddress NetworkLocalIP() { diff --git a/src/ESPEasy/net/ESPEasyNetwork_ESP8266.cpp b/src/ESPEasy/net/ESPEasyNetwork_ESP8266.cpp index e8f5ced3b..7ff10c879 100644 --- a/src/ESPEasy/net/ESPEasyNetwork_ESP8266.cpp +++ b/src/ESPEasy/net/ESPEasyNetwork_ESP8266.cpp @@ -55,8 +55,15 @@ void setNetworkMedium(NetworkMedium_t new_medium) { // } bool NetworkConnected() { - processNetworkEvents(); - return ESPEasy::net::wifi::WiFiConnected(); } + static bool last_result = false; + static uint32_t last_check_millis = 0; + if (timePassedSince(last_check_millis) > 50 || last_check_millis == 0) { + last_check_millis = millis(); + processNetworkEvents(); + last_result = ESPEasy::net::wifi::WiFiConnected(); + } + return last_result; +} IPAddress NetworkLocalIP() { return WiFi.localIP(); } diff --git a/src/ESPEasy/net/Globals/NWPlugins.cpp b/src/ESPEasy/net/Globals/NWPlugins.cpp index 66ade9e70..919abbc3c 100644 --- a/src/ESPEasy/net/Globals/NWPlugins.cpp +++ b/src/ESPEasy/net/Globals/NWPlugins.cpp @@ -68,38 +68,36 @@ bool NWPluginCall(NWPlugin::Function Function, EventStruct *event, String& str) Function != NWPlugin::Function::NWPLUGIN_WRITE && Function != NWPlugin::Function::NWPLUGIN_WEBSERVER_SHOULD_RUN; - if (Function == NWPlugin::Function::NWPLUGIN_INIT_ALL) { - Function = NWPlugin::Function::NWPLUGIN_INIT; - } - - if (Function == NWPlugin::Function::NWPLUGIN_EXIT_ALL) { - Function = NWPlugin::Function::NWPLUGIN_EXIT; - } - for (networkIndex_t x = 0; x < NETWORK_MAX; x++) { const bool checkedEnabled = Settings.getNetworkEnabled(x) || Function == NWPlugin::Function::NWPLUGIN_EXIT; if (Settings.getNWPluginID_for_network(x) && checkedEnabled) { - event->NetworkIndex = x; - String command; + if (Function == NWPlugin::Function::NWPLUGIN_INIT_ALL) { + Scheduler.setNetworkInitTimer(Settings.getNetworkInterfaceStartupDelayAtBoot(x), x); + } else if (Function == NWPlugin::Function::NWPLUGIN_EXIT_ALL) { + Scheduler.setNetworkExitTimer(Settings.getNetworkInterfaceStartupDelayAtBoot(x), x); + } else { + event->NetworkIndex = x; + String command; - if (Function == NWPlugin::Function::NWPLUGIN_WRITE) { - command = str; - } + if (Function == NWPlugin::Function::NWPLUGIN_WRITE) { + command = str; + } - if (do_NWPluginCall( - getNetworkDriverIndex_from_NetworkIndex(x), - Function, - event, - command)) { - if ((Function == NWPlugin::Function::NWPLUGIN_WRITE) || - (Function == NWPlugin::Function::NWPLUGIN_WEBSERVER_SHOULD_RUN)) { - // Need to stop when call was handled - return true; + if (do_NWPluginCall( + getNetworkDriverIndex_from_NetworkIndex(x), + Function, + event, + command)) { + if ((Function == NWPlugin::Function::NWPLUGIN_WRITE) || + (Function == NWPlugin::Function::NWPLUGIN_WEBSERVER_SHOULD_RUN)) { + // Need to stop when call was handled + return true; + } + success = true; } - success = true; } } } diff --git a/src/ESPEasy/net/Helpers/WiFi_AP_CandidatesList.cpp b/src/ESPEasy/net/Helpers/WiFi_AP_CandidatesList.cpp index 3a833e76a..4dbecb43b 100644 --- a/src/ESPEasy/net/Helpers/WiFi_AP_CandidatesList.cpp +++ b/src/ESPEasy/net/Helpers/WiFi_AP_CandidatesList.cpp @@ -107,7 +107,8 @@ void WiFi_AP_CandidatesList::force_reload() { loadCandidatesFromScanned(); } -void WiFi_AP_CandidatesList::begin_sync_scan() { +void WiFi_AP_CandidatesList::begin_scan() { + _last_scan.setNow(); candidates.clear(); _addedKnownCandidate = false; } @@ -124,9 +125,10 @@ void WiFi_AP_CandidatesList::purge_expired() { # if !FEATURE_ESP8266_DIRECT_WIFI_SCAN -void WiFi_AP_CandidatesList::process_WiFiscan(uint8_t scancount) { +void WiFi_AP_CandidatesList::process_WiFiscan() { // Append or update found APs from scan. - for (uint8_t i = 0; i < scancount; ++i) { + int scancount = WiFi.scanComplete(); + for (int i = 0; i < scancount; ++i) { const WiFi_AP_Candidate tmp(i); scanned_new.push_back(tmp); @@ -273,9 +275,11 @@ void WiFi_AP_CandidatesList::markCurrentConnectionStable() { } int8_t WiFi_AP_CandidatesList::scanComplete() const { - const int8_t scanCompleteStatus = WiFi.scanComplete(); + if (!_last_scan.isSet() || + (_last_scan.millisPassedSince() > WIFI_AP_CANDIDATE_MAX_AGE)) return -3; - if (scanCompleteStatus == -1) { + const int8_t scanCompleteStatus = WiFi.scanComplete(); + if (scanCompleteStatus < 0) { // Still scanning return scanCompleteStatus; } diff --git a/src/ESPEasy/net/Helpers/WiFi_AP_CandidatesList.h b/src/ESPEasy/net/Helpers/WiFi_AP_CandidatesList.h index 69264cbfd..4756913ac 100644 --- a/src/ESPEasy/net/Helpers/WiFi_AP_CandidatesList.h +++ b/src/ESPEasy/net/Helpers/WiFi_AP_CandidatesList.h @@ -3,6 +3,7 @@ #include "../../../ESPEasy_common.h" #include "../DataStructs/WiFi_AP_Candidate.h" +#include "../../../src/Helpers/LongTermTimer.h" #include @@ -30,14 +31,14 @@ struct WiFi_AP_CandidatesList { // Called after WiFi credentials have changed. void force_reload(); - void begin_sync_scan(); + void begin_scan(); void purge_expired(); # if !FEATURE_ESP8266_DIRECT_WIFI_SCAN // Add found WiFi access points to the list if they are possible candidates. - void process_WiFiscan(uint8_t scancount); + void process_WiFiscan(); # endif // if !FEATURE_ESP8266_DIRECT_WIFI_SCAN # ifdef ESP8266 @@ -69,6 +70,10 @@ struct WiFi_AP_CandidatesList { bool addedKnownCandidate() const { return _addedKnownCandidate; } + // Return number of found access points + // @retval -1: WIFI_SCAN_RUNNING + // @retval -2: WIFI_SCAN_FAILED + // @retval -3: No scan performed (recently) int8_t scanComplete() const; WiFi_AP_Candidate_const_iterator scanned_begin() const { @@ -119,6 +124,7 @@ private: bool _mustLoadCredentials = true; bool _addedKnownCandidate = false; + LongTermTimer _last_scan; public: diff --git a/src/ESPEasy/net/NWPluginStructs/NW001_data_struct_WiFi_STA.cpp b/src/ESPEasy/net/NWPluginStructs/NW001_data_struct_WiFi_STA.cpp index 0dc1dca30..d408cf5b2 100644 --- a/src/ESPEasy/net/NWPluginStructs/NW001_data_struct_WiFi_STA.cpp +++ b/src/ESPEasy/net/NWPluginStructs/NW001_data_struct_WiFi_STA.cpp @@ -168,12 +168,14 @@ bool NW001_data_struct_WiFi_STA::record_stats() if (_plugin_stats_array != nullptr) { EventStruct tmpEvent; size_t valueCount{}; - tmpEvent.ParfN[valueCount++] = - # ifdef ESP32 + const int rssi = +# ifdef ESP32 WiFi.STA.RSSI(); - # else +# else WiFi.RSSI(); - # endif // ifdef ESP32 +# endif // ifdef ESP32 + + tmpEvent.ParfN[valueCount++] = rssi < 0 ? rssi : NAN; # if FEATURE_SET_WIFI_TX_PWR tmpEvent.ParfN[valueCount++] = ESPEasy::net::wifi::GetWiFiTXpower(); # endif diff --git a/src/ESPEasy/net/wifi/ESPEasyWiFi_state_machine.cpp b/src/ESPEasy/net/wifi/ESPEasyWiFi_state_machine.cpp index 01ba98a7b..76d67e95e 100644 --- a/src/ESPEasy/net/wifi/ESPEasyWiFi_state_machine.cpp +++ b/src/ESPEasy/net/wifi/ESPEasyWiFi_state_machine.cpp @@ -46,7 +46,20 @@ void ESPEasyWiFi_t::enable() {} void ESPEasyWiFi_t::disable() { setState(WiFiState_e::Disabled, 100); } -void ESPEasyWiFi_t::begin() { setState(WiFiState_e::IdleWaiting, 100); } +void ESPEasyWiFi_t::begin() { + if (WiFi_AP_Candidates.hasCandidates()) { + setState(WiFiState_e::IdleWaiting, 100); + } else { + if (WifiIsAP(WiFi.getMode())) { + // TODO TD-er: Must check if any client is connected. + // If not, then we can disable AP mode and switch to WiFiState_e::STA_Scanning + setState(WiFiState_e::STA_AP_Scanning, WIFI_STATE_MACHINE_STA_AP_SCANNING_TIMEOUT); + } else { + // setState(WiFiState_e::STA_AP_Scanning, WIFI_STATE_MACHINE_STA_AP_SCANNING_TIMEOUT); + setState(WiFiState_e::STA_Scanning, WIFI_STATE_MACHINE_STA_SCANNING_TIMEOUT); + } + } +} void ESPEasyWiFi_t::loop() { @@ -110,7 +123,7 @@ void ESPEasyWiFi_t::loop() WiFiEventData.wifiConnectAttemptNeeded = false; setState(WiFiState_e::AP_only, WIFI_STATE_MACHINE_AP_ONLY_TIMEOUT); */ - } else if (WiFi_AP_Candidates.scanComplete() == 0 + } else if (WiFi_AP_Candidates.scanComplete() == 0 || WiFi_AP_Candidates.scanComplete() == -3 # ifdef ESP32 # if ESP_IDF_VERSION >= ESP_IDF_VERSION_VAL(5, 1, 2) || WiFi.status() == WL_STOPPED @@ -147,12 +160,12 @@ void ESPEasyWiFi_t::loop() case WiFiState_e::STA_Scanning: { // -1 if scan not finished - auto scanCompleteStatus = WiFi.scanComplete(); + auto scanCompleteStatus = WiFi_AP_Candidates.scanComplete(); if (scanCompleteStatus >= 0) { WiFi_AP_Candidates.load_knownCredentials(); # if !FEATURE_ESP8266_DIRECT_WIFI_SCAN - WiFi_AP_Candidates.process_WiFiscan(scanCompleteStatus); + WiFi_AP_Candidates.process_WiFiscan(); # endif # ifndef BUILD_NO_DEBUG addLog(LOG_LEVEL_INFO, strformat( @@ -183,12 +196,12 @@ void ESPEasyWiFi_t::loop() case WiFiState_e::STA_AP_Scanning: { // -1 if scan not finished - auto scanCompleteStatus = WiFi.scanComplete(); + auto scanCompleteStatus = WiFi_AP_Candidates.scanComplete(); if (scanCompleteStatus >= 0) { WiFi_AP_Candidates.load_knownCredentials(); # if !FEATURE_ESP8266_DIRECT_WIFI_SCAN - WiFi_AP_Candidates.process_WiFiscan(scanCompleteStatus); + WiFi_AP_Candidates.process_WiFiscan(); # endif # ifndef BUILD_NO_DEBUG addLog(LOG_LEVEL_INFO, strformat( @@ -252,7 +265,11 @@ void ESPEasyWiFi_t::loop() // Check if still connected if (getSTA_connected_state() != STA_connected_state::Connected) { // setState(WiFiState_e::WiFiOFF); - setState(WiFiState_e::Disabled); + if (WiFi_AP_Candidates.hasCandidates()) { + setState(WiFiState_e::STA_Connecting, WIFI_STATE_MACHINE_STA_CONNECTING_TIMEOUT); + } else { + setState(WiFiState_e::STA_Scanning, WIFI_STATE_MACHINE_STA_SCANNING_TIMEOUT); + } /* if (Settings.UseRules) @@ -287,7 +304,8 @@ bool ESPEasyWiFi_t::connected() const void ESPEasyWiFi_t::disconnect() { doWiFiDisconnect(); } void ESPEasyWiFi_t::setState(WiFiState_e newState, uint32_t timeout) { - if (newState == _state) return; + if (newState == _state) { return; } + if (loglevelActiveFor(LOG_LEVEL_INFO)) { addLog( LOG_LEVEL_INFO, diff --git a/src/ESPEasy/net/wifi/ESPEasyWifi_ProcessEvent.cpp b/src/ESPEasy/net/wifi/ESPEasyWifi_ProcessEvent.cpp index d1ff47f8a..f6ddc527f 100644 --- a/src/ESPEasy/net/wifi/ESPEasyWifi_ProcessEvent.cpp +++ b/src/ESPEasy/net/wifi/ESPEasyWifi_ProcessEvent.cpp @@ -50,6 +50,7 @@ namespace wifi { // Called from the loop() to make sure events are processed as soon as possible. // These functions are called from Setup() or Loop() and thus may call delay() or yield() // ******************************************************************************** +/* void handle_unprocessedNetworkEvents() { # if FEATURE_ETHERNET @@ -87,18 +88,10 @@ void handle_unprocessedNetworkEvents() } if (WiFiEventData.WiFiServicesInitialized() && processedSomething) { - - // #ifdef ESP32 setWebserverRunning(false); delay(1); setWebserverRunning(true); delay(1); - - /* - #else - CheckRunningServices(); - #endif - */ } } @@ -110,6 +103,7 @@ void handle_unprocessedNetworkEvents() updateUDPport(false); # endif } +*/ // ******************************************************************************** // Functions to process the data gathered from the events. @@ -430,7 +424,7 @@ void processScanDone() { # endif // ifndef BUILD_NO_DEBUG # if !FEATURE_ESP8266_DIRECT_WIFI_SCAN - WiFi_AP_Candidates.process_WiFiscan(scanCompleteStatus); + WiFi_AP_Candidates.process_WiFiscan(); # endif WiFi_AP_Candidates.load_knownCredentials(); diff --git a/src/ESPEasy/net/wifi/ESPEasyWifi_ProcessEvent.h b/src/ESPEasy/net/wifi/ESPEasyWifi_ProcessEvent.h index ba914aeff..405067c7d 100644 --- a/src/ESPEasy/net/wifi/ESPEasyWifi_ProcessEvent.h +++ b/src/ESPEasy/net/wifi/ESPEasyWifi_ProcessEvent.h @@ -7,7 +7,7 @@ namespace ESPEasy { namespace net { namespace wifi { -void handle_unprocessedNetworkEvents(); +//void handle_unprocessedNetworkEvents(); void processDisconnect(); void processConnect(); void processGotIP(); diff --git a/src/ESPEasy/net/wifi/ESPEasyWifi_abstracted_ESP32.cpp b/src/ESPEasy/net/wifi/ESPEasyWifi_abstracted_ESP32.cpp index 97efdd39c..0e8f5ab2c 100644 --- a/src/ESPEasy/net/wifi/ESPEasyWifi_abstracted_ESP32.cpp +++ b/src/ESPEasy/net/wifi/ESPEasyWifi_abstracted_ESP32.cpp @@ -241,8 +241,8 @@ void doWifiScan(bool async, uint8_t channel) { unsigned int nrScans = 1 + (async ? 0 : Settings.NumberExtraWiFiScans); while (nrScans > 0) { + WiFi_AP_Candidates.begin_scan(); if (!async) { - WiFi_AP_Candidates.begin_sync_scan(); FeedSW_watchdog(); } --nrScans; diff --git a/src/ESPEasy/net/wifi/ESPEasyWifi_abstracted_ESP8266.cpp b/src/ESPEasy/net/wifi/ESPEasyWifi_abstracted_ESP8266.cpp index eda6c8ab7..d42f4a1d4 100644 --- a/src/ESPEasy/net/wifi/ESPEasyWifi_abstracted_ESP8266.cpp +++ b/src/ESPEasy/net/wifi/ESPEasyWifi_abstracted_ESP8266.cpp @@ -31,8 +31,8 @@ bool WiFi_pre_STA_setup() { if (!doSetSTA(true)) { return false; } // Assign to 2 separate bools to make sure both are executed. - const bool autoConnect = WiFi.setAutoConnect(false); - const bool autoReconnect = WiFi.setAutoReconnect(false); + const bool autoConnect = WiFi.setAutoConnect(true); + const bool autoReconnect = WiFi.setAutoReconnect(true); if (!autoConnect || !autoReconnect) { addLog(LOG_LEVEL_ERROR, F("WiFi : Disabling auto (re)connect failed")); @@ -158,8 +158,8 @@ void doWifiScan(bool async, uint8_t channel) { unsigned int nrScans = 1 + (async ? 0 : Settings.NumberExtraWiFiScans); while (nrScans > 0) { + WiFi_AP_Candidates.begin_scan(); if (!async) { - WiFi_AP_Candidates.begin_sync_scan(); FeedSW_watchdog(); } --nrScans; diff --git a/src/src/DataStructs/Scheduler_NWPluginTimerID.cpp b/src/src/DataStructs/Scheduler_NWPluginTimerID.cpp new file mode 100644 index 000000000..90522dda8 --- /dev/null +++ b/src/src/DataStructs/Scheduler_NWPluginTimerID.cpp @@ -0,0 +1,52 @@ +#include "../DataStructs/Scheduler_NWPluginTimerID.h" + +#include "../Globals/Plugins.h" +#include "../Helpers/Misc.h" + +NWPluginTimerID::NWPluginTimerID(ESPEasy::net::networkIndex_t networkIndex, + int Par1, + NWPlugin::Function function) : + SchedulerTimerID(SchedulerTimerType_e::NWPLUGIN_TIMER_IN_e) +{ + constexpr unsigned nrBitsNetworkIndex = NR_BITS(NETWORK_MAX); + constexpr unsigned mask_networkIndex = MASK_BITS(nrBitsNetworkIndex); + constexpr unsigned nrBitsPluginFunction = NrBitsNWPluginFunctions; + constexpr unsigned mask_function = MASK_BITS(nrBitsPluginFunction); + + if (validTaskIndex(networkIndex)) { + setId((networkIndex & mask_networkIndex) | + ((static_cast(function) & mask_function) << nrBitsNetworkIndex) | + (Par1 << (nrBitsNetworkIndex + nrBitsPluginFunction))); + } +} + +ESPEasy::net::networkIndex_t NWPluginTimerID::getNetworkIndex() const +{ + constexpr unsigned nrBitsNetworkIndex = NR_BITS(NETWORK_MAX); + constexpr unsigned mask_networkIndex = MASK_BITS(nrBitsNetworkIndex); + + return static_cast(getId() & mask_networkIndex); +} + +NWPlugin::Function NWPluginTimerID::getFunction() const +{ + constexpr unsigned nrBitsNetworkIndex = NR_BITS(NETWORK_MAX); + constexpr unsigned nrBitsPluginFunction = NrBitsNWPluginFunctions; + constexpr unsigned mask_function = MASK_BITS(nrBitsPluginFunction); + + return static_cast((getId() >> nrBitsNetworkIndex) & mask_function); +} + +#ifndef BUILD_NO_DEBUG + +String NWPluginTimerID::decode() const +{ + const ESPEasy::net::networkIndex_t networkIndex = getNetworkIndex(); + + if (validTaskIndex(networkIndex)) { + return getTaskDeviceName(networkIndex); + } + return String(getId()); +} + +#endif // ifndef BUILD_NO_DEBUG diff --git a/src/src/DataStructs/Scheduler_NWPluginTimerID.h b/src/src/DataStructs/Scheduler_NWPluginTimerID.h new file mode 100644 index 000000000..6f7dff998 --- /dev/null +++ b/src/src/DataStructs/Scheduler_NWPluginTimerID.h @@ -0,0 +1,27 @@ +#pragma once + +#include "../DataStructs/SchedulerTimerID.h" + +#include "../DataTypes/ESPEasy_plugin_functions.h" +#include "../../ESPEasy/net/DataTypes/NetworkIndex.h" + + +/*********************************************************************************************\ +* Plugin Task Timer (PLUGIN_TASKTIMER_IN) +* Can be scheduled per combo taskIndex & Par1 (20 least significant bits) +\*********************************************************************************************/ +struct NWPluginTimerID : SchedulerTimerID { + // taskIndex and par1 form a unique key that can be used to restart a timer + NWPluginTimerID(ESPEasy::net::networkIndex_t taskIndex, + int Par1, + NWPlugin::Function function = NWPlugin::Function::NWPLUGIN_TIMER_IN); + + ESPEasy::net::networkIndex_t getNetworkIndex() const; + + NWPlugin::Function getFunction() const; + +#ifndef BUILD_NO_DEBUG + String decode() const; +#endif // ifndef BUILD_NO_DEBUG + +}; diff --git a/src/src/DataStructs/SettingsStruct.h b/src/src/DataStructs/SettingsStruct.h index 4a69c096a..39dd70b6c 100644 --- a/src/src/DataStructs/SettingsStruct.h +++ b/src/src/DataStructs/SettingsStruct.h @@ -640,7 +640,7 @@ public: int8_t PinBootStates_ESP32[24] = {0}; // pins 17 ... 39 #endif uint8_t WiFi_TX_power = 70; // 70 = 17.5dBm. unit: 0.25 dBm - int8_t WiFi_sensitivity_margin = 3; // Margin in dBm on top of sensitivity. + int8_t WiFi_sensitivity_margin = 5; // Margin in dBm on top of sensitivity. uint8_t NumberExtraWiFiScans = 0; int8_t SPI_SCLK_pin = -1; int8_t SPI_MISO_pin = -1; diff --git a/src/src/DataStructs/SystemTimerStruct.cpp b/src/src/DataStructs/SystemTimerStruct.cpp index 11b69280c..db009158b 100644 --- a/src/src/DataStructs/SystemTimerStruct.cpp +++ b/src/src/DataStructs/SystemTimerStruct.cpp @@ -35,7 +35,7 @@ systemTimerStruct::systemTimerStruct(int recurringCount, unsigned long msecFromN } struct EventStruct systemTimerStruct::toEvent() const { - struct EventStruct TempEvent(TaskIndex); + struct EventStruct TempEvent(static_cast(_index)); TempEvent.Par1 = _recurringCount; TempEvent.Par2 = _interval; @@ -45,14 +45,28 @@ struct EventStruct systemTimerStruct::toEvent() const { return TempEvent; } -void systemTimerStruct::fromEvent(taskIndex_t taskIndex, +struct EventStruct systemTimerStruct::toNetworkEvent() const { + struct EventStruct TempEvent; + + TempEvent.NetworkIndex = _index; + + TempEvent.Par1 = _recurringCount; + TempEvent.Par2 = _interval; + TempEvent.Par3 = _timerIndex; + TempEvent.Par4 = _remainder; + TempEvent.Par5 = _loopCount; + return TempEvent; + +} + +void systemTimerStruct::fromEvent(int Index, int Par1, int Par2, int Par3, int Par4, int Par5) { - TaskIndex = taskIndex; + _index = Index; _recurringCount = Par1; _interval = Par2; _timerIndex = Par3; diff --git a/src/src/DataStructs/SystemTimerStruct.h b/src/src/DataStructs/SystemTimerStruct.h index 06a10750c..1265f1df4 100644 --- a/src/src/DataStructs/SystemTimerStruct.h +++ b/src/src/DataStructs/SystemTimerStruct.h @@ -20,7 +20,7 @@ private: int _remainder = 0; int _loopCount = 0; int _alternateInterval = 0; - taskIndex_t TaskIndex = INVALID_TASK_INDEX; + int _index = -1; bool _alternateState = false; public: @@ -35,7 +35,9 @@ public: struct EventStruct toEvent() const; - void fromEvent(taskIndex_t TaskIndex, + struct EventStruct toNetworkEvent() const; + + void fromEvent(int Index, int Par1, int Par2, int Par3, diff --git a/src/src/DataTypes/ESPEasy_plugin_functions.h b/src/src/DataTypes/ESPEasy_plugin_functions.h index e3dcfa640..d162023fe 100644 --- a/src/src/DataTypes/ESPEasy_plugin_functions.h +++ b/src/src/DataTypes/ESPEasy_plugin_functions.h @@ -164,6 +164,7 @@ public: NWPLUGIN_WEBFORM_SAVE, NWPLUGIN_WEBFORM_LOAD, NWPLUGIN_GET_PARAMETER_DISPLAY_NAME, + NWPLUGIN_TIMER_IN, NWPLUGIN_INIT, NWPLUGIN_TEN_PER_SECOND, // Called 10x per second (typical for checking new data instead of waiting) NWPLUGIN_FIFTY_PER_SECOND, // Called 50x per second (typical for checking new data instead of waiting) @@ -191,10 +192,16 @@ public: NWPLUGIN_WEBFORM_SHOW_HOSTNAME, // Used for showing hostname NWPLUGIN_WEBFORM_SHOW_HW_ADDRESS, // Used for showing MAC NWPLUGIN_WEBFORM_SHOW_IP, // Used for showing IP - NWPLUGIN_WEBFORM_SHOW_PORT // Used for showing host information for the network adapter. + NWPLUGIN_WEBFORM_SHOW_PORT, // Used for showing host information for the network adapter. + + + NWPLUGIN_MAX_FUNCTION // Keep as last }; +#define NrBitsNWPluginFunctions NR_BITS(static_cast(NWPlugin::Function::NWPLUGIN_MAX_FUNCTION)) + + #ifdef ESP32 static bool canQueryViaNetworkInterface(Function function); diff --git a/src/src/DataTypes/SchedulerTimerType.cpp b/src/src/DataTypes/SchedulerTimerType.cpp index 9d32cd1be..8a2136675 100644 --- a/src/src/DataTypes/SchedulerTimerType.cpp +++ b/src/src/DataTypes/SchedulerTimerType.cpp @@ -12,6 +12,7 @@ const __FlashStringHelper * toString(SchedulerTimerType_e timerType) { case SchedulerTimerType_e::PLUGIN_DEVICETIMER_IN_e: return F("PLUGIN_DEVICETIMER_IN"); case SchedulerTimerType_e::RulesTimer: return F("Rules#Timer"); case SchedulerTimerType_e::IntendedReboot: return F("Intended Reboot"); + case SchedulerTimerType_e::NWPLUGIN_TIMER_IN_e: return F("NWPLUGIN_TIMER_IN"); } return F("Unknown"); } diff --git a/src/src/DataTypes/SchedulerTimerType.h b/src/src/DataTypes/SchedulerTimerType.h index 804ed95ee..a51f230dd 100644 --- a/src/src/DataTypes/SchedulerTimerType.h +++ b/src/src/DataTypes/SchedulerTimerType.h @@ -12,6 +12,7 @@ GPIO_timer = 4u, PLUGIN_DEVICETIMER_IN_e = 5u, // Similar to PLUGIN_TASKTIMER_IN, addressed to a plugin instead of a task. RulesTimer = 6u, + NWPLUGIN_TIMER_IN_e = 7u, IntendedReboot = 15u // Used to show intended reboot }; diff --git a/src/src/ESPEasyCore/ESPEasy_loop.cpp b/src/src/ESPEasyCore/ESPEasy_loop.cpp index d1c1aa5e5..0e2465747 100644 --- a/src/src/ESPEasyCore/ESPEasy_loop.cpp +++ b/src/src/ESPEasyCore/ESPEasy_loop.cpp @@ -75,7 +75,7 @@ void ESPEasy_loop() // ESPEasy::net::wifi::loopWiFi(); - ESPEasy::net::wifi::handle_unprocessedNetworkEvents(); +// ESPEasy::net::wifi::handle_unprocessedNetworkEvents(); bool firstLoopConnectionsEstablished = firstLoop && ESPEasy::net::NetworkConnected(); diff --git a/src/src/Helpers/ESPEasy_Storage.cpp b/src/src/Helpers/ESPEasy_Storage.cpp index 9699b3d84..94842028c 100644 --- a/src/src/Helpers/ESPEasy_Storage.cpp +++ b/src/src/Helpers/ESPEasy_Storage.cpp @@ -430,7 +430,7 @@ bool BuildFixes() if (Settings.Build < 20112) { Settings.WiFi_TX_power = 70; // 70 = 17.5dBm. unit: 0.25 dBm - Settings.WiFi_sensitivity_margin = 3; // Margin in dBm on top of sensitivity. + Settings.WiFi_sensitivity_margin = 5; // Margin in dBm on top of sensitivity. } if (Settings.Build < 20113) { diff --git a/src/src/Helpers/ESPEasy_checks.cpp b/src/src/Helpers/ESPEasy_checks.cpp index 814daafa6..58d5a2288 100644 --- a/src/src/Helpers/ESPEasy_checks.cpp +++ b/src/src/Helpers/ESPEasy_checks.cpp @@ -129,7 +129,7 @@ void run_compiletime_checks() { #if FEATURE_CUSTOM_PROVISIONING check_size(); #endif - check_size(); + check_size(); check_size(); check_size(); check_size(); diff --git a/src/src/Helpers/PeriodicalActions.cpp b/src/src/Helpers/PeriodicalActions.cpp index b1e87d8ff..f46703bb8 100644 --- a/src/src/Helpers/PeriodicalActions.cpp +++ b/src/src/Helpers/PeriodicalActions.cpp @@ -280,7 +280,7 @@ void runEach30Seconds() log += strformat( F(" WiFiStatus: %s ESPeasy internal wifi status: %s"), ArduinoWifiStatusToString(WiFi.status()).c_str(), - WiFiEventData.ESPeasyWifiStatusToString().c_str()); + data->statusToString().c_str()); } // log += F(" ListenInterval "); // log += WiFi.getListenInterval(); diff --git a/src/src/Helpers/Scheduler.cpp b/src/src/Helpers/Scheduler.cpp index 98ecf4b25..40f027be8 100644 --- a/src/src/Helpers/Scheduler.cpp +++ b/src/src/Helpers/Scheduler.cpp @@ -84,6 +84,9 @@ void ESPEasy_Scheduler::handle_schedule() { case SchedulerTimerType_e::GPIO_timer: process_gpio_timer(timerID, timer); break; + case SchedulerTimerType_e::NWPLUGIN_TIMER_IN_e: + process_network_timer(timerID); + break; case SchedulerTimerType_e::SystemEventQueue: case SchedulerTimerType_e::IntendedReboot: diff --git a/src/src/Helpers/Scheduler.h b/src/src/Helpers/Scheduler.h index 4266d3ebf..cfc77b478 100644 --- a/src/src/Helpers/Scheduler.h +++ b/src/src/Helpers/Scheduler.h @@ -144,7 +144,7 @@ public: void setPluginTaskTimer(unsigned long msecFromNow, taskIndex_t taskIndex, - PluginFunctions_e function, + const PluginFunctions_e& function, int Par1, int Par2 = 0, int Par3 = 0, @@ -153,6 +153,27 @@ void setPluginTaskTimer(unsigned long msecFromNow, void process_plugin_task_timer(SchedulerTimerID timerID); + /*********************************************************************************************\ + * Network Adapter Timer (NWPLUGIN_TASKTIMER_IN) + * Can be scheduled per combo networkIndex & Par1 (20 least significant bits) + \*********************************************************************************************/ + void setNetworkInitTimer(unsigned long msecFromNow, + ESPEasy::net::networkIndex_t networkIndex); + void setNetworkExitTimer(unsigned long msecFromNow, + ESPEasy::net::networkIndex_t networkIndex); + + void setNetworkTimer(unsigned long msecFromNow, + ESPEasy::net::networkIndex_t networkIndex, + NWPlugin::Function function, + int Par1 = 0, + int Par2 = 0, + int Par3 = 0, + int Par4 = 0, + int Par5 = 0); + + void process_network_timer(SchedulerTimerID timerID); + + /*********************************************************************************************\ * Rules Timer diff --git a/src/src/Helpers/Scheduler_NetworkTimer.cpp b/src/src/Helpers/Scheduler_NetworkTimer.cpp new file mode 100644 index 000000000..7bb085edf --- /dev/null +++ b/src/src/Helpers/Scheduler_NetworkTimer.cpp @@ -0,0 +1,64 @@ +#include "../Helpers/Scheduler.h" + +#include "../DataStructs/Scheduler_NWPluginTimerID.h" + +#include "../Globals/Settings.h" + +/*********************************************************************************************\ +* Network Adapter Timer (NWPLUGIN_TASKTIMER_IN) +* Can be scheduled per combo networkIndex & Par1 (20 least significant bits) +\*********************************************************************************************/ +void ESPEasy_Scheduler::setNetworkInitTimer(unsigned long msecFromNow, + ESPEasy::net::networkIndex_t networkIndex) +{ + setNetworkTimer(msecFromNow, networkIndex, NWPlugin::Function::NWPLUGIN_INIT); +} + +void ESPEasy_Scheduler::setNetworkExitTimer(unsigned long msecFromNow, + ESPEasy::net::networkIndex_t networkIndex) +{ + setNetworkTimer(msecFromNow, networkIndex, NWPlugin::Function::NWPLUGIN_EXIT); +} + +void ESPEasy_Scheduler::setNetworkTimer(unsigned long msecFromNow, + ESPEasy::net::networkIndex_t networkIndex, + NWPlugin::Function function, + int Par1, + int Par2, + int Par3, + int Par4, + int Par5) +{ + if (!validNetworkIndex(networkIndex)) { return; } + + if (!Settings.getNetworkEnabled(networkIndex)) { return; } + + const NWPluginTimerID timerID(networkIndex, Par1, function); + + systemTimerStruct timer_data; + + timer_data.fromEvent(networkIndex, Par1, Par2, Par3, Par4, Par5); + systemTimers[timerID.mixed_id] = timer_data; + setNewTimerAt(timerID, millis() + msecFromNow); +} + +void ESPEasy_Scheduler::process_network_timer(SchedulerTimerID id) +{ + auto it = systemTimers.find(id.mixed_id); + + if (it == systemTimers.end()) { return; } + + struct EventStruct TempEvent(it->second.toNetworkEvent()); + + // TD-er: Not sure if we have to keep original source for notifications. + TempEvent.Source = EventValueSource::Enum::VALUE_SOURCE_SYSTEM; + systemTimers.erase(id.mixed_id); + + { + String dummy; + const NWPluginTimerID *tmp = reinterpret_cast(&id); + const NWPlugin::Function function = tmp->getFunction(); + ESPEasy::net::NWPluginCall(function, &TempEvent, dummy); + } + +} diff --git a/src/src/Helpers/Scheduler_PluginTaskTimer.cpp b/src/src/Helpers/Scheduler_PluginTaskTimer.cpp index 13ebddad9..accb4127e 100644 --- a/src/src/Helpers/Scheduler_PluginTaskTimer.cpp +++ b/src/src/Helpers/Scheduler_PluginTaskTimer.cpp @@ -21,7 +21,7 @@ void ESPEasy_Scheduler::setPluginTaskTimer( void ESPEasy_Scheduler::setPluginTaskTimer( unsigned long msecFromNow, taskIndex_t taskIndex, - PluginFunctions_e function, + const PluginFunctions_e& function, int Par1, int Par2, int Par3, int Par4, int Par5) { // taskIndex and par1 form a unique key that can be used to restart a timer @@ -29,7 +29,7 @@ void ESPEasy_Scheduler::setPluginTaskTimer( if (!Settings.TaskDeviceEnabled[taskIndex]) { return; } - const PluginTaskTimerID timerID(taskIndex, Par1); + const PluginTaskTimerID timerID(taskIndex, Par1, function); systemTimerStruct timer_data; diff --git a/src/src/PluginStructs/P056_data_struct.cpp b/src/src/PluginStructs/P056_data_struct.cpp index 86dc9eed4..678de8353 100644 --- a/src/src/PluginStructs/P056_data_struct.cpp +++ b/src/src/PluginStructs/P056_data_struct.cpp @@ -1,6 +1,8 @@ #include "../PluginStructs/P056_data_struct.h" +#ifdef USES_P056 + P056_data_struct::P056_data_struct(EventStruct *event) { delete SDS; @@ -60,3 +62,5 @@ void P056_data_struct::SetWorkingPeriod(int minutes) { this->SDS->SetWorkingPeriod(minutes); } } + +#endif \ No newline at end of file diff --git a/src/src/PluginStructs/P089_data_struct.cpp b/src/src/PluginStructs/P089_data_struct.cpp index d7f51e4f6..69b141fa2 100644 --- a/src/src/PluginStructs/P089_data_struct.cpp +++ b/src/src/PluginStructs/P089_data_struct.cpp @@ -4,9 +4,10 @@ # include "../Helpers/Networking.h" - # include "../Helpers/_Plugin_init.h" +# include "../../ESPEasy/net/ESPEasyNetwork.h" + # ifdef ESP32 P089_data_struct::P089_data_struct() { if (nullptr == P089_ping_service) { From 2ab3e78e1d715bbcec9df85df4c02db39a0c5993 Mon Sep 17 00:00:00 2001 From: TD-er Date: Fri, 12 Sep 2025 12:33:18 +0200 Subject: [PATCH 249/564] [RC522] Add support for 7-byte NFC UIDs --- src/_P111_RC522_RFID.ino | 32 ++++++++++++--- src/src/Helpers/StringConverter.cpp | 40 ++++++++++++++++++ src/src/Helpers/StringConverter.h | 14 +++++++ src/src/PluginStructs/P111_data_struct.cpp | 47 ++++++++++++++++------ src/src/PluginStructs/P111_data_struct.h | 2 +- 5 files changed, 116 insertions(+), 19 deletions(-) diff --git a/src/_P111_RC522_RFID.ino b/src/_P111_RC522_RFID.ino index 0f89afd59..93a9cb0d1 100644 --- a/src/_P111_RC522_RFID.ino +++ b/src/_P111_RC522_RFID.ino @@ -39,12 +39,17 @@ boolean Plugin_111(uint8_t function, struct EventStruct *event, String& string) case PLUGIN_DEVICE_ADD: { auto& dev = Device[++deviceCount]; - dev.Number = PLUGIN_ID_111; - dev.Type = DEVICE_TYPE_SPI3; - dev.VType = Sensor_VType::SENSOR_TYPE_ULONG; - dev.ValueCount = 1; - dev.SendDataOption = true; - dev.CustomVTypeVar = true; + dev.Number = PLUGIN_ID_111; + dev.Type = DEVICE_TYPE_SPI3; +#if FEATURE_EXTENDED_TASK_VALUE_TYPES + dev.VType = Sensor_VType::SENSOR_TYPE_UINT64_SINGLE; +#else + dev.VType = Sensor_VType::SENSOR_TYPE_ULONG; +#endif + dev.ValueCount = 1; + dev.HasFormatUserVar = true; + dev.SendDataOption = true; + dev.CustomVTypeVar = true; break; } @@ -68,6 +73,21 @@ boolean Plugin_111(uint8_t function, struct EventStruct *event, String& string) break; } + case PLUGIN_FORMAT_USERVAR: + { +#if FEATURE_EXTENDED_TASK_VALUE_TYPES + string = formatULLtoHex( + UserVar.getUint64(event->TaskIndex, event->idx), + 1); +#else + string = formatToHex( + UserVar.getSensorTypeLong(event->TaskIndex, event->idx), + 1); +#endif + success = true; + break; + } + # if FEATURE_MQTT_DISCOVER || FEATURE_CUSTOM_TASKVAR_VTYPE case PLUGIN_GET_DISCOVERY_VTYPES: { diff --git a/src/src/Helpers/StringConverter.cpp b/src/src/Helpers/StringConverter.cpp index 4894a1566..24915c286 100644 --- a/src/src/Helpers/StringConverter.cpp +++ b/src/src/Helpers/StringConverter.cpp @@ -301,6 +301,46 @@ String formatToHex_array(const uint8_t* data, size_t size) return res; } +String formatULLtoHex(const uint64_t& value, + const __FlashStringHelper * prefix, + unsigned int minimal_hex_digits) +{ + return concat(prefix, formatULLtoHex_no_prefix(value, minimal_hex_digits)); +} + +String formatULLtoHex(const uint64_t& value, + const __FlashStringHelper * prefix) +{ + return formatULLtoHex(value, prefix, 0); +} + +String formatULLtoHex(const uint64_t& value, unsigned int minimal_hex_digits) +{ + return formatULLtoHex(value, F("0x"), minimal_hex_digits); +} + +String formatULLtoHex_no_prefix(const uint64_t& value, unsigned int minimal_hex_digits) +{ + const uint32_t msb_val = static_cast(value >> 32); + const uint32_t lsb_val = static_cast(value & 0xFFFFFFFF); + String res; + res.reserve(16); + res += formatToHex_no_prefix(msb_val, 8); + res += formatToHex_no_prefix(lsb_val, 8); + while (minimal_hex_digits < res.length() && res.startsWith(F("0"))) { + res = res.substring(1); + } + return res; +} + +String formatULLtoHex_decimal(const uint64_t& value) +{ + return strformat( + F("%s (%s)"), + formatULLtoHex(value).c_str(), + ull2String(value).c_str()); +} + String formatToHex(unsigned long value, const __FlashStringHelper * prefix, unsigned int minimal_hex_digits) { diff --git a/src/src/Helpers/StringConverter.h b/src/src/Helpers/StringConverter.h index 886774814..c2357d4f6 100644 --- a/src/src/Helpers/StringConverter.h +++ b/src/src/Helpers/StringConverter.h @@ -123,6 +123,20 @@ void appendHexChar(uint8_t data, String& string); // Returned string length will be twice the size of the data array. String formatToHex_array(const uint8_t* data, size_t size); +String formatULLtoHex(const uint64_t& value, + const __FlashStringHelper * prefix, + unsigned int minimal_hex_digits); + +String formatULLtoHex(const uint64_t& value, + const __FlashStringHelper * prefix); + +String formatULLtoHex(const uint64_t& value, unsigned int minimal_hex_digits = 0); + +String formatULLtoHex_no_prefix(const uint64_t& value, unsigned int minimal_hex_digits = 0); + +String formatULLtoHex_decimal(const uint64_t& value); + + String formatToHex(unsigned long value, const __FlashStringHelper * prefix, unsigned int minimal_hex_digits); diff --git a/src/src/PluginStructs/P111_data_struct.cpp b/src/src/PluginStructs/P111_data_struct.cpp index 49f735c67..7d526ae77 100644 --- a/src/src/PluginStructs/P111_data_struct.cpp +++ b/src/src/PluginStructs/P111_data_struct.cpp @@ -51,14 +51,14 @@ void P111_data_struct::init() { /** * read status and tag */ -uint8_t P111_data_struct::readCardStatus(uint32_t *key, +uint8_t P111_data_struct::readCardStatus(uint64_t *key, bool *removedTag) { if (initPhase != P111_initPhases::Ready) { // No read during reset return P111_ERROR_RESET_BUSY; } uint8_t error = P111_NO_ERROR; - uint8_t uid[] = { 0, 0, 0, 0, 0, 0, 0 }; + uint8_t uid[] = { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 }; uint8_t uidLength; error = readPassiveTargetID(uid, &uidLength); @@ -96,9 +96,10 @@ uint8_t P111_data_struct::readCardStatus(uint32_t *key, return P111_ERROR_RESET_BUSY; } } - uint32_t tmpKey = uid[0]; + uint64_t tmpKey = uid[0]; - for (uint8_t i = 1; i < 4; i++) { + for (uint8_t i = 1; i < uidLength && i < sizeof(uid); i++) { + // FIXME TD-er: 10-byte UID will not fit in an uint64_t tmpKey <<= 8; tmpKey += uid[i]; } @@ -227,10 +228,10 @@ uint8_t P111_data_struct::readPassiveTargetID(uint8_t *uid, // Until we support 7 uint8_t PICCs addLog(LOG_LEVEL_INFO, F("MFRC522: Scanned PICC's UID")); - for (uint8_t i = 0; i < 4; i++) { // + for (uint8_t i = 0; i < mfrc522->uid.size; i++) { // uid[i] = mfrc522->uid.uidByte[i]; } - *uidLength = 4; + *uidLength = mfrc522->uid.size; #ifndef BUILD_NO_DEBUG @@ -280,12 +281,16 @@ bool P111_data_struct::loop(struct EventStruct *event) { if (counter >= 5 || ComIrqReg_bits) { // Only every 3rd 0.1 second we do a read counter = 0; - uint32_t key = P111_NO_KEY; + uint64_t key = P111_NO_KEY; bool removedTag = false; const uint8_t error = readCardStatus(&key, &removedTag); if (error == P111_NO_ERROR) { - const uint32_t old_key = UserVar.getSensorTypeLong(event->TaskIndex); +#if FEATURE_EXTENDED_TASK_VALUE_TYPES + const uint64_t old_key = UserVar.getUint64(event->TaskIndex, 0); +#else + const uint64_t old_key = UserVar.getSensorTypeLong(event->TaskIndex, 0); +#endif bool new_key = false; # ifdef P111_USE_REMOVAL @@ -296,12 +301,30 @@ bool P111_data_struct::loop(struct EventStruct *event) { # endif // P111_USE_REMOVAL if ((old_key != key) && (key != P111_NO_KEY)) { - UserVar.setSensorTypeLong(event->TaskIndex, key); +#if FEATURE_EXTENDED_TASK_VALUE_TYPES + UserVar.setUint64(event->TaskIndex, 0, key); +#else + UserVar.setSensorTypeLong(event->TaskIndex, 0, key); +#endif new_key = true; if (Settings.UseRules) { - String event = strformat(F("MFRC522#tag=%u,%u"), key, old_key); - rulesProcessing(event); // TD-er: Process event of read key now. + // Event values: + // - Full tag UID + // - Least significant 32 bit (byte 0 .. 3) + // - Extra bytes of 7-byte UID (byte 4 .. 6) + // - Extra bytes of 10-byte UID (byte 7 .. 9) + + // TODO TD-er: No support yet for 10 byte UIDs + + // TD-er: Process event of read key now. + rulesProcessing(strformat( + F("%s#taguid=%s,%s,%s"), + getTaskDeviceName(event->TaskIndex).c_str(), + formatULLtoHex(key, 1).c_str(), + formatToHex(static_cast(key & 0xFFFFFFFF), 1).c_str(), + formatToHex(static_cast((key >> 32) & 0xFFFFFF), 1).c_str()) + ); } } @@ -313,7 +336,7 @@ bool P111_data_struct::loop(struct EventStruct *event) { } else { log += F("Old Tag: "); } - log += formatToHex_decimal(key); + log += formatULLtoHex_decimal(key); if (!removedTag) { log += F(" card: "); diff --git a/src/src/PluginStructs/P111_data_struct.h b/src/src/PluginStructs/P111_data_struct.h index 8acabdc6f..72da64742 100644 --- a/src/src/PluginStructs/P111_data_struct.h +++ b/src/src/PluginStructs/P111_data_struct.h @@ -52,7 +52,7 @@ private: uint8_t counter = 0; String getCardName(); - uint8_t readCardStatus(uint32_t *key, + uint8_t readCardStatus(uint64_t *key, bool *removedTag); bool reset(int8_t csPin, int8_t resetPin); From 582da18a2ab34e4337f7c608a5736161fb5d32af Mon Sep 17 00:00:00 2001 From: TD-er Date: Fri, 12 Sep 2025 12:33:48 +0200 Subject: [PATCH 250/564] [webUI] Move Hardware tab before Network tab --- src/src/WebServer/WebTemplateParser.h | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/src/WebServer/WebTemplateParser.h b/src/src/WebServer/WebTemplateParser.h index e18476894..3d0ad9183 100644 --- a/src/src/WebServer/WebTemplateParser.h +++ b/src/src/WebServer/WebTemplateParser.h @@ -11,9 +11,9 @@ #define MENU_INDEX_MAIN 0 #define MENU_INDEX_CONFIG 1 -#define MENU_INDEX_NETWORK 2 -#define MENU_INDEX_CONTROLLERS 3 -#define MENU_INDEX_HARDWARE 4 +#define MENU_INDEX_HARDWARE 2 +#define MENU_INDEX_NETWORK 3 +#define MENU_INDEX_CONTROLLERS 4 #define MENU_INDEX_BUSES 5 #define MENU_INDEX_DEVICES 6 #define MENU_INDEX_RULES 7 From 22ee9a29c16a1eda2af1f8512dfc6313e58c8365 Mon Sep 17 00:00:00 2001 From: TD-er Date: Fri, 12 Sep 2025 13:02:18 +0200 Subject: [PATCH 251/564] [Build] Fix merge issue --- src/src/PluginStructs/P089_data_struct.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/src/PluginStructs/P089_data_struct.h b/src/src/PluginStructs/P089_data_struct.h index e48a479b1..48ae549a1 100644 --- a/src/src/PluginStructs/P089_data_struct.h +++ b/src/src/PluginStructs/P089_data_struct.h @@ -4,7 +4,7 @@ #include "../../_Plugin_Helper.h" #ifdef USES_P089 -# include "src/ESPEasyCore/ESPEasyNetwork.h" +# include "../../ESPEasy/net/ESPEasyNetwork.h" # define PLUGIN_ID_089 89 From ca0a755e2bce5aaa3e4aca79cb39473c0a1aaf1a Mon Sep 17 00:00:00 2001 From: Ton Huisman Date: Fri, 12 Sep 2025 23:26:01 +0200 Subject: [PATCH 252/564] [P033] Update documentation --- docs/source/Plugin/P033.rst | 22 +++++++++++++++++- .../Plugin/P033_DeviceConfiguration.png | Bin 0 -> 48957 bytes .../Plugin/P033_OutputDataTypeOptions.png | Bin 47815 -> 47244 bytes 3 files changed, 21 insertions(+), 1 deletion(-) create mode 100644 docs/source/Plugin/P033_DeviceConfiguration.png diff --git a/docs/source/Plugin/P033.rst b/docs/source/Plugin/P033.rst index 1e94cff88..2cc260e88 100644 --- a/docs/source/Plugin/P033.rst +++ b/docs/source/Plugin/P033.rst @@ -32,6 +32,16 @@ Dummy tasks can be used like temporary variables to store data. One nice benefit is that these task values of Dummy tasks are also kept in RTC memory. So these may survive a reboot, as long as the ESP remains powered. +Device Configuration +-------------------- + +.. image:: P033_DeviceConfiguration.png + +* **Name**: Required by ESPEasy, must be unique among the list of available devices/tasks. + +* **Enabled**: The device can be disabled or enabled. When not enabled the device should not use any resources. + + Storing Values -------------- @@ -77,7 +87,7 @@ This selector is using a categorized display when the build includes this enhanc Available options, grouped per category: -**Basic**: ``Single, Dual, Tripple, Quad`` +**Basic**: ``Single, Dual, Triple, Quad`` **Environment**: ``Temp¹, Hum¹, Baro¹, Wind¹`` @@ -147,6 +157,13 @@ And all connected controllers of that task will be handed over the values presen Especially Domoticz controllers are very specific to the output data type. +Values +^^^^^^ + +The plugin provides the ``Dummy`` value, that can be changed to the desired name. A formula can be set to recalculate the displayed, and sent, value. The number of decimals can be set as desired, and defaults to 2. + +In selected builds, per Value is a **Stats** checkbox available, that when checked, gathers the data and presents recent data in a graph, as described here: :ref:`Task Value Statistics: ` + .. Supported hardware .. ------------------ @@ -169,6 +186,9 @@ Change log .. versionchanged:: 2.0 ... + |improved| + 2025-07-17 Add categorized output configuration (ESP32 only) + |improved| 2023-04-15 Add more types of task values, like (u)int32, (u)int64 and double. diff --git a/docs/source/Plugin/P033_DeviceConfiguration.png b/docs/source/Plugin/P033_DeviceConfiguration.png new file mode 100644 index 0000000000000000000000000000000000000000..71403ee3237440c1feccc3269f3cf89f0da6aeb9 GIT binary patch literal 48957 zcmd?QcT`i^+cpdgj$&iPf=Y8#M5GBQMM`umC{Ls5CthABtZg12uXyHgbVnOVk;kNUsS0uqgk~5Gk))5uw38TQ=$&=o~fGF*s^) ze4q9{1A`OC3{MyuZ`pYE@|UFDv}|t7)0eR@s^zm)u^13x#2kWD-z_y+WfD7Vs)%v`yW(Op-LdWO%QZGDY5$LF6GGwQ znZGaZFPCH<{%E3YZhi7ci;TNga)*DksQGqSny|Q_2Z4$fam)mI9|FF}b ze*IF%mYX-wS~Et!5l3>8FpJEf8%&q{XgEeVg-gMum~ne?y*T5C`p0N)79tz&l9mWv z50P=Ap+f8)c`aAo1o8TFj2pLfW?7&Ad*&H72!*4Ew4@))gatd_@>xf+c6$FtRcm8g z3*_f}H9-|el~w5RZZ-O@YS44oB&9$53m? zwvWdJPB}@%K}uCmz;rvw;p-NmhWF;HiQx4i_0`(a^@BTU4~5U&aUnH*;!##H*=RmS zbiPOPhxpf@mD~L|E6L}kV(w1wmU*@L`-4mUkP)|V{=~4@jNx?eCey&WEr4R;fv#X% zTYoa4B*0UDs6l6m?4us*w$as{F=w5fK61y*Hflk!8_hE#Y|DSw%L#Z_RivdSO(TRi zO@_*(&yQ4`-1$Qi?Lbq1>$dq&e%ekCOqOW)V!#l%tnXpHd7Qw>T-Ca*XPSIPZggC3 zx1&hq6lC2GMRNBA7ROF5FY8(#^&Khu7LiJG%ZvE%I?iWC?_*}4~>`LzKvwxe3u7&l<#-;fc z?EKaabk>ix&L~e)xTp(a>ZF>nmbU*bwMO1y>FI#XowqmsP}U5k2mcd;`_cEAU8?F& ze^^oX`^d7N*6e+ko!o}C`=&BkS>Tp*_p*#kSX3gdUhK)g3||;z2`R!StTZ)oHA^1L zEg{Q`KaMy_V6+s;89ofe^TQO28^JDi5ON4-6lm_8tME%w$-?SLVu>&V!~sRazrBHA zsFESjpoqeTkBSVz;&L*3d7z98`t}mrxDqPiU{_~wWVYnCWF@Ex(o`=&Vn4#f^>9Po zxdHM_HQ=NUOG}$$C@KaiO_I$NOu0xFEYpyB;(z;a7n^BW2(pVtz96Zs8iXqpF z34Y-jxidzHEmBfXfmuxq3pXK(W2nO63w%_fgka<|Rf?fd zx&NfTPpW=Q4mXjpUCeO0Q zdm>QK-5RZ%<=GzO8fg=2EEj@dVI*H2V!+G2lJOmWDN`)x#7d!qBVaAQj;mh}oim-- z8?+IHdA8t|yTqiS?hIL8u>Pn~MkaSM9|N}a7RkUgv_El2VrYZLQ zLH}`dWL6SP_rzb_-cX+?{YJ`;K+04#e63)g>(R3=&(zIIVv@DFCy*$0y~PlSS!K@p~m5kbo!`Iu;s80&Q#u8AV`JlAVo|Ay)?N51G_ zSm*G1!I@;FZM=%uU+y!E2p+L;oU_ku42S+61h!Sd1g$V>41I5$zL+^`Qm`WM7C;l& zvknl+d%gr=cflx|Ep~(RgZhDKMJ>8NfzJvhDJ&>fY#5$ht73p|Z2StCkCegsoFvAk zk4=B1DwezYJKJB@E76s%-L&MW{p-kBblbq4kv?U+Q>~hRJRISpKaU;1+;>cvYq(n2 z)HMHK`cv!glIvb)htG+Ma$0Z))vwn%JXFxL+y&R|s`jwwjDCxB`s#zo=9#OdcDCSj zK|hznoLGq1ipLx;7r)2?WAF_%rHB~}d>Ob?(WaljVqkH$L+VXHUaHYYt&yx+GD>MGMke_l<;qZHfsPy6&`E!8P|A{dTGc6|L3 zjfR^Fpr<@keWpq3d!XRaQBZn?Y(?(K4!3r%8;wJjw>CDAy-I|jRj@POJi<0Qd$S6YurxfjY6Y2?l5dO#GZJ4F%+`W!O8p~0 zt+@;Dt=iJ~{Wlwgeg{eAZ7a{~ToW(L*pGjzZ!9@T=(ww?+>)ViG|sM~Y|oQKPJ9LH za~g{O`U@RjiW#RMCZ5EuLp~sfd)j$;1#6Zh2fbvz9JlEOw|)5B((N{mR?Fqgtu#_)dIw$ z!>%Hlx}i;5YC7PY_C>nLxscb@uy02BL2l%^XBnwaEO)L_=r^htpTBWxZ8d_FrcE`g zUoXIV+FPOnh;;4S{XPWYZ%)JHe1$5KwjZ~xfdAQI@Cv>-az17-8&~5F%(RR1vWfy> zHVr?4uVR;m5iyc(3Wm8-Vbf+R+1LFCRs0hCRs4;(D1RIt#3(3}ZT?&HvXd4XmpRuQ zH*8icDZL`w{Q3CO&QdwoaxxL7d zmCBR(d5{QVc+drX#fK<{u5>*cOpHuJzbL=LzDvxDAO&CO`k0lpon0p^DrTgC7Crf9 zSOYej#Z@Q8S+|MVEEqvv@}QxY*l&ooq-#p+eK+Ywn>KEzNApL@xW58>ufML0v0|m@ zZ8-5+o7)>~J_vJC52r8rO)>qN=O* ze(DNL8!C_I4Zh4yYL6E!J1W2nyXKI*Z(KF(!x!XhrATakej|*48GB;pq-7VZ@guzdjjus zFLiV|!F?u9&*aOk3Qs*|;7wty;M&*@`)S63oYmPt^OQBmsHfT$U*co0U>`9?MEH4NKbj{R3F7~@YoU=JOf!1PG=w#+-F9g;-TkYw6 z^Y#kTy}wx@Oz6^B5cQG%R_7#XDitM3NlhFtpPc*IrtOAOK2Awc4OUmhy_>2g?RnU3 za_>{Hys&CVF#S~U0MFL9mqd{G z76f~(g7sP-{big$x>0||$-H$gaj8t~$X83?YUJ0m?oj>;C-8B2or z^6*(jq=61TRJf=YBUzDO{SeS9p--c5XFc=3_g1vFJz6YN6$9}S%j2@B%eRYJVxpcT z)UI)uUM%dDjERt-ZL>SCeh5|tvea(@|7K%m2;y%d^I@X0Cga3qToY&& zuyWAyX)vQTibn+=IaH`hW{ZVN<+GKf@2%$?|KC}k39$D8F6{z^U)Jus?Emww5P1Aw zC5Rae5I}_KE|Q%S;;n75pLF&|xGjGDR5Ik8EG?CUd?|b9z_5g@1D4*EK`Ibi zyoRHIWH%(|uO{o4Y3u5NFWE>u*GWl@Ypd^5)(3XP%D~uw5psYLcFg1?sUQfs{cfK#YeF^-h0Dd} zU>0Ids_z@$n0ra4b#;o#+T@3#>m^nR1j%}6@b;~P6*>G)`S&A_MmSdxg+OqmZ6cG@ zDsqq8a_-iHh`MmmD67ANTljE63tt=+3jbBx?Mz7Y_mP*{v|-A~v#&Qdk6eX;on%5( zwImc5!Rq5dO!>6MyaZF|D~hHKMYenO6sGw6`UG}1j@x`L)A{4etRy|q*H)9Pa1kNW zrY)lAc}FUuvl#Eg-q^l8IzxB4m~L@sfBlKS=V;TWL2hSx!ZSRL! ziS=_3dj-$lx+8<6yr!As&3n`*D%+H_ME5YOEB^I0{_i~!?A{rh8)<84DkA+ScE*&b zUw5H=+xewo+(iZr;ogPky*MK6H9L~?`~C=F36R_*A&tvr=ljL%S@QELB~ALULpGS7 zrheUH*=PEOo8>*!ew0S9T8i_B>8zyni7Lza)@?Tu$^|t(_q*R9*32S=@&SmtyWr)h zxh{pHs}^lTwAsR>l&mDo^zbE__kg&n?_;9XCqjs=8?_?})^L`#J|tKsrqelIZFn8n zh&i2|)N8pra*z6Tj=SUgPAqxkgQ0oMS@nsFwu#lQDgUSD*t`J`}kPx5_bhwp3N?R=$m4=~dvNzocy6c*r7kC_-RRLH z=YKS(9~k>-edk@_T$SG$7`|!@e?-^#;r_abIl=P2W*NX}aB7kxRo(hl z-xd0;tZWF@xm5N8Yxj&HaD9($jN+ zzcf2I^Sj%bDfA0CVvbr4q!fP{HgDoxGHZc`>pQz<#XTifh$e*P%HdWR;4VgN0e3Oq znW{(@3Hiv>kZl>HOb8{eOt{J+&`64a1^2Capdt(CaEp+IDaQmS9CtYra(adTTx{`5 zPpTLMSEZtXo|K---dXpRyPbZdvZtrs?c~;tNT|?0#upUXY zGQbs={)H*bTm%*xh+e>(k&k}l&3g#sL5=X7O>q(N{GdjDQ_8}F_W}8Uqk6pD(P%zv z&n^mXZ+Uh6T{sYE*BaX9CMoKU&j30j_zSp9GF=nU`<_(J=Sf5L+}*;Ime?~(j%N{{J3qkt_V##5p3Nyghm^_fAbyrm}z*c z@U6cPL*@}=Et{Pc*V0HGQ4A*t-+Z%>fwgJSlJSz;ovUBr$LDV}UU$9L_N5yB>Guid z=}M=X&Cl)VB$dimNS^(%qE%nrOfq-bnQZs0-cb+ZX^*CmRqmE|R`zx$Jh48R0|Yl< z;2-ooWV$AGk0+=!Bm}LpS!pnsvCc-!N_o@JG5>cX!M&Yan!o^u`x$rc`}^S*>erW{ zN#!ZEX3~$jcDYH@(>Jy_z%SuVwcmImrd9-WRZBeeZ)@=_^I}v0#m%LhA6W=u- zEp7E1ULmca}^fuOwBOfksyzUn;gvg zqgr;{(&>>FC496(Nb%oI@^#DpUHR9)_8LcVx8ydACu(SDkO#{gkc%vX0lj*#B{0nI zN~UTa`_UqCwL$Zn?g50V#hm5J*OCTn;OB`AYueTlyYL(Xmn2>W^pg@tFJy5DAVj$= z@O%0nfcB2p`VpESR2U?hPB{yhGJ&dB_T9>zf!Hsltf{_F`y|}zx@2fV9J&msF7DYZ zosE^5-+B`G*=5)Ncsm5N{?9hg>Nmy;`s{yz3a_YvTmtqWa&M#!Ui2mqgGGh4toL&R{KAiB>6(w#ue&-9K{~mRzjr`6fc(6K+e(>2=o zT8tmH+ausHr1}l6aA(p2tGfZ-t3OOK3$iil;x-L1Hx2R`se^q)K6liUy0fvp2`wy9 z9h_^dM%_WM+GCV(52r?`n+8>FG>`lZl}8-hqbF^JFZ9@|`J9)N8UNM}l=T{+H;7&2+iAHOj)O{VLDr<=lAi$=Yovn>#J}E8wXVrD{ z7Zk$WRvy8*hKYsIA=|RELuZ{4sW)G1Rs);M_@-9|nriIW7%%OOs8{;C27NePBIiEj zcwsIxm%|bU1x>HIUKpu_tc1$2hA-LHTNK}$twCiePJjL2^#kDFFN_pgw_Ox>IBJWV zd(Ui(jstd0PaonRc|8Q7G9T%)uu&9mu+QK$X@Dg(0q4ZlPYA5rVhR}@qFjgE(3BtO zu=_!p`t{4Kw-4?*dQKelac~Usx$DAf7GHALT%yz6g?LU0-(!kW&Yi^TM>+H=uoLZ+j=$BVlQuH^OqmBg;ek7 zvf3M;1cw`%JFi;QKmTRSuGk_cD@j;N+GTs;!PTrYBwVIKRU=Ku+nC*r{ms1sYTWhw zSixSJIxv$(JT6}$j9?j@gSB?--U;~`&FDjehjyvU>}X#GvjC0 z9K}b;#M~Ggq2lpHuSbvAw2e@{ zQnWU`d$IZTruLC0V~WkgKQE2~5Gm21jQ-%IJ1lqV{HL5OA7FFtGQg!-mm#a!g90ai zzOzwl04OaxsV5Jw-@*Nt5mp*;tlI+bFZvzq^oYjP=!;=3-j;t$a$AO7R#LqsQzaVH zfnopSs>TjWBlf#)`%~(lVntlz@qc-*`|d!if7I`PRuTN+BF^k8GE-UepH;X13RnNx zkN*EOD+MGRvH98xEJpaEU?y3w$U@x7N;YBNUA(~ODYBx# zvBJkwrrTU^eorNU5TC-&%$&afiRZUP1k^Qa9hNo*N+=3dg}#>~&<^w5ZxmvJqNa37 z`4~uh_?`O1>v7B=Y$17NLB4eqi`K&|r2@6#=78@LPy+m_O>JHB#;Woojl4(EJ^}f! z=!cZw%9pwiiEmVI)sc4gp(=uIslo+|$*fdJWz$ojsQXWA9clh9_i7Wjoi1NkZ8!79 zjHW*4FlPdlX|Fa6PJM%K;16)*RTKzCkOK7@-w`u!hj?s2Hj{h!R z{Kfns_}4_!@k;NJl~ks~KoGD-@?lFciDonexA z>&e1luC76jBm}+-k&m62%)&Plwvt%*jiyHc(s#B6G^C` zVGy5-g16-VoxHt}byxI^v~CMth`OzCw6aWhq_Rx50$2RTFuh!4+VVJr8gCOW3F`RW zKsVAu#-1%S84lW;PI#t%z1U-0gAHdVxk7d`k*!n&t-Qs*3G82JzHfADkh1%!ka9=Vs@GhYyBT=-@XME%O_?mMKY>jL54>JCwTcI>CMRCy zI|7@K!@T@p&EY**gYie@qk1G}sxa(KEwj!SW2NR`jjaxT2+@tWvh|2Gc&lV3M4RD> zR;R?-v{e@iIg!wMu)Dnw^%H^&6!CF;zIQvT5T-7GMg%`bqcyjT%;GCz%ZL~Eh2-e( zh%Cd@XzRV3(_cF4w7PK~y+KK}10vriaKcL%)Ldm_EndE_n-TWy?H9(0%Q_-n{Ot>9C)Waheq-11x# zfD6sA-p{eORI1vv#%u3K*?wQftR$8`tQf~|BubT9JZLFz&U-azQ+iR-@+?O2_IujHJ`P#FIHZdr?I9) zRtul-wR;DVXKNNL7?zf%P}UJ#xN5mRmg>R0WrQ;biLAv^<|hx*f!7~z>H`Jz$2|_R zDSph8&6^D>PAe1|a)k%d%X-$0=#P}}gdRt*4np#hIVhsH1z=fEe6fM? z4s&3uS?J{P#!RoJBcpKDeg%Z2Zk6?NPk?vm9$L`Lpgny-Ldi> zz0aj$r-7B-9c=lOes=6vMJz*}=**FhJiKmhQ~t9%uSVjsX$>#)Q{UWx-}S;gVLhFk z@6|m_S3xyTT_XVD%9UNrAs91PQBUv@cIt!C4}8u+o+!RgHl?=}_|N1)($z3{&^gra z_!GE$)D#TA8wmx?k!vCoFJHthjL%zIyA#>Ox*^jDBw8`4WDR6L=6*C`TwOe7dS& zxtFr$KM?&QOP|~rHcgzboZQ{AQFm6EF)0+=wWugaASi0`FpkRo5jZ|R~b$`5~2tuG9jY_JRRN>DLo5I5rLiABqM zgK)K^+|C*!h8Auc;@#(ED<;y9D%SC&&W;XD%cIK4jRqE?eX5eF7D(6X5cEXu%Y10Ld#}@3dvEpY1!=x&GtoZ!u$WbXNzs<9OV5z4S~U zBel19`Oobs^9==I8Fh^$`ip`?6zMDON9Pai(GB1f3#*F?mJoG{`=9ud6sik=%=C(4 z1oQ6c=8MYcH%%s~B&?%exkac#&jPV0{j}+D?D!%xm`9pAv7NX?>1=;2!BejmPROrS8-o$&Q+lR5U_e-K`+SVSG!ia~ zY9mcGs~I)gt!4IVCFjgl!;AI^Awm~JG&uq(LW?XMLm{<#`CfmtB(}%r(`m~iSZuG| zEzja`?6JvkvUw9k^dJh%MU_}^j!!l^ms8DV3Q~~#)>=-OaEw?W-v<>m=3v+@C~|$D z(DTN!iU+$qMnx)Y!Kn?}p-EezeVC%fI0Z9*vGG02TiNQ$38{6O(--#TwpQx(#f z@@i9IY+|}Uftg)rUS%MV)E(qmxE|HpdZGZphl3{1o{hO-kTCj4(I`2fX!$m5KH0Y*q`18lHG<4_&u#z> za6@!Y3fCiNQ!dP~&%$WJ+4<}9yAj<8kKJzLhy{9fL;_JTPQvz?5ydt+W?oR5(J(GzCNZsM#5SUm znWF?(-61?kM!huk>f^atw8m6)9{ZvU;zJz^4tdVwZkCMCR5MXI`hJ_k-8K%Ls0n^# z#4dKdp&xGkn*YbVa+>g&+0^cJUc%6$yabbT#1q4`SBO)MWMXXXbj1$ZeGXF({XXKc zsG+bF6awvke9CCpl_B3X^MHLS@{vwpl^Je~_Q}3>OBxmDI%r zmkDRhv1U@&f%0#7o78-kZxeGYI_)4R+h{V}*LtvFG|<_MNb*$DUvb zctc&3$M-lsk>mNyJ%&4O!ydv6PQYE@5$ScLYrFQ*gmov*ox*$=`^p&-_whX}LZO?- z_;(Ua%l#gDUDPucv?$bD%qP!Sv{vcJ2oKT@r=^1``E6bwb>YPeqIxIgFhdy0C zL8^ATqZ}q#H^3X@G%!7%<%P%9u}wahX&kasE=f$l{DyL;bXOnA9r_TNJcAScFQOQ9l1-@a=T(lo7vX;a;#cIJr-JWOzio zmJ;ek0tt!=_foq8J}m5J9?!asj2nQpAS+iqj@2eSNpK*01xdDa6`{b!!S6;M)e~6@ zaW%oCOoWMDW5Ke!Z~w7&-ZZH-M@Iu1giTP>V4s3ApOhu29K(5;U5d0%D~?pMyImjJ z*khE7D*xp3`JUJ3`KEV`;Bu)yfW7IZ9?K5iiu?;dwR`O;9dCcZTQ(a>HpQ$yHAPeW z1uG*rT|YfKU~d@czCf=FAkIb@DWVT3#)emDx$gO87*nKI8TkHlr)cKAH>5h#<7qG& zUh!dGZ5Fp@BqKO9Ui&>SU77T5>evmpT9G0@JW_eU>q+rXC5Ln?oET6E%^Q@$@hKS# z%{_{qH+d_3Ybif7kLyeJkRap|Ru?)egP$)I^9QxTcr%^bavYsd=Q2p}tool>~`H9{{si9^b z(8j$YEW$A~LLk>jWAF~G$+3m1&WRF4;9<_plFu-9^`Uh$W5|8sh(r4=|OPy1x8q9RUHj(iME9iv2=-0Aru%YG&T-hb!XT?!kdg4YMDaxXvA#qdbTF)$S7`ic zX4G%612)u|`g-W6^2mBk>GDW_?|CnVoox}x3l|poOe`iQRv`FGrWTEr=gi>fmWAV% zexQ(|^ZmKoyx0e(n=i->6dhn19Ty&C;V!DarJpRfSU<)!V)*O6e;n7;S3_ewjZ?dY z;P8&`K)}aCy@V$!Bl`s^_4;vkERW$ZvF$vj8dgOTg(L6z^P1Op_~(0N-RI1!*kIs; zkwJ9@OSridJ@}jWX#G6$>|CQ$QjPQ^i&gclkcu<4IKU zoybaXNOK!GB$PKA;x@zPubPCUd3+1e`;6E3!`-4XZdpfAeCQF{TP9D`iW>A2Gsv&| znM1qZGa|i}`&v_Jc-{qb6ke_-@@b7*Xo7{&`^LvDR`W22ji~G)-ZA0x;-HpFU%2;R z*NFY``$3zxXO7_dKlpSm92B-DA_(ck4~y!mWj$WUZqBXFb}}#ULX~kY+m2~tHP_i} z$L(XK_*yX5cSYOlF*~Wa-bV!EXjNZE z5FaAW&$||Ke0Zq8CubYFZ1llGOEj_pI~gY}wH}}{p_=C>CnnG7riVC2==V2NbDp<^ znV+lwwkjL)VQ8maTy?KIQL;~3Dg`Jzqq2A*DK>{sXPUj~+V}z)6|ER&b1dddHhDTc zpZ%#I}rIP^%Z_(*VDH# zbgM+qgNlt--jE_nD`$Jd1%~7{?L9mA3!{BwTf3leOWW1|Vde{=BdM#t8vmf_c;HmP z4;=o#f4=5lX!^gS`~SNl<00!de$xnhe3tcSip!r|iX7DAb6G7j3+;;(MrVU3v_yE$ zpf8%P6xtlq78@hPjMYAqrenLinZaGM^`=Bl>2z)#!aDa z4?}XEAk-;!yZM1FSVnb4?byfxuUmZB;cMlBxoYj#CjXpBIRx;mFMJxxx_H{i=c@LX zl?vRrVyrcUX{OApIfmCX(Y(EwBmEu~yTs#iQLT?&Fr}5*8Hg(5HlYuV7-Q)+ICTN85*=v^uf=67Yj|~i0Z6lbz^DIk>6n6!CUvHw zHosJtpFf>utB4!;FftBsk=2P*qGh_*t=^9rvy+4aUWz~JV$;*Ws%SRdyzT7WB>QNc zYsROW0XK`T)}VTQJ4v4#9>(dp%jD4hG>oHryTgs{1?30C{Zo0(aJEAD=Fgj;k?)H11=|B zmHcu3YLq(o3wf6parerOyKb&QoxkY_UWX`?pmtA2H0E<_qdWG$(UEQkga~0c0E%kQ zL{^Eaucrw^yjx9Te$>-kJr7x*?7^G=_SFRCpOl|^O+lXQq&lM6M zKL%TwEnA~+U~=`qss)K+96}AkXH(e#&uZ5{L<{9=fU4Ol^~i_f^FmLCylsv80x)L) zrY3w{1NNt*yJB-QtPrYiTK8@Seo+PiS#LE!%J5jyYV(@SCF!ZHb(;uuds76O*@nm9 zZT}7H=s%Nz2Gu7X53*Q=X5>NxhyzAr=!`rD>W830T`XcxIW!GoAWZ=IbaJ~Dqi2?E zGj7EczsjXr!d+Lm^ZmEWO?aQ8D`>HQf3|C__~rBxtPNJBFz{_q@=%O{v-3^zeY+=n z`O`1`bKucJfMtzYD_%$?nF5&nRbsA@9>a0w$i~vba;@r+GnWTEYJ3IG^%9`E3Ir8k zE_q%+jV1SdoZRjq^}dS=00q-5;qG!jxpKC|2(mY%7{r9Dmg21|xba=soC3GBvOK+A zK1?Gt!;>m9LF=^hQWm!0-=GcMs7LKwLKa6W^K`oMbm6h$FY!t#^qKkEDXod=Kj^th zk$kpqldsax0s;3$-hPsEUra}M2fdyAW;Qc$Z|XTl zr2T;vvg12~&Sn_W1A7?NI~c?rp!SFnLW)mCDY0*`qD+v#bWvPKswJ&kuy6TOXYk%+ zINznw;l0>D2dgzax%&`%Yf#Q0t6iWzQ6NI@xZ7v)n4^^wxsVW$v#tM~x0$ohOqajm zUt*(FZWw>5laZNuXcy?}h3%VKZ)7eg9QBy-Z3#Cu6L5xVG7bJb@+6ZEjlPlfMkCAZ z0G{~3#|8TVLnfDg#q%97s}0R{u(QtBs_y!X3<6}aa0>TyxTMQWi#7`MoUWghG#iuS z_2A`~A51jcoFuaaEu_!wi2lq&n)mYkUuSCN{ANaj*HOzp2s97AD54NR1jqvKbWC*AVY9Psr;^9&?Yy zy@CNpRe|+x1K9a(?=KE3UmG}f_o{)NlT6OKOV@U-BcXQt5wnx8eo}nc?s8|Saa7?O;+5RfEvvfK&%XAeAuVbTxySChIjO1uv}XS4NaLH@ zbwCwPnL4}}_!giRYw*~B=J1tS4=tUQ3 z4P>2PpOr+y-J7N`RGlDSebk3bH)zu}i&Sd0p3WJR8|=6cKCZ-w2+D0*>U~(n3wg^l zI5%9KndNLZTQ|Teju$XFB>&Q3a86kH60Sn`y1b@z880*@Va}k&!^(m{jIz^j$-m`x zy;Rs@TL0MbXn*9UfAQ!7qqJXc8b9=3^5H_B$_8P_%*=PO-G3_mQQlc&z5&e4&#v*mC2Jh>)j3%x5Kb?xo8Zt1 zwAaA5k`4eU|35s~Em*M{$K;r3RpgvRmj26sKmSYJ{yHwY*7g7GH2MD?`xWTr|8*?k zzg6W)MJnTKS+vKs%!UtK9w{6hsvDWn$Q^Z9+=5BsR$K6wjY%Tk47?gCt9(q&nMTBE z(5blk@e;nCpe`x|$$!}s`E8>o=KzonDaRLuqA}wjFE-Wr1&FR!)2~G=E~m<~A-T<; zm7;ii^BNJ(!rHu;=!Ex-GJ?+?ci*HRTmbeW@?)r*Ab++V7KL%5pTRPTaoarMs2yZd`i!Xi=H@Q33iD*%)ycBtx4*RKzU}b=7r{ZRgxZ_SpG+pz}jGnysZa=$l4%QM2dNi2b1y_t>3Zf>2XJGD`ks3wx z%Rf=_PbhX#)M!m*In~hC;?{8ol7O#T|1QKdyKlAcDAdk>H?B4R&#`{8sk3tNTw_oH zW|~#HXBeqQpIP+)HRbaVq8^YF^Rdywapw?cblO7QXI0WNH15MxBZUMp*C0q9L~0gM ziS&mND?QwbLmPy%ZTys*t(Tx(o>;55xY8_aD4O$`{V6;Fm>%a^ZDoT>&u+dXM9L%t z*vXxkUSG(SfMNF@C~jY%e`)t#eR@^T+rqB-dWhv)rheR)Mq+w~ykEPy&~j;nHkPo@ zQd3tpUw^aOM~K=Bq&%f>J)?m#|9g4Mc_alMuHpwOZieSf{qBWeu3t&83f(fuG&;aS z-gGSynhOO%<9()ANEp`4Z}raXk{0}7RV7f0ulxLF9LlxJ6tUooT;YVT{^3iL6E+b0 zV>cVow1!pSo)hpfo)+nS>xD<*ji3Sf4qz3p4>ytI zzYR6{>Kp*64ppZr+C7Q#;4-}X^;LQJrG+3cd?EUAA!4EKqQju))8I1V2gATs!;WxU z(j%>kdS&PM)tZqocfV-&R9L=pGLdm#=tqsSeA!?UI?@8Q)D>27%v9UC=;OkQk40WR z0#yPE#@-$d3zw*~Uo8~aAx_`uj~h={kHb=HAI+P;CNwr6A_T_-jA$)VkqKqa!mCyf z?_a~wY9?&Pp6>M@gKh7+rqVw2(=40Y@FC_hNiYW6Nzr=DUyPz=WyZap?xI=RUMf5d zEJTn6lQ)GYGn4l)r(W7obb46DurP3vyP--7 zPSiM+@wTYjO0;APxyM8e5l!ji@${wK0*g>dj@^3I zw-Q4tK+Sgcjr+`-rmPfaMjq_deQ|GkzCXiT8M(Q32Je5>%ew#em*+2fSOI?miknXR zut3mY$2k@}Kf>&f#_H?Wur5!kS+##xF zuRa`f9^A}P$CgjVgc>du?M6g)$B2gFYk#jQtoJJ-H+p{F<%ygT*SpJ(i#lK3CDBh zWADPUMMZloaOE^7ZDa9x`I_jNID8y@)Qndp8pJ(wF4F2*v7(mY(&4Sa)5l6kRo08~ zM04XhuvB{XTA^{}%WFwhLwtq!7n7LVl*FfLYHzJ{oBGv-Cz}R?tm1E9(LMlc%?S>z zE82q}#fpG)zexYZP1&ym0LGIKt07GB-l~al>7Dy9VXlbi+Vl+Wap6;gP;v`-g|?3S z!RG}H$)B4Ueo6K8t6n@S1gVYW0ub7B=acW9x9GWZ^PJ|_JjBLLUr z8PgQ%>`<&@%wmTXl;NLLb9Bu{YMI(ToUE>5J-&Za;SF#nr;!}mva-9wpNG;gyC-N2 z&)}z+RMx$so;tvIwPWxYDs{Ei%ObrhJxXcLe^UR6mx(dWMJl}z5N_{i%KxG6y`!4U zy0}q699~6X2Bj!%EGW_yr58uWMpcRd0*QctNH3uV!i)oqRF$eg5EYObI)Olfw1|O3 zK?ouA2oXXHAp{74`=C?a?_0O5_1(MHz4u>up7WgSv(Mh=?ETxn4H%pOO8jdb39qUB zcZ1$NiGCstUQTC6^oKta@tzaxn{B@s{a#5ex<(`=V3gA3I4sx`YuReqesLNNm~U?x zYp$0K*1$`{a36^FC--6Yn_;a0Fi4YinNA_@z$8-hROojC$BFjc<3S1rH(qUP+W@I; zymp>@=fjaHHaHcr9ztr;HY9D(O|t5LB4*9Dx?jE(-n+^Q-_@}rN;DeDvW&^qyZWRz zc)!>BzH`Bp0Hi*S<%&l7eUUUL) zMY~t(wICy}Yss}bm3T%ILkq<)T(BvI4X1zLY+0J)u#Yc$w!X1x*< z-J;_Wp^;g=EB&G2!m#wj&T`LUh`BPKyEJX#)&0-2a3EnGd(!7> zpHygTYAwraE9%u4zHcWHl{(AQ!`^V8Zc;BV9vfQR%1PYh5&q6hhxR!QX7!F6Y7@^y%9;kVLa&0 z_5ra*{=|oDIN7HZ%LuiJD)3EZUy^e<)De%|IEhxcTa!4v{b;yS`)1bj=qobSJoN@s z?r)0Rml;lf{1Gq+I_fOdJo{++9{0Bz%F^O7s@2()#?2~9qFgymJBLTMw35w=9!Fc! zNJpPVNv8&BI$ge1dt~hW=H2BSj$Bt_)=$=q@eyS`Dzvr7tyd>Lf%Z(~rFQBE*I}eF zHzgp5dHFnM<4@8Notz?FRN7+Y`T!+3wTAp|ZG+`%RG=eB+p1yd7=^Cm3^}bL3r49N zlq;|dKBVjj``3(?mCe?>K2%Cj5V0!)kxn>FH3-`6c0IP-?qymWow*fitFIOqNu(uD zaU7#tiZU-$r{)9}<{Ke7u?w6#tY%6hj~Qx>PE*t|q%4;=s{@*%Gf~6jXi}dnQg1Bd zClb3zIh(7C3u3fGbUTbW3z~`{=|`>OgsGgNC^{m*uq(>3QY&0;!otwifX&d=fy@OQ zp(55D@5&C%CP&$YMtWa2liB?unNIU2f7-FQ+32+#X*LP~!}sby1!9tCr)AOT^3P#2 zy=tW?Jw9QiTJJgV;SuMZvkwr<6ep3UUBOGKIMVFHgEgC z`3@@gN_Vxbz6H2tVxssY2`z-1f3Y3x`({wecMtg^1n((-FNJi7x-7Z(#`lo;#0n6; ziNXJm#gkiz-qV?(fTnK(54JJ)K)-(#-~!tMC=&h_tp+MP_NqnnLYwv6mXINqrH_FM zZ=x)YQx&liGMu#A?iv}k>`h&UNjUWyiY&WvIe`W`t&uZ~$*sQvw?KH@mN_W?pzKwt zVkhJ`(Ulhpd^&1-;OBjN<(+87H~s70PFrIJQC7TMi->{rm?QF&HGfBaO#s4xxv^?d z^%Fp4JE9RPJ!=Z6yKfLlf1&7i7dW#P!cySo!O|^vy@lahzP@O z>-t};%-G17GGNSAESHXcS)%9`o3vG54Pu8~K%&RhEuHw?5BNqelvStrB3cb*&P1ll z2<{=b_ll6yV{&R9*nVB$g2RlPK*x-kWu3+sY}2o>$qCep4;Au4QY#20V={lfbC+QX zcX>-=JT+rMckGT(ohphIH>UHRbe!p0@3XVqc3_7fQZr&s&p6u7%U_#{Xu`M#-8?9X zACaCYlJv=XH~3dQEl~E{x>p^cj9axTSN&}j)s)HV>VJz^@(pcN=1t4^{nDIr`)=XD zAJg8geFYnbLpSRQC4{>5%}R)+)sPS8mt54xlnT}BjNkpT&rq-cSH+wi!^a!n1^eqK z?M1V5Tpoab$aEXUo;oiM*E4@=GyW-Leb-1?)>Npn;weU;j9*Df33PN(t$!L6)sg21 zJE-Yu5D+fq8E%&l>lh?BPK+?axQ0A9sO_+lLA?z>prh04_;;QFpg#BruMdSjy=3(f zR%_hUiE}NJ!V>yH^2Nler~ceZlGyvH56K zrg(t)LA!-VVWH!>>@x(gk>e71wDO8KIgN-oFMm&O$kX^_*!ZUQU#fQl!mrtN*QdM% zFq!y~txqkT&7sQ+%mV$9^vF<-#GN_aQrto9yVr+k`C$G^ISh3SBY_8GF}E|;D?yey z!WvJ69v~)uoU*{exg)MsDl2ivuVVvqmx`?dJkEi>;qv$OKFx|5E3zS&f$h;5~?o)NGoRtUw}!fdfVMwW9Voj0+SaomfVLm zFG?niE^%Cx+3WRPw20$u&198EMREL6y0R>7^{;&jWR)@s(v=2|>1mj>WxTp%nl(^3 zV-FBa$zGeQe?h<0L{l|8iobvp7!`A$8(uFjZd4i7B;^y8iE-`f<7|-FA7yK9K2aV} zOcXm{F3WymuIYKHv{y|ZRWvB)&9Nkn0O!Br{Bxo|q6ha38bHpXIWy+==6@*g|33*l z?}h#Tt|};M!z8t^h6C zZ98S}coQp(-3zJ41EdMWfnk{#V2CQ^Z&UogQxXV_^1t$W)jm?b(X!$8O2^WdFK;3l z6^+6cM!Sy$MVcklAf2{*qu$sfpIE9T88R#^Eislxyt>G(HBZj!4B^oLX?KH3TiW4q z$AF6T>3>4&r`OAHTV-W`^DZpx3his#C5`jCKLn0*oN*RVN%J&Cg@l>_>VHCh8O^$$ z*3hHJC+bECu*&d!#t<<7tZk92?P+T(e)I90U$xv9*PgWu2@T$S`ny@oRiA@T=R;QZ~9NVM7W2#bDmGIdKVU!7La2UlHkVg`j}c4 z!rcQGx-Pv>8v!^YS2ieyp|{WVH?3;`GY@X#I|0NF;MKb4C#D*gK`~sb)J9n&Kmh*V z|N1REd)_+rTf+9+5a0Fcu>8-t7ruLi>wW;~;ZX8?ck<3?3+p<(=Ur<6-5tj8h1X3k zRosX8*}6gkFR#we4z9fJMjTG-BaO`uouN_gRTKU03XZ9W4@fo{sQvLRk1FYk7HA1C zjyP=?;MASz;*9=8xDc|94}8d~eJr}-@ZHT^a0l@Zg$fm21E9;~_e{CIl0FgufAK2# zmcQs8t`&g4ZVqBSM34xFWQM3;2sL3HEt1J9LoN-vhK|5m!wffd{h@ax2=(e}UF_Dri|ZBCE?SS* zbTG|Jm-T$vmGH|dyGHr<$Zq>YE+~xWl1oXn0LV4~5lXs}M62i)nA=OrLT&f6Z-1^Z z$-W;!@!CpwV`gmzXb1UO;dY^~#$lU`2ZSYGpCkY2ejh{iuY<2QL zO04ac9$(fjRGBzJzR&6}Cj~?Qr25&8vsGN1lpzaxi(x_xM3Y|^tjP&LkDOM8jzSDr z5vAV~VUis{)%UM6J*FAuEyoo?ALiAZRdOlahB4_U%cd**vmp6D(NYgsvmRKLA30_n zuqoQbjC)mK*U)W+s*}}|zvtv<-wn-^I8lhDhJpgWNg_qgoOE&Jx{1GWQn$afi~e$rim zmA0z2-N*duiB9lBwxkJGTWxI7TD7m4CD~0r;n=MR#qIAYcYMI5;;mkV_pZqY^o%Chr~!H~TMd74uBCfM)*)r!doHXy z`;CAZ;l)PtQl7hk$&9UX%rxn_)%njVq%9~oS$21FEG&v9smy1}ax%(IDMO6N6tc5{ z8g0!FvyG@HW-~Ofp?+PGDI@A+zQw4Y`1JOo4ZkqSx>7}e7NKwc*RKF*bZu|Jl$1iZ z60)zI{CwW4=sX|mmG}LU+JNmS#u;2~rJb4B&@W}$X$N*c;nbFHIoczcWj8vL<0BM@KzPPjw62v{dIV`lVudO4viF*T7IZ6^VbI-o3z24 ztrdTtCI{CB7TJ90be<;37ifbst|o4d+!jbVj?gf3(03zMQ!EARZ558IJi4PDjwpQdLGcFneU+?O6YoTnP%rpn;d*2co zjg`F_0kP8>VC>3^vMF(z2n(b7HtX>~3JDKG+kv{oV7$M!MyveK1Lwu8)nloRejq>W zru*G-^QRFl?2WynG^V6Hop086U+-V^Zti~-+iCno`uqI*<)E$i+lgb}z1jbFUr&&q9I!O{2M~A4BRBoO zkdSe=#7wUMGT3*|@c-Ru{$GCmJpd3L2M>b%2E$QX7I0Bu&M{ua0{68h!e2+s(B$5Z z?~ZAeN@?}OL)kkb@Ro>~Be0)=huTVR^VhVZu(zWoqpG(P!=dcoB(Nu-dq=6Z%aW>m z6KLzPq#0tL-k?+f+Ss!Q0l3docSJO_+d{_CK^p1yjiqzlvSSs#<~4?>?zHmau8U?D z$A9Nk7G;RVOgI^=eKa04ra1k!jCoPancllg?$fT>5nWlTxc2lYw;t0d?35(0nHl3} z6Y2};v)tVWwiEZP*7q`fckAp=%0n|}+{UU++Lmpg+YgkteD4~u2+)!xY+&Qo2e6+l zYBT~Gw)1*WB1&U#J3@svKR@C30s|-P~hx0GU2+_T+-&yZy|MimYZS+ z%iRd%@<+kg5%y>M$q>i=j8Nl)*%b_=(o+B2-&g>$pMxMH>Q&D2&Q9uGIqtCQpb``? zAl1vHd^tzXo&cmB{SMkGWf)S(F_BBJ7{?qF`_GR$i9@o)TnK{3_F`S4>N}%`j!67a zpiaC{RsDql1(Bm!7j_&SEerADBE={f1-{74*0n8f>JNoHXM6tW@@7^Ss1&;M0aPks zcmi?mo-=08^7z|4lAm-SkwFZPtwVKdOU?axA+i0+N(B*z%IobK*ctW#=*n?7g%cXd ztE-*;YCDb&maVLz^MYK{wkdLBYAAHVgGT-h$HkZ7IC*M!4SkTMjONS{TKvpvlKMC#HTYN!XY|_gFMPxf~1>CoGa{RD?{?SN;7@4ccJ?r=b zUf19EgZyNimG>P;z2*8gv6(329UG`*aayS}Q$#i44R-UrY1>8+cV%VubHae1G7{Xk z3y25Azg{uXzr3cD5fg=4KCIC!(6Tx{ShZ|wij6Ow;4<@3knowr!8|atvV-H4%xcyC zLHMQW<9VScVHYl3n-}`&+I#k9w-)vSrK>Q>GU6lzIvEs^%h9%7H%A{%flW$hn6{Ow zU{_Zk*oVO6mNV}!s^2QHQEZ%6?;|m$z3t6>K>T;hru_|&?%BxS{VJYABz?orIc3Ku z4`f#fc;oX7kr}V|%TKzj9HDyTh*qr+N|cHOC$w3OgQ6y5QQe@xpV>|>uv^E}elB_s z(DX@!{u%&}Z$YOs15QT2`0t4TCPT=a^7)qK^9JP?Lp`RoN96CV4nLF*J=F1QS-4q3 zk2-RpvXw7Dr)Jalh=r@;!R!=Q=4yY$!(h5nW^D&Bg+B`xYkdydafwocN^-kb*tb2L zR9GJc4I!l?&KKU=?6TY9SrJJeu)!dV=sm@)f5dgZkI&%H5;Pr`NALNb^EhjWp}a&iqin7_3V z@ar0rr|u(#Tb*Ol7kG_ zw$~B?kwyvePscR+F5DhTP4i|a+LM>YM^^15H+Z$yglLJSKN@rlLwYVz;ev$|_!b(r zI<0H1akSV3M-M-zx1BQWv`~`-&Zc6IBT&KT1a+|@?gI^esknkXb*^jN;|;wI(~gW3 zW_B5SYx-lvvQ+46M2;AdcLQ#jozo=4XmbMy{0{eSojSwy8Z}*nE~TWBdWIL9mG{Y2 zK;}2?*GZS~SEkfPP{|y^jr|By2BP;dNiDHad&yl!j6Bi5ik`4(KhlCYw&qj2suSnb zw`eD*3S5=k?=?uAlrpqS!T1|OX$=h1!Pg+h*C~%B`P8v8KwO4rx%XeV-rF!9wcxUf zMC!=p%a6Vu>z0wjc)akzCeQ5rlo%U(gx-E@vBpv+Xs4)(aM9P{`65(Dk5dE_n(ptX2l8uN2b_au& zTAA`FjSL8*oF9*Xi1r z6ZE_lX8=t*7po@;gD*VwY}nMy3_UDn+V*Nz`1SoL+*5tM5R57({>!FbEKmIqccwzG zP}DzcM|{AC^K_8aL;lSaZ_I688`bkqD)+YQPF}tYenG|R*qsm)nmj_q%ARUDN9XcZ zw1pcGjoh)ZRc^S!MB`GoE9_;PAA6Bx8|iBRIhgHJ8)hapZd}vTO;fe-n%u;OCoYS0 zEb9=$y-5a%bg1%TqB9SIhmFYUtXB&=#yypvwe->Y@73HF>n@s2Z9ay_)}Z@9lxwT=E|(zhyUFGc zK8HljeJWiWghCG@H35-#$W7OX{N86MY4jk(P~S~XS!m!-+WCwaHnugw+%RuOy(f5D zyKFm5K}N&+#9y)wx!d)=8@g^@gqPHduS5E3s*BLeL26{PkR9*-t>?Yt? zl^tH3?0@xhPS)eh0Lvh%7S|*vc0sx>oa#YKEd2aufVB56M8$IM#2X|kLbe^NQ)*|z zS*%avIn?DTIpK-QZ-V@hZnRJMJmjW?nx?5lxhqi3gIuHsNWE?-6J1ew zJ}W7?q5dqYZEo{N2_t1Z53}KX$*j?iUsy(KhS$Ps)`k*Ju8PbY{aaM)cdy-hh9(?q zv>&$Ua@M8Rw-{xTU|wCki|PDbo_L{;&I%H=7V%mh~&mUtx zM{X`iXT^FZWydc?C|aHaXLWIk=DzLP4uH2;$>_!JZ^Fp7gX8wFKd*Y}mW3;)8<0Fr{vfWAqQ&JQDc5+CN47zSJfvja?uCk;BOnGf~d@<6C9Q7Ozj z+1DMkGgAt>Ied=BuNivc$pIC={J%91~Ud&^& z22J`S{1B_(AU{>-dWd~DZ%;&G1C($#=g|hJFFrWm!skLt4`;cQ3-=hFfve!P=s=y( zco&%?6Iy|#V^|Y;xGL``MlCDV(ST7Kyx0&hw&d#zoJ5YtnYLN!)S(%rICaG+pCIP& zd|BqE7YOC~;l&ywd(O-Cajj>InpEUF-P`7Lf#3*h$>ce)lx+u?h z#eFfjuk4j#URH?x4|LS)+hHoQ!UL(NA1p)6;t8|WGQI{#Z{41;gjT99INzx-%J*}~ zl8T@yF5P2}&*UDd>V1o4|709l&IO}}_`j@szL_t|_mp5%UF zu`1Cs!|;eLSBytJ8{P$C;(eqw8qUmNjElmwJj<5%M?0XCa&Txl zO_8|ivw0Bx=YB@YxQ_D`ZEjzqwBA+bkk*H1FGVZRGzm2Uzs~4OUkDV z){ywkZSDnoW=w!Em?@Ky(MRgh&O})X<$Y1gS@gdZ@HwS4ve6NYtf0GwVTYPKGCm-+ z%`!4>zeYm)yp&%~>nf(3+Utlxt-%tBWdZS=Ac|9`s##S36?AI%Djl zDtW8g8=N}cPzXB;wH_ySxuK@Lz_E+LS7#%Bx(NRXEM?E1saiRZINpB1zePbMnfp;9 z8`#W7hXd2if)1}Os4dDw=HaLH!LMWW^Q)=Iq(kit5izNe%)DN|#~x`ylTfy0I3 zoaO>0_4j0I{c^|FxhG+0>t2>!SLwWQH{Nuam>iYU>1B$9~zcwN5ogm z-<8IyFI@F7j9)LAmG<{y1ulAhGZa8$irbya8OzNMbEEcy(5tXR&)diB3RnG|WZ8Yj zyK4@GO!pZFuAS2lZUc5Fq78{RBJmJq6{#+Eu2QB)*QRf=wQ2z7P{&#yDf{;e;Xa;D zdni9E8 z=v$U(RpeBz(@jh7g%GD`c4(B=OBBClzGupBNRb;tvAj!EH6gC!_T+KS;$T=BIaUPT zMJu8|T8X&3D)NpX(&F4QmHoVbnC410tL$Q&R8(5zA0JjRLd(=Ns2dl z=8fwmWx39(L5sQ`g&)jLGSUmF37^xu-r(460GQw2Ax{^l;0jqv)uJi=U6>)|Qp*0N zi2&&`@)tZ*`Q<9?X|7-`FG58XZ1361W>DQXn_3RxU7RT{=OxGtmnZj+zo3(8U(f%N zGc}EVxC!sxJfX-(^|=rowfOLxxFby4S}xh^+qGcI2G3iXKzWYBgXf{EbLk(Re<>?s zh7QKA^?~(LHsDPwo^pQOIcmS|vbts<2w0Fqx3>^cQvP!I>&rOGktQRdKfp* z2%OyAp#^oHed#S{7-Q>&oHcKnaO!JxU(qnGHXxlyt$t$C$-8g{+}mX;Y{M^J1kJSw zQSOF8?S{N{I>KnIu1(cNJujx?a9;eBXw}#fystT1#TP0K-i_(xGb1F=wLnW ztz6K*T4>`g_ThP5%$&?})wqk#(;a5T2P|6k1cmj8p@36TucWt>mv+Id6iTL>7cj5Y zY$eYUEz2~Z1_a6FA!P~g$I}gm2_qU6g;gY5us8jk6{;#)kWSkg!$x5uSbbWxiSg(6 za%#JUQlU=`D~zGvBL@cGBL~-D7c%Otq}!`2DSP+Dkx~I=37d)w*KDP4IA>ew44f}J zgt9-}ukuJYZs{z;3}s_d#A=z_oZY2vDu~~hi%4LUw~W^^JM+DqTaQ$x-YpPN9(yiH z4{B*K+7wZ@JT@pqC_V|dI4AAr$ zHDa}@f;B*`4rJQaw3h=)fm>{z=BT{(N#IP8(xAvEnE2#sc-9e|0_d6ZAve>K+{d)X zMp>pM^)qA62C8 zpz~Nbz=B`K8IM%6Se;hjQ_})TGf5T z8@f?HkQ^Ec!&56^dtgK}e-zrgW83-7i`7YHd@a0?4)a_Eui3zghgY zlg35EXf+W4+9UV~NGFgPi;WY=h0wnD8*gw~#XC`ZiC{XASn!`N+WPldt-mr5O#t%e z+eOXBQvbplhA#_YP``#hC5|)lWjf}-v)PPz*7UC9?k@@3%sv{D3#B+Ut}V65p3Z`$mH#-lsr+EQ01k4D-canTO}##P@!m=_Nb<$`6J8d2WfX=DOyii~UFZB_`WHsvDE!Lv~L1 zSih7fJQI7c=$bcmHQ>3qQU3Davhjk{4c<+<7sf}YN%a8hnR*Iso=#PR$fuWnm%iwJ zfPmDyJ{G#_?R0Oj%ewLH38vVvVkWf2E|5LU^s4K^9Im~J3eIxoaJU(>2pH!cE6CGf z%(?cFMWukmnMV&j{t`O(cRL`KNhlqQ#+A%&>1%Z=eDt`*jl zzvPr*`@9G&qoTu$nOS*PtF+-CHFgVOcab;trlV>LSpBUCuQBN0fq|{K#_g2a4GdHF z0C|%9@W%L5mRRa(vBU=LKC5@bGDS9`-R#@jyl7`EhIW2JXPELsENl#0xyBW$4c|-n zO}entW5SO&Y#&+ybYG%F4)=a()XU`Upp&miCc+8Li|~T#T(j*CV{$(5B!mhng~y%Zz9j~3r8x4-egHx@i8!tgFH&kx z*gs!>1hCoSRC%gx9b?Yll2e;G0Q`ARir?6(fw=$wM-qyEXX?5{SAd=<;(xO&Jk_u; z`L{Xo#f~=#-_xY(-!TLK|4ExV|FG8rW8M_HWd-A|FU|u$GV}Bs2w4rc9SAfUTkh`L zTd;EgaLr>0u-ZV$Zy6(UR`sIK`WcB~d*|WA538Fs| z?V<$lIqmEI-6SQa`L6~s#Q@;RqkQL(KkzT*!Y}A1#O}^?**oA3e*j9dhYvEPE47jH zBcwi4_w>gCDEA=R@dOoJPRf(hBEZ0(+Dd?U_i<}}q{X+z$*ma|T}jr{DwEP$w(;vc zr-_baxWnkl8((2zd-$B|FxDmaAB0_i7*yd6;341g)vu5*cadZva{>;W8rX&zyR*HpSFU+VmHs`vf0EE9{f2L^hFG zwF`L_07o{d!ur97eDkqe1_(-cP=If0YU9kXaO~%v7La#zzFmvNQccq7``mWyfeFc0 z?l0D>vzECpXF~K6?GNmWIr>WA4-L&qffkSfYh^H=djmSJztjJE)3qkj{SJSo$=f3+ zs%N;xY^w{4+X*zK8e9n~E`orlO8}?1|5SHY%wl}nY|4|3!I~Mt!c}rYKMFS^xBUWz z9P`9S)^61zUTzlzUO;{sxE0#Myv*zvTZ7*EodJ9hUJ|i(eTsog#P9(T{10(iPBox| zlEg9!EAf{&;%if8?y$~8vO?IjP6*r1Ir?sU7&RbxRz5sxv-OpKbP5!Fg!K`7V{9== z4XPH9cNk|G+(qu@q_Km>rhPB?H7;EWH5q?Dso1= zU|fTJiue7w2o-PY5r$eM7QLI%EdjyDoZi(S#uXQQ(j zkQKU|%{1tFoYCkz=_EzIWdmyi$E|r3O2G0(o@v_xJWE0;hxEG7tDo6jb8aX1e1@Vc z@%5PV-7b4=2@$oR?2uYGV{VpaCuY5Wpl66JynK`}cg&>mx5WV>^<$V9Wji@K-zQqt zd%!#Q&eY`+bPFLr&1bL$>(rpV9g)3$*_j$gR+BTq|I~QLS>{bDM+MN3C%}vkcR6mW z{}lh2q}42El_{}3CSn?k*9|pFH!SaF`tAT~V{tG{mr^gFoT*T9f&R&2uK%@%z7li0 z6|Qb1;n7^^R$cXYfLN4)9AJqCpGooDp=iE&(J7C}StjL;qtzO=OL1|`kD7%xmd~}T6zY9tCB~Q1A0XqGaLs{a|voXS;>5W$xaGZhMP~b}wf#e;|ipdM;no~wvbPx7=lxR!y-u(xF!>k0? z1RX@f>%dk%;j(>1vV1J-K`A(-LRKa~c2U?`*=stiCh)u(U+tYget(PZb#Ae4u?!}g z?yiun`Bi_gtIWEOdrx*cm7?}ldD+DwAm8gK=M#2XU5(F_;ddUIX)$f)F#s5#IOzg` zBss;`SP?h_bFhZlIj7mc1D3|u=HOS6N7C}#jF^&!AI%P7kI+9|=vd3s0!Pt?wQ1o=Zi9~C zP8RI5R>~1nBB8d0Te$|gur{v#O5qUeY3q%_ex}8m;U^V7){Kwr;<2o*aHaR%wlC=D z9n+5BHC(Z3C$n%mh)KVzDYB@Eu~qQLu+mh5ZbxHV^13TM0C3G*mHgy%!OCyySog2{ z2`+Fpql49_-7g|Qn0qszhC>>Z^sER<o~T`x;&L`@NvcjXPwSZ#kx6^1X5VwoO7K+?t1fwW|hG7kIKTHQpSXKzNheV8tC;`UrWALPYvML|r(zSaz3ygO) zpb!;4F9v_1c{EYVFf}uN?wAT?Q&-Eew2n?Y6YET!!K4vQH67t7h1`5x3|yc?12O$IbE0!VGQ%>fvP^hfUbKt9Fgxs9k$k&GjCHNbv8YA_mTEeZxGuD>}( zzzN(XY$}bBts$-o!@eJ$%6?E7Qmtcx(Q^ z2Z^Y2e&bJpj+j8BF%L7q038SO17B~00h!$6m?&<@9%8{gHeFhat@*Zb&(-HD0wCS$ zENFC7#9}?U#tQKET+T8G)v{_bs=w#hFYY<^J&?uxCOw~Ia$d(52{f9UZ{>_9<^UJR zeHL+mj~@ka(WP``q;G)M3)ByCYV77pa=6nzEC2@&sNM7W0C|4<;m@H0L(n6Y2sJ0* zNbqH)gbd?}-3#3ZOweEW@1xrHi_8Bqa7_!lJ);Ktn^Nu6#R-Lf+2!12|LtG%zW2X~ z@t%kO%T;$uBlW*9XS4tEbp6?@|1XEv)91y-0^70kN0)JT#?S#7B8cdfO%7sO;t(l* zyZu}#hfHf`?#v&>-428NP38Bia3)f8g)pcFpXL!nSGwcNNO*dq3cEq(-$%}x`T^ZV zmV9mGcHo>Q+g~pG3zV`lyP|Q=~Hvjr4GfNB>%U{(~dZrhmffaB((ikv$A>qnD=V9GP^7l&82?_5) zvfn859>TVV)i|4UR76`ut2x6LSaM55OQyxOe;z0F`5(*{d&s1#!@=+CDYXJg(EUqi z#beF8caT^Ac}l1!4zQw|AO#k%Cct%rc&PcTAke)MCspN#UI-OT_^0dCJpgm&d4V$} zLdTuc{YT8$kuXaLi_*Q}PVf$T+_Mf0P{<#q} zO#){NJp}yq?Q&Q`^Va5u1l&}9GRyV1F!m^&(9w0u-)Ub%PhuNf@}Hka=tcj#D8CXl z|64h3{MYRQXmIimCENd_8c6RxovLs3_-`q`hyUNy=>KWbZm5_0>8~dFh zRM5mY_ORMVsCkAOVA6)QS0r-U!V>JoUYT6c>F~DYk6SmQ&VfjXvaKyL^(0DoQmyV> z`r0lvpFz%)mCDB5*JZNvMAdVk@&(`JbyKTaz|1I%-ZfTgW@;1^f6>RO6J|s!w$Dg> zbZsTfN3Pc}UG84?(y?3ru*moiT9GBegoH=%=#tWmx@k@YH*^Q7_W zBqg|TD&_VcGC(^a6xehtejIsPf8vA!pJ}LgWmoil+@78sGi}K3SrU*|-8M-TqpRgu z=x?48`3$%axmP;8sm;UW_2{#YP&?pN&bsp)1Hs7kv4B==b60;Bk)4|0`@#(33ySGGS78qSYXXmE!>wkwz zS*7%VxyZ=7&nn!OH_f}9sK<)*(x;DHi6xf!TfFB!ZD*K}c|8|VMfQ@r$BwJ=QIC7N zhv#p%Rw>0y}-9?=3 zb2UzJDU1SooV9kP5TM_dHJrNsNFV+2_BvYA)+ypIr!G1V(VMOAR1MOR{o$;afd0YG zP0-29gheb!l~&^wW46m?qrGxggSi^P`bS3ngJHgsj+x~G-j`UiH^?WnNHh&ce$Ajy zo`Hg(C0HSNIGBE6;`p`MC*wyUb5LvIrB*^%@39?Q_ozV2@h3I?-rmGQ0qGoqF1>O$ z;3ZaYEie;op=FF`e+&ZCZv*>>d$;AmQf_{G{XJf}>z!X4dgqP9LVT&~Tkh1U;=VWZ z$ftLDIGb=IX+_#9hiPL7pSWal{Dm)K)k<~O@$>PbAeQ5*-Bgfmv9j5$fkjZxrcBP& zgW8`XG=BiCz|KrK51pgJJsi(qo-7#VLy|%?Z`V4TrWVfm>hI3iSQ>7;zfqbBUq~C2 zR(Fjg53pIG`8!&*p66b zhEJxE7CSJL?3cFCr#P`bHU+Tu9s%k4A)(C&mbR*d2n{>GR*%FF;azH@1v$0#B^iqLBx7ui>N@>H4m?PR}mZM@5FvX4zDK_#EU>I+5v0EIVa=zX=s?l&e^)#D^P%hzUpeC!ZV4 z=ohRTjX2TcT6WZRcPq$cR8?-PAoVU{MQs~2h&PJFY#Cef*z+9ttS{S7e+O|F$Ezln zEk`Vn#dj+ZJE8eu^}rK5^<`5#jINc`?Mb=b?#uX2EzS~aGdka?_|o;U1Sf?G&E!Ty zpZnY^JB9Q%vN36u-6ph=}_kbI1*|E9W8iWYg^{nwZa+AU$Mo;tc?&Nki15vPfxN zJbeR;B^5l?qA{=7Zw!-_SGMJTGLMdRzDwU8XF07FoY70^K)W8y9$7)&ag;k17;~&L zRJJFTwi5*2g;_@ntBR2ImfFKx)hKn-mrc`Pg2SOs&6=~h6fWfFQ|HpI9vm*xIe6(@ z%78C)AdSAYOY2ca#&A`A2b_lpxsYrz*+jqp%-w2U%RW5&D0Qc2{-`C-n_XQTjor$U zi>zp74wE%!L-ltY*u}^#zfw#1x*D`~$MQZc7hI#ov1kXGnfh&0T$#hS;(HPwZ+F-l zBKuu81si_CPqiH|3%L{W=P^|9)lb&hjf1X0kriFby9^mHgQ6OBiM)CamvX0`drk_@ zB}^S6fZz+;&ldAzVRa@YS8g`C=?|sUiM-!_wwwhdUFZzp^?Gw>^n&q2XI;h_n&mom z5S!Z)a@o(A8yb;Yhnr|TenXGA;QOV$I^AdpTja0mMZW+ZXGhE_Mf!Q;+7xds>68kJMUB7Xh>@lE=_k#Yip{e7#I9LP0n&NwtvO75OFdIZ@wFl z?U<_^FP%*;v2Heg9V~d0q(39{JXs5;06yX z7U6vQp;S<$0gEV+*^QI zdpc0U8=NYSEFWZ!Hn78Of3;AI6;(&RKV%|dNPZF4ZjxEBMi>#Stf@&04!oc{Tm9P| zkVQfc>z&+A#~>6wPnm}zwwFC-#x*zdQW2XE^+_t-62%v?(#J>1lv(53wG$$c$#gu} z=&mB?x`C#D)qT8kbCLl{D)P>yTm9h=NP<9xg}Bb+ccSWMr!UL|ij)0vyu+s()UxhT zR=v^L=A>ee40D35Zc0D7b4E2o@W!y<{pjPmm9)#I(T<$t*XpBNZ;<958RO0)%tdSd zv!T=QR$l&Ay-{f>d@SXtrbN)y&<;5H9 zta%_&vO8FX8jprpAK@h?7+Ys2(KrjM3eiK)=tf zVA=R6)|d`4em0V`)@Q804#d);p4MTrKahSZOssmcU&UjhM&+4`B{s^0sv}iNH)b|@ z3>@&UKuP<+8aPGl;FnQX+_T50D}r}=QW?6NO$F+sZNW9+kGbB?2okZRu#+4+ks=80IEWajIq}+$hLuIUzBur8A#!?c*$d zm3bI|PhE6p<*HJnB}`k-_mWq1Wfiv%p_In%gua>S9rAne6HrF@A0@H;MgO@x%4UT2 z7$>9PScCmDHuXvkB+VxRRW)9-82M&T9$(-S6r;q{tkkaU(c6-hb*b*>^H?A7H$x0; zP4s_w=H?(L5heGQ3v@Xi-Nzx>c=@AJSvA~IZ}=V5EW3WfQ0jjl`7H+5CtJ1O+W~Ngjf!u zfFROKf{M~1^qvG22uO+4P!jxZ?g_~IEy4Rxd*#YoO6GsCEM@0JrG7SigWS!>xvQ^hqas8HqO#ScxHo9Bjs z64@pSz@YMegW2%T3R6CXpcet0X8tie!q=S^%U{ce_QB)HXN)=r4a8U^SAKlX5vw=; z1n`x07JmyuPcmtq6&c(ri}+9yF?nq47;a;p`^nKzP7O3o8arp(@Hl2wVS>k(4}ZnU zvA{h`4sGR485U6r?dXPrr}Rj|^-$2~%NP!`P@Yr1Ik9J0@V0OlU}=|I91uA@JB`gT zo8>k2ON?-znCUVNvCZYd+9oT-(v&{k@=CJ|_+nEjhE(hn{+i~O@?H%J-_q`w)u66- zwk!;5I62*a0tt9(1THG2F^A6@fWDlYrCYAI%gW39tjXtOgmu z>*jg3Y4H~;#PFNtk|aT^R9xcVxndU`SC=B*mYN}|cKT|32k#$&G8WohgNRmm7ui39 zR|f+Oj)6nAj;q7^mF3Zr@Dea+e=Fmqk+aSoG&Gv55c7If0?S$MgEP>ailRt-%NoH>#=dG;UsA`&Yr0J5zwSe)TiSVAF|(HQ=M%f1*fj zqO`jxw7K#eY`m$yMwq3wF5(9NcYw zB%3!+vL&#}_YlOE_7j|OWZmJ2oUp@tt=j!jJo!@*)Eim3U!UXJd5QeO`}lX~MUN|G zu$Y6x%1eE33m}t4_sKa{y`X}l62IkW`^n652mjaj ztsHts(Z3LU+%5`bN}Rshl&N-d7dX<3g^ z{2C(vpRB~iAASFIu~LhDhm2iz%%bjkE2sd+_G&oskPqMLP8bvkVL(DxLRcU3hv56&Eg4GJxg|j`zI#oFs`(5^XqYMNcJAd{(1&B4`FKZ9>1J*Bk5kC z#O8E%SPci(#t;6aV$w`qO>Z2GN6Y;FhGfZEu`DnsCbxP{KLw)N0`vIIh zAi|qv%5S#d-DN3ZI46ZBjh`s=EGOj!1wM{H;)1DC!uvpLlk&w8^G|3+DCUz!hxA&L z2r87HN+&rzWj>5Y9Lr4k9!zLgxCoG)EVgyu&}j>5F;OZP#zV}X072CtjJIRbc_aVT;}^|`+X0w zB$&hk>Z>l#+d}1YhNnq(hD$91>#dmht=qP1$tz%a!61ESHcx&(miuv#F@5$&NKsV_ z(9SvDr+ARdR%;%nBtnoVFk<kHT^$l?e7*c>vm=m7MI3wjT$$1kM56 z@5tl7mowZbx3ER=tVp(o%bzO;zp5eqnj+8ju!e4dL{q779!6f$l16Jp~ZKN~f9~a6+wLR!eVpK>BSf6|w?t zphg);L3>-h!PgzA-l$H#7ZU9im@oT&JzcSev>ccpJQ4O^tlE_AmPswpo(Xgg+*@si zCS3TO6!?V^m9dI>oOOLKlEMY5C?_2e4_=d}ShUOnClgW6yfoFQ;WIwjbAgW+ay}iW zU5mU}f)B-#;aRg%1vK_G|7N4vI@4++Rk8xK(3j3rIFgrQa7jtgMu&!q=`6ZngG0$QR6Et4*v^Q^fy?T0<8R3 zP#P>ase0q4dTVtk+0*XS zV6@&^SazTbG2?IJeUBcYJwuX$m1zdzx>0AD=*zjI=ElwG?*CTdUMVZXMMmWWdue%(1^TME91{?vNjmi^^*fKJN8GV!`7Y21U>o&ihFcFxvu-cassqewGA)OmX{Zp4HoF`|9 zEBCi~dI29%MvEC^+`KSf<$K{mToxdK0(4Kfujue9{Zihu&-iY)&!(or#xUWc z8~uh`{eyM{&fxqqryPobD~2Pez772~;^Ml2>jvaEA$rVUkXs8$>d;rVJOj{m_KZWS zQ0QvgC6(-Uw29qtGil~@-?e#gjG&9X2l^u8K!WMH5ooq^Q!0|mMnYI$yEqXU0<3&dHn$%5 z>G58l$kq2fB%WXZbmOnMt&e7pvR^|}1VDvlE9nY)>NJSJyIdTV4KE1N3D=JEe{|?* zO&CNf!Ro^Z`d7nib=$VdnF@0O*s7<=0V))|eu*-q#u!jA&o{3!hudZNX~gwp0?7`O zW&z9g`is0$!pg+`s1Ce-+wj8C#+im13ok)-xKM|k$=u<;>F`e}_gEJ{F*(iz@8D%i zfm0sti>JH^q>`yU;WhU7@q7Y<_snK&t|_%iDY=wdLAufnO=N{%Uv;>p)y1)MD5lVM zWd~GvNk0-#=qEW~zT?+WCQ+tu%9WnH`}-S-(}W_mBxT?Qi}^{lpTyFCaJ1Sddwyz3 z{i~#_D7EeX=4f&c>!GedqO6C3CAc7&>V@LJ8K6Q}M3{|A9igCfFm*r(fh?BGG$O-u@gFxZ%uP%y;di$4-GLEU z=Av+IDz*nB+6x!%QcgB0sh}czS1K(4Slwlv(Yr1H{MFw|j( z2T9tvZljTF>^^=NIK?atQKkG3yLkDtKWtErZ}zWh+ZbQ10+}24H%9c;N1R?gv7LdK zISDz~^d!t1@X`e_EP|(RtP5 zJ0E8w%) z0(ICYU`D5&^?J-Oh}a3p`fFxpw+^){7ih+?JTz@sqpNDweI~GOKHPLf`$*v4?5%&7%lsd($yoh-K-V<)Y_5}3 zbbA5xgP4Psa7vab^6yjHhXekn5?4se8vD*5f$F`hhICiAWj%d`UDvHV*MRS#UL~@E zVoehZ;+6MD9totUuNc{O!!0hD8(3wtZ*%_g3Vf{kGDJn;hHs$|ecb`(WCb$!34p%L zZRa42%uz1wH)7HQ+Y9C@R)U9@KLbt);AjFvOIz8b!=WLqE;D3vHA@cLfX;gdqQ zB`?VhXusk7-^{uBpBeuDO0%e6gbz&rp&^&Ex9EnBARA@7wMZg3Y{ijqmJ^}#-uqL- z>KQXwAYoY*DI52Mg-A0kcLCA}?@iaGNG$0H2!))r30M*Hgw(I8X<-KEHft%)#i`}R z?-$$*?SQ#H)s?;x;pr3B7mBacts%(MkfMk=`KN@O4|?M&L#sDez;qTTo*-){ zZ0C6Ai16li$X1@ilRqHfudpVBu*Uuk3-Lv5E3x>`XIPb?PWz$B#d3^TqVLd2;bTm98BR>3qm`qt!!_Abk=+hHoo7jn?m}2VC&lySoOffa;aX>?e$qX{#sVF8LQW|P z$m$dVsuYnqp`Agqz4%0;?Ad*FFVBhf3!=lRe2F_7_4wUBwfOlm1Gcb60=TzA#A*EE zV0i7Q{@|~K=SjyRCCYFyWy#4W%mOM>_B#d0SS1UY;+r}nn>Z4fdfgsXZhzaP8M0WM zxahraY<>aazj%+aw;x_?6Xb3if2 zqD@_6hEjD7yA|U=D!}cI&mq@U0QO4<(iGJCCdB><}n06(P8lT9%(9)vDD60 z6AHlzYQJL^@*BMEj(w8M9a5S8KX1Pb45Z4jD6GpwW_^)s8q*C(JXgwhL%JD=(|f->*Q#tv)8M_$)n#4gjcFH=xo*S#J| zVyT>Ecev60(rWUDDxY05Z7X8d$6BwJYtHXGS^oKh;J3E4#=5p|+Dw_SKaO-gC`Gnd zsUGwbwfE&Snt{%eQyhn5U~&Ks&`3>;{Yq=Ly#CXz{Q$aWODk2j@AujjXKj0{@c` zTkg_!{q-Wo_k%41j;L|K3hxMTHWA%05q!yZ|LNTuTBDr6kp+t=VOn$mahyhIX2oEb zT=w6r+7O5zBk;F9;uHvC*Afoe_5N{@?l)57v-JkWTcFpT!^B^1C?NN0Go%6FXG^_L zZub@}9TGHg`qd18{(l+}l5wQT72G&$h0M6QKY9RYTQ%YsKJSmue0sTI#2qKpH)2qU z!XMnmwIji%>ndRHp&*R%H?u19KeOe2&CwO0!f7dt;b3n|cAHtCRbM2p{->Y&b~PSa z{PUXpPX~TkNf%r{wLm;V`y4hOWF4tjcxKxUSVH3G(dXuWkWMNAWU1{{`~$dr{WQls z{8l+8{B3FKhA>o^d(Iq8Xw3TX~c!{cr3-ugTm+VynsF0nY` zH%-SA9(A+RH%ZoiY1$hQq%Us8{xRM%%`s9Z$M*6&|6$I79asnjo2?d*ZkK3g=(=8& zr``5#XMvDE$DEQQ=Sgk-UZlqmjlKP#o1@MMRe#t>$IaSVZM`!s$m7nRDe_Nnmz7*1 z)Iy$LU0d#Y)#CSp6Et-UaFzQN1Ytmo-V6Q4%aK7LGacVE8si&z|C{&9K+b7}RvD!nV3MaFHRD$<3j~ zYL$ge2i#McfuB#!O^+wxY3JVs22+0lXjELwxScD7`%dKcOv$OSkEp#kiN1NL@=a#B}VVW(E6!h>T=&_;enCJvP<_Rk-Z}!#taTAbN&eF7aHvEzIR`4A& zbT%3pa*o6dBd$$0Y2Q5B{k^K^y>9B^zX3WMPlq{v|OkrBb6Ee!e z$M6Com(Zf(8F{s=KYMZf_q4;T`-eW{( zrcrbIj2)cjJ+ZslX>2W^bjurOB*`4M<7KSgJRQc@9EiKpW|;;%kQ6TSGn&Q3E_;36 zqHr1vTy32-w#Ps~{4cX)$*x;~|I40++yQrZFUKsrQJZQl&MJBbos+fzSkSsRN8kUY zojsX2!ip$Dvp6o6wGX=EG_+FnaY}=iD@kI1%@pZ67s`$F&SD;nTXj8#^;VKHnIGYl zoJug3QAAe#rBP~iTCU@b`JlXk^BiAM^CBxtC~G0?*`a(#(!Z!rhPT&`g=W8CbT>skubq} z{kQ$m2WjSk(s-Soh+lj>7R7NrAA_QesG)hHXEiGJx^`cV^r-HQ0 z_1gL`Y4-6c%iLF@b&Tf@)(0N*^)!b}o8M*WWj8{1cyw(W2tTs~yLCB_&Ha2(v%&@_whpg1XhXfz8;ai9HTmp`l zA=RQ5ND~-4K?tC5_@6ln)zL5FHUl3q)?2Oxb;i)qu`z-zbrey8ufagJK`+FOxB@it1wOkQZ<0Z99);3rPPCK`*+F6^{ zV*raU2gMv)4?FJv+!ow1rg5d(a{Mauc}QsK;7|b#ZIij6-!!{gMOp>RxOdBIb+@Lw zrK|<`LG2D&Htq>DE2MEltAIv2wqi3{(FY}@gD1i}f02#$GAj|23iReZQca=LgvOTPP$#S_wuXWZ_aV;q^BdCUU zM!}HA>|VFI{M4-pT2FD>y^;LU_Suxo+z(y5HA;D~T|Ymp?)GO+ru4Hl*Ehp04ZJru ze_zZptYzwZ4CF4Lc@Z#BJepLGDR3I8#AB>^%$5(=6-PZ zU>z(+5emkOQoT21owBuD*iPrdkGZPY?a)I-x3G{Ksiv~zW5X)r+pL}yqWbPA9 zrnrZ%Y$E3o^8+%avObx=tDNuwUhJvaW^mbIHQYbJTZ1UnTorMSdGA^FS-K2Wo+L*c zudM%=@A((|w)H?TQ|0L0vypu9%OkW4Xw1p(P(jJ~OQ#I>A75giUKK~|1_}>y`*)gQ z&S-DfiiZ5DprJS$qA_{%H}oaqnWMjp-L8;PG$jqxrF$iY6kH9;+t7lvM2zUDA5^Ne zHEmv0qs$-Vc-V!RvA^7A=5K1Af0~c>DYKa!4Pa_Xp2l4=(I-3-wMV!dsU+1?z=qf` zd?C4#kL#j`X(RdJl>`;QDqznq|5Q`F0C8XFETON*Mod0M#wTIK!Zt+%@I#kghet+q zUv-+KuYM^Ff+UbMf+(E*OBmNwPoBAMUo7&k^@~*y#>v!2u1_Oefzd=7Nfd1TOyfm#a-m~#%;yR4?PXO38|H_&JBx_D zZX|8j)BQalCdETT@zh*DrZl(jF=kz`|J?L>@cC*26C>m+f%-rheDL94A zx#)bwt|i^Eu|u}XehN0;7o*$ZeN`DY;i34c`SgkI2e+P8Lq2XbWbP(_!ho&)N}Dn9 z&NoP%z+QC+TbuOd}Ra14E1a7Y|C#zy;$h)iE8D`CX3T) zq{eoS;r*0h_LVs}@or2DsHEh@R#?Q&B2rF6NJ?9%PJPbI`zC2b9`iA`Ixjl#(b`Oq zGelv5In-lXu+Wpg@*F%NzKp3n{bi4qcb0f~d=j&7Gpsbs8piVTU(o*;VL)!-#s#kU zs35U-SN3GvG3|2}Sy}WI1F(wcyAf_odb#0Xh9bt!zAq0Ke_^yfrmdcsmcJZ&w|#RL zIec}?wt&6c1K5c!wSeIMMZ=COaQUR!-A^=12C#!0TaF#j}@ltFcjN-Gy9Cetb zlX-t-ZhdvazAkfb)b{1a?>*DzPngE^rRgfi?$&Y<(OCDP-SmtYUBNX{Mkm4=7war% zy1G=M9wEVet??UYGc1$Vbt<(pYuzNv)Y%`P;L(w}JsaNOab?SIY8p|qR+&R93Nv6( zJBv%9{g=D>n{o(MzyM&31Tn=CmiSZ_?^^3Prb?|zvfFb=qP18qq*f)J%i;mGV|l}N z6ber9CH|Csd=uoZ%A+z!kl$!hzS=<*oEW0588(a4po3;D;`@QUFX{@e&+0OdnsUo!87 zOZ}XRr;gRH!Uss3Hdf3+7q&bW%4Qld$8SKI=sJVC_JHo8V=cK7iWu*^|SriLc0 z4fM)zT1u)~CH6M|=mHK8z3@^kWTtUW?#b=aLE7;6iIl3+gRWbBcAwR}wC~g01PZPw zHORs*^+e0N&&M1QwzZ`+=N#I>2IBPL+cXzQdOxTjZ>j!h6BXLsi$7772P1xztN?pm z)9=MeSapM1S9EhPAWcTIMob4kr+M0XbZLffeUerDBzq>=6g4n0em&>#p+6%N@@LIX zA4n{y=$}P8@*z99kxzt>2w3fd5l6y*SEraJa&8t zqEOis=%=1gS{*ws^PYM?DCbav4oM!-gUtxDW7Q&RS5Y<_-HI=GzG)6%l(01o#$;Jx z@I1I`aWrieqfMuu!hLwcvQ79sI_$R=L?>Q!!m?GhYcrJCTO8D{yen8Gu3TRl_IUMB zEACb;**$KyXyRxUVYIim`Z+n}E_6mJ?UG0$$GrZ1c+g*b)kyrXJG;^u9yeEXP!i!M zUjLRcw}3CB&JK_)TRksP=2^Ak(Ae7zMogP8Yp3dO`kIJL99HK1{6#fBDjyAY8%nN! zg$?b-zXtR}SzC#ek%P1Gv|z@)RJv8$_af!vgpGwIvnk?t6YKC8hw1v#4)G*MF#1d% zy804PL}dCjSWi)+IVyL9Tm!7aZ7JzIBVw(R;Ndkx;JFI>ivSLJC|cLP?0t$G`A74w zr@4^|z+DKXFM?FUZePymT9+2iPU$>RqufB*+WCfojc31DG)@(`)c(o*DC*0#{78N& zDKC%8Rj*pOSVk*8pXqXM1M#t0BvT)>AA10DvPaBdG=epo9ScKrkjc@*4@4#3|$l zy0QFgN#rN;x|V46MSeW8m(g|t0C0Q$yn*qIxMavLWu2w8oFz@2OdKukoh|Kb0VWoX zb~dIsSnM3kZ2Zg|Y#iKFOjH~k0^IBZY#caPQtB$491=XX>^#iuoIF&_RIlyq%&kqS zB>w)*X2tm$0H6ZMN{VT~^!HlL-H0^n>dM-WGw=`*PJM=FhpXzo9!nz1Zq4cHf(W_@ zMQ8N++4rbeR4=Kaq|`Z%2`VE%G(y=6uT9~Zk{VZ885x`0#Qe+g;f7>xdOJg} z(dFO5xp~#dWyHc?pr7h^LM5sE=`4rR^f5j3-wPl2a>b%XPFajGT zoRH#zbw$}4`bGijgRr=!z1dIA;aebw6NlsSgE?!X*iN1o!K#xoIvbcNI}6hKImnuMjcQlW zD7~vFtO&9gWv(!BIFEN)t-0UL(41DsJTPvGB^l!ET!T9JJEmT6?K5wz13sVhEeh6K zE9HDK(-q>bjS=Re!z$_xG}cg>sm6evkP5YrAM7|Rb8Z_b^Yr^PKvcN=nq*QK;;p*3 zPDe!xk?#2MlrQo7!_wmE-vRpN0JD4h5BQBJ0AXTDd_`F4)hi@y-$77ST(}W~F&^d< zbXKkBd^E1Av>!tUyYreQS+nOwjFt3EMy~y~LaJs=hKLs?lh~}RQA#F*e9}>b<`< z;_nt%LLH9l+=ic$NGsaVUmRs&qE$i$_Hm;?QvFZ1{j&Ywn^Q9S8TD)wgo^ySbh@$s zJihb8Rp!HWrU=s-}D4( zj=$44V@K)FI8Aj?EC(GR)P(x2tW4MjtUtwgCV1(heNI}^tZgi6(@}6L1`lKbD zA}zldR3`Co+y0=lMDlQM@bIc@nUCax!$VC)_n8iWFcAg6bo!heB)tm=t2)~7_Sc3u zca8~PoP6q71)W4D&5KZD8?sd~dK70tuGMfYk8i&g5ZAr|^~NY@e#5Z%fEE_|KpgSM zfdG+L5tLcqfj8f`+e_1oTXS%Lu3BLRzTJjRfnu! z4&T6MCp?s1Nx#qlW%6~tC-M|3Z>xH{8fMnAW`>=_*di{wJoLt@uA4UNlzW)i9=NNl z`))}ww)NkI>dTlo;FlNFH3&1&h0ToVNsO!K4ZAgFUE!M$>U}yROiV;3Bm0t)l6Qmz z)W~#F6(si9OpFyvlvu#H^CdaY)`1s39nFXbZnxUno^HDi>Ur9?`Pu#s}aq`gy zR&BU}Xgv-|<;SMi%-KuW8PUM*pq+IO==2nYAs%+vZ-w_5TUm5l%#?&A0#PuWbY}uH zVb=9zjbe@H{J*Y;Ayt)hY!g~z`aK~3v0wkWmV1ol?6NP^ z)vGVYvgp1wSAWdxemPTpiJt`#FrRo2P;j9s=*feZ=N82jsolH(CvAFttjkJNW*%91 z#G6rUu42P%W17_v90rs?X1jG6F$Wg~vE!<$EA|*RG^yI!nn;W=2Tz%KC-%h!hWMSq zKTDPrux4TyYJ#7O#E!azx?||$Fzo>yYSny?ocuo?-}VPmE@prAp-Lf9AWZJ>J^v>9 zI-7Z(o&9}97=5V*!?g6{B~_SaaoGYP(od!mOi4*eHFR`RkBr|IYm`JH5#y2^Xoq;^`E(M zpdsy9`_^%Fbn^NXvEAVhI@#7&SJBn`k9EqxgzA<~Y6P#Ci+;qV;G1vAEm}`5r={2{ zA|Y3|@d)FMrsi-;Xome>u&Ro#@PGa#{7%J-tFj3BK;aC>RXZ!IFxSJSXFw@(cnjIv z|5>_sSq=Qtjc<`~M%+}OR-7Tzc;vP>TZQ@3qsyK5>tDC{1M&oWc)v%tKKrl1xL?_E z%<#O@#6U;@wg)41(p%_v;uqo+rn7gEnPCz3*$WBpO^je4&2n8?Ku@LpB3iHLRr;9s90t^(jcT*2LL;Frsk&**NT4WVC37oExj*jV;@JB`WdZV=@3OeGp*uZ@nJ zn$z@Fo3O*$PX*-((fc+COkN&H3@F-(g@=+&l<2(lzBD%cYe#G?2>#(D<>le{;pJiZ zQ#zJBHmCBosJ;suHogskCT4TzO;i5;@3jda%#0U%wvNLx{_pvtXA? z-c7Xq!@xdC8BPw-geRk9*D6odxFS;Vdc})U`wrWijTR&mY;EDG5WRf^>#*c{-fin5z1bOY zAl&4}iW>3gh$xrsYvVR;hpzqpQmZGilEihRWwYD>#zt#mQYP6Ubv$OS|3c;88HUoZ ze!_pblw8>C#OZ8q<~R*y&)((dl4b{P858#4^@h^{lt>7@8#It52~Umgl}^-Ac}hxp zZgQi0O0)Moun*s>cTgT<3}dlX-c90*)8ph*w}XX8A1fVy^uV{J+dbS6s!kT%4EWS$Uc>J(mk*j2({!3v&2>w zTO=>4#pRWQQ2}WQlPAtjYs88GNTIofG!BQ#jAb_$UDQ- znXTgIla#8e`kc z4g+VwLW^5PSAhk!j~|zzJ@MDbnmzNM_1qzczY5$PQ`?eH3RJ(bw0Pr|`sU1iDi5Xp}0nGM3!ddXEOVbqKRv zTIYl7`^Zd+)5!n6I1$sv_x;lSJTvu^sQ8N)OsOM$g&>PFv1!%yw8Kzvcjmd8$9c8; zQWz#e!TpGLMA7jV(VxtYQf=}?*lz6(+z#%)mYQBxyth%D($_g25M$r5j0o=M_VqG? zY!Mi;?+`_Rqz2M4;rg1z8oP`nzY|`xl)m%4Dax(LY`VoLwzL0)9{kz@_E9Wib$1hT zV#o&)Qc~d9`qlpV65@w5)?djZB-t$?!PWDWf?~6Q7Y(p_{G{WXpPSSBq+oOmi>&s{ z8*LCMkc*G&dj~?yq{vprz*+sI@lnJ2RksAWxgY%UTs0GO8*IPSjs6tvZ7aw8H|h7g zYwa6z-dC|kR``Ahn_A|ldhpH(}aC#tqY^5VSY zSUEp;q|now8r)g)YWC!#K+K35o}PX*F#yOzsT0dW;La{;=C3haJ_)=k%bcyrMPij@dFOE!iBQDlj{x05Ew8fFjgQe_wr)n-? zekERv+v38q_>_{;Ef34$Kl`zFoI#yvP<|N*f#J+}ikeI`4||lY2AE%4pJYac8D+t|XJo?7tJx z#kY5#A4A6iMMW@Fh#?z}A5RW-v$o>YDQ1#*nF(Ja-eCy{G1m~1> zG3qCANm)_ex3zGrFk~(81DSx;erNBX7;7~g1Q=t3-g1I;o=7OGJ5^Vh`B%R6uOtJ1 z-uHVAh($a)gN9L8w6^~E^l7yxJHi)t3E#^ds-yc|sC;!BdsA$XKZfL^j^HefC0so5!+bDVPx&C!z5*ijF>o)mx+Sf1iN zut*ZXk_J+!3)QTsX2c3B5Oj-Kj%}S<{MEVg^Lfnd?5CQ~Aw(zV8YFj-r|6iG_PPcJ z=0jWY>RkW`8ID&@3&p44tZ(Du`Hi+>$ddk8t?q=MjN~{kf=16@wFl0X`k7e5Sg+Tm zq)GR04P}OtWs%qmq#NO&i{hlaxI8}{&W~hZ*e$+VlcTLJLY7YxMChUsvd*h)Un|;w z3jhfP1?M4gDQICkyB~@ZfJFs;B?-}JeUPNDGb16rt}uegOPnms!)E{jy=kABYBVVY z==PyRy^~-qdmImE9M;QsE2SG=R(#7lDOM%rxUxh39KRfUhWw1bt~W*6Z3L0n69TLW z>8w$pb0$D}(YC~pAn6{s)A^ft4X1sq_{0RdKXxZQrTxZ6XZ%?k6lTKFmS0;I%kV*G ztE<-IzXs354t8)9t12WjK?m9yshm;$=*aOSkWhsoZ?o(i?C1XO zq)z6yF~bzh!i+YKJ*IoA0^ZQplX~;!ElRjw|5I#t76`h&v??mDHbMVS|H+e;8Tr?S zk1ZRvKPkLZh1BZHdO0TVmM|3G><~5ii2cRhcT99A;U0blVK(W)8j}lRi63kShA$sH zo8BU;Sc=BCSYh|xdQ;Q>4uMBSz)#}(e0W~~%13k_i=%!$QA(t6^QNr*tKI{Ooqe*H zS9WZvS_$=?5UFjCgU{uN3!cf=`Kfi6eRTJ(Qp_Z5iIQWBU?GpAtLw#K>CY^iF|?|N zP=zb113R=o<0XuYeQ`a8WZV_hRAyCFh$3Kb!S#o=v6uz!o)pl%}d+wp|~qEx^`^3P)j=9*e?=V-E+Lp+p^V@u0$Aj5F^=)AxYQ z6||~Mo|oB2oPN=Nubbnqq8hkwn{bmwCJa!Np&1^?i-#VpKjq904&qYjV+fx6AdoDD ztY=dEa(I)`sxuIq?}L0=@Na{qi(BoIQapl*{_s;NmibwHJOYvuAar6u!Q5DNaD-7K zx!t2wrR1+`%wcFI^7gJnll6qnCWJ**(Nv|9JPiCu8Q)%J$cfqZq ztF57H?cPqAj|v>TCZKI za`I?+lN1Og9yyo(Da;jae~ayemqQNvMv;^Efuxh?gP^NQA%M!)HTwhkuF&&#Lw|eU z>?4)M_n+;W$Lh2>zl}~AOdu`{Rf0)st8>G%tJMEEEHhij+Tk}&?551a0kiX231?%g z6k8>w@uT&cf3O8f(wP@jxjd`;+6^|{>p)3PSNy&_JAv0+m8ASDJ;;BI$vd!YkIm@S z?13GDADyR=r>BI;^84md&I^k^9bxkJ<0`BihD zuD2I32b!%yGoi&$Y{eg`kXNBi&fmA5MA%G|?8%r6Ve$oI)K>V){4>&Hh9N#F_?s3J zBM0=wv1%tSe!+@=9rn6WJ2{D$+w}7N#f41Wt)Q~PyH&fxw3#xdZ?~_yJ^6%90H2pb zV60Dn48jhQE#Z1;aYB1nQmmP>)vV47zrX($naplY?o}s64m95%X7*eW;O)4#VR;(P zFnjq6CcgiBlxI=4;x}BzH(-*pX%NXKs;fWY)Ekvvdqb$z^4jfSDSsXu;Z%P(wzuC* zhD{i)JejBS`IqGl6@hJT80<4&Yz;p<81x*E zO*@^u6pAEfAem@+vz3>(`&wcl zfMbeu&Db73J`@8i&q?g{7CU2Jlr~Gtu1dct)=(~b&RQV3y0KsVJgl<`yRiu zHrkw(3s)xVZ#7&OLd}H}exDPQd#+WSu^VkK-#+L*{nkpVB}nI=|iyg62RtbR5`#32DN&c;CS)qF|l! zVFImO?Y^;AO~rZHpk#xQUf_-Hpa0BAqx3?5GH&TKF!G}lF50fL(aj}K9lT5qGICtC zJqqeqEkRbU7Wr9QZS5Mvnrdrn(SLZCN*)>{J;|I52hBb8UlaesRS4H0q2=IKzSiqi z_S7^X|NJIq!F!8hC)aZz+Y;Sc*r4k zOx;H(-8rT1C4jvB_P_R+8XJS2pP&2h>=Z@4(b18w<>uDtE-5dM!bBkXp;zE8@y}eu zF(f=H#z~U=8-XoXbS4oA85dT=Wd>P2mHu6;3r$RUGB@m&EIN1OE7~f>6nQwnFy-bI z;xEv3tUfvx82FUtYXg1~-!8vTKsa(~qyC*b8bAw)-fuLtwZ({tHZ*+h1&}S3_;US5 zaU{i2Fq{}!zH-Ho+3p%yZh)}gAaDEj1)h9W^<`I@h)9MKYecI1bvD;?vOf93mOFt& z;6{sCkFNnMf`i&SuQiTKlR*?uhqB$re{Gj^s<(!JC-8zxymhSYaZtI$XIF6HZUQoV zq-+RP2&H}s)NG2cbo&{L&w;%hTkz@7uO-(SHjw^1JRv7G?(JKgQ1KE(Mv=y5t=HNG zg@q2WBuoThztYgvkPHe6(oj*MVqjv*$yqaIXtej2V@*)~^$J}kxW7~r_yK*Pi@*=0 zrH^L+d>`Llzw;V@U7HW9JI1dFPqo2z2o^L9E8csq$0Wti`bqBkFkH7l{>$$-vYHdl zfZa~4Y3kLKTovI8N8xT4LS`*xC-Nw#ZGw7F()w+wa?OAtNyqe{N`1lSk-hWw^m3@W z@eE32ScEewRer_D`la|^OFz=mN&El8Gap|RRIVc6-wi(&&o!ZDCA7NnL()}iqg)v&A!(Vay? zCQ43W1Sl(_oeA-;mE6&0azRrus04(c$lStC=A_r`y~D7I@u3-+qvtD4K_B6FUZ7nx z@Iesxs5eb{ELdiev06u8Qwd@TB6*((7%ZVx^Yu|t*pvRr{rFAE`S`!f1)pwOlQ5Qb zpx($7l{f#UJXsv!EGL{H-XBGg|KfGjrzi?RX?j{UdS>{`bb)j!{zmg{UH!HWY@tX$ z65uQJ%r#?>C>o$i2z}HE0oek$kRuk{1xAlgu$j)Tjvz4f+#^slSs)R}+(8uxdOnmS zm0YN#ChZ}RU(KPEVI1?r=##LrI~p;BS;jr1@o3pUWQ4-0ZD9UX<>nhA*CCMas3n20 z`}7_3x(MMO{L=}4MsOjXYkL$gthSRtkXl_v zqxh#jBbwCZeg3<)FL}F9@cSxJm5s%g_|YpBhGc}5UgJ^bEnnP=iykh@dtU54-oM{A zzcF35t9e+V7I56-%P%m;WP8f`LLv)5fJ*f}pVQotF4g~lOJZ~|mKJSmf*&`Fh4aaZ zNj3(Bn4fY6urxp%6m2xdD5c34_-3h5cSz)iWxC8N2SpC(_Hy#~J;v5bcDFOv25Nrh z_q?y5@o-B-rE^&uw%+7-H=`j{`|i*TdSwc~w=M2G6iv&oGL8W^Ss_g* zCmhP-#p?KhOP1>WX`BlpjXzH<=P^61SH?g~Tynw=X=;$Z=y!agOl$4YCygfbagKL< z=`yA&2p*xq?e6YWCmKzm7KDmfd&_lQdEJQGh!;>>y-)~VOsInK-k7da3KUVEsEV{; zDBur)OpV08e{kTDUeOi}v9g|#NV;IGRN;j3*to>4<+8Hp)~#K8fu5k-Sk(T!7h?A;$=%JT!pkCb*|EA@;=*pBKskps4Y!W4b@HypTJ^mV2dni~BF)s|6TJ z2#QDXn!h5ys|NItZst%+4(pj{Ct^~3zqz&vI7-SVU)Tv`heW7r`e|(T)gnGpG?l7k-he7&pja`OpvivqimKI$c46I_wNKwK+ zT7Xs+g`jK1mcmb2IYoZ)+spm@!}ec_f^9cn+Gf8fWcvQ*XH2fMz7DAKxhAriuZnfO z?XXxeeeef4Ls9XT?ap>9+9yO{FMa3aJ$>G1-5v8}stPICeTwYKyB3VC-nWk}9kyqu&nsSkiLD$%;*1bJNTW_ws|4Z3?jdDn456b{n;JD zF4Td-FqG<;7DdS`XJjbs`rU&bkCMj-ZHhg@5BNmy0&prGEEREhMoS;mA6laEcLnzU ztbkls4|>Hs|AQBcX}Vl)T=(rZLU?)n;F-ZV$zbMWVWyWjrSBd4?vtDKN#$+M;J$Tc z04FE{g%!nbjQ8w(#$XcJG`5&2Pp>iQcb#JytB$93!UjE)Fh3zV>-|}=Rca#`8FKOg z{`ig<&;z)B0a|Bmf0iZjdc4+#3Oz#zcBf>TCwJ|0eXKKAyN`Wy7mK%j@3x%nw&b3; zbi4B6hRdDNX89b)yB$G$BSjUq3TCVG743f7&A7|!{6?n%1?*9Y-Z9@Ca{939d6SV% zY*Yf(X<+dEK zD0tY`-%oksf}W|oTFkX1N9R8LcJ5{xckcZB@(e!OKH=ZpzXeO#P7q1{tVF98HRkW_ zx!t@tzZI@5ns>S65vcEZPULaDp}DnO(Jp4!eo5_pa!qnJ9i`WIitdLJhd1MTW zMH@lR#hSB3EK=Wt1{^8mcrt#m*4c9FOZab%lH!XN;EArddfYO5z$0h2mLGoeww^HT zF5g}5+D(wzwJO@>?u)F{!7m=pI04OxxQVxnaj_3ohDjY!&vf6BKaRwH8ZoRRerCTC=CA6CVpNa@n;(m=tp*jDy z=1G_1U2GEdsZXu*y+-q98M|cnUUw%%X3E!KKT0-0n_a8^;dnEOzujr1d!WAW{xX=q zf@8f!yrS)pc%>Ovi3q$L`xwusPD7xUS{r z+HM7ddzZIXj5re>n>>pqzl-$wy-GHBy@5D8_OzSat!R^E6}n^+KK)*Owt&q#&R9XJ zb$3<${w9E0p(FHsS`$65?GB3y?bDo;VDD~ytgAI*7aTH}=_{AXw&3G;1F%@G${4y_ z8NdAmBwf-7ZeeAzV2Ah&j-8`PWYj##N`klb+ZgruwuhMH^;^21_s~udDN}cIovhb+ zk?dnYz0OTNw)080t`V7q=GvpJM<}gF1ex$U&vRtYx0ZJ)kJskup(9dT;hz|VaoV7a z4_&ykIY{<*{pg#y3&Pt#=(Oe82(J3y2VGDqWlzNx(j&eeGbHHusJ#|=t4c(q-v)=n zk=vy60c11$cUXXNIj~m(&}-+Wt@0jbd~`J%5aN#uz*q?pJ1pbfj+`+dVe`7)AlVK= zWagS@x~F9L+!&m(ZY7%|Uzz#lnefw5_A{YTz*$%L+4I2BVO9{uD$aXMkI!(FPx@ZT z`q#XMhc9mS!uM-#n}yF#D=@b3`=*}>$h6;oOKf}az_7XBd*N|dHnX)sl96lv`<(Fp zG*j8ZXLQVowN0|3?Ke%oZ)WGV$+5>%QarjA`%E3yg}0=jD>NIiOM#uUrDm`ry0gKC zW9tdWkXgqCH~JVasr9lu#?lxbq$witjbAdn^_B;;LI!RJH2RXY{+`=?>nEzz|MOIe z1uma3-NzCty=EF%0N_HmOMd{|Y>(4$n`}oh~g=Gt!MpX5U z*!AdY7e`&oWG`1$g_HjXtu#KoLhC)B2^2f7#-~GRSW&&(0(lr@VZ~UiZU!OH@H1}^ zqFaX#m%iI}54XHOA0{5|`C#1zwp_@t`5zw=h}bwI`A*FLzpr#_F5$l zeZK{@&0RC!S6-5EYHuQIiPMb3?cHYvYA5}Nlk*kra;(Cm(DNzL?aT*5;d54C2?^=J zii_uNy4#i>>}+KN*(z?a)%~q3nmhXbYu+})!#X?~a3o^*IVqr$B83e`8m_X-s|GDSD?E5KZW2CpD8gAlR1H(V>% z{J?g=4FIXWL#bDzxzPdY=K}Z3({hoA0IF ziZv#9qNsFjaL;9Zf7-`}rxm^vqQ6ICuIe8o9uN=a_xpBd?Y_KO7DC~~1m3_NK&UeN z7Le^h$@c-HdyR8+QvSgwcIp1e>Bjih_U0fY^SySGcM|E{J+B!7HuM;0glvg7@AzyI z<*f|mk{rCuGj{2$+2ap_dM+P2-k(*EzE{I-GE>dGTymGsB0<)IIq3Qi=TnnstR1^Z z%48HY0x$(s_@>&r9DiziFO&mrdk&y79LMNQgyb1u`d!h(bTS_oc`td8psiWI19Xt+ z0~A0Io6BmLail)J%GrA(RiPT0Zm1DeY`IKSB+1D+Z-X8ZzE?>X?~t*)-Jf|mxoTnw z4l{=kVw)C|BRM7HhUAYr11Z7sWwznK?xQolO9i}W(iN?QUoGYEF2nR_Vp~uRJ<;_$ z+rwWU`%?S&_>NEh^bB@z^=n83C;`a*@cKwZB4OZUaQMR&ZHVuIl*e^#{dQ}#NMRXD zm?s)xRohAiWn2E@e0v^qrjI0L%Wd7^xRq&h z$6-XhxtK@mr)!UDD4?U*bQI9MQ52cB_Yb(JhTIvFaK#$@Ef}Fxg+#%ywotZR_oP+U zHC$P=kXfgGe59hiu=N&q?D29gQcx0>_?N?FM2cP7iFGLuB+Wu2Z{6IMJsAcqCK$>_1lOP_yDkF%I7tW++JWOl?h z1l4&N_0juKSI4ne&wCK5MkngWm75|Zl``*yww!~xO zU-Mo((gs5T=5Icm%HDcDY*XWnm|3e`tbf4FAAs~$$7%YNn_KS}B2Dv$>{Kg@CnTIP zz-DUjp4GOWXSsepJY#5?$c&<;^In#mY1g>fZrQZ5%H*Oa5G|U*5Utv??Dd2KpmT5K zl3&OSrJFI7#TwSGkhnE}=mVwnZjx#VUHx1af(~kx=*a^|Uj3#EAdKE0(Gk1?RcaNCnLTMqXR|IBuCf3jW zzQgEDlPP`8YA_1T$X}XKn5^L?;Bv@sc=c7@I{<14Mis)unm>hb)}%#|3J&fM9ka0z z8q(SzMn&qo0jP7wmZR6-I5YS~COS`qC?F=Aya}Vfs!VA2=OXo7D`A)VH}1Sn=ft2flEb*|hJ^S1nO>8Ecb* zvN8u>lH%FoBN&&5gM#YuDEZA?NoDz^`=iJU0x>Sg4s)2Ew`vl9S$ctO`e67|zNc$> z8HVj^GQPWL2DHAjnGuVtC9K*yi>4XjZLSJldpn16xE5kooKnBUMKM;-whh<&?u-ub z*_23U^;bc!Vy(n6297#HzWrv6>???GyMU*y0-NX*eST zE{mn}^_=f$zKVxNpmBr{pZ zx}_N%Q{DGLFP?Nmpx|)z;c`k8$ZX2N%txCWpUNznu7ek%#-$?F%Is@K{V}cI25Nyd zhp0P3eBZ*ghckZ6zP`bHrpPa5xlQ^l`j~#NFwLlLUNFk$G|H${;Kg2<*ZL=Ial{I6 zuP4Cfw82YPDGpCC?vANB4z;;-;DBki5p5o4h}c8d6#&-+M+_dJ_&n!qtD?I~U^bZ0 zH25V|FVS2E6CCooO!u!8_N-(a8l}nfF7VC+7YWWi_T(LYz5?K}d)PE+P{0i5AWL># zd_DU{YL4k;jY;J$mftUH(obhNd^(tM`ygO|t7mWEEDyfU{WILU8<1b7O#WGfy0gG; z#IIzjguYN)IO1=`O!kbB(%I(KpVHwcl4RVic=>CXckc}oLsrYFIX&$ySNf0)_P%e# zy+4kjA*InCC6gzO1Z^e66_)uP^iu2gXh3x@7EIN-)J=TgRV3kdBGxQgQ_s9aeN08s zP0_PWOMmK2ys^&KvA!8Lk~X;d%~bvETjIbUmTwcTZ@C`QlefFydw4tr<t`WE#}wxgWpBNL6M*C?T{NcPH^nr7=5q@zJ}QJS=q z1$i&$(yXG@d1+l`n~lT~U3$M(caeLJ={cm-^FIFL1CZEMZ8)C;J3J^Z(=B6UGvz)W zXqdb<4j)wjng9A__OQYE9B&Ey)zr*U>$-;OOZ<=3NPvqr@s2_YAQAcnqub~$PhqNO z)at9~6Kt%a%F38GP_#QYA0H9M=o76?yWEx*ApzeEc$)CAsd=U3FUJOJejZ;Ij4YX< z43nXQpux>=nF7g5mb7Y+P26!Y7-<=;BjtsJ2*A%&MhWPZADZ}NC4Mzfv%%&Y|2?_V zOdZ}3)wL(obIvP=*`C7az7G76OQD$*a`Ap78#hDTW_OSgwDYMBnhHfUcuOK0%cyEz zfQ-eciHH)%(6B?BUW8jw3lnGYWyqzHo*)&EsqlQi98aN)*~qg055k#NkiQgMyQe9P zL{1JBf{g{~f^?if$brW0?tUETJV4&y@SNuiC)6wep3i7}9eR=!ThtL9a+vQ<0KPQ$ zIXT7*^o>+UYVV$Ib)lu5uBX@c>mGbTQuHh=U%rucND6nEvLUdrTiNKINNhIh1`GHd z%MQsX=W6Vh2|9Gac$H1NZqct$VA?C+OnEozY~Y0k7W2WTr?`POFPY}pb1Z~H$;ty0 z%XQjSJVPd#6L^k$Y(BaYB)c*)w+{Ge^@$QIxK%@QF0FOjm1f>Bl=g!NOX=MwPoV6? zD2W8p`D(%(|8{g3Sn+V5chK!JCXDxnle~zbS#u&mb`i9-wfHa^SJ&cW%pmCZXRM_5 zjn=DZoHfVwjJnv*44OW|5{-w5)f)Er&@B=OIcJGJ@t!Ye!(K-AkAS*Q{occtAco-* zF+?3!F+Mdm))X1ys|54xB_AF8<9+?@f4j_6IE2-##*gL2k4dQM>zAut-&6+}YxTt@ z&E9|gyAuC45Z-8LsAz496Ox;fn@EP1%Np2fU3%yyp}HGA8Fbwa8*~$+R<={aYg#UQ zUEA;}tc({|#iGTQq6Ot^0BL6i!K7=PN`F3M9dlw)&xHe#5a9u5wp!3R%x|sRP5AYS ziZC)7nymh9oVmDgzbXkUDG_?3W}5%vVNP5;X(;KGy3sN?4*vou$8_pwdMcgEMn^hO zbF}3-S5C@GW+?ZRwQ2#+HZhXvl2oO5?Oe+*2cT~en)b@i*xKVywEfThB_u#-C51OP zv~OHAH2X`+^54BxRKywnKzH}!%Lg9vxR}07sa13F{IDGdK<~#7C}AUWVU8n#(8AKW zq1}MDf3n`|e+l(>Iy$mMMfv%?CCMqN5+|b)p~o5}v{J|vxtKike3ujq9dlL;p&r{i zBRCNVZpvwe{f+(qpRJo4Z*kX7PI-Cnda!1329ph)3OJG;T+>19^E1!_HHNDaqF~0Z z-`l_@o2vdQ0$C*1*8SVR0nluJgvD8=ko)hs$ z3dNGhiNsr#5&B#o^}PGF%cp|b@+=LHRJCLj?y}cW z20&Er9pu58biBCVajFTJTUo?Zjmv{J>P8Pk%h%{;`|}=`*vt}i^{$it*cEeea-u@G z>u5b11rFm>-#B8IZl?VEnCZ8+xO5(4K&lpbH&ZIOO_R6aOaA_ugC&=aW1!);BH{pi z5|0H~jQWe^1^W-hQajaj8q6&1-mNuWFy6}-C3Lg2b(!<}$1#xNkRPlpnOU}>mQ2dw zHR%S?uW=%5hl_%c2eih8+-jjFBcFD|>E=qjXA~N_NIXx2C?OY?)4nD-nexmWuzWwX1)mdlO9O>-iTm(L^2-dZI#@bwd4lHPGK=Zxa&-4@b?{ zmlApOPYtiMzCJn{!@}MoNg5DE{FK&i(b&+xf1GK=qHPuw9gFw*iMUEpQ2rU<`B6XDHdH$Wirx3&A z<%ZYYFLJqt>_tU@NaMJ(k#wj6`iXJ*m18p-c?XnN@XuH7Z0GL2{}iFYbH@clsIgAg z{l-IEHx=$$74SGe-Qi)SkUM39xwN2Nooj~lJ8cSM01j3tZY=wj>gW4T?*Xzxvi+8+ zm@3T=UKt9=(-Hq+k?LPgZg?p-r6R87J**tlj0}^|Z#;{ekup`=g{+?m#8#G;`9FV> zP5oRFOV?WjM}Z@e3S+MCV{}jyd-7a%Pp9JziVK0xQzB<0_^d|(K!q484WL31ya(sq zfBC(#5`!mX0_d+KVO*!jZfaxR0!nt{3lM#Yqke1^`4t13@yo3#_XhXLL}k}H?Zl>X>k3gt@1kZA zMa;}kO6lF{Iy+O{EA8wYN}0rmN)b#>nZs=D%!-JXTAn z(_OEyESxvQva&ryVBSu}NgXsj{Zj>rn{TR0KI{~gxA~`}=%7l2=>Sh7>#Hh8Q7Eu8 zn7szOPq~=b_`5pThw#}L^eZ0+r>`2J1A>d%+9-Cm4{}CET&?UroG^TGV z*H=^v$U?A6BCy!gz)pn{WDowOTftL9Qa{;&Uys&eU*|a+Vzw>NCyMKQoVx&4(D$Uq zgR1*x<}Hpd_1R1*L`I%#3||(NG<{)UU@UGS$b93aD_`q^gB0V+@y_uX*tYwNtq%iy z8RyIj80W#fNl6gS7{+t9Z%oX5+b@(tvjb1|XT-%0*@TAD)U@)*1l9z!GkwC%!{#+Lt)j>+q4b96&0C=BRRgig#DF_BWuB#w zsjx6O7aZAE2sSuclSN7DIPI%s6Qar(r+{_xwT~z<(#uB!$~%}_ys5LB7XyW#R0ImF zikS>9>lKLLPjp|q`o#fQx-~d=x&fLP1Dj1yZe0?;X&l?=4E-I9qoD?63k?8arKRDc zl|_^J62Spl)DM8Gk|DL#Z+ z!OZAoK9gooV$}=CW_D>Z$rD%6B?9l)xcBy;-YSXGRvoRy8+I?fpk8siFE84#WxD^8g{?R5Py7^Q=yzYFgGtRQr>rB zopsYB5NwF9?~V>pN#&!gp*(1Z)f{(s4#2V%n_VuGc)Fct#vgxid+=VRSkqoZWKk|1 zKi-zc*plOIg6SVh(rjChob>^Er+&!B#nm(*_a?MGPx5UycT?%7h1;`AkOlnn?LX(( zXpodj{mbN@=ZhoAQ#f96!K;ea9}0r!7#Pf{8k|382d?Jkt)q1JOEtl^IY4l3^gb+X zrz5Vn;WMg2(R}?S!B-8zz~ZR(qut%z;_T0>Y8rMcxwsBYUb?LciKH-==c2(G*d%hr zH8l}KLsxf19kTrKnp8jDMVSj}AMsqAU2vwYVEcR*(K=GY3DvA=eqxArRD`%&H3|eg z8=yS;#gs(`)CJgKXPRpP_oki5p`vW$7xc)mXirfm}k4v25s5 z&WX{osW@jY;k1oX(3*G9vm2K?6~nEbR{CD24ohMpHB|@pc- z6}N>RzBZ5U$Z;mZOFAwSu?Kx;Qt|92O}P${mS{cxwB}x1v_eU<;5t+8a9^&QKb$xo zoVYP5PeGvYJ`9M8=!B^SE<=kI0&et!C z?AhWOK+ms+cXJ{YHBVp4gbYZS%R!Y`!_U1rXN6R@=D%b8!_U5Qhd)7>6<9c0e+-5Y z&*_jAmp7%A>zNH0vC%QnW!>GOFwmh=u`vN4!z)!NJ*(k&9D%5miNHMw1tj7q)FiFl z5zXE`s9ZmgWN3>)g3hpT@41ALEHwx(5C=5cSlt+xnmW7!n&p3u7y-ht_z#i$R&*i# zwL5^w^quLl3^Q0yZxIrL5sgoyb*ApiDxv9#&CSh0r2%v;hs-uwzi-K<>vvHq6mPN? z?kE$Vv2kyNsa53ICN|&}#ZJE>mw#G!z*HkaTHh~K?nV!?eI%h_WCTnUjHW&iO8)^D z$hrf!YBDx1M1l*q)DC%;-gGE^z?OI-LEqvE5c4ajVH}F6GmUrf)Mt{qko3#eI$w>hAMe_GCJwr#%sQ@l=hhJhp=bD2!crEarfHB2O^ChmpRwc z7%l^Bz;NMzi#e#D2p?+JlA)b zmni0z`8saN4KI7IKh!C^;pOf840S4$J>=zEdlA9e}|!bj7`0zE8MfNw8ux`+roO zWn7d|xAtck7(j+bU}#XuA%||HL>iQCq$H)=0hBK3PD$yMltwzGySq~m-qGir_nh;E zPyA-~J$tWxuYIj+{Wmjv&YkiX^A1n@dJ#MT6Z0)5yIgL;49~PkO6BZlOiV~G z7k?gwaxP&J1JnA(E*{KrDX|PrG_7hnfsIU_zSz0#Rvmt3sEnU431lua%nu_WojOxN zueoEgdxU^TAW9=U8%64R<* zTr%;n8|`VZP${snDpyaINp@VWz7<}Hn}76f1w0d;M_9IT3y*2CbrNFRGx(~Uh^*YX z5?kez-t_j&I$847(AG0$iHv|$gu@V)O8bpI33Gy7EP^&o+bzj!`FGk9_*eXXCN5|6 zqM0^jx$oKvcdpCc(vPvqqC2pPs1Sr3u!#6Cm}$X)|q|GRr~+1oej`jYV4 zx>`c>$2#~4H{X<+%jVlaDFjA;5Zf%Qf33Ny3STVMQANYO$5FLFuLvY;&dA=M*|}P! zWZ^i=uN?SQz2GLc{eU|YtKf?h_!5C0=R%)od=(DtQcu=naQ{u}uFQFnW;_afqt8?j zItPB=1#{f>M^0V}@bC#p=L@igLYzh%w*ta%Y9xwgBx)D4(bb~!8>_inqWlho_7^nBGY$d%923p|I|7T`bf zQ;PY9N3Ld6M1BxuN?XQ!P*W7^tN00UBi`-MWm+6Dk0I{jdk6Au9QMe zh!g^i06g{3`gN;G29fmR56sKffd*rk!>Pw!%)b09R4YrX4FU|&nq6XVMzIan{;cpv zc|{M|MhWKnjQZYua{Fa1@ zN5>m)Vo72aLX(;P4fYEK_isw=Uhe)%6zHT>`JF+y*=tgV?f@wv~Fo}~iztf9U zaOWIaE^xr%z+eoRhCPcIpFsLxm%e^*@SuzVFtN2?{wB5s+|9RYi?dN7?3iRio6ySTvC`7d=O(Vr!=M=Mi z74tQ|G96${d<`F55=Xd8k+APgKqauifED_}%sE-2wzx4Pg`)vYp3-<>C4%@pYKZ}B zE^;fArl9 zTV)L+-X)8p1PAhQBuYRHsuaMY?nDAn3U;}AfA_RvQkfJEKQP>fmC>NZ*)Q}AX_vK% z3@F>k1-t;)N-nU;u8e^=^0ZaBxhj4}yR4y766TGcPC5(8;3LAh(k+r+Ub|!Je@C3= z0HmG8Ou1e)CCe?2OI`BBL%!v`iOU=?`?=ytZRXJFa}(h^KO*=&6UV^=hgyW*BQO2k z$#!D~3uFGceExoe1pVhE=pdM=d?G&VUh-MyaVPZL6y=akjOd2&Fw;-4jm2|Pd=2R> z=Klezp}wXR!;9p44pM-|z_|d|1)D)3r#kCF7`|yMq9|X-4t*7b$7R2#$&#jZ!>wqA zL>Aqlomm(^M?}Ibiazz1=@l>s-Xzp1?NO5Ej8)2MyK#->?mWOfs}3qb()GIhU?Ly; z9EMY7yPS zO*H!62>u!qZpjHJ8PHZl2YC}c;$*B1SJ;YdT_-$k4Rk2l;xjPZ1 zO0#dss$ixu4^~A=$1P|I_8sfFjy+xHo?O{96rgb`-MFD>Zp9-{YkYMTK^*SH1Ar(O z;f5lt7eKf3H9lm`h?CGW5nL~#s1qM$IX_vFYt+RN_rNMtqKICykLwh^7^L=ejcc3+ zgjCY*gi!@#--n|s%YM!~i==XM+|y|Gun`j*Mnf0kc`mt_3JN|(%W!0yc?NE64S6E- zydEMVB)dSrJ5B;wrD;Z%gqIKek$ef9fVIImeFyS^uSPFlfqH%$m$nXYos$rXaPUIl z>O-hFa1S)o;jDXM1p}t9CQvbr!PPJ`e+gAu@qSnQGm<+dz%wKKtfco6r!)A#XYK(U zGK$UOCy{w(DxPG*%7`azXu|Ox$TG`IlJ3~I@)26hLD}D`zXi0T$4ahXcMs~vkvLfQ z(DvWFcGjFbBirFw-x$@$u`k5MqYK0b81pu3sU$$>gDb<6^kSmq=#udKFgf$|4BZV^ z`(XJm73>6X*XzyI@}c7IC{CT=OSX5GfoFy)C;dvNJRFrQ})nPbJ!`XC4h_9* z5fg2jW#9V|pI*3x7A3XUlEPEu<;`p*tDT>$M2?U^Pd)?Mxm0szFyPTxSmzA~<_S); zLDD*}w&@adzT~-<^{q`zmz(;XIodHOtQd(icRLD{gkiWT_Ulg1n7DGaEAdu^$phY! z66yrj;$xlNb7rH+P}vY?Q<;klVC6A3>Axed4gwZ*YdPHc!=43PH8?&sEB@O51eOqS zNkd*Z79a)wwM11z(n%?dP{e){mJKFV*9xvoKk4dl!mQZ7qosNS<{4btq6SGrx=1SD zU<-duQkaYsG{$#s%Eej^y3*J$+OPmzavke2bbQ4Q)+1i0)yT?N3b1V zVgzTkW95l+I?TX^IwC4h%Gq=#gZ>E8vXHxCCJ5CDF`nR4UyG5{80Iqx))e`l~@lm=@N! zyeu(!FWvAZc9jF1_|&ejH-^LIjXHLl%M8Fy>EiN%6oe%?Oo2`J=2woM;^bs-WojuT zSSu^#ytiX~#u4|9!BjJLiE6Lo<$T0RSHeUsi&i=Qz!PA_;P2$m2qBoiK_Jib2AGy` zb3U&c!>kT&(@=P1zt7Ho4<2}MkGJWk(W2D-inxcgYw7Dr_(3V#r$pj?dK8({_4TUT zQ`*CiPpwT%@d}$mdSo-(;|4yKP|Sr4gN8kFo=jCB+i|H+aXXKb|B~PpQ?c z6IoO&v)BCqIRI${hwR9b`rg;=V%6=(ZtB0>el~yQB5qrylr<=2*LH+V@3z=a)L^=% z#Nk)wO51HtuA-SwLgnA-H?d5gpy6^ zI20C?3IHKV51&Jxnum!W%#2OixS6!$z--4@uT#j#1@v(O7Iio{!K*qcW*Ux!uCZ2a zc5JS0P@Lt3_v2q`@q{WwDC%ZAkC?T@$xU%9gLz%GB_5Ji!%w{y+j-qguc%S3=zGc- z|L83ZyJ}}O78SKGM@TzclHcERjU4%7{;+XQx zHFI08x&VIE`Lp6W0JLOv;2Ln(_VR9(uxaGyFz?Nn@fqkQArZ7zfg$MYZlr2kEg4bs z>P3pN8t% zf?)pT@X)O7{n5Vv{M18u)^{cWfhsnW8kRYUD(72P)1wLcZ}K@Qg44c=p)+6vqf^6qKWk)2(f=1^|InHi{w)c{V#NwbGn_nyy zu8p?I>BTy~sBaf|)P4XPs&b%y_qa2LA6sU#O=4%!lvsOkOL=f}wcpJ5mo=Gi||Z1-?&!|6xfKOMhD0!9n&M8>W?E10ENIVl=NqHUfO&1!ogs?7B2_c zjO_Vy(te`}Gz@v&K(qayyV#w%(7vc+p~h~>=>7W7!XW;recEht>g_+<@1!2CA{FmX zoG4yTEKO9Z_-s62JWuh-_?1eEgu5c07yq2RFYuGu#lqiS7@ZzbI!m6Dh=8U`+;;(_ z8vKDJ+m^IIUvmq5*OYvK_*ynaj-RNrg_nNGPK;eNo4Rx2Zv;QT!ZW^zZQHYiOYd8* zO~Ap8;g&1=k{8{>9h(ta8~=7sH)tn30~dLW&ALPhoB&#ej2c7>B;3FO z8tk@Td#Ataqvfk?HECGd1AaG$Sah(L4z*nTsql4A&16mWQv*%79eq0QU8b4=YTf!` zE&zQQQ2j;lcq^>t+N@dR=9|z@nmw-D%M+~#C#WQZ$d8X}+~0H~4NZW!p@P1Vr8|ek z4JgMnU5aBSp=LI>_vfRc$-V_;b!s>peuk7^*Ye>H!cD1vMNIR5G0sK3lt|NxH`YeG zQiVtOGcBw`ChZ7=F*t|-z#S06MYvWOgGu3I4t?ru`nsOxiV{rodfH|s4@C=YslyT) zjhiJ!_2ic8x_{(Jdnf{LjaB6+OEd&vF)VQFwN1F!tksy`Or`Ld+WcqGw^g2+E?|aQ*KP*7*=lm&(KU<2ak!0jybb zE!Qdzi_?dnJJ|FYV{4wyG3in7%e}GBsT3pm+rkx5a^e>M|1AR5Sr}NYknW}%A#=%~ zEcp$To&Ym(AizX8?qsD+{Y5Olj4Tvlo0xU@y2tUkxlIxprPwjv&dsiu3ITHyZZoZ= z-qYE8!r^6HiQ->>ROSVqbiAl@`#Pkls5DD(hMP#fN;of6Z23E6m$ljebC==0_Nu^O z%Z%W65B9Vm%`HnG|Bp<{jsNlPsNF0cyfjYhSp5qjeVK)>(;wx{#lLYhtj(=dtEN9Y`?D{#NM$bD9r9HOecmp`gp~GlFp3e?+y! zWZXdZMMBim$yY=FWu5s~2=O=hNzlq|N@QV|gleR)GtS$aKaa~d%}LyqcVM$)27s^;tpl+Dsg?+4Y{ga(J#IKH{GYG-FD|pf|2LyA z|6^n&n33ZUeT%hHN3tY8*KB$571(Wg|D_QR@*w+~M*rud{AZu;YLjCkIm#f2zPNne z5TNHT^q6q_%iqe9=W{g`Z+Ceu?Je3wS|n=_$&Kzp5$~ES(Bl4>i}bq#A$xn2A{wqRz9L;*A_PdYls>;FsfuUCi~JVm+pe#h1K8wMmNQ+4?+K^NT-Ae- zQ--8Xq7Z|-?k;-&cwOB6X(C4@!p2~m>ptj6r4TZ*YAWR`Xgo!lQ#k>on4QzH$X*sC zuk$Ui`>DTLbAwga#=1e!!aIV&i1ma&*Pkb_()o;A>MEL6KD%}3T7KJb@SOVhW0?G3 zb|WvC@yUt^#-IX84Xz)OCQQQC+j4ZMB8(N{OYt#$BcMMQDV%8DcS1Cu`6lpsZ{>Nk2_<199;@30N8H_F+so+aCZ{;>+B zViTn>2#yCQ78{_AaCif!I45|AVAGv45fF;<+0M=7dHD^S?F9Bi)*13(u*nS3XCvxi zqM$lvZd(;WsA9w&t??h|pBvjHpV1BnR5jt#oS$P#7`!C=5L3|uVzlD7TJu)1Lua$~ zK*h5knYh2F82XD-nQSn;-$Ad^@*Da%Q^+W@P9KIN zfT3Xk0~(Oa0E)ER0c{&Q#Lw>LmEd2a;(Kc(unE_G?t)tp7)_dF=aI!NA_+%vMsT)~ zAo|`a)RzL%T5#}c0D^G1Z8qeV6lv1Jica>1YwLx)} z@DX_>bw3Mb8`wZq438R{K_)$vwT&LJJw4xT82}M!b++h0OLQ9%6{OEnT^%cV`g1!w z)xBEAHp#*y>LMBC*VGnDZiifBBvEFcH9S@*;lwYCbh(t`lDJqFS)P?ghJr;tw1S?W z75p`oIKd7jf&Vb1PtLEL3EXF;2@pPQ{M=+Kl5CB^hsM9*OwS)xSxFN$ruyJz6TZ)3 zdH9slB8g0ce13#keM9256u0^NUSNdI)_i(vRN&>hV`jNs=ImXZtradQ~) z@V}Cj?Bo_kv3wUC9*1jIWki0a$NYDDK{M~A_gw1ocz7!)GR!{pV7F&)opUu8ij5Mw zUgiF3w zZ!~^c*v1Dk(UntyNFmV=VXFy#PZxXY24?nAGE=49;E7Qa;`e^OZ1VQFmlw|JNI&Yw zD;0b8ev1hTFn5l3ogU-J^X5cI?pi}L(x9E6Pn^VOeI)9ezO-eS@4gy-f>rS?U6Aa3 z(ZgI`1SoW!tqTgZgfI5u?^G{!wqaS3Y`KbrVmj=8-SlL3nW{#1dLoGm6h8zyqJN%% zRrdD24i6*!QhO$rChmKOPqX%~n{8W3hfxPf&q%+@kbYgJ_T2n$F91#XohvF{Z|`?r zZtkC}cW6D00*k|uID3}IS*{NU2awGP3z}by^wg;&qTL{jl?`{`N_Gk4d*?Gq9i$w^ zafcblEo3B&?{w;`-#RUuCVTJk%NA8OmI-j0T@;gUIoiB0wGH$=)MSiDL`3M@zgX5D zJ@m%aCq?2MhuG6n?_&2sm>Ugr8neY!iK;&vYT;`skOu5{;)C3|k^MKA2xx31 z5+ePdUD+N7?tIAwbE#3ki_mBsn|obaLe6KWqD!7>ZO;ezg$a#@7>%E|0WW?-Hn2%6 zxZBX}k!r!d3BOHZjc!V6QBhIIFNL8Y*2%qXLWGWNP@=Ntb85py;`aiueufXgbP>Hk z3Gj64I(IwXw#R+*X#{C1KU@Uq(=_FNVsAnnKwmJ??qY9k9V>XZW}0SwJ}#TALOhwc z&--&!@V&9>-%VjC<Zw*PMXIVTU&4&kD6(2JRtooyluER@3W4M4(moOGzrq4>%LY}P#!i?@02u^ zVE*35GOKY;r?|8zk4!^fU*y+$LyrtDMdwQ@7*;8t9jSvg`kNIqw{k|@e@`$&y>!!c z$K_;aXRg!J06AgbCBGjpDJjg4i5ZCcm#X#ZAZs$&4@!Hx%@T*Dijxanqf>1s8iu`i znig5ZU((8Dlfdtdl2D~WEmUYiCCWO*b5AjHQj=-JKfdDQK_Rd%Y%C64j*oxSj^v`} z@9m|~ELJ>^@_cW}af_j#gRnNYhC<33_2t)~#!_?tWgk<3P*-gV1YJ*~k%|ivvSDLo zl^fdc$=v$gj~+>REEa3gfP}W#PEL$c2I>?HP%7`nzJ;B<3f0OcA z2;>Bi0i>Ni+%EpQpY7=dRDhN0^U0#MBsQl9q@Qj+eWM-X3=IDjV~Eu9){(lP(U2$g zqoLP!_S95avyUA;NnBXJt@oqTmC{Rs*E=oOcIx5Sq~sheZm%4xwo~1nmu{I6sM*XU zdt~s{X?~FzfAZilsYX8s4R z@;$Gz6BY|MckSPFr>H+a6Wm?;7TgWlBqh>>GreYK$DE}7jqV`-e2a9;8%T_{2kQb7 z<6la4u?ugFGByQ%2(bbpdrv~E;gC?6)KhH66z;GMglbMQZ?VO*NX*ho0Le>yU zV?fl-#z7iedF7{wUDt$k-B59Scm`HYZ3rgs{`e)#S4ZVS9O^<-&Ul>D_TKzO=dD?h z%FNe*0Ls5<2#;xH*3XZHZr4{#smnRH3XwhA(|^5zZ)Y#6v)n7B zV{}1T4$Bz{Y8G!_AD@Ui zUZh@h5WM+c5M7TQdV5llWisBu2bM-%KW?)e z5IMbO&=Mn9Co+qWt)_Z*FQu(wck{0Q@Lhj+o^##zNY{G4U5Afh!;#!M$d{@45F$rk z_H@8PyZNcEe7e5g=xQJIkRpA&r~Mxu4JJ1z#yeV?J9EVL>zM_*pmRi9I+dFAbtx|9yeJ3CgXZvd4PZra~jy10QY6c{YC^A4xaTOv`K2K!xk`^dIm6Cf9HvEQQh(l~gqW z5w!*)UJ8WW=TPiai3-kSPvq)13jgB#dxHQFo@Lp?WP;%4E$_`Jut?N&_V$%S-~Pwc zD7N{nt1rB#2*WY-4vehN}G-MvazvI-yWp%H8r~nRU?}rx1RP^v``^|k%^Td)6V-jAt)hw z8uioFVaz7w+hIFl{);0w z@u5%`gmlTYi-(i^HlN#HYuA6q+rn=$Bapp601v6r*Ebk_;ru~@1i@5qf38hqczbZX z?`>=*YI?lg_As&>Qy&Gta>hv*qTIgU6#V$OV{|)YFmZAlT4t7C4Nbkdg?DDNGCUZp z|7xdmwQP`hceOFK?_41ZDz( z@MiolwQSzh{I`zTkn7mDvE}RCJj+z=fgVb*zny(HIhgqwq#Co2>c=Ye&-x{=ojGRr z1KrTChfI#?LcT8D(QYrwZ^E5|=~DEyI6S&v(mg1lZ*=C&UTgPTP2g-JAQWuzWapZXOWGAn5ki9DQ#KCnI%+~B(2cq@=C=US%!+f95DSEC3n zoU*he*}oMR?$NfCgftv)zd1j<&if<$$@8Nek96Nm3s3#kvD8&ik@M?{4ks3uRNfP`?_()|%QGg~S0y~LK}@dPKx*PV zO2CL2J5)lOG(3Q1Op*qgaQ*_-AHT(2)q6Nd;Ri(3WAmPhdaXYvtI$(MO{Jvy->)Ik z@B5Uo=NoFchXdhvF|v3Te{r!VH#CfaZAJWlM*r}>gns;Z+9Jx>=!gd7*h-Qg0A>uZ zAI-S^#?z!`{^j)L|BMCV){qb=3VJEMagn1R;sD(hsWR&$&q7Z z|L?1GQK|i2me|*qkgr)<9{-}kEA9`o%Kbyxwmm|n@J;}^9JVqDtVpB}g#~_m#3KTY z{ub$_0(bY`W+8_^{J(~uLB$A`*w0fGgGftX$Gy6%mnJgxVfBHfD3!EMpd+WqDFHdg zLkX2|wpP-3q(YKup^Q%y)>!il@zz;61PQddK|6N)(nD}9dme(a;zoUr_@(@#aNxI) z52H)^>r3S2T3Q}qz-|n@9@}FAP(*9a?%R$WQIQwRp`|m*xrWx=yN_qE$p?(Pw^>?h zQE1sar^O~1tc?XybJ1eJ7sYM0FOH(N)KL-3J_nrD8Pr$pKZg5%mH*eXWBKKv;}K)% zn+5TP<8Z%p2zZ~15sXU69`Ko#aZQ&fCWkKw=4hLiQ!hM~vn!$!C1x`wEH%@~>3NWu z$sRRFZL0i~NZysacTt_rR$29XXukH^gQaLU;O0;7nh_^z+w!g?qYqMgx(xsO7}Z%j zl3ml~g+}757QgRr34MM$D_>trtdf2@moW~80nNpVD}GcGH!mR)(Dazl2SoVuvN$#H zM{b|4Q?9OwD#@ESd;N-Avev=SnYA_pi&NF5}f)5@9?P0Hk0dCXk#hvl8 z!gtG=8*1b$EC@@z4&Wq@Wt7r8(P(Tm900diFXel75bK zx3R|p@OtAr$!=)u;o4PO8HNhPd2x{r#j|h4a~L-XO>YO)0jt7n8DNT11C9&*(?mFW zvBHX{+R_T{nsvl<0DD)f4l?TXyWq>A5_4chx19LhqvAyh3JVp;mq`L;ipY`7c<~~1 zF+(x6;0wi1nmH{7Qb`gS`x|NVmj{qt@}IIoz$1MR1+ugyhPZBa+!Z06z@Vp=d{})F zmKT1Uzxj(r(Eo|Wn=!~3E`6Qj2+_?1>hMiNLJFL{oyD7k(B=lW8Jp@}v#_wl^_86L zGnbZ?s`54|?Ke zCdwKS(u6Y>hhzylT$p*wc<9}-H9M|rap2zc;|*lBjI6YDirQ7Xe#g1K#)Ud4&;F1v zB8k&q;i8+kv_Hey!crk-eD`tn?i4@Z9w;di@VK#}!^A$OY zXs0B>fq;ko1i=qQuiM21Vp2+&Oy;Xv2K#^6jNadU@a^qbmu{fHlc0!bR!cf-e|fno zeR@v!XOGwP1aXL%bM7A%;$dO(H8pWLd2d41M$fod3*d3uX2E(R6FvF35qIbirXX1j z0P#*+^VxQ;q_Y*Z+{FmtiVW&2p)WzwZAyTlwp_pG^WB5dj=ruPR)_EvyD=Hx^r0!;ww3tHSfAs&AxJ z@QW@QS3oMejk{l_fa3&|DTUTFQ9gmS>4zw`wi`@|L*ryL!qxr0<#2EN559L0M?F_I zH=;WBuT78s#-o5z;LDAOi-&XsZt?S05CIb=+)Oh0b>RZe>W z!b^@F&}SL-tR~jF9;6PYh+V}{suRg$RYWDBiM(>u-?iiS50E|#^v(EJA?Qc)vHDYy z2lFdr2&DY1sQuA-Ql-SQ`yxeoaQtHOIa0}-;OFL)h>ca}<`GexfWu+Fo7d_S?qc%Q zPI9l=IHcI%++`(WI>ZiD#yOFB_NV1Ols zu*a8%XMwr;%r=`==|IkS9iu|CWs7`ElN2<=*?QEwy6ll*#562+V`Az*R?e#OdZT7MOY1e&HCKZ{JnpVOrVve0|E@z z3XtUH7FOtd_DsXu&N3J*eee4&T&5Q(b-xcZH-`?!U~%K}>ne;9u++Y*`4s&1ZK#A? zPK?IDz=IcIkpkSg?1}Rh^yL!>rx!YXjz!xp;>s0RF90q#3(Q9C+((TF$5DMW61%*( zR>i$r661a;iEL@+MT!$}1{Ldj-5Pu~25$on6&^9=^K&^C05NsY50q4vnyUAWYrrqx zzU^cvS3eHK;27EX`ufGdn%B<#C(#fQVhjS0v)U=i@9?O}b1PR>%l1EjPob~rp~P^c z*T9AomQuDR(zbKO+v$KO1+@gGaS0=`;X^J>pYHi>1Mi{WTPEraV=oLGq3H=@e=jIu9=&txRJufLD zvN*ZeiM*|4a(=pZZ}VDYa&b{nA9-ueYs-V}*^@9W%UIk^|nCgbv8O|M??aLeG8{xj~l@Un5 z$pUQX#g-PPN4nXLq_ay*J8o-KWTfM*EHr;;|L0E92AT@tDk=fNJG1)C(qGQ@lA6fMdY^88(4@{d z0RdeCJdKkS@~qGv;IN}Z>ajj1`Vph%&2*`!X3aVNYt`KUInXgNYAm4=;j40Ixj)ZJ zs?OraRG~1sF>Tv9ILL~`(Xc3Zi(cziqpqt#W+S za}Ejl2G!9~c#Z1(?tA8+LnFhK!q)5z(aB%qcRCtKdDa`*Mv3gYv@thawLm`;Zv`+1 z@&Jee<^kNJBds{@9os-D4ebC)WYe}y&Nn)#H|XfM25c;eXeSG^v)wMEeI8kCDu#uU z;yj6c#aO*61-3GU3N<-OVazCoeab4lxbQf*O3^=PSK0sS{_5s9m}NqM>yuisL9oZax7|xRwZ1yIC4r zfsDS$T5He$Z0))qrq9dvJu`B5F~NZnZ77Jq)!ddLM0W6MMZEFXyw52qq^(l!_P;P{ z)tm?=wUO84)Vn&8AxIHHeo@1&6!v)zGb9srdz#2Rx zPD)K}p!!Zh4a`$%@#x+T1cU2)=!?p?wus9}3`-&9l!y8d&j4;gUPVl2u>#EoZ}Vnj z^JH3lQyGR{D`(P*MFzxSC(qqDj?p$3C(ZOPpDbMJ;-Zv+D8WKsL&am!=54{Eyhcym za>x}WVABBXDy6Oc=e`yF%QUZ@{mtyCc*Ft~c23m6N6_6!MW1b;MOJ!d$Q4eZzOT5m z%e4yiBPpr0?h9fosQ!+wP|ZgNg@WxwNND|&&=KUFmPnPf;qNg7o^=DY#xt1MoW-O( zvYjxGT(xGBbD9Wd15$ZDPuVcShz5w;*jeS%gP-BzXh%STBOpfDmk@bGrC{I>&%j)8 zASY0UP{i7T!`e*zJ(z+EF**H9&2|Xg^YMYQP{VxbV#PwK|W5&U=6q4*CnaeE@ z`}OmiK#g|_`WlTU>S5>HLLz+to}Wh3eH`-&)a37XMFPh6>&th=K0Zo6UXxs;Jlyet z*2zKP$6}MJwv=s?0E!jtO%R7G3UL!4j2I8vB`7re=qmoAA7{mMnH-1!v`3-T*SbKm zd1@h6X%Ba}7e^xfU27x!flkQY(~HU_^xiF*z&djTv-pSL9ty^O*bYxfQhwqV6DQni zE?~7nKBwWN8{vvI=jU^)WjNr`oV&L-eewJ9V?*;}_T&BM=^x)0?7uG@cO}kwNK$)XptdrB^Yz!QuTnb{-2w}{* z`-RAnIs}+e<2RVjl$d1|n~85soll_%(`KN@uqySkp|TkOC0%O7(e??#Y+ zuBm;|V2&-VMKbSB1DN>E5`&9v#jJ!tAua%2#P9j~H$w>Rq4MLUx7Cl-q=D8AzO0N- zo`c1|NDwaGB40S`vDI;U3KMg`>1~fG$4`rZ-9q5*5oB~sWuP!lHJ9WR7YALgy{+15 z4gI$D;%!R_lPJz#t?BB{OmVP5U3ZJ5oDu4Dq{(u-_j%Ho$?#3Fqa0FX+6q`(#MakO z8|z!8I<(n@DkVVM76!Lz$+~X%q^cShZlw4O#uVS}t~!YjB){ycs4a?5Axn9Yg7Hd< z&)FI)CuYYn(B>1t7dfe?P-1hAx+23ViJniBBUKy$(3h!IpH5S$XrxKt=Cm{XR9kA>hl684t$hf)UqzbyqhBK+17>8DC&{E5~vslF=q6-}IylKZ8 zy)j)R`>tWypAK}~!BuLKwsr&zSQF4USpFnF25YADf&I#;5Bp3J-r-Z z^C(X2jqgiGf9H^rDRuT*rcH#dg*tNe;rD-g0d{kpW2cdA_^Jlss@+kjgZ_z_ ztY^YTFY)&9Hc7Kq@ts9R#)J`x5+BI3+&i+|H^ooo0YvdcnXyca4}~k+Sf26WRQ1S7 z+IfS#N6nMq-(lI9Rj3|5F!T#8-S~8G(RQxiRAR?WM<=bI3z=~$n0k=ITslWBUkptD ztYUN>JG2siK_9O$x^u#a&B={(VH~~=xV$#bKgSE80FfjNubw~abf?T;r5&8%88{(z zsKM(h57sadNL@XZOOaz6KYN|vn5uO!2jkYCnft0oOsGRVt32%G{U#xB_i+CUCW9>` zn-#)4Wb1BQpb?nE8{Tcoac~4&fsC%KRNTOM&54OJR~-k3hWaA8&-*^X!~z79(%a8O zwbpvr#GW~Pdf`{0hnM9c-UiK@oJKe5hFHRA-&tr}8wK*6ZCHcIcKAfYBb6K|=`Dea zwX?#uPhH<}9_!o4CiOZXUcf1gAhF?qLoJlvk`GMq>Pj0`TuFOba!KkoBK-k~w|nkR=XX*Gz?7A3BeqKMq6_9y(*o$OCyo?RrDPZ~JFeMA4K2g^#RL(>2^{?9mj0Dc zl(<MWe{a0$f@_fiF$#a*jPr40X z)E@n#Hxp-j&jEH2sC_qmkXrDL%j#2iVWmS&eflz2o*H0)h;^7<&5=#c37(WUaKg`N z+jU$}NqWsKIekFUN$UEnoec4?HmX%V8i0fN$xj@V5wHI?L30X~!0oESqI#AWN2tmM z4l9Gh*x)dFPPn^g%&}<_8D)OEaW2qX|Z;$6-&; z*FOJ{S@OaPwJoDNhAV8KrmB%`e&0AuVwUO{?@of;-LShZ^gK<>HMJc_K;7JpVwM&? z%+0BRlZEWdTc9?6XOVuRxz-+0wEg`D(a4Ah_(nuB54A{e{R*Ey#y7v0HMsp@jwaZ0 z#~!aplVo&r^efp+Ung+&Pna7gUg2`?3-HURN}M*#IRT|XA$}McXq?n#6tLUr8zZR5 z*2gQr*ucovBOdCUbB+@CU_D_I z6?FKgO1oMl*?Hm~lQ@Uyc`OJ#SvV-I+@m@><_O zf8ufodvT$nTr&}(_E(4f*~<0mDP*)1v;+9ARig9mO5b2)6AIQw=xm2wg6=4eokSVY zuhd2TZ8iupaTg!@n}p1TTKpGdk=t-P?LoLf^t424X1Z(`MXPlDTMeFUZJ;BW$y4YkDva{z^?A4{FSl0rR zxB#&*pa0j_Sw}_HwGDrU7(j-S8X5uV2I-U#L>d*OyFnVs0i?T;Zcyoz?vO4?X%Hl& zbBOQYbAQkMzUy1-<3DEBI%m(B+2`ziUBByhmBq@A=&-bImJCsjB8}^Ps_!8_@%kp( z=rB@4a_%W6h)QQvX-lSfbMv$+Fw2|tM`oZXrb_qTS}x<<=Rg`a5o~&65EC|#C2Cmj zU`w|{Vb2Rg<o9&Rk{?xAvw@FUm<(Dpg1Q6#jVG)44ui27%!wvu{u+y!w(hqH=S4U_?PeH-_Gzmhi{W5 zkF#u@5$blLZ5$lC#Ch-qY;#U2ttYc@9|> zT><}2>CcWA4MI=dFr~3_jD+`!dS9Pv_11ekTo1humn%k<{kbKXLAa#Pxrb`H!l6mO z9&mCWHK@<}_Kj2N$&atma)J>YbweFOHIJ#%eTjRiE)79=vHZ^Csg7%+10OiV2(}Kk z`Zk+57moqfLAd$=)rWSIXxU#3h4AA>Mf!ctP56NMJeDa&ZCXHg`FVr7l9%hbmjoAm zE^H#&PeX*Uw_tNOZ5`kEI23S}pE10An0lsqKa=@d+f_T@_;*J4H=%7SiW?)73{J0F zFU7@Kofa8F)q*B)8=P@Xk59r96>-|>aNzKuL=oI+{m~i56%tJh=I!u7hHV6~bgRFF zRnAl!{ZgMngYh8iBk~ikQ*SQQXE+`K za$+*3p|2x+pMI=*`N4QVXCvHA(Mzk1;eL%b?~x9bRlIx7{_QyqdGvQ-_YB{k<@G8} zS2&sTJk{plup)=*4|yvDw|i8c==o4a$VvF9xN{qtJ@RyQ0MgLe}YB{w@z$jCNE!y{h~D`l8F}I z2v6YtpeINPUO7*8ry>(0##$ow^n!ilT-+t0!mxl{AiMHTN=l zC8jDPInLtNj>c3D+(`8wrnWX0Bcx-0MAdRo-)1V?M!JNgZ8Pw;S4`P32B zYq}Qq@P-3<=AHU^r}`qau+7(86+pf5@bkBUr6)}RR#zHe)*fE`6t&-K=8oa z|J}3w0|p=_|56Of!1EI@06u$G`{Hj219S320`)IE5zYN?F!3*cPigvZWc|O#{lBr5 zf0F6I>;LQx|2faUX|#XPfqx@o|G*1>YaaflO8?)1Je4@2y57pNXY?3UuiD!9nmW(J z^Y5rSvtdXj<)>%X7%~!j7YlB1eFAI+CJ%ky{kWOLK_f3bnQ~8>Hyc|A#ce64zP1pn z=!zmxSk?SwV=k8UOxOXlB;n~>MlqbyK)p{?TC3bW*>Xm^O zG0t)7`_gM%TuIDJx}5`EHOCrMb%-T)eLb`Z-dNLfvZcGFLK>t}pYq@8G_5tDWOI6z z>cCu<)wg(WE3=E;nksa@Bj~8yEHfGTecc**Bd$Ry&-d$+wtxuu5r{KiUIFMxUSH`; zzqQYi*-5ot&mM(+VaQoozGVbz9Nb&{*UBrIPYNu+s4-_4@7)#nXJ(vTT;!9JiJcw5 ztG9%@M@MN3+K?Bm*zMZ}vaR33+iYZ1HLnVh4xg-;uPU27d4{e^WG7yE;I@a@AI8$H z&XVQt)eqA7xeGt?<-_qhpFq>}_`U9B2@Ad6+o^Qc3ZFzTK+P)QIFzEMcszSHNbaBi z`1meQI5m55>@IbN(Cvkq)hmx6+`F;4)8E##}PtZMWCB&lNM8 zy*AyJivVl(!9?(hHB)`)b|W`tc2kYihrr!YWF@qWr4}w9Z5i(izn>Xh zIFH&{5p?@V)WPL%*LK-<<~-T=T4Xj|O`{7V8`0rUjzKp~=ft1P+ec~lj4N|DF~q+X z4D292x5H|-kisC3kq^YvItc6b z^BAlwgPaeq5F6sYGIzcT=dE(uf`0)8{okXNTi`GVup=_d9_>g#?OE}b;rvbIG)4fa zy0l(9UAgR*AYEn5QHK)r%EA_199$l|4UO`P&6A20swL|Gj8(w-!h*J&*g&s zQjyK7uQhRg%fNy-a@vVZV|Ff2>U^f1296;%?@7WLEl`dO;x6)LHGtq&j>}-;g`79o z+4^xLkU4VxG8r^&+*8yl#~pW$tpG_QH@>1f1#p_#-~iG2xw%5NpwnTtH->3-ZWk6f zs=Aol=8T9B1_JQ@%}}R0Z1ATN;}4?GaDx#xp7Npsb7dZv2lbKa`8NH?DpA*KLd&MU z_4OnJS1xY$(YuEsCu>`41F|p*PPC1C>cd_947{dn)la zQQtC@*d+8x;Oxw!uQ#qRw;$O)7G%gm?jrP$-K6Fe(u}yXzm@`26h^PQ73owqqWU^a zpwvBnMg(=u^3(-1L2~>^$*Mg_X-)j>JLUwLU;sD!Rz-+_srxejz<&VUN_W0S(k~q+ z?+A8Hcl_bAEh`^?X%$KokMVM7xbiWtc$rP~l3 zOf1&LHoc2yzH?N2+N<6w5C|9y>eQ7+ArYyozy&pFJLdtN0J@| z5|6{_>b}D!NQeF5zT zC>nN-WJBA)31}k|U#`2M@Pz zUXs^6`g|3~05;y%?kfv^Da{!TG7FBYlbgUwBD8H#_AD+h#Tsy0FqvEa@dFBAImgwp zMQqXzS7Km6usWKtn25qD(P&t5J#wcv_&Hh@st<&Z|2Q3|UUWVyaa{ypc96yp=U2jn z@Ve)pKz)4{#8c6wWGo2>xSQ|ePTZqc3F-YYvy)aIg|IF+u>1PH+Q|BebqlQ1NfX06 zHOK{S=~cWew9+465iC-nEUR4Y9i@b<@ek66eHKsL3H`fYHtnTf8XtZth2J$WViq+$ z!SpUAt>9BAMk(3?36@*3Y_ z?9)GQbxauDYF^*ng_3Ipb?h-q^*t&rp{7YO641@Q>iO`JosOyDn_T#y<$%eR*hcs^ zO?I#B<7yUYXsBf>Iay9lhYu+XmYuVznwp-O2PCPUI4Mw%fuIISPmXZ$n%M?;V$ASl zOwpGZ_ukJ#h`?^!I|=9vTeYK`3t$zy9GmSp{!Y&m65X>8Olb-6`us3ERplnAWH8j2 zzRH}&7p`-uZ*V_D@-0a{JV9<`oHyXl2CsF{!jq0oeVyEbO{nRcZ&9Eqt^8;&l{O`x z);ZR$v-#Bag`LzE^NdmOaXl#AqMkw-GE_h779;5-pmWN1rxl(h@y0Dd3qXP2+gF zyo=*@arhEPS>iE-SvZWn(gaf1iP^B^q;mTx<%sVL`7m_W<0rpTAEqsyTj|R)-v6W< z-Q5)4ZWTG#)JtjaeofGm8{6v^05S;UW9`&{=Y4W^7Nu*D_374CIB7+l5r{7Bj8-(a zDpxOi`X_{(&SWJZCH~%}FBg>v1)&u<-De;zTzcf{W`V?Yc3q zkf40L6UIyK(^8NI*cqPQNxxYQ)xv~ou6OZ{Ey!f-mrhO3%Tnly@^XsEPC8*G=;;;> z@9R$5en4{XaF@mJ(cVN%?m4ACaVH!Xmi}|D_?9L=|7&}@c2|p3al#$@_u@LCrxF+@`-mj)VP;8P=I3C!PYMR?375C?>$Mut;n~kz< zsf+Cy%`)vA%p!m7MU<`is1c>G)0kl0U?(jbwl9nAV)+8~{$)mZA>KL4&NOr$~b98X>2un?>LtUZi>&AJ!y@xzP+^=Y9f4Mk2=gWce4J|%` zUEIey)i_)(&MG`UyTwFDD^F;|wXM8`shy;mk?T|HjwtYo^GN0)i%!kWOGlo$Xz0IH zj#OlunwwOn#pmI*&kGZVtwW6Q-#(}*%QXVeb< zXaY+j0vk9v@e1=u@j%%o)j_1^nAC$6yx$FYxD0!;ip;((!KQU;Y>^iWCu#>)zPFYm zJ>DX5Bxwu^y8hf$6hALCU)=D3<;)k?wy4AFo9eT!uY)b#zt@~Mb|#4FrABr4rw6}o z?Nz;izBPUWFA0@DcS*g?M14;>JTk(apm=f{?s0>BqxItZzn`aiOZyYIJKS!=-ikUvj%1q(r$o3^RjM@ zmmxg{K1Wxk{WE4CXgmU4@;_}UCo{mLwye90NFXGBwyUY>pY4>#?uNL4i}H%DolmB!;FWF%!9r*+$$RKRH)HC@oKgnGn+%FvcJkoHD^m2Csz%L>MT)78iyGG&H3i}D18Z}OeTrWq zW^uf2&7EVY=-&r75>M6Q%ou{^w)m{BG!>p5eEqF^CVZ`;t*mI9G1Yf5Oqa|UUu(Q= zLcYvroAcG1O)>m4>PyxkbtJro(=ccIExzH8aabd?O<^K1*)5PW^cj>n4{jNh)N$uS zx@`^zYhHlUJy6rL@4#ikt#&q@(hE@5RQBIG?1P8h2CXqBE96@qWZ9X2l&oxR3xj&2 zH3lmXIb~5+JK}1$eX?TH&xhG;r>1*dCP&Vuz8_8vyG(?O2>PBQUtwkMmmHGxIkcAJ zWQQ8>@km{)#NahF3IZ z(A0OA0s&5*XyQDgpx!5Us$f_zP8?Gzxp_9l>K2ZzKi|q$aS`U|rw>a)N3CQRt~}1d zhabn@=-5kjJ#NUz+@z9HAORd}{_{m$w9Vi6$CBU5P}9Q7HaF;(>~+7@$_X2kZ4m$}ghXFp z+|i7deERce&nigmq?-2`w?xbS@RTMZbE)MjP4E6Tb?Hr8(RC2f&K^bn(QlN1dD2b3 zIv7YtnnQtwh3TE9$(TvZC;1U|N6SxYEY^>2warVxkJX7DlU()&H8g|RgNibhoSo8+ z>uReGO8A=X(Z*^p(w&`Jpqw$03N^NVYM-D|3BMf`*|@StlqN4{IRngakPTR7u%wK1 zv06Ouqn0$@Rxim5F13{Bqyh}oSA-muc&=XB=YocwjqhU4&Y&RBJSc|}oMY#++|&2I zEF*9?`y4)xTPuB9^=Y>(cDKpztWxs$a(1jcd-|1PIu1>GsV(R=Ljv*s^mE&vzjUFg z0eN}6&w{yfm|m8rR2CwIhLWT{?~d`627N(XzLUl{LIzXMbe#Q|@BDD&r1tj0Pi(4r z{rC-;x4ZIzwU`Q)l#?jpNBdn(4Oj*22{HtFg40tcWzDfqiDruWw8l_ownV#cdZ0S< z9i2=MasCl?Ldw!{gLZo(1BuX)(GNzkNe>w4{@7gyS4L)90npeoi-s}jEjGb3q$0Ij zp9eHBj3#WC1UZa7cXp6lchs0S6oU;Tf}tA)5}}$_`27e7kPver8=?9BuA@Hg(jNnL zMxWJcyw#SfeRlBqSC{a0`^rNQsIoto@@|2;=E~Sapz_p7W{ktr@ItJTiRS znk<>Z;KXlt&-P3kAcL&0ckQ>a+I$u4mpCO}^T^ecS3841#A))x?OJEf+eC2jAO(P!z( z8Pd-hBA{`R>5yY42Tuz@PCvFaD}b$;DfeWO@zE}XGnRy#vntSQ@y?!Z3qtklwe36-Nm7Va_@zIiUZ z($K}zmwlD#hY($wId8J@(TWP%*ZNm`UG`;Q9L)k z8dHlMW0y5ZlIvQ3XBi0h0ny$6aB?Soj7FB}0Mc*ROb)_b>}&C!8YLwMgte-|pHSl& zZR&Yw47t0$wFNf{!K5!0Wt%MKbah}ykgiUY z5IfF*M(}YSC8!Q$wiRaB z{p}!n#pN~7;ik=d)CB|dLX`HMwS+2-@%BWYJJ7%8O?kwD)P;|yumm1n7sRi#@f~vD zv)WdWAyUYJ_?R#Y711t~6)A*`l?DkzQ(8mG;9FZ(P@ig_{JV|g(%HFPP>+^#DbBen zPGiy)C5RgC*vY>Uz}oKKhL6y1adj%mabl-nUuy)m(f9xv_Ym zxRlWH_{6WDfx0rN98B(b`$UM6gFF!GXU=+9dIG}M6mWA=j)wm#>UtjpvR|^LYVWnyiDVX* z`f2C{Bj`)0DkwBpF(nLANh{JI#b+CO%mg7w_EJgDEc`qtn5t-`MJbFd5E?QImE!7(Lhi9^ zcR;JHuTgW#18)FbSdhcuCYa%H1L?0qjZLQK+!7i<9X$}zaPWweeKC8{YPTct0Z+c? zvKuFaxiybpCy3wvn~41~*D0tF6v~%6J4?4XYHMqjPTiP};8b$3h=BwTeWZ>^lqTkA zbi-?r;>E-Fwj#O1l|gX_Bgvc#wBvp$jg-Y#D6iga#kGnOj>(}i(>L@xb` z>41BAwDFD3CyO=Dll6^^NX9j^aA|x+y2{U}i!-h%pvH02Vo)#Vx!OIoghNmqW{8;a z?JzQ=$EmTo6~ixA%U$^Ir1ceg$hRE-W$`$oog8HQ5KT3S+Id53B2NoB4UH3eWo1px z*rruq8BoZumK!DechE%$Lf{TT>3(_(1>3#98!A2E5?)O82CTUh(IMMdSuYa4R>!Xv zqE(xXZ}z?Kvc!rqkWT?an#4Zs|Loc6O_4u0b+$?}BUXD%NH9CNWpdlWix3eOl229@^2y{hhy@Bxf zaQ%kFtI#zvN}=HXKt6rK+@GbrQ1TAd25iX9UfJ+E*EOWB)L_%uCa#BF%p%K0>-vR+kJm>C!sGIVOfU&mC_3dtjj@RK)m02vSO_Z; z%rt_AdK4*FT1mV6#pNXXMHOd5u(v&OGm==t2$`t}>x?+vIzE}n^N9AGh!@@6OgvHQ zQvoE?DO3Kn{Cy_-!>MRS={mSZ(7f31|ppS*?xCN6#+|D|dZJ zYXCM&q1fQfSG?93gvlFrGnD8k!_V;;caE8H1tx`Ng_pNr7WVkWx_Q7-B}i%4bn89Y8^4QxJZ=*wt@@ zx}zz0B2Vs$xI^kn)m;}yJk0ug+?823{R<3L-Y(5{y6VHCXU11YUH|M#-C~b(BDjMB z#~BzbJs=9rL#jrU)syj6>`y^31)wrr*GTpnG;N;noeq?*x3k}6W649-NVU!Z?r8D$ zis~tM1Z)ufHkL(Tym{Q%LBpW#(BGCX-+LRf4g939^EhRImKJi6^h006ej(5}N#rIr z5LziA{$*}ZLyIoW*AjUd`>gR6ppO}FVSWTDPXof#LYfMJVbRz9)efTBE=-Va$YBto zHR3KN=qutzTg8f>L_!*CnkFlINOBfpnoUG^+?=_bOYvVk?V)`2*7ad|_FVhY@cH1A zq==3xHmD!)%=0H1IjP#_CbH5?)YY11s*kc;e)g{Cjg!K5kQwzSKI=zDimfD|aEo`1 zZz|t&Pive`6Lq@?j2h4n?i=8lu#QB^Z5}^v(@&t#dJGkIqB%zm7c+meZ$eNV0CByT zonuF5Ei*!h4e9jKEZ+2RfF^LV4MDIhBT#p;cpY_j$(C-l?XdesUD6oA25$UaYA)(K1AZzGI ze}q+N-S-LMG^lFI>&Q)GP@d)}t~H4fg_KhKBt<9GTH<$w*35fn6a`#Ed00tWziBF@ zJMC%sig2%(5uy#+i&jQs71~oW>@LSD5XnYjzLy%R>5IoRH@+BkRK%mHjK?XmIU=PV zH=3ZsL%T0TyFi;-OUqF7N_%Z7Usv40+c>_?&CRq)!iFiN6oVhHK{3y}qJ?H!vAf#e zIidpcRDwkJu&U;g2qA>^gk(h8y(}v%ku`$RwKhr9PG+`})h+L$meWGg zO1gqew>gPoPx>bKG|@eAwD$~0jcjn-+$9iI^hQfjp;836gBJ!|meuj!J88^T%N!cD zp zDEi51Dg%VqED}OmH1)Q9GV+dERBt1@S@_mqK5Lht1Bp!{l(tXW;O(k@u+z_ zF1%;&GiD07pOaHQwW;dGsaVk_9d4jANqz;^&vWdyKD~+li;&fI0>o4Ou^v=Ru`Ke* zoJc(|4DV=YfU?glO>)T5RsUu-2@AoWrGJTF8*G85A+>Ff)ZKmhqYj+cF-0^}l}huY za8_3oZOSWT0o}MzCXnpjJMM^3x)2L&?C&%q>eVS2&Cj*qJ4@gIf`NAb<*LNxs0}s* z1@gpdTgXZOYKrQT6|yH^o+oirbH836+!8|HPv-K9uN;JZC4RDaKEHT zbIipmh#<3zHrLsmC-MZ)yFCpAczM( zpE#c28UOLKabcGPPqo=-{7*@V`6r-5xZ&l;Ep&v+)_WXk7@l2q8NJxLzzuiRL1i0H z=9bDrDwW7uK;oS6{7njA*>(u+sk7xhI!W#)^6|S@^bPr!LjmYSVW2!tZLlSx#PpD ze`kJjzS(8p2uJK(r`lZ(A^?YgemRL8yQqQmH5vjE5pk(-55kiMt)c278Q9rfiiHdg zULe7STSB;Vn;|t(QHoQ?DIH3=$pS!EB56dwG4TS(D4p&cu2(4>LpOv?rw+3hRB-x^ z`p!sBXOQa^7aUmXr|as3QN2yxtA`Uz@Z%{V56BiGh$Q~(jy-RjdV-)k+uy-m@xpMp zeuFewtgf>@|2+}&0QsH?T&^c5dgX#^qkx<(3sTQVrD89~_3m2gcXRgjec@)2XN?@O zWubf^SowTj?I3-+l|%`2NSJf0BZ>l=wPqmiyMlL9p$*YAf9S33 zJ4sB~RH8nL59}5fOhx}6U=NTO@on{}2(h+;PP1NV#I(W*pI?S1?`{XE`sHFvos|-9vt&l!=V_FN0B66b#O%K+iztFX-(IhH~~Zli0PL z9n1;_$#s|D-A-gV&jso1F`ML;f7FArN-wBSQBA#=?Qrr*UKf|z2!9BxA&v?h*xNKV zU6{BuY}dGPIAgKx8l5nAo?QF!gU9Re1brYubk?qe3a4Xh^g{mlV(0rzK?~oTrD`{z zS$h(fN|9O?NLo9I11xuAMSXqD1%@(duJanC$4 zwB2sxW(EA%Q$L4=q246B5&u`|lF3(<&c=Y({%W%;r!?o=2>@B91%EDz?wnKj-{C#%gsUTY*} z4+&oGh?`&Dui7tM6g{W;A7B<(CIx}iot$&AsfR+YD&bjj!y7gt-zq6{a7Nh5{wuS% zjmFLQlrpc_clizI5EPlizK7q&g0Gvt{pCf%?sZT{pLB7$xX)7baMtb^OZ@9s4Y^^{ zn^OMKJ}okY>(Qd-$Bq(&US&wO1bG%7Jsv;L4!O>?7zc#C{(^i4T6YGr1poQLsU6z8 z5IkBZXx5WFnn^(mGwR@w3gr~b9;;o>TjLEYzj_w->!d}DSofYys~^|Gx!v8maizeT zclMc0Ujr(Gl=Lmr%X?u0wytuZH7Nn&Ntpar6QSZ)a^}}j<>SZi0`IDC8vaGpv|$9I z;a71tb~5o{nbE2nN!hD=0l$M;J!~U#>or*#|9F~qAmKdCRV~C6o^{!6HOWJeVSSHrFhxu|A(KUB5tebfBpQeK5N_>(C3XJf;mH4kESqIP^;f1O@I`Ul zKXQ~zn;IW{dn}T`qWqsHm!jlRvL^3i!oA*z%Sab|E_>z7O*nD_t(w#`3RfvKDdJ*zdh8pR+0^LN;darS4k z5cd7Is$$enxfmeUK-ipTV=g%DLt{1hWe{D1&cN&V;3Y_ zG^U~ZkD|-Tew-vcpl=VZrG3?N9f@%XBalQ`qa=m%<^Nj^K>0Bl%>eUSRfUyZ;b$cp zHSV=)f8sh`3ceh4%Y0|5ZRCoCIg1R9#A0jPTlUB$&m;2zJN<`T%tT`(l?&_i2jij< z5#{^;!@8@mrY9g3z$wYIU~;tNmf_nkB#vS?!+%Jv<0D%VT(N}tby~c`bBETeue8!= zMp|!OHmZs$KTP<42+2_-0^{5_G+uCLvpvm3XOxxPN_&6Y9tT}2&VwgDmZ1s7d7#%Rg-bF$Dp`v71rSN%m<_5_xtyM)J7KODeSW!vw3?&i zLMpe2hg`-#c&R9{%Ey~cgNU_kra!Y%)SK}AMC4xdW`f_Iy?;L+0YQr+nio3qbaWyI ztIj54{s5Ce(e5Z`!i+v7Xvx~UEJI(XkR@# z;-a7g(7O)s{=q@``T04p(xqa(UH=M19tr>}+4eHW4}esqX-pgc0hN9Xer{{IJTW0H6P literal 47815 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 F{~v8yTyg*a From eb8e0e46c787f6b127d2e942985d1b8001acdbf2 Mon Sep 17 00:00:00 2001 From: Ton Huisman Date: Sat, 13 Sep 2025 13:09:25 +0200 Subject: [PATCH 253/564] [P102] Use defined constants --- src/_P102_PZEM004Tv3.ino | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/_P102_PZEM004Tv3.ino b/src/_P102_PZEM004Tv3.ino index 58069b228..61d59afa5 100644 --- a/src/_P102_PZEM004Tv3.ino +++ b/src/_P102_PZEM004Tv3.ino @@ -335,7 +335,9 @@ boolean Plugin_102(uint8_t function, struct EventStruct *even PZEM[5] = P102_PZEM_sensor->frequency(); // Skip non-available values - const uint8_t toCheckMax = PZEM_model::PZEM004Tv30 == static_cast(P102_PZEM_TYPE) ? 6 : 4; + const uint8_t toCheckMax = PZEM_model::PZEM004Tv30 == static_cast(P102_PZEM_TYPE) + ? P102_PZEM004_VALUE_COUNT + : P102_PZEM017_VALUE_COUNT; for (uint8_t i = 0; i < toCheckMax; i++) // Check each PZEM field { From 659e5e50fa0b99aa01e8e0d7c0f62ecf8c2028c1 Mon Sep 17 00:00:00 2001 From: Ton Huisman Date: Sun, 14 Sep 2025 15:32:10 +0200 Subject: [PATCH 254/564] [P102] Add Submit instruction after use of 'Reset energy' mode --- src/_P102_PZEM004Tv3.ino | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/_P102_PZEM004Tv3.ino b/src/_P102_PZEM004Tv3.ino index 61d59afa5..38ef4e59f 100644 --- a/src/_P102_PZEM004Tv3.ino +++ b/src/_P102_PZEM004Tv3.ino @@ -8,6 +8,7 @@ // /** Changelog: + * 2025-09-14 tonhuisman: Add extra instruction to submit page once more after 'Reset energy' is used, to save 'Read energy' default Mode. * 2025-08-06 tonhuisman: Change plugin name to "Energy - PZEM-004T (AC) / PZEM-017 (DC)" * 2025-08-05 tonhuisman: Add support for PZEM-017v1 from a forum suggestion: * https://www.letscontrolit.com/forum/viewtopic.php?p=74069#p74064 @@ -232,6 +233,7 @@ boolean Plugin_102(uint8_t function, struct EventStruct *even if (P102_PZEM_ADDR_SET == 4) { addHtml(F("
    Energy reset on current PZEM !     ")); + addHtml(F("
    Click Submit button once more to save 'Read value' PZEM Mode!    ")); P102_PZEM_ADDR_SET = 0; // Reset programming confirmation } From 546e850959440a962f257575fa9c0334632ac9a4 Mon Sep 17 00:00:00 2001 From: Ton Huisman Date: Sun, 14 Sep 2025 16:58:24 +0200 Subject: [PATCH 255/564] [P102] Update documentation --- docs/source/Plugin/P102.rst | 7 +++++++ docs/source/Plugin/P102_ResetEnergyDone.png | Bin 13403 -> 15793 bytes src/_P102_PZEM004Tv3.ino | 2 +- 3 files changed, 8 insertions(+), 1 deletion(-) diff --git a/docs/source/Plugin/P102.rst b/docs/source/Plugin/P102.rst index 9d93c1dfb..580305b73 100644 --- a/docs/source/Plugin/P102.rst +++ b/docs/source/Plugin/P102.rst @@ -250,6 +250,13 @@ The command will be executed immediately, and afterward the status will shown: The blue message showing that the command was sent. The **PZEM Mode** is already reset to ``Read value``. +To store this change in settings, the :cyan:`Submit` button should be used once more (you can of course change more settings if desired, that's why no automatic save is done.) + +Send the ``resetenergy,`` command +^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ + +For an easy alternative to reset the Energy counter, you can use the ``resetenergy,`` command, f.e. from the ``Command`` field on the Tools page, to reset the counter for the specific modbus address (range 1..247, or 0 if only 1 device is on the bus). + Installing multiple PZEM units on a single ESP ---------------------------------------------- diff --git a/docs/source/Plugin/P102_ResetEnergyDone.png b/docs/source/Plugin/P102_ResetEnergyDone.png index c5d3f366e5c07379dde01d67a5549bd3b03d3b57..84183a0b2ad32d758be336ef57ebfb835bac553e 100644 GIT binary patch literal 15793 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 HECc=z*+GB~ literal 13403 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 J+
    Energy reset on current PZEM ! ")); - addHtml(F("
    Click Submit button once more to save 'Read value' PZEM Mode!    ")); + addHtml(F("
    Click Submit button once more to save 'Read value' PZEM Mode !    ")); P102_PZEM_ADDR_SET = 0; // Reset programming confirmation } From 1f5cbc461dd529a0429e68ac727a5ad749cf1edd Mon Sep 17 00:00:00 2001 From: Ton Huisman Date: Mon, 15 Sep 2025 21:17:36 +0200 Subject: [PATCH 256/564] [Info] Emphasize the number of flash writes count since cold boot #3116 --- src/src/WebServer/SysInfoPage.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/src/WebServer/SysInfoPage.cpp b/src/src/WebServer/SysInfoPage.cpp index 0ffd9b76d..cd78abb4b 100644 --- a/src/src/WebServer/SysInfoPage.cpp +++ b/src/src/WebServer/SysInfoPage.cpp @@ -760,7 +760,7 @@ void handle_sysinfo_Storage() { addRowLabel(LabelType::FLASH_WRITE_COUNT); addHtml(strformat( - F("%d daily / %d boot"), + F("%d daily / %d cold boot"), RTC.flashDayCounter, static_cast(RTC.flashCounter))); From 24a14e8e2dc12358a3d14291559eb2bdcb266020 Mon Sep 17 00:00:00 2001 From: Ton Huisman Date: Mon, 15 Sep 2025 22:35:32 +0200 Subject: [PATCH 257/564] [C011] HTTP Advanced - Don't URL-encode header --- src/_C011.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/_C011.cpp b/src/_C011.cpp index c29756c32..679e8be26 100644 --- a/src/_C011.cpp +++ b/src/_C011.cpp @@ -305,7 +305,7 @@ boolean Create_schedule_HTTP_C011(struct EventStruct *event) } ReplaceTokenByValue(element.uri, event, false); - ReplaceTokenByValue(element.header, event, false); + ReplaceTokenByValue(element.header, event, true); // Header shouldn't be URL-encoded https://github.com/letscontrolit/ESPEasy/issues/4819 if (element.postStr.length() > 0) { From 6bbb2087bde609ad3ab862e77748c2a684510b99 Mon Sep 17 00:00:00 2001 From: TD-er Date: Thu, 18 Sep 2025 15:32:45 +0200 Subject: [PATCH 258/564] [SysVars] Fix showing variables with hex number as index --- src/src/Helpers/SystemVariables.cpp | 12 +++++++----- src/src/WebServer/SysVarPage.cpp | 8 +++++--- 2 files changed, 12 insertions(+), 8 deletions(-) diff --git a/src/src/Helpers/SystemVariables.cpp b/src/src/Helpers/SystemVariables.cpp index a7b131da0..9ee36411d 100644 --- a/src/src/Helpers/SystemVariables.cpp +++ b/src/src/Helpers/SystemVariables.cpp @@ -303,11 +303,13 @@ bool parse_pct_v_num_pct(String& s, boolean useURLencode, int start_pos) const int pos_closing_pct = s.indexOf('%', v_index + 1); const String arg = s.substring(v_index + 2 + (isv_ ? 1 : 0), pos_closing_pct); String valArg(arg); - constexpr int64_t errorvalue = -1; - const int64_t i = CalculateParam(arg, errorvalue); - // addLog(LOG_LEVEL_INFO, strformat(F("s: '%s', calc parse: %s => %d"), s.c_str(), arg.c_str(), i)); - if (i != errorvalue) { // We're calculating a numeric index like %v=1+%v2%%, so have to use the result for the value - valArg = ll2String(i); + if (!isv_) { + constexpr int64_t errorvalue = -1; + const int64_t i = CalculateParam(arg, errorvalue); + // addLog(LOG_LEVEL_INFO, strformat(F("s: '%s', calc parse: %s => %d"), s.c_str(), arg.c_str(), i)); + if (i != errorvalue) { // We're calculating a numeric index like %v=1+%v2%%, so have to use the result for the value + valArg = ll2String(i); + } } // Need to replace the entire arg diff --git a/src/src/WebServer/SysVarPage.cpp b/src/src/WebServer/SysVarPage.cpp index ea7421e95..fae507395 100644 --- a/src/src/WebServer/SysVarPage.cpp +++ b/src/src/WebServer/SysVarPage.cpp @@ -60,10 +60,12 @@ void handle_sysvars() { html_TD(); html_TD(); } else { - uint32_t tmpVar{}; - for (auto it = customFloatVar.begin(); it != customFloatVar.end(); ++it) { - const bool isv_ = !validUIntFromString(it->first, tmpVar); + NumericalType detectedType; + bool isv_ = true; + if (getNumerical(it->first, NumericalType::HexadecimalUInt, detectedType).length() > 0) { + isv_ = detectedType != NumericalType::Integer; + } addSysVar_html(strformat(F("%%%s%s%%"), FsP(isv_ ? F("v_") : F("v")), it->first.c_str()), false); } } From 43b42bb5e72d3cb18d08d7a61e6784541c7dd561 Mon Sep 17 00:00:00 2001 From: TD-er Date: Thu, 18 Sep 2025 15:35:05 +0200 Subject: [PATCH 259/564] [MFRC522] Add immediate event on tag removal --- src/_P111_RC522_RFID.ino | 2 + src/src/PluginStructs/P111_data_struct.cpp | 166 +++++++++++---------- 2 files changed, 90 insertions(+), 78 deletions(-) diff --git a/src/_P111_RC522_RFID.ino b/src/_P111_RC522_RFID.ino index 93a9cb0d1..20ee7c320 100644 --- a/src/_P111_RC522_RFID.ino +++ b/src/_P111_RC522_RFID.ino @@ -6,6 +6,8 @@ // ####################################################################################################### /** Changelog: + * 2025-09-12 TD-er: Add support for 7-byte UID + * 2025-08-20 TD-er: Speed-up reading + send immediate event * 2025-06-14 tonhuisman: Add support for Custom Value Type per task value * 2025-01-12 tonhuisman: Add support for MQTT AutoDiscovery (not supported for RFID) * Update changelog diff --git a/src/src/PluginStructs/P111_data_struct.cpp b/src/src/PluginStructs/P111_data_struct.cpp index 7d526ae77..821b38605 100644 --- a/src/src/PluginStructs/P111_data_struct.cpp +++ b/src/src/PluginStructs/P111_data_struct.cpp @@ -29,12 +29,12 @@ P111_data_struct::~P111_data_struct() { void P111_data_struct::init() { delete mfrc522; - mfrc522 = new (std::nothrow) MFRC522(_csPin, _rstPin); // Instantiate a MFRC522 + mfrc522 = new (std::nothrow) MFRC522(_csPin, _rstPin); // Instantiate a MFRC522 if (mfrc522 != nullptr) { - mfrc522->PCD_Init(); // Initialize MFRC522 reader + mfrc522->PCD_Init(); // Initialize MFRC522 reader mfrc522->PCD_WriteRegister(MFRC522::ComIEnReg, 0b10100000); // enable receiver interrupt - mfrc522->PCD_WriteRegister(MFRC522::DivIEnReg, 0x80); // Set as CMOS output pin + mfrc522->PCD_WriteRegister(MFRC522::DivIEnReg, 0x80); // Set as CMOS output pin initPhase = P111_initPhases::Ready; if (validGpio(_irqPin)) { @@ -63,7 +63,8 @@ uint8_t P111_data_struct::readCardStatus(uint64_t *key, error = readPassiveTargetID(uid, &uidLength); - switch (error) { + switch (error) + { case P111_ERROR_READ: // Read error { errorCount++; @@ -111,9 +112,7 @@ uint8_t P111_data_struct::readCardStatus(uint64_t *key, /** * Returns last read card (type) name */ -String P111_data_struct::getCardName() { - return mfrc522->PICC_GetTypeName(mfrc522->PICC_GetType(mfrc522->uid.sak)); -} +String P111_data_struct::getCardName() { return mfrc522->PICC_GetTypeName(mfrc522->PICC_GetType(mfrc522->uid.sak)); } /*********************************************************************************************\ * MFRC522 init @@ -130,13 +129,13 @@ String P111_data_struct::getCardName() { * - phase = Ready * - exit true, assuming initialization succeeds \*********************************************************************************************/ -bool P111_data_struct::reset(int8_t csPin, - int8_t resetPin) { +bool P111_data_struct::reset(int8_t csPin, + int8_t resetPin) { if ((resetPin != -1) && (initPhase == P111_initPhases::Ready)) { if (loglevelActiveFor(LOG_LEVEL_INFO)) { addLogMove( - LOG_LEVEL_INFO, + LOG_LEVEL_INFO, concat(F("MFRC522: Reset on pin: "), resetPin)); } @@ -163,9 +162,9 @@ bool P111_data_struct::reset(int8_t csPin, pinMode(csPin, OUTPUT); digitalWrite(csPin, LOW); - mfrc522->PCD_Init(csPin, resetPin); // Init MFRC522 module + mfrc522->PCD_Init(csPin, resetPin); // Init MFRC522 module mfrc522->PCD_WriteRegister(MFRC522::ComIEnReg, 0b10100000); // enable receiver interrupt - mfrc522->PCD_WriteRegister(MFRC522::DivIEnReg, 0x80); // Set as CMOS output pin + mfrc522->PCD_WriteRegister(MFRC522::DivIEnReg, 0x80); // Set as CMOS output pin // If you set Antenna Gain to Max it will increase reading distance mfrc522->PCD_SetAntennaGain(mfrc522->RxGain_max); @@ -234,33 +233,30 @@ uint8_t P111_data_struct::readPassiveTargetID(uint8_t *uid, *uidLength = mfrc522->uid.size; - #ifndef BUILD_NO_DEBUG + # ifndef BUILD_NO_DEBUG + if (loglevelActiveFor(LOG_LEVEL_DEBUG)) { PrintToString p2str; mfrc522->PICC_DumpToSerial(&(mfrc522->uid), p2str); + if (p2str.length()) { addLog(LOG_LEVEL_DEBUG, concat(F("MFRC522: "), p2str.get())); } } - #endif + # endif // ifndef BUILD_NO_DEBUG mfrc522->PICC_HaltA(); // Stop reading return P111_NO_ERROR; } -void P111_data_struct::mfrc522_interrupt(P111_data_struct * self) -{ - self->_irq_pin_time_micros = getMicros64(); -} +void P111_data_struct::mfrc522_interrupt(P111_data_struct *self) { self->_irq_pin_time_micros = getMicros64(); } /********************************************************************************************* * Handle regular read and reset processing ********************************************************************************************/ -bool P111_data_struct::plugin_ten_per_second(struct EventStruct *event) { - return loop(event); -} +bool P111_data_struct::plugin_ten_per_second(struct EventStruct *event) { return loop(event); } bool P111_data_struct::loop(struct EventStruct *event) { bool success = false; @@ -274,11 +270,11 @@ bool P111_data_struct::loop(struct EventStruct *event) { return success; } - counter++; // This variable replaces a static variable in the original implementation - const bool ComIrqReg_bits = (mfrc522->PCD_ReadRegister(MFRC522::ComIrqReg) & (1<<5)) != 0; + counter++; // This variable replaces a static variable in the original implementation + const bool ComIrqReg_bits = (mfrc522->PCD_ReadRegister(MFRC522::ComIrqReg) & (1 << 5)) != 0; mfrc522->PCD_WriteRegister(MFRC522::ComIrqReg, 0x34); - if (counter >= 5 || ComIrqReg_bits) { // Only every 3rd 0.1 second we do a read + if ((counter >= 5) || ComIrqReg_bits) { // Only every 3rd 0.1 second we do a read counter = 0; uint64_t key = P111_NO_KEY; @@ -286,12 +282,12 @@ bool P111_data_struct::loop(struct EventStruct *event) { const uint8_t error = readCardStatus(&key, &removedTag); if (error == P111_NO_ERROR) { -#if FEATURE_EXTENDED_TASK_VALUE_TYPES +# if FEATURE_EXTENDED_TASK_VALUE_TYPES const uint64_t old_key = UserVar.getUint64(event->TaskIndex, 0); -#else +# else const uint64_t old_key = UserVar.getSensorTypeLong(event->TaskIndex, 0); -#endif - bool new_key = false; +# endif // if FEATURE_EXTENDED_TASK_VALUE_TYPES + bool new_key = false; # ifdef P111_USE_REMOVAL @@ -300,56 +296,66 @@ bool P111_data_struct::loop(struct EventStruct *event) { } # endif // P111_USE_REMOVAL - if ((old_key != key) && (key != P111_NO_KEY)) { -#if FEATURE_EXTENDED_TASK_VALUE_TYPES - UserVar.setUint64(event->TaskIndex, 0, key); -#else - UserVar.setSensorTypeLong(event->TaskIndex, 0, key); -#endif - new_key = true; - if (Settings.UseRules) - { - // Event values: - // - Full tag UID - // - Least significant 32 bit (byte 0 .. 3) - // - Extra bytes of 7-byte UID (byte 4 .. 6) - // - Extra bytes of 10-byte UID (byte 7 .. 9) + if (old_key != key) { + if (key != P111_NO_KEY) { +# if FEATURE_EXTENDED_TASK_VALUE_TYPES + UserVar.setUint64(event->TaskIndex, 0, key); +# else + UserVar.setSensorTypeLong(event->TaskIndex, 0, key); +# endif // if FEATURE_EXTENDED_TASK_VALUE_TYPES + new_key = true; - // TODO TD-er: No support yet for 10 byte UIDs + if (Settings.UseRules) + { + // Event values: + // - Full tag UID + // - Least significant 32 bit (byte 0 .. 3) + // - Extra bytes of 7-byte UID (byte 4 .. 6) + // - Extra bytes of 10-byte UID (byte 7 .. 9) + // TODO TD-er: No support yet for 10 byte UIDs + + // TD-er: Process event of read key now. + rulesProcessing(strformat( + F("%s#taguid=%s,%s,%s"), + getTaskDeviceName(event->TaskIndex).c_str(), + formatULLtoHex(key, 1).c_str(), + formatToHex(static_cast(key & 0xFFFFFFFF), 1).c_str(), + formatToHex(static_cast((key >> 32) & 0xFFFFFF), 1).c_str()) + ); + } + + + if (loglevelActiveFor(LOG_LEVEL_INFO) && (key != P111_NO_KEY)) { + String log = F("MFRC522: "); + + if (new_key) { + log += F("New Tag: "); + } else { + log += F("Old Tag: "); + } + log += formatULLtoHex_decimal(key); + + if (!removedTag) { + log += F(" card: "); + log += getCardName(); + } + addLogMove(LOG_LEVEL_INFO, log); + } + + if (new_key && !removedTag) { // Removal event sent from PLUGIN_TIMER_IN, if any + sendData(event); + } + Scheduler.setPluginTaskTimer(P111_REMOVALTIMEOUT, event->TaskIndex, event->Par1); + success = true; + } + if (removedTag && Settings.UseRules) { // TD-er: Process event of read key now. - rulesProcessing(strformat( - F("%s#taguid=%s,%s,%s"), - getTaskDeviceName(event->TaskIndex).c_str(), - formatULLtoHex(key, 1).c_str(), - formatToHex(static_cast(key & 0xFFFFFFFF), 1).c_str(), - formatToHex(static_cast((key >> 32) & 0xFFFFFF), 1).c_str()) - ); + rulesProcessing(concat( + getTaskDeviceName(event->TaskIndex), + F("#tagremoved"))); } } - - if (loglevelActiveFor(LOG_LEVEL_INFO) && (key != P111_NO_KEY)) { - String log = F("MFRC522: "); - - if (new_key) { - log += F("New Tag: "); - } else { - log += F("Old Tag: "); - } - log += formatULLtoHex_decimal(key); - - if (!removedTag) { - log += F(" card: "); - log += getCardName(); - } - addLogMove(LOG_LEVEL_INFO, log); - } - - if (new_key && !removedTag) { // Removal event sent from PLUGIN_TIMER_IN, if any - sendData(event); - } - Scheduler.setPluginTaskTimer(P111_REMOVALTIMEOUT, event->TaskIndex, event->Par1); - success = true; } } return success; @@ -375,24 +381,29 @@ bool P111_data_struct::plugin_fifty_per_second(struct EventStruct *event) { } } } + if (_irq_pin_time_micros > _last_served_irq_pin_time_micros) { _last_served_irq_pin_time_micros = _irq_pin_time_micros; - //addLog(LOG_LEVEL_INFO, F("P111: acting on interrupt")); + + // addLog(LOG_LEVEL_INFO, F("P111: acting on interrupt")); loop(event); } return true; } - String P111_data_struct::PCD_getVersion(uint8_t& v) { v = 0xFF; + if (mfrc522) { v = mfrc522->PCD_ReadRegister(MFRC522::VersionReg); - if (v != 0xFF && v != 0) { + + if ((v != 0xFF) && (v != 0)) { // Human readable version. String res = concat(formatToHex(v, 2), F(" = ")); - switch(v) { + + switch (v) + { case 0xb2: res += F("FM17522_1"); break; @@ -424,5 +435,4 @@ String P111_data_struct::PCD_getVersion(uint8_t& v) { return EMPTY_STRING; } - #endif // ifdef USES_P111 From 5135dfc446592bb950462d4c53693b70b769c0ce Mon Sep 17 00:00:00 2001 From: TD-er Date: Thu, 18 Sep 2025 15:36:24 +0200 Subject: [PATCH 260/564] [LAN867x] Add support for LAN867x Ethernet controller (RMII) --- platformio_core_defs.ini | 8 ++++---- src/ESPEasy/net/DataTypes/EthernetParameters.cpp | 9 +++++++++ src/ESPEasy/net/DataTypes/EthernetParameters.h | 3 +++ src/ESPEasy/net/_NW003_ETH_RMII.cpp | 6 ++++++ src/ESPEasy/net/_NW004_ETH_SPI.cpp | 6 ++++++ src/src/WebServer/HardwarePage.cpp | 9 ++++++++- 6 files changed, 36 insertions(+), 5 deletions(-) diff --git a/platformio_core_defs.ini b/platformio_core_defs.ini index 0f43fe666..570c5da13 100644 --- a/platformio_core_defs.ini +++ b/platformio_core_defs.ini @@ -164,15 +164,15 @@ extra_scripts = ${esp82xx_common.extra_scripts} ; ESP_IDF 5.5.0 [core_esp32_IDF5_5_0__3_2_0_LittleFS] -platform = https://github.com/Jason2866/platform-espressif32.git#0b2bdf30cd0744b0b37907ee022ee7e30bb8f8bc -;platform = https://github.com/Jason2866/platform-espressif32.git#Arduino/IDF55 -platform_packages = framework-arduinoespressif32 @ https://github.com/Jason2866/esp32-arduino-lib-builder/releases/download/0209-1054-5.5/framework-arduinoespressif32-release_v5.5-717d5bca.zip +platform = https://github.com/Jason2866/platform-espressif32.git#Arduino/IDF55_gcc15 +platform_packages = framework-arduinoespressif32 @ https://github.com/Jason2866/esp32-arduino-lib-builder/releases/download/1609-1652-5.5/framework-arduinoespressif32-release_v5.5-a942e2d1.tar.xz build_flags = -DESP32_STAGE -DESP_IDF_VERSION_MAJOR=5 -DLIBRARIES_NO_LOG=1 -DDISABLE_SC16IS752_SPI ; -DCONFIG_PM_ENABLE=0 - -DETH_TYPE_JL1101_SUPPORTED + -DETH_TYPE_JL1101_SUPPORTED=1 + -DETH_PHY_LAN867X_SUPPORTED=1 ; PR_9453_FLUSH_TO_CLEAR_REVERTED -DPR_9453_FLUSH_TO_CLEAR=clear ; -DCONFIG_LWIP_L2_TO_L3_COPY diff --git a/src/ESPEasy/net/DataTypes/EthernetParameters.cpp b/src/ESPEasy/net/DataTypes/EthernetParameters.cpp index 26b9ae020..717d1e2d1 100644 --- a/src/ESPEasy/net/DataTypes/EthernetParameters.cpp +++ b/src/ESPEasy/net/DataTypes/EthernetParameters.cpp @@ -10,6 +10,9 @@ bool isValid(EthPhyType_t phyType) { { # if CONFIG_ETH_USE_ESP32_EMAC && FEATURE_ETHERNET case EthPhyType_t::LAN8720: +# if ETH_PHY_LAN867X_SUPPORTED + case EthPhyType_t::LAN867X: +# endif case EthPhyType_t::TLK110: case EthPhyType_t::RTL8201: # if ETH_TYPE_JL1101_SUPPORTED @@ -62,6 +65,9 @@ eth_phy_type_t to_ESP_phy_type(EthPhyType_t phyType) { # if CONFIG_ETH_USE_ESP32_EMAC && FEATURE_ETHERNET case EthPhyType_t::LAN8720: return ETH_PHY_LAN8720; +# if ETH_PHY_LAN867X_SUPPORTED + case EthPhyType_t::LAN867X: return ETH_PHY_LAN867X; +# endif case EthPhyType_t::TLK110: return ETH_PHY_TLK110; case EthPhyType_t::RTL8201: return ETH_PHY_RTL8201; # if ETH_TYPE_JL1101_SUPPORTED @@ -94,6 +100,9 @@ const __FlashStringHelper* toString(EthPhyType_t phyType) { { # if CONFIG_ETH_USE_ESP32_EMAC && FEATURE_ETHERNET case EthPhyType_t::LAN8720: return F("LAN8710 / LAN8720"); +# if ETH_PHY_LAN867X_SUPPORTED + case EthPhyType_t::LAN867X: return F("LAN867X"); +# endif case EthPhyType_t::TLK110: return F("TLK110 / IP101"); case EthPhyType_t::RTL8201: return F("RTL8201"); # if ETH_TYPE_JL1101_SUPPORTED diff --git a/src/ESPEasy/net/DataTypes/EthernetParameters.h b/src/ESPEasy/net/DataTypes/EthernetParameters.h index 15e5ac3ac..2481818fc 100644 --- a/src/ESPEasy/net/DataTypes/EthernetParameters.h +++ b/src/ESPEasy/net/DataTypes/EthernetParameters.h @@ -64,6 +64,9 @@ enum class EthPhyType_t : uint8_t { DP83848 = 4, KSZ8041 = 5, KSZ8081 = 6, +# if ETH_PHY_LAN867X_SUPPORTED + LAN867X = 7, +# endif # endif // if CONFIG_ETH_USE_ESP32_EMAC && FEATURE_ETHERNET # if ESP_IDF_VERSION_MAJOR >= 5 # if CONFIG_ETH_SPI_ETHERNET_DM9051 diff --git a/src/ESPEasy/net/_NW003_ETH_RMII.cpp b/src/ESPEasy/net/_NW003_ETH_RMII.cpp index 25f92c756..67c0242e8 100644 --- a/src/ESPEasy/net/_NW003_ETH_RMII.cpp +++ b/src/ESPEasy/net/_NW003_ETH_RMII.cpp @@ -156,6 +156,9 @@ bool NWPlugin_003(NWPlugin::Function function, EventStruct *event, String& strin # if CONFIG_ETH_USE_ESP32_EMAC && FEATURE_ETHERNET toString(EthPhyType_t::LAN8720), +# if ETH_PHY_LAN867X_SUPPORTED + toString(ESPEasy::net::EthPhyType_t::LAN867X), +# endif toString(EthPhyType_t::TLK110), toString(EthPhyType_t::RTL8201), # if ETH_TYPE_JL1101_SUPPORTED @@ -183,6 +186,9 @@ bool NWPlugin_003(NWPlugin::Function function, EventStruct *event, String& strin # if CONFIG_ETH_USE_ESP32_EMAC && FEATURE_ETHERNET static_cast(EthPhyType_t::LAN8720), +# if ETH_PHY_LAN867X_SUPPORTED + static_cast(ESPEasy::net::EthPhyType_t::LAN867X), +# endif static_cast(EthPhyType_t::TLK110), static_cast(EthPhyType_t::RTL8201), # if ETH_TYPE_JL1101_SUPPORTED diff --git a/src/ESPEasy/net/_NW004_ETH_SPI.cpp b/src/ESPEasy/net/_NW004_ETH_SPI.cpp index 9555f5bc3..dfb1c7c6e 100644 --- a/src/ESPEasy/net/_NW004_ETH_SPI.cpp +++ b/src/ESPEasy/net/_NW004_ETH_SPI.cpp @@ -161,6 +161,9 @@ bool NWPlugin_004(NWPlugin::Function function, EventStruct *event, String& strin # if CONFIG_ETH_USE_ESP32_EMAC && FEATURE_ETHERNET toString(EthPhyType_t::LAN8720), +# if ETH_PHY_LAN867X_SUPPORTED + toString(ESPEasy::net::EthPhyType_t::LAN867X), +# endif toString(EthPhyType_t::TLK110), toString(EthPhyType_t::RTL8201), # if ETH_TYPE_JL1101_SUPPORTED @@ -188,6 +191,9 @@ bool NWPlugin_004(NWPlugin::Function function, EventStruct *event, String& strin # if CONFIG_ETH_USE_ESP32_EMAC && FEATURE_ETHERNET static_cast(EthPhyType_t::LAN8720), +# if ETH_PHY_LAN867X_SUPPORTED + static_cast(ESPEasy::net::EthPhyType_t::LAN867X), +# endif static_cast(EthPhyType_t::TLK110), static_cast(EthPhyType_t::RTL8201), # if ETH_TYPE_JL1101_SUPPORTED diff --git a/src/src/WebServer/HardwarePage.cpp b/src/src/WebServer/HardwarePage.cpp index 57d9248d0..f2bb6f4fd 100644 --- a/src/src/WebServer/HardwarePage.cpp +++ b/src/src/WebServer/HardwarePage.cpp @@ -348,7 +348,11 @@ void handle_hardware() { toString(ESPEasy::net::EthPhyType_t::notSet), # if CONFIG_ETH_USE_ESP32_EMAC && FEATURE_ETHERNET - toString(ESPEasy::net::EthPhyType_t::LAN8720), + toString(ESPEasy::net::EthPhyType_t::LAN8720), +# if ETH_PHY_LAN867X_SUPPORTED + toString(ESPEasy::net::EthPhyType_t::LAN867X), +# endif + toString(ESPEasy::net::EthPhyType_t::TLK110), toString(ESPEasy::net::EthPhyType_t::RTL8201), #if ETH_TYPE_JL1101_SUPPORTED @@ -376,6 +380,9 @@ void handle_hardware() { # if CONFIG_ETH_USE_ESP32_EMAC && FEATURE_ETHERNET static_cast(ESPEasy::net::EthPhyType_t::LAN8720), +# if ETH_PHY_LAN867X_SUPPORTED + static_cast(ESPEasy::net::EthPhyType_t::LAN867X), +# endif static_cast(ESPEasy::net::EthPhyType_t::TLK110), static_cast(ESPEasy::net::EthPhyType_t::RTL8201), #if ETH_TYPE_JL1101_SUPPORTED From 927e7fd1029807595af34324f50eebc8d342d2e8 Mon Sep 17 00:00:00 2001 From: TD-er Date: Fri, 19 Sep 2025 00:13:24 +0200 Subject: [PATCH 261/564] [Network] Exit all networks before reboot --- src/ESPEasy/net/Globals/NWPlugins.cpp | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/src/ESPEasy/net/Globals/NWPlugins.cpp b/src/ESPEasy/net/Globals/NWPlugins.cpp index 919abbc3c..16f324638 100644 --- a/src/ESPEasy/net/Globals/NWPlugins.cpp +++ b/src/ESPEasy/net/Globals/NWPlugins.cpp @@ -68,6 +68,12 @@ bool NWPluginCall(NWPlugin::Function Function, EventStruct *event, String& str) Function != NWPlugin::Function::NWPLUGIN_WRITE && Function != NWPlugin::Function::NWPLUGIN_WEBSERVER_SHOULD_RUN; + if (Function == NWPlugin::Function::NWPLUGIN_EXIT_ALL) { + // Called before shutdown, so must immediately exit network adapters + // Especially PPP modem may no longer respond if not turned off properly before reboot + Function = NWPlugin::Function::NWPLUGIN_EXIT; + } + for (networkIndex_t x = 0; x < NETWORK_MAX; x++) { const bool checkedEnabled = Settings.getNetworkEnabled(x) || @@ -76,8 +82,6 @@ bool NWPluginCall(NWPlugin::Function Function, EventStruct *event, String& str) if (Settings.getNWPluginID_for_network(x) && checkedEnabled) { if (Function == NWPlugin::Function::NWPLUGIN_INIT_ALL) { Scheduler.setNetworkInitTimer(Settings.getNetworkInterfaceStartupDelayAtBoot(x), x); - } else if (Function == NWPlugin::Function::NWPLUGIN_EXIT_ALL) { - Scheduler.setNetworkExitTimer(Settings.getNetworkInterfaceStartupDelayAtBoot(x), x); } else { event->NetworkIndex = x; String command; From d54fbe1ce7073435b9b9521297676b3b477857b5 Mon Sep 17 00:00:00 2001 From: Ton Huisman Date: Fri, 19 Sep 2025 21:52:32 +0200 Subject: [PATCH 262/564] [HTTP] Add support for TLS --- src/src/Commands/HTTP.cpp | 88 +++++++++++++++---- src/src/Commands/HTTP.h | 15 +++- src/src/Commands/InternalCommands.cpp | 9 ++ src/src/Commands/InternalCommands_decoder.cpp | 9 ++ src/src/Commands/InternalCommands_decoder.h | 9 ++ src/src/CustomBuild/define_plugin_sets.h | 27 +++--- src/src/Helpers/Networking.cpp | 75 +++++++++++++++- src/src/Helpers/Networking.h | 10 ++- static/espeasy.js | 4 +- static/espeasy.min.js | 2 +- 10 files changed, 211 insertions(+), 37 deletions(-) diff --git a/src/src/Commands/HTTP.cpp b/src/src/Commands/HTTP.cpp index 5cf27b8c5..5dacf005a 100644 --- a/src/src/Commands/HTTP.cpp +++ b/src/src/Commands/HTTP.cpp @@ -25,7 +25,8 @@ const __FlashStringHelper* httpEmitToHTTP(struct EventStruct *event, const int timeout, const bool waitForAck, const bool useHeader, - const bool useBody) + const bool useBody, + const bool useHttps) { if (NetworkConnected()) { String user, pass, host, file, path, header, postBody; @@ -60,12 +61,8 @@ const __FlashStringHelper* httpEmitToHTTP(struct EventStruct *event, port = port_arg; } else { if (loglevelActiveFor(LOG_LEVEL_ERROR)) { - String log = logIdentifier; - log += F(": Invalid port argument: "); - log += port_arg; - log += F(" will use: "); - log += port; - addLogMove(LOG_LEVEL_ERROR, log); + addLogMove(LOG_LEVEL_ERROR, strformat(F("%s: Invalid port argument: %d will use: %d"), + FsP(logIdentifier), port_arg, port)); } } @@ -88,17 +85,19 @@ const __FlashStringHelper* httpEmitToHTTP(struct EventStruct *event, # ifndef BUILD_NO_DEBUG if (loglevelActiveFor(LOG_LEVEL_DEBUG)) { - String log = logIdentifier; - log += F(": Host: "); - log += host; - log += F(" port: "); - log += port; - log += F(" path: "); - log += path; - addLogMove(LOG_LEVEL_DEBUG, log); + addLogMove(LOG_LEVEL_DEBUG, strformat(F("%s: Host: %s port: %d path: %s"), + FsP(logIdentifier), host.c_str(), port, path.c_str())); } # endif // ifndef BUILD_NO_DEBUG + #if FEATURE_HTTP_TLS + TLS_types tlsType = TLS_types::NoTLS; + if (useHttps) { + tlsType = TLS_types::TLS_insecure; + // TODO: ?Parse Line for type of TLS to use? + } + #endif // if FEATURE_HTTP_TLS + int httpCode = -1; send_via_http( logIdentifier, @@ -112,7 +111,11 @@ const __FlashStringHelper* httpEmitToHTTP(struct EventStruct *event, header, postBody, httpCode, - waitForAck); + waitForAck + #if FEATURE_HTTP_TLS + , tlsType + #endif // if FEATURE_HTTP_TLS + ); if ((httpCode >= 100) && (httpCode < 300)) { return return_command_success_flashstr(); @@ -138,9 +141,26 @@ const __FlashStringHelper* Command_HTTP_SendToHTTP(struct EventStruct *event, co const int timeout = Settings.SendToHttp_ack() ? CONTROLLER_CLIENTTIMEOUT_MAX : 1000; - return httpEmitToHTTP(event, F("SendToHTTP"), F("GET"), Line, timeout, Settings.SendToHttp_ack(), false, false); + return httpEmitToHTTP(event, F("SendToHTTP"), F("GET"), Line, timeout, Settings.SendToHttp_ack(), false, false, false); } +#if FEATURE_HTTP_TLS + +// syntax 1: SendToHttpS,<[:@],, +// syntax 2: SendToHttpS,http://<[:@][:]/ +const __FlashStringHelper* Command_HTTP_SendToHTTPS(struct EventStruct *event, const char *Line) +{ + // Some servers don't give an ack. + // For these it is adviced to uncheck to wait for an acknowledgement. + // However the default timeout of 4000 msec is then way too long + // FIXME TD-er: Make sendToHttp timeout a setting. + const int timeout = Settings.SendToHttp_ack() + ? CONTROLLER_CLIENTTIMEOUT_MAX : 1000; + + return httpEmitToHTTP(event, F("SendToHTTPS"), F("GET"), Line, timeout, Settings.SendToHttp_ack(), false, false, true); +} +#endif // if FEATURE_HTTP_TLS + #endif // FEATURE_SEND_TO_HTTP #if FEATURE_POST_TO_HTTP @@ -154,9 +174,24 @@ const __FlashStringHelper* Command_HTTP_PostToHTTP(struct EventStruct *event, co // FIXME tonhuisman: make PostToHttp_ack a setting, using SendToHttp_ack for now... - return httpEmitToHTTP(event, F("PostToHTTP"), F("POST"), Line, timeout, Settings.SendToHttp_ack(), true, true); + return httpEmitToHTTP(event, F("PostToHTTP"), F("POST"), Line, timeout, Settings.SendToHttp_ack(), true, true, false); } +#if FEATURE_HTTP_TLS + +// syntax 1: PostToHttpS,<[:@],,,
    , +// syntax 2: PostToHttpS,http://<[:@][:]/,
    , +const __FlashStringHelper* Command_HTTP_PostToHTTPS(struct EventStruct *event, const char *Line) +{ + // FIXME tonhuisman: Make postToHttp timeout a setting, now using a somewhat sensible default + const int timeout = CONTROLLER_CLIENTTIMEOUT_MAX; + + // FIXME tonhuisman: make PostToHttp_ack a setting, using SendToHttp_ack for now... + + return httpEmitToHTTP(event, F("PostToHTTPS"), F("POST"), Line, timeout, Settings.SendToHttp_ack(), true, true, true); +} +#endif // if FEATURE_HTTP_TLS + #endif // if FEATURE_POST_TO_HTTP #if FEATURE_PUT_TO_HTTP @@ -170,7 +205,22 @@ const __FlashStringHelper* Command_HTTP_PutToHTTP(struct EventStruct *event, con // FIXME tonhuisman: make PutToHttp_ack a setting, using SendToHttp_ack for now... - return httpEmitToHTTP(event, F("PutToHTTP"), F("PUT"), Line, timeout, Settings.SendToHttp_ack(), true, true); + return httpEmitToHTTP(event, F("PutToHTTP"), F("PUT"), Line, timeout, Settings.SendToHttp_ack(), true, true, false); } +#if FEATURE_HTTP_TLS + +// syntax 1: PutToHttpS,<[:@],,,
    , +// syntax 2: PutToHttpS,http://<[:@][:]/,
    , +const __FlashStringHelper* Command_HTTP_PutToHTTPS(struct EventStruct *event, const char *Line) +{ + // FIXME tonhuisman: Make putToHttp timeout a setting, now using a somewhat sensible default + const int timeout = CONTROLLER_CLIENTTIMEOUT_MAX; + + // FIXME tonhuisman: make PutToHttp_ack a setting, using SendToHttp_ack for now... + + return httpEmitToHTTP(event, F("PutToHTTPS"), F("PUT"), Line, timeout, Settings.SendToHttp_ack(), true, true, true); +} +#endif // if FEATURE_HTTP_TLS + #endif // if FEATURE_PUT_TO_HTTP diff --git a/src/src/Commands/HTTP.h b/src/src/Commands/HTTP.h index ea1dfdc75..124881324 100644 --- a/src/src/Commands/HTTP.h +++ b/src/src/Commands/HTTP.h @@ -11,19 +11,32 @@ const __FlashStringHelper* httpEmitToHTTP(struct EventStruct *event, const int timeout, const bool waitForAck, const bool useHeader, - const bool useBody); + const bool useBody, + const bool useHttps); #endif // if FEATURE_SEND_TO_HTTP || FEATURE_POST_TO_HTTP || FEATURE_PUT_TO_HTTP #if FEATURE_SEND_TO_HTTP const __FlashStringHelper* Command_HTTP_SendToHTTP(struct EventStruct *event, const char *Line); +#if FEATURE_HTTP_TLS +const __FlashStringHelper* Command_HTTP_SendToHTTPS(struct EventStruct *event, + const char *Line); +#endif // if FEATURE_HTTP_TLS #endif // FEATURE_SEND_TO_HTTP #if FEATURE_POST_TO_HTTP const __FlashStringHelper* Command_HTTP_PostToHTTP(struct EventStruct *event, const char *Line); +#if FEATURE_HTTP_TLS +const __FlashStringHelper* Command_HTTP_PostToHTTPS(struct EventStruct *event, + const char *Line); +#endif // if FEATURE_HTTP_TLS #endif // if FEATURE_POST_TO_HTTP #if FEATURE_PUT_TO_HTTP const __FlashStringHelper* Command_HTTP_PutToHTTP(struct EventStruct *event, const char *Line); +#if FEATURE_HTTP_TLS +const __FlashStringHelper* Command_HTTP_PutToHTTPS(struct EventStruct *event, + const char *Line); +#endif // if FEATURE_HTTP_TLS #endif // if FEATURE_PUT_TO_HTTP #endif // COMMAND_HTTP_H diff --git a/src/src/Commands/InternalCommands.cpp b/src/src/Commands/InternalCommands.cpp index dce54f5a3..ca9528752 100644 --- a/src/src/Commands/InternalCommands.cpp +++ b/src/src/Commands/InternalCommands.cpp @@ -376,6 +376,9 @@ bool InternalCommands::executeInternalCommand() case ESPEasy_cmd_e::password: COMMAND_CASE_R(Command_Settings_Password, 1); // Settings.h #if FEATURE_POST_TO_HTTP case ESPEasy_cmd_e::posttohttp: COMMAND_CASE_A(Command_HTTP_PostToHTTP, -1); // HTTP.h +#if FEATURE_HTTP_TLS + case ESPEasy_cmd_e::posttohttps: COMMAND_CASE_A(Command_HTTP_PostToHTTPS, -1); // HTTP.h +#endif // if FEATURE_HTTP_TLS #endif // if FEATURE_POST_TO_HTTP #if FEATURE_CUSTOM_PROVISIONING case ESPEasy_cmd_e::provision: COMMAND_CASE_A(Command_Provisioning_Dispatcher, -1); // Provisioning.h @@ -399,6 +402,9 @@ bool InternalCommands::executeInternalCommand() #endif // if FEATURE_MQTT #if FEATURE_PUT_TO_HTTP case ESPEasy_cmd_e::puttohttp: COMMAND_CASE_A(Command_HTTP_PutToHTTP, -1); // HTTP.h +#if FEATURE_HTTP_TLS + case ESPEasy_cmd_e::puttohttps: COMMAND_CASE_A(Command_HTTP_PutToHTTPS, -1); // HTTP.h +#endif // if FEATURE_HTTP_TLS #endif // if FEATURE_PUT_TO_HTTP case ESPEasy_cmd_e::pwm: COMMAND_CASE_A(Command_GPIO_PWM, 4); // GPIO.h case ESPEasy_cmd_e::reboot: COMMAND_CASE_A(Command_System_Reboot, 0); // System.h @@ -421,6 +427,9 @@ bool InternalCommands::executeInternalCommand() #endif // if FEATURE_ESPEASY_P2P #if FEATURE_SEND_TO_HTTP case ESPEasy_cmd_e::sendtohttp: COMMAND_CASE_A(Command_HTTP_SendToHTTP, 3); // HTTP.h +#if FEATURE_HTTP_TLS + case ESPEasy_cmd_e::sendtohttps: COMMAND_CASE_A(Command_HTTP_SendToHTTPS, 3); // HTTP.h +#endif // if FEATURE_HTTP_TLS #endif // FEATURE_SEND_TO_HTTP case ESPEasy_cmd_e::sendtoudp: COMMAND_CASE_A(Command_UDP_SendToUPD, 3); // UDP.h case ESPEasy_cmd_e::sendtoudpmix: COMMAND_CASE_A(Command_UDP_SendToUPDMix, 3); // UDP.h diff --git a/src/src/Commands/InternalCommands_decoder.cpp b/src/src/Commands/InternalCommands_decoder.cpp index 0c6115f6e..83d4589a3 100644 --- a/src/src/Commands/InternalCommands_decoder.cpp +++ b/src/src/Commands/InternalCommands_decoder.cpp @@ -167,6 +167,9 @@ const char Internal_commands_p[] PROGMEM = #endif // #ifdef USES_P019 #if FEATURE_POST_TO_HTTP "posttohttp|" +#if FEATURE_HTTP_TLS + "posttohttps|" +#endif // if FEATURE_HTTP_TLS #endif // #if FEATURE_POST_TO_HTTP #if FEATURE_CUSTOM_PROVISIONING "provision|" @@ -188,6 +191,9 @@ const char Internal_commands_p[] PROGMEM = #endif // #if FEATURE_MQTT #if FEATURE_PUT_TO_HTTP "puttohttp|" +#if FEATURE_HTTP_TLS + "puttohttps|" +#endif // if FEATURE_HTTP_TLS #endif // #if FEATURE_PUT_TO_HTTP "pwm|" ; @@ -214,6 +220,9 @@ const char Internal_commands_s[] PROGMEM = #endif // #if FEATURE_ESPEASY_P2P #if FEATURE_SEND_TO_HTTP "sendtohttp|" +#if FEATURE_HTTP_TLS + "sendtohttps|" +#endif // if FEATURE_HTTP_TLS #endif // FEATURE_SEND_TO_HTTP "sendtoudp|" "sendtoudpmix|" diff --git a/src/src/Commands/InternalCommands_decoder.h b/src/src/Commands/InternalCommands_decoder.h index b5c3f5fa3..c5aba34ab 100644 --- a/src/src/Commands/InternalCommands_decoder.h +++ b/src/src/Commands/InternalCommands_decoder.h @@ -137,6 +137,9 @@ enum class ESPEasy_cmd_e : uint8_t { #endif // #ifdef USES_P019 #if FEATURE_POST_TO_HTTP posttohttp, +#if FEATURE_HTTP_TLS + posttohttps, +#endif // if FEATURE_HTTP_TLS #endif // #if FEATURE_POST_TO_HTTP #if FEATURE_CUSTOM_PROVISIONING provision, @@ -158,6 +161,9 @@ enum class ESPEasy_cmd_e : uint8_t { #endif // #if FEATURE_MQTT #if FEATURE_PUT_TO_HTTP puttohttp, +#if FEATURE_HTTP_TLS + puttohttps, +#endif // if FEATURE_HTTP_TLS #endif // #if FEATURE_PUT_TO_HTTP pwm, @@ -178,6 +184,9 @@ enum class ESPEasy_cmd_e : uint8_t { #endif // #if FEATURE_ESPEASY_P2P #if FEATURE_SEND_TO_HTTP sendtohttp, +#if FEATURE_HTTP_TLS + sendtohttps, +#endif // if FEATURE_HTTP_TLS #endif // FEATURE_SEND_TO_HTTP sendtoudp, sendtoudpmix, diff --git a/src/src/CustomBuild/define_plugin_sets.h b/src/src/CustomBuild/define_plugin_sets.h index cd0dc505a..bbb44209e 100644 --- a/src/src/CustomBuild/define_plugin_sets.h +++ b/src/src/CustomBuild/define_plugin_sets.h @@ -1141,6 +1141,7 @@ To create/register a plugin, you have to : #endif #define FEATURE_MQTT_TLS 1 #define FEATURE_EMAIL_TLS 1 + #define FEATURE_HTTP_TLS 1 #ifdef FEATURE_CUSTOM_PROVISIONING #undef FEATURE_CUSTOM_PROVISIONING @@ -2329,6 +2330,9 @@ To create/register a plugin, you have to : #ifndef FEATURE_EMAIL_TLS #define FEATURE_EMAIL_TLS 1 #endif + #ifndef FEATURE_HTTP_TLS + #define FEATURE_HTTP_TLS 1 + #endif // Plugins #ifndef USES_P016 @@ -3116,6 +3120,13 @@ To create/register a plugin, you have to : #endif #endif +#ifndef FEATURE_HTTP_TLS + #if defined(ESP32) && (FEATURE_SEND_TO_HTTP || FEATURE_POST_TO_HTTP || FEATURE_PUT_TO_HTTP) + #define FEATURE_HTTP_TLS 1 + #else + #define FEATURE_HTTP_TLS 0 + #endif +#endif // ifndef FEATURE_HTTP_TLS #ifdef ESP8266 // It just doesn't work on ESP8266, too slow, too high memory requirements @@ -3128,9 +3139,13 @@ To create/register a plugin, you have to : #undef FEATURE_EMAIL_TLS #define FEATURE_EMAIL_TLS 0 #endif + #if FEATURE_HTTP_TLS + #undef FEATURE_HTTP_TLS + #define FEATURE_HTTP_TLS 0 + #endif #endif -#if FEATURE_MQTT_TLS +#if FEATURE_MQTT_TLS || FEATURE_EMAIL_TLS || FEATURE_HTTP_TLS #if defined(FEATURE_TLS) && !FEATURE_TLS #undef FEATURE_TLS #endif @@ -3140,16 +3155,6 @@ To create/register a plugin, you have to : #endif -#if FEATURE_EMAIL_TLS - #if defined(FEATURE_TLS) && !FEATURE_TLS - #undef FEATURE_TLS - #endif - #ifndef FEATURE_TLS - #define FEATURE_TLS 1 - #endif -#endif - - #if !defined(FEATURE_MQTT_DISCOVER) && FEATURE_MQTT #if defined(LIMIT_BUILD_SIZE) || defined(ESP8266) // Must enable this explicitly for ESP8266 Custom build #define FEATURE_MQTT_DISCOVER 0 diff --git a/src/src/Helpers/Networking.cpp b/src/src/Helpers/Networking.cpp index c91a3aaef..809512847 100644 --- a/src/src/Helpers/Networking.cpp +++ b/src/src/Helpers/Networking.cpp @@ -1353,6 +1353,17 @@ String splitURL(const String& fullURL, String& user, String& pass, String& host, return EMPTY_STRING; } + #if FEATURE_HTTP_TLS + if ((starthost > 0) && (port == 80)) { // 'Upgrade' from port 80 to port 443 for HTTPS url + String proto = fullURL.substring(0, starthost - 3); + proto.toLowerCase(); + + if (equals(proto, F("https"))) { + port = 443; + } + } + #endif // if FEATURE_HTTP_TLS + int startfile = fullURL.lastIndexOf('/'); if (startfile >= 0) { @@ -1677,6 +1688,11 @@ int http_authenticate(const String& logIdentifier, return httpCode; } +# if FEATURE_HTTP_TLS +# include +# include "../CustomBuild/Certificate_CA.h" +# endif // if FEATURE_HTTP_TLS + String send_via_http(const String& logIdentifier, uint16_t timeout, const String& user, @@ -1688,13 +1704,60 @@ String send_via_http(const String& logIdentifier, const String& header, const String& postStr, int & httpCode, - bool must_check_reply) { + bool must_check_reply + #if FEATURE_HTTP_TLS + , TLS_types tlsType + #endif // if FEATURE_HTTP_TLS + ) { WiFiClient client; + #if FEATURE_HTTP_TLS + BearSSL::WiFiClientSecure_light *client_secure = nullptr; + if (tlsType != TLS_types::NoTLS) { + client_secure = new (std::nothrow) BearSSL::WiFiClientSecure_light(2048, 2048); + if (nullptr == client_secure) { + return F("HTTPS: Could not create TLS client, out of memory"); + } + client_secure->setUtcTime_fcn(getUnixTime); + client_secure->setCfgTime_fcn(get_build_unixtime); + switch (tlsType) { + case TLS_types::NoTLS: + break; + // TODO: Implement? + // case TLS_types::TLS_PSK: + // case TLS_types::TLS_CA_CLI_CERT: + // break; + case TLS_types::TLS_FINGERPRINT: + // TODO: Implement + addLog(LOG_LEVEL_ERROR, F("HTTPS: TLS_FINGERPRINT Not implemented yet.")); + client_secure->setInsecure(); + break; + case TLS_types::TLS_CA_CERT: + // TODO: Read from filesystem? + client_secure->setTrustAnchor(Tasmota_TA, Tasmota_TA_size); + break; + case TLS_types::TLS_insecure: + client_secure->setInsecure(); + break; + } + # ifdef MUSTFIX_CLIENT_TIMEOUT_IN_SECONDS + + // See: https://github.com/espressif/arduino-esp32/pull/6676 + client_secure->setTimeout((timeout + 500) / 1000); // in seconds!!!! + Client *pClient = client_secure; + pClient->setTimeout(timeout); + # else // ifdef MUSTFIX_CLIENT_TIMEOUT_IN_SECONDS + client_secure->setTimeout(timeout); // in msec as it should be! + # endif // ifdef MUSTFIX_CLIENT_TIMEOUT_IN_SECONDS + } + #endif // if FEATURE_HTTP_TLS HTTPClient http; http.setReuse(false); httpCode = http_authenticate( logIdentifier, + #if FEATURE_HTTP_TLS + tlsType != TLS_types::NoTLS ? *client_secure : + #endif // if FEATURE_HTTP_TLS client, http, timeout, @@ -1718,11 +1781,19 @@ String send_via_http(const String& logIdentifier, } #endif } + http.end(); // http.end() does not call client.stop() if it is no longer connected. // However the client may still keep its internal state which may prevent // future connections to the same host until there has been a connection to another host inbetween. - client.stop(); + client.stop(); + + #if FEATURE_HTTP_TLS + if (nullptr != client_secure) { + client_secure->stop(); + } + #endif // if FEATURE_HTTP_TLS + return response; } #endif // FEATURE_HTTP_CLIENT diff --git a/src/src/Helpers/Networking.h b/src/src/Helpers/Networking.h index ad8e39154..ce682dc47 100644 --- a/src/src/Helpers/Networking.h +++ b/src/src/Helpers/Networking.h @@ -16,6 +16,10 @@ #endif // ifdef ESP32 #endif +#if FEATURE_HTTP_TLS +#include "../DataTypes/TLS_types.h" +#endif // if FEATURE_HTTP_TLS + /*********************************************************************************************\ Syslog client @@ -248,7 +252,11 @@ String send_via_http(const String& logIdentifier, const String& header, const String& postStr, int & httpCode, - bool must_check_reply); + bool must_check_reply + #if FEATURE_HTTP_TLS + , TLS_types tlsType = TLS_types::NoTLS + #endif // if FEATURE_HTTP_TLS + ); #endif // FEATURE_HTTP_CLIENT #if FEATURE_DOWNLOAD diff --git a/static/espeasy.js b/static/espeasy.js index 8a771bbdc..79af6d758 100644 --- a/static/espeasy.js +++ b/static/espeasy.js @@ -6,8 +6,8 @@ var commonAtoms = ["And", "Or"]; var commonKeywords = ["If", "Else", "Elseif", "Endif"]; var commonCommands = ["AccessInfo", "Background", "Build", "ClearAccessBlock", "ClearRTCam", "Config", "ControllerDisable", "ControllerEnable", "DateTime", "Debug", "Dec", "DeepSleep", "DisablePriorityTask", "DNS", "DST", "EraseSDKWiFi", "ExecuteRules", "FactoryReset", "Gateway", "I2Cscanner", "Inc", - "IP", "Let", "LetStr", "Load", "LogEntry", "LogPortStatus", "LoopTimerSet", "LoopTimerSet_ms", "LoopTimerSetAndRun", "LoopTimerSetAndRun_ms", "MemInfo", "MemInfoDetail", "Name", "Password", "PostToHTTP", "Publish", "PublishR", - "Reboot", "Save", "SendTo", "SendToHTTP", "SendToUDP", "SendToUDPMix", "Settings", "Subnet", "Subscribe", "TaskClear", "TaskClearAll", + "IP", "Let", "LetStr", "Load", "LogEntry", "LogPortStatus", "LoopTimerSet", "LoopTimerSet_ms", "LoopTimerSetAndRun", "LoopTimerSetAndRun_ms", "MemInfo", "MemInfoDetail", "Name", "Password", "PostToHTTP", "PostToHTTPS", "Publish", "PublishR", + "PutToHTTP", "PutToHTTPS", "Reboot", "Save", "SendTo", "SendToHTTP", "SendToHTTPS", "SendToUDP", "SendToUDPMix", "Settings", "Subnet", "Subscribe", "TaskClear", "TaskClearAll", "TaskDisable", "TaskEnable", "TaskRun", "TaskValueSet", "TaskValueSetAndRun", "TaskValueSetDerived", "TaskValueSetPresentation", "TimerPause", "TimerResume", "TimerSet", "TimerSet_ms", "TimeZone", "UdpPort", "UdpTest", "Unit", "UseNTP", "WdConfig", "WdRead", "WiFi", "WiFiAllowAP", "WiFiAPMode", "WiFiConnect", "WiFiDisconnect", "WiFiKey", "WiFiKey2", "WiFiMode", "WiFiScan", "WiFiSSID", "WiFiSSID2", "WiFiSTAMode", diff --git a/static/espeasy.min.js b/static/espeasy.min.js index 319337dd0..5cc90bc28 100644 --- a/static/espeasy.min.js +++ b/static/espeasy.min.js @@ -1 +1 @@ -var rEdit,commonAtoms=["And","Or"],commonKeywords=["If","Else","Elseif","Endif"],commonCommands=["AccessInfo","Background","Build","ClearAccessBlock","ClearRTCam","Config","ControllerDisable","ControllerEnable","DateTime","Debug","Dec","DeepSleep","DisablePriorityTask","DNS","DST","EraseSDKWiFi","ExecuteRules","FactoryReset","Gateway","I2Cscanner","Inc","IP","Let","LetStr","Load","LogEntry","LogPortStatus","LoopTimerSet","LoopTimerSet_ms","LoopTimerSetAndRun","LoopTimerSetAndRun_ms","MemInfo","MemInfoDetail","Name","Password","PostToHTTP","Publish","PublishR","Reboot","Save","SendTo","SendToHTTP","SendToUDP","SendToUDPMix","Settings","Subnet","Subscribe","TaskClear","TaskClearAll","TaskDisable","TaskEnable","TaskRun","TaskValueSet","TaskValueSetAndRun","TaskValueSetDerived","TaskValueSetPresentation","TimerPause","TimerResume","TimerSet","TimerSet_ms","TimeZone","UdpPort","UdpTest","Unit","UseNTP","WdConfig","WdRead","WiFi","WiFiAllowAP","WiFiAPMode","WiFiConnect","WiFiDisconnect","WiFiKey","WiFiKey2","WiFiMode","WiFiScan","WiFiSSID","WiFiSSID2","WiFiSTAMode","Event","AsyncEvent","GPIO","GPIOToggle","LongPulse","LongPulse_mS","Monitor","Pulse","PWM","Servo","Status","Tone","RTTTL","UnMonitor","Provision","Provision,Config","Provision,Security","Provision,Notification","Provision,Provision","Provision,Rules,","Provision,CustomCdnUrl","Provision,Firmware,",],commonEvents=["Clock#Time","Login#Failed","MQTT#Connected","MQTT#Disconnected","MQTTimport#Connected","MQTTimport#Disconnected","Rules#Timer","System#Boot","System#BootMode","System#Sleep","System#Wake","TaskExit#","TaskInit#","ThingspeakReply","Time#Initialized","Time#Set","WiFi#APmodeDisabled","WiFi#APmodeEnabled","WiFi#ChangedAccesspoint","WiFi#ChangedWiFichannel","WiFi#Connected","WiFi#Disconnected","ProvisionFirmware",],commonPlugins=["ResetPulseCounter","SetPulseCounterTotal","LogPulseStatistic","analogout","MCPGPIO","MCPGPIOToggle","MCPLongPulse","MCPLongPulse_ms","MCPPulse","Status,MCP","Monitor,MCP","MonitorRange,MCP","UnMonitorRange,MCP","UnMonitor,MCP","MCPGPIORange","MCPGPIOPattern","MCPMode","MCPModeRange","ExtGpio","ExtPwm","ExtPulse","ExtLongPulse","Status,EXT,","LCDCmd","LCD","PCFGPIO","PCFGPIOToggle","PCFLongPulse","PCFLongPulse_ms","PCFPulse","Status,PCF","Monitor,PCF","MonitorRange,PCF","UnMonitorRange,PCF","UnMonitor,PCF","PCFGPIORange","PCFGPIOpattern","PCFMode","PCFmodeRange","SerialSend","SerialSendMix","Ser2NetClientSend","SerialSend_test","pcapwm","pcafrq","mode2","OLED","OLEDCMD","OLEDCMD,on","OLEDCMD,off","OLEDCMD,clear","IRSEND","IRSENDAC","OledFramedCmd","OledFramedCmd,Display","OledFramedCmd,low","OledFramedCmd,med","OledFramedCmd,high","OledFramedCmd,Frame","OledFramedCmd,linecount","OledFramedCmd,leftalign","OledFramedCmd,align","OledFramedCmd,userDef1","OledFramedCmd,userDef2","NeoPixel","NeoPixelAll","NeoPixelLine","NeoPixelHSV","NeoPixelAllHSV","NeoPixelLineHSV","NeoPixelBright","MotorShieldCmd,DCMotor","MotorShieldCmd,Stepper","MHZCalibrateZero","MHZReset","MHZABCEnable","MHZABCDisable","Sensair_SetRelay","PMSX003","PMSX003,Wake","PMSX003,Sleep","PMSX003,Reset","encwrite","Play","Vol","Eq","Mode","Repeat","tareChanA","tareChanB","7dn","7dst","7dsd","7dtext","7ddt","7dt","7dtfont","7dtbin","7don","7doff","7output","HLWCalibrate","HLWReset","csecalibrate","cseclearpulses","csereset","WemosMotorShieldCMD","LolinMotorShieldCMD","GPS","GPS,Sleep","GPS,Wake","GPS#GotFix","GPS#LostFix","GPS#Travelled","homieValueSet","SerialProxy_Write","SerialProxy_WriteMix","SerialProxy_Test","HeatPumpir","MitsubishiHP","MitsubishiHP,temperature","MitsubishiHP,power","MitsubishiHP,mode","MitsubishiHP,fan","MitsubishiHP,vane","MitsubishiHP,widevane","Culreader_Write","Touch","Touch,Rot","Touch,Flip","Touch,Enable","Touch,Disable","Touch,On","Touch,Off","Touch,Toggle","Touch,Setgrp","Touch,Incgrp","Touch,Decgrp","Touch,Incpage","Touch,Decpage","Touch,Updatebutton","WakeOnLan","DotMatrix","DotMatrix,clear","DotMatrix,update","DotMatrix,size","DotMatrix,txt","DotMatrix,settxt","DotMatrix,content","DotMatrix,alignment","DotMatrix,anim.in","DotMatrix,anim.out","DotMatrix,speed","DotMatrix,pause","DotMatrix,font","DotMatrix,layout","DotMatrix,inverted","DotMatrix,specialeffect","DotMatrix,offset","DotMatrix,brightness","DotMatrix,repeat","DotMatrix,setbar","DotMatrix,bar","Thermo","Thermo,Up","Thermo,Down","Thermo,Mode","Thermo,ModeBtn","Thermo,Setpoint","Max1704xclearalert","scdgetabc","scdgetalt","scdgettmp","scdsetcalibration","scdsetfrc","scdgetinterval","multirelay","multirelay,on","multirelay,off","multirelay,set","multirelay,get","multirelay,loop","ShiftOut","ShiftOut,Set","ShiftOut,SetNoUpdate","ShiftOut,Update","ShiftOut,SetAll","ShiftOut,SetAllNoUpdate","ShiftOut,SetAllLow","ShiftOut,SetAllHigh","ShiftOut,SetChipCount","ShiftOut,SetHexBin","cdmrst","nfx","nfx,off","nfx,on","nfx,dim","nfx,line,","nfx,hsvline,","nfx,one,","nfx,hsvone,","nfx,all,","nfx,rgb,","nfx,fade,","nfx,hsv,","nfx,colorfade,","nfx,rainbow","nfx,kitt,","nfx,comet,","nfx,theatre,","nfx,scan,","nfx,dualscan,","nfx,twinkle,","nfx,twinklefade,","nfx,sparkle,","nfx,wipe,","nfx,dualwipe","nfx,fire","nfx,fireflicker","nfx,faketv","nfx,simpleclock","nfx,stop","nfx,statusrequest","nfx,fadetime,","nfx,fadedelay,","nfx,speed,","nfx,count,","nfx,bgcolor","ShiftIn","ShiftIn,PinEvent","ShiftIn,ChipEvent","ShiftIn,SetChipCount","ShiftIn,SampleFrequency","ShiftIn,EventPerPin","scd4x","scd4x,storesettings","scd4x,facoryreset","scd4x,selftest","scd4x,setfrc,","axp","axp,ldo2","axp,ldo3","axp,ldoio","axp,gpio0","axp,gpio1","axp,gpio2","axp,gpio3","axp,gpio4","axp,dcdc2","axp,dcdc3","axp,ldo2map","axp,ldo3map","axp,ldoiomap","axp,dcdc2map","axp,dcdc3map","axp,ldo2perc","axp,ldo3perc","axp,ldoioperc","axp,dcdc2perc","axp,dcdc3perc","I2CEncoder","I2CEncoder,bright","I2CEncoder,led1","I2CEncoder,led2","I2CEncoder,gain","I2CEncoder,set","cachereader","cachereader,readpos","cachereader,sendtaskinfo","cachereader,flush","tm1621","tm1621,write,","tm1621,writerow,","tm1621,voltamp,","tm1621,energy,","tm1621,celcius,","tm1621,fahrenheit,","tm1621,humidity,","tm1621,raw,","dac","dac,1","dac,2","sht4x","sht4x,startup","ld2410","ld2410,factoryreset","ld2410,logall","digipot","digipot,reset","digipot,shutdown","digipot,","7dextra","7dbefore","7dgroup","7digit","7color","7digitcolor","7groupcolor","gp8403","gp8403,volt,","gp8403,mvolt,","gp8403,range,","gp8403,preset,","gp8403,init,","sen5x","sen5x,startclean","sen5x,techlog,","as3935","as3935,clearstats","as3935,calibrate","as3935,setgain,","as3935,setnf,","as3935,setwd,","as3925,setsrej,","lu9685","lu9685,servo,","lu9685,enable,","lu9685,disable,","lu9685,setrange,","geni2c","geni2c,cmd,","geni2c,exec,","geni2c,log,",],pluginDispKind=["tft","ili9341","ili9342","ili9481","ili9486","ili9488","epd","eink","epaper","il3897","uc8151d","ssd1680","ws2in7","ws1in54","st77xx","st7735","st7789","st7796","neomatrix","neo","pcd8544",],pluginDispCmd=["cmd,on","cmd,off","cmd,clear","cmd,backlight","cmd,bright","cmd,deepsleep","cmd,seq_start","cmd,seq_end","cmd,inv","cmd,rot",",clear",",rot",",tpm",",txt",",txp",",txz",",txc",",txs",",txtfull",",asciitable",",font",",l",",lh",",lv",",lm",",lmr",",r",",rf",",c",",cf",",rf",",t",",tf",",rr",",rrf",",px",",pxh",",pxv",",bmp",",btn",",win",",defwin",",delwin",],commonTag=["On","Do","Endon"],commonNumber=["toBin","toHex","Constrain","XOR","AND:","OR:","Ord","bitRead","bitSet","bitClear","bitWrite","urlencode"],commonMath=["Log","Ln","Abs","Exp","Sqrt","Sq","Round","Sin","Cos","Tan","aSin","aCos","aTan","Sin_d","Cos_d","Tan_d","aSin_d","aCos_d","aTan_d","map","mapc"],commonWarning=["delay","Delay","ResetFlashWriteCounter"],taskSpecifics=["settings.Enabled","settings.Interval","settings.ValueCount","settings.Controller1.Enabled","settings.Controller2.Enabled","settings.Controller3.Enabled","settings.Controller1.Idx","settings.Controller2.Idx","settings.Controller3.Idx"],AnythingElse=["%eventvalue%","%eventpar%","%eventname%","%sysname%","%bootcause%","%systime%","%systm_hm%","%systm_hm_0%","%systm_hm_sp%","%systime_am%","%systime_am_0%","%systime_am_sp%","%systm_hm_am%","%systm_hm_am_0%","%systm_hm_am_sp%","%lcltime%","%sunrise%","%s_sunrise%","%m_sunrise%","%sunset%","%s_sunset%","%m_sunset%","%lcltime_am%","%syshour%","%syshour_0%","%sysmin%","%sysmin_0%","%syssec%","%syssec_0%","%sysday%","%sysday_0%","%sysmonth%","%sysmonth_0%","%systzoffset%","%systzoffset_s%","%sysyear%","%sysyear_0%","%sysyears%","%sysweekday%","%sysweekday_s%","%unixtime%","%unixtime_lcl%","%uptime%","%uptime_ms%","%rssi%","%ip%","%unit%","%unit_0%","%ssid%","%bssid%","%wi_ch%","%iswifi%","%vcc%","%mac%","%mac_int%","%isntp%","%ismqtt%","%dns%","%dns1%","%dns2%","%flash_freq%","%flash_size%","%flash_chip_vendor%","%flash_chip_model%","%fs_free%","%fs_size%","%cpu_id%","%cpu_freq%","%cpu_model%","%cpu_rev%","%cpu_cores%","%board_name%","%inttemp%","%islimited_build%","%isvar_double%","substring","lookup","indexOf","indexOf_ci","equals","equals_ci","strtol","timeToMin","timeToSec","%ethwifimode%","%ethconnected%","%ethduplex%","%ethspeed%","%ethstate%","%ethspeedstate%","%c_w_dir%","%c_c2f%","%c_ms2Bft%","%c_dew_th%","%c_alt_pres_sea%","%c_sea_pres_alt%","%c_cm2imp%","%c_isnum%","%c_mm2imp%","%c_m2day%","%c_m2dh%","%c_m2dhm%","%c_s2dhms%","%c_ts2date%","%c_ts2isodate%","%c_ts2wday%","%c_random%","%c_2hex%","%c_u2ip%","%c_uname%","%c_uage%","%c_ubuild%","%c_ubuildstr%","%c_uload%","%c_utype%","%c_utypestr%","%c_strf%","var","int","str","length"];for(const element2 of pluginDispKind)commonPlugins=commonPlugins.concat(element2);for(const element2 of pluginDispKind)for(const element3 of pluginDispCmd){let e=element2+element3;commonPlugins=commonPlugins.concat(e)}var EXTRAWORDS=commonAtoms.concat(commonPlugins,commonKeywords,commonCommands,commonEvents,commonTag,commonNumber,commonMath,commonWarning,taskSpecifics,AnythingElse);function initCM(){CodeMirror.commands.autocomplete=function(e){e.showHint({hint:CodeMirror.hint.anyword})},(rEdit=CodeMirror.fromTextArea(document.getElementById("rules"),{tabSize:2,indentWithTabs:!1,lineNumbers:!0,autoCloseBrackets:!0,extraKeys:{"Ctrl-Space":"autocomplete",Tab(e){"null"===e.getMode().name?e.execCommand("insertTab"):e.somethingSelected()?e.execCommand("indentMore"):e.execCommand("insertSoftTab")},"Shift-Tab":e=>e.execCommand("indentLess")}})).on("change",function(){rEdit.save()}),rEdit.on("inputRead",function(e,t){var n=e.getCursor(),o=e.getTokenAt(n);/[\w%,.]/.test(t.text)&&"comment"!=o.type&&e.showHint({completeSingle:!1})})}!function(e){"object"==typeof exports&&"object"==typeof module?e(require("codemirror")):"function"==typeof define&&define.amd?define(["codemirror"],e):e(CodeMirror)}(function(e){"use strict";e.defineMode("espeasy",function(){var e={};function t(t,n){for(var o=0;oe.toLowerCase());commonCommands=commonCommands.concat(n);var o=commonEvents.map(e=>e.toLowerCase());commonEvents=commonEvents.concat(o);var i=commonPlugins.map(e=>e.toLowerCase());commonPlugins=commonPlugins.concat(i);var a=commonAtoms.map(e=>e.toLowerCase());commonAtoms=commonAtoms.concat(a);var s=commonKeywords.map(e=>e.toLowerCase());commonKeywords=commonKeywords.concat(s);var r=commonTag.map(e=>e.toLowerCase());commonTag=commonTag.concat(r);var c=commonNumber.map(e=>e.toLowerCase());commonNumber=commonNumber.concat(c);var l=commonMath.map(e=>e.toLowerCase());commonMath=commonMath.concat(l);var m=AnythingElse.map(e=>e.toLowerCase());AnythingElse=AnythingElse.concat(m);var d=taskSpecifics.map(e=>e.toLowerCase());function u(t,n){if(t.eatSpace())return null;t.sol();var o=t.next();if(/\d/.test(o)){if("0"==o)return"x"===t.next()?(t.eatWhile(/\w/),"number"):(t.eatWhile(/\d|\./),"number");if(t.eatWhile(/\d|\./),!t.match("d")&&!t.match("output")&&(t.eol()||/\D/.test(t.peek())))return"number"}if(/\w/.test(o))for(let i of EXTRAWORDS){let a=i.substring(1);(i.includes(":")||i.includes(",")||i.includes("."))&&t.match(a)}if(/\w/.test(o)&&(t.eatWhile(/[\w]/),t.match(".gpio")||t.match(".pulse")||t.match(".frq")||t.match(".pwm")))return"def";if("\\"===o)return t.next(),null;if("("===o||")"===o)return"bracket";if("{"===o||"}"===o||":"===o)return"number";if("/"==o)return/\//.test(t.peek())?(t.skipToEnd(),"comment"):"operator";if("'"==o&&(t.eatWhile(/[^']/),t.match("'")))return"attribute";if("+"===o||"="===o||"<"===o||">"===o||"-"===o||","===o||"*"===o||"!"===o)return"operator";if("%"==o){if(/\d/.test(t.next()))return"number";if(t.eatWhile(/[^\s\%]/),t.match("%"))return"hr"}if("["==o&&(t.eatWhile(/[^\s\]]/),t.eat("]")))return"hr";t.eatWhile(/\w/);var s=t.current();return/\w/.test(o)&&t.match("#")?(t.eatWhile(/[\w.#]/),"events"):"#"===o?(t.eatWhile(/\w/),"number"):e.hasOwnProperty(s)?e[s]:null}return taskSpecifics=taskSpecifics.concat(d),t("atom",commonAtoms),t("keyword",commonKeywords),t("builtin",commonCommands),t("events",commonEvents),t("def",commonPlugins),t("tag",commonTag),t("number",commonNumber),t("bracket",commonMath),t("warning",commonWarning),t("hr",AnythingElse),t("comment",taskSpecifics),{startState:function(){return{tokens:[]}},token:function(e,t){var n,o;return n=e,((o=t).tokens[0]||u)(n,o)},closeBrackets:"[]{}''\"\"``()",lineComment:"//",fold:"brace"}})}),function(e){"object"==typeof exports&&"object"==typeof module?e(require("../../lib/codemirror")):"function"==typeof define&&define.amd?define(["../../lib/codemirror"],mod):e(CodeMirror)}(function(e){var t={pairs:"()[]{}''\"\"",closeBefore:")]}'\":;>",triples:"",explode:"[]{}"},n=e.Pos;function o(e,n){return"pairs"==n&&"string"==typeof e?e:"object"==typeof e&&null!=e[n]?e[n]:t[n]}e.defineOption("autoCloseBrackets",!1,function(t,n,s){s&&s!=e.Init&&(t.removeKeyMap(i),t.state.closeBrackets=null),n&&(a(o(n,"pairs")),t.state.closeBrackets=n,t.addKeyMap(i))});var i={Backspace:function t(i){var a=r(i);if(!a||i.getOption("disableInput"))return e.Pass;for(var s=o(a,"pairs"),c=i.listSelections(),l=0;l=0;l--){var u=c[l].head;i.replaceRange("",n(u.line,u.ch-1),n(u.line,u.ch+1),"+delete")}},Enter:function t(n){var i=r(n),a=i&&o(i,"explode");if(!a||n.getOption("disableInput"))return e.Pass;for(var s=n.listSelections(),l=0;l=0&&i.getRange(b,n(b.line,b.ch+3))==a+a+a?"skipThree":"skip";else if(h&&b.ch>1&&p.indexOf(a)>=0&&i.getRange(n(b.line,b.ch-2),b)==a+a){if(b.ch>2&&/\bstring/.test(i.getTokenTypeAt(n(b.line,b.ch-2))))return e.Pass;C="addFour"}else if(h){var M=0==b.ch?" ":i.getRange(n(b.line,b.ch-1),b);if(e.isWordChar(y)||M==a||e.isWordChar(M))return e.Pass;C="both"}else{if(!(x&&(0===y.length||/\s/.test(y)||f.indexOf(y)>-1)))return e.Pass;C="both"}if(P){if(P!=C)return e.Pass}else P=C}var v=u%2?m.charAt(u-1):a,D=u%2?a:m.charAt(u+1);i.operation(function(){if("skip"==P)c(i,1);else if("skipThree"==P)c(i,3);else if("surround"==P){for(var e=i.getSelections(),t=0;t0?{line:s.head.line,ch:s.head.ch+t}:{line:s.head.line-1};n.push({anchor:r,head:r})}e.setSelections(n,i)}function l(t){var o=e.cmpPos(t.anchor,t.head)>0;return{anchor:new n(t.anchor.line,t.anchor.ch+(o?-1:1)),head:new n(t.head.line,t.head.ch+(o?1:-1))}}function m(e,t){var o=e.getRange(n(t.line,t.ch-1),n(t.line,t.ch+1));return 2==o.length?o:null}function d(e,t){var o=e.getTokenAt(n(t.line,t.ch+1));return/\bstring/.test(o.type)&&o.start==t.ch&&(0==t.ch||!/\bstring/.test(e.getTokenTypeAt(t)))}a(t.pairs+"`")}); \ No newline at end of file +var rEdit,commonAtoms=["And","Or"],commonKeywords=["If","Else","Elseif","Endif"],commonCommands=["AccessInfo","Background","Build","ClearAccessBlock","ClearRTCam","Config","ControllerDisable","ControllerEnable","DateTime","Debug","Dec","DeepSleep","DisablePriorityTask","DNS","DST","EraseSDKWiFi","ExecuteRules","FactoryReset","Gateway","I2Cscanner","Inc","IP","Let","LetStr","Load","LogEntry","LogPortStatus","LoopTimerSet","LoopTimerSet_ms","LoopTimerSetAndRun","LoopTimerSetAndRun_ms","MemInfo","MemInfoDetail","Name","Password","PostToHTTP","PostToHTTPS","Publish","PublishR","PutToHTTP","PutToHTTPS","Reboot","Save","SendTo","SendToHTTP","SendToHTTPS","SendToUDP","SendToUDPMix","Settings","Subnet","Subscribe","TaskClear","TaskClearAll","TaskDisable","TaskEnable","TaskRun","TaskValueSet","TaskValueSetAndRun","TaskValueSetDerived","TaskValueSetPresentation","TimerPause","TimerResume","TimerSet","TimerSet_ms","TimeZone","UdpPort","UdpTest","Unit","UseNTP","WdConfig","WdRead","WiFi","WiFiAllowAP","WiFiAPMode","WiFiConnect","WiFiDisconnect","WiFiKey","WiFiKey2","WiFiMode","WiFiScan","WiFiSSID","WiFiSSID2","WiFiSTAMode","Event","AsyncEvent","GPIO","GPIOToggle","LongPulse","LongPulse_mS","Monitor","Pulse","PWM","Servo","Status","Tone","RTTTL","UnMonitor","Provision","Provision,Config","Provision,Security","Provision,Notification","Provision,Provision","Provision,Rules,","Provision,CustomCdnUrl","Provision,Firmware,",],commonEvents=["Clock#Time","Login#Failed","MQTT#Connected","MQTT#Disconnected","MQTTimport#Connected","MQTTimport#Disconnected","Rules#Timer","System#Boot","System#BootMode","System#Sleep","System#Wake","TaskExit#","TaskInit#","ThingspeakReply","Time#Initialized","Time#Set","WiFi#APmodeDisabled","WiFi#APmodeEnabled","WiFi#ChangedAccesspoint","WiFi#ChangedWiFichannel","WiFi#Connected","WiFi#Disconnected","ProvisionFirmware",],commonPlugins=["ResetPulseCounter","SetPulseCounterTotal","LogPulseStatistic","analogout","MCPGPIO","MCPGPIOToggle","MCPLongPulse","MCPLongPulse_ms","MCPPulse","Status,MCP","Monitor,MCP","MonitorRange,MCP","UnMonitorRange,MCP","UnMonitor,MCP","MCPGPIORange","MCPGPIOPattern","MCPMode","MCPModeRange","ExtGpio","ExtPwm","ExtPulse","ExtLongPulse","Status,EXT,","LCDCmd","LCD","PCFGPIO","PCFGPIOToggle","PCFLongPulse","PCFLongPulse_ms","PCFPulse","Status,PCF","Monitor,PCF","MonitorRange,PCF","UnMonitorRange,PCF","UnMonitor,PCF","PCFGPIORange","PCFGPIOpattern","PCFMode","PCFmodeRange","SerialSend","SerialSendMix","Ser2NetClientSend","SerialSend_test","pcapwm","pcafrq","mode2","OLED","OLEDCMD","OLEDCMD,on","OLEDCMD,off","OLEDCMD,clear","IRSEND","IRSENDAC","OledFramedCmd","OledFramedCmd,Display","OledFramedCmd,low","OledFramedCmd,med","OledFramedCmd,high","OledFramedCmd,Frame","OledFramedCmd,linecount","OledFramedCmd,leftalign","OledFramedCmd,align","OledFramedCmd,userDef1","OledFramedCmd,userDef2","NeoPixel","NeoPixelAll","NeoPixelLine","NeoPixelHSV","NeoPixelAllHSV","NeoPixelLineHSV","NeoPixelBright","MotorShieldCmd,DCMotor","MotorShieldCmd,Stepper","MHZCalibrateZero","MHZReset","MHZABCEnable","MHZABCDisable","Sensair_SetRelay","PMSX003","PMSX003,Wake","PMSX003,Sleep","PMSX003,Reset","encwrite","Play","Vol","Eq","Mode","Repeat","tareChanA","tareChanB","7dn","7dst","7dsd","7dtext","7ddt","7dt","7dtfont","7dtbin","7don","7doff","7output","HLWCalibrate","HLWReset","csecalibrate","cseclearpulses","csereset","WemosMotorShieldCMD","LolinMotorShieldCMD","GPS","GPS,Sleep","GPS,Wake","GPS#GotFix","GPS#LostFix","GPS#Travelled","homieValueSet","SerialProxy_Write","SerialProxy_WriteMix","SerialProxy_Test","HeatPumpir","MitsubishiHP","MitsubishiHP,temperature","MitsubishiHP,power","MitsubishiHP,mode","MitsubishiHP,fan","MitsubishiHP,vane","MitsubishiHP,widevane","Culreader_Write","Touch","Touch,Rot","Touch,Flip","Touch,Enable","Touch,Disable","Touch,On","Touch,Off","Touch,Toggle","Touch,Setgrp","Touch,Incgrp","Touch,Decgrp","Touch,Incpage","Touch,Decpage","Touch,Updatebutton","WakeOnLan","DotMatrix","DotMatrix,clear","DotMatrix,update","DotMatrix,size","DotMatrix,txt","DotMatrix,settxt","DotMatrix,content","DotMatrix,alignment","DotMatrix,anim.in","DotMatrix,anim.out","DotMatrix,speed","DotMatrix,pause","DotMatrix,font","DotMatrix,layout","DotMatrix,inverted","DotMatrix,specialeffect","DotMatrix,offset","DotMatrix,brightness","DotMatrix,repeat","DotMatrix,setbar","DotMatrix,bar","Thermo","Thermo,Up","Thermo,Down","Thermo,Mode","Thermo,ModeBtn","Thermo,Setpoint","Max1704xclearalert","scdgetabc","scdgetalt","scdgettmp","scdsetcalibration","scdsetfrc","scdgetinterval","multirelay","multirelay,on","multirelay,off","multirelay,set","multirelay,get","multirelay,loop","ShiftOut","ShiftOut,Set","ShiftOut,SetNoUpdate","ShiftOut,Update","ShiftOut,SetAll","ShiftOut,SetAllNoUpdate","ShiftOut,SetAllLow","ShiftOut,SetAllHigh","ShiftOut,SetChipCount","ShiftOut,SetHexBin","cdmrst","nfx","nfx,off","nfx,on","nfx,dim","nfx,line,","nfx,hsvline,","nfx,one,","nfx,hsvone,","nfx,all,","nfx,rgb,","nfx,fade,","nfx,hsv,","nfx,colorfade,","nfx,rainbow","nfx,kitt,","nfx,comet,","nfx,theatre,","nfx,scan,","nfx,dualscan,","nfx,twinkle,","nfx,twinklefade,","nfx,sparkle,","nfx,wipe,","nfx,dualwipe","nfx,fire","nfx,fireflicker","nfx,faketv","nfx,simpleclock","nfx,stop","nfx,statusrequest","nfx,fadetime,","nfx,fadedelay,","nfx,speed,","nfx,count,","nfx,bgcolor","ShiftIn","ShiftIn,PinEvent","ShiftIn,ChipEvent","ShiftIn,SetChipCount","ShiftIn,SampleFrequency","ShiftIn,EventPerPin","scd4x","scd4x,storesettings","scd4x,facoryreset","scd4x,selftest","scd4x,setfrc,","axp","axp,ldo2","axp,ldo3","axp,ldoio","axp,gpio0","axp,gpio1","axp,gpio2","axp,gpio3","axp,gpio4","axp,dcdc2","axp,dcdc3","axp,ldo2map","axp,ldo3map","axp,ldoiomap","axp,dcdc2map","axp,dcdc3map","axp,ldo2perc","axp,ldo3perc","axp,ldoioperc","axp,dcdc2perc","axp,dcdc3perc","I2CEncoder","I2CEncoder,bright","I2CEncoder,led1","I2CEncoder,led2","I2CEncoder,gain","I2CEncoder,set","cachereader","cachereader,readpos","cachereader,sendtaskinfo","cachereader,flush","tm1621","tm1621,write,","tm1621,writerow,","tm1621,voltamp,","tm1621,energy,","tm1621,celcius,","tm1621,fahrenheit,","tm1621,humidity,","tm1621,raw,","dac","dac,1","dac,2","sht4x","sht4x,startup","ld2410","ld2410,factoryreset","ld2410,logall","digipot","digipot,reset","digipot,shutdown","digipot,","7dextra","7dbefore","7dgroup","7digit","7color","7digitcolor","7groupcolor","gp8403","gp8403,volt,","gp8403,mvolt,","gp8403,range,","gp8403,preset,","gp8403,init,","sen5x","sen5x,startclean","sen5x,techlog,","as3935","as3935,clearstats","as3935,calibrate","as3935,setgain,","as3935,setnf,","as3935,setwd,","as3925,setsrej,","lu9685","lu9685,servo,","lu9685,enable,","lu9685,disable,","lu9685,setrange,","geni2c","geni2c,cmd,","geni2c,exec,","geni2c,log,",],pluginDispKind=["tft","ili9341","ili9342","ili9481","ili9486","ili9488","epd","eink","epaper","il3897","uc8151d","ssd1680","ws2in7","ws1in54","st77xx","st7735","st7789","st7796","neomatrix","neo","pcd8544",],pluginDispCmd=["cmd,on","cmd,off","cmd,clear","cmd,backlight","cmd,bright","cmd,deepsleep","cmd,seq_start","cmd,seq_end","cmd,inv","cmd,rot",",clear",",rot",",tpm",",txt",",txp",",txz",",txc",",txs",",txtfull",",asciitable",",font",",l",",lh",",lv",",lm",",lmr",",r",",rf",",c",",cf",",rf",",t",",tf",",rr",",rrf",",px",",pxh",",pxv",",bmp",",btn",",win",",defwin",",delwin",],commonTag=["On","Do","Endon"],commonNumber=["toBin","toHex","Constrain","XOR","AND:","OR:","Ord","bitRead","bitSet","bitClear","bitWrite","urlencode"],commonMath=["Log","Ln","Abs","Exp","Sqrt","Sq","Round","Sin","Cos","Tan","aSin","aCos","aTan","Sin_d","Cos_d","Tan_d","aSin_d","aCos_d","aTan_d","map","mapc"],commonWarning=["delay","Delay","ResetFlashWriteCounter"],taskSpecifics=["settings.Enabled","settings.Interval","settings.ValueCount","settings.Controller1.Enabled","settings.Controller2.Enabled","settings.Controller3.Enabled","settings.Controller1.Idx","settings.Controller2.Idx","settings.Controller3.Idx"],AnythingElse=["%eventvalue%","%eventpar%","%eventname%","%sysname%","%bootcause%","%systime%","%systm_hm%","%systm_hm_0%","%systm_hm_sp%","%systime_am%","%systime_am_0%","%systime_am_sp%","%systm_hm_am%","%systm_hm_am_0%","%systm_hm_am_sp%","%lcltime%","%sunrise%","%s_sunrise%","%m_sunrise%","%sunset%","%s_sunset%","%m_sunset%","%lcltime_am%","%syshour%","%syshour_0%","%sysmin%","%sysmin_0%","%syssec%","%syssec_0%","%sysday%","%sysday_0%","%sysmonth%","%sysmonth_0%","%systzoffset%","%systzoffset_s%","%sysyear%","%sysyear_0%","%sysyears%","%sysweekday%","%sysweekday_s%","%unixtime%","%unixtime_lcl%","%uptime%","%uptime_ms%","%rssi%","%ip%","%unit%","%unit_0%","%ssid%","%bssid%","%wi_ch%","%iswifi%","%vcc%","%mac%","%mac_int%","%isntp%","%ismqtt%","%dns%","%dns1%","%dns2%","%flash_freq%","%flash_size%","%flash_chip_vendor%","%flash_chip_model%","%fs_free%","%fs_size%","%cpu_id%","%cpu_freq%","%cpu_model%","%cpu_rev%","%cpu_cores%","%board_name%","%inttemp%","%islimited_build%","%isvar_double%","substring","lookup","indexOf","indexOf_ci","equals","equals_ci","strtol","timeToMin","timeToSec","%ethwifimode%","%ethconnected%","%ethduplex%","%ethspeed%","%ethstate%","%ethspeedstate%","%c_w_dir%","%c_c2f%","%c_ms2Bft%","%c_dew_th%","%c_alt_pres_sea%","%c_sea_pres_alt%","%c_cm2imp%","%c_isnum%","%c_mm2imp%","%c_m2day%","%c_m2dh%","%c_m2dhm%","%c_s2dhms%","%c_ts2date%","%c_ts2isodate%","%c_ts2wday%","%c_random%","%c_2hex%","%c_u2ip%","%c_uname%","%c_uage%","%c_ubuild%","%c_ubuildstr%","%c_uload%","%c_utype%","%c_utypestr%","%c_strf%","var","int","str","length"];for(const element2 of pluginDispKind)commonPlugins=commonPlugins.concat(element2);for(const element2 of pluginDispKind)for(const element3 of pluginDispCmd){let e=element2+element3;commonPlugins=commonPlugins.concat(e)}var EXTRAWORDS=commonAtoms.concat(commonPlugins,commonKeywords,commonCommands,commonEvents,commonTag,commonNumber,commonMath,commonWarning,taskSpecifics,AnythingElse);function initCM(){CodeMirror.commands.autocomplete=function(e){e.showHint({hint:CodeMirror.hint.anyword})},(rEdit=CodeMirror.fromTextArea(document.getElementById("rules"),{tabSize:2,indentWithTabs:!1,lineNumbers:!0,autoCloseBrackets:!0,extraKeys:{"Ctrl-Space":"autocomplete",Tab(e){"null"===e.getMode().name?e.execCommand("insertTab"):e.somethingSelected()?e.execCommand("indentMore"):e.execCommand("insertSoftTab")},"Shift-Tab":e=>e.execCommand("indentLess")}})).on("change",function(){rEdit.save()}),rEdit.on("inputRead",function(e,t){var n=e.getCursor(),o=e.getTokenAt(n);/[\w%,.]/.test(t.text)&&"comment"!=o.type&&e.showHint({completeSingle:!1})})}!function(e){"object"==typeof exports&&"object"==typeof module?e(require("codemirror")):"function"==typeof define&&define.amd?define(["codemirror"],e):e(CodeMirror)}(function(e){"use strict";e.defineMode("espeasy",function(){var e={};function t(t,n){for(var o=0;oe.toLowerCase());commonCommands=commonCommands.concat(n);var o=commonEvents.map(e=>e.toLowerCase());commonEvents=commonEvents.concat(o);var i=commonPlugins.map(e=>e.toLowerCase());commonPlugins=commonPlugins.concat(i);var a=commonAtoms.map(e=>e.toLowerCase());commonAtoms=commonAtoms.concat(a);var s=commonKeywords.map(e=>e.toLowerCase());commonKeywords=commonKeywords.concat(s);var r=commonTag.map(e=>e.toLowerCase());commonTag=commonTag.concat(r);var c=commonNumber.map(e=>e.toLowerCase());commonNumber=commonNumber.concat(c);var l=commonMath.map(e=>e.toLowerCase());commonMath=commonMath.concat(l);var m=AnythingElse.map(e=>e.toLowerCase());AnythingElse=AnythingElse.concat(m);var d=taskSpecifics.map(e=>e.toLowerCase());function u(t,n){if(t.eatSpace())return null;t.sol();var o=t.next();if(/\d/.test(o)){if("0"==o)return"x"===t.next()?(t.eatWhile(/\w/),"number"):(t.eatWhile(/\d|\./),"number");if(t.eatWhile(/\d|\./),!t.match("d")&&!t.match("output")&&(t.eol()||/\D/.test(t.peek())))return"number"}if(/\w/.test(o))for(let i of EXTRAWORDS){let a=i.substring(1);(i.includes(":")||i.includes(",")||i.includes("."))&&t.match(a)}if(/\w/.test(o)&&(t.eatWhile(/[\w]/),t.match(".gpio")||t.match(".pulse")||t.match(".frq")||t.match(".pwm")))return"def";if("\\"===o)return t.next(),null;if("("===o||")"===o)return"bracket";if("{"===o||"}"===o||":"===o)return"number";if("/"==o)return/\//.test(t.peek())?(t.skipToEnd(),"comment"):"operator";if("'"==o&&(t.eatWhile(/[^']/),t.match("'")))return"attribute";if("+"===o||"="===o||"<"===o||">"===o||"-"===o||","===o||"*"===o||"!"===o)return"operator";if("%"==o){if(/\d/.test(t.next()))return"number";if(t.eatWhile(/[^\s\%]/),t.match("%"))return"hr"}if("["==o&&(t.eatWhile(/[^\s\]]/),t.eat("]")))return"hr";t.eatWhile(/\w/);var s=t.current();return/\w/.test(o)&&t.match("#")?(t.eatWhile(/[\w.#]/),"events"):"#"===o?(t.eatWhile(/\w/),"number"):e.hasOwnProperty(s)?e[s]:null}return taskSpecifics=taskSpecifics.concat(d),t("atom",commonAtoms),t("keyword",commonKeywords),t("builtin",commonCommands),t("events",commonEvents),t("def",commonPlugins),t("tag",commonTag),t("number",commonNumber),t("bracket",commonMath),t("warning",commonWarning),t("hr",AnythingElse),t("comment",taskSpecifics),{startState:function(){return{tokens:[]}},token:function(e,t){var n,o;return n=e,((o=t).tokens[0]||u)(n,o)},closeBrackets:"[]{}''\"\"``()",lineComment:"//",fold:"brace"}})}),function(e){"object"==typeof exports&&"object"==typeof module?e(require("../../lib/codemirror")):"function"==typeof define&&define.amd?define(["../../lib/codemirror"],mod):e(CodeMirror)}(function(e){var t={pairs:"()[]{}''\"\"",closeBefore:")]}'\":;>",triples:"",explode:"[]{}"},n=e.Pos;function o(e,n){return"pairs"==n&&"string"==typeof e?e:"object"==typeof e&&null!=e[n]?e[n]:t[n]}e.defineOption("autoCloseBrackets",!1,function(t,n,s){s&&s!=e.Init&&(t.removeKeyMap(i),t.state.closeBrackets=null),n&&(a(o(n,"pairs")),t.state.closeBrackets=n,t.addKeyMap(i))});var i={Backspace:function t(i){var a=r(i);if(!a||i.getOption("disableInput"))return e.Pass;for(var s=o(a,"pairs"),c=i.listSelections(),l=0;l=0;l--){var u=c[l].head;i.replaceRange("",n(u.line,u.ch-1),n(u.line,u.ch+1),"+delete")}},Enter:function t(n){var i=r(n),a=i&&o(i,"explode");if(!a||n.getOption("disableInput"))return e.Pass;for(var s=n.listSelections(),l=0;l=0&&i.getRange(b,n(b.line,b.ch+3))==a+a+a?"skipThree":"skip";else if(h&&b.ch>1&&p.indexOf(a)>=0&&i.getRange(n(b.line,b.ch-2),b)==a+a){if(b.ch>2&&/\bstring/.test(i.getTokenTypeAt(n(b.line,b.ch-2))))return e.Pass;C="addFour"}else if(h){var M=0==b.ch?" ":i.getRange(n(b.line,b.ch-1),b);if(e.isWordChar(y)||M==a||e.isWordChar(M))return e.Pass;C="both"}else{if(!(x&&(0===y.length||/\s/.test(y)||f.indexOf(y)>-1)))return e.Pass;C="both"}if(P){if(P!=C)return e.Pass}else P=C}var v=u%2?m.charAt(u-1):a,D=u%2?a:m.charAt(u+1);i.operation(function(){if("skip"==P)c(i,1);else if("skipThree"==P)c(i,3);else if("surround"==P){for(var e=i.getSelections(),t=0;t0?{line:s.head.line,ch:s.head.ch+t}:{line:s.head.line-1};n.push({anchor:r,head:r})}e.setSelections(n,i)}function l(t){var o=e.cmpPos(t.anchor,t.head)>0;return{anchor:new n(t.anchor.line,t.anchor.ch+(o?-1:1)),head:new n(t.head.line,t.head.ch+(o?1:-1))}}function m(e,t){var o=e.getRange(n(t.line,t.ch-1),n(t.line,t.ch+1));return 2==o.length?o:null}function d(e,t){var o=e.getTokenAt(n(t.line,t.ch+1));return/\bstring/.test(o.type)&&o.start==t.ch&&(0==t.ch||!/\bstring/.test(e.getTokenTypeAt(t)))}a(t.pairs+"`")}); \ No newline at end of file From 8e805e9c857bf494ef7e58bd7befd4b7a35139f7 Mon Sep 17 00:00:00 2001 From: Ton Huisman Date: Fri, 19 Sep 2025 21:54:54 +0200 Subject: [PATCH 263/564] [HTTP] Enable TLS support for Controllers using HTTP --- src/_C001.cpp | 43 +++++++++++-------- src/_C004.cpp | 3 ++ src/_C008.cpp | 3 ++ src/_C009.cpp | 3 ++ src/_C011.cpp | 5 ++- .../DataStructs/ControllerSettingsStruct.cpp | 4 +- .../DataStructs/ControllerSettingsStruct.h | 4 +- src/src/Helpers/_CPlugin_Helper.cpp | 6 ++- src/src/Helpers/_CPlugin_Helper_webform.cpp | 8 ++-- src/src/WebServer/ControllerPage.cpp | 12 ++++-- 10 files changed, 57 insertions(+), 34 deletions(-) diff --git a/src/_C001.cpp b/src/_C001.cpp index 445177d35..f68ed446a 100644 --- a/src/_C001.cpp +++ b/src/_C001.cpp @@ -27,6 +27,9 @@ bool CPlugin_001(CPlugin::Function function, struct EventStruct *event, String& proto.usesExtCreds = true; proto.defaultPort = 8080; proto.usesID = true; + # if FEATURE_HTTP_TLS + proto.usesTLS = true; + # endif // if FEATURE_HTTP_TLS break; } @@ -50,9 +53,10 @@ bool CPlugin_001(CPlugin::Function function, struct EventStruct *event, String& case CPlugin::Function::CPLUGIN_PROTOCOL_SEND: { - if (C001_DelayHandler == nullptr || !validTaskIndex(event->TaskIndex)) { + if ((C001_DelayHandler == nullptr) || !validTaskIndex(event->TaskIndex)) { break; } + if (C001_DelayHandler->queueFull(event->ControllerIndex)) { break; } @@ -67,8 +71,8 @@ bool CPlugin_001(CPlugin::Function function, struct EventStruct *event, String& if (reserve_special(url, expectedSize)) { url = F("/json.htm?type=command¶m="); - if (sensorType == Sensor_VType::SENSOR_TYPE_SWITCH || - sensorType == Sensor_VType::SENSOR_TYPE_DIMMER) + if ((sensorType == Sensor_VType::SENSOR_TYPE_SWITCH) || + (sensorType == Sensor_VType::SENSOR_TYPE_DIMMER)) { url += F("switchlight&idx="); url += event->idx; @@ -102,9 +106,10 @@ bool CPlugin_001(CPlugin::Function function, struct EventStruct *event, String& constexpr unsigned size = sizeof(C001_queue_element); void *ptr = special_calloc(1, size); - + if (ptr != nullptr) { - std::unique_ptr element(new (ptr) C001_queue_element(event->ControllerIndex, event->TaskIndex, std::move(url))); + std::unique_ptr element(new (ptr) C001_queue_element(event->ControllerIndex, event->TaskIndex, + std::move(url))); success = C001_DelayHandler->addToQueue(std::move(element)); } @@ -140,22 +145,22 @@ bool do_process_c001_delay_queue(cpluginID_t cpluginID, const Queue_element_base // *INDENT-ON* # ifndef BUILD_NO_DEBUG - if (loglevelActiveFor(LOG_LEVEL_DEBUG)) { - addLog(LOG_LEVEL_DEBUG, element.txt); - } +if (loglevelActiveFor(LOG_LEVEL_DEBUG)) { + addLog(LOG_LEVEL_DEBUG, element.txt); +} # endif // ifndef BUILD_NO_DEBUG - int httpCode = -1; - send_via_http( - cpluginID, - ControllerSettings, - element._controller_idx, - element.txt, - F("GET"), - EMPTY_STRING, - EMPTY_STRING, - httpCode); - return (httpCode >= 100) && (httpCode < 300); +int httpCode = -1; +send_via_http( + cpluginID, + ControllerSettings, + element._controller_idx, + element.txt, + F("GET"), + EMPTY_STRING, + EMPTY_STRING, + httpCode); +return (httpCode >= 100) && (httpCode < 300); } #endif // ifdef USES_C001 diff --git a/src/_C004.cpp b/src/_C004.cpp index a450f0da9..f48734954 100644 --- a/src/_C004.cpp +++ b/src/_C004.cpp @@ -23,6 +23,9 @@ bool CPlugin_004(CPlugin::Function function, struct EventStruct *event, String& proto.usesPassword = true; proto.defaultPort = 80; proto.usesID = true; + # if FEATURE_HTTP_TLS + proto.usesTLS = true; + # endif // if FEATURE_HTTP_TLS break; } diff --git a/src/_C008.cpp b/src/_C008.cpp index 761850332..82cb3153c 100644 --- a/src/_C008.cpp +++ b/src/_C008.cpp @@ -26,6 +26,9 @@ bool CPlugin_008(CPlugin::Function function, struct EventStruct *event, String& proto.usesExtCreds = true; proto.defaultPort = 80; proto.usesID = true; + # if FEATURE_HTTP_TLS + proto.usesTLS = true; + # endif // if FEATURE_HTTP_TLS break; } diff --git a/src/_C009.cpp b/src/_C009.cpp index 0b5e1a191..452490149 100644 --- a/src/_C009.cpp +++ b/src/_C009.cpp @@ -52,6 +52,9 @@ bool CPlugin_009(CPlugin::Function function, struct EventStruct *event, String& proto.usesExtCreds = true; proto.usesID = false; proto.defaultPort = 8383; + # if FEATURE_HTTP_TLS + proto.usesTLS = true; + # endif // if FEATURE_HTTP_TLS break; } diff --git a/src/_C011.cpp b/src/_C011.cpp index c29756c32..ecf0c7a9b 100644 --- a/src/_C011.cpp +++ b/src/_C011.cpp @@ -19,7 +19,6 @@ bool C011_sendBinary = false; struct C011_ConfigStruct { - void zero_last() { HttpMethod[C011_HTTP_METHOD_MAX_LEN - 1] = 0; HttpUri[C011_HTTP_URI_MAX_LEN - 1] = 0; @@ -31,7 +30,6 @@ struct C011_ConfigStruct char HttpUri[C011_HTTP_URI_MAX_LEN] = { 0 }; char HttpHeader[C011_HTTP_HEADER_MAX_LEN] = { 0 }; char HttpBody[C011_HTTP_BODY_MAX_LEN] = { 0 }; - }; @@ -63,6 +61,9 @@ bool CPlugin_011(CPlugin::Function function, struct EventStruct *event, String& proto.usesExtCreds = true; proto.defaultPort = 80; proto.usesID = false; + # if FEATURE_HTTP_TLS + proto.usesTLS = true; + # endif // if FEATURE_HTTP_TLS break; } diff --git a/src/src/DataStructs/ControllerSettingsStruct.cpp b/src/src/DataStructs/ControllerSettingsStruct.cpp index 9afc59e96..afbccafda 100644 --- a/src/src/DataStructs/ControllerSettingsStruct.cpp +++ b/src/src/DataStructs/ControllerSettingsStruct.cpp @@ -326,7 +326,7 @@ bool ControllerSettingsStruct::mqtt_cleanSession() const } */ -#if FEATURE_MQTT_TLS +#if FEATURE_MQTT_TLS || FEATURE_HTTP_TLS String ControllerSettingsStruct::getCertificateFilename() const { return getCertificateFilename(TLStype()); @@ -368,4 +368,4 @@ String ControllerSettingsStruct::getCertificateFilename(TLS_types tls_type) cons return certFile; } -#endif +#endif // #if FEATURE_MQTT_TLS || FEATURE_HTTP_TLS diff --git a/src/src/DataStructs/ControllerSettingsStruct.h b/src/src/DataStructs/ControllerSettingsStruct.h index 065237e40..1f981be4a 100644 --- a/src/src/DataStructs/ControllerSettingsStruct.h +++ b/src/src/DataStructs/ControllerSettingsStruct.h @@ -193,13 +193,13 @@ struct ControllerSettingsStruct void mqtt_retainDiscovery(bool value) { VariousBits1.mqttRetainDiscovery = value; } #endif -#if FEATURE_MQTT_TLS +#if FEATURE_MQTT_TLS || FEATURE_HTTP_TLS TLS_types TLStype() const { return static_cast(VariousBits1.TLStype); } void TLStype(TLS_types tls_type) { VariousBits1.TLStype = static_cast(tls_type); } String getCertificateFilename() const; String getCertificateFilename(TLS_types tls_type) const; -#endif +#endif // #if FEATURE_MQTT_TLS || FEATURE_HTTP_TLS bool UseDNS; diff --git a/src/src/Helpers/_CPlugin_Helper.cpp b/src/src/Helpers/_CPlugin_Helper.cpp index 347ff2e57..af865921c 100644 --- a/src/src/Helpers/_CPlugin_Helper.cpp +++ b/src/src/Helpers/_CPlugin_Helper.cpp @@ -256,7 +256,11 @@ String send_via_http(int cpluginID, header, postStr, httpCode, - ControllerSettings.MustCheckReply); + ControllerSettings.MustCheckReply + #if FEATURE_HTTP_TLS + , ControllerSettings.TLStype() + #endif // if FEATURE_HTTP_TLS + ); // FIXME TD-er: Shouldn't this be: success = (httpCode >= 100) && (httpCode < 300) // or is reachability of the host the important factor here? diff --git a/src/src/Helpers/_CPlugin_Helper_webform.cpp b/src/src/Helpers/_CPlugin_Helper_webform.cpp index 249456a1b..fca6a79ec 100644 --- a/src/src/Helpers/_CPlugin_Helper_webform.cpp +++ b/src/src/Helpers/_CPlugin_Helper_webform.cpp @@ -200,7 +200,7 @@ void addControllerParameterForm(const ControllerSettingsStruct & ControllerSett addFormNumericBox(displayName, internalName, ControllerSettings.Port, 1, 65535); break; } -#if FEATURE_MQTT_TLS +#if FEATURE_MQTT_TLS || FEATURE_HTTP_TLS case ControllerSettingsStruct::CONTROLLER_MQTT_TLS_TYPE: { const int choice = static_cast(ControllerSettings.TLStype()); @@ -265,7 +265,7 @@ void addControllerParameterForm(const ControllerSettingsStruct & ControllerSett */ break; } -#endif // if FEATURE_MQTT_TLS +#endif // if FEATURE_MQTT_TLS || FEATURE_HTTP_TLS case ControllerSettingsStruct::CONTROLLER_USER: { const size_t fieldMaxLength = @@ -454,7 +454,7 @@ void saveControllerParameterForm(ControllerSettingsStruct & ControllerSet case ControllerSettingsStruct::CONTROLLER_PORT: ControllerSettings.Port = getFormItemInt(internalName, ControllerSettings.Port); break; -#if FEATURE_MQTT_TLS +#if FEATURE_MQTT_TLS || FEATURE_HTTP_TLS case ControllerSettingsStruct::CONTROLLER_MQTT_TLS_TYPE: { const int current = static_cast(ControllerSettings.TLStype()); @@ -492,7 +492,7 @@ void saveControllerParameterForm(ControllerSettingsStruct & ControllerSet } break; } -#endif // if FEATURE_MQTT_TLS +#endif // if FEATURE_MQTT_TLS || FEATURE_HTTP_TLS case ControllerSettingsStruct::CONTROLLER_USER: setControllerUser(controllerindex, ControllerSettings, webArg(internalName)); break; diff --git a/src/src/WebServer/ControllerPage.cpp b/src/src/WebServer/ControllerPage.cpp index 8f0ad00cb..8b70f2503 100644 --- a/src/src/WebServer/ControllerPage.cpp +++ b/src/src/WebServer/ControllerPage.cpp @@ -374,13 +374,17 @@ void handle_controllers_ControllerSettingsPage(controllerIndex_t controllerindex if (proto.usesPort) { addControllerParameterForm(*ControllerSettings, controllerindex, ControllerSettingsStruct::CONTROLLER_PORT); } - # if FEATURE_MQTT_TLS + # if FEATURE_MQTT_TLS || FEATURE_HTTP_TLS - if (proto.usesMQTT && proto.usesTLS) { + if (proto.usesTLS) { addControllerParameterForm(*ControllerSettings, controllerindex, ControllerSettingsStruct::CONTROLLER_MQTT_TLS_TYPE); - addFormNote(F("Default ports: MQTT: 1883 / MQTT TLS: 8883")); + if (proto.usesMQTT) { + addFormNote(F("Default ports: MQTT: 1883 / MQTT TLS: 8883")); + } else { + addFormNote(F("Default ports: HTTP: 80 / HTTPS: 443")); + } } - # endif // if FEATURE_MQTT_TLS + # endif // if FEATURE_MQTT_TLS || FEATURE_HTTP_TLS # ifdef USES_ESPEASY_NOW if (proto.usesMQTT) { From 314e1df8ee30d7482b6c1514cc6c0f6a58f70b85 Mon Sep 17 00:00:00 2001 From: Ton Huisman Date: Fri, 19 Sep 2025 22:58:27 +0200 Subject: [PATCH 264/564] [P002] Fix docs layout issue --- docs/source/Plugin/P002.rst | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/docs/source/Plugin/P002.rst b/docs/source/Plugin/P002.rst index fe795c826..84c3f0c20 100644 --- a/docs/source/Plugin/P002.rst +++ b/docs/source/Plugin/P002.rst @@ -437,10 +437,12 @@ Change log .. versionchanged:: 2.0 ... - |improved| 2020-04-25 Added support for ESP32 ADC pins + Hall Effect Sensor. - |improved| 2022-07-11 Added ESP32 Factory calibration, multipoint processing, binning and charts. |improved| 2022-07-27 Improved resolution when using ESP32 Factory Calibration. + |improved| 2022-07-11 Added ESP32 Factory calibration, multipoint processing, binning and charts. + + |improved| 2020-04-25 Added support for ESP32 ADC pins + Hall Effect Sensor. + .. versionadded:: 1.0 ... From 00e3f731726d6f177f2dd368cb50ee76db285faf Mon Sep 17 00:00:00 2001 From: Ton Huisman Date: Sat, 20 Sep 2025 15:19:48 +0200 Subject: [PATCH 265/564] [HTTP] Defensive programming in test for https url --- src/src/Helpers/Networking.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/src/Helpers/Networking.cpp b/src/src/Helpers/Networking.cpp index 809512847..d42540d2b 100644 --- a/src/src/Helpers/Networking.cpp +++ b/src/src/Helpers/Networking.cpp @@ -1354,7 +1354,7 @@ String splitURL(const String& fullURL, String& user, String& pass, String& host, } #if FEATURE_HTTP_TLS - if ((starthost > 0) && (port == 80)) { // 'Upgrade' from port 80 to port 443 for HTTPS url + if ((starthost > 3) && (port == 80)) { // 'Upgrade' from port 80 to port 443 for HTTPS url String proto = fullURL.substring(0, starthost - 3); proto.toLowerCase(); From bb3a72cc37c1ebaa9cde21a35df9d3c4b59cf37e Mon Sep 17 00:00:00 2001 From: Ton Huisman Date: Sat, 20 Sep 2025 15:20:51 +0200 Subject: [PATCH 266/564] [HTTP] Enable TLS support also for Controller C007 Emoncms --- src/_C007.cpp | 3 +++ 1 file changed, 3 insertions(+) diff --git a/src/_C007.cpp b/src/_C007.cpp index f4de2157d..a67832e15 100644 --- a/src/_C007.cpp +++ b/src/_C007.cpp @@ -28,6 +28,9 @@ bool CPlugin_007(CPlugin::Function function, struct EventStruct *event, String& proto.defaultPort = 80; proto.usesID = true; proto.usesTemplate = true; + # if FEATURE_HTTP_TLS + proto.usesTLS = true; + # endif // if FEATURE_HTTP_TLS break; } From cdc29fb43fb60a8b2aed71e726609f8044282267 Mon Sep 17 00:00:00 2001 From: Ton Huisman Date: Sun, 21 Sep 2025 14:33:15 +0200 Subject: [PATCH 267/564] [Devices] Limit displaying of (old) Wiki Help button to P056 and below --- src/src/WebServer/DevicesPage.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/src/WebServer/DevicesPage.cpp b/src/src/WebServer/DevicesPage.cpp index 1253bc6a5..bfa6dbf0c 100644 --- a/src/src/WebServer/DevicesPage.cpp +++ b/src/src/WebServer/DevicesPage.cpp @@ -1075,7 +1075,7 @@ void handle_devices_TaskSettingsPage(taskIndex_t taskIndex, uint8_t page) addHtml(getPluginNameFromDeviceIndex(DeviceIndex)); const uint8_t pid = Settings.getPluginID_for_task(taskIndex).value; - if (pid <= 101) { // Up to P101 seem to be listed in the old Wiki, so lets keep pointing there too + if (pid <= 56) { // Up to P056 seem to be listed in the old Wiki (and a few incomplete pages), so lets keep pointing there too addHelpButton(concat(F("Plugin"), Settings.getPluginID_for_task(taskIndex).value)); } addRTDPluginButton(Settings.getPluginID_for_task(taskIndex)); From 4bcf990a6878605d2b13371b6d88958b0c459158 Mon Sep 17 00:00:00 2001 From: TD-er Date: Sun, 21 Sep 2025 15:15:06 +0200 Subject: [PATCH 268/564] [WiFi] Fix scanning WiFi returns no networks found --- platformio_core_defs.ini | 2 +- .../NWPluginData_static_runtime.cpp | 62 ++++++++++++------- .../DataStructs/NWPluginData_static_runtime.h | 16 +++-- .../NWPluginData_static_runtime_ESP32.cpp | 17 ++++- .../NWPluginData_static_runtime_ESP8266.cpp | 18 +++--- src/ESPEasy/net/ESPEasyNetwork.cpp | 21 +++++++ src/ESPEasy/net/ESPEasyNetwork.h | 3 + src/ESPEasy/net/Globals/NWPlugins.cpp | 9 ++- src/ESPEasy/net/Globals/NWPlugins.h | 1 + .../net/Helpers/WiFi_AP_CandidatesList.cpp | 45 +++++++------- .../net/Helpers/WiFi_AP_CandidatesList.h | 6 +- .../NW002_data_struct_WiFi_AP.cpp | 4 +- .../wifi/ESPEasyWiFi_STA_Event_ESP8266.cpp | 3 +- .../net/wifi/ESPEasyWiFi_state_machine.cpp | 10 +-- src/ESPEasy/net/wifi/ESPEasyWifi.cpp | 3 +- .../net/wifi/ESPEasyWifi_ProcessEvent.cpp | 24 +++---- .../net/wifi/ESPEasyWifi_ProcessEvent.h | 16 ++--- .../net/wifi/ESPEasyWifi_abstracted.cpp | 5 +- .../net/wifi/ESPEasyWifi_abstracted_ESP32.cpp | 5 +- .../wifi/ESPEasyWifi_abstracted_ESP8266.cpp | 5 +- src/src/Helpers/StringProvider.cpp | 16 +---- src/src/WebServer/WiFiScanner.cpp | 1 + 22 files changed, 179 insertions(+), 113 deletions(-) diff --git a/platformio_core_defs.ini b/platformio_core_defs.ini index 570c5da13..1daa1eca6 100644 --- a/platformio_core_defs.ini +++ b/platformio_core_defs.ini @@ -165,7 +165,7 @@ extra_scripts = ${esp82xx_common.extra_scripts} ; ESP_IDF 5.5.0 [core_esp32_IDF5_5_0__3_2_0_LittleFS] platform = https://github.com/Jason2866/platform-espressif32.git#Arduino/IDF55_gcc15 -platform_packages = framework-arduinoespressif32 @ https://github.com/Jason2866/esp32-arduino-lib-builder/releases/download/1609-1652-5.5/framework-arduinoespressif32-release_v5.5-a942e2d1.tar.xz +platform_packages = framework-arduinoespressif32 @ https://github.com/Jason2866/esp32-arduino-lib-builder/releases/download/1809-0958-5.5/framework-arduinoespressif32-release_v5.5-b24d7e0b.tar.xz build_flags = -DESP32_STAGE -DESP_IDF_VERSION_MAJOR=5 -DLIBRARIES_NO_LOG=1 diff --git a/src/ESPEasy/net/DataStructs/NWPluginData_static_runtime.cpp b/src/ESPEasy/net/DataStructs/NWPluginData_static_runtime.cpp index b7bb374d3..f973c714d 100644 --- a/src/ESPEasy/net/DataStructs/NWPluginData_static_runtime.cpp +++ b/src/ESPEasy/net/DataStructs/NWPluginData_static_runtime.cpp @@ -31,22 +31,26 @@ static void tx_rx_event_handler(void *arg, esp_event_base_t event_base, { if (event_data == nullptr) { return; } ip_event_tx_rx_t *event = (ip_event_tx_rx_t *)event_data; - const int key = esp_netif_get_netif_impl_index(event->esp_netif); - if (event->dir == ESP_NETIF_TX) { - interfaceTrafficCount[key]._tx_count += event->len; - } else if (event->dir == ESP_NETIF_RX) { - interfaceTrafficCount[key]._rx_count += event->len; + if (event->len > 0) { + const int key = esp_netif_get_netif_impl_index(event->esp_netif); - /* - addLog(LOG_LEVEL_INFO, strformat( - F("RX: %s key: %d len: %d total: %d"), - esp_netif_get_desc(event->esp_netif), - key, - event->len, - interfaceTrafficCount[key]._rx_count - )); - */ + + if (event->dir == ESP_NETIF_TX) { + interfaceTrafficCount[key]._tx_count += event->len; + } else if (event->dir == ESP_NETIF_RX) { + interfaceTrafficCount[key]._rx_count += event->len; + + /* + addLog(LOG_LEVEL_INFO, strformat( + F("RX: %s key: %d len: %d total: %d"), + esp_netif_get_desc(event->esp_netif), + key, + event->len, + interfaceTrafficCount[key]._rx_count + )); + */ + } } } @@ -95,11 +99,12 @@ void NWPluginData_static_runtime::clear(networkIndex_t networkIndex) #endif _operationalStats.clear(); #if FEATURE_NETWORK_TRAFFIC_COUNT + if (_netif) { const int key = _netif->impl_index(); interfaceTrafficCount[key].clear(); } -#endif +#endif // if FEATURE_NETWORK_TRAFFIC_COUNT _networkIndex = networkIndex; #ifdef ESP32 @@ -126,8 +131,17 @@ void NWPluginData_static_runtime::processEvent_and_clear() bool NWPluginData_static_runtime::operational() const { - return connected() && hasIP() - && Settings.getNetworkEnabled(_networkIndex); + if (!Settings.getNetworkEnabled(_networkIndex)) { return false; } + + if (_isAP) { + return +#ifdef ESP32 + WiFi.AP.stationCount() > 0; +#else + WiFi.softAPgetStationNum() > 0; +#endif // ifdef ESP32 + } + return connected() && hasIP(); // FIXME TD-er: WiFi STA keeps reporting it is // connected and has IP even after call to networkdisable,1 @@ -156,11 +170,7 @@ void NWPluginData_static_runtime::processEvents() } } -// if (connected_changed || establishConnect_changed || gotIP_changed) { -// _operationalStats.forceSet(operational()); -// } else { - _operationalStats.set(operational()); -// } + _operationalStats.set(operational()); if (_operationalStats.changedSinceLastCheck_and_clear()) { #if FEATURE_NETWORK_TRAFFIC_COUNT @@ -185,6 +195,14 @@ void NWPluginData_static_runtime::processEvents() } statusLED(true); } + + if (_startStopStats.changedSinceLastCheck_and_clear() && _isAP && Settings.UseRules) { + if (_startStopStats.isOn()) { + eventQueue.add(F("WiFi#APmodeEnabled")); + } else if (_startStopStats.isOff()) { + eventQueue.add(F("WiFi#APmodeDisabled")); + } + } } String NWPluginData_static_runtime::statusToString() const diff --git a/src/ESPEasy/net/DataStructs/NWPluginData_static_runtime.h b/src/ESPEasy/net/DataStructs/NWPluginData_static_runtime.h index fd4f6cf66..bb744b3cb 100644 --- a/src/ESPEasy/net/DataStructs/NWPluginData_static_runtime.h +++ b/src/ESPEasy/net/DataStructs/NWPluginData_static_runtime.h @@ -18,10 +18,16 @@ namespace net { struct NWPluginData_static_runtime { #ifdef ESP32 - NWPluginData_static_runtime(NetworkInterface *netif, - const String & eventInterfaceName = EMPTY_STRING); + NWPluginData_static_runtime( + NetworkInterface *netif, + const String & eventInterfaceName = EMPTY_STRING); + + NWPluginData_static_runtime( + bool isAP, + NetworkInterface *netif, + const String & eventInterfaceName = EMPTY_STRING); #else // ifdef ESP32 - NWPluginData_static_runtime(bool isSTA, + NWPluginData_static_runtime(bool isAP, const char *eventInterfaceName); #endif // ifdef ESP32 @@ -134,9 +140,7 @@ private: #endif // ifdef ESP32 networkIndex_t _networkIndex = INVALID_NETWORK_INDEX; -#ifdef ESP8266 - const bool _isSTA; -#endif + const bool _isAP; String _eventInterfaceName; diff --git a/src/ESPEasy/net/DataStructs/NWPluginData_static_runtime_ESP32.cpp b/src/ESPEasy/net/DataStructs/NWPluginData_static_runtime_ESP32.cpp index ed104e820..6fd54085a 100644 --- a/src/ESPEasy/net/DataStructs/NWPluginData_static_runtime_ESP32.cpp +++ b/src/ESPEasy/net/DataStructs/NWPluginData_static_runtime_ESP32.cpp @@ -14,8 +14,21 @@ namespace ESPEasy { namespace net { -NWPluginData_static_runtime::NWPluginData_static_runtime(NetworkInterface *netif, const String& eventInterfaceName) - : _netif(netif), _eventInterfaceName(eventInterfaceName) +NWPluginData_static_runtime::NWPluginData_static_runtime( + NetworkInterface *netif, + const String & eventInterfaceName) + : _netif(netif), + _isAP(false), + _eventInterfaceName(eventInterfaceName) +{} + +NWPluginData_static_runtime::NWPluginData_static_runtime( + bool isAP, + NetworkInterface *netif, + const String & eventInterfaceName) + : _netif(netif), + _isAP(isAP), + _eventInterfaceName(eventInterfaceName) {} bool NWPluginData_static_runtime::started() const diff --git a/src/ESPEasy/net/DataStructs/NWPluginData_static_runtime_ESP8266.cpp b/src/ESPEasy/net/DataStructs/NWPluginData_static_runtime_ESP8266.cpp index 5fa2fe01b..cbc21b166 100644 --- a/src/ESPEasy/net/DataStructs/NWPluginData_static_runtime_ESP8266.cpp +++ b/src/ESPEasy/net/DataStructs/NWPluginData_static_runtime_ESP8266.cpp @@ -7,8 +7,8 @@ namespace ESPEasy { namespace net { -NWPluginData_static_runtime::NWPluginData_static_runtime(bool isSTA, const char * eventInterfaceName) - : _isSTA(isSTA), _eventInterfaceName(eventInterfaceName) {} +NWPluginData_static_runtime::NWPluginData_static_runtime(bool isAP, const char *eventInterfaceName) + : _isAP(isAP), _eventInterfaceName(eventInterfaceName) {} bool NWPluginData_static_runtime::started() const { @@ -18,14 +18,14 @@ bool NWPluginData_static_runtime::started() const bool NWPluginData_static_runtime::connected() const { - if (_isSTA) { return WiFi.status() == WL_CONNECTED; } + if (!_isAP) { return WiFi.status() == WL_CONNECTED; } return false; } bool NWPluginData_static_runtime::isDefaultRoute() const { // FIXME TD-er: Should I just return connected() here? - return _isSTA; + return !_isAP; } bool NWPluginData_static_runtime::hasIP() const @@ -37,7 +37,7 @@ void NWPluginData_static_runtime::mark_start() { _startStopStats.setOn(); # ifndef BUILD_NO_DEBUG - addLog(LOG_LEVEL_INFO, _isSTA ? F("STA: Started") : F("AP: Started")); + addLog(LOG_LEVEL_INFO, _isAP ? F("AP: Started") : F("STA: Started")); # endif } @@ -45,7 +45,7 @@ void NWPluginData_static_runtime::mark_stop() { _startStopStats.setOff(); # ifndef BUILD_NO_DEBUG - addLog(LOG_LEVEL_INFO, _isSTA ? F("STA: Stopped") : F("AP: Stopped")); + addLog(LOG_LEVEL_INFO, _isAP ? F("AP: Stopped") : F("STA: Stopped")); # endif } @@ -54,7 +54,7 @@ void NWPluginData_static_runtime::mark_got_IP() // Set OnOffTimer to off so we can also count how often we het new IP _gotIPStats.forceSet(true); # ifndef BUILD_NO_DEBUG - addLog(LOG_LEVEL_INFO, _isSTA ? F("STA: Got IP") : F("AP: Got IP")); + addLog(LOG_LEVEL_INFO, _isAP ? F("AP: Got IP") : F("STA: Got IP")); # endif } @@ -62,7 +62,7 @@ void NWPluginData_static_runtime::mark_lost_IP() { _gotIPStats.setOff(); # ifndef BUILD_NO_DEBUG - addLog(LOG_LEVEL_INFO, _isSTA ? F("STA: Lost IP") : F("AP: Lost IP")); + addLog(LOG_LEVEL_INFO, _isAP ? F("AP: Lost IP") : F("STA: Lost IP")); # endif } @@ -107,7 +107,7 @@ void NWPluginData_static_runtime::log_disconnected() { # ifndef BUILD_NO_DEBUG - if (_isSTA && loglevelActiveFor(LOG_LEVEL_INFO)) { + if (!_isAP && loglevelActiveFor(LOG_LEVEL_INFO)) { addLog(LOG_LEVEL_INFO, concat( F("STA: Disconnected. Connected for: "), format_msec_duration_HMS(_connectedStats.getLastOnDuration_ms()))); diff --git a/src/ESPEasy/net/ESPEasyNetwork.cpp b/src/ESPEasy/net/ESPEasyNetwork.cpp index fe1e4cca8..4e9d57b08 100644 --- a/src/ESPEasy/net/ESPEasyNetwork.cpp +++ b/src/ESPEasy/net/ESPEasyNetwork.cpp @@ -104,5 +104,26 @@ void CheckRunningServices() { #endif } +uint64_t NetworkConnectDuration_ms() +{ + auto data = getDefaultRoute_NWPluginData_static_runtime(); + + if (data == nullptr) { + return 0ull; + } + return data->_connectedStats.getLastOnDuration_ms(); +} + +uint32_t NetworkConnectCount() +{ + auto data = getDefaultRoute_NWPluginData_static_runtime(); + + if (data == nullptr) { + return 0ul; + } + return data->_connectedStats.getCycleCount(); +} + + } // namespace net } // namespace ESPEasy diff --git a/src/ESPEasy/net/ESPEasyNetwork.h b/src/ESPEasy/net/ESPEasyNetwork.h index 4e48f8489..acad41e41 100644 --- a/src/ESPEasy/net/ESPEasyNetwork.h +++ b/src/ESPEasy/net/ESPEasyNetwork.h @@ -27,6 +27,9 @@ IPAddress NetworkBroadcast(); IPAddress NetworkSubnetMask(); IPAddress NetworkGatewayIP(); IPAddress NetworkDnsIP(uint8_t dns_no); +uint64_t NetworkConnectDuration_ms(); +uint32_t NetworkConnectCount(); + #if FEATURE_USE_IPV6 IPAddress NetworkLocalIP6(); diff --git a/src/ESPEasy/net/Globals/NWPlugins.cpp b/src/ESPEasy/net/Globals/NWPlugins.cpp index 16f324638..91631e3e1 100644 --- a/src/ESPEasy/net/Globals/NWPlugins.cpp +++ b/src/ESPEasy/net/Globals/NWPlugins.cpp @@ -16,6 +16,7 @@ namespace ESPEasy { namespace net { #define NETWORK_INDEX_WIFI_STA 0 // Always the first network index +#define NETWORK_INDEX_WIFI_AP 1 // Always the 2nd network index bool NWPluginCall(NWPlugin::Function Function, EventStruct *event) { #ifdef USE_SECOND_HEAP @@ -392,10 +393,12 @@ String getNWPluginNameFromNWPluginID(nwpluginID_t nwpluginID) { NWPluginData_static_runtime* getWiFi_STA_NWPluginData_static_runtime() { - auto NW_data = getNWPluginData(NETWORK_INDEX_WIFI_STA); + return getNWPluginData_static_runtime(NETWORK_INDEX_WIFI_STA); +} - if (!NW_data) { return nullptr; } - return NW_data->getNWPluginData_static_runtime(); +NWPluginData_static_runtime* getWiFi_AP_NWPluginData_static_runtime() +{ + return getNWPluginData_static_runtime(NETWORK_INDEX_WIFI_AP); } NWPluginData_static_runtime* getNWPluginData_static_runtime(networkIndex_t index) diff --git a/src/ESPEasy/net/Globals/NWPlugins.h b/src/ESPEasy/net/Globals/NWPlugins.h index 56fd1f777..1fbd040ab 100644 --- a/src/ESPEasy/net/Globals/NWPlugins.h +++ b/src/ESPEasy/net/Globals/NWPlugins.h @@ -45,6 +45,7 @@ String getNWPluginNameFromNetworkDriverIndex(networkDriverIndex_t String getNWPluginNameFromNWPluginID(nwpluginID_t nwpluginID); NWPluginData_static_runtime* getWiFi_STA_NWPluginData_static_runtime(); +NWPluginData_static_runtime* getWiFi_AP_NWPluginData_static_runtime(); NWPluginData_static_runtime* getNWPluginData_static_runtime(networkIndex_t index); const NWPluginData_static_runtime* getDefaultRoute_NWPluginData_static_runtime(); diff --git a/src/ESPEasy/net/Helpers/WiFi_AP_CandidatesList.cpp b/src/ESPEasy/net/Helpers/WiFi_AP_CandidatesList.cpp index 4dbecb43b..fc219c43b 100644 --- a/src/ESPEasy/net/Helpers/WiFi_AP_CandidatesList.cpp +++ b/src/ESPEasy/net/Helpers/WiFi_AP_CandidatesList.cpp @@ -31,14 +31,18 @@ namespace wifi { # define WIFI_CUSTOM_SUPPORT_KEY_INDEX 4 # define WIFI_CREDENTIALS_FALLBACK_SSID_INDEX 5 +static LongTermOnOffTimer _last_scan; + WiFi_AP_CandidatesList::WiFi_AP_CandidatesList() { + _last_scan.clear(); known.clear(); candidates.clear(); known_it = known.begin(); } WiFi_AP_CandidatesList::~WiFi_AP_CandidatesList() { + _last_scan.clear(); candidates.clear(); known.clear(); scanned.clear(); @@ -104,11 +108,11 @@ void WiFi_AP_CandidatesList::force_reload() { RTC.clearLastWiFi(); // Invalidate the RTC WiFi data. candidates.clear(); load_knownCredentials(); - loadCandidatesFromScanned(); } -void WiFi_AP_CandidatesList::begin_scan() { - _last_scan.setNow(); +void WiFi_AP_CandidatesList::begin_scan(uint8_t channel) { + _last_scan.setOn(); + _last_scan_channel = channel; candidates.clear(); _addedKnownCandidate = false; } @@ -126,15 +130,21 @@ void WiFi_AP_CandidatesList::purge_expired() { # if !FEATURE_ESP8266_DIRECT_WIFI_SCAN void WiFi_AP_CandidatesList::process_WiFiscan() { - // Append or update found APs from scan. - int scancount = WiFi.scanComplete(); - for (int i = 0; i < scancount; ++i) { - const WiFi_AP_Candidate tmp(i); +// if (_last_scan.isOn()) { + // Append or update found APs from scan. + int scancount = WiFi.scanComplete(); + if (scancount < 0) { - scanned_new.push_back(tmp); - } + } else { + for (int i = 0; i < scancount; ++i) { + const WiFi_AP_Candidate tmp(i); - after_process_WiFiscan(); + scanned_new.push_back(tmp); + } + + after_process_WiFiscan(); + } +// } } # endif // if !FEATURE_ESP8266_DIRECT_WIFI_SCAN @@ -152,6 +162,7 @@ void WiFi_AP_CandidatesList::process_WiFiscan(const bss_info& ap) { # endif // ifdef ESP8266 void WiFi_AP_CandidatesList::after_process_WiFiscan() { + _last_scan.setOff(); scanned_new.sort(); scanned_new.unique(); _mustLoadCredentials = true; @@ -165,14 +176,6 @@ bool WiFi_AP_CandidatesList::getNext(bool scanAllowed) { if (candidates.empty()) { return false; - - /* if (scanAllowed) { - return false; - } - loadCandidatesFromScanned(); - attemptsLeft = WiFi_CONNECT_ATTEMPTS; - if (candidates.empty()) { return false; } - */ } currentCandidate = candidates.front(); @@ -275,11 +278,11 @@ void WiFi_AP_CandidatesList::markCurrentConnectionStable() { } int8_t WiFi_AP_CandidatesList::scanComplete() const { - if (!_last_scan.isSet() || - (_last_scan.millisPassedSince() > WIFI_AP_CANDIDATE_MAX_AGE)) return -3; +// if (!_last_scan.isOn() || +// (_last_scan.getLastOnDuration_ms() > WIFI_AP_CANDIDATE_MAX_AGE)) return -3; const int8_t scanCompleteStatus = WiFi.scanComplete(); - if (scanCompleteStatus < 0) { + if (scanCompleteStatus == -1) { // Still scanning return scanCompleteStatus; } diff --git a/src/ESPEasy/net/Helpers/WiFi_AP_CandidatesList.h b/src/ESPEasy/net/Helpers/WiFi_AP_CandidatesList.h index 4756913ac..b55b02874 100644 --- a/src/ESPEasy/net/Helpers/WiFi_AP_CandidatesList.h +++ b/src/ESPEasy/net/Helpers/WiFi_AP_CandidatesList.h @@ -3,7 +3,7 @@ #include "../../../ESPEasy_common.h" #include "../DataStructs/WiFi_AP_Candidate.h" -#include "../../../src/Helpers/LongTermTimer.h" +#include "../../../src/Helpers/LongTermOnOffTimer.h" #include @@ -31,7 +31,7 @@ struct WiFi_AP_CandidatesList { // Called after WiFi credentials have changed. void force_reload(); - void begin_scan(); + void begin_scan(uint8_t channel = 0); void purge_expired(); @@ -124,7 +124,7 @@ private: bool _mustLoadCredentials = true; bool _addedKnownCandidate = false; - LongTermTimer _last_scan; + uint8_t _last_scan_channel{}; public: diff --git a/src/ESPEasy/net/NWPluginStructs/NW002_data_struct_WiFi_AP.cpp b/src/ESPEasy/net/NWPluginStructs/NW002_data_struct_WiFi_AP.cpp index 96f151ba4..db624d1c1 100644 --- a/src/ESPEasy/net/NWPluginStructs/NW002_data_struct_WiFi_AP.cpp +++ b/src/ESPEasy/net/NWPluginStructs/NW002_data_struct_WiFi_AP.cpp @@ -27,9 +27,9 @@ namespace net { namespace wifi { # ifdef ESP32 -static NWPluginData_static_runtime stats_and_cache(&NW_PLUGIN_INTERFACE); +static NWPluginData_static_runtime stats_and_cache(true, &NW_PLUGIN_INTERFACE); # else -static NWPluginData_static_runtime stats_and_cache(false, "AP"); // Cannot use flash strings during init of static objects +static NWPluginData_static_runtime stats_and_cache(true, "AP"); // Cannot use flash strings during init of static objects # endif // ifdef ESP32 static bool nw002_initialized{}; # ifdef ESP32 diff --git a/src/ESPEasy/net/wifi/ESPEasyWiFi_STA_Event_ESP8266.cpp b/src/ESPEasy/net/wifi/ESPEasyWiFi_STA_Event_ESP8266.cpp index b9c465588..d6e944558 100644 --- a/src/ESPEasy/net/wifi/ESPEasyWiFi_STA_Event_ESP8266.cpp +++ b/src/ESPEasy/net/wifi/ESPEasyWiFi_STA_Event_ESP8266.cpp @@ -24,7 +24,7 @@ namespace ESPEasy { namespace net { namespace wifi { -static NWPluginData_static_runtime stats_and_cache(true, "WiFi"); // Cannot use flash strings during init of static objects +static NWPluginData_static_runtime stats_and_cache(false, "WiFi"); // Cannot use flash strings during init of static objects static WiFiDisconnectReason _wifi_disconnect_reason = WiFiDisconnectReason::WIFI_DISCONNECT_REASON_UNSPECIFIED; static uint8_t _authmode{}; @@ -131,7 +131,6 @@ void ESPEasyWiFi_STA_EventHandler::onWiFiScanDone(void ESPEasyWiFi_STA_EventHand ++scanCount; } WiFi_AP_Candidates.after_process_WiFiscan(); - WiFiEventData.lastGetScanMoment.setNow(); // WiFiEventData.processedScanDone = true; # ifndef BUILD_NO_DEBUG diff --git a/src/ESPEasy/net/wifi/ESPEasyWiFi_state_machine.cpp b/src/ESPEasy/net/wifi/ESPEasyWiFi_state_machine.cpp index 76d67e95e..59295a74a 100644 --- a/src/ESPEasy/net/wifi/ESPEasyWiFi_state_machine.cpp +++ b/src/ESPEasy/net/wifi/ESPEasyWiFi_state_machine.cpp @@ -174,13 +174,13 @@ void ESPEasyWiFi_t::loop() # endif // ifndef BUILD_NO_DEBUG } else if (scanCompleteStatus == -2) { // WIFI_SCAN_FAILED addLog(LOG_LEVEL_ERROR, F("WiFi : Scan failed")); - WiFi.scanDelete(); +// WiFi.scanDelete(); setState(WiFiState_e::WiFiOFF, 1000); WiFiEventData.processedScanDone = true; } if (_state_timeout.timeReached() || (scanCompleteStatus >= 0)) { - WiFi.scanDelete(); +// WiFi.scanDelete(); if (_state_timeout.timeReached()) { # ifndef BUILD_NO_DEBUG @@ -211,13 +211,13 @@ void ESPEasyWiFi_t::loop() # endif // ifndef BUILD_NO_DEBUG } else if (scanCompleteStatus == -2) { // WIFI_SCAN_FAILED addLog(LOG_LEVEL_ERROR, F("WiFi : Scan failed")); - WiFi.scanDelete(); +// WiFi.scanDelete(); setState(WiFiState_e::WiFiOFF, 1000); WiFiEventData.processedScanDone = true; } if (_state_timeout.timeReached() || (scanCompleteStatus >= 0)) { - WiFi.scanDelete(); +// WiFi.scanDelete(); if (_state_timeout.timeReached()) { # ifndef BUILD_NO_DEBUG @@ -331,7 +331,7 @@ void ESPEasyWiFi_t::setState(WiFiState_e newState, uint32_t timeout) { if ((_state == WiFiState_e::STA_AP_Scanning) || (_state == WiFiState_e::STA_Scanning)) { - WiFi.scanDelete(); + WiFi_AP_Candidates.process_WiFiscan(); } if (timeout == 0) diff --git a/src/ESPEasy/net/wifi/ESPEasyWifi.cpp b/src/ESPEasy/net/wifi/ESPEasyWifi.cpp index 57816c772..05e51d54f 100644 --- a/src/ESPEasy/net/wifi/ESPEasyWifi.cpp +++ b/src/ESPEasy/net/wifi/ESPEasyWifi.cpp @@ -230,13 +230,14 @@ void WiFiScan_log_to_serial() if (WiFi_AP_Candidates.scanComplete() <= 0) { WiFiMode_t cur_wifimode = WiFi.getMode(); WifiScan(false); + WiFi_AP_Candidates.process_WiFiscan(); setWifiMode(cur_wifimode); } const int8_t scanCompleteStatus = WiFi_AP_Candidates.scanComplete(); if (scanCompleteStatus <= 0) { - serialPrintln(F("WIFI : No networks found")); + serialPrintln(concat(F("WIFI : No networks found. Status: "), scanCompleteStatus)); } else { diff --git a/src/ESPEasy/net/wifi/ESPEasyWifi_ProcessEvent.cpp b/src/ESPEasy/net/wifi/ESPEasyWifi_ProcessEvent.cpp index f6ddc527f..1e0522ee4 100644 --- a/src/ESPEasy/net/wifi/ESPEasyWifi_ProcessEvent.cpp +++ b/src/ESPEasy/net/wifi/ESPEasyWifi_ProcessEvent.cpp @@ -109,25 +109,23 @@ void handle_unprocessedNetworkEvents() // Functions to process the data gathered from the events. // These functions are called from Setup() or Loop() and thus may call delay() or yield() // ******************************************************************************** +/* void processDisconnect() {} void processConnect() { if (WiFiEventData.processedConnect) { return; } - /* // delay(100); // FIXME TD-er: See https://github.com/letscontrolit/ESPEasy/issues/1987#issuecomment-451644424 - if (checkAndResetWiFi()) { - return; - } - */ +// if (checkAndResetWiFi()) { +// return; +// } + WiFiEventData.processedConnect = true; - /* - if (WiFi.status() == WL_DISCONNECTED) { - // Apparently not really connected - return; - } - */ +// if (WiFi.status() == WL_DISCONNECTED) { + // Apparently not really connected +// return; +// } WiFiEventData.setWiFiConnected(); ++WiFiEventData.wifi_reconnects; @@ -201,6 +199,7 @@ void processConnect() { logConnectionStatus(); } + void processGotIP() { if (WiFiEventData.processedGotIP) { return; @@ -290,6 +289,7 @@ void processGotIP() { logConnectionStatus(); } + # if FEATURE_USE_IPV6 void processGotIPv6() { @@ -308,6 +308,7 @@ void processGotIPv6() { # endif // if FEATURE_USE_IPV6 + // A client disconnected from the AP on this node. void processDisconnectAPmode() { if (WiFiEventData.processedDisconnectAPmode) { return; } @@ -451,6 +452,7 @@ void processScanDone() { } } + */ } // namespace wifi } // namespace net diff --git a/src/ESPEasy/net/wifi/ESPEasyWifi_ProcessEvent.h b/src/ESPEasy/net/wifi/ESPEasyWifi_ProcessEvent.h index 405067c7d..c6e6f6955 100644 --- a/src/ESPEasy/net/wifi/ESPEasyWifi_ProcessEvent.h +++ b/src/ESPEasy/net/wifi/ESPEasyWifi_ProcessEvent.h @@ -8,16 +8,16 @@ namespace net { namespace wifi { //void handle_unprocessedNetworkEvents(); -void processDisconnect(); -void processConnect(); -void processGotIP(); +//void processDisconnect(); +//void processConnect(); +//void processGotIP(); # if FEATURE_USE_IPV6 -void processGotIPv6(); +//void processGotIPv6(); # endif -void processDisconnectAPmode(); -void processConnectAPmode(); -void processDisableAPmode(); -void processScanDone(); +//void processDisconnectAPmode(); +//void processConnectAPmode(); +//void processDisableAPmode(); +//void processScanDone(); } // namespace wifi } // namespace net diff --git a/src/ESPEasy/net/wifi/ESPEasyWifi_abstracted.cpp b/src/ESPEasy/net/wifi/ESPEasyWifi_abstracted.cpp index d6d875993..6eb233372 100644 --- a/src/ESPEasy/net/wifi/ESPEasyWifi_abstracted.cpp +++ b/src/ESPEasy/net/wifi/ESPEasyWifi_abstracted.cpp @@ -116,7 +116,8 @@ void doSetAPinternal(bool enable) } if (WiFi.softAP(softAPSSID.c_str(), pwd.c_str(), channel)) { - eventQueue.add(F("WiFi#APmodeEnabled")); + auto data = getWiFi_AP_NWPluginData_static_runtime(); + if (data) data->mark_start(); if (loglevelActiveFor(LOG_LEVEL_INFO)) { addLogMove(LOG_LEVEL_INFO, strformat( @@ -162,6 +163,8 @@ void doSetAPinternal(bool enable) dnsServer.stop(); } # endif // if FEATURE_DNS_SERVER + auto data = getWiFi_AP_NWPluginData_static_runtime(); + if (data) data->mark_stop(); } } diff --git a/src/ESPEasy/net/wifi/ESPEasyWifi_abstracted_ESP32.cpp b/src/ESPEasy/net/wifi/ESPEasyWifi_abstracted_ESP32.cpp index 0e8f5ab2c..cb63f811a 100644 --- a/src/ESPEasy/net/wifi/ESPEasyWifi_abstracted_ESP32.cpp +++ b/src/ESPEasy/net/wifi/ESPEasyWifi_abstracted_ESP32.cpp @@ -104,7 +104,7 @@ bool doSetWifiMode(WiFiMode_t new_mode) doWiFiDisconnect(); // delay(100); - processDisconnect(); + //processDisconnect(); // WiFiEventData.clear_processed_flags(); } @@ -265,7 +265,8 @@ void doWifiScan(bool async, uint8_t channel) { if (!async) { FeedSW_watchdog(); - processScanDone(); + WiFi_AP_Candidates.process_WiFiscan(); +// processScanDone(); } } # if FEATURE_TIMING_STATS diff --git a/src/ESPEasy/net/wifi/ESPEasyWifi_abstracted_ESP8266.cpp b/src/ESPEasy/net/wifi/ESPEasyWifi_abstracted_ESP8266.cpp index d42f4a1d4..b7375b66a 100644 --- a/src/ESPEasy/net/wifi/ESPEasyWifi_abstracted_ESP8266.cpp +++ b/src/ESPEasy/net/wifi/ESPEasyWifi_abstracted_ESP8266.cpp @@ -200,7 +200,10 @@ void doWifiScan(bool async, uint8_t channel) { if (!async) { FeedSW_watchdog(); - processScanDone(); + WiFi_AP_Candidates.process_WiFiscan(); + + // FIXME TD-er: This should call WiFi_AP_Candidates.process_WiFiscan(); +// processScanDone(); } } # if FEATURE_TIMING_STATS diff --git a/src/src/Helpers/StringProvider.cpp b/src/src/Helpers/StringProvider.cpp index 60d368144..3f0df8b89 100644 --- a/src/src/Helpers/StringProvider.cpp +++ b/src/src/Helpers/StringProvider.cpp @@ -520,24 +520,14 @@ String getValue(LabelType::Enum label) { WiFi_encryptionType(WiFiEventData.auth_mode); #endif case LabelType::CONNECTED: - #if FEATURE_ETHERNET - if(active_network_medium == ESPEasy::net::NetworkMedium_t::Ethernet) { - return format_msec_duration(EthEventData.lastConnectMoment.millisPassedSince()); - } - #endif // if FEATURE_ETHERNET - return format_msec_duration(WiFiEventData.lastConnectMoment.millisPassedSince()); + return format_msec_duration(ESPEasy::net::NetworkConnectDuration_ms()); // Use only the nr of seconds to fit it in an int32, plus append '000' to have msec format again. case LabelType::CONNECTED_MSEC: - #if FEATURE_ETHERNET - if(active_network_medium == ESPEasy::net::NetworkMedium_t::Ethernet) { - return String(static_cast(EthEventData.lastConnectMoment.millisPassedSince() / 1000ll)) + F("000"); - } - #endif // if FEATURE_ETHERNET - return String(static_cast(WiFiEventData.lastConnectMoment.millisPassedSince() / 1000ll)) + F("000"); + return String(static_cast(ESPEasy::net::NetworkConnectDuration_ms() / 1000ll)) + F("000"); case LabelType::LAST_DISCONNECT_REASON: return String(WiFiEventData.lastDisconnectReason); case LabelType::LAST_DISC_REASON_STR: return getLastDisconnectReason(); - case LabelType::NUMBER_RECONNECTS: retval = WiFiEventData.wifi_reconnects; break; + case LabelType::NUMBER_RECONNECTS: retval = ESPEasy::net::NetworkConnectCount(); break; case LabelType::WIFI_STORED_SSID1: return String(SecuritySettings.WifiSSID); case LabelType::WIFI_STORED_SSID2: return String(SecuritySettings.WifiSSID2); diff --git a/src/src/WebServer/WiFiScanner.cpp b/src/src/WebServer/WiFiScanner.cpp index 9b73cb6b3..48d35e535 100644 --- a/src/src/WebServer/WiFiScanner.cpp +++ b/src/src/WebServer/WiFiScanner.cpp @@ -68,6 +68,7 @@ void handle_wifiscanner() { WiFiMode_t cur_wifimode = WiFi.getMode(); ESPEasy::net::wifi::WifiScan(false); + ESPEasy::net::wifi::WiFi_AP_Candidates.process_WiFiscan(); int8_t scanCompleteStatus = ESPEasy::net::wifi::WiFi_AP_Candidates.scanComplete(); ESPEasy::net::wifi::setWifiMode(cur_wifimode); From cf56ffe88872924ba3dcaedb9ec13883095b5a55 Mon Sep 17 00:00:00 2001 From: Ton Huisman Date: Sun, 21 Sep 2025 17:08:13 +0200 Subject: [PATCH 269/564] [Devices] Limit displaying of (old) Wiki Help button to P079 and below --- src/src/WebServer/DevicesPage.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/src/WebServer/DevicesPage.cpp b/src/src/WebServer/DevicesPage.cpp index bfa6dbf0c..4cf767eeb 100644 --- a/src/src/WebServer/DevicesPage.cpp +++ b/src/src/WebServer/DevicesPage.cpp @@ -1075,7 +1075,7 @@ void handle_devices_TaskSettingsPage(taskIndex_t taskIndex, uint8_t page) addHtml(getPluginNameFromDeviceIndex(DeviceIndex)); const uint8_t pid = Settings.getPluginID_for_task(taskIndex).value; - if (pid <= 56) { // Up to P056 seem to be listed in the old Wiki (and a few incomplete pages), so lets keep pointing there too + if (pid <= 79) { // Up to P079 seem to be listed in the old Wiki (and a few incomplete pages), so lets keep pointing there too addHelpButton(concat(F("Plugin"), Settings.getPluginID_for_task(taskIndex).value)); } addRTDPluginButton(Settings.getPluginID_for_task(taskIndex)); From 4905c5462048b1c3cd109c0116854641bbbfcdf8 Mon Sep 17 00:00:00 2001 From: TD-er Date: Sun, 21 Sep 2025 22:28:28 +0200 Subject: [PATCH 270/564] [Network] Fix showing stats and connection info --- .../net/DataStructs/NWPluginData_base.cpp | 17 +++++----- .../net/DataStructs/NWPluginData_base.h | 3 +- .../NWPluginData_static_runtime.cpp | 15 +++----- .../DataStructs/NWPluginData_static_runtime.h | 16 +++++++-- src/ESPEasy/net/Globals/NWPlugins.cpp | 15 ++++---- .../NW001_data_struct_WiFi_STA.cpp | 5 +++ .../NW001_data_struct_WiFi_STA.h | 2 ++ src/ESPEasy/net/_NW001_WiFi_STA.cpp | 2 +- src/ESPEasy/net/_NWPlugin_Helper.h | 4 +++ .../net/wifi/ESPEasyWiFi_state_machine.cpp | 2 +- src/src/Helpers/StringConverter.cpp | 7 ++-- src/src/Helpers/StringConverter.h | 8 ++--- src/src/Helpers/StringGenerator_WiFi.cpp | 34 +++++++++++++++---- src/src/Helpers/StringGenerator_WiFi.h | 8 ++++- src/src/Helpers/StringProvider.cpp | 7 ++-- src/src/WebServer/NetworkPage.cpp | 15 +++++--- src/src/WebServer/SysInfoPage.cpp | 12 +++---- 17 files changed, 110 insertions(+), 62 deletions(-) diff --git a/src/ESPEasy/net/DataStructs/NWPluginData_base.cpp b/src/ESPEasy/net/DataStructs/NWPluginData_base.cpp index 2877fe9e4..2aaeec8a5 100644 --- a/src/ESPEasy/net/DataStructs/NWPluginData_base.cpp +++ b/src/ESPEasy/net/DataStructs/NWPluginData_base.cpp @@ -183,15 +183,14 @@ bool NWPluginData_base::pushStatsValues(EventStruct *event, # if FEATURE_NETWORK_TRAFFIC_COUNT // Include traffic - uint64_t tx{}; - uint64_t rx{}; + TX_RX_traffic_count traffic{}; - if (getTrafficCount(tx, rx)) { + if (getTrafficCount(traffic)) { // Only set value when _prevRX/TX was set to make sure there isn't an enormous spike - event->ParfN[valueCount++] = _prevTX == 0 ? 0 : tx - _prevTX; - event->ParfN[valueCount++] = _prevRX == 0 ? 0 : rx - _prevRX; - _prevRX = rx; - _prevTX = tx; + event->ParfN[valueCount++] = _prevTX == 0 ? 0 : traffic._tx_count - _prevTX; + event->ParfN[valueCount++] = _prevRX == 0 ? 0 : traffic._rx_count - _prevRX; + _prevRX = traffic._rx_count; + _prevTX = traffic._tx_count; } else { event->ParfN[valueCount++] = NAN; event->ParfN[valueCount++] = NAN; @@ -359,11 +358,11 @@ void NWPluginData_base::enable_txrx_events() } } -bool NWPluginData_base::getTrafficCount(uint64_t& tx, uint64_t& rx) +bool NWPluginData_base::getTrafficCount(TX_RX_traffic_count& traffic) { if (!_netif) { return false; } auto cache = getNWPluginData_static_runtime(); - return cache && cache->getTrafficCount(tx, rx); + return cache && cache->getTrafficCount(traffic); } #endif // if FEATURE_NETWORK_TRAFFIC_COUNT diff --git a/src/ESPEasy/net/DataStructs/NWPluginData_base.h b/src/ESPEasy/net/DataStructs/NWPluginData_base.h index 0f3910392..217a381b2 100644 --- a/src/ESPEasy/net/DataStructs/NWPluginData_base.h +++ b/src/ESPEasy/net/DataStructs/NWPluginData_base.h @@ -106,8 +106,7 @@ struct NWPluginData_base { #endif #if FEATURE_NETWORK_TRAFFIC_COUNT void enable_txrx_events(); - bool getTrafficCount(uint64_t& tx, - uint64_t& rx); + bool getTrafficCount(TX_RX_traffic_count& traffic); #endif // if FEATURE_NETWORK_TRAFFIC_COUNT virtual NWPluginData_static_runtime* getNWPluginData_static_runtime() = 0; diff --git a/src/ESPEasy/net/DataStructs/NWPluginData_static_runtime.cpp b/src/ESPEasy/net/DataStructs/NWPluginData_static_runtime.cpp index f973c714d..6884c3896 100644 --- a/src/ESPEasy/net/DataStructs/NWPluginData_static_runtime.cpp +++ b/src/ESPEasy/net/DataStructs/NWPluginData_static_runtime.cpp @@ -13,14 +13,6 @@ namespace net { #define CONNECT_TIMEOUT_MAX 10000 // in milliSeconds #if FEATURE_NETWORK_TRAFFIC_COUNT -struct TX_RX_traffic_count { - - void clear() { _tx_count = 0; _rx_count = 0; } - - uint64_t _tx_count{}; - uint64_t _rx_count{}; - -}; typedef std::map InterfaceTrafficCount_t; @@ -38,8 +30,10 @@ static void tx_rx_event_handler(void *arg, esp_event_base_t event_base, if (event->dir == ESP_NETIF_TX) { interfaceTrafficCount[key]._tx_count += event->len; + interfaceTrafficCount[key]._tx_packets++; } else if (event->dir == ESP_NETIF_RX) { interfaceTrafficCount[key]._rx_count += event->len; + interfaceTrafficCount[key]._rx_packets++; /* addLog(LOG_LEVEL_INFO, strformat( @@ -77,14 +71,13 @@ void NWPluginData_static_runtime::enable_txrx_events() } } -bool NWPluginData_static_runtime::getTrafficCount(uint64_t& tx, uint64_t& rx) const +bool NWPluginData_static_runtime::getTrafficCount(TX_RX_traffic_count& traffic) const { const int key = _netif->impl_index(); auto it = interfaceTrafficCount.find(key); if (it == interfaceTrafficCount.end()) { return false; } - tx = it->second._tx_count; - rx = it->second._rx_count; + traffic = it->second; return true; } diff --git a/src/ESPEasy/net/DataStructs/NWPluginData_static_runtime.h b/src/ESPEasy/net/DataStructs/NWPluginData_static_runtime.h index bb744b3cb..303b54fea 100644 --- a/src/ESPEasy/net/DataStructs/NWPluginData_static_runtime.h +++ b/src/ESPEasy/net/DataStructs/NWPluginData_static_runtime.h @@ -16,6 +16,19 @@ namespace ESPEasy { namespace net { +#if FEATURE_NETWORK_TRAFFIC_COUNT +struct TX_RX_traffic_count { + + void clear() { _tx_count = 0; _rx_count = 0; _tx_packets = 0; _rx_packets = 0; } + + uint64_t _tx_count{}; + uint64_t _rx_count{}; + uint32_t _tx_packets{}; + uint32_t _rx_packets{}; + +}; +#endif + struct NWPluginData_static_runtime { #ifdef ESP32 NWPluginData_static_runtime( @@ -35,8 +48,7 @@ struct NWPluginData_static_runtime { #if FEATURE_NETWORK_TRAFFIC_COUNT void enable_txrx_events(); - bool getTrafficCount(uint64_t& tx, - uint64_t& rx) const; + bool getTrafficCount(TX_RX_traffic_count& traffic) const; #endif // if FEATURE_NETWORK_TRAFFIC_COUNT void clear(networkIndex_t networkIndex = INVALID_NETWORK_INDEX); diff --git a/src/ESPEasy/net/Globals/NWPlugins.cpp b/src/ESPEasy/net/Globals/NWPlugins.cpp index 91631e3e1..3cfe0e34b 100644 --- a/src/ESPEasy/net/Globals/NWPlugins.cpp +++ b/src/ESPEasy/net/Globals/NWPlugins.cpp @@ -15,9 +15,6 @@ namespace ESPEasy { namespace net { -#define NETWORK_INDEX_WIFI_STA 0 // Always the first network index -#define NETWORK_INDEX_WIFI_AP 1 // Always the 2nd network index - bool NWPluginCall(NWPlugin::Function Function, EventStruct *event) { #ifdef USE_SECOND_HEAP HeapSelectDram ephemeral; @@ -133,12 +130,12 @@ bool NWPluginCall(NWPlugin::Function Function, EventStruct *event, String& str) #if FEATURE_NETWORK_TRAFFIC_COUNT case NWPlugin::Function::NWPLUGIN_GET_TRAFFIC_COUNT: { - uint64_t tx{}; - uint64_t rx{}; - - if (NW_data->getTrafficCount(tx, rx)) { - event->Par64_1 = tx; - event->Par64_2 = rx; + TX_RX_traffic_count traffic{}; + if (NW_data->getTrafficCount(traffic)) { + event->Par64_1 = traffic._tx_count; + event->Par64_2 = traffic._rx_count; + event->Par5 = traffic._tx_packets; + event->Par6 = traffic._rx_packets; success = true; } break; diff --git a/src/ESPEasy/net/NWPluginStructs/NW001_data_struct_WiFi_STA.cpp b/src/ESPEasy/net/NWPluginStructs/NW001_data_struct_WiFi_STA.cpp index d408cf5b2..1e9e09efc 100644 --- a/src/ESPEasy/net/NWPluginStructs/NW001_data_struct_WiFi_STA.cpp +++ b/src/ESPEasy/net/NWPluginStructs/NW001_data_struct_WiFi_STA.cpp @@ -115,6 +115,11 @@ const __FlashStringHelper * NW001_data_struct_WiFi_STA::getWiFi_encryptionType() return _WiFiEventHandler.getWiFi_encryptionType(); } +WiFiDisconnectReason NW001_data_struct_WiFi_STA::getWiFi_disconnectReason() const +{ + return _WiFiEventHandler.getLastDisconnectReason(); +} + # ifdef ESP32 bool NW001_data_struct_WiFi_STA::handle_priority_route_changed() diff --git a/src/ESPEasy/net/NWPluginStructs/NW001_data_struct_WiFi_STA.h b/src/ESPEasy/net/NWPluginStructs/NW001_data_struct_WiFi_STA.h index e1f894f92..165453ee8 100644 --- a/src/ESPEasy/net/NWPluginStructs/NW001_data_struct_WiFi_STA.h +++ b/src/ESPEasy/net/NWPluginStructs/NW001_data_struct_WiFi_STA.h @@ -43,6 +43,8 @@ struct NW001_data_struct_WiFi_STA : public NWPluginData_base { NWPluginData_static_runtime* getNWPluginData_static_runtime(); const __FlashStringHelper* getWiFi_encryptionType() const; + WiFiDisconnectReason getWiFi_disconnectReason() const; + private: ESPEasyWiFi_STA_EventHandler _WiFiEventHandler; diff --git a/src/ESPEasy/net/_NW001_WiFi_STA.cpp b/src/ESPEasy/net/_NW001_WiFi_STA.cpp index 14f532e96..3cdede204 100644 --- a/src/ESPEasy/net/_NW001_WiFi_STA.cpp +++ b/src/ESPEasy/net/_NW001_WiFi_STA.cpp @@ -119,7 +119,7 @@ bool NWPlugin_001(NWPlugin::Function function, EventStruct *event, String& strin if (success) { string += strformat( F("\n%s\nRSSI: %d dBm"), - FsP(toString(ESPEasy::net::wifi::getConnectionProtocol())), + FsP(ESPEasy::net::wifi::toString(ESPEasy::net::wifi::getConnectionProtocol())), WiFi.RSSI()); ESPEasy::net::wifi::NW001_data_struct_WiFi_STA *NW_data = diff --git a/src/ESPEasy/net/_NWPlugin_Helper.h b/src/ESPEasy/net/_NWPlugin_Helper.h index fa2c33701..589fa66e6 100644 --- a/src/ESPEasy/net/_NWPlugin_Helper.h +++ b/src/ESPEasy/net/_NWPlugin_Helper.h @@ -11,6 +11,10 @@ namespace ESPEasy { namespace net { +#define NETWORK_INDEX_WIFI_STA 0 // Always the first network index +#define NETWORK_INDEX_WIFI_AP 1 // Always the 2nd network index + + extern NWPluginData_base *NWPlugin_task_data[NETWORK_MAX]; // Try to allocate in PSRAM or 2nd heap if possible diff --git a/src/ESPEasy/net/wifi/ESPEasyWiFi_state_machine.cpp b/src/ESPEasy/net/wifi/ESPEasyWiFi_state_machine.cpp index 59295a74a..14fdc2b23 100644 --- a/src/ESPEasy/net/wifi/ESPEasyWiFi_state_machine.cpp +++ b/src/ESPEasy/net/wifi/ESPEasyWiFi_state_machine.cpp @@ -456,7 +456,7 @@ bool ESPEasyWiFi_t::connectSTA() # ifndef BUILD_NO_DEBUG addLog(LOG_LEVEL_INFO, concat( F("WiFi : Disconnect reason: "), - getLastDisconnectReason())); + getWiFi_disconnectReason_str())); # endif // ifndef BUILD_NO_DEBUG WiFiEventData.processedDisconnect = true; } diff --git a/src/src/Helpers/StringConverter.cpp b/src/src/Helpers/StringConverter.cpp index 917d8fa10..a2ee6f336 100644 --- a/src/src/Helpers/StringConverter.cpp +++ b/src/src/Helpers/StringConverter.cpp @@ -372,14 +372,17 @@ String formatToHex_no_prefix(unsigned long value, unsigned int minimal_hex_digit return strformat(fmt, value); } -String formatHumanReadable(unsigned long value, unsigned long factor) { +String formatHumanReadable(uint64_t value, + uint32_t factor) { String result = formatHumanReadable(value, factor, 2); result.replace(F(".00"), EMPTY_STRING); return result; } -String formatHumanReadable(unsigned long value, unsigned long factor, int NrDecimals) { +String formatHumanReadable(uint64_t value, + uint32_t factor, + int NrDecimals) { float floatValue(value); uint8_t steps = 0; diff --git a/src/src/Helpers/StringConverter.h b/src/src/Helpers/StringConverter.h index 21d6a451a..5e64ca65c 100644 --- a/src/src/Helpers/StringConverter.h +++ b/src/src/Helpers/StringConverter.h @@ -149,11 +149,11 @@ String formatToHex(unsigned long value, unsigned int minimal_hex_digits = 0); String formatToHex_no_prefix(unsigned long value, unsigned int minimal_hex_digits = 0); -String formatHumanReadable(unsigned long value, - unsigned long factor); +String formatHumanReadable(uint64_t value, + uint32_t factor); -String formatHumanReadable(unsigned long value, - unsigned long factor, +String formatHumanReadable(uint64_t value, + uint32_t factor, int NrDecimals); String formatToHex_decimal(unsigned long value); diff --git a/src/src/Helpers/StringGenerator_WiFi.cpp b/src/src/Helpers/StringGenerator_WiFi.cpp index cab552027..7a4f08d49 100644 --- a/src/src/Helpers/StringGenerator_WiFi.cpp +++ b/src/src/Helpers/StringGenerator_WiFi.cpp @@ -3,6 +3,8 @@ #include "../Helpers/StringConverter.h" #include "../../ESPEasy/net/Globals/ESPEasyWiFiEvent.h" +#include "../../ESPEasy/net/_NWPlugin_Helper.h" +#include "../../ESPEasy/net/NWPluginStructs/NW001_data_struct_WiFi_STA.h" #ifdef ESP8266 #include @@ -130,13 +132,33 @@ const __FlashStringHelper * getLastDisconnectReason(WiFiDisconnectReason reason) } } -String getLastDisconnectReason() { +WiFiDisconnectReason getWiFi_disconnectReason() +{ + ESPEasy::net::wifi::NW001_data_struct_WiFi_STA *NW_data = + static_cast(ESPEasy::net::getNWPluginData(NETWORK_INDEX_WIFI_STA)); + if (NW_data) { + return NW_data->getWiFi_disconnectReason(); + } + return WIFI_DISCONNECT_REASON_UNSPECIFIED; +} + +String getWiFi_disconnectReason_str() { #ifndef LIMIT_BUILD_SIZE - String reason = wrap_braces(String(WiFiEventData.lastDisconnectReason)); - reason += ' '; - reason += getLastDisconnectReason(WiFiEventData.lastDisconnectReason); - return reason; + const WiFiDisconnectReason reason = getWiFi_disconnectReason(); + return strformat( + F("(%d) %s"), + reason, + FsP(getLastDisconnectReason(reason))); #else - return wrap_braces(String(WiFiEventData.lastDisconnectReason)); + return wrap_braces(String(getWiFi_disconnectReason())); #endif } + +const __FlashStringHelper* getWiFi_encryptionType() { + ESPEasy::net::wifi::NW001_data_struct_WiFi_STA *NW_data = + static_cast(ESPEasy::net::getNWPluginData(NETWORK_INDEX_WIFI_STA)); + if (NW_data) { + return NW_data->getWiFi_encryptionType(); + } + return F("-"); +} \ No newline at end of file diff --git a/src/src/Helpers/StringGenerator_WiFi.h b/src/src/Helpers/StringGenerator_WiFi.h index d08e57b98..0f953b5dc 100644 --- a/src/src/Helpers/StringGenerator_WiFi.h +++ b/src/src/Helpers/StringGenerator_WiFi.h @@ -3,6 +3,8 @@ #include "../../ESPEasy_common.h" +#include "../../ESPEasy/net/wifi/WiFiDisconnectReason.h" + const __FlashStringHelper * WiFi_encryptionType(uint8_t encryptionType); #ifdef ESP8266 @@ -15,6 +17,10 @@ const __FlashStringHelper * SDKwifiStatusToString(uint8_t sdk_wifistatus); String ArduinoWifiStatusToString(uint8_t arduino_corelib_wifistatus); -String getLastDisconnectReason(); +WiFiDisconnectReason getWiFi_disconnectReason(); + +String getWiFi_disconnectReason_str(); + +const __FlashStringHelper* getWiFi_encryptionType(); #endif \ No newline at end of file diff --git a/src/src/Helpers/StringProvider.cpp b/src/src/Helpers/StringProvider.cpp index 3f0df8b89..89fff8b33 100644 --- a/src/src/Helpers/StringProvider.cpp +++ b/src/src/Helpers/StringProvider.cpp @@ -516,8 +516,7 @@ String getValue(LabelType::Enum label) { case LabelType::SSID: return WiFi.SSID(); case LabelType::BSSID: return WiFi.BSSIDstr(); case LabelType::CHANNEL: retval = WiFi.channel(); break; - case LabelType::ENCRYPTION_TYPE_STA: return // ESPEasy::net::wifi::WiFi_AP_Candidates.getCurrent().encryption_type(); - WiFi_encryptionType(WiFiEventData.auth_mode); + case LabelType::ENCRYPTION_TYPE_STA: return getWiFi_encryptionType(); #endif case LabelType::CONNECTED: return format_msec_duration(ESPEasy::net::NetworkConnectDuration_ms()); @@ -525,8 +524,8 @@ String getValue(LabelType::Enum label) { // Use only the nr of seconds to fit it in an int32, plus append '000' to have msec format again. case LabelType::CONNECTED_MSEC: return String(static_cast(ESPEasy::net::NetworkConnectDuration_ms() / 1000ll)) + F("000"); - case LabelType::LAST_DISCONNECT_REASON: return String(WiFiEventData.lastDisconnectReason); - case LabelType::LAST_DISC_REASON_STR: return getLastDisconnectReason(); + case LabelType::LAST_DISCONNECT_REASON: retval = getWiFi_disconnectReason(); break; + case LabelType::LAST_DISC_REASON_STR: return getWiFi_disconnectReason_str(); case LabelType::NUMBER_RECONNECTS: retval = ESPEasy::net::NetworkConnectCount(); break; case LabelType::WIFI_STORED_SSID1: return String(SecuritySettings.WifiSSID); case LabelType::WIFI_STORED_SSID2: return String(SecuritySettings.WifiSSID2); diff --git a/src/src/WebServer/NetworkPage.cpp b/src/src/WebServer/NetworkPage.cpp index fbb18995e..e65b0fc4f 100644 --- a/src/src/WebServer/NetworkPage.cpp +++ b/src/src/WebServer/NetworkPage.cpp @@ -511,10 +511,17 @@ void handle_networks_NetworkSettingsPage(ESPEasy::net::networkIndex_t networkind # if FEATURE_NETWORK_TRAFFIC_COUNT if (NWPluginCall(NWPlugin::Function::NWPLUGIN_GET_TRAFFIC_COUNT, &TempEvent, str)) { - addRowLabel(F("TX Bytes Total")); - addHtmlInt(TempEvent.Par64_1); - addRowLabel(F("RX Bytes Total")); - addHtmlInt(TempEvent.Par64_2); + addRowLabel(F("TX / RX Frames")); + addHtml(strformat( + F("%d / %d"), + TempEvent.Par5, + TempEvent.Par6)); + + addRowLabel(F("TX / RX Frame Bytes")); + addHtml(strformat( + F("%siB / %siB"), + formatHumanReadable(TempEvent.Par64_1, 1024).c_str(), + formatHumanReadable(TempEvent.Par64_2, 1024).c_str())); } # endif // if FEATURE_NETWORK_TRAFFIC_COUNT } diff --git a/src/src/WebServer/SysInfoPage.cpp b/src/src/WebServer/SysInfoPage.cpp index 7c1863cd3..a208633fc 100644 --- a/src/src/WebServer/SysInfoPage.cpp +++ b/src/src/WebServer/SysInfoPage.cpp @@ -25,6 +25,7 @@ # include "../Globals/CRCValues.h" # include "../Globals/ESPEasy_time.h" +# include "../../ESPEasy/net/Globals/ESPEasyWiFi.h" # include "../../ESPEasy/net/Globals/ESPEasyWiFiEvent.h" # include "../../ESPEasy/net/Globals/NetworkState.h" # include "../Globals/RTC.h" @@ -486,16 +487,15 @@ void handle_sysinfo_Network() { addTableSeparator(F("WiFi"), 2, 3, F("Wifi")); - const bool showWiFiConnectionInfo = !WiFiEventData.WiFiDisconnected(); - + const bool showWiFiConnectionInfo = ESPEasyWiFi.connected(); addRowLabel(LabelType::WIFI_CONNECTION); if (showWiFiConnectionInfo) { - addHtml(toString(ESPEasy::net::wifi::getConnectionProtocol())); - addHtml(F(" (RSSI ")); - addHtmlInt(WiFi.RSSI()); - addHtml(F(" dBm)")); + addHtml(strformat( + F("%s (RSSI %d dBm)"), + FsP(toString(ESPEasy::net::wifi::getConnectionProtocol())), + WiFi.RSSI())); } else addHtml('-'); addRowLabel(LabelType::SSID); From 1774dad526b6576c3b06fab4333836104cb4991d Mon Sep 17 00:00:00 2001 From: TD-er Date: Mon, 22 Sep 2025 09:46:00 +0200 Subject: [PATCH 271/564] [WiFi] Fix reported WiFi enc. mode on ESP8266 --- .../net/wifi/ESPEasyWiFi_STA_Event_ESP8266.cpp | 12 +++++------- .../net/wifi/ESPEasyWiFi_state_machine.cpp | 15 --------------- 2 files changed, 5 insertions(+), 22 deletions(-) diff --git a/src/ESPEasy/net/wifi/ESPEasyWiFi_STA_Event_ESP8266.cpp b/src/ESPEasy/net/wifi/ESPEasyWiFi_STA_Event_ESP8266.cpp index d6e944558..9282b12cb 100644 --- a/src/ESPEasy/net/wifi/ESPEasyWiFi_STA_Event_ESP8266.cpp +++ b/src/ESPEasy/net/wifi/ESPEasyWiFi_STA_Event_ESP8266.cpp @@ -27,7 +27,7 @@ namespace wifi { static NWPluginData_static_runtime stats_and_cache(false, "WiFi"); // Cannot use flash strings during init of static objects static WiFiDisconnectReason _wifi_disconnect_reason = WiFiDisconnectReason::WIFI_DISCONNECT_REASON_UNSPECIFIED; -static uint8_t _authmode{}; +static uint8_t _enc_type{}; static bool _ESPEasyWiFi_STA_EventHandler_initialized{}; @@ -62,11 +62,11 @@ NWPluginData_static_runtime* ESPEasyWiFi_STA_EventHandler::getNWPluginData_stati WiFiDisconnectReason ESPEasyWiFi_STA_EventHandler::getLastDisconnectReason() const { return _wifi_disconnect_reason; } -uint8_t ESPEasyWiFi_STA_EventHandler::getAuthMode() const { return _authmode; } +uint8_t ESPEasyWiFi_STA_EventHandler::getAuthMode() const { return _enc_type; } const __FlashStringHelper * ESPEasyWiFi_STA_EventHandler::getWiFi_encryptionType() const { - return WiFi_encryptionType(_authmode); + return WiFi_encryptionType(_enc_type); } // ******************************************************************************** @@ -76,7 +76,7 @@ const __FlashStringHelper * ESPEasyWiFi_STA_EventHandler::getWiFi_encryptionTyp void ESPEasyWiFi_STA_EventHandler::onConnected(const WiFiEventStationModeConnected& event) { stats_and_cache.mark_connected(); - // WiFiEventData.markConnected(event.ssid, event.bssid, event.channel); + _enc_type = WiFi_AP_Candidates.getCurrent().enc_type; } void ESPEasyWiFi_STA_EventHandler::onDisconnect(const WiFiEventStationModeDisconnected& event) { @@ -84,8 +84,6 @@ void ESPEasyWiFi_STA_EventHandler::onDisconnect(const WiFiEventStationModeDiscon stats_and_cache.mark_lost_IP(); // ESP8266 doesn't have a separate event for lost IP _wifi_disconnect_reason = event.reason; - // WiFiEventData.markDisconnect(event.reason); - if (WiFi.status() == WL_CONNECTED) { // See https://github.com/esp8266/Arduino/issues/5912 WiFi.persistent(false); @@ -114,7 +112,7 @@ void ESPEasyWiFi_STA_EventHandler::onDisconnectedAPmode(const WiFiEventSoftAPMod } void ESPEasyWiFi_STA_EventHandler::onStationModeAuthModeChanged(const WiFiEventStationModeAuthModeChanged& event) { - _authmode = event.newMode; + _enc_type = event.newMode; // WiFiEventData.setAuthMode(event.newMode); } diff --git a/src/ESPEasy/net/wifi/ESPEasyWiFi_state_machine.cpp b/src/ESPEasy/net/wifi/ESPEasyWiFi_state_machine.cpp index 14fdc2b23..b210b2de2 100644 --- a/src/ESPEasy/net/wifi/ESPEasyWiFi_state_machine.cpp +++ b/src/ESPEasy/net/wifi/ESPEasyWiFi_state_machine.cpp @@ -108,21 +108,6 @@ void ESPEasyWiFi_t::loop() // Do we have candidate to connect to ? if (WiFi_AP_Candidates.hasCandidates()) { setState(WiFiState_e::STA_Connecting, WIFI_STATE_MACHINE_STA_CONNECTING_TIMEOUT); - - /* - } else if (!WiFi_AP_Candidates.hasCandidateCredentials() || - !Settings.DoNotStartAP()) { - if (!WiFi_AP_Candidates.hasCandidateCredentials() && - !WiFiEventData.warnedNoValidWiFiSettings) - { - addLog(LOG_LEVEL_ERROR, F("WIFI : No valid wifi settings")); - WiFiEventData.warnedNoValidWiFiSettings = true; - } - - wifi_STA_data->_establishConnectStats.clear(); - WiFiEventData.wifiConnectAttemptNeeded = false; - setState(WiFiState_e::AP_only, WIFI_STATE_MACHINE_AP_ONLY_TIMEOUT); - */ } else if (WiFi_AP_Candidates.scanComplete() == 0 || WiFi_AP_Candidates.scanComplete() == -3 # ifdef ESP32 # if ESP_IDF_VERSION >= ESP_IDF_VERSION_VAL(5, 1, 2) From b63a93d1032be9c5746ce1eead61e9b63756a39d Mon Sep 17 00:00:00 2001 From: TD-er Date: Mon, 22 Sep 2025 10:38:16 +0200 Subject: [PATCH 272/564] [WiFi] Clear uses of WiFiEventData for ESP8266 builds --- .../net/DataStructs/EthernetEventData.cpp | 217 --------- .../net/DataStructs/EthernetEventData.h | 96 ---- src/ESPEasy/net/DataStructs/WiFiEventData.cpp | 382 --------------- src/ESPEasy/net/DataStructs/WiFiEventData.h | 155 ------ .../net/DataStructs/WiFi_AP_Candidate.cpp | 40 +- .../net/DataStructs/WiFi_AP_Candidate.h | 6 - src/ESPEasy/net/ESPEasyNetwork_ESP8266.cpp | 4 +- src/ESPEasy/net/Globals/ESPEasyWiFiEvent.cpp | 3 - src/ESPEasy/net/Globals/ESPEasyWiFiEvent.h | 5 - .../net/Helpers/WiFi_AP_CandidatesList.cpp | 16 - .../net/Helpers/WiFi_AP_CandidatesList.h | 9 - src/ESPEasy/net/_NW001_WiFi_STA.cpp | 1 - .../net/eth/ESPEasyEth_ProcessEvent.cpp | 2 +- .../net/wifi/ESPEasyWiFi_STA_Event_ESP32.cpp | 2 - .../wifi/ESPEasyWiFi_STA_Event_ESP8266.cpp | 47 -- .../net/wifi/ESPEasyWiFi_STA_Event_ESP8266.h | 5 - .../net/wifi/ESPEasyWiFi_state_machine.cpp | 27 +- src/ESPEasy/net/wifi/ESPEasyWifi.cpp | 45 +- .../net/wifi/ESPEasyWifi_ProcessEvent.cpp | 460 ------------------ .../net/wifi/ESPEasyWifi_ProcessEvent.h | 26 - .../net/wifi/ESPEasyWifi_abstracted.cpp | 15 +- .../net/wifi/ESPEasyWifi_abstracted_ESP32.cpp | 21 +- .../wifi/ESPEasyWifi_abstracted_ESP8266.cpp | 41 +- src/src/Commands/WiFi.cpp | 2 +- src/src/CustomBuild/define_plugin_sets.h | 13 - src/src/DataStructs/NodesHandler.cpp | 4 +- src/src/ESPEasyCore/Controller.cpp | 6 +- src/src/ESPEasyCore/ESPEasy_Log.cpp | 3 +- src/src/ESPEasyCore/ESPEasy_loop.cpp | 1 - src/src/ESPEasyCore/ESPEasy_setup.cpp | 3 +- src/src/Helpers/ESPEasy_FactoryDefault.cpp | 2 +- src/src/Helpers/ESPEasy_Storage.cpp | 2 +- src/src/Helpers/Hardware.cpp | 4 +- src/src/Helpers/Hardware_ADC.cpp | 4 +- src/src/Helpers/MDNS_Helper.cpp | 3 +- src/src/Helpers/Networking.cpp | 7 +- src/src/Helpers/PeriodicalActions.cpp | 2 +- src/src/Helpers/SystemVariables.cpp | 13 +- src/src/PluginStructs/P026_data_struct.cpp | 7 +- src/src/PluginStructs/P109_data_struct.cpp | 6 +- src/src/PluginStructs/P145_data_struct.cpp | 2 +- src/src/WebServer/404.cpp | 3 +- src/src/WebServer/RootPage.cpp | 5 +- src/src/WebServer/SetupPage.cpp | 10 +- 44 files changed, 84 insertions(+), 1643 deletions(-) delete mode 100644 src/ESPEasy/net/DataStructs/EthernetEventData.cpp delete mode 100644 src/ESPEasy/net/DataStructs/EthernetEventData.h delete mode 100644 src/ESPEasy/net/DataStructs/WiFiEventData.cpp delete mode 100644 src/ESPEasy/net/DataStructs/WiFiEventData.h delete mode 100644 src/ESPEasy/net/wifi/ESPEasyWifi_ProcessEvent.cpp delete mode 100644 src/ESPEasy/net/wifi/ESPEasyWifi_ProcessEvent.h diff --git a/src/ESPEasy/net/DataStructs/EthernetEventData.cpp b/src/ESPEasy/net/DataStructs/EthernetEventData.cpp deleted file mode 100644 index 5fcc7c3e3..000000000 --- a/src/ESPEasy/net/DataStructs/EthernetEventData.cpp +++ /dev/null @@ -1,217 +0,0 @@ -#include "../DataStructs/EthernetEventData.h" - -#if FEATURE_ETHERNET - -#include "../../../src/ESPEasyCore/ESPEasy_Log.h" -#include "../../../src/Globals/Settings.h" -#include "../../../src/Helpers/Networking.h" - -#include - -// Bit numbers for Eth status -#define ESPEASY_ETH_CONNECTED 0 -#define ESPEASY_ETH_GOT_IP 1 -#define ESPEASY_ETH_SERVICES_INITIALIZED 2 - - -#if FEATURE_USE_IPV6 -#include - -// ----------------------------------------------------------------------------------------------------------------------- -// ---------------------------------------------------- Private functions ------------------------------------------------ -// ----------------------------------------------------------------------------------------------------------------------- - -esp_netif_t* get_esp_interface_netif(esp_interface_t interface); -#endif - - - -bool EthernetEventData_t::EthConnectAllowed() const { - if (!ethConnectAttemptNeeded) return false; - if (last_eth_connect_attempt_moment.isSet()) { - // TODO TD-er: Make this time more dynamic. - if (!last_eth_connect_attempt_moment.timeoutReached(10000)) { - return false; - } - } - return true; -} - -bool EthernetEventData_t::unprocessedEthEvents() const { - if (processedConnect && processedDisconnect && processedGotIP && processedDHCPTimeout -#if FEATURE_USE_IPV6 - && processedGotIP6 -#endif - ) - { - return false; - } - return true; -} - -void EthernetEventData_t::clearAll() { - lastDisconnectMoment.clear(); - lastConnectMoment.clear(); - lastGetIPmoment.clear(); - last_eth_connect_attempt_moment.clear(); - - lastEthResetMoment.setNow(); - eth_considered_stable = false; - - // Mark all flags to default to prevent handling old events. - processedConnect = true; - processedDisconnect = true; - processedGotIP = true; - #if FEATURE_USE_IPV6 - processedGotIP6 = true; - #endif - processedDHCPTimeout = true; - ethConnectAttemptNeeded = true; - dns0_cache = IPAddress(); - dns1_cache = IPAddress(); -} - -void EthernetEventData_t::markEthBegin() { - lastDisconnectMoment.clear(); - lastConnectMoment.clear(); - lastGetIPmoment.clear(); - last_eth_connect_attempt_moment.setNow(); - eth_considered_stable = false; - ethConnectInProgress = true; - ++eth_connect_attempt; -} - -bool EthernetEventData_t::EthDisconnected() const { - return ethStatus == ESPEASY_ETH_DISCONNECTED; -} - -bool EthernetEventData_t::EthGotIP() const { - - return bitRead(ethStatus, ESPEASY_ETH_GOT_IP); -} - -bool EthernetEventData_t::EthConnected() const { - return bitRead(ethStatus, ESPEASY_ETH_CONNECTED); -} - -bool EthernetEventData_t::EthServicesInitialized() const { - return bitRead(ethStatus, ESPEASY_ETH_SERVICES_INITIALIZED); -} - -void EthernetEventData_t::setEthDisconnected() { - processedConnect = true; - processedDisconnect = true; - processedGotIP = true; - #if FEATURE_USE_IPV6 - processedGotIP6 = true; - #endif - processedDHCPTimeout = true; - - ethStatus = ESPEASY_ETH_DISCONNECTED; -} - -void EthernetEventData_t::setEthGotIP() { - bitSet(ethStatus, ESPEASY_ETH_GOT_IP); - setEthServicesInitialized(); -} - -void EthernetEventData_t::setEthConnected() { - bitSet(ethStatus, ESPEASY_ETH_CONNECTED); - setEthServicesInitialized(); -} - -bool EthernetEventData_t::setEthServicesInitialized() { - if (!unprocessedEthEvents() && !EthServicesInitialized()) { - if (EthGotIP() && EthConnected()) { - if (valid_DNS_address(ETH.dnsIP(0))) { - dns0_cache = ETH.dnsIP(0); - } - if (valid_DNS_address(ETH.dnsIP(1))) { - dns1_cache = ETH.dnsIP(1); - } - - #ifndef BUILD_NO_DEBUG - addLog(LOG_LEVEL_DEBUG, F("Eth : Eth services initialized")); - #endif - bitSet(ethStatus, ESPEASY_ETH_SERVICES_INITIALIZED); - ethConnectInProgress = false; - return true; - } - } - return false; -} - -void EthernetEventData_t::markGotIP() { - lastGetIPmoment.setNow(); - - // Create the 'got IP event' so mark the ethStatus to not have the got IP flag set - // This also implies the services are not fully initialized. - bitClear(ethStatus, ESPEASY_ETH_GOT_IP); - bitClear(ethStatus, ESPEASY_ETH_SERVICES_INITIALIZED); - processedGotIP = false; -} - -#if FEATURE_USE_IPV6 -void EthernetEventData_t::markGotIPv6(const IPAddress& ip6) { - processedGotIP6 = false; - unprocessed_IP6 = ip6; -} -#endif - - -void EthernetEventData_t::markLostIP() { - bitClear(ethStatus, ESPEASY_ETH_GOT_IP); - bitClear(ethStatus, ESPEASY_ETH_SERVICES_INITIALIZED); - lastGetIPmoment.clear(); - processedGotIP = false; -} - -void EthernetEventData_t::markDisconnect() { - lastDisconnectMoment.setNow(); - - if (last_eth_connect_attempt_moment.isSet() && !lastConnectMoment.isSet()) { - // There was an unsuccessful connection attempt - lastConnectedDuration_us = last_eth_connect_attempt_moment.timeDiff(lastDisconnectMoment); - } else { - lastConnectedDuration_us = lastConnectMoment.timeDiff(lastDisconnectMoment); - } - lastConnectMoment.clear(); - processedDisconnect = false; -#if ESP_IDF_VERSION_MAJOR >= 5 -// WiFi.STA.setDefault(); -#endif -} - -void EthernetEventData_t::markConnected() { - lastConnectMoment.setNow(); - processedConnect = false; -#if ESP_IDF_VERSION_MAJOR >= 5 -// ETH.setDefault(); -#endif - -#if FEATURE_USE_IPV6 - if (Settings.EnableIPv6()) { - ETH.enableIPv6(true); - } -#endif -} - -String EthernetEventData_t::ESPEasyEthStatusToString() const { - String log; - if (EthDisconnected()) { - log = F("DISCONNECTED"); - } else { - if (EthConnected()) { - log += F("Conn. "); - } - if (EthGotIP()) { - log += F("IP "); - } - if (EthServicesInitialized()) { - log += F("Init"); - } - } - return log; -} - -#endif diff --git a/src/ESPEasy/net/DataStructs/EthernetEventData.h b/src/ESPEasy/net/DataStructs/EthernetEventData.h deleted file mode 100644 index 4fadd5426..000000000 --- a/src/ESPEasy/net/DataStructs/EthernetEventData.h +++ /dev/null @@ -1,96 +0,0 @@ -#pragma once - -#include "../../../ESPEasy_common.h" - -#if FEATURE_ETHERNET - -#include "../../../src/Helpers/LongTermTimer.h" - - - - -#ifdef ESP32 -# include -# include - -#endif // ifdef ESP32 - -#include - - -// EthStatus -#define ESPEASY_ETH_DISCONNECTED 0 - - -struct EthernetEventData_t { - bool EthConnectAllowed() const; - - bool unprocessedEthEvents() const; - - void clearAll(); - void markEthBegin(); - - bool EthDisconnected() const; - bool EthGotIP() const; - bool EthConnected() const; - bool EthServicesInitialized() const; - - void setEthDisconnected(); - void setEthGotIP(); - void setEthConnected(); - bool setEthServicesInitialized(); - - - void markGotIP(); -#if FEATURE_USE_IPV6 - void markGotIPv6(const IPAddress& ip6); -#endif - void markLostIP(); - void markDisconnect(); - void markConnected(); - - String ESPEasyEthStatusToString() const; - - - // Eth related data - bool ethSetup = false; - uint8_t ethStatus = ESPEASY_ETH_DISCONNECTED; - LongTermTimer last_eth_connect_attempt_moment; - unsigned int eth_connect_attempt = 0; - bool eth_considered_stable = false; - int eth_reconnects = -1; // First connection attempt is not a reconnect. - - LongTermTimer lastConnectMoment; - LongTermTimer lastDisconnectMoment; - LongTermTimer lastEthResetMoment; - LongTermTimer lastGetIPmoment; - LongTermTimer::Duration lastConnectedDuration_us = 0ll; - - IPAddress dns0_cache{}; - IPAddress dns1_cache{}; - #if FEATURE_USE_IPV6 - IPAddress unprocessed_IP6; - #endif - - // Semaphore like bools for processing data gathered from Eth events. - bool processedConnect = true; - bool processedDisconnect = true; - bool processedGotIP = true; - #if FEATURE_USE_IPV6 - bool processedGotIP6 = true; - #endif - bool processedDHCPTimeout = true; - bool ethConnectAttemptNeeded = true; - bool ethConnectInProgress = false; - - - bool ethInitSuccess = false; - -#ifdef ESP32 - WiFiEventId_t wm_event_id = 0; -#endif // ifdef ESP32 - -}; - -#endif - diff --git a/src/ESPEasy/net/DataStructs/WiFiEventData.cpp b/src/ESPEasy/net/DataStructs/WiFiEventData.cpp deleted file mode 100644 index 165ddc81b..000000000 --- a/src/ESPEasy/net/DataStructs/WiFiEventData.cpp +++ /dev/null @@ -1,382 +0,0 @@ -#include "../DataStructs/WiFiEventData.h" - -#if FEATURE_WIFI - -# include "../../../src/ESPEasyCore/ESPEasy_Log.h" - -# include "../../../src/Globals/RTC.h" -# include "../../../src/Globals/Settings.h" -# include "../Globals/WiFi_AP_Candidates.h" - -# include "../../../src/Helpers/ESPEasy_Storage.h" -# include "../../../src/Helpers/Networking.h" - -# include "../../../src/Helpers/StringConverter.h" - - -# define WIFI_RECONNECT_WAIT 30000 // in milliSeconds - -# define CONNECT_TIMEOUT_MAX 10000 // in milliSeconds - - -# if FEATURE_USE_IPV6 -# include - -// ----------------------------------------------------------------------------------------------------------------------- -// ---------------------------------------------------- Private functions ------------------------------------------------ -// ----------------------------------------------------------------------------------------------------------------------- - -esp_netif_t* get_esp_interface_netif(esp_interface_t interface); -# endif // if FEATURE_USE_IPV6 - -bool WiFiEventData_t::WiFiConnectAllowed() const { - if (WiFi.status() == WL_IDLE_STATUS) { - // FIXME TD-er: What to do now? Set a timer? - // return false; - if (last_wifi_connect_attempt_moment.isSet() && - !last_wifi_connect_attempt_moment.timeoutReached(WIFI_PROCESS_EVENTS_TIMEOUT)) { - return false; - } - } - - if (!wifiConnectAttemptNeeded) { return false; } - - if (intent_to_reboot) { return false; } - - if (wifiSetupConnect) { return true; } - - if (wifiConnectInProgress) { - if (last_wifi_connect_attempt_moment.isSet() && - !last_wifi_connect_attempt_moment.timeoutReached(WIFI_PROCESS_EVENTS_TIMEOUT)) { - return false; - } - } - - if (lastDisconnectMoment.isSet()) { - // TODO TD-er: Make this time more dynamic. - if (!lastDisconnectMoment.timeoutReached(1000)) { - return false; - } - } - return true; -} - -bool WiFiEventData_t::unprocessedWifiEvents() const { - if (processedConnect && processedDisconnect && processedGotIP && processedDHCPTimeout -# if FEATURE_USE_IPV6 - && processedGotIP6 -# endif - ) - { - return false; - } - - if (!processedConnect) { - if (lastConnectMoment.isSet() && lastConnectMoment.timeoutReached(WIFI_PROCESS_EVENTS_TIMEOUT)) { - return false; - } - } - - if (!processedGotIP) { - if (lastGetIPmoment.isSet() && lastGetIPmoment.timeoutReached(WIFI_PROCESS_EVENTS_TIMEOUT)) { - return false; - } - } - - if (!processedDisconnect) { - if (lastDisconnectMoment.isSet() && lastDisconnectMoment.timeoutReached(WIFI_PROCESS_EVENTS_TIMEOUT)) { - return false; - } - } - - if (!processedDHCPTimeout) { - return false; - } - return true; -} - -void WiFiEventData_t::clearAll() { - markWiFiTurnOn(); - lastGetScanMoment.clear(); - last_wifi_connect_attempt_moment.clear(); - timerAPstart.clear(); - - lastWiFiResetMoment.setNow(); - wifi_TX_pwr = 0; - usedChannel = 0; -} - -void WiFiEventData_t::markWiFiTurnOn() { - setWiFiDisconnected(); - - // lastDisconnectMoment.clear(); - lastConnectMoment.clear(); - lastGetIPmoment.clear(); - wifi_considered_stable = false; - - clear_processed_flags(); -} - -void WiFiEventData_t::clear_processed_flags() { - // Mark all flags to default to prevent handling old events. - WiFi.scanDelete(); - processedConnect = true; - processedDisconnect = true; - processedGotIP = true; - # if FEATURE_USE_IPV6 - processedGotIP6 = true; - # endif - processedDHCPTimeout = true; - processedConnectAPmode = true; - processedDisconnectAPmode = true; - processedScanDone = true; - wifiConnectAttemptNeeded = true; - wifiConnectInProgress = false; - processingDisconnect.clear(); - dns0_cache = IPAddress(); - dns1_cache = IPAddress(); -} - -void WiFiEventData_t::markWiFiBegin() { - markWiFiTurnOn(); - last_wifi_connect_attempt_moment.setNow(); - wifiConnectInProgress = true; - usedChannel = 0; - ++wifi_connect_attempt; - - if (!timerAPstart.isSet()) { - timerAPstart.setMillisFromNow(3 * WIFI_RECONNECT_WAIT); - } -} - -void WiFiEventData_t::setWiFiDisconnected() { - wifiStatus = ESPEASY_WIFI_DISCONNECTED; - last_wifi_connect_attempt_moment.clear(); - wifiConnectInProgress = false; -# if FEATURE_ESPEASY_P2P - updateUDPport(true); -# endif - -} - -void WiFiEventData_t::setWiFiGotIP() { - bitSet(wifiStatus, ESPEASY_WIFI_GOT_IP); - processedGotIP = true; - - if (valid_DNS_address(WiFi.dnsIP(0))) { - dns0_cache = WiFi.dnsIP(0); - } - - if (valid_DNS_address(WiFi.dnsIP(1))) { - dns1_cache = WiFi.dnsIP(1); - } -} - -void WiFiEventData_t::setWiFiConnected() { - bitSet(wifiStatus, ESPEASY_WIFI_CONNECTED); - processedConnect = true; -} - -void WiFiEventData_t::setWiFiServicesInitialized() { - if (!processedConnect) { - setWiFiConnected(); - } - - if (!processedGotIP) { - setWiFiGotIP(); - } - - if ( WiFiConnected() && WiFiGotIP()) { - # ifndef BUILD_NO_DEBUG - - // addLog(LOG_LEVEL_DEBUG, F("WiFi : WiFi services initialized")); - # endif // ifndef BUILD_NO_DEBUG - bitSet(wifiStatus, ESPEASY_WIFI_SERVICES_INITIALIZED); - wifiConnectInProgress = false; - wifiConnectAttemptNeeded = false; - - if (valid_DNS_address(WiFi.dnsIP(0))) { - dns0_cache = WiFi.dnsIP(0); - } - - if (valid_DNS_address(WiFi.dnsIP(1))) { - dns1_cache = WiFi.dnsIP(1); - } -# if FEATURE_ESPEASY_P2P - updateUDPport(false); -# endif - } -} - -void WiFiEventData_t::markGotIP() { - lastGetIPmoment.setNow(); - - // Create the 'got IP event' so mark the wifiStatus to not have the got IP flag set - // This also implies the services are not fully initialized. - bitClear(wifiStatus, ESPEASY_WIFI_GOT_IP); - bitClear(wifiStatus, ESPEASY_WIFI_SERVICES_INITIALIZED); - processedGotIP = false; -} - -void WiFiEventData_t::markGotIP(const IPAddress& ip, const IPAddress& netmask, const IPAddress& gw) -{ - if (loglevelActiveFor(LOG_LEVEL_INFO)) { - addLog( - LOG_LEVEL_INFO, - strformat( - F("WiFi : GotIP IP: %s, GW: %s, SN: %s DNS: %s / %s"), - formatIP(ip).c_str(), - formatIP(gw).c_str(), - formatIP(netmask).c_str(), - formatIP(WiFi.dnsIP(0)).c_str(), - formatIP(WiFi.dnsIP(1)).c_str() - )); - } - markGotIP(); -} - -# if FEATURE_USE_IPV6 - -void WiFiEventData_t::markGotIPv6(const IPAddress& ip6) { - processedGotIP6 = false; - unprocessed_IP6 = ip6; -} - -# endif // if FEATURE_USE_IPV6 - -void WiFiEventData_t::markLostIP() { - bitClear(wifiStatus, ESPEASY_WIFI_GOT_IP); - bitClear(wifiStatus, ESPEASY_WIFI_SERVICES_INITIALIZED); -} - -void WiFiEventData_t::markDisconnect(WiFiDisconnectReason reason) { - lastDisconnectMoment.setNow(); - usedChannel = 0; - - if (last_wifi_connect_attempt_moment.isSet() && !lastConnectMoment.isSet()) { - // There was an unsuccessful connection attempt - lastConnectedDuration_us = last_wifi_connect_attempt_moment.timeDiff(lastDisconnectMoment); - } else { - if (last_wifi_connect_attempt_moment.isSet()) { - lastConnectedDuration_us = lastConnectMoment.timeDiff(lastDisconnectMoment); - } - else { - lastConnectedDuration_us = 0; - } - } - lastDisconnectReason = reason; - processedDisconnect = false; - wifiConnectInProgress = false; -} - -void WiFiEventData_t::markConnected(const String& ssid, const uint8_t bssid[6], uint8_t channel) { - usedChannel = channel; - lastConnectMoment.setNow(); - processedConnect = false; - channel_changed = RTC.lastWiFiChannel != channel; - last_ssid = ssid; - bssid_changed = false; - auth_mode = ESPEasy::net::wifi::WiFi_AP_Candidates.getCurrent().enc_type; - - RTC.lastWiFiChannel = channel; - - for (uint8_t i = 0; i < 6; ++i) { - if (RTC.lastBSSID[i] != bssid[i]) { - bssid_changed = true; - RTC.lastBSSID[i] = bssid[i]; - } - } -# if FEATURE_USE_IPV6 - - if (Settings.EnableIPv6()) { - WiFi.enableIPv6(true); - } -# endif // if FEATURE_USE_IPV6 -} - -void WiFiEventData_t::markConnectedAPmode(const uint8_t mac[6]) { - lastMacConnectedAPmode = mac; - processedConnectAPmode = false; -} - -void WiFiEventData_t::markDisconnectedAPmode(const uint8_t mac[6]) { - lastMacDisconnectedAPmode = mac; - processedDisconnectAPmode = false; -} - -String WiFiEventData_t::ESPeasyWifiStatusToString() const { - String log; - - if (WiFiDisconnected()) { - log = F("DISCONNECTED"); - } else { - if (WiFiConnected()) { - log += F("Conn. "); - } - - if (WiFiGotIP()) { - log += F("IP "); - } - - if (WiFiServicesInitialized()) { - log += F("Init"); - } - } - return log; -} - - -# ifdef ESP8266 - -bool WiFiEventData_t::WiFiDisconnected() const { - return wifiStatus == ESPEASY_WIFI_DISCONNECTED; -} - -bool WiFiEventData_t::WiFiGotIP() const { - return bitRead(wifiStatus, ESPEASY_WIFI_GOT_IP); -} - -bool WiFiEventData_t::WiFiConnected() const { - return bitRead(wifiStatus, ESPEASY_WIFI_CONNECTED); -} - -bool WiFiEventData_t::WiFiServicesInitialized() const { - return bitRead(wifiStatus, ESPEASY_WIFI_SERVICES_INITIALIZED); -} - -# endif // ifdef ESP8266 - -# ifdef ESP32 - -bool WiFiEventData_t::WiFiDisconnected() const { - return !WiFi.STA.connected(); -} - -bool WiFiEventData_t::WiFiGotIP() const { - return WiFi.STA.hasIP(); -} - -# if FEATURE_USE_IPV6 - -bool WiFiEventData_t::WiFiGotIPv6() const { - return WiFi.STA.hasGlobalIPv6(); -} - -# endif // if FEATURE_USE_IPV6 - -bool WiFiEventData_t::WiFiConnected() const { - return WiFi.STA.connected(); -} - -bool WiFiEventData_t::WiFiServicesInitialized() const { - return WiFiConnected() && -# if FEATURE_USE_IPV6 - (WiFiGotIP() || WiFi.STA.hasGlobalIPv6() || WiFi.STA.hasLinkLocalIPv6()); -# else - WiFiGotIP(); -# endif // if FEATURE_USE_IPV6 -} - -# endif // ifdef ESP32 - -#endif // if FEATURE_WIFI diff --git a/src/ESPEasy/net/DataStructs/WiFiEventData.h b/src/ESPEasy/net/DataStructs/WiFiEventData.h deleted file mode 100644 index 4d0a0d003..000000000 --- a/src/ESPEasy/net/DataStructs/WiFiEventData.h +++ /dev/null @@ -1,155 +0,0 @@ -#pragma once - -#include "../../../ESPEasy_common.h" - -#if FEATURE_WIFI - -# include "../DataStructs/MAC_address.h" -# include "../wifi/WiFiDisconnectReason.h" -# include "../../../src/Helpers/LongTermTimer.h" - - -# ifdef ESP32 -# include -# include -# include - -# endif // ifdef ESP32 - -# include - -# ifdef ESP8266 -# include -# include -# endif // ifdef ESP8266 - -# include - -// WifiStatus -# define ESPEASY_WIFI_DISCONNECTED 0 - -// Bit numbers for WiFi status -# define ESPEASY_WIFI_CONNECTED 0 -# define ESPEASY_WIFI_GOT_IP 1 -# define ESPEASY_WIFI_SERVICES_INITIALIZED 2 - - -# define WIFI_PROCESS_EVENTS_TIMEOUT 20000 // in milliSeconds - -struct WiFiEventData_t { - bool WiFiConnectAllowed() const; - - bool unprocessedWifiEvents() const; - - void clearAll(); - void markWiFiTurnOn(); - void clear_processed_flags(); - void markWiFiBegin(); - - bool WiFiDisconnected() const; - bool WiFiGotIP() const; -# if FEATURE_USE_IPV6 - bool WiFiGotIPv6() const; -# endif - bool WiFiConnected() const; - bool WiFiServicesInitialized() const; - - void setWiFiDisconnected(); - void setWiFiGotIP(); - void setWiFiConnected(); - void setWiFiServicesInitialized(); - - - void markGotIP(); - void markGotIP(const IPAddress& ip, - const IPAddress& netmask, - const IPAddress& gw); - -# if FEATURE_USE_IPV6 - void markGotIPv6(const IPAddress& ip6); -# endif - void markLostIP(); - void markDisconnect(WiFiDisconnectReason reason); - void markConnected(const String& ssid, - const uint8_t bssid[6], - uint8_t channel); - void markConnectedAPmode(const uint8_t mac[6]); - void markDisconnectedAPmode(const uint8_t mac[6]); - - void setAuthMode(uint8_t newMode) { auth_mode = newMode; } - - String ESPeasyWifiStatusToString() const; - - - // WiFi related data - bool wifiSetup = false; - bool wifiSetupConnect = false; - uint8_t wifiStatus = ESPEASY_WIFI_DISCONNECTED; - LongTermTimer last_wifi_connect_attempt_moment; - unsigned int wifi_connect_attempt = 0; - bool wifi_considered_stable = false; - int wifi_reconnects = -1; // First connection attempt is not a reconnect. - String last_ssid; - float wifi_TX_pwr = 0; - bool bssid_changed = false; - bool channel_changed = false; - - uint8_t auth_mode = 0; - uint8_t lastScanChannel = 0; - uint8_t usedChannel = 0; - - bool eventError = false; - - WiFiDisconnectReason lastDisconnectReason = WIFI_DISCONNECT_REASON_UNSPECIFIED; - LongTermTimer lastScanMoment; - LongTermTimer lastConnectMoment; - LongTermTimer lastDisconnectMoment; - LongTermTimer lastWiFiResetMoment; - LongTermTimer lastGetIPmoment; - LongTermTimer lastGetScanMoment; - LongTermTimer::Duration lastConnectedDuration_us = 0ll; - LongTermTimer timerAPoff; // Timer to check whether the AP mode should be disabled (0 = disabled) - LongTermTimer timerAPstart; // Timer to start AP mode, started when no valid network is detected. - bool intent_to_reboot = false; - MAC_address lastMacConnectedAPmode; - MAC_address lastMacDisconnectedAPmode; - - IPAddress dns0_cache; - IPAddress dns1_cache; - - # if FEATURE_USE_IPV6 - IPAddress unprocessed_IP6; - # endif - - - // processDisconnect() may clear all WiFi settings, resulting in clearing processedDisconnect - // This can cause recursion, so a semaphore is needed here. - LongTermTimer processingDisconnect; - - - // Semaphore like bools for processing data gathered from WiFi events. - bool processedConnect = true; - bool processedDisconnect = true; - bool processedGotIP = true; - # if FEATURE_USE_IPV6 - bool processedGotIP6 = true; - # endif - bool processedDHCPTimeout = true; - bool processedConnectAPmode = true; - bool processedDisconnectAPmode = true; - bool processedScanDone = true; - bool wifiConnectAttemptNeeded = true; - bool wifiConnectInProgress = false; - bool warnedNoValidWiFiSettings = false; - - bool performedClearWiFiCredentials = false; - - - -# ifdef ESP32 - WiFiEventId_t wm_event_id = 0; -# endif // ifdef ESP32 - -}; - -#endif // if FEATURE_WIFI diff --git a/src/ESPEasy/net/DataStructs/WiFi_AP_Candidate.cpp b/src/ESPEasy/net/DataStructs/WiFi_AP_Candidate.cpp index 4da1769f7..5b23c19c0 100644 --- a/src/ESPEasy/net/DataStructs/WiFi_AP_Candidate.cpp +++ b/src/ESPEasy/net/DataStructs/WiFi_AP_Candidate.cpp @@ -141,44 +141,6 @@ WiFi_AP_Candidate::WiFi_AP_Candidate(uint8_t networkItem) : index(0) { last_seen = millis(); } -# ifdef ESP8266 -# if FEATURE_ESP8266_DIRECT_WIFI_SCAN -WiFi_AP_Candidate::WiFi_AP_Candidate(const bss_info& ap) : - rssi(ap.rssi), channel(ap.channel), bssid(ap.bssid), - index(0), enc_type(0), isHidden(ap.is_hidden), - phy_11b(ap.phy_11b), phy_11g(ap.phy_11g), phy_11n(ap.phy_11n), - wps(ap.wps) -{ - _allBits = 0u; - last_seen = millis(); - - switch (ap.authmode) - { - case AUTH_OPEN: enc_type = ENC_TYPE_NONE; - break; - case AUTH_WEP: enc_type = ENC_TYPE_WEP; - break; - case AUTH_WPA_PSK: enc_type = ENC_TYPE_TKIP; - break; - case AUTH_WPA2_PSK: enc_type = ENC_TYPE_CCMP; - break; - case AUTH_WPA_WPA2_PSK: enc_type = ENC_TYPE_AUTO; - break; - case AUTH_MAX: break; - } - - char tmp[33]; // ssid can be up to 32chars, => plus null term - const size_t ssid_len = std::min(static_cast(ap.ssid_len), sizeof(ap.ssid)); - - memcpy(tmp, ap.ssid, ssid_len); - tmp[ssid_len] = 0; // nullterm marking end of string - - ssid = String(reinterpret_cast(tmp)); -} - -# endif // if FEATURE_ESP8266_DIRECT_WIFI_SCAN -# endif // ifdef ESP8266 - bool WiFi_AP_Candidate::operator<(const WiFi_AP_Candidate& other) const { if (bits.isEmergencyFallback != other.bits.isEmergencyFallback) { @@ -234,7 +196,7 @@ bool WiFi_AP_Candidate::usable() const { if ((getUptimeMinutes() > allowedUptimeMinutes) || !SecuritySettings.hasWiFiCredentials() || - WiFiEventData.performedClearWiFiCredentials || +// WiFiEventData.performedClearWiFiCredentials || (lastBootCause != BOOT_CAUSE_COLD_BOOT)) { return false; } diff --git a/src/ESPEasy/net/DataStructs/WiFi_AP_Candidate.h b/src/ESPEasy/net/DataStructs/WiFi_AP_Candidate.h index 11973303f..7662dba85 100644 --- a/src/ESPEasy/net/DataStructs/WiFi_AP_Candidate.h +++ b/src/ESPEasy/net/DataStructs/WiFi_AP_Candidate.h @@ -28,12 +28,6 @@ struct WiFi_AP_Candidate { // Construct using index from WiFi scan result WiFi_AP_Candidate(uint8_t networkItem); - # ifdef ESP8266 - # if FEATURE_ESP8266_DIRECT_WIFI_SCAN - WiFi_AP_Candidate(const bss_info& ap); - # endif // if FEATURE_ESP8266_DIRECT_WIFI_SCAN - # endif // ifdef ESP8266 - // Return true when this one is preferred over 'other'. bool operator<(const WiFi_AP_Candidate& other) const; diff --git a/src/ESPEasy/net/ESPEasyNetwork_ESP8266.cpp b/src/ESPEasy/net/ESPEasyNetwork_ESP8266.cpp index 7ff10c879..acbff598a 100644 --- a/src/ESPEasy/net/ESPEasyNetwork_ESP8266.cpp +++ b/src/ESPEasy/net/ESPEasyNetwork_ESP8266.cpp @@ -34,8 +34,8 @@ void setNetworkMedium(NetworkMedium_t new_medium) { case NetworkMedium_t::Ethernet: break; case NetworkMedium_t::WIFI: - WiFiEventData.timerAPoff.setMillisFromNow(WIFI_AP_OFF_TIMER_DURATION); - WiFiEventData.timerAPstart.clear(); +// WiFiEventData.timerAPoff.setMillisFromNow(WIFI_AP_OFF_TIMER_DURATION); +// WiFiEventData.timerAPstart.clear(); break; case NetworkMedium_t::NotSet: break; diff --git a/src/ESPEasy/net/Globals/ESPEasyWiFiEvent.cpp b/src/ESPEasy/net/Globals/ESPEasyWiFiEvent.cpp index df10b77b2..5790178c3 100644 --- a/src/ESPEasy/net/Globals/ESPEasyWiFiEvent.cpp +++ b/src/ESPEasy/net/Globals/ESPEasyWiFiEvent.cpp @@ -15,7 +15,4 @@ WiFiEventHandler APModeStationDisconnectedHandler; # endif // ifdef ESP8266 -// TODO TD-er: Must remove -WiFiEventData_t WiFiEventData; - #endif // if FEATURE_WIFI diff --git a/src/ESPEasy/net/Globals/ESPEasyWiFiEvent.h b/src/ESPEasy/net/Globals/ESPEasyWiFiEvent.h index 68bda1ca0..d3d679d89 100644 --- a/src/ESPEasy/net/Globals/ESPEasyWiFiEvent.h +++ b/src/ESPEasy/net/Globals/ESPEasyWiFiEvent.h @@ -4,8 +4,6 @@ #if FEATURE_WIFI -# include "../DataStructs/WiFiEventData.h" - # include # include @@ -33,7 +31,4 @@ extern WiFiEventHandler APModeStationDisconnectedHandler; # endif // ifdef ESP8266 -extern WiFiEventData_t WiFiEventData; - - #endif // if FEATURE_WIFI diff --git a/src/ESPEasy/net/Helpers/WiFi_AP_CandidatesList.cpp b/src/ESPEasy/net/Helpers/WiFi_AP_CandidatesList.cpp index fc219c43b..8821d42b9 100644 --- a/src/ESPEasy/net/Helpers/WiFi_AP_CandidatesList.cpp +++ b/src/ESPEasy/net/Helpers/WiFi_AP_CandidatesList.cpp @@ -127,8 +127,6 @@ void WiFi_AP_CandidatesList::purge_expired() { } } -# if !FEATURE_ESP8266_DIRECT_WIFI_SCAN - void WiFi_AP_CandidatesList::process_WiFiscan() { // if (_last_scan.isOn()) { // Append or update found APs from scan. @@ -147,20 +145,6 @@ void WiFi_AP_CandidatesList::process_WiFiscan() { // } } -# endif // if !FEATURE_ESP8266_DIRECT_WIFI_SCAN - -# ifdef ESP8266 -# if FEATURE_ESP8266_DIRECT_WIFI_SCAN - -void WiFi_AP_CandidatesList::process_WiFiscan(const bss_info& ap) { - WiFi_AP_Candidate tmp(ap); - - scanned_new.push_back(tmp); -} - -# endif // if FEATURE_ESP8266_DIRECT_WIFI_SCAN -# endif // ifdef ESP8266 - void WiFi_AP_CandidatesList::after_process_WiFiscan() { _last_scan.setOff(); scanned_new.sort(); diff --git a/src/ESPEasy/net/Helpers/WiFi_AP_CandidatesList.h b/src/ESPEasy/net/Helpers/WiFi_AP_CandidatesList.h index b55b02874..51c619e06 100644 --- a/src/ESPEasy/net/Helpers/WiFi_AP_CandidatesList.h +++ b/src/ESPEasy/net/Helpers/WiFi_AP_CandidatesList.h @@ -35,17 +35,8 @@ struct WiFi_AP_CandidatesList { void purge_expired(); -# if !FEATURE_ESP8266_DIRECT_WIFI_SCAN - // Add found WiFi access points to the list if they are possible candidates. void process_WiFiscan(); -# endif // if !FEATURE_ESP8266_DIRECT_WIFI_SCAN - -# ifdef ESP8266 -# if FEATURE_ESP8266_DIRECT_WIFI_SCAN - void process_WiFiscan(const bss_info& ap); -# endif -# endif // ifdef ESP8266 void after_process_WiFiscan(); diff --git a/src/ESPEasy/net/_NW001_WiFi_STA.cpp b/src/ESPEasy/net/_NW001_WiFi_STA.cpp index 3cdede204..eb58ab557 100644 --- a/src/ESPEasy/net/_NW001_WiFi_STA.cpp +++ b/src/ESPEasy/net/_NW001_WiFi_STA.cpp @@ -31,7 +31,6 @@ # include "../net/Helpers/_NWPlugin_init.h" # include "../net/NWPluginStructs/NW001_data_struct_WiFi_STA.h" # include "../net/wifi/ESPEasyWifi.h" -# include "../net/wifi/ESPEasyWifi_ProcessEvent.h" # ifdef ESP8266 # include "../net/Helpers/NWAccessControl.h" diff --git a/src/ESPEasy/net/eth/ESPEasyEth_ProcessEvent.cpp b/src/ESPEasy/net/eth/ESPEasyEth_ProcessEvent.cpp index d182d311d..8f86ba4ab 100644 --- a/src/ESPEasy/net/eth/ESPEasyEth_ProcessEvent.cpp +++ b/src/ESPEasy/net/eth/ESPEasyEth_ProcessEvent.cpp @@ -125,7 +125,7 @@ void processEthernetConnected() { if (EthEventData.processedConnect) { return; } // FIXME TD-er: Must differentiate among reconnects for WiFi and Ethernet. - ++WiFiEventData.wifi_reconnects; +// ++WiFiEventData.wifi_reconnects; addLog(LOG_LEVEL_INFO, F("processEthernetConnected()")); EthEventData.setEthConnected(); EthEventData.processedConnect = true; diff --git a/src/ESPEasy/net/wifi/ESPEasyWiFi_STA_Event_ESP32.cpp b/src/ESPEasy/net/wifi/ESPEasyWiFi_STA_Event_ESP32.cpp index e3bd97683..337cb106a 100644 --- a/src/ESPEasy/net/wifi/ESPEasyWiFi_STA_Event_ESP32.cpp +++ b/src/ESPEasy/net/wifi/ESPEasyWiFi_STA_Event_ESP32.cpp @@ -24,7 +24,6 @@ # include "../Globals/WiFi_AP_Candidates.h" # include "../eth/ESPEasyEth.h" # include "../wifi/ESPEasyWifi.h" -# include "../wifi/ESPEasyWifi_ProcessEvent.h" # if FEATURE_ETHERNET # include "../Globals/ESPEasyEthEvent.h" @@ -280,7 +279,6 @@ void ESPEasyWiFi_STA_EventHandler::WiFiEvent(WiFiEvent_t event_id, arduino_event WiFiEventData.markDisconnectedAPmode(info.wifi_ap_stadisconnected.mac); break; case ARDUINO_EVENT_WIFI_SCAN_DONE: - WiFiEventData.processedScanDone = false; break; # if FEATURE_ETHERNET case ARDUINO_EVENT_ETH_START: diff --git a/src/ESPEasy/net/wifi/ESPEasyWiFi_STA_Event_ESP8266.cpp b/src/ESPEasy/net/wifi/ESPEasyWiFi_STA_Event_ESP8266.cpp index 9282b12cb..25aff7ac1 100644 --- a/src/ESPEasy/net/wifi/ESPEasyWiFi_STA_Event_ESP8266.cpp +++ b/src/ESPEasy/net/wifi/ESPEasyWiFi_STA_Event_ESP8266.cpp @@ -13,7 +13,6 @@ # include "../ESPEasyNetwork.h" # include "../wifi/ESPEasyWifi.h" -# include "../wifi/ESPEasyWifi_ProcessEvent.h" # include "../Globals/ESPEasyWiFiEvent.h" # include "../Globals/NetworkState.h" @@ -117,52 +116,6 @@ void ESPEasyWiFi_STA_EventHandler::onStationModeAuthModeChanged(const WiFiEventS // WiFiEventData.setAuthMode(event.newMode); } -# if FEATURE_ESP8266_DIRECT_WIFI_SCAN - -void ESPEasyWiFi_STA_EventHandler::onWiFiScanDone(void ESPEasyWiFi_STA_EventHandler::*arg, STATUS status) { - if (status == OK) { - auto *head = reinterpret_cast(arg); - int scanCount = 0; - - for (bss_info *it = head; it != nullptr; it = STAILQ_NEXT(it, next)) { - WiFi_AP_Candidates.process_WiFiscan(*it); - ++scanCount; - } - WiFi_AP_Candidates.after_process_WiFiscan(); - - // WiFiEventData.processedScanDone = true; -# ifndef BUILD_NO_DEBUG - - /* - if (loglevelActiveFor(LOG_LEVEL_INFO)) { - addLogMove(LOG_LEVEL_INFO, concat(F("WiFi : Scan finished (ESP8266), found: "), scanCount)); - } - */ -# endif // ifndef BUILD_NO_DEBUG - WiFi_AP_Candidates.load_knownCredentials(); - - if (WiFi_AP_Candidates.addedKnownCandidate() || !NetworkConnected()) { - WiFiEventData.wifiConnectAttemptNeeded = true; - # ifndef BUILD_NO_DEBUG - - if (WiFi_AP_Candidates.addedKnownCandidate()) { - // addLog(LOG_LEVEL_INFO, F("WiFi : Added known candidate, try to connect")); - } - # endif // ifndef BUILD_NO_DEBUG - // NetworkConnectRelaxed(); - } - - } - - WiFiMode_t mode = WiFi.getMode(); - ESPEasy::net::wifi::setWifiMode(WIFI_OFF); - delay(1); - ESPEasy::net::wifi::setWifiMode(mode); - delay(1); -} - -# endif // if FEATURE_ESP8266_DIRECT_WIFI_SCAN - } // namespace wifi } // namespace net } // namespace ESPEasy diff --git a/src/ESPEasy/net/wifi/ESPEasyWiFi_STA_Event_ESP8266.h b/src/ESPEasy/net/wifi/ESPEasyWiFi_STA_Event_ESP8266.h index 1c33ef841..93b65d52d 100644 --- a/src/ESPEasy/net/wifi/ESPEasyWiFi_STA_Event_ESP8266.h +++ b/src/ESPEasy/net/wifi/ESPEasyWiFi_STA_Event_ESP8266.h @@ -60,11 +60,6 @@ public: static void onStationModeAuthModeChanged(const WiFiEventStationModeAuthModeChanged& event); -# if FEATURE_ESP8266_DIRECT_WIFI_SCAN - static void onWiFiScanDone(void *arg, - STATUS status); -# endif // if FEATURE_ESP8266_DIRECT_WIFI_SCAN - }; // class ESPEasyWiFi_STA_EventHandler } // namespace wifi diff --git a/src/ESPEasy/net/wifi/ESPEasyWiFi_state_machine.cpp b/src/ESPEasy/net/wifi/ESPEasyWiFi_state_machine.cpp index b210b2de2..e7c3f91b2 100644 --- a/src/ESPEasy/net/wifi/ESPEasyWiFi_state_machine.cpp +++ b/src/ESPEasy/net/wifi/ESPEasyWiFi_state_machine.cpp @@ -127,15 +127,16 @@ void ESPEasyWiFi_t::loop() // Move up? } else if (!WiFi_AP_Candidates.hasCandidateCredentials() || !Settings.DoNotStartAP()) { - if (!WiFi_AP_Candidates.hasCandidateCredentials() && - !WiFiEventData.warnedNoValidWiFiSettings) + if (!WiFi_AP_Candidates.hasCandidateCredentials() + // && !WiFiEventData.warnedNoValidWiFiSettings + ) { addLog(LOG_LEVEL_ERROR, F("WIFI : No valid wifi settings")); - WiFiEventData.warnedNoValidWiFiSettings = true; +// WiFiEventData.warnedNoValidWiFiSettings = true; } wifi_STA_data->_establishConnectStats.clear(); - WiFiEventData.wifiConnectAttemptNeeded = false; +// WiFiEventData.wifiConnectAttemptNeeded = false; setState(WiFiState_e::AP_only, WIFI_STATE_MACHINE_AP_ONLY_TIMEOUT); // end move up?? @@ -149,9 +150,7 @@ void ESPEasyWiFi_t::loop() if (scanCompleteStatus >= 0) { WiFi_AP_Candidates.load_knownCredentials(); -# if !FEATURE_ESP8266_DIRECT_WIFI_SCAN WiFi_AP_Candidates.process_WiFiscan(); -# endif # ifndef BUILD_NO_DEBUG addLog(LOG_LEVEL_INFO, strformat( F("WiFi : Scan done, found %d APs"), @@ -161,7 +160,6 @@ void ESPEasyWiFi_t::loop() addLog(LOG_LEVEL_ERROR, F("WiFi : Scan failed")); // WiFi.scanDelete(); setState(WiFiState_e::WiFiOFF, 1000); - WiFiEventData.processedScanDone = true; } if (_state_timeout.timeReached() || (scanCompleteStatus >= 0)) { @@ -173,8 +171,6 @@ void ESPEasyWiFi_t::loop() # endif } setState(WiFiState_e::WiFiOFF, 100); - WiFiEventData.processedScanDone = true; - } break; } @@ -185,9 +181,7 @@ void ESPEasyWiFi_t::loop() if (scanCompleteStatus >= 0) { WiFi_AP_Candidates.load_knownCredentials(); -# if !FEATURE_ESP8266_DIRECT_WIFI_SCAN WiFi_AP_Candidates.process_WiFiscan(); -# endif # ifndef BUILD_NO_DEBUG addLog(LOG_LEVEL_INFO, strformat( F("WiFi : Scan channel %d done, found %d APs"), @@ -198,7 +192,6 @@ void ESPEasyWiFi_t::loop() addLog(LOG_LEVEL_ERROR, F("WiFi : Scan failed")); // WiFi.scanDelete(); setState(WiFiState_e::WiFiOFF, 1000); - WiFiEventData.processedScanDone = true; } if (_state_timeout.timeReached() || (scanCompleteStatus >= 0)) { @@ -218,8 +211,6 @@ void ESPEasyWiFi_t::loop() else { setState(WiFiState_e::STA_AP_Scanning, 500); } - WiFiEventData.processedScanDone = true; - } break; @@ -418,6 +409,7 @@ bool ESPEasyWiFi_t::connectSTA() if (!WiFi_AP_Candidates.hasCandidateCredentials()) { +/* if (!WiFiEventData.warnedNoValidWiFiSettings) { addLog(LOG_LEVEL_ERROR, F("WIFI : No valid wifi settings")); @@ -428,7 +420,7 @@ bool ESPEasyWiFi_t::connectSTA() // WiFiEventData.last_wifi_connect_attempt_moment.clear(); // _connect_attempt = 1; WiFiEventData.wifiConnectAttemptNeeded = false; - +*/ // No need to wait longer to start AP mode. if (!Settings.DoNotStartAP()) { @@ -436,7 +428,7 @@ bool ESPEasyWiFi_t::connectSTA() } return false; } - +/* if (WiFiEventData.lastDisconnectReason != WIFI_DISCONNECT_REASON_UNSPECIFIED) { # ifndef BUILD_NO_DEBUG addLog(LOG_LEVEL_INFO, concat( @@ -447,6 +439,7 @@ bool ESPEasyWiFi_t::connectSTA() } WiFiEventData.warnedNoValidWiFiSettings = false; +*/ setSTA(true); # if defined(ESP8266) wifi_station_set_hostname(NetworkCreateRFCCompliantHostname().c_str()); @@ -492,7 +485,7 @@ bool ESPEasyWiFi_t::connectSTA() # endif // if FEATURE_SET_WIFI_TX_PWR // Start connect attempt now, so no longer needed to attempt new connection. - WiFiEventData.wifiConnectAttemptNeeded = false; +// WiFiEventData.wifiConnectAttemptNeeded = false; // WiFiEventData.wifiConnectInProgress = true; const String key = WiFi_AP_CandidatesList::get_key(candidate.index); diff --git a/src/ESPEasy/net/wifi/ESPEasyWifi.cpp b/src/ESPEasy/net/wifi/ESPEasyWifi.cpp index 05e51d54f..802eb5e74 100644 --- a/src/ESPEasy/net/wifi/ESPEasyWifi.cpp +++ b/src/ESPEasy/net/wifi/ESPEasyWifi.cpp @@ -24,7 +24,6 @@ # include "../Globals/ESPEasyWiFi.h" # include "../Globals/ESPEasyWiFiEvent.h" # include "../Globals/NetworkState.h" -# include "../wifi/ESPEasyWifi_ProcessEvent.h" # include "../wifi/ESPEasyWifi_abstracted.h" @@ -271,7 +270,8 @@ bool WiFiUseStaticIP() { return Settings.IP[0] != 0 && Settings.IP[0] bool wifiAPmodeActivelyUsed() { - if (!WifiIsAP(WiFi.getMode()) || (!WiFiEventData.timerAPoff.isSet())) { + if (!WifiIsAP(WiFi.getMode()) //|| (!WiFiEventData.timerAPoff.isSet()) + ) { // AP not active or soon to be disabled in processDisableAPmode() return false; } @@ -290,7 +290,7 @@ void setupStaticIPconfig() { const IPAddress subnet(Settings.Subnet); const IPAddress dns(Settings.DNS); - WiFiEventData.dns0_cache = dns; +// WiFiEventData.dns0_cache = dns; WiFi.config(ip, gw, subnet, dns); @@ -342,49 +342,14 @@ void logConnectionStatus() { } } # endif // ifdef ESP8266 - +/* if (loglevelActiveFor(LOG_LEVEL_INFO)) { addLogMove(LOG_LEVEL_INFO, strformat( F("WIFI : Arduino wifi status: %s ESPeasy internal wifi status: %s"), ArduinoWifiStatusToString(WiFi.status()).c_str(), WiFiEventData.ESPeasyWifiStatusToString().c_str())); } - - /* - if (loglevelActiveFor(LOG_LEVEL_INFO)) { - String log; - - switch (WiFi.status()) { - case WL_NO_SSID_AVAIL: { - log = F("WIFI : No SSID found matching: "); - break; - } - case WL_CONNECT_FAILED: { - log = F("WIFI : Connection failed to: "); - break; - } - case WL_DISCONNECTED: { - log = F("WIFI : WiFi.status() = WL_DISCONNECTED SSID: "); - break; - } - case WL_IDLE_STATUS: { - log = F("WIFI : Connection in IDLE state: "); - break; - } - case WL_CONNECTED: { - break; - } - default: - break; - } - - if (log.length() > 0) { - const char *ssid = getLastWiFiSettingsSSID(); - log += ssid; - addLog(LOG_LEVEL_INFO, log); - } - } - */ +*/ # endif // ifndef BUILD_NO_DEBUG } diff --git a/src/ESPEasy/net/wifi/ESPEasyWifi_ProcessEvent.cpp b/src/ESPEasy/net/wifi/ESPEasyWifi_ProcessEvent.cpp deleted file mode 100644 index 1e0522ee4..000000000 --- a/src/ESPEasy/net/wifi/ESPEasyWifi_ProcessEvent.cpp +++ /dev/null @@ -1,460 +0,0 @@ -#include "../wifi/ESPEasyWifi_ProcessEvent.h" - -#include "../../../ESPEasy-Globals.h" - -#if FEATURE_WIFI - -# if FEATURE_ETHERNET -# include "../eth/ESPEasyEth_ProcessEvent.h" -# endif -# include "../ESPEasyNetwork.h" -# include "../../../src/Globals/ESPEasy_Scheduler.h" -# include "../../../src/Globals/ESPEasy_time.h" -# include "../../../src/Globals/EventQueue.h" -# include "../../../src/Globals/MQTT.h" -# include "../../../src/Globals/RTC.h" -# include "../../../src/Globals/SecuritySettings.h" -# include "../../../src/Globals/Services.h" -# include "../../../src/Globals/Settings.h" -# include "../Globals/WiFi_AP_Candidates.h" - -# include "../../../src/Helpers/Convert.h" -# include "../../../src/Helpers/ESPEasyRTC.h" -# include "../../../src/Helpers/ESPEasy_Storage.h" -# include "../../../src/Helpers/NetworkStatusLED.h" -# include "../../../src/Helpers/Networking.h" -# include "../../../src/Helpers/PeriodicalActions.h" -# include "../../../src/Helpers/StringConverter.h" -# include "../../../src/Helpers/StringGenerator_WiFi.h" -# include "../../../src/Helpers/StringProvider.h" - -// #include "../../ESPEasy/net/eth/ESPEasyEth.h" -// #include "../ESPEasyCore/ESPEasyWiFiEvent.h" -// #include "../ESPEasyCore/ESPEasy_Log.h" -// #include "../Helpers/ESPEasy_time_calc.h" -// #include "../Helpers/Misc.h" -// #include "../Helpers/Scheduler.h" - -# include "../../../src/WebServer/ESPEasy_WebServer.h" - -# include "../wifi/ESPEasyWifi.h" -# include "../Globals/ESPEasyWiFiEvent.h" -# include "../Globals/NetworkState.h" - - -namespace ESPEasy { -namespace net { -namespace wifi { - -// ******************************************************************************** -// Called from the loop() to make sure events are processed as soon as possible. -// These functions are called from Setup() or Loop() and thus may call delay() or yield() -// ******************************************************************************** -/* -void handle_unprocessedNetworkEvents() -{ -# if FEATURE_ETHERNET - ESPEasy::net::eth::handle_unprocessedEthEvents(); -# endif - - if (active_network_medium == NetworkMedium_t::WIFI) { - bool processedSomething = false; - - if (!WiFiEventData.processedConnect) { - # ifndef BUILD_NO_DEBUG - addLog(LOG_LEVEL_DEBUG, F("WIFI : Entering processConnect()")); - # endif // ifndef BUILD_NO_DEBUG - processConnect(); - processedSomething = true; - - // FIXME TD-er: Forcefully set the connected flag for now - WiFiEventData.setWiFiConnected(); - } - - if (!WiFiEventData.processedGotIP) { - # ifndef BUILD_NO_DEBUG - addLog(LOG_LEVEL_DEBUG, F("WIFI : Entering processGotIP()")); - # endif // ifndef BUILD_NO_DEBUG - processGotIP(); - - processedSomething = true; - - // FIXME TD-er: Forcefully set the GotIP flag for now - WiFiEventData.setWiFiGotIP(); - } - - if (!WiFiEventData.WiFiServicesInitialized()) { - WiFiEventData.setWiFiServicesInitialized(); - } - - if (WiFiEventData.WiFiServicesInitialized() && processedSomething) { - setWebserverRunning(false); - delay(1); - setWebserverRunning(true); - delay(1); - } - } - -# if FEATURE_ETHERNET - ESPEasy::net::eth::check_Eth_DNS_valid(); -# endif // if FEATURE_ETHERNET - -# if FEATURE_ESPEASY_P2P - updateUDPport(false); -# endif -} -*/ - -// ******************************************************************************** -// Functions to process the data gathered from the events. -// These functions are called from Setup() or Loop() and thus may call delay() or yield() -// ******************************************************************************** -/* -void processDisconnect() {} - -void processConnect() { - if (WiFiEventData.processedConnect) { return; } - - // delay(100); // FIXME TD-er: See https://github.com/letscontrolit/ESPEasy/issues/1987#issuecomment-451644424 -// if (checkAndResetWiFi()) { -// return; -// } - - WiFiEventData.processedConnect = true; - -// if (WiFi.status() == WL_DISCONNECTED) { - // Apparently not really connected -// return; -// } - WiFiEventData.setWiFiConnected(); - ++WiFiEventData.wifi_reconnects; - - if (WiFi_AP_Candidates.getCurrent().bits.isEmergencyFallback) { - # ifdef CUSTOM_EMERGENCY_FALLBACK_RESET_CREDENTIALS - const bool mustResetCredentials = CUSTOM_EMERGENCY_FALLBACK_RESET_CREDENTIALS; - # else - const bool mustResetCredentials = false; - # endif // ifdef CUSTOM_EMERGENCY_FALLBACK_RESET_CREDENTIALS - # ifdef CUSTOM_EMERGENCY_FALLBACK_START_AP - const bool mustStartAP = CUSTOM_EMERGENCY_FALLBACK_START_AP; - # else - const bool mustStartAP = false; - # endif // ifdef CUSTOM_EMERGENCY_FALLBACK_START_AP - - if (mustStartAP) { - int allowedUptimeMinutes = 10; - # ifdef CUSTOM_EMERGENCY_FALLBACK_ALLOW_MINUTES_UPTIME - allowedUptimeMinutes = CUSTOM_EMERGENCY_FALLBACK_ALLOW_MINUTES_UPTIME; - # endif - - if (getUptimeMinutes() < allowedUptimeMinutes) { - WiFiEventData.timerAPstart.setNow(); - } - } - - if (mustResetCredentials && !WiFiEventData.performedClearWiFiCredentials) { - WiFiEventData.performedClearWiFiCredentials = true; - SecuritySettings.clearWiFiCredentials(); - SaveSecuritySettings(); - WiFiEventData.markDisconnect(WIFI_DISCONNECT_REASON_AUTH_EXPIRE); - WiFi_AP_Candidates.force_reload(); - } - } - - if (loglevelActiveFor(LOG_LEVEL_INFO)) { - const LongTermTimer::Duration connect_duration = - WiFiEventData.last_wifi_connect_attempt_moment.timeDiff(WiFiEventData.lastConnectMoment); - String log = strformat( - F("WIFI : Connected! AP: %s (%s) Ch: %d"), - WiFi.SSID().c_str(), - WiFi.BSSIDstr().c_str(), - RTC.lastWiFiChannel); - - if ((connect_duration > 0ll) && (connect_duration < 30000000ll)) { - // Just log times when they make sense. - log += strformat( - F(" Duration: %d ms"), - static_cast(connect_duration / 1000)); - } - addLogMove(LOG_LEVEL_INFO, log); - } - - // WiFiEventData.last_wifi_connect_attempt_moment.clear(); - - if (Settings.UseRules) { - if (WiFiEventData.bssid_changed) { - eventQueue.add(F("WiFi#ChangedAccesspoint")); - } - - if (WiFiEventData.channel_changed) { - eventQueue.add(F("WiFi#ChangedWiFichannel")); - } - } - - if (useStaticIP()) { - WiFiEventData.markGotIP(); // in static IP config the got IP event is never fired. - } - saveToRTC(); - - logConnectionStatus(); -} - - -void processGotIP() { - if (WiFiEventData.processedGotIP) { - return; - } - - if (checkAndResetWiFi()) { - return; - } - - IPAddress ip = NetworkLocalIP(); - - if (!useStaticIP()) { - # ifdef ESP8266 - - if (!ip.isSet()) - # else // ifdef ESP8266 - - if ((ip[0] == 0) && (ip[1] == 0) && (ip[2] == 0) && (ip[3] == 0)) - # endif // ifdef ESP8266 - { - return; - } - } - const IPAddress gw = WiFi.gatewayIP(); - const IPAddress subnet = WiFi.subnetMask(); - const LongTermTimer::Duration dhcp_duration = WiFiEventData.lastConnectMoment.timeDiff(WiFiEventData.lastGetIPmoment); - WiFiEventData.dns0_cache = WiFi.dnsIP(0); - WiFiEventData.dns1_cache = WiFi.dnsIP(1); - - if (loglevelActiveFor(LOG_LEVEL_INFO)) { - String log = strformat( - F("WIFI : %s (%s) GW: %s SN: %s DNS: %s"), - concat(useStaticIP() ? F("Static IP: ") : F("DHCP IP: "), formatIP(ip)).c_str(), - NetworkGetHostname().c_str(), - formatIP(gw).c_str(), - formatIP(subnet).c_str(), - getValue(LabelType::DNS).c_str()); - - if ((dhcp_duration > 0ll) && (dhcp_duration < 30000000ll)) { - // Just log times when they make sense. - log += strformat(F(" duration: %d ms"), static_cast(dhcp_duration / 1000)); - } - addLogMove(LOG_LEVEL_INFO, log); - } - - // Might not work in core 2.5.0 - // See https://github.com/esp8266/Arduino/issues/5839 - if ((Settings.IP_Octet != 0) && (Settings.IP_Octet != 255)) - { - ip[3] = Settings.IP_Octet; - - if (loglevelActiveFor(LOG_LEVEL_INFO)) { - addLogMove(LOG_LEVEL_INFO, concat(F("IP : Fixed IP octet:"), formatIP(ip))); - } - WiFi.config(ip, gw, subnet, WiFiEventData.dns0_cache, WiFiEventData.dns1_cache); - } - - # if FEATURE_MQTT - mqtt_reconnect_count = 0; - MQTTclient_should_reconnect = true; - timermqtt_interval = 100; - Scheduler.setIntervalTimer(SchedulerIntervalTimer_e::TIMER_MQTT); - scheduleNextMQTTdelayQueue(); - # endif // if FEATURE_MQTT - Scheduler.sendGratuitousARP_now(); - - if (Settings.UseRules) - { - eventQueue.add(F("WiFi#Connected")); - } - statusLED(true); - - // WiFi.scanDelete(); - - if (WiFiEventData.wifiSetup) { - // Wifi setup was active, Apparently these settings work. - WiFiEventData.wifiSetup = false; - SaveSecuritySettings(); - } - - if ((WiFiEventData.WiFiConnected() || WiFi.isConnected()) && hasIPaddr()) { - WiFiEventData.setWiFiGotIP(); - } - # if FEATURE_ESPEASY_P2P - refreshNodeList(); - # endif - logConnectionStatus(); -} - - -# if FEATURE_USE_IPV6 - -void processGotIPv6() { - if (!WiFiEventData.processedGotIP6) { - WiFiEventData.processedGotIP6 = true; - - if (loglevelActiveFor(LOG_LEVEL_INFO)) { - addLog(LOG_LEVEL_INFO, String(F("WIFI : STA got IP6 ")) + WiFiEventData.unprocessed_IP6.toString(true)); - } -# if FEATURE_ESPEASY_P2P - - // updateUDPport(true); -# endif // if FEATURE_ESPEASY_P2P - } -} - -# endif // if FEATURE_USE_IPV6 - - -// A client disconnected from the AP on this node. -void processDisconnectAPmode() { - if (WiFiEventData.processedDisconnectAPmode) { return; } - WiFiEventData.processedDisconnectAPmode = true; - -# ifndef BUILD_NO_DEBUG - - if (loglevelActiveFor(LOG_LEVEL_INFO)) { - String log(strformat( - F("AP Mode: Client disconnected: %s Connected devices: %u"), - WiFiEventData.lastMacDisconnectedAPmode.toString().c_str(), - WiFi.softAPgetStationNum())); - addLogMove(LOG_LEVEL_INFO, log); - } -# endif // ifndef BUILD_NO_DEBUG -} - -// Client connects to AP on this node -void processConnectAPmode() { - if (WiFiEventData.processedConnectAPmode) { return; } - WiFiEventData.processedConnectAPmode = true; - - // Extend timer to switch off AP. - WiFiEventData.timerAPoff.setMillisFromNow(WIFI_AP_OFF_TIMER_DURATION); -# ifndef BUILD_NO_DEBUG - - if (loglevelActiveFor(LOG_LEVEL_INFO)) { - String log(strformat( - F("AP Mode: Client connected: %s Connected devices: %u"), - WiFiEventData.lastMacConnectedAPmode.toString().c_str(), - WiFi.softAPgetStationNum())); - addLogMove(LOG_LEVEL_INFO, log); - } -# endif // ifndef BUILD_NO_DEBUG - - # if FEATURE_DNS_SERVER - - // Start DNS, only used if the ESP has no valid WiFi config - // It will reply with it's own address on all DNS requests - // (captive portal concept) - if (!dnsServerActive) { - dnsServerActive = true; - dnsServer.start(DNS_PORT, "*", apIP); - } - # endif // if FEATURE_DNS_SERVER -} - -// Switch of AP mode when timeout reached and no client connected anymore. -void processDisableAPmode() { - if (!WiFiEventData.timerAPoff.isSet()) { return; } - - if (!ESPEasy::net::wifi::WifiIsAP(WiFi.getMode())) { - return; - } - - // disable AP after timeout and no clients connected. - if (WiFiEventData.timerAPoff.timeReached() && (WiFi.softAPgetStationNum() == 0)) { - ESPEasy::net::wifi::setAP(false); - } - - if (!ESPEasy::net::wifi::WifiIsAP(WiFi.getMode())) { - WiFiEventData.timerAPoff.clear(); - - if (WiFiEventData.wifiConnectAttemptNeeded) { - // Force a reconnect cycle - WifiDisconnect(); - } - } -} - -void processScanDone() { - WiFi_AP_Candidates.load_knownCredentials(); - - if (WiFiEventData.processedScanDone) { return; } - - - // Better act on the scan done event, as it may get triggered for normal wifi begin calls. - int8_t scanCompleteStatus = WiFi.scanComplete(); - - switch (scanCompleteStatus) - { - case 0: // Nothing (yet) found - - if (WiFiEventData.lastGetScanMoment.timeoutReached(5000)) { - WiFi.scanDelete(); - WiFiEventData.processedScanDone = true; - } - return; - case -1: // WIFI_SCAN_RUNNING - - // FIXME TD-er: Set timeout... - if (WiFiEventData.lastGetScanMoment.timeoutReached(5000)) { - # ifndef BUILD_NO_DEBUG - addLog(LOG_LEVEL_ERROR, F("WiFi : Scan Running Timeout")); - # endif - WiFi.scanDelete(); - WiFiEventData.processedScanDone = true; - } - return; - case -2: // WIFI_SCAN_FAILED - addLog(LOG_LEVEL_ERROR, F("WiFi : Scan failed (old)")); - WiFi.scanDelete(); - WiFiEventData.processedScanDone = true; - return; - } - - WiFiEventData.lastGetScanMoment.setNow(); - WiFiEventData.processedScanDone = true; -# ifndef BUILD_NO_DEBUG - - if (loglevelActiveFor(LOG_LEVEL_INFO)) { - addLogMove(LOG_LEVEL_INFO, concat(F("WiFi : Scan finished, found: "), scanCompleteStatus)); - } -# endif // ifndef BUILD_NO_DEBUG - -# if !FEATURE_ESP8266_DIRECT_WIFI_SCAN - WiFi_AP_Candidates.process_WiFiscan(); -# endif - WiFi_AP_Candidates.load_knownCredentials(); - - if (WiFi_AP_Candidates.addedKnownCandidate() && !NetworkConnected()) { - if (!WiFiEventData.wifiConnectInProgress) { - WiFiEventData.wifiConnectAttemptNeeded = true; - # ifndef BUILD_NO_DEBUG - - if (WiFi_AP_Candidates.addedKnownCandidate()) { - addLog(LOG_LEVEL_INFO, F("WiFi : Added known candidate, try to connect")); - } - # endif // ifndef BUILD_NO_DEBUG -# ifdef ESP32 - - // ESPEasy::net::wifi::setSTA(false); -# endif // ifdef ESP32 -// NetworkConnectRelaxed(); -# ifdef USES_ESPEASY_NOW - temp_disable_EspEasy_now_timer = millis() + 20000; -# endif - } - } else if (!WiFiEventData.wifiConnectInProgress && !NetworkConnected()) { - WiFiEventData.timerAPstart.setNow(); - } - -} - */ - -} // namespace wifi -} // namespace net -} // namespace ESPEasy -#endif // if FEATURE_WIFI diff --git a/src/ESPEasy/net/wifi/ESPEasyWifi_ProcessEvent.h b/src/ESPEasy/net/wifi/ESPEasyWifi_ProcessEvent.h deleted file mode 100644 index c6e6f6955..000000000 --- a/src/ESPEasy/net/wifi/ESPEasyWifi_ProcessEvent.h +++ /dev/null @@ -1,26 +0,0 @@ -#pragma once - -#include "../../../ESPEasy_common.h" - -#if FEATURE_WIFI -namespace ESPEasy { -namespace net { -namespace wifi { - -//void handle_unprocessedNetworkEvents(); -//void processDisconnect(); -//void processConnect(); -//void processGotIP(); -# if FEATURE_USE_IPV6 -//void processGotIPv6(); -# endif -//void processDisconnectAPmode(); -//void processConnectAPmode(); -//void processDisableAPmode(); -//void processScanDone(); - -} // namespace wifi -} // namespace net -} // namespace ESPEasy - -#endif // if FEATURE_WIFI diff --git a/src/ESPEasy/net/wifi/ESPEasyWifi_abstracted.cpp b/src/ESPEasy/net/wifi/ESPEasyWifi_abstracted.cpp index 6eb233372..42eb938a4 100644 --- a/src/ESPEasy/net/wifi/ESPEasyWifi_abstracted.cpp +++ b/src/ESPEasy/net/wifi/ESPEasyWifi_abstracted.cpp @@ -70,7 +70,7 @@ bool doWiFiScanAllowed() { if (WiFi_AP_Candidates.scanComplete() == WIFI_SCAN_RUNNING) { return false; } - return WiFiEventData.processedConnect; + return true; // WiFiEventData.processedConnect; } // Only internal scope @@ -154,7 +154,7 @@ void doSetAPinternal(bool enable) } } # endif // ifdef ESP32 - WiFiEventData.timerAPoff.setMillisFromNow(WIFI_AP_OFF_TIMER_DURATION); +// WiFiEventData.timerAPoff.setMillisFromNow(WIFI_AP_OFF_TIMER_DURATION); } else { # if FEATURE_DNS_SERVER @@ -234,18 +234,19 @@ void doSetWiFiTXpower(float dBm, float rssi) { doSetWiFiTXpower(dBm); - if (WiFiEventData.wifi_TX_pwr < dBm) { +// if (WiFiEventData.wifi_TX_pwr < dBm) { // Will increase the TX power, give power supply of the unit some rest - delay(1); - } +// delay(1); + //} - WiFiEventData.wifi_TX_pwr = dBm; +// WiFiEventData.wifi_TX_pwr = dBm; delay(0); + # ifndef BUILD_NO_DEBUG if (loglevelActiveFor(LOG_LEVEL_DEBUG)) { - const int TX_pwr_int = WiFiEventData.wifi_TX_pwr * 4; + const int TX_pwr_int = dBm * 4; const int maxTXpwr_int = maxTXpwr * 4; if (TX_pwr_int != maxTXpwr_int) { diff --git a/src/ESPEasy/net/wifi/ESPEasyWifi_abstracted_ESP32.cpp b/src/ESPEasy/net/wifi/ESPEasyWifi_abstracted_ESP32.cpp index cb63f811a..cc63f8a30 100644 --- a/src/ESPEasy/net/wifi/ESPEasyWifi_abstracted_ESP32.cpp +++ b/src/ESPEasy/net/wifi/ESPEasyWifi_abstracted_ESP32.cpp @@ -12,7 +12,6 @@ # include "../../net/ESPEasyNetwork.h" // Needed for NetworkCreateRFCCompliantHostname, WiFi code should not include network code # include "../Globals/ESPEasyWiFiEvent.h" # include "../wifi/ESPEasyWiFi_STA_Event_ESP32.h" -# include "../wifi/ESPEasyWifi_ProcessEvent.h" # include # include // Needed to call ESP-IDF functions like esp_wifi_.... @@ -222,7 +221,7 @@ void doWifiScan(bool async, uint8_t channel) { } START_TIMER; - WiFiEventData.lastScanMoment.setNow(); +// WiFiEventData.lastScanMoment.setNow(); # ifndef BUILD_NO_DEBUG if (loglevelActiveFor(LOG_LEVEL_INFO)) { @@ -234,9 +233,8 @@ void doWifiScan(bool async, uint8_t channel) { } # endif // ifndef BUILD_NO_DEBUG bool show_hidden = true; - WiFiEventData.processedScanDone = false; - WiFiEventData.lastGetScanMoment.setNow(); - WiFiEventData.lastScanChannel = channel; +// WiFiEventData.lastGetScanMoment.setNow(); +// WiFiEventData.lastScanChannel = channel; unsigned int nrScans = 1 + (async ? 0 : Settings.NumberExtraWiFiScans); @@ -286,9 +284,9 @@ void doWifiScan(bool async, uint8_t channel) { addLog(LOG_LEVEL_INFO, F("WiFi : Disconnect after scan")); # endif - const bool needReconnect = WiFiEventData.wifiConnectAttemptNeeded; +// const bool needReconnect = WiFiEventData.wifiConnectAttemptNeeded; WifiDisconnect(); - WiFiEventData.wifiConnectAttemptNeeded = needReconnect; +// WiFiEventData.wifiConnectAttemptNeeded = needReconnect; } # endif // if ESP_IDF_VERSION_MAJOR < 5 # if CONFIG_SOC_WIFI_SUPPORT_5G @@ -468,15 +466,6 @@ void doSetConnectionSpeed(bool ForceWiFi_bg_mode) protocol = WIFI_PROTOCOL_11B | WIFI_PROTOCOL_11G; // Default to BG } - /* - if (WiFiEventData.connectionFailures > 10) { - // Set to allow all protocols - protocol = WIFI_PROTOCOL_11B | WIFI_PROTOCOL_11G | WIFI_PROTOCOL_11N; - # if CONFIG_SOC_WIFI_HE_SUPPORT - protocol |= WIFI_PROTOCOL_11AX; - # endif - } - */ const WiFi_AP_Candidate candidate = WiFi_AP_Candidates.getCurrent(); if (candidate.phy_known()) { diff --git a/src/ESPEasy/net/wifi/ESPEasyWifi_abstracted_ESP8266.cpp b/src/ESPEasy/net/wifi/ESPEasyWifi_abstracted_ESP8266.cpp index b7375b66a..2833bd131 100644 --- a/src/ESPEasy/net/wifi/ESPEasyWifi_abstracted_ESP8266.cpp +++ b/src/ESPEasy/net/wifi/ESPEasyWifi_abstracted_ESP8266.cpp @@ -10,7 +10,6 @@ # include "../Globals/ESPEasyWiFiEvent.h" # include "../wifi/ESPEasyWiFi_STA_Event_ESP8266.h" -# include "../wifi/ESPEasyWifi_ProcessEvent.h" // # include "../wifi/ESPEasyWifi.h" @@ -139,7 +138,7 @@ void doWifiScan(bool async, uint8_t channel) { } START_TIMER; - WiFiEventData.lastScanMoment.setNow(); +// WiFiEventData.lastScanMoment.setNow(); # ifndef BUILD_NO_DEBUG if (loglevelActiveFor(LOG_LEVEL_INFO)) { @@ -151,9 +150,8 @@ void doWifiScan(bool async, uint8_t channel) { } # endif // ifndef BUILD_NO_DEBUG bool show_hidden = true; - WiFiEventData.processedScanDone = false; - WiFiEventData.lastGetScanMoment.setNow(); - WiFiEventData.lastScanChannel = channel; +// WiFiEventData.lastGetScanMoment.setNow(); +// WiFiEventData.lastScanChannel = channel; unsigned int nrScans = 1 + (async ? 0 : Settings.NumberExtraWiFiScans); @@ -163,40 +161,7 @@ void doWifiScan(bool async, uint8_t channel) { FeedSW_watchdog(); } --nrScans; -# if FEATURE_ESP8266_DIRECT_WIFI_SCAN - { - static bool FIRST_SCAN = true; - - struct scan_config config; - memset(&config, 0, sizeof(config)); - config.ssid = nullptr; - config.bssid = nullptr; - config.channel = channel; - config.show_hidden = show_hidden ? 1 : 0; - config.scan_type = WIFI_SCAN_TYPE_ACTIVE; - - if (FIRST_SCAN) { - config.scan_time.active.min = 100; - config.scan_time.active.max = 200; - } else { - config.scan_time.active.min = 400; - config.scan_time.active.max = 500; - } - FIRST_SCAN = false; - wifi_station_scan(&config, &onWiFiScanDone); - - if (!async) { - // will resume when SYSTEM_EVENT_SCAN_DONE event is fired - do - { - delay(0); - } while (!WiFiEventData.processedScanDone); - } - - } -# else // if FEATURE_ESP8266_DIRECT_WIFI_SCAN WiFi.scanNetworks(async, show_hidden, channel); -# endif // if FEATURE_ESP8266_DIRECT_WIFI_SCAN if (!async) { FeedSW_watchdog(); diff --git a/src/src/Commands/WiFi.cpp b/src/src/Commands/WiFi.cpp index 649659ec7..e3651ab5d 100644 --- a/src/src/Commands/WiFi.cpp +++ b/src/src/Commands/WiFi.cpp @@ -84,7 +84,7 @@ const __FlashStringHelper* Command_Wifi_Scan(struct EventStruct *event, const ch const __FlashStringHelper* Command_Wifi_Connect(struct EventStruct *event, const char *Line) { - WiFiEventData.wifiConnectAttemptNeeded = true; +// WiFiEventData.wifiConnectAttemptNeeded = true; return return_command_success_flashstr(); } diff --git a/src/src/CustomBuild/define_plugin_sets.h b/src/src/CustomBuild/define_plugin_sets.h index b973ef54d..6509a6fd6 100644 --- a/src/src/CustomBuild/define_plugin_sets.h +++ b/src/src/CustomBuild/define_plugin_sets.h @@ -3559,19 +3559,6 @@ To create/register a plugin, you have to : #endif #endif -#ifndef FEATURE_ESP8266_DIRECT_WIFI_SCAN - // Feature still in development, do not yet use. - #define FEATURE_ESP8266_DIRECT_WIFI_SCAN 0 -#endif - -#if FEATURE_ESP8266_DIRECT_WIFI_SCAN - #ifdef ESP32 - // ESP8266 only feature - #undef FEATURE_ESP8266_DIRECT_WIFI_SCAN - #define FEATURE_ESP8266_DIRECT_WIFI_SCAN 0 - #endif -#endif - #ifndef DISABLE_SC16IS752_SPI #define DISABLE_SC16IS752_SPI #endif diff --git a/src/src/DataStructs/NodesHandler.cpp b/src/src/DataStructs/NodesHandler.cpp index b35b2e3db..0e92cbecf 100644 --- a/src/src/DataStructs/NodesHandler.cpp +++ b/src/src/DataStructs/NodesHandler.cpp @@ -417,7 +417,7 @@ void NodesHandler::updateThisNode() { #ifdef USES_ESPEASY_NOW thisNode.channel = getESPEasyNOW_channel(); #else - thisNode.channel = WiFiEventData.usedChannel; + thisNode.channel = WiFi.channel(); //WiFiEventData.usedChannel; #endif if (thisNode.channel == 0) { thisNode.channel = WiFi.channel(); @@ -643,7 +643,7 @@ uint8_t NodesHandler::getESPEasyNOW_channel() const return preferred->channel; } } - return WiFiEventData.usedChannel; + return WiFi.channel(); // WiFiEventData.usedChannel; } #endif diff --git a/src/src/ESPEasyCore/Controller.cpp b/src/src/ESPEasyCore/Controller.cpp index dcf82ccb4..5dc37ce52 100644 --- a/src/src/ESPEasyCore/Controller.cpp +++ b/src/src/ESPEasyCore/Controller.cpp @@ -638,14 +638,16 @@ String getMQTTclientID(const ControllerSettingsStruct& ControllerSettings) { parseSystemVariables(clientid, false); clientid.replace(' ', '_'); // Make sure no spaces are present in the client ID - if ((WiFiEventData.wifi_reconnects >= 1) && ControllerSettings.mqtt_uniqueMQTTclientIdReconnect()) { + if (// (WiFiEventData.wifi_reconnects >= 1) && + ControllerSettings.mqtt_uniqueMQTTclientIdReconnect()) { // Work-around for 'lost connections' to the MQTT broker. // If the broker thinks the connection is still alive, a reconnect from the // client will be refused. // To overcome this issue, append the number of reconnects to the client ID to // make it different from the previous one. + static int id{}; clientid += '_'; - clientid += WiFiEventData.wifi_reconnects; + clientid += ++id; //WiFiEventData.wifi_reconnects; } return clientid; } diff --git a/src/src/ESPEasyCore/ESPEasy_Log.cpp b/src/src/ESPEasyCore/ESPEasy_Log.cpp index 4756daeea..ee1588ef8 100644 --- a/src/src/ESPEasyCore/ESPEasy_Log.cpp +++ b/src/src/ESPEasyCore/ESPEasy_Log.cpp @@ -5,6 +5,7 @@ #include "../Globals/Cache.h" #include "../Globals/ESPEasy_Console.h" #include "../../ESPEasy/net/Globals/ESPEasyWiFiEvent.h" +#include "../../ESPEasy/net/ESPEasyNetwork.h" #include "../Globals/Logging.h" #include "../Globals/Settings.h" #include "../Helpers/Networking.h" @@ -143,7 +144,7 @@ uint8_t getSerialLogLevel() { #else if (log_to_serial_disabled || !Settings.UseSerial || activeTaskUseSerial0()) return 0; #endif - if (!(WiFiEventData.WiFiServicesInitialized())){ + if (!ESPEasy::net::NetworkConnected()) { if (Settings.SerialLogLevel < LOG_LEVEL_INFO) { return LOG_LEVEL_INFO; } diff --git a/src/src/ESPEasyCore/ESPEasy_loop.cpp b/src/src/ESPEasyCore/ESPEasy_loop.cpp index 0e2465747..81a88fad9 100644 --- a/src/src/ESPEasyCore/ESPEasy_loop.cpp +++ b/src/src/ESPEasyCore/ESPEasy_loop.cpp @@ -5,7 +5,6 @@ #include "../../ESPEasy/net/ESPEasyNetwork.h" #include "../../ESPEasy/net/Globals/NWPlugins.h" #include "../../ESPEasy/net/wifi/ESPEasyWifi.h" -#include "../../ESPEasy/net/wifi/ESPEasyWifi_ProcessEvent.h" #include "../Commands/ExecuteCommand.h" #include "../Commands/InternalCommands_decoder.h" #include "../DataStructs/TimingStats.h" diff --git a/src/src/ESPEasyCore/ESPEasy_setup.cpp b/src/src/ESPEasyCore/ESPEasy_setup.cpp index 2c233554a..6ba48d7aa 100644 --- a/src/src/ESPEasyCore/ESPEasy_setup.cpp +++ b/src/src/ESPEasyCore/ESPEasy_setup.cpp @@ -11,7 +11,6 @@ #include "../ESPEasyCore/ESPEasyRules.h" #include "../../ESPEasy/net/wifi/ESPEasyWifi.h" -#include "../../ESPEasy/net/wifi/ESPEasyWifi_ProcessEvent.h" #include "../ESPEasyCore/Serial.h" #include "../Globals/Cache.h" #include "../Globals/ESPEasy_Console.h" @@ -238,7 +237,7 @@ void ESPEasy_setup() ESPEasy::net::NWPluginSetup(); // ESPEasy::net::wifi::initWiFi(); - WiFiEventData.clearAll(); +// WiFiEventData.clearAll(); #ifndef LIMIT_BUILD_SIZE run_compiletime_checks(); diff --git a/src/src/Helpers/ESPEasy_FactoryDefault.cpp b/src/src/Helpers/ESPEasy_FactoryDefault.cpp index c2629eae6..1199b6d63 100644 --- a/src/src/Helpers/ESPEasy_FactoryDefault.cpp +++ b/src/src/Helpers/ESPEasy_FactoryDefault.cpp @@ -419,7 +419,7 @@ void ResetFactory(bool formatFS) // NOTE: this is a known ESP8266 bug, not our fault. :) delay(1000); WiFi.persistent(true); // use SDK storage of SSID/WPA parameters - WiFiEventData.intent_to_reboot = true; +// WiFiEventData.intent_to_reboot = true; ESPEasy::net::wifi::WifiDisconnect(); // this will store empty ssid/wpa into sdk storage WiFi.persistent(false); // Do not use SDK storage of SSID/WPA parameters reboot(IntendedRebootReason_e::ResetFactory); diff --git a/src/src/Helpers/ESPEasy_Storage.cpp b/src/src/Helpers/ESPEasy_Storage.cpp index 94842028c..b0c38687a 100644 --- a/src/src/Helpers/ESPEasy_Storage.cpp +++ b/src/src/Helpers/ESPEasy_Storage.cpp @@ -865,7 +865,7 @@ String SaveSecuritySettings(bool forFactoryReset) { if (SecuritySettings.hasWiFiCredentials() && (active_network_medium == ESPEasy::net::NetworkMedium_t::WIFI)) { ESPEasy::net::wifi::WiFi_AP_Candidates.force_reload(); // Force reload of the credentials and found APs from the last scan if (!ESPEasy::net::NetworkConnected()) { - WiFiEventData.wifiConnectAttemptNeeded = true; +// WiFiEventData.wifiConnectAttemptNeeded = true; ESPEasy::net::wifi::resetWiFi(); String dummy; ESPEasy::net::NWPluginCall( diff --git a/src/src/Helpers/Hardware.cpp b/src/src/Helpers/Hardware.cpp index 7308e2530..9df1ca03a 100644 --- a/src/src/Helpers/Hardware.cpp +++ b/src/src/Helpers/Hardware.cpp @@ -304,13 +304,13 @@ void checkResetFactoryPin() { int lastADCvalue = 0; int espeasy_analogRead(int pin) { - if (!WiFiEventData.wifiConnectInProgress) { +// if (!WiFiEventData.wifiConnectInProgress) { #if FEATURE_ADC_VCC lastADCvalue = ESP.getVcc(); #else lastADCvalue = analogRead(A0); #endif // if FEATURE_ADC_VCC - } +// } return lastADCvalue; } diff --git a/src/src/Helpers/Hardware_ADC.cpp b/src/src/Helpers/Hardware_ADC.cpp index f4f763142..d4c905fc9 100644 --- a/src/src/Helpers/Hardware_ADC.cpp +++ b/src/src/Helpers/Hardware_ADC.cpp @@ -15,13 +15,13 @@ bool Hardware_ADC_t::init() { int Hardware_ADC_t::read() { - if (!WiFiEventData.wifiConnectInProgress) { +// if (!WiFiEventData.wifiConnectInProgress) { # if FEATURE_ADC_VCC _lastADCvalue = ESP.getVcc(); # else // if FEATURE_ADC_VCC _lastADCvalue = analogRead(A0); # endif // if FEATURE_ADC_VCC - } +// } return _lastADCvalue; } diff --git a/src/src/Helpers/MDNS_Helper.cpp b/src/src/Helpers/MDNS_Helper.cpp index bac51cbde..fe03ea81a 100644 --- a/src/src/Helpers/MDNS_Helper.cpp +++ b/src/src/Helpers/MDNS_Helper.cpp @@ -16,8 +16,7 @@ void set_mDNS() { #if FEATURE_MDNS - - if (!WiFiEventData.WiFiServicesInitialized()) { return; } + if (!ESPEasy::net::NetworkConnected()) return; update_mDNS(); #endif // if FEATURE_MDNS diff --git a/src/src/Helpers/Networking.cpp b/src/src/Helpers/Networking.cpp index 7a3eb5f06..92b2c715f 100644 --- a/src/src/Helpers/Networking.cpp +++ b/src/src/Helpers/Networking.cpp @@ -1169,6 +1169,7 @@ bool connectClient(WiFiClient& client, IPAddress ip, uint16_t port, uint32_t tim #endif // FEATURE_HTTP_CLIENT void scrubDNS() { + /* #if FEATURE_ETHERNET if (active_network_medium == ESPEasy::net::NetworkMedium_t::Ethernet) { @@ -1179,11 +1180,7 @@ void scrubDNS() { return; } #endif // if FEATURE_ETHERNET - - if (WiFiEventData.WiFiServicesInitialized()) { - setDNS(0, WiFiEventData.dns0_cache); - setDNS(1, WiFiEventData.dns1_cache); - } + */ } bool valid_DNS_address(const IPAddress& dns) { diff --git a/src/src/Helpers/PeriodicalActions.cpp b/src/src/Helpers/PeriodicalActions.cpp index f46703bb8..f70bd7a22 100644 --- a/src/src/Helpers/PeriodicalActions.cpp +++ b/src/src/Helpers/PeriodicalActions.cpp @@ -573,7 +573,7 @@ void flushAndDisconnectAllClients() { void prepareShutdown(IntendedRebootReason_e reason) { - WiFiEventData.intent_to_reboot = true; +// WiFiEventData.intent_to_reboot = true; #if FEATURE_MQTT runPeriodicalMQTT(); // Flush outstanding MQTT messages #endif // if FEATURE_MQTT diff --git a/src/src/Helpers/SystemVariables.cpp b/src/src/Helpers/SystemVariables.cpp index 9ee36411d..a22925ef6 100644 --- a/src/src/Helpers/SystemVariables.cpp +++ b/src/src/Helpers/SystemVariables.cpp @@ -34,9 +34,11 @@ #if defined(ESP8266) # include + #define WIFI_CONNECTED WiFi.isConnected() #endif // if defined(ESP8266) #if defined(ESP32) # include + #define WIFI_CONNECTED WiFi.STA.connected() #endif // if defined(ESP32) @@ -160,7 +162,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 (WiFiEventData.WiFiDisconnected()) ? MAC_address().toString() : WiFi.BSSIDstr(); + case BSSID: return (!WIFI_CONNECTED) ? MAC_address().toString() : WiFi.BSSIDstr(); case CR: return String('\r'); case IP4: intvalue = static_cast(ESPEasy::net::NetworkLocalIP()[3]); break; // 4th IP octet case ISVAR_DOUBLE: intvalue = @@ -190,13 +192,16 @@ String SystemVariables::getSystemVariable(SystemVariables::Enum enumval) { 0; break; case ISNTP: intvalue = statusNTPInitialized ? 1 : 0; break; - case ISWIFI: intvalue = WiFiEventData.wifiStatus; break; // 0=disconnected, 1=connected, 2=got ip, 4=services + case ISWIFI: intvalue = WIFI_CONNECTED ? 1 : 0; break; + // 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. case SPACE: return String(' '); - case SSID: return (WiFiEventData.WiFiDisconnected()) ? String(F("--")) : WiFi.SSID(); + case SSID: return (!WIFI_CONNECTED) ? String(F("--")) : WiFi.SSID(); + + case SYSBUILD_DATE: return get_build_date(); case SYSBUILD_TIME: return get_build_time(); case SYSDAY: intvalue = node_time.day(); break; @@ -248,7 +253,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 = (WiFiEventData.WiFiDisconnected()) ? 0 : WiFi.channel(); break; + case WI_CH: intvalue = !WIFI_CONNECTED ? 0 : WiFi.channel(); break; default: // Already handled above. diff --git a/src/src/PluginStructs/P026_data_struct.cpp b/src/src/PluginStructs/P026_data_struct.cpp index 68b820133..ad8fe6dd8 100644 --- a/src/src/PluginStructs/P026_data_struct.cpp +++ b/src/src/PluginStructs/P026_data_struct.cpp @@ -4,6 +4,7 @@ # include "../DataStructs/ESPEasy_packed_raw_data.h" # include "../../ESPEasy/net/ESPEasyNetwork.h" +# include "../../ESPEasy/net/wifi/ESPEasyWifi.h" # include "../../ESPEasy/net/Globals/ESPEasyWiFiEvent.h" # include "../Helpers/Memory.h" # include "../Helpers/Hardware_temperature_sensor.h" @@ -134,7 +135,11 @@ float P026_get_value(uint8_t type) res = timePassedSince(lastWeb) / 1000.0f; break; // respond in seconds case P026_VALUETYPE_freestack: res = getCurrentFreeStack(); break; - case P026_VALUETYPE_txpwr: res = WiFiEventData.wifi_TX_pwr; break; +# if FEATURE_SET_WIFI_TX_PWR + case P026_VALUETYPE_txpwr: res = ESPEasy::net::wifi::GetWiFiTXpower(); break; +#else + case P026_VALUETYPE_txpwr: res = 0; break; +#endif # ifdef USE_SECOND_HEAP case P026_VALUETYPE_free2ndheap: res = FreeMem2ndHeap(); diff --git a/src/src/PluginStructs/P109_data_struct.cpp b/src/src/PluginStructs/P109_data_struct.cpp index fc4a398c7..20597f632 100644 --- a/src/src/PluginStructs/P109_data_struct.cpp +++ b/src/src/PluginStructs/P109_data_struct.cpp @@ -501,7 +501,7 @@ void P109_data_struct::actionMode(struct EventStruct *event) { * Display header, alternating between WiFi AP SSID and Sysname */ void P109_data_struct::display_header() { - if (_alternateTitle && _showWiFiName && WiFiEventData.WiFiServicesInitialized()) { + if (_alternateTitle && _showWiFiName && ESPEasy::net::NetworkConnected()) { // String newString = ; display_title(WiFi.SSID()); } else { @@ -536,7 +536,7 @@ void P109_data_struct::display_title(const String& title) { * Draw Signal Strength Bars, return true when there was an update. */ bool P109_data_struct::display_wifibars() { - const bool connected = WiFiEventData.WiFiServicesInitialized(); + const bool connected = ESPEasy::net::NetworkConnected(); const int nbars_filled = (WiFi.RSSI() + 100) / 8; const int newState = connected ? nbars_filled : P109_WIFI_STATE_UNSET; @@ -561,7 +561,7 @@ bool P109_data_struct::display_wifibars() { _display->fillRect(x, y, size_x, size_y); _display->setColor(WHITE); - if (WiFiEventData.WiFiServicesInitialized()) { + if (ESPEasy::net::NetworkConnected()) { for (uint8_t ibar = 0; ibar < nbars; ++ibar) { const int16_t height = size_y * (ibar + 1) / nbars; const int16_t xpos = x + ibar * width; diff --git a/src/src/PluginStructs/P145_data_struct.cpp b/src/src/PluginStructs/P145_data_struct.cpp index 192fa2a37..5d91cba68 100644 --- a/src/src/PluginStructs/P145_data_struct.cpp +++ b/src/src/PluginStructs/P145_data_struct.cpp @@ -678,7 +678,7 @@ bool P145_data_struct::plugin_ten_per_second() // Algorithm uses mean value with exeption of max and min values // See declaraion of the global variables for their usage // Skip measurement in analog input is used to calibrate WiFi - if (!WiFiEventData.wifiConnectInProgress) +// if (!WiFiEventData.wifiConnectInProgress) { ovs.add(espeasy_analogRead(analogPin)); } diff --git a/src/src/WebServer/404.cpp b/src/src/WebServer/404.cpp index 9efaa304f..f1dae65fc 100644 --- a/src/src/WebServer/404.cpp +++ b/src/src/WebServer/404.cpp @@ -29,7 +29,8 @@ void handleNotFound() { } // if Wifi setup, launch setup wizard if AP_DONT_FORCE_SETUP is not set. - if (WiFiEventData.wifiSetup && !Settings.ApDontForceSetup()) + if (//WiFiEventData.wifiSetup && + !Settings.ApDontForceSetup()) { web_server.send_P(200, (PGM_P)F("text/html"), (PGM_P)F("")); return; diff --git a/src/src/WebServer/RootPage.cpp b/src/src/WebServer/RootPage.cpp index 4a6ecb36f..3abea0463 100644 --- a/src/src/WebServer/RootPage.cpp +++ b/src/src/WebServer/RootPage.cpp @@ -72,7 +72,8 @@ void handle_root() { } // if Wifi setup, launch setup wizard if AP_DONT_FORCE_SETUP is not set. - if (WiFiEventData.wifiSetup && !Settings.ApDontForceSetup()) + if (!ESPEasy::net::NetworkConnected() && + !Settings.ApDontForceSetup()) { web_server.send_P(200, (PGM_P)F("text/html"), (PGM_P)F("")); return; @@ -205,7 +206,7 @@ void handle_root() { addRowLabelValue(LabelType::ETH_WIFI_MODE); # endif // if FEATURE_ETHERNET - if (!WiFiEventData.WiFiDisconnected()) + if (ESPEasy::net::NetworkConnected()) { addRowLabelValue(LabelType::IP_ADDRESS); #if FEATURE_USE_IPV6 diff --git a/src/src/WebServer/SetupPage.cpp b/src/src/WebServer/SetupPage.cpp index 5ded7fb1b..f0e951a3a 100644 --- a/src/src/WebServer/SetupPage.cpp +++ b/src/src/WebServer/SetupPage.cpp @@ -91,7 +91,7 @@ void handle_setup() { const bool emptyPassAllowed = isFormItemChecked(F("emptypass")); const bool performRescan = hasArg(F("performrescan")); if (performRescan) { - WiFiEventData.lastScanMoment.clear(); +// WiFiEventData.lastScanMoment.clear(); ESPEasy::net::wifi::WifiScan(false); } @@ -119,8 +119,8 @@ void handle_setup() { #endif addHtmlError(SaveSettings()); - WiFiEventData.wifiSetupConnect = true; - WiFiEventData.wifiConnectAttemptNeeded = true; +// WiFiEventData.wifiSetupConnect = true; +// WiFiEventData.wifiConnectAttemptNeeded = true; ESPEasy::net::wifi::WiFi_AP_Candidates.force_reload(); // Force reload of the credentials and found APs from the last scan if (loglevelActiveFor(LOG_LEVEL_INFO)) { @@ -192,7 +192,7 @@ void handle_setup() { } #endif - WiFiEventData.wifiSetup = false; +// WiFiEventData.wifiSetup = false; } html_end_table(); @@ -392,7 +392,7 @@ bool handle_setup_connectingStage(uint8_t refreshCount) { addButton(F("/setup"), F("Back to Setup")); html_TR_TD(); html_BR(); - WiFiEventData.wifiSetupConnect = false; +// WiFiEventData.wifiSetupConnect = false; return false; } int wait = WIFI_RECONNECT_WAIT / 1000; From 20fe2a465f035b1057d7d0972d71be4a9b8b249f Mon Sep 17 00:00:00 2001 From: TD-er Date: Mon, 22 Sep 2025 12:38:02 +0200 Subject: [PATCH 273/564] [Eth] Clear uses of EthEventData for ESP32 builds --- .../DataStructs/NWPluginData_static_runtime.h | 4 + .../NWPluginData_static_runtime_ESP32.cpp | 9 + src/ESPEasy/net/ESPEasyNetwork_ESP32.cpp | 17 +- src/ESPEasy/net/Globals/ESPEasyEthEvent.cpp | 7 - src/ESPEasy/net/Globals/ESPEasyEthEvent.h | 12 - src/ESPEasy/net/Globals/NWPlugins.cpp | 13 + src/ESPEasy/net/Globals/NWPlugins.h | 1 + .../NW003_data_struct_ETH_RMII.cpp | 5 +- .../NW004_data_struct_ETH_SPI.cpp | 5 +- src/ESPEasy/net/eth/ESPEasyEth.cpp | 106 ++----- src/ESPEasy/net/eth/ESPEasyEth.h | 7 +- src/ESPEasy/net/eth/ESPEasyEthEvent.cpp | 76 ----- src/ESPEasy/net/eth/ESPEasyEthEvent.h | 26 -- .../net/eth/ESPEasyEth_ProcessEvent.cpp | 297 ------------------ src/ESPEasy/net/eth/ESPEasyEth_ProcessEvent.h | 26 -- .../net/wifi/ESPEasyWiFi_STA_Event_ESP32.cpp | 4 - src/src/Commands/Networks.cpp | 4 +- src/src/Helpers/Networking.cpp | 1 - src/src/Helpers/PeriodicalActions.cpp | 7 +- src/src/Helpers/StringProvider.cpp | 6 +- 20 files changed, 68 insertions(+), 565 deletions(-) delete mode 100644 src/ESPEasy/net/Globals/ESPEasyEthEvent.cpp delete mode 100644 src/ESPEasy/net/Globals/ESPEasyEthEvent.h delete mode 100644 src/ESPEasy/net/eth/ESPEasyEthEvent.cpp delete mode 100644 src/ESPEasy/net/eth/ESPEasyEthEvent.h delete mode 100644 src/ESPEasy/net/eth/ESPEasyEth_ProcessEvent.cpp delete mode 100644 src/ESPEasy/net/eth/ESPEasyEth_ProcessEvent.h diff --git a/src/ESPEasy/net/DataStructs/NWPluginData_static_runtime.h b/src/ESPEasy/net/DataStructs/NWPluginData_static_runtime.h index 303b54fea..44c36c38f 100644 --- a/src/ESPEasy/net/DataStructs/NWPluginData_static_runtime.h +++ b/src/ESPEasy/net/DataStructs/NWPluginData_static_runtime.h @@ -59,6 +59,10 @@ struct NWPluginData_static_runtime { bool connected() const; +#if FEATURE_ETHERNET + bool linkUp() const; +#endif + bool isDefaultRoute() const; bool hasIP() const; diff --git a/src/ESPEasy/net/DataStructs/NWPluginData_static_runtime_ESP32.cpp b/src/ESPEasy/net/DataStructs/NWPluginData_static_runtime_ESP32.cpp index 6fd54085a..6b94d771c 100644 --- a/src/ESPEasy/net/DataStructs/NWPluginData_static_runtime_ESP32.cpp +++ b/src/ESPEasy/net/DataStructs/NWPluginData_static_runtime_ESP32.cpp @@ -43,6 +43,15 @@ bool NWPluginData_static_runtime::connected() const return _netif->connected(); } +#if FEATURE_ETHERNET +bool NWPluginData_static_runtime::linkUp() const +{ + if (!_netif) { return false; } + return _netif->linkUp(); +} +#endif + + bool NWPluginData_static_runtime::isDefaultRoute() const { if (!_netif) { return false; } diff --git a/src/ESPEasy/net/ESPEasyNetwork_ESP32.cpp b/src/ESPEasy/net/ESPEasyNetwork_ESP32.cpp index c0c314492..571edabca 100644 --- a/src/ESPEasy/net/ESPEasyNetwork_ESP32.cpp +++ b/src/ESPEasy/net/ESPEasyNetwork_ESP32.cpp @@ -11,8 +11,6 @@ #include "../../ESPEasy/net/Globals/NetworkState.h" #include "../../src/Globals/Settings.h" -#include "../../ESPEasy/net/Globals/ESPEasyEthEvent.h" - #include "../../src/Helpers/NetworkStatusLED.h" #include "../../src/Helpers/Networking.h" #include "../../src/Helpers/StringConverter.h" @@ -333,25 +331,22 @@ MAC_address WifiSTAmacAddress() { bool EthFullDuplex() { - if (EthEventData.ethInitSuccess) { - return ETH.fullDuplex(); - } + auto data = getFirst_ETH_NWPluginData_static_runtime(); + if (data && data->connected()) return ETH.fullDuplex(); return false; } bool EthLinkUp() { - if (EthEventData.ethInitSuccess) { - return ETH.linkUp(); - } + auto data = getFirst_ETH_NWPluginData_static_runtime(); + if (data) return data->linkUp(); return false; } uint8_t EthLinkSpeed() { - if (EthEventData.ethInitSuccess) { - return ETH.linkSpeed(); - } + auto data = getFirst_ETH_NWPluginData_static_runtime(); + if (data && data->connected()) return ETH.linkSpeed(); return 0; } diff --git a/src/ESPEasy/net/Globals/ESPEasyEthEvent.cpp b/src/ESPEasy/net/Globals/ESPEasyEthEvent.cpp deleted file mode 100644 index 3cf027e09..000000000 --- a/src/ESPEasy/net/Globals/ESPEasyEthEvent.cpp +++ /dev/null @@ -1,7 +0,0 @@ -#include "../Globals/ESPEasyEthEvent.h" - -#include "../../../ESPEasy_common.h" - -#if FEATURE_ETHERNET -EthernetEventData_t EthEventData; -#endif diff --git a/src/ESPEasy/net/Globals/ESPEasyEthEvent.h b/src/ESPEasy/net/Globals/ESPEasyEthEvent.h deleted file mode 100644 index af0125010..000000000 --- a/src/ESPEasy/net/Globals/ESPEasyEthEvent.h +++ /dev/null @@ -1,12 +0,0 @@ -#pragma once - - -#include "../../../ESPEasy_common.h" -#if FEATURE_ETHERNET - -# include "../DataStructs/EthernetEventData.h" - - -extern EthernetEventData_t EthEventData; - -#endif // if FEATURE_ETHERNET diff --git a/src/ESPEasy/net/Globals/NWPlugins.cpp b/src/ESPEasy/net/Globals/NWPlugins.cpp index 3cfe0e34b..92819dc65 100644 --- a/src/ESPEasy/net/Globals/NWPlugins.cpp +++ b/src/ESPEasy/net/Globals/NWPlugins.cpp @@ -398,6 +398,19 @@ NWPluginData_static_runtime* getWiFi_AP_NWPluginData_static_runtime() return getNWPluginData_static_runtime(NETWORK_INDEX_WIFI_AP); } +NWPluginData_static_runtime* getFirst_ETH_NWPluginData_static_runtime() +{ + for (networkIndex_t i = 0; validNetworkIndex(i); ++i) { + if (Settings.getNetworkEnabled(i)) { + const auto nwpluginID = Settings.getNWPluginID_for_network(i); + if (nwpluginID.value == 3 || nwpluginID.value == 4) { + return getNWPluginData_static_runtime(i); + } + } + } + return nullptr; +} + NWPluginData_static_runtime* getNWPluginData_static_runtime(networkIndex_t index) { auto NW_data = getNWPluginData(index); diff --git a/src/ESPEasy/net/Globals/NWPlugins.h b/src/ESPEasy/net/Globals/NWPlugins.h index 1fbd040ab..b46c43212 100644 --- a/src/ESPEasy/net/Globals/NWPlugins.h +++ b/src/ESPEasy/net/Globals/NWPlugins.h @@ -46,6 +46,7 @@ String getNWPluginNameFromNWPluginID(nwpluginID_t nwpluginID); NWPluginData_static_runtime* getWiFi_STA_NWPluginData_static_runtime(); NWPluginData_static_runtime* getWiFi_AP_NWPluginData_static_runtime(); +NWPluginData_static_runtime* getFirst_ETH_NWPluginData_static_runtime(); NWPluginData_static_runtime* getNWPluginData_static_runtime(networkIndex_t index); const NWPluginData_static_runtime* getDefaultRoute_NWPluginData_static_runtime(); diff --git a/src/ESPEasy/net/NWPluginStructs/NW003_data_struct_ETH_RMII.cpp b/src/ESPEasy/net/NWPluginStructs/NW003_data_struct_ETH_RMII.cpp index c2054de1d..0bdb859f7 100644 --- a/src/ESPEasy/net/NWPluginStructs/NW003_data_struct_ETH_RMII.cpp +++ b/src/ESPEasy/net/NWPluginStructs/NW003_data_struct_ETH_RMII.cpp @@ -48,8 +48,9 @@ bool NW003_data_struct_ETH_RMII::init(EventStruct *event) { auto data = getNWPluginData_static_runtime(); - if (data) { data->mark_begin_establish_connection(); } - ESPEasy::net::eth::ETHConnectRelaxed(); + if (data) { + ESPEasy::net::eth::ETHConnectRelaxed(*data); + } return true; } diff --git a/src/ESPEasy/net/NWPluginStructs/NW004_data_struct_ETH_SPI.cpp b/src/ESPEasy/net/NWPluginStructs/NW004_data_struct_ETH_SPI.cpp index ec636674c..d66cac3b2 100644 --- a/src/ESPEasy/net/NWPluginStructs/NW004_data_struct_ETH_SPI.cpp +++ b/src/ESPEasy/net/NWPluginStructs/NW004_data_struct_ETH_SPI.cpp @@ -47,8 +47,9 @@ bool NW004_data_struct_ETH_SPI::init(EventStruct *event) { auto data = getNWPluginData_static_runtime(); - if (data) { data->mark_begin_establish_connection(); } - ESPEasy::net::eth::ETHConnectRelaxed(); + if (data) { + ESPEasy::net::eth::ETHConnectRelaxed(*data); + } return true; } diff --git a/src/ESPEasy/net/eth/ESPEasyEth.cpp b/src/ESPEasy/net/eth/ESPEasyEth.cpp index 935506334..83d62b47d 100644 --- a/src/ESPEasy/net/eth/ESPEasyEth.cpp +++ b/src/ESPEasy/net/eth/ESPEasyEth.cpp @@ -7,8 +7,6 @@ # include "../wifi/ESPEasyWifi.h" # include "../../../src/ESPEasyCore/ESPEasy_Log.h" # include "../../../src/ESPEasyCore/ESPEasyGPIO.h" -# include "../eth/ESPEasyEthEvent.h" -# include "../Globals/ESPEasyEthEvent.h" # include "../Globals/NetworkState.h" # include "../../../src/Globals/Settings.h" # include "../../../src/Helpers/Hardware_GPIO.h" @@ -41,10 +39,6 @@ void ethSetupStaticIPconfig() { const IPAddress subnet = Settings.ETH_Subnet; const IPAddress dns = Settings.ETH_DNS; - EthEventData.dns0_cache = dns; - EthEventData.dns1_cache = IP_zero; - - if (loglevelActiveFor(LOG_LEVEL_INFO)) { String log = F("ETH IP : Static IP : "); log += formatIP(ip); @@ -57,8 +51,6 @@ void ethSetupStaticIPconfig() { addLogMove(LOG_LEVEL_INFO, log); } ETH.config(ip, gw, subnet, dns); - setDNS(0, EthEventData.dns0_cache); - setDNS(1, EthEventData.dns1_cache); } bool ethCheckSettings() { @@ -114,31 +106,18 @@ void ethPrintSettings() { MAC_address ETHMacAddress() { MAC_address mac; - +/* if (!EthEventData.ethInitSuccess) { addLog(LOG_LEVEL_ERROR, F("Call NetworkMacAddress() only on connected Ethernet!")); } else { ETH.macAddress(mac.mac); } + */ return mac; } -void removeEthEventHandler() -{ - WiFi.removeEvent(EthEventData.wm_event_id); - EthEventData.wm_event_id = 0; -} - -void registerEthEventHandler() -{ - if (EthEventData.wm_event_id != 0) { - removeEthEventHandler(); - } - EthEventData.wm_event_id = WiFi.onEvent(EthEvent); -} - -bool ETHConnectRelaxed() { - if (EthEventData.ethInitSuccess) { +bool ETHConnectRelaxed(NWPluginData_static_runtime& runtimeData) { + if (runtimeData.started() && runtimeData.connected()) { return EthLinkUp(); } ethPrintSettings(); @@ -146,29 +125,16 @@ bool ETHConnectRelaxed() { if (!ethCheckSettings()) { addLog(LOG_LEVEL_ERROR, F("ETH: Settings not correct!!!")); - EthEventData.ethInitSuccess = false; + runtimeData.mark_stop(); return false; } - // Re-register event listener - removeEthEventHandler(); + ethPower(runtimeData, true); + runtimeData.mark_begin_establish_connection(); - ethPower(true); - EthEventData.markEthBegin(); + bool success = runtimeData.started(); - // Re-register event listener - registerEthEventHandler(); - - if (!EthEventData.ethInitSuccess) { -# if ESP_IDF_VERSION_MAJOR < 5 - EthEventData.ethInitSuccess = ETH.begin( - Settings.ETH_Phy_Addr, - Settings.ETH_Pin_power_rst, - Settings.ETH_Pin_mdc_cs, - Settings.ETH_Pin_mdio_irq, - (eth_phy_type_t)Settings.ETH_Phy_Type, - (eth_clock_mode_t)Settings.ETH_Clock_Mode); -# else // if ESP_IDF_VERSION_MAJOR < 5 + if (!success) { # if FEATURE_USE_IPV6 if (Settings.EnableIPv6()) { @@ -195,7 +161,7 @@ bool ETHConnectRelaxed() { // else { # if ETH_SPI_SUPPORTS_CUSTOM - EthEventData.ethInitSuccess = ETH.begin( + success = ETH.begin( to_ESP_phy_type(Settings.ETH_Phy_Type), Settings.ETH_Phy_Addr, Settings.ETH_Pin_mdc_cs, @@ -203,7 +169,7 @@ bool ETHConnectRelaxed() { Settings.ETH_Pin_power_rst, SPI); # else // if ETH_SPI_SUPPORTS_CUSTOM - EthEventData.ethInitSuccess = ETH.begin( + success = ETH.begin( to_ESP_phy_type(Settings.ETH_Phy_Type), Settings.ETH_Phy_Addr, Settings.ETH_Pin_mdc_cs, @@ -220,7 +186,7 @@ bool ETHConnectRelaxed() { # ifndef ESP32P4 ethResetGPIOpins(); # endif - EthEventData.ethInitSuccess = ETH.begin( + success = ETH.begin( to_ESP_phy_type(Settings.ETH_Phy_Type), Settings.ETH_Phy_Addr, Settings.ETH_Pin_mdc_cs, @@ -229,11 +195,9 @@ bool ETHConnectRelaxed() { (eth_clock_mode_t)Settings.ETH_Clock_Mode); # endif // if CONFIG_ETH_USE_ESP32_EMAC && FEATURE_ETHERNET } - -# endif // if ESP_IDF_VERSION_MAJOR < 5 } - if (EthEventData.ethInitSuccess) { + if (success) { // FIXME TD-er: Not sure if this is correctly set to false // EthEventData.ethConnectAttemptNeeded = false; @@ -260,15 +224,15 @@ bool ETHConnectRelaxed() { if (EthLinkUp()) { // We might miss the connected event, since we are already connected. - EthEventData.markConnected(); + runtimeData.mark_connected(); } } else { addLog(LOG_LEVEL_ERROR, F("ETH : Failed to initialize ETH")); } - return EthEventData.ethInitSuccess; + return success; } -void ethPower(bool enable) { +void ethPower(NWPluginData_static_runtime& runtimeData, bool enable) { if (isSPI_EthernetType(Settings.ETH_Phy_Type)) { return; } @@ -280,6 +244,7 @@ void ethPower(bool enable) { } addLog(LOG_LEVEL_INFO, enable ? F("ETH power ON") : F("ETH power OFF")); +/* if (!enable) { EthEventData.ethInitSuccess = false; EthEventData.clearAll(); @@ -296,6 +261,7 @@ void ethPower(bool enable) { // ETH = ETHClass(); } +*/ if (enable) { // ethResetGPIOpins(); @@ -363,40 +329,8 @@ void ethResetGPIOpins() { } bool ETHConnected() { - if (EthEventData.EthServicesInitialized()) { - if (EthLinkUp()) { - return true; - } - - // Apparently we missed an event - EthEventData.processedDisconnect = false; - } else if (EthEventData.ethInitSuccess) { - if (EthLinkUp()) { - EthEventData.setEthConnected(); - - if ((NetworkLocalIP() != IPAddress(0, 0, 0, 0)) && - !EthEventData.EthGotIP()) { - EthEventData.processedGotIP = false; - } - - if (EthEventData.lastConnectMoment.isSet()) { - if (!EthEventData.EthServicesInitialized()) { - if ((EthEventData.lastConnectMoment.millisPassedSince() > 10000) && - EthEventData.lastGetIPmoment.isSet()) { - EthEventData.processedGotIP = false; - EthEventData.markLostIP(); - } - } - } - return EthEventData.EthServicesInitialized(); - } else { - if (EthEventData.last_eth_connect_attempt_moment.isSet() && - (EthEventData.last_eth_connect_attempt_moment.millisPassedSince() < 5000)) { - return false; - } - setNetworkMedium(NetworkMedium_t::WIFI); - } - } + auto data = getFirst_ETH_NWPluginData_static_runtime(); + if (data) return data->connected(); return false; } diff --git a/src/ESPEasy/net/eth/ESPEasyEth.h b/src/ESPEasy/net/eth/ESPEasyEth.h index 58fa7ea17..d63fd5dad 100644 --- a/src/ESPEasy/net/eth/ESPEasyEth.h +++ b/src/ESPEasy/net/eth/ESPEasyEth.h @@ -5,6 +5,7 @@ #if FEATURE_ETHERNET +# include "../DataStructs/NWPluginData_static_runtime.h" # include "../DataStructs/MAC_address.h" # include @@ -18,14 +19,12 @@ void ethSetupStaticIPconfig(); bool ethCheckSettings(); bool ethPrepare(); void ethPrintSettings(); -bool ETHConnectRelaxed(); +bool ETHConnectRelaxed(NWPluginData_static_runtime& runtimeData); bool ETHConnected(); -void ethPower(bool enable); +void ethPower(NWPluginData_static_runtime& runtimeData, bool enable); void ethResetGPIOpins(); MAC_address ETHMacAddress(); -void removeEthEventHandler(); -void registerEthEventHandler(); } // namespace eth } // namespace net diff --git a/src/ESPEasy/net/eth/ESPEasyEthEvent.cpp b/src/ESPEasy/net/eth/ESPEasyEthEvent.cpp deleted file mode 100644 index 2dc91970a..000000000 --- a/src/ESPEasy/net/eth/ESPEasyEthEvent.cpp +++ /dev/null @@ -1,76 +0,0 @@ -#include "../eth/ESPEasyEthEvent.h" - -#ifdef ESP32 -# if FEATURE_ETHERNET -# include - -# include "../eth/ESPEasyEth.h" -# include "../Globals/ESPEasyEthEvent.h" - - -// ******************************************************************************** -// Functions called on events. ** WARNING ** -// Make sure not to call anything in these functions that result in delay() or yield() -// ******************************************************************************** - -# include - -namespace ESPEasy { -namespace net { -namespace eth { - -void EthEvent(WiFiEvent_t event, arduino_event_info_t info) { - switch (event) - { - case ARDUINO_EVENT_ETH_START: - - if (ethPrepare()) { - // addLog(LOG_LEVEL_INFO, F("ETH event: Started")); - // } else { - // addLog(LOG_LEVEL_ERROR, F("ETH event: Could not prepare ETH!")); - } - break; - case ARDUINO_EVENT_ETH_CONNECTED: - // addLog(LOG_LEVEL_INFO, F("ETH event: Connected")); - EthEventData.markConnected(); - break; - case ARDUINO_EVENT_ETH_GOT_IP: - EthEventData.markGotIP(); - - // addLog(LOG_LEVEL_INFO, F("ETH event: Got IP")); - break; - case ARDUINO_EVENT_ETH_DISCONNECTED: - // addLog(LOG_LEVEL_ERROR, F("ETH event: Disconnected")); - EthEventData.markDisconnect(); - break; - case ARDUINO_EVENT_ETH_STOP: - // addLog(LOG_LEVEL_INFO, F("ETH event: Stopped")); - break; - case ARDUINO_EVENT_ETH_GOT_IP6: - # if FEATURE_USE_IPV6 - { - ip_event_got_ip6_t *event = static_cast(&info.got_ip6); - IPAddress ip(IPv6, (const uint8_t *)event->ip6_info.ip.addr, event->ip6_info.ip.zone); - EthEventData.markGotIPv6(ip); - - // addLog(LOG_LEVEL_INFO, String(F("ETH event: Got IP6 ")) + ip.toString(true)); - } - # else // if FEATURE_USE_IPV6 - - // addLog(LOG_LEVEL_INFO, F("ETH event: Got IP6")); - # endif // if FEATURE_USE_IPV6 - break; - default: - { - break; - } - } -} - -} // namespace eth -} // namespace net -} // namespace ESPEasy - -# endif // if FEATURE_ETHERNET - -#endif // ifdef ESP32 diff --git a/src/ESPEasy/net/eth/ESPEasyEthEvent.h b/src/ESPEasy/net/eth/ESPEasyEthEvent.h deleted file mode 100644 index 77d5c11c7..000000000 --- a/src/ESPEasy/net/eth/ESPEasyEthEvent.h +++ /dev/null @@ -1,26 +0,0 @@ -#pragma once - -#include "../../../ESPEasy_common.h" - -#ifdef ESP32 -# if FEATURE_ETHERNET - -namespace ESPEasy { -namespace net { -namespace eth { - -// ******************************************************************************** -// Functions called on Eth events. -// Make sure not to call anything in these functions that result in delay() or yield() -// ******************************************************************************** -# include -# include -void EthEvent(WiFiEvent_t event, - arduino_event_info_t info); - -} // namespace eth -} // namespace net -} // namespace ESPEasy - -# endif // if FEATURE_ETHERNET -#endif // ifdef ESP32 diff --git a/src/ESPEasy/net/eth/ESPEasyEth_ProcessEvent.cpp b/src/ESPEasy/net/eth/ESPEasyEth_ProcessEvent.cpp deleted file mode 100644 index 8f86ba4ab..000000000 --- a/src/ESPEasy/net/eth/ESPEasyEth_ProcessEvent.cpp +++ /dev/null @@ -1,297 +0,0 @@ -#include "../eth/ESPEasyEth_ProcessEvent.h" - -#if FEATURE_ETHERNET - -# include "../../../ESPEasy-Globals.h" - -# include "../eth/ESPEasyEth.h" -# include "../ESPEasyNetwork.h" -# include "../wifi/ESPEasyWifi.h" // LogConnectionStatus - -# include "../Globals/ESPEasyEthEvent.h" -# include "../Globals/ESPEasyWiFiEvent.h" -# include "../../../src/Globals/ESPEasy_Scheduler.h" -# include "../../../src/Globals/ESPEasy_time.h" -# include "../../../src/Globals/EventQueue.h" -# include "../../../src/Globals/MQTT.h" -# include "../Globals/NetworkState.h" -# include "../../../src/Globals/Settings.h" - -# include "../../../src/Helpers/LongTermTimer.h" -# include "../../../src/Helpers/NetworkStatusLED.h" -# include "../../../src/Helpers/Networking.h" -# include "../../../src/Helpers/PeriodicalActions.h" -# include "../../../src/Helpers/StringConverter.h" - -# include - -namespace ESPEasy { -namespace net { -namespace eth { - -void handle_unprocessedEthEvents() { - if (EthEventData.unprocessedEthEvents()) { - // Process disconnect events before connect events. -# if FEATURE_USE_IPV6 - - if (!EthEventData.processedGotIP6) { - processEthernetGotIPv6(); - } -# endif // if FEATURE_USE_IPV6 - - if (!EthEventData.processedDisconnect) { - # ifndef BUILD_NO_DEBUG - addLog(LOG_LEVEL_DEBUG, F("Eth : Entering processDisconnect()")); - # endif // ifndef BUILD_NO_DEBUG - processEthernetDisconnected(); - } - - // Must process the Ethernet Connected event regardless the active network medium. - // It may happen by plugging in the cable while WiFi was active. - if (!EthEventData.processedConnect) { - # ifndef BUILD_NO_DEBUG - addLog(LOG_LEVEL_DEBUG, F("Eth : Entering processConnect()")); - # endif // ifndef BUILD_NO_DEBUG - processEthernetConnected(); - } - } - - if (active_network_medium == NetworkMedium_t::Ethernet) { - const bool EthServices_was_initialized = EthEventData.EthServicesInitialized(); - - if (!EthEventData.EthServicesInitialized() || EthEventData.unprocessedEthEvents()) - { - if (!EthEventData.unprocessedEthEvents() && EthEventData.EthConnectAllowed()) { -// NetworkConnectRelaxed(); - } - - if (!EthEventData.processedGotIP) { - # ifndef BUILD_NO_DEBUG - addLog(LOG_LEVEL_DEBUG, F("Eth : Entering processGotIP()")); - # endif // ifndef BUILD_NO_DEBUG - processEthernetGotIP(); - } - - if (!EthEventData.processedDHCPTimeout) { - # ifndef BUILD_NO_DEBUG - addLog(LOG_LEVEL_DEBUG, F("Eth : DHCP timeout, Calling disconnect()")); - # endif // ifndef BUILD_NO_DEBUG - EthEventData.processedDHCPTimeout = true; - - // WifiDisconnect(); - } - } - EthEventData.setEthServicesInitialized(); - - if (!EthServices_was_initialized && EthEventData.setEthServicesInitialized()) { - registerEthEventHandler(); - } - } -} - -void check_Eth_DNS_valid() { - // Check if DNS is still valid, as this may have been reset by the WiFi module turned off. - // DNS records are shared between WiFi and Ethernet IP stack. - // Turning off WiFi will clead DNS records for Ethernet - if (EthEventData.EthServicesInitialized() && - (active_network_medium == NetworkMedium_t::Ethernet) && - EthEventData.ethInitSuccess && - !ethUseStaticIP()) { - const bool has_cache = - valid_DNS_address(EthEventData.dns0_cache) || - valid_DNS_address(EthEventData.dns1_cache); - - if (has_cache) { - const IPAddress dns0 = ETH.dnsIP(0); - const IPAddress dns1 = ETH.dnsIP(1); - - if (!valid_DNS_address(dns0) && !valid_DNS_address(dns1)) { - static uint32_t lastLog = 0; - - if (timePassedSince(lastLog) > 1000) { - addLogMove(LOG_LEVEL_ERROR, concat( - F("ETH : DNS server was cleared, use cached DNS IP: "), - formatIP(EthEventData.dns0_cache))); - lastLog = millis(); - } - setDNS(0, EthEventData.dns0_cache); - setDNS(1, EthEventData.dns1_cache); - } - } - } -} - -void processEthernetConnected() { - if (EthEventData.processedConnect) { return; } - - // FIXME TD-er: Must differentiate among reconnects for WiFi and Ethernet. -// ++WiFiEventData.wifi_reconnects; - addLog(LOG_LEVEL_INFO, F("processEthernetConnected()")); - EthEventData.setEthConnected(); - EthEventData.processedConnect = true; - - if (Settings.UseRules) - { - eventQueue.add(F("Ethernet#LinkUp")); - } - setNetworkMedium(Settings.NetworkMedium); - - if (ethUseStaticIP()) { EthEventData.processedGotIP = false; } -} - -void processEthernetDisconnected() { - if (EthEventData.processedDisconnect) { return; } - EthEventData.setEthDisconnected(); - EthEventData.processedDisconnect = true; - EthEventData.ethConnectAttemptNeeded = true; - - if (Settings.UseRules) - { - eventQueue.add(F("Ethernet#Disconnected")); - } -} - -void processEthernetGotIP() { - if (EthEventData.processedGotIP || !EthEventData.ethInitSuccess) { - return; - } - - if (ethUseStaticIP()) { - ethSetupStaticIPconfig(); - } - const IPAddress ip = NetworkLocalIP(); - - if (!ip) { - return; - } - - const IPAddress gw = NetworkGatewayIP(); - const IPAddress subnet = NetworkSubnetMask(); - - IPAddress dns0 = ETH.dnsIP(0); - IPAddress dns1 = ETH.dnsIP(1); - const LongTermTimer::Duration dhcp_duration = EthEventData.lastConnectMoment.timeDiff(EthEventData.lastGetIPmoment); - # if ESP_IDF_VERSION_MAJOR >= 5 - const bool mustRequestDHCP = (!dns0 && !dns1) && !ethUseStaticIP(); - # endif - - if (!ethUseStaticIP()) { - if (!dns0 && !dns1) { - addLog(LOG_LEVEL_ERROR, F("ETH : No DNS server received via DHCP, use cached DNS IP")); - - if (EthEventData.dns0_cache) { setDNS(0, EthEventData.dns0_cache); } - - if (EthEventData.dns1_cache) { setDNS(1, EthEventData.dns1_cache); } - } else { - EthEventData.dns0_cache = dns0; - EthEventData.dns1_cache = dns1; - } - } - - if (loglevelActiveFor(LOG_LEVEL_INFO)) - { - String log; - - if (log.reserve(160)) { - log = F("ETH MAC: "); - log += NetworkMacAddress().toString(); - log += ' '; - - if (ethUseStaticIP()) { - log += F("Static"); - } else { - log += F("DHCP"); - } - log += F(" IP: "); - log += formatIP(ip); - log += ' '; - log += wrap_braces(NetworkGetHostname()); - log += F(" GW: "); - log += formatIP(gw); - log += F(" SN: "); - log += formatIP(subnet); - log += F(" DNS: "); - log += formatIP(dns0); - log += '/'; - log += formatIP(dns1); - - if (EthLinkUp()) { - if (EthFullDuplex()) { - log += F(" FULL_DUPLEX"); - } - log += ' '; - log += EthLinkSpeed(); - log += F("Mbps"); - } else { - log += F(" Link Down"); - } - - if ((dhcp_duration > 0ll) && (dhcp_duration < 30000000ll)) { - // Just log times when they make sense. - log += F(" duration: "); - log += static_cast(dhcp_duration / 1000); - log += F(" ms"); - } - - addLogMove(LOG_LEVEL_INFO, log); - } - } - - // First try to get the time, since that may be used in logs - if (node_time.systemTimePresent()) { - node_time.initTime(); - } -# if FEATURE_MQTT - mqtt_reconnect_count = 0; - MQTTclient_should_reconnect = true; - timermqtt_interval = 100; - Scheduler.setIntervalTimer(SchedulerIntervalTimer_e::TIMER_MQTT); - scheduleNextMQTTdelayQueue(); -# endif // if FEATURE_MQTT - Scheduler.sendGratuitousARP_now(); - - if (Settings.UseRules) - { - eventQueue.add(F("Ethernet#Connected")); - } - statusLED(true); - ESPEasy::net::wifi::logConnectionStatus(); - - EthEventData.processedGotIP = true; -# if ESP_IDF_VERSION_MAJOR >= 5 - - if (mustRequestDHCP /*&& EthEventData.lastConnectMoment.millisPassedSince() < 10000*/) { - // FIXME TD-er: Must add some check other than fixed timeout here to not constantly make DHCP requests. - // Force new DHCP request. - ETH.config(); - } -# endif // if ESP_IDF_VERSION_MAJOR >= 5 - - EthEventData.setEthGotIP(); - CheckRunningServices(); -} - -# if FEATURE_USE_IPV6 - -void processEthernetGotIPv6() { - if (!EthEventData.processedGotIP6) { - if (loglevelActiveFor(LOG_LEVEL_INFO)) { - addLog(LOG_LEVEL_INFO, String(F("ETH event: Got IP6 ")) + EthEventData.unprocessed_IP6.toString(true)); - } - EthEventData.processedGotIP6 = true; -# if FEATURE_ESPEASY_P2P - - // updateUDPport(true); -# endif // if FEATURE_ESPEASY_P2P - - } -} - -# endif // if FEATURE_USE_IPV6 - - -} // namespace eth -} // namespace net -} // namespace ESPEasy - -#endif // if FEATURE_ETHERNET diff --git a/src/ESPEasy/net/eth/ESPEasyEth_ProcessEvent.h b/src/ESPEasy/net/eth/ESPEasyEth_ProcessEvent.h deleted file mode 100644 index 8494641bd..000000000 --- a/src/ESPEasy/net/eth/ESPEasyEth_ProcessEvent.h +++ /dev/null @@ -1,26 +0,0 @@ -#pragma once - -#include "../../../ESPEasy_common.h" - -#if FEATURE_ETHERNET - -namespace ESPEasy { -namespace net { -namespace eth { - -void handle_unprocessedEthEvents(); - -void check_Eth_DNS_valid(); - -void processEthernetConnected(); -void processEthernetDisconnected(); -void processEthernetGotIP(); -# if FEATURE_USE_IPV6 -void processEthernetGotIPv6(); -# endif - -} // namespace eth -} // namespace net -} // namespace ESPEasy - -#endif // if FEATURE_ETHERNET diff --git a/src/ESPEasy/net/wifi/ESPEasyWiFi_STA_Event_ESP32.cpp b/src/ESPEasy/net/wifi/ESPEasyWiFi_STA_Event_ESP32.cpp index 337cb106a..45bb3d6ca 100644 --- a/src/ESPEasy/net/wifi/ESPEasyWiFi_STA_Event_ESP32.cpp +++ b/src/ESPEasy/net/wifi/ESPEasyWiFi_STA_Event_ESP32.cpp @@ -25,10 +25,6 @@ # include "../eth/ESPEasyEth.h" # include "../wifi/ESPEasyWifi.h" -# if FEATURE_ETHERNET -# include "../Globals/ESPEasyEthEvent.h" -# endif // if FEATURE_ETHERNET - namespace ESPEasy { namespace net { namespace wifi { diff --git a/src/src/Commands/Networks.cpp b/src/src/Commands/Networks.cpp index 9ba90124b..6452e0ef1 100644 --- a/src/src/Commands/Networks.cpp +++ b/src/src/Commands/Networks.cpp @@ -171,12 +171,14 @@ String Command_ETH_Wifi_Mode (struct EventStruct *event, const char* Line) String Command_ETH_Disconnect (struct EventStruct *event, const char* Line) { + // FIXME TD-er: Must implement support for multiple and default eth interface +/* ESPEasy::net::eth::ethPower(0); delay(400); // ethPower(1); ESPEasy::net::setNetworkMedium(ESPEasy::net::NetworkMedium_t::Ethernet); ESPEasy::net::eth::ETHConnectRelaxed(); - +*/ return return_command_success(); } diff --git a/src/src/Helpers/Networking.cpp b/src/src/Helpers/Networking.cpp index 92b2c715f..405af8712 100644 --- a/src/src/Helpers/Networking.cpp +++ b/src/src/Helpers/Networking.cpp @@ -11,7 +11,6 @@ #include "../../ESPEasy/net/ESPEasyNetwork.h" #include "../../ESPEasy/net/wifi/ESPEasyWifi.h" #include "../ESPEasyCore/Serial.h" -#include "../../ESPEasy/net/Globals/ESPEasyEthEvent.h" #include "../../ESPEasy/net/Globals/ESPEasyWiFiEvent.h" #include "../Globals/ESPEasy_Scheduler.h" diff --git a/src/src/Helpers/PeriodicalActions.cpp b/src/src/Helpers/PeriodicalActions.cpp index f70bd7a22..52f27526f 100644 --- a/src/src/Helpers/PeriodicalActions.cpp +++ b/src/src/Helpers/PeriodicalActions.cpp @@ -35,9 +35,6 @@ #include "../../ESPEasy/net/wifi/ESPEasyWifi.h" #include "../../ESPEasy/net/Globals/ESPEasyWiFiEvent.h" -#if FEATURE_ETHERNET -#include "../../ESPEasy/net/Globals/ESPEasyEthEvent.h" -#endif #include "../../ESPEasy/net/Globals/NetworkState.h" #include "../../ESPEasy/net/Globals/NWPlugins.h" @@ -272,8 +269,8 @@ void runEach30Seconds() logWiFiStatus = false; log += F( " EthSpeedState "); log += getValue(LabelType::ETH_SPEED_STATE); - log += F(" ETH status: "); - log += EthEventData.ESPEasyEthStatusToString(); +// log += F(" ETH status: "); +// log += EthEventData.ESPEasyEthStatusToString(); } #endif // if FEATURE_ETHERNET if (logWiFiStatus) { diff --git a/src/src/Helpers/StringProvider.cpp b/src/src/Helpers/StringProvider.cpp index 89fff8b33..68d366692 100644 --- a/src/src/Helpers/StringProvider.cpp +++ b/src/src/Helpers/StringProvider.cpp @@ -22,10 +22,6 @@ #include "../Globals/ESPEasy_time.h" #include "../../ESPEasy/net/Globals/ESPEasyWiFiEvent.h" -#if FEATURE_ETHERNET -#include "../../ESPEasy/net/Globals/ESPEasyEthEvent.h" -#endif - #include "../../ESPEasy/net/Globals/NetworkState.h" #include "../Globals/SecuritySettings.h" #include "../Globals/Settings.h" @@ -372,7 +368,7 @@ String getValue(LabelType::Enum label) { case LabelType::CPU_ECO_MODE: return jsonBool(Settings.EcoPowerMode()); #if FEATURE_SET_WIFI_TX_PWR case LabelType::WIFI_TX_MAX_PWR: return toString(Settings.getWiFi_TX_power(), 2); - case LabelType::WIFI_CUR_TX_PWR: return toString(WiFiEventData.wifi_TX_pwr, 2); + case LabelType::WIFI_CUR_TX_PWR: return toString(ESPEasy::net::wifi::GetWiFiTXpower(), 2); case LabelType::WIFI_SENS_MARGIN: retval = Settings.WiFi_sensitivity_margin; break; case LabelType::WIFI_SEND_AT_MAX_TX_PWR:return jsonBool(Settings.UseMaxTXpowerForSending()); #endif From 9e1f8763f14f32e33109c510e280e9bcede26607 Mon Sep 17 00:00:00 2001 From: TD-er Date: Mon, 22 Sep 2025 13:06:26 +0200 Subject: [PATCH 274/564] [Build] Fix ESP8266 build --- src/src/Helpers/PeriodicalActions.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/src/Helpers/PeriodicalActions.cpp b/src/src/Helpers/PeriodicalActions.cpp index 52f27526f..16b03fbdd 100644 --- a/src/src/Helpers/PeriodicalActions.cpp +++ b/src/src/Helpers/PeriodicalActions.cpp @@ -304,9 +304,9 @@ void runEach30Seconds() #endif // if FEATURE_SSDP #endif #if FEATURE_ADC_VCC - if (!WiFiEventData.wifiConnectInProgress) { +// if (!WiFiEventData.wifiConnectInProgress) { vcc = ESP.getVcc() / 1000.0f; - } +// } #endif #if FEATURE_REPORTING From dc5f50bf709ec00609a9911cd71ebcfc9505928d Mon Sep 17 00:00:00 2001 From: TD-er Date: Tue, 23 Sep 2025 16:31:14 +0200 Subject: [PATCH 275/564] [WiFi] Fix wifi reconnect (on ESP32) --- .../NWPluginData_static_runtime.cpp | 2 +- .../NWPluginData_static_runtime_ESP32.cpp | 6 ++ src/ESPEasy/net/ESPEasyNetwork.h | 4 + .../NW002_data_struct_WiFi_AP.cpp | 1 + src/ESPEasy/net/_NWPlugin_Helper.h | 5 +- .../net/wifi/ESPEasyWiFi_state_machine.cpp | 98 +++++++++++-------- .../wifi/ESPEasyWiFi_state_machine_ESP32.cpp | 2 +- .../net/wifi/ESPEasyWifi_abstracted.cpp | 7 +- .../net/wifi/ESPEasyWifi_abstracted_ESP32.cpp | 11 ++- .../wifi/ESPEasyWifi_abstracted_ESP8266.cpp | 11 ++- src/src/Commands/WiFi.cpp | 2 +- src/src/DataStructs_templ/SettingsStruct.cpp | 14 +++ src/src/Helpers/PeriodicalActions.cpp | 5 +- src/src/Helpers/StringConverter.cpp | 2 + src/src/WebServer/NetworkPage.cpp | 16 +-- 15 files changed, 121 insertions(+), 65 deletions(-) diff --git a/src/ESPEasy/net/DataStructs/NWPluginData_static_runtime.cpp b/src/ESPEasy/net/DataStructs/NWPluginData_static_runtime.cpp index 6884c3896..4277c48da 100644 --- a/src/ESPEasy/net/DataStructs/NWPluginData_static_runtime.cpp +++ b/src/ESPEasy/net/DataStructs/NWPluginData_static_runtime.cpp @@ -158,7 +158,7 @@ void NWPluginData_static_runtime::processEvents() log_connected(); // _establishConnectStats.resetCount(); - } else if (_connectedStats.isOff()) { + } else if (_connectedStats.isOff() && !_establishConnectStats.isOn()) { log_disconnected(); } } diff --git a/src/ESPEasy/net/DataStructs/NWPluginData_static_runtime_ESP32.cpp b/src/ESPEasy/net/DataStructs/NWPluginData_static_runtime_ESP32.cpp index 6b94d771c..9cae783a1 100644 --- a/src/ESPEasy/net/DataStructs/NWPluginData_static_runtime_ESP32.cpp +++ b/src/ESPEasy/net/DataStructs/NWPluginData_static_runtime_ESP32.cpp @@ -224,6 +224,12 @@ void NWPluginData_static_runtime::log_connected() format_msec_duration_HMS( _establishConnectStats.getLastOnDuration_ms()).c_str(), _establishConnectStats.getCycleCount())); + } else if (_establishConnectStats.isOff()) { + addLog(LOG_LEVEL_INFO, strformat( + F("%s: Connected, took: %s"), + _netif->desc(), + format_msec_duration_HMS( + _establishConnectStats.getLastOnDuration_ms()).c_str())); } else { addLog(LOG_LEVEL_INFO, strformat( F("%s: Connected"), diff --git a/src/ESPEasy/net/ESPEasyNetwork.h b/src/ESPEasy/net/ESPEasyNetwork.h index acad41e41..3e08d45d6 100644 --- a/src/ESPEasy/net/ESPEasyNetwork.h +++ b/src/ESPEasy/net/ESPEasyNetwork.h @@ -14,6 +14,10 @@ typedef std::vector IP6Addresses_t; #endif // if FEATURE_USE_IPV6 + +#define NETWORK_INDEX_WIFI_STA 0 // Always the first network index +#define NETWORK_INDEX_WIFI_AP 1 // Always the 2nd network index + namespace ESPEasy { namespace net { diff --git a/src/ESPEasy/net/NWPluginStructs/NW002_data_struct_WiFi_AP.cpp b/src/ESPEasy/net/NWPluginStructs/NW002_data_struct_WiFi_AP.cpp index db624d1c1..fb0067367 100644 --- a/src/ESPEasy/net/NWPluginStructs/NW002_data_struct_WiFi_AP.cpp +++ b/src/ESPEasy/net/NWPluginStructs/NW002_data_struct_WiFi_AP.cpp @@ -101,6 +101,7 @@ bool NW002_data_struct_WiFi_AP::init(EventStruct *event) bool NW002_data_struct_WiFi_AP::exit(EventStruct *event) { + ESPEasy::net::wifi::setAPinternal(false); # ifdef ESP32 NW_PLUGIN_INTERFACE.enableNAPT(false); NW_PLUGIN_INTERFACE.end(); diff --git a/src/ESPEasy/net/_NWPlugin_Helper.h b/src/ESPEasy/net/_NWPlugin_Helper.h index 589fa66e6..8c579161f 100644 --- a/src/ESPEasy/net/_NWPlugin_Helper.h +++ b/src/ESPEasy/net/_NWPlugin_Helper.h @@ -6,15 +6,12 @@ #include "../../src/DataStructs/ESPEasy_EventStruct.h" #include "../../src/Helpers/LongTermTimer.h" #include "../net/DataStructs/NWPluginData_base.h" +#include "../net/ESPEasyNetwork.h" namespace ESPEasy { namespace net { -#define NETWORK_INDEX_WIFI_STA 0 // Always the first network index -#define NETWORK_INDEX_WIFI_AP 1 // Always the 2nd network index - - extern NWPluginData_base *NWPlugin_task_data[NETWORK_MAX]; // Try to allocate in PSRAM or 2nd heap if possible diff --git a/src/ESPEasy/net/wifi/ESPEasyWiFi_state_machine.cpp b/src/ESPEasy/net/wifi/ESPEasyWiFi_state_machine.cpp index e7c3f91b2..078c4cec4 100644 --- a/src/ESPEasy/net/wifi/ESPEasyWiFi_state_machine.cpp +++ b/src/ESPEasy/net/wifi/ESPEasyWiFi_state_machine.cpp @@ -98,7 +98,7 @@ void ESPEasyWiFi_t::loop() break; case WiFiState_e::IdleWaiting: - if (_state_timeout.timeReached()) { + if (_state_timeout.timeReached() || getSTA_connected_state() == STA_connected_state::Idle) { // This is where we decide what to do next: // - Reconnect // - Scan @@ -108,13 +108,8 @@ void ESPEasyWiFi_t::loop() // Do we have candidate to connect to ? if (WiFi_AP_Candidates.hasCandidates()) { setState(WiFiState_e::STA_Connecting, WIFI_STATE_MACHINE_STA_CONNECTING_TIMEOUT); - } else if (WiFi_AP_Candidates.scanComplete() == 0 || WiFi_AP_Candidates.scanComplete() == -3 -# ifdef ESP32 -# if ESP_IDF_VERSION >= ESP_IDF_VERSION_VAL(5, 1, 2) - || WiFi.status() == WL_STOPPED -# endif -# endif // ifdef ESP32 - ) { + } else if ((WiFi_AP_Candidates.scanComplete() == 0) + || WiFi_AP_Candidates.scanComplete() == -3) { if (WifiIsAP(WiFi.getMode())) { // TODO TD-er: Must check if any client is connected. // If not, then we can disable AP mode and switch to WiFiState_e::STA_Scanning @@ -128,17 +123,18 @@ void ESPEasyWiFi_t::loop() } else if (!WiFi_AP_Candidates.hasCandidateCredentials() || !Settings.DoNotStartAP()) { if (!WiFi_AP_Candidates.hasCandidateCredentials() - // && !WiFiEventData.warnedNoValidWiFiSettings - ) + + // && !WiFiEventData.warnedNoValidWiFiSettings + ) { addLog(LOG_LEVEL_ERROR, F("WIFI : No valid wifi settings")); -// WiFiEventData.warnedNoValidWiFiSettings = true; + + // WiFiEventData.warnedNoValidWiFiSettings = true; } wifi_STA_data->_establishConnectStats.clear(); -// WiFiEventData.wifiConnectAttemptNeeded = false; - setState(WiFiState_e::AP_only, WIFI_STATE_MACHINE_AP_ONLY_TIMEOUT); + // WiFiEventData.wifiConnectAttemptNeeded = false; // end move up?? } } @@ -158,19 +154,26 @@ void ESPEasyWiFi_t::loop() # endif // ifndef BUILD_NO_DEBUG } else if (scanCompleteStatus == -2) { // WIFI_SCAN_FAILED addLog(LOG_LEVEL_ERROR, F("WiFi : Scan failed")); -// WiFi.scanDelete(); + + // WiFi.scanDelete(); setState(WiFiState_e::WiFiOFF, 1000); } if (_state_timeout.timeReached() || (scanCompleteStatus >= 0)) { -// WiFi.scanDelete(); + // WiFi.scanDelete(); if (_state_timeout.timeReached()) { # ifndef BUILD_NO_DEBUG addLog(LOG_LEVEL_ERROR, F("WiFi : Scan Running Timeout")); # endif } - setState(WiFiState_e::WiFiOFF, 100); + + if (!WiFi_AP_Candidates.hasCandidateCredentials() && + !Settings.DoNotStartAP()) { + setState(WiFiState_e::AP_only, WIFI_STATE_MACHINE_AP_ONLY_TIMEOUT); + } else { + setState(WiFiState_e::WiFiOFF, 100); + } } break; } @@ -190,12 +193,13 @@ void ESPEasyWiFi_t::loop() # endif // ifndef BUILD_NO_DEBUG } else if (scanCompleteStatus == -2) { // WIFI_SCAN_FAILED addLog(LOG_LEVEL_ERROR, F("WiFi : Scan failed")); -// WiFi.scanDelete(); + + // WiFi.scanDelete(); setState(WiFiState_e::WiFiOFF, 1000); } if (_state_timeout.timeReached() || (scanCompleteStatus >= 0)) { -// WiFi.scanDelete(); + // WiFi.scanDelete(); if (_state_timeout.timeReached()) { # ifndef BUILD_NO_DEBUG @@ -206,7 +210,13 @@ void ESPEasyWiFi_t::loop() if (_scan_channel > 14) { _scan_channel = 0; - setState(WiFiState_e::WiFiOFF, 100); + + if (!WiFi_AP_Candidates.hasCandidateCredentials() && + !Settings.DoNotStartAP()) { + setState(WiFiState_e::AP_only, WIFI_STATE_MACHINE_AP_ONLY_TIMEOUT); + } else { + setState(WiFiState_e::WiFiOFF, 100); + } } else { setState(WiFiState_e::STA_AP_Scanning, 500); @@ -409,37 +419,39 @@ bool ESPEasyWiFi_t::connectSTA() if (!WiFi_AP_Candidates.hasCandidateCredentials()) { -/* - if (!WiFiEventData.warnedNoValidWiFiSettings) - { - addLog(LOG_LEVEL_ERROR, F("WIFI : No valid wifi settings")); - WiFiEventData.warnedNoValidWiFiSettings = true; - } - wifi_STA_data->_establishConnectStats.clear(); + /* + if (!WiFiEventData.warnedNoValidWiFiSettings) + { + addLog(LOG_LEVEL_ERROR, F("WIFI : No valid wifi settings")); + WiFiEventData.warnedNoValidWiFiSettings = true; + } + wifi_STA_data->_establishConnectStats.clear(); + + // WiFiEventData.last_wifi_connect_attempt_moment.clear(); + // _connect_attempt = 1; + WiFiEventData.wifiConnectAttemptNeeded = false; + */ - // WiFiEventData.last_wifi_connect_attempt_moment.clear(); - // _connect_attempt = 1; - WiFiEventData.wifiConnectAttemptNeeded = false; -*/ // No need to wait longer to start AP mode. if (!Settings.DoNotStartAP()) { - setAPinternal(true); + // setAPinternal(true); } return false; } -/* - if (WiFiEventData.lastDisconnectReason != WIFI_DISCONNECT_REASON_UNSPECIFIED) { -# ifndef BUILD_NO_DEBUG - addLog(LOG_LEVEL_INFO, concat( - F("WiFi : Disconnect reason: "), - getWiFi_disconnectReason_str())); -# endif // ifndef BUILD_NO_DEBUG - WiFiEventData.processedDisconnect = true; - } - WiFiEventData.warnedNoValidWiFiSettings = false; -*/ + /* + if (WiFiEventData.lastDisconnectReason != WIFI_DISCONNECT_REASON_UNSPECIFIED) { + # ifndef BUILD_NO_DEBUG + addLog(LOG_LEVEL_INFO, concat( + F("WiFi : Disconnect reason: "), + getWiFi_disconnectReason_str())); + # endif // ifndef BUILD_NO_DEBUG + WiFiEventData.processedDisconnect = true; + } + + WiFiEventData.warnedNoValidWiFiSettings = false; + */ setSTA(true); # if defined(ESP8266) wifi_station_set_hostname(NetworkCreateRFCCompliantHostname().c_str()); @@ -485,7 +497,7 @@ bool ESPEasyWiFi_t::connectSTA() # endif // if FEATURE_SET_WIFI_TX_PWR // Start connect attempt now, so no longer needed to attempt new connection. -// WiFiEventData.wifiConnectAttemptNeeded = false; + // WiFiEventData.wifiConnectAttemptNeeded = false; // WiFiEventData.wifiConnectInProgress = true; const String key = WiFi_AP_CandidatesList::get_key(candidate.index); diff --git a/src/ESPEasy/net/wifi/ESPEasyWiFi_state_machine_ESP32.cpp b/src/ESPEasy/net/wifi/ESPEasyWiFi_state_machine_ESP32.cpp index 986fb1ee2..b4a18b680 100644 --- a/src/ESPEasy/net/wifi/ESPEasyWiFi_state_machine_ESP32.cpp +++ b/src/ESPEasy/net/wifi/ESPEasyWiFi_state_machine_ESP32.cpp @@ -57,7 +57,7 @@ STA_connected_state ESPEasyWiFi_t::getSTA_connected_state() const return STA_connected_state::Error_Connect_Failed; case WL_IDLE_STATUS: - return STA_connected_state::Connecting; + break; // return STA_connected_state::Connecting; case WL_NO_SHIELD: diff --git a/src/ESPEasy/net/wifi/ESPEasyWifi_abstracted.cpp b/src/ESPEasy/net/wifi/ESPEasyWifi_abstracted.cpp index 42eb938a4..ab8099971 100644 --- a/src/ESPEasy/net/wifi/ESPEasyWifi_abstracted.cpp +++ b/src/ESPEasy/net/wifi/ESPEasyWifi_abstracted.cpp @@ -57,7 +57,7 @@ bool doSetSTA_AP(bool sta_enable, bool ap_enable) # else if (ap_enable) { - return doSetWifiMode(sta_enable ? WIFI_AP_STA : WIFI_AP); + return doSetWifiMode(sta_enable ? WIFI_AP_STA : WIFI_AP); } return doSetWifiMode(sta_enable ? WIFI_STA : WIFI_OFF); # endif // ifndef SOC_WIFI_SUPPORTED @@ -77,6 +77,7 @@ bool doWiFiScanAllowed() { void doSetAPinternal(bool enable) { if (enable) { + if (!Settings.getNetworkEnabled(NETWORK_INDEX_WIFI_AP)) return; // create and store unique AP SSID/PW to prevent ESP from starting AP mode with default SSID and No password! // setup ssid for AP Mode when needed String softAPSSID = NetworkCreateRFCCompliantHostname(); @@ -115,6 +116,8 @@ void doSetAPinternal(bool enable) channel = WiFi.channel(); } + doSetAP(true); + if (WiFi.softAP(softAPSSID.c_str(), pwd.c_str(), channel)) { auto data = getWiFi_AP_NWPluginData_static_runtime(); if (data) data->mark_start(); @@ -165,6 +168,8 @@ void doSetAPinternal(bool enable) # endif // if FEATURE_DNS_SERVER auto data = getWiFi_AP_NWPluginData_static_runtime(); if (data) data->mark_stop(); + + doSetAP(false); } } diff --git a/src/ESPEasy/net/wifi/ESPEasyWifi_abstracted_ESP32.cpp b/src/ESPEasy/net/wifi/ESPEasyWifi_abstracted_ESP32.cpp index cc63f8a30..c18917653 100644 --- a/src/ESPEasy/net/wifi/ESPEasyWifi_abstracted_ESP32.cpp +++ b/src/ESPEasy/net/wifi/ESPEasyWifi_abstracted_ESP32.cpp @@ -62,10 +62,19 @@ void doWiFiDisconnect() { bool doWifiIsAP(WiFiMode_t wifimode) { return (wifimode == WIFI_MODE_AP) || (wifimode == WIFI_MODE_APSTA); } -bool doWifiIsSTA(WiFiMode_t wifimode) { return (wifimode & WIFI_MODE_STA) != 0; } +bool doWifiIsSTA(WiFiMode_t wifimode) { return (wifimode == WIFI_MODE_STA) || (wifimode == WIFI_MODE_APSTA); } bool doSetWifiMode(WiFiMode_t new_mode) { + if (!Settings.getNetworkEnabled(NETWORK_INDEX_WIFI_AP)) { + if (new_mode == WIFI_MODE_AP) new_mode = WIFI_OFF; + if (new_mode == WIFI_MODE_APSTA) new_mode = WIFI_MODE_STA; + } + if (!Settings.getNetworkEnabled(NETWORK_INDEX_WIFI_STA)) { + if (new_mode == WIFI_MODE_STA) new_mode = WIFI_OFF; + if (new_mode == WIFI_MODE_APSTA) new_mode = WIFI_MODE_AP; + } + const WiFiMode_t cur_mode = WiFi.getMode(); // Made this static flag an int as ESP8266 and ESP32 differ in the "not set" values diff --git a/src/ESPEasy/net/wifi/ESPEasyWifi_abstracted_ESP8266.cpp b/src/ESPEasy/net/wifi/ESPEasyWifi_abstracted_ESP8266.cpp index 2833bd131..d92660e7b 100644 --- a/src/ESPEasy/net/wifi/ESPEasyWifi_abstracted_ESP8266.cpp +++ b/src/ESPEasy/net/wifi/ESPEasyWifi_abstracted_ESP8266.cpp @@ -54,10 +54,19 @@ void doWiFiDisconnect() { bool doWifiIsAP(WiFiMode_t wifimode) { return (wifimode == WIFI_AP) || (wifimode == WIFI_AP_STA); } -bool doWifiIsSTA(WiFiMode_t wifimode) { return (wifimode & WIFI_STA) != 0; } +bool doWifiIsSTA(WiFiMode_t wifimode) { return (wifimode == WIFI_STA) || (wifimode == WIFI_AP_STA); } bool doSetWifiMode(WiFiMode_t new_mode) { + if (!Settings.getNetworkEnabled(NETWORK_INDEX_WIFI_AP)) { + if (new_mode == WIFI_AP) new_mode = WIFI_OFF; + if (new_mode == WIFI_AP_STA) new_mode = WIFI_STA; + } + if (!Settings.getNetworkEnabled(NETWORK_INDEX_WIFI_STA)) { + if (new_mode == WIFI_STA) new_mode = WIFI_OFF; + if (new_mode == WIFI_AP_STA) new_mode = WIFI_AP; + } + const WiFiMode_t cur_mode = WiFi.getMode(); // Made this static flag an int as ESP8266 and ESP32 differ in the "not set" values diff --git a/src/src/Commands/WiFi.cpp b/src/src/Commands/WiFi.cpp index e3651ab5d..f87464cef 100644 --- a/src/src/Commands/WiFi.cpp +++ b/src/src/Commands/WiFi.cpp @@ -98,7 +98,7 @@ const __FlashStringHelper* Command_Wifi_Disconnect(struct EventStruct *event, co const __FlashStringHelper* Command_Wifi_APMode(struct EventStruct *event, const char *Line) { - ESPEasy::net::wifi::setAP(true); + ESPEasy::net::wifi::setAPinternal(true); return return_command_success_flashstr(); } diff --git a/src/src/DataStructs_templ/SettingsStruct.cpp b/src/src/DataStructs_templ/SettingsStruct.cpp index 5ae632e2d..1fb487f57 100644 --- a/src/src/DataStructs_templ/SettingsStruct.cpp +++ b/src/src/DataStructs_templ/SettingsStruct.cpp @@ -21,6 +21,8 @@ #include "../Helpers/StringParser.h" #include "../ESPEasy/net/Helpers/_NWPlugin_init.h" +#include "../../ESPEasy/net/Globals/NWPlugins.h" + #if FEATURE_I2C_MULTIPLE #include "../Helpers/Hardware_device_info.h" #endif @@ -1346,6 +1348,18 @@ void SettingsStruct_tmpl::setNWPluginID_for_network(ESPEasy::net::netwo { if (validNetworkIndex(index)) { NWPluginID[index] = id.value; + if (id.isValid()) { + ESPEasy::net::networkDriverIndex_t NetworkDriverIndex = + ESPEasy::net::getNetworkDriverIndex_from_NetworkIndex(index); + + if (ESPEasy::net::validNetworkDriverIndex(NetworkDriverIndex)) { + struct EventStruct TempEvent; + TempEvent.NetworkIndex = index; + + String dummy; + ESPEasy::net::NWPluginCall(NWPlugin::Function::NWPLUGIN_LOAD_DEFAULTS, &TempEvent, dummy); + } + } } } diff --git a/src/src/Helpers/PeriodicalActions.cpp b/src/src/Helpers/PeriodicalActions.cpp index 16b03fbdd..0205c63b1 100644 --- a/src/src/Helpers/PeriodicalActions.cpp +++ b/src/src/Helpers/PeriodicalActions.cpp @@ -34,9 +34,11 @@ #include "../Helpers/StringProvider.h" #include "../../ESPEasy/net/wifi/ESPEasyWifi.h" +#include "../../ESPEasy/net/Globals/ESPEasyWiFi.h" #include "../../ESPEasy/net/Globals/ESPEasyWiFiEvent.h" #include "../../ESPEasy/net/Globals/NetworkState.h" #include "../../ESPEasy/net/Globals/NWPlugins.h" +#include "../../ESPEasy/net/wifi/WiFi_State.h" #ifdef USES_C015 @@ -275,8 +277,9 @@ void runEach30Seconds() #endif // if FEATURE_ETHERNET if (logWiFiStatus) { log += strformat( - F(" WiFiStatus: %s ESPeasy internal wifi status: %s"), + F(" WiFiStatus: %s ESPeasy internal wifi status: %s (%s)"), ArduinoWifiStatusToString(WiFi.status()).c_str(), + FsP(ESPEasy::net::wifi::toString(ESPEasyWiFi.getState())), data->statusToString().c_str()); } // log += F(" ListenInterval "); diff --git a/src/src/Helpers/StringConverter.cpp b/src/src/Helpers/StringConverter.cpp index a2ee6f336..d841ff100 100644 --- a/src/src/Helpers/StringConverter.cpp +++ b/src/src/Helpers/StringConverter.cpp @@ -393,6 +393,8 @@ String formatHumanReadable(uint64_t value, } String result = toString(floatValue, NrDecimals); + if (steps != 0) result += ' '; + switch (steps) { case 0: break; case 1: result += 'k'; break; diff --git a/src/src/WebServer/NetworkPage.cpp b/src/src/WebServer/NetworkPage.cpp index e65b0fc4f..76ecc15a6 100644 --- a/src/src/WebServer/NetworkPage.cpp +++ b/src/src/WebServer/NetworkPage.cpp @@ -131,15 +131,6 @@ void handle_networks() } void handle_networks_clearLoadDefaults(ESPEasy::net::networkIndex_t networkindex, NetworkSettingsStruct& NetworkSettings) { - networkDriverIndex_t NetworkDriverIndex = getNetworkDriverIndex_from_NetworkIndex(networkindex); - - if (validNetworkDriverIndex(NetworkDriverIndex)) { - struct EventStruct TempEvent; - TempEvent.NetworkIndex = networkindex; - - String dummy; - NWPluginCall(NWPlugin::Function::NWPLUGIN_LOAD_DEFAULTS, &TempEvent, dummy); - } // TODO TD-er: Must also check NetworkDriverStruct to see if something else must be done } @@ -519,9 +510,12 @@ void handle_networks_NetworkSettingsPage(ESPEasy::net::networkIndex_t networkind addRowLabel(F("TX / RX Frame Bytes")); addHtml(strformat( - F("%siB / %siB"), + F("%s%cB / %s%cB"), formatHumanReadable(TempEvent.Par64_1, 1024).c_str(), - formatHumanReadable(TempEvent.Par64_2, 1024).c_str())); + TempEvent.Par64_1 < 1024 ? ' ' : 'i', + formatHumanReadable(TempEvent.Par64_2, 1024).c_str(), + TempEvent.Par64_2 < 1024 ? ' ' : 'i' + )); } # endif // if FEATURE_NETWORK_TRAFFIC_COUNT } From 07485f76de77d08b76652d8db0c3da683a21e208 Mon Sep 17 00:00:00 2001 From: TD-er Date: Tue, 23 Sep 2025 21:25:09 +0200 Subject: [PATCH 276/564] [WiFi] Fix internal WiFi state matching real connected state. --- src/ESPEasy/net/DataStructs/NWPluginData_base.cpp | 4 ++-- .../net/DataStructs/NWPluginData_static_runtime.cpp | 10 ++++------ .../NWPluginStructs/NW002_data_struct_WiFi_AP.cpp | 9 ++------- src/ESPEasy/net/_NW002_WiFi_AP.cpp | 8 ++------ src/ESPEasy/net/wifi/ESPEasyWiFi_state_machine.cpp | 13 +++++++++---- src/ESPEasy/net/wifi/ESPEasyWifi.cpp | 2 +- src/ESPEasy/net/wifi/ESPEasyWifi.h | 8 ++++++++ .../net/wifi/ESPEasyWifi_abstracted_ESP8266.cpp | 1 + src/src/ESPEasyCore/ESPEasy_setup.cpp | 2 +- src/src/Helpers/PeriodicalActions.cpp | 8 +------- src/src/WebServer/ESPEasy_WebServer.cpp | 9 ++++++++- src/src/WebServer/LoadFromFS.cpp | 2 +- src/src/WebServer/Rules.cpp | 2 +- 13 files changed, 41 insertions(+), 37 deletions(-) diff --git a/src/ESPEasy/net/DataStructs/NWPluginData_base.cpp b/src/ESPEasy/net/DataStructs/NWPluginData_base.cpp index 2aaeec8a5..968cdfd99 100644 --- a/src/ESPEasy/net/DataStructs/NWPluginData_base.cpp +++ b/src/ESPEasy/net/DataStructs/NWPluginData_base.cpp @@ -187,8 +187,8 @@ bool NWPluginData_base::pushStatsValues(EventStruct *event, if (getTrafficCount(traffic)) { // Only set value when _prevRX/TX was set to make sure there isn't an enormous spike - event->ParfN[valueCount++] = _prevTX == 0 ? 0 : traffic._tx_count - _prevTX; - event->ParfN[valueCount++] = _prevRX == 0 ? 0 : traffic._rx_count - _prevRX; + event->ParfN[valueCount++] = _prevTX == 0 || (traffic._tx_count < _prevTX) ? 0 : traffic._tx_count - _prevTX; + event->ParfN[valueCount++] = _prevRX == 0 || (traffic._rx_count < _prevRX) ? 0 : traffic._rx_count - _prevRX; _prevRX = traffic._rx_count; _prevTX = traffic._tx_count; } else { diff --git a/src/ESPEasy/net/DataStructs/NWPluginData_static_runtime.cpp b/src/ESPEasy/net/DataStructs/NWPluginData_static_runtime.cpp index 4277c48da..1cc0f6b50 100644 --- a/src/ESPEasy/net/DataStructs/NWPluginData_static_runtime.cpp +++ b/src/ESPEasy/net/DataStructs/NWPluginData_static_runtime.cpp @@ -6,6 +6,9 @@ #include "../../../src/Helpers/NetworkStatusLED.h" #include "../../../src/Helpers/StringConverter.h" +#include "../wifi/ESPEasyWifi.h" + + namespace ESPEasy { namespace net { @@ -127,12 +130,7 @@ bool NWPluginData_static_runtime::operational() const if (!Settings.getNetworkEnabled(_networkIndex)) { return false; } if (_isAP) { - return -#ifdef ESP32 - WiFi.AP.stationCount() > 0; -#else - WiFi.softAPgetStationNum() > 0; -#endif // ifdef ESP32 + return ESPEasy::net::wifi::wifiAPmodeActivelyUsed(); } return connected() && hasIP(); diff --git a/src/ESPEasy/net/NWPluginStructs/NW002_data_struct_WiFi_AP.cpp b/src/ESPEasy/net/NWPluginStructs/NW002_data_struct_WiFi_AP.cpp index fb0067367..074a706c6 100644 --- a/src/ESPEasy/net/NWPluginStructs/NW002_data_struct_WiFi_AP.cpp +++ b/src/ESPEasy/net/NWPluginStructs/NW002_data_struct_WiFi_AP.cpp @@ -172,12 +172,7 @@ bool NW002_data_struct_WiFi_AP::record_stats() if (_plugin_stats_array != nullptr) { EventStruct tmpEvent; size_t valueCount{}; - tmpEvent.ParfN[valueCount++] = - # ifdef ESP32 - NW_PLUGIN_INTERFACE.stationCount(); - # else - WiFi.softAPgetStationNum(); - # endif // ifdef ESP32 + tmpEvent.ParfN[valueCount++] = SOFTAP_STATION_COUNT; # ifdef ESP32 { @@ -231,7 +226,7 @@ void NW002_data_struct_WiFi_AP::onEvent(arduino_event_id_t event, break; case ARDUINO_EVENT_WIFI_AP_STADISCONNECTED: - if (WiFi.AP.stationCount() == 0) { + if (!ESPEasy::net::wifi::wifiAPmodeActivelyUsed()) { stats_and_cache.mark_disconnected(); } NW002_update_NAPT(); diff --git a/src/ESPEasy/net/_NW002_WiFi_AP.cpp b/src/ESPEasy/net/_NW002_WiFi_AP.cpp index 8e475a4f0..3894435b1 100644 --- a/src/ESPEasy/net/_NW002_WiFi_AP.cpp +++ b/src/ESPEasy/net/_NW002_WiFi_AP.cpp @@ -82,11 +82,7 @@ bool NWPlugin_002(NWPlugin::Function function, EventStruct *event, String& strin case NWPlugin::Function::NWPLUGIN_WEBSERVER_SHOULD_RUN: { -# ifdef ESP32 - success = WiFi.AP.stationCount() > 0; -# else - success = WiFi.softAPgetStationNum() > 0; -# endif // ifdef ESP32 + success = ESPEasy::net::wifi::wifiAPmodeActivelyUsed(); break; } @@ -142,7 +138,7 @@ bool NWPlugin_002(NWPlugin::Function function, EventStruct *event, String& strin wifi_softap_free_station_info(); # else // ifndef LIMIT_BUILD_SIZE - const uint8_t num = WiFi.softAPgetStationNum(); + const uint8_t num = SOFTAP_STATION_COUNT; if (num > 0) { success = true; diff --git a/src/ESPEasy/net/wifi/ESPEasyWiFi_state_machine.cpp b/src/ESPEasy/net/wifi/ESPEasyWiFi_state_machine.cpp index 078c4cec4..7ca472e58 100644 --- a/src/ESPEasy/net/wifi/ESPEasyWiFi_state_machine.cpp +++ b/src/ESPEasy/net/wifi/ESPEasyWiFi_state_machine.cpp @@ -92,13 +92,18 @@ void ESPEasyWiFi_t::loop() if (WiFi_AP_Candidates.hasCandidates() || (_state_timeout.timeReached() && - (WiFi.softAPgetStationNum() == 0))) { + !ESPEasy::net::wifi::wifiAPmodeActivelyUsed())) { setState(WiFiState_e::IdleWaiting, 100); } break; case WiFiState_e::IdleWaiting: - if (_state_timeout.timeReached() || getSTA_connected_state() == STA_connected_state::Idle) { + if (connected()) { + setState(WiFiState_e::STA_Connected, 100); + break; + } + + if (_state_timeout.timeReached() || (getSTA_connected_state() == STA_connected_state::Idle)) { // This is where we decide what to do next: // - Reconnect // - Scan @@ -108,8 +113,8 @@ void ESPEasyWiFi_t::loop() // Do we have candidate to connect to ? if (WiFi_AP_Candidates.hasCandidates()) { setState(WiFiState_e::STA_Connecting, WIFI_STATE_MACHINE_STA_CONNECTING_TIMEOUT); - } else if ((WiFi_AP_Candidates.scanComplete() == 0) - || WiFi_AP_Candidates.scanComplete() == -3) { + } else if ((WiFi_AP_Candidates.scanComplete() == 0) + || (WiFi_AP_Candidates.scanComplete() == -3)) { if (WifiIsAP(WiFi.getMode())) { // TODO TD-er: Must check if any client is connected. // If not, then we can disable AP mode and switch to WiFiState_e::STA_Scanning diff --git a/src/ESPEasy/net/wifi/ESPEasyWifi.cpp b/src/ESPEasy/net/wifi/ESPEasyWifi.cpp index 802eb5e74..d722b9ab6 100644 --- a/src/ESPEasy/net/wifi/ESPEasyWifi.cpp +++ b/src/ESPEasy/net/wifi/ESPEasyWifi.cpp @@ -275,7 +275,7 @@ bool wifiAPmodeActivelyUsed() // AP not active or soon to be disabled in processDisableAPmode() return false; } - return WiFi.softAPgetStationNum() != 0; + return SOFTAP_STATION_COUNT != 0; // FIXME TD-er: is effectively checking for AP active enough or must really check for connected clients to prevent automatic wifi // reconnect? diff --git a/src/ESPEasy/net/wifi/ESPEasyWifi.h b/src/ESPEasy/net/wifi/ESPEasyWifi.h index 69fb8effb..f9a2b2de3 100644 --- a/src/ESPEasy/net/wifi/ESPEasyWifi.h +++ b/src/ESPEasy/net/wifi/ESPEasyWifi.h @@ -16,6 +16,14 @@ # include "../../../src/Helpers/LongTermTimer.h" +#ifdef ESP32 +#define SOFTAP_STATION_COUNT WiFi.AP.stationCount() +#endif +#ifdef ESP8266 +#define SOFTAP_STATION_COUNT WiFi.softAPgetStationNum() +#endif + + namespace ESPEasy { namespace net { namespace wifi { diff --git a/src/ESPEasy/net/wifi/ESPEasyWifi_abstracted_ESP8266.cpp b/src/ESPEasy/net/wifi/ESPEasyWifi_abstracted_ESP8266.cpp index d92660e7b..262663b40 100644 --- a/src/ESPEasy/net/wifi/ESPEasyWifi_abstracted_ESP8266.cpp +++ b/src/ESPEasy/net/wifi/ESPEasyWifi_abstracted_ESP8266.cpp @@ -10,6 +10,7 @@ # include "../Globals/ESPEasyWiFiEvent.h" # include "../wifi/ESPEasyWiFi_STA_Event_ESP8266.h" +# include "../../net/ESPEasyNetwork.h" // # include "../wifi/ESPEasyWifi.h" diff --git a/src/src/ESPEasyCore/ESPEasy_setup.cpp b/src/src/ESPEasyCore/ESPEasy_setup.cpp index 6ba48d7aa..90b02a77a 100644 --- a/src/src/ESPEasyCore/ESPEasy_setup.cpp +++ b/src/src/ESPEasyCore/ESPEasy_setup.cpp @@ -457,7 +457,7 @@ void ESPEasy_setup() #endif // if FEATURE_ETHERNET // FIXME TD-er: This network medium setting may be obsolete as we need a priority scale/order - ESPEasy::net::setNetworkMedium(Settings.NetworkMedium); +// ESPEasy::net::setNetworkMedium(Settings.NetworkMedium); #ifndef BUILD_NO_RAM_TRACKER logMemUsageAfter(F("WifiScan()")); #endif // ifndef BUILD_NO_RAM_TRACKER diff --git a/src/src/Helpers/PeriodicalActions.cpp b/src/src/Helpers/PeriodicalActions.cpp index 0205c63b1..de394f037 100644 --- a/src/src/Helpers/PeriodicalActions.cpp +++ b/src/src/Helpers/PeriodicalActions.cpp @@ -129,13 +129,7 @@ void run10TimesPerSecond() { } #endif if (!UseRTOSMultitasking && - (ESPEasy::net::NetworkConnected() || - #ifdef ESP32 - WiFi.AP.stationCount() - #else - WiFi.softAPgetStationNum() - #endif - )) { + (ESPEasy::net::NetworkConnected() || ESPEasy::net::wifi::wifiAPmodeActivelyUsed())) { // FIXME TD-er: What about client connected via AP? START_TIMER web_server.handleClient(); diff --git a/src/src/WebServer/ESPEasy_WebServer.cpp b/src/src/WebServer/ESPEasy_WebServer.cpp index ea0aeaa6b..ace22601b 100644 --- a/src/src/WebServer/ESPEasy_WebServer.cpp +++ b/src/src/WebServer/ESPEasy_WebServer.cpp @@ -129,7 +129,7 @@ void sendHeadandTail_stdtemplate(bool Tail, bool rebooting) { sendHeadandTail(F("TmplStd"), Tail, rebooting); if (!Tail) { - if (!clientIPinSubnetDefaultNetwork() && ESPEasy::net::wifi::WifiIsAP(WiFi.getMode()) && (WiFi.softAPgetStationNum() > 0)) { + if (!clientIPinSubnetDefaultNetwork() && ESPEasy::net::wifi::wifiAPmodeActivelyUsed()) { addHtmlError(F("Warning: Connected via AP")); } @@ -215,7 +215,14 @@ void WebServerInit() // Entries for several captive portal URLs. // Maybe not needed. Might be handled by notFound handler. web_server.on(UriGlob("/generate_204*"), handle_root); // Android captive portal. Handle "/generate_204_"-like requests. +//web_server.on(F("/generate_204"), handle_root); // android captive portal redirect web_server.on(F("/fwlink"), handle_root); // Microsoft captive portal. + web_server.on(F("/redirect"), handle_root); // microsoft redirect + web_server.on(F("/hotspot-detect.html"), handle_root); // apple call home + web_server.on(F("/canonical.html"), handle_root); // firefox captive portal call home + web_server.on(F("/success.txt"), handle_root); // firefox captive portal call home + web_server.on(F("/ncsi.txt"), handle_root); // windows call home + #endif // ifdef WEBSERVER_ROOT #ifdef WEBSERVER_ADVANCED web_server.on(F("/advanced"), handle_advanced); diff --git a/src/src/WebServer/LoadFromFS.cpp b/src/src/WebServer/LoadFromFS.cpp index 080abe77d..cf67dd8a6 100644 --- a/src/src/WebServer/LoadFromFS.cpp +++ b/src/src/WebServer/LoadFromFS.cpp @@ -278,7 +278,7 @@ bool loadFromFS(String path) { // prevent reloading stuff on every click if (static_file) { - sendHeader(F("Cache-Control"), F("public, max-age=31536000, s-maxage=31536000, immutable")); + sendHeader(F("Cache-Control"), F("public,max-age=31536000,s-maxage=31536000,immutable")); // sendHeader(F("Cache-Control"), F("max-age=86400")); // sendHeader(F("Expires"), F("-1")); diff --git a/src/src/WebServer/Rules.cpp b/src/src/WebServer/Rules.cpp index ecd00870e..6e420c9e6 100644 --- a/src/src/WebServer/Rules.cpp +++ b/src/src/WebServer/Rules.cpp @@ -575,7 +575,7 @@ bool Rule_Download(const String& path) filename.replace(RULE_FILE_SEPARAROR, '_'); String str = concat(F("attachment; filename="), filename); sendHeader(F("Content-Disposition"), str); - sendHeader(F("Cache-Control"), F("max-age=3600, public")); + sendHeader(F("Cache-Control"), F("public,max-age=3600")); sendHeader(F("Vary"), "*"); sendHeader(F("ETag"), F("\"2.0.0\"")); From e00fe33d9e41f7ca0bd9815c0be4dbefe9845f99 Mon Sep 17 00:00:00 2001 From: TD-er Date: Tue, 23 Sep 2025 23:04:16 +0200 Subject: [PATCH 277/564] [Network] Log got IP events --- .../NWPluginData_static_runtime.cpp | 76 ++++++++++++++++--- .../DataStructs/NWPluginData_static_runtime.h | 2 + .../NWPluginData_static_runtime_ESP32.cpp | 8 ++ src/src/WebServer/ESPEasy_WebServer.cpp | 2 + 4 files changed, 79 insertions(+), 9 deletions(-) diff --git a/src/ESPEasy/net/DataStructs/NWPluginData_static_runtime.cpp b/src/ESPEasy/net/DataStructs/NWPluginData_static_runtime.cpp index 1cc0f6b50..5dde30d2a 100644 --- a/src/ESPEasy/net/DataStructs/NWPluginData_static_runtime.cpp +++ b/src/ESPEasy/net/DataStructs/NWPluginData_static_runtime.cpp @@ -142,13 +142,71 @@ void NWPluginData_static_runtime::processEvents() { // TD-er: Just set these just to be sure we didn't miss any events. _connectedStats.set(connected()); - _gotIPStats.set(hasIP()); + + // _gotIPStats.set(hasIP()); #if FEATURE_USE_IPV6 - _gotIP6Stats.set(hasIPv6()); -#endif + + // _gotIP6Stats.set(hasIPv6()); +#endif // if FEATURE_USE_IPV6 const bool connected_changed = _connectedStats.changedSinceLastCheck_and_clear(); const bool establishConnect_changed = _establishConnectStats.changedSinceLastCheck_and_clear(); - const bool gotIP_changed = _gotIPStats.changedSinceLastCheck_and_clear(); + + if (_gotIPStats.changedSinceLastCheck_and_clear()) { +#ifdef ESP32 + + if (loglevelActiveFor(LOG_LEVEL_INFO) && _netif) { + auto ip = _netif->localIP(); + + if (ip != INADDR_NONE) { + addLog(LOG_LEVEL_INFO, strformat( + F("%s: Got IP: %s/%d GW: %s"), + _netif->desc(), + ip.toString().c_str(), + _netif->subnetCIDR(), + _netif->gatewayIP().toString().c_str() + )); + } + } +#endif // ifdef ESP32 +#ifdef ESP8266 + # ifndef BUILD_NO_DEBUG + + if (_isAP) { + addLog(LOG_LEVEL_INFO, F("AP: Got IP")); + } + else { + addLog(LOG_LEVEL_INFO, concat( + F("STA: Got IP "), + WiFi.localIP().toString())); + } + # endif // ifndef BUILD_NO_DEBUG +#endif // ifdef ESP8266 + } + +#if FEATURE_USE_IPV6 + + if (_gotIP6Stats.changedSinceLastCheck_and_clear() || !_gotIP6Events.empty()) { + if (loglevelActiveFor(LOG_LEVEL_INFO)) { + while (!_gotIP6Events.empty()) { + auto ip6Event = _gotIP6Events.front(); + esp_ip6_addr_type_t addr_type = esp_netif_ip6_get_addr_type(&ip6Event.ip6_info.ip); + static const char *addr_types[] = { "UNKNOWN", "GLOBAL", "LINK_LOCAL", "SITE_LOCAL", "UNIQUE_LOCAL", "IPV4_MAPPED_IPV6" }; + + if (addr_type < NR_ELEMENTS(addr_types)) { + addLog(LOG_LEVEL_INFO, strformat( + F("%s: Got IPv6: IP Index: %d, Type: %s, Zone: %d, Address: " IPV6STR), + _netif->desc(), + ip6Event.ip_index, + addr_types[addr_type], + ip6Event.ip6_info.ip.zone, + IPV62STR(ip6Event.ip6_info.ip) + )); + } + _gotIP6Events.pop_front(); + } + } + } +#endif // if FEATURE_USE_IPV6 if (connected_changed || establishConnect_changed) { @@ -188,11 +246,11 @@ void NWPluginData_static_runtime::processEvents() } if (_startStopStats.changedSinceLastCheck_and_clear() && _isAP && Settings.UseRules) { - if (_startStopStats.isOn()) { - eventQueue.add(F("WiFi#APmodeEnabled")); - } else if (_startStopStats.isOff()) { - eventQueue.add(F("WiFi#APmodeDisabled")); - } + if (_startStopStats.isOn()) { + eventQueue.add(F("WiFi#APmodeEnabled")); + } else if (_startStopStats.isOff()) { + eventQueue.add(F("WiFi#APmodeDisabled")); + } } } diff --git a/src/ESPEasy/net/DataStructs/NWPluginData_static_runtime.h b/src/ESPEasy/net/DataStructs/NWPluginData_static_runtime.h index 44c36c38f..af73cfa3b 100644 --- a/src/ESPEasy/net/DataStructs/NWPluginData_static_runtime.h +++ b/src/ESPEasy/net/DataStructs/NWPluginData_static_runtime.h @@ -12,6 +12,7 @@ #endif #include +#include namespace ESPEasy { namespace net { @@ -138,6 +139,7 @@ struct NWPluginData_static_runtime { LongTermOnOffTimer _gotIPStats{}; #if FEATURE_USE_IPV6 LongTermOnOffTimer _gotIP6Stats{}; + std::list _gotIP6Events{}; #endif LongTermOnOffTimer _operationalStats{}; // is started, connected and had IP diff --git a/src/ESPEasy/net/DataStructs/NWPluginData_static_runtime_ESP32.cpp b/src/ESPEasy/net/DataStructs/NWPluginData_static_runtime_ESP32.cpp index 9cae783a1..935f6fb2a 100644 --- a/src/ESPEasy/net/DataStructs/NWPluginData_static_runtime_ESP32.cpp +++ b/src/ESPEasy/net/DataStructs/NWPluginData_static_runtime_ESP32.cpp @@ -158,12 +158,20 @@ void NWPluginData_static_runtime::mark_got_IPv6(ip_event_got_ip6_t *event) if (!_netif->isDefault()) { nonDefaultNetworkInterface_gotIP = true; } + + if (event) { + ip_event_got_ip6_t ip6Event; + memcpy(&ip6Event, event, sizeof(ip_event_got_ip6_t)); + _gotIP6Events.push_back(ip6Event); + } + # if NW_PLUGIN_LOG_EVENTS if (loglevelActiveFor(LOG_LEVEL_INFO)) { if (event) { esp_ip6_addr_type_t addr_type = esp_netif_ip6_get_addr_type(&event->ip6_info.ip); static const char *addr_types[] = { "UNKNOWN", "GLOBAL", "LINK_LOCAL", "SITE_LOCAL", "UNIQUE_LOCAL", "IPV4_MAPPED_IPV6" }; + if (addr_type < NR_ELEMENTS(addr_types)) addLog(LOG_LEVEL_INFO, strformat( F("%s: Got IPv6: IP Index: %d, Type: %s, Zone: %d, Address: " IPV6STR), _netif->desc(), diff --git a/src/src/WebServer/ESPEasy_WebServer.cpp b/src/src/WebServer/ESPEasy_WebServer.cpp index ace22601b..811aaaad9 100644 --- a/src/src/WebServer/ESPEasy_WebServer.cpp +++ b/src/src/WebServer/ESPEasy_WebServer.cpp @@ -176,6 +176,8 @@ bool captivePortal() { const bool fromAP = client_localIP == apIP; const bool hasWiFiCredentials = SecuritySettings.hasWiFiCredentials(); + addLog(LOG_LEVEL_INFO, concat(F("CaptivePortal: hostHeader: "), web_server.hostHeader())); + if (hasWiFiCredentials || !fromAP) { return false; } From 22f60dee68c69959a1c6e70b93e3902eb05f4cec Mon Sep 17 00:00:00 2001 From: TD-er Date: Tue, 23 Sep 2025 23:15:18 +0200 Subject: [PATCH 278/564] [Network] Add checks to see if _netif is a valid pointer --- src/ESPEasy/net/DataStructs/NWPluginData_static_runtime.cpp | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/ESPEasy/net/DataStructs/NWPluginData_static_runtime.cpp b/src/ESPEasy/net/DataStructs/NWPluginData_static_runtime.cpp index 5dde30d2a..8da85b762 100644 --- a/src/ESPEasy/net/DataStructs/NWPluginData_static_runtime.cpp +++ b/src/ESPEasy/net/DataStructs/NWPluginData_static_runtime.cpp @@ -76,6 +76,7 @@ void NWPluginData_static_runtime::enable_txrx_events() bool NWPluginData_static_runtime::getTrafficCount(TX_RX_traffic_count& traffic) const { + if (_netif == nullptr) return false; const int key = _netif->impl_index(); auto it = interfaceTrafficCount.find(key); @@ -140,6 +141,9 @@ bool NWPluginData_static_runtime::operational() const void NWPluginData_static_runtime::processEvents() { +#ifdef ESP32 + if (_netif == nullptr) return; +#endif // TD-er: Just set these just to be sure we didn't miss any events. _connectedStats.set(connected()); From 29eca9786b13c1702d011c9caef920f655b118e8 Mon Sep 17 00:00:00 2001 From: TD-er Date: Wed, 24 Sep 2025 09:54:45 +0200 Subject: [PATCH 279/564] [Network] Make logging gotIPv6 events not do memory allocation --- .../net/DataStructs/NWPluginData_static_runtime.cpp | 11 ++++++----- .../net/DataStructs/NWPluginData_static_runtime.h | 2 +- .../DataStructs/NWPluginData_static_runtime_ESP32.cpp | 7 ++++--- 3 files changed, 11 insertions(+), 9 deletions(-) diff --git a/src/ESPEasy/net/DataStructs/NWPluginData_static_runtime.cpp b/src/ESPEasy/net/DataStructs/NWPluginData_static_runtime.cpp index 8da85b762..0924c337b 100644 --- a/src/ESPEasy/net/DataStructs/NWPluginData_static_runtime.cpp +++ b/src/ESPEasy/net/DataStructs/NWPluginData_static_runtime.cpp @@ -189,10 +189,12 @@ void NWPluginData_static_runtime::processEvents() #if FEATURE_USE_IPV6 - if (_gotIP6Stats.changedSinceLastCheck_and_clear() || !_gotIP6Events.empty()) { - if (loglevelActiveFor(LOG_LEVEL_INFO)) { - while (!_gotIP6Events.empty()) { - auto ip6Event = _gotIP6Events.front(); + if (_gotIP6Stats.changedSinceLastCheck_and_clear()) { + for (uint8_t i = 0; i < NR_ELEMENTS(_gotIP6Events); ++i) { + ip_event_got_ip6_t ip6Event; + memcpy(&ip6Event, &_gotIP6Events[i], sizeof(ip_event_got_ip6_t)); + memset(&_gotIP6Events[i], 0, sizeof(ip_event_got_ip6_t)); + if (loglevelActiveFor(LOG_LEVEL_INFO) && ip6Event.esp_netif != nullptr) { esp_ip6_addr_type_t addr_type = esp_netif_ip6_get_addr_type(&ip6Event.ip6_info.ip); static const char *addr_types[] = { "UNKNOWN", "GLOBAL", "LINK_LOCAL", "SITE_LOCAL", "UNIQUE_LOCAL", "IPV4_MAPPED_IPV6" }; @@ -206,7 +208,6 @@ void NWPluginData_static_runtime::processEvents() IPV62STR(ip6Event.ip6_info.ip) )); } - _gotIP6Events.pop_front(); } } } diff --git a/src/ESPEasy/net/DataStructs/NWPluginData_static_runtime.h b/src/ESPEasy/net/DataStructs/NWPluginData_static_runtime.h index af73cfa3b..e25335cb8 100644 --- a/src/ESPEasy/net/DataStructs/NWPluginData_static_runtime.h +++ b/src/ESPEasy/net/DataStructs/NWPluginData_static_runtime.h @@ -139,7 +139,7 @@ struct NWPluginData_static_runtime { LongTermOnOffTimer _gotIPStats{}; #if FEATURE_USE_IPV6 LongTermOnOffTimer _gotIP6Stats{}; - std::list _gotIP6Events{}; + ip_event_got_ip6_t _gotIP6Events[6]{}; #endif LongTermOnOffTimer _operationalStats{}; // is started, connected and had IP diff --git a/src/ESPEasy/net/DataStructs/NWPluginData_static_runtime_ESP32.cpp b/src/ESPEasy/net/DataStructs/NWPluginData_static_runtime_ESP32.cpp index 935f6fb2a..51a4f44e6 100644 --- a/src/ESPEasy/net/DataStructs/NWPluginData_static_runtime_ESP32.cpp +++ b/src/ESPEasy/net/DataStructs/NWPluginData_static_runtime_ESP32.cpp @@ -160,9 +160,10 @@ void NWPluginData_static_runtime::mark_got_IPv6(ip_event_got_ip6_t *event) } if (event) { - ip_event_got_ip6_t ip6Event; - memcpy(&ip6Event, event, sizeof(ip_event_got_ip6_t)); - _gotIP6Events.push_back(ip6Event); + if (event->ip_index < NR_ELEMENTS(_gotIP6Events)) { + memcpy(&_gotIP6Events[event->ip_index], event, sizeof(ip_event_got_ip6_t)); + _gotIP6Stats.forceSet(true); + } } # if NW_PLUGIN_LOG_EVENTS From e337181a257d658e8d8f8770dd28d9a386dc6807 Mon Sep 17 00:00:00 2001 From: TD-er Date: Wed, 24 Sep 2025 09:55:40 +0200 Subject: [PATCH 280/564] [NeoPixel] Make NeoPixelSendStatus use less memory allocations --- src/_Plugin_Helper.h | 1 + src/src/PluginStructs/P128_data_struct.cpp | 56 +++++++++------------- 2 files changed, 24 insertions(+), 33 deletions(-) diff --git a/src/_Plugin_Helper.h b/src/_Plugin_Helper.h index ae93568f1..9848ab0ed 100644 --- a/src/_Plugin_Helper.h +++ b/src/_Plugin_Helper.h @@ -40,6 +40,7 @@ #include "src/Helpers/Misc.h" #include "src/Helpers/Numerical.h" #include "src/Helpers/PortStatus.h" +#include "src/Helpers/PrintToString.h" #include "src/Helpers/StringConverter.h" #include "src/Helpers/StringGenerator_GPIO.h" #include "src/Helpers/StringGenerator_Plugin.h" diff --git a/src/src/PluginStructs/P128_data_struct.cpp b/src/src/PluginStructs/P128_data_struct.cpp index 65bc1c9c1..0a55a815e 100644 --- a/src/src/PluginStructs/P128_data_struct.cpp +++ b/src/src/PluginStructs/P128_data_struct.cpp @@ -1546,39 +1546,29 @@ void P128_data_struct::NeoPixelSendStatus(struct EventStruct *eventSource) { HsbColor hsbColor = HsbColor(RgbColor(rgb.R, rgb.G, rgb.B)); // Calculate only once - SendStatus( - eventSource, - strformat( - F("{\n%s" // "plugin" - ",\n%s" // "mode" - ",\n%s" // "lastmode" - ",\n%s" // "fadetime" - ",\n%s" // "fadedelay" - ",\n%s" // "dim" - ",\n%s" // "rgb" - ",\n%s" // "hue" - ",\n%s" // "saturation" - ",\n%s" // "brightness" - ",\n%s" // "bgcolor" - ",\n%s" // "count" - ",\n%s" // "speed" - ",\n%s" // "pixelcount" - "\n}\n"), - to_json_object_value(F("plugin"), 128).c_str(), - to_json_object_value(F("mode"), P128_modeType_toString(mode)).c_str(), - to_json_object_value(F("lastmode"), P128_modeType_toString(savemode)).c_str(), - to_json_object_value(F("fadetime"), static_cast(fadetime)).c_str(), - to_json_object_value(F("fadedelay"), static_cast(fadedelay)).c_str(), - to_json_object_value(F("dim"), static_cast(Plugin_128_pixels->GetBrightness())).c_str(), - to_json_object_value(F("rgb"), colorStr, true).c_str(), - to_json_object_value(F("hue"), static_cast(hsbColor.H * 360.0f)).c_str(), - to_json_object_value(F("saturation"), static_cast(hsbColor.S * 100.0f)).c_str(), - to_json_object_value(F("brightness"), static_cast(hsbColor.B * 100.0f)).c_str(), - to_json_object_value(F("bgcolor"), backgroundcolorStr, true).c_str(), - to_json_object_value(F("count"), static_cast(count)).c_str(), - to_json_object_value(F("speed"), static_cast(speed)).c_str(), - to_json_object_value(F("pixelcount"), static_cast(pixelCount)).c_str() - )); + static size_t statusSize = 128; + + PrintToString status; + status.reserve(statusSize); + + status.print('{'); status.println(to_json_object_value(F("plugin"), 128)); + status.print(','); status.println(to_json_object_value(F("mode"), P128_modeType_toString(mode))); + status.print(','); status.println(to_json_object_value(F("lastmode"), P128_modeType_toString(savemode))); + status.print(','); status.println(to_json_object_value(F("fadetime"), static_cast(fadetime))); + status.print(','); status.println(to_json_object_value(F("fadedelay"), static_cast(fadedelay))); + status.print(','); status.println(to_json_object_value(F("dim"), static_cast(Plugin_128_pixels->GetBrightness()))); + status.print(','); status.println(to_json_object_value(F("rgb"), colorStr, true)); + status.print(','); status.println(to_json_object_value(F("hue"), static_cast(hsbColor.H * 360.0f))); + status.print(','); status.println(to_json_object_value(F("saturation"), static_cast(hsbColor.S * 100.0f))); + status.print(','); status.println(to_json_object_value(F("brightness"), static_cast(hsbColor.B * 100.0f))); + status.print(','); status.println(to_json_object_value(F("bgcolor"), backgroundcolorStr, true)); + status.print(','); status.println(to_json_object_value(F("count"), static_cast(count))); + status.print(','); status.println(to_json_object_value(F("speed"), static_cast(speed))); + status.print(','); status.println(to_json_object_value(F("pixelcount"), static_cast(pixelCount))); + status.println('}'); + + statusSize = status.get().length(); + SendStatus(eventSource, status.get()); printToWeb = false; } From dde3a81494bea6414b8c88ee27b8003836710680 Mon Sep 17 00:00:00 2001 From: TD-er Date: Wed, 24 Sep 2025 12:23:19 +0200 Subject: [PATCH 281/564] [MQTTDiscovery] Reduce mem alloc MQTT_DiscoveryPublishWithStatusAndSet --- src/src/Helpers/_CPlugin_Helper_mqtt.cpp | 108 +++++++++++++---------- src/src/Helpers/_CPlugin_Helper_mqtt.h | 8 +- 2 files changed, 67 insertions(+), 49 deletions(-) diff --git a/src/src/Helpers/_CPlugin_Helper_mqtt.cpp b/src/src/Helpers/_CPlugin_Helper_mqtt.cpp index 523fe6d67..878a3e49f 100644 --- a/src/src/Helpers/_CPlugin_Helper_mqtt.cpp +++ b/src/src/Helpers/_CPlugin_Helper_mqtt.cpp @@ -1071,11 +1071,11 @@ bool MQTT_DiscoveryPublishWithStatusAndSet(taskIndex_t taskIndex, controllerIndex_t ControllerIndex, ControllerSettingsStruct& ControllerSettings, const __FlashStringHelper*componentClass, - String deviceClass, - String unitOfMeasure, + const String & deviceClass, + const String & unitOfMeasure, struct EventStruct *event, - const String deviceElement, - const String stateClass, + const String & deviceElement, + const String & stateClass, bool success, bool hasSet, bool hasIcon, @@ -1083,52 +1083,70 @@ bool MQTT_DiscoveryPublishWithStatusAndSet(taskIndex_t taskIndex, const String & elementId, bool sendTrigger) { if (!valueName.isEmpty()) { - const String withSet = hasSet ? F(",\"cmd_t\":\"~/set\"") : EMPTY_STRING; - const String schema = hasSet ? EMPTY_STRING : "\"schema\":\"basic\","; - const String devOrIcon = hasIcon ? F("ic") : F("dev_cla"); - const String withUoM = unitOfMeasure.isEmpty() ? EMPTY_STRING : - strformat(F(",\"unit_of_meas\":\"%s\""), unitOfMeasure.c_str()); - const String stateJson = stateClass.isEmpty() ? EMPTY_STRING : - strformat(F(",\"stat_cla\":\"%s\""), stateClass.c_str()); - const String taskName = makeHomeAssistantCompliantName(getTaskDeviceName(taskIndex)); - const String valName = makeHomeAssistantCompliantName(valueName); - const bool retainDsc = ControllerSettings.mqtt_retainDiscovery(); - const String discoveryTopic(ControllerSettings.MqttAutoDiscoveryTopic); - const String publishTopic(ControllerSettings.Publish); - const String discoveryConfig(parseStringKeepCase(ControllerSettings.MqttAutoDiscoveryConfig, 1, '|')); + // const String discoveryTopic(ControllerSettings.MqttAutoDiscoveryTopic); + // const String publishTopic(ControllerSettings.Publish); + + const String taskName = makeHomeAssistantCompliantName(getTaskDeviceName(taskIndex)); + const String valName = makeHomeAssistantCompliantName(valueName); const String uniqueId = elementName.isEmpty() ? MQTT_TaskValueUniqueName(taskName, valName) : strformat(F("%s_%s"), elementId.c_str(), valName.c_str()); - const String publish = MQTT_DiscoveryBuildValueTopic(publishTopic, - event, - taskValue, - componentClass, - uniqueId, - elementId, - valName); - const String discoveryUrl = MQTT_DiscoveryBuildValueTopic(discoveryTopic, - event, - taskValue, - componentClass, - uniqueId, - elementId, - valName); - const String discoveryMessage = strformat(F("{\"~\":\"%s\",\"name\":\"%s %s\",\"uniq_id\":\"%s\",%s" - "\"%s\":\"%s\"%s%s%s,\"stat_t\":\"~\"" - "%s}"), // deviceElement last - publish.c_str(), taskName.c_str(), valName.c_str(), uniqueId.c_str(), schema.c_str(), - devOrIcon.c_str(), deviceClass.c_str(), withUoM.c_str(), stateJson.c_str(), withSet.c_str(), - deviceElement.c_str()); - const String triggerMessage = strformat(F("{\"atype\":\"trigger\",\"t\":\"%s\"," - "\"p\":\"device_automation\"," - "\"type\":\"button_short_press\"," // FIXME ? - "\"stype\":\"switch_1\"" // FIXME ? - "%s}"), // deviceElement is used to pass in the TriggerState - publish.c_str(), deviceElement.c_str()); + String message; + { + const String publish = MQTT_DiscoveryBuildValueTopic(ControllerSettings.Publish, + event, + taskValue, + componentClass, + uniqueId, + elementId, + valName); + + if (sendTrigger) { + // triggerMessage + message = strformat(F("{\"atype\":\"trigger\",\"t\":\"%s\"," + "\"p\":\"device_automation\"," + "\"type\":\"button_short_press\"," // FIXME ? + "\"stype\":\"switch_1\"" // FIXME ? + "%s}"), // deviceElement is used to pass in the TriggerState + publish.c_str(), deviceElement.c_str()); + } else { + // discoveryMessage + const String withSet = hasSet ? F(",\"cmd_t\":\"~/set\"") : EMPTY_STRING; + const String schema = hasSet ? EMPTY_STRING : "\"schema\":\"basic\","; + const String devOrIcon = hasIcon ? F("ic") : F("dev_cla"); + const String withUoM = unitOfMeasure.isEmpty() ? EMPTY_STRING : + strformat(F(",\"unit_of_meas\":\"%s\""), unitOfMeasure.c_str()); + const String stateJson = stateClass.isEmpty() ? EMPTY_STRING : + strformat(F(",\"stat_cla\":\"%s\""), stateClass.c_str()); + + message = strformat(F("{\"~\":\"%s\",\"name\":\"%s %s\",\"uniq_id\":\"%s\",%s" + "\"%s\":\"%s\"%s%s%s,\"stat_t\":\"~\"" + "%s}"), // deviceElement last + publish.c_str(), taskName.c_str(), valName.c_str(), uniqueId.c_str(), schema.c_str(), + devOrIcon.c_str(), deviceClass.c_str(), withUoM.c_str(), stateJson.c_str(), withSet.c_str(), + deviceElement.c_str()); + } + } + + const bool retainDsc = ControllerSettings.mqtt_retainDiscovery(); + String topic; + { + const String discoveryUrl = MQTT_DiscoveryBuildValueTopic(ControllerSettings.MqttAutoDiscoveryTopic, + event, + taskValue, + componentClass, + uniqueId, + elementId, + valName); + const String discoveryConfig(parseStringKeepCase(ControllerSettings.MqttAutoDiscoveryConfig, 1, '|')); + topic = discoveryConfig.isEmpty() + ? concat(discoveryUrl, F("/config")) + : concat(discoveryUrl, discoveryConfig); + } return MQTT_DiscoveryPublish(ControllerIndex, - discoveryConfig.isEmpty() ? concat(discoveryUrl, F("/config")) : concat(discoveryUrl, discoveryConfig), - sendTrigger ? triggerMessage : discoveryMessage, + topic, + message, taskIndex, taskValue, retainDsc); diff --git a/src/src/Helpers/_CPlugin_Helper_mqtt.h b/src/src/Helpers/_CPlugin_Helper_mqtt.h index c636efa71..e118bad30 100644 --- a/src/src/Helpers/_CPlugin_Helper_mqtt.h +++ b/src/src/Helpers/_CPlugin_Helper_mqtt.h @@ -96,11 +96,11 @@ bool MQTT_DiscoveryPublishWithStatusAndSet(taskIndex_t taskIndex, controllerIndex_t ControllerIndex, ControllerSettingsStruct& ControllerSettings, const __FlashStringHelper*componentClass, - String deviceClass, - String unitOfMeasure, + const String & deviceClass, + const String & unitOfMeasure, struct EventStruct *event, - const String deviceElement, - const String stateClass, + const String & deviceElement, + const String & stateClass, bool success, bool hasSet, bool hasIcon, From 18cf4d6b1714ba69d20007b567d3e85c7ddf130f Mon Sep 17 00:00:00 2001 From: TD-er Date: Wed, 24 Sep 2025 16:09:48 +0200 Subject: [PATCH 282/564] [Network] Remove unused base_class check for NWPluginData structs --- .../net/DataStructs/NWPluginData_base.cpp | 3 +-- .../net/DataStructs/NWPluginData_base.h | 10 ---------- src/ESPEasy/net/Globals/NWPlugins.cpp | 20 +++++++++++++++++++ src/ESPEasy/net/_NWPlugin_Helper.cpp | 10 ---------- src/ESPEasy/net/_NWPlugin_Helper.h | 1 - src/src/Helpers/ESPEasy_time.cpp | 2 +- 6 files changed, 22 insertions(+), 24 deletions(-) diff --git a/src/ESPEasy/net/DataStructs/NWPluginData_base.cpp b/src/ESPEasy/net/DataStructs/NWPluginData_base.cpp index 968cdfd99..7bc2b9d56 100644 --- a/src/ESPEasy/net/DataStructs/NWPluginData_base.cpp +++ b/src/ESPEasy/net/DataStructs/NWPluginData_base.cpp @@ -31,8 +31,7 @@ NWPluginData_base::NWPluginData_base( _kvs(nullptr), #endif _nw_data_pluginID(nwpluginID), - _networkIndex(networkIndex), - _baseClassOnly(false) + _networkIndex(networkIndex) #ifdef ESP32 , _netif(netif) #endif diff --git a/src/ESPEasy/net/DataStructs/NWPluginData_base.h b/src/ESPEasy/net/DataStructs/NWPluginData_base.h index 217a381b2..7f1c8705b 100644 --- a/src/ESPEasy/net/DataStructs/NWPluginData_base.h +++ b/src/ESPEasy/net/DataStructs/NWPluginData_base.h @@ -38,10 +38,6 @@ struct NWPluginData_base { virtual bool exit(EventStruct *event) = 0; - bool baseClassOnly() const { - return _baseClassOnly; - } - bool hasPluginStats() const; bool hasPeaks() const; @@ -163,12 +159,6 @@ protected: nwpluginID_t _nw_data_pluginID = INVALID_NW_PLUGIN_ID; networkIndex_t _networkIndex = INVALID_NETWORK_INDEX; -#if FEATURE_STORE_NETWORK_INTERFACE_SETTINGS - bool _baseClassOnly = false; -#else - bool _baseClassOnly = true; -#endif // if FEATURE_STORE_NETWORK_INTERFACE_SETTINGS - #ifdef ESP32 NetworkInterface *_netif{}; # if FEATURE_NETWORK_STATS && FEATURE_NETWORK_TRAFFIC_COUNT diff --git a/src/ESPEasy/net/Globals/NWPlugins.cpp b/src/ESPEasy/net/Globals/NWPlugins.cpp index 92819dc65..27ec9fadd 100644 --- a/src/ESPEasy/net/Globals/NWPlugins.cpp +++ b/src/ESPEasy/net/Globals/NWPlugins.cpp @@ -421,11 +421,31 @@ NWPluginData_static_runtime* getNWPluginData_static_runtime(networkIndex_t index const NWPluginData_static_runtime* getDefaultRoute_NWPluginData_static_runtime() { + #ifdef ESP32 + networkIndex_t index_highest_prio = NETWORK_MAX; + int highest_prio = -1; + #endif + for (networkIndex_t i = 0; validNetworkIndex(i); ++i) { auto NW_data = getNWPluginData_static_runtime(i); if (NW_data && NW_data->isDefaultRoute()) { return NW_data; } + #ifdef ESP32 + if (NW_data) { + if (NW_data->_route_prio > highest_prio) { + index_highest_prio = i; + highest_prio = NW_data->_route_prio; + } + } + #endif } + #ifdef ESP32 + if (validNetworkIndex(index_highest_prio)) { + return getNWPluginData_static_runtime(index_highest_prio); + } + + #endif + return nullptr; } diff --git a/src/ESPEasy/net/_NWPlugin_Helper.cpp b/src/ESPEasy/net/_NWPlugin_Helper.cpp index 8f83b49da..d6e76c6f3 100644 --- a/src/ESPEasy/net/_NWPlugin_Helper.cpp +++ b/src/ESPEasy/net/_NWPlugin_Helper.cpp @@ -70,16 +70,6 @@ bool initNWPluginData(ESPEasy::net::networkIndex_t networkIndex, NWPluginData_ba } NWPluginData_base* getNWPluginData(ESPEasy::net::networkIndex_t networkIndex) { - if (nwpluginTaskData_initialized(networkIndex)) { - - if (!NWPlugin_task_data[networkIndex]->baseClassOnly()) { - return NWPlugin_task_data[networkIndex]; - } - } - return nullptr; -} - -NWPluginData_base* getNWPluginDataBaseClassOnly(ESPEasy::net::networkIndex_t networkIndex) { if (nwpluginTaskData_initialized(networkIndex)) { return NWPlugin_task_data[networkIndex]; } diff --git a/src/ESPEasy/net/_NWPlugin_Helper.h b/src/ESPEasy/net/_NWPlugin_Helper.h index 8c579161f..1de556aa9 100644 --- a/src/ESPEasy/net/_NWPlugin_Helper.h +++ b/src/ESPEasy/net/_NWPlugin_Helper.h @@ -31,7 +31,6 @@ bool initNWPluginData(ESPEasy::net::networkIndex_t networkIndex, NWPluginData_base * data); NWPluginData_base* getNWPluginData(ESPEasy::net::networkIndex_t networkIndex); -NWPluginData_base* getNWPluginDataBaseClassOnly(ESPEasy::net::networkIndex_t networkIndex); bool nwpluginTaskData_initialized(ESPEasy::net::networkIndex_t networkIndex); diff --git a/src/src/Helpers/ESPEasy_time.cpp b/src/src/Helpers/ESPEasy_time.cpp index 3c1e00da3..832264630 100644 --- a/src/src/Helpers/ESPEasy_time.cpp +++ b/src/src/Helpers/ESPEasy_time.cpp @@ -344,7 +344,7 @@ unsigned long ESPEasy_time::now_() { // Process for network interfaces too for (ESPEasy::net::networkIndex_t networkIndex = 0; networkIndex < NETWORK_MAX; networkIndex++) { - ESPEasy::net::NWPluginData_base *NWdata = ESPEasy::net::getNWPluginDataBaseClassOnly(networkIndex); + ESPEasy::net::NWPluginData_base *NWdata = ESPEasy::net::getNWPluginData(networkIndex); if (NWdata != nullptr) { NWdata->processTimeSet(externalUnixTime_offset_usec / 1000000.0); From 9e43ecee095f628e975c0dcf5263b997a018641a Mon Sep 17 00:00:00 2001 From: TD-er Date: Wed, 24 Sep 2025 16:11:59 +0200 Subject: [PATCH 283/564] [Network] Add ESPEasy event when network is enabled/disabled --- .../NWPluginData_static_runtime.cpp | 10 +++++--- .../NWPluginData_static_runtime_ESP32.cpp | 23 ------------------- 2 files changed, 7 insertions(+), 26 deletions(-) diff --git a/src/ESPEasy/net/DataStructs/NWPluginData_static_runtime.cpp b/src/ESPEasy/net/DataStructs/NWPluginData_static_runtime.cpp index 0924c337b..88881462a 100644 --- a/src/ESPEasy/net/DataStructs/NWPluginData_static_runtime.cpp +++ b/src/ESPEasy/net/DataStructs/NWPluginData_static_runtime.cpp @@ -250,11 +250,15 @@ void NWPluginData_static_runtime::processEvents() statusLED(true); } - if (_startStopStats.changedSinceLastCheck_and_clear() && _isAP && Settings.UseRules) { + if (_startStopStats.changedSinceLastCheck_and_clear() && Settings.UseRules) { if (_startStopStats.isOn()) { - eventQueue.add(F("WiFi#APmodeEnabled")); + eventQueue.add(concat( + _eventInterfaceName, + _isAP ? F("#APmodeEnabled") : F("#Enabled"))); } else if (_startStopStats.isOff()) { - eventQueue.add(F("WiFi#APmodeDisabled")); + eventQueue.add(concat( + _eventInterfaceName, + _isAP ? F("#APmodeDisabled") : F("#Disabled"))); } } } diff --git a/src/ESPEasy/net/DataStructs/NWPluginData_static_runtime_ESP32.cpp b/src/ESPEasy/net/DataStructs/NWPluginData_static_runtime_ESP32.cpp index 51a4f44e6..7ae16ca1d 100644 --- a/src/ESPEasy/net/DataStructs/NWPluginData_static_runtime_ESP32.cpp +++ b/src/ESPEasy/net/DataStructs/NWPluginData_static_runtime_ESP32.cpp @@ -165,29 +165,6 @@ void NWPluginData_static_runtime::mark_got_IPv6(ip_event_got_ip6_t *event) _gotIP6Stats.forceSet(true); } } - -# if NW_PLUGIN_LOG_EVENTS - - if (loglevelActiveFor(LOG_LEVEL_INFO)) { - if (event) { - esp_ip6_addr_type_t addr_type = esp_netif_ip6_get_addr_type(&event->ip6_info.ip); - static const char *addr_types[] = { "UNKNOWN", "GLOBAL", "LINK_LOCAL", "SITE_LOCAL", "UNIQUE_LOCAL", "IPV4_MAPPED_IPV6" }; - if (addr_type < NR_ELEMENTS(addr_types)) - addLog(LOG_LEVEL_INFO, strformat( - F("%s: Got IPv6: IP Index: %d, Type: %s, Zone: %d, Address: " IPV6STR), - _netif->desc(), - event->ip_index, - addr_types[addr_type], - event->ip6_info.ip.zone, - IPV62STR(event->ip6_info.ip) - )); - } else { - addLog(LOG_LEVEL_INFO, strformat( - F("%s: Got IPv6"), - _netif->desc())); - } - } -# endif // if NW_PLUGIN_LOG_EVENTS } # endif // if FEATURE_USE_IPV6 From 5d568c6ee468f2b610e99ef25ea6427a1d3417e4 Mon Sep 17 00:00:00 2001 From: TD-er Date: Wed, 24 Sep 2025 16:13:03 +0200 Subject: [PATCH 284/564] [Log] Only process log to serial when in "Arduino RTOS task" --- src/src/ESPEasyCore/ESPEasy_Console_Port.cpp | 13 +++++++++++++ src/src/Helpers/SerialWriteBuffer.cpp | 2 +- 2 files changed, 14 insertions(+), 1 deletion(-) diff --git a/src/src/ESPEasyCore/ESPEasy_Console_Port.cpp b/src/src/ESPEasyCore/ESPEasy_Console_Port.cpp index dc91f0872..4d1071017 100644 --- a/src/src/ESPEasyCore/ESPEasy_Console_Port.cpp +++ b/src/src/ESPEasyCore/ESPEasy_Console_Port.cpp @@ -98,6 +98,9 @@ void EspEasy_Console_Port::endPort() void EspEasy_Console_Port::addToSerialBuffer(char c) { +#ifdef ESP32 + if (!xPortCanYield()) return; +#endif if (_serial != nullptr) { _serialWriteBuffer.add(c); } @@ -105,6 +108,9 @@ void EspEasy_Console_Port::addToSerialBuffer(char c) void EspEasy_Console_Port::addToSerialBuffer(const String& line) { +#ifdef ESP32 + if (!xPortCanYield()) return; +#endif if (_serial != nullptr) { _serialWriteBuffer.add(line); } @@ -112,6 +118,10 @@ void EspEasy_Console_Port::addToSerialBuffer(const String& line) void EspEasy_Console_Port::addNewlineToSerialBuffer() { +#ifdef ESP32 + if (!xPortCanYield()) return; +#endif + if (_serial != nullptr) { _serialWriteBuffer.addNewline(); } @@ -120,6 +130,9 @@ void EspEasy_Console_Port::addNewlineToSerialBuffer() bool EspEasy_Console_Port::process_serialWriteBuffer() { if (_serial != nullptr) { +#ifdef ESP32 + if (!xPortCanYield()) return false; +#endif const int snip = _serial->availableForWrite(); if (snip > 0) { diff --git a/src/src/Helpers/SerialWriteBuffer.cpp b/src/src/Helpers/SerialWriteBuffer.cpp index 9321136f6..ff7087a63 100644 --- a/src/src/Helpers/SerialWriteBuffer.cpp +++ b/src/src/Helpers/SerialWriteBuffer.cpp @@ -72,7 +72,7 @@ size_t SerialWriteBuffer_t::write(Stream& stream, size_t nrBytesToWrite) } while (nrBytesToWrite > 0 && !_buffer.empty()) { - uint8_t tmpBuffer[16]{}; + uint8_t tmpBuffer[32]{}; size_t tmpBufferUsed = 0; From 76dede8fb98ba96087627c78a8c173400933d40c Mon Sep 17 00:00:00 2001 From: TD-er Date: Wed, 24 Sep 2025 16:13:54 +0200 Subject: [PATCH 285/564] [WiFi] Make sure WiFi actually is disconnected when trying to reconnect --- src/ESPEasy/net/wifi/ESPEasyWiFi_state_machine.cpp | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/src/ESPEasy/net/wifi/ESPEasyWiFi_state_machine.cpp b/src/ESPEasy/net/wifi/ESPEasyWiFi_state_machine.cpp index 7ca472e58..1987cdfaa 100644 --- a/src/ESPEasy/net/wifi/ESPEasyWiFi_state_machine.cpp +++ b/src/ESPEasy/net/wifi/ESPEasyWiFi_state_machine.cpp @@ -316,6 +316,8 @@ void ESPEasyWiFi_t::setState(WiFiState_e newState, uint32_t timeout) { if (wifi_STA_data) { wifi_STA_data->mark_disconnected(); + if (WiFi.status() == WL_CONNECTED) + WiFi.disconnect(); } } @@ -370,7 +372,11 @@ void ESPEasyWiFi_t::setState(WiFiState_e newState, uint32_t timeout) { if (!connectSTA()) { // TODO TD-er: Must keep track of failed attempts and start AP when either no credentials present or nr. of attempts failed > some // threshold. - setState(WiFiState_e::IdleWaiting, 100); + if (!WiFi_AP_Candidates.hasCandidateCredentials()) { + setState(WiFiState_e::STA_Scanning, WIFI_STATE_MACHINE_STA_CONNECTING_TIMEOUT); + } else { + setState(WiFiState_e::IdleWaiting, 100); + } } break; case WiFiState_e::STA_Connected: From edd8ddef58a577100f2204f9c5158342c0c1555a Mon Sep 17 00:00:00 2001 From: TD-er Date: Wed, 24 Sep 2025 16:14:28 +0200 Subject: [PATCH 286/564] [MQTT] Only try to run background MQTT connect when connected to network --- src/src/ESPEasyCore/Controller.cpp | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/src/ESPEasyCore/Controller.cpp b/src/src/ESPEasyCore/Controller.cpp index 5dc37ce52..082932f1f 100644 --- a/src/src/ESPEasyCore/Controller.cpp +++ b/src/src/ESPEasyCore/Controller.cpp @@ -674,7 +674,8 @@ void MQTT_execute_connect_task(void *parameter) : ControllerSettings->ClientTimeout; uint8_t incr = 5; // Increment timeout between connection attempts 5 times by 100 msec - while (!MQTTConnect(MQTT_task_data->ControllerIndex) + while (ESPEasy::net::NetworkConnected() && + !MQTTConnect(MQTT_task_data->ControllerIndex) # if FEATURE_MQTT_TLS && mqtt_tls_last_errorstr.isEmpty() # endif // if FEATURE_MQTT_TLS From 41aeed80609294a1f2e866808d9a38dbdc9e8817 Mon Sep 17 00:00:00 2001 From: TD-er Date: Wed, 24 Sep 2025 16:15:12 +0200 Subject: [PATCH 287/564] [CSS] Tweaks for newly added Network tab --- src/src/Static/WebStaticData.h | 2 +- static/espeasy_default.css | 4 ++-- static/espeasy_default.min.css | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/src/Static/WebStaticData.h b/src/src/Static/WebStaticData.h index 51f981df4..eacfd465e 100644 --- a/src/src/Static/WebStaticData.h +++ b/src/src/Static/WebStaticData.h @@ -154,7 +154,7 @@ static const char DATA_ESPEASY_DEFAULT_MIN_CSS[] PROGMEM = { "losebtn{cursor:pointer;font-size:22px;line-height:20px;margin-left:15px;transition:.3s}.closebtn:hover{color:#000}section{overflow-x" ":auto;padding:10px 0}footer{padding:0 5px;word-break:break-all}.closebtn,.div_r{float:right;color:var(--c6)}a,h1,h6{color:var(--c5)}" ".button,.container input:checked~.checkmark:not(.disabled),.container2 input:checked~.dotmark{background-color:var(--bg10)}canvas{fi" -"lter:invert(var(--iv)) hue-rotate(var(--ro))}@media screen and (max-width:780px){.showmenulabel{display:none}a.menu{width:12%}}@medi" +"lter:invert(var(--iv)) hue-rotate(var(--ro))}@media screen and (max-width:830px){.showmenulabel{display:none}a.menu{width:11%}}@medi" "a screen and (max-width:450px){.normal{min-width:300px}input.wide:focus{left:4px;position:absolute;z-index:1}}" }; #else // ifndef EMBED_ESPEASY_DEFAULT_MIN_CSS_USE_GZ diff --git a/static/espeasy_default.css b/static/espeasy_default.css index f5f9fae5d..c6597eb37 100644 --- a/static/espeasy_default.css +++ b/static/espeasy_default.css @@ -576,13 +576,13 @@ canvas { filter: invert(var(--iv)) hue-rotate(var(--ro)); } -@media screen and (max-width:780px) { +@media screen and (max-width:830px) { .showmenulabel { display: none } a.menu { - width: 12% + width: 11% } } diff --git a/static/espeasy_default.min.css b/static/espeasy_default.min.css index c06e1b7e8..c9ae02f13 100644 --- a/static/espeasy_default.min.css +++ b/static/espeasy_default.min.css @@ -1 +1 @@ -.logviewer,tbody{overflow:auto}.container,.normal td{height:30px}.container,.container input:checked~.checkmark:after,.container2,.container2 input:checked~.dotmark:after,.sub{display:block}:root{--bg1:#eee;--bg2:#cacaca;--bg3:#07d;--c1:#fff;--bdc1:silver;--bg4:#e8e8e8;--bg5:#dbff0075;--c2:#444;--bg6:#fff;--bdc2:#444 #444 #fff;--c3:#000;--bg7:#bdbdbd;--bg8:#029b34;--c4:inherit;--c5:#07d;--bg10:#07d;--bg11:#f8f8f8;--c6:#fff;--ro:0deg;--iv:0}[data-theme=dark]{--bg1:#444;--bg2:#2e2e2e;--bg3:#00000085;--c1:#dfdfdf;--bdc1:#545454;--bg4:#2e2e2e;--bg5:#553044;--c2:#fff;--bg6:#222;--bdc2:transparent;--c3:#fff;--bg7:#00000030;--bg8:#30553d;--c4:#c3c3c3;--c5:#c3c3c3;--bg10:#44607a;--bg11:#44607a;--c6:#c3c3c3;--ro:180deg;--iv:1}@media (prefers-color-scheme:dark){[data-theme=auto]{--bg1:#444;--bg2:#2e2e2e;--bg3:#00000085;--c1:#dfdfdf;--bdc1:#545454;--bg4:#2e2e2e;--bg5:#553044;--c2:#fff;--bg6:#222;--bdc2:transparent;--c3:#fff;--bg7:#00000030;--bg8:#30553d;--bg9:#222;--c4:#c3c3c3;--c5:#c3c3c3;--bg10:#44607a;--bg11:#44607a;--c6:#c3c3c3;--ro:180deg;--iv:1}}* :not(font,a),.closebtn,.div_r,.wide,h1,h6,textarea{color:var(--c4)}.checkmark:after,.dotmark:after{content:'';display:none;position:absolute}.button,.menu{text-decoration:none}.div_l,.menu{float:left}*{box-sizing:border-box;font-family:sans-serif;font-size:12pt;margin:0}h1{font-size:16pt;margin:8px 0}h3{background-color:var(--bg2);margin:-5px;padding:6px}h6{font-size:10pt}pre{font:1em monospace,monospace}.button{border:0;border-radius:5px;color:var(--c6);margin:5px;padding:5px 15px}.checkmark,input,select{background-color:var(--bg1)}#toastmessage,.button.help,.checkmark,.dotmark,.logviewer,hr,input,select,textarea{border:.1px solid gray}input[disabled],input[disabled]:hover{background-color:var(--bg7)}.button.link.wide{display:inline-block;text-align:center}.button.link.red{background-color:red}.button.help{border-radius:50%;font-family:monospace;padding:2px 7px}.checkmark,input,select,textarea{border-radius:5px}.button:hover{background:#369}input,select,textarea{margin:4px;padding:4px 8px}.wide{margin-bottom:5px;max-width:300px;min-width:85px;width:95%}.sub,.widenumber{max-width:100px}textarea.wide{max-width:1000px}.xwide{width:300px}.container,.container2{cursor:pointer;font-size:12pt;padding-left:35px}.container{margin-left:4px;margin-top:0;position:relative;user-select:none}.checkmark.disabled{background-color:grey}.checkmark{height:25px;left:0;position:absolute;top:0;width:25px}.container .checkmark:after{border:solid #fff;border-width:0 3px 3px 0;height:10px;left:7px;top:3px;transform:rotate(45deg);width:5px}#toastmessage{background-color:var(--bg3);border-radius:5px;bottom:30%;color:#fff;font-size:17px;left:282px;margin-left:-125px;min-width:250px;padding:16px;position:fixed;text-align:center;visibility:hidden;z-index:1}.container2{margin-bottom:20px;margin-left:9px;position:relative;user-select:none}.dotmark{background-color:#eee;border-radius:50%;height:26px;left:0;position:absolute;top:0;width:26px}.container2 .dotmark:after{background:#fff;border-radius:50%;height:8px;left:8px;top:8px;width:8px}textarea{font-family:'Lucida Console',Monaco,monospace;max-height:60vh;width:-webkit-fill-available;width:-moz-available}#toastmessage.show{animation:.5s fadein,.5s 2.5s fadeout;visibility:visible}.container input,.container2 input{cursor:pointer;opacity:0;position:absolute}@keyframes fadein{from{bottom:20%;opacity:0}to{bottom:30%;opacity:.9}}@keyframes fadeout{from{bottom:30%;opacity:.9}to{bottom:0;opacity:0}}.level_0{color:#f1f1f1}.level_1{color:#fcff95}.level_2{color:#9dcefe}.level_3{color:#a4fc79}.level_4{color:#f2ab39}.level_9{color:#f50}.logviewer{background-color:#272727;color:#f1f1f1;height:60vh}.multirow th,.normal th{background-color:#444;border-color:var(--bdc1);color:var(--c1);padding:5px;width:100vw}.multirow,.normal{border-spacing:0;width:100%}.multirow tr,.normal td,.normal tr{padding:5px}.multirow td{border-color:var(--bdc1);height:30px;padding:4px;text-align:center}.tworow td,.tworow th{text-align:left}.sub{border-spacing:0}.even tr:nth-child(2n),.tworow tr:nth-child(4n+3),.tworow tr:nth-child(4n+4),textarea{background-color:var(--bg4)}.menu.active,body{background-color:var(--bg6)}.apheader,.headermenu{padding:8px 12px;width:100vw}.note{color:#7b7b7b;font-style:italic}.headermenu{background-color:var(--bg11);border-bottom:.1px solid #444;height:100px;position:fixed;top:0;z-index:1}.bodymenu{height:100vh;padding-top:100px}.menubar{position:inherit;top:54px;width:100%}a.menu{align-items:center;display:flex;height:46px;justify-content:center}.menu{color:var(--c2);border:1px solid transparent;border-radius:5px 5px 0 0;padding:10px 10px 8px;white-space:nowrap}.menu.active{border-color:var(--bdc2);color:var(--c3);border-width:.1px}.menu:hover{background:var(--bg7);color:var(--c3)}.menu_button{display:none}.on{color:#029b34}.off{color:red}.div_r{background-color:var(--bg8);border-radius:4px;margin:2px;padding:1px 10px}.alert,.warning{color:#fff;margin-bottom:15px;padding:20px}.highlight td{background-color:var(--bg5)}.div_br{clear:both}.alert{background-color:#f44336}.warning{background-color:#ffca17}.closebtn{cursor:pointer;font-size:22px;line-height:20px;margin-left:15px;transition:.3s}.closebtn:hover{color:#000}section{overflow-x:auto;padding:10px 0}footer{padding:0 5px;word-break:break-all}.closebtn,.div_r{float:right;color:var(--c6)}a,h1,h6{color:var(--c5)}.button,.container input:checked~.checkmark:not(.disabled),.container2 input:checked~.dotmark{background-color:var(--bg10)}canvas{filter:invert(var(--iv)) hue-rotate(var(--ro))}@media screen and (max-width:780px){.showmenulabel{display:none}a.menu{width:12%}}@media screen and (max-width:450px){.normal{min-width:300px}input.wide:focus{left:4px;position:absolute;z-index:1}} \ No newline at end of file +.logviewer,tbody{overflow:auto}.container,.normal td{height:30px}.container,.container input:checked~.checkmark:after,.container2,.container2 input:checked~.dotmark:after,.sub{display:block}:root{--bg1:#eee;--bg2:#cacaca;--bg3:#07d;--c1:#fff;--bdc1:silver;--bg4:#e8e8e8;--bg5:#dbff0075;--c2:#444;--bg6:#fff;--bdc2:#444 #444 #fff;--c3:#000;--bg7:#bdbdbd;--bg8:#029b34;--c4:inherit;--c5:#07d;--bg10:#07d;--bg11:#f8f8f8;--c6:#fff;--ro:0deg;--iv:0}[data-theme=dark]{--bg1:#444;--bg2:#2e2e2e;--bg3:#00000085;--c1:#dfdfdf;--bdc1:#545454;--bg4:#2e2e2e;--bg5:#553044;--c2:#fff;--bg6:#222;--bdc2:transparent;--c3:#fff;--bg7:#00000030;--bg8:#30553d;--c4:#c3c3c3;--c5:#c3c3c3;--bg10:#44607a;--bg11:#44607a;--c6:#c3c3c3;--ro:180deg;--iv:1}@media (prefers-color-scheme:dark){[data-theme=auto]{--bg1:#444;--bg2:#2e2e2e;--bg3:#00000085;--c1:#dfdfdf;--bdc1:#545454;--bg4:#2e2e2e;--bg5:#553044;--c2:#fff;--bg6:#222;--bdc2:transparent;--c3:#fff;--bg7:#00000030;--bg8:#30553d;--bg9:#222;--c4:#c3c3c3;--c5:#c3c3c3;--bg10:#44607a;--bg11:#44607a;--c6:#c3c3c3;--ro:180deg;--iv:1}}* :not(font,a),.closebtn,.div_r,.wide,h1,h6,textarea{color:var(--c4)}.checkmark:after,.dotmark:after{content:'';display:none;position:absolute}.button,.menu{text-decoration:none}.div_l,.menu{float:left}*{box-sizing:border-box;font-family:sans-serif;font-size:12pt;margin:0}h1{font-size:16pt;margin:8px 0}h3{background-color:var(--bg2);margin:-5px;padding:6px}h6{font-size:10pt}pre{font:1em monospace,monospace}.button{border:0;border-radius:5px;color:var(--c6);margin:5px;padding:5px 15px}.checkmark,input,select{background-color:var(--bg1)}#toastmessage,.button.help,.checkmark,.dotmark,.logviewer,hr,input,select,textarea{border:.1px solid gray}input[disabled],input[disabled]:hover{background-color:var(--bg7)}.button.link.wide{display:inline-block;text-align:center}.button.link.red{background-color:red}.button.help{border-radius:50%;font-family:monospace;padding:2px 7px}.checkmark,input,select,textarea{border-radius:5px}.button:hover{background:#369}input,select,textarea{margin:4px;padding:4px 8px}.wide{margin-bottom:5px;max-width:300px;min-width:85px;width:95%}.sub,.widenumber{max-width:100px}textarea.wide{max-width:1000px}.xwide{width:300px}.container,.container2{cursor:pointer;font-size:12pt;padding-left:35px}.container{margin-left:4px;margin-top:0;position:relative;user-select:none}.checkmark.disabled{background-color:grey}.checkmark{height:25px;left:0;position:absolute;top:0;width:25px}.container .checkmark:after{border:solid #fff;border-width:0 3px 3px 0;height:10px;left:7px;top:3px;transform:rotate(45deg);width:5px}#toastmessage{background-color:var(--bg3);border-radius:5px;bottom:30%;color:#fff;font-size:17px;left:282px;margin-left:-125px;min-width:250px;padding:16px;position:fixed;text-align:center;visibility:hidden;z-index:1}.container2{margin-bottom:20px;margin-left:9px;position:relative;user-select:none}.dotmark{background-color:#eee;border-radius:50%;height:26px;left:0;position:absolute;top:0;width:26px}.container2 .dotmark:after{background:#fff;border-radius:50%;height:8px;left:8px;top:8px;width:8px}textarea{font-family:'Lucida Console',Monaco,monospace;max-height:60vh;width:-webkit-fill-available;width:-moz-available}#toastmessage.show{animation:.5s fadein,.5s 2.5s fadeout;visibility:visible}.container input,.container2 input{cursor:pointer;opacity:0;position:absolute}@keyframes fadein{from{bottom:20%;opacity:0}to{bottom:30%;opacity:.9}}@keyframes fadeout{from{bottom:30%;opacity:.9}to{bottom:0;opacity:0}}.level_0{color:#f1f1f1}.level_1{color:#fcff95}.level_2{color:#9dcefe}.level_3{color:#a4fc79}.level_4{color:#f2ab39}.level_9{color:#f50}.logviewer{background-color:#272727;color:#f1f1f1;height:60vh}.multirow th,.normal th{background-color:#444;border-color:var(--bdc1);color:var(--c1);padding:5px;width:100vw}.multirow,.normal{border-spacing:0;width:100%}.multirow tr,.normal td,.normal tr{padding:5px}.multirow td{border-color:var(--bdc1);height:30px;padding:4px;text-align:center}.tworow td,.tworow th{text-align:left}.sub{border-spacing:0}.even tr:nth-child(2n),.tworow tr:nth-child(4n+3),.tworow tr:nth-child(4n+4),textarea{background-color:var(--bg4)}.menu.active,body{background-color:var(--bg6)}.apheader,.headermenu{padding:8px 12px;width:100vw}.note{color:#7b7b7b;font-style:italic}.headermenu{background-color:var(--bg11);border-bottom:.1px solid #444;height:100px;position:fixed;top:0;z-index:1}.bodymenu{height:100vh;padding-top:100px}.menubar{position:inherit;top:54px;width:100%}a.menu{align-items:center;display:flex;height:46px;justify-content:center}.menu{color:var(--c2);border:1px solid transparent;border-radius:5px 5px 0 0;padding:10px 10px 8px;white-space:nowrap}.menu.active{border-color:var(--bdc2);color:var(--c3);border-width:.1px}.menu:hover{background:var(--bg7);color:var(--c3)}.menu_button{display:none}.on{color:#029b34}.off{color:red}.div_r{background-color:var(--bg8);border-radius:4px;margin:2px;padding:1px 10px}.alert,.warning{color:#fff;margin-bottom:15px;padding:20px}.highlight td{background-color:var(--bg5)}.div_br{clear:both}.alert{background-color:#f44336}.warning{background-color:#ffca17}.closebtn{cursor:pointer;font-size:22px;line-height:20px;margin-left:15px;transition:.3s}.closebtn:hover{color:#000}section{overflow-x:auto;padding:10px 0}footer{padding:0 5px;word-break:break-all}.closebtn,.div_r{float:right;color:var(--c6)}a,h1,h6{color:var(--c5)}.button,.container input:checked~.checkmark:not(.disabled),.container2 input:checked~.dotmark{background-color:var(--bg10)}canvas{filter:invert(var(--iv)) hue-rotate(var(--ro))}@media screen and (max-width:830px){.showmenulabel{display:none}a.menu{width:11%}}@media screen and (max-width:450px){.normal{min-width:300px}input.wide:focus{left:4px;position:absolute;z-index:1}} \ No newline at end of file From fcf23e1f4bf6b34f68731fa3c0ca8bb735cde93f Mon Sep 17 00:00:00 2001 From: TD-er Date: Wed, 24 Sep 2025 17:32:18 +0200 Subject: [PATCH 288/564] [web UI] Change tab icons to be more uniform and working on Apple --- src/src/WebServer/WebTemplateParser.cpp | 21 ++++++++++++--------- 1 file changed, 12 insertions(+), 9 deletions(-) diff --git a/src/src/WebServer/WebTemplateParser.cpp b/src/src/WebServer/WebTemplateParser.cpp index 5a0ae54d9..49ead277e 100644 --- a/src/src/WebServer/WebTemplateParser.cpp +++ b/src/src/WebServer/WebTemplateParser.cpp @@ -98,16 +98,19 @@ uint8_t navMenuIndex = MENU_INDEX_MAIN; // See https://github.com/letscontrolit/ESPEasy/issues/1650 const __FlashStringHelper* getGpMenuIcon(uint8_t index) { + + #define ICON(code) F(code "︎") + switch (index) { - case MENU_INDEX_MAIN: return F("⌂"); - case MENU_INDEX_CONFIG: return F("⚙"); - case MENU_INDEX_NETWORK: return F("🖧"); - case MENU_INDEX_CONTROLLERS: return F("💬"); - case MENU_INDEX_HARDWARE: return F("📌"); - case MENU_INDEX_DEVICES: return F("🔌"); - case MENU_INDEX_RULES: return F("⧴"); - case MENU_INDEX_NOTIFICATIONS: return F("✉"); - case MENU_INDEX_TOOLS: return F("🔧"); + case MENU_INDEX_MAIN: return ICON("⌂"); + case MENU_INDEX_CONFIG: return ICON("⚙"); + case MENU_INDEX_NETWORK: return ICON("🌐"); // Alternative 🖧 (not working on Apple) + case MENU_INDEX_CONTROLLERS: return ICON("✆"); + case MENU_INDEX_HARDWARE: return ICON("☷"); + case MENU_INDEX_DEVICES: return ICON("❖"); + case MENU_INDEX_RULES: return ICON("⧴"); + case MENU_INDEX_NOTIFICATIONS: return ICON("✉"); + case MENU_INDEX_TOOLS: return ICON("⚠"); } return F(""); } From 9bd053ab470039925076b86927e90b346a52bb5a Mon Sep 17 00:00:00 2001 From: TD-er Date: Wed, 24 Sep 2025 19:52:54 +0200 Subject: [PATCH 289/564] [WiFi] Fix automatic redirect on Captive Portal --- .../net/wifi/ESPEasyWifi_abstracted.cpp | 31 ++++---- .../net/wifi/ESPEasyWifi_abstracted_ESP32.cpp | 10 +++ .../wifi/ESPEasyWifi_abstracted_ESP8266.cpp | 72 +++++++++++-------- 3 files changed, 70 insertions(+), 43 deletions(-) diff --git a/src/ESPEasy/net/wifi/ESPEasyWifi_abstracted.cpp b/src/ESPEasy/net/wifi/ESPEasyWifi_abstracted.cpp index ab8099971..dd5ef4b27 100644 --- a/src/ESPEasy/net/wifi/ESPEasyWifi_abstracted.cpp +++ b/src/ESPEasy/net/wifi/ESPEasyWifi_abstracted.cpp @@ -85,15 +85,14 @@ void doSetAPinternal(bool enable) IPAddress subnet(DEFAULT_AP_SUBNET); # ifdef ESP32 IPAddress dhcp_lease_start = (uint32_t)0; - IPAddress dns(DEFAULT_AP_DNS); +// IPAddress dns(DEFAULT_AP_DNS); - if (!WiFi.softAPConfig(apIP, apIP, subnet, dhcp_lease_start, dns)) { + if (!WiFi.softAPConfig(apIP, apIP, subnet, dhcp_lease_start/*, dns*/)) { addLog(LOG_LEVEL_ERROR, strformat( - ("WIFI : [AP] softAPConfig failed! IP: %s, GW: %s, SN: %s, DNS: %s"), + ("WIFI : [AP] softAPConfig failed! IP: %s, GW: %s, SN: %s"), apIP.toString().c_str(), apIP.toString().c_str(), - subnet.toString().c_str(), - dns.toString().c_str()) + subnet.toString().c_str()) ); } WiFi.AP.bandwidth(WIFI_BW_HT20); @@ -148,16 +147,20 @@ void doSetAPinternal(bool enable) } # endif // if ESP_IDF_VERSION >= ESP_IDF_VERSION_VAL(5, 4, 2) - - # else // ifdef ESP32 - - if (wifi_softap_dhcps_status() != DHCP_STARTED) { - if (!wifi_softap_dhcps_start()) { - addLog(LOG_LEVEL_ERROR, F("WIFI : [AP] wifi_softap_dhcps_start failed!")); - } +# if FEATURE_DNS_SERVER + if (!dnsServerActive) { + dnsServerActive = true; + dnsServer.start(); } - # endif // ifdef ESP32 -// WiFiEventData.timerAPoff.setMillisFromNow(WIFI_AP_OFF_TIMER_DURATION); +#endif +#else +# if FEATURE_DNS_SERVER + if (!dnsServerActive) { + dnsServerActive = true; + dnsServer.start(DNS_PORT, "*", WiFi.softAPIP()); + } +#endif +# endif // ifdef ESP32 } else { # if FEATURE_DNS_SERVER diff --git a/src/ESPEasy/net/wifi/ESPEasyWifi_abstracted_ESP32.cpp b/src/ESPEasy/net/wifi/ESPEasyWifi_abstracted_ESP32.cpp index c18917653..cb0a0804c 100644 --- a/src/ESPEasy/net/wifi/ESPEasyWifi_abstracted_ESP32.cpp +++ b/src/ESPEasy/net/wifi/ESPEasyWifi_abstracted_ESP32.cpp @@ -5,6 +5,7 @@ # include "../../../src/DataStructs/TimingStats.h" # include "../../../src/Globals/EventQueue.h" +# include "../../../src/Globals/Services.h" # include "../../../src/Globals/Settings.h" # include "../Globals/WiFi_AP_Candidates.h" # include "../../../src/Helpers/StringConverter.h" @@ -119,6 +120,15 @@ bool doSetWifiMode(WiFiMode_t new_mode) addLog(LOG_LEVEL_INFO, concat(F("WIFI : Set WiFi to "), doGetWifiModeString(new_mode))); + # if FEATURE_DNS_SERVER + if (!doWifiIsAP(new_mode)) { + if (dnsServerActive) { + dnsServerActive = false; + dnsServer.stop(); + } + } + #endif + int retry = 2; while (!WiFi.mode(new_mode) && retry > 0) { diff --git a/src/ESPEasy/net/wifi/ESPEasyWifi_abstracted_ESP8266.cpp b/src/ESPEasy/net/wifi/ESPEasyWifi_abstracted_ESP8266.cpp index 262663b40..6318886d2 100644 --- a/src/ESPEasy/net/wifi/ESPEasyWifi_abstracted_ESP8266.cpp +++ b/src/ESPEasy/net/wifi/ESPEasyWifi_abstracted_ESP8266.cpp @@ -5,6 +5,7 @@ # include "../../../src/DataStructs/TimingStats.h" # include "../../../src/Helpers/StringConverter.h" +# include "../../../src/Globals/Services.h" # include "../../../src/Globals/Settings.h" # include "../Globals/WiFi_AP_Candidates.h" @@ -18,7 +19,6 @@ namespace ESPEasy { namespace net { namespace wifi { - bool WiFi_pre_setup() { if (!ESPEasyWiFi_STA_EventHandler::initialized()) { return false; } @@ -60,14 +60,17 @@ bool doWifiIsSTA(WiFiMode_t wifimode) { return (wifimode == WIFI_STA) || (wifimo bool doSetWifiMode(WiFiMode_t new_mode) { if (!Settings.getNetworkEnabled(NETWORK_INDEX_WIFI_AP)) { - if (new_mode == WIFI_AP) new_mode = WIFI_OFF; - if (new_mode == WIFI_AP_STA) new_mode = WIFI_STA; + if (new_mode == WIFI_AP) { new_mode = WIFI_OFF; } + + if (new_mode == WIFI_AP_STA) { new_mode = WIFI_STA; } } + if (!Settings.getNetworkEnabled(NETWORK_INDEX_WIFI_STA)) { - if (new_mode == WIFI_STA) new_mode = WIFI_OFF; - if (new_mode == WIFI_AP_STA) new_mode = WIFI_AP; + if (new_mode == WIFI_STA) { new_mode = WIFI_OFF; } + + if (new_mode == WIFI_AP_STA) { new_mode = WIFI_AP; } } - + const WiFiMode_t cur_mode = WiFi.getMode(); // Made this static flag an int as ESP8266 and ESP32 differ in the "not set" values @@ -96,9 +99,16 @@ bool doSetWifiMode(WiFiMode_t new_mode) WiFi.forceSleepWake(); // Make sure WiFi is really active. delay(100); } -#ifndef BUILD_NO_DEBUG +# ifndef BUILD_NO_DEBUG addLog(LOG_LEVEL_INFO, concat(F("WIFI : Set WiFi to "), doGetWifiModeString(new_mode))); -#endif +# endif + +# if FEATURE_DNS_SERVER + if (!doWifiIsAP(new_mode) && dnsServerActive) { + dnsServerActive = false; + dnsServer.stop(); + } +# endif // if FEATURE_DNS_SERVER int retry = 2; @@ -109,17 +119,17 @@ bool doSetWifiMode(WiFiMode_t new_mode) retry = 2; while (WiFi.getMode() != new_mode && retry > 0) { -#ifndef BUILD_NO_DEBUG +# ifndef BUILD_NO_DEBUG addLog(LOG_LEVEL_INFO, F("WIFI : mode not yet set")); -#endif +# endif delay(100); --retry; } if (WiFi.getMode() != new_mode) { -#ifndef BUILD_NO_DEBUG +# ifndef BUILD_NO_DEBUG addLog(LOG_LEVEL_ERROR, F("WIFI : Cannot set mode!!!!!")); -#endif +# endif return false; } @@ -148,7 +158,8 @@ void doWifiScan(bool async, uint8_t channel) { } START_TIMER; -// WiFiEventData.lastScanMoment.setNow(); + + // WiFiEventData.lastScanMoment.setNow(); # ifndef BUILD_NO_DEBUG if (loglevelActiveFor(LOG_LEVEL_INFO)) { @@ -160,13 +171,15 @@ void doWifiScan(bool async, uint8_t channel) { } # endif // ifndef BUILD_NO_DEBUG bool show_hidden = true; -// WiFiEventData.lastGetScanMoment.setNow(); -// WiFiEventData.lastScanChannel = channel; + + // WiFiEventData.lastGetScanMoment.setNow(); + // WiFiEventData.lastScanChannel = channel; unsigned int nrScans = 1 + (async ? 0 : Settings.NumberExtraWiFiScans); while (nrScans > 0) { WiFi_AP_Candidates.begin_scan(); + if (!async) { FeedSW_watchdog(); } @@ -178,7 +191,7 @@ void doWifiScan(bool async, uint8_t channel) { WiFi_AP_Candidates.process_WiFiscan(); // FIXME TD-er: This should call WiFi_AP_Candidates.process_WiFiscan(); -// processScanDone(); + // processScanDone(); } } # if FEATURE_TIMING_STATS @@ -239,9 +252,9 @@ WiFiConnectionProtocol doGetConnectionProtocol() # if FEATURE_SET_WIFI_TX_PWR -void doSetWiFiTXpower(float& dBm) { WiFi.setOutputPower(dBm); } +void doSetWiFiTXpower(float& dBm) { WiFi.setOutputPower(dBm); } -float doGetWiFiTXpower() { return WiFi.getOutputPower(); } +float doGetWiFiTXpower() { return WiFi.getOutputPower(); } # endif // if FEATURE_SET_WIFI_TX_PWR @@ -256,23 +269,24 @@ void doSetConnectionSpeed(bool ForceWiFi_bg_mode) { if (candidate.phy_known() && (candidate.bits.phy_11g != candidate.bits.phy_11n)) { if ((WIFI_PHY_MODE_11G == phyMode) && !candidate.bits.phy_11g) { phyMode = WIFI_PHY_MODE_11N; -#ifndef BUILD_NO_DEBUG +# ifndef BUILD_NO_DEBUG addLog(LOG_LEVEL_INFO, F("WIFI : AP is set to 802.11n only")); -#endif +# endif } else if ((WIFI_PHY_MODE_11N == phyMode) && !candidate.bits.phy_11n) { phyMode = WIFI_PHY_MODE_11G; -#ifndef BUILD_NO_DEBUG +# ifndef BUILD_NO_DEBUG addLog(LOG_LEVEL_INFO, F("WIFI : AP is set to 802.11g only")); -#endif +# endif } -/* - } else { - bool useAlternate = WiFiEventData.connectionFailures > 10; - if (useAlternate) { - phyMode = (WIFI_PHY_MODE_11G == phyMode) ? WIFI_PHY_MODE_11N : WIFI_PHY_MODE_11G; - } -*/ + /* + } else { + bool useAlternate = WiFiEventData.connectionFailures > 10; + + if (useAlternate) { + phyMode = (WIFI_PHY_MODE_11G == phyMode) ? WIFI_PHY_MODE_11N : WIFI_PHY_MODE_11G; + } + */ } } else { // No need to perform a next attempt. From 0c50fb06dea691808860bb9db3df14b03c2ab555 Mon Sep 17 00:00:00 2001 From: TD-er Date: Wed, 24 Sep 2025 12:23:19 +0200 Subject: [PATCH 290/564] [MQTTDiscovery] Reduce mem alloc MQTT_DiscoveryPublishWithStatusAndSet --- src/src/Helpers/_CPlugin_Helper_mqtt.cpp | 108 +++++++++++++---------- src/src/Helpers/_CPlugin_Helper_mqtt.h | 8 +- 2 files changed, 67 insertions(+), 49 deletions(-) diff --git a/src/src/Helpers/_CPlugin_Helper_mqtt.cpp b/src/src/Helpers/_CPlugin_Helper_mqtt.cpp index a4f327bc1..7eed29264 100644 --- a/src/src/Helpers/_CPlugin_Helper_mqtt.cpp +++ b/src/src/Helpers/_CPlugin_Helper_mqtt.cpp @@ -1071,11 +1071,11 @@ bool MQTT_DiscoveryPublishWithStatusAndSet(taskIndex_t taskIndex, controllerIndex_t ControllerIndex, ControllerSettingsStruct& ControllerSettings, const __FlashStringHelper*componentClass, - String deviceClass, - String unitOfMeasure, + const String & deviceClass, + const String & unitOfMeasure, struct EventStruct *event, - const String deviceElement, - const String stateClass, + const String & deviceElement, + const String & stateClass, bool success, bool hasSet, bool hasIcon, @@ -1083,52 +1083,70 @@ bool MQTT_DiscoveryPublishWithStatusAndSet(taskIndex_t taskIndex, const String & elementId, bool sendTrigger) { if (!valueName.isEmpty()) { - const String withSet = hasSet ? F(",\"cmd_t\":\"~/set\"") : EMPTY_STRING; - const String schema = hasSet ? EMPTY_STRING : "\"schema\":\"basic\","; - const String devOrIcon = hasIcon ? F("ic") : F("dev_cla"); - const String withUoM = unitOfMeasure.isEmpty() ? EMPTY_STRING : - strformat(F(",\"unit_of_meas\":\"%s\""), unitOfMeasure.c_str()); - const String stateJson = stateClass.isEmpty() ? EMPTY_STRING : - strformat(F(",\"stat_cla\":\"%s\""), stateClass.c_str()); - const String taskName = makeHomeAssistantCompliantName(getTaskDeviceName(taskIndex)); - const String valName = makeHomeAssistantCompliantName(valueName); - const bool retainDsc = ControllerSettings.mqtt_retainDiscovery(); - const String discoveryTopic(ControllerSettings.MqttAutoDiscoveryTopic); - const String publishTopic(ControllerSettings.Publish); - const String discoveryConfig(parseStringKeepCase(ControllerSettings.MqttAutoDiscoveryConfig, 1, '|')); + // const String discoveryTopic(ControllerSettings.MqttAutoDiscoveryTopic); + // const String publishTopic(ControllerSettings.Publish); + + const String taskName = makeHomeAssistantCompliantName(getTaskDeviceName(taskIndex)); + const String valName = makeHomeAssistantCompliantName(valueName); const String uniqueId = elementName.isEmpty() ? MQTT_TaskValueUniqueName(taskName, valName) : strformat(F("%s_%s"), elementId.c_str(), valName.c_str()); - const String publish = MQTT_DiscoveryBuildValueTopic(publishTopic, - event, - taskValue, - componentClass, - uniqueId, - elementId, - valName); - const String discoveryUrl = MQTT_DiscoveryBuildValueTopic(discoveryTopic, - event, - taskValue, - componentClass, - uniqueId, - elementId, - valName); - const String discoveryMessage = strformat(F("{\"~\":\"%s\",\"name\":\"%s %s\",\"uniq_id\":\"%s\",%s" - "\"%s\":\"%s\"%s%s%s,\"stat_t\":\"~\"" - "%s}"), // deviceElement last - publish.c_str(), taskName.c_str(), valName.c_str(), uniqueId.c_str(), schema.c_str(), - devOrIcon.c_str(), deviceClass.c_str(), withUoM.c_str(), stateJson.c_str(), withSet.c_str(), - deviceElement.c_str()); - const String triggerMessage = strformat(F("{\"atype\":\"trigger\",\"t\":\"%s\"," - "\"p\":\"device_automation\"," - "\"type\":\"button_short_press\"," // FIXME ? - "\"stype\":\"switch_1\"" // FIXME ? - "%s}"), // deviceElement is used to pass in the TriggerState - publish.c_str(), deviceElement.c_str()); + String message; + { + const String publish = MQTT_DiscoveryBuildValueTopic(ControllerSettings.Publish, + event, + taskValue, + componentClass, + uniqueId, + elementId, + valName); + + if (sendTrigger) { + // triggerMessage + message = strformat(F("{\"atype\":\"trigger\",\"t\":\"%s\"," + "\"p\":\"device_automation\"," + "\"type\":\"button_short_press\"," // FIXME ? + "\"stype\":\"switch_1\"" // FIXME ? + "%s}"), // deviceElement is used to pass in the TriggerState + publish.c_str(), deviceElement.c_str()); + } else { + // discoveryMessage + const String withSet = hasSet ? F(",\"cmd_t\":\"~/set\"") : EMPTY_STRING; + const String schema = hasSet ? EMPTY_STRING : "\"schema\":\"basic\","; + const String devOrIcon = hasIcon ? F("ic") : F("dev_cla"); + const String withUoM = unitOfMeasure.isEmpty() ? EMPTY_STRING : + strformat(F(",\"unit_of_meas\":\"%s\""), unitOfMeasure.c_str()); + const String stateJson = stateClass.isEmpty() ? EMPTY_STRING : + strformat(F(",\"stat_cla\":\"%s\""), stateClass.c_str()); + + message = strformat(F("{\"~\":\"%s\",\"name\":\"%s %s\",\"uniq_id\":\"%s\",%s" + "\"%s\":\"%s\"%s%s%s,\"stat_t\":\"~\"" + "%s}"), // deviceElement last + publish.c_str(), taskName.c_str(), valName.c_str(), uniqueId.c_str(), schema.c_str(), + devOrIcon.c_str(), deviceClass.c_str(), withUoM.c_str(), stateJson.c_str(), withSet.c_str(), + deviceElement.c_str()); + } + } + + const bool retainDsc = ControllerSettings.mqtt_retainDiscovery(); + String topic; + { + const String discoveryUrl = MQTT_DiscoveryBuildValueTopic(ControllerSettings.MqttAutoDiscoveryTopic, + event, + taskValue, + componentClass, + uniqueId, + elementId, + valName); + const String discoveryConfig(parseStringKeepCase(ControllerSettings.MqttAutoDiscoveryConfig, 1, '|')); + topic = discoveryConfig.isEmpty() + ? concat(discoveryUrl, F("/config")) + : concat(discoveryUrl, discoveryConfig); + } return MQTT_DiscoveryPublish(ControllerIndex, - discoveryConfig.isEmpty() ? concat(discoveryUrl, F("/config")) : concat(discoveryUrl, discoveryConfig), - sendTrigger ? triggerMessage : discoveryMessage, + topic, + message, taskIndex, taskValue, retainDsc); diff --git a/src/src/Helpers/_CPlugin_Helper_mqtt.h b/src/src/Helpers/_CPlugin_Helper_mqtt.h index c636efa71..e118bad30 100644 --- a/src/src/Helpers/_CPlugin_Helper_mqtt.h +++ b/src/src/Helpers/_CPlugin_Helper_mqtt.h @@ -96,11 +96,11 @@ bool MQTT_DiscoveryPublishWithStatusAndSet(taskIndex_t taskIndex, controllerIndex_t ControllerIndex, ControllerSettingsStruct& ControllerSettings, const __FlashStringHelper*componentClass, - String deviceClass, - String unitOfMeasure, + const String & deviceClass, + const String & unitOfMeasure, struct EventStruct *event, - const String deviceElement, - const String stateClass, + const String & deviceElement, + const String & stateClass, bool success, bool hasSet, bool hasIcon, From b3be7a5a975ab34bfc3212b10cabb4a02cfb16b6 Mon Sep 17 00:00:00 2001 From: Ton Huisman Date: Wed, 24 Sep 2025 21:44:24 +0200 Subject: [PATCH 291/564] [MQTT] Reduce work/memory in background task, use xTaskDelay as required --- src/src/ESPEasyCore/Controller.cpp | 36 ++++++++++++++++-------------- src/src/Globals/MQTT.h | 1 + 2 files changed, 20 insertions(+), 17 deletions(-) diff --git a/src/src/ESPEasyCore/Controller.cpp b/src/src/ESPEasyCore/Controller.cpp index 2fdb3b788..d7af1f2a9 100644 --- a/src/src/ESPEasyCore/Controller.cpp +++ b/src/src/ESPEasyCore/Controller.cpp @@ -690,25 +690,12 @@ void MQTT_execute_connect_task(void *parameter) { MQTT_connect_request*MQTT_task_data = static_cast(parameter); - MakeControllerSettings(ControllerSettings); // -V522 - - if (!AllocatedControllerSettings()) { - #ifndef BUILD_MINIMAL_OTA - addLog(LOG_LEVEL_ERROR, F("MQTT : Cannot load Controller settings, out of RAM")); - #endif - MQTT_task_data->taskHandle = NULL; - vTaskDelete(MQTT_task_data->taskHandle); - return; - } - LoadControllerSettings(MQTT_task_data->ControllerIndex, *ControllerSettings); - - uint32_t timeout = ControllerSettings->MustCheckReply - ? WiFiEventData.getSuggestedTimeout(Settings.Protocol[MQTT_task_data->ControllerIndex], ControllerSettings->ClientTimeout) - : ControllerSettings->ClientTimeout; - uint8_t incr = 5; // Increment timeout between connection attempts 5 times by 100 msec + uint32_t timeout = MQTT_task_data->timeout; + uint8_t incr = 5; // Increment timeout between connection attempts 5 times by 100 msec while (!MQTTConnect_clientConnect(MQTT_task_data->ControllerIndex) && !MQTTclient.connected()) { - delay(timeout); // Use regular controller timeout also for delay between connection attempts (range 10..4000) + const TickType_t xDelay = timeout / portTICK_PERIOD_MS; + vTaskDelay(xDelay); // Use regular controller timeout also for delay between connection attempts (range 10..4000) if (incr > 0) { timeout += 100; // Increment next few (5) times with 100 msec incr--; @@ -787,11 +774,26 @@ bool MQTTConnectInBackground(controllerIndex_t controller_idx, bool reportOnly) MQTT_task_data.result = false; if (MQTTConnect_prepareClient(controller_idx)) { + MakeControllerSettings(ControllerSettings); // -V522 + + if (!AllocatedControllerSettings()) { + #ifndef BUILD_MINIMAL_OTA + addLog(LOG_LEVEL_ERROR, F("MQTT : Cannot load Controller settings, out of RAM")); + #endif + return false; + } + LoadControllerSettings(controller_idx, *ControllerSettings); + + const uint32_t timeout = ControllerSettings->MustCheckReply + ? WiFiEventData.getSuggestedTimeout(Settings.Protocol[controller_idx], ControllerSettings->ClientTimeout) + : ControllerSettings->ClientTimeout; + MQTT_task_data.status = MQTT_connect_status_e::Connecting; MQTT_task_data.logged = false; MQTT_task_data.ControllerIndex = controller_idx; MQTT_task_data.startTime = millis(); MQTT_task_data.loopTime = millis(); + MQTT_task_data.timeout = timeout; xTaskCreatePinnedToCore( MQTT_execute_connect_task, // Function that should be called diff --git a/src/src/Globals/MQTT.h b/src/src/Globals/MQTT.h index 7aa1a459d..debf9c7b0 100644 --- a/src/src/Globals/MQTT.h +++ b/src/src/Globals/MQTT.h @@ -32,6 +32,7 @@ struct MQTT_connect_request { uint32_t startTime{}; uint32_t loopTime{}; uint32_t endTime{}; + uint32_t timeout{}; bool result{}; bool logged{}; From a29a25a8e33a3d1de21aa0888ad4ca16d41d837b Mon Sep 17 00:00:00 2001 From: TD-er Date: Wed, 24 Sep 2025 23:49:23 +0200 Subject: [PATCH 292/564] [MQTT] Reduce work/memory in background task, use xTaskDelay as required --- src/src/ESPEasyCore/Controller.cpp | 218 ++++++++++++++++++----------- src/src/Globals/MQTT.h | 1 + 2 files changed, 134 insertions(+), 85 deletions(-) diff --git a/src/src/ESPEasyCore/Controller.cpp b/src/src/ESPEasyCore/Controller.cpp index 082932f1f..9c8f9000d 100644 --- a/src/src/ESPEasyCore/Controller.cpp +++ b/src/src/ESPEasyCore/Controller.cpp @@ -171,17 +171,7 @@ void MQTTDisconnect() updateMQTTclient_connected(); } -/*********************************************************************************************\ -* Connect to MQTT message broker -\*********************************************************************************************/ -bool MQTTConnect(controllerIndex_t controller_idx) -{ - if (MQTTclient_next_connect_attempt.isSet() && !MQTTclient_next_connect_attempt.timeoutReached(timermqtt_interval)) { - return false; - } - MQTTclient_next_connect_attempt.setNow(); - ++mqtt_reconnect_count; - +bool MQTTConnect_prepareClient(controllerIndex_t controller_idx) { MakeControllerSettings(ControllerSettings); // -V522 if (!AllocatedControllerSettings()) { @@ -424,43 +414,48 @@ bool MQTTConnect(controllerIndex_t controller_idx) } MQTTclient.setCallback(incoming_mqtt_callback); + if (MQTTclient_should_reconnect) { + addLog(LOG_LEVEL_ERROR, F("MQTT : Intentional reconnect")); + } + + return true; +} + +bool MQTTConnect_clientConnect(controllerIndex_t controller_idx) { + MakeControllerSettings(ControllerSettings); // -V522 + + if (!AllocatedControllerSettings()) { + #ifndef BUILD_MINIMAL_OTA + addLog(LOG_LEVEL_ERROR, F("MQTT : Cannot connect, out of RAM")); + #endif + return false; + } + LoadControllerSettings(controller_idx, *ControllerSettings); + + bool MQTTresult = false; + // MQTT needs a unique clientname to subscribe to broker const String clientid = getMQTTclientID(*ControllerSettings); const String LWTTopic = getLWT_topic(*ControllerSettings); const String LWTMessageDisconnect = getLWT_messageDisconnect(*ControllerSettings); - bool MQTTresult = false; const uint8_t willQos = 0; const bool willRetain = ControllerSettings->mqtt_willRetain() && ControllerSettings->mqtt_sendLWT(); - const bool cleanSession = ControllerSettings->mqtt_cleanSession(); // As suggested here: - - if (MQTTclient_should_reconnect) { - addLog(LOG_LEVEL_ERROR, F("MQTT : Intentional reconnect")); - } + // As suggested here: https://github.com/knolleary/pubsubclient/issues/458#issuecomment-493875150 + const bool cleanSession = ControllerSettings->mqtt_cleanSession(); + const bool hasCredentials = hasControllerCredentialsSet(controller_idx, *ControllerSettings); const uint64_t statisticsTimerStart(getMicros64()); - // https://github.com/knolleary/pubsubclient/issues/458#issuecomment-493875150 - if (hasControllerCredentialsSet(controller_idx, *ControllerSettings)) { - MQTTresult = + MQTTresult = MQTTclient.connect(clientid.c_str(), - getControllerUser(controller_idx, *ControllerSettings).c_str(), - getControllerPass(controller_idx, *ControllerSettings).c_str(), - ControllerSettings->mqtt_sendLWT() ? LWTTopic.c_str() : nullptr, - willQos, - willRetain, - ControllerSettings->mqtt_sendLWT() ? LWTMessageDisconnect.c_str() : nullptr, - cleanSession); - } else { - MQTTresult = MQTTclient.connect(clientid.c_str(), - nullptr, - nullptr, - ControllerSettings->mqtt_sendLWT() ? LWTTopic.c_str() : nullptr, - willQos, - willRetain, - ControllerSettings->mqtt_sendLWT() ? LWTMessageDisconnect.c_str() : nullptr, - cleanSession); - } + hasCredentials ? getControllerUser(controller_idx, *ControllerSettings).c_str() : nullptr, + hasCredentials ? getControllerPass(controller_idx, *ControllerSettings).c_str() : nullptr, + ControllerSettings->mqtt_sendLWT() ? LWTTopic.c_str() : nullptr, + willQos, + willRetain, + ControllerSettings->mqtt_sendLWT() ? LWTMessageDisconnect.c_str() : nullptr, + cleanSession); delay(0); count_connection_results( @@ -469,8 +464,28 @@ bool MQTTConnect(controllerIndex_t controller_idx) Settings.Protocol[controller_idx], statisticsTimerStart); + return MQTTresult; +} + +bool MQTTConnect_wrapUpConnect(controllerIndex_t controller_idx, bool MQTTresult) { + MakeControllerSettings(ControllerSettings); // -V522 + + if (!AllocatedControllerSettings()) { + #ifndef BUILD_MINIMAL_OTA + addLog(LOG_LEVEL_ERROR, F("MQTT : Cannot connect, out of RAM")); + #endif + return false; + } + LoadControllerSettings(controller_idx, *ControllerSettings); + + const String clientid = getMQTTclientID(*ControllerSettings); + const String LWTTopic = getLWT_topic(*ControllerSettings); + const bool willRetain = ControllerSettings->mqtt_willRetain() && ControllerSettings->mqtt_sendLWT(); + # if FEATURE_MQTT_TLS + const TLS_types TLS_type = ControllerSettings->TLStype(); + if (mqtt_tls != nullptr) { # ifdef ESP32 @@ -614,6 +629,26 @@ bool MQTTConnect(controllerIndex_t controller_idx) return true; } +/*********************************************************************************************\ +* Connect to MQTT message broker +\*********************************************************************************************/ +bool MQTTConnect(controllerIndex_t controller_idx) +{ + if (MQTTclient_next_connect_attempt.isSet() && !MQTTclient_next_connect_attempt.timeoutReached(timermqtt_interval)) { + return false; + } + MQTTclient_next_connect_attempt.setNow(); + ++mqtt_reconnect_count; + + if (!MQTTConnect_prepareClient(controller_idx)) { + return false; + } + + bool MQTTresult = MQTTConnect_clientConnect(controller_idx); + + return MQTTConnect_wrapUpConnect(controller_idx, MQTTresult); +} + void MQTTparseSystemVariablesAndSubscribe(String subscribeTo) { if (subscribeTo.isEmpty()) { return; } parseSystemVariables(subscribeTo, false); @@ -623,7 +658,7 @@ void MQTTparseSystemVariablesAndSubscribe(String subscribeTo) { MQTTclient.subscribe(subscribeTo.c_str()); if (loglevelActiveFor(LOG_LEVEL_INFO)) { - addLogMove(LOG_LEVEL_INFO, concat(F("Subscribed to: "), subscribeTo)); + addLogMove(LOG_LEVEL_INFO, concat(F("MQTT : Subscribed to: "), subscribeTo)); } } } @@ -657,39 +692,22 @@ void MQTT_execute_connect_task(void *parameter) { MQTT_connect_request*MQTT_task_data = static_cast(parameter); - MakeControllerSettings(ControllerSettings); // -V522 - - if (!AllocatedControllerSettings()) { - #ifndef BUILD_MINIMAL_OTA - addLog(LOG_LEVEL_ERROR, F("MQTT : Cannot load Controller settings, out of RAM")); - #endif - MQTT_task_data->taskHandle = NULL; - vTaskDelete(MQTT_task_data->taskHandle); - return; - } - LoadControllerSettings(MQTT_task_data->ControllerIndex, *ControllerSettings); - - uint32_t timeout = ControllerSettings->MustCheckReply - ? ControllerSettings->getSuggestedTimeout(Settings.Protocol[MQTT_task_data->ControllerIndex]) - : ControllerSettings->ClientTimeout; - uint8_t incr = 5; // Increment timeout between connection attempts 5 times by 100 msec + uint32_t timeout = MQTT_task_data->timeout; + uint8_t incr = 5; // Increment timeout between connection attempts 5 times by 100 msec while (ESPEasy::net::NetworkConnected() && - !MQTTConnect(MQTT_task_data->ControllerIndex) - # if FEATURE_MQTT_TLS - && mqtt_tls_last_errorstr.isEmpty() - # endif // if FEATURE_MQTT_TLS - && !MQTTclient.connected() - ) { - delay(timeout); // Use regular controller timeout also for delay between connection attempts (range 10..4000) - if (incr > 0) { - timeout += 100; // Increment next few (5) times with 100 msec - incr--; - } - if (timePassedSince(MQTT_task_data->startTime) > 120000) { // Quit after 120 seconds - break; - } - } + !MQTTConnect_clientConnect(MQTT_task_data->ControllerIndex) && + !MQTTclient.connected()) { + const TickType_t xDelay = timeout / portTICK_PERIOD_MS; + vTaskDelay(xDelay); // Use regular controller timeout also for delay between connection attempts (range 10..4000) + if (incr > 0) { + timeout += 100; // Increment next few (5) times with 100 msec + incr--; + } + if (timePassedSince(MQTT_task_data->startTime) > 120000) { // Quit after 120 seconds + break; + } + } MQTT_task_data->result = MQTTclient.connected(); MQTT_task_data->status = MQTT_task_data->result ? MQTT_connect_status_e::Connected @@ -703,14 +721,18 @@ bool MQTTConnectInBackground(controllerIndex_t controller_idx, bool reportOnly) if (!Settings.MQTTConnectInBackground()) { return false; } if ((MQTT_task_data.status == MQTT_connect_status_e::Connected) || (MQTT_task_data.status == MQTT_connect_status_e::Failure)) { + MQTT_task_data.status = MQTT_connect_status_e::Ready; // Set status first to avoid re-entry + + const bool result = MQTTConnect_wrapUpConnect(MQTT_task_data.ControllerIndex, MQTT_task_data.result); + if (loglevelActiveFor(LOG_LEVEL_INFO)) { addLog(LOG_LEVEL_INFO, strformat(F("MQTT : Background Connect request %s, took %d msec"), FsP(MQTT_task_data.result ? F("success") : F("FAILED")), MQTT_task_data.endTime - MQTT_task_data.startTime )); } - MQTT_task_data.status = MQTT_connect_status_e::Ready; - return MQTT_task_data.result; + + return result && MQTT_task_data.result; } if ((MQTT_task_data.status == MQTT_connect_status_e::Ready) && MQTTclient.connected()) { @@ -744,25 +766,51 @@ bool MQTTConnectInBackground(controllerIndex_t controller_idx, bool reportOnly) } if (!reportOnly && (MQTT_task_data.status == MQTT_connect_status_e::Disconnected) && (controller_idx < CONTROLLER_MAX)) { + if (MQTTclient_next_connect_attempt.isSet() && !MQTTclient_next_connect_attempt.timeoutReached(timermqtt_interval)) { + return false; + } + MQTTclient_next_connect_attempt.setNow(); + ++mqtt_reconnect_count; + if (loglevelActiveFor(LOG_LEVEL_INFO)) { addLog(LOG_LEVEL_INFO, strformat(F("MQTT : Start background connect for controller %d"), controller_idx + 1)); } - MQTT_task_data.status = MQTT_connect_status_e::Connecting; MQTT_task_data.result = false; - MQTT_task_data.logged = false; - MQTT_task_data.ControllerIndex = controller_idx; - MQTT_task_data.startTime = millis(); - MQTT_task_data.loopTime = millis(); - xTaskCreatePinnedToCore( - MQTT_execute_connect_task, // Function that should be called - "MQTTConnect()", // Name of the task (for debugging) - 8192, // Stack size (bytes) - &MQTT_task_data, // Parameter to pass - 1, // Task priority - &MQTT_task_data.taskHandle, // Task handle - xPortGetCoreID() // Core you want to run the task on (0 or 1) - ); + if (MQTTConnect_prepareClient(controller_idx)) { + MakeControllerSettings(ControllerSettings); // -V522 + + if (!AllocatedControllerSettings()) { + #ifndef BUILD_MINIMAL_OTA + addLog(LOG_LEVEL_ERROR, F("MQTT : Cannot load Controller settings, out of RAM")); + #endif + return false; + } + LoadControllerSettings(controller_idx, *ControllerSettings); + + uint32_t timeout = ControllerSettings->MustCheckReply + ? ControllerSettings->getSuggestedTimeout(Settings.Protocol[MQTT_task_data.ControllerIndex]) + : ControllerSettings->ClientTimeout; + + MQTT_task_data.status = MQTT_connect_status_e::Connecting; + MQTT_task_data.logged = false; + MQTT_task_data.ControllerIndex = controller_idx; + MQTT_task_data.startTime = millis(); + MQTT_task_data.loopTime = millis(); + MQTT_task_data.timeout = timeout; + + xTaskCreatePinnedToCore( + MQTT_execute_connect_task, // Function that should be called + "MQTTClient.connect()", // Name of the task (for debugging) + 8192, // Stack size (bytes) + &MQTT_task_data, // Parameter to pass + 1, // Task priority + &MQTT_task_data.taskHandle, // Task handle + xPortGetCoreID() // Core you want to run the task on (0 or 1) + ); + } else { + MQTT_task_data.status = MQTT_connect_status_e::Failure; + } } return false; } diff --git a/src/src/Globals/MQTT.h b/src/src/Globals/MQTT.h index 31ebcd801..fab3ea2a7 100644 --- a/src/src/Globals/MQTT.h +++ b/src/src/Globals/MQTT.h @@ -33,6 +33,7 @@ struct MQTT_connect_request { uint32_t startTime{}; uint32_t loopTime{}; uint32_t endTime{}; + uint32_t timeout{}; bool result{}; bool logged{}; From 52e852952a7cc0e61e9982a5ccaa532ee420912b Mon Sep 17 00:00:00 2001 From: TD-er Date: Thu, 25 Sep 2025 16:58:30 +0200 Subject: [PATCH 293/564] [WiFi AP] Fix switching between NAPT and Captive Portal --- src/Custom-sample.h | 2 +- src/ESPEasy/net/_NW002_WiFi_AP.cpp | 42 ++++++++- .../net/wifi/ESPEasyWiFi_state_machine.cpp | 2 + .../net/wifi/ESPEasyWifi_abstracted.cpp | 92 ++++++++++++------- src/src/CustomBuild/ESPEasyDefaults.h | 4 +- .../DataStructs/FactoryDefault_WiFi_NVS.cpp | 4 +- src/src/DataStructs/FactoryDefault_WiFi_NVS.h | 2 +- src/src/DataStructs/NodesHandler.cpp | 4 +- src/src/DataStructs/SettingsStruct.h | 10 +- src/src/DataStructs_templ/SettingsStruct.cpp | 6 +- src/src/WebServer/404.cpp | 2 +- src/src/WebServer/ConfigPage.cpp | 8 +- src/src/WebServer/RootPage.cpp | 4 +- 13 files changed, 120 insertions(+), 62 deletions(-) diff --git a/src/Custom-sample.h b/src/Custom-sample.h index 26d1f427d..e87ab4e61 100644 --- a/src/Custom-sample.h +++ b/src/Custom-sample.h @@ -77,7 +77,7 @@ // See: https://github.com/letscontrolit/ESPEasy/issues/2724 #define DEFAULT_SEND_TO_HTTP_ACK false // Wait for ack with SendToHttp command. -#define DEFAULT_AP_DONT_FORCE_SETUP false // Allow optional usage of Sensor without WIFI avaiable // When set you can use the Sensor in AP-Mode without beeing forced to /setup +#define DEFAULT_AP_FORCE_SETUP true // When set, start Captive Portal to redirect user to web interface when connecting to AP #define DEFAULT_DONT_ALLOW_START_AP false // Usually the AP will be started when no WiFi is defined, or the defined one cannot be found. This flag may prevent it. // --- Default Controller ------------------------------------------------------------------------------ diff --git a/src/ESPEasy/net/_NW002_WiFi_AP.cpp b/src/ESPEasy/net/_NW002_WiFi_AP.cpp index 3894435b1..06a0eae5a 100644 --- a/src/ESPEasy/net/_NW002_WiFi_AP.cpp +++ b/src/ESPEasy/net/_NW002_WiFi_AP.cpp @@ -213,8 +213,10 @@ bool NWPlugin_002(NWPlugin::Function function, EventStruct *event, String& strin // Access point password. copyFormPassword(F("apkey"), SecuritySettings.WifiAPKey, sizeof(SecuritySettings.WifiAPKey)); - // When set you can use the Sensor in AP-Mode without being forced to /setup - Settings.ApDontForceSetup(isFormItemChecked(F("ApDontForceSetup"))); + Settings.WiFiAP_channel = getFormItemInt(F("apchannel")); + + // When set, user will be redirected to /setup or root page when connecting to this AP + Settings.ApCaptivePortal(isFormItemChecked(F("captiveportal"))); // Usually the AP will be started when no WiFi is defined, or the defined one cannot be found. This flag may prevent it. Settings.DoNotStartAP(isFormItemChecked(F("DoNotStartAP"))); @@ -232,8 +234,39 @@ bool NWPlugin_002(NWPlugin::Function function, EventStruct *event, String& strin addFormPasswordBox(F("WPA AP Mode Key"), F("apkey"), SecuritySettings.WifiAPKey, 63); addFormNote(F("WPA Key must be at least 8 characters long")); - addFormCheckBox(F("Don't force /setup in AP-Mode"), F("ApDontForceSetup"), Settings.ApDontForceSetup()); - addFormNote(F("When set you can use the Sensor in AP-Mode without being forced to /setup. /setup can still be called.")); + + { +# if CONFIG_SOC_WIFI_SUPPORT_5G + + // See wifi_5g_channel_bit_t for all supported channels + const int wifiChannels[] = + { 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14 // 2.4 GHz + , 36, 40, 44, 48 // 5 GHz U-NII-1 + , 52, 56, 60, 64, 68 // 5 GHz U-NII-2A + // ,72, 76, 80, 84, 88 /* , 92 */ // 5 GHz U-NII-2B + , /* 96,*/ 100, 104, 108, 112, 116, 120, 124, 128, 132, 136, 140 // 5 GHz U-NII-2C + , 144 // 5 GHz U-NII-2C/3 + , 149, 153, 157, 161, 165 // 5 GHz U-NII-3 + , 169 // 5 GHz U-NII-3/4 + , 173, 177 // 5 GHz U-NII-4 + }; + constexpr int nrwifiChannels = NR_ELEMENTS(wifiChannels); + const FormSelectorOptions selector( + nrwifiChannels, + wifiChannels); + selector.addFormSelector( + F("Wifi AP channel"), F("apchannel"), + Settings.WiFiAP_channel); +# else + addFormNumericBox(F("Wifi AP channel"), F("apchannel"), Settings.WiFiAP_channel, 1, 14); +# endif // if CONFIG_SOC_WIFI_SUPPORT_5G + + addFormNote(F("WiFi channel to be used when only WiFi AP is active")); + } + + + addFormCheckBox(F("Force /setup in AP-Mode"), F("captiveportal"), Settings.ApCaptivePortal()); + addFormNote(F("When set, user will be redirected to /setup or root page when connecting to this AP. /setup can still be called when disabled.")); addFormCheckBox(F("Do Not Start AP"), F("DoNotStartAP"), Settings.DoNotStartAP()); # if FEATURE_ETHERNET @@ -243,6 +276,7 @@ bool NWPlugin_002(NWPlugin::Function function, EventStruct *event, String& strin # endif // if FEATURE_ETHERNET # ifdef ESP32 addFormCheckBox(F("Enable NAPT"), F("napt"), Settings.WiFi_AP_enable_NAPT()); + addFormNote(F("NAPT will have no effect when 'force /setup' is enabled")); # endif break; diff --git a/src/ESPEasy/net/wifi/ESPEasyWiFi_state_machine.cpp b/src/ESPEasy/net/wifi/ESPEasyWiFi_state_machine.cpp index 1987cdfaa..a66ea09c9 100644 --- a/src/ESPEasy/net/wifi/ESPEasyWiFi_state_machine.cpp +++ b/src/ESPEasy/net/wifi/ESPEasyWiFi_state_machine.cpp @@ -532,6 +532,7 @@ bool ESPEasyWiFi_t::connectSTA() // WiFi.disconnect(false, true); # ifdef ESP32 WiFi.setScanMethod(WIFI_ALL_CHANNEL_SCAN); + WiFi.setSortMethod(WIFI_CONNECT_AP_BY_SIGNAL); # endif delay(100); WiFi.begin(candidate.ssid.c_str(), key.c_str(), candidate.channel, candidate.bssid.mac); @@ -552,6 +553,7 @@ bool ESPEasyWiFi_t::connectSTA() } else { # ifdef ESP32 WiFi.setScanMethod(WIFI_ALL_CHANNEL_SCAN); + WiFi.setSortMethod(WIFI_CONNECT_AP_BY_SIGNAL); # endif WiFi.begin(candidate.ssid.c_str(), key.c_str()); } diff --git a/src/ESPEasy/net/wifi/ESPEasyWifi_abstracted.cpp b/src/ESPEasy/net/wifi/ESPEasyWifi_abstracted.cpp index dd5ef4b27..b1fb94db3 100644 --- a/src/ESPEasy/net/wifi/ESPEasyWifi_abstracted.cpp +++ b/src/ESPEasy/net/wifi/ESPEasyWifi_abstracted.cpp @@ -57,7 +57,7 @@ bool doSetSTA_AP(bool sta_enable, bool ap_enable) # else if (ap_enable) { - return doSetWifiMode(sta_enable ? WIFI_AP_STA : WIFI_AP); + return doSetWifiMode(sta_enable ? WIFI_AP_STA : WIFI_AP); } return doSetWifiMode(sta_enable ? WIFI_STA : WIFI_OFF); # endif // ifndef SOC_WIFI_SUPPORTED @@ -77,7 +77,8 @@ bool doWiFiScanAllowed() { void doSetAPinternal(bool enable) { if (enable) { - if (!Settings.getNetworkEnabled(NETWORK_INDEX_WIFI_AP)) return; + if (!Settings.getNetworkEnabled(NETWORK_INDEX_WIFI_AP)) { return; } + // create and store unique AP SSID/PW to prevent ESP from starting AP mode with default SSID and No password! // setup ssid for AP Mode when needed String softAPSSID = NetworkCreateRFCCompliantHostname(); @@ -85,14 +86,24 @@ void doSetAPinternal(bool enable) IPAddress subnet(DEFAULT_AP_SUBNET); # ifdef ESP32 IPAddress dhcp_lease_start = (uint32_t)0; -// IPAddress dns(DEFAULT_AP_DNS); - if (!WiFi.softAPConfig(apIP, apIP, subnet, dhcp_lease_start/*, dns*/)) { + IPAddress dns(DEFAULT_AP_DNS); + + if (Settings.ApCaptivePortal()) { + dns = apIP; + } else { + if (WiFi.STA.dnsIP()) { + dns = WiFi.STA.dnsIP(); + } + } + + if (!WiFi.softAPConfig(apIP, apIP, subnet, dhcp_lease_start, dns)) { addLog(LOG_LEVEL_ERROR, strformat( - ("WIFI : [AP] softAPConfig failed! IP: %s, GW: %s, SN: %s"), + ("WIFI : [AP] softAPConfig failed! IP: %s, GW: %s, SN: %s DNS: %s"), apIP.toString().c_str(), apIP.toString().c_str(), - subnet.toString().c_str()) + subnet.toString().c_str(), + dns.toString().c_str()) ); } WiFi.AP.bandwidth(WIFI_BW_HT20); @@ -111,6 +122,10 @@ void doSetAPinternal(bool enable) int channel = 1; + if (Settings.WiFiAP_channel) { + channel = Settings.WiFiAP_channel; + } + if (WifiIsSTA(WiFi.getMode()) && WiFiConnected()) { channel = WiFi.channel(); } @@ -119,7 +134,8 @@ void doSetAPinternal(bool enable) if (WiFi.softAP(softAPSSID.c_str(), pwd.c_str(), channel)) { auto data = getWiFi_AP_NWPluginData_static_runtime(); - if (data) data->mark_start(); + + if (data) { data->mark_start(); } if (loglevelActiveFor(LOG_LEVEL_INFO)) { addLogMove(LOG_LEVEL_INFO, strformat( @@ -136,31 +152,36 @@ void doSetAPinternal(bool enable) formatIP(apIP).c_str())); } } - # ifdef ESP32 - # if ESP_IDF_VERSION >= ESP_IDF_VERSION_VAL(5, 4, 2) - if (WiFi.AP.enableDhcpCaptivePortal()) { - addLog(LOG_LEVEL_INFO, F("WIFI : AP Captive Portal enabled")); - } - else { - addLog(LOG_LEVEL_ERROR, F("WIFI : Failed to enable AP Captive Portal")); - } - # endif // if ESP_IDF_VERSION >= ESP_IDF_VERSION_VAL(5, 4, 2) + if (Settings.ApCaptivePortal()) { +# ifdef ESP32 +# if ESP_IDF_VERSION >= ESP_IDF_VERSION_VAL(5, 4, 2) -# if FEATURE_DNS_SERVER - if (!dnsServerActive) { - dnsServerActive = true; - dnsServer.start(); - } -#endif -#else -# if FEATURE_DNS_SERVER - if (!dnsServerActive) { - dnsServerActive = true; - dnsServer.start(DNS_PORT, "*", WiFi.softAPIP()); - } -#endif + if (WiFi.AP.enableDhcpCaptivePortal()) { + addLog(LOG_LEVEL_INFO, F("WIFI : AP Captive Portal enabled")); + } + else { + addLog(LOG_LEVEL_ERROR, F("WIFI : Failed to enable AP Captive Portal")); + } +# endif // if ESP_IDF_VERSION >= ESP_IDF_VERSION_VAL(5, 4, 2) + +# if FEATURE_DNS_SERVER + + if (!dnsServerActive) { + dnsServerActive = true; + dnsServer.start(); + } +# endif // if FEATURE_DNS_SERVER +# else // ifdef ESP32 +# if FEATURE_DNS_SERVER + + if (!dnsServerActive) { + dnsServerActive = true; + dnsServer.start(DNS_PORT, "*", WiFi.softAPIP()); + } +# endif // if FEATURE_DNS_SERVER # endif // ifdef ESP32 + } } else { # if FEATURE_DNS_SERVER @@ -170,7 +191,8 @@ void doSetAPinternal(bool enable) } # endif // if FEATURE_DNS_SERVER auto data = getWiFi_AP_NWPluginData_static_runtime(); - if (data) data->mark_stop(); + + if (data) { data->mark_stop(); } doSetAP(false); } @@ -242,12 +264,12 @@ void doSetWiFiTXpower(float dBm, float rssi) { doSetWiFiTXpower(dBm); -// if (WiFiEventData.wifi_TX_pwr < dBm) { - // Will increase the TX power, give power supply of the unit some rest -// delay(1); - //} + // if (WiFiEventData.wifi_TX_pwr < dBm) { + // Will increase the TX power, give power supply of the unit some rest + // delay(1); + // } -// WiFiEventData.wifi_TX_pwr = dBm; + // WiFiEventData.wifi_TX_pwr = dBm; delay(0); diff --git a/src/src/CustomBuild/ESPEasyDefaults.h b/src/src/CustomBuild/ESPEasyDefaults.h index 90cc38e22..de3a7e756 100644 --- a/src/src/CustomBuild/ESPEasyDefaults.h +++ b/src/src/CustomBuild/ESPEasyDefaults.h @@ -133,8 +133,8 @@ #define DEFAULT_SEND_TO_HTTP_ACK false // Wait for ack with SendToHttp command. #endif -#ifndef DEFAULT_AP_DONT_FORCE_SETUP -#define DEFAULT_AP_DONT_FORCE_SETUP false // Allow optional usage of Sensor without WIFI avaiable // When set you can use the Sensor in AP-Mode without beeing forced to /setup +#ifndef DEFAULT_AP_FORCE_SETUP +#define DEFAULT_AP_FORCE_SETUP true // When set, start Captive Portal to redirect user to web interface when connecting to AP #endif #ifndef DEFAULT_DONT_ALLOW_START_AP diff --git a/src/src/DataStructs/FactoryDefault_WiFi_NVS.cpp b/src/src/DataStructs/FactoryDefault_WiFi_NVS.cpp index 8cc486e54..623a1b533 100644 --- a/src/src/DataStructs/FactoryDefault_WiFi_NVS.cpp +++ b/src/src/DataStructs/FactoryDefault_WiFi_NVS.cpp @@ -17,7 +17,7 @@ void FactoryDefault_WiFi_NVS::fromSettings() { bits.IncludeHiddenSSID = Settings.IncludeHiddenSSID(); - bits.ApDontForceSetup = Settings.ApDontForceSetup(); + bits.ApCaptivePortal_inv = Settings.ApCaptivePortal(); bits.DoNotStartAP = Settings.DoNotStartAP(); bits.ForceWiFi_bg_mode = Settings.ForceWiFi_bg_mode(); bits.WiFiRestart_connection_lost = Settings.WiFiRestart_connection_lost(); @@ -34,7 +34,7 @@ void FactoryDefault_WiFi_NVS::fromSettings() { void FactoryDefault_WiFi_NVS::applyToSettings() const { Settings.IncludeHiddenSSID(bits.IncludeHiddenSSID); - Settings.ApDontForceSetup(bits.ApDontForceSetup); + Settings.ApCaptivePortal(bits.ApCaptivePortal_inv); Settings.DoNotStartAP(bits.DoNotStartAP); Settings.ForceWiFi_bg_mode(bits.ForceWiFi_bg_mode); Settings.WiFiRestart_connection_lost(bits.WiFiRestart_connection_lost); diff --git a/src/src/DataStructs/FactoryDefault_WiFi_NVS.h b/src/src/DataStructs/FactoryDefault_WiFi_NVS.h index e3638b084..a4af361c6 100644 --- a/src/src/DataStructs/FactoryDefault_WiFi_NVS.h +++ b/src/src/DataStructs/FactoryDefault_WiFi_NVS.h @@ -29,7 +29,7 @@ private: union { struct { uint64_t IncludeHiddenSSID : 1; - uint64_t ApDontForceSetup : 1; + uint64_t ApCaptivePortal_inv : 1; // Was ApDontForceSetup, so store inverted to remain compatible with existing settings uint64_t DoNotStartAP : 1; uint64_t ForceWiFi_bg_mode : 1; uint64_t WiFiRestart_connection_lost : 1; diff --git a/src/src/DataStructs/NodesHandler.cpp b/src/src/DataStructs/NodesHandler.cpp index 0e92cbecf..3914ad0f8 100644 --- a/src/src/DataStructs/NodesHandler.cpp +++ b/src/src/DataStructs/NodesHandler.cpp @@ -629,8 +629,8 @@ uint8_t NodesHandler::getESPEasyNOW_channel() const if (active_network_medium == ESPEasy::net::NetworkMedium_t::WIFI && ESPEasy::net::NetworkConnected()) { return WiFi.channel(); } - if (Settings.ForceESPEasyNOWchannel > 0) { - return Settings.ForceESPEasyNOWchannel; + if (Settings.WiFiAP_channel > 0) { + return Settings.WiFiAP_channel; } if (isEndpoint()) { if (active_network_medium == ESPEasy::net::NetworkMedium_t::WIFI) { diff --git a/src/src/DataStructs/SettingsStruct.h b/src/src/DataStructs/SettingsStruct.h index 39dd70b6c..4c57018a4 100644 --- a/src/src/DataStructs/SettingsStruct.h +++ b/src/src/DataStructs/SettingsStruct.h @@ -135,9 +135,9 @@ class SettingsStruct_tmpl bool UseMaxTXpowerForSending() const { return VariousBits_1.UseMaxTXpowerForSending; } void UseMaxTXpowerForSending(bool value) { VariousBits_1.UseMaxTXpowerForSending = value; } - // When set you can use the Sensor in AP-Mode without beeing forced to /setup - bool ApDontForceSetup() const { return VariousBits_1.ApDontForceSetup; } - void ApDontForceSetup(bool value) { VariousBits_1.ApDontForceSetup = value; } + // When set, user will be redirected to /setup or root page when connecting to this AP + bool ApCaptivePortal() const { return !VariousBits_1.ApCaptivePortal; } + void ApCaptivePortal(bool value) { VariousBits_1.ApCaptivePortal = !value; } // When outputting JSON bools use quoted values (on, backward compatible) or use official JSON true/false unquoted bool JSONBoolWithoutQuotes() const { return VariousBits_1.JSONBoolWithoutQuotes; } @@ -583,7 +583,7 @@ public: uint32_t UseESPEasyNow : 1; // Bit 11 uint32_t IncludeHiddenSSID : 1; // Bit 12 uint32_t UseMaxTXpowerForSending : 1; // Bit 13 - uint32_t ApDontForceSetup : 1; // Bit 14 + uint32_t ApCaptivePortal : 1; // Bit 14 Inverted uint32_t unused_15 : 1; // Bit 15 was used by PeriodicalScanWiFi uint32_t JSONBoolWithoutQuotes : 1; // Bit 16 uint32_t DoNotStartAP : 1; // Bit 17 @@ -645,7 +645,7 @@ public: int8_t SPI_SCLK_pin = -1; int8_t SPI_MISO_pin = -1; int8_t SPI_MOSI_pin = -1; - uint8_t ForceESPEasyNOWchannel = 0; + uint8_t WiFiAP_channel = 0; // Do not rename or move this checksum. // Checksum calculation will work "around" this diff --git a/src/src/DataStructs_templ/SettingsStruct.cpp b/src/src/DataStructs_templ/SettingsStruct.cpp index 1fb487f57..e865cc819 100644 --- a/src/src/DataStructs_templ/SettingsStruct.cpp +++ b/src/src/DataStructs_templ/SettingsStruct.cpp @@ -180,12 +180,12 @@ void SettingsStruct_tmpl::UseMaxTXpowerForSending(bool value) { } template -bool SettingsStruct_tmpl::ApDontForceSetup() const { +bool SettingsStruct_tmpl::ApCaptivePortal() const { return bitRead(VariousBits1, 14); } template -void SettingsStruct_tmpl::ApDontForceSetup(bool value) { +void SettingsStruct_tmpl::ApCaptivePortal(bool value) { bitWrite(VariousBits1, 14, value); } @@ -744,7 +744,7 @@ void SettingsStruct_tmpl::clearMisc() { #else UseESPEasyNow(false); #endif - ApDontForceSetup(DEFAULT_AP_DONT_FORCE_SETUP); + ApCaptivePortal(DEFAULT_AP_FORCE_SETUP); DoNotStartAP(DEFAULT_DONT_ALLOW_START_AP); } diff --git a/src/src/WebServer/404.cpp b/src/src/WebServer/404.cpp index f1dae65fc..96195bd5a 100644 --- a/src/src/WebServer/404.cpp +++ b/src/src/WebServer/404.cpp @@ -30,7 +30,7 @@ void handleNotFound() { // if Wifi setup, launch setup wizard if AP_DONT_FORCE_SETUP is not set. if (//WiFiEventData.wifiSetup && - !Settings.ApDontForceSetup()) + Settings.ApCaptivePortal()) { web_server.send_P(200, (PGM_P)F("text/html"), (PGM_P)F("")); return; diff --git a/src/src/WebServer/ConfigPage.cpp b/src/src/WebServer/ConfigPage.cpp index 8f2fa3fc8..eb46a2bab 100644 --- a/src/src/WebServer/ConfigPage.cpp +++ b/src/src/WebServer/ConfigPage.cpp @@ -93,8 +93,8 @@ void handle_config() { // Access point password. copyFormPassword(F("apkey"), SecuritySettings.WifiAPKey, sizeof(SecuritySettings.WifiAPKey)); - // When set you can use the Sensor in AP-Mode without being forced to /setup - Settings.ApDontForceSetup(isFormItemChecked(F("ApDontForceSetup"))); + // When set, user will be redirected to /setup or root page when connecting to this AP + Settings.ApCaptivePortal(isFormItemChecked(F("captiveportal"))); // Usually the AP will be started when no WiFi is defined, or the defined one cannot be found. This flag may prevent it. Settings.DoNotStartAP(isFormItemChecked(F("DoNotStartAP"))); @@ -186,8 +186,8 @@ void handle_config() { addFormPasswordBox(F("WPA AP Mode Key"), F("apkey"), SecuritySettings.WifiAPKey, 63); addFormNote(F("WPA Key must be at least 8 characters long")); - addFormCheckBox(F("Don't force /setup in AP-Mode"), F("ApDontForceSetup"), Settings.ApDontForceSetup()); - addFormNote(F("When set you can use the Sensor in AP-Mode without being forced to /setup. /setup can still be called.")); + addFormCheckBox(F("Force /setup in AP-Mode"), F("captiveportal"), Settings.ApCaptivePortal()); + addFormNote(F("When set, user will be redirected to /setup or root page when connecting to this AP. /setup can still be called when disabled")); addFormCheckBox(F("Do Not Start AP"), F("DoNotStartAP"), Settings.DoNotStartAP()); #if FEATURE_ETHERNET diff --git a/src/src/WebServer/RootPage.cpp b/src/src/WebServer/RootPage.cpp index 3abea0463..06878a451 100644 --- a/src/src/WebServer/RootPage.cpp +++ b/src/src/WebServer/RootPage.cpp @@ -71,9 +71,9 @@ void handle_root() { return; } - // if Wifi setup, launch setup wizard if AP_DONT_FORCE_SETUP is not set. + // if Wifi setup, launch setup wizard if AP_FORCE_SETUP is set. if (!ESPEasy::net::NetworkConnected() && - !Settings.ApDontForceSetup()) + Settings.ApCaptivePortal()) { web_server.send_P(200, (PGM_P)F("text/html"), (PGM_P)F("")); return; From 7e9a773af327c045b498e07bdf2af3301cc64490 Mon Sep 17 00:00:00 2001 From: TD-er Date: Thu, 25 Sep 2025 16:58:54 +0200 Subject: [PATCH 294/564] [Build] Reduce bin size for ESP32 collection builds --- src/src/CustomBuild/define_plugin_sets.h | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/src/src/CustomBuild/define_plugin_sets.h b/src/src/CustomBuild/define_plugin_sets.h index 6509a6fd6..03c8cf3e8 100644 --- a/src/src/CustomBuild/define_plugin_sets.h +++ b/src/src/CustomBuild/define_plugin_sets.h @@ -907,10 +907,22 @@ To create/register a plugin, you have to : #endif */ +// Reduce build size for Collection builds #if defined(PLUGIN_SET_COLLECTION_A_ESP32) || defined(PLUGIN_SET_COLLECTION_B_ESP32) || defined(PLUGIN_SET_COLLECTION_C_ESP32) || defined(PLUGIN_SET_COLLECTION_D_ESP32) || defined(PLUGIN_SET_COLLECTION_E_ESP32) || defined(PLUGIN_SET_COLLECTION_F_ESP32) || defined(PLUGIN_SET_COLLECTION_G_ESP32) # ifndef BUILD_NO_DEBUG # define BUILD_NO_DEBUG # endif +# ifdef FEATURE_NETWORK_STATS +# undef FEATURE_NETWORK_STATS +# endif +# define FEATURE_NETWORK_STATS 0 +# ifdef FEATURE_PPP_MODEM +# undef FEATURE_PPP_MODEM +# endif +# define FEATURE_PPP_MODEM 0 +#ifndef P036_LIMIT_BUILD_SIZE + #define P036_LIMIT_BUILD_SIZE // Reduce build size for P036 (FramedOLED) only +#endif #endif #ifdef PLUGIN_SET_COLLECTION_ESP32 From 092066796b9d8056b6faa8c71b9b8d8a40d92d7f Mon Sep 17 00:00:00 2001 From: TD-er Date: Thu, 25 Sep 2025 21:12:41 +0200 Subject: [PATCH 295/564] Reduce ESP32 Display build size (BUILD_NO_DEBUG) --- src/src/CustomBuild/define_plugin_sets.h | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/src/src/CustomBuild/define_plugin_sets.h b/src/src/CustomBuild/define_plugin_sets.h index cd0dc505a..a702c3a59 100644 --- a/src/src/CustomBuild/define_plugin_sets.h +++ b/src/src/CustomBuild/define_plugin_sets.h @@ -154,6 +154,16 @@ To create/register a plugin, you have to : #endif #endif +#if defined(PLUGIN_DISPLAY_COLLECTION) + // Display builds are getting too large, so for now disable ETH for display buikds + #if FEATURE_ETHERNET + #undef FEATURE_ETHERNET + #endif + #ifndef BUILD_NO_DEBUG + #define BUILD_NO_DEBUG + #endif +#endif + #ifdef MEMORY_ANALYSIS #ifdef MQTT_ONLY #define USES_C002 // Domoticz MQTT @@ -3869,4 +3879,4 @@ To create/register a plugin, you have to : #endif -#endif // CUSTOMBUILD_DEFINE_PLUGIN_SETS_H \ No newline at end of file +#endif // CUSTOMBUILD_DEFINE_PLUGIN_SETS_H From 2a8c514bed06d49c74e7a76dc5281a998b4e7203 Mon Sep 17 00:00:00 2001 From: TD-er Date: Sat, 27 Sep 2025 14:36:20 +0200 Subject: [PATCH 296/564] [Provision] Fix not able to provision files --- src/src/Helpers/ESPEasy_Storage.cpp | 5 ----- 1 file changed, 5 deletions(-) diff --git a/src/src/Helpers/ESPEasy_Storage.cpp b/src/src/Helpers/ESPEasy_Storage.cpp index b0c38687a..736710f6b 100644 --- a/src/src/Helpers/ESPEasy_Storage.cpp +++ b/src/src/Helpers/ESPEasy_Storage.cpp @@ -2648,11 +2648,6 @@ String getPartitionTable(uint8_t pType, const String& itemSep, const String& lin #if FEATURE_DOWNLOAD String downloadFileType(const String& url, const String& user, const String& pass, FileType::Enum filetype, unsigned int filenr) { - if (!getDownloadFiletypeChecked(filetype, filenr)) { - // Not selected, so not downloaded - return F("Not Allowed"); - } - String filename = getFileName(filetype, filenr); String fullUrl = joinUrlFilename(url, filename); String error; From eff11c69dd4663d58ba2649f37de04db03da3943 Mon Sep 17 00:00:00 2001 From: TD-er Date: Sat, 27 Sep 2025 14:36:55 +0200 Subject: [PATCH 297/564] [PPP modem] Fix crash when PPP modem is enabled but not present --- src/ESPEasy/net/NWPluginStructs/NW005_data_struct_PPP_modem.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/ESPEasy/net/NWPluginStructs/NW005_data_struct_PPP_modem.cpp b/src/ESPEasy/net/NWPluginStructs/NW005_data_struct_PPP_modem.cpp index 067f6ab44..c6ff1d224 100644 --- a/src/ESPEasy/net/NWPluginStructs/NW005_data_struct_PPP_modem.cpp +++ b/src/ESPEasy/net/NWPluginStructs/NW005_data_struct_PPP_modem.cpp @@ -974,7 +974,7 @@ bool NW005_data_struct_PPP_modem::initPluginStats() bool NW005_data_struct_PPP_modem::record_stats() { - if (_plugin_stats_array != nullptr) { + if (_plugin_stats_array != nullptr && _modem_task_data.modem_initialized) { EventStruct tmpEvent; size_t valueCount{}; const int rssi = doGetRSSI(); From 0c15064686876c77beb928c7a2fab802e69eff5e Mon Sep 17 00:00:00 2001 From: TD-er Date: Sat, 27 Sep 2025 14:37:30 +0200 Subject: [PATCH 298/564] [Docs] Add stubs for documenting new Network design --- docs/source/Network/NW001.rst | 39 ++++++++++++ docs/source/Network/NW002.rst | 39 ++++++++++++ docs/source/Network/NW003.rst | 39 ++++++++++++ docs/source/Network/NW004.rst | 39 ++++++++++++ docs/source/Network/NW005.rst | 56 +++++++++++++++++ docs/source/Network/NW005_DeviceSettings.png | Bin 0 -> 60821 bytes docs/source/Network/NW005_ModemState.png | Bin 0 -> 38189 bytes .../Network/NW005_UE_SystemInformation.png | Bin 0 -> 38073 bytes docs/source/Network/_Network.rst | 31 ++++++++++ .../Network/_network_substitutions.repl | 58 ++++++++++++++++++ docs/source/index.rst | 3 +- 11 files changed, 303 insertions(+), 1 deletion(-) create mode 100644 docs/source/Network/NW001.rst create mode 100644 docs/source/Network/NW002.rst create mode 100644 docs/source/Network/NW003.rst create mode 100644 docs/source/Network/NW004.rst create mode 100644 docs/source/Network/NW005.rst create mode 100644 docs/source/Network/NW005_DeviceSettings.png create mode 100644 docs/source/Network/NW005_ModemState.png create mode 100644 docs/source/Network/NW005_UE_SystemInformation.png create mode 100644 docs/source/Network/_Network.rst create mode 100644 docs/source/Network/_network_substitutions.repl diff --git a/docs/source/Network/NW001.rst b/docs/source/Network/NW001.rst new file mode 100644 index 000000000..0d0f6cd1b --- /dev/null +++ b/docs/source/Network/NW001.rst @@ -0,0 +1,39 @@ +.. include:: _network_substitutions.repl + +.. _NW001_page: + +|NW001_typename| +================================================== + +|NW001_shortinfo| + +Network details +--------------- + +Type: |NW001_type| + +Name: |NW001_name| + +Status: |NW001_status| + +GitHub: |NW001_github|_ + +Maintainer: |NW001_maintainer| + +Change log +---------- + +.. versionchanged:: 2.0 + ... + + |added| + Major overhaul for 2.0 release. + +.. versionadded:: 1.0 + ... + + |added| + Initial release version. + +Description +----------- diff --git a/docs/source/Network/NW002.rst b/docs/source/Network/NW002.rst new file mode 100644 index 000000000..ca451d1c3 --- /dev/null +++ b/docs/source/Network/NW002.rst @@ -0,0 +1,39 @@ +.. include:: _network_substitutions.repl + +.. _NW002_page: + +|NW002_typename| +================================================== + +|NW002_shortinfo| + +Network details +--------------- + +Type: |NW002_type| + +Name: |NW002_name| + +Status: |NW002_status| + +GitHub: |NW002_github|_ + +Maintainer: |NW002_maintainer| + +Change log +---------- + +.. versionchanged:: 2.0 + ... + + |added| + Major overhaul for 2.0 release. + +.. versionadded:: 1.0 + ... + + |added| + Initial release version. + +Description +----------- diff --git a/docs/source/Network/NW003.rst b/docs/source/Network/NW003.rst new file mode 100644 index 000000000..3be1023fe --- /dev/null +++ b/docs/source/Network/NW003.rst @@ -0,0 +1,39 @@ +.. include:: _network_substitutions.repl + +.. _NW003_page: + +|NW003_typename| +================================================== + +|NW003_shortinfo| + +Network details +--------------- + +Type: |NW003_type| + +Name: |NW003_name| + +Status: |NW003_status| + +GitHub: |NW003_github|_ + +Maintainer: |NW003_maintainer| + +Change log +---------- + +.. versionchanged:: 2.0 + ... + + |added| + Major overhaul for 2.0 release. + +.. versionadded:: 1.0 + ... + + |added| + Initial release version. + +Description +----------- diff --git a/docs/source/Network/NW004.rst b/docs/source/Network/NW004.rst new file mode 100644 index 000000000..9a4885546 --- /dev/null +++ b/docs/source/Network/NW004.rst @@ -0,0 +1,39 @@ +.. include:: _network_substitutions.repl + +.. _NW004_page: + +|NW004_typename| +================================================== + +|NW004_shortinfo| + +Network details +--------------- + +Type: |NW004_type| + +Name: |NW004_name| + +Status: |NW004_status| + +GitHub: |NW004_github|_ + +Maintainer: |NW004_maintainer| + +Change log +---------- + +.. versionchanged:: 2.0 + ... + + |added| + Major overhaul for 2.0 release. + +.. versionadded:: 1.0 + ... + + |added| + Initial release version. + +Description +----------- diff --git a/docs/source/Network/NW005.rst b/docs/source/Network/NW005.rst new file mode 100644 index 000000000..5cf45a5de --- /dev/null +++ b/docs/source/Network/NW005.rst @@ -0,0 +1,56 @@ +.. include:: _network_substitutions.repl + +.. _NW005_page: + +|NW005_typename| +================================================== + +|NW005_shortinfo| + +Network details +--------------- + +Type: |NW005_type| + +Name: |NW005_name| + +Status: |NW005_status| + +GitHub: |NW005_github|_ + +Maintainer: |NW005_maintainer| + +Description +----------- + + +Configuration +------------- + + +Device Settings +^^^^^^^^^^^^^^^ + + + +Connection Settings +^^^^^^^^^^^^^^^^^^^ + + +Change log +---------- + +.. versionchanged:: 2.0 + ... + + |added| + Major overhaul for 2.0 release. + +.. versionadded:: 1.0 + ... + + |added| + Initial release version. + +Description +----------- diff --git a/docs/source/Network/NW005_DeviceSettings.png b/docs/source/Network/NW005_DeviceSettings.png new file mode 100644 index 0000000000000000000000000000000000000000..89abbd08ef1e8fd534984fe7f21a75ad1ec57f8b GIT binary patch literal 60821 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 Date: Mon, 29 Sep 2025 15:19:20 +0200 Subject: [PATCH 299/564] [TaskValueSet] Fix setting 64-bit int values to a dummy task --- src/src/Commands/Tasks.cpp | 53 +++-- src/src/DataTypes/TaskValues_Data.cpp | 3 +- src/src/Helpers/StringConverter.cpp | 189 ----------------- src/src/Helpers/StringConverter.h | 67 ------ src/src/Helpers/StringConverter_Numerical.cpp | 190 ++++++++++++++++++ src/src/Helpers/StringConverter_Numerical.h | 69 +++++++ 6 files changed, 299 insertions(+), 272 deletions(-) diff --git a/src/src/Commands/Tasks.cpp b/src/src/Commands/Tasks.cpp index f1ca699d4..c7419f298 100644 --- a/src/src/Commands/Tasks.cpp +++ b/src/src/Commands/Tasks.cpp @@ -128,25 +128,48 @@ const __FlashStringHelper * taskValueSet(struct EventStruct *event, const char * EventStruct tmpEvent(taskIndex); if (GetArgv(Line, TmpStr1, 4)) { const Sensor_VType sensorType = tmpEvent.getSensorType(); +#if FEATURE_EXTENDED_TASK_VALUE_TYPES + bool done = false; + if (isUInt64OutputDataType(sensorType)) + { + // Don't try to do calculations as storing as double will loose accuracy + uint64_t val{}; + if (validUInt64FromString(TmpStr1, val)) { + done = true; + UserVar.setUint64(taskIndex, varNr, val); + } + } else if (isInt64OutputDataType(sensorType)) + { + // Don't try to do calculations as storing as double will loose accuracy + int64_t val{}; + if (validInt64FromString(TmpStr1, val)) { + done = true; + UserVar.setInt64(taskIndex, varNr, val); + } + } + if (!done) { +#endif + // FIXME TD-er: Must check if the value has to be computed and not convert to double when sensor type is 64 bit int. - // FIXME TD-er: Must check if the value has to be computed and not convert to double when sensor type is 64 bit int. + // Perform calculation with float result. + ESPEASY_RULES_FLOAT_TYPE result{}; - // Perform calculation with float result. - ESPEASY_RULES_FLOAT_TYPE result{}; + if (isError(Calculate(TmpStr1, result))) { + success = false; + return F("CALCULATION_ERROR"); + } + #ifndef BUILD_NO_DEBUG + addLog(LOG_LEVEL_INFO, strformat( + F("taskValueSet: %s taskindex: %d varNr: %d result: %f type: %d"), + Line, + taskIndex, + varNr, result, sensorType)); + #endif - if (isError(Calculate(TmpStr1, result))) { - success = false; - return F("CALCULATION_ERROR"); + UserVar.set(taskIndex, varNr, result, sensorType); +#if FEATURE_EXTENDED_TASK_VALUE_TYPES } - #ifndef BUILD_NO_DEBUG - addLog(LOG_LEVEL_INFO, strformat( - F("taskValueSet: %s taskindex: %d varNr: %d result: %f type: %d"), - Line, - taskIndex, - varNr, result, sensorType)); - #endif - - UserVar.set(taskIndex, varNr, result, sensorType); +#endif } else { // TODO: Get Task description and var name serialPrintln(formatUserVarNoCheck(&tmpEvent, varNr)); diff --git a/src/src/DataTypes/TaskValues_Data.cpp b/src/src/DataTypes/TaskValues_Data.cpp index 5b3017e99..dbc7cf748 100644 --- a/src/src/DataTypes/TaskValues_Data.cpp +++ b/src/src/DataTypes/TaskValues_Data.cpp @@ -276,7 +276,8 @@ String TaskValues_Data_t::getAsString(uint8_t varNr, Sensor_VType sensorType, u } else if (isInt32OutputDataType(sensorType)) { return String(getInt32(varNr)); } else if (isUInt64OutputDataType(sensorType)) { - return ull2String(getUint64(varNr)); + // Return unsigned 64-bit as hex string or else it could become way too long to be practical + return formatULLtoHex(getUint64(varNr)); } else if (isInt64OutputDataType(sensorType)) { return ll2String(getInt64(varNr)); #endif diff --git a/src/src/Helpers/StringConverter.cpp b/src/src/Helpers/StringConverter.cpp index d841ff100..2812f864b 100644 --- a/src/src/Helpers/StringConverter.cpp +++ b/src/src/Helpers/StringConverter.cpp @@ -240,195 +240,6 @@ String formatIP(const IPAddress& ip, bool includeZone) { #endif } - -/********************************************************************************************\ - Handling HEX strings - \*********************************************************************************************/ - -// Convert max. 8 hex decimals to unsigned long -unsigned long hexToUL(const String& input_c, size_t nrHexDecimals) { - const unsigned long long resULL = hexToULL(input_c, nrHexDecimals); - return static_cast(resULL & 0xFFFFFFFFull); -} - -unsigned long hexToUL(const String& input_c) { - return hexToUL(input_c, input_c.length()); -} - -unsigned long hexToUL(const String& input_c, size_t startpos, size_t nrHexDecimals) { - return hexToUL(input_c.substring(startpos, startpos + nrHexDecimals), nrHexDecimals); -} - -// Convert max. 16 hex decimals to unsigned long long (aka uint64_t) -unsigned long long hexToULL(const String& input_c, size_t nrHexDecimals) { - size_t nr_decimals = nrHexDecimals; - - if (nr_decimals > 16) { - nr_decimals = 16; - } - const size_t inputLength = input_c.length(); - - if (nr_decimals > inputLength) { - nr_decimals = inputLength; - } else if (input_c.startsWith(F("0x"))) { // strtoull handles that prefix nicely - nr_decimals += 2; - } - return strtoull(input_c.substring(0, nr_decimals).c_str(), 0, 16); -} - -unsigned long long hexToULL(const String& input_c) { - return hexToULL(input_c, input_c.length()); -} - -unsigned long long hexToULL(const String& input_c, size_t startpos, size_t nrHexDecimals) { - return hexToULL(input_c.substring(startpos, startpos + nrHexDecimals), nrHexDecimals); -} - -void appendHexChar(uint8_t data, String& string) -{ - const char *hex_chars = "0123456789abcdef"; - string += hex_chars[(data >> 4) & 0xF]; - string += hex_chars[(data) & 0xF]; -} - -String formatToHex_array(const uint8_t* data, size_t size) -{ - String res; - res.reserve(2 * size); - for (size_t i = 0; i < size; ++i) { - appendHexChar(data[i], res); - } - return res; -} - -String formatULLtoHex(const uint64_t& value, - const __FlashStringHelper * prefix, - unsigned int minimal_hex_digits) -{ - return concat(prefix, formatULLtoHex_no_prefix(value, minimal_hex_digits)); -} - -String formatULLtoHex(const uint64_t& value, - const __FlashStringHelper * prefix) -{ - return formatULLtoHex(value, prefix, 0); -} - -String formatULLtoHex(const uint64_t& value, unsigned int minimal_hex_digits) -{ - return formatULLtoHex(value, F("0x"), minimal_hex_digits); -} - -String formatULLtoHex_no_prefix(const uint64_t& value, unsigned int minimal_hex_digits) -{ - const uint32_t msb_val = static_cast(value >> 32); - const uint32_t lsb_val = static_cast(value & 0xFFFFFFFF); - String res; - res.reserve(16); - res += formatToHex_no_prefix(msb_val, 8); - res += formatToHex_no_prefix(lsb_val, 8); - while (minimal_hex_digits < res.length() && res.startsWith(F("0"))) { - res = res.substring(1); - } - return res; -} - -String formatULLtoHex_decimal(const uint64_t& value) -{ - return strformat( - F("%s (%s)"), - formatULLtoHex(value).c_str(), - ull2String(value).c_str()); -} - -String formatToHex_wordarray(const uint16_t* data, size_t size) -{ - String res; - res.reserve(2 * size); - for (size_t i = 0; i < size; ++i) { - appendHexChar(data[i] << 8, res); - appendHexChar(data[i] & 0xFF, res); - } - return res; -} - -String formatToHex(unsigned long value, - const __FlashStringHelper * prefix, - unsigned int minimal_hex_digits) { - return concat(prefix, formatToHex_no_prefix(value, minimal_hex_digits)); -} - -String formatToHex(unsigned long value, - const __FlashStringHelper * prefix) { - return formatToHex(value, prefix, 0); -} - -String formatToHex(unsigned long value, unsigned int minimal_hex_digits) { - return formatToHex(value, F("0x"), minimal_hex_digits); -} - -String formatToHex_no_prefix(unsigned long value, unsigned int minimal_hex_digits) { - const String fmt = strformat(F("%%0%dX"), minimal_hex_digits); - return strformat(fmt, value); -} - -String formatHumanReadable(uint64_t value, - uint32_t factor) { - String result = formatHumanReadable(value, factor, 2); - - result.replace(F(".00"), EMPTY_STRING); - return result; -} - -String formatHumanReadable(uint64_t value, - uint32_t factor, - int NrDecimals) { - float floatValue(value); - uint8_t steps = 0; - - while (value >= factor) { - value /= factor; - ++steps; - floatValue /= float(factor); - } - String result = toString(floatValue, NrDecimals); - - if (steps != 0) result += ' '; - - switch (steps) { - case 0: break; - case 1: result += 'k'; break; - case 2: result += 'M'; break; - case 3: result += 'G'; break; - case 4: result += 'T'; break; - default: - result += '*'; - result += factor; - result += '^'; - result += steps; - break; - } - return result; -} - -String formatToHex_decimal(unsigned long value) { - return formatToHex_decimal(value, 1); -} - -String formatToHex_decimal(unsigned long value, unsigned long factor) { - String result = formatToHex(value); - - result += F(" ("); - - if (factor > 1) { - result += formatHumanReadable(value, factor); - } else { - result += value; - } - result += ')'; - return result; -} - const __FlashStringHelper * boolToString(bool value) { return value ? F("true") : F("false"); } diff --git a/src/src/Helpers/StringConverter.h b/src/src/Helpers/StringConverter.h index 5e64ca65c..e89e0a267 100644 --- a/src/src/Helpers/StringConverter.h +++ b/src/src/Helpers/StringConverter.h @@ -93,73 +93,6 @@ bool str2ip(const char *string, String formatIP(const IPAddress& ip, bool includeZone = false); -/********************************************************************************************\ - Handling HEX strings - \*********************************************************************************************/ - -// Convert max. 8 hex decimals to unsigned long -unsigned long hexToUL(const String& input_c, - size_t nrHexDecimals); - -unsigned long hexToUL(const String& input_c); - -unsigned long hexToUL(const String& input_c, - size_t startpos, - size_t nrHexDecimals); - -// Convert max. 16 hex decimals to unsigned long long -unsigned long long hexToULL(const String& input_c, - size_t nrHexDecimals); - -unsigned long long hexToULL(const String& input_c); - -unsigned long long hexToULL(const String& input_c, - size_t startpos, - size_t nrHexDecimals); - -void appendHexChar(uint8_t data, String& string); - -// Binary data to HEX -// Returned string length will be twice the size of the data array. -String formatToHex_array(const uint8_t* data, size_t size); -String formatToHex_wordarray(const uint16_t* data, size_t size); - -String formatULLtoHex(const uint64_t& value, - const __FlashStringHelper * prefix, - unsigned int minimal_hex_digits); - -String formatULLtoHex(const uint64_t& value, - const __FlashStringHelper * prefix); - -String formatULLtoHex(const uint64_t& value, unsigned int minimal_hex_digits = 0); - -String formatULLtoHex_no_prefix(const uint64_t& value, unsigned int minimal_hex_digits = 0); - -String formatULLtoHex_decimal(const uint64_t& value); - - -String formatToHex(unsigned long value, - const __FlashStringHelper * prefix, - unsigned int minimal_hex_digits); - -String formatToHex(unsigned long value, - const __FlashStringHelper * prefix); - -String formatToHex(unsigned long value, unsigned int minimal_hex_digits = 0); - -String formatToHex_no_prefix(unsigned long value, unsigned int minimal_hex_digits = 0); - -String formatHumanReadable(uint64_t value, - uint32_t factor); - -String formatHumanReadable(uint64_t value, - uint32_t factor, - int NrDecimals); - -String formatToHex_decimal(unsigned long value); - -String formatToHex_decimal(unsigned long value, - unsigned long factor); const __FlashStringHelper * boolToString(bool value); diff --git a/src/src/Helpers/StringConverter_Numerical.cpp b/src/src/Helpers/StringConverter_Numerical.cpp index 18e29ad7b..e8c4dfef6 100644 --- a/src/src/Helpers/StringConverter_Numerical.cpp +++ b/src/src/Helpers/StringConverter_Numerical.cpp @@ -258,3 +258,193 @@ String floatToString(const float& value, bool string2float(const String& string, float& floatvalue) { return validFloatFromString(string, floatvalue); } + + + +/********************************************************************************************\ + Handling HEX strings + \*********************************************************************************************/ + +// Convert max. 8 hex decimals to unsigned long +unsigned long hexToUL(const String& input_c, size_t nrHexDecimals) { + const unsigned long long resULL = hexToULL(input_c, nrHexDecimals); + return static_cast(resULL & 0xFFFFFFFFull); +} + +unsigned long hexToUL(const String& input_c) { + return hexToUL(input_c, input_c.length()); +} + +unsigned long hexToUL(const String& input_c, size_t startpos, size_t nrHexDecimals) { + return hexToUL(input_c.substring(startpos, startpos + nrHexDecimals), nrHexDecimals); +} + +// Convert max. 16 hex decimals to unsigned long long (aka uint64_t) +unsigned long long hexToULL(const String& input_c, size_t nrHexDecimals) { + size_t nr_decimals = nrHexDecimals; + + if (nr_decimals > 16) { + nr_decimals = 16; + } + const size_t inputLength = input_c.length(); + + if (nr_decimals > inputLength) { + nr_decimals = inputLength; + } else if (input_c.startsWith(F("0x"))) { // strtoull handles that prefix nicely + nr_decimals += 2; + } + return strtoull(input_c.substring(0, nr_decimals).c_str(), 0, 16); +} + +unsigned long long hexToULL(const String& input_c) { + return hexToULL(input_c, input_c.length()); +} + +unsigned long long hexToULL(const String& input_c, size_t startpos, size_t nrHexDecimals) { + return hexToULL(input_c.substring(startpos, startpos + nrHexDecimals), nrHexDecimals); +} + +void appendHexChar(uint8_t data, String& string) +{ + const char *hex_chars = "0123456789abcdef"; + string += hex_chars[(data >> 4) & 0xF]; + string += hex_chars[(data) & 0xF]; +} + +String formatToHex_array(const uint8_t* data, size_t size) +{ + String res; + res.reserve(2 * size); + for (size_t i = 0; i < size; ++i) { + appendHexChar(data[i], res); + } + return res; +} + +String formatULLtoHex(const uint64_t& value, + const __FlashStringHelper * prefix, + unsigned int minimal_hex_digits) +{ + return concat(prefix, formatULLtoHex_no_prefix(value, minimal_hex_digits)); +} + +String formatULLtoHex(const uint64_t& value, + const __FlashStringHelper * prefix) +{ + return formatULLtoHex(value, prefix, 0); +} + +String formatULLtoHex(const uint64_t& value, unsigned int minimal_hex_digits) +{ + return formatULLtoHex(value, F("0x"), minimal_hex_digits); +} + +String formatULLtoHex_no_prefix(const uint64_t& value, unsigned int minimal_hex_digits) +{ + const uint32_t msb_val = static_cast(value >> 32); + const uint32_t lsb_val = static_cast(value & 0xFFFFFFFF); + String res; + res.reserve(16); + res += formatToHex_no_prefix(msb_val, 8); + res += formatToHex_no_prefix(lsb_val, 8); + while (minimal_hex_digits < res.length() && res.startsWith(F("0"))) { + res = res.substring(1); + } + return res; +} + +String formatULLtoHex_decimal(const uint64_t& value) +{ + return strformat( + F("%s (%s)"), + formatULLtoHex(value).c_str(), + ull2String(value).c_str()); +} + +String formatToHex_wordarray(const uint16_t* data, size_t size) +{ + String res; + res.reserve(2 * size); + for (size_t i = 0; i < size; ++i) { + appendHexChar(data[i] << 8, res); + appendHexChar(data[i] & 0xFF, res); + } + return res; +} + +String formatToHex(unsigned long value, + const __FlashStringHelper * prefix, + unsigned int minimal_hex_digits) { + return concat(prefix, formatToHex_no_prefix(value, minimal_hex_digits)); +} + +String formatToHex(unsigned long value, + const __FlashStringHelper * prefix) { + return formatToHex(value, prefix, 0); +} + +String formatToHex(unsigned long value, unsigned int minimal_hex_digits) { + return formatToHex(value, F("0x"), minimal_hex_digits); +} + +String formatToHex_no_prefix(unsigned long value, unsigned int minimal_hex_digits) { + const String fmt = strformat(F("%%0%dX"), minimal_hex_digits); + return strformat(fmt, value); +} + +String formatHumanReadable(uint64_t value, + uint32_t factor) { + String result = formatHumanReadable(value, factor, 2); + + result.replace(F(".00"), EMPTY_STRING); + return result; +} + +String formatHumanReadable(uint64_t value, + uint32_t factor, + int NrDecimals) { + float floatValue(value); + uint8_t steps = 0; + + while (value >= factor) { + value /= factor; + ++steps; + floatValue /= float(factor); + } + String result = toString(floatValue, NrDecimals); + + if (steps != 0) result += ' '; + + switch (steps) { + case 0: break; + case 1: result += 'k'; break; + case 2: result += 'M'; break; + case 3: result += 'G'; break; + case 4: result += 'T'; break; + default: + result += '*'; + result += factor; + result += '^'; + result += steps; + break; + } + return result; +} + +String formatToHex_decimal(unsigned long value) { + return formatToHex_decimal(value, 1); +} + +String formatToHex_decimal(unsigned long value, unsigned long factor) { + String result = formatToHex(value); + + result += F(" ("); + + if (factor > 1) { + result += formatHumanReadable(value, factor); + } else { + result += value; + } + result += ')'; + return result; +} diff --git a/src/src/Helpers/StringConverter_Numerical.h b/src/src/Helpers/StringConverter_Numerical.h index ec44ba4db..f61e0688e 100644 --- a/src/src/Helpers/StringConverter_Numerical.h +++ b/src/src/Helpers/StringConverter_Numerical.h @@ -52,4 +52,73 @@ String floatToString(const float& value, unsigned int decimalPlaces = 2, bool trimTrailingZeros = false); + +/********************************************************************************************\ + Handling HEX strings + \*********************************************************************************************/ + +// Convert max. 8 hex decimals to unsigned long +unsigned long hexToUL(const String& input_c, + size_t nrHexDecimals); + +unsigned long hexToUL(const String& input_c); + +unsigned long hexToUL(const String& input_c, + size_t startpos, + size_t nrHexDecimals); + +// Convert max. 16 hex decimals to unsigned long long +unsigned long long hexToULL(const String& input_c, + size_t nrHexDecimals); + +unsigned long long hexToULL(const String& input_c); + +unsigned long long hexToULL(const String& input_c, + size_t startpos, + size_t nrHexDecimals); + +void appendHexChar(uint8_t data, String& string); + +// Binary data to HEX +// Returned string length will be twice the size of the data array. +String formatToHex_array(const uint8_t* data, size_t size); +String formatToHex_wordarray(const uint16_t* data, size_t size); + +String formatULLtoHex(const uint64_t& value, + const __FlashStringHelper * prefix, + unsigned int minimal_hex_digits); + +String formatULLtoHex(const uint64_t& value, + const __FlashStringHelper * prefix); + +String formatULLtoHex(const uint64_t& value, unsigned int minimal_hex_digits = 0); + +String formatULLtoHex_no_prefix(const uint64_t& value, unsigned int minimal_hex_digits = 0); + +String formatULLtoHex_decimal(const uint64_t& value); + + +String formatToHex(unsigned long value, + const __FlashStringHelper * prefix, + unsigned int minimal_hex_digits); + +String formatToHex(unsigned long value, + const __FlashStringHelper * prefix); + +String formatToHex(unsigned long value, unsigned int minimal_hex_digits = 0); + +String formatToHex_no_prefix(unsigned long value, unsigned int minimal_hex_digits = 0); + +String formatHumanReadable(uint64_t value, + uint32_t factor); + +String formatHumanReadable(uint64_t value, + uint32_t factor, + int NrDecimals); + +String formatToHex_decimal(unsigned long value); + +String formatToHex_decimal(unsigned long value, + unsigned long factor); + #endif // ifndef HELPERS_STRINGCONVERTER_NUMERICAL_H From 035cb04f77ecbc9a33336673a59d2b27ab8cbb6d Mon Sep 17 00:00:00 2001 From: TD-er Date: Mon, 29 Sep 2025 15:20:21 +0200 Subject: [PATCH 300/564] [CacheReader] Fix reading cache files from CacheController --- src/src/DataStructs/RTC_cache_handler_struct.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/src/DataStructs/RTC_cache_handler_struct.cpp b/src/src/DataStructs/RTC_cache_handler_struct.cpp index 28027fc83..b0dc7525d 100644 --- a/src/src/DataStructs/RTC_cache_handler_struct.cpp +++ b/src/src/DataStructs/RTC_cache_handler_struct.cpp @@ -76,7 +76,7 @@ bool RTC_cache_handler_struct::peekDataAvailable() const { if (_peekfilenr == RTC_cache.writeFileNr) { if (fw) { constexpr size_t errorcode = (size_t)-1; - size_t pos = fp.position(); + size_t pos = fw.position(); if (pos == errorcode) { pos = 0; } From 872ebfe6cac84aff342d354143f06dcf7354a630 Mon Sep 17 00:00:00 2001 From: TD-er Date: Mon, 29 Sep 2025 15:21:17 +0200 Subject: [PATCH 301/564] [CacheReader] Add support for 64bit ints + output as events --- src/_P146_CacheControllerReader.ino | 53 ++++++++--- src/src/DataStructs/DeviceStruct.h | 2 +- src/src/PluginStructs/P146_data_struct.cpp | 101 +++++++++++++++++---- src/src/PluginStructs/P146_data_struct.h | 18 +++- src/src/WebServer/DevicesPage.cpp | 95 ++++++++++--------- 5 files changed, 190 insertions(+), 79 deletions(-) diff --git a/src/_P146_CacheControllerReader.ino b/src/_P146_CacheControllerReader.ino index 602427f4b..e757b69e7 100644 --- a/src/_P146_CacheControllerReader.ino +++ b/src/_P146_CacheControllerReader.ino @@ -45,12 +45,13 @@ boolean Plugin_146(uint8_t function, struct EventStruct *event, String& string) case PLUGIN_DEVICE_ADD: { auto& dev = Device[++deviceCount]; - dev.Number = PLUGIN_ID_146; - dev.Type = DEVICE_TYPE_DUMMY; - dev.VType = Sensor_VType::SENSOR_TYPE_DUAL; - dev.ValueCount = 2; - dev.SendDataOption = true; - dev.OutputDataType = Output_Data_type_t::Default; + dev.Number = PLUGIN_ID_146; + dev.Type = DEVICE_TYPE_DUMMY; + dev.VType = Sensor_VType::SENSOR_TYPE_DUAL; + dev.ValueCount = 2; + dev.SendDataOption = true; + dev.OutputDataType = Output_Data_type_t::Default; + dev.HideDerivedValues = true; break; } @@ -116,6 +117,12 @@ boolean Plugin_146(uint8_t function, struct EventStruct *event, String& string) break; } + case PLUGIN_EXIT: + { + P146_data_struct::flush(); + break; + } + case PLUGIN_READ: { if (ControllerCache.peekDataAvailable()) { @@ -132,10 +139,20 @@ boolean Plugin_146(uint8_t function, struct EventStruct *event, String& string) P146_data->prepareCSVInBulk(event->TaskIndex, P146_GET_JOIN_TIMESTAMP, P146_GET_ONLY_SET_TASKS, separator); } } - } else { + } else if (P146_GET_SEND_VIA_ORIG_TASK || P146_GET_SEND_VIA_EVENT) { // Do not set the "success" or else the task values of this Cache reader task will be sent to the same controller too. - if (P146_data_struct::sendViaOriginalTask(event->TaskIndex, P146_GET_SEND_TIMESTAMP)) { + bool processed = false; + + if (P146_GET_SEND_VIA_ORIG_TASK && P146_data_struct::sendViaOriginalTask(event->TaskIndex, P146_GET_SEND_TIMESTAMP)) { + processed = true; + } + + if (P146_GET_SEND_VIA_EVENT && P146_data_struct::sendViaEvent_AllCache(event->TaskIndex, P146_GET_SEND_TIMESTAMP)) { + processed = true; + } + + if (processed) { int readFileNr = 0; const int readPos = ControllerCache.getPeekFilePos(readFileNr); @@ -216,7 +233,10 @@ boolean Plugin_146(uint8_t function, struct EventStruct *event, String& string) addFormTextBox(F("Publish Topic"), getPluginCustomArgName(P146_PublishTopicIndex), strings[P146_PublishTopicIndex], P146_Nchars); - // addFormSubHeader(F("Non MQTT Output Options")); + addFormSubHeader(F("Non MQTT Output Options")); + addFormCheckBox(F("Send via Original Task"), F("origTask"), P146_GET_SEND_VIA_ORIG_TASK); + addFormCheckBox(F("Send as Event"), F("sendEvent"), P146_GET_SEND_VIA_EVENT); + // addFormCheckBox(F("Send Timestamp"), F("sendtimestamp"), P146_GET_SEND_TIMESTAMP); addTableSeparator(F("Export to CSV"), 2, 3); @@ -245,11 +265,15 @@ boolean Plugin_146(uint8_t function, struct EventStruct *event, String& string) html_add_button_prefix(); addHtml(F("dumpcache?separator=")); - switch (static_cast(P146_SEPARATOR_CHARACTER)) { - case '\t': addHtml(F("Tab")); break; - case ',': addHtml(F("Comma")); break; + switch (static_cast(P146_SEPARATOR_CHARACTER)) + { + case '\t': addHtml(F("Tab")); + break; + case ',': addHtml(F("Comma")); + break; case ';': - default: addHtml(F("Semicolon")); break; + default: addHtml(F("Semicolon")); + break; } if (P146_GET_JOIN_TIMESTAMP) { @@ -281,6 +305,9 @@ boolean Plugin_146(uint8_t function, struct EventStruct *event, String& string) P146_SET_ONLY_SET_TASKS(isFormItemChecked(F("onlysettasks"))); P146_SEPARATOR_CHARACTER = getFormItemInt(F("separator")); + P146_SET_SEND_VIA_ORIG_TASK(isFormItemChecked(F("origTask"))); + P146_SET_SEND_VIA_EVENT(isFormItemChecked(F("sendEvent"))); + String strings[P146_Nlines]; for (uint8_t varNr = 0; varNr < P146_Nlines; varNr++) { diff --git a/src/src/DataStructs/DeviceStruct.h b/src/src/DataStructs/DeviceStruct.h index be2d3c777..fc41285e6 100644 --- a/src/src/DataStructs/DeviceStruct.h +++ b/src/src/DataStructs/DeviceStruct.h @@ -116,7 +116,7 @@ struct DeviceStruct uint32_t CustomVTypeVar : 1; // User-selectable VType per value uint32_t MqttStateClass : 1; // MQTT StateClass setting in DevicesPage - uint32_t Dummy23 : 1; // Dummy added to force alignment, can be re-used + uint32_t HideDerivedValues : 1; // Hide the options for derived values uint32_t Dummy24 : 1; // Dummy added to force alignment, can be re-used uint32_t Dummy25 : 1; // Dummy added to force alignment, can be re-used uint32_t Dummy26 : 1; // Dummy added to force alignment, can be re-used diff --git a/src/src/PluginStructs/P146_data_struct.cpp b/src/src/PluginStructs/P146_data_struct.cpp index 216b0b9c8..4fcaf740c 100644 --- a/src/src/PluginStructs/P146_data_struct.cpp +++ b/src/src/PluginStructs/P146_data_struct.cpp @@ -3,11 +3,11 @@ #ifdef USES_P146 # include "../ControllerQueue/C016_queue_element.h" +# include "../ESPEasyCore/ESPEasyRules.h" # include "../Globals/C016_ControllerCache.h" # include "../Globals/MQTT.h" # include "../Helpers/_CPlugin_init.h" - P146_data_struct::P146_data_struct(struct EventStruct *event) { LoadCustomTaskSettings(event->TaskIndex, _topics, P146_Nlines, 0); @@ -28,7 +28,7 @@ P146_data_struct::~P146_data_struct() uint32_t writeToMqtt(const String& str, bool send) { if (send) { - MQTTclient.write((const uint8_t*)str.c_str(), str.length()); + MQTTclient.write((const uint8_t *)str.c_str(), str.length()); } return str.length(); } @@ -339,17 +339,22 @@ bool P146_data_struct::sendViaOriginalTask( const int peekReadPos = ControllerCache.getPeekFilePos(peekFileNr); - unsigned long timestamp; - uint8_t valueCount; - float taskValues[VARS_PER_TASK] = {}; - EventStruct tmpEvent(C016_getTaskSample( - timestamp, valueCount, - taskValues[0], taskValues[1], taskValues[2], taskValues[3])); + C016_binary_element element{}; - if (!validTaskIndex(tmpEvent.TaskIndex)) { + if (!C016_getTaskSample(element)) { return false; } + if (!validTaskIndex(element.TaskIndex)) { + return false; + } + + if (Settings.UseRules) { + EventStruct tmpEvent(element.TaskIndex); + createRuleEvents(&tmpEvent); + } + + bool success = false; bool unusableSample = false; @@ -363,16 +368,23 @@ bool P146_data_struct::sendViaOriginalTask( // - Copy values from the cache bin files to the task it had // - Call CPLUGIN_PROTOCOL_SEND // - Restore the values - for (int valIndex = 0; valIndex < VARS_PER_TASK; ++valIndex) { - const float tmp = UserVar.getFloat(tmpEvent.TaskIndex, valIndex); - UserVar.setFloat(tmpEvent.TaskIndex, valIndex, taskValues[valIndex]); - taskValues[valIndex] = tmp; + + TaskValues_Data_t tmp; + { + const TaskValues_Data_t*data = UserVar.getRawTaskValues_Data(element.TaskIndex); + + if (data != nullptr) { + for (uint8_t i = 0; i < element.valueCount; ++i) { + tmp.copyValue(*data, i, element.sensorType); + } + } } for (controllerIndex_t x = 0; !unusableSample && x < CONTROLLER_MAX; x++) { // Make sure we are not sending to the cache controller. if (Settings.Protocol[x] != 16) { + EventStruct tmpEvent(element.TaskIndex); tmpEvent.ControllerIndex = x; tmpEvent.idx = Settings.TaskDeviceID[x][P146_TaskIndex]; @@ -400,10 +412,14 @@ bool P146_data_struct::sendViaOriginalTask( } } - for (int valIndex = 0; valIndex < VARS_PER_TASK; ++valIndex) { - const float tmp = UserVar.getFloat(tmpEvent.TaskIndex, valIndex); - UserVar.setFloat(tmpEvent.TaskIndex, valIndex, taskValues[valIndex]); - taskValues[valIndex] = tmp; + { + TaskValues_Data_t*data = UserVar.getRawTaskValues_Data(element.TaskIndex); + + if (data != nullptr) { + for (uint8_t i = 0; i < element.valueCount; ++i) { + data->copyValue(tmp, i, element.sensorType); + } + } } if (!success && !unusableSample) { @@ -413,6 +429,53 @@ bool P146_data_struct::sendViaOriginalTask( return success; } +bool P146_data_struct::sendViaEvent_AllCache(taskIndex_t P146_TaskIndex, + bool sendTimestamp) +{ + if (!Settings.UseRules) { return false; } + + // Keep the current peek position, so we can reset it when we fail to deliver the data to the controller. + int peekFileNr = 0; + const int peekReadPos = ControllerCache.getPeekFilePos(peekFileNr); + + + C016_binary_element element{}; + + if (!C016_getTaskSample(element)) { + return false; + } + + if (!validTaskIndex(element.TaskIndex)) { + return false; + } + + const deviceIndex_t DeviceIndex = getDeviceIndex_from_TaskIndex(element.TaskIndex); + + if (!validDeviceIndex(DeviceIndex)) { + return false; + } + + String eventvalues; + reserve_special(eventvalues, 64); // Enough for most use cases, prevent lots of memory allocations. + eventvalues = strformat( + F("%d,%d"), + element.unixTime, + element.valueCount); + + for (uint8_t varNr = 0; varNr < element.valueCount; ++varNr) { + eventvalues += ','; + uint8_t nrDecimals = 0; + + if (Device[DeviceIndex].configurableDecimals()) { + nrDecimals = Cache.getTaskDeviceValueDecimals(element.TaskIndex, varNr); + } + + eventvalues += element.values.getAsString(varNr, element.sensorType, nrDecimals); + } + eventQueue.add(element.TaskIndex, F("AllCache"), eventvalues); + return true; +} + bool P146_data_struct::setPeekFilePos(int peekFileNr, int peekReadPos) { { @@ -430,9 +493,7 @@ bool P146_data_struct::setPeekFilePos(int peekFileNr, int peekReadPos) return true; } -void P146_data_struct::flush() { - C016_flush(); -} +void P146_data_struct::flush() { C016_flush(); } bool P146_data_struct::getPeekFilePos(int& peekFileNr, int& peekReadPos, int& peekFileSize) const { peekFileNr = 0; diff --git a/src/src/PluginStructs/P146_data_struct.h b/src/src/PluginStructs/P146_data_struct.h index 5761bae49..1dadcf11d 100644 --- a/src/src/PluginStructs/P146_data_struct.h +++ b/src/src/PluginStructs/P146_data_struct.h @@ -15,10 +15,10 @@ # define P146_TASKVALUE_FILENR UserVar.getFloat(event->TaskIndex, 0) -# define P146_SET_TASKVALUE_FILENR(x) UserVar.setFloat(event->TaskIndex, 0, x) +# define P146_SET_TASKVALUE_FILENR(x) UserVar.setFloat(event->TaskIndex, 0, x) # define P146_TASKVALUE_FILEPOS UserVar.getFloat(event->TaskIndex, 1) -# define P146_SET_TASKVALUE_FILEPOS(x) UserVar.setFloat(event->TaskIndex, 1, x) +# define P146_SET_TASKVALUE_FILEPOS(x) UserVar.setFloat(event->TaskIndex, 1, x) # define P146_GET_SEND_BINARY bitRead(PCONFIG(0), 0) # define P146_SET_SEND_BINARY(X) bitWrite(PCONFIG(0), 0, X) @@ -30,7 +30,7 @@ # define P146_SET_SEND_TIMESTAMP(X) bitWrite(PCONFIG(0), 2, X) # define P146_GET_SEND_READ_POS bitRead(PCONFIG(0), 3) -# define P146_SET_SEND_READ_POS(X) bitWrite(PCONFIG(0), 3, X) +# define P146_SET_SEND_READ_POS(X) bitWrite(PCONFIG(0), 3, X) # define P146_GET_JOIN_TIMESTAMP bitRead(PCONFIG(0), 4) # define P146_SET_JOIN_TIMESTAMP(X) bitWrite(PCONFIG(0), 4, X) @@ -41,6 +41,12 @@ # define P146_GET_ERASE_BINFILES bitRead(PCONFIG(0), 6) # define P146_SET_ERASE_BINFILES(X) bitWrite(PCONFIG(0), 6, X) +# define P146_GET_SEND_VIA_ORIG_TASK bitRead(PCONFIG(7), 1) +# define P146_SET_SEND_VIA_ORIG_TASK(X) bitWrite(PCONFIG(7), 1, X) + +# define P146_GET_SEND_VIA_EVENT bitRead(PCONFIG(8), 1) +# define P146_SET_SEND_VIA_EVENT(X) bitWrite(PCONFIG(8), 1, X) + # define P146_SEPARATOR_CHARACTER PCONFIG(1) @@ -75,6 +81,11 @@ public: static bool sendViaOriginalTask(taskIndex_t P146_TaskIndex, bool sendTimestamp); + // Send as event using the following format: + // TaskName#AllCache,,,,..., + static bool sendViaEvent_AllCache(taskIndex_t P146_TaskIndex, + bool sendTimestamp); + static bool setPeekFilePos(int peekFileNr, int peekReadPos); @@ -94,6 +105,7 @@ private: ESPEasyControllerCache_CSV_dumper *dumper = nullptr; std::listlines; + }; diff --git a/src/src/WebServer/DevicesPage.cpp b/src/src/WebServer/DevicesPage.cpp index cc7fa9b93..0540878c6 100644 --- a/src/src/WebServer/DevicesPage.cpp +++ b/src/src/WebServer/DevicesPage.cpp @@ -391,8 +391,10 @@ void handle_devices_CopySubmittedSettings(taskIndex_t taskIndex, pluginID_t task update_whenset_FormItemInt(F("remoteFeed"), Settings.TaskDeviceDataFeed[taskIndex]); Settings.CombineTaskValues_SingleEvent(taskIndex, isFormItemChecked(F("TVSE"))); #if FEATURE_STRING_VARIABLES - Settings.ShowDerivedTaskValues(taskIndex, isFormItemChecked(F("TSDV"))); - Settings.EventAndLogDerivedTaskValues(taskIndex, isFormItemChecked(F("TELD"))); + if (!device.HideDerivedValues) { + Settings.ShowDerivedTaskValues(taskIndex, isFormItemChecked(F("TSDV"))); + Settings.EventAndLogDerivedTaskValues(taskIndex, isFormItemChecked(F("TELD"))); + } #endif // if FEATURE_STRING_VARIABLES for (controllerIndex_t controllerNr = 0; controllerNr < CONTROLLER_MAX; controllerNr++) @@ -407,6 +409,7 @@ void handle_devices_CopySubmittedSettings(taskIndex_t taskIndex, pluginID_t task } # endif // if FEATURE_MQTT_DISCOVER #if FEATURE_STRING_VARIABLES + if (!device.HideDerivedValues) Settings.SendDerivedTaskValues(taskIndex, controllerNr, isFormItemChecked(getPluginCustomArgName(F("TSND"), controllerNr))); #endif // if FEATURE_STRING_VARIABLES #if FEATURE_MQTT && FEATURE_MQTT_DISCOVER @@ -825,6 +828,7 @@ void handle_devicess_ShowAllTasksTable(uint8_t page) html_TD(); if (validDeviceIndex(DeviceIndex)) { + const DeviceStruct& device = Device[DeviceIndex]; String customValuesString; const bool customValues = PluginCall(PLUGIN_WEBFORM_SHOW_VALUES, &TempEvent, customValuesString); @@ -846,7 +850,9 @@ void handle_devicess_ShowAllTasksTable(uint8_t page) const String value = formatUserVarNoCheck(&TempEvent, varNr); #if FEATURE_STRING_VARIABLES bool hasPresentation = false; - const String presentation = formatUserVarForPresentation(&TempEvent, varNr, hasPresentation, value, DeviceIndex); + String presentation; + if (!device.HideDerivedValues) + presentation = formatUserVarForPresentation(&TempEvent, varNr, hasPresentation, value, DeviceIndex); #endif // if FEATURE_STRING_VARIABLES pluginWebformShowValue( x, @@ -865,47 +871,49 @@ void handle_devicess_ShowAllTasksTable(uint8_t page) } #if FEATURE_STRING_VARIABLES - int varNr = VARS_PER_TASK; - if (Settings.ShowDerivedTaskValues(x)) { - String taskName = getTaskDeviceName(x); - taskName.toLowerCase(); - String postfix; - const String search = getDerivedValueSearchAndPostfix(taskName, postfix); + if (!device.HideDerivedValues) { + int varNr = VARS_PER_TASK; + if (Settings.ShowDerivedTaskValues(x)) { + String taskName = getTaskDeviceName(x); + taskName.toLowerCase(); + String postfix; + const String search = getDerivedValueSearchAndPostfix(taskName, postfix); - auto it = customStringVar.begin(); - while (it != customStringVar.end()) { - if (it->first.startsWith(search) && it->first.endsWith(postfix)) { - String valueName = it->first.substring(search.length(), it->first.indexOf('-')); - String uom; - String vType; - const String vname2 = getDerivedValueNameUomAndVType(taskName, valueName, uom, vType); - if (!vname2.isEmpty()) { - valueName = vname2; - } - if (!it->second.isEmpty()) { - String value(it->second); - value = parseTemplateAndCalculate(value); - String presentation = getCustomStringVar(strformat(F(TASK_VALUE_PRESENTATION_PREFIX_TEMPLATE), taskName.c_str(), valueName.c_str())); - if (!uom.isEmpty()) { - value = strformat(F("%s %s"), value.c_str(), uom.c_str()); + auto it = customStringVar.begin(); + while (it != customStringVar.end()) { + if (it->first.startsWith(search) && it->first.endsWith(postfix)) { + String valueName = it->first.substring(search.length(), it->first.indexOf('-')); + String uom; + String vType; + const String vname2 = getDerivedValueNameUomAndVType(taskName, valueName, uom, vType); + if (!vname2.isEmpty()) { + valueName = vname2; } - if (!presentation.isEmpty()) { - stripEscapeCharacters(presentation); - presentation.replace(F("%value%"), value); - value = parseTemplate(presentation); + if (!it->second.isEmpty()) { + String value(it->second); + value = parseTemplateAndCalculate(value); + String presentation = getCustomStringVar(strformat(F(TASK_VALUE_PRESENTATION_PREFIX_TEMPLATE), taskName.c_str(), valueName.c_str())); + if (!uom.isEmpty()) { + value = strformat(F("%s %s"), value.c_str(), uom.c_str()); + } + if (!presentation.isEmpty()) { + stripEscapeCharacters(presentation); + presentation.replace(F("%value%"), value); + value = parseTemplate(presentation); + } + pluginWebformShowValue( + x, + varNr, + valueName, + value); + ++varNr; } - pluginWebformShowValue( - x, - varNr, - valueName, - value); - ++varNr; } + else if (it->first.substring(0, search.length()).compareTo(search) > 0) { + break; + } + ++it; } - else if (it->first.substring(0, search.length()).compareTo(search) > 0) { - break; - } - ++it; } } #endif // if FEATURE_STRING_VARIABLES @@ -1565,8 +1573,10 @@ void devicePage_show_controller_config(taskIndex_t taskIndex, deviceIndex_t Devi getTaskDeviceName(taskIndex).c_str())); #if FEATURE_STRING_VARIABLES - addFormCheckBox(F("Show derived values"), F("TSDV"), Settings.ShowDerivedTaskValues(taskIndex)); - addFormCheckBox(F("Event & Log derived values"), F("TELD"), Settings.EventAndLogDerivedTaskValues(taskIndex)); + if (!device.HideDerivedValues) { + addFormCheckBox(F("Show derived values"), F("TSDV"), Settings.ShowDerivedTaskValues(taskIndex)); + addFormCheckBox(F("Event & Log derived values"), F("TELD"), Settings.EventAndLogDerivedTaskValues(taskIndex)); + } #endif // if FEATURE_STRING_VARIABLES bool separatorAdded = false; @@ -1601,7 +1611,8 @@ void devicePage_show_controller_config(taskIndex_t taskIndex, deviceIndex_t Devi getProtocolStruct(ProtocolIndex).mqttAutoDiscover); # endif // if FEATURE_MQTT_DISCOVER # if FEATURE_STRING_VARIABLES - const bool allowSendDerived = (validProtocolIndex(ProtocolIndex) && + const bool allowSendDerived = !device.HideDerivedValues && + (validProtocolIndex(ProtocolIndex) && getProtocolStruct(ProtocolIndex).allowSendDerived); # endif // if FEATURE_STRING_VARIABLES From 616305a1a76d778875005654405a2f4fc04c3d15 Mon Sep 17 00:00:00 2001 From: TD-er Date: Mon, 29 Sep 2025 22:11:36 +0200 Subject: [PATCH 302/564] [CacheReader] Fix continue reading after crash/reboot --- src/_P146_CacheControllerReader.ino | 21 ++++++++++++- .../DataStructs/RTC_cache_handler_struct.cpp | 8 +++-- src/src/Helpers/Misc.cpp | 31 ++++++++++--------- src/src/PluginStructs/P146_data_struct.cpp | 6 ++-- src/src/PluginStructs/P146_data_struct.h | 2 +- 5 files changed, 48 insertions(+), 20 deletions(-) diff --git a/src/_P146_CacheControllerReader.ino b/src/_P146_CacheControllerReader.ino index e757b69e7..14ded7ff0 100644 --- a/src/_P146_CacheControllerReader.ino +++ b/src/_P146_CacheControllerReader.ino @@ -111,6 +111,16 @@ boolean Plugin_146(uint8_t function, struct EventStruct *event, String& string) ControllerCache.setPeekFilePos( P146_TASKVALUE_FILENR, P146_TASKVALUE_FILEPOS); + + int peekFileNr{}; + int peekReadPos = ControllerCache.getPeekFilePos(peekFileNr); + + if (peekReadPos >= 0) { + P146_SET_TASKVALUE_FILENR(peekFileNr); + P146_SET_TASKVALUE_FILEPOS(peekReadPos); + } + + success = initPluginTaskData( event->TaskIndex, new (std::nothrow) P146_data_struct(event)); @@ -221,6 +231,7 @@ boolean Plugin_146(uint8_t function, struct EventStruct *event, String& string) // addFormCheckBox(F("Send ReadPos"), F("sendreadpos"), P146_GET_SEND_READ_POS); addFormNumericBox(F("Minimal Send Interval"), F("minsendinterval"), P146_MINIMAL_SEND_INTERVAL, 0, 1000); + addUnit(F("ms")); addFormNumericBox(F("Max Message Size"), F("maxmsgsize"), P146_MQTT_MESSAGE_LENGTH, @@ -332,7 +343,15 @@ boolean Plugin_146(uint8_t function, struct EventStruct *event, String& string) if (equals(command, F("cachereader"))) { if (equals(subcommand, F("setreadpos"))) { - P146_data_struct::setPeekFilePos(event->Par2, event->Par3); + if (P146_data_struct::setPeekFilePos(event->Par2, event->Par3)) { + int peekFileNr{}; + int peekReadPos = ControllerCache.getPeekFilePos(peekFileNr); + + if (peekReadPos >= 0) { + P146_SET_TASKVALUE_FILENR(peekFileNr); + P146_SET_TASKVALUE_FILEPOS(peekReadPos); + } + } success = true; } else if (equals(subcommand, F("sendtaskinfo"))) { P146_data_struct *P146_data = static_cast(getPluginTaskData(event->TaskIndex)); diff --git a/src/src/DataStructs/RTC_cache_handler_struct.cpp b/src/src/DataStructs/RTC_cache_handler_struct.cpp index b0dc7525d..3bf190bac 100644 --- a/src/src/DataStructs/RTC_cache_handler_struct.cpp +++ b/src/src/DataStructs/RTC_cache_handler_struct.cpp @@ -258,8 +258,8 @@ bool RTC_cache_handler_struct::write(const uint8_t *data, unsigned int size) { // Mark all content as being processed and empty buffer. bool RTC_cache_handler_struct::flush() { - if (prepareFileForWrite()) { - if (RTC_cache.writePos > 0) { + if (RTC_cache.writePos > 0) { + if (prepareFileForWrite()) { #ifdef RTC_STRUCT_DEBUG size_t filesize = fw.size(); #endif // ifdef RTC_STRUCT_DEBUG @@ -375,6 +375,9 @@ void RTC_cache_handler_struct::closeOpenFiles() if (fp) { fp.close(); } + if (fw) { + fw.close(); + } } bool RTC_cache_handler_struct::deleteAllCacheBlocks() @@ -384,6 +387,7 @@ bool RTC_cache_handler_struct::deleteAllCacheBlocks() if (RTC_cache.readFileNr < RTC_cache.writeFileNr) { bool fileDeleted = false; int count = 0; + closeOpenFiles(); for (int fileNr = RTC_cache.readFileNr; count < 25 && fileNr < RTC_cache.writeFileNr; ++fileNr) { diff --git a/src/src/Helpers/Misc.cpp b/src/src/Helpers/Misc.cpp index b45e1bb47..a536c13a5 100644 --- a/src/src/Helpers/Misc.cpp +++ b/src/src/Helpers/Misc.cpp @@ -146,24 +146,27 @@ bool setTaskEnableStatus(struct EventStruct *event, bool enabled) // Only enable task if it has a Plugin configured if (validPluginID(Settings.getPluginID_for_task(event->TaskIndex)) || !enabled) { - String dummy; + if (enabled != Settings.TaskDeviceEnabled[event->TaskIndex]) + { + String dummy; - if (!enabled) { - PluginCall(PLUGIN_EXIT, event, dummy); - } + if (!enabled) { + PluginCall(PLUGIN_EXIT, event, dummy); + } - // Toggle enable/disable state via command - // FIXME TD-er: Should this be a 'runtime' change, or actually change the intended state? - // Settings.TaskDeviceEnabled[event->TaskIndex].enabled = enabled; - Settings.TaskDeviceEnabled[event->TaskIndex] = enabled; + // Toggle enable/disable state via command + // FIXME TD-er: Should this be a 'runtime' change, or actually change the intended state? + // Settings.TaskDeviceEnabled[event->TaskIndex].enabled = enabled; + Settings.TaskDeviceEnabled[event->TaskIndex] = enabled; - if (enabled) { - // Schedule the plugin to be read. - // Do this before actual init, to allow the plugin to schedule a specific first read. - Scheduler.schedule_task_device_timer(event->TaskIndex, millis() + 10); + if (enabled) { + // Schedule the plugin to be read. + // Do this before actual init, to allow the plugin to schedule a specific first read. + Scheduler.schedule_task_device_timer(event->TaskIndex, millis() + 10); - if (!PluginCall(PLUGIN_INIT, event, dummy)) { - return false; + if (!PluginCall(PLUGIN_INIT, event, dummy)) { + return false; + } } } return true; diff --git a/src/src/PluginStructs/P146_data_struct.cpp b/src/src/PluginStructs/P146_data_struct.cpp index 4fcaf740c..61b867c27 100644 --- a/src/src/PluginStructs/P146_data_struct.cpp +++ b/src/src/PluginStructs/P146_data_struct.cpp @@ -458,9 +458,11 @@ bool P146_data_struct::sendViaEvent_AllCache(taskIndex_t P146_TaskIndex, String eventvalues; reserve_special(eventvalues, 64); // Enough for most use cases, prevent lots of memory allocations. eventvalues = strformat( - F("%d,%d"), + F("%d,%d,%d,%d"), element.unixTime, - element.valueCount); + element.valueCount, + peekFileNr, + peekReadPos); for (uint8_t varNr = 0; varNr < element.valueCount; ++varNr) { eventvalues += ','; diff --git a/src/src/PluginStructs/P146_data_struct.h b/src/src/PluginStructs/P146_data_struct.h index 1dadcf11d..0ee378a3d 100644 --- a/src/src/PluginStructs/P146_data_struct.h +++ b/src/src/PluginStructs/P146_data_struct.h @@ -82,7 +82,7 @@ public: bool sendTimestamp); // Send as event using the following format: - // TaskName#AllCache,,,,..., + // TaskName#AllCache,,,,,,..., static bool sendViaEvent_AllCache(taskIndex_t P146_TaskIndex, bool sendTimestamp); From 1b7e5e120cc14da715974f08431bf7702a21298f Mon Sep 17 00:00:00 2001 From: TD-er Date: Mon, 29 Sep 2025 22:11:36 +0200 Subject: [PATCH 303/564] [CacheReader] Fix continue reading after crash/reboot --- src/_P146_CacheControllerReader.ino | 21 +++++++- .../DataStructs/RTC_cache_handler_struct.cpp | 8 ++- src/src/Helpers/Misc.cpp | 31 ++++++------ src/src/PluginStructs/P146_data_struct.cpp | 49 +++++++++++++++++++ src/src/PluginStructs/P146_data_struct.h | 5 ++ 5 files changed, 97 insertions(+), 17 deletions(-) diff --git a/src/_P146_CacheControllerReader.ino b/src/_P146_CacheControllerReader.ino index 602427f4b..0f905b08a 100644 --- a/src/_P146_CacheControllerReader.ino +++ b/src/_P146_CacheControllerReader.ino @@ -110,6 +110,16 @@ boolean Plugin_146(uint8_t function, struct EventStruct *event, String& string) ControllerCache.setPeekFilePos( P146_TASKVALUE_FILENR, P146_TASKVALUE_FILEPOS); + + int peekFileNr{}; + int peekReadPos = ControllerCache.getPeekFilePos(peekFileNr); + + if (peekReadPos >= 0) { + P146_SET_TASKVALUE_FILENR(peekFileNr); + P146_SET_TASKVALUE_FILEPOS(peekReadPos); + } + + success = initPluginTaskData( event->TaskIndex, new (std::nothrow) P146_data_struct(event)); @@ -204,6 +214,7 @@ boolean Plugin_146(uint8_t function, struct EventStruct *event, String& string) // addFormCheckBox(F("Send ReadPos"), F("sendreadpos"), P146_GET_SEND_READ_POS); addFormNumericBox(F("Minimal Send Interval"), F("minsendinterval"), P146_MINIMAL_SEND_INTERVAL, 0, 1000); + addUnit(F("ms")); addFormNumericBox(F("Max Message Size"), F("maxmsgsize"), P146_MQTT_MESSAGE_LENGTH, @@ -305,7 +316,15 @@ boolean Plugin_146(uint8_t function, struct EventStruct *event, String& string) if (equals(command, F("cachereader"))) { if (equals(subcommand, F("setreadpos"))) { - P146_data_struct::setPeekFilePos(event->Par2, event->Par3); + if (P146_data_struct::setPeekFilePos(event->Par2, event->Par3)) { + int peekFileNr{}; + int peekReadPos = ControllerCache.getPeekFilePos(peekFileNr); + + if (peekReadPos >= 0) { + P146_SET_TASKVALUE_FILENR(peekFileNr); + P146_SET_TASKVALUE_FILEPOS(peekReadPos); + } + } success = true; } else if (equals(subcommand, F("sendtaskinfo"))) { P146_data_struct *P146_data = static_cast(getPluginTaskData(event->TaskIndex)); diff --git a/src/src/DataStructs/RTC_cache_handler_struct.cpp b/src/src/DataStructs/RTC_cache_handler_struct.cpp index 28027fc83..19e3ce04a 100644 --- a/src/src/DataStructs/RTC_cache_handler_struct.cpp +++ b/src/src/DataStructs/RTC_cache_handler_struct.cpp @@ -258,8 +258,8 @@ bool RTC_cache_handler_struct::write(const uint8_t *data, unsigned int size) { // Mark all content as being processed and empty buffer. bool RTC_cache_handler_struct::flush() { - if (prepareFileForWrite()) { - if (RTC_cache.writePos > 0) { + if (RTC_cache.writePos > 0) { + if (prepareFileForWrite()) { #ifdef RTC_STRUCT_DEBUG size_t filesize = fw.size(); #endif // ifdef RTC_STRUCT_DEBUG @@ -375,6 +375,9 @@ void RTC_cache_handler_struct::closeOpenFiles() if (fp) { fp.close(); } + if (fw) { + fw.close(); + } } bool RTC_cache_handler_struct::deleteAllCacheBlocks() @@ -384,6 +387,7 @@ bool RTC_cache_handler_struct::deleteAllCacheBlocks() if (RTC_cache.readFileNr < RTC_cache.writeFileNr) { bool fileDeleted = false; int count = 0; + closeOpenFiles(); for (int fileNr = RTC_cache.readFileNr; count < 25 && fileNr < RTC_cache.writeFileNr; ++fileNr) { diff --git a/src/src/Helpers/Misc.cpp b/src/src/Helpers/Misc.cpp index 6ce9bf7dc..919bb2958 100644 --- a/src/src/Helpers/Misc.cpp +++ b/src/src/Helpers/Misc.cpp @@ -98,24 +98,27 @@ bool setTaskEnableStatus(struct EventStruct *event, bool enabled) // Only enable task if it has a Plugin configured if (validPluginID(Settings.getPluginID_for_task(event->TaskIndex)) || !enabled) { - String dummy; + if (enabled != Settings.TaskDeviceEnabled[event->TaskIndex]) + { + String dummy; - if (!enabled) { - PluginCall(PLUGIN_EXIT, event, dummy); - } + if (!enabled) { + PluginCall(PLUGIN_EXIT, event, dummy); + } - // Toggle enable/disable state via command - // FIXME TD-er: Should this be a 'runtime' change, or actually change the intended state? - // Settings.TaskDeviceEnabled[event->TaskIndex].enabled = enabled; - Settings.TaskDeviceEnabled[event->TaskIndex] = enabled; + // Toggle enable/disable state via command + // FIXME TD-er: Should this be a 'runtime' change, or actually change the intended state? + // Settings.TaskDeviceEnabled[event->TaskIndex].enabled = enabled; + Settings.TaskDeviceEnabled[event->TaskIndex] = enabled; - if (enabled) { - // Schedule the plugin to be read. - // Do this before actual init, to allow the plugin to schedule a specific first read. - Scheduler.schedule_task_device_timer(event->TaskIndex, millis() + 10); + if (enabled) { + // Schedule the plugin to be read. + // Do this before actual init, to allow the plugin to schedule a specific first read. + Scheduler.schedule_task_device_timer(event->TaskIndex, millis() + 10); - if (!PluginCall(PLUGIN_INIT, event, dummy)) { - return false; + if (!PluginCall(PLUGIN_INIT, event, dummy)) { + return false; + } } } return true; diff --git a/src/src/PluginStructs/P146_data_struct.cpp b/src/src/PluginStructs/P146_data_struct.cpp index 680d1b2f1..33ec14d60 100644 --- a/src/src/PluginStructs/P146_data_struct.cpp +++ b/src/src/PluginStructs/P146_data_struct.cpp @@ -410,6 +410,55 @@ bool P146_data_struct::sendViaOriginalTask( return success; } +bool P146_data_struct::sendViaEvent_AllCache(taskIndex_t P146_TaskIndex, + bool sendTimestamp) +{ + if (!Settings.UseRules) { return false; } + + // Keep the current peek position, so we can reset it when we fail to deliver the data to the controller. + int peekFileNr = 0; + const int peekReadPos = ControllerCache.getPeekFilePos(peekFileNr); + + + C016_binary_element element{}; + + if (!C016_getTaskSample(element)) { + return false; + } + + if (!validTaskIndex(element.TaskIndex)) { + return false; + } + + const deviceIndex_t DeviceIndex = getDeviceIndex_from_TaskIndex(element.TaskIndex); + + if (!validDeviceIndex(DeviceIndex)) { + return false; + } + + String eventvalues; + reserve_special(eventvalues, 64); // Enough for most use cases, prevent lots of memory allocations. + eventvalues = strformat( + F("%d,%d,%d,%d"), + element.unixTime, + element.valueCount, + peekFileNr, + peekReadPos); + + for (uint8_t varNr = 0; varNr < element.valueCount; ++varNr) { + eventvalues += ','; + uint8_t nrDecimals = 0; + + if (Device[DeviceIndex].configurableDecimals()) { + nrDecimals = Cache.getTaskDeviceValueDecimals(element.TaskIndex, varNr); + } + + eventvalues += element.values.getAsString(varNr, element.sensorType, nrDecimals); + } + eventQueue.add(element.TaskIndex, F("AllCache"), eventvalues); + return true; +} + bool P146_data_struct::setPeekFilePos(int peekFileNr, int peekReadPos) { { diff --git a/src/src/PluginStructs/P146_data_struct.h b/src/src/PluginStructs/P146_data_struct.h index 5761bae49..8b988a972 100644 --- a/src/src/PluginStructs/P146_data_struct.h +++ b/src/src/PluginStructs/P146_data_struct.h @@ -75,6 +75,11 @@ public: static bool sendViaOriginalTask(taskIndex_t P146_TaskIndex, bool sendTimestamp); + // Send as event using the following format: + // TaskName#AllCache,,,,,,..., + static bool sendViaEvent_AllCache(taskIndex_t P146_TaskIndex, + bool sendTimestamp); + static bool setPeekFilePos(int peekFileNr, int peekReadPos); From 2274a82ece0ac803436146c97a95c18da2873e86 Mon Sep 17 00:00:00 2001 From: TD-er Date: Mon, 29 Sep 2025 15:20:21 +0200 Subject: [PATCH 304/564] [CacheReader] Fix reading cache files from CacheController --- src/src/DataStructs/RTC_cache_handler_struct.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/src/DataStructs/RTC_cache_handler_struct.cpp b/src/src/DataStructs/RTC_cache_handler_struct.cpp index 19e3ce04a..3bf190bac 100644 --- a/src/src/DataStructs/RTC_cache_handler_struct.cpp +++ b/src/src/DataStructs/RTC_cache_handler_struct.cpp @@ -76,7 +76,7 @@ bool RTC_cache_handler_struct::peekDataAvailable() const { if (_peekfilenr == RTC_cache.writeFileNr) { if (fw) { constexpr size_t errorcode = (size_t)-1; - size_t pos = fp.position(); + size_t pos = fw.position(); if (pos == errorcode) { pos = 0; } From 04ba656bb42f5a7a2539f11e7cbb1c8988b18841 Mon Sep 17 00:00:00 2001 From: TD-er Date: Mon, 29 Sep 2025 15:21:17 +0200 Subject: [PATCH 305/564] [CacheReader] Add support for 64bit ints + output as events --- src/_P146_CacheControllerReader.ino | 53 +++++++++--- src/src/DataStructs/DeviceStruct.h | 2 +- src/src/PluginStructs/P146_data_struct.cpp | 54 +++++++----- src/src/PluginStructs/P146_data_struct.h | 13 ++- src/src/WebServer/DevicesPage.cpp | 95 ++++++++++++---------- 5 files changed, 138 insertions(+), 79 deletions(-) diff --git a/src/_P146_CacheControllerReader.ino b/src/_P146_CacheControllerReader.ino index 0f905b08a..14ded7ff0 100644 --- a/src/_P146_CacheControllerReader.ino +++ b/src/_P146_CacheControllerReader.ino @@ -45,12 +45,13 @@ boolean Plugin_146(uint8_t function, struct EventStruct *event, String& string) case PLUGIN_DEVICE_ADD: { auto& dev = Device[++deviceCount]; - dev.Number = PLUGIN_ID_146; - dev.Type = DEVICE_TYPE_DUMMY; - dev.VType = Sensor_VType::SENSOR_TYPE_DUAL; - dev.ValueCount = 2; - dev.SendDataOption = true; - dev.OutputDataType = Output_Data_type_t::Default; + dev.Number = PLUGIN_ID_146; + dev.Type = DEVICE_TYPE_DUMMY; + dev.VType = Sensor_VType::SENSOR_TYPE_DUAL; + dev.ValueCount = 2; + dev.SendDataOption = true; + dev.OutputDataType = Output_Data_type_t::Default; + dev.HideDerivedValues = true; break; } @@ -126,6 +127,12 @@ boolean Plugin_146(uint8_t function, struct EventStruct *event, String& string) break; } + case PLUGIN_EXIT: + { + P146_data_struct::flush(); + break; + } + case PLUGIN_READ: { if (ControllerCache.peekDataAvailable()) { @@ -142,10 +149,20 @@ boolean Plugin_146(uint8_t function, struct EventStruct *event, String& string) P146_data->prepareCSVInBulk(event->TaskIndex, P146_GET_JOIN_TIMESTAMP, P146_GET_ONLY_SET_TASKS, separator); } } - } else { + } else if (P146_GET_SEND_VIA_ORIG_TASK || P146_GET_SEND_VIA_EVENT) { // Do not set the "success" or else the task values of this Cache reader task will be sent to the same controller too. - if (P146_data_struct::sendViaOriginalTask(event->TaskIndex, P146_GET_SEND_TIMESTAMP)) { + bool processed = false; + + if (P146_GET_SEND_VIA_ORIG_TASK && P146_data_struct::sendViaOriginalTask(event->TaskIndex, P146_GET_SEND_TIMESTAMP)) { + processed = true; + } + + if (P146_GET_SEND_VIA_EVENT && P146_data_struct::sendViaEvent_AllCache(event->TaskIndex, P146_GET_SEND_TIMESTAMP)) { + processed = true; + } + + if (processed) { int readFileNr = 0; const int readPos = ControllerCache.getPeekFilePos(readFileNr); @@ -227,7 +244,10 @@ boolean Plugin_146(uint8_t function, struct EventStruct *event, String& string) addFormTextBox(F("Publish Topic"), getPluginCustomArgName(P146_PublishTopicIndex), strings[P146_PublishTopicIndex], P146_Nchars); - // addFormSubHeader(F("Non MQTT Output Options")); + addFormSubHeader(F("Non MQTT Output Options")); + addFormCheckBox(F("Send via Original Task"), F("origTask"), P146_GET_SEND_VIA_ORIG_TASK); + addFormCheckBox(F("Send as Event"), F("sendEvent"), P146_GET_SEND_VIA_EVENT); + // addFormCheckBox(F("Send Timestamp"), F("sendtimestamp"), P146_GET_SEND_TIMESTAMP); addTableSeparator(F("Export to CSV"), 2, 3); @@ -256,11 +276,15 @@ boolean Plugin_146(uint8_t function, struct EventStruct *event, String& string) html_add_button_prefix(); addHtml(F("dumpcache?separator=")); - switch (static_cast(P146_SEPARATOR_CHARACTER)) { - case '\t': addHtml(F("Tab")); break; - case ',': addHtml(F("Comma")); break; + switch (static_cast(P146_SEPARATOR_CHARACTER)) + { + case '\t': addHtml(F("Tab")); + break; + case ',': addHtml(F("Comma")); + break; case ';': - default: addHtml(F("Semicolon")); break; + default: addHtml(F("Semicolon")); + break; } if (P146_GET_JOIN_TIMESTAMP) { @@ -292,6 +316,9 @@ boolean Plugin_146(uint8_t function, struct EventStruct *event, String& string) P146_SET_ONLY_SET_TASKS(isFormItemChecked(F("onlysettasks"))); P146_SEPARATOR_CHARACTER = getFormItemInt(F("separator")); + P146_SET_SEND_VIA_ORIG_TASK(isFormItemChecked(F("origTask"))); + P146_SET_SEND_VIA_EVENT(isFormItemChecked(F("sendEvent"))); + String strings[P146_Nlines]; for (uint8_t varNr = 0; varNr < P146_Nlines; varNr++) { diff --git a/src/src/DataStructs/DeviceStruct.h b/src/src/DataStructs/DeviceStruct.h index be2d3c777..fc41285e6 100644 --- a/src/src/DataStructs/DeviceStruct.h +++ b/src/src/DataStructs/DeviceStruct.h @@ -116,7 +116,7 @@ struct DeviceStruct uint32_t CustomVTypeVar : 1; // User-selectable VType per value uint32_t MqttStateClass : 1; // MQTT StateClass setting in DevicesPage - uint32_t Dummy23 : 1; // Dummy added to force alignment, can be re-used + uint32_t HideDerivedValues : 1; // Hide the options for derived values uint32_t Dummy24 : 1; // Dummy added to force alignment, can be re-used uint32_t Dummy25 : 1; // Dummy added to force alignment, can be re-used uint32_t Dummy26 : 1; // Dummy added to force alignment, can be re-used diff --git a/src/src/PluginStructs/P146_data_struct.cpp b/src/src/PluginStructs/P146_data_struct.cpp index 33ec14d60..300dc14ad 100644 --- a/src/src/PluginStructs/P146_data_struct.cpp +++ b/src/src/PluginStructs/P146_data_struct.cpp @@ -3,10 +3,10 @@ #ifdef USES_P146 # include "../ControllerQueue/C016_queue_element.h" +# include "../ESPEasyCore/ESPEasyRules.h" # include "../Globals/C016_ControllerCache.h" # include "../Globals/MQTT.h" - P146_data_struct::P146_data_struct(struct EventStruct *event) { LoadCustomTaskSettings(event->TaskIndex, _topics, P146_Nlines, 0); @@ -27,7 +27,7 @@ P146_data_struct::~P146_data_struct() uint32_t writeToMqtt(const String& str, bool send) { if (send) { - MQTTclient.write((const uint8_t*)str.c_str(), str.length()); + MQTTclient.write((const uint8_t *)str.c_str(), str.length()); } return str.length(); } @@ -338,17 +338,22 @@ bool P146_data_struct::sendViaOriginalTask( const int peekReadPos = ControllerCache.getPeekFilePos(peekFileNr); - unsigned long timestamp; - uint8_t valueCount; - float taskValues[VARS_PER_TASK] = {}; - EventStruct tmpEvent(C016_getTaskSample( - timestamp, valueCount, - taskValues[0], taskValues[1], taskValues[2], taskValues[3])); + C016_binary_element element{}; - if (!validTaskIndex(tmpEvent.TaskIndex)) { + if (!C016_getTaskSample(element)) { return false; } + if (!validTaskIndex(element.TaskIndex)) { + return false; + } + + if (Settings.UseRules) { + EventStruct tmpEvent(element.TaskIndex); + createRuleEvents(&tmpEvent); + } + + bool success = false; bool unusableSample = false; @@ -362,16 +367,23 @@ bool P146_data_struct::sendViaOriginalTask( // - Copy values from the cache bin files to the task it had // - Call CPLUGIN_PROTOCOL_SEND // - Restore the values - for (int valIndex = 0; valIndex < VARS_PER_TASK; ++valIndex) { - const float tmp = UserVar.getFloat(tmpEvent.TaskIndex, valIndex); - UserVar.setFloat(tmpEvent.TaskIndex, valIndex, taskValues[valIndex]); - taskValues[valIndex] = tmp; + + TaskValues_Data_t tmp; + { + const TaskValues_Data_t*data = UserVar.getRawTaskValues_Data(element.TaskIndex); + + if (data != nullptr) { + for (uint8_t i = 0; i < element.valueCount; ++i) { + tmp.copyValue(*data, i, element.sensorType); + } + } } for (controllerIndex_t x = 0; !unusableSample && x < CONTROLLER_MAX; x++) { // Make sure we are not sending to the cache controller. if (Settings.Protocol[x] != 16) { + EventStruct tmpEvent(element.TaskIndex); tmpEvent.ControllerIndex = x; tmpEvent.idx = Settings.TaskDeviceID[x][P146_TaskIndex]; @@ -397,10 +409,14 @@ bool P146_data_struct::sendViaOriginalTask( } } - for (int valIndex = 0; valIndex < VARS_PER_TASK; ++valIndex) { - const float tmp = UserVar.getFloat(tmpEvent.TaskIndex, valIndex); - UserVar.setFloat(tmpEvent.TaskIndex, valIndex, taskValues[valIndex]); - taskValues[valIndex] = tmp; + { + TaskValues_Data_t*data = UserVar.getRawTaskValues_Data(element.TaskIndex); + + if (data != nullptr) { + for (uint8_t i = 0; i < element.valueCount; ++i) { + data->copyValue(tmp, i, element.sensorType); + } + } } if (!success && !unusableSample) { @@ -476,9 +492,7 @@ bool P146_data_struct::setPeekFilePos(int peekFileNr, int peekReadPos) return true; } -void P146_data_struct::flush() { - C016_flush(); -} +void P146_data_struct::flush() { C016_flush(); } bool P146_data_struct::getPeekFilePos(int& peekFileNr, int& peekReadPos, int& peekFileSize) const { peekFileNr = 0; diff --git a/src/src/PluginStructs/P146_data_struct.h b/src/src/PluginStructs/P146_data_struct.h index 8b988a972..0ee378a3d 100644 --- a/src/src/PluginStructs/P146_data_struct.h +++ b/src/src/PluginStructs/P146_data_struct.h @@ -15,10 +15,10 @@ # define P146_TASKVALUE_FILENR UserVar.getFloat(event->TaskIndex, 0) -# define P146_SET_TASKVALUE_FILENR(x) UserVar.setFloat(event->TaskIndex, 0, x) +# define P146_SET_TASKVALUE_FILENR(x) UserVar.setFloat(event->TaskIndex, 0, x) # define P146_TASKVALUE_FILEPOS UserVar.getFloat(event->TaskIndex, 1) -# define P146_SET_TASKVALUE_FILEPOS(x) UserVar.setFloat(event->TaskIndex, 1, x) +# define P146_SET_TASKVALUE_FILEPOS(x) UserVar.setFloat(event->TaskIndex, 1, x) # define P146_GET_SEND_BINARY bitRead(PCONFIG(0), 0) # define P146_SET_SEND_BINARY(X) bitWrite(PCONFIG(0), 0, X) @@ -30,7 +30,7 @@ # define P146_SET_SEND_TIMESTAMP(X) bitWrite(PCONFIG(0), 2, X) # define P146_GET_SEND_READ_POS bitRead(PCONFIG(0), 3) -# define P146_SET_SEND_READ_POS(X) bitWrite(PCONFIG(0), 3, X) +# define P146_SET_SEND_READ_POS(X) bitWrite(PCONFIG(0), 3, X) # define P146_GET_JOIN_TIMESTAMP bitRead(PCONFIG(0), 4) # define P146_SET_JOIN_TIMESTAMP(X) bitWrite(PCONFIG(0), 4, X) @@ -41,6 +41,12 @@ # define P146_GET_ERASE_BINFILES bitRead(PCONFIG(0), 6) # define P146_SET_ERASE_BINFILES(X) bitWrite(PCONFIG(0), 6, X) +# define P146_GET_SEND_VIA_ORIG_TASK bitRead(PCONFIG(7), 1) +# define P146_SET_SEND_VIA_ORIG_TASK(X) bitWrite(PCONFIG(7), 1, X) + +# define P146_GET_SEND_VIA_EVENT bitRead(PCONFIG(8), 1) +# define P146_SET_SEND_VIA_EVENT(X) bitWrite(PCONFIG(8), 1, X) + # define P146_SEPARATOR_CHARACTER PCONFIG(1) @@ -99,6 +105,7 @@ private: ESPEasyControllerCache_CSV_dumper *dumper = nullptr; std::listlines; + }; diff --git a/src/src/WebServer/DevicesPage.cpp b/src/src/WebServer/DevicesPage.cpp index 1253bc6a5..d1b1eaee4 100644 --- a/src/src/WebServer/DevicesPage.cpp +++ b/src/src/WebServer/DevicesPage.cpp @@ -390,8 +390,10 @@ void handle_devices_CopySubmittedSettings(taskIndex_t taskIndex, pluginID_t task update_whenset_FormItemInt(F("remoteFeed"), Settings.TaskDeviceDataFeed[taskIndex]); Settings.CombineTaskValues_SingleEvent(taskIndex, isFormItemChecked(F("TVSE"))); #if FEATURE_STRING_VARIABLES - Settings.ShowDerivedTaskValues(taskIndex, isFormItemChecked(F("TSDV"))); - Settings.EventAndLogDerivedTaskValues(taskIndex, isFormItemChecked(F("TELD"))); + if (!device.HideDerivedValues) { + Settings.ShowDerivedTaskValues(taskIndex, isFormItemChecked(F("TSDV"))); + Settings.EventAndLogDerivedTaskValues(taskIndex, isFormItemChecked(F("TELD"))); + } #endif // if FEATURE_STRING_VARIABLES for (controllerIndex_t controllerNr = 0; controllerNr < CONTROLLER_MAX; controllerNr++) @@ -406,6 +408,7 @@ void handle_devices_CopySubmittedSettings(taskIndex_t taskIndex, pluginID_t task } # endif // if FEATURE_MQTT_DISCOVER #if FEATURE_STRING_VARIABLES + if (!device.HideDerivedValues) Settings.SendDerivedTaskValues(taskIndex, controllerNr, isFormItemChecked(getPluginCustomArgName(F("TSND"), controllerNr))); #endif // if FEATURE_STRING_VARIABLES #if FEATURE_MQTT && FEATURE_MQTT_DISCOVER @@ -825,6 +828,7 @@ void handle_devicess_ShowAllTasksTable(uint8_t page) html_TD(); if (validDeviceIndex(DeviceIndex)) { + const DeviceStruct& device = Device[DeviceIndex]; String customValuesString; const bool customValues = PluginCall(PLUGIN_WEBFORM_SHOW_VALUES, &TempEvent, customValuesString); @@ -846,7 +850,9 @@ void handle_devicess_ShowAllTasksTable(uint8_t page) const String value = formatUserVarNoCheck(&TempEvent, varNr); #if FEATURE_STRING_VARIABLES bool hasPresentation = false; - const String presentation = formatUserVarForPresentation(&TempEvent, varNr, hasPresentation, value, DeviceIndex); + String presentation; + if (!device.HideDerivedValues) + presentation = formatUserVarForPresentation(&TempEvent, varNr, hasPresentation, value, DeviceIndex); #endif // if FEATURE_STRING_VARIABLES pluginWebformShowValue( x, @@ -865,47 +871,49 @@ void handle_devicess_ShowAllTasksTable(uint8_t page) } #if FEATURE_STRING_VARIABLES - int varNr = VARS_PER_TASK; - if (Settings.ShowDerivedTaskValues(x)) { - String taskName = getTaskDeviceName(x); - taskName.toLowerCase(); - String postfix; - const String search = getDerivedValueSearchAndPostfix(taskName, postfix); + if (!device.HideDerivedValues) { + int varNr = VARS_PER_TASK; + if (Settings.ShowDerivedTaskValues(x)) { + String taskName = getTaskDeviceName(x); + taskName.toLowerCase(); + String postfix; + const String search = getDerivedValueSearchAndPostfix(taskName, postfix); - auto it = customStringVar.begin(); - while (it != customStringVar.end()) { - if (it->first.startsWith(search) && it->first.endsWith(postfix)) { - String valueName = it->first.substring(search.length(), it->first.indexOf('-')); - String uom; - String vType; - const String vname2 = getDerivedValueNameUomAndVType(taskName, valueName, uom, vType); - if (!vname2.isEmpty()) { - valueName = vname2; - } - if (!it->second.isEmpty()) { - String value(it->second); - value = parseTemplateAndCalculate(value); - String presentation = getCustomStringVar(strformat(F(TASK_VALUE_PRESENTATION_PREFIX_TEMPLATE), taskName.c_str(), valueName.c_str())); - if (!uom.isEmpty()) { - value = strformat(F("%s %s"), value.c_str(), uom.c_str()); + auto it = customStringVar.begin(); + while (it != customStringVar.end()) { + if (it->first.startsWith(search) && it->first.endsWith(postfix)) { + String valueName = it->first.substring(search.length(), it->first.indexOf('-')); + String uom; + String vType; + const String vname2 = getDerivedValueNameUomAndVType(taskName, valueName, uom, vType); + if (!vname2.isEmpty()) { + valueName = vname2; } - if (!presentation.isEmpty()) { - stripEscapeCharacters(presentation); - presentation.replace(F("%value%"), value); - value = parseTemplate(presentation); + if (!it->second.isEmpty()) { + String value(it->second); + value = parseTemplateAndCalculate(value); + String presentation = getCustomStringVar(strformat(F(TASK_VALUE_PRESENTATION_PREFIX_TEMPLATE), taskName.c_str(), valueName.c_str())); + if (!uom.isEmpty()) { + value = strformat(F("%s %s"), value.c_str(), uom.c_str()); + } + if (!presentation.isEmpty()) { + stripEscapeCharacters(presentation); + presentation.replace(F("%value%"), value); + value = parseTemplate(presentation); + } + pluginWebformShowValue( + x, + varNr, + valueName, + value); + ++varNr; } - pluginWebformShowValue( - x, - varNr, - valueName, - value); - ++varNr; } + else if (it->first.substring(0, search.length()).compareTo(search) > 0) { + break; + } + ++it; } - else if (it->first.substring(0, search.length()).compareTo(search) > 0) { - break; - } - ++it; } } #endif // if FEATURE_STRING_VARIABLES @@ -1564,8 +1572,10 @@ void devicePage_show_controller_config(taskIndex_t taskIndex, deviceIndex_t Devi getTaskDeviceName(taskIndex).c_str())); #if FEATURE_STRING_VARIABLES - addFormCheckBox(F("Show derived values"), F("TSDV"), Settings.ShowDerivedTaskValues(taskIndex)); - addFormCheckBox(F("Event & Log derived values"), F("TELD"), Settings.EventAndLogDerivedTaskValues(taskIndex)); + if (!device.HideDerivedValues) { + addFormCheckBox(F("Show derived values"), F("TSDV"), Settings.ShowDerivedTaskValues(taskIndex)); + addFormCheckBox(F("Event & Log derived values"), F("TELD"), Settings.EventAndLogDerivedTaskValues(taskIndex)); + } #endif // if FEATURE_STRING_VARIABLES bool separatorAdded = false; @@ -1600,7 +1610,8 @@ void devicePage_show_controller_config(taskIndex_t taskIndex, deviceIndex_t Devi getProtocolStruct(ProtocolIndex).mqttAutoDiscover); # endif // if FEATURE_MQTT_DISCOVER # if FEATURE_STRING_VARIABLES - const bool allowSendDerived = (validProtocolIndex(ProtocolIndex) && + const bool allowSendDerived = !device.HideDerivedValues && + (validProtocolIndex(ProtocolIndex) && getProtocolStruct(ProtocolIndex).allowSendDerived); # endif // if FEATURE_STRING_VARIABLES From f0cbd9007c703a23942105fc3f9f4627fc621377 Mon Sep 17 00:00:00 2001 From: TD-er Date: Mon, 29 Sep 2025 23:22:43 +0200 Subject: [PATCH 306/564] [CacheReader] Fix incorrect settings array index --- src/_P146_CacheControllerReader.ino | 7 +++++-- src/src/PluginStructs/P146_data_struct.h | 8 ++++---- 2 files changed, 9 insertions(+), 6 deletions(-) diff --git a/src/_P146_CacheControllerReader.ino b/src/_P146_CacheControllerReader.ino index 14ded7ff0..2b9014138 100644 --- a/src/_P146_CacheControllerReader.ino +++ b/src/_P146_CacheControllerReader.ino @@ -225,13 +225,16 @@ boolean Plugin_146(uint8_t function, struct EventStruct *event, String& string) case PLUGIN_WEBFORM_LOAD: { addFormCheckBox(F("Delete Cache Files After Send"), F("deletebin"), P146_GET_ERASE_BINFILES); + + addFormSubHeader(F("Read Rate")); + addFormNumericBox(F("Minimal Send Interval"), F("minsendinterval"), P146_MINIMAL_SEND_INTERVAL, 0, 1000); + addUnit(F("ms")); + addFormSubHeader(F("MQTT Output Options")); addFormCheckBox(F("Send Bulk"), F("sendbulk"), P146_GET_SEND_BULK); addFormCheckBox(F("HEX encoded Binary"), F("binary"), P146_GET_SEND_BINARY); // addFormCheckBox(F("Send ReadPos"), F("sendreadpos"), P146_GET_SEND_READ_POS); - addFormNumericBox(F("Minimal Send Interval"), F("minsendinterval"), P146_MINIMAL_SEND_INTERVAL, 0, 1000); - addUnit(F("ms")); addFormNumericBox(F("Max Message Size"), F("maxmsgsize"), P146_MQTT_MESSAGE_LENGTH, diff --git a/src/src/PluginStructs/P146_data_struct.h b/src/src/PluginStructs/P146_data_struct.h index 0ee378a3d..413c96ea5 100644 --- a/src/src/PluginStructs/P146_data_struct.h +++ b/src/src/PluginStructs/P146_data_struct.h @@ -41,11 +41,11 @@ # define P146_GET_ERASE_BINFILES bitRead(PCONFIG(0), 6) # define P146_SET_ERASE_BINFILES(X) bitWrite(PCONFIG(0), 6, X) -# define P146_GET_SEND_VIA_ORIG_TASK bitRead(PCONFIG(7), 1) -# define P146_SET_SEND_VIA_ORIG_TASK(X) bitWrite(PCONFIG(7), 1, X) +# define P146_GET_SEND_VIA_ORIG_TASK bitRead(PCONFIG(0), 7) +# define P146_SET_SEND_VIA_ORIG_TASK(X) bitWrite(PCONFIG(0), 7, X) -# define P146_GET_SEND_VIA_EVENT bitRead(PCONFIG(8), 1) -# define P146_SET_SEND_VIA_EVENT(X) bitWrite(PCONFIG(8), 1, X) +# define P146_GET_SEND_VIA_EVENT bitRead(PCONFIG(0), 8) +# define P146_SET_SEND_VIA_EVENT(X) bitWrite(PCONFIG(0), 8, X) # define P146_SEPARATOR_CHARACTER PCONFIG(1) From b7d595cfca3fdd0e8a1e10bddf5c03b99b42ab87 Mon Sep 17 00:00:00 2001 From: TD-er Date: Mon, 29 Sep 2025 23:22:43 +0200 Subject: [PATCH 307/564] [CacheReader] Fix incorrect settings array index --- src/_P146_CacheControllerReader.ino | 7 +++++-- src/src/PluginStructs/P146_data_struct.h | 8 ++++---- 2 files changed, 9 insertions(+), 6 deletions(-) diff --git a/src/_P146_CacheControllerReader.ino b/src/_P146_CacheControllerReader.ino index 14ded7ff0..2b9014138 100644 --- a/src/_P146_CacheControllerReader.ino +++ b/src/_P146_CacheControllerReader.ino @@ -225,13 +225,16 @@ boolean Plugin_146(uint8_t function, struct EventStruct *event, String& string) case PLUGIN_WEBFORM_LOAD: { addFormCheckBox(F("Delete Cache Files After Send"), F("deletebin"), P146_GET_ERASE_BINFILES); + + addFormSubHeader(F("Read Rate")); + addFormNumericBox(F("Minimal Send Interval"), F("minsendinterval"), P146_MINIMAL_SEND_INTERVAL, 0, 1000); + addUnit(F("ms")); + addFormSubHeader(F("MQTT Output Options")); addFormCheckBox(F("Send Bulk"), F("sendbulk"), P146_GET_SEND_BULK); addFormCheckBox(F("HEX encoded Binary"), F("binary"), P146_GET_SEND_BINARY); // addFormCheckBox(F("Send ReadPos"), F("sendreadpos"), P146_GET_SEND_READ_POS); - addFormNumericBox(F("Minimal Send Interval"), F("minsendinterval"), P146_MINIMAL_SEND_INTERVAL, 0, 1000); - addUnit(F("ms")); addFormNumericBox(F("Max Message Size"), F("maxmsgsize"), P146_MQTT_MESSAGE_LENGTH, diff --git a/src/src/PluginStructs/P146_data_struct.h b/src/src/PluginStructs/P146_data_struct.h index 0ee378a3d..413c96ea5 100644 --- a/src/src/PluginStructs/P146_data_struct.h +++ b/src/src/PluginStructs/P146_data_struct.h @@ -41,11 +41,11 @@ # define P146_GET_ERASE_BINFILES bitRead(PCONFIG(0), 6) # define P146_SET_ERASE_BINFILES(X) bitWrite(PCONFIG(0), 6, X) -# define P146_GET_SEND_VIA_ORIG_TASK bitRead(PCONFIG(7), 1) -# define P146_SET_SEND_VIA_ORIG_TASK(X) bitWrite(PCONFIG(7), 1, X) +# define P146_GET_SEND_VIA_ORIG_TASK bitRead(PCONFIG(0), 7) +# define P146_SET_SEND_VIA_ORIG_TASK(X) bitWrite(PCONFIG(0), 7, X) -# define P146_GET_SEND_VIA_EVENT bitRead(PCONFIG(8), 1) -# define P146_SET_SEND_VIA_EVENT(X) bitWrite(PCONFIG(8), 1, X) +# define P146_GET_SEND_VIA_EVENT bitRead(PCONFIG(0), 8) +# define P146_SET_SEND_VIA_EVENT(X) bitWrite(PCONFIG(0), 8, X) # define P146_SEPARATOR_CHARACTER PCONFIG(1) From 870be68c5232ea8d315e23f1fb1074f3278c739c Mon Sep 17 00:00:00 2001 From: TD-er Date: Tue, 30 Sep 2025 13:03:28 +0200 Subject: [PATCH 308/564] [Cleanup] Only show MQTT connected stats on enabled controller --- src/src/DataStructs/SettingsStruct.h | 4 ++-- src/src/DataStructs_templ/SettingsStruct.cpp | 1 + src/src/WebServer/ControllerPage.cpp | 14 +++++++------- 3 files changed, 10 insertions(+), 9 deletions(-) diff --git a/src/src/DataStructs/SettingsStruct.h b/src/src/DataStructs/SettingsStruct.h index 4c57018a4..1139a13da 100644 --- a/src/src/DataStructs/SettingsStruct.h +++ b/src/src/DataStructs/SettingsStruct.h @@ -663,8 +663,8 @@ public: uint32_t ShowUnitOfMeasureOnDevicesPage : 1; // Bit 07 // inverted uint32_t WiFi_band_mode : 2; // Bit 08 & 09 uint32_t WiFi_AP_enable_NAPT : 1; // Bit 10 // inverted - uint32_t unused_11 : 1; // Bit 11 - uint32_t unused_12 : 1; // Bit 12 + uint32_t RestoreUserVarsFromEEPROMOnColdBoot : 1; // Bit 11 + uint32_t RestoreUserVarsFromEEPROMOnWarmBoot : 1; // Bit 12 uint32_t MQTTConnectInBackground : 1; // Bit 13 // inverted uint32_t unused_14 : 1; // Bit 14 uint32_t unused_15 : 1; // Bit 15 diff --git a/src/src/DataStructs_templ/SettingsStruct.cpp b/src/src/DataStructs_templ/SettingsStruct.cpp index e865cc819..886ff6bce 100644 --- a/src/src/DataStructs_templ/SettingsStruct.cpp +++ b/src/src/DataStructs_templ/SettingsStruct.cpp @@ -651,6 +651,7 @@ void SettingsStruct_tmpl::clearLogSettings() { template void SettingsStruct_tmpl::clearUnitNameSettings() { Unit = 0; + appendUnitToHostname(false); ZERO_FILL(Name); UDPPort = 0; } diff --git a/src/src/WebServer/ControllerPage.cpp b/src/src/WebServer/ControllerPage.cpp index 6a94e0078..1a36ce3d2 100644 --- a/src/src/WebServer/ControllerPage.cpp +++ b/src/src/WebServer/ControllerPage.cpp @@ -485,13 +485,13 @@ void handle_controllers_ControllerSettingsPage(controllerIndex_t controllerindex addHtmlError(F("Bug in CPlugin::Function::CPLUGIN_WEBFORM_LOAD, should not append to string, use addHtml() instead")); } } - { + # if FEATURE_MQTT - if (proto.usesMQTT) { - addFormSubHeader(F("Connection Status")); - addRowLabel(F("MQTT Client Connected")); - addEnabled(MQTTclient_connected); + if (proto.usesMQTT && Settings.ControllerEnabled[controllerindex]) { + addFormSubHeader(F("Connection Status")); + addRowLabel(F("MQTT Client Connected")); + addEnabled(MQTTclient_connected); if (MQTTclient_connected) { auto conn_duration = MQTTclient_connected_stats.getLastOnDuration_ms(); @@ -616,9 +616,9 @@ void handle_controllers_ControllerSettingsPage(controllerIndex_t controllerindex # endif // ifdef ESP32 } # endif // if FEATURE_MQTT_TLS - } -# endif // if FEATURE_MQTT } +# endif // if FEATURE_MQTT + } addFormSeparator(2); From a1b42f31ba451f708d26968077b508ea4ba15c1d Mon Sep 17 00:00:00 2001 From: TD-er Date: Tue, 30 Sep 2025 13:04:53 +0200 Subject: [PATCH 309/564] [CacheReader] Fix reading cache files when files are missing --- src/_P146_CacheControllerReader.ino | 11 +++- src/src/DataStructs/ESPEasyControllerCache.h | 2 +- .../DataStructs/ESPeasyControllerCache.cpp | 3 +- .../DataStructs/RTC_cache_handler_struct.cpp | 63 +++++++++++-------- .../DataStructs/RTC_cache_handler_struct.h | 5 +- src/src/Helpers/ESPEasy_Storage.cpp | 58 ++++++++++++++++- src/src/Helpers/ESPEasy_Storage.h | 2 + src/src/PluginStructs/P146_data_struct.cpp | 9 ++- src/src/WebServer/FileList.cpp | 49 +++++++++++---- src/src/WebServer/FileList.h | 2 +- 10 files changed, 152 insertions(+), 52 deletions(-) diff --git a/src/_P146_CacheControllerReader.ino b/src/_P146_CacheControllerReader.ino index 2b9014138..e345ee1bd 100644 --- a/src/_P146_CacheControllerReader.ino +++ b/src/_P146_CacheControllerReader.ino @@ -104,14 +104,15 @@ boolean Plugin_146(uint8_t function, struct EventStruct *event, String& string) case PLUGIN_INIT: { - // Init the controller cache handler, just in case the cache controller may not be enabled - ControllerCache.init(); - // Restore the last position from RTC when rebooting. ControllerCache.setPeekFilePos( P146_TASKVALUE_FILENR, P146_TASKVALUE_FILEPOS); + // Init the controller cache handler, just in case the cache controller may not be enabled + ControllerCache.init(); + + // Update the position based on actually present cache files. int peekFileNr{}; int peekReadPos = ControllerCache.getPeekFilePos(peekFileNr); @@ -180,6 +181,10 @@ boolean Plugin_146(uint8_t function, struct EventStruct *event, String& string) } else { // Default to 1 sec Scheduler.schedule_task_device_timer(event->TaskIndex, millis() + 1000); + int readFileNr = 0; + const int readPos = ControllerCache.getPeekFilePos(readFileNr); + P146_SET_TASKVALUE_FILENR(readFileNr); + P146_SET_TASKVALUE_FILEPOS(readPos); } break; diff --git a/src/src/DataStructs/ESPEasyControllerCache.h b/src/src/DataStructs/ESPEasyControllerCache.h index f27b99d49..a498ce030 100644 --- a/src/src/DataStructs/ESPEasyControllerCache.h +++ b/src/src/DataStructs/ESPEasyControllerCache.h @@ -42,7 +42,7 @@ struct ControllerCache_struct { void resetpeek(); - bool peekDataAvailable() const; + bool peekDataAvailable(); int getPeekFilePos(int& peekFileNr) const; diff --git a/src/src/DataStructs/ESPeasyControllerCache.cpp b/src/src/DataStructs/ESPeasyControllerCache.cpp index bae5fbee6..33742a54b 100644 --- a/src/src/DataStructs/ESPeasyControllerCache.cpp +++ b/src/src/DataStructs/ESPeasyControllerCache.cpp @@ -63,6 +63,7 @@ bool ControllerCache_struct::deleteOldestCacheBlock() { void ControllerCache_struct::closeOpenFiles() { if (_RTC_cache_handler != nullptr) { + _RTC_cache_handler->flush(); _RTC_cache_handler->closeOpenFiles(); } } @@ -87,7 +88,7 @@ void ControllerCache_struct::resetpeek() { } } -bool ControllerCache_struct::peekDataAvailable() const { +bool ControllerCache_struct::peekDataAvailable() { if (_RTC_cache_handler == nullptr) { return false; } diff --git a/src/src/DataStructs/RTC_cache_handler_struct.cpp b/src/src/DataStructs/RTC_cache_handler_struct.cpp index 3bf190bac..89fc1989e 100644 --- a/src/src/DataStructs/RTC_cache_handler_struct.cpp +++ b/src/src/DataStructs/RTC_cache_handler_struct.cpp @@ -65,8 +65,8 @@ void RTC_cache_handler_struct::resetpeek() { _peekreadpos = 0; } -bool RTC_cache_handler_struct::peekDataAvailable() const { - if (fp) { +bool RTC_cache_handler_struct::peekDataAvailable() { + if (openPeekFile()) { if ((_peekreadpos + 1) < fp.size()) { return true; } } if (_peekfilenr < RTC_cache.writeFileNr) { @@ -90,7 +90,7 @@ bool RTC_cache_handler_struct::peekDataAvailable() const { int RTC_cache_handler_struct::getPeekFilePos(int& peekFileNr) { peekFileNr = _peekfilenr; constexpr size_t errorcode = (size_t)-1; - if (fp) { + if (openPeekFile()) { size_t pos = fp.position(); if (pos == errorcode) { _peekreadpos = 0; @@ -114,7 +114,7 @@ int RTC_cache_handler_struct::getPeekFileSize(int peekFileNr) const { void RTC_cache_handler_struct::setPeekFilePos(int newPeekFileNr, int newPeekReadPos) { validateFilePos(newPeekFileNr, newPeekReadPos); - if (fp) { + if (openPeekFile(newPeekFileNr)) { constexpr size_t errorcode = (size_t)-1; size_t pos = fp.position(); if (pos == errorcode) { @@ -138,16 +138,7 @@ void RTC_cache_handler_struct::setPeekFilePos(int newPeekFileNr, int newPeekRead } } - - if (!fp) { - String fname = createCacheFilename(newPeekFileNr); - - if (fname.isEmpty()) { return; } - - fp = tryOpenFile(fname, "r"); - } - - if (fp) { + if (openPeekFile(newPeekFileNr)) { _peekfilenr = newPeekFileNr; if (newPeekReadPos > 0) { @@ -380,6 +371,31 @@ void RTC_cache_handler_struct::closeOpenFiles() } } +bool RTC_cache_handler_struct::openPeekFile(int newPeekFileNr) +{ + if (fp) { + const String fname = createCacheFilename(newPeekFileNr); + if (!fname.endsWith(fp.name())) { + fp.close(); + } + } + if (!fp) { + int filepos = _peekreadpos; + validateFilePos(newPeekFileNr, filepos); + _peekfilenr = newPeekFileNr; + _peekreadpos = filepos; + const String fname = createCacheFilename(_peekfilenr); + if (fname.isEmpty()) { return false; } + fp = tryOpenFile(fname, "r"); + } + return !!fp; // cast to bool and force using operator::bool() +} + +bool RTC_cache_handler_struct::openPeekFile() +{ + return openPeekFile(_peekfilenr); +} + bool RTC_cache_handler_struct::deleteAllCacheBlocks() { if (updateRTC_filenameCounters()) { @@ -427,13 +443,7 @@ bool RTC_cache_handler_struct::deleteCacheBlock(int fileNr) writeError = false; // Make sure the read and peek file handles cannot be used on possibly deleted files. - if (fr) { - fr.close(); - } - - if (fp) { - fp.close(); - } + closeOpenFiles(); if (tryDeleteFile(fname)) { fileDeleted = true; @@ -654,17 +664,16 @@ bool RTC_cache_handler_struct::prepareFileForWrite() { } void RTC_cache_handler_struct::validateFilePos(int& fileNr, int& readPos) { - { - // Check to see if we try to set it to a no longer existing file - if (fileNr < RTC_cache.readFileNr) { - fileNr = RTC_cache.readFileNr; - readPos = 0; - } + // Check to see if we try to set it to a no longer existing file + if (fileNr < RTC_cache.readFileNr) { + fileNr = RTC_cache.readFileNr; + readPos = 0; } if (fileNr > RTC_cache.writeFileNr) { // We're trying to set it to a not yet existing file fileNr = RTC_cache.writeFileNr; + readPos = 0; } } diff --git a/src/src/DataStructs/RTC_cache_handler_struct.h b/src/src/DataStructs/RTC_cache_handler_struct.h index 07367bb40..a7f525417 100644 --- a/src/src/DataStructs/RTC_cache_handler_struct.h +++ b/src/src/DataStructs/RTC_cache_handler_struct.h @@ -42,7 +42,7 @@ struct RTC_cache_handler_struct void resetpeek(); - bool peekDataAvailable() const; + bool peekDataAvailable(); int getPeekFilePos(int& peekFileNr); @@ -77,6 +77,9 @@ struct RTC_cache_handler_struct private: + bool openPeekFile(int newPeekFileNr); + bool openPeekFile(); + bool loadMetaData(); bool loadData(); diff --git a/src/src/Helpers/ESPEasy_Storage.cpp b/src/src/Helpers/ESPEasy_Storage.cpp index 736710f6b..9cc26db07 100644 --- a/src/src/Helpers/ESPEasy_Storage.cpp +++ b/src/src/Helpers/ESPEasy_Storage.cpp @@ -269,8 +269,9 @@ bool tryDeleteFile(const String& fname, FileDestination_e destination) { if (fname.length() > 0) { #if FEATURE_RTC_CACHE_STORAGE + const bool cacheFile = isCacheFile(fname); - if (isCacheFile(fname)) { + if (cacheFile) { ControllerCache.closeOpenFiles(); } #endif // if FEATURE_RTC_CACHE_STORAGE @@ -291,6 +292,11 @@ bool tryDeleteFile(const String& fname, FileDestination_e destination) { res = SD.remove(patch_fname(fname)); } #endif // if FEATURE_SD +#ifndef BUILD_NO_DEBUG + if (!res) { + addLog(LOG_LEVEL_ERROR, concat(F("Del : Could not delete "), patch_fname(fname))); + } +#endif // A call to GarbageCollection() will at most erase a single block. (e.g. 8k block size) // A deleted file may have covered more than a single block, so try to clear multiple blocks. @@ -299,6 +305,14 @@ bool tryDeleteFile(const String& fname, FileDestination_e destination) { while (retries > 0 && GarbageCollection()) { --retries; } +#if FEATURE_RTC_CACHE_STORAGE +/* + if (cacheFile) { + ControllerCache.updateRTC_filenameCounters(); + // FIXME TD-er: Tell Cache Reader a file has been deleted + } +*/ +#endif return res; } return false; @@ -2701,6 +2715,48 @@ String downloadFileType(const String& url, const String& user, const String& pas return error; } +# if defined(ESP8266) +void deleteBakFiles() +{ + fs::Dir dir = ESPEASY_FS.openDir(""); + + while (dir.next()) + { + const String fname = dir.fileName(); + if (fname.endsWith(F("_bak"))) { + if (tryDeleteFile(fname)) { + delay(1); + } + } + } +} +#endif +#ifdef ESP32 +void deleteBakFiles() +{ + fs::File root = ESPEASY_FS.open("/"); + fs::File file = root.openNextFile(); + + while (file) + { + if (!file.isDirectory()) { + const String fname = file.name(); + // Need to open next file or else we cannot delete the file + file = root.openNextFile(); + + if (fname.endsWith(F("_bak"))) { + addLog(LOG_LEVEL_INFO, concat(F("Del : Delete _bak file: "), fname)); + if (tryDeleteFile(fname)) { + delay(1); + } + } + } else { + file = root.openNextFile(); + } + } +} +#endif + #endif // if FEATURE_DOWNLOAD bool validateUploadConfigDat(const uint8_t *buf) { diff --git a/src/src/Helpers/ESPEasy_Storage.h b/src/src/Helpers/ESPEasy_Storage.h index 81b3d6557..9d0f07645 100644 --- a/src/src/Helpers/ESPEasy_Storage.h +++ b/src/src/Helpers/ESPEasy_Storage.h @@ -399,6 +399,8 @@ bool validateUploadConfigDat(const uint8_t *buf); #if FEATURE_DOWNLOAD String downloadFileType(const String& url, const String& user, const String& pass, FileType::Enum filetype, unsigned int filenr = 0); +void deleteBakFiles(); + #endif // if FEATURE_DOWNLOAD #if FEATURE_CUSTOM_PROVISIONING // Download file type based on settings stored in provisioning.dat file. diff --git a/src/src/PluginStructs/P146_data_struct.cpp b/src/src/PluginStructs/P146_data_struct.cpp index 61b867c27..648f781fe 100644 --- a/src/src/PluginStructs/P146_data_struct.cpp +++ b/src/src/PluginStructs/P146_data_struct.cpp @@ -434,11 +434,6 @@ bool P146_data_struct::sendViaEvent_AllCache(taskIndex_t P146_TaskIndex, { if (!Settings.UseRules) { return false; } - // Keep the current peek position, so we can reset it when we fail to deliver the data to the controller. - int peekFileNr = 0; - const int peekReadPos = ControllerCache.getPeekFilePos(peekFileNr); - - C016_binary_element element{}; if (!C016_getTaskSample(element)) { @@ -455,6 +450,10 @@ bool P146_data_struct::sendViaEvent_AllCache(taskIndex_t P146_TaskIndex, return false; } + // Need to send the 'next' peek file position info, since it will reflect the last completed position. + int peekFileNr = 0; + const int peekReadPos = ControllerCache.getPeekFilePos(peekFileNr); + String eventvalues; reserve_special(eventvalues, 64); // Enough for most use cases, prevent lots of memory allocations. eventvalues = strformat( diff --git a/src/src/WebServer/FileList.cpp b/src/src/WebServer/FileList.cpp index 6bed8feec..4159cc021 100644 --- a/src/src/WebServer/FileList.cpp +++ b/src/src/WebServer/FileList.cpp @@ -163,6 +163,15 @@ void handle_filelist() { } } # endif // ifdef USES_C016 + #if FEATURE_DOWNLOAD + if (hasArg(F("delbak"))) { + deleteBakFiles(); + + while (GarbageCollection()) { + delay(1); + } + } + #endif int32_t startIdx = 0; const String fstart = webArg(F("start")); @@ -178,9 +187,8 @@ void handle_filelist() { int count = -1; bool moreFilesPresent = false; -#if FEATURE_RTC_CACHE_STORAGE bool cacheFilesPresent = false; -#endif + bool bakFilesPresent = false; # if defined(ESP8266) @@ -198,13 +206,20 @@ void handle_filelist() { if (f) { filesize = f.size(); } + const String fname = dir.fileName(); + #if FEATURE_RTC_CACHE_STORAGE - if (!cacheFilesPresent && (getCacheFileCountFromFilename(dir.fileName()) != -1)) + if (!cacheFilesPresent && (getCacheFileCountFromFilename(fname) != -1)) { cacheFilesPresent = true; } #endif - handle_filelist_add_file(dir.fileName(), filesize, startIdx); +#if FEATURE_DOWNLOAD + if (fname.endsWith(F("_bak"))) { + bakFilesPresent = true; + } +#endif + handle_filelist_add_file(fname, filesize, startIdx); } } moreFilesPresent = dir.next(); @@ -220,13 +235,21 @@ void handle_filelist() { if (count >= startIdx) { + const String fname = file.name(); + #if FEATURE_RTC_CACHE_STORAGE - if (!cacheFilesPresent && (getCacheFileCountFromFilename(file.name()) != -1)) + if (!cacheFilesPresent && (getCacheFileCountFromFilename(fname) != -1)) { cacheFilesPresent = true; } #endif - handle_filelist_add_file(file.name(), file.size(), startIdx); +#if FEATURE_DOWNLOAD + if (fname.endsWith(F("_bak"))) { + bakFilesPresent = true; + } +#endif + + handle_filelist_add_file(fname, file.size(), startIdx); } } file = root.openNextFile(); @@ -245,11 +268,7 @@ void handle_filelist() { if ((count >= endIdx) && moreFilesPresent) { start_next = endIdx + 1; } -#if FEATURE_RTC_CACHE_STORAGE - handle_filelist_buttons(start_prev, start_next, cacheFilesPresent); -#else - handle_filelist_buttons(start_prev, start_next, false); -#endif + handle_filelist_buttons(start_prev, start_next, cacheFilesPresent, bakFilesPresent); } void handle_filelist_add_file(const String& filename, int filesize, int startIdx) { @@ -281,7 +300,7 @@ void handle_filelist_add_file(const String& filename, int filesize, int startIdx } } -void handle_filelist_buttons(int start_prev, int start_next, bool cacheFilesPresent) { +void handle_filelist_buttons(int start_prev, int start_next, bool cacheFilesPresent, bool bakFilesPresent) { html_end_table(); html_end_form(); html_BR(); @@ -307,6 +326,12 @@ void handle_filelist_buttons(int start_prev, int start_next, bool cacheFilesPres html_add_button_prefix(F("red"), true); addHtml(F("filelist?delcache=1'>Delete Cache Files")); } +#endif +#if FEATURE_DOWNLOAD + if (bakFilesPresent) { + html_add_button_prefix(F("red"), true); + addHtml(F("filelist?delbak=1'>Delete '_bak' Files")); + } #endif addHtml(F("

    ")); sendHeadandTail_stdtemplate(_TAIL); diff --git a/src/src/WebServer/FileList.h b/src/src/WebServer/FileList.h index 6c0acd652..138cfd65a 100644 --- a/src/src/WebServer/FileList.h +++ b/src/src/WebServer/FileList.h @@ -18,7 +18,7 @@ void handle_filelist(); void handle_filelist_add_file(const String& filename, int filesize, int startIdx); -void handle_filelist_buttons(int start_prev, int start_next, bool cacheFilesPresent); +void handle_filelist_buttons(int start_prev, int start_next, bool cacheFilesPresent, bool bakFilesPresent); #endif // ifdef WEBSERVER_FILELIST From 44aa36322bbf0b0d02bf02076b8d30f130ca4270 Mon Sep 17 00:00:00 2001 From: TD-er Date: Tue, 30 Sep 2025 17:37:34 +0200 Subject: [PATCH 310/564] [PPP modem] Add DTR pin option to regain access to modem in CMUX mode --- .../NW005_data_struct_PPP_modem.cpp | 48 ++++++++++++++----- .../NW005_data_struct_PPP_modem.h | 1 + src/ESPEasy/net/_NW005_PPP_modem.cpp | 3 +- 3 files changed, 40 insertions(+), 12 deletions(-) diff --git a/src/ESPEasy/net/NWPluginStructs/NW005_data_struct_PPP_modem.cpp b/src/ESPEasy/net/NWPluginStructs/NW005_data_struct_PPP_modem.cpp index c6ff1d224..488adb783 100644 --- a/src/ESPEasy/net/NWPluginStructs/NW005_data_struct_PPP_modem.cpp +++ b/src/ESPEasy/net/NWPluginStructs/NW005_data_struct_PPP_modem.cpp @@ -47,6 +47,7 @@ static NWPluginData_static_runtime stats_and_cache(&NW_PLUGIN_INTERFACE, F("PPP" # define NW005_KEY_MODEM_MODEL 11 # define NW005_KEY_APN 12 # define NW005_KEY_SIM_PIN 13 +# define NW005_KEY_PIN_DTR 14 const __FlashStringHelper* NW005_getLabelString(uint32_t key, bool displayString, ESPEasy_key_value_store::StorageType& storageType) { @@ -60,6 +61,7 @@ const __FlashStringHelper* NW005_getLabelString(uint32_t key, bool displayString case NW005_KEY_PIN_TX: return F("TX"); case NW005_KEY_PIN_RTS: return F("RTS"); case NW005_KEY_PIN_CTS: return F("CTS"); + case NW005_KEY_PIN_DTR: return F("DTR"); case NW005_KEY_PIN_RESET: return displayString ? F("Reset") : F("rst"); case NW005_KEY_PIN_RESET_ACTIVE_LOW: storageType = ESPEasy_key_value_store::StorageType::bool_type; @@ -105,6 +107,12 @@ NW005_data_struct_PPP_modem::~NW005_data_struct_PPP_modem() { _modem_task_data.modem_taskHandle = NULL; } NW_PLUGIN_INTERFACE.mode(ESP_MODEM_MODE_COMMAND); + + const int dtrPin = _kvs->getValueAsInt_or_default(NW005_KEY_PIN_DTR, -1); + if (dtrPin != -1) { + digitalWrite(dtrPin, LOW); + } + NW_PLUGIN_INTERFACE.end(); _modem_task_data.modem_initialized = false; @@ -446,15 +454,25 @@ void NW005_data_struct_PPP_modem::webform_load(EventStruct *event) showFormSelector(*_kvs, selector, NW005_makeWebFormItemParams(NW005_KEY_SERIAL_PORT)); } - for (int i = NW005_KEY_PIN_RX; i <= NW005_KEY_PIN_RESET; ++i) + const int gpio_keys[] = { + NW005_KEY_PIN_RX, + NW005_KEY_PIN_TX, + NW005_KEY_PIN_RTS, + NW005_KEY_PIN_CTS, + NW005_KEY_PIN_DTR, + NW005_KEY_PIN_RESET + }; + + for (int i = 0; i < NR_ELEMENTS(gpio_keys); ++i) { + const int key = gpio_keys[i]; ESPEasy_key_value_store::StorageType storageType; - const __FlashStringHelper *id = NW005_getLabelString(i, false, storageType); + const __FlashStringHelper *id = NW005_getLabelString(key, false, storageType); PinSelectPurpose purpose = PinSelectPurpose::Generic; - String label = NW005_formatGpioLabel(i, purpose); + String label = NW005_formatGpioLabel(key, purpose); int8_t pin = -1; - _kvs->getValue(i, pin); + _kvs->getValue(key, pin); addFormPinSelect(purpose, label, id, pin); } @@ -700,7 +718,8 @@ void NW005_data_struct_PPP_modem::webform_save(EventStruct *event) NW005_KEY_FLOWCTRL, NW005_KEY_MODEM_MODEL, NW005_KEY_APN, - NW005_KEY_SIM_PIN + NW005_KEY_SIM_PIN, + NW005_KEY_PIN_DTR }; @@ -727,6 +746,7 @@ bool NW005_data_struct_PPP_modem::webform_getPort(String& str) NW005_KEY_PIN_TX, NW005_KEY_PIN_RTS, NW005_KEY_PIN_CTS, + NW005_KEY_PIN_DTR, NW005_KEY_PIN_RESET }; @@ -753,6 +773,10 @@ void NW005_begin_modem_task(void *parameter) if (!modem_task_data->modem_initialized) { modem_task_data->initializing = true; + if (modem_task_data->dtrPin != -1) { + digitalWrite(modem_task_data->dtrPin, LOW); + } + const bool res = NW_PLUGIN_INTERFACE.begin( modem_task_data->model, @@ -776,6 +800,10 @@ void NW005_begin_modem_task(void *parameter) NW_PLUGIN_INTERFACE.mode(ESP_MODEM_MODE_CMUX); modem_task_data->AT_CPSI = NW_PLUGIN_INTERFACE.cmd(F("AT+CPSI?"), 3000); + if (modem_task_data->dtrPin != -1) { + NW_PLUGIN_INTERFACE.cmd(F("AT&D1"), 9000); + digitalWrite(modem_task_data->dtrPin, HIGH); + } } modem_task_data->modem_initialized = res; } @@ -804,7 +832,6 @@ bool NW005_data_struct_PPP_modem::init(EventStruct *event) const int ctsPin = _kvs->getValueAsInt_or_default(NW005_KEY_PIN_CTS, -1); esp_modem_flow_ctrl_t flow_ctl = static_cast(_kvs->getValueAsInt_or_default(NW005_KEY_FLOWCTRL, ESP_MODEM_FLOW_CONTROL_NONE)); - if ((rtsPin < 0) || (ctsPin < 0)) { if (flow_ctl != ESP_MODEM_FLOW_CONTROL_NONE) { addLog(LOG_LEVEL_INFO, F("PPP: Disable flow control as RTS/CTS are not set")); @@ -875,6 +902,7 @@ bool NW005_data_struct_PPP_modem::init(EventStruct *event) _modem_task_data.baud_rate = _kvs->getValueAsInt_or_default(NW005_KEY_BAUDRATE, 115200); _modem_task_data.modem_initialized = false; _modem_task_data.initializing = false; + _modem_task_data.dtrPin = _kvs->getValueAsInt_or_default(NW005_KEY_PIN_DTR, -1); stats_and_cache.mark_begin_establish_connection(); @@ -1035,7 +1063,8 @@ String NW005_data_struct_PPP_modem::NW005_formatGpioLabel(uint32_t key, PinSelec { String label; - if ((key >= NW005_KEY_PIN_RX) && (key <= NW005_KEY_PIN_RESET)) + if (key == NW005_KEY_PIN_DTR || + ((key >= NW005_KEY_PIN_RX) && (key <= NW005_KEY_PIN_RESET))) { ESPEasy_key_value_store::StorageType storageType; purpose = PinSelectPurpose::Generic; @@ -1063,10 +1092,7 @@ String NW005_data_struct_PPP_modem::NW005_formatGpioLabel(uint32_t key, PinSelec label, gpio_direction::gpio_input, optional); break; case NW005_KEY_PIN_RTS: - purpose = PinSelectPurpose::Generic_output; - label = formatGpioName( - label, gpio_direction::gpio_output, optional); - break; + case NW005_KEY_PIN_DTR: case NW005_KEY_PIN_RESET: purpose = PinSelectPurpose::Generic_output; label = formatGpioName( diff --git a/src/ESPEasy/net/NWPluginStructs/NW005_data_struct_PPP_modem.h b/src/ESPEasy/net/NWPluginStructs/NW005_data_struct_PPP_modem.h index 4c320fc10..a78f011d3 100644 --- a/src/ESPEasy/net/NWPluginStructs/NW005_data_struct_PPP_modem.h +++ b/src/ESPEasy/net/NWPluginStructs/NW005_data_struct_PPP_modem.h @@ -18,6 +18,7 @@ struct NW005_modem_task_data { int baud_rate = 115200; bool initializing{}; bool modem_initialized{}; + int dtrPin = -1; String logString; String AT_CPSI; // Result from "AT+CPSI?" diff --git a/src/ESPEasy/net/_NW005_PPP_modem.cpp b/src/ESPEasy/net/_NW005_PPP_modem.cpp index 5fe497da0..d9ae0815e 100644 --- a/src/ESPEasy/net/_NW005_PPP_modem.cpp +++ b/src/ESPEasy/net/_NW005_PPP_modem.cpp @@ -227,7 +227,8 @@ bool NWPlugin_005(NWPlugin::Function function, EventStruct *event, String& strin case NWPlugin::Function::NWPLUGIN_WRITE: { - auto *NW_data = getNWPluginData(event->NetworkIndex); + ESPEasy::net::ppp::NW005_data_struct_PPP_modem *NW_data = + static_cast(getNWPluginData(event->NetworkIndex)); if (NW_data) { success = NW_data->handle_nwplugin_write(event, string); From cc09d4529a2300d4a92649f529d9d5c3606dff2f Mon Sep 17 00:00:00 2001 From: Ton Huisman Date: Wed, 1 Oct 2025 23:20:23 +0200 Subject: [PATCH 311/564] [Docs] Correct some layout inconsistencies --- docs/source/Notify/N001.rst | 4 ++-- docs/source/Notify/N002.rst | 4 ++-- docs/source/Notify/_notify_substitutions_n00x.repl | 4 ++-- docs/source/Plugin/_plugin_substitutions_p09x.repl | 4 ++-- docs/source/Plugin/_plugin_substitutions_p10x.repl | 2 +- docs/source/Plugin/_plugin_substitutions_p11x.repl | 2 +- docs/source/Plugin/_plugin_substitutions_p14x.repl | 2 +- 7 files changed, 11 insertions(+), 11 deletions(-) diff --git a/docs/source/Notify/N001.rst b/docs/source/Notify/N001.rst index 1ad5d1688..e73cef858 100644 --- a/docs/source/Notify/N001.rst +++ b/docs/source/Notify/N001.rst @@ -2,8 +2,8 @@ .. _N001_page: -Notifications Email (SMTP) -=========================== +|N001_typename| +=============================== |N001_shortinfo| diff --git a/docs/source/Notify/N002.rst b/docs/source/Notify/N002.rst index 6797a5b84..4cbcb51a5 100644 --- a/docs/source/Notify/N002.rst +++ b/docs/source/Notify/N002.rst @@ -3,8 +3,8 @@ .. _N002_page: -Notifications Buzzer -===================== +|N002_typename| +======================== |N002_shortinfo| diff --git a/docs/source/Notify/_notify_substitutions_n00x.repl b/docs/source/Notify/_notify_substitutions_n00x.repl index 4a4a15f4b..b6c9702e1 100644 --- a/docs/source/Notify/_notify_substitutions_n00x.repl +++ b/docs/source/Notify/_notify_substitutions_n00x.repl @@ -1,5 +1,5 @@ .. |N001_type| replace:: :cyan:`Notifications` -.. |N001_name| replace:: :cyan:`Notifications Email (SMTP)` +.. |N001_name| replace:: :cyan:`Notifications - Email (SMTP)` .. |N001_typename| replace:: :cyan:`Notifications - Email (SMTP)` .. |N001_porttype| replace:: `.` .. |N001_status| replace:: :green:`NORMAL` :yellow:`CLIMATE` :yellow:`COLLECTION` :yellow:`SONOFF` :yellow:`SHELLY` @@ -11,7 +11,7 @@ .. |N001_page| replace:: N001 .. |N002_type| replace:: :cyan:`Notifications` -.. |N002_name| replace:: :cyan:`Notifications Buzzer` +.. |N002_name| replace:: :cyan:`Notifications - Buzzer` .. |N002_typename| replace:: :cyan:`Notifications - Buzzer` .. |N002_porttype| replace:: `.` .. |N002_status| replace:: :green:`NORMAL` :yellow:`CLIMATE` :yellow:`COLLECTION` :yellow:`SONOFF` :yellow:`SHELLY` diff --git a/docs/source/Plugin/_plugin_substitutions_p09x.repl b/docs/source/Plugin/_plugin_substitutions_p09x.repl index 0154a7f40..73ddd3dac 100644 --- a/docs/source/Plugin/_plugin_substitutions_p09x.repl +++ b/docs/source/Plugin/_plugin_substitutions_p09x.repl @@ -38,7 +38,7 @@ .. |P093_name| replace:: :cyan:`Mitsubishi Heat Pump` .. |P093_type| replace:: :cyan:`Energy (Heat)` .. |P093_typename| replace:: :cyan:`Energy (Heat) - Mitsubishi Heat Pump` -.. |P093_status| replace:: :yellow:`ENERGY` :yellow:`COLLECTION D` +.. |P093_status| replace:: :yellow:`COLLECTION D` :yellow:`ENERGY` .. |P093_github| replace:: P093_MitsubishiHP.ino .. _P093_github: https://github.com/letscontrolit/ESPEasy/blob/mega/src/_P093_MitsubishiHP.ino .. |P093_usedby| replace:: `.` @@ -63,7 +63,7 @@ .. |P095_type| replace:: :cyan:`Display` .. |P095_typename| replace:: :cyan:`Display - TFT ILI934x/ILI948x` .. |P095_porttype| replace:: `.` -.. |P095_status| replace:: :yellow:`DISPLAY` :yellow:`COLLECTION` :yellow:`(ESP32)` +.. |P095_status| replace:: :yellow:`COLLECTION` :yellow:`\(ESP32\)` :yellow:`DISPLAY` .. |P095_github| replace:: _P095_ILI9341.ino .. _P095_github: https://github.com/letscontrolit/ESPEasy/blob/mega/src/_P095_ILI9341.ino .. |P095_usedby| replace:: `.` diff --git a/docs/source/Plugin/_plugin_substitutions_p10x.repl b/docs/source/Plugin/_plugin_substitutions_p10x.repl index 6099d1014..c3cfbf7be 100644 --- a/docs/source/Plugin/_plugin_substitutions_p10x.repl +++ b/docs/source/Plugin/_plugin_substitutions_p10x.repl @@ -122,7 +122,7 @@ .. |P108_type| replace:: :cyan:`Energy (AC)` .. |P108_typename| replace:: :cyan:`Energy (AC) - DDS238-x` .. |P108_porttype| replace:: `.` -.. |P108_status| replace:: :yellow:`ENERGY` :yellow:`COLLECTION B` +.. |P108_status| replace:: :yellow:`COLLECTION B` :yellow:`ENERGY` .. |P108_github| replace:: P108_DDS238.ino .. _P108_github: https://github.com/letscontrolit/ESPEasy/blob/mega/src/_P108_DDS238.ino .. |P108_usedby| replace:: `.` diff --git a/docs/source/Plugin/_plugin_substitutions_p11x.repl b/docs/source/Plugin/_plugin_substitutions_p11x.repl index 12a1398a9..4ce29a9da 100644 --- a/docs/source/Plugin/_plugin_substitutions_p11x.repl +++ b/docs/source/Plugin/_plugin_substitutions_p11x.repl @@ -67,7 +67,7 @@ .. |P115_type| replace:: :cyan:`Energy` .. |P115_typename| replace:: :cyan:`Energy - MAX1704x` .. |P115_porttype| replace:: `.` -.. |P115_status| replace:: :yellow:`ENERGY` :yellow:`COLLECTION B` +.. |P115_status| replace:: :yellow:`COLLECTION B` :yellow:`ENERGY` .. |P115_github| replace:: _P115_MAX1704x_v2.ino .. _P115_github: https://github.com/letscontrolit/ESPEasy/blob/mega/src/_P115_MAX1704x_v2.ino .. |P115_usedby| replace:: `.` diff --git a/docs/source/Plugin/_plugin_substitutions_p14x.repl b/docs/source/Plugin/_plugin_substitutions_p14x.repl index 3996585e1..8ce70d11e 100644 --- a/docs/source/Plugin/_plugin_substitutions_p14x.repl +++ b/docs/source/Plugin/_plugin_substitutions_p14x.repl @@ -106,7 +106,7 @@ .. |P148_type| replace:: :cyan:`Display` .. |P148_typename| replace:: :cyan:`Display - POWR3xxD/THR3xxD` .. |P148_porttype| replace:: `.` -.. |P148_status| replace:: :yellow:`ENERGY` :yellow:`DISPLAY` +.. |P148_status| replace:: :yellow:`DISPLAY` :yellow:`ENERGY` .. |P148_github| replace:: P148_POWRxxD_THR3xxD.ino .. _P148_github: https://github.com/letscontrolit/ESPEasy/blob/mega/src/_P148_POWRxxD_THR3xxD.ino .. |P148_usedby| replace:: `.` From 7db54eb59baca2727034efe2850d5f7a65c11f1f Mon Sep 17 00:00:00 2001 From: Ton Huisman Date: Wed, 1 Oct 2025 23:25:08 +0200 Subject: [PATCH 312/564] [Docs] Update overview generator, include Notify and Network plugins --- docs/builds_overview.py | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) diff --git a/docs/builds_overview.py b/docs/builds_overview.py index 204cb4a03..247e18566 100644 --- a/docs/builds_overview.py +++ b/docs/builds_overview.py @@ -5,13 +5,14 @@ ############################################################################################################# # This script parses all documentation substitution files to determine in what builds a plugin is available # Collection A..G, Display, Energy and Neopixel, IR and IRext get Normal plugins injected -# Collection plugins are also injected into Collection A..G +# Collection, Notify and Network plugins are also injected into Collection A..G # All plugins get injected into MAX build set # Some build sets have exceptions for plugins not available # The output generation order is determined by how they are ordered in list 'buildColors' # When adding or removing a build set, this script may need adjustments! # Changelog: +# 2025-10-01 tonhuisman: Include Notify and Network plugins, ignore not available files, parse NWxxx also # 2024-05-04 tonhuisman: Working and documented # 2024-04-28 tonhuisman: Initial script @@ -41,7 +42,7 @@ excludeBuilds = {'DEVELOPMENT', 'RETIRED'} excludePlugins = { 'CLIMATE': {'P007', 'P008', 'P009', 'P017', 'P022', 'P027', 'P030', 'P035', 'P040', 'P041', 'P042', 'P045'}, 'DISPLAY': {'P070'}, - 'MAX': {'P089'}, + # 'MAX': {''}, # 'NEOPIXEL': {''}, 'NORMAL': {'P016', 'P035'}, } @@ -101,6 +102,8 @@ def addToAllBuilds(plugin, pluginName, builds:dict): # Parse a single substitution file def parseSingleSubstitutionFile(fileName): filepath = os.path.relpath(os.path.join(basePath, fileName), '.') + if not os.path.isfile(filepath): + return # print(filepath) # For debugging pfile = open(filepath, "r") # Start empty @@ -113,7 +116,7 @@ def parseSingleSubstitutionFile(fileName): break # Parse into label, plugin ID, description and up to 4 separate builds (current max.), # append "(?:[^`]+`([^`]+)`)?" to regex for an extra build, if needed - m = re.search(r"[^|]\|([PCN](\d{3}))([^\|]+)\|[^`]+`([^`]+)`(?:[^`]+`([^`]+)`)?(?:[^`]+`([^`]+)`)?(?:[^`]+`([^`]+)`)?", line) + m = re.search(r"[^|]\|((?:NW|[PCN])(\d{3}))([^\|]+)\|[^`]+`([^`]+)`(?:[^`]+`([^`]+)`)?(?:[^`]+`([^`]+)`)?(?:[^`]+`([^`]+)`)?", line) if m: if m.group(3) == "_typename": # the typename substitution should be before _status... if plugin != "" and plugin != m.group(1): # Changed plugin ID, store current @@ -178,6 +181,10 @@ print('Parsing substitutions for build sets...') parseSubstitutionFiles('../Plugin/_plugin_substitutions.repl') # Parse all Controller substitutions parseSingleSubstitutionFile('../Controller/_controller_substitutions.repl') +# Parse all Notify substitutions +parseSingleSubstitutionFile('../Notify/_notify_substitutions_n00x.repl') +# Parse all Network substitutions +parseSingleSubstitutionFile('../Network/_network_substitutions.repl') # Generate output generateBuildOverview('../Plugin/_plugin_sets_overview.repl') From e2fc9ce03676ba89e9c21983228ce76d97fcc3c3 Mon Sep 17 00:00:00 2001 From: TD-er Date: Thu, 2 Oct 2025 01:05:08 +0200 Subject: [PATCH 313/564] [Cleanup] Simplify managing key-value representation in web UI / JSON --- src/ESPEasy/net/Globals/NWPlugins.cpp | 1 + src/src/DataTypes/ESPEasy_plugin_functions.h | 1 + src/src/Helpers/KeyValueWriter.cpp | 76 +++ src/src/Helpers/KeyValueWriter.h | 89 ++++ src/src/WebServer/JSON.cpp | 496 ++++++++++--------- src/src/WebServer/JSON.h | 2 +- src/src/WebServer/KeyValueWriter_JSON.cpp | 70 +++ src/src/WebServer/KeyValueWriter_JSON.h | 30 ++ src/src/WebServer/KeyValueWriter_WebForm.cpp | 37 ++ src/src/WebServer/KeyValueWriter_WebForm.h | 23 + src/src/WebServer/NetworkPage.cpp | 215 ++++---- src/src/WebServer/NetworkPage.h | 9 + 12 files changed, 737 insertions(+), 312 deletions(-) create mode 100644 src/src/Helpers/KeyValueWriter.cpp create mode 100644 src/src/Helpers/KeyValueWriter.h create mode 100644 src/src/WebServer/KeyValueWriter_JSON.cpp create mode 100644 src/src/WebServer/KeyValueWriter_JSON.h create mode 100644 src/src/WebServer/KeyValueWriter_WebForm.cpp create mode 100644 src/src/WebServer/KeyValueWriter_WebForm.h diff --git a/src/ESPEasy/net/Globals/NWPlugins.cpp b/src/ESPEasy/net/Globals/NWPlugins.cpp index 27ec9fadd..bb9f1d3d7 100644 --- a/src/ESPEasy/net/Globals/NWPlugins.cpp +++ b/src/ESPEasy/net/Globals/NWPlugins.cpp @@ -195,6 +195,7 @@ bool NWPluginCall(NWPlugin::Function Function, EventStruct *event, String& str) case NWPlugin::Function::NWPLUGIN_CONNECT_SUCCESS: case NWPlugin::Function::NWPLUGIN_CONNECT_FAIL: case NWPlugin::Function::NWPLUGIN_WEBFORM_SHOW_CONNECTED: + case NWPlugin::Function::NWPLUGIN_WEBFORM_SHOW_EXTENDED: case NWPlugin::Function::NWPLUGIN_WEBFORM_SHOW_HW_ADDRESS: case NWPlugin::Function::NWPLUGIN_WEBFORM_SHOW_IP: case NWPlugin::Function::NWPLUGIN_WEBFORM_SHOW_PORT: diff --git a/src/src/DataTypes/ESPEasy_plugin_functions.h b/src/src/DataTypes/ESPEasy_plugin_functions.h index d162023fe..b6ccb6812 100644 --- a/src/src/DataTypes/ESPEasy_plugin_functions.h +++ b/src/src/DataTypes/ESPEasy_plugin_functions.h @@ -189,6 +189,7 @@ public: NWPLUGIN_WEBFORM_LOAD_SHOW_STATS, #endif NWPLUGIN_WEBFORM_SHOW_CONNECTED, // Used for showing connected state/speed + NWPLUGIN_WEBFORM_SHOW_EXTENDED, // Used for showing all connection info NWPLUGIN_WEBFORM_SHOW_HOSTNAME, // Used for showing hostname NWPLUGIN_WEBFORM_SHOW_HW_ADDRESS, // Used for showing MAC NWPLUGIN_WEBFORM_SHOW_IP, // Used for showing IP diff --git a/src/src/Helpers/KeyValueWriter.cpp b/src/src/Helpers/KeyValueWriter.cpp new file mode 100644 index 000000000..dc5284e26 --- /dev/null +++ b/src/src/Helpers/KeyValueWriter.cpp @@ -0,0 +1,76 @@ +#include "../Helpers/KeyValueWriter.h" + +#include "../Helpers/StringConverter_Numerical.h" + +ValueStruct::ValueStruct(bool val) : str(val), isBoolean(true) {} + +ValueStruct::ValueStruct(int val) : str(val), isInt(true) {} + +ValueStruct::ValueStruct(uint32_t val) : str(val), isInt(true) {} + +ValueStruct::ValueStruct(uint64_t val) : str(ull2String(val)), isInt(true) {} + +ValueStruct::ValueStruct(int64_t val) : str(ll2String(val)), isInt(true) {} + +ValueStruct::ValueStruct(const __FlashStringHelper *val) : str(val) {} + + +KeyValueStruct::KeyValueStruct(const __FlashStringHelper *key) : _key(key) {} + +KeyValueStruct::KeyValueStruct(const String& key) : _key(key) {} + +KeyValueStruct::KeyValueStruct(const __FlashStringHelper *key, + ValueStruct value) + : _key(key) { + _values.emplace_back(std::move(value)); +} + +KeyValueStruct::KeyValueStruct(const String& key, + ValueStruct value) + : _key(key) { + _values.emplace_back(std::move(value)); +} + +KeyValueStruct::KeyValueStruct(const __FlashStringHelper *key, + ValueStruct value, + const __FlashStringHelper *unit) + : _key(key), _unit(unit) { + _values.emplace_back(std::move(value)); +} + +KeyValueStruct::KeyValueStruct(const __FlashStringHelper *key, + ValueStruct value, + const String & unit) + : _key(key), _unit(unit) { + _values.emplace_back(std::move(value)); +} + +KeyValueStruct::KeyValueStruct(const String& key, + ValueStruct value, + const String& unit) + : _key(key), _unit(unit) { + _values.emplace_back(std::move(value)); +} + +KeyValueStruct::KeyValueStruct(LabelType::Enum label) + : _key(getLabel(label)), _unit(getFormUnit(label)) { + _values.emplace_back(getValue(label)); +} + +void KeyValueStruct::appendValue(const ValueStruct& value) { _values.emplace_back(std::move(value)); } + +void KeyValueStruct::appendValue(ValueStruct&& value) { _values.emplace_back(std::move(value)); } + +void KeyValueWriter::clear() {} + +void KeyValueWriter::writeLabels(const LabelType::Enum labels[]) +{ + size_t i = 0; + LabelType::Enum cur = static_cast(pgm_read_byte(labels + i)); + + while (cur != LabelType::MAX_LABEL) { + write(cur); + cur = static_cast(pgm_read_byte(labels + i + 1)); + ++i; + } +} diff --git a/src/src/Helpers/KeyValueWriter.h b/src/src/Helpers/KeyValueWriter.h new file mode 100644 index 000000000..08c1dff87 --- /dev/null +++ b/src/src/Helpers/KeyValueWriter.h @@ -0,0 +1,89 @@ +#pragma once + +#include "../../ESPEasy_common.h" + +#include "../Helpers/StringProvider.h" + +#include + +struct ValueStruct +{ + ValueStruct() {} + + explicit ValueStruct(bool val); + + ValueStruct(int val); + ValueStruct(uint32_t val); + explicit ValueStruct(uint64_t val); + explicit ValueStruct(int64_t val); + ValueStruct(const __FlashStringHelper *val); + + template + ValueStruct(const T& val) : str(val) {} + + String str; + bool isBoolean{}; + bool isInt{}; + +}; + +struct KeyValueStruct +{ + + KeyValueStruct() {} + + KeyValueStruct(const __FlashStringHelper *key); + KeyValueStruct(const String& key); + + + KeyValueStruct(const __FlashStringHelper *key, + ValueStruct value); + + KeyValueStruct(const String& key, + ValueStruct value); + + + KeyValueStruct(const __FlashStringHelper *key, + ValueStruct value, + const __FlashStringHelper *unit); + + KeyValueStruct(const __FlashStringHelper *key, + ValueStruct value, + const String & unit); + + KeyValueStruct(const String& key, + ValueStruct value, + const String& unit); + + KeyValueStruct(LabelType::Enum label); + + void appendValue(const ValueStruct& value); + + void appendValue(ValueStruct&& value); + + + String _key; + String _id; + String _unit; + + std::vector_values; + + // output as pre-formatted monospaced + bool _value_pre{}; + + +}; + +class KeyValueWriter +{ +public: + + virtual ~KeyValueWriter() {} + + virtual void clear(); + + virtual void write(const KeyValueStruct& kv) = 0; + + void writeLabels(const LabelType::Enum labels[]); + +}; // class KeyValueWriter diff --git a/src/src/WebServer/JSON.cpp b/src/src/WebServer/JSON.cpp index 93b4730fd..7f691722e 100644 --- a/src/src/WebServer/JSON.cpp +++ b/src/src/WebServer/JSON.cpp @@ -4,6 +4,12 @@ #include "../WebServer/JSON.h" #include "../WebServer/Markup_Forms.h" +// TODO TD-er: Needed for write_NetworkAdapterFlags and write_IP_config +// Move to other file +#include "../WebServer/NetworkPage.h" + +#include "../WebServer/KeyValueWriter_JSON.h" + #include "../CustomBuild/CompiletimeDefines.h" #include "../DataStructs/TimingStats.h" @@ -25,37 +31,39 @@ #include "../../_Plugin_Helper.h" #include "../../ESPEasy-Globals.h" -void stream_comma_newline() { - addHtml(',', '\n'); -} +void stream_comma_newline() { addHtml(',', '\n'); } // ******************************************************************************** // Web Interface get CSV value from task // ******************************************************************************** #ifdef WEBSERVER_CSVVAL + void handle_csvval() { TXBuffer.startJsonStream(); const int printHeader = getFormItemInt(F("header"), 1); bool printHeaderValid = true; - if (printHeader != 1 && printHeader != 0) + + if ((printHeader != 1) && (printHeader != 0)) { addHtml(F("ERROR: Header not valid!\n")); printHeaderValid = false; } - const taskIndex_t taskNr = getFormItemInt(F("tasknr"), INVALID_TASK_INDEX); - const bool taskValid = validTaskIndex(taskNr); + const taskIndex_t taskNr = getFormItemInt(F("tasknr"), INVALID_TASK_INDEX); + const bool taskValid = validTaskIndex(taskNr); + if (!taskValid) { addHtml(F("ERROR: TaskNr not valid!\n")); } const int INVALID_VALUE_NUM = INVALID_TASKVAR_INDEX + 1; - const taskVarIndex_t valNr = getFormItemInt(F("valnr"), INVALID_VALUE_NUM); - bool valueNumberValid = true; - if (valNr != INVALID_VALUE_NUM && !validTaskVarIndex(valNr)) + const taskVarIndex_t valNr = getFormItemInt(F("valnr"), INVALID_VALUE_NUM); + bool valueNumberValid = true; + + if ((valNr != INVALID_VALUE_NUM) && !validTaskVarIndex(valNr)) { addHtml(F("ERROR: ValueId not valid!\n")); valueNumberValid = false; @@ -73,9 +81,10 @@ void handle_csvval() { for (uint8_t x = 0; x < taskValCount; x++) { - if (valNr == INVALID_VALUE_NUM || valNr == x) + if ((valNr == INVALID_VALUE_NUM) || (valNr == x)) { addHtml(Cache.getTaskDeviceValueName(taskNr, x)); + if (x != taskValCount - 1) { addHtml(';'); @@ -104,7 +113,8 @@ void handle_csvval() } TXBuffer.endStream(); } -#endif + +#endif // ifdef WEBSERVER_CSVVAL // ******************************************************************************** // Web Interface JSON page (no password!) @@ -123,10 +133,10 @@ void handle_json() bool showDataAcquisition = true; bool showTaskDetails = true; #if FEATURE_ESPEASY_P2P - bool showNodes = true; + bool showNodes = true; #endif #if FEATURE_PLUGIN_STATS - bool showPluginStats = getFormItemInt(F("showpluginstats"), 0) != 0; + bool showPluginStats = getFormItemInt(F("showpluginstats"), 0) != 0; #endif if (equals(webArg(F("view")), F("sensorupdate"))) { @@ -138,10 +148,10 @@ void handle_json() showDataAcquisition = false; showTaskDetails = false; #if FEATURE_ESPEASY_P2P - showNodes = false; + showNodes = false; #endif #if FEATURE_PLUGIN_STATS - showPluginStats = hasArg(F("showpluginstats")); + showPluginStats = hasArg(F("showpluginstats")); #endif } @@ -152,166 +162,185 @@ void handle_json() addHtml('{'); if (showSystem) { - addHtml(F("\"System\":{\n")); - - if (wdcounter > 0) { - stream_next_json_object_value(LabelType::LOAD_PCT); - stream_next_json_object_value(LabelType::LOOP_COUNT); - } + KeyValueWriter_JSON writer(F("System")); - static const LabelType::Enum labels[] PROGMEM = - { - LabelType::BUILD_DESC, - LabelType::GIT_BUILD, - LabelType::SYSTEM_LIBRARIES, + static const LabelType::Enum labels[] PROGMEM = + { + LabelType::BUILD_DESC, + LabelType::GIT_BUILD, + LabelType::SYSTEM_LIBRARIES, #ifdef ESP32 - LabelType::ESP_IDF_SDK_VERSION, + LabelType::ESP_IDF_SDK_VERSION, #endif - LabelType::PLUGIN_COUNT, - LabelType::PLUGIN_DESCRIPTION, - LabelType::BUILD_TIME, - LabelType::BINARY_FILENAME, - LabelType::LOCAL_TIME, + LabelType::PLUGIN_COUNT, + LabelType::PLUGIN_DESCRIPTION, + LabelType::BUILD_TIME, + LabelType::BINARY_FILENAME, + LabelType::LOCAL_TIME, #if FEATURE_EXT_RTC - LabelType::EXT_RTC_UTC_TIME, + LabelType::EXT_RTC_UTC_TIME, #endif - LabelType::TIME_SOURCE, - LabelType::TIME_WANDER, - LabelType::ISNTP, - LabelType::UNIT_NR, - LabelType::UNIT_NAME, - LabelType::UPTIME, - LabelType::UPTIME_MS, + LabelType::TIME_SOURCE, + LabelType::TIME_WANDER, + LabelType::ISNTP, + LabelType::UNIT_NR, + LabelType::UNIT_NAME, + LabelType::UPTIME, + LabelType::UPTIME_MS, #if FEATURE_INTERNAL_TEMPERATURE - LabelType::INTERNAL_TEMPERATURE, + LabelType::INTERNAL_TEMPERATURE, #endif - LabelType::BOOT_TYPE, - LabelType::RESET_REASON, - LabelType::CPU_ECO_MODE, + LabelType::BOOT_TYPE, + LabelType::RESET_REASON, + LabelType::CPU_ECO_MODE, #if defined(CORE_POST_2_5_0) || defined(ESP32) - #ifndef LIMIT_BUILD_SIZE - LabelType::HEAP_MAX_FREE_BLOCK, // 7654 - #endif + # ifndef LIMIT_BUILD_SIZE + LabelType::HEAP_MAX_FREE_BLOCK, // 7654 + # endif #endif // if defined(CORE_POST_2_5_0) || defined(ESP32) #if defined(CORE_POST_2_5_0) - #ifndef LIMIT_BUILD_SIZE - LabelType::HEAP_FRAGMENTATION, // 12 - #endif + # ifndef LIMIT_BUILD_SIZE + LabelType::HEAP_FRAGMENTATION, // 12 + # endif #endif // if defined(CORE_POST_2_5_0) - LabelType::FREE_MEM, + LabelType::FREE_MEM, #ifdef USE_SECOND_HEAP - LabelType::FREE_HEAP_IRAM, + LabelType::FREE_HEAP_IRAM, #endif - LabelType::FREE_STACK, + LabelType::FREE_STACK, #ifdef ESP32 - LabelType::HEAP_SIZE, - LabelType::HEAP_MIN_FREE, - #ifdef BOARD_HAS_PSRAM - LabelType::PSRAM_SIZE, - LabelType::PSRAM_FREE, - LabelType::PSRAM_MIN_FREE, - LabelType::PSRAM_MAX_FREE_BLOCK, - #endif // BOARD_HAS_PSRAM + LabelType::HEAP_SIZE, + LabelType::HEAP_MIN_FREE, + # ifdef BOARD_HAS_PSRAM + LabelType::PSRAM_SIZE, + LabelType::PSRAM_FREE, + LabelType::PSRAM_MIN_FREE, + LabelType::PSRAM_MAX_FREE_BLOCK, + # endif // BOARD_HAS_PSRAM #endif // ifdef ESP32 - LabelType::ESP_CHIP_MODEL, + LabelType::ESP_CHIP_MODEL, #ifdef ESP32 - LabelType::ESP_CHIP_REVISION, + LabelType::ESP_CHIP_REVISION, #endif // ifdef ESP32 - LabelType::FLASH_CHIP_ID, - LabelType::FLASH_CHIP_VENDOR, - LabelType::FLASH_CHIP_MODEL, - LabelType::FLASH_CHIP_REAL_SIZE, - LabelType::FLASH_CHIP_SPEED, - LabelType::FLASH_IDE_MODE, - LabelType::FS_SIZE, + LabelType::FLASH_CHIP_ID, + LabelType::FLASH_CHIP_VENDOR, + LabelType::FLASH_CHIP_MODEL, + LabelType::FLASH_CHIP_REAL_SIZE, + LabelType::FLASH_CHIP_SPEED, + LabelType::FLASH_IDE_MODE, + LabelType::FS_SIZE, - LabelType::SUNRISE, - LabelType::SUNSET, - LabelType::TIMEZONE_OFFSET, - LabelType::LATITUDE, - LabelType::LONGITUDE, - LabelType::SYSLOG_LOG_LEVEL, - LabelType::SERIAL_LOG_LEVEL, - LabelType::WEB_LOG_LEVEL, + LabelType::SUNRISE, + LabelType::SUNSET, + LabelType::TIMEZONE_OFFSET, + LabelType::LATITUDE, + LabelType::LONGITUDE, + LabelType::SYSLOG_LOG_LEVEL, + LabelType::SERIAL_LOG_LEVEL, + LabelType::WEB_LOG_LEVEL, #if FEATURE_SD - LabelType::SD_LOG_LEVEL, + LabelType::SD_LOG_LEVEL, #endif // if FEATURE_SD - LabelType::MAX_LABEL - }; + LabelType::MAX_LABEL + }; + writer.writeLabels(labels); - stream_json_object_values(labels); + if (wdcounter > 0) + { + writer.write(LabelType::LOAD_PCT); + writer.write(LabelType::LOOP_COUNT); + } + } stream_comma_newline(); } + if (showWifi) { - addHtml(F("\"WiFi\":{\n")); - static const LabelType::Enum labels[] PROGMEM = { - LabelType::HOST_NAME, + KeyValueWriter_JSON writer(F("WiFi")); + +#ifdef ESP32 + { + KeyValueWriter_JSON writer2(F("Network Interface")); + write_NetworkAdapterFlags(0, writer2); + } + stream_comma_newline(); + { + KeyValueWriter_JSON writer2(F("IP Config")); + write_IP_config(0, writer2); + } + stream_comma_newline(); +#endif // ifdef ESP32 + + static const LabelType::Enum labels[] PROGMEM = + { + LabelType::HOST_NAME, #if FEATURE_MDNS - LabelType::M_DNS, + LabelType::M_DNS, #endif // if FEATURE_MDNS - LabelType::IP_CONFIG, - LabelType::IP_ADDRESS, -#if FEATURE_USE_IPV6 - LabelType::IP6_LOCAL, - LabelType::IP6_GLOBAL, - LabelType::ENABLE_IPV6, -#endif - LabelType::IP_SUBNET, - LabelType::GATEWAY, - LabelType::STA_MAC, - LabelType::DNS_1, - LabelType::DNS_2, - LabelType::SSID, - LabelType::BSSID, - LabelType::CHANNEL, - LabelType::ENCRYPTION_TYPE_STA, - LabelType::CONNECTED_MSEC, - LabelType::LAST_DISCONNECT_REASON, - LabelType::LAST_DISC_REASON_STR, - LabelType::NUMBER_RECONNECTS, - LabelType::WIFI_STORED_SSID1, - LabelType::WIFI_STORED_SSID2, - LabelType::FORCE_WIFI_BG, - LabelType::RESTART_WIFI_LOST_CONN, - LabelType::FORCE_WIFI_NOSLEEP, + // LabelType::IP_CONFIG, +#ifdef ESP8266 + LabelType::IP_ADDRESS, +# if FEATURE_USE_IPV6 + LabelType::IP6_LOCAL, + LabelType::IP6_GLOBAL, + LabelType::ENABLE_IPV6, +# endif // if FEATURE_USE_IPV6 + LabelType::IP_SUBNET, + LabelType::GATEWAY, + LabelType::STA_MAC, + LabelType::DNS_1, + LabelType::DNS_2, +#endif // ifdef ESP8266 + LabelType::SSID, + LabelType::BSSID, + LabelType::CHANNEL, + LabelType::ENCRYPTION_TYPE_STA, + LabelType::CONNECTED_MSEC, + LabelType::LAST_DISCONNECT_REASON, + LabelType::LAST_DISC_REASON_STR, + LabelType::NUMBER_RECONNECTS, + LabelType::WIFI_STORED_SSID1, + LabelType::WIFI_STORED_SSID2, + LabelType::FORCE_WIFI_BG, + LabelType::RESTART_WIFI_LOST_CONN, + LabelType::FORCE_WIFI_NOSLEEP, #ifdef SUPPORT_ARP - LabelType::PERIODICAL_GRAT_ARP, + LabelType::PERIODICAL_GRAT_ARP, #endif // ifdef SUPPORT_ARP #ifdef USES_ESPEASY_NOW - LabelType::USE_ESPEASY_NOW, - LabelType::FORCE_ESPEASY_NOW_CHANNEL, -#endif - LabelType::CONNECTION_FAIL_THRESH, + LabelType::USE_ESPEASY_NOW, + LabelType::FORCE_ESPEASY_NOW_CHANNEL, +#endif // ifdef USES_ESPEASY_NOW + LabelType::CONNECTION_FAIL_THRESH, #if FEATURE_SET_WIFI_TX_PWR - LabelType::WIFI_TX_MAX_PWR, - LabelType::WIFI_CUR_TX_PWR, - LabelType::WIFI_SENS_MARGIN, - LabelType::WIFI_SEND_AT_MAX_TX_PWR, -#endif - LabelType::WIFI_NR_EXTRA_SCANS, + LabelType::WIFI_TX_MAX_PWR, + LabelType::WIFI_CUR_TX_PWR, + LabelType::WIFI_SENS_MARGIN, + LabelType::WIFI_SEND_AT_MAX_TX_PWR, +#endif // if FEATURE_SET_WIFI_TX_PWR + LabelType::WIFI_NR_EXTRA_SCANS, #ifdef ESP32 - LabelType::WIFI_PASSIVE_SCAN, + LabelType::WIFI_PASSIVE_SCAN, #endif - LabelType::WIFI_USE_LAST_CONN_FROM_RTC, - LabelType::WIFI_RSSI, + LabelType::WIFI_USE_LAST_CONN_FROM_RTC, + LabelType::WIFI_RSSI, #ifndef ESP32 - LabelType::WAIT_WIFI_CONNECT, + LabelType::WAIT_WIFI_CONNECT, #endif - LabelType::HIDDEN_SSID_SLOW_CONNECT, - LabelType::CONNECT_HIDDEN_SSID, - LabelType::SDK_WIFI_AUTORECONNECT, + LabelType::HIDDEN_SSID_SLOW_CONNECT, + LabelType::CONNECT_HIDDEN_SSID, + LabelType::SDK_WIFI_AUTORECONNECT, - LabelType::MAX_LABEL - }; - - stream_json_object_values(labels); + LabelType::MAX_LABEL + }; + writer.writeLabels(labels); + } // TODO: PKR: Add ETH Objects stream_comma_newline(); @@ -320,27 +349,30 @@ void handle_json() #if FEATURE_ETHERNET if (showEthernet) { - addHtml(F("\"Ethernet\":{\n")); - static const LabelType::Enum labels[] PROGMEM = { - LabelType::ETH_WIFI_MODE, - LabelType::ETH_CONNECTED, - LabelType::ETH_CHIP, - LabelType::ETH_DUPLEX, - LabelType::ETH_SPEED, - LabelType::ETH_STATE, - LabelType::ETH_SPEED_STATE, + static const LabelType::Enum labels[] PROGMEM = + { + LabelType::ETH_WIFI_MODE, + LabelType::ETH_CONNECTED, + LabelType::ETH_CHIP, + LabelType::ETH_DUPLEX, + LabelType::ETH_SPEED, + LabelType::ETH_STATE, + LabelType::ETH_SPEED_STATE, - LabelType::MAX_LABEL - }; + LabelType::MAX_LABEL + }; + KeyValueWriter_JSON writer(F("Ethernet")); + writer.writeLabels(labels); + } - stream_json_object_values(labels); stream_comma_newline(); } #endif // if FEATURE_ETHERNET #if FEATURE_ESPEASY_P2P + if (showNodes) { bool comma_between = false; @@ -368,24 +400,29 @@ void handle_json() stream_next_json_object_value(F("platform"), it->second.getNodeTypeDisplayString()); } const int8_t rssi = it->second.getRSSI(); + if (rssi < 0) { stream_next_json_object_value(F("rssi"), rssi); } + if (it->second.build >= 20107) { stream_next_json_object_value(F("load"), toString(it->second.getLoad(), 2)); + if (it->second.webgui_portnumber != 80) { stream_next_json_object_value(F("webport"), it->second.webgui_portnumber); } } stream_next_json_object_value(F("ip"), formatIP(it->second.IP())); -#if FEATURE_USE_IPV6 +# if FEATURE_USE_IPV6 + if (it->second.hasIPv6_mac_based_link_local) { stream_next_json_object_value(F("ipv6local"), formatIP(it->second.IPv6_link_local(true), true)); } + if (it->second.hasIPv6_mac_based_link_global) { stream_next_json_object_value(F("ipv6global"), formatIP(it->second.IPv6_global())); } -#endif +# endif // if FEATURE_USE_IPV6 stream_last_json_object_value(F("age"), it->second.getAge()); } // if node info exists } // for loop @@ -394,7 +431,7 @@ void handle_json() addHtml(F("],\n")); // close array if >0 nodes } } - #endif + #endif // if FEATURE_ESPEASY_P2P } taskIndex_t firstTaskIndex = 0; @@ -427,7 +464,8 @@ void handle_json() if (validDeviceIndex(DeviceIndex)) { const unsigned long taskInterval = Settings.TaskDeviceTimer[TaskIndex]; - //LoadTaskSettings(TaskIndex); + + // LoadTaskSettings(TaskIndex); addHtml('{', '\n'); unsigned long ttl_json = 60; // Default value @@ -459,7 +497,7 @@ void handle_json() bool hasPresentation; const String presentation = formatUserVarForPresentation(&TempEvent, x, hasPresentation, value, DeviceIndex); #endif // if FEATURE_STRING_VARIABLES - + if (mustConsiderAsJSONString(value)) { // Flag as not to treat as a float nrDecimals = 255; @@ -467,6 +505,7 @@ void handle_json() #if FEATURE_TASKVALUE_UNIT_OF_MEASURE String uom; const uint8_t uomIndex = Cache.getTaskVarUnitOfMeasure(TaskIndex, x); + if (uomIndex != 0) { uom = toUnitOfMeasureName(uomIndex); } @@ -486,39 +525,48 @@ void handle_json() x < (valueCount - 1)); } #if FEATURE_STRING_VARIABLES + if (Settings.ShowDerivedTaskValues(TaskIndex)) { - int varNr = VARS_PER_TASK; + int varNr = VARS_PER_TASK; String taskName = getTaskDeviceName(TaskIndex); taskName.toLowerCase(); String postfix; const String search = getDerivedValueSearchAndPostfix(taskName, postfix); auto it = customStringVar.begin(); + while (it != customStringVar.end()) { if (it->first.startsWith(search) && it->first.endsWith(postfix)) { String valueName = it->first.substring(search.length(), it->first.indexOf('-')); String uom; String vType; const String vname2 = getDerivedValueNameUomAndVType(taskName, valueName, uom, vType); + if (!vname2.isEmpty()) { valueName = vname2; } + if (!it->second.isEmpty()) { String value(it->second); stripEscapeCharacters(value); value = parseTemplate(value); uint8_t nrDecimals = 255; // FIXME Use the minimal number of decimals needed - bool hasPresentation; - const String presentation = formatUserVarForPresentation(&TempEvent, INVALID_TASKVAR_INDEX, hasPresentation, value, DeviceIndex, valueName); + bool hasPresentation; + const String presentation = formatUserVarForPresentation(&TempEvent, + INVALID_TASKVAR_INDEX, + hasPresentation, + value, + DeviceIndex, + valueName); stream_comma_newline(); // Push out a comma and newline handle_json_stream_task_value_data(varNr + 1, - valueName, - nrDecimals, - value, - presentation, - uom, - false); // No comma here + valueName, + nrDecimals, + value, + presentation, + uom, + false); // No comma here ++varNr; } } @@ -533,19 +581,21 @@ void handle_json() } #if FEATURE_PLUGIN_STATS && FEATURE_CHART_JS + if (showPluginStats && Device[DeviceIndex].PluginStats) { PluginTaskData_base *taskData = getPluginTaskDataBaseClassOnly(TaskIndex); - if (taskData != nullptr && taskData->nrSamplesPresent() > 0) { + + if ((taskData != nullptr) && (taskData->nrSamplesPresent() > 0)) { addHtml(F("\"PluginStats\":\n")); taskData->plot_ChartJS(true); stream_comma_newline(); } } -#endif +#endif // if FEATURE_PLUGIN_STATS && FEATURE_CHART_JS if (showSpecificTask) { - stream_next_json_object_value(F("TTL"), ttl_json * 1000); + stream_next_json_object_value(F("TTL"), ttl_json * 1000); #if FEATURE_TASKVALUE_UNIT_OF_MEASURE stream_next_json_object_value(F("ShowUoM"), jsonBool(Settings.ShowUnitOfMeasureOnDevicesPage())); #endif // if FEATURE_TASKVALUE_UNIT_OF_MEASURE @@ -573,25 +623,29 @@ void handle_json() stream_next_json_object_value(F("Type"), getPluginNameFromDeviceIndex(DeviceIndex)); stream_next_json_object_value(F("TaskName"), getTaskDeviceName(TaskIndex)); stream_next_json_object_value(F("TaskDeviceNumber"), Settings.getPluginID_for_task(TaskIndex).value); - for(int i = 0; i < 3; i++) { + + for (int i = 0; i < 3; i++) { if (Settings.TaskDevicePin[i][TaskIndex] >= 0) { - stream_next_json_object_value(concat(F("TaskDeviceGPIO"), i + 1) , static_cast(Settings.TaskDevicePin[i][TaskIndex])); + stream_next_json_object_value(concat(F("TaskDeviceGPIO"), i + 1), static_cast(Settings.TaskDevicePin[i][TaskIndex])); } } #if FEATURE_I2CMULTIPLEXER uint8_t i2cBus = 0; - #if FEATURE_I2C_MULTIPLE + # if FEATURE_I2C_MULTIPLE i2cBus = Settings.getI2CInterface(TaskIndex); - #endif - if (Device[DeviceIndex].Type == DEVICE_TYPE_I2C && isI2CMultiplexerEnabled(i2cBus)) { - #if FEATURE_I2C_MULTIPLE + # endif + + if ((Device[DeviceIndex].Type == DEVICE_TYPE_I2C) && isI2CMultiplexerEnabled(i2cBus)) { + # if FEATURE_I2C_MULTIPLE stream_next_json_object_value(F("I2C_Interface"), static_cast(i2cBus + 1)); - #endif + # endif int8_t channel = Settings.I2C_Multiplexer_Channel[TaskIndex]; + if (bitRead(Settings.I2C_Flags[TaskIndex], I2C_FLAGS_MUX_MULTICHANNEL)) { addHtml(F("\"I2CBus\" : [")); uint8_t b = 0; + for (uint8_t c = 0; c < I2CMultiplexerMaxChannels(i2cBus); ++c) { if (bitRead(channel, c)) { if (b > 0) { stream_comma_newline(); } @@ -603,19 +657,20 @@ void handle_json() } addHtml(F("],\n")); } else { - if (channel == -1){ - stream_next_json_object_value(F("I2Cbus"), F("Standard I2C bus")); + if (channel == -1) { + stream_next_json_object_value(F("I2Cbus"), F("Standard I2C bus")); } else { String i2cChannel = concat(F("Multiplexer channel "), channel); - stream_next_json_object_value(F("I2Cbus"), i2cChannel); + stream_next_json_object_value(F("I2Cbus"), i2cChannel); } } } #endif // if FEATURE_I2CMULTIPLEXER } - stream_next_json_object_value(F("TaskEnabled"), - // jsonBool(Settings.TaskDeviceEnabled[TaskIndex].enabled)); - jsonBool(Settings.TaskDeviceEnabled[TaskIndex])); + stream_next_json_object_value(F("TaskEnabled"), + +// jsonBool(Settings.TaskDeviceEnabled[TaskIndex].enabled)); + jsonBool(Settings.TaskDeviceEnabled[TaskIndex])); stream_last_json_object_value(F("TaskNumber"), TaskIndex + 1); @@ -638,36 +693,40 @@ void handle_json() STOP_TIMER(HANDLE_SERVING_WEBPAGE_JSON); } -void handle_json_stream_task_value_data(uint16_t valueNumber, - const String & valueName, - uint8_t nrDecimals, - const String & value, - const String & presentation, - const String & uom, - bool appendComma) { +void handle_json_stream_task_value_data(uint16_t valueNumber, + const String& valueName, + uint8_t nrDecimals, + const String& value, + const String& presentation, + const String& uom, + bool appendComma) { addHtml('{'); stream_next_json_object_value(F("ValueNumber"), valueNumber); stream_next_json_object_value(F("Name"), valueName); stream_next_json_object_value(F("NrDecimals"), nrDecimals); #if FEATURE_STRING_VARIABLES + if (!presentation.isEmpty()) { stream_next_json_object_value(F("Presentation"), presentation); } #endif // if FEATURE_STRING_VARIABLES + if (!uom.isEmpty()) { stream_next_json_object_value(F("UoM"), uom); } - stream_last_json_object_value(F("Value"), value); + stream_last_json_object_value(F("Value"), value); if (appendComma) { stream_comma_newline(); } } + // ******************************************************************************** // JSON formatted timing statistics // ******************************************************************************** #ifdef WEBSERVER_NEW_UI + void handle_timingstats_json() { TXBuffer.startJsonStream(); json_init(); @@ -683,7 +742,8 @@ void handle_timingstats_json() { #ifdef WEBSERVER_NEW_UI -#if FEATURE_ESPEASY_P2P +# if FEATURE_ESPEASY_P2P + void handle_nodes_list_json() { if (!isLoggedIn()) { return; } TXBuffer.startJsonStream(); @@ -714,7 +774,8 @@ void handle_nodes_list_json() { json_close(true); TXBuffer.endStream(); } -#endif + +# endif // if FEATURE_ESPEASY_P2P void handle_buildinfo() { if (!isLoggedIn()) { return; } @@ -726,6 +787,7 @@ void handle_buildinfo() { for (deviceIndex_t x; x <= getDeviceCount(); x++) { const pluginID_t pluginID = getPluginID_from_DeviceIndex(x); + if (validPluginID(pluginID)) { json_open(); json_number(F("id"), String(pluginID)); @@ -748,7 +810,7 @@ void handle_buildinfo() { } json_close(true); } -#if FEATURE_NOTIFIER +# if FEATURE_NOTIFIER { json_open(true, F("notifications")); @@ -762,13 +824,13 @@ void handle_buildinfo() { } json_close(true); } -#endif +# endif // if FEATURE_NOTIFIER json_prop(LabelType::BUILD_DESC); json_prop(LabelType::GIT_BUILD); json_prop(LabelType::SYSTEM_LIBRARIES); -#ifdef ESP32 +# ifdef ESP32 json_prop(LabelType::ESP_IDF_SDK_VERSION); -#endif +# endif json_prop(LabelType::PLUGIN_COUNT); json_prop(LabelType::PLUGIN_DESCRIPTION); json_close(); @@ -777,11 +839,10 @@ void handle_buildinfo() { #endif // WEBSERVER_NEW_UI - /*********************************************************************************************\ Streaming versions directly to TXBuffer \*********************************************************************************************/ -void stream_to_json_object_value(const __FlashStringHelper * object, const String& value) { +void stream_to_json_object_value(const __FlashStringHelper *object, const String& value) { stream_to_json_object_value(String(object), value); } @@ -791,9 +852,7 @@ void stream_to_json_object_value(const String& object, const String& value) { addHtml(to_json_value(value)); } -void stream_to_json_object_value(const __FlashStringHelper * object, int value) { - stream_to_json_object_value(String(object), value); -} +void stream_to_json_object_value(const __FlashStringHelper *object, int value) { stream_to_json_object_value(String(object), value); } void stream_to_json_object_value(const String& object, int value) { addHtml(wrap_String(object, '"', '"')); @@ -801,18 +860,15 @@ void stream_to_json_object_value(const String& object, int value) { addHtmlInt(value); } -String jsonBool(bool value) { - return boolToString(value); -} - +String jsonBool(bool value) { return boolToString(value); } // Add JSON formatted data directly to the TXbuffer, including a trailing comma. -void stream_next_json_object_value(const __FlashStringHelper * object, const String& value) { +void stream_next_json_object_value(const __FlashStringHelper *object, const String& value) { stream_to_json_object_value(object, value); stream_comma_newline(); } -void stream_next_json_object_value(const __FlashStringHelper * object, String&& value) { +void stream_next_json_object_value(const __FlashStringHelper *object, String&& value) { stream_to_json_object_value(object, value); stream_comma_newline(); } @@ -822,7 +878,7 @@ void stream_next_json_object_value(const String& object, const String& value) { stream_comma_newline(); } -void stream_next_json_object_value(const __FlashStringHelper * object, int value) { +void stream_next_json_object_value(const __FlashStringHelper *object, int value) { stream_to_json_object_value(object, value); stream_comma_newline(); } @@ -832,18 +888,15 @@ void stream_next_json_object_value(const String& object, int value) { stream_comma_newline(); } -void stream_newline_close_brace() { - addHtml('\n', '}'); -} - +void stream_newline_close_brace() { addHtml('\n', '}'); } // Add JSON formatted data directly to the TXbuffer, including a closing '}' -void stream_last_json_object_value(const __FlashStringHelper * object, const String& value) { +void stream_last_json_object_value(const __FlashStringHelper *object, const String& value) { stream_to_json_object_value(object, value); stream_newline_close_brace(); } -void stream_last_json_object_value(const __FlashStringHelper * object, String&& value) { +void stream_last_json_object_value(const __FlashStringHelper *object, String&& value) { stream_to_json_object_value(object, value); stream_newline_close_brace(); } @@ -853,17 +906,18 @@ void stream_last_json_object_value(const String& object, const String& value) { stream_newline_close_brace(); } -void stream_last_json_object_value(const __FlashStringHelper * object, int value) { +void stream_last_json_object_value(const __FlashStringHelper *object, int value) { stream_to_json_object_value(object, value); stream_newline_close_brace(); } -void stream_json_object_values(const LabelType::Enum labels[]) -{ - size_t i = 0; - LabelType::Enum cur = static_cast(pgm_read_byte(labels + i)); +/* + void stream_json_object_values(const LabelType::Enum labels[]) + { + size_t i = 0; + LabelType::Enum cur = static_cast(pgm_read_byte(labels + i)); - while (true) { + while (true) { const LabelType::Enum next = static_cast(pgm_read_byte(labels + i + 1)); const bool nextIsLast = next == LabelType::MAX_LABEL; @@ -873,15 +927,11 @@ void stream_json_object_values(const LabelType::Enum labels[]) } else { stream_next_json_object_value(cur); } - ++i; + ++i; cur = next; - } -} + } + } + */ +void stream_next_json_object_value(LabelType::Enum label) { stream_next_json_object_value(getLabel(label), getValue(label)); } -void stream_next_json_object_value(LabelType::Enum label) { - stream_next_json_object_value(getLabel(label), getValue(label)); -} - -void stream_last_json_object_value(LabelType::Enum label) { - stream_last_json_object_value(getLabel(label), getValue(label)); -} \ No newline at end of file +void stream_last_json_object_value(LabelType::Enum label) { stream_last_json_object_value(getLabel(label), getValue(label)); } diff --git a/src/src/WebServer/JSON.h b/src/src/WebServer/JSON.h index 045b1f93a..6cc1c7628 100644 --- a/src/src/WebServer/JSON.h +++ b/src/src/WebServer/JSON.h @@ -67,7 +67,7 @@ void stream_last_json_object_value(const __FlashStringHelper * object, String&& void stream_last_json_object_value(const String& object, const String& value); void stream_last_json_object_value(const __FlashStringHelper * object, int value); -void stream_json_object_values(const LabelType::Enum labels[]); +//void stream_json_object_values(const LabelType::Enum labels[]); void stream_next_json_object_value(LabelType::Enum label); diff --git a/src/src/WebServer/KeyValueWriter_JSON.cpp b/src/src/WebServer/KeyValueWriter_JSON.cpp new file mode 100644 index 000000000..91016670b --- /dev/null +++ b/src/src/WebServer/KeyValueWriter_JSON.cpp @@ -0,0 +1,70 @@ +#include "../WebServer/KeyValueWriter_JSON.h" + +#include "../Helpers/StringConverter.h" + +#include "../WebServer/HTML_wrappers.h" + +KeyValueWriter_JSON::KeyValueWriter_JSON(const String& header) + : _hasHeader(true) +{ + addHtml(strformat(F("\"%s\":{\n"), header.c_str())); +} + +KeyValueWriter_JSON::KeyValueWriter_JSON(const __FlashStringHelper *header) + : _hasHeader(true) +{ + addHtml(strformat(F("\"%s\":{\n"), FsP(header))); +} + +KeyValueWriter_JSON::~KeyValueWriter_JSON() +{ + if (_hasHeader) { addHtml('}', '\n'); } +} + +void KeyValueWriter_JSON::clear() { _isFirst = true; } + +void KeyValueWriter_JSON::write(const KeyValueStruct& kv) +{ + if (!_isFirst) { + addHtml(',', '\n'); + } + addHtml('"'); + addHtml(kv._key); + addHtml('"', ':'); + + const size_t nrValues = kv._values.size(); + + if (nrValues < 2) { + // Either 1 value or empty value + if (nrValues == 0) { + addHtml('"', '"'); + } + else { + writeValue(kv._values[0]); + } + } else { + // Multiple values, so we must wrap it in [] + addHtml('[', '\n'); + + for (size_t i = 0; i < nrValues; ++i) { + if (i != 0) { + addHtml(',', '\n'); + } + writeValue(kv._values[i]); + } + addHtml(']', '\n'); + } + + _isFirst = false; +} + +void KeyValueWriter_JSON::writeValue(const ValueStruct& val) +{ + if (val.isInt) { + addHtml(val.str); + } else if (val.isBoolean) { + addHtml(val.str.equals("0") ? F("false") : F("true")); + } else { + addHtml(to_json_value(val.str)); + } +} diff --git a/src/src/WebServer/KeyValueWriter_JSON.h b/src/src/WebServer/KeyValueWriter_JSON.h new file mode 100644 index 000000000..4053bd75c --- /dev/null +++ b/src/src/WebServer/KeyValueWriter_JSON.h @@ -0,0 +1,30 @@ +#pragma once + +#include "../Helpers/KeyValueWriter.h" + +class KeyValueWriter_JSON : public KeyValueWriter +{ +public: + + using KeyValueWriter::writeLabels; + + KeyValueWriter_JSON() {} + + KeyValueWriter_JSON(const String& header); + KeyValueWriter_JSON(const __FlashStringHelper *header); + + virtual ~KeyValueWriter_JSON(); + + virtual void clear() override; + + virtual void write(const KeyValueStruct& kv); + +private: + + void writeValue(const ValueStruct& val); + + bool _hasHeader{}; + + + bool _isFirst = true; +}; // class KeyValueWriter_JSON diff --git a/src/src/WebServer/KeyValueWriter_WebForm.cpp b/src/src/WebServer/KeyValueWriter_WebForm.cpp new file mode 100644 index 000000000..162ffc176 --- /dev/null +++ b/src/src/WebServer/KeyValueWriter_WebForm.cpp @@ -0,0 +1,37 @@ +#include "../WebServer/KeyValueWriter_WebForm.h" + + +#include "../WebServer/HTML_wrappers.h" +#include "../WebServer/Markup.h" + +KeyValueWriter_WebForm::KeyValueWriter_WebForm(const String& header) +{ + addFormSubHeader(header); +} + +KeyValueWriter_WebForm::KeyValueWriter_WebForm(const __FlashStringHelper *header) +{ + addFormSubHeader(header); +} + +void KeyValueWriter_WebForm::write(const KeyValueStruct& kv) +{ + addRowLabel(kv._key, kv._id); + const size_t nrValues = kv._values.size(); + const bool format_pre = nrValues > 1 || kv._value_pre; + + if (format_pre) { addHtml(F("
    ")); }
+
+  for (size_t i = 0; i < nrValues; ++i) {
+    if (i != 0) {
+      addHtml(F("
    "));
+    }
+    addHtml(kv._values[i].str);
+  }
+
+  if (format_pre) { addHtml(F("
    ")); } + + if (nrValues == 1) { + addUnit(kv._unit); + } +} diff --git a/src/src/WebServer/KeyValueWriter_WebForm.h b/src/src/WebServer/KeyValueWriter_WebForm.h new file mode 100644 index 000000000..4dce331cb --- /dev/null +++ b/src/src/WebServer/KeyValueWriter_WebForm.h @@ -0,0 +1,23 @@ +#pragma once + +#include "../Helpers/KeyValueWriter.h" + +class KeyValueWriter_WebForm : public KeyValueWriter +{ +public: + + using KeyValueWriter::writeLabels; + + KeyValueWriter_WebForm() {} + + KeyValueWriter_WebForm(const String& header); + KeyValueWriter_WebForm(const __FlashStringHelper *header); + + + virtual ~KeyValueWriter_WebForm() {} + + + virtual void write(const KeyValueStruct& kv); + + +}; // class KeyValueWriter_WebForm diff --git a/src/src/WebServer/NetworkPage.cpp b/src/src/WebServer/NetworkPage.cpp index 76ecc15a6..07f939ead 100644 --- a/src/src/WebServer/NetworkPage.cpp +++ b/src/src/WebServer/NetworkPage.cpp @@ -11,6 +11,7 @@ # include "../Helpers/StringConverter.h" # include "../WebServer/ESPEasy_WebServer.h" # include "../WebServer/HTML_wrappers.h" +# include "../WebServer/KeyValueWriter_WebForm.h" # include "../WebServer/Markup.h" # include "../WebServer/Markup_Buttons.h" # include "../WebServer/Markup_Forms.h" @@ -398,90 +399,16 @@ void handle_networks_NetworkSettingsPage(ESPEasy::net::networkIndex_t networkind if (NWPluginCall(NWPlugin::Function::NWPLUGIN_GET_INTERFACE, &TempEvent, str)) { { - addFormSubHeader(F("Network Interface")); - - { - String str; - const bool res = NWPluginCall(NWPlugin::Function::NWPLUGIN_WEBFORM_SHOW_HW_ADDRESS, &TempEvent, str); - - if (res && !TempEvent.String1.isEmpty()) { - addRowLabel(TempEvent.String1); - } else { - addRowLabel(F("MAC Address")); - } - addHtml_pre(res - ? str - : TempEvent.networkInterface->macAddress()); - } - - const NWPlugin::NetforkFlags flags[] = { - NWPlugin::NetforkFlags::DHCP_client, - NWPlugin::NetforkFlags::DHCP_server, - NWPlugin::NetforkFlags::AutoUp, - NWPlugin::NetforkFlags::GratuituousArp, - NWPlugin::NetforkFlags::EventIPmodified, - NWPlugin::NetforkFlags::isPPP, - NWPlugin::NetforkFlags::isBridge, -# if CONFIG_LWIP_IPV6 - NWPlugin::NetforkFlags::MLD_v6_report, - NWPlugin::NetforkFlags::IPv6_autoconf_enabled, -# endif // if CONFIG_LWIP_IPV6 - }; - - addRowLabel(F("Flags")); - String labels_str; - - for (size_t i = 0; i < NR_ELEMENTS(flags); ++i) { - if (NWPlugin::isFlagSet(flags[i], TempEvent.networkInterface)) { - if (!labels_str.isEmpty()) { - labels_str += F("
    "); - } - labels_str += NWPlugin::toString(flags[i]); - - if (flags[i] == NWPlugin::NetforkFlags::DHCP_client) { - if (TempEvent.networkInterface->getStatusBits() & ESP_NETIF_HAS_STATIC_IP_BIT) { - labels_str += F(" (static IP)"); - } - } - } - } - addHtml_pre(labels_str); + KeyValueWriter_WebForm writer(F("Network Interface")); + write_NetworkAdapterFlags(networkindex, writer); } { - addFormSubHeader(F("IP Config")); - - const NWPlugin::IP_type ip_types[] = { - NWPlugin::IP_type::inet, - NWPlugin::IP_type::network_id_cdr, - NWPlugin::IP_type::netmask, - NWPlugin::IP_type::broadcast, - NWPlugin::IP_type::gateway, - NWPlugin::IP_type::dns1, - NWPlugin::IP_type::dns2, -# if CONFIG_LWIP_IPV6 - NWPlugin::IP_type::ipv6_unknown, - NWPlugin::IP_type::ipv6_global, - NWPlugin::IP_type::ipv6_link_local, - NWPlugin::IP_type::ipv6_site_local, - NWPlugin::IP_type::ipv6_unique_local, - NWPlugin::IP_type::ipv4_mapped_ipv6, -# endif // if CONFIG_LWIP_IPV6 - - }; - - for (size_t i = 0; i < NR_ELEMENTS(ip_types); ++i) { - - PrintToString str; - - if (NWPlugin::print_IP_address(ip_types[i], TempEvent.networkInterface, str)) { - addRowLabel(NWPlugin::toString(ip_types[i])); - addHtml_pre(str.get()); - } - } + KeyValueWriter_WebForm writer(F("IP Config")); + write_IP_config(networkindex, writer); } { String str; - const bool res = NWPluginCall(NWPlugin::Function::NWPLUGIN_WEBFORM_SHOW_CONNECTED, &TempEvent, str); + const bool res = NWPluginCall(NWPlugin::Function::NWPLUGIN_WEBFORM_SHOW_EXTENDED, &TempEvent, str); if (res && !str.isEmpty()) { addFormSubHeader(F("Connection Information")); @@ -504,18 +431,18 @@ void handle_networks_NetworkSettingsPage(ESPEasy::net::networkIndex_t networkind if (NWPluginCall(NWPlugin::Function::NWPLUGIN_GET_TRAFFIC_COUNT, &TempEvent, str)) { addRowLabel(F("TX / RX Frames")); addHtml(strformat( - F("%d / %d"), - TempEvent.Par5, - TempEvent.Par6)); + F("%d / %d"), + TempEvent.Par5, + TempEvent.Par6)); addRowLabel(F("TX / RX Frame Bytes")); addHtml(strformat( - F("%s%cB / %s%cB"), - formatHumanReadable(TempEvent.Par64_1, 1024).c_str(), - TempEvent.Par64_1 < 1024 ? ' ' : 'i', - formatHumanReadable(TempEvent.Par64_2, 1024).c_str(), - TempEvent.Par64_2 < 1024 ? ' ' : 'i' - )); + F("%s%cB / %s%cB"), + formatHumanReadable(TempEvent.Par64_1, 1024).c_str(), + TempEvent.Par64_1 < 1024 ? ' ' : 'i', + formatHumanReadable(TempEvent.Par64_2, 1024).c_str(), + TempEvent.Par64_2 < 1024 ? ' ' : 'i' + )); } # endif // if FEATURE_NETWORK_TRAFFIC_COUNT } @@ -535,4 +462,116 @@ void handle_networks_NetworkSettingsPage(ESPEasy::net::networkIndex_t networkind } +# ifdef ESP32 + +bool write_NetworkAdapterFlags(ESPEasy::net::networkIndex_t networkindex, KeyValueWriter& writer) +{ + struct EventStruct TempEvent; + + TempEvent.NetworkIndex = networkindex; + String str; + + if (!NWPluginCall(NWPlugin::Function::NWPLUGIN_GET_INTERFACE, &TempEvent, str)) { + return false; + } + + { + String str; + const bool res = NWPluginCall(NWPlugin::Function::NWPLUGIN_WEBFORM_SHOW_HW_ADDRESS, &TempEvent, str); + + KeyValueStruct kv; + kv._value_pre = true; + + if (res && !TempEvent.String1.isEmpty()) { + kv._key = TempEvent.String1; + } else { + kv._key = F("MAC Address"); + } + kv.appendValue(res + ? std::move(str) + : TempEvent.networkInterface->macAddress()); + + writer.write(kv); + } + + { + KeyValueStruct kv(F("Flags")); + kv._value_pre = true; + + const NWPlugin::NetforkFlags flags[] = { + NWPlugin::NetforkFlags::DHCP_client, + NWPlugin::NetforkFlags::DHCP_server, + NWPlugin::NetforkFlags::AutoUp, + NWPlugin::NetforkFlags::GratuituousArp, + NWPlugin::NetforkFlags::EventIPmodified, + NWPlugin::NetforkFlags::isPPP, + NWPlugin::NetforkFlags::isBridge, +# if CONFIG_LWIP_IPV6 + NWPlugin::NetforkFlags::MLD_v6_report, + NWPlugin::NetforkFlags::IPv6_autoconf_enabled, +# endif // if CONFIG_LWIP_IPV6 + }; + + for (size_t i = 0; i < NR_ELEMENTS(flags); ++i) { + if (NWPlugin::isFlagSet(flags[i], TempEvent.networkInterface)) { + String labels_str = NWPlugin::toString(flags[i]); + + if (flags[i] == NWPlugin::NetforkFlags::DHCP_client) { + if (TempEvent.networkInterface->getStatusBits() & ESP_NETIF_HAS_STATIC_IP_BIT) { + labels_str += F(" (static IP)"); + } + } + kv.appendValue(labels_str); + } + } + writer.write(kv); + } + return true; +} + +bool write_IP_config(ESPEasy::net::networkIndex_t networkindex, KeyValueWriter& writer) +{ + struct EventStruct TempEvent; + + TempEvent.NetworkIndex = networkindex; + String str; + + if (!NWPluginCall(NWPlugin::Function::NWPLUGIN_GET_INTERFACE, &TempEvent, str)) { + return false; + } + const NWPlugin::IP_type ip_types[] = { + NWPlugin::IP_type::inet, + NWPlugin::IP_type::network_id_cdr, + NWPlugin::IP_type::netmask, + NWPlugin::IP_type::broadcast, + NWPlugin::IP_type::gateway, + NWPlugin::IP_type::dns1, + NWPlugin::IP_type::dns2, +# if CONFIG_LWIP_IPV6 + NWPlugin::IP_type::ipv6_unknown, + NWPlugin::IP_type::ipv6_global, + NWPlugin::IP_type::ipv6_link_local, + NWPlugin::IP_type::ipv6_site_local, + NWPlugin::IP_type::ipv6_unique_local, + NWPlugin::IP_type::ipv4_mapped_ipv6, +# endif // if CONFIG_LWIP_IPV6 + + }; + + for (size_t i = 0; i < NR_ELEMENTS(ip_types); ++i) { + + PrintToString str; + + if (NWPlugin::print_IP_address(ip_types[i], TempEvent.networkInterface, str)) { + KeyValueStruct kv(NWPlugin::toString(ip_types[i]), str.get()); + kv._value_pre = true; + writer.write(kv); + } + } + return true; +} + +# endif // ifdef ESP32 + + #endif // ifdef WEBSERVER_NETWORK diff --git a/src/src/WebServer/NetworkPage.h b/src/src/WebServer/NetworkPage.h index fd1533c40..58d4956a5 100644 --- a/src/src/WebServer/NetworkPage.h +++ b/src/src/WebServer/NetworkPage.h @@ -5,6 +5,8 @@ #ifdef WEBSERVER_NETWORK +#include "../Helpers/KeyValueWriter.h" + #include "../../ESPEasy/net/DataTypes/NetworkIndex.h" #include "../../ESPEasy/net/DataStructs/NetworkSettingsStruct.h" @@ -37,6 +39,13 @@ void handle_networks_ShowAllNetworksTable(); // ******************************************************************************** void handle_networks_NetworkSettingsPage(ESPEasy::net::networkIndex_t networkindex); +#ifdef ESP32 +bool write_NetworkAdapterFlags(ESPEasy::net::networkIndex_t networkindex, KeyValueWriter& writer); + +bool write_IP_config(ESPEasy::net::networkIndex_t networkindex, KeyValueWriter& writer); + +#endif + #endif // ifdef WEBSERVER_NETWORK #endif // ifndef WEBSERVER_WEBSERVER_NETWORKPAGE_H From 5588cc4aca6d507f9153682e0c06ead9f849d332 Mon Sep 17 00:00:00 2001 From: TD-er Date: Thu, 2 Oct 2025 14:55:47 +0200 Subject: [PATCH 314/564] [JSON] Simplify writing JSON page --- src/src/Helpers/KeyValueWriter.cpp | 6 + src/src/Helpers/KeyValueWriter.h | 37 +- src/src/WebServer/JSON.cpp | 580 +++++++++---------- src/src/WebServer/JSON.h | 7 +- src/src/WebServer/KeyValueWriter_JSON.cpp | 91 ++- src/src/WebServer/KeyValueWriter_JSON.h | 22 +- src/src/WebServer/KeyValueWriter_WebForm.cpp | 49 +- src/src/WebServer/KeyValueWriter_WebForm.h | 18 +- 8 files changed, 479 insertions(+), 331 deletions(-) diff --git a/src/src/Helpers/KeyValueWriter.cpp b/src/src/Helpers/KeyValueWriter.cpp index dc5284e26..4d576ffd0 100644 --- a/src/src/Helpers/KeyValueWriter.cpp +++ b/src/src/Helpers/KeyValueWriter.cpp @@ -74,3 +74,9 @@ void KeyValueWriter::writeLabels(const LabelType::Enum labels[]) ++i; } } + +int KeyValueWriter::getLevel() const +{ + if (_parent == nullptr) { return 0; } + return _parent->getLevel() + 1; +} diff --git a/src/src/Helpers/KeyValueWriter.h b/src/src/Helpers/KeyValueWriter.h index 08c1dff87..28dc33f63 100644 --- a/src/src/Helpers/KeyValueWriter.h +++ b/src/src/Helpers/KeyValueWriter.h @@ -76,14 +76,49 @@ struct KeyValueStruct class KeyValueWriter { +public: + + KeyValueWriter(bool emptyHeader = false) : _hasHeader(emptyHeader) {} + +protected: + + KeyValueWriter(KeyValueWriter*parent) : _parent(parent) {} + + KeyValueWriter(bool emptyHeader, KeyValueWriter*parent) : _parent(parent), _hasHeader(emptyHeader) {} + + KeyValueWriter(const String& header, KeyValueWriter*parent) : _header(header), _parent(parent) {} + public: virtual ~KeyValueWriter() {} + virtual void setHeader(const String& header) { + _header = header; + _hasHeader = true; + } + virtual void clear(); + // Mark a write, typically called from a child calling its parent it is about to write + virtual void write() = 0; + virtual void write(const KeyValueStruct& kv) = 0; - void writeLabels(const LabelType::Enum labels[]); + void writeLabels(const LabelType::Enum labels[]); + +// virtual void setParent(KeyValueWriter*parent) { _parent = parent; } + + virtual int getLevel() const; + +protected: + + String _header; + + KeyValueWriter *_parent{}; + + bool _hasHeader = true; + + bool _isEmpty = true; + }; // class KeyValueWriter diff --git a/src/src/WebServer/JSON.cpp b/src/src/WebServer/JSON.cpp index 7f691722e..abe413352 100644 --- a/src/src/WebServer/JSON.cpp +++ b/src/src/WebServer/JSON.cpp @@ -156,14 +156,21 @@ void handle_json() } TXBuffer.startJsonStream(); - - if (!showSpecificTask) { - addHtml('{'); - if (showSystem) { - { - KeyValueWriter_JSON writer(F("System")); + KeyValueWriter_JSON mainLevelWriter(true); + + if (!showSpecificTask) + { + if (showSystem) { + KeyValueWriter_JSON writer(F("System"), &mainLevelWriter); + + if (wdcounter > 0) + { + writer.write(LabelType::LOAD_PCT); + writer.write(LabelType::LOOP_COUNT); + } + static const LabelType::Enum labels[] PROGMEM = { @@ -249,33 +256,25 @@ void handle_json() LabelType::MAX_LABEL }; writer.writeLabels(labels); - - if (wdcounter > 0) - { - writer.write(LabelType::LOAD_PCT); - writer.write(LabelType::LOOP_COUNT); - } } - stream_comma_newline(); - } - if (showWifi) { - { - KeyValueWriter_JSON writer(F("WiFi")); + if (showWifi) { + KeyValueWriter_JSON writer(F("WiFi"), &mainLevelWriter); -#ifdef ESP32 +#ifdef WEBSERVER_NETWORK +# ifdef ESP32 { - KeyValueWriter_JSON writer2(F("Network Interface")); + KeyValueWriter_JSON writer2(F("Network Interface"), &writer); write_NetworkAdapterFlags(0, writer2); } - stream_comma_newline(); { - KeyValueWriter_JSON writer2(F("IP Config")); + KeyValueWriter_JSON writer2(F("IP Config"), &writer); write_IP_config(0, writer2); } - stream_comma_newline(); -#endif // ifdef ESP32 +# endif // ifdef ESP32 +#endif // ifdef WEBSERVER_NETWORK + static const LabelType::Enum labels[] PROGMEM = { @@ -340,16 +339,14 @@ void handle_json() LabelType::MAX_LABEL }; writer.writeLabels(labels); - } - // TODO: PKR: Add ETH Objects - stream_comma_newline(); - } + // TODO: PKR: Add ETH Objects + } #if FEATURE_ETHERNET - if (showEthernet) { - { + if (showEthernet) { + static const LabelType::Enum labels[] PROGMEM = { LabelType::ETH_WIFI_MODE, @@ -363,362 +360,341 @@ void handle_json() LabelType::MAX_LABEL }; - KeyValueWriter_JSON writer(F("Ethernet")); + KeyValueWriter_JSON writer(F("Ethernet"), &mainLevelWriter); writer.writeLabels(labels); - } - stream_comma_newline(); - } + } #endif // if FEATURE_ETHERNET #if FEATURE_ESPEASY_P2P - if (showNodes) { - bool comma_between = false; + if (showNodes) { + KeyValueWriter_JSON nodesWriter(F("nodes"), &mainLevelWriter); + nodesWriter.setIsArray(); - for (auto it = Nodes.begin(); it != Nodes.end(); ++it) - { - if (it->second.ip[0] != 0) + for (auto it = Nodes.begin(); it != Nodes.end(); ++it) { - if (comma_between) { - addHtml(','); - } else { - comma_between = true; - addHtml(F("\"nodes\":[\n")); // open json array if >0 nodes - } + if (it->second.ip[0] != 0) + { + KeyValueWriter_JSON writer(&nodesWriter); - addHtml('{'); - stream_next_json_object_value(F("nr"), it->first); - stream_next_json_object_value(F("name"), - (it->first != Settings.Unit) ? it->second.getNodeName() : Settings.getName()); + writer.write({ F("nr"), it->first }); + writer.write({ F("name"), + (it->first != Settings.Unit) ? it->second.getNodeName() : Settings.getName() }); - if (it->second.build) { - stream_next_json_object_value(F("build"), formatSystemBuildNr(it->second.build)); - } - - if (it->second.nodeType) { - stream_next_json_object_value(F("platform"), it->second.getNodeTypeDisplayString()); - } - const int8_t rssi = it->second.getRSSI(); - - if (rssi < 0) { - stream_next_json_object_value(F("rssi"), rssi); - } - - if (it->second.build >= 20107) { - stream_next_json_object_value(F("load"), toString(it->second.getLoad(), 2)); - - if (it->second.webgui_portnumber != 80) { - stream_next_json_object_value(F("webport"), it->second.webgui_portnumber); + if (it->second.build) { + writer.write({ F("build"), formatSystemBuildNr(it->second.build) }); } - } - stream_next_json_object_value(F("ip"), formatIP(it->second.IP())); + + if (it->second.nodeType) { + writer.write({ F("platform"), it->second.getNodeTypeDisplayString() }); + } + const int8_t rssi = it->second.getRSSI(); + + if (rssi < 0) { + writer.write({ F("rssi"), rssi }); + } + + if (it->second.build >= 20107) { + writer.write({ F("load"), toString(it->second.getLoad(), 2) }); + + if (it->second.webgui_portnumber != 80) { + writer.write({ F("webport"), it->second.webgui_portnumber }); + } + } + writer.write({ F("ip"), formatIP(it->second.IP()) }); # if FEATURE_USE_IPV6 - if (it->second.hasIPv6_mac_based_link_local) { - stream_next_json_object_value(F("ipv6local"), formatIP(it->second.IPv6_link_local(true), true)); - } + if (it->second.hasIPv6_mac_based_link_local) { + writer.write({ F("ipv6local"), formatIP(it->second.IPv6_link_local(true), true) }); + } - if (it->second.hasIPv6_mac_based_link_global) { - stream_next_json_object_value(F("ipv6global"), formatIP(it->second.IPv6_global())); - } + if (it->second.hasIPv6_mac_based_link_global) { + writer.write({ F("ipv6global"), formatIP(it->second.IPv6_global()) }); + } # endif // if FEATURE_USE_IPV6 - stream_last_json_object_value(F("age"), it->second.getAge()); - } // if node info exists - } // for loop + writer.write({ F("age"), it->second.getAge() }); + } // if node info exists + } // for loop + } + #endif // if FEATURE_ESPEASY_P2P + } - if (comma_between) { - addHtml(F("],\n")); // close array if >0 nodes + taskIndex_t firstTaskIndex = 0; + taskIndex_t lastTaskIndex = TASKS_MAX - 1; + + if (showSpecificTask) + { + firstTaskIndex = taskNr - 1; + lastTaskIndex = taskNr - 1; + } + taskIndex_t lastActiveTaskIndex = 0; + + for (taskIndex_t TaskIndex = firstTaskIndex; TaskIndex <= lastTaskIndex; TaskIndex++) { + if (validPluginID_fullcheck(Settings.getPluginID_for_task(TaskIndex))) { + lastActiveTaskIndex = TaskIndex; } } - #endif // if FEATURE_ESPEASY_P2P - } - taskIndex_t firstTaskIndex = 0; - taskIndex_t lastTaskIndex = TASKS_MAX - 1; - - if (showSpecificTask) - { - firstTaskIndex = taskNr - 1; - lastTaskIndex = taskNr - 1; - } - taskIndex_t lastActiveTaskIndex = 0; - - for (taskIndex_t TaskIndex = firstTaskIndex; TaskIndex <= lastTaskIndex; TaskIndex++) { - if (validPluginID_fullcheck(Settings.getPluginID_for_task(TaskIndex))) { - lastActiveTaskIndex = TaskIndex; - } - } - - if (!showSpecificTask) { - addHtml(F("\"Sensors\":[\n")); - } - - // Keep track of the lowest reported TTL and use that as refresh interval. - unsigned long lowest_ttl_json = 60; - - for (taskIndex_t TaskIndex = firstTaskIndex; TaskIndex <= lastActiveTaskIndex && validTaskIndex(TaskIndex); TaskIndex++) - { - const deviceIndex_t DeviceIndex = getDeviceIndex_from_TaskIndex(TaskIndex); - - if (validDeviceIndex(DeviceIndex)) + // Keep track of the lowest reported TTL and use that as refresh interval. + unsigned long lowest_ttl_json = 60; { - const unsigned long taskInterval = Settings.TaskDeviceTimer[TaskIndex]; + KeyValueWriter_JSON sensorsWriter(false, &mainLevelWriter); - // LoadTaskSettings(TaskIndex); - addHtml('{', '\n'); + if (!showSpecificTask) { + sensorsWriter.setHeader(F("Sensors")); + sensorsWriter.setIsArray(); + } - unsigned long ttl_json = 60; // Default value - // For simplicity, do the optional values first. - const uint8_t valueCount = getValueCountForTask(TaskIndex); + for (taskIndex_t TaskIndex = firstTaskIndex; TaskIndex <= lastActiveTaskIndex && validTaskIndex(TaskIndex); TaskIndex++) + { + const deviceIndex_t DeviceIndex = getDeviceIndex_from_TaskIndex(TaskIndex); - if (valueCount != 0) { - if (Settings.TaskDeviceEnabled[TaskIndex]) { - if (taskInterval == 0) { - ttl_json = 1; - } else { - ttl_json = taskInterval; - } - - if (ttl_json < lowest_ttl_json) { - lowest_ttl_json = ttl_json; - } - } - addHtml(F("\"TaskValues\": [\n")); - - struct EventStruct TempEvent(TaskIndex); - - for (uint8_t x = 0; x < valueCount; x++) + if (validDeviceIndex(DeviceIndex)) { - uint8_t nrDecimals = Cache.getTaskDeviceValueDecimals(TaskIndex, x); - String value = formatUserVarNoCheck(&TempEvent, x); + const unsigned long taskInterval = Settings.TaskDeviceTimer[TaskIndex]; + + KeyValueWriter_JSON taskWriter(&sensorsWriter); + + // LoadTaskSettings(TaskIndex); + + unsigned long ttl_json = 60; // Default value + + // For simplicity, do the optional values first. + const uint8_t valueCount = getValueCountForTask(TaskIndex); + + if (valueCount != 0) { + if (Settings.TaskDeviceEnabled[TaskIndex]) { + if (taskInterval == 0) { + ttl_json = 1; + } else { + ttl_json = taskInterval; + } + + if (ttl_json < lowest_ttl_json) { + lowest_ttl_json = ttl_json; + } + } + KeyValueWriter_JSON taskValueWriter(F("TaskValues"), &taskWriter); + taskValueWriter.setIsArray(); + + struct EventStruct TempEvent(TaskIndex); + + for (uint8_t x = 0; x < valueCount; x++) + { + uint8_t nrDecimals = Cache.getTaskDeviceValueDecimals(TaskIndex, x); + String value = formatUserVarNoCheck(&TempEvent, x); #if FEATURE_STRING_VARIABLES - bool hasPresentation; - const String presentation = formatUserVarForPresentation(&TempEvent, x, hasPresentation, value, DeviceIndex); + bool hasPresentation; + const String presentation = formatUserVarForPresentation(&TempEvent, x, hasPresentation, value, DeviceIndex); #endif // if FEATURE_STRING_VARIABLES - if (mustConsiderAsJSONString(value)) { - // Flag as not to treat as a float - nrDecimals = 255; - } + if (mustConsiderAsJSONString(value)) { + // Flag as not to treat as a float + nrDecimals = 255; + } #if FEATURE_TASKVALUE_UNIT_OF_MEASURE - String uom; - const uint8_t uomIndex = Cache.getTaskVarUnitOfMeasure(TaskIndex, x); + String uom; + const uint8_t uomIndex = Cache.getTaskVarUnitOfMeasure(TaskIndex, x); - if (uomIndex != 0) { - uom = toUnitOfMeasureName(uomIndex); - } + if (uomIndex != 0) { + uom = toUnitOfMeasureName(uomIndex); + } #else // if FEATURE_TASKVALUE_UNIT_OF_MEASURE - const String uom; + const String uom; #endif // if FEATURE_TASKVALUE_UNIT_OF_MEASURE - handle_json_stream_task_value_data(x + 1, - Cache.getTaskDeviceValueName(TaskIndex, x), - nrDecimals, - value, + handle_json_stream_task_value_data(&taskValueWriter, + x + 1, + Cache.getTaskDeviceValueName(TaskIndex, x), + nrDecimals, + value, #if FEATURE_STRING_VARIABLES - presentation, + presentation, #else // if FEATURE_STRING_VARIABLES - EMPTY_STRING, + EMPTY_STRING, #endif // if FEATURE_STRING_VARIABLES - uom, - x < (valueCount - 1)); - } + uom); + } #if FEATURE_STRING_VARIABLES - if (Settings.ShowDerivedTaskValues(TaskIndex)) { - int varNr = VARS_PER_TASK; - String taskName = getTaskDeviceName(TaskIndex); - taskName.toLowerCase(); - String postfix; - const String search = getDerivedValueSearchAndPostfix(taskName, postfix); + if (Settings.ShowDerivedTaskValues(TaskIndex)) { + int varNr = VARS_PER_TASK; + String taskName = getTaskDeviceName(TaskIndex); + taskName.toLowerCase(); + String postfix; + const String search = getDerivedValueSearchAndPostfix(taskName, postfix); - auto it = customStringVar.begin(); + auto it = customStringVar.begin(); - while (it != customStringVar.end()) { - if (it->first.startsWith(search) && it->first.endsWith(postfix)) { - String valueName = it->first.substring(search.length(), it->first.indexOf('-')); - String uom; - String vType; - const String vname2 = getDerivedValueNameUomAndVType(taskName, valueName, uom, vType); + while (it != customStringVar.end()) { + if (it->first.startsWith(search) && it->first.endsWith(postfix)) { + String valueName = it->first.substring(search.length(), it->first.indexOf('-')); + String uom; + String vType; + const String vname2 = getDerivedValueNameUomAndVType(taskName, valueName, uom, vType); - if (!vname2.isEmpty()) { - valueName = vname2; - } + if (!vname2.isEmpty()) { + valueName = vname2; + } - if (!it->second.isEmpty()) { - String value(it->second); - stripEscapeCharacters(value); - value = parseTemplate(value); - uint8_t nrDecimals = 255; // FIXME Use the minimal number of decimals needed - bool hasPresentation; - const String presentation = formatUserVarForPresentation(&TempEvent, - INVALID_TASKVAR_INDEX, - hasPresentation, - value, - DeviceIndex, - valueName); + if (!it->second.isEmpty()) { + String value(it->second); + stripEscapeCharacters(value); + value = parseTemplate(value); + uint8_t nrDecimals = 255; // FIXME Use the minimal number of decimals needed + bool hasPresentation; + const String presentation = formatUserVarForPresentation(&TempEvent, + INVALID_TASKVAR_INDEX, + hasPresentation, + value, + DeviceIndex, + valueName); - stream_comma_newline(); // Push out a comma and newline - handle_json_stream_task_value_data(varNr + 1, - valueName, - nrDecimals, - value, - presentation, - uom, - false); // No comma here - ++varNr; + handle_json_stream_task_value_data(&taskValueWriter, + varNr + 1, + valueName, + nrDecimals, + value, + presentation, + uom); + ++varNr; + } + } + else if (it->first.substring(0, search.length()).compareTo(search) > 0) { + break; + } + ++it; } } - else if (it->first.substring(0, search.length()).compareTo(search) > 0) { - break; - } - ++it; - } - } #endif // if FEATURE_STRING_VARIABLES - addHtml(F("],\n")); - } + } #if FEATURE_PLUGIN_STATS && FEATURE_CHART_JS - if (showPluginStats && Device[DeviceIndex].PluginStats) { - PluginTaskData_base *taskData = getPluginTaskDataBaseClassOnly(TaskIndex); + if (showPluginStats && Device[DeviceIndex].PluginStats) { + PluginTaskData_base *taskData = getPluginTaskDataBaseClassOnly(TaskIndex); - if ((taskData != nullptr) && (taskData->nrSamplesPresent() > 0)) { - addHtml(F("\"PluginStats\":\n")); - taskData->plot_ChartJS(true); - stream_comma_newline(); - } - } + if ((taskData != nullptr) && (taskData->nrSamplesPresent() > 0)) { + addHtml(F("\"PluginStats\":\n")); + taskData->plot_ChartJS(true); + stream_comma_newline(); + } + } #endif // if FEATURE_PLUGIN_STATS && FEATURE_CHART_JS - if (showSpecificTask) { - stream_next_json_object_value(F("TTL"), ttl_json * 1000); + if (showSpecificTask) { + stream_next_json_object_value(F("TTL"), ttl_json * 1000); #if FEATURE_TASKVALUE_UNIT_OF_MEASURE - stream_next_json_object_value(F("ShowUoM"), jsonBool(Settings.ShowUnitOfMeasureOnDevicesPage())); + stream_next_json_object_value(F("ShowUoM"), jsonBool(Settings.ShowUnitOfMeasureOnDevicesPage())); #endif // if FEATURE_TASKVALUE_UNIT_OF_MEASURE - } - - if (showDataAcquisition) { - addHtml(F("\"DataAcquisition\": [\n")); - - for (controllerIndex_t x = 0; x < CONTROLLER_MAX; x++) - { - addHtml('{'); - stream_next_json_object_value(F("Controller"), x + 1); - stream_next_json_object_value(F("IDX"), Settings.TaskDeviceID[x][TaskIndex]); - stream_last_json_object_value(F("Enabled"), jsonBool(Settings.TaskDeviceSendData[x][TaskIndex])); - - if (x < (CONTROLLER_MAX - 1)) { - stream_comma_newline(); } - } - addHtml(F("],\n")); - } - if (showTaskDetails) { - stream_next_json_object_value(F("TaskInterval"), taskInterval); - stream_next_json_object_value(F("Type"), getPluginNameFromDeviceIndex(DeviceIndex)); - stream_next_json_object_value(F("TaskName"), getTaskDeviceName(TaskIndex)); - stream_next_json_object_value(F("TaskDeviceNumber"), Settings.getPluginID_for_task(TaskIndex).value); + if (showDataAcquisition) { + KeyValueWriter_JSON dataAquisitionWriter(F("DataAcquisition"), &taskWriter); + dataAquisitionWriter.setIsArray(); - for (int i = 0; i < 3; i++) { - if (Settings.TaskDevicePin[i][TaskIndex] >= 0) { - stream_next_json_object_value(concat(F("TaskDeviceGPIO"), i + 1), static_cast(Settings.TaskDevicePin[i][TaskIndex])); + for (controllerIndex_t x = 0; x < CONTROLLER_MAX; x++) + { + KeyValueWriter_JSON controllerWriter(&dataAquisitionWriter); + controllerWriter.write({ F("Controller"), x + 1 }); + controllerWriter.write({ F("IDX"), Settings.TaskDeviceID[x][TaskIndex] }); + controllerWriter.write({ F("Enabled"), jsonBool(Settings.TaskDeviceSendData[x][TaskIndex]) }); + } } - } - #if FEATURE_I2CMULTIPLEXER - uint8_t i2cBus = 0; - # if FEATURE_I2C_MULTIPLE - i2cBus = Settings.getI2CInterface(TaskIndex); - # endif + if (showTaskDetails) { + taskWriter.write({ F("TaskInterval"), taskInterval }); + taskWriter.write({ F("Type"), getPluginNameFromDeviceIndex(DeviceIndex) }); + taskWriter.write({ F("TaskName"), getTaskDeviceName(TaskIndex) }); + taskWriter.write({ F("TaskDeviceNumber"), Settings.getPluginID_for_task(TaskIndex).value }); - if ((Device[DeviceIndex].Type == DEVICE_TYPE_I2C) && isI2CMultiplexerEnabled(i2cBus)) { - # if FEATURE_I2C_MULTIPLE - stream_next_json_object_value(F("I2C_Interface"), static_cast(i2cBus + 1)); - # endif - int8_t channel = Settings.I2C_Multiplexer_Channel[TaskIndex]; - - if (bitRead(Settings.I2C_Flags[TaskIndex], I2C_FLAGS_MUX_MULTICHANNEL)) { - addHtml(F("\"I2CBus\" : [")); - uint8_t b = 0; - - for (uint8_t c = 0; c < I2CMultiplexerMaxChannels(i2cBus); ++c) { - if (bitRead(channel, c)) { - if (b > 0) { stream_comma_newline(); } - b++; - addHtml(F("\"Multiplexer channel ")); - addHtmlInt(c); - addHtml('"'); + for (int i = 0; i < 3; i++) { + if (Settings.TaskDevicePin[i][TaskIndex] >= 0) { + taskWriter.write({ concat(F("TaskDeviceGPIO"), i + 1), static_cast(Settings.TaskDevicePin[i][TaskIndex]) }); } } - addHtml(F("],\n")); - } else { - if (channel == -1) { - stream_next_json_object_value(F("I2Cbus"), F("Standard I2C bus")); - } else { - String i2cChannel = concat(F("Multiplexer channel "), channel); - stream_next_json_object_value(F("I2Cbus"), i2cChannel); + + #if FEATURE_I2CMULTIPLEXER + uint8_t i2cBus = 0; + # if FEATURE_I2C_MULTIPLE + i2cBus = Settings.getI2CInterface(TaskIndex); + # endif + + if ((Device[DeviceIndex].Type == DEVICE_TYPE_I2C) && isI2CMultiplexerEnabled(i2cBus)) { + # if FEATURE_I2C_MULTIPLE + taskWriter.write({ F("I2C_Interface"), static_cast(i2cBus + 1) }); + # endif + int8_t channel = Settings.I2C_Multiplexer_Channel[TaskIndex]; + + if (bitRead(Settings.I2C_Flags[TaskIndex], I2C_FLAGS_MUX_MULTICHANNEL)) { + + KeyValueStruct kv(F("I2CBus")); + + addHtml(F("\"I2CBus\" : [")); + + for (uint8_t c = 0; c < I2CMultiplexerMaxChannels(i2cBus); ++c) { + if (bitRead(channel, c)) { + kv.appendValue(strformat(F("Multiplexer channel %d"), c)); + } + } + taskWriter.write(kv); + } else { + if (channel == -1) { + taskWriter.write({ F("I2Cbus"), F("Standard I2C bus") }); + } else { + taskWriter.write({ F("I2Cbus"), concat(F("Multiplexer channel "), channel) }); + } + } } - } - } #endif // if FEATURE_I2CMULTIPLEXER + } + taskWriter.write({ F("TaskEnabled"), + jsonBool(Settings.TaskDeviceEnabled[TaskIndex]) }); + taskWriter.write({ F("TaskNumber"), TaskIndex + 1 }); + } } - stream_next_json_object_value(F("TaskEnabled"), - -// jsonBool(Settings.TaskDeviceEnabled[TaskIndex].enabled)); - jsonBool(Settings.TaskDeviceEnabled[TaskIndex])); - - stream_last_json_object_value(F("TaskNumber"), TaskIndex + 1); - - if (TaskIndex != lastActiveTaskIndex) { - addHtml(','); - } - addHtml('\n'); } - } - if (!showSpecificTask) { - addHtml(F("],\n")); + if (!showSpecificTask) { #if FEATURE_TASKVALUE_UNIT_OF_MEASURE - stream_next_json_object_value(F("ShowUoM"), jsonBool(Settings.ShowUnitOfMeasureOnDevicesPage())); + + // Explicit cast to bool, since the function is an inline function, which is returning part of a bitset. + // Thus is considered an int by the compiler + mainLevelWriter.write({ F("ShowUoM"), !!Settings.ShowUnitOfMeasureOnDevicesPage() }); #endif // if FEATURE_TASKVALUE_UNIT_OF_MEASURE - stream_last_json_object_value(F("TTL"), lowest_ttl_json * 1000); + mainLevelWriter.write({ F("TTL"), lowest_ttl_json * 1000 }); + } } TXBuffer.endStream(); STOP_TIMER(HANDLE_SERVING_WEBPAGE_JSON); } -void handle_json_stream_task_value_data(uint16_t valueNumber, - const String& valueName, - uint8_t nrDecimals, - const String& value, - const String& presentation, - const String& uom, - bool appendComma) { - addHtml('{'); - stream_next_json_object_value(F("ValueNumber"), valueNumber); - stream_next_json_object_value(F("Name"), valueName); - stream_next_json_object_value(F("NrDecimals"), nrDecimals); +void handle_json_stream_task_value_data(KeyValueWriter_JSON*parent, + uint16_t valueNumber, + const String & valueName, + uint8_t nrDecimals, + const String & value, + const String & presentation, + const String & uom) { + KeyValueWriter_JSON writer(parent); + + writer.write({ F("ValueNumber"), valueNumber }); + writer.write({ F("Name"), valueName }); + writer.write({ F("NrDecimals"), nrDecimals }); #if FEATURE_STRING_VARIABLES if (!presentation.isEmpty()) { - stream_next_json_object_value(F("Presentation"), presentation); + writer.write({ F("Presentation"), presentation }); } #endif // if FEATURE_STRING_VARIABLES if (!uom.isEmpty()) { - stream_next_json_object_value(F("UoM"), uom); - } - stream_last_json_object_value(F("Value"), value); - - if (appendComma) { - stream_comma_newline(); + writer.write({ F("UoM"), uom }); } + writer.write({ F("Value"), value }); } // ******************************************************************************** diff --git a/src/src/WebServer/JSON.h b/src/src/WebServer/JSON.h index 6cc1c7628..9f57f48de 100644 --- a/src/src/WebServer/JSON.h +++ b/src/src/WebServer/JSON.h @@ -4,6 +4,7 @@ #include "../WebServer/common.h" +#include "../WebServer/KeyValueWriter_JSON.h" // ******************************************************************************** // Web Interface get CSV value from task @@ -17,13 +18,13 @@ void handle_csvval(); // ******************************************************************************** void handle_json(); -void handle_json_stream_task_value_data(uint16_t valueNumber, +void handle_json_stream_task_value_data(KeyValueWriter_JSON* parent, + uint16_t valueNumber, const String & valueName, uint8_t nrDecimals, const String & value, const String & presentation, - const String & uom, - bool appendComma); + const String & uom); // ******************************************************************************** // JSON formatted timing statistics diff --git a/src/src/WebServer/KeyValueWriter_JSON.cpp b/src/src/WebServer/KeyValueWriter_JSON.cpp index 91016670b..b096a820d 100644 --- a/src/src/WebServer/KeyValueWriter_JSON.cpp +++ b/src/src/WebServer/KeyValueWriter_JSON.cpp @@ -4,30 +4,82 @@ #include "../WebServer/HTML_wrappers.h" +KeyValueWriter_JSON::KeyValueWriter_JSON(bool emptyHeader) + : KeyValueWriter(emptyHeader) +{} + +KeyValueWriter_JSON::KeyValueWriter_JSON(KeyValueWriter_JSON*parent) + : KeyValueWriter(parent) +{} + +KeyValueWriter_JSON::KeyValueWriter_JSON(bool emptyHeader, KeyValueWriter_JSON*parent) + : KeyValueWriter(emptyHeader, parent) +{} + KeyValueWriter_JSON::KeyValueWriter_JSON(const String& header) - : _hasHeader(true) -{ - addHtml(strformat(F("\"%s\":{\n"), header.c_str())); -} + : KeyValueWriter(header, nullptr) +{} KeyValueWriter_JSON::KeyValueWriter_JSON(const __FlashStringHelper *header) - : _hasHeader(true) -{ - addHtml(strformat(F("\"%s\":{\n"), FsP(header))); -} + : KeyValueWriter(String(header), nullptr) +{} + + +KeyValueWriter_JSON::KeyValueWriter_JSON(const String& header, KeyValueWriter_JSON*parent) + : KeyValueWriter(header, parent) +{} + +KeyValueWriter_JSON::KeyValueWriter_JSON(const __FlashStringHelper *header, KeyValueWriter_JSON*parent) + : KeyValueWriter(String(header), parent) +{} KeyValueWriter_JSON::~KeyValueWriter_JSON() { - if (_hasHeader) { addHtml('}', '\n'); } + if (!_isEmpty) { + addHtml('\n'); + + if (_hasHeader) { + indent(); + addHtml(_isArray ? ']' : '}'); + } + } } -void KeyValueWriter_JSON::clear() { _isFirst = true; } +void KeyValueWriter_JSON::setHeader(const String& header) +{ + _header = header; + _hasHeader = true; +} + +void KeyValueWriter_JSON::clear() { _isEmpty = true; } + +void KeyValueWriter_JSON::write() +{ + if (_isEmpty) { + if (_parent != nullptr) { _parent->write(); } + + if (_hasHeader) { + indent(); + + if (_header.isEmpty()) { + addHtml('{', '\n'); + } else { + addHtml(strformat( + F("\"%s\":%c\n"), + _header.c_str(), + _isArray ? '[' : '{')); + } + } + _isEmpty = false; + } else { + addHtml(',', '\n'); + } +} void KeyValueWriter_JSON::write(const KeyValueStruct& kv) { - if (!_isFirst) { - addHtml(',', '\n'); - } + write(); + indent(); addHtml('"'); addHtml(kv._key); addHtml('"', ':'); @@ -50,12 +102,12 @@ void KeyValueWriter_JSON::write(const KeyValueStruct& kv) if (i != 0) { addHtml(',', '\n'); } + indent(); writeValue(kv._values[i]); } + indent(); addHtml(']', '\n'); } - - _isFirst = false; } void KeyValueWriter_JSON::writeValue(const ValueStruct& val) @@ -68,3 +120,12 @@ void KeyValueWriter_JSON::writeValue(const ValueStruct& val) addHtml(to_json_value(val.str)); } } + +void KeyValueWriter_JSON::indent() const +{ + const int level = getLevel(); + + for (int i = 0; i < level; ++i) { + addHtml('\t'); + } +} diff --git a/src/src/WebServer/KeyValueWriter_JSON.h b/src/src/WebServer/KeyValueWriter_JSON.h index 4053bd75c..436e73ab9 100644 --- a/src/src/WebServer/KeyValueWriter_JSON.h +++ b/src/src/WebServer/KeyValueWriter_JSON.h @@ -8,23 +8,39 @@ public: using KeyValueWriter::writeLabels; - KeyValueWriter_JSON() {} + KeyValueWriter_JSON(bool emptyHeader = false); + + KeyValueWriter_JSON(KeyValueWriter_JSON*parent); + + KeyValueWriter_JSON(bool emptyHeader, + KeyValueWriter_JSON*parent); KeyValueWriter_JSON(const String& header); KeyValueWriter_JSON(const __FlashStringHelper *header); + KeyValueWriter_JSON(const String & header, + KeyValueWriter_JSON*parent); + KeyValueWriter_JSON(const __FlashStringHelper *header, + KeyValueWriter_JSON *parent); + virtual ~KeyValueWriter_JSON(); + virtual void setHeader(const String& header); + + void setIsArray() { _isArray = true; } + virtual void clear() override; + virtual void write(); + virtual void write(const KeyValueStruct& kv); private: void writeValue(const ValueStruct& val); - bool _hasHeader{}; + void indent() const; + bool _isArray{}; - bool _isFirst = true; }; // class KeyValueWriter_JSON diff --git a/src/src/WebServer/KeyValueWriter_WebForm.cpp b/src/src/WebServer/KeyValueWriter_WebForm.cpp index 162ffc176..0cf1037ba 100644 --- a/src/src/WebServer/KeyValueWriter_WebForm.cpp +++ b/src/src/WebServer/KeyValueWriter_WebForm.cpp @@ -4,14 +4,55 @@ #include "../WebServer/HTML_wrappers.h" #include "../WebServer/Markup.h" +KeyValueWriter_WebForm::KeyValueWriter_WebForm(bool emptyHeader) + : KeyValueWriter(emptyHeader) +{} + +KeyValueWriter_WebForm::KeyValueWriter_WebForm(KeyValueWriter_WebForm*parent) + : KeyValueWriter(parent) +{} + +KeyValueWriter_WebForm::KeyValueWriter_WebForm(bool emptyHeader, KeyValueWriter_WebForm*parent) + : KeyValueWriter(emptyHeader, parent) +{} + KeyValueWriter_WebForm::KeyValueWriter_WebForm(const String& header) -{ - addFormSubHeader(header); -} + : KeyValueWriter(header, nullptr) +{} KeyValueWriter_WebForm::KeyValueWriter_WebForm(const __FlashStringHelper *header) + : KeyValueWriter(String(header), nullptr) +{} + + +KeyValueWriter_WebForm::KeyValueWriter_WebForm(const String& header, KeyValueWriter_WebForm*parent) + : KeyValueWriter(header, parent) +{} + +KeyValueWriter_WebForm::KeyValueWriter_WebForm(const __FlashStringHelper *header, KeyValueWriter_WebForm*parent) + : KeyValueWriter(String(header), parent) +{} + + +KeyValueWriter_WebForm::~KeyValueWriter_WebForm() +{} + +void KeyValueWriter_WebForm::setHeader(const String& header) { - addFormSubHeader(header); + _header = header; + _hasHeader = true; +} + +void KeyValueWriter_WebForm::write() +{ + if (_isEmpty) { + if (_parent != nullptr) { _parent->write(); } + + if (_hasHeader && !_header.isEmpty()) { + addFormSubHeader(_header); + } + _isEmpty = false; + } } void KeyValueWriter_WebForm::write(const KeyValueStruct& kv) diff --git a/src/src/WebServer/KeyValueWriter_WebForm.h b/src/src/WebServer/KeyValueWriter_WebForm.h index 4dce331cb..e5134ef58 100644 --- a/src/src/WebServer/KeyValueWriter_WebForm.h +++ b/src/src/WebServer/KeyValueWriter_WebForm.h @@ -8,16 +8,28 @@ public: using KeyValueWriter::writeLabels; - KeyValueWriter_WebForm() {} + KeyValueWriter_WebForm(bool emptyHeader = false); + + KeyValueWriter_WebForm(KeyValueWriter_WebForm*parent); + + KeyValueWriter_WebForm(bool emptyHeader, + KeyValueWriter_WebForm*parent); KeyValueWriter_WebForm(const String& header); KeyValueWriter_WebForm(const __FlashStringHelper *header); + KeyValueWriter_WebForm(const String & header, + KeyValueWriter_WebForm*parent); + KeyValueWriter_WebForm(const __FlashStringHelper *header, + KeyValueWriter_WebForm *parent); - virtual ~KeyValueWriter_WebForm() {} + virtual ~KeyValueWriter_WebForm(); + + virtual void setHeader(const String& header); + + virtual void write(); virtual void write(const KeyValueStruct& kv); - }; // class KeyValueWriter_WebForm From 66125885b02084d0a91f89fe072c847249b489e7 Mon Sep 17 00:00:00 2001 From: TD-er Date: Thu, 2 Oct 2025 21:46:51 +0200 Subject: [PATCH 315/564] [JSON] Fine-tune + speedup generating JSON --- src/src/Helpers/KeyValueWriter.cpp | 26 +++++++++++----- src/src/Helpers/KeyValueWriter.h | 21 ++++++++----- src/src/WebServer/KeyValueWriter_JSON.cpp | 36 ++++++++++++++++------- src/src/WebServer/KeyValueWriter_JSON.h | 14 +++++---- 4 files changed, 67 insertions(+), 30 deletions(-) diff --git a/src/src/Helpers/KeyValueWriter.cpp b/src/src/Helpers/KeyValueWriter.cpp index 4d576ffd0..6389b4914 100644 --- a/src/src/Helpers/KeyValueWriter.cpp +++ b/src/src/Helpers/KeyValueWriter.cpp @@ -14,39 +14,41 @@ ValueStruct::ValueStruct(int64_t val) : str(ll2String(val)), isInt(true) {} ValueStruct::ValueStruct(const __FlashStringHelper *val) : str(val) {} +ValueStruct::ValueStruct(String&& val) : str(std::move(val)) {} + KeyValueStruct::KeyValueStruct(const __FlashStringHelper *key) : _key(key) {} KeyValueStruct::KeyValueStruct(const String& key) : _key(key) {} KeyValueStruct::KeyValueStruct(const __FlashStringHelper *key, - ValueStruct value) + ValueStruct && value) : _key(key) { _values.emplace_back(std::move(value)); } KeyValueStruct::KeyValueStruct(const String& key, - ValueStruct value) + ValueStruct&& value) : _key(key) { _values.emplace_back(std::move(value)); } KeyValueStruct::KeyValueStruct(const __FlashStringHelper *key, - ValueStruct value, + ValueStruct && value, const __FlashStringHelper *unit) : _key(key), _unit(unit) { _values.emplace_back(std::move(value)); } KeyValueStruct::KeyValueStruct(const __FlashStringHelper *key, - ValueStruct value, + ValueStruct && value, const String & unit) : _key(key), _unit(unit) { _values.emplace_back(std::move(value)); } KeyValueStruct::KeyValueStruct(const String& key, - ValueStruct value, + ValueStruct&& value, const String& unit) : _key(key), _unit(unit) { _values.emplace_back(std::move(value)); @@ -57,11 +59,19 @@ KeyValueStruct::KeyValueStruct(LabelType::Enum label) _values.emplace_back(getValue(label)); } -void KeyValueStruct::appendValue(const ValueStruct& value) { _values.emplace_back(std::move(value)); } +void KeyValueStruct::appendValue(const ValueStruct& value) +{ + _values.emplace_back(std::move(value)); + _isArray = true; +} -void KeyValueStruct::appendValue(ValueStruct&& value) { _values.emplace_back(std::move(value)); } +void KeyValueStruct::appendValue(ValueStruct&& value) +{ + _values.emplace_back(std::move(value)); + _isArray = true; +} -void KeyValueWriter::clear() {} +void KeyValueWriter::clear() {} void KeyValueWriter::writeLabels(const LabelType::Enum labels[]) { diff --git a/src/src/Helpers/KeyValueWriter.h b/src/src/Helpers/KeyValueWriter.h index 28dc33f63..2b3af9584 100644 --- a/src/src/Helpers/KeyValueWriter.h +++ b/src/src/Helpers/KeyValueWriter.h @@ -17,6 +17,7 @@ struct ValueStruct explicit ValueStruct(uint64_t val); explicit ValueStruct(int64_t val); ValueStruct(const __FlashStringHelper *val); + ValueStruct(String&& val); template ValueStruct(const T& val) : str(val) {} @@ -37,22 +38,22 @@ struct KeyValueStruct KeyValueStruct(const __FlashStringHelper *key, - ValueStruct value); + ValueStruct && value); KeyValueStruct(const String& key, - ValueStruct value); + ValueStruct&& value); KeyValueStruct(const __FlashStringHelper *key, - ValueStruct value, + ValueStruct && value, const __FlashStringHelper *unit); KeyValueStruct(const __FlashStringHelper *key, - ValueStruct value, + ValueStruct && value, const String & unit); KeyValueStruct(const String& key, - ValueStruct value, + ValueStruct&& value, const String& unit); KeyValueStruct(LabelType::Enum label); @@ -70,7 +71,7 @@ struct KeyValueStruct // output as pre-formatted monospaced bool _value_pre{}; - + bool _isArray{}; }; @@ -106,10 +107,14 @@ public: void writeLabels(const LabelType::Enum labels[]); -// virtual void setParent(KeyValueWriter*parent) { _parent = parent; } + // virtual void setParent(KeyValueWriter*parent) { _parent = parent; } virtual int getLevel() const; + virtual void setIsArray() { _isArray = true; } + + virtual void indent() const {} + protected: String _header; @@ -120,5 +125,7 @@ protected: bool _isEmpty = true; + bool _isArray{}; + }; // class KeyValueWriter diff --git a/src/src/WebServer/KeyValueWriter_JSON.cpp b/src/src/WebServer/KeyValueWriter_JSON.cpp index b096a820d..03bf9a24c 100644 --- a/src/src/WebServer/KeyValueWriter_JSON.cpp +++ b/src/src/WebServer/KeyValueWriter_JSON.cpp @@ -39,7 +39,10 @@ KeyValueWriter_JSON::~KeyValueWriter_JSON() addHtml('\n'); if (_hasHeader) { +#ifdef USE_KVW_JSON_INDENT indent(); +#endif + addHtml(_isArray ? ']' : '}'); } } @@ -59,7 +62,9 @@ void KeyValueWriter_JSON::write() if (_parent != nullptr) { _parent->write(); } if (_hasHeader) { +#ifdef USE_KVW_JSON_INDENT indent(); +#endif if (_header.isEmpty()) { addHtml('{', '\n'); @@ -79,14 +84,19 @@ void KeyValueWriter_JSON::write() void KeyValueWriter_JSON::write(const KeyValueStruct& kv) { write(); +#ifdef USE_KVW_JSON_INDENT indent(); - addHtml('"'); - addHtml(kv._key); - addHtml('"', ':'); +#endif + + if (kv._key.length()) { + addHtml('"'); + addHtml(kv._key); + addHtml('"', ':'); + } const size_t nrValues = kv._values.size(); - if (nrValues < 2) { + if (!kv._isArray) { // Either 1 value or empty value if (nrValues == 0) { addHtml('"', '"'); @@ -102,11 +112,14 @@ void KeyValueWriter_JSON::write(const KeyValueStruct& kv) if (i != 0) { addHtml(',', '\n'); } +#ifdef USE_KVW_JSON_INDENT indent(); + addHtml('\t'); +#endif + writeValue(kv._values[i]); } - indent(); - addHtml(']', '\n'); + addHtml(']'); } } @@ -115,17 +128,20 @@ void KeyValueWriter_JSON::writeValue(const ValueStruct& val) if (val.isInt) { addHtml(val.str); } else if (val.isBoolean) { - addHtml(val.str.equals("0") ? F("false") : F("true")); + addHtml(val.str.equals("1") ? F("true") : F("false")); } else { addHtml(to_json_value(val.str)); } } +#ifdef USE_KVW_JSON_INDENT + void KeyValueWriter_JSON::indent() const { - const int level = getLevel(); - - for (int i = 0; i < level; ++i) { + if (_parent != nullptr) { addHtml('\t'); + _parent->indent(); } } + +#endif // ifdef USE_KVW_JSON_INDENT diff --git a/src/src/WebServer/KeyValueWriter_JSON.h b/src/src/WebServer/KeyValueWriter_JSON.h index 436e73ab9..4f28bced9 100644 --- a/src/src/WebServer/KeyValueWriter_JSON.h +++ b/src/src/WebServer/KeyValueWriter_JSON.h @@ -2,6 +2,8 @@ #include "../Helpers/KeyValueWriter.h" + #define USE_KVW_JSON_INDENT + class KeyValueWriter_JSON : public KeyValueWriter { public: @@ -27,8 +29,6 @@ public: virtual void setHeader(const String& header); - void setIsArray() { _isArray = true; } - virtual void clear() override; virtual void write(); @@ -37,10 +37,14 @@ public: private: - void writeValue(const ValueStruct& val); + void writeValue(const ValueStruct& value); - void indent() const; +#ifdef USE_KVW_JSON_INDENT + +public: + + virtual void indent() const override; +#endif // ifdef USE_KVW_JSON_INDENT - bool _isArray{}; }; // class KeyValueWriter_JSON From f296e8655f6d538d78a6f2e7db0da67359b40d67 Mon Sep 17 00:00:00 2001 From: TD-er Date: Thu, 2 Oct 2025 21:47:23 +0200 Subject: [PATCH 316/564] [Log] Use new streaming JSON writer to generate web log --- src/src/WebServer/Log.cpp | 128 ++++++++++++++++++++------------------ 1 file changed, 66 insertions(+), 62 deletions(-) diff --git a/src/src/WebServer/Log.cpp b/src/src/WebServer/Log.cpp index ab43fe2a2..280e07d8a 100644 --- a/src/src/WebServer/Log.cpp +++ b/src/src/WebServer/Log.cpp @@ -28,7 +28,8 @@ void handle_log() { #ifdef WEBSERVER_LOG addHtml(F("Log")); addCopyButton(F("copyText"), EMPTY_STRING, F("Copy log to clipboard")); - addHtml(F("
    Logging:
    ")); + addHtml(F( + "
    Logging:
    ")); addHtml(F("Autoscroll: ")); addCheckBox(F("autoscroll"), true); addHtml(F("
    ")); @@ -49,72 +50,75 @@ void handle_log_JSON() { if (!isLoggedIn()) { return; } #ifdef WEBSERVER_LOG TXBuffer.startJsonStream(); - String webrequest = webArg(F("view")); - addHtml(F("{\"Log\": {")); + { + KeyValueWriter_JSON top(true); + { + String webrequest = webArg(F("view")); + KeyValueWriter_JSON mainWriter(F("Log"), &top); - if (equals(webrequest, F("legend"))) { - addHtml(F("\"Legend\": [")); + if (equals(webrequest, F("legend"))) { + KeyValueWriter_JSON legendWriter(F("Legend"), &mainWriter); + legendWriter.setIsArray(); - for (uint8_t i = 0; i < LOG_LEVEL_NRELEMENTS; ++i) { - if (i != 0) { - addHtml(','); + for (uint8_t i = 0; i < LOG_LEVEL_NRELEMENTS; ++i) { + KeyValueWriter_JSON loglevelWriter(&legendWriter); + int loglevel; + loglevelWriter.write({ F("label"), getLogLevelDisplayStringFromIndex(i, loglevel) }); + loglevelWriter.write({ F("loglevel"), loglevel }); + } } - addHtml('{'); - int loglevel; - stream_next_json_object_value(F("label"), getLogLevelDisplayStringFromIndex(i, loglevel)); - stream_last_json_object_value(F("loglevel"), loglevel); + unsigned long firstTimeStamp = 0; + unsigned long lastTimeStamp = 0; + int nrEntries = 0; + + { + KeyValueWriter_JSON entriesWriter(F("Entries"), &mainWriter); + entriesWriter.setIsArray(); + bool logLinesAvailable = true; + + while (logLinesAvailable) { + String message; + uint8_t loglevel; + + if (Logging.getNext(logLinesAvailable, lastTimeStamp, message, loglevel)) { + KeyValueWriter_JSON logWriter(&entriesWriter); + logWriter.write({ F("timestamp"), lastTimeStamp }); + logWriter.write({ F("text"), std::move(message) }); + logWriter.write({ F("level"), loglevel }); + + if (nrEntries == 0) { + firstTimeStamp = lastTimeStamp; + } + ++nrEntries; + } + + // Do we need to do something here and maybe limit number of lines at once? + } + } + long logTimeSpan = timeDiff(firstTimeStamp, lastTimeStamp); + long refreshSuggestion = 1000; + long newOptimum = 1000; + + if ((nrEntries > 2) && (logTimeSpan > 1)) { + // May need to lower the TTL for refresh when time needed + // to fill half the log is lower than current TTL + newOptimum = logTimeSpan * (LOG_STRUCT_MESSAGE_LINES / 2); + newOptimum = newOptimum / (nrEntries - 1); + } + + if (newOptimum < refreshSuggestion) { refreshSuggestion = newOptimum; } + + if (refreshSuggestion < 100) { + // Reload times no lower than 100 msec. + refreshSuggestion = 100; + } + mainWriter.write({ F("TTL"), refreshSuggestion }); + mainWriter.write({ F("timeHalfBuffer"), newOptimum }); + mainWriter.write({ F("nrEntries"), nrEntries }); + mainWriter.write({ F("SettingsWebLogLevel"), Settings.WebLogLevel }); + mainWriter.write({ F("logTimeSpan"), logTimeSpan }); } - addHtml(F("],\n")); } - addHtml(F("\"Entries\": [")); - bool logLinesAvailable = true; - int nrEntries = 0; - unsigned long firstTimeStamp = 0; - unsigned long lastTimeStamp = 0; - - while (logLinesAvailable) { - String message; - uint8_t loglevel; - if (Logging.getNext(logLinesAvailable, lastTimeStamp, message, loglevel)) { - addHtml('{'); - stream_next_json_object_value(F("timestamp"), lastTimeStamp); - stream_next_json_object_value(F("text"), std::move(message)); - stream_last_json_object_value(F("level"), loglevel); - if (logLinesAvailable) { - addHtml(',', '\n'); - } - if (nrEntries == 0) { - firstTimeStamp = lastTimeStamp; - } - ++nrEntries; - } - - // Do we need to do something here and maybe limit number of lines at once? - } - addHtml(F("],\n")); - long logTimeSpan = timeDiff(firstTimeStamp, lastTimeStamp); - long refreshSuggestion = 1000; - long newOptimum = 1000; - - if ((nrEntries > 2) && (logTimeSpan > 1)) { - // May need to lower the TTL for refresh when time needed - // to fill half the log is lower than current TTL - newOptimum = logTimeSpan * (LOG_STRUCT_MESSAGE_LINES / 2); - newOptimum = newOptimum / (nrEntries - 1); - } - - if (newOptimum < refreshSuggestion) { refreshSuggestion = newOptimum; } - - if (refreshSuggestion < 100) { - // Reload times no lower than 100 msec. - refreshSuggestion = 100; - } - stream_next_json_object_value(F("TTL"), refreshSuggestion); - stream_next_json_object_value(F("timeHalfBuffer"), newOptimum); - stream_next_json_object_value(F("nrEntries"), nrEntries); - stream_next_json_object_value(F("SettingsWebLogLevel"), Settings.WebLogLevel); - stream_last_json_object_value(F("logTimeSpan"), logTimeSpan); - addHtml(F("}\n")); TXBuffer.endStream(); updateLogLevelCache(); From be3d1793e33202fa1076318f272d5bfc97108f93 Mon Sep 17 00:00:00 2001 From: TD-er Date: Thu, 2 Oct 2025 21:48:53 +0200 Subject: [PATCH 317/564] [Cache Controller] Use new JSON functions to generate cache_json --- src/src/WebServer/CacheControllerPages.cpp | 104 ++++++++++----------- 1 file changed, 50 insertions(+), 54 deletions(-) diff --git a/src/src/WebServer/CacheControllerPages.cpp b/src/src/WebServer/CacheControllerPages.cpp index 926ea6d6d..fc91b1c74 100644 --- a/src/src/WebServer/CacheControllerPages.cpp +++ b/src/src/WebServer/CacheControllerPages.cpp @@ -19,7 +19,6 @@ # include "../Helpers/ESPEasy_time_calc.h" # include "../Helpers/Misc.h" - // ******************************************************************************** // URLs needed for C016_CacheController // to help dump the content of the binary log files @@ -73,9 +72,9 @@ void handle_dumpcache() { ESPEasyControllerCache_CSV_dumper dumper( - joinTimestamp, - onlySetTasks, - separator, + joinTimestamp, + onlySetTasks, + separator, ESPEasyControllerCache_CSV_dumper::Target::CSV_file); dumper.generateCSVHeader(true); @@ -94,65 +93,62 @@ void handle_cache_json() { C016_flush(); TXBuffer.startJsonStream(); - addHtml(F("{\"columns\": [")); + { + KeyValueWriter_JSON writer(true); + { + KeyValueWriter_JSON columnWriter(F("columns"), &writer); + columnWriter.setIsArray(); - // addHtml(F("UNIX timestamp;contr. idx;sensortype;taskindex;value count")); - addHtml(to_json_value(F("UNIX timestamp"))); - addHtml(','); - addHtml(to_json_value(F("UTC timestamp"))); - addHtml(','); - addHtml(to_json_value(F("task index"))); + // addHtml(F("UNIX timestamp;contr. idx;sensortype;taskindex;value count")); + columnWriter.write({ F(""), F("UNIX timestamp") }); + columnWriter.write({ F(""), F("UTC timestamp") }); + columnWriter.write({ F(""), F("task index") }); - if (hasArg(F("pluginID"))) { - addHtml(','); - addHtml(to_json_value(F("plugin ID"))); - } - - for (taskIndex_t i = 0; i < TASKS_MAX; ++i) { - for (int j = 0; j < VARS_PER_TASK; ++j) { - String label = getTaskDeviceName(i); - label += '#'; - label += getTaskValueName(i, j); - addHtml(','); - addHtml(to_json_value(label)); - } - } - addHtml(F("],\n")); - addHtml(F("\"files\": [")); - bool islast = false; - int filenr = 0; - int fileCount = 0; - - while (!islast) { - const String currentFile = C016_getCacheFileName(filenr, islast); - ++filenr; - - if (currentFile.length() > 0) { - if (fileCount != 0) { - addHtml(','); + if (hasArg(F("pluginID"))) { + columnWriter.write({ F(""), F("plugin ID") }); } - addHtml(to_json_value(currentFile)); - ++fileCount; - } - } - addHtml(F("],\n")); - addHtml(F("\"pluginID\": [")); - for (taskIndex_t taskIndex = 0; validTaskIndex(taskIndex); ++taskIndex) { - if (taskIndex != 0) { - addHtml(','); + for (taskIndex_t i = 0; i < TASKS_MAX; ++i) { + for (int j = 0; j < VARS_PER_TASK; ++j) { + columnWriter.write({ F(""), strformat( + F("%s#%s"), + getTaskDeviceName(i).c_str(), + getTaskValueName(i, j).c_str()) }); + } + } } - addHtmlInt(getPluginID_from_TaskIndex(taskIndex).value); + int fileCount = 0; + { + KeyValueWriter_JSON filesWriter(F("files"), &writer); + filesWriter.setIsArray(); + bool islast = false; + int filenr = 0; + + while (!islast) { + const String currentFile = C016_getCacheFileName(filenr, islast); + ++filenr; + + if (currentFile.length() > 0) { + ++fileCount; + filesWriter.write({ F(""), currentFile }); + } + } + } + { + KeyValueWriter_JSON pluginIDWriter(F("pluginID"), &writer); + pluginIDWriter.setIsArray(); + + for (taskIndex_t taskIndex = 0; validTaskIndex(taskIndex); ++taskIndex) { + pluginIDWriter.write({ F(""), getPluginID_from_TaskIndex(taskIndex).value }); + } + } + writer.write({ F("separator"), F(";") }); + writer.write({ F("nrfiles"), fileCount }); } - addHtml(F("],\n")); - stream_next_json_object_value(F("separator"), F(";")); - stream_last_json_object_value(F("nrfiles"), fileCount); - addHtml('\n'); TXBuffer.endStream(); } -void handle_cache_csv() { - if (!isLoggedIn()) { return; } +void handle_cache_csv() { if (!isLoggedIn()) { return; } } #endif // ifdef USES_C016 From 17c3326c31e8ff590b22be4bc109c49d13a02fbe Mon Sep 17 00:00:00 2001 From: TD-er Date: Fri, 3 Oct 2025 13:45:55 +0200 Subject: [PATCH 318/564] [JSON] Fine tune new JSON generation functions --- src/src/Helpers/KeyValueWriter.cpp | 113 ++++++++++++++++----- src/src/Helpers/KeyValueWriter.h | 101 +++++++++++++----- src/src/WebServer/CacheControllerPages.cpp | 16 +-- src/src/WebServer/JSON.cpp | 86 ++++++++-------- src/src/WebServer/KeyValueWriter_JSON.cpp | 29 ++++-- 5 files changed, 234 insertions(+), 111 deletions(-) diff --git a/src/src/Helpers/KeyValueWriter.cpp b/src/src/Helpers/KeyValueWriter.cpp index 6389b4914..e7db5942d 100644 --- a/src/src/Helpers/KeyValueWriter.cpp +++ b/src/src/Helpers/KeyValueWriter.cpp @@ -2,56 +2,111 @@ #include "../Helpers/StringConverter_Numerical.h" -ValueStruct::ValueStruct(bool val) : str(val), isBoolean(true) {} -ValueStruct::ValueStruct(int val) : str(val), isInt(true) {} +ValueStruct::ValueStruct(const uint64_t& val, ValueType vType) : str(ull2String(val)), valueType(vType) {} -ValueStruct::ValueStruct(uint32_t val) : str(val), isInt(true) {} +ValueStruct::ValueStruct(const int64_t& val, ValueType vType) : str(ll2String(val)), valueType(vType) {} -ValueStruct::ValueStruct(uint64_t val) : str(ull2String(val)), isInt(true) {} +ValueStruct::ValueStruct(const String& val, ValueType vType) : str(val), valueType(vType) {} -ValueStruct::ValueStruct(int64_t val) : str(ll2String(val)), isInt(true) {} +ValueStruct::ValueStruct(const __FlashStringHelper *val, ValueType vType) : str(val), valueType(vType) {} -ValueStruct::ValueStruct(const __FlashStringHelper *val) : str(val) {} - -ValueStruct::ValueStruct(String&& val) : str(std::move(val)) {} +ValueStruct::ValueStruct(String&& val, ValueType vType) : str(std::move(val)), valueType(vType) {} KeyValueStruct::KeyValueStruct(const __FlashStringHelper *key) : _key(key) {} KeyValueStruct::KeyValueStruct(const String& key) : _key(key) {} -KeyValueStruct::KeyValueStruct(const __FlashStringHelper *key, +/* + KeyValueStruct::KeyValueStruct(const __FlashStringHelper *key, ValueStruct && value) - : _key(key) { - _values.emplace_back(std::move(value)); -} + : _key(key) { + _values.emplace_back(std::move(value)); + } -KeyValueStruct::KeyValueStruct(const String& key, + KeyValueStruct::KeyValueStruct(const String& key, ValueStruct&& value) + : _key(key) { + _values.emplace_back(std::move(value)); + } + */ + +KeyValueStruct::KeyValueStruct(const String & key, + bool val, + ValueStruct::ValueType vType) : _key(key) { - _values.emplace_back(std::move(value)); + _values.emplace_back(String(val), vType); +} + +KeyValueStruct::KeyValueStruct(const String & key, + int val, + ValueStruct::ValueType vType) + : _key(key) { + _values.emplace_back(String(val), vType); +} + +KeyValueStruct::KeyValueStruct(const String & key, + const float & val, + int nrDecimals, + ValueStruct::ValueType vType) + : _key(key) { + String str; + + if (!toValidString(str, val, nrDecimals, true)) { + vType = ValueStruct::ValueType::String; + } + + _values.emplace_back(str, vType); +} + +KeyValueStruct::KeyValueStruct(const String & key, + const double & val, + int nrDecimals, + ValueStruct::ValueType vType) + : _key(key) { + String str; + + if (!doubleToValidString(str, val, nrDecimals, true)) { + vType = ValueStruct::ValueType::String; + } + + _values.emplace_back(str, vType); } KeyValueStruct::KeyValueStruct(const __FlashStringHelper *key, - ValueStruct && value, - const __FlashStringHelper *unit) - : _key(key), _unit(unit) { - _values.emplace_back(std::move(value)); + const String & val, + ValueStruct::ValueType vType) + : _key(key) { + _values.emplace_back(val, vType); } KeyValueStruct::KeyValueStruct(const __FlashStringHelper *key, - ValueStruct && value, - const String & unit) - : _key(key), _unit(unit) { - _values.emplace_back(std::move(value)); + const __FlashStringHelper *val, + ValueStruct::ValueType vType) + : _key(key) { + _values.emplace_back(val, vType); } -KeyValueStruct::KeyValueStruct(const String& key, - ValueStruct&& value, - const String& unit) - : _key(key), _unit(unit) { - _values.emplace_back(std::move(value)); +KeyValueStruct::KeyValueStruct(const String & key, + const String & val, + ValueStruct::ValueType vType) + : _key(key) { + _values.emplace_back(val, vType); +} + +KeyValueStruct::KeyValueStruct(const __FlashStringHelper *key, + String && val, + ValueStruct::ValueType vType) + : _key(key) { + _values.emplace_back(std::move(val), vType); +} + +KeyValueStruct::KeyValueStruct(const String & key, + String && val, + ValueStruct::ValueType vType) + : _key(key) { + _values.emplace_back(std::move(val), vType); } KeyValueStruct::KeyValueStruct(LabelType::Enum label) @@ -59,6 +114,10 @@ KeyValueStruct::KeyValueStruct(LabelType::Enum label) _values.emplace_back(getValue(label)); } +void KeyValueStruct::setUnit(const String& unit) { _unit = unit; } + +void KeyValueStruct::setUnit(const __FlashStringHelper *unit) { _unit = unit; } + void KeyValueStruct::appendValue(const ValueStruct& value) { _values.emplace_back(std::move(value)); diff --git a/src/src/Helpers/KeyValueWriter.h b/src/src/Helpers/KeyValueWriter.h index 2b3af9584..2400f54ef 100644 --- a/src/src/Helpers/KeyValueWriter.h +++ b/src/src/Helpers/KeyValueWriter.h @@ -8,23 +8,33 @@ struct ValueStruct { + enum class ValueType { + Auto, + String, + Float, + Double, + Int, + Bool + + }; + + ValueStruct() {} - explicit ValueStruct(bool val); + explicit ValueStruct(const uint64_t& val, + ValueType vType = ValueType::Int); + explicit ValueStruct(const int64_t& val, + ValueType vType = ValueType::Int); + ValueStruct(const String& val, + ValueType vType = ValueType::Auto); + ValueStruct(const __FlashStringHelper *val, + ValueType vType = ValueType::Auto); + ValueStruct(String && val, + ValueType vType = ValueType::Auto); - ValueStruct(int val); - ValueStruct(uint32_t val); - explicit ValueStruct(uint64_t val); - explicit ValueStruct(int64_t val); - ValueStruct(const __FlashStringHelper *val); - ValueStruct(String&& val); - - template - ValueStruct(const T& val) : str(val) {} String str; - bool isBoolean{}; - bool isInt{}; + ValueType valueType = ValueType::Auto; }; @@ -33,31 +43,70 @@ struct KeyValueStruct KeyValueStruct() {} - KeyValueStruct(const __FlashStringHelper *key); - KeyValueStruct(const String& key); + KeyValueStruct(const __FlashStringHelper *key); + KeyValueStruct(const String& key); + + /* + KeyValueStruct(const __FlashStringHelper *key, + ValueStruct && value); + + KeyValueStruct(const String& key, + ValueStruct&& value); + */ + + template + KeyValueStruct(const String & key, + const T & val, + ValueStruct::ValueType vType = ValueStruct::ValueType::Auto) + : _key(key) { + _values.emplace_back(String(val), vType); + } + + KeyValueStruct(const String & key, + bool val, + ValueStruct::ValueType vType = ValueStruct::ValueType::Bool); + + KeyValueStruct(const String & key, + int val, + ValueStruct::ValueType vType = ValueStruct::ValueType::Int); + + KeyValueStruct(const String & key, + const float& val, + int nrDecimals = 4, + ValueStruct::ValueType vType = ValueStruct::ValueType::Float); + + KeyValueStruct(const String & key, + const double& val, + int nrDecimals = 4, + ValueStruct::ValueType vType = ValueStruct::ValueType::Double); KeyValueStruct(const __FlashStringHelper *key, - ValueStruct && value); - - KeyValueStruct(const String& key, - ValueStruct&& value); - + const String & val, + ValueStruct::ValueType vType = ValueStruct::ValueType::Auto); KeyValueStruct(const __FlashStringHelper *key, - ValueStruct && value, - const __FlashStringHelper *unit); + const __FlashStringHelper *val, + ValueStruct::ValueType vType = ValueStruct::ValueType::Auto); + + KeyValueStruct(const String & key, + const String & val, + ValueStruct::ValueType vType = ValueStruct::ValueType::Auto); KeyValueStruct(const __FlashStringHelper *key, - ValueStruct && value, - const String & unit); + String && val, + ValueStruct::ValueType vType = ValueStruct::ValueType::Auto); - KeyValueStruct(const String& key, - ValueStruct&& value, - const String& unit); + + KeyValueStruct(const String & key, + String && val, + ValueStruct::ValueType vType = ValueStruct::ValueType::Auto); KeyValueStruct(LabelType::Enum label); + void setUnit(const String& unit); + void setUnit(const __FlashStringHelper *unit); + void appendValue(const ValueStruct& value); void appendValue(ValueStruct&& value); diff --git a/src/src/WebServer/CacheControllerPages.cpp b/src/src/WebServer/CacheControllerPages.cpp index fc91b1c74..721349ac5 100644 --- a/src/src/WebServer/CacheControllerPages.cpp +++ b/src/src/WebServer/CacheControllerPages.cpp @@ -100,20 +100,20 @@ void handle_cache_json() { columnWriter.setIsArray(); // addHtml(F("UNIX timestamp;contr. idx;sensortype;taskindex;value count")); - columnWriter.write({ F(""), F("UNIX timestamp") }); - columnWriter.write({ F(""), F("UTC timestamp") }); - columnWriter.write({ F(""), F("task index") }); + columnWriter.write({ EMPTY_STRING, F("UNIX timestamp") }); + columnWriter.write({ EMPTY_STRING, F("UTC timestamp") }); + columnWriter.write({ EMPTY_STRING, F("task index") }); if (hasArg(F("pluginID"))) { - columnWriter.write({ F(""), F("plugin ID") }); + columnWriter.write({ EMPTY_STRING, F("plugin ID") }); } for (taskIndex_t i = 0; i < TASKS_MAX; ++i) { for (int j = 0; j < VARS_PER_TASK; ++j) { - columnWriter.write({ F(""), strformat( + columnWriter.write({ EMPTY_STRING, strformat( F("%s#%s"), getTaskDeviceName(i).c_str(), - getTaskValueName(i, j).c_str()) }); + getTaskValueName(i, j).c_str())}); } } } @@ -130,7 +130,7 @@ void handle_cache_json() { if (currentFile.length() > 0) { ++fileCount; - filesWriter.write({ F(""), currentFile }); + filesWriter.write({ EMPTY_STRING, currentFile }); } } } @@ -139,7 +139,7 @@ void handle_cache_json() { pluginIDWriter.setIsArray(); for (taskIndex_t taskIndex = 0; validTaskIndex(taskIndex); ++taskIndex) { - pluginIDWriter.write({ F(""), getPluginID_from_TaskIndex(taskIndex).value }); + pluginIDWriter.write({ EMPTY_STRING, getPluginID_from_TaskIndex(taskIndex).value }); } } writer.write({ F("separator"), F(";") }); diff --git a/src/src/WebServer/JSON.cpp b/src/src/WebServer/JSON.cpp index abe413352..2f1657359 100644 --- a/src/src/WebServer/JSON.cpp +++ b/src/src/WebServer/JSON.cpp @@ -343,7 +343,7 @@ void handle_json() // TODO: PKR: Add ETH Objects } - #if FEATURE_ETHERNET +#if FEATURE_ETHERNET if (showEthernet) { @@ -364,9 +364,9 @@ void handle_json() writer.writeLabels(labels); } - #endif // if FEATURE_ETHERNET +#endif // if FEATURE_ETHERNET - #if FEATURE_ESPEASY_P2P +#if FEATURE_ESPEASY_P2P if (showNodes) { KeyValueWriter_JSON nodesWriter(F("nodes"), &mainLevelWriter); @@ -417,7 +417,7 @@ void handle_json() } // if node info exists } // for loop } - #endif // if FEATURE_ESPEASY_P2P +#endif // if FEATURE_ESPEASY_P2P } taskIndex_t firstTaskIndex = 0; @@ -439,10 +439,11 @@ void handle_json() // Keep track of the lowest reported TTL and use that as refresh interval. unsigned long lowest_ttl_json = 60; { - KeyValueWriter_JSON sensorsWriter(false, &mainLevelWriter); + KeyValueWriter_JSON sensorsWriter = showSpecificTask + ? KeyValueWriter_JSON() + : KeyValueWriter_JSON(F("Sensors"), &mainLevelWriter); if (!showSpecificTask) { - sensorsWriter.setHeader(F("Sensors")); sensorsWriter.setIsArray(); } @@ -485,38 +486,38 @@ void handle_json() { uint8_t nrDecimals = Cache.getTaskDeviceValueDecimals(TaskIndex, x); String value = formatUserVarNoCheck(&TempEvent, x); - #if FEATURE_STRING_VARIABLES +#if FEATURE_STRING_VARIABLES bool hasPresentation; const String presentation = formatUserVarForPresentation(&TempEvent, x, hasPresentation, value, DeviceIndex); - #endif // if FEATURE_STRING_VARIABLES +#endif // if FEATURE_STRING_VARIABLES if (mustConsiderAsJSONString(value)) { // Flag as not to treat as a float nrDecimals = 255; } - #if FEATURE_TASKVALUE_UNIT_OF_MEASURE +#if FEATURE_TASKVALUE_UNIT_OF_MEASURE String uom; const uint8_t uomIndex = Cache.getTaskVarUnitOfMeasure(TaskIndex, x); if (uomIndex != 0) { uom = toUnitOfMeasureName(uomIndex); } - #else // if FEATURE_TASKVALUE_UNIT_OF_MEASURE +#else // if FEATURE_TASKVALUE_UNIT_OF_MEASURE const String uom; - #endif // if FEATURE_TASKVALUE_UNIT_OF_MEASURE +#endif // if FEATURE_TASKVALUE_UNIT_OF_MEASURE handle_json_stream_task_value_data(&taskValueWriter, x + 1, Cache.getTaskDeviceValueName(TaskIndex, x), nrDecimals, value, - #if FEATURE_STRING_VARIABLES + #if FEATURE_STRING_VARIABLES presentation, - #else // if FEATURE_STRING_VARIABLES + #else // if FEATURE_STRING_VARIABLES EMPTY_STRING, - #endif // if FEATURE_STRING_VARIABLES + #endif // if FEATURE_STRING_VARIABLES uom); } - #if FEATURE_STRING_VARIABLES +#if FEATURE_STRING_VARIABLES if (Settings.ShowDerivedTaskValues(TaskIndex)) { int varNr = VARS_PER_TASK; @@ -544,12 +545,13 @@ void handle_json() value = parseTemplate(value); uint8_t nrDecimals = 255; // FIXME Use the minimal number of decimals needed bool hasPresentation; - const String presentation = formatUserVarForPresentation(&TempEvent, - INVALID_TASKVAR_INDEX, - hasPresentation, - value, - DeviceIndex, - valueName); + const String presentation = + formatUserVarForPresentation(&TempEvent, + INVALID_TASKVAR_INDEX, + hasPresentation, + value, + DeviceIndex, + valueName); handle_json_stream_task_value_data(&taskValueWriter, varNr + 1, @@ -567,7 +569,7 @@ void handle_json() ++it; } } - #endif // if FEATURE_STRING_VARIABLES +#endif // if FEATURE_STRING_VARIABLES } #if FEATURE_PLUGIN_STATS && FEATURE_CHART_JS @@ -584,13 +586,6 @@ void handle_json() #endif // if FEATURE_PLUGIN_STATS && FEATURE_CHART_JS - if (showSpecificTask) { - stream_next_json_object_value(F("TTL"), ttl_json * 1000); - #if FEATURE_TASKVALUE_UNIT_OF_MEASURE - stream_next_json_object_value(F("ShowUoM"), jsonBool(Settings.ShowUnitOfMeasureOnDevicesPage())); - #endif // if FEATURE_TASKVALUE_UNIT_OF_MEASURE - } - if (showDataAcquisition) { KeyValueWriter_JSON dataAquisitionWriter(F("DataAcquisition"), &taskWriter); dataAquisitionWriter.setIsArray(); @@ -600,7 +595,7 @@ void handle_json() KeyValueWriter_JSON controllerWriter(&dataAquisitionWriter); controllerWriter.write({ F("Controller"), x + 1 }); controllerWriter.write({ F("IDX"), Settings.TaskDeviceID[x][TaskIndex] }); - controllerWriter.write({ F("Enabled"), jsonBool(Settings.TaskDeviceSendData[x][TaskIndex]) }); + controllerWriter.write({ F("Enabled"), Settings.TaskDeviceSendData[x][TaskIndex] }); } } @@ -616,16 +611,16 @@ void handle_json() } } - #if FEATURE_I2CMULTIPLEXER +#if FEATURE_I2CMULTIPLEXER uint8_t i2cBus = 0; - # if FEATURE_I2C_MULTIPLE +# if FEATURE_I2C_MULTIPLE i2cBus = Settings.getI2CInterface(TaskIndex); - # endif +# endif if ((Device[DeviceIndex].Type == DEVICE_TYPE_I2C) && isI2CMultiplexerEnabled(i2cBus)) { - # if FEATURE_I2C_MULTIPLE +# if FEATURE_I2C_MULTIPLE taskWriter.write({ F("I2C_Interface"), static_cast(i2cBus + 1) }); - # endif +# endif int8_t channel = Settings.I2C_Multiplexer_Channel[TaskIndex]; if (bitRead(Settings.I2C_Flags[TaskIndex], I2C_FLAGS_MUX_MULTICHANNEL)) { @@ -648,22 +643,27 @@ void handle_json() } } } - #endif // if FEATURE_I2CMULTIPLEXER +#endif // if FEATURE_I2CMULTIPLEXER } + taskWriter.write({ F("TaskEnabled"), - jsonBool(Settings.TaskDeviceEnabled[TaskIndex]) }); + Settings.TaskDeviceEnabled[TaskIndex] }); taskWriter.write({ F("TaskNumber"), TaskIndex + 1 }); + + if (showSpecificTask) { +#if FEATURE_TASKVALUE_UNIT_OF_MEASURE + taskWriter.write({ F("ShowUoM"), Settings.ShowUnitOfMeasureOnDevicesPage() }); +#endif // if FEATURE_TASKVALUE_UNIT_OF_MEASURE + taskWriter.write({ F("TTL"), ttl_json * 1000 }); + } } } } if (!showSpecificTask) { - #if FEATURE_TASKVALUE_UNIT_OF_MEASURE - - // Explicit cast to bool, since the function is an inline function, which is returning part of a bitset. - // Thus is considered an int by the compiler - mainLevelWriter.write({ F("ShowUoM"), !!Settings.ShowUnitOfMeasureOnDevicesPage() }); - #endif // if FEATURE_TASKVALUE_UNIT_OF_MEASURE +#if FEATURE_TASKVALUE_UNIT_OF_MEASURE + mainLevelWriter.write({ F("ShowUoM"), Settings.ShowUnitOfMeasureOnDevicesPage() }); +#endif // if FEATURE_TASKVALUE_UNIT_OF_MEASURE mainLevelWriter.write({ F("TTL"), lowest_ttl_json * 1000 }); } } diff --git a/src/src/WebServer/KeyValueWriter_JSON.cpp b/src/src/WebServer/KeyValueWriter_JSON.cpp index 03bf9a24c..77b588767 100644 --- a/src/src/WebServer/KeyValueWriter_JSON.cpp +++ b/src/src/WebServer/KeyValueWriter_JSON.cpp @@ -1,5 +1,6 @@ #include "../WebServer/KeyValueWriter_JSON.h" +#include "../Globals/Settings.h" #include "../Helpers/StringConverter.h" #include "../WebServer/HTML_wrappers.h" @@ -115,7 +116,7 @@ void KeyValueWriter_JSON::write(const KeyValueStruct& kv) #ifdef USE_KVW_JSON_INDENT indent(); addHtml('\t'); -#endif +#endif // ifdef USE_KVW_JSON_INDENT writeValue(kv._values[i]); } @@ -125,13 +126,27 @@ void KeyValueWriter_JSON::write(const KeyValueStruct& kv) void KeyValueWriter_JSON::writeValue(const ValueStruct& val) { - if (val.isInt) { - addHtml(val.str); - } else if (val.isBoolean) { - addHtml(val.str.equals("1") ? F("true") : F("false")); - } else { - addHtml(to_json_value(val.str)); + switch (val.valueType) + { + case ValueStruct::ValueType::Float: + case ValueStruct::ValueType::Double: + case ValueStruct::ValueType::Int: + addHtml(val.str); + return; + case ValueStruct::ValueType::Bool: + + if (Settings.JSONBoolWithoutQuotes()) + { + addHtml(val.str.equals("0") ? F("false") : F("true")); + return; + } + + // Fall through + case ValueStruct::ValueType::Auto: + case ValueStruct::ValueType::String: + break; } + addHtml(to_json_value(val.str)); } #ifdef USE_KVW_JSON_INDENT From 258cda68a5c510a863fc99c50e51a377471beaa8 Mon Sep 17 00:00:00 2001 From: TD-er Date: Fri, 3 Oct 2025 15:52:47 +0200 Subject: [PATCH 319/564] [Cleanup] Wrap #ifdef WEBSERVER_NEW_UI.. around functions only used then --- src/src/Helpers/ESPEasyStatistics.cpp | 4 +- src/src/Helpers/ESPEasyStatistics.h | 4 +- src/src/Helpers/KeyValueWriter.cpp | 31 ++++++------- src/src/Helpers/KeyValueWriter.h | 55 ++++++++++++----------- src/src/WebServer/ESPEasy_WebServer.cpp | 4 +- src/src/WebServer/JSON.cpp | 3 +- src/src/WebServer/JSON.h | 4 +- src/src/WebServer/KeyValueWriter_JSON.cpp | 11 +++-- src/src/WebServer/KeyValueWriter_JSON.h | 2 + 9 files changed, 60 insertions(+), 58 deletions(-) diff --git a/src/src/Helpers/ESPEasyStatistics.cpp b/src/src/Helpers/ESPEasyStatistics.cpp index 81e8addd6..5c53f1f2b 100644 --- a/src/src/Helpers/ESPEasyStatistics.cpp +++ b/src/src/Helpers/ESPEasyStatistics.cpp @@ -2,7 +2,7 @@ #if FEATURE_TIMING_STATS - +#ifdef WEBSERVER_NEW_UI #include "../DataStructs/TimingStats.h" #include "../WebServer/ESPEasy_WebServer.h" #include "../Helpers/Convert.h" @@ -139,5 +139,5 @@ void jsonStatistics(bool clearStats) { } } - +#endif #endif // if FEATURE_TIMING_STATS \ No newline at end of file diff --git a/src/src/Helpers/ESPEasyStatistics.h b/src/src/Helpers/ESPEasyStatistics.h index f35f28ddb..dbc48bf79 100644 --- a/src/src/Helpers/ESPEasyStatistics.h +++ b/src/src/Helpers/ESPEasyStatistics.h @@ -6,7 +6,7 @@ #if FEATURE_TIMING_STATS - +#ifdef WEBSERVER_NEW_UI #include "../DataStructs/TimingStats.h" //void logStatistics(uint8_t loglevel, bool clearStats); @@ -14,7 +14,7 @@ void stream_json_timing_stats(const TimingStats& stats, long timeSinceLastReset); void jsonStatistics(bool clearStats); - +#endif #endif // if FEATURE_TIMING_STATS diff --git a/src/src/Helpers/KeyValueWriter.cpp b/src/src/Helpers/KeyValueWriter.cpp index e7db5942d..4a5baf981 100644 --- a/src/src/Helpers/KeyValueWriter.cpp +++ b/src/src/Helpers/KeyValueWriter.cpp @@ -18,19 +18,6 @@ KeyValueStruct::KeyValueStruct(const __FlashStringHelper *key) : _key(key) {} KeyValueStruct::KeyValueStruct(const String& key) : _key(key) {} -/* - KeyValueStruct::KeyValueStruct(const __FlashStringHelper *key, - ValueStruct && value) - : _key(key) { - _values.emplace_back(std::move(value)); - } - - KeyValueStruct::KeyValueStruct(const String& key, - ValueStruct&& value) - : _key(key) { - _values.emplace_back(std::move(value)); - } - */ KeyValueStruct::KeyValueStruct(const String & key, bool val, @@ -46,6 +33,20 @@ KeyValueStruct::KeyValueStruct(const String & key, _values.emplace_back(String(val), vType); } +KeyValueStruct::KeyValueStruct(const String & key, + const uint64_t & val, + ValueStruct::ValueType vType) + : _key(key) { + _values.emplace_back(ull2String(val), vType); +} + +KeyValueStruct::KeyValueStruct(const String & key, + const int64_t & val, + ValueStruct::ValueType vType) + : _key(key) { + _values.emplace_back(ll2String(val), vType); +} + KeyValueStruct::KeyValueStruct(const String & key, const float & val, int nrDecimals, @@ -53,7 +54,7 @@ KeyValueStruct::KeyValueStruct(const String & key, : _key(key) { String str; - if (!toValidString(str, val, nrDecimals, true)) { + if (!toValidString(str, val, nrDecimals)) { vType = ValueStruct::ValueType::String; } @@ -67,7 +68,7 @@ KeyValueStruct::KeyValueStruct(const String & key, : _key(key) { String str; - if (!doubleToValidString(str, val, nrDecimals, true)) { + if (!doubleToValidString(str, val, nrDecimals)) { vType = ValueStruct::ValueType::String; } diff --git a/src/src/Helpers/KeyValueWriter.h b/src/src/Helpers/KeyValueWriter.h index 2400f54ef..fcb495b10 100644 --- a/src/src/Helpers/KeyValueWriter.h +++ b/src/src/Helpers/KeyValueWriter.h @@ -33,7 +33,7 @@ struct ValueStruct ValueType vType = ValueType::Auto); - String str; + String str; ValueType valueType = ValueType::Auto; }; @@ -43,24 +43,8 @@ struct KeyValueStruct KeyValueStruct() {} - KeyValueStruct(const __FlashStringHelper *key); - KeyValueStruct(const String& key); - - /* - KeyValueStruct(const __FlashStringHelper *key, - ValueStruct && value); - - KeyValueStruct(const String& key, - ValueStruct&& value); - */ - - template - KeyValueStruct(const String & key, - const T & val, - ValueStruct::ValueType vType = ValueStruct::ValueType::Auto) - : _key(key) { - _values.emplace_back(String(val), vType); - } + KeyValueStruct(const __FlashStringHelper *key); + KeyValueStruct(const String& key); KeyValueStruct(const String & key, bool val, @@ -71,14 +55,23 @@ struct KeyValueStruct ValueStruct::ValueType vType = ValueStruct::ValueType::Int); KeyValueStruct(const String & key, - const float& val, - int nrDecimals = 4, - ValueStruct::ValueType vType = ValueStruct::ValueType::Float); + const uint64_t & val, + ValueStruct::ValueType vType = ValueStruct::ValueType::Int); KeyValueStruct(const String & key, - const double& val, - int nrDecimals = 4, - ValueStruct::ValueType vType = ValueStruct::ValueType::Double); + const int64_t & val, + ValueStruct::ValueType vType = ValueStruct::ValueType::Int); + + + KeyValueStruct(const String & key, + const float & val, + int nrDecimals = 4, + ValueStruct::ValueType vType = ValueStruct::ValueType::Float); + + KeyValueStruct(const String & key, + const double & val, + int nrDecimals = 4, + ValueStruct::ValueType vType = ValueStruct::ValueType::Double); KeyValueStruct(const __FlashStringHelper *key, @@ -94,14 +87,22 @@ struct KeyValueStruct ValueStruct::ValueType vType = ValueStruct::ValueType::Auto); KeyValueStruct(const __FlashStringHelper *key, - String && val, - ValueStruct::ValueType vType = ValueStruct::ValueType::Auto); + String && val, + ValueStruct::ValueType vType = ValueStruct::ValueType::Auto); KeyValueStruct(const String & key, String && val, ValueStruct::ValueType vType = ValueStruct::ValueType::Auto); + template + KeyValueStruct(const String & key, + const T & val, + ValueStruct::ValueType vType = ValueStruct::ValueType::Auto) + : _key(key) { + _values.emplace_back(String(val), vType); + } + KeyValueStruct(LabelType::Enum label); void setUnit(const String& unit); diff --git a/src/src/WebServer/ESPEasy_WebServer.cpp b/src/src/WebServer/ESPEasy_WebServer.cpp index 811aaaad9..8fdc24d70 100644 --- a/src/src/WebServer/ESPEasy_WebServer.cpp +++ b/src/src/WebServer/ESPEasy_WebServer.cpp @@ -626,9 +626,7 @@ void json_quote_name(const String& val) { } void json_quote_val(const String& val) { - addHtml('\"'); - addHtml(val); - addHtml('\"'); + addHtml(to_json_value(val)); } void json_open(bool arr) { diff --git a/src/src/WebServer/JSON.cpp b/src/src/WebServer/JSON.cpp index 2f1657359..f6c82e88d 100644 --- a/src/src/WebServer/JSON.cpp +++ b/src/src/WebServer/JSON.cpp @@ -447,7 +447,6 @@ void handle_json() sensorsWriter.setIsArray(); } - for (taskIndex_t TaskIndex = firstTaskIndex; TaskIndex <= lastActiveTaskIndex && validTaskIndex(TaskIndex); TaskIndex++) { const deviceIndex_t DeviceIndex = getDeviceIndex_from_TaskIndex(TaskIndex); @@ -838,6 +837,7 @@ void stream_to_json_object_value(const String& object, int value) { String jsonBool(bool value) { return boolToString(value); } +#ifdef WEBSERVER_NEW_UI // Add JSON formatted data directly to the TXbuffer, including a trailing comma. void stream_next_json_object_value(const __FlashStringHelper *object, const String& value) { stream_to_json_object_value(object, value); @@ -911,3 +911,4 @@ void stream_last_json_object_value(const __FlashStringHelper *object, int value) void stream_next_json_object_value(LabelType::Enum label) { stream_next_json_object_value(getLabel(label), getValue(label)); } void stream_last_json_object_value(LabelType::Enum label) { stream_last_json_object_value(getLabel(label), getValue(label)); } +#endif \ No newline at end of file diff --git a/src/src/WebServer/JSON.h b/src/src/WebServer/JSON.h index 9f57f48de..cb1093e5e 100644 --- a/src/src/WebServer/JSON.h +++ b/src/src/WebServer/JSON.h @@ -54,7 +54,7 @@ void stream_to_json_object_value(const String& object, int value); String jsonBool(bool value); - +#ifdef WEBSERVER_NEW_UI // Add JSON formatted data directly to the TXbuffer, including a trailing comma. void stream_next_json_object_value(const __FlashStringHelper * object, const String& value); void stream_next_json_object_value(const __FlashStringHelper * object, String&& value); @@ -73,7 +73,7 @@ void stream_last_json_object_value(const __FlashStringHelper * object, int value void stream_next_json_object_value(LabelType::Enum label); void stream_last_json_object_value(LabelType::Enum label); - +#endif diff --git a/src/src/WebServer/KeyValueWriter_JSON.cpp b/src/src/WebServer/KeyValueWriter_JSON.cpp index 77b588767..e8ebd9b7d 100644 --- a/src/src/WebServer/KeyValueWriter_JSON.cpp +++ b/src/src/WebServer/KeyValueWriter_JSON.cpp @@ -135,13 +135,12 @@ void KeyValueWriter_JSON::writeValue(const ValueStruct& val) return; case ValueStruct::ValueType::Bool: - if (Settings.JSONBoolWithoutQuotes()) - { - addHtml(val.str.equals("0") ? F("false") : F("true")); - return; - } + if (!Settings.JSONBoolWithoutQuotes()) { addHtml('"'); } + addHtml(val.str.equals("0") ? F("false") : F("true")); + + if (!Settings.JSONBoolWithoutQuotes()) { addHtml('"'); } + return; - // Fall through case ValueStruct::ValueType::Auto: case ValueStruct::ValueType::String: break; diff --git a/src/src/WebServer/KeyValueWriter_JSON.h b/src/src/WebServer/KeyValueWriter_JSON.h index 4f28bced9..53d05c98b 100644 --- a/src/src/WebServer/KeyValueWriter_JSON.h +++ b/src/src/WebServer/KeyValueWriter_JSON.h @@ -2,7 +2,9 @@ #include "../Helpers/KeyValueWriter.h" +#ifndef BUILD_NO_DEBUG #define USE_KVW_JSON_INDENT +#endif class KeyValueWriter_JSON : public KeyValueWriter { From cb386edbf5b25aa221711d2030b30950aec32b12 Mon Sep 17 00:00:00 2001 From: TD-er Date: Fri, 3 Oct 2025 16:35:33 +0200 Subject: [PATCH 320/564] [JSON] Change handle_sysinfo_json() to use new JSON formatting functions --- src/src/WebServer/ESPEasy_WebServer.cpp | 4 +- src/src/WebServer/ESPEasy_WebServer.h | 3 +- src/src/WebServer/SysInfoPage.cpp | 642 +++++++++++++----------- 3 files changed, 349 insertions(+), 300 deletions(-) diff --git a/src/src/WebServer/ESPEasy_WebServer.cpp b/src/src/WebServer/ESPEasy_WebServer.cpp index 8fdc24d70..8e4bea24b 100644 --- a/src/src/WebServer/ESPEasy_WebServer.cpp +++ b/src/src/WebServer/ESPEasy_WebServer.cpp @@ -606,7 +606,7 @@ void writeDefaultCSS(void) // FIXME TD-er: replace stream_xxx_json_object* into this code. // N.B. handling of numerical values differs (string vs. no string) // ******************************************************************************** - +#ifdef WEBSERVER_NEW_UI int8_t level = 0; int8_t lastLevel = -1; @@ -687,7 +687,7 @@ void json_prop(const String& name, const String& value) { void json_prop(LabelType::Enum label) { json_prop(getInternalLabel(label, '-'), getValue(label)); } - +#endif // ******************************************************************************** // Add a task select dropdown list // This allows to select a task index based on the existing tasks. diff --git a/src/src/WebServer/ESPEasy_WebServer.h b/src/src/WebServer/ESPEasy_WebServer.h index 60b4733eb..2d14b76f2 100644 --- a/src/src/WebServer/ESPEasy_WebServer.h +++ b/src/src/WebServer/ESPEasy_WebServer.h @@ -64,7 +64,7 @@ void writeDefaultCSS(void); // FIXME TD-er: replace stream_xxx_json_object* into this code. // N.B. handling of numerical values differs (string vs. no string) // ******************************************************************************** - +#ifdef WEBSERVER_NEW_UI extern int8_t level; extern int8_t lastLevel; @@ -100,6 +100,7 @@ void json_prop(const String& name, const String& value); void json_prop(LabelType::Enum label); +#endif // ******************************************************************************** // Add a task select dropdown list diff --git a/src/src/WebServer/SysInfoPage.cpp b/src/src/WebServer/SysInfoPage.cpp index a208633fc..46d21dd38 100644 --- a/src/src/WebServer/SysInfoPage.cpp +++ b/src/src/WebServer/SysInfoPage.cpp @@ -5,6 +5,8 @@ # include "../WebServer/AccessControl.h" # include "../WebServer/ESPEasy_WebServer.h" # include "../WebServer/HTML_wrappers.h" +# include "../WebServer/KeyValueWriter_JSON.h" + # include "../WebServer/Markup.h" # include "../WebServer/Markup_Buttons.h" @@ -52,9 +54,9 @@ # endif // if FEATURE_MQTT -#if FEATURE_INTERNAL_TEMPERATURE -#include "../Helpers/Hardware_temperature_sensor.h" -#endif +# if FEATURE_INTERNAL_TEMPERATURE +# include "../Helpers/Hardware_temperature_sensor.h" +# endif # ifdef ESP32 # include @@ -67,182 +69,202 @@ // Web Interface sysinfo page // ******************************************************************************** void handle_sysinfo_json() { - # ifndef BUILD_NO_RAM_TRACKER +# ifndef BUILD_NO_RAM_TRACKER checkRAM(F("handle_sysinfo")); - # endif // ifndef BUILD_NO_RAM_TRACKER +# endif // ifndef BUILD_NO_RAM_TRACKER if (!isLoggedIn()) { return; } TXBuffer.startJsonStream(); - json_init(); - json_open(); - json_open(false, F("general")); - json_number(F("unit"), String(Settings.Unit)); - json_prop(F("time"), node_time.getDateTimeString('-', ':', ' ')); - json_prop(F("uptime"), getExtendedValue(LabelType::UPTIME)); - json_number(F("cpu_load"), toString(getCPUload())); -#if FEATURE_INTERNAL_TEMPERATURE - json_number(F("cpu_temp"), toString(getInternalTemperature())); -#endif - json_number(F("loop_count"), String(getLoopCountPerSec())); - json_close(); + { + KeyValueWriter_JSON mainLevelWriter(true); + { + KeyValueWriter_JSON writer(F("general"), &mainLevelWriter); - int freeMem = ESP.getFreeHeap(); - json_open(false, F("mem")); - json_number(F("free"), String(freeMem)); - json_number(F("low_ram"), String( - # ifndef BUILD_NO_RAM_TRACKER - lowestRAM - # else // ifndef BUILD_NO_RAM_TRACKER - 0 - # endif // ifndef BUILD_NO_RAM_TRACKER - )); - json_prop(F("low_ram_fn"), String( - # ifndef BUILD_NO_RAM_TRACKER - lowestRAMfunction - # else // ifndef BUILD_NO_RAM_TRACKER - 0 - # endif // ifndef BUILD_NO_RAM_TRACKER - )); - json_number(F("stack"), String(getCurrentFreeStack())); - json_number(F("low_stack"), String( - # ifndef BUILD_NO_RAM_TRACKER - lowestFreeStack - # else // ifndef BUILD_NO_RAM_TRACKER - 0 - # endif // ifndef BUILD_NO_RAM_TRACKER - )); - json_prop(F("low_stack_fn"), String( - # ifndef BUILD_NO_RAM_TRACKER - lowestFreeStackfunction - # else // ifndef BUILD_NO_RAM_TRACKER - 0 - # endif // ifndef BUILD_NO_RAM_TRACKER - )); - json_close(); + writer.write({ F("unit"), Settings.Unit }); + writer.write({ F("time"), node_time.getDateTimeString('-', ':', ' ') }); + writer.write({ F("uptime"), getExtendedValue(LabelType::UPTIME) }); + writer.write({ F("cpu_load"), getCPUload(), 2 }); +# if FEATURE_INTERNAL_TEMPERATURE + writer.write({ F("cpu_temp"), getInternalTemperature(), 2 }); +# endif + writer.write({ F("loop_count"), getLoopCountPerSec() }); - json_open(false, F("boot")); - json_prop(F("last_cause"), getLastBootCauseString()); - json_number(F("counter"), String(RTC.bootCounter)); - json_prop(F("reset_reason"), getResetReasonString()); - json_close(); - - json_open(false, F("wifi")); - json_prop(F("type"), toString(ESPEasy::net::wifi::getConnectionProtocol())); - json_number(F("rssi"), String(WiFi.RSSI())); - json_prop(F("dhcp"), useStaticIP() ? getLabel(LabelType::IP_CONFIG_STATIC) : getLabel(LabelType::IP_CONFIG_DYNAMIC)); - json_prop(F("ip"), getValue(LabelType::IP_ADDRESS)); -#if FEATURE_USE_IPV6 - if (Settings.EnableIPv6()) { - json_prop(F("ip6_local"), getValue(LabelType::IP6_LOCAL)); - json_prop(F("ip6_global"), getValue(LabelType::IP6_GLOBAL)); - } -#endif - - json_prop(F("subnet"), getValue(LabelType::IP_SUBNET)); - json_prop(F("gw"), getValue(LabelType::GATEWAY)); - json_prop(F("dns1"), getValue(LabelType::DNS_1)); - json_prop(F("dns2"), getValue(LabelType::DNS_2)); - json_prop(F("allowed_range"), ESPEasy::net::describeAllowedIPrange()); - json_prop(F("sta_mac"), getValue(LabelType::STA_MAC)); - json_prop(F("ap_mac"), getValue(LabelType::AP_MAC)); - json_prop(F("ssid"), getValue(LabelType::SSID)); - json_prop(F("bssid"), getValue(LabelType::BSSID)); - json_number(F("channel"), getValue(LabelType::CHANNEL)); - json_prop(F("encryption"), getValue(LabelType::ENCRYPTION_TYPE_STA)); - json_prop(F("connected"), getValue(LabelType::CONNECTED)); - json_prop(F("ldr"), getValue(LabelType::LAST_DISC_REASON_STR)); - json_number(F("reconnects"), getValue(LabelType::NUMBER_RECONNECTS)); - json_prop(F("ssid1"), getValue(LabelType::WIFI_STORED_SSID1)); - json_prop(F("ssid2"), getValue(LabelType::WIFI_STORED_SSID2)); - json_close(); - -# if FEATURE_ETHERNET - json_open(false, F("ethernet")); - json_prop(F("ethwifimode"), getValue(LabelType::ETH_WIFI_MODE)); - json_prop(F("ethconnected"), getValue(LabelType::ETH_CONNECTED)); - json_prop(F("ethchip"), getValue(LabelType::ETH_CHIP)); - json_prop(F("ethduplex"), getValue(LabelType::ETH_DUPLEX)); - json_prop(F("ethspeed"), getValue(LabelType::ETH_SPEED)); - json_prop(F("ethstate"), getValue(LabelType::ETH_STATE)); - json_prop(F("ethspeedstate"), getValue(LabelType::ETH_SPEED_STATE)); -#if FEATURE_USE_IPV6 - if (Settings.EnableIPv6()) - json_prop(F("ethipv6local"), getValue(LabelType::ETH_IP6_LOCAL)); -#endif - json_close(); -# endif // if FEATURE_ETHERNET - - json_open(false, F("firmware")); - json_prop(F("build"), getSystemBuildString()); - json_prop(F("notes"), F(BUILD_NOTES)); - json_prop(F("libraries"), getSystemLibraryString()); - json_prop(F("git_version"), getValue(LabelType::GIT_BUILD)); - json_prop(F("plugins"), getPluginDescriptionString()); - json_prop(F("md5"), String(CRCValues.compileTimeMD5[0], HEX)); - json_number(F("md5_check"), String(CRCValues.checkPassed())); - json_prop(F("build_time"), get_build_time()); - json_prop(F("filename"), getValue(LabelType::BINARY_FILENAME)); - json_prop(F("build_platform"), getValue(LabelType::BUILD_PLATFORM)); - json_prop(F("git_head"), getValue(LabelType::GIT_HEAD)); - #ifdef CONFIGURATION_CODE - json_prop(F("configuration_code"), getValue(LabelType::CONFIGURATION_CODE_LBL)); - #endif // ifdef CONFIGURATION_CODE - json_close(); - - json_open(false, F("esp")); - json_prop(F("chip_id"), getValue(LabelType::ESP_CHIP_ID)); - json_number(F("cpu"), getValue(LabelType::ESP_CHIP_FREQ)); -#ifdef ESP32 - json_number(F("xtal_freq"), getValue(LabelType::ESP_CHIP_XTAL_FREQ)); - json_number(F("abp_freq"), getValue(LabelType::ESP_CHIP_APB_FREQ)); -#endif - json_prop(F("board"), getValue(LabelType::BOARD_NAME)); - json_close(); - - json_open(false, F("storage")); - - // Set to HEX may be something like 0x1640E0. - // Where manufacturer is 0xE0 and device is 0x4016. - json_number(F("chip_id"), getValue(LabelType::FLASH_CHIP_ID)); - if (flashChipVendorPuya()) { - if (puyaSupport()) { - json_prop(F("vendor"), F("puya, supported")); - } else { - json_prop(F("vendor"), F("puya, error")); } - } else { - json_prop(F("vendor"), getValue(LabelType::FLASH_CHIP_VENDOR)); + int freeMem = ESP.getFreeHeap(); + { + KeyValueWriter_JSON writer(F("mem"), &mainLevelWriter); + writer.write({ F("free"), freeMem }); + writer.write({ F("low_ram"), +# ifndef BUILD_NO_RAM_TRACKER + lowestRAM +# else // ifndef BUILD_NO_RAM_TRACKER + 0 +# endif // ifndef BUILD_NO_RAM_TRACKER + }); + writer.write({ F("low_ram_fn"), +# ifndef BUILD_NO_RAM_TRACKER + lowestRAMfunction +# else // ifndef BUILD_NO_RAM_TRACKER + 0 +# endif // ifndef BUILD_NO_RAM_TRACKER + }); + writer.write({ F("stack"), getCurrentFreeStack() }); + writer.write({ F("low_stack"), +# ifndef BUILD_NO_RAM_TRACKER + lowestFreeStack +# else // ifndef BUILD_NO_RAM_TRACKER + 0 +# endif // ifndef BUILD_NO_RAM_TRACKER + }); + writer.write({ F("low_stack_fn"), +# ifndef BUILD_NO_RAM_TRACKER + lowestFreeStackfunction +# else // ifndef BUILD_NO_RAM_TRACKER + 0 +# endif // ifndef BUILD_NO_RAM_TRACKER + }); + + } + { + + KeyValueWriter_JSON writer(F("boot"), &mainLevelWriter); + writer.write({ F("last_cause"), getLastBootCauseString() }); + writer.write({ F("counter"), RTC.bootCounter }); + writer.write({ F("reset_reason"), getResetReasonString() }); + + } + { + + KeyValueWriter_JSON writer(F("wifi"), &mainLevelWriter); + writer.write({ F("type"), toString(ESPEasy::net::wifi::getConnectionProtocol()) }); + writer.write({ F("rssi"), WiFi.RSSI() }); + writer.write({ F("dhcp"), useStaticIP() ? LabelType::IP_CONFIG_STATIC : LabelType::IP_CONFIG_DYNAMIC }); + writer.write({ F("ip"), LabelType::IP_ADDRESS }); +# if FEATURE_USE_IPV6 + + if (Settings.EnableIPv6()) { + writer.write({ F("ip6_local"), LabelType::IP6_LOCAL }); + writer.write({ F("ip6_global"), LabelType::IP6_GLOBAL }); + } +# endif // if FEATURE_USE_IPV6 + + writer.write({ F("subnet"), LabelType::IP_SUBNET }); + writer.write({ F("gw"), LabelType::GATEWAY }); + writer.write({ F("dns1"), LabelType::DNS_1 }); + writer.write({ F("dns2"), LabelType::DNS_2 }); + writer.write({ F("allowed_range"), ESPEasy::net::describeAllowedIPrange() }); + writer.write({ F("sta_mac"), LabelType::STA_MAC }); + writer.write({ F("ap_mac"), LabelType::AP_MAC }); + writer.write({ F("ssid"), LabelType::SSID }); + writer.write({ F("bssid"), LabelType::BSSID }); + writer.write({ F("channel"), LabelType::CHANNEL }); + writer.write({ F("encryption"), LabelType::ENCRYPTION_TYPE_STA }); + writer.write({ F("connected"), LabelType::CONNECTED }); + writer.write({ F("ldr"), LabelType::LAST_DISC_REASON_STR }); + writer.write({ F("reconnects"), LabelType::NUMBER_RECONNECTS }); + writer.write({ F("ssid1"), LabelType::WIFI_STORED_SSID1 }); + writer.write({ F("ssid2"), LabelType::WIFI_STORED_SSID2 }); + + } + { + +# if FEATURE_ETHERNET + KeyValueWriter_JSON writer(F("ethernet"), &mainLevelWriter); + writer.write({ F("ethwifimode"), LabelType::ETH_WIFI_MODE }); + writer.write({ F("ethconnected"), LabelType::ETH_CONNECTED }); + writer.write({ F("ethchip"), LabelType::ETH_CHIP }); + writer.write({ F("ethduplex"), LabelType::ETH_DUPLEX }); + writer.write({ F("ethspeed"), LabelType::ETH_SPEED }); + writer.write({ F("ethstate"), LabelType::ETH_STATE }); + writer.write({ F("ethspeedstate"), LabelType::ETH_SPEED_STATE }); +# if FEATURE_USE_IPV6 + + if (Settings.EnableIPv6()) { + writer.write({ F("ethipv6local"), LabelType::ETH_IP6_LOCAL }); + } +# endif // if FEATURE_USE_IPV6 + +# endif // if FEATURE_ETHERNET + } + { + + KeyValueWriter_JSON writer(F("firmware"), &mainLevelWriter); + writer.write({ F("build"), getSystemBuildString() }); + writer.write({ F("notes"), F(BUILD_NOTES) }); + writer.write({ F("libraries"), getSystemLibraryString() }); + writer.write({ F("git_version"), LabelType::GIT_BUILD }); + writer.write({ F("plugins"), getPluginDescriptionString() }); + writer.write({ F("md5"), formatToHex_array((const uint8_t *)CRCValues.compileTimeMD5, sizeof(CRCValues.compileTimeMD5)) }); + writer.write({ F("md5_check"), CRCValues.checkPassed() }); + writer.write({ F("build_time"), get_build_time() }); + writer.write({ F("filename"), LabelType::BINARY_FILENAME }); + writer.write({ F("build_platform"),LabelType::BUILD_PLATFORM }); + writer.write({ F("git_head"), LabelType::GIT_HEAD }); +# ifdef CONFIGURATION_CODE + writer.write({ F("configuration_code"), LabelType::CONFIGURATION_CODE_LBL }); +# endif // ifdef CONFIGURATION_CODE + + } + { + + KeyValueWriter_JSON writer(F("esp"), &mainLevelWriter); + writer.write({ F("chip_id"), LabelType::ESP_CHIP_ID }); + writer.write({ F("cpu"), LabelType::ESP_CHIP_FREQ }); +# ifdef ESP32 + writer.write({ F("xtal_freq"), LabelType::ESP_CHIP_XTAL_FREQ }); + writer.write({ F("abp_freq"), LabelType::ESP_CHIP_APB_FREQ }); +# endif // ifdef ESP32 + writer.write({ F("board"), LabelType::BOARD_NAME }); + + } + { + + KeyValueWriter_JSON writer(F("storage"), &mainLevelWriter); + + // Set to HEX may be something like 0x1640E0. + // Where manufacturer is 0xE0 and device is 0x4016. + writer.write({ F("chip_id"), LabelType::FLASH_CHIP_ID }); + + if (flashChipVendorPuya()) { + if (puyaSupport()) { + writer.write({ F("vendor"), F("puya, supported") }); + } else { + writer.write({ F("vendor"), F("puya, error") }); + } + } else { + writer.write({ F("vendor"), LabelType::FLASH_CHIP_VENDOR }); + } + writer.write({ F("device"), LabelType::FLASH_CHIP_MODEL }); + writer.write({ F("real_size"), getFlashRealSizeInBytes() / 1024 }); + writer.write({ F("ide_size"), ESP.getFlashChipSize() / 1024 }); + + // Please check what is supported for the ESP32 + writer.write({ F("flash_speed"), LabelType::FLASH_CHIP_SPEED }); + + writer.write({ F("mode"), getFlashChipMode() }); + + writer.write({ F("writes"), RTC.flashDayCounter }); + writer.write({ F("flash_counter"), RTC.flashCounter }); + writer.write({ F("sketch_size"), getSketchSize() / 1024 }); + writer.write({ F("sketch_free"), getFreeSketchSpace() / 1024 }); + + writer.write({ F("spiffs_size"), SpiffsTotalBytes() / 1024 }); + writer.write({ F("spiffs_free"), SpiffsFreeSpace() / 1024 }); + + } + } - json_number(F("device"), getValue(LabelType::FLASH_CHIP_MODEL)); - json_number(F("real_size"), String(getFlashRealSizeInBytes() / 1024)); - json_number(F("ide_size"), String(ESP.getFlashChipSize() / 1024)); - - // Please check what is supported for the ESP32 - json_number(F("flash_speed"), getValue(LabelType::FLASH_CHIP_SPEED)); - - json_prop(F("mode"), getFlashChipMode()); - - json_number(F("writes"), String(RTC.flashDayCounter)); - json_number(F("flash_counter"), String(RTC.flashCounter)); - json_number(F("sketch_size"), String(getSketchSize() / 1024)); - json_number(F("sketch_free"), String(getFreeSketchSpace() / 1024)); - - json_number(F("spiffs_size"), String(SpiffsTotalBytes() / 1024)); - json_number(F("spiffs_free"), String(SpiffsFreeSpace() / 1024)); - json_close(); - json_close(); - TXBuffer.endStream(); } -#endif // SHOW_SYSINFO_JSON +# endif // SHOW_SYSINFO_JSON -#ifdef WEBSERVER_SYSINFO +# ifdef WEBSERVER_SYSINFO void handle_sysinfo() { - # ifndef BUILD_NO_RAM_TRACKER + # ifndef BUILD_NO_RAM_TRACKER checkRAM(F("handle_sysinfo")); - # endif // ifndef BUILD_NO_RAM_TRACKER + # endif // ifndef BUILD_NO_RAM_TRACKER if (!isLoggedIn()) { return; } navMenuIndex = MENU_INDEX_TOOLS; @@ -257,7 +279,7 @@ void handle_sysinfo() { html_table_class_normal(); - # ifdef WEBSERVER_GITHUB_COPY + # ifdef WEBSERVER_GITHUB_COPY // Not using addFormHeader() to get the copy button on the same header line as 2nd column html_TR(); @@ -268,30 +290,30 @@ void handle_sysinfo() { TXBuffer.addFlashString((PGM_P)FPSTR(githublogo)); serve_JS(JSfiles_e::GitHubClipboard); - # else // ifdef WEBSERVER_GITHUB_COPY + # else // ifdef WEBSERVER_GITHUB_COPY addFormHeader(F("System Info")); - # endif // ifdef WEBSERVER_GITHUB_COPY + # endif // ifdef WEBSERVER_GITHUB_COPY handle_sysinfo_basicInfo(); -#ifndef WEBSERVER_SYSINFO_MINIMAL +# ifndef WEBSERVER_SYSINFO_MINIMAL handle_sysinfo_memory(); -#endif +# endif handle_sysinfo_Network(); -# if FEATURE_ETHERNET +# if FEATURE_ETHERNET handle_sysinfo_Ethernet(); -# endif // if FEATURE_ETHERNET +# endif // if FEATURE_ETHERNET -#ifndef WEBSERVER_SYSINFO_MINIMAL +# ifndef WEBSERVER_SYSINFO_MINIMAL handle_sysinfo_WiFiSettings(); -#endif +# endif handle_sysinfo_Firmware(); -#ifndef WEBSERVER_SYSINFO_MINIMAL +# ifndef WEBSERVER_SYSINFO_MINIMAL handle_sysinfo_SystemStatus(); handle_sysinfo_NetworkServices(); @@ -299,7 +321,7 @@ void handle_sysinfo() { handle_sysinfo_ESP_Board(); handle_sysinfo_Storage(); -#endif +# endif // ifndef WEBSERVER_SYSINFO_MINIMAL html_end_table(); @@ -314,11 +336,12 @@ void handle_sysinfo_basicInfo() { if (node_time.systemTimePresent()) { addRowLabelValue(LabelType::LOCAL_TIME); - #if FEATURE_EXT_RTC + # if FEATURE_EXT_RTC + if (Settings.ExtTimeSource() != ExtTimeSource_e::None) { addRowLabelValue(LabelType::EXT_RTC_UTC_TIME); } - #endif + # endif // if FEATURE_EXT_RTC addRowLabelValue(LabelType::TIME_SOURCE); addRowLabelValue(LabelType::TIME_WANDER); } @@ -333,16 +356,16 @@ void handle_sysinfo_basicInfo() { if (wdcounter > 0) { addHtml(strformat( - F("%.2f [%%] (LC=%d)"), - getCPUload(), - getLoopCountPerSec())); + F("%.2f [%%] (LC=%d)"), + getCPUload(), + getLoopCountPerSec())); } static const LabelType::Enum labels[] PROGMEM = { -#if FEATURE_INTERNAL_TEMPERATURE +# if FEATURE_INTERNAL_TEMPERATURE LabelType::INTERNAL_TEMPERATURE, -#endif +# endif LabelType::CPU_ECO_MODE, @@ -357,65 +380,67 @@ void handle_sysinfo_basicInfo() { { addHtml(getLastBootCauseString()); addHtml(strformat( - F(" (%d)"), static_cast(RTC.bootCounter))); + F(" (%d)"), static_cast(RTC.bootCounter))); } } -#ifndef WEBSERVER_SYSINFO_MINIMAL +# ifndef WEBSERVER_SYSINFO_MINIMAL + void handle_sysinfo_memory() { addTableSeparator(F("Memory"), 2, 3); -# ifdef ESP32 +# ifdef ESP32 addRowLabelValue(LabelType::HEAP_SIZE); addRowLabelValue(LabelType::HEAP_MIN_FREE); -# endif // ifdef ESP32 +# endif // ifdef ESP32 int freeMem = ESP.getFreeHeap(); addRowLabel(LabelType::FREE_MEM); { addHtmlInt(freeMem); addUnit(getFormUnit(LabelType::FREE_MEM)); -# ifndef BUILD_NO_RAM_TRACKER +# ifndef BUILD_NO_RAM_TRACKER addHtml(F(" (")); addHtmlInt(lowestRAM); addHtml(F(" - ")); addHtml(lowestRAMfunction); addHtml(')'); -# endif // ifndef BUILD_NO_RAM_TRACKER +# endif // ifndef BUILD_NO_RAM_TRACKER } -# if defined(CORE_POST_2_5_0) || defined(ESP32) - # ifndef LIMIT_BUILD_SIZE +# if defined(CORE_POST_2_5_0) || defined(ESP32) + # ifndef LIMIT_BUILD_SIZE addRowLabelValue(LabelType::HEAP_MAX_FREE_BLOCK); - # endif // ifndef LIMIT_BUILD_SIZE -# endif // if defined(CORE_POST_2_5_0) || defined(ESP32) -# if defined(CORE_POST_2_5_0) - # ifndef LIMIT_BUILD_SIZE + # endif // ifndef LIMIT_BUILD_SIZE +# endif // if defined(CORE_POST_2_5_0) || defined(ESP32) +# if defined(CORE_POST_2_5_0) + # ifndef LIMIT_BUILD_SIZE addRowLabelValue(LabelType::HEAP_FRAGMENTATION); - # endif // ifndef LIMIT_BUILD_SIZE + # endif // ifndef LIMIT_BUILD_SIZE { - #ifdef USE_SECOND_HEAP + # ifdef USE_SECOND_HEAP addRowLabelValue(LabelType::FREE_HEAP_IRAM); - #endif + # endif } -# endif // if defined(CORE_POST_2_5_0) +# endif // if defined(CORE_POST_2_5_0) addRowLabel(LabelType::FREE_STACK); { addHtmlInt(getCurrentFreeStack()); addUnit(getFormUnit(LabelType::FREE_STACK)); -# ifndef BUILD_NO_RAM_TRACKER +# ifndef BUILD_NO_RAM_TRACKER addHtml(F(" (")); addHtmlInt(lowestFreeStack); addHtml(F(" - ")); addHtml(lowestFreeStackfunction); addHtml(')'); -# endif // ifndef BUILD_NO_RAM_TRACKER +# endif // ifndef BUILD_NO_RAM_TRACKER } -# if defined(ESP32) && defined(BOARD_HAS_PSRAM) +# if defined(ESP32) && defined(BOARD_HAS_PSRAM) addRowLabelValue(LabelType::PSRAM_SIZE); + if (UsePSRAM()) { static const LabelType::Enum labels[] PROGMEM = { @@ -425,12 +450,14 @@ void handle_sysinfo_memory() { LabelType::MAX_LABEL }; addRowLabelValues(labels); - } -# endif // if defined(ESP32) && defined(BOARD_HAS_PSRAM) + } +# endif // if defined(ESP32) && defined(BOARD_HAS_PSRAM) } -#endif -# if FEATURE_ETHERNET +# endif // ifndef WEBSERVER_SYSINFO_MINIMAL + +# if FEATURE_ETHERNET + void handle_sysinfo_Ethernet() { if (active_network_medium == ESPEasy::net::NetworkMedium_t::Ethernet) { addTableSeparator(F("Ethernet"), 2, 3); @@ -442,9 +469,10 @@ void handle_sysinfo_Ethernet() { LabelType::ETH_SPEED, LabelType::ETH_DUPLEX, LabelType::ETH_MAC, -// LabelType::ETH_IP_ADDRESS_SUBNET, -// LabelType::ETH_IP_GATEWAY, -// LabelType::ETH_IP_DNS, + + // LabelType::ETH_IP_ADDRESS_SUBNET, + // LabelType::ETH_IP_GATEWAY, + // LabelType::ETH_IP_DNS, LabelType::MAX_LABEL }; @@ -454,7 +482,7 @@ void handle_sysinfo_Ethernet() { } } -# endif // if FEATURE_ETHERNET +# endif // if FEATURE_ETHERNET void handle_sysinfo_Network() { addTableSeparator(F("Network"), 2, 3); @@ -462,16 +490,17 @@ void handle_sysinfo_Network() { { static const LabelType::Enum labels[] PROGMEM = { -# if FEATURE_ETHERNET || defined(USES_ESPEASY_NOW) +# if FEATURE_ETHERNET || defined(USES_ESPEASY_NOW) LabelType::ETH_WIFI_MODE, -# endif +# endif LabelType::IP_CONFIG, LabelType::IP_ADDRESS_SUBNET, -#if FEATURE_USE_IPV6 +# if FEATURE_USE_IPV6 LabelType::IP6_LOCAL, LabelType::IP6_GLOBAL, -// LabelType::IP6_ALL_ADDRESSES, -#endif + + // LabelType::IP6_ALL_ADDRESSES, +# endif // if FEATURE_USE_IPV6 LabelType::GATEWAY, LabelType::CLIENT_IP, LabelType::DNS, @@ -490,46 +519,52 @@ void handle_sysinfo_Network() { const bool showWiFiConnectionInfo = ESPEasyWiFi.connected(); addRowLabel(LabelType::WIFI_CONNECTION); + if (showWiFiConnectionInfo) { addHtml(strformat( - F("%s (RSSI %d dBm)"), - FsP(toString(ESPEasy::net::wifi::getConnectionProtocol())), - WiFi.RSSI())); - } else addHtml('-'); + F("%s (RSSI %d dBm)"), + FsP(toString(ESPEasy::net::wifi::getConnectionProtocol())), + WiFi.RSSI())); + } else { addHtml('-'); } addRowLabel(LabelType::SSID); + if (showWiFiConnectionInfo) { addHtml(WiFi.SSID()); addHtml(F(" (")); addHtml(WiFi.BSSIDstr()); addHtml(')'); - } else addHtml('-'); + } else { addHtml('-'); } - #ifdef ESP32 + # ifdef ESP32 const int64_t tsf_time = ESPEasy::net::wifi::WiFi_get_TSF_time(); + if (tsf_time > 0) { addRowLabel(F("WiFi TSF time")); + // Split it while printing, so we're not loosing a lot of decimals in the float conversion uint32_t tsf_usec{}; addHtml(secondsToDayHourMinuteSecond(micros_to_sec_usec(tsf_time, tsf_usec))); addHtml(strformat(F(".%06u"), tsf_usec)); } - #endif + # endif // ifdef ESP32 addRowLabel(getLabel(LabelType::CHANNEL)); + if (showWiFiConnectionInfo) { addHtml(getValue(LabelType::CHANNEL)); -#if CONFIG_SOC_WIFI_SUPPORT_5G +# if CONFIG_SOC_WIFI_SUPPORT_5G addHtml(WiFi.channel() < 36 ? F(" (2.4 GHz)") : F(" (5 GHz)")); -#endif - } else addHtml('-'); +# endif + } else { addHtml('-'); } addRowLabel(getLabel(LabelType::ENCRYPTION_TYPE_STA)); + if (showWiFiConnectionInfo) { addHtml(getValue(LabelType::ENCRYPTION_TYPE_STA)); - } else addHtml('-'); + } else { addHtml('-'); } if (active_network_medium == ESPEasy::net::NetworkMedium_t::WIFI) { @@ -544,7 +579,8 @@ void handle_sysinfo_Network() { html_TR(); } -#ifndef WEBSERVER_SYSINFO_MINIMAL +# ifndef WEBSERVER_SYSINFO_MINIMAL + void handle_sysinfo_WiFiSettings() { addTableSeparator(F("WiFi Settings"), 2, 3); @@ -553,41 +589,42 @@ void handle_sysinfo_WiFiSettings() { LabelType::FORCE_WIFI_BG, LabelType::RESTART_WIFI_LOST_CONN, LabelType::FORCE_WIFI_NOSLEEP, -# ifdef SUPPORT_ARP +# ifdef SUPPORT_ARP LabelType::PERIODICAL_GRAT_ARP, -# endif // ifdef SUPPORT_ARP +# endif // ifdef SUPPORT_ARP LabelType::CONNECTION_FAIL_THRESH, -#if FEATURE_SET_WIFI_TX_PWR +# if FEATURE_SET_WIFI_TX_PWR LabelType::WIFI_TX_MAX_PWR, LabelType::WIFI_CUR_TX_PWR, LabelType::WIFI_SENS_MARGIN, LabelType::WIFI_SEND_AT_MAX_TX_PWR, -#endif +# endif // if FEATURE_SET_WIFI_TX_PWR LabelType::WIFI_NR_EXTRA_SCANS, -#ifdef USES_ESPEASY_NOW +# ifdef USES_ESPEASY_NOW LabelType::USE_ESPEASY_NOW, LabelType::FORCE_ESPEASY_NOW_CHANNEL, -#endif +# endif // ifdef USES_ESPEASY_NOW LabelType::WIFI_USE_LAST_CONN_FROM_RTC, -#ifndef ESP32 +# ifndef ESP32 LabelType::WAIT_WIFI_CONNECT, -#endif -#ifdef ESP32 +# endif +# ifdef ESP32 LabelType::WIFI_PASSIVE_SCAN, -#endif +# endif LabelType::HIDDEN_SSID_SLOW_CONNECT, LabelType::CONNECT_HIDDEN_SSID, LabelType::SDK_WIFI_AUTORECONNECT, -#if FEATURE_USE_IPV6 +# if FEATURE_USE_IPV6 LabelType::ENABLE_IPV6, -#endif +# endif LabelType::MAX_LABEL }; addRowLabelValues(labels); } -#endif + +# endif // ifndef WEBSERVER_SYSINFO_MINIMAL void handle_sysinfo_Firmware() { addTableSeparator(F("Firmware"), 2, 3); @@ -597,9 +634,9 @@ void handle_sysinfo_Firmware() { addHtml(F(BUILD_NOTES)); addRowLabelValue_copy(LabelType::SYSTEM_LIBRARIES); -#ifdef ESP32 +# ifdef ESP32 addRowLabelValue_copy(LabelType::ESP_IDF_SDK_VERSION); -#endif +# endif addRowLabelValue_copy(LabelType::GIT_BUILD); addRowLabelValue_copy(LabelType::PLUGIN_COUNT); addHtml(' '); @@ -611,12 +648,13 @@ void handle_sysinfo_Firmware() { addRowLabelValue_copy(LabelType::BINARY_FILENAME); addRowLabelValue_copy(LabelType::BUILD_PLATFORM); addRowLabelValue_copy(LabelType::GIT_HEAD); - #ifdef CONFIGURATION_CODE + # ifdef CONFIGURATION_CODE addRowLabelValue_copy(LabelType::CONFIGURATION_CODE_LBL); - #endif // ifdef CONFIGURATION_CODE + # endif // ifdef CONFIGURATION_CODE } -#ifndef WEBSERVER_SYSINFO_MINIMAL +# ifndef WEBSERVER_SYSINFO_MINIMAL + void handle_sysinfo_SystemStatus() { addTableSeparator(F("System Status"), 2, 3); @@ -626,30 +664,33 @@ void handle_sysinfo_SystemStatus() { LabelType::SYSLOG_LOG_LEVEL, LabelType::SERIAL_LOG_LEVEL, LabelType::WEB_LOG_LEVEL, -# if FEATURE_SD +# if FEATURE_SD LabelType::SD_LOG_LEVEL, -# endif // if FEATURE_SD +# endif // if FEATURE_SD LabelType::ENABLE_SERIAL_PORT_CONSOLE, LabelType::CONSOLE_SERIAL_PORT, -#if USES_ESPEASY_CONSOLE_FALLBACK_PORT +# if USES_ESPEASY_CONSOLE_FALLBACK_PORT LabelType::CONSOLE_FALLBACK_TO_SERIAL0, LabelType::CONSOLE_FALLBACK_PORT, -#endif +# endif // if USES_ESPEASY_CONSOLE_FALLBACK_PORT LabelType::MAX_LABEL }; addRowLabelValues(labels); -#if FEATURE_CLEAR_I2C_STUCK +# if FEATURE_CLEAR_I2C_STUCK + if (Settings.EnableClearHangingI2Cbus()) { addRowLabelValue(LabelType::I2C_BUS_STATE); addRowLabelValue(LabelType::I2C_BUS_CLEARED_COUNT); } -#endif +# endif // if FEATURE_CLEAR_I2C_STUCK } -#endif -#ifndef WEBSERVER_SYSINFO_MINIMAL +# endif // ifndef WEBSERVER_SYSINFO_MINIMAL + +# ifndef WEBSERVER_SYSINFO_MINIMAL + void handle_sysinfo_NetworkServices() { addTableSeparator(F("Network Services"), 2, 3); @@ -659,16 +700,19 @@ void handle_sysinfo_NetworkServices() { addRowLabel(F("NTP Initialized")); addEnabled(statusNTPInitialized); - #if FEATURE_MQTT + # if FEATURE_MQTT + if (validControllerIndex(firstEnabledMQTT_ControllerIndex())) { addRowLabel(F("MQTT Client Connected")); addEnabled(MQTTclient_connected); } - #endif + # endif // if FEATURE_MQTT } -#endif -#ifndef WEBSERVER_SYSINFO_MINIMAL +# endif // ifndef WEBSERVER_SYSINFO_MINIMAL + +# ifndef WEBSERVER_SYSINFO_MINIMAL + void handle_sysinfo_ESP_Board() { addTableSeparator(F("ESP Board"), 2, 3); @@ -677,16 +721,16 @@ void handle_sysinfo_ESP_Board() { const uint32_t chipID = getChipId(); addHtml(strformat( - F("%d (%s)"), - chipID, - formatToHex(chipID, 6).c_str())); + F("%d (%s)"), + chipID, + formatToHex(chipID, 6).c_str())); static const LabelType::Enum labels[] PROGMEM = { - LabelType::ESP_CHIP_FREQ, + LabelType::ESP_CHIP_FREQ, # ifdef ESP32 - LabelType::ESP_CHIP_XTAL_FREQ, - LabelType::ESP_CHIP_APB_FREQ, + LabelType::ESP_CHIP_XTAL_FREQ, + LabelType::ESP_CHIP_APB_FREQ, # endif // ifdef ESP32 LabelType::ESP_CHIP_MODEL, @@ -701,15 +745,16 @@ void handle_sysinfo_ESP_Board() { addRowLabelValues(labels); -#if defined(ESP32) +# if defined(ESP32) addRowLabel(F("ESP Chip Features")); addHtml(getChipFeaturesString()); -#endif +# endif // if defined(ESP32) } # endif // ifndef WEBSERVER_SYSINFO_MINIMAL # ifndef WEBSERVER_SYSINFO_MINIMAL + void handle_sysinfo_Storage() { addTableSeparator(F("Storage"), 2, 3); @@ -735,11 +780,12 @@ void handle_sysinfo_Storage() { } addHtml(F(" Device: ")); addHtml(getValue(LabelType::FLASH_CHIP_MODEL)); - #ifdef ESP32 + # ifdef ESP32 + if (getChipFeatures().embeddedFlash) { addHtml(F(" (Embedded)")); } - #endif + # endif // ifdef ESP32 } const uint32_t realSize = getFlashRealSizeInBytes(); const uint32_t ideSize = ESP.getFlashChipSize(); @@ -765,46 +811,46 @@ void handle_sysinfo_Storage() { addRowLabel(LabelType::FLASH_WRITE_COUNT); addHtml(strformat( - F("%d daily / %d boot"), - RTC.flashDayCounter, - static_cast(RTC.flashCounter))); + F("%d daily / %d boot"), + RTC.flashDayCounter, + static_cast(RTC.flashCounter))); { uint32_t maxSketchSize; bool use2step; - # if defined(ESP8266) + # if defined(ESP8266) bool otaEnabled = - # endif // if defined(ESP8266) + # endif // if defined(ESP8266) OTA_possible(maxSketchSize, use2step); addRowLabel(LabelType::SKETCH_SIZE); addHtml(strformat( - F("%d [kB] (%d kB not used)"), - getSketchSize() / 1024, - (maxSketchSize - getSketchSize()) / 1024)); + F("%d [kB] (%d kB not used)"), + getSketchSize() / 1024, + (maxSketchSize - getSketchSize()) / 1024)); addRowLabel(LabelType::MAX_OTA_SKETCH_SIZE); addHtml(strformat( - F("%d [kB] (%d bytes)"), - maxSketchSize / 1024, - maxSketchSize)); + F("%d [kB] (%d bytes)"), + maxSketchSize / 1024, + maxSketchSize)); - # if defined(ESP8266) + # if defined(ESP8266) addRowLabel(LabelType::OTA_POSSIBLE); addHtml(boolToString(otaEnabled)); addRowLabel(LabelType::OTA_2STEP); addHtml(boolToString(use2step)); - # endif // if defined(ESP8266) + # endif // if defined(ESP8266) } addRowLabel(LabelType::FS_SIZE); addHtml(strformat( - F("%d [kB] (%d kB free)"), - SpiffsTotalBytes() / 1024, - SpiffsFreeSpace() / 1024)); + F("%d [kB] (%d kB free)"), + SpiffsTotalBytes() / 1024, + SpiffsFreeSpace() / 1024)); - # ifndef LIMIT_BUILD_SIZE + # ifndef LIMIT_BUILD_SIZE addRowLabel(F("Page size")); addHtmlInt(SpiffsPagesize()); addUnit(getFormUnit(LabelType::FREE_MEM)); // FIXME TD-er: Add labeltype @@ -817,7 +863,7 @@ void handle_sysinfo_Storage() { addHtmlInt(SpiffsTotalBytes() / SpiffsBlocksize()); { - # if defined(ESP8266) + # if defined(ESP8266) fs::FSInfo fs_info; ESPEASY_FS.info(fs_info); addRowLabel(F("Maximum open files")); @@ -826,11 +872,11 @@ void handle_sysinfo_Storage() { addRowLabel(F("Maximum path length")); addHtmlInt(fs_info.maxPathLength); - # endif // if defined(ESP8266) + # endif // if defined(ESP8266) } - # endif // ifndef LIMIT_BUILD_SIZE + # endif // ifndef LIMIT_BUILD_SIZE -#if FEATURE_CHART_STORAGE_LAYOUT +# if FEATURE_CHART_STORAGE_LAYOUT if (showSettingsFileLayout) { addTableSeparator(F("Settings Files"), 2, 3); @@ -844,11 +890,12 @@ void handle_sysinfo_Storage() { for (int st = 0; st < static_cast(SettingsType::Enum::SettingsType_MAX); ++st) { const SettingsType::Enum settingsType = static_cast(st); - #if !FEATURE_NOTIFIER + # if !FEATURE_NOTIFIER + if (settingsType == SettingsType::Enum::NotificationSettings_Type) { continue; } - #endif + # endif // if !FEATURE_NOTIFIER html_TR_TD(); addHtml(SettingsType::getSettingsTypeString(settingsType)); html_BR(); @@ -859,7 +906,7 @@ void handle_sysinfo_Storage() { } } - # ifdef ESP32 + # ifdef ESP32 addTableSeparator(F("Partitions"), 2, 3, F("https://docs.espressif.com/projects/esp-idf/en/stable/esp32/api-guides/partition-tables.html")); @@ -874,20 +921,21 @@ void handle_sysinfo_Storage() { // TXBuffer += getPartitionTableHeader(F(" - "), F("
    ")); // TXBuffer += getPartitionTable(ESP_PARTITION_TYPE_APP , F(" - "), F("
    ")); getPartitionTableSVG(ESP_PARTITION_TYPE_APP, 0xab56e6); - # endif // ifdef ESP32 + # endif // ifdef ESP32 - #ifdef ESP8266 + # ifdef ESP8266 addTableSeparator(F("Partitions"), 2, 3); addRowLabel(F("Partition Table")); getPartitionTableSVG(); - #endif -#endif + # endif // ifdef ESP8266 +# endif // if FEATURE_CHART_STORAGE_LAYOUT } -#endif -#endif // ifdef WEBSERVER_SYSINFO +# endif // ifndef WEBSERVER_SYSINFO_MINIMAL + +# endif // ifdef WEBSERVER_SYSINFO -#endif +#endif // if defined(WEBSERVER_SYSINFO) || SHOW_SYSINFO_JSON From 32710e5367d7c9479a7431b2033a71a0761c4a44 Mon Sep 17 00:00:00 2001 From: Ton Huisman Date: Fri, 3 Oct 2025 21:46:37 +0200 Subject: [PATCH 321/564] [Build] Fix compiler warning --- src/src/WebServer/DevicesPage.cpp | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/src/WebServer/DevicesPage.cpp b/src/src/WebServer/DevicesPage.cpp index 7d4b4147d..746bcca45 100644 --- a/src/src/WebServer/DevicesPage.cpp +++ b/src/src/WebServer/DevicesPage.cpp @@ -828,7 +828,9 @@ void handle_devicess_ShowAllTasksTable(uint8_t page) html_TD(); if (validDeviceIndex(DeviceIndex)) { + #if FEATURE_STRING_VARIABLES const DeviceStruct& device = Device[DeviceIndex]; + #endif // #if FEATURE_STRING_VARIABLES String customValuesString; const bool customValues = PluginCall(PLUGIN_WEBFORM_SHOW_VALUES, &TempEvent, customValuesString); From 1829a3c1f235fb0fee864ae12c78d5268af0e5a9 Mon Sep 17 00:00:00 2001 From: TD-er Date: Fri, 3 Oct 2025 20:41:53 +0200 Subject: [PATCH 322/564] [JSON] Fix pretty-print generated JSON + add createChild() option --- src/src/Helpers/KeyValueWriter.cpp | 15 +- src/src/Helpers/KeyValueWriter.h | 38 ++- src/src/Helpers/KeyValueWriter_child.cpp | 40 +++ src/src/WebServer/KeyValueWriter_JSON.cpp | 27 +- src/src/WebServer/KeyValueWriter_JSON.h | 10 +- src/src/WebServer/KeyValueWriter_WebForm.cpp | 22 +- src/src/WebServer/KeyValueWriter_WebForm.h | 6 +- src/src/WebServer/SysInfoPage.cpp | 286 ++++++++++--------- 8 files changed, 255 insertions(+), 189 deletions(-) create mode 100644 src/src/Helpers/KeyValueWriter_child.cpp diff --git a/src/src/Helpers/KeyValueWriter.cpp b/src/src/Helpers/KeyValueWriter.cpp index 4a5baf981..6bb31ed65 100644 --- a/src/src/Helpers/KeyValueWriter.cpp +++ b/src/src/Helpers/KeyValueWriter.cpp @@ -2,10 +2,9 @@ #include "../Helpers/StringConverter_Numerical.h" - -ValueStruct::ValueStruct(const uint64_t& val, ValueType vType) : str(ull2String(val)), valueType(vType) {} - -ValueStruct::ValueStruct(const int64_t& val, ValueType vType) : str(ll2String(val)), valueType(vType) {} +// ******************************************************************************** +// ValueStruct +// ******************************************************************************** ValueStruct::ValueStruct(const String& val, ValueType vType) : str(val), valueType(vType) {} @@ -14,6 +13,10 @@ ValueStruct::ValueStruct(const __FlashStringHelper *val, ValueType vType) : str( ValueStruct::ValueStruct(String&& val, ValueType vType) : str(std::move(val)), valueType(vType) {} +// ******************************************************************************** +// KeyValueStruct +// ******************************************************************************** + KeyValueStruct::KeyValueStruct(const __FlashStringHelper *key) : _key(key) {} KeyValueStruct::KeyValueStruct(const String& key) : _key(key) {} @@ -131,6 +134,10 @@ void KeyValueStruct::appendValue(ValueStruct&& value) _isArray = true; } +// ******************************************************************************** +// KeyValueWriter +// ******************************************************************************** + void KeyValueWriter::clear() {} void KeyValueWriter::writeLabels(const LabelType::Enum labels[]) diff --git a/src/src/Helpers/KeyValueWriter.h b/src/src/Helpers/KeyValueWriter.h index fcb495b10..57cb84aa0 100644 --- a/src/src/Helpers/KeyValueWriter.h +++ b/src/src/Helpers/KeyValueWriter.h @@ -5,7 +5,11 @@ #include "../Helpers/StringProvider.h" #include +#include +// ******************************************************************************** +// ValueStruct +// ******************************************************************************** struct ValueStruct { enum class ValueType { @@ -21,10 +25,6 @@ struct ValueStruct ValueStruct() {} - explicit ValueStruct(const uint64_t& val, - ValueType vType = ValueType::Int); - explicit ValueStruct(const int64_t& val, - ValueType vType = ValueType::Int); ValueStruct(const String& val, ValueType vType = ValueType::Auto); ValueStruct(const __FlashStringHelper *val, @@ -38,6 +38,9 @@ struct ValueStruct }; +// ******************************************************************************** +// KeyValueStruct +// ******************************************************************************** struct KeyValueStruct { @@ -125,19 +128,30 @@ struct KeyValueStruct }; +#define KEYVALUEWRITER_BASE 0 +#define KEYVALUEWRITER_JSON 1 +#define KEYVALUEWRITER_WEBFORM 2 + +class KeyValueWriter; +typedef std::shared_ptr Sp_KeyValueWriter; + +// ******************************************************************************** +// KeyValueWriter +// ******************************************************************************** class KeyValueWriter { public: - KeyValueWriter(bool emptyHeader = false) : _hasHeader(emptyHeader) {} + KeyValueWriter(int writerType, bool emptyHeader = false) : _writerType(writerType), _hasHeader(emptyHeader) {} protected: - KeyValueWriter(KeyValueWriter*parent) : _parent(parent) {} + KeyValueWriter(int writerType, KeyValueWriter*parent) : _writerType(writerType), _parent(parent) {} - KeyValueWriter(bool emptyHeader, KeyValueWriter*parent) : _parent(parent), _hasHeader(emptyHeader) {} + KeyValueWriter(int writerType, bool emptyHeader, KeyValueWriter*parent) : _writerType(writerType), _parent(parent), + _hasHeader(emptyHeader) {} - KeyValueWriter(const String& header, KeyValueWriter*parent) : _header(header), _parent(parent) {} + KeyValueWriter(int writerType, const String& header, KeyValueWriter*parent) : _writerType(writerType), _header(header), _parent(parent) {} public: @@ -165,8 +179,13 @@ public: virtual void indent() const {} + Sp_KeyValueWriter createChild(); + Sp_KeyValueWriter createChild(const String& header); + protected: + const int _writerType = KEYVALUEWRITER_BASE; + String _header; KeyValueWriter *_parent{}; @@ -179,3 +198,6 @@ protected: }; // class KeyValueWriter + + + diff --git a/src/src/Helpers/KeyValueWriter_child.cpp b/src/src/Helpers/KeyValueWriter_child.cpp new file mode 100644 index 000000000..afe2df492 --- /dev/null +++ b/src/src/Helpers/KeyValueWriter_child.cpp @@ -0,0 +1,40 @@ +#include "../Helpers/KeyValueWriter.h" + +#include "../WebServer/KeyValueWriter_JSON.h" +#include "../WebServer/KeyValueWriter_WebForm.h" + +Sp_KeyValueWriter KeyValueWriter::createChild() +{ + switch (_writerType) + { + case KEYVALUEWRITER_BASE: + break; + case KEYVALUEWRITER_JSON: + { + return std::make_shared(static_cast(this)); + } + case KEYVALUEWRITER_WEBFORM: + { + return std::make_shared(static_cast(this)); + } + } + return nullptr; +} + +Sp_KeyValueWriter KeyValueWriter::createChild(const String& header) +{ + switch (_writerType) + { + case KEYVALUEWRITER_BASE: + break; + case KEYVALUEWRITER_JSON: + { + return std::make_shared(header, static_cast(this)); + } + case KEYVALUEWRITER_WEBFORM: + { + return std::make_shared(header, static_cast(this)); + } + } + return nullptr; +} diff --git a/src/src/WebServer/KeyValueWriter_JSON.cpp b/src/src/WebServer/KeyValueWriter_JSON.cpp index e8ebd9b7d..416a275fd 100644 --- a/src/src/WebServer/KeyValueWriter_JSON.cpp +++ b/src/src/WebServer/KeyValueWriter_JSON.cpp @@ -6,32 +6,32 @@ #include "../WebServer/HTML_wrappers.h" KeyValueWriter_JSON::KeyValueWriter_JSON(bool emptyHeader) - : KeyValueWriter(emptyHeader) + : KeyValueWriter(KEYVALUEWRITER_JSON, emptyHeader) {} KeyValueWriter_JSON::KeyValueWriter_JSON(KeyValueWriter_JSON*parent) - : KeyValueWriter(parent) + : KeyValueWriter(KEYVALUEWRITER_JSON, parent) {} KeyValueWriter_JSON::KeyValueWriter_JSON(bool emptyHeader, KeyValueWriter_JSON*parent) - : KeyValueWriter(emptyHeader, parent) + : KeyValueWriter(KEYVALUEWRITER_JSON, emptyHeader, parent) {} KeyValueWriter_JSON::KeyValueWriter_JSON(const String& header) - : KeyValueWriter(header, nullptr) + : KeyValueWriter(KEYVALUEWRITER_JSON, header, nullptr) {} KeyValueWriter_JSON::KeyValueWriter_JSON(const __FlashStringHelper *header) - : KeyValueWriter(String(header), nullptr) + : KeyValueWriter(KEYVALUEWRITER_JSON, String(header), nullptr) {} KeyValueWriter_JSON::KeyValueWriter_JSON(const String& header, KeyValueWriter_JSON*parent) - : KeyValueWriter(header, parent) + : KeyValueWriter(KEYVALUEWRITER_JSON, header, parent) {} KeyValueWriter_JSON::KeyValueWriter_JSON(const __FlashStringHelper *header, KeyValueWriter_JSON*parent) - : KeyValueWriter(String(header), parent) + : KeyValueWriter(KEYVALUEWRITER_JSON, String(header), parent) {} KeyValueWriter_JSON::~KeyValueWriter_JSON() @@ -49,15 +49,9 @@ KeyValueWriter_JSON::~KeyValueWriter_JSON() } } -void KeyValueWriter_JSON::setHeader(const String& header) -{ - _header = header; - _hasHeader = true; -} +void KeyValueWriter_JSON::clear() { _isEmpty = true; } -void KeyValueWriter_JSON::clear() { _isEmpty = true; } - -void KeyValueWriter_JSON::write() +void KeyValueWriter_JSON::write() { if (_isEmpty) { if (_parent != nullptr) { _parent->write(); } @@ -87,6 +81,7 @@ void KeyValueWriter_JSON::write(const KeyValueStruct& kv) write(); #ifdef USE_KVW_JSON_INDENT indent(); + addHtml('\t'); #endif if (kv._key.length()) { @@ -115,7 +110,7 @@ void KeyValueWriter_JSON::write(const KeyValueStruct& kv) } #ifdef USE_KVW_JSON_INDENT indent(); - addHtml('\t'); + addHtml('\t', '\t'); #endif // ifdef USE_KVW_JSON_INDENT writeValue(kv._values[i]); diff --git a/src/src/WebServer/KeyValueWriter_JSON.h b/src/src/WebServer/KeyValueWriter_JSON.h index 53d05c98b..2b08c659c 100644 --- a/src/src/WebServer/KeyValueWriter_JSON.h +++ b/src/src/WebServer/KeyValueWriter_JSON.h @@ -3,7 +3,7 @@ #include "../Helpers/KeyValueWriter.h" #ifndef BUILD_NO_DEBUG - #define USE_KVW_JSON_INDENT + # define USE_KVW_JSON_INDENT #endif class KeyValueWriter_JSON : public KeyValueWriter @@ -29,13 +29,11 @@ public: virtual ~KeyValueWriter_JSON(); - virtual void setHeader(const String& header); + virtual void clear() override; - virtual void clear() override; + virtual void write(); - virtual void write(); - - virtual void write(const KeyValueStruct& kv); + virtual void write(const KeyValueStruct& kv); private: diff --git a/src/src/WebServer/KeyValueWriter_WebForm.cpp b/src/src/WebServer/KeyValueWriter_WebForm.cpp index 0cf1037ba..a2d564daa 100644 --- a/src/src/WebServer/KeyValueWriter_WebForm.cpp +++ b/src/src/WebServer/KeyValueWriter_WebForm.cpp @@ -5,45 +5,39 @@ #include "../WebServer/Markup.h" KeyValueWriter_WebForm::KeyValueWriter_WebForm(bool emptyHeader) - : KeyValueWriter(emptyHeader) + : KeyValueWriter(KEYVALUEWRITER_WEBFORM, emptyHeader) {} KeyValueWriter_WebForm::KeyValueWriter_WebForm(KeyValueWriter_WebForm*parent) - : KeyValueWriter(parent) + : KeyValueWriter(KEYVALUEWRITER_WEBFORM, parent) {} KeyValueWriter_WebForm::KeyValueWriter_WebForm(bool emptyHeader, KeyValueWriter_WebForm*parent) - : KeyValueWriter(emptyHeader, parent) + : KeyValueWriter(KEYVALUEWRITER_WEBFORM, emptyHeader, parent) {} KeyValueWriter_WebForm::KeyValueWriter_WebForm(const String& header) - : KeyValueWriter(header, nullptr) + : KeyValueWriter(KEYVALUEWRITER_WEBFORM, header, nullptr) {} KeyValueWriter_WebForm::KeyValueWriter_WebForm(const __FlashStringHelper *header) - : KeyValueWriter(String(header), nullptr) + : KeyValueWriter(KEYVALUEWRITER_WEBFORM, String(header), nullptr) {} KeyValueWriter_WebForm::KeyValueWriter_WebForm(const String& header, KeyValueWriter_WebForm*parent) - : KeyValueWriter(header, parent) + : KeyValueWriter(KEYVALUEWRITER_WEBFORM, header, parent) {} KeyValueWriter_WebForm::KeyValueWriter_WebForm(const __FlashStringHelper *header, KeyValueWriter_WebForm*parent) - : KeyValueWriter(String(header), parent) + : KeyValueWriter(KEYVALUEWRITER_WEBFORM, String(header), parent) {} KeyValueWriter_WebForm::~KeyValueWriter_WebForm() {} -void KeyValueWriter_WebForm::setHeader(const String& header) -{ - _header = header; - _hasHeader = true; -} - -void KeyValueWriter_WebForm::write() +void KeyValueWriter_WebForm::write() { if (_isEmpty) { if (_parent != nullptr) { _parent->write(); } diff --git a/src/src/WebServer/KeyValueWriter_WebForm.h b/src/src/WebServer/KeyValueWriter_WebForm.h index e5134ef58..799dd7a92 100644 --- a/src/src/WebServer/KeyValueWriter_WebForm.h +++ b/src/src/WebServer/KeyValueWriter_WebForm.h @@ -26,10 +26,8 @@ public: virtual ~KeyValueWriter_WebForm(); - virtual void setHeader(const String& header); + virtual void write(); - virtual void write(); - - virtual void write(const KeyValueStruct& kv); + virtual void write(const KeyValueStruct& kv); }; // class KeyValueWriter_WebForm diff --git a/src/src/WebServer/SysInfoPage.cpp b/src/src/WebServer/SysInfoPage.cpp index 46d21dd38..2a70d2756 100644 --- a/src/src/WebServer/SysInfoPage.cpp +++ b/src/src/WebServer/SysInfoPage.cpp @@ -78,179 +78,191 @@ void handle_sysinfo_json() { { KeyValueWriter_JSON mainLevelWriter(true); { - KeyValueWriter_JSON writer(F("general"), &mainLevelWriter); - writer.write({ F("unit"), Settings.Unit }); - writer.write({ F("time"), node_time.getDateTimeString('-', ':', ' ') }); - writer.write({ F("uptime"), getExtendedValue(LabelType::UPTIME) }); - writer.write({ F("cpu_load"), getCPUload(), 2 }); + auto writer = mainLevelWriter.createChild(F("general")); + + if (writer) { + + writer->write({ F("unit"), Settings.Unit }); + writer->write({ F("time"), node_time.getDateTimeString('-', ':', ' ') }); + writer->write({ F("uptime"), getExtendedValue(LabelType::UPTIME) }); + writer->write({ F("cpu_load"), getCPUload(), 2 }); # if FEATURE_INTERNAL_TEMPERATURE - writer.write({ F("cpu_temp"), getInternalTemperature(), 2 }); + writer->write({ F("cpu_temp"), getInternalTemperature(), 2 }); # endif - writer.write({ F("loop_count"), getLoopCountPerSec() }); - + writer->write({ F("loop_count"), getLoopCountPerSec() }); + } } int freeMem = ESP.getFreeHeap(); { - KeyValueWriter_JSON writer(F("mem"), &mainLevelWriter); - writer.write({ F("free"), freeMem }); - writer.write({ F("low_ram"), -# ifndef BUILD_NO_RAM_TRACKER - lowestRAM -# else // ifndef BUILD_NO_RAM_TRACKER - 0 -# endif // ifndef BUILD_NO_RAM_TRACKER - }); - writer.write({ F("low_ram_fn"), -# ifndef BUILD_NO_RAM_TRACKER - lowestRAMfunction -# else // ifndef BUILD_NO_RAM_TRACKER - 0 -# endif // ifndef BUILD_NO_RAM_TRACKER - }); - writer.write({ F("stack"), getCurrentFreeStack() }); - writer.write({ F("low_stack"), -# ifndef BUILD_NO_RAM_TRACKER - lowestFreeStack -# else // ifndef BUILD_NO_RAM_TRACKER - 0 -# endif // ifndef BUILD_NO_RAM_TRACKER - }); - writer.write({ F("low_stack_fn"), -# ifndef BUILD_NO_RAM_TRACKER - lowestFreeStackfunction -# else // ifndef BUILD_NO_RAM_TRACKER - 0 -# endif // ifndef BUILD_NO_RAM_TRACKER - }); + auto writer = mainLevelWriter.createChild(F("mem")); + if (writer) { + writer->write({ F("free"), freeMem }); + writer->write({ F("low_ram"), +# ifndef BUILD_NO_RAM_TRACKER + lowestRAM +# else // ifndef BUILD_NO_RAM_TRACKER + 0 +# endif // ifndef BUILD_NO_RAM_TRACKER + }); + writer->write({ F("low_ram_fn"), +# ifndef BUILD_NO_RAM_TRACKER + lowestRAMfunction +# else // ifndef BUILD_NO_RAM_TRACKER + 0 +# endif // ifndef BUILD_NO_RAM_TRACKER + }); + writer->write({ F("stack"), getCurrentFreeStack() }); + writer->write({ F("low_stack"), +# ifndef BUILD_NO_RAM_TRACKER + lowestFreeStack +# else // ifndef BUILD_NO_RAM_TRACKER + 0 +# endif // ifndef BUILD_NO_RAM_TRACKER + }); + writer->write({ F("low_stack_fn"), +# ifndef BUILD_NO_RAM_TRACKER + lowestFreeStackfunction +# else // ifndef BUILD_NO_RAM_TRACKER + 0 +# endif // ifndef BUILD_NO_RAM_TRACKER + }); + } } { + auto writer = mainLevelWriter.createChild(F("boot")); - KeyValueWriter_JSON writer(F("boot"), &mainLevelWriter); - writer.write({ F("last_cause"), getLastBootCauseString() }); - writer.write({ F("counter"), RTC.bootCounter }); - writer.write({ F("reset_reason"), getResetReasonString() }); - + if (writer) { + writer->write({ F("last_cause"), getLastBootCauseString() }); + writer->write({ F("counter"), RTC.bootCounter }); + writer->write({ F("reset_reason"), getResetReasonString() }); + } } { + auto writer = mainLevelWriter.createChild(F("wifi")); - KeyValueWriter_JSON writer(F("wifi"), &mainLevelWriter); - writer.write({ F("type"), toString(ESPEasy::net::wifi::getConnectionProtocol()) }); - writer.write({ F("rssi"), WiFi.RSSI() }); - writer.write({ F("dhcp"), useStaticIP() ? LabelType::IP_CONFIG_STATIC : LabelType::IP_CONFIG_DYNAMIC }); - writer.write({ F("ip"), LabelType::IP_ADDRESS }); + if (writer) { + writer->write({ F("type"), toString(ESPEasy::net::wifi::getConnectionProtocol()) }); + writer->write({ F("rssi"), WiFi.RSSI() }); + writer->write({ F("dhcp"), useStaticIP() ? LabelType::IP_CONFIG_STATIC : LabelType::IP_CONFIG_DYNAMIC }); + writer->write({ F("ip"), LabelType::IP_ADDRESS }); # if FEATURE_USE_IPV6 - if (Settings.EnableIPv6()) { - writer.write({ F("ip6_local"), LabelType::IP6_LOCAL }); - writer.write({ F("ip6_global"), LabelType::IP6_GLOBAL }); - } + if (Settings.EnableIPv6()) { + writer->write({ F("ip6_local"), LabelType::IP6_LOCAL }); + writer->write({ F("ip6_global"), LabelType::IP6_GLOBAL }); + } # endif // if FEATURE_USE_IPV6 - writer.write({ F("subnet"), LabelType::IP_SUBNET }); - writer.write({ F("gw"), LabelType::GATEWAY }); - writer.write({ F("dns1"), LabelType::DNS_1 }); - writer.write({ F("dns2"), LabelType::DNS_2 }); - writer.write({ F("allowed_range"), ESPEasy::net::describeAllowedIPrange() }); - writer.write({ F("sta_mac"), LabelType::STA_MAC }); - writer.write({ F("ap_mac"), LabelType::AP_MAC }); - writer.write({ F("ssid"), LabelType::SSID }); - writer.write({ F("bssid"), LabelType::BSSID }); - writer.write({ F("channel"), LabelType::CHANNEL }); - writer.write({ F("encryption"), LabelType::ENCRYPTION_TYPE_STA }); - writer.write({ F("connected"), LabelType::CONNECTED }); - writer.write({ F("ldr"), LabelType::LAST_DISC_REASON_STR }); - writer.write({ F("reconnects"), LabelType::NUMBER_RECONNECTS }); - writer.write({ F("ssid1"), LabelType::WIFI_STORED_SSID1 }); - writer.write({ F("ssid2"), LabelType::WIFI_STORED_SSID2 }); - + writer->write({ F("subnet"), LabelType::IP_SUBNET }); + writer->write({ F("gw"), LabelType::GATEWAY }); + writer->write({ F("dns1"), LabelType::DNS_1 }); + writer->write({ F("dns2"), LabelType::DNS_2 }); + writer->write({ F("allowed_range"), ESPEasy::net::describeAllowedIPrange() }); + writer->write({ F("sta_mac"), LabelType::STA_MAC }); + writer->write({ F("ap_mac"), LabelType::AP_MAC }); + writer->write({ F("ssid"), LabelType::SSID }); + writer->write({ F("bssid"), LabelType::BSSID }); + writer->write({ F("channel"), LabelType::CHANNEL }); + writer->write({ F("encryption"), LabelType::ENCRYPTION_TYPE_STA }); + writer->write({ F("connected"), LabelType::CONNECTED }); + writer->write({ F("ldr"), LabelType::LAST_DISC_REASON_STR }); + writer->write({ F("reconnects"), LabelType::NUMBER_RECONNECTS }); + writer->write({ F("ssid1"), LabelType::WIFI_STORED_SSID1 }); + writer->write({ F("ssid2"), LabelType::WIFI_STORED_SSID2 }); + } } { # if FEATURE_ETHERNET - KeyValueWriter_JSON writer(F("ethernet"), &mainLevelWriter); - writer.write({ F("ethwifimode"), LabelType::ETH_WIFI_MODE }); - writer.write({ F("ethconnected"), LabelType::ETH_CONNECTED }); - writer.write({ F("ethchip"), LabelType::ETH_CHIP }); - writer.write({ F("ethduplex"), LabelType::ETH_DUPLEX }); - writer.write({ F("ethspeed"), LabelType::ETH_SPEED }); - writer.write({ F("ethstate"), LabelType::ETH_STATE }); - writer.write({ F("ethspeedstate"), LabelType::ETH_SPEED_STATE }); + auto writer = mainLevelWriter.createChild(F("ethernet")); + + if (writer) { + writer->write({ F("ethwifimode"), LabelType::ETH_WIFI_MODE }); + writer->write({ F("ethconnected"), LabelType::ETH_CONNECTED }); + writer->write({ F("ethchip"), LabelType::ETH_CHIP }); + writer->write({ F("ethduplex"), LabelType::ETH_DUPLEX }); + writer->write({ F("ethspeed"), LabelType::ETH_SPEED }); + writer->write({ F("ethstate"), LabelType::ETH_STATE }); + writer->write({ F("ethspeedstate"), LabelType::ETH_SPEED_STATE }); # if FEATURE_USE_IPV6 - if (Settings.EnableIPv6()) { - writer.write({ F("ethipv6local"), LabelType::ETH_IP6_LOCAL }); - } + if (Settings.EnableIPv6()) { + writer->write({ F("ethipv6local"), LabelType::ETH_IP6_LOCAL }); + } # endif // if FEATURE_USE_IPV6 - + } # endif // if FEATURE_ETHERNET } { + auto writer = mainLevelWriter.createChild(F("firmware")); - KeyValueWriter_JSON writer(F("firmware"), &mainLevelWriter); - writer.write({ F("build"), getSystemBuildString() }); - writer.write({ F("notes"), F(BUILD_NOTES) }); - writer.write({ F("libraries"), getSystemLibraryString() }); - writer.write({ F("git_version"), LabelType::GIT_BUILD }); - writer.write({ F("plugins"), getPluginDescriptionString() }); - writer.write({ F("md5"), formatToHex_array((const uint8_t *)CRCValues.compileTimeMD5, sizeof(CRCValues.compileTimeMD5)) }); - writer.write({ F("md5_check"), CRCValues.checkPassed() }); - writer.write({ F("build_time"), get_build_time() }); - writer.write({ F("filename"), LabelType::BINARY_FILENAME }); - writer.write({ F("build_platform"),LabelType::BUILD_PLATFORM }); - writer.write({ F("git_head"), LabelType::GIT_HEAD }); + if (writer) { + writer->write({ F("build"), getSystemBuildString() }); + writer->write({ F("notes"), F(BUILD_NOTES) }); + writer->write({ F("libraries"), getSystemLibraryString() }); + writer->write({ F("git_version"), LabelType::GIT_BUILD }); + writer->write({ F("plugins"), getPluginDescriptionString() }); + writer->write({ F("md5"), formatToHex_array((const uint8_t *)CRCValues.compileTimeMD5, sizeof(CRCValues.compileTimeMD5)) }); + writer->write({ F("md5_check"), CRCValues.checkPassed() }); + writer->write({ F("build_time"), get_build_time() }); + writer->write({ F("filename"), LabelType::BINARY_FILENAME }); + writer->write({ F("build_platform"), LabelType::BUILD_PLATFORM }); + writer->write({ F("git_head"), LabelType::GIT_HEAD }); # ifdef CONFIGURATION_CODE - writer.write({ F("configuration_code"), LabelType::CONFIGURATION_CODE_LBL }); + writer->write({ F("configuration_code"), LabelType::CONFIGURATION_CODE_LBL }); # endif // ifdef CONFIGURATION_CODE - - } - { - - KeyValueWriter_JSON writer(F("esp"), &mainLevelWriter); - writer.write({ F("chip_id"), LabelType::ESP_CHIP_ID }); - writer.write({ F("cpu"), LabelType::ESP_CHIP_FREQ }); -# ifdef ESP32 - writer.write({ F("xtal_freq"), LabelType::ESP_CHIP_XTAL_FREQ }); - writer.write({ F("abp_freq"), LabelType::ESP_CHIP_APB_FREQ }); -# endif // ifdef ESP32 - writer.write({ F("board"), LabelType::BOARD_NAME }); - - } - { - - KeyValueWriter_JSON writer(F("storage"), &mainLevelWriter); - - // Set to HEX may be something like 0x1640E0. - // Where manufacturer is 0xE0 and device is 0x4016. - writer.write({ F("chip_id"), LabelType::FLASH_CHIP_ID }); - - if (flashChipVendorPuya()) { - if (puyaSupport()) { - writer.write({ F("vendor"), F("puya, supported") }); - } else { - writer.write({ F("vendor"), F("puya, error") }); - } - } else { - writer.write({ F("vendor"), LabelType::FLASH_CHIP_VENDOR }); } - writer.write({ F("device"), LabelType::FLASH_CHIP_MODEL }); - writer.write({ F("real_size"), getFlashRealSizeInBytes() / 1024 }); - writer.write({ F("ide_size"), ESP.getFlashChipSize() / 1024 }); - // Please check what is supported for the ESP32 - writer.write({ F("flash_speed"), LabelType::FLASH_CHIP_SPEED }); + } + { + auto writer = mainLevelWriter.createChild(F("esp")); - writer.write({ F("mode"), getFlashChipMode() }); + if (writer) { + writer->write({ F("chip_id"), LabelType::ESP_CHIP_ID }); + writer->write({ F("cpu"), LabelType::ESP_CHIP_FREQ }); +# ifdef ESP32 + writer->write({ F("xtal_freq"), LabelType::ESP_CHIP_XTAL_FREQ }); + writer->write({ F("abp_freq"), LabelType::ESP_CHIP_APB_FREQ }); +# endif // ifdef ESP32 + writer->write({ F("board"), LabelType::BOARD_NAME }); + } + } + { + auto writer = mainLevelWriter.createChild(F("storage")); - writer.write({ F("writes"), RTC.flashDayCounter }); - writer.write({ F("flash_counter"), RTC.flashCounter }); - writer.write({ F("sketch_size"), getSketchSize() / 1024 }); - writer.write({ F("sketch_free"), getFreeSketchSpace() / 1024 }); + if (writer) { + // Set to HEX may be something like 0x1640E0. + // Where manufacturer is 0xE0 and device is 0x4016. + writer->write({ F("chip_id"), LabelType::FLASH_CHIP_ID }); - writer.write({ F("spiffs_size"), SpiffsTotalBytes() / 1024 }); - writer.write({ F("spiffs_free"), SpiffsFreeSpace() / 1024 }); + if (flashChipVendorPuya()) { + if (puyaSupport()) { + writer->write({ F("vendor"), F("puya, supported") }); + } else { + writer->write({ F("vendor"), F("puya, error") }); + } + } else { + writer->write({ F("vendor"), LabelType::FLASH_CHIP_VENDOR }); + } + writer->write({ F("device"), LabelType::FLASH_CHIP_MODEL }); + writer->write({ F("real_size"), getFlashRealSizeInBytes() / 1024 }); + writer->write({ F("ide_size"), ESP.getFlashChipSize() / 1024 }); + // Please check what is supported for the ESP32 + writer->write({ F("flash_speed"), LabelType::FLASH_CHIP_SPEED }); + + writer->write({ F("mode"), getFlashChipMode() }); + + writer->write({ F("writes"), RTC.flashDayCounter }); + writer->write({ F("flash_counter"), RTC.flashCounter }); + writer->write({ F("sketch_size"), getSketchSize() / 1024 }); + writer->write({ F("sketch_free"), getFreeSketchSpace() / 1024 }); + + writer->write({ F("spiffs_size"), SpiffsTotalBytes() / 1024 }); + writer->write({ F("spiffs_free"), SpiffsFreeSpace() / 1024 }); + } } } From 8bc6f4de3e1b7760e5a845bf658e92eb6ba76186 Mon Sep 17 00:00:00 2001 From: TD-er Date: Fri, 3 Oct 2025 23:48:24 +0200 Subject: [PATCH 323/564] [JSON] Use new createChild function --- src/src/Helpers/KeyValueWriter.h | 6 + src/src/Helpers/KeyValueWriter_child.cpp | 37 + src/src/WebServer/CacheControllerPages.cpp | 77 +- src/src/WebServer/JSON.cpp | 825 +++++++++++---------- src/src/WebServer/JSON.h | 2 +- src/src/WebServer/Log.cpp | 119 +-- src/src/WebServer/NetworkPage.cpp | 16 +- src/src/WebServer/NetworkPage.h | 4 +- 8 files changed, 600 insertions(+), 486 deletions(-) diff --git a/src/src/Helpers/KeyValueWriter.h b/src/src/Helpers/KeyValueWriter.h index 57cb84aa0..37046bb93 100644 --- a/src/src/Helpers/KeyValueWriter.h +++ b/src/src/Helpers/KeyValueWriter.h @@ -179,9 +179,15 @@ public: virtual void indent() const {} + // Create writer of the same derived type, with this set as parent Sp_KeyValueWriter createChild(); Sp_KeyValueWriter createChild(const String& header); + // Create new writer of the same derived type, without parent + Sp_KeyValueWriter createNew(); + Sp_KeyValueWriter createNew(const String& header); + + protected: const int _writerType = KEYVALUEWRITER_BASE; diff --git a/src/src/Helpers/KeyValueWriter_child.cpp b/src/src/Helpers/KeyValueWriter_child.cpp index afe2df492..cec2f8ae1 100644 --- a/src/src/Helpers/KeyValueWriter_child.cpp +++ b/src/src/Helpers/KeyValueWriter_child.cpp @@ -38,3 +38,40 @@ Sp_KeyValueWriter KeyValueWriter::createChild(const String& header) } return nullptr; } + + +Sp_KeyValueWriter KeyValueWriter::createNew() +{ + switch (_writerType) + { + case KEYVALUEWRITER_BASE: + break; + case KEYVALUEWRITER_JSON: + { + return std::make_shared(); + } + case KEYVALUEWRITER_WEBFORM: + { + return std::make_shared(); + } + } + return nullptr; +} + +Sp_KeyValueWriter KeyValueWriter::createNew(const String& header) +{ + switch (_writerType) + { + case KEYVALUEWRITER_BASE: + break; + case KEYVALUEWRITER_JSON: + { + return std::make_shared(header); + } + case KEYVALUEWRITER_WEBFORM: + { + return std::make_shared(header); + } + } + return nullptr; +} diff --git a/src/src/WebServer/CacheControllerPages.cpp b/src/src/WebServer/CacheControllerPages.cpp index 721349ac5..c8a31c6e3 100644 --- a/src/src/WebServer/CacheControllerPages.cpp +++ b/src/src/WebServer/CacheControllerPages.cpp @@ -94,61 +94,72 @@ void handle_cache_json() { TXBuffer.startJsonStream(); { - KeyValueWriter_JSON writer(true); + KeyValueWriter_JSON mainLevelWriter(true); { - KeyValueWriter_JSON columnWriter(F("columns"), &writer); - columnWriter.setIsArray(); + auto writer = mainLevelWriter.createChild(F("columns")); - // addHtml(F("UNIX timestamp;contr. idx;sensortype;taskindex;value count")); - columnWriter.write({ EMPTY_STRING, F("UNIX timestamp") }); - columnWriter.write({ EMPTY_STRING, F("UTC timestamp") }); - columnWriter.write({ EMPTY_STRING, F("task index") }); + if (writer) { - if (hasArg(F("pluginID"))) { - columnWriter.write({ EMPTY_STRING, F("plugin ID") }); - } + writer->setIsArray(); - for (taskIndex_t i = 0; i < TASKS_MAX; ++i) { - for (int j = 0; j < VARS_PER_TASK; ++j) { - columnWriter.write({ EMPTY_STRING, strformat( - F("%s#%s"), - getTaskDeviceName(i).c_str(), - getTaskValueName(i, j).c_str())}); + // addHtml(F("UNIX timestamp;contr. idx;sensortype;taskindex;value count")); + writer->write({ EMPTY_STRING, F("UNIX timestamp") }); + writer->write({ EMPTY_STRING, F("UTC timestamp") }); + writer->write({ EMPTY_STRING, F("task index") }); + + if (hasArg(F("pluginID"))) { + writer->write({ EMPTY_STRING, F("plugin ID") }); + } + + for (taskIndex_t i = 0; i < TASKS_MAX; ++i) { + for (int j = 0; j < VARS_PER_TASK; ++j) { + writer->write({ EMPTY_STRING, strformat( + F("%s#%s"), + getTaskDeviceName(i).c_str(), + getTaskValueName(i, j).c_str()) }); + } } } } int fileCount = 0; { - KeyValueWriter_JSON filesWriter(F("files"), &writer); - filesWriter.setIsArray(); - bool islast = false; - int filenr = 0; + auto writer = mainLevelWriter.createChild(F("files")); - while (!islast) { - const String currentFile = C016_getCacheFileName(filenr, islast); - ++filenr; + if (writer) { + writer->setIsArray(); + bool islast = false; + int filenr = 0; - if (currentFile.length() > 0) { - ++fileCount; - filesWriter.write({ EMPTY_STRING, currentFile }); + while (!islast) { + const String currentFile = C016_getCacheFileName(filenr, islast); + ++filenr; + + if (currentFile.length() > 0) { + ++fileCount; + writer->write({ EMPTY_STRING, currentFile }); + } } } } { - KeyValueWriter_JSON pluginIDWriter(F("pluginID"), &writer); - pluginIDWriter.setIsArray(); + auto writer = mainLevelWriter.createChild(F("pluginID")); - for (taskIndex_t taskIndex = 0; validTaskIndex(taskIndex); ++taskIndex) { - pluginIDWriter.write({ EMPTY_STRING, getPluginID_from_TaskIndex(taskIndex).value }); + if (writer) { + writer->setIsArray(); + + for (taskIndex_t taskIndex = 0; validTaskIndex(taskIndex); ++taskIndex) { + writer->write({ EMPTY_STRING, getPluginID_from_TaskIndex(taskIndex).value }); + } } } - writer.write({ F("separator"), F(";") }); - writer.write({ F("nrfiles"), fileCount }); + mainLevelWriter.write({ F("separator"), F(";") }); + mainLevelWriter.write({ F("nrfiles"), fileCount }); } TXBuffer.endStream(); } -void handle_cache_csv() { if (!isLoggedIn()) { return; } +void handle_cache_csv() { + if (!isLoggedIn()) { return; } } #endif // ifdef USES_C016 diff --git a/src/src/WebServer/JSON.cpp b/src/src/WebServer/JSON.cpp index f6c82e88d..f2a558f2f 100644 --- a/src/src/WebServer/JSON.cpp +++ b/src/src/WebServer/JSON.cpp @@ -127,32 +127,32 @@ void handle_json() bool showSystem = true; bool showWifi = true; - #if FEATURE_ETHERNET +#if FEATURE_ETHERNET bool showEthernet = true; - #endif // if FEATURE_ETHERNET +#endif // if FEATURE_ETHERNET bool showDataAcquisition = true; bool showTaskDetails = true; - #if FEATURE_ESPEASY_P2P +#if FEATURE_ESPEASY_P2P bool showNodes = true; - #endif - #if FEATURE_PLUGIN_STATS +#endif +#if FEATURE_PLUGIN_STATS bool showPluginStats = getFormItemInt(F("showpluginstats"), 0) != 0; - #endif +#endif if (equals(webArg(F("view")), F("sensorupdate"))) { showSystem = false; showWifi = false; - #if FEATURE_ETHERNET +#if FEATURE_ETHERNET showEthernet = false; - #endif // if FEATURE_ETHERNET +#endif // if FEATURE_ETHERNET showDataAcquisition = false; showTaskDetails = false; - #if FEATURE_ESPEASY_P2P +#if FEATURE_ESPEASY_P2P showNodes = false; - #endif - #if FEATURE_PLUGIN_STATS +#endif +#if FEATURE_PLUGIN_STATS showPluginStats = hasArg(F("showpluginstats")); - #endif +#endif } TXBuffer.startJsonStream(); @@ -163,184 +163,195 @@ void handle_json() if (!showSpecificTask) { if (showSystem) { - KeyValueWriter_JSON writer(F("System"), &mainLevelWriter); + auto writer = mainLevelWriter.createChild(F("System")); - if (wdcounter > 0) - { - writer.write(LabelType::LOAD_PCT); - writer.write(LabelType::LOOP_COUNT); - } + if (writer) { + + if (wdcounter > 0) + { + writer->write(LabelType::LOAD_PCT); + writer->write(LabelType::LOOP_COUNT); + } - static const LabelType::Enum labels[] PROGMEM = - { - LabelType::BUILD_DESC, - LabelType::GIT_BUILD, - LabelType::SYSTEM_LIBRARIES, + static const LabelType::Enum labels[] PROGMEM = + { + LabelType::BUILD_DESC, + LabelType::GIT_BUILD, + LabelType::SYSTEM_LIBRARIES, #ifdef ESP32 - LabelType::ESP_IDF_SDK_VERSION, + LabelType::ESP_IDF_SDK_VERSION, #endif - LabelType::PLUGIN_COUNT, - LabelType::PLUGIN_DESCRIPTION, - LabelType::BUILD_TIME, - LabelType::BINARY_FILENAME, - LabelType::LOCAL_TIME, - #if FEATURE_EXT_RTC - LabelType::EXT_RTC_UTC_TIME, - #endif - LabelType::TIME_SOURCE, - LabelType::TIME_WANDER, - LabelType::ISNTP, - LabelType::UNIT_NR, - LabelType::UNIT_NAME, - LabelType::UPTIME, - LabelType::UPTIME_MS, + LabelType::PLUGIN_COUNT, + LabelType::PLUGIN_DESCRIPTION, + LabelType::BUILD_TIME, + LabelType::BINARY_FILENAME, + LabelType::LOCAL_TIME, +#if FEATURE_EXT_RTC + LabelType::EXT_RTC_UTC_TIME, +#endif + LabelType::TIME_SOURCE, + LabelType::TIME_WANDER, + LabelType::ISNTP, + LabelType::UNIT_NR, + LabelType::UNIT_NAME, + LabelType::UPTIME, + LabelType::UPTIME_MS, #if FEATURE_INTERNAL_TEMPERATURE - LabelType::INTERNAL_TEMPERATURE, + LabelType::INTERNAL_TEMPERATURE, #endif - LabelType::BOOT_TYPE, - LabelType::RESET_REASON, - LabelType::CPU_ECO_MODE, + LabelType::BOOT_TYPE, + LabelType::RESET_REASON, + LabelType::CPU_ECO_MODE, - #if defined(CORE_POST_2_5_0) || defined(ESP32) - # ifndef LIMIT_BUILD_SIZE - LabelType::HEAP_MAX_FREE_BLOCK, // 7654 - # endif - #endif // if defined(CORE_POST_2_5_0) || defined(ESP32) - #if defined(CORE_POST_2_5_0) - # ifndef LIMIT_BUILD_SIZE - LabelType::HEAP_FRAGMENTATION, // 12 - # endif - #endif // if defined(CORE_POST_2_5_0) - LabelType::FREE_MEM, - #ifdef USE_SECOND_HEAP - LabelType::FREE_HEAP_IRAM, - #endif - LabelType::FREE_STACK, +#if defined(CORE_POST_2_5_0) || defined(ESP32) +# ifndef LIMIT_BUILD_SIZE + LabelType::HEAP_MAX_FREE_BLOCK, // 7654 +# endif +#endif // if defined(CORE_POST_2_5_0) || defined(ESP32) +#if defined(CORE_POST_2_5_0) +# ifndef LIMIT_BUILD_SIZE + LabelType::HEAP_FRAGMENTATION, // 12 +# endif +#endif // if defined(CORE_POST_2_5_0) + LabelType::FREE_MEM, +#ifdef USE_SECOND_HEAP + LabelType::FREE_HEAP_IRAM, +#endif + LabelType::FREE_STACK, - #ifdef ESP32 - LabelType::HEAP_SIZE, - LabelType::HEAP_MIN_FREE, - # ifdef BOARD_HAS_PSRAM - LabelType::PSRAM_SIZE, - LabelType::PSRAM_FREE, - LabelType::PSRAM_MIN_FREE, - LabelType::PSRAM_MAX_FREE_BLOCK, - # endif // BOARD_HAS_PSRAM - #endif // ifdef ESP32 - LabelType::ESP_CHIP_MODEL, - #ifdef ESP32 - LabelType::ESP_CHIP_REVISION, - #endif // ifdef ESP32 - LabelType::FLASH_CHIP_ID, - LabelType::FLASH_CHIP_VENDOR, - LabelType::FLASH_CHIP_MODEL, - LabelType::FLASH_CHIP_REAL_SIZE, - LabelType::FLASH_CHIP_SPEED, - LabelType::FLASH_IDE_MODE, - LabelType::FS_SIZE, +#ifdef ESP32 + LabelType::HEAP_SIZE, + LabelType::HEAP_MIN_FREE, +# ifdef BOARD_HAS_PSRAM + LabelType::PSRAM_SIZE, + LabelType::PSRAM_FREE, + LabelType::PSRAM_MIN_FREE, + LabelType::PSRAM_MAX_FREE_BLOCK, +# endif // BOARD_HAS_PSRAM +#endif // ifdef ESP32 + LabelType::ESP_CHIP_MODEL, +#ifdef ESP32 + LabelType::ESP_CHIP_REVISION, +#endif // ifdef ESP32 + LabelType::FLASH_CHIP_ID, + LabelType::FLASH_CHIP_VENDOR, + LabelType::FLASH_CHIP_MODEL, + LabelType::FLASH_CHIP_REAL_SIZE, + LabelType::FLASH_CHIP_SPEED, + LabelType::FLASH_IDE_MODE, + LabelType::FS_SIZE, - LabelType::SUNRISE, - LabelType::SUNSET, - LabelType::TIMEZONE_OFFSET, - LabelType::LATITUDE, - LabelType::LONGITUDE, - LabelType::SYSLOG_LOG_LEVEL, - LabelType::SERIAL_LOG_LEVEL, - LabelType::WEB_LOG_LEVEL, - #if FEATURE_SD - LabelType::SD_LOG_LEVEL, - #endif // if FEATURE_SD + LabelType::SUNRISE, + LabelType::SUNSET, + LabelType::TIMEZONE_OFFSET, + LabelType::LATITUDE, + LabelType::LONGITUDE, + LabelType::SYSLOG_LOG_LEVEL, + LabelType::SERIAL_LOG_LEVEL, + LabelType::WEB_LOG_LEVEL, +#if FEATURE_SD + LabelType::SD_LOG_LEVEL, +#endif // if FEATURE_SD - LabelType::MAX_LABEL - }; - writer.writeLabels(labels); + LabelType::MAX_LABEL + }; + writer->writeLabels(labels); + } } - if (showWifi) { - KeyValueWriter_JSON writer(F("WiFi"), &mainLevelWriter); + auto writer = mainLevelWriter.createChild(F("WiFi")); + + if (writer) { #ifdef WEBSERVER_NETWORK # ifdef ESP32 - { - KeyValueWriter_JSON writer2(F("Network Interface"), &writer); - write_NetworkAdapterFlags(0, writer2); - } - { - KeyValueWriter_JSON writer2(F("IP Config"), &writer); - write_IP_config(0, writer2); - } + { + auto writer2 = writer->createChild(F("Network Interface")); + + if (writer2) { + write_NetworkAdapterFlags(0, writer2.get()); + } + } + { + auto writer2 = writer->createChild(F("IP Config")); + + if (writer2) { + write_IP_config(0, writer2.get()); + } + } # endif // ifdef ESP32 #endif // ifdef WEBSERVER_NETWORK - static const LabelType::Enum labels[] PROGMEM = - { - LabelType::HOST_NAME, - #if FEATURE_MDNS - LabelType::M_DNS, - #endif // if FEATURE_MDNS - // LabelType::IP_CONFIG, + static const LabelType::Enum labels[] PROGMEM = + { + LabelType::HOST_NAME, +#if FEATURE_MDNS + LabelType::M_DNS, +#endif // if FEATURE_MDNS + // LabelType::IP_CONFIG, #ifdef ESP8266 - LabelType::IP_ADDRESS, + LabelType::IP_ADDRESS, # if FEATURE_USE_IPV6 - LabelType::IP6_LOCAL, - LabelType::IP6_GLOBAL, - LabelType::ENABLE_IPV6, + LabelType::IP6_LOCAL, + LabelType::IP6_GLOBAL, + LabelType::ENABLE_IPV6, # endif // if FEATURE_USE_IPV6 - LabelType::IP_SUBNET, - LabelType::GATEWAY, - LabelType::STA_MAC, - LabelType::DNS_1, - LabelType::DNS_2, + LabelType::IP_SUBNET, + LabelType::GATEWAY, + LabelType::STA_MAC, + LabelType::DNS_1, + LabelType::DNS_2, #endif // ifdef ESP8266 - LabelType::SSID, - LabelType::BSSID, - LabelType::CHANNEL, - LabelType::ENCRYPTION_TYPE_STA, - LabelType::CONNECTED_MSEC, - LabelType::LAST_DISCONNECT_REASON, - LabelType::LAST_DISC_REASON_STR, - LabelType::NUMBER_RECONNECTS, - LabelType::WIFI_STORED_SSID1, - LabelType::WIFI_STORED_SSID2, - LabelType::FORCE_WIFI_BG, - LabelType::RESTART_WIFI_LOST_CONN, - LabelType::FORCE_WIFI_NOSLEEP, + LabelType::SSID, + LabelType::BSSID, + LabelType::CHANNEL, + LabelType::ENCRYPTION_TYPE_STA, + LabelType::CONNECTED_MSEC, + LabelType::LAST_DISCONNECT_REASON, + LabelType::LAST_DISC_REASON_STR, + LabelType::NUMBER_RECONNECTS, + LabelType::WIFI_STORED_SSID1, + LabelType::WIFI_STORED_SSID2, + LabelType::FORCE_WIFI_BG, + LabelType::RESTART_WIFI_LOST_CONN, + LabelType::FORCE_WIFI_NOSLEEP, #ifdef SUPPORT_ARP - LabelType::PERIODICAL_GRAT_ARP, + LabelType::PERIODICAL_GRAT_ARP, #endif // ifdef SUPPORT_ARP #ifdef USES_ESPEASY_NOW - LabelType::USE_ESPEASY_NOW, - LabelType::FORCE_ESPEASY_NOW_CHANNEL, + LabelType::USE_ESPEASY_NOW, + LabelType::FORCE_ESPEASY_NOW_CHANNEL, #endif // ifdef USES_ESPEASY_NOW - LabelType::CONNECTION_FAIL_THRESH, + LabelType::CONNECTION_FAIL_THRESH, #if FEATURE_SET_WIFI_TX_PWR - LabelType::WIFI_TX_MAX_PWR, - LabelType::WIFI_CUR_TX_PWR, - LabelType::WIFI_SENS_MARGIN, - LabelType::WIFI_SEND_AT_MAX_TX_PWR, + LabelType::WIFI_TX_MAX_PWR, + LabelType::WIFI_CUR_TX_PWR, + LabelType::WIFI_SENS_MARGIN, + LabelType::WIFI_SEND_AT_MAX_TX_PWR, #endif // if FEATURE_SET_WIFI_TX_PWR - LabelType::WIFI_NR_EXTRA_SCANS, + LabelType::WIFI_NR_EXTRA_SCANS, #ifdef ESP32 - LabelType::WIFI_PASSIVE_SCAN, + LabelType::WIFI_PASSIVE_SCAN, #endif - LabelType::WIFI_USE_LAST_CONN_FROM_RTC, - LabelType::WIFI_RSSI, + LabelType::WIFI_USE_LAST_CONN_FROM_RTC, + LabelType::WIFI_RSSI, #ifndef ESP32 - LabelType::WAIT_WIFI_CONNECT, + LabelType::WAIT_WIFI_CONNECT, #endif - LabelType::HIDDEN_SSID_SLOW_CONNECT, - LabelType::CONNECT_HIDDEN_SSID, - LabelType::SDK_WIFI_AUTORECONNECT, + LabelType::HIDDEN_SSID_SLOW_CONNECT, + LabelType::CONNECT_HIDDEN_SSID, + LabelType::SDK_WIFI_AUTORECONNECT, - LabelType::MAX_LABEL - }; - writer.writeLabels(labels); + LabelType::MAX_LABEL + }; + writer->writeLabels(labels); - // TODO: PKR: Add ETH Objects + // TODO: PKR: Add ETH Objects + } } #if FEATURE_ETHERNET @@ -360,8 +371,11 @@ void handle_json() LabelType::MAX_LABEL }; - KeyValueWriter_JSON writer(F("Ethernet"), &mainLevelWriter); - writer.writeLabels(labels); + auto writer = mainLevelWriter.createChild(F("Ethernet")); + + if (writer) { + writer->writeLabels(labels); + } } #endif // if FEATURE_ETHERNET @@ -369,53 +383,58 @@ void handle_json() #if FEATURE_ESPEASY_P2P if (showNodes) { - KeyValueWriter_JSON nodesWriter(F("nodes"), &mainLevelWriter); - nodesWriter.setIsArray(); + auto nodesWriter = mainLevelWriter.createChild(F("nodes")); - for (auto it = Nodes.begin(); it != Nodes.end(); ++it) - { - if (it->second.ip[0] != 0) + if (nodesWriter) { + nodesWriter->setIsArray(); + + for (auto it = Nodes.begin(); it != Nodes.end(); ++it) { - KeyValueWriter_JSON writer(&nodesWriter); + if (it->second.ip[0] != 0) + { + auto writer = nodesWriter->createChild(); - writer.write({ F("nr"), it->first }); - writer.write({ F("name"), - (it->first != Settings.Unit) ? it->second.getNodeName() : Settings.getName() }); + if (writer) { + writer->write({ F("nr"), it->first }); + writer->write({ F("name"), + (it->first != Settings.Unit) ? it->second.getNodeName() : Settings.getName() }); - if (it->second.build) { - writer.write({ F("build"), formatSystemBuildNr(it->second.build) }); - } + if (it->second.build) { + writer->write({ F("build"), formatSystemBuildNr(it->second.build) }); + } - if (it->second.nodeType) { - writer.write({ F("platform"), it->second.getNodeTypeDisplayString() }); - } - const int8_t rssi = it->second.getRSSI(); + if (it->second.nodeType) { + writer->write({ F("platform"), it->second.getNodeTypeDisplayString() }); + } + const int8_t rssi = it->second.getRSSI(); - if (rssi < 0) { - writer.write({ F("rssi"), rssi }); - } + if (rssi < 0) { + writer->write({ F("rssi"), rssi }); + } - if (it->second.build >= 20107) { - writer.write({ F("load"), toString(it->second.getLoad(), 2) }); + if (it->second.build >= 20107) { + writer->write({ F("load"), toString(it->second.getLoad(), 2) }); - if (it->second.webgui_portnumber != 80) { - writer.write({ F("webport"), it->second.webgui_portnumber }); - } - } - writer.write({ F("ip"), formatIP(it->second.IP()) }); + if (it->second.webgui_portnumber != 80) { + writer->write({ F("webport"), it->second.webgui_portnumber }); + } + } + writer->write({ F("ip"), formatIP(it->second.IP()) }); # if FEATURE_USE_IPV6 - if (it->second.hasIPv6_mac_based_link_local) { - writer.write({ F("ipv6local"), formatIP(it->second.IPv6_link_local(true), true) }); - } + if (it->second.hasIPv6_mac_based_link_local) { + writer->write({ F("ipv6local"), formatIP(it->second.IPv6_link_local(true), true) }); + } - if (it->second.hasIPv6_mac_based_link_global) { - writer.write({ F("ipv6global"), formatIP(it->second.IPv6_global()) }); - } + if (it->second.hasIPv6_mac_based_link_global) { + writer->write({ F("ipv6global"), formatIP(it->second.IPv6_global()) }); + } # endif // if FEATURE_USE_IPV6 - writer.write({ F("age"), it->second.getAge() }); - } // if node info exists - } // for loop + writer->write({ F("age"), it->second.getAge() }); + } // if node info exists + } // for loop + } + } } #endif // if FEATURE_ESPEASY_P2P } @@ -439,221 +458,236 @@ void handle_json() // Keep track of the lowest reported TTL and use that as refresh interval. unsigned long lowest_ttl_json = 60; { - KeyValueWriter_JSON sensorsWriter = showSpecificTask - ? KeyValueWriter_JSON() - : KeyValueWriter_JSON(F("Sensors"), &mainLevelWriter); + auto sensorsWriter = showSpecificTask + ? mainLevelWriter.createNew() + : mainLevelWriter.createChild(F("Sensors")); - if (!showSpecificTask) { - sensorsWriter.setIsArray(); - } + if (sensorsWriter) { - for (taskIndex_t TaskIndex = firstTaskIndex; TaskIndex <= lastActiveTaskIndex && validTaskIndex(TaskIndex); TaskIndex++) - { - const deviceIndex_t DeviceIndex = getDeviceIndex_from_TaskIndex(TaskIndex); + if (!showSpecificTask) { + sensorsWriter->setIsArray(); + } - if (validDeviceIndex(DeviceIndex)) + for (taskIndex_t TaskIndex = firstTaskIndex; TaskIndex <= lastActiveTaskIndex && validTaskIndex(TaskIndex); TaskIndex++) { - const unsigned long taskInterval = Settings.TaskDeviceTimer[TaskIndex]; + const deviceIndex_t DeviceIndex = getDeviceIndex_from_TaskIndex(TaskIndex); - KeyValueWriter_JSON taskWriter(&sensorsWriter); + if (validDeviceIndex(DeviceIndex)) + { + const unsigned long taskInterval = Settings.TaskDeviceTimer[TaskIndex]; - // LoadTaskSettings(TaskIndex); + auto taskWriter = sensorsWriter->createChild(); - unsigned long ttl_json = 60; // Default value + if (taskWriter) { - // For simplicity, do the optional values first. - const uint8_t valueCount = getValueCountForTask(TaskIndex); + // LoadTaskSettings(TaskIndex); - if (valueCount != 0) { - if (Settings.TaskDeviceEnabled[TaskIndex]) { - if (taskInterval == 0) { - ttl_json = 1; - } else { - ttl_json = taskInterval; - } + unsigned long ttl_json = 60; // Default value - if (ttl_json < lowest_ttl_json) { - lowest_ttl_json = ttl_json; - } - } - KeyValueWriter_JSON taskValueWriter(F("TaskValues"), &taskWriter); - taskValueWriter.setIsArray(); + // For simplicity, do the optional values first. + const uint8_t valueCount = getValueCountForTask(TaskIndex); - struct EventStruct TempEvent(TaskIndex); - - for (uint8_t x = 0; x < valueCount; x++) - { - uint8_t nrDecimals = Cache.getTaskDeviceValueDecimals(TaskIndex, x); - String value = formatUserVarNoCheck(&TempEvent, x); -#if FEATURE_STRING_VARIABLES - bool hasPresentation; - const String presentation = formatUserVarForPresentation(&TempEvent, x, hasPresentation, value, DeviceIndex); -#endif // if FEATURE_STRING_VARIABLES - - if (mustConsiderAsJSONString(value)) { - // Flag as not to treat as a float - nrDecimals = 255; - } -#if FEATURE_TASKVALUE_UNIT_OF_MEASURE - String uom; - const uint8_t uomIndex = Cache.getTaskVarUnitOfMeasure(TaskIndex, x); - - if (uomIndex != 0) { - uom = toUnitOfMeasureName(uomIndex); - } -#else // if FEATURE_TASKVALUE_UNIT_OF_MEASURE - const String uom; -#endif // if FEATURE_TASKVALUE_UNIT_OF_MEASURE - handle_json_stream_task_value_data(&taskValueWriter, - x + 1, - Cache.getTaskDeviceValueName(TaskIndex, x), - nrDecimals, - value, - #if FEATURE_STRING_VARIABLES - presentation, - #else // if FEATURE_STRING_VARIABLES - EMPTY_STRING, - #endif // if FEATURE_STRING_VARIABLES - uom); - } -#if FEATURE_STRING_VARIABLES - - if (Settings.ShowDerivedTaskValues(TaskIndex)) { - int varNr = VARS_PER_TASK; - String taskName = getTaskDeviceName(TaskIndex); - taskName.toLowerCase(); - String postfix; - const String search = getDerivedValueSearchAndPostfix(taskName, postfix); - - auto it = customStringVar.begin(); - - while (it != customStringVar.end()) { - if (it->first.startsWith(search) && it->first.endsWith(postfix)) { - String valueName = it->first.substring(search.length(), it->first.indexOf('-')); - String uom; - String vType; - const String vname2 = getDerivedValueNameUomAndVType(taskName, valueName, uom, vType); - - if (!vname2.isEmpty()) { - valueName = vname2; + if (valueCount != 0) { + if (Settings.TaskDeviceEnabled[TaskIndex]) { + if (taskInterval == 0) { + ttl_json = 1; + } else { + ttl_json = taskInterval; } - if (!it->second.isEmpty()) { - String value(it->second); - stripEscapeCharacters(value); - value = parseTemplate(value); - uint8_t nrDecimals = 255; // FIXME Use the minimal number of decimals needed - bool hasPresentation; - const String presentation = - formatUserVarForPresentation(&TempEvent, - INVALID_TASKVAR_INDEX, - hasPresentation, - value, - DeviceIndex, - valueName); + if (ttl_json < lowest_ttl_json) { + lowest_ttl_json = ttl_json; + } + } + auto taskValueWriter = taskWriter->createChild(F("TaskValues")); - handle_json_stream_task_value_data(&taskValueWriter, - varNr + 1, - valueName, + if (taskValueWriter) { + taskValueWriter->setIsArray(); + + struct EventStruct TempEvent(TaskIndex); + + for (uint8_t x = 0; x < valueCount; x++) + { + uint8_t nrDecimals = Cache.getTaskDeviceValueDecimals(TaskIndex, x); + String value = formatUserVarNoCheck(&TempEvent, x); +#if FEATURE_STRING_VARIABLES + bool hasPresentation; + const String presentation = formatUserVarForPresentation(&TempEvent, x, hasPresentation, value, DeviceIndex); +#endif // if FEATURE_STRING_VARIABLES + + if (mustConsiderAsJSONString(value)) { + // Flag as not to treat as a float + nrDecimals = 255; + } +#if FEATURE_TASKVALUE_UNIT_OF_MEASURE + String uom; + const uint8_t uomIndex = Cache.getTaskVarUnitOfMeasure(TaskIndex, x); + + if (uomIndex != 0) { + uom = toUnitOfMeasureName(uomIndex); + } +#else // if FEATURE_TASKVALUE_UNIT_OF_MEASURE + const String uom; +#endif // if FEATURE_TASKVALUE_UNIT_OF_MEASURE + handle_json_stream_task_value_data(taskValueWriter.get(), + x + 1, + Cache.getTaskDeviceValueName(TaskIndex, x), nrDecimals, value, +#if FEATURE_STRING_VARIABLES presentation, - uom); - ++varNr; - } - } - else if (it->first.substring(0, search.length()).compareTo(search) > 0) { - break; - } - ++it; - } - } +#else // if FEATURE_STRING_VARIABLES + EMPTY_STRING, #endif // if FEATURE_STRING_VARIABLES - } + uom); + } +#if FEATURE_STRING_VARIABLES + + if (Settings.ShowDerivedTaskValues(TaskIndex)) { + int varNr = VARS_PER_TASK; + String taskName = getTaskDeviceName(TaskIndex); + taskName.toLowerCase(); + String postfix; + const String search = getDerivedValueSearchAndPostfix(taskName, postfix); + + auto it = customStringVar.begin(); + + while (it != customStringVar.end()) { + if (it->first.startsWith(search) && it->first.endsWith(postfix)) { + String valueName = it->first.substring(search.length(), it->first.indexOf('-')); + String uom; + String vType; + const String vname2 = getDerivedValueNameUomAndVType(taskName, valueName, uom, vType); + + if (!vname2.isEmpty()) { + valueName = vname2; + } + + if (!it->second.isEmpty()) { + String value(it->second); + stripEscapeCharacters(value); + value = parseTemplate(value); + uint8_t nrDecimals = 255; // FIXME Use the minimal number of decimals needed + bool hasPresentation; + const String presentation = + formatUserVarForPresentation(&TempEvent, + INVALID_TASKVAR_INDEX, + hasPresentation, + value, + DeviceIndex, + valueName); + + handle_json_stream_task_value_data(taskValueWriter.get(), + varNr + 1, + valueName, + nrDecimals, + value, + presentation, + uom); + ++varNr; + } + } + else if (it->first.substring(0, search.length()).compareTo(search) > 0) { + break; + } + ++it; + } + } +#endif // if FEATURE_STRING_VARIABLES + } + } #if FEATURE_PLUGIN_STATS && FEATURE_CHART_JS - if (showPluginStats && Device[DeviceIndex].PluginStats) { - PluginTaskData_base *taskData = getPluginTaskDataBaseClassOnly(TaskIndex); + if (showPluginStats && Device[DeviceIndex].PluginStats) { + PluginTaskData_base *taskData = getPluginTaskDataBaseClassOnly(TaskIndex); - if ((taskData != nullptr) && (taskData->nrSamplesPresent() > 0)) { - addHtml(F("\"PluginStats\":\n")); - taskData->plot_ChartJS(true); - stream_comma_newline(); - } - } + if ((taskData != nullptr) && (taskData->nrSamplesPresent() > 0)) { + addHtml(F("\"PluginStats\":\n")); + taskData->plot_ChartJS(true); + stream_comma_newline(); + } + } #endif // if FEATURE_PLUGIN_STATS && FEATURE_CHART_JS - if (showDataAcquisition) { - KeyValueWriter_JSON dataAquisitionWriter(F("DataAcquisition"), &taskWriter); - dataAquisitionWriter.setIsArray(); + if (showDataAcquisition) { + auto dataAquisitionWriter = taskWriter->createChild(F("DataAcquisition")); - for (controllerIndex_t x = 0; x < CONTROLLER_MAX; x++) - { - KeyValueWriter_JSON controllerWriter(&dataAquisitionWriter); - controllerWriter.write({ F("Controller"), x + 1 }); - controllerWriter.write({ F("IDX"), Settings.TaskDeviceID[x][TaskIndex] }); - controllerWriter.write({ F("Enabled"), Settings.TaskDeviceSendData[x][TaskIndex] }); - } - } + if (dataAquisitionWriter) { + dataAquisitionWriter->setIsArray(); - if (showTaskDetails) { - taskWriter.write({ F("TaskInterval"), taskInterval }); - taskWriter.write({ F("Type"), getPluginNameFromDeviceIndex(DeviceIndex) }); - taskWriter.write({ F("TaskName"), getTaskDeviceName(TaskIndex) }); - taskWriter.write({ F("TaskDeviceNumber"), Settings.getPluginID_for_task(TaskIndex).value }); + for (controllerIndex_t x = 0; x < CONTROLLER_MAX; x++) + { + auto controllerWriter = dataAquisitionWriter->createChild(); - for (int i = 0; i < 3; i++) { - if (Settings.TaskDevicePin[i][TaskIndex] >= 0) { - taskWriter.write({ concat(F("TaskDeviceGPIO"), i + 1), static_cast(Settings.TaskDevicePin[i][TaskIndex]) }); - } - } - -#if FEATURE_I2CMULTIPLEXER - uint8_t i2cBus = 0; -# if FEATURE_I2C_MULTIPLE - i2cBus = Settings.getI2CInterface(TaskIndex); -# endif - - if ((Device[DeviceIndex].Type == DEVICE_TYPE_I2C) && isI2CMultiplexerEnabled(i2cBus)) { -# if FEATURE_I2C_MULTIPLE - taskWriter.write({ F("I2C_Interface"), static_cast(i2cBus + 1) }); -# endif - int8_t channel = Settings.I2C_Multiplexer_Channel[TaskIndex]; - - if (bitRead(Settings.I2C_Flags[TaskIndex], I2C_FLAGS_MUX_MULTICHANNEL)) { - - KeyValueStruct kv(F("I2CBus")); - - addHtml(F("\"I2CBus\" : [")); - - for (uint8_t c = 0; c < I2CMultiplexerMaxChannels(i2cBus); ++c) { - if (bitRead(channel, c)) { - kv.appendValue(strformat(F("Multiplexer channel %d"), c)); + if (controllerWriter) { + controllerWriter->write({ F("Controller"), x + 1 }); + controllerWriter->write({ F("IDX"), Settings.TaskDeviceID[x][TaskIndex] }); + controllerWriter->write({ F("Enabled"), Settings.TaskDeviceSendData[x][TaskIndex] }); + } } } - taskWriter.write(kv); - } else { - if (channel == -1) { - taskWriter.write({ F("I2Cbus"), F("Standard I2C bus") }); - } else { - taskWriter.write({ F("I2Cbus"), concat(F("Multiplexer channel "), channel) }); + } + + if (showTaskDetails) { + taskWriter->write({ F("TaskInterval"), taskInterval }); + taskWriter->write({ F("Type"), getPluginNameFromDeviceIndex(DeviceIndex) }); + taskWriter->write({ F("TaskName"), getTaskDeviceName(TaskIndex) }); + taskWriter->write({ F("TaskDeviceNumber"), Settings.getPluginID_for_task(TaskIndex).value }); + + for (int i = 0; i < 3; i++) { + if (Settings.TaskDevicePin[i][TaskIndex] >= 0) { + taskWriter->write({ concat(F("TaskDeviceGPIO"), i + 1), static_cast(Settings.TaskDevicePin[i][TaskIndex]) }); + } } + +#if FEATURE_I2CMULTIPLEXER + uint8_t i2cBus = 0; +# if FEATURE_I2C_MULTIPLE + i2cBus = Settings.getI2CInterface(TaskIndex); +# endif + + if ((Device[DeviceIndex].Type == DEVICE_TYPE_I2C) && isI2CMultiplexerEnabled(i2cBus)) { +# if FEATURE_I2C_MULTIPLE + taskWriter->write({ F("I2C_Interface"), static_cast(i2cBus + 1) }); +# endif + int8_t channel = Settings.I2C_Multiplexer_Channel[TaskIndex]; + + if (bitRead(Settings.I2C_Flags[TaskIndex], I2C_FLAGS_MUX_MULTICHANNEL)) { + + KeyValueStruct kv(F("I2CBus")); + + addHtml(F("\"I2CBus\" : [")); + + for (uint8_t c = 0; c < I2CMultiplexerMaxChannels(i2cBus); ++c) { + if (bitRead(channel, c)) { + kv.appendValue(strformat(F("Multiplexer channel %d"), c)); + } + } + taskWriter->write(kv); + } else { + if (channel == -1) { + taskWriter->write({ F("I2Cbus"), F("Standard I2C bus") }); + } else { + taskWriter->write({ F("I2Cbus"), concat(F("Multiplexer channel "), channel) }); + } + } + } +#endif // if FEATURE_I2CMULTIPLEXER + } + + taskWriter->write({ F("TaskEnabled"), + Settings.TaskDeviceEnabled[TaskIndex] }); + taskWriter->write({ F("TaskNumber"), TaskIndex + 1 }); + + if (showSpecificTask) { +#if FEATURE_TASKVALUE_UNIT_OF_MEASURE + taskWriter->write({ F("ShowUoM"), Settings.ShowUnitOfMeasureOnDevicesPage() }); +#endif // if FEATURE_TASKVALUE_UNIT_OF_MEASURE + taskWriter->write({ F("TTL"), ttl_json * 1000 }); } } -#endif // if FEATURE_I2CMULTIPLEXER - } - - taskWriter.write({ F("TaskEnabled"), - Settings.TaskDeviceEnabled[TaskIndex] }); - taskWriter.write({ F("TaskNumber"), TaskIndex + 1 }); - - if (showSpecificTask) { -#if FEATURE_TASKVALUE_UNIT_OF_MEASURE - taskWriter.write({ F("ShowUoM"), Settings.ShowUnitOfMeasureOnDevicesPage() }); -#endif // if FEATURE_TASKVALUE_UNIT_OF_MEASURE - taskWriter.write({ F("TTL"), ttl_json * 1000 }); } } } @@ -671,29 +705,32 @@ void handle_json() STOP_TIMER(HANDLE_SERVING_WEBPAGE_JSON); } -void handle_json_stream_task_value_data(KeyValueWriter_JSON*parent, - uint16_t valueNumber, - const String & valueName, - uint8_t nrDecimals, - const String & value, - const String & presentation, - const String & uom) { - KeyValueWriter_JSON writer(parent); +void handle_json_stream_task_value_data(KeyValueWriter*parent, + uint16_t valueNumber, + const String & valueName, + uint8_t nrDecimals, + const String & value, + const String & presentation, + const String & uom) +{ + auto writer = parent->createChild(); - writer.write({ F("ValueNumber"), valueNumber }); - writer.write({ F("Name"), valueName }); - writer.write({ F("NrDecimals"), nrDecimals }); - #if FEATURE_STRING_VARIABLES + if (writer) { + writer->write({ F("ValueNumber"), valueNumber }); + writer->write({ F("Name"), valueName }); + writer->write({ F("NrDecimals"), nrDecimals }); +#if FEATURE_STRING_VARIABLES - if (!presentation.isEmpty()) { - writer.write({ F("Presentation"), presentation }); + if (!presentation.isEmpty()) { + writer->write({ F("Presentation"), presentation }); + } +#endif // if FEATURE_STRING_VARIABLES + + if (!uom.isEmpty()) { + writer->write({ F("UoM"), uom }); + } + writer->write({ F("Value"), value }); } - #endif // if FEATURE_STRING_VARIABLES - - if (!uom.isEmpty()) { - writer.write({ F("UoM"), uom }); - } - writer.write({ F("Value"), value }); } // ******************************************************************************** @@ -838,8 +875,9 @@ void stream_to_json_object_value(const String& object, int value) { String jsonBool(bool value) { return boolToString(value); } #ifdef WEBSERVER_NEW_UI + // Add JSON formatted data directly to the TXbuffer, including a trailing comma. -void stream_next_json_object_value(const __FlashStringHelper *object, const String& value) { +void stream_next_json_object_value(const __FlashStringHelper *object, const String& value) { stream_to_json_object_value(object, value); stream_comma_newline(); } @@ -911,4 +949,5 @@ void stream_last_json_object_value(const __FlashStringHelper *object, int value) void stream_next_json_object_value(LabelType::Enum label) { stream_next_json_object_value(getLabel(label), getValue(label)); } void stream_last_json_object_value(LabelType::Enum label) { stream_last_json_object_value(getLabel(label), getValue(label)); } -#endif \ No newline at end of file + +#endif // ifdef WEBSERVER_NEW_UI diff --git a/src/src/WebServer/JSON.h b/src/src/WebServer/JSON.h index cb1093e5e..5f99bb3a9 100644 --- a/src/src/WebServer/JSON.h +++ b/src/src/WebServer/JSON.h @@ -18,7 +18,7 @@ void handle_csvval(); // ******************************************************************************** void handle_json(); -void handle_json_stream_task_value_data(KeyValueWriter_JSON* parent, +void handle_json_stream_task_value_data(KeyValueWriter* parent, uint16_t valueNumber, const String & valueName, uint8_t nrDecimals, diff --git a/src/src/WebServer/Log.cpp b/src/src/WebServer/Log.cpp index 280e07d8a..d74410643 100644 --- a/src/src/WebServer/Log.cpp +++ b/src/src/WebServer/Log.cpp @@ -54,69 +54,88 @@ void handle_log_JSON() { KeyValueWriter_JSON top(true); { String webrequest = webArg(F("view")); - KeyValueWriter_JSON mainWriter(F("Log"), &top); - if (equals(webrequest, F("legend"))) { - KeyValueWriter_JSON legendWriter(F("Legend"), &mainWriter); - legendWriter.setIsArray(); + auto mainWriter = top.createChild(F("Log")); - for (uint8_t i = 0; i < LOG_LEVEL_NRELEMENTS; ++i) { - KeyValueWriter_JSON loglevelWriter(&legendWriter); - int loglevel; - loglevelWriter.write({ F("label"), getLogLevelDisplayStringFromIndex(i, loglevel) }); - loglevelWriter.write({ F("loglevel"), loglevel }); - } - } - unsigned long firstTimeStamp = 0; - unsigned long lastTimeStamp = 0; - int nrEntries = 0; + if (mainWriter) { - { - KeyValueWriter_JSON entriesWriter(F("Entries"), &mainWriter); - entriesWriter.setIsArray(); - bool logLinesAvailable = true; + if (equals(webrequest, F("legend"))) { - while (logLinesAvailable) { - String message; - uint8_t loglevel; + auto legendWriter = mainWriter->createChild(F("Legend")); - if (Logging.getNext(logLinesAvailable, lastTimeStamp, message, loglevel)) { - KeyValueWriter_JSON logWriter(&entriesWriter); - logWriter.write({ F("timestamp"), lastTimeStamp }); - logWriter.write({ F("text"), std::move(message) }); - logWriter.write({ F("level"), loglevel }); + if (legendWriter) { + legendWriter->setIsArray(); - if (nrEntries == 0) { - firstTimeStamp = lastTimeStamp; + for (uint8_t i = 0; i < LOG_LEVEL_NRELEMENTS; ++i) { + auto loglevelWriter = legendWriter->createChild(); + + if (loglevelWriter) { + + + int loglevel; + loglevelWriter->write({ F("label"), getLogLevelDisplayStringFromIndex(i, loglevel) }); + loglevelWriter->write({ F("loglevel"), loglevel }); + } } - ++nrEntries; } - - // Do we need to do something here and maybe limit number of lines at once? } - } - long logTimeSpan = timeDiff(firstTimeStamp, lastTimeStamp); - long refreshSuggestion = 1000; - long newOptimum = 1000; + unsigned long firstTimeStamp = 0; + unsigned long lastTimeStamp = 0; + int nrEntries = 0; - if ((nrEntries > 2) && (logTimeSpan > 1)) { - // May need to lower the TTL for refresh when time needed - // to fill half the log is lower than current TTL - newOptimum = logTimeSpan * (LOG_STRUCT_MESSAGE_LINES / 2); - newOptimum = newOptimum / (nrEntries - 1); - } + { + auto entriesWriter = mainWriter->createChild(F("Entries")); - if (newOptimum < refreshSuggestion) { refreshSuggestion = newOptimum; } + if (entriesWriter) { + entriesWriter->setIsArray(); + bool logLinesAvailable = true; - if (refreshSuggestion < 100) { - // Reload times no lower than 100 msec. - refreshSuggestion = 100; + while (logLinesAvailable) { + String message; + uint8_t loglevel; + + if (Logging.getNext(logLinesAvailable, lastTimeStamp, message, loglevel)) { + auto logWriter = entriesWriter->createChild(); + + if (logWriter) { + logWriter->write({ F("timestamp"), lastTimeStamp }); + logWriter->write({ F("text"), std::move(message) }); + logWriter->write({ F("level"), loglevel }); + + if (nrEntries == 0) { + firstTimeStamp = lastTimeStamp; + } + ++nrEntries; + } + + // Do we need to do something here and maybe limit number of lines at once? + } + } + } + } + long logTimeSpan = timeDiff(firstTimeStamp, lastTimeStamp); + long refreshSuggestion = 1000; + long newOptimum = 1000; + + if ((nrEntries > 2) && (logTimeSpan > 1)) { + // May need to lower the TTL for refresh when time needed + // to fill half the log is lower than current TTL + newOptimum = logTimeSpan * (LOG_STRUCT_MESSAGE_LINES / 2); + newOptimum = newOptimum / (nrEntries - 1); + } + + if (newOptimum < refreshSuggestion) { refreshSuggestion = newOptimum; } + + if (refreshSuggestion < 100) { + // Reload times no lower than 100 msec. + refreshSuggestion = 100; + } + mainWriter->write({ F("TTL"), refreshSuggestion }); + mainWriter->write({ F("timeHalfBuffer"), newOptimum }); + mainWriter->write({ F("nrEntries"), nrEntries }); + mainWriter->write({ F("SettingsWebLogLevel"), Settings.WebLogLevel }); + mainWriter->write({ F("logTimeSpan"), logTimeSpan }); } - mainWriter.write({ F("TTL"), refreshSuggestion }); - mainWriter.write({ F("timeHalfBuffer"), newOptimum }); - mainWriter.write({ F("nrEntries"), nrEntries }); - mainWriter.write({ F("SettingsWebLogLevel"), Settings.WebLogLevel }); - mainWriter.write({ F("logTimeSpan"), logTimeSpan }); } } TXBuffer.endStream(); diff --git a/src/src/WebServer/NetworkPage.cpp b/src/src/WebServer/NetworkPage.cpp index 07f939ead..b91429217 100644 --- a/src/src/WebServer/NetworkPage.cpp +++ b/src/src/WebServer/NetworkPage.cpp @@ -400,11 +400,11 @@ void handle_networks_NetworkSettingsPage(ESPEasy::net::networkIndex_t networkind { { KeyValueWriter_WebForm writer(F("Network Interface")); - write_NetworkAdapterFlags(networkindex, writer); + write_NetworkAdapterFlags(networkindex, &writer); } { KeyValueWriter_WebForm writer(F("IP Config")); - write_IP_config(networkindex, writer); + write_IP_config(networkindex, &writer); } { String str; @@ -464,8 +464,9 @@ void handle_networks_NetworkSettingsPage(ESPEasy::net::networkIndex_t networkind # ifdef ESP32 -bool write_NetworkAdapterFlags(ESPEasy::net::networkIndex_t networkindex, KeyValueWriter& writer) +bool write_NetworkAdapterFlags(ESPEasy::net::networkIndex_t networkindex, KeyValueWriter* writer) { + if (writer == nullptr) return false; struct EventStruct TempEvent; TempEvent.NetworkIndex = networkindex; @@ -491,7 +492,7 @@ bool write_NetworkAdapterFlags(ESPEasy::net::networkIndex_t networkindex, KeyVal ? std::move(str) : TempEvent.networkInterface->macAddress()); - writer.write(kv); + writer->write(kv); } { @@ -524,13 +525,14 @@ bool write_NetworkAdapterFlags(ESPEasy::net::networkIndex_t networkindex, KeyVal kv.appendValue(labels_str); } } - writer.write(kv); + writer->write(kv); } return true; } -bool write_IP_config(ESPEasy::net::networkIndex_t networkindex, KeyValueWriter& writer) +bool write_IP_config(ESPEasy::net::networkIndex_t networkindex, KeyValueWriter* writer) { + if (writer == nullptr) return false; struct EventStruct TempEvent; TempEvent.NetworkIndex = networkindex; @@ -565,7 +567,7 @@ bool write_IP_config(ESPEasy::net::networkIndex_t networkindex, KeyValueWriter& if (NWPlugin::print_IP_address(ip_types[i], TempEvent.networkInterface, str)) { KeyValueStruct kv(NWPlugin::toString(ip_types[i]), str.get()); kv._value_pre = true; - writer.write(kv); + writer->write(kv); } } return true; diff --git a/src/src/WebServer/NetworkPage.h b/src/src/WebServer/NetworkPage.h index 58d4956a5..578a3735c 100644 --- a/src/src/WebServer/NetworkPage.h +++ b/src/src/WebServer/NetworkPage.h @@ -40,9 +40,9 @@ void handle_networks_ShowAllNetworksTable(); void handle_networks_NetworkSettingsPage(ESPEasy::net::networkIndex_t networkindex); #ifdef ESP32 -bool write_NetworkAdapterFlags(ESPEasy::net::networkIndex_t networkindex, KeyValueWriter& writer); +bool write_NetworkAdapterFlags(ESPEasy::net::networkIndex_t networkindex, KeyValueWriter* writer); -bool write_IP_config(ESPEasy::net::networkIndex_t networkindex, KeyValueWriter& writer); +bool write_IP_config(ESPEasy::net::networkIndex_t networkindex, KeyValueWriter* writer); #endif From 56d2f5bc522edc07a0587903bb8f56008745b22a Mon Sep 17 00:00:00 2001 From: TD-er Date: Sat, 4 Oct 2025 00:41:38 +0200 Subject: [PATCH 324/564] [JSON] Simplify code + reduce build size due to less dependencies --- src/src/Helpers/KeyValueWriter.h | 21 ++---- src/src/Helpers/KeyValueWriter_child.cpp | 77 -------------------- src/src/WebServer/JSON.cpp | 3 + src/src/WebServer/JSON.h | 3 +- src/src/WebServer/KeyValueWriter_JSON.cpp | 35 +++++++-- src/src/WebServer/KeyValueWriter_JSON.h | 9 +++ src/src/WebServer/KeyValueWriter_WebForm.cpp | 35 +++++++-- src/src/WebServer/KeyValueWriter_WebForm.h | 10 +++ 8 files changed, 87 insertions(+), 106 deletions(-) delete mode 100644 src/src/Helpers/KeyValueWriter_child.cpp diff --git a/src/src/Helpers/KeyValueWriter.h b/src/src/Helpers/KeyValueWriter.h index 37046bb93..ecb52ba42 100644 --- a/src/src/Helpers/KeyValueWriter.h +++ b/src/src/Helpers/KeyValueWriter.h @@ -128,9 +128,6 @@ struct KeyValueStruct }; -#define KEYVALUEWRITER_BASE 0 -#define KEYVALUEWRITER_JSON 1 -#define KEYVALUEWRITER_WEBFORM 2 class KeyValueWriter; typedef std::shared_ptr Sp_KeyValueWriter; @@ -142,16 +139,16 @@ class KeyValueWriter { public: - KeyValueWriter(int writerType, bool emptyHeader = false) : _writerType(writerType), _hasHeader(emptyHeader) {} + KeyValueWriter(bool emptyHeader = false) : _hasHeader(emptyHeader) {} protected: - KeyValueWriter(int writerType, KeyValueWriter*parent) : _writerType(writerType), _parent(parent) {} + KeyValueWriter(KeyValueWriter*parent) : _parent(parent) {} - KeyValueWriter(int writerType, bool emptyHeader, KeyValueWriter*parent) : _writerType(writerType), _parent(parent), + KeyValueWriter(bool emptyHeader, KeyValueWriter*parent) : _parent(parent), _hasHeader(emptyHeader) {} - KeyValueWriter(int writerType, const String& header, KeyValueWriter*parent) : _writerType(writerType), _header(header), _parent(parent) {} + KeyValueWriter(const String& header, KeyValueWriter*parent) : _header(header), _parent(parent) {} public: @@ -180,18 +177,16 @@ public: virtual void indent() const {} // Create writer of the same derived type, with this set as parent - Sp_KeyValueWriter createChild(); - Sp_KeyValueWriter createChild(const String& header); + virtual Sp_KeyValueWriter createChild() = 0; + virtual Sp_KeyValueWriter createChild(const String& header) = 0; // Create new writer of the same derived type, without parent - Sp_KeyValueWriter createNew(); - Sp_KeyValueWriter createNew(const String& header); + virtual Sp_KeyValueWriter createNew() = 0; + virtual Sp_KeyValueWriter createNew(const String& header) = 0; protected: - const int _writerType = KEYVALUEWRITER_BASE; - String _header; KeyValueWriter *_parent{}; diff --git a/src/src/Helpers/KeyValueWriter_child.cpp b/src/src/Helpers/KeyValueWriter_child.cpp deleted file mode 100644 index cec2f8ae1..000000000 --- a/src/src/Helpers/KeyValueWriter_child.cpp +++ /dev/null @@ -1,77 +0,0 @@ -#include "../Helpers/KeyValueWriter.h" - -#include "../WebServer/KeyValueWriter_JSON.h" -#include "../WebServer/KeyValueWriter_WebForm.h" - -Sp_KeyValueWriter KeyValueWriter::createChild() -{ - switch (_writerType) - { - case KEYVALUEWRITER_BASE: - break; - case KEYVALUEWRITER_JSON: - { - return std::make_shared(static_cast(this)); - } - case KEYVALUEWRITER_WEBFORM: - { - return std::make_shared(static_cast(this)); - } - } - return nullptr; -} - -Sp_KeyValueWriter KeyValueWriter::createChild(const String& header) -{ - switch (_writerType) - { - case KEYVALUEWRITER_BASE: - break; - case KEYVALUEWRITER_JSON: - { - return std::make_shared(header, static_cast(this)); - } - case KEYVALUEWRITER_WEBFORM: - { - return std::make_shared(header, static_cast(this)); - } - } - return nullptr; -} - - -Sp_KeyValueWriter KeyValueWriter::createNew() -{ - switch (_writerType) - { - case KEYVALUEWRITER_BASE: - break; - case KEYVALUEWRITER_JSON: - { - return std::make_shared(); - } - case KEYVALUEWRITER_WEBFORM: - { - return std::make_shared(); - } - } - return nullptr; -} - -Sp_KeyValueWriter KeyValueWriter::createNew(const String& header) -{ - switch (_writerType) - { - case KEYVALUEWRITER_BASE: - break; - case KEYVALUEWRITER_JSON: - { - return std::make_shared(header); - } - case KEYVALUEWRITER_WEBFORM: - { - return std::make_shared(header); - } - } - return nullptr; -} diff --git a/src/src/WebServer/JSON.cpp b/src/src/WebServer/JSON.cpp index f2a558f2f..5f9c4a86f 100644 --- a/src/src/WebServer/JSON.cpp +++ b/src/src/WebServer/JSON.cpp @@ -851,6 +851,8 @@ void handle_buildinfo() { #endif // WEBSERVER_NEW_UI +#if FEATURE_CHART_JS || defined(WEBSERVER_NEW_UI) + /*********************************************************************************************\ Streaming versions directly to TXBuffer \*********************************************************************************************/ @@ -871,6 +873,7 @@ void stream_to_json_object_value(const String& object, int value) { addHtml(':'); addHtmlInt(value); } +#endif String jsonBool(bool value) { return boolToString(value); } diff --git a/src/src/WebServer/JSON.h b/src/src/WebServer/JSON.h index 5f99bb3a9..c7dd768a7 100644 --- a/src/src/WebServer/JSON.h +++ b/src/src/WebServer/JSON.h @@ -47,11 +47,12 @@ void handle_buildinfo(); /*********************************************************************************************\ Streaming versions directly to TXBuffer \*********************************************************************************************/ +#if FEATURE_CHART_JS || defined(WEBSERVER_NEW_UI) void stream_to_json_object_value(const __FlashStringHelper * object, const String& value); void stream_to_json_object_value(const String& object, const String& value); void stream_to_json_object_value(const __FlashStringHelper * object, int value); void stream_to_json_object_value(const String& object, int value); - +#endif String jsonBool(bool value); #ifdef WEBSERVER_NEW_UI diff --git a/src/src/WebServer/KeyValueWriter_JSON.cpp b/src/src/WebServer/KeyValueWriter_JSON.cpp index 416a275fd..9e3cd2e0a 100644 --- a/src/src/WebServer/KeyValueWriter_JSON.cpp +++ b/src/src/WebServer/KeyValueWriter_JSON.cpp @@ -6,32 +6,32 @@ #include "../WebServer/HTML_wrappers.h" KeyValueWriter_JSON::KeyValueWriter_JSON(bool emptyHeader) - : KeyValueWriter(KEYVALUEWRITER_JSON, emptyHeader) + : KeyValueWriter(emptyHeader) {} KeyValueWriter_JSON::KeyValueWriter_JSON(KeyValueWriter_JSON*parent) - : KeyValueWriter(KEYVALUEWRITER_JSON, parent) + : KeyValueWriter(parent) {} KeyValueWriter_JSON::KeyValueWriter_JSON(bool emptyHeader, KeyValueWriter_JSON*parent) - : KeyValueWriter(KEYVALUEWRITER_JSON, emptyHeader, parent) + : KeyValueWriter(emptyHeader, parent) {} KeyValueWriter_JSON::KeyValueWriter_JSON(const String& header) - : KeyValueWriter(KEYVALUEWRITER_JSON, header, nullptr) + : KeyValueWriter(header, nullptr) {} KeyValueWriter_JSON::KeyValueWriter_JSON(const __FlashStringHelper *header) - : KeyValueWriter(KEYVALUEWRITER_JSON, String(header), nullptr) + : KeyValueWriter(String(header), nullptr) {} KeyValueWriter_JSON::KeyValueWriter_JSON(const String& header, KeyValueWriter_JSON*parent) - : KeyValueWriter(KEYVALUEWRITER_JSON, header, parent) + : KeyValueWriter(header, parent) {} KeyValueWriter_JSON::KeyValueWriter_JSON(const __FlashStringHelper *header, KeyValueWriter_JSON*parent) - : KeyValueWriter(KEYVALUEWRITER_JSON, String(header), parent) + : KeyValueWriter(String(header), parent) {} KeyValueWriter_JSON::~KeyValueWriter_JSON() @@ -143,6 +143,27 @@ void KeyValueWriter_JSON::writeValue(const ValueStruct& val) addHtml(to_json_value(val.str)); } +Sp_KeyValueWriter KeyValueWriter_JSON::createChild() +{ + return std::make_shared(this); +} + +Sp_KeyValueWriter KeyValueWriter_JSON::createChild(const String& header) +{ + return std::make_shared(header, this); +} + +Sp_KeyValueWriter KeyValueWriter_JSON::createNew() +{ + return std::make_shared(); +} + +Sp_KeyValueWriter KeyValueWriter_JSON::createNew(const String& header) +{ + return std::make_shared(header); +} + + #ifdef USE_KVW_JSON_INDENT void KeyValueWriter_JSON::indent() const diff --git a/src/src/WebServer/KeyValueWriter_JSON.h b/src/src/WebServer/KeyValueWriter_JSON.h index 2b08c659c..f7e7ddf45 100644 --- a/src/src/WebServer/KeyValueWriter_JSON.h +++ b/src/src/WebServer/KeyValueWriter_JSON.h @@ -35,6 +35,15 @@ public: virtual void write(const KeyValueStruct& kv); + // Create writer of the same derived type, with this set as parent + virtual Sp_KeyValueWriter createChild(); + virtual Sp_KeyValueWriter createChild(const String& header); + + // Create new writer of the same derived type, without parent + virtual Sp_KeyValueWriter createNew(); + virtual Sp_KeyValueWriter createNew(const String& header); + + private: void writeValue(const ValueStruct& value); diff --git a/src/src/WebServer/KeyValueWriter_WebForm.cpp b/src/src/WebServer/KeyValueWriter_WebForm.cpp index a2d564daa..dcc7006b9 100644 --- a/src/src/WebServer/KeyValueWriter_WebForm.cpp +++ b/src/src/WebServer/KeyValueWriter_WebForm.cpp @@ -1,36 +1,35 @@ #include "../WebServer/KeyValueWriter_WebForm.h" - #include "../WebServer/HTML_wrappers.h" #include "../WebServer/Markup.h" KeyValueWriter_WebForm::KeyValueWriter_WebForm(bool emptyHeader) - : KeyValueWriter(KEYVALUEWRITER_WEBFORM, emptyHeader) + : KeyValueWriter(emptyHeader) {} KeyValueWriter_WebForm::KeyValueWriter_WebForm(KeyValueWriter_WebForm*parent) - : KeyValueWriter(KEYVALUEWRITER_WEBFORM, parent) + : KeyValueWriter(parent) {} KeyValueWriter_WebForm::KeyValueWriter_WebForm(bool emptyHeader, KeyValueWriter_WebForm*parent) - : KeyValueWriter(KEYVALUEWRITER_WEBFORM, emptyHeader, parent) + : KeyValueWriter(emptyHeader, parent) {} KeyValueWriter_WebForm::KeyValueWriter_WebForm(const String& header) - : KeyValueWriter(KEYVALUEWRITER_WEBFORM, header, nullptr) + : KeyValueWriter(header, nullptr) {} KeyValueWriter_WebForm::KeyValueWriter_WebForm(const __FlashStringHelper *header) - : KeyValueWriter(KEYVALUEWRITER_WEBFORM, String(header), nullptr) + : KeyValueWriter(String(header), nullptr) {} KeyValueWriter_WebForm::KeyValueWriter_WebForm(const String& header, KeyValueWriter_WebForm*parent) - : KeyValueWriter(KEYVALUEWRITER_WEBFORM, header, parent) + : KeyValueWriter(header, parent) {} KeyValueWriter_WebForm::KeyValueWriter_WebForm(const __FlashStringHelper *header, KeyValueWriter_WebForm*parent) - : KeyValueWriter(KEYVALUEWRITER_WEBFORM, String(header), parent) + : KeyValueWriter(String(header), parent) {} @@ -70,3 +69,23 @@ void KeyValueWriter_WebForm::write(const KeyValueStruct& kv) addUnit(kv._unit); } } + +Sp_KeyValueWriter KeyValueWriter_WebForm::createChild() +{ + return std::make_shared(this); +} + +Sp_KeyValueWriter KeyValueWriter_WebForm::createChild(const String& header) +{ + return std::make_shared(header, this); +} + +Sp_KeyValueWriter KeyValueWriter_WebForm::createNew() +{ + return std::make_shared(); +} + +Sp_KeyValueWriter KeyValueWriter_WebForm::createNew(const String& header) +{ + return std::make_shared(header); +} diff --git a/src/src/WebServer/KeyValueWriter_WebForm.h b/src/src/WebServer/KeyValueWriter_WebForm.h index 799dd7a92..2daf09841 100644 --- a/src/src/WebServer/KeyValueWriter_WebForm.h +++ b/src/src/WebServer/KeyValueWriter_WebForm.h @@ -2,6 +2,7 @@ #include "../Helpers/KeyValueWriter.h" + class KeyValueWriter_WebForm : public KeyValueWriter { public: @@ -30,4 +31,13 @@ public: virtual void write(const KeyValueStruct& kv); + // Create writer of the same derived type, with this set as parent + virtual Sp_KeyValueWriter createChild(); + virtual Sp_KeyValueWriter createChild(const String& header); + + // Create new writer of the same derived type, without parent + virtual Sp_KeyValueWriter createNew(); + virtual Sp_KeyValueWriter createNew(const String& header); + + }; // class KeyValueWriter_WebForm From ba456d40441e24b9dbf89f0c87900142d5464e20 Mon Sep 17 00:00:00 2001 From: TD-er Date: Sat, 4 Oct 2025 02:46:19 +0200 Subject: [PATCH 325/564] [JSON] Add option to print JSON to String + convert Domoticz JSON --- src/src/Helpers/KeyValueWriter.cpp | 8 +- src/src/Helpers/KeyValueWriter.h | 58 +++++++--- src/src/Helpers/PrintToString.cpp | 5 + src/src/Helpers/PrintToString.h | 2 + src/src/Helpers/_CPlugin_DomoticzHelper.cpp | 32 +++--- src/src/WebServer/HTML_Print.cpp | 7 ++ src/src/WebServer/HTML_Print.h | 14 +++ src/src/WebServer/KeyValueWriter_JSON.cpp | 113 ++++++++++---------- src/src/WebServer/KeyValueWriter_JSON.h | 30 +++--- 9 files changed, 169 insertions(+), 100 deletions(-) diff --git a/src/src/Helpers/KeyValueWriter.cpp b/src/src/Helpers/KeyValueWriter.cpp index 6bb31ed65..3d9a3cf69 100644 --- a/src/src/Helpers/KeyValueWriter.cpp +++ b/src/src/Helpers/KeyValueWriter.cpp @@ -138,7 +138,13 @@ void KeyValueStruct::appendValue(ValueStruct&& value) // KeyValueWriter // ******************************************************************************** -void KeyValueWriter::clear() {} +void KeyValueWriter::clear() { + _isEmpty = true; + + if (_toString) { + _toString->clear(); + } +} void KeyValueWriter::writeLabels(const LabelType::Enum labels[]) { diff --git a/src/src/Helpers/KeyValueWriter.h b/src/src/Helpers/KeyValueWriter.h index ecb52ba42..3045a564f 100644 --- a/src/src/Helpers/KeyValueWriter.h +++ b/src/src/Helpers/KeyValueWriter.h @@ -2,8 +2,11 @@ #include "../../ESPEasy_common.h" +#include "../Helpers/PrintToString.h" #include "../Helpers/StringProvider.h" +#include "../WebServer/HTML_Print.h" + #include #include @@ -139,16 +142,17 @@ class KeyValueWriter { public: - KeyValueWriter(bool emptyHeader = false) : _hasHeader(emptyHeader) {} + KeyValueWriter(bool emptyHeader = false, PrintToString *toStr = nullptr) : _toString(toStr), _hasHeader(emptyHeader) {} protected: - KeyValueWriter(KeyValueWriter*parent) : _parent(parent) {} + KeyValueWriter(KeyValueWriter*parent, PrintToString *toStr = nullptr) : _toString(toStr), _parent(parent) {} - KeyValueWriter(bool emptyHeader, KeyValueWriter*parent) : _parent(parent), + KeyValueWriter(bool emptyHeader, KeyValueWriter*parent, PrintToString *toStr = nullptr) : _toString(toStr), _parent(parent), _hasHeader(emptyHeader) {} - KeyValueWriter(const String& header, KeyValueWriter*parent) : _header(header), _parent(parent) {} + KeyValueWriter(const String& header, KeyValueWriter*parent, PrintToString *toStr = nullptr) : _toString(toStr), _header(header), _parent(parent) + {} public: @@ -172,24 +176,57 @@ public: virtual int getLevel() const; - virtual void setIsArray() { _isArray = true; } + virtual void setIsArray() { _isArray = true; } - virtual void indent() const {} + // Only supported for JSON writer right now + // TODO TD-er: Change this to std::shared_ptr + virtual void setOutputToString(PrintToString*printToStr) { _toString = printToStr; } + + virtual void indent() {} // Create writer of the same derived type, with this set as parent - virtual Sp_KeyValueWriter createChild() = 0; + virtual Sp_KeyValueWriter createChild() = 0; virtual Sp_KeyValueWriter createChild(const String& header) = 0; // Create new writer of the same derived type, without parent - virtual Sp_KeyValueWriter createNew() = 0; + virtual Sp_KeyValueWriter createNew() = 0; virtual Sp_KeyValueWriter createNew(const String& header) = 0; + const String& get() const { + if (_toString == nullptr) { return EMPTY_STRING; } + return _toString->get(); + } + + String && getMove() + { + if (_toString == nullptr) { + static String tmp; + return std::move(tmp); + } + return std::move(_toString->getMove()); + } + + bool reserve(unsigned int size) { return _toString && _toString->reserve(size); } + +protected: + + Print& getPrint() { + if (_toString == nullptr) { return _toWeb; } + return *_toString; + } + + // TODO TD-er: Change this to std::shared_ptr + PrintToString *_toString = nullptr; + +private: + + PrintToWebServer _toWeb; protected: String _header; - KeyValueWriter *_parent{}; + KeyValueWriter *_parent = nullptr; bool _hasHeader = true; @@ -199,6 +236,3 @@ protected: }; // class KeyValueWriter - - - diff --git a/src/src/Helpers/PrintToString.cpp b/src/src/Helpers/PrintToString.cpp index 9cc44a316..cbee0ec3e 100644 --- a/src/src/Helpers/PrintToString.cpp +++ b/src/src/Helpers/PrintToString.cpp @@ -19,3 +19,8 @@ const String& PrintToString::get() const { return _str; } + +String&& PrintToString::getMove() +{ + return std::move(_str); +} \ No newline at end of file diff --git a/src/src/Helpers/PrintToString.h b/src/src/Helpers/PrintToString.h index 79113710b..2a531e6d9 100644 --- a/src/src/Helpers/PrintToString.h +++ b/src/src/Helpers/PrintToString.h @@ -20,6 +20,8 @@ public: const String& get() const; + String&& getMove(); + private: String _str; diff --git a/src/src/Helpers/_CPlugin_DomoticzHelper.cpp b/src/src/Helpers/_CPlugin_DomoticzHelper.cpp index 67aeaed75..3aaf3bcb9 100644 --- a/src/src/Helpers/_CPlugin_DomoticzHelper.cpp +++ b/src/src/Helpers/_CPlugin_DomoticzHelper.cpp @@ -12,6 +12,7 @@ # include "../Helpers/Convert.h" # include "../Helpers/StringConverter.h" +# include "../WebServer/KeyValueWriter_JSON.h" # include "../../ESPEasy-Globals.h" @@ -214,42 +215,35 @@ bool deserializeDomoticzJson(const String& json, String serializeDomoticzJson(struct EventStruct *event) { - String json; + PrintToString json; { - json += '{'; - json += to_json_object_value(F("idx"), static_cast(event->idx)); - json += ','; - json += to_json_object_value(F("RSSI"), mapRSSItoDomoticz()); + KeyValueWriter_JSON writer(true, &json); + writer.write({ F("idx"), static_cast(event->idx) }); + writer.write({ F("RSSI"), mapRSSItoDomoticz() }); # if FEATURE_ADC_VCC - json += ','; - json += to_json_object_value(F("Battery"), mapVccToDomoticz()); + writer.write({ F("Battery"), mapVccToDomoticz() }); # endif // if FEATURE_ADC_VCC const Sensor_VType sensorType = event->getSensorType(); if (sensorType == Sensor_VType::SENSOR_TYPE_SWITCH || sensorType == Sensor_VType::SENSOR_TYPE_DIMMER) { - json += ','; - json += to_json_object_value(F("command"), F("switchlight")); - json += ','; - + writer.write({ F("command"), F("switchlight") }); + const bool value_zero = essentiallyZero(UserVar[event->BaseVarIndex]); if (sensorType == Sensor_VType::SENSOR_TYPE_DIMMER && !value_zero) { - json += to_json_object_value(F("Set%20Level"), toString(UserVar[event->BaseVarIndex], 2)); + writer.write({ F("Set%20Level"), UserVar[event->BaseVarIndex], 2 }); } else { - json += to_json_object_value(F("switchcmd"), value_zero ? F("Off") : F("On")); + writer.write({ F("switchcmd"), value_zero ? F("Off") : F("On") }); } } else { - json += ','; - json += to_json_object_value(F("nvalue"), 0); - json += ','; - json += to_json_object_value(F("svalue"), formatDomoticzSensorType(event), true); + writer.write({ F("nvalue"), F("0") }); + writer.write({ F("svalue"), formatDomoticzSensorType(event) }); } - json += '}'; } - return json; + return json.getMove(); } # endif // ifdef USES_C002 diff --git a/src/src/WebServer/HTML_Print.cpp b/src/src/WebServer/HTML_Print.cpp index 634cd4e08..5ba00912f 100644 --- a/src/src/WebServer/HTML_Print.cpp +++ b/src/src/WebServer/HTML_Print.cpp @@ -11,3 +11,10 @@ size_t HTML_Print::write(uint8_t c) } return 1; } + + +size_t PrintToWebServer::write(uint8_t c) +{ + TXBuffer += (char)c; + return 1; +} diff --git a/src/src/WebServer/HTML_Print.h b/src/src/WebServer/HTML_Print.h index 403261b87..453658929 100644 --- a/src/src/WebServer/HTML_Print.h +++ b/src/src/WebServer/HTML_Print.h @@ -6,6 +6,7 @@ // Class to redirect any function expecting a Print stream to output to the TXBuffer of our webserver. +// Converts newline to HTML
    class HTML_Print : public Print { public: @@ -17,4 +18,17 @@ public: }; +// Streaming replacement for writing to WebServer TXBuffer +// Inherits from Print +class PrintToWebServer : public Print +{ +public: + + virtual ~PrintToWebServer() {} + + size_t write(uint8_t c) override; + +}; + + #endif // WEBSERVER_HTML_PRINT_H diff --git a/src/src/WebServer/KeyValueWriter_JSON.cpp b/src/src/WebServer/KeyValueWriter_JSON.cpp index 9e3cd2e0a..be1498aac 100644 --- a/src/src/WebServer/KeyValueWriter_JSON.cpp +++ b/src/src/WebServer/KeyValueWriter_JSON.cpp @@ -5,53 +5,51 @@ #include "../WebServer/HTML_wrappers.h" -KeyValueWriter_JSON::KeyValueWriter_JSON(bool emptyHeader) - : KeyValueWriter(emptyHeader) +KeyValueWriter_JSON::KeyValueWriter_JSON(bool emptyHeader, PrintToString *toStr) + : KeyValueWriter(emptyHeader, toStr) {} -KeyValueWriter_JSON::KeyValueWriter_JSON(KeyValueWriter_JSON*parent) - : KeyValueWriter(parent) +KeyValueWriter_JSON::KeyValueWriter_JSON(KeyValueWriter_JSON*parent, PrintToString *toStr) + : KeyValueWriter(parent, toStr) {} -KeyValueWriter_JSON::KeyValueWriter_JSON(bool emptyHeader, KeyValueWriter_JSON*parent) - : KeyValueWriter(emptyHeader, parent) +KeyValueWriter_JSON::KeyValueWriter_JSON(bool emptyHeader, KeyValueWriter_JSON*parent, PrintToString *toStr) + : KeyValueWriter(emptyHeader, parent, toStr) {} -KeyValueWriter_JSON::KeyValueWriter_JSON(const String& header) - : KeyValueWriter(header, nullptr) +KeyValueWriter_JSON::KeyValueWriter_JSON(const String& header, PrintToString *toStr) + : KeyValueWriter(header, nullptr, toStr) {} -KeyValueWriter_JSON::KeyValueWriter_JSON(const __FlashStringHelper *header) - : KeyValueWriter(String(header), nullptr) +KeyValueWriter_JSON::KeyValueWriter_JSON(const __FlashStringHelper *header, PrintToString *toStr) + : KeyValueWriter(String(header), nullptr, toStr) {} -KeyValueWriter_JSON::KeyValueWriter_JSON(const String& header, KeyValueWriter_JSON*parent) - : KeyValueWriter(header, parent) +KeyValueWriter_JSON::KeyValueWriter_JSON(const String& header, KeyValueWriter_JSON*parent, PrintToString *toStr) + : KeyValueWriter(header, parent, toStr) {} -KeyValueWriter_JSON::KeyValueWriter_JSON(const __FlashStringHelper *header, KeyValueWriter_JSON*parent) - : KeyValueWriter(String(header), parent) +KeyValueWriter_JSON::KeyValueWriter_JSON(const __FlashStringHelper *header, KeyValueWriter_JSON*parent, PrintToString *toStr) + : KeyValueWriter(String(header), parent, toStr) {} KeyValueWriter_JSON::~KeyValueWriter_JSON() { if (!_isEmpty) { - addHtml('\n'); + getPrint().write('\n'); if (_hasHeader) { #ifdef USE_KVW_JSON_INDENT indent(); #endif - addHtml(_isArray ? ']' : '}'); + getPrint().write(_isArray ? ']' : '}'); } } } -void KeyValueWriter_JSON::clear() { _isEmpty = true; } - -void KeyValueWriter_JSON::write() +void KeyValueWriter_JSON::write() { if (_isEmpty) { if (_parent != nullptr) { _parent->write(); } @@ -62,17 +60,19 @@ void KeyValueWriter_JSON::write() #endif if (_header.isEmpty()) { - addHtml('{', '\n'); + getPrint().write('{'); + getPrint().write('\n'); } else { - addHtml(strformat( - F("\"%s\":%c\n"), - _header.c_str(), - _isArray ? '[' : '{')); + getPrint().print(strformat( + F("\"%s\":%c\n"), + _header.c_str(), + _isArray ? '[' : '{')); } } _isEmpty = false; } else { - addHtml(',', '\n'); + getPrint().write(','); + getPrint().write('\n'); } } @@ -81,13 +81,15 @@ void KeyValueWriter_JSON::write(const KeyValueStruct& kv) write(); #ifdef USE_KVW_JSON_INDENT indent(); - addHtml('\t'); -#endif + getPrint().write('\t'); +#endif // ifdef USE_KVW_JSON_INDENT if (kv._key.length()) { - addHtml('"'); - addHtml(kv._key); - addHtml('"', ':'); + auto& pr = getPrint(); + pr.write('"'); + pr.print(kv._key); + pr.write('"'); + pr.write(':'); } const size_t nrValues = kv._values.size(); @@ -95,81 +97,82 @@ void KeyValueWriter_JSON::write(const KeyValueStruct& kv) if (!kv._isArray) { // Either 1 value or empty value if (nrValues == 0) { - addHtml('"', '"'); + auto& pr = getPrint(); + pr.write('"'); + pr.write('"'); } else { writeValue(kv._values[0]); } } else { // Multiple values, so we must wrap it in [] - addHtml('[', '\n'); + auto& pr = getPrint(); + pr.write('['); + pr.write('\n'); for (size_t i = 0; i < nrValues; ++i) { if (i != 0) { - addHtml(',', '\n'); + auto& pr = getPrint(); + pr.write(','); + pr.write('\n'); } #ifdef USE_KVW_JSON_INDENT indent(); - addHtml('\t', '\t'); + auto& pr = getPrint(); + pr.write('\t'); + pr.write('\t'); #endif // ifdef USE_KVW_JSON_INDENT writeValue(kv._values[i]); } - addHtml(']'); + getPrint().write(']'); } } void KeyValueWriter_JSON::writeValue(const ValueStruct& val) { + auto& pr = getPrint(); + switch (val.valueType) { case ValueStruct::ValueType::Float: case ValueStruct::ValueType::Double: case ValueStruct::ValueType::Int: - addHtml(val.str); + pr.print(val.str); return; case ValueStruct::ValueType::Bool: - if (!Settings.JSONBoolWithoutQuotes()) { addHtml('"'); } - addHtml(val.str.equals("0") ? F("false") : F("true")); + if (!Settings.JSONBoolWithoutQuotes()) { pr.write('"'); } + pr.print(val.str.equals("0") ? F("false") : F("true")); - if (!Settings.JSONBoolWithoutQuotes()) { addHtml('"'); } + if (!Settings.JSONBoolWithoutQuotes()) { pr.write('"'); } return; case ValueStruct::ValueType::Auto: case ValueStruct::ValueType::String: break; } - addHtml(to_json_value(val.str)); + pr.print(to_json_value(val.str)); } -Sp_KeyValueWriter KeyValueWriter_JSON::createChild() -{ - return std::make_shared(this); -} +Sp_KeyValueWriter KeyValueWriter_JSON::createChild() { return std::make_shared(this, _toString); } Sp_KeyValueWriter KeyValueWriter_JSON::createChild(const String& header) { - return std::make_shared(header, this); + return std::make_shared(header, this, _toString); } -Sp_KeyValueWriter KeyValueWriter_JSON::createNew() -{ - return std::make_shared(); -} +Sp_KeyValueWriter KeyValueWriter_JSON::createNew() { return std::make_shared(false, _toString); } -Sp_KeyValueWriter KeyValueWriter_JSON::createNew(const String& header) -{ - return std::make_shared(header); -} +Sp_KeyValueWriter KeyValueWriter_JSON::createNew(const String& header) { return std::make_shared(header, _toString); } #ifdef USE_KVW_JSON_INDENT -void KeyValueWriter_JSON::indent() const +void KeyValueWriter_JSON::indent() { if (_parent != nullptr) { - addHtml('\t'); + getPrint().write('\t'); _parent->indent(); } } diff --git a/src/src/WebServer/KeyValueWriter_JSON.h b/src/src/WebServer/KeyValueWriter_JSON.h index f7e7ddf45..0a72f26da 100644 --- a/src/src/WebServer/KeyValueWriter_JSON.h +++ b/src/src/WebServer/KeyValueWriter_JSON.h @@ -12,28 +12,33 @@ public: using KeyValueWriter::writeLabels; - KeyValueWriter_JSON(bool emptyHeader = false); + KeyValueWriter_JSON(bool emptyHeader = false, + PrintToString *toStr = nullptr); - KeyValueWriter_JSON(KeyValueWriter_JSON*parent); + KeyValueWriter_JSON(KeyValueWriter_JSON*parent, + PrintToString *toStr = nullptr); KeyValueWriter_JSON(bool emptyHeader, - KeyValueWriter_JSON*parent); + KeyValueWriter_JSON*parent, + PrintToString *toStr = nullptr); - KeyValueWriter_JSON(const String& header); - KeyValueWriter_JSON(const __FlashStringHelper *header); + KeyValueWriter_JSON(const String & header, + PrintToString *toStr = nullptr); + KeyValueWriter_JSON(const __FlashStringHelper *header, + PrintToString *toStr = nullptr); KeyValueWriter_JSON(const String & header, - KeyValueWriter_JSON*parent); + KeyValueWriter_JSON*parent, + PrintToString *toStr = nullptr); KeyValueWriter_JSON(const __FlashStringHelper *header, - KeyValueWriter_JSON *parent); + KeyValueWriter_JSON *parent, + PrintToString *toStr = nullptr); virtual ~KeyValueWriter_JSON(); - virtual void clear() override; + virtual void write(); - virtual void write(); - - virtual void write(const KeyValueStruct& kv); + virtual void write(const KeyValueStruct& kv); // Create writer of the same derived type, with this set as parent virtual Sp_KeyValueWriter createChild(); @@ -43,7 +48,6 @@ public: virtual Sp_KeyValueWriter createNew(); virtual Sp_KeyValueWriter createNew(const String& header); - private: void writeValue(const ValueStruct& value); @@ -52,7 +56,7 @@ private: public: - virtual void indent() const override; + virtual void indent() override; #endif // ifdef USE_KVW_JSON_INDENT From f032f517c478c1f3661e1bed84a00407f8750469 Mon Sep 17 00:00:00 2001 From: Gijs Noorlander Date: Sat, 4 Oct 2025 09:37:28 +0200 Subject: [PATCH 326/564] [Build] Change ESP8266 normal and collection builds to core 3.1.2 --- platformio_esp82xx_base.ini | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/platformio_esp82xx_base.ini b/platformio_esp82xx_base.ini index bc45ac8b5..37e0a46f5 100644 --- a/platformio_esp82xx_base.ini +++ b/platformio_esp82xx_base.ini @@ -89,12 +89,12 @@ src_filter = +<*> -<.git/> -<.svn/> - - - Date: Sat, 4 Oct 2025 20:10:27 +0200 Subject: [PATCH 327/564] [Build] Enable BUILD_NO_DEBUG for 2nd heap ESP8266 normal builds --- platformio_esp82xx_envs.ini | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/platformio_esp82xx_envs.ini b/platformio_esp82xx_envs.ini index 3e8246a42..7f57db8eb 100644 --- a/platformio_esp82xx_envs.ini +++ b/platformio_esp82xx_envs.ini @@ -297,7 +297,8 @@ platform_packages = ${normal.platform_packages} build_flags = ${normal.build_flags} ${esp8266_4M1M.build_flags} -D FEATURE_ADC_VCC=1 - -D NO_LIMIT_BUILD_SIZE + -D LIMIT_BUILD_SIZE + -D BUILD_NO_DEBUG lib_ignore = ${normal.lib_ignore} [env:normal_beta_2ndheap_ESP8266_4M1M] @@ -307,7 +308,8 @@ platform = ${normal_beta_2ndheap.platform} platform_packages = ${normal_beta_2ndheap.platform_packages} build_flags = ${normal_beta_2ndheap.build_flags} ${esp8266_4M1M.build_flags} - -D NO_LIMIT_BUILD_SIZE + -D LIMIT_BUILD_SIZE + -D BUILD_NO_DEBUG lib_ignore = ${normal_beta_2ndheap.lib_ignore} @@ -319,7 +321,8 @@ platform_packages = ${normal_beta_2ndheap.platform_packages} build_flags = ${normal_beta_2ndheap.build_flags} ${esp8266_4M1M.build_flags} -D FEATURE_ADC_VCC=1 - -D NO_LIMIT_BUILD_SIZE + -D LIMIT_BUILD_SIZE + -D BUILD_NO_DEBUG lib_ignore = ${normal_beta_2ndheap.lib_ignore} From fcd39e68bfbc799d8a07d7011f5a40d2402b6205 Mon Sep 17 00:00:00 2001 From: TD-er Date: Sat, 4 Oct 2025 21:42:48 +0200 Subject: [PATCH 328/564] [Build] Set ESP8266 IR builds to esp8266/Arduino 3.1.2 --- platformio_esp82xx_base.ini | 92 +++++++++++++++++++++++++++++++++++-- 1 file changed, 88 insertions(+), 4 deletions(-) diff --git a/platformio_esp82xx_base.ini b/platformio_esp82xx_base.ini index 37e0a46f5..40c4fd013 100644 --- a/platformio_esp82xx_base.ini +++ b/platformio_esp82xx_base.ini @@ -136,9 +136,9 @@ lib_ignore = ${core312_platform.lib_ignore} ; ********************************************************************* [ir] -build_flags = ${core_2_7_4.build_flags} -platform = ${core_2_7_4.platform} -platform_packages = ${core_2_7_4.platform_packages} +build_flags = ${core312_platform.build_flags} +platform = ${core312_platform.platform} +platform_packages = ${core312_platform.platform_packages} lib_ignore = ESP32_ping ESP32WebServer ESP32HTTPUpdateServer @@ -153,8 +153,92 @@ lib_ignore = ESP32_ping ArduinoOTA ESP8266mDNS I2C AXP192 Power management - EspSoftwareSerial +; EspSoftwareSerial AXP2101 Power management (I2C) + AM2320 + AS3935MI + AS5600 +; AS_BH1750 + Adafruit BME680 Library + Adafruit BMP3XX Library + Adafruit GFX Library + Adafruit HMC5883 Unified + Adafruit ILI9341 ESPEasy + Adafruit MPR121 + Adafruit Motor Shield V2 Library + Adafruit NeoMatrix via NeoPixelBus + Adafruit PCD8544 Nokia 5110 LCD library + Adafruit SGP30 Sensor + Adafruit SI1145 Library + Adafruit TCS34725 + Adafruit TSL2591 Library + Adafruit Unified Sensor + Adafruit VEML7700 Library + Adafruit seesaw Library + Adafruit_ST77xx + AnyRtttl +; ArduinoJson + Blynk + CHT16K33 LED Matrix Library + CircularBuffer + ClimateGuard RadSens + DFRobot_GP8403_ESPEasy + DNSServer +; ESP8266HTTPClient +; ESP8266HTTPUpdateServer +; ESP8266WebServer +; ESP8266WiFi +; ESP8266_SSD1306 +; ESPeasySerial + ESPping + FrogmoreScd30 +; GPIO_DirectAccess + HLW8012 +; HeatpumpIR +; I2Cdevlib-Core + ILI9488 +; IRremoteESP8266 + ITG3205 + Improv WiFi Library + IthoCC1101 + LOLIN_EPD +; LiquidCrystal_I2C + MD_MAX72XX + MD_Parola + MFRC522 +; MechInputs + Multi Channel Relay Arduino Library + NeoPixelBus + NeoPixelBus_wrapper +; NewPing + Noiasca NeopixelDisplay + PZEM-004T-v30 +; PubSubClient3 + RAK12019_LTR390_UV_Light + RN2xx3 Arduino Library + RTClib + Regexp + SDM +; SPI + Sensirion Gas Index Algorithm +; SerialSensors +; Servo + ShiftRegister74HC595_NonTemplate + SparkFun ADXL345 Arduino Library + SparkFun APDS9960 RGB and Gesture Sensor + SparkFun MAX1704x Fuel Gauge Arduino Library + SparkFun SCD4x Arduino Library + SparkFun VL53L1X 4m Laser Distance Sensor + SparkFun_AS7265x + TinyGPSPlus + VL53L0X + WakeOnLan +; Wire + XPT2046_Touchscreen + bb_captouch + htcw_ip5306 + ld2410 + supertinycron From e2b71fe749854dda910b8f57cdb6692922d949b8 Mon Sep 17 00:00:00 2001 From: Ton Huisman Date: Sat, 4 Oct 2025 21:42:58 +0200 Subject: [PATCH 329/564] [Tools] Add Plugin list overview page --- src/src/CustomBuild/define_plugin_sets.h | 9 ++ src/src/WebServer/ESPEasy_WebServer.cpp | 4 + src/src/WebServer/PluginListPage.cpp | 146 +++++++++++++++++++++++ src/src/WebServer/PluginListPage.h | 13 ++ src/src/WebServer/ToolsPage.cpp | 4 + 5 files changed, 176 insertions(+) create mode 100644 src/src/WebServer/PluginListPage.cpp create mode 100644 src/src/WebServer/PluginListPage.h diff --git a/src/src/CustomBuild/define_plugin_sets.h b/src/src/CustomBuild/define_plugin_sets.h index a702c3a59..66e0c0386 100644 --- a/src/src/CustomBuild/define_plugin_sets.h +++ b/src/src/CustomBuild/define_plugin_sets.h @@ -3834,6 +3834,15 @@ To create/register a plugin, you have to : #endif #endif // if FEATURE_TASKVALUE_ATTRIBUTES +#ifndef FEATURE_PLUGIN_LIST + #ifdef ESP32 + #define FEATURE_PLUGIN_LIST 1 + #endif + #ifdef ESP8266 + #define FEATURE_PLUGIN_LIST 0 // Disabled by default on ESP8266 + #endif +#endif // ifndef FEATURE_PLUGIN_LIST + //-------------------HTTPResponseParser Section---------------- #ifndef FEATURE_THINGSPEAK_EVENT #if defined(PLUGIN_BUILD_MAX_ESP32) diff --git a/src/src/WebServer/ESPEasy_WebServer.cpp b/src/src/WebServer/ESPEasy_WebServer.cpp index 5ba648ab3..d9d381690 100644 --- a/src/src/WebServer/ESPEasy_WebServer.cpp +++ b/src/src/WebServer/ESPEasy_WebServer.cpp @@ -24,6 +24,7 @@ #include "../WebServer/Markup_Buttons.h" #include "../WebServer/Markup_Forms.h" #include "../WebServer/NotificationPage.h" +#include "../WebServer/PluginListPage.h" #include "../WebServer/PinStates.h" #include "../WebServer/RootPage.h" #include "../WebServer/Rules.h" @@ -299,6 +300,9 @@ void WebServerInit() #ifdef WEBSERVER_SYSVARS web_server.on(F("/sysvars"), handle_sysvars); #endif // WEBSERVER_SYSVARS +#if FEATURE_PLUGIN_LIST + web_server.on(F("/pluginlist"), handle_pluginlist); +#endif // if FEATURE_PLUGIN_LIST #ifdef WEBSERVER_TIMINGSTATS web_server.on(F("/timingstats"), handle_timingstats); #endif // WEBSERVER_TIMINGSTATS diff --git a/src/src/WebServer/PluginListPage.cpp b/src/src/WebServer/PluginListPage.cpp new file mode 100644 index 000000000..5d7186c17 --- /dev/null +++ b/src/src/WebServer/PluginListPage.cpp @@ -0,0 +1,146 @@ +#include "../WebServer/PluginListPage.h" + + +#if FEATURE_PLUGIN_LIST + +# include "../WebServer/ESPEasy_WebServer.h" +# include "../WebServer/HTML_wrappers.h" + +# include "../_Plugin_Helper.h" +# if FEATURE_NOTIFIER +# include "../Globals/NPlugins.h" +# include "../DataTypes/NPluginID.h" +# endif // if FEATURE_NOTIFIER + +void handle_pluginlist() { + # ifndef BUILD_NO_RAM_TRACKER + checkRAM(F("handle_pluginlist")); + # endif // ifndef BUILD_NO_RAM_TRACKER + + # if FEATURE_MQTT_TLS // TODO Add check for FEATURE_HTTP_TLS when https://github.com/letscontrolit/ESPEasy/pull/5402 is merged + const int colspan = 5; + # else // if FEATURE_MQTT_TLS + const int colspan = 4; + # endif // if FEATURE_MQTT_TLS + + TXBuffer.startStream(); + sendHeadandTail_stdtemplate(_HEAD); + + // the table header + html_table_class_normal(); + + for (uint8_t p = 0; p < 2; ++p) { // Sorted by Description and by PluginID + addTableSeparator(concat(F("Plugins sorted by "), 0 == p ? F("Description") : F("Plugin ID")), colspan, 3); + html_TR(); + html_table_header(F("Plugin"), 80); + html_table_header(F("Description"), 800); + html_table_header(F(""), 50); + # if FEATURE_MQTT_TLS + html_table_header(F(""), 50); + # endif // if FEATURE_MQTT_TLS + html_table_header(F("")); + + deviceIndex_t x; + bool done = false; + + while (!done) { + const deviceIndex_t deviceIndex = (0 == p) ? getDeviceIndex_sorted(x) : x; + + if (!validDeviceIndex(deviceIndex)) { + done = true; + } else { + const pluginID_t pluginID = getPluginID_from_DeviceIndex(deviceIndex); + + if (validPluginID(pluginID)) { + html_TR_TD(); + addHtml(get_formatted_Plugin_number(pluginID)); + html_TD(); + addHtml(getPluginNameFromDeviceIndex(deviceIndex)); + html_TD(); + } + } + ++x; + } + } + + { + addTableSeparator(F("Controllers"), colspan, 3); + html_TR(); + html_table_header(F("Controller"), 80); + html_table_header(F("Description"), 800); + html_table_header(F("MQTT"), 50); + # if FEATURE_MQTT_TLS + html_table_header(F("TLS"), 50); + # endif // if FEATURE_MQTT_TLS + html_table_header(F("")); + protocolIndex_t x; + bool done = false; + + while (!done) { + if (!validProtocolIndex(x)) { + done = true; + } else { + const cpluginID_t cpluginID = getCPluginID_from_ProtocolIndex(x); + const ProtocolStruct& proto = getProtocolStruct(x); + + if (validCPluginID(cpluginID)) { + html_TR_TD(); + addHtml(get_formatted_Controller_number(cpluginID)); + html_TD(); + addHtml(getCPluginNameFromProtocolIndex(x)); + + html_TD(); + + if (proto.usesMQTT) { + addEnabled(true); + } + # if FEATURE_MQTT_TLS + + html_TD(); + + if (proto.usesTLS) { + addEnabled(true); + } + # endif // if FEATURE_MQTT_TLS + html_TD(); + } + } + ++x; + } + } + + # if FEATURE_NOTIFIER + { + addTableSeparator(F("Notifications"), colspan, 3); + html_TR(); + html_table_header(F("Notifier"), 80); + html_table_header(F("Description"), 800); + html_table_header(F(""), 50); + # if FEATURE_MQTT_TLS + html_table_header(F(""), 50); + # endif // if FEATURE_MQTT_TLS + html_table_header(F("")); + + for (uint8_t x = 0; x <= notificationCount; x++) + { + html_TR_TD(); + const npluginID_t plugin(Notification[x].Number); + addHtml(plugin.toDisplayString()); + html_TD(); + String NotificationName; + NPlugin_ptr[x](NPlugin::Function::NPLUGIN_GET_DEVICENAME, 0, NotificationName); + addHtml(NotificationName); + html_TD(); + } + } + # endif // if FEATURE_NOTIFIER + + // TODO Add Network plugins once PR https://github.com/letscontrolit/ESPEasy/pull/5149 is merged + + html_end_table(); + html_end_form(); + sendHeadandTail_stdtemplate(_TAIL); + TXBuffer.endStream(); +} + +#endif // if FEATURE_PLUGIN_LIST diff --git a/src/src/WebServer/PluginListPage.h b/src/src/WebServer/PluginListPage.h new file mode 100644 index 000000000..888d400da --- /dev/null +++ b/src/src/WebServer/PluginListPage.h @@ -0,0 +1,13 @@ +#pragma once + +#include "../WebServer/common.h" + +#if FEATURE_PLUGIN_LIST + + +// ******************************************************************************** +// Web Interface List all included plugins. +// ******************************************************************************** +void handle_pluginlist(); + +#endif // if FEATURE_PLUGIN_LIST diff --git a/src/src/WebServer/ToolsPage.cpp b/src/src/WebServer/ToolsPage.cpp index 8889e4af9..f62a86a4a 100644 --- a/src/src/WebServer/ToolsPage.cpp +++ b/src/src/WebServer/ToolsPage.cpp @@ -94,6 +94,10 @@ void handle_tools() { addWideButtonPlusDescription(F("sysvars"), F("System Variables"), F("Show all system variables and conversions")); # endif // ifdef WEBSERVER_SYSVARS + #if FEATURE_PLUGIN_LIST + addWideButtonPlusDescription(F("pluginlist"), F("Included Plugins"), F("Show all plugins that are included in this build")); + #endif // if FEATURE_PLUGIN_LIST + addFormSubHeader(F("Wifi")); addWideButtonPlusDescription(F("/?cmd=wificonnect"), F("Connect"), F("Connects to known Wifi network")); From bf639a2032123d2ca0e50ae77806f67393c25131 Mon Sep 17 00:00:00 2001 From: Ton Huisman Date: Sat, 4 Oct 2025 21:43:21 +0200 Subject: [PATCH 330/564] [Tools] Update documentation for Plugin list --- docs/source/Tools/Tools.rst | 12 ++++++++++++ .../images/Tools_PluginList_Controllers.png | Bin 0 -> 11252 bytes 2 files changed, 12 insertions(+) create mode 100644 docs/source/Tools/images/Tools_PluginList_Controllers.png diff --git a/docs/source/Tools/Tools.rst b/docs/source/Tools/Tools.rst index d7160eec2..92babd7ac 100644 --- a/docs/source/Tools/Tools.rst +++ b/docs/source/Tools/Tools.rst @@ -951,6 +951,18 @@ System Variables Shows an overview of the available variables set from rules, and available ``%variable%`` variables in several categories. +Included Plugins +================ + +Show a list of all plugins available in the build, Plugins, Controllers and Notifications. + +For Devices, the plugins are listed both sorted by Description and by Plugin ID, for easier retrieval. + +Controller plugins also show columns for MQTT and TLS (when included in the build). + +.. image:: images/Tools_PluginList_Controllers.png + + Interfaces ********** diff --git a/docs/source/Tools/images/Tools_PluginList_Controllers.png b/docs/source/Tools/images/Tools_PluginList_Controllers.png new file mode 100644 index 0000000000000000000000000000000000000000..aa4c6cb013623bec1e800cd740140ca8962e6906 GIT binary patch literal 11252 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 Lj&cd;8T@|$M}nD# literal 0 HcmV?d00001 From 2bb657485298bacb2d653edf649c5b48259c257b Mon Sep 17 00:00:00 2001 From: TD-er Date: Sat, 4 Oct 2025 21:54:27 +0200 Subject: [PATCH 331/564] [Build] Fix custom_IR_ESP8266_4M1M build --- src/_P016_IR.ino | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) diff --git a/src/_P016_IR.ino b/src/_P016_IR.ino index 7b7efa233..9e48b0791 100644 --- a/src/_P016_IR.ino +++ b/src/_P016_IR.ino @@ -1046,13 +1046,11 @@ boolean displayRawToReadableB32Hex(String& outputStr, decode_results results) out[iOut] = 0; - outputStr.reserve(32 + iOut); - outputStr += F("IRSEND,RAW2,"); - outputStr += out; - outputStr += F(",38,"); - outputStr += uint64ToString(div[0], 10); - outputStr += ','; - outputStr += uint64ToString(div[1], 10); + outputStr = strformat( + F("IRSEND,RAW2,%s,38,%s,%s"), + out, + uint64ToString(div[0], 10).c_str(), + uint64ToString(div[1], 10).c_str()); addLog(LOG_LEVEL_INFO, outputStr); return true; } From 4ada6c88140ebf11b2fc3a3b1b75e8f7f6b4a4bd Mon Sep 17 00:00:00 2001 From: TD-er Date: Sun, 5 Oct 2025 00:45:22 +0200 Subject: [PATCH 332/564] [C009 FHEM] Use new JSON code to generate response --- src/_C009.cpp | 163 ++++++++++++++++++++++---------------------------- 1 file changed, 70 insertions(+), 93 deletions(-) diff --git a/src/_C009.cpp b/src/_C009.cpp index 32c23b612..f2c280ce0 100644 --- a/src/_C009.cpp +++ b/src/_C009.cpp @@ -3,6 +3,8 @@ # include "src/DataTypes/NodeTypeID.h" # include "src/Helpers/StringProvider.h" +# include "src/WebServer/KeyValueWriter_JSON.h" + # include "src/CustomBuild/ESPEasy_buildinfo.h" // ####################################################################################################### @@ -114,110 +116,85 @@ bool CPlugin_009(CPlugin::Function function, struct EventStruct *event, String& bool do_process_c009_delay_queue(cpluginID_t cpluginID, const Queue_element_base& element_base, ControllerSettingsStruct& ControllerSettings) { const C009_queue_element& element = static_cast(element_base); // *INDENT-ON* -String jsonString; -// Make an educated guess on the actual length, based on earlier requests. -static size_t expectedJsonLength = 100; -{ - // Reserve on the heap with most space - if (!reserve_special(jsonString, expectedJsonLength)) { - // Not enough free memory - return false; - } -} -{ - jsonString += '{'; + // Make an educated guess on the actual length, based on earlier requests. + static size_t expectedJsonLength = 100; + PrintToString jsonPrint; + jsonPrint.reserve(expectedJsonLength); { - jsonString += to_json_object_value(F("module"), F("ESPEasy")); - jsonString += ','; - jsonString += to_json_object_value(F("version"), F("1.04")); - - // Create nested object "ESP" inside "data" - jsonString += ','; - jsonString += F("\"data\":{"); + KeyValueWriter_JSON mainLevelWriter(true, &jsonPrint); { - jsonString += F("\"ESP\":{"); { - // Create nested objects in "ESP": - jsonString += to_json_object_value(F("name"), Settings.getName()); - jsonString += ','; - jsonString += to_json_object_value(F("unit"), static_cast(Settings.Unit)); - jsonString += ','; - jsonString += to_json_object_value(F("version"), static_cast(Settings.Version)); - jsonString += ','; - jsonString += to_json_object_value(F("build"), static_cast(Settings.Build)); - jsonString += ','; - jsonString += to_json_object_value(F("build_notes"), F(BUILD_NOTES)); - jsonString += ','; - jsonString += to_json_object_value(F("build_git"), getValue(LabelType::GIT_BUILD)); - jsonString += ','; - jsonString += to_json_object_value(F("node_type_id"), static_cast(NODE_TYPE_ID)); - jsonString += ','; - jsonString += to_json_object_value(F("sleep"), static_cast(Settings.deepSleep_wakeTime)); + mainLevelWriter.write({F("module"), F("ESPEasy")}); + mainLevelWriter.write({F("version"), F("1.04")}); - // embed IP, important if there is NAT/PAT - // char ipStr[20]; - // IPAddress ip = NetworkLocalIP(); - // sprintf_P(ipStr, PSTR("%u.%u.%u.%u"), ip[0], ip[1], ip[2], ip[3]); - jsonString += ','; - jsonString += to_json_object_value(F("ip"), formatIP(ESPEasy::net::NetworkLocalIP())); - } - jsonString += '}'; // End "ESP" - - jsonString += ','; - - // Create nested object "SENSOR" json object inside "data" - jsonString += F("\"SENSOR\":{"); - { - // char itemNames[valueCount][2]; - for (uint8_t x = 0; x < element.valueCount; x++) - { - // Each sensor value get an own object (0..n) - // sprintf(itemNames[x],"%d",x); - if (x != 0) { - jsonString += ','; - } - - jsonString += '"'; - jsonString += x; - jsonString += F("\":{"); + // Create nested object "ESP" inside "data" + auto data = mainLevelWriter.createChild(F("data")); + if (data) { { - jsonString += to_json_object_value(F("deviceName"), getTaskDeviceName(element._taskIndex)); - jsonString += ','; - jsonString += to_json_object_value(F("valueName"), Cache.getTaskDeviceValueName(element._taskIndex, x)); - jsonString += ','; - jsonString += to_json_object_value(F("type"), static_cast(element.sensorType)); - jsonString += ','; - jsonString += to_json_object_value(F("value"), element.txt[x]); - } - jsonString += '}'; // End "sensor value N" + auto esp = data->createChild(F("ESP")); + if (esp) + { + // Create nested objects in "ESP": + esp->write({F("name"), Settings.getName()}); + esp->write({F("unit"), static_cast(Settings.Unit)}); + esp->write({F("version"), static_cast(Settings.Version)}); + esp->write({F("build"), static_cast(Settings.Build)}); + esp->write({F("build_notes"), F(BUILD_NOTES)}); + esp->write({F("build_git"), getValue(LabelType::GIT_BUILD)}); + esp->write({F("node_type_id"), static_cast(NODE_TYPE_ID)}); + esp->write({F("sleep"), static_cast(Settings.deepSleep_wakeTime)}); + + // embed IP, important if there is NAT/PAT + // char ipStr[20]; + // IPAddress ip = NetworkLocalIP(); + // sprintf_P(ipStr, PSTR("%u.%u.%u.%u"), ip[0], ip[1], ip[2], ip[3]}); + esp->write({F("ip"), formatIP(ESPEasy::net::NetworkLocalIP())}); + } + } // End "ESP" + { + // Create nested object "SENSOR" json object inside "data" + auto sensor = data->createChild(F("SENSOR")); + if (sensor) + { + // char itemNames[valueCount][2]; + for (uint8_t x = 0; x < element.valueCount; x++) + { + // Each sensor value get an own object (0..n) + // sprintf(itemNames[x],"%d",x); + auto val_x = sensor->createChild(String(x)); + if (val_x) { + val_x->write({F("deviceName"), getTaskDeviceName(element._taskIndex)}); + val_x->write({F("valueName"), Cache.getTaskDeviceValueName(element._taskIndex, x)}); + val_x->write({F("type"), static_cast(element.sensorType)}); + val_x->write({F("value"), element.txt[x]}); + } + } // End "sensor value N" + } + } // End "SENSOR" } - } - jsonString += '}'; // End "SENSOR" + } // End "data" } - jsonString += '}'; // End "data" + } // End mainLevelWriter + + if (expectedJsonLength < jsonPrint.get().length()) { + expectedJsonLength = jsonPrint.get().length(); } - jsonString += '}'; // End JSON structure -} -if (expectedJsonLength < jsonString.length()) { - expectedJsonLength = jsonString.length(); -} + // addLog(LOG_LEVEL_INFO, F("C009 Test JSON:")); + // addLog(LOG_LEVEL_INFO, mainLevelWriter); -// addLog(LOG_LEVEL_INFO, F("C009 Test JSON:")); -// addLog(LOG_LEVEL_INFO, jsonString); - -int httpCode = -1; -send_via_http( - cpluginID, - ControllerSettings, - element._controller_idx, - F("/ESPEasy"), - F("POST"), - EMPTY_STRING, - jsonString, - httpCode); -return (httpCode >= 100) && (httpCode < 300); + int httpCode = -1; + send_via_http( + cpluginID, + ControllerSettings, + element._controller_idx, + F("/ESPEasy"), + F("POST"), + EMPTY_STRING, + jsonPrint.get(), + httpCode); + return (httpCode >= 100) && (httpCode < 300); } #endif // ifdef USES_C009 From 325e6fe64a311281375aa6009b603c49ef917140 Mon Sep 17 00:00:00 2001 From: TD-er Date: Sun, 5 Oct 2025 00:46:19 +0200 Subject: [PATCH 333/564] [Cleanup] Remove no longer used to_json_object_value functions --- src/src/Helpers/StringConverter.cpp | 53 ---------------------- src/src/Helpers/StringConverter.h | 24 ---------- src/src/PluginStructs/P128_data_struct.cpp | 34 +++++++------- src/src/WebServer/KeyValueWriter_JSON.h | 7 +++ 4 files changed, 25 insertions(+), 93 deletions(-) diff --git a/src/src/Helpers/StringConverter.cpp b/src/src/Helpers/StringConverter.cpp index 2812f864b..cbcbd075f 100644 --- a/src/src/Helpers/StringConverter.cpp +++ b/src/src/Helpers/StringConverter.cpp @@ -534,59 +534,6 @@ String wrapWithQuotesIfContainsParameterSeparatorChar(const String& text) { /*********************************************************************************************\ Format an object value pair for use in JSON. \*********************************************************************************************/ -String to_json_object_value(const __FlashStringHelper * object, - const __FlashStringHelper * value, - bool wrapInQuotes) -{ - return to_json_object_value(String(object), String(value), wrapInQuotes); -} - - -String to_json_object_value(const __FlashStringHelper * object, - const String& value, - bool wrapInQuotes) -{ - return to_json_object_value(String(object), value, wrapInQuotes); -} - -String to_json_object_value(const __FlashStringHelper * object, - String&& value, - bool wrapInQuotes) -{ - return to_json_object_value(String(object), value, wrapInQuotes); -} - -String to_json_object_value(const __FlashStringHelper * object, - int value, - bool wrapInQuotes) -{ - return to_json_object_value(String(object), value, wrapInQuotes); -} - -String to_json_object_value(const String& object, - int value, - bool wrapInQuotes) -{ - if (wrapInQuotes) { - return strformat( - F("\"%s\":\"%d\""), - object.c_str(), - value); - } - - return strformat( - F("\"%s\":%d"), - object.c_str(), - value); -} - -String to_json_object_value(const String& object, const String& value, bool wrapInQuotes) { - return strformat( - F("\"%s\":%s"), - object.c_str(), - to_json_value(value, wrapInQuotes).c_str()); -} - String to_json_value(const String& value, bool wrapInQuotes) { if (value.isEmpty()) { // Empty string diff --git a/src/src/Helpers/StringConverter.h b/src/src/Helpers/StringConverter.h index e89e0a267..5e3eff182 100644 --- a/src/src/Helpers/StringConverter.h +++ b/src/src/Helpers/StringConverter.h @@ -171,30 +171,6 @@ String wrapWithQuotesIfContainsParameterSeparatorChar(const String& text); /*********************************************************************************************\ Format an object value pair for use in JSON. \*********************************************************************************************/ -String to_json_object_value(const __FlashStringHelper * object, - const __FlashStringHelper * value, - bool wrapInQuotes = false); - -String to_json_object_value(const __FlashStringHelper * object, - const String& value, - bool wrapInQuotes = false); - -String to_json_object_value(const __FlashStringHelper * object, - String&& value, - bool wrapInQuotes = false); - -String to_json_object_value(const String& object, - const String& value, - bool wrapInQuotes = false); - -String to_json_object_value(const __FlashStringHelper * object, - int value, - bool wrapInQuotes = false); - -String to_json_object_value(const String& object, - int value, - bool wrapInQuotes = false); - String to_json_value(const String& value, bool wrapInQuotes = false); diff --git a/src/src/PluginStructs/P128_data_struct.cpp b/src/src/PluginStructs/P128_data_struct.cpp index 0a55a815e..5827e72e3 100644 --- a/src/src/PluginStructs/P128_data_struct.cpp +++ b/src/src/PluginStructs/P128_data_struct.cpp @@ -2,6 +2,7 @@ #ifdef USES_P128 # include "../PluginStructs/P128_data_struct.h" +# include "../WebServer/KeyValueWriter_JSON.h" // ***************************************************************/ // Constructor @@ -1550,23 +1551,24 @@ void P128_data_struct::NeoPixelSendStatus(struct EventStruct *eventSource) { PrintToString status; status.reserve(statusSize); + { + KeyValueWriter_JSON writer(true, &status); - status.print('{'); status.println(to_json_object_value(F("plugin"), 128)); - status.print(','); status.println(to_json_object_value(F("mode"), P128_modeType_toString(mode))); - status.print(','); status.println(to_json_object_value(F("lastmode"), P128_modeType_toString(savemode))); - status.print(','); status.println(to_json_object_value(F("fadetime"), static_cast(fadetime))); - status.print(','); status.println(to_json_object_value(F("fadedelay"), static_cast(fadedelay))); - status.print(','); status.println(to_json_object_value(F("dim"), static_cast(Plugin_128_pixels->GetBrightness()))); - status.print(','); status.println(to_json_object_value(F("rgb"), colorStr, true)); - status.print(','); status.println(to_json_object_value(F("hue"), static_cast(hsbColor.H * 360.0f))); - status.print(','); status.println(to_json_object_value(F("saturation"), static_cast(hsbColor.S * 100.0f))); - status.print(','); status.println(to_json_object_value(F("brightness"), static_cast(hsbColor.B * 100.0f))); - status.print(','); status.println(to_json_object_value(F("bgcolor"), backgroundcolorStr, true)); - status.print(','); status.println(to_json_object_value(F("count"), static_cast(count))); - status.print(','); status.println(to_json_object_value(F("speed"), static_cast(speed))); - status.print(','); status.println(to_json_object_value(F("pixelcount"), static_cast(pixelCount))); - status.println('}'); - + writer.write({F("plugin"), 128}); + writer.write({F("mode"), P128_modeType_toString(mode)}); + writer.write({F("lastmode"), P128_modeType_toString(savemode)}); + writer.write({F("fadetime"), static_cast(fadetime)}); + writer.write({F("fadedelay"), static_cast(fadedelay)}); + writer.write({F("dim"), static_cast(Plugin_128_pixels->GetBrightness())}); + writer.write({F("rgb"), colorStr}); + writer.write({F("hue"), static_cast(hsbColor.H * 360.0f)}); + writer.write({F("saturation"), static_cast(hsbColor.S * 100.0f)}); + writer.write({F("brightness"), static_cast(hsbColor.B * 100.0f)}); + writer.write({F("bgcolor"), backgroundcolorStr}); + writer.write({F("count"), static_cast(count)}); + writer.write({F("speed"), static_cast(speed)}); + writer.write({F("pixelcount"), static_cast(pixelCount)}); + } statusSize = status.get().length(); SendStatus(eventSource, status.get()); printToWeb = false; diff --git a/src/src/WebServer/KeyValueWriter_JSON.h b/src/src/WebServer/KeyValueWriter_JSON.h index 0a72f26da..58ff13aef 100644 --- a/src/src/WebServer/KeyValueWriter_JSON.h +++ b/src/src/WebServer/KeyValueWriter_JSON.h @@ -10,6 +10,13 @@ class KeyValueWriter_JSON : public KeyValueWriter { public: + +/* +TODO TD-er: Replace +- stream_to_json_object_value used in ChartJS code + +*/ + using KeyValueWriter::writeLabels; KeyValueWriter_JSON(bool emptyHeader = false, From 8db19e8a1f90b6f6be0aa6e6e0931fda50d40c1d Mon Sep 17 00:00:00 2001 From: TD-er Date: Sun, 5 Oct 2025 11:56:39 +0200 Subject: [PATCH 334/564] [Cleanup] Reduce bin size: unsigned long to uint32_t and long to int32_t --- src/src/DataStructs/SettingsStruct.h | 22 +- src/src/DataStructs_templ/SettingsStruct.cpp | 260 +++++++++---------- src/src/Helpers/KeyValueWriter.cpp | 37 ++- src/src/Helpers/KeyValueWriter.h | 29 ++- src/src/Helpers/StringConverter.cpp | 9 + src/src/Helpers/StringConverter.h | 4 + src/src/PluginStructs/P128_data_struct.cpp | 2 +- src/src/WebServer/Log.cpp | 12 +- 8 files changed, 223 insertions(+), 152 deletions(-) diff --git a/src/src/DataStructs/SettingsStruct.h b/src/src/DataStructs/SettingsStruct.h index 1139a13da..3b65e8d25 100644 --- a/src/src/DataStructs/SettingsStruct.h +++ b/src/src/DataStructs/SettingsStruct.h @@ -65,7 +65,7 @@ enum class PinBootState { /*********************************************************************************************\ * SettingsStruct \*********************************************************************************************/ -template +template class SettingsStruct_tmpl { public: @@ -456,7 +456,7 @@ public: void setNetworkInterfaceStartupDelayAtBoot(ESPEasy::net::networkIndex_t index, uint32_t delay_ms); - unsigned long PID = 0; + uint32_t PID = 0; int Version = 0; int16_t Build = 0; uint8_t IP[4] = {0}; @@ -468,20 +468,20 @@ public: char Name[26] = {0}; char NTPHost[64] = {0}; // FIXME TD-er: Issue #2690 - unsigned long Delay = 0; // Sleep time in seconds + uint32_t Delay = 0; // Sleep time in seconds int8_t Pin_i2c_sda = DEFAULT_PIN_I2C_SDA; int8_t Pin_i2c_scl = DEFAULT_PIN_I2C_SCL; int8_t Pin_status_led = DEFAULT_PIN_STATUS_LED; int8_t Pin_sd_cs = -1; int8_t PinBootStates[17] = {0}; // Only use getPinBootState and setPinBootState as multiple pins are packed for ESP32 uint8_t Syslog_IP[4] = {0}; - unsigned int UDPPort = 8266; + uint32_t UDPPort = 8266; uint8_t SyslogLevel = 0; uint8_t SerialLogLevel = 0; uint8_t WebLogLevel = 0; uint8_t SDLogLevel = 0; - unsigned long BaudRate = 115200; - unsigned long MessageDelay_unused = 0; // MQTT settings now moved to the controller settings. + uint32_t BaudRate = 115200; + uint32_t MessageDelay_unused = 0; // MQTT settings now moved to the controller settings. uint8_t deepSleep_wakeTime = 0; // 0 = Sleep Disabled, else time awake from sleep in seconds boolean CustomCSS = false; boolean DST = false; @@ -490,9 +490,9 @@ public: boolean UseSerial = false; boolean UseSSDP = false; uint8_t ExternalTimeSource = 0; - unsigned long WireClockStretchLimit = 0; + uint32_t WireClockStretchLimit = 0; boolean GlobalSync = false; - unsigned long ConnectionFailuresThreshold = 0; + uint32_t ConnectionFailuresThreshold = 0; int16_t TimeZone = 0; boolean MQTTRetainFlag_unused = false; uint8_t InitSPI = 0; //0 = disabled, 1= enabled but for ESP32 there is option 2= SPI2 9 = User defined, see src/src/WebServer/HardwarePage.h enum SPI_Options_e @@ -516,7 +516,7 @@ public: int8_t I2C3_Multiplexer_Type = I2C_MULTIPLEXER_NONE; int8_t I2C3_Multiplexer_Addr = -1; int8_t I2C3_Multiplexer_ResetPin = -1; - unsigned int OLD_TaskDeviceID[N_TASKS - 7] = {0}; //UNUSED: this can be reused + uint32_t OLD_TaskDeviceID[N_TASKS - 7] = {0}; //UNUSED: this can be reused // FIXME TD-er: When used on ESP8266, this conversion union may not work // It might work as it is 32-bit in size. @@ -543,11 +543,11 @@ public: uint8_t TaskDeviceSendDataFlags[N_TASKS] = {0}; uint8_t VariousTaskBits[N_TASKS] = {0}; uint8_t TaskDeviceDataFeed[N_TASKS] = {0}; // When set to 0, only read local connected sensorsfeeds - unsigned long TaskDeviceTimer[N_TASKS] = {0}; + uint32_t TaskDeviceTimer[N_TASKS] = {0}; boolean TaskDeviceEnabled[N_TASKS] = {0}; boolean ControllerEnabled[CONTROLLER_MAX] = {0}; boolean NotificationEnabled[NOTIFICATION_MAX] = {0}; - unsigned int TaskDeviceID[CONTROLLER_MAX][N_TASKS]{}; // IDX number (mainly used by Domoticz) + uint32_t TaskDeviceID[CONTROLLER_MAX][N_TASKS]{}; // IDX number (mainly used by Domoticz) boolean TaskDeviceSendData[CONTROLLER_MAX][N_TASKS]{}; boolean Pin_status_led_Inversed = false; boolean deepSleepOnFail = false; diff --git a/src/src/DataStructs_templ/SettingsStruct.cpp b/src/src/DataStructs_templ/SettingsStruct.cpp index 886ff6bce..5d378aa74 100644 --- a/src/src/DataStructs_templ/SettingsStruct.cpp +++ b/src/src/DataStructs_templ/SettingsStruct.cpp @@ -38,27 +38,27 @@ /* // VariousBits1 defaults to 0, keep in mind when adding bit lookups. -template +template bool SettingsStruct_tmpl::appendUnitToHostname() const { return !bitRead(VariousBits1, 1); } -template +template void SettingsStruct_tmpl::appendUnitToHostname(bool value) { bitWrite(VariousBits1, 1, !value); } -template +template bool SettingsStruct_tmpl::uniqueMQTTclientIdReconnect_unused() const { return bitRead(VariousBits1, 2); } -template +template void SettingsStruct_tmpl::uniqueMQTTclientIdReconnect_unused(bool value) { bitWrite(VariousBits1, 2, value); } -template +template bool SettingsStruct_tmpl::OldRulesEngine() const { #ifdef WEBSERVER_NEW_RULES return !bitRead(VariousBits1, 3); @@ -67,83 +67,83 @@ bool SettingsStruct_tmpl::OldRulesEngine() const { #endif } -template +template void SettingsStruct_tmpl::OldRulesEngine(bool value) { bitWrite(VariousBits1, 3, !value); } -template +template bool SettingsStruct_tmpl::ForceWiFi_bg_mode() const { return bitRead(VariousBits1, 4); } -template +template void SettingsStruct_tmpl::ForceWiFi_bg_mode(bool value) { bitWrite(VariousBits1, 4, value); } -template +template bool SettingsStruct_tmpl::WiFiRestart_connection_lost() const { return bitRead(VariousBits1, 5); } -template +template void SettingsStruct_tmpl::WiFiRestart_connection_lost(bool value) { bitWrite(VariousBits1, 5, value); } -template +template bool SettingsStruct_tmpl::EcoPowerMode() const { return bitRead(VariousBits1, 6); } -template +template void SettingsStruct_tmpl::EcoPowerMode(bool value) { bitWrite(VariousBits1, 6, value); } -template +template bool SettingsStruct_tmpl::WifiNoneSleep() const { return bitRead(VariousBits1, 7); } -template +template void SettingsStruct_tmpl::WifiNoneSleep(bool value) { bitWrite(VariousBits1, 7, value); } // Enable send gratuitous ARP by default, so invert the values (default = 0) -template +template bool SettingsStruct_tmpl::gratuitousARP() const { return !bitRead(VariousBits1, 8); } -template +template void SettingsStruct_tmpl::gratuitousARP(bool value) { bitWrite(VariousBits1, 8, !value); } -template +template bool SettingsStruct_tmpl::TolerantLastArgParse() const { return bitRead(VariousBits1, 9); } -template +template void SettingsStruct_tmpl::TolerantLastArgParse(bool value) { bitWrite(VariousBits1, 9, value); } -template +template bool SettingsStruct_tmpl::SendToHttp_ack() const { return bitRead(VariousBits1, 10); } -template +template void SettingsStruct_tmpl::SendToHttp_ack(bool value) { bitWrite(VariousBits1, 10, value); } -template +template bool SettingsStruct_tmpl::UseESPEasyNow() const { #ifdef USES_ESPEASY_NOW return bitRead(VariousBits1, 11); @@ -152,39 +152,39 @@ bool SettingsStruct_tmpl::UseESPEasyNow() const { #endif } -template +template void SettingsStruct_tmpl::UseESPEasyNow(bool value) { #ifdef USES_ESPEASY_NOW bitWrite(VariousBits1, 11, value); #endif } -template +template bool SettingsStruct_tmpl::IncludeHiddenSSID() const { return bitRead(VariousBits1, 12); } -template +template void SettingsStruct_tmpl::IncludeHiddenSSID(bool value) { bitWrite(VariousBits1, 12, value); } -template +template bool SettingsStruct_tmpl::UseMaxTXpowerForSending() const { return bitRead(VariousBits1, 13); } -template +template void SettingsStruct_tmpl::UseMaxTXpowerForSending(bool value) { bitWrite(VariousBits1, 13, value); } -template +template bool SettingsStruct_tmpl::ApCaptivePortal() const { return bitRead(VariousBits1, 14); } -template +template void SettingsStruct_tmpl::ApCaptivePortal(bool value) { bitWrite(VariousBits1, 14, value); } @@ -192,18 +192,18 @@ void SettingsStruct_tmpl::ApCaptivePortal(bool value) { // VariousBits1 bit 15 was used by PeriodicalScanWiFi // Now removed, is reset to 0, can be used for some other setting. -template +template bool SettingsStruct_tmpl::JSONBoolWithoutQuotes() const { return bitRead(VariousBits1, 16); } -template +template void SettingsStruct_tmpl::JSONBoolWithoutQuotes(bool value) { bitWrite(VariousBits1, 16, value); } */ -template +template bool SettingsStruct_tmpl::CombineTaskValues_SingleEvent(taskIndex_t taskIndex) const { if (validTaskIndex(taskIndex)) { return bitRead(TaskDeviceSendDataFlags[taskIndex], 0); @@ -211,7 +211,7 @@ bool SettingsStruct_tmpl::CombineTaskValues_SingleEvent(taskIndex_t tas return false; } -template +template void SettingsStruct_tmpl::CombineTaskValues_SingleEvent(taskIndex_t taskIndex, bool value) { if (validTaskIndex(taskIndex)) { bitWrite(TaskDeviceSendDataFlags[taskIndex], 0, value); @@ -219,7 +219,7 @@ void SettingsStruct_tmpl::CombineTaskValues_SingleEvent(taskIndex_t tas } #if FEATURE_STRING_VARIABLES -template +template bool SettingsStruct_tmpl::ShowDerivedTaskValues(taskIndex_t taskIndex) const { if (validTaskIndex(taskIndex)) { return bitRead(TaskDeviceSendDataFlags[taskIndex], 1); @@ -227,14 +227,14 @@ bool SettingsStruct_tmpl::ShowDerivedTaskValues(taskIndex_t taskIndex) return false; } -template +template void SettingsStruct_tmpl::ShowDerivedTaskValues(taskIndex_t taskIndex, bool value) { if (validTaskIndex(taskIndex)) { bitWrite(TaskDeviceSendDataFlags[taskIndex], 1, value); } } -template +template bool SettingsStruct_tmpl::EventAndLogDerivedTaskValues(taskIndex_t taskIndex) const { if (validTaskIndex(taskIndex)) { return bitRead(TaskDeviceSendDataFlags[taskIndex], 2); @@ -242,14 +242,14 @@ bool SettingsStruct_tmpl::EventAndLogDerivedTaskValues(taskIndex_t task return false; } -template +template void SettingsStruct_tmpl::EventAndLogDerivedTaskValues(taskIndex_t taskIndex, bool value) { if (validTaskIndex(taskIndex)) { bitWrite(TaskDeviceSendDataFlags[taskIndex], 2, value); } } -template +template bool SettingsStruct_tmpl::SendDerivedTaskValues(taskIndex_t taskIndex, controllerIndex_t controllerIndex) const { if (validTaskIndex(taskIndex) && validControllerIndex(controllerIndex)) { return bitRead(TaskDeviceSendDataFlags[taskIndex], 3 + controllerIndex); // ATTENTION: uses bits 3..6!!! @@ -257,7 +257,7 @@ bool SettingsStruct_tmpl::SendDerivedTaskValues(taskIndex_t taskIndex, return false; } -template +template void SettingsStruct_tmpl::SendDerivedTaskValues(taskIndex_t taskIndex, controllerIndex_t controllerIndex, bool value) { if (validTaskIndex(taskIndex) && validControllerIndex(controllerIndex)) { bitWrite(TaskDeviceSendDataFlags[taskIndex], 3 + controllerIndex, value); // ATTENTION: uses bits 3..6!!! @@ -265,183 +265,183 @@ void SettingsStruct_tmpl::SendDerivedTaskValues(taskIndex_t taskIndex, } #endif // if FEATURE_STRING_VARIABLES /* -template +template bool SettingsStruct_tmpl::DoNotStartAP() const { return bitRead(VariousBits1, 17); } -template +template void SettingsStruct_tmpl::DoNotStartAP(bool value) { bitWrite(VariousBits1, 17, value); } -template +template bool SettingsStruct_tmpl::UseAlternativeDeepSleep() const { return bitRead(VariousBits1, 18); } -template +template void SettingsStruct_tmpl::UseAlternativeDeepSleep(bool value) { bitWrite(VariousBits1, 18, value); } -template +template bool SettingsStruct_tmpl::UseLastWiFiFromRTC() const { return bitRead(VariousBits1, 19); } -template +template void SettingsStruct_tmpl::UseLastWiFiFromRTC(bool value) { bitWrite(VariousBits1, 19, value); } -template +template bool SettingsStruct_tmpl::EnableTimingStats() const { return bitRead(VariousBits1, 20); } -template +template void SettingsStruct_tmpl::EnableTimingStats(bool value) { bitWrite(VariousBits1, 20, value); } -template +template bool SettingsStruct_tmpl::AllowTaskValueSetAllPlugins() const { return bitRead(VariousBits1, 21); } -template +template void SettingsStruct_tmpl::AllowTaskValueSetAllPlugins(bool value) { bitWrite(VariousBits1, 21, value); } -template +template bool SettingsStruct_tmpl::EnableClearHangingI2Cbus() const { return bitRead(VariousBits1, 22); } -template +template void SettingsStruct_tmpl::EnableClearHangingI2Cbus(bool value) { bitWrite(VariousBits1, 22, value); } -template +template bool SettingsStruct_tmpl::EnableRAMTracking() const { return bitRead(VariousBits1, 23); } -template +template void SettingsStruct_tmpl::EnableRAMTracking(bool value) { bitWrite(VariousBits1, 23, value); } -template +template bool SettingsStruct_tmpl::EnableRulesCaching() const { return !bitRead(VariousBits1, 24); } -template +template void SettingsStruct_tmpl::EnableRulesCaching(bool value) { bitWrite(VariousBits1, 24, !value); } -template +template bool SettingsStruct_tmpl::EnableRulesEventReorder() const { return !bitRead(VariousBits1, 25); } -template +template void SettingsStruct_tmpl::EnableRulesEventReorder(bool value) { bitWrite(VariousBits1, 25, !value); } -template +template bool SettingsStruct_tmpl::AllowOTAUnlimited() const { return bitRead(VariousBits1, 26); } -template +template void SettingsStruct_tmpl::AllowOTAUnlimited(bool value) { bitWrite(VariousBits1, 26, value); } -template +template bool SettingsStruct_tmpl::SendToHTTP_follow_redirects() const { return bitRead(VariousBits1, 27); } -template +template void SettingsStruct_tmpl::SendToHTTP_follow_redirects(bool value) { bitWrite(VariousBits1, 27, value); } #if FEATURE_AUTO_DARK_MODE -template +template uint8_t SettingsStruct_tmpl::getCssMode() const { return get2BitFromUL(VariousBits1, 28); // Also occupies bit 29! } -template +template void SettingsStruct_tmpl::setCssMode(uint8_t value) { set2BitToUL(VariousBits1, 28, value); // Also occupies bit 29! } #endif // FEATURE_AUTO_DARK_MODE #if FEATURE_I2C_DEVICE_CHECK -template +template bool SettingsStruct_tmpl::CheckI2Cdevice() const { // Inverted return !bitRead(VariousBits1, 30); } -template +template void SettingsStruct_tmpl::CheckI2Cdevice(bool value) { // Inverted bitWrite(VariousBits1, 30, !value); } #endif // if FEATURE_I2C_DEVICE_CHECK */ /* -template +template bool SettingsStruct_tmpl::WaitWiFiConnect() const { return bitRead(VariousBits2, 0); } -template +template void SettingsStruct_tmpl::WaitWiFiConnect(bool value) { bitWrite(VariousBits2, 0, value); } -template +template bool SettingsStruct_tmpl::SDK_WiFi_autoreconnect() const { return bitRead(VariousBits2, 1); } -template +template void SettingsStruct_tmpl::SDK_WiFi_autoreconnect(bool value) { bitWrite(VariousBits2, 1, value); } #if FEATURE_RULES_EASY_COLOR_CODE -template +template bool SettingsStruct_tmpl::DisableRulesCodeCompletion() const { return bitRead(VariousBits2, 2); } -template +template void SettingsStruct_tmpl::DisableRulesCodeCompletion(bool value) { bitWrite(VariousBits2, 2, value); } #endif // if FEATURE_RULES_EASY_COLOR_CODE #if FEATURE_TARSTREAM_SUPPORT -template +template bool SettingsStruct_tmpl::DisableSaveConfigAsTar() const { return bitRead(VariousBits2, 3); // Using bit 4 now... } -template +template void SettingsStruct_tmpl::DisableSaveConfigAsTar(bool value) { bitWrite(VariousBits2, 3, value); // Using bit 4 now... } @@ -449,7 +449,7 @@ void SettingsStruct_tmpl::DisableSaveConfigAsTar(bool value) { */ -template +template bool SettingsStruct_tmpl::isTaskEnableReadonly(taskIndex_t taskIndex) const { if (validTaskIndex(taskIndex)) { return bitRead(VariousTaskBits[taskIndex], 0); @@ -457,7 +457,7 @@ bool SettingsStruct_tmpl::isTaskEnableReadonly(taskIndex_t taskIndex) c return false; } -template +template void SettingsStruct_tmpl::setTaskEnableReadonly(taskIndex_t taskIndex, bool value) { if (validTaskIndex(taskIndex)) { bitWrite(VariousTaskBits[taskIndex], 0, value); @@ -465,7 +465,7 @@ void SettingsStruct_tmpl::setTaskEnableReadonly(taskIndex_t taskIndex, } #if FEATURE_PLUGIN_PRIORITY -template +template bool SettingsStruct_tmpl::isPowerManagerTask(taskIndex_t taskIndex) const { if (validTaskIndex(taskIndex)) { return bitRead(VariousTaskBits[taskIndex], 1); @@ -473,14 +473,14 @@ bool SettingsStruct_tmpl::isPowerManagerTask(taskIndex_t taskIndex) con return false; } -template +template void SettingsStruct_tmpl::setPowerManagerTask(taskIndex_t taskIndex, bool value) { if (validTaskIndex(taskIndex)) { bitWrite(VariousTaskBits[taskIndex], 1, value); } } -template +template bool SettingsStruct_tmpl::isPriorityTask(taskIndex_t taskIndex) const { if (validTaskIndex(taskIndex)) { return isPowerManagerTask(taskIndex); // Add more? @@ -490,7 +490,7 @@ bool SettingsStruct_tmpl::isPriorityTask(taskIndex_t taskIndex) const { #endif // if FEATURE_PLUGIN_PRIORITY #if FEATURE_MQTT -template +template bool SettingsStruct_tmpl::SendRetainedTaskValues(taskIndex_t taskIndex, controllerIndex_t controllerIndex) const { if (validTaskIndex(taskIndex) && validControllerIndex(controllerIndex)) { return bitRead(VariousTaskBits[taskIndex], 2 + controllerIndex); // ATTENTION: uses bits 2..5!!! @@ -498,7 +498,7 @@ bool SettingsStruct_tmpl::SendRetainedTaskValues(taskIndex_t taskIndex, return false; } -template +template void SettingsStruct_tmpl::SendRetainedTaskValues(taskIndex_t taskIndex, controllerIndex_t controllerIndex, bool value) { if (validTaskIndex(taskIndex) && validControllerIndex(controllerIndex)) { bitWrite(VariousTaskBits[taskIndex], 2 + controllerIndex, value); // ATTENTION: uses bits 2..5!!! @@ -506,12 +506,12 @@ void SettingsStruct_tmpl::SendRetainedTaskValues(taskIndex_t taskIndex, } #endif // if FEATURE_MQTT -template +template ExtTimeSource_e SettingsStruct_tmpl::ExtTimeSource() const { return static_cast(ExternalTimeSource >> 1); } -template +template void SettingsStruct_tmpl::ExtTimeSource(ExtTimeSource_e value) { uint8_t newValue = static_cast(value) << 1; if (UseNTP()) { @@ -520,18 +520,18 @@ void SettingsStruct_tmpl::ExtTimeSource(ExtTimeSource_e value) { ExternalTimeSource = newValue; } -template +template bool SettingsStruct_tmpl::UseNTP() const { return bitRead(ExternalTimeSource, 0); } -template +template void SettingsStruct_tmpl::UseNTP(bool value) { bitWrite(ExternalTimeSource, 0, value); } -template +template void SettingsStruct_tmpl::validate() { if (UDPPort > 65535) { UDPPort = 0; } @@ -584,12 +584,12 @@ void SettingsStruct_tmpl::validate() { } } -template +template bool SettingsStruct_tmpl::networkSettingsEmpty() const { return IP[0] == 0 && Gateway[0] == 0 && Subnet[0] == 0 && DNS[0] == 0; } -template +template void SettingsStruct_tmpl::clearNetworkSettings() { for (uint8_t i = 0; i < 4; ++i) { IP[i] = 0; @@ -603,7 +603,7 @@ void SettingsStruct_tmpl::clearNetworkSettings() { } } -template +template void SettingsStruct_tmpl::clearTimeSettings() { ExternalTimeSource = 0; ZERO_FILL(NTPHost); @@ -615,7 +615,7 @@ void SettingsStruct_tmpl::clearTimeSettings() { Longitude = 0.0f; } -template +template void SettingsStruct_tmpl::clearNotifications() { for (uint8_t i = 0; i < NOTIFICATION_MAX; ++i) { Notification[i] = 0u;// .setInvalid(); @@ -623,7 +623,7 @@ void SettingsStruct_tmpl::clearNotifications() { } } -template +template void SettingsStruct_tmpl::clearControllers() { for (controllerIndex_t i = 0; i < CONTROLLER_MAX; ++i) { Protocol[i] = 0; @@ -631,14 +631,14 @@ void SettingsStruct_tmpl::clearControllers() { } } -template +template void SettingsStruct_tmpl::clearTasks() { for (taskIndex_t task = 0; task < N_TASKS; ++task) { clearTask(task); } } -template +template void SettingsStruct_tmpl::clearLogSettings() { SyslogLevel = 0; SerialLogLevel = 0; @@ -648,7 +648,7 @@ void SettingsStruct_tmpl::clearLogSettings() { ZERO_FILL(Syslog_IP); } -template +template void SettingsStruct_tmpl::clearUnitNameSettings() { Unit = 0; appendUnitToHostname(false); @@ -656,7 +656,7 @@ void SettingsStruct_tmpl::clearUnitNameSettings() { UDPPort = 0; } -template +template void SettingsStruct_tmpl::clearMisc() { PID = ESP_PROJECT_PID; Version = VERSION; @@ -750,7 +750,7 @@ void SettingsStruct_tmpl::clearMisc() { } -template +template void SettingsStruct_tmpl::clearTask(taskIndex_t task) { if (task >= N_TASKS) { return; } @@ -787,12 +787,12 @@ void SettingsStruct_tmpl::clearTask(taskIndex_t task) { I2C_Multiplexer_Channel[task] = -1; } -template +template String SettingsStruct_tmpl::getHostname() const { return this->getHostname(this->appendUnitToHostname()); } -template +template String SettingsStruct_tmpl::getHostname(bool appendUnit) const { String hostname = this->getName(); @@ -803,14 +803,14 @@ String SettingsStruct_tmpl::getHostname(bool appendUnit) const { return hostname; } -template +template String SettingsStruct_tmpl::getName() const { String unitname = this->Name; return parseTemplate(unitname); } -template +template bool SettingsStruct_tmpl::getPinBootStateIndex( int8_t gpio_pin, int8_t& index_low @@ -900,7 +900,7 @@ bool SettingsStruct_tmpl::getPinBootStateIndex( return false; } -template +template PinBootState SettingsStruct_tmpl::getPinBootState(int8_t gpio_pin) const { if (gpio_pin < 0) return PinBootState::Default_state; # ifdef ESP8266 @@ -928,7 +928,7 @@ PinBootState SettingsStruct_tmpl::getPinBootState(int8_t gpio_pin) cons return PinBootState::Default_state; } -template +template void SettingsStruct_tmpl::setPinBootState(int8_t gpio_pin, PinBootState state) { if (gpio_pin < 0) return; # ifdef ESP8266 @@ -955,7 +955,7 @@ void SettingsStruct_tmpl::setPinBootState(int8_t gpio_pin, PinBootState # endif // ifdef ESP32 } -template +template bool SettingsStruct_tmpl::getSPI_pins(int8_t spi_gpios[3]) const { spi_gpios[0] = -1; spi_gpios[1] = -1; @@ -1002,7 +1002,7 @@ bool SettingsStruct_tmpl::getSPI_pins(int8_t spi_gpios[3]) const { } #ifdef ESP32 -template +template spi_host_device_t SettingsStruct_tmpl::getSPI_host() const { if (isSPI_valid()) { @@ -1048,7 +1048,7 @@ spi_host_device_t SettingsStruct_tmpl::getSPI_host() const #endif -template +template bool SettingsStruct_tmpl::isSPI_pin(int8_t pin) const { if (pin < 0) { return false; } int8_t spi_gpios[3]; @@ -1061,7 +1061,7 @@ bool SettingsStruct_tmpl::isSPI_pin(int8_t pin) const { return false; } -template +template bool SettingsStruct_tmpl::isSPI_valid() const { if (InitSPI == static_cast(SPI_Options_e::None)) { return false; } @@ -1076,7 +1076,7 @@ bool SettingsStruct_tmpl::isSPI_valid() const { return true; } -template +template bool SettingsStruct_tmpl::isI2C_pin(int8_t pin) const { if (pin < 0) { return false; } #if !FEATURE_I2C_MULTIPLE @@ -1092,7 +1092,7 @@ bool SettingsStruct_tmpl::isI2C_pin(int8_t pin) const { return false; } -template +template bool SettingsStruct_tmpl::isI2CEnabled(uint8_t i2cBus) const { return (getI2CSdaPin(i2cBus) != -1) && (getI2CSclPin(i2cBus) != -1) && @@ -1100,12 +1100,12 @@ bool SettingsStruct_tmpl::isI2CEnabled(uint8_t i2cBus) const { (getI2CClockSpeedSlow(i2cBus) > 0); } -template +template uint8_t SettingsStruct_tmpl::getI2CInterface(taskIndex_t TaskIndex) const { return get3BitFromUL(I2C_Flags[TaskIndex], I2C_FLAGS_BUS_NUMBER); } -template +template int8_t SettingsStruct_tmpl::getI2CSdaPin(uint8_t i2cBus) const { if (0 == i2cBus) { return Pin_i2c_sda; @@ -1121,7 +1121,7 @@ int8_t SettingsStruct_tmpl::getI2CSdaPin(uint8_t i2cBus) const { return -1; } -template +template int8_t SettingsStruct_tmpl::getI2CSclPin(uint8_t i2cBus) const { if (0 == i2cBus) { return Pin_i2c_scl; @@ -1137,7 +1137,7 @@ int8_t SettingsStruct_tmpl::getI2CSclPin(uint8_t i2cBus) const { return -1; } -template +template uint32_t SettingsStruct_tmpl::getI2CClockSpeed(uint8_t i2cBus) const { if (0 == i2cBus) { return I2C_clockSpeed; @@ -1153,7 +1153,7 @@ uint32_t SettingsStruct_tmpl::getI2CClockSpeed(uint8_t i2cBus) const { return 0u; } -template +template uint32_t SettingsStruct_tmpl::getI2CClockSpeedSlow(uint8_t i2cBus) const { if (0 == i2cBus) { return I2C_clockSpeed_Slow; @@ -1169,7 +1169,7 @@ uint32_t SettingsStruct_tmpl::getI2CClockSpeedSlow(uint8_t i2cBus) cons return 0u; } -template +template uint32_t SettingsStruct_tmpl::getI2CClockStretch(uint8_t i2cBus) const { if (0 == i2cBus) { return WireClockStretchLimit; @@ -1178,24 +1178,24 @@ uint32_t SettingsStruct_tmpl::getI2CClockStretch(uint8_t i2cBus) const } #if FEATURE_I2C_MULTIPLE -template +template uint8_t SettingsStruct_tmpl::getI2CInterfaceRTC() const { return get3BitFromUL(I2C_peripheral_bus, I2C_PERIPHERAL_BUS_CLOCK); } -template +template uint8_t SettingsStruct_tmpl::getI2CInterfaceWDT() const { return get3BitFromUL(I2C_peripheral_bus, I2C_PERIPHERAL_BUS_WDT); } -template +template uint8_t SettingsStruct_tmpl::getI2CInterfacePCFMCP() const { return get3BitFromUL(I2C_peripheral_bus, I2C_PERIPHERAL_BUS_PCFMCP); } #endif // if FEATURE_I2C_MULTIPLE #if FEATURE_I2CMULTIPLEXER -template +template int8_t SettingsStruct_tmpl::getI2CMultiplexerType(uint8_t i2cBus) const { if (0 == i2cBus) { return I2C_Multiplexer_Type; @@ -1211,7 +1211,7 @@ int8_t SettingsStruct_tmpl::getI2CMultiplexerType(uint8_t i2cBus) const return -1; } -template +template int8_t SettingsStruct_tmpl::getI2CMultiplexerAddr(uint8_t i2cBus) const { if (0 == i2cBus) { return I2C_Multiplexer_Addr; @@ -1227,7 +1227,7 @@ int8_t SettingsStruct_tmpl::getI2CMultiplexerAddr(uint8_t i2cBus) const return -1; } -template +template int8_t SettingsStruct_tmpl::getI2CMultiplexerResetPin(uint8_t i2cBus) const { if (0 == i2cBus) { return I2C_Multiplexer_ResetPin; @@ -1244,7 +1244,7 @@ int8_t SettingsStruct_tmpl::getI2CMultiplexerResetPin(uint8_t i2cBus) c } #endif // if FEATURE_I2CMULTIPLEXER -template +template bool SettingsStruct_tmpl::isEthernetPin(int8_t pin) const { #if FEATURE_ETHERNET if (pin < 0) return false; @@ -1281,7 +1281,7 @@ bool SettingsStruct_tmpl::isEthernetPin(int8_t pin) const { } -template +template bool SettingsStruct_tmpl::isEthernetPinOptional(int8_t pin) const { #if FEATURE_ETHERNET if (pin < 0) return false; @@ -1299,7 +1299,7 @@ bool SettingsStruct_tmpl::isEthernetPinOptional(int8_t pin) const { return false; } -template +template int8_t SettingsStruct_tmpl::getTaskDevicePin(taskIndex_t taskIndex, uint8_t pinnr) const { if (validTaskIndex(taskIndex)) { switch(pinnr) { @@ -1311,17 +1311,17 @@ int8_t SettingsStruct_tmpl::getTaskDevicePin(taskIndex_t taskIndex, uin return -1; } -template +template float SettingsStruct_tmpl::getWiFi_TX_power() const { return WiFi_TX_power / 4.0f; } -template +template void SettingsStruct_tmpl::setWiFi_TX_power(float dBm) { WiFi_TX_power = dBm * 4.0f; } -template +template pluginID_t SettingsStruct_tmpl::getPluginID_for_task(taskIndex_t taskIndex) const { if (validTaskIndex(taskIndex)) { const uint8_t tdn = TaskDeviceNumber[taskIndex]; @@ -1332,7 +1332,7 @@ pluginID_t SettingsStruct_tmpl::getPluginID_for_task(taskIndex_t taskIn return INVALID_PLUGIN_ID; } -template +template ESPEasy::net::nwpluginID_t SettingsStruct_tmpl::getNWPluginID_for_network(ESPEasy::net::networkIndex_t index) const { if (validNetworkIndex(index)) { @@ -1344,7 +1344,7 @@ ESPEasy::net::nwpluginID_t SettingsStruct_tmpl::getNWPluginID_for_netwo return ESPEasy::net::INVALID_NW_PLUGIN_ID; } -template +template void SettingsStruct_tmpl::setNWPluginID_for_network(ESPEasy::net::networkIndex_t index, ESPEasy::net::nwpluginID_t id) { if (validNetworkIndex(index)) { @@ -1367,7 +1367,7 @@ void SettingsStruct_tmpl::setNWPluginID_for_network(ESPEasy::net::netwo #ifdef ESP32 -template +template uint8_t SettingsStruct_tmpl::getRoutePrio_for_network(ESPEasy::net::networkIndex_t index) const { if (validNetworkIndex(index)) { @@ -1376,7 +1376,7 @@ uint8_t SettingsStruct_tmpl::getRoutePrio_for_network(ESPEasy::net::net return 0; } -template +template void SettingsStruct_tmpl::setRoutePrio_for_network(ESPEasy::net::networkIndex_t index, uint8_t prio) { if (validNetworkIndex(index)) { @@ -1385,7 +1385,7 @@ void SettingsStruct_tmpl::setRoutePrio_for_network(ESPEasy::net::networ } #endif -template +template uint32_t SettingsStruct_tmpl::getNetworkInterfaceStartupDelayAtBoot(ESPEasy::net::networkIndex_t index) const { if (validNetworkIndex(index)) { @@ -1394,7 +1394,7 @@ uint32_t SettingsStruct_tmpl::getNetworkInterfaceStartupDelayAtBoot(ESP return 0; } -template +template void SettingsStruct_tmpl::setNetworkInterfaceStartupDelayAtBoot(ESPEasy::net::networkIndex_t index, uint32_t delay_ms) { if (validNetworkIndex(index)) { diff --git a/src/src/Helpers/KeyValueWriter.cpp b/src/src/Helpers/KeyValueWriter.cpp index 3d9a3cf69..edc2b5370 100644 --- a/src/src/Helpers/KeyValueWriter.cpp +++ b/src/src/Helpers/KeyValueWriter.cpp @@ -23,7 +23,7 @@ KeyValueStruct::KeyValueStruct(const String& key) : _key(key) {} KeyValueStruct::KeyValueStruct(const String & key, - bool val, + const bool& val, ValueStruct::ValueType vType) : _key(key) { _values.emplace_back(String(val), vType); @@ -36,6 +36,27 @@ KeyValueStruct::KeyValueStruct(const String & key, _values.emplace_back(String(val), vType); } +KeyValueStruct::KeyValueStruct(const String & key, + int32_t val, + ValueStruct::ValueType vType) + : _key(key) { + _values.emplace_back(String(val), vType); +} + +KeyValueStruct::KeyValueStruct(const String & key, + uint32_t val, + ValueStruct::ValueType vType) + : _key(key) { + _values.emplace_back(String(val), vType); +} + +KeyValueStruct::KeyValueStruct(const String & key, + size_t val, + ValueStruct::ValueType vType) + : _key(key) { + _values.emplace_back(String(val), vType); +} + KeyValueStruct::KeyValueStruct(const String & key, const uint64_t & val, ValueStruct::ValueType vType) @@ -85,6 +106,13 @@ KeyValueStruct::KeyValueStruct(const __FlashStringHelper *key, _values.emplace_back(val, vType); } +KeyValueStruct::KeyValueStruct(const String & key, + const __FlashStringHelper *val, + ValueStruct::ValueType vType) + : _key(key) { + _values.emplace_back(val, vType); +} + KeyValueStruct::KeyValueStruct(const __FlashStringHelper *key, const __FlashStringHelper *val, ValueStruct::ValueType vType) @@ -92,6 +120,13 @@ KeyValueStruct::KeyValueStruct(const __FlashStringHelper *key, _values.emplace_back(val, vType); } +KeyValueStruct::KeyValueStruct(const __FlashStringHelper *key, + const char *val, + ValueStruct::ValueType vType) + : _key(key) { + _values.emplace_back(String(val), vType); +} + KeyValueStruct::KeyValueStruct(const String & key, const String & val, ValueStruct::ValueType vType) diff --git a/src/src/Helpers/KeyValueWriter.h b/src/src/Helpers/KeyValueWriter.h index 3045a564f..e69890dca 100644 --- a/src/src/Helpers/KeyValueWriter.h +++ b/src/src/Helpers/KeyValueWriter.h @@ -53,13 +53,25 @@ struct KeyValueStruct KeyValueStruct(const String& key); KeyValueStruct(const String & key, - bool val, + const bool& val, ValueStruct::ValueType vType = ValueStruct::ValueType::Bool); KeyValueStruct(const String & key, int val, ValueStruct::ValueType vType = ValueStruct::ValueType::Int); + KeyValueStruct(const String & key, + int32_t val, + ValueStruct::ValueType vType = ValueStruct::ValueType::Int); + + KeyValueStruct(const String & key, + uint32_t val, + ValueStruct::ValueType vType = ValueStruct::ValueType::Int); + + KeyValueStruct(const String & key, + size_t val, + ValueStruct::ValueType vType = ValueStruct::ValueType::Int); + KeyValueStruct(const String & key, const uint64_t & val, ValueStruct::ValueType vType = ValueStruct::ValueType::Int); @@ -84,10 +96,18 @@ struct KeyValueStruct const String & val, ValueStruct::ValueType vType = ValueStruct::ValueType::Auto); + KeyValueStruct(const String & key, + const __FlashStringHelper *val, + ValueStruct::ValueType vType = ValueStruct::ValueType::Auto); + KeyValueStruct(const __FlashStringHelper *key, const __FlashStringHelper *val, ValueStruct::ValueType vType = ValueStruct::ValueType::Auto); + KeyValueStruct(const __FlashStringHelper *key, + const char *val, + ValueStruct::ValueType vType = ValueStruct::ValueType::Auto); + KeyValueStruct(const String & key, const String & val, ValueStruct::ValueType vType = ValueStruct::ValueType::Auto); @@ -100,7 +120,10 @@ struct KeyValueStruct KeyValueStruct(const String & key, String && val, ValueStruct::ValueType vType = ValueStruct::ValueType::Auto); - +/* +// TD-er: Do not use template types as it may 'explode' in binary size. +// For example "foo" and "test" will result in 2 compiled instances +// as they are const char[3] and const char[4] respectively. template KeyValueStruct(const String & key, const T & val, @@ -108,7 +131,7 @@ struct KeyValueStruct : _key(key) { _values.emplace_back(String(val), vType); } - +*/ KeyValueStruct(LabelType::Enum label); void setUnit(const String& unit); diff --git a/src/src/Helpers/StringConverter.cpp b/src/src/Helpers/StringConverter.cpp index cbcbd075f..88dd5fb32 100644 --- a/src/src/Helpers/StringConverter.cpp +++ b/src/src/Helpers/StringConverter.cpp @@ -59,6 +59,15 @@ String concat(const __FlashStringHelper * str, const __FlashStringHelper *val) { return concat(str, String(val)); } +String concat(const __FlashStringHelper * str, const char* val) { + return concat(String(str), String(val)); +} + +String concat(const String & str, const char* val) +{ + return concat(str, String(val)); +} + String concat(const char& str, const String &val) { String res(str); diff --git a/src/src/Helpers/StringConverter.h b/src/src/Helpers/StringConverter.h index 5e3eff182..d2f1a43dc 100644 --- a/src/src/Helpers/StringConverter.h +++ b/src/src/Helpers/StringConverter.h @@ -24,6 +24,10 @@ unsigned int count_newlines(const String& str); String concat(const __FlashStringHelper * str, const String &val); String concat(const __FlashStringHelper * str, const __FlashStringHelper *val); + +String concat(const __FlashStringHelper * str, const char* val); +String concat(const String & str, const char* val); + String concat(const char& str, const String &val); template diff --git a/src/src/PluginStructs/P128_data_struct.cpp b/src/src/PluginStructs/P128_data_struct.cpp index 5827e72e3..0f9a43475 100644 --- a/src/src/PluginStructs/P128_data_struct.cpp +++ b/src/src/PluginStructs/P128_data_struct.cpp @@ -1554,7 +1554,7 @@ void P128_data_struct::NeoPixelSendStatus(struct EventStruct *eventSource) { { KeyValueWriter_JSON writer(true, &status); - writer.write({F("plugin"), 128}); + writer.write({F("plugin"), 128}); writer.write({F("mode"), P128_modeType_toString(mode)}); writer.write({F("lastmode"), P128_modeType_toString(savemode)}); writer.write({F("fadetime"), static_cast(fadetime)}); diff --git a/src/src/WebServer/Log.cpp b/src/src/WebServer/Log.cpp index d74410643..196eeaf51 100644 --- a/src/src/WebServer/Log.cpp +++ b/src/src/WebServer/Log.cpp @@ -79,8 +79,8 @@ void handle_log_JSON() { } } } - unsigned long firstTimeStamp = 0; - unsigned long lastTimeStamp = 0; + uint32_t firstTimeStamp = 0; + uint32_t lastTimeStamp = 0; int nrEntries = 0; { @@ -113,9 +113,9 @@ void handle_log_JSON() { } } } - long logTimeSpan = timeDiff(firstTimeStamp, lastTimeStamp); - long refreshSuggestion = 1000; - long newOptimum = 1000; + int32_t logTimeSpan = timeDiff(firstTimeStamp, lastTimeStamp); + int32_t refreshSuggestion = 1000; + int32_t newOptimum = 1000; if ((nrEntries > 2) && (logTimeSpan > 1)) { // May need to lower the TTL for refresh when time needed @@ -134,7 +134,7 @@ void handle_log_JSON() { mainWriter->write({ F("timeHalfBuffer"), newOptimum }); mainWriter->write({ F("nrEntries"), nrEntries }); mainWriter->write({ F("SettingsWebLogLevel"), Settings.WebLogLevel }); - mainWriter->write({ F("logTimeSpan"), logTimeSpan }); + mainWriter->write({ F("logTimeSpan"), logTimeSpan }); } } } From 44271fc202962ba5dbd70c090b262f6667ebb9be Mon Sep 17 00:00:00 2001 From: TD-er Date: Sun, 5 Oct 2025 12:15:34 +0200 Subject: [PATCH 335/564] [JSON] Move KeyValueWriter_JSON to src/Helpers/ --- src/_C009.cpp | 2 +- src/src/Helpers/KeyValueWriter.cpp | 2 +- src/src/Helpers/KeyValueWriter.h | 40 ++++++++++--------- .../KeyValueWriter_JSON.cpp | 2 +- .../KeyValueWriter_JSON.h | 9 ++--- src/src/Helpers/_CPlugin_DomoticzHelper.cpp | 2 +- src/src/PluginStructs/P128_data_struct.cpp | 2 +- src/src/WebServer/JSON.cpp | 3 +- src/src/WebServer/JSON.h | 2 +- src/src/WebServer/KeyValueWriter_WebForm.cpp | 22 +++------- src/src/WebServer/KeyValueWriter_WebForm.h | 6 +-- src/src/WebServer/SysInfoPage.cpp | 39 +++++++----------- 12 files changed, 54 insertions(+), 77 deletions(-) rename src/src/{WebServer => Helpers}/KeyValueWriter_JSON.cpp (95%) rename src/src/{WebServer => Helpers}/KeyValueWriter_JSON.h (92%) diff --git a/src/_C009.cpp b/src/_C009.cpp index f2c280ce0..b2b538bff 100644 --- a/src/_C009.cpp +++ b/src/_C009.cpp @@ -3,7 +3,7 @@ # include "src/DataTypes/NodeTypeID.h" # include "src/Helpers/StringProvider.h" -# include "src/WebServer/KeyValueWriter_JSON.h" +# include "src/Helpers/KeyValueWriter_JSON.h" # include "src/CustomBuild/ESPEasy_buildinfo.h" diff --git a/src/src/Helpers/KeyValueWriter.cpp b/src/src/Helpers/KeyValueWriter.cpp index edc2b5370..3871e901d 100644 --- a/src/src/Helpers/KeyValueWriter.cpp +++ b/src/src/Helpers/KeyValueWriter.cpp @@ -23,7 +23,7 @@ KeyValueStruct::KeyValueStruct(const String& key) : _key(key) {} KeyValueStruct::KeyValueStruct(const String & key, - const bool& val, + const bool & val, ValueStruct::ValueType vType) : _key(key) { _values.emplace_back(String(val), vType); diff --git a/src/src/Helpers/KeyValueWriter.h b/src/src/Helpers/KeyValueWriter.h index e69890dca..887f0a5f9 100644 --- a/src/src/Helpers/KeyValueWriter.h +++ b/src/src/Helpers/KeyValueWriter.h @@ -53,7 +53,7 @@ struct KeyValueStruct KeyValueStruct(const String& key); KeyValueStruct(const String & key, - const bool& val, + const bool & val, ValueStruct::ValueType vType = ValueStruct::ValueType::Bool); KeyValueStruct(const String & key, @@ -120,18 +120,19 @@ struct KeyValueStruct KeyValueStruct(const String & key, String && val, ValueStruct::ValueType vType = ValueStruct::ValueType::Auto); -/* -// TD-er: Do not use template types as it may 'explode' in binary size. -// For example "foo" and "test" will result in 2 compiled instances -// as they are const char[3] and const char[4] respectively. - template - KeyValueStruct(const String & key, - const T & val, - ValueStruct::ValueType vType = ValueStruct::ValueType::Auto) - : _key(key) { - _values.emplace_back(String(val), vType); - } -*/ + + /* + // TD-er: Do not use template types as it may 'explode' in binary size. + // For example "foo" and "test" will result in 2 compiled instances + // as they are const char[3] and const char[4] respectively. + template + KeyValueStruct(const String & key, + const T & val, + ValueStruct::ValueType vType = ValueStruct::ValueType::Auto) + : _key(key) { + _values.emplace_back(String(val), vType); + } + */ KeyValueStruct(LabelType::Enum label); void setUnit(const String& unit); @@ -174,8 +175,9 @@ protected: KeyValueWriter(bool emptyHeader, KeyValueWriter*parent, PrintToString *toStr = nullptr) : _toString(toStr), _parent(parent), _hasHeader(emptyHeader) {} - KeyValueWriter(const String& header, KeyValueWriter*parent, PrintToString *toStr = nullptr) : _toString(toStr), _header(header), _parent(parent) - {} + KeyValueWriter(const String& header, KeyValueWriter*parent, PrintToString *toStr = nullptr) : _toString(toStr), _header(header), + _parent(parent) + {} public: @@ -220,11 +222,11 @@ public: return _toString->get(); } - String && getMove() + String&& getMove() { - if (_toString == nullptr) { - static String tmp; - return std::move(tmp); + if (_toString == nullptr) { + static String tmp; + return std::move(tmp); } return std::move(_toString->getMove()); } diff --git a/src/src/WebServer/KeyValueWriter_JSON.cpp b/src/src/Helpers/KeyValueWriter_JSON.cpp similarity index 95% rename from src/src/WebServer/KeyValueWriter_JSON.cpp rename to src/src/Helpers/KeyValueWriter_JSON.cpp index be1498aac..d29905779 100644 --- a/src/src/WebServer/KeyValueWriter_JSON.cpp +++ b/src/src/Helpers/KeyValueWriter_JSON.cpp @@ -1,4 +1,4 @@ -#include "../WebServer/KeyValueWriter_JSON.h" +#include "../Helpers/KeyValueWriter_JSON.h" #include "../Globals/Settings.h" #include "../Helpers/StringConverter.h" diff --git a/src/src/WebServer/KeyValueWriter_JSON.h b/src/src/Helpers/KeyValueWriter_JSON.h similarity index 92% rename from src/src/WebServer/KeyValueWriter_JSON.h rename to src/src/Helpers/KeyValueWriter_JSON.h index 58ff13aef..0858d0563 100644 --- a/src/src/WebServer/KeyValueWriter_JSON.h +++ b/src/src/Helpers/KeyValueWriter_JSON.h @@ -10,12 +10,11 @@ class KeyValueWriter_JSON : public KeyValueWriter { public: + /* + TODO TD-er: Replace + - stream_to_json_object_value used in ChartJS code -/* -TODO TD-er: Replace -- stream_to_json_object_value used in ChartJS code - -*/ + */ using KeyValueWriter::writeLabels; diff --git a/src/src/Helpers/_CPlugin_DomoticzHelper.cpp b/src/src/Helpers/_CPlugin_DomoticzHelper.cpp index 3aaf3bcb9..cd4a3a76d 100644 --- a/src/src/Helpers/_CPlugin_DomoticzHelper.cpp +++ b/src/src/Helpers/_CPlugin_DomoticzHelper.cpp @@ -12,7 +12,7 @@ # include "../Helpers/Convert.h" # include "../Helpers/StringConverter.h" -# include "../WebServer/KeyValueWriter_JSON.h" +# include "../Helpers/KeyValueWriter_JSON.h" # include "../../ESPEasy-Globals.h" diff --git a/src/src/PluginStructs/P128_data_struct.cpp b/src/src/PluginStructs/P128_data_struct.cpp index 0f9a43475..5a0a5b0d2 100644 --- a/src/src/PluginStructs/P128_data_struct.cpp +++ b/src/src/PluginStructs/P128_data_struct.cpp @@ -2,7 +2,7 @@ #ifdef USES_P128 # include "../PluginStructs/P128_data_struct.h" -# include "../WebServer/KeyValueWriter_JSON.h" +# include "../Helpers/KeyValueWriter_JSON.h" // ***************************************************************/ // Constructor diff --git a/src/src/WebServer/JSON.cpp b/src/src/WebServer/JSON.cpp index 5f9c4a86f..f9a93d5bc 100644 --- a/src/src/WebServer/JSON.cpp +++ b/src/src/WebServer/JSON.cpp @@ -8,8 +8,6 @@ // Move to other file #include "../WebServer/NetworkPage.h" -#include "../WebServer/KeyValueWriter_JSON.h" - #include "../CustomBuild/CompiletimeDefines.h" #include "../DataStructs/TimingStats.h" @@ -23,6 +21,7 @@ #include "../Helpers/_Plugin_init.h" #include "../Helpers/ESPEasyStatistics.h" #include "../Helpers/ESPEasy_Storage.h" +#include "../Helpers/KeyValueWriter_JSON.h" #include "../Helpers/Numerical.h" #include "../Helpers/StringConverter.h" #include "../Helpers/StringProvider.h" diff --git a/src/src/WebServer/JSON.h b/src/src/WebServer/JSON.h index c7dd768a7..cb58e305c 100644 --- a/src/src/WebServer/JSON.h +++ b/src/src/WebServer/JSON.h @@ -4,7 +4,7 @@ #include "../WebServer/common.h" -#include "../WebServer/KeyValueWriter_JSON.h" +#include "../Helpers/KeyValueWriter_JSON.h" // ******************************************************************************** // Web Interface get CSV value from task diff --git a/src/src/WebServer/KeyValueWriter_WebForm.cpp b/src/src/WebServer/KeyValueWriter_WebForm.cpp index dcc7006b9..3429ca467 100644 --- a/src/src/WebServer/KeyValueWriter_WebForm.cpp +++ b/src/src/WebServer/KeyValueWriter_WebForm.cpp @@ -36,7 +36,7 @@ KeyValueWriter_WebForm::KeyValueWriter_WebForm(const __FlashStringHelper *header KeyValueWriter_WebForm::~KeyValueWriter_WebForm() {} -void KeyValueWriter_WebForm::write() +void KeyValueWriter_WebForm::write() { if (_isEmpty) { if (_parent != nullptr) { _parent->write(); } @@ -70,22 +70,10 @@ void KeyValueWriter_WebForm::write(const KeyValueStruct& kv) } } -Sp_KeyValueWriter KeyValueWriter_WebForm::createChild() -{ - return std::make_shared(this); -} +Sp_KeyValueWriter KeyValueWriter_WebForm::createChild() { return std::make_shared(this); } -Sp_KeyValueWriter KeyValueWriter_WebForm::createChild(const String& header) -{ - return std::make_shared(header, this); -} +Sp_KeyValueWriter KeyValueWriter_WebForm::createChild(const String& header) { return std::make_shared(header, this); } -Sp_KeyValueWriter KeyValueWriter_WebForm::createNew() -{ - return std::make_shared(); -} +Sp_KeyValueWriter KeyValueWriter_WebForm::createNew() { return std::make_shared(); } -Sp_KeyValueWriter KeyValueWriter_WebForm::createNew(const String& header) -{ - return std::make_shared(header); -} +Sp_KeyValueWriter KeyValueWriter_WebForm::createNew(const String& header) { return std::make_shared(header); } diff --git a/src/src/WebServer/KeyValueWriter_WebForm.h b/src/src/WebServer/KeyValueWriter_WebForm.h index 2daf09841..8b92a8f33 100644 --- a/src/src/WebServer/KeyValueWriter_WebForm.h +++ b/src/src/WebServer/KeyValueWriter_WebForm.h @@ -27,11 +27,11 @@ public: virtual ~KeyValueWriter_WebForm(); - virtual void write(); + virtual void write(); - virtual void write(const KeyValueStruct& kv); + virtual void write(const KeyValueStruct& kv); - // Create writer of the same derived type, with this set as parent + // Create writer of the same derived type, with this set as parent virtual Sp_KeyValueWriter createChild(); virtual Sp_KeyValueWriter createChild(const String& header); diff --git a/src/src/WebServer/SysInfoPage.cpp b/src/src/WebServer/SysInfoPage.cpp index 2a70d2756..165434a45 100644 --- a/src/src/WebServer/SysInfoPage.cpp +++ b/src/src/WebServer/SysInfoPage.cpp @@ -2,41 +2,26 @@ #if defined(WEBSERVER_SYSINFO) || SHOW_SYSINFO_JSON -# include "../WebServer/AccessControl.h" -# include "../WebServer/ESPEasy_WebServer.h" -# include "../WebServer/HTML_wrappers.h" -# include "../WebServer/KeyValueWriter_JSON.h" - -# include "../WebServer/Markup.h" -# include "../WebServer/Markup_Buttons.h" - - # include "../../ESPEasy-Globals.h" - -# include "../Commands/Diagnostic.h" - -# include "../CustomBuild/CompiletimeDefines.h" - -# include "../DataStructs/RTCStruct.h" - -# include "../../ESPEasy/net/eth/ESPEasyEth.h" # include "../../ESPEasy/net/ESPEasyNetwork.h" -# include "../../ESPEasy/net/Helpers/NWAccessControl.h" -# include "../../ESPEasy/net/wifi/ESPEasyWifi.h" - - -# include "../Globals/CRCValues.h" -# include "../Globals/ESPEasy_time.h" # include "../../ESPEasy/net/Globals/ESPEasyWiFi.h" # include "../../ESPEasy/net/Globals/ESPEasyWiFiEvent.h" # include "../../ESPEasy/net/Globals/NetworkState.h" +# include "../../ESPEasy/net/Helpers/NWAccessControl.h" +# include "../../ESPEasy/net/eth/ESPEasyEth.h" +# include "../../ESPEasy/net/wifi/ESPEasyWifi.h" +# include "../Commands/Diagnostic.h" +# include "../CustomBuild/CompiletimeDefines.h" +# include "../DataStructs/RTCStruct.h" +# include "../Globals/CRCValues.h" +# include "../Globals/ESPEasy_time.h" # include "../Globals/RTC.h" # include "../Globals/Settings.h" - # include "../Helpers/Convert.h" # include "../Helpers/ESPEasyStatistics.h" # include "../Helpers/ESPEasy_Storage.h" # include "../Helpers/Hardware_device_info.h" +# include "../Helpers/KeyValueWriter_JSON.h" # include "../Helpers/Memory.h" # include "../Helpers/Misc.h" # include "../Helpers/Networking.h" @@ -45,8 +30,12 @@ # include "../Helpers/StringGenerator_GPIO.h" # include "../Helpers/StringGenerator_System.h" # include "../Helpers/StringProvider.h" - # include "../Static/WebStaticData.h" +# include "../WebServer/AccessControl.h" +# include "../WebServer/ESPEasy_WebServer.h" +# include "../WebServer/HTML_wrappers.h" +# include "../WebServer/Markup.h" +# include "../WebServer/Markup_Buttons.h" # if FEATURE_MQTT # include "../Globals/MQTT.h" From d52fa24d563e079c8a4835a77fc8548a681dace7 Mon Sep 17 00:00:00 2001 From: Ton Huisman Date: Sun, 5 Oct 2025 17:23:56 +0200 Subject: [PATCH 336/564] [Build] Split Display into Display A and Display B --- platformio_esp32_envs.ini | 15 +- platformio_esp32c3_envs.ini | 11 +- platformio_esp32c6_envs.ini | 11 +- platformio_esp32s2_envs.ini | 12 +- platformio_esp32s3_envs.ini | 12 +- platformio_esp82xx_envs.ini | 18 +- platformio_special_envs.ini | 7 +- src/src/CustomBuild/define_plugin_sets.h | 309 ++++++++++++++++------- src/src/PluginStructs/P037_data_struct.h | 4 +- src/src/PluginStructs/P104_data_struct.h | 10 +- 10 files changed, 300 insertions(+), 109 deletions(-) diff --git a/platformio_esp32_envs.ini b/platformio_esp32_envs.ini index 9e261988d..e64577096 100644 --- a/platformio_esp32_envs.ini +++ b/platformio_esp32_envs.ini @@ -237,15 +237,24 @@ build_flags = ${esp32_common_LittleFS_ETH.build_flags} -DPLUGIN_ENERGY_COLLECTION -[env:display_ESP32_4M316k_LittleFS_ETH] +[env:display_A_ESP32_4M316k_LittleFS_ETH] extends = esp32_common_LittleFS_ETH board = esp32_4M build_flags = ${esp32_common_LittleFS_ETH.build_flags} -DFEATURE_ARDUINO_OTA=1 - -DPLUGIN_DISPLAY_COLLECTION + -DPLUGIN_DISPLAY_A_COLLECTION -D ST7789_EXTRA_INIT=1 -D P116_EXTRA_ST7789=1 - + +[env:display_B_ESP32_4M316k_LittleFS_ETH] +extends = esp32_common_LittleFS_ETH +board = esp32_4M +build_flags = ${esp32_common_LittleFS_ETH.build_flags} + -DFEATURE_ARDUINO_OTA=1 + -DPLUGIN_DISPLAY_B_COLLECTION + -D ST7789_EXTRA_INIT=1 + -D P116_EXTRA_ST7789=1 + [env:climate_ESP32_4M316k_LittleFS_ETH] diff --git a/platformio_esp32c3_envs.ini b/platformio_esp32c3_envs.ini index 874ecd23d..686d0476d 100644 --- a/platformio_esp32c3_envs.ini +++ b/platformio_esp32c3_envs.ini @@ -77,10 +77,17 @@ build_flags = ${esp32c3_common_LittleFS.build_flags} -D PLUGIN_ENERGY_COLLECTION -[env:display_ESP32c3_4M316k_LittleFS_ETH] +[env:display_A_ESP32c3_4M316k_LittleFS_ETH] extends = esp32c3_common_LittleFS build_flags = ${esp32c3_common_LittleFS.build_flags} - -D PLUGIN_DISPLAY_COLLECTION + -D PLUGIN_DISPLAY_A_COLLECTION + -D ST7789_EXTRA_INIT=1 + -D P116_EXTRA_ST7789=1 + +[env:display_B_ESP32c3_4M316k_LittleFS_ETH] +extends = esp32c3_common_LittleFS +build_flags = ${esp32c3_common_LittleFS.build_flags} + -D PLUGIN_DISPLAY_B_COLLECTION -D ST7789_EXTRA_INIT=1 -D P116_EXTRA_ST7789=1 diff --git a/platformio_esp32c6_envs.ini b/platformio_esp32c6_envs.ini index 084e231ee..b90d518ce 100644 --- a/platformio_esp32c6_envs.ini +++ b/platformio_esp32c6_envs.ini @@ -34,10 +34,17 @@ build_flags = ${esp32c6_common_LittleFS.build_flags} -D PLUGIN_ENERGY_COLLECTION -[env:display_ESP32c6_4M316k_LittleFS_ETH] +[env:display_A_ESP32c6_4M316k_LittleFS_ETH] extends = esp32c6_common_LittleFS build_flags = ${esp32c6_common_LittleFS.build_flags} - -D PLUGIN_DISPLAY_COLLECTION + -D PLUGIN_DISPLAY_A_COLLECTION + -D ST7789_EXTRA_INIT=1 + -D P116_EXTRA_ST7789=1 + +[env:display_B_ESP32c6_4M316k_LittleFS_ETH] +extends = esp32c6_common_LittleFS +build_flags = ${esp32c6_common_LittleFS.build_flags} + -D PLUGIN_DISPLAY_B_COLLECTION -D ST7789_EXTRA_INIT=1 -D P116_EXTRA_ST7789=1 diff --git a/platformio_esp32s2_envs.ini b/platformio_esp32s2_envs.ini index 98c9a46a8..2e44e2151 100644 --- a/platformio_esp32s2_envs.ini +++ b/platformio_esp32s2_envs.ini @@ -112,11 +112,19 @@ board = esp32s2cdc build_flags = ${esp32s2_common_LittleFS.build_flags} -D PLUGIN_ENERGY_COLLECTION -[env:display_ESP32s2_4M316k_LittleFS_ETH] +[env:display_A_ESP32s2_4M316k_LittleFS_ETH] extends = esp32s2_common_LittleFS board = esp32s2cdc build_flags = ${esp32s2_common_LittleFS.build_flags} - -D PLUGIN_DISPLAY_COLLECTION + -D PLUGIN_DISPLAY_A_COLLECTION + -D ST7789_EXTRA_INIT=1 + -D P116_EXTRA_ST7789=1 + +[env:display_B_ESP32s2_4M316k_LittleFS_ETH] +extends = esp32s2_common_LittleFS +board = esp32s2cdc +build_flags = ${esp32s2_common_LittleFS.build_flags} + -D PLUGIN_DISPLAY_B_COLLECTION -D ST7789_EXTRA_INIT=1 -D P116_EXTRA_ST7789=1 diff --git a/platformio_esp32s3_envs.ini b/platformio_esp32s3_envs.ini index ee5185ec9..3aa8aa6c8 100644 --- a/platformio_esp32s3_envs.ini +++ b/platformio_esp32s3_envs.ini @@ -103,11 +103,19 @@ board = esp32s3cdc-qio_qspi build_flags = ${esp32s3_common_LittleFS.build_flags} -D PLUGIN_ENERGY_COLLECTION -[env:display_ESP32s3_4M316k_LittleFS_ETH] +[env:display_A_ESP32s3_4M316k_LittleFS_ETH] extends = esp32s3_common_LittleFS board = esp32s3cdc-qio_qspi build_flags = ${esp32s3_common_LittleFS.build_flags} - -D PLUGIN_DISPLAY_COLLECTION + -D PLUGIN_DISPLAY_A_COLLECTION + -D ST7789_EXTRA_INIT=1 + -D P116_EXTRA_ST7789=1 + +[env:display_B_ESP32s3_4M316k_LittleFS_ETH] +extends = esp32s3_common_LittleFS +board = esp32s3cdc-qio_qspi +build_flags = ${esp32s3_common_LittleFS.build_flags} + -D PLUGIN_DISPLAY_B_COLLECTION -D ST7789_EXTRA_INIT=1 -D P116_EXTRA_ST7789=1 diff --git a/platformio_esp82xx_envs.ini b/platformio_esp82xx_envs.ini index a51d074c3..9e226ff5b 100644 --- a/platformio_esp82xx_envs.ini +++ b/platformio_esp82xx_envs.ini @@ -602,12 +602,26 @@ extra_scripts = ${regular_platform.extra_scripts} ; display : 4096k version ---------------------------- -[env:display_ESP8266_4M1M] +[env:display_A_ESP8266_4M1M] extends = esp8266_4M1M, regular_platform build_flags = ${regular_platform.build_flags} ${esp8266_4M1M.build_flags} -D BUILD_NO_DEBUG - -D PLUGIN_DISPLAY_COLLECTION + -D PLUGIN_DISPLAY_A_COLLECTION + -D WEBSERVER_USE_CDN_JS_CSS +lib_ignore = ${regular_platform.lib_ignore} + ESP8266SdFat + SD(esp8266) + SD + SDFS + LittleFS(esp8266) + +[env:display_B_ESP8266_4M1M] +extends = esp8266_4M1M, regular_platform +build_flags = ${regular_platform.build_flags} + ${esp8266_4M1M.build_flags} + -D BUILD_NO_DEBUG + -D PLUGIN_DISPLAY_B_COLLECTION -D WEBSERVER_USE_CDN_JS_CSS lib_ignore = ${regular_platform.lib_ignore} ESP8266SdFat diff --git a/platformio_special_envs.ini b/platformio_special_envs.ini index 179b27b68..3bfb2617b 100644 --- a/platformio_special_envs.ini +++ b/platformio_special_envs.ini @@ -112,7 +112,8 @@ build_flags = ${esp32_base_idf5.build_flags} ${debug_pio.build_flags} -DESP32_CLASSIC -DUSE_LITTLEFS - -D PLUGIN_DISPLAY_COLLECTION + -D PLUGIN_DISPLAY_A_COLLECTION + -D PLUGIN_DISPLAY_B_COLLECTION -D WEBSERVER_USE_CDN_JS_CSS -D BUILD_NO_DEBUG board_build.filesystem = littlefs @@ -133,7 +134,9 @@ build_flags = ${esp32_base_idf5.build_flags} ${debug_pio.build_flags} -DESP32_CLASSIC -DUSE_LITTLEFS - -D PLUGIN_DISPLAY_COLLECTION + -D PLUGIN_DISPLAY_A_COLLECTION + -D PLUGIN_DISPLAY_B_COLLECTION + -D PLUGIN_NEOPIXEL_COLLECTION -D WEBSERVER_USE_CDN_JS_CSS -D BUILD_NO_DEBUG board_build.filesystem = littlefs diff --git a/src/src/CustomBuild/define_plugin_sets.h b/src/src/CustomBuild/define_plugin_sets.h index a702c3a59..c774bfe83 100644 --- a/src/src/CustomBuild/define_plugin_sets.h +++ b/src/src/CustomBuild/define_plugin_sets.h @@ -154,13 +154,14 @@ To create/register a plugin, you have to : #endif #endif -#if defined(PLUGIN_DISPLAY_COLLECTION) - // Display builds are getting too large, so for now disable ETH for display buikds - #if FEATURE_ETHERNET - #undef FEATURE_ETHERNET - #endif +#if defined(PLUGIN_DISPLAY_A_COLLECTION) || defined(PLUGIN_DISPLAY_B_COLLECTION) + // Display builds are getting too large, so for now disable ETH for display builds + // Update: By splitting Display into A and B, there is enough space available to enable ETH for now + // #if FEATURE_ETHERNET + // #undef FEATURE_ETHERNET + // #endif #ifndef BUILD_NO_DEBUG - #define BUILD_NO_DEBUG + #define BUILD_NO_DEBUG #endif #endif @@ -1131,8 +1132,11 @@ To create/register a plugin, you have to : #ifndef PLUGIN_ENERGY_COLLECTION #define PLUGIN_ENERGY_COLLECTION #endif - #ifndef PLUGIN_DISPLAY_COLLECTION - #define PLUGIN_DISPLAY_COLLECTION + #ifndef PLUGIN_DISPLAY_A_COLLECTION + #define PLUGIN_DISPLAY_A_COLLECTION + #endif + #ifndef PLUGIN_DISPLAY_B_COLLECTION + #define PLUGIN_DISPLAY_B_COLLECTION #endif #ifndef PLUGIN_CLIMATE_COLLECTION #define PLUGIN_CLIMATE_COLLECTION @@ -1805,91 +1809,202 @@ To create/register a plugin, you have to : #endif // ifdef PLUGIN_ENERGY_COLLECTION -// Collection of all display plugins. (also NeoPixel) -#ifdef PLUGIN_DISPLAY_COLLECTION +// Collection of display plugins, set A (non-AdaGFX_Helper). +#ifdef PLUGIN_DISPLAY_A_COLLECTION #ifndef PLUGIN_DESCR - #define PLUGIN_DESCR "Display" + #define PLUGIN_DESCR "Display A" #endif - #if !defined(LIMIT_BUILD_SIZE) && (defined(ESP8266) || !(ESP_IDF_VERSION_MAJOR > 3)) - #ifndef PLUGIN_BUILD_MAX_ESP32 - #define LIMIT_BUILD_SIZE // Reduce buildsize (on ESP8266 / pre-IDF4.x) to fit in all Display plugins - #define KEEP_I2C_MULTIPLEXER - #ifndef P036_LIMIT_BUILD_SIZE - #define P036_LIMIT_BUILD_SIZE // Reduce build size for P036 (FramedOLED) only - #endif - #ifndef P037_LIMIT_BUILD_SIZE - #define P037_LIMIT_BUILD_SIZE // Reduce build size for P037 (MQTT Import) only - #endif - #define NOTIFIER_SET_NONE - #ifdef USES_N001 - #undef USES_N001 // Email - #endif - #ifdef USES_N002 - #undef USES_N002 // Buzzer - #endif - #endif - #endif - #if defined(ESP8266) - #if defined(FEATURE_I2C_DEVICE_CHECK) - #undef FEATURE_I2C_DEVICE_CHECK - #endif - #define FEATURE_I2C_DEVICE_CHECK 0 // Disable I2C device check code + #if !defined(LIMIT_BUILD_SIZE) && (defined(ESP8266) || !(ESP_IDF_VERSION_MAJOR > 3)) + #ifndef PLUGIN_BUILD_MAX_ESP32 + #define LIMIT_BUILD_SIZE // Reduce buildsize (on ESP8266 / pre-IDF4.x) to fit in all Display plugins + #define KEEP_I2C_MULTIPLEXER + #ifndef P036_LIMIT_BUILD_SIZE + #define P036_LIMIT_BUILD_SIZE // Reduce build size for P036 (FramedOLED) only + #endif + #ifndef P037_LIMIT_BUILD_SIZE + #define P037_LIMIT_BUILD_SIZE // Reduce build size for P037 (MQTT Import) only + #endif + #define NOTIFIER_SET_NONE + #ifdef USES_N001 + #undef USES_N001 // Email + #endif + #ifdef USES_N002 + #undef USES_N002 // Buzzer + #endif + #endif + #endif + #if defined(ESP8266) + #if defined(FEATURE_I2C_DEVICE_CHECK) + #undef FEATURE_I2C_DEVICE_CHECK + #endif + #define FEATURE_I2C_DEVICE_CHECK 0 // Disable I2C device check code // #if !defined(FEATURE_TARSTREAM_SUPPORT) // #define FEATURE_TARSTREAM_SUPPORT 0 // Disable TarStream support for size // #endif // FEATURE_TARSTREAM_SUPPORT - #endif - #if !defined(FEATURE_SD) && !defined(ESP8266) - #define FEATURE_SD 1 - #endif - #ifndef USES_P012 - #define USES_P012 // LCD - #endif - #ifndef USES_P023 + #endif + #if !defined(FEATURE_SD) && !defined(ESP8266) + #define FEATURE_SD 1 + #endif + #ifndef USES_P012 + #define USES_P012 // LCD + #endif + #ifndef USES_P023 #define USES_P023 // OLED - #endif - #ifndef USES_P036 + #endif + #ifndef USES_P036 #define USES_P036 // FrameOLED - #endif - #ifdef USES_P038 + #endif + #ifdef USES_P038 #undef USES_P038 // DISABLE NeoPixel - #endif - #ifdef USES_P041 + #endif + #ifdef USES_P041 #undef USES_P041 // DISABLE NeoClock - #endif - #ifdef USES_P042 + #endif + #ifdef USES_P042 #undef USES_P042 // DISABLE Candle - #endif - #ifndef USES_P057 + #endif + #ifndef USES_P057 #define USES_P057 // HT16K33_LED - #endif - #ifdef USES_P070 + #endif + #ifdef USES_P070 #undef USES_P070 // DISABLE NeoPixel_Clock - #endif - #ifndef USES_P075 + #endif + #ifndef USES_P075 #define USES_P075 // Nextion - #endif - #ifndef USES_P095 - #define USES_P095 // TFT ILI9341 - #endif - #ifndef USES_P096 - #define USES_P096 // eInk (Needs lib_deps = Adafruit GFX Library, LOLIN_EPD ) - #endif - #ifndef USES_P099 - #define USES_P099 // XPT2046 Touchscreen - #endif - #ifndef USES_P104 + #endif + // #ifndef USES_P095 + // #define USES_P095 // TFT ILI9341 + // #endif + // #ifndef USES_P096 + // #define USES_P096 // eInk (Needs lib_deps = Adafruit GFX Library, LOLIN_EPD ) + // #endif + // #ifndef USES_P099 + // #define USES_P099 // XPT2046 Touchscreen + // #endif + #ifndef USES_P104 // Plugin adds over 40k to build size #define USES_P104 // MAX7219 dot matrix - #endif - #if !defined(USES_P109) && defined(ESP32) - #define USES_P109 // ThermoOLED - #endif - #ifndef USES_P116 - #define USES_P116 // ST77xx - #endif - #if !defined(USES_P123) && defined(ESP32) - #define USES_P123 // I2C Touchscreens - #endif + #endif + #if !defined(USES_P109) && defined(ESP32) + #define USES_P109 // ThermoOLED + #endif + // #ifndef USES_P116 + // #define USES_P116 // ST77xx + // #endif + // #if !defined(USES_P123) && defined(ESP32) + // #define USES_P123 // I2C Touchscreens + // #endif + #if !defined(USES_P137) && defined(ESP32) + #define USES_P137 // AXP192 + #endif + #if !defined(USES_P138) && defined(ESP32) + #define USES_P138 // IP5306 + #endif + #if !defined(USES_P139) && defined(ESP32) + #define USES_P139 // AXP2101 + #endif + // #ifndef USES_P141 + // #define USES_P141 // PCD8544 Nokia 5110 + // #endif + #ifndef USES_P143 + #define USES_P143 // I2C Rotary encoders + #endif + #if !defined(USES_P148) && defined(ESP32) + #define USES_P148 // Sonoff POWR3xxD and THR3xxD display + #endif + // #if !defined(USES_P165) && defined(ESP32) + // #define USES_P165 // Display - NeoPixel (7-Segment) + // #endif + #if !defined(USES_P180) && defined(ESP32) + #define USES_P180 // Generic - I2C Generic + #endif +#endif // ifdef PLUGIN_DISPLAY_A_COLLECTION + +// Collection of display plugins, set B (AdaGFX_Helper). +#ifdef PLUGIN_DISPLAY_B_COLLECTION + #ifndef PLUGIN_DESCR + #define PLUGIN_DESCR "Display B" + #endif + #if !defined(LIMIT_BUILD_SIZE) && (defined(ESP8266) || !(ESP_IDF_VERSION_MAJOR > 3)) + #ifndef PLUGIN_BUILD_MAX_ESP32 + #define LIMIT_BUILD_SIZE // Reduce buildsize (on ESP8266 / pre-IDF4.x) to fit in all Display plugins + #define KEEP_I2C_MULTIPLEXER + #ifndef P036_LIMIT_BUILD_SIZE + #define P036_LIMIT_BUILD_SIZE // Reduce build size for P036 (FramedOLED) only + #endif + #ifndef P037_LIMIT_BUILD_SIZE + #define P037_LIMIT_BUILD_SIZE // Reduce build size for P037 (MQTT Import) only + #endif + #define NOTIFIER_SET_NONE + #ifdef USES_N001 + #undef USES_N001 // Email + #endif + #ifdef USES_N002 + #undef USES_N002 // Buzzer + #endif + #endif + #endif + #if defined(ESP8266) + #if defined(FEATURE_I2C_DEVICE_CHECK) + #undef FEATURE_I2C_DEVICE_CHECK + #endif + #define FEATURE_I2C_DEVICE_CHECK 0 // Disable I2C device check code + // #if !defined(FEATURE_TARSTREAM_SUPPORT) + // #define FEATURE_TARSTREAM_SUPPORT 0 // Disable TarStream support for size + // #endif // FEATURE_TARSTREAM_SUPPORT + #endif + #if !defined(FEATURE_SD) && !defined(ESP8266) + #define FEATURE_SD 1 + #endif + #ifdef USES_P012 + #undef USES_P012 // DISABLE LCD + #endif + #ifdef USES_P023 + #undef USES_P023 // DISABLE OLED + #endif + #ifndef USES_P036 + #define USES_P036 // FrameOLED + #endif + #ifdef USES_P038 + #undef USES_P038 // DISABLE NeoPixel + #endif + #ifdef USES_P041 + #undef USES_P041 // DISABLE NeoClock + #endif + #ifdef USES_P042 + #undef USES_P042 // DISABLE Candle + #endif + #ifdef USES_P057 + #undef USES_P057 // DISABLE HT16K33_LED + #endif + #ifdef USES_P070 + #undef USES_P070 // DISABLE NeoPixel_Clock + #endif + #ifdef USES_P075 + #undef USES_P075 // DISABLE Nextion + #endif + #ifndef USES_P095 + #define USES_P095 // TFT ILI9341 + #endif + #ifndef USES_P096 + #define USES_P096 // eInk (Needs lib_deps = Adafruit GFX Library, LOLIN_EPD ) + #endif + #ifndef USES_P099 + #define USES_P099 // XPT2046 Touchscreen + #endif + #ifdef USES_P104 + // Plugin adds over 40k to build size + #undef USES_P104 // DISABLE MAX7219 dot matrix + #endif + #if !defined(USES_P109) && defined(ESP32) + #define USES_P109 // ThermoOLED + #endif + #ifndef USES_P116 + #define USES_P116 // ST77xx + #endif + #if !defined(USES_P123) && defined(ESP32) + #define USES_P123 // I2C Touchscreens + #endif #if !defined(USES_P137) && defined(ESP32) #define USES_P137 // AXP192 #endif @@ -1905,16 +2020,16 @@ To create/register a plugin, you have to : #ifndef USES_P143 #define USES_P143 // I2C Rotary encoders #endif - #ifndef USES_P148 + #if !defined(USES_P148) && defined(ESP32) #define USES_P148 // Sonoff POWR3xxD and THR3xxD display #endif - #if !defined(USES_P165) && defined(ESP32) - #define USES_P165 // Display - NeoPixel (7-Segment) - #endif + // #if !defined(USES_P165) && defined(ESP32) + // #define USES_P165 // Display - NeoPixel (7-Segment) + // #endif #if !defined(USES_P180) && defined(ESP32) #define USES_P180 // Generic - I2C Generic #endif -#endif // ifdef PLUGIN_DISPLAY_COLLECTION +#endif // ifdef PLUGIN_DISPLAY_B_COLLECTION // Collection of all climate plugins. #ifdef PLUGIN_CLIMATE_COLLECTION @@ -2356,6 +2471,24 @@ To create/register a plugin, you have to : #ifndef USES_P046 #define USES_P046 // VentusW266 #endif + #ifndef USES_P038 + #define USES_P038 // NeoPixel + #endif + #ifndef USES_P041 + #define USES_P041 // NeoClock + #endif + #ifndef USES_P042 + #define USES_P042 // Candle + #endif + #ifndef USES_P057 + #define USES_P057 // HT16K33_LED + #endif + #ifndef USES_P070 + #define USES_P070 // NeoPixel_Clock + #endif + #ifndef USES_P075 + #define USES_P075 // Nextion + #endif #ifndef USES_P087 #define USES_P087 // Serial Proxy #endif @@ -2572,13 +2705,13 @@ To create/register a plugin, you have to : #ifndef USES_P168 #define USES_P168 // Light - VEML6030/VEML7700 #endif - #ifndef USES_P170 - #define USES_P170 // Input - I2C Liquid level sensor - #endif - #ifndef USES_P169 #define USES_P169 // Environment - AS3935 Lightning Detector #endif + + #ifndef USES_P170 + #define USES_P170 // Input - I2C Liquid level sensor + #endif #ifndef USES_P173 #define USES_P173 // Environment - SHTC3 #endif @@ -2747,7 +2880,7 @@ To create/register a plugin, you have to : // Disable Homie plugin for now in the dev build to make it fit. -#if defined(PLUGIN_DISPLAY_COLLECTION) && defined(USES_C014) && defined(ESP8266) +#if (defined(PLUGIN_DISPLAY_A_COLLECTION) || defined(PLUGIN_DISPLAY_B_COLLECTION)) && defined(USES_C014) && defined(ESP8266) #undef USES_C014 #endif diff --git a/src/src/PluginStructs/P037_data_struct.h b/src/src/PluginStructs/P037_data_struct.h index 7c7bd6b9c..974abca08 100644 --- a/src/src/PluginStructs/P037_data_struct.h +++ b/src/src/PluginStructs/P037_data_struct.h @@ -60,7 +60,7 @@ // #endif # endif // if (defined(LIMIT_BUILD_SIZE) && !defined(P037_OVERRIDE)) || defined(P037_LIMIT_BUILD_SIZE) -# ifdef PLUGIN_DISPLAY_COLLECTION +# if defined(PLUGIN_DISPLAY_A_COLLECTION) || defined(PLUGIN_DISPLAY_B_COLLECTION) # if P037_FILTER_SUPPORT # undef P037_FILTER_SUPPORT # define P037_FILTER_SUPPORT 0 @@ -69,7 +69,7 @@ # undef P037_REPLACE_BY_COMMA_SUPPORT # define P037_REPLACE_BY_COMMA_SUPPORT 0 # endif // if P037_REPLACE_BY_COMMA_SUPPORT -# endif // ifdef PLUGIN_DISPLAY_COLLECTION +# endif // if defined(PLUGIN_DISPLAY_A_COLLECTION) || defined(PLUGIN_DISPLAY_B_COLLECTION) # endif // ifndef PLUGIN_BUILD_MAX_ESP32 # define P037_MAX_MAPPINGS 25 diff --git a/src/src/PluginStructs/P104_data_struct.h b/src/src/PluginStructs/P104_data_struct.h index 0fde33829..f50975328 100644 --- a/src/src/PluginStructs/P104_data_struct.h +++ b/src/src/PluginStructs/P104_data_struct.h @@ -18,10 +18,12 @@ # include -// # if defined(PLUGIN_SET_MAX) || defined(PLUGIN_BUILD_CUSTOM) || (defined(PLUGIN_DISPLAY_COLLECTION) && defined(ESP32)) +// # if defined(PLUGIN_SET_MAX) || defined(PLUGIN_BUILD_CUSTOM) || ((defined(PLUGIN_DISPLAY_A_COLLECTION) || +// defined(PLUGIN_DISPLAY_B_COLLECTION)) && defined(ESP32)) # ifdef ESP32 # define P104_USE_NUMERIC_DOUBLEHEIGHT_FONT // Enables double height numeric font for double-height time/date -// # endif // if defined(PLUGIN_SET_MAX) || defined(PLUGIN_BUILD_CUSTOM) || (defined(PLUGIN_DISPLAY_COLLECTION) && defined(ESP32)) +// # endif // if defined(PLUGIN_SET_MAX) || defined(PLUGIN_BUILD_CUSTOM) || ((defined(PLUGIN_DISPLAY_A_COLLECTION) || +// defined(PLUGIN_DISPLAY_B_COLLECTION)) && defined(ESP32)) # endif // ifdef ESP32 # define P104_USE_FULL_DOUBLEHEIGHT_FONT // Enables the use of a full (lower ascii only) set double height font # define P104_USE_VERTICAL_FONT // Enables the use of a vertical font @@ -45,7 +47,7 @@ # endif // if FEATURE_EXTENDED_CUSTOM_SETTINGS && defined(ESP32) && defined(USE_LITTLEFS) // To make it fit in the ESP8266 display build -# if defined(PLUGIN_DISPLAY_COLLECTION) && defined(ESP8266) && !defined(LIMIT_BUILD_SIZE) +# if (defined(PLUGIN_DISPLAY_A_COLLECTION) || defined(PLUGIN_DISPLAY_B_COLLECTION)) && defined(ESP8266) && !defined(LIMIT_BUILD_SIZE) # ifdef P104_USE_FULL_DOUBLEHEIGHT_FONT # undef P104_USE_FULL_DOUBLEHEIGHT_FONT # ifndef P104_USE_NUMERIC_DOUBLEHEIGHT_FONT @@ -83,7 +85,7 @@ # undef P104_DEBUG_DEV # endif // ifdef P104_DEBUG_DEV # define P104_MEDIUM_ANIMATIONS -# endif // if defined(PLUGIN_DISPLAY_COLLECTION) && defined(ESP8266) +# endif // if (defined(PLUGIN_DISPLAY_A_COLLECTION) || defined(PLUGIN_DISPLAY_B_COLLECTION)) && defined(ESP8266) && !defined(LIMIT_BUILD_SIZE) // # define P104_MINIMAL_ANIMATIONS // disable most animations // # define P104_MEDIUM_ANIMATIONS // disable some complex animations From edfe004456f3d81e8bf9206606deb3dae4d0f298 Mon Sep 17 00:00:00 2001 From: Ton Huisman Date: Sun, 5 Oct 2025 17:31:14 +0200 Subject: [PATCH 337/564] [Build] Display A/B split: Update documentation --- docs/builds_overview.py | 12 ++++++++---- docs/source/Plugin/_plugin_substitutions_p01x.repl | 2 +- docs/source/Plugin/_plugin_substitutions_p02x.repl | 2 +- docs/source/Plugin/_plugin_substitutions_p07x.repl | 2 +- docs/source/Plugin/_plugin_substitutions_p09x.repl | 4 ++-- docs/source/Plugin/_plugin_substitutions_p10x.repl | 2 +- docs/source/Plugin/_plugin_substitutions_p11x.repl | 2 +- docs/source/Plugin/_plugin_substitutions_p12x.repl | 2 +- docs/source/Plugin/_plugin_substitutions_p14x.repl | 4 ++-- docs/source/Plugin/_plugin_substitutions_p16x.repl | 2 +- 10 files changed, 19 insertions(+), 15 deletions(-) diff --git a/docs/builds_overview.py b/docs/builds_overview.py index 204cb4a03..46e219ad3 100644 --- a/docs/builds_overview.py +++ b/docs/builds_overview.py @@ -12,6 +12,7 @@ # When adding or removing a build set, this script may need adjustments! # Changelog: +# 2025-10-05 tonhuisman: Adjustments for Display A and Display B split # 2024-05-04 tonhuisman: Working and documented # 2024-04-28 tonhuisman: Initial script @@ -30,8 +31,9 @@ appendBuilds = {'MAX'} # What build set to add plugins also appendAlso = { - 'NORMAL': {'CLIMATE', 'COLLECTION A', 'COLLECTION B', 'COLLECTION C', 'COLLECTION D', 'COLLECTION E', 'COLLECTION F', 'COLLECTION G', 'DISPLAY', 'ENERGY', 'IR', 'IRext', 'NEOPIXEL'}, - 'COLLECTION': {'COLLECTION A', 'COLLECTION B', 'COLLECTION C', 'COLLECTION D', 'COLLECTION E', 'COLLECTION F', 'COLLECTION G'} + 'NORMAL': {'CLIMATE', 'COLLECTION A', 'COLLECTION B', 'COLLECTION C', 'COLLECTION D', 'COLLECTION E', 'COLLECTION F', 'COLLECTION G', 'DISPLAY A', 'DISPLAY B', 'ENERGY', 'IR', 'IRext', 'NEOPIXEL'}, + 'COLLECTION': {'COLLECTION A', 'COLLECTION B', 'COLLECTION C', 'COLLECTION D', 'COLLECTION E', 'COLLECTION F', 'COLLECTION G'}, + 'DISPLAY': {'DISPLAY A', 'DISPLAY B'} } # Ignore these, not real build sets @@ -40,7 +42,8 @@ excludeBuilds = {'DEVELOPMENT', 'RETIRED'} # Plugins not included excludePlugins = { 'CLIMATE': {'P007', 'P008', 'P009', 'P017', 'P022', 'P027', 'P030', 'P035', 'P040', 'P041', 'P042', 'P045'}, - 'DISPLAY': {'P070'}, + 'DISPLAY A': {'P038', 'P041', 'P042', 'P070'}, + 'DISPLAY B': {'P038', 'P041', 'P042', 'P057', 'P070', 'P075', 'P104'}, 'MAX': {'P089'}, # 'NEOPIXEL': {''}, 'NORMAL': {'P016', 'P035'}, @@ -57,7 +60,8 @@ buildColors = { 'COLLECTION F': 'yellow', 'COLLECTION G': 'yellow', 'CLIMATE': 'yellow', - 'DISPLAY': 'yellow', + 'DISPLAY A': 'yellow', + 'DISPLAY B': 'yellow', 'ENERGY': 'yellow', 'IR': 'yellow', 'IRext': 'yellow', diff --git a/docs/source/Plugin/_plugin_substitutions_p01x.repl b/docs/source/Plugin/_plugin_substitutions_p01x.repl index f88b837fb..c9f68c4ac 100644 --- a/docs/source/Plugin/_plugin_substitutions_p01x.repl +++ b/docs/source/Plugin/_plugin_substitutions_p01x.repl @@ -28,7 +28,7 @@ .. |P012_type| replace:: :cyan:`Display` .. |P012_typename| replace:: :cyan:`Display - LCD2004` .. |P012_porttype| replace:: `.` -.. |P012_status| replace:: :green:`NORMAL` :yellow:`DISPLAY` :yellow:`CLIMATE` +.. |P012_status| replace:: :green:`NORMAL` :yellow:`CLIMATE` :yellow:`DISPLAY A` .. |P012_github| replace:: P012_LCD.ino .. _P012_github: https://github.com/letscontrolit/ESPEasy/blob/mega/src/_P012_LCD.ino .. |P012_usedby| replace:: `.` diff --git a/docs/source/Plugin/_plugin_substitutions_p02x.repl b/docs/source/Plugin/_plugin_substitutions_p02x.repl index 1a9d4fd51..eb1c1005d 100644 --- a/docs/source/Plugin/_plugin_substitutions_p02x.repl +++ b/docs/source/Plugin/_plugin_substitutions_p02x.repl @@ -41,7 +41,7 @@ .. |P023_type| replace:: :cyan:`Display` .. |P023_typename| replace:: :cyan:`Display - OLED SSD1306` .. |P023_porttype| replace:: `.` -.. |P023_status| replace:: :green:`NORMAL` :yellow:`DISPLAY` :yellow:`CLIMATE` +.. |P023_status| replace:: :green:`NORMAL` :yellow:`CLIMATE` :yellow:`DISPLAY A` .. |P023_github| replace:: P023_OLED.ino .. _P023_github: https://github.com/letscontrolit/ESPEasy/blob/mega/src/_P023_OLED.ino .. |P023_usedby| replace:: `.` diff --git a/docs/source/Plugin/_plugin_substitutions_p07x.repl b/docs/source/Plugin/_plugin_substitutions_p07x.repl index c6be0725b..280f933fe 100644 --- a/docs/source/Plugin/_plugin_substitutions_p07x.repl +++ b/docs/source/Plugin/_plugin_substitutions_p07x.repl @@ -68,7 +68,7 @@ .. |P075_type| replace:: :cyan:`Display` .. |P075_typename| replace:: :cyan:`Display - Nextion` .. |P075_porttype| replace:: `.` -.. |P075_status| replace:: :yellow:`DISPLAY` :yellow:`COLLECTION` +.. |P075_status| replace:: :yellow:`COLLECTION` :yellow:`DISPLAY A` .. |P075_github| replace:: P075_Nextion.ino .. _P075_github: https://github.com/letscontrolit/ESPEasy/blob/mega/src/_P075_Nextion.ino .. |P075_usedby| replace:: `.` diff --git a/docs/source/Plugin/_plugin_substitutions_p09x.repl b/docs/source/Plugin/_plugin_substitutions_p09x.repl index 0154a7f40..233db6d8e 100644 --- a/docs/source/Plugin/_plugin_substitutions_p09x.repl +++ b/docs/source/Plugin/_plugin_substitutions_p09x.repl @@ -63,7 +63,7 @@ .. |P095_type| replace:: :cyan:`Display` .. |P095_typename| replace:: :cyan:`Display - TFT ILI934x/ILI948x` .. |P095_porttype| replace:: `.` -.. |P095_status| replace:: :yellow:`DISPLAY` :yellow:`COLLECTION` :yellow:`(ESP32)` +.. |P095_status| replace:: :yellow:`COLLECTION` :yellow:`\(ESP32\)` :yellow:`DISPLAY B` .. |P095_github| replace:: _P095_ILI9341.ino .. _P095_github: https://github.com/letscontrolit/ESPEasy/blob/mega/src/_P095_ILI9341.ino .. |P095_usedby| replace:: `.` @@ -102,7 +102,7 @@ .. |P099_type| replace:: :cyan:`Touch` .. |P099_typename| replace:: :cyan:`Touch - XPT2046 touchscreen on TFT display` .. |P099_porttype| replace:: `SPI` -.. |P099_status| replace:: :yellow:`DISPLAY` +.. |P099_status| replace:: :yellow:`DISPLAY B` .. |P099_github| replace:: _P099_XPT2046Touch.ino .. _P099_github: https://github.com/letscontrolit/ESPEasy/blob/mega/src/_P099_XPT2046Touch.ino .. |P099_usedby| replace:: `.` diff --git a/docs/source/Plugin/_plugin_substitutions_p10x.repl b/docs/source/Plugin/_plugin_substitutions_p10x.repl index 6099d1014..6768b77e0 100644 --- a/docs/source/Plugin/_plugin_substitutions_p10x.repl +++ b/docs/source/Plugin/_plugin_substitutions_p10x.repl @@ -55,7 +55,7 @@ .. |P104_type| replace:: :cyan:`Display` .. |P104_typename| replace:: :cyan:`Display - MAX7219 dot matrix` .. |P104_porttype| replace:: `SPI` -.. |P104_status| replace:: :yellow:`DISPLAY` +.. |P104_status| replace:: :yellow:`DISPLAY A` .. |P104_github| replace:: P104_max7219_Dotmatrix.ino .. _P104_github: https://github.com/letscontrolit/ESPEasy/blob/mega/src/_P104_max7210_Dotmatrix.ino .. |P104_usedby| replace:: `.` diff --git a/docs/source/Plugin/_plugin_substitutions_p11x.repl b/docs/source/Plugin/_plugin_substitutions_p11x.repl index 12a1398a9..3dcf40c9e 100644 --- a/docs/source/Plugin/_plugin_substitutions_p11x.repl +++ b/docs/source/Plugin/_plugin_substitutions_p11x.repl @@ -80,7 +80,7 @@ .. |P116_type| replace:: :cyan:`Display` .. |P116_typename| replace:: :cyan:`Display - ST77xx TFT` .. |P116_porttype| replace:: `.` -.. |P116_status| replace:: :yellow:`DISPLAY` +.. |P116_status| replace:: :yellow:`DISPLAY B` .. |P116_github| replace:: _P116_ST77xx.ino .. _P116_github: https://github.com/letscontrolit/ESPEasy/blob/mega/src/_P116_ST77xx.ino .. |P116_usedby| replace:: `.` diff --git a/docs/source/Plugin/_plugin_substitutions_p12x.repl b/docs/source/Plugin/_plugin_substitutions_p12x.repl index 7d03c8ef9..26cd48c12 100644 --- a/docs/source/Plugin/_plugin_substitutions_p12x.repl +++ b/docs/source/Plugin/_plugin_substitutions_p12x.repl @@ -41,7 +41,7 @@ .. |P123_type| replace:: :cyan:`Touch` .. |P123_typename| replace:: :cyan:`Touch - I2C Touchscreens` .. |P123_porttype| replace:: `.` -.. |P123_status| replace:: :yellow:`DISPLAY` +.. |P123_status| replace:: :yellow:`DISPLAY B` .. |P123_github| replace:: P123_I2CTouch.ino .. _P123_github: https://github.com/letscontrolit/ESPEasy/blob/mega/src/_P123_I2CTouch.ino .. |P123_usedby| replace:: `.` diff --git a/docs/source/Plugin/_plugin_substitutions_p14x.repl b/docs/source/Plugin/_plugin_substitutions_p14x.repl index 3996585e1..49ff184bc 100644 --- a/docs/source/Plugin/_plugin_substitutions_p14x.repl +++ b/docs/source/Plugin/_plugin_substitutions_p14x.repl @@ -15,7 +15,7 @@ .. |P141_type| replace:: :cyan:`Display` .. |P141_typename| replace:: :cyan:`Display - PCD8544 Nokia 5110 LCD` .. |P141_porttype| replace:: `.` -.. |P141_status| replace:: :yellow:`DISPLAY` +.. |P141_status| replace:: :yellow:`DISPLAY B` .. |P141_github| replace:: P141_PCD8544_Nokia5110.ino .. _P141_github: https://github.com/letscontrolit/ESPEasy/blob/mega/src/_P141_PCD8544_Nokia5110.ino .. |P141_usedby| replace:: `.` @@ -106,7 +106,7 @@ .. |P148_type| replace:: :cyan:`Display` .. |P148_typename| replace:: :cyan:`Display - POWR3xxD/THR3xxD` .. |P148_porttype| replace:: `.` -.. |P148_status| replace:: :yellow:`ENERGY` :yellow:`DISPLAY` +.. |P148_status| replace:: :yellow:`DISPLAY B` :yellow:`ENERGY` .. |P148_github| replace:: P148_POWRxxD_THR3xxD.ino .. _P148_github: https://github.com/letscontrolit/ESPEasy/blob/mega/src/_P148_POWRxxD_THR3xxD.ino .. |P148_usedby| replace:: `.` diff --git a/docs/source/Plugin/_plugin_substitutions_p16x.repl b/docs/source/Plugin/_plugin_substitutions_p16x.repl index 843ffeea8..82079032e 100644 --- a/docs/source/Plugin/_plugin_substitutions_p16x.repl +++ b/docs/source/Plugin/_plugin_substitutions_p16x.repl @@ -41,7 +41,7 @@ .. |P165_type| replace:: :cyan:`Display` .. |P165_typename| replace:: :cyan:`Display - NeoPixel (7-Segment)` .. |P165_porttype| replace:: `.` -.. |P165_status| replace:: :yellow:`DISPLAY` :yellow:`NEOPIXEL` +.. |P165_status| replace:: :yellow:`NEOPIXEL` .. |P165_github| replace:: P165_7SegNeopixel.ino .. _P165_github: https://github.com/letscontrolit/ESPEasy/blob/mega/src/_P165_7SegNeopixel.ino .. |P165_usedby| replace:: `.` From a9a700414118577003af22e7baaf7ef5bc24bf97 Mon Sep 17 00:00:00 2001 From: TD-er Date: Sun, 5 Oct 2025 17:31:41 +0200 Subject: [PATCH 338/564] [Network] Use new WebForm writer for gathering network adapter info --- src/ESPEasy/net/Globals/NWPlugins.cpp | 82 +++++++++++------ src/ESPEasy/net/_NW001_WiFi_STA.cpp | 93 ++++++++++++++------ src/ESPEasy/net/_NW002_WiFi_AP.cpp | 73 ++++++++------- src/ESPEasy/net/_NW003_ETH_RMII.cpp | 32 +++++-- src/ESPEasy/net/_NW004_ETH_SPI.cpp | 31 +++++-- src/ESPEasy/net/_NW005_PPP_modem.cpp | 65 ++++++++++---- src/src/DataStructs/ESPEasy_EventStruct.h | 2 + src/src/Helpers/KeyValueWriter.cpp | 67 +++++++++----- src/src/Helpers/KeyValueWriter.h | 91 +++++++++++++------ src/src/WebServer/KeyValueWriter_WebForm.cpp | 79 +++++++++++------ src/src/WebServer/KeyValueWriter_WebForm.h | 21 +++-- src/src/WebServer/NetworkPage.cpp | 92 ++++++------------- 12 files changed, 463 insertions(+), 265 deletions(-) diff --git a/src/ESPEasy/net/Globals/NWPlugins.cpp b/src/ESPEasy/net/Globals/NWPlugins.cpp index bb9f1d3d7..87357b517 100644 --- a/src/ESPEasy/net/Globals/NWPlugins.cpp +++ b/src/ESPEasy/net/Globals/NWPlugins.cpp @@ -130,7 +130,8 @@ bool NWPluginCall(NWPlugin::Function Function, EventStruct *event, String& str) #if FEATURE_NETWORK_TRAFFIC_COUNT case NWPlugin::Function::NWPLUGIN_GET_TRAFFIC_COUNT: { - TX_RX_traffic_count traffic{}; + TX_RX_traffic_count traffic{}; + if (NW_data->getTrafficCount(traffic)) { event->Par64_1 = traffic._tx_count; event->Par64_2 = traffic._rx_count; @@ -174,10 +175,17 @@ bool NWPluginCall(NWPlugin::Function Function, EventStruct *event, String& str) auto duration = runtime_data->_connectedStats.getLastOnDuration_ms(); if (duration > 0) { - str = format_msec_duration_HMS(duration); event->Par64_1 = duration; event->Par64_2 = runtime_data->_connectedStats.getCycleCount(); - success = true; + + if (event->kvWriter) { + event->kvWriter->write({ F("Connection Duration"), format_msec_duration_HMS(duration) }); + + if (!event->kvWriter->ignoreKey()) { + event->kvWriter->write({ F("Number of Reconnects"), event->Par64_2 }); + } + } + success = true; } } break; @@ -261,24 +269,43 @@ bool NWPluginCall(NWPlugin::Function Function, EventStruct *event, String& str) break; case NWPlugin::Function::NWPLUGIN_WEBFORM_SHOW_HOSTNAME: - str = event->networkInterface->getHostname(); - success = true; + + if (event->kvWriter) { + event->kvWriter->write({ F("Hostname"), event->networkInterface->getHostname() }); + success = true; + } break; case NWPlugin::Function::NWPLUGIN_WEBFORM_SHOW_HW_ADDRESS: - str = event->networkInterface->macAddress(); - event->String1 = F("MAC"); - success = true; + + if (event->kvWriter) { + if (event->kvWriter->ignoreKey()) { + event->kvWriter->write({ + EMPTY_STRING, + concat(F("MAC: "), event->networkInterface->macAddress()) }); + } + else { + event->kvWriter->write({ + F("MAC"), + event->networkInterface->macAddress(), + KeyValueStruct::Format::PreFormatted + }); + } + success = true; + } break; case NWPlugin::Function::NWPLUGIN_WEBFORM_SHOW_IP: { - PrintToString prstr; - success = NWPlugin::print_IP_address( - static_cast(event->Par1), - event->networkInterface, - prstr); - str = prstr.get(); + if (event->kvWriter) { + PrintToString prstr; + success = NWPlugin::print_IP_address( + static_cast(event->Par1), + event->networkInterface, + prstr); + event->kvWriter->write({ F("ip"), prstr.getMove() }); + success = true; + } break; } @@ -389,22 +416,17 @@ String getNWPluginNameFromNWPluginID(nwpluginID_t nwpluginID) { return getNWPluginNameFromNetworkDriverIndex(networkDriverIndex); } -NWPluginData_static_runtime* getWiFi_STA_NWPluginData_static_runtime() -{ - return getNWPluginData_static_runtime(NETWORK_INDEX_WIFI_STA); -} +NWPluginData_static_runtime* getWiFi_STA_NWPluginData_static_runtime() { return getNWPluginData_static_runtime(NETWORK_INDEX_WIFI_STA); } -NWPluginData_static_runtime* getWiFi_AP_NWPluginData_static_runtime() -{ - return getNWPluginData_static_runtime(NETWORK_INDEX_WIFI_AP); -} +NWPluginData_static_runtime* getWiFi_AP_NWPluginData_static_runtime() { return getNWPluginData_static_runtime(NETWORK_INDEX_WIFI_AP); } NWPluginData_static_runtime* getFirst_ETH_NWPluginData_static_runtime() { for (networkIndex_t i = 0; validNetworkIndex(i); ++i) { if (Settings.getNetworkEnabled(i)) { const auto nwpluginID = Settings.getNWPluginID_for_network(i); - if (nwpluginID.value == 3 || nwpluginID.value == 4) { + + if ((nwpluginID.value == 3) || (nwpluginID.value == 4)) { return getNWPluginData_static_runtime(i); } } @@ -424,29 +446,31 @@ const NWPluginData_static_runtime* getDefaultRoute_NWPluginData_static_runtime() { #ifdef ESP32 networkIndex_t index_highest_prio = NETWORK_MAX; - int highest_prio = -1; - #endif + int highest_prio = -1; + #endif // ifdef ESP32 for (networkIndex_t i = 0; validNetworkIndex(i); ++i) { auto NW_data = getNWPluginData_static_runtime(i); if (NW_data && NW_data->isDefaultRoute()) { return NW_data; } #ifdef ESP32 + if (NW_data) { if (NW_data->_route_prio > highest_prio) { index_highest_prio = i; - highest_prio = NW_data->_route_prio; + highest_prio = NW_data->_route_prio; } } - #endif + #endif // ifdef ESP32 } #ifdef ESP32 + if (validNetworkIndex(index_highest_prio)) { return getNWPluginData_static_runtime(index_highest_prio); } - #endif - + #endif // ifdef ESP32 + return nullptr; } diff --git a/src/ESPEasy/net/_NW001_WiFi_STA.cpp b/src/ESPEasy/net/_NW001_WiFi_STA.cpp index eb58ab557..bc5d353f7 100644 --- a/src/ESPEasy/net/_NW001_WiFi_STA.cpp +++ b/src/ESPEasy/net/_NW001_WiFi_STA.cpp @@ -97,36 +97,67 @@ bool NWPlugin_001(NWPlugin::Function function, EventStruct *event, String& strin { # ifdef ESP32 success = WiFi.STA.connected(); - - if (success) { - string = strformat(F("%s (ch: %d)\n%s"), - WiFi.STA.SSID().c_str(), - WiFi.channel(), - WiFi.STA.BSSIDstr().c_str()); - } -# else // ifdef ESP32 +# else success = WiFi.isConnected(); - - if (success) { - string = strformat(F("%s (ch: %d)\n%s"), - WiFi.SSID().c_str(), - WiFi.channel(), - WiFi.BSSIDstr().c_str()); - } # endif // ifdef ESP32 + if (event->kvWriter == nullptr) { + break; + } + if (success) { - string += strformat( - F("\n%s\nRSSI: %d dBm"), - FsP(ESPEasy::net::wifi::toString(ESPEasy::net::wifi::getConnectionProtocol())), - WiFi.RSSI()); +# ifdef ESP32 +# define STA_SSID_STR WiFi.STA.SSID() +# define STA_BSSID_STR WiFi.STA.BSSIDstr() +# else // ifdef ESP32 +# define STA_SSID_STR WiFi.SSID() +# define STA_BSSID_STR WiFi.BSSIDstr() +# endif // ifdef ESP32 + + + if (event->kvWriter->ignoreKey()) { + event->kvWriter->write({ + EMPTY_STRING, + strformat(F("%s (ch: %d)"), + STA_SSID_STR.c_str(), + WiFi.channel()) }); + } else { + event->kvWriter->write({ + F("SSID"), + STA_SSID_STR, + KeyValueStruct::Format::PreFormatted }); + event->kvWriter->write({ + F("Channel"), + WiFi.channel() }); + } + { + KeyValueStruct kv( + F("RSSI"), + strformat( + event->kvWriter->ignoreKey() ? F("RSSI: %d dBm") : F("%d"), + WiFi.RSSI())); + + kv.setUnit(F("dBm")); + + event->kvWriter->write(kv); + } + event->kvWriter->write({ + F("BSSID"), + STA_BSSID_STR, + KeyValueStruct::Format::PreFormatted }); + + event->kvWriter->write({ + F("Protocol"), + ESPEasy::net::wifi::toString(ESPEasy::net::wifi::getConnectionProtocol()) + }); ESPEasy::net::wifi::NW001_data_struct_WiFi_STA *NW_data = static_cast(getNWPluginData(event->NetworkIndex)); if (NW_data) { - string += '\n'; - string += NW_data->getWiFi_encryptionType(); + event->kvWriter->write({ + F("Encryption Type"), + NW_data->getWiFi_encryptionType() }); } } @@ -136,22 +167,29 @@ bool NWPlugin_001(NWPlugin::Function function, EventStruct *event, String& strin # ifdef ESP8266 case NWPlugin::Function::NWPLUGIN_WEBFORM_SHOW_HOSTNAME: { - string = WiFi.hostname(); - success = true; + if (event->kvWriter) { + event->kvWriter->write({ F("Hostname"), WiFi.hostname() }); + success = true; + } break; } + } case NWPlugin::Function::NWPLUGIN_WEBFORM_SHOW_HW_ADDRESS: { - string = WiFi.macAddress(); - success = true; + if (event->kvWriter) { + event->kvWriter->write({ F("MAC"), WiFi.macAddress(), KeyValueStruct::Format::PreFormatted }); + success = true; + } break; } case NWPlugin::Function::NWPLUGIN_WEBFORM_SHOW_IP: { - string = WiFi.localIP().toString(); - success = true; + if (event->kvWriter) { + event->kvWriter->write({ F("IP"), WiFi.localIP().toString(), KeyValueStruct::Format::PreFormatted }); + success = true; + } break; } @@ -176,6 +214,7 @@ bool NWPlugin_001(NWPlugin::Function function, EventStruct *event, String& strin case NWPlugin::Function::NWPLUGIN_WEBFORM_SHOW_PORT: { + // TODO TD-er: Show ESP32-P4 GPIOs for WiFi break; } diff --git a/src/ESPEasy/net/_NW002_WiFi_AP.cpp b/src/ESPEasy/net/_NW002_WiFi_AP.cpp index 06a0eae5a..919fce999 100644 --- a/src/ESPEasy/net/_NW002_WiFi_AP.cpp +++ b/src/ESPEasy/net/_NW002_WiFi_AP.cpp @@ -89,6 +89,12 @@ bool NWPlugin_002(NWPlugin::Function function, EventStruct *event, String& strin case NWPlugin::Function::NWPLUGIN_WEBFORM_SHOW_CONNECTED: { + if (event->kvWriter == nullptr) { + break; + } + + KeyValueStruct kv(F("Clients")); + # ifdef ESP32 wifi_sta_list_t wifi_sta_list = { 0 }; wifi_sta_mac_ip_list_t wifi_sta_mac_ip_list = { 0 }; @@ -101,16 +107,12 @@ bool NWPlugin_002(NWPlugin::Function function, EventStruct *event, String& strin const MAC_address mac(wifi_sta_mac_ip_list.sta[i].mac); const IPAddress ip(wifi_sta_mac_ip_list.sta[i].ip.addr); - if (string.length() > 0) { - string += '\n'; - } - - string += strformat( - F("%s IP:%s (%d dBm)"), - mac.toString().c_str(), - ip.toString().c_str(), - wifi_sta_list.sta[i].rssi - ); + kv.appendValue(strformat( + F("%s IP:%s (%d dBm)"), + mac.toString().c_str(), + ip.toString().c_str(), + wifi_sta_list.sta[i].rssi + )); } # endif // ifdef ESP32 @@ -123,15 +125,11 @@ bool NWPlugin_002(NWPlugin::Function function, EventStruct *event, String& strin const MAC_address mac(station->bssid); const IPAddress ip(station->ip.addr); - if (string.length() > 0) { - string += '\n'; - } - - string += strformat( - F("%s IP:%s"), - mac.toString().c_str(), - ip.toString().c_str() - ); + kv.appendValue(strformat( + F("%s IP:%s"), + mac.toString().c_str(), + ip.toString().c_str() + )); station = STAILQ_NEXT(station, next); } @@ -149,33 +147,45 @@ bool NWPlugin_002(NWPlugin::Function function, EventStruct *event, String& strin } # endif // ifndef LIMIT_BUILD_SIZE # endif // ifdef ESP8266 - success = string.length() > 0; + + if (kv._values.size() > 0) { + success = true; + event->kvWriter->write(kv); + } break; } case NWPlugin::Function::NWPLUGIN_WEBFORM_SHOW_HOSTNAME: { + if (event->kvWriter) { + event->kvWriter->write({ F("Hostname"), # ifdef ESP32 - string = WiFi.AP.SSID(); + WiFi.AP.SSID() # else - string = WiFi.softAPSSID(); + WiFi.softAPSSID() # endif // ifdef ESP32 - success = true; + }); + success = true; + } break; } # ifdef ESP8266 case NWPlugin::Function::NWPLUGIN_WEBFORM_SHOW_HW_ADDRESS: { - string = WiFi.softAPmacAddress(); - success = true; + if (event->kvWriter) { + event->kvWriter->write({ F("MAC"), WiFi.softAPmacAddress(), KeyValueStruct::Format::PreFormatted }); + success = true; + } break; } case NWPlugin::Function::NWPLUGIN_WEBFORM_SHOW_IP: { - string = WiFi.softAPIP().toString(); - success = true; + if (event->kvWriter) { + event->kvWriter->write({ F("IP"), WiFi.softAPIP().toString(), KeyValueStruct::Format::PreFormatted }); + success = true; + } break; } @@ -234,7 +244,7 @@ bool NWPlugin_002(NWPlugin::Function function, EventStruct *event, String& strin addFormPasswordBox(F("WPA AP Mode Key"), F("apkey"), SecuritySettings.WifiAPKey, 63); addFormNote(F("WPA Key must be at least 8 characters long")); - + { # if CONFIG_SOC_WIFI_SUPPORT_5G @@ -257,7 +267,7 @@ bool NWPlugin_002(NWPlugin::Function function, EventStruct *event, String& strin selector.addFormSelector( F("Wifi AP channel"), F("apchannel"), Settings.WiFiAP_channel); -# else +# else // if CONFIG_SOC_WIFI_SUPPORT_5G addFormNumericBox(F("Wifi AP channel"), F("apchannel"), Settings.WiFiAP_channel, 1, 14); # endif // if CONFIG_SOC_WIFI_SUPPORT_5G @@ -266,7 +276,8 @@ bool NWPlugin_002(NWPlugin::Function function, EventStruct *event, String& strin addFormCheckBox(F("Force /setup in AP-Mode"), F("captiveportal"), Settings.ApCaptivePortal()); - addFormNote(F("When set, user will be redirected to /setup or root page when connecting to this AP. /setup can still be called when disabled.")); + addFormNote(F( + "When set, user will be redirected to /setup or root page when connecting to this AP. /setup can still be called when disabled.")); addFormCheckBox(F("Do Not Start AP"), F("DoNotStartAP"), Settings.DoNotStartAP()); # if FEATURE_ETHERNET @@ -277,7 +288,7 @@ bool NWPlugin_002(NWPlugin::Function function, EventStruct *event, String& strin # ifdef ESP32 addFormCheckBox(F("Enable NAPT"), F("napt"), Settings.WiFi_AP_enable_NAPT()); addFormNote(F("NAPT will have no effect when 'force /setup' is enabled")); - # endif + # endif // ifdef ESP32 break; } diff --git a/src/ESPEasy/net/_NW003_ETH_RMII.cpp b/src/ESPEasy/net/_NW003_ETH_RMII.cpp index 67c0242e8..0765de253 100644 --- a/src/ESPEasy/net/_NW003_ETH_RMII.cpp +++ b/src/ESPEasy/net/_NW003_ETH_RMII.cpp @@ -89,13 +89,26 @@ bool NWPlugin_003(NWPlugin::Function function, EventStruct *event, String& strin case NWPlugin::Function::NWPLUGIN_WEBFORM_SHOW_CONNECTED: { - success = ETH.connected(); + if (event->kvWriter) { + success = ETH.connected(); - if (ETH.linkUp()) { - string = ETH.linkSpeed(); - string += ETH.fullDuplex() ? F("Mbps FD") : F("Mbps HD"); + if (ETH.linkUp()) { + if (event->kvWriter->ignoreKey()) { + String s = concat( + String(ETH.linkSpeed()), + ETH.fullDuplex() ? F("Mbps FD") : F("Mbps HD")); - if (!ETH.autoNegotiation()) { string += F("(manual)"); } + if (!ETH.autoNegotiation()) { s += F("(manual)"); } + event->kvWriter->write({ EMPTY_STRING, s }); + } else { + KeyValueStruct kv(F("Link Speed"), ETH.linkSpeed()); + kv.setUnit(F("Mbps")); + event->kvWriter->write(kv); + event->kvWriter->write({ F("Link Speed"), ETH.linkSpeed() }); + event->kvWriter->write({ F("Duplex Mode"), ETH.fullDuplex() ? F("Full Duplex") : F("Half Duplex") }); + event->kvWriter->write({ F("Negotiation Mode"), ETH.autoNegotiation() ? F("Auto") : F("Manual") }); + } + } } break; } @@ -156,9 +169,9 @@ bool NWPlugin_003(NWPlugin::Function function, EventStruct *event, String& strin # if CONFIG_ETH_USE_ESP32_EMAC && FEATURE_ETHERNET toString(EthPhyType_t::LAN8720), -# if ETH_PHY_LAN867X_SUPPORTED +# if ETH_PHY_LAN867X_SUPPORTED toString(ESPEasy::net::EthPhyType_t::LAN867X), -# endif +# endif toString(EthPhyType_t::TLK110), toString(EthPhyType_t::RTL8201), # if ETH_TYPE_JL1101_SUPPORTED @@ -186,9 +199,9 @@ bool NWPlugin_003(NWPlugin::Function function, EventStruct *event, String& strin # if CONFIG_ETH_USE_ESP32_EMAC && FEATURE_ETHERNET static_cast(EthPhyType_t::LAN8720), -# if ETH_PHY_LAN867X_SUPPORTED +# if ETH_PHY_LAN867X_SUPPORTED static_cast(ESPEasy::net::EthPhyType_t::LAN867X), -# endif +# endif static_cast(EthPhyType_t::TLK110), static_cast(EthPhyType_t::RTL8201), # if ETH_TYPE_JL1101_SUPPORTED @@ -343,6 +356,7 @@ bool NWPlugin_003(NWPlugin::Function function, EventStruct *event, String& strin } } // namespace net + } // namespace ESPEasy diff --git a/src/ESPEasy/net/_NW004_ETH_SPI.cpp b/src/ESPEasy/net/_NW004_ETH_SPI.cpp index dfb1c7c6e..badcb56a5 100644 --- a/src/ESPEasy/net/_NW004_ETH_SPI.cpp +++ b/src/ESPEasy/net/_NW004_ETH_SPI.cpp @@ -94,13 +94,26 @@ bool NWPlugin_004(NWPlugin::Function function, EventStruct *event, String& strin case NWPlugin::Function::NWPLUGIN_WEBFORM_SHOW_CONNECTED: { - success = ETH.connected(); + if (event->kvWriter) { + success = ETH.connected(); - if (ETH.linkUp()) { - string = ETH.linkSpeed(); - string += ETH.fullDuplex() ? F("Mbps FD") : F("Mbps HD"); + if (ETH.linkUp()) { + if (event->kvWriter->ignoreKey()) { + String s = concat( + String(ETH.linkSpeed()), + ETH.fullDuplex() ? F("Mbps FD") : F("Mbps HD")); - if (!ETH.autoNegotiation()) { string += F("(manual)"); } + if (!ETH.autoNegotiation()) { s += F("(manual)"); } + event->kvWriter->write({ EMPTY_STRING, s }); + } else { + KeyValueStruct kv(F("Link Speed"), ETH.linkSpeed()); + kv.setUnit(F("Mbps")); + event->kvWriter->write(kv); + event->kvWriter->write({ F("Link Speed"), ETH.linkSpeed() }); + event->kvWriter->write({ F("Duplex Mode"), ETH.fullDuplex() ? F("Full Duplex") : F("Half Duplex") }); + event->kvWriter->write({ F("Negotiation Mode"), ETH.autoNegotiation() ? F("Auto") : F("Manual") }); + } + } } break; } @@ -161,9 +174,9 @@ bool NWPlugin_004(NWPlugin::Function function, EventStruct *event, String& strin # if CONFIG_ETH_USE_ESP32_EMAC && FEATURE_ETHERNET toString(EthPhyType_t::LAN8720), -# if ETH_PHY_LAN867X_SUPPORTED +# if ETH_PHY_LAN867X_SUPPORTED toString(ESPEasy::net::EthPhyType_t::LAN867X), -# endif +# endif toString(EthPhyType_t::TLK110), toString(EthPhyType_t::RTL8201), # if ETH_TYPE_JL1101_SUPPORTED @@ -191,9 +204,9 @@ bool NWPlugin_004(NWPlugin::Function function, EventStruct *event, String& strin # if CONFIG_ETH_USE_ESP32_EMAC && FEATURE_ETHERNET static_cast(EthPhyType_t::LAN8720), -# if ETH_PHY_LAN867X_SUPPORTED +# if ETH_PHY_LAN867X_SUPPORTED static_cast(ESPEasy::net::EthPhyType_t::LAN867X), -# endif +# endif static_cast(EthPhyType_t::TLK110), static_cast(EthPhyType_t::RTL8201), # if ETH_TYPE_JL1101_SUPPORTED diff --git a/src/ESPEasy/net/_NW005_PPP_modem.cpp b/src/ESPEasy/net/_NW005_PPP_modem.cpp index d9ae0815e..d9137c181 100644 --- a/src/ESPEasy/net/_NW005_PPP_modem.cpp +++ b/src/ESPEasy/net/_NW005_PPP_modem.cpp @@ -86,17 +86,33 @@ bool NWPlugin_005(NWPlugin::Function function, EventStruct *event, String& strin case NWPlugin::Function::NWPLUGIN_WEBFORM_SHOW_CONNECTED: { - ESPEasy::net::ppp::NW005_data_struct_PPP_modem *NW_data = - static_cast(getNWPluginData(event->NetworkIndex)); + if (event->kvWriter) { + ESPEasy::net::ppp::NW005_data_struct_PPP_modem *NW_data = + static_cast(getNWPluginData(event->NetworkIndex)); - if (NW_data) { - success = NW_data->attached(); + if (NW_data) { + success = NW_data->attached(); - if (success) { - string = strformat( - F("%s (%s dBm)"), - NW_data->operatorName().c_str(), - NW_data->getRSSI().c_str()); + if (success) { + if (event->kvWriter->ignoreKey()) { + event->kvWriter->write({ + EMPTY_STRING, + strformat( + F("%s (%s dBm)"), + NW_data->operatorName().c_str(), + NW_data->getRSSI().c_str()) + }); + } else { + event->kvWriter->write({ + F("Operator Name"), + NW_data->operatorName() + }); + event->kvWriter->write({ + F("RSSI"), + NW_data->getRSSI() + }); + } + } } } @@ -105,12 +121,18 @@ bool NWPlugin_005(NWPlugin::Function function, EventStruct *event, String& strin case NWPlugin::Function::NWPLUGIN_WEBFORM_SHOW_HW_ADDRESS: { - ESPEasy::net::ppp::NW005_data_struct_PPP_modem *NW_data = - static_cast(getNWPluginData(event->NetworkIndex)); + if (event->kvWriter) { + ESPEasy::net::ppp::NW005_data_struct_PPP_modem *NW_data = + static_cast(getNWPluginData(event->NetworkIndex)); - if (NW_data) { - string = NW_data->IMEI(); - event->String1 = F("IMEI"); + if (NW_data) { + if (event->kvWriter->ignoreKey()) { + event->kvWriter->write({ EMPTY_STRING, concat(F("IMEI: "), NW_data->IMEI()) }); + } + else { + event->kvWriter->write({ F("IMEI"), NW_data->IMEI(), KeyValueStruct::Format::PreFormatted }); + } + } } // Still mark success = true to prevent a call to get the MAC address @@ -121,11 +143,18 @@ bool NWPlugin_005(NWPlugin::Function function, EventStruct *event, String& strin case NWPlugin::Function::NWPLUGIN_WEBFORM_SHOW_PORT: { - ESPEasy::net::ppp::NW005_data_struct_PPP_modem *NW_data = - static_cast(getNWPluginData(event->NetworkIndex)); + if (event->kvWriter) { + ESPEasy::net::ppp::NW005_data_struct_PPP_modem *NW_data = + static_cast(getNWPluginData(event->NetworkIndex)); - if (NW_data) { - success = NW_data->webform_getPort(string); + if (NW_data) { + String portStr; + success = NW_data->webform_getPort(portStr); + + if (success) { + event->kvWriter->write({ F("Port"), portStr }); + } + } } break; } diff --git a/src/src/DataStructs/ESPEasy_EventStruct.h b/src/src/DataStructs/ESPEasy_EventStruct.h index 0889455b1..d0a230dba 100644 --- a/src/src/DataStructs/ESPEasy_EventStruct.h +++ b/src/src/DataStructs/ESPEasy_EventStruct.h @@ -9,6 +9,7 @@ #include "../DataTypes/NotifierIndex.h" #include "../ESPEasy/net/DataTypes/NetworkIndex.h" #include "../DataStructs/DeviceStruct.h" +#include "../Helpers/KeyValueWriter.h" #ifdef ESP32 # include @@ -68,6 +69,7 @@ public: NetworkInterface*networkInterface = nullptr; #endif + KeyValueWriter* kvWriter = nullptr; uint32_t timestamp_sec = 0u; uint32_t timestamp_frac = 0u; diff --git a/src/src/Helpers/KeyValueWriter.cpp b/src/src/Helpers/KeyValueWriter.cpp index 3871e901d..8f75daa92 100644 --- a/src/src/Helpers/KeyValueWriter.cpp +++ b/src/src/Helpers/KeyValueWriter.cpp @@ -17,65 +17,73 @@ ValueStruct::ValueStruct(String&& val, ValueType vType) : str(std::move(val)), v // KeyValueStruct // ******************************************************************************** -KeyValueStruct::KeyValueStruct(const __FlashStringHelper *key) : _key(key) {} +KeyValueStruct::KeyValueStruct(const __FlashStringHelper *key, Format format) : _key(key), _format(format) {} -KeyValueStruct::KeyValueStruct(const String& key) : _key(key) {} +KeyValueStruct::KeyValueStruct(const String& key, Format format) : _key(key), _format(format) {} KeyValueStruct::KeyValueStruct(const String & key, const bool & val, + Format format, ValueStruct::ValueType vType) - : _key(key) { + : _key(key), _format(format) { _values.emplace_back(String(val), vType); } KeyValueStruct::KeyValueStruct(const String & key, int val, + Format format, ValueStruct::ValueType vType) - : _key(key) { + : _key(key), _format(format) { _values.emplace_back(String(val), vType); } KeyValueStruct::KeyValueStruct(const String & key, int32_t val, + Format format, ValueStruct::ValueType vType) - : _key(key) { + : _key(key), _format(format) { _values.emplace_back(String(val), vType); } KeyValueStruct::KeyValueStruct(const String & key, uint32_t val, + Format format, ValueStruct::ValueType vType) - : _key(key) { + : _key(key), _format(format) { _values.emplace_back(String(val), vType); } KeyValueStruct::KeyValueStruct(const String & key, size_t val, + Format format, ValueStruct::ValueType vType) - : _key(key) { + : _key(key), _format(format) { _values.emplace_back(String(val), vType); } KeyValueStruct::KeyValueStruct(const String & key, const uint64_t & val, + Format format, ValueStruct::ValueType vType) - : _key(key) { + : _key(key), _format(format) { _values.emplace_back(ull2String(val), vType); } KeyValueStruct::KeyValueStruct(const String & key, const int64_t & val, + Format format, ValueStruct::ValueType vType) - : _key(key) { + : _key(key), _format(format) { _values.emplace_back(ll2String(val), vType); } KeyValueStruct::KeyValueStruct(const String & key, const float & val, int nrDecimals, + Format format, ValueStruct::ValueType vType) - : _key(key) { + : _key(key), _format(format) { String str; if (!toValidString(str, val, nrDecimals)) { @@ -88,8 +96,9 @@ KeyValueStruct::KeyValueStruct(const String & key, KeyValueStruct::KeyValueStruct(const String & key, const double & val, int nrDecimals, + Format format, ValueStruct::ValueType vType) - : _key(key) { + : _key(key), _format(format) { String str; if (!doubleToValidString(str, val, nrDecimals)) { @@ -101,55 +110,62 @@ KeyValueStruct::KeyValueStruct(const String & key, KeyValueStruct::KeyValueStruct(const __FlashStringHelper *key, const String & val, + Format format, ValueStruct::ValueType vType) - : _key(key) { + : _key(key), _format(format) { _values.emplace_back(val, vType); } KeyValueStruct::KeyValueStruct(const String & key, const __FlashStringHelper *val, + Format format, ValueStruct::ValueType vType) - : _key(key) { + : _key(key), _format(format) { _values.emplace_back(val, vType); } KeyValueStruct::KeyValueStruct(const __FlashStringHelper *key, const __FlashStringHelper *val, + Format format, ValueStruct::ValueType vType) - : _key(key) { + : _key(key), _format(format) { _values.emplace_back(val, vType); } KeyValueStruct::KeyValueStruct(const __FlashStringHelper *key, const char *val, + Format format, ValueStruct::ValueType vType) - : _key(key) { + : _key(key), _format(format) { _values.emplace_back(String(val), vType); } KeyValueStruct::KeyValueStruct(const String & key, const String & val, + Format format, ValueStruct::ValueType vType) - : _key(key) { + : _key(key), _format(format) { _values.emplace_back(val, vType); } KeyValueStruct::KeyValueStruct(const __FlashStringHelper *key, String && val, + Format format, ValueStruct::ValueType vType) - : _key(key) { + : _key(key), _format(format) { _values.emplace_back(std::move(val), vType); } KeyValueStruct::KeyValueStruct(const String & key, String && val, + Format format, ValueStruct::ValueType vType) - : _key(key) { + : _key(key), _format(format) { _values.emplace_back(std::move(val), vType); } -KeyValueStruct::KeyValueStruct(LabelType::Enum label) - : _key(getLabel(label)), _unit(getFormUnit(label)) { +KeyValueStruct::KeyValueStruct(LabelType::Enum label, Format format) + : _key(getLabel(label)), _unit(getFormUnit(label)), _format(format) { _values.emplace_back(getValue(label)); } @@ -198,3 +214,14 @@ int KeyValueWriter::getLevel() const if (_parent == nullptr) { return 0; } return _parent->getLevel() + 1; } + +bool KeyValueWriter::plainText() const { + if (_toString != nullptr) { return true; } + + if (_parent && _parent->plainText()) { return true; } + return _plainText; +} + +bool KeyValueWriter::ignoreKey() const { + return plainText() || _ignoreKey; +} diff --git a/src/src/Helpers/KeyValueWriter.h b/src/src/Helpers/KeyValueWriter.h index 887f0a5f9..2b1fb0ed0 100644 --- a/src/src/Helpers/KeyValueWriter.h +++ b/src/src/Helpers/KeyValueWriter.h @@ -46,80 +46,104 @@ struct ValueStruct // ******************************************************************************** struct KeyValueStruct { + enum class Format { + Default, + PreFormatted - KeyValueStruct() {} + }; - KeyValueStruct(const __FlashStringHelper *key); - KeyValueStruct(const String& key); + + KeyValueStruct(Format format = Format::Default) : _format(format) {} + + KeyValueStruct(const __FlashStringHelper *key, + Format format = Format::Default); + KeyValueStruct(const String& key, + Format format = Format::Default); KeyValueStruct(const String & key, const bool & val, - ValueStruct::ValueType vType = ValueStruct::ValueType::Bool); + Format format = Format::Default, + ValueStruct::ValueType vType = ValueStruct::ValueType::Bool); KeyValueStruct(const String & key, int val, - ValueStruct::ValueType vType = ValueStruct::ValueType::Int); + Format format = Format::Default, + ValueStruct::ValueType vType = ValueStruct::ValueType::Int); KeyValueStruct(const String & key, int32_t val, - ValueStruct::ValueType vType = ValueStruct::ValueType::Int); + Format format = Format::Default, + ValueStruct::ValueType vType = ValueStruct::ValueType::Int); KeyValueStruct(const String & key, uint32_t val, - ValueStruct::ValueType vType = ValueStruct::ValueType::Int); + Format format = Format::Default, + ValueStruct::ValueType vType = ValueStruct::ValueType::Int); KeyValueStruct(const String & key, size_t val, - ValueStruct::ValueType vType = ValueStruct::ValueType::Int); + Format format = Format::Default, + ValueStruct::ValueType vType = ValueStruct::ValueType::Int); KeyValueStruct(const String & key, const uint64_t & val, - ValueStruct::ValueType vType = ValueStruct::ValueType::Int); + Format format = Format::Default, + ValueStruct::ValueType vType = ValueStruct::ValueType::Int); KeyValueStruct(const String & key, const int64_t & val, - ValueStruct::ValueType vType = ValueStruct::ValueType::Int); + Format format = Format::Default, + ValueStruct::ValueType vType = ValueStruct::ValueType::Int); KeyValueStruct(const String & key, const float & val, int nrDecimals = 4, + Format format = Format::Default, ValueStruct::ValueType vType = ValueStruct::ValueType::Float); KeyValueStruct(const String & key, const double & val, int nrDecimals = 4, + Format format = Format::Default, ValueStruct::ValueType vType = ValueStruct::ValueType::Double); KeyValueStruct(const __FlashStringHelper *key, const String & val, - ValueStruct::ValueType vType = ValueStruct::ValueType::Auto); + Format format = Format::Default, + ValueStruct::ValueType vType = ValueStruct::ValueType::Auto); KeyValueStruct(const String & key, const __FlashStringHelper *val, - ValueStruct::ValueType vType = ValueStruct::ValueType::Auto); + Format format = Format::Default, + ValueStruct::ValueType vType = ValueStruct::ValueType::Auto); KeyValueStruct(const __FlashStringHelper *key, const __FlashStringHelper *val, - ValueStruct::ValueType vType = ValueStruct::ValueType::Auto); + Format format = Format::Default, + ValueStruct::ValueType vType = ValueStruct::ValueType::Auto); KeyValueStruct(const __FlashStringHelper *key, const char *val, - ValueStruct::ValueType vType = ValueStruct::ValueType::Auto); + Format format = Format::Default, + ValueStruct::ValueType vType = ValueStruct::ValueType::Auto); KeyValueStruct(const String & key, const String & val, - ValueStruct::ValueType vType = ValueStruct::ValueType::Auto); + Format format = Format::Default, + ValueStruct::ValueType vType = ValueStruct::ValueType::Auto); KeyValueStruct(const __FlashStringHelper *key, String && val, - ValueStruct::ValueType vType = ValueStruct::ValueType::Auto); + Format format = Format::Default, + ValueStruct::ValueType vType = ValueStruct::ValueType::Auto); KeyValueStruct(const String & key, String && val, - ValueStruct::ValueType vType = ValueStruct::ValueType::Auto); + Format format = Format::Default, + ValueStruct::ValueType vType = ValueStruct::ValueType::Auto); /* // TD-er: Do not use template types as it may 'explode' in binary size. @@ -127,13 +151,15 @@ struct KeyValueStruct // as they are const char[3] and const char[4] respectively. template KeyValueStruct(const String & key, - const T & val, - ValueStruct::ValueType vType = ValueStruct::ValueType::Auto) - : _key(key) { + const T & val, + Format format = Format::Default, + ValueStruct::ValueType vType = ValueStruct::ValueType::Auto) + : _key(key), _format(format) { _values.emplace_back(String(val), vType); } */ - KeyValueStruct(LabelType::Enum label); + KeyValueStruct(LabelType::Enum label, + Format format = Format::Default); void setUnit(const String& unit); void setUnit(const __FlashStringHelper *unit); @@ -149,8 +175,8 @@ struct KeyValueStruct std::vector_values; - // output as pre-formatted monospaced - bool _value_pre{}; + Format _format = Format::Default; + bool _isArray{}; }; @@ -170,7 +196,8 @@ public: protected: - KeyValueWriter(KeyValueWriter*parent, PrintToString *toStr = nullptr) : _toString(toStr), _parent(parent) {} + KeyValueWriter(KeyValueWriter*parent, PrintToString *toStr = nullptr) : _toString(toStr), _parent(parent) + {} KeyValueWriter(bool emptyHeader, KeyValueWriter*parent, PrintToString *toStr = nullptr) : _toString(toStr), _parent(parent), _hasHeader(emptyHeader) {} @@ -201,7 +228,15 @@ public: virtual int getLevel() const; - virtual void setIsArray() { _isArray = true; } + virtual void setIsArray() { _isArray = true; } + + virtual void setPlainText() { _plainText = true; } + + virtual bool plainText() const; + + virtual void setIgnoreKey() { _ignoreKey = true; } + + virtual bool ignoreKey() const; // Only supported for JSON writer right now // TODO TD-er: Change this to std::shared_ptr @@ -259,5 +294,11 @@ protected: bool _isArray{}; +private: + + bool _plainText = false; + + bool _ignoreKey = false; + }; // class KeyValueWriter diff --git a/src/src/WebServer/KeyValueWriter_WebForm.cpp b/src/src/WebServer/KeyValueWriter_WebForm.cpp index 3429ca467..fd3805705 100644 --- a/src/src/WebServer/KeyValueWriter_WebForm.cpp +++ b/src/src/WebServer/KeyValueWriter_WebForm.cpp @@ -1,48 +1,59 @@ #include "../WebServer/KeyValueWriter_WebForm.h" +#include "../Helpers/StringConverter.h" + #include "../WebServer/HTML_wrappers.h" #include "../WebServer/Markup.h" -KeyValueWriter_WebForm::KeyValueWriter_WebForm(bool emptyHeader) - : KeyValueWriter(emptyHeader) + +KeyValueWriter_WebForm::KeyValueWriter_WebForm(bool emptyHeader, PrintToString *toStr) + : KeyValueWriter(emptyHeader, toStr) {} -KeyValueWriter_WebForm::KeyValueWriter_WebForm(KeyValueWriter_WebForm*parent) - : KeyValueWriter(parent) +KeyValueWriter_WebForm::KeyValueWriter_WebForm(KeyValueWriter_WebForm*parent, PrintToString *toStr) + : KeyValueWriter(parent, toStr) {} -KeyValueWriter_WebForm::KeyValueWriter_WebForm(bool emptyHeader, KeyValueWriter_WebForm*parent) - : KeyValueWriter(emptyHeader, parent) +KeyValueWriter_WebForm::KeyValueWriter_WebForm(bool emptyHeader, KeyValueWriter_WebForm*parent, PrintToString *toStr) + : KeyValueWriter(emptyHeader, parent, toStr) {} -KeyValueWriter_WebForm::KeyValueWriter_WebForm(const String& header) - : KeyValueWriter(header, nullptr) +KeyValueWriter_WebForm::KeyValueWriter_WebForm(const String& header, PrintToString *toStr) + : KeyValueWriter(header, nullptr, toStr) {} -KeyValueWriter_WebForm::KeyValueWriter_WebForm(const __FlashStringHelper *header) - : KeyValueWriter(String(header), nullptr) +KeyValueWriter_WebForm::KeyValueWriter_WebForm(const __FlashStringHelper *header, PrintToString *toStr) + : KeyValueWriter(String(header), nullptr, toStr) {} -KeyValueWriter_WebForm::KeyValueWriter_WebForm(const String& header, KeyValueWriter_WebForm*parent) - : KeyValueWriter(header, parent) +KeyValueWriter_WebForm::KeyValueWriter_WebForm(const String& header, KeyValueWriter_WebForm*parent, PrintToString *toStr) + : KeyValueWriter(header, parent, toStr) {} -KeyValueWriter_WebForm::KeyValueWriter_WebForm(const __FlashStringHelper *header, KeyValueWriter_WebForm*parent) - : KeyValueWriter(String(header), parent) +KeyValueWriter_WebForm::KeyValueWriter_WebForm(const __FlashStringHelper *header, KeyValueWriter_WebForm*parent, PrintToString *toStr) + : KeyValueWriter(String(header), parent, toStr) {} - KeyValueWriter_WebForm::~KeyValueWriter_WebForm() -{} +{ + if (!ignoreKey() && !_isEmpty && _hasHeader && _header.isEmpty()) { + // TODO TD-er: Should we add a separator line here? + } + +} void KeyValueWriter_WebForm::write() { if (_isEmpty) { if (_parent != nullptr) { _parent->write(); } - if (_hasHeader && !_header.isEmpty()) { - addFormSubHeader(_header); + if (!ignoreKey() && _hasHeader && !_header.isEmpty()) { + if (plainText()) { + getPrint().print(concat(_header, F(": "))); + } else { + addFormSubHeader(_header); + } } _isEmpty = false; } @@ -50,24 +61,40 @@ void KeyValueWriter_WebForm::write() void KeyValueWriter_WebForm::write(const KeyValueStruct& kv) { - addRowLabel(kv._key, kv._id); - const size_t nrValues = kv._values.size(); - const bool format_pre = nrValues > 1 || kv._value_pre; + write(); - if (format_pre) { addHtml(F("
    ")); }
+  if (!ignoreKey()) {
+    addRowLabel(kv._key, kv._id);
+  }
+  const size_t nrValues   = kv._values.size();
+  const bool   format_pre = !plainText() && (nrValues > 1 || kv._format == KeyValueStruct::Format::PreFormatted);
+
+  if (format_pre) { getPrint().print(F("
    ")); }
 
   for (size_t i = 0; i < nrValues; ++i) {
     if (i != 0) {
-      addHtml(F("
    "));
+      getPrint().print(F("
    "));
+    }
+
+    if (kv._values[i].str.indexOf('\n') != -1)
+    {
+      String str = kv._values[i].str;
+      str.replace(F("\n"), F("
    "));
+      getPrint().print(str);
+    } else {
+      getPrint().print(kv._values[i].str);
     }
-    addHtml(kv._values[i].str);
   }
 
-  if (format_pre) { addHtml(F("
    ")); }
+  if (format_pre) { getPrint().print(F("
    ")); } - if (nrValues == 1) { + if (!plainText() && (nrValues == 1)) { addUnit(kv._unit); } + + if (plainText()) { + getPrint().print(F("
    ")); + } } Sp_KeyValueWriter KeyValueWriter_WebForm::createChild() { return std::make_shared(this); } diff --git a/src/src/WebServer/KeyValueWriter_WebForm.h b/src/src/WebServer/KeyValueWriter_WebForm.h index 8b92a8f33..0c6e5b65e 100644 --- a/src/src/WebServer/KeyValueWriter_WebForm.h +++ b/src/src/WebServer/KeyValueWriter_WebForm.h @@ -9,20 +9,27 @@ public: using KeyValueWriter::writeLabels; - KeyValueWriter_WebForm(bool emptyHeader = false); + KeyValueWriter_WebForm(bool emptyHeader = false, + PrintToString *toStr = nullptr); - KeyValueWriter_WebForm(KeyValueWriter_WebForm*parent); + KeyValueWriter_WebForm(KeyValueWriter_WebForm*parent, + PrintToString *toStr = nullptr); KeyValueWriter_WebForm(bool emptyHeader, - KeyValueWriter_WebForm*parent); + KeyValueWriter_WebForm*parent, + PrintToString *toStr = nullptr); - KeyValueWriter_WebForm(const String& header); - KeyValueWriter_WebForm(const __FlashStringHelper *header); + KeyValueWriter_WebForm(const String & header, + PrintToString *toStr = nullptr); + KeyValueWriter_WebForm(const __FlashStringHelper *header, + PrintToString *toStr = nullptr); KeyValueWriter_WebForm(const String & header, - KeyValueWriter_WebForm*parent); + KeyValueWriter_WebForm*parent, + PrintToString *toStr = nullptr); KeyValueWriter_WebForm(const __FlashStringHelper *header, - KeyValueWriter_WebForm *parent); + KeyValueWriter_WebForm *parent, + PrintToString *toStr = nullptr); virtual ~KeyValueWriter_WebForm(); diff --git a/src/src/WebServer/NetworkPage.cpp b/src/src/WebServer/NetworkPage.cpp index b91429217..603b2b617 100644 --- a/src/src/WebServer/NetworkPage.cpp +++ b/src/src/WebServer/NetworkPage.cpp @@ -217,12 +217,16 @@ void handle_networks_ShowAllNetworksTable() for (uint8_t i = 0; i < NR_ELEMENTS(functions); ++i) { html_TD(); + KeyValueWriter_WebForm webFormWriter; + webFormWriter.setPlainText(); struct EventStruct TempEvent; + TempEvent.kvWriter = &webFormWriter; + TempEvent.NetworkIndex = x; String str; - const bool res = NWPluginCall(functions[i], &TempEvent, str); + const bool res = NWPluginCall(functions[i], &TempEvent); # ifdef ESP32 if (functions[i] == NWPlugin::Function::NWPLUGIN_WEBFORM_SHOW_ROUTE_PRIO) { @@ -237,29 +241,9 @@ void handle_networks_ShowAllNetworksTable() # endif // ifdef ESP32 if (functions[i] == NWPlugin::Function::NWPLUGIN_WEBFORM_SHOW_CONNECTED) { - if (!res || str.isEmpty()) { - addEnabled(res); - } else { - String conn_duration; - - if (NWPluginCall(NWPlugin::Function::NWPLUGIN_GET_CONNECTED_DURATION, &TempEvent, conn_duration)) { - if (conn_duration.length()) { - str += '\n'; - str += conn_duration; - } - } - } - } else if (functions[i] == NWPlugin::Function::NWPLUGIN_WEBFORM_SHOW_HW_ADDRESS) { - if (res && !TempEvent.String1.isEmpty() && !str.isEmpty()) { - addHtml(strformat(F("%s: "), TempEvent.String1.c_str())); - } + NWPluginCall(NWPlugin::Function::NWPLUGIN_GET_CONNECTED_DURATION, &TempEvent); + addEnabled(res); } - - if (!str.isEmpty()) { - str.replace(F("\n"), F("
    ")); - addHtml(str); - } - } /* @@ -400,49 +384,43 @@ void handle_networks_NetworkSettingsPage(ESPEasy::net::networkIndex_t networkind { { KeyValueWriter_WebForm writer(F("Network Interface")); - write_NetworkAdapterFlags(networkindex, &writer); + write_NetworkAdapterFlags(networkindex, writer.createChild().get()); } { KeyValueWriter_WebForm writer(F("IP Config")); - write_IP_config(networkindex, &writer); + write_IP_config(networkindex, writer.createChild().get()); } { + KeyValueWriter_WebForm writer(F("Connection Information")); + struct EventStruct TempEvent2; + TempEvent2.NetworkIndex = networkindex; + auto child = writer.createChild(); + TempEvent2.kvWriter = child.get(); + + String str; - const bool res = NWPluginCall(NWPlugin::Function::NWPLUGIN_WEBFORM_SHOW_EXTENDED, &TempEvent, str); - - if (res && !str.isEmpty()) { - addFormSubHeader(F("Connection Information")); - - addRowLabel(F("Connected")); - str.replace(F("\n"), F("
    ")); - addHtml_pre(str); + const bool res = NWPluginCall(NWPlugin::Function::NWPLUGIN_WEBFORM_SHOW_CONNECTED, &TempEvent2, str); + if (res) { String conn_duration; - if (NWPluginCall(NWPlugin::Function::NWPLUGIN_GET_CONNECTED_DURATION, &TempEvent, conn_duration)) { - addRowLabel(F("Connection Duration")); - addHtml(conn_duration); - addRowLabel(F("Number of Reconnects")); - addHtmlInt(TempEvent.Par64_2); - } + NWPluginCall(NWPlugin::Function::NWPLUGIN_GET_CONNECTED_DURATION, &TempEvent2, conn_duration); # if FEATURE_NETWORK_TRAFFIC_COUNT - if (NWPluginCall(NWPlugin::Function::NWPLUGIN_GET_TRAFFIC_COUNT, &TempEvent, str)) { - addRowLabel(F("TX / RX Frames")); - addHtml(strformat( + if (NWPluginCall(NWPlugin::Function::NWPLUGIN_GET_TRAFFIC_COUNT, &TempEvent2, str)) { + writer.write({ F("TX / RX Frames"), strformat( F("%d / %d"), TempEvent.Par5, - TempEvent.Par6)); + TempEvent.Par6)}); - addRowLabel(F("TX / RX Frame Bytes")); - addHtml(strformat( + writer.write({ F("TX / RX Frame Bytes"), strformat( F("%s%cB / %s%cB"), formatHumanReadable(TempEvent.Par64_1, 1024).c_str(), TempEvent.Par64_1 < 1024 ? ' ' : 'i', formatHumanReadable(TempEvent.Par64_2, 1024).c_str(), TempEvent.Par64_2 < 1024 ? ' ' : 'i' - )); + ) }); } # endif // if FEATURE_NETWORK_TRAFFIC_COUNT } @@ -468,8 +446,10 @@ bool write_NetworkAdapterFlags(ESPEasy::net::networkIndex_t networkindex, KeyVal { if (writer == nullptr) return false; struct EventStruct TempEvent; + TempEvent.kvWriter = writer; TempEvent.NetworkIndex = networkindex; + String str; if (!NWPluginCall(NWPlugin::Function::NWPLUGIN_GET_INTERFACE, &TempEvent, str)) { @@ -479,25 +459,10 @@ bool write_NetworkAdapterFlags(ESPEasy::net::networkIndex_t networkindex, KeyVal { String str; const bool res = NWPluginCall(NWPlugin::Function::NWPLUGIN_WEBFORM_SHOW_HW_ADDRESS, &TempEvent, str); - - KeyValueStruct kv; - kv._value_pre = true; - - if (res && !TempEvent.String1.isEmpty()) { - kv._key = TempEvent.String1; - } else { - kv._key = F("MAC Address"); - } - kv.appendValue(res - ? std::move(str) - : TempEvent.networkInterface->macAddress()); - - writer->write(kv); } { - KeyValueStruct kv(F("Flags")); - kv._value_pre = true; + KeyValueStruct kv(F("Flags"), KeyValueStruct::Format::PreFormatted); const NWPlugin::NetforkFlags flags[] = { NWPlugin::NetforkFlags::DHCP_client, @@ -565,8 +530,7 @@ bool write_IP_config(ESPEasy::net::networkIndex_t networkindex, KeyValueWriter* PrintToString str; if (NWPlugin::print_IP_address(ip_types[i], TempEvent.networkInterface, str)) { - KeyValueStruct kv(NWPlugin::toString(ip_types[i]), str.get()); - kv._value_pre = true; + KeyValueStruct kv(NWPlugin::toString(ip_types[i]), str.get(), KeyValueStruct::Format::PreFormatted); writer->write(kv); } } From 4ecbb223e4bdd88e26426ddce488825c85e57f8a Mon Sep 17 00:00:00 2001 From: Ton Huisman Date: Sun, 5 Oct 2025 21:51:53 +0200 Subject: [PATCH 339/564] [Tools] Add documentation-button to Plugin list overview page --- src/src/WebServer/PluginListPage.cpp | 15 +++++++++++++-- 1 file changed, 13 insertions(+), 2 deletions(-) diff --git a/src/src/WebServer/PluginListPage.cpp b/src/src/WebServer/PluginListPage.cpp index 5d7186c17..c2de57ca1 100644 --- a/src/src/WebServer/PluginListPage.cpp +++ b/src/src/WebServer/PluginListPage.cpp @@ -18,9 +18,9 @@ void handle_pluginlist() { # endif // ifndef BUILD_NO_RAM_TRACKER # if FEATURE_MQTT_TLS // TODO Add check for FEATURE_HTTP_TLS when https://github.com/letscontrolit/ESPEasy/pull/5402 is merged - const int colspan = 5; + const int colspan = 6; # else // if FEATURE_MQTT_TLS - const int colspan = 4; + const int colspan = 5; # endif // if FEATURE_MQTT_TLS TXBuffer.startStream(); @@ -33,6 +33,7 @@ void handle_pluginlist() { addTableSeparator(concat(F("Plugins sorted by "), 0 == p ? F("Description") : F("Plugin ID")), colspan, 3); html_TR(); html_table_header(F("Plugin"), 80); + html_table_header(F(""), 25); html_table_header(F("Description"), 800); html_table_header(F(""), 50); # if FEATURE_MQTT_TLS @@ -55,6 +56,8 @@ void handle_pluginlist() { html_TR_TD(); addHtml(get_formatted_Plugin_number(pluginID)); html_TD(); + addRTDPluginButton(pluginID); + html_TD(); addHtml(getPluginNameFromDeviceIndex(deviceIndex)); html_TD(); } @@ -67,6 +70,7 @@ void handle_pluginlist() { addTableSeparator(F("Controllers"), colspan, 3); html_TR(); html_table_header(F("Controller"), 80); + html_table_header(F(""), 25); html_table_header(F("Description"), 800); html_table_header(F("MQTT"), 50); # if FEATURE_MQTT_TLS @@ -87,6 +91,10 @@ void handle_pluginlist() { html_TR_TD(); addHtml(get_formatted_Controller_number(cpluginID)); html_TD(); + # ifndef LIMIT_BUILD_SIZE + addRTDControllerButton(cpluginID); + # endif // ifndef LIMIT_BUILD_SIZE + html_TD(); addHtml(getCPluginNameFromProtocolIndex(x)); html_TD(); @@ -114,6 +122,7 @@ void handle_pluginlist() { addTableSeparator(F("Notifications"), colspan, 3); html_TR(); html_table_header(F("Notifier"), 80); + html_table_header(F(""), 25); html_table_header(F("Description"), 800); html_table_header(F(""), 50); # if FEATURE_MQTT_TLS @@ -127,6 +136,8 @@ void handle_pluginlist() { const npluginID_t plugin(Notification[x].Number); addHtml(plugin.toDisplayString()); html_TD(); + addRTDHelpButton(strformat(F("Notify/%s.html"), plugin.toDisplayString().c_str())); + html_TD(); String NotificationName; NPlugin_ptr[x](NPlugin::Function::NPLUGIN_GET_DEVICENAME, 0, NotificationName); addHtml(NotificationName); From 43ecbf2f7424a0bfa9973c7e06477323ac3feae6 Mon Sep 17 00:00:00 2001 From: TD-er Date: Sun, 5 Oct 2025 23:04:37 +0200 Subject: [PATCH 340/564] [Network] Cleanup code + generate more network info using new K/V writer --- src/ESPEasy/net/Globals/NWPlugins.cpp | 42 +- .../NW005_data_struct_PPP_modem.cpp | 392 ++++++++++-------- .../NW005_data_struct_PPP_modem.h | 4 +- src/ESPEasy/net/_NW001_WiFi_STA.cpp | 4 +- src/ESPEasy/net/_NW003_ETH_RMII.cpp | 2 +- src/ESPEasy/net/_NW004_ETH_SPI.cpp | 2 +- src/ESPEasy/net/_NW005_PPP_modem.cpp | 25 +- src/ESPEasy/net/_NWPlugin_Helper.h | 1 + src/src/Helpers/KeyValueWriter.cpp | 26 +- src/src/Helpers/KeyValueWriter.h | 32 +- src/src/Helpers/KeyValueWriter_JSON.cpp | 1 + src/src/Helpers/KeyValueWriter_JSON.h | 17 +- src/src/WebServer/KeyValueWriter_WebForm.cpp | 61 ++- src/src/WebServer/NetworkPage.cpp | 66 ++- src/src/WebServer/NetworkPage.h | 3 +- 15 files changed, 408 insertions(+), 270 deletions(-) diff --git a/src/ESPEasy/net/Globals/NWPlugins.cpp b/src/ESPEasy/net/Globals/NWPlugins.cpp index 87357b517..e47a404b3 100644 --- a/src/ESPEasy/net/Globals/NWPlugins.cpp +++ b/src/ESPEasy/net/Globals/NWPlugins.cpp @@ -138,6 +138,44 @@ bool NWPluginCall(NWPlugin::Function Function, EventStruct *event, String& str) event->Par5 = traffic._tx_packets; event->Par6 = traffic._rx_packets; success = true; + + if (event->kvWriter) { + if (event->kvWriter->dataOnlyOutput()) { + { + auto frames = event->kvWriter->createChild(F("Frames")); + + if (frames) { + frames->write({ F("TX"), traffic._tx_packets }); + frames->write({ F("RX"), traffic._rx_packets }); + } + } + { + auto bytes = event->kvWriter->createChild(F("Bytes")); + + if (bytes) { + bytes->write({ F("TX"), traffic._tx_count }); + bytes->write({ F("RX"), traffic._rx_count }); + } + } + } else { + event->kvWriter->write({ + F("TX / RX Frames"), + strformat( + F("%d / %d"), + event->Par5, + event->Par6) }); + + event->kvWriter->write({ + F("TX / RX Frame Bytes"), + strformat( + F("%s%cB / %s%cB"), + formatHumanReadable(event->Par64_1, 1024).c_str(), + event->Par64_1 < 1024 ? ' ' : 'i', + formatHumanReadable(event->Par64_2, 1024).c_str(), + event->Par64_2 < 1024 ? ' ' : 'i' + ) }); + } + } } break; } @@ -181,7 +219,7 @@ bool NWPluginCall(NWPlugin::Function Function, EventStruct *event, String& str) if (event->kvWriter) { event->kvWriter->write({ F("Connection Duration"), format_msec_duration_HMS(duration) }); - if (!event->kvWriter->ignoreKey()) { + if (!event->kvWriter->summaryValueOnly()) { event->kvWriter->write({ F("Number of Reconnects"), event->Par64_2 }); } } @@ -279,7 +317,7 @@ bool NWPluginCall(NWPlugin::Function Function, EventStruct *event, String& str) case NWPlugin::Function::NWPLUGIN_WEBFORM_SHOW_HW_ADDRESS: if (event->kvWriter) { - if (event->kvWriter->ignoreKey()) { + if (event->kvWriter->summaryValueOnly()) { event->kvWriter->write({ EMPTY_STRING, concat(F("MAC: "), event->networkInterface->macAddress()) }); diff --git a/src/ESPEasy/net/NWPluginStructs/NW005_data_struct_PPP_modem.cpp b/src/ESPEasy/net/NWPluginStructs/NW005_data_struct_PPP_modem.cpp index 488adb783..4d9609c7f 100644 --- a/src/ESPEasy/net/NWPluginStructs/NW005_data_struct_PPP_modem.cpp +++ b/src/ESPEasy/net/NWPluginStructs/NW005_data_struct_PPP_modem.cpp @@ -109,6 +109,7 @@ NW005_data_struct_PPP_modem::~NW005_data_struct_PPP_modem() { NW_PLUGIN_INTERFACE.mode(ESP_MODEM_MODE_COMMAND); const int dtrPin = _kvs->getValueAsInt_or_default(NW005_KEY_PIN_DTR, -1); + if (dtrPin != -1) { digitalWrite(dtrPin, LOW); } @@ -240,7 +241,7 @@ String NW005_data_struct_PPP_modem::operatorName() const return NW_PLUGIN_INTERFACE.operatorName(); } -const __FlashStringHelper* NW005_decode_label(int sysmode_index, uint8_t i, String& value_str) +const __FlashStringHelper* NW005_decode_label(int sysmode_index, uint8_t i, String& value_str, String& unit) { const __FlashStringHelper*res = F(""); @@ -301,16 +302,21 @@ const __FlashStringHelper* NW005_decode_label(int sysmode_index, uint8_t i, Stri float val = value_str.toInt(); val -= 40; val /= 2.0f; - value_str = String(val, 1) + F(" [dBm]"); + value_str = String(val, 1); + unit = F("dBm"); break; } case 11: // RSRP - value_str = strformat(F("%d [dBm]"), value_str.toInt() - 140); + value_str = value_str.toInt() - 140; + unit = F("dBm"); + break; case 12: // RSSI - value_str = strformat(F("%d [dBm]"), value_str.toInt() - 110); + value_str = value_str.toInt() - 110; + unit = F("dBm"); + break; } @@ -321,7 +327,7 @@ const __FlashStringHelper* NW005_decode_label(int sysmode_index, uint8_t i, Stri return res; } -void NW005_data_struct_PPP_modem::webform_load_UE_system_information() +void NW005_data_struct_PPP_modem::webform_load_UE_system_information(KeyValueWriter*writer) { if (!NW_PLUGIN_INTERFACE.attached()) { // clear cached string @@ -329,6 +335,11 @@ void NW005_data_struct_PPP_modem::webform_load_UE_system_information() return; } + if (NW_PLUGIN_INTERFACE.mode() != ESP_MODEM_MODE_CMUX) { + NW_PLUGIN_INTERFACE.mode(ESP_MODEM_MODE_CMUX); + } + + String res = write_AT_cmd(F("AT+CPSI?"), 1000); if (res.isEmpty()) { res = _modem_task_data.AT_CPSI; } @@ -354,23 +365,32 @@ void NW005_data_struct_PPP_modem::webform_load_UE_system_information() // Update cached string _modem_task_data.AT_CPSI = res; - addFormSubHeader(F("UE System Information")); + // addFormSubHeader(F("UE System Information")); res += ','; // Add trailing comma so we're not missing the last element for (int i = 0; start_index < res.length() && end_index != -1 && i < 15; ++i) { - String value_str = res.substring(start_index, end_index); - const String label = NW005_decode_label(sysmode_index, i, value_str); + String value_str = res.substring(start_index, end_index); + String unit; + const String label = NW005_decode_label(sysmode_index, i, value_str, unit); if (!label.isEmpty()) { - addRowLabel(label); - if (i == 0) { // We have some leading characters left here, so use the 'clean' strings - addHtml(sysmode_str[sysmode_index]); + KeyValueStruct kv(label, sysmode_str[sysmode_index]); + + if (unit.length()) { + kv.setUnit(unit); + } + writer->write(kv); } else { - addHtml_pre(value_str); + KeyValueStruct kv(label, value_str, KeyValueStruct::Format::PreFormatted); + + if (unit.length()) { + kv.setUnit(unit); + } + writer->write(kv); } } start_index = end_index + 1; @@ -379,6 +399,9 @@ void NW005_data_struct_PPP_modem::webform_load_UE_system_information() } + if (NW_PLUGIN_INTERFACE.attached()) { + NW_PLUGIN_INTERFACE.mode(ESP_MODEM_MODE_DATA); + } } void NW005_data_struct_PPP_modem::webform_load(EventStruct *event) @@ -526,10 +549,11 @@ void NW005_data_struct_PPP_modem::webform_load(EventStruct *event) if (!Settings.getNetworkEnabled(event->NetworkIndex)) { return; } - addFormSubHeader(F("Modem State")); - addRowLabel(F("Modem Model")); if (!_modem_task_data.modem_initialized) { + addFormSubHeader(F("Modem State")); + addRowLabel(F("Modem Model")); + if (_modem_task_data.initializing) { addHtml(F("Initializing ...")); } else { @@ -537,170 +561,6 @@ void NW005_data_struct_PPP_modem::webform_load(EventStruct *event) } return; } - - addHtml_pre(NW_PLUGIN_INTERFACE.moduleName()); - addRowLabel(F("IMEI")); - addHtml_pre(NW_PLUGIN_INTERFACE.IMEI()); - - addRowLabel(F("IMSI")); - addHtml_pre(NW_PLUGIN_INTERFACE.IMSI()); - - if (NW_PLUGIN_INTERFACE.attached()) { - const String operatorName = NW_PLUGIN_INTERFACE.operatorName(); - addRowLabel(F("Mobile Country Code (MCC)")); - addHtml_pre(operatorName.substring(0, 3)); - addRowLabel(F("Mobile Network Code (MNC)")); - addHtml_pre(operatorName.substring(3)); - addFormNote(F("See Wikipedia - Mobile Country Code")); - - if (NW_PLUGIN_INTERFACE.mode() != ESP_MODEM_MODE_CMUX) { - NW_PLUGIN_INTERFACE.mode(ESP_MODEM_MODE_CMUX); - } - - /* - { - String res = NW_PLUGIN_INTERFACE.cmd("AT+CPSI?", 1000); - - if (!res.isEmpty()) { - addRowLabel(F("AT+CPSI?")); - addHtml_pre(res); - } - }*/ - /* - { - String res = NW_PLUGIN_INTERFACE.cmd("AT+CPSITD?", 1000); - - if (!res.isEmpty()) { - addRowLabel(F("AT+CPSITD?")); - addHtml_pre(res); - } - } - */ - - } - - addRowLabel(F("RSSI")); - addHtml(getRSSI()); - addUnit(F("dBm")); - - addRowLabel(F("BER")); - addHtml(getBER()); - - addRowLabel(F("Radio State")); - addHtml((NW_PLUGIN_INTERFACE.radioState() == 0) ? F("Minimal") : F("Full")); - - int networkMode = NW_PLUGIN_INTERFACE.networkMode(); - - if (networkMode >= 0) { - addRowLabel(F("Network Mode")); - - // Result from AT+CNSMOD Show network system mode - switch (networkMode) - { - case 0: addHtml(F("no service")); - break; - case 1: addHtml(F("GSM")); - break; - case 2: addHtml(F("GPRS")); - break; - case 3: addHtml(F("EGPRS (EDGE)")); - break; - case 4: addHtml(F("WCDMA")); - break; - case 5: addHtml(F("HSDPA only(WCDMA)")); - break; - case 6: addHtml(F("HSUPA only(WCDMA)")); - break; - case 7: addHtml(F("HSPA (HSDPA and HSUPA, WCDMA)")); - break; - case 8: addHtml(F("LTE")); - break; - default: addHtmlInt(networkMode); - break; - } - } - - { - int batStatus = NW_PLUGIN_INTERFACE.batteryStatus(); - addRowLabel(F("Battery Status")); - const __FlashStringHelper*str = F("Not Available"); - - switch (batStatus) - { - case 0: str = F("Not Charging"); - break; - case 1: str = F("Charging"); - break; - case 2: str = F("Charging Done"); - break; - } - addHtml(str); - - if (batStatus >= 0) { - int batVolt = NW_PLUGIN_INTERFACE.batteryVoltage(); - - if (batVolt >= 0) { - addRowLabel(F("Battery Voltage")); - addHtmlInt(batVolt); - addUnit(F("mV")); - } - - int batLevel = NW_PLUGIN_INTERFACE.batteryLevel(); - - if (batLevel >= 0) { - addRowLabel(F("Battery Level")); - addHtmlInt(batLevel); - } - } - } - - // TODO TD-er: Disabled for now, missing PdpContext - - /* - esp_modem_dce_t *handle = NW_PLUGIN_INTERFACE.handle(); - - if (handle) { - int state{}; - - if (esp_modem_get_network_registration_state(handle, state) == ESP_OK) { - addRowLabel(F("Network Registration State")); - const __FlashStringHelper*str = F("Unknown"); - - switch (state) - { - case 0: str = F("Not registered, MT is not currently searching an operator to register to"); - break; - case 1: str = F("Registered, home network"); - break; - case 2: str = F("Not registered, but MT is currently trying to attach or searching an operator to register to"); - break; - case 3: str = F("Registration denied"); - break; - case 4: str = F("Unknown"); - break; - case 5: str = F("Registered, Roaming"); - break; - case 6: str = F("Registered, for SMS only, home network (NB-IoT only)"); - break; - case 7: str = F("Registered, for SMS only, roaming (NB-IoT only)"); - break; - case 8: str = F("Attached for emergency bearer services only"); - break; - case 9: str = F("Registered for CSFB not preferred, home network"); - break; - case 10: str = F("Registered for CSFB not preferred, roaming"); - break; - } - addHtml(str); - } - } - */ - - webform_load_UE_system_information(); - - if (NW_PLUGIN_INTERFACE.attached()) { - NW_PLUGIN_INTERFACE.mode(ESP_MODEM_MODE_DATA); - } } void NW005_data_struct_PPP_modem::webform_save(EventStruct *event) @@ -767,12 +627,179 @@ bool NW005_data_struct_PPP_modem::webform_getPort(String& str) return !str.isEmpty(); } +bool NW005_data_struct_PPP_modem::write_ModemState(KeyValueWriter*modemState) +{ + // if (!writer) { return false; } + // auto modemState = writer->createChild(F("Modem State")); + + if (!modemState) { return false; } + + if (!_modem_task_data.modem_initialized) { + modemState->write({ + F("Modem Model"), + _modem_task_data.initializing + ? F("Initializing ...") + : F("Not found") + }); + + return false; + } + # define STATE_WRITE(X, Y) modemState->write({ X, Y \ + }) + # define STATE_WRITE_PRE(X, Y) modemState->write({ X, Y, KeyValueStruct::Format::PreFormatted \ + }) + STATE_WRITE_PRE(F("Modem Model"), NW_PLUGIN_INTERFACE.moduleName()); + STATE_WRITE_PRE(F("IMEI"), NW_PLUGIN_INTERFACE.IMEI()); + STATE_WRITE_PRE(F("IMSI"), NW_PLUGIN_INTERFACE.IMSI()); + + if (NW_PLUGIN_INTERFACE.attached()) { + const String operatorName = NW_PLUGIN_INTERFACE.operatorName(); + STATE_WRITE_PRE(F("Mobile Country Code (MCC)"), operatorName.substring(0, 3)); + STATE_WRITE_PRE(F("Mobile Network Code (MNC)"), operatorName.substring(3)); + modemState->writeNote( + F("See Wikipedia - Mobile Country Code") + ); + + if (NW_PLUGIN_INTERFACE.mode() != ESP_MODEM_MODE_CMUX) { + NW_PLUGIN_INTERFACE.mode(ESP_MODEM_MODE_CMUX); + } + } + { + KeyValueStruct kv(F("RSSI"), getRSSI()); + kv.setUnit(F("dBm")); + modemState->write(kv); + } + STATE_WRITE(F("BER"), getBER()); + + STATE_WRITE( + F("Radio State"), + (NW_PLUGIN_INTERFACE.radioState() == 0) ? F("Minimal") : F("Full")); + + { + int networkMode = NW_PLUGIN_INTERFACE.networkMode(); + + if (networkMode >= 0) { + const __FlashStringHelper*mode; + + // Result from AT+CNSMOD Show network system mode + if (networkMode <= 8) { + switch (networkMode) + { + case 0: mode = F("no service"); + break; + case 1: mode = F("GSM"); + break; + case 2: mode = F("GPRS"); + break; + case 3: mode = F("EGPRS (EDGE)"); + break; + case 4: mode = F("WCDMA"); + break; + case 5: mode = F("HSDPA only(WCDMA)"); + break; + case 6: mode = F("HSUPA only(WCDMA)"); + break; + case 7: mode = F("HSPA (HSDPA and HSUPA, WCDMA)"); + break; + case 8: mode = F("LTE"); + break; + } + STATE_WRITE(F("Network Mode"), mode); + } else { + STATE_WRITE(F("Network Mode"), networkMode); + } + } + } + { + int batStatus = NW_PLUGIN_INTERFACE.batteryStatus(); + const __FlashStringHelper*str = F("Not Available"); + + switch (batStatus) + { + case 0: str = F("Not Charging"); + break; + case 1: str = F("Charging"); + break; + case 2: str = F("Charging Done"); + break; + } + STATE_WRITE(F("Battery Status"), str); + + if (batStatus >= 0) { + int batVolt = NW_PLUGIN_INTERFACE.batteryVoltage(); + + if (batVolt >= 0) { + KeyValueStruct kv(F("Battery Voltage"), batVolt); + kv.setUnit(F("mV")); + modemState->write(kv); + } + + int batLevel = NW_PLUGIN_INTERFACE.batteryLevel(); + + if (batLevel >= 0) { + STATE_WRITE(F("Battery Level"), batLevel); + } + } + } + # undef STATE_WRITE + # undef STATE_WRITE_PRE + + + // TODO TD-er: Disabled for now, missing PdpContext + + /* + esp_modem_dce_t *handle = NW_PLUGIN_INTERFACE.handle(); + + if (handle) { + int state{}; + + if (esp_modem_get_network_registration_state(handle, state) == ESP_OK) { + addRowLabel(F("Network Registration State")); + const __FlashStringHelper*str = F("Unknown"); + + switch (state) + { + case 0: str = F("Not registered, MT is not currently searching an operator to register to"); + break; + case 1: str = F("Registered, home network"); + break; + case 2: str = F("Not registered, but MT is currently trying to attach or searching an operator to register to"); + break; + case 3: str = F("Registration denied"); + break; + case 4: str = F("Unknown"); + break; + case 5: str = F("Registered, Roaming"); + break; + case 6: str = F("Registered, for SMS only, home network (NB-IoT only)"); + break; + case 7: str = F("Registered, for SMS only, roaming (NB-IoT only)"); + break; + case 8: str = F("Attached for emergency bearer services only"); + break; + case 9: str = F("Registered for CSFB not preferred, home network"); + break; + case 10: str = F("Registered for CSFB not preferred, roaming"); + break; + } + addHtml(str); + } + } + */ + if (NW_PLUGIN_INTERFACE.attached()) { + NW_PLUGIN_INTERFACE.mode(ESP_MODEM_MODE_DATA); + } + + return true; +} + void NW005_begin_modem_task(void *parameter) { NW005_modem_task_data*modem_task_data = static_cast(parameter); if (!modem_task_data->modem_initialized) { modem_task_data->initializing = true; + if (modem_task_data->dtrPin != -1) { digitalWrite(modem_task_data->dtrPin, LOW); } @@ -800,6 +827,7 @@ void NW005_begin_modem_task(void *parameter) NW_PLUGIN_INTERFACE.mode(ESP_MODEM_MODE_CMUX); modem_task_data->AT_CPSI = NW_PLUGIN_INTERFACE.cmd(F("AT+CPSI?"), 3000); + if (modem_task_data->dtrPin != -1) { NW_PLUGIN_INTERFACE.cmd(F("AT&D1"), 9000); digitalWrite(modem_task_data->dtrPin, HIGH); @@ -832,6 +860,7 @@ bool NW005_data_struct_PPP_modem::init(EventStruct *event) const int ctsPin = _kvs->getValueAsInt_or_default(NW005_KEY_PIN_CTS, -1); esp_modem_flow_ctrl_t flow_ctl = static_cast(_kvs->getValueAsInt_or_default(NW005_KEY_FLOWCTRL, ESP_MODEM_FLOW_CONTROL_NONE)); + if ((rtsPin < 0) || (ctsPin < 0)) { if (flow_ctl != ESP_MODEM_FLOW_CONTROL_NONE) { addLog(LOG_LEVEL_INFO, F("PPP: Disable flow control as RTS/CTS are not set")); @@ -1002,7 +1031,7 @@ bool NW005_data_struct_PPP_modem::initPluginStats() bool NW005_data_struct_PPP_modem::record_stats() { - if (_plugin_stats_array != nullptr && _modem_task_data.modem_initialized) { + if ((_plugin_stats_array != nullptr) && _modem_task_data.modem_initialized) { EventStruct tmpEvent; size_t valueCount{}; const int rssi = doGetRSSI(); @@ -1063,8 +1092,8 @@ String NW005_data_struct_PPP_modem::NW005_formatGpioLabel(uint32_t key, PinSelec { String label; - if (key == NW005_KEY_PIN_DTR || - ((key >= NW005_KEY_PIN_RX) && (key <= NW005_KEY_PIN_RESET))) + if ((key == NW005_KEY_PIN_DTR) || + ((key >= NW005_KEY_PIN_RX) && (key <= NW005_KEY_PIN_RESET))) { ESPEasy_key_value_store::StorageType storageType; purpose = PinSelectPurpose::Generic; @@ -1105,6 +1134,7 @@ String NW005_data_struct_PPP_modem::NW005_formatGpioLabel(uint32_t key, PinSelec } } // namespace ppp + } // namespace net } // namespace ESPEasy diff --git a/src/ESPEasy/net/NWPluginStructs/NW005_data_struct_PPP_modem.h b/src/ESPEasy/net/NWPluginStructs/NW005_data_struct_PPP_modem.h index a78f011d3..58a256597 100644 --- a/src/ESPEasy/net/NWPluginStructs/NW005_data_struct_PPP_modem.h +++ b/src/ESPEasy/net/NWPluginStructs/NW005_data_struct_PPP_modem.h @@ -40,13 +40,15 @@ struct NW005_data_struct_PPP_modem : public NWPluginData_base { String IMEI() const; String operatorName() const; - void webform_load_UE_system_information(); + void webform_load_UE_system_information(KeyValueWriter* writer); void webform_load(EventStruct *event); void webform_save(EventStruct *event); bool webform_getPort(String& str); + bool write_ModemState(KeyValueWriter*writer); + bool init(EventStruct *event); bool exit(EventStruct *event); diff --git a/src/ESPEasy/net/_NW001_WiFi_STA.cpp b/src/ESPEasy/net/_NW001_WiFi_STA.cpp index bc5d353f7..8bd994353 100644 --- a/src/ESPEasy/net/_NW001_WiFi_STA.cpp +++ b/src/ESPEasy/net/_NW001_WiFi_STA.cpp @@ -115,7 +115,7 @@ bool NWPlugin_001(NWPlugin::Function function, EventStruct *event, String& strin # endif // ifdef ESP32 - if (event->kvWriter->ignoreKey()) { + if (event->kvWriter->summaryValueOnly()) { event->kvWriter->write({ EMPTY_STRING, strformat(F("%s (ch: %d)"), @@ -134,7 +134,7 @@ bool NWPlugin_001(NWPlugin::Function function, EventStruct *event, String& strin KeyValueStruct kv( F("RSSI"), strformat( - event->kvWriter->ignoreKey() ? F("RSSI: %d dBm") : F("%d"), + event->kvWriter->summaryValueOnly() ? F("RSSI: %d dBm") : F("%d"), WiFi.RSSI())); kv.setUnit(F("dBm")); diff --git a/src/ESPEasy/net/_NW003_ETH_RMII.cpp b/src/ESPEasy/net/_NW003_ETH_RMII.cpp index 0765de253..7e4e4a1ef 100644 --- a/src/ESPEasy/net/_NW003_ETH_RMII.cpp +++ b/src/ESPEasy/net/_NW003_ETH_RMII.cpp @@ -93,7 +93,7 @@ bool NWPlugin_003(NWPlugin::Function function, EventStruct *event, String& strin success = ETH.connected(); if (ETH.linkUp()) { - if (event->kvWriter->ignoreKey()) { + if (event->kvWriter->summaryValueOnly()) { String s = concat( String(ETH.linkSpeed()), ETH.fullDuplex() ? F("Mbps FD") : F("Mbps HD")); diff --git a/src/ESPEasy/net/_NW004_ETH_SPI.cpp b/src/ESPEasy/net/_NW004_ETH_SPI.cpp index badcb56a5..ae1d09662 100644 --- a/src/ESPEasy/net/_NW004_ETH_SPI.cpp +++ b/src/ESPEasy/net/_NW004_ETH_SPI.cpp @@ -98,7 +98,7 @@ bool NWPlugin_004(NWPlugin::Function function, EventStruct *event, String& strin success = ETH.connected(); if (ETH.linkUp()) { - if (event->kvWriter->ignoreKey()) { + if (event->kvWriter->summaryValueOnly()) { String s = concat( String(ETH.linkSpeed()), ETH.fullDuplex() ? F("Mbps FD") : F("Mbps HD")); diff --git a/src/ESPEasy/net/_NW005_PPP_modem.cpp b/src/ESPEasy/net/_NW005_PPP_modem.cpp index d9137c181..abc851699 100644 --- a/src/ESPEasy/net/_NW005_PPP_modem.cpp +++ b/src/ESPEasy/net/_NW005_PPP_modem.cpp @@ -94,7 +94,7 @@ bool NWPlugin_005(NWPlugin::Function function, EventStruct *event, String& strin success = NW_data->attached(); if (success) { - if (event->kvWriter->ignoreKey()) { + if (event->kvWriter->summaryValueOnly()) { event->kvWriter->write({ EMPTY_STRING, strformat( @@ -103,14 +103,8 @@ bool NWPlugin_005(NWPlugin::Function function, EventStruct *event, String& strin NW_data->getRSSI().c_str()) }); } else { - event->kvWriter->write({ - F("Operator Name"), - NW_data->operatorName() - }); - event->kvWriter->write({ - F("RSSI"), - NW_data->getRSSI() - }); + NW_data->webform_load_UE_system_information(event->kvWriter); + event->kvWriter->write({ F("BER"), NW_data->getBER() }); } } } @@ -126,11 +120,14 @@ bool NWPlugin_005(NWPlugin::Function function, EventStruct *event, String& strin static_cast(getNWPluginData(event->NetworkIndex)); if (NW_data) { - if (event->kvWriter->ignoreKey()) { - event->kvWriter->write({ EMPTY_STRING, concat(F("IMEI: "), NW_data->IMEI()) }); - } - else { - event->kvWriter->write({ F("IMEI"), NW_data->IMEI(), KeyValueStruct::Format::PreFormatted }); + const String imei(NW_data->IMEI()); + + if (imei.length()) { + if (event->kvWriter->summaryValueOnly()) { + event->kvWriter->write({ EMPTY_STRING, concat(F("IMEI: "), imei) }); + } else { + NW_data->write_ModemState(event->kvWriter); + } } } } diff --git a/src/ESPEasy/net/_NWPlugin_Helper.h b/src/ESPEasy/net/_NWPlugin_Helper.h index 1de556aa9..00af4c67b 100644 --- a/src/ESPEasy/net/_NWPlugin_Helper.h +++ b/src/ESPEasy/net/_NWPlugin_Helper.h @@ -5,6 +5,7 @@ #include "../../src/CustomBuild/ESPEasyLimits.h" #include "../../src/DataStructs/ESPEasy_EventStruct.h" #include "../../src/Helpers/LongTermTimer.h" +#include "../../src/WebServer/KeyValueWriter_WebForm.h" #include "../net/DataStructs/NWPluginData_base.h" #include "../net/ESPEasyNetwork.h" diff --git a/src/src/Helpers/KeyValueWriter.cpp b/src/src/Helpers/KeyValueWriter.cpp index 8f75daa92..d3219526f 100644 --- a/src/src/Helpers/KeyValueWriter.cpp +++ b/src/src/Helpers/KeyValueWriter.cpp @@ -209,6 +209,26 @@ void KeyValueWriter::writeLabels(const LabelType::Enum labels[]) } } +void KeyValueWriter::writeNote(const String& note) +{ + if (!dataOnlyOutput()) { + write({ + EMPTY_STRING, + note, + KeyValueStruct::Format::Note }); + } +} + +void KeyValueWriter::writeNote(const __FlashStringHelper *note) +{ + if (!dataOnlyOutput()) { + write({ + EMPTY_STRING, + note, + KeyValueStruct::Format::Note }); + } +} + int KeyValueWriter::getLevel() const { if (_parent == nullptr) { return 0; } @@ -222,6 +242,8 @@ bool KeyValueWriter::plainText() const { return _plainText; } -bool KeyValueWriter::ignoreKey() const { - return plainText() || _ignoreKey; +bool KeyValueWriter::summaryValueOnly() const { + if (_parent && _parent->summaryValueOnly()) { return true; } + + return _summaryValueOnly; } diff --git a/src/src/Helpers/KeyValueWriter.h b/src/src/Helpers/KeyValueWriter.h index 2b1fb0ed0..d6ba1e545 100644 --- a/src/src/Helpers/KeyValueWriter.h +++ b/src/src/Helpers/KeyValueWriter.h @@ -48,7 +48,8 @@ struct KeyValueStruct { enum class Format { Default, - PreFormatted + PreFormatted, + Note }; @@ -224,26 +225,35 @@ public: void writeLabels(const LabelType::Enum labels[]); + virtual void writeNote(const String& note); + virtual void writeNote(const __FlashStringHelper * note); + // virtual void setParent(KeyValueWriter*parent) { _parent = parent; } virtual int getLevel() const; - virtual void setIsArray() { _isArray = true; } + virtual void setIsArray() { _isArray = true; } + // When set to 'plainText', the writer will not try to insert writer specific + // markings, like 
     or 
     for example for HTML output
+  // When set to true, any child writer will also have this set to true
   virtual void setPlainText() { _plainText = true; }
 
   virtual bool plainText() const;
 
-  virtual void setIgnoreKey() { _ignoreKey = true; }
+  // 'summaryValueOnly' means the key will not be output and this is also a hint to generate a summary of data.
+  // Typically this is intended for human readable texts.
+  // When set to true, any child writer will also have this set to true
+  virtual void              setSummaryValueOnly() { _summaryValueOnly = true; }
 
-  virtual bool ignoreKey() const;
+  virtual bool              summaryValueOnly() const;
+
+  // This should be override by any writer outputting data which is not intended to be human readable.
+  virtual bool              dataOnlyOutput() const                      { return false; }
 
-  // Only supported for JSON writer right now
   // TODO TD-er: Change this to std::shared_ptr
   virtual void              setOutputToString(PrintToString*printToStr) { _toString = printToStr; }
 
-  virtual void              indent()                                    {}
-
   // Create writer of the same derived type, with this set as parent
   virtual Sp_KeyValueWriter createChild()                     = 0;
   virtual Sp_KeyValueWriter createChild(const String& header) = 0;
@@ -266,7 +276,9 @@ public:
     return std::move(_toString->getMove());
   }
 
-  bool reserve(unsigned int size) { return _toString && _toString->reserve(size); }
+  bool         reserve(unsigned int size) { return _toString && _toString->reserve(size); }
+
+  virtual void indent()                   {}
 
 protected:
 
@@ -294,11 +306,11 @@ protected:
 
   bool _isArray{};
 
-private:
+  // private:
 
   bool _plainText = false;
 
-  bool _ignoreKey = false;
+  bool _summaryValueOnly = false;
 
 
 }; // class KeyValueWriter
diff --git a/src/src/Helpers/KeyValueWriter_JSON.cpp b/src/src/Helpers/KeyValueWriter_JSON.cpp
index d29905779..395cfc980 100644
--- a/src/src/Helpers/KeyValueWriter_JSON.cpp
+++ b/src/src/Helpers/KeyValueWriter_JSON.cpp
@@ -78,6 +78,7 @@ void KeyValueWriter_JSON::write()
 
 void KeyValueWriter_JSON::write(const KeyValueStruct& kv)
 {
+  if (kv._format == KeyValueStruct::Format::Note) { return; }
   write();
 #ifdef USE_KVW_JSON_INDENT
   indent();
diff --git a/src/src/Helpers/KeyValueWriter_JSON.h b/src/src/Helpers/KeyValueWriter_JSON.h
index 0858d0563..c5cf4b0b1 100644
--- a/src/src/Helpers/KeyValueWriter_JSON.h
+++ b/src/src/Helpers/KeyValueWriter_JSON.h
@@ -54,13 +54,28 @@ public:
   virtual Sp_KeyValueWriter createNew();
   virtual Sp_KeyValueWriter createNew(const String& header);
 
+  virtual bool              dataOnlyOutput() const override {
+    // JSON is not intended to be human readable
+    return true;
+  }
+
+  virtual bool plainText() const override {
+    // No 'plain text' in JSON
+    return false;
+  }
+
+  virtual bool summaryValueOnly() const override {
+    // No 'summary mode' in JSON
+    return false;
+  }
+
 private:
 
   void writeValue(const ValueStruct& value);
 
 #ifdef USE_KVW_JSON_INDENT
 
-public:
+protected:
 
   virtual void indent() override;
 #endif // ifdef USE_KVW_JSON_INDENT
diff --git a/src/src/WebServer/KeyValueWriter_WebForm.cpp b/src/src/WebServer/KeyValueWriter_WebForm.cpp
index fd3805705..b50c103a7 100644
--- a/src/src/WebServer/KeyValueWriter_WebForm.cpp
+++ b/src/src/WebServer/KeyValueWriter_WebForm.cpp
@@ -37,9 +37,9 @@ KeyValueWriter_WebForm::KeyValueWriter_WebForm(const __FlashStringHelper *header
 
 KeyValueWriter_WebForm::~KeyValueWriter_WebForm()
 {
-      if (!ignoreKey() && !_isEmpty && _hasHeader && _header.isEmpty()) {
-        // TODO TD-er: Should we add a separator line here?
-      }
+  if (!summaryValueOnly() && !_isEmpty && _hasHeader && _header.isEmpty()) {
+    // TODO TD-er: Should we add a separator line here?
+  }
 
 }
 
@@ -48,7 +48,7 @@ void KeyValueWriter_WebForm::write()
   if (_isEmpty) {
     if (_parent != nullptr) { _parent->write(); }
 
-    if (!ignoreKey() && _hasHeader && !_header.isEmpty()) {
+    if (!summaryValueOnly() && _hasHeader && !_header.isEmpty()) {
       if (plainText()) {
         getPrint().print(concat(_header, F(": ")));
       } else {
@@ -62,21 +62,42 @@ void KeyValueWriter_WebForm::write()
 void KeyValueWriter_WebForm::write(const KeyValueStruct& kv)
 {
   write();
+  const bool plain_text         = plainText();
+  const bool summary_value_only = summaryValueOnly();
 
-  if (!ignoreKey()) {
-    addRowLabel(kv._key, kv._id);
-  }
   const size_t nrValues   = kv._values.size();
-  const bool   format_pre = !plainText() && (nrValues > 1 || kv._format == KeyValueStruct::Format::PreFormatted);
+  const bool   format_pre =
+    !plain_text &&
+    !summary_value_only &&
+    (nrValues > 1 || kv._format == KeyValueStruct::Format::PreFormatted);
+
+  const bool format_note =
+    !plain_text &&
+    !summary_value_only &&
+    (nrValues == 1 && kv._format == KeyValueStruct::Format::Note);
+
+  if (!summary_value_only) {
+    if (format_note) { addRowLabel_tr_id(EMPTY_STRING, EMPTY_STRING); }
+    else {
+      addRowLabel(kv._key, kv._id);
+    }
+  }
+
+  if (format_note) { getPrint().print(F(" 
    Note: ")); }
 
   if (format_pre) { getPrint().print(F("
    ")); }
 
   for (size_t i = 0; i < nrValues; ++i) {
     if (i != 0) {
-      getPrint().print(F("
    "));
+      if (plain_text) {
+        getPrint().write('\n');
+      }
+      else {
+        getPrint().print(F("
    "));
+      }
     }
 
-    if (kv._values[i].str.indexOf('\n') != -1)
+    if (!plain_text && (kv._values[i].str.indexOf('\n') != -1))
     {
       String str = kv._values[i].str;
       str.replace(F("\n"), F("
    "));
@@ -86,14 +107,24 @@ void KeyValueWriter_WebForm::write(const KeyValueStruct& kv)
     }
   }
 
-  if (format_pre) { getPrint().print(F("
    ")); }
-
-  if (!plainText() && (nrValues == 1)) {
+  // May need to include the unit before ending
    + // or else it will be shown on the next line + if (!plain_text && (nrValues == 1) && !summary_value_only) { addUnit(kv._unit); } - if (plainText()) { - getPrint().print(F("
    ")); + if (format_pre) { getPrint().print(F("")); } + + if (format_note) { getPrint().print(F("
    ")); } + + if (summary_value_only) { + // Must add a newline + if (plain_text) { + getPrint().write('\n'); + } + else { + getPrint().print(F("
    ")); + } } } diff --git a/src/src/WebServer/NetworkPage.cpp b/src/src/WebServer/NetworkPage.cpp index 603b2b617..9c8882115 100644 --- a/src/src/WebServer/NetworkPage.cpp +++ b/src/src/WebServer/NetworkPage.cpp @@ -218,7 +218,7 @@ void handle_networks_ShowAllNetworksTable() for (uint8_t i = 0; i < NR_ELEMENTS(functions); ++i) { html_TD(); KeyValueWriter_WebForm webFormWriter; - webFormWriter.setPlainText(); + webFormWriter.setSummaryValueOnly(); struct EventStruct TempEvent; TempEvent.kvWriter = &webFormWriter; @@ -242,7 +242,8 @@ void handle_networks_ShowAllNetworksTable() if (functions[i] == NWPlugin::Function::NWPLUGIN_WEBFORM_SHOW_CONNECTED) { NWPluginCall(NWPlugin::Function::NWPLUGIN_GET_CONNECTED_DURATION, &TempEvent); - addEnabled(res); + if (!res) + addEnabled(res); } } @@ -392,38 +393,7 @@ void handle_networks_NetworkSettingsPage(ESPEasy::net::networkIndex_t networkind } { KeyValueWriter_WebForm writer(F("Connection Information")); - struct EventStruct TempEvent2; - TempEvent2.NetworkIndex = networkindex; - auto child = writer.createChild(); - TempEvent2.kvWriter = child.get(); - - - String str; - const bool res = NWPluginCall(NWPlugin::Function::NWPLUGIN_WEBFORM_SHOW_CONNECTED, &TempEvent2, str); - - if (res) { - String conn_duration; - - NWPluginCall(NWPlugin::Function::NWPLUGIN_GET_CONNECTED_DURATION, &TempEvent2, conn_duration); - -# if FEATURE_NETWORK_TRAFFIC_COUNT - - if (NWPluginCall(NWPlugin::Function::NWPLUGIN_GET_TRAFFIC_COUNT, &TempEvent2, str)) { - writer.write({ F("TX / RX Frames"), strformat( - F("%d / %d"), - TempEvent.Par5, - TempEvent.Par6)}); - - writer.write({ F("TX / RX Frame Bytes"), strformat( - F("%s%cB / %s%cB"), - formatHumanReadable(TempEvent.Par64_1, 1024).c_str(), - TempEvent.Par64_1 < 1024 ? ' ' : 'i', - formatHumanReadable(TempEvent.Par64_2, 1024).c_str(), - TempEvent.Par64_2 < 1024 ? ' ' : 'i' - ) }); - } -# endif // if FEATURE_NETWORK_TRAFFIC_COUNT - } + write_NetworkConnectionInfo(networkindex, writer.createChild().get()); } } # endif // ifdef ESP32 @@ -442,14 +412,14 @@ void handle_networks_NetworkSettingsPage(ESPEasy::net::networkIndex_t networkind # ifdef ESP32 -bool write_NetworkAdapterFlags(ESPEasy::net::networkIndex_t networkindex, KeyValueWriter* writer) +bool write_NetworkAdapterFlags(ESPEasy::net::networkIndex_t networkindex, KeyValueWriter*writer) { - if (writer == nullptr) return false; + if (writer == nullptr) { return false; } struct EventStruct TempEvent; TempEvent.kvWriter = writer; TempEvent.NetworkIndex = networkindex; - + String str; if (!NWPluginCall(NWPlugin::Function::NWPLUGIN_GET_INTERFACE, &TempEvent, str)) { @@ -495,9 +465,9 @@ bool write_NetworkAdapterFlags(ESPEasy::net::networkIndex_t networkindex, KeyVal return true; } -bool write_IP_config(ESPEasy::net::networkIndex_t networkindex, KeyValueWriter* writer) +bool write_IP_config(ESPEasy::net::networkIndex_t networkindex, KeyValueWriter*writer) { - if (writer == nullptr) return false; + if (writer == nullptr) { return false; } struct EventStruct TempEvent; TempEvent.NetworkIndex = networkindex; @@ -539,5 +509,23 @@ bool write_IP_config(ESPEasy::net::networkIndex_t networkindex, KeyValueWriter* # endif // ifdef ESP32 +bool write_NetworkConnectionInfo(ESPEasy::net::networkIndex_t networkindex, KeyValueWriter*writer) +{ + if (!writer) { return false; } + struct EventStruct TempEvent; + TempEvent.NetworkIndex = networkindex; + TempEvent.kvWriter = writer; + + const bool res = NWPluginCall(NWPlugin::Function::NWPLUGIN_WEBFORM_SHOW_CONNECTED, &TempEvent); + + if (res) { + NWPluginCall(NWPlugin::Function::NWPLUGIN_GET_CONNECTED_DURATION, &TempEvent); + +# if FEATURE_NETWORK_TRAFFIC_COUNT + NWPluginCall(NWPlugin::Function::NWPLUGIN_GET_TRAFFIC_COUNT, &TempEvent); +# endif // if FEATURE_NETWORK_TRAFFIC_COUNT + } + return res; +} #endif // ifdef WEBSERVER_NETWORK diff --git a/src/src/WebServer/NetworkPage.h b/src/src/WebServer/NetworkPage.h index 578a3735c..1a496b069 100644 --- a/src/src/WebServer/NetworkPage.h +++ b/src/src/WebServer/NetworkPage.h @@ -43,9 +43,10 @@ void handle_networks_NetworkSettingsPage(ESPEasy::net::networkIndex_t networkind bool write_NetworkAdapterFlags(ESPEasy::net::networkIndex_t networkindex, KeyValueWriter* writer); bool write_IP_config(ESPEasy::net::networkIndex_t networkindex, KeyValueWriter* writer); - #endif +bool write_NetworkConnectionInfo(ESPEasy::net::networkIndex_t networkindex, KeyValueWriter* writer); + #endif // ifdef WEBSERVER_NETWORK #endif // ifndef WEBSERVER_WEBSERVER_NETWORKPAGE_H From 4c09f5695fd672033c7fdc235b53e801151e383a Mon Sep 17 00:00:00 2001 From: Ton Huisman Date: Sun, 5 Oct 2025 23:39:11 +0200 Subject: [PATCH 341/564] [Tools] Add preliminary support for Network plugins --- src/src/WebServer/PluginListPage.cpp | 36 +++++++++++++++++++++++++++- 1 file changed, 35 insertions(+), 1 deletion(-) diff --git a/src/src/WebServer/PluginListPage.cpp b/src/src/WebServer/PluginListPage.cpp index c2de57ca1..94e5a2479 100644 --- a/src/src/WebServer/PluginListPage.cpp +++ b/src/src/WebServer/PluginListPage.cpp @@ -11,6 +11,9 @@ # include "../Globals/NPlugins.h" # include "../DataTypes/NPluginID.h" # endif // if FEATURE_NOTIFIER +# ifdef WEBSERVER_NETWORK +# include "../ESPEasy/net/DataTypes/NetworkDriverIndex.h" +# endif void handle_pluginlist() { # ifndef BUILD_NO_RAM_TRACKER @@ -146,7 +149,38 @@ void handle_pluginlist() { } # endif // if FEATURE_NOTIFIER - // TODO Add Network plugins once PR https://github.com/letscontrolit/ESPEasy/pull/5149 is merged + # ifdef WEBSERVER_NETWORK + { + addTableSeparator(F("Networks"), colspan, 3); + html_TR(); + html_table_header(F("Network"), 80); + html_table_header(F(""), 25); + html_table_header(F("Description"), 800); + html_table_header(F(""), 50); + # if FEATURE_MQTT_TLS + html_table_header(F(""), 50); + # endif // if FEATURE_MQTT_TLS + html_table_header(F("")); + + ESPEasy::net::networkDriverIndex_t tmpNetworkDriverIndex{}; + + while (validNetworkDriverIndex(tmpNetworkDriverIndex)) + { + html_TR_TD(); + const ESPEasy::net::nwpluginID_t number = getNWPluginID_from_NetworkDriverIndex(tmpNetworkDriverIndex); + addHtml(number.toDisplayString()); + html_TD(); + # ifndef LIMIT_BUILD_SIZE + addRTDNetworkDriverButton(number); + # endif // ifndef LIMIT_BUILD_SIZE + html_TD(); + addHtml(getNWPluginNameFromNetworkDriverIndex(tmpNetworkDriverIndex)); + html_TD(); + ++tmpNetworkDriverIndex; + } + + } + # endif // ifdef WEBSERVER_NETWORK html_end_table(); html_end_form(); From b728fdd9ab25ba5fdff8b4f36b5ed04e0a47b3da Mon Sep 17 00:00:00 2001 From: TD-er Date: Mon, 6 Oct 2025 00:34:55 +0200 Subject: [PATCH 342/564] [JSON] Add same info on network adapters & sysinfo & JSON page --- src/ESPEasy/net/_NW001_WiFi_STA.cpp | 50 ++++++++- src/src/WebServer/JSON.cpp | 156 ++++++++++++---------------- src/src/WebServer/SysInfoPage.cpp | 79 ++++---------- 3 files changed, 134 insertions(+), 151 deletions(-) diff --git a/src/ESPEasy/net/_NW001_WiFi_STA.cpp b/src/ESPEasy/net/_NW001_WiFi_STA.cpp index 8bd994353..1dae9067f 100644 --- a/src/ESPEasy/net/_NW001_WiFi_STA.cpp +++ b/src/ESPEasy/net/_NW001_WiFi_STA.cpp @@ -17,6 +17,7 @@ # include "../../src/Helpers/ESPEasy_Storage.h" # include "../../src/Helpers/PrintToString.h" # include "../../src/Helpers/StringConverter.h" +# include "../../src/Helpers/StringGenerator_WiFi.h" # include "../../src/WebServer/ESPEasy_WebServer.h" # include "../../src/WebServer/HTML_Print.h" # include "../../src/WebServer/HTML_wrappers.h" @@ -127,8 +128,18 @@ bool NWPlugin_001(NWPlugin::Function function, EventStruct *event, String& strin STA_SSID_STR, KeyValueStruct::Format::PreFormatted }); event->kvWriter->write({ - F("Channel"), + F("Channel"), WiFi.channel() }); +# if CONFIG_SOC_WIFI_SUPPORT_5G + { + KeyValueStruct kv( + F("Band"), + (WiFi.channel() < 36) ? F("2.4") : F("5")); + kv.setUnit(F("GHz")); + event->kvWriter->write(kv); + } +# endif // if CONFIG_SOC_WIFI_SUPPORT_5G + } { KeyValueStruct kv( @@ -138,9 +149,44 @@ bool NWPlugin_001(NWPlugin::Function function, EventStruct *event, String& strin WiFi.RSSI())); kv.setUnit(F("dBm")); - + event->kvWriter->write(kv); } + + if (!event->kvWriter->summaryValueOnly()) { + { + KeyValueStruct kv( + F("WiFi TX Power"), + ESPEasy::net::wifi::GetWiFiTXpower(), 2); + kv.setUnit(F("dBm")); + event->kvWriter->write(kv); + } + event->kvWriter->write({ + F("Last Disconnect Reason"), + getWiFi_disconnectReason_str() + }); + +# ifdef ESP32 + { + const int64_t tsf_time = ESPEasy::net::wifi::WiFi_get_TSF_time(); + + if (tsf_time > 0) { + + // Split it while printing, so we're not loosing a lot of decimals in the float conversion + uint32_t tsf_usec{}; + + KeyValueStruct kv( + F("WiFi TSF time"), + concat( + secondsToDayHourMinuteSecond(micros_to_sec_usec(tsf_time, tsf_usec)), + strformat(F(".%06u"), tsf_usec)) + ); + kv.setUnit(F("usec")); + event->kvWriter->write(kv); + } + } +# endif // ifdef ESP32 + } event->kvWriter->write({ F("BSSID"), STA_BSSID_STR, diff --git a/src/src/WebServer/JSON.cpp b/src/src/WebServer/JSON.cpp index f9a93d5bc..c9f44c93a 100644 --- a/src/src/WebServer/JSON.cpp +++ b/src/src/WebServer/JSON.cpp @@ -261,124 +261,97 @@ void handle_json() } if (showWifi) { - auto writer = mainLevelWriter.createChild(F("WiFi")); + for (ESPEasy::net::networkIndex_t x = 0; x < NETWORK_MAX; ++x) + { + if (Settings.getNetworkEnabled(x)) { + auto pluginID = Settings.getNWPluginID_for_network(x); - if (writer) { + if (pluginID != ESPEasy::net::INVALID_NW_PLUGIN_ID) { + auto writer = mainLevelWriter.createChild(getNWPluginNameFromNWPluginID(pluginID)); + if (writer) { + writer->write({ F("Network Index"), x + 1 }); #ifdef WEBSERVER_NETWORK # ifdef ESP32 - { - auto writer2 = writer->createChild(F("Network Interface")); - - if (writer2) { - write_NetworkAdapterFlags(0, writer2.get()); - } - } - { - auto writer2 = writer->createChild(F("IP Config")); - - if (writer2) { - write_IP_config(0, writer2.get()); - } - } + write_NetworkAdapterFlags(x, writer->createChild(F("Interface")).get()); + write_IP_config(x, writer->createChild(F("IP")).get()); # endif // ifdef ESP32 #endif // ifdef WEBSERVER_NETWORK + write_NetworkConnectionInfo(x, writer->createChild(F("Connection")).get()); + } - - static const LabelType::Enum labels[] PROGMEM = - { - LabelType::HOST_NAME, + if (x == 0) { + static const LabelType::Enum labels[] PROGMEM = + { + LabelType::HOST_NAME, #if FEATURE_MDNS - LabelType::M_DNS, + LabelType::M_DNS, #endif // if FEATURE_MDNS - // LabelType::IP_CONFIG, + // LabelType::IP_CONFIG, #ifdef ESP8266 - LabelType::IP_ADDRESS, + LabelType::IP_ADDRESS, # if FEATURE_USE_IPV6 - LabelType::IP6_LOCAL, - LabelType::IP6_GLOBAL, - LabelType::ENABLE_IPV6, + LabelType::IP6_LOCAL, + LabelType::IP6_GLOBAL, + LabelType::ENABLE_IPV6, # endif // if FEATURE_USE_IPV6 - LabelType::IP_SUBNET, - LabelType::GATEWAY, - LabelType::STA_MAC, - LabelType::DNS_1, - LabelType::DNS_2, + LabelType::IP_SUBNET, + LabelType::GATEWAY, + LabelType::STA_MAC, + LabelType::DNS_1, + LabelType::DNS_2, #endif // ifdef ESP8266 - LabelType::SSID, - LabelType::BSSID, - LabelType::CHANNEL, - LabelType::ENCRYPTION_TYPE_STA, - LabelType::CONNECTED_MSEC, - LabelType::LAST_DISCONNECT_REASON, - LabelType::LAST_DISC_REASON_STR, - LabelType::NUMBER_RECONNECTS, - LabelType::WIFI_STORED_SSID1, - LabelType::WIFI_STORED_SSID2, - LabelType::FORCE_WIFI_BG, - LabelType::RESTART_WIFI_LOST_CONN, - LabelType::FORCE_WIFI_NOSLEEP, + LabelType::SSID, + LabelType::BSSID, + LabelType::CHANNEL, + LabelType::ENCRYPTION_TYPE_STA, + LabelType::CONNECTED_MSEC, + LabelType::LAST_DISCONNECT_REASON, + LabelType::LAST_DISC_REASON_STR, + LabelType::NUMBER_RECONNECTS, + LabelType::WIFI_STORED_SSID1, + LabelType::WIFI_STORED_SSID2, + LabelType::FORCE_WIFI_BG, + LabelType::RESTART_WIFI_LOST_CONN, + LabelType::FORCE_WIFI_NOSLEEP, #ifdef SUPPORT_ARP - LabelType::PERIODICAL_GRAT_ARP, + LabelType::PERIODICAL_GRAT_ARP, #endif // ifdef SUPPORT_ARP #ifdef USES_ESPEASY_NOW - LabelType::USE_ESPEASY_NOW, - LabelType::FORCE_ESPEASY_NOW_CHANNEL, + LabelType::USE_ESPEASY_NOW, + LabelType::FORCE_ESPEASY_NOW_CHANNEL, #endif // ifdef USES_ESPEASY_NOW - LabelType::CONNECTION_FAIL_THRESH, + LabelType::CONNECTION_FAIL_THRESH, #if FEATURE_SET_WIFI_TX_PWR - LabelType::WIFI_TX_MAX_PWR, - LabelType::WIFI_CUR_TX_PWR, - LabelType::WIFI_SENS_MARGIN, - LabelType::WIFI_SEND_AT_MAX_TX_PWR, + LabelType::WIFI_TX_MAX_PWR, + LabelType::WIFI_CUR_TX_PWR, + LabelType::WIFI_SENS_MARGIN, + LabelType::WIFI_SEND_AT_MAX_TX_PWR, #endif // if FEATURE_SET_WIFI_TX_PWR - LabelType::WIFI_NR_EXTRA_SCANS, + LabelType::WIFI_NR_EXTRA_SCANS, #ifdef ESP32 - LabelType::WIFI_PASSIVE_SCAN, + LabelType::WIFI_PASSIVE_SCAN, #endif - LabelType::WIFI_USE_LAST_CONN_FROM_RTC, - LabelType::WIFI_RSSI, + LabelType::WIFI_USE_LAST_CONN_FROM_RTC, + LabelType::WIFI_RSSI, #ifndef ESP32 - LabelType::WAIT_WIFI_CONNECT, + LabelType::WAIT_WIFI_CONNECT, #endif - LabelType::HIDDEN_SSID_SLOW_CONNECT, - LabelType::CONNECT_HIDDEN_SSID, - LabelType::SDK_WIFI_AUTORECONNECT, + LabelType::HIDDEN_SSID_SLOW_CONNECT, + LabelType::CONNECT_HIDDEN_SSID, + LabelType::SDK_WIFI_AUTORECONNECT, - LabelType::MAX_LABEL - }; - writer->writeLabels(labels); + LabelType::MAX_LABEL + }; + writer->writeLabels(labels); - // TODO: PKR: Add ETH Objects + // TODO: PKR: Add ETH Objects + } + } + } } } -#if FEATURE_ETHERNET - - if (showEthernet) { - - static const LabelType::Enum labels[] PROGMEM = - { - LabelType::ETH_WIFI_MODE, - LabelType::ETH_CONNECTED, - LabelType::ETH_CHIP, - LabelType::ETH_DUPLEX, - LabelType::ETH_SPEED, - LabelType::ETH_STATE, - LabelType::ETH_SPEED_STATE, - - - LabelType::MAX_LABEL - }; - auto writer = mainLevelWriter.createChild(F("Ethernet")); - - if (writer) { - writer->writeLabels(labels); - } - - } -#endif // if FEATURE_ETHERNET - #if FEATURE_ESPEASY_P2P if (showNodes) { @@ -872,7 +845,8 @@ void stream_to_json_object_value(const String& object, int value) { addHtml(':'); addHtmlInt(value); } -#endif + +#endif // if FEATURE_CHART_JS || defined(WEBSERVER_NEW_UI) String jsonBool(bool value) { return boolToString(value); } diff --git a/src/src/WebServer/SysInfoPage.cpp b/src/src/WebServer/SysInfoPage.cpp index 165434a45..011bdeb04 100644 --- a/src/src/WebServer/SysInfoPage.cpp +++ b/src/src/WebServer/SysInfoPage.cpp @@ -34,8 +34,10 @@ # include "../WebServer/AccessControl.h" # include "../WebServer/ESPEasy_WebServer.h" # include "../WebServer/HTML_wrappers.h" +# include "../WebServer/KeyValueWriter_WebForm.h" # include "../WebServer/Markup.h" # include "../WebServer/Markup_Buttons.h" +# include "../WebServer/NetworkPage.h" # if FEATURE_MQTT # include "../Globals/MQTT.h" @@ -486,6 +488,8 @@ void handle_sysinfo_Ethernet() { # endif // if FEATURE_ETHERNET void handle_sysinfo_Network() { + + addTableSeparator(F("Network"), 2, 3); { @@ -515,68 +519,27 @@ void handle_sysinfo_Network() { addRowLabelValues(labels); } - addTableSeparator(F("WiFi"), 2, 3, F("Wifi")); - - const bool showWiFiConnectionInfo = ESPEasyWiFi.connected(); - - addRowLabel(LabelType::WIFI_CONNECTION); - - if (showWiFiConnectionInfo) + for (ESPEasy::net::networkIndex_t x = 0; x < NETWORK_MAX; ++x) { - addHtml(strformat( - F("%s (RSSI %d dBm)"), - FsP(toString(ESPEasy::net::wifi::getConnectionProtocol())), - WiFi.RSSI())); - } else { addHtml('-'); } + if (Settings.getNetworkEnabled(x)) { + auto pluginID = Settings.getNWPluginID_for_network(x); - addRowLabel(LabelType::SSID); - - if (showWiFiConnectionInfo) - { - addHtml(WiFi.SSID()); - addHtml(F(" (")); - addHtml(WiFi.BSSIDstr()); - addHtml(')'); - } else { addHtml('-'); } - - # ifdef ESP32 - const int64_t tsf_time = ESPEasy::net::wifi::WiFi_get_TSF_time(); - - if (tsf_time > 0) { - addRowLabel(F("WiFi TSF time")); - - // Split it while printing, so we're not loosing a lot of decimals in the float conversion - uint32_t tsf_usec{}; - addHtml(secondsToDayHourMinuteSecond(micros_to_sec_usec(tsf_time, tsf_usec))); - addHtml(strformat(F(".%06u"), tsf_usec)); - } - # endif // ifdef ESP32 - - addRowLabel(getLabel(LabelType::CHANNEL)); - - if (showWiFiConnectionInfo) { - addHtml(getValue(LabelType::CHANNEL)); -# if CONFIG_SOC_WIFI_SUPPORT_5G - addHtml(WiFi.channel() < 36 ? F(" (2.4 GHz)") : F(" (5 GHz)")); -# endif - } else { addHtml('-'); } - - addRowLabel(getLabel(LabelType::ENCRYPTION_TYPE_STA)); - - if (showWiFiConnectionInfo) { - addHtml(getValue(LabelType::ENCRYPTION_TYPE_STA)); - } else { addHtml('-'); } - - if (active_network_medium == ESPEasy::net::NetworkMedium_t::WIFI) - { - addRowLabel(LabelType::LAST_DISCONNECT_REASON); - addHtml(getValue(LabelType::LAST_DISC_REASON_STR)); - addRowLabelValue(LabelType::WIFI_STORED_SSID1); - addRowLabelValue(LabelType::WIFI_STORED_SSID2); + if (pluginID != ESPEasy::net::INVALID_NW_PLUGIN_ID) { + KeyValueWriter_WebForm writer( + strformat(F("%s (%d)"), + getNWPluginNameFromNWPluginID(pluginID).c_str(), + x + 1 )); +# ifdef WEBSERVER_NETWORK +# ifdef ESP32 + write_NetworkAdapterFlags(x, &writer); + write_IP_config(x, &writer); +# endif // ifdef ESP32 +# endif // ifdef WEBSERVER_NETWORK + write_NetworkConnectionInfo(x, &writer); + } + } } - addRowLabelValue(LabelType::STA_MAC); - addRowLabelValue(LabelType::AP_MAC); html_TR(); } From 881c3bc0209fe7a716b5879a3df1cadd96d0d1d1 Mon Sep 17 00:00:00 2001 From: TD-er Date: Mon, 6 Oct 2025 01:01:04 +0200 Subject: [PATCH 343/564] [Build] Fix ESP8266 build fail due to variable type mismatch --- src/ESPEasy/net/_NW001_WiFi_STA.cpp | 4 +++- src/src/DataStructs/LogStruct.cpp | 2 +- src/src/DataStructs/LogStruct.h | 4 ++-- src/src/DataStructs/NodeStruct.cpp | 2 +- src/src/DataStructs/NodeStruct.h | 4 ++-- src/src/Helpers/ESPEasy_checks.cpp | 2 +- src/src/Helpers/KeyValueWriter.cpp | 8 ++++---- src/src/Helpers/KeyValueWriter.h | 8 ++++---- src/src/WebServer/JSON.cpp | 6 +++--- 9 files changed, 21 insertions(+), 19 deletions(-) diff --git a/src/ESPEasy/net/_NW001_WiFi_STA.cpp b/src/ESPEasy/net/_NW001_WiFi_STA.cpp index 1dae9067f..4136b2307 100644 --- a/src/ESPEasy/net/_NW001_WiFi_STA.cpp +++ b/src/ESPEasy/net/_NW001_WiFi_STA.cpp @@ -154,6 +154,7 @@ bool NWPlugin_001(NWPlugin::Function function, EventStruct *event, String& strin } if (!event->kvWriter->summaryValueOnly()) { +# if FEATURE_SET_WIFI_TX_PWR { KeyValueStruct kv( F("WiFi TX Power"), @@ -161,6 +162,7 @@ bool NWPlugin_001(NWPlugin::Function function, EventStruct *event, String& strin kv.setUnit(F("dBm")); event->kvWriter->write(kv); } +#endif event->kvWriter->write({ F("Last Disconnect Reason"), getWiFi_disconnectReason_str() @@ -219,7 +221,7 @@ bool NWPlugin_001(NWPlugin::Function function, EventStruct *event, String& strin } break; } - } + case NWPlugin::Function::NWPLUGIN_WEBFORM_SHOW_HW_ADDRESS: { diff --git a/src/src/DataStructs/LogStruct.cpp b/src/src/DataStructs/LogStruct.cpp index bea1740ce..fce67c471 100644 --- a/src/src/DataStructs/LogStruct.cpp +++ b/src/src/DataStructs/LogStruct.cpp @@ -23,7 +23,7 @@ void LogStruct::add(const uint8_t loglevel, String&& line) { } } -bool LogStruct::getNext(bool& logLinesAvailable, unsigned long& timestamp, String& message, uint8_t& loglevel) { +bool LogStruct::getNext(bool& logLinesAvailable, uint32_t& timestamp, String& message, uint8_t& loglevel) { lastReadTimeStamp = millis(); logLinesAvailable = false; diff --git a/src/src/DataStructs/LogStruct.h b/src/src/DataStructs/LogStruct.h index 4e3c64490..9f48be999 100644 --- a/src/src/DataStructs/LogStruct.h +++ b/src/src/DataStructs/LogStruct.h @@ -40,7 +40,7 @@ struct LogStruct { // bool get(String& output, const String& lineEnd); // Returns whether a line was retrieved. - bool getNext(bool& logLinesAvailable, unsigned long& timestamp, String& message, uint8_t& loglevel); + bool getNext(bool& logLinesAvailable, uint32_t& timestamp, String& message, uint8_t& loglevel); bool isEmpty() const { return !is_full && (write_idx == read_idx); @@ -66,7 +66,7 @@ struct LogStruct { LogEntry_t Message[LOG_STRUCT_MESSAGE_LINES]; int write_idx = 0; int read_idx = 0; - unsigned long lastReadTimeStamp = 0; + uint32_t lastReadTimeStamp = 0; bool is_full = false; }; diff --git a/src/src/DataStructs/NodeStruct.cpp b/src/src/DataStructs/NodeStruct.cpp index a3c852e02..69ac8e779 100644 --- a/src/src/DataStructs/NodeStruct.cpp +++ b/src/src/DataStructs/NodeStruct.cpp @@ -203,7 +203,7 @@ MAC_address NodeStruct::ESPEasy_Now_MAC() const { return MAC_address(sta_mac); } -unsigned long NodeStruct::getAge() const { +uint32_t NodeStruct::getAge() const { return timePassedSince(lastUpdated); } diff --git a/src/src/DataStructs/NodeStruct.h b/src/src/DataStructs/NodeStruct.h index 2875e8445..cbd406099 100644 --- a/src/src/DataStructs/NodeStruct.h +++ b/src/src/DataStructs/NodeStruct.h @@ -46,7 +46,7 @@ struct __attribute__((__packed__)) NodeStruct MAC_address ESPEasy_Now_MAC() const; - unsigned long getAge() const; + uint32_t getAge() const; bool isExpired() const; @@ -102,7 +102,7 @@ struct __attribute__((__packed__)) NodeStruct // When sending system info, this value contains the time since last time sync. // When kept as node info, this is the last time stamp the node info was updated. - unsigned long lastUpdated = (1 << 30); + uint32_t lastUpdated = (1 << 30); uint8_t version = 1; #if FEATURE_USE_IPV6 uint8_t hasIPv4 : 1; diff --git a/src/src/Helpers/ESPEasy_checks.cpp b/src/src/Helpers/ESPEasy_checks.cpp index 58d5a2288..bfbd6f3f0 100644 --- a/src/src/Helpers/ESPEasy_checks.cpp +++ b/src/src/Helpers/ESPEasy_checks.cpp @@ -105,7 +105,7 @@ void run_compiletime_checks() { // String class has increased with 4 bytes check_size(); // Is not stored #else - check_size(); // Is not stored + check_size(); // Is not stored #endif diff --git a/src/src/Helpers/KeyValueWriter.cpp b/src/src/Helpers/KeyValueWriter.cpp index d3219526f..9300f80a5 100644 --- a/src/src/Helpers/KeyValueWriter.cpp +++ b/src/src/Helpers/KeyValueWriter.cpp @@ -37,7 +37,7 @@ KeyValueStruct::KeyValueStruct(const String & key, : _key(key), _format(format) { _values.emplace_back(String(val), vType); } - +#ifdef ESP32 KeyValueStruct::KeyValueStruct(const String & key, int32_t val, Format format, @@ -45,7 +45,7 @@ KeyValueStruct::KeyValueStruct(const String & key, : _key(key), _format(format) { _values.emplace_back(String(val), vType); } - +#endif KeyValueStruct::KeyValueStruct(const String & key, uint32_t val, Format format, @@ -53,7 +53,7 @@ KeyValueStruct::KeyValueStruct(const String & key, : _key(key), _format(format) { _values.emplace_back(String(val), vType); } - +#ifdef ESP32 KeyValueStruct::KeyValueStruct(const String & key, size_t val, Format format, @@ -61,7 +61,7 @@ KeyValueStruct::KeyValueStruct(const String & key, : _key(key), _format(format) { _values.emplace_back(String(val), vType); } - +#endif KeyValueStruct::KeyValueStruct(const String & key, const uint64_t & val, Format format, diff --git a/src/src/Helpers/KeyValueWriter.h b/src/src/Helpers/KeyValueWriter.h index d6ba1e545..4d62e0db6 100644 --- a/src/src/Helpers/KeyValueWriter.h +++ b/src/src/Helpers/KeyValueWriter.h @@ -70,22 +70,22 @@ struct KeyValueStruct int val, Format format = Format::Default, ValueStruct::ValueType vType = ValueStruct::ValueType::Int); - +#ifdef ESP32 KeyValueStruct(const String & key, int32_t val, Format format = Format::Default, ValueStruct::ValueType vType = ValueStruct::ValueType::Int); - +#endif KeyValueStruct(const String & key, uint32_t val, Format format = Format::Default, ValueStruct::ValueType vType = ValueStruct::ValueType::Int); - +#ifdef ESP32 KeyValueStruct(const String & key, size_t val, Format format = Format::Default, ValueStruct::ValueType vType = ValueStruct::ValueType::Int); - +#endif KeyValueStruct(const String & key, const uint64_t & val, Format format = Format::Default, diff --git a/src/src/WebServer/JSON.cpp b/src/src/WebServer/JSON.cpp index c9f44c93a..e733c6509 100644 --- a/src/src/WebServer/JSON.cpp +++ b/src/src/WebServer/JSON.cpp @@ -428,7 +428,7 @@ void handle_json() } // Keep track of the lowest reported TTL and use that as refresh interval. - unsigned long lowest_ttl_json = 60; + uint32_t lowest_ttl_json = 60; { auto sensorsWriter = showSpecificTask ? mainLevelWriter.createNew() @@ -446,7 +446,7 @@ void handle_json() if (validDeviceIndex(DeviceIndex)) { - const unsigned long taskInterval = Settings.TaskDeviceTimer[TaskIndex]; + const uint32_t taskInterval = Settings.TaskDeviceTimer[TaskIndex]; auto taskWriter = sensorsWriter->createChild(); @@ -454,7 +454,7 @@ void handle_json() // LoadTaskSettings(TaskIndex); - unsigned long ttl_json = 60; // Default value + uint32_t ttl_json = 60; // Default value // For simplicity, do the optional values first. const uint8_t valueCount = getValueCountForTask(TaskIndex); From 536189789f5677cfb8bdebe8df51c9540a5ca1a1 Mon Sep 17 00:00:00 2001 From: TD-er Date: Mon, 6 Oct 2025 09:16:15 +0200 Subject: [PATCH 344/564] [Build] Reduce bin size by disabling logs in BUILD_NO_DEBUG builds --- src/ESPEasy/net/ESPEasyNetwork_ESP8266.cpp | 2 ++ .../net/wifi/ESPEasyWiFi_state_machine.cpp | 8 ++++---- src/ESPEasy/net/wifi/ESPEasyWifi.cpp | 3 ++- src/ESPEasy/net/wifi/ESPEasyWifi_abstracted.cpp | 3 ++- src/src/Commands/Diagnostic.cpp | 3 ++- src/src/Commands/Diagnostic.h | 2 +- src/src/Commands/InternalCommands.cpp | 2 ++ src/src/Commands/InternalCommands_decoder.cpp | 2 ++ src/src/Commands/InternalCommands_decoder.h | 2 ++ src/src/CustomBuild/define_plugin_sets.h | 15 +++++++++++++++ src/src/ESPEasyCore/Controller.cpp | 3 ++- src/src/ESPEasyCore/ESPEasyRules.cpp | 8 ++++---- src/src/ESPEasyCore/ESPEasy_Console.cpp | 4 ++-- src/src/ESPEasyCore/ESPEasy_setup.cpp | 12 ++++++------ src/src/Helpers/BusCmd_Handler_I2C.cpp | 4 +++- src/src/Helpers/BusCmd_Handler_I2C.h | 3 +++ src/src/Helpers/BusCmd_Helper.cpp | 14 ++++++++++---- src/src/Helpers/BusCmd_Helper.h | 3 ++- src/src/Helpers/IBusCmd_Handler.h | 3 ++- src/src/WebServer/DevicesPage.cpp | 2 ++ 20 files changed, 70 insertions(+), 28 deletions(-) diff --git a/src/ESPEasy/net/ESPEasyNetwork_ESP8266.cpp b/src/ESPEasy/net/ESPEasyNetwork_ESP8266.cpp index acbff598a..159261cb3 100644 --- a/src/ESPEasy/net/ESPEasyNetwork_ESP8266.cpp +++ b/src/ESPEasy/net/ESPEasyNetwork_ESP8266.cpp @@ -42,7 +42,9 @@ void setNetworkMedium(NetworkMedium_t new_medium) { } statusLED(true); active_network_medium = new_medium; +#ifndef BUILD_NO_DEBUG addLog(LOG_LEVEL_INFO, concat(F("Set Network mode: "), toString(active_network_medium))); +#endif } /*********************************************************************************************\ diff --git a/src/ESPEasy/net/wifi/ESPEasyWiFi_state_machine.cpp b/src/ESPEasy/net/wifi/ESPEasyWiFi_state_machine.cpp index a66ea09c9..678cb2845 100644 --- a/src/ESPEasy/net/wifi/ESPEasyWiFi_state_machine.cpp +++ b/src/ESPEasy/net/wifi/ESPEasyWiFi_state_machine.cpp @@ -296,7 +296,7 @@ void ESPEasyWiFi_t::disconnect() { doWiFiDisconnect(); } void ESPEasyWiFi_t::setState(WiFiState_e newState, uint32_t timeout) { if (newState == _state) { return; } - +#ifndef BUILD_NO_DEBUG if (loglevelActiveFor(LOG_LEVEL_INFO)) { addLog( LOG_LEVEL_INFO, @@ -304,7 +304,7 @@ void ESPEasyWiFi_t::setState(WiFiState_e newState, uint32_t timeout) { concat(F(" to: "), toString(newState)) + concat(F(" timeout: "), timeout)); } - +#endif if (_state == WiFiState_e::AP_only) { setAPinternal(false); setAP(false); @@ -482,14 +482,14 @@ bool ESPEasyWiFi_t::connectSTA() } const WiFi_AP_Candidate candidate = WiFi_AP_Candidates.getCurrent(); - +#ifndef BUILD_NO_DEBUG if (loglevelActiveFor(LOG_LEVEL_INFO)) { addLogMove(LOG_LEVEL_INFO, strformat( F("WIFI : Connecting %s attempt #%u"), candidate.toString().c_str(), wifi_STA_data->_establishConnectStats.getCycleCount() + 1)); } - +#endif // WiFiEventData.markWiFiBegin(); if (prepareWiFi()) { diff --git a/src/ESPEasy/net/wifi/ESPEasyWifi.cpp b/src/ESPEasy/net/wifi/ESPEasyWifi.cpp index d722b9ab6..5e01c3830 100644 --- a/src/ESPEasy/net/wifi/ESPEasyWifi.cpp +++ b/src/ESPEasy/net/wifi/ESPEasyWifi.cpp @@ -293,7 +293,7 @@ void setupStaticIPconfig() { // WiFiEventData.dns0_cache = dns; WiFi.config(ip, gw, subnet, dns); - +#ifndef BUILD_NO_DEBUG if (loglevelActiveFor(LOG_LEVEL_INFO)) { addLogMove(LOG_LEVEL_INFO, strformat( F("IP : Static IP : %s GW: %s SN: %s DNS: %s"), @@ -302,6 +302,7 @@ void setupStaticIPconfig() { formatIP(subnet).c_str(), getValue(LabelType::DNS).c_str())); } +#endif } // ******************************************************************************** diff --git a/src/ESPEasy/net/wifi/ESPEasyWifi_abstracted.cpp b/src/ESPEasy/net/wifi/ESPEasyWifi_abstracted.cpp index b1fb94db3..50a0e2cb6 100644 --- a/src/ESPEasy/net/wifi/ESPEasyWifi_abstracted.cpp +++ b/src/ESPEasy/net/wifi/ESPEasyWifi_abstracted.cpp @@ -136,7 +136,7 @@ void doSetAPinternal(bool enable) auto data = getWiFi_AP_NWPluginData_static_runtime(); if (data) { data->mark_start(); } - +#ifndef BUILD_NO_DEBUG if (loglevelActiveFor(LOG_LEVEL_INFO)) { addLogMove(LOG_LEVEL_INFO, strformat( F("WIFI : AP Mode enabled. SSID: %s IP: %s ch: %d"), @@ -151,6 +151,7 @@ void doSetAPinternal(bool enable) softAPSSID.c_str(), formatIP(apIP).c_str())); } +#endif } if (Settings.ApCaptivePortal()) { diff --git a/src/src/Commands/Diagnostic.cpp b/src/src/Commands/Diagnostic.cpp index e5763d4f9..5b358d5c2 100644 --- a/src/src/Commands/Diagnostic.cpp +++ b/src/src/Commands/Diagnostic.cpp @@ -139,7 +139,6 @@ const __FlashStringHelper * Command_Background(struct EventStruct *event, const serialPrintln(F("end")); return return_see_serial(event); } -#endif // BUILD_NO_DIAGNOSTIC_COMMANDS const __FlashStringHelper * Command_Debug(struct EventStruct *event, const char *Line) { @@ -152,6 +151,8 @@ const __FlashStringHelper * Command_Debug(struct EventStruct *event, const char } return return_see_serial(event); } +#endif + String Command_logentry(struct EventStruct *event, const char *Line) { diff --git a/src/src/Commands/Diagnostic.h b/src/src/Commands/Diagnostic.h index 8803edd92..b1cd8a6c8 100644 --- a/src/src/Commands/Diagnostic.h +++ b/src/src/Commands/Diagnostic.h @@ -17,8 +17,8 @@ const __FlashStringHelper * Command_SerialFloat(struct EventStruct *event, const const __FlashStringHelper * Command_MemInfo(struct EventStruct *event, const char* Line); const __FlashStringHelper * Command_MemInfo_detail(struct EventStruct *event, const char* Line); const __FlashStringHelper * Command_Background(struct EventStruct *event, const char* Line); -#endif const __FlashStringHelper * Command_Debug(struct EventStruct *event, const char* Line); +#endif String Command_logentry(struct EventStruct *event, const char* Line); #ifndef BUILD_NO_DIAGNOSTIC_COMMANDS const __FlashStringHelper * Command_JSONPortStatus(struct EventStruct *event, const char* Line); diff --git a/src/src/Commands/InternalCommands.cpp b/src/src/Commands/InternalCommands.cpp index 8f33d01a9..b8c6a659b 100644 --- a/src/src/Commands/InternalCommands.cpp +++ b/src/src/Commands/InternalCommands.cpp @@ -281,7 +281,9 @@ bool InternalCommands::executeInternalCommand() case ESPEasy_cmd_e::controllerdisable: COMMAND_CASE_R(Command_Controller_Disable, 1); // Controller.h case ESPEasy_cmd_e::controllerenable: COMMAND_CASE_R(Command_Controller_Enable, 1); // Controller.h case ESPEasy_cmd_e::datetime: COMMAND_CASE_R(Command_DateTime, 2); // Time.h +#ifndef BUILD_NO_DIAGNOSTIC_COMMANDS case ESPEasy_cmd_e::debug: COMMAND_CASE_R(Command_Debug, 1); // Diagnostic.h +#endif case ESPEasy_cmd_e::dec: COMMAND_CASE_A(Command_Rules_Dec, -1); // Rules.h case ESPEasy_cmd_e::deepsleep: COMMAND_CASE_R(Command_System_deepSleep, 1); // System.h case ESPEasy_cmd_e::delay: COMMAND_CASE_R(Command_Delay, 1); // Timers.h diff --git a/src/src/Commands/InternalCommands_decoder.cpp b/src/src/Commands/InternalCommands_decoder.cpp index b5418bbb3..c2e6371a1 100644 --- a/src/src/Commands/InternalCommands_decoder.cpp +++ b/src/src/Commands/InternalCommands_decoder.cpp @@ -46,7 +46,9 @@ const char Internal_commands_c[] PROGMEM = #define Int_cmd_d_offset ESPEasy_cmd_e::datetime const char Internal_commands_d[] PROGMEM = "datetime|" +#ifndef BUILD_NO_DIAGNOSTIC_COMMANDS "debug|" +#endif "dec|" "deepsleep|" "delay|" diff --git a/src/src/Commands/InternalCommands_decoder.h b/src/src/Commands/InternalCommands_decoder.h index 7ff4da379..534d583b0 100644 --- a/src/src/Commands/InternalCommands_decoder.h +++ b/src/src/Commands/InternalCommands_decoder.h @@ -31,7 +31,9 @@ enum class ESPEasy_cmd_e : uint8_t { controllerenable, datetime, +#ifndef BUILD_NO_DIAGNOSTIC_COMMANDS debug, +#endif dec, deepsleep, delay, diff --git a/src/src/CustomBuild/define_plugin_sets.h b/src/src/CustomBuild/define_plugin_sets.h index 31c806592..f8f2cb6a3 100644 --- a/src/src/CustomBuild/define_plugin_sets.h +++ b/src/src/CustomBuild/define_plugin_sets.h @@ -2248,12 +2248,18 @@ To create/register a plugin, you have to : #ifdef USES_P040 #undef USES_P040 // RFID - ID12LA/RDM6300 #endif + #ifdef USES_P042 + #undef USES_P042 // Candle + #endif #ifdef USES_P043 #undef USES_P043 // ClkOutput #endif #ifdef USES_P079 #undef USES_P079 // Wemos Motoshield #endif + #ifdef USES_P073 + #undef USES_P073 // 7DGT + #endif #endif // ifdef PLUGIN_BUILD_IR_EXTENDED_NO_RX // EXPERIMENTAL (playground) ####################### @@ -4033,4 +4039,13 @@ To create/register a plugin, you have to : # define FEATURE_STORE_NETWORK_INTERFACE_SETTINGS 0 #endif +#ifdef USES_P180 +#ifdef FEATURE_BUS_COMMAND +#undef FEATURE_BUS_COMMAND +#endif +#ifndef FEATURE_BUS_COMMAND +#define FEATURE_BUS_COMMAND 1 +#endif +#endif + #endif // CUSTOMBUILD_DEFINE_PLUGIN_SETS_H diff --git a/src/src/ESPEasyCore/Controller.cpp b/src/src/ESPEasyCore/Controller.cpp index 9c8f9000d..8d24d9402 100644 --- a/src/src/ESPEasyCore/Controller.cpp +++ b/src/src/ESPEasyCore/Controller.cpp @@ -656,10 +656,11 @@ void MQTTparseSystemVariablesAndSubscribe(String subscribeTo) { if (!subscribeTo.isEmpty()) { MQTTclient.subscribe(subscribeTo.c_str()); - +# ifndef BUILD_NO_DEBUG if (loglevelActiveFor(LOG_LEVEL_INFO)) { addLogMove(LOG_LEVEL_INFO, concat(F("MQTT : Subscribed to: "), subscribeTo)); } +#endif } } diff --git a/src/src/ESPEasyCore/ESPEasyRules.cpp b/src/src/ESPEasyCore/ESPEasyRules.cpp index 01165a722..477497d35 100644 --- a/src/src/ESPEasyCore/ESPEasyRules.cpp +++ b/src/src/ESPEasyCore/ESPEasyRules.cpp @@ -98,11 +98,11 @@ void rulesProcessing(const String& event) { #ifndef BUILD_NO_DEBUG const unsigned long timer = millis(); #endif // ifndef BUILD_NO_DEBUG - +#ifndef BUILD_NO_DEBUG if (loglevelActiveFor(LOG_LEVEL_INFO)) { addLogMove(LOG_LEVEL_INFO, concat(F("EVENT: "), event)); } - +#endif if (Settings.OldRulesEngine()) { bool eventHandled = false; @@ -1049,13 +1049,13 @@ void processMatchedRule(String& action, const String& event, substitute_eventvalue(action, event); const bool executeRestricted = equals(parseString(action, 1), F("restrict")); - +#ifndef BUILD_NO_DEBUG if (loglevelActiveFor(LOG_LEVEL_INFO)) { String actionlog = executeRestricted ? F("ACT : (restricted) ") : F("ACT : "); actionlog += action; addLogMove(LOG_LEVEL_INFO, actionlog); } - +#endif if (executeRestricted) { ExecuteCommand_all({EventValueSource::Enum::VALUE_SOURCE_RULES_RESTRICTED, parseStringToEndKeepCase(action, 2)}); } else { diff --git a/src/src/ESPEasyCore/ESPEasy_Console.cpp b/src/src/ESPEasyCore/ESPEasy_Console.cpp index 95e78c611..568ab1450 100644 --- a/src/src/ESPEasyCore/ESPEasy_Console.cpp +++ b/src/src/ESPEasyCore/ESPEasy_Console.cpp @@ -208,9 +208,9 @@ void EspEasy_Console_t::begin(uint32_t baudrate) #else // if FEATURE_DEFINE_SERIAL_CONSOLE_PORT # ifdef ESP8266 _mainSerial._serial->begin(baudrate); - #ifdef BUILD_NO_DEBUG +# ifndef BUILD_NO_DEBUG addLog(LOG_LEVEL_INFO, F("ESPEasy console using HW Serial")); - #endif +#endif # endif // ifdef ESP8266 # ifdef ESP32 diff --git a/src/src/ESPEasyCore/ESPEasy_setup.cpp b/src/src/ESPEasyCore/ESPEasy_setup.cpp index 90b02a77a..4472cac33 100644 --- a/src/src/ESPEasyCore/ESPEasy_setup.cpp +++ b/src/src/ESPEasyCore/ESPEasy_setup.cpp @@ -369,9 +369,9 @@ void ESPEasy_setup() #ifndef BUILD_NO_RAM_TRACKER logMemUsageAfter(F("LoadSettings()")); #endif // ifndef BUILD_NO_RAM_TRACKER - +#ifndef BUILD_NO_DEBUG addLog(LOG_LEVEL_INFO, concat(F("CPU Frequency: "), ESP.getCpuFreqMHz())); - +#endif #ifdef ESP32 #if !defined(CORE32SOLO1) && !defined(ESP32P4) @@ -488,11 +488,11 @@ void ESPEasy_setup() #ifndef BUILD_NO_RAM_TRACKER logMemUsageAfter(F("initSerial()")); #endif // ifndef BUILD_NO_RAM_TRACKER - +#ifndef BUILD_NO_DEBUG if (loglevelActiveFor(LOG_LEVEL_INFO)) { addLogMove(LOG_LEVEL_INFO, concat(F("INIT : Free RAM:"), FreeMem())); } - +#endif #ifndef BUILD_NO_DEBUG if (Settings.UseSerial && (Settings.SerialLogLevel >= LOG_LEVEL_DEBUG_MORE)) { @@ -524,7 +524,7 @@ void ESPEasy_setup() #ifndef BUILD_NO_RAM_TRACKER logMemUsageAfter(F("PluginInit()")); #endif - +#ifndef BUILD_NO_DEBUG if (loglevelActiveFor(LOG_LEVEL_INFO)) { String log; if (reserve_special(log, 80)) { @@ -537,7 +537,7 @@ void ESPEasy_setup() addLogMove(LOG_LEVEL_INFO, log); } } - +#endif /* if ((getDeviceCount() + 1) >= PLUGIN_MAX) { addLog(LOG_LEVEL_ERROR, concat(F("Programming error! - Increase PLUGIN_MAX ("), getDeviceCount()) + ')'); diff --git a/src/src/Helpers/BusCmd_Handler_I2C.cpp b/src/src/Helpers/BusCmd_Handler_I2C.cpp index 6493694d8..a6ae45bdc 100644 --- a/src/src/Helpers/BusCmd_Handler_I2C.cpp +++ b/src/src/Helpers/BusCmd_Handler_I2C.cpp @@ -1,5 +1,6 @@ #include "../Helpers/BusCmd_Handler_I2C.h" +#if FEATURE_BUS_COMMAND /** * Constructor BusCmd_Handler_I2C */ @@ -487,4 +488,5 @@ uint32_t BusCmd_Handler_I2C::writeStringReg(uint16_t reg, return _wire->endTransmission() == 0; } -#endif // if FEATURE_BUSCMD_STRING +#endif +#endif \ No newline at end of file diff --git a/src/src/Helpers/BusCmd_Handler_I2C.h b/src/src/Helpers/BusCmd_Handler_I2C.h index 9b957f156..d0867dd0e 100644 --- a/src/src/Helpers/BusCmd_Handler_I2C.h +++ b/src/src/Helpers/BusCmd_Handler_I2C.h @@ -7,6 +7,8 @@ */ #include "../../_Plugin_Helper.h" +#if FEATURE_BUS_COMMAND + #include "../Helpers/IBusCmd_Handler.h" #include @@ -89,4 +91,5 @@ private: TwoWire *_wire; bool _ok; }; +#endif #endif // ifndef _HELPERS_BUSCMD_HANDLER_I2C_H diff --git a/src/src/Helpers/BusCmd_Helper.cpp b/src/src/Helpers/BusCmd_Helper.cpp index 14827914b..f4c1056b0 100644 --- a/src/src/Helpers/BusCmd_Helper.cpp +++ b/src/src/Helpers/BusCmd_Helper.cpp @@ -1,5 +1,5 @@ #include "../Helpers/BusCmd_Helper.h" - +#if FEATURE_BUS_COMMAND #include #include "../Globals/RulesCalculate.h" @@ -259,11 +259,12 @@ std::vectorBusCmd_Helper_struct::parseBusCmdCommands(cons if (!key.isEmpty() && (_commandCache.count(key) == 1) && !update) { commands = _commandCache.find(key)->second; - +#ifndef BUILD_NO_DEBUG if (loglevelActiveFor(LOG_LEVEL_INFO) && _showLog && ((BusCmd_CommandSource_e::PluginRead == _commandSource) || (BusCmd_CommandSource_e::PluginGetConfigVar == _commandSource))) { addLog(LOG_LEVEL_INFO, strformat(F("BUSCMD: Retrieve '%s' from cache with %d commands."), name.c_str(), commands.size())); } +#endif } if (!line.isEmpty() && ((commands.empty()) || update) && ((BusCmd_CommandSource_e::PluginRead == _commandSource) || @@ -506,11 +507,12 @@ std::vectorBusCmd_Helper_struct::parseBusCmdCommands(cons if (!key.isEmpty()) { _commandCache[concat(key, keyPostfix)] = commands; - +#ifndef BUILD_NO_DEBUG if (loglevelActiveFor(LOG_LEVEL_INFO) && _showLog) { addLog(LOG_LEVEL_INFO, strformat(F("BUSCMD: Insert '%s%s' into cache with %d commands."), name.c_str(), keyPostfix.c_str(), commands.size())); } +#endif } } } @@ -938,11 +940,12 @@ bool BusCmd_Helper_struct::executeBusCmdCommands() { #endif // if FEATURE_BUSCMD_STRING && FEATURE_STRING_VARIABLES if (Calculate(newCalc, tmp) == CalculateReturnCode::OK) { +#ifndef BUILD_NO_DEBUG if (loglevelActiveFor(LOG_LEVEL_INFO) && _showLog && ((BusCmd_CommandSource_e::PluginRead == _commandSource) || (BusCmd_CommandSource_e::PluginGetConfigVar == _commandSource))) { addLog(LOG_LEVEL_INFO, strformat(F("BUSCMD: Calculation: %s, result: %s"), toCalc.c_str(), doubleToString(tmp).c_str())); } - +#endif if (BusCmd_Command_e::If == _it->command) { if (essentiallyZero(tmp)) { // 0 = false => cancel execution if (0 == _it->len) { @@ -1131,9 +1134,11 @@ bool BusCmd_Helper_struct::parseAndExecute(BusCmd_CommandSource_e source, _commands = parseBusCmdCommands(EMPTY_STRING, line); if (!_commands.empty()) { +#ifndef BUILD_NO_DEBUG if (loglevelActiveFor(LOG_LEVEL_INFO) && _showLog) { addLog(LOG_LEVEL_INFO, strformat(logFormat, _commands.size())); } +#endif _commandState = BusCmd_CommandState_e::Processing; result = executeBusCmdCommands(); _commands.clear(); @@ -1307,3 +1312,4 @@ bool BusCmd_Helper_struct::plugin_get_config(struct EventStruct *event, } #endif // ifndef LIMIT_BUILD_SIZE +#endif \ No newline at end of file diff --git a/src/src/Helpers/BusCmd_Helper.h b/src/src/Helpers/BusCmd_Helper.h index b21249a65..a8ed0878a 100644 --- a/src/src/Helpers/BusCmd_Helper.h +++ b/src/src/Helpers/BusCmd_Helper.h @@ -10,7 +10,7 @@ */ #include "../../_Plugin_Helper.h" - +#if FEATURE_BUS_COMMAND #include "../Helpers/IBusCmd_Handler.h" #define BUSCMD_EVENT_SEPARATOR '|' @@ -230,4 +230,5 @@ private: std::vector::iterator _it; std::vector _buffer; }; +#endif #endif // ifndef _HELPERS_BUSCMD_HELPER_H diff --git a/src/src/Helpers/IBusCmd_Handler.h b/src/src/Helpers/IBusCmd_Handler.h index 7ec7cee77..edff68843 100644 --- a/src/src/Helpers/IBusCmd_Handler.h +++ b/src/src/Helpers/IBusCmd_Handler.h @@ -17,7 +17,7 @@ * 2025-05-13 tonhuisman: Add String data-format support, guarded with FEATURE_BUSCMD_STRING * 2025-05-10 tonhuisman: Extract interface and I2C implementation from Plugin P180 I2C Generic implementation */ - +#if FEATURE_BUS_COMMAND #include class IBusCmd_Handler { // Interface/Abstract Class @@ -86,4 +86,5 @@ public: bool wideReg = false) = 0; #endif // if FEATURE_BUSCMD_STRING }; +#endif #endif // ifndef _HELPERS_IBUSCMD_HANDLER_H diff --git a/src/src/WebServer/DevicesPage.cpp b/src/src/WebServer/DevicesPage.cpp index 0540878c6..37d166835 100644 --- a/src/src/WebServer/DevicesPage.cpp +++ b/src/src/WebServer/DevicesPage.cpp @@ -828,7 +828,9 @@ void handle_devicess_ShowAllTasksTable(uint8_t page) html_TD(); if (validDeviceIndex(DeviceIndex)) { +#if FEATURE_STRING_VARIABLES const DeviceStruct& device = Device[DeviceIndex]; +#endif String customValuesString; const bool customValues = PluginCall(PLUGIN_WEBFORM_SHOW_VALUES, &TempEvent, customValuesString); From 0139f1248ba3f9343bce301873510a403626d845 Mon Sep 17 00:00:00 2001 From: TD-er Date: Mon, 6 Oct 2025 09:29:15 +0200 Subject: [PATCH 345/564] [Build] Fix failed custom ESP8266 build, disable CustomProvisioning --- tools/pio/pre_custom_esp82xx.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/pio/pre_custom_esp82xx.py b/tools/pio/pre_custom_esp82xx.py index d51a29556..1616050cf 100644 --- a/tools/pio/pre_custom_esp82xx.py +++ b/tools/pio/pre_custom_esp82xx.py @@ -66,7 +66,7 @@ else: "-DFEATURE_EXT_RTC=1", "-DFEATURE_I2CMULTIPLEXER=1", "-DFEATURE_TRIGONOMETRIC_FUNCTIONS_RULES=1", - "-DFEATURE_CUSTOM_PROVISIONING=1", +# "-DFEATURE_CUSTOM_PROVISIONING=1", "-DFEATURE_DEFINE_SERIAL_CONSOLE_PORT=0", "-DFEATURE_ESPEASY_P2P=1", From 60a3b451fb1dbbaeed6dcb77f14c550ea0b0d115 Mon Sep 17 00:00:00 2001 From: TD-er Date: Mon, 6 Oct 2025 09:38:10 +0200 Subject: [PATCH 346/564] [Build] Disable C014 (Homie) and C017 (Zabbix) for ESP8266 Collections --- src/src/CustomBuild/define_plugin_sets.h | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/src/CustomBuild/define_plugin_sets.h b/src/src/CustomBuild/define_plugin_sets.h index 59fb0e761..dd0974455 100644 --- a/src/src/CustomBuild/define_plugin_sets.h +++ b/src/src/CustomBuild/define_plugin_sets.h @@ -2328,14 +2328,18 @@ To create/register a plugin, you have to : #define USES_C012 // Blynk HTTP #endif #ifndef USES_C014 + #ifdef ESP32 #define USES_C014 // homie 3 & 4dev MQTT #endif + #endif #ifndef USES_C015 //#define USES_C015 // Blynk #endif #ifndef USES_C017 + #ifdef ESP32 #define USES_C017 // Zabbix #endif + #endif #ifdef ESP32 #ifndef USES_C018 #define USES_C018 // TTN RN2483 From 0944d27240a419223d4955e7d6cae0db13a29cc0 Mon Sep 17 00:00:00 2001 From: TD-er Date: Mon, 6 Oct 2025 10:58:59 +0200 Subject: [PATCH 347/564] [Build] Disable more logs with BUILD_NO_DEBUG on ESP8266 --- src/ESPEasy/net/_NW001_WiFi_STA.cpp | 2 ++ src/ESPEasy/net/_NW002_WiFi_AP.cpp | 2 ++ src/ESPEasy/net/wifi/ESPEasyWifi_abstracted.cpp | 2 ++ .../net/wifi/ESPEasyWifi_abstracted_ESP8266.cpp | 3 ++- src/src/Helpers/ESPEasy_time.cpp | 8 ++++---- src/src/Helpers/ESPEasy_time_zone.cpp | 2 ++ src/src/Helpers/Hardware.cpp | 8 ++++++++ src/src/Helpers/Modbus_RTU.cpp | 5 ++++- src/src/Helpers/Networking.cpp | 15 ++++++++++++--- src/src/Helpers/WebServer_commandHelper.cpp | 3 ++- src/src/NotifierStructs/N001_data_struct.cpp | 13 ++++++++++--- src/src/WebServer/ESPEasy_WebServer.cpp | 4 ++-- src/src/WebServer/FileList.cpp | 2 ++ src/src/WebServer/Rules.cpp | 2 ++ src/src/WebServer/SetupPage.cpp | 3 ++- src/src/WebServer/UploadPage.cpp | 8 ++++++-- 16 files changed, 64 insertions(+), 18 deletions(-) diff --git a/src/ESPEasy/net/_NW001_WiFi_STA.cpp b/src/ESPEasy/net/_NW001_WiFi_STA.cpp index 4136b2307..22ebaade2 100644 --- a/src/ESPEasy/net/_NW001_WiFi_STA.cpp +++ b/src/ESPEasy/net/_NW001_WiFi_STA.cpp @@ -189,6 +189,7 @@ bool NWPlugin_001(NWPlugin::Function function, EventStruct *event, String& strin } # endif // ifdef ESP32 } +#ifndef LIMIT_BUILD_SIZE event->kvWriter->write({ F("BSSID"), STA_BSSID_STR, @@ -207,6 +208,7 @@ bool NWPlugin_001(NWPlugin::Function function, EventStruct *event, String& strin F("Encryption Type"), NW_data->getWiFi_encryptionType() }); } +#endif } break; diff --git a/src/ESPEasy/net/_NW002_WiFi_AP.cpp b/src/ESPEasy/net/_NW002_WiFi_AP.cpp index 919fce999..c8072a6ec 100644 --- a/src/ESPEasy/net/_NW002_WiFi_AP.cpp +++ b/src/ESPEasy/net/_NW002_WiFi_AP.cpp @@ -283,7 +283,9 @@ bool NWPlugin_002(NWPlugin::Function function, EventStruct *event, String& strin # if FEATURE_ETHERNET addFormNote(F("Do not allow to start an AP when unable to connect to configured LAN/WiFi")); # else // if FEATURE_ETHERNET +#ifndef LIMIT_BUILD_SIZE addFormNote(F("Do not allow to start an AP when configured WiFi cannot be found")); +#endif # endif // if FEATURE_ETHERNET # ifdef ESP32 addFormCheckBox(F("Enable NAPT"), F("napt"), Settings.WiFi_AP_enable_NAPT()); diff --git a/src/ESPEasy/net/wifi/ESPEasyWifi_abstracted.cpp b/src/ESPEasy/net/wifi/ESPEasyWifi_abstracted.cpp index 50a0e2cb6..4a0c4069a 100644 --- a/src/ESPEasy/net/wifi/ESPEasyWifi_abstracted.cpp +++ b/src/ESPEasy/net/wifi/ESPEasyWifi_abstracted.cpp @@ -111,12 +111,14 @@ void doSetAPinternal(bool enable) # ifdef ESP8266 if (!WiFi.softAPConfig(apIP, apIP, subnet)) { +# ifndef BUILD_NO_DEBUG addLog(LOG_LEVEL_ERROR, strformat( ("WIFI : [AP] softAPConfig failed! IP: %s, GW: %s, SN: %s"), apIP.toString().c_str(), apIP.toString().c_str(), subnet.toString().c_str()) ); +#endif } # endif // ifdef ESP8266 diff --git a/src/ESPEasy/net/wifi/ESPEasyWifi_abstracted_ESP8266.cpp b/src/ESPEasy/net/wifi/ESPEasyWifi_abstracted_ESP8266.cpp index 6318886d2..72e18931a 100644 --- a/src/ESPEasy/net/wifi/ESPEasyWifi_abstracted_ESP8266.cpp +++ b/src/ESPEasy/net/wifi/ESPEasyWifi_abstracted_ESP8266.cpp @@ -33,10 +33,11 @@ bool WiFi_pre_STA_setup() { // Assign to 2 separate bools to make sure both are executed. const bool autoConnect = WiFi.setAutoConnect(true); const bool autoReconnect = WiFi.setAutoReconnect(true); - +#ifndef LIMIT_BUILD_SIZE if (!autoConnect || !autoReconnect) { addLog(LOG_LEVEL_ERROR, F("WiFi : Disabling auto (re)connect failed")); } +#endif delay(100); return true; } diff --git a/src/src/Helpers/ESPEasy_time.cpp b/src/src/Helpers/ESPEasy_time.cpp index 832264630..365b1c18b 100644 --- a/src/src/Helpers/ESPEasy_time.cpp +++ b/src/src/Helpers/ESPEasy_time.cpp @@ -389,7 +389,7 @@ unsigned long ESPEasy_time::now_() { syncInterval = 3600; } } - +#ifndef BUILD_NO_DEBUG if (loglevelActiveFor(LOG_LEVEL_INFO)) { String log = F("Time set to "); #if FEATURE_USE_DOUBLE_AS_ESPEASY_RULES_FLOAT_TYPE @@ -408,7 +408,7 @@ unsigned long ESPEasy_time::now_() { } addLogMove(LOG_LEVEL_INFO, log); } - +#endif time_zone.applyTimeZone(unixTime_d); lastSyncTime_ms = millis(); nextSyncTime = getUptime_in_sec() + syncInterval; @@ -429,13 +429,13 @@ unsigned long ESPEasy_time::now_() { calcSunRiseAndSet(timeSynced); if (timeSynced) { - #ifndef BUILD_MINIMAL_OTA +#ifndef BUILD_NO_DEBUG if (loglevelActiveFor(LOG_LEVEL_INFO)) { addLog(LOG_LEVEL_INFO, strformat( F("Local time: %s"), getDateTimeString('-', ':', ' ').c_str())); } - #endif +#endif { // Notify plugins the time has been set. String dummy; diff --git a/src/src/Helpers/ESPEasy_time_zone.cpp b/src/src/Helpers/ESPEasy_time_zone.cpp index 1963d20cf..b687c74d7 100644 --- a/src/src/Helpers/ESPEasy_time_zone.cpp +++ b/src/src/Helpers/ESPEasy_time_zone.cpp @@ -53,6 +53,7 @@ void ESPEasy_time_zone::setTimeZone(const TimeChangeRule& dstStart, const TimeCh } void ESPEasy_time_zone::logTimeZoneInfo() { +#ifndef BUILD_NO_DEBUG if (!loglevelActiveFor(LOG_LEVEL_INFO)) return; String log = F("Current Time Zone: "); @@ -82,6 +83,7 @@ void ESPEasy_time_zone::logTimeZoneInfo() { log += m_std.offset; log += F(" min"); addLogMove(LOG_LEVEL_INFO, log); +#endif } diff --git a/src/src/Helpers/Hardware.cpp b/src/src/Helpers/Hardware.cpp index 9df1ca03a..6fb8755de 100644 --- a/src/src/Helpers/Hardware.cpp +++ b/src/src/Helpers/Hardware.cpp @@ -253,24 +253,32 @@ void hardwareInit() if (SPI_initialized) { +#ifndef BUILD_NO_DEBUG addLog(LOG_LEVEL_INFO, F("INIT : SPI Init (without CS)")); +#endif #if FEATURE_SD if (Settings.Pin_sd_cs >= 0) { if (SD.begin(Settings.Pin_sd_cs)) { +#ifndef BUILD_NO_DEBUG addLog(LOG_LEVEL_INFO, F("SD : Init OK")); +#endif } else { SD.end(); +#ifndef BUILD_NO_DEBUG addLog(LOG_LEVEL_ERROR, F("SD : Init failed")); +#endif } } #endif // if FEATURE_SD +#ifndef BUILD_NO_DEBUG } else { addLog(LOG_LEVEL_INFO, F("INIT : SPI not enabled")); +#endif } } diff --git a/src/src/Helpers/Modbus_RTU.cpp b/src/src/Helpers/Modbus_RTU.cpp index 7e452360c..60b018573 100644 --- a/src/src/Helpers/Modbus_RTU.cpp +++ b/src/src/Helpers/Modbus_RTU.cpp @@ -64,13 +64,14 @@ bool ModbusRTU_struct::init(const ESPEasySerialPort port, const int16_t serial_r } detected_device_description = getDevice_description(_modbus_address); - +#ifndef BUILD_NO_DEBUG if (loglevelActiveFor(LOG_LEVEL_INFO)) { String log; // = F("Modbus detected: "); log += detected_device_description; addLogMove(LOG_LEVEL_INFO, log); modbus_log_MEI(_modbus_address); } +#endif return true; } @@ -252,8 +253,10 @@ String ModbusRTU_struct::parse_modbus_MEI_response(unsigned int& object_value_in if (_recv_buf_used < 8) { // Too small. +#ifndef BUILD_NO_DEBUG addLog(LOG_LEVEL_INFO, concat(F("MEI response too small: "), _recv_buf_used)); +#endif next_object_id = 0xFF; more_follows = false; return result; diff --git a/src/src/Helpers/Networking.cpp b/src/src/Helpers/Networking.cpp index 405af8712..41300c423 100644 --- a/src/src/Helpers/Networking.cpp +++ b/src/src/Helpers/Networking.cpp @@ -236,7 +236,9 @@ void updateUDPport(bool force) if (lastUsedUDPPort != 0) { portUDP.stop(); lastUsedUDPPort = 0; +#ifndef BUILD_NO_DEBUG addLogMove(LOG_LEVEL_INFO, concat(F("UDP : Stop listening on port "), Settings.UDPPort)); +#endif } if (!connected) { return; @@ -245,15 +247,18 @@ void updateUDPport(bool force) if (Settings.UDPPort != 0) { if (portUDP.begin(Settings.UDPPort) == 0) { +#ifndef BUILD_NO_DEBUG if (loglevelActiveFor(LOG_LEVEL_ERROR)) { addLogMove(LOG_LEVEL_ERROR, concat(F("UDP : Cannot bind to ESPEasy p2p UDP port "), Settings.UDPPort)); } +#endif } else { lastUsedUDPPort = Settings.UDPPort; - +#ifndef BUILD_NO_DEBUG if (loglevelActiveFor(LOG_LEVEL_INFO)) { addLogMove(LOG_LEVEL_INFO, concat(F("UDP : Start listening on port "), Settings.UDPPort)); } +#endif } } } @@ -1651,9 +1656,11 @@ int http_authenticate(const String& logIdentifier, if (authReq.indexOf(F("Digest")) != -1) { // Use Digest authorization +#ifndef BUILD_NO_DEBUG if (loglevelActiveFor(LOG_LEVEL_INFO)) { addLogMove(LOG_LEVEL_INFO, concat(F("HTTP : Start Digest Authorization for "), host)); } +#endif http.setAuthorization(""); // Clear Basic authorization # ifdef ESP32 @@ -1904,10 +1911,11 @@ bool downloadFile(const String& url, String file_save, const String& user, const f.close(); http.end(); client.stop(); - +#ifndef BUILD_NO_DEBUG if (loglevelActiveFor(LOG_LEVEL_INFO)) { addLog(LOG_LEVEL_INFO, strformat(F("downloadFile: %s Success"), file_save.c_str())); } +#endif return true; } http.end(); @@ -2000,10 +2008,11 @@ bool downloadFirmware(const String& url, String& file_save, String& user, String } http.end(); client.stop(); - +#ifndef BUILD_NO_DEBUG if (error.isEmpty() && loglevelActiveFor(LOG_LEVEL_INFO)) { addLog(LOG_LEVEL_INFO, strformat(F("downloadFile: %s Success"), file_save.c_str())); } +#endif uint8_t errorcode = 0; diff --git a/src/src/Helpers/WebServer_commandHelper.cpp b/src/src/Helpers/WebServer_commandHelper.cpp index de9706246..3a1c0a5e7 100644 --- a/src/src/Helpers/WebServer_commandHelper.cpp +++ b/src/src/Helpers/WebServer_commandHelper.cpp @@ -14,8 +14,9 @@ HandledWebCommand_result handle_command_from_web(EventValueSource::Enum source, if (!clientIPallowed()) { return HandledWebCommand_result::IP_not_allowed; } webrequest.trim(); if (webrequest.isEmpty()) { return HandledWebCommand_result::NoCommand; } - +#ifndef BUILD_NO_DEBUG addLogMove(LOG_LEVEL_INFO, concat(F("HTTP: "), webrequest)); +#endif webrequest = parseTemplate(webrequest); #ifndef BUILD_NO_DEBUG addLogMove(LOG_LEVEL_DEBUG, concat(F("HTTP after parseTemplate: "), webrequest)); diff --git a/src/src/NotifierStructs/N001_data_struct.cpp b/src/src/NotifierStructs/N001_data_struct.cpp index 38cee7e00..dca4cff69 100644 --- a/src/src/NotifierStructs/N001_data_struct.cpp +++ b/src/src/NotifierStructs/N001_data_struct.cpp @@ -206,7 +206,9 @@ bool NPlugin_001_send(const NotificationSettingsStruct& notificationsettings, St // The MTA Exchange if (!failFlag) { +#ifndef BUILD_NO_DEBUG addLog(LOG_LEVEL_INFO, F("Email: Initializing ...")); +#endif # ifndef BUILD_NO_DEBUG addLog(LOG_LEVEL_INFO, strformat(F("Email: Max Allowed Timeout is %d secs"), clientTimeout / 1000)); @@ -315,8 +317,9 @@ bool NPlugin_001_send(const NotificationSettingsStruct& notificationsettings, St int i = 0; String emailTo; const String receiver(tmp_ato); - +#ifndef BUILD_NO_DEBUG addLog(LOG_LEVEL_INFO, strformat(F("Email: Receiver(s): %s"), receiver.c_str())); +#endif if (!getNextMailAddress(receiver, emailTo, i)) { addLog(LOG_LEVEL_ERROR, F("Email: Receiver missing!")); @@ -324,9 +327,11 @@ bool NPlugin_001_send(const NotificationSettingsStruct& notificationsettings, St } while (nextAddressAvailable) { +#ifndef BUILD_NO_DEBUG if (loglevelActiveFor(LOG_LEVEL_INFO)) { addLog(LOG_LEVEL_INFO, concat(F("Email: To "), emailTo)); } +#endif if (!NPlugin_001_MTA(*client, strformat(F("RCPT TO:<%s>"), emailTo.c_str()), 250, clientTimeout)) { @@ -360,7 +365,7 @@ bool NPlugin_001_send(const NotificationSettingsStruct& notificationsettings, St break; } } - +#ifndef BUILD_NO_DEBUG if (myStatus) { addLog(LOG_LEVEL_INFO, F("Email: Connection Closed Successfully")); } else { @@ -368,6 +373,7 @@ bool NPlugin_001_send(const NotificationSettingsStruct& notificationsettings, St addLogMove(LOG_LEVEL_ERROR, concat(F("Email: Connection Closed With Error. Used header: "), mailheader)); } } +#endif } client->stop(); @@ -392,10 +398,11 @@ bool NPlugin_001_Auth(WiFiClient& client, const String& user, const String& pass if (!NPlugin_001_MTA(client, encoder.encode(user), 334, timeout)) { success = false; } if (!NPlugin_001_MTA(client, encoder.encode(pass), 235, timeout)) { success = false; } - +#ifndef BUILD_NO_DEBUG if (success) { addLog(LOG_LEVEL_INFO, F("Email: Credentials Accepted")); } +#endif return success; } diff --git a/src/src/WebServer/ESPEasy_WebServer.cpp b/src/src/WebServer/ESPEasy_WebServer.cpp index 8e4bea24b..b81048377 100644 --- a/src/src/WebServer/ESPEasy_WebServer.cpp +++ b/src/src/WebServer/ESPEasy_WebServer.cpp @@ -175,9 +175,9 @@ bool captivePortal() { const IPAddress client_localIP = web_server.client().localIP(); const bool fromAP = client_localIP == apIP; const bool hasWiFiCredentials = SecuritySettings.hasWiFiCredentials(); - +#ifndef BUILD_NO_DEBUG addLog(LOG_LEVEL_INFO, concat(F("CaptivePortal: hostHeader: "), web_server.hostHeader())); - +#endif if (hasWiFiCredentials || !fromAP) { return false; } diff --git a/src/src/WebServer/FileList.cpp b/src/src/WebServer/FileList.cpp index 4159cc021..c61e91ba3 100644 --- a/src/src/WebServer/FileList.cpp +++ b/src/src/WebServer/FileList.cpp @@ -155,7 +155,9 @@ void handle_filelist() { # ifdef USES_C016 if (hasArg(F("delcache"))) { +#ifndef BUILD_NO_DEBUG addLog(LOG_LEVEL_INFO, F("RTC : delcache")); +#endif C016_deleteAllCacheBlocks(); while (GarbageCollection()) { diff --git a/src/src/WebServer/Rules.cpp b/src/src/WebServer/Rules.cpp index 6e420c9e6..4cd6aec87 100644 --- a/src/src/WebServer/Rules.cpp +++ b/src/src/WebServer/Rules.cpp @@ -48,9 +48,11 @@ void handle_rules() { // Make sure file exists if (!fileExists(fileName)) { +#ifndef BUILD_NO_DEBUG if (loglevelActiveFor(LOG_LEVEL_INFO)) { addLogMove(LOG_LEVEL_INFO, concat(F("Rules : Create new file: %s"), fileName)); } +#endif fs::File f = tryOpenFile(fileName, "w"); if (f) { f.close(); } diff --git a/src/src/WebServer/SetupPage.cpp b/src/src/WebServer/SetupPage.cpp index f0e951a3a..6c31f2474 100644 --- a/src/src/WebServer/SetupPage.cpp +++ b/src/src/WebServer/SetupPage.cpp @@ -122,12 +122,13 @@ void handle_setup() { // WiFiEventData.wifiSetupConnect = true; // WiFiEventData.wifiConnectAttemptNeeded = true; ESPEasy::net::wifi::WiFi_AP_Candidates.force_reload(); // Force reload of the credentials and found APs from the last scan - +#ifndef BUILD_NO_DEBUG if (loglevelActiveFor(LOG_LEVEL_INFO)) { String reconnectlog = F("WIFI : Credentials Changed, retry connection. SSID: "); reconnectlog += ssid; addLogMove(LOG_LEVEL_INFO, reconnectlog); } +#endif status = HANDLE_SETUP_CONNECTING_STAGE; refreshCount = 0; String dummy; diff --git a/src/src/WebServer/UploadPage.cpp b/src/src/WebServer/UploadPage.cpp index 74ae84ca7..f7c4e9968 100644 --- a/src/src/WebServer/UploadPage.cpp +++ b/src/src/WebServer/UploadPage.cpp @@ -151,9 +151,11 @@ void handleFileUploadBase(bool toSDcard) { if (upload.status == UPLOAD_FILE_START) { +#ifndef BUILD_NO_DEBUG if (loglevelActiveFor(LOG_LEVEL_INFO)) { addLogMove(LOG_LEVEL_INFO, concat(F("Upload: START, filename: "), upload.filename)); } +#endif valid = false; uploadResult = uploadResult_e::UploadStarted; } @@ -207,10 +209,11 @@ void handleFileUploadBase(bool toSDcard) { { if (uploadFile) { uploadFile.write(upload.buf, upload.currentSize); } } - +#ifndef BUILD_NO_DEBUG if (loglevelActiveFor(LOG_LEVEL_INFO)) { addLogMove(LOG_LEVEL_INFO, concat(F("Upload: WRITE, Bytes: "), upload.currentSize)); } +#endif } else if (upload.status == UPLOAD_FILE_END) { @@ -242,10 +245,11 @@ void handleFileUploadBase(bool toSDcard) { { if (uploadFile) { uploadFile.close(); } } - +#ifndef BUILD_NO_DEBUG if (loglevelActiveFor(LOG_LEVEL_INFO)) { addLogMove(LOG_LEVEL_INFO, concat(F("Upload: END, Size: "), upload.totalSize)); } +#endif } if (valid) { From 36e8edd80a6788d43c53a12bf869a6ae38fd3226 Mon Sep 17 00:00:00 2001 From: TD-er Date: Mon, 6 Oct 2025 11:12:37 +0200 Subject: [PATCH 348/564] [Build] Fix failing build hard_SONOFF_POW_4M1M --- src/src/DataStructs/RTCStruct.h | 35 +++++++++++++++++---------------- 1 file changed, 18 insertions(+), 17 deletions(-) diff --git a/src/src/DataStructs/RTCStruct.h b/src/src/DataStructs/RTCStruct.h index a0bb75510..4d0757549 100644 --- a/src/src/DataStructs/RTCStruct.h +++ b/src/src/DataStructs/RTCStruct.h @@ -9,12 +9,12 @@ #define RTC_BASE_CACHE 124 #ifdef ESP8266 -# define RTC_CACHE_DATA_SIZE 240 // 10 elements, limited by RTC memory +# define RTC_CACHE_DATA_SIZE 240 // 10 elements, limited by RTC memory # ifdef ESP8266_16M14M # ifdef USE_LITTLEFS # define CACHE_FILE_MAX_SIZE 262144 // LittleFS can handle larger files just fine. # else // ifdef USE_LITTLEFS -# define CACHE_FILE_MAX_SIZE 48000 // Try to reduce the nr. of files, but SPIFFS still slows down on lager files. +# define CACHE_FILE_MAX_SIZE 48000 // Try to reduce the nr. of files, but SPIFFS still slows down on lager files. # endif // ifdef USE_LITTLEFS # else // ifdef ESP8266_16M14M # define CACHE_FILE_MAX_SIZE 24000 @@ -53,21 +53,22 @@ struct RTCStruct bool lastWiFi_set() const; - uint8_t ID1 = 0; - uint8_t ID2 = 0; - uint8_t lastWiFiChannel = 0; - uint8_t factoryResetCounter = 0; - uint8_t deepSleepState = 0; - uint8_t bootFailedCount = 0; - uint8_t flashDayCounter = 0; - uint8_t lastWiFiSettingsIndex = 0; - unsigned long flashCounter = 0; - unsigned long bootCounter = 0; - unsigned long lastMixedSchedulerId = 0; - uint8_t lastBSSID[6] = { 0 }; - uint8_t unused1 = 0; // Force alignment to 4 bytes - uint8_t unused2 = 0; - unsigned long lastSysTime = 0; + uint8_t ID1 = 0; + uint8_t ID2 = 0; + uint8_t lastWiFiChannel = 0; + uint8_t factoryResetCounter = 0; + uint8_t deepSleepState = 0; + uint8_t bootFailedCount = 0; + uint8_t flashDayCounter = 0; + uint8_t lastWiFiSettingsIndex = 0; + uint32_t flashCounter = 0; + uint32_t bootCounter = 0; + uint32_t lastMixedSchedulerId = 0; + uint8_t lastBSSID[6] = { 0 }; + uint8_t unused1 = 0; // Force alignment to 4 bytes + uint8_t unused2 = 0; + uint32_t lastSysTime = 0; + }; From beeb6dfa2da5b1b806eabbd1e1dbe63080d20f88 Mon Sep 17 00:00:00 2001 From: TD-er Date: Mon, 6 Oct 2025 16:28:23 +0200 Subject: [PATCH 349/564] [Build] Fix build errors on RISC-V like ESP32-C2/C3/C5/C6 --- src/src/Helpers/KeyValueWriter.cpp | 4 ++-- src/src/Helpers/KeyValueWriter.h | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/src/Helpers/KeyValueWriter.cpp b/src/src/Helpers/KeyValueWriter.cpp index 9300f80a5..3e644f599 100644 --- a/src/src/Helpers/KeyValueWriter.cpp +++ b/src/src/Helpers/KeyValueWriter.cpp @@ -37,7 +37,7 @@ KeyValueStruct::KeyValueStruct(const String & key, : _key(key), _format(format) { _values.emplace_back(String(val), vType); } -#ifdef ESP32 +#if defined(ESP32) && !defined(__riscv) KeyValueStruct::KeyValueStruct(const String & key, int32_t val, Format format, @@ -53,7 +53,7 @@ KeyValueStruct::KeyValueStruct(const String & key, : _key(key), _format(format) { _values.emplace_back(String(val), vType); } -#ifdef ESP32 +#if defined(ESP32) && !defined(__riscv) KeyValueStruct::KeyValueStruct(const String & key, size_t val, Format format, diff --git a/src/src/Helpers/KeyValueWriter.h b/src/src/Helpers/KeyValueWriter.h index 4d62e0db6..5886e30f9 100644 --- a/src/src/Helpers/KeyValueWriter.h +++ b/src/src/Helpers/KeyValueWriter.h @@ -70,7 +70,7 @@ struct KeyValueStruct int val, Format format = Format::Default, ValueStruct::ValueType vType = ValueStruct::ValueType::Int); -#ifdef ESP32 +#if defined(ESP32) && !defined(__riscv) KeyValueStruct(const String & key, int32_t val, Format format = Format::Default, @@ -80,7 +80,7 @@ struct KeyValueStruct uint32_t val, Format format = Format::Default, ValueStruct::ValueType vType = ValueStruct::ValueType::Int); -#ifdef ESP32 +#if defined(ESP32) && !defined(__riscv) KeyValueStruct(const String & key, size_t val, Format format = Format::Default, From 7afbf7b3c3bf4abfcb913fe985b4d2c6de3cd2c4 Mon Sep 17 00:00:00 2001 From: TD-er Date: Mon, 6 Oct 2025 17:17:02 +0200 Subject: [PATCH 350/564] [Build] Fix build error on safeboot builds --- src/ESPEasy/net/Helpers/NW_info_writer.cpp | 131 +++++++++++++++++++++ src/ESPEasy/net/Helpers/NW_info_writer.h | 24 ++++ src/src/WebServer/JSON.cpp | 12 +- src/src/WebServer/NetworkPage.cpp | 129 ++------------------ src/src/WebServer/NetworkPage.h | 8 -- src/src/WebServer/SysInfoPage.cpp | 11 +- 6 files changed, 173 insertions(+), 142 deletions(-) create mode 100644 src/ESPEasy/net/Helpers/NW_info_writer.cpp create mode 100644 src/ESPEasy/net/Helpers/NW_info_writer.h diff --git a/src/ESPEasy/net/Helpers/NW_info_writer.cpp b/src/ESPEasy/net/Helpers/NW_info_writer.cpp new file mode 100644 index 000000000..66eecd7c3 --- /dev/null +++ b/src/ESPEasy/net/Helpers/NW_info_writer.cpp @@ -0,0 +1,131 @@ +#include "../Helpers/NW_info_writer.h" + +#include "../../../src/DataStructs/ESPEasy_EventStruct.h" +#include "../../../src/DataTypes/ESPEasy_plugin_functions.h" +#include "../../../src/Globals/Settings.h" + +#include "../Globals/NWPlugins.h" + +namespace ESPEasy { +namespace net { + +#ifdef ESP32 + +bool write_NetworkAdapterFlags(ESPEasy::net::networkIndex_t networkindex, KeyValueWriter*writer) +{ + if (writer == nullptr) { return false; } + struct EventStruct TempEvent; + TempEvent.kvWriter = writer; + + TempEvent.NetworkIndex = networkindex; + + String str; + + if (!NWPluginCall(NWPlugin::Function::NWPLUGIN_GET_INTERFACE, &TempEvent, str)) { + return false; + } + + { + String str; + const bool res = NWPluginCall(NWPlugin::Function::NWPLUGIN_WEBFORM_SHOW_HW_ADDRESS, &TempEvent, str); + } + + { + KeyValueStruct kv(F("Flags"), KeyValueStruct::Format::PreFormatted); + + const NWPlugin::NetforkFlags flags[] = { + NWPlugin::NetforkFlags::DHCP_client, + NWPlugin::NetforkFlags::DHCP_server, + NWPlugin::NetforkFlags::AutoUp, + NWPlugin::NetforkFlags::GratuituousArp, + NWPlugin::NetforkFlags::EventIPmodified, + NWPlugin::NetforkFlags::isPPP, + NWPlugin::NetforkFlags::isBridge, +# if CONFIG_LWIP_IPV6 + NWPlugin::NetforkFlags::MLD_v6_report, + NWPlugin::NetforkFlags::IPv6_autoconf_enabled, +# endif // if CONFIG_LWIP_IPV6 + }; + + for (size_t i = 0; i < NR_ELEMENTS(flags); ++i) { + if (NWPlugin::isFlagSet(flags[i], TempEvent.networkInterface)) { + String labels_str = NWPlugin::toString(flags[i]); + + if (flags[i] == NWPlugin::NetforkFlags::DHCP_client) { + if (TempEvent.networkInterface->getStatusBits() & ESP_NETIF_HAS_STATIC_IP_BIT) { + labels_str += F(" (static IP)"); + } + } + kv.appendValue(labels_str); + } + } + writer->write(kv); + } + return true; +} + +bool write_IP_config(ESPEasy::net::networkIndex_t networkindex, KeyValueWriter*writer) +{ + if (writer == nullptr) { return false; } + struct EventStruct TempEvent; + + TempEvent.NetworkIndex = networkindex; + String str; + + if (!NWPluginCall(NWPlugin::Function::NWPLUGIN_GET_INTERFACE, &TempEvent, str)) { + return false; + } + const NWPlugin::IP_type ip_types[] = { + NWPlugin::IP_type::inet, + NWPlugin::IP_type::network_id_cdr, + NWPlugin::IP_type::netmask, + NWPlugin::IP_type::broadcast, + NWPlugin::IP_type::gateway, + NWPlugin::IP_type::dns1, + NWPlugin::IP_type::dns2, +# if CONFIG_LWIP_IPV6 + NWPlugin::IP_type::ipv6_unknown, + NWPlugin::IP_type::ipv6_global, + NWPlugin::IP_type::ipv6_link_local, + NWPlugin::IP_type::ipv6_site_local, + NWPlugin::IP_type::ipv6_unique_local, + NWPlugin::IP_type::ipv4_mapped_ipv6, +# endif // if CONFIG_LWIP_IPV6 + + }; + + for (size_t i = 0; i < NR_ELEMENTS(ip_types); ++i) { + + PrintToString str; + + if (NWPlugin::print_IP_address(ip_types[i], TempEvent.networkInterface, str)) { + KeyValueStruct kv(NWPlugin::toString(ip_types[i]), str.get(), KeyValueStruct::Format::PreFormatted); + writer->write(kv); + } + } + return true; +} + +#endif // ifdef ESP32 + +bool write_NetworkConnectionInfo(ESPEasy::net::networkIndex_t networkindex, KeyValueWriter*writer) +{ + if (!writer) { return false; } + struct EventStruct TempEvent; + TempEvent.NetworkIndex = networkindex; + TempEvent.kvWriter = writer; + + const bool res = NWPluginCall(NWPlugin::Function::NWPLUGIN_WEBFORM_SHOW_CONNECTED, &TempEvent); + + if (res) { + NWPluginCall(NWPlugin::Function::NWPLUGIN_GET_CONNECTED_DURATION, &TempEvent); + +#if FEATURE_NETWORK_TRAFFIC_COUNT + NWPluginCall(NWPlugin::Function::NWPLUGIN_GET_TRAFFIC_COUNT, &TempEvent); +#endif // if FEATURE_NETWORK_TRAFFIC_COUNT + } + return res; +} + +} // namespace net +} // namespace ESPEasy diff --git a/src/ESPEasy/net/Helpers/NW_info_writer.h b/src/ESPEasy/net/Helpers/NW_info_writer.h new file mode 100644 index 000000000..73de57cc2 --- /dev/null +++ b/src/ESPEasy/net/Helpers/NW_info_writer.h @@ -0,0 +1,24 @@ +#pragma once + +#include "../../../ESPEasy_common.h" + +#include "../../../src/Helpers/KeyValueWriter.h" + +#include "../DataTypes/NetworkIndex.h" + +namespace ESPEasy { +namespace net { + +#ifdef ESP32 +bool write_NetworkAdapterFlags(ESPEasy::net::networkIndex_t networkindex, + KeyValueWriter *writer); + +bool write_IP_config(ESPEasy::net::networkIndex_t networkindex, + KeyValueWriter *writer); +#endif // ifdef ESP32 + +bool write_NetworkConnectionInfo(ESPEasy::net::networkIndex_t networkindex, + KeyValueWriter *writer); + +} // namespace net +} // namespace ESPEasy diff --git a/src/src/WebServer/JSON.cpp b/src/src/WebServer/JSON.cpp index e733c6509..bc52888ab 100644 --- a/src/src/WebServer/JSON.cpp +++ b/src/src/WebServer/JSON.cpp @@ -4,10 +4,6 @@ #include "../WebServer/JSON.h" #include "../WebServer/Markup_Forms.h" -// TODO TD-er: Needed for write_NetworkAdapterFlags and write_IP_config -// Move to other file -#include "../WebServer/NetworkPage.h" - #include "../CustomBuild/CompiletimeDefines.h" #include "../DataStructs/TimingStats.h" @@ -27,6 +23,8 @@ #include "../Helpers/StringProvider.h" #include "../Helpers/StringGenerator_System.h" +#include "../../ESPEasy/net/Helpers/NW_info_writer.h" + #include "../../_Plugin_Helper.h" #include "../../ESPEasy-Globals.h" @@ -273,11 +271,11 @@ void handle_json() writer->write({ F("Network Index"), x + 1 }); #ifdef WEBSERVER_NETWORK # ifdef ESP32 - write_NetworkAdapterFlags(x, writer->createChild(F("Interface")).get()); - write_IP_config(x, writer->createChild(F("IP")).get()); + ESPEasy::net::write_NetworkAdapterFlags(x, writer->createChild(F("Interface")).get()); + ESPEasy::net::write_IP_config(x, writer->createChild(F("IP")).get()); # endif // ifdef ESP32 #endif // ifdef WEBSERVER_NETWORK - write_NetworkConnectionInfo(x, writer->createChild(F("Connection")).get()); + ESPEasy::net::write_NetworkConnectionInfo(x, writer->createChild(F("Connection")).get()); } if (x == 0) { diff --git a/src/src/WebServer/NetworkPage.cpp b/src/src/WebServer/NetworkPage.cpp index 9c8882115..704fb91b5 100644 --- a/src/src/WebServer/NetworkPage.cpp +++ b/src/src/WebServer/NetworkPage.cpp @@ -18,6 +18,7 @@ # include "../../ESPEasy/net/Globals/NWPlugins.h" # include "../../ESPEasy/net/Helpers/_NWPlugin_Helper_webform.h" # include "../../ESPEasy/net/Helpers/_NWPlugin_init.h" +# include "../../ESPEasy/net/Helpers/NW_info_writer.h" # include "../../ESPEasy/net/_NWPlugin_Helper.h" # ifdef ESP8266 @@ -242,8 +243,10 @@ void handle_networks_ShowAllNetworksTable() if (functions[i] == NWPlugin::Function::NWPLUGIN_WEBFORM_SHOW_CONNECTED) { NWPluginCall(NWPlugin::Function::NWPLUGIN_GET_CONNECTED_DURATION, &TempEvent); - if (!res) + + if (!res) { addEnabled(res); + } } } @@ -385,15 +388,15 @@ void handle_networks_NetworkSettingsPage(ESPEasy::net::networkIndex_t networkind { { KeyValueWriter_WebForm writer(F("Network Interface")); - write_NetworkAdapterFlags(networkindex, writer.createChild().get()); + ESPEasy::net::write_NetworkAdapterFlags(networkindex, writer.createChild().get()); } { KeyValueWriter_WebForm writer(F("IP Config")); - write_IP_config(networkindex, writer.createChild().get()); + ESPEasy::net::write_IP_config(networkindex, writer.createChild().get()); } { KeyValueWriter_WebForm writer(F("Connection Information")); - write_NetworkConnectionInfo(networkindex, writer.createChild().get()); + ESPEasy::net::write_NetworkConnectionInfo(networkindex, writer.createChild().get()); } } # endif // ifdef ESP32 @@ -410,122 +413,4 @@ void handle_networks_NetworkSettingsPage(ESPEasy::net::networkIndex_t networkind } -# ifdef ESP32 - -bool write_NetworkAdapterFlags(ESPEasy::net::networkIndex_t networkindex, KeyValueWriter*writer) -{ - if (writer == nullptr) { return false; } - struct EventStruct TempEvent; - TempEvent.kvWriter = writer; - - TempEvent.NetworkIndex = networkindex; - - String str; - - if (!NWPluginCall(NWPlugin::Function::NWPLUGIN_GET_INTERFACE, &TempEvent, str)) { - return false; - } - - { - String str; - const bool res = NWPluginCall(NWPlugin::Function::NWPLUGIN_WEBFORM_SHOW_HW_ADDRESS, &TempEvent, str); - } - - { - KeyValueStruct kv(F("Flags"), KeyValueStruct::Format::PreFormatted); - - const NWPlugin::NetforkFlags flags[] = { - NWPlugin::NetforkFlags::DHCP_client, - NWPlugin::NetforkFlags::DHCP_server, - NWPlugin::NetforkFlags::AutoUp, - NWPlugin::NetforkFlags::GratuituousArp, - NWPlugin::NetforkFlags::EventIPmodified, - NWPlugin::NetforkFlags::isPPP, - NWPlugin::NetforkFlags::isBridge, -# if CONFIG_LWIP_IPV6 - NWPlugin::NetforkFlags::MLD_v6_report, - NWPlugin::NetforkFlags::IPv6_autoconf_enabled, -# endif // if CONFIG_LWIP_IPV6 - }; - - for (size_t i = 0; i < NR_ELEMENTS(flags); ++i) { - if (NWPlugin::isFlagSet(flags[i], TempEvent.networkInterface)) { - String labels_str = NWPlugin::toString(flags[i]); - - if (flags[i] == NWPlugin::NetforkFlags::DHCP_client) { - if (TempEvent.networkInterface->getStatusBits() & ESP_NETIF_HAS_STATIC_IP_BIT) { - labels_str += F(" (static IP)"); - } - } - kv.appendValue(labels_str); - } - } - writer->write(kv); - } - return true; -} - -bool write_IP_config(ESPEasy::net::networkIndex_t networkindex, KeyValueWriter*writer) -{ - if (writer == nullptr) { return false; } - struct EventStruct TempEvent; - - TempEvent.NetworkIndex = networkindex; - String str; - - if (!NWPluginCall(NWPlugin::Function::NWPLUGIN_GET_INTERFACE, &TempEvent, str)) { - return false; - } - const NWPlugin::IP_type ip_types[] = { - NWPlugin::IP_type::inet, - NWPlugin::IP_type::network_id_cdr, - NWPlugin::IP_type::netmask, - NWPlugin::IP_type::broadcast, - NWPlugin::IP_type::gateway, - NWPlugin::IP_type::dns1, - NWPlugin::IP_type::dns2, -# if CONFIG_LWIP_IPV6 - NWPlugin::IP_type::ipv6_unknown, - NWPlugin::IP_type::ipv6_global, - NWPlugin::IP_type::ipv6_link_local, - NWPlugin::IP_type::ipv6_site_local, - NWPlugin::IP_type::ipv6_unique_local, - NWPlugin::IP_type::ipv4_mapped_ipv6, -# endif // if CONFIG_LWIP_IPV6 - - }; - - for (size_t i = 0; i < NR_ELEMENTS(ip_types); ++i) { - - PrintToString str; - - if (NWPlugin::print_IP_address(ip_types[i], TempEvent.networkInterface, str)) { - KeyValueStruct kv(NWPlugin::toString(ip_types[i]), str.get(), KeyValueStruct::Format::PreFormatted); - writer->write(kv); - } - } - return true; -} - -# endif // ifdef ESP32 - -bool write_NetworkConnectionInfo(ESPEasy::net::networkIndex_t networkindex, KeyValueWriter*writer) -{ - if (!writer) { return false; } - struct EventStruct TempEvent; - TempEvent.NetworkIndex = networkindex; - TempEvent.kvWriter = writer; - - const bool res = NWPluginCall(NWPlugin::Function::NWPLUGIN_WEBFORM_SHOW_CONNECTED, &TempEvent); - - if (res) { - NWPluginCall(NWPlugin::Function::NWPLUGIN_GET_CONNECTED_DURATION, &TempEvent); - -# if FEATURE_NETWORK_TRAFFIC_COUNT - NWPluginCall(NWPlugin::Function::NWPLUGIN_GET_TRAFFIC_COUNT, &TempEvent); -# endif // if FEATURE_NETWORK_TRAFFIC_COUNT - } - return res; -} - #endif // ifdef WEBSERVER_NETWORK diff --git a/src/src/WebServer/NetworkPage.h b/src/src/WebServer/NetworkPage.h index 1a496b069..6da6e2c3c 100644 --- a/src/src/WebServer/NetworkPage.h +++ b/src/src/WebServer/NetworkPage.h @@ -39,14 +39,6 @@ void handle_networks_ShowAllNetworksTable(); // ******************************************************************************** void handle_networks_NetworkSettingsPage(ESPEasy::net::networkIndex_t networkindex); -#ifdef ESP32 -bool write_NetworkAdapterFlags(ESPEasy::net::networkIndex_t networkindex, KeyValueWriter* writer); - -bool write_IP_config(ESPEasy::net::networkIndex_t networkindex, KeyValueWriter* writer); -#endif - -bool write_NetworkConnectionInfo(ESPEasy::net::networkIndex_t networkindex, KeyValueWriter* writer); - #endif // ifdef WEBSERVER_NETWORK #endif // ifndef WEBSERVER_WEBSERVER_NETWORKPAGE_H diff --git a/src/src/WebServer/SysInfoPage.cpp b/src/src/WebServer/SysInfoPage.cpp index 011bdeb04..ebd067e9f 100644 --- a/src/src/WebServer/SysInfoPage.cpp +++ b/src/src/WebServer/SysInfoPage.cpp @@ -8,6 +8,7 @@ # include "../../ESPEasy/net/Globals/ESPEasyWiFiEvent.h" # include "../../ESPEasy/net/Globals/NetworkState.h" # include "../../ESPEasy/net/Helpers/NWAccessControl.h" +# include "../../ESPEasy/net/Helpers/NW_info_writer.h" # include "../../ESPEasy/net/eth/ESPEasyEth.h" # include "../../ESPEasy/net/wifi/ESPEasyWifi.h" # include "../Commands/Diagnostic.h" @@ -527,15 +528,15 @@ void handle_sysinfo_Network() { if (pluginID != ESPEasy::net::INVALID_NW_PLUGIN_ID) { KeyValueWriter_WebForm writer( strformat(F("%s (%d)"), - getNWPluginNameFromNWPluginID(pluginID).c_str(), - x + 1 )); + getNWPluginNameFromNWPluginID(pluginID).c_str(), + x + 1)); # ifdef WEBSERVER_NETWORK # ifdef ESP32 - write_NetworkAdapterFlags(x, &writer); - write_IP_config(x, &writer); + ESPEasy::net::write_NetworkAdapterFlags(x, &writer); + ESPEasy::net::write_IP_config(x, &writer); # endif // ifdef ESP32 # endif // ifdef WEBSERVER_NETWORK - write_NetworkConnectionInfo(x, &writer); + ESPEasy::net::write_NetworkConnectionInfo(x, &writer); } } } From 0df6a161888c99e57732517fe957502c89c80aa4 Mon Sep 17 00:00:00 2001 From: TD-er Date: Mon, 6 Oct 2025 20:32:31 +0200 Subject: [PATCH 351/564] [Build] Set BUILD_NO_DEBUG for all NeoPixel builds to make builds fit --- src/src/CustomBuild/define_plugin_sets.h | 3 +++ 1 file changed, 3 insertions(+) diff --git a/src/src/CustomBuild/define_plugin_sets.h b/src/src/CustomBuild/define_plugin_sets.h index dd0974455..57e7ef2db 100644 --- a/src/src/CustomBuild/define_plugin_sets.h +++ b/src/src/CustomBuild/define_plugin_sets.h @@ -2257,6 +2257,9 @@ To create/register a plugin, you have to : #ifndef PLUGIN_DESCR #define PLUGIN_DESCR "NeoPixel" #endif + #ifndef BUILD_NO_DEBUG + #define BUILD_NO_DEBUG + #endif #if !defined(FEATURE_SD) && !defined(ESP8266) #define FEATURE_SD 1 #endif From 5a0158e6f107bb128c0d8cf702f41cc26dd6db35 Mon Sep 17 00:00:00 2001 From: TD-er Date: Mon, 6 Oct 2025 21:20:59 +0200 Subject: [PATCH 352/564] [Build] Fix failing max_ESP32c5_8M1M_LittleFS_ETH builds --- src/src/PluginStructs/P169_data_struct.cpp | 3 ++- src/src/WebServer/SysInfoPage.cpp | 28 ++++------------------ 2 files changed, 6 insertions(+), 25 deletions(-) diff --git a/src/src/PluginStructs/P169_data_struct.cpp b/src/src/PluginStructs/P169_data_struct.cpp index 9f29c7efb..a532c7480 100644 --- a/src/src/PluginStructs/P169_data_struct.cpp +++ b/src/src/PluginStructs/P169_data_struct.cpp @@ -248,7 +248,7 @@ bool P169_data_struct::plugin_init(struct EventStruct *event) calibrate(event); # ifdef ESP32 - +#ifndef BUILD_NO_DEBUG if (loglevelActiveFor(LOG_LEVEL_DEBUG)) { // Short test checking effect of nr samples during calibration @@ -284,6 +284,7 @@ bool P169_data_struct::plugin_init(struct EventStruct *event) addLogMove(LOG_LEVEL_DEBUG, log); } } +#endif # endif // ifdef ESP32 diff --git a/src/src/WebServer/SysInfoPage.cpp b/src/src/WebServer/SysInfoPage.cpp index ebd067e9f..771227af3 100644 --- a/src/src/WebServer/SysInfoPage.cpp +++ b/src/src/WebServer/SysInfoPage.cpp @@ -91,35 +91,15 @@ void handle_sysinfo_json() { if (writer) { writer->write({ F("free"), freeMem }); - writer->write({ F("low_ram"), # ifndef BUILD_NO_RAM_TRACKER - lowestRAM -# else // ifndef BUILD_NO_RAM_TRACKER - 0 + writer->write({ F("low_ram"), lowestRAM }); + writer->write({ F("low_ram_fn"), lowestRAMfunction }); # endif // ifndef BUILD_NO_RAM_TRACKER - }); - writer->write({ F("low_ram_fn"), -# ifndef BUILD_NO_RAM_TRACKER - lowestRAMfunction -# else // ifndef BUILD_NO_RAM_TRACKER - 0 -# endif // ifndef BUILD_NO_RAM_TRACKER - }); writer->write({ F("stack"), getCurrentFreeStack() }); - writer->write({ F("low_stack"), # ifndef BUILD_NO_RAM_TRACKER - lowestFreeStack -# else // ifndef BUILD_NO_RAM_TRACKER - 0 + writer->write({ F("low_stack"), lowestFreeStack }); + writer->write({ F("low_stack_fn"), lowestFreeStackfunction }); # endif // ifndef BUILD_NO_RAM_TRACKER - }); - writer->write({ F("low_stack_fn"), -# ifndef BUILD_NO_RAM_TRACKER - lowestFreeStackfunction -# else // ifndef BUILD_NO_RAM_TRACKER - 0 -# endif // ifndef BUILD_NO_RAM_TRACKER - }); } } { From 812e26d82cceaa8b2563c582dbb03851cda063a9 Mon Sep 17 00:00:00 2001 From: TD-er Date: Tue, 7 Oct 2025 12:49:33 +0200 Subject: [PATCH 353/564] [Cleanup] Reduce bin size & simplify ValueStruct --- src/ESPEasy/net/Helpers/NW_info_writer.cpp | 2 +- src/src/DataStructs/KeyValueStruct.cpp | 165 +++++++++++++++++ src/src/DataStructs/KeyValueStruct.h | 140 ++++++++++++++ src/src/DataStructs/ValueStruct.cpp | 116 ++++++++++++ src/src/DataStructs/ValueStruct.h | 134 ++++++++++++++ src/src/Helpers/KeyValueWriter.cpp | 182 ------------------- src/src/Helpers/KeyValueWriter.h | 173 +----------------- src/src/Helpers/KeyValueWriter_JSON.cpp | 18 +- src/src/Helpers/KeyValueWriter_JSON.h | 2 +- src/src/Helpers/ValueStruct_Factory.cpp | 63 +++++++ src/src/Helpers/ValueStruct_Factory.h | 49 +++++ src/src/WebServer/JSON.cpp | 2 +- src/src/WebServer/KeyValueWriter_WebForm.cpp | 12 +- src/src/WebServer/Markup.cpp | 2 +- 14 files changed, 690 insertions(+), 370 deletions(-) create mode 100644 src/src/DataStructs/KeyValueStruct.cpp create mode 100644 src/src/DataStructs/KeyValueStruct.h create mode 100644 src/src/DataStructs/ValueStruct.cpp create mode 100644 src/src/DataStructs/ValueStruct.h create mode 100644 src/src/Helpers/ValueStruct_Factory.cpp create mode 100644 src/src/Helpers/ValueStruct_Factory.h diff --git a/src/ESPEasy/net/Helpers/NW_info_writer.cpp b/src/ESPEasy/net/Helpers/NW_info_writer.cpp index 66eecd7c3..704d9ee2a 100644 --- a/src/ESPEasy/net/Helpers/NW_info_writer.cpp +++ b/src/ESPEasy/net/Helpers/NW_info_writer.cpp @@ -56,7 +56,7 @@ bool write_NetworkAdapterFlags(ESPEasy::net::networkIndex_t networkindex, KeyVal labels_str += F(" (static IP)"); } } - kv.appendValue(labels_str); + kv.appendValue(std::move(labels_str)); } } writer->write(kv); diff --git a/src/src/DataStructs/KeyValueStruct.cpp b/src/src/DataStructs/KeyValueStruct.cpp new file mode 100644 index 000000000..1bd4c9d02 --- /dev/null +++ b/src/src/DataStructs/KeyValueStruct.cpp @@ -0,0 +1,165 @@ +#include "../DataStructs/KeyValueStruct.h" + +#include "../Helpers/StringConverter_Numerical.h" + + +// ******************************************************************************** +// KeyValueStruct +// ******************************************************************************** + +KeyValueStruct::KeyValueStruct(const __FlashStringHelper *key, Format format) : _key(key), _format(format) {} + +KeyValueStruct::KeyValueStruct(const String& key, Format format) : _key(key), _format(format) {} + + +KeyValueStruct::KeyValueStruct(const String& key, + const bool & val, + Format format) + : _key(key), _format(format) { + _values.emplace_back(ValueStruct_Factory::create(val)); +} + +KeyValueStruct::KeyValueStruct(const String& key, + int val, + Format format) + : _key(key), _format(format) { + _values.emplace_back(ValueStruct_Factory::create(val)); +} + +#if defined(ESP32) && !defined(__riscv) +KeyValueStruct::KeyValueStruct(const String& key, + int32_t val, + Format format) + : _key(key), _format(format) { + _values.emplace_back(ValueStruct_Factory::create(val)); +} + +#endif // if defined(ESP32) && !defined(__riscv) +KeyValueStruct::KeyValueStruct(const String& key, + uint32_t val, + Format format) + : _key(key), _format(format) { + _values.emplace_back(ValueStruct_Factory::create(val)); +} + +#if defined(ESP32) && !defined(__riscv) +KeyValueStruct::KeyValueStruct(const String& key, + size_t val, + Format format) + : _key(key), _format(format) { + _values.emplace_back(ValueStruct_Factory::create(val)); +} + +#endif // if defined(ESP32) && !defined(__riscv) +KeyValueStruct::KeyValueStruct(const String & key, + const uint64_t& val, + Format format) + : _key(key), _format(format) { + _values.emplace_back(ValueStruct_Factory::create(val)); +} + +KeyValueStruct::KeyValueStruct(const String & key, + const int64_t& val, + Format format) + : _key(key), _format(format) { + _values.emplace_back(ValueStruct_Factory::create(val)); +} + +KeyValueStruct::KeyValueStruct(const String& key, + const float & val, + int nrDecimals, + Format format) + : _key(key), _format(format) { + _values.emplace_back(ValueStruct_Factory::create(val, nrDecimals)); +} + +KeyValueStruct::KeyValueStruct(const String& key, + const double& val, + int nrDecimals, + Format format) + : _key(key), _format(format) { + _values.emplace_back(ValueStruct_Factory::create(val, nrDecimals)); +} + +KeyValueStruct::KeyValueStruct(const __FlashStringHelper *key, + const String & val, + Format format, + ValueStruct::ValueType vType) + : _key(key), _format(format) { + _values.emplace_back(ValueStruct_Factory::create(val, vType)); +} + +KeyValueStruct::KeyValueStruct(const String & key, + const __FlashStringHelper *val, + Format format, + ValueStruct::ValueType vType) + : _key(key), _format(format) { + _values.emplace_back(ValueStruct_Factory::create(val, vType)); +} + +KeyValueStruct::KeyValueStruct(const __FlashStringHelper *key, + const __FlashStringHelper *val, + Format format, + ValueStruct::ValueType vType) + : _key(key), _format(format) { + _values.emplace_back(ValueStruct_Factory::create(val, vType)); +} + +KeyValueStruct::KeyValueStruct(const __FlashStringHelper *key, + const char *val, + Format format, + ValueStruct::ValueType vType) + : _key(key), _format(format) { + _values.emplace_back(ValueStruct_Factory::create(String(val), vType)); +} + +KeyValueStruct::KeyValueStruct(const String & key, + const String & val, + Format format, + ValueStruct::ValueType vType) + : _key(key), _format(format) { + _values.emplace_back(ValueStruct_Factory::create(val, vType)); +} + +KeyValueStruct::KeyValueStruct(const __FlashStringHelper *key, + String && val, + Format format, + ValueStruct::ValueType vType) + : _key(key), _format(format) { + _values.emplace_back(ValueStruct_Factory::create(std::move(val), vType)); +} + +KeyValueStruct::KeyValueStruct(const String & key, + String && val, + Format format, + ValueStruct::ValueType vType) + : _key(key), _format(format) { + _values.emplace_back(ValueStruct_Factory::create(std::move(val), vType)); +} + +KeyValueStruct::KeyValueStruct(LabelType::Enum label, Format format) + : _key(getLabel(label)), _unit(getFormUnit(label)), _format(format) { + _values.emplace_back(ValueStruct_Factory::create(label)); +} + +void KeyValueStruct::setUnit(const String& unit) { _unit = unit; } + +void KeyValueStruct::setUnit(const __FlashStringHelper *unit) { _unit = unit; } + +void KeyValueStruct::appendValue(Sp_ValueStruct value) +{ + _values.emplace_back(value); + _isArray = true; +} + +void KeyValueStruct::appendValue(const String& value) +{ + _values.emplace_back(ValueStruct_Factory::create(value)); + _isArray = true; +} + +void KeyValueStruct::appendValue(String&& value) +{ + _values.emplace_back(ValueStruct_Factory::create(value)); + _isArray = true; +} diff --git a/src/src/DataStructs/KeyValueStruct.h b/src/src/DataStructs/KeyValueStruct.h new file mode 100644 index 000000000..49fad7cad --- /dev/null +++ b/src/src/DataStructs/KeyValueStruct.h @@ -0,0 +1,140 @@ +#pragma once + +#include "../DataStructs/ValueStruct.h" + +#include "../Helpers/StringProvider.h" +#include "../Helpers/ValueStruct_Factory.h" + +#include + +// ******************************************************************************** +// KeyValueStruct +// ******************************************************************************** +struct KeyValueStruct +{ + enum class Format { + Default, + PreFormatted, + Note + + }; + + + KeyValueStruct(Format format = Format::Default) : _format(format) {} + + KeyValueStruct(const __FlashStringHelper *key, + Format format = Format::Default); + KeyValueStruct(const String& key, + Format format = Format::Default); + + KeyValueStruct(const String & key, + const bool & val, + Format format = Format::Default); + + KeyValueStruct(const String & key, + int val, + Format format = Format::Default); +#if defined(ESP32) && !defined(__riscv) + KeyValueStruct(const String & key, + int32_t val, + Format format = Format::Default); +#endif + KeyValueStruct(const String & key, + uint32_t val, + Format format = Format::Default); +#if defined(ESP32) && !defined(__riscv) + KeyValueStruct(const String & key, + size_t val, + Format format = Format::Default); +#endif + KeyValueStruct(const String & key, + const uint64_t & val, + Format format = Format::Default); + + KeyValueStruct(const String & key, + const int64_t & val, + Format format = Format::Default); + + + KeyValueStruct(const String & key, + const float & val, + int nrDecimals = 4, + Format format = Format::Default); + + KeyValueStruct(const String & key, + const double & val, + int nrDecimals = 4, + Format format = Format::Default); + + + KeyValueStruct(const __FlashStringHelper *key, + const String & val, + Format format = Format::Default, + ValueStruct::ValueType vType = ValueStruct::ValueType::Auto); + + KeyValueStruct(const String & key, + const __FlashStringHelper *val, + Format format = Format::Default, + ValueStruct::ValueType vType = ValueStruct::ValueType::Auto); + + KeyValueStruct(const __FlashStringHelper *key, + const __FlashStringHelper *val, + Format format = Format::Default, + ValueStruct::ValueType vType = ValueStruct::ValueType::Auto); + + KeyValueStruct(const __FlashStringHelper *key, + const char *val, + Format format = Format::Default, + ValueStruct::ValueType vType = ValueStruct::ValueType::Auto); + + KeyValueStruct(const String & key, + const String & val, + Format format = Format::Default, + ValueStruct::ValueType vType = ValueStruct::ValueType::Auto); + + KeyValueStruct(const __FlashStringHelper *key, + String && val, + Format format = Format::Default, + ValueStruct::ValueType vType = ValueStruct::ValueType::Auto); + + + KeyValueStruct(const String & key, + String && val, + Format format = Format::Default, + ValueStruct::ValueType vType = ValueStruct::ValueType::Auto); + + /* + // TD-er: Do not use template types as it may 'explode' in binary size. + // For example "foo" and "test" will result in 2 compiled instances + // as they are const char[3] and const char[4] respectively. + template + KeyValueStruct(const String & key, + const T & val, + Format format = Format::Default, + ValueStruct::ValueType vType = ValueStruct::ValueType::Auto) + : _key(key), _format(format) { + _values.emplace_back(String(val), vType); + } + */ + KeyValueStruct(LabelType::Enum label, + Format format = Format::Default); + + void setUnit(const String& unit); + void setUnit(const __FlashStringHelper *unit); + + void appendValue(Sp_ValueStruct value); + void appendValue(const String& value); + void appendValue(String&& value); + + + String _key; + String _id; + String _unit; + + std::vector_values; + + Format _format = Format::Default; + + bool _isArray{}; + +}; \ No newline at end of file diff --git a/src/src/DataStructs/ValueStruct.cpp b/src/src/DataStructs/ValueStruct.cpp new file mode 100644 index 000000000..6a76bd5c6 --- /dev/null +++ b/src/src/DataStructs/ValueStruct.cpp @@ -0,0 +1,116 @@ +#include "../DataStructs/ValueStruct.h" + +#include "../Helpers/PrintToString.h" +#include "../Helpers/StringConverter_Numerical.h" + +// ******************************************************************************** +// ValueStruct +// ******************************************************************************** +String ValueStruct::toString() const +{ + PrintToString p; + + print(p); + String res(p.getMove()); + return res; +} + +String ValueStruct::toString(ValueType& valueType) const +{ + valueType = _valueType; + return toString(); +} + +// ******************************************************************************** +// ValueStruct_String +// ******************************************************************************** + +ValueStruct_String::~ValueStruct_String() {} + +ValueStruct_String::ValueStruct_String(const String& val, ValueType vType) + : ValueStruct(vType), _val(val) {} + +ValueStruct_String::ValueStruct_String(String&& val, ValueType vType) + : ValueStruct(vType), _val(std::move(val)) {} + +size_t ValueStruct_String::print(Print& out) const +{ + return out.print(_val); +} + +// ******************************************************************************** +// ValueStruct_FlashString +// ******************************************************************************** + +ValueStruct_FlashString::~ValueStruct_FlashString() {} + +ValueStruct_FlashString::ValueStruct_FlashString(const __FlashStringHelper *val, ValueType vType) + : ValueStruct(vType), _val(val) {} + +size_t ValueStruct_FlashString::print(Print& out) const +{ + return out.print(_val); +} + +// ******************************************************************************** +// ValueStruct_Double +// ******************************************************************************** + +ValueStruct_Double::~ValueStruct_Double() {} + +ValueStruct_Double::ValueStruct_Double( + double val, + uint32_t nrDecimals, + bool trimTrailingZeros) + : ValueStruct(ValueType::Double), _val(val), _nrDecimals(nrDecimals), _trimTrailingZeros(trimTrailingZeros) {} + +size_t ValueStruct_Double::print(Print& out) const +{ + return out.print(doubleToString(_val, _nrDecimals, _trimTrailingZeros)); +} + +String ValueStruct_Double::toString(ValueType& valueType) const +{ + String res; + + valueType = _valueType; + + if (!doubleToValidString(res, _val, _nrDecimals, _trimTrailingZeros)) { + valueType = ValueType::String; + } + + return res; +} + +// ******************************************************************************** +// ValueStruct_Float +// ******************************************************************************** + +ValueStruct_Float::~ValueStruct_Float() {} + +ValueStruct_Float::ValueStruct_Float( + float val, + uint32_t nrDecimals, + bool trimTrailingZeros) + : ValueStruct(ValueType::Float), _val(val), _nrDecimals(nrDecimals), _trimTrailingZeros(trimTrailingZeros) {} + +size_t ValueStruct_Float::print(Print& out) const +{ + String res; + + toValidString(res, _val, _nrDecimals, _trimTrailingZeros); + return out.print(res); +} + +String ValueStruct_Float::toString(ValueType& valueType) const +{ + String res; + + valueType = _valueType; + + if (!toValidString(res, _val, _nrDecimals, _trimTrailingZeros)) { + valueType = ValueType::String; + } + + return res; +} diff --git a/src/src/DataStructs/ValueStruct.h b/src/src/DataStructs/ValueStruct.h new file mode 100644 index 000000000..5cba9e545 --- /dev/null +++ b/src/src/DataStructs/ValueStruct.h @@ -0,0 +1,134 @@ +#pragma once + +#include +#include + +#include + +// ******************************************************************************** +// ValueStruct +// ******************************************************************************** +class ValueStruct +{ +public: + + enum class ValueType { + Auto, + String, + Float, + Double, + Int, + Bool + + }; + + ValueStruct(ValueType valueType = ValueType::Auto) : _valueType(valueType) {} + + virtual ~ValueStruct() {} + + virtual size_t print(Print& out) const = 0; + + virtual String toString() const; + + virtual String toString(ValueType& valueType) const; + +protected: + const ValueType _valueType; + +}; // class ValueStruct + +typedef std::shared_ptr Sp_ValueStruct; + + +// ******************************************************************************** +// Derived types from ValueStruct +// ******************************************************************************** + +class ValueStruct_String : public ValueStruct +{ +public: + + virtual ~ValueStruct_String(); + + ValueStruct_String(const String& val, + ValueType vType = ValueType::String); + ValueStruct_String(String && val, + ValueType vType = ValueType::String); + + virtual size_t print(Print& out) const; + + String _val; +}; // class ValueStruct_String + + +class ValueStruct_FlashString : public ValueStruct +{ +public: + + virtual ~ValueStruct_FlashString(); + + ValueStruct_FlashString(const __FlashStringHelper *val, + ValueType vType = ValueType::String); + + virtual size_t print(Print& out) const; + + const __FlashStringHelper *_val; +}; // class ValueStruct_FlashString + +class ValueStruct_Double : public ValueStruct +{ +public: + + virtual ~ValueStruct_Double(); + + ValueStruct_Double(double val, + uint32_t nrDecimals = 2, + bool trimTrailingZeros = false); + + virtual size_t print(Print& out) const; + + virtual String toString(ValueType& valueType) const override; + + double _val{}; + uint32_t _nrDecimals = 2; + bool _trimTrailingZeros{}; +}; + +class ValueStruct_Float : public ValueStruct +{ +public: + + virtual ~ValueStruct_Float(); + + ValueStruct_Float(float val, + uint32_t nrDecimals = 2, + bool trimTrailingZeros = false); + + virtual size_t print(Print& out) const; + + virtual String toString(ValueType& valueType) const override; + + float _val{}; + uint32_t _nrDecimals = 2; + bool _trimTrailingZeros{}; +}; + + +template +class ValueStruct_T : public ValueStruct +{ +public: + + virtual ~ValueStruct_T() {} + + ValueStruct_T(T val, + ValueType vType) + : ValueStruct(vType), _val(val) {} + + virtual size_t print(Print& out) const + { + return out.print(_val); + } + + const T _val; +}; // class ValueStruct_T diff --git a/src/src/Helpers/KeyValueWriter.cpp b/src/src/Helpers/KeyValueWriter.cpp index 3e644f599..ce00943eb 100644 --- a/src/src/Helpers/KeyValueWriter.cpp +++ b/src/src/Helpers/KeyValueWriter.cpp @@ -1,189 +1,7 @@ #include "../Helpers/KeyValueWriter.h" -#include "../Helpers/StringConverter_Numerical.h" - -// ******************************************************************************** -// ValueStruct -// ******************************************************************************** - -ValueStruct::ValueStruct(const String& val, ValueType vType) : str(val), valueType(vType) {} - -ValueStruct::ValueStruct(const __FlashStringHelper *val, ValueType vType) : str(val), valueType(vType) {} - -ValueStruct::ValueStruct(String&& val, ValueType vType) : str(std::move(val)), valueType(vType) {} -// ******************************************************************************** -// KeyValueStruct -// ******************************************************************************** - -KeyValueStruct::KeyValueStruct(const __FlashStringHelper *key, Format format) : _key(key), _format(format) {} - -KeyValueStruct::KeyValueStruct(const String& key, Format format) : _key(key), _format(format) {} - - -KeyValueStruct::KeyValueStruct(const String & key, - const bool & val, - Format format, - ValueStruct::ValueType vType) - : _key(key), _format(format) { - _values.emplace_back(String(val), vType); -} - -KeyValueStruct::KeyValueStruct(const String & key, - int val, - Format format, - ValueStruct::ValueType vType) - : _key(key), _format(format) { - _values.emplace_back(String(val), vType); -} -#if defined(ESP32) && !defined(__riscv) -KeyValueStruct::KeyValueStruct(const String & key, - int32_t val, - Format format, - ValueStruct::ValueType vType) - : _key(key), _format(format) { - _values.emplace_back(String(val), vType); -} -#endif -KeyValueStruct::KeyValueStruct(const String & key, - uint32_t val, - Format format, - ValueStruct::ValueType vType) - : _key(key), _format(format) { - _values.emplace_back(String(val), vType); -} -#if defined(ESP32) && !defined(__riscv) -KeyValueStruct::KeyValueStruct(const String & key, - size_t val, - Format format, - ValueStruct::ValueType vType) - : _key(key), _format(format) { - _values.emplace_back(String(val), vType); -} -#endif -KeyValueStruct::KeyValueStruct(const String & key, - const uint64_t & val, - Format format, - ValueStruct::ValueType vType) - : _key(key), _format(format) { - _values.emplace_back(ull2String(val), vType); -} - -KeyValueStruct::KeyValueStruct(const String & key, - const int64_t & val, - Format format, - ValueStruct::ValueType vType) - : _key(key), _format(format) { - _values.emplace_back(ll2String(val), vType); -} - -KeyValueStruct::KeyValueStruct(const String & key, - const float & val, - int nrDecimals, - Format format, - ValueStruct::ValueType vType) - : _key(key), _format(format) { - String str; - - if (!toValidString(str, val, nrDecimals)) { - vType = ValueStruct::ValueType::String; - } - - _values.emplace_back(str, vType); -} - -KeyValueStruct::KeyValueStruct(const String & key, - const double & val, - int nrDecimals, - Format format, - ValueStruct::ValueType vType) - : _key(key), _format(format) { - String str; - - if (!doubleToValidString(str, val, nrDecimals)) { - vType = ValueStruct::ValueType::String; - } - - _values.emplace_back(str, vType); -} - -KeyValueStruct::KeyValueStruct(const __FlashStringHelper *key, - const String & val, - Format format, - ValueStruct::ValueType vType) - : _key(key), _format(format) { - _values.emplace_back(val, vType); -} - -KeyValueStruct::KeyValueStruct(const String & key, - const __FlashStringHelper *val, - Format format, - ValueStruct::ValueType vType) - : _key(key), _format(format) { - _values.emplace_back(val, vType); -} - -KeyValueStruct::KeyValueStruct(const __FlashStringHelper *key, - const __FlashStringHelper *val, - Format format, - ValueStruct::ValueType vType) - : _key(key), _format(format) { - _values.emplace_back(val, vType); -} - -KeyValueStruct::KeyValueStruct(const __FlashStringHelper *key, - const char *val, - Format format, - ValueStruct::ValueType vType) - : _key(key), _format(format) { - _values.emplace_back(String(val), vType); -} - -KeyValueStruct::KeyValueStruct(const String & key, - const String & val, - Format format, - ValueStruct::ValueType vType) - : _key(key), _format(format) { - _values.emplace_back(val, vType); -} - -KeyValueStruct::KeyValueStruct(const __FlashStringHelper *key, - String && val, - Format format, - ValueStruct::ValueType vType) - : _key(key), _format(format) { - _values.emplace_back(std::move(val), vType); -} - -KeyValueStruct::KeyValueStruct(const String & key, - String && val, - Format format, - ValueStruct::ValueType vType) - : _key(key), _format(format) { - _values.emplace_back(std::move(val), vType); -} - -KeyValueStruct::KeyValueStruct(LabelType::Enum label, Format format) - : _key(getLabel(label)), _unit(getFormUnit(label)), _format(format) { - _values.emplace_back(getValue(label)); -} - -void KeyValueStruct::setUnit(const String& unit) { _unit = unit; } - -void KeyValueStruct::setUnit(const __FlashStringHelper *unit) { _unit = unit; } - -void KeyValueStruct::appendValue(const ValueStruct& value) -{ - _values.emplace_back(std::move(value)); - _isArray = true; -} - -void KeyValueStruct::appendValue(ValueStruct&& value) -{ - _values.emplace_back(std::move(value)); - _isArray = true; -} // ******************************************************************************** // KeyValueWriter diff --git a/src/src/Helpers/KeyValueWriter.h b/src/src/Helpers/KeyValueWriter.h index 5886e30f9..e0632d4ce 100644 --- a/src/src/Helpers/KeyValueWriter.h +++ b/src/src/Helpers/KeyValueWriter.h @@ -2,185 +2,14 @@ #include "../../ESPEasy_common.h" +#include "../DataStructs/KeyValueStruct.h" #include "../Helpers/PrintToString.h" -#include "../Helpers/StringProvider.h" - #include "../WebServer/HTML_Print.h" -#include #include -// ******************************************************************************** -// ValueStruct -// ******************************************************************************** -struct ValueStruct -{ - enum class ValueType { - Auto, - String, - Float, - Double, - Int, - Bool - - }; - ValueStruct() {} - - ValueStruct(const String& val, - ValueType vType = ValueType::Auto); - ValueStruct(const __FlashStringHelper *val, - ValueType vType = ValueType::Auto); - ValueStruct(String && val, - ValueType vType = ValueType::Auto); - - - String str; - ValueType valueType = ValueType::Auto; - -}; - -// ******************************************************************************** -// KeyValueStruct -// ******************************************************************************** -struct KeyValueStruct -{ - enum class Format { - Default, - PreFormatted, - Note - - }; - - - KeyValueStruct(Format format = Format::Default) : _format(format) {} - - KeyValueStruct(const __FlashStringHelper *key, - Format format = Format::Default); - KeyValueStruct(const String& key, - Format format = Format::Default); - - KeyValueStruct(const String & key, - const bool & val, - Format format = Format::Default, - ValueStruct::ValueType vType = ValueStruct::ValueType::Bool); - - KeyValueStruct(const String & key, - int val, - Format format = Format::Default, - ValueStruct::ValueType vType = ValueStruct::ValueType::Int); -#if defined(ESP32) && !defined(__riscv) - KeyValueStruct(const String & key, - int32_t val, - Format format = Format::Default, - ValueStruct::ValueType vType = ValueStruct::ValueType::Int); -#endif - KeyValueStruct(const String & key, - uint32_t val, - Format format = Format::Default, - ValueStruct::ValueType vType = ValueStruct::ValueType::Int); -#if defined(ESP32) && !defined(__riscv) - KeyValueStruct(const String & key, - size_t val, - Format format = Format::Default, - ValueStruct::ValueType vType = ValueStruct::ValueType::Int); -#endif - KeyValueStruct(const String & key, - const uint64_t & val, - Format format = Format::Default, - ValueStruct::ValueType vType = ValueStruct::ValueType::Int); - - KeyValueStruct(const String & key, - const int64_t & val, - Format format = Format::Default, - ValueStruct::ValueType vType = ValueStruct::ValueType::Int); - - - KeyValueStruct(const String & key, - const float & val, - int nrDecimals = 4, - Format format = Format::Default, - ValueStruct::ValueType vType = ValueStruct::ValueType::Float); - - KeyValueStruct(const String & key, - const double & val, - int nrDecimals = 4, - Format format = Format::Default, - ValueStruct::ValueType vType = ValueStruct::ValueType::Double); - - - KeyValueStruct(const __FlashStringHelper *key, - const String & val, - Format format = Format::Default, - ValueStruct::ValueType vType = ValueStruct::ValueType::Auto); - - KeyValueStruct(const String & key, - const __FlashStringHelper *val, - Format format = Format::Default, - ValueStruct::ValueType vType = ValueStruct::ValueType::Auto); - - KeyValueStruct(const __FlashStringHelper *key, - const __FlashStringHelper *val, - Format format = Format::Default, - ValueStruct::ValueType vType = ValueStruct::ValueType::Auto); - - KeyValueStruct(const __FlashStringHelper *key, - const char *val, - Format format = Format::Default, - ValueStruct::ValueType vType = ValueStruct::ValueType::Auto); - - KeyValueStruct(const String & key, - const String & val, - Format format = Format::Default, - ValueStruct::ValueType vType = ValueStruct::ValueType::Auto); - - KeyValueStruct(const __FlashStringHelper *key, - String && val, - Format format = Format::Default, - ValueStruct::ValueType vType = ValueStruct::ValueType::Auto); - - - KeyValueStruct(const String & key, - String && val, - Format format = Format::Default, - ValueStruct::ValueType vType = ValueStruct::ValueType::Auto); - - /* - // TD-er: Do not use template types as it may 'explode' in binary size. - // For example "foo" and "test" will result in 2 compiled instances - // as they are const char[3] and const char[4] respectively. - template - KeyValueStruct(const String & key, - const T & val, - Format format = Format::Default, - ValueStruct::ValueType vType = ValueStruct::ValueType::Auto) - : _key(key), _format(format) { - _values.emplace_back(String(val), vType); - } - */ - KeyValueStruct(LabelType::Enum label, - Format format = Format::Default); - - void setUnit(const String& unit); - void setUnit(const __FlashStringHelper *unit); - - void appendValue(const ValueStruct& value); - - void appendValue(ValueStruct&& value); - - - String _key; - String _id; - String _unit; - - std::vector_values; - - Format _format = Format::Default; - - bool _isArray{}; - -}; class KeyValueWriter; diff --git a/src/src/Helpers/KeyValueWriter_JSON.cpp b/src/src/Helpers/KeyValueWriter_JSON.cpp index 395cfc980..52fd443ae 100644 --- a/src/src/Helpers/KeyValueWriter_JSON.cpp +++ b/src/src/Helpers/KeyValueWriter_JSON.cpp @@ -103,7 +103,7 @@ void KeyValueWriter_JSON::write(const KeyValueStruct& kv) pr.write('"'); } else { - writeValue(kv._values[0]); + writeValue(kv._values[0].get()); } } else { // Multiple values, so we must wrap it in [] @@ -124,27 +124,31 @@ void KeyValueWriter_JSON::write(const KeyValueStruct& kv) pr.write('\t'); #endif // ifdef USE_KVW_JSON_INDENT - writeValue(kv._values[i]); + writeValue(kv._values[i].get()); } getPrint().write(']'); } } -void KeyValueWriter_JSON::writeValue(const ValueStruct& val) +void KeyValueWriter_JSON::writeValue(const ValueStruct* val) { + if (val == nullptr) return; auto& pr = getPrint(); - switch (val.valueType) + ValueStruct::ValueType valueType(ValueStruct::ValueType::Auto); + String str = val->toString(valueType); + + switch (valueType) { case ValueStruct::ValueType::Float: case ValueStruct::ValueType::Double: case ValueStruct::ValueType::Int: - pr.print(val.str); + pr.print(str); return; case ValueStruct::ValueType::Bool: if (!Settings.JSONBoolWithoutQuotes()) { pr.write('"'); } - pr.print(val.str.equals("0") ? F("false") : F("true")); + pr.print(str.equals("0") ? F("false") : F("true")); if (!Settings.JSONBoolWithoutQuotes()) { pr.write('"'); } return; @@ -153,7 +157,7 @@ void KeyValueWriter_JSON::writeValue(const ValueStruct& val) case ValueStruct::ValueType::String: break; } - pr.print(to_json_value(val.str)); + pr.print(to_json_value(str)); } Sp_KeyValueWriter KeyValueWriter_JSON::createChild() { return std::make_shared(this, _toString); } diff --git a/src/src/Helpers/KeyValueWriter_JSON.h b/src/src/Helpers/KeyValueWriter_JSON.h index c5cf4b0b1..5a5cab204 100644 --- a/src/src/Helpers/KeyValueWriter_JSON.h +++ b/src/src/Helpers/KeyValueWriter_JSON.h @@ -71,7 +71,7 @@ public: private: - void writeValue(const ValueStruct& value); + void writeValue(const ValueStruct* value); #ifdef USE_KVW_JSON_INDENT diff --git a/src/src/Helpers/ValueStruct_Factory.cpp b/src/src/Helpers/ValueStruct_Factory.cpp new file mode 100644 index 000000000..6485b8bea --- /dev/null +++ b/src/src/Helpers/ValueStruct_Factory.cpp @@ -0,0 +1,63 @@ +#include "../Helpers/ValueStruct_Factory.h" + +Sp_ValueStruct ValueStruct_Factory::create(const bool& val) +{ + return std::make_shared >(val, ValueStruct::ValueType::Bool); +} + +Sp_ValueStruct ValueStruct_Factory::create(int val) { return std::make_shared >(val, ValueStruct::ValueType::Int); } + +#if defined(ESP32) && !defined(__riscv) + +Sp_ValueStruct ValueStruct_Factory::create(int32_t val) +{ + return std::make_shared >(val, ValueStruct::ValueType::Int); +} + +#endif // if defined(ESP32) && !defined(__riscv) + +Sp_ValueStruct ValueStruct_Factory::create(uint32_t val) +{ + return std::make_shared >(val, ValueStruct::ValueType::Int); +} + +#if defined(ESP32) && !defined(__riscv) + +Sp_ValueStruct ValueStruct_Factory::create(size_t val) { return std::make_shared >(val, ValueStruct::ValueType::Int); } + +#endif // if defined(ESP32) && !defined(__riscv) + +Sp_ValueStruct ValueStruct_Factory::create(const uint64_t& val) +{ + return std::make_shared >(val, ValueStruct::ValueType::Int); +} + +Sp_ValueStruct ValueStruct_Factory::create(const int64_t& val) +{ + return std::make_shared >(val, ValueStruct::ValueType::Int); +} + +Sp_ValueStruct ValueStruct_Factory::create( + const float& val, + int nrDecimals, + bool trimTrailingZeros) { return std::make_shared(val, nrDecimals, trimTrailingZeros); } + +Sp_ValueStruct ValueStruct_Factory::create( + const double& val, + int nrDecimals, + bool trimTrailingZeros) { return std::make_shared(val, nrDecimals, trimTrailingZeros); } + +Sp_ValueStruct ValueStruct_Factory::create( + LabelType::Enum label) { return std::make_shared(getValue(label), ValueStruct::ValueType::Auto); } + +Sp_ValueStruct ValueStruct_Factory::create( + const String & val, + ValueStruct::ValueType vType) { return std::make_shared(val, vType); } + +Sp_ValueStruct ValueStruct_Factory::create( + String && val, + ValueStruct::ValueType vType) { return std::make_shared(std::move(val), vType); } + +Sp_ValueStruct ValueStruct_Factory::create( + const __FlashStringHelper *val, + ValueStruct::ValueType vType) { return std::make_shared(val, vType); } diff --git a/src/src/Helpers/ValueStruct_Factory.h b/src/src/Helpers/ValueStruct_Factory.h new file mode 100644 index 000000000..8e4f3681c --- /dev/null +++ b/src/src/Helpers/ValueStruct_Factory.h @@ -0,0 +1,49 @@ +#pragma once + +#include "../DataStructs/ValueStruct.h" +#include "../Helpers/StringProvider.h" + +class ValueStruct_Factory +{ +public: + + static Sp_ValueStruct create(const bool& val); + + static Sp_ValueStruct create(int val); +#if defined(ESP32) && !defined(__riscv) + static Sp_ValueStruct create(int32_t val); +#endif + static Sp_ValueStruct create(uint32_t val); +#if defined(ESP32) && !defined(__riscv) + static Sp_ValueStruct create(size_t val); +#endif + static Sp_ValueStruct create(const uint64_t& val); + + static Sp_ValueStruct create(const int64_t& val); + + + static Sp_ValueStruct create(const float& val, + int nrDecimals = 4, + bool trimTrailingZeros = false); + + static Sp_ValueStruct create(const double& val, + int nrDecimals = 4, + bool trimTrailingZeros = false); + + static Sp_ValueStruct create( + LabelType::Enum label); + + static Sp_ValueStruct create( + const String & val, + ValueStruct::ValueType vType = ValueStruct::ValueType::String); + + static Sp_ValueStruct create( + String && val, + ValueStruct::ValueType vType = ValueStruct::ValueType::String); + + static Sp_ValueStruct create( + const __FlashStringHelper *val, + ValueStruct::ValueType vType = ValueStruct::ValueType::String); + + +}; // class ValueStruct_Factory diff --git a/src/src/WebServer/JSON.cpp b/src/src/WebServer/JSON.cpp index bc52888ab..b8df1b0ed 100644 --- a/src/src/WebServer/JSON.cpp +++ b/src/src/WebServer/JSON.cpp @@ -632,7 +632,7 @@ void handle_json() for (uint8_t c = 0; c < I2CMultiplexerMaxChannels(i2cBus); ++c) { if (bitRead(channel, c)) { - kv.appendValue(strformat(F("Multiplexer channel %d"), c)); + kv.appendValue(concat(F("Multiplexer channel "), c)); } } taskWriter->write(kv); diff --git a/src/src/WebServer/KeyValueWriter_WebForm.cpp b/src/src/WebServer/KeyValueWriter_WebForm.cpp index b50c103a7..0d0d6a285 100644 --- a/src/src/WebServer/KeyValueWriter_WebForm.cpp +++ b/src/src/WebServer/KeyValueWriter_WebForm.cpp @@ -97,14 +97,16 @@ void KeyValueWriter_WebForm::write(const KeyValueStruct& kv) } } - if (!plain_text && (kv._values[i].str.indexOf('\n') != -1)) + if (kv._values[i]) { + + String str(kv._values[i]->toString()); + + if (!plain_text && (str.indexOf('\n') != -1)) { - String str = kv._values[i].str; str.replace(F("\n"), F("
    ")); - getPrint().print(str); - } else { - getPrint().print(kv._values[i].str); } + getPrint().print(str); + } } // May need to include the unit before ending diff --git a/src/src/WebServer/Markup.cpp b/src/src/WebServer/Markup.cpp index 3c4815985..96b699e0a 100644 --- a/src/src/WebServer/Markup.cpp +++ b/src/src/WebServer/Markup.cpp @@ -1015,7 +1015,7 @@ void addRTDNetworkDriverButton(ESPEasy::net::nwpluginID_t nwpluginID) { addRTDHelpButton( strformat( - F("NetworkDriver/%s.html"), + F("Network/%s.html"), nwpluginID.toDisplayString().c_str())); } # endif // ifndef LIMIT_BUILD_SIZE From fd2de92cc623d9d56881b910bb4c09f3751c59e9 Mon Sep 17 00:00:00 2001 From: TD-er Date: Tue, 7 Oct 2025 12:50:50 +0200 Subject: [PATCH 354/564] [ESP-IDF] Update to latest Arduino/ESP-IDF --- platformio_core_defs.ini | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/platformio_core_defs.ini b/platformio_core_defs.ini index 1daa1eca6..f8b7cadd8 100644 --- a/platformio_core_defs.ini +++ b/platformio_core_defs.ini @@ -165,7 +165,7 @@ extra_scripts = ${esp82xx_common.extra_scripts} ; ESP_IDF 5.5.0 [core_esp32_IDF5_5_0__3_2_0_LittleFS] platform = https://github.com/Jason2866/platform-espressif32.git#Arduino/IDF55_gcc15 -platform_packages = framework-arduinoespressif32 @ https://github.com/Jason2866/esp32-arduino-lib-builder/releases/download/1809-0958-5.5/framework-arduinoespressif32-release_v5.5-b24d7e0b.tar.xz +platform_packages = framework-arduinoespressif32 @ https://github.com/Jason2866/esp32-arduino-lib-builder/releases/download/0410-1232-5.5/framework-arduinoespressif32-release_v5.5-2f303469.tar.xz build_flags = -DESP32_STAGE -DESP_IDF_VERSION_MAJOR=5 -DLIBRARIES_NO_LOG=1 From b48600c42ae0b88f7d8d5220002c12b0d8863c1f Mon Sep 17 00:00:00 2001 From: Ton Huisman Date: Wed, 8 Oct 2025 23:35:09 +0200 Subject: [PATCH 355/564] [Docs] Add MQTT Device class documentation for plugins where available --- docs/source/Plugin/DeviceClass_binary.repl | 12 ++++++++++++ docs/source/Plugin/P001.rst | 5 ++++- docs/source/Plugin/P009.rst | 2 ++ docs/source/Plugin/P019.rst | 2 ++ docs/source/Plugin/P021.rst | 2 ++ docs/source/Plugin/_Plugin.rst | 2 +- 6 files changed, 23 insertions(+), 2 deletions(-) create mode 100644 docs/source/Plugin/DeviceClass_binary.repl diff --git a/docs/source/Plugin/DeviceClass_binary.repl b/docs/source/Plugin/DeviceClass_binary.repl new file mode 100644 index 000000000..7e45b955b --- /dev/null +++ b/docs/source/Plugin/DeviceClass_binary.repl @@ -0,0 +1,12 @@ +MQTT Device class +^^^^^^^^^^^^^^^^^ + +(Only available if both MQTT Auto Discovery and Device Class features are included in the build.) + +* **MQTT Device class**: Select the Binary Device class that's to be used for this task device. Device classes marked with ``²`` are 'two-way' devices, meaning that the state will be updated when changed, either on the ESPEasy side, or on the MQTT (Home Assistant) side. + +The default value used is ``power``, also when not set (empty), and can be updated in Home Assistant by resending the MQTT Discovery. + +The available options are based on the Summer 2025 version of this `Home Assistant MQTT Binary sensor documentation page `_ + +The On/Off icon shown in Home Assistant (HA) can be changed for an alternative in the HA configuration, after Auto Discovery has created the device there. diff --git a/docs/source/Plugin/P001.rst b/docs/source/Plugin/P001.rst index d7f198f42..fdfe7c2bf 100644 --- a/docs/source/Plugin/P001.rst +++ b/docs/source/Plugin/P001.rst @@ -1,4 +1,4 @@ -.. include:: ../Plugin/_plugin_substitutions_p00x.repl +.. include:: ../Plugin/_plugin_substitutions_p00x.repl .. _P001_page: |P001_typename| @@ -25,6 +25,9 @@ Supported hardware |P001_usedby| + +.. include:: DeviceClass_binary.repl + Commands available ------------------ diff --git a/docs/source/Plugin/P009.rst b/docs/source/Plugin/P009.rst index ba17f11e9..17795e354 100644 --- a/docs/source/Plugin/P009.rst +++ b/docs/source/Plugin/P009.rst @@ -110,6 +110,8 @@ Advanced event management * **Use safe button (slower)**: This effectively adds an extra De-bounce delay and sends event value ``4`` when reached. +.. include:: DeviceClass_binary.repl + .. include:: DataAcquisition.repl * **Interval** By default, Interval will be set to 60 sec. It is the frequency used to read sensor values and send these to any Controllers configured for this device. diff --git a/docs/source/Plugin/P019.rst b/docs/source/Plugin/P019.rst index 678b229d6..11ee24a0e 100644 --- a/docs/source/Plugin/P019.rst +++ b/docs/source/Plugin/P019.rst @@ -112,6 +112,8 @@ Advanced event management * **Use safe button (slower)**: This effectively adds an extra De-bounce delay and sends event value ``4`` when reached. +.. include:: DeviceClass_binary.repl + .. include:: DataAcquisition.repl * **Interval** By default, Interval will be set to 60 sec. It is the frequency used to read sensor values and send these to any Controllers configured for this device. diff --git a/docs/source/Plugin/P021.rst b/docs/source/Plugin/P021.rst index ab8884f95..851c622e0 100644 --- a/docs/source/Plugin/P021.rst +++ b/docs/source/Plugin/P021.rst @@ -162,6 +162,8 @@ Sensor :sup:`1)` Configuration may not be available due to build size limitations. +.. include:: DeviceClass_binary.repl + .. include:: DataAcquisition.repl Values diff --git a/docs/source/Plugin/_Plugin.rst b/docs/source/Plugin/_Plugin.rst index bbe0800b3..8ed9069da 100644 --- a/docs/source/Plugin/_Plugin.rst +++ b/docs/source/Plugin/_Plugin.rst @@ -324,7 +324,7 @@ There are different released versions of ESP Easy: :red:`DEVELOPMENT` is used for plugins that are still being developed and are not considered stable at all. Currently there are no DEVELOPMENT builds available. -:yellow:`ENERGY` :yellow:`DISPLAY` :yellow:`IR` :yellow:`IRext` :yellow:`NEOPIXEL` :yellow:`CLIMATE` are specialized builds holding all Energy-, Display-, Infra Red- (extended), NeoPixel- and Climate- related plugins. +:yellow:`ENERGY` :yellow:`DISPLAY` (split into sets A..B) :yellow:`IR` :yellow:`IRext` :yellow:`NEOPIXEL` :yellow:`CLIMATE` are specialized builds holding all Energy-, Display-, Infra Red- (extended), NeoPixel- and Climate- related plugins. :yellow:`MAX` is the build that has all plugins that are available in the ESPEasy repository. Available for ESP32 16MB and ESP32 8MB Flash units (available for ESP32 Classic, ESP32-S3 and ESP32-C6). From fda5b00e90400f308a9bc6e9900e7c3d493d9214 Mon Sep 17 00:00:00 2001 From: TD-er Date: Thu, 9 Oct 2025 23:11:22 +0200 Subject: [PATCH 356/564] [Log] Simplify web log buffering --- .../net/DataStructs/NetworkSettingsStruct.h | 4 +- src/_C011.cpp | 4 +- src/_C018.cpp | 6 +- src/_P002_ADC.ino | 2 + src/_P013_HCSR04.ino | 4 +- src/_P021_Level.ino | 4 +- src/_P059_Encoder.ino | 4 +- src/_P101_WakeOnLan.ino | 10 +- src/_P123_I2CTouch.ino | 6 +- src/_P137_AXP192.ino | 6 +- src/_P139_AXP2101.ino | 6 +- src/_P164_gases_ens160.ino | 2 +- .../ControllerDelayHandlerStruct.h | 2 +- src/src/CustomBuild/define_plugin_sets.h | 5 +- .../DataStructs/ControllerSettingsStruct.h | 4 +- src/src/DataStructs/KeyValueStruct.cpp | 41 ++- src/src/DataStructs/KeyValueStruct.h | 25 +- src/src/DataStructs/LogBuffer.cpp | 48 ++++ src/src/DataStructs/LogBuffer.h | 66 +++++ src/src/DataStructs/LogEntry.cpp | 210 +++++++++++--- src/src/DataStructs/LogEntry.h | 84 +++++- src/src/DataStructs/LogStruct.cpp | 71 ----- src/src/DataStructs/LogStruct.h | 75 ----- .../DataStructs/NotificationSettingsStruct.h | 4 +- src/src/DataStructs/ProvisioningStruct.h | 4 +- src/src/DataStructs/ValueStruct.cpp | 22 +- src/src/DataStructs/ValueStruct.h | 31 +- src/src/DataTypes/LogLevels.h | 24 ++ src/src/ESPEasyCore/Controller.cpp | 4 + src/src/ESPEasyCore/ESPEasy_Log.cpp | 265 ++++++++---------- src/src/ESPEasyCore/ESPEasy_Log.h | 68 ++--- src/src/Globals/Logging.cpp | 4 +- src/src/Globals/Logging.h | 6 +- src/src/Globals/Plugins.cpp | 2 +- src/src/Helpers/ESPEasy_checks.cpp | 12 +- src/src/Helpers/KeyValueWriter.h | 6 +- src/src/Helpers/KeyValueWriter_JSON.cpp | 8 +- src/src/Helpers/Log_Helper.cpp | 125 +++++++++ src/src/Helpers/Log_Helper.h | 29 ++ src/src/Helpers/TarStream.cpp | 2 +- src/src/Helpers/ValueStruct_Factory.cpp | 51 ++-- src/src/Helpers/ValueStruct_Factory.h | 35 ++- src/src/PluginStructs/P118_data_struct.cpp | 2 +- src/src/PluginStructs/P123_data_struct.cpp | 2 +- src/src/PluginStructs/P132_data_struct.cpp | 2 +- src/src/PluginStructs/P164_data_struct.cpp | 6 +- src/src/WebServer/KeyValueWriter_WebForm.cpp | 8 +- src/src/WebServer/Log.cpp | 10 +- 48 files changed, 844 insertions(+), 577 deletions(-) create mode 100644 src/src/DataStructs/LogBuffer.cpp create mode 100644 src/src/DataStructs/LogBuffer.h delete mode 100644 src/src/DataStructs/LogStruct.cpp delete mode 100644 src/src/DataStructs/LogStruct.h create mode 100644 src/src/DataTypes/LogLevels.h create mode 100644 src/src/Helpers/Log_Helper.cpp create mode 100644 src/src/Helpers/Log_Helper.h diff --git a/src/ESPEasy/net/DataStructs/NetworkSettingsStruct.h b/src/ESPEasy/net/DataStructs/NetworkSettingsStruct.h index 525d564fd..4c0c046fa 100644 --- a/src/ESPEasy/net/DataStructs/NetworkSettingsStruct.h +++ b/src/ESPEasy/net/DataStructs/NetworkSettingsStruct.h @@ -5,7 +5,7 @@ \*********************************************************************************************/ #include "../../../ESPEasy_common.h" -#include // For std::shared_ptr +#include // For std::unique_ptr #include // for std::nothrow #include "../../../src/Globals/Plugins.h" @@ -50,7 +50,7 @@ private: }; -typedef std::shared_ptr NetworkSettingsStruct_ptr_type; +typedef std::unique_ptr NetworkSettingsStruct_ptr_type; /* # ifdef USE_SECOND_HEAP diff --git a/src/_C011.cpp b/src/_C011.cpp index ed010b698..b391cac3d 100644 --- a/src/_C011.cpp +++ b/src/_C011.cpp @@ -153,7 +153,7 @@ bool CPlugin_011(CPlugin::Function function, struct EventStruct *event, String& void *ptr = special_calloc(1, size); if (ptr != nullptr) { - std::shared_ptr customConfig(new (ptr) C011_ConfigStruct); + std::unique_ptr customConfig(new (ptr) C011_ConfigStruct); if (customConfig) { uint8_t choice = 0; @@ -245,7 +245,7 @@ bool load_C011_ConfigStruct(controllerIndex_t ControllerIndex, String& HttpMetho return false; } - std::shared_ptrcustomConfig(new (ptr) C011_ConfigStruct); + std::unique_ptrcustomConfig(new (ptr) C011_ConfigStruct); if (!customConfig) { return false; diff --git a/src/_C018.cpp b/src/_C018.cpp index 326b19389..947c1f1ab 100644 --- a/src/_C018.cpp +++ b/src/_C018.cpp @@ -134,7 +134,7 @@ bool CPlugin_018(CPlugin::Function function, struct EventStruct *event, String& if (ptr == nullptr) { break; } - std::shared_ptr customConfig(new (ptr) C018_ConfigStruct); + std::unique_ptr customConfig(new (ptr) C018_ConfigStruct); if (!customConfig) { break; @@ -153,7 +153,7 @@ bool CPlugin_018(CPlugin::Function function, struct EventStruct *event, String& if (ptr == nullptr) { break; } - std::shared_ptr customConfig(new (ptr) C018_ConfigStruct); + std::unique_ptr customConfig(new (ptr) C018_ConfigStruct); if (customConfig) { customConfig->webform_save(); @@ -329,7 +329,7 @@ bool C018_init(struct EventStruct *event) { if (ptr == nullptr) { return false; } - std::shared_ptr customConfig(new (ptr) C018_ConfigStruct); + std::unique_ptr customConfig(new (ptr) C018_ConfigStruct); if (!customConfig) { return false; diff --git a/src/_P002_ADC.ino b/src/_P002_ADC.ino index 48920b6a6..6475f9f9a 100644 --- a/src/_P002_ADC.ino +++ b/src/_P002_ADC.ino @@ -157,6 +157,8 @@ boolean Plugin_002(uint8_t function, struct EventStruct *event, String& string) log += strformat(F(" (%u samples)"), P002_data->getOversamplingCount()); } addLogMove(LOG_LEVEL_INFO, log); + addLog(LOG_LEVEL_INFO, F("ADC : This is a long text to test if the flash string will be kept as flash string. This is now a 128 bytes long message.....")); + addLog(LOG_LEVEL_INFO, F("ADC : This is a long text to test if the flash string will be kept as flash string. This is now a 128 bytes long message.....")); } P002_data->reset(); success = true; diff --git a/src/_P013_HCSR04.ino b/src/_P013_HCSR04.ino index 2fea00afe..8497b7aa6 100644 --- a/src/_P013_HCSR04.ino +++ b/src/_P013_HCSR04.ino @@ -33,7 +33,7 @@ # include "src/PluginStructs/P013_data_struct.h" // map of sensors -std::map > P_013_sensordefs; +std::map > P_013_sensordefs; // Forward declarations float Plugin_013_read(struct EventStruct *event); @@ -251,7 +251,7 @@ boolean Plugin_013(uint8_t function, struct EventStruct *even // create sensor instance and add to std::map P_013_sensordefs.erase(event->TaskIndex); - P_013_sensordefs[event->TaskIndex] = std::shared_ptr(new NewPing(P013_TRIGGER_PIN, + P_013_sensordefs[event->TaskIndex] = std::unique_ptr(new NewPing(P013_TRIGGER_PIN, P013_ECHO_PIN, max_distance_cm, P013_TRIGGER_WIDTH)); diff --git a/src/_P021_Level.ino b/src/_P021_Level.ino index 9d6230a3c..f85442781 100644 --- a/src/_P021_Level.ino +++ b/src/_P021_Level.ino @@ -455,7 +455,7 @@ boolean Plugin_021(uint8_t function, struct EventStruct *event, String& string) (UserVar.getUint32(event->TaskIndex, P021_VALUE_AUTOSAVE_TIME) > P021_AUTOSAVE_TIMER))) { UserVar.setUint32(event->TaskIndex, P021_VALUE_AUTOSAVE_TIME, P021_AUTOSAVE_TIMER); // Start timer # ifndef LIMIT_BUILD_SIZE - addLogMove(LOG_LEVEL_INFO, F("LEVEL: Auto-save timer started.")); + addLog(LOG_LEVEL_INFO, F("LEVEL: Auto-save timer started.")); # endif // ifndef LIMIT_BUILD_SIZE } } @@ -623,7 +623,7 @@ void P021_check_autosave(struct EventStruct *event) if ((UserVar.getUint32(event->TaskIndex, P021_VALUE_AUTOSAVE_FLAG) != 0) && !essentiallyEqual(P021_SETPOINT, P021_SETP_LAST_STORED)) { # ifndef P021_MIN_BUILD_SIZE - addLogMove(LOG_LEVEL_INFO, F("LEVEL: Auto-saving changed 'Set Level'.")); + addLog(LOG_LEVEL_INFO, F("LEVEL: Auto-saving changed 'Set Level'.")); # endif // ifndef P021_MIN_BUILD_SIZE P021_SETP_LAST_STORED = P021_SETPOINT; SaveSettings(); diff --git a/src/_P059_Encoder.ino b/src/_P059_Encoder.ino index c89a7c7ff..363030e38 100644 --- a/src/_P059_Encoder.ino +++ b/src/_P059_Encoder.ino @@ -30,7 +30,7 @@ # include -std::map > P_059_sensordefs; +std::map > P_059_sensordefs; boolean Plugin_059(uint8_t function, struct EventStruct *event, String& string) { @@ -127,7 +127,7 @@ boolean Plugin_059(uint8_t function, struct EventStruct *event, String& string) // create sensor instance and add to std::map P_059_sensordefs.erase(event->TaskIndex); - P_059_sensordefs[event->TaskIndex] = std::shared_ptr(new QEIx4); + P_059_sensordefs[event->TaskIndex] = std::unique_ptr(new QEIx4); P_059_sensordefs[event->TaskIndex]->begin(CONFIG_PIN1, CONFIG_PIN2, CONFIG_PIN3, PCONFIG(0)); P_059_sensordefs[event->TaskIndex]->setLimit(PCONFIG_LONG(0), PCONFIG_LONG(1)); diff --git a/src/_P101_WakeOnLan.ino b/src/_P101_WakeOnLan.ino index 1dece4346..0202df727 100644 --- a/src/_P101_WakeOnLan.ino +++ b/src/_P101_WakeOnLan.ino @@ -182,13 +182,13 @@ boolean Plugin_101(uint8_t function, struct EventStruct *event, String& string) if (strlen(deviceTemplate[0]) == 0) { // IP Address missing, use default value (without webform warning). strcpy_P(deviceTemplate[0], PSTR(IP_STR_DEF_P101)); - addLogMove(LOG_LEVEL_INFO, F(LOG_NAME_P101 "Loaded Default IP = " IP_STR_DEF_P101)); + addLog(LOG_LEVEL_INFO, F(LOG_NAME_P101 "Loaded Default IP = " IP_STR_DEF_P101)); } else if (strlen(deviceTemplate[0]) < IP_MIN_SIZE_P101) { // IP Address too short, load default value. Warn User. strcpy_P(deviceTemplate[0], PSTR(IP_STR_DEF_P101)); errorStr += F("Provided IP Invalid (Using Default). "); - addLogMove(LOG_LEVEL_INFO, F(LOG_NAME_P101 "Provided IP Invalid (Using Default). [" IP_STR_DEF_P101 "]")); + addLog(LOG_LEVEL_INFO, F(LOG_NAME_P101 "Provided IP Invalid (Using Default). [" IP_STR_DEF_P101 "]")); } else if (!validateIp(deviceTemplate[0])) { // Unexpected IP Address value. Leave as-is, but Warn User. errorStr += F("WARNING, Please Review IP Address. "); @@ -207,7 +207,7 @@ boolean Plugin_101(uint8_t function, struct EventStruct *event, String& string) strcpy_P(deviceTemplate[1], PSTR(MAC_STR_DEF_P101)); errorStr += F("MAC Address Not Provided, Populated with Zero Values. "); - addLogMove(LOG_LEVEL_INFO, F(LOG_NAME_P101 "MAC Address Not Provided, Populated with Zero Values. ")); + addLog(LOG_LEVEL_INFO, F(LOG_NAME_P101 "MAC Address Not Provided, Populated with Zero Values. ")); } else if (!validateMac(deviceTemplate[1])) { // Suspicious MAC Address. Leave as-is, but warn User. errorStr += F("ERROR, MAC Address Invalid. "); @@ -311,11 +311,11 @@ boolean Plugin_101(uint8_t function, struct EventStruct *event, String& string) // WOL.setRepeat(1, 0); // One Magic Packet, No Repeats. (Library default) if (!WOL.sendMagicPacket(paramMac, paramPort.toInt())) { - addLogMove(LOG_LEVEL_INFO, F(LOG_NAME_P101 "Error, Magic Packet Failed (check parameters)")); + addLog(LOG_LEVEL_INFO, F(LOG_NAME_P101 "Error, Magic Packet Failed (check parameters)")); } } else { - addLogMove(LOG_LEVEL_INFO, F(LOG_NAME_P101 "Error, WiFi Off-Line")); + addLog(LOG_LEVEL_INFO, F(LOG_NAME_P101 "Error, WiFi Off-Line")); } } } diff --git a/src/_P123_I2CTouch.ino b/src/_P123_I2CTouch.ino index fd8a2eada..7a49e469b 100644 --- a/src/_P123_I2CTouch.ino +++ b/src/_P123_I2CTouch.ino @@ -148,7 +148,7 @@ boolean Plugin_123(uint8_t function, struct EventStruct *event, String& string) case PLUGIN_WEBFORM_LOAD: { # ifdef PLUGIN_123_DEBUG - addLogMove(LOG_LEVEL_INFO, F("P123 PLUGIN_WEBFORM_LOAD")); + addLog(LOG_LEVEL_INFO, F("P123 PLUGIN_WEBFORM_LOAD")); # endif // ifdef PLUGIN_123_DEBUG { addRowLabel(F("Display task")); @@ -243,7 +243,7 @@ boolean Plugin_123(uint8_t function, struct EventStruct *event, String& string) case PLUGIN_WEBFORM_SAVE: { # ifdef PLUGIN_123_DEBUG - addLogMove(LOG_LEVEL_INFO, F("P123 PLUGIN_WEBFORM_SAVE")); + addLog(LOG_LEVEL_INFO, F("P123 PLUGIN_WEBFORM_SAVE")); # endif // ifdef PLUGIN_123_DEBUG P123_CONFIG_DISPLAY_PREV = P123_CONFIG_DISPLAY_TASK; P123_CONFIG_THRESHOLD = getFormItemInt(F("threshold")); @@ -286,7 +286,7 @@ boolean Plugin_123(uint8_t function, struct EventStruct *event, String& string) case PLUGIN_INIT: { # ifdef PLUGIN_123_DEBUG - addLogMove(LOG_LEVEL_INFO, F("P123 PLUGIN_INIT")); + addLog(LOG_LEVEL_INFO, F("P123 PLUGIN_INIT")); # endif // ifdef PLUGIN_123_DEBUG if (0 == P123_I2C_ADDRESS) { diff --git a/src/_P137_AXP192.ino b/src/_P137_AXP192.ino index 353fccdcc..7bdad37fb 100644 --- a/src/_P137_AXP192.ino +++ b/src/_P137_AXP192.ino @@ -102,7 +102,7 @@ boolean Plugin_137(uint8_t function, struct EventStruct *event, String& string) case PLUGIN_PRIORITY_INIT: { # ifndef BUILD_NO_DEBUG - addLogMove(LOG_LEVEL_DEBUG, F("P137: PLUGIN_PRIORITY_INIT")); + addLog(LOG_LEVEL_DEBUG, F("P137: PLUGIN_PRIORITY_INIT")); # endif // ifndef BUILD_NO_DEBUG success = Settings.isPowerManagerTask(event->TaskIndex); // Are we the PowerManager task? break; @@ -392,13 +392,13 @@ boolean Plugin_137(uint8_t function, struct EventStruct *event, String& string) if (nullptr != P137_init) { # ifndef BUILD_NO_DEBUG - addLogMove(LOG_LEVEL_INFO, F("P137: Already initialized, skipped.")); + addLog(LOG_LEVEL_INFO, F("P137: Already initialized, skipped.")); # endif // ifndef BUILD_NO_DEBUG // has been initialized so nothing to do here success = true; // Still was successful (to keep plugin enabled!) } else { # ifndef BUILD_NO_DEBUG - addLogMove(LOG_LEVEL_DEBUG, F("P137: PLUGIN_INIT")); + addLog(LOG_LEVEL_DEBUG, F("P137: PLUGIN_INIT")); # endif // ifndef BUILD_NO_DEBUG success = initPluginTaskData(event->TaskIndex, new (std::nothrow) P137_data_struct(event)); } diff --git a/src/_P139_AXP2101.ino b/src/_P139_AXP2101.ino index c63b99848..812b0799a 100644 --- a/src/_P139_AXP2101.ino +++ b/src/_P139_AXP2101.ino @@ -96,7 +96,7 @@ boolean Plugin_139(uint8_t function, struct EventStruct *event, String& string) { const bool isPowerManagerTask = Settings.isPowerManagerTask(event->TaskIndex); # ifndef BUILD_NO_DEBUG - addLogMove(LOG_LEVEL_DEBUG, F("P139: PLUGIN_PRIORITY_INIT")); + addLog(LOG_LEVEL_DEBUG, F("P139: PLUGIN_PRIORITY_INIT")); # endif // ifndef BUILD_NO_DEBUG success = isPowerManagerTask; // Are we the PowerManager task? break; @@ -262,13 +262,13 @@ boolean Plugin_139(uint8_t function, struct EventStruct *event, String& string) if (nullptr != P139_init) { # ifndef BUILD_NO_DEBUG - addLogMove(LOG_LEVEL_INFO, F("P139: Already initialized, skipped.")); + addLog(LOG_LEVEL_INFO, F("P139: Already initialized, skipped.")); # endif // ifndef BUILD_NO_DEBUG // has been initialized so nothing to do here success = true; // Still was successful (to keep plugin enabled!) } else { # ifndef BUILD_NO_DEBUG - addLogMove(LOG_LEVEL_DEBUG, F("P139: PLUGIN_INIT")); + addLog(LOG_LEVEL_DEBUG, F("P139: PLUGIN_INIT")); # endif // ifndef BUILD_NO_DEBUG success = initPluginTaskData(event->TaskIndex, new (std::nothrow) P139_data_struct(event)); } diff --git a/src/_P164_gases_ens160.ino b/src/_P164_gases_ens160.ino index 38d9bd8c0..1cb3fc46e 100644 --- a/src/_P164_gases_ens160.ino +++ b/src/_P164_gases_ens160.ino @@ -121,7 +121,7 @@ boolean Plugin_164(uint8_t function, struct EventStruct *event, String& string) P164_data_struct *P164_data = static_cast(getPluginTaskData(event->TaskIndex)); if (nullptr == P164_data) { - addLogMove(LOG_LEVEL_ERROR, F("P164: plugin_read NULLPTR")); + addLog(LOG_LEVEL_ERROR, F("P164: plugin_read NULLPTR")); break; } diff --git a/src/src/ControllerQueue/ControllerDelayHandlerStruct.h b/src/src/ControllerQueue/ControllerDelayHandlerStruct.h index f5442cf50..6982f35c0 100644 --- a/src/src/ControllerQueue/ControllerDelayHandlerStruct.h +++ b/src/src/ControllerQueue/ControllerDelayHandlerStruct.h @@ -21,7 +21,7 @@ #include -#include // For std::shared_ptr +#include // For std::unique_ptr #include // std::nothrow #ifndef CONTROLLER_QUEUE_MINIMAL_EXPIRE_TIME diff --git a/src/src/CustomBuild/define_plugin_sets.h b/src/src/CustomBuild/define_plugin_sets.h index 57e7ef2db..749373b58 100644 --- a/src/src/CustomBuild/define_plugin_sets.h +++ b/src/src/CustomBuild/define_plugin_sets.h @@ -1117,6 +1117,9 @@ To create/register a plugin, you have to : #ifndef PLUGIN_DESCR // COLLECTION_G_ESP32_IRExt also passes here #define PLUGIN_DESCR "Collection_G ESP32" #endif + #ifndef BUILD_NO_DEBUG + #define BUILD_NO_DEBUG + #endif #ifndef ESP32 #define ESP32 #endif @@ -4167,7 +4170,7 @@ To create/register a plugin, you have to : #endif -#if defined(USES_NW003) || defined(USES_NW004) || defined(USES_NW005) +#if /*defined(USES_NW003) || defined(USES_NW004) ||*/ defined(USES_NW005) # ifndef FEATURE_STORE_NETWORK_INTERFACE_SETTINGS # define FEATURE_STORE_NETWORK_INTERFACE_SETTINGS 1 # endif diff --git a/src/src/DataStructs/ControllerSettingsStruct.h b/src/src/DataStructs/ControllerSettingsStruct.h index 675cdc77d..471271dfe 100644 --- a/src/src/DataStructs/ControllerSettingsStruct.h +++ b/src/src/DataStructs/ControllerSettingsStruct.h @@ -6,7 +6,7 @@ \*********************************************************************************************/ #include "../../ESPEasy_common.h" -#include // For std::shared_ptr +#include // For std::unique_ptr #include // for std::nothrow #include @@ -270,7 +270,7 @@ private: #include "../Helpers/Memory.h" -typedef std::shared_ptr ControllerSettingsStruct_ptr_type; +typedef std::unique_ptr ControllerSettingsStruct_ptr_type; /* # ifdef USE_SECOND_HEAP #define MakeControllerSettings(T) HeapSelectIram ephemeral; ControllerSettingsStruct_ptr_type T(new (std::nothrow) ControllerSettingsStruct()); diff --git a/src/src/DataStructs/KeyValueStruct.cpp b/src/src/DataStructs/KeyValueStruct.cpp index 1bd4c9d02..5478abef9 100644 --- a/src/src/DataStructs/KeyValueStruct.cpp +++ b/src/src/DataStructs/KeyValueStruct.cpp @@ -83,58 +83,51 @@ KeyValueStruct::KeyValueStruct(const String& key, KeyValueStruct::KeyValueStruct(const __FlashStringHelper *key, const String & val, - Format format, - ValueStruct::ValueType vType) + Format format) : _key(key), _format(format) { - _values.emplace_back(ValueStruct_Factory::create(val, vType)); + _values.emplace_back(ValueStruct_Factory::create(val)); } KeyValueStruct::KeyValueStruct(const String & key, const __FlashStringHelper *val, - Format format, - ValueStruct::ValueType vType) + Format format) : _key(key), _format(format) { - _values.emplace_back(ValueStruct_Factory::create(val, vType)); + _values.emplace_back(ValueStruct_Factory::create(val)); } KeyValueStruct::KeyValueStruct(const __FlashStringHelper *key, const __FlashStringHelper *val, - Format format, - ValueStruct::ValueType vType) + Format format) : _key(key), _format(format) { - _values.emplace_back(ValueStruct_Factory::create(val, vType)); + _values.emplace_back(ValueStruct_Factory::create(val)); } KeyValueStruct::KeyValueStruct(const __FlashStringHelper *key, const char *val, - Format format, - ValueStruct::ValueType vType) + Format format) : _key(key), _format(format) { - _values.emplace_back(ValueStruct_Factory::create(String(val), vType)); + _values.emplace_back(ValueStruct_Factory::create(String(val))); } KeyValueStruct::KeyValueStruct(const String & key, const String & val, - Format format, - ValueStruct::ValueType vType) + Format format) : _key(key), _format(format) { - _values.emplace_back(ValueStruct_Factory::create(val, vType)); + _values.emplace_back(ValueStruct_Factory::create(val)); } KeyValueStruct::KeyValueStruct(const __FlashStringHelper *key, String && val, - Format format, - ValueStruct::ValueType vType) + Format format) : _key(key), _format(format) { - _values.emplace_back(ValueStruct_Factory::create(std::move(val), vType)); + _values.emplace_back(ValueStruct_Factory::create(std::move(val))); } KeyValueStruct::KeyValueStruct(const String & key, String && val, - Format format, - ValueStruct::ValueType vType) + Format format) : _key(key), _format(format) { - _values.emplace_back(ValueStruct_Factory::create(std::move(val), vType)); + _values.emplace_back(ValueStruct_Factory::create(std::move(val))); } KeyValueStruct::KeyValueStruct(LabelType::Enum label, Format format) @@ -146,9 +139,9 @@ void KeyValueStruct::setUnit(const String& unit) { _unit = unit; } void KeyValueStruct::setUnit(const __FlashStringHelper *unit) { _unit = unit; } -void KeyValueStruct::appendValue(Sp_ValueStruct value) +void KeyValueStruct::appendValue(Up_ValueStruct value) { - _values.emplace_back(value); + _values.emplace_back(std::move(value)); _isArray = true; } @@ -160,6 +153,6 @@ void KeyValueStruct::appendValue(const String& value) void KeyValueStruct::appendValue(String&& value) { - _values.emplace_back(ValueStruct_Factory::create(value)); + _values.emplace_back(ValueStruct_Factory::create(std::move(value))); _isArray = true; } diff --git a/src/src/DataStructs/KeyValueStruct.h b/src/src/DataStructs/KeyValueStruct.h index 49fad7cad..57f584be9 100644 --- a/src/src/DataStructs/KeyValueStruct.h +++ b/src/src/DataStructs/KeyValueStruct.h @@ -69,39 +69,32 @@ struct KeyValueStruct KeyValueStruct(const __FlashStringHelper *key, const String & val, - Format format = Format::Default, - ValueStruct::ValueType vType = ValueStruct::ValueType::Auto); + Format format = Format::Default); KeyValueStruct(const String & key, const __FlashStringHelper *val, - Format format = Format::Default, - ValueStruct::ValueType vType = ValueStruct::ValueType::Auto); + Format format = Format::Default); KeyValueStruct(const __FlashStringHelper *key, const __FlashStringHelper *val, - Format format = Format::Default, - ValueStruct::ValueType vType = ValueStruct::ValueType::Auto); + Format format = Format::Default); KeyValueStruct(const __FlashStringHelper *key, const char *val, - Format format = Format::Default, - ValueStruct::ValueType vType = ValueStruct::ValueType::Auto); + Format format = Format::Default); KeyValueStruct(const String & key, const String & val, - Format format = Format::Default, - ValueStruct::ValueType vType = ValueStruct::ValueType::Auto); + Format format = Format::Default); KeyValueStruct(const __FlashStringHelper *key, String && val, - Format format = Format::Default, - ValueStruct::ValueType vType = ValueStruct::ValueType::Auto); + Format format = Format::Default); KeyValueStruct(const String & key, String && val, - Format format = Format::Default, - ValueStruct::ValueType vType = ValueStruct::ValueType::Auto); + Format format = Format::Default); /* // TD-er: Do not use template types as it may 'explode' in binary size. @@ -122,7 +115,7 @@ struct KeyValueStruct void setUnit(const String& unit); void setUnit(const __FlashStringHelper *unit); - void appendValue(Sp_ValueStruct value); + void appendValue(Up_ValueStruct value); void appendValue(const String& value); void appendValue(String&& value); @@ -131,7 +124,7 @@ struct KeyValueStruct String _id; String _unit; - std::vector_values; + std::vector_values; Format _format = Format::Default; diff --git a/src/src/DataStructs/LogBuffer.cpp b/src/src/DataStructs/LogBuffer.cpp new file mode 100644 index 000000000..036206c97 --- /dev/null +++ b/src/src/DataStructs/LogBuffer.cpp @@ -0,0 +1,48 @@ +#include "../DataStructs/LogBuffer.h" + +#include "../Helpers/ESPEasy_time_calc.h" +#include "../Helpers/StringConverter.h" + +void LogBuffer::add(LogEntry_t&& logEntry) { + clearExpiredEntries(); + + if (logEntry) { + LogEntries.emplace_back(std::move(logEntry)); + } +} + +bool LogBuffer::getNext(uint8_t logDestination, uint32_t& timestamp, String& message, uint8_t& loglevel) +{ + if (logDestination == LOG_TO_WEBLOG) { + lastReadTimeStamp = millis(); + } + + for (LogEntry_queue::iterator it = LogEntries.begin(); it != LogEntries.end(); ++it) + { + if (it->validForSubscriber(logDestination)) { + timestamp = it->getTimestamp(); + message = it->getMessage(); + loglevel = it->getLogLevel(); + it->markReadBySubscriber(logDestination); + clearExpiredEntries(); + return true; + } + } + return false; +} + +bool LogBuffer::logActiveRead() { + clearExpiredEntries(); + return timePassedSince(lastReadTimeStamp) < LOG_BUFFER_ACTIVE_READ_TIMEOUT; +} + +void LogBuffer::clearExpiredEntries() { + for (auto it = LogEntries.begin(); it != LogEntries.end();) + { + if (it->isExpired()) { + it = LogEntries.erase(it); + } else { + return; + } + } +} diff --git a/src/src/DataStructs/LogBuffer.h b/src/src/DataStructs/LogBuffer.h new file mode 100644 index 000000000..cee2c0d75 --- /dev/null +++ b/src/src/DataStructs/LogBuffer.h @@ -0,0 +1,66 @@ +#ifndef DATASTRUCTS_LOGSTRUCT_H +#define DATASTRUCTS_LOGSTRUCT_H + + +#include "../../ESPEasy_common.h" + +#include "../DataStructs/LogEntry.h" + +#include "../DataTypes/LogLevels.h" + +#include + +/*********************************************************************************************\ +* LogBuffer +\*********************************************************************************************/ +#ifdef ESP32 + # define LOG_STRUCT_MESSAGE_LINES 120 +#else + # ifdef USE_SECOND_HEAP + # define LOG_STRUCT_MESSAGE_LINES 60 + # else + # if defined(PLUGIN_BUILD_COLLECTION) || defined(PLUGIN_BUILD_DEV) + # define LOG_STRUCT_MESSAGE_LINES 10 + # else + # define LOG_STRUCT_MESSAGE_LINES 15 + # endif // if defined(PLUGIN_BUILD_COLLECTION) || defined(PLUGIN_BUILD_DEV) + # endif // ifdef USE_SECOND_HEAP +#endif // ifdef ESP32 + +#ifdef ESP32 + # define LOG_BUFFER_ACTIVE_READ_TIMEOUT 30000 +#else + # define LOG_BUFFER_ACTIVE_READ_TIMEOUT 5000 +#endif // ifdef ESP32 + +typedef std::deque LogEntry_queue; + +struct LogBuffer { + + LogBuffer() = default; + + void add(LogEntry_t&& logEntry); + + bool isEmpty() const { + return LogEntries.empty(); + } + + // Returns whether a line was retrieved. + bool getNext(uint8_t logDestination, + uint32_t& timestamp, + String & message, + uint8_t & loglevel); + + bool logActiveRead(); + + void clearExpiredEntries(); + +private: + + LogEntry_queue LogEntries; + uint32_t lastReadTimeStamp = 0; + +}; + + +#endif // DATASTRUCTS_LOGSTRUCT_H diff --git a/src/src/DataStructs/LogEntry.cpp b/src/src/DataStructs/LogEntry.cpp index ac45bfd01..e53f6aafb 100644 --- a/src/src/DataStructs/LogEntry.cpp +++ b/src/src/DataStructs/LogEntry.cpp @@ -1,71 +1,195 @@ #include "../DataStructs/LogEntry.h" + #include "../Helpers/ESPEasy_time_calc.h" #include "../Helpers/StringConverter.h" -#define LOG_STRUCT_MESSAGE_SIZE 128 - #ifdef ESP32 - #define LOG_BUFFER_EXPIRE 30000 // Time after which a buffered log item is considered expired. + # define LOG_BUFFER_EXPIRE 30000 // Time after which a buffered log item is considered expired. #else - #define LOG_BUFFER_EXPIRE 5000 // Time after which a buffered log item is considered expired. -#endif + # define LOG_BUFFER_EXPIRE 5000 // Time after which a buffered log item is considered expired. +#endif // ifdef ESP32 -bool LogEntry_t::add(const uint8_t loglevel, const String& line) +LogEntry_t::LogEntry_t(const uint8_t logLevel, + const __FlashStringHelper *message) : + _message((void *)(message)), + _strLength(message ? strlen_P((const char *)(message)) : 0), + _timestamp(millis()), + _logLevel(logLevel), + _isFlashString(true) +{} + +LogEntry_t::LogEntry_t(const uint8_t logLevel, + const char *message) : + _message(nullptr), + _strLength(message ? strlen_P((const char *)(message)) : 0), + _timestamp(millis()), + _logLevel(logLevel), + _isFlashString(false) { - if (line.length() == 0) { - return false; - } + if (_strLength) { + _message = special_calloc(1, _strLength + 1); - { - if (line.length() > LOG_STRUCT_MESSAGE_SIZE - 1) { - #ifdef USE_SECOND_HEAP - - // Need to make a substring or a copy, which is a new allocation, on the 2nd heap - HeapSelectIram ephemeral; - #endif // ifdef USE_SECOND_HEAP - move_special(_message, line.substring(0, LOG_STRUCT_MESSAGE_SIZE - 1)); - } else { - reserve_special(_message, line.length()); - _message = line; + if (_message) { + memcpy_P(_message, message, _strLength); } } - _loglevel = loglevel; - _timestamp = millis(); - return true; } -bool LogEntry_t::add(const uint8_t loglevel, String&& line) +LogEntry_t::LogEntry_t(const uint8_t logLevel, + const String& message) : + _message(nullptr), + _strLength(message.length()), + _timestamp(millis()), + _logLevel(logLevel), + _isFlashString(false) { - if (line.length() == 0) { - return false; - } + if (_strLength) { - if (line.length() > LOG_STRUCT_MESSAGE_SIZE - 1) { - #ifdef USE_SECOND_HEAP + _message = special_calloc(1, _strLength + 1); - // Need to make a substring, which is a new allocation, on the 2nd heap - HeapSelectIram ephemeral; - #endif // ifdef USE_SECOND_HEAP - move_special(_message, line.substring(0, LOG_STRUCT_MESSAGE_SIZE - 1)); - } else { - move_special(_message, std::move(line)); + if (_message) { + memcpy_P(_message, message.begin(), _strLength); + } } - _loglevel = loglevel; - _timestamp = millis(); - return true; +} + +LogEntry_t::LogEntry_t(const uint8_t logLevel, + String && message) : + _message(nullptr), + _strLength(message.length()), + _timestamp(millis()), + _logLevel(logLevel), + _isFlashString(false) +{ + if (_strLength) { + // We can't move the allocated memory from 'message'. + // Just use move so we make sure the memory is de-allocated after this call. + String str = std::move(message); + const size_t size = str.length(); + _message = special_calloc(1, size + 1); + + if (_message) { + memcpy_P(_message, str.begin(), size); + } + } +} + +LogEntry_t::~LogEntry_t() +{ + if (!_isFlashString && (_message != nullptr)) { + free(_message); + } +} + +LogEntry_t::LogEntry_t(LogEntry_t&& rhs) : + _message(rhs._message), + _strLength(rhs._strLength), + _timestamp(rhs._timestamp), + _flags(rhs._flags) +{ + rhs._message = nullptr; + rhs._strLength = 0; + rhs._timestamp = 0; + rhs._flags = 0; +} + +LogEntry_t& LogEntry_t::operator=(LogEntry_t&& rhs) +{ + _message = rhs._message; + _strLength = rhs._strLength; + _timestamp = rhs._timestamp; + _flags = rhs._flags; + + rhs._message = nullptr; + rhs._strLength = 0; + rhs._timestamp = 0; + rhs._flags = 0; + return *this; } void LogEntry_t::clear() { - free_string(_message); - _timestamp = 0; - _loglevel = 0; + if (!_isFlashString && (_message != nullptr)) { + free(_message); + } + _message = nullptr; + + // _strLength = 0; +} + +void LogEntry_t::setSubscribers() +{ + if (isValid()) { + for (uint32_t i = 0; i < NR_LOG_TO_DESTINATIONS; ++i) { + bitWrite(_subscriberPendingRead, (1 << i), + loglevelActiveFor(i, _logLevel)); + } + } + + if (_subscriberPendingRead == 0) { + clear(); + } +} + +void LogEntry_t::markReadBySubscriber(uint8_t subscriber) +{ + if (subscriber < NR_LOG_TO_DESTINATIONS) { + bitClear(_subscriberPendingRead, (1 << subscriber)); + } + + if (_subscriberPendingRead == 0) { + clear(); + } +} + +bool LogEntry_t::validForSubscriber(uint8_t subscriber) const +{ + return isValid() && (subscriber < NR_LOG_TO_DESTINATIONS) && bitRead(_subscriberPendingRead, (1 << subscriber)); +} + +size_t LogEntry_t::print(Print& out, size_t offset, size_t length) const +{ + if (offset > _strLength) { return 0; } + + const char*begin = (const char *)_message; + const char*end = begin; + + if (_strLength > (offset + length)) { + end += (offset + length); + } + else { + end += _strLength; + } + const char*pos = begin + offset; + + for (; pos != end; ++pos) { + if ((*pos == '\0') || (out.write(*pos) == 0)) { return pos - begin - offset; } + } + return pos - begin - offset; +} + +String LogEntry_t::getMessage() const +{ + if (_message == nullptr) { return EMPTY_STRING; } + + return String((const char *)_message); } bool LogEntry_t::isExpired() const { - return timePassedSince(_timestamp) >= LOG_BUFFER_EXPIRE; + return + !isValid() || + timePassedSince(_timestamp) >= LOG_BUFFER_EXPIRE; +} -} \ No newline at end of file +bool LogEntry_t::isValid() const +{ + return _message && (_strLength != 0u); +} + +uint8_t LogEntry_t::getLogLevel() const +{ + return _logLevel; +} diff --git a/src/src/DataStructs/LogEntry.h b/src/src/DataStructs/LogEntry.h index 0fafa50af..9671686e9 100644 --- a/src/src/DataStructs/LogEntry.h +++ b/src/src/DataStructs/LogEntry.h @@ -1,27 +1,81 @@ -#ifndef DATASTRUCT_LOGENTRY_H -#define DATASTRUCT_LOGENTRY_H +#pragma once #include "../../ESPEasy_common.h" -class LogEntry_t { -public: +#include "../DataTypes/LogLevels.h" - LogEntry_t() = default; +#include - bool add(const uint8_t loglevel, - const String& line); - bool add(const uint8_t loglevel, - String && line); +struct LogEntry_t { - void clear(); + LogEntry_t() = delete; - bool isExpired() const; + LogEntry_t(const LogEntry_t& rhs) = delete; + LogEntry_t(const uint8_t logLevel, + const __FlashStringHelper *message); + + LogEntry_t(const uint8_t logLevel, + const char *message); + + LogEntry_t(const uint8_t logLevel, + const String& message); + + LogEntry_t(const uint8_t logLevel, + String && message); + + ~LogEntry_t(); + + LogEntry_t(LogEntry_t&& rhs); + LogEntry_t& operator=(LogEntry_t&& rhs); + + void clear(); + + LogEntry_t& operator=(const LogEntry_t& rhs) = delete; + + operator bool() const { return isValid(); } + + void setSubscribers(); + + void markReadBySubscriber(uint8_t subscriber); + + bool validForSubscriber(uint8_t subscriber) const; + + size_t print(Print& out, + size_t offset = 0, + size_t length = std::numeric_limits::max()) const; + + String getMessage() const; + + bool isExpired() const; + + bool isValid() const; + + uint8_t getLogLevel() const; + + uint32_t getTimestamp() const { return _timestamp; } + +private: + + void *_message{}; + size_t _strLength; + uint32_t _timestamp; + union { + struct { + uint32_t _isFlashString : 1; + uint32_t _logLevel : 4; + uint32_t _subscriberPendingRead : 8; + + uint32_t unused : 19; + + }; + + uint32_t _flags{}; + + }; - String _message; - unsigned long _timestamp{}; - uint8_t _loglevel{}; }; -#endif // ifndef DATASTRUCT_LOGENTRY_H +typedef std::unique_ptrUp_LogEntry; +typedef std::shared_ptrSp_LogEntry; diff --git a/src/src/DataStructs/LogStruct.cpp b/src/src/DataStructs/LogStruct.cpp deleted file mode 100644 index fce67c471..000000000 --- a/src/src/DataStructs/LogStruct.cpp +++ /dev/null @@ -1,71 +0,0 @@ -#include "../DataStructs/LogStruct.h" - -#include "../Helpers/ESPEasy_time_calc.h" -#include "../Helpers/StringConverter.h" - -void LogStruct::add_end() { - if (isFull()) { - read_idx = nextIndex(read_idx); - } - write_idx = nextIndex(write_idx); - is_full = (write_idx == read_idx); -} - -void LogStruct::add(const uint8_t loglevel, const String& line) { - if (Message[write_idx].add(loglevel, line)) { - add_end(); - } -} - -void LogStruct::add(const uint8_t loglevel, String&& line) { - if (Message[write_idx].add(loglevel, std::move(line))) { - add_end(); - } -} - -bool LogStruct::getNext(bool& logLinesAvailable, uint32_t& timestamp, String& message, uint8_t& loglevel) { - lastReadTimeStamp = millis(); - logLinesAvailable = false; - - if (isEmpty()) { - return false; - } - timestamp = Message[read_idx]._timestamp; - message = std::move(Message[read_idx]._message); - loglevel = Message[read_idx]._loglevel; - clearOldest(); - - if (!isEmpty()) { - logLinesAvailable = true; - } - return true; -} - - -bool LogStruct::logActiveRead() { - clearExpiredEntries(); - return timePassedSince(lastReadTimeStamp) < LOG_BUFFER_ACTIVE_READ_TIMEOUT; -} - -void LogStruct::clearExpiredEntries() { - unsigned int maxLoops = LOG_STRUCT_MESSAGE_LINES; - - while (maxLoops > 0) { - --maxLoops; - - if (isEmpty() || // Nothing left - !Message[read_idx].isExpired()) - { - return; - } - clearOldest(); - } -} - -void LogStruct::clearOldest() { - if (!isEmpty()) { - is_full = false; - Message[read_idx].clear(); - read_idx = nextIndex(read_idx); - } -} diff --git a/src/src/DataStructs/LogStruct.h b/src/src/DataStructs/LogStruct.h deleted file mode 100644 index 9f48be999..000000000 --- a/src/src/DataStructs/LogStruct.h +++ /dev/null @@ -1,75 +0,0 @@ -#ifndef DATASTRUCTS_LOGSTRUCT_H -#define DATASTRUCTS_LOGSTRUCT_H - - -#include "../../ESPEasy_common.h" - -#include "../DataStructs/LogEntry.h" - -/*********************************************************************************************\ - * LogStruct -\*********************************************************************************************/ -#ifdef ESP32 - #define LOG_STRUCT_MESSAGE_LINES 120 -#else - #ifdef USE_SECOND_HEAP - #define LOG_STRUCT_MESSAGE_LINES 60 - #else - #if defined(PLUGIN_BUILD_COLLECTION) || defined(PLUGIN_BUILD_DEV) - #define LOG_STRUCT_MESSAGE_LINES 10 - #else - #define LOG_STRUCT_MESSAGE_LINES 15 - #endif - #endif -#endif - -#ifdef ESP32 - #define LOG_BUFFER_ACTIVE_READ_TIMEOUT 30000 -#else - #define LOG_BUFFER_ACTIVE_READ_TIMEOUT 5000 -#endif - - -struct LogStruct { - - void add(const uint8_t loglevel, const String& line); - void add(const uint8_t loglevel, String&& line); - - // Read the next item and append it to the given string. - // Returns whether new lines are available. -// bool get(String& output, const String& lineEnd); - - // Returns whether a line was retrieved. - bool getNext(bool& logLinesAvailable, uint32_t& timestamp, String& message, uint8_t& loglevel); - - bool isEmpty() const { - return !is_full && (write_idx == read_idx); - } - - bool isFull() const { return is_full; } - - bool logActiveRead(); - - private: - - void add_end(); - - void clearExpiredEntries(); - - void clearOldest(); - - static int nextIndex(int idx) { -// return ((++idx) == LOG_STRUCT_MESSAGE_LINES) ? 0 : idx; - return (idx + 1) % LOG_STRUCT_MESSAGE_LINES; - } - - LogEntry_t Message[LOG_STRUCT_MESSAGE_LINES]; - int write_idx = 0; - int read_idx = 0; - uint32_t lastReadTimeStamp = 0; - bool is_full = false; -}; - - - -#endif // DATASTRUCTS_LOGSTRUCT_H \ No newline at end of file diff --git a/src/src/DataStructs/NotificationSettingsStruct.h b/src/src/DataStructs/NotificationSettingsStruct.h index 4684bbeaf..751053878 100644 --- a/src/src/DataStructs/NotificationSettingsStruct.h +++ b/src/src/DataStructs/NotificationSettingsStruct.h @@ -5,7 +5,7 @@ #if FEATURE_NOTIFIER -#include // For std::shared_ptr +#include // For std::unique_ptr # define NPLUGIN_001_DEF_TM 8000 // Email Server Default Response Time, in mS. # define NPLUGIN_001_MIN_TM 5000 @@ -35,7 +35,7 @@ struct NotificationSettingsStruct //its safe to extend this struct, up to 4096 bytes, default values in config are 0 }; -typedef std::shared_ptr NotificationSettingsStruct_ptr_type; +typedef std::unique_ptr NotificationSettingsStruct_ptr_type; #define MakeNotificationSettings(T) void * calloc_ptr = special_calloc(1,sizeof(NotificationSettingsStruct)); NotificationSettingsStruct_ptr_type T(new (calloc_ptr) NotificationSettingsStruct()); diff --git a/src/src/DataStructs/ProvisioningStruct.h b/src/src/DataStructs/ProvisioningStruct.h index 5d0589928..8a16e14b2 100644 --- a/src/src/DataStructs/ProvisioningStruct.h +++ b/src/src/DataStructs/ProvisioningStruct.h @@ -8,7 +8,7 @@ # include "../DataStructs/FactoryDefaultPref.h" # include "../DataTypes/ESPEasyFileType.h" -# include // for std::shared_ptr +# include // for std::unique_ptr /*********************************************************************************************\ * ProvisioningStruct @@ -54,7 +54,7 @@ struct ProvisioningStruct }; }; -typedef std::shared_ptr ProvisioningStruct_ptr_type; +typedef std::unique_ptr ProvisioningStruct_ptr_type; #define MakeProvisioningSettings(T) void * calloc_ptr = special_calloc(1,sizeof(ProvisioningStruct)); ProvisioningStruct_ptr_type T(new (calloc_ptr) ProvisioningStruct()); diff --git a/src/src/DataStructs/ValueStruct.cpp b/src/src/DataStructs/ValueStruct.cpp index 6a76bd5c6..927cde81c 100644 --- a/src/src/DataStructs/ValueStruct.cpp +++ b/src/src/DataStructs/ValueStruct.cpp @@ -17,7 +17,7 @@ String ValueStruct::toString() const String ValueStruct::toString(ValueType& valueType) const { - valueType = _valueType; + valueType = getValueType(); return toString(); } @@ -27,11 +27,11 @@ String ValueStruct::toString(ValueType& valueType) const ValueStruct_String::~ValueStruct_String() {} -ValueStruct_String::ValueStruct_String(const String& val, ValueType vType) - : ValueStruct(vType), _val(val) {} +ValueStruct_String::ValueStruct_String(const String& val) + : ValueStruct(ValueType::String), _val(val) {} -ValueStruct_String::ValueStruct_String(String&& val, ValueType vType) - : ValueStruct(vType), _val(std::move(val)) {} +ValueStruct_String::ValueStruct_String(String&& val) + : ValueStruct(ValueType::String), _val(std::move(val)) {} size_t ValueStruct_String::print(Print& out) const { @@ -44,8 +44,8 @@ size_t ValueStruct_String::print(Print& out) const ValueStruct_FlashString::~ValueStruct_FlashString() {} -ValueStruct_FlashString::ValueStruct_FlashString(const __FlashStringHelper *val, ValueType vType) - : ValueStruct(vType), _val(val) {} +ValueStruct_FlashString::ValueStruct_FlashString(const __FlashStringHelper *val) + : ValueStruct(ValueType::FlashString), _val(val) {} size_t ValueStruct_FlashString::print(Print& out) const { @@ -60,7 +60,7 @@ ValueStruct_Double::~ValueStruct_Double() {} ValueStruct_Double::ValueStruct_Double( double val, - uint32_t nrDecimals, + uint8_t nrDecimals, bool trimTrailingZeros) : ValueStruct(ValueType::Double), _val(val), _nrDecimals(nrDecimals), _trimTrailingZeros(trimTrailingZeros) {} @@ -73,7 +73,7 @@ String ValueStruct_Double::toString(ValueType& valueType) const { String res; - valueType = _valueType; + valueType = getValueType(); if (!doubleToValidString(res, _val, _nrDecimals, _trimTrailingZeros)) { valueType = ValueType::String; @@ -90,7 +90,7 @@ ValueStruct_Float::~ValueStruct_Float() {} ValueStruct_Float::ValueStruct_Float( float val, - uint32_t nrDecimals, + uint8_t nrDecimals, bool trimTrailingZeros) : ValueStruct(ValueType::Float), _val(val), _nrDecimals(nrDecimals), _trimTrailingZeros(trimTrailingZeros) {} @@ -106,7 +106,7 @@ String ValueStruct_Float::toString(ValueType& valueType) const { String res; - valueType = _valueType; + valueType = getValueType(); if (!toValidString(res, _val, _nrDecimals, _trimTrailingZeros)) { valueType = ValueType::String; diff --git a/src/src/DataStructs/ValueStruct.h b/src/src/DataStructs/ValueStruct.h index 5cba9e545..75a83c90e 100644 --- a/src/src/DataStructs/ValueStruct.h +++ b/src/src/DataStructs/ValueStruct.h @@ -15,6 +15,7 @@ public: enum class ValueType { Auto, String, + FlashString, Float, Double, Int, @@ -32,12 +33,15 @@ public: virtual String toString(ValueType& valueType) const; + virtual ValueType getValueType() const { return _valueType; }; + protected: + const ValueType _valueType; }; // class ValueStruct -typedef std::shared_ptr Sp_ValueStruct; +typedef std::unique_ptr Up_ValueStruct; // ******************************************************************************** @@ -50,10 +54,8 @@ public: virtual ~ValueStruct_String(); - ValueStruct_String(const String& val, - ValueType vType = ValueType::String); - ValueStruct_String(String && val, - ValueType vType = ValueType::String); + ValueStruct_String(const String& val); + ValueStruct_String(String && val); virtual size_t print(Print& out) const; @@ -67,8 +69,7 @@ public: virtual ~ValueStruct_FlashString(); - ValueStruct_FlashString(const __FlashStringHelper *val, - ValueType vType = ValueType::String); + ValueStruct_FlashString(const __FlashStringHelper *val); virtual size_t print(Print& out) const; @@ -82,16 +83,16 @@ public: virtual ~ValueStruct_Double(); ValueStruct_Double(double val, - uint32_t nrDecimals = 2, + uint8_t nrDecimals = 2, bool trimTrailingZeros = false); virtual size_t print(Print& out) const; virtual String toString(ValueType& valueType) const override; - double _val{}; - uint32_t _nrDecimals = 2; - bool _trimTrailingZeros{}; + const double _val; + const uint8_t _nrDecimals; + const bool _trimTrailingZeros; }; class ValueStruct_Float : public ValueStruct @@ -101,16 +102,16 @@ public: virtual ~ValueStruct_Float(); ValueStruct_Float(float val, - uint32_t nrDecimals = 2, + uint8_t nrDecimals = 2, bool trimTrailingZeros = false); virtual size_t print(Print& out) const; virtual String toString(ValueType& valueType) const override; - float _val{}; - uint32_t _nrDecimals = 2; - bool _trimTrailingZeros{}; + const float _val; + const uint8_t _nrDecimals; + const bool _trimTrailingZeros; }; diff --git a/src/src/DataTypes/LogLevels.h b/src/src/DataTypes/LogLevels.h new file mode 100644 index 000000000..6ef75f6d1 --- /dev/null +++ b/src/src/DataTypes/LogLevels.h @@ -0,0 +1,24 @@ +#pragma once + +#include "../../ESPEasy_common.h" + +#define LOG_LEVEL_NONE 0 +#define LOG_LEVEL_ERROR 1 +#define LOG_LEVEL_INFO 2 +#ifndef BUILD_NO_DEBUG +# define LOG_LEVEL_DEBUG 3 +# define LOG_LEVEL_DEBUG_MORE 4 +# define LOG_LEVEL_DEBUG_DEV 9 // use for testing/debugging only, not for regular use +# define LOG_LEVEL_NRELEMENTS 5 // Update this and getLogLevelDisplayString() when new log levels are added +#else // ifndef BUILD_NO_DEBUG +# define LOG_LEVEL_NRELEMENTS 2 // Update this and getLogLevelDisplayString() when new log levels are added +#endif // ifndef BUILD_NO_DEBUG + +#define LOG_TO_SERIAL 0 +#define LOG_TO_SYSLOG 1 +#define LOG_TO_WEBLOG 2 +#define LOG_TO_SDCARD 3 +#define LOG_TO_SERIAL_EXTRA 4 + +#define NR_LOG_TO_DESTINATIONS 5 // Update this when adding extra log output streams + diff --git a/src/src/ESPEasyCore/Controller.cpp b/src/src/ESPEasyCore/Controller.cpp index 8d24d9402..6dffc60d8 100644 --- a/src/src/ESPEasyCore/Controller.cpp +++ b/src/src/ESPEasyCore/Controller.cpp @@ -404,6 +404,10 @@ bool MQTTConnect_prepareClient(controllerIndex_t controller_idx) { } #endif // if !defined(BUILD_NO_DEBUG) && FEATURE_MQTT_CONNECT_BACKGROUND MQTTclient.setServer(ControllerSettings->getHost().c_str(), ControllerSettings->Port); +# if FEATURE_MQTT_TLS + if (mqtt_tls) + mqtt_tls->setDomainName(ControllerSettings->getHost().c_str()); +#endif } else { #if !defined(BUILD_NO_DEBUG) && FEATURE_MQTT_CONNECT_BACKGROUND if (loglevelActiveFor(LOG_LEVEL_INFO)) { diff --git a/src/src/ESPEasyCore/ESPEasy_Log.cpp b/src/src/ESPEasyCore/ESPEasy_Log.cpp index ee1588ef8..36ad45d64 100644 --- a/src/src/ESPEasyCore/ESPEasy_Log.cpp +++ b/src/src/ESPEasyCore/ESPEasy_Log.cpp @@ -1,6 +1,6 @@ #include "../ESPEasyCore/ESPEasy_Log.h" -#include "../DataStructs/LogStruct.h" +#include "../DataStructs/LogBuffer.h" #include "../ESPEasyCore/Serial.h" #include "../Globals/Cache.h" #include "../Globals/ESPEasy_Console.h" @@ -11,61 +11,62 @@ #include "../Helpers/Networking.h" #include "../Helpers/StringConverter.h" -#include - -#if FEATURE_SD -#include -#include "../Helpers/ESPEasy_Storage.h" -#endif #define UPDATE_LOGLEVEL_ACTIVE_CACHE_INTERVAL 5000 /********************************************************************************************\ - Init critical variables for logging (important during initial factory reset stuff ) - \*********************************************************************************************/ + Init critical variables for logging (important during initial factory reset stuff ) + \*********************************************************************************************/ void initLog() { - //make sure addLog doesnt do any stuff before initalisation of Settings is complete. - Settings.UseSerial=true; - Settings.SyslogFacility=0; + // make sure addLog doesnt do any stuff before initalisation of Settings is complete. + Settings.UseSerial = true; + Settings.SyslogFacility = 0; setLogLevelFor(LOG_TO_SYSLOG, 0); - setLogLevelFor(LOG_TO_SERIAL, 2); //logging during initialisation + setLogLevelFor(LOG_TO_SERIAL, 2); // logging during initialisation setLogLevelFor(LOG_TO_WEBLOG, 2); setLogLevelFor(LOG_TO_SDCARD, 0); } - /********************************************************************************************\ - Logging - \*********************************************************************************************/ -const __FlashStringHelper * getLogLevelDisplayString(int logLevel) { - switch (logLevel) { + Logging + \*********************************************************************************************/ +const __FlashStringHelper* getLogLevelDisplayString(int logLevel) { + switch (logLevel) + { case LOG_LEVEL_NONE: return F("None"); case LOG_LEVEL_ERROR: return F("Error"); case LOG_LEVEL_INFO: return F("Info"); -# ifndef BUILD_NO_DEBUG +#ifndef BUILD_NO_DEBUG case LOG_LEVEL_DEBUG: return F("Debug"); case LOG_LEVEL_DEBUG_MORE: return F("Debug More"); case LOG_LEVEL_DEBUG_DEV: return F("Debug dev"); -#endif +#endif // ifndef BUILD_NO_DEBUG default: - break; + break; } return F(""); } -const __FlashStringHelper * getLogLevelDisplayStringFromIndex(uint8_t index, int& logLevel) { - switch (index) { - case 0: logLevel = LOG_LEVEL_ERROR; break; - case 1: logLevel = LOG_LEVEL_INFO; break; -# ifndef BUILD_NO_DEBUG - case 2: logLevel = LOG_LEVEL_DEBUG; break; - case 3: logLevel = LOG_LEVEL_DEBUG_MORE; break; - case 4: logLevel = LOG_LEVEL_DEBUG_DEV; break; -#endif +const __FlashStringHelper* getLogLevelDisplayStringFromIndex(uint8_t index, int& logLevel) { + switch (index) + { + case 0: logLevel = LOG_LEVEL_ERROR; + break; + case 1: logLevel = LOG_LEVEL_INFO; + break; +#ifndef BUILD_NO_DEBUG + case 2: logLevel = LOG_LEVEL_DEBUG; + break; + case 3: logLevel = LOG_LEVEL_DEBUG_MORE; + break; + case 4: logLevel = LOG_LEVEL_DEBUG_DEV; + break; +#endif // ifndef BUILD_NO_DEBUG - default: logLevel = -1; return F(""); + default: logLevel = -1; + return F(""); } return getLogLevelDisplayString(logLevel); } @@ -76,15 +77,20 @@ void disableSerialLog() { } void setLogLevelFor(uint8_t destination, uint8_t logLevel) { - switch (destination) { + switch (destination) + { case LOG_TO_SERIAL: - if (!log_to_serial_disabled || logLevel == 0) { - Settings.SerialLogLevel = logLevel; + + if (!log_to_serial_disabled || (logLevel == 0)) { + Settings.SerialLogLevel = logLevel; } break; - case LOG_TO_SYSLOG: Settings.SyslogLevel = logLevel; break; - case LOG_TO_WEBLOG: Settings.WebLogLevel = logLevel; break; - case LOG_TO_SDCARD: Settings.SDLogLevel = logLevel; break; + case LOG_TO_SYSLOG: Settings.SyslogLevel = logLevel; + break; + case LOG_TO_WEBLOG: Settings.WebLogLevel = logLevel; + break; + case LOG_TO_SDCARD: Settings.SDLogLevel = logLevel; + break; default: break; } @@ -93,8 +99,10 @@ void setLogLevelFor(uint8_t destination, uint8_t logLevel) { void updateLogLevelCache() { uint8_t max_lvl = 0; + // FIXME TD-er: Must add check whether SW serial may be using the same pins as Serial0 const bool useSerial = Settings.UseSerial && !activeTaskUseSerial0(); + if (log_to_serial_disabled) { if (useSerial) { ESPEasy_Console.setDebugOutput(false); @@ -102,13 +110,15 @@ void updateLogLevelCache() { } else { max_lvl = _max(max_lvl, Settings.SerialLogLevel); #ifndef BUILD_NO_DEBUG - if (useSerial && Settings.SerialLogLevel >= LOG_LEVEL_DEBUG_MORE) { + + if (useSerial && (Settings.SerialLogLevel >= LOG_LEVEL_DEBUG_MORE)) { ESPEasy_Console.setDebugOutput(true); } -#endif +#endif // ifndef BUILD_NO_DEBUG } max_lvl = _max(max_lvl, Settings.SyslogLevel); - if (Logging.logActiveRead()) { + + if (Logging.webLogActiveRead()) { max_lvl = _max(max_lvl, Settings.WebLogLevel); } #if FEATURE_SD @@ -119,17 +129,19 @@ void updateLogLevelCache() { bool loglevelActiveFor(uint8_t logLevel) { #ifdef ESP32 + if (xPortInIsrContext()) { // When called from an ISR, you should not send out logs. // Allocating memory from within an ISR is a big no-no. - // Also long-time blocking like sending logs (especially to a syslog server) + // Also long-time blocking like sending logs (especially to a syslog server) // is also really not a good idea from an ISR call. return false; } - #endif + #endif // ifdef ESP32 static uint32_t lastUpdateLogLevelCache = 0; - if (lastUpdateLogLevelCache == 0 || - timePassedSince(lastUpdateLogLevelCache) > UPDATE_LOGLEVEL_ACTIVE_CACHE_INTERVAL) + + if ((lastUpdateLogLevelCache == 0) || + (timePassedSince(lastUpdateLogLevelCache) > UPDATE_LOGLEVEL_ACTIVE_CACHE_INTERVAL)) { lastUpdateLogLevelCache = millis(); updateLogLevelCache(); @@ -139,11 +151,14 @@ bool loglevelActiveFor(uint8_t logLevel) { uint8_t getSerialLogLevel() { #if FEATURE_DEFINE_SERIAL_CONSOLE_PORT + // FIXME TD-er: Must add check whether SW serial may be using the same pins as Serial0 - if (log_to_serial_disabled || !Settings.UseSerial) return 0; -#else - if (log_to_serial_disabled || !Settings.UseSerial || activeTaskUseSerial0()) return 0; -#endif + if (log_to_serial_disabled || !Settings.UseSerial) { return 0; } +#else // if FEATURE_DEFINE_SERIAL_CONSOLE_PORT + + if (log_to_serial_disabled || !Settings.UseSerial || activeTaskUseSerial0()) { return 0; } +#endif // if FEATURE_DEFINE_SERIAL_CONSOLE_PORT + if (!ESPEasy::net::NetworkConnected()) { if (Settings.SerialLogLevel < LOG_LEVEL_INFO) { return LOG_LEVEL_INFO; @@ -153,9 +168,10 @@ uint8_t getSerialLogLevel() { } uint8_t getWebLogLevel() { - if (Logging.logActiveRead()) { + if (Logging.webLogActiveRead()) { return Settings.WebLogLevel; - } + } + if (Settings.WebLogLevel != LOG_LEVEL_NONE) { updateLogLevelCache(); } @@ -164,30 +180,37 @@ uint8_t getWebLogLevel() { bool loglevelActiveFor(uint8_t destination, uint8_t logLevel) { #ifdef ESP32 + if (xPortInIsrContext()) { // When called from an ISR, you should not send out logs. // Allocating memory from within an ISR is a big no-no. - // Also long-time blocking like sending logs (especially to a syslog server) + // Also long-time blocking like sending logs (especially to a syslog server) // is also really not a good idea from an ISR call. return false; } - #endif + #endif // ifdef ESP32 uint8_t logLevelSettings = 0; - switch (destination) { - case LOG_TO_SERIAL: { + + switch (destination) + { + case LOG_TO_SERIAL: + { logLevelSettings = getSerialLogLevel(); break; } - case LOG_TO_SYSLOG: { + case LOG_TO_SYSLOG: + { logLevelSettings = Settings.SyslogLevel; break; } - case LOG_TO_WEBLOG: { + case LOG_TO_WEBLOG: + { logLevelSettings = getWebLogLevel(); break; } - case LOG_TO_SDCARD: { + case LOG_TO_SDCARD: + { #if FEATURE_SD logLevelSettings = Settings.SDLogLevel; #endif @@ -201,14 +224,19 @@ bool loglevelActiveFor(uint8_t destination, uint8_t logLevel) { void addLog(uint8_t logLevel, const __FlashStringHelper *str) { - if (loglevelActiveFor(logLevel)) { - String copy; - if (!reserve_special(copy, strlen_P((PGM_P)str))) { - return; - } - copy = str; - addToLogMove(logLevel, std::move(copy)); + #ifdef ESP32 + + if (xPortInIsrContext()) { + // When called from an ISR, you should not send out logs. + // Allocating memory from within an ISR is a big no-no. + // Also long-time blocking like sending logs (especially to a syslog server) + // is also really not a good idea from an ISR call. + return; } + #endif // ifdef ESP32 + // Up_LogEntry entry(new (std::nothrow) LogEntry_t(logLevel, str)); + // Logging.addLogEntry(std::move(entry)); + Logging.addLogEntry(LogEntry_t(logLevel, str)); } void addLog(uint8_t logLevel, const char *line) @@ -221,12 +249,14 @@ void addLog(uint8_t logLevel, const char *line) { // Allow to store the logs in 2nd heap if present. if (mmu_is_iram(line)) { - size_t length = 0; - const char* cur_char = line; - bool copying = false; - bool done = false; + size_t length = 0; + const char*cur_char = line; + bool copying = false; + bool done = false; + while (!done) { const uint8_t ch = mmu_get_uint8(cur_char++); + if (ch == 0) { if (copying) { done = true; @@ -234,7 +264,7 @@ void addLog(uint8_t logLevel, const char *line) if (!reserve_special(copy, length)) { return; } - copying = true; + copying = true; cur_char = line; } } else { @@ -252,114 +282,55 @@ void addLog(uint8_t logLevel, const char *line) copy = line; } } - #else + #else // ifdef USE_SECOND_HEAP + if (!reserve_special(copy, strlen_P((PGM_P)line))) { return; } copy = line; - #endif + #endif // ifdef USE_SECOND_HEAP addToLogMove(logLevel, std::move(copy)); } } -void addLog(uint8_t logLevel, String&& string) -{ - addToLogMove(logLevel, std::move(string)); -} +void addLog(uint8_t logLevel, String&& str) { addToLogMove(logLevel, std::move(str)); } #ifndef LIMIT_BUILD_SIZE -#include "../Helpers/Memory.h" +# include "../Helpers/Memory.h" #endif -void addToSerialLog(uint8_t logLevel, const String& string) -{ - if (loglevelActiveFor(LOG_TO_SERIAL, logLevel)) { - ESPEasy_Console.addToSerialBuffer(format_msec_duration(millis())); - #ifndef LIMIT_BUILD_SIZE - ESPEasy_Console.addToSerialBuffer(strformat(F(" : (%d) "), FreeMem())); - #endif - { - String loglevelDisplayString = getLogLevelDisplayString(logLevel); - while (loglevelDisplayString.length() < 6) { - loglevelDisplayString += ' '; - } - ESPEasy_Console.addToSerialBuffer(loglevelDisplayString); - } - ESPEasy_Console.addToSerialBuffer(F(" : ")); - ESPEasy_Console.addToSerialBuffer(string); - ESPEasy_Console.addNewlineToSerialBuffer(); - } -} -void addToSysLog(uint8_t logLevel, const String& string) -{ - if (loglevelActiveFor(LOG_TO_SYSLOG, logLevel)) { - sendSyslog(logLevel, string); - } -} - -void addToSDLog(uint8_t logLevel, const String& string) -{ -#if FEATURE_SD - if (!string.isEmpty() && loglevelActiveFor(LOG_TO_SDCARD, logLevel)) { - String logName = patch_fname(F("log.txt")); - fs::File logFile = SD.open(logName, "a+"); - if (logFile) { - const size_t stringLength = string.length(); - for (size_t i = 0; i < stringLength; ++i) { - logFile.print(string[i]); - } - logFile.println(); - } - logFile.close(); - } -#endif -} - - -void addLog(uint8_t logLevel, const String& string) +void addLog(uint8_t logLevel, const String& str) { #ifdef ESP32 + if (xPortInIsrContext()) { // When called from an ISR, you should not send out logs. // Allocating memory from within an ISR is a big no-no. - // Also long-time blocking like sending logs (especially to a syslog server) + // Also long-time blocking like sending logs (especially to a syslog server) // is also really not a good idea from an ISR call. return; } - #endif - - if (string.isEmpty()) return; - addToSerialLog(logLevel, string); - addToSysLog(logLevel, string); - addToSDLog(logLevel, string); - if (loglevelActiveFor(LOG_TO_WEBLOG, logLevel)) { - Logging.add(logLevel, string); - } + #endif // ifdef ESP32 + // Up_LogEntry entry(new (std::nothrow) LogEntry_t(logLevel, str)); + // Logging.addLogEntry(std::move(entry)); + Logging.addLogEntry(LogEntry_t(logLevel, str)); } -void addToLogMove(uint8_t logLevel, String&& string) +void addToLogMove(uint8_t logLevel, String&& str) { #ifdef ESP32 + if (xPortInIsrContext()) { // When called from an ISR, you should not send out logs. // Allocating memory from within an ISR is a big no-no. - // Also long-time blocking like sending logs (especially to a syslog server) + // Also long-time blocking like sending logs (especially to a syslog server) // is also really not a good idea from an ISR call. return; } - #endif - - if (string.isEmpty()) return; - String tmp; - move_special(tmp, std::move(string)); - addToSerialLog(logLevel, tmp); - addToSysLog(logLevel, tmp); - addToSDLog(logLevel, tmp); - - // May clear the string, so call as last one. - if (loglevelActiveFor(LOG_TO_WEBLOG, logLevel)) { - Logging.add(logLevel, std::move(tmp)); - } + #endif // ifdef ESP32 + // Up_LogEntry entry(new (std::nothrow) LogEntry_t(logLevel, str)); + // Logging.addLogEntry(std::move(entry)); + Logging.addLogEntry(LogEntry_t(logLevel, str)); } diff --git a/src/src/ESPEasyCore/ESPEasy_Log.h b/src/src/ESPEasyCore/ESPEasy_Log.h index df5c25cb2..f4308c7d3 100644 --- a/src/src/ESPEasyCore/ESPEasy_Log.h +++ b/src/src/ESPEasyCore/ESPEasy_Log.h @@ -1,60 +1,52 @@ -#ifndef ESPEASYCORE_ESPEASY_LOG_H -#define ESPEASYCORE_ESPEASY_LOG_H +#pragma once #include "../../ESPEasy_common.h" -#define LOG_LEVEL_NONE 0 -#define LOG_LEVEL_ERROR 1 -#define LOG_LEVEL_INFO 2 -# ifndef BUILD_NO_DEBUG -#define LOG_LEVEL_DEBUG 3 -#define LOG_LEVEL_DEBUG_MORE 4 -#define LOG_LEVEL_DEBUG_DEV 9 // use for testing/debugging only, not for regular use -#define LOG_LEVEL_NRELEMENTS 5 // Update this and getLogLevelDisplayString() when new log levels are added -#else -#define LOG_LEVEL_NRELEMENTS 2 // Update this and getLogLevelDisplayString() when new log levels are added -#endif +#include "../DataStructs/LogEntry.h" + +#include "../DataTypes/LogLevels.h" -#define LOG_TO_SERIAL 1 -#define LOG_TO_SYSLOG 2 -#define LOG_TO_WEBLOG 3 -#define LOG_TO_SDCARD 4 // Move the log String so it does not have to be copied in the web log -#define addLogMove(L, S) addToLogMove(L, std::move(S)) +#define addLogMove(L, S) addToLogMove(L, std::move(S)) /********************************************************************************************\ - Logging - \*********************************************************************************************/ -void initLog(); + Logging + \*********************************************************************************************/ +void initLog(); -const __FlashStringHelper * getLogLevelDisplayString(int logLevel); +const __FlashStringHelper* getLogLevelDisplayString(int logLevel); -const __FlashStringHelper * getLogLevelDisplayStringFromIndex(uint8_t index, int& logLevel); +const __FlashStringHelper* getLogLevelDisplayStringFromIndex(uint8_t index, + int & logLevel); -void disableSerialLog(); +void disableSerialLog(); -void setLogLevelFor(uint8_t destination, uint8_t logLevel); +void setLogLevelFor(uint8_t destination, + uint8_t logLevel); -void updateLogLevelCache(); +void updateLogLevelCache(); -bool loglevelActiveFor(uint8_t logLevel); +bool loglevelActiveFor(uint8_t logLevel); -uint8_t getSerialLogLevel(); +uint8_t getSerialLogLevel(); -uint8_t getWebLogLevel(); +uint8_t getWebLogLevel(); -bool loglevelActiveFor(uint8_t destination, uint8_t logLevel); +bool loglevelActiveFor(uint8_t destination, + uint8_t logLevel); +void addLog(uint8_t logLevel, + const __FlashStringHelper *str); +void addLog(uint8_t logLevel, + const char *line); +void addLog(uint8_t logLevel, + String&& str); -void addLog(uint8_t logLevel, const __FlashStringHelper *str); -void addLog(uint8_t logLevel, const char *line); -void addLog(uint8_t logLevel, String&& string); +void addLog(uint8_t logLevel, + const String& str); -void addLog(uint8_t logLevel, const String& string); -void addToLogMove(uint8_t logLevel, String&& string); - - -#endif \ No newline at end of file +void addToLogMove(uint8_t logLevel, + String&& str); diff --git a/src/src/Globals/Logging.cpp b/src/src/Globals/Logging.cpp index affbd1450..64b42915a 100644 --- a/src/src/Globals/Logging.cpp +++ b/src/src/Globals/Logging.cpp @@ -1,9 +1,7 @@ #include "../Globals/Logging.h" -#include "../DataStructs/LogStruct.h" - -LogStruct Logging; +LogHelper Logging; uint8_t highest_active_log_level = 0; bool log_to_serial_disabled = false; diff --git a/src/src/Globals/Logging.h b/src/src/Globals/Logging.h index 88f029ffc..75d304eba 100644 --- a/src/src/Globals/Logging.h +++ b/src/src/Globals/Logging.h @@ -4,11 +4,13 @@ #include #include +#include "../Helpers/Log_Helper.h" + + extern uint8_t highest_active_log_level; extern bool log_to_serial_disabled; -struct LogStruct; -extern LogStruct Logging; +extern LogHelper Logging; #endif // GLOBALS_LOGGING_H \ No newline at end of file diff --git a/src/src/Globals/Plugins.cpp b/src/src/Globals/Plugins.cpp index 1785e14ae..1045c5a9e 100644 --- a/src/src/Globals/Plugins.cpp +++ b/src/src/Globals/Plugins.cpp @@ -762,7 +762,7 @@ bool PluginCall(uint8_t Function, struct EventStruct *event, String& str) case PLUGIN_PRIORITY_INIT_ALL: { if (Function == PLUGIN_PRIORITY_INIT_ALL) { - addLogMove(LOG_LEVEL_INFO, F("INIT : Check for Priority tasks")); + addLog(LOG_LEVEL_INFO, F("INIT : Check for Priority tasks")); PluginInit(true); // Priority only, load plugins but don't initialize them yet Function = PLUGIN_PRIORITY_INIT; } diff --git a/src/src/Helpers/ESPEasy_checks.cpp b/src/src/Helpers/ESPEasy_checks.cpp index bfbd6f3f0..1611598f6 100644 --- a/src/src/Helpers/ESPEasy_checks.cpp +++ b/src/src/Helpers/ESPEasy_checks.cpp @@ -11,7 +11,7 @@ #include "../DataStructs/ExtraTaskSettingsStruct.h" #include "../DataStructs/FactoryDefaultPref.h" #include "../DataStructs/GpioFactorySettingsStruct.h" -#include "../DataStructs/LogStruct.h" +#include "../DataStructs/LogBuffer.h" #if FEATURE_ESPEASY_P2P #include "../DataStructs/NodeStruct.h" #endif @@ -108,16 +108,6 @@ void run_compiletime_checks() { check_size(); // Is not stored #endif - - // LogStruct is mainly dependent on the number of lines. - // Has to be round up to multiple of 4. - #ifdef ESP32 // ESP_IDF_VERSION_MAJOR > 3 - // String class has increased with 4 bytes - const unsigned int LogStructSize = ((13u + 24 * LOG_STRUCT_MESSAGE_LINES) + 3) & ~3; - #else - const unsigned int LogStructSize = ((13u + 20 * LOG_STRUCT_MESSAGE_LINES) + 3) & ~3; - #endif - check_size(); // Is not stored check_size(); // Is not stored check_size(); #if FEATURE_NOTIFIER diff --git a/src/src/Helpers/KeyValueWriter.h b/src/src/Helpers/KeyValueWriter.h index e0632d4ce..f4e60798f 100644 --- a/src/src/Helpers/KeyValueWriter.h +++ b/src/src/Helpers/KeyValueWriter.h @@ -13,7 +13,7 @@ class KeyValueWriter; -typedef std::shared_ptr Sp_KeyValueWriter; +typedef std::unique_ptr Sp_KeyValueWriter; // ******************************************************************************** // KeyValueWriter @@ -80,7 +80,7 @@ public: // This should be override by any writer outputting data which is not intended to be human readable. virtual bool dataOnlyOutput() const { return false; } - // TODO TD-er: Change this to std::shared_ptr + // TODO TD-er: Change this to std::unique_ptr virtual void setOutputToString(PrintToString*printToStr) { _toString = printToStr; } // Create writer of the same derived type, with this set as parent @@ -116,7 +116,7 @@ protected: return *_toString; } - // TODO TD-er: Change this to std::shared_ptr + // TODO TD-er: Change this to std::unique_ptr PrintToString *_toString = nullptr; private: diff --git a/src/src/Helpers/KeyValueWriter_JSON.cpp b/src/src/Helpers/KeyValueWriter_JSON.cpp index 52fd443ae..d8d17cb58 100644 --- a/src/src/Helpers/KeyValueWriter_JSON.cpp +++ b/src/src/Helpers/KeyValueWriter_JSON.cpp @@ -160,16 +160,16 @@ void KeyValueWriter_JSON::writeValue(const ValueStruct* val) pr.print(to_json_value(str)); } -Sp_KeyValueWriter KeyValueWriter_JSON::createChild() { return std::make_shared(this, _toString); } +Sp_KeyValueWriter KeyValueWriter_JSON::createChild() { return std::make_unique(this, _toString); } Sp_KeyValueWriter KeyValueWriter_JSON::createChild(const String& header) { - return std::make_shared(header, this, _toString); + return std::make_unique(header, this, _toString); } -Sp_KeyValueWriter KeyValueWriter_JSON::createNew() { return std::make_shared(false, _toString); } +Sp_KeyValueWriter KeyValueWriter_JSON::createNew() { return std::make_unique(false, _toString); } -Sp_KeyValueWriter KeyValueWriter_JSON::createNew(const String& header) { return std::make_shared(header, _toString); } +Sp_KeyValueWriter KeyValueWriter_JSON::createNew(const String& header) { return std::make_unique(header, _toString); } #ifdef USE_KVW_JSON_INDENT diff --git a/src/src/Helpers/Log_Helper.cpp b/src/src/Helpers/Log_Helper.cpp new file mode 100644 index 000000000..5b0cc7729 --- /dev/null +++ b/src/src/Helpers/Log_Helper.cpp @@ -0,0 +1,125 @@ +#include "../Helpers/Log_Helper.h" + + +#include "../Globals/ESPEasy_Console.h" +#include "../Helpers/Networking.h" +#include "../Helpers/StringConverter.h" + + +#include + +#if FEATURE_SD +# include +# include "../Helpers/ESPEasy_Storage.h" +#endif // if FEATURE_SD + +void addToSerialLog(uint32_t timestamp, const String& message, uint8_t loglevel) +{ + if (loglevelActiveFor(LOG_TO_SERIAL, loglevel)) { + ESPEasy_Console.addToSerialBuffer(format_msec_duration(timestamp)); + #ifndef LIMIT_BUILD_SIZE + ESPEasy_Console.addToSerialBuffer(strformat(F(" : (%d) "), FreeMem())); + #endif + { + String loglevelDisplayString = getLogLevelDisplayString(loglevel); + + while (loglevelDisplayString.length() < 6) { + loglevelDisplayString += ' '; + } + ESPEasy_Console.addToSerialBuffer(loglevelDisplayString); + } + ESPEasy_Console.addToSerialBuffer(F(" : ")); + ESPEasy_Console.addToSerialBuffer(message); + ESPEasy_Console.addNewlineToSerialBuffer(); + } +} + +void addToSysLog(uint8_t logLevel, const String& str) +{ + if (loglevelActiveFor(LOG_TO_SYSLOG, logLevel)) { + sendSyslog(logLevel, str); + } +} + +void addToSDLog(uint8_t logLevel, const String& str) +{ +#if FEATURE_SD + + if (!str.isEmpty() && loglevelActiveFor(LOG_TO_SDCARD, logLevel)) { + String logName = patch_fname(F("log.txt")); + fs::File logFile = SD.open(logName, "a+"); + + if (logFile) { + const size_t stringLength = str.length(); + + for (size_t i = 0; i < stringLength; ++i) { + logFile.print(str[i]); + } + logFile.println(); + } + logFile.close(); + } +#endif // if FEATURE_SD +} + +void LogHelper::addLogEntry(LogEntry_t&& logEntry) +{ + #ifdef ESP32 + + if (xPortInIsrContext()) { + // When called from an ISR, you should not send out logs. + // Allocating memory from within an ISR is a big no-no. + // Also long-time blocking like sending logs (especially to a syslog server) + // is also really not a good idea from an ISR call. + return; + } + #endif // ifdef ESP32 + + logEntry.setSubscribers(); + + if (!logEntry) { return; } + + _logBuffer.add(std::move(logEntry)); + + loop(); +} + +bool LogHelper::getNext(uint8_t logDestination, uint32_t& timestamp, String& message, uint8_t& loglevel) +{ + return _logBuffer.getNext(logDestination, timestamp, message, loglevel); +} + +void LogHelper::loop() { + const uint8_t destinations[] = { + // TODO TD-er: Add log buffer for 2nd serial console + LOG_TO_SERIAL, + LOG_TO_SYSLOG, + LOG_TO_SDCARD + }; + + for (int i = 0; i < NR_ELEMENTS(destinations); ++i) { + String message; + uint32_t timestamp{}; + uint8_t loglevel{}; + + if (_logBuffer.getNext(destinations[i], timestamp, message, loglevel)) + { + switch (destinations[i]) + { + case LOG_TO_SERIAL: + addToSerialLog(timestamp, message, loglevel); + break; + case LOG_TO_SYSLOG: + addToSysLog(loglevel, message); + break; + case LOG_TO_SDCARD: + addToSDLog(loglevel, message); + break; + } + } + } + + _logBuffer.clearExpiredEntries(); +} + +bool LogHelper::webLogActiveRead() { return _logBuffer.logActiveRead(); } diff --git a/src/src/Helpers/Log_Helper.h b/src/src/Helpers/Log_Helper.h new file mode 100644 index 000000000..67fd76cbb --- /dev/null +++ b/src/src/Helpers/Log_Helper.h @@ -0,0 +1,29 @@ +#pragma once + +#include "../../ESPEasy_common.h" + +#include "../DataStructs/LogBuffer.h" + +#include "../DataTypes/LogLevels.h" + +class LogHelper +{ +public: + + LogHelper() {} + + void addLogEntry(LogEntry_t&& logEntry); + + bool getNext(uint8_t logDestination, + uint32_t& timestamp, + String & message, + uint8_t & loglevel); + + void loop(); + + bool webLogActiveRead(); + +private: + + LogBuffer _logBuffer{}; +}; // class LogHelper diff --git a/src/src/Helpers/TarStream.cpp b/src/src/Helpers/TarStream.cpp index 0e1b16084..76440e5a9 100644 --- a/src/src/Helpers/TarStream.cpp +++ b/src/src/Helpers/TarStream.cpp @@ -44,7 +44,7 @@ TarStream::~TarStream() { size_t TarStream::write(uint8_t ch) { // TODO implement - addLogMove(LOG_LEVEL_ERROR, F("TarStream: write(ch) NOT IMPLEMENTED YET.")); + addLog(LOG_LEVEL_ERROR, F("TarStream: write(ch) NOT IMPLEMENTED YET.")); return 1u; } diff --git a/src/src/Helpers/ValueStruct_Factory.cpp b/src/src/Helpers/ValueStruct_Factory.cpp index 6485b8bea..e7089f3a0 100644 --- a/src/src/Helpers/ValueStruct_Factory.cpp +++ b/src/src/Helpers/ValueStruct_Factory.cpp @@ -1,63 +1,60 @@ #include "../Helpers/ValueStruct_Factory.h" -Sp_ValueStruct ValueStruct_Factory::create(const bool& val) +Up_ValueStruct ValueStruct_Factory::create(const bool& val) { - return std::make_shared >(val, ValueStruct::ValueType::Bool); + return std::make_unique >(val, ValueStruct::ValueType::Bool); } -Sp_ValueStruct ValueStruct_Factory::create(int val) { return std::make_shared >(val, ValueStruct::ValueType::Int); } +Up_ValueStruct ValueStruct_Factory::create(int val) { return std::make_unique >(val, ValueStruct::ValueType::Int); } #if defined(ESP32) && !defined(__riscv) -Sp_ValueStruct ValueStruct_Factory::create(int32_t val) +Up_ValueStruct ValueStruct_Factory::create(int32_t val) { - return std::make_shared >(val, ValueStruct::ValueType::Int); + return std::make_unique >(val, ValueStruct::ValueType::Int); } #endif // if defined(ESP32) && !defined(__riscv) -Sp_ValueStruct ValueStruct_Factory::create(uint32_t val) +Up_ValueStruct ValueStruct_Factory::create(uint32_t val) { - return std::make_shared >(val, ValueStruct::ValueType::Int); + return std::make_unique >(val, ValueStruct::ValueType::Int); } #if defined(ESP32) && !defined(__riscv) -Sp_ValueStruct ValueStruct_Factory::create(size_t val) { return std::make_shared >(val, ValueStruct::ValueType::Int); } +Up_ValueStruct ValueStruct_Factory::create(size_t val) { return std::make_unique >(val, ValueStruct::ValueType::Int); } #endif // if defined(ESP32) && !defined(__riscv) -Sp_ValueStruct ValueStruct_Factory::create(const uint64_t& val) +Up_ValueStruct ValueStruct_Factory::create(const uint64_t& val) { - return std::make_shared >(val, ValueStruct::ValueType::Int); + return std::make_unique >(val, ValueStruct::ValueType::Int); } -Sp_ValueStruct ValueStruct_Factory::create(const int64_t& val) +Up_ValueStruct ValueStruct_Factory::create(const int64_t& val) { - return std::make_shared >(val, ValueStruct::ValueType::Int); + return std::make_unique >(val, ValueStruct::ValueType::Int); } -Sp_ValueStruct ValueStruct_Factory::create( +Up_ValueStruct ValueStruct_Factory::create( const float& val, int nrDecimals, - bool trimTrailingZeros) { return std::make_shared(val, nrDecimals, trimTrailingZeros); } + bool trimTrailingZeros) { return std::make_unique(val, nrDecimals, trimTrailingZeros); } -Sp_ValueStruct ValueStruct_Factory::create( +Up_ValueStruct ValueStruct_Factory::create( const double& val, int nrDecimals, - bool trimTrailingZeros) { return std::make_shared(val, nrDecimals, trimTrailingZeros); } + bool trimTrailingZeros) { return std::make_unique(val, nrDecimals, trimTrailingZeros); } -Sp_ValueStruct ValueStruct_Factory::create( - LabelType::Enum label) { return std::make_shared(getValue(label), ValueStruct::ValueType::Auto); } +Up_ValueStruct ValueStruct_Factory::create( + LabelType::Enum label) { return std::make_unique(getValue(label)); } -Sp_ValueStruct ValueStruct_Factory::create( - const String & val, - ValueStruct::ValueType vType) { return std::make_shared(val, vType); } +Up_ValueStruct ValueStruct_Factory::create( + const String & val) { return std::make_unique(val); } -Sp_ValueStruct ValueStruct_Factory::create( - String && val, - ValueStruct::ValueType vType) { return std::make_shared(std::move(val), vType); } +Up_ValueStruct ValueStruct_Factory::create( + String && val) { return std::make_unique(std::move(val)); } -Sp_ValueStruct ValueStruct_Factory::create( - const __FlashStringHelper *val, - ValueStruct::ValueType vType) { return std::make_shared(val, vType); } +Up_ValueStruct ValueStruct_Factory::create( + const __FlashStringHelper *val) { return std::make_unique(val); } diff --git a/src/src/Helpers/ValueStruct_Factory.h b/src/src/Helpers/ValueStruct_Factory.h index 8e4f3681c..a8cfe1620 100644 --- a/src/src/Helpers/ValueStruct_Factory.h +++ b/src/src/Helpers/ValueStruct_Factory.h @@ -7,43 +7,40 @@ class ValueStruct_Factory { public: - static Sp_ValueStruct create(const bool& val); + static Up_ValueStruct create(const bool& val); - static Sp_ValueStruct create(int val); + static Up_ValueStruct create(int val); #if defined(ESP32) && !defined(__riscv) - static Sp_ValueStruct create(int32_t val); + static Up_ValueStruct create(int32_t val); #endif - static Sp_ValueStruct create(uint32_t val); + static Up_ValueStruct create(uint32_t val); #if defined(ESP32) && !defined(__riscv) - static Sp_ValueStruct create(size_t val); + static Up_ValueStruct create(size_t val); #endif - static Sp_ValueStruct create(const uint64_t& val); + static Up_ValueStruct create(const uint64_t& val); - static Sp_ValueStruct create(const int64_t& val); + static Up_ValueStruct create(const int64_t& val); - static Sp_ValueStruct create(const float& val, + static Up_ValueStruct create(const float& val, int nrDecimals = 4, bool trimTrailingZeros = false); - static Sp_ValueStruct create(const double& val, + static Up_ValueStruct create(const double& val, int nrDecimals = 4, bool trimTrailingZeros = false); - static Sp_ValueStruct create( + static Up_ValueStruct create( LabelType::Enum label); - static Sp_ValueStruct create( - const String & val, - ValueStruct::ValueType vType = ValueStruct::ValueType::String); + static Up_ValueStruct create( + const String & val); - static Sp_ValueStruct create( - String && val, - ValueStruct::ValueType vType = ValueStruct::ValueType::String); + static Up_ValueStruct create( + String && val); - static Sp_ValueStruct create( - const __FlashStringHelper *val, - ValueStruct::ValueType vType = ValueStruct::ValueType::String); + static Up_ValueStruct create( + const __FlashStringHelper *val); }; // class ValueStruct_Factory diff --git a/src/src/PluginStructs/P118_data_struct.cpp b/src/src/PluginStructs/P118_data_struct.cpp index a33615c8d..9b2db6e8a 100644 --- a/src/src/PluginStructs/P118_data_struct.cpp +++ b/src/src/PluginStructs/P118_data_struct.cpp @@ -153,7 +153,7 @@ bool P118_data_struct::plugin_write(struct EventStruct *event, const String& str if (equals(cmd, F("itho")) || stateCmd) { # ifndef BUILD_NO_DEBUG - if (stateCmd) { addLogMove(LOG_LEVEL_ERROR, F("ITHO: Command 'state' is deprecated, use 'itho' instead, see documentation.")); } + if (stateCmd) { addLog(LOG_LEVEL_ERROR, F("ITHO: Command 'state' is deprecated, use 'itho' instead, see documentation.")); } # endif // ifndef BUILD_NO_DEBUG success = true; diff --git a/src/src/PluginStructs/P123_data_struct.cpp b/src/src/PluginStructs/P123_data_struct.cpp index dd9daf867..f4501d51a 100644 --- a/src/src/PluginStructs/P123_data_struct.cpp +++ b/src/src/PluginStructs/P123_data_struct.cpp @@ -144,7 +144,7 @@ bool P123_data_struct::init(struct EventStruct *event) { addLogMove(LOG_LEVEL_INFO, concat(concat(F("P123 DEBUG Plugin"), nullptr != touchscreen ? F(" & touchscreen") : F("")), F(" initialized."))); } else { - addLogMove(LOG_LEVEL_INFO, F("P123 DEBUG Touchscreen initialization FAILED.")); + addLog(LOG_LEVEL_INFO, F("P123 DEBUG Touchscreen initialization FAILED.")); # endif // PLUGIN_123_DEBUG } return isInitialized(); diff --git a/src/src/PluginStructs/P132_data_struct.cpp b/src/src/PluginStructs/P132_data_struct.cpp index 5d999089e..0f7cb4c31 100644 --- a/src/src/PluginStructs/P132_data_struct.cpp +++ b/src/src/PluginStructs/P132_data_struct.cpp @@ -125,7 +125,7 @@ void P132_data_struct::setCalibration_INA3221(struct EventStruct *event) { # endif // ifndef BUILD_NO_DEBUG if (mfgid != 0x5449) { - addLogMove(LOG_LEVEL_ERROR, F("INA3221: Invalid Manufacturer ID! (0x5449)")); + addLog(LOG_LEVEL_ERROR, F("INA3221: Invalid Manufacturer ID! (0x5449)")); } I2C_write16_reg(_i2c_address, 0x00, static_cast(config)); diff --git a/src/src/PluginStructs/P164_data_struct.cpp b/src/src/PluginStructs/P164_data_struct.cpp index ee30716c1..5a51105b6 100644 --- a/src/src/PluginStructs/P164_data_struct.cpp +++ b/src/src/PluginStructs/P164_data_struct.cpp @@ -141,13 +141,13 @@ bool P164_data_struct::begin() { // Start connecting the device over I2C if (!start(i2cAddress)) { - addLogMove(LOG_LEVEL_ERROR, F("P164: device initialization FAILED")); + addLog(LOG_LEVEL_ERROR, F("P164: device initialization FAILED")); return false; } setMode(ENS160_OPMODE_STD); // For now we only support the standard acquisition mode #ifdef P164_ENS160_DEBUG - addLogMove(LOG_LEVEL_DEBUG, F("P164: begin(): success")); + addLog(LOG_LEVEL_DEBUG, F("P164: begin(): success")); #endif return true; } @@ -730,7 +730,7 @@ bool P164_data_struct::getFirmware() { } if (! IS_NEWGPR(this->_statusReg)) { // Check if firmware could be read result = false; - addLogMove(LOG_LEVEL_ERROR, F("P164: Could not read firmware version")); + addLog(LOG_LEVEL_ERROR, F("P164: Could not read firmware version")); } if (result) { diff --git a/src/src/WebServer/KeyValueWriter_WebForm.cpp b/src/src/WebServer/KeyValueWriter_WebForm.cpp index 0d0d6a285..1c73604c8 100644 --- a/src/src/WebServer/KeyValueWriter_WebForm.cpp +++ b/src/src/WebServer/KeyValueWriter_WebForm.cpp @@ -130,10 +130,10 @@ void KeyValueWriter_WebForm::write(const KeyValueStruct& kv) } } -Sp_KeyValueWriter KeyValueWriter_WebForm::createChild() { return std::make_shared(this); } +Sp_KeyValueWriter KeyValueWriter_WebForm::createChild() { return std::make_unique(this); } -Sp_KeyValueWriter KeyValueWriter_WebForm::createChild(const String& header) { return std::make_shared(header, this); } +Sp_KeyValueWriter KeyValueWriter_WebForm::createChild(const String& header) { return std::make_unique(header, this); } -Sp_KeyValueWriter KeyValueWriter_WebForm::createNew() { return std::make_shared(); } +Sp_KeyValueWriter KeyValueWriter_WebForm::createNew() { return std::make_unique(); } -Sp_KeyValueWriter KeyValueWriter_WebForm::createNew(const String& header) { return std::make_shared(header); } +Sp_KeyValueWriter KeyValueWriter_WebForm::createNew(const String& header) { return std::make_unique(header); } diff --git a/src/src/WebServer/Log.cpp b/src/src/WebServer/Log.cpp index 196eeaf51..54119321e 100644 --- a/src/src/WebServer/Log.cpp +++ b/src/src/WebServer/Log.cpp @@ -7,7 +7,7 @@ #include "../WebServer/Markup.h" #include "../WebServer/Markup_Buttons.h" -#include "../DataStructs/LogStruct.h" +#include "../DataStructs/LogBuffer.h" #include "../Globals/Logging.h" #include "../Globals/Settings.h" @@ -81,7 +81,7 @@ void handle_log_JSON() { } uint32_t firstTimeStamp = 0; uint32_t lastTimeStamp = 0; - int nrEntries = 0; + int nrEntries = 0; { auto entriesWriter = mainWriter->createChild(F("Entries")); @@ -94,11 +94,11 @@ void handle_log_JSON() { String message; uint8_t loglevel; - if (Logging.getNext(logLinesAvailable, lastTimeStamp, message, loglevel)) { + if (Logging.getNext(LOG_TO_WEBLOG, lastTimeStamp, message, loglevel)) { auto logWriter = entriesWriter->createChild(); if (logWriter) { - logWriter->write({ F("timestamp"), lastTimeStamp }); + logWriter->write({ F("timestamp"), format_msec_duration(lastTimeStamp) }); logWriter->write({ F("text"), std::move(message) }); logWriter->write({ F("level"), loglevel }); @@ -109,7 +109,7 @@ void handle_log_JSON() { } // Do we need to do something here and maybe limit number of lines at once? - } + } else { logLinesAvailable = false; } } } } From 881285970b578cf234d4056ec3cd2c61f0531e57 Mon Sep 17 00:00:00 2001 From: TD-er Date: Fri, 10 Oct 2025 00:04:39 +0200 Subject: [PATCH 357/564] [Log] Speedup finding 'next' log element to process --- src/src/DataStructs/LogBuffer.cpp | 23 +++++++++++++++++------ src/src/DataStructs/LogBuffer.h | 5 ++++- src/src/DataStructs/LogEntry.h | 16 +++++++++------- src/src/Helpers/Log_Helper.cpp | 3 ++- 4 files changed, 32 insertions(+), 15 deletions(-) diff --git a/src/src/DataStructs/LogBuffer.cpp b/src/src/DataStructs/LogBuffer.cpp index 036206c97..514f4bfc3 100644 --- a/src/src/DataStructs/LogBuffer.cpp +++ b/src/src/DataStructs/LogBuffer.cpp @@ -13,17 +13,22 @@ void LogBuffer::add(LogEntry_t&& logEntry) { bool LogBuffer::getNext(uint8_t logDestination, uint32_t& timestamp, String& message, uint8_t& loglevel) { + if (logDestination >= NR_LOG_TO_DESTINATIONS) { return false; } + if (logDestination == LOG_TO_WEBLOG) { lastReadTimeStamp = millis(); } - for (LogEntry_queue::iterator it = LogEntries.begin(); it != LogEntries.end(); ++it) + while (cache_iterator_pos[logDestination] < LogEntries.size()) { - if (it->validForSubscriber(logDestination)) { - timestamp = it->getTimestamp(); - message = it->getMessage(); - loglevel = it->getLogLevel(); - it->markReadBySubscriber(logDestination); + const auto pos = cache_iterator_pos[logDestination]; + ++cache_iterator_pos[logDestination]; + + if (LogEntries[pos].validForSubscriber(logDestination)) { + timestamp = LogEntries[pos].getTimestamp(); + message = LogEntries[pos].getMessage(); + loglevel = LogEntries[pos].getLogLevel(); + LogEntries[pos].markReadBySubscriber(logDestination); clearExpiredEntries(); return true; } @@ -40,6 +45,12 @@ void LogBuffer::clearExpiredEntries() { for (auto it = LogEntries.begin(); it != LogEntries.end();) { if (it->isExpired()) { + for (size_t i = 0; i < NR_LOG_TO_DESTINATIONS; ++i) { + if (cache_iterator_pos[i]) { + --cache_iterator_pos[i]; + } + } + it = LogEntries.erase(it); } else { return; diff --git a/src/src/DataStructs/LogBuffer.h b/src/src/DataStructs/LogBuffer.h index cee2c0d75..3fde6ca62 100644 --- a/src/src/DataStructs/LogBuffer.h +++ b/src/src/DataStructs/LogBuffer.h @@ -35,6 +35,7 @@ typedef std::deque LogEntry_queue; + struct LogBuffer { LogBuffer() = default; @@ -58,7 +59,9 @@ struct LogBuffer { private: LogEntry_queue LogEntries; - uint32_t lastReadTimeStamp = 0; + uint32_t lastReadTimeStamp{}; + + uint32_t cache_iterator_pos[NR_LOG_TO_DESTINATIONS]{}; }; diff --git a/src/src/DataStructs/LogEntry.h b/src/src/DataStructs/LogEntry.h index 9671686e9..7d165f27a 100644 --- a/src/src/DataStructs/LogEntry.h +++ b/src/src/DataStructs/LogEntry.h @@ -33,17 +33,19 @@ struct LogEntry_t { LogEntry_t& operator=(const LogEntry_t& rhs) = delete; - operator bool() const { return isValid(); } + operator bool() const { + return isValid(); + } - void setSubscribers(); + void setSubscribers(); - void markReadBySubscriber(uint8_t subscriber); + void markReadBySubscriber(uint8_t subscriber); - bool validForSubscriber(uint8_t subscriber) const; + bool validForSubscriber(uint8_t subscriber) const; - size_t print(Print& out, - size_t offset = 0, - size_t length = std::numeric_limits::max()) const; + size_t print(Print& out, + size_t offset = 0, + size_t length = std::numeric_limits::max()) const; String getMessage() const; diff --git a/src/src/Helpers/Log_Helper.cpp b/src/src/Helpers/Log_Helper.cpp index 5b0cc7729..5a3184dc3 100644 --- a/src/src/Helpers/Log_Helper.cpp +++ b/src/src/Helpers/Log_Helper.cpp @@ -89,7 +89,8 @@ bool LogHelper::getNext(uint8_t logDestination, uint32_t& timestamp, String& mes return _logBuffer.getNext(logDestination, timestamp, message, loglevel); } -void LogHelper::loop() { +void LogHelper::loop() +{ const uint8_t destinations[] = { // TODO TD-er: Add log buffer for 2nd serial console LOG_TO_SERIAL, From 4b6b5abd35f2f507c1b83e35e1cce70ff2a684c3 Mon Sep 17 00:00:00 2001 From: TD-er Date: Fri, 10 Oct 2025 01:31:48 +0200 Subject: [PATCH 358/564] [Build] Fix ESP8266 build fail as std::make_unique is not (yet) known --- src/src/CustomBuild/define_plugin_sets.h | 3 + src/src/DataStructs/LogEntry.cpp | 12 ++- src/src/DataStructs/LogEntry.h | 5 +- src/src/DataStructs/ValueStruct.cpp | 41 ++++++-- src/src/DataStructs/ValueStruct.h | 57 +++++++--- src/src/Helpers/KeyValueWriter_JSON.cpp | 39 +++++-- src/src/Helpers/Log_Helper.cpp | 2 +- src/src/Helpers/ValueStruct_Factory.cpp | 103 ++++++++++++++++--- src/src/WebServer/KeyValueWriter_WebForm.cpp | 48 +++++++-- 9 files changed, 253 insertions(+), 57 deletions(-) diff --git a/src/src/CustomBuild/define_plugin_sets.h b/src/src/CustomBuild/define_plugin_sets.h index 749373b58..d8290d122 100644 --- a/src/src/CustomBuild/define_plugin_sets.h +++ b/src/src/CustomBuild/define_plugin_sets.h @@ -3000,6 +3000,9 @@ To create/register a plugin, you have to : #ifdef LIMIT_BUILD_SIZE #undef LIMIT_BUILD_SIZE #endif + #ifdef BUILD_NO_DEBUG + #undef BUILD_NO_DEBUG + #endif #endif // Disable some diagnostic parts to make builds fit. diff --git a/src/src/DataStructs/LogEntry.cpp b/src/src/DataStructs/LogEntry.cpp index e53f6aafb..848fe9f3e 100644 --- a/src/src/DataStructs/LogEntry.cpp +++ b/src/src/DataStructs/LogEntry.cpp @@ -16,8 +16,9 @@ LogEntry_t::LogEntry_t(const uint8_t logLevel, _message((void *)(message)), _strLength(message ? strlen_P((const char *)(message)) : 0), _timestamp(millis()), + _isFlashString(true), _logLevel(logLevel), - _isFlashString(true) + _subscriberPendingRead(0) {} LogEntry_t::LogEntry_t(const uint8_t logLevel, @@ -25,8 +26,9 @@ LogEntry_t::LogEntry_t(const uint8_t logLevel, _message(nullptr), _strLength(message ? strlen_P((const char *)(message)) : 0), _timestamp(millis()), + _isFlashString(false), _logLevel(logLevel), - _isFlashString(false) + _subscriberPendingRead(0) { if (_strLength) { _message = special_calloc(1, _strLength + 1); @@ -42,8 +44,9 @@ LogEntry_t::LogEntry_t(const uint8_t logLevel, _message(nullptr), _strLength(message.length()), _timestamp(millis()), + _isFlashString(false), _logLevel(logLevel), - _isFlashString(false) + _subscriberPendingRead(0) { if (_strLength) { @@ -60,8 +63,9 @@ LogEntry_t::LogEntry_t(const uint8_t logLevel, _message(nullptr), _strLength(message.length()), _timestamp(millis()), + _isFlashString(false), _logLevel(logLevel), - _isFlashString(false) + _subscriberPendingRead(0) { if (_strLength) { // We can't move the allocated memory from 'message'. diff --git a/src/src/DataStructs/LogEntry.h b/src/src/DataStructs/LogEntry.h index 7d165f27a..895ac85f9 100644 --- a/src/src/DataStructs/LogEntry.h +++ b/src/src/DataStructs/LogEntry.h @@ -63,6 +63,8 @@ private: size_t _strLength; uint32_t _timestamp; union { + uint32_t _flags; + struct { uint32_t _isFlashString : 1; uint32_t _logLevel : 4; @@ -71,9 +73,6 @@ private: uint32_t unused : 19; }; - - uint32_t _flags{}; - }; }; diff --git a/src/src/DataStructs/ValueStruct.cpp b/src/src/DataStructs/ValueStruct.cpp index 927cde81c..90afd5b33 100644 --- a/src/src/DataStructs/ValueStruct.cpp +++ b/src/src/DataStructs/ValueStruct.cpp @@ -59,9 +59,9 @@ size_t ValueStruct_FlashString::print(Print& out) const ValueStruct_Double::~ValueStruct_Double() {} ValueStruct_Double::ValueStruct_Double( - double val, - uint8_t nrDecimals, - bool trimTrailingZeros) + double val, + uint8_t nrDecimals, + bool trimTrailingZeros) : ValueStruct(ValueType::Double), _val(val), _nrDecimals(nrDecimals), _trimTrailingZeros(trimTrailingZeros) {} size_t ValueStruct_Double::print(Print& out) const @@ -89,9 +89,9 @@ String ValueStruct_Double::toString(ValueType& valueType) const ValueStruct_Float::~ValueStruct_Float() {} ValueStruct_Float::ValueStruct_Float( - float val, - uint8_t nrDecimals, - bool trimTrailingZeros) + float val, + uint8_t nrDecimals, + bool trimTrailingZeros) : ValueStruct(ValueType::Float), _val(val), _nrDecimals(nrDecimals), _trimTrailingZeros(trimTrailingZeros) {} size_t ValueStruct_Float::print(Print& out) const @@ -114,3 +114,32 @@ String ValueStruct_Float::toString(ValueType& valueType) const return res; } + +// ******************************************************************************** +// ValueStruct_uint64_t +// ******************************************************************************** + +ValueStruct_uint64_t::~ValueStruct_uint64_t() {} + +ValueStruct_uint64_t::ValueStruct_uint64_t(uint64_t val, + ValueType vType) + : ValueStruct(vType), _val(val) {} + +size_t ValueStruct_uint64_t::print(Print& out) const +{ + return out.print(ull2String(_val)); +} + +// ******************************************************************************** +// ValueStruct_int64_t +// ******************************************************************************** + +ValueStruct_int64_t::~ValueStruct_int64_t() {} + +ValueStruct_int64_t::ValueStruct_int64_t(int64_t val, ValueType vType) + : ValueStruct(vType), _val(val) {} + +size_t ValueStruct_int64_t::print(Print& out) const +{ + return out.print(ll2String(_val)); +} diff --git a/src/src/DataStructs/ValueStruct.h b/src/src/DataStructs/ValueStruct.h index 75a83c90e..7f9bcb778 100644 --- a/src/src/DataStructs/ValueStruct.h +++ b/src/src/DataStructs/ValueStruct.h @@ -27,16 +27,16 @@ public: virtual ~ValueStruct() {} - virtual size_t print(Print& out) const = 0; + virtual size_t print(Print& out) const = 0; - virtual String toString() const; + virtual String toString() const; - virtual String toString(ValueType& valueType) const; + virtual String toString(ValueType& valueType) const; - virtual ValueType getValueType() const { return _valueType; }; + virtual ValueType getValueType() const { return _valueType; } protected: - + const ValueType _valueType; }; // class ValueStruct @@ -55,7 +55,7 @@ public: virtual ~ValueStruct_String(); ValueStruct_String(const String& val); - ValueStruct_String(String && val); + ValueStruct_String(String&& val); virtual size_t print(Print& out) const; @@ -82,9 +82,9 @@ public: virtual ~ValueStruct_Double(); - ValueStruct_Double(double val, - uint8_t nrDecimals = 2, - bool trimTrailingZeros = false); + ValueStruct_Double(double val, + uint8_t nrDecimals = 2, + bool trimTrailingZeros = false); virtual size_t print(Print& out) const; @@ -93,7 +93,7 @@ public: const double _val; const uint8_t _nrDecimals; const bool _trimTrailingZeros; -}; +}; // class ValueStruct_Double class ValueStruct_Float : public ValueStruct { @@ -101,9 +101,9 @@ public: virtual ~ValueStruct_Float(); - ValueStruct_Float(float val, - uint8_t nrDecimals = 2, - bool trimTrailingZeros = false); + ValueStruct_Float(float val, + uint8_t nrDecimals = 2, + bool trimTrailingZeros = false); virtual size_t print(Print& out) const; @@ -112,7 +112,36 @@ public: const float _val; const uint8_t _nrDecimals; const bool _trimTrailingZeros; -}; +}; // class ValueStruct_Float + +class ValueStruct_uint64_t : public ValueStruct +{ +public: + + virtual ~ValueStruct_uint64_t(); + + ValueStruct_uint64_t(uint64_t val, + ValueType vType); + + virtual size_t print(Print& out) const; + + const uint64_t _val; +}; // class ValueStruct_uint64_t + + +class ValueStruct_int64_t : public ValueStruct +{ +public: + + virtual ~ValueStruct_int64_t(); + + ValueStruct_int64_t(int64_t val, + ValueType vType); + + virtual size_t print(Print& out) const; + + const int64_t _val; +}; // class ValueStruct_int64_t template diff --git a/src/src/Helpers/KeyValueWriter_JSON.cpp b/src/src/Helpers/KeyValueWriter_JSON.cpp index d8d17cb58..f37cd3245 100644 --- a/src/src/Helpers/KeyValueWriter_JSON.cpp +++ b/src/src/Helpers/KeyValueWriter_JSON.cpp @@ -5,6 +5,9 @@ #include "../WebServer/HTML_wrappers.h" +#include + + KeyValueWriter_JSON::KeyValueWriter_JSON(bool emptyHeader, PrintToString *toStr) : KeyValueWriter(emptyHeader, toStr) {} @@ -130,9 +133,9 @@ void KeyValueWriter_JSON::write(const KeyValueStruct& kv) } } -void KeyValueWriter_JSON::writeValue(const ValueStruct* val) +void KeyValueWriter_JSON::writeValue(const ValueStruct*val) { - if (val == nullptr) return; + if (val == nullptr) { return; } auto& pr = getPrint(); ValueStruct::ValueType valueType(ValueStruct::ValueType::Auto); @@ -160,17 +163,41 @@ void KeyValueWriter_JSON::writeValue(const ValueStruct* val) pr.print(to_json_value(str)); } -Sp_KeyValueWriter KeyValueWriter_JSON::createChild() { return std::make_unique(this, _toString); } +Sp_KeyValueWriter KeyValueWriter_JSON::createChild() +{ + std::unique_ptr child(new (std::nothrow) KeyValueWriter_JSON(this, _toString)); + + return std::move(child); + + // return std::make_unique(this, _toString); +} Sp_KeyValueWriter KeyValueWriter_JSON::createChild(const String& header) { - return std::make_unique(header, this, _toString); + std::unique_ptr child(new (std::nothrow) KeyValueWriter_JSON(header, this, _toString)); + + return std::move(child); + + // return std::make_unique(header, this, _toString); } -Sp_KeyValueWriter KeyValueWriter_JSON::createNew() { return std::make_unique(false, _toString); } +Sp_KeyValueWriter KeyValueWriter_JSON::createNew() +{ + std::unique_ptr child(new (std::nothrow) KeyValueWriter_JSON(false, _toString)); -Sp_KeyValueWriter KeyValueWriter_JSON::createNew(const String& header) { return std::make_unique(header, _toString); } + return std::move(child); + // return std::make_unique(false, _toString); +} + +Sp_KeyValueWriter KeyValueWriter_JSON::createNew(const String& header) +{ + std::unique_ptr child(new (std::nothrow) KeyValueWriter_JSON(header, _toString)); + + return std::move(child); + + // return std::make_unique(header, _toString); +} #ifdef USE_KVW_JSON_INDENT diff --git a/src/src/Helpers/Log_Helper.cpp b/src/src/Helpers/Log_Helper.cpp index 5a3184dc3..3ec55a131 100644 --- a/src/src/Helpers/Log_Helper.cpp +++ b/src/src/Helpers/Log_Helper.cpp @@ -98,7 +98,7 @@ void LogHelper::loop() LOG_TO_SDCARD }; - for (int i = 0; i < NR_ELEMENTS(destinations); ++i) { + for (uint8_t i = 0; i < NR_ELEMENTS(destinations); ++i) { String message; uint32_t timestamp{}; uint8_t loglevel{}; diff --git a/src/src/Helpers/ValueStruct_Factory.cpp b/src/src/Helpers/ValueStruct_Factory.cpp index e7089f3a0..dffc82d33 100644 --- a/src/src/Helpers/ValueStruct_Factory.cpp +++ b/src/src/Helpers/ValueStruct_Factory.cpp @@ -2,59 +2,136 @@ Up_ValueStruct ValueStruct_Factory::create(const bool& val) { - return std::make_unique >(val, ValueStruct::ValueType::Bool); + std::unique_ptr > child(new (std::nothrow) ValueStruct_T(val, ValueStruct::ValueType::Bool)); + + return std::move(child); + + // return std::make_unique >(val, ValueStruct::ValueType::Bool); } -Up_ValueStruct ValueStruct_Factory::create(int val) { return std::make_unique >(val, ValueStruct::ValueType::Int); } +Up_ValueStruct ValueStruct_Factory::create(int val) +{ + std::unique_ptr > child(new (std::nothrow) ValueStruct_T(val, ValueStruct::ValueType::Int)); + + return std::move(child); + + // return std::make_unique >(val, ValueStruct::ValueType::Int); +} #if defined(ESP32) && !defined(__riscv) Up_ValueStruct ValueStruct_Factory::create(int32_t val) { - return std::make_unique >(val, ValueStruct::ValueType::Int); + std::unique_ptr > child(new (std::nothrow) ValueStruct_T(val, ValueStruct::ValueType::Int)); + + return std::move(child); + + // return std::make_unique >(val, ValueStruct::ValueType::Int); } #endif // if defined(ESP32) && !defined(__riscv) Up_ValueStruct ValueStruct_Factory::create(uint32_t val) { - return std::make_unique >(val, ValueStruct::ValueType::Int); + std::unique_ptr > child(new (std::nothrow) ValueStruct_T(val, ValueStruct::ValueType::Int)); + + return std::move(child); + + // return std::make_unique >(val, ValueStruct::ValueType::Int); } #if defined(ESP32) && !defined(__riscv) -Up_ValueStruct ValueStruct_Factory::create(size_t val) { return std::make_unique >(val, ValueStruct::ValueType::Int); } +Up_ValueStruct ValueStruct_Factory::create(size_t val) +{ + std::unique_ptr > child(new (std::nothrow) ValueStruct_T(val, ValueStruct::ValueType::Int)); + + return std::move(child); + + // return std::make_unique >(val, ValueStruct::ValueType::Int); +} #endif // if defined(ESP32) && !defined(__riscv) Up_ValueStruct ValueStruct_Factory::create(const uint64_t& val) { - return std::make_unique >(val, ValueStruct::ValueType::Int); + std::unique_ptr child(new (std::nothrow) ValueStruct_uint64_t(val, ValueStruct::ValueType::Int)); + + return std::move(child); + + // return std::make_unique(val, ValueStruct::ValueType::Int); } Up_ValueStruct ValueStruct_Factory::create(const int64_t& val) { - return std::make_unique >(val, ValueStruct::ValueType::Int); + + std::unique_ptr child(new (std::nothrow) ValueStruct_int64_t(val, ValueStruct::ValueType::Int)); + + return std::move(child); + + // return std::make_unique(val, ValueStruct::ValueType::Int); } Up_ValueStruct ValueStruct_Factory::create( const float& val, int nrDecimals, - bool trimTrailingZeros) { return std::make_unique(val, nrDecimals, trimTrailingZeros); } + bool trimTrailingZeros) +{ + std::unique_ptr child(new (std::nothrow) ValueStruct_Float(val, nrDecimals, trimTrailingZeros)); + + return std::move(child); + + // return std::make_unique(val, nrDecimals, trimTrailingZeros); +} Up_ValueStruct ValueStruct_Factory::create( const double& val, int nrDecimals, - bool trimTrailingZeros) { return std::make_unique(val, nrDecimals, trimTrailingZeros); } + bool trimTrailingZeros) +{ + std::unique_ptr child(new (std::nothrow) ValueStruct_Double(val, nrDecimals, trimTrailingZeros)); + + return std::move(child); + + // return std::make_unique(val, nrDecimals, trimTrailingZeros); +} Up_ValueStruct ValueStruct_Factory::create( - LabelType::Enum label) { return std::make_unique(getValue(label)); } + LabelType::Enum label) +{ + std::unique_ptr child(new (std::nothrow) ValueStruct_String(getValue(label))); + + return std::move(child); + + // return std::make_unique(getValue(label)); +} Up_ValueStruct ValueStruct_Factory::create( - const String & val) { return std::make_unique(val); } + const String& val) +{ + std::unique_ptr child(new (std::nothrow) ValueStruct_String(val)); + + return std::move(child); + + // return std::make_unique(val); +} Up_ValueStruct ValueStruct_Factory::create( - String && val) { return std::make_unique(std::move(val)); } + String&& val) +{ + std::unique_ptr child(new (std::nothrow) ValueStruct_String(std::move(val))); + + return std::move(child); + + // return std::make_unique(std::move(val)); +} Up_ValueStruct ValueStruct_Factory::create( - const __FlashStringHelper *val) { return std::make_unique(val); } + const __FlashStringHelper *val) +{ + std::unique_ptr child(new (std::nothrow) ValueStruct_FlashString(val)); + + return std::move(child); + + // return std::make_unique(val); +} diff --git a/src/src/WebServer/KeyValueWriter_WebForm.cpp b/src/src/WebServer/KeyValueWriter_WebForm.cpp index 1c73604c8..0323906e8 100644 --- a/src/src/WebServer/KeyValueWriter_WebForm.cpp +++ b/src/src/WebServer/KeyValueWriter_WebForm.cpp @@ -99,14 +99,14 @@ void KeyValueWriter_WebForm::write(const KeyValueStruct& kv) if (kv._values[i]) { - String str(kv._values[i]->toString()); + String str(kv._values[i]->toString()); - if (!plain_text && (str.indexOf('\n') != -1)) - { - str.replace(F("\n"), F("
    ")); + if (!plain_text && (str.indexOf('\n') != -1)) + { + str.replace(F("\n"), F("
    ")); + } + getPrint().print(str); } - getPrint().print(str); - } } // May need to include the unit before ending @@ -130,10 +130,38 @@ void KeyValueWriter_WebForm::write(const KeyValueStruct& kv) } } -Sp_KeyValueWriter KeyValueWriter_WebForm::createChild() { return std::make_unique(this); } +Sp_KeyValueWriter KeyValueWriter_WebForm::createChild() +{ + std::unique_ptr child(new (std::nothrow) KeyValueWriter_WebForm(this)); -Sp_KeyValueWriter KeyValueWriter_WebForm::createChild(const String& header) { return std::make_unique(header, this); } + return std::move(child); -Sp_KeyValueWriter KeyValueWriter_WebForm::createNew() { return std::make_unique(); } + // return std::make_unique(this); +} -Sp_KeyValueWriter KeyValueWriter_WebForm::createNew(const String& header) { return std::make_unique(header); } +Sp_KeyValueWriter KeyValueWriter_WebForm::createChild(const String& header) +{ + std::unique_ptr child(new (std::nothrow) KeyValueWriter_WebForm(header, this)); + + return std::move(child); + + // return std::make_unique(header, this); +} + +Sp_KeyValueWriter KeyValueWriter_WebForm::createNew() +{ + std::unique_ptr child(new (std::nothrow) KeyValueWriter_WebForm()); + + return std::move(child); + + // return std::make_unique(); +} + +Sp_KeyValueWriter KeyValueWriter_WebForm::createNew(const String& header) +{ + std::unique_ptr child(new (std::nothrow) KeyValueWriter_WebForm(header)); + + return std::move(child); + + // return std::make_unique(header); +} From 6f5be97fe9486b2815c94b88f5344e09fa3cc508 Mon Sep 17 00:00:00 2001 From: TD-er Date: Fri, 10 Oct 2025 16:46:41 +0200 Subject: [PATCH 359/564] [WebLog] Send many log messages in chunks of 200 msec. --- src/src/DataStructs/LogBuffer.cpp | 16 ++++++++++++++++ src/src/DataStructs/LogBuffer.h | 3 +++ src/src/Helpers/Log_Helper.cpp | 5 +++++ src/src/Helpers/Log_Helper.h | 2 ++ src/src/WebServer/Log.cpp | 13 ++++++++++--- 5 files changed, 36 insertions(+), 3 deletions(-) diff --git a/src/src/DataStructs/LogBuffer.cpp b/src/src/DataStructs/LogBuffer.cpp index 514f4bfc3..50da7159d 100644 --- a/src/src/DataStructs/LogBuffer.cpp +++ b/src/src/DataStructs/LogBuffer.cpp @@ -36,6 +36,22 @@ bool LogBuffer::getNext(uint8_t logDestination, uint32_t& timestamp, String& mes return false; } +uint32_t LogBuffer::getNrMessages(uint8_t logDestination) const +{ + uint32_t res{}; + if (logDestination >= NR_LOG_TO_DESTINATIONS) { return res; } + + uint32_t pos = cache_iterator_pos[logDestination]; + for (;pos < LogEntries.size(); ++pos) { + if (LogEntries[pos].validForSubscriber(logDestination)) { + ++res; + } + } + return res; + + +} + bool LogBuffer::logActiveRead() { clearExpiredEntries(); return timePassedSince(lastReadTimeStamp) < LOG_BUFFER_ACTIVE_READ_TIMEOUT; diff --git a/src/src/DataStructs/LogBuffer.h b/src/src/DataStructs/LogBuffer.h index 3fde6ca62..00ef61622 100644 --- a/src/src/DataStructs/LogBuffer.h +++ b/src/src/DataStructs/LogBuffer.h @@ -52,6 +52,9 @@ struct LogBuffer { String & message, uint8_t & loglevel); + // Return the number of messages left for given log destination. + uint32_t getNrMessages(uint8_t logDestination) const; + bool logActiveRead(); void clearExpiredEntries(); diff --git a/src/src/Helpers/Log_Helper.cpp b/src/src/Helpers/Log_Helper.cpp index 3ec55a131..e22072922 100644 --- a/src/src/Helpers/Log_Helper.cpp +++ b/src/src/Helpers/Log_Helper.cpp @@ -89,6 +89,11 @@ bool LogHelper::getNext(uint8_t logDestination, uint32_t& timestamp, String& mes return _logBuffer.getNext(logDestination, timestamp, message, loglevel); } +uint32_t LogHelper::getNrMessages(uint8_t logDestination) const +{ + return _logBuffer.getNrMessages(logDestination); +} + void LogHelper::loop() { const uint8_t destinations[] = { diff --git a/src/src/Helpers/Log_Helper.h b/src/src/Helpers/Log_Helper.h index 67fd76cbb..6e1a80dc8 100644 --- a/src/src/Helpers/Log_Helper.h +++ b/src/src/Helpers/Log_Helper.h @@ -19,6 +19,8 @@ public: String & message, uint8_t & loglevel); + uint32_t getNrMessages(uint8_t logDestination) const; + void loop(); bool webLogActiveRead(); diff --git a/src/src/WebServer/Log.cpp b/src/src/WebServer/Log.cpp index 54119321e..a80310ac4 100644 --- a/src/src/WebServer/Log.cpp +++ b/src/src/WebServer/Log.cpp @@ -8,6 +8,7 @@ #include "../WebServer/Markup_Buttons.h" #include "../DataStructs/LogBuffer.h" +#include "../DataStructs/TimingStats.h" #include "../Globals/Logging.h" #include "../Globals/Settings.h" @@ -49,6 +50,7 @@ void handle_log() { void handle_log_JSON() { if (!isLoggedIn()) { return; } #ifdef WEBSERVER_LOG + START_TIMER; TXBuffer.startJsonStream(); { KeyValueWriter_JSON top(true); @@ -83,14 +85,16 @@ void handle_log_JSON() { uint32_t lastTimeStamp = 0; int nrEntries = 0; + bool logLinesAvailable = true; { auto entriesWriter = mainWriter->createChild(F("Entries")); if (entriesWriter) { entriesWriter->setIsArray(); - bool logLinesAvailable = true; - while (logLinesAvailable) { + uint32_t startTime = millis(); + + while (logLinesAvailable && timePassedSince(startTime) < 200) { String message; uint8_t loglevel; @@ -113,10 +117,12 @@ void handle_log_JSON() { } } } + const uint32_t nrEntriesLeft = Logging.getNrMessages(LOG_TO_WEBLOG); int32_t logTimeSpan = timeDiff(firstTimeStamp, lastTimeStamp); - int32_t refreshSuggestion = 1000; + int32_t refreshSuggestion = (nrEntriesLeft > 0) ? 200 : 1000; int32_t newOptimum = 1000; + if ((nrEntries > 2) && (logTimeSpan > 1)) { // May need to lower the TTL for refresh when time needed // to fill half the log is lower than current TTL @@ -139,6 +145,7 @@ void handle_log_JSON() { } } TXBuffer.endStream(); + STOP_TIMER(HANDLE_SERVING_WEBPAGE_JSON); updateLogLevelCache(); #else // ifdef WEBSERVER_LOG From b0c0be6e272a6d3e40203f4ac1077268589bb3a1 Mon Sep 17 00:00:00 2001 From: Ton Huisman Date: Fri, 10 Oct 2025 20:43:13 +0200 Subject: [PATCH 360/564] [MQTT] Minor corrections --- src/src/Helpers/_CPlugin_Helper_mqtt.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/src/Helpers/_CPlugin_Helper_mqtt.cpp b/src/src/Helpers/_CPlugin_Helper_mqtt.cpp index a4f327bc1..fecbbc861 100644 --- a/src/src/Helpers/_CPlugin_Helper_mqtt.cpp +++ b/src/src/Helpers/_CPlugin_Helper_mqtt.cpp @@ -420,7 +420,7 @@ const char mqtt_binary_deviceclass_names[] PROGMEM = String MQTT_binary_deviceClassName(int devClassIndex) { char tmp[17]{}; // length: battery_charging + \0 - String result(GetTextIndexed(tmp, sizeof(tmp), devClassIndex, mqtt_binary_deviceclass_names)); + const String result(GetTextIndexed(tmp, sizeof(tmp), devClassIndex, mqtt_binary_deviceclass_names)); return result; } @@ -429,7 +429,7 @@ int MQTT_binary_deviceClassIndex(const String& deviceClassName) { return GetCommandCode(deviceClassName.c_str(), mqtt_binary_deviceclass_names); } -// TwoWay devices are marked with ² in the selector, and disvocered as 'light' instead of 'binary_sensor' +// TwoWay devices are marked with ² in the selector, and discovered as 'light' instead of 'binary_sensor' bool MQTT_binary_deviceClassTwoWay(int devClassIndex) { switch (devClassIndex) { // Index into mqtt_binary_deviceclass_names case 1: // power From af56ce7fb6b6873c5baf7572a5de590bd01ce29d Mon Sep 17 00:00:00 2001 From: TD-er Date: Fri, 10 Oct 2025 20:52:28 +0200 Subject: [PATCH 361/564] [TLS] Update TLS to be able to use ECDHE_ECDSA_AES_128_GCM_SHA256 cipher --- lib/lib_ssl/bearssl-esp8266/conf/esp8266.mk | 4 +- .../bearssl-esp8266/src/codec/pemdec.c | 10 +- .../bearssl-esp8266/src/ec/_ec_c25519_m15.c | 308 +++++++ .../bearssl-esp8266/src/ec/_ec_p256_m15.c | 468 +++++++++++ .../bearssl-esp8266/src/ec/ec_c25519_m15.c | 2 +- .../bearssl-esp8266/src/hash/_sha_hal_idf5x.c | 754 ++++++++++++++++++ lib/lib_ssl/bearssl-esp8266/src/hash/md5.c | 9 +- .../bearssl-esp8266/src/hash/sha2small.c | 8 +- .../bearssl-esp8266/src/int/i15_fmont.c | 8 +- .../bearssl-esp8266/src/int/i15_moddiv.c | 8 +- .../bearssl-esp8266/src/int/i15_mulacc.c | 8 +- lib/lib_ssl/bearssl-esp8266/src/rand/sysrng.c | 116 +-- .../bearssl-esp8266/src/rsa/rsa_i15_pub.c | 8 +- .../src/ssl/ssl_ccert_single_ec.c | 1 - .../bearssl-esp8266/src/ssl/ssl_hs_client.c | 13 +- .../bearssl-esp8266/src/ssl/ssl_hs_server.c | 17 +- .../bearssl-esp8266/src/t_bearssl_x509.h | 78 +- lib/lib_ssl/bearssl-esp8266/src/t_config.h | 30 +- lib/lib_ssl/bearssl-esp8266/src/t_inner.h | 8 +- .../bearssl-esp8266/src/x509/pkey_decoder.c | 17 +- .../bearssl-esp8266/src/x509/skey_decoder.c | 17 +- .../bearssl-esp8266/src/x509/x509_decoder.c | 17 +- .../bearssl-esp8266/src/x509/x509_minimal.c | 70 +- .../src/WiFiClientSecureLightBearSSL.cpp | 294 +++---- .../src/WiFiClientSecureLightBearSSL.h | 32 +- src/src/ESPEasyCore/Controller.cpp | 4 +- src/src/Globals/MQTT.cpp | 2 +- src/src/WebServer/ControllerPage.cpp | 93 +++ 28 files changed, 1909 insertions(+), 495 deletions(-) create mode 100644 lib/lib_ssl/bearssl-esp8266/src/ec/_ec_c25519_m15.c create mode 100644 lib/lib_ssl/bearssl-esp8266/src/ec/_ec_p256_m15.c create mode 100644 lib/lib_ssl/bearssl-esp8266/src/hash/_sha_hal_idf5x.c mode change 100644 => 100755 lib/lib_ssl/tls_mini/src/WiFiClientSecureLightBearSSL.cpp mode change 100644 => 100755 lib/lib_ssl/tls_mini/src/WiFiClientSecureLightBearSSL.h diff --git a/lib/lib_ssl/bearssl-esp8266/conf/esp8266.mk b/lib/lib_ssl/bearssl-esp8266/conf/esp8266.mk index bcbdd68b0..5c409b8be 100644 --- a/lib/lib_ssl/bearssl-esp8266/conf/esp8266.mk +++ b/lib/lib_ssl/bearssl-esp8266/conf/esp8266.mk @@ -10,8 +10,8 @@ BUILD = esp8266 # C compiler, linker, and static library builder. TOOLCHAIN_PREFIX := xtensa-lx106-elf- CC := $(TOOLCHAIN_PREFIX)gcc -CFLAGS = -W -Wall -g -O2 -Wpointer-arith -Wl,-EL -nostdlib -mlongcalls -mno-text-section-literals -ffunction-sections -fdata-sections -Werror -free -fipa-pta -mextra-l32r-costs=5 -CFLAGS += -D__ets__ -DICACHE_FLASH -DESP8266 -DBR_SLOW_MUL15=1 -DPGM_READ_UNALIGNED=0 +CFLAGS = -W -Wall -g -O2 -Wpointer-arith -Wl,-EL -nostdlib -mlongcalls -mno-text-section-literals -ffunction-sections -fdata-sections -Werror +CFLAGS += -D__ets__ -DICACHE_FLASH -DESP8266 -DBR_SLOW_MUL15=1 LD := $(TOOLCHAIN_PREFIX)ld AR := $(TOOLCHAIN_PREFIX)ar diff --git a/lib/lib_ssl/bearssl-esp8266/src/codec/pemdec.c b/lib/lib_ssl/bearssl-esp8266/src/codec/pemdec.c index cb00c2348..0de8d3414 100644 --- a/lib/lib_ssl/bearssl-esp8266/src/codec/pemdec.c +++ b/lib/lib_ssl/bearssl-esp8266/src/codec/pemdec.c @@ -412,7 +412,7 @@ br_pem_decoder_run(void *t0ctx) break; case 17: { /* co */ - T0_CO(); + T0_CO(); } break; case 18: { @@ -425,12 +425,12 @@ br_pem_decoder_run(void *t0ctx) break; case 19: { /* drop */ - (void)T0_POP(); + (void)T0_POP(); } break; case 20: { /* dup */ - T0_PUSH(T0_PEEK(0)); + T0_PUSH(T0_PEEK(0)); } break; case 21: { @@ -474,7 +474,7 @@ br_pem_decoder_run(void *t0ctx) break; case 24: { /* over */ - T0_PUSH(T0_PEEK(1)); + T0_PUSH(T0_PEEK(1)); } break; case 25: { @@ -506,7 +506,7 @@ br_pem_decoder_run(void *t0ctx) break; case 27: { /* swap */ - T0_SWAP(); + T0_SWAP(); } break; case 28: { diff --git a/lib/lib_ssl/bearssl-esp8266/src/ec/_ec_c25519_m15.c b/lib/lib_ssl/bearssl-esp8266/src/ec/_ec_c25519_m15.c new file mode 100644 index 000000000..5aa467b92 --- /dev/null +++ b/lib/lib_ssl/bearssl-esp8266/src/ec/_ec_c25519_m15.c @@ -0,0 +1,308 @@ +/* + * _ec_c25519_m15.c — BearSSL Curve25519 (X25519) implementation using ESP32 ROM-backed Montgomery arithmetic + * + * This file provides a fast Montgomery ladder implementation for Curve25519 scalar + * multiplication (X25519), leveraging the ESP32's ROM bigint accelerator for modular + * multiplication in the prime field p = 2^255 - 19. + * + * Key features: + * - Field arithmetic in the normal domain using single-step ROM-backed multiply/square. + * - 8×32-bit little-endian limb representation for all field elements. + * - Constant-time Montgomery ladder for scalar multiplication. + * - RFC 7748–compliant clamping of scalar inputs. + * - Supports multiplication by arbitrary u‑coordinates and basepoint generation. + * - Fully compatible with BearSSL's ec_impl API. + * + * Internal operations avoid heap allocation and use fixed-size buffers. + * + * Requires: ESP32 platform with SOC_MPI_SUPPORTED enabled. + * + * Author: Christian Baars + */ + +#if defined(USE_SHA_ROM) +#if defined(ESP_PLATFORM) && !defined(ESP8266) && !defined(CONFIG_IDF_TARGET_ESP32) + +#if __has_include("soc/sha_caps.h") +# include "soc/sha_caps.h" +#elif __has_include("soc/soc_caps.h") +# include "soc/soc_caps.h" +#else +# error "No ESP capability header found" +#endif + +#if SOC_MPI_SUPPORTED + +#include "rom/bigint.h" +#include "t_inner.h" + +#define WORDS 8 /* 8×32-bit limbs */ + +/* Prime p = 2^255 - 19 (little-endian 32-bit limbs) */ +static const uint32_t P_LE[WORDS] = { + 0xFFFFFFED, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, + 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0x7FFFFFFF +}; + +/* R^2 mod p (with R = 2^256 mod p = 38) */ +static const uint32_t RR_LE[WORDS] = { 1444, 0,0,0,0,0,0,0 }; + +/* A24 = 121665 (normal-domain constant) */ +static const uint32_t A24_LE[WORDS] = { 121665, 0,0,0,0,0,0,0 }; + +static const uint32_t MPRIME = 0x286BCA1B; + +/* ---------- limb utilities ---------- */ + +static inline void zclear(uint32_t *a) { memset(a, 0, WORDS * sizeof(uint32_t)); } +static inline void zcopy(uint32_t *dst, const uint32_t *src) { memcpy(dst, src, WORDS * sizeof(uint32_t)); } + +/* ct compare: return 1 if a >= b, else 0 */ +static inline uint32_t ge_ct(const uint32_t *a, const uint32_t *b) { + uint32_t gt = 0, eq = 1; + for (int i = WORDS - 1; i >= 0; i--) { + uint32_t ai = a[i], bi = b[i]; + uint32_t gt_i = (ai > bi); + uint32_t lt_i = (ai < bi); + gt |= (eq & gt_i); + eq &= ~(gt_i | lt_i); + } + return gt | eq; +} + +static inline void add_mod(uint32_t *d, const uint32_t *a, const uint32_t *b) { + uint64_t c = 0; + for (int i = 0; i < WORDS; i++) { + c = (uint64_t)a[i] + b[i] + (c >> 32); + d[i] = (uint32_t)c; + } + uint32_t need_sub = (uint32_t)(c >> 32); + need_sub |= ge_ct(d, P_LE); + uint32_t borrow = 0, tmp[WORDS]; + for (int i = 0; i < WORDS; i++) { + uint64_t t = (uint64_t)d[i] - P_LE[i] - borrow; + tmp[i] = (uint32_t)t; + borrow = (uint32_t)(t >> 63); + } + for (int i = 0; i < WORDS; i++) d[i] = need_sub ? tmp[i] : d[i]; +} + +static inline void sub_mod(uint32_t *d, const uint32_t *a, const uint32_t *b) { + uint32_t borrow = 0; + for (int i = 0; i < WORDS; i++) { + uint64_t t = (uint64_t)a[i] - b[i] - borrow; + d[i] = (uint32_t)t; + borrow = (uint32_t)(t >> 63); + } + uint64_t c = 0, tmp[WORDS]; + for (int i = 0; i < WORDS; i++) { + c = (uint64_t)d[i] + P_LE[i] + (c >> 32); + tmp[i] = (uint32_t)c; + } + for (int i = 0; i < WORDS; i++) d[i] = borrow ? tmp[i] : d[i]; +} + +static inline void field_mul(uint32_t *dst, const uint32_t *a, const uint32_t *b) { + ets_bigint_enable(); + ets_bigint_modmult(a, b, P_LE, MPRIME, RR_LE, WORDS); + ets_bigint_wait_finish(); + ets_bigint_getz(dst, WORDS); + ets_bigint_disable(); +} + +static inline void field_sqr(uint32_t *dst, const uint32_t *a) { + field_mul(dst, a, a); +} + +/* Fermat inversion: a^(p-2) in normal domain */ +static void field_inv(uint32_t *out, const uint32_t *a) { + static const uint32_t EXP_P_MINUS_2[WORDS] = { + 0xFFFFFFEB, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, + 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0x7FFFFFFF + }; + uint32_t res[WORDS], base[WORDS]; + zclear(res); res[0] = 1; + zcopy(base, a); + for (int wi = WORDS - 1; wi >= 0; wi--) { + uint32_t w = EXP_P_MINUS_2[wi]; + for (int b = 31; b >= 0; b--) { + field_sqr(res, res); + if ((w >> b) & 1U) field_mul(res, res, base); + } + } + zcopy(out, res); +} + +/* Conditional swap */ +static inline void cswap(uint32_t *a, uint32_t *b, uint32_t ctl) { + uint32_t mask = -ctl; + for (int i = 0; i < WORDS; i++) { + uint32_t t = (a[i] ^ b[i]) & mask; + a[i] ^= t; b[i] ^= t; + } +} + +/* ---------- X25519 ladder (normal domain) ---------- */ + +static const unsigned char GEN[] PROGMEM = { + 0x09, 0,0,0, 0,0,0,0, 0,0,0,0, 0,0,0,0, + 0,0,0,0, 0,0,0,0, 0,0,0,0, 0,0,0,0 +}; + +static const unsigned char ORDER[] PROGMEM = { + 0x7F, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, + 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, + 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, + 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF +}; + +static const unsigned char * +api_generator(int curve, size_t *len) +{ + (void)curve; + *len = 32; + return GEN; +} + +static const unsigned char * +api_order(int curve, size_t *len) +{ + (void)curve; + *len = 32; + return ORDER; +} + +static size_t +api_xoff(int curve, size_t *len) +{ + (void)curve; + *len = 32; + return 0; +} + +static uint32_t +api_mul(unsigned char *G, size_t Glen, + const unsigned char *kb, size_t kblen, int curve) +{ + (void)curve; + + if (Glen != 32 || kblen > 32) { + return 0; + } + + /* Clamp scalar per RFC 7748 */ + unsigned char k[32]; + memset(k, 0, 32 - kblen); + memcpy(k + (32 - kblen), kb, kblen); + k[31] &= 0xF8; + k[0] &= 0x7F; + k[0] |= 0x40; + + /* Load u and clear high bit per RFC 7748 */ + unsigned char u_bytes[32]; + memcpy(u_bytes, G, 32); + u_bytes[31] &= 0x7F; + + uint32_t x1[WORDS], x2[WORDS], z2[WORDS], x3[WORDS], z3[WORDS]; + br_range_dec32le(x1, WORDS, u_bytes); + + /* Initialize: + * (x2:z2) = (1:0) + * (x3:z3) = (u:1) + */ + zclear(z2); + zclear(x2); x2[0] = 1; + zcopy(x3, x1); + zclear(z3); z3[0] = 1; + + uint32_t a[WORDS], aa[WORDS], b[WORDS], bb[WORDS]; + uint32_t c[WORDS], d[WORDS], e[WORDS], da[WORDS], cb[WORDS]; + uint32_t t[WORDS]; + + uint32_t swap = 0; + for (int i = 254; i >= 0; i--) { + uint32_t kt = (k[31 - (i >> 3)] >> (i & 7)) & 1U; + swap ^= kt; + cswap(x2, x3, swap); + cswap(z2, z3, swap); + swap = kt; + + /* Ladder step */ + add_mod(a, x2, z2); /* a = x2 + z2 */ + sub_mod(b, x2, z2); /* b = x2 - z2 */ + field_sqr(aa, a); /* aa = a^2 */ + field_sqr(bb, b); /* bb = b^2 */ + sub_mod(e, aa, bb); /* e = aa - bb */ + + add_mod(c, x3, z3); /* c = x3 + z3 */ + sub_mod(d, x3, z3); /* d = x3 - z3 */ + field_mul(da, d, a); /* da = d * a */ + field_mul(cb, c, b); /* cb = c * b */ + + add_mod(x3, da, cb); /* x3 = (da + cb)^2 */ + field_sqr(x3, x3); + sub_mod(z3, da, cb); /* z3 = (da - cb)^2 * x1 */ + field_sqr(z3, z3); + field_mul(z3, z3, x1); + + field_mul(x2, aa, bb); /* x2 = aa * bb */ + + /* z2 = e * (aa + A24 * e) */ + field_mul(t, A24_LE, e); /* t = A24 * e */ + add_mod(t, t, aa); /* t = aa + A24*e */ + field_mul(z2, e, t); /* z2 = e * t */ + } + + cswap(x2, x3, swap); + cswap(z2, z3, swap); + + /* u = x2 / z2 */ + uint32_t z2i[WORDS], unorm[WORDS]; + field_inv(z2i, z2); + field_mul(unorm, x2, z2i); + + /* Final reduction if needed and serialize */ + if (ge_ct(unorm, P_LE)) { + sub_mod(unorm, unorm, P_LE); + } + br_range_enc32le(G, unorm, WORDS); + return 1; +} + +static size_t +api_mulgen(unsigned char *R, + const unsigned char *x, size_t xlen, int curve) +{ + const unsigned char *G0; + size_t Glen; + + G0 = api_generator(curve, &Glen); + memcpy_P(R, G0, Glen); + api_mul(R, Glen, x, xlen, curve); + return Glen; +} + +static uint32_t +api_muladd(unsigned char *A, const unsigned char *B, size_t len, + const unsigned char *x, size_t xlen, + const unsigned char *y, size_t ylen, int curve) +{ + (void)A; (void)B; (void)len; (void)x; (void)xlen; (void)y; (void)ylen; (void)curve; + /* Not applicable for Curve25519 (no ECDSA). */ + return 0; +} + +/* see bearssl_ec.h */ +const br_ec_impl br_ec_c25519_m15 PROGMEM = { + (uint32_t)0x20000000, + &api_generator, + &api_order, + &api_xoff, + &api_mul, + &api_mulgen, + &api_muladd +}; + +#endif /* SOC_MPI_SUPPORTED */ +#endif /* ESP_PLATFORM && !ESP8266 */ +#endif /* USE_SHA_ROM */ diff --git a/lib/lib_ssl/bearssl-esp8266/src/ec/_ec_p256_m15.c b/lib/lib_ssl/bearssl-esp8266/src/ec/_ec_p256_m15.c new file mode 100644 index 000000000..69d4f519f --- /dev/null +++ b/lib/lib_ssl/bearssl-esp8266/src/ec/_ec_p256_m15.c @@ -0,0 +1,468 @@ +/* + * _ec_p256_m15.c — BearSSL P-256 implementation using ESP32 ROM-backed Montgomery arithmetic + * + * This file provides a fast elliptic curve implementation for secp256r1 (P-256), + * leveraging the ESP32's ROM bigint accelerator for modular multiplication. + * + * Key features: + * - Field arithmetic in normal domain using Montgomery-backed multiply/square. + * - Jacobian point representation with full group law (point add/double). + * - Scalar multiplication via double-and-add, supporting arbitrary base points. + * - Conversion between affine and Jacobian coordinates. + * - Compact encoding/decoding of uncompressed points (04 || X || Y). + * - Fully compatible with BearSSL's ec_impl API. + * + * All field elements are stored as 8×32-bit little-endian limbs. + * Internal operations avoid heap allocation and use fixed-size buffers. + * + * Requires: ESP32 platform with SOC_MPI_SUPPORTED enabled. + * + * Author: Christian Baars + */ + +#if defined(USE_SHA_ROM) +#if defined(ESP_PLATFORM) && !defined(ESP8266) && !defined(CONFIG_IDF_TARGET_ESP32) + +#if __has_include("soc/sha_caps.h") +# include "soc/sha_caps.h" +#elif __has_include("soc/soc_caps.h") +# include "soc/soc_caps.h" +#else +# error "No ESP capability header found" +#endif + +#if SOC_MPI_SUPPORTED + +#include +#include "rom/bigint.h" +#include "t_inner.h" + +#define WORDS 8 + +/* ESP32 ROM Montgomery parameters (little-endian).*/ +static const uint32_t P_LE[8] = { + 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0x00000000, + 0x00000000, 0x00000000, 0x00000001, 0xFFFFFFFF +}; + +static const uint32_t RR_LE[8] = { + 0x03000000, 0x00000000, 0xFFFFFFFF, 0xFBFFFFFF, + 0xFEFFFFFF, 0xFFFFFFFF, 0xFDFFFFFF, 0x04000000 +}; + +/* -p^{-1} mod 2^32 */ +static const uint32_t MPRIME = 0x00000001; + +/* Factor to convert ROM Montgomery output back to normal domain (8 limbs) */ +static const uint32_t CINV2_LE[8] = { + 0xB15F7DC9, 0x21BC7192, 0xF82DEBEB, 0xF2086906, + 0x8AD3BB54, 0xE34453E4, 0xB2B4EF16, 0x5FF55809 +}; + +/* Generator point G in little-endian 32-bit limbs (LSW first) */ +static const uint32_t Gx[WORDS] = { + 0xD898C296, 0xF4A13945, 0x2DEB33A0, 0x77037D81, + 0x63A440F2, 0xF8BCE6E5, 0xE12C4247, 0x6B17D1F2 +}; + +static const uint32_t Gy[WORDS] = { + 0x37BF51F5, 0xCBB64068, 0x6B315ECE, 0x2BCE3357, + 0x7C0F9E16, 0x8EE7EB4A, 0xFE1A7F9B, 0x4FE342E2 +}; + +typedef struct { + uint32_t X[WORDS]; + uint32_t Y[WORDS]; + uint32_t Z[WORDS]; +} p256_pt; + +/* ---------- small utilities ---------- */ + +static inline void zclear(uint32_t *dst) { + memset(dst, 0, WORDS * sizeof(uint32_t)); +} + +static inline void zcopy(uint32_t *dst, const uint32_t *src) { + memcpy(dst, src, WORDS * sizeof(uint32_t)); +} + +static inline int is_zero(const uint32_t *a) { + uint32_t acc = 0; + for (int i = 0; i < WORDS; i++) acc |= a[i]; + return acc == 0; +} + +/* big-endian bytes -> internal little-endian limbs (reverse word order) */ +static void be32_to_le32(const uint8_t *src, uint32_t *dst) { + for (int i = 0; i < WORDS; i++) { + int j = WORDS - 1 - i; + dst[i] = ((uint32_t)src[4*j] << 24) + | ((uint32_t)src[4*j + 1] << 16) + | ((uint32_t)src[4*j + 2] << 8) + | ((uint32_t)src[4*j + 3]); + } +} + +/* internal little-endian limbs -> big-endian bytes (reverse word order) */ +static void le32_to_be32(const uint32_t *src, uint8_t *dst) { + for (int i = 0; i < WORDS; i++) { + int j = WORDS - 1 - i; + dst[4*j] = (uint8_t)(src[i] >> 24); + dst[4*j + 1] = (uint8_t)(src[i] >> 16); + dst[4*j + 2] = (uint8_t)(src[i] >> 8); + dst[4*j + 3] = (uint8_t)(src[i]); + } +} + +/* ---------- field arithmetic modulo p (normal domain) ---------- */ + +static inline const uint32_t *Pmod(void) { return P_LE; } + +static int ge_mod_p(const uint32_t *a) { + const uint32_t *P = Pmod(); + for (int i = WORDS - 1; i >= 0; i--) { + if (a[i] > P[i]) return 1; + if (a[i] < P[i]) return 0; + } + return 1; /* equal */ +} + +static void field_add_mod(uint32_t *dst, const uint32_t *a, const uint32_t *b) { + const uint32_t *P = Pmod(); + uint64_t carry = 0; + for (int i = 0; i < WORDS; i++) { + uint64_t sum = (uint64_t)a[i] + b[i] + carry; + dst[i] = (uint32_t)sum; + carry = sum >> 32; + } + if (carry || ge_mod_p(dst)) { + uint64_t borrow = 0; + for (int i = 0; i < WORDS; i++) { + uint64_t diff = (uint64_t)dst[i] - P[i] - borrow; + dst[i] = (uint32_t)diff; + borrow = (diff >> 63) & 1; + } + } +} + +static void field_sub_mod(uint32_t *dst, const uint32_t *a, const uint32_t *b) { + const uint32_t *P = Pmod(); + uint64_t borrow = 0; + for (int i = 0; i < WORDS; i++) { + uint64_t diff = (uint64_t)a[i] - b[i] - borrow; + dst[i] = (uint32_t)diff; + borrow = (diff >> 63) & 1; + } + if (borrow) { + uint64_t carry = 0; + for (int i = 0; i < WORDS; i++) { + uint64_t sum = (uint64_t)dst[i] + P[i] + carry; + dst[i] = (uint32_t)sum; + carry = sum >> 32; + } + } +} + +/* ROM-backed modular multiply returning normal-domain result (8 limbs) */ +static void rom_field_mul(uint32_t *dst, const uint32_t *a, const uint32_t *b) { + uint32_t tmp[WORDS]; + + ets_bigint_enable(); + + /* Montgomery multiply in ROM (returns Montgomery residue) */ + ets_bigint_modmult(a, b, P_LE, MPRIME, RR_LE, WORDS); + ets_bigint_wait_finish(); + ets_bigint_getz(tmp, WORDS); + + /* Convert out of Montgomery domain using the proven CINV2_LE */ + ets_bigint_modmult(tmp, CINV2_LE, P_LE, MPRIME, RR_LE, WORDS); + ets_bigint_wait_finish(); + ets_bigint_getz(dst, WORDS); + + ets_bigint_disable(); +} + +static inline void field_mul(uint32_t *dst, const uint32_t *a, const uint32_t *b) { + rom_field_mul(dst, a, b); +} + +static inline void field_sqr(uint32_t *dst, const uint32_t *a) { + rom_field_mul(dst, a, a); +} + +/* Square-and-multiply exponentiation for p-2 (normal domain throughout) */ +static void field_inv(uint32_t *out, const uint32_t *a) { + static const uint32_t EXP_P_MINUS_2[WORDS] = { + 0xFFFFFFFD, 0xFFFFFFFF, 0xFFFFFFFF, 0x00000000, + 0x00000000, 0x00000000, 0x00000001, 0xFFFFFFFF + }; + uint32_t res[WORDS], base[WORDS]; + + zclear(res); res[0] = 1; /* res = 1 */ + zcopy(base, a); /* base = a */ + + for (int wi = WORDS - 1; wi >= 0; wi--) { + uint32_t w = EXP_P_MINUS_2[wi]; + for (int b = 31; b >= 0; b--) { + field_sqr(res, res); + if ((w >> b) & 1U) { + field_mul(res, res, base); + } + } + } + zcopy(out, res); +} + +/* ---------- point utilities ---------- */ + +static inline void load_generator(p256_pt *Pp) { + zcopy(Pp->X, Gx); + zcopy(Pp->Y, Gy); + zclear(Pp->Z); + Pp->Z[0] = 1; +} + +static void to_affine(p256_pt *Pp) { + uint32_t zi[WORDS], zi2[WORDS], xi[WORDS], yi[WORDS]; + uint32_t z0 = 0; + for (int i = 0; i < WORDS; i++) z0 |= Pp->Z[i]; + if (z0 == 0) { + zclear(Pp->X); zclear(Pp->Y); zclear(Pp->Z); + return; + } + field_inv(zi, Pp->Z); + field_sqr(zi2, zi); + field_mul(xi, Pp->X, zi2); + field_mul(yi, Pp->Y, zi2); + field_mul(yi, yi, zi); + zcopy(Pp->X, xi); + zcopy(Pp->Y, yi); + zclear(Pp->Z); Pp->Z[0] = 1; +} + +/* ---------- group law (Jacobian, a = -3) ---------- */ + +__attribute__((noinline)) +static void p256_point_double(p256_pt *Q) { + if (is_zero(Q->Y)) { zclear(Q->X); zclear(Q->Y); zclear(Q->Z); return; } + + uint32_t Z2[WORDS], M[WORDS], Mtmp[WORDS], S[WORDS], T1[WORDS], T2[WORDS], X3[WORDS], Y3[WORDS]; + + /* Z2 = Z^2 */ + field_sqr(Z2, Q->Z); + + /* T1 = X - Z^2 ; T2 = X + Z^2 */ + field_sub_mod(T1, Q->X, Z2); + field_add_mod(T2, Q->X, Z2); + + /* M = (X - Z^2) * (X + Z^2) */ + field_mul(M, T1, T2); + + /* M = 3 * M */ + zcopy(Mtmp, M); + field_add_mod(M, M, M); /* 2*M */ + field_add_mod(M, M, Mtmp); /* 3*M */ + + /* S = 4 * X * Y^2 */ + field_sqr(S, Q->Y); /* Y^2 */ + field_mul(S, S, Q->X); /* X*Y^2 */ + field_add_mod(S, S, S); /* 2*X*Y^2 */ + field_add_mod(S, S, S); /* 4*X*Y^2 */ + + /* X3 = M^2 - 2*S */ + field_sqr(X3, M); + field_sub_mod(X3, X3, S); + field_sub_mod(X3, X3, S); + + /* Y3 = M*(S - X3) - 8*Y^4 */ + field_sub_mod(Y3, S, X3); + field_mul(Y3, Y3, M); + + field_sqr(T1, Q->Y); /* Y^2 */ + field_sqr(T1, T1); /* Y^4 */ + field_add_mod(T1, T1, T1); /* 2*Y^4 */ + field_add_mod(T1, T1, T1); /* 4*Y^4 */ + field_add_mod(T1, T1, T1); /* 8*Y^4 */ + + field_sub_mod(Y3, Y3, T1); + + /* Z3 = 2*Y*Z */ + field_mul(Q->Z, Q->Y, Q->Z); + field_add_mod(Q->Z, Q->Z, Q->Z); + + zcopy(Q->X, X3); + zcopy(Q->Y, Y3); +} + +__attribute__((noinline)) +static void p256_point_add(p256_pt *R, const p256_pt *Pp, const p256_pt *Qp) { + if (is_zero(Pp->Z)) { zcopy(R->X, Qp->X); zcopy(R->Y, Qp->Y); zcopy(R->Z, Qp->Z); return; } + if (is_zero(Qp->Z)) { zcopy(R->X, Pp->X); zcopy(R->Y, Pp->Y); zcopy(R->Z, Pp->Z); return; } + + uint32_t Z1Z1[WORDS], Z2Z2[WORDS], U1[WORDS], U2[WORDS]; + uint32_t S1[WORDS], S2[WORDS], H[WORDS], RR[WORDS]; + uint32_t H2[WORDS], H3[WORDS], U1H2[WORDS], X3[WORDS], Y3[WORDS], Z3[WORDS], t[WORDS]; + + field_sqr(Z1Z1, Pp->Z); + field_sqr(Z2Z2, Qp->Z); + + field_mul(U1, Pp->X, Z2Z2); + field_mul(U2, Qp->X, Z1Z1); + + field_mul(t, Qp->Z, Z2Z2); /* Z2^3 */ + field_mul(S1, Pp->Y, t); + + field_mul(t, Pp->Z, Z1Z1); /* Z1^3 */ + field_mul(S2, Qp->Y, t); + + field_sub_mod(H, U2, U1); + field_sub_mod(RR, S2, S1); + + if (is_zero(H)) { + if (is_zero(RR)) { + p256_pt D = *Pp; + p256_point_double(&D); + zcopy(R->X, D.X); + zcopy(R->Y, D.Y); + zcopy(R->Z, D.Z); + } else { + zclear(R->X); zclear(R->Y); zclear(R->Z); /* infinity */ + } + return; + } + + field_sqr(H2, H); + field_mul(H3, H, H2); + field_mul(U1H2, U1, H2); + + field_sqr(X3, RR); + field_sub_mod(X3, X3, H3); + field_sub_mod(X3, X3, U1H2); + field_sub_mod(X3, X3, U1H2); /* -2*U1H2 */ + + field_sub_mod(Y3, U1H2, X3); + field_mul(Y3, Y3, RR); + + field_mul(t, S1, H3); + field_sub_mod(Y3, Y3, t); + + field_mul(t, Pp->Z, Qp->Z); + field_mul(Z3, t, H); + + zcopy(R->X, X3); + zcopy(R->Y, Y3); + zcopy(R->Z, Z3); +} + +/* ---------- shared scalar multiply helpers (reduce duplication) ---------- */ + +static void scalar_mul_point(p256_pt *R, const p256_pt *Base, const uint8_t *k, size_t klen) { + zclear(R->X); zclear(R->Y); zclear(R->Z); /* R = O */ + for (size_t bi = 0; bi < klen * 8; bi++) { + p256_point_double(R); + if ((k[bi >> 3] >> (7 - (bi & 7))) & 1) { + p256_point_add(R, R, Base); + } + } +} + +/* Load uncompressed point (04 || X || Y) into Jacobian with Z=1 */ +static int load_point_uncompressed(p256_pt *Pp, const unsigned char *buf, size_t len) { + if (len != 65 || buf[0] != 0x04) return 0; + be32_to_le32(buf + 1, Pp->X); + be32_to_le32(buf + 33, Pp->Y); + zclear(Pp->Z); Pp->Z[0] = 1; + return 1; +} + +static void store_point_uncompressed(unsigned char *buf, const p256_pt *Pp) { + buf[0] = 0x04; + le32_to_be32(Pp->X, buf + 1); + le32_to_be32(Pp->Y, buf + 33); +} + +/* ---------- BearSSL ec_impl API ---------- */ + +static const unsigned char *api_generator(int curve, size_t *len) { + (void)curve; + *len = br_secp256r1.generator_len; + return br_secp256r1.generator; +} + +static const unsigned char *api_order(int curve, size_t *len) { + (void)curve; + *len = br_secp256r1.order_len; + return br_secp256r1.order; +} + +static size_t api_xoff(int curve, size_t *len) { + (void)curve; + *len = 32; + return 1; +} + +static uint32_t api_mul(unsigned char *G, size_t Glen, + const unsigned char *x, size_t xlen, + int curve) { + (void)curve; + p256_pt Pp, R; + if (!load_point_uncompressed(&Pp, G, Glen)) return 0; + + scalar_mul_point(&R, &Pp, x, xlen); + to_affine(&R); + store_point_uncompressed(G, &R); + return 1; +} + +static size_t api_mulgen(unsigned char *Rbuf, + const unsigned char *x, size_t xlen, + int curve) { + (void)curve; + p256_pt Gp, R; + load_generator(&Gp); + + scalar_mul_point(&R, &Gp, x, xlen); + to_affine(&R); + store_point_uncompressed(Rbuf, &R); + return 65; +} + +static uint32_t api_muladd(unsigned char *A, const unsigned char *B, + size_t Glen, + const unsigned char *x, size_t xlen, + const unsigned char *y, size_t ylen, + int curve) { + (void)curve; + p256_pt Pp, Qp, R, T; + + if (!load_point_uncompressed(&Pp, A, Glen)) return 0; + + scalar_mul_point(&R, &Pp, x, xlen); + + if (B) { + if (!load_point_uncompressed(&Qp, B, Glen)) return 0; + } else { + load_generator(&Qp); + } + + scalar_mul_point(&T, &Qp, y, ylen); + p256_point_add(&R, &R, &T); + + to_affine(&R); + store_point_uncompressed(A, &R); + return 1; +} + +const br_ec_impl br_ec_p256_m15 PROGMEM = { + (uint32_t)0x00800000, + &api_generator, + &api_order, + &api_xoff, + &api_mul, + &api_mulgen, + &api_muladd +}; + +#endif // SOC_MPI_SUPPORTED +#endif // defined(ESP_PLATFORM) && !defined(ESP8266) +#endif // USE_SHA_ROM \ No newline at end of file diff --git a/lib/lib_ssl/bearssl-esp8266/src/ec/ec_c25519_m15.c b/lib/lib_ssl/bearssl-esp8266/src/ec/ec_c25519_m15.c index 0d1041472..115d51a63 100644 --- a/lib/lib_ssl/bearssl-esp8266/src/ec/ec_c25519_m15.c +++ b/lib/lib_ssl/bearssl-esp8266/src/ec/ec_c25519_m15.c @@ -1475,4 +1475,4 @@ const br_ec_impl br_ec_c25519_m15 PROGMEM = { &api_mul, &api_mulgen, &api_muladd -}; +}; \ No newline at end of file diff --git a/lib/lib_ssl/bearssl-esp8266/src/hash/_sha_hal_idf5x.c b/lib/lib_ssl/bearssl-esp8266/src/hash/_sha_hal_idf5x.c new file mode 100644 index 000000000..1fc124f35 --- /dev/null +++ b/lib/lib_ssl/bearssl-esp8266/src/hash/_sha_hal_idf5x.c @@ -0,0 +1,754 @@ +/* + * _sha_hal_idf5x.c — BearSSL drop‑in with ESP32 HAL SHA acceleration + * + * This file provides hardware-accelerated implementations of BearSSL-compatible + * hash functions (SHA-1, SHA-224, SHA-256, SHA-384, SHA-512) using the ESP-IDF 5.x + * SHA HAL. It replaces the software digest core with direct access to the ESP32's + * SHA engine, preserving BearSSL's context structure and API semantics. + * + * Each hash context uses a minimal layout: + * - val[] holds the midstate as a raw little-endian byte image. + * - buf[] holds the partial block (64 or 128 bytes). + * - count tracks the total input length in bytes. + * + * Endianness is preserved across state() and set_state() calls, allowing seamless + * serialization and restoration of midstate snapshots. All conversions for hardware + * interaction are localized to update() and out(). + * + * This module is designed for drop-in replacement with no changes to BearSSL clients. + * It supports multihash, midstate injection, and digest resumption. + * + * Author: Christian Baars + */ + +#include "t_inner.h" + +#if defined(USE_SHA_ROM) +#if defined(ESP_PLATFORM) && !defined(ESP8266) + +#include + +#include "freertos/FreeRTOS.h" + +#if __has_include("soc/sha_caps.h") +# include "soc/sha_caps.h" +#elif __has_include("soc/soc_caps.h") +# include "soc/soc_caps.h" +#else +# error "No SHA capability header found" +#endif +#if SOC_SHA_SUPPORT_RESUME + +#if __has_include("hal/sha_ll.h") +# include "hal/sha_ll.h" +# define HAVE_SHA_LL 1 +#else +# define HAVE_SHA_LL 0 +#endif + + +#define HAVE_HAL_SHA1 (SOC_SHA_SUPPORT_SHA1) +#define HAVE_HAL_SHA224 (SOC_SHA_SUPPORT_SHA224) +#define HAVE_HAL_SHA256 (SOC_SHA_SUPPORT_SHA256) +#define HAVE_HAL_SHA384 (SOC_SHA_SUPPORT_SHA384) +#define HAVE_HAL_SHA512 (SOC_SHA_SUPPORT_SHA512) + +static portMUX_TYPE s_sha_mux = portMUX_INITIALIZER_UNLOCKED; +#define SHA_ENTER() {portENTER_CRITICAL(&s_sha_mux); int __DECLARE_RCC_ATOMIC_ENV; sha_ll_enable_bus_clock(true); sha_ll_reset_register();} +#define SHA_EXIT() {portEXIT_CRITICAL(&s_sha_mux); int __DECLARE_RCC_ATOMIC_ENV; sha_ll_enable_bus_clock(false);} +#define SHA_WAIT() {while (sha_ll_busy()) { } } + +/* ================================================================ + * SHA-1 (HAL path, no save/restore) - needs char buf[112]; + * ================================================================ */ +#if HAVE_HAL_SHA1 + +static void __attribute__((noinline)) +sha_hal_process_block(void *state_buf, const void *blk, + esp_sha_type type, size_t digest_words, + size_t block_words, bool first) +{ + SHA_ENTER(); + if (!first) { + sha_ll_write_digest(type, state_buf, digest_words); + } + sha_ll_fill_text_block(blk, block_words); + if (first) { + sha_ll_start_block(type); + } else { + sha_ll_continue_block(type); + } + SHA_WAIT(); + sha_ll_read_digest(type, state_buf, digest_words); + SHA_EXIT(); +} + +static const uint8_t S1_IV_BYTES[20] PROGMEM = { + 0x67,0x45,0x23,0x01, 0xEF,0xCD,0xAB,0x89, + 0x98,0xBA,0xDC,0xFE, 0x10,0x32,0x54,0x76, + 0xC3,0xD2,0xE1,0xF0 +}; + +void br_sha1_init(br_sha1_context *cc) +{ + cc->vtable = &br_sha1_vtable; + cc->count = 0; + memset(cc->buf, 0, sizeof cc->buf); + /* Store IV bytes exactly as given (LE words) into cc->val */ + memcpy(cc->val, S1_IV_BYTES, sizeof S1_IV_BYTES); +} + +void br_sha1_update(br_sha1_context *cc, const void *data, size_t len) +{ + const uint8_t *src = data; + size_t used = (size_t)(cc->count & 63U); + + if (!len) return; + cc->count += len; + + if (used) { + size_t take = 64 - used; + if (take > len) take = len; + memcpy(cc->buf + used, src, take); + src += take; + len -= take; + used += take; + if (used == 64) { + sha_hal_process_block(cc->val, cc->buf, SHA1, 5, 16, cc->count == 64); + used = 0; + } + } + while (len >= 64) { + sha_hal_process_block(cc->val, src, SHA1, 5, 16, + (cc->count - len == 0) && !used); + src += 64; + len -= 64; + } + if (len) { + memcpy(cc->buf, src, len); + } +} + +void br_sha1_out(const br_sha1_context *cc, void *out) +{ + br_sha1_context ctx = *cc; + size_t used = (size_t)(ctx.count & 63U); + uint64_t bit_len = (uint64_t)ctx.count << 3; + + ctx.buf[used++] = 0x80; + if (used > 56) { + memset(ctx.buf + used, 0, 64 - used); + sha_hal_process_block(ctx.val, ctx.buf, SHA1, 5, 16, ctx.count <= 64); + used = 0; + } + memset(ctx.buf + used, 0, 56 - used); + br_enc64be(ctx.buf + 56, bit_len); + sha_hal_process_block(ctx.val, ctx.buf, SHA1, 5, 16, ctx.count <= 64); + memcpy(out, ctx.val, 20); +} + +uint64_t br_sha1_state(const br_sha1_context *cc, void *dst) +{ + /* Export raw 20-byte LE midstate image exactly as stored */ + memcpy(dst, cc->val, 20); + return cc->count; +} + +void br_sha1_set_state(br_sha1_context *cc, const void *src, uint64_t count) +{ + if (!(cc->vtable == &br_sha1_vtable)) { + cc->vtable = &br_sha1_vtable; + } + /* Import raw 20-byte LE midstate image exactly as provided */ + memcpy(cc->val, src, 20); + cc->count = count; + memset(cc->buf, 0, sizeof cc->buf); +} + +const br_hash_class br_sha1_vtable PROGMEM = { + sizeof(br_sha1_context), + BR_HASHDESC_ID(br_sha1_ID) + | BR_HASHDESC_OUT(20) + | BR_HASHDESC_LBLEN(6) + | BR_HASHDESC_MD_PADDING + | BR_HASHDESC_MD_PADDING_BE + | BR_HASHDESC_STATE(32), + (void (*)(const br_hash_class **)) &br_sha1_init, + (void (*)(const br_hash_class **, const void *, size_t)) &br_sha1_update, + (void (*)(const br_hash_class *const *, void *)) &br_sha1_out, + (uint64_t (*)(const br_hash_class *const *, void *)) &br_sha1_state, + (void (*)(const br_hash_class **, const void *, uint64_t)) &br_sha1_set_state +}; + +#endif /* HAVE_HAL_SHA1 */ + +/* ================================================================ + * SHA-224 (HAL path, no save/restore) + * ================================================================ */ +#if HAVE_HAL_SHA224 + +/* SHA-224 IV as 32-bit words (FIPS 180-4) */ +static const uint32_t S224_IV_WORDS[8] = { + 0xc1059ed8U, 0x367cd507U, 0x3070dd17U, 0xf70e5939U, + 0xffc00b31U, 0x68581511U, 0x64f98fa7U, 0xbefa4fa4U +}; + +void br_sha224_init(br_sha224_context *cc) { + cc->vtable = &br_sha224_vtable; + cc->count = 0; + memset(cc->buf, 0, sizeof cc->buf); + /* Internal state is LE; encode IV directly in LE form into cc->val */ + br_range_enc32le(cc->val, S224_IV_WORDS, 8); +} + +/* Reuse SHA-256 out, then truncate to 28 bytes */ +void br_sha224_out(const br_sha224_context *cc, void *out) { + uint8_t full[32]; + br_sha256_out((const br_sha256_context *)cc, full); + memcpy(out, full, 28); +} + +const br_hash_class br_sha224_vtable PROGMEM = { + sizeof(br_sha224_context), + BR_HASHDESC_ID(br_sha224_ID) + | BR_HASHDESC_OUT(28) + | BR_HASHDESC_LBLEN(6) + | BR_HASHDESC_MD_PADDING + | BR_HASHDESC_MD_PADDING_BE + | BR_HASHDESC_STATE(32), + (void (*)(const br_hash_class **)) &br_sha224_init, + (void (*)(const br_hash_class **, const void *, size_t)) &br_sha224_update, + (void (*)(const br_hash_class *const *, void *)) &br_sha224_out, + (uint64_t (*)(const br_hash_class *const *, void *)) &br_sha224_state, + (void (*)(const br_hash_class **, const void *, uint64_t)) &br_sha224_set_state +}; + +#endif /* HAVE_HAL_SHA224 */ + +/* ================================================================ + * SHA-256 (HAL path, save/restore) + * ================================================================ */ +#if HAVE_HAL_SHA256 && defined(SOC_SHA_SUPPORT_RESUME) + +/* Fixed SHA-256 IV in big-endian bytes (spec-defined) */ +static const uint8_t S256_IV_BYTES[32] PROGMEM = { + 0x6a, 0x09, 0xe6, 0x67, 0xbb, 0x67, 0xae, 0x85, + 0x3c, 0x6e, 0xf3, 0x72, 0xa5, 0x4f, 0xf5, 0x3a, + 0x51, 0x0e, 0x52, 0x7f, 0x9b, 0x05, 0x68, 0x8c, + 0x1f, 0x83, 0xd9, 0xab, 0x5b, 0xe0, 0xcd, 0x19 +}; + +/* Maintain the partial block in cc->buf[] (64 bytes) */ +static inline void s256_update_partial(br_sha256_context *cc, + const uint8_t *data_ptr, + size_t data_len, + size_t prev_partial_len) +{ + size_t new_partial_len = (prev_partial_len + data_len) & 63U; + + if (new_partial_len == 0) { + /* Exact block boundary: clear partial buffer */ + memset(cc->buf, 0, sizeof cc->buf); + return; + } + + if (data_len >= new_partial_len) { + /* Tail entirely from current input */ + memcpy(cc->buf, data_ptr + (data_len - new_partial_len), new_partial_len); + } else { + /* Need some bytes from previous partial tail */ + size_t need_prev = new_partial_len - data_len; + if (need_prev && need_prev <= prev_partial_len) { + memmove(cc->buf, cc->buf + (prev_partial_len - need_prev), need_prev); + } else if (need_prev) { + memset(cc->buf, 0, need_prev); + } + memcpy(cc->buf + need_prev, data_ptr, data_len); + } + + if (new_partial_len < sizeof cc->buf) { + memset(cc->buf + new_partial_len, 0, sizeof cc->buf - new_partial_len); + } +} + +void br_sha256_init(br_sha256_context *cc) +{ + cc->vtable = &br_sha256_vtable; + cc->count = 0; + memset(cc->buf, 0, sizeof cc->buf); + /* Keep midstate bytes exactly as IV (BE byte image), as in the original */ + memcpy(cc->val, S256_IV_BYTES, 32); +} + +void br_sha224_update(br_sha224_context *cc, const void *data, size_t len) +{ + if (!len) return; + + /* Embedded mode selection by vtable pointer (no desc, no tags) */ + const int mode = (cc->vtable == &br_sha256_vtable) ? SHA2_256 : SHA2_224; + + const uint8_t *data_ptr = (const uint8_t *)data; + const uint8_t *orig_ptr = data_ptr; + size_t orig_len = len; + + size_t prev_partial_len = (size_t)(cc->count & 63U); + bool starting_from_iv = (cc->count == 0) && (prev_partial_len == 0); + size_t stitch_take = 0; + if (prev_partial_len && len >= (64 - prev_partial_len)) + stitch_take = 64 - prev_partial_len; + + if (stitch_take || len >= 64) { + size_t block_count_in_run = 0; + + SHA_ENTER(); + + /* Complete the partial block (stitch) if needed */ + if (stitch_take) { + uint32_t midstate_words[8]; + /* Original semantics: decode state from LE words before seeding HW */ + br_range_dec32le(midstate_words, 8, cc->val); + sha_ll_load(mode); + sha_ll_write_digest(mode, midstate_words, 8); + + uint8_t first_block[64]; + memcpy(first_block, cc->buf, prev_partial_len); + memcpy(first_block + prev_partial_len, data_ptr, stitch_take); + + sha_ll_fill_text_block(first_block, 16); + sha_ll_continue_block(mode); + SHA_WAIT(); + + data_ptr += stitch_take; + len -= stitch_take; + block_count_in_run = 1; + } + + /* Process full 64-byte blocks */ + if (len >= 64) { + if (starting_from_iv && stitch_take == 0) { + /* Start from IV directly */ + sha_ll_fill_text_block(data_ptr, 16); + sha_ll_start_block(mode); + SHA_WAIT(); + data_ptr += 64; + len -= 64; + block_count_in_run = 1; + } else if (block_count_in_run == 0) { + /* Seed from current midstate once before the run */ + uint32_t midstate_words2[8]; + br_range_dec32le(midstate_words2, 8, cc->val); + sha_ll_load(mode); + sha_ll_write_digest(mode, midstate_words2, 8); + } + +#if defined(CONFIG_IDF_TARGET_ARCH_RISCV) /* RISC-V: enforce 8-block (512B) window with checkpointing */ + while (len >= 64) { + sha_ll_fill_text_block(data_ptr, 16); + sha_ll_continue_block(mode); + SHA_WAIT(); + + data_ptr += 64; + len -= 64; + block_count_in_run++; + + if (block_count_in_run == 8 && len >= 64) { + uint32_t midstate_words3[8]; + sha_ll_load(mode); + sha_ll_read_digest(mode, midstate_words3, 8); + sha_ll_load(mode); + sha_ll_write_digest(mode, midstate_words3, 8); + block_count_in_run = 0; + } + } +#else /* Xtensa: simple per-block processing, no extra checkpointing */ + while (len >= 64) { + sha_ll_fill_text_block(data_ptr, 16); + sha_ll_continue_block(mode); + SHA_WAIT(); + data_ptr += 64; + len -= 64; + } +#endif + } + + /* Commit midstate back; keep the same on-wire format as before: LE words in cc->val */ + { + uint32_t tmp_words[8]; + sha_ll_load(mode); + SHA_WAIT(); + sha_ll_read_digest(mode, tmp_words, 8); + br_range_enc32le(cc->val, tmp_words, 8); + } + SHA_EXIT(); + } + + /* Bookkeeping and partial buffer maintenance */ + cc->count += orig_len; + s256_update_partial((br_sha256_context *)cc, orig_ptr, orig_len, prev_partial_len); +} + +void br_sha256_out(const br_sha256_context *cc, void *out) +{ + uint8_t saved_partial[sizeof cc->buf]; + uint64_t saved_count = cc->count; + uint8_t saved_state[32]; + + memcpy(saved_partial, cc->buf, sizeof cc->buf); + memcpy(saved_state, cc->val, 32); + + uint8_t partial_len = (uint8_t)(saved_count & 63U); + const int mode = (cc->vtable == &br_sha256_vtable) ? SHA2_256 : SHA2_224; + + bool midstate_is_iv = (memcmp(saved_state, S256_IV_BYTES, 32) == 0); + bool no_full_blocks_done = (saved_count < 64); + bool must_start_from_iv = midstate_is_iv && no_full_blocks_done; + + SHA_ENTER(); + + if (!must_start_from_iv) { + uint32_t midstate_words[8]; + /* Original semantics: state stored as LE words in cc->val */ + br_range_dec32le(midstate_words, 8, saved_state); + sha_ll_load(mode); + sha_ll_write_digest(mode, midstate_words, 8); + } + + uint8_t final_blocks[128]; + memcpy(final_blocks, saved_partial, partial_len); + final_blocks[partial_len] = 0x80; + + size_t zero_len = (partial_len < 56) ? (56 - partial_len - 1) + : (120 - partial_len - 1); + if (zero_len) { + memset(final_blocks + partial_len + 1, 0, zero_len); + } + + uint64_t bit_length = saved_count * 8; + size_t len_pos = partial_len + 1 + zero_len; + for (int i = 0; i < 8; i++) { + final_blocks[len_pos + i] = (uint8_t)(bit_length >> (56 - 8 * i)); + } + size_t total_final_len = len_pos + 8; + + if (total_final_len == 64) { + sha_ll_fill_text_block(final_blocks, 16); + if (must_start_from_iv) + sha_ll_start_block(mode); + else + sha_ll_continue_block(mode); + SHA_WAIT(); + } else { + sha_ll_fill_text_block(final_blocks, 16); + if (must_start_from_iv) + sha_ll_start_block(mode); + else + sha_ll_continue_block(mode); + SHA_WAIT(); + sha_ll_fill_text_block(final_blocks + 64, 16); + sha_ll_continue_block(mode); + SHA_WAIT(); + } + + { + uint32_t tmp_words[8]; + sha_ll_load(mode); + sha_ll_read_digest(mode, tmp_words, 8); + SHA_EXIT(); + /* Final digest serialization remains LE as in your original */ + br_range_enc32le(out, tmp_words, 8); + } + + /* Non-destructive out(): restore snapshot */ + memcpy(((br_sha256_context *)cc)->buf, saved_partial, sizeof cc->buf); + ((br_sha256_context *)cc)->count = saved_count; + /* cc->val was never modified in out() */ +} + +uint64_t br_sha224_state(const br_sha256_context *cc, void *dst) +{ + /* Export midstate bytes exactly as stored (LE words image), unchanged */ + memcpy(dst, cc->val, 32); + return cc->count; +} + +void br_sha224_set_state(br_sha256_context *cc, const void *src, uint64_t count) +{ + if( !(cc->vtable == &br_sha256_vtable) && !(cc->vtable == &br_sha224_vtable)){ + cc->vtable = &br_sha256_vtable; /* safety for multihash fresh gen context */ + } + /* Reset partial, set count, and import state bytes exactly as provided */ + memset(cc->buf, 0, sizeof cc->buf); + memcpy(cc->val, src, 32); + cc->count = count; +} + +const br_hash_class br_sha256_vtable PROGMEM = { + sizeof(br_sha256_context), + BR_HASHDESC_ID(br_sha256_ID) + | BR_HASHDESC_OUT(32) + | BR_HASHDESC_STATE(32) + | BR_HASHDESC_LBLEN(6) + | BR_HASHDESC_MD_PADDING + | BR_HASHDESC_MD_PADDING_BE, + (void (*)(const br_hash_class **))&br_sha256_init, + (void (*)(const br_hash_class **, + const void *, size_t))&br_sha256_update, + (void (*)(const br_hash_class *const *, void *))&br_sha256_out, + (uint64_t (*)(const br_hash_class *const *, void *))&br_sha256_state, + (void (*)(const br_hash_class **, const void *, uint64_t)) + &br_sha256_set_state +}; + +#endif /* HAVE_HAL_SHA256 && SOC_SHA_SUPPORT_RESUME */ + +/* ================================================================ + * SHA-384 (HAL path, no save/restore) + * ================================================================ */ +#if HAVE_HAL_SHA384 + +static const uint64_t S384_IV_WORDS[8] = { + 0xcbbb9d5dc1059ed8ULL, 0x629a292a367cd507ULL, + 0x9159015a3070dd17ULL, 0x152fecd8f70e5939ULL, + 0x67332667ffc00b31ULL, 0x8eb44a8768581511ULL, + 0xdb0c2e0d64f98fa7ULL, 0x47b5481dbefa4fa4ULL +}; + +void br_sha384_init(br_sha384_context *cc) { + cc->vtable = &br_sha384_vtable; + cc->count = 0; + memset(cc->buf, 0, sizeof cc->buf); + /* Internal state is LE; encode IV directly in LE form into cc->val */ + br_range_enc64le(cc->val, S384_IV_WORDS, 8); +} + +void br_sha384_update(br_sha384_context *cc, const void *data, size_t len) { + if (!len) return; + const uint8_t *src = (const uint8_t *)data; + size_t used = (size_t)(cc->count & 127U); + uint64_t prior_count = cc->count; + cc->count += len; + + if (used) { + size_t take = 128 - used; + if (take > len) take = len; + memcpy(cc->buf + used, src, take); + src += take; + len -= take; + used += take; + if (used == 128) { + uint64_t st_be[8]; + br_range_dec64le(st_be, 8, cc->val); + br_range_enc64be(st_be, st_be, 8); + SHA_ENTER(); + sha_ll_load(SHA2_512); + sha_ll_write_digest(SHA2_512, st_be, 16); + sha_ll_fill_text_block(cc->buf, 32); + sha_ll_continue_block(SHA2_512); + SHA_WAIT(); + sha_ll_read_digest(SHA2_512, st_be, 16); + SHA_EXIT(); + br_range_dec64be(st_be, 8, st_be); + br_range_enc64le(cc->val, st_be, 8); + prior_count += 128; + used = 0; + } + } + + if (len >= 128) { + uint64_t st_be[8]; + br_range_dec64le(st_be, 8, cc->val); + br_range_enc64be(st_be, st_be, 8); + bool first = (prior_count == 0); + SHA_ENTER(); + sha_ll_load(SHA2_512); + sha_ll_write_digest(SHA2_512, st_be, 16); + while (len >= 128) { + sha_ll_fill_text_block(src, 32); + if (first) { + sha_ll_start_block(SHA2_512); + first = false; + } else { + sha_ll_continue_block(SHA2_512); + } + SHA_WAIT(); + src += 128; + len -= 128; + } + sha_ll_read_digest(SHA2_512, st_be, 16); + SHA_EXIT(); + br_range_dec64be(st_be, 8, st_be); + br_range_enc64le(cc->val, st_be, 8); + } + + if (len) memcpy(cc->buf, src, len); +} + +void br_sha384_out(const br_sha384_context *cc, void *out) { + br_sha384_context ctx = *cc; + size_t used = (size_t)(ctx.count & 127U); + uint64_t bit_hi = (uint64_t)(ctx.count >> 61); + uint64_t bit_lo = (uint64_t)(ctx.count << 3); + + ctx.buf[used++] = 0x80; + if (used > 112) { + memset(ctx.buf + used, 0, 128 - used); + uint64_t st_be[8]; + br_range_dec64le(st_be, 8, ctx.val); + br_range_enc64be(st_be, st_be, 8); + SHA_ENTER(); + sha_ll_load(SHA2_512); + sha_ll_write_digest(SHA2_512, st_be, 16); + sha_ll_fill_text_block(ctx.buf, 32); + sha_ll_continue_block(SHA2_512); + SHA_WAIT(); + sha_ll_read_digest(SHA2_512, st_be, 16); + SHA_EXIT(); + br_range_dec64be(st_be, 8, st_be); + br_range_enc64le(ctx.val, st_be, 8); + used = 0; + } + + memset(ctx.buf + used, 0, 112 - used); + br_enc64be(ctx.buf + 112, bit_hi); + br_enc64be(ctx.buf + 120, bit_lo); + + uint64_t st_be2[8]; + br_range_dec64le(st_be2, 8, ctx.val); + br_range_enc64be(st_be2, st_be2, 8); + SHA_ENTER(); + sha_ll_load(SHA2_512); + sha_ll_write_digest(SHA2_512, st_be2, 16); + sha_ll_fill_text_block(ctx.buf, 32); + sha_ll_continue_block(SHA2_512); + SHA_WAIT(); + sha_ll_read_digest(SHA2_512, st_be2, 16); + SHA_EXIT(); + + br_range_dec64be(st_be2, 8, st_be2); + br_range_enc64be(out, st_be2, 6); +} + +uint64_t br_sha384_state(const br_sha384_context *cc, void *dst) { + /* Export raw 64-byte LE midstate image exactly as stored */ + memcpy(dst, cc->val, 64); + return cc->count; +} + +void br_sha384_set_state(br_sha384_context *cc, const void *src, uint64_t count) { + if (!(cc->vtable == &br_sha384_vtable)) { + cc->vtable = &br_sha384_vtable; + } + /* Import raw 64-byte LE midstate image exactly as provided */ + memcpy(cc->val, src, 64); + cc->count = count; + memset(cc->buf, 0, sizeof cc->buf); +} + +const br_hash_class br_sha384_vtable PROGMEM = { + sizeof(br_sha384_context), + BR_HASHDESC_ID(br_sha384_ID) + | BR_HASHDESC_OUT(48) + | BR_HASHDESC_STATE(64) + | BR_HASHDESC_LBLEN(7) + | BR_HASHDESC_MD_PADDING + | BR_HASHDESC_MD_PADDING_BE + | BR_HASHDESC_MD_PADDING_128, + (void (*)(const br_hash_class **)) &br_sha384_init, + (void (*)(const br_hash_class **, const void *, size_t)) &br_sha384_update, + (void (*)(const br_hash_class *const *, void *)) &br_sha384_out, + (uint64_t (*)(const br_hash_class *const *, void *)) &br_sha384_state, + (void (*)(const br_hash_class **, const void *, uint64_t)) &br_sha384_set_state +}; + +#endif /* HAVE_HAL_SHA384 */ + +/* ================================================================ + * SHA-512 (HAL path, no save/restore) + * Uses SHA-384 update/state/set_state + * ================================================================ */ +#if HAVE_HAL_SHA512 + +static const uint64_t S512_IV_WORDS[8] = { + 0x6a09e667f3bcc908ULL, 0xbb67ae8584caa73bULL, + 0x3c6ef372fe94f82bULL, 0xa54ff53a5f1d36f1ULL, + 0x510e527fade682d1ULL, 0x9b05688c2b3e6c1fULL, + 0x1f83d9abfb41bd6bULL, 0x5be0cd19137e2179ULL +}; + +void br_sha512_init(br_sha512_context *cc) { + cc->vtable = &br_sha512_vtable; + cc->count = 0; + memset(cc->buf, 0, sizeof cc->buf); + /* Internal state is LE; encode IV directly in LE form into cc->val */ + br_range_enc64le(cc->val, S512_IV_WORDS, 8); +} + +void br_sha512_out(const br_sha512_context *cc, void *out) { + br_sha512_context ctx = *cc; + size_t used = (size_t)(ctx.count & 127U); + uint64_t bit_hi = (uint64_t)(ctx.count >> 61); + uint64_t bit_lo = (uint64_t)(ctx.count << 3); + + ctx.buf[used++] = 0x80; + if (used > 112) { + memset(ctx.buf + used, 0, 128 - used); + uint64_t st_be[8]; + br_range_dec64le(st_be, 8, ctx.val); + br_range_enc64be(st_be, st_be, 8); + SHA_ENTER(); + sha_ll_load(SHA2_512); + sha_ll_write_digest(SHA2_512, st_be, 16); + sha_ll_fill_text_block(ctx.buf, 32); + sha_ll_continue_block(SHA2_512); + SHA_WAIT(); + sha_ll_read_digest(SHA2_512, st_be, 16); + SHA_EXIT(); + br_range_dec64be(st_be, 8, st_be); + br_range_enc64le(ctx.val, st_be, 8); + used = 0; + } + + memset(ctx.buf + used, 0, 112 - used); + br_enc64be(ctx.buf + 112, bit_hi); + br_enc64be(ctx.buf + 120, bit_lo); + + uint64_t st_be2[8]; + br_range_dec64le(st_be2, 8, ctx.val); + br_range_enc64be(st_be2, st_be2, 8); + SHA_ENTER(); + sha_ll_load(SHA2_512); + sha_ll_write_digest(SHA2_512, st_be2, 16); + sha_ll_fill_text_block(ctx.buf, 32); + sha_ll_continue_block(SHA2_512); + SHA_WAIT(); + sha_ll_read_digest(SHA2_512, st_be2, 16); + SHA_EXIT(); + + /* Output digest in big‑endian bytes as BearSSL expects */ + br_range_dec64be(st_be2, 8, st_be2); + br_range_enc64be(out, st_be2, 8); +} + +const br_hash_class br_sha512_vtable PROGMEM = { + sizeof(br_sha512_context), + BR_HASHDESC_ID(br_sha512_ID) + | BR_HASHDESC_OUT(64) + | BR_HASHDESC_STATE(64) + | BR_HASHDESC_LBLEN(7) + | BR_HASHDESC_MD_PADDING + | BR_HASHDESC_MD_PADDING_BE + | BR_HASHDESC_MD_PADDING_128, + (void (*)(const br_hash_class **)) &br_sha512_init, + (void (*)(const br_hash_class **, const void *, size_t)) &br_sha384_update, /* reuse SHA-384 update */ + (void (*)(const br_hash_class *const *, void *)) &br_sha512_out, + (uint64_t (*)(const br_hash_class *const *, void *)) &br_sha512_state, + (void (*)(const br_hash_class **, const void *, uint64_t)) &br_sha512_set_state +}; + +#endif /* HAVE_HAL_SHA512 */ + +#else +/* ===== ESP8266 - leave it unchanged ===== */ +#endif // SOC_SHA_SUPPORT_RESUME +#endif // defined(ESP_PLATFORM) && !defined(ESP8266) +#endif //USE_SHA_ROM diff --git a/lib/lib_ssl/bearssl-esp8266/src/hash/md5.c b/lib/lib_ssl/bearssl-esp8266/src/hash/md5.c index d954e6d3e..f38ee6ccb 100644 --- a/lib/lib_ssl/bearssl-esp8266/src/hash/md5.c +++ b/lib/lib_ssl/bearssl-esp8266/src/hash/md5.c @@ -1,7 +1,7 @@ /* * Copyright (c) 2016 Thomas Pornin * - * Permission is hereby granted, free of charge, to any person obtaining + * Permission is hereby granted, free of charge, to any person obtaining * a copy of this software and associated documentation files (the * "Software"), to deal in the Software without restriction, including * without limitation the rights to use, copy, modify, merge, publish, @@ -9,12 +9,12 @@ * permit persons to whom the Software is furnished to do so, subject to * the following conditions: * - * The above copyright notice and this permission notice shall be + * The above copyright notice and this permission notice shall be * included in all copies or substantial portions of the Software. * - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF - * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND + * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS * BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN * ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN @@ -22,7 +22,6 @@ * SOFTWARE. */ -#include #include "t_inner.h" #define F(B, C, D) ((((C) ^ (D)) & (B)) ^ (D)) diff --git a/lib/lib_ssl/bearssl-esp8266/src/hash/sha2small.c b/lib/lib_ssl/bearssl-esp8266/src/hash/sha2small.c index 8c640efc8..b4b12b13d 100644 --- a/lib/lib_ssl/bearssl-esp8266/src/hash/sha2small.c +++ b/lib/lib_ssl/bearssl-esp8266/src/hash/sha2small.c @@ -1,7 +1,7 @@ /* * Copyright (c) 2016 Thomas Pornin * - * Permission is hereby granted, free of charge, to any person obtaining + * Permission is hereby granted, free of charge, to any person obtaining * a copy of this software and associated documentation files (the * "Software"), to deal in the Software without restriction, including * without limitation the rights to use, copy, modify, merge, publish, @@ -9,12 +9,12 @@ * permit persons to whom the Software is furnished to do so, subject to * the following conditions: * - * The above copyright notice and this permission notice shall be + * The above copyright notice and this permission notice shall be * included in all copies or substantial portions of the Software. * - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF - * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND + * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS * BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN * ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN diff --git a/lib/lib_ssl/bearssl-esp8266/src/int/i15_fmont.c b/lib/lib_ssl/bearssl-esp8266/src/int/i15_fmont.c index a562d6852..8bf73a59f 100644 --- a/lib/lib_ssl/bearssl-esp8266/src/int/i15_fmont.c +++ b/lib/lib_ssl/bearssl-esp8266/src/int/i15_fmont.c @@ -1,7 +1,7 @@ /* * Copyright (c) 2017 Thomas Pornin * - * Permission is hereby granted, free of charge, to any person obtaining + * Permission is hereby granted, free of charge, to any person obtaining * a copy of this software and associated documentation files (the * "Software"), to deal in the Software without restriction, including * without limitation the rights to use, copy, modify, merge, publish, @@ -9,12 +9,12 @@ * permit persons to whom the Software is furnished to do so, subject to * the following conditions: * - * The above copyright notice and this permission notice shall be + * The above copyright notice and this permission notice shall be * included in all copies or substantial portions of the Software. * - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF - * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND + * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS * BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN * ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN diff --git a/lib/lib_ssl/bearssl-esp8266/src/int/i15_moddiv.c b/lib/lib_ssl/bearssl-esp8266/src/int/i15_moddiv.c index c3b32d2ce..d265a7d90 100644 --- a/lib/lib_ssl/bearssl-esp8266/src/int/i15_moddiv.c +++ b/lib/lib_ssl/bearssl-esp8266/src/int/i15_moddiv.c @@ -1,7 +1,7 @@ /* * Copyright (c) 2018 Thomas Pornin * - * Permission is hereby granted, free of charge, to any person obtaining + * Permission is hereby granted, free of charge, to any person obtaining * a copy of this software and associated documentation files (the * "Software"), to deal in the Software without restriction, including * without limitation the rights to use, copy, modify, merge, publish, @@ -9,12 +9,12 @@ * permit persons to whom the Software is furnished to do so, subject to * the following conditions: * - * The above copyright notice and this permission notice shall be + * The above copyright notice and this permission notice shall be * included in all copies or substantial portions of the Software. * - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF - * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND + * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS * BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN * ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN diff --git a/lib/lib_ssl/bearssl-esp8266/src/int/i15_mulacc.c b/lib/lib_ssl/bearssl-esp8266/src/int/i15_mulacc.c index db33c069c..ee4bb157d 100644 --- a/lib/lib_ssl/bearssl-esp8266/src/int/i15_mulacc.c +++ b/lib/lib_ssl/bearssl-esp8266/src/int/i15_mulacc.c @@ -1,7 +1,7 @@ /* * Copyright (c) 2017 Thomas Pornin * - * Permission is hereby granted, free of charge, to any person obtaining + * Permission is hereby granted, free of charge, to any person obtaining * a copy of this software and associated documentation files (the * "Software"), to deal in the Software without restriction, including * without limitation the rights to use, copy, modify, merge, publish, @@ -9,12 +9,12 @@ * permit persons to whom the Software is furnished to do so, subject to * the following conditions: * - * The above copyright notice and this permission notice shall be + * The above copyright notice and this permission notice shall be * included in all copies or substantial portions of the Software. * - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF - * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND + * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS * BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN * ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN diff --git a/lib/lib_ssl/bearssl-esp8266/src/rand/sysrng.c b/lib/lib_ssl/bearssl-esp8266/src/rand/sysrng.c index 2a8347736..8fa4f3403 100644 --- a/lib/lib_ssl/bearssl-esp8266/src/rand/sysrng.c +++ b/lib/lib_ssl/bearssl-esp8266/src/rand/sysrng.c @@ -25,10 +25,6 @@ #define BR_ENABLE_INTRINSICS 1 #include "t_inner.h" -#if BR_USE_GETENTROPY -#include -#endif - #if BR_USE_URANDOM #include #include @@ -42,9 +38,6 @@ #pragma comment(lib, "advapi32") #endif -/* - * Seeder that uses the RDRAND opcodes (on x86 CPU). - */ #if BR_RDRAND BR_TARGETS_X86_UP BR_TARGET("rdrnd") @@ -64,24 +57,9 @@ seeder_rdrand(const br_prng_class **ctx) * * Intel recommends trying at least 10 times in case of * failure. - * - * AMD bug: there are reports that some AMD processors - * have a bug that makes them fail silently after a - * suspend/resume cycle, in which case RDRAND will report - * a success but always return 0xFFFFFFFF. - * see: https://bugzilla.kernel.org/show_bug.cgi?id=85911 - * - * As a mitigation, if the 32-bit value is 0 or -1, then - * it is considered a failure and tried again. This should - * reliably detect the buggy case, at least. This also - * implies that the selected seed values can never be - * 0x00000000 or 0xFFFFFFFF, which is not a problem since - * we are generating a seed for a PRNG, and we overdo it - * a bit (we generate 32 bytes of randomness, and 256 bits - * of entropy are really overkill). */ for (j = 0; j < 10; j ++) { - if (_rdrand32_step(&x) && x != 0 && x != (uint32_t)-1) { + if (_rdrand32_step(&x)) { goto next_word; } } @@ -102,11 +80,9 @@ rdrand_supported(void) */ return br_cpuid(0, 0, 0x40000000, 0); } + #endif -/* - * Seeder that uses /dev/urandom (on Unix-like systems). - */ #if BR_USE_URANDOM static int seeder_urandom(const br_prng_class **ctx) @@ -140,32 +116,6 @@ seeder_urandom(const br_prng_class **ctx) } #endif -/* - * Seeder that uses getentropy() (backed by getrandom() on some systems, - * e.g. Linux). On failure, it will use the /dev/urandom seeder (if - * enabled). - */ -#if BR_USE_GETENTROPY -static int -seeder_getentropy(const br_prng_class **ctx) -{ - unsigned char tmp[32]; - - if (getentropy(tmp, sizeof tmp) == 0) { - (*ctx)->update(ctx, tmp, sizeof tmp); - return 1; - } -#if BR_USE_URANDOM - return seeder_urandom(ctx); -#else - return 0; -#endif -} -#endif - -/* - * Seeder that uses CryptGenRandom() (on Windows). - */ #if BR_USE_WIN32_RAND static int seeder_win32(const br_prng_class **ctx) @@ -221,56 +171,12 @@ seeder_esp8266(const br_prng_class **ctx) } (*ctx)->update(ctx, tmp, sizeof tmp); + return 1; } #endif #endif -#ifdef BR_USE_PICO_RAND -extern uint32_t __picoRand(); -static int -seeder_pico(const br_prng_class **ctx) -{ - uint32_t tmp[32 / sizeof(uint32_t)]; - size_t i; - - for (i=0; iupdate(ctx, tmp, sizeof tmp); - return 1; -} - -#endif - -/* - * An aggregate seeder that uses RDRAND, and falls back to an OS-provided - * source if RDRAND fails. - */ -#if BR_RDRAND && (BR_USE_GETENTROPY || BR_USE_URANDOM || BR_USE_WIN32_RAND) -static int -seeder_rdrand_with_fallback(const br_prng_class **ctx) -{ - if (!seeder_rdrand(ctx)) { -#if BR_USE_PICO - return seeder_pico(ctx); -#elif BR_USE_GETENTROPY - return seeder_getentropy(ctx); -#elif BR_USE_URANDOM - return seeder_urandom(ctx); -#elif BR_USE_WIN32_RAND - return seeder_win32(ctx); -#elif BR_USE_ESP8266_RAND - return seeder_esp8266(ctx); -#else -#error "macro selection has gone wrong" -#endif - } - return 1; -} -#endif - /* see bearssl_rand.h */ br_prng_seeder @@ -281,24 +187,10 @@ br_prng_seeder_system(const char **name) if (name != NULL) { *name = "rdrand"; } -#if BR_USE_GETENTROPY || BR_USE_URANDOM || BR_USE_WIN32_RAND - return &seeder_rdrand_with_fallback; -#else return &seeder_rdrand; -#endif } #endif -#if BR_USE_PICO_RAND - if (name != NULL) { - *name = "pico"; - } - return &seeder_pico; -#elif BR_USE_GETENTROPY - if (name != NULL) { - *name = "getentropy"; - } - return &seeder_getentropy; -#elif BR_USE_URANDOM +#if BR_USE_URANDOM if (name != NULL) { *name = "urandom"; } diff --git a/lib/lib_ssl/bearssl-esp8266/src/rsa/rsa_i15_pub.c b/lib/lib_ssl/bearssl-esp8266/src/rsa/rsa_i15_pub.c index 662b00585..2fa78312b 100644 --- a/lib/lib_ssl/bearssl-esp8266/src/rsa/rsa_i15_pub.c +++ b/lib/lib_ssl/bearssl-esp8266/src/rsa/rsa_i15_pub.c @@ -1,7 +1,7 @@ /* * Copyright (c) 2017 Thomas Pornin * - * Permission is hereby granted, free of charge, to any person obtaining + * Permission is hereby granted, free of charge, to any person obtaining * a copy of this software and associated documentation files (the * "Software"), to deal in the Software without restriction, including * without limitation the rights to use, copy, modify, merge, publish, @@ -9,12 +9,12 @@ * permit persons to whom the Software is furnished to do so, subject to * the following conditions: * - * The above copyright notice and this permission notice shall be + * The above copyright notice and this permission notice shall be * included in all copies or substantial portions of the Software. * - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF - * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND + * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS * BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN * ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN diff --git a/lib/lib_ssl/bearssl-esp8266/src/ssl/ssl_ccert_single_ec.c b/lib/lib_ssl/bearssl-esp8266/src/ssl/ssl_ccert_single_ec.c index 599cda305..7e9530cd0 100644 --- a/lib/lib_ssl/bearssl-esp8266/src/ssl/ssl_ccert_single_ec.c +++ b/lib/lib_ssl/bearssl-esp8266/src/ssl/ssl_ccert_single_ec.c @@ -69,7 +69,6 @@ cc_choose(const br_ssl_client_certificate_class **pctx, choices->hash_id = -1; choices->chain = zc->chain; choices->chain_len = zc->chain_len; - return; } } diff --git a/lib/lib_ssl/bearssl-esp8266/src/ssl/ssl_hs_client.c b/lib/lib_ssl/bearssl-esp8266/src/ssl/ssl_hs_client.c index 9d2b7444e..3f883a17b 100644 --- a/lib/lib_ssl/bearssl-esp8266/src/ssl/ssl_hs_client.c +++ b/lib/lib_ssl/bearssl-esp8266/src/ssl/ssl_hs_client.c @@ -395,9 +395,6 @@ make_client_sign(br_ssl_client_context *ctx) ctx->eng.pad, sizeof ctx->eng.pad); } -/* State machine should be squeezed for size, not performance critical */ -#pragma GCC optimize ("Os") - static const unsigned char t0_datablock[] PROGMEM = { @@ -1202,7 +1199,7 @@ br_ssl_hs_client_run(void *t0ctx) break; case 27: { /* co */ - T0_CO(); + T0_CO(); } break; case 28: { @@ -1330,12 +1327,12 @@ br_ssl_hs_client_run(void *t0ctx) break; case 37: { /* drop */ - (void)T0_POP(); + (void)T0_POP(); } break; case 38: { /* dup */ - T0_PUSH(T0_PEEK(0)); + T0_PUSH(T0_PEEK(0)); } break; case 39: { @@ -1511,7 +1508,7 @@ br_ssl_hs_client_run(void *t0ctx) break; case 56: { /* over */ - T0_PUSH(T0_PEEK(1)); + T0_PUSH(T0_PEEK(1)); } break; case 57: { @@ -1652,7 +1649,7 @@ br_ssl_hs_client_run(void *t0ctx) break; case 69: { /* swap */ - T0_SWAP(); + T0_SWAP(); } break; case 70: { diff --git a/lib/lib_ssl/bearssl-esp8266/src/ssl/ssl_hs_server.c b/lib/lib_ssl/bearssl-esp8266/src/ssl/ssl_hs_server.c index 80aedf593..9bce99645 100644 --- a/lib/lib_ssl/bearssl-esp8266/src/ssl/ssl_hs_server.c +++ b/lib/lib_ssl/bearssl-esp8266/src/ssl/ssl_hs_server.c @@ -426,9 +426,6 @@ verify_CV_sig(br_ssl_server_context *ctx, size_t sig_len) return 0; } -/* State machine should be squeezed for size, not performance critical */ -#pragma GCC optimize ("Os") - static const unsigned char t0_datablock[] PROGMEM = { @@ -1067,7 +1064,7 @@ br_ssl_hs_server_run(void *t0ctx) break; case 10: { /* -rot */ - T0_NROT(); + T0_NROT(); } break; case 11: { @@ -1241,7 +1238,7 @@ br_ssl_hs_server_run(void *t0ctx) break; case 27: { /* co */ - T0_CO(); + T0_CO(); } break; case 28: { @@ -1405,12 +1402,12 @@ br_ssl_hs_server_run(void *t0ctx) break; case 41: { /* drop */ - (void)T0_POP(); + (void)T0_POP(); } break; case 42: { /* dup */ - T0_PUSH(T0_PEEK(0)); + T0_PUSH(T0_PEEK(0)); } break; case 43: { @@ -1547,12 +1544,12 @@ br_ssl_hs_server_run(void *t0ctx) break; case 58: { /* over */ - T0_PUSH(T0_PEEK(1)); + T0_PUSH(T0_PEEK(1)); } break; case 59: { /* pick */ - T0_PICK(T0_POP()); + T0_PICK(T0_POP()); } break; case 60: { @@ -1693,7 +1690,7 @@ br_ssl_hs_server_run(void *t0ctx) break; case 71: { /* swap */ - T0_SWAP(); + T0_SWAP(); } break; case 72: { diff --git a/lib/lib_ssl/bearssl-esp8266/src/t_bearssl_x509.h b/lib/lib_ssl/bearssl-esp8266/src/t_bearssl_x509.h index 1fae8a56f..d5a6b6554 100644 --- a/lib/lib_ssl/bearssl-esp8266/src/t_bearssl_x509.h +++ b/lib/lib_ssl/bearssl-esp8266/src/t_bearssl_x509.h @@ -625,52 +625,6 @@ typedef struct { } br_name_element; -/** - * \brief Callback for validity date checks. - * - * The function receives as parameter an arbitrary user-provided context, - * and the notBefore and notAfter dates specified in an X.509 certificate, - * both expressed as a number of days and a number of seconds: - * - * - Days are counted in a proleptic Gregorian calendar since - * January 1st, 0 AD. Year "0 AD" is the one that preceded "1 AD"; - * it is also traditionally known as "1 BC". - * - * - Seconds are counted since midnight, from 0 to 86400 (a count of - * 86400 is possible only if a leap second happened). - * - * Each date and time is understood in the UTC time zone. The "Unix - * Epoch" (January 1st, 1970, 00:00 UTC) corresponds to days=719528 and - * seconds=0; the "Windows Epoch" (January 1st, 1601, 00:00 UTC) is - * days=584754, seconds=0. - * - * This function must return -1 if the current date is strictly before - * the "notBefore" time, or +1 if the current date is strictly after the - * "notAfter" time. If neither condition holds, then the function returns - * 0, which means that the current date falls within the validity range of - * the certificate. If the function returns a value distinct from -1, 0 - * and +1, then this is interpreted as an unavailability of the current - * time, which normally ends the validation process with a - * `BR_ERR_X509_TIME_UNKNOWN` error. - * - * During path validation, this callback will be invoked for each - * considered X.509 certificate. Validation fails if any of the calls - * returns a non-zero value. - * - * The context value is an abritrary pointer set by the caller when - * configuring this callback. - * - * \param tctx context pointer. - * \param not_before_days notBefore date (days since Jan 1st, 0 AD). - * \param not_before_seconds notBefore time (seconds, at most 86400). - * \param not_after_days notAfter date (days since Jan 1st, 0 AD). - * \param not_after_seconds notAfter time (seconds, at most 86400). - * \return -1, 0 or +1. - */ -typedef int (*br_x509_time_check)(void *tctx, - uint32_t not_before_days, uint32_t not_before_seconds, - uint32_t not_after_days, uint32_t not_after_seconds); - /** * \brief The "minimal" X.509 engine structure. * @@ -693,8 +647,8 @@ typedef struct { uint32_t *rp; const unsigned char *ip; } cpu; - uint32_t dp_stack[31]; - uint32_t rp_stack[31]; + uint32_t dp_stack[32]; + uint32_t rp_stack[32]; int err; /* Server name to match with the SAN / CN of the EE certificate. */ @@ -776,12 +730,6 @@ typedef struct { br_name_element *name_elts; size_t num_name_elts; - /* - * Callback function (and context) to get the current date. - */ - void *itime_ctx; - br_x509_time_check itime; - /* * Public key cryptography implementations (signature verification). */ @@ -963,28 +911,6 @@ br_x509_minimal_set_time(br_x509_minimal_context *ctx, { ctx->days = days; ctx->seconds = seconds; - ctx->itime = 0; -} - -/** - * \brief Set the validity range callback function for the X.509 - * "minimal" engine. - * - * The provided function will be invoked to check whether the validation - * date is within the validity range for a given X.509 certificate; a - * call will be issued for each considered certificate. The provided - * context pointer (itime_ctx) will be passed as first parameter to the - * callback. - * - * \param tctx context for callback invocation. - * \param cb callback function. - */ -static inline void -br_x509_minimal_set_time_callback(br_x509_minimal_context *ctx, - void *itime_ctx, br_x509_time_check itime) -{ - ctx->itime_ctx = itime_ctx; - ctx->itime = itime; } /** diff --git a/lib/lib_ssl/bearssl-esp8266/src/t_config.h b/lib/lib_ssl/bearssl-esp8266/src/t_config.h index be8e840cd..2b0e47b64 100644 --- a/lib/lib_ssl/bearssl-esp8266/src/t_config.h +++ b/lib/lib_ssl/bearssl-esp8266/src/t_config.h @@ -1,7 +1,7 @@ /* * Copyright (c) 2016 Thomas Pornin * - * Permission is hereby granted, free of charge, to any person obtaining + * Permission is hereby granted, free of charge, to any person obtaining * a copy of this software and associated documentation files (the * "Software"), to deal in the Software without restriction, including * without limitation the rights to use, copy, modify, merge, publish, @@ -9,12 +9,12 @@ * permit persons to whom the Software is furnished to do so, subject to * the following conditions: * - * The above copyright notice and this permission notice shall be + * The above copyright notice and this permission notice shall be * included in all copies or substantial portions of the Software. * - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF - * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND + * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS * BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN * ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN @@ -111,27 +111,9 @@ #define BR_RDRAND 1 */ -/* - * When BR_USE_GETENTROPY is enabled, the SSL engine will use the - * getentropy() function to obtain quality randomness for seeding its - * internal PRNG. On Linux and FreeBSD, getentropy() is implemented by - * the standard library with the system call getrandom(); on OpenBSD, - * getentropy() is the system call, and there is no getrandom() wrapper, - * hence the use of the getentropy() function for maximum portability. - * - * If the getentropy() call fails, and BR_USE_URANDOM is not explicitly - * disabled, then /dev/urandom will be used as a fallback mechanism. On - * FreeBSD and OpenBSD, this does not change much, since /dev/urandom - * will block if not enough entropy has been obtained since last boot. - * On Linux, /dev/urandom might not block, which can be troublesome in - * early boot stages, which is why getentropy() is preferred. - * -#define BR_USE_GETENTROPY 1 - */ - /* * When BR_USE_URANDOM is enabled, the SSL engine will use /dev/urandom - * to automatically obtain quality randomness for seeding its internal + * to automatically obtain quality randomness for seedings its internal * PRNG. * #define BR_USE_URANDOM 1 @@ -147,7 +129,7 @@ /* * When BR_USE_WIN32_RAND is enabled, the SSL engine will use the Win32 * (CryptoAPI) functions (CryptAcquireContext(), CryptGenRandom()...) to - * automatically obtain quality randomness for seeding its internal PRNG. + * automatically obtain quality randomness for seedings its internal PRNG. * * Note: if both BR_USE_URANDOM and BR_USE_WIN32_RAND are defined, the * former takes precedence. diff --git a/lib/lib_ssl/bearssl-esp8266/src/t_inner.h b/lib/lib_ssl/bearssl-esp8266/src/t_inner.h index 27f030108..de08990e5 100644 --- a/lib/lib_ssl/bearssl-esp8266/src/t_inner.h +++ b/lib/lib_ssl/bearssl-esp8266/src/t_inner.h @@ -1,7 +1,7 @@ /* * Copyright (c) 2016 Thomas Pornin * - * Permission is hereby granted, free of charge, to any person obtaining + * Permission is hereby granted, free of charge, to any person obtaining * a copy of this software and associated documentation files (the * "Software"), to deal in the Software without restriction, including * without limitation the rights to use, copy, modify, merge, publish, @@ -9,12 +9,12 @@ * permit persons to whom the Software is furnished to do so, subject to * the following conditions: * - * The above copyright notice and this permission notice shall be + * The above copyright notice and this permission notice shall be * included in all copies or substantial portions of the Software. * - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF - * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND + * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS * BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN * ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN diff --git a/lib/lib_ssl/bearssl-esp8266/src/x509/pkey_decoder.c b/lib/lib_ssl/bearssl-esp8266/src/x509/pkey_decoder.c index c234bc11b..84fa057aa 100644 --- a/lib/lib_ssl/bearssl-esp8266/src/x509/pkey_decoder.c +++ b/lib/lib_ssl/bearssl-esp8266/src/x509/pkey_decoder.c @@ -100,9 +100,6 @@ br_pkey_decoder_push(br_pkey_decoder_context *ctx, br_pkey_decoder_run(&ctx->cpu); } -/* State machine should be squeezed for size, not performance critical */ -#pragma GCC optimize ("Os") - static const unsigned char t0_datablock[] PROGMEM = { @@ -386,7 +383,7 @@ br_pkey_decoder_run(void *t0ctx) break; case 9: { /* -rot */ - T0_NROT(); + T0_NROT(); } break; case 10: { @@ -454,17 +451,17 @@ br_pkey_decoder_run(void *t0ctx) break; case 17: { /* co */ - T0_CO(); + T0_CO(); } break; case 18: { /* drop */ - (void)T0_POP(); + (void)T0_POP(); } break; case 19: { /* dup */ - T0_PUSH(T0_PEEK(0)); + T0_PUSH(T0_PEEK(0)); } break; case 20: { @@ -501,7 +498,7 @@ br_pkey_decoder_run(void *t0ctx) break; case 23: { /* over */ - T0_PUSH(T0_PEEK(1)); + T0_PUSH(T0_PEEK(1)); } break; case 24: { @@ -537,7 +534,7 @@ br_pkey_decoder_run(void *t0ctx) break; case 26: { /* rot */ - T0_ROT(); + T0_ROT(); } break; case 27: { @@ -574,7 +571,7 @@ br_pkey_decoder_run(void *t0ctx) break; case 30: { /* swap */ - T0_SWAP(); + T0_SWAP(); } break; } diff --git a/lib/lib_ssl/bearssl-esp8266/src/x509/skey_decoder.c b/lib/lib_ssl/bearssl-esp8266/src/x509/skey_decoder.c index 02bc8d714..47adab0eb 100644 --- a/lib/lib_ssl/bearssl-esp8266/src/x509/skey_decoder.c +++ b/lib/lib_ssl/bearssl-esp8266/src/x509/skey_decoder.c @@ -100,9 +100,6 @@ br_skey_decoder_push(br_skey_decoder_context *ctx, br_skey_decoder_run(&ctx->cpu); } -/* State machine should be squeezed for size, not performance critical */ -#pragma GCC optimize ("Os") - static const unsigned char t0_datablock[] PROGMEM = { @@ -411,7 +408,7 @@ br_skey_decoder_run(void *t0ctx) break; case 9: { /* -rot */ - T0_NROT(); + T0_NROT(); } break; case 10: { @@ -488,17 +485,17 @@ br_skey_decoder_run(void *t0ctx) break; case 18: { /* co */ - T0_CO(); + T0_CO(); } break; case 19: { /* drop */ - (void)T0_POP(); + (void)T0_POP(); } break; case 20: { /* dup */ - T0_PUSH(T0_PEEK(0)); + T0_PUSH(T0_PEEK(0)); } break; case 21: { @@ -543,7 +540,7 @@ br_skey_decoder_run(void *t0ctx) break; case 25: { /* over */ - T0_PUSH(T0_PEEK(1)); + T0_PUSH(T0_PEEK(1)); } break; case 26: { @@ -579,7 +576,7 @@ br_skey_decoder_run(void *t0ctx) break; case 28: { /* rot */ - T0_ROT(); + T0_ROT(); } break; case 29: { @@ -632,7 +629,7 @@ br_skey_decoder_run(void *t0ctx) break; case 32: { /* swap */ - T0_SWAP(); + T0_SWAP(); } break; case 33: { diff --git a/lib/lib_ssl/bearssl-esp8266/src/x509/x509_decoder.c b/lib/lib_ssl/bearssl-esp8266/src/x509/x509_decoder.c index 9d2c22d94..b738755f5 100644 --- a/lib/lib_ssl/bearssl-esp8266/src/x509/x509_decoder.c +++ b/lib/lib_ssl/bearssl-esp8266/src/x509/x509_decoder.c @@ -113,9 +113,6 @@ br_x509_decoder_push(br_x509_decoder_context *ctx, br_x509_decoder_run(&ctx->cpu); } -/* State machine should be squeezed for size, not performance critical */ -#pragma GCC optimize ("Os") - static const unsigned char t0_datablock[] PROGMEM = { @@ -523,7 +520,7 @@ br_x509_decoder_run(void *t0ctx) break; case 11: { /* -rot */ - T0_NROT(); + T0_NROT(); } break; case 12: { @@ -618,7 +615,7 @@ br_x509_decoder_run(void *t0ctx) break; case 22: { /* co */ - T0_CO(); + T0_CO(); } break; case 23: { @@ -656,12 +653,12 @@ br_x509_decoder_run(void *t0ctx) break; case 26: { /* drop */ - (void)T0_POP(); + (void)T0_POP(); } break; case 27: { /* dup */ - T0_PUSH(T0_PEEK(0)); + T0_PUSH(T0_PEEK(0)); } break; case 28: { @@ -707,7 +704,7 @@ br_x509_decoder_run(void *t0ctx) break; case 32: { /* over */ - T0_PUSH(T0_PEEK(1)); + T0_PUSH(T0_PEEK(1)); } break; case 33: { @@ -756,7 +753,7 @@ br_x509_decoder_run(void *t0ctx) break; case 35: { /* rot */ - T0_ROT(); + T0_ROT(); } break; case 36: { @@ -777,7 +774,7 @@ br_x509_decoder_run(void *t0ctx) break; case 38: { /* swap */ - T0_SWAP(); + T0_SWAP(); } break; } diff --git a/lib/lib_ssl/bearssl-esp8266/src/x509/x509_minimal.c b/lib/lib_ssl/bearssl-esp8266/src/x509/x509_minimal.c index 4e506a5a2..0d92e7b25 100644 --- a/lib/lib_ssl/bearssl-esp8266/src/x509/x509_minimal.c +++ b/lib/lib_ssl/bearssl-esp8266/src/x509/x509_minimal.c @@ -489,8 +489,6 @@ static int check_single_trust_anchor_CA(br_x509_minimal_context *ctx, return 0; } -/* State machine should be squeezed for size, not performance critical */ -#pragma GCC optimize ("Os") @@ -1088,7 +1086,7 @@ br_x509_minimal_run(void *t0ctx) break; case 11: { /* -rot */ - T0_NROT(); + T0_NROT(); } break; case 12: { @@ -1271,43 +1269,35 @@ br_x509_minimal_run(void *t0ctx) uint32_t nas = T0_POP(); uint32_t nad = T0_POP(); int r; - if (CTX->itime != 0) { - r = CTX->itime(CTX->itime_ctx, nbd, nbs, nad, nas); - if (r < -1 || r > 1) { - CTX->err = BR_ERR_X509_TIME_UNKNOWN; - T0_CO(); - } - } else { - uint32_t vd = CTX->days; - uint32_t vs = CTX->seconds; - if (vd == 0 && vs == 0) { + uint32_t vd = CTX->days; + uint32_t vs = CTX->seconds; + if (vd == 0 && vs == 0) { #if BR_USE_UNIX_TIME - time_t x = time(NULL); + time_t x = time(NULL); - vd = (uint32_t)(x / 86400) + 719528; - vs = (uint32_t)(x % 86400); + vd = (uint32_t)(x / 86400) + 719528; + vs = (uint32_t)(x % 86400); #elif BR_USE_WIN32_TIME - FILETIME ft; - uint64_t x; + FILETIME ft; + uint64_t x; - GetSystemTimeAsFileTime(&ft); - x = ((uint64_t)ft.dwHighDateTime << 32) - + (uint64_t)ft.dwLowDateTime; - x = (x / 10000000); - vd = (uint32_t)(x / 86400) + 584754; - vs = (uint32_t)(x % 86400); + GetSystemTimeAsFileTime(&ft); + x = ((uint64_t)ft.dwHighDateTime << 32) + + (uint64_t)ft.dwLowDateTime; + x = (x / 10000000); + vd = (uint32_t)(x / 86400) + 584754; + vs = (uint32_t)(x % 86400); #else - CTX->err = BR_ERR_X509_TIME_UNKNOWN; + CTX->err = BR_ERR_X509_TIME_UNKNOWN; T0_CO(); #endif - } - if (vd < nbd || (vd == nbd && vs < nbs)) { - r = -1; - } else if (vd > nad || (vd == nad && vs > nas)) { - r = 1; - } else { - r = 0; - } + } + if (vd < nbd || (vd == nbd && vs < nbs)) { + r = -1; + } else if (vd > nad || (vd == nad && vs > nas)) { + r = 1; + } else { + r = 0; } T0_PUSHi(r); @@ -1315,7 +1305,7 @@ br_x509_minimal_run(void *t0ctx) break; case 26: { /* co */ - T0_CO(); + T0_CO(); } break; case 27: { @@ -1463,12 +1453,12 @@ br_x509_minimal_run(void *t0ctx) break; case 37: { /* drop */ - (void)T0_POP(); + (void)T0_POP(); } break; case 38: { /* dup */ - T0_PUSH(T0_PEEK(0)); + T0_PUSH(T0_PEEK(0)); } break; case 39: { @@ -1609,7 +1599,7 @@ br_x509_minimal_run(void *t0ctx) break; case 48: { /* over */ - T0_PUSH(T0_PEEK(1)); + T0_PUSH(T0_PEEK(1)); } break; case 49: { @@ -1659,7 +1649,7 @@ br_x509_minimal_run(void *t0ctx) break; case 51: { /* rot */ - T0_ROT(); + T0_ROT(); } break; case 52: { @@ -1711,7 +1701,7 @@ br_x509_minimal_run(void *t0ctx) break; case 58: { /* swap */ - T0_SWAP(); + T0_SWAP(); } break; case 59: { @@ -1785,5 +1775,3 @@ verify_signature(br_x509_minimal_context *ctx, const br_x509_pkey *pk) return BR_ERR_X509_UNSUPPORTED; } } - - diff --git a/lib/lib_ssl/tls_mini/src/WiFiClientSecureLightBearSSL.cpp b/lib/lib_ssl/tls_mini/src/WiFiClientSecureLightBearSSL.cpp old mode 100644 new mode 100755 index ce552977a..8b11073f2 --- a/lib/lib_ssl/tls_mini/src/WiFiClientSecureLightBearSSL.cpp +++ b/lib/lib_ssl/tls_mini/src/WiFiClientSecureLightBearSSL.cpp @@ -54,7 +54,9 @@ #include "c_types.h" #endif -#include +#if __has_include("core_version.h") // ESP32 Stage has no core_version.h file. Disable include via PlatformIO Option +#include // Arduino_Esp8266 version information (ARDUINO_ESP8266_RELEASE and ARDUINO_ESP8266_RELEASE_2_7_1) +#endif // ESP32_STAGE #undef DEBUG_TLS #ifdef DEBUG_TLS @@ -75,6 +77,9 @@ void _Log_heap_size(const char *msg) { #define LOG_HEAP_SIZE(a) #endif +// get UTC time from Tasmota +//extern uint32_t UtcTime(void); +//extern uint32_t CfgTime(void); #ifdef ESP8266 // Stack thunk is not needed with ESP32 // Stack thunked versions of calls @@ -196,7 +201,8 @@ void WiFiClientSecure_light::_clear() { _last_error = 0; _recvapp_buf = nullptr; _recvapp_len = 0; - _insecure = false; // set to true when calling setPubKeyFingerprint() + _insecure = true; // set to true when calling setPubKeyFingerprint() + _rsa_only = false; // for now we disable ECDSA by default _fingerprint_any = true; // by default accept all fingerprints _fingerprint1 = nullptr; _fingerprint2 = nullptr; @@ -298,16 +304,6 @@ void WiFiClientSecure_light::flush(void) { #ifdef ESP32 -int WiFiClientSecure_light::connect(IPAddress ip, uint16_t port) -{ - return connect(ip, port, _timeout); -} - -int WiFiClientSecure_light::connect(const char* name, uint16_t port) -{ - return connect(name, port, _timeout); -} - int WiFiClientSecure_light::connect(IPAddress ip, uint16_t port, int32_t timeout) { DEBUG_BSSL("connect(%s,%d)", ip.toString().c_str(), port); @@ -316,7 +312,9 @@ int WiFiClientSecure_light::connect(IPAddress ip, uint16_t port, int32_t timeout setLastError(ERR_TCP_CONNECT); return 0; } - return _connectSSL(_domain.isEmpty() ? nullptr : _domain.c_str()); + bool success = _connectSSL(_domain.isEmpty() ? nullptr : _domain.c_str()); + if (!success) { stop(); } + return success; } #else // ESP32 int WiFiClientSecure_light::connect(IPAddress ip, uint16_t port) { @@ -326,7 +324,9 @@ int WiFiClientSecure_light::connect(IPAddress ip, uint16_t port) { setLastError(ERR_TCP_CONNECT); return 0; } - return _connectSSL(_domain.isEmpty() ? nullptr : _domain.c_str()); + bool success = _connectSSL(_domain.isEmpty() ? nullptr : _domain.c_str()); + if (!success) { stop(); } + return success; } #endif @@ -335,7 +335,7 @@ int WiFiClientSecure_light::connect(const char* name, uint16_t port, int32_t tim DEBUG_BSSL("connect(%s,%d)\n", name, port); IPAddress remote_addr; clearLastError(); - if (WiFi.hostByName(name, remote_addr) != 1) { + if (!WiFi.hostByName(name, remote_addr)) { DEBUG_BSSL("connect: Name loopup failure\n"); setLastError(ERR_CANT_RESOLVE_IP); return 0; @@ -354,7 +354,7 @@ int WiFiClientSecure_light::connect(const char* name, uint16_t port) { DEBUG_BSSL("connect(%s,%d)\n", name, port); IPAddress remote_addr; clearLastError(); - if (WiFi.hostByName(name, remote_addr, 1000) != 1) { + if (!WiFi.hostByName(name, remote_addr)) { DEBUG_BSSL("connect: Name loopup failure\n"); setLastError(ERR_CANT_RESOLVE_IP); return 0; @@ -587,6 +587,7 @@ int WiFiClientSecure_light::_run_until(unsigned target, bool blocking) { if (((int32_t)(millis() - (t + this->_loopTimeout)) >= 0)){ DEBUG_BSSL("_run_until: Timeout\n"); + setLastError(ERR_TLS_TIMEOUT); return -1; } @@ -606,72 +607,66 @@ int WiFiClientSecure_light::_run_until(unsigned target, bool blocking) { } #endif - /* - If there is some record data to send, do it. This takes - precedence over everything else. - */ - if (state & BR_SSL_SENDREC) { - unsigned char *buf; - size_t len; - int wlen; + /* + If there is some record data to send, do it. This takes + precedence over everything else. + */ + if (state & BR_SSL_SENDREC) { + unsigned char *buf; + size_t len; + int wlen; - buf = br_ssl_engine_sendrec_buf(_eng, &len); - wlen = WiFiClient::write(buf, len); - if (wlen < 0) { - /* - If we received a close_notify and we - still send something, then we have our - own response close_notify to send, and - the peer is allowed by RFC 5246 not to - wait for it. - */ - if (!_eng->shutdown_recv) { -// br_ssl_engine_fail(_eng, BR_ERR_IO); - } - return -1; - } - if (wlen > 0) { - br_ssl_engine_sendrec_ack(_eng, wlen); - } + buf = br_ssl_engine_sendrec_buf(_eng, &len); + wlen = WiFiClient::write(buf, len); + if (wlen <= 0) { + /* + If we received a close_notify and we + still send something, then we have our + own response close_notify to send, and + the peer is allowed by RFC 5246 not to + wait for it. + */ + return -1; + } + if (wlen > 0) { + br_ssl_engine_sendrec_ack(_eng, wlen); + } no_work = 0; - continue; - } + continue; + } - /* - If we reached our target, then we are finished. - */ - if (state & target) { - return 0; - } - - /* - If some application data must be read, and we did not - exit, then this means that we are trying to write data, - and that's not possible until the application data is - read. This may happen if using a shared in/out buffer, - and the underlying protocol is not strictly half-duplex. - This is unrecoverable here, so we report an error. - */ - if (state & BR_SSL_RECVAPP) { - DEBUG_BSSL("_run_until: Fatal protocol state\n"); - return -1; - } - - /* - If we reached that point, then either we are trying - to read data and there is some, or the engine is stuck - until a new record is obtained. - */ - if (state & BR_SSL_RECVREC) { - if (WiFiClient::available()) { + /* + If we reached our target, then we are finished. + */ + if (state & target) { + return 0; + } + /* + If some application data must be read, and we did not + exit, then this means that we are trying to write data, + and that's not possible until the application data is + read. This may happen if using a shared in/out buffer, + and the underlying protocol is not strictly half-duplex. + This is unrecoverable here, so we report an error. + */ + if (state & BR_SSL_RECVAPP) { + DEBUG_BSSL("_run_until: Fatal protocol state\n"); + return -1; + } + /* + If we reached that point, then either we are trying + to read data and there is some, or the engine is stuck + until a new record is obtained. + */ + if (state & BR_SSL_RECVREC) { + if (WiFiClient::available()) { unsigned char *buf; size_t len; int rlen; buf = br_ssl_engine_recvrec_buf(_eng, &len); - rlen = WiFiClient::read(buf, len); + rlen = WiFiClient::read(buf, len); if (rlen < 0) { -// br_ssl_engine_fail(_eng, BR_ERR_IO); return -1; } if (rlen > 0) { @@ -680,16 +675,15 @@ int WiFiClientSecure_light::_run_until(unsigned target, bool blocking) { no_work = 0; continue; } - } - - /* - We can reach that point if the target RECVAPP, and - the state contains SENDAPP only. This may happen with - a shared in/out buffer. In that case, we must flush - the buffered data to "make room" for a new incoming - record. - */ - br_ssl_engine_flush(_eng, 0); + } + /* + We can reach that point if the target RECVAPP, and + the state contains SENDAPP only. This may happen with + a shared in/out buffer. In that case, we must flush + the buffered data to "make room" for a new incoming + record. + */ + br_ssl_engine_flush(_eng, 0); no_work++; // We didn't actually advance here } @@ -792,59 +786,69 @@ extern "C" { xc->done_cert = true; // first cert already processed } -// **** Start patch Castellucci -/* - static void pubkeyfingerprint_pubkey_fingerprint(br_sha1_context *shactx, br_rsa_public_key rsakey) { - br_sha1_init(shactx); - br_sha1_update(shactx, "ssh-rsa", 7); // tag - br_sha1_update(shactx, rsakey.e, rsakey.elen); // exponent - br_sha1_update(shactx, rsakey.n, rsakey.nlen); // modulus - } -*/ - // If `compat` id false, adds a u32be length prefixed value to the sha1 state. - // If `compat` is true, the length will be omitted for compatibility with - // data from older versions of Tasmota. - static void sha1_update_len(br_sha1_context *shactx, const void *msg, uint32_t len, bool compat) { + // Add a data element with a u32be length prefix to the sha1 state. + static void sha1_update_len(br_sha1_context *shactx, const void *msg, uint32_t len) { uint8_t buf[] = {0, 0, 0, 0}; - if (!compat) { - buf[0] = (len >> 24) & 0xff; - buf[1] = (len >> 16) & 0xff; - buf[2] = (len >> 8) & 0xff; - buf[3] = (len >> 0) & 0xff; - br_sha1_update(shactx, buf, 4); // length - } + buf[0] = (len >> 24) & 0xff; + buf[1] = (len >> 16) & 0xff; + buf[2] = (len >> 8) & 0xff; + buf[3] = (len >> 0) & 0xff; + br_sha1_update(shactx, buf, 4); // length + br_sha1_update(shactx, msg, len); // message } - // Update the received fingerprint based on the certificate's public key. - // If `compat` is true, an insecure version of the fingerprint will be - // calcualted for compatibility with older versions of Tasmota. Normally, - // `compat` should be false. - static void pubkeyfingerprint_pubkey_fingerprint(br_x509_pubkeyfingerprint_context *xc, bool compat) { - br_rsa_public_key rsakey = xc->ctx.pkey.key.rsa; + // Calculate the received fingerprint based on the certificate's public key. + // The public exponent and modulus are length prefixed to avoid security + // vulnerabilities related to ambiguous serialization. Without this, an + // attacker can generate alternative public keys which result in the same + // fingerprint, but are trivial to crack. This works because RSA keys can be + // created with more than two primes, and most numbers, even large ones, can + // be easily factored. + static void pubkeyfingerprint_pubkey_fingerprint(br_x509_pubkeyfingerprint_context *xc) { + if (xc->ctx.pkey.key_type == BR_KEYTYPE_RSA) { + br_rsa_public_key rsakey = xc->ctx.pkey.key.rsa; - br_sha1_context shactx; + br_sha1_context shactx; - br_sha1_init(&shactx); + br_sha1_init(&shactx); - sha1_update_len(&shactx, "ssh-rsa", 7, compat); // tag - sha1_update_len(&shactx, rsakey.e, rsakey.elen, compat); // exponent - sha1_update_len(&shactx, rsakey.n, rsakey.nlen, compat); // modulus + // The tag string doesn't really matter, but it should differ depending on + // key type. For RSA it's a fixed string. + sha1_update_len(&shactx, "ssh-rsa", 7); // tag + sha1_update_len(&shactx, rsakey.e, rsakey.elen); // exponent + sha1_update_len(&shactx, rsakey.n, rsakey.nlen); // modulus - br_sha1_out(&shactx, xc->pubkey_recv_fingerprint); // copy to fingerprint + br_sha1_out(&shactx, xc->pubkey_recv_fingerprint); // copy to fingerprint + } + #ifndef ESP8266 + else if (xc->ctx.pkey.key_type == BR_KEYTYPE_EC) { + br_ec_public_key eckey = xc->ctx.pkey.key.ec; + + br_sha1_context shactx; + + br_sha1_init(&shactx); + + // The tag string doesn't really matter, but it should differ depending on + // key type. For ECDSA it's a fixed string. + sha1_update_len(&shactx, "ecdsa", 5); // tag + int32_t curve = htonl(eckey.curve); + sha1_update_len(&shactx, &curve, 4); // curve id as int32be + sha1_update_len(&shactx, eckey.q, eckey.qlen); // public point + } + #endif + else { + // We don't support anything else, so just set the fingerprint to all zeros. + memset(xc->pubkey_recv_fingerprint, 0, 20); + } } -// **** End patch Castellucci // Callback when complete chain has been parsed. // Return 0 on validation success, !0 on validation error static unsigned pubkeyfingerprint_end_chain(const br_x509_class **ctx) { br_x509_pubkeyfingerprint_context *xc = (br_x509_pubkeyfingerprint_context *)ctx; - // set fingerprint status byte to zero - // FIXME: find a better way to pass this information - xc->pubkey_recv_fingerprint[20] = 0; - // Try matching using the the new fingerprint algorithm - pubkeyfingerprint_pubkey_fingerprint(xc, false); + pubkeyfingerprint_pubkey_fingerprint(xc); if (!xc->fingerprint_all) { if (0 == memcmp_P(xc->pubkey_recv_fingerprint, xc->fingerprint1, 20)) { return 0; @@ -857,7 +861,6 @@ extern "C" { // Default (no validation at all) or no errors in prior checks = success. return 0; } -// **** End patch Castellucci } // Return the public key from the validator (set by x509_minimal) @@ -894,20 +897,39 @@ extern "C" { ctx->fingerprint_all = fingerprint_all; } +#ifdef ESP8266 // We limit to a single cipher to reduce footprint // we reference it, don't put in PROGMEM static const uint16_t suites[] = { BR_TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256 }; +#else + // add more flexibility on ESP32 + static const uint16_t suites[] = { + BR_TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256, + BR_TLS_ECDHE_ECDSA_WITH_AES_128_GCM_SHA256, + }; + static const uint16_t suites_RSA_ONLY[] = { + BR_TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256, + }; +#endif // Default initializion for our SSL clients - static void br_ssl_client_base_init(br_ssl_client_context *cc) { + static void br_ssl_client_base_init(br_ssl_client_context *cc, bool _rsa_only) { br_ssl_client_zero(cc); // forbid SSL renegotiation, as we free the Private Key after handshake br_ssl_engine_add_flags(&cc->eng, BR_OPT_NO_RENEGOTIATION); br_ssl_engine_set_versions(&cc->eng, BR_TLS12, BR_TLS12); +#ifdef ESP8266 br_ssl_engine_set_suites(&cc->eng, suites, (sizeof suites) / (sizeof suites[0])); +#else + if (_rsa_only) { + br_ssl_engine_set_suites(&cc->eng, suites_RSA_ONLY, (sizeof suites_RSA_ONLY) / (sizeof suites_RSA_ONLY[0])); + } else { + br_ssl_engine_set_suites(&cc->eng, suites, (sizeof suites) / (sizeof suites[0])); + } +#endif br_ssl_client_set_default_rsapub(cc); br_ssl_engine_set_default_rsavrfy(&cc->eng); @@ -922,6 +944,9 @@ extern "C" { // we support only P256 EC curve for AWS IoT, no EC curve for Letsencrypt unless forced br_ssl_engine_set_ec(&cc->eng, &br_ec_p256_m15); // TODO +#ifndef ESP8266 + br_ssl_engine_set_ecdsa(&cc->eng, &br_ecdsa_i15_vrfy_asn1); +#endif } } @@ -935,8 +960,6 @@ bool WiFiClientSecure_light::_connectSSL(const char* hostName) { LOG_HEAP_SIZE("_connectSSL.start"); - bool OOM_error_occured = true; - do { // used to exit on Out of Memory error and keep all cleanup code at the same place // ============================================================ // allocate Thunk stack, move to alternate stack and initialize @@ -954,7 +977,7 @@ bool WiFiClientSecure_light::_connectSSL(const char* hostName) { _ctx_present = true; _eng = &_sc->eng; // Allocation/deallocation taken care of by the _sc shared_ptr - br_ssl_client_base_init(_sc.get()); + br_ssl_client_base_init(_sc.get(), _rsa_only); if (_alpn_names && _alpn_num > 0) { br_ssl_engine_set_protocol_names(_eng, _alpn_names, _alpn_num); } @@ -989,23 +1012,20 @@ bool WiFiClientSecure_light::_connectSSL(const char* hostName) { br_ssl_engine_set_buffers_bidi(_eng, _iobuf_in.get(), _iobuf_in_size, _iobuf_out.get(), _iobuf_out_size); // ============================================================ - // allocate Private key if needed, only if USE_MQTT_AWS_IOT + // allocate Private key if needed, only if USE_MQTT_CLIENT_CERT LOG_HEAP_SIZE("_connectSSL before PrivKey allocation"); - #ifdef USE_MQTT_AWS_IOT + #if defined(USE_MQTT_CLIENT_CERT) // ============================================================ - // Set the EC Private Key, only USE_MQTT_AWS_IOT + // Set the EC Private Key, only USE_MQTT_CLIENT_CERT // limited to P256 curve br_ssl_client_set_single_ec(_sc.get(), _chain_P, 1, _sk_ec_P, _allowed_usages, _cert_issuer_key_type, &br_ec_p256_m15, br_ecdsa_sign_asn1_get_default()); - #endif // USE_MQTT_AWS_IOT + #endif // USE_MQTT_CLIENT_CERT // ============================================================ // Start TLS connection, ALL - if (!br_ssl_client_reset(_sc.get(), hostName, 0)) { - OOM_error_occured = false; - break; - } + if (!br_ssl_client_reset(_sc.get(), hostName, 0)) break; auto ret = _wait_for_handshake(); #ifdef DEBUG_ESP_SSL @@ -1031,10 +1051,8 @@ bool WiFiClientSecure_light::_connectSSL(const char* hostName) { // ============================================================ // if we arrived here, this means we had an OOM error, cleaning up - if (OOM_error_occured) { - setLastError(ERR_OOM); - DEBUG_BSSL("_connectSSL: Out of memory\n"); - } + setLastError(ERR_OOM); + DEBUG_BSSL("_connectSSL: Out of memory\n"); #ifdef ESP8266 stack_thunk_light_del_ref(); #endif diff --git a/lib/lib_ssl/tls_mini/src/WiFiClientSecureLightBearSSL.h b/lib/lib_ssl/tls_mini/src/WiFiClientSecureLightBearSSL.h old mode 100644 new mode 100755 index c8555b957..fe9fe4f98 --- a/lib/lib_ssl/tls_mini/src/WiFiClientSecureLightBearSSL.h +++ b/lib/lib_ssl/tls_mini/src/WiFiClientSecureLightBearSSL.h @@ -20,7 +20,9 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */ -#include +#if __has_include("core_version.h") // ESP32 Stage has no core_version.h file. Disable include via PlatformIO Option +#include // Arduino_Esp8266 version information (ARDUINO_ESP8266_RELEASE and ARDUINO_ESP8266_RELEASE_2_7_1) +#endif // ESP32_STAGE #ifndef wificlientlightbearssl_h #define wificlientlightbearssl_h @@ -29,27 +31,24 @@ #include "NetworkClient.h" #include - namespace BearSSL { class WiFiClientSecure_light : public NetworkClient { public: - typedef std::function UtcTime_fcn; - typedef std::function CfgTime_fcn; - WiFiClientSecure_light(int recv, int xmit); ~WiFiClientSecure_light() override; + // Set function pointers to call to get UTC time or build time. + typedef std::function UtcTime_fcn; + typedef std::function CfgTime_fcn; void setUtcTime_fcn(UtcTime_fcn fcn) { _UtcTime = fcn; } void setCfgTime_fcn(CfgTime_fcn fcn) { _CfgTime = fcn; } void allocateBuffers(void); #ifdef ESP32 // the method to override in ESP32 has timeout argument default #define WIFI_CLIENT_DEF_CONN_TIMEOUT_MS (3000) - int connect(IPAddress ip, uint16_t port) override; - int connect(const char* name, uint16_t port) override; - int connect(IPAddress ip, uint16_t port, int32_t timeout); - int connect(const char* name, uint16_t port, int32_t timeout); + int connect(IPAddress ip, uint16_t port, int32_t timeout = 3000) override; + int connect(const char* name, uint16_t port, int32_t timeout = 3000) override; #else int connect(IPAddress ip, uint16_t port) override; int connect(const char* name, uint16_t port) override; @@ -93,6 +92,10 @@ class WiFiClientSecure_light : public NetworkClient { _fingerprint2 = f2; _fingerprint_any = f_any; _insecure = true; + _rsa_only = true; // if fingerprint, we limit to RSA only + } + void setRSAOnly(bool rsa_only) { + _rsa_only = rsa_only; } const uint8_t * getRecvPubKeyFingerprint(void) { return _recv_fingerprint; @@ -141,7 +144,7 @@ class WiFiClientSecure_light : public NetworkClient { } private: - uint32_t _loopTimeout=5000; + uint32_t _loopTimeout=10000; void _clear(); bool _ctx_present; std::shared_ptr _sc; @@ -158,14 +161,10 @@ class WiFiClientSecure_light : public NetworkClient { bool _fingerprint_any; // accept all fingerprints bool _insecure; // force fingerprint + bool _rsa_only; // restrict to RSA only key exchange (no ECDSA - enabled to force RSA fingerprints) const uint8_t *_fingerprint1; // fingerprint1 to be checked against const uint8_t *_fingerprint2; // fingerprint2 to be checked against -// **** Start patch Castellucci -/* uint8_t _recv_fingerprint[20]; // fingerprint received -*/ - uint8_t _recv_fingerprint[21]; // fingerprint received -// **** End patch Castellucci unsigned char *_recvapp_buf; size_t _recvapp_len; @@ -207,7 +206,8 @@ class WiFiClientSecure_light : public NetworkClient { #define ERR_CANT_RESOLVE_IP -1001 #define ERR_TCP_CONNECT -1002 // #define ERR_MISSING_EC_KEY -1003 // deprecated, AWS IoT is not called if the private key is not present -#define ERR_MISSING_CA -1004 +// #define ERR_MISSING_CA -1004 // deprecated +#define ERR_TLS_TIMEOUT -1005 // For reference, BearSSL error codes: // #define BR_ERR_OK 0 diff --git a/src/src/ESPEasyCore/Controller.cpp b/src/src/ESPEasyCore/Controller.cpp index 6dffc60d8..e2b84fbce 100644 --- a/src/src/ESPEasyCore/Controller.cpp +++ b/src/src/ESPEasyCore/Controller.cpp @@ -331,6 +331,7 @@ bool MQTTConnect_prepareClient(controllerIndex_t controller_idx) { mqtt_rootCA.clear(); if (mqtt_tls != nullptr) { + mqtt_tls->setTrustAnchor(Tasmota_TA, Tasmota_TA_size); mqtt_tls->setInsecure(); } break; @@ -500,7 +501,8 @@ bool MQTTConnect_wrapUpConnect(controllerIndex_t controller_idx, bool MQTTresult if (mqtt_tls_last_error == ERR_OOM) mqtt_tls_last_errorstr = F("OutOfMemory"); if (mqtt_tls_last_error == ERR_CANT_RESOLVE_IP) mqtt_tls_last_errorstr = F("Can't resolve IP"); if (mqtt_tls_last_error == ERR_TCP_CONNECT) mqtt_tls_last_errorstr = F("TCP Connect error"); - if (mqtt_tls_last_error == ERR_MISSING_CA) mqtt_tls_last_errorstr = F("Missing CA"); +// if (mqtt_tls_last_error == ERR_MISSING_CA) mqtt_tls_last_errorstr = F("Missing CA"); + if (mqtt_tls_last_error == ERR_TLS_TIMEOUT) mqtt_tls_last_errorstr = F("TLS Timeout"); } # ifdef ESP32 diff --git a/src/src/Globals/MQTT.cpp b/src/src/Globals/MQTT.cpp index f5e568f17..b85e33a92 100644 --- a/src/src/Globals/MQTT.cpp +++ b/src/src/Globals/MQTT.cpp @@ -11,7 +11,7 @@ String mqtt_tls_last_errorstr; int32_t mqtt_tls_last_error = 0; # ifdef ESP32 -BearSSL::WiFiClientSecure_light*mqtt_tls; +BearSSL::WiFiClientSecure_light*mqtt_tls{}; # endif // ifdef ESP32 # ifdef ESP8266 BearSSL::WiFiClientSecure*mqtt_tls; diff --git a/src/src/WebServer/ControllerPage.cpp b/src/src/WebServer/ControllerPage.cpp index 1a36ce3d2..83733243d 100644 --- a/src/src/WebServer/ControllerPage.cpp +++ b/src/src/WebServer/ControllerPage.cpp @@ -512,6 +512,99 @@ void handle_controllers_ControllerSettingsPage(controllerIndex_t controllerindex addHtmlInt(mqtt_tls_last_error); addHtml(F(": ")); addHtml(mqtt_tls_last_errorstr); +/* + getLastError codes as documented in lib\lib_ssl\bearssl-esp8266\src\t_bearssl_ssl.h + SSL-level error codes + | Receive Fatal Alert + | | Send Fatal Alert + | | | + 0 : 256 : 512 : BR_ERR_OK + 1 : 257 : 513 : BR_ERR_BAD_PARAM - caller-provided parameter is incorrect + 2 : 258 : 514 : BR_ERR_BAD_STATE - operation requested by the caller cannot be applied with the current context state (e.g. reading data while outgoing data is waiting to be sent) + 3 : 259 : 515 : BR_ERR_UNSUPPORTED_VERSION - incoming protocol or record version is unsupported + 4 : 260 : 516 : BR_ERR_BAD_VERSION - incoming record version does not match the expected version + 5 : 261 : 517 : BR_ERR_BAD_LENGTH - incoming record length is invalid + 6 : 262 : 518 : BR_ERR_TOO_LARGE - incoming record is too large to be processed, or buffer is too small for the handshake message to send + 7 : 263 : 519 : BR_ERR_BAD_MAC - decryption found an invalid padding, or the record MAC is not correct + 8 : 264 : 520 : BR_ERR_NO_RANDOM - no initial entropy was provided, and none can be obtained from the OS + 9 : 265 : 521 : BR_ERR_UNKNOWN_TYPE - incoming record type is unknown + 10 : 266 : 522 : BR_ERR_UNEXPECTED - incoming record or message has wrong type with regards to the current engine state + 12 : 268 : 524 : BR_ERR_BAD_CCS - ChangeCipherSpec message from the peer has invalid contents + 13 : 269 : 525 : BR_ERR_BAD_ALERT - alert message from the peer has invalid contents (odd length) + 14 : 270 : 526 : BR_ERR_BAD_HANDSHAKE - incoming handshake message decoding failed + 15 : 271 : 527 : BR_ERR_OVERSIZED_ID - ServerHello contains a session ID which is larger than 32 bytes + 16 : 272 : 528 : BR_ERR_BAD_CIPHER_SUITE - server wants to use a cipher suite that we did not claim to support. This is also reported if we tried to advertise a cipher suite that we do not support + 17 : 273 : 529 : BR_ERR_BAD_COMPRESSION - server wants to use a compression that we did not claim to support + 18 : 274 : 530 : BR_ERR_BAD_FRAGLEN - server's max fragment length does not match client's + 19 : 275 : 531 : BR_ERR_BAD_SECRENEG - secure renegotiation failed + 20 : 276 : 532 : BR_ERR_EXTRA_EXTENSION - server sent an extension type that we did not announce, or used the same extension type several times in a single ServerHello + 21 : 277 : 533 : BR_ERR_BAD_SNI - invalid Server Name Indication contents (when used by the server, this extension shall be empty) + 22 : 278 : 534 : BR_ERR_BAD_HELLO_DONE - invalid ServerHelloDone from the server (length is not 0) + 23 : 279 : 535 : BR_ERR_LIMIT_EXCEEDED - internal limit exceeded (e.g. server's public key is too large) + 24 : 280 : 536 : BR_ERR_BAD_FINISHED - Finished message from peer does not match the expected value + 25 : 281 : 537 : BR_ERR_RESUME_MISMATCH - session resumption attempt with distinct version or cipher suite + 26 : 282 : 538 : BR_ERR_INVALID_ALGORITHM - unsupported or invalid algorithm (ECDHE curve, signature algorithm, hash function) + 27 : 283 : 539 : BR_ERR_BAD_SIGNATURE - invalid signature (on ServerKeyExchange from server, or in CertificateVerify from client) + 28 : 284 : 540 : BR_ERR_WRONG_KEY_USAGE - peer's public key does not have the proper type or is not allowed for requested operation + 29 : 285 : 541 : BR_ERR_NO_CLIENT_AUTH - client did not send a certificate upon request, or the client certificate could not be validated + 31 : 287 : 543 : BR_ERR_IO - I/O error or premature close on underlying transport stream. This error code is set only by the simplified I/O API ("br_sslio_*") + + getLastError codes as documented in lib\lib_ssl\bearssl-esp8266\src\t_bearssl_x509.h + 32 : BR_ERR_X509_OK - validation was successful; this is not actually an error + 33 : BR_ERR_X509_INVALID_VALUE - invalid value in an ASN.1 structure + 34 : BR_ERR_X509_TRUNCATED - truncated certificate + 35 : BR_ERR_X509_EMPTY_CHAIN - empty certificate chain (no certificate at all) + 36 : BR_ERR_X509_INNER_TRUNC - decoding error: inner element extends beyond outer element size + 37 : BR_ERR_X509_BAD_TAG_CLASS - decoding error: unsupported tag class (application or private) + 38 : BR_ERR_X509_BAD_TAG_VALUE - decoding error: unsupported tag value + 39 : BR_ERR_X509_INDEFINITE_LENGTH - decoding error: indefinite length + 40 : BR_ERR_X509_EXTRA_ELEMENT - decoding error: extraneous element + 41 : BR_ERR_X509_UNEXPECTED - decoding error: unexpected element + 42 : BR_ERR_X509_NOT_CONSTRUCTED - decoding error: expected constructed element, but is primitive + 43 : BR_ERR_X509_NOT_PRIMITIVE - decoding error: expected primitive element, but is constructed + 44 : BR_ERR_X509_PARTIAL_BYTE - decoding error: BIT STRING length is not multiple of 8 + 45 : BR_ERR_X509_BAD_BOOLEAN - decoding error: BOOLEAN value has invalid length + 46 : BR_ERR_X509_OVERFLOW - decoding error: value is off-limits + 47 : BR_ERR_X509_BAD_DN - invalid distinguished name + 48 : BR_ERR_X509_BAD_TIME - invalid date/time representation + 49 : BR_ERR_X509_UNSUPPORTED - certificate contains unsupported features that cannot be ignored + 50 : BR_ERR_X509_LIMIT_EXCEEDED - key or signature size exceeds internal limits + 51 : BR_ERR_X509_WRONG_KEY_TYPE - key type does not match that which was expected + 52 : BR_ERR_X509_BAD_SIGNATURE - signature is invalid + 53 : BR_ERR_X509_TIME_UNKNOWN - validation time is unknown + 54 : BR_ERR_X509_EXPIRED - certificate is expired or not yet valid + 55 : BR_ERR_X509_DN_MISMATCH - issuer/subject DN mismatch in the chain + 56 : BR_ERR_X509_BAD_SERVER_NAME - expected server name was not found in the chain + 57 : BR_ERR_X509_CRITICAL_EXTENSION - unknown critical extension in certificate + 58 : BR_ERR_X509_NOT_CA - not a CA, or path length constraint violation + 59 : BR_ERR_X509_FORBIDDEN_KEY_USAGE - Key Usage extension prohibits intended usage + 60 : BR_ERR_X509_WEAK_PUBLIC_KEY - public key found in certificate is too small + 62 : BR_ERR_X509_NOT_TRUSTED - chain could not be linked to a trust anchor + + getLastError codes as documented in lib\lib_ssl\bearssl-esp8266\src\t_bearssl_ssl.h + 10 : 266 : BR_ALERT_UNEXPECTED_MESSAGE + 20 : 276 : BR_ALERT_BAD_RECORD_MAC + 22 : 278 : BR_ALERT_RECORD_OVERFLOW + 30 : 286 : BR_ALERT_DECOMPRESSION_FAILURE + 40 : 296 : BR_ALERT_HANDSHAKE_FAILURE + 42 : 298 : BR_ALERT_BAD_CERTIFICATE + 43 : 299 : BR_ALERT_UNSUPPORTED_CERTIFICATE + 44 : 300 : BR_ALERT_CERTIFICATE_REVOKED + 45 : 301 : BR_ALERT_CERTIFICATE_EXPIRED + 46 : 302 : BR_ALERT_CERTIFICATE_UNKNOWN + 47 : 303 : BR_ALERT_ILLEGAL_PARAMETER + 48 : 304 : BR_ALERT_UNKNOWN_CA + 49 : 305 : BR_ALERT_ACCESS_DENIED + 50 : 306 : BR_ALERT_DECODE_ERROR + 51 : 307 : BR_ALERT_DECRYPT_ERROR + 70 : 326 : BR_ALERT_PROTOCOL_VERSION + 71 : 327 : BR_ALERT_INSUFFICIENT_SECURITY + 80 : 336 : BR_ALERT_INTERNAL_ERROR + 90 : 346 : BR_ALERT_USER_CANCELED + 100 : 356 : BR_ALERT_NO_RENEGOTIATION + 110 : 366 : BR_ALERT_UNSUPPORTED_EXTENSION + 120 : 376 : BR_ALERT_NO_APPLICATION_PROTOCOL +*/ # ifdef ESP32 From e9cc704777a15305f06c878bb764ae85e5f3abb7 Mon Sep 17 00:00:00 2001 From: TD-er Date: Sat, 11 Oct 2025 00:03:26 +0200 Subject: [PATCH 362/564] [TimingStats] Add stat to measure time spent processing MQTT messages --- src/src/DataStructs/TimingStats.cpp | 3 +++ src/src/DataStructs/TimingStats.h | 3 +++ src/src/Helpers/PeriodicalActions.cpp | 2 ++ 3 files changed, 8 insertions(+) diff --git a/src/src/DataStructs/TimingStats.cpp b/src/src/DataStructs/TimingStats.cpp index b8748bccf..45e229c7f 100644 --- a/src/src/DataStructs/TimingStats.cpp +++ b/src/src/DataStructs/TimingStats.cpp @@ -275,6 +275,9 @@ const __FlashStringHelper* getMiscStatsName_F(TimingStatsElements stat) { case TimingStatsElements::IS_NUMERICAL: return F("isNumerical()"); case TimingStatsElements::HANDLE_SCHEDULER_IDLE: return F("handle_schedule() idle"); case TimingStatsElements::HANDLE_SCHEDULER_TASK: return F("handle_schedule() task"); +#if FEATURE_MQTT + case TimingStatsElements::PERIODICAL_MQTT: return F("Periodical MQTT"); +#endif case TimingStatsElements::PARSE_TEMPLATE_PADDED: return F("parseTemplate_padded()"); case TimingStatsElements::PARSE_SYSVAR: return F("parseSystemVariables()"); case TimingStatsElements::PARSE_SYSVAR_NOCHANGE: return F("parseSystemVariables() No change"); diff --git a/src/src/DataStructs/TimingStats.h b/src/src/DataStructs/TimingStats.h index 39cacfd03..0d7551b27 100644 --- a/src/src/DataStructs/TimingStats.h +++ b/src/src/DataStructs/TimingStats.h @@ -110,6 +110,9 @@ enum class TimingStatsElements { HANDLE_SCHEDULER_TASK, HANDLE_SCHEDULER_IDLE, BACKGROUND_TASKS, +#if FEATURE_MQTT + PERIODICAL_MQTT, +#endif CHECK_UDP, C013_SEND_UDP, C013_SEND_UDP_FAIL, diff --git a/src/src/Helpers/PeriodicalActions.cpp b/src/src/Helpers/PeriodicalActions.cpp index de394f037..3c702d3e4 100644 --- a/src/src/Helpers/PeriodicalActions.cpp +++ b/src/src/Helpers/PeriodicalActions.cpp @@ -448,6 +448,7 @@ void updateMQTTclient_connected() { } void runPeriodicalMQTT() { + START_TIMER // MQTT_KEEPALIVE = 15 seconds. if (!NetworkConnected(10)) { updateMQTTclient_connected(); @@ -475,6 +476,7 @@ void runPeriodicalMQTT() { updateMQTTclient_connected(); } } + STOP_TIMER(PERIODICAL_MQTT); } From 6e93ac880832052b3348c8c02ef004f79cf67b82 Mon Sep 17 00:00:00 2001 From: Ton Huisman Date: Sat, 11 Oct 2025 13:39:17 +0200 Subject: [PATCH 363/564] [TLS] Update TLS to be able to use ECDHE_ECDSA_AES_128_GCM_SHA256 cipher --- lib/lib_ssl/bearssl-esp8266/conf/esp8266.mk | 4 +- .../bearssl-esp8266/src/codec/pemdec.c | 10 +- .../bearssl-esp8266/src/ec/_ec_c25519_m15.c | 308 +++++++ .../bearssl-esp8266/src/ec/_ec_p256_m15.c | 468 +++++++++++ .../bearssl-esp8266/src/ec/ec_c25519_m15.c | 2 +- .../bearssl-esp8266/src/hash/_sha_hal_idf5x.c | 754 ++++++++++++++++++ lib/lib_ssl/bearssl-esp8266/src/hash/md5.c | 9 +- .../bearssl-esp8266/src/hash/sha2small.c | 8 +- .../bearssl-esp8266/src/int/i15_fmont.c | 8 +- .../bearssl-esp8266/src/int/i15_moddiv.c | 8 +- .../bearssl-esp8266/src/int/i15_mulacc.c | 8 +- lib/lib_ssl/bearssl-esp8266/src/rand/sysrng.c | 116 +-- .../bearssl-esp8266/src/rsa/rsa_i15_pub.c | 8 +- .../src/ssl/ssl_ccert_single_ec.c | 1 - .../bearssl-esp8266/src/ssl/ssl_hs_client.c | 13 +- .../bearssl-esp8266/src/ssl/ssl_hs_server.c | 17 +- .../bearssl-esp8266/src/t_bearssl_x509.h | 78 +- lib/lib_ssl/bearssl-esp8266/src/t_config.h | 30 +- lib/lib_ssl/bearssl-esp8266/src/t_inner.h | 8 +- .../bearssl-esp8266/src/x509/pkey_decoder.c | 17 +- .../bearssl-esp8266/src/x509/skey_decoder.c | 17 +- .../bearssl-esp8266/src/x509/x509_decoder.c | 17 +- .../bearssl-esp8266/src/x509/x509_minimal.c | 70 +- .../src/WiFiClientSecureLightBearSSL.cpp | 294 +++---- .../src/WiFiClientSecureLightBearSSL.h | 32 +- src/src/ESPEasyCore/Controller.cpp | 7 + src/src/Globals/MQTT.cpp | 2 +- src/src/WebServer/ControllerPage.cpp | 93 +++ 28 files changed, 1913 insertions(+), 494 deletions(-) create mode 100644 lib/lib_ssl/bearssl-esp8266/src/ec/_ec_c25519_m15.c create mode 100644 lib/lib_ssl/bearssl-esp8266/src/ec/_ec_p256_m15.c create mode 100644 lib/lib_ssl/bearssl-esp8266/src/hash/_sha_hal_idf5x.c mode change 100644 => 100755 lib/lib_ssl/tls_mini/src/WiFiClientSecureLightBearSSL.cpp mode change 100644 => 100755 lib/lib_ssl/tls_mini/src/WiFiClientSecureLightBearSSL.h diff --git a/lib/lib_ssl/bearssl-esp8266/conf/esp8266.mk b/lib/lib_ssl/bearssl-esp8266/conf/esp8266.mk index bcbdd68b0..5c409b8be 100644 --- a/lib/lib_ssl/bearssl-esp8266/conf/esp8266.mk +++ b/lib/lib_ssl/bearssl-esp8266/conf/esp8266.mk @@ -10,8 +10,8 @@ BUILD = esp8266 # C compiler, linker, and static library builder. TOOLCHAIN_PREFIX := xtensa-lx106-elf- CC := $(TOOLCHAIN_PREFIX)gcc -CFLAGS = -W -Wall -g -O2 -Wpointer-arith -Wl,-EL -nostdlib -mlongcalls -mno-text-section-literals -ffunction-sections -fdata-sections -Werror -free -fipa-pta -mextra-l32r-costs=5 -CFLAGS += -D__ets__ -DICACHE_FLASH -DESP8266 -DBR_SLOW_MUL15=1 -DPGM_READ_UNALIGNED=0 +CFLAGS = -W -Wall -g -O2 -Wpointer-arith -Wl,-EL -nostdlib -mlongcalls -mno-text-section-literals -ffunction-sections -fdata-sections -Werror +CFLAGS += -D__ets__ -DICACHE_FLASH -DESP8266 -DBR_SLOW_MUL15=1 LD := $(TOOLCHAIN_PREFIX)ld AR := $(TOOLCHAIN_PREFIX)ar diff --git a/lib/lib_ssl/bearssl-esp8266/src/codec/pemdec.c b/lib/lib_ssl/bearssl-esp8266/src/codec/pemdec.c index cb00c2348..0de8d3414 100644 --- a/lib/lib_ssl/bearssl-esp8266/src/codec/pemdec.c +++ b/lib/lib_ssl/bearssl-esp8266/src/codec/pemdec.c @@ -412,7 +412,7 @@ br_pem_decoder_run(void *t0ctx) break; case 17: { /* co */ - T0_CO(); + T0_CO(); } break; case 18: { @@ -425,12 +425,12 @@ br_pem_decoder_run(void *t0ctx) break; case 19: { /* drop */ - (void)T0_POP(); + (void)T0_POP(); } break; case 20: { /* dup */ - T0_PUSH(T0_PEEK(0)); + T0_PUSH(T0_PEEK(0)); } break; case 21: { @@ -474,7 +474,7 @@ br_pem_decoder_run(void *t0ctx) break; case 24: { /* over */ - T0_PUSH(T0_PEEK(1)); + T0_PUSH(T0_PEEK(1)); } break; case 25: { @@ -506,7 +506,7 @@ br_pem_decoder_run(void *t0ctx) break; case 27: { /* swap */ - T0_SWAP(); + T0_SWAP(); } break; case 28: { diff --git a/lib/lib_ssl/bearssl-esp8266/src/ec/_ec_c25519_m15.c b/lib/lib_ssl/bearssl-esp8266/src/ec/_ec_c25519_m15.c new file mode 100644 index 000000000..5aa467b92 --- /dev/null +++ b/lib/lib_ssl/bearssl-esp8266/src/ec/_ec_c25519_m15.c @@ -0,0 +1,308 @@ +/* + * _ec_c25519_m15.c — BearSSL Curve25519 (X25519) implementation using ESP32 ROM-backed Montgomery arithmetic + * + * This file provides a fast Montgomery ladder implementation for Curve25519 scalar + * multiplication (X25519), leveraging the ESP32's ROM bigint accelerator for modular + * multiplication in the prime field p = 2^255 - 19. + * + * Key features: + * - Field arithmetic in the normal domain using single-step ROM-backed multiply/square. + * - 8×32-bit little-endian limb representation for all field elements. + * - Constant-time Montgomery ladder for scalar multiplication. + * - RFC 7748–compliant clamping of scalar inputs. + * - Supports multiplication by arbitrary u‑coordinates and basepoint generation. + * - Fully compatible with BearSSL's ec_impl API. + * + * Internal operations avoid heap allocation and use fixed-size buffers. + * + * Requires: ESP32 platform with SOC_MPI_SUPPORTED enabled. + * + * Author: Christian Baars + */ + +#if defined(USE_SHA_ROM) +#if defined(ESP_PLATFORM) && !defined(ESP8266) && !defined(CONFIG_IDF_TARGET_ESP32) + +#if __has_include("soc/sha_caps.h") +# include "soc/sha_caps.h" +#elif __has_include("soc/soc_caps.h") +# include "soc/soc_caps.h" +#else +# error "No ESP capability header found" +#endif + +#if SOC_MPI_SUPPORTED + +#include "rom/bigint.h" +#include "t_inner.h" + +#define WORDS 8 /* 8×32-bit limbs */ + +/* Prime p = 2^255 - 19 (little-endian 32-bit limbs) */ +static const uint32_t P_LE[WORDS] = { + 0xFFFFFFED, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, + 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0x7FFFFFFF +}; + +/* R^2 mod p (with R = 2^256 mod p = 38) */ +static const uint32_t RR_LE[WORDS] = { 1444, 0,0,0,0,0,0,0 }; + +/* A24 = 121665 (normal-domain constant) */ +static const uint32_t A24_LE[WORDS] = { 121665, 0,0,0,0,0,0,0 }; + +static const uint32_t MPRIME = 0x286BCA1B; + +/* ---------- limb utilities ---------- */ + +static inline void zclear(uint32_t *a) { memset(a, 0, WORDS * sizeof(uint32_t)); } +static inline void zcopy(uint32_t *dst, const uint32_t *src) { memcpy(dst, src, WORDS * sizeof(uint32_t)); } + +/* ct compare: return 1 if a >= b, else 0 */ +static inline uint32_t ge_ct(const uint32_t *a, const uint32_t *b) { + uint32_t gt = 0, eq = 1; + for (int i = WORDS - 1; i >= 0; i--) { + uint32_t ai = a[i], bi = b[i]; + uint32_t gt_i = (ai > bi); + uint32_t lt_i = (ai < bi); + gt |= (eq & gt_i); + eq &= ~(gt_i | lt_i); + } + return gt | eq; +} + +static inline void add_mod(uint32_t *d, const uint32_t *a, const uint32_t *b) { + uint64_t c = 0; + for (int i = 0; i < WORDS; i++) { + c = (uint64_t)a[i] + b[i] + (c >> 32); + d[i] = (uint32_t)c; + } + uint32_t need_sub = (uint32_t)(c >> 32); + need_sub |= ge_ct(d, P_LE); + uint32_t borrow = 0, tmp[WORDS]; + for (int i = 0; i < WORDS; i++) { + uint64_t t = (uint64_t)d[i] - P_LE[i] - borrow; + tmp[i] = (uint32_t)t; + borrow = (uint32_t)(t >> 63); + } + for (int i = 0; i < WORDS; i++) d[i] = need_sub ? tmp[i] : d[i]; +} + +static inline void sub_mod(uint32_t *d, const uint32_t *a, const uint32_t *b) { + uint32_t borrow = 0; + for (int i = 0; i < WORDS; i++) { + uint64_t t = (uint64_t)a[i] - b[i] - borrow; + d[i] = (uint32_t)t; + borrow = (uint32_t)(t >> 63); + } + uint64_t c = 0, tmp[WORDS]; + for (int i = 0; i < WORDS; i++) { + c = (uint64_t)d[i] + P_LE[i] + (c >> 32); + tmp[i] = (uint32_t)c; + } + for (int i = 0; i < WORDS; i++) d[i] = borrow ? tmp[i] : d[i]; +} + +static inline void field_mul(uint32_t *dst, const uint32_t *a, const uint32_t *b) { + ets_bigint_enable(); + ets_bigint_modmult(a, b, P_LE, MPRIME, RR_LE, WORDS); + ets_bigint_wait_finish(); + ets_bigint_getz(dst, WORDS); + ets_bigint_disable(); +} + +static inline void field_sqr(uint32_t *dst, const uint32_t *a) { + field_mul(dst, a, a); +} + +/* Fermat inversion: a^(p-2) in normal domain */ +static void field_inv(uint32_t *out, const uint32_t *a) { + static const uint32_t EXP_P_MINUS_2[WORDS] = { + 0xFFFFFFEB, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, + 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0x7FFFFFFF + }; + uint32_t res[WORDS], base[WORDS]; + zclear(res); res[0] = 1; + zcopy(base, a); + for (int wi = WORDS - 1; wi >= 0; wi--) { + uint32_t w = EXP_P_MINUS_2[wi]; + for (int b = 31; b >= 0; b--) { + field_sqr(res, res); + if ((w >> b) & 1U) field_mul(res, res, base); + } + } + zcopy(out, res); +} + +/* Conditional swap */ +static inline void cswap(uint32_t *a, uint32_t *b, uint32_t ctl) { + uint32_t mask = -ctl; + for (int i = 0; i < WORDS; i++) { + uint32_t t = (a[i] ^ b[i]) & mask; + a[i] ^= t; b[i] ^= t; + } +} + +/* ---------- X25519 ladder (normal domain) ---------- */ + +static const unsigned char GEN[] PROGMEM = { + 0x09, 0,0,0, 0,0,0,0, 0,0,0,0, 0,0,0,0, + 0,0,0,0, 0,0,0,0, 0,0,0,0, 0,0,0,0 +}; + +static const unsigned char ORDER[] PROGMEM = { + 0x7F, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, + 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, + 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, + 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF +}; + +static const unsigned char * +api_generator(int curve, size_t *len) +{ + (void)curve; + *len = 32; + return GEN; +} + +static const unsigned char * +api_order(int curve, size_t *len) +{ + (void)curve; + *len = 32; + return ORDER; +} + +static size_t +api_xoff(int curve, size_t *len) +{ + (void)curve; + *len = 32; + return 0; +} + +static uint32_t +api_mul(unsigned char *G, size_t Glen, + const unsigned char *kb, size_t kblen, int curve) +{ + (void)curve; + + if (Glen != 32 || kblen > 32) { + return 0; + } + + /* Clamp scalar per RFC 7748 */ + unsigned char k[32]; + memset(k, 0, 32 - kblen); + memcpy(k + (32 - kblen), kb, kblen); + k[31] &= 0xF8; + k[0] &= 0x7F; + k[0] |= 0x40; + + /* Load u and clear high bit per RFC 7748 */ + unsigned char u_bytes[32]; + memcpy(u_bytes, G, 32); + u_bytes[31] &= 0x7F; + + uint32_t x1[WORDS], x2[WORDS], z2[WORDS], x3[WORDS], z3[WORDS]; + br_range_dec32le(x1, WORDS, u_bytes); + + /* Initialize: + * (x2:z2) = (1:0) + * (x3:z3) = (u:1) + */ + zclear(z2); + zclear(x2); x2[0] = 1; + zcopy(x3, x1); + zclear(z3); z3[0] = 1; + + uint32_t a[WORDS], aa[WORDS], b[WORDS], bb[WORDS]; + uint32_t c[WORDS], d[WORDS], e[WORDS], da[WORDS], cb[WORDS]; + uint32_t t[WORDS]; + + uint32_t swap = 0; + for (int i = 254; i >= 0; i--) { + uint32_t kt = (k[31 - (i >> 3)] >> (i & 7)) & 1U; + swap ^= kt; + cswap(x2, x3, swap); + cswap(z2, z3, swap); + swap = kt; + + /* Ladder step */ + add_mod(a, x2, z2); /* a = x2 + z2 */ + sub_mod(b, x2, z2); /* b = x2 - z2 */ + field_sqr(aa, a); /* aa = a^2 */ + field_sqr(bb, b); /* bb = b^2 */ + sub_mod(e, aa, bb); /* e = aa - bb */ + + add_mod(c, x3, z3); /* c = x3 + z3 */ + sub_mod(d, x3, z3); /* d = x3 - z3 */ + field_mul(da, d, a); /* da = d * a */ + field_mul(cb, c, b); /* cb = c * b */ + + add_mod(x3, da, cb); /* x3 = (da + cb)^2 */ + field_sqr(x3, x3); + sub_mod(z3, da, cb); /* z3 = (da - cb)^2 * x1 */ + field_sqr(z3, z3); + field_mul(z3, z3, x1); + + field_mul(x2, aa, bb); /* x2 = aa * bb */ + + /* z2 = e * (aa + A24 * e) */ + field_mul(t, A24_LE, e); /* t = A24 * e */ + add_mod(t, t, aa); /* t = aa + A24*e */ + field_mul(z2, e, t); /* z2 = e * t */ + } + + cswap(x2, x3, swap); + cswap(z2, z3, swap); + + /* u = x2 / z2 */ + uint32_t z2i[WORDS], unorm[WORDS]; + field_inv(z2i, z2); + field_mul(unorm, x2, z2i); + + /* Final reduction if needed and serialize */ + if (ge_ct(unorm, P_LE)) { + sub_mod(unorm, unorm, P_LE); + } + br_range_enc32le(G, unorm, WORDS); + return 1; +} + +static size_t +api_mulgen(unsigned char *R, + const unsigned char *x, size_t xlen, int curve) +{ + const unsigned char *G0; + size_t Glen; + + G0 = api_generator(curve, &Glen); + memcpy_P(R, G0, Glen); + api_mul(R, Glen, x, xlen, curve); + return Glen; +} + +static uint32_t +api_muladd(unsigned char *A, const unsigned char *B, size_t len, + const unsigned char *x, size_t xlen, + const unsigned char *y, size_t ylen, int curve) +{ + (void)A; (void)B; (void)len; (void)x; (void)xlen; (void)y; (void)ylen; (void)curve; + /* Not applicable for Curve25519 (no ECDSA). */ + return 0; +} + +/* see bearssl_ec.h */ +const br_ec_impl br_ec_c25519_m15 PROGMEM = { + (uint32_t)0x20000000, + &api_generator, + &api_order, + &api_xoff, + &api_mul, + &api_mulgen, + &api_muladd +}; + +#endif /* SOC_MPI_SUPPORTED */ +#endif /* ESP_PLATFORM && !ESP8266 */ +#endif /* USE_SHA_ROM */ diff --git a/lib/lib_ssl/bearssl-esp8266/src/ec/_ec_p256_m15.c b/lib/lib_ssl/bearssl-esp8266/src/ec/_ec_p256_m15.c new file mode 100644 index 000000000..69d4f519f --- /dev/null +++ b/lib/lib_ssl/bearssl-esp8266/src/ec/_ec_p256_m15.c @@ -0,0 +1,468 @@ +/* + * _ec_p256_m15.c — BearSSL P-256 implementation using ESP32 ROM-backed Montgomery arithmetic + * + * This file provides a fast elliptic curve implementation for secp256r1 (P-256), + * leveraging the ESP32's ROM bigint accelerator for modular multiplication. + * + * Key features: + * - Field arithmetic in normal domain using Montgomery-backed multiply/square. + * - Jacobian point representation with full group law (point add/double). + * - Scalar multiplication via double-and-add, supporting arbitrary base points. + * - Conversion between affine and Jacobian coordinates. + * - Compact encoding/decoding of uncompressed points (04 || X || Y). + * - Fully compatible with BearSSL's ec_impl API. + * + * All field elements are stored as 8×32-bit little-endian limbs. + * Internal operations avoid heap allocation and use fixed-size buffers. + * + * Requires: ESP32 platform with SOC_MPI_SUPPORTED enabled. + * + * Author: Christian Baars + */ + +#if defined(USE_SHA_ROM) +#if defined(ESP_PLATFORM) && !defined(ESP8266) && !defined(CONFIG_IDF_TARGET_ESP32) + +#if __has_include("soc/sha_caps.h") +# include "soc/sha_caps.h" +#elif __has_include("soc/soc_caps.h") +# include "soc/soc_caps.h" +#else +# error "No ESP capability header found" +#endif + +#if SOC_MPI_SUPPORTED + +#include +#include "rom/bigint.h" +#include "t_inner.h" + +#define WORDS 8 + +/* ESP32 ROM Montgomery parameters (little-endian).*/ +static const uint32_t P_LE[8] = { + 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0x00000000, + 0x00000000, 0x00000000, 0x00000001, 0xFFFFFFFF +}; + +static const uint32_t RR_LE[8] = { + 0x03000000, 0x00000000, 0xFFFFFFFF, 0xFBFFFFFF, + 0xFEFFFFFF, 0xFFFFFFFF, 0xFDFFFFFF, 0x04000000 +}; + +/* -p^{-1} mod 2^32 */ +static const uint32_t MPRIME = 0x00000001; + +/* Factor to convert ROM Montgomery output back to normal domain (8 limbs) */ +static const uint32_t CINV2_LE[8] = { + 0xB15F7DC9, 0x21BC7192, 0xF82DEBEB, 0xF2086906, + 0x8AD3BB54, 0xE34453E4, 0xB2B4EF16, 0x5FF55809 +}; + +/* Generator point G in little-endian 32-bit limbs (LSW first) */ +static const uint32_t Gx[WORDS] = { + 0xD898C296, 0xF4A13945, 0x2DEB33A0, 0x77037D81, + 0x63A440F2, 0xF8BCE6E5, 0xE12C4247, 0x6B17D1F2 +}; + +static const uint32_t Gy[WORDS] = { + 0x37BF51F5, 0xCBB64068, 0x6B315ECE, 0x2BCE3357, + 0x7C0F9E16, 0x8EE7EB4A, 0xFE1A7F9B, 0x4FE342E2 +}; + +typedef struct { + uint32_t X[WORDS]; + uint32_t Y[WORDS]; + uint32_t Z[WORDS]; +} p256_pt; + +/* ---------- small utilities ---------- */ + +static inline void zclear(uint32_t *dst) { + memset(dst, 0, WORDS * sizeof(uint32_t)); +} + +static inline void zcopy(uint32_t *dst, const uint32_t *src) { + memcpy(dst, src, WORDS * sizeof(uint32_t)); +} + +static inline int is_zero(const uint32_t *a) { + uint32_t acc = 0; + for (int i = 0; i < WORDS; i++) acc |= a[i]; + return acc == 0; +} + +/* big-endian bytes -> internal little-endian limbs (reverse word order) */ +static void be32_to_le32(const uint8_t *src, uint32_t *dst) { + for (int i = 0; i < WORDS; i++) { + int j = WORDS - 1 - i; + dst[i] = ((uint32_t)src[4*j] << 24) + | ((uint32_t)src[4*j + 1] << 16) + | ((uint32_t)src[4*j + 2] << 8) + | ((uint32_t)src[4*j + 3]); + } +} + +/* internal little-endian limbs -> big-endian bytes (reverse word order) */ +static void le32_to_be32(const uint32_t *src, uint8_t *dst) { + for (int i = 0; i < WORDS; i++) { + int j = WORDS - 1 - i; + dst[4*j] = (uint8_t)(src[i] >> 24); + dst[4*j + 1] = (uint8_t)(src[i] >> 16); + dst[4*j + 2] = (uint8_t)(src[i] >> 8); + dst[4*j + 3] = (uint8_t)(src[i]); + } +} + +/* ---------- field arithmetic modulo p (normal domain) ---------- */ + +static inline const uint32_t *Pmod(void) { return P_LE; } + +static int ge_mod_p(const uint32_t *a) { + const uint32_t *P = Pmod(); + for (int i = WORDS - 1; i >= 0; i--) { + if (a[i] > P[i]) return 1; + if (a[i] < P[i]) return 0; + } + return 1; /* equal */ +} + +static void field_add_mod(uint32_t *dst, const uint32_t *a, const uint32_t *b) { + const uint32_t *P = Pmod(); + uint64_t carry = 0; + for (int i = 0; i < WORDS; i++) { + uint64_t sum = (uint64_t)a[i] + b[i] + carry; + dst[i] = (uint32_t)sum; + carry = sum >> 32; + } + if (carry || ge_mod_p(dst)) { + uint64_t borrow = 0; + for (int i = 0; i < WORDS; i++) { + uint64_t diff = (uint64_t)dst[i] - P[i] - borrow; + dst[i] = (uint32_t)diff; + borrow = (diff >> 63) & 1; + } + } +} + +static void field_sub_mod(uint32_t *dst, const uint32_t *a, const uint32_t *b) { + const uint32_t *P = Pmod(); + uint64_t borrow = 0; + for (int i = 0; i < WORDS; i++) { + uint64_t diff = (uint64_t)a[i] - b[i] - borrow; + dst[i] = (uint32_t)diff; + borrow = (diff >> 63) & 1; + } + if (borrow) { + uint64_t carry = 0; + for (int i = 0; i < WORDS; i++) { + uint64_t sum = (uint64_t)dst[i] + P[i] + carry; + dst[i] = (uint32_t)sum; + carry = sum >> 32; + } + } +} + +/* ROM-backed modular multiply returning normal-domain result (8 limbs) */ +static void rom_field_mul(uint32_t *dst, const uint32_t *a, const uint32_t *b) { + uint32_t tmp[WORDS]; + + ets_bigint_enable(); + + /* Montgomery multiply in ROM (returns Montgomery residue) */ + ets_bigint_modmult(a, b, P_LE, MPRIME, RR_LE, WORDS); + ets_bigint_wait_finish(); + ets_bigint_getz(tmp, WORDS); + + /* Convert out of Montgomery domain using the proven CINV2_LE */ + ets_bigint_modmult(tmp, CINV2_LE, P_LE, MPRIME, RR_LE, WORDS); + ets_bigint_wait_finish(); + ets_bigint_getz(dst, WORDS); + + ets_bigint_disable(); +} + +static inline void field_mul(uint32_t *dst, const uint32_t *a, const uint32_t *b) { + rom_field_mul(dst, a, b); +} + +static inline void field_sqr(uint32_t *dst, const uint32_t *a) { + rom_field_mul(dst, a, a); +} + +/* Square-and-multiply exponentiation for p-2 (normal domain throughout) */ +static void field_inv(uint32_t *out, const uint32_t *a) { + static const uint32_t EXP_P_MINUS_2[WORDS] = { + 0xFFFFFFFD, 0xFFFFFFFF, 0xFFFFFFFF, 0x00000000, + 0x00000000, 0x00000000, 0x00000001, 0xFFFFFFFF + }; + uint32_t res[WORDS], base[WORDS]; + + zclear(res); res[0] = 1; /* res = 1 */ + zcopy(base, a); /* base = a */ + + for (int wi = WORDS - 1; wi >= 0; wi--) { + uint32_t w = EXP_P_MINUS_2[wi]; + for (int b = 31; b >= 0; b--) { + field_sqr(res, res); + if ((w >> b) & 1U) { + field_mul(res, res, base); + } + } + } + zcopy(out, res); +} + +/* ---------- point utilities ---------- */ + +static inline void load_generator(p256_pt *Pp) { + zcopy(Pp->X, Gx); + zcopy(Pp->Y, Gy); + zclear(Pp->Z); + Pp->Z[0] = 1; +} + +static void to_affine(p256_pt *Pp) { + uint32_t zi[WORDS], zi2[WORDS], xi[WORDS], yi[WORDS]; + uint32_t z0 = 0; + for (int i = 0; i < WORDS; i++) z0 |= Pp->Z[i]; + if (z0 == 0) { + zclear(Pp->X); zclear(Pp->Y); zclear(Pp->Z); + return; + } + field_inv(zi, Pp->Z); + field_sqr(zi2, zi); + field_mul(xi, Pp->X, zi2); + field_mul(yi, Pp->Y, zi2); + field_mul(yi, yi, zi); + zcopy(Pp->X, xi); + zcopy(Pp->Y, yi); + zclear(Pp->Z); Pp->Z[0] = 1; +} + +/* ---------- group law (Jacobian, a = -3) ---------- */ + +__attribute__((noinline)) +static void p256_point_double(p256_pt *Q) { + if (is_zero(Q->Y)) { zclear(Q->X); zclear(Q->Y); zclear(Q->Z); return; } + + uint32_t Z2[WORDS], M[WORDS], Mtmp[WORDS], S[WORDS], T1[WORDS], T2[WORDS], X3[WORDS], Y3[WORDS]; + + /* Z2 = Z^2 */ + field_sqr(Z2, Q->Z); + + /* T1 = X - Z^2 ; T2 = X + Z^2 */ + field_sub_mod(T1, Q->X, Z2); + field_add_mod(T2, Q->X, Z2); + + /* M = (X - Z^2) * (X + Z^2) */ + field_mul(M, T1, T2); + + /* M = 3 * M */ + zcopy(Mtmp, M); + field_add_mod(M, M, M); /* 2*M */ + field_add_mod(M, M, Mtmp); /* 3*M */ + + /* S = 4 * X * Y^2 */ + field_sqr(S, Q->Y); /* Y^2 */ + field_mul(S, S, Q->X); /* X*Y^2 */ + field_add_mod(S, S, S); /* 2*X*Y^2 */ + field_add_mod(S, S, S); /* 4*X*Y^2 */ + + /* X3 = M^2 - 2*S */ + field_sqr(X3, M); + field_sub_mod(X3, X3, S); + field_sub_mod(X3, X3, S); + + /* Y3 = M*(S - X3) - 8*Y^4 */ + field_sub_mod(Y3, S, X3); + field_mul(Y3, Y3, M); + + field_sqr(T1, Q->Y); /* Y^2 */ + field_sqr(T1, T1); /* Y^4 */ + field_add_mod(T1, T1, T1); /* 2*Y^4 */ + field_add_mod(T1, T1, T1); /* 4*Y^4 */ + field_add_mod(T1, T1, T1); /* 8*Y^4 */ + + field_sub_mod(Y3, Y3, T1); + + /* Z3 = 2*Y*Z */ + field_mul(Q->Z, Q->Y, Q->Z); + field_add_mod(Q->Z, Q->Z, Q->Z); + + zcopy(Q->X, X3); + zcopy(Q->Y, Y3); +} + +__attribute__((noinline)) +static void p256_point_add(p256_pt *R, const p256_pt *Pp, const p256_pt *Qp) { + if (is_zero(Pp->Z)) { zcopy(R->X, Qp->X); zcopy(R->Y, Qp->Y); zcopy(R->Z, Qp->Z); return; } + if (is_zero(Qp->Z)) { zcopy(R->X, Pp->X); zcopy(R->Y, Pp->Y); zcopy(R->Z, Pp->Z); return; } + + uint32_t Z1Z1[WORDS], Z2Z2[WORDS], U1[WORDS], U2[WORDS]; + uint32_t S1[WORDS], S2[WORDS], H[WORDS], RR[WORDS]; + uint32_t H2[WORDS], H3[WORDS], U1H2[WORDS], X3[WORDS], Y3[WORDS], Z3[WORDS], t[WORDS]; + + field_sqr(Z1Z1, Pp->Z); + field_sqr(Z2Z2, Qp->Z); + + field_mul(U1, Pp->X, Z2Z2); + field_mul(U2, Qp->X, Z1Z1); + + field_mul(t, Qp->Z, Z2Z2); /* Z2^3 */ + field_mul(S1, Pp->Y, t); + + field_mul(t, Pp->Z, Z1Z1); /* Z1^3 */ + field_mul(S2, Qp->Y, t); + + field_sub_mod(H, U2, U1); + field_sub_mod(RR, S2, S1); + + if (is_zero(H)) { + if (is_zero(RR)) { + p256_pt D = *Pp; + p256_point_double(&D); + zcopy(R->X, D.X); + zcopy(R->Y, D.Y); + zcopy(R->Z, D.Z); + } else { + zclear(R->X); zclear(R->Y); zclear(R->Z); /* infinity */ + } + return; + } + + field_sqr(H2, H); + field_mul(H3, H, H2); + field_mul(U1H2, U1, H2); + + field_sqr(X3, RR); + field_sub_mod(X3, X3, H3); + field_sub_mod(X3, X3, U1H2); + field_sub_mod(X3, X3, U1H2); /* -2*U1H2 */ + + field_sub_mod(Y3, U1H2, X3); + field_mul(Y3, Y3, RR); + + field_mul(t, S1, H3); + field_sub_mod(Y3, Y3, t); + + field_mul(t, Pp->Z, Qp->Z); + field_mul(Z3, t, H); + + zcopy(R->X, X3); + zcopy(R->Y, Y3); + zcopy(R->Z, Z3); +} + +/* ---------- shared scalar multiply helpers (reduce duplication) ---------- */ + +static void scalar_mul_point(p256_pt *R, const p256_pt *Base, const uint8_t *k, size_t klen) { + zclear(R->X); zclear(R->Y); zclear(R->Z); /* R = O */ + for (size_t bi = 0; bi < klen * 8; bi++) { + p256_point_double(R); + if ((k[bi >> 3] >> (7 - (bi & 7))) & 1) { + p256_point_add(R, R, Base); + } + } +} + +/* Load uncompressed point (04 || X || Y) into Jacobian with Z=1 */ +static int load_point_uncompressed(p256_pt *Pp, const unsigned char *buf, size_t len) { + if (len != 65 || buf[0] != 0x04) return 0; + be32_to_le32(buf + 1, Pp->X); + be32_to_le32(buf + 33, Pp->Y); + zclear(Pp->Z); Pp->Z[0] = 1; + return 1; +} + +static void store_point_uncompressed(unsigned char *buf, const p256_pt *Pp) { + buf[0] = 0x04; + le32_to_be32(Pp->X, buf + 1); + le32_to_be32(Pp->Y, buf + 33); +} + +/* ---------- BearSSL ec_impl API ---------- */ + +static const unsigned char *api_generator(int curve, size_t *len) { + (void)curve; + *len = br_secp256r1.generator_len; + return br_secp256r1.generator; +} + +static const unsigned char *api_order(int curve, size_t *len) { + (void)curve; + *len = br_secp256r1.order_len; + return br_secp256r1.order; +} + +static size_t api_xoff(int curve, size_t *len) { + (void)curve; + *len = 32; + return 1; +} + +static uint32_t api_mul(unsigned char *G, size_t Glen, + const unsigned char *x, size_t xlen, + int curve) { + (void)curve; + p256_pt Pp, R; + if (!load_point_uncompressed(&Pp, G, Glen)) return 0; + + scalar_mul_point(&R, &Pp, x, xlen); + to_affine(&R); + store_point_uncompressed(G, &R); + return 1; +} + +static size_t api_mulgen(unsigned char *Rbuf, + const unsigned char *x, size_t xlen, + int curve) { + (void)curve; + p256_pt Gp, R; + load_generator(&Gp); + + scalar_mul_point(&R, &Gp, x, xlen); + to_affine(&R); + store_point_uncompressed(Rbuf, &R); + return 65; +} + +static uint32_t api_muladd(unsigned char *A, const unsigned char *B, + size_t Glen, + const unsigned char *x, size_t xlen, + const unsigned char *y, size_t ylen, + int curve) { + (void)curve; + p256_pt Pp, Qp, R, T; + + if (!load_point_uncompressed(&Pp, A, Glen)) return 0; + + scalar_mul_point(&R, &Pp, x, xlen); + + if (B) { + if (!load_point_uncompressed(&Qp, B, Glen)) return 0; + } else { + load_generator(&Qp); + } + + scalar_mul_point(&T, &Qp, y, ylen); + p256_point_add(&R, &R, &T); + + to_affine(&R); + store_point_uncompressed(A, &R); + return 1; +} + +const br_ec_impl br_ec_p256_m15 PROGMEM = { + (uint32_t)0x00800000, + &api_generator, + &api_order, + &api_xoff, + &api_mul, + &api_mulgen, + &api_muladd +}; + +#endif // SOC_MPI_SUPPORTED +#endif // defined(ESP_PLATFORM) && !defined(ESP8266) +#endif // USE_SHA_ROM \ No newline at end of file diff --git a/lib/lib_ssl/bearssl-esp8266/src/ec/ec_c25519_m15.c b/lib/lib_ssl/bearssl-esp8266/src/ec/ec_c25519_m15.c index 0d1041472..115d51a63 100644 --- a/lib/lib_ssl/bearssl-esp8266/src/ec/ec_c25519_m15.c +++ b/lib/lib_ssl/bearssl-esp8266/src/ec/ec_c25519_m15.c @@ -1475,4 +1475,4 @@ const br_ec_impl br_ec_c25519_m15 PROGMEM = { &api_mul, &api_mulgen, &api_muladd -}; +}; \ No newline at end of file diff --git a/lib/lib_ssl/bearssl-esp8266/src/hash/_sha_hal_idf5x.c b/lib/lib_ssl/bearssl-esp8266/src/hash/_sha_hal_idf5x.c new file mode 100644 index 000000000..1fc124f35 --- /dev/null +++ b/lib/lib_ssl/bearssl-esp8266/src/hash/_sha_hal_idf5x.c @@ -0,0 +1,754 @@ +/* + * _sha_hal_idf5x.c — BearSSL drop‑in with ESP32 HAL SHA acceleration + * + * This file provides hardware-accelerated implementations of BearSSL-compatible + * hash functions (SHA-1, SHA-224, SHA-256, SHA-384, SHA-512) using the ESP-IDF 5.x + * SHA HAL. It replaces the software digest core with direct access to the ESP32's + * SHA engine, preserving BearSSL's context structure and API semantics. + * + * Each hash context uses a minimal layout: + * - val[] holds the midstate as a raw little-endian byte image. + * - buf[] holds the partial block (64 or 128 bytes). + * - count tracks the total input length in bytes. + * + * Endianness is preserved across state() and set_state() calls, allowing seamless + * serialization and restoration of midstate snapshots. All conversions for hardware + * interaction are localized to update() and out(). + * + * This module is designed for drop-in replacement with no changes to BearSSL clients. + * It supports multihash, midstate injection, and digest resumption. + * + * Author: Christian Baars + */ + +#include "t_inner.h" + +#if defined(USE_SHA_ROM) +#if defined(ESP_PLATFORM) && !defined(ESP8266) + +#include + +#include "freertos/FreeRTOS.h" + +#if __has_include("soc/sha_caps.h") +# include "soc/sha_caps.h" +#elif __has_include("soc/soc_caps.h") +# include "soc/soc_caps.h" +#else +# error "No SHA capability header found" +#endif +#if SOC_SHA_SUPPORT_RESUME + +#if __has_include("hal/sha_ll.h") +# include "hal/sha_ll.h" +# define HAVE_SHA_LL 1 +#else +# define HAVE_SHA_LL 0 +#endif + + +#define HAVE_HAL_SHA1 (SOC_SHA_SUPPORT_SHA1) +#define HAVE_HAL_SHA224 (SOC_SHA_SUPPORT_SHA224) +#define HAVE_HAL_SHA256 (SOC_SHA_SUPPORT_SHA256) +#define HAVE_HAL_SHA384 (SOC_SHA_SUPPORT_SHA384) +#define HAVE_HAL_SHA512 (SOC_SHA_SUPPORT_SHA512) + +static portMUX_TYPE s_sha_mux = portMUX_INITIALIZER_UNLOCKED; +#define SHA_ENTER() {portENTER_CRITICAL(&s_sha_mux); int __DECLARE_RCC_ATOMIC_ENV; sha_ll_enable_bus_clock(true); sha_ll_reset_register();} +#define SHA_EXIT() {portEXIT_CRITICAL(&s_sha_mux); int __DECLARE_RCC_ATOMIC_ENV; sha_ll_enable_bus_clock(false);} +#define SHA_WAIT() {while (sha_ll_busy()) { } } + +/* ================================================================ + * SHA-1 (HAL path, no save/restore) - needs char buf[112]; + * ================================================================ */ +#if HAVE_HAL_SHA1 + +static void __attribute__((noinline)) +sha_hal_process_block(void *state_buf, const void *blk, + esp_sha_type type, size_t digest_words, + size_t block_words, bool first) +{ + SHA_ENTER(); + if (!first) { + sha_ll_write_digest(type, state_buf, digest_words); + } + sha_ll_fill_text_block(blk, block_words); + if (first) { + sha_ll_start_block(type); + } else { + sha_ll_continue_block(type); + } + SHA_WAIT(); + sha_ll_read_digest(type, state_buf, digest_words); + SHA_EXIT(); +} + +static const uint8_t S1_IV_BYTES[20] PROGMEM = { + 0x67,0x45,0x23,0x01, 0xEF,0xCD,0xAB,0x89, + 0x98,0xBA,0xDC,0xFE, 0x10,0x32,0x54,0x76, + 0xC3,0xD2,0xE1,0xF0 +}; + +void br_sha1_init(br_sha1_context *cc) +{ + cc->vtable = &br_sha1_vtable; + cc->count = 0; + memset(cc->buf, 0, sizeof cc->buf); + /* Store IV bytes exactly as given (LE words) into cc->val */ + memcpy(cc->val, S1_IV_BYTES, sizeof S1_IV_BYTES); +} + +void br_sha1_update(br_sha1_context *cc, const void *data, size_t len) +{ + const uint8_t *src = data; + size_t used = (size_t)(cc->count & 63U); + + if (!len) return; + cc->count += len; + + if (used) { + size_t take = 64 - used; + if (take > len) take = len; + memcpy(cc->buf + used, src, take); + src += take; + len -= take; + used += take; + if (used == 64) { + sha_hal_process_block(cc->val, cc->buf, SHA1, 5, 16, cc->count == 64); + used = 0; + } + } + while (len >= 64) { + sha_hal_process_block(cc->val, src, SHA1, 5, 16, + (cc->count - len == 0) && !used); + src += 64; + len -= 64; + } + if (len) { + memcpy(cc->buf, src, len); + } +} + +void br_sha1_out(const br_sha1_context *cc, void *out) +{ + br_sha1_context ctx = *cc; + size_t used = (size_t)(ctx.count & 63U); + uint64_t bit_len = (uint64_t)ctx.count << 3; + + ctx.buf[used++] = 0x80; + if (used > 56) { + memset(ctx.buf + used, 0, 64 - used); + sha_hal_process_block(ctx.val, ctx.buf, SHA1, 5, 16, ctx.count <= 64); + used = 0; + } + memset(ctx.buf + used, 0, 56 - used); + br_enc64be(ctx.buf + 56, bit_len); + sha_hal_process_block(ctx.val, ctx.buf, SHA1, 5, 16, ctx.count <= 64); + memcpy(out, ctx.val, 20); +} + +uint64_t br_sha1_state(const br_sha1_context *cc, void *dst) +{ + /* Export raw 20-byte LE midstate image exactly as stored */ + memcpy(dst, cc->val, 20); + return cc->count; +} + +void br_sha1_set_state(br_sha1_context *cc, const void *src, uint64_t count) +{ + if (!(cc->vtable == &br_sha1_vtable)) { + cc->vtable = &br_sha1_vtable; + } + /* Import raw 20-byte LE midstate image exactly as provided */ + memcpy(cc->val, src, 20); + cc->count = count; + memset(cc->buf, 0, sizeof cc->buf); +} + +const br_hash_class br_sha1_vtable PROGMEM = { + sizeof(br_sha1_context), + BR_HASHDESC_ID(br_sha1_ID) + | BR_HASHDESC_OUT(20) + | BR_HASHDESC_LBLEN(6) + | BR_HASHDESC_MD_PADDING + | BR_HASHDESC_MD_PADDING_BE + | BR_HASHDESC_STATE(32), + (void (*)(const br_hash_class **)) &br_sha1_init, + (void (*)(const br_hash_class **, const void *, size_t)) &br_sha1_update, + (void (*)(const br_hash_class *const *, void *)) &br_sha1_out, + (uint64_t (*)(const br_hash_class *const *, void *)) &br_sha1_state, + (void (*)(const br_hash_class **, const void *, uint64_t)) &br_sha1_set_state +}; + +#endif /* HAVE_HAL_SHA1 */ + +/* ================================================================ + * SHA-224 (HAL path, no save/restore) + * ================================================================ */ +#if HAVE_HAL_SHA224 + +/* SHA-224 IV as 32-bit words (FIPS 180-4) */ +static const uint32_t S224_IV_WORDS[8] = { + 0xc1059ed8U, 0x367cd507U, 0x3070dd17U, 0xf70e5939U, + 0xffc00b31U, 0x68581511U, 0x64f98fa7U, 0xbefa4fa4U +}; + +void br_sha224_init(br_sha224_context *cc) { + cc->vtable = &br_sha224_vtable; + cc->count = 0; + memset(cc->buf, 0, sizeof cc->buf); + /* Internal state is LE; encode IV directly in LE form into cc->val */ + br_range_enc32le(cc->val, S224_IV_WORDS, 8); +} + +/* Reuse SHA-256 out, then truncate to 28 bytes */ +void br_sha224_out(const br_sha224_context *cc, void *out) { + uint8_t full[32]; + br_sha256_out((const br_sha256_context *)cc, full); + memcpy(out, full, 28); +} + +const br_hash_class br_sha224_vtable PROGMEM = { + sizeof(br_sha224_context), + BR_HASHDESC_ID(br_sha224_ID) + | BR_HASHDESC_OUT(28) + | BR_HASHDESC_LBLEN(6) + | BR_HASHDESC_MD_PADDING + | BR_HASHDESC_MD_PADDING_BE + | BR_HASHDESC_STATE(32), + (void (*)(const br_hash_class **)) &br_sha224_init, + (void (*)(const br_hash_class **, const void *, size_t)) &br_sha224_update, + (void (*)(const br_hash_class *const *, void *)) &br_sha224_out, + (uint64_t (*)(const br_hash_class *const *, void *)) &br_sha224_state, + (void (*)(const br_hash_class **, const void *, uint64_t)) &br_sha224_set_state +}; + +#endif /* HAVE_HAL_SHA224 */ + +/* ================================================================ + * SHA-256 (HAL path, save/restore) + * ================================================================ */ +#if HAVE_HAL_SHA256 && defined(SOC_SHA_SUPPORT_RESUME) + +/* Fixed SHA-256 IV in big-endian bytes (spec-defined) */ +static const uint8_t S256_IV_BYTES[32] PROGMEM = { + 0x6a, 0x09, 0xe6, 0x67, 0xbb, 0x67, 0xae, 0x85, + 0x3c, 0x6e, 0xf3, 0x72, 0xa5, 0x4f, 0xf5, 0x3a, + 0x51, 0x0e, 0x52, 0x7f, 0x9b, 0x05, 0x68, 0x8c, + 0x1f, 0x83, 0xd9, 0xab, 0x5b, 0xe0, 0xcd, 0x19 +}; + +/* Maintain the partial block in cc->buf[] (64 bytes) */ +static inline void s256_update_partial(br_sha256_context *cc, + const uint8_t *data_ptr, + size_t data_len, + size_t prev_partial_len) +{ + size_t new_partial_len = (prev_partial_len + data_len) & 63U; + + if (new_partial_len == 0) { + /* Exact block boundary: clear partial buffer */ + memset(cc->buf, 0, sizeof cc->buf); + return; + } + + if (data_len >= new_partial_len) { + /* Tail entirely from current input */ + memcpy(cc->buf, data_ptr + (data_len - new_partial_len), new_partial_len); + } else { + /* Need some bytes from previous partial tail */ + size_t need_prev = new_partial_len - data_len; + if (need_prev && need_prev <= prev_partial_len) { + memmove(cc->buf, cc->buf + (prev_partial_len - need_prev), need_prev); + } else if (need_prev) { + memset(cc->buf, 0, need_prev); + } + memcpy(cc->buf + need_prev, data_ptr, data_len); + } + + if (new_partial_len < sizeof cc->buf) { + memset(cc->buf + new_partial_len, 0, sizeof cc->buf - new_partial_len); + } +} + +void br_sha256_init(br_sha256_context *cc) +{ + cc->vtable = &br_sha256_vtable; + cc->count = 0; + memset(cc->buf, 0, sizeof cc->buf); + /* Keep midstate bytes exactly as IV (BE byte image), as in the original */ + memcpy(cc->val, S256_IV_BYTES, 32); +} + +void br_sha224_update(br_sha224_context *cc, const void *data, size_t len) +{ + if (!len) return; + + /* Embedded mode selection by vtable pointer (no desc, no tags) */ + const int mode = (cc->vtable == &br_sha256_vtable) ? SHA2_256 : SHA2_224; + + const uint8_t *data_ptr = (const uint8_t *)data; + const uint8_t *orig_ptr = data_ptr; + size_t orig_len = len; + + size_t prev_partial_len = (size_t)(cc->count & 63U); + bool starting_from_iv = (cc->count == 0) && (prev_partial_len == 0); + size_t stitch_take = 0; + if (prev_partial_len && len >= (64 - prev_partial_len)) + stitch_take = 64 - prev_partial_len; + + if (stitch_take || len >= 64) { + size_t block_count_in_run = 0; + + SHA_ENTER(); + + /* Complete the partial block (stitch) if needed */ + if (stitch_take) { + uint32_t midstate_words[8]; + /* Original semantics: decode state from LE words before seeding HW */ + br_range_dec32le(midstate_words, 8, cc->val); + sha_ll_load(mode); + sha_ll_write_digest(mode, midstate_words, 8); + + uint8_t first_block[64]; + memcpy(first_block, cc->buf, prev_partial_len); + memcpy(first_block + prev_partial_len, data_ptr, stitch_take); + + sha_ll_fill_text_block(first_block, 16); + sha_ll_continue_block(mode); + SHA_WAIT(); + + data_ptr += stitch_take; + len -= stitch_take; + block_count_in_run = 1; + } + + /* Process full 64-byte blocks */ + if (len >= 64) { + if (starting_from_iv && stitch_take == 0) { + /* Start from IV directly */ + sha_ll_fill_text_block(data_ptr, 16); + sha_ll_start_block(mode); + SHA_WAIT(); + data_ptr += 64; + len -= 64; + block_count_in_run = 1; + } else if (block_count_in_run == 0) { + /* Seed from current midstate once before the run */ + uint32_t midstate_words2[8]; + br_range_dec32le(midstate_words2, 8, cc->val); + sha_ll_load(mode); + sha_ll_write_digest(mode, midstate_words2, 8); + } + +#if defined(CONFIG_IDF_TARGET_ARCH_RISCV) /* RISC-V: enforce 8-block (512B) window with checkpointing */ + while (len >= 64) { + sha_ll_fill_text_block(data_ptr, 16); + sha_ll_continue_block(mode); + SHA_WAIT(); + + data_ptr += 64; + len -= 64; + block_count_in_run++; + + if (block_count_in_run == 8 && len >= 64) { + uint32_t midstate_words3[8]; + sha_ll_load(mode); + sha_ll_read_digest(mode, midstate_words3, 8); + sha_ll_load(mode); + sha_ll_write_digest(mode, midstate_words3, 8); + block_count_in_run = 0; + } + } +#else /* Xtensa: simple per-block processing, no extra checkpointing */ + while (len >= 64) { + sha_ll_fill_text_block(data_ptr, 16); + sha_ll_continue_block(mode); + SHA_WAIT(); + data_ptr += 64; + len -= 64; + } +#endif + } + + /* Commit midstate back; keep the same on-wire format as before: LE words in cc->val */ + { + uint32_t tmp_words[8]; + sha_ll_load(mode); + SHA_WAIT(); + sha_ll_read_digest(mode, tmp_words, 8); + br_range_enc32le(cc->val, tmp_words, 8); + } + SHA_EXIT(); + } + + /* Bookkeeping and partial buffer maintenance */ + cc->count += orig_len; + s256_update_partial((br_sha256_context *)cc, orig_ptr, orig_len, prev_partial_len); +} + +void br_sha256_out(const br_sha256_context *cc, void *out) +{ + uint8_t saved_partial[sizeof cc->buf]; + uint64_t saved_count = cc->count; + uint8_t saved_state[32]; + + memcpy(saved_partial, cc->buf, sizeof cc->buf); + memcpy(saved_state, cc->val, 32); + + uint8_t partial_len = (uint8_t)(saved_count & 63U); + const int mode = (cc->vtable == &br_sha256_vtable) ? SHA2_256 : SHA2_224; + + bool midstate_is_iv = (memcmp(saved_state, S256_IV_BYTES, 32) == 0); + bool no_full_blocks_done = (saved_count < 64); + bool must_start_from_iv = midstate_is_iv && no_full_blocks_done; + + SHA_ENTER(); + + if (!must_start_from_iv) { + uint32_t midstate_words[8]; + /* Original semantics: state stored as LE words in cc->val */ + br_range_dec32le(midstate_words, 8, saved_state); + sha_ll_load(mode); + sha_ll_write_digest(mode, midstate_words, 8); + } + + uint8_t final_blocks[128]; + memcpy(final_blocks, saved_partial, partial_len); + final_blocks[partial_len] = 0x80; + + size_t zero_len = (partial_len < 56) ? (56 - partial_len - 1) + : (120 - partial_len - 1); + if (zero_len) { + memset(final_blocks + partial_len + 1, 0, zero_len); + } + + uint64_t bit_length = saved_count * 8; + size_t len_pos = partial_len + 1 + zero_len; + for (int i = 0; i < 8; i++) { + final_blocks[len_pos + i] = (uint8_t)(bit_length >> (56 - 8 * i)); + } + size_t total_final_len = len_pos + 8; + + if (total_final_len == 64) { + sha_ll_fill_text_block(final_blocks, 16); + if (must_start_from_iv) + sha_ll_start_block(mode); + else + sha_ll_continue_block(mode); + SHA_WAIT(); + } else { + sha_ll_fill_text_block(final_blocks, 16); + if (must_start_from_iv) + sha_ll_start_block(mode); + else + sha_ll_continue_block(mode); + SHA_WAIT(); + sha_ll_fill_text_block(final_blocks + 64, 16); + sha_ll_continue_block(mode); + SHA_WAIT(); + } + + { + uint32_t tmp_words[8]; + sha_ll_load(mode); + sha_ll_read_digest(mode, tmp_words, 8); + SHA_EXIT(); + /* Final digest serialization remains LE as in your original */ + br_range_enc32le(out, tmp_words, 8); + } + + /* Non-destructive out(): restore snapshot */ + memcpy(((br_sha256_context *)cc)->buf, saved_partial, sizeof cc->buf); + ((br_sha256_context *)cc)->count = saved_count; + /* cc->val was never modified in out() */ +} + +uint64_t br_sha224_state(const br_sha256_context *cc, void *dst) +{ + /* Export midstate bytes exactly as stored (LE words image), unchanged */ + memcpy(dst, cc->val, 32); + return cc->count; +} + +void br_sha224_set_state(br_sha256_context *cc, const void *src, uint64_t count) +{ + if( !(cc->vtable == &br_sha256_vtable) && !(cc->vtable == &br_sha224_vtable)){ + cc->vtable = &br_sha256_vtable; /* safety for multihash fresh gen context */ + } + /* Reset partial, set count, and import state bytes exactly as provided */ + memset(cc->buf, 0, sizeof cc->buf); + memcpy(cc->val, src, 32); + cc->count = count; +} + +const br_hash_class br_sha256_vtable PROGMEM = { + sizeof(br_sha256_context), + BR_HASHDESC_ID(br_sha256_ID) + | BR_HASHDESC_OUT(32) + | BR_HASHDESC_STATE(32) + | BR_HASHDESC_LBLEN(6) + | BR_HASHDESC_MD_PADDING + | BR_HASHDESC_MD_PADDING_BE, + (void (*)(const br_hash_class **))&br_sha256_init, + (void (*)(const br_hash_class **, + const void *, size_t))&br_sha256_update, + (void (*)(const br_hash_class *const *, void *))&br_sha256_out, + (uint64_t (*)(const br_hash_class *const *, void *))&br_sha256_state, + (void (*)(const br_hash_class **, const void *, uint64_t)) + &br_sha256_set_state +}; + +#endif /* HAVE_HAL_SHA256 && SOC_SHA_SUPPORT_RESUME */ + +/* ================================================================ + * SHA-384 (HAL path, no save/restore) + * ================================================================ */ +#if HAVE_HAL_SHA384 + +static const uint64_t S384_IV_WORDS[8] = { + 0xcbbb9d5dc1059ed8ULL, 0x629a292a367cd507ULL, + 0x9159015a3070dd17ULL, 0x152fecd8f70e5939ULL, + 0x67332667ffc00b31ULL, 0x8eb44a8768581511ULL, + 0xdb0c2e0d64f98fa7ULL, 0x47b5481dbefa4fa4ULL +}; + +void br_sha384_init(br_sha384_context *cc) { + cc->vtable = &br_sha384_vtable; + cc->count = 0; + memset(cc->buf, 0, sizeof cc->buf); + /* Internal state is LE; encode IV directly in LE form into cc->val */ + br_range_enc64le(cc->val, S384_IV_WORDS, 8); +} + +void br_sha384_update(br_sha384_context *cc, const void *data, size_t len) { + if (!len) return; + const uint8_t *src = (const uint8_t *)data; + size_t used = (size_t)(cc->count & 127U); + uint64_t prior_count = cc->count; + cc->count += len; + + if (used) { + size_t take = 128 - used; + if (take > len) take = len; + memcpy(cc->buf + used, src, take); + src += take; + len -= take; + used += take; + if (used == 128) { + uint64_t st_be[8]; + br_range_dec64le(st_be, 8, cc->val); + br_range_enc64be(st_be, st_be, 8); + SHA_ENTER(); + sha_ll_load(SHA2_512); + sha_ll_write_digest(SHA2_512, st_be, 16); + sha_ll_fill_text_block(cc->buf, 32); + sha_ll_continue_block(SHA2_512); + SHA_WAIT(); + sha_ll_read_digest(SHA2_512, st_be, 16); + SHA_EXIT(); + br_range_dec64be(st_be, 8, st_be); + br_range_enc64le(cc->val, st_be, 8); + prior_count += 128; + used = 0; + } + } + + if (len >= 128) { + uint64_t st_be[8]; + br_range_dec64le(st_be, 8, cc->val); + br_range_enc64be(st_be, st_be, 8); + bool first = (prior_count == 0); + SHA_ENTER(); + sha_ll_load(SHA2_512); + sha_ll_write_digest(SHA2_512, st_be, 16); + while (len >= 128) { + sha_ll_fill_text_block(src, 32); + if (first) { + sha_ll_start_block(SHA2_512); + first = false; + } else { + sha_ll_continue_block(SHA2_512); + } + SHA_WAIT(); + src += 128; + len -= 128; + } + sha_ll_read_digest(SHA2_512, st_be, 16); + SHA_EXIT(); + br_range_dec64be(st_be, 8, st_be); + br_range_enc64le(cc->val, st_be, 8); + } + + if (len) memcpy(cc->buf, src, len); +} + +void br_sha384_out(const br_sha384_context *cc, void *out) { + br_sha384_context ctx = *cc; + size_t used = (size_t)(ctx.count & 127U); + uint64_t bit_hi = (uint64_t)(ctx.count >> 61); + uint64_t bit_lo = (uint64_t)(ctx.count << 3); + + ctx.buf[used++] = 0x80; + if (used > 112) { + memset(ctx.buf + used, 0, 128 - used); + uint64_t st_be[8]; + br_range_dec64le(st_be, 8, ctx.val); + br_range_enc64be(st_be, st_be, 8); + SHA_ENTER(); + sha_ll_load(SHA2_512); + sha_ll_write_digest(SHA2_512, st_be, 16); + sha_ll_fill_text_block(ctx.buf, 32); + sha_ll_continue_block(SHA2_512); + SHA_WAIT(); + sha_ll_read_digest(SHA2_512, st_be, 16); + SHA_EXIT(); + br_range_dec64be(st_be, 8, st_be); + br_range_enc64le(ctx.val, st_be, 8); + used = 0; + } + + memset(ctx.buf + used, 0, 112 - used); + br_enc64be(ctx.buf + 112, bit_hi); + br_enc64be(ctx.buf + 120, bit_lo); + + uint64_t st_be2[8]; + br_range_dec64le(st_be2, 8, ctx.val); + br_range_enc64be(st_be2, st_be2, 8); + SHA_ENTER(); + sha_ll_load(SHA2_512); + sha_ll_write_digest(SHA2_512, st_be2, 16); + sha_ll_fill_text_block(ctx.buf, 32); + sha_ll_continue_block(SHA2_512); + SHA_WAIT(); + sha_ll_read_digest(SHA2_512, st_be2, 16); + SHA_EXIT(); + + br_range_dec64be(st_be2, 8, st_be2); + br_range_enc64be(out, st_be2, 6); +} + +uint64_t br_sha384_state(const br_sha384_context *cc, void *dst) { + /* Export raw 64-byte LE midstate image exactly as stored */ + memcpy(dst, cc->val, 64); + return cc->count; +} + +void br_sha384_set_state(br_sha384_context *cc, const void *src, uint64_t count) { + if (!(cc->vtable == &br_sha384_vtable)) { + cc->vtable = &br_sha384_vtable; + } + /* Import raw 64-byte LE midstate image exactly as provided */ + memcpy(cc->val, src, 64); + cc->count = count; + memset(cc->buf, 0, sizeof cc->buf); +} + +const br_hash_class br_sha384_vtable PROGMEM = { + sizeof(br_sha384_context), + BR_HASHDESC_ID(br_sha384_ID) + | BR_HASHDESC_OUT(48) + | BR_HASHDESC_STATE(64) + | BR_HASHDESC_LBLEN(7) + | BR_HASHDESC_MD_PADDING + | BR_HASHDESC_MD_PADDING_BE + | BR_HASHDESC_MD_PADDING_128, + (void (*)(const br_hash_class **)) &br_sha384_init, + (void (*)(const br_hash_class **, const void *, size_t)) &br_sha384_update, + (void (*)(const br_hash_class *const *, void *)) &br_sha384_out, + (uint64_t (*)(const br_hash_class *const *, void *)) &br_sha384_state, + (void (*)(const br_hash_class **, const void *, uint64_t)) &br_sha384_set_state +}; + +#endif /* HAVE_HAL_SHA384 */ + +/* ================================================================ + * SHA-512 (HAL path, no save/restore) + * Uses SHA-384 update/state/set_state + * ================================================================ */ +#if HAVE_HAL_SHA512 + +static const uint64_t S512_IV_WORDS[8] = { + 0x6a09e667f3bcc908ULL, 0xbb67ae8584caa73bULL, + 0x3c6ef372fe94f82bULL, 0xa54ff53a5f1d36f1ULL, + 0x510e527fade682d1ULL, 0x9b05688c2b3e6c1fULL, + 0x1f83d9abfb41bd6bULL, 0x5be0cd19137e2179ULL +}; + +void br_sha512_init(br_sha512_context *cc) { + cc->vtable = &br_sha512_vtable; + cc->count = 0; + memset(cc->buf, 0, sizeof cc->buf); + /* Internal state is LE; encode IV directly in LE form into cc->val */ + br_range_enc64le(cc->val, S512_IV_WORDS, 8); +} + +void br_sha512_out(const br_sha512_context *cc, void *out) { + br_sha512_context ctx = *cc; + size_t used = (size_t)(ctx.count & 127U); + uint64_t bit_hi = (uint64_t)(ctx.count >> 61); + uint64_t bit_lo = (uint64_t)(ctx.count << 3); + + ctx.buf[used++] = 0x80; + if (used > 112) { + memset(ctx.buf + used, 0, 128 - used); + uint64_t st_be[8]; + br_range_dec64le(st_be, 8, ctx.val); + br_range_enc64be(st_be, st_be, 8); + SHA_ENTER(); + sha_ll_load(SHA2_512); + sha_ll_write_digest(SHA2_512, st_be, 16); + sha_ll_fill_text_block(ctx.buf, 32); + sha_ll_continue_block(SHA2_512); + SHA_WAIT(); + sha_ll_read_digest(SHA2_512, st_be, 16); + SHA_EXIT(); + br_range_dec64be(st_be, 8, st_be); + br_range_enc64le(ctx.val, st_be, 8); + used = 0; + } + + memset(ctx.buf + used, 0, 112 - used); + br_enc64be(ctx.buf + 112, bit_hi); + br_enc64be(ctx.buf + 120, bit_lo); + + uint64_t st_be2[8]; + br_range_dec64le(st_be2, 8, ctx.val); + br_range_enc64be(st_be2, st_be2, 8); + SHA_ENTER(); + sha_ll_load(SHA2_512); + sha_ll_write_digest(SHA2_512, st_be2, 16); + sha_ll_fill_text_block(ctx.buf, 32); + sha_ll_continue_block(SHA2_512); + SHA_WAIT(); + sha_ll_read_digest(SHA2_512, st_be2, 16); + SHA_EXIT(); + + /* Output digest in big‑endian bytes as BearSSL expects */ + br_range_dec64be(st_be2, 8, st_be2); + br_range_enc64be(out, st_be2, 8); +} + +const br_hash_class br_sha512_vtable PROGMEM = { + sizeof(br_sha512_context), + BR_HASHDESC_ID(br_sha512_ID) + | BR_HASHDESC_OUT(64) + | BR_HASHDESC_STATE(64) + | BR_HASHDESC_LBLEN(7) + | BR_HASHDESC_MD_PADDING + | BR_HASHDESC_MD_PADDING_BE + | BR_HASHDESC_MD_PADDING_128, + (void (*)(const br_hash_class **)) &br_sha512_init, + (void (*)(const br_hash_class **, const void *, size_t)) &br_sha384_update, /* reuse SHA-384 update */ + (void (*)(const br_hash_class *const *, void *)) &br_sha512_out, + (uint64_t (*)(const br_hash_class *const *, void *)) &br_sha512_state, + (void (*)(const br_hash_class **, const void *, uint64_t)) &br_sha512_set_state +}; + +#endif /* HAVE_HAL_SHA512 */ + +#else +/* ===== ESP8266 - leave it unchanged ===== */ +#endif // SOC_SHA_SUPPORT_RESUME +#endif // defined(ESP_PLATFORM) && !defined(ESP8266) +#endif //USE_SHA_ROM diff --git a/lib/lib_ssl/bearssl-esp8266/src/hash/md5.c b/lib/lib_ssl/bearssl-esp8266/src/hash/md5.c index d954e6d3e..f38ee6ccb 100644 --- a/lib/lib_ssl/bearssl-esp8266/src/hash/md5.c +++ b/lib/lib_ssl/bearssl-esp8266/src/hash/md5.c @@ -1,7 +1,7 @@ /* * Copyright (c) 2016 Thomas Pornin * - * Permission is hereby granted, free of charge, to any person obtaining + * Permission is hereby granted, free of charge, to any person obtaining * a copy of this software and associated documentation files (the * "Software"), to deal in the Software without restriction, including * without limitation the rights to use, copy, modify, merge, publish, @@ -9,12 +9,12 @@ * permit persons to whom the Software is furnished to do so, subject to * the following conditions: * - * The above copyright notice and this permission notice shall be + * The above copyright notice and this permission notice shall be * included in all copies or substantial portions of the Software. * - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF - * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND + * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS * BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN * ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN @@ -22,7 +22,6 @@ * SOFTWARE. */ -#include #include "t_inner.h" #define F(B, C, D) ((((C) ^ (D)) & (B)) ^ (D)) diff --git a/lib/lib_ssl/bearssl-esp8266/src/hash/sha2small.c b/lib/lib_ssl/bearssl-esp8266/src/hash/sha2small.c index 8c640efc8..b4b12b13d 100644 --- a/lib/lib_ssl/bearssl-esp8266/src/hash/sha2small.c +++ b/lib/lib_ssl/bearssl-esp8266/src/hash/sha2small.c @@ -1,7 +1,7 @@ /* * Copyright (c) 2016 Thomas Pornin * - * Permission is hereby granted, free of charge, to any person obtaining + * Permission is hereby granted, free of charge, to any person obtaining * a copy of this software and associated documentation files (the * "Software"), to deal in the Software without restriction, including * without limitation the rights to use, copy, modify, merge, publish, @@ -9,12 +9,12 @@ * permit persons to whom the Software is furnished to do so, subject to * the following conditions: * - * The above copyright notice and this permission notice shall be + * The above copyright notice and this permission notice shall be * included in all copies or substantial portions of the Software. * - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF - * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND + * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS * BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN * ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN diff --git a/lib/lib_ssl/bearssl-esp8266/src/int/i15_fmont.c b/lib/lib_ssl/bearssl-esp8266/src/int/i15_fmont.c index a562d6852..8bf73a59f 100644 --- a/lib/lib_ssl/bearssl-esp8266/src/int/i15_fmont.c +++ b/lib/lib_ssl/bearssl-esp8266/src/int/i15_fmont.c @@ -1,7 +1,7 @@ /* * Copyright (c) 2017 Thomas Pornin * - * Permission is hereby granted, free of charge, to any person obtaining + * Permission is hereby granted, free of charge, to any person obtaining * a copy of this software and associated documentation files (the * "Software"), to deal in the Software without restriction, including * without limitation the rights to use, copy, modify, merge, publish, @@ -9,12 +9,12 @@ * permit persons to whom the Software is furnished to do so, subject to * the following conditions: * - * The above copyright notice and this permission notice shall be + * The above copyright notice and this permission notice shall be * included in all copies or substantial portions of the Software. * - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF - * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND + * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS * BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN * ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN diff --git a/lib/lib_ssl/bearssl-esp8266/src/int/i15_moddiv.c b/lib/lib_ssl/bearssl-esp8266/src/int/i15_moddiv.c index c3b32d2ce..d265a7d90 100644 --- a/lib/lib_ssl/bearssl-esp8266/src/int/i15_moddiv.c +++ b/lib/lib_ssl/bearssl-esp8266/src/int/i15_moddiv.c @@ -1,7 +1,7 @@ /* * Copyright (c) 2018 Thomas Pornin * - * Permission is hereby granted, free of charge, to any person obtaining + * Permission is hereby granted, free of charge, to any person obtaining * a copy of this software and associated documentation files (the * "Software"), to deal in the Software without restriction, including * without limitation the rights to use, copy, modify, merge, publish, @@ -9,12 +9,12 @@ * permit persons to whom the Software is furnished to do so, subject to * the following conditions: * - * The above copyright notice and this permission notice shall be + * The above copyright notice and this permission notice shall be * included in all copies or substantial portions of the Software. * - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF - * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND + * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS * BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN * ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN diff --git a/lib/lib_ssl/bearssl-esp8266/src/int/i15_mulacc.c b/lib/lib_ssl/bearssl-esp8266/src/int/i15_mulacc.c index db33c069c..ee4bb157d 100644 --- a/lib/lib_ssl/bearssl-esp8266/src/int/i15_mulacc.c +++ b/lib/lib_ssl/bearssl-esp8266/src/int/i15_mulacc.c @@ -1,7 +1,7 @@ /* * Copyright (c) 2017 Thomas Pornin * - * Permission is hereby granted, free of charge, to any person obtaining + * Permission is hereby granted, free of charge, to any person obtaining * a copy of this software and associated documentation files (the * "Software"), to deal in the Software without restriction, including * without limitation the rights to use, copy, modify, merge, publish, @@ -9,12 +9,12 @@ * permit persons to whom the Software is furnished to do so, subject to * the following conditions: * - * The above copyright notice and this permission notice shall be + * The above copyright notice and this permission notice shall be * included in all copies or substantial portions of the Software. * - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF - * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND + * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS * BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN * ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN diff --git a/lib/lib_ssl/bearssl-esp8266/src/rand/sysrng.c b/lib/lib_ssl/bearssl-esp8266/src/rand/sysrng.c index 2a8347736..8fa4f3403 100644 --- a/lib/lib_ssl/bearssl-esp8266/src/rand/sysrng.c +++ b/lib/lib_ssl/bearssl-esp8266/src/rand/sysrng.c @@ -25,10 +25,6 @@ #define BR_ENABLE_INTRINSICS 1 #include "t_inner.h" -#if BR_USE_GETENTROPY -#include -#endif - #if BR_USE_URANDOM #include #include @@ -42,9 +38,6 @@ #pragma comment(lib, "advapi32") #endif -/* - * Seeder that uses the RDRAND opcodes (on x86 CPU). - */ #if BR_RDRAND BR_TARGETS_X86_UP BR_TARGET("rdrnd") @@ -64,24 +57,9 @@ seeder_rdrand(const br_prng_class **ctx) * * Intel recommends trying at least 10 times in case of * failure. - * - * AMD bug: there are reports that some AMD processors - * have a bug that makes them fail silently after a - * suspend/resume cycle, in which case RDRAND will report - * a success but always return 0xFFFFFFFF. - * see: https://bugzilla.kernel.org/show_bug.cgi?id=85911 - * - * As a mitigation, if the 32-bit value is 0 or -1, then - * it is considered a failure and tried again. This should - * reliably detect the buggy case, at least. This also - * implies that the selected seed values can never be - * 0x00000000 or 0xFFFFFFFF, which is not a problem since - * we are generating a seed for a PRNG, and we overdo it - * a bit (we generate 32 bytes of randomness, and 256 bits - * of entropy are really overkill). */ for (j = 0; j < 10; j ++) { - if (_rdrand32_step(&x) && x != 0 && x != (uint32_t)-1) { + if (_rdrand32_step(&x)) { goto next_word; } } @@ -102,11 +80,9 @@ rdrand_supported(void) */ return br_cpuid(0, 0, 0x40000000, 0); } + #endif -/* - * Seeder that uses /dev/urandom (on Unix-like systems). - */ #if BR_USE_URANDOM static int seeder_urandom(const br_prng_class **ctx) @@ -140,32 +116,6 @@ seeder_urandom(const br_prng_class **ctx) } #endif -/* - * Seeder that uses getentropy() (backed by getrandom() on some systems, - * e.g. Linux). On failure, it will use the /dev/urandom seeder (if - * enabled). - */ -#if BR_USE_GETENTROPY -static int -seeder_getentropy(const br_prng_class **ctx) -{ - unsigned char tmp[32]; - - if (getentropy(tmp, sizeof tmp) == 0) { - (*ctx)->update(ctx, tmp, sizeof tmp); - return 1; - } -#if BR_USE_URANDOM - return seeder_urandom(ctx); -#else - return 0; -#endif -} -#endif - -/* - * Seeder that uses CryptGenRandom() (on Windows). - */ #if BR_USE_WIN32_RAND static int seeder_win32(const br_prng_class **ctx) @@ -221,56 +171,12 @@ seeder_esp8266(const br_prng_class **ctx) } (*ctx)->update(ctx, tmp, sizeof tmp); + return 1; } #endif #endif -#ifdef BR_USE_PICO_RAND -extern uint32_t __picoRand(); -static int -seeder_pico(const br_prng_class **ctx) -{ - uint32_t tmp[32 / sizeof(uint32_t)]; - size_t i; - - for (i=0; iupdate(ctx, tmp, sizeof tmp); - return 1; -} - -#endif - -/* - * An aggregate seeder that uses RDRAND, and falls back to an OS-provided - * source if RDRAND fails. - */ -#if BR_RDRAND && (BR_USE_GETENTROPY || BR_USE_URANDOM || BR_USE_WIN32_RAND) -static int -seeder_rdrand_with_fallback(const br_prng_class **ctx) -{ - if (!seeder_rdrand(ctx)) { -#if BR_USE_PICO - return seeder_pico(ctx); -#elif BR_USE_GETENTROPY - return seeder_getentropy(ctx); -#elif BR_USE_URANDOM - return seeder_urandom(ctx); -#elif BR_USE_WIN32_RAND - return seeder_win32(ctx); -#elif BR_USE_ESP8266_RAND - return seeder_esp8266(ctx); -#else -#error "macro selection has gone wrong" -#endif - } - return 1; -} -#endif - /* see bearssl_rand.h */ br_prng_seeder @@ -281,24 +187,10 @@ br_prng_seeder_system(const char **name) if (name != NULL) { *name = "rdrand"; } -#if BR_USE_GETENTROPY || BR_USE_URANDOM || BR_USE_WIN32_RAND - return &seeder_rdrand_with_fallback; -#else return &seeder_rdrand; -#endif } #endif -#if BR_USE_PICO_RAND - if (name != NULL) { - *name = "pico"; - } - return &seeder_pico; -#elif BR_USE_GETENTROPY - if (name != NULL) { - *name = "getentropy"; - } - return &seeder_getentropy; -#elif BR_USE_URANDOM +#if BR_USE_URANDOM if (name != NULL) { *name = "urandom"; } diff --git a/lib/lib_ssl/bearssl-esp8266/src/rsa/rsa_i15_pub.c b/lib/lib_ssl/bearssl-esp8266/src/rsa/rsa_i15_pub.c index 662b00585..2fa78312b 100644 --- a/lib/lib_ssl/bearssl-esp8266/src/rsa/rsa_i15_pub.c +++ b/lib/lib_ssl/bearssl-esp8266/src/rsa/rsa_i15_pub.c @@ -1,7 +1,7 @@ /* * Copyright (c) 2017 Thomas Pornin * - * Permission is hereby granted, free of charge, to any person obtaining + * Permission is hereby granted, free of charge, to any person obtaining * a copy of this software and associated documentation files (the * "Software"), to deal in the Software without restriction, including * without limitation the rights to use, copy, modify, merge, publish, @@ -9,12 +9,12 @@ * permit persons to whom the Software is furnished to do so, subject to * the following conditions: * - * The above copyright notice and this permission notice shall be + * The above copyright notice and this permission notice shall be * included in all copies or substantial portions of the Software. * - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF - * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND + * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS * BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN * ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN diff --git a/lib/lib_ssl/bearssl-esp8266/src/ssl/ssl_ccert_single_ec.c b/lib/lib_ssl/bearssl-esp8266/src/ssl/ssl_ccert_single_ec.c index 599cda305..7e9530cd0 100644 --- a/lib/lib_ssl/bearssl-esp8266/src/ssl/ssl_ccert_single_ec.c +++ b/lib/lib_ssl/bearssl-esp8266/src/ssl/ssl_ccert_single_ec.c @@ -69,7 +69,6 @@ cc_choose(const br_ssl_client_certificate_class **pctx, choices->hash_id = -1; choices->chain = zc->chain; choices->chain_len = zc->chain_len; - return; } } diff --git a/lib/lib_ssl/bearssl-esp8266/src/ssl/ssl_hs_client.c b/lib/lib_ssl/bearssl-esp8266/src/ssl/ssl_hs_client.c index 9d2b7444e..3f883a17b 100644 --- a/lib/lib_ssl/bearssl-esp8266/src/ssl/ssl_hs_client.c +++ b/lib/lib_ssl/bearssl-esp8266/src/ssl/ssl_hs_client.c @@ -395,9 +395,6 @@ make_client_sign(br_ssl_client_context *ctx) ctx->eng.pad, sizeof ctx->eng.pad); } -/* State machine should be squeezed for size, not performance critical */ -#pragma GCC optimize ("Os") - static const unsigned char t0_datablock[] PROGMEM = { @@ -1202,7 +1199,7 @@ br_ssl_hs_client_run(void *t0ctx) break; case 27: { /* co */ - T0_CO(); + T0_CO(); } break; case 28: { @@ -1330,12 +1327,12 @@ br_ssl_hs_client_run(void *t0ctx) break; case 37: { /* drop */ - (void)T0_POP(); + (void)T0_POP(); } break; case 38: { /* dup */ - T0_PUSH(T0_PEEK(0)); + T0_PUSH(T0_PEEK(0)); } break; case 39: { @@ -1511,7 +1508,7 @@ br_ssl_hs_client_run(void *t0ctx) break; case 56: { /* over */ - T0_PUSH(T0_PEEK(1)); + T0_PUSH(T0_PEEK(1)); } break; case 57: { @@ -1652,7 +1649,7 @@ br_ssl_hs_client_run(void *t0ctx) break; case 69: { /* swap */ - T0_SWAP(); + T0_SWAP(); } break; case 70: { diff --git a/lib/lib_ssl/bearssl-esp8266/src/ssl/ssl_hs_server.c b/lib/lib_ssl/bearssl-esp8266/src/ssl/ssl_hs_server.c index 80aedf593..9bce99645 100644 --- a/lib/lib_ssl/bearssl-esp8266/src/ssl/ssl_hs_server.c +++ b/lib/lib_ssl/bearssl-esp8266/src/ssl/ssl_hs_server.c @@ -426,9 +426,6 @@ verify_CV_sig(br_ssl_server_context *ctx, size_t sig_len) return 0; } -/* State machine should be squeezed for size, not performance critical */ -#pragma GCC optimize ("Os") - static const unsigned char t0_datablock[] PROGMEM = { @@ -1067,7 +1064,7 @@ br_ssl_hs_server_run(void *t0ctx) break; case 10: { /* -rot */ - T0_NROT(); + T0_NROT(); } break; case 11: { @@ -1241,7 +1238,7 @@ br_ssl_hs_server_run(void *t0ctx) break; case 27: { /* co */ - T0_CO(); + T0_CO(); } break; case 28: { @@ -1405,12 +1402,12 @@ br_ssl_hs_server_run(void *t0ctx) break; case 41: { /* drop */ - (void)T0_POP(); + (void)T0_POP(); } break; case 42: { /* dup */ - T0_PUSH(T0_PEEK(0)); + T0_PUSH(T0_PEEK(0)); } break; case 43: { @@ -1547,12 +1544,12 @@ br_ssl_hs_server_run(void *t0ctx) break; case 58: { /* over */ - T0_PUSH(T0_PEEK(1)); + T0_PUSH(T0_PEEK(1)); } break; case 59: { /* pick */ - T0_PICK(T0_POP()); + T0_PICK(T0_POP()); } break; case 60: { @@ -1693,7 +1690,7 @@ br_ssl_hs_server_run(void *t0ctx) break; case 71: { /* swap */ - T0_SWAP(); + T0_SWAP(); } break; case 72: { diff --git a/lib/lib_ssl/bearssl-esp8266/src/t_bearssl_x509.h b/lib/lib_ssl/bearssl-esp8266/src/t_bearssl_x509.h index 1fae8a56f..d5a6b6554 100644 --- a/lib/lib_ssl/bearssl-esp8266/src/t_bearssl_x509.h +++ b/lib/lib_ssl/bearssl-esp8266/src/t_bearssl_x509.h @@ -625,52 +625,6 @@ typedef struct { } br_name_element; -/** - * \brief Callback for validity date checks. - * - * The function receives as parameter an arbitrary user-provided context, - * and the notBefore and notAfter dates specified in an X.509 certificate, - * both expressed as a number of days and a number of seconds: - * - * - Days are counted in a proleptic Gregorian calendar since - * January 1st, 0 AD. Year "0 AD" is the one that preceded "1 AD"; - * it is also traditionally known as "1 BC". - * - * - Seconds are counted since midnight, from 0 to 86400 (a count of - * 86400 is possible only if a leap second happened). - * - * Each date and time is understood in the UTC time zone. The "Unix - * Epoch" (January 1st, 1970, 00:00 UTC) corresponds to days=719528 and - * seconds=0; the "Windows Epoch" (January 1st, 1601, 00:00 UTC) is - * days=584754, seconds=0. - * - * This function must return -1 if the current date is strictly before - * the "notBefore" time, or +1 if the current date is strictly after the - * "notAfter" time. If neither condition holds, then the function returns - * 0, which means that the current date falls within the validity range of - * the certificate. If the function returns a value distinct from -1, 0 - * and +1, then this is interpreted as an unavailability of the current - * time, which normally ends the validation process with a - * `BR_ERR_X509_TIME_UNKNOWN` error. - * - * During path validation, this callback will be invoked for each - * considered X.509 certificate. Validation fails if any of the calls - * returns a non-zero value. - * - * The context value is an abritrary pointer set by the caller when - * configuring this callback. - * - * \param tctx context pointer. - * \param not_before_days notBefore date (days since Jan 1st, 0 AD). - * \param not_before_seconds notBefore time (seconds, at most 86400). - * \param not_after_days notAfter date (days since Jan 1st, 0 AD). - * \param not_after_seconds notAfter time (seconds, at most 86400). - * \return -1, 0 or +1. - */ -typedef int (*br_x509_time_check)(void *tctx, - uint32_t not_before_days, uint32_t not_before_seconds, - uint32_t not_after_days, uint32_t not_after_seconds); - /** * \brief The "minimal" X.509 engine structure. * @@ -693,8 +647,8 @@ typedef struct { uint32_t *rp; const unsigned char *ip; } cpu; - uint32_t dp_stack[31]; - uint32_t rp_stack[31]; + uint32_t dp_stack[32]; + uint32_t rp_stack[32]; int err; /* Server name to match with the SAN / CN of the EE certificate. */ @@ -776,12 +730,6 @@ typedef struct { br_name_element *name_elts; size_t num_name_elts; - /* - * Callback function (and context) to get the current date. - */ - void *itime_ctx; - br_x509_time_check itime; - /* * Public key cryptography implementations (signature verification). */ @@ -963,28 +911,6 @@ br_x509_minimal_set_time(br_x509_minimal_context *ctx, { ctx->days = days; ctx->seconds = seconds; - ctx->itime = 0; -} - -/** - * \brief Set the validity range callback function for the X.509 - * "minimal" engine. - * - * The provided function will be invoked to check whether the validation - * date is within the validity range for a given X.509 certificate; a - * call will be issued for each considered certificate. The provided - * context pointer (itime_ctx) will be passed as first parameter to the - * callback. - * - * \param tctx context for callback invocation. - * \param cb callback function. - */ -static inline void -br_x509_minimal_set_time_callback(br_x509_minimal_context *ctx, - void *itime_ctx, br_x509_time_check itime) -{ - ctx->itime_ctx = itime_ctx; - ctx->itime = itime; } /** diff --git a/lib/lib_ssl/bearssl-esp8266/src/t_config.h b/lib/lib_ssl/bearssl-esp8266/src/t_config.h index be8e840cd..2b0e47b64 100644 --- a/lib/lib_ssl/bearssl-esp8266/src/t_config.h +++ b/lib/lib_ssl/bearssl-esp8266/src/t_config.h @@ -1,7 +1,7 @@ /* * Copyright (c) 2016 Thomas Pornin * - * Permission is hereby granted, free of charge, to any person obtaining + * Permission is hereby granted, free of charge, to any person obtaining * a copy of this software and associated documentation files (the * "Software"), to deal in the Software without restriction, including * without limitation the rights to use, copy, modify, merge, publish, @@ -9,12 +9,12 @@ * permit persons to whom the Software is furnished to do so, subject to * the following conditions: * - * The above copyright notice and this permission notice shall be + * The above copyright notice and this permission notice shall be * included in all copies or substantial portions of the Software. * - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF - * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND + * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS * BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN * ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN @@ -111,27 +111,9 @@ #define BR_RDRAND 1 */ -/* - * When BR_USE_GETENTROPY is enabled, the SSL engine will use the - * getentropy() function to obtain quality randomness for seeding its - * internal PRNG. On Linux and FreeBSD, getentropy() is implemented by - * the standard library with the system call getrandom(); on OpenBSD, - * getentropy() is the system call, and there is no getrandom() wrapper, - * hence the use of the getentropy() function for maximum portability. - * - * If the getentropy() call fails, and BR_USE_URANDOM is not explicitly - * disabled, then /dev/urandom will be used as a fallback mechanism. On - * FreeBSD and OpenBSD, this does not change much, since /dev/urandom - * will block if not enough entropy has been obtained since last boot. - * On Linux, /dev/urandom might not block, which can be troublesome in - * early boot stages, which is why getentropy() is preferred. - * -#define BR_USE_GETENTROPY 1 - */ - /* * When BR_USE_URANDOM is enabled, the SSL engine will use /dev/urandom - * to automatically obtain quality randomness for seeding its internal + * to automatically obtain quality randomness for seedings its internal * PRNG. * #define BR_USE_URANDOM 1 @@ -147,7 +129,7 @@ /* * When BR_USE_WIN32_RAND is enabled, the SSL engine will use the Win32 * (CryptoAPI) functions (CryptAcquireContext(), CryptGenRandom()...) to - * automatically obtain quality randomness for seeding its internal PRNG. + * automatically obtain quality randomness for seedings its internal PRNG. * * Note: if both BR_USE_URANDOM and BR_USE_WIN32_RAND are defined, the * former takes precedence. diff --git a/lib/lib_ssl/bearssl-esp8266/src/t_inner.h b/lib/lib_ssl/bearssl-esp8266/src/t_inner.h index 27f030108..de08990e5 100644 --- a/lib/lib_ssl/bearssl-esp8266/src/t_inner.h +++ b/lib/lib_ssl/bearssl-esp8266/src/t_inner.h @@ -1,7 +1,7 @@ /* * Copyright (c) 2016 Thomas Pornin * - * Permission is hereby granted, free of charge, to any person obtaining + * Permission is hereby granted, free of charge, to any person obtaining * a copy of this software and associated documentation files (the * "Software"), to deal in the Software without restriction, including * without limitation the rights to use, copy, modify, merge, publish, @@ -9,12 +9,12 @@ * permit persons to whom the Software is furnished to do so, subject to * the following conditions: * - * The above copyright notice and this permission notice shall be + * The above copyright notice and this permission notice shall be * included in all copies or substantial portions of the Software. * - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF - * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND + * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS * BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN * ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN diff --git a/lib/lib_ssl/bearssl-esp8266/src/x509/pkey_decoder.c b/lib/lib_ssl/bearssl-esp8266/src/x509/pkey_decoder.c index c234bc11b..84fa057aa 100644 --- a/lib/lib_ssl/bearssl-esp8266/src/x509/pkey_decoder.c +++ b/lib/lib_ssl/bearssl-esp8266/src/x509/pkey_decoder.c @@ -100,9 +100,6 @@ br_pkey_decoder_push(br_pkey_decoder_context *ctx, br_pkey_decoder_run(&ctx->cpu); } -/* State machine should be squeezed for size, not performance critical */ -#pragma GCC optimize ("Os") - static const unsigned char t0_datablock[] PROGMEM = { @@ -386,7 +383,7 @@ br_pkey_decoder_run(void *t0ctx) break; case 9: { /* -rot */ - T0_NROT(); + T0_NROT(); } break; case 10: { @@ -454,17 +451,17 @@ br_pkey_decoder_run(void *t0ctx) break; case 17: { /* co */ - T0_CO(); + T0_CO(); } break; case 18: { /* drop */ - (void)T0_POP(); + (void)T0_POP(); } break; case 19: { /* dup */ - T0_PUSH(T0_PEEK(0)); + T0_PUSH(T0_PEEK(0)); } break; case 20: { @@ -501,7 +498,7 @@ br_pkey_decoder_run(void *t0ctx) break; case 23: { /* over */ - T0_PUSH(T0_PEEK(1)); + T0_PUSH(T0_PEEK(1)); } break; case 24: { @@ -537,7 +534,7 @@ br_pkey_decoder_run(void *t0ctx) break; case 26: { /* rot */ - T0_ROT(); + T0_ROT(); } break; case 27: { @@ -574,7 +571,7 @@ br_pkey_decoder_run(void *t0ctx) break; case 30: { /* swap */ - T0_SWAP(); + T0_SWAP(); } break; } diff --git a/lib/lib_ssl/bearssl-esp8266/src/x509/skey_decoder.c b/lib/lib_ssl/bearssl-esp8266/src/x509/skey_decoder.c index 02bc8d714..47adab0eb 100644 --- a/lib/lib_ssl/bearssl-esp8266/src/x509/skey_decoder.c +++ b/lib/lib_ssl/bearssl-esp8266/src/x509/skey_decoder.c @@ -100,9 +100,6 @@ br_skey_decoder_push(br_skey_decoder_context *ctx, br_skey_decoder_run(&ctx->cpu); } -/* State machine should be squeezed for size, not performance critical */ -#pragma GCC optimize ("Os") - static const unsigned char t0_datablock[] PROGMEM = { @@ -411,7 +408,7 @@ br_skey_decoder_run(void *t0ctx) break; case 9: { /* -rot */ - T0_NROT(); + T0_NROT(); } break; case 10: { @@ -488,17 +485,17 @@ br_skey_decoder_run(void *t0ctx) break; case 18: { /* co */ - T0_CO(); + T0_CO(); } break; case 19: { /* drop */ - (void)T0_POP(); + (void)T0_POP(); } break; case 20: { /* dup */ - T0_PUSH(T0_PEEK(0)); + T0_PUSH(T0_PEEK(0)); } break; case 21: { @@ -543,7 +540,7 @@ br_skey_decoder_run(void *t0ctx) break; case 25: { /* over */ - T0_PUSH(T0_PEEK(1)); + T0_PUSH(T0_PEEK(1)); } break; case 26: { @@ -579,7 +576,7 @@ br_skey_decoder_run(void *t0ctx) break; case 28: { /* rot */ - T0_ROT(); + T0_ROT(); } break; case 29: { @@ -632,7 +629,7 @@ br_skey_decoder_run(void *t0ctx) break; case 32: { /* swap */ - T0_SWAP(); + T0_SWAP(); } break; case 33: { diff --git a/lib/lib_ssl/bearssl-esp8266/src/x509/x509_decoder.c b/lib/lib_ssl/bearssl-esp8266/src/x509/x509_decoder.c index 9d2c22d94..b738755f5 100644 --- a/lib/lib_ssl/bearssl-esp8266/src/x509/x509_decoder.c +++ b/lib/lib_ssl/bearssl-esp8266/src/x509/x509_decoder.c @@ -113,9 +113,6 @@ br_x509_decoder_push(br_x509_decoder_context *ctx, br_x509_decoder_run(&ctx->cpu); } -/* State machine should be squeezed for size, not performance critical */ -#pragma GCC optimize ("Os") - static const unsigned char t0_datablock[] PROGMEM = { @@ -523,7 +520,7 @@ br_x509_decoder_run(void *t0ctx) break; case 11: { /* -rot */ - T0_NROT(); + T0_NROT(); } break; case 12: { @@ -618,7 +615,7 @@ br_x509_decoder_run(void *t0ctx) break; case 22: { /* co */ - T0_CO(); + T0_CO(); } break; case 23: { @@ -656,12 +653,12 @@ br_x509_decoder_run(void *t0ctx) break; case 26: { /* drop */ - (void)T0_POP(); + (void)T0_POP(); } break; case 27: { /* dup */ - T0_PUSH(T0_PEEK(0)); + T0_PUSH(T0_PEEK(0)); } break; case 28: { @@ -707,7 +704,7 @@ br_x509_decoder_run(void *t0ctx) break; case 32: { /* over */ - T0_PUSH(T0_PEEK(1)); + T0_PUSH(T0_PEEK(1)); } break; case 33: { @@ -756,7 +753,7 @@ br_x509_decoder_run(void *t0ctx) break; case 35: { /* rot */ - T0_ROT(); + T0_ROT(); } break; case 36: { @@ -777,7 +774,7 @@ br_x509_decoder_run(void *t0ctx) break; case 38: { /* swap */ - T0_SWAP(); + T0_SWAP(); } break; } diff --git a/lib/lib_ssl/bearssl-esp8266/src/x509/x509_minimal.c b/lib/lib_ssl/bearssl-esp8266/src/x509/x509_minimal.c index 4e506a5a2..0d92e7b25 100644 --- a/lib/lib_ssl/bearssl-esp8266/src/x509/x509_minimal.c +++ b/lib/lib_ssl/bearssl-esp8266/src/x509/x509_minimal.c @@ -489,8 +489,6 @@ static int check_single_trust_anchor_CA(br_x509_minimal_context *ctx, return 0; } -/* State machine should be squeezed for size, not performance critical */ -#pragma GCC optimize ("Os") @@ -1088,7 +1086,7 @@ br_x509_minimal_run(void *t0ctx) break; case 11: { /* -rot */ - T0_NROT(); + T0_NROT(); } break; case 12: { @@ -1271,43 +1269,35 @@ br_x509_minimal_run(void *t0ctx) uint32_t nas = T0_POP(); uint32_t nad = T0_POP(); int r; - if (CTX->itime != 0) { - r = CTX->itime(CTX->itime_ctx, nbd, nbs, nad, nas); - if (r < -1 || r > 1) { - CTX->err = BR_ERR_X509_TIME_UNKNOWN; - T0_CO(); - } - } else { - uint32_t vd = CTX->days; - uint32_t vs = CTX->seconds; - if (vd == 0 && vs == 0) { + uint32_t vd = CTX->days; + uint32_t vs = CTX->seconds; + if (vd == 0 && vs == 0) { #if BR_USE_UNIX_TIME - time_t x = time(NULL); + time_t x = time(NULL); - vd = (uint32_t)(x / 86400) + 719528; - vs = (uint32_t)(x % 86400); + vd = (uint32_t)(x / 86400) + 719528; + vs = (uint32_t)(x % 86400); #elif BR_USE_WIN32_TIME - FILETIME ft; - uint64_t x; + FILETIME ft; + uint64_t x; - GetSystemTimeAsFileTime(&ft); - x = ((uint64_t)ft.dwHighDateTime << 32) - + (uint64_t)ft.dwLowDateTime; - x = (x / 10000000); - vd = (uint32_t)(x / 86400) + 584754; - vs = (uint32_t)(x % 86400); + GetSystemTimeAsFileTime(&ft); + x = ((uint64_t)ft.dwHighDateTime << 32) + + (uint64_t)ft.dwLowDateTime; + x = (x / 10000000); + vd = (uint32_t)(x / 86400) + 584754; + vs = (uint32_t)(x % 86400); #else - CTX->err = BR_ERR_X509_TIME_UNKNOWN; + CTX->err = BR_ERR_X509_TIME_UNKNOWN; T0_CO(); #endif - } - if (vd < nbd || (vd == nbd && vs < nbs)) { - r = -1; - } else if (vd > nad || (vd == nad && vs > nas)) { - r = 1; - } else { - r = 0; - } + } + if (vd < nbd || (vd == nbd && vs < nbs)) { + r = -1; + } else if (vd > nad || (vd == nad && vs > nas)) { + r = 1; + } else { + r = 0; } T0_PUSHi(r); @@ -1315,7 +1305,7 @@ br_x509_minimal_run(void *t0ctx) break; case 26: { /* co */ - T0_CO(); + T0_CO(); } break; case 27: { @@ -1463,12 +1453,12 @@ br_x509_minimal_run(void *t0ctx) break; case 37: { /* drop */ - (void)T0_POP(); + (void)T0_POP(); } break; case 38: { /* dup */ - T0_PUSH(T0_PEEK(0)); + T0_PUSH(T0_PEEK(0)); } break; case 39: { @@ -1609,7 +1599,7 @@ br_x509_minimal_run(void *t0ctx) break; case 48: { /* over */ - T0_PUSH(T0_PEEK(1)); + T0_PUSH(T0_PEEK(1)); } break; case 49: { @@ -1659,7 +1649,7 @@ br_x509_minimal_run(void *t0ctx) break; case 51: { /* rot */ - T0_ROT(); + T0_ROT(); } break; case 52: { @@ -1711,7 +1701,7 @@ br_x509_minimal_run(void *t0ctx) break; case 58: { /* swap */ - T0_SWAP(); + T0_SWAP(); } break; case 59: { @@ -1785,5 +1775,3 @@ verify_signature(br_x509_minimal_context *ctx, const br_x509_pkey *pk) return BR_ERR_X509_UNSUPPORTED; } } - - diff --git a/lib/lib_ssl/tls_mini/src/WiFiClientSecureLightBearSSL.cpp b/lib/lib_ssl/tls_mini/src/WiFiClientSecureLightBearSSL.cpp old mode 100644 new mode 100755 index ce552977a..8b11073f2 --- a/lib/lib_ssl/tls_mini/src/WiFiClientSecureLightBearSSL.cpp +++ b/lib/lib_ssl/tls_mini/src/WiFiClientSecureLightBearSSL.cpp @@ -54,7 +54,9 @@ #include "c_types.h" #endif -#include +#if __has_include("core_version.h") // ESP32 Stage has no core_version.h file. Disable include via PlatformIO Option +#include // Arduino_Esp8266 version information (ARDUINO_ESP8266_RELEASE and ARDUINO_ESP8266_RELEASE_2_7_1) +#endif // ESP32_STAGE #undef DEBUG_TLS #ifdef DEBUG_TLS @@ -75,6 +77,9 @@ void _Log_heap_size(const char *msg) { #define LOG_HEAP_SIZE(a) #endif +// get UTC time from Tasmota +//extern uint32_t UtcTime(void); +//extern uint32_t CfgTime(void); #ifdef ESP8266 // Stack thunk is not needed with ESP32 // Stack thunked versions of calls @@ -196,7 +201,8 @@ void WiFiClientSecure_light::_clear() { _last_error = 0; _recvapp_buf = nullptr; _recvapp_len = 0; - _insecure = false; // set to true when calling setPubKeyFingerprint() + _insecure = true; // set to true when calling setPubKeyFingerprint() + _rsa_only = false; // for now we disable ECDSA by default _fingerprint_any = true; // by default accept all fingerprints _fingerprint1 = nullptr; _fingerprint2 = nullptr; @@ -298,16 +304,6 @@ void WiFiClientSecure_light::flush(void) { #ifdef ESP32 -int WiFiClientSecure_light::connect(IPAddress ip, uint16_t port) -{ - return connect(ip, port, _timeout); -} - -int WiFiClientSecure_light::connect(const char* name, uint16_t port) -{ - return connect(name, port, _timeout); -} - int WiFiClientSecure_light::connect(IPAddress ip, uint16_t port, int32_t timeout) { DEBUG_BSSL("connect(%s,%d)", ip.toString().c_str(), port); @@ -316,7 +312,9 @@ int WiFiClientSecure_light::connect(IPAddress ip, uint16_t port, int32_t timeout setLastError(ERR_TCP_CONNECT); return 0; } - return _connectSSL(_domain.isEmpty() ? nullptr : _domain.c_str()); + bool success = _connectSSL(_domain.isEmpty() ? nullptr : _domain.c_str()); + if (!success) { stop(); } + return success; } #else // ESP32 int WiFiClientSecure_light::connect(IPAddress ip, uint16_t port) { @@ -326,7 +324,9 @@ int WiFiClientSecure_light::connect(IPAddress ip, uint16_t port) { setLastError(ERR_TCP_CONNECT); return 0; } - return _connectSSL(_domain.isEmpty() ? nullptr : _domain.c_str()); + bool success = _connectSSL(_domain.isEmpty() ? nullptr : _domain.c_str()); + if (!success) { stop(); } + return success; } #endif @@ -335,7 +335,7 @@ int WiFiClientSecure_light::connect(const char* name, uint16_t port, int32_t tim DEBUG_BSSL("connect(%s,%d)\n", name, port); IPAddress remote_addr; clearLastError(); - if (WiFi.hostByName(name, remote_addr) != 1) { + if (!WiFi.hostByName(name, remote_addr)) { DEBUG_BSSL("connect: Name loopup failure\n"); setLastError(ERR_CANT_RESOLVE_IP); return 0; @@ -354,7 +354,7 @@ int WiFiClientSecure_light::connect(const char* name, uint16_t port) { DEBUG_BSSL("connect(%s,%d)\n", name, port); IPAddress remote_addr; clearLastError(); - if (WiFi.hostByName(name, remote_addr, 1000) != 1) { + if (!WiFi.hostByName(name, remote_addr)) { DEBUG_BSSL("connect: Name loopup failure\n"); setLastError(ERR_CANT_RESOLVE_IP); return 0; @@ -587,6 +587,7 @@ int WiFiClientSecure_light::_run_until(unsigned target, bool blocking) { if (((int32_t)(millis() - (t + this->_loopTimeout)) >= 0)){ DEBUG_BSSL("_run_until: Timeout\n"); + setLastError(ERR_TLS_TIMEOUT); return -1; } @@ -606,72 +607,66 @@ int WiFiClientSecure_light::_run_until(unsigned target, bool blocking) { } #endif - /* - If there is some record data to send, do it. This takes - precedence over everything else. - */ - if (state & BR_SSL_SENDREC) { - unsigned char *buf; - size_t len; - int wlen; + /* + If there is some record data to send, do it. This takes + precedence over everything else. + */ + if (state & BR_SSL_SENDREC) { + unsigned char *buf; + size_t len; + int wlen; - buf = br_ssl_engine_sendrec_buf(_eng, &len); - wlen = WiFiClient::write(buf, len); - if (wlen < 0) { - /* - If we received a close_notify and we - still send something, then we have our - own response close_notify to send, and - the peer is allowed by RFC 5246 not to - wait for it. - */ - if (!_eng->shutdown_recv) { -// br_ssl_engine_fail(_eng, BR_ERR_IO); - } - return -1; - } - if (wlen > 0) { - br_ssl_engine_sendrec_ack(_eng, wlen); - } + buf = br_ssl_engine_sendrec_buf(_eng, &len); + wlen = WiFiClient::write(buf, len); + if (wlen <= 0) { + /* + If we received a close_notify and we + still send something, then we have our + own response close_notify to send, and + the peer is allowed by RFC 5246 not to + wait for it. + */ + return -1; + } + if (wlen > 0) { + br_ssl_engine_sendrec_ack(_eng, wlen); + } no_work = 0; - continue; - } + continue; + } - /* - If we reached our target, then we are finished. - */ - if (state & target) { - return 0; - } - - /* - If some application data must be read, and we did not - exit, then this means that we are trying to write data, - and that's not possible until the application data is - read. This may happen if using a shared in/out buffer, - and the underlying protocol is not strictly half-duplex. - This is unrecoverable here, so we report an error. - */ - if (state & BR_SSL_RECVAPP) { - DEBUG_BSSL("_run_until: Fatal protocol state\n"); - return -1; - } - - /* - If we reached that point, then either we are trying - to read data and there is some, or the engine is stuck - until a new record is obtained. - */ - if (state & BR_SSL_RECVREC) { - if (WiFiClient::available()) { + /* + If we reached our target, then we are finished. + */ + if (state & target) { + return 0; + } + /* + If some application data must be read, and we did not + exit, then this means that we are trying to write data, + and that's not possible until the application data is + read. This may happen if using a shared in/out buffer, + and the underlying protocol is not strictly half-duplex. + This is unrecoverable here, so we report an error. + */ + if (state & BR_SSL_RECVAPP) { + DEBUG_BSSL("_run_until: Fatal protocol state\n"); + return -1; + } + /* + If we reached that point, then either we are trying + to read data and there is some, or the engine is stuck + until a new record is obtained. + */ + if (state & BR_SSL_RECVREC) { + if (WiFiClient::available()) { unsigned char *buf; size_t len; int rlen; buf = br_ssl_engine_recvrec_buf(_eng, &len); - rlen = WiFiClient::read(buf, len); + rlen = WiFiClient::read(buf, len); if (rlen < 0) { -// br_ssl_engine_fail(_eng, BR_ERR_IO); return -1; } if (rlen > 0) { @@ -680,16 +675,15 @@ int WiFiClientSecure_light::_run_until(unsigned target, bool blocking) { no_work = 0; continue; } - } - - /* - We can reach that point if the target RECVAPP, and - the state contains SENDAPP only. This may happen with - a shared in/out buffer. In that case, we must flush - the buffered data to "make room" for a new incoming - record. - */ - br_ssl_engine_flush(_eng, 0); + } + /* + We can reach that point if the target RECVAPP, and + the state contains SENDAPP only. This may happen with + a shared in/out buffer. In that case, we must flush + the buffered data to "make room" for a new incoming + record. + */ + br_ssl_engine_flush(_eng, 0); no_work++; // We didn't actually advance here } @@ -792,59 +786,69 @@ extern "C" { xc->done_cert = true; // first cert already processed } -// **** Start patch Castellucci -/* - static void pubkeyfingerprint_pubkey_fingerprint(br_sha1_context *shactx, br_rsa_public_key rsakey) { - br_sha1_init(shactx); - br_sha1_update(shactx, "ssh-rsa", 7); // tag - br_sha1_update(shactx, rsakey.e, rsakey.elen); // exponent - br_sha1_update(shactx, rsakey.n, rsakey.nlen); // modulus - } -*/ - // If `compat` id false, adds a u32be length prefixed value to the sha1 state. - // If `compat` is true, the length will be omitted for compatibility with - // data from older versions of Tasmota. - static void sha1_update_len(br_sha1_context *shactx, const void *msg, uint32_t len, bool compat) { + // Add a data element with a u32be length prefix to the sha1 state. + static void sha1_update_len(br_sha1_context *shactx, const void *msg, uint32_t len) { uint8_t buf[] = {0, 0, 0, 0}; - if (!compat) { - buf[0] = (len >> 24) & 0xff; - buf[1] = (len >> 16) & 0xff; - buf[2] = (len >> 8) & 0xff; - buf[3] = (len >> 0) & 0xff; - br_sha1_update(shactx, buf, 4); // length - } + buf[0] = (len >> 24) & 0xff; + buf[1] = (len >> 16) & 0xff; + buf[2] = (len >> 8) & 0xff; + buf[3] = (len >> 0) & 0xff; + br_sha1_update(shactx, buf, 4); // length + br_sha1_update(shactx, msg, len); // message } - // Update the received fingerprint based on the certificate's public key. - // If `compat` is true, an insecure version of the fingerprint will be - // calcualted for compatibility with older versions of Tasmota. Normally, - // `compat` should be false. - static void pubkeyfingerprint_pubkey_fingerprint(br_x509_pubkeyfingerprint_context *xc, bool compat) { - br_rsa_public_key rsakey = xc->ctx.pkey.key.rsa; + // Calculate the received fingerprint based on the certificate's public key. + // The public exponent and modulus are length prefixed to avoid security + // vulnerabilities related to ambiguous serialization. Without this, an + // attacker can generate alternative public keys which result in the same + // fingerprint, but are trivial to crack. This works because RSA keys can be + // created with more than two primes, and most numbers, even large ones, can + // be easily factored. + static void pubkeyfingerprint_pubkey_fingerprint(br_x509_pubkeyfingerprint_context *xc) { + if (xc->ctx.pkey.key_type == BR_KEYTYPE_RSA) { + br_rsa_public_key rsakey = xc->ctx.pkey.key.rsa; - br_sha1_context shactx; + br_sha1_context shactx; - br_sha1_init(&shactx); + br_sha1_init(&shactx); - sha1_update_len(&shactx, "ssh-rsa", 7, compat); // tag - sha1_update_len(&shactx, rsakey.e, rsakey.elen, compat); // exponent - sha1_update_len(&shactx, rsakey.n, rsakey.nlen, compat); // modulus + // The tag string doesn't really matter, but it should differ depending on + // key type. For RSA it's a fixed string. + sha1_update_len(&shactx, "ssh-rsa", 7); // tag + sha1_update_len(&shactx, rsakey.e, rsakey.elen); // exponent + sha1_update_len(&shactx, rsakey.n, rsakey.nlen); // modulus - br_sha1_out(&shactx, xc->pubkey_recv_fingerprint); // copy to fingerprint + br_sha1_out(&shactx, xc->pubkey_recv_fingerprint); // copy to fingerprint + } + #ifndef ESP8266 + else if (xc->ctx.pkey.key_type == BR_KEYTYPE_EC) { + br_ec_public_key eckey = xc->ctx.pkey.key.ec; + + br_sha1_context shactx; + + br_sha1_init(&shactx); + + // The tag string doesn't really matter, but it should differ depending on + // key type. For ECDSA it's a fixed string. + sha1_update_len(&shactx, "ecdsa", 5); // tag + int32_t curve = htonl(eckey.curve); + sha1_update_len(&shactx, &curve, 4); // curve id as int32be + sha1_update_len(&shactx, eckey.q, eckey.qlen); // public point + } + #endif + else { + // We don't support anything else, so just set the fingerprint to all zeros. + memset(xc->pubkey_recv_fingerprint, 0, 20); + } } -// **** End patch Castellucci // Callback when complete chain has been parsed. // Return 0 on validation success, !0 on validation error static unsigned pubkeyfingerprint_end_chain(const br_x509_class **ctx) { br_x509_pubkeyfingerprint_context *xc = (br_x509_pubkeyfingerprint_context *)ctx; - // set fingerprint status byte to zero - // FIXME: find a better way to pass this information - xc->pubkey_recv_fingerprint[20] = 0; - // Try matching using the the new fingerprint algorithm - pubkeyfingerprint_pubkey_fingerprint(xc, false); + pubkeyfingerprint_pubkey_fingerprint(xc); if (!xc->fingerprint_all) { if (0 == memcmp_P(xc->pubkey_recv_fingerprint, xc->fingerprint1, 20)) { return 0; @@ -857,7 +861,6 @@ extern "C" { // Default (no validation at all) or no errors in prior checks = success. return 0; } -// **** End patch Castellucci } // Return the public key from the validator (set by x509_minimal) @@ -894,20 +897,39 @@ extern "C" { ctx->fingerprint_all = fingerprint_all; } +#ifdef ESP8266 // We limit to a single cipher to reduce footprint // we reference it, don't put in PROGMEM static const uint16_t suites[] = { BR_TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256 }; +#else + // add more flexibility on ESP32 + static const uint16_t suites[] = { + BR_TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256, + BR_TLS_ECDHE_ECDSA_WITH_AES_128_GCM_SHA256, + }; + static const uint16_t suites_RSA_ONLY[] = { + BR_TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256, + }; +#endif // Default initializion for our SSL clients - static void br_ssl_client_base_init(br_ssl_client_context *cc) { + static void br_ssl_client_base_init(br_ssl_client_context *cc, bool _rsa_only) { br_ssl_client_zero(cc); // forbid SSL renegotiation, as we free the Private Key after handshake br_ssl_engine_add_flags(&cc->eng, BR_OPT_NO_RENEGOTIATION); br_ssl_engine_set_versions(&cc->eng, BR_TLS12, BR_TLS12); +#ifdef ESP8266 br_ssl_engine_set_suites(&cc->eng, suites, (sizeof suites) / (sizeof suites[0])); +#else + if (_rsa_only) { + br_ssl_engine_set_suites(&cc->eng, suites_RSA_ONLY, (sizeof suites_RSA_ONLY) / (sizeof suites_RSA_ONLY[0])); + } else { + br_ssl_engine_set_suites(&cc->eng, suites, (sizeof suites) / (sizeof suites[0])); + } +#endif br_ssl_client_set_default_rsapub(cc); br_ssl_engine_set_default_rsavrfy(&cc->eng); @@ -922,6 +944,9 @@ extern "C" { // we support only P256 EC curve for AWS IoT, no EC curve for Letsencrypt unless forced br_ssl_engine_set_ec(&cc->eng, &br_ec_p256_m15); // TODO +#ifndef ESP8266 + br_ssl_engine_set_ecdsa(&cc->eng, &br_ecdsa_i15_vrfy_asn1); +#endif } } @@ -935,8 +960,6 @@ bool WiFiClientSecure_light::_connectSSL(const char* hostName) { LOG_HEAP_SIZE("_connectSSL.start"); - bool OOM_error_occured = true; - do { // used to exit on Out of Memory error and keep all cleanup code at the same place // ============================================================ // allocate Thunk stack, move to alternate stack and initialize @@ -954,7 +977,7 @@ bool WiFiClientSecure_light::_connectSSL(const char* hostName) { _ctx_present = true; _eng = &_sc->eng; // Allocation/deallocation taken care of by the _sc shared_ptr - br_ssl_client_base_init(_sc.get()); + br_ssl_client_base_init(_sc.get(), _rsa_only); if (_alpn_names && _alpn_num > 0) { br_ssl_engine_set_protocol_names(_eng, _alpn_names, _alpn_num); } @@ -989,23 +1012,20 @@ bool WiFiClientSecure_light::_connectSSL(const char* hostName) { br_ssl_engine_set_buffers_bidi(_eng, _iobuf_in.get(), _iobuf_in_size, _iobuf_out.get(), _iobuf_out_size); // ============================================================ - // allocate Private key if needed, only if USE_MQTT_AWS_IOT + // allocate Private key if needed, only if USE_MQTT_CLIENT_CERT LOG_HEAP_SIZE("_connectSSL before PrivKey allocation"); - #ifdef USE_MQTT_AWS_IOT + #if defined(USE_MQTT_CLIENT_CERT) // ============================================================ - // Set the EC Private Key, only USE_MQTT_AWS_IOT + // Set the EC Private Key, only USE_MQTT_CLIENT_CERT // limited to P256 curve br_ssl_client_set_single_ec(_sc.get(), _chain_P, 1, _sk_ec_P, _allowed_usages, _cert_issuer_key_type, &br_ec_p256_m15, br_ecdsa_sign_asn1_get_default()); - #endif // USE_MQTT_AWS_IOT + #endif // USE_MQTT_CLIENT_CERT // ============================================================ // Start TLS connection, ALL - if (!br_ssl_client_reset(_sc.get(), hostName, 0)) { - OOM_error_occured = false; - break; - } + if (!br_ssl_client_reset(_sc.get(), hostName, 0)) break; auto ret = _wait_for_handshake(); #ifdef DEBUG_ESP_SSL @@ -1031,10 +1051,8 @@ bool WiFiClientSecure_light::_connectSSL(const char* hostName) { // ============================================================ // if we arrived here, this means we had an OOM error, cleaning up - if (OOM_error_occured) { - setLastError(ERR_OOM); - DEBUG_BSSL("_connectSSL: Out of memory\n"); - } + setLastError(ERR_OOM); + DEBUG_BSSL("_connectSSL: Out of memory\n"); #ifdef ESP8266 stack_thunk_light_del_ref(); #endif diff --git a/lib/lib_ssl/tls_mini/src/WiFiClientSecureLightBearSSL.h b/lib/lib_ssl/tls_mini/src/WiFiClientSecureLightBearSSL.h old mode 100644 new mode 100755 index c8555b957..fe9fe4f98 --- a/lib/lib_ssl/tls_mini/src/WiFiClientSecureLightBearSSL.h +++ b/lib/lib_ssl/tls_mini/src/WiFiClientSecureLightBearSSL.h @@ -20,7 +20,9 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */ -#include +#if __has_include("core_version.h") // ESP32 Stage has no core_version.h file. Disable include via PlatformIO Option +#include // Arduino_Esp8266 version information (ARDUINO_ESP8266_RELEASE and ARDUINO_ESP8266_RELEASE_2_7_1) +#endif // ESP32_STAGE #ifndef wificlientlightbearssl_h #define wificlientlightbearssl_h @@ -29,27 +31,24 @@ #include "NetworkClient.h" #include - namespace BearSSL { class WiFiClientSecure_light : public NetworkClient { public: - typedef std::function UtcTime_fcn; - typedef std::function CfgTime_fcn; - WiFiClientSecure_light(int recv, int xmit); ~WiFiClientSecure_light() override; + // Set function pointers to call to get UTC time or build time. + typedef std::function UtcTime_fcn; + typedef std::function CfgTime_fcn; void setUtcTime_fcn(UtcTime_fcn fcn) { _UtcTime = fcn; } void setCfgTime_fcn(CfgTime_fcn fcn) { _CfgTime = fcn; } void allocateBuffers(void); #ifdef ESP32 // the method to override in ESP32 has timeout argument default #define WIFI_CLIENT_DEF_CONN_TIMEOUT_MS (3000) - int connect(IPAddress ip, uint16_t port) override; - int connect(const char* name, uint16_t port) override; - int connect(IPAddress ip, uint16_t port, int32_t timeout); - int connect(const char* name, uint16_t port, int32_t timeout); + int connect(IPAddress ip, uint16_t port, int32_t timeout = 3000) override; + int connect(const char* name, uint16_t port, int32_t timeout = 3000) override; #else int connect(IPAddress ip, uint16_t port) override; int connect(const char* name, uint16_t port) override; @@ -93,6 +92,10 @@ class WiFiClientSecure_light : public NetworkClient { _fingerprint2 = f2; _fingerprint_any = f_any; _insecure = true; + _rsa_only = true; // if fingerprint, we limit to RSA only + } + void setRSAOnly(bool rsa_only) { + _rsa_only = rsa_only; } const uint8_t * getRecvPubKeyFingerprint(void) { return _recv_fingerprint; @@ -141,7 +144,7 @@ class WiFiClientSecure_light : public NetworkClient { } private: - uint32_t _loopTimeout=5000; + uint32_t _loopTimeout=10000; void _clear(); bool _ctx_present; std::shared_ptr _sc; @@ -158,14 +161,10 @@ class WiFiClientSecure_light : public NetworkClient { bool _fingerprint_any; // accept all fingerprints bool _insecure; // force fingerprint + bool _rsa_only; // restrict to RSA only key exchange (no ECDSA - enabled to force RSA fingerprints) const uint8_t *_fingerprint1; // fingerprint1 to be checked against const uint8_t *_fingerprint2; // fingerprint2 to be checked against -// **** Start patch Castellucci -/* uint8_t _recv_fingerprint[20]; // fingerprint received -*/ - uint8_t _recv_fingerprint[21]; // fingerprint received -// **** End patch Castellucci unsigned char *_recvapp_buf; size_t _recvapp_len; @@ -207,7 +206,8 @@ class WiFiClientSecure_light : public NetworkClient { #define ERR_CANT_RESOLVE_IP -1001 #define ERR_TCP_CONNECT -1002 // #define ERR_MISSING_EC_KEY -1003 // deprecated, AWS IoT is not called if the private key is not present -#define ERR_MISSING_CA -1004 +// #define ERR_MISSING_CA -1004 // deprecated +#define ERR_TLS_TIMEOUT -1005 // For reference, BearSSL error codes: // #define BR_ERR_OK 0 diff --git a/src/src/ESPEasyCore/Controller.cpp b/src/src/ESPEasyCore/Controller.cpp index 36a1b238c..95378bb42 100644 --- a/src/src/ESPEasyCore/Controller.cpp +++ b/src/src/ESPEasyCore/Controller.cpp @@ -331,6 +331,7 @@ bool MQTTConnect(controllerIndex_t controller_idx) mqtt_rootCA.clear(); if (mqtt_tls != nullptr) { + mqtt_tls->setTrustAnchor(Tasmota_TA, Tasmota_TA_size); mqtt_tls->setInsecure(); } break; @@ -461,6 +462,12 @@ bool MQTTConnect(controllerIndex_t controller_idx) mqtt_tls->clearLastError(); # endif // ifdef ESP32 // mqtt_tls_last_errorstr = buf; + if (mqtt_tls_last_error == ERR_OOM) mqtt_tls_last_errorstr = F("OutOfMemory"); + if (mqtt_tls_last_error == ERR_CANT_RESOLVE_IP) mqtt_tls_last_errorstr = F("Can't resolve IP"); + if (mqtt_tls_last_error == ERR_TCP_CONNECT) mqtt_tls_last_errorstr = F("TCP Connect error"); +// if (mqtt_tls_last_error == ERR_MISSING_CA) mqtt_tls_last_errorstr = F("Missing CA"); + if (mqtt_tls_last_error == ERR_TLS_TIMEOUT) mqtt_tls_last_errorstr = F("TLS Timeout"); + } # ifdef ESP32 diff --git a/src/src/Globals/MQTT.cpp b/src/src/Globals/MQTT.cpp index 04d64d09a..f7df2d332 100644 --- a/src/src/Globals/MQTT.cpp +++ b/src/src/Globals/MQTT.cpp @@ -12,7 +12,7 @@ String mqtt_tls_last_errorstr; int32_t mqtt_tls_last_error = 0; # ifdef ESP32 -BearSSL::WiFiClientSecure_light*mqtt_tls; +BearSSL::WiFiClientSecure_light*mqtt_tls{}; # endif // ifdef ESP32 # ifdef ESP8266 BearSSL::WiFiClientSecure*mqtt_tls; diff --git a/src/src/WebServer/ControllerPage.cpp b/src/src/WebServer/ControllerPage.cpp index 8f0ad00cb..a842147a6 100644 --- a/src/src/WebServer/ControllerPage.cpp +++ b/src/src/WebServer/ControllerPage.cpp @@ -522,6 +522,99 @@ void handle_controllers_ControllerSettingsPage(controllerIndex_t controllerindex addHtmlInt(mqtt_tls_last_error); addHtml(F(": ")); addHtml(mqtt_tls_last_errorstr); +/* + getLastError codes as documented in lib\lib_ssl\bearssl-esp8266\src\t_bearssl_ssl.h + SSL-level error codes + | Receive Fatal Alert + | | Send Fatal Alert + | | | + 0 : 256 : 512 : BR_ERR_OK + 1 : 257 : 513 : BR_ERR_BAD_PARAM - caller-provided parameter is incorrect + 2 : 258 : 514 : BR_ERR_BAD_STATE - operation requested by the caller cannot be applied with the current context state (e.g. reading data while outgoing data is waiting to be sent) + 3 : 259 : 515 : BR_ERR_UNSUPPORTED_VERSION - incoming protocol or record version is unsupported + 4 : 260 : 516 : BR_ERR_BAD_VERSION - incoming record version does not match the expected version + 5 : 261 : 517 : BR_ERR_BAD_LENGTH - incoming record length is invalid + 6 : 262 : 518 : BR_ERR_TOO_LARGE - incoming record is too large to be processed, or buffer is too small for the handshake message to send + 7 : 263 : 519 : BR_ERR_BAD_MAC - decryption found an invalid padding, or the record MAC is not correct + 8 : 264 : 520 : BR_ERR_NO_RANDOM - no initial entropy was provided, and none can be obtained from the OS + 9 : 265 : 521 : BR_ERR_UNKNOWN_TYPE - incoming record type is unknown + 10 : 266 : 522 : BR_ERR_UNEXPECTED - incoming record or message has wrong type with regards to the current engine state + 12 : 268 : 524 : BR_ERR_BAD_CCS - ChangeCipherSpec message from the peer has invalid contents + 13 : 269 : 525 : BR_ERR_BAD_ALERT - alert message from the peer has invalid contents (odd length) + 14 : 270 : 526 : BR_ERR_BAD_HANDSHAKE - incoming handshake message decoding failed + 15 : 271 : 527 : BR_ERR_OVERSIZED_ID - ServerHello contains a session ID which is larger than 32 bytes + 16 : 272 : 528 : BR_ERR_BAD_CIPHER_SUITE - server wants to use a cipher suite that we did not claim to support. This is also reported if we tried to advertise a cipher suite that we do not support + 17 : 273 : 529 : BR_ERR_BAD_COMPRESSION - server wants to use a compression that we did not claim to support + 18 : 274 : 530 : BR_ERR_BAD_FRAGLEN - server's max fragment length does not match client's + 19 : 275 : 531 : BR_ERR_BAD_SECRENEG - secure renegotiation failed + 20 : 276 : 532 : BR_ERR_EXTRA_EXTENSION - server sent an extension type that we did not announce, or used the same extension type several times in a single ServerHello + 21 : 277 : 533 : BR_ERR_BAD_SNI - invalid Server Name Indication contents (when used by the server, this extension shall be empty) + 22 : 278 : 534 : BR_ERR_BAD_HELLO_DONE - invalid ServerHelloDone from the server (length is not 0) + 23 : 279 : 535 : BR_ERR_LIMIT_EXCEEDED - internal limit exceeded (e.g. server's public key is too large) + 24 : 280 : 536 : BR_ERR_BAD_FINISHED - Finished message from peer does not match the expected value + 25 : 281 : 537 : BR_ERR_RESUME_MISMATCH - session resumption attempt with distinct version or cipher suite + 26 : 282 : 538 : BR_ERR_INVALID_ALGORITHM - unsupported or invalid algorithm (ECDHE curve, signature algorithm, hash function) + 27 : 283 : 539 : BR_ERR_BAD_SIGNATURE - invalid signature (on ServerKeyExchange from server, or in CertificateVerify from client) + 28 : 284 : 540 : BR_ERR_WRONG_KEY_USAGE - peer's public key does not have the proper type or is not allowed for requested operation + 29 : 285 : 541 : BR_ERR_NO_CLIENT_AUTH - client did not send a certificate upon request, or the client certificate could not be validated + 31 : 287 : 543 : BR_ERR_IO - I/O error or premature close on underlying transport stream. This error code is set only by the simplified I/O API ("br_sslio_*") + + getLastError codes as documented in lib\lib_ssl\bearssl-esp8266\src\t_bearssl_x509.h + 32 : BR_ERR_X509_OK - validation was successful; this is not actually an error + 33 : BR_ERR_X509_INVALID_VALUE - invalid value in an ASN.1 structure + 34 : BR_ERR_X509_TRUNCATED - truncated certificate + 35 : BR_ERR_X509_EMPTY_CHAIN - empty certificate chain (no certificate at all) + 36 : BR_ERR_X509_INNER_TRUNC - decoding error: inner element extends beyond outer element size + 37 : BR_ERR_X509_BAD_TAG_CLASS - decoding error: unsupported tag class (application or private) + 38 : BR_ERR_X509_BAD_TAG_VALUE - decoding error: unsupported tag value + 39 : BR_ERR_X509_INDEFINITE_LENGTH - decoding error: indefinite length + 40 : BR_ERR_X509_EXTRA_ELEMENT - decoding error: extraneous element + 41 : BR_ERR_X509_UNEXPECTED - decoding error: unexpected element + 42 : BR_ERR_X509_NOT_CONSTRUCTED - decoding error: expected constructed element, but is primitive + 43 : BR_ERR_X509_NOT_PRIMITIVE - decoding error: expected primitive element, but is constructed + 44 : BR_ERR_X509_PARTIAL_BYTE - decoding error: BIT STRING length is not multiple of 8 + 45 : BR_ERR_X509_BAD_BOOLEAN - decoding error: BOOLEAN value has invalid length + 46 : BR_ERR_X509_OVERFLOW - decoding error: value is off-limits + 47 : BR_ERR_X509_BAD_DN - invalid distinguished name + 48 : BR_ERR_X509_BAD_TIME - invalid date/time representation + 49 : BR_ERR_X509_UNSUPPORTED - certificate contains unsupported features that cannot be ignored + 50 : BR_ERR_X509_LIMIT_EXCEEDED - key or signature size exceeds internal limits + 51 : BR_ERR_X509_WRONG_KEY_TYPE - key type does not match that which was expected + 52 : BR_ERR_X509_BAD_SIGNATURE - signature is invalid + 53 : BR_ERR_X509_TIME_UNKNOWN - validation time is unknown + 54 : BR_ERR_X509_EXPIRED - certificate is expired or not yet valid + 55 : BR_ERR_X509_DN_MISMATCH - issuer/subject DN mismatch in the chain + 56 : BR_ERR_X509_BAD_SERVER_NAME - expected server name was not found in the chain + 57 : BR_ERR_X509_CRITICAL_EXTENSION - unknown critical extension in certificate + 58 : BR_ERR_X509_NOT_CA - not a CA, or path length constraint violation + 59 : BR_ERR_X509_FORBIDDEN_KEY_USAGE - Key Usage extension prohibits intended usage + 60 : BR_ERR_X509_WEAK_PUBLIC_KEY - public key found in certificate is too small + 62 : BR_ERR_X509_NOT_TRUSTED - chain could not be linked to a trust anchor + + getLastError codes as documented in lib\lib_ssl\bearssl-esp8266\src\t_bearssl_ssl.h + 10 : 266 : BR_ALERT_UNEXPECTED_MESSAGE + 20 : 276 : BR_ALERT_BAD_RECORD_MAC + 22 : 278 : BR_ALERT_RECORD_OVERFLOW + 30 : 286 : BR_ALERT_DECOMPRESSION_FAILURE + 40 : 296 : BR_ALERT_HANDSHAKE_FAILURE + 42 : 298 : BR_ALERT_BAD_CERTIFICATE + 43 : 299 : BR_ALERT_UNSUPPORTED_CERTIFICATE + 44 : 300 : BR_ALERT_CERTIFICATE_REVOKED + 45 : 301 : BR_ALERT_CERTIFICATE_EXPIRED + 46 : 302 : BR_ALERT_CERTIFICATE_UNKNOWN + 47 : 303 : BR_ALERT_ILLEGAL_PARAMETER + 48 : 304 : BR_ALERT_UNKNOWN_CA + 49 : 305 : BR_ALERT_ACCESS_DENIED + 50 : 306 : BR_ALERT_DECODE_ERROR + 51 : 307 : BR_ALERT_DECRYPT_ERROR + 70 : 326 : BR_ALERT_PROTOCOL_VERSION + 71 : 327 : BR_ALERT_INSUFFICIENT_SECURITY + 80 : 336 : BR_ALERT_INTERNAL_ERROR + 90 : 346 : BR_ALERT_USER_CANCELED + 100 : 356 : BR_ALERT_NO_RENEGOTIATION + 110 : 366 : BR_ALERT_UNSUPPORTED_EXTENSION + 120 : 376 : BR_ALERT_NO_APPLICATION_PROTOCOL +*/ # ifdef ESP32 From dd55c27bedb65e5641913bf4efb31320d913f3df Mon Sep 17 00:00:00 2001 From: TD-er Date: Sat, 11 Oct 2025 20:16:32 +0200 Subject: [PATCH 364/564] [TLS-MQTT] Automatic switch to ECDSA when error is 296 (TLS handshake) --- .../src/WiFiClientSecureLightBearSSL.cpp | 9 +- .../src/WiFiClientSecureLightBearSSL.h | 6 + src/src/ESPEasyCore/Controller.cpp | 317 ++++++++++-------- src/src/Globals/MQTT.cpp | 1 + src/src/Globals/MQTT.h | 1 + 5 files changed, 194 insertions(+), 140 deletions(-) diff --git a/lib/lib_ssl/tls_mini/src/WiFiClientSecureLightBearSSL.cpp b/lib/lib_ssl/tls_mini/src/WiFiClientSecureLightBearSSL.cpp index 8b11073f2..06cc2bf2b 100755 --- a/lib/lib_ssl/tls_mini/src/WiFiClientSecureLightBearSSL.cpp +++ b/lib/lib_ssl/tls_mini/src/WiFiClientSecureLightBearSSL.cpp @@ -196,7 +196,7 @@ void WiFiClientSecure_light::_clear() { _eng = nullptr; _iobuf_in = nullptr; _iobuf_out = nullptr; - setBufferSizes(1024, 1024); // reasonable minimum + setBufferSizes(2048, 2048); // reasonable minimum _handshake_done = false; _last_error = 0; _recvapp_buf = nullptr; @@ -943,8 +943,8 @@ extern "C" { br_ssl_engine_set_ghash(&cc->eng, &br_ghash_ctmul32); // we support only P256 EC curve for AWS IoT, no EC curve for Letsencrypt unless forced - br_ssl_engine_set_ec(&cc->eng, &br_ec_p256_m15); // TODO -#ifndef ESP8266 + br_ssl_engine_set_ec(&cc->eng, &br_ec_p256_m15); +#ifdef ESP32 br_ssl_engine_set_ecdsa(&cc->eng, &br_ecdsa_i15_vrfy_asn1); #endif } @@ -999,6 +999,9 @@ bool WiFiClientSecure_light::_connectSSL(const char* hostName) { br_x509_minimal_init(x509_minimal, &br_sha256_vtable, _ta_P, _ta_size); br_x509_minimal_set_rsa(x509_minimal, br_ssl_engine_get_rsavrfy(_eng)); br_x509_minimal_set_hash(x509_minimal, br_sha256_ID, &br_sha256_vtable); +#ifdef ESP32 + br_x509_minimal_set_ecdsa(x509_minimal, &br_ec_all_m15, &br_ecdsa_i15_vrfy_asn1); +#endif // ESP32 br_ssl_engine_set_x509(_eng, &x509_minimal->vtable); uint32_t now = UtcTime(); uint32_t cfg_time = CfgTime(); diff --git a/lib/lib_ssl/tls_mini/src/WiFiClientSecureLightBearSSL.h b/lib/lib_ssl/tls_mini/src/WiFiClientSecureLightBearSSL.h index fe9fe4f98..f464fcda3 100755 --- a/lib/lib_ssl/tls_mini/src/WiFiClientSecureLightBearSSL.h +++ b/lib/lib_ssl/tls_mini/src/WiFiClientSecureLightBearSSL.h @@ -127,6 +127,9 @@ class WiFiClientSecure_light : public NetworkClient { return br_ssl_engine_last_error(_eng); } } + int32_t getLastCipherSuite(void) { + return _eng->session.cipher_suite; + } inline void setLastError(int32_t err) { _last_error = err; } @@ -138,6 +141,9 @@ class WiFiClientSecure_light : public NetworkClient { } void setInsecure(); + void setECDSA(bool ecdsa) { + _rsa_only = !ecdsa; + }; void setDomainName(const char * domain) { _domain = domain; diff --git a/src/src/ESPEasyCore/Controller.cpp b/src/src/ESPEasyCore/Controller.cpp index e2b84fbce..a4ec31184 100644 --- a/src/src/ESPEasyCore/Controller.cpp +++ b/src/src/ESPEasyCore/Controller.cpp @@ -43,9 +43,9 @@ constexpr pluginID_t PLUGIN_ID_MQTT_IMPORT(37); void sendData(struct EventStruct *event, bool sendEvents) { START_TIMER; - #ifndef BUILD_NO_RAM_TRACKER +#ifndef BUILD_NO_RAM_TRACKER checkRAM(F("sendData")); - #endif // ifndef BUILD_NO_RAM_TRACKER +#endif // ifndef BUILD_NO_RAM_TRACKER // LoadTaskSettings(event->TaskIndex); if (Settings.UseRules && sendEvents) { @@ -65,7 +65,7 @@ void sendData(struct EventStruct *event, bool sendEvents) Settings.Protocol[x]) { event->ControllerIndex = x; - event->idx = Settings.TaskDeviceID[x][event->TaskIndex]; + event->idx = Settings.TaskDeviceID[x][event->TaskIndex]; if (validUserVar(event)) { String dummy; @@ -158,13 +158,14 @@ void incoming_mqtt_callback(char *c_topic, uint8_t *b_payload, unsigned int leng void MQTTDisconnect() { if (MQTTclient.connected()) { - #if FEATURE_MQTT_CONNECT_BACKGROUND +# if FEATURE_MQTT_CONNECT_BACKGROUND + if (MQTT_task_data.taskHandle) { vTaskDelete(MQTT_task_data.taskHandle); MQTT_task_data.taskHandle = NULL; } MQTT_task_data.status = MQTT_connect_status_e::Disconnected; - #endif // if FEATURE_MQTT_CONNECT_BACKGROUND +# endif // if FEATURE_MQTT_CONNECT_BACKGROUND MQTTclient.disconnect(); addLog(LOG_LEVEL_INFO, F("MQTT : Disconnected from broker")); } @@ -175,9 +176,9 @@ bool MQTTConnect_prepareClient(controllerIndex_t controller_idx) { MakeControllerSettings(ControllerSettings); // -V522 if (!AllocatedControllerSettings()) { - #ifndef BUILD_NO_DEBUG +# ifndef BUILD_NO_DEBUG addLog(LOG_LEVEL_ERROR, F("MQTT : Cannot connect, out of RAM")); - #endif +# endif return false; } LoadControllerSettings(controller_idx, *ControllerSettings); @@ -187,20 +188,21 @@ bool MQTTConnect_prepareClient(controllerIndex_t controller_idx) { } if (MQTTclient.connected()) { - #if FEATURE_MQTT_CONNECT_BACKGROUND +# if FEATURE_MQTT_CONNECT_BACKGROUND + if (MQTT_task_data.status != MQTT_connect_status_e::Connecting) { MQTT_task_data.status = MQTT_connect_status_e::Disconnected; } - #endif // if FEATURE_MQTT_CONNECT_BACKGROUND +# endif // if FEATURE_MQTT_CONNECT_BACKGROUND MQTTclient.disconnect(); - # if FEATURE_MQTT_TLS +# if FEATURE_MQTT_TLS if (mqtt_tls != nullptr) { delete mqtt_tls; mqtt_tls = nullptr; } mqtt_rootCA.clear(); - # endif // if FEATURE_MQTT_TLS +# endif // if FEATURE_MQTT_TLS } updateMQTTclient_connected(); @@ -211,17 +213,15 @@ bool MQTTConnect_prepareClient(controllerIndex_t controller_idx) { uint16_t mqttPort = ControllerSettings->Port; - mqtt_tls_last_errorstr.clear(); - mqtt_tls_last_error = 0; const TLS_types TLS_type = ControllerSettings->TLStype(); if ((TLS_type != TLS_types::NoTLS) && (nullptr == mqtt_tls)) { # ifdef ESP32 - # if MQTT_MAX_PACKET_SIZE > 2000 +# if MQTT_MAX_PACKET_SIZE > 2000 mqtt_tls = new BearSSL::WiFiClientSecure_light(4096, 4096); - # else // if MQTT_MAX_PACKET_SIZE > 2000 +# else // if MQTT_MAX_PACKET_SIZE > 2000 mqtt_tls = new BearSSL::WiFiClientSecure_light(2048, 2048); - # endif // if MQTT_MAX_PACKET_SIZE > 2000 +# endif // if MQTT_MAX_PACKET_SIZE > 2000 # else // ESP32 - ESP8266 mqtt_tls = new BearSSL::WiFiClientSecure_light(1024, 1024); # endif // ifdef ESP32 @@ -235,9 +235,12 @@ bool MQTTConnect_prepareClient(controllerIndex_t controller_idx) { mqtt_tls->setUtcTime_fcn(getUnixTime); mqtt_tls->setCfgTime_fcn(get_build_unixtime); } + mqtt_tls_last_errorstr.clear(); + mqtt_tls_last_error = 0; } - switch (TLS_type) { + switch (TLS_type) + { case TLS_types::NoTLS: { // Ignoring the ACK from the server is probably set for a reason. @@ -247,15 +250,15 @@ bool MQTTConnect_prepareClient(controllerIndex_t controller_idx) { const uint32_t timeout = ControllerSettings->getSuggestedTimeout(Settings.Protocol[controller_idx]); - # ifdef MUSTFIX_CLIENT_TIMEOUT_IN_SECONDS +# ifdef MUSTFIX_CLIENT_TIMEOUT_IN_SECONDS // See: https://github.com/espressif/arduino-esp32/pull/6676 mqtt.setTimeout((timeout + 500) / 1000); // in seconds!!!! Client *pClient = &mqtt; pClient->setTimeout(timeout); - # else // ifdef MUSTFIX_CLIENT_TIMEOUT_IN_SECONDS +# else // ifdef MUSTFIX_CLIENT_TIMEOUT_IN_SECONDS mqtt.setTimeout(timeout); // in msec as it should be! - # endif // ifdef MUSTFIX_CLIENT_TIMEOUT_IN_SECONDS +# endif // ifdef MUSTFIX_CLIENT_TIMEOUT_IN_SECONDS MQTTclient.setClient(mqtt); MQTTclient.setKeepAlive(ControllerSettings->KeepAliveTime ? ControllerSettings->KeepAliveTime : CONTROLLER_KEEP_ALIVE_TIME_DFLT); MQTTclient.setSocketTimeout(timeout); @@ -281,10 +284,10 @@ bool MQTTConnect_prepareClient(controllerIndex_t controller_idx) { LoadCertificate(ControllerSettings->getCertificateFilename(), mqtt_rootCA); if (mqtt_rootCA.isEmpty()) { - // Fingerprint must be of some minimal length to continue. - mqtt_tls_last_errorstr = F("MQTT : No TLS root CA"); - addLog(LOG_LEVEL_ERROR, mqtt_tls_last_errorstr); - return false; + // Fingerprint must be of some minimal length to continue. + mqtt_tls_last_errorstr = F("MQTT : No TLS root CA"); + addLog(LOG_LEVEL_ERROR, mqtt_tls_last_errorstr); + return false; } @@ -346,7 +349,15 @@ bool MQTTConnect_prepareClient(controllerIndex_t controller_idx) { // This way, we always need the set amount of timeout to handle the request. // Thus we should not make the timeout dynamic here if set to ignore ack. const uint32_t timeout = ControllerSettings->getSuggestedTimeout(Settings.Protocol[controller_idx]); - + + if (mqtt_tls_last_error == 296) { + // in this special case of cipher mismatch, we force enable ECDSA + // this would be the case for newer letsencrypt certificates now defaulting + // to EC certificates requiring ECDSA instead of RSA + mqtt_tls->setECDSA(true); + addLog(LOG_LEVEL_INFO, F("MQTT : TLS now enabling ECDSA")); + } + # ifdef MUSTFIX_CLIENT_TIMEOUT_IN_SECONDS @@ -360,7 +371,7 @@ bool MQTTConnect_prepareClient(controllerIndex_t controller_idx) { # ifdef ESP8266 mqtt_tls->setBufferSizes(1024, 1024); - # endif // ifdef ESP8266 +# endif // ifdef ESP8266 MQTTclient.setClient(*mqtt_tls); MQTTclient.setKeepAlive(ControllerSettings->KeepAliveTime ? ControllerSettings->KeepAliveTime : CONTROLLER_KEEP_ALIVE_TIME_DFLT); MQTTclient.setSocketTimeout(timeout); @@ -399,22 +410,28 @@ bool MQTTConnect_prepareClient(controllerIndex_t controller_idx) { # endif // if FEATURE_MQTT_TLS if (ControllerSettings->UseDNS) { - #if !defined(BUILD_NO_DEBUG) && FEATURE_MQTT_CONNECT_BACKGROUND +# if !defined(BUILD_NO_DEBUG) && FEATURE_MQTT_CONNECT_BACKGROUND + if (loglevelActiveFor(LOG_LEVEL_INFO)) { addLog(LOG_LEVEL_INFO, strformat(F("MQTT : Connecting to: %s:%u"), ControllerSettings->getHost().c_str(), ControllerSettings->Port)); } - #endif // if !defined(BUILD_NO_DEBUG) && FEATURE_MQTT_CONNECT_BACKGROUND +# endif // if !defined(BUILD_NO_DEBUG) && FEATURE_MQTT_CONNECT_BACKGROUND MQTTclient.setServer(ControllerSettings->getHost().c_str(), ControllerSettings->Port); # if FEATURE_MQTT_TLS - if (mqtt_tls) - mqtt_tls->setDomainName(ControllerSettings->getHost().c_str()); -#endif - } else { - #if !defined(BUILD_NO_DEBUG) && FEATURE_MQTT_CONNECT_BACKGROUND - if (loglevelActiveFor(LOG_LEVEL_INFO)) { - addLog(LOG_LEVEL_INFO, strformat(F("MQTT : Connecting to: %s:%u"), ControllerSettings->getIP().toString().c_str(), ControllerSettings->Port)); + + if (mqtt_tls) { + mqtt_tls->setDomainName(ControllerSettings->getHost().c_str()); } - #endif // if !defined(BUILD_NO_DEBUG) && FEATURE_MQTT_CONNECT_BACKGROUND +# endif // if FEATURE_MQTT_TLS + } else { +# if !defined(BUILD_NO_DEBUG) && FEATURE_MQTT_CONNECT_BACKGROUND + + if (loglevelActiveFor(LOG_LEVEL_INFO)) { + addLog(LOG_LEVEL_INFO, strformat(F("MQTT : Connecting to: %s:%u"), + ControllerSettings->getIP().toString().c_str(), + ControllerSettings->Port)); + } +# endif // if !defined(BUILD_NO_DEBUG) && FEATURE_MQTT_CONNECT_BACKGROUND MQTTclient.setServer(ControllerSettings->getIP(), ControllerSettings->Port); } MQTTclient.setCallback(incoming_mqtt_callback); @@ -430,37 +447,41 @@ bool MQTTConnect_clientConnect(controllerIndex_t controller_idx) { MakeControllerSettings(ControllerSettings); // -V522 if (!AllocatedControllerSettings()) { - #ifndef BUILD_MINIMAL_OTA +# ifndef BUILD_MINIMAL_OTA addLog(LOG_LEVEL_ERROR, F("MQTT : Cannot connect, out of RAM")); - #endif +# endif return false; } LoadControllerSettings(controller_idx, *ControllerSettings); - bool MQTTresult = false; + bool MQTTresult = false; // MQTT needs a unique clientname to subscribe to broker const String clientid = getMQTTclientID(*ControllerSettings); - const String LWTTopic = getLWT_topic(*ControllerSettings); - const String LWTMessageDisconnect = getLWT_messageDisconnect(*ControllerSettings); - const uint8_t willQos = 0; - const bool willRetain = ControllerSettings->mqtt_willRetain() && ControllerSettings->mqtt_sendLWT(); + const String LWTTopic = getLWT_topic(*ControllerSettings); + const String LWTMessageDisconnect = getLWT_messageDisconnect(*ControllerSettings); + const uint8_t willQos = 0; + const bool willRetain = ControllerSettings->mqtt_willRetain() && ControllerSettings->mqtt_sendLWT(); + // As suggested here: https://github.com/knolleary/pubsubclient/issues/458#issuecomment-493875150 - const bool cleanSession = ControllerSettings->mqtt_cleanSession(); - const bool hasCredentials = hasControllerCredentialsSet(controller_idx, *ControllerSettings); + const bool cleanSession = ControllerSettings->mqtt_cleanSession(); + const bool hasCredentials = hasControllerCredentialsSet(controller_idx, *ControllerSettings); const uint64_t statisticsTimerStart(getMicros64()); + mqtt_tls_last_errorstr.clear(); + mqtt_tls_last_error = 0; + MQTTresult = - MQTTclient.connect(clientid.c_str(), - hasCredentials ? getControllerUser(controller_idx, *ControllerSettings).c_str() : nullptr, - hasCredentials ? getControllerPass(controller_idx, *ControllerSettings).c_str() : nullptr, - ControllerSettings->mqtt_sendLWT() ? LWTTopic.c_str() : nullptr, - willQos, - willRetain, - ControllerSettings->mqtt_sendLWT() ? LWTMessageDisconnect.c_str() : nullptr, - cleanSession); + MQTTclient.connect(clientid.c_str(), + hasCredentials ? getControllerUser(controller_idx, *ControllerSettings).c_str() : nullptr, + hasCredentials ? getControllerPass(controller_idx, *ControllerSettings).c_str() : nullptr, + ControllerSettings->mqtt_sendLWT() ? LWTTopic.c_str() : nullptr, + willQos, + willRetain, + ControllerSettings->mqtt_sendLWT() ? LWTMessageDisconnect.c_str() : nullptr, + cleanSession); delay(0); count_connection_results( @@ -476,9 +497,9 @@ bool MQTTConnect_wrapUpConnect(controllerIndex_t controller_idx, bool MQTTresult MakeControllerSettings(ControllerSettings); // -V522 if (!AllocatedControllerSettings()) { - #ifndef BUILD_MINIMAL_OTA +# ifndef BUILD_MINIMAL_OTA addLog(LOG_LEVEL_ERROR, F("MQTT : Cannot connect, out of RAM")); - #endif +# endif return false; } LoadControllerSettings(controller_idx, *ControllerSettings); @@ -487,25 +508,41 @@ bool MQTTConnect_wrapUpConnect(controllerIndex_t controller_idx, bool MQTTresult const String LWTTopic = getLWT_topic(*ControllerSettings); const bool willRetain = ControllerSettings->mqtt_willRetain() && ControllerSettings->mqtt_sendLWT(); - # if FEATURE_MQTT_TLS +# if FEATURE_MQTT_TLS const TLS_types TLS_type = ControllerSettings->TLStype(); if (mqtt_tls != nullptr) { - # ifdef ESP32 +# ifdef ESP32 mqtt_tls_last_error = mqtt_tls->getLastError(); mqtt_tls->clearLastError(); - # endif // ifdef ESP32 + mqtt_tls_last_cipher_suite = mqtt_tls->getLastCipherSuite(); +# endif // ifdef ESP32 + // mqtt_tls_last_errorstr = buf; - if (mqtt_tls_last_error == ERR_OOM) mqtt_tls_last_errorstr = F("OutOfMemory"); - if (mqtt_tls_last_error == ERR_CANT_RESOLVE_IP) mqtt_tls_last_errorstr = F("Can't resolve IP"); - if (mqtt_tls_last_error == ERR_TCP_CONNECT) mqtt_tls_last_errorstr = F("TCP Connect error"); -// if (mqtt_tls_last_error == ERR_MISSING_CA) mqtt_tls_last_errorstr = F("Missing CA"); - if (mqtt_tls_last_error == ERR_TLS_TIMEOUT) mqtt_tls_last_errorstr = F("TLS Timeout"); + if (mqtt_tls_last_error == ERR_OOM) { mqtt_tls_last_errorstr = F("OutOfMemory"); } + + if (mqtt_tls_last_error == ERR_CANT_RESOLVE_IP) { mqtt_tls_last_errorstr = F("Can't resolve IP"); } + + if (mqtt_tls_last_error == ERR_TCP_CONNECT) { mqtt_tls_last_errorstr = F("TCP Connect error"); } + + // if (mqtt_tls_last_error == ERR_MISSING_CA) mqtt_tls_last_errorstr = F("Missing CA"); + if (mqtt_tls_last_error == ERR_TLS_TIMEOUT) { mqtt_tls_last_errorstr = F("TLS Timeout"); } + +# ifndef BUILD_NO_DEBUG + + if (BR_TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256 == mqtt_tls_last_cipher_suite) { + addLog(LOG_LEVEL_DEBUG, F("TLS cipher suite: ECDHE_RSA_AES_128_GCM_SHA256")); + } else if (BR_TLS_ECDHE_ECDSA_WITH_AES_128_GCM_SHA256 == mqtt_tls_last_cipher_suite) { + addLog(LOG_LEVEL_DEBUG, F("TLS cipher suite: ECDHE_ECDSA_AES_128_GCM_SHA256")); + } else if (0 != mqtt_tls_last_cipher_suite) { + addLog(LOG_LEVEL_DEBUG, strformat(F("TLS cipher suite: 0x%04X"), mqtt_tls_last_cipher_suite)); + } +# endif // ifndef BUILD_NO_DEBUG } - # ifdef ESP32 +# ifdef ESP32 // FIXME TD-er: There seems to be no verify function in BearSSL used on ESP8266 if (TLS_type == TLS_types::TLS_FINGERPRINT) @@ -538,23 +575,23 @@ bool MQTTConnect_wrapUpConnect(controllerIndex_t controller_idx, bool MQTTresult /* if (mqtt_tls != nullptr) { if (!mqtt_tls->verify( - fp.c_str(), - dn.isEmpty() ? nullptr : dn.c_str())) + fp.c_str(), + dn.isEmpty() ? nullptr : dn.c_str())) { - mqtt_tls_last_errorstr += F("TLS Fingerprint does not match"); - addLog(LOG_LEVEL_INFO, mqtt_fingerprint); - MQTTresult = false; + mqtt_tls_last_errorstr += F("TLS Fingerprint does not match"); + addLog(LOG_LEVEL_INFO, mqtt_fingerprint); + MQTTresult = false; } } */ } } - # endif // ifdef ESP32 +# endif // ifdef ESP32 - # endif // if FEATURE_MQTT_TLS +# endif // if FEATURE_MQTT_TLS if (!MQTTresult) { - # if FEATURE_MQTT_TLS +# if FEATURE_MQTT_TLS if ((mqtt_tls_last_error != 0) && loglevelActiveFor(LOG_LEVEL_ERROR)) { String log = F("MQTT : TLS error code: "); @@ -563,20 +600,21 @@ bool MQTTConnect_wrapUpConnect(controllerIndex_t controller_idx, bool MQTTresult log += mqtt_tls_last_errorstr; addLog(LOG_LEVEL_ERROR, log); } - # endif // if FEATURE_MQTT_TLS +# endif // if FEATURE_MQTT_TLS + +# if FEATURE_MQTT_CONNECT_BACKGROUND - #if FEATURE_MQTT_CONNECT_BACKGROUND if (MQTT_task_data.status != MQTT_connect_status_e::Connecting) { MQTT_task_data.status = MQTT_connect_status_e::Disconnected; } - #endif // if FEATURE_MQTT_CONNECT_BACKGROUND +# endif // if FEATURE_MQTT_CONNECT_BACKGROUND MQTTclient.disconnect(); - # if FEATURE_MQTT_TLS +# if FEATURE_MQTT_TLS if (mqtt_tls != nullptr) { mqtt_tls->stop(); } - # endif // if FEATURE_MQTT_TLS +# endif // if FEATURE_MQTT_TLS updateMQTTclient_connected(); @@ -588,8 +626,8 @@ bool MQTTConnect_wrapUpConnect(controllerIndex_t controller_idx, bool MQTTresult addLogMove(LOG_LEVEL_INFO, concat(F("MQTT : Connected to broker with client ID: "), clientid)); } - # if FEATURE_MQTT_TLS - # ifdef ESP32 +# if FEATURE_MQTT_TLS +# ifdef ESP32 // FIXME TD-er: Must get certificate info @@ -604,17 +642,17 @@ bool MQTTConnect_wrapUpConnect(controllerIndex_t controller_idx, bool MQTTresult addLogMove(LOG_LEVEL_INFO, log); } */ - # endif // ifdef ESP32 - # endif // if FEATURE_MQTT_TLS +# endif // ifdef ESP32 +# endif // if FEATURE_MQTT_TLS MQTTparseSystemVariablesAndSubscribe(String(ControllerSettings->Subscribe)); - # if FEATURE_MQTT_DISCOVER +# if FEATURE_MQTT_DISCOVER if (ControllerSettings->mqtt_autoDiscovery()) { MQTTparseSystemVariablesAndSubscribe(String(ControllerSettings->MqttAutoDiscoveryTrigger)); } - # endif // if FEATURE_MQTT_DISCOVER +# endif // if FEATURE_MQTT_DISCOVER updateMQTTclient_connected(); statusLED(true); @@ -649,7 +687,7 @@ bool MQTTConnect(controllerIndex_t controller_idx) if (!MQTTConnect_prepareClient(controller_idx)) { return false; } - + bool MQTTresult = MQTTConnect_clientConnect(controller_idx); return MQTTConnect_wrapUpConnect(controller_idx, MQTTresult); @@ -663,10 +701,11 @@ void MQTTparseSystemVariablesAndSubscribe(String subscribeTo) { if (!subscribeTo.isEmpty()) { MQTTclient.subscribe(subscribeTo.c_str()); # ifndef BUILD_NO_DEBUG + if (loglevelActiveFor(LOG_LEVEL_INFO)) { addLogMove(LOG_LEVEL_INFO, concat(F("MQTT : Subscribed to: "), subscribeTo)); } -#endif +# endif // ifndef BUILD_NO_DEBUG } } @@ -680,8 +719,8 @@ String getMQTTclientID(const ControllerSettingsStruct& ControllerSettings) { parseSystemVariables(clientid, false); clientid.replace(' ', '_'); // Make sure no spaces are present in the client ID - if (// (WiFiEventData.wifi_reconnects >= 1) && - ControllerSettings.mqtt_uniqueMQTTclientIdReconnect()) { + if ( // (WiFiEventData.wifi_reconnects >= 1) && + ControllerSettings.mqtt_uniqueMQTTclientIdReconnect()) { // Work-around for 'lost connections' to the MQTT broker. // If the broker thinks the connection is still alive, a reconnect from the // client will be refused. @@ -689,12 +728,13 @@ String getMQTTclientID(const ControllerSettingsStruct& ControllerSettings) { // make it different from the previous one. static int id{}; clientid += '_'; - clientid += ++id; //WiFiEventData.wifi_reconnects; + clientid += ++id; // WiFiEventData.wifi_reconnects; } return clientid; } -#if FEATURE_MQTT_CONNECT_BACKGROUND +# if FEATURE_MQTT_CONNECT_BACKGROUND + void MQTT_execute_connect_task(void *parameter) { MQTT_connect_request*MQTT_task_data = static_cast(parameter); @@ -707,18 +747,20 @@ void MQTT_execute_connect_task(void *parameter) !MQTTclient.connected()) { const TickType_t xDelay = timeout / portTICK_PERIOD_MS; vTaskDelay(xDelay); // Use regular controller timeout also for delay between connection attempts (range 10..4000) + if (incr > 0) { - timeout += 100; // Increment next few (5) times with 100 msec + timeout += 100; // Increment next few (5) times with 100 msec incr--; } + if (timePassedSince(MQTT_task_data->startTime) > 120000) { // Quit after 120 seconds break; } } - MQTT_task_data->result = MQTTclient.connected(); - MQTT_task_data->status = MQTT_task_data->result - ? MQTT_connect_status_e::Connected - : MQTT_connect_status_e::Failure; + MQTT_task_data->result = MQTTclient.connected(); + MQTT_task_data->status = MQTT_task_data->result +? MQTT_connect_status_e::Connected +: MQTT_connect_status_e::Failure; MQTT_task_data->endTime = millis(); MQTT_task_data->taskHandle = NULL; vTaskDelete(MQTT_task_data->taskHandle); @@ -736,12 +778,12 @@ bool MQTTConnectInBackground(controllerIndex_t controller_idx, bool reportOnly) addLog(LOG_LEVEL_INFO, strformat(F("MQTT : Background Connect request %s, took %d msec"), FsP(MQTT_task_data.result ? F("success") : F("FAILED")), MQTT_task_data.endTime - MQTT_task_data.startTime - )); + )); } return result && MQTT_task_data.result; } - + if ((MQTT_task_data.status == MQTT_connect_status_e::Ready) && MQTTclient.connected()) { if (!MQTT_task_data.logged && loglevelActiveFor(LOG_LEVEL_INFO)) { addLog(LOG_LEVEL_INFO, F("MQTT : Background Connect request Ready")); @@ -755,7 +797,7 @@ bool MQTTConnectInBackground(controllerIndex_t controller_idx, bool reportOnly) if (loglevelActiveFor(LOG_LEVEL_INFO)) { addLog(LOG_LEVEL_INFO, strformat(F("MQTT : Background waiting to Connect, %d sec"), timePassedSince(MQTT_task_data.startTime) / 1000 - )); + )); } MQTT_task_data.loopTime = millis(); } @@ -764,9 +806,10 @@ bool MQTTConnectInBackground(controllerIndex_t controller_idx, bool reportOnly) if ((MQTT_task_data.status == MQTT_connect_status_e::Ready) && !MQTTclient.connected() && - NetworkConnected(10)) { // Unexpected network disconnect and reconnect? + NetworkConnected(10)) { // Unexpected network disconnect and reconnect? MQTT_task_data.status = MQTT_connect_status_e::Disconnected; reportOnly = false; // Reconnect ASAP + if (CONTROLLER_MAX == controller_idx) { controller_idx = firstEnabledMQTT_ControllerIndex(); } @@ -782,22 +825,22 @@ bool MQTTConnectInBackground(controllerIndex_t controller_idx, bool reportOnly) if (loglevelActiveFor(LOG_LEVEL_INFO)) { addLog(LOG_LEVEL_INFO, strformat(F("MQTT : Start background connect for controller %d"), controller_idx + 1)); } - MQTT_task_data.result = false; + MQTT_task_data.result = false; if (MQTTConnect_prepareClient(controller_idx)) { MakeControllerSettings(ControllerSettings); // -V522 if (!AllocatedControllerSettings()) { - #ifndef BUILD_MINIMAL_OTA +# ifndef BUILD_MINIMAL_OTA addLog(LOG_LEVEL_ERROR, F("MQTT : Cannot load Controller settings, out of RAM")); - #endif +# endif return false; } LoadControllerSettings(controller_idx, *ControllerSettings); uint32_t timeout = ControllerSettings->MustCheckReply - ? ControllerSettings->getSuggestedTimeout(Settings.Protocol[MQTT_task_data.ControllerIndex]) - : ControllerSettings->ClientTimeout; +? ControllerSettings->getSuggestedTimeout(Settings.Protocol[MQTT_task_data.ControllerIndex]) +: ControllerSettings->ClientTimeout; MQTT_task_data.status = MQTT_connect_status_e::Connecting; MQTT_task_data.logged = false; @@ -807,13 +850,13 @@ bool MQTTConnectInBackground(controllerIndex_t controller_idx, bool reportOnly) MQTT_task_data.timeout = timeout; xTaskCreatePinnedToCore( - MQTT_execute_connect_task, // Function that should be called - "MQTTClient.connect()", // Name of the task (for debugging) - 8192, // Stack size (bytes) - &MQTT_task_data, // Parameter to pass - 1, // Task priority - &MQTT_task_data.taskHandle, // Task handle - xPortGetCoreID() // Core you want to run the task on (0 or 1) + MQTT_execute_connect_task, // Function that should be called + "MQTTClient.connect()", // Name of the task (for debugging) + 8192, // Stack size (bytes) + &MQTT_task_data, // Parameter to pass + 1, // Task priority + &MQTT_task_data.taskHandle, // Task handle + xPortGetCoreID() // Core you want to run the task on (0 or 1) ); } else { MQTT_task_data.status = MQTT_connect_status_e::Failure; @@ -821,7 +864,8 @@ bool MQTTConnectInBackground(controllerIndex_t controller_idx, bool reportOnly) } return false; } -#endif // if FEATURE_MQTT_CONNECT_BACKGROUND + +# endif // if FEATURE_MQTT_CONNECT_BACKGROUND /*********************************************************************************************\ * Check connection MQTT message broker @@ -858,7 +902,7 @@ bool MQTTCheck(controllerIndex_t controller_idx) #ifdef USES_ESPEASY_NOW if (!MQTTclient.connected()) { if (ControllerSettings->enableESPEasyNowFallback()) { - return true; + return true; } } #endif @@ -878,11 +922,12 @@ bool MQTTCheck(controllerIndex_t controller_idx) if (MQTTclient_should_reconnect || !MQTTclient.connected()) { - #if FEATURE_MQTT_CONNECT_BACKGROUND +# if FEATURE_MQTT_CONNECT_BACKGROUND + if (Settings.MQTTConnectInBackground()) { return MQTTConnectInBackground(controller_idx, false); } - #endif // ifdef ESP32 +# endif // ifdef ESP32 return MQTTConnect(controller_idx); } @@ -960,7 +1005,8 @@ void SendStatusOnlyIfNeeded(struct EventStruct *event, bool param1, uint32_t key bool SourceNeedsStatusUpdate(EventValueSource::Enum eventSource) { - switch (eventSource) { + switch (eventSource) + { case EventValueSource::Enum::VALUE_SOURCE_HTTP: case EventValueSource::Enum::VALUE_SOURCE_SERIAL: case EventValueSource::Enum::VALUE_SOURCE_MQTT: @@ -973,10 +1019,7 @@ bool SourceNeedsStatusUpdate(EventValueSource::Enum eventSource) return false; } -void SendStatus(struct EventStruct *event, const __FlashStringHelper *status) -{ - SendStatus(event, String(status)); -} +void SendStatus(struct EventStruct *event, const __FlashStringHelper *status) { SendStatus(event, String(status)); } void SendStatus(struct EventStruct *event, const String& status) { @@ -1006,6 +1049,7 @@ void SendStatus(struct EventStruct *event, const String& status) } #if FEATURE_MQTT + controllerIndex_t firstEnabledMQTT_ControllerIndex() { for (controllerIndex_t i = 0; i < CONTROLLER_MAX; ++i) { protocolIndex_t ProtocolIndex = getProtocolIndex_from_ControllerIndex(i); @@ -1048,11 +1092,12 @@ bool MQTTpublish(controllerIndex_t controller_idx, } String topic_str; String payload_str; + if (!reserve_special(topic_str, strlen_P(topic)) || !reserve_special(payload_str, strlen_P(payload))) { return false; } - topic_str = topic; + topic_str = topic; payload_str = payload; bool success = false; @@ -1065,7 +1110,7 @@ bool MQTTpublish(controllerIndex_t controller_idx, MQTTDelayHandler->addToQueue( std::unique_ptr( new (ptr) MQTT_queue_element( - controller_idx, taskIndex, + controller_idx, taskIndex, std::move(topic_str), std::move(payload_str), retained, callbackTask))); @@ -1095,7 +1140,7 @@ bool MQTTpublish(controllerIndex_t controller_idx, void *ptr = special_calloc(1, size); if (ptr != nullptr) { - success = + success = MQTTDelayHandler->addToQueue( std::unique_ptr( new (ptr) MQTT_queue_element( @@ -1155,9 +1200,10 @@ void MQTTStatus(struct EventStruct *event, const String& status) } # if FEATURE_MQTT_TLS + bool GetTLSfingerprint(String& fp) { - # ifdef ESP32 +# ifdef ESP32 if (MQTTclient_connected && (mqtt_tls != nullptr)) { const uint8_t *recv_fingerprint = mqtt_tls->getRecvPubKeyFingerprint(); @@ -1168,7 +1214,8 @@ bool GetTLSfingerprint(String& fp) for (size_t i = 0; i < 21; ++i) { const String tmp(recv_fingerprint[i], HEX); - switch (tmp.length()) { + switch (tmp.length()) + { case 0: fp += '0'; @@ -1183,13 +1230,13 @@ bool GetTLSfingerprint(String& fp) return true; } } - # endif // ifdef ESP32 +# endif // ifdef ESP32 return false; } bool GetTLS_Certificate(String& cert, bool caRoot) { - # ifdef ESP32 +# ifdef ESP32 // FIXME TD-er: Implement retrieval of certificate @@ -1199,11 +1246,11 @@ bool GetTLS_Certificate(String& cert, bool caRoot) String subject; if (mqtt_tls->getPeerCertificate(cert, subject, caRoot) == 0) { - return true; + return true; } } */ - # endif // ifdef ESP32 +# endif // ifdef ESP32 return false; } @@ -1211,28 +1258,24 @@ bool GetTLS_Certificate(String& cert, bool caRoot) #endif // if FEATURE_MQTT - /*********************************************************************************************\ * send specific sensor task data, effectively calling PluginCall(PLUGIN_READ...) \*********************************************************************************************/ -void SensorSendTask(struct EventStruct *event, unsigned long timestampUnixTime) -{ - SensorSendTask(event, timestampUnixTime, millis()); -} +void SensorSendTask(struct EventStruct *event, unsigned long timestampUnixTime) { SensorSendTask(event, timestampUnixTime, millis()); } void SensorSendTask(struct EventStruct *event, unsigned long timestampUnixTime, unsigned long lasttimer) { - if (!validTaskIndex(event->TaskIndex)) { - return; + if (!validTaskIndex(event->TaskIndex)) { + return; } // FIXME TD-er: Should a 'disabled' task be rescheduled? // If not, then it should be rescheduled after the check to see if it is enabled. Scheduler.reschedule_task_device_timer(event->TaskIndex, lasttimer); - #ifndef BUILD_NO_RAM_TRACKER +#ifndef BUILD_NO_RAM_TRACKER checkRAM(F("SensorSendTask")); - #endif // ifndef BUILD_NO_RAM_TRACKER +#endif // ifndef BUILD_NO_RAM_TRACKER if (Settings.TaskDeviceEnabled[event->TaskIndex]) { diff --git a/src/src/Globals/MQTT.cpp b/src/src/Globals/MQTT.cpp index b85e33a92..123a045ba 100644 --- a/src/src/Globals/MQTT.cpp +++ b/src/src/Globals/MQTT.cpp @@ -17,6 +17,7 @@ BearSSL::WiFiClientSecure_light*mqtt_tls{}; BearSSL::WiFiClientSecure*mqtt_tls; BearSSL::X509List mqtt_X509List; # endif // ifdef ESP8266 +int32_t mqtt_tls_last_cipher_suite{}; String mqtt_rootCA; String mqtt_fingerprint; # endif // if FEATURE_MQTT_TLS diff --git a/src/src/Globals/MQTT.h b/src/src/Globals/MQTT.h index fab3ea2a7..da293c6d1 100644 --- a/src/src/Globals/MQTT.h +++ b/src/src/Globals/MQTT.h @@ -49,6 +49,7 @@ extern WiFiClient mqtt; extern String mqtt_tls_last_errorstr; extern int32_t mqtt_tls_last_error; extern BearSSL::WiFiClientSecure_light*mqtt_tls; +extern int32_t mqtt_tls_last_cipher_suite; // extern BearSSL::X509List mqtt_X509List; From cf7a400a6d8aded4b34cf89457e985f5d132206b Mon Sep 17 00:00:00 2001 From: TD-er Date: Sun, 12 Oct 2025 17:52:34 +0200 Subject: [PATCH 365/564] [Provision] Add option to store (WiFi) credentials to separate file --- .../net/Helpers/WiFi_AP_CandidatesList.cpp | 74 ++++++---- .../net/Helpers/WiFi_AP_CandidatesList.h | 3 + src/ESPEasy/net/_NW001_WiFi_STA.cpp | 28 +++- src/_P002_ADC.ino | 2 - src/src/Commands/Provisioning.cpp | 8 ++ src/src/Commands/Provisioning.h | 4 + src/src/CustomBuild/StorageLayout.h | 7 +- src/src/CustomBuild/define_plugin_sets.h | 16 +++ src/src/DataStructs/FactoryDefaultPref.h | 14 +- src/src/DataStructs/ProvisioningStruct.cpp | 7 + src/src/DataStructs/ProvisioningStruct.h | 3 +- src/src/DataStructs/SecurityStruct.cpp | 2 + src/src/DataStructs/SecurityStruct.h | 1 + .../SecurityStruct_deviceSpecific.cpp | 106 ++++++++++++++ .../SecurityStruct_deviceSpecific.h | 131 ++++++++++++++++++ src/src/DataTypes/ESPEasyFileType.cpp | 9 ++ src/src/DataTypes/ESPEasyFileType.h | 4 +- .../ESPEasy_key_value_store_4byte_data.cpp | 4 +- .../ESPEasy_key_value_store_8byte_data.cpp | 4 +- .../DataTypes/ESPEasy_key_value_store_data.h | 4 +- src/src/DataTypes/SettingsType.cpp | 30 ++++ src/src/DataTypes/SettingsType.h | 7 +- src/src/Globals/SecuritySettings.cpp | 6 +- src/src/Globals/SecuritySettings.h | 7 +- src/src/Helpers/ESPEasy_Storage.cpp | 10 ++ src/src/Helpers/_CPlugin_Helper.cpp | 4 + src/src/Helpers/_ESPEasy_key_value_store.cpp | 30 +++- src/src/Helpers/_ESPEasy_key_value_store.h | 9 +- src/src/WebServer/DownloadPage.cpp | 23 ++- .../ESPEasy_key_value_store_webform.cpp | 67 +++++---- .../ESPEasy_key_value_store_webform.h | 5 +- src/src/WebServer/Markup_Forms.cpp | 14 +- src/src/WebServer/Markup_Forms.h | 3 + .../SecurityStruct_deviceSpecific_webform.cpp | 86 ++++++++++++ .../SecurityStruct_deviceSpecific_webform.h | 17 +++ src/src/WebServer/SettingsArchive.cpp | 3 + src/src/WebServer/SetupPage.cpp | 3 + 37 files changed, 677 insertions(+), 78 deletions(-) create mode 100644 src/src/DataStructs/SecurityStruct_deviceSpecific.cpp create mode 100644 src/src/DataStructs/SecurityStruct_deviceSpecific.h create mode 100644 src/src/WebServer/SecurityStruct_deviceSpecific_webform.cpp create mode 100644 src/src/WebServer/SecurityStruct_deviceSpecific_webform.h diff --git a/src/ESPEasy/net/Helpers/WiFi_AP_CandidatesList.cpp b/src/ESPEasy/net/Helpers/WiFi_AP_CandidatesList.cpp index 8821d42b9..26d87fa43 100644 --- a/src/ESPEasy/net/Helpers/WiFi_AP_CandidatesList.cpp +++ b/src/ESPEasy/net/Helpers/WiFi_AP_CandidatesList.cpp @@ -30,6 +30,12 @@ namespace wifi { # define WIFI_CUSTOM_DEPLOYMENT_KEY_INDEX 3 # define WIFI_CUSTOM_SUPPORT_KEY_INDEX 4 # define WIFI_CREDENTIALS_FALLBACK_SSID_INDEX 5 +# if FEATURE_STORE_CREDENTIALS_SEPARATE_FILE +# define WIFI_CREDENTIALs_SEPARATE_FILE_FIRST_INDEX 6 +# define WIFI_CREDENTIALS_MAX_INDEX (WIFI_CREDENTIALs_SEPARATE_FILE_FIRST_INDEX + MAX_EXTRA_WIFI_CREDENTIALS_SEPARATE_FILE) +# else // if FEATURE_STORE_CREDENTIALS_SEPARATE_FILE +# define WIFI_CREDENTIALS_MAX_INDEX 6 +# endif // if FEATURE_STORE_CREDENTIALS_SEPARATE_FILE static LongTermOnOffTimer _last_scan; @@ -62,12 +68,11 @@ void WiFi_AP_CandidatesList::load_knownCredentials() { { // Add the known SSIDs - String ssid; uint8_t index = 1; // Index 0 is the "unset" value - bool done = false; + for (; index < WIFI_CREDENTIALS_MAX_INDEX; ++index) { + String ssid; - while (!done) { if (get_SSID(index, ssid)) { // Make sure emplace_back is not done on the 2nd heap # ifdef USE_SECOND_HEAP @@ -84,12 +89,6 @@ void WiFi_AP_CandidatesList::load_knownCredentials() { } } ++index; - } else { - if (SettingsIndexMatchCustomCredentials(index)) { - ++index; - } else { - done = true; - } } } } @@ -128,21 +127,21 @@ void WiFi_AP_CandidatesList::purge_expired() { } void WiFi_AP_CandidatesList::process_WiFiscan() { -// if (_last_scan.isOn()) { - // Append or update found APs from scan. - int scancount = WiFi.scanComplete(); - if (scancount < 0) { + // if (_last_scan.isOn()) { + // Append or update found APs from scan. + int scancount = WiFi.scanComplete(); - } else { - for (int i = 0; i < scancount; ++i) { - const WiFi_AP_Candidate tmp(i); + if (scancount < 0) {} else { + for (int i = 0; i < scancount; ++i) { + const WiFi_AP_Candidate tmp(i); - scanned_new.push_back(tmp); - } - - after_process_WiFiscan(); + scanned_new.push_back(tmp); } -// } + + after_process_WiFiscan(); + } + + // } } void WiFi_AP_CandidatesList::after_process_WiFiscan() { @@ -262,10 +261,11 @@ void WiFi_AP_CandidatesList::markCurrentConnectionStable() { } int8_t WiFi_AP_CandidatesList::scanComplete() const { -// if (!_last_scan.isOn() || -// (_last_scan.getLastOnDuration_ms() > WIFI_AP_CANDIDATE_MAX_AGE)) return -3; + // if (!_last_scan.isOn() || + // (_last_scan.getLastOnDuration_ms() > WIFI_AP_CANDIDATE_MAX_AGE)) return -3; const int8_t scanCompleteStatus = WiFi.scanComplete(); + if (scanCompleteStatus == -1) { // Still scanning return scanCompleteStatus; @@ -303,6 +303,16 @@ bool WiFi_AP_CandidatesList::SettingsIndexMatchCustomCredentials(uint8_t index) bool WiFi_AP_CandidatesList::SettingsIndexMatchEmergencyFallback(uint8_t index) { return WIFI_CREDENTIALS_FALLBACK_SSID_INDEX == index; } +# if FEATURE_STORE_CREDENTIALS_SEPARATE_FILE + +bool WiFi_AP_CandidatesList::SettingsIndexMatchCredentialsSeparateFile(uint8_t index) +{ + return index >= WIFI_CREDENTIALs_SEPARATE_FILE_FIRST_INDEX && + index < WIFI_CREDENTIALS_MAX_INDEX; +} + +# endif // if FEATURE_STORE_CREDENTIALS_SEPARATE_FILE + void WiFi_AP_CandidatesList::loadCandidatesFromScanned() { // Make sure list operations are not done on the 2nd heap # ifdef USE_SECOND_HEAP @@ -517,6 +527,9 @@ void WiFi_AP_CandidatesList::purge_unusable() { } bool WiFi_AP_CandidatesList::get_SSID_key(uint8_t index, String& ssid, String& key) { + ssid.clear(); + key.clear(); + switch (index) { case 1: @@ -562,15 +575,22 @@ bool WiFi_AP_CandidatesList::get_SSID_key(uint8_t index, String& ssid, String& k # endif // if !defined(CUSTOM_EMERGENCY_FALLBACK_SSID) || !defined(CUSTOM_EMERGENCY_FALLBACK_KEY) break; } - default: - return false; + default: break; } - // TODO TD-er: Read other credentials from extra file. +# if FEATURE_STORE_CREDENTIALS_SEPARATE_FILE + if (SettingsIndexMatchCredentialsSeparateFile(index)) + { + return SecuritySettings_deviceSpecific.getWiFiCredentials( + index - WIFI_CREDENTIALs_SEPARATE_FILE_FIRST_INDEX, + ssid, + key); + } +# endif // if FEATURE_STORE_CREDENTIALS_SEPARATE_FILE // Spaces are allowed in both SSID and pass phrase, so make sure to not trim the ssid and key. - return true; + return !ssid.isEmpty() && key.length() >= 8; } bool WiFi_AP_CandidatesList::get_SSID(uint8_t index, String& ssid) diff --git a/src/ESPEasy/net/Helpers/WiFi_AP_CandidatesList.h b/src/ESPEasy/net/Helpers/WiFi_AP_CandidatesList.h index 51c619e06..eca8fae3b 100644 --- a/src/ESPEasy/net/Helpers/WiFi_AP_CandidatesList.h +++ b/src/ESPEasy/net/Helpers/WiFi_AP_CandidatesList.h @@ -78,6 +78,9 @@ struct WiFi_AP_CandidatesList { static bool SettingsIndexMatchCustomCredentials(uint8_t index); static bool SettingsIndexMatchEmergencyFallback(uint8_t index); +#if FEATURE_STORE_CREDENTIALS_SEPARATE_FILE + static bool SettingsIndexMatchCredentialsSeparateFile(uint8_t index); +#endif private: diff --git a/src/ESPEasy/net/_NW001_WiFi_STA.cpp b/src/ESPEasy/net/_NW001_WiFi_STA.cpp index 22ebaade2..d4151bda2 100644 --- a/src/ESPEasy/net/_NW001_WiFi_STA.cpp +++ b/src/ESPEasy/net/_NW001_WiFi_STA.cpp @@ -33,6 +33,11 @@ # include "../net/NWPluginStructs/NW001_data_struct_WiFi_STA.h" # include "../net/wifi/ESPEasyWifi.h" +#if FEATURE_STORE_CREDENTIALS_SEPARATE_FILE +# include "../../src/WebServer/SecurityStruct_deviceSpecific_webform.h" +#endif + + # ifdef ESP8266 # include "../net/Helpers/NWAccessControl.h" # endif @@ -278,6 +283,15 @@ bool NWPlugin_001(NWPlugin::Function function, EventStruct *event, String& strin strncpy_webserver_arg(SecuritySettings.WifiSSID2, F("ssid2")); copyFormPassword(F("key2"), SecuritySettings.WifiKey2, sizeof(SecuritySettings.WifiKey2)); +#if FEATURE_STORE_CREDENTIALS_SEPARATE_FILE + for (uint16_t i = 0; i < MAX_EXTRA_WIFI_CREDENTIALS_SEPARATE_FILE; ++i) { + store_SecurityStruct_deviceSpecific_WebFormItem( + SecurityStruct_deviceSpecific::KeyType::WiFi_SSID, i); + store_SecurityStruct_deviceSpecific_WebFormItem( + SecurityStruct_deviceSpecific::KeyType::WiFi_Password, i); + } +#endif + // Hidden SSID Settings.IncludeHiddenSSID(isFormItemChecked(LabelType::CONNECT_HIDDEN_SSID)); Settings.HiddenSSID_SlowConnectPerBSSID(isFormItemChecked(LabelType::HIDDEN_SSID_SLOW_CONNECT)); @@ -326,7 +340,7 @@ bool NWPlugin_001(NWPlugin::Function function, EventStruct *event, String& strin case NWPlugin::Function::NWPLUGIN_WEBFORM_LOAD: { - addFormSubHeader(F("Wifi Settings")); + addFormSubHeader(F("Wifi Credentials")); // TODO Add pin configuration for ESP32P4. // ESP32-C5 may use different SDIO pins. @@ -353,6 +367,18 @@ bool NWPlugin_001(NWPlugin::Function function, EventStruct *event, String& strin addFormPasswordBox(F("Fallback WPA Key"), F("key2"), SecuritySettings.WifiKey2, 63); addFormNote(F("WPA Key must be at least 8 characters long")); +#if FEATURE_STORE_CREDENTIALS_SEPARATE_FILE + addFormSubHeader(F("Wifi Credentials Extra")); + for (uint16_t i = 0; i < MAX_EXTRA_WIFI_CREDENTIALS_SEPARATE_FILE; ++i) { + show_SecurityStruct_deviceSpecific_WebFormItem( + SecurityStruct_deviceSpecific::KeyType::WiFi_SSID, i); + show_SecurityStruct_deviceSpecific_WebFormItem( + SecurityStruct_deviceSpecific::KeyType::WiFi_Password, i); + } + addFormNote(F("These credentials will be stored in a separate file: devsecurity.dat")); +#endif + addFormSubHeader(F("Wifi Settings")); + addFormCheckBox(LabelType::CONNECT_HIDDEN_SSID, Settings.IncludeHiddenSSID()); addFormCheckBox(LabelType::HIDDEN_SSID_SLOW_CONNECT, Settings.HiddenSSID_SlowConnectPerBSSID()); # ifdef ESP32 diff --git a/src/_P002_ADC.ino b/src/_P002_ADC.ino index 6475f9f9a..48920b6a6 100644 --- a/src/_P002_ADC.ino +++ b/src/_P002_ADC.ino @@ -157,8 +157,6 @@ boolean Plugin_002(uint8_t function, struct EventStruct *event, String& string) log += strformat(F(" (%u samples)"), P002_data->getOversamplingCount()); } addLogMove(LOG_LEVEL_INFO, log); - addLog(LOG_LEVEL_INFO, F("ADC : This is a long text to test if the flash string will be kept as flash string. This is now a 128 bytes long message.....")); - addLog(LOG_LEVEL_INFO, F("ADC : This is a long text to test if the flash string will be kept as flash string. This is now a 128 bytes long message.....")); } P002_data->reset(); success = true; diff --git a/src/src/Commands/Provisioning.cpp b/src/src/Commands/Provisioning.cpp index 0746d2478..1feaec561 100644 --- a/src/src/Commands/Provisioning.cpp +++ b/src/src/Commands/Provisioning.cpp @@ -60,6 +60,14 @@ String Command_Provisioning_Provision() return downloadFileType(FileType::PROVISIONING_DAT); } +#if FEATURE_STORE_CREDENTIALS_SEPARATE_FILE +String Command_Provisioning_DeviceSecurity() +{ + return downloadFileType(FileType::DEV_SECURITY_DAT); +} +#endif + + String Command_Provisioning_Rules(struct EventStruct *event) { if ((event->Par2 <= 0) || (event->Par2 > 4)) { diff --git a/src/src/Commands/Provisioning.h b/src/src/Commands/Provisioning.h index 99b504c1f..c7ebc3fd9 100644 --- a/src/src/Commands/Provisioning.h +++ b/src/src/Commands/Provisioning.h @@ -16,6 +16,10 @@ String Command_Provisioning_Notification(); # endif // if FEATURE_NOTIFIER String Command_Provisioning_Provision(); +#if FEATURE_STORE_CREDENTIALS_SEPARATE_FILE +String Command_Provisioning_DeviceSecurity(); +#endif + String Command_Provisioning_Rules(struct EventStruct *event); String Command_Provisioning_Firmware(struct EventStruct *event, diff --git a/src/src/CustomBuild/StorageLayout.h b/src/src/CustomBuild/StorageLayout.h index 6c10cb95f..b9958d6d9 100644 --- a/src/src/CustomBuild/StorageLayout.h +++ b/src/src/CustomBuild/StorageLayout.h @@ -233,7 +233,12 @@ # ifndef DAT_NETWORK_INTERFACES_OFFSET # define DAT_NETWORK_INTERFACES_OFFSET 16384 # endif // ifndef DAT_OFFSET_CUSTOM_CONTROLLER - + # ifndef DAT_OFFSET_DEV_CREDENTIALS + # define DAT_OFFSET_DEV_CREDENTIALS 0 + # endif + # ifndef DAT_DEV_CREDENTIALS_SIZE + # define DAT_DEV_CREDENTIALS_SIZE 4096 + # endif #endif // if defined(ESP32) diff --git a/src/src/CustomBuild/define_plugin_sets.h b/src/src/CustomBuild/define_plugin_sets.h index d8290d122..9f213b154 100644 --- a/src/src/CustomBuild/define_plugin_sets.h +++ b/src/src/CustomBuild/define_plugin_sets.h @@ -4184,6 +4184,22 @@ To create/register a plugin, you have to : # define FEATURE_STORE_NETWORK_INTERFACE_SETTINGS 0 #endif +#ifndef FEATURE_STORE_CREDENTIALS_SEPARATE_FILE +# ifdef ESP32 +# define FEATURE_STORE_CREDENTIALS_SEPARATE_FILE 1 +# endif +# ifdef ESP8266 +# define FEATURE_STORE_CREDENTIALS_SEPARATE_FILE 0 +# endif +#endif + +#if FEATURE_STORE_CREDENTIALS_SEPARATE_FILE || FEATURE_STORE_NETWORK_INTERFACE_SETTINGS +# ifdef FEATURE_ESPEASY_KEY_VALUE_STORE +# undef FEATURE_ESPEASY_KEY_VALUE_STORE +# endif +# define FEATURE_ESPEASY_KEY_VALUE_STORE 1 +#endif + #ifdef USES_P180 #ifdef FEATURE_BUS_COMMAND #undef FEATURE_BUS_COMMAND diff --git a/src/src/DataStructs/FactoryDefaultPref.h b/src/src/DataStructs/FactoryDefaultPref.h index 2188266af..cb0e23580 100644 --- a/src/src/DataStructs/FactoryDefaultPref.h +++ b/src/src/DataStructs/FactoryDefaultPref.h @@ -45,8 +45,9 @@ private: uint32_t storeCredentials : 1; uint32_t fetchProvisioningDat : 1; uint32_t keepCustomCdnUrl : 1; + uint32_t fetchDeviceSecurityDat : 1; - uint32_t unused : 5; + uint32_t unused : 4; } bits; uint32_t _preference{}; }; @@ -150,6 +151,17 @@ public: bits.fetchProvisioningDat = fetch; } +#if FEATURE_STORE_CREDENTIALS_SEPARATE_FILE + + bool fetchDeviceSecurityDat() const { + return bits.fetchDeviceSecurityDat; + } + + void fetchDeviceSecurityDat(bool fetch) { + bits.fetchDeviceSecurityDat = fetch; + } +#endif + bool deleteFirst() const { return bits.deleteFirst; } diff --git a/src/src/DataStructs/ProvisioningStruct.cpp b/src/src/DataStructs/ProvisioningStruct.cpp index 839e84989..cec1cf381 100644 --- a/src/src/DataStructs/ProvisioningStruct.cpp +++ b/src/src/DataStructs/ProvisioningStruct.cpp @@ -43,6 +43,10 @@ bool ProvisioningStruct::fetchFileTypeAllowed(FileType::Enum filetype, unsigned case FileType::NOTIFICATION_DAT: return allowedFlags.allowFetchNotificationDat; case FileType::RULES_TXT: return (filenr < RULESETS_MAX) && bitRead(allowedFlags.allowFetchRules, filenr); case FileType::PROVISIONING_DAT: return allowedFlags.allowFetchProvisioningDat; +#if FEATURE_STORE_CREDENTIALS_SEPARATE_FILE + case FileType::DEV_SECURITY_DAT: return allowedFlags.allowFetchDeviceSecurityDat; +#endif + case FileType::MAX_FILETYPE: break; @@ -57,6 +61,9 @@ void ProvisioningStruct::setFetchFileTypeAllowed(FileType::Enum filetype, unsign case FileType::SECURITY_DAT: allowedFlags.allowFetchSecurityDat = checked; break; case FileType::NOTIFICATION_DAT: allowedFlags.allowFetchNotificationDat = checked; break; case FileType::PROVISIONING_DAT: allowedFlags.allowFetchProvisioningDat = checked; break; +#if FEATURE_STORE_CREDENTIALS_SEPARATE_FILE + case FileType::DEV_SECURITY_DAT: allowedFlags.allowFetchDeviceSecurityDat = checked; break; +#endif case FileType::RULES_TXT: if (filenr < RULESETS_MAX) { diff --git a/src/src/DataStructs/ProvisioningStruct.h b/src/src/DataStructs/ProvisioningStruct.h index 8a16e14b2..536c53b06 100644 --- a/src/src/DataStructs/ProvisioningStruct.h +++ b/src/src/DataStructs/ProvisioningStruct.h @@ -47,8 +47,9 @@ struct ProvisioningStruct uint16_t allowFetchNotificationDat :1; uint16_t allowFetchProvisioningDat :1; uint16_t allowFetchRules :4; + uint16_t allowFetchDeviceSecurityDat :1; - uint16_t unused :7; // Add to use full 16 bit. + uint16_t unused :6; // Add to use full 16 bit. } allowedFlags; uint16_t _allBits; }; diff --git a/src/src/DataStructs/SecurityStruct.cpp b/src/src/DataStructs/SecurityStruct.cpp index 25f6e3dad..e25bf83dc 100644 --- a/src/src/DataStructs/SecurityStruct.cpp +++ b/src/src/DataStructs/SecurityStruct.cpp @@ -78,6 +78,8 @@ void SecurityStruct::clearWiFiCredentials(SecurityStruct::WiFiCredentialsSlot sl } } +//TODO TD-er: Let SecurityStruct load/save/handle the device specific security settings + bool SecurityStruct::hasWiFiCredentials() const { return hasWiFiCredentials(SecurityStruct::WiFiCredentialsSlot::first) || hasWiFiCredentials(SecurityStruct::WiFiCredentialsSlot::second); diff --git a/src/src/DataStructs/SecurityStruct.h b/src/src/DataStructs/SecurityStruct.h index 68bdb12c7..662fb3a6e 100644 --- a/src/src/DataStructs/SecurityStruct.h +++ b/src/src/DataStructs/SecurityStruct.h @@ -57,6 +57,7 @@ struct SecurityStruct //its safe to extend this struct, up to 4096 bytes, default values in config are 0. Make sure crc is last uint8_t ProgmemMd5[16] = {0}; // crc of the binary that last saved the struct to file. uint8_t md5[16] = {0}; + }; diff --git a/src/src/DataStructs/SecurityStruct_deviceSpecific.cpp b/src/src/DataStructs/SecurityStruct_deviceSpecific.cpp new file mode 100644 index 000000000..928439bb9 --- /dev/null +++ b/src/src/DataStructs/SecurityStruct_deviceSpecific.cpp @@ -0,0 +1,106 @@ +#include "../DataStructs/SecurityStruct_deviceSpecific.h" + +#if FEATURE_STORE_CREDENTIALS_SEPARATE_FILE + +int SecurityStruct_deviceSpecific::maxLength(KeyType keyType) +{ + switch (keyType) + { + case KeyType::Controller_User: return 128; + case KeyType::Controller_Password: return 128; + case KeyType::WiFi_SSID: return 31; + case KeyType::WiFi_Password: return 63; + case KeyType::Pin: return 4; + case KeyType::APN: return 64; + } + return 0; +} + +bool SecurityStruct_deviceSpecific::isPassword(KeyType keyType) +{ + switch (keyType) + { + case KeyType::Controller_Password: + case KeyType::WiFi_Password: + case KeyType::Pin: + return true; + default: break; + } + return false; +} + +const __FlashStringHelper * SecurityStruct_deviceSpecific::toString(KeyType keyType) +{ + switch (keyType) + { + case KeyType::Controller_User: return F("Controller User"); + case KeyType::Controller_Password: return F("Controller Password"); + case KeyType::WiFi_SSID: return F("SSID"); + case KeyType::WiFi_Password: return F("WPA Key"); + case KeyType::Pin: return F("Pin"); + case KeyType::APN: return F("APN"); + } + return F(""); +} + +bool SecurityStruct_deviceSpecific::load() +{ + return _kvs.load( + SettingsType::Enum::DeviceSpecificCredentials_type, + 0, + 0, + 0); +} + +bool SecurityStruct_deviceSpecific::save() +{ + return _kvs.store( + SettingsType::Enum::DeviceSpecificCredentials_type, + 0, + 0, + 0); +} + +void SecurityStruct_deviceSpecific::clear() +{ + _kvs.clear(); +} + +bool SecurityStruct_deviceSpecific::getValue( + KeyType keytype, uint8_t index, String& value) const +{ + return _kvs.getValue(createKey(keytype, index), value); +} + +void SecurityStruct_deviceSpecific::setValue(KeyType keytype, uint8_t index, const String& value) +{ + _kvs.setValue(createKey(keytype, index), value); +} + +uint32_t SecurityStruct_deviceSpecific::createKey(KeyType keytype, uint16_t index) +{ + return (static_cast(keytype) & 0xFF) + (static_cast(index) << 8); +} + +bool SecurityStruct_deviceSpecific::getCredentials(KeyType keytype_key, + KeyType keytype_secret, + uint8_t index, + String& key, + String& secret) const +{ + return + _kvs.getValue(createKey(keytype_key, index), key) && + _kvs.getValue(createKey(keytype_secret, index), secret); +} + +void SecurityStruct_deviceSpecific::setCredentials(KeyType keytype_key, + KeyType keytype_secret, + uint8_t index, + const String& key, + const String& secret) +{ + _kvs.setValue(createKey(keytype_key, index), key); + _kvs.setValue(createKey(keytype_secret, index), secret); +} + +#endif // if FEATURE_STORE_CREDENTIALS_SEPARATE_FILE diff --git a/src/src/DataStructs/SecurityStruct_deviceSpecific.h b/src/src/DataStructs/SecurityStruct_deviceSpecific.h new file mode 100644 index 000000000..65f80776a --- /dev/null +++ b/src/src/DataStructs/SecurityStruct_deviceSpecific.h @@ -0,0 +1,131 @@ +#pragma once + +#include "../../ESPEasy_common.h" + +#if FEATURE_STORE_CREDENTIALS_SEPARATE_FILE + + +# define MAX_EXTRA_WIFI_CREDENTIALS_SEPARATE_FILE 3 + +# include "../Helpers/_ESPEasy_key_value_store.h" + +class SecurityStruct_deviceSpecific +{ +public: + + // Indices used to create key in storage, so do not change values + enum class KeyType { + Controller_User = 0, + Controller_Password = 1, + + WiFi_SSID = 8, + WiFi_Password = 9, + + // Left some gap in numbers, so we can later add other WiFi specifics like for enterprise wifi + // Having a block, makes it easier later to implement a faster check using a bitmask + + + Pin = 32, + APN = 33 + + }; + + static int maxLength(KeyType keyType); + + static bool isPassword(KeyType keyType); + + static const __FlashStringHelper* toString(KeyType keyType); + + + SecurityStruct_deviceSpecific() = default; + + bool load(); + + bool save(); + + void clear(); + + bool getWiFiCredentials(uint8_t index, + String& ssid, + String& passwd) const + { + return + index < MAX_EXTRA_WIFI_CREDENTIALS_SEPARATE_FILE && + getCredentials(KeyType::WiFi_SSID, KeyType::WiFi_Password, index, ssid, passwd); + } + + void setWiFiCredentials( + uint8_t index, + const String& ssid, + const String& passwd) + { + if (index < MAX_EXTRA_WIFI_CREDENTIALS_SEPARATE_FILE) + { + setCredentials( + KeyType::WiFi_SSID, + KeyType::WiFi_Password, + index, + ssid, + passwd); + } + } + + bool getControllerCredentials(uint8_t index, + String& user, + String& passwd) const + { + return + (index < CONTROLLER_MAX) && getCredentials( + KeyType::Controller_User, + KeyType::Controller_Password, + index, + user, + passwd); + } + + void setControllerCredentials(uint8_t index, + const String& user, + const String& passwd) + { + if (index < CONTROLLER_MAX) { + setCredentials( + KeyType::Controller_User, + KeyType::Controller_Password, + index, + user, + passwd); + } + } + + bool getValue(KeyType keytype, + uint8_t index, + String& value) const; + void setValue(KeyType keytype, + uint8_t index, + const String& value); + + // Used for ESPEasy_key_value_store_webform + ESPEasy_key_value_store* _getKVS() { return &_kvs; } + + static uint32_t createKey(KeyType keytype, + uint16_t index); + +private: + + bool getCredentials(KeyType keytype_key, + KeyType keytype_secret, + uint8_t index, + String& key, + String& secret) const; + void setCredentials(KeyType keytype_key, + KeyType keytype_secret, + uint8_t index, + const String& key, + const String& secret); + + + ESPEasy_key_value_store _kvs; + +}; // class SecurityStruct_deviceSpecific + +#endif // if FEATURE_STORE_CREDENTIALS_SEPARATE_FILE diff --git a/src/src/DataTypes/ESPEasyFileType.cpp b/src/src/DataTypes/ESPEasyFileType.cpp index a8b3bf4bc..f6e4f26a4 100644 --- a/src/src/DataTypes/ESPEasyFileType.cpp +++ b/src/src/DataTypes/ESPEasyFileType.cpp @@ -38,6 +38,9 @@ bool isProtectedFileType(const String& filename) matchFileType(filename, FileType::CONFIG_DAT) || matchFileType(filename, FileType::SECURITY_DAT) || matchFileType(filename, FileType::NOTIFICATION_DAT) || +#if FEATURE_STORE_CREDENTIALS_SEPARATE_FILE + matchFileType(filename, FileType::DEV_SECURITY_DAT) || +#endif matchFileType(filename, FileType::PROVISIONING_DAT); } @@ -48,6 +51,9 @@ const __FlashStringHelper* getFileName(FileType::Enum filetype) { case FileType::NOTIFICATION_DAT: return F("notification.dat"); case FileType::SECURITY_DAT: return F("security.dat"); case FileType::PROVISIONING_DAT: return F("provisioning.dat"); +#if FEATURE_STORE_CREDENTIALS_SEPARATE_FILE + case FileType::DEV_SECURITY_DAT: return F("devsecurity.dat"); +#endif case FileType::RULES_TXT: // Use getRulesFileName break; @@ -84,6 +90,9 @@ bool getDownloadFiletypeChecked(FileType::Enum filetype, unsigned int filenr) { case FileType::NOTIFICATION_DAT: return ResetFactoryDefaultPreference.fetchNotificationDat(); case FileType::RULES_TXT: return ResetFactoryDefaultPreference.fetchRulesTXT(filenr); case FileType::PROVISIONING_DAT: return ResetFactoryDefaultPreference.fetchProvisioningDat(); +#if FEATURE_STORE_CREDENTIALS_SEPARATE_FILE + case FileType::DEV_SECURITY_DAT: return ResetFactoryDefaultPreference.fetchDeviceSecurityDat(); +#endif break; case FileType::MAX_FILETYPE: diff --git a/src/src/DataTypes/ESPEasyFileType.h b/src/src/DataTypes/ESPEasyFileType.h index 48dbf5567..aaec346df 100644 --- a/src/src/DataTypes/ESPEasyFileType.h +++ b/src/src/DataTypes/ESPEasyFileType.h @@ -10,7 +10,9 @@ struct FileType { RULES_TXT, NOTIFICATION_DAT, PROVISIONING_DAT, - +#if FEATURE_STORE_CREDENTIALS_SEPARATE_FILE + DEV_SECURITY_DAT, +#endif MAX_FILETYPE }; }; diff --git a/src/src/DataTypes/ESPEasy_key_value_store_4byte_data.cpp b/src/src/DataTypes/ESPEasy_key_value_store_4byte_data.cpp index 935072683..e3d6337af 100644 --- a/src/src/DataTypes/ESPEasy_key_value_store_4byte_data.cpp +++ b/src/src/DataTypes/ESPEasy_key_value_store_4byte_data.cpp @@ -1,6 +1,6 @@ #include "../DataTypes/ESPEasy_key_value_store_data.h" -#if FEATURE_STORE_NETWORK_INTERFACE_SETTINGS +#if FEATURE_ESPEASY_KEY_VALUE_STORE constexpr unsigned int size_32bit = sizeof(float); @@ -63,4 +63,4 @@ bool ESPEasy_key_value_store_4byte_data_t::set(const void*value) return true; } -#endif // if FEATURE_STORE_NETWORK_INTERFACE_SETTINGS +#endif // if FEATURE_ESPEASY_KEY_VALUE_STORE diff --git a/src/src/DataTypes/ESPEasy_key_value_store_8byte_data.cpp b/src/src/DataTypes/ESPEasy_key_value_store_8byte_data.cpp index d836b049f..68650472f 100644 --- a/src/src/DataTypes/ESPEasy_key_value_store_8byte_data.cpp +++ b/src/src/DataTypes/ESPEasy_key_value_store_8byte_data.cpp @@ -1,6 +1,6 @@ #include "../DataTypes/ESPEasy_key_value_store_data.h" -#if FEATURE_STORE_NETWORK_INTERFACE_SETTINGS +#if FEATURE_ESPEASY_KEY_VALUE_STORE constexpr unsigned int size_64bit = sizeof(double); @@ -63,4 +63,4 @@ bool ESPEasy_key_value_store_8byte_data_t::set(const void*value) return true; } -#endif // if FEATURE_STORE_NETWORK_INTERFACE_SETTINGS +#endif // if FEATURE_ESPEASY_KEY_VALUE_STORE diff --git a/src/src/DataTypes/ESPEasy_key_value_store_data.h b/src/src/DataTypes/ESPEasy_key_value_store_data.h index c9ddbb21f..3252e5337 100644 --- a/src/src/DataTypes/ESPEasy_key_value_store_data.h +++ b/src/src/DataTypes/ESPEasy_key_value_store_data.h @@ -3,7 +3,7 @@ #include "../../ESPEasy_common.h" -#if FEATURE_STORE_NETWORK_INTERFACE_SETTINGS +#if FEATURE_ESPEASY_KEY_VALUE_STORE // Store various types of 32 bit class alignas(uint32_t) ESPEasy_key_value_store_4byte_data_t @@ -92,5 +92,5 @@ private: uint8_t binary[sizeof(double)]{}; }; // class alignas -#endif // if FEATURE_STORE_NETWORK_INTERFACE_SETTINGS +#endif // if FEATURE_ESPEASY_KEY_VALUE_STORE #endif // ifndef DATATYPES_ESPEASY_KEY_VALUE_STORE_DATA_H diff --git a/src/src/DataTypes/SettingsType.cpp b/src/src/DataTypes/SettingsType.cpp index 679782a37..fde993e3e 100644 --- a/src/src/DataTypes/SettingsType.cpp +++ b/src/src/DataTypes/SettingsType.cpp @@ -30,6 +30,10 @@ const __FlashStringHelper * SettingsType::getSettingsTypeString(Enum settingsTyp #if FEATURE_STORE_NETWORK_INTERFACE_SETTINGS case Enum::NetworkInterfaceSettings_Type: return F("NetworkInterface"); #endif +#if FEATURE_STORE_CREDENTIALS_SEPARATE_FILE + case Enum::DeviceSpecificCredentials_type: return F("DeviceSpecificCredentials"); +#endif + case Enum::SettingsType_MAX: break; } @@ -145,6 +149,19 @@ bool SettingsType::getSettingsParameters(Enum settingsType, int index, int& max_ } break; #endif +#if FEATURE_STORE_CREDENTIALS_SEPARATE_FILE + case Enum::DeviceSpecificCredentials_type: + { + max_index = 1; + offset = DAT_OFFSET_DEV_CREDENTIALS; + max_size = DAT_DEV_CREDENTIALS_SIZE; + + // struct_size may differ. + struct_size = 0; + } + break; +#endif + case Enum::SettingsType_MAX: { @@ -218,6 +235,9 @@ unsigned int SettingsType::getSVGcolor(Enum settingsType) { case Enum::SecuritySettings_Type: return 0xff00a2; case Enum::ExtdControllerCredentials_Type: +#if FEATURE_STORE_CREDENTIALS_SEPARATE_FILE + case Enum::DeviceSpecificCredentials_type: +#endif return 0xc300ff; #if FEATURE_ALTERNATIVE_CDN_URL case Enum::CdnSettings_Type: @@ -251,6 +271,10 @@ SettingsType::SettingsFileEnum SettingsType::getSettingsFile(Enum settingsType) case Enum::SecuritySettings_Type: case Enum::ExtdControllerCredentials_Type: return SettingsFileEnum::FILE_SECURITY_type; +#if FEATURE_STORE_CREDENTIALS_SEPARATE_FILE + case Enum::DeviceSpecificCredentials_type: + return SettingsFileEnum::FILE_DEVICE_SECURITY_type; +#endif case Enum::SettingsType_MAX: break; @@ -272,6 +296,9 @@ const __FlashStringHelper * SettingsType::getSettingsFileName(SettingsType::Sett case SettingsFileEnum::FILE_CONFIG_type: return getFileName(FileType::CONFIG_DAT); case SettingsFileEnum::FILE_NOTIFICATION_type: return getFileName(FileType::NOTIFICATION_DAT); case SettingsFileEnum::FILE_SECURITY_type: return getFileName(FileType::SECURITY_DAT); +#if FEATURE_STORE_CREDENTIALS_SEPARATE_FILE + case SettingsFileEnum::FILE_DEVICE_SECURITY_type: return getFileName(FileType::DEV_SECURITY_DAT); +#endif case SettingsFileEnum::FILE_UNKNOWN_type: break; } return F(""); @@ -282,6 +309,9 @@ size_t SettingsType::getInitFileSize(SettingsType::SettingsFileEnum file_type) { case SettingsFileEnum::FILE_CONFIG_type: return CONFIG_FILE_SIZE; case SettingsFileEnum::FILE_NOTIFICATION_type: return 4096; case SettingsFileEnum::FILE_SECURITY_type: return 4096; +#if FEATURE_STORE_CREDENTIALS_SEPARATE_FILE + case SettingsFileEnum::FILE_DEVICE_SECURITY_type: return DAT_DEV_CREDENTIALS_SIZE; +#endif case SettingsFileEnum::FILE_UNKNOWN_type: break; } return 0; diff --git a/src/src/DataTypes/SettingsType.h b/src/src/DataTypes/SettingsType.h index 3008bda09..b5f2c43cb 100644 --- a/src/src/DataTypes/SettingsType.h +++ b/src/src/DataTypes/SettingsType.h @@ -22,7 +22,9 @@ public: #if FEATURE_STORE_NETWORK_INTERFACE_SETTINGS NetworkInterfaceSettings_Type, #endif - +#if FEATURE_STORE_CREDENTIALS_SEPARATE_FILE + DeviceSpecificCredentials_type, +#endif SettingsType_MAX }; @@ -31,6 +33,9 @@ public: FILE_CONFIG_type, FILE_NOTIFICATION_type, FILE_SECURITY_type, +#if FEATURE_STORE_CREDENTIALS_SEPARATE_FILE + FILE_DEVICE_SECURITY_type, +#endif FILE_UNKNOWN_type }; diff --git a/src/src/Globals/SecuritySettings.cpp b/src/src/Globals/SecuritySettings.cpp index 3fd353f65..10b9d430e 100644 --- a/src/src/Globals/SecuritySettings.cpp +++ b/src/src/Globals/SecuritySettings.cpp @@ -2,4 +2,8 @@ SecurityStruct SecuritySettings; -ExtendedControllerCredentialsStruct ExtendedControllerCredentials; \ No newline at end of file +ExtendedControllerCredentialsStruct ExtendedControllerCredentials; + +#if FEATURE_STORE_CREDENTIALS_SEPARATE_FILE +SecurityStruct_deviceSpecific SecuritySettings_deviceSpecific; +#endif diff --git a/src/src/Globals/SecuritySettings.h b/src/src/Globals/SecuritySettings.h index 7ef8b18c4..e0255659f 100644 --- a/src/src/Globals/SecuritySettings.h +++ b/src/src/Globals/SecuritySettings.h @@ -3,9 +3,14 @@ #include "../DataStructs/SecurityStruct.h" #include "../DataStructs/ExtendedControllerCredentialsStruct.h" +#if FEATURE_STORE_CREDENTIALS_SEPARATE_FILE +#include "../DataStructs/SecurityStruct_deviceSpecific.h" +#endif extern SecurityStruct SecuritySettings; extern ExtendedControllerCredentialsStruct ExtendedControllerCredentials; - +#if FEATURE_STORE_CREDENTIALS_SEPARATE_FILE +extern SecurityStruct_deviceSpecific SecuritySettings_deviceSpecific; +#endif #endif // GLOBALS_SECURITY_SETTINGS_H \ No newline at end of file diff --git a/src/src/Helpers/ESPEasy_Storage.cpp b/src/src/Helpers/ESPEasy_Storage.cpp index 9cc26db07..14c7f5199 100644 --- a/src/src/Helpers/ESPEasy_Storage.cpp +++ b/src/src/Helpers/ESPEasy_Storage.cpp @@ -897,9 +897,15 @@ String SaveSecuritySettings(bool forFactoryReset) { // FIXME TD-er: How to check if these have changed? if (forFactoryReset) { ExtendedControllerCredentials.clear(); +#if FEATURE_STORE_CREDENTIALS_SEPARATE_FILE + SecuritySettings_deviceSpecific.clear(); +#endif } ExtendedControllerCredentials.save(); +#if FEATURE_STORE_CREDENTIALS_SEPARATE_FILE + SecuritySettings_deviceSpecific.save(); +#endif if (!forFactoryReset) { afterloadSettings(); @@ -1037,6 +1043,10 @@ String LoadSettings() #endif // ifndef BUILD_NO_DEBUG ExtendedControllerCredentials.load(); +#if FEATURE_STORE_CREDENTIALS_SEPARATE_FILE + SecuritySettings_deviceSpecific.load(); +#endif + // setupStaticIPconfig(); // FIXME TD-er: Must check if static/dynamic IP was changed and trigger a reconnect? Or is a reboot better when changing those settings? diff --git a/src/src/Helpers/_CPlugin_Helper.cpp b/src/src/Helpers/_CPlugin_Helper.cpp index cfcb14321..8df7ac16c 100644 --- a/src/src/Helpers/_CPlugin_Helper.cpp +++ b/src/src/Helpers/_CPlugin_Helper.cpp @@ -275,6 +275,7 @@ String getControllerUser(controllerIndex_t controller_idx, const ControllerSetti String res; if (ControllerSettings.useExtendedCredentials()) { + // FIXME TD-er: Must add checkbox to save credentials in separate file res = ExtendedControllerCredentials.getControllerUser(controller_idx); } else { res = String(SecuritySettings.ControllerUser[controller_idx]); @@ -292,6 +293,7 @@ String getControllerPass(controllerIndex_t controller_idx, const ControllerSetti if (!validControllerIndex(controller_idx)) { return EMPTY_STRING; } if (ControllerSettings.useExtendedCredentials()) { + // FIXME TD-er: Must add checkbox to save credentials in separate file return ExtendedControllerCredentials.getControllerPass(controller_idx); } String res(SecuritySettings.ControllerPassword[controller_idx]); @@ -305,6 +307,7 @@ void setControllerUser(controllerIndex_t controller_idx, const ControllerSetting if (!validControllerIndex(controller_idx)) { return; } if (ControllerSettings.useExtendedCredentials()) { + // FIXME TD-er: Must add checkbox to save credentials in separate file ExtendedControllerCredentials.setControllerUser(controller_idx, value); } else { safe_strncpy(SecuritySettings.ControllerUser[controller_idx], value, sizeof(SecuritySettings.ControllerUser[0])); @@ -316,6 +319,7 @@ void setControllerPass(controllerIndex_t controller_idx, const ControllerSetting if (!validControllerIndex(controller_idx)) { return; } if (ControllerSettings.useExtendedCredentials()) { + // FIXME TD-er: Must add checkbox to save credentials in separate file ExtendedControllerCredentials.setControllerPass(controller_idx, value); } else { safe_strncpy(SecuritySettings.ControllerPassword[controller_idx], value, sizeof(SecuritySettings.ControllerPassword[0])); diff --git a/src/src/Helpers/_ESPEasy_key_value_store.cpp b/src/src/Helpers/_ESPEasy_key_value_store.cpp index c6e0d0a53..40fb52288 100644 --- a/src/src/Helpers/_ESPEasy_key_value_store.cpp +++ b/src/src/Helpers/_ESPEasy_key_value_store.cpp @@ -1,6 +1,6 @@ #include "../Helpers/_ESPEasy_key_value_store.h" -#if FEATURE_STORE_NETWORK_INTERFACE_SETTINGS +#if FEATURE_ESPEASY_KEY_VALUE_STORE # include "../Helpers/StringConverter_Numerical.h" # include "../Helpers/ESPEasy_Storage.h" @@ -351,7 +351,7 @@ bool ESPEasy_key_value_store::store( _state = State::ErrorOnSave; # ifndef BUILD_NO_DEBUG _lastError = F("KVS: Invalid index"); - addLog(LOG_LEVEL_ERROR, _lastError); // addLog(LOG_LEVEL_DEBUG, _lastError); + addLog(LOG_LEVEL_ERROR, F("KVS: Invalid index")); // addLog(LOG_LEVEL_DEBUG, _lastError); # endif // ifndef BUILD_NO_DEBUG return false; } @@ -631,6 +631,30 @@ ESPEasy_key_value_store::StorageType ESPEasy_key_value_store::getStorageType(uin } return ESPEasy_key_value_store::StorageType::not_set; } +#define KVS_STRINGPAIR_SEPARATOR ((char)1) +bool ESPEasy_key_value_store::getValue(uint32_t key, StringPair& stringPair) const +{ + String str; + if (!getValue(key, str)) { + return false; + } + const int separatorPos = str.indexOf(KVS_STRINGPAIR_SEPARATOR); + if (separatorPos < 0) return false; + stringPair.first = str.substring(0, separatorPos); + stringPair.second = str.substring(separatorPos + 1); + return true; +} + +void ESPEasy_key_value_store::setValue(uint32_t key, const StringPair& stringPair) +{ + String str; + str.reserve(stringPair.first.length() + 1 + stringPair.second.length()); + str += stringPair.first; + str += KVS_STRINGPAIR_SEPARATOR; + str += stringPair.second; + setValue(key, str); +} +#undef KVS_STRINGPAIR_SEPARATOR bool ESPEasy_key_value_store::getValue(uint32_t key, String& value) const { @@ -1162,4 +1186,4 @@ void ESPEasy_key_value_store::dump() const } -#endif // if FEATURE_STORE_NETWORK_INTERFACE_SETTINGS +#endif // if FEATURE_ESPEASY_KEY_VALUE_STORE diff --git a/src/src/Helpers/_ESPEasy_key_value_store.h b/src/src/Helpers/_ESPEasy_key_value_store.h index 9a7732ceb..8264b71b1 100644 --- a/src/src/Helpers/_ESPEasy_key_value_store.h +++ b/src/src/Helpers/_ESPEasy_key_value_store.h @@ -3,7 +3,7 @@ #include "../../ESPEasy_common.h" -#if FEATURE_STORE_NETWORK_INTERFACE_SETTINGS +#if FEATURE_ESPEASY_KEY_VALUE_STORE # include "../DataTypes/ESPEasy_key_value_store_data.h" # include "../DataTypes/SettingsType.h" @@ -27,6 +27,8 @@ class ESPEasy_key_value_store { public: + typedef std::pair StringPair; + // Type is stored, so do not change the order/values enum class StorageType { @@ -103,6 +105,9 @@ public: ############################################### */ + bool getValue(uint32_t key, StringPair& stringPair) const; + void setValue(uint32_t key, const StringPair& stringPair); + bool getValue(uint32_t key, String & value) const; void setValue(uint32_t key, @@ -243,6 +248,6 @@ private: }; // class ESPEasy_key_value_store -#endif // if FEATURE_STORE_NETWORK_INTERFACE_SETTINGS +#endif // if FEATURE_ESPEASY_KEY_VALUE_STORE #endif // ifndef HELPERS_ESPEASY_KEY_VALUE_STORE_H diff --git a/src/src/WebServer/DownloadPage.cpp b/src/src/WebServer/DownloadPage.cpp index 5eb3b4b08..753de1a51 100644 --- a/src/src/WebServer/DownloadPage.cpp +++ b/src/src/WebServer/DownloadPage.cpp @@ -84,6 +84,9 @@ void handle_config_download(bool fullBackup, if (fullBackup && (nullptr != tarStream)) { const String security_dat = getFileName(FileType::SECURITY_DAT); +#if FEATURE_STORE_CREDENTIALS_SEPARATE_FILE + const String device_security_dat = getFileName(FileType::DEV_SECURITY_DAT); +#endif # if defined(ESP8266) fs::Dir dir = ESPEASY_FS.openDir(""); @@ -92,7 +95,13 @@ void handle_config_download(bool fullBackup, fs::File file = dir.openFile("r"); if (file) { - if (!noCreds || (noCreds && (0 != strncasecmp(file.name(), security_dat.c_str(), security_dat.length())))) { + if (!noCreds || + (noCreds + && (0 != strncasecmp(file.name(), security_dat.c_str(), security_dat.length())) +#if FEATURE_STORE_CREDENTIALS_SEPARATE_FILE + && (0 != strncasecmp(file.name(), device_security_dat.c_str(), device_security_dat.length())) +#endif + )) { tarStream->addFile(file.name(), file.size()); } file.close(); @@ -105,7 +114,13 @@ void handle_config_download(bool fullBackup, while (file) { if (!file.isDirectory()) { - if (!noCreds || (noCreds && (0 != strncasecmp(file.name(), security_dat.c_str(), security_dat.length())))) { + if (!noCreds || + (noCreds + && (0 != strncasecmp(file.name(), security_dat.c_str(), security_dat.length())) +#if FEATURE_STORE_CREDENTIALS_SEPARATE_FILE + && (0 != strncasecmp(file.name(), device_security_dat.c_str(), device_security_dat.length())) +#endif + )) { tarStream->addFile(file.name(), file.size()); } } @@ -130,6 +145,10 @@ void handle_config_download(bool fullBackup, if (!noCreds) { tarStream->addFileIfExists(getFileName(FileType::SECURITY_DAT)); +#if FEATURE_STORE_CREDENTIALS_SEPARATE_FILE + // TODO TD-er: Must add separate flag for this +// tarStream->addFileIfExists(getFileName(FileType::DEV_SECURITY_DAT)); +#endif } // rules.txt files diff --git a/src/src/WebServer/ESPEasy_key_value_store_webform.cpp b/src/src/WebServer/ESPEasy_key_value_store_webform.cpp index f62a15b83..36cc20b91 100644 --- a/src/src/WebServer/ESPEasy_key_value_store_webform.cpp +++ b/src/src/WebServer/ESPEasy_key_value_store_webform.cpp @@ -1,6 +1,6 @@ #include "../WebServer/ESPEasy_key_value_store_webform.h" -#if FEATURE_STORE_NETWORK_INTERFACE_SETTINGS +#if FEATURE_ESPEASY_KEY_VALUE_STORE # include "../Helpers/StringConverter.h" # include "../WebServer/Markup_Forms.h" @@ -29,15 +29,15 @@ void WebFormItemParams::checkRanges() { switch (_storageType) { - CORRECT_RANGE(int8_type, int8_t) - CORRECT_RANGE(uint8_type, uint8_t) - CORRECT_RANGE(int16_type, int16_t) - CORRECT_RANGE(uint16_type, uint16_t) - CORRECT_RANGE(int32_type, int32_t) - CORRECT_RANGE(uint32_type, uint32_t) - CORRECT_RANGE(float_type, float) - CORRECT_RANGE(uint64_type, uint64_t) - CORRECT_RANGE(int64_type, int64_t) + CORRECT_RANGE(int8_type, int8_t) + CORRECT_RANGE(uint8_type, uint8_t) + CORRECT_RANGE(int16_type, int16_t) + CORRECT_RANGE(uint16_type, uint16_t) + CORRECT_RANGE(int32_type, int32_t) + CORRECT_RANGE(uint32_type, uint32_t) + CORRECT_RANGE(float_type, float) + CORRECT_RANGE(uint64_type, uint64_t) + CORRECT_RANGE(int64_type, int64_t) // CORRECT_RANGE(double_type, double) default: break; @@ -56,19 +56,35 @@ bool showWebformItem(const ESPEasy_key_value_store& store, { String value; - if (!store.getValueAsString(params._key, value)) { value = params._defaultStringValue; } - addFormTextBox( - params._label, - id, - value, - params._maxLength, - params._readOnly, - params._required, - params._pattern + if (!store.getValueAsString(params._key, value)) + { + value = params._defaultStringValue; + } + + if (params._password) { + addFormPasswordBox( + params._label, + id, + value, + params._maxLength # if FEATURE_TOOLTIPS - , params._tooltip + , params._tooltip # endif // if FEATURE_TOOLTIPS - ); + ); + } else { + addFormTextBox( + params._label, + id, + value, + params._maxLength, + params._readOnly, + params._required, + params._pattern +# if FEATURE_TOOLTIPS + , params._tooltip +# endif // if FEATURE_TOOLTIPS + ); + } return true; } case ESPEasy_key_value_store::StorageType::int8_type: @@ -122,7 +138,7 @@ bool showWebformItem(const ESPEasy_key_value_store& store, params._stepsize # if FEATURE_TOOLTIPS - ,params._tooltip + , params._tooltip # endif // if FEATURE_TOOLTIPS ); @@ -175,7 +191,10 @@ void storeWebformItem(ESPEasy_key_value_store & store, store.setValue(key, isFormItemChecked(_id)); return; } - store.setValue(storageType, key, webArg(_id)); + + if (hasArg(_id)) { + store.setValue(storageType, key, webArg(_id)); + } } -#endif // if FEATURE_STORE_NETWORK_INTERFACE_SETTINGS +#endif // if FEATURE_ESPEASY_KEY_VALUE_STORE diff --git a/src/src/WebServer/ESPEasy_key_value_store_webform.h b/src/src/WebServer/ESPEasy_key_value_store_webform.h index 686a54905..ad9958b1d 100644 --- a/src/src/WebServer/ESPEasy_key_value_store_webform.h +++ b/src/src/WebServer/ESPEasy_key_value_store_webform.h @@ -3,7 +3,7 @@ #include "../WebServer/common.h" -#if FEATURE_STORE_NETWORK_INTERFACE_SETTINGS +#if FEATURE_ESPEASY_KEY_VALUE_STORE # include "../DataTypes/FormSelectorOptions.h" # include "../Helpers/_ESPEasy_key_value_store.h" @@ -37,6 +37,7 @@ struct WebFormItemParams { bool _disabled{}; bool _readOnly{}; bool _required{}; + bool _password{}; String _pattern; int64_t _defaultIntValue{}; @@ -63,5 +64,5 @@ void storeWebformItem(ESPEasy_key_value_store & store, ESPEasy_key_value_store::StorageType storageType, const String & id = EMPTY_STRING); -#endif // if FEATURE_STORE_NETWORK_INTERFACE_SETTINGS +#endif // if FEATURE_ESPEASY_KEY_VALUE_STORE #endif // ifndef WEBSERVER_ESPEASY_KEY_VALUE_STORE_WEBFORM_H diff --git a/src/src/WebServer/Markup_Forms.cpp b/src/src/WebServer/Markup_Forms.cpp index 4ab8d9b33..50dec3868 100644 --- a/src/src/WebServer/Markup_Forms.cpp +++ b/src/src/WebServer/Markup_Forms.cpp @@ -12,6 +12,9 @@ #include "../Helpers/StringConverter.h" #include "../Helpers/StringGenerator_GPIO.h" + +#define MARKUP_FORMS_PASSWORD_MASK_ASTERISKS "****" + # if FEATURE_MQTT_DISCOVER && FEATURE_MQTT_DEVICECLASS #include "../Helpers/_CPlugin_Helper_mqtt.h" # endif // if FEATURE_MQTT_DISCOVER && FEATURE_MQTT_DEVICECLASS @@ -346,7 +349,7 @@ void addFormPasswordBox(const String& label, const String& id, const String& pas #if FEATURE_TOOLTIPS addTooltip(tooltip); #endif // if FEATURE_TOOLTIPS - addHtmlAttribute(F("value"), (password.length() == 0) ? F("") : F("*****")); + addHtmlAttribute(F("value"), (password.length() == 0) ? F("") : F(MARKUP_FORMS_PASSWORD_MASK_ASTERISKS)); addHtml('>'); } @@ -358,7 +361,7 @@ bool getFormPassword(const String& id, String& password) addLog(LOG_LEVEL_DEBUG, concat(F("getFormPassword: "), password)); } */ - return !equals(password, F("*****")); + return !equals(password, F(MARKUP_FORMS_PASSWORD_MASK_ASTERISKS)); } // ******************************************************************************** @@ -741,6 +744,13 @@ bool isFormItem(const String& id) } void copyFormPassword(const __FlashStringHelper * id, char *pPassword, int maxlength) +{ + copyFormPassword(String(id), pPassword, maxlength); +} + +void copyFormPassword(const String& id, + char *pPassword, + int maxlength) { String password; diff --git a/src/src/WebServer/Markup_Forms.h b/src/src/WebServer/Markup_Forms.h index 7b569711c..64cf22ed5 100644 --- a/src/src/WebServer/Markup_Forms.h +++ b/src/src/WebServer/Markup_Forms.h @@ -357,6 +357,9 @@ bool isFormItem(const String& id); void copyFormPassword(const __FlashStringHelper * id, char *pPassword, int maxlength); +void copyFormPassword(const String& id, + char *pPassword, + int maxlength); # if FEATURE_MQTT_DISCOVER && FEATURE_MQTT_DEVICECLASS void addFormSelector_binarySensorDeviceClass(const __FlashStringHelper*label, diff --git a/src/src/WebServer/SecurityStruct_deviceSpecific_webform.cpp b/src/src/WebServer/SecurityStruct_deviceSpecific_webform.cpp new file mode 100644 index 000000000..c1335e6e4 --- /dev/null +++ b/src/src/WebServer/SecurityStruct_deviceSpecific_webform.cpp @@ -0,0 +1,86 @@ +#include "../WebServer/SecurityStruct_deviceSpecific_webform.h" + +#if FEATURE_STORE_CREDENTIALS_SEPARATE_FILE + +# include "../Globals/SecuritySettings.h" +# include "../Helpers/StringConverter.h" +# include "../WebServer/Markup_Forms.h" + +String DevSpecific_Security_getLabelString(SecurityStruct_deviceSpecific::KeyType keytype, + uint16_t index, + bool displayString, + ESPEasy_key_value_store::StorageType & storageType) +{ + storageType = ESPEasy_key_value_store::StorageType::string_type; + String res = SecurityStruct_deviceSpecific::toString(keytype); + + if ((keytype == SecurityStruct_deviceSpecific::KeyType::WiFi_SSID) || + (keytype == SecurityStruct_deviceSpecific::KeyType::WiFi_Password)) { + if (displayString) { + res += ' '; + res += index + 1; + } else { + res += index; + } + } + + if (!displayString) { + res.toLowerCase(); + res.replace(' ', '_'); + return concat(F("KVS_ID_"), res); + } + return res; +} + +WebFormItemParams make_DevSpecific_Security_WebFormItemParams( + SecurityStruct_deviceSpecific::KeyType keytype, + uint16_t index) +{ + ESPEasy_key_value_store::StorageType storageType; + + auto res = WebFormItemParams( + DevSpecific_Security_getLabelString(keytype, index, true, storageType), + DevSpecific_Security_getLabelString(keytype, index, false, storageType), + storageType, + SecurityStruct_deviceSpecific::createKey(keytype, index)); + + res._password = SecurityStruct_deviceSpecific::isPassword(keytype); + res._maxLength = SecurityStruct_deviceSpecific::maxLength(keytype); + return res; +} + +void show_SecurityStruct_deviceSpecific_WebFormItem( + SecurityStruct_deviceSpecific::KeyType keytype, + uint16_t index) +{ + showWebformItem( + *SecuritySettings_deviceSpecific._getKVS(), + make_DevSpecific_Security_WebFormItemParams(keytype, index)); +} + +void store_SecurityStruct_deviceSpecific_WebFormItem( + SecurityStruct_deviceSpecific::KeyType keytype, + uint16_t index) +{ + ESPEasy_key_value_store::StorageType storageType; + + auto id = + DevSpecific_Security_getLabelString(keytype, index, false, storageType); + + if (SecurityStruct_deviceSpecific::isPassword(keytype)) { + String passwd; + + if (!getFormPassword(id, passwd)) { + // Not changed, so do not try to store. + return; + } + } + + storeWebformItem( + *SecuritySettings_deviceSpecific._getKVS(), + SecurityStruct_deviceSpecific::createKey(keytype, index), + storageType, + id); +} + +#endif // if FEATURE_STORE_CREDENTIALS_SEPARATE_FILE diff --git a/src/src/WebServer/SecurityStruct_deviceSpecific_webform.h b/src/src/WebServer/SecurityStruct_deviceSpecific_webform.h new file mode 100644 index 000000000..3605e5be5 --- /dev/null +++ b/src/src/WebServer/SecurityStruct_deviceSpecific_webform.h @@ -0,0 +1,17 @@ +#pragma once + +#if FEATURE_STORE_CREDENTIALS_SEPARATE_FILE + +# include "../WebServer/ESPEasy_key_value_store_webform.h" +# include "../DataStructs/SecurityStruct_deviceSpecific.h" + +void show_SecurityStruct_deviceSpecific_WebFormItem( + SecurityStruct_deviceSpecific::KeyType keytype, + uint16_t index); + +void store_SecurityStruct_deviceSpecific_WebFormItem( + SecurityStruct_deviceSpecific::KeyType keytype, + uint16_t index); + + +#endif // if FEATURE_STORE_CREDENTIALS_SEPARATE_FILE diff --git a/src/src/WebServer/SettingsArchive.cpp b/src/src/WebServer/SettingsArchive.cpp index c0e2ec9bc..b00ba9841 100644 --- a/src/src/WebServer/SettingsArchive.cpp +++ b/src/src/WebServer/SettingsArchive.cpp @@ -257,6 +257,9 @@ void storeDownloadFiletypeCheckbox(FileType::Enum filetype, unsigned int filenr) case FileType::NOTIFICATION_DAT: ResetFactoryDefaultPreference.fetchNotificationDat(isChecked); break; case FileType::RULES_TXT: { ResetFactoryDefaultPreference.fetchRulesTXT(filenr, isChecked); break; } case FileType::PROVISIONING_DAT: { ResetFactoryDefaultPreference.fetchProvisioningDat(isChecked); break; } +#if FEATURE_STORE_CREDENTIALS_SEPARATE_FILE + case FileType::DEV_SECURITY_DAT: { ResetFactoryDefaultPreference.fetchProvisioningDat(isChecked); break; } +#endif case FileType::MAX_FILETYPE: break; diff --git a/src/src/WebServer/SetupPage.cpp b/src/src/WebServer/SetupPage.cpp index 6c31f2474..eed27bc78 100644 --- a/src/src/WebServer/SetupPage.cpp +++ b/src/src/WebServer/SetupPage.cpp @@ -109,6 +109,9 @@ void handle_setup() { } else if (!passwordGiven && !emptyPassAllowed) { addHtmlError(F("No password entered")); } else { +// TODO TD-er: Must store in separate file when system password is set + + safe_strncpy(SecuritySettings.WifiKey, password.c_str(), sizeof(SecuritySettings.WifiKey)); safe_strncpy(SecuritySettings.WifiSSID, ssid.c_str(), sizeof(SecuritySettings.WifiSSID)); // Hidden SSID From 7a26f68ba91b993591d8f56c8e683c9669fbe407 Mon Sep 17 00:00:00 2001 From: TD-er Date: Sun, 12 Oct 2025 22:15:56 +0200 Subject: [PATCH 366/564] [Build] Fix build issues on ESP8266 --- src/src/ESPEasyCore/Controller.cpp | 4 ++-- src/src/Helpers/KeyValueWriter_JSON.cpp | 1 + 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/src/src/ESPEasyCore/Controller.cpp b/src/src/ESPEasyCore/Controller.cpp index a4ec31184..576283701 100644 --- a/src/src/ESPEasyCore/Controller.cpp +++ b/src/src/ESPEasyCore/Controller.cpp @@ -469,10 +469,10 @@ bool MQTTConnect_clientConnect(controllerIndex_t controller_idx) { const bool hasCredentials = hasControllerCredentialsSet(controller_idx, *ControllerSettings); const uint64_t statisticsTimerStart(getMicros64()); - +# if FEATURE_MQTT_TLS mqtt_tls_last_errorstr.clear(); mqtt_tls_last_error = 0; - +#endif MQTTresult = MQTTclient.connect(clientid.c_str(), hasCredentials ? getControllerUser(controller_idx, *ControllerSettings).c_str() : nullptr, diff --git a/src/src/Helpers/KeyValueWriter_JSON.cpp b/src/src/Helpers/KeyValueWriter_JSON.cpp index f37cd3245..2a2341b5d 100644 --- a/src/src/Helpers/KeyValueWriter_JSON.cpp +++ b/src/src/Helpers/KeyValueWriter_JSON.cpp @@ -158,6 +158,7 @@ void KeyValueWriter_JSON::writeValue(const ValueStruct*val) case ValueStruct::ValueType::Auto: case ValueStruct::ValueType::String: + case ValueStruct::ValueType::FlashString: break; } pr.print(to_json_value(str)); From acdad31f0c19f4a0388d004f83e31f8329bb2fe4 Mon Sep 17 00:00:00 2001 From: Ton Huisman Date: Sun, 12 Oct 2025 22:16:33 +0200 Subject: [PATCH 367/564] [Docs] ESP8266 is Feature Complete! --- docs/source/ESPEasy/ESPchips.rst | 23 +++++++++++++++++++++++ 1 file changed, 23 insertions(+) diff --git a/docs/source/ESPEasy/ESPchips.rst b/docs/source/ESPEasy/ESPchips.rst index f5cf06b70..708764698 100644 --- a/docs/source/ESPEasy/ESPchips.rst +++ b/docs/source/ESPEasy/ESPchips.rst @@ -1,6 +1,29 @@ Supported ESP Chips ******************* +ESP8266 is Feature Complete! +============================ + +(Since 2025-04-30) + +The core team has decided to declare the ESP8266 builds (that also support ESP8285) Feature Complete, for multiple reasons: + +* **Binary size**: Making (new or enhanced) plugins and growing feature set fit in the limited available binary space of an ESP8266 (1020kB) is getting harder and harder. Many hundreds of hours have been spent already to reduce size as much as possble, and there isn't much room for improvement anymore. +* **Limited RAM available**: The ESP8266 has only 80 kB of RAM available, and with the core of ESPEasy loaded, that leaves only between 15 and 25 kB of free memory for plugins to work with. This is a major cause for crashes when some complicated tasks are handling data of some size. +* **Chip development progress**: New features for ESP chips are being developed, but the ESP8266 platform, while still being manufactured, does not get technical improvements anymore. +* **Software support by Espressif**: New software development in the framework for supporting the ESP platform is only directed at the ESP32 line of MCUs. No new development for ESP8266 is being done. + +The consequences of this decision are that: + +* New plugins and features are **not** included in the regularly made available ESP8266 builds. +* To enable some of the new features (many are still useable) for ESP8266, a Custom build can be configured and built by the user, as documented in :ref:`PlatformIO_page`. +* A notable exception is support for TLS: That's *not* possible to enable on ESPEasy in ESP8266 builds as it doesn't fit in the limited available RAM memory. + +For new projects, it is strongly advised to select one of the many available ESP32 boards, or chips when designing a custom board. Some of the ESP32 variants are available with 16 MB Flash (ESP32 Classic, ESP32-C3, ESP32-C6 and ESP32-S3), and have 1 or more MAX builds available in ESPEasy, that include all plugins and features available, and also a larger selection of fonts for displays (TFT/LCD, OLed and 7-segment). + +Overview of supported chips +=========================== + ESPEasy does support a number of variants of the processors manufactured by Espressif. * **ESP8266** The original ESP processor, with external flash. From 1c5be8c54c3112abe2413a5d94fed81d5bb6e833 Mon Sep 17 00:00:00 2001 From: TD-er Date: Mon, 13 Oct 2025 10:38:23 +0200 Subject: [PATCH 368/564] [WiFi Setup] Store credentials via setup page to separate file --- .../SecurityStruct_deviceSpecific.cpp | 29 +++++++++++++++++-- .../SecurityStruct_deviceSpecific.h | 8 +++++ .../SecurityStruct_deviceSpecific_webform.cpp | 23 ++++++++++----- .../SecurityStruct_deviceSpecific_webform.h | 3 +- src/src/WebServer/SettingsArchive.cpp | 2 +- src/src/WebServer/SetupPage.cpp | 18 ++++++++++-- 6 files changed, 69 insertions(+), 14 deletions(-) diff --git a/src/src/DataStructs/SecurityStruct_deviceSpecific.cpp b/src/src/DataStructs/SecurityStruct_deviceSpecific.cpp index 928439bb9..6f9ba169d 100644 --- a/src/src/DataStructs/SecurityStruct_deviceSpecific.cpp +++ b/src/src/DataStructs/SecurityStruct_deviceSpecific.cpp @@ -61,11 +61,36 @@ bool SecurityStruct_deviceSpecific::save() 0); } -void SecurityStruct_deviceSpecific::clear() +void SecurityStruct_deviceSpecific::clear() { _kvs.clear(); } + +void SecurityStruct_deviceSpecific::clearWiFiCredentials() { - _kvs.clear(); + for (uint8_t i = 0; i < MAX_EXTRA_WIFI_CREDENTIALS_SEPARATE_FILE; ++i) + { + setWiFiCredentials(i, EMPTY_STRING, EMPTY_STRING); + } } +bool SecurityStruct_deviceSpecific::hasWiFiCredentials(uint8_t index) const +{ + return + (index < MAX_EXTRA_WIFI_CREDENTIALS_SEPARATE_FILE) && + _kvs.hasKey(ESPEasy_key_value_store::StorageType::string_type, + createKey(KeyType::WiFi_SSID, index)) && + _kvs.hasKey(ESPEasy_key_value_store::StorageType::string_type, + createKey(KeyType::WiFi_Password, index)); +} + +/* + void SecurityStruct_deviceSpecific::freeUpFirstWiFiCredentials(uint8_t index) + { + + if (hasWiFiCredentials(index)) freeUpFirstWiFiCredentials(index + 1); + else { + + } + } + */ bool SecurityStruct_deviceSpecific::getValue( KeyType keytype, uint8_t index, String& value) const { diff --git a/src/src/DataStructs/SecurityStruct_deviceSpecific.h b/src/src/DataStructs/SecurityStruct_deviceSpecific.h index 65f80776a..5cca8eb75 100644 --- a/src/src/DataStructs/SecurityStruct_deviceSpecific.h +++ b/src/src/DataStructs/SecurityStruct_deviceSpecific.h @@ -45,6 +45,14 @@ public: void clear(); + void clearWiFiCredentials(); + + bool hasWiFiCredentials(uint8_t index) const; + + // Move all set WiFi credentials to free up first entry + // Typically used for setup page. +// void freeUpFirstWiFiCredentials(uint8_t index = 0); + bool getWiFiCredentials(uint8_t index, String& ssid, String& passwd) const diff --git a/src/src/WebServer/SecurityStruct_deviceSpecific_webform.cpp b/src/src/WebServer/SecurityStruct_deviceSpecific_webform.cpp index c1335e6e4..fec4fa805 100644 --- a/src/src/WebServer/SecurityStruct_deviceSpecific_webform.cpp +++ b/src/src/WebServer/SecurityStruct_deviceSpecific_webform.cpp @@ -9,7 +9,8 @@ String DevSpecific_Security_getLabelString(SecurityStruct_deviceSpecific::KeyType keytype, uint16_t index, bool displayString, - ESPEasy_key_value_store::StorageType & storageType) + ESPEasy_key_value_store::StorageType & storageType, + bool suppressIndex_displayString = false) { storageType = ESPEasy_key_value_store::StorageType::string_type; String res = SecurityStruct_deviceSpecific::toString(keytype); @@ -17,8 +18,10 @@ String DevSpecific_Security_getLabelString(SecurityStruct_deviceSpecific::KeyTyp if ((keytype == SecurityStruct_deviceSpecific::KeyType::WiFi_SSID) || (keytype == SecurityStruct_deviceSpecific::KeyType::WiFi_Password)) { if (displayString) { - res += ' '; - res += index + 1; + if (!suppressIndex_displayString) { + res += ' '; + res += index + 1; + } } else { res += index; } @@ -34,13 +37,16 @@ String DevSpecific_Security_getLabelString(SecurityStruct_deviceSpecific::KeyTyp WebFormItemParams make_DevSpecific_Security_WebFormItemParams( SecurityStruct_deviceSpecific::KeyType keytype, - uint16_t index) + uint16_t index, + bool suppressIndex_displayString) { ESPEasy_key_value_store::StorageType storageType; auto res = WebFormItemParams( - DevSpecific_Security_getLabelString(keytype, index, true, storageType), - DevSpecific_Security_getLabelString(keytype, index, false, storageType), + DevSpecific_Security_getLabelString( + keytype, index, true, storageType, suppressIndex_displayString), + DevSpecific_Security_getLabelString( + keytype, index, false, storageType, suppressIndex_displayString), storageType, SecurityStruct_deviceSpecific::createKey(keytype, index)); @@ -51,11 +57,12 @@ WebFormItemParams make_DevSpecific_Security_WebFormItemParams( void show_SecurityStruct_deviceSpecific_WebFormItem( SecurityStruct_deviceSpecific::KeyType keytype, - uint16_t index) + uint16_t index, + bool suppressIndex_displayString) { showWebformItem( *SecuritySettings_deviceSpecific._getKVS(), - make_DevSpecific_Security_WebFormItemParams(keytype, index)); + make_DevSpecific_Security_WebFormItemParams(keytype, index, suppressIndex_displayString)); } void store_SecurityStruct_deviceSpecific_WebFormItem( diff --git a/src/src/WebServer/SecurityStruct_deviceSpecific_webform.h b/src/src/WebServer/SecurityStruct_deviceSpecific_webform.h index 3605e5be5..e8aadd81d 100644 --- a/src/src/WebServer/SecurityStruct_deviceSpecific_webform.h +++ b/src/src/WebServer/SecurityStruct_deviceSpecific_webform.h @@ -7,7 +7,8 @@ void show_SecurityStruct_deviceSpecific_WebFormItem( SecurityStruct_deviceSpecific::KeyType keytype, - uint16_t index); + uint16_t index, + bool suppressIndex_displayString = false); void store_SecurityStruct_deviceSpecific_WebFormItem( SecurityStruct_deviceSpecific::KeyType keytype, diff --git a/src/src/WebServer/SettingsArchive.cpp b/src/src/WebServer/SettingsArchive.cpp index b00ba9841..35721ea68 100644 --- a/src/src/WebServer/SettingsArchive.cpp +++ b/src/src/WebServer/SettingsArchive.cpp @@ -258,7 +258,7 @@ void storeDownloadFiletypeCheckbox(FileType::Enum filetype, unsigned int filenr) case FileType::RULES_TXT: { ResetFactoryDefaultPreference.fetchRulesTXT(filenr, isChecked); break; } case FileType::PROVISIONING_DAT: { ResetFactoryDefaultPreference.fetchProvisioningDat(isChecked); break; } #if FEATURE_STORE_CREDENTIALS_SEPARATE_FILE - case FileType::DEV_SECURITY_DAT: { ResetFactoryDefaultPreference.fetchProvisioningDat(isChecked); break; } + case FileType::DEV_SECURITY_DAT: { ResetFactoryDefaultPreference.fetchDeviceSecurityDat(isChecked); break; } #endif case FileType::MAX_FILETYPE: diff --git a/src/src/WebServer/SetupPage.cpp b/src/src/WebServer/SetupPage.cpp index eed27bc78..7272589ef 100644 --- a/src/src/WebServer/SetupPage.cpp +++ b/src/src/WebServer/SetupPage.cpp @@ -67,7 +67,18 @@ void handle_setup() { { if (clearWiFiCredentials) { +# if FEATURE_STORE_CREDENTIALS_SEPARATE_FILE + + if (SecuritySettings.Password[0] == 0) { + // No password set, so also clear the regular credentials + // SecuritySettings.clearWiFiCredentials(); + } + SecuritySettings_deviceSpecific.clearWiFiCredentials(); + +# else // if FEATURE_STORE_CREDENTIALS_SEPARATE_FILE SecuritySettings.clearWiFiCredentials(); +# endif // if FEATURE_STORE_CREDENTIALS_SEPARATE_FILE + addHtmlError(SaveSecuritySettings()); html_add_form(); @@ -110,10 +121,13 @@ void handle_setup() { addHtmlError(F("No password entered")); } else { // TODO TD-er: Must store in separate file when system password is set - - +#if FEATURE_STORE_CREDENTIALS_SEPARATE_FILE +// TODO TD-er: Must check whether password is set: SecuritySettings.Password + SecuritySettings_deviceSpecific.setWiFiCredentials(0, ssid, password); +#else safe_strncpy(SecuritySettings.WifiKey, password.c_str(), sizeof(SecuritySettings.WifiKey)); safe_strncpy(SecuritySettings.WifiSSID, ssid.c_str(), sizeof(SecuritySettings.WifiSSID)); +#endif // Hidden SSID Settings.IncludeHiddenSSID(isFormItemChecked(LabelType::CONNECT_HIDDEN_SSID)); Settings.HiddenSSID_SlowConnectPerBSSID(isFormItemChecked(LabelType::HIDDEN_SSID_SLOW_CONNECT)); From 02dbfe33a3135c0d747d1aeaac86a83c0bcdf815 Mon Sep 17 00:00:00 2001 From: TD-er Date: Mon, 13 Oct 2025 16:16:34 +0200 Subject: [PATCH 369/564] [TAR] Fix creating unusable TAR files when backup all --- src/src/Helpers/TarStream.cpp | 2 +- src/src/WebServer/DownloadPage.cpp | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/src/Helpers/TarStream.cpp b/src/src/Helpers/TarStream.cpp index 76440e5a9..82cd26537 100644 --- a/src/src/Helpers/TarStream.cpp +++ b/src/src/Helpers/TarStream.cpp @@ -305,7 +305,7 @@ size_t TarStream::write(const uint8_t *buf, break; } - if (bufOffset < size) { // We got leftover bytes + if (bufOffset < size && _streamState != TarStreamState_e::Error) { // We got leftover bytes stayInLoop = true; } } diff --git a/src/src/WebServer/DownloadPage.cpp b/src/src/WebServer/DownloadPage.cpp index 753de1a51..4bd1d0e76 100644 --- a/src/src/WebServer/DownloadPage.cpp +++ b/src/src/WebServer/DownloadPage.cpp @@ -121,7 +121,7 @@ void handle_config_download(bool fullBackup, && (0 != strncasecmp(file.name(), device_security_dat.c_str(), device_security_dat.length())) #endif )) { - tarStream->addFile(file.name(), file.size()); + tarStream->addFileIfExists(file.name()); } } file = root.openNextFile(); From 85028da6d07c91d425ff84072d8405aaff0838a1 Mon Sep 17 00:00:00 2001 From: TD-er Date: Mon, 13 Oct 2025 16:17:36 +0200 Subject: [PATCH 370/564] [WiFi AP] Fix generating correct events when WiFi AP turns on/off --- .../NWPluginData_static_runtime.cpp | 47 ++++++++++++------- 1 file changed, 31 insertions(+), 16 deletions(-) diff --git a/src/ESPEasy/net/DataStructs/NWPluginData_static_runtime.cpp b/src/ESPEasy/net/DataStructs/NWPluginData_static_runtime.cpp index 88881462a..67fdba313 100644 --- a/src/ESPEasy/net/DataStructs/NWPluginData_static_runtime.cpp +++ b/src/ESPEasy/net/DataStructs/NWPluginData_static_runtime.cpp @@ -76,7 +76,7 @@ void NWPluginData_static_runtime::enable_txrx_events() bool NWPluginData_static_runtime::getTrafficCount(TX_RX_traffic_count& traffic) const { - if (_netif == nullptr) return false; + if (_netif == nullptr) { return false; } const int key = _netif->impl_index(); auto it = interfaceTrafficCount.find(key); @@ -142,8 +142,10 @@ bool NWPluginData_static_runtime::operational() const void NWPluginData_static_runtime::processEvents() { #ifdef ESP32 - if (_netif == nullptr) return; -#endif + + if (_netif == nullptr) { return; } +#endif // ifdef ESP32 + // TD-er: Just set these just to be sure we didn't miss any events. _connectedStats.set(connected()); @@ -194,7 +196,8 @@ void NWPluginData_static_runtime::processEvents() ip_event_got_ip6_t ip6Event; memcpy(&ip6Event, &_gotIP6Events[i], sizeof(ip_event_got_ip6_t)); memset(&_gotIP6Events[i], 0, sizeof(ip_event_got_ip6_t)); - if (loglevelActiveFor(LOG_LEVEL_INFO) && ip6Event.esp_netif != nullptr) { + + if (loglevelActiveFor(LOG_LEVEL_INFO) && (ip6Event.esp_netif != nullptr)) { esp_ip6_addr_type_t addr_type = esp_netif_ip6_get_addr_type(&ip6Event.ip6_info.ip); static const char *addr_types[] = { "UNKNOWN", "GLOBAL", "LINK_LOCAL", "SITE_LOCAL", "UNIQUE_LOCAL", "IPV4_MAPPED_IPV6" }; @@ -238,13 +241,19 @@ void NWPluginData_static_runtime::processEvents() if (Settings.UseRules && _eventInterfaceName.length()) { if (_operationalStats.isOn()) { - eventQueue.add(concat( - _eventInterfaceName, - F("#Connected"))); + if (_isAP) { + eventQueue.add(F("WiFi#APmodeConnected")); + } + else { + eventQueue.add(concat(_eventInterfaceName, F("#Connected"))); + } } else if (_operationalStats.isOff()) { - eventQueue.add(concat( - _eventInterfaceName, - F("#Disconnected"))); + if (_isAP) { + eventQueue.add(F("WiFi#APmodeDisconnected")); + } + else { + eventQueue.add(concat(_eventInterfaceName, F("#Disconnected"))); + } } } statusLED(true); @@ -252,13 +261,19 @@ void NWPluginData_static_runtime::processEvents() if (_startStopStats.changedSinceLastCheck_and_clear() && Settings.UseRules) { if (_startStopStats.isOn()) { - eventQueue.add(concat( - _eventInterfaceName, - _isAP ? F("#APmodeEnabled") : F("#Enabled"))); + if (_isAP) { + eventQueue.add(F("WiFi#APmodeEnabled")); + } + else { + eventQueue.add(concat(_eventInterfaceName, F("#Enabled"))); + } } else if (_startStopStats.isOff()) { - eventQueue.add(concat( - _eventInterfaceName, - _isAP ? F("#APmodeDisabled") : F("#Disabled"))); + if (_isAP) { + eventQueue.add(F("WiFi#APmodeDisabled")); + } + else { + eventQueue.add(concat(_eventInterfaceName, F("#Disabled"))); + } } } } From 01619ae6df21bb8eae1df6e52fd26a30e9775443 Mon Sep 17 00:00:00 2001 From: Ton Huisman Date: Mon, 13 Oct 2025 23:30:39 +0200 Subject: [PATCH 371/564] [TLS-MQTT] Automatic switch to ECDSA when error is 296 (TLS handshake) --- .../src/WiFiClientSecureLightBearSSL.cpp | 9 +- .../src/WiFiClientSecureLightBearSSL.h | 6 ++ src/src/ESPEasyCore/Controller.cpp | 87 ++++++++++++------- src/src/Globals/MQTT.cpp | 1 + src/src/Globals/MQTT.h | 1 + 5 files changed, 71 insertions(+), 33 deletions(-) diff --git a/lib/lib_ssl/tls_mini/src/WiFiClientSecureLightBearSSL.cpp b/lib/lib_ssl/tls_mini/src/WiFiClientSecureLightBearSSL.cpp index 8b11073f2..06cc2bf2b 100755 --- a/lib/lib_ssl/tls_mini/src/WiFiClientSecureLightBearSSL.cpp +++ b/lib/lib_ssl/tls_mini/src/WiFiClientSecureLightBearSSL.cpp @@ -196,7 +196,7 @@ void WiFiClientSecure_light::_clear() { _eng = nullptr; _iobuf_in = nullptr; _iobuf_out = nullptr; - setBufferSizes(1024, 1024); // reasonable minimum + setBufferSizes(2048, 2048); // reasonable minimum _handshake_done = false; _last_error = 0; _recvapp_buf = nullptr; @@ -943,8 +943,8 @@ extern "C" { br_ssl_engine_set_ghash(&cc->eng, &br_ghash_ctmul32); // we support only P256 EC curve for AWS IoT, no EC curve for Letsencrypt unless forced - br_ssl_engine_set_ec(&cc->eng, &br_ec_p256_m15); // TODO -#ifndef ESP8266 + br_ssl_engine_set_ec(&cc->eng, &br_ec_p256_m15); +#ifdef ESP32 br_ssl_engine_set_ecdsa(&cc->eng, &br_ecdsa_i15_vrfy_asn1); #endif } @@ -999,6 +999,9 @@ bool WiFiClientSecure_light::_connectSSL(const char* hostName) { br_x509_minimal_init(x509_minimal, &br_sha256_vtable, _ta_P, _ta_size); br_x509_minimal_set_rsa(x509_minimal, br_ssl_engine_get_rsavrfy(_eng)); br_x509_minimal_set_hash(x509_minimal, br_sha256_ID, &br_sha256_vtable); +#ifdef ESP32 + br_x509_minimal_set_ecdsa(x509_minimal, &br_ec_all_m15, &br_ecdsa_i15_vrfy_asn1); +#endif // ESP32 br_ssl_engine_set_x509(_eng, &x509_minimal->vtable); uint32_t now = UtcTime(); uint32_t cfg_time = CfgTime(); diff --git a/lib/lib_ssl/tls_mini/src/WiFiClientSecureLightBearSSL.h b/lib/lib_ssl/tls_mini/src/WiFiClientSecureLightBearSSL.h index fe9fe4f98..f464fcda3 100755 --- a/lib/lib_ssl/tls_mini/src/WiFiClientSecureLightBearSSL.h +++ b/lib/lib_ssl/tls_mini/src/WiFiClientSecureLightBearSSL.h @@ -127,6 +127,9 @@ class WiFiClientSecure_light : public NetworkClient { return br_ssl_engine_last_error(_eng); } } + int32_t getLastCipherSuite(void) { + return _eng->session.cipher_suite; + } inline void setLastError(int32_t err) { _last_error = err; } @@ -138,6 +141,9 @@ class WiFiClientSecure_light : public NetworkClient { } void setInsecure(); + void setECDSA(bool ecdsa) { + _rsa_only = !ecdsa; + }; void setDomainName(const char * domain) { _domain = domain; diff --git a/src/src/ESPEasyCore/Controller.cpp b/src/src/ESPEasyCore/Controller.cpp index 95378bb42..036066039 100644 --- a/src/src/ESPEasyCore/Controller.cpp +++ b/src/src/ESPEasyCore/Controller.cpp @@ -179,9 +179,9 @@ bool MQTTConnect(controllerIndex_t controller_idx) MakeControllerSettings(ControllerSettings); // -V522 if (!AllocatedControllerSettings()) { - #ifndef BUILD_MINIMAL_OTA + # ifndef BUILD_NO_DEBUG addLog(LOG_LEVEL_ERROR, F("MQTT : Cannot connect, out of RAM")); - #endif + # endif // ifndef BUILD_NO_DEBUG return false; } LoadControllerSettings(controller_idx, *ControllerSettings); @@ -210,8 +210,6 @@ bool MQTTConnect(controllerIndex_t controller_idx) uint16_t mqttPort = ControllerSettings->Port; - mqtt_tls_last_errorstr.clear(); - mqtt_tls_last_error = 0; const TLS_types TLS_type = ControllerSettings->TLStype(); if ((TLS_type != TLS_types::NoTLS) && (nullptr == mqtt_tls)) { @@ -234,6 +232,8 @@ bool MQTTConnect(controllerIndex_t controller_idx) mqtt_tls->setUtcTime_fcn(getUnixTime); mqtt_tls->setCfgTime_fcn(get_build_unixtime); } + mqtt_tls_last_errorstr.clear(); + mqtt_tls_last_error = 0; } switch (TLS_type) { @@ -281,10 +281,10 @@ bool MQTTConnect(controllerIndex_t controller_idx) LoadCertificate(ControllerSettings->getCertificateFilename(), mqtt_rootCA); if (mqtt_rootCA.isEmpty()) { - // Fingerprint must be of some minimal length to continue. - mqtt_tls_last_errorstr = F("MQTT : No TLS root CA"); - addLog(LOG_LEVEL_ERROR, mqtt_tls_last_errorstr); - return false; + // Fingerprint must be of some minimal length to continue. + mqtt_tls_last_errorstr = F("MQTT : No TLS root CA"); + addLog(LOG_LEVEL_ERROR, mqtt_tls_last_errorstr); + return false; } @@ -349,6 +349,15 @@ bool MQTTConnect(controllerIndex_t controller_idx) ? WiFiEventData.getSuggestedTimeout(Settings.Protocol[controller_idx], ControllerSettings->ClientTimeout) : ControllerSettings->ClientTimeout; + if (mqtt_tls_last_error == 296) { + // in this special case of cipher mismatch, we force enable ECDSA + // this would be the case for newer letsencrypt certificates now defaulting + // to EC certificates requiring ECDSA instead of RSA + mqtt_tls->setECDSA(true); + addLog(LOG_LEVEL_INFO, F("MQTT : TLS now enabling ECDSA")); + } + + # ifdef MUSTFIX_CLIENT_TIMEOUT_IN_SECONDS // See: https://github.com/espressif/arduino-esp32/pull/6676 @@ -361,7 +370,7 @@ bool MQTTConnect(controllerIndex_t controller_idx) # ifdef ESP8266 mqtt_tls->setBufferSizes(1024, 1024); - # endif // ifdef ESP8266 +# endif // ifdef ESP8266 MQTTclient.setClient(*mqtt_tls); MQTTclient.setKeepAlive(ControllerSettings->KeepAliveTime ? ControllerSettings->KeepAliveTime : CONTROLLER_KEEP_ALIVE_TIME_DFLT); MQTTclient.setSocketTimeout(timeout); @@ -460,14 +469,29 @@ bool MQTTConnect(controllerIndex_t controller_idx) # ifdef ESP32 mqtt_tls_last_error = mqtt_tls->getLastError(); mqtt_tls->clearLastError(); + mqtt_tls_last_cipher_suite = mqtt_tls->getLastCipherSuite(); # endif // ifdef ESP32 - // mqtt_tls_last_errorstr = buf; - if (mqtt_tls_last_error == ERR_OOM) mqtt_tls_last_errorstr = F("OutOfMemory"); - if (mqtt_tls_last_error == ERR_CANT_RESOLVE_IP) mqtt_tls_last_errorstr = F("Can't resolve IP"); - if (mqtt_tls_last_error == ERR_TCP_CONNECT) mqtt_tls_last_errorstr = F("TCP Connect error"); -// if (mqtt_tls_last_error == ERR_MISSING_CA) mqtt_tls_last_errorstr = F("Missing CA"); - if (mqtt_tls_last_error == ERR_TLS_TIMEOUT) mqtt_tls_last_errorstr = F("TLS Timeout"); + // mqtt_tls_last_errorstr = buf; + if (mqtt_tls_last_error == ERR_OOM) { mqtt_tls_last_errorstr = F("OutOfMemory"); } + + if (mqtt_tls_last_error == ERR_CANT_RESOLVE_IP) { mqtt_tls_last_errorstr = F("Can't resolve IP"); } + + if (mqtt_tls_last_error == ERR_TCP_CONNECT) { mqtt_tls_last_errorstr = F("TCP Connect error"); } + + // if (mqtt_tls_last_error == ERR_MISSING_CA) mqtt_tls_last_errorstr = F("Missing CA"); + if (mqtt_tls_last_error == ERR_TLS_TIMEOUT) { mqtt_tls_last_errorstr = F("TLS Timeout"); } + +# ifndef BUILD_NO_DEBUG + + if (BR_TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256 == mqtt_tls_last_cipher_suite) { + addLog(LOG_LEVEL_DEBUG, F("TLS cipher suite: ECDHE_RSA_AES_128_GCM_SHA256")); + } else if (BR_TLS_ECDHE_ECDSA_WITH_AES_128_GCM_SHA256 == mqtt_tls_last_cipher_suite) { + addLog(LOG_LEVEL_DEBUG, F("TLS cipher suite: ECDHE_ECDSA_AES_128_GCM_SHA256")); + } else if (0 != mqtt_tls_last_cipher_suite) { + addLog(LOG_LEVEL_DEBUG, strformat(F("TLS cipher suite: 0x%04X"), mqtt_tls_last_cipher_suite)); + } +# endif // ifndef BUILD_NO_DEBUG } # ifdef ESP32 @@ -502,12 +526,12 @@ bool MQTTConnect(controllerIndex_t controller_idx) /* if (mqtt_tls != nullptr) { if (!mqtt_tls->verify( - fp.c_str(), - dn.isEmpty() ? nullptr : dn.c_str())) + fp.c_str(), + dn.isEmpty() ? nullptr : dn.c_str())) { - mqtt_tls_last_errorstr += F("TLS Fingerprint does not match"); - addLog(LOG_LEVEL_INFO, mqtt_fingerprint); - MQTTresult = false; + mqtt_tls_last_errorstr += F("TLS Fingerprint does not match"); + addLog(LOG_LEVEL_INFO, mqtt_fingerprint); + MQTTresult = false; } } */ @@ -601,10 +625,12 @@ void MQTTparseSystemVariablesAndSubscribe(String subscribeTo) { if (!subscribeTo.isEmpty()) { MQTTclient.subscribe(subscribeTo.c_str()); +# ifndef BUILD_NO_DEBUG if (loglevelActiveFor(LOG_LEVEL_INFO)) { addLogMove(LOG_LEVEL_INFO, concat(F("Subscribed to: "), subscribeTo)); } +# endif // ifndef BUILD_NO_DEBUG } } @@ -665,7 +691,7 @@ bool MQTTCheck(controllerIndex_t controller_idx) #ifdef USES_ESPEASY_NOW if (!MQTTclient.connected()) { if (ControllerSettings->enableESPEasyNowFallback()) { - return true; + return true; } } #endif @@ -808,6 +834,7 @@ void SendStatus(struct EventStruct *event, const String& status) } #if FEATURE_MQTT + controllerIndex_t firstEnabledMQTT_ControllerIndex() { for (controllerIndex_t i = 0; i < CONTROLLER_MAX; ++i) { protocolIndex_t ProtocolIndex = getProtocolIndex_from_ControllerIndex(i); @@ -850,11 +877,12 @@ bool MQTTpublish(controllerIndex_t controller_idx, } String topic_str; String payload_str; + if (!reserve_special(topic_str, strlen_P(topic)) || !reserve_special(payload_str, strlen_P(payload))) { return false; } - topic_str = topic; + topic_str = topic; payload_str = payload; bool success = false; @@ -867,7 +895,7 @@ bool MQTTpublish(controllerIndex_t controller_idx, MQTTDelayHandler->addToQueue( std::unique_ptr( new (ptr) MQTT_queue_element( - controller_idx, taskIndex, + controller_idx, taskIndex, std::move(topic_str), std::move(payload_str), retained, callbackTask))); @@ -897,7 +925,7 @@ bool MQTTpublish(controllerIndex_t controller_idx, void *ptr = special_calloc(1, size); if (ptr != nullptr) { - success = + success = MQTTDelayHandler->addToQueue( std::unique_ptr( new (ptr) MQTT_queue_element( @@ -957,6 +985,7 @@ void MQTTStatus(struct EventStruct *event, const String& status) } # if FEATURE_MQTT_TLS + bool GetTLSfingerprint(String& fp) { # ifdef ESP32 @@ -1001,7 +1030,7 @@ bool GetTLS_Certificate(String& cert, bool caRoot) String subject; if (mqtt_tls->getPeerCertificate(cert, subject, caRoot) == 0) { - return true; + return true; } } */ @@ -1013,19 +1042,17 @@ bool GetTLS_Certificate(String& cert, bool caRoot) #endif // if FEATURE_MQTT - /*********************************************************************************************\ * send specific sensor task data, effectively calling PluginCall(PLUGIN_READ...) \*********************************************************************************************/ -void SensorSendTask(struct EventStruct *event, unsigned long timestampUnixTime) -{ +void SensorSendTask(struct EventStruct *event, unsigned long timestampUnixTime) { SensorSendTask(event, timestampUnixTime, millis()); } void SensorSendTask(struct EventStruct *event, unsigned long timestampUnixTime, unsigned long lasttimer) { - if (!validTaskIndex(event->TaskIndex)) { - return; + if (!validTaskIndex(event->TaskIndex)) { + return; } // FIXME TD-er: Should a 'disabled' task be rescheduled? diff --git a/src/src/Globals/MQTT.cpp b/src/src/Globals/MQTT.cpp index f7df2d332..1c315f6f2 100644 --- a/src/src/Globals/MQTT.cpp +++ b/src/src/Globals/MQTT.cpp @@ -18,6 +18,7 @@ BearSSL::WiFiClientSecure_light*mqtt_tls{}; BearSSL::WiFiClientSecure*mqtt_tls; BearSSL::X509List mqtt_X509List; # endif // ifdef ESP8266 +int32_t mqtt_tls_last_cipher_suite{}; String mqtt_rootCA; String mqtt_fingerprint; # endif // if FEATURE_MQTT_TLS diff --git a/src/src/Globals/MQTT.h b/src/src/Globals/MQTT.h index 59bf490f4..219bf32ad 100644 --- a/src/src/Globals/MQTT.h +++ b/src/src/Globals/MQTT.h @@ -23,6 +23,7 @@ extern WiFiClient mqtt; extern String mqtt_tls_last_errorstr; extern int32_t mqtt_tls_last_error; extern BearSSL::WiFiClientSecure_light*mqtt_tls; +extern int32_t mqtt_tls_last_cipher_suite; // extern BearSSL::X509List mqtt_X509List; From e113b0c859d8b88cbe2eaacda4fc3ca9d5bbd424 Mon Sep 17 00:00:00 2001 From: TD-er Date: Mon, 13 Oct 2025 23:33:12 +0200 Subject: [PATCH 372/564] [WiFi] Fix starting AP when no credentials present or known APs found --- platformio_core_defs.ini | 3 +- .../net/wifi/ESPEasyWiFi_state_machine.cpp | 50 ++++++++++++------- src/src/Helpers/SystemVariables.cpp | 15 ++++++ src/src/Helpers/SystemVariables.h | 4 ++ src/src/WebServer/SysVarPage.cpp | 4 ++ 5 files changed, 57 insertions(+), 19 deletions(-) diff --git a/platformio_core_defs.ini b/platformio_core_defs.ini index f8b7cadd8..2027553f9 100644 --- a/platformio_core_defs.ini +++ b/platformio_core_defs.ini @@ -165,7 +165,8 @@ extra_scripts = ${esp82xx_common.extra_scripts} ; ESP_IDF 5.5.0 [core_esp32_IDF5_5_0__3_2_0_LittleFS] platform = https://github.com/Jason2866/platform-espressif32.git#Arduino/IDF55_gcc15 -platform_packages = framework-arduinoespressif32 @ https://github.com/Jason2866/esp32-arduino-lib-builder/releases/download/0410-1232-5.5/framework-arduinoespressif32-release_v5.5-2f303469.tar.xz +;platform_packages = framework-arduinoespressif32 @ https://github.com/Jason2866/esp32-arduino-lib-builder/releases/download/0410-1232-5.5/framework-arduinoespressif32-release_v5.5-2f303469.tar.xz +platform_packages = build_flags = -DESP32_STAGE -DESP_IDF_VERSION_MAJOR=5 -DLIBRARIES_NO_LOG=1 diff --git a/src/ESPEasy/net/wifi/ESPEasyWiFi_state_machine.cpp b/src/ESPEasy/net/wifi/ESPEasyWiFi_state_machine.cpp index 678cb2845..9eed9a84c 100644 --- a/src/ESPEasy/net/wifi/ESPEasyWiFi_state_machine.cpp +++ b/src/ESPEasy/net/wifi/ESPEasyWiFi_state_machine.cpp @@ -50,13 +50,18 @@ void ESPEasyWiFi_t::begin() { if (WiFi_AP_Candidates.hasCandidates()) { setState(WiFiState_e::IdleWaiting, 100); } else { - if (WifiIsAP(WiFi.getMode())) { - // TODO TD-er: Must check if any client is connected. - // If not, then we can disable AP mode and switch to WiFiState_e::STA_Scanning - setState(WiFiState_e::STA_AP_Scanning, WIFI_STATE_MACHINE_STA_AP_SCANNING_TIMEOUT); - } else { - // setState(WiFiState_e::STA_AP_Scanning, WIFI_STATE_MACHINE_STA_AP_SCANNING_TIMEOUT); - setState(WiFiState_e::STA_Scanning, WIFI_STATE_MACHINE_STA_SCANNING_TIMEOUT); +// if (!Settings.DoNotStartAP()) { +// setState(WiFiState_e::AP_only, WIFI_STATE_MACHINE_AP_ONLY_TIMEOUT); +// } else + { + if (WifiIsAP(WiFi.getMode())) { + // TODO TD-er: Must check if any client is connected. + // If not, then we can disable AP mode and switch to WiFiState_e::STA_Scanning + setState(WiFiState_e::STA_AP_Scanning, WIFI_STATE_MACHINE_STA_AP_SCANNING_TIMEOUT); + } else { + // setState(WiFiState_e::STA_AP_Scanning, WIFI_STATE_MACHINE_STA_AP_SCANNING_TIMEOUT); + setState(WiFiState_e::STA_Scanning, WIFI_STATE_MACHINE_STA_SCANNING_TIMEOUT); + } } } } @@ -173,11 +178,14 @@ void ESPEasyWiFi_t::loop() # endif } - if (!WiFi_AP_Candidates.hasCandidateCredentials() && - !Settings.DoNotStartAP()) { - setState(WiFiState_e::AP_only, WIFI_STATE_MACHINE_AP_ONLY_TIMEOUT); - } else { + if (WiFi_AP_Candidates.hasCandidates()) { setState(WiFiState_e::WiFiOFF, 100); + } else { + if (!Settings.DoNotStartAP()) { + setState(WiFiState_e::AP_only, WIFI_STATE_MACHINE_AP_ONLY_TIMEOUT); + } else { + setState(WiFiState_e::WiFiOFF, 1000); + } } } break; @@ -296,7 +304,8 @@ void ESPEasyWiFi_t::disconnect() { doWiFiDisconnect(); } void ESPEasyWiFi_t::setState(WiFiState_e newState, uint32_t timeout) { if (newState == _state) { return; } -#ifndef BUILD_NO_DEBUG +# ifndef BUILD_NO_DEBUG + if (loglevelActiveFor(LOG_LEVEL_INFO)) { addLog( LOG_LEVEL_INFO, @@ -304,7 +313,8 @@ void ESPEasyWiFi_t::setState(WiFiState_e newState, uint32_t timeout) { concat(F(" to: "), toString(newState)) + concat(F(" timeout: "), timeout)); } -#endif +# endif // ifndef BUILD_NO_DEBUG + if (_state == WiFiState_e::AP_only) { setAPinternal(false); setAP(false); @@ -316,8 +326,10 @@ void ESPEasyWiFi_t::setState(WiFiState_e newState, uint32_t timeout) { if (wifi_STA_data) { wifi_STA_data->mark_disconnected(); - if (WiFi.status() == WL_CONNECTED) + + if (WiFi.status() == WL_CONNECTED) { WiFi.disconnect(); + } } } @@ -482,14 +494,16 @@ bool ESPEasyWiFi_t::connectSTA() } const WiFi_AP_Candidate candidate = WiFi_AP_Candidates.getCurrent(); -#ifndef BUILD_NO_DEBUG +# ifndef BUILD_NO_DEBUG + if (loglevelActiveFor(LOG_LEVEL_INFO)) { addLogMove(LOG_LEVEL_INFO, strformat( F("WIFI : Connecting %s attempt #%u"), candidate.toString().c_str(), wifi_STA_data->_establishConnectStats.getCycleCount() + 1)); } -#endif +# endif // ifndef BUILD_NO_DEBUG + // WiFiEventData.markWiFiBegin(); if (prepareWiFi()) { @@ -533,7 +547,7 @@ bool ESPEasyWiFi_t::connectSTA() # ifdef ESP32 WiFi.setScanMethod(WIFI_ALL_CHANNEL_SCAN); WiFi.setSortMethod(WIFI_CONNECT_AP_BY_SIGNAL); -# endif +# endif // ifdef ESP32 delay(100); WiFi.begin(candidate.ssid.c_str(), key.c_str(), candidate.channel, candidate.bssid.mac); @@ -554,7 +568,7 @@ bool ESPEasyWiFi_t::connectSTA() # ifdef ESP32 WiFi.setScanMethod(WIFI_ALL_CHANNEL_SCAN); WiFi.setSortMethod(WIFI_CONNECT_AP_BY_SIGNAL); -# endif +# endif // ifdef ESP32 WiFi.begin(candidate.ssid.c_str(), key.c_str()); } } diff --git a/src/src/Helpers/SystemVariables.cpp b/src/src/Helpers/SystemVariables.cpp index a22925ef6..fb6d6363e 100644 --- a/src/src/Helpers/SystemVariables.cpp +++ b/src/src/Helpers/SystemVariables.cpp @@ -11,6 +11,7 @@ #include "../ESPEasyCore/ESPEasy_Log.h" #include "../../ESPEasy/net/ESPEasyNetwork.h" +#include "../../ESPEasy/net/wifi/ESPEasyWifi.h" #include "../Globals/CRCValues.h" #include "../Globals/ESPEasy_time.h" @@ -32,6 +33,11 @@ #include "../Helpers/StringProvider.h" +#ifdef USES_NW005 +# include +#endif + + #if defined(ESP8266) # include #define WIFI_CONNECTED WiFi.isConnected() @@ -192,7 +198,12 @@ String SystemVariables::getSystemVariable(SystemVariables::Enum enumval) { 0; break; 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; +#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('-', ':', ' '); @@ -609,6 +620,10 @@ const __FlashStringHelper * SystemVariables::toFlashString(SystemVariables::Enum case Enum::ISMQTT: return F("ismqtt"); case Enum::ISMQTTIMP: return F("ismqttimp"); case Enum::ISNTP: return F("isntp"); + case Enum::ISWIFIAP: return F("iswifiap"); +#ifdef USES_NW005 + case Enum::ISPPP: return F("isppp"); +#endif case Enum::ISWIFI: return F("iswifi"); case Enum::LCLTIME: return F("lcltime"); case Enum::LCLTIME_AM: return F("lcltime_am"); diff --git a/src/src/Helpers/SystemVariables.h b/src/src/Helpers/SystemVariables.h index 0b1c0df50..3d674b343 100644 --- a/src/src/Helpers/SystemVariables.h +++ b/src/src/Helpers/SystemVariables.h @@ -51,6 +51,10 @@ public: ISMQTT, ISMQTTIMP, ISNTP, +#ifdef USES_NW005 + ISPPP, +#endif + ISWIFIAP, ISWIFI, LCLTIME, LCLTIME_AM, diff --git a/src/src/WebServer/SysVarPage.cpp b/src/src/WebServer/SysVarPage.cpp index fae507395..2d9db29e9 100644 --- a/src/src/WebServer/SysVarPage.cpp +++ b/src/src/WebServer/SysVarPage.cpp @@ -162,6 +162,10 @@ void handle_sysvars() { { const SystemVariables::Enum vars[] = { SystemVariables::ISWIFI, + SystemVariables::ISWIFIAP, +#ifdef USES_NW005 + SystemVariables::ISPPP, +#endif SystemVariables::ISNTP, # if FEATURE_MQTT SystemVariables::ISMQTT, From f106bfd3d0685f793cf6cc5c52518e3b4d99e213 Mon Sep 17 00:00:00 2001 From: TD-er Date: Tue, 14 Oct 2025 19:54:46 +0200 Subject: [PATCH 373/564] [Log] Convert all ESPEasy console output to LOG_LEVEL_NONE log entry --- src/src/Commands/Common.cpp | 15 ++++- src/src/Commands/Common.h | 3 + src/src/DataTypes/LogLevels.h | 2 +- src/src/ESPEasyCore/ESPEasy_Console_Port.cpp | 7 +- src/src/ESPEasyCore/ESPEasy_Log.cpp | 5 +- src/src/ESPEasyCore/Serial.cpp | 15 ++--- src/src/Helpers/Log_Helper.cpp | 69 +++++++++++++++++--- src/src/Helpers/Log_Helper.h | 19 +++++- 8 files changed, 106 insertions(+), 29 deletions(-) diff --git a/src/src/Commands/Common.cpp b/src/src/Commands/Common.cpp index 5abe2326d..28fc16527 100644 --- a/src/src/Commands/Common.cpp +++ b/src/src/Commands/Common.cpp @@ -14,8 +14,8 @@ // Simple function to return "Ok", to avoid flash string duplication in the firmware. -const __FlashStringHelper * return_command_success_flashstr() { return F("\nOK"); } -const __FlashStringHelper * return_command_failed_flashstr() { return F("\nFailed"); } +const __FlashStringHelper * return_command_success_flashstr() { return F("OK"); } +const __FlashStringHelper * return_command_failed_flashstr() { return F("Failed"); } const __FlashStringHelper * return_command_boolean_result_flashstr(bool success) { @@ -37,6 +37,17 @@ const __FlashStringHelper * return_incorrect_nr_arguments() { return F("Too many const __FlashStringHelper * return_incorrect_source() { return F("Command not allowed from this source!"); } const __FlashStringHelper * return_not_connected() { return F("Not connected to WiFi"); } +String return_result(struct EventStruct *event, + const __FlashStringHelper * result) +{ + serialPrintln(); + serialPrintln(result); + + if (event->Source == EventValueSource::Enum::VALUE_SOURCE_SERIAL) { + return return_command_success(); + } + return result; +} String return_result(struct EventStruct *event, const String& result) { diff --git a/src/src/Commands/Common.h b/src/src/Commands/Common.h index 6e5d5ec3f..3735ee20e 100644 --- a/src/src/Commands/Common.h +++ b/src/src/Commands/Common.h @@ -24,6 +24,9 @@ const __FlashStringHelper * return_incorrect_nr_arguments(); const __FlashStringHelper * return_incorrect_source(); const __FlashStringHelper * return_not_connected(); +String return_result(struct EventStruct *event, + const __FlashStringHelper * result); + String return_result(struct EventStruct *event, const String & result); diff --git a/src/src/DataTypes/LogLevels.h b/src/src/DataTypes/LogLevels.h index 6ef75f6d1..5ddd1f6a1 100644 --- a/src/src/DataTypes/LogLevels.h +++ b/src/src/DataTypes/LogLevels.h @@ -2,7 +2,7 @@ #include "../../ESPEasy_common.h" -#define LOG_LEVEL_NONE 0 +#define LOG_LEVEL_NONE 0 // console output is also loglevel none, only shown on those 'log destinations' subscribing to get console output. #define LOG_LEVEL_ERROR 1 #define LOG_LEVEL_INFO 2 #ifndef BUILD_NO_DEBUG diff --git a/src/src/ESPEasyCore/ESPEasy_Console_Port.cpp b/src/src/ESPEasyCore/ESPEasy_Console_Port.cpp index 4d1071017..66cd6e647 100644 --- a/src/src/ESPEasyCore/ESPEasy_Console_Port.cpp +++ b/src/src/ESPEasyCore/ESPEasy_Console_Port.cpp @@ -12,6 +12,7 @@ #include "../Globals/Settings.h" #include "../Helpers/Memory.h" +#include "../Helpers/StringConverter.h" #include @@ -160,10 +161,10 @@ bool EspEasy_Console_Port::process_consoleInput(uint8_t SerialInByte) // Ignore empty command if (SerialInByteCounter != 0) { InputBuffer_Serial[SerialInByteCounter] = 0; // serial data completed - addToSerialBuffer('>'); + String cmd(InputBuffer_Serial); - addToSerialBuffer(cmd); - addToSerialBuffer('\n'); + Logging.consolePrintln(concat('>', cmd)); + ExecuteCommand_all({EventValueSource::Enum::VALUE_SOURCE_SERIAL, std::move(cmd)}, true); SerialInByteCounter = 0; InputBuffer_Serial[0] = 0; // serial data processed, clear buffer diff --git a/src/src/ESPEasyCore/ESPEasy_Log.cpp b/src/src/ESPEasyCore/ESPEasy_Log.cpp index 36ad45d64..203fcfc4b 100644 --- a/src/src/ESPEasyCore/ESPEasy_Log.cpp +++ b/src/src/ESPEasyCore/ESPEasy_Log.cpp @@ -201,16 +201,20 @@ bool loglevelActiveFor(uint8_t destination, uint8_t logLevel) { } case LOG_TO_SYSLOG: { + if (logLevel == LOG_LEVEL_NONE) { return false; } logLevelSettings = Settings.SyslogLevel; break; } case LOG_TO_WEBLOG: { logLevelSettings = getWebLogLevel(); + + if (logLevel == LOG_LEVEL_NONE) { return logLevelSettings != LOG_LEVEL_NONE; } break; } case LOG_TO_SDCARD: { + if (logLevel == LOG_LEVEL_NONE) { return false; } #if FEATURE_SD logLevelSettings = Settings.SDLogLevel; #endif @@ -300,7 +304,6 @@ void addLog(uint8_t logLevel, String&& str) { addToLogMove(logLevel, std::move(s # include "../Helpers/Memory.h" #endif - void addLog(uint8_t logLevel, const String& str) { #ifdef ESP32 diff --git a/src/src/ESPEasyCore/Serial.cpp b/src/src/ESPEasyCore/Serial.cpp index 522a996a8..4380182d6 100644 --- a/src/src/ESPEasyCore/Serial.cpp +++ b/src/src/ESPEasyCore/Serial.cpp @@ -5,7 +5,7 @@ #include "../Globals/Cache.h" #include "../Globals/ESPEasy_Console.h" -//#include "../Globals/Logging.h" // For serialWriteBuffer +#include "../Globals/Logging.h" #include "../Globals/Settings.h" #include "../Helpers/ESPEasy_time_calc.h" @@ -31,26 +31,23 @@ bool process_serialWriteBuffer() // For now, only send it to the serial buffer and try to process it. // Later we may want to wrap it into a log. void serialPrint(const __FlashStringHelper *text) { - ESPEasy_Console.addToSerialBuffer(text); + Logging.consolePrint(text); } void serialPrint(const String& text) { - ESPEasy_Console.addToSerialBuffer(text); + Logging.consolePrint(text); } void serialPrintln(const __FlashStringHelper *text) { - ESPEasy_Console.addToSerialBuffer(text); - serialPrintln(); + Logging.consolePrintln(text); } void serialPrintln(const String& text) { - ESPEasy_Console.addToSerialBuffer(text); - serialPrintln(); + Logging.consolePrintln(text); } void serialPrintln() { - ESPEasy_Console.addNewlineToSerialBuffer(); - ESPEasy_Console.process_serialWriteBuffer(); + Logging.consolePrintln(); } // Do not add helper functions for other types, since those types can only be diff --git a/src/src/Helpers/Log_Helper.cpp b/src/src/Helpers/Log_Helper.cpp index e22072922..ff1d1e6da 100644 --- a/src/src/Helpers/Log_Helper.cpp +++ b/src/src/Helpers/Log_Helper.cpp @@ -17,18 +17,23 @@ void addToSerialLog(uint32_t timestamp, const String& message, uint8_t loglevel) { if (loglevelActiveFor(LOG_TO_SERIAL, loglevel)) { ESPEasy_Console.addToSerialBuffer(format_msec_duration(timestamp)); - #ifndef LIMIT_BUILD_SIZE - ESPEasy_Console.addToSerialBuffer(strformat(F(" : (%d) "), FreeMem())); - #endif - { - String loglevelDisplayString = getLogLevelDisplayString(loglevel); - while (loglevelDisplayString.length() < 6) { - loglevelDisplayString += ' '; + if (loglevel == LOG_LEVEL_NONE) { + ESPEasy_Console.addToSerialBuffer(F(" :> ")); + } else { + #ifndef LIMIT_BUILD_SIZE + ESPEasy_Console.addToSerialBuffer(strformat(F(" : (%d) "), FreeMem())); + #endif + { + String loglevelDisplayString = getLogLevelDisplayString(loglevel); + + while (loglevelDisplayString.length() < 6) { + loglevelDisplayString += ' '; + } + ESPEasy_Console.addToSerialBuffer(loglevelDisplayString); } - ESPEasy_Console.addToSerialBuffer(loglevelDisplayString); + ESPEasy_Console.addToSerialBuffer(F(" : ")); } - ESPEasy_Console.addToSerialBuffer(F(" : ")); ESPEasy_Console.addToSerialBuffer(message); ESPEasy_Console.addNewlineToSerialBuffer(); } @@ -128,4 +133,48 @@ void LogHelper::loop() _logBuffer.clearExpiredEntries(); } -bool LogHelper::webLogActiveRead() { return _logBuffer.logActiveRead(); } +bool LogHelper::webLogActiveRead() { return _logBuffer.logActiveRead(); } + +void LogHelper::consolePrint(const __FlashStringHelper *text) { _tmpConsoleOutput += text; } + +void LogHelper::consolePrint(const String& text) { _tmpConsoleOutput += text; } + +void LogHelper::consolePrintln(const __FlashStringHelper *text) +{ + if (_tmpConsoleOutput.isEmpty()) { + // A complete console line, thus send directly to _logBuffer + addLogEntry({ LOG_LEVEL_NONE, text }); + } else { + _tmpConsoleOutput += text; + consolePrintln(); + } +} + +void LogHelper::consolePrintln(const String& text) +{ + if (_tmpConsoleOutput.isEmpty()) { + // A complete console line, thus send directly to _logBuffer + addLogEntry({ LOG_LEVEL_NONE, text }); + } else { + _tmpConsoleOutput += text; + consolePrintln(); + } +} + +void LogHelper::consolePrintln(String&& text) +{ + if (_tmpConsoleOutput.isEmpty()) { + // A complete console line, thus send directly to _logBuffer + addLogEntry({ LOG_LEVEL_NONE, std::move(text) }); + } else { + _tmpConsoleOutput += text; + consolePrintln(); + } +} + +void LogHelper::consolePrintln() +{ + if (!_tmpConsoleOutput.isEmpty()) { + addLogEntry({ LOG_LEVEL_NONE, std::move(_tmpConsoleOutput) }); + } +} diff --git a/src/src/Helpers/Log_Helper.h b/src/src/Helpers/Log_Helper.h index 6e1a80dc8..ef352b064 100644 --- a/src/src/Helpers/Log_Helper.h +++ b/src/src/Helpers/Log_Helper.h @@ -19,13 +19,26 @@ public: String & message, uint8_t & loglevel); - uint32_t getNrMessages(uint8_t logDestination) const; + uint32_t getNrMessages(uint8_t logDestination) const; - void loop(); + void loop(); - bool webLogActiveRead(); + bool webLogActiveRead(); + + + // Append to internal buffer, which will only be flushed on consolePrintln + void consolePrint(const __FlashStringHelper *text); + void consolePrint(const String& text); + + void consolePrintln(const __FlashStringHelper *text); + void consolePrintln(const String& text); + void consolePrintln(String&& text); + + void consolePrintln(); private: + String _tmpConsoleOutput; + LogBuffer _logBuffer{}; }; // class LogHelper From 661cce9bac52f3dbb6adea4aa41c4ed63d84537a Mon Sep 17 00:00:00 2001 From: Ton Huisman Date: Tue, 14 Oct 2025 22:17:54 +0200 Subject: [PATCH 374/564] [MQTT AutoDiscovery] Add support for Switch Device Class --- src/src/Helpers/_CPlugin_Helper_mqtt.cpp | 39 ++++++++++++++++++------ src/src/Helpers/_CPlugin_Helper_mqtt.h | 1 + src/src/WebServer/Markup_Forms.cpp | 6 ++++ 3 files changed, 37 insertions(+), 9 deletions(-) diff --git a/src/src/Helpers/_CPlugin_Helper_mqtt.cpp b/src/src/Helpers/_CPlugin_Helper_mqtt.cpp index fecbbc861..20accde11 100644 --- a/src/src/Helpers/_CPlugin_Helper_mqtt.cpp +++ b/src/src/Helpers/_CPlugin_Helper_mqtt.cpp @@ -413,12 +413,14 @@ String makeHomeAssistantCompliantName(const String& name) { const char mqtt_binary_deviceclass_names[] PROGMEM = "|" // Default/0 is empty value "power|light|plug|door|garage_door|cold|heat|lock|tamper|window|" // Guessed some often used options to be listed first - "battery|battery_charging|carbon_monoxide|connectivity|gas|" // power is selected as the default + "battery|battery_charging|carbon_monoxide|connectivity|gas|" // switch is selected as the default "moisture|motion|moving|occupancy|opening|presence|problem|" // *** DO NOT CHANGE VALUE ORDER!!! - "running|safety|smoke|sound|update|vibration|"; // *** Index is stored in task settings!!! + "running|safety|smoke|sound|update|vibration|" // *** Index is stored in task settings!!! + "switch|outlet|" // switch devices +; String MQTT_binary_deviceClassName(int devClassIndex) { - char tmp[17]{}; // length: battery_charging + \0 + char tmp[17]{}; // length: battery_charging + \0 const String result(GetTextIndexed(tmp, sizeof(tmp), devClassIndex, mqtt_binary_deviceclass_names)); @@ -439,6 +441,20 @@ bool MQTT_binary_deviceClassTwoWay(int devClassIndex) { case 8: // lock case 26: // sound case 28: // vibration + case 29: // switch + case 30: // outlet + return true; + default: + break; + } + return false; +} + +// Switch devices are marked with ÷ in the selector, and discovered as 'switch' instead of 'light' +bool MQTT_binary_deviceClassSwitch(int devClassIndex) { + switch (devClassIndex) { // Index into mqtt_binary_deviceclass_names + case 29: // switch + case 30: // outlet return true; default: break; @@ -630,22 +646,27 @@ bool MQTT_HomeAssistant_SendAutoDiscovery(controllerIndex_t ControllerIn const String valuename = MQTT_DiscoveryHelperGetValueName(x, v, discoveryItems[s]); String valueDeviceClass = parseStringKeepCase(pluginDeviceClass, v + 1); // Device classes per value - if (valueDeviceClass.isEmpty()) { valueDeviceClass = F("power"); } // default + if (valueDeviceClass.isEmpty()) { valueDeviceClass = F("switch"); } // default # if FEATURE_MQTT_STATE_CLASS const String stateClass = MQTT_sensor_StateClass(Cache.getTaskVarStateClass(x, v), false); # else // if FEATURE_MQTT_STATE_CLASS const String stateClass = EMPTY_STRING; # endif // if FEATURE_MQTT_STATE_CLASS # if FEATURE_MQTT_DEVICECLASS - const bool twoWay = MQTT_binary_deviceClassTwoWay(MQTT_binary_deviceClassIndex(valueDeviceClass)); + const int devClass = MQTT_binary_deviceClassIndex(valueDeviceClass); + const bool twoWay = MQTT_binary_deviceClassTwoWay(devClass); + const bool isSwitch = MQTT_binary_deviceClassSwitch(devClass); # else // if FEATURE_MQTT_DEVICECLASS - const bool twoWay = true; + const bool twoWay = true; + const bool isSwitch = true; # endif // if FEATURE_MQTT_DEVICECLASS // Discover 2-way as Light - const __FlashStringHelper*componentClass = twoWay && discoveryItems[s].canSet ? F("light") : F("binary_sensor"); - const String deviceClass = strformat(F("%s\",\"pl_on\":\"%d\",\"pl_off\":\"%d"), - valueDeviceClass.c_str(), !inversedState, inversedState); + const __FlashStringHelper*componentClass = twoWay && discoveryItems[s].canSet + ? (isSwitch ? F("switch") : F("light")) + : F("binary_sensor"); + const String deviceClass = strformat(F("%s\",\"pl_on\":\"%d\",\"pl_off\":\"%d"), + valueDeviceClass.c_str(), !inversedState, inversedState); const String uom = MQTT_DiscoveryHelperGetValueUoM(x, v, discoveryItems[s]); if (discoveryItems[s].canSet) { diff --git a/src/src/Helpers/_CPlugin_Helper_mqtt.h b/src/src/Helpers/_CPlugin_Helper_mqtt.h index c636efa71..28760bf1f 100644 --- a/src/src/Helpers/_CPlugin_Helper_mqtt.h +++ b/src/src/Helpers/_CPlugin_Helper_mqtt.h @@ -38,6 +38,7 @@ String makeHomeAssistantCompliantName(const String& name); # if FEATURE_MQTT_DEVICECLASS String MQTT_binary_deviceClassName(int devClassIndex); bool MQTT_binary_deviceClassTwoWay(int devClassIndex); +bool MQTT_binary_deviceClassSwitch(int devClassIndex); int MQTT_binary_deviceClassIndex(const String& deviceClassName); # endif // if FEATURE_MQTT_DEVICECLASS # if FEATURE_MQTT_STATE_CLASS diff --git a/src/src/WebServer/Markup_Forms.cpp b/src/src/WebServer/Markup_Forms.cpp index 4ab8d9b33..d98715d7c 100644 --- a/src/src/WebServer/Markup_Forms.cpp +++ b/src/src/WebServer/Markup_Forms.cpp @@ -764,6 +764,9 @@ void addFormSelector_binarySensorDeviceClass(const __FlashStringHelper*label, if (MQTT_binary_deviceClassTwoWay(devClassIndex)) { devClassName += F("²"); } + if (MQTT_binary_deviceClassSwitch(devClassIndex)) { + devClassName += F("÷"); // These are multi-byte chars, so we have to use the F() macro + } while (!devClassName.isEmpty() || (0 == devClassIndex)) { binaryDeviceClasses.push_back(devClassName); @@ -772,6 +775,9 @@ void addFormSelector_binarySensorDeviceClass(const __FlashStringHelper*label, if (MQTT_binary_deviceClassTwoWay(devClassIndex)) { devClassName += F("²"); } + if (MQTT_binary_deviceClassSwitch(devClassIndex)) { + devClassName += F("÷"); + } } const FormSelectorOptions deviceClass( devClassIndex, From 25e968d1eadb4cafaa0de29cfd7805e47ac741ff Mon Sep 17 00:00:00 2001 From: Ton Huisman Date: Tue, 14 Oct 2025 22:18:18 +0200 Subject: [PATCH 375/564] [MQTT AutoDiscovery] Update documentation for Device Class --- docs/source/Plugin/DeviceClass_binary.repl | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/docs/source/Plugin/DeviceClass_binary.repl b/docs/source/Plugin/DeviceClass_binary.repl index 7e45b955b..658f5aaef 100644 --- a/docs/source/Plugin/DeviceClass_binary.repl +++ b/docs/source/Plugin/DeviceClass_binary.repl @@ -3,10 +3,10 @@ MQTT Device class (Only available if both MQTT Auto Discovery and Device Class features are included in the build.) -* **MQTT Device class**: Select the Binary Device class that's to be used for this task device. Device classes marked with ``²`` are 'two-way' devices, meaning that the state will be updated when changed, either on the ESPEasy side, or on the MQTT (Home Assistant) side. +* **MQTT Device class**: Select the Binary Device class that's to be used for this task device. Device classes marked with ``²`` are 'two-way' devices, meaning that the state will be updated when changed, either on the ESPEasy side, or on the MQTT (Home Assistant) side. For the MQTT Device classes ``switch`` and ``outlet``, both also marked with ``÷``, the discovery is marked as ``switch`` instead of ``light``. -The default value used is ``power``, also when not set (empty), and can be updated in Home Assistant by resending the MQTT Discovery. +The default value used is ``switch``, also when not set (empty), and can be updated in Home Assistant by resending the MQTT Discovery. -The available options are based on the Summer 2025 version of this `Home Assistant MQTT Binary sensor documentation page `_ +The available options are based on the Summer 2025 version of this `Home Assistant MQTT Binary sensor documentation page `_ and also related to this `Home Assistant MQTT Switch device page `_ (though that doesn't document *any* Auto Discovery information) -The On/Off icon shown in Home Assistant (HA) can be changed for an alternative in the HA configuration, after Auto Discovery has created the device there. +The ``switch`` device class shows an On/Off icon, the default icon shown for other ``light`` or ``binary_sensor`` devices in Home Assistant (HA) can be changed for an alternative in the HA configuration, if desired, after Auto Discovery has created the device there. From de3ab4b8e7affa04778d22f91d0480d878f89edc Mon Sep 17 00:00:00 2001 From: Ton Huisman Date: Tue, 14 Oct 2025 22:19:13 +0200 Subject: [PATCH 376/564] [P026] Fix Value Type for TXpower to use dBm --- src/src/PluginStructs/P026_data_struct.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/src/PluginStructs/P026_data_struct.cpp b/src/src/PluginStructs/P026_data_struct.cpp index da6576ee1..10af1793b 100644 --- a/src/src/PluginStructs/P026_data_struct.cpp +++ b/src/src/PluginStructs/P026_data_struct.cpp @@ -172,7 +172,7 @@ Sensor_VType P026_get_valueVType(uint8_t type) { case P026_VALUETYPE_ip4: return Sensor_VType::SENSOR_TYPE_NONE; case P026_VALUETYPE_web: return Sensor_VType::SENSOR_TYPE_DURATION; case P026_VALUETYPE_freestack: return Sensor_VType::SENSOR_TYPE_DATA_SIZE; - case P026_VALUETYPE_txpwr: return Sensor_VType::SENSOR_TYPE_POWER_FACT_ONLY; + case P026_VALUETYPE_txpwr: return Sensor_VType::SENSOR_TYPE_SOUND_PRESSURE; # ifdef USE_SECOND_HEAP case P026_VALUETYPE_free2ndheap: return Sensor_VType::SENSOR_TYPE_DATA_SIZE; # endif // ifdef USE_SECOND_HEAP From 2e34df9fa505bb50c4ae4ad90502b7845d06e914 Mon Sep 17 00:00:00 2001 From: TD-er Date: Wed, 15 Oct 2025 00:05:28 +0200 Subject: [PATCH 377/564] [Log] Serial Console pulls logitems when UART buffer is ready + colorize --- src/src/DataStructs/LogEntry.cpp | 6 - src/src/DataStructs/LogEntry.h | 8 + src/src/DataTypes/LogLevels.h | 6 + src/src/ESPEasyCore/ESPEasy_Console.cpp | 64 ++---- src/src/ESPEasyCore/ESPEasy_Console.h | 6 - src/src/ESPEasyCore/ESPEasy_Console_Port.cpp | 33 +--- src/src/ESPEasyCore/ESPEasy_Console_Port.h | 6 +- src/src/Helpers/Log_Helper.cpp | 30 --- src/src/Helpers/SerialWriteBuffer.cpp | 198 +++++++++---------- src/src/Helpers/SerialWriteBuffer.h | 18 +- 10 files changed, 137 insertions(+), 238 deletions(-) diff --git a/src/src/DataStructs/LogEntry.cpp b/src/src/DataStructs/LogEntry.cpp index 848fe9f3e..602a621c4 100644 --- a/src/src/DataStructs/LogEntry.cpp +++ b/src/src/DataStructs/LogEntry.cpp @@ -4,12 +4,6 @@ #include "../Helpers/ESPEasy_time_calc.h" #include "../Helpers/StringConverter.h" -#ifdef ESP32 - # define LOG_BUFFER_EXPIRE 30000 // Time after which a buffered log item is considered expired. -#else - # define LOG_BUFFER_EXPIRE 5000 // Time after which a buffered log item is considered expired. -#endif // ifdef ESP32 - LogEntry_t::LogEntry_t(const uint8_t logLevel, const __FlashStringHelper *message) : diff --git a/src/src/DataStructs/LogEntry.h b/src/src/DataStructs/LogEntry.h index 895ac85f9..38723ee5b 100644 --- a/src/src/DataStructs/LogEntry.h +++ b/src/src/DataStructs/LogEntry.h @@ -6,6 +6,14 @@ #include + +#ifdef ESP32 + # define LOG_BUFFER_EXPIRE 30000 // Time after which a buffered log item is considered expired. +#else + # define LOG_BUFFER_EXPIRE 5000 // Time after which a buffered log item is considered expired. +#endif // ifdef ESP32 + + struct LogEntry_t { LogEntry_t() = delete; diff --git a/src/src/DataTypes/LogLevels.h b/src/src/DataTypes/LogLevels.h index 5ddd1f6a1..d62bf7f3d 100644 --- a/src/src/DataTypes/LogLevels.h +++ b/src/src/DataTypes/LogLevels.h @@ -22,3 +22,9 @@ #define NR_LOG_TO_DESTINATIONS 5 // Update this when adding extra log output streams + +#ifdef BUILD_NO_DEBUG +#define LOG_LEVEL_MAX_STRING_LENGTH 6 +#else +#define LOG_LEVEL_MAX_STRING_LENGTH 10 +#endif \ No newline at end of file diff --git a/src/src/ESPEasyCore/ESPEasy_Console.cpp b/src/src/ESPEasyCore/ESPEasy_Console.cpp index 568ab1450..48c80d4ff 100644 --- a/src/src/ESPEasyCore/ESPEasy_Console.cpp +++ b/src/src/ESPEasyCore/ESPEasy_Console.cpp @@ -17,7 +17,13 @@ #include -EspEasy_Console_t::EspEasy_Console_t() +EspEasy_Console_t::EspEasy_Console_t() : + _mainSerial(LOG_TO_SERIAL) +#if FEATURE_DEFINE_SERIAL_CONSOLE_PORT +# if USES_ESPEASY_CONSOLE_FALLBACK_PORT + , _fallbackSerial(LOG_TO_SERIAL_EXTRA) +# endif +#endif // if FEATURE_DEFINE_SERIAL_CONSOLE_PORT { #if FEATURE_DEFINE_SERIAL_CONSOLE_PORT const ESPEasySerialPort port = static_cast(_console_serial_port); @@ -121,7 +127,7 @@ void EspEasy_Console_t::reInit() _fallbackSerial._serial->end(); delete _fallbackSerial._serial; _fallbackSerial._serial = nullptr; - somethingChanged = true; + somethingChanged = true; } } # endif // if USES_ESPEASY_CONSOLE_FALLBACK_PORT @@ -136,7 +142,7 @@ void EspEasy_Console_t::reInit() _mainSerial._serial->end(); delete _mainSerial._serial; _mainSerial._serial = nullptr; - somethingChanged = true; + somethingChanged = true; } _console_serial_port = Settings.console_serial_port; @@ -153,16 +159,17 @@ void EspEasy_Console_t::reInit() const ESPEasySerialPort mainSerialPort = static_cast(_console_serial_port); -#if USES_HWCDC +# if USES_HWCDC + if (mainSerialPort == ESPEasySerialPort::usb_hw_cdc) { buffsize = 2048; } -#endif // if USES_HWCDC +# endif // if USES_HWCDC _mainSerial._serial = new (std::nothrow) ESPeasySerial( mainSerialPort, _console_serial_rxpin, - _console_serial_txpin, + _console_serial_txpin, false, buffsize); somethingChanged = true; @@ -191,6 +198,7 @@ void EspEasy_Console_t::reInit() _mainSerial._serialWriteBuffer.clear(); } #endif // if FEATURE_DEFINE_SERIAL_CONSOLE_PORT + if (somethingChanged) { begin(Settings.BaudRate); } @@ -208,9 +216,9 @@ void EspEasy_Console_t::begin(uint32_t baudrate) #else // if FEATURE_DEFINE_SERIAL_CONSOLE_PORT # ifdef ESP8266 _mainSerial._serial->begin(baudrate); -# ifndef BUILD_NO_DEBUG +# ifndef BUILD_NO_DEBUG addLog(LOG_LEVEL_INFO, F("ESPEasy console using HW Serial")); -#endif +# endif # endif // ifdef ESP8266 # ifdef ESP32 @@ -260,7 +268,7 @@ void EspEasy_Console_t::init() { void EspEasy_Console_t::loop() { - if (!Settings.UseSerial) return; + if (!Settings.UseSerial) { return; } START_TIMER; @@ -296,40 +304,6 @@ void EspEasy_Console_t::loop() STOP_TIMER(CONSOLE_LOOP); } -void EspEasy_Console_t::addToSerialBuffer(const __FlashStringHelper *line) -{ - addToSerialBuffer(String(line)); -} - -void EspEasy_Console_t::addToSerialBuffer(char c) -{ - _mainSerial.addToSerialBuffer(c); -#if USES_ESPEASY_CONSOLE_FALLBACK_PORT - - _fallbackSerial.addToSerialBuffer(c); -#endif // if USES_ESPEASY_CONSOLE_FALLBACK_PORT - process_serialWriteBuffer(); -} - -void EspEasy_Console_t::addToSerialBuffer(const String& line) { - process_serialWriteBuffer(); - - _mainSerial.addToSerialBuffer(line); -#if USES_ESPEASY_CONSOLE_FALLBACK_PORT - - _fallbackSerial.addToSerialBuffer(line); -#endif // if USES_ESPEASY_CONSOLE_FALLBACK_PORT - process_serialWriteBuffer(); -} - -void EspEasy_Console_t::addNewlineToSerialBuffer() { - _mainSerial.addNewlineToSerialBuffer(); -#if USES_ESPEASY_CONSOLE_FALLBACK_PORT - _fallbackSerial.addNewlineToSerialBuffer(); -#endif // if USES_ESPEASY_CONSOLE_FALLBACK_PORT - process_serialWriteBuffer(); -} - bool EspEasy_Console_t::process_serialWriteBuffer() { START_TIMER; bool res = false; @@ -364,6 +338,7 @@ String EspEasy_Console_t::getPortDescription() const } #if USES_ESPEASY_CONSOLE_FALLBACK_PORT + String EspEasy_Console_t::getFallbackPortDescription() const { return _fallbackSerial.getPortDescription(); @@ -420,6 +395,7 @@ void EspEasy_Console_t::readInput(EspEasy_Console_Port& port) } #if FEATURE_DEFINE_SERIAL_CONSOLE_PORT + ESPeasySerial * EspEasy_Console_t::getPort() { if (_mainSerial._serial != nullptr) { @@ -435,6 +411,7 @@ ESPeasySerial * EspEasy_Console_t::getPort() } #else // if FEATURE_DEFINE_SERIAL_CONSOLE_PORT + HardwareSerial * EspEasy_Console_t::getPort() { if (_mainSerial._serial != nullptr) { @@ -445,7 +422,6 @@ HardwareSerial * EspEasy_Console_t::getPort() #endif // if FEATURE_DEFINE_SERIAL_CONSOLE_PORT - void EspEasy_Console_t::endPort() { _mainSerial.endPort(); diff --git a/src/src/ESPEasyCore/ESPEasy_Console.h b/src/src/ESPEasyCore/ESPEasy_Console.h index afbf9144c..a3c31c5cb 100644 --- a/src/src/ESPEasyCore/ESPEasy_Console.h +++ b/src/src/ESPEasyCore/ESPEasy_Console.h @@ -21,12 +21,6 @@ public: // Process data from serial port void loop(); - void addToSerialBuffer(const __FlashStringHelper *line); - void addToSerialBuffer(const String& line); - void addToSerialBuffer(char c); - - void addNewlineToSerialBuffer(); - // Return true when something got written, or when the buffer was already empty bool process_serialWriteBuffer(); diff --git a/src/src/ESPEasyCore/ESPEasy_Console_Port.cpp b/src/src/ESPEasyCore/ESPEasy_Console_Port.cpp index 66cd6e647..96165fdb6 100644 --- a/src/src/ESPEasyCore/ESPEasy_Console_Port.cpp +++ b/src/src/ESPEasyCore/ESPEasy_Console_Port.cpp @@ -23,6 +23,9 @@ #endif // if FEATURE_DEFINE_SERIAL_CONSOLE_PORT */ +EspEasy_Console_Port::EspEasy_Console_Port(uint8_t log_destination) +: _serialWriteBuffer(log_destination) {} + EspEasy_Console_Port::~EspEasy_Console_Port() { #if FEATURE_DEFINE_SERIAL_CONSOLE_PORT @@ -97,36 +100,6 @@ void EspEasy_Console_Port::endPort() } } -void EspEasy_Console_Port::addToSerialBuffer(char c) -{ -#ifdef ESP32 - if (!xPortCanYield()) return; -#endif - if (_serial != nullptr) { - _serialWriteBuffer.add(c); - } -} - -void EspEasy_Console_Port::addToSerialBuffer(const String& line) -{ -#ifdef ESP32 - if (!xPortCanYield()) return; -#endif - if (_serial != nullptr) { - _serialWriteBuffer.add(line); - } -} - -void EspEasy_Console_Port::addNewlineToSerialBuffer() -{ -#ifdef ESP32 - if (!xPortCanYield()) return; -#endif - - if (_serial != nullptr) { - _serialWriteBuffer.addNewline(); - } -} bool EspEasy_Console_Port::process_serialWriteBuffer() { diff --git a/src/src/ESPEasyCore/ESPEasy_Console_Port.h b/src/src/ESPEasyCore/ESPEasy_Console_Port.h index d92d027c6..201a8e066 100644 --- a/src/src/ESPEasyCore/ESPEasy_Console_Port.h +++ b/src/src/ESPEasyCore/ESPEasy_Console_Port.h @@ -20,6 +20,8 @@ #define CONSOLE_INPUT_BUFFER_SIZE 128 struct EspEasy_Console_Port { + + EspEasy_Console_Port(uint8_t log_destination); ~EspEasy_Console_Port(); operator bool() const; @@ -29,9 +31,6 @@ struct EspEasy_Console_Port { void endPort(); - void addToSerialBuffer(char c); - void addToSerialBuffer(const String& line); - void addNewlineToSerialBuffer(); bool process_serialWriteBuffer(); bool process_consoleInput(uint8_t SerialInByte); @@ -42,7 +41,6 @@ struct EspEasy_Console_Port { char InputBuffer_Serial[CONSOLE_INPUT_BUFFER_SIZE + 2]{}; SerialWriteBuffer_t _serialWriteBuffer; - #if FEATURE_DEFINE_SERIAL_CONSOLE_PORT ESPeasySerial *_serial = nullptr; #else // if FEATURE_DEFINE_SERIAL_CONSOLE_PORT diff --git a/src/src/Helpers/Log_Helper.cpp b/src/src/Helpers/Log_Helper.cpp index ff1d1e6da..2aa2ecb06 100644 --- a/src/src/Helpers/Log_Helper.cpp +++ b/src/src/Helpers/Log_Helper.cpp @@ -13,31 +13,6 @@ # include "../Helpers/ESPEasy_Storage.h" #endif // if FEATURE_SD -void addToSerialLog(uint32_t timestamp, const String& message, uint8_t loglevel) -{ - if (loglevelActiveFor(LOG_TO_SERIAL, loglevel)) { - ESPEasy_Console.addToSerialBuffer(format_msec_duration(timestamp)); - - if (loglevel == LOG_LEVEL_NONE) { - ESPEasy_Console.addToSerialBuffer(F(" :> ")); - } else { - #ifndef LIMIT_BUILD_SIZE - ESPEasy_Console.addToSerialBuffer(strformat(F(" : (%d) "), FreeMem())); - #endif - { - String loglevelDisplayString = getLogLevelDisplayString(loglevel); - - while (loglevelDisplayString.length() < 6) { - loglevelDisplayString += ' '; - } - ESPEasy_Console.addToSerialBuffer(loglevelDisplayString); - } - ESPEasy_Console.addToSerialBuffer(F(" : ")); - } - ESPEasy_Console.addToSerialBuffer(message); - ESPEasy_Console.addNewlineToSerialBuffer(); - } -} void addToSysLog(uint8_t logLevel, const String& str) { @@ -102,8 +77,6 @@ uint32_t LogHelper::getNrMessages(uint8_t logDestination) const void LogHelper::loop() { const uint8_t destinations[] = { - // TODO TD-er: Add log buffer for 2nd serial console - LOG_TO_SERIAL, LOG_TO_SYSLOG, LOG_TO_SDCARD }; @@ -117,9 +90,6 @@ void LogHelper::loop() { switch (destinations[i]) { - case LOG_TO_SERIAL: - addToSerialLog(timestamp, message, loglevel); - break; case LOG_TO_SYSLOG: addToSysLog(loglevel, message); break; diff --git a/src/src/Helpers/SerialWriteBuffer.cpp b/src/src/Helpers/SerialWriteBuffer.cpp index ff7087a63..57b699785 100644 --- a/src/src/Helpers/SerialWriteBuffer.cpp +++ b/src/src/Helpers/SerialWriteBuffer.cpp @@ -1,134 +1,118 @@ #include "../Helpers/SerialWriteBuffer.h" +#include "../Globals/Logging.h" + +#include "../Helpers/ESPEasy_time_calc.h" #include "../Helpers/Memory.h" - -void SerialWriteBuffer_t::add(const String& line) -{ - // When the buffer is too full, try to dump at least the size of what we try to add. - const bool mustPop = _buffer.size() > _maxSize; - { - #ifdef USE_SECOND_HEAP - - // Do not store in 2nd heap, std::dequeue cannot handle 2nd heap well - HeapSelectIram ephemeral; - #endif // ifdef USE_SECOND_HEAP - int roomLeft = getRoomLeft(); - - auto it = line.begin(); - - while (roomLeft > 0 && it != line.end()) { - if (mustPop) { - _buffer.pop_front(); - } - _buffer.push_back(*it); - --roomLeft; - ++it; - } - } -} - -void SerialWriteBuffer_t::add(const __FlashStringHelper *line) -{ - add(String(line)); -} - -void SerialWriteBuffer_t::add(char c) -{ - #ifdef USE_SECOND_HEAP - - // Do not store in 2nd heap, std::dequeue cannot handle 2nd heap well - HeapSelectIram ephemeral; - #endif // ifdef USE_SECOND_HEAP - - if (_buffer.size() > _maxSize) { - _buffer.pop_front(); - } - _buffer.push_back(c); -} - -void SerialWriteBuffer_t::addNewline() -{ - add('\r'); - add('\n'); -} +#include "../Helpers/StringConverter.h" void SerialWriteBuffer_t::clear() { - _buffer.clear(); + _prefix.clear(); + free_string(_message); + _timestamp = 0; + _readpos = 0; +} + +String colorize(const String& str, uint8_t loglevel) { + const __FlashStringHelper *format = F("%s"); + + switch (loglevel) + { + case LOG_LEVEL_NONE: format = F("\033[1m%s\033[0m"); // Bold or increased intensity + break; + case LOG_LEVEL_INFO: format = F("\033[34m%s\033[0m"); // blue + break; + case LOG_LEVEL_ERROR: format = F("\033[91;1m%s\033[0m"); // Red + Bold or increased intensity + break; +#ifndef BUILD_NO_DEBUG + case LOG_LEVEL_DEBUG: format = F("\033[32m%s\033[0m"); // Green + break; + case LOG_LEVEL_DEBUG_MORE: format = F("\033[35m%s\033[0m"); // Purple + break; + case LOG_LEVEL_DEBUG_DEV: format = F("\033[33m%s\033[0m"); // Yellow + break; +#endif + + } + return strformat(format, str.c_str()); } size_t SerialWriteBuffer_t::write(Stream& stream, size_t nrBytesToWrite) { - size_t bytesWritten = 0; - const size_t bufferSize = _buffer.size(); + size_t bytesWritten = 0; - if (bufferSize == 0) { - return bytesWritten; + if ((_timestamp != 0) && (timePassedSince(_timestamp) > LOG_BUFFER_EXPIRE)) { + clear(); + + // Mark with empty line we skipped the rest of the message. + bytesWritten += stream.println(F(" ...")); + bytesWritten += stream.println(); } - if (nrBytesToWrite > 0) { - if (nrBytesToWrite > bufferSize) { - nrBytesToWrite = bufferSize; + if (_timestamp == 0) { + _readpos = 0; + + // Need to fetch a line + if (!Logging.getNext(_log_destination, _timestamp, _message, _loglevel) || + !loglevelActiveFor(_log_destination, _loglevel)) { + free_string(_message); + _timestamp = 0; + return bytesWritten; } - while (nrBytesToWrite > 0 && !_buffer.empty()) { - uint8_t tmpBuffer[32]{}; + // Prepare prefix + _prefix = format_msec_duration(_timestamp); - size_t tmpBufferUsed = 0; + if (_loglevel == LOG_LEVEL_NONE) { + _prefix += F("\033[31;1m :> \033[0m"); // F(" :> "); + } else { + #ifndef LIMIT_BUILD_SIZE + _prefix += strformat(F(" : (%d) "), FreeMem()); + #endif + { + String loglevelDisplayString = getLogLevelDisplayString(_loglevel); - auto it = _buffer.begin(); - - bool done = false; - - for (; tmpBufferUsed < sizeof(tmpBuffer) && - !done && - it != _buffer.end();) { - tmpBuffer[tmpBufferUsed] = (uint8_t)(*it); - - if ((*it == '\n') || - (tmpBufferUsed >= nrBytesToWrite)) { - done = true; + while (loglevelDisplayString.length() < LOG_LEVEL_MAX_STRING_LENGTH) { + loglevelDisplayString += ' '; } - ++tmpBufferUsed; - ++it; + _prefix += colorize(loglevelDisplayString, _loglevel); } + _prefix += F(" | "); + } + } - // done = false; - const size_t written = (tmpBufferUsed == 0) ? 0 : stream.write(tmpBuffer, tmpBufferUsed); + const size_t maxToWrite = _prefix.length() + _message.length(); - if (written < tmpBufferUsed) { - done = true; - } + if (nrBytesToWrite > maxToWrite) { + nrBytesToWrite = maxToWrite; + } - for (size_t i = 0; i < written; ++i) { - _buffer.pop_front(); - --nrBytesToWrite; - ++bytesWritten; - } + bool done = false; - if (done) { - return bytesWritten; - } + while (!done && bytesWritten < nrBytesToWrite) { + if (_readpos < _prefix.length()) { + // Write prefix + if (1 != stream.write(_prefix[_readpos])) { return bytesWritten; } + ++bytesWritten; + ++_readpos; + } else if (!_prefix.isEmpty()) { + // Clear prefix + _prefix.clear(); + _readpos = 0; + } else if (_readpos < _message.length()) { + // Write message + if (1 != stream.write(_message[_readpos])) { return bytesWritten; } + ++bytesWritten; + ++_readpos; + } else { + if (1 != stream.write('\n')) { return bytesWritten; } + + // Done with entry, cleanup and leave + ++bytesWritten; + clear(); + done = true; } } return bytesWritten; } - -int SerialWriteBuffer_t::getRoomLeft() const { - #ifdef USE_SECOND_HEAP - - // Do not store in 2nd heap, std::dequeue cannot handle 2nd heap well - HeapSelectIram ephemeral; - #endif // ifdef USE_SECOND_HEAP - - int roomLeft = getMaxFreeBlock(); - - if (roomLeft < 1000) { - roomLeft = 0; // Do not append to buffer. - } else if (roomLeft < 4000) { - roomLeft = 128 - _buffer.size(); // 1 buffer. - } else { - roomLeft -= 4000; // leave some free for normal use. - } - return roomLeft; -} diff --git a/src/src/Helpers/SerialWriteBuffer.h b/src/src/Helpers/SerialWriteBuffer.h index 7e5932df4..398d9b6e4 100644 --- a/src/src/Helpers/SerialWriteBuffer.h +++ b/src/src/Helpers/SerialWriteBuffer.h @@ -17,14 +17,7 @@ class SerialWriteBuffer_t { public: - SerialWriteBuffer_t(size_t maxSize = MAX_SERIALWRITEBUFFER_SIZE) - : _maxSize(maxSize) {} - - void add(const String& line); - void add(const __FlashStringHelper *line); - void add(char c); - - void addNewline(); + SerialWriteBuffer_t(uint8_t log_destination) : _log_destination(log_destination) {} void clear(); @@ -33,10 +26,13 @@ public: private: - int getRoomLeft() const; + String _prefix; + String _message; + uint32_t _timestamp{}; + uint32_t _readpos{}; + uint8_t _loglevel{}; - std::deque_buffer; - size_t _maxSize = MAX_SERIALWRITEBUFFER_SIZE; + const uint8_t _log_destination; }; #endif // ifndef HELPERS_SERIALWRITEBUFFER_H From 4a77bd5b0dfe5975f97308a25da1b23c6dac520d Mon Sep 17 00:00:00 2001 From: TD-er Date: Wed, 15 Oct 2025 16:50:32 +0200 Subject: [PATCH 378/564] [Log] Fix log output to webflasher console + colorize LogEntry output --- src/src/Commands/Diagnostic.cpp | 11 ++ src/src/Commands/ExecuteCommand.cpp | 2 +- src/src/Commands/InternalCommands.cpp | 10 ++ src/src/CustomBuild/define_plugin_sets.h | 8 + src/src/DataTypes/EventValueSource.cpp | 42 +++++ src/src/DataTypes/EventValueSource.h | 27 +--- src/src/ESPEasyCore/Controller.cpp | 9 ++ src/src/ESPEasyCore/ESPEasy_Console_Port.cpp | 2 + src/src/Helpers/SerialWriteBuffer.cpp | 159 ++++++++++--------- src/src/Helpers/SerialWriteBuffer.h | 1 + 10 files changed, 177 insertions(+), 94 deletions(-) create mode 100644 src/src/DataTypes/EventValueSource.cpp diff --git a/src/src/Commands/Diagnostic.cpp b/src/src/Commands/Diagnostic.cpp index 5b358d5c2..e35c9693e 100644 --- a/src/src/Commands/Diagnostic.cpp +++ b/src/src/Commands/Diagnostic.cpp @@ -9,6 +9,7 @@ #include "../ESPEasyCore/ESPEasy_backgroundtasks.h" #include "../ESPEasyCore/ESPEasy_Log.h" +#include "../ESPEasyCore/Controller.h" // For SourceNeedsStatusUpdate, should be moved to some more generic location #include "../ESPEasyCore/Serial.h" #include "../Globals/Device.h" @@ -166,7 +167,17 @@ String Command_logentry(struct EventStruct *event, const char *Line) #endif ) { level = event->Par2; } String res = tolerantParseStringKeepCase(Line, 2); +#if FEATURE_COLORIZE_CONSOLE_LOGS + if (!SourceNeedsStatusUpdate(event->Source)) { + addLog(LOG_LEVEL_NONE, Line); + } +#endif addLog(level, res); +#if FEATURE_COLORIZE_CONSOLE_LOGS + if (!SourceNeedsStatusUpdate(event->Source)) { + addLog(LOG_LEVEL_NONE, res); + } +#endif return res; } diff --git a/src/src/Commands/ExecuteCommand.cpp b/src/src/Commands/ExecuteCommand.cpp index 37d16f694..61f9c6397 100644 --- a/src/src/Commands/ExecuteCommand.cpp +++ b/src/src/Commands/ExecuteCommand.cpp @@ -294,7 +294,7 @@ bool ExecuteCommand(ExecuteCommandArgs&& args, bool addToQueue) } String errorUnknown = concat(F("Command unknown: "), args._Line); SendStatus(&TempEvent, errorUnknown); - addLogMove(LOG_LEVEL_INFO, errorUnknown); + addLogMove(LOG_LEVEL_ERROR, errorUnknown); delay(0); return false; } diff --git a/src/src/Commands/InternalCommands.cpp b/src/src/Commands/InternalCommands.cpp index b8c6a659b..dd3fecc21 100644 --- a/src/src/Commands/InternalCommands.cpp +++ b/src/src/Commands/InternalCommands.cpp @@ -197,6 +197,16 @@ bool do_command_case_check(command_case_data & data, return true; // Command is handled } } + +#if FEATURE_COLORIZE_CONSOLE_LOGS + if (SourceNeedsStatusUpdate(data.event->Source)) { + addLog(LOG_LEVEL_NONE, + strformat( + F("Cmd (%s) : %s"), + FsP(EventValueSource::toString(data.event->Source)), + data.line.c_str())); + } +#endif data.retval = true; // Mark the command should be executed. return true; // Command is handled } diff --git a/src/src/CustomBuild/define_plugin_sets.h b/src/src/CustomBuild/define_plugin_sets.h index 9f213b154..d9d8cae7d 100644 --- a/src/src/CustomBuild/define_plugin_sets.h +++ b/src/src/CustomBuild/define_plugin_sets.h @@ -4209,4 +4209,12 @@ To create/register a plugin, you have to : #endif #endif +#ifndef FEATURE_COLORIZE_CONSOLE_LOGS +#ifdef LIMIT_BUILD_SIZE +#define FEATURE_COLORIZE_CONSOLE_LOGS 0 +#else +#define FEATURE_COLORIZE_CONSOLE_LOGS 1 +#endif +#endif + #endif // CUSTOMBUILD_DEFINE_PLUGIN_SETS_H diff --git a/src/src/DataTypes/EventValueSource.cpp b/src/src/DataTypes/EventValueSource.cpp new file mode 100644 index 000000000..e1c34e9d4 --- /dev/null +++ b/src/src/DataTypes/EventValueSource.cpp @@ -0,0 +1,42 @@ +#include "../DataTypes/EventValueSource.h" + +const __FlashStringHelper * EventValueSource::toString(Enum source) +{ + switch (source) + { + case EventValueSource::Enum::VALUE_SOURCE_SYSTEM: return F("System"); + case EventValueSource::Enum::VALUE_SOURCE_SERIAL: return F("Serial"); + case EventValueSource::Enum::VALUE_SOURCE_UDP: return F("UDP"); + case EventValueSource::Enum::VALUE_SOURCE_WEB_FRONTEND: return F("Web"); + case EventValueSource::Enum::VALUE_SOURCE_RULES: return F("Rules"); + case EventValueSource::Enum::VALUE_SOURCE_HTTP: return F("HTTP"); + case EventValueSource::Enum::VALUE_SOURCE_MQTT: return F("MQTT"); + case EventValueSource::Enum::VALUE_SOURCE_RULES_RESTRICTED: return F("Restricted Rules"); + + case EventValueSource::Enum::VALUE_SOURCE_NOT_SET: + case EventValueSource::Enum::VALUE_SOURCE_NR_VALUES: + break; + } + return F(""); +} + +bool EventValueSource::partOfGroup(EventValueSource::Enum source, EventValueSourceGroup::Enum group) +{ + switch (source) + { + case EventValueSource::Enum::VALUE_SOURCE_NOT_SET: + case EventValueSource::Enum::VALUE_SOURCE_NR_VALUES: + return false; + case EventValueSource::Enum::VALUE_SOURCE_SYSTEM: + case EventValueSource::Enum::VALUE_SOURCE_SERIAL: + case EventValueSource::Enum::VALUE_SOURCE_UDP: + case EventValueSource::Enum::VALUE_SOURCE_WEB_FRONTEND: + case EventValueSource::Enum::VALUE_SOURCE_RULES: + return true; + case EventValueSource::Enum::VALUE_SOURCE_HTTP: + case EventValueSource::Enum::VALUE_SOURCE_MQTT: + case EventValueSource::Enum::VALUE_SOURCE_RULES_RESTRICTED: + return group == EventValueSourceGroup::Enum::ALL; + } + return false; +} diff --git a/src/src/DataTypes/EventValueSource.h b/src/src/DataTypes/EventValueSource.h index 12de4c45e..d0f427254 100644 --- a/src/src/DataTypes/EventValueSource.h +++ b/src/src/DataTypes/EventValueSource.h @@ -7,7 +7,9 @@ struct EventValueSourceGroup { enum class Enum : uint8_t { RESTRICTED, ALL + }; + }; @@ -25,27 +27,14 @@ struct EventValueSource { VALUE_SOURCE_RULES_RESTRICTED = 8, VALUE_SOURCE_NR_VALUES + }; - static bool partOfGroup(EventValueSource::Enum source, EventValueSourceGroup::Enum group) - { - switch (source) { - case EventValueSource::Enum::VALUE_SOURCE_NOT_SET: - case EventValueSource::Enum::VALUE_SOURCE_NR_VALUES: - return false; - case EventValueSource::Enum::VALUE_SOURCE_SYSTEM: - case EventValueSource::Enum::VALUE_SOURCE_SERIAL: - case EventValueSource::Enum::VALUE_SOURCE_UDP: - case EventValueSource::Enum::VALUE_SOURCE_WEB_FRONTEND: - case EventValueSource::Enum::VALUE_SOURCE_RULES: - return true; - case EventValueSource::Enum::VALUE_SOURCE_HTTP: - case EventValueSource::Enum::VALUE_SOURCE_MQTT: - case EventValueSource::Enum::VALUE_SOURCE_RULES_RESTRICTED: - return group == EventValueSourceGroup::Enum::ALL; - } - return false; - } + static const __FlashStringHelper* toString(Enum); + + static bool partOfGroup(EventValueSource::Enum source, + EventValueSourceGroup::Enum group); + }; diff --git a/src/src/ESPEasyCore/Controller.cpp b/src/src/ESPEasyCore/Controller.cpp index 576283701..00908c22d 100644 --- a/src/src/ESPEasyCore/Controller.cpp +++ b/src/src/ESPEasyCore/Controller.cpp @@ -1025,6 +1025,13 @@ void SendStatus(struct EventStruct *event, const String& status) { if (status.isEmpty()) { return; } +#if FEATURE_COLORIZE_CONSOLE_LOGS + if (SourceNeedsStatusUpdate(event->Source)) { + addLog(LOG_LEVEL_NONE, status); + } +#endif + + switch (event->Source) { case EventValueSource::Enum::VALUE_SOURCE_HTTP: @@ -1040,7 +1047,9 @@ void SendStatus(struct EventStruct *event, const String& status) break; #endif // if FEATURE_MQTT case EventValueSource::Enum::VALUE_SOURCE_SERIAL: +#if !FEATURE_COLORIZE_CONSOLE_LOGS serialPrintln(status); +#endif break; default: diff --git a/src/src/ESPEasyCore/ESPEasy_Console_Port.cpp b/src/src/ESPEasyCore/ESPEasy_Console_Port.cpp index 96165fdb6..2e21cbf3a 100644 --- a/src/src/ESPEasyCore/ESPEasy_Console_Port.cpp +++ b/src/src/ESPEasyCore/ESPEasy_Console_Port.cpp @@ -136,7 +136,9 @@ bool EspEasy_Console_Port::process_consoleInput(uint8_t SerialInByte) InputBuffer_Serial[SerialInByteCounter] = 0; // serial data completed String cmd(InputBuffer_Serial); +#if !FEATURE_COLORIZE_CONSOLE_LOGS Logging.consolePrintln(concat('>', cmd)); +#endif ExecuteCommand_all({EventValueSource::Enum::VALUE_SOURCE_SERIAL, std::move(cmd)}, true); SerialInByteCounter = 0; diff --git a/src/src/Helpers/SerialWriteBuffer.cpp b/src/src/Helpers/SerialWriteBuffer.cpp index 57b699785..e92e9dcfd 100644 --- a/src/src/Helpers/SerialWriteBuffer.cpp +++ b/src/src/Helpers/SerialWriteBuffer.cpp @@ -14,16 +14,17 @@ void SerialWriteBuffer_t::clear() _readpos = 0; } -String colorize(const String& str, uint8_t loglevel) { +String SerialWriteBuffer_t::colorize(const String& str) const { +#if FEATURE_COLORIZE_CONSOLE_LOGS const __FlashStringHelper *format = F("%s"); - switch (loglevel) + switch (_loglevel) { - case LOG_LEVEL_NONE: format = F("\033[1m%s\033[0m"); // Bold or increased intensity + case LOG_LEVEL_NONE: format = F("\033[31;1m%s\033[0m"); // Red + Bold or increased intensity break; - case LOG_LEVEL_INFO: format = F("\033[34m%s\033[0m"); // blue + case LOG_LEVEL_INFO: format = F("\033[36m%s\033[0m"); // Cyan break; - case LOG_LEVEL_ERROR: format = F("\033[91;1m%s\033[0m"); // Red + Bold or increased intensity + case LOG_LEVEL_ERROR: format = F("\033[31;1m%s\033[0m"); // Red + Bold or increased intensity break; #ifndef BUILD_NO_DEBUG case LOG_LEVEL_DEBUG: format = F("\033[32m%s\033[0m"); // Green @@ -32,86 +33,96 @@ String colorize(const String& str, uint8_t loglevel) { break; case LOG_LEVEL_DEBUG_DEV: format = F("\033[33m%s\033[0m"); // Yellow break; -#endif +#endif // ifndef BUILD_NO_DEBUG + default: + return str; } return strformat(format, str.c_str()); +#else +return str; +#endif } size_t SerialWriteBuffer_t::write(Stream& stream, size_t nrBytesToWrite) { size_t bytesWritten = 0; - if ((_timestamp != 0) && (timePassedSince(_timestamp) > LOG_BUFFER_EXPIRE)) { - clear(); + while (bytesWritten < nrBytesToWrite) { - // Mark with empty line we skipped the rest of the message. - bytesWritten += stream.println(F(" ...")); - bytesWritten += stream.println(); - } - - if (_timestamp == 0) { - _readpos = 0; - - // Need to fetch a line - if (!Logging.getNext(_log_destination, _timestamp, _message, _loglevel) || - !loglevelActiveFor(_log_destination, _loglevel)) { - free_string(_message); - _timestamp = 0; - return bytesWritten; - } - - // Prepare prefix - _prefix = format_msec_duration(_timestamp); - - if (_loglevel == LOG_LEVEL_NONE) { - _prefix += F("\033[31;1m :> \033[0m"); // F(" :> "); - } else { - #ifndef LIMIT_BUILD_SIZE - _prefix += strformat(F(" : (%d) "), FreeMem()); - #endif - { - String loglevelDisplayString = getLogLevelDisplayString(_loglevel); - - while (loglevelDisplayString.length() < LOG_LEVEL_MAX_STRING_LENGTH) { - loglevelDisplayString += ' '; - } - _prefix += colorize(loglevelDisplayString, _loglevel); - } - _prefix += F(" | "); - } - } - - const size_t maxToWrite = _prefix.length() + _message.length(); - - if (nrBytesToWrite > maxToWrite) { - nrBytesToWrite = maxToWrite; - } - - bool done = false; - - while (!done && bytesWritten < nrBytesToWrite) { - if (_readpos < _prefix.length()) { - // Write prefix - if (1 != stream.write(_prefix[_readpos])) { return bytesWritten; } - ++bytesWritten; - ++_readpos; - } else if (!_prefix.isEmpty()) { - // Clear prefix - _prefix.clear(); - _readpos = 0; - } else if (_readpos < _message.length()) { - // Write message - if (1 != stream.write(_message[_readpos])) { return bytesWritten; } - ++bytesWritten; - ++_readpos; - } else { - if (1 != stream.write('\n')) { return bytesWritten; } - - // Done with entry, cleanup and leave - ++bytesWritten; + if ((_timestamp != 0) && (timePassedSince(_timestamp) > LOG_BUFFER_EXPIRE)) { clear(); - done = true; + + // Mark with empty line we skipped the rest of the message. + bytesWritten += stream.println(F(" ...")); + bytesWritten += stream.println(); + } + + if (_timestamp == 0) { + _readpos = 0; + + // Need to fetch a line + if (!Logging.getNext(_log_destination, _timestamp, _message, _loglevel) || + !loglevelActiveFor(_log_destination, _loglevel)) { + free_string(_message); + _timestamp = 0; + return bytesWritten; + } + + // Prepare prefix + _prefix = format_msec_duration(_timestamp); + + if (_loglevel == LOG_LEVEL_NONE) { + _prefix += colorize(F(" : > ")); + } else { + #ifndef LIMIT_BUILD_SIZE + _prefix += strformat(F(" : (%d) "), FreeMem()); + #else + _prefix += ' '; + #endif // ifndef LIMIT_BUILD_SIZE + { + String loglevelDisplayString = getLogLevelDisplayString(_loglevel); + + while (loglevelDisplayString.length() < LOG_LEVEL_MAX_STRING_LENGTH) { + loglevelDisplayString += ' '; + } + _prefix += colorize(loglevelDisplayString); + } + _prefix += F(" | "); + } + } + + const size_t maxToWrite = _prefix.length() + _message.length(); + + if (nrBytesToWrite > maxToWrite) { + nrBytesToWrite = maxToWrite; + } + + bool done = false; + + while (!done && bytesWritten < nrBytesToWrite) { + if (_readpos < _prefix.length()) { + // Write prefix + if (1 != stream.write(_prefix[_readpos])) { return bytesWritten; } + ++bytesWritten; + ++_readpos; + } else if (!_prefix.isEmpty()) { + // Clear prefix + _prefix.clear(); + _readpos = 0; + } else if (_readpos < _message.length()) { + // Write message + if (1 != stream.write(_message[_readpos])) { return bytesWritten; } + ++bytesWritten; + ++_readpos; + } else { + if ((bytesWritten + 2) > nrBytesToWrite) { return bytesWritten; } + bytesWritten += stream.println(); + + // Done with entry, cleanup and leave + clear(); + done = true; + } } } return bytesWritten; diff --git a/src/src/Helpers/SerialWriteBuffer.h b/src/src/Helpers/SerialWriteBuffer.h index 398d9b6e4..ce8c6392f 100644 --- a/src/src/Helpers/SerialWriteBuffer.h +++ b/src/src/Helpers/SerialWriteBuffer.h @@ -25,6 +25,7 @@ public: size_t nrBytesToWrite); private: + String colorize(const String& str) const; String _prefix; String _message; From af96cb3e496b78e9f817ae664af2e75e97fb17a7 Mon Sep 17 00:00:00 2001 From: TD-er Date: Wed, 15 Oct 2025 20:17:42 +0200 Subject: [PATCH 379/564] [Log] Clearly mark commands in log + source of the command --- src/src/Commands/Diagnostic.cpp | 5 ++-- src/src/Commands/InternalCommands.cpp | 20 +++++++------- src/src/Commands/Rules.cpp | 2 +- src/src/DataTypes/EventValueSource.cpp | 37 ++++++++++++++++++++++++++ src/src/DataTypes/EventValueSource.h | 4 +++ src/src/ESPEasyCore/Controller.cpp | 20 ++------------ src/src/ESPEasyCore/Controller.h | 2 -- src/src/Helpers/Networking.cpp | 2 +- 8 files changed, 57 insertions(+), 35 deletions(-) diff --git a/src/src/Commands/Diagnostic.cpp b/src/src/Commands/Diagnostic.cpp index e35c9693e..8281f47bd 100644 --- a/src/src/Commands/Diagnostic.cpp +++ b/src/src/Commands/Diagnostic.cpp @@ -9,7 +9,6 @@ #include "../ESPEasyCore/ESPEasy_backgroundtasks.h" #include "../ESPEasyCore/ESPEasy_Log.h" -#include "../ESPEasyCore/Controller.h" // For SourceNeedsStatusUpdate, should be moved to some more generic location #include "../ESPEasyCore/Serial.h" #include "../Globals/Device.h" @@ -168,13 +167,13 @@ String Command_logentry(struct EventStruct *event, const char *Line) ) { level = event->Par2; } String res = tolerantParseStringKeepCase(Line, 2); #if FEATURE_COLORIZE_CONSOLE_LOGS - if (!SourceNeedsStatusUpdate(event->Source)) { + if (!EventValueSource::isExternalSource(event->Source)) { addLog(LOG_LEVEL_NONE, Line); } #endif addLog(level, res); #if FEATURE_COLORIZE_CONSOLE_LOGS - if (!SourceNeedsStatusUpdate(event->Source)) { + if (!EventValueSource::isExternalSource(event->Source)) { addLog(LOG_LEVEL_NONE, res); } #endif diff --git a/src/src/Commands/InternalCommands.cpp b/src/src/Commands/InternalCommands.cpp index dd3fecc21..275fcc2b1 100644 --- a/src/src/Commands/InternalCommands.cpp +++ b/src/src/Commands/InternalCommands.cpp @@ -182,6 +182,16 @@ bool do_command_case_check(command_case_data & data, return false; } +#if FEATURE_COLORIZE_CONSOLE_LOGS + if (EventValueSource::isExternalSource(data.event->Source)) { + addLog(LOG_LEVEL_NONE, + strformat( + F("Cmd (%s) : %s"), + FsP(EventValueSource::toString(data.event->Source)), + data.line.c_str())); + } +#endif + // FIXME TD-er: Do not check nr arguments from MQTT source. // See https://github.com/letscontrolit/ESPEasy/issues/3344 // C005 does recreate command partly from topic and published message @@ -197,16 +207,6 @@ bool do_command_case_check(command_case_data & data, return true; // Command is handled } } - -#if FEATURE_COLORIZE_CONSOLE_LOGS - if (SourceNeedsStatusUpdate(data.event->Source)) { - addLog(LOG_LEVEL_NONE, - strformat( - F("Cmd (%s) : %s"), - FsP(EventValueSource::toString(data.event->Source)), - data.line.c_str())); - } -#endif data.retval = true; // Mark the command should be executed. return true; // Command is handled } diff --git a/src/src/Commands/Rules.cpp b/src/src/Commands/Rules.cpp index cbf2471e9..5339986ae 100644 --- a/src/src/Commands/Rules.cpp +++ b/src/src/Commands/Rules.cpp @@ -54,7 +54,7 @@ const __FlashStringHelper * Command_Rules_Events(struct EventStruct *event, cons { if (Settings.UseRules) { const bool executeImmediately = - SourceNeedsStatusUpdate(event->Source) || + EventValueSource::SourceNeedsStatusUpdate(event->Source) || event->Source == EventValueSource::Enum::VALUE_SOURCE_RULES || event->Source == EventValueSource::Enum::VALUE_SOURCE_RULES_RESTRICTED; diff --git a/src/src/DataTypes/EventValueSource.cpp b/src/src/DataTypes/EventValueSource.cpp index e1c34e9d4..c4acbf193 100644 --- a/src/src/DataTypes/EventValueSource.cpp +++ b/src/src/DataTypes/EventValueSource.cpp @@ -40,3 +40,40 @@ bool EventValueSource::partOfGroup(EventValueSource::Enum source, EventValueSour } return false; } + +bool EventValueSource::SourceNeedsStatusUpdate(EventValueSource::Enum eventSource) +{ + switch (eventSource) + { + case EventValueSource::Enum::VALUE_SOURCE_HTTP: + case EventValueSource::Enum::VALUE_SOURCE_SERIAL: + case EventValueSource::Enum::VALUE_SOURCE_MQTT: + case EventValueSource::Enum::VALUE_SOURCE_WEB_FRONTEND: + return true; + + default: + break; + } + return false; +} + +bool EventValueSource::isExternalSource(EventValueSource::Enum eventSource) +{ + switch (eventSource) + { + case EventValueSource::Enum::VALUE_SOURCE_NOT_SET: + case EventValueSource::Enum::VALUE_SOURCE_NR_VALUES: + case EventValueSource::Enum::VALUE_SOURCE_SYSTEM: + case EventValueSource::Enum::VALUE_SOURCE_RULES: + case EventValueSource::Enum::VALUE_SOURCE_RULES_RESTRICTED: + break; + + case EventValueSource::Enum::VALUE_SOURCE_SERIAL: + case EventValueSource::Enum::VALUE_SOURCE_UDP: + case EventValueSource::Enum::VALUE_SOURCE_WEB_FRONTEND: + case EventValueSource::Enum::VALUE_SOURCE_HTTP: + case EventValueSource::Enum::VALUE_SOURCE_MQTT: + return true; +} + return false; +} \ No newline at end of file diff --git a/src/src/DataTypes/EventValueSource.h b/src/src/DataTypes/EventValueSource.h index d0f427254..751c0305a 100644 --- a/src/src/DataTypes/EventValueSource.h +++ b/src/src/DataTypes/EventValueSource.h @@ -30,6 +30,10 @@ struct EventValueSource { }; + static bool SourceNeedsStatusUpdate(EventValueSource::Enum eventSource); + + static bool isExternalSource(EventValueSource::Enum eventSource); + static const __FlashStringHelper* toString(Enum); static bool partOfGroup(EventValueSource::Enum source, diff --git a/src/src/ESPEasyCore/Controller.cpp b/src/src/ESPEasyCore/Controller.cpp index 00908c22d..1258a3f3b 100644 --- a/src/src/ESPEasyCore/Controller.cpp +++ b/src/src/ESPEasyCore/Controller.cpp @@ -997,28 +997,12 @@ String getLWT_messageDisconnect(const ControllerSettingsStruct& ControllerSettin * Send status info to request source \*********************************************************************************************/ void SendStatusOnlyIfNeeded(struct EventStruct *event, bool param1, uint32_t key, const String& param2, int16_t param3) { - if (SourceNeedsStatusUpdate(event->Source)) { + if (EventValueSource::SourceNeedsStatusUpdate(event->Source)) { SendStatus(event, getPinStateJSON(param1, key, param2, param3)); printToWeb = false; // SP: 2020-06-12: to avoid to add more info to a JSON structure } } -bool SourceNeedsStatusUpdate(EventValueSource::Enum eventSource) -{ - switch (eventSource) - { - case EventValueSource::Enum::VALUE_SOURCE_HTTP: - case EventValueSource::Enum::VALUE_SOURCE_SERIAL: - case EventValueSource::Enum::VALUE_SOURCE_MQTT: - case EventValueSource::Enum::VALUE_SOURCE_WEB_FRONTEND: - return true; - - default: - break; - } - return false; -} - void SendStatus(struct EventStruct *event, const __FlashStringHelper *status) { SendStatus(event, String(status)); } void SendStatus(struct EventStruct *event, const String& status) @@ -1026,7 +1010,7 @@ void SendStatus(struct EventStruct *event, const String& status) if (status.isEmpty()) { return; } #if FEATURE_COLORIZE_CONSOLE_LOGS - if (SourceNeedsStatusUpdate(event->Source)) { + if (EventValueSource::isExternalSource(event->Source)) { addLog(LOG_LEVEL_NONE, status); } #endif diff --git a/src/src/ESPEasyCore/Controller.h b/src/src/ESPEasyCore/Controller.h index 6b5f4ebb4..21e4f59d7 100644 --- a/src/src/ESPEasyCore/Controller.h +++ b/src/src/ESPEasyCore/Controller.h @@ -59,8 +59,6 @@ String getLWT_messageDisconnect(const ControllerSettingsStruct& ControllerSettin \*********************************************************************************************/ void SendStatusOnlyIfNeeded(struct EventStruct *event, bool param1, uint32_t key, const String& param2, int16_t param3); -bool SourceNeedsStatusUpdate(EventValueSource::Enum eventSource); - void SendStatus(struct EventStruct *event, const __FlashStringHelper * status); void SendStatus(struct EventStruct *event, const String& status); diff --git a/src/src/Helpers/Networking.cpp b/src/src/Helpers/Networking.cpp index 41300c423..7ba446041 100644 --- a/src/src/Helpers/Networking.cpp +++ b/src/src/Helpers/Networking.cpp @@ -335,7 +335,7 @@ void checkUDP() )); } # endif // ifndef BUILD_NO_DEBUG - ExecuteCommand_all({ EventValueSource::Enum::VALUE_SOURCE_SYSTEM, &packetBuffer[0] }, true); + ExecuteCommand_all({ EventValueSource::Enum::VALUE_SOURCE_UDP, &packetBuffer[0] }, true); } else { From 68e2c3cb1891602060c1d32e4f37a6629ccd9623 Mon Sep 17 00:00:00 2001 From: TD-er Date: Wed, 15 Oct 2025 21:56:17 +0200 Subject: [PATCH 380/564] [Log] Cleanup and simplify log level code --- src/src/DataTypes/LogLevels.cpp | 56 ++++++++++++++++++++++++ src/src/DataTypes/LogLevels.h | 25 +++++++---- src/src/ESPEasyCore/ESPEasy_Log.cpp | 40 ----------------- src/src/ESPEasyCore/ESPEasy_Log.h | 45 +++++++++---------- src/src/Helpers/Log_Helper.cpp | 1 - src/src/WebServer/AdvancedConfigPage.cpp | 12 +---- src/src/WebServer/Log.cpp | 4 +- 7 files changed, 95 insertions(+), 88 deletions(-) create mode 100644 src/src/DataTypes/LogLevels.cpp diff --git a/src/src/DataTypes/LogLevels.cpp b/src/src/DataTypes/LogLevels.cpp new file mode 100644 index 000000000..4264cd5f1 --- /dev/null +++ b/src/src/DataTypes/LogLevels.cpp @@ -0,0 +1,56 @@ +#include "../DataTypes/LogLevels.h" + +#include "../DataTypes/FormSelectorOptions.h" + +const __FlashStringHelper *logLevelDisplayStrings[] = +{ + F("None"), + F("Error"), + F("Info") +#ifndef BUILD_NO_DEBUG + , F("Debug") + , F("Debug More") + , F("Debug dev") +#endif // ifndef BUILD_NO_DEBUG +}; + +constexpr int logLevels[] = +{ + LOG_LEVEL_NONE, + LOG_LEVEL_ERROR, + LOG_LEVEL_INFO + +#ifndef BUILD_NO_DEBUG + , LOG_LEVEL_DEBUG + , LOG_LEVEL_DEBUG_MORE + , LOG_LEVEL_DEBUG_DEV +#endif // ifndef BUILD_NO_DEBUG + +}; + +uint8_t LOG_LEVEL_NRELEMENTS() { return NR_ELEMENTS(logLevels); } + +const __FlashStringHelper* getLogLevelDisplayString(int logLevel) { + for (uint8_t i = 0; i < NR_ELEMENTS(logLevels); ++i) { + if (logLevels[i] == logLevel) { + return logLevelDisplayStrings[logLevel]; + } + } + return F(""); +} + +const __FlashStringHelper* getLogLevelDisplayStringFromIndex(uint8_t index, int& logLevel) { + if (index < NR_ELEMENTS(logLevels)) { + logLevel = logLevels[index]; + return logLevelDisplayStrings[index]; + } + logLevel = -1; + return F(""); +} + +void addLogLevelFormSelectorOptions(const String& id, int choice) +{ + const FormSelectorOptions selector(NR_ELEMENTS(logLevels), logLevelDisplayStrings, logLevels); + + selector.addSelector(id, choice); +} diff --git a/src/src/DataTypes/LogLevels.h b/src/src/DataTypes/LogLevels.h index d62bf7f3d..201855589 100644 --- a/src/src/DataTypes/LogLevels.h +++ b/src/src/DataTypes/LogLevels.h @@ -2,16 +2,15 @@ #include "../../ESPEasy_common.h" -#define LOG_LEVEL_NONE 0 // console output is also loglevel none, only shown on those 'log destinations' subscribing to get console output. + +#define LOG_LEVEL_NONE 0 // console output is also loglevel none, only shown on those 'log destinations' subscribing to + // get console output. #define LOG_LEVEL_ERROR 1 #define LOG_LEVEL_INFO 2 #ifndef BUILD_NO_DEBUG # define LOG_LEVEL_DEBUG 3 # define LOG_LEVEL_DEBUG_MORE 4 # define LOG_LEVEL_DEBUG_DEV 9 // use for testing/debugging only, not for regular use -# define LOG_LEVEL_NRELEMENTS 5 // Update this and getLogLevelDisplayString() when new log levels are added -#else // ifndef BUILD_NO_DEBUG -# define LOG_LEVEL_NRELEMENTS 2 // Update this and getLogLevelDisplayString() when new log levels are added #endif // ifndef BUILD_NO_DEBUG #define LOG_TO_SERIAL 0 @@ -20,11 +19,21 @@ #define LOG_TO_SDCARD 3 #define LOG_TO_SERIAL_EXTRA 4 -#define NR_LOG_TO_DESTINATIONS 5 // Update this when adding extra log output streams +#define NR_LOG_TO_DESTINATIONS 5 // Update this when adding extra log output streams #ifdef BUILD_NO_DEBUG -#define LOG_LEVEL_MAX_STRING_LENGTH 6 +# define LOG_LEVEL_MAX_STRING_LENGTH 6 #else -#define LOG_LEVEL_MAX_STRING_LENGTH 10 -#endif \ No newline at end of file +# define LOG_LEVEL_MAX_STRING_LENGTH 10 +#endif // ifdef BUILD_NO_DEBUG + +uint8_t LOG_LEVEL_NRELEMENTS(); + +const __FlashStringHelper* getLogLevelDisplayString(int logLevel); + +const __FlashStringHelper* getLogLevelDisplayStringFromIndex(uint8_t index, + int & logLevel); + +void addLogLevelFormSelectorOptions(const String& id, + int choice); diff --git a/src/src/ESPEasyCore/ESPEasy_Log.cpp b/src/src/ESPEasyCore/ESPEasy_Log.cpp index 203fcfc4b..f8dbf5121 100644 --- a/src/src/ESPEasyCore/ESPEasy_Log.cpp +++ b/src/src/ESPEasyCore/ESPEasy_Log.cpp @@ -31,46 +31,6 @@ void initLog() /********************************************************************************************\ Logging \*********************************************************************************************/ -const __FlashStringHelper* getLogLevelDisplayString(int logLevel) { - switch (logLevel) - { - case LOG_LEVEL_NONE: return F("None"); - case LOG_LEVEL_ERROR: return F("Error"); - case LOG_LEVEL_INFO: return F("Info"); -#ifndef BUILD_NO_DEBUG - case LOG_LEVEL_DEBUG: return F("Debug"); - case LOG_LEVEL_DEBUG_MORE: return F("Debug More"); - case LOG_LEVEL_DEBUG_DEV: return F("Debug dev"); -#endif // ifndef BUILD_NO_DEBUG - - default: - break; - } - return F(""); -} - -const __FlashStringHelper* getLogLevelDisplayStringFromIndex(uint8_t index, int& logLevel) { - switch (index) - { - case 0: logLevel = LOG_LEVEL_ERROR; - break; - case 1: logLevel = LOG_LEVEL_INFO; - break; -#ifndef BUILD_NO_DEBUG - case 2: logLevel = LOG_LEVEL_DEBUG; - break; - case 3: logLevel = LOG_LEVEL_DEBUG_MORE; - break; - case 4: logLevel = LOG_LEVEL_DEBUG_DEV; - break; -#endif // ifndef BUILD_NO_DEBUG - - default: logLevel = -1; - return F(""); - } - return getLogLevelDisplayString(logLevel); -} - void disableSerialLog() { log_to_serial_disabled = true; setLogLevelFor(LOG_TO_SERIAL, 0); diff --git a/src/src/ESPEasyCore/ESPEasy_Log.h b/src/src/ESPEasyCore/ESPEasy_Log.h index f4308c7d3..54bf5e5ea 100644 --- a/src/src/ESPEasyCore/ESPEasy_Log.h +++ b/src/src/ESPEasyCore/ESPEasy_Log.h @@ -8,45 +8,40 @@ #include "../DataTypes/LogLevels.h" - // Move the log String so it does not have to be copied in the web log #define addLogMove(L, S) addToLogMove(L, std::move(S)) /********************************************************************************************\ Logging \*********************************************************************************************/ -void initLog(); +void initLog(); -const __FlashStringHelper* getLogLevelDisplayString(int logLevel); -const __FlashStringHelper* getLogLevelDisplayStringFromIndex(uint8_t index, - int & logLevel); +void disableSerialLog(); -void disableSerialLog(); +void setLogLevelFor(uint8_t destination, + uint8_t logLevel); -void setLogLevelFor(uint8_t destination, - uint8_t logLevel); +void updateLogLevelCache(); -void updateLogLevelCache(); +bool loglevelActiveFor(uint8_t logLevel); -bool loglevelActiveFor(uint8_t logLevel); +uint8_t getSerialLogLevel(); -uint8_t getSerialLogLevel(); +uint8_t getWebLogLevel(); -uint8_t getWebLogLevel(); +bool loglevelActiveFor(uint8_t destination, + uint8_t logLevel); -bool loglevelActiveFor(uint8_t destination, - uint8_t logLevel); +void addLog(uint8_t logLevel, + const __FlashStringHelper *str); +void addLog(uint8_t logLevel, + const char *line); +void addLog(uint8_t logLevel, + String&& str); -void addLog(uint8_t logLevel, - const __FlashStringHelper *str); -void addLog(uint8_t logLevel, - const char *line); -void addLog(uint8_t logLevel, - String&& str); +void addLog(uint8_t logLevel, + const String& str); -void addLog(uint8_t logLevel, - const String& str); - -void addToLogMove(uint8_t logLevel, - String&& str); +void addToLogMove(uint8_t logLevel, + String&& str); diff --git a/src/src/Helpers/Log_Helper.cpp b/src/src/Helpers/Log_Helper.cpp index 2aa2ecb06..2501fe3a7 100644 --- a/src/src/Helpers/Log_Helper.cpp +++ b/src/src/Helpers/Log_Helper.cpp @@ -13,7 +13,6 @@ # include "../Helpers/ESPEasy_Storage.h" #endif // if FEATURE_SD - void addToSysLog(uint8_t logLevel, const String& str) { if (loglevelActiveFor(LOG_TO_SYSLOG, logLevel)) { diff --git a/src/src/WebServer/AdvancedConfigPage.cpp b/src/src/WebServer/AdvancedConfigPage.cpp index 56982b86d..f1d493214 100644 --- a/src/src/WebServer/AdvancedConfigPage.cpp +++ b/src/src/WebServer/AdvancedConfigPage.cpp @@ -555,17 +555,7 @@ void addFormLogLevelSelect(LabelType::Enum label, int choice) #endif addRowLabel(getLabel(label)); - const __FlashStringHelper * options[LOG_LEVEL_NRELEMENTS + 1]; - int optionValues[LOG_LEVEL_NRELEMENTS + 1] = { 0 }; - - options[0] = getLogLevelDisplayString(0); - - for (int i = 0; i < LOG_LEVEL_NRELEMENTS; ++i) { - options[i + 1] = getLogLevelDisplayStringFromIndex(i, optionValues[i + 1]); - } - const FormSelectorOptions selector(LOG_LEVEL_NRELEMENTS + 1, options, optionValues); - selector.addSelector(getInternalLabel(label), choice); - + addLogLevelFormSelectorOptions(getInternalLabel(label), choice); } void addFormLogFacilitySelect(const __FlashStringHelper * label, const __FlashStringHelper * id, int choice) diff --git a/src/src/WebServer/Log.cpp b/src/src/WebServer/Log.cpp index a80310ac4..b418ee7c7 100644 --- a/src/src/WebServer/Log.cpp +++ b/src/src/WebServer/Log.cpp @@ -68,12 +68,10 @@ void handle_log_JSON() { if (legendWriter) { legendWriter->setIsArray(); - for (uint8_t i = 0; i < LOG_LEVEL_NRELEMENTS; ++i) { + for (uint8_t i = LOG_LEVEL_ERROR; i < LOG_LEVEL_NRELEMENTS(); ++i) { auto loglevelWriter = legendWriter->createChild(); if (loglevelWriter) { - - int loglevel; loglevelWriter->write({ F("label"), getLogLevelDisplayStringFromIndex(i, loglevel) }); loglevelWriter->write({ F("loglevel"), loglevel }); From 6961465501bde19129dc6aa1b8ad1af6e9f3c599 Mon Sep 17 00:00:00 2001 From: TD-er Date: Thu, 16 Oct 2025 14:35:27 +0200 Subject: [PATCH 381/564] [Log] Make syslog to use the new log queue + fix syslog crashes --- src/src/Commands/UDP.cpp | 16 ++- src/src/DataStructs/PluginStats_timestamp.cpp | 10 +- src/src/ESPEasyCore/ESPEasy_Console_Port.cpp | 6 +- .../ESPEasyCore/ESPEasy_backgroundtasks.cpp | 2 + src/src/Globals/Logging.cpp | 1 + src/src/Globals/Logging.h | 3 + src/src/Helpers/ESPEasy_time.cpp | 15 ++ src/src/Helpers/ESPEasy_time.h | 4 + src/src/Helpers/LogStreamWriter.cpp | 113 +++++++++++++++ src/src/Helpers/LogStreamWriter.h | 51 +++++++ src/src/Helpers/Log_Helper.cpp | 11 -- src/src/Helpers/Networking.cpp | 60 -------- src/src/Helpers/Networking.h | 5 - src/src/Helpers/SerialWriteBuffer.cpp | 132 +++++------------ src/src/Helpers/SerialWriteBuffer.h | 34 ++--- src/src/Helpers/SyslogWriter.cpp | 133 ++++++++++++++++++ src/src/Helpers/SyslogWriter.h | 23 +++ 17 files changed, 406 insertions(+), 213 deletions(-) create mode 100644 src/src/Helpers/LogStreamWriter.cpp create mode 100644 src/src/Helpers/LogStreamWriter.h create mode 100644 src/src/Helpers/SyslogWriter.cpp create mode 100644 src/src/Helpers/SyslogWriter.h diff --git a/src/src/Commands/UDP.cpp b/src/src/Commands/UDP.cpp index 11159eae9..3a0ee63fb 100644 --- a/src/src/Commands/UDP.cpp +++ b/src/src/Commands/UDP.cpp @@ -82,20 +82,26 @@ const __FlashStringHelper* Command_UDP_SendToUPD(struct EventStruct *event, cons IPAddress UDP_IP; if (UDP_IP.fromString(ip)) { + WiFiUDP udp; + + if (!beginWiFiUDP_randomPort(udp)) { + return return_command_failed_flashstr(); + } + FeedSW_watchdog(); - portUDP.beginPacket(UDP_IP, port); + udp.beginPacket(UDP_IP, port); if (handleMix) { - portUDP.write(&argument[0], argument.size()); + udp.write(&argument[0], argument.size()); } else { #if defined(ESP8266) - portUDP.write(message.c_str(), message.length()); + udp.write(message.c_str(), message.length()); #endif // if defined(ESP8266) #if defined(ESP32) - portUDP.write(reinterpret_cast(message.c_str()), message.length()); + udp.write(reinterpret_cast(message.c_str()), message.length()); #endif // if defined(ESP32) } - portUDP.endPacket(); + udp.endPacket(); FeedSW_watchdog(); delay(0); } diff --git a/src/src/DataStructs/PluginStats_timestamp.cpp b/src/src/DataStructs/PluginStats_timestamp.cpp index f71f05873..73b21af66 100644 --- a/src/src/DataStructs/PluginStats_timestamp.cpp +++ b/src/src/DataStructs/PluginStats_timestamp.cpp @@ -104,17 +104,9 @@ uint32_t PluginStats_timestamp::systemMicros_to_internalTimestamp(const int64_t& int64_t PluginStats_timestamp::internalTimestamp_to_systemMicros(const uint32_t& internalTimestamp) const { - const uint64_t cur_micros = getMicros64(); - const uint64_t overflow_step = 4294967296ull * _internal_to_micros_ratio; - - uint64_t sysMicros = static_cast(internalTimestamp) * _internal_to_micros_ratio; - // Try to get in the range of the current system micros // This only does play a role in high res mode, when uptime is over 994 days. - while ((sysMicros + overflow_step) < cur_micros) { - sysMicros += overflow_step; - } - return sysMicros; + return node_time.internalTimestamp_to_systemMicros(internalTimestamp, _internal_to_micros_ratio); } #endif // if FEATURE_PLUGIN_STATS diff --git a/src/src/ESPEasyCore/ESPEasy_Console_Port.cpp b/src/src/ESPEasyCore/ESPEasy_Console_Port.cpp index 2e21cbf3a..62d33526a 100644 --- a/src/src/ESPEasyCore/ESPEasy_Console_Port.cpp +++ b/src/src/ESPEasyCore/ESPEasy_Console_Port.cpp @@ -107,11 +107,7 @@ bool EspEasy_Console_Port::process_serialWriteBuffer() #ifdef ESP32 if (!xPortCanYield()) return false; #endif - const int snip = _serial->availableForWrite(); - - if (snip > 0) { - return _serialWriteBuffer.write(*_serial, snip) != 0; - } + return _serialWriteBuffer.process(_serial); } return false; } diff --git a/src/src/ESPEasyCore/ESPEasy_backgroundtasks.cpp b/src/src/ESPEasyCore/ESPEasy_backgroundtasks.cpp index 365acd411..b9c87d09e 100644 --- a/src/src/ESPEasyCore/ESPEasy_backgroundtasks.cpp +++ b/src/src/ESPEasyCore/ESPEasy_backgroundtasks.cpp @@ -7,6 +7,7 @@ #include "../../ESPEasy/net/ESPEasyNetwork.h" #include "../ESPEasyCore/Serial.h" #include "../../ESPEasy/net/Globals/NetworkState.h" +#include "../Globals/Logging.h" #include "../Globals/Services.h" #include "../Globals/Settings.h" #if FEATURE_RTTTL && FEATURE_ANYRTTTL_LIB && FEATURE_ANYRTTTL_ASYNC @@ -74,6 +75,7 @@ void backgroundtasks() */ process_serialWriteBuffer(); + syslogWriter.process(nullptr); if (!UseRTOSMultitasking) { serial(); diff --git a/src/src/Globals/Logging.cpp b/src/src/Globals/Logging.cpp index 64b42915a..ee1924e50 100644 --- a/src/src/Globals/Logging.cpp +++ b/src/src/Globals/Logging.cpp @@ -2,6 +2,7 @@ LogHelper Logging; +SyslogWriter syslogWriter(LOG_TO_SYSLOG); uint8_t highest_active_log_level = 0; bool log_to_serial_disabled = false; diff --git a/src/src/Globals/Logging.h b/src/src/Globals/Logging.h index 75d304eba..631b0e3dc 100644 --- a/src/src/Globals/Logging.h +++ b/src/src/Globals/Logging.h @@ -5,12 +5,15 @@ #include #include "../Helpers/Log_Helper.h" +#include "../Helpers/SyslogWriter.h" + extern uint8_t highest_active_log_level; extern bool log_to_serial_disabled; extern LogHelper Logging; +extern SyslogWriter syslogWriter; #endif // GLOBALS_LOGGING_H \ No newline at end of file diff --git a/src/src/Helpers/ESPEasy_time.cpp b/src/src/Helpers/ESPEasy_time.cpp index 365b1c18b..65eb326ab 100644 --- a/src/src/Helpers/ESPEasy_time.cpp +++ b/src/src/Helpers/ESPEasy_time.cpp @@ -206,6 +206,21 @@ uint32_t ESPEasy_time::systemMicros_to_Localtime(const int64_t& systemMicros, ui return time_zone.toLocal(systemMicros_to_Unixtime(systemMicros, unix_time_frac)); } +int64_t ESPEasy_time::internalTimestamp_to_systemMicros(const uint32_t& internalTimestamp, uint32_t internal_to_micros_ratio) const +{ + const uint64_t cur_micros = getMicros64(); + const uint64_t overflow_step = 4294967296ull * internal_to_micros_ratio; + + uint64_t sysMicros = static_cast(internalTimestamp) * internal_to_micros_ratio; + + // Try to get in the range of the current system micros + while ((sysMicros + overflow_step) < cur_micros) { + sysMicros += overflow_step; + } + return sysMicros; + +} + void ESPEasy_time::initTime() { nextSyncTime = 0; diff --git a/src/src/Helpers/ESPEasy_time.h b/src/src/Helpers/ESPEasy_time.h index d10f219ec..7f5569d07 100644 --- a/src/src/Helpers/ESPEasy_time.h +++ b/src/src/Helpers/ESPEasy_time.h @@ -72,6 +72,10 @@ public: uint32_t systemMicros_to_Localtime(const int64_t& systemMicros, uint32_t & unix_time_frac) const; + // Try to get in the range of the current system micros using given ratio + // Ratio of 1000 reflects millis. Ratio of 20000 reflects 1/50 sec (20 msec) + int64_t internalTimestamp_to_systemMicros(const uint32_t& internalTimestamp, uint32_t internal_to_micros_ratio = 1000u) const; + void initTime(); unsigned long getLocalUnixTime() const; diff --git a/src/src/Helpers/LogStreamWriter.cpp b/src/src/Helpers/LogStreamWriter.cpp new file mode 100644 index 000000000..9ebdc7991 --- /dev/null +++ b/src/src/Helpers/LogStreamWriter.cpp @@ -0,0 +1,113 @@ +#include "../Helpers/LogStreamWriter.h" + +#include "../Globals/Logging.h" + +#include "../Helpers/ESPEasy_time_calc.h" +#include "../Helpers/Memory.h" +#include "../Helpers/StringConverter.h" + +void LogStreamWriter::clear() +{ + _prefix.clear(); + free_string(_message); + _timestamp = 0; + _readpos = 0; +} + +bool LogStreamWriter::process(Stream*stream) +{ + if (stream == nullptr) { return false; } + return write(*stream, stream->availableForWrite()) != 0; +} + +uint32_t LogStreamWriter::getNrMessages() const +{ + return Logging.getNrMessages(_log_destination); +} + +size_t LogStreamWriter::write(Stream& stream, size_t nrBytesToWrite) +{ + size_t bytesWritten = 0; + + while (bytesWritten < nrBytesToWrite) { + const size_t written = write_item(stream, (nrBytesToWrite - bytesWritten)); + + if (written == 0) { + return bytesWritten; + } + bytesWritten += written; + } + return bytesWritten; +} + +size_t LogStreamWriter::write_single_item(Stream& stream, + size_t nrBytesToWrite) +{ + const size_t res = write_item(stream, nrBytesToWrite); + + clear(); + return res; +} + +size_t LogStreamWriter::write_item(Stream& stream, + size_t nrBytesToWrite) +{ + size_t bytesWritten = 0; + + if ((_timestamp != 0) && (timePassedSince(_timestamp) > LOG_BUFFER_EXPIRE)) { + clear(); + bytesWritten += write_skipping(stream); + } + + if (_timestamp == 0) { + _readpos = 0; + + // Need to fetch a line + if (!Logging.getNext(_log_destination, _timestamp, _message, _loglevel) || + !loglevelActiveFor(_log_destination, _loglevel)) { + free_string(_message); + _timestamp = 0; + return bytesWritten; + } + + prepare_prefix(); + } + + const size_t maxToWrite = _prefix.length() + _message.length(); + + if (nrBytesToWrite > maxToWrite) { + nrBytesToWrite = maxToWrite; + } + + bool done = false; + + while (!done && bytesWritten < nrBytesToWrite) { + if (_readpos < _prefix.length()) { + // Write prefix + if (1 != stream.write(_prefix[_readpos])) { return bytesWritten; } + ++bytesWritten; + ++_readpos; + } else if (!_prefix.isEmpty()) { + // Clear prefix + _prefix.clear(); + _readpos = 0; + } else if (_readpos < _message.length()) { + // Write message + if (1 != stream.write(_message[_readpos])) { return bytesWritten; } + ++bytesWritten; + ++_readpos; + } else { + if ((bytesWritten + 2) > nrBytesToWrite) { return bytesWritten; } + bytesWritten += stream.println(); + + // Done with entry, cleanup and leave + clear(); + done = true; + } + } + return bytesWritten; +} + +size_t LogStreamWriter::write_skipping(Stream& stream) { return 0; } + +void LogStreamWriter::prepare_prefix() {} diff --git a/src/src/Helpers/LogStreamWriter.h b/src/src/Helpers/LogStreamWriter.h new file mode 100644 index 000000000..aa59c47f8 --- /dev/null +++ b/src/src/Helpers/LogStreamWriter.h @@ -0,0 +1,51 @@ +#pragma once + +#include "../../ESPEasy_common.h" + +class LogStreamWriter +{ + +public: + + LogStreamWriter(uint8_t log_destination) : _log_destination(log_destination) {} + + virtual ~LogStreamWriter() {} + + virtual bool process(Stream*stream); + + virtual uint32_t getNrMessages() const; + + virtual void clear(); + +protected: + + // Write continuously until either nrBytesToWrite was reached or no new messages were available to process. + // @retval Number of bytes written. Zero when no new message was available to process. + virtual size_t write(Stream& stream, + size_t nrBytesToWrite); + + // Write single item and clear() on return. + // This way each call starts with a new item and long messages may get truncated based on nrBytesToWrite + // @retval Number of bytes written. Zero when no new message was available to process. + virtual size_t write_single_item(Stream& stream, + size_t nrBytesToWrite); + + virtual size_t write_item(Stream& stream, + size_t nrBytesToWrite); + + + virtual size_t write_skipping(Stream& stream); + + virtual void prepare_prefix(); + + + String _prefix; + String _message; + uint32_t _timestamp{}; + uint32_t _readpos{}; + uint8_t _loglevel{}; + + const uint8_t _log_destination; + + +}; // class LogStreamWriter diff --git a/src/src/Helpers/Log_Helper.cpp b/src/src/Helpers/Log_Helper.cpp index 2501fe3a7..6ecdb1ad1 100644 --- a/src/src/Helpers/Log_Helper.cpp +++ b/src/src/Helpers/Log_Helper.cpp @@ -13,13 +13,6 @@ # include "../Helpers/ESPEasy_Storage.h" #endif // if FEATURE_SD -void addToSysLog(uint8_t logLevel, const String& str) -{ - if (loglevelActiveFor(LOG_TO_SYSLOG, logLevel)) { - sendSyslog(logLevel, str); - } -} - void addToSDLog(uint8_t logLevel, const String& str) { #if FEATURE_SD @@ -76,7 +69,6 @@ uint32_t LogHelper::getNrMessages(uint8_t logDestination) const void LogHelper::loop() { const uint8_t destinations[] = { - LOG_TO_SYSLOG, LOG_TO_SDCARD }; @@ -89,9 +81,6 @@ void LogHelper::loop() { switch (destinations[i]) { - case LOG_TO_SYSLOG: - addToSysLog(loglevel, message); - break; case LOG_TO_SDCARD: addToSDLog(loglevel, message); break; diff --git a/src/src/Helpers/Networking.cpp b/src/src/Helpers/Networking.cpp index 7ba446041..51dac8ca1 100644 --- a/src/src/Helpers/Networking.cpp +++ b/src/src/Helpers/Networking.cpp @@ -94,66 +94,6 @@ void etharp_gratuitous_r(struct netif *netif) { tcpip_callback_with_block((t #include -/*********************************************************************************************\ - Syslog client -\*********************************************************************************************/ -void sendSyslog(uint8_t logLevel, const String& message) -{ - if ((Settings.Syslog_IP[0] != 0) && ESPEasy::net::NetworkConnected()) - { - IPAddress broadcastIP(Settings.Syslog_IP[0], Settings.Syslog_IP[1], Settings.Syslog_IP[2], Settings.Syslog_IP[3]); - - FeedSW_watchdog(); - - if (portUDP.beginPacket(broadcastIP, Settings.SyslogPort) == 0) { - // problem resolving the hostname or port - return; - } - unsigned int prio = Settings.SyslogFacility * 8; - - if (logLevel == LOG_LEVEL_ERROR) { - prio += 3; // syslog error - } - else if (logLevel == LOG_LEVEL_INFO) { - prio += 5; // syslog notice - } - else { - prio += 7; - } - - // An RFC3164 compliant message must be formated like : "[TimeStamp ]Hostname TaskName: Message" - - // Using Settings.Name as the Hostname (Hostname must NOT content space) - { - String header; - header += '<'; - header += prio; - header += '>'; - header += ESPEasy::net::NetworkCreateRFCCompliantHostname(true); - header += F(" EspEasy: "); - header.trim(); - header.replace(' ', '_'); - - #ifdef ESP8266 - portUDP.write(header.c_str(), header.length()); - #endif // ifdef ESP8266 - #ifdef ESP32 - portUDP.write(reinterpret_cast(header.c_str()), header.length()); - #endif // ifdef ESP32 - } - - #ifdef ESP8266 - portUDP.write(message.c_str(), message.length()); - #endif // ifdef ESP8266 - #ifdef ESP32 - portUDP.write(reinterpret_cast(message.c_str()), message.length()); - #endif // ifdef ESP32 - - portUDP.endPacket(); - FeedSW_watchdog(); - delay(0); - } -} #if FEATURE_ESPEASY_P2P diff --git a/src/src/Helpers/Networking.h b/src/src/Helpers/Networking.h index ad8e39154..6526bd601 100644 --- a/src/src/Helpers/Networking.h +++ b/src/src/Helpers/Networking.h @@ -17,11 +17,6 @@ #endif -/*********************************************************************************************\ - Syslog client -\*********************************************************************************************/ -void sendSyslog(uint8_t logLevel, const String& message); - #if FEATURE_ESPEASY_P2P diff --git a/src/src/Helpers/SerialWriteBuffer.cpp b/src/src/Helpers/SerialWriteBuffer.cpp index e92e9dcfd..93a8737b6 100644 --- a/src/src/Helpers/SerialWriteBuffer.cpp +++ b/src/src/Helpers/SerialWriteBuffer.cpp @@ -1,18 +1,7 @@ #include "../Helpers/SerialWriteBuffer.h" -#include "../Globals/Logging.h" - -#include "../Helpers/ESPEasy_time_calc.h" -#include "../Helpers/Memory.h" #include "../Helpers/StringConverter.h" -void SerialWriteBuffer_t::clear() -{ - _prefix.clear(); - free_string(_message); - _timestamp = 0; - _readpos = 0; -} String SerialWriteBuffer_t::colorize(const String& str) const { #if FEATURE_COLORIZE_CONSOLE_LOGS @@ -26,104 +15,57 @@ String SerialWriteBuffer_t::colorize(const String& str) const { break; case LOG_LEVEL_ERROR: format = F("\033[31;1m%s\033[0m"); // Red + Bold or increased intensity break; -#ifndef BUILD_NO_DEBUG +# ifndef BUILD_NO_DEBUG case LOG_LEVEL_DEBUG: format = F("\033[32m%s\033[0m"); // Green break; case LOG_LEVEL_DEBUG_MORE: format = F("\033[35m%s\033[0m"); // Purple break; case LOG_LEVEL_DEBUG_DEV: format = F("\033[33m%s\033[0m"); // Yellow break; -#endif // ifndef BUILD_NO_DEBUG +# endif // ifndef BUILD_NO_DEBUG default: return str; } return strformat(format, str.c_str()); -#else -return str; -#endif +#else // if FEATURE_COLORIZE_CONSOLE_LOGS + return str; +#endif // if FEATURE_COLORIZE_CONSOLE_LOGS } -size_t SerialWriteBuffer_t::write(Stream& stream, size_t nrBytesToWrite) + +size_t SerialWriteBuffer_t::write_skipping(Stream& stream) { - size_t bytesWritten = 0; + size_t bytesWritten{}; - while (bytesWritten < nrBytesToWrite) { - - if ((_timestamp != 0) && (timePassedSince(_timestamp) > LOG_BUFFER_EXPIRE)) { - clear(); - - // Mark with empty line we skipped the rest of the message. - bytesWritten += stream.println(F(" ...")); - bytesWritten += stream.println(); - } - - if (_timestamp == 0) { - _readpos = 0; - - // Need to fetch a line - if (!Logging.getNext(_log_destination, _timestamp, _message, _loglevel) || - !loglevelActiveFor(_log_destination, _loglevel)) { - free_string(_message); - _timestamp = 0; - return bytesWritten; - } - - // Prepare prefix - _prefix = format_msec_duration(_timestamp); - - if (_loglevel == LOG_LEVEL_NONE) { - _prefix += colorize(F(" : > ")); - } else { - #ifndef LIMIT_BUILD_SIZE - _prefix += strformat(F(" : (%d) "), FreeMem()); - #else - _prefix += ' '; - #endif // ifndef LIMIT_BUILD_SIZE - { - String loglevelDisplayString = getLogLevelDisplayString(_loglevel); - - while (loglevelDisplayString.length() < LOG_LEVEL_MAX_STRING_LENGTH) { - loglevelDisplayString += ' '; - } - _prefix += colorize(loglevelDisplayString); - } - _prefix += F(" | "); - } - } - - const size_t maxToWrite = _prefix.length() + _message.length(); - - if (nrBytesToWrite > maxToWrite) { - nrBytesToWrite = maxToWrite; - } - - bool done = false; - - while (!done && bytesWritten < nrBytesToWrite) { - if (_readpos < _prefix.length()) { - // Write prefix - if (1 != stream.write(_prefix[_readpos])) { return bytesWritten; } - ++bytesWritten; - ++_readpos; - } else if (!_prefix.isEmpty()) { - // Clear prefix - _prefix.clear(); - _readpos = 0; - } else if (_readpos < _message.length()) { - // Write message - if (1 != stream.write(_message[_readpos])) { return bytesWritten; } - ++bytesWritten; - ++_readpos; - } else { - if ((bytesWritten + 2) > nrBytesToWrite) { return bytesWritten; } - bytesWritten += stream.println(); - - // Done with entry, cleanup and leave - clear(); - done = true; - } - } - } + // Mark with empty line we skipped the rest of the message. + bytesWritten += stream.println(F(" ...")); + bytesWritten += stream.println(); return bytesWritten; } + +void SerialWriteBuffer_t::prepare_prefix() +{ + // Prepare prefix + _prefix = format_msec_duration(_timestamp); + + if (_loglevel == LOG_LEVEL_NONE) { + _prefix += colorize(F(" : > ")); + } else { + #ifndef LIMIT_BUILD_SIZE + _prefix += strformat(F(" : (%d) "), FreeMem()); + #else + _prefix += ' '; + #endif // ifndef LIMIT_BUILD_SIZE + { + String loglevelDisplayString = getLogLevelDisplayString(_loglevel); + + while (loglevelDisplayString.length() < LOG_LEVEL_MAX_STRING_LENGTH) { + loglevelDisplayString += ' '; + } + _prefix += colorize(loglevelDisplayString); + } + _prefix += F(" | "); + } + +} diff --git a/src/src/Helpers/SerialWriteBuffer.h b/src/src/Helpers/SerialWriteBuffer.h index ce8c6392f..791299970 100644 --- a/src/src/Helpers/SerialWriteBuffer.h +++ b/src/src/Helpers/SerialWriteBuffer.h @@ -3,37 +3,25 @@ #include "../../ESPEasy_common.h" -#include +#include "../Helpers/LogStreamWriter.h" -#ifndef MAX_SERIALWRITEBUFFER_SIZE -# ifdef ESP8266 -# define MAX_SERIALWRITEBUFFER_SIZE 1024 -# endif // ifdef ESP8266 -# ifdef ESP32 -# define MAX_SERIALWRITEBUFFER_SIZE 10240 -# endif // ifdef ESP32 -#endif // ifndef MAX_SERIALWRITEBUFFER_SIZE - -class SerialWriteBuffer_t { +class SerialWriteBuffer_t : public LogStreamWriter { public: - SerialWriteBuffer_t(uint8_t log_destination) : _log_destination(log_destination) {} + SerialWriteBuffer_t(uint8_t log_destination) : LogStreamWriter(log_destination) {} - void clear(); - - size_t write(Stream& stream, - size_t nrBytesToWrite); + private: + + size_t write_skipping(Stream& stream) override; + + void prepare_prefix() override; + + + String colorize(const String& str) const; - String _prefix; - String _message; - uint32_t _timestamp{}; - uint32_t _readpos{}; - uint8_t _loglevel{}; - - const uint8_t _log_destination; }; #endif // ifndef HELPERS_SERIALWRITEBUFFER_H diff --git a/src/src/Helpers/SyslogWriter.cpp b/src/src/Helpers/SyslogWriter.cpp new file mode 100644 index 000000000..c1b86a809 --- /dev/null +++ b/src/src/Helpers/SyslogWriter.cpp @@ -0,0 +1,133 @@ +#include "../Helpers/SyslogWriter.h" + +#include "../../ESPEasy/net/ESPEasyNetwork.h" +#include "../../ESPEasy/net/Globals/NetworkState.h" +#include "../Globals/ESPEasy_time.h" +#include "../Globals/Settings.h" +#include "../Helpers/ESPEasy_time_calc.h" +#include "../Helpers/Networking.h" +#include "../Helpers/StringConverter.h" + +#define MAX_LENGTH_SYSLOG_MESSAGE 1000 + +bool SyslogWriter::process(Stream*stream) +{ + if ((Settings.SyslogLevel == 0) || (getNrMessages() == 0)) { + return false; + } + + bool somethingWritten{}; + + if ((Settings.Syslog_IP[0] != 0) && ESPEasy::net::NetworkConnected()) + { + WiFiUDP syslogUDP; + + if (!beginWiFiUDP_randomPort(syslogUDP)) { + return false; + } + + const IPAddress syslogIP(Settings.Syslog_IP[0], Settings.Syslog_IP[1], Settings.Syslog_IP[2], Settings.Syslog_IP[3]); + const uint32_t start = millis(); + bool done = false; + + // Only try to process syslog messages for a limited amount of time to keep ESPEasy responsive + while (!done && timePassedSince(start) < 200) { + FeedSW_watchdog(); + + if (syslogUDP.beginPacket(syslogIP, Settings.SyslogPort) == 0) { + // Could not create socket + return somethingWritten; + } + + if (write_single_item(syslogUDP, MAX_LENGTH_SYSLOG_MESSAGE) != 0) { + somethingWritten = true; + } else { done = true; } + + syslogUDP.endPacket(); + FeedSW_watchdog(); + delay(0); + } + } + return somethingWritten; +} + +void SyslogWriter::prepare_prefix() +{ + unsigned int prio = Settings.SyslogFacility * 8; + + if (_loglevel == LOG_LEVEL_ERROR) { + prio += 3; // syslog error + } + else if (_loglevel == LOG_LEVEL_INFO) { + prio += 5; // syslog notice + } + else { + prio += 7; + } + + // An RFC3164 compliant message must be formated like: + // "[TimeStamp ]Hostname TaskName: Message" + + // See: https://www.rfc-editor.org/rfc/rfc3164 + + /* + The TIMESTAMP field is the local time and is in the format of + "Mmm dd hh:mm:ss" (without the quote marks) where: + + Mmm is the English language abbreviation for the month of the + year with the first character in uppercase and the other two + characters in lowercase. The following are the only acceptable + values: + + Jan, Feb, Mar, Apr, May, Jun, Jul, Aug, Sep, Oct, Nov, Dec + + dd is the day of the month. If the day of the month is less + than 10, then it MUST be represented as a space and then the + number. For example, the 7th day of August would be + represented as "Aug 7", with two spaces between the "g" and + the "7". + + + + Lonvick Informational [Page 10] + + RFC 3164 The BSD syslog Protocol August 2001 + + + hh:mm:ss is the local time. The hour (hh) is represented in a + 24-hour format. Valid entries are between 00 and 23, + inclusive. The minute (mm) and second (ss) entries are between + 00 and 59 inclusive. + + A single space character MUST follow the TIMESTAMP field. + */ + + // Using Settings.Name as the Hostname (Hostname must NOT contain space) + + String formattedTimestamp; + + if (statusNTPInitialized) { + // Calculate the local time retroactively from the log timestamps + struct tm ts; + uint32_t unix_time_frac{}; + const uint32_t local_timestamp = node_time.systemMicros_to_Localtime( + node_time.internalTimestamp_to_systemMicros(_timestamp), + unix_time_frac); + breakTime(local_timestamp, ts); + + // A single space character MUST follow the TIMESTAMP field. + formattedTimestamp = strformat( + F("%s %2d %02d:%02d:%02d "), + ESPEasy_time::month_str(ts.tm_mon).c_str(), + ts.tm_mday, + ts.tm_hour, ts.tm_min, ts.tm_sec); + } + + _prefix = strformat( + F("<%d>%s%s EspEasy: "), + prio, + formattedTimestamp.c_str(), + ESPEasy::net::NetworkCreateRFCCompliantHostname(true).c_str()); + _prefix.trim(); + _prefix.replace(' ', '_'); +} diff --git a/src/src/Helpers/SyslogWriter.h b/src/src/Helpers/SyslogWriter.h new file mode 100644 index 000000000..2d143da0d --- /dev/null +++ b/src/src/Helpers/SyslogWriter.h @@ -0,0 +1,23 @@ +#pragma once + +#include "../../ESPEasy_common.h" + +#include "../Helpers/LogStreamWriter.h" + + +/*********************************************************************************************\ + Syslog client +\*********************************************************************************************/ + +class SyslogWriter : public LogStreamWriter { +public: + + SyslogWriter(uint8_t log_destination) : LogStreamWriter(log_destination) {} + + virtual bool process(Stream* stream) override; + +private: + + void prepare_prefix() override; + +}; \ No newline at end of file From 208d5541d5042971b9fc62cc8fea441381faf7c0 Mon Sep 17 00:00:00 2001 From: TD-er Date: Thu, 16 Oct 2025 16:18:23 +0200 Subject: [PATCH 382/564] [Log] Fix build on ESP8266 + log level label in console + syslog format --- src/src/DataTypes/LogLevels.cpp | 49 +++++++++++++------ src/src/ESPEasyCore/ESPEasy_Console_Port.cpp | 2 +- src/src/ESPEasyCore/ESPEasy_Log.cpp | 2 +- .../ESPEasyCore/ESPEasy_backgroundtasks.cpp | 2 +- src/src/Helpers/LogStreamWriter.cpp | 9 +++- src/src/Helpers/LogStreamWriter.h | 5 +- src/src/Helpers/SyslogWriter.cpp | 10 ++-- src/src/Helpers/SyslogWriter.h | 2 +- 8 files changed, 56 insertions(+), 25 deletions(-) diff --git a/src/src/DataTypes/LogLevels.cpp b/src/src/DataTypes/LogLevels.cpp index 4264cd5f1..94fff720e 100644 --- a/src/src/DataTypes/LogLevels.cpp +++ b/src/src/DataTypes/LogLevels.cpp @@ -2,18 +2,6 @@ #include "../DataTypes/FormSelectorOptions.h" -const __FlashStringHelper *logLevelDisplayStrings[] = -{ - F("None"), - F("Error"), - F("Info") -#ifndef BUILD_NO_DEBUG - , F("Debug") - , F("Debug More") - , F("Debug dev") -#endif // ifndef BUILD_NO_DEBUG -}; - constexpr int logLevels[] = { LOG_LEVEL_NONE, @@ -28,12 +16,33 @@ constexpr int logLevels[] = }; +// We can't have a globally declared flash string array on ESP8266, so need to wrap it in a function. +const __FlashStringHelper* getLogLevelDisplayStringFromIndex(uint8_t index) +{ + const __FlashStringHelper *logLevelDisplayStrings[] + { + F("None"), + F("Error"), + F("Info") +#ifndef BUILD_NO_DEBUG + , F("Debug") + , F("Debug More") + , F("Debug dev") +#endif // ifndef BUILD_NO_DEBUG + }; + + if (index < NR_ELEMENTS(logLevelDisplayStrings)) { + return logLevelDisplayStrings[index]; + } + return F(""); +} + uint8_t LOG_LEVEL_NRELEMENTS() { return NR_ELEMENTS(logLevels); } const __FlashStringHelper* getLogLevelDisplayString(int logLevel) { for (uint8_t i = 0; i < NR_ELEMENTS(logLevels); ++i) { if (logLevels[i] == logLevel) { - return logLevelDisplayStrings[logLevel]; + return getLogLevelDisplayStringFromIndex(i); } } return F(""); @@ -42,7 +51,7 @@ const __FlashStringHelper* getLogLevelDisplayString(int logLevel) { const __FlashStringHelper* getLogLevelDisplayStringFromIndex(uint8_t index, int& logLevel) { if (index < NR_ELEMENTS(logLevels)) { logLevel = logLevels[index]; - return logLevelDisplayStrings[index]; + return getLogLevelDisplayStringFromIndex(index); } logLevel = -1; return F(""); @@ -50,6 +59,18 @@ const __FlashStringHelper* getLogLevelDisplayStringFromIndex(uint8_t index, int& void addLogLevelFormSelectorOptions(const String& id, int choice) { + const __FlashStringHelper *logLevelDisplayStrings[] + { + F("None"), + F("Error"), + F("Info") +#ifndef BUILD_NO_DEBUG + , F("Debug") + , F("Debug More") + , F("Debug dev") +#endif // ifndef BUILD_NO_DEBUG + }; + const FormSelectorOptions selector(NR_ELEMENTS(logLevels), logLevelDisplayStrings, logLevels); selector.addSelector(id, choice); diff --git a/src/src/ESPEasyCore/ESPEasy_Console_Port.cpp b/src/src/ESPEasyCore/ESPEasy_Console_Port.cpp index 62d33526a..a70a99e06 100644 --- a/src/src/ESPEasyCore/ESPEasy_Console_Port.cpp +++ b/src/src/ESPEasyCore/ESPEasy_Console_Port.cpp @@ -107,7 +107,7 @@ bool EspEasy_Console_Port::process_serialWriteBuffer() #ifdef ESP32 if (!xPortCanYield()) return false; #endif - return _serialWriteBuffer.process(_serial); + return _serialWriteBuffer.process(_serial, _serial->availableForWrite()); } return false; } diff --git a/src/src/ESPEasyCore/ESPEasy_Log.cpp b/src/src/ESPEasyCore/ESPEasy_Log.cpp index f8dbf5121..68b051ab1 100644 --- a/src/src/ESPEasyCore/ESPEasy_Log.cpp +++ b/src/src/ESPEasyCore/ESPEasy_Log.cpp @@ -22,7 +22,7 @@ void initLog() // make sure addLog doesnt do any stuff before initalisation of Settings is complete. Settings.UseSerial = true; Settings.SyslogFacility = 0; - setLogLevelFor(LOG_TO_SYSLOG, 0); + setLogLevelFor(LOG_TO_SYSLOG, 2); setLogLevelFor(LOG_TO_SERIAL, 2); // logging during initialisation setLogLevelFor(LOG_TO_WEBLOG, 2); setLogLevelFor(LOG_TO_SDCARD, 0); diff --git a/src/src/ESPEasyCore/ESPEasy_backgroundtasks.cpp b/src/src/ESPEasyCore/ESPEasy_backgroundtasks.cpp index b9c87d09e..c92ad6dec 100644 --- a/src/src/ESPEasyCore/ESPEasy_backgroundtasks.cpp +++ b/src/src/ESPEasyCore/ESPEasy_backgroundtasks.cpp @@ -75,7 +75,7 @@ void backgroundtasks() */ process_serialWriteBuffer(); - syslogWriter.process(nullptr); + syslogWriter.process(); if (!UseRTOSMultitasking) { serial(); diff --git a/src/src/Helpers/LogStreamWriter.cpp b/src/src/Helpers/LogStreamWriter.cpp index 9ebdc7991..b58e56ce2 100644 --- a/src/src/Helpers/LogStreamWriter.cpp +++ b/src/src/Helpers/LogStreamWriter.cpp @@ -14,10 +14,15 @@ void LogStreamWriter::clear() _readpos = 0; } -bool LogStreamWriter::process(Stream*stream) +bool LogStreamWriter::process(Stream*stream, size_t availableForWrite) { if (stream == nullptr) { return false; } - return write(*stream, stream->availableForWrite()) != 0; + return write(*stream, availableForWrite) != 0; +} + +bool LogStreamWriter::process() +{ + return false; } uint32_t LogStreamWriter::getNrMessages() const diff --git a/src/src/Helpers/LogStreamWriter.h b/src/src/Helpers/LogStreamWriter.h index aa59c47f8..6cab5cae3 100644 --- a/src/src/Helpers/LogStreamWriter.h +++ b/src/src/Helpers/LogStreamWriter.h @@ -11,7 +11,10 @@ public: virtual ~LogStreamWriter() {} - virtual bool process(Stream*stream); + virtual bool process(Stream* stream, size_t availableForWrite); + + // Only use this from derived classes, as we need a Stream to further process + virtual bool process(); virtual uint32_t getNrMessages() const; diff --git a/src/src/Helpers/SyslogWriter.cpp b/src/src/Helpers/SyslogWriter.cpp index c1b86a809..121572e95 100644 --- a/src/src/Helpers/SyslogWriter.cpp +++ b/src/src/Helpers/SyslogWriter.cpp @@ -10,7 +10,7 @@ #define MAX_LENGTH_SYSLOG_MESSAGE 1000 -bool SyslogWriter::process(Stream*stream) +bool SyslogWriter::process() { if ((Settings.SyslogLevel == 0) || (getNrMessages() == 0)) { return false; @@ -123,11 +123,13 @@ void SyslogWriter::prepare_prefix() ts.tm_hour, ts.tm_min, ts.tm_sec); } + String hostname(ESPEasy::net::NetworkCreateRFCCompliantHostname(true)); + hostname.replace(' ', '_'); + hostname.trim(); + _prefix = strformat( F("<%d>%s%s EspEasy: "), prio, formattedTimestamp.c_str(), - ESPEasy::net::NetworkCreateRFCCompliantHostname(true).c_str()); - _prefix.trim(); - _prefix.replace(' ', '_'); + hostname.c_str()); } diff --git a/src/src/Helpers/SyslogWriter.h b/src/src/Helpers/SyslogWriter.h index 2d143da0d..a4a38a3ba 100644 --- a/src/src/Helpers/SyslogWriter.h +++ b/src/src/Helpers/SyslogWriter.h @@ -14,7 +14,7 @@ public: SyslogWriter(uint8_t log_destination) : LogStreamWriter(log_destination) {} - virtual bool process(Stream* stream) override; + virtual bool process() override; private: From 9322a324d8b58c52dbc27a9e24496697667d2511 Mon Sep 17 00:00:00 2001 From: TD-er Date: Fri, 17 Oct 2025 12:57:56 +0200 Subject: [PATCH 383/564] [ChartJS] Use new JSON key-value-writer + cleanup ChartJS code --- src/src/DataStructs/PluginStats.cpp | 25 +- src/src/DataStructs/PluginStats.h | 3 +- src/src/DataStructs/PluginStats_array.cpp | 288 ++++---- src/src/Helpers/KeyValueWriter.h | 23 +- src/src/Helpers/KeyValueWriter_JSON.cpp | 38 +- src/src/Helpers/KeyValueWriter_JSON.h | 1 + src/src/PluginStructs/P002_data_struct.cpp | 685 ++++++++++--------- src/src/PluginStructs/P169_data_struct.cpp | 116 ++-- src/src/WebServer/CacheControllerPages.cpp | 12 +- src/src/WebServer/Chart_JS.cpp | 257 +++---- src/src/WebServer/Chart_JS.h | 79 ++- src/src/WebServer/Chart_JS_scale.cpp | 59 +- src/src/WebServer/Chart_JS_scale.h | 5 +- src/src/WebServer/JSON.cpp | 19 +- src/src/WebServer/KeyValueWriter_WebForm.cpp | 10 + src/src/WebServer/KeyValueWriter_WebForm.h | 1 + src/src/WebServer/Log.cpp | 8 +- 17 files changed, 900 insertions(+), 729 deletions(-) diff --git a/src/src/DataStructs/PluginStats.cpp b/src/src/DataStructs/PluginStats.cpp index 6234d65d8..a8380136e 100644 --- a/src/src/DataStructs/PluginStats.cpp +++ b/src/src/DataStructs/PluginStats.cpp @@ -587,21 +587,26 @@ void PluginStats::webformLoad_show_val( # if FEATURE_CHART_JS -void PluginStats::plot_ChartJS_dataset() const +void PluginStats::plot_ChartJS_dataset(KeyValueWriter& dataset) const { - add_ChartJS_dataset_header(_ChartJS_dataset_config); + auto data = add_ChartJS_dataset_header(dataset, _ChartJS_dataset_config); - PluginStatsBuffer_t::index_t i = 0; - const size_t nrSamples = getNrSamples(); + if (data) { + PluginStatsBuffer_t::index_t i = 0; + const size_t nrSamples = getNrSamples(); - for (; i < nrSamples; ++i) { - if (i != 0) { - addHtml(','); + for (; i < nrSamples; ++i) { + const float value = (*_samples)[i]; + + if (isnanf(value)) { + data->write({ EMPTY_STRING, F("null") }); + } else { + data->write({ EMPTY_STRING, value, _nrDecimals }); + } + + // addHtmlFloat_NaN_toNull((*_samples)[i], _nrDecimals); } - - addHtmlFloat_NaN_toNull((*_samples)[i], _nrDecimals); } - add_ChartJS_dataset_footer(); } # endif // if FEATURE_CHART_JS diff --git a/src/src/DataStructs/PluginStats.h b/src/src/DataStructs/PluginStats.h index 5651fcbad..f0618cf07 100644 --- a/src/src/DataStructs/PluginStats.h +++ b/src/src/DataStructs/PluginStats.h @@ -12,6 +12,7 @@ # if FEATURE_CHART_JS +# include "../Helpers/KeyValueWriter.h" # include "../WebServer/Chart_JS_title.h" # endif // if FEATURE_CHART_JS @@ -159,7 +160,7 @@ public: } # if FEATURE_CHART_JS - void plot_ChartJS_dataset() const; + void plot_ChartJS_dataset(KeyValueWriter & parent) const; # endif // if FEATURE_CHART_JS # if FEATURE_CHART_JS diff --git a/src/src/DataStructs/PluginStats_array.cpp b/src/src/DataStructs/PluginStats_array.cpp index 2f4b6b496..5b7507f9a 100644 --- a/src/src/DataStructs/PluginStats_array.cpp +++ b/src/src/DataStructs/PluginStats_array.cpp @@ -33,31 +33,32 @@ void PluginStats_array::initPluginStats(taskVarIndex_t taskVarIndex) { if (taskVarIndex < VARS_PER_TASK) { - String label; - if (ExtraTaskSettings.enabledPluginStats(taskVarIndex)) { - label = ExtraTaskSettings.TaskDeviceValueNames[taskVarIndex]; -# if FEATURE_TASKVALUE_UNIT_OF_MEASURE - const uint8_t uomIndex = ExtraTaskSettings.getTaskVarUnitOfMeasure(taskVarIndex); + String label; - if (uomIndex != 0) { - label = strformat(F("%s (%s)"), ExtraTaskSettings.TaskDeviceValueNames[taskVarIndex], toUnitOfMeasureName(uomIndex).c_str()); - } + if (ExtraTaskSettings.enabledPluginStats(taskVarIndex)) { + label = ExtraTaskSettings.TaskDeviceValueNames[taskVarIndex]; +# if FEATURE_TASKVALUE_UNIT_OF_MEASURE + const uint8_t uomIndex = ExtraTaskSettings.getTaskVarUnitOfMeasure(taskVarIndex); + + if (uomIndex != 0) { + label = strformat(F("%s (%s)"), ExtraTaskSettings.TaskDeviceValueNames[taskVarIndex], toUnitOfMeasureName(uomIndex).c_str()); + } # endif // if FEATURE_TASKVALUE_UNIT_OF_MEASURE - } - initPluginStats( - taskVarIndex, - label, - ExtraTaskSettings.TaskDeviceValueDecimals[taskVarIndex], - ExtraTaskSettings.TaskDeviceErrorValue[taskVarIndex], - ExtraTaskSettings.getPluginStatsConfig(taskVarIndex)); + } + initPluginStats( + taskVarIndex, + label, + ExtraTaskSettings.TaskDeviceValueDecimals[taskVarIndex], + ExtraTaskSettings.TaskDeviceErrorValue[taskVarIndex], + ExtraTaskSettings.getPluginStatsConfig(taskVarIndex)); } } void PluginStats_array::initPluginStats( - taskVarIndex_t taskVarIndex, - const String& label, - uint8_t nrDecimals, - float errorValue, + taskVarIndex_t taskVarIndex, + const String & label, + uint8_t nrDecimals, + float errorValue, const PluginStats_Config_t& displayConfig) { if (taskVarIndex < VARS_PER_TASK) { @@ -78,7 +79,7 @@ void PluginStats_array::initPluginStats( if (ptr == nullptr) { _plugin_stats[taskVarIndex] = nullptr; } else { - _plugin_stats[taskVarIndex] = + _plugin_stats[taskVarIndex] = new (ptr) PluginStats(nrDecimals, errorValue); } @@ -117,8 +118,6 @@ void PluginStats_array::initPluginStats( } } - - void PluginStats_array::clearPluginStats(taskVarIndex_t taskVarIndex) { if (taskVarIndex < VARS_PER_TASK) { @@ -364,84 +363,88 @@ void PluginStats_array::plot_ChartJS(bool onlyJSON) const if (nrSamples == 0) { return; } // Chart Header + + ChartJS_options_scales scales; { - ChartJS_options_scales scales; - { - ChartJS_options_scale scaleOption(F("x")); + ChartJS_options_scale scaleOption(F("x")); - if (_plugin_stats_timestamps != nullptr) { - scaleOption.scaleType = F("time"); - } + if (_plugin_stats_timestamps != nullptr) { + scaleOption.scaleType = F("time"); + } + scales.add(scaleOption); + } + + for (size_t i = 0; i < VARS_PER_TASK; ++i) { + if (_plugin_stats[i] != nullptr) { + ChartJS_options_scale scaleOption( + _plugin_stats[i]->_ChartJS_dataset_config.displayConfig, + _plugin_stats[i]->getLabel()); + scaleOption.axisTitle.color = _plugin_stats[i]->_ChartJS_dataset_config.color; scales.add(scaleOption); + + _plugin_stats[i]->_ChartJS_dataset_config.axisID = scaleOption.axisID; } + } - for (size_t i = 0; i < VARS_PER_TASK; ++i) { - if (_plugin_stats[i] != nullptr) { - ChartJS_options_scale scaleOption( - _plugin_stats[i]->_ChartJS_dataset_config.displayConfig, - _plugin_stats[i]->getLabel()); - scaleOption.axisTitle.color = _plugin_stats[i]->_ChartJS_dataset_config.color; - scales.add(scaleOption); + scales.update_Yaxis_TickCount(); - _plugin_stats[i]->_ChartJS_dataset_config.axisID = scaleOption.axisID; - } - } - - scales.update_Yaxis_TickCount(); - - const bool enableZoom = true; - - add_ChartJS_chart_header( + const bool enableZoom = true; + { + auto chart = add_ChartJS_chart_header( F("line"), F("TaskStatsChart"), {}, 500 + (70 * (scales.nr_Y_scales() - 1)), 500, - scales.toString(), + scales, enableZoom, nrSamples, onlyJSON); - } + if (chart) { + auto data = chart->createChild(F("data")); - // Add labels - addHtml(F("\"labels\":[")); + if (data) { + { + auto labels = data->createChildArray(F("labels")); - for (size_t i = 0; i < nrSamples; ++i) { - if (i != 0) { - addHtml(','); - } + if (labels) { + for (size_t i = 0; i < nrSamples; ++i) { + if (_plugin_stats_timestamps != nullptr) { + struct tm ts; + uint32_t unix_time_frac{}; + const uint32_t unixtime_sec = node_time.systemMicros_to_Unixtime((*_plugin_stats_timestamps)[i], unix_time_frac); + const uint32_t local_timestamp = time_zone.toLocal(unixtime_sec); + breakTime(local_timestamp, ts); + labels->write({ + EMPTY_STRING, + formatDateTimeString(ts) + strformat(F(".%03u"), unix_time_frac_to_millis(unix_time_frac)) + }); + } else { + labels->write({ EMPTY_STRING, i }); + } + } - if (_plugin_stats_timestamps != nullptr) { - struct tm ts; - uint32_t unix_time_frac{}; - const uint32_t unixtime_sec = node_time.systemMicros_to_Unixtime((*_plugin_stats_timestamps)[i], unix_time_frac); - const uint32_t local_timestamp = time_zone.toLocal(unixtime_sec); - breakTime(local_timestamp, ts); - addHtml('"'); - addHtml(formatDateTimeString(ts)); - addHtml(strformat(F(".%03u"), unix_time_frac_to_millis(unix_time_frac))); - addHtml('"'); - } else { - addHtmlInt(i); - } - } - addHtml(F("],\n\"datasets\":[")); + } + } + { + auto datasets = data->createChildArray(F("datasets")); + if (datasets) { + for (size_t i = 0; i < VARS_PER_TASK; ++i) { + if (_plugin_stats[i] != nullptr) { + auto dataset = datasets->createChild(); - // Data sets - bool first = true; - - for (size_t i = 0; i < VARS_PER_TASK; ++i) { - if (_plugin_stats[i] != nullptr) { - if (!first) { - addHtml(','); + if (dataset) { + _plugin_stats[i]->plot_ChartJS_dataset(*dataset); + } + } + } + } + } } - first = false; - _plugin_stats[i]->plot_ChartJS_dataset(); } } - add_ChartJS_chart_footer(onlyJSON); } void PluginStats_array::plot_ChartJS_scatter( @@ -467,69 +470,96 @@ void PluginStats_array::plot_ChartJS_scatter( return; } - String axisOptions; - { ChartJS_options_scales scales; scales.add({ F("x"), stats_X->getLabel() }); scales.add({ F("y"), stats_Y->getLabel() }); - axisOptions = scales.toString(); - } - const size_t nrSamples = stats_X->getNrSamples(); - const bool enableZoom = false; + const size_t nrSamples = stats_X->getNrSamples(); + const bool enableZoom = false; - add_ChartJS_chart_header( - F("scatter"), - id, - chartTitle, - width, - height, - axisOptions, - enableZoom, - nrSamples, - onlyJSON); + auto chart = add_ChartJS_chart_header( + F("scatter"), + id, + chartTitle, + width, + height, + scales, + enableZoom, + nrSamples, + onlyJSON); - // Add labels, which will be shown in a tooltip when hovering with the mouse over a point. - addHtml(F("\"labels\":[")); + if (chart) { + chart->allowFormatOverrides(false); + auto data = chart->createChild(F("data")); - for (size_t i = 0; i < nrSamples; ++i) { - if (i != 0) { - addHtml(','); + if (data) { + { + // Add labels, which will be shown in a tooltip when hovering with the mouse over a point. + auto labels = data->createChildArray(F("labels")); + + if (labels) { + for (size_t i = 0; i < nrSamples; ++i) { + labels->write({ EMPTY_STRING, i }); + } + } + } + { + + auto datasets = data->createChildArray(F("datasets")); + + if (datasets) { + { + auto dataset = datasets->createChild(); + + if (dataset) { + dataset->write({ F("showLine"), true }); + + { + // Long/Lat Coordinates + auto data = add_ChartJS_dataset_header(*dataset, datasetConfig); + + if (data) { + // Add scatter data + for (size_t i = 0; i < nrSamples; ++i) { + const float valX = (*stats_X)[i]; + const float valY = (*stats_Y)[i]; + add_ChartJS_scatter_data_point(*data, valX, valY, 6); + } + } + } + } + } + + if (showAverage) { + auto dataset = datasets->createChild(); + + if (dataset) { + dataset->write({ F("pointRadius"), 6 }); + dataset->write({ F("pointHoverRadius"), 10 }); + + { + // Add single point showing the average + auto data = add_ChartJS_dataset_header( + *dataset, + { + F("Average"), + F("#0F4C5C") }); + + if (data) { + const float valX = stats_X->getSampleAvg(); + const float valY = stats_Y->getSampleAvg(); + add_ChartJS_scatter_data_point(*data, valX, valY, 6); + } + } + } + } + } + } + } } - addHtmlInt(i); } - addHtml(F("],\n\"datasets\":[")); - - // Long/Lat Coordinates - add_ChartJS_dataset_header(datasetConfig); - - // Add scatter data - for (size_t i = 0; i < nrSamples; ++i) { - const float valX = (*stats_X)[i]; - const float valY = (*stats_Y)[i]; - add_ChartJS_scatter_data_point(valX, valY, 6); - } - - add_ChartJS_dataset_footer(F("\"showLine\":true")); - - if (showAverage) { - // Add single point showing the average - addHtml(','); - add_ChartJS_dataset_header( - { - F("Average"), - F("#0F4C5C") }); - - { - const float valX = stats_X->getSampleAvg(); - const float valY = stats_Y->getSampleAvg(); - add_ChartJS_scatter_data_point(valX, valY, 6); - } - add_ChartJS_dataset_footer(F("\"pointRadius\":6,\"pointHoverRadius\":10")); - } - add_ChartJS_chart_footer(onlyJSON); } # endif // if FEATURE_CHART_JS diff --git a/src/src/Helpers/KeyValueWriter.h b/src/src/Helpers/KeyValueWriter.h index f4e60798f..0afed0b12 100644 --- a/src/src/Helpers/KeyValueWriter.h +++ b/src/src/Helpers/KeyValueWriter.h @@ -9,9 +9,6 @@ #include - - - class KeyValueWriter; typedef std::unique_ptr Sp_KeyValueWriter; @@ -45,6 +42,10 @@ public: _hasHeader = true; } + virtual void setFooter(const String& footer) { _footer = footer; } + + virtual void setIsArray() { _isArray = true; } + virtual void clear(); // Mark a write, typically called from a child calling its parent it is about to write @@ -55,14 +56,12 @@ public: void writeLabels(const LabelType::Enum labels[]); virtual void writeNote(const String& note); - virtual void writeNote(const __FlashStringHelper * note); + virtual void writeNote(const __FlashStringHelper *note); // virtual void setParent(KeyValueWriter*parent) { _parent = parent; } virtual int getLevel() const; - virtual void setIsArray() { _isArray = true; } - // When set to 'plainText', the writer will not try to insert writer specific // markings, like 
     or 
     for example for HTML output
   // When set to true, any child writer will also have this set to true
@@ -86,6 +85,7 @@ public:
   // Create writer of the same derived type, with this set as parent
   virtual Sp_KeyValueWriter createChild()                     = 0;
   virtual Sp_KeyValueWriter createChild(const String& header) = 0;
+  virtual Sp_KeyValueWriter createChildArray(const String& header) = 0;
 
   // Create new writer of the same derived type, without parent
   virtual Sp_KeyValueWriter createNew()                     = 0;
@@ -105,9 +105,11 @@ public:
     return std::move(_toString->getMove());
   }
 
-  bool         reserve(unsigned int size) { return _toString && _toString->reserve(size); }
+  bool         reserve(unsigned int size)       { return _toString && _toString->reserve(size); }
 
-  virtual void indent()                   {}
+  virtual void indent()                         {}
+
+  virtual void allowFormatOverrides(bool allow) { _allowFormatOverrides = allow; }
 
 protected:
 
@@ -127,6 +129,9 @@ protected:
 
   String _header;
 
+  // To be written from destructor
+  String _footer;
+
   KeyValueWriter *_parent = nullptr;
 
   bool _hasHeader = true;
@@ -141,5 +146,7 @@ protected:
 
   bool _summaryValueOnly = false;
 
+  bool _allowFormatOverrides = true;
+
 
 }; // class KeyValueWriter
diff --git a/src/src/Helpers/KeyValueWriter_JSON.cpp b/src/src/Helpers/KeyValueWriter_JSON.cpp
index 2a2341b5d..2bfd558f4 100644
--- a/src/src/Helpers/KeyValueWriter_JSON.cpp
+++ b/src/src/Helpers/KeyValueWriter_JSON.cpp
@@ -50,6 +50,11 @@ KeyValueWriter_JSON::~KeyValueWriter_JSON()
       getPrint().write(_isArray ? ']' : '}');
     }
   }
+
+  if (!_footer.isEmpty())
+  {
+    getPrint().print(_footer);
+  }
 }
 
 void KeyValueWriter_JSON::write()
@@ -138,22 +143,29 @@ void KeyValueWriter_JSON::writeValue(const ValueStruct*val)
   if (val == nullptr) { return; }
   auto& pr = getPrint();
 
-  ValueStruct::ValueType valueType(ValueStruct::ValueType::Auto);
-  String str = val->toString(valueType);
+  ValueStruct::ValueType valueType = val->getValueType();
+  String str                       = val->toString();
 
   switch (valueType)
   {
     case ValueStruct::ValueType::Float:
     case ValueStruct::ValueType::Double:
+
+      // TODO TD-er: Should we use addHtmlFloat_NaN_toNull here?
+      if (!_allowFormatOverrides && str.equalsIgnoreCase(F("nan"))) {
+        pr.print(F("null"));
+        break;
+      }
+
     case ValueStruct::ValueType::Int:
       pr.print(str);
       return;
     case ValueStruct::ValueType::Bool:
 
-      if (!Settings.JSONBoolWithoutQuotes()) { pr.write('"'); }
+      if (_allowFormatOverrides && !Settings.JSONBoolWithoutQuotes()) { pr.write('"'); }
       pr.print(str.equals("0") ? F("false") : F("true"));
 
-      if (!Settings.JSONBoolWithoutQuotes()) { pr.write('"'); }
+      if (_allowFormatOverrides && !Settings.JSONBoolWithoutQuotes()) { pr.write('"'); }
       return;
 
     case ValueStruct::ValueType::Auto:
@@ -168,6 +180,8 @@ Sp_KeyValueWriter KeyValueWriter_JSON::createChild()
 {
   std::unique_ptr child(new (std::nothrow) KeyValueWriter_JSON(this, _toString));
 
+  child->_allowFormatOverrides = _allowFormatOverrides;
+
   return std::move(child);
 
   // return std::make_unique(this, _toString);
@@ -177,15 +191,29 @@ Sp_KeyValueWriter KeyValueWriter_JSON::createChild(const String& header)
 {
   std::unique_ptr child(new (std::nothrow) KeyValueWriter_JSON(header, this, _toString));
 
+  child->_allowFormatOverrides = _allowFormatOverrides;
+
   return std::move(child);
 
   // return std::make_unique(header, this, _toString);
 }
 
+Sp_KeyValueWriter KeyValueWriter_JSON::createChildArray(const String& header)
+{
+  auto child = createChild(header);
+
+  if (child) {
+    child->setIsArray();
+  }
+  return std::move(child);
+}
+
 Sp_KeyValueWriter KeyValueWriter_JSON::createNew()
 {
   std::unique_ptr child(new (std::nothrow) KeyValueWriter_JSON(false, _toString));
 
+  child->_allowFormatOverrides = _allowFormatOverrides;
+
   return std::move(child);
 
   // return std::make_unique(false, _toString);
@@ -195,6 +223,8 @@ Sp_KeyValueWriter KeyValueWriter_JSON::createNew(const String& header)
 {
   std::unique_ptr child(new (std::nothrow) KeyValueWriter_JSON(header, _toString));
 
+  child->_allowFormatOverrides = _allowFormatOverrides;
+
   return std::move(child);
 
   // return std::make_unique(header, _toString);
diff --git a/src/src/Helpers/KeyValueWriter_JSON.h b/src/src/Helpers/KeyValueWriter_JSON.h
index 5a5cab204..c50c9ace0 100644
--- a/src/src/Helpers/KeyValueWriter_JSON.h
+++ b/src/src/Helpers/KeyValueWriter_JSON.h
@@ -49,6 +49,7 @@ public:
   // Create writer of the same derived type, with this set as parent
   virtual Sp_KeyValueWriter createChild();
   virtual Sp_KeyValueWriter createChild(const String& header);
+  virtual Sp_KeyValueWriter createChildArray(const String& header);
 
   // Create new writer of the same derived type, without parent
   virtual Sp_KeyValueWriter createNew();
diff --git a/src/src/PluginStructs/P002_data_struct.cpp b/src/src/PluginStructs/P002_data_struct.cpp
index 6492fd526..43a76cf68 100644
--- a/src/src/PluginStructs/P002_data_struct.cpp
+++ b/src/src/PluginStructs/P002_data_struct.cpp
@@ -1,33 +1,32 @@
 #include "../PluginStructs/P002_data_struct.h"
 
 #ifdef USES_P002
-#if SOC_ADC_SUPPORTED || defined(ESP8266)
+# if SOC_ADC_SUPPORTED || defined(ESP8266)
 
-# include "../Globals/RulesCalculate.h"
+#  include "../Globals/RulesCalculate.h"
 
-# include "../Helpers/Hardware_ADC_cali.h"
+#  include "../Helpers/Hardware_ADC_cali.h"
 
-# ifndef DEFAULT_VREF
-#  define DEFAULT_VREF 1100
-# endif // ifndef DEFAULT_VREF
-
-# ifndef P002_ADC_ATTEN_MAX
-#  if ESP_IDF_VERSION_MAJOR < 5
-#   define P002_ADC_ATTEN_MAX ADC_ATTEN_MAX
-#  else // if ESP_IDF_VERSION_MAJOR < 5
-#   define P002_ADC_ATTEN_MAX ADC_ATTENDB_MAX
-#  endif // if ESP_IDF_VERSION_MAJOR < 5
-# endif // ifndef P002_ADC_ATTEN_MAX
+#  ifndef DEFAULT_VREF
+#   define DEFAULT_VREF 1100
+#  endif // ifndef DEFAULT_VREF
 
+#  ifndef P002_ADC_ATTEN_MAX
+#   if ESP_IDF_VERSION_MAJOR < 5
+#    define P002_ADC_ATTEN_MAX ADC_ATTEN_MAX
+#   else // if ESP_IDF_VERSION_MAJOR < 5
+#    define P002_ADC_ATTEN_MAX ADC_ATTENDB_MAX
+#   endif // if ESP_IDF_VERSION_MAJOR < 5
+#  endif // ifndef P002_ADC_ATTEN_MAX
 
 void P002_data_struct::init(struct EventStruct *event)
 {
   _sampleMode = P002_OVERSAMPLING;
 
-  # ifdef ESP8266
+  #  ifdef ESP8266
   _pin_analogRead = A0;
-  # endif // ifdef ESP8266
-  # ifdef ESP32
+  #  endif // ifdef ESP8266
+  #  ifdef ESP32
   _pin_analogRead        = CONFIG_PIN1;
   _useFactoryCalibration = useFactoryCalibration(event);
   _attenuation           = getAttenuation(event);
@@ -35,7 +34,7 @@ void P002_data_struct::init(struct EventStruct *event)
   // Initialize attenuation and perform read
   // This way there is less chance of a big difference between 1st read and any next reads
   analog_read();
-  # endif // ifdef ESP32
+  #  endif // ifdef ESP32
 
   if (P002_CALIBRATION_ENABLED) {
     _use2pointCalibration = true;
@@ -45,15 +44,16 @@ void P002_data_struct::init(struct EventStruct *event)
     _calib_out2           = P002_CALIBRATION_VALUE2;
   }
   _nrDecimals = Cache.getTaskDeviceValueDecimals(event->TaskIndex, 0);
-# ifndef LIMIT_BUILD_SIZE
+#  ifndef LIMIT_BUILD_SIZE
   _nrMultiPointItems = P002_NR_MULTIPOINT_ITEMS;
   _useMultipoint     = P002_MULTIPOINT_ENABLED;
 
   load(event);
-# endif // ifndef LIMIT_BUILD_SIZE
+#  endif // ifndef LIMIT_BUILD_SIZE
 }
 
-# ifndef LIMIT_BUILD_SIZE
+#  ifndef LIMIT_BUILD_SIZE
+
 void P002_data_struct::load(struct EventStruct *event)
 {
   const size_t nr_lines = P002_Nlines;
@@ -70,26 +70,27 @@ void P002_data_struct::load(struct EventStruct *event)
 
       if (validFloatFromString(lines[i], adc) && validFloatFromString(lines[i + 1], value)) {
         // sizeof() multipoint item is multiple of 4 bytes, so should work just fine on 2nd heap
-        #  ifdef USE_SECOND_HEAP
+        #   ifdef USE_SECOND_HEAP
         HeapSelectIram ephemeral;
-        #  endif // ifdef USE_SECOND_HEAP
+        #   endif // ifdef USE_SECOND_HEAP
 
         _multipoint.emplace_back(adc, value);
       }
     }
   }
+
   std::sort(_multipoint.begin(), _multipoint.end());
   {
-    #  ifdef USE_SECOND_HEAP
+    #   ifdef USE_SECOND_HEAP
     HeapSelectIram ephemeral;
-    #  endif // ifdef USE_SECOND_HEAP
+    #   endif // ifdef USE_SECOND_HEAP
 
     _binning.resize(_multipoint.size(), 0);
     _binningRange.resize(_multipoint.size());
   }
 }
 
-# endif // ifndef LIMIT_BUILD_SIZE
+#  endif // ifndef LIMIT_BUILD_SIZE
 
 void P002_data_struct::webformLoad_2p_calibPoint(
   const __FlashStringHelper *label,
@@ -101,12 +102,12 @@ void P002_data_struct::webformLoad_2p_calibPoint(
   addRowLabel_tr_id(label, id_point);
   addTextBox(id_point, String(point), 10, F("number"));
 
-# ifdef ESP32
+#  ifdef ESP32
 
   if (_useFactoryCalibration) {
     addUnit(F("mV"));
   }
-# endif // ifdef ESP32
+#  endif // ifdef ESP32
 
   html_add_estimate_symbol();
   const unsigned int display_nrDecimals = _nrDecimals > 3 ? _nrDecimals : 3;
@@ -120,21 +121,21 @@ void P002_data_struct::webformLoad(struct EventStruct *event)
   int raw_value            = 0;
   const float currentValue = P002_data_struct::getCurrentValue(event, raw_value);
 
-# if FEATURE_PLUGIN_STATS
+#  if FEATURE_PLUGIN_STATS
   PluginStats *stats = getPluginStats(0);
 
   if (stats != nullptr) {
     stats->trackPeak(raw_value);
   }
-# endif // if FEATURE_PLUGIN_STATS
+#  endif // if FEATURE_PLUGIN_STATS
 
-# ifdef ESP32
+#  ifdef ESP32
   addRowLabel(F("Analog Pin"));
-  #  if HAS_HALL_EFFECT_SENSOR
+  #   if HAS_HALL_EFFECT_SENSOR
   addADC_PinSelect(AdcPinSelectPurpose::ADC_Touch_HallEffect, F("taskdevicepin1"), CONFIG_PIN1);
-  #  else // if HAS_HALL_EFFECT_SENSOR
+  #   else // if HAS_HALL_EFFECT_SENSOR
   addADC_PinSelect(AdcPinSelectPurpose::ADC_Touch,            F("taskdevicepin1"), CONFIG_PIN1);
-  #  endif // if HAS_HALL_EFFECT_SENSOR
+  #   endif // if HAS_HALL_EFFECT_SENSOR
 
   {
     const __FlashStringHelper *outputOptions[] = {
@@ -154,29 +155,29 @@ void P002_data_struct::webformLoad(struct EventStruct *event)
     selector.addFormSelector(F("Attenuation"), F("attn"), P002_ATTENUATION);
   }
 
-# endif // ifdef ESP32
+#  endif // ifdef ESP32
 
   {
     const __FlashStringHelper *outputOptions[] = {
       F("Use Current Sample"),
       F("Oversampling")
-# ifndef LIMIT_BUILD_SIZE
+#  ifndef LIMIT_BUILD_SIZE
       , F("Binning")
-# endif // ifndef LIMIT_BUILD_SIZE
+#  endif // ifndef LIMIT_BUILD_SIZE
     };
     const int outputOptionValues[] = {
       P002_USE_CURENT_SAMPLE,
       P002_USE_OVERSAMPLING
-# ifndef LIMIT_BUILD_SIZE
+#  ifndef LIMIT_BUILD_SIZE
       , P002_USE_BINNING
-# endif // ifndef LIMIT_BUILD_SIZE
+#  endif // ifndef LIMIT_BUILD_SIZE
     };
     constexpr int nrOptions = NR_ELEMENTS(outputOptionValues);
     const FormSelectorOptions selector(nrOptions, outputOptions, outputOptionValues);
     selector.addFormSelector(F("Oversampling"), F("oversampling"), P002_OVERSAMPLING);
   }
 
-# ifdef ESP32
+#  ifdef ESP32
   addFormSubHeader(F("Factory Calibration"));
   addFormCheckBox(F("Apply Factory Calibration"), F("fac_cal"), P002_APPLY_FACTORY_CALIB, !hasADC_factory_calibration());
   addFormNote(F("When checked, reading is in mV"));
@@ -184,18 +185,19 @@ void P002_data_struct::webformLoad(struct EventStruct *event)
   if (hasADC_factory_calibration()) {
     addRowLabel(F("Factory Calibration Type"));
     addHtml(getADC_factory_calibration_type());
-    #  if FEATURE_CHART_JS
+    #   if FEATURE_CHART_JS
     webformLoad_calibrationCurve(event);
-    #  endif // if FEATURE_CHART_JS
-    # ifdef ESP32
+    #   endif // if FEATURE_CHART_JS
+    #   ifdef ESP32
+
     if (_useFactoryCalibration) {
       formatADC_statistics(F("Current Voltage"), raw_value);
     } else {
       formatADC_statistics(F("Current ADC raw value"), raw_value);
     }
-    #else
+    #   else // ifdef ESP32
     formatADC_statistics(F("Current ADC raw value"), raw_value);
-    #endif
+    #   endif // ifdef ESP32
 
     for (size_t att = 0; att < P002_ADC_ATTEN_MAX; ++att) {
       const adc_atten_t attenuation = static_cast(att);
@@ -214,17 +216,17 @@ void P002_data_struct::webformLoad(struct EventStruct *event)
       addUnit(F("mV"));
     }
   }
-# endif // ifdef ESP32
+#  endif // ifdef ESP32
 
   addFormSubHeader(F("Two Point Calibration"));
 
   addFormCheckBox(F("Calibration Enabled"), F("cal"), P002_CALIBRATION_ENABLED);
 
-# ifdef ESP8266
-#  if FEATURE_ADC_VCC
+#  ifdef ESP8266
+#   if FEATURE_ADC_VCC
   addFormNote(F("Measuring ESP VCC, not A0. Unit is 1/1024 V. See documentation."));
-#  endif // if FEATURE_ADC_VCC
-# endif  // ifdef ESP8266
+#   endif // if FEATURE_ADC_VCC
+#  endif  // ifdef ESP8266
 
 
   webformLoad_2p_calibPoint(
@@ -245,9 +247,9 @@ void P002_data_struct::webformLoad(struct EventStruct *event)
   {
     // Output the statistics for the current settings.
     if (P002_CALIBRATION_ENABLED) {
-      # if FEATURE_CHART_JS
+      #  if FEATURE_CHART_JS
       webformLoad_2pt_calibrationCurve(event);
-      # endif // if FEATURE_CHART_JS
+      #  endif // if FEATURE_CHART_JS
 
       int minInputValue, maxInputValue;
       getInputRange(event, minInputValue, maxInputValue);
@@ -268,7 +270,7 @@ void P002_data_struct::webformLoad(struct EventStruct *event)
       addHtmlFloat(currentValue, _nrDecimals);
     }
   }
-# ifndef LIMIT_BUILD_SIZE
+#  ifndef LIMIT_BUILD_SIZE
   const bool useBinning = P002_OVERSAMPLING == P002_USE_BINNING;
   addFormSubHeader(useBinning ? F("Binning Processing") : F("Multipoint Processing"));
   addFormCheckBox(useBinning ? F("Binning Processing Enabled") : F("Multipoint Processing Enabled"),
@@ -299,11 +301,11 @@ void P002_data_struct::webformLoad(struct EventStruct *event)
                    getPluginCustomArgName(varNr),
 
                    _multipoint.size() > line_nr ?
-#  if FEATURE_USE_DOUBLE_AS_ESPEASY_RULES_FLOAT_TYPE
+#   if FEATURE_USE_DOUBLE_AS_ESPEASY_RULES_FLOAT_TYPE
                    doubleToString
-#  else // if FEATURE_USE_DOUBLE_AS_ESPEASY_RULES_FLOAT_TYPE
+#   else // if FEATURE_USE_DOUBLE_AS_ESPEASY_RULES_FLOAT_TYPE
                    floatToString
-#  endif // if FEATURE_USE_DOUBLE_AS_ESPEASY_RULES_FLOAT_TYPE
+#   endif // if FEATURE_USE_DOUBLE_AS_ESPEASY_RULES_FLOAT_TYPE
                      (static_cast(_multipoint[line_nr]._adc),
                      _nrDecimals,
                      true) : EMPTY_STRING,
@@ -311,11 +313,11 @@ void P002_data_struct::webformLoad(struct EventStruct *event)
     html_add_estimate_symbol();
     addTextBox(getPluginCustomArgName(varNr + 1),
                _multipoint.size() > line_nr ?
-#  if FEATURE_USE_DOUBLE_AS_ESPEASY_RULES_FLOAT_TYPE
+#   if FEATURE_USE_DOUBLE_AS_ESPEASY_RULES_FLOAT_TYPE
                doubleToString
-#  else // if FEATURE_USE_DOUBLE_AS_ESPEASY_RULES_FLOAT_TYPE
+#   else // if FEATURE_USE_DOUBLE_AS_ESPEASY_RULES_FLOAT_TYPE
                floatToString
-#  endif // if FEATURE_USE_DOUBLE_AS_ESPEASY_RULES_FLOAT_TYPE
+#   endif // if FEATURE_USE_DOUBLE_AS_ESPEASY_RULES_FLOAT_TYPE
                  (static_cast(_multipoint[line_nr]._value),
                  _nrDecimals,
                  true) : EMPTY_STRING,
@@ -324,13 +326,14 @@ void P002_data_struct::webformLoad(struct EventStruct *event)
 
     ++line_nr;
   }
-  #  if FEATURE_CHART_JS
+  #   if FEATURE_CHART_JS
   webformLoad_multipointCurve(event);
-  #  endif // if FEATURE_CHART_JS
-# endif    // ifndef LIMIT_BUILD_SIZE
+  #   endif // if FEATURE_CHART_JS
+#  endif    // ifndef LIMIT_BUILD_SIZE
 }
 
-# if FEATURE_PLUGIN_STATS
+#  if FEATURE_PLUGIN_STATS
+
 bool P002_data_struct::webformLoad_show_stats(struct EventStruct *event)
 {
   bool somethingAdded = false;
@@ -365,11 +368,12 @@ bool P002_data_struct::webformLoad_show_stats(struct EventStruct *event)
   return somethingAdded;
 }
 
-# endif // if FEATURE_PLUGIN_STATS
+#  endif // if FEATURE_PLUGIN_STATS
 
 
-# ifdef ESP32
-#  if FEATURE_CHART_JS
+#  ifdef ESP32
+#   if FEATURE_CHART_JS
+
 void P002_data_struct::webformLoad_calibrationCurve(struct EventStruct *event)
 {
   if (!hasADC_factory_calibration()) { return; }
@@ -381,87 +385,95 @@ void P002_data_struct::webformLoad_calibrationCurve(struct EventStruct *event)
 
   getChartRange(event, xAxisValues, valueCount, true);
 
-  String axisOptions;
 
   {
     ChartJS_options_scales scales;
     scales.add({ F("x"), F("ADC Value") });
     scales.add({ F("y"), F("Input Voltage (mV)") });
-    axisOptions = scales.toString();
-  }
-  add_ChartJS_chart_header(
-    F("line"),
-    F("fact_cal"),
-    { F("Factory Calibration per Attenuation") },
-    500,
-    500,
-    axisOptions);
 
-  add_ChartJS_chart_labels(
-    valueCount,
-    xAxisValues);
+    auto chart = add_ChartJS_chart_header(
+      F("line"),
+      F("fact_cal"),
+      { F("Factory Calibration per Attenuation") },
+      500,
+      500,
+      scales);
 
-  const __FlashStringHelper *colors[] = { F("#A52422"), F("#BEA57D"), F("#0F4C5C"), F("#A4BAB7") };
+    if (chart) {
+      auto data = chart->createChild(F("data"));
 
-  size_t current_attenuation = getAttenuation(event);
+      if (data) {
+        add_ChartJS_chart_labels(
+          *data,
+          valueCount,
+          xAxisValues);
 
-  if (current_attenuation >= P002_ADC_ATTEN_MAX) {
-#   if ESP_IDF_VERSION_MAJOR >= 5
-    current_attenuation = ADC_ATTEN_DB_12;
-#   else // if ESP_IDF_VERSION_MAJOR >= 5
-    current_attenuation = ADC_ATTEN_DB_11;
-#   endif // if ESP_IDF_VERSION_MAJOR >= 5
-  }
+        const __FlashStringHelper *colors[] = { F("#A52422"), F("#BEA57D"), F("#0F4C5C"), F("#A4BAB7") };
 
-  for (size_t att = 0; att < P002_ADC_ATTEN_MAX; ++att)
-  {
-    float values[valueCount];
+        size_t current_attenuation = getAttenuation(event);
 
-    for (int i = 0; i < valueCount; ++i) {
-      values[i] = applyADCFactoryCalibration(xAxisValues[i], static_cast(att));
+        if (current_attenuation >= P002_ADC_ATTEN_MAX) {
+#    if ESP_IDF_VERSION_MAJOR >= 5
+          current_attenuation = ADC_ATTEN_DB_12;
+#    else // if ESP_IDF_VERSION_MAJOR >= 5
+          current_attenuation = ADC_ATTEN_DB_11;
+#    endif // if ESP_IDF_VERSION_MAJOR >= 5
+        }
+        {
+          auto datasets = data->createChildArray(F("datasets"));
+
+          if (datasets) {
+            for (size_t att = 0; att < P002_ADC_ATTEN_MAX; ++att)
+            {
+              float values[valueCount];
+
+              for (int i = 0; i < valueCount; ++i) {
+                values[i] = applyADCFactoryCalibration(xAxisValues[i], static_cast(att));
+              }
+
+              ChartJS_dataset_config config(
+                AttenuationToString(static_cast(att)),
+                colors[att]);
+              config.hidden = att != current_attenuation;
+
+              add_ChartJS_dataset(
+                *datasets,
+                config,
+                values,
+                valueCount,
+                Cache.getTaskDeviceValueDecimals(event->TaskIndex, 0));
+            }
+          }
+        }
+      }
     }
-
-    ChartJS_dataset_config config(
-      AttenuationToString(static_cast(att)),
-      colors[att]);
-    config.hidden = att != current_attenuation;
-
-    if (att != 0) {
-      addHtml(',');
-    }
-
-    add_ChartJS_dataset(
-      config,
-      values,
-      valueCount,
-      Cache.getTaskDeviceValueDecimals(event->TaskIndex, 0));
   }
-  add_ChartJS_chart_footer();
 }
 
-#  endif // if FEATURE_CHART_JS
-# endif  // ifdef ESP32
+#   endif // if FEATURE_CHART_JS
+#  endif  // ifdef ESP32
+
+#  if FEATURE_CHART_JS
 
-# if FEATURE_CHART_JS
 const __FlashStringHelper * P002_data_struct::getChartXaxisLabel(struct EventStruct *event)
 {
-  #  ifdef ESP32
+  #   ifdef ESP32
 
   if (useFactoryCalibration(event)) {
     // reading in mVolt, not ADC
     return F("Input Voltage (mV)");
   }
-  #  endif // ifdef ESP32
+  #   endif // ifdef ESP32
   return F("ADC Value");
 }
 
-# endif // if FEATURE_CHART_JS
+#  endif // if FEATURE_CHART_JS
 
 void P002_data_struct::getInputRange(struct EventStruct *event, int& minInputValue, int& maxInputValue, bool ignoreCalibration)
 {
   minInputValue = 0;
   maxInputValue = MAX_ADC_VALUE;
-# ifdef ESP32
+#  ifdef ESP32
 
   if (useFactoryCalibration(event) && !ignoreCalibration) {
     // reading in mVolt, not ADC
@@ -470,10 +482,10 @@ void P002_data_struct::getInputRange(struct EventStruct *event, int& minInputVal
     minInputValue = getADC_factory_calibrated_min(attenuation);
     maxInputValue = getADC_factory_calibrated_max(attenuation);
   }
-# endif // ifdef ESP32
+#  endif // ifdef ESP32
 }
 
-# if FEATURE_CHART_JS
+#  if FEATURE_CHART_JS
 
 void P002_data_struct::getChartRange(struct EventStruct *event, int values[], int count, bool ignoreCalibration)
 {
@@ -497,50 +509,59 @@ void P002_data_struct::webformLoad_2pt_calibrationCurve(struct EventStruct *even
 
   getChartRange(event, xAxisValues, valueCount);
 
-  String axisOptions;
 
+  ChartJS_options_scales scales;
   {
-    ChartJS_options_scales scales;
     scales.add({ F("x"), getChartXaxisLabel(event) });
     scales.add({ F("y"), F("Calibrated Output") });
-    axisOptions = scales.toString();
   }
 
-
-  add_ChartJS_chart_header(
-    F("line"),
-    F("twoPointCurve"),
-    { F("Two Point Calibration Curve") },
-    500,
-    500,
-    axisOptions);
-
-  add_ChartJS_chart_labels(
-    valueCount,
-    xAxisValues);
-
   {
-    float values[valueCount];
+    auto chart = add_ChartJS_chart_header(
+      F("line"),
+      F("twoPointCurve"),
+      { F("Two Point Calibration Curve") },
+      500,
+      500,
+      scales);
 
-    for (int i = 0; i < valueCount; ++i) {
-      values[i] = P002_data_struct::applyCalibration(event, xAxisValues[i]);
+    if (chart) {
+      auto data = chart->createChild(F("data"));
+
+      if (data) {
+        add_ChartJS_chart_labels(
+          *data,
+          valueCount,
+          xAxisValues);
+
+        {
+          float values[valueCount];
+
+          for (int i = 0; i < valueCount; ++i) {
+            values[i] = P002_data_struct::applyCalibration(event, xAxisValues[i]);
+          }
+
+          const ChartJS_dataset_config config(
+            F("2 Point Calibration"),
+            F("rgb(255, 99, 132)"));
+
+          auto datasets = data->createChildArray(F("datasets"));
+
+          if (datasets) {
+            add_ChartJS_dataset(
+              *datasets,
+              config,
+              values,
+              valueCount,
+              Cache.getTaskDeviceValueDecimals(event->TaskIndex, 0));
+          }
+        }
+      }
     }
-
-    const ChartJS_dataset_config config(
-      F("2 Point Calibration"),
-      F("rgb(255, 99, 132)"));
-
-
-    add_ChartJS_dataset(
-      config,
-      values,
-      valueCount,
-      Cache.getTaskDeviceValueDecimals(event->TaskIndex, 0));
   }
-  add_ChartJS_chart_footer();
 }
 
-# endif // if FEATURE_CHART_JS
+#  endif // if FEATURE_CHART_JS
 
 void P002_data_struct::formatADC_statistics(const __FlashStringHelper *label, int raw, bool includeOutputValue) const
 {
@@ -559,28 +580,29 @@ String P002_data_struct::formatADC_statistics_to_str(
 
   float_value = raw;
 
-# ifdef ESP32
+#  ifdef ESP32
 
   if (_useFactoryCalibration) {
     float_value = applyADCFactoryCalibration(raw, _attenuation);
-    res = strformat(
+    res         = strformat(
       F("%s [mV]  ≙ %d [ADC]"),
       toString(float_value, _nrDecimals).c_str(),
       raw);
   } else {
     res += raw;
   }
-#else
+#  else // ifdef ESP32
   res += raw;
-# endif // ifdef ESP32
+#  endif // ifdef ESP32
 
   if (includeOutputValue) {
     res        += F(" → ");
     float_value =  applyCalibration(float_value);
 
-# ifndef LIMIT_BUILD_SIZE
+#  ifndef LIMIT_BUILD_SIZE
 
-    switch (_sampleMode) {
+    switch (_sampleMode)
+    {
       case P002_USE_OVERSAMPLING:
         float_value = applyMultiPointInterpolation(float_value);
         break;
@@ -595,7 +617,7 @@ String P002_data_struct::formatADC_statistics_to_str(
         break;
       }
     }
-# endif // ifndef LIMIT_BUILD_SIZE
+#  endif // ifndef LIMIT_BUILD_SIZE
     res += toString(float_value, _nrDecimals);
   }
 
@@ -606,16 +628,17 @@ void P002_data_struct::format_2point_calib_statistics(const __FlashStringHelper
 {
   addRowLabel(label);
   addHtmlInt(raw);
-  # ifdef ESP32
+  #  ifdef ESP32
   addUnit(_useFactoryCalibration ? F("mV") : F("raw"));
-  # else // ifdef ESP32
+  #  else // ifdef ESP32
   addUnit(F("raw"));
-  # endif // ifdef ESP32
+  #  endif // ifdef ESP32
   html_add_estimate_symbol();
   addHtmlFloat(float_value, _nrDecimals);
 }
 
-# ifdef ESP32
+#  ifdef ESP32
+
 const __FlashStringHelper * P002_data_struct::AttenuationToString(adc_atten_t attenuation) {
   const __FlashStringHelper *datalabels[] = { F("0 dB"), F("2.5 dB"), F("6 dB"), F("12 dB") };
 
@@ -630,16 +653,17 @@ adc_atten_t P002_data_struct::getAttenuation(struct EventStruct *event) {
   }
   P002_ATTENUATION = P002_ADC_11db;
 
-#  if ESP_IDF_VERSION_MAJOR >= 5
+#   if ESP_IDF_VERSION_MAJOR >= 5
   return ADC_ATTEN_DB_12;
-#  else // if ESP_IDF_VERSION_MAJOR >= 5
+#   else // if ESP_IDF_VERSION_MAJOR >= 5
   return ADC_ATTEN_DB_11;
-#  endif // if ESP_IDF_VERSION_MAJOR >= 5
+#   endif // if ESP_IDF_VERSION_MAJOR >= 5
 }
 
-# endif // ifdef ESP32
+#  endif // ifdef ESP32
+
+#  if FEATURE_CHART_JS
 
-# if FEATURE_CHART_JS
 void P002_data_struct::webformLoad_multipointCurve(struct EventStruct *event) const
 {
   if (P002_MULTIPOINT_ENABLED)
@@ -647,47 +671,67 @@ void P002_data_struct::webformLoad_multipointCurve(struct EventStruct *event) co
     const bool useBinning = P002_OVERSAMPLING == P002_USE_BINNING;
     addRowLabel(useBinning ? F("Binning Curve") : F("Multipoint Curve"));
 
-    String axisOptions;
 
+    ChartJS_options_scales scales;
     {
-      ChartJS_options_scales scales;
       scales.add({ F("x"), useBinning ? F("Bin Center Value") : F("Input") });
       scales.add({ F("y"), useBinning ? F("Bin Output Value") : F("Output") });
-      axisOptions = scales.toString();
     }
-
-    add_ChartJS_chart_header(
-      useBinning ? F("bar") : F("line"),
-      F("mpcurve"),
-      { useBinning ? F("Bin Values") : F("Multipoint Curve") },
-      500,
-      500,
-      axisOptions);
-
-    // Add labels
-    addHtml(F("\"labels\":["));
-
-    for (size_t i = 0; i < _multipoint.size(); ++i) {
-      if (i != 0) {
-        addHtml(',');
-      }
-      addHtmlFloat(_multipoint[i]._adc, _nrDecimals);
-    }
-    addHtml(F("],\n\"datasets\":["));
-
-    add_ChartJS_dataset_header(
     {
-      useBinning ? F("Bins") : F("Multipoint Values"),
-      F("rgb(255, 99, 132)") });
+      auto chart = add_ChartJS_chart_header(
+        useBinning ? F("bar") : F("line"),
+        F("mpcurve"),
+        { useBinning ? F("Bin Values") : F("Multipoint Curve") },
+        500,
+        500,
+        scales);
 
-    for (size_t i = 0; i < _multipoint.size(); ++i) {
-      if (i != 0) {
-        addHtml(',');
+      if (chart) {
+        auto data = chart->createChild(F("data"));
+
+        if (data) {
+          {
+            auto labels = data->createChildArray(F("labels"));
+
+            if (labels) {
+              for (size_t i = 0; i < _multipoint.size(); ++i) {
+                labels->write({ EMPTY_STRING, _multipoint[i]._adc, _nrDecimals });
+              }
+            }
+          }
+
+          {
+            auto datasets = data->createChildArray(F("datasets"));
+
+            if (datasets) {
+              auto dataset = datasets->createChild();
+
+              if (dataset) {
+
+                auto data = add_ChartJS_dataset_header(
+                  *dataset,
+                {
+                  useBinning ? F("Bins") : F("Multipoint Values"),
+                  F("rgb(255, 99, 132)") });
+
+                if (data) {
+                  for (size_t i = 0; i < _multipoint.size(); ++i) {
+                    const float value = _multipoint[i]._value;
+
+                    if (isnanf(value)) {
+                      data->write({ EMPTY_STRING, F("null") });
+                    } else {
+                      data->write({ EMPTY_STRING, value, _nrDecimals });
+                    }
+                  }
+                }
+              }
+            }
+          }
+        }
       }
-      addHtmlFloat(_multipoint[i]._value, _nrDecimals);
     }
-    add_ChartJS_dataset_footer();
-    add_ChartJS_chart_footer();
+
 
     if (!useBinning) {
       // Try to compute the expected mapping from ADC to multipoint values
@@ -696,98 +740,106 @@ void P002_data_struct::webformLoad_multipointCurve(struct EventStruct *event) co
       int xAxisValues[valueCount];
       getChartRange(event, xAxisValues, valueCount);
 
-      String axisOptions;
 
+      ChartJS_options_scales scales;
       {
-        ChartJS_options_scales scales;
         scales.add({ F("x"), getChartXaxisLabel(event) });
         scales.add({ F("y"), F("Output") });
-        axisOptions = scales.toString();
       }
-      add_ChartJS_chart_header(
-        F("line"),
-        F("mpCurveSimulated"),
-        { F("Simulated Input to Output Curve") },
-        500,
-        500,
-        axisOptions);
-
-      add_ChartJS_chart_labels(
-        valueCount,
-        xAxisValues);
-
-      const __FlashStringHelper *label = F("Multipoint");
-      const __FlashStringHelper *color = F("rgb(255, 99, 132)");
-
-      for (int step = 0; step < 3; ++step)
       {
-        float values[valueCount];
-        bool  use2PointCalib = false;
-        bool  useMultiPoint  = false;
+        auto chart = add_ChartJS_chart_header(
+          F("line"),
+          F("mpCurveSimulated"),
+          { F("Simulated Input to Output Curve") },
+          500,
+          500,
+          scales);
 
-        switch (step) {
-          case 0:
-            useMultiPoint = true;
-            break;
-          case 1:
-            label          = F("2 Point Calibration & Multipoint");
-            color          = F("rgb(54, 162, 235)");
-            use2PointCalib = true;
-            useMultiPoint  = true;
-            break;
-          case 2:
-            label          = F("2 Point Calibration");
-            color          = F("rgb(153, 102, 255)");
-            use2PointCalib = true;
-            break;
-        }
+        if (chart) {
+          auto data = chart->createChild(F("data"));
 
-        bool hidden = !((use2PointCalib == _use2pointCalibration) &&
-                        useMultiPoint);
+          if (data) {
+            add_ChartJS_chart_labels(
+              *data,
+              valueCount,
+              xAxisValues);
 
-        for (int i = 0; i < valueCount; ++i) {
-          values[i] = xAxisValues[i];
+            const __FlashStringHelper *label = F("Multipoint");
+            const __FlashStringHelper *color = F("rgb(255, 99, 132)");
 
-          if (use2PointCalib) {
-            values[i] = P002_data_struct::applyCalibration(event, values[i], true);
-          }
+            auto datasets = data->createChildArray(F("datasets"));
 
-          if (useMultiPoint) {
-            values[i] = applyMultiPointInterpolation(values[i], true);
+            if (datasets) {
+              for (int step = 0; step < 3; ++step)
+              {
+                float values[valueCount];
+                bool  use2PointCalib = false;
+                bool  useMultiPoint  = false;
+
+                switch (step)
+                {
+                  case 0:
+                    useMultiPoint = true;
+                    break;
+                  case 1:
+                    label          = F("2 Point Calibration & Multipoint");
+                    color          = F("rgb(54, 162, 235)");
+                    use2PointCalib = true;
+                    useMultiPoint  = true;
+                    break;
+                  case 2:
+                    label          = F("2 Point Calibration");
+                    color          = F("rgb(153, 102, 255)");
+                    use2PointCalib = true;
+                    break;
+                }
+
+                bool hidden = !((use2PointCalib == _use2pointCalibration) &&
+                                useMultiPoint);
+
+                for (int i = 0; i < valueCount; ++i) {
+                  values[i] = xAxisValues[i];
+
+                  if (use2PointCalib) {
+                    values[i] = P002_data_struct::applyCalibration(event, values[i], true);
+                  }
+
+                  if (useMultiPoint) {
+                    values[i] = applyMultiPointInterpolation(values[i], true);
+                  }
+                }
+
+                ChartJS_dataset_config config(
+                  label,
+                  color);
+                config.hidden = hidden;
+
+                add_ChartJS_dataset(
+                  *datasets,
+                  config,
+                  values,
+                  valueCount,
+                  Cache.getTaskDeviceValueDecimals(event->TaskIndex, 0));
+              }
+            }
           }
         }
-
-        ChartJS_dataset_config config(
-          label,
-          color);
-        config.hidden = hidden;
-
-        if (step != 0) {
-          addHtml(',');
-        }
-
-        add_ChartJS_dataset(
-          config,
-          values,
-          valueCount,
-          Cache.getTaskDeviceValueDecimals(event->TaskIndex, 0));
       }
-      add_ChartJS_chart_footer();
     }
   }
 }
 
-# endif // if FEATURE_CHART_JS
+#  endif // if FEATURE_CHART_JS
 
 String P002_data_struct::webformSave(struct EventStruct *event)
 {
   P002_OVERSAMPLING = getFormItemInt(F("oversampling"), 0); // Set a default for LIMIT_BUILD_SIZE
 
   P002_CALIBRATION_ENABLED = isFormItemChecked(F("cal"));
-  # ifdef ESP32
+  #  ifdef ESP32
   P002_APPLY_FACTORY_CALIB = isFormItemChecked(F("fac_cal"));
   P002_ATTENUATION         = getFormItemInt(F("attn"));
-  # endif // ifdef ESP32
+  #  endif // ifdef ESP32
 
   // Map the input "point" values to the nearest int.
   setTwoPointCalibration(
@@ -797,7 +849,7 @@ String P002_data_struct::webformSave(struct EventStruct *event)
     getFormItemFloat(F("out1")),
     getFormItemFloat(F("out2")));
 
-# ifndef LIMIT_BUILD_SIZE
+#  ifndef LIMIT_BUILD_SIZE
   P002_MULTIPOINT_ENABLED = isFormItemChecked(F("multi_en"));
 
   P002_NR_MULTIPOINT_ITEMS = getFormItemInt(F("nr_mp"));
@@ -828,9 +880,9 @@ String P002_data_struct::webformSave(struct EventStruct *event)
   }
 
   return SaveCustomTaskSettings(event->TaskIndex, lines, nr_lines, 0);
-# else // ifndef LIMIT_BUILD_SIZE
+#  else // ifndef LIMIT_BUILD_SIZE
   return EMPTY_STRING;
-# endif // ifndef LIMIT_BUILD_SIZE
+#  endif // ifndef LIMIT_BUILD_SIZE
 }
 
 void P002_data_struct::takeSample()
@@ -838,23 +890,24 @@ void P002_data_struct::takeSample()
   if (_sampleMode == P002_USE_CURENT_SAMPLE) { return; }
   const int raw = analog_read();
 
-# if FEATURE_PLUGIN_STATS
+#  if FEATURE_PLUGIN_STATS
   PluginStats *stats = getPluginStats(0);
 
   if (stats != nullptr) {
     stats->trackPeak(raw);
   }
-# endif // if FEATURE_PLUGIN_STATS
+#  endif // if FEATURE_PLUGIN_STATS
 
-  switch (_sampleMode) {
+  switch (_sampleMode)
+  {
     case P002_USE_OVERSAMPLING:
       addOversamplingValue(raw);
       break;
-# ifndef LIMIT_BUILD_SIZE
+#  ifndef LIMIT_BUILD_SIZE
     case P002_USE_BINNING:
       addBinningValue(raw);
       break;
-# endif // ifndef LIMIT_BUILD_SIZE
+#  endif // ifndef LIMIT_BUILD_SIZE
   }
 }
 
@@ -863,7 +916,8 @@ bool P002_data_struct::getValue(float& float_value,
 {
   bool mustTakeSample = false;
 
-  switch (_sampleMode) {
+  switch (_sampleMode)
+  {
     case P002_USE_OVERSAMPLING:
 
       if (getOversamplingValue(float_value, raw_value)) {
@@ -871,7 +925,7 @@ bool P002_data_struct::getValue(float& float_value,
       }
       mustTakeSample = true;
       break;
-# ifndef LIMIT_BUILD_SIZE
+#  ifndef LIMIT_BUILD_SIZE
     case P002_USE_BINNING:
 
       if (getBinnedValue(float_value, raw_value)) {
@@ -879,7 +933,7 @@ bool P002_data_struct::getValue(float& float_value,
       }
       mustTakeSample = true;
       break;
-# endif // ifndef LIMIT_BUILD_SIZE
+#  endif // ifndef LIMIT_BUILD_SIZE
     case P002_USE_CURENT_SAMPLE:
       mustTakeSample = true;
       break;
@@ -890,27 +944,28 @@ bool P002_data_struct::getValue(float& float_value,
   }
 
   raw_value = analog_read();
-# if FEATURE_PLUGIN_STATS
+#  if FEATURE_PLUGIN_STATS
 
   PluginStats *stats = getPluginStats(0);
 
   if (stats != nullptr) {
     stats->trackPeak(raw_value);
   }
-# endif // if FEATURE_PLUGIN_STATS
+#  endif // if FEATURE_PLUGIN_STATS
   float_value = raw_value;
-  # ifdef ESP32
+  #  ifdef ESP32
 
   if (_useFactoryCalibration) {
     float_value = applyADCFactoryCalibration(raw_value, _attenuation);
   }
-  # endif // ifdef ESP32
+  #  endif // ifdef ESP32
 
   float_value = applyCalibration(float_value);
 
-# ifndef LIMIT_BUILD_SIZE
+#  ifndef LIMIT_BUILD_SIZE
 
-  switch (_sampleMode) {
+  switch (_sampleMode)
+  {
     case P002_USE_OVERSAMPLING:
       float_value = applyMultiPointInterpolation(float_value);
       break;
@@ -925,16 +980,17 @@ bool P002_data_struct::getValue(float& float_value,
       break;
     }
   }
-# endif // ifndef LIMIT_BUILD_SIZE
+#  endif // ifndef LIMIT_BUILD_SIZE
 
   return true;
 }
 
 void P002_data_struct::reset()
 {
-# ifndef LIMIT_BUILD_SIZE
+#  ifndef LIMIT_BUILD_SIZE
 
-  switch (_sampleMode) {
+  switch (_sampleMode)
+  {
     case P002_USE_OVERSAMPLING:
       resetOversampling();
       break;
@@ -947,9 +1003,9 @@ void P002_data_struct::reset()
       break;
     }
   }
-# else // ifndef LIMIT_BUILD_SIZE
+#  else // ifndef LIMIT_BUILD_SIZE
   resetOversampling();
-# endif // ifndef LIMIT_BUILD_SIZE
+#  endif // ifndef LIMIT_BUILD_SIZE
 }
 
 uint32_t P002_data_struct::getOversamplingCount() const
@@ -957,37 +1013,34 @@ uint32_t P002_data_struct::getOversamplingCount() const
   return OverSampling.getCount();
 }
 
-void P002_data_struct::resetOversampling() {
-  OverSampling.reset();
-}
+void P002_data_struct::resetOversampling()                    { OverSampling.reset(); }
 
-void P002_data_struct::addOversamplingValue(int currentValue) {
-  OverSampling.add(currentValue);
-}
+void P002_data_struct::addOversamplingValue(int currentValue) { OverSampling.add(currentValue); }
 
 bool P002_data_struct::getOversamplingValue(float& float_value, int& raw_value) const {
   if (OverSampling.peek(float_value)) {
     raw_value = static_cast(float_value);
 
-# ifdef ESP32
+#  ifdef ESP32
 
     if (_useFactoryCalibration) {
       float_value = applyADCFactoryCalibration(float_value, _attenuation);
     }
-# endif // ifdef ESP32
+#  endif // ifdef ESP32
 
     // We counted the raw oversampling values, so now we need to apply the calibration and multi-point processing
     float_value = applyCalibration(float_value);
-# ifndef LIMIT_BUILD_SIZE
+#  ifndef LIMIT_BUILD_SIZE
     float_value = applyMultiPointInterpolation(float_value);
-# endif // ifndef LIMIT_BUILD_SIZE
+#  endif // ifndef LIMIT_BUILD_SIZE
 
     return true;
   }
   return false;
 }
 
-# ifndef LIMIT_BUILD_SIZE
+#  ifndef LIMIT_BUILD_SIZE
+
 int P002_data_struct::getBinIndex(float currentValue) const
 {
   const size_t mp_size = _multipoint.size();
@@ -1020,12 +1073,12 @@ int P002_data_struct::computeADC_to_bin(const int& currentValue) const
   // First apply calibration, then find the bin index
   float calibrated_value = static_cast(currentValue);
 
-#  ifdef ESP32
+#   ifdef ESP32
 
   if (_useFactoryCalibration) {
     calibrated_value = applyADCFactoryCalibration(calibrated_value, _attenuation);
   }
-#  endif // ifdef ESP32
+#   endif // ifdef ESP32
 
 
   calibrated_value = applyCalibration(calibrated_value);
@@ -1076,7 +1129,7 @@ bool P002_data_struct::getBinnedValue(float& float_value, int& raw_value) const
       raw_value         = _multipoint[i]._adc;
     }
   }
-  #  ifndef BUILD_NO_DEBUG
+  #   ifndef BUILD_NO_DEBUG
 
   if (loglevelActiveFor(LOG_LEVEL_DEBUG)) {
     addLogMove(LOG_LEVEL_DEBUG,
@@ -1085,12 +1138,12 @@ bool P002_data_struct::getBinnedValue(float& float_value, int& raw_value) const
                          float_value,
                          raw_value));
   }
-  #  endif // ifndef BUILD_NO_DEBUG
+  #   endif // ifndef BUILD_NO_DEBUG
 
   return highest_bin_count != 0;
 }
 
-# endif // ifndef LIMIT_BUILD_SIZE
+#  endif // ifndef LIMIT_BUILD_SIZE
 
 float P002_data_struct::applyCalibration(struct EventStruct *event, float float_value, bool force) {
   if (force || P002_CALIBRATION_ENABLED)
@@ -1106,25 +1159,25 @@ float P002_data_struct::applyCalibration(struct EventStruct *event, float float_
 
 float P002_data_struct::getCurrentValue(struct EventStruct *event, int& raw_value)
 {
-  # ifdef ESP8266
+  #  ifdef ESP8266
   const int pin = A0;
-  # endif // ifdef ESP8266
-  # ifdef ESP32
+  #  endif // ifdef ESP8266
+  #  ifdef ESP32
   const int pin = CONFIG_PIN1;
 
   auto att = getAttenuation(event);
 
   analogSetPinAttenuation(pin, static_cast(att));
-  # endif // ifdef ESP32
+  #  endif // ifdef ESP32
 
   raw_value = espeasy_analogRead(pin);
 
-  # ifdef ESP32
+  #  ifdef ESP32
 
   if (useFactoryCalibration(event)) {
     return applyADCFactoryCalibration(raw_value, att);
   }
-  # endif // ifdef ESP32
+  #  endif // ifdef ESP32
 
   return raw_value;
 }
@@ -1140,7 +1193,8 @@ float P002_data_struct::applyCalibration(float float_value) const
     _calib_out2);
 }
 
-# ifdef ESP32
+#  ifdef ESP32
+
 bool P002_data_struct::useFactoryCalibration(struct EventStruct *event) {
   if (P002_APPLY_FACTORY_CALIB) {
     const int adc_num = getADC_num_for_gpio(CONFIG_PIN1);
@@ -1152,9 +1206,10 @@ bool P002_data_struct::useFactoryCalibration(struct EventStruct *event) {
   return false;
 }
 
-# endif // ifdef ESP32
+#  endif // ifdef ESP32
+
+#  ifndef LIMIT_BUILD_SIZE
 
-# ifndef LIMIT_BUILD_SIZE
 float P002_data_struct::applyMultiPointInterpolation(float float_value, bool force) const
 {
   if (!_useMultipoint && !force) { return float_value; }
@@ -1226,7 +1281,7 @@ float P002_data_struct::applyMultiPointInterpolation(float float_value, bool for
   return float_value;
 }
 
-# endif // ifndef LIMIT_BUILD_SIZE
+#  endif // ifndef LIMIT_BUILD_SIZE
 
 void P002_data_struct::setTwoPointCalibration(
   struct EventStruct *event,
@@ -1291,17 +1346,17 @@ bool P002_data_struct::plugin_set_config(struct EventStruct *event,
 }
 
 int P002_data_struct::analog_read() const {
-#ifdef ESP32
+#  ifdef ESP32
   int channel{};
   const int adc = getADC_num_for_gpio(_pin_analogRead, channel);
 
   if ((adc == 1) || (adc == 2)) {
     analogSetPinAttenuation(_pin_analogRead, static_cast(_attenuation));
   }
-#endif
+#  endif // ifdef ESP32
 
   return espeasy_analogRead(_pin_analogRead);
 }
 
-#endif
+# endif // if SOC_ADC_SUPPORTED || defined(ESP8266)
 #endif // ifdef USES_P002
diff --git a/src/src/PluginStructs/P169_data_struct.cpp b/src/src/PluginStructs/P169_data_struct.cpp
index a532c7480..91405a526 100644
--- a/src/src/PluginStructs/P169_data_struct.cpp
+++ b/src/src/PluginStructs/P169_data_struct.cpp
@@ -20,7 +20,7 @@ P169_data_struct::P169_data_struct(struct EventStruct *event) :
   _irqPin(P169_IRQ_PIN)
 {
   // Do not try to construct the sensor if not needed as it will set the pinmode of the pin
-  if (_irqPin >= 0 && Settings.TaskDeviceDataFeed[event->TaskIndex] == 0) {
+  if ((_irqPin >= 0) && (Settings.TaskDeviceDataFeed[event->TaskIndex] == 0)) {
     _sensor = new (std::nothrow) AS3935I2C(P169_I2C_ADDRESS, P169_IRQ_PIN);
   }
 }
@@ -61,7 +61,8 @@ bool P169_data_struct::loop(struct EventStruct *event)
       }
 
       // query the interrupt source from the AS3935
-      switch (_sensor->readInterruptSource()) {
+      switch (_sensor->readInterruptSource())
+      {
         case AS3935MI::AS3935_INT_NH:
 
           // Noise floor too high
@@ -248,7 +249,8 @@ bool P169_data_struct::plugin_init(struct EventStruct *event)
   calibrate(event);
 
 # ifdef ESP32
-#ifndef BUILD_NO_DEBUG
+#  ifndef BUILD_NO_DEBUG
+
   if (loglevelActiveFor(LOG_LEVEL_DEBUG))
   {
     // Short test checking effect of nr samples during calibration
@@ -284,7 +286,7 @@ bool P169_data_struct::plugin_init(struct EventStruct *event)
       addLogMove(LOG_LEVEL_DEBUG, log);
     }
   }
-#endif
+#  endif // ifndef BUILD_NO_DEBUG
 # endif // ifdef ESP32
 
 
@@ -318,6 +320,7 @@ enum class P169_subcmd_e : int8_t {
   setnf,  // Set noise floor
   setwd,  // Set Watchdog Threshold
   setsrej // Set Spike Rejection
+
 };
 
 /*****************************************************
@@ -343,7 +346,8 @@ bool P169_data_struct::plugin_write(struct EventStruct *event,
     uint32_t   value{};
     const bool hasValue = validUIntFromString(parseString(string, 3), value);
 
-    switch (subcmd) {
+    switch (subcmd)
+    {
       case P169_subcmd_e::invalid:
         break;
       case P169_subcmd_e::clearstats:
@@ -401,8 +405,8 @@ enum class P169_get_config_e : int8_t {
   watchdog,       // [#watchdog]
   srej,           // [#srej] = current spike rejection
   gain            // [#gain]
-};
 
+};
 
 /*****************************************************
 * plugin_get_config_value
@@ -439,10 +443,7 @@ bool P169_data_struct::plugin_get_config_value(struct EventStruct *event,
   return true;
 }
 
-float P169_data_struct::getDistance()
-{
-  return computeDistanceFromEnergy(getEnergy(), -1.0f);
-}
+float    P169_data_struct::getDistance() { return computeDistanceFromEnergy(getEnergy(), -1.0f); }
 
 uint32_t P169_data_struct::getEnergy()
 {
@@ -493,10 +494,7 @@ void P169_data_struct::clearStatistics()
   }
 }
 
-float P169_data_struct::computeDeviationPct(uint32_t LCO_freq)
-{
-  return (LCO_freq / 5000.0f) - 100.0f;
-}
+float P169_data_struct::computeDeviationPct(uint32_t LCO_freq) { return (LCO_freq / 5000.0f) - 100.0f; }
 
 float P169_data_struct::computeDistanceFromEnergy(uint32_t energy, float errorValue)
 {
@@ -792,15 +790,24 @@ float P169_data_struct::regValue_AFE_gain_toFloat(uint8_t gain)
 
   switch (gain)
   {
-    case 10: afeGain = 0.30f; break;
-    case 11: afeGain = 0.40f; break;
-    case 12: afeGain = 0.55f; break;
-    case 13: afeGain = 0.74f; break;
-    case 14: afeGain = 1.00f; break; // Datasheet: "Outdoor"
-    case 15: afeGain = 1.35f; break;
-    case 16: afeGain = 1.83f; break;
-    case 17: afeGain = 2.47f; break;
-    case 18: afeGain = 3.34f; break; // Datasheet: "Indoor"
+    case 10: afeGain = 0.30f;
+      break;
+    case 11: afeGain = 0.40f;
+      break;
+    case 12: afeGain = 0.55f;
+      break;
+    case 13: afeGain = 0.74f;
+      break;
+    case 14: afeGain = 1.00f;
+      break; // Datasheet: "Outdoor"
+    case 15: afeGain = 1.35f;
+      break;
+    case 16: afeGain = 1.83f;
+      break;
+    case 17: afeGain = 2.47f;
+      break;
+    case 18: afeGain = 3.34f;
+      break; // Datasheet: "Indoor"
   }
   return afeGain;
 }
@@ -880,6 +887,7 @@ void P169_data_struct::sendChangeEvent(struct EventStruct *event)
 }
 
 # if FEATURE_CHART_JS
+
 void P169_data_struct::addCalibrationChart(struct EventStruct *event)
 {
   if (_sensor == nullptr) {
@@ -902,40 +910,46 @@ void P169_data_struct::addCalibrationChart(struct EventStruct *event)
     }
   }
 
-  String axisOptions;
 
   {
     ChartJS_options_scales scales;
     scales.add({ F("x"), F("Antenna capacitor") });
     scales.add({ F("y"), F("Error (%)") });
-    axisOptions = scales.toString();
+    auto chart =
+      add_ChartJS_chart_header(
+        F("line"),
+        F("lcoCapErrorCurve"),
+        { F("LCO Resonance Frequency") },
+        500,
+        500,
+        scales);
+
+    if (chart) {
+      auto data = chart->createChild(F("data"));
+
+      if (data) {
+        add_ChartJS_chart_labels(
+          *data,
+          actualValueCount,
+          xAxisValues);
+
+        auto datasets = data->createChildArray(F("datasets"));
+
+        if (datasets) {
+          const ChartJS_dataset_config config(
+            F("Error %"),
+            F("rgb(255, 99, 132)"));
+
+          add_ChartJS_dataset(
+            *datasets,
+            config,
+            values,
+            actualValueCount,
+            2);
+        }
+      }
+    }
   }
-
-  add_ChartJS_chart_header(
-    F("line"),
-    F("lcoCapErrorCurve"),
-    { F("LCO Resonance Frequency") },
-    500,
-    500,
-    axisOptions);
-
-  add_ChartJS_chart_labels(
-    actualValueCount,
-    xAxisValues);
-
-  {
-    const ChartJS_dataset_config config(
-      F("Error %"),
-      F("rgb(255, 99, 132)"));
-
-
-    add_ChartJS_dataset(
-      config,
-      values,
-      actualValueCount,
-      2);
-  }
-  add_ChartJS_chart_footer();
 }
 
 # endif // if FEATURE_CHART_JS
diff --git a/src/src/WebServer/CacheControllerPages.cpp b/src/src/WebServer/CacheControllerPages.cpp
index c8a31c6e3..655931c7e 100644
--- a/src/src/WebServer/CacheControllerPages.cpp
+++ b/src/src/WebServer/CacheControllerPages.cpp
@@ -96,12 +96,9 @@ void handle_cache_json() {
   {
     KeyValueWriter_JSON mainLevelWriter(true);
     {
-      auto writer = mainLevelWriter.createChild(F("columns"));
+      auto writer = mainLevelWriter.createChildArray(F("columns"));
 
       if (writer) {
-
-        writer->setIsArray();
-
         //     addHtml(F("UNIX timestamp;contr. idx;sensortype;taskindex;value count"));
         writer->write({ EMPTY_STRING, F("UNIX timestamp") });
         writer->write({ EMPTY_STRING, F("UTC timestamp") });
@@ -123,10 +120,9 @@ void handle_cache_json() {
     }
     int fileCount = 0;
     {
-      auto writer = mainLevelWriter.createChild(F("files"));
+      auto writer = mainLevelWriter.createChildArray(F("files"));
 
       if (writer) {
-        writer->setIsArray();
         bool islast = false;
         int  filenr = 0;
 
@@ -142,11 +138,9 @@ void handle_cache_json() {
       }
     }
     {
-      auto writer = mainLevelWriter.createChild(F("pluginID"));
+      auto writer = mainLevelWriter.createChildArray(F("pluginID"));
 
       if (writer) {
-        writer->setIsArray();
-
         for (taskIndex_t taskIndex = 0; validTaskIndex(taskIndex); ++taskIndex) {
           writer->write({ EMPTY_STRING, getPluginID_from_TaskIndex(taskIndex).value });
         }
diff --git a/src/src/WebServer/Chart_JS.cpp b/src/src/WebServer/Chart_JS.cpp
index 0990f7228..af090f068 100644
--- a/src/src/WebServer/Chart_JS.cpp
+++ b/src/src/WebServer/Chart_JS.cpp
@@ -2,56 +2,53 @@
 
 #if FEATURE_CHART_JS
 
+# include "../Helpers/KeyValueWriter_JSON.h"
 # include "../Helpers/StringConverter.h"
 # include "../WebServer/HTML_wrappers.h"
 # include "../WebServer/JSON.h"
 
-void add_ChartJS_array(int          valueCount,
-                       const String array[])
+void add_ChartJS_array(KeyValueWriter& parent,
+                       int             valueCount,
+                       const String    array[])
 {
   for (int i = 0; i < valueCount; ++i) {
-    if (i != 0) {
-      addHtml(',', '\n');
-    }
-    addHtml(to_json_value(array[i]));
+    parent.write({ EMPTY_STRING, array[i] });
   }
 }
 
-void add_ChartJS_array(int          valueCount,
-                       const float  array[],
-                       unsigned int nrDecimals)
+void add_ChartJS_array(KeyValueWriter& parent,
+                       int             valueCount,
+                       const float     array[],
+                       unsigned int    nrDecimals)
 {
   for (int i = 0; i < valueCount; ++i) {
-    if (i != 0) {
-      addHtml(',', '\n');
-    }
-    addHtmlFloat_NaN_toNull(array[i], nrDecimals);
+    parent.write({ EMPTY_STRING, array[i], nrDecimals });
+
+    //    addHtmlFloat_NaN_toNull(array[i], nrDecimals);
   }
 }
 
-void add_ChartJS_array(int       valueCount,
-                       const int array[])
+void add_ChartJS_array(KeyValueWriter& parent,
+                       int             valueCount,
+                       const int       array[])
 {
   for (int i = 0; i < valueCount; ++i) {
-    if (i != 0) {
-      addHtml(',', '\n');
-    }
-    addHtmlInt(array[i]);
+    parent.write({ EMPTY_STRING, array[i] });
   }
 }
 
-void add_ChartJS_chart_header(
+Sp_KeyValueWriter add_ChartJS_chart_header(
   const __FlashStringHelper *chartType,
   const __FlashStringHelper *id,
   const ChartJS_title      & chartTitle,
   int                        width,
   int                        height,
-  const String             & options,
+  ChartJS_options_scales   & options,
   bool                       enableZoom,
   size_t                     nrSamples,
   bool                       onlyJSON)
 {
-  add_ChartJS_chart_header(
+  return add_ChartJS_chart_header(
     chartType,
     String(id),
     chartTitle,
@@ -63,13 +60,13 @@ void add_ChartJS_chart_header(
     onlyJSON);
 }
 
-void add_ChartJS_chart_header(
+Sp_KeyValueWriter add_ChartJS_chart_header(
   const __FlashStringHelper *chartType,
   const String             & id,
   const ChartJS_title      & chartTitle,
   int                        width,
   int                        height,
-  const String             & options,
+  ChartJS_options_scales   & options,
   bool                       enableZoom,
   size_t                     nrSamples,
   bool                       onlyJSON)
@@ -90,154 +87,160 @@ void add_ChartJS_chart_header(
               id_c_str,
               id_c_str));
   }
-  String plugins;
+  std::unique_ptr chartJSON(new (std::nothrow) KeyValueWriter_JSON(true));
 
-  if (enableZoom) {
-    plugins = F(
-      "\"zoom\":"
-      "{\"limits\":{"
-      "\"x\":{\"min\":\"original\",\"max\":\"original\",\"minRange\":1000}},"
-      "\"pan\":{\"enabled\":true,\"mode\":\"x\",\"modifierKey\":\"ctrl\"},"
-      "\"zoom\":{"
-      "\"wheel\":{\"enabled\":true},"
-      "\"drag\":{\"enabled\":true},"
-      "\"pinch\":{\"enabled\":true},"
-      "\"mode\":\"x\"}}"
-      );
+  if (chartJSON) {
+    chartJSON->allowFormatOverrides(false);
+
+    if (!onlyJSON) {
+      chartJSON->setFooter(F(");"));
+    }
+
+    add_ChartJS_chart_JSON_header(
+      *chartJSON,
+      chartType,
+      chartTitle,
+      options,
+      nrSamples,
+      enableZoom);
   }
-  add_ChartJS_chart_JSON_header(
-    chartType,
-    plugins,
-    chartTitle,
-    options,
-    nrSamples);
+
+  return std::move(chartJSON);
 }
 
 void add_ChartJS_chart_JSON_header(
+  KeyValueWriter_JSON      & parent,
   const __FlashStringHelper *chartType,
-  const String             & plugins,
   const ChartJS_title      & chartTitle,
-  const String             & options,
-  size_t                     nrSamples)
+  ChartJS_options_scales   & options,
+  size_t                     nrSamples,
+  bool                       enableZoom)
 {
-  addHtml(F("{\"type\":\""));
-  addHtml(chartType);
-  addHtml(F("\",\"options\":{"
-            "\"responsive\":false,\"plugins\":{"));
-  addHtml(F("\"legend\":{"
-            "\"position\":\"top\""
-            "},\"title\":"));
-  addHtml(chartTitle.toString());
+  parent.write({ F("type"), chartType });
+  auto optionsArr = parent.createChild(F("options"));
 
-  if (plugins.length() > 0) {
-    addHtml(',');
+  if (optionsArr) {
+    optionsArr->write({ F("responsive"), false });
+    {
+      auto plugins = optionsArr->createChild(F("plugins"));
+
+      if (plugins) {
+        {
+          auto legend = plugins->createChild(F("legend"));
+
+          if (legend) {
+            legend->write({ F("position"), F("top") });
+          }
+        }
+        plugins->write({ F("title"), chartTitle.toString() });
+
+        if (enableZoom) {
+          plugins->write({
+            F("zoom"),
+            F("{\"limits\":{"
+              "\"x\":{\"min\":\"original\",\"max\":\"original\",\"minRange\":1000}},"
+              "\"pan\":{\"enabled\":true,\"mode\":\"x\",\"modifierKey\":\"ctrl\"},"
+              "\"zoom\":{"
+              "\"wheel\":{\"enabled\":true},"
+              "\"drag\":{\"enabled\":true},"
+              "\"pinch\":{\"enabled\":true},"
+              "\"mode\":\"x\"}}"
+              ) });
+        }
+
+      }
+    }
+
+    if (nrSamples >= 60) {
+      // Default point radius = 3
+      // Typically when having > 64 samples, these points become really cluttered
+      // Thus it is best to reduce their radius.
+      const float radius = (enableZoom) ? 2.5f : 2.0f;
+      optionsArr->write({ F("elements"),
+                          strformat(
+                            F("{\"point\":{\"radius\":%.1f}}"),
+                            radius)
+                        });
+    }
+    options.toString(*optionsArr);
   }
-  addHtml(plugins);
-  addHtml('}'); // end plugins
-
-  if (nrSamples >= 60) {
-    // Default point radius = 3
-    // Typically when having > 64 samples, these points become really cluttered
-    // Thus it is best to reduce their radius.
-    const float radius = (plugins.length() > 0) ? 2.5f : 2.0f;
-    addHtml(strformat(
-      F(",\"elements\":{\"point\":{\"radius\":%.1f}}"),
-      radius));
-  }
-
-  if (!options.isEmpty()) {
-    addHtml(',', '\n');
-    addHtml(options);
-  }
-
-  addHtml(F("}," // end options
-            "\n\"data\":{"));
 }
 
 void add_ChartJS_chart_labels(
-  int       valueCount,
-  const int labels[])
+  KeyValueWriter& parent,
+  int             valueCount,
+  const int       labels[])
 {
-  addHtml(F("\n\"labels\":["));
-  add_ChartJS_array(valueCount, labels);
-  addHtml(F("],\n\"datasets\":["));
+  auto labelsWriter = parent.createChildArray(F("labels"));
+
+  if (labelsWriter) {
+    add_ChartJS_array(*labelsWriter, valueCount, labels);
+  }
 }
 
 void add_ChartJS_chart_labels(
-  int          valueCount,
-  const String labels[])
+  KeyValueWriter& parent,
+  int             valueCount,
+  const String    labels[])
 {
-  addHtml(F("\n\"labels\":["));
-  add_ChartJS_array(valueCount, labels);
-  addHtml(F("],\n\"datasets\":["));
+  auto labelsWriter = parent.createChildArray(F("labels"));
+
+  if (labelsWriter) {
+    add_ChartJS_array(*labelsWriter, valueCount, labels);
+  }
 }
 
-void add_ChartJS_scatter_data_point(float x, float y, int nrDecimals)
+void add_ChartJS_scatter_data_point(
+  KeyValueWriter& parent,
+  float x, float y, int nrDecimals)
 {
-  addHtml(F("{\"x\":"));
-  addHtmlFloat_NaN_toNull(x, nrDecimals);
-  addHtml(F(",\"y\":"));
-  addHtmlFloat_NaN_toNull(y, nrDecimals);
-  addHtml('}', ',');
+  auto element = parent.createChild();
+
+  if (element) {
+    element->write({ F("x"), x, nrDecimals });
+    element->write({ F("y"), y, nrDecimals });
+  }
 }
 
 void add_ChartJS_dataset(
+  KeyValueWriter              & datasets,
   const ChartJS_dataset_config& config,
   const float                   values[],
   int                           valueCount,
   unsigned int                  nrDecimals,
   const String                & options)
 {
-  add_ChartJS_dataset_header(config);
-  add_ChartJS_array(valueCount, values, nrDecimals);
-  add_ChartJS_dataset_footer(options);
+  auto dataset = datasets.createChild();
+
+  if (dataset) {
+    auto data = add_ChartJS_dataset_header(*dataset, config);
+
+    if (data) {
+      add_ChartJS_array(*data, valueCount, values, nrDecimals);
+    }
+  }
 }
 
-void add_ChartJS_dataset_header(const ChartJS_dataset_config& config)
+Sp_KeyValueWriter add_ChartJS_dataset_header(KeyValueWriter& dataset, const ChartJS_dataset_config& config)
 {
-  addHtml('{');
-
   if (!config.label.isEmpty()) {
-    stream_to_json_object_value(F("label"), config.label);
-    addHtml(',');
+    dataset.write({ F("label"), config.label });
   }
 
   if (!config.color.isEmpty()) {
-    stream_to_json_object_value(F("backgroundColor"), config.color);
-    addHtml(',');
-    stream_to_json_object_value(F("borderColor"), config.color);
-    addHtml(',');
+    dataset.write({ F("backgroundColor"), config.color });
+    dataset.write({ F("borderColor"), config.color });
   }
 
   if (!config.axisID.isEmpty()) {
-    stream_to_json_object_value(F("yAxisID"), config.axisID);
-    addHtml(',');
+    dataset.write({ F("yAxisID"), config.axisID });
   }
 
   if (config.hidden || config.displayConfig.showHidden()) {
-    addHtml(F("\"hidden\":true,"));
+    dataset.write({ F("hidden"), true });
   }
 
-  addHtml(F("\n\"data\":[\n"));
-}
-
-void add_ChartJS_dataset_footer(const String& options) {
-  addHtml(']');
-
-  if (!options.isEmpty()) {
-    addHtml(',', '\n');
-    addHtml(options);
-  }
-
-  addHtml('}', '\n');
-}
-
-void add_ChartJS_chart_footer(bool onlyJSON) {
-  addHtml(F("]}}"));
-
-  if (!onlyJSON) {
-    addHtml(F(");"));
-  }
+  return dataset.createChildArray(F("data"));
 }
 
 #endif // if FEATURE_CHART_JS
diff --git a/src/src/WebServer/Chart_JS.h b/src/src/WebServer/Chart_JS.h
index 73ae441b4..3373ea132 100644
--- a/src/src/WebServer/Chart_JS.h
+++ b/src/src/WebServer/Chart_JS.h
@@ -10,7 +10,32 @@
 // - add_ChartJS_chart_header
 // - add_ChartJS_chart_labels
 // - add_ChartJS_dataset (1x or more)
-// - add_ChartJS_chart_footer
+//
+// Typical JSON layout:
+// {
+//   "type": "line",
+//   "options": {
+//       ...
+//   },
+//   "data": {
+//     "labels": [
+//       ...
+//     ],
+//     "datasets": [
+//       {
+//         "label": "Error %",
+//         "backgroundColor": "rgb(255, 99, 132)",
+//         "borderColor": "rgb(255, 99, 132)",
+//         "data": [
+//           ...
+//         ]
+//       }
+//     ]
+//   }
+// }
+//
+// Make sure the KeyValueWriter objects are in their own scope, 
+// since the closing braces are written from their destructor.
 //
 // Split into several parts so a long array of
 // values can also be served directly
@@ -19,64 +44,74 @@
 
 #if FEATURE_CHART_JS
 
+# include "../Helpers/KeyValueWriter.h"
+# include "../Helpers/KeyValueWriter_JSON.h"
 # include "../WebServer/Chart_JS_scale.h"
 # include "../DataStructs/ChartJS_dataset_config.h"
 
-void add_ChartJS_chart_header(
+Sp_KeyValueWriter add_ChartJS_chart_header(
   const __FlashStringHelper *chartType,
   const __FlashStringHelper *id,
   const ChartJS_title      & chartTitle,
   int                        width,
   int                        height,
-  const String             & options   = EMPTY_STRING,
+  ChartJS_options_scales   & options,
   bool                       enableZoom = false,
-  size_t                     nrSamples = 0,
-  bool                       onlyJSON  = false);
+  size_t                     nrSamples  = 0,
+  bool                       onlyJSON   = false);
 
-void add_ChartJS_chart_header(
+Sp_KeyValueWriter add_ChartJS_chart_header(
   const __FlashStringHelper *chartType,
   const String             & id,
   const ChartJS_title      & chartTitle,
   int                        width,
   int                        height,
-  const String             & options   = EMPTY_STRING,
+  ChartJS_options_scales   & options,
   bool                       enableZoom = false,
-  size_t                     nrSamples = 0,
-  bool                       onlyJSON  = false);
+  size_t                     nrSamples  = 0,
+  bool                       onlyJSON   = false);
 
 void add_ChartJS_chart_JSON_header(
+  KeyValueWriter_JSON      & parent,
   const __FlashStringHelper *chartType,
-  const String             & plugins,
   const ChartJS_title      & chartTitle,
-  const String             & options,
-  size_t                     nrSamples);
+  ChartJS_options_scales   & options,
+  size_t                     nrSamples,
+  bool                       enableZoom
+  );
 
 void add_ChartJS_chart_labels(
-  int       valueCount,
-  const int labels[]);
+  KeyValueWriter& parent,
+  int             valueCount,
+  const int       labels[]);
 
 void add_ChartJS_chart_labels(
-  int          valueCount,
-  const String labels[]);
+  KeyValueWriter& parent,
+  int             valueCount,
+  const String    labels[]);
 
 
-void add_ChartJS_scatter_data_point(float x,
-                                    float y,
-                                    int   nrDecimals);
+void add_ChartJS_scatter_data_point(
+  KeyValueWriter& parent,
+  float           x,
+  float           y,
+  int             nrDecimals);
 
 void add_ChartJS_dataset(
+  KeyValueWriter              & datasets,
   const ChartJS_dataset_config& config,
   const float                   values[],
   int                           valueCount,
   unsigned int                  nrDecimals = 3,
   const String                & options    = EMPTY_STRING);
 
-void add_ChartJS_dataset_header(const ChartJS_dataset_config& config);
 
-void add_ChartJS_dataset_footer(const String& options = EMPTY_STRING);
+Sp_KeyValueWriter add_ChartJS_dataset_header(
+  KeyValueWriter              & dataset,
+                                const ChartJS_dataset_config& config);
+
 
 
-void add_ChartJS_chart_footer(bool onlyJSON = false);
 #endif // if FEATURE_CHART_JS
 
 #endif // ifndef WEBSERVER_CHART_JS_H
diff --git a/src/src/WebServer/Chart_JS_scale.cpp b/src/src/WebServer/Chart_JS_scale.cpp
index 010b74abe..5f940c42f 100644
--- a/src/src/WebServer/Chart_JS_scale.cpp
+++ b/src/src/WebServer/Chart_JS_scale.cpp
@@ -32,7 +32,7 @@ ChartJS_options_scale::ChartJS_options_scale(const PluginStats_Config_t& config,
   display        = Display::Auto;
 }
 
-String ChartJS_options_scale::toString() const
+void ChartJS_options_scale::toString(KeyValueWriter& parent) const
 {
   if (!axisID.isEmpty()) {
     // In JSON, boolean values do not need quotes
@@ -46,34 +46,44 @@ String ChartJS_options_scale::toString() const
 
     String positionStr;
 
-    switch (position) {
-      case Position::Top:    positionStr = F("top"); break;
-      case Position::Bottom: positionStr = F("bottom"); break;
-      case Position::Right:  positionStr = F("right"); break;
-      case Position::Center: positionStr = F("center"); break;
-      case Position::Left:   positionStr = F("left"); break;
+    switch (position)
+    {
+      case Position::Top:    positionStr = F("top");
+        break;
+      case Position::Bottom: positionStr = F("bottom");
+        break;
+      case Position::Right:  positionStr = F("right");
+        break;
+      case Position::Center: positionStr = F("center");
+        break;
+      case Position::Left:   positionStr = F("left");
+        break;
     }
 
     String extraOptions;
+
     if (typeStr.equalsIgnoreCase(F("time")) || typeStr.equalsIgnoreCase(F("timeseries"))) {
       // Make sure to use 24h time notation.
-      extraOptions += F(",\"time\":{\"displayFormats\":{\"millisecond\":\"HH:mm:ss.SSS\",\"second\":\"HH:mm:ss\",\"minute\":\"HH:mm:ss\",\"hour\":\"HH:mm\",\"day\":\"dd-MMM\",\"month\":\"MMM-yyyy\",\"year\":\"yyyy\"},\"tooltipFormat\":\"yyyy-MM-dd HH:mm:ss\"}");
+      extraOptions +=
+        F(
+          ",\"time\":{\"displayFormats\":{\"millisecond\":\"HH:mm:ss.SSS\",\"second\":\"HH:mm:ss\",\"minute\":\"HH:mm:ss\",\"hour\":\"HH:mm\",\"day\":\"dd-MMM\",\"month\":\"MMM-yyyy\",\"year\":\"yyyy\"},\"tooltipFormat\":\"yyyy-MM-dd HH:mm:ss\"}");
     }
 
     if (tickCount > 0) {
       extraOptions += strformat(F(",\"ticks\":{\"count\":%d}"), tickCount);
     }
-    return strformat(
-      F("\"%s\":{\"display\":%s,\"type\":\"%s\",\"position\":\"%s\",\"title\":%s,\"weight\":%d%s}"),
-      axisID.c_str(),
+    parent.write({
+      axisID,
+    strformat(
+      F("{\"display\":%s,\"type\":\"%s\",\"position\":\"%s\",\"title\":%s,\"weight\":%d%s}"),
       displayStr.c_str(),
       typeStr.c_str(),
       positionStr.c_str(),
       axisTitle.toString().c_str(),
       weight,
-      extraOptions.c_str());
+      extraOptions.c_str())
+      });
   }
-  return EMPTY_STRING;
 }
 
 bool ChartJS_options_scale::is_Y_axis() const
@@ -116,27 +126,16 @@ void ChartJS_options_scales::update_Yaxis_TickCount()
   }
 }
 
-String ChartJS_options_scales::toString() const
+void ChartJS_options_scales::toString(KeyValueWriter& parent) const
 {
-  if (_scales.empty()) { return EMPTY_STRING; }
+  if (_scales.empty()) { return; }
+  auto scales = parent.createChild(F("scales"));
 
-  String res   = F("\"scales\":{");
-  bool   first = true;
-
-  for (auto it = _scales.begin(); it != _scales.end(); ++it) {
-    const String scale_str = it->toString();
-
-    if (!scale_str.isEmpty()) {
-      if (!first) {
-        res += ',';
-      }
-      first = false;
-      res  += '\n';
-      res  += scale_str;
+  if (scales) {
+    for (auto it = _scales.begin(); it != _scales.end(); ++it) {
+      it->toString(*scales);
     }
   }
-  res += '}';
-  return res;
 }
 
 size_t ChartJS_options_scales::nr_Y_scales() const
diff --git a/src/src/WebServer/Chart_JS_scale.h b/src/src/WebServer/Chart_JS_scale.h
index e19c90ccb..45564711b 100644
--- a/src/src/WebServer/Chart_JS_scale.h
+++ b/src/src/WebServer/Chart_JS_scale.h
@@ -7,6 +7,7 @@
 #if FEATURE_CHART_JS
 
 # include "../DataStructs/PluginStats_Config.h"
+# include "../Helpers/KeyValueWriter.h"
 # include "../WebServer/Chart_JS_title.h"
 
 # include 
@@ -45,7 +46,7 @@ struct ChartJS_options_scale {
   int tickCount{};
   int weight{};
 
-  String toString() const;
+  void toString(KeyValueWriter& parent) const;
 
   bool   is_Y_axis() const;
 };
@@ -57,7 +58,7 @@ struct ChartJS_options_scales {
 
   void   update_Yaxis_TickCount();
 
-  String toString() const;
+  void toString(KeyValueWriter & parent) const;
 
   size_t nr_Y_scales() const;
 
diff --git a/src/src/WebServer/JSON.cpp b/src/src/WebServer/JSON.cpp
index b8df1b0ed..dc8d87581 100644
--- a/src/src/WebServer/JSON.cpp
+++ b/src/src/WebServer/JSON.cpp
@@ -353,11 +353,9 @@ void handle_json()
 #if FEATURE_ESPEASY_P2P
 
       if (showNodes) {
-        auto nodesWriter = mainLevelWriter.createChild(F("nodes"));
+        auto nodesWriter = mainLevelWriter.createChildArray(F("nodes"));
 
         if (nodesWriter) {
-          nodesWriter->setIsArray();
-
           for (auto it = Nodes.begin(); it != Nodes.end(); ++it)
           {
             if (it->second.ip[0] != 0)
@@ -430,14 +428,9 @@ void handle_json()
     {
       auto sensorsWriter = showSpecificTask
         ? mainLevelWriter.createNew()
-        : mainLevelWriter.createChild(F("Sensors"));
+        : mainLevelWriter.createChildArray(F("Sensors"));
 
       if (sensorsWriter) {
-
-        if (!showSpecificTask) {
-          sensorsWriter->setIsArray();
-        }
-
         for (taskIndex_t TaskIndex = firstTaskIndex; TaskIndex <= lastActiveTaskIndex && validTaskIndex(TaskIndex); TaskIndex++)
         {
           const deviceIndex_t DeviceIndex = getDeviceIndex_from_TaskIndex(TaskIndex);
@@ -469,11 +462,9 @@ void handle_json()
                     lowest_ttl_json = ttl_json;
                   }
                 }
-                auto taskValueWriter = taskWriter->createChild(F("TaskValues"));
+                auto taskValueWriter = taskWriter->createChildArray(F("TaskValues"));
 
                 if (taskValueWriter) {
-                  taskValueWriter->setIsArray();
-
                   struct EventStruct TempEvent(TaskIndex);
 
                   for (uint8_t x = 0; x < valueCount; x++)
@@ -582,11 +573,9 @@ void handle_json()
 
 
               if (showDataAcquisition) {
-                auto dataAquisitionWriter = taskWriter->createChild(F("DataAcquisition"));
+                auto dataAquisitionWriter = taskWriter->createChildArray(F("DataAcquisition"));
 
                 if (dataAquisitionWriter) {
-                  dataAquisitionWriter->setIsArray();
-
                   for (controllerIndex_t x = 0; x < CONTROLLER_MAX; x++)
                   {
                     auto controllerWriter = dataAquisitionWriter->createChild();
diff --git a/src/src/WebServer/KeyValueWriter_WebForm.cpp b/src/src/WebServer/KeyValueWriter_WebForm.cpp
index 0323906e8..7ba0674aa 100644
--- a/src/src/WebServer/KeyValueWriter_WebForm.cpp
+++ b/src/src/WebServer/KeyValueWriter_WebForm.cpp
@@ -148,6 +148,16 @@ Sp_KeyValueWriter KeyValueWriter_WebForm::createChild(const String& header)
   // return std::make_unique(header, this);
 }
 
+Sp_KeyValueWriter KeyValueWriter_WebForm::createChildArray(const String& header)
+{
+  auto child = createChild(header);
+
+  if (child) {
+    child->setIsArray();
+  }
+  return std::move(child);
+}
+
 Sp_KeyValueWriter KeyValueWriter_WebForm::createNew()
 {
   std::unique_ptr child(new (std::nothrow) KeyValueWriter_WebForm());
diff --git a/src/src/WebServer/KeyValueWriter_WebForm.h b/src/src/WebServer/KeyValueWriter_WebForm.h
index 0c6e5b65e..78fff21d3 100644
--- a/src/src/WebServer/KeyValueWriter_WebForm.h
+++ b/src/src/WebServer/KeyValueWriter_WebForm.h
@@ -41,6 +41,7 @@ public:
   // Create writer of the same derived type, with this set as parent
   virtual Sp_KeyValueWriter createChild();
   virtual Sp_KeyValueWriter createChild(const String& header);
+  virtual Sp_KeyValueWriter createChildArray(const String& header);
 
   // Create new writer of the same derived type, without parent
   virtual Sp_KeyValueWriter createNew();
diff --git a/src/src/WebServer/Log.cpp b/src/src/WebServer/Log.cpp
index b418ee7c7..cf9129703 100644
--- a/src/src/WebServer/Log.cpp
+++ b/src/src/WebServer/Log.cpp
@@ -63,11 +63,9 @@ void handle_log_JSON() {
 
         if (equals(webrequest, F("legend"))) {
 
-          auto legendWriter = mainWriter->createChild(F("Legend"));
+          auto legendWriter = mainWriter->createChildArray(F("Legend"));
 
           if (legendWriter) {
-            legendWriter->setIsArray();
-
             for (uint8_t i = LOG_LEVEL_ERROR; i < LOG_LEVEL_NRELEMENTS(); ++i) {
               auto loglevelWriter = legendWriter->createChild();
 
@@ -85,11 +83,9 @@ void handle_log_JSON() {
 
         bool logLinesAvailable = true;
         {
-          auto entriesWriter = mainWriter->createChild(F("Entries"));
+          auto entriesWriter = mainWriter->createChildArray(F("Entries"));
 
           if (entriesWriter) {
-            entriesWriter->setIsArray();
-
             uint32_t startTime = millis();
 
             while (logLinesAvailable && timePassedSince(startTime) < 200) {

From a7a8f4cd71baa15aefa5b84dd3f0c0c6264afd73 Mon Sep 17 00:00:00 2001
From: TD-er 
Date: Fri, 17 Oct 2025 13:19:02 +0200
Subject: [PATCH 384/564] [Cleanup] Rename Sp_KeyValueWriter to
 Up_KeyValueWriter

---
 src/src/Helpers/KeyValueWriter.h             | 12 ++++++------
 src/src/Helpers/KeyValueWriter_JSON.cpp      | 10 +++++-----
 src/src/Helpers/KeyValueWriter_JSON.h        | 10 +++++-----
 src/src/WebServer/Chart_JS.cpp               |  6 +++---
 src/src/WebServer/Chart_JS.h                 |  6 +++---
 src/src/WebServer/KeyValueWriter_WebForm.cpp | 10 +++++-----
 src/src/WebServer/KeyValueWriter_WebForm.h   | 10 +++++-----
 7 files changed, 32 insertions(+), 32 deletions(-)

diff --git a/src/src/Helpers/KeyValueWriter.h b/src/src/Helpers/KeyValueWriter.h
index 0afed0b12..391b6af40 100644
--- a/src/src/Helpers/KeyValueWriter.h
+++ b/src/src/Helpers/KeyValueWriter.h
@@ -10,7 +10,7 @@
 
 
 class KeyValueWriter;
-typedef std::unique_ptr Sp_KeyValueWriter;
+typedef std::unique_ptr Up_KeyValueWriter;
 
 // ********************************************************************************
 // KeyValueWriter
@@ -83,13 +83,13 @@ public:
   virtual void              setOutputToString(PrintToString*printToStr) { _toString = printToStr; }
 
   // Create writer of the same derived type, with this set as parent
-  virtual Sp_KeyValueWriter createChild()                     = 0;
-  virtual Sp_KeyValueWriter createChild(const String& header) = 0;
-  virtual Sp_KeyValueWriter createChildArray(const String& header) = 0;
+  virtual Up_KeyValueWriter createChild()                     = 0;
+  virtual Up_KeyValueWriter createChild(const String& header) = 0;
+  virtual Up_KeyValueWriter createChildArray(const String& header) = 0;
 
   // Create new writer of the same derived type, without parent
-  virtual Sp_KeyValueWriter createNew()                     = 0;
-  virtual Sp_KeyValueWriter createNew(const String& header) = 0;
+  virtual Up_KeyValueWriter createNew()                     = 0;
+  virtual Up_KeyValueWriter createNew(const String& header) = 0;
 
   const String&             get() const {
     if (_toString == nullptr) { return EMPTY_STRING; }
diff --git a/src/src/Helpers/KeyValueWriter_JSON.cpp b/src/src/Helpers/KeyValueWriter_JSON.cpp
index 2bfd558f4..2cb86cc30 100644
--- a/src/src/Helpers/KeyValueWriter_JSON.cpp
+++ b/src/src/Helpers/KeyValueWriter_JSON.cpp
@@ -176,7 +176,7 @@ void KeyValueWriter_JSON::writeValue(const ValueStruct*val)
   pr.print(to_json_value(str));
 }
 
-Sp_KeyValueWriter KeyValueWriter_JSON::createChild()
+Up_KeyValueWriter KeyValueWriter_JSON::createChild()
 {
   std::unique_ptr child(new (std::nothrow) KeyValueWriter_JSON(this, _toString));
 
@@ -187,7 +187,7 @@ Sp_KeyValueWriter KeyValueWriter_JSON::createChild()
   // return std::make_unique(this, _toString);
 }
 
-Sp_KeyValueWriter KeyValueWriter_JSON::createChild(const String& header)
+Up_KeyValueWriter KeyValueWriter_JSON::createChild(const String& header)
 {
   std::unique_ptr child(new (std::nothrow) KeyValueWriter_JSON(header, this, _toString));
 
@@ -198,7 +198,7 @@ Sp_KeyValueWriter KeyValueWriter_JSON::createChild(const String& header)
   // return std::make_unique(header, this, _toString);
 }
 
-Sp_KeyValueWriter KeyValueWriter_JSON::createChildArray(const String& header)
+Up_KeyValueWriter KeyValueWriter_JSON::createChildArray(const String& header)
 {
   auto child = createChild(header);
 
@@ -208,7 +208,7 @@ Sp_KeyValueWriter KeyValueWriter_JSON::createChildArray(const String& header)
   return std::move(child);
 }
 
-Sp_KeyValueWriter KeyValueWriter_JSON::createNew()
+Up_KeyValueWriter KeyValueWriter_JSON::createNew()
 {
   std::unique_ptr child(new (std::nothrow) KeyValueWriter_JSON(false, _toString));
 
@@ -219,7 +219,7 @@ Sp_KeyValueWriter KeyValueWriter_JSON::createNew()
   // return std::make_unique(false, _toString);
 }
 
-Sp_KeyValueWriter KeyValueWriter_JSON::createNew(const String& header)
+Up_KeyValueWriter KeyValueWriter_JSON::createNew(const String& header)
 {
   std::unique_ptr child(new (std::nothrow) KeyValueWriter_JSON(header, _toString));
 
diff --git a/src/src/Helpers/KeyValueWriter_JSON.h b/src/src/Helpers/KeyValueWriter_JSON.h
index c50c9ace0..f8ebc38a6 100644
--- a/src/src/Helpers/KeyValueWriter_JSON.h
+++ b/src/src/Helpers/KeyValueWriter_JSON.h
@@ -47,13 +47,13 @@ public:
   virtual void              write(const KeyValueStruct& kv);
 
   // Create writer of the same derived type, with this set as parent
-  virtual Sp_KeyValueWriter createChild();
-  virtual Sp_KeyValueWriter createChild(const String& header);
-  virtual Sp_KeyValueWriter createChildArray(const String& header);
+  virtual Up_KeyValueWriter createChild();
+  virtual Up_KeyValueWriter createChild(const String& header);
+  virtual Up_KeyValueWriter createChildArray(const String& header);
 
   // Create new writer of the same derived type, without parent
-  virtual Sp_KeyValueWriter createNew();
-  virtual Sp_KeyValueWriter createNew(const String& header);
+  virtual Up_KeyValueWriter createNew();
+  virtual Up_KeyValueWriter createNew(const String& header);
 
   virtual bool              dataOnlyOutput() const override {
     // JSON is not intended to be human readable
diff --git a/src/src/WebServer/Chart_JS.cpp b/src/src/WebServer/Chart_JS.cpp
index af090f068..1b7c4d9ed 100644
--- a/src/src/WebServer/Chart_JS.cpp
+++ b/src/src/WebServer/Chart_JS.cpp
@@ -37,7 +37,7 @@ void add_ChartJS_array(KeyValueWriter& parent,
   }
 }
 
-Sp_KeyValueWriter add_ChartJS_chart_header(
+Up_KeyValueWriter add_ChartJS_chart_header(
   const __FlashStringHelper *chartType,
   const __FlashStringHelper *id,
   const ChartJS_title      & chartTitle,
@@ -60,7 +60,7 @@ Sp_KeyValueWriter add_ChartJS_chart_header(
     onlyJSON);
 }
 
-Sp_KeyValueWriter add_ChartJS_chart_header(
+Up_KeyValueWriter add_ChartJS_chart_header(
   const __FlashStringHelper *chartType,
   const String             & id,
   const ChartJS_title      & chartTitle,
@@ -221,7 +221,7 @@ void add_ChartJS_dataset(
   }
 }
 
-Sp_KeyValueWriter add_ChartJS_dataset_header(KeyValueWriter& dataset, const ChartJS_dataset_config& config)
+Up_KeyValueWriter add_ChartJS_dataset_header(KeyValueWriter& dataset, const ChartJS_dataset_config& config)
 {
   if (!config.label.isEmpty()) {
     dataset.write({ F("label"), config.label });
diff --git a/src/src/WebServer/Chart_JS.h b/src/src/WebServer/Chart_JS.h
index 3373ea132..e28df9890 100644
--- a/src/src/WebServer/Chart_JS.h
+++ b/src/src/WebServer/Chart_JS.h
@@ -49,7 +49,7 @@
 # include "../WebServer/Chart_JS_scale.h"
 # include "../DataStructs/ChartJS_dataset_config.h"
 
-Sp_KeyValueWriter add_ChartJS_chart_header(
+Up_KeyValueWriter add_ChartJS_chart_header(
   const __FlashStringHelper *chartType,
   const __FlashStringHelper *id,
   const ChartJS_title      & chartTitle,
@@ -60,7 +60,7 @@ Sp_KeyValueWriter add_ChartJS_chart_header(
   size_t                     nrSamples  = 0,
   bool                       onlyJSON   = false);
 
-Sp_KeyValueWriter add_ChartJS_chart_header(
+Up_KeyValueWriter add_ChartJS_chart_header(
   const __FlashStringHelper *chartType,
   const String             & id,
   const ChartJS_title      & chartTitle,
@@ -106,7 +106,7 @@ void add_ChartJS_dataset(
   const String                & options    = EMPTY_STRING);
 
 
-Sp_KeyValueWriter add_ChartJS_dataset_header(
+Up_KeyValueWriter add_ChartJS_dataset_header(
   KeyValueWriter              & dataset,
                                 const ChartJS_dataset_config& config);
 
diff --git a/src/src/WebServer/KeyValueWriter_WebForm.cpp b/src/src/WebServer/KeyValueWriter_WebForm.cpp
index 7ba0674aa..3ed12bdef 100644
--- a/src/src/WebServer/KeyValueWriter_WebForm.cpp
+++ b/src/src/WebServer/KeyValueWriter_WebForm.cpp
@@ -130,7 +130,7 @@ void KeyValueWriter_WebForm::write(const KeyValueStruct& kv)
   }
 }
 
-Sp_KeyValueWriter KeyValueWriter_WebForm::createChild()
+Up_KeyValueWriter KeyValueWriter_WebForm::createChild()
 {
   std::unique_ptr child(new (std::nothrow) KeyValueWriter_WebForm(this));
 
@@ -139,7 +139,7 @@ Sp_KeyValueWriter KeyValueWriter_WebForm::createChild()
   // return std::make_unique(this);
 }
 
-Sp_KeyValueWriter KeyValueWriter_WebForm::createChild(const String& header)
+Up_KeyValueWriter KeyValueWriter_WebForm::createChild(const String& header)
 {
   std::unique_ptr child(new (std::nothrow) KeyValueWriter_WebForm(header, this));
 
@@ -148,7 +148,7 @@ Sp_KeyValueWriter KeyValueWriter_WebForm::createChild(const String& header)
   // return std::make_unique(header, this);
 }
 
-Sp_KeyValueWriter KeyValueWriter_WebForm::createChildArray(const String& header)
+Up_KeyValueWriter KeyValueWriter_WebForm::createChildArray(const String& header)
 {
   auto child = createChild(header);
 
@@ -158,7 +158,7 @@ Sp_KeyValueWriter KeyValueWriter_WebForm::createChildArray(const String& header)
   return std::move(child);
 }
 
-Sp_KeyValueWriter KeyValueWriter_WebForm::createNew()
+Up_KeyValueWriter KeyValueWriter_WebForm::createNew()
 {
   std::unique_ptr child(new (std::nothrow) KeyValueWriter_WebForm());
 
@@ -167,7 +167,7 @@ Sp_KeyValueWriter KeyValueWriter_WebForm::createNew()
   // return std::make_unique();
 }
 
-Sp_KeyValueWriter KeyValueWriter_WebForm::createNew(const String& header)
+Up_KeyValueWriter KeyValueWriter_WebForm::createNew(const String& header)
 {
   std::unique_ptr child(new (std::nothrow) KeyValueWriter_WebForm(header));
 
diff --git a/src/src/WebServer/KeyValueWriter_WebForm.h b/src/src/WebServer/KeyValueWriter_WebForm.h
index 78fff21d3..6ff77404a 100644
--- a/src/src/WebServer/KeyValueWriter_WebForm.h
+++ b/src/src/WebServer/KeyValueWriter_WebForm.h
@@ -39,13 +39,13 @@ public:
   virtual void              write(const KeyValueStruct& kv);
 
   // Create writer of the same derived type, with this set as parent
-  virtual Sp_KeyValueWriter createChild();
-  virtual Sp_KeyValueWriter createChild(const String& header);
-  virtual Sp_KeyValueWriter createChildArray(const String& header);
+  virtual Up_KeyValueWriter createChild();
+  virtual Up_KeyValueWriter createChild(const String& header);
+  virtual Up_KeyValueWriter createChildArray(const String& header);
 
   // Create new writer of the same derived type, without parent
-  virtual Sp_KeyValueWriter createNew();
-  virtual Sp_KeyValueWriter createNew(const String& header);
+  virtual Up_KeyValueWriter createNew();
+  virtual Up_KeyValueWriter createNew(const String& header);
 
 
 }; // class KeyValueWriter_WebForm

From 1cd5657daac7e7fe1c24e19b8264ce8da14692b3 Mon Sep 17 00:00:00 2001
From: TD-er 
Date: Fri, 17 Oct 2025 13:20:11 +0200
Subject: [PATCH 385/564] [ChartJS] Cleanup forcing "null" on NaN values in
 JSON

---
 src/src/DataStructs/PluginStats.cpp        | 8 +-------
 src/src/Helpers/KeyValueWriter_JSON.cpp    | 8 ++++----
 src/src/PluginStructs/P002_data_struct.cpp | 6 +-----
 src/src/WebServer/Chart_JS.cpp             | 2 --
 src/src/WebServer/HTML_wrappers.cpp        | 5 ++++-
 src/src/WebServer/HTML_wrappers.h          | 4 ++--
 6 files changed, 12 insertions(+), 21 deletions(-)

diff --git a/src/src/DataStructs/PluginStats.cpp b/src/src/DataStructs/PluginStats.cpp
index a8380136e..5f169860f 100644
--- a/src/src/DataStructs/PluginStats.cpp
+++ b/src/src/DataStructs/PluginStats.cpp
@@ -598,13 +598,7 @@ void PluginStats::plot_ChartJS_dataset(KeyValueWriter& dataset) const
     for (; i < nrSamples; ++i) {
       const float value = (*_samples)[i];
 
-      if (isnanf(value)) { 
-        data->write({ EMPTY_STRING, F("null") }); 
-      } else {
-        data->write({ EMPTY_STRING, value, _nrDecimals });
-      }
-
-      //     addHtmlFloat_NaN_toNull((*_samples)[i], _nrDecimals);
+      data->write({ EMPTY_STRING, value, _nrDecimals });
     }
   }
 }
diff --git a/src/src/Helpers/KeyValueWriter_JSON.cpp b/src/src/Helpers/KeyValueWriter_JSON.cpp
index 2cb86cc30..5366ea344 100644
--- a/src/src/Helpers/KeyValueWriter_JSON.cpp
+++ b/src/src/Helpers/KeyValueWriter_JSON.cpp
@@ -144,17 +144,17 @@ void KeyValueWriter_JSON::writeValue(const ValueStruct*val)
   auto& pr = getPrint();
 
   ValueStruct::ValueType valueType = val->getValueType();
-  String str                       = val->toString();
+  ValueStruct::ValueType valueType_afterPrint;
+  String str                       = val->toString(valueType_afterPrint);
 
   switch (valueType)
   {
     case ValueStruct::ValueType::Float:
     case ValueStruct::ValueType::Double:
 
-      // TODO TD-er: Should we use addHtmlFloat_NaN_toNull here?
-      if (!_allowFormatOverrides && str.equalsIgnoreCase(F("nan"))) {
+      if (!_allowFormatOverrides && valueType_afterPrint != valueType) {
         pr.print(F("null"));
-        break;
+        return;
       }
 
     case ValueStruct::ValueType::Int:
diff --git a/src/src/PluginStructs/P002_data_struct.cpp b/src/src/PluginStructs/P002_data_struct.cpp
index 43a76cf68..2e403de7e 100644
--- a/src/src/PluginStructs/P002_data_struct.cpp
+++ b/src/src/PluginStructs/P002_data_struct.cpp
@@ -718,11 +718,7 @@ void P002_data_struct::webformLoad_multipointCurve(struct EventStruct *event) co
                   for (size_t i = 0; i < _multipoint.size(); ++i) {
                     const float value = _multipoint[i]._value;
 
-                    if (isnanf(value)) {
-                      data->write({ EMPTY_STRING, F("null") });
-                    } else {
-                      data->write({ EMPTY_STRING, value, _nrDecimals });
-                    }
+                    data->write({ EMPTY_STRING, value, _nrDecimals });
                   }
                 }
               }
diff --git a/src/src/WebServer/Chart_JS.cpp b/src/src/WebServer/Chart_JS.cpp
index 1b7c4d9ed..5e595997b 100644
--- a/src/src/WebServer/Chart_JS.cpp
+++ b/src/src/WebServer/Chart_JS.cpp
@@ -23,8 +23,6 @@ void add_ChartJS_array(KeyValueWriter& parent,
 {
   for (int i = 0; i < valueCount; ++i) {
     parent.write({ EMPTY_STRING, array[i], nrDecimals });
-
-    //    addHtmlFloat_NaN_toNull(array[i], nrDecimals);
   }
 }
 
diff --git a/src/src/WebServer/HTML_wrappers.cpp b/src/src/WebServer/HTML_wrappers.cpp
index 0b17941e0..0aaf75ee1 100644
--- a/src/src/WebServer/HTML_wrappers.cpp
+++ b/src/src/WebServer/HTML_wrappers.cpp
@@ -447,6 +447,7 @@ void addHtmlFloat(const float& value, unsigned int nrDecimals) {
   addHtml(toString(value, nrDecimals));
 }
 
+/*
 void addHtmlFloat_NaN_toNull(const float& value, unsigned int nrDecimals) {
   String res;
   if (toValidString(res, value, nrDecimals)) {
@@ -455,13 +456,14 @@ void addHtmlFloat_NaN_toNull(const float& value, unsigned int nrDecimals) {
     addHtml(F("null"));
   }
 }
-
+*/
 
 #if FEATURE_USE_DOUBLE_AS_ESPEASY_RULES_FLOAT_TYPE
 void addHtmlFloat(const double& value, unsigned int nrDecimals) {
   addHtml(doubleToString(value, nrDecimals));
 }
 
+/*
 void addHtmlFloat_NaN_toNull(const double& value, unsigned int nrDecimals) {
   String res;
   if (doubleToValidString(res, value, nrDecimals)) {
@@ -470,6 +472,7 @@ void addHtmlFloat_NaN_toNull(const double& value, unsigned int nrDecimals) {
     addHtml(F("null"));
   }
 }
+*/
 
 #endif
 
diff --git a/src/src/WebServer/HTML_wrappers.h b/src/src/WebServer/HTML_wrappers.h
index 741eba655..4397d9d35 100644
--- a/src/src/WebServer/HTML_wrappers.h
+++ b/src/src/WebServer/HTML_wrappers.h
@@ -141,10 +141,10 @@ void addHtmlInt(uint32_t int_val);
 void addHtmlInt(int64_t int_val);
 void addHtmlInt(uint64_t int_val);
 void addHtmlFloat(const float& value, unsigned int nrDecimals = 2u);
-void addHtmlFloat_NaN_toNull(const float& value, unsigned int nrDecimals = 2u);
+//void addHtmlFloat_NaN_toNull(const float& value, unsigned int nrDecimals = 2u);
 #if FEATURE_USE_DOUBLE_AS_ESPEASY_RULES_FLOAT_TYPE
 void addHtmlFloat(const double& value, unsigned int nrDecimals = 2u);
-void addHtmlFloat_NaN_toNull(const double& value, unsigned int nrDecimals = 2u);
+//void addHtmlFloat_NaN_toNull(const double& value, unsigned int nrDecimals = 2u);
 #endif
 
 void addEncodedHtml(const __FlashStringHelper * html);

From 7451a6533337f2c6fafdc9b8988a1cd62f4b6f10 Mon Sep 17 00:00:00 2001
From: TD-er 
Date: Fri, 17 Oct 2025 18:24:16 +0200
Subject: [PATCH 386/564] [Cleanup] Simplify use of LabelType

---
 src/src/DataStructs/KeyValueStruct.cpp       |   16 +-
 src/src/DataStructs/KeyValueStruct.h         |    9 +-
 src/src/Helpers/KeyValueWriter.cpp           |    6 +-
 src/src/Helpers/KeyValueWriter.h             |    2 +-
 src/src/Helpers/StringProvider.cpp           | 1668 +++++++++++-------
 src/src/Helpers/StringProvider.h             |   18 +-
 src/src/Helpers/ValueStruct_Factory.cpp      |   10 -
 src/src/Helpers/ValueStruct_Factory.h        |    3 -
 src/src/WebServer/JSON.cpp                   |   11 +-
 src/src/WebServer/KeyValueWriter_WebForm.cpp |    2 +-
 src/src/WebServer/Markup.cpp                 |   14 +-
 src/src/WebServer/RootPage.cpp               |  170 +-
 src/src/WebServer/SysInfoPage.cpp            |   11 +-
 13 files changed, 1141 insertions(+), 799 deletions(-)

diff --git a/src/src/DataStructs/KeyValueStruct.cpp b/src/src/DataStructs/KeyValueStruct.cpp
index 5478abef9..a7affa566 100644
--- a/src/src/DataStructs/KeyValueStruct.cpp
+++ b/src/src/DataStructs/KeyValueStruct.cpp
@@ -1,5 +1,6 @@
 #include "../DataStructs/KeyValueStruct.h"
 
+#include "../Helpers/StringConverter.h"
 #include "../Helpers/StringConverter_Numerical.h"
 
 
@@ -130,15 +131,14 @@ KeyValueStruct::KeyValueStruct(const String         & key,
   _values.emplace_back(ValueStruct_Factory::create(std::move(val)));
 }
 
-KeyValueStruct::KeyValueStruct(LabelType::Enum label, Format format)
-  : _key(getLabel(label)), _unit(getFormUnit(label)), _format(format) {
-  _values.emplace_back(ValueStruct_Factory::create(label));
-}
-
 void KeyValueStruct::setUnit(const String& unit)              { _unit = unit; }
 
 void KeyValueStruct::setUnit(const __FlashStringHelper *unit) { _unit = unit; }
 
+void KeyValueStruct::setID(const String& id) { __id = id; }
+void KeyValueStruct::setID(const __FlashStringHelper *id) { __id = id; }
+
+
 void KeyValueStruct::appendValue(Up_ValueStruct value)
 {
   _values.emplace_back(std::move(value));
@@ -156,3 +156,9 @@ void KeyValueStruct::appendValue(String&& value)
   _values.emplace_back(ValueStruct_Factory::create(std::move(value)));
   _isArray = true;
 }
+
+String KeyValueStruct::getID() const
+{
+  if (__id.isEmpty()) return to_internal_string(_key, '_');
+  return __id;
+}
\ No newline at end of file
diff --git a/src/src/DataStructs/KeyValueStruct.h b/src/src/DataStructs/KeyValueStruct.h
index 57f584be9..486f3aec0 100644
--- a/src/src/DataStructs/KeyValueStruct.h
+++ b/src/src/DataStructs/KeyValueStruct.h
@@ -109,19 +109,22 @@ struct KeyValueStruct
       _values.emplace_back(String(val), vType);
      }
    */
-  KeyValueStruct(LabelType::Enum label,
-                 Format          format = Format::Default);
 
   void setUnit(const String& unit);
   void setUnit(const __FlashStringHelper *unit);
 
+  void setID(const String& id);
+  void setID(const __FlashStringHelper *id);
+
   void appendValue(Up_ValueStruct value);
   void appendValue(const String& value);
   void appendValue(String&& value);
 
+  String getID() const;
+
 
   String _key;
-  String _id;
+  String __id;
   String _unit;
 
   std::vector_values;
diff --git a/src/src/Helpers/KeyValueWriter.cpp b/src/src/Helpers/KeyValueWriter.cpp
index ce00943eb..292cbc40d 100644
--- a/src/src/Helpers/KeyValueWriter.cpp
+++ b/src/src/Helpers/KeyValueWriter.cpp
@@ -15,13 +15,15 @@ void KeyValueWriter::clear() {
   }
 }
 
-void KeyValueWriter::writeLabels(const LabelType::Enum labels[])
+void KeyValueWriter::writeLabels(const LabelType::Enum labels[], bool extendedValues)
 {
   size_t i            = 0;
   LabelType::Enum cur = static_cast(pgm_read_byte(labels + i));
 
   while (cur != LabelType::MAX_LABEL) {
-    write(cur);
+    auto kv = getKeyValue(cur, extendedValues);
+    if (!kv._key.isEmpty())
+      write(kv);
     cur = static_cast(pgm_read_byte(labels + i + 1));
     ++i;
   }
diff --git a/src/src/Helpers/KeyValueWriter.h b/src/src/Helpers/KeyValueWriter.h
index 391b6af40..b3dcc25af 100644
--- a/src/src/Helpers/KeyValueWriter.h
+++ b/src/src/Helpers/KeyValueWriter.h
@@ -53,7 +53,7 @@ public:
 
   virtual void write(const KeyValueStruct& kv) = 0;
 
-  void         writeLabels(const LabelType::Enum labels[]);
+  void         writeLabels(const LabelType::Enum labels[], bool extendedValues = false);
 
   virtual void writeNote(const String& note);
   virtual void writeNote(const __FlashStringHelper *note);
diff --git a/src/src/Helpers/StringProvider.cpp b/src/src/Helpers/StringProvider.cpp
index 68d366692..e01d6ad30 100644
--- a/src/src/Helpers/StringProvider.cpp
+++ b/src/src/Helpers/StringProvider.cpp
@@ -13,7 +13,7 @@
 #include "../../ESPEasy/net/wifi/ESPEasyWifi.h"
 
 #if FEATURE_ETHERNET
-#include "../../ESPEasy/net/eth/ESPEasyEth.h"
+# include "../../ESPEasy/net/eth/ESPEasyEth.h"
 #endif
 
 #include "../Globals/Device.h"
@@ -23,6 +23,7 @@
 #include "../../ESPEasy/net/Globals/ESPEasyWiFiEvent.h"
 
 #include "../../ESPEasy/net/Globals/NetworkState.h"
+#include "../Globals/RTC.h"
 #include "../Globals/SecuritySettings.h"
 #include "../Globals/Settings.h"
 #include "../../ESPEasy/net/Globals/WiFi_AP_Candidates.h"
@@ -43,616 +44,1105 @@
 #include "../WebServer/AccessControl.h"
 
 #ifdef ESP32
-#include 
+# include 
 #endif
 
-String getInternalLabel(LabelType::Enum label, char replaceSpace) {
-  return to_internal_string(getLabel(label), replaceSpace);
-}
-
-const __FlashStringHelper * getLabel(LabelType::Enum label) {
+KeyValueStruct getKeyValue(LabelType::Enum label, bool extendedValue)
+{
   switch (label)
   {
-    case LabelType::UNIT_NR:                return F("Unit Number");
+    case LabelType::UNIT_NR:
+    {
+      KeyValueStruct kv(F("Unit Number"), Settings.Unit);
+      return kv;
+    }
     #if FEATURE_ZEROFILLED_UNITNUMBER
-    case LabelType::UNIT_NR_0:              return F("Unit Number 0-filled");
-    #endif // FEATURE_ZEROFILLED_UNITNUMBER
-    case LabelType::UNIT_NAME:              return F("Unit Name");
-    case LabelType::HOST_NAME:              return F("Hostname");
-
-    case LabelType::LOCAL_TIME:             return F("Local Time");
-    case LabelType::TIME_SOURCE:            return F("Time Source");
-    case LabelType::TIME_WANDER:            return F("Time Wander");
-    #if FEATURE_EXT_RTC
-    case LabelType::EXT_RTC_UTC_TIME:       return F("UTC time stored in RTC chip");
-    #endif
-    case LabelType::UPTIME:                 return F("Uptime");
-    case LabelType::LOAD_PCT:               return F("Load");
-    case LabelType::LOOP_COUNT:             return F("Load LC");
-    case LabelType::CPU_ECO_MODE:           return F("CPU Eco Mode");
-#if FEATURE_SET_WIFI_TX_PWR
-    case LabelType::WIFI_TX_MAX_PWR:        return F("Max WiFi TX Power");
-    case LabelType::WIFI_CUR_TX_PWR:        return F("Current WiFi TX Power");
-    case LabelType::WIFI_SENS_MARGIN:       return F("WiFi Sensitivity Margin");
-    case LabelType::WIFI_SEND_AT_MAX_TX_PWR:return F("Send With Max TX Power");
-#endif
-    case LabelType::WIFI_NR_EXTRA_SCANS:    return F("Extra WiFi scan loops");
-    case LabelType::WIFI_USE_LAST_CONN_FROM_RTC: return F("Use Last Connected AP from RTC");
-
-    case LabelType::FREE_MEM:               return F("Free RAM");
-    case LabelType::FREE_STACK:             return F("Free Stack");
-#ifdef USE_SECOND_HEAP
-    case LabelType::FREE_HEAP_IRAM:         return F("Free 2nd Heap");
-#endif
-
-#if defined(CORE_POST_2_5_0) || defined(ESP32)
-  #ifndef LIMIT_BUILD_SIZE
-    case LabelType::HEAP_MAX_FREE_BLOCK:    return F("Heap Max Free Block");
-  #endif
-#endif // if defined(CORE_POST_2_5_0) || defined(ESP32)
-#if defined(CORE_POST_2_5_0)
-  #ifndef LIMIT_BUILD_SIZE
-    case LabelType::HEAP_FRAGMENTATION:     return F("Heap Fragmentation");
-  #endif
-#endif // if defined(CORE_POST_2_5_0)
-
-#ifdef ESP32
-    case LabelType::HEAP_SIZE:              return F("Heap Size");
-    case LabelType::HEAP_MIN_FREE:          return F("Heap Min Free");
-    #ifdef BOARD_HAS_PSRAM
-    case LabelType::PSRAM_SIZE:             return F("PSRAM Size");
-    case LabelType::PSRAM_FREE:             return F("PSRAM Free");
-    case LabelType::PSRAM_MIN_FREE:         return F("PSRAM Min Free");
-    case LabelType::PSRAM_MAX_FREE_BLOCK:   return F("PSRAM Max Free Block");
-    #endif // BOARD_HAS_PSRAM
-#endif // ifdef ESP32
-
-    case LabelType::JSON_BOOL_QUOTES:           return F("JSON bool output without quotes");
-#if FEATURE_TIMING_STATS
-    case LabelType::ENABLE_TIMING_STATISTICS:   return F("Collect Timing Statistics");
-#endif
-    case LabelType::ENABLE_RULES_CACHING:       return F("Enable Rules Cache");
-    case LabelType::ENABLE_SERIAL_PORT_CONSOLE: return F("Enable Serial Port Console");
-    case LabelType::CONSOLE_SERIAL_PORT:        return F("Console Serial Port");
-#if USES_ESPEASY_CONSOLE_FALLBACK_PORT
-    case LabelType::CONSOLE_FALLBACK_TO_SERIAL0: return F("Fallback to Serial 0");
-    case LabelType::CONSOLE_FALLBACK_PORT:       return F("Console Fallback Port");
-#endif
-
-//    case LabelType::ENABLE_RULES_EVENT_REORDER: return F("Optimize Rules Cache Event Order"); // TD-er: Disabled for now
-    case LabelType::TASKVALUESET_ALL_PLUGINS:   return F("Allow TaskValueSet on all plugins");
-    case LabelType::ALLOW_OTA_UNLIMITED:        return F("Allow OTA without size-check");
-#if FEATURE_CLEAR_I2C_STUCK
-    case LabelType::ENABLE_CLEAR_HUNG_I2C_BUS:  return F("Try clear I2C bus when stuck");
-#endif
-    #if FEATURE_I2C_DEVICE_CHECK
-    case LabelType::ENABLE_I2C_DEVICE_CHECK:    return F("Check I2C devices when enabled");
-    #endif // if FEATURE_I2C_DEVICE_CHECK
-#ifndef BUILD_NO_RAM_TRACKER
-    case LabelType::ENABLE_RAM_TRACKING:    return F("Enable RAM Tracker");
-#endif
-#if FEATURE_AUTO_DARK_MODE
-    case LabelType::ENABLE_AUTO_DARK_MODE:  return F("Web light/dark mode");
-#endif // FEATURE_AUTO_DARK_MODE
-#if FEATURE_RULES_EASY_COLOR_CODE
-    case LabelType::DISABLE_RULES_AUTOCOMPLETE:  return F("Disable Rules auto-completion");
-#endif // if FEATURE_RULES_EASY_COLOR_CODE
-#if FEATURE_TARSTREAM_SUPPORT
-    case LabelType::DISABLE_SAVE_CONFIG_AS_TAR:  return F("Disable Save Config as .tar");
-#endif // if FEATURE_TARSTREAM_SUPPORT
-#if FEATURE_TASKVALUE_UNIT_OF_MEASURE
-    case LabelType::SHOW_UOM_ON_DEVICES_PAGE: return F("Show Unit of Measure");
-    #endif // if FEATURE_TASKVALUE_UNIT_OF_MEASURE
-    #if FEATURE_MQTT_CONNECT_BACKGROUND
-    case LabelType::MQTT_CONNECT_IN_BACKGROUND: return F("MQTT Connect in background");
-    #endif // if FEATURE_MQTT_CONNECT_BACKGROUND
-
-#if CONFIG_SOC_WIFI_SUPPORT_5G
-    case LabelType::WIFI_BAND_MODE: return F("WiFi Band Mode");
-#endif
-
-    case LabelType::BOOT_TYPE:              return F("Last Boot Cause");
-    case LabelType::BOOT_COUNT:             return F("Boot Count");
-    case LabelType::DEEP_SLEEP_ALTERNATIVE_CALL: return F("Deep Sleep Alternative");
-    case LabelType::RESET_REASON:           return F("Reset Reason");
-    case LabelType::LAST_TASK_BEFORE_REBOOT: return F("Last Action before Reboot");
-    case LabelType::SW_WD_COUNT:            return F("SW WD count");
-
-
-    case LabelType::WIFI_CONNECTION:        return F("WiFi Connection");
-    case LabelType::WIFI_RSSI:              return F("RSSI");
-    case LabelType::IP_CONFIG:              return F("IP Config");
-#if FEATURE_USE_IPV6
-    case LabelType::IP6_LOCAL:              return F("IPv6 link local");
-    case LabelType::IP6_GLOBAL:             return F("IPv6 global");
-//    case LabelType::IP6_ALL_ADDRESSES:      return F("IPv6 all addresses");
-#endif
-    case LabelType::IP_CONFIG_STATIC:       return F("Static");
-    case LabelType::IP_CONFIG_DYNAMIC:      return F("DHCP");
-    case LabelType::IP_ADDRESS:             return F("IP Address");
-    case LabelType::IP_SUBNET:              return F("IP Subnet");
-    case LabelType::IP_ADDRESS_SUBNET:      return F("IP / Subnet");
-    case LabelType::GATEWAY:                return F("Gateway");
-    case LabelType::CLIENT_IP:              return F("Client IP");
-    #if FEATURE_MDNS
-    case LabelType::M_DNS:                  return F("mDNS");
-    #endif // if FEATURE_MDNS
-    case LabelType::DNS:                    return F("DNS");
-    case LabelType::DNS_1:                  return F("DNS 1");
-    case LabelType::DNS_2:                  return F("DNS 2");
-    case LabelType::ALLOWED_IP_RANGE:       return F("Allowed IP Range");
-    case LabelType::STA_MAC:                return F("STA MAC");
-    case LabelType::AP_MAC:                 return F("AP MAC");
-    case LabelType::SSID:                   return F("SSID");
-    case LabelType::BSSID:                  return F("BSSID");
-    case LabelType::CHANNEL:                return F("Channel");
-    case LabelType::ENCRYPTION_TYPE_STA:    return F("Encryption Type");
-    case LabelType::CONNECTED:              return F("Connected");
-    case LabelType::CONNECTED_MSEC:         return F("Connected msec");
-    case LabelType::LAST_DISCONNECT_REASON: return F("Last Disconnect Reason");
-    case LabelType::LAST_DISC_REASON_STR:   return F("Last Disconnect Reason str");
-    case LabelType::NUMBER_RECONNECTS:      return F("Number Reconnects");
-    case LabelType::WIFI_STORED_SSID1:      return F("Configured SSID1");
-    case LabelType::WIFI_STORED_SSID2:      return F("Configured SSID2");
-
-
-    case LabelType::FORCE_WIFI_BG:          return F("Force WiFi B/G");
-    case LabelType::RESTART_WIFI_LOST_CONN: return F("Restart WiFi Lost Conn");
-    case LabelType::FORCE_WIFI_NOSLEEP:     return F("Force WiFi No Sleep");
-    case LabelType::PERIODICAL_GRAT_ARP:    return F("Periodical send Gratuitous ARP");
-    case LabelType::CONNECTION_FAIL_THRESH: return F("Connection Failure Threshold");
-#ifndef ESP32
-    case LabelType::WAIT_WIFI_CONNECT:      return F("Extra Wait WiFi Connect");
-#endif
-    case LabelType::CONNECT_HIDDEN_SSID:    return F("Include Hidden SSID");
-#ifdef ESP32
-    case LabelType::WIFI_PASSIVE_SCAN:      return F("Passive WiFi Scan");
-#endif
-    case LabelType::HIDDEN_SSID_SLOW_CONNECT: return F("Hidden SSID Slow Connect");
-    case LabelType::SDK_WIFI_AUTORECONNECT: return F("Enable SDK WiFi Auto Reconnect");
-#if FEATURE_USE_IPV6
-    case LabelType::ENABLE_IPV6:            return F("Enable IPv6");
-#endif
-
-
-    case LabelType::BUILD_DESC:             return F("Build");
-    case LabelType::GIT_BUILD:              return F("Git Build");
-    case LabelType::SYSTEM_LIBRARIES:       return F("System Libraries");
-#ifdef ESP32
-    case LabelType::ESP_IDF_SDK_VERSION:    return F("ESP-IDF Version");
-#endif
-    case LabelType::PLUGIN_COUNT:           return F("Plugin Count");
-    case LabelType::PLUGIN_DESCRIPTION:     return F("Plugin Description");
-    case LabelType::BUILD_TIME:             return F("Build Time");
-    case LabelType::BINARY_FILENAME:        return F("Binary Filename");
-    case LabelType::BUILD_PLATFORM:         return F("Build Platform");
-    case LabelType::GIT_HEAD:               return F("Git HEAD");
-    #ifdef CONFIGURATION_CODE
-    case LabelType::CONFIGURATION_CODE_LBL: return F("Configuration code");
-    #endif // ifdef CONFIGURATION_CODE
-
-    case LabelType::I2C_BUS_STATE:          return F("I2C Bus State");
-    case LabelType::I2C_BUS_CLEARED_COUNT:  return F("I2C bus cleared count");
-
-    case LabelType::SYSLOG_LOG_LEVEL:       return F("Syslog Log Level");
-    case LabelType::SERIAL_LOG_LEVEL:       return F("Serial Log Level");
-    case LabelType::WEB_LOG_LEVEL:          return F("Web Log Level");
-  #if FEATURE_SD
-    case LabelType::SD_LOG_LEVEL:           return F("SD Log Level");
-  #endif // if FEATURE_SD
-
-    case LabelType::ESP_CHIP_ID:            return F("ESP Chip ID");
-    case LabelType::ESP_CHIP_FREQ:          return F("ESP Chip Frequency");
-#ifdef ESP32
-    case LabelType::ESP_CHIP_XTAL_FREQ:     return F("ESP Crystal Frequency");
-    case LabelType::ESP_CHIP_APB_FREQ:      return F("ESP APB Frequency");
-#endif
-    case LabelType::ESP_CHIP_MODEL:         return F("ESP Chip Model");
-    case LabelType::ESP_CHIP_REVISION:      return F("ESP Chip Revision");
-    case LabelType::ESP_CHIP_CORES:         return F("ESP Chip Cores");
-
-    case LabelType::BOARD_NAME:         return F("ESP Board Name");
-
-    case LabelType::FLASH_CHIP_ID:          return F("Flash Chip ID");
-    case LabelType::FLASH_CHIP_VENDOR:      return F("Flash Chip Vendor");
-    case LabelType::FLASH_CHIP_MODEL:       return F("Flash Chip Model");
-    case LabelType::FLASH_CHIP_REAL_SIZE:   return F("Flash Chip Real Size");
-    case LabelType::FLASH_CHIP_SPEED:       return F("Flash Chip Speed");
-    case LabelType::FLASH_IDE_SIZE:         return F("Flash IDE Size");
-    case LabelType::FLASH_IDE_SPEED:        return F("Flash IDE Speed");
-    case LabelType::FLASH_IDE_MODE:         return F("Flash IDE Mode");
-    case LabelType::FLASH_WRITE_COUNT:      return F("Flash Writes");
-    case LabelType::SKETCH_SIZE:            return F("Sketch Size");
-    case LabelType::SKETCH_FREE:            return F("Sketch Free");
-    #ifdef USE_LITTLEFS
-    case LabelType::FS_SIZE:                return F("Little FS Size");
-    case LabelType::FS_FREE:                return F("Little FS Free");
-    #else // ifdef USE_LITTLEFS
-    case LabelType::FS_SIZE:                return F("SPIFFS Size");
-    case LabelType::FS_FREE:                return F("SPIFFS Free");
-    #endif // ifdef USE_LITTLEFS
-    case LabelType::MAX_OTA_SKETCH_SIZE:    return F("Max. OTA Sketch Size");
-    case LabelType::OTA_2STEP:              return F("OTA 2-step Needed");
-    case LabelType::OTA_POSSIBLE:           return F("OTA possible");
-    #if FEATURE_INTERNAL_TEMPERATURE
-    case LabelType::INTERNAL_TEMPERATURE:   return F("Internal Temperature");
-    #endif // if FEATURE_INTERNAL_TEMPERATURE
-#if FEATURE_ETHERNET
-    case LabelType::ETH_IP_ADDRESS:         return F("Eth IP Address");
-    case LabelType::ETH_IP_SUBNET:          return F("Eth IP Subnet");
-    case LabelType::ETH_IP_ADDRESS_SUBNET:  return F("Eth IP / Subnet");
-    case LabelType::ETH_IP_GATEWAY:         return F("Eth Gateway");
-    case LabelType::ETH_IP_DNS:             return F("Eth DNS");
-#if FEATURE_USE_IPV6
-    case LabelType::ETH_IP6_LOCAL:          return F("Eth IPv6 link local");
-#endif
-    case LabelType::ETH_MAC:                return F("Eth MAC");
-    case LabelType::ETH_DUPLEX:             return F("Eth Mode");
-    case LabelType::ETH_SPEED:              return F("Eth Speed");
-    case LabelType::ETH_STATE:              return F("Eth State");
-    case LabelType::ETH_SPEED_STATE:        return F("Eth Speed State");
-    case LabelType::ETH_CONNECTED:          return F("Eth connected");
-    case LabelType::ETH_CHIP:               return F("Eth chip");
-#endif // if FEATURE_ETHERNET
-# if FEATURE_ETHERNET || defined(USES_ESPEASY_NOW)
-    case LabelType::ETH_WIFI_MODE:          return F("Network Type");
-#endif
-    case LabelType::SUNRISE:                return F("Sunrise");
-    case LabelType::SUNSET:                 return F("Sunset");
-    case LabelType::SUNRISE_S:              return F("Sunrise sec.");
-    case LabelType::SUNSET_S:               return F("Sunset sec.");
-    case LabelType::SUNRISE_M:              return F("Sunrise min.");
-    case LabelType::SUNSET_M:               return F("Sunset min.");
-    case LabelType::ISNTP:                  return F("Use NTP");
-    case LabelType::UPTIME_MS:              return F("Uptime (ms)");
-    case LabelType::TIMEZONE_OFFSET:        return F("Timezone Offset");
-    case LabelType::LATITUDE:               return F("Latitude");
-    case LabelType::LONGITUDE:              return F("Longitude");
-
-    case LabelType::MAX_LABEL:
-      break;
-
-  }
-  return F("MissingString");
-}
-
-String getValue(LabelType::Enum label) {
-  int retval = INT_MAX;
-  switch (label)
-  {
-    case LabelType::UNIT_NR:                retval = Settings.Unit; break;
-    #if FEATURE_ZEROFILLED_UNITNUMBER
-    case LabelType::UNIT_NR_0: 
+    case LabelType::UNIT_NR_0:
     {
       // Fixed 3-digit unitnumber
-      return formatIntLeadingZeroes(Settings.Unit, 3);
+      KeyValueStruct kv(F("Unit Number 0-filled"), formatIntLeadingZeroes(Settings.Unit, 3));
+      return kv;
     }
     #endif // FEATURE_ZEROFILLED_UNITNUMBER
-    case LabelType::UNIT_NAME:              return Settings.getName(); // Only return the set name, no appended unit.
-    case LabelType::HOST_NAME:              return ESPEasy::net::NetworkGetHostname();
-
-
-    case LabelType::LOCAL_TIME:             return node_time.getDateTimeString('-', ':', ' ');
-    case LabelType::TIME_SOURCE:
+    case LabelType::UNIT_NAME:
     {
-      String timeSource_str = toString(node_time.getTimeSource());
-      if (((node_time.getTimeSource() == timeSource_t::ESPEASY_p2p_UDP) ||
-           (node_time.getTimeSource() == timeSource_t::ESP_now_peer)) &&
-          (node_time.timeSource_p2p_unit != 0))
-      {
-        return strformat(F("%s (%u)"), timeSource_str.c_str(), node_time.timeSource_p2p_unit);
-      }
-      return timeSource_str;
+      // Only return the set name, no appended unit.
+      KeyValueStruct kv(F("Unit Name"), Settings.getName());
+      return kv;
     }
-    case LabelType::TIME_WANDER:            return String(node_time.timeWander, 3);
+    case LabelType::HOST_NAME:
+    {
+      KeyValueStruct kv(F("Hostname"), ESPEasy::net::NetworkGetHostname());
+      return kv;
+    }
+
+    case LabelType::LOCAL_TIME:
+
+      if (node_time.systemTimePresent())
+      {
+        KeyValueStruct kv(F("Local Time"), node_time.getDateTimeString('-', ':', ' '));
+        return kv;
+      } else if (extendedValue) {
+        KeyValueStruct kv(F("Local Time"), F("No system time source"));
+        return kv;
+      }
+      break;
+    case LabelType::TIME_SOURCE:
+
+      if (node_time.systemTimePresent())
+      {
+        String timeSource_str = toString(node_time.getTimeSource());
+
+        if (((node_time.getTimeSource() == timeSource_t::ESPEASY_p2p_UDP) ||
+             (node_time.getTimeSource() == timeSource_t::ESP_now_peer)) &&
+            (node_time.timeSource_p2p_unit != 0))
+        {
+          timeSource_str = strformat(F("%s (%u)"), timeSource_str.c_str(), node_time.timeSource_p2p_unit);
+        }
+
+        KeyValueStruct kv(F("Time Source"), timeSource_str);
+        return kv;
+      }
+      break;
+    case LabelType::TIME_WANDER:
+
+      if (node_time.systemTimePresent())
+      {
+        KeyValueStruct kv(F("Time Wander"), node_time.timeWander, 3);
+        kv.setUnit(F("ppm"));
+        return kv;
+      }
+      break;
     #if FEATURE_EXT_RTC
     case LabelType::EXT_RTC_UTC_TIME:
     {
       if (Settings.ExtTimeSource() != ExtTimeSource_e::None) {
+        String rtcTime = F("Not Set");
+
         // Try to read the stored time in the ext. time source to allow to check if it is working properly.
         uint32_t unixtime;
+
         if (node_time.ExtRTC_get(unixtime)) {
           struct tm RTC_time;
           breakTime(unixtime, RTC_time);
-          return formatDateTimeString(RTC_time);
-        } else {
-          return F("Not Set");
+          rtcTime = formatDateTimeString(RTC_time);
         }
+        KeyValueStruct kv(F("UTC time stored in RTC chip"), rtcTime);
+        return kv;
       }
-      return String('-');
+      break;
+    }
+    #endif // if FEATURE_EXT_RTC
+    case LabelType::UPTIME:
+    {
+      if (extendedValue) {
+        KeyValueStruct kv(F("Uptime"), minutesToDayHourMinute(getUptimeMinutes()));
+        return kv;
+      } else {
+        KeyValueStruct kv(F("Uptime"), getUptimeMinutes());
+        return kv;
+      }
+    }
+    case LabelType::LOAD_PCT:
+
+      if (wdcounter > 0)
+      {
+        if (extendedValue) {
+          KeyValueStruct kv(F("Load"), strformat(
+                              F("%.2f [%%] (LC=%d)"),
+                              getCPUload(),
+                              getLoopCountPerSec()));
+          return kv;
+        }
+        KeyValueStruct kv(F("Load"), getCPUload(), 2);
+        kv.setUnit(F("%"));
+        return kv;
+      }
+      break;
+    case LabelType::LOOP_COUNT:
+    {
+      if (extendedValue) { break; }
+      KeyValueStruct kv(F("Load LC"), getLoopCountPerSec());
+      return kv;
+    }
+    case LabelType::CPU_ECO_MODE:
+    {
+      KeyValueStruct kv(F("CPU Eco Mode"), Settings.EcoPowerMode());
+      return kv;
     }
-    #endif
-    case LabelType::UPTIME:                 retval = getUptimeMinutes(); break;
-    case LabelType::LOAD_PCT:               return toString(getCPUload(), 2);
-    case LabelType::LOOP_COUNT:             retval = getLoopCountPerSec(); break;
-    case LabelType::CPU_ECO_MODE:           return jsonBool(Settings.EcoPowerMode());
 #if FEATURE_SET_WIFI_TX_PWR
-    case LabelType::WIFI_TX_MAX_PWR:        return toString(Settings.getWiFi_TX_power(), 2);
-    case LabelType::WIFI_CUR_TX_PWR:        return toString(ESPEasy::net::wifi::GetWiFiTXpower(), 2);
-    case LabelType::WIFI_SENS_MARGIN:       retval = Settings.WiFi_sensitivity_margin; break;
-    case LabelType::WIFI_SEND_AT_MAX_TX_PWR:return jsonBool(Settings.UseMaxTXpowerForSending());
-#endif
-    case LabelType::WIFI_NR_EXTRA_SCANS:    retval = Settings.NumberExtraWiFiScans; break;
-    case LabelType::WIFI_USE_LAST_CONN_FROM_RTC: return jsonBool(Settings.UseLastWiFiFromRTC());
+    case LabelType::WIFI_TX_MAX_PWR:
+    {
+      KeyValueStruct kv(F("Max WiFi TX Power"), Settings.getWiFi_TX_power(), 2);
+      kv.setUnit(F("dBm"));
+      return kv;
+    }
+    case LabelType::WIFI_CUR_TX_PWR:
+    {
+      KeyValueStruct kv(F("Current WiFi TX Power"), ESPEasy::net::wifi::GetWiFiTXpower(), 2);
+      kv.setUnit(F("dBm"));
+      return kv;
+    }
+    case LabelType::WIFI_SENS_MARGIN:
+    {
+      KeyValueStruct kv(F("WiFi Sensitivity Margin"), Settings.WiFi_sensitivity_margin);
+      kv.setUnit(F("dB"));
+      return kv;
+    }
+    case LabelType::WIFI_SEND_AT_MAX_TX_PWR:
+    {
+      KeyValueStruct kv(F("Send With Max TX Power"), Settings.UseMaxTXpowerForSending());
+      return kv;
+    }
+#endif // if FEATURE_SET_WIFI_TX_PWR
+    case LabelType::WIFI_NR_EXTRA_SCANS:
+    {
+      KeyValueStruct kv(F("Extra WiFi scan loops"), Settings.NumberExtraWiFiScans);
+      return kv;
+    }
+    case LabelType::WIFI_USE_LAST_CONN_FROM_RTC:
+    {
+      KeyValueStruct kv(F("Use Last Connected AP from RTC"), Settings.UseLastWiFiFromRTC());
+      return kv;
+    }
 
-    case LabelType::FREE_MEM:               retval = FreeMem(); break;
-    case LabelType::FREE_STACK:             retval = getCurrentFreeStack(); break;
+    case LabelType::FREE_MEM:
+    {
+#ifndef BUILD_NO_RAM_TRACKER
 
+      if (extendedValue) {
+        KeyValueStruct kv(F("Free RAM"),
+                          strformat(
+                            F("%d [byte] (%d - %s)"),
+                            FreeMem(),
+                            lowestRAM,
+                            lowestRAMfunction.c_str()));
+        return kv;
+      }
+#endif // ifndef BUILD_NO_RAM_TRACKER
+
+      KeyValueStruct kv(F("Free RAM"), FreeMem());
+      kv.setUnit(F("byte"));
+      return kv;
+    }
+    case LabelType::FREE_STACK:
+    {
+#ifndef BUILD_NO_RAM_TRACKER
+
+      if (extendedValue) {
+        KeyValueStruct kv(F("Free Stack"),
+                          strformat(
+                            F("%d [byte] (%d - %s)"),
+                            getCurrentFreeStack(),
+                            lowestFreeStack,
+                            lowestFreeStackfunction.c_str()));
+
+        return kv;
+      }
+#endif // ifndef BUILD_NO_RAM_TRACKER
+      KeyValueStruct kv(F("Free Stack"), getCurrentFreeStack());
+      kv.setUnit(F("byte"));
+
+      return kv;
+    }
 #ifdef USE_SECOND_HEAP
-    case LabelType::FREE_HEAP_IRAM:         retval = FreeMem2ndHeap(); break;
-#endif
+    case LabelType::FREE_HEAP_IRAM:
+    {
+      KeyValueStruct kv(F("Free 2nd Heap"), FreeMem2ndHeap());
+      kv.setUnit(F("byte"));
+      return kv;
+    }
+#endif // ifdef USE_SECOND_HEAP
 
+#if defined(CORE_POST_2_5_0) || defined(ESP32)
+  # ifndef LIMIT_BUILD_SIZE
+    case LabelType::HEAP_MAX_FREE_BLOCK:
+    {
+      KeyValueStruct kv(F("Heap Max Free Block"),
+#  ifdef ESP32
+                        ESP.getMaxAllocHeap()
+#  else
+                        ESP.getMaxFreeBlockSize()
+#  endif // ifdef ESP32
+                        );
+      kv.setUnit(F("byte"));
+      return kv;
+    }
+  # endif // ifndef LIMIT_BUILD_SIZE
+#endif // if defined(CORE_POST_2_5_0) || defined(ESP32)
 #if defined(CORE_POST_2_5_0)
-  #ifndef LIMIT_BUILD_SIZE
-    case LabelType::HEAP_MAX_FREE_BLOCK:    retval = ESP.getMaxFreeBlockSize(); break;
-  #endif
-#endif // if defined(CORE_POST_2_5_0)
-#if  defined(ESP32)
-  #ifndef LIMIT_BUILD_SIZE
-    case LabelType::HEAP_MAX_FREE_BLOCK:    retval = ESP.getMaxAllocHeap(); break;
-  #endif
-#endif // if  defined(ESP32)
-#if defined(CORE_POST_2_5_0)
-  #ifndef LIMIT_BUILD_SIZE
-    case LabelType::HEAP_FRAGMENTATION:     retval = ESP.getHeapFragmentation(); break;
-  #endif
+  # ifndef LIMIT_BUILD_SIZE
+    case LabelType::HEAP_FRAGMENTATION:
+    {
+      KeyValueStruct kv(F("Heap Fragmentation"), ESP.getHeapFragmentation());
+      kv.setUnit(F("%"));
+      return kv;
+    }
+  # endif // ifndef LIMIT_BUILD_SIZE
 #endif // if defined(CORE_POST_2_5_0)
+
 #ifdef ESP32
-    case LabelType::HEAP_SIZE:              retval = ESP.getHeapSize(); break;
-    case LabelType::HEAP_MIN_FREE:          retval = ESP.getMinFreeHeap(); break;
-    #ifdef BOARD_HAS_PSRAM
-    case LabelType::PSRAM_SIZE:             retval = UsePSRAM() ? ESP.getPsramSize() : 0; break;
-    case LabelType::PSRAM_FREE:             retval = UsePSRAM() ? ESP.getFreePsram() : 0; break;
-    case LabelType::PSRAM_MIN_FREE:         retval = UsePSRAM() ? ESP.getMinFreePsram() : 0; break;
-    case LabelType::PSRAM_MAX_FREE_BLOCK:   retval = UsePSRAM() ? ESP.getMaxAllocPsram() : 0; break;
-    #endif // BOARD_HAS_PSRAM
+    case LabelType::HEAP_SIZE:
+    {
+      KeyValueStruct kv(F("Heap Size"), ESP.getHeapSize());
+      kv.setUnit(F("byte"));
+      return kv;
+    }
+    case LabelType::HEAP_MIN_FREE:
+    {
+      KeyValueStruct kv(F("Heap Min Free"), ESP.getMinFreeHeap());
+      kv.setUnit(F("byte"));
+      return kv;
+    }
+    # ifdef BOARD_HAS_PSRAM
+    case LabelType::PSRAM_SIZE:
+    {
+      if (!UsePSRAM()) { break; }
+      KeyValueStruct kv(F("PSRAM Size"), ESP.getPsramSize());
+      kv.setUnit(F("byte"));
+      return kv;
+    }
+    case LabelType::PSRAM_FREE:
+    {
+      if (!UsePSRAM()) { break; }
+      KeyValueStruct kv(F("PSRAM Free"), ESP.getFreePsram());
+      kv.setUnit(F("byte"));
+      return kv;
+    }
+    case LabelType::PSRAM_MIN_FREE:
+    {
+      if (!UsePSRAM()) { break; }
+      KeyValueStruct kv(F("PSRAM Min Free"), ESP.getMinFreePsram());
+      kv.setUnit(F("byte"));
+      return kv;
+    }
+    case LabelType::PSRAM_MAX_FREE_BLOCK:
+    {
+      if (!UsePSRAM()) { break; }
+      KeyValueStruct kv(F("PSRAM Max Free Block"), ESP.getMaxAllocPsram());
+      kv.setUnit(F("byte"));
+      return kv;
+    }
+    # endif // BOARD_HAS_PSRAM
 #endif // ifdef ESP32
 
-
-    case LabelType::JSON_BOOL_QUOTES:           return jsonBool(Settings.JSONBoolWithoutQuotes());
+    case LabelType::JSON_BOOL_QUOTES:
+    {
+      KeyValueStruct kv(F("JSON bool output without quotes"), Settings.JSONBoolWithoutQuotes());
+      return kv;
+    }
 #if FEATURE_TIMING_STATS
-    case LabelType::ENABLE_TIMING_STATISTICS:   return jsonBool(Settings.EnableTimingStats());
-#endif
-    case LabelType::ENABLE_RULES_CACHING:       return jsonBool(Settings.EnableRulesCaching());
-    case LabelType::ENABLE_SERIAL_PORT_CONSOLE: return jsonBool(Settings.UseSerial);
-    case LabelType::CONSOLE_SERIAL_PORT:        return ESPEasy_Console.getPortDescription();
-
+    case LabelType::ENABLE_TIMING_STATISTICS:
+    {
+      KeyValueStruct kv(F("Collect Timing Statistics"), Settings.EnableTimingStats());
+      return kv;
+    }
+#endif // if FEATURE_TIMING_STATS
+    case LabelType::ENABLE_RULES_CACHING:
+    {
+      KeyValueStruct kv(F("Enable Rules Cache"), Settings.EnableRulesCaching());
+      return kv;
+    }
+    case LabelType::ENABLE_SERIAL_PORT_CONSOLE:
+    {
+      KeyValueStruct kv(F("Enable Serial Port Console"), !!Settings.UseSerial);
+      return kv;
+    }
+    case LabelType::CONSOLE_SERIAL_PORT:
+    {
+      KeyValueStruct kv(F("Console Serial Port"), ESPEasy_Console.getPortDescription());
+      return kv;
+    }
 #if USES_ESPEASY_CONSOLE_FALLBACK_PORT
-    case LabelType::CONSOLE_FALLBACK_TO_SERIAL0: return jsonBool(Settings.console_serial0_fallback);
-    case LabelType::CONSOLE_FALLBACK_PORT:       return ESPEasy_Console.getFallbackPortDescription();
-#endif
+    case LabelType::CONSOLE_FALLBACK_TO_SERIAL0:
+    {
+      KeyValueStruct kv(F("Fallback to Serial 0"), Settings.console_serial0_fallback);
+      return kv;
+    }
+    case LabelType::CONSOLE_FALLBACK_PORT:
+    {
+      KeyValueStruct kv(F("Console Fallback Port"), ESPEasy_Console.getFallbackPortDescription());
+      return kv;
+    }
+#endif // if USES_ESPEASY_CONSOLE_FALLBACK_PORT
 
-//    case LabelType::ENABLE_RULES_EVENT_REORDER: return jsonBool(Settings.EnableRulesEventReorder()); // TD-er: Disabled for now
-    case LabelType::TASKVALUESET_ALL_PLUGINS:   return jsonBool(Settings.AllowTaskValueSetAllPlugins());
-    case LabelType::ALLOW_OTA_UNLIMITED:        return jsonBool(Settings.AllowOTAUnlimited());
+    //    case LabelType::ENABLE_RULES_EVENT_REORDER: {
+    // KeyValueStruct kv(F("Optimize Rules Cache Event Order"), Settings.EnableRulesEventReorder());
+    // return kv;
+    // } // TD-er: Disabled for now
+    case LabelType::TASKVALUESET_ALL_PLUGINS:
+    {
+      KeyValueStruct kv(F("Allow TaskValueSet on all plugins"), Settings.AllowTaskValueSetAllPlugins());
+      return kv;
+    }
+    case LabelType::ALLOW_OTA_UNLIMITED:
+    {
+      KeyValueStruct kv(F("Allow OTA without size-check"), Settings.AllowOTAUnlimited());
+      return kv;
+    }
 #if FEATURE_CLEAR_I2C_STUCK
-    case LabelType::ENABLE_CLEAR_HUNG_I2C_BUS:  return jsonBool(Settings.EnableClearHangingI2Cbus());
-#endif
-#if FEATURE_I2C_DEVICE_CHECK
-    case LabelType::ENABLE_I2C_DEVICE_CHECK:    return jsonBool(Settings.CheckI2Cdevice());
-#endif // if FEATURE_I2C_DEVICE_CHECK
+    case LabelType::ENABLE_CLEAR_HUNG_I2C_BUS:
+    {
+      KeyValueStruct kv(F("Try clear I2C bus when stuck"), Settings.EnableClearHangingI2Cbus());
+      return kv;
+    }
+#endif // if FEATURE_CLEAR_I2C_STUCK
+    #if FEATURE_I2C_DEVICE_CHECK
+    case LabelType::ENABLE_I2C_DEVICE_CHECK:
+    {
+      KeyValueStruct kv(F("Check I2C devices when enabled"), Settings.CheckI2Cdevice());
+      return kv;
+    }
+    #endif // if FEATURE_I2C_DEVICE_CHECK
 #ifndef BUILD_NO_RAM_TRACKER
-    case LabelType::ENABLE_RAM_TRACKING:        return jsonBool(Settings.EnableRAMTracking());
-#endif
+    case LabelType::ENABLE_RAM_TRACKING:
+    {
+      KeyValueStruct kv(F("Enable RAM Tracker"), Settings.EnableRAMTracking());
+      return kv;
+    }
+#endif // ifndef BUILD_NO_RAM_TRACKER
 #if FEATURE_AUTO_DARK_MODE
-    case LabelType::ENABLE_AUTO_DARK_MODE:      return toString(Settings.getCssMode());
+    case LabelType::ENABLE_AUTO_DARK_MODE:
+    {
+      KeyValueStruct kv(F("Web light/dark mode"), Settings.getCssMode());
+      return kv;
+    }
 #endif // FEATURE_AUTO_DARK_MODE
 #if FEATURE_RULES_EASY_COLOR_CODE
-    case LabelType::DISABLE_RULES_AUTOCOMPLETE: return jsonBool(Settings.DisableRulesCodeCompletion());
+    case LabelType::DISABLE_RULES_AUTOCOMPLETE:
+    {
+      KeyValueStruct kv(F("Disable Rules auto-completion"), Settings.DisableRulesCodeCompletion());
+      return kv;
+    }
 #endif // if FEATURE_RULES_EASY_COLOR_CODE
 #if FEATURE_TARSTREAM_SUPPORT
-    case LabelType::DISABLE_SAVE_CONFIG_AS_TAR: return jsonBool(Settings.DisableSaveConfigAsTar());
+    case LabelType::DISABLE_SAVE_CONFIG_AS_TAR:
+    {
+      KeyValueStruct kv(F("Disable Save Config as .tar"), Settings.DisableSaveConfigAsTar());
+      return kv;
+    }
 #endif // if FEATURE_TARSTREAM_SUPPORT
-    #if FEATURE_TASKVALUE_UNIT_OF_MEASURE
-    case LabelType::SHOW_UOM_ON_DEVICES_PAGE:   return jsonBool(Settings.ShowUnitOfMeasureOnDevicesPage());
+#if FEATURE_TASKVALUE_UNIT_OF_MEASURE
+    case LabelType::SHOW_UOM_ON_DEVICES_PAGE:
+    {
+      KeyValueStruct kv(F("Show Unit of Measure"), Settings.ShowUnitOfMeasureOnDevicesPage());
+      return kv;
+    }
     #endif // if FEATURE_TASKVALUE_UNIT_OF_MEASURE
     #if FEATURE_MQTT_CONNECT_BACKGROUND
-    case LabelType::MQTT_CONNECT_IN_BACKGROUND: return jsonBool(Settings.MQTTConnectInBackground());
+    case LabelType::MQTT_CONNECT_IN_BACKGROUND:
+    {
+      KeyValueStruct kv(F("MQTT Connect in background"), Settings.MQTTConnectInBackground());
+      return kv;
+    }
     #endif // if FEATURE_MQTT_CONNECT_BACKGROUND
 
 #if CONFIG_SOC_WIFI_SUPPORT_5G
-    case LabelType::WIFI_BAND_MODE:        return ESPEasy::net::wifi::getWifiBandModeString(Settings.WiFi_band_mode());
-#endif
-
-    case LabelType::BOOT_TYPE:              return getLastBootCauseString();
-    case LabelType::BOOT_COUNT:             break;
-    case LabelType::DEEP_SLEEP_ALTERNATIVE_CALL: return jsonBool(Settings.UseAlternativeDeepSleep());
-    case LabelType::RESET_REASON:           return getResetReasonString();
-    case LabelType::LAST_TASK_BEFORE_REBOOT: return ESPEasy_Scheduler::decodeSchedulerId(lastMixedSchedulerId_beforereboot);
-    case LabelType::SW_WD_COUNT:            retval = sw_watchdog_callback_count; break;
-
-    case LabelType::WIFI_CONNECTION:        break;
-    case LabelType::WIFI_RSSI:              retval = WiFi.RSSI(); break;
-    case LabelType::IP_CONFIG:              return useStaticIP() 
-                                                     ? getLabel(LabelType::IP_CONFIG_STATIC) 
-                                                     : getLabel(LabelType::IP_CONFIG_DYNAMIC);
-    case LabelType::IP_CONFIG_STATIC:       break;
-    case LabelType::IP_CONFIG_DYNAMIC:      break;
-    case LabelType::IP_ADDRESS:             return formatIP(ESPEasy::net::NetworkLocalIP());
-    case LabelType::IP_SUBNET:              return formatIP(ESPEasy::net::NetworkSubnetMask());
-    case LabelType::IP_ADDRESS_SUBNET:      return strformat(F("%s / %s"), getValue(LabelType::IP_ADDRESS).c_str(), getValue(LabelType::IP_SUBNET).c_str());
-    case LabelType::GATEWAY:                return formatIP(ESPEasy::net::NetworkGatewayIP());
-#if FEATURE_USE_IPV6
-    case LabelType::IP6_LOCAL:              return formatIP(ESPEasy::net::NetworkLocalIP6(), true);
-    case LabelType::IP6_GLOBAL:             return formatIP(ESPEasy::net::NetworkGlobalIP6());
-#if FEATURE_ETHERNET
-    case LabelType::ETH_IP6_LOCAL:          return formatIP(ESPEasy::net::NetworkLocalIP6(), true);
-#endif
-/*
-    case LabelType::IP6_ALL_ADDRESSES:
+    case LabelType::WIFI_BAND_MODE:
     {
-      IP6Addresses_t addresses = NetworkAllIPv6();
-      String res;
-      for (auto it = addresses.begin(); it != addresses.end(); ++it)
-      {
-        if (!res.isEmpty()) {
-          res += F("
    ");
-        }
-        res += it->toString();
-      }
-      return res;
+      KeyValueStruct kv(F("WiFi Band Mode"), ESPEasy::net::wifi::getWifiBandModeString(Settings.WiFi_band_mode()));
+      return kv;
     }
-*/
-#endif
-    case LabelType::CLIENT_IP:              return formatIP(web_server.client().remoteIP(), true);
-    #if FEATURE_INTERNAL_TEMPERATURE
-    case LabelType::INTERNAL_TEMPERATURE:   return toString(getInternalTemperature());
-    #endif // if FEATURE_INTERNAL_TEMPERATURE
+#endif // if CONFIG_SOC_WIFI_SUPPORT_5G
 
-    #if FEATURE_MDNS
-    case LabelType::M_DNS:                  return NetworkGetHostname() + F(".local");
-    #endif // if FEATURE_MDNS
-    case LabelType::DNS:                    return strformat(F("%s / %s"), getValue(LabelType::DNS_1).c_str(), getValue(LabelType::DNS_2).c_str());
-    case LabelType::DNS_1:                  return formatIP(ESPEasy::net::NetworkDnsIP(0));
-    case LabelType::DNS_2:                  return formatIP(ESPEasy::net::NetworkDnsIP(1));
-    case LabelType::ALLOWED_IP_RANGE:       return ESPEasy::net::describeAllowedIPrange();
-#if FEATURE_WIFI
-    case LabelType::STA_MAC:                return ESPEasy::net::WifiSTAmacAddress().toString();
-    case LabelType::AP_MAC:                 return ESPEasy::net::WifiSoftAPmacAddress().toString();
-    case LabelType::SSID:                   return WiFi.SSID();
-    case LabelType::BSSID:                  return WiFi.BSSIDstr();
-    case LabelType::CHANNEL:                retval = WiFi.channel(); break;
-    case LabelType::ENCRYPTION_TYPE_STA:    return getWiFi_encryptionType();
-#endif
-    case LabelType::CONNECTED:
-        return format_msec_duration(ESPEasy::net::NetworkConnectDuration_ms());
+    case LabelType::BOOT_TYPE:
+    {
+      KeyValueStruct kv(F("Last Boot Cause"), getLastBootCauseString());
+      return kv;
+    }
+    case LabelType::BOOT_COUNT:
+    {
+      KeyValueStruct kv(F("Boot Count") /*, value*/);
+      return kv;
+    }
+    case LabelType::DEEP_SLEEP_ALTERNATIVE_CALL:
+    {
+      KeyValueStruct kv(F("Deep Sleep Alternative"), Settings.UseAlternativeDeepSleep());
+      return kv;
+    }
+    case LabelType::RESET_REASON:
+    {
+      KeyValueStruct kv(F("Reset Reason"), getResetReasonString());
+      return kv;
+    }
+    case LabelType::LAST_TASK_BEFORE_REBOOT:
+    {
+      KeyValueStruct kv(F("Last Action before Reboot"), ESPEasy_Scheduler::decodeSchedulerId(lastMixedSchedulerId_beforereboot));
+      return kv;
+    }
+    case LabelType::SW_WD_COUNT:
+    {
+      KeyValueStruct kv(F("SW WD count"), sw_watchdog_callback_count);
+      return kv;
+    }
 
-    // Use only the nr of seconds to fit it in an int32, plus append '000' to have msec format again.
-    case LabelType::CONNECTED_MSEC:         
-      return String(static_cast(ESPEasy::net::NetworkConnectDuration_ms() / 1000ll)) + F("000");
-    case LabelType::LAST_DISCONNECT_REASON: retval = getWiFi_disconnectReason(); break;
-    case LabelType::LAST_DISC_REASON_STR:   return getWiFi_disconnectReason_str();
-    case LabelType::NUMBER_RECONNECTS:      retval = ESPEasy::net::NetworkConnectCount(); break;
-    case LabelType::WIFI_STORED_SSID1:      return String(SecuritySettings.WifiSSID);
-    case LabelType::WIFI_STORED_SSID2:      return String(SecuritySettings.WifiSSID2);
-
-
-    case LabelType::FORCE_WIFI_BG:          return jsonBool(Settings.ForceWiFi_bg_mode());
-    case LabelType::RESTART_WIFI_LOST_CONN: return jsonBool(Settings.WiFiRestart_connection_lost());
-    case LabelType::FORCE_WIFI_NOSLEEP:     return jsonBool(Settings.WifiNoneSleep());
-    case LabelType::PERIODICAL_GRAT_ARP:    return jsonBool(Settings.gratuitousARP());
-    case LabelType::CONNECTION_FAIL_THRESH: retval = Settings.ConnectionFailuresThreshold; break;
-#ifndef ESP32
-    case LabelType::WAIT_WIFI_CONNECT:      return jsonBool(Settings.WaitWiFiConnect());
-#endif
-    case LabelType::CONNECT_HIDDEN_SSID:    return jsonBool(Settings.IncludeHiddenSSID());
-#ifdef ESP32
-    case LabelType::WIFI_PASSIVE_SCAN:      return jsonBool(Settings.PassiveWiFiScan());
-#endif
-    case LabelType::HIDDEN_SSID_SLOW_CONNECT: return jsonBool(Settings.HiddenSSID_SlowConnectPerBSSID());
-    case LabelType::SDK_WIFI_AUTORECONNECT: return jsonBool(Settings.SDK_WiFi_autoreconnect());
+    case LabelType::WIFI_CONNECTION:
+    {
+      KeyValueStruct kv(F("WiFi Connection") /*, value*/);
+      return kv;
+    }
+    case LabelType::WIFI_RSSI:
+    {
+      if (extendedValue) {
+        KeyValueStruct kv(F("RSSI"), strformat(
+                            F("%d [dBm] (%s)"),
+                            WiFi.RSSI(),
+                            WiFi.SSID().c_str()));
+        return kv;
+      }
+      KeyValueStruct kv(F("RSSI"), WiFi.RSSI());
+      kv.setUnit(F("dBm"));
+      return kv;
+    }
+    case LabelType::IP_CONFIG:
+    {
+      KeyValueStruct kv(F("IP Config"), useStaticIP() ? F("static") : F("DHCP"));
+      kv.setID(F("dhcp"));
+      return kv;
+    }
 #if FEATURE_USE_IPV6
-    case LabelType::ENABLE_IPV6:            return jsonBool(Settings.EnableIPv6());
-#endif
+    case LabelType::IP6_LOCAL:
+
+      if (Settings.EnableIPv6()) {
+        KeyValueStruct kv(F("IPv6 link local"), formatIP(ESPEasy::net::NetworkLocalIP6(), true));
+        return kv;
+      }
+      break;
+    case LabelType::IP6_GLOBAL:
+
+      if (Settings.EnableIPv6()) {
+        KeyValueStruct kv(F("IPv6 global"), formatIP(ESPEasy::net::NetworkGlobalIP6()));
+        return kv;
+      }
+      break;
+
+      // case LabelType::IP6_ALL_ADDRESSES:      {
+      // KeyValueStruct kv(F("IPv6 all addresses"));
+      // IP6Addresses_t addresses = NetworkAllIPv6();
+      // for (auto it = addresses.begin(); it != addresses.end(); ++it)
+      // {
+      //   kv.appendValue(it->toString());
+      // }
+      // return kv;
+      // }
+#endif // if FEATURE_USE_IPV6
+    case LabelType::IP_ADDRESS:
+    {
+      KeyValueStruct kv(F("IP Address"), formatIP(ESPEasy::net::NetworkLocalIP()));
+      kv.setID(F("ip"));
+      return kv;
+    }
+    case LabelType::IP_SUBNET:
+    {
+      KeyValueStruct kv(F("IP Subnet"), formatIP(ESPEasy::net::NetworkSubnetMask()));
+      kv.setID(F("subnet"));
+      return kv;
+    }
+    case LabelType::IP_ADDRESS_SUBNET:
+    {
+      KeyValueStruct kv(F("IP / Subnet"), strformat(
+                          F("%s / %s"),
+                          getValue(LabelType::IP_ADDRESS).c_str(),
+                          getValue(LabelType::IP_SUBNET).c_str()));
+      return kv;
+    }
+    case LabelType::GATEWAY:
+    {
+      KeyValueStruct kv(F("Gateway"), formatIP(ESPEasy::net::NetworkGatewayIP()));
+      kv.setID(F("gw"));
+      return kv;
+    }
+    case LabelType::CLIENT_IP:
+    {
+      KeyValueStruct kv(F("Client IP"), formatIP(web_server.client().remoteIP(), true));
+      return kv;
+    }
+    #if FEATURE_MDNS
+    case LabelType::M_DNS:
+    {
+      const String url = NetworkGetHostname() + F(".local");
+
+      if (extendedValue) {
+        KeyValueStruct kv(F("mDNS"),
+                          strformat(
+                            F("%s"),
+                            url.c_str(),
+                            url.c_str()));
+        return kv;
+      }
+      KeyValueStruct kv(F("mDNS"), url);
+      return kv;
+    }
+    #endif // if FEATURE_MDNS
+    case LabelType::DNS:
+    {
+      if (!extendedValue) { break; }
+      KeyValueStruct kv(F("DNS"), strformat(F("%s / %s"),
+                                            getValue(LabelType::DNS_1).c_str(),
+                                            getValue(LabelType::DNS_2).c_str()));
+      return kv;
+    }
+    case LabelType::DNS_1:
+    {
+      if (extendedValue) { break; }
+      KeyValueStruct kv(F("DNS 1"), formatIP(ESPEasy::net::NetworkDnsIP(0)));
+      kv.setID(F("dns1"));
+      return kv;
+    }
+    case LabelType::DNS_2:
+    {
+      if (extendedValue) { break; }
+      KeyValueStruct kv(F("DNS 2"), formatIP(ESPEasy::net::NetworkDnsIP(1)));
+      kv.setID(F("dns2"));
+      return kv;
+    }
+    case LabelType::ALLOWED_IP_RANGE:
+    {
+      KeyValueStruct kv(F("Allowed IP Range"), ESPEasy::net::describeAllowedIPrange());
+      kv.setID(F("allowed_range"));
+      return kv;
+    }
+    case LabelType::STA_MAC:
+    {
+      KeyValueStruct kv(F("STA MAC"), ESPEasy::net::WifiSTAmacAddress().toString());
+      return kv;
+    }
+    case LabelType::AP_MAC:
+    {
+      KeyValueStruct kv(F("AP MAC"), ESPEasy::net::WifiSoftAPmacAddress().toString());
+      return kv;
+    }
+    case LabelType::SSID:
+    {
+      KeyValueStruct kv(F("SSID"), WiFi.SSID());
+      return kv;
+    }
+    case LabelType::BSSID:
+    {
+      KeyValueStruct kv(F("BSSID"), WiFi.BSSIDstr());
+      return kv;
+    }
+    case LabelType::CHANNEL:
+    {
+      KeyValueStruct kv(F("Channel"), WiFi.channel());
+      return kv;
+    }
+    case LabelType::ENCRYPTION_TYPE_STA:
+    {
+      KeyValueStruct kv(F("Encryption Type"), getWiFi_encryptionType());
+      kv.setID(F("encryption"));
+      return kv;
+    }
+    case LabelType::CONNECTED:
+    {
+      KeyValueStruct kv(F("Connected"), format_msec_duration(ESPEasy::net::NetworkConnectDuration_ms()));
+      return kv;
+    }
+    case LabelType::CONNECTED_MSEC:
+    {
+      KeyValueStruct kv(F("Connected msec"), ESPEasy::net::NetworkConnectDuration_ms());
+      return kv;
+    }
+    case LabelType::LAST_DISCONNECT_REASON:
+    {
+      KeyValueStruct kv(F("Last Disconnect Reason"), getWiFi_disconnectReason());
+      return kv;
+    }
+    case LabelType::LAST_DISC_REASON_STR:
+    {
+      KeyValueStruct kv(F("Last Disconnect Reason str"), getWiFi_disconnectReason_str());
+      return kv;
+    }
+    case LabelType::NUMBER_RECONNECTS:
+    {
+      KeyValueStruct kv(F("Number Reconnects"), ESPEasy::net::NetworkConnectCount());
+      return kv;
+    }
+    case LabelType::WIFI_STORED_SSID1:
+    {
+      KeyValueStruct kv(F("Configured SSID1"), SecuritySettings.WifiSSID);
+      return kv;
+    }
+    case LabelType::WIFI_STORED_SSID2:
+    {
+      KeyValueStruct kv(F("Configured SSID2"), SecuritySettings.WifiSSID2);
+      return kv;
+    }
 
 
-    case LabelType::BUILD_DESC:             return getSystemBuildString();
+    case LabelType::FORCE_WIFI_BG:
+    {
+      KeyValueStruct kv(F("Force WiFi B/G"), Settings.ForceWiFi_bg_mode());
+      return kv;
+    }
+    case LabelType::RESTART_WIFI_LOST_CONN:
+    {
+      KeyValueStruct kv(F("Restart WiFi Lost Conn"), Settings.WiFiRestart_connection_lost());
+      return kv;
+    }
+    case LabelType::FORCE_WIFI_NOSLEEP:
+    {
+      KeyValueStruct kv(F("Force WiFi No Sleep"), Settings.WifiNoneSleep());
+      return kv;
+    }
+    case LabelType::PERIODICAL_GRAT_ARP:
+    {
+      KeyValueStruct kv(F("Periodical send Gratuitous ARP"), Settings.gratuitousARP());
+      return kv;
+    }
+    case LabelType::CONNECTION_FAIL_THRESH:
+    {
+      KeyValueStruct kv(F("Connection Failure Threshold"), Settings.ConnectionFailuresThreshold);
+      return kv;
+    }
+#ifndef ESP32
+    case LabelType::WAIT_WIFI_CONNECT:
+    {
+      KeyValueStruct kv(F("Extra Wait WiFi Connect"), Settings.WaitWiFiConnect());
+      return kv;
+    }
+#endif // ifndef ESP32
+    case LabelType::CONNECT_HIDDEN_SSID:
+    {
+      KeyValueStruct kv(F("Include Hidden SSID"), Settings.IncludeHiddenSSID());
+      return kv;
+    }
+#ifdef ESP32
+    case LabelType::WIFI_PASSIVE_SCAN:
+    {
+      KeyValueStruct kv(F("Passive WiFi Scan"), Settings.PassiveWiFiScan());
+      return kv;
+    }
+#endif // ifdef ESP32
+    case LabelType::HIDDEN_SSID_SLOW_CONNECT:
+    {
+      KeyValueStruct kv(F("Hidden SSID Slow Connect"), Settings.HiddenSSID_SlowConnectPerBSSID());
+      return kv;
+    }
+    case LabelType::SDK_WIFI_AUTORECONNECT:
+    {
+      KeyValueStruct kv(F("Enable SDK WiFi Auto Reconnect"), Settings.SDK_WiFi_autoreconnect());
+      return kv;
+    }
+#if FEATURE_USE_IPV6
+    case LabelType::ENABLE_IPV6:
+    {
+      KeyValueStruct kv(F("Enable IPv6"), Settings.EnableIPv6());
+      return kv;
+    }
+#endif // if FEATURE_USE_IPV6
+
+
+    case LabelType::BUILD_DESC:
+    {
+      KeyValueStruct kv(F("Build"), getSystemBuildString());
+      return kv;
+    }
     case LabelType::GIT_BUILD:
     {
-      const String res(F(BUILD_GIT));
+      String res(F(BUILD_GIT));
 
-      if (!res.isEmpty()) { return res; }
-      return get_git_head();
+      if (res.isEmpty()) { res = get_git_head(); }
+      KeyValueStruct kv(F("Git Build"), res);
+      return kv;
+    }
+    case LabelType::SYSTEM_LIBRARIES:
+    {
+      KeyValueStruct kv(F("System Libraries"), getSystemLibraryString());
+      return kv;
     }
-    case LabelType::SYSTEM_LIBRARIES:       return getSystemLibraryString();
 #ifdef ESP32
-    case LabelType::ESP_IDF_SDK_VERSION:    return strformat(
-      F("%d.%d.%d"), 
-      ESP_IDF_VERSION_MAJOR, 
-      ESP_IDF_VERSION_MINOR, 
-      ESP_IDF_VERSION_PATCH);
-#endif
-
-    case LabelType::PLUGIN_COUNT:           retval = getDeviceCount() + 1; break;
-    case LabelType::PLUGIN_DESCRIPTION:     return getPluginDescriptionString();
-    case LabelType::BUILD_TIME:             return String(get_build_date()) + ' ' + get_build_time();
-    case LabelType::BINARY_FILENAME:        return get_binary_filename();
-    case LabelType::BUILD_PLATFORM:         return get_build_platform();
-    case LabelType::GIT_HEAD:               return get_git_head();
+    case LabelType::ESP_IDF_SDK_VERSION:
+    {
+      KeyValueStruct kv(F("ESP-IDF Version"), strformat(
+                          F("%d.%d.%d"),
+                          ESP_IDF_VERSION_MAJOR,
+                          ESP_IDF_VERSION_MINOR,
+                          ESP_IDF_VERSION_PATCH));
+      return kv;
+    }
+#endif // ifdef ESP32
+    case LabelType::PLUGIN_COUNT:
+    {
+      KeyValueStruct kv(F("Plugin Count"), getDeviceCount() + 1);
+      return kv;
+    }
+    case LabelType::PLUGIN_DESCRIPTION:
+    {
+      KeyValueStruct kv(F("Plugin Description"), getPluginDescriptionString());
+      return kv;
+    }
+    case LabelType::BUILD_TIME:
+    {
+      KeyValueStruct kv(F("Build Time"), String(get_build_date()) + ' ' + get_build_time());
+      return kv;
+    }
+    case LabelType::BINARY_FILENAME:
+    {
+      KeyValueStruct kv(F("Binary Filename"), get_binary_filename());
+      return kv;
+    }
+    case LabelType::BUILD_PLATFORM:
+    {
+      KeyValueStruct kv(F("Build Platform"), get_build_platform());
+      return kv;
+    }
+    case LabelType::GIT_HEAD:
+    {
+      KeyValueStruct kv(F("Git HEAD"), get_git_head());
+      return kv;
+    }
     #ifdef CONFIGURATION_CODE
-    case LabelType::CONFIGURATION_CODE_LBL: return getConfigurationCode();
+    case LabelType::CONFIGURATION_CODE_LBL:
+    {
+      KeyValueStruct kv(F("Configuration code"), getConfigurationCode());
+      return kv;
+    }
     #endif // ifdef CONFIGURATION_CODE
-    case LabelType::I2C_BUS_STATE:          return toString(I2C_state);
-    case LabelType::I2C_BUS_CLEARED_COUNT:  retval = I2C_bus_cleared_count; break;
-    case LabelType::SYSLOG_LOG_LEVEL:       return getLogLevelDisplayString(Settings.SyslogLevel);
-    case LabelType::SERIAL_LOG_LEVEL:       return getLogLevelDisplayString(getSerialLogLevel());
-    case LabelType::WEB_LOG_LEVEL:          return getLogLevelDisplayString(getWebLogLevel());
+
+    case LabelType::I2C_BUS_STATE:
+    {
+      KeyValueStruct kv(F("I2C Bus State"), toString(I2C_state));
+      return kv;
+    }
+    case LabelType::I2C_BUS_CLEARED_COUNT:
+    {
+      KeyValueStruct kv(F("I2C bus cleared count"), I2C_bus_cleared_count);
+      return kv;
+    }
+
+    case LabelType::SYSLOG_LOG_LEVEL:
+    {
+      KeyValueStruct kv(F("Syslog Log Level"), getLogLevelDisplayString(Settings.SyslogLevel));
+      return kv;
+    }
+    case LabelType::SERIAL_LOG_LEVEL:
+    {
+      KeyValueStruct kv(F("Serial Log Level"), getLogLevelDisplayString(getSerialLogLevel()));
+      return kv;
+    }
+    case LabelType::WEB_LOG_LEVEL:
+    {
+      KeyValueStruct kv(F("Web Log Level"), getLogLevelDisplayString(getWebLogLevel()));
+      return kv;
+    }
   #if FEATURE_SD
-    case LabelType::SD_LOG_LEVEL:           return getLogLevelDisplayString(Settings.SDLogLevel);
+    case LabelType::SD_LOG_LEVEL:
+    {
+      KeyValueStruct kv(F("SD Log Level"), getLogLevelDisplayString(Settings.SDLogLevel));
+      return kv;
+    }
   #endif // if FEATURE_SD
 
-    case LabelType::ESP_CHIP_ID:            return formatToHex(getChipId(), 6);
-    case LabelType::ESP_CHIP_FREQ:          retval = ESP.getCpuFreqMHz(); break;
+    case LabelType::ESP_CHIP_ID:
+    {
+      KeyValueStruct kv(F("ESP Chip ID"), formatToHex(getChipId(), 6));
+      return kv;
+    }
+    case LabelType::ESP_CHIP_FREQ:
+    {
+      KeyValueStruct kv(F("ESP Chip Frequency"), ESP.getCpuFreqMHz());
+      kv.setUnit(F("MHz"));
+      return kv;
+    }
 #ifdef ESP32
-    case LabelType::ESP_CHIP_XTAL_FREQ:     retval = getXtalFrequencyMHz(); break;
-    case LabelType::ESP_CHIP_APB_FREQ:      retval = rtc_clk_apb_freq_get() / 1000000; break;
-    //getApbFrequency() / 1000000; break;
-#endif
-    case LabelType::ESP_CHIP_MODEL:         return getChipModel();
-    case LabelType::ESP_CHIP_REVISION:      return getChipRevision();
-    case LabelType::ESP_CHIP_CORES:         retval = getChipCores(); break;
-    case LabelType::BOARD_NAME:             return get_board_name();
-    case LabelType::FLASH_CHIP_ID:          return formatToHex(getFlashChipId(), 6);
-    case LabelType::FLASH_CHIP_VENDOR:      return formatToHex(getFlashChipId() & 0xFF, 2);
+    case LabelType::ESP_CHIP_XTAL_FREQ:
+    {
+      KeyValueStruct kv(F("ESP Crystal Frequency"), getXtalFrequencyMHz());
+      kv.setUnit(F("MHz"));
+      return kv;
+    }
+    case LabelType::ESP_CHIP_APB_FREQ:
+    {
+      KeyValueStruct kv(F("ESP APB Frequency"), rtc_clk_apb_freq_get() / 1000000);
+      kv.setUnit(F("MHz"));
+      return kv;
+    }
+#endif // ifdef ESP32
+    case LabelType::ESP_CHIP_MODEL:
+    {
+      KeyValueStruct kv(F("ESP Chip Model"), getChipModel());
+      return kv;
+    }
+    case LabelType::ESP_CHIP_REVISION:
+    {
+      KeyValueStruct kv(F("ESP Chip Revision"), getChipRevision());
+      return kv;
+    }
+    case LabelType::ESP_CHIP_CORES:
+    {
+      KeyValueStruct kv(F("ESP Chip Cores"), getChipCores());
+      return kv;
+    }
+
+    case LabelType::BOARD_NAME:
+    {
+      KeyValueStruct kv(F("ESP Board Name"), get_board_name());
+      return kv;
+    }
+
+    case LabelType::FLASH_CHIP_ID:
+    {
+      KeyValueStruct kv(F("Flash Chip ID"), formatToHex(getFlashChipId(), 6));
+      return kv;
+    }
+    case LabelType::FLASH_CHIP_VENDOR:
+    {
+      KeyValueStruct kv(F("Flash Chip Vendor"), formatToHex(getFlashChipId() & 0xFF, 2));
+      return kv;
+    }
     case LabelType::FLASH_CHIP_MODEL:
     {
       const uint32_t flashChipId = getFlashChipId();
       const uint32_t flashDevice = (flashChipId & 0xFF00) | ((flashChipId >> 16) & 0xFF);
-      return formatToHex(flashDevice, 4);
+
+      KeyValueStruct kv(F("Flash Chip Model"), formatToHex(flashDevice, 4));
+      return kv;
     }
-    case LabelType::FLASH_CHIP_REAL_SIZE:   retval = getFlashRealSizeInBytes(); break;
-    case LabelType::FLASH_CHIP_SPEED:       retval = getFlashChipSpeed() / 1000000; break;
-    case LabelType::FLASH_IDE_SIZE:         break;
-    case LabelType::FLASH_IDE_SPEED:        break;
-    case LabelType::FLASH_IDE_MODE:         return getFlashChipMode();
-    case LabelType::FLASH_WRITE_COUNT:      break;
-    case LabelType::SKETCH_SIZE:            break;
-    case LabelType::SKETCH_FREE:            break;
-    case LabelType::FS_SIZE:                retval = SpiffsTotalBytes(); break;
-    case LabelType::FS_FREE:                retval = SpiffsFreeSpace(); break;
-    case LabelType::MAX_OTA_SKETCH_SIZE:    break;
-    case LabelType::OTA_2STEP:              break;
-    case LabelType::OTA_POSSIBLE:           break;
+    case LabelType::FLASH_CHIP_REAL_SIZE:
+    {
+      KeyValueStruct kv(F("Flash Chip Real Size"), getFlashRealSizeInBytes() >> 10);
+      kv.setUnit(F("kB"));
+      return kv;
+    }
+    case LabelType::FLASH_CHIP_SPEED:
+    {
+      KeyValueStruct kv(F("Flash Chip Speed"), getFlashChipSpeed() / 1000000);
+      kv.setUnit(F("MHz"));
+      return kv;
+    }
+    case LabelType::FLASH_IDE_SIZE:
+    {
+      KeyValueStruct kv(F("Flash IDE Size"), ESP.getFlashChipSize() >> 10);
+      kv.setUnit(F("kB"));
+      return kv;
+    }
+    case LabelType::FLASH_IDE_SPEED:
+    {
+      KeyValueStruct kv(F("Flash IDE Speed"), getFlashChipSpeed() / 1000000);
+      kv.setUnit(F("MHz"));
+      return kv;
+    }
+    case LabelType::FLASH_IDE_MODE:
+    {
+      KeyValueStruct kv(F("Flash IDE Mode"), getFlashChipMode());
+      kv.setID(F("mode"));
+      return kv;
+    }
+    case LabelType::FLASH_WRITE_COUNT:
+    {
+      KeyValueStruct kv(F("Flash Writes"), RTC.flashCounter);
+      return kv;
+    }
+    case LabelType::SKETCH_SIZE:
+    {
+      KeyValueStruct kv(F("Sketch Size"), getSketchSize() >> 10);
+      kv.setID(F("sketch_size"));
+      kv.setUnit(F("kB"));
+      return kv;
+    }
+    case LabelType::SKETCH_FREE:
+    {
+      KeyValueStruct kv(F("Sketch Free"), getFreeSketchSpace() >> 10);
+      kv.setID(F("sketch_free"));
+      kv.setUnit(F("kB"));
+      return kv;
+    }
+    #ifdef USE_LITTLEFS
+    case LabelType::FS_SIZE:
+    {
+      KeyValueStruct kv(F("Little FS Size"), SpiffsTotalBytes() >> 10);
+      kv.setID(F("fs_size"));
+      kv.setUnit(F("kB"));
+      return kv;
+    }
+    case LabelType::FS_FREE:
+    {
+      KeyValueStruct kv(F("Little FS Free"), SpiffsFreeSpace() >> 10);
+      kv.setID(F("fs_free"));
+      kv.setUnit(F("kB"));
+      return kv;
+    }
+    #else // ifdef USE_LITTLEFS
+    case LabelType::FS_SIZE:
+    {
+      KeyValueStruct kv(F("SPIFFS Size"), SpiffsTotalBytes() >> 10);
+      kv.setID(F("fs_size"));
+      kv.setUnit(F("kB"));
+      return kv;
+    }
+    case LabelType::FS_FREE:
+    {
+      KeyValueStruct kv(F("SPIFFS Free"), SpiffsFreeSpace() >> 10);
+      kv.setID(F("fs_free"));
+      kv.setUnit(F("kB"));
+      return kv;
+    }
+    #endif // ifdef USE_LITTLEFS
+    case LabelType::MAX_OTA_SKETCH_SIZE:
+    {
+      KeyValueStruct kv(F("Max. OTA Sketch Size") /*, value*/);
+      return kv;
+    }
+    case LabelType::OTA_2STEP:
+    {
+      KeyValueStruct kv(F("OTA 2-step Needed") /*, value*/);
+      return kv;
+    }
+    case LabelType::OTA_POSSIBLE:
+    {
+      KeyValueStruct kv(F("OTA possible") /*, value*/);
+      return kv;
+    }
+    #if FEATURE_INTERNAL_TEMPERATURE
+    case LabelType::INTERNAL_TEMPERATURE:
+    {
+      KeyValueStruct kv(F("Internal Temperature"), getInternalTemperature(), 1);
+      kv.setUnit(F("°C"));
+      return kv;
+    }
+    #endif // if FEATURE_INTERNAL_TEMPERATURE
 #if FEATURE_ETHERNET
-    case LabelType::ETH_IP_ADDRESS:         return formatIP(ESPEasy::net::NetworkLocalIP());
-    case LabelType::ETH_IP_SUBNET:          return formatIP(ESPEasy::net::NetworkSubnetMask());
-    case LabelType::ETH_IP_ADDRESS_SUBNET:  return strformat(
-                                                          F("%s / %s"),
-                                                          getValue(LabelType::ETH_IP_ADDRESS).c_str(),
-                                                          getValue(LabelType::ETH_IP_SUBNET).c_str());
-    case LabelType::ETH_IP_GATEWAY:         return formatIP(ESPEasy::net::NetworkGatewayIP());
-    case LabelType::ETH_IP_DNS:             return formatIP(ESPEasy::net::NetworkDnsIP(0));
-    case LabelType::ETH_MAC:                return ESPEasy::net::NetworkMacAddress().toString();
-    case LabelType::ETH_DUPLEX:             return ESPEasy::net::EthLinkUp() ? (ESPEasy::net::EthFullDuplex() ? F("Full Duplex") : F("Half Duplex")) : F("Link Down");
-    case LabelType::ETH_SPEED:              return getEthSpeed();
-    case LabelType::ETH_STATE:              return ESPEasy::net::EthLinkUp() ? F("Link Up") : F("Link Down");
-    case LabelType::ETH_SPEED_STATE:        return getEthLinkSpeedState();
-    case LabelType::ETH_CONNECTED:          return ESPEasy::net::eth::ETHConnected() ? F("CONNECTED") : F("DISCONNECTED"); // 0=disconnected, 1=connected
-    case LabelType::ETH_CHIP:               return toString(Settings.ETH_Phy_Type);
+    case LabelType::ETH_MAC:
+    {
+      KeyValueStruct kv(F("Eth MAC"), ESPEasy::net::NetworkMacAddress().toString());
+      return kv;
+    }
+    case LabelType::ETH_DUPLEX:
+    {
+      KeyValueStruct kv(F("Eth Mode"), ESPEasy::net::EthLinkUp() ?
+                        (ESPEasy::net::EthFullDuplex() ? F("Full Duplex") : F("Half Duplex")) : F("Link Down"));
+      kv.setID(F("ethduplex"));
+      return kv;
+    }
+    case LabelType::ETH_SPEED:
+    {
+      KeyValueStruct kv(F("Eth Speed"), getEthSpeed());
+      kv.setID(F("ethspeed"));
+      kv.setUnit(F("Mbps"));
+      return kv;
+    }
+    case LabelType::ETH_STATE:
+    {
+      KeyValueStruct kv(F("Eth State"), ESPEasy::net::EthLinkUp() ? F("Link Up") : F("Link Down"));
+      kv.setID(F("ethstate"));
+      return kv;
+    }
+    case LabelType::ETH_SPEED_STATE:
+    {
+      if (active_network_medium != ESPEasy::net::NetworkMedium_t::Ethernet) { break; }
+      KeyValueStruct kv(F("Eth Speed State"), getEthLinkSpeedState());
+      kv.setID(F("ethspeedstate"));
+      return kv;
+    }
+    case LabelType::ETH_CONNECTED:
+    {
+      KeyValueStruct kv(F("Eth connected"), ESPEasy::net::eth::ETHConnected() ? F("CONNECTED") : F("DISCONNECTED"));
+      kv.setID(F("ethconnected"));
+      return kv;
+    }
+    case LabelType::ETH_CHIP:
+    {
+      KeyValueStruct kv(F("Eth chip"), toString(Settings.ETH_Phy_Type));
+      kv.setID(F("ethchip"));
+      return kv;
+    }
 #endif // if FEATURE_ETHERNET
-# if FEATURE_ETHERNET || defined(USES_ESPEASY_NOW)
-    case LabelType::ETH_WIFI_MODE:          return toString(active_network_medium);
-#endif
-    case LabelType::SUNRISE:                return node_time.getSunriseTimeString(':');
-    case LabelType::SUNSET:                 return node_time.getSunsetTimeString(':');
-    case LabelType::SUNRISE_S:              retval = node_time.sunRise.tm_hour * 3600 + node_time.sunRise.tm_min * 60 + node_time.sunRise.tm_sec; break;
-    case LabelType::SUNSET_S:               retval = node_time.sunSet.tm_hour * 3600 + node_time.sunSet.tm_min * 60 + node_time.sunSet.tm_sec; break;
-    case LabelType::SUNRISE_M:              retval = node_time.sunRise.tm_hour * 60 + node_time.sunRise.tm_min; break;
-    case LabelType::SUNSET_M:               retval = node_time.sunSet.tm_hour * 60 + node_time.sunSet.tm_min; break;
-    case LabelType::ISNTP:                  return jsonBool(Settings.UseNTP());
-    case LabelType::UPTIME_MS:              return ull2String(getMicros64() / 1000);
-    case LabelType::TIMEZONE_OFFSET:        retval = Settings.TimeZone; break;
-    case LabelType::LATITUDE:               return toString(Settings.Latitude, 6);
-    case LabelType::LONGITUDE:              return toString(Settings.Longitude, 6);
+#if FEATURE_ETHERNET || defined(USES_ESPEASY_NOW)
+    case LabelType::ETH_WIFI_MODE:
+    {
+      KeyValueStruct kv(F("Network Type"), toString(active_network_medium));
+      kv.setID(F("ethwifimode"));
+      return kv;
+    }
+#endif // if FEATURE_ETHERNET || defined(USES_ESPEASY_NOW)
+    case LabelType::SUNRISE:
+    {
+      KeyValueStruct kv(F("Sunrise"), node_time.getSunriseTimeString(':'));
+      return kv;
+    }
+    case LabelType::SUNSET:
+    {
+      KeyValueStruct kv(F("Sunset"), node_time.getSunsetTimeString(':'));
+      return kv;
+    }
+    case LabelType::SUNRISE_S:
+    {
+      KeyValueStruct kv(F("Sunrise sec."), node_time.sunRise.tm_hour * 3600 + node_time.sunRise.tm_min * 60 +
+                        node_time.sunRise.tm_sec);
+      return kv;
+    }
+    case LabelType::SUNSET_S:
+    {
+      KeyValueStruct kv(F("Sunset sec."), node_time.sunSet.tm_hour * 3600 + node_time.sunSet.tm_min * 60 + node_time.sunSet.tm_sec);
+      return kv;
+    }
+    case LabelType::SUNRISE_M:
+    {
+      KeyValueStruct kv(F("Sunrise min."), node_time.sunRise.tm_hour * 60 + node_time.sunRise.tm_min);
+      return kv;
+    }
+    case LabelType::SUNSET_M:
+    {
+      KeyValueStruct kv(F("Sunset min."), node_time.sunSet.tm_hour * 60 + node_time.sunSet.tm_min);
+      return kv;
+    }
+    case LabelType::ISNTP:
+    {
+      KeyValueStruct kv(F("Use NTP"), Settings.UseNTP());
+      return kv;
+    }
+    case LabelType::UPTIME_MS:
+    {
+      KeyValueStruct kv(F("Uptime (ms)"), getMicros64() / 1000);
+      return kv;
+    }
+    case LabelType::TIMEZONE_OFFSET:
+    {
+      KeyValueStruct kv(F("Timezone Offset"), Settings.TimeZone);
+      return kv;
+    }
+    case LabelType::LATITUDE:
+    {
+      KeyValueStruct kv(F("Latitude"), Settings.Latitude, 6);
+      return kv;
+    }
+    case LabelType::LONGITUDE:
+    {
+      KeyValueStruct kv(F("Longitude"), Settings.Longitude, 6);
+      return kv;
+    }
 
     case LabelType::MAX_LABEL:
       break;
   }
-  if (retval != INT_MAX) return String(retval);
-  return F("MissingString");
+  return KeyValueStruct();
+}
+
+String getInternalLabel(LabelType::Enum label, char replaceSpace) {
+  auto kv = getKeyValue(label);
+
+  return kv.getID();
+}
+
+String getLabel(LabelType::Enum label) {
+  auto kv = getKeyValue(label);
+
+  if (kv._key.isEmpty()) {
+    return F("MissingString");
+  }
+  return kv._key;
+}
+
+String getValue(LabelType::Enum label) {
+  auto kv = getKeyValue(label);
+
+  if (kv._values.size() && kv._values[0]) { return kv._values[0]->toString(); }
+  return EMPTY_STRING;
 }
 
 #if FEATURE_ETHERNET
+
 String getEthSpeed() {
   if (ESPEasy::net::EthLinkUp()) {
     return strformat(F("%d [Mbps]"), ESPEasy::net::EthLinkSpeed());
@@ -662,10 +1152,10 @@ String getEthSpeed() {
 
 String getEthLinkSpeedState() {
   if (ESPEasy::net::EthLinkUp()) {
-    return strformat(F("%s %s %s"), 
-    getValue(LabelType::ETH_STATE).c_str(), 
-    getValue(LabelType::ETH_DUPLEX).c_str(), 
-    getEthSpeed().c_str());
+    return strformat(F("%s %s %s"),
+                     getValue(LabelType::ETH_STATE).c_str(),
+                     getValue(LabelType::ETH_DUPLEX).c_str(),
+                     getEthSpeed().c_str());
   }
   return getValue(LabelType::ETH_STATE);
 }
@@ -692,34 +1182,35 @@ String getFormNote(LabelType::Enum label)
   // Otherwise lots of calls to String() constructor are included.
   const __FlashStringHelper *flash_str = F("");
 
-  switch (label) {
+  switch (label)
+  {
 #ifndef MINIMAL_OTA
     case LabelType::CONNECT_HIDDEN_SSID:
       flash_str = F("Must be checked to connect to a hidden SSID");
       break;
-#ifdef ESP32
+# ifdef ESP32
     case LabelType::WIFI_PASSIVE_SCAN:
       flash_str = F("Passive scan listens for WiFi beacons, Active scan probes for AP. Passive scan is typically faster.");
       break;
-#endif // ifdef ESP32
+# endif // ifdef ESP32
     case LabelType::HIDDEN_SSID_SLOW_CONNECT:
       flash_str = F("Required for some AP brands like Mikrotik to connect to hidden SSID");
       break;
-#if FEATURE_USE_IPV6
+# if FEATURE_USE_IPV6
     case LabelType::ENABLE_IPV6:
       flash_str = F("Toggling IPv6 requires reboot");
       break;
-#endif // if FEATURE_USE_IPV6
-#ifndef NO_HTTP_UPDATER
+# endif // if FEATURE_USE_IPV6
+# ifndef NO_HTTP_UPDATER
     case LabelType::ALLOW_OTA_UNLIMITED:
       flash_str = F("When enabled, OTA updating can overwrite the filesystem and settings!
    Requires reboot to activate");
       break;
-#endif // ifndef NO_HTTP_UPDATER
-#if FEATURE_RULES_EASY_COLOR_CODE
+# endif // ifndef NO_HTTP_UPDATER
+# if FEATURE_RULES_EASY_COLOR_CODE
     case LabelType::DISABLE_RULES_AUTOCOMPLETE:
       flash_str = F("Also disables Rules syntax highlighting!");
       break;
-#endif // if FEATURE_RULES_EASY_COLOR_CODE
+# endif // if FEATURE_RULES_EASY_COLOR_CODE
 
     case LabelType::FORCE_WIFI_NOSLEEP:
       flash_str = F("Change WiFi sleep settings requires reboot to activate");
@@ -732,13 +1223,13 @@ String getFormNote(LabelType::Enum label)
     case LabelType::WIFI_NR_EXTRA_SCANS:
       flash_str = F("Number of extra times to scan all channels to have higher chance of finding the desired AP");
       break;
-#ifndef ESP32
+# ifndef ESP32
     case LabelType::WAIT_WIFI_CONNECT:
       flash_str = F("Wait for 1000 msec right after connecting to WiFi.
    May improve success on some APs like Fritz!Box");
       break;
-#endif
+# endif // ifndef ESP32
 
-#endif
+#endif // ifndef MINIMAL_OTA
 
 #if FEATURE_SET_WIFI_TX_PWR
     case LabelType::WIFI_TX_MAX_PWR:
@@ -746,6 +1237,7 @@ String getFormNote(LabelType::Enum label)
     {
       float maxTXpwr;
       float sensitivity = ESPEasy::net::wifi::GetRSSIthreshold(maxTXpwr);
+
       if (LabelType::WIFI_TX_MAX_PWR == label) {
         return strformat(
           F("Current max: %.2f dBm"), maxTXpwr);
@@ -763,87 +1255,9 @@ String getFormNote(LabelType::Enum label)
   return flash_str;
 }
 
-
 String getFormUnit(LabelType::Enum label)
 {
-    const __FlashStringHelper *flash_str = F("");
+  auto kv = getKeyValue(label);
 
-  switch (label) {
-#if FEATURE_SET_WIFI_TX_PWR
-    case LabelType::WIFI_TX_MAX_PWR:
-    case LabelType::WIFI_CUR_TX_PWR:
-    case LabelType::WIFI_RSSI:
-      flash_str = F("dBm");
-      break;
-    case LabelType::WIFI_SENS_MARGIN:
-      flash_str = F("dB");
-      break;
-#endif
-    case LabelType::TIME_WANDER:
-      flash_str = F("ppm");
-      break;
-#ifdef ESP32
-    case LabelType::HEAP_SIZE:
-    case LabelType::HEAP_MIN_FREE:
-    #ifdef BOARD_HAS_PSRAM
-    case LabelType::PSRAM_SIZE:
-    case LabelType::PSRAM_FREE:
-    case LabelType::PSRAM_MIN_FREE:
-    case LabelType::PSRAM_MAX_FREE_BLOCK:
-    #endif // BOARD_HAS_PSRAM
-#endif // ifdef ESP32
-    case LabelType::FREE_MEM:
-    case LabelType::FREE_STACK:
-#ifdef USE_SECOND_HEAP
-    case LabelType::FREE_HEAP_IRAM:
-#endif
-#if defined(CORE_POST_2_5_0) || defined(ESP32)
-  #ifndef LIMIT_BUILD_SIZE
-    case LabelType::HEAP_MAX_FREE_BLOCK:
-  #endif
-#endif // if defined(CORE_POST_2_5_0) || defined(ESP32)
-
-      flash_str = F("byte");
-      break;
-    case LabelType::FLASH_CHIP_REAL_SIZE:
-    case LabelType::FLASH_IDE_SIZE:
-      flash_str = F("kB");
-      break;
-/*
-    case LabelType::UPTIME:
-      flash_str = F("min");
-      break;
-*/
-    case LabelType::LOAD_PCT:
-#if defined(CORE_POST_2_5_0)
-  #ifndef LIMIT_BUILD_SIZE
-    case LabelType::HEAP_FRAGMENTATION:
-  #endif
-#endif // if defined(CORE_POST_2_5_0)
-
-      flash_str = F("%");
-      break;
-
-    case LabelType::ESP_CHIP_FREQ:
-#ifdef ESP32
-    case LabelType::ESP_CHIP_XTAL_FREQ:
-    case LabelType::ESP_CHIP_APB_FREQ:
-#endif
-    case LabelType::FLASH_CHIP_SPEED:
-    case LabelType::FLASH_IDE_SPEED:
-      flash_str = F("MHz");
-      break;
-#if FEATURE_INTERNAL_TEMPERATURE
-    case LabelType::INTERNAL_TEMPERATURE:
-      flash_str = F("°C");
-      break;
-#endif // if FEATURE_INTERNAL_TEMPERATURE
-
-
-
-    default:
-      return EMPTY_STRING;
-  }
-
-  return flash_str;
-}
\ No newline at end of file
+  return kv._unit;
+}
diff --git a/src/src/Helpers/StringProvider.h b/src/src/Helpers/StringProvider.h
index bddc53660..979cd89d5 100644
--- a/src/src/Helpers/StringProvider.h
+++ b/src/src/Helpers/StringProvider.h
@@ -3,6 +3,10 @@
 
 #include "../../ESPEasy_common.h"
 
+#include "../DataStructs/KeyValueStruct.h"
+
+struct KeyValueStruct;
+
 struct LabelType {
   enum Enum : uint8_t {
     UNIT_NR,
@@ -110,8 +114,6 @@ struct LabelType {
     WIFI_CONNECTION,         // 802.11G
     WIFI_RSSI,               // -67
     IP_CONFIG,               // DHCP
-    IP_CONFIG_STATIC,
-    IP_CONFIG_DYNAMIC,
     IP_ADDRESS,              // 192.168.1.123
     IP_SUBNET,               // 255.255.255.0
     IP_ADDRESS_SUBNET,       // 192.168.1.123 / 255.255.255.0
@@ -221,14 +223,6 @@ struct LabelType {
     INTERNAL_TEMPERATURE,
     #endif // if FEATURE_INTERNAL_TEMPERATURE
 #if FEATURE_ETHERNET
-    ETH_IP_ADDRESS,
-    ETH_IP_SUBNET,
-    ETH_IP_ADDRESS_SUBNET,
-    ETH_IP_GATEWAY,
-    ETH_IP_DNS,
-#if FEATURE_USE_IPV6
-    ETH_IP6_LOCAL,
-#endif
     ETH_MAC,
     ETH_DUPLEX,
     ETH_SPEED,
@@ -266,12 +260,14 @@ String getEthLinkSpeedState();
 
 String getInternalLabel(LabelType::Enum label,
                         char            replaceSpace = '_');
-const __FlashStringHelper * getLabel(LabelType::Enum label);
+String getLabel(LabelType::Enum label);
 String getValue(LabelType::Enum label);
 String getExtendedValue(LabelType::Enum label);
 
 String getFormNote(LabelType::Enum label);
 String getFormUnit(LabelType::Enum label);
 
+KeyValueStruct getKeyValue(LabelType::Enum label, bool extendedValue = false);
+
 
 #endif // STRING_PROVIDER_TYPES_H
diff --git a/src/src/Helpers/ValueStruct_Factory.cpp b/src/src/Helpers/ValueStruct_Factory.cpp
index dffc82d33..e5c3040b8 100644
--- a/src/src/Helpers/ValueStruct_Factory.cpp
+++ b/src/src/Helpers/ValueStruct_Factory.cpp
@@ -96,16 +96,6 @@ Up_ValueStruct ValueStruct_Factory::create(
   // return std::make_unique(val, nrDecimals, trimTrailingZeros);
 }
 
-Up_ValueStruct ValueStruct_Factory::create(
-  LabelType::Enum label)
-{
-  std::unique_ptr child(new (std::nothrow) ValueStruct_String(getValue(label)));
-
-  return std::move(child);
-
-  // return std::make_unique(getValue(label));
-}
-
 Up_ValueStruct ValueStruct_Factory::create(
   const String& val)
 {
diff --git a/src/src/Helpers/ValueStruct_Factory.h b/src/src/Helpers/ValueStruct_Factory.h
index a8cfe1620..3281dc19b 100644
--- a/src/src/Helpers/ValueStruct_Factory.h
+++ b/src/src/Helpers/ValueStruct_Factory.h
@@ -30,9 +30,6 @@ public:
                                int           nrDecimals        = 4,
                                bool          trimTrailingZeros = false);
 
-  static Up_ValueStruct create(
-    LabelType::Enum label);
-
   static Up_ValueStruct create(
     const String         & val);
 
diff --git a/src/src/WebServer/JSON.cpp b/src/src/WebServer/JSON.cpp
index dc8d87581..c2de9708a 100644
--- a/src/src/WebServer/JSON.cpp
+++ b/src/src/WebServer/JSON.cpp
@@ -166,8 +166,15 @@ void handle_json()
 
           if (wdcounter > 0)
           {
-            writer->write(LabelType::LOAD_PCT);
-            writer->write(LabelType::LOOP_COUNT);
+            static const LabelType::Enum wdlabels[] PROGMEM =
+            {
+              LabelType::LOAD_PCT, 
+              LabelType::LOOP_COUNT,
+
+              LabelType::MAX_LABEL
+            };
+            writer->writeLabels(wdlabels);
+
           }
 
 
diff --git a/src/src/WebServer/KeyValueWriter_WebForm.cpp b/src/src/WebServer/KeyValueWriter_WebForm.cpp
index 3ed12bdef..51248e310 100644
--- a/src/src/WebServer/KeyValueWriter_WebForm.cpp
+++ b/src/src/WebServer/KeyValueWriter_WebForm.cpp
@@ -79,7 +79,7 @@ void KeyValueWriter_WebForm::write(const KeyValueStruct& kv)
   if (!summary_value_only) {
     if (format_note) { addRowLabel_tr_id(EMPTY_STRING, EMPTY_STRING); }
     else {
-      addRowLabel(kv._key, kv._id);
+      addRowLabel(kv._key, kv.__id);
     }
   }
 
diff --git a/src/src/WebServer/Markup.cpp b/src/src/WebServer/Markup.cpp
index 96b699e0a..222496c18 100644
--- a/src/src/WebServer/Markup.cpp
+++ b/src/src/WebServer/Markup.cpp
@@ -2,6 +2,7 @@
 #include "../WebServer/Markup.h"
 
 #include "../WebServer/HTML_wrappers.h"
+#include "../WebServer/KeyValueWriter_WebForm.h"
 #include "../WebServer/Markup_Forms.h"
 
 #include "../CustomBuild/ESPEasyLimits.h"
@@ -588,18 +589,9 @@ void addRowLabelValue(LabelType::Enum label) {
 }
 
 void addRowLabelValues(const LabelType::Enum labels[]) {
-  size_t i = 0;
-  LabelType::Enum cur  = static_cast(pgm_read_byte(labels + i));
 
-  while (true) {
-    const LabelType::Enum next = static_cast(pgm_read_byte(labels + i + 1));
-    addRowLabelValue(cur);
-    if (next == LabelType::MAX_LABEL) {
-      return;
-    }
-    ++i;
-    cur = next;
-  }
+  KeyValueWriter_WebForm writer(true);
+  writer.writeLabels(labels, true);
 }
 
 void addRowLabelValue_copy(LabelType::Enum label) {
diff --git a/src/src/WebServer/RootPage.cpp b/src/src/WebServer/RootPage.cpp
index 06878a451..2d71d7980 100644
--- a/src/src/WebServer/RootPage.cpp
+++ b/src/src/WebServer/RootPage.cpp
@@ -15,7 +15,7 @@
 # include "../Globals/ESPEasy_time.h"
 # include "../../ESPEasy/net/Globals/ESPEasyWiFiEvent.h"
 # include "../Globals/MainLoopCommand.h"
-#include "../../ESPEasy/net/Globals/NetworkState.h"
+# include "../../ESPEasy/net/Globals/NetworkState.h"
 # include "../Globals/Nodes.h"
 # include "../Globals/Settings.h"
 # include "../Globals/Statistics.h"
@@ -54,7 +54,6 @@
   #  define MAIN_PAGE_SHOW_NODE_LIST_TYPE    true
 # endif // ifndef MAIN_PAGE_SHOW_NODE_LIST_TYPE
 
-
 // ********************************************************************************
 // Web Interface root page
 // ********************************************************************************
@@ -108,29 +107,29 @@ void handle_root() {
   // disconnect here could result into a crash/reboot...
   if (strcasecmp_P(sCommand.c_str(), PSTR("wifidisconnect")) == 0)
   {
-    #ifndef LIMIT_BUILD_SIZE
+    # ifndef LIMIT_BUILD_SIZE
     addLog(LOG_LEVEL_INFO, F("WIFI : Disconnecting..."));
-    #endif
+    # endif
     cmd_within_mainloop = CMD_WIFI_DISCONNECT;
     addHtml(F("OK"));
   } else if (strcasecmp_P(sCommand.c_str(), PSTR("reboot")) == 0)
   {
-    #ifndef LIMIT_BUILD_SIZE
+    # ifndef LIMIT_BUILD_SIZE
     addLog(LOG_LEVEL_INFO, F("     : Rebooting..."));
-    #endif
+    # endif
     cmd_within_mainloop = CMD_REBOOT;
     addHtml(F("OK"));
   } else if (strcasecmp_P(sCommand.c_str(), PSTR("reset")) == 0)
   {
     if (loggedIn) {
-      #ifndef LIMIT_BUILD_SIZE
+      # ifndef LIMIT_BUILD_SIZE
       addLog(LOG_LEVEL_INFO, F("     : factory reset..."));
-      #endif
+      # endif
       cmd_within_mainloop = CMD_REBOOT;
       addHtml(F(
                 "OK. Please wait > 1 min and connect to Access point.

    PW=configesp
    URL=192.168.4.1"));
       TXBuffer.endStream();
-      ExecuteCommand_internal({EventValueSource::Enum::VALUE_SOURCE_HTTP, sCommand.c_str()}, true);
+      ExecuteCommand_internal({ EventValueSource::Enum::VALUE_SOURCE_HTTP, sCommand.c_str() }, true);
       return;
     }
   } else {
@@ -144,110 +143,52 @@ void handle_root() {
     html_table_class_normal();
     addFormHeader(F("System Info"));
 
-    addRowLabelValue(LabelType::UNIT_NR);
-    addRowLabelValue(LabelType::GIT_BUILD);
-    addRowLabel(LabelType::LOCAL_TIME);
+    static const LabelType::Enum labels[] PROGMEM =
+    {
 
-    if (node_time.systemTimePresent())
-    {
-      addHtml(getValue(LabelType::LOCAL_TIME));
-    }
-    else {
-      addHtml(F("No system time source"));
-    }
-    addRowLabelValue(LabelType::TIME_SOURCE);
+      LabelType::UNIT_NR,
+      LabelType::GIT_BUILD,
+      LabelType::LOCAL_TIME,
+      LabelType::TIME_SOURCE,
 
-    addRowLabel(LabelType::UPTIME);
-    {
-      addHtml(getExtendedValue(LabelType::UPTIME));
-    }
-    addRowLabel(LabelType::LOAD_PCT);
+      LabelType::UPTIME,
+      LabelType::LOAD_PCT,
 
-    if (wdcounter > 0)
-    {
-      addHtml(strformat(
-        F("%.2f [%%] (LC=%d)"),
-        getCPUload(),
-        getLoopCountPerSec()));
-    }
-
-#if FEATURE_INTERNAL_TEMPERATURE
-    addRowLabelValue(LabelType::INTERNAL_TEMPERATURE);
-#endif
-    {
-      addRowLabel(LabelType::FREE_MEM);
-      addHtmlInt(freeMem);
-      addUnit(getFormUnit(LabelType::FREE_MEM));
-# ifndef BUILD_NO_RAM_TRACKER
-      addHtml(strformat(
-        F(" (%d - %s)"),
-        lowestRAM,
-        lowestRAMfunction.c_str()));
-# endif // ifndef BUILD_NO_RAM_TRACKER
-    }
-    {
+# if FEATURE_INTERNAL_TEMPERATURE
+      LabelType::INTERNAL_TEMPERATURE,
+# endif
+      LabelType::FREE_MEM,
 # ifdef USE_SECOND_HEAP
-      addRowLabelValue(LabelType::FREE_HEAP_IRAM);
+      LabelType::FREE_HEAP_IRAM,
 # endif // ifdef USE_SECOND_HEAP
-    }
-    {
-      addRowLabel(LabelType::FREE_STACK);
-      addHtmlInt(getCurrentFreeStack());
-      addUnit(getFormUnit(LabelType::FREE_STACK));
-# ifndef BUILD_NO_RAM_TRACKER
-      addHtml(strformat(
-        F(" (%d - %s)"),
-        lowestFreeStack,
-        lowestFreeStackfunction.c_str()));
-# endif // ifndef BUILD_NO_RAM_TRACKER
-    }
+      LabelType::FREE_STACK,
 
   # if FEATURE_ETHERNET
-    addRowLabelValue(LabelType::ETH_WIFI_MODE);
+      LabelType::ETH_WIFI_MODE,
   # endif // if FEATURE_ETHERNET
 
-    if (ESPEasy::net::NetworkConnected())
-    {
-      addRowLabelValue(LabelType::IP_ADDRESS);
-#if FEATURE_USE_IPV6
-      if (Settings.EnableIPv6()) {
-        addRowLabelValue(LabelType::IP6_LOCAL);
-        // Do not show global IPv6 on the root page
-      }
-#endif
-      addRowLabel(LabelType::WIFI_RSSI);
-      addHtml(strformat(
-        F("%d [dBm] (%s)"),
-        WiFi.RSSI(),
-        WiFi.SSID().c_str()));
-    }
+      LabelType::IP_ADDRESS,
+# if FEATURE_USE_IPV6
+      LabelType::IP6_LOCAL,
+
+      // Do not show global IPv6 on the root page
+
+# endif // if FEATURE_USE_IPV6
+      LabelType::WIFI_RSSI,
 
   # if FEATURE_ETHERNET
+      LabelType::ETH_SPEED_STATE,
 
-    if (active_network_medium == ESPEasy::net::NetworkMedium_t::Ethernet) {
-      addRowLabelValue(LabelType::ETH_SPEED_STATE);
-      addRowLabelValue(LabelType::ETH_IP_ADDRESS);
-#if FEATURE_USE_IPV6
-      if (Settings.EnableIPv6()) {
-        addRowLabelValue(LabelType::ETH_IP6_LOCAL);
-        // Do not show global IPv6 on the root page
-      }
-#endif
-    }
   # endif // if FEATURE_ETHERNET
 
       # if FEATURE_MDNS
-    {
-      addRowLabel(LabelType::M_DNS);
-      addHtml(F(""));
-      addHtml(url);
-      addHtml(F(""));
-    }
+      LabelType::M_DNS,
       # endif // if FEATURE_MDNS
 
+      LabelType::MAX_LABEL
+    };
+    addRowLabelValues(labels);
+
     # if FEATURE_MQTT
     {
       if (validControllerIndex(firstEnabledMQTT_ControllerIndex())) {
@@ -353,33 +294,36 @@ void handle_root() {
         }
 
         if (it->second.ip[0] != 0
-#if FEATURE_USE_IPV6
+#  if FEATURE_USE_IPV6
             || (Settings.EnableIPv6() &&
-                (it->second.hasIPv6_mac_based_link_local || 
+                (it->second.hasIPv6_mac_based_link_local ||
                  it->second.hasIPv6_mac_based_link_global)
-               )
-#endif
-        )
+                )
+#  endif // if FEATURE_USE_IPV6
+            )
         {
-          IPAddress ip = it->second.IP();
+          IPAddress ip        = it->second.IP();
           const uint16_t port = it->second.webgui_portnumber;
 
-#if FEATURE_USE_IPV6
+#  if FEATURE_USE_IPV6
           bool isIPv6 = false;
+
           if (Settings.EnableIPv6()) {
             if (it->second.hasIPv6_mac_based_link_local) {
-              ip = it->second.IPv6_link_local(true);
+              ip     = it->second.IPv6_link_local(true);
               isIPv6 = true;
             } else if (it->second.hasIPv6_mac_based_link_global) {
-              ip = it->second.IPv6_global();
+              ip     = it->second.IPv6_global();
               isIPv6 = true;
             }
           }
+
           if (it->second.hasIPv4 && it->second.hasIPv6()) {
             // Add 2 buttons for IPv4 and IPv6 address
             html_add_wide_button_prefix();
             addHtml(F("http://"));
             addHtml(wrap_String(formatIP(ip), '[', ']'));
+
             if ((port != 0) && (port != 80)) {
               addHtml(':');
               addHtmlInt(port);
@@ -391,27 +335,27 @@ void handle_root() {
             // Now prepare 2nd button prefix
             addHtml(F("
    "));
             html_add_wide_button_prefix();
-            ip = it->second.IP();
+            ip     = it->second.IP();
             isIPv6 = false;
           } else {
             // Add single wide button
             html_add_wide_button_prefix();
           }
-#else
+#  else // if FEATURE_USE_IPV6
           html_add_wide_button_prefix();
-#endif
+#  endif // if FEATURE_USE_IPV6
           addHtml(F("http://"));
-#if FEATURE_USE_IPV6
+#  if FEATURE_USE_IPV6
 
           if (isIPv6) {
             addHtml(wrap_String(formatIP(ip), '[', ']'));
           } else {
             addHtml(formatIP(ip));
           }
-          #else
+          #  else // if FEATURE_USE_IPV6
           addHtml(formatIP(ip));
-          #endif
-          
+          #  endif // if FEATURE_USE_IPV6
+
           if ((port != 0) && (port != 80)) {
             addHtml(':');
             addHtmlInt(port);
@@ -468,7 +412,7 @@ void handle_root() {
     html_end_form();
 
     free_string(printWebString);
-    printToWeb     = false;
+    printToWeb = false;
     sendHeadandTail_stdtemplate(_TAIL);
   }
   TXBuffer.endStream();
diff --git a/src/src/WebServer/SysInfoPage.cpp b/src/src/WebServer/SysInfoPage.cpp
index aae0fe542..826eb544c 100644
--- a/src/src/WebServer/SysInfoPage.cpp
+++ b/src/src/WebServer/SysInfoPage.cpp
@@ -117,7 +117,7 @@ void handle_sysinfo_json() {
       if (writer) {
         writer->write({ F("type"), toString(ESPEasy::net::wifi::getConnectionProtocol()) });
         writer->write({ F("rssi"), WiFi.RSSI() });
-        writer->write({ F("dhcp"), useStaticIP() ? LabelType::IP_CONFIG_STATIC : LabelType::IP_CONFIG_DYNAMIC });
+        writer->write({ F("dhcp"), useStaticIP() ? F("static") : F("DHCP") });
         writer->write({ F("ip"),   LabelType::IP_ADDRESS });
 #  if FEATURE_USE_IPV6
 
@@ -158,12 +158,6 @@ void handle_sysinfo_json() {
         writer->write({ F("ethspeed"),      LabelType::ETH_SPEED });
         writer->write({ F("ethstate"),      LabelType::ETH_STATE });
         writer->write({ F("ethspeedstate"), LabelType::ETH_SPEED_STATE });
-#   if FEATURE_USE_IPV6
-
-        if (Settings.EnableIPv6()) {
-          writer->write({ F("ethipv6local"), LabelType::ETH_IP6_LOCAL });
-        }
-#   endif // if FEATURE_USE_IPV6
       }
 #  endif // if FEATURE_ETHERNET
     }
@@ -454,9 +448,6 @@ void handle_sysinfo_Ethernet() {
       LabelType::ETH_DUPLEX,
       LabelType::ETH_MAC,
 
-      //    LabelType::ETH_IP_ADDRESS_SUBNET,
-      //    LabelType::ETH_IP_GATEWAY,
-      //    LabelType::ETH_IP_DNS,
 
       LabelType::MAX_LABEL
     };

From b4d3c60ff73b0ee22be75b473ed44c7822795da1 Mon Sep 17 00:00:00 2001
From: TD-er 
Date: Fri, 17 Oct 2025 22:37:55 +0200
Subject: [PATCH 387/564] [ESP8266] Fix build issues due to older compiler for
 ESP8266 2.7.4

---
 src/src/DataStructs/KeyValueStruct.cpp  | 24 ++++++++++-----------
 src/src/DataStructs/KeyValueStruct.h    |  4 ++--
 src/src/DataStructs/LogEntry.cpp        |  3 +++
 src/src/DataStructs/PluginStats_array.h |  1 +
 src/src/Globals/Statistics.cpp          | 28 ++++++++++++-------------
 src/src/Globals/Statistics.h            | 18 ++++++++--------
 src/src/Helpers/Memory.cpp              |  8 +++----
 src/src/Helpers/Memory.h                |  6 +++---
 src/src/Helpers/ValueStruct_Factory.cpp |  4 ++--
 src/src/Helpers/ValueStruct_Factory.h   |  8 +++----
 src/src/WebServer/Chart_JS.cpp          |  6 ++++--
 src/src/WebServer/Chart_JS.h            |  7 +++----
 src/src/WebServer/JSON.cpp              |  2 +-
 src/src/WebServer/RootPage.cpp          |  2 --
 tools/pio/pre_custom_esp82xx.py         |  4 ++--
 15 files changed, 64 insertions(+), 61 deletions(-)

diff --git a/src/src/DataStructs/KeyValueStruct.cpp b/src/src/DataStructs/KeyValueStruct.cpp
index a7affa566..ee943b2ba 100644
--- a/src/src/DataStructs/KeyValueStruct.cpp
+++ b/src/src/DataStructs/KeyValueStruct.cpp
@@ -68,7 +68,7 @@ KeyValueStruct::KeyValueStruct(const String & key,
 
 KeyValueStruct::KeyValueStruct(const String& key,
                                const float & val,
-                               int           nrDecimals,
+                               uint8_t       nrDecimals,
                                Format        format)
   : _key(key), _format(format) {
   _values.emplace_back(ValueStruct_Factory::create(val, nrDecimals));
@@ -76,7 +76,7 @@ KeyValueStruct::KeyValueStruct(const String& key,
 
 KeyValueStruct::KeyValueStruct(const String& key,
                                const double& val,
-                               int           nrDecimals,
+                               uint8_t       nrDecimals,
                                Format        format)
   : _key(key), _format(format) {
   _values.emplace_back(ValueStruct_Factory::create(val, nrDecimals));
@@ -110,9 +110,9 @@ KeyValueStruct::KeyValueStruct(const __FlashStringHelper *key,
   _values.emplace_back(ValueStruct_Factory::create(String(val)));
 }
 
-KeyValueStruct::KeyValueStruct(const String         & key,
-                               const String         & val,
-                               Format                 format)
+KeyValueStruct::KeyValueStruct(const String& key,
+                               const String& val,
+                               Format        format)
   : _key(key), _format(format) {
   _values.emplace_back(ValueStruct_Factory::create(val));
 }
@@ -124,9 +124,9 @@ KeyValueStruct::KeyValueStruct(const __FlashStringHelper *key,
   _values.emplace_back(ValueStruct_Factory::create(std::move(val)));
 }
 
-KeyValueStruct::KeyValueStruct(const String         & key,
-                               String              && val,
-                               Format                 format)
+KeyValueStruct::KeyValueStruct(const String& key,
+                               String     && val,
+                               Format        format)
   : _key(key), _format(format) {
   _values.emplace_back(ValueStruct_Factory::create(std::move(val)));
 }
@@ -135,9 +135,9 @@ void KeyValueStruct::setUnit(const String& unit)              { _unit = unit; }
 
 void KeyValueStruct::setUnit(const __FlashStringHelper *unit) { _unit = unit; }
 
-void KeyValueStruct::setID(const String& id) { __id = id; }
-void KeyValueStruct::setID(const __FlashStringHelper *id) { __id = id; }
+void KeyValueStruct::setID(const String& id)                  { __id = id; }
 
+void KeyValueStruct::setID(const __FlashStringHelper *id)     { __id = id; }
 
 void KeyValueStruct::appendValue(Up_ValueStruct value)
 {
@@ -159,6 +159,6 @@ void KeyValueStruct::appendValue(String&& value)
 
 String KeyValueStruct::getID() const
 {
-  if (__id.isEmpty()) return to_internal_string(_key, '_');
+  if (__id.isEmpty()) { return to_internal_string(_key, '_'); }
   return __id;
-}
\ No newline at end of file
+}
diff --git a/src/src/DataStructs/KeyValueStruct.h b/src/src/DataStructs/KeyValueStruct.h
index 486f3aec0..f93913b17 100644
--- a/src/src/DataStructs/KeyValueStruct.h
+++ b/src/src/DataStructs/KeyValueStruct.h
@@ -58,12 +58,12 @@ struct KeyValueStruct
 
   KeyValueStruct(const String         & key,
                  const float          & val,
-                 int                    nrDecimals = 4,
+                 uint8_t                    nrDecimals = 4,
                  Format                 format     = Format::Default);
 
   KeyValueStruct(const String         & key,
                  const double         & val,
-                 int                    nrDecimals = 4,
+                 uint8_t                    nrDecimals = 4,
                  Format                 format     = Format::Default);
 
 
diff --git a/src/src/DataStructs/LogEntry.cpp b/src/src/DataStructs/LogEntry.cpp
index 602a621c4..d766b8c2f 100644
--- a/src/src/DataStructs/LogEntry.cpp
+++ b/src/src/DataStructs/LogEntry.cpp
@@ -172,6 +172,9 @@ String LogEntry_t::getMessage() const
 {
   if (_message == nullptr) { return EMPTY_STRING; }
 
+  if (_isFlashString) {
+    return String((const __FlashStringHelper *)_message);
+  }
   return String((const char *)_message);
 }
 
diff --git a/src/src/DataStructs/PluginStats_array.h b/src/src/DataStructs/PluginStats_array.h
index 89fad885c..4212b8b70 100644
--- a/src/src/DataStructs/PluginStats_array.h
+++ b/src/src/DataStructs/PluginStats_array.h
@@ -16,6 +16,7 @@
 #  include "../WebServer/Chart_JS_title.h"
 # endif // if FEATURE_CHART_JS
 
+struct PluginStats_Config_t;
 
 class PluginStats_array
 {
diff --git a/src/src/Globals/Statistics.cpp b/src/src/Globals/Statistics.cpp
index 1dee64440..6833b752b 100644
--- a/src/src/Globals/Statistics.cpp
+++ b/src/src/Globals/Statistics.cpp
@@ -11,24 +11,24 @@ String   lowestFreeStackfunction;
 uint8_t lastBootCause                           = BOOT_CAUSE_MANUAL_REBOOT;
 SchedulerTimerID lastMixedSchedulerId_beforereboot(0);
 
-unsigned long idle_msec_per_sec = 0;
-unsigned long elapsed10ps       = 0;
-unsigned long elapsed10psU      = 0;
-unsigned long elapsed50ps       = 0;
-unsigned long loopCounter       = 0;
-unsigned long loopCounterLast   = 0;
-unsigned long loopCounterMax    = 1;
-uint32_t      lastLoopStart     = 0;
-unsigned long shortestLoop      = 10000000;
-unsigned long longestLoop       = 0;
-unsigned long loopCounter_full  = 1;
+uint32_t idle_msec_per_sec = 0;
+uint32_t elapsed10ps       = 0;
+uint32_t elapsed10psU      = 0;
+uint32_t elapsed50ps       = 0;
+uint32_t loopCounter       = 0;
+uint32_t loopCounterLast   = 0;
+uint32_t loopCounterMax    = 1;
+uint32_t lastLoopStart     = 0;
+uint32_t shortestLoop      = 10000000;
+uint32_t longestLoop       = 0;
+uint32_t loopCounter_full  = 1;
 float loop_usec_duration_total  = 0.0f;
 
 
-unsigned long dailyResetCounter                   = 0;
+uint32_t dailyResetCounter                   = 0;
 
-ESPEASY_VOLATILE(unsigned long) sw_watchdog_callback_count{};
+ESPEASY_VOLATILE(uint32_t) sw_watchdog_callback_count{};
 
 
 I2C_bus_state I2C_state = I2C_bus_state::OK;
-unsigned long I2C_bus_cleared_count = 0;
+uint32_t I2C_bus_cleared_count = 0;
diff --git a/src/src/Globals/Statistics.h b/src/src/Globals/Statistics.h
index 1cb45dabb..e848eecf1 100644
--- a/src/src/Globals/Statistics.h
+++ b/src/src/Globals/Statistics.h
@@ -32,21 +32,21 @@ extern String   lowestFreeStackfunction;
 extern uint8_t lastBootCause;
 extern SchedulerTimerID lastMixedSchedulerId_beforereboot;
 
-extern unsigned long loopCounter;
-extern unsigned long loopCounterLast;
-extern unsigned long loopCounterMax;
+extern uint32_t loopCounter;
+extern uint32_t loopCounterLast;
+extern uint32_t loopCounterMax;
 extern uint32_t lastLoopStart;
-extern unsigned long shortestLoop;
-extern unsigned long longestLoop;
-extern unsigned long loopCounter_full;
+extern uint32_t shortestLoop;
+extern uint32_t longestLoop;
+extern uint32_t loopCounter_full;
 extern float loop_usec_duration_total;
 
-extern unsigned long dailyResetCounter;
-extern ESPEASY_VOLATILE(unsigned long) sw_watchdog_callback_count;
+extern uint32_t dailyResetCounter;
+extern ESPEASY_VOLATILE(uint32_t) sw_watchdog_callback_count;
 
 
 extern I2C_bus_state I2C_state;
-extern unsigned long I2C_bus_cleared_count;
+extern uint32_t I2C_bus_cleared_count;
 
 
 #endif // GLOBALS_STATISTICS_H
diff --git a/src/src/Helpers/Memory.cpp b/src/src/Helpers/Memory.cpp
index 3fd4a35ad..287b31e2d 100644
--- a/src/src/Helpers/Memory.cpp
+++ b/src/src/Helpers/Memory.cpp
@@ -64,7 +64,7 @@ bool allocatedOnStack(const void *address) {
 /********************************************************************************************\
    Get free system mem
  \*********************************************************************************************/
-unsigned long FreeMem()
+uint32_t FreeMem()
 {
   #if defined(ESP8266)
   return system_get_free_heap_size();
@@ -75,7 +75,7 @@ unsigned long FreeMem()
 }
 
 #ifdef USE_SECOND_HEAP
-unsigned long FreeMem2ndHeap()
+uint32_t FreeMem2ndHeap()
 {
   HeapSelectIram ephemeral;
 
@@ -85,9 +85,9 @@ unsigned long FreeMem2ndHeap()
 #endif // ifdef USE_SECOND_HEAP
 
 
-unsigned long getMaxFreeBlock()
+uint32_t getMaxFreeBlock()
 {
-  const unsigned long freemem = FreeMem();
+  const uint32_t freemem = FreeMem();
 
   // computing max free block is a rather extensive operation, so only perform when free memory is already low.
   if (freemem < 6144) {
diff --git a/src/src/Helpers/Memory.h b/src/src/Helpers/Memory.h
index 9f7faab34..c795ed80d 100644
--- a/src/src/Helpers/Memory.h
+++ b/src/src/Helpers/Memory.h
@@ -38,13 +38,13 @@ bool     allocatedOnStack(const void *address);
 /********************************************************************************************\
    Get free system mem
  \*********************************************************************************************/
-unsigned long FreeMem();
+uint32_t FreeMem();
 
 #ifdef USE_SECOND_HEAP
-unsigned long FreeMem2ndHeap();
+uint32_t FreeMem2ndHeap();
 #endif
 
-unsigned long getMaxFreeBlock();
+uint32_t getMaxFreeBlock();
 
 
 #endif
diff --git a/src/src/Helpers/ValueStruct_Factory.cpp b/src/src/Helpers/ValueStruct_Factory.cpp
index e5c3040b8..57c61931b 100644
--- a/src/src/Helpers/ValueStruct_Factory.cpp
+++ b/src/src/Helpers/ValueStruct_Factory.cpp
@@ -74,7 +74,7 @@ Up_ValueStruct ValueStruct_Factory::create(const int64_t& val)
 
 Up_ValueStruct ValueStruct_Factory::create(
   const float& val,
-  int          nrDecimals,
+  uint8_t                    nrDecimals,
   bool         trimTrailingZeros)
 {
   std::unique_ptr child(new (std::nothrow) ValueStruct_Float(val, nrDecimals, trimTrailingZeros));
@@ -86,7 +86,7 @@ Up_ValueStruct ValueStruct_Factory::create(
 
 Up_ValueStruct ValueStruct_Factory::create(
   const double& val,
-  int           nrDecimals,
+  uint8_t                    nrDecimals,
   bool          trimTrailingZeros)
 {
   std::unique_ptr child(new (std::nothrow) ValueStruct_Double(val, nrDecimals, trimTrailingZeros));
diff --git a/src/src/Helpers/ValueStruct_Factory.h b/src/src/Helpers/ValueStruct_Factory.h
index 3281dc19b..61270ebdf 100644
--- a/src/src/Helpers/ValueStruct_Factory.h
+++ b/src/src/Helpers/ValueStruct_Factory.h
@@ -23,18 +23,18 @@ public:
 
 
   static Up_ValueStruct create(const float& val,
-                               int          nrDecimals        = 4,
+                               uint8_t      nrDecimals        = 4,
                                bool         trimTrailingZeros = false);
 
   static Up_ValueStruct create(const double& val,
-                               int           nrDecimals        = 4,
+                               uint8_t       nrDecimals        = 4,
                                bool          trimTrailingZeros = false);
 
   static Up_ValueStruct create(
-    const String         & val);
+    const String& val);
 
   static Up_ValueStruct create(
-    String              && val);
+    String&& val);
 
   static Up_ValueStruct create(
     const __FlashStringHelper *val);
diff --git a/src/src/WebServer/Chart_JS.cpp b/src/src/WebServer/Chart_JS.cpp
index 5e595997b..a3b0c74ad 100644
--- a/src/src/WebServer/Chart_JS.cpp
+++ b/src/src/WebServer/Chart_JS.cpp
@@ -19,7 +19,7 @@ void add_ChartJS_array(KeyValueWriter& parent,
 void add_ChartJS_array(KeyValueWriter& parent,
                        int             valueCount,
                        const float     array[],
-                       unsigned int    nrDecimals)
+                       uint8_t         nrDecimals)
 {
   for (int i = 0; i < valueCount; ++i) {
     parent.write({ EMPTY_STRING, array[i], nrDecimals });
@@ -118,7 +118,9 @@ void add_ChartJS_chart_JSON_header(
   auto optionsArr = parent.createChild(F("options"));
 
   if (optionsArr) {
-    optionsArr->write({ F("responsive"), false });
+    const bool f(false);
+    KeyValueStruct kv(F("responsive"), f);
+    optionsArr->write(kv);
     {
       auto plugins = optionsArr->createChild(F("plugins"));
 
diff --git a/src/src/WebServer/Chart_JS.h b/src/src/WebServer/Chart_JS.h
index e28df9890..f3df1e3e5 100644
--- a/src/src/WebServer/Chart_JS.h
+++ b/src/src/WebServer/Chart_JS.h
@@ -34,7 +34,7 @@
 //   }
 // }
 //
-// Make sure the KeyValueWriter objects are in their own scope, 
+// Make sure the KeyValueWriter objects are in their own scope,
 // since the closing braces are written from their destructor.
 //
 // Split into several parts so a long array of
@@ -102,14 +102,13 @@ void add_ChartJS_dataset(
   const ChartJS_dataset_config& config,
   const float                   values[],
   int                           valueCount,
-  unsigned int                  nrDecimals = 3,
+  uint8_t                       nrDecimals = 3,
   const String                & options    = EMPTY_STRING);
 
 
 Up_KeyValueWriter add_ChartJS_dataset_header(
   KeyValueWriter              & dataset,
-                                const ChartJS_dataset_config& config);
-
+  const ChartJS_dataset_config& config);
 
 
 #endif // if FEATURE_CHART_JS
diff --git a/src/src/WebServer/JSON.cpp b/src/src/WebServer/JSON.cpp
index c2de9708a..4d53c10b7 100644
--- a/src/src/WebServer/JSON.cpp
+++ b/src/src/WebServer/JSON.cpp
@@ -590,7 +590,7 @@ void handle_json()
                     if (controllerWriter) {
                       controllerWriter->write({ F("Controller"), x + 1 });
                       controllerWriter->write({ F("IDX"),        Settings.TaskDeviceID[x][TaskIndex] });
-                      controllerWriter->write({ F("Enabled"),    Settings.TaskDeviceSendData[x][TaskIndex] });
+                      controllerWriter->write({ F("Enabled"),    !!Settings.TaskDeviceSendData[x][TaskIndex] });
                     }
                   }
                 }
diff --git a/src/src/WebServer/RootPage.cpp b/src/src/WebServer/RootPage.cpp
index 2d71d7980..710323764 100644
--- a/src/src/WebServer/RootPage.cpp
+++ b/src/src/WebServer/RootPage.cpp
@@ -98,8 +98,6 @@ void handle_root() {
   rebootCmd = strcasecmp_P(sCommand.c_str(), PSTR("reboot")) == 0;
   sendHeadandTail_stdtemplate(_HEAD, rebootCmd);
 
-  int freeMem = ESP.getFreeHeap();
-
   // TODO: move this to handle_tools, from where it is actually called?
 
   // have to disconnect or reboot from within the main loop
diff --git a/tools/pio/pre_custom_esp82xx.py b/tools/pio/pre_custom_esp82xx.py
index 1616050cf..7b517618c 100644
--- a/tools/pio/pre_custom_esp82xx.py
+++ b/tools/pio/pre_custom_esp82xx.py
@@ -73,8 +73,8 @@ else:
     "-DEMBED_ESPEASY_DEFAULT_MIN_CSS",
 
 #    "-DPLUGIN_STATS_NR_ELEMENTS=30",
-    "-DFEATURE_PLUGIN_STATS=1",
-    "-DFEATURE_CHART_JS=1",
+    "-DFEATURE_PLUGIN_STATS=0",
+    "-DFEATURE_CHART_JS=0",
 
 #    "-DFEATURE_ADC_VCC=1",
 

From 6c5e8f0e27c40e4a6f2f81b78b3d3d2fef1b0e63 Mon Sep 17 00:00:00 2001
From: TD-er 
Date: Sat, 18 Oct 2025 01:31:21 +0200
Subject: [PATCH 388/564] [Cleanup] Make nearly all of sysinfo page use new
 KeyValueStruct writers

---
 src/src/CustomBuild/define_plugin_sets.h     |   8 +
 src/src/DataStructs/ChartJS_dataset_config.h |   7 +-
 src/src/ESPEasyCore/ESPEasy_Log.cpp          |  10 +-
 src/src/Helpers/StringProvider.cpp           | 176 ++++++++---
 src/src/Helpers/StringProvider.h             |   3 +
 src/src/PluginStructs/P002_data_struct.cpp   |   8 +-
 src/src/PluginStructs/P169_data_struct.cpp   |   4 +-
 src/src/WebServer/Chart_JS.cpp               |   4 +-
 src/src/WebServer/Chart_JS.h                 |   2 +-
 src/src/WebServer/HTML_wrappers.cpp          |   8 +-
 src/src/WebServer/HTML_wrappers.h            |   8 +-
 src/src/WebServer/JSON.cpp                   |   4 +-
 src/src/WebServer/Markup.cpp                 |   2 +-
 src/src/WebServer/Markup.h                   |   2 +-
 src/src/WebServer/SysInfoPage.cpp            | 300 ++++++-------------
 15 files changed, 264 insertions(+), 282 deletions(-)

diff --git a/src/src/CustomBuild/define_plugin_sets.h b/src/src/CustomBuild/define_plugin_sets.h
index d9d8cae7d..172d78a3f 100644
--- a/src/src/CustomBuild/define_plugin_sets.h
+++ b/src/src/CustomBuild/define_plugin_sets.h
@@ -408,8 +408,13 @@ To create/register a plugin, you have to :
         #define FEATURE_PLUGIN_STATS  1
     #endif
     #ifndef FEATURE_CHART_JS
+    #ifdef ESP8266
+        #define FEATURE_CHART_JS  0
+    #endif
+    #ifdef ESP32
         #define FEATURE_CHART_JS  1
     #endif
+    #endif
     #ifndef FEATURE_RULES_EASY_COLOR_CODE
         #define FEATURE_RULES_EASY_COLOR_CODE 1
     #endif
@@ -1185,6 +1190,9 @@ To create/register a plugin, you have to :
     #ifndef FEATURE_NETWORK_TRAFFIC_COUNT
         #define FEATURE_NETWORK_TRAFFIC_COUNT 1
     #endif
+    #if defined(FEATURE_CHART_JS) && !FEATURE_CHART_JS
+    #undef FEATURE_CHART_JS
+    #endif
     #ifndef FEATURE_CHART_JS
         #define FEATURE_CHART_JS  1
     #endif
diff --git a/src/src/DataStructs/ChartJS_dataset_config.h b/src/src/DataStructs/ChartJS_dataset_config.h
index ac42ccec8..9e0fbfbd7 100644
--- a/src/src/DataStructs/ChartJS_dataset_config.h
+++ b/src/src/DataStructs/ChartJS_dataset_config.h
@@ -1,5 +1,4 @@
-#ifndef DATASTRUCTS_CHARTJS_DATASET_CONFIG_H
-#define DATASTRUCTS_CHARTJS_DATASET_CONFIG_H
+#pragma once
 
 #include "../../ESPEasy_common.h"
 
@@ -7,7 +6,8 @@
 
 # include "../DataStructs/PluginStats_Config.h"
 
-struct ChartJS_dataset_config {
+class ChartJS_dataset_config {
+public:
   ChartJS_dataset_config() = default;
 
   ChartJS_dataset_config(
@@ -26,4 +26,3 @@ struct ChartJS_dataset_config {
 };
 #endif // if FEATURE_CHART_JS
 
-#endif // ifndef DATASTRUCTS_CHARTJS_DATASET_CONFIG_H
diff --git a/src/src/ESPEasyCore/ESPEasy_Log.cpp b/src/src/ESPEasyCore/ESPEasy_Log.cpp
index 68b051ab1..37dab4ad8 100644
--- a/src/src/ESPEasyCore/ESPEasy_Log.cpp
+++ b/src/src/ESPEasyCore/ESPEasy_Log.cpp
@@ -22,9 +22,17 @@ void initLog()
   // make sure addLog doesnt do any stuff before initalisation of Settings is complete.
   Settings.UseSerial      = true;
   Settings.SyslogFacility = 0;
+
+  #ifdef ESP32
   setLogLevelFor(LOG_TO_SYSLOG, 2);
-  setLogLevelFor(LOG_TO_SERIAL, 2); // logging during initialisation
   setLogLevelFor(LOG_TO_WEBLOG, 2);
+  #else
+  setLogLevelFor(LOG_TO_SYSLOG, 0);
+  setLogLevelFor(LOG_TO_WEBLOG, 0);
+  #endif
+
+
+  setLogLevelFor(LOG_TO_SERIAL, 2); // logging during initialisation
   setLogLevelFor(LOG_TO_SDCARD, 0);
 }
 
diff --git a/src/src/Helpers/StringProvider.cpp b/src/src/Helpers/StringProvider.cpp
index e01d6ad30..4e95afa3d 100644
--- a/src/src/Helpers/StringProvider.cpp
+++ b/src/src/Helpers/StringProvider.cpp
@@ -35,6 +35,7 @@
 #include "../Helpers/Memory.h"
 #include "../Helpers/Misc.h"
 #include "../Helpers/Networking.h"
+#include "../Helpers/OTA.h"
 #include "../Helpers/Scheduler.h"
 #include "../Helpers/StringConverter.h"
 #include "../Helpers/StringGenerator_System.h"
@@ -116,21 +117,19 @@ KeyValueStruct getKeyValue(LabelType::Enum label, bool extendedValue)
     #if FEATURE_EXT_RTC
     case LabelType::EXT_RTC_UTC_TIME:
     {
-      if (Settings.ExtTimeSource() != ExtTimeSource_e::None) {
-        String rtcTime = F("Not Set");
+      if (Settings.ExtTimeSource() == ExtTimeSource_e::None) { break; }
+      String rtcTime = F("Not Set");
 
-        // Try to read the stored time in the ext. time source to allow to check if it is working properly.
-        uint32_t unixtime;
+      // Try to read the stored time in the ext. time source to allow to check if it is working properly.
+      uint32_t unixtime;
 
-        if (node_time.ExtRTC_get(unixtime)) {
-          struct tm RTC_time;
-          breakTime(unixtime, RTC_time);
-          rtcTime = formatDateTimeString(RTC_time);
-        }
-        KeyValueStruct kv(F("UTC time stored in RTC chip"), rtcTime);
-        return kv;
+      if (node_time.ExtRTC_get(unixtime)) {
+        struct tm RTC_time;
+        breakTime(unixtime, RTC_time);
+        rtcTime = formatDateTimeString(RTC_time);
       }
-      break;
+      KeyValueStruct kv(F("UTC time stored in RTC chip"), rtcTime);
+      return kv;
     }
     #endif // if FEATURE_EXT_RTC
     case LabelType::UPTIME:
@@ -447,12 +446,20 @@ KeyValueStruct getKeyValue(LabelType::Enum label, bool extendedValue)
 
     case LabelType::BOOT_TYPE:
     {
+      if (extendedValue) {
+        KeyValueStruct kv(
+          F("Boot"),
+          concat(
+            getLastBootCauseString(),
+            strformat(F(" (%d)"), RTC.bootCounter)));
+        return kv;
+      }
       KeyValueStruct kv(F("Last Boot Cause"), getLastBootCauseString());
       return kv;
     }
     case LabelType::BOOT_COUNT:
     {
-      KeyValueStruct kv(F("Boot Count") /*, value*/);
+      KeyValueStruct kv(F("Boot Count"), RTC.bootCounter);
       return kv;
     }
     case LabelType::DEEP_SLEEP_ALTERNATIVE_CALL:
@@ -735,7 +742,18 @@ KeyValueStruct getKeyValue(LabelType::Enum label, bool extendedValue)
 
     case LabelType::BUILD_DESC:
     {
-      KeyValueStruct kv(F("Build"), getSystemBuildString());
+      String descr = getSystemBuildString();
+
+      if (extendedValue) {
+        descr += ' ';
+        descr += F(BUILD_NOTES);
+      }
+      KeyValueStruct kv(F("Build"), descr);
+      return kv;
+    }
+    case LabelType::BUILD_ORIGIN:
+    {
+      KeyValueStruct kv(F("Build Origin"), get_build_origin());
       return kv;
     }
     case LabelType::GIT_BUILD:
@@ -883,12 +901,24 @@ KeyValueStruct getKeyValue(LabelType::Enum label, bool extendedValue)
 
     case LabelType::FLASH_CHIP_ID:
     {
-      KeyValueStruct kv(F("Flash Chip ID"), formatToHex(getFlashChipId(), 6));
+      auto flashChipId = getFlashChipId();
+
+      if (flashChipId == 0) { break; }
+      KeyValueStruct kv(F("Flash Chip ID"), formatToHex(flashChipId, 6));
       return kv;
     }
     case LabelType::FLASH_CHIP_VENDOR:
     {
-      KeyValueStruct kv(F("Flash Chip Vendor"), formatToHex(getFlashChipId() & 0xFF, 2));
+      const uint32_t flashChipId = getFlashChipId();
+
+      if (flashChipId == 0) { break; }
+      String id = formatToHex(flashChipId & 0xFF, 2);
+
+      if (extendedValue && flashChipVendorPuya()) {
+        id += concat(F(" (PUYA"), puyaSupport() ? F(", supported") : F(HTML_SYMBOL_WARNING)) + ')';
+      }
+
+      KeyValueStruct kv(F("Flash Chip Vendor"), id);
       return kv;
     }
     case LabelType::FLASH_CHIP_MODEL:
@@ -896,7 +926,14 @@ KeyValueStruct getKeyValue(LabelType::Enum label, bool extendedValue)
       const uint32_t flashChipId = getFlashChipId();
       const uint32_t flashDevice = (flashChipId & 0xFF00) | ((flashChipId >> 16) & 0xFF);
 
-      KeyValueStruct kv(F("Flash Chip Model"), formatToHex(flashDevice, 4));
+      String model(formatToHex(flashDevice, 4));
+          #ifdef ESP32
+
+      if (extendedValue && getChipFeatures().embeddedFlash) {
+        model += F(" (Embedded)");
+      }
+    #endif // ifdef ESP32
+      KeyValueStruct kv(F("Flash Chip Model"), model);
       return kv;
     }
     case LabelType::FLASH_CHIP_REAL_SIZE:
@@ -931,14 +968,40 @@ KeyValueStruct getKeyValue(LabelType::Enum label, bool extendedValue)
     }
     case LabelType::FLASH_WRITE_COUNT:
     {
+      if (extendedValue) {
+        KeyValueStruct kv(
+          F("Flash Writes"),
+          strformat(
+            F("%d daily / %d cold boot"),
+            RTC.flashDayCounter,
+            static_cast(RTC.flashCounter)));
+        return kv;
+      }
       KeyValueStruct kv(F("Flash Writes"), RTC.flashCounter);
       return kv;
     }
     case LabelType::SKETCH_SIZE:
     {
-      KeyValueStruct kv(F("Sketch Size"), getSketchSize() >> 10);
+      String str;
+
+      if (extendedValue) {
+        uint32_t maxSketchSize;
+        bool     use2step;
+        OTA_possible(maxSketchSize, use2step);
+        str += strformat(
+          F("%d [kB] (%d kB not used)"),
+          (getSketchSize() >> 10),
+          (maxSketchSize - getSketchSize()) >> 10);
+      } else {
+        str = (getSketchSize() >> 10);
+      }
+
+      KeyValueStruct kv(F("Sketch Size"), str);
       kv.setID(F("sketch_size"));
-      kv.setUnit(F("kB"));
+
+      if (!extendedValue) {
+        kv.setUnit(F("kB"));
+      }
       return kv;
     }
     case LabelType::SKETCH_FREE:
@@ -948,52 +1011,81 @@ KeyValueStruct getKeyValue(LabelType::Enum label, bool extendedValue)
       kv.setUnit(F("kB"));
       return kv;
     }
-    #ifdef USE_LITTLEFS
     case LabelType::FS_SIZE:
     {
-      KeyValueStruct kv(F("Little FS Size"), SpiffsTotalBytes() >> 10);
+      String size;
+
+      if (extendedValue) {
+        size = strformat(
+          F("%d [kB] (%d kB free)"),
+          SpiffsTotalBytes() / 1024,
+          SpiffsFreeSpace() / 1024);
+      }
+      else {
+        size = (SpiffsTotalBytes() >> 10);
+      }
+
+      KeyValueStruct kv(
+        #ifdef USE_LITTLEFS
+        F("Little FS Size"),
+        #else
+        F("SPIFFS Size"),
+        #endif // ifdef USE_LITTLEFS
+        SpiffsTotalBytes() >> 10);
       kv.setID(F("fs_size"));
-      kv.setUnit(F("kB"));
+
+      if (!extendedValue) {
+        kv.setUnit(F("kB"));
+      }
       return kv;
     }
     case LabelType::FS_FREE:
     {
-      KeyValueStruct kv(F("Little FS Free"), SpiffsFreeSpace() >> 10);
+      KeyValueStruct kv(
+        #ifdef USE_LITTLEFS
+        F("Little FS Free"),
+        #else
+        F("SPIFFS Free"),
+        #endif // ifdef USE_LITTLEFS
+        SpiffsFreeSpace() >> 10);
       kv.setID(F("fs_free"));
       kv.setUnit(F("kB"));
       return kv;
     }
-    #else // ifdef USE_LITTLEFS
-    case LabelType::FS_SIZE:
-    {
-      KeyValueStruct kv(F("SPIFFS Size"), SpiffsTotalBytes() >> 10);
-      kv.setID(F("fs_size"));
-      kv.setUnit(F("kB"));
-      return kv;
-    }
-    case LabelType::FS_FREE:
-    {
-      KeyValueStruct kv(F("SPIFFS Free"), SpiffsFreeSpace() >> 10);
-      kv.setID(F("fs_free"));
-      kv.setUnit(F("kB"));
-      return kv;
-    }
-    #endif // ifdef USE_LITTLEFS
     case LabelType::MAX_OTA_SKETCH_SIZE:
     {
-      KeyValueStruct kv(F("Max. OTA Sketch Size") /*, value*/);
+      uint32_t maxSketchSize;
+      bool     use2step;
+      OTA_possible(maxSketchSize, use2step);
+
+      KeyValueStruct kv(F("Max. OTA Sketch Size"), strformat(
+                          F("%d [kB] (%d bytes)"),
+                          maxSketchSize / 1024,
+                          maxSketchSize));
       return kv;
     }
+#ifdef ESP8266
     case LabelType::OTA_2STEP:
     {
-      KeyValueStruct kv(F("OTA 2-step Needed") /*, value*/);
+      uint32_t maxSketchSize;
+      bool     use2step;
+      OTA_possible(maxSketchSize, use2step);
+
+      KeyValueStruct kv(F("OTA 2-step Needed"), use2step);
       return kv;
     }
     case LabelType::OTA_POSSIBLE:
     {
-      KeyValueStruct kv(F("OTA possible") /*, value*/);
+      uint32_t maxSketchSize;
+      bool     use2step;
+    # if defined(ESP8266)
+      bool otaEnabled =
+    # endif // if defined(ESP8266)
+      OTA_possible(maxSketchSize, use2step);
+      KeyValueStruct kv(F("OTA possible"), otaEnabled);
       return kv;
     }
+#endif // ifdef ESP8266
     #if FEATURE_INTERNAL_TEMPERATURE
     case LabelType::INTERNAL_TEMPERATURE:
     {
diff --git a/src/src/Helpers/StringProvider.h b/src/src/Helpers/StringProvider.h
index 979cd89d5..5695504c6 100644
--- a/src/src/Helpers/StringProvider.h
+++ b/src/src/Helpers/StringProvider.h
@@ -166,6 +166,7 @@ struct LabelType {
 #endif
 
     BUILD_DESC,
+    BUILD_ORIGIN,
     GIT_BUILD,
     SYSTEM_LIBRARIES,
 #ifdef ESP32
@@ -217,8 +218,10 @@ struct LabelType {
     FS_SIZE,
     FS_FREE,
     MAX_OTA_SKETCH_SIZE,
+#ifdef ESP8266
     OTA_2STEP,
     OTA_POSSIBLE,
+#endif
     #if FEATURE_INTERNAL_TEMPERATURE
     INTERNAL_TEMPERATURE,
     #endif // if FEATURE_INTERNAL_TEMPERATURE
diff --git a/src/src/PluginStructs/P002_data_struct.cpp b/src/src/PluginStructs/P002_data_struct.cpp
index 2e403de7e..8774d2b21 100644
--- a/src/src/PluginStructs/P002_data_struct.cpp
+++ b/src/src/PluginStructs/P002_data_struct.cpp
@@ -541,13 +541,13 @@ void P002_data_struct::webformLoad_2pt_calibrationCurve(struct EventStruct *even
             values[i] = P002_data_struct::applyCalibration(event, xAxisValues[i]);
           }
 
-          const ChartJS_dataset_config config(
-            F("2 Point Calibration"),
-            F("rgb(255, 99, 132)"));
-
           auto datasets = data->createChildArray(F("datasets"));
 
           if (datasets) {
+                      const ChartJS_dataset_config config(
+            F("2 Point Calibration"),
+            F("rgb(255, 99, 132)"));
+
             add_ChartJS_dataset(
               *datasets,
               config,
diff --git a/src/src/PluginStructs/P169_data_struct.cpp b/src/src/PluginStructs/P169_data_struct.cpp
index 91405a526..0ceed5860 100644
--- a/src/src/PluginStructs/P169_data_struct.cpp
+++ b/src/src/PluginStructs/P169_data_struct.cpp
@@ -939,13 +939,15 @@ void P169_data_struct::addCalibrationChart(struct EventStruct *event)
           const ChartJS_dataset_config config(
             F("Error %"),
             F("rgb(255, 99, 132)"));
+          String options;
 
           add_ChartJS_dataset(
             *datasets,
             config,
             values,
             actualValueCount,
-            2);
+            2,
+          options);
         }
       }
     }
diff --git a/src/src/WebServer/Chart_JS.cpp b/src/src/WebServer/Chart_JS.cpp
index a3b0c74ad..fbc0cee4f 100644
--- a/src/src/WebServer/Chart_JS.cpp
+++ b/src/src/WebServer/Chart_JS.cpp
@@ -192,7 +192,7 @@ void add_ChartJS_chart_labels(
 
 void add_ChartJS_scatter_data_point(
   KeyValueWriter& parent,
-  float x, float y, int nrDecimals)
+  float x, float y, uint8_t nrDecimals)
 {
   auto element = parent.createChild();
 
@@ -207,7 +207,7 @@ void add_ChartJS_dataset(
   const ChartJS_dataset_config& config,
   const float                   values[],
   int                           valueCount,
-  unsigned int                  nrDecimals,
+  uint8_t                       nrDecimals,
   const String                & options)
 {
   auto dataset = datasets.createChild();
diff --git a/src/src/WebServer/Chart_JS.h b/src/src/WebServer/Chart_JS.h
index f3df1e3e5..e9e9afeb9 100644
--- a/src/src/WebServer/Chart_JS.h
+++ b/src/src/WebServer/Chart_JS.h
@@ -95,7 +95,7 @@ void add_ChartJS_scatter_data_point(
   KeyValueWriter& parent,
   float           x,
   float           y,
-  int             nrDecimals);
+  uint8_t             nrDecimals);
 
 void add_ChartJS_dataset(
   KeyValueWriter              & datasets,
diff --git a/src/src/WebServer/HTML_wrappers.cpp b/src/src/WebServer/HTML_wrappers.cpp
index 0aaf75ee1..dbbc61364 100644
--- a/src/src/WebServer/HTML_wrappers.cpp
+++ b/src/src/WebServer/HTML_wrappers.cpp
@@ -443,12 +443,12 @@ void addHtmlInt(uint64_t int_val) {
   addHtml(ull2String(int_val));
 }
 
-void addHtmlFloat(const float& value, unsigned int nrDecimals) {
+void addHtmlFloat(const float& value, uint8_t nrDecimals) {
   addHtml(toString(value, nrDecimals));
 }
 
 /*
-void addHtmlFloat_NaN_toNull(const float& value, unsigned int nrDecimals) {
+void addHtmlFloat_NaN_toNull(const float& value, uint8_t nrDecimals) {
   String res;
   if (toValidString(res, value, nrDecimals)) {
     addHtml(res);
@@ -459,12 +459,12 @@ void addHtmlFloat_NaN_toNull(const float& value, unsigned int nrDecimals) {
 */
 
 #if FEATURE_USE_DOUBLE_AS_ESPEASY_RULES_FLOAT_TYPE
-void addHtmlFloat(const double& value, unsigned int nrDecimals) {
+void addHtmlFloat(const double& value, uint8_t nrDecimals) {
   addHtml(doubleToString(value, nrDecimals));
 }
 
 /*
-void addHtmlFloat_NaN_toNull(const double& value, unsigned int nrDecimals) {
+void addHtmlFloat_NaN_toNull(const double& value, uint8_t nrDecimals) {
   String res;
   if (doubleToValidString(res, value, nrDecimals)) {
     addHtml(res);
diff --git a/src/src/WebServer/HTML_wrappers.h b/src/src/WebServer/HTML_wrappers.h
index 4397d9d35..aebb11dfe 100644
--- a/src/src/WebServer/HTML_wrappers.h
+++ b/src/src/WebServer/HTML_wrappers.h
@@ -140,11 +140,11 @@ void addHtmlInt(int32_t int_val);
 void addHtmlInt(uint32_t int_val);
 void addHtmlInt(int64_t int_val);
 void addHtmlInt(uint64_t int_val);
-void addHtmlFloat(const float& value, unsigned int nrDecimals = 2u);
-//void addHtmlFloat_NaN_toNull(const float& value, unsigned int nrDecimals = 2u);
+void addHtmlFloat(const float& value, uint8_t nrDecimals = 2u);
+//void addHtmlFloat_NaN_toNull(const float& value, uint8_t nrDecimals = 2u);
 #if FEATURE_USE_DOUBLE_AS_ESPEASY_RULES_FLOAT_TYPE
-void addHtmlFloat(const double& value, unsigned int nrDecimals = 2u);
-//void addHtmlFloat_NaN_toNull(const double& value, unsigned int nrDecimals = 2u);
+void addHtmlFloat(const double& value, uint8_t nrDecimals = 2u);
+//void addHtmlFloat_NaN_toNull(const double& value, uint8_t nrDecimals = 2u);
 #endif
 
 void addEncodedHtml(const __FlashStringHelper * html);
diff --git a/src/src/WebServer/JSON.cpp b/src/src/WebServer/JSON.cpp
index 4d53c10b7..3fe08e483 100644
--- a/src/src/WebServer/JSON.cpp
+++ b/src/src/WebServer/JSON.cpp
@@ -132,7 +132,7 @@ void handle_json()
 #if FEATURE_ESPEASY_P2P
   bool showNodes = true;
 #endif
-#if FEATURE_PLUGIN_STATS
+#if FEATURE_PLUGIN_STATS && FEATURE_CHART_JS
   bool showPluginStats = getFormItemInt(F("showpluginstats"), 0) != 0;
 #endif
 
@@ -147,7 +147,7 @@ void handle_json()
 #if FEATURE_ESPEASY_P2P
     showNodes = false;
 #endif
-#if FEATURE_PLUGIN_STATS
+#if FEATURE_PLUGIN_STATS && FEATURE_CHART_JS
     showPluginStats = hasArg(F("showpluginstats"));
 #endif
   }
diff --git a/src/src/WebServer/Markup.cpp b/src/src/WebServer/Markup.cpp
index 222496c18..4c38c8c7e 100644
--- a/src/src/WebServer/Markup.cpp
+++ b/src/src/WebServer/Markup.cpp
@@ -776,7 +776,7 @@ void addNumericBox(const String& id, int value, int min, int max, bool disabled)
 
 #endif // if FEATURE_TOOLTIPS
 
-void addFloatNumberBox(const String& id, float value, float min, float max, unsigned int nrDecimals, float stepsize
+void addFloatNumberBox(const String& id, float value, float min, float max, uint8_t nrDecimals, float stepsize
                        #if FEATURE_TOOLTIPS
                        , const String& tooltip
                        #endif // if FEATURE_TOOLTIPS
diff --git a/src/src/WebServer/Markup.h b/src/src/WebServer/Markup.h
index ff37ed394..906077fc0 100644
--- a/src/src/WebServer/Markup.h
+++ b/src/src/WebServer/Markup.h
@@ -211,7 +211,7 @@ void addFloatNumberBox(const String& id,
                        float         value,
                        float         min,
                        float         max,
-                       unsigned int  nrDecimals = 6,
+                       uint8_t  nrDecimals = 6,
                        float         stepsize   = 0.0f
                        #if FEATURE_TOOLTIPS
                        ,
diff --git a/src/src/WebServer/SysInfoPage.cpp b/src/src/WebServer/SysInfoPage.cpp
index 826eb544c..94ab2c9ed 100644
--- a/src/src/WebServer/SysInfoPage.cpp
+++ b/src/src/WebServer/SysInfoPage.cpp
@@ -309,38 +309,20 @@ void handle_sysinfo() {
 }
 
 void handle_sysinfo_basicInfo() {
-  addRowLabelValue(LabelType::UNIT_NR);
-
-  if (node_time.systemTimePresent())
-  {
-    addRowLabelValue(LabelType::LOCAL_TIME);
-    #  if FEATURE_EXT_RTC
-
-    if (Settings.ExtTimeSource() != ExtTimeSource_e::None) {
-      addRowLabelValue(LabelType::EXT_RTC_UTC_TIME);
-    }
-    #  endif // if FEATURE_EXT_RTC
-    addRowLabelValue(LabelType::TIME_SOURCE);
-    addRowLabelValue(LabelType::TIME_WANDER);
-  }
-
-  addRowLabel(LabelType::UPTIME);
-  {
-    addHtml(getExtendedValue(LabelType::UPTIME));
-  }
-
-  addRowLabel(LabelType::LOAD_PCT);
-
-  if (wdcounter > 0)
-  {
-    addHtml(strformat(
-              F("%.2f [%%] (LC=%d)"),
-              getCPUload(),
-              getLoopCountPerSec()));
-  }
-
   static const LabelType::Enum labels[] PROGMEM =
   {
+    LabelType::UNIT_NR,
+
+    LabelType::LOCAL_TIME,
+    #  if FEATURE_EXT_RTC
+
+    LabelType::EXT_RTC_UTC_TIME,
+    #  endif // if FEATURE_EXT_RTC
+    LabelType::TIME_SOURCE,
+    LabelType::TIME_WANDER,
+    LabelType::UPTIME,
+    LabelType::UPTIME,
+    LabelType::LOAD_PCT,
 #  if FEATURE_INTERNAL_TEMPERATURE
     LabelType::INTERNAL_TEMPERATURE,
 #  endif
@@ -350,16 +332,12 @@ void handle_sysinfo_basicInfo() {
     LabelType::RESET_REASON,
     LabelType::LAST_TASK_BEFORE_REBOOT,
     LabelType::SW_WD_COUNT,
+    LabelType::BOOT_TYPE,
+
     LabelType::MAX_LABEL
   };
-  addRowLabelValues(labels);
 
-  addRowLabel(F("Boot"));
-  {
-    addHtml(getLastBootCauseString());
-    addHtml(strformat(
-              F(" (%d)"), static_cast(RTC.bootCounter)));
-  }
+  addRowLabelValues(labels);
 }
 
 #  ifndef WEBSERVER_SYSINFO_MINIMAL
@@ -367,69 +345,42 @@ void handle_sysinfo_basicInfo() {
 void handle_sysinfo_memory() {
   addTableSeparator(F("Memory"), 2, 3);
 
+  static const LabelType::Enum labels[] PROGMEM =
+  {
 #   ifdef ESP32
-  addRowLabelValue(LabelType::HEAP_SIZE);
-  addRowLabelValue(LabelType::HEAP_MIN_FREE);
+    LabelType::HEAP_SIZE,
+    LabelType::HEAP_MIN_FREE,
 #   endif // ifdef ESP32
 
-  int freeMem = ESP.getFreeHeap();
-  addRowLabel(LabelType::FREE_MEM);
-  {
-    addHtmlInt(freeMem);
-    addUnit(getFormUnit(LabelType::FREE_MEM));
-#   ifndef BUILD_NO_RAM_TRACKER
-    addHtml(F(" ("));
-    addHtmlInt(lowestRAM);
-    addHtml(F(" - "));
-    addHtml(lowestRAMfunction);
-    addHtml(')');
-#   endif // ifndef BUILD_NO_RAM_TRACKER
-  }
+    LabelType::FREE_MEM,
 #   if defined(CORE_POST_2_5_0) || defined(ESP32)
- #    ifndef LIMIT_BUILD_SIZE
-  addRowLabelValue(LabelType::HEAP_MAX_FREE_BLOCK);
- #    endif // ifndef LIMIT_BUILD_SIZE
+#    ifndef LIMIT_BUILD_SIZE
+    LabelType::HEAP_MAX_FREE_BLOCK,
+#    endif // ifndef LIMIT_BUILD_SIZE
 #   endif   // if defined(CORE_POST_2_5_0) || defined(ESP32)
 #   if defined(CORE_POST_2_5_0)
-  #    ifndef LIMIT_BUILD_SIZE
-  addRowLabelValue(LabelType::HEAP_FRAGMENTATION);
-  #    endif // ifndef LIMIT_BUILD_SIZE
-  {
-    #    ifdef USE_SECOND_HEAP
-    addRowLabelValue(LabelType::FREE_HEAP_IRAM);
-    #    endif
-  }
+#    ifndef LIMIT_BUILD_SIZE
+    LabelType::HEAP_FRAGMENTATION,
+#    endif // ifndef LIMIT_BUILD_SIZE
+
+#    ifdef USE_SECOND_HEAP
+    LabelType::FREE_HEAP_IRAM,
+#    endif
+
 #   endif // if defined(CORE_POST_2_5_0)
-
-
-  addRowLabel(LabelType::FREE_STACK);
-  {
-    addHtmlInt(getCurrentFreeStack());
-    addUnit(getFormUnit(LabelType::FREE_STACK));
-#   ifndef BUILD_NO_RAM_TRACKER
-    addHtml(F(" ("));
-    addHtmlInt(lowestFreeStack);
-    addHtml(F(" - "));
-    addHtml(lowestFreeStackfunction);
-    addHtml(')');
-#   endif // ifndef BUILD_NO_RAM_TRACKER
-  }
+    LabelType::FREE_STACK,
 
 #   if defined(ESP32) && defined(BOARD_HAS_PSRAM)
 
-  addRowLabelValue(LabelType::PSRAM_SIZE);
+    LabelType::PSRAM_SIZE,
 
-  if (UsePSRAM()) {
-    static const LabelType::Enum labels[] PROGMEM =
-    {
-      LabelType::PSRAM_FREE,
-      LabelType::PSRAM_MIN_FREE,
-      LabelType::PSRAM_MAX_FREE_BLOCK,
-      LabelType::MAX_LABEL
-    };
-    addRowLabelValues(labels);
-  }
+    LabelType::PSRAM_FREE,
+    LabelType::PSRAM_MIN_FREE,
+    LabelType::PSRAM_MAX_FREE_BLOCK,
 #   endif // if defined(ESP32) && defined(BOARD_HAS_PSRAM)
+    LabelType::MAX_LABEL
+  };
+  addRowLabelValues(labels);
 }
 
 #  endif // ifndef WEBSERVER_SYSINFO_MINIMAL
@@ -448,20 +399,16 @@ void handle_sysinfo_Ethernet() {
       LabelType::ETH_DUPLEX,
       LabelType::ETH_MAC,
 
-
       LabelType::MAX_LABEL
     };
 
     addRowLabelValues(labels);
-
   }
 }
 
 #  endif // if FEATURE_ETHERNET
 
 void handle_sysinfo_Network() {
-
-
   addTableSeparator(F("Network"), 2, 3);
 
   {
@@ -565,28 +512,29 @@ void handle_sysinfo_WiFiSettings() {
 void handle_sysinfo_Firmware() {
   addTableSeparator(F("Firmware"), 2, 3);
 
-  addRowLabelValue_copy(LabelType::BUILD_DESC);
-  addHtml(' ');
-  addHtml(F(BUILD_NOTES));
-
-  addRowLabelValue_copy(LabelType::SYSTEM_LIBRARIES);
+  static const LabelType::Enum labels[] PROGMEM =
+  {
+    LabelType::BUILD_DESC,
+    LabelType::SYSTEM_LIBRARIES,
 #  ifdef ESP32
-  addRowLabelValue_copy(LabelType::ESP_IDF_SDK_VERSION);
+    LabelType::ESP_IDF_SDK_VERSION,
 #  endif
-  addRowLabelValue_copy(LabelType::GIT_BUILD);
-  addRowLabelValue_copy(LabelType::PLUGIN_COUNT);
-  addHtml(' ');
-  addHtml(getPluginDescriptionString());
-
-  addRowLabel(F("Build Origin"));
-  addHtml(get_build_origin());
-  addRowLabelValue_copy(LabelType::BUILD_TIME);
-  addRowLabelValue_copy(LabelType::BINARY_FILENAME);
-  addRowLabelValue_copy(LabelType::BUILD_PLATFORM);
-  addRowLabelValue_copy(LabelType::GIT_HEAD);
+    LabelType::GIT_BUILD,
+    LabelType::PLUGIN_COUNT,
+    LabelType::PLUGIN_DESCRIPTION,
+    LabelType::BUILD_ORIGIN,
+    LabelType::BUILD_TIME,
+    LabelType::BINARY_FILENAME,
+    LabelType::BUILD_PLATFORM,
+    LabelType::GIT_HEAD,
   #  ifdef CONFIGURATION_CODE
-  addRowLabelValue_copy(LabelType::CONFIGURATION_CODE_LBL);
+    LabelType::CONFIGURATION_CODE_LBL,
   #  endif  // ifdef CONFIGURATION_CODE
+
+    LabelType::MAX_LABEL
+  };
+
+  addRowLabelValues(labels);
 }
 
 #  ifndef WEBSERVER_SYSINFO_MINIMAL
@@ -610,17 +558,15 @@ void handle_sysinfo_SystemStatus() {
     LabelType::CONSOLE_FALLBACK_TO_SERIAL0,
     LabelType::CONSOLE_FALLBACK_PORT,
 #   endif // if USES_ESPEASY_CONSOLE_FALLBACK_PORT
+#   if FEATURE_CLEAR_I2C_STUCK
+    LabelType::I2C_BUS_STATE,
+    LabelType::I2C_BUS_CLEARED_COUNT,
+#   endif // if FEATURE_CLEAR_I2C_STUCK
+
     LabelType::MAX_LABEL
   };
 
   addRowLabelValues(labels);
-#   if FEATURE_CLEAR_I2C_STUCK
-
-  if (Settings.EnableClearHangingI2Cbus()) {
-    addRowLabelValue(LabelType::I2C_BUS_STATE);
-    addRowLabelValue(LabelType::I2C_BUS_CLEARED_COUNT);
-  }
-#   endif // if FEATURE_CLEAR_I2C_STUCK
 }
 
 #  endif // ifndef WEBSERVER_SYSINFO_MINIMAL
@@ -652,17 +598,9 @@ void handle_sysinfo_NetworkServices() {
 void handle_sysinfo_ESP_Board() {
   addTableSeparator(F("ESP Board"), 2, 3);
 
-
-  addRowLabel(LabelType::ESP_CHIP_ID);
-
-  const uint32_t chipID = getChipId();
-  addHtml(strformat(
-            F("%d (%s)"),
-            chipID,
-            formatToHex(chipID, 6).c_str()));
-
   static const LabelType::Enum labels[] PROGMEM =
   {
+    LabelType::ESP_CHIP_ID,
     LabelType::ESP_CHIP_FREQ,
 #   ifdef ESP32
     LabelType::ESP_CHIP_XTAL_FREQ,
@@ -675,12 +613,12 @@ void handle_sysinfo_ESP_Board() {
 #   endif // if defined(ESP32)
     LabelType::ESP_CHIP_CORES,
     LabelType::BOARD_NAME,
+
     LabelType::MAX_LABEL
   };
 
   addRowLabelValues(labels);
 
-
 #   if defined(ESP32)
   addRowLabel(F("ESP Chip Features"));
   addHtml(getChipFeaturesString());
@@ -694,97 +632,29 @@ void handle_sysinfo_ESP_Board() {
 void handle_sysinfo_Storage() {
   addTableSeparator(F("Storage"), 2, 3);
 
-  if (getFlashChipId() != 0) {
-    addRowLabel(LabelType::FLASH_CHIP_ID);
-
-
-    // Set to HEX may be something like 0x1640E0.
-    // Where manufacturer is 0xE0 and device is 0x4016.
-    addHtml(F("Vendor: "));
-    addHtml(getValue(LabelType::FLASH_CHIP_VENDOR));
-
-    if (flashChipVendorPuya())
-    {
-      addHtml(F(" (PUYA"));
-
-      if (puyaSupport()) {
-        addHtml(F(", supported"));
-      } else {
-        addHtml(F(HTML_SYMBOL_WARNING));
-      }
-      addHtml(')');
-    }
-    addHtml(F(" Device: "));
-    addHtml(getValue(LabelType::FLASH_CHIP_MODEL));
-    #   ifdef ESP32
-
-    if (getChipFeatures().embeddedFlash) {
-      addHtml(F(" (Embedded)"));
-    }
-    #   endif // ifdef ESP32
-  }
-  const uint32_t realSize = getFlashRealSizeInBytes();
-  const uint32_t ideSize  = ESP.getFlashChipSize();
-
-  addRowLabel(LabelType::FLASH_CHIP_REAL_SIZE);
-  addHtmlInt(realSize / 1024);
-  addHtml(F(" [kB]"));
-
-  addRowLabel(LabelType::FLASH_IDE_SIZE);
-  addHtmlInt(ideSize / 1024);
-  addHtml(F(" [kB]"));
-
-  addRowLabel(LabelType::FLASH_CHIP_SPEED);
-  addHtmlInt(getFlashChipSpeed() / 1000000);
-  addHtml(F(" [MHz]"));
-
-  // Please check what is supported for the ESP32
-  addRowLabel(LabelType::FLASH_IDE_SPEED);
-  addHtmlInt(ESP.getFlashChipSpeed() / 1000000);
-  addHtml(F(" [MHz]"));
-
-  addRowLabelValue(LabelType::FLASH_IDE_MODE);
-
-  addRowLabel(LabelType::FLASH_WRITE_COUNT);
-  addHtml(strformat(
-    F("%d daily / %d cold boot"),
-    RTC.flashDayCounter,
-    static_cast(RTC.flashCounter)));
-
+  static const LabelType::Enum labels[] PROGMEM =
   {
-    uint32_t maxSketchSize;
-    bool     use2step;
-    #   if defined(ESP8266)
-    bool otaEnabled =
-    #   endif // if defined(ESP8266)
-    OTA_possible(maxSketchSize, use2step);
+    LabelType::FLASH_CHIP_ID,
+    LabelType::FLASH_CHIP_VENDOR,
+    LabelType::FLASH_CHIP_MODEL,
+    LabelType::FLASH_CHIP_REAL_SIZE,
+    LabelType::FLASH_IDE_SIZE,
+    LabelType::FLASH_CHIP_SPEED,
+    LabelType::FLASH_IDE_SPEED,
+    LabelType::FLASH_IDE_MODE,
+    LabelType::FLASH_WRITE_COUNT,
+    LabelType::SKETCH_SIZE,
+    LabelType::MAX_OTA_SKETCH_SIZE,
+#   ifdef ESP8266
+    LabelType::OTA_POSSIBLE,
+    LabelType::OTA_2STEP,
+#   endif // ifdef ESP8266
+    LabelType::FS_SIZE,
 
-    addRowLabel(LabelType::SKETCH_SIZE);
-    addHtml(strformat(
-              F("%d [kB] (%d kB not used)"),
-              getSketchSize() / 1024,
-              (maxSketchSize - getSketchSize()) / 1024));
+    LabelType::MAX_LABEL
+  };
 
-    addRowLabel(LabelType::MAX_OTA_SKETCH_SIZE);
-    addHtml(strformat(
-              F("%d [kB] (%d bytes)"),
-              maxSketchSize / 1024,
-              maxSketchSize));
-
-    #   if defined(ESP8266)
-    addRowLabel(LabelType::OTA_POSSIBLE);
-    addHtml(boolToString(otaEnabled));
-
-    addRowLabel(LabelType::OTA_2STEP);
-    addHtml(boolToString(use2step));
-    #   endif // if defined(ESP8266)
-  }
-
-  addRowLabel(LabelType::FS_SIZE);
-  addHtml(strformat(
-            F("%d [kB] (%d kB free)"),
-            SpiffsTotalBytes() / 1024,
-            SpiffsFreeSpace() / 1024));
+  addRowLabelValues(labels);
 
   #   ifndef LIMIT_BUILD_SIZE
   addRowLabel(F("Page size"));

From 3b5de88ffaca3831e2505785e17563daa011e7f9 Mon Sep 17 00:00:00 2001
From: Ton Huisman 
Date: Sat, 18 Oct 2025 21:14:07 +0200
Subject: [PATCH 389/564] [HTTP] Fix build and feature-enable for non-MAX
 builds

---
 src/src/CustomBuild/define_plugin_sets.h | 16 ++++++++--------
 src/src/Helpers/Networking.cpp           |  1 +
 2 files changed, 9 insertions(+), 8 deletions(-)

diff --git a/src/src/CustomBuild/define_plugin_sets.h b/src/src/CustomBuild/define_plugin_sets.h
index 95e1cab46..4537798c8 100644
--- a/src/src/CustomBuild/define_plugin_sets.h
+++ b/src/src/CustomBuild/define_plugin_sets.h
@@ -3263,14 +3263,6 @@ To create/register a plugin, you have to :
   #endif
 #endif
 
-#ifndef FEATURE_HTTP_TLS
-  #if defined(ESP32) && (FEATURE_SEND_TO_HTTP || FEATURE_POST_TO_HTTP || FEATURE_PUT_TO_HTTP)
-    #define FEATURE_HTTP_TLS 1
-  #else
-    #define FEATURE_HTTP_TLS 0
-  #endif
-#endif // ifndef FEATURE_HTTP_TLS
-
 #ifdef ESP8266
 // It just doesn't work on ESP8266, too slow, too high memory requirements
 //#if defined(LIMIT_BUILD_SIZE) || defined(ESP8266_1M)
@@ -3617,6 +3609,14 @@ To create/register a plugin, you have to :
   #define FEATURE_HTTP_CLIENT   1 // Enable because required for these controllers/features
 #endif
 
+#ifndef FEATURE_HTTP_TLS
+  #if defined(ESP32) && (FEATURE_SEND_TO_HTTP || FEATURE_POST_TO_HTTP || FEATURE_PUT_TO_HTTP)
+    #define FEATURE_HTTP_TLS 1
+  #else
+    #define FEATURE_HTTP_TLS 0
+  #endif
+#endif // ifndef FEATURE_HTTP_TLS
+
 #ifndef FEATURE_AUTO_DARK_MODE
   #ifdef LIMIT_BUILD_SIZE
     #define FEATURE_AUTO_DARK_MODE            0
diff --git a/src/src/Helpers/Networking.cpp b/src/src/Helpers/Networking.cpp
index d42540d2b..875ad810c 100644
--- a/src/src/Helpers/Networking.cpp
+++ b/src/src/Helpers/Networking.cpp
@@ -14,6 +14,7 @@
 #include "../Globals/ESPEasyEthEvent.h"
 #include "../Globals/ESPEasyWiFiEvent.h"
 #include "../Globals/ESPEasy_Scheduler.h"
+#include "../Globals/ESPEasy_time.h"
 
 #ifdef USES_ESPEASY_NOW
 #include "../Globals/ESPEasy_now_handler.h"

From 8221c92f01c4fc452a821b3b59e7d4ddb5b501ae Mon Sep 17 00:00:00 2001
From: Ton Huisman 
Date: Sat, 18 Oct 2025 21:14:32 +0200
Subject: [PATCH 390/564] [HTTP] Update documentation for TLS options

---
 docs/source/Controller/_Controller.rst |  4 ++++
 docs/source/Plugin/P000_commands.repl  | 18 ++++++++++++++++++
 2 files changed, 22 insertions(+)

diff --git a/docs/source/Controller/_Controller.rst b/docs/source/Controller/_Controller.rst
index 801956148..05f1d5251 100644
--- a/docs/source/Controller/_Controller.rst
+++ b/docs/source/Controller/_Controller.rst
@@ -52,6 +52,10 @@ Generic fields
 - **Controller Port** - TCP/UDP Port number (0...65536)
 - **Enabled** - Whether or not the controller is active.
 
+When **TLS** is included in the build, some of the Controllers have a setting to enable a TLS option. For HTTP-based controller protocols, this usually expects the port to adjusted from 80 to 443, but of course any custom port can be used. For MQTT controllers, the port is automatically updated from 1883 (No TLS) to 8883 when a TLS-enabled setting is selected.
+
+- **Use TLS** - Select the desired TLS type. The available options depend on what's implemented, and will change when development progresses. The default setting is **No TLS**. 
+
 Send queue parameters
 ---------------------
 
diff --git a/docs/source/Plugin/P000_commands.repl b/docs/source/Plugin/P000_commands.repl
index 2a1d41a47..a7e18efd0 100644
--- a/docs/source/Plugin/P000_commands.repl
+++ b/docs/source/Plugin/P000_commands.repl
@@ -521,6 +521,12 @@
     Added: 2023-01-15
     "
     "
+    PostToHTTPS","
+    :green:`Rules`","
+    Like ``PostToHTTP`` but using a TLS connection, by default on port 443
+
+    NB: No certificate validation is done!
+    "
     ProvisionConfig","
     :red:`Internal`","
     Fetch ``config.dat`` as configured in the Provisioning configuration (see Settings Archive)
@@ -622,6 +628,12 @@
     Added: 2023-04-17
     "
     "
+    PutToHTTPS","
+    :green:`Rules`","
+    Like ``PutToHTTP`` but using a TLS connection, by default on port 443
+
+    NB: No certificate validation is done!
+    "
     Reboot","
     :red:`Internal`","
     Reboot the ESP
@@ -696,6 +708,12 @@
     On completion of the command, the returned status code can be handled in a generated event, f.e. ``http#hostname=404`` for not found error, or ``http#hostname=200`` for success.
     "
     "
+    SendToHTTPS","
+    :green:`Rules`","
+    Like ``SendToHTTP`` but using a TLS connection, by default on port 443
+
+    NB: No certificate validation is done!
+    "
     SendToUDP","
     :green:`Rules`","
     Send command to other network device using UDP (non-ESP Easy units)

From 7e8371c85e470b0ef110db79f5c247e7022dc372 Mon Sep 17 00:00:00 2001
From: TD-er 
Date: Sat, 18 Oct 2025 23:57:11 +0200
Subject: [PATCH 391/564] [Cleanup] Make ESP8266 builds fit again + tweak
 reducing generated HTML

---
 src/src/CustomBuild/define_plugin_sets.h     |   5 +
 src/src/DataStructs/PluginStats.h            |   2 +
 src/src/DataStructs/PluginStats_array.cpp    |  12 +-
 src/src/Globals/Plugins.cpp                  |   4 +-
 src/src/Globals/Statistics.cpp               |   3 +-
 src/src/Globals/Statistics.h                 |   4 +-
 src/src/Helpers/KeyValueWriter_JSON.cpp      |  41 +-
 src/src/Helpers/KeyValueWriter_JSON.h        |   6 +-
 src/src/Helpers/StringProvider.cpp           | 537 ++++++++-----------
 src/src/Helpers/StringProvider.h             |   4 +-
 src/src/WebServer/Chart_JS.cpp               |  10 +-
 src/src/WebServer/Chart_JS.h                 |   3 +-
 src/src/WebServer/HTML_wrappers.cpp          |  55 +-
 src/src/WebServer/HTML_wrappers.h            |   1 +
 src/src/WebServer/KeyValueWriter_WebForm.cpp |   3 +-
 src/src/WebServer/Markup_Forms.cpp           |   4 +-
 src/src/WebServer/SysInfoPage.cpp            |   3 +-
 17 files changed, 309 insertions(+), 388 deletions(-)

diff --git a/src/src/CustomBuild/define_plugin_sets.h b/src/src/CustomBuild/define_plugin_sets.h
index 172d78a3f..b12ebdca0 100644
--- a/src/src/CustomBuild/define_plugin_sets.h
+++ b/src/src/CustomBuild/define_plugin_sets.h
@@ -3878,8 +3878,13 @@ To create/register a plugin, you have to :
 
 #ifndef FEATURE_CLEAR_I2C_STUCK
   #ifdef ESP8266
+  #ifdef ESP8266_1M
+    // Typically 1M builds do not use any I2C
+    #define FEATURE_CLEAR_I2C_STUCK 0
+  #else
     #define FEATURE_CLEAR_I2C_STUCK 1
   #endif
+  #endif
   #ifdef ESP32
     #if ESP_IDF_VERSION_MAJOR >= 5
       // Messing with the I2C pin mode doesn't work well on IDF5.x
diff --git a/src/src/DataStructs/PluginStats.h b/src/src/DataStructs/PluginStats.h
index f0618cf07..c3ab83bb1 100644
--- a/src/src/DataStructs/PluginStats.h
+++ b/src/src/DataStructs/PluginStats.h
@@ -68,6 +68,8 @@ public:
     return _maxValue >= _minValue;
   }
 
+  uint8_t getNrDecimals() const { return _nrDecimals; }
+
   // Set the peaks to unset values
   void   resetPeaks();
 
diff --git a/src/src/DataStructs/PluginStats_array.cpp b/src/src/DataStructs/PluginStats_array.cpp
index 5b7507f9a..ae503b591 100644
--- a/src/src/DataStructs/PluginStats_array.cpp
+++ b/src/src/DataStructs/PluginStats_array.cpp
@@ -521,11 +521,14 @@ void PluginStats_array::plot_ChartJS_scatter(
                   auto data = add_ChartJS_dataset_header(*dataset, datasetConfig);
 
                   if (data) {
+
+                    const uint8_t nrDecimalsX = stats_X->getNrDecimals();
+                    const uint8_t nrDecimalsY = stats_Y->getNrDecimals();
                     // Add scatter data
                     for (size_t i = 0; i < nrSamples; ++i) {
                       const float valX = (*stats_X)[i];
                       const float valY = (*stats_Y)[i];
-                      add_ChartJS_scatter_data_point(*data, valX, valY, 6);
+                      add_ChartJS_scatter_data_point(*data, valX, valY, nrDecimalsX, nrDecimalsY);
                     }
                   }
                 }
@@ -550,7 +553,12 @@ void PluginStats_array::plot_ChartJS_scatter(
                   if (data) {
                     const float valX = stats_X->getSampleAvg();
                     const float valY = stats_Y->getSampleAvg();
-                    add_ChartJS_scatter_data_point(*data, valX, valY, 6);
+                    add_ChartJS_scatter_data_point(
+                      *data, 
+                      valX, 
+                      valY, 
+                      stats_X->getNrDecimals(), 
+                      stats_Y->getNrDecimals());
                   }
                 }
               }
diff --git a/src/src/Globals/Plugins.cpp b/src/src/Globals/Plugins.cpp
index 1045c5a9e..d18e4c40c 100644
--- a/src/src/Globals/Plugins.cpp
+++ b/src/src/Globals/Plugins.cpp
@@ -218,11 +218,11 @@ bool prepare_I2C_by_taskIndex(taskIndex_t taskIndex, deviceIndex_t DeviceIndex)
   if (!Settings.isI2CEnabled(Settings.getI2CInterface(taskIndex))) {
     return false; // Plugin-selected I2C bus is not configured, fail
   }
-
+#if FEATURE_CLEAR_I2C_STUCK
   if (I2C_state != I2C_bus_state::OK) {
     return false; // Bus state is not OK, so do not consider task runnable
   }
-
+#endif
   #if FEATURE_I2C_MULTIPLE
   const uint8_t i2cBus = Settings.getI2CInterface(taskIndex);
   #else // if FEATURE_I2C_MULTIPLE
diff --git a/src/src/Globals/Statistics.cpp b/src/src/Globals/Statistics.cpp
index 6833b752b..d2b73b1c5 100644
--- a/src/src/Globals/Statistics.cpp
+++ b/src/src/Globals/Statistics.cpp
@@ -29,6 +29,7 @@ uint32_t dailyResetCounter                   = 0;
 
 ESPEASY_VOLATILE(uint32_t) sw_watchdog_callback_count{};
 
-
+#if FEATURE_CLEAR_I2C_STUCK
 I2C_bus_state I2C_state = I2C_bus_state::OK;
 uint32_t I2C_bus_cleared_count = 0;
+#endif
\ No newline at end of file
diff --git a/src/src/Globals/Statistics.h b/src/src/Globals/Statistics.h
index e848eecf1..f7b846f86 100644
--- a/src/src/Globals/Statistics.h
+++ b/src/src/Globals/Statistics.h
@@ -44,9 +44,9 @@ extern float loop_usec_duration_total;
 extern uint32_t dailyResetCounter;
 extern ESPEASY_VOLATILE(uint32_t) sw_watchdog_callback_count;
 
-
+#if FEATURE_CLEAR_I2C_STUCK
 extern I2C_bus_state I2C_state;
 extern uint32_t I2C_bus_cleared_count;
-
+#endif
 
 #endif // GLOBALS_STATISTICS_H
diff --git a/src/src/Helpers/KeyValueWriter_JSON.cpp b/src/src/Helpers/KeyValueWriter_JSON.cpp
index 5366ea344..bd1aca348 100644
--- a/src/src/Helpers/KeyValueWriter_JSON.cpp
+++ b/src/src/Helpers/KeyValueWriter_JSON.cpp
@@ -40,14 +40,20 @@ KeyValueWriter_JSON::KeyValueWriter_JSON(const __FlashStringHelper *header, KeyV
 KeyValueWriter_JSON::~KeyValueWriter_JSON()
 {
   if (!_isEmpty) {
+#ifdef USE_KWH_JSON_PRETTY_PRINT
     getPrint().write('\n');
+#endif
 
     if (_hasHeader) {
-#ifdef USE_KVW_JSON_INDENT
+#ifdef USE_KWH_JSON_PRETTY_PRINT
       indent();
 #endif
 
       getPrint().write(_isArray ? ']' : '}');
+#ifndef USE_KWH_JSON_PRETTY_PRINT
+      if (_isArray) getPrint().write('\n');
+#endif
+
     }
   }
 
@@ -63,16 +69,22 @@ void KeyValueWriter_JSON::write()
     if (_parent != nullptr) { _parent->write(); }
 
     if (_hasHeader) {
-#ifdef USE_KVW_JSON_INDENT
+#ifdef USE_KWH_JSON_PRETTY_PRINT
       indent();
 #endif
 
       if (_header.isEmpty()) {
         getPrint().write('{');
+#ifdef USE_KWH_JSON_PRETTY_PRINT
         getPrint().write('\n');
+#endif
       } else {
         getPrint().print(strformat(
+#ifdef USE_KWH_JSON_PRETTY_PRINT
                            F("\"%s\":%c\n"),
+#else
+                           F("\"%s\":%c"),
+#endif
                            _header.c_str(),
                            _isArray ? '[' : '{'));
       }
@@ -80,7 +92,9 @@ void KeyValueWriter_JSON::write()
     _isEmpty = false;
   } else {
     getPrint().write(',');
+#ifdef USE_KWH_JSON_PRETTY_PRINT
     getPrint().write('\n');
+#endif
   }
 }
 
@@ -88,10 +102,10 @@ void KeyValueWriter_JSON::write(const KeyValueStruct& kv)
 {
   if (kv._format == KeyValueStruct::Format::Note) { return; }
   write();
-#ifdef USE_KVW_JSON_INDENT
+#ifdef USE_KWH_JSON_PRETTY_PRINT
   indent();
   getPrint().write('\t');
-#endif // ifdef USE_KVW_JSON_INDENT
+#endif // ifdef USE_KWH_JSON_PRETTY_PRINT
 
   if (kv._key.length()) {
     auto& pr = getPrint();
@@ -117,24 +131,30 @@ void KeyValueWriter_JSON::write(const KeyValueStruct& kv)
     // Multiple values, so we must wrap it in []
     auto& pr = getPrint();
     pr.write('[');
+#ifdef USE_KWH_JSON_PRETTY_PRINT
     pr.write('\n');
-
+#endif
     for (size_t i = 0; i < nrValues; ++i) {
       if (i != 0) {
         auto& pr = getPrint();
         pr.write(',');
+#ifdef USE_KWH_JSON_PRETTY_PRINT
         pr.write('\n');
+#endif
       }
-#ifdef USE_KVW_JSON_INDENT
+#ifdef USE_KWH_JSON_PRETTY_PRINT
       indent();
       auto& pr = getPrint();
       pr.write('\t');
       pr.write('\t');
-#endif // ifdef USE_KVW_JSON_INDENT
+#endif // ifdef USE_KWH_JSON_PRETTY_PRINT
 
       writeValue(kv._values[i].get());
     }
     getPrint().write(']');
+#ifndef USE_KWH_JSON_PRETTY_PRINT
+    getPrint().write('\n');
+#endif
   }
 }
 
@@ -205,7 +225,8 @@ Up_KeyValueWriter KeyValueWriter_JSON::createChildArray(const String& header)
   if (child) {
     child->setIsArray();
   }
-  return std::move(child);
+  //return std::move(child);
+  return child;
 }
 
 Up_KeyValueWriter KeyValueWriter_JSON::createNew()
@@ -230,7 +251,7 @@ Up_KeyValueWriter KeyValueWriter_JSON::createNew(const String& header)
   // return std::make_unique(header, _toString);
 }
 
-#ifdef USE_KVW_JSON_INDENT
+#ifdef USE_KWH_JSON_PRETTY_PRINT
 
 void KeyValueWriter_JSON::indent()
 {
@@ -240,4 +261,4 @@ void KeyValueWriter_JSON::indent()
   }
 }
 
-#endif // ifdef USE_KVW_JSON_INDENT
+#endif // ifdef USE_KWH_JSON_PRETTY_PRINT
diff --git a/src/src/Helpers/KeyValueWriter_JSON.h b/src/src/Helpers/KeyValueWriter_JSON.h
index f8ebc38a6..c1b5df6af 100644
--- a/src/src/Helpers/KeyValueWriter_JSON.h
+++ b/src/src/Helpers/KeyValueWriter_JSON.h
@@ -3,7 +3,7 @@
 #include "../Helpers/KeyValueWriter.h"
 
 #ifndef BUILD_NO_DEBUG
- # define USE_KVW_JSON_INDENT
+// # define USE_KWH_JSON_PRETTY_PRINT
 #endif
 
 class KeyValueWriter_JSON : public KeyValueWriter
@@ -74,12 +74,12 @@ private:
 
   void writeValue(const ValueStruct* value);
 
-#ifdef USE_KVW_JSON_INDENT
+#ifdef USE_KWH_JSON_PRETTY_PRINT
 
 protected:
 
   virtual void indent() override;
-#endif // ifdef USE_KVW_JSON_INDENT
+#endif // ifdef USE_KWH_JSON_PRETTY_PRINT
 
 
 }; // class KeyValueWriter_JSON
diff --git a/src/src/Helpers/StringProvider.cpp b/src/src/Helpers/StringProvider.cpp
index 4e95afa3d..f017747a4 100644
--- a/src/src/Helpers/StringProvider.cpp
+++ b/src/src/Helpers/StringProvider.cpp
@@ -48,44 +48,46 @@
 # include 
 #endif
 
+#ifndef LIMIT_BUILD_SIZE
+# define KV_SETUNIT(S) kv.setUnit(S)
+# define KV_SETID(S) kv.setID(S)
+#else // ifndef LIMIT_BUILD_SIZE
+# define KV_SETUNIT(S)
+# define KV_SETID(S)
+#endif // ifndef LIMIT_BUILD_SIZE
+
 KeyValueStruct getKeyValue(LabelType::Enum label, bool extendedValue)
 {
   switch (label)
   {
     case LabelType::UNIT_NR:
     {
-      KeyValueStruct kv(F("Unit Number"), Settings.Unit);
-      return kv;
+      return KeyValueStruct(F("Unit Number"), Settings.Unit);
     }
     #if FEATURE_ZEROFILLED_UNITNUMBER
     case LabelType::UNIT_NR_0:
     {
       // Fixed 3-digit unitnumber
-      KeyValueStruct kv(F("Unit Number 0-filled"), formatIntLeadingZeroes(Settings.Unit, 3));
-      return kv;
+      return KeyValueStruct(F("Unit Number 0-filled"), formatIntLeadingZeroes(Settings.Unit, 3));
     }
     #endif // FEATURE_ZEROFILLED_UNITNUMBER
     case LabelType::UNIT_NAME:
     {
       // Only return the set name, no appended unit.
-      KeyValueStruct kv(F("Unit Name"), Settings.getName());
-      return kv;
+      return KeyValueStruct(F("Unit Name"), Settings.getName());
     }
     case LabelType::HOST_NAME:
     {
-      KeyValueStruct kv(F("Hostname"), ESPEasy::net::NetworkGetHostname());
-      return kv;
+      return KeyValueStruct(F("Hostname"), ESPEasy::net::NetworkGetHostname());
     }
 
     case LabelType::LOCAL_TIME:
 
       if (node_time.systemTimePresent())
       {
-        KeyValueStruct kv(F("Local Time"), node_time.getDateTimeString('-', ':', ' '));
-        return kv;
+        return KeyValueStruct(F("Local Time"), node_time.getDateTimeString('-', ':', ' '));
       } else if (extendedValue) {
-        KeyValueStruct kv(F("Local Time"), F("No system time source"));
-        return kv;
+        return KeyValueStruct(F("Local Time"), F("No system time source"));
       }
       break;
     case LabelType::TIME_SOURCE:
@@ -101,8 +103,7 @@ KeyValueStruct getKeyValue(LabelType::Enum label, bool extendedValue)
           timeSource_str = strformat(F("%s (%u)"), timeSource_str.c_str(), node_time.timeSource_p2p_unit);
         }
 
-        KeyValueStruct kv(F("Time Source"), timeSource_str);
-        return kv;
+        return KeyValueStruct(F("Time Source"), timeSource_str);
       }
       break;
     case LabelType::TIME_WANDER:
@@ -110,7 +111,7 @@ KeyValueStruct getKeyValue(LabelType::Enum label, bool extendedValue)
       if (node_time.systemTimePresent())
       {
         KeyValueStruct kv(F("Time Wander"), node_time.timeWander, 3);
-        kv.setUnit(F("ppm"));
+        KV_SETUNIT(F("ppm"));
         return kv;
       }
       break;
@@ -128,18 +129,17 @@ KeyValueStruct getKeyValue(LabelType::Enum label, bool extendedValue)
         breakTime(unixtime, RTC_time);
         rtcTime = formatDateTimeString(RTC_time);
       }
-      KeyValueStruct kv(F("UTC time stored in RTC chip"), rtcTime);
-      return kv;
+      return KeyValueStruct(F("UTC time stored in RTC chip"), rtcTime);
     }
     #endif // if FEATURE_EXT_RTC
     case LabelType::UPTIME:
     {
       if (extendedValue) {
-        KeyValueStruct kv(F("Uptime"), minutesToDayHourMinute(getUptimeMinutes()));
-        return kv;
+        return KeyValueStruct(F("Uptime"), minutesToDayHourMinute(getUptimeMinutes()));
+
       } else {
-        KeyValueStruct kv(F("Uptime"), getUptimeMinutes());
-        return kv;
+        return KeyValueStruct(F("Uptime"), getUptimeMinutes());
+
       }
     }
     case LabelType::LOAD_PCT:
@@ -147,62 +147,56 @@ KeyValueStruct getKeyValue(LabelType::Enum label, bool extendedValue)
       if (wdcounter > 0)
       {
         if (extendedValue) {
-          KeyValueStruct kv(F("Load"), strformat(
-                              F("%.2f [%%] (LC=%d)"),
-                              getCPUload(),
-                              getLoopCountPerSec()));
-          return kv;
+          return KeyValueStruct(F("Load"), strformat(
+                                  F("%.2f [%%] (LC=%d)"),
+                                  getCPUload(),
+                                  getLoopCountPerSec()));
         }
         KeyValueStruct kv(F("Load"), getCPUload(), 2);
-        kv.setUnit(F("%"));
+        KV_SETUNIT(F("%"));
         return kv;
       }
       break;
     case LabelType::LOOP_COUNT:
     {
       if (extendedValue) { break; }
-      KeyValueStruct kv(F("Load LC"), getLoopCountPerSec());
-      return kv;
+      return KeyValueStruct(F("Load LC"), getLoopCountPerSec());
     }
     case LabelType::CPU_ECO_MODE:
     {
-      KeyValueStruct kv(F("CPU Eco Mode"), Settings.EcoPowerMode());
-      return kv;
+      return KeyValueStruct(F("CPU Eco Mode"), Settings.EcoPowerMode());
     }
 #if FEATURE_SET_WIFI_TX_PWR
     case LabelType::WIFI_TX_MAX_PWR:
     {
       KeyValueStruct kv(F("Max WiFi TX Power"), Settings.getWiFi_TX_power(), 2);
-      kv.setUnit(F("dBm"));
+      KV_SETUNIT(F("dBm"));
       return kv;
     }
     case LabelType::WIFI_CUR_TX_PWR:
     {
       KeyValueStruct kv(F("Current WiFi TX Power"), ESPEasy::net::wifi::GetWiFiTXpower(), 2);
-      kv.setUnit(F("dBm"));
+      KV_SETUNIT(F("dBm"));
       return kv;
     }
     case LabelType::WIFI_SENS_MARGIN:
     {
       KeyValueStruct kv(F("WiFi Sensitivity Margin"), Settings.WiFi_sensitivity_margin);
-      kv.setUnit(F("dB"));
+      KV_SETUNIT(F("dB"));
       return kv;
     }
     case LabelType::WIFI_SEND_AT_MAX_TX_PWR:
     {
-      KeyValueStruct kv(F("Send With Max TX Power"), Settings.UseMaxTXpowerForSending());
-      return kv;
+      return KeyValueStruct(F("Send With Max TX Power"), Settings.UseMaxTXpowerForSending());
     }
 #endif // if FEATURE_SET_WIFI_TX_PWR
     case LabelType::WIFI_NR_EXTRA_SCANS:
     {
-      KeyValueStruct kv(F("Extra WiFi scan loops"), Settings.NumberExtraWiFiScans);
-      return kv;
+      return KeyValueStruct(F("Extra WiFi scan loops"), Settings.NumberExtraWiFiScans);
     }
     case LabelType::WIFI_USE_LAST_CONN_FROM_RTC:
     {
-      KeyValueStruct kv(F("Use Last Connected AP from RTC"), Settings.UseLastWiFiFromRTC());
-      return kv;
+      return KeyValueStruct(F("Use Last Connected AP from RTC"), Settings.UseLastWiFiFromRTC());
     }
 
     case LabelType::FREE_MEM:
@@ -210,18 +204,17 @@ KeyValueStruct getKeyValue(LabelType::Enum label, bool extendedValue)
 #ifndef BUILD_NO_RAM_TRACKER
 
       if (extendedValue) {
-        KeyValueStruct kv(F("Free RAM"),
-                          strformat(
-                            F("%d [byte] (%d - %s)"),
-                            FreeMem(),
-                            lowestRAM,
-                            lowestRAMfunction.c_str()));
-        return kv;
+        return KeyValueStruct(F("Free RAM"),
+                              strformat(
+                                F("%d [byte] (%d - %s)"),
+                                FreeMem(),
+                                lowestRAM,
+                                lowestRAMfunction.c_str()));
       }
 #endif // ifndef BUILD_NO_RAM_TRACKER
 
       KeyValueStruct kv(F("Free RAM"), FreeMem());
-      kv.setUnit(F("byte"));
+      KV_SETUNIT(F("byte"));
       return kv;
     }
     case LabelType::FREE_STACK:
@@ -229,18 +222,16 @@ KeyValueStruct getKeyValue(LabelType::Enum label, bool extendedValue)
 #ifndef BUILD_NO_RAM_TRACKER
 
       if (extendedValue) {
-        KeyValueStruct kv(F("Free Stack"),
-                          strformat(
-                            F("%d [byte] (%d - %s)"),
-                            getCurrentFreeStack(),
-                            lowestFreeStack,
-                            lowestFreeStackfunction.c_str()));
-
-        return kv;
+        return KeyValueStruct(F("Free Stack"),
+                              strformat(
+                                F("%d [byte] (%d - %s)"),
+                                getCurrentFreeStack(),
+                                lowestFreeStack,
+                                lowestFreeStackfunction.c_str()));
       }
 #endif // ifndef BUILD_NO_RAM_TRACKER
       KeyValueStruct kv(F("Free Stack"), getCurrentFreeStack());
-      kv.setUnit(F("byte"));
+      KV_SETUNIT(F("byte"));
 
       return kv;
     }
@@ -248,7 +239,7 @@ KeyValueStruct getKeyValue(LabelType::Enum label, bool extendedValue)
     case LabelType::FREE_HEAP_IRAM:
     {
       KeyValueStruct kv(F("Free 2nd Heap"), FreeMem2ndHeap());
-      kv.setUnit(F("byte"));
+      KV_SETUNIT(F("byte"));
       return kv;
     }
 #endif // ifdef USE_SECOND_HEAP
@@ -264,7 +255,7 @@ KeyValueStruct getKeyValue(LabelType::Enum label, bool extendedValue)
                         ESP.getMaxFreeBlockSize()
 #  endif // ifdef ESP32
                         );
-      kv.setUnit(F("byte"));
+      KV_SETUNIT(F("byte"));
       return kv;
     }
   # endif // ifndef LIMIT_BUILD_SIZE
@@ -274,7 +265,7 @@ KeyValueStruct getKeyValue(LabelType::Enum label, bool extendedValue)
     case LabelType::HEAP_FRAGMENTATION:
     {
       KeyValueStruct kv(F("Heap Fragmentation"), ESP.getHeapFragmentation());
-      kv.setUnit(F("%"));
+      KV_SETUNIT(F("%"));
       return kv;
     }
   # endif // ifndef LIMIT_BUILD_SIZE
@@ -284,13 +275,13 @@ KeyValueStruct getKeyValue(LabelType::Enum label, bool extendedValue)
     case LabelType::HEAP_SIZE:
     {
       KeyValueStruct kv(F("Heap Size"), ESP.getHeapSize());
-      kv.setUnit(F("byte"));
+      KV_SETUNIT(F("byte"));
       return kv;
     }
     case LabelType::HEAP_MIN_FREE:
     {
       KeyValueStruct kv(F("Heap Min Free"), ESP.getMinFreeHeap());
-      kv.setUnit(F("byte"));
+      KV_SETUNIT(F("byte"));
       return kv;
     }
     # ifdef BOARD_HAS_PSRAM
@@ -298,28 +289,28 @@ KeyValueStruct getKeyValue(LabelType::Enum label, bool extendedValue)
     {
       if (!UsePSRAM()) { break; }
       KeyValueStruct kv(F("PSRAM Size"), ESP.getPsramSize());
-      kv.setUnit(F("byte"));
+      KV_SETUNIT(F("byte"));
       return kv;
     }
     case LabelType::PSRAM_FREE:
     {
       if (!UsePSRAM()) { break; }
       KeyValueStruct kv(F("PSRAM Free"), ESP.getFreePsram());
-      kv.setUnit(F("byte"));
+      KV_SETUNIT(F("byte"));
       return kv;
     }
     case LabelType::PSRAM_MIN_FREE:
     {
       if (!UsePSRAM()) { break; }
       KeyValueStruct kv(F("PSRAM Min Free"), ESP.getMinFreePsram());
-      kv.setUnit(F("byte"));
+      KV_SETUNIT(F("byte"));
       return kv;
     }
     case LabelType::PSRAM_MAX_FREE_BLOCK:
     {
       if (!UsePSRAM()) { break; }
       KeyValueStruct kv(F("PSRAM Max Free Block"), ESP.getMaxAllocPsram());
-      kv.setUnit(F("byte"));
+      KV_SETUNIT(F("byte"));
       return kv;
     }
     # endif // BOARD_HAS_PSRAM
@@ -327,120 +318,101 @@ KeyValueStruct getKeyValue(LabelType::Enum label, bool extendedValue)
 
     case LabelType::JSON_BOOL_QUOTES:
     {
-      KeyValueStruct kv(F("JSON bool output without quotes"), Settings.JSONBoolWithoutQuotes());
-      return kv;
+      return KeyValueStruct(F("JSON bool output without quotes"), Settings.JSONBoolWithoutQuotes());
     }
 #if FEATURE_TIMING_STATS
     case LabelType::ENABLE_TIMING_STATISTICS:
     {
-      KeyValueStruct kv(F("Collect Timing Statistics"), Settings.EnableTimingStats());
-      return kv;
+      return KeyValueStruct(F("Collect Timing Statistics"), Settings.EnableTimingStats());
     }
 #endif // if FEATURE_TIMING_STATS
     case LabelType::ENABLE_RULES_CACHING:
     {
-      KeyValueStruct kv(F("Enable Rules Cache"), Settings.EnableRulesCaching());
-      return kv;
+      return KeyValueStruct(F("Enable Rules Cache"), Settings.EnableRulesCaching());
     }
     case LabelType::ENABLE_SERIAL_PORT_CONSOLE:
     {
-      KeyValueStruct kv(F("Enable Serial Port Console"), !!Settings.UseSerial);
-      return kv;
+      return KeyValueStruct(F("Enable Serial Port Console"), !!Settings.UseSerial);
     }
     case LabelType::CONSOLE_SERIAL_PORT:
     {
-      KeyValueStruct kv(F("Console Serial Port"), ESPEasy_Console.getPortDescription());
-      return kv;
+      return KeyValueStruct(F("Console Serial Port"), ESPEasy_Console.getPortDescription());
     }
 #if USES_ESPEASY_CONSOLE_FALLBACK_PORT
     case LabelType::CONSOLE_FALLBACK_TO_SERIAL0:
     {
-      KeyValueStruct kv(F("Fallback to Serial 0"), Settings.console_serial0_fallback);
-      return kv;
+      return KeyValueStruct(F("Fallback to Serial 0"), Settings.console_serial0_fallback);
     }
     case LabelType::CONSOLE_FALLBACK_PORT:
     {
-      KeyValueStruct kv(F("Console Fallback Port"), ESPEasy_Console.getFallbackPortDescription());
-      return kv;
+      return KeyValueStruct(F("Console Fallback Port"), ESPEasy_Console.getFallbackPortDescription());
     }
 #endif // if USES_ESPEASY_CONSOLE_FALLBACK_PORT
 
     //    case LabelType::ENABLE_RULES_EVENT_REORDER: {
-    // KeyValueStruct kv(F("Optimize Rules Cache Event Order"), Settings.EnableRulesEventReorder());
-    // return kv;
+    // return KeyValueStruct( F("Optimize Rules Cache Event Order"), Settings.EnableRulesEventReorder() );
     // } // TD-er: Disabled for now
     case LabelType::TASKVALUESET_ALL_PLUGINS:
     {
-      KeyValueStruct kv(F("Allow TaskValueSet on all plugins"), Settings.AllowTaskValueSetAllPlugins());
-      return kv;
+      return KeyValueStruct(F("Allow TaskValueSet on all plugins"), Settings.AllowTaskValueSetAllPlugins());
     }
     case LabelType::ALLOW_OTA_UNLIMITED:
     {
-      KeyValueStruct kv(F("Allow OTA without size-check"), Settings.AllowOTAUnlimited());
-      return kv;
+      return KeyValueStruct(F("Allow OTA without size-check"), Settings.AllowOTAUnlimited());
     }
 #if FEATURE_CLEAR_I2C_STUCK
     case LabelType::ENABLE_CLEAR_HUNG_I2C_BUS:
     {
-      KeyValueStruct kv(F("Try clear I2C bus when stuck"), Settings.EnableClearHangingI2Cbus());
-      return kv;
+      return KeyValueStruct(F("Try clear I2C bus when stuck"), Settings.EnableClearHangingI2Cbus());
     }
 #endif // if FEATURE_CLEAR_I2C_STUCK
     #if FEATURE_I2C_DEVICE_CHECK
     case LabelType::ENABLE_I2C_DEVICE_CHECK:
     {
-      KeyValueStruct kv(F("Check I2C devices when enabled"), Settings.CheckI2Cdevice());
-      return kv;
+      return KeyValueStruct(F("Check I2C devices when enabled"), Settings.CheckI2Cdevice());
     }
     #endif // if FEATURE_I2C_DEVICE_CHECK
 #ifndef BUILD_NO_RAM_TRACKER
     case LabelType::ENABLE_RAM_TRACKING:
     {
-      KeyValueStruct kv(F("Enable RAM Tracker"), Settings.EnableRAMTracking());
-      return kv;
+      return KeyValueStruct(F("Enable RAM Tracker"), Settings.EnableRAMTracking());
     }
 #endif // ifndef BUILD_NO_RAM_TRACKER
 #if FEATURE_AUTO_DARK_MODE
     case LabelType::ENABLE_AUTO_DARK_MODE:
     {
-      KeyValueStruct kv(F("Web light/dark mode"), Settings.getCssMode());
-      return kv;
+      return KeyValueStruct(F("Web light/dark mode"), Settings.getCssMode());
     }
 #endif // FEATURE_AUTO_DARK_MODE
 #if FEATURE_RULES_EASY_COLOR_CODE
     case LabelType::DISABLE_RULES_AUTOCOMPLETE:
     {
-      KeyValueStruct kv(F("Disable Rules auto-completion"), Settings.DisableRulesCodeCompletion());
-      return kv;
+      return KeyValueStruct(F("Disable Rules auto-completion"), Settings.DisableRulesCodeCompletion());
     }
 #endif // if FEATURE_RULES_EASY_COLOR_CODE
 #if FEATURE_TARSTREAM_SUPPORT
     case LabelType::DISABLE_SAVE_CONFIG_AS_TAR:
     {
-      KeyValueStruct kv(F("Disable Save Config as .tar"), Settings.DisableSaveConfigAsTar());
-      return kv;
+      return KeyValueStruct(F("Disable Save Config as .tar"), Settings.DisableSaveConfigAsTar());
     }
 #endif // if FEATURE_TARSTREAM_SUPPORT
 #if FEATURE_TASKVALUE_UNIT_OF_MEASURE
     case LabelType::SHOW_UOM_ON_DEVICES_PAGE:
     {
-      KeyValueStruct kv(F("Show Unit of Measure"), Settings.ShowUnitOfMeasureOnDevicesPage());
-      return kv;
+      return KeyValueStruct(F("Show Unit of Measure"), Settings.ShowUnitOfMeasureOnDevicesPage());
     }
     #endif // if FEATURE_TASKVALUE_UNIT_OF_MEASURE
     #if FEATURE_MQTT_CONNECT_BACKGROUND
     case LabelType::MQTT_CONNECT_IN_BACKGROUND:
     {
-      KeyValueStruct kv(F("MQTT Connect in background"), Settings.MQTTConnectInBackground());
-      return kv;
+      return KeyValueStruct(F("MQTT Connect in background"), Settings.MQTTConnectInBackground());
     }
     #endif // if FEATURE_MQTT_CONNECT_BACKGROUND
 
 #if CONFIG_SOC_WIFI_SUPPORT_5G
     case LabelType::WIFI_BAND_MODE:
     {
-      KeyValueStruct kv(F("WiFi Band Mode"), ESPEasy::net::wifi::getWifiBandModeString(Settings.WiFi_band_mode()));
-      return kv;
+      return KeyValueStruct(F("WiFi Band Mode"), ESPEasy::net::wifi::getWifiBandModeString(Settings.WiFi_band_mode()));
     }
 #endif // if CONFIG_SOC_WIFI_SUPPORT_5G
 
@@ -454,72 +426,62 @@ KeyValueStruct getKeyValue(LabelType::Enum label, bool extendedValue)
             strformat(F(" (%d)"), RTC.bootCounter)));
         return kv;
       }
-      KeyValueStruct kv(F("Last Boot Cause"), getLastBootCauseString());
-      return kv;
+      return KeyValueStruct(F("Last Boot Cause"), getLastBootCauseString());
     }
     case LabelType::BOOT_COUNT:
     {
-      KeyValueStruct kv(F("Boot Count"), RTC.bootCounter);
-      return kv;
+      return KeyValueStruct(F("Boot Count"), RTC.bootCounter);
     }
     case LabelType::DEEP_SLEEP_ALTERNATIVE_CALL:
     {
-      KeyValueStruct kv(F("Deep Sleep Alternative"), Settings.UseAlternativeDeepSleep());
-      return kv;
+      return KeyValueStruct(F("Deep Sleep Alternative"), Settings.UseAlternativeDeepSleep());
     }
     case LabelType::RESET_REASON:
     {
-      KeyValueStruct kv(F("Reset Reason"), getResetReasonString());
-      return kv;
+      return KeyValueStruct(F("Reset Reason"), getResetReasonString());
     }
     case LabelType::LAST_TASK_BEFORE_REBOOT:
     {
-      KeyValueStruct kv(F("Last Action before Reboot"), ESPEasy_Scheduler::decodeSchedulerId(lastMixedSchedulerId_beforereboot));
-      return kv;
+      return KeyValueStruct(F("Last Action before Reboot"), ESPEasy_Scheduler::decodeSchedulerId(lastMixedSchedulerId_beforereboot));
     }
     case LabelType::SW_WD_COUNT:
     {
-      KeyValueStruct kv(F("SW WD count"), sw_watchdog_callback_count);
-      return kv;
+      return KeyValueStruct(F("SW WD count"), sw_watchdog_callback_count);
     }
 
     case LabelType::WIFI_CONNECTION:
     {
-      KeyValueStruct kv(F("WiFi Connection") /*, value*/);
-      return kv;
+      return KeyValueStruct(F("WiFi Connection") /*, value*/);
     }
     case LabelType::WIFI_RSSI:
     {
       if (extendedValue) {
-        KeyValueStruct kv(F("RSSI"), strformat(
-                            F("%d [dBm] (%s)"),
-                            WiFi.RSSI(),
-                            WiFi.SSID().c_str()));
-        return kv;
+        return KeyValueStruct(F("RSSI"), strformat(
+                                F("%d [dBm] (%s)"),
+                                WiFi.RSSI(),
+                                WiFi.SSID().c_str()));
       }
       KeyValueStruct kv(F("RSSI"), WiFi.RSSI());
-      kv.setUnit(F("dBm"));
+      KV_SETUNIT(F("dBm"));
       return kv;
     }
     case LabelType::IP_CONFIG:
     {
       KeyValueStruct kv(F("IP Config"), useStaticIP() ? F("static") : F("DHCP"));
-      kv.setID(F("dhcp"));
+      KV_SETID(F("dhcp"));
       return kv;
     }
 #if FEATURE_USE_IPV6
     case LabelType::IP6_LOCAL:
 
       if (Settings.EnableIPv6()) {
-        KeyValueStruct kv(F("IPv6 link local"), formatIP(ESPEasy::net::NetworkLocalIP6(), true));
-        return kv;
+        return KeyValueStruct(F("IPv6 link local"), formatIP(ESPEasy::net::NetworkLocalIP6(), true));
       }
       break;
     case LabelType::IP6_GLOBAL:
 
       if (Settings.EnableIPv6()) {
-        KeyValueStruct kv(F("IPv6 global"), formatIP(ESPEasy::net::NetworkGlobalIP6()));
-        return kv;
+        return KeyValueStruct(F("IPv6 global"), formatIP(ESPEasy::net::NetworkGlobalIP6()));
       }
       break;
 
@@ -536,33 +498,31 @@ KeyValueStruct getKeyValue(LabelType::Enum label, bool extendedValue)
     case LabelType::IP_ADDRESS:
     {
       KeyValueStruct kv(F("IP Address"), formatIP(ESPEasy::net::NetworkLocalIP()));
-      kv.setID(F("ip"));
+      KV_SETID(F("ip"));
       return kv;
     }
     case LabelType::IP_SUBNET:
     {
       KeyValueStruct kv(F("IP Subnet"), formatIP(ESPEasy::net::NetworkSubnetMask()));
-      kv.setID(F("subnet"));
+      KV_SETID(F("subnet"));
       return kv;
     }
     case LabelType::IP_ADDRESS_SUBNET:
     {
-      KeyValueStruct kv(F("IP / Subnet"), strformat(
-                          F("%s / %s"),
-                          getValue(LabelType::IP_ADDRESS).c_str(),
-                          getValue(LabelType::IP_SUBNET).c_str()));
-      return kv;
+      return KeyValueStruct(F("IP / Subnet"), strformat(
+                              F("%s / %s"),
+                              getValue(LabelType::IP_ADDRESS).c_str(),
+                              getValue(LabelType::IP_SUBNET).c_str()));
     }
     case LabelType::GATEWAY:
     {
       KeyValueStruct kv(F("Gateway"), formatIP(ESPEasy::net::NetworkGatewayIP()));
-      kv.setID(F("gw"));
+      KV_SETID(F("gw"));
       return kv;
     }
     case LabelType::CLIENT_IP:
     {
-      KeyValueStruct kv(F("Client IP"), formatIP(web_server.client().remoteIP(), true));
-      return kv;
+      return KeyValueStruct(F("Client IP"), formatIP(web_server.client().remoteIP(), true));
     }
     #if FEATURE_MDNS
     case LabelType::M_DNS:
@@ -570,172 +530,146 @@ KeyValueStruct getKeyValue(LabelType::Enum label, bool extendedValue)
       const String url = NetworkGetHostname() + F(".local");
 
       if (extendedValue) {
-        KeyValueStruct kv(F("mDNS"),
-                          strformat(
-                            F("%s"),
-                            url.c_str(),
-                            url.c_str()));
-        return kv;
+        return KeyValueStruct(F("mDNS"),
+                              strformat(
+                                F("%s"),
+                                url.c_str(),
+                                url.c_str()));
       }
-      KeyValueStruct kv(F("mDNS"), url);
-      return kv;
+      return KeyValueStruct(F("mDNS"), url);
     }
     #endif // if FEATURE_MDNS
     case LabelType::DNS:
     {
       if (!extendedValue) { break; }
-      KeyValueStruct kv(F("DNS"), strformat(F("%s / %s"),
-                                            getValue(LabelType::DNS_1).c_str(),
-                                            getValue(LabelType::DNS_2).c_str()));
-      return kv;
+      return KeyValueStruct(F("DNS"), strformat(F("%s / %s"),
+                                                getValue(LabelType::DNS_1).c_str(),
+                                                getValue(LabelType::DNS_2).c_str()));
     }
     case LabelType::DNS_1:
     {
       if (extendedValue) { break; }
       KeyValueStruct kv(F("DNS 1"), formatIP(ESPEasy::net::NetworkDnsIP(0)));
-      kv.setID(F("dns1"));
+      KV_SETID(F("dns1"));
       return kv;
     }
     case LabelType::DNS_2:
     {
       if (extendedValue) { break; }
       KeyValueStruct kv(F("DNS 2"), formatIP(ESPEasy::net::NetworkDnsIP(1)));
-      kv.setID(F("dns2"));
+      KV_SETID(F("dns2"));
       return kv;
     }
     case LabelType::ALLOWED_IP_RANGE:
     {
       KeyValueStruct kv(F("Allowed IP Range"), ESPEasy::net::describeAllowedIPrange());
-      kv.setID(F("allowed_range"));
+      KV_SETID(F("allowed_range"));
       return kv;
     }
     case LabelType::STA_MAC:
     {
-      KeyValueStruct kv(F("STA MAC"), ESPEasy::net::WifiSTAmacAddress().toString());
-      return kv;
+      return KeyValueStruct(F("STA MAC"), ESPEasy::net::WifiSTAmacAddress().toString());
     }
     case LabelType::AP_MAC:
     {
-      KeyValueStruct kv(F("AP MAC"), ESPEasy::net::WifiSoftAPmacAddress().toString());
-      return kv;
+      return KeyValueStruct(F("AP MAC"), ESPEasy::net::WifiSoftAPmacAddress().toString());
     }
     case LabelType::SSID:
     {
-      KeyValueStruct kv(F("SSID"), WiFi.SSID());
-      return kv;
+      return KeyValueStruct(F("SSID"), WiFi.SSID());
     }
     case LabelType::BSSID:
     {
-      KeyValueStruct kv(F("BSSID"), WiFi.BSSIDstr());
-      return kv;
+      return KeyValueStruct(F("BSSID"), WiFi.BSSIDstr());
     }
     case LabelType::CHANNEL:
     {
-      KeyValueStruct kv(F("Channel"), WiFi.channel());
-      return kv;
+      return KeyValueStruct(F("Channel"), WiFi.channel());
     }
     case LabelType::ENCRYPTION_TYPE_STA:
     {
       KeyValueStruct kv(F("Encryption Type"), getWiFi_encryptionType());
-      kv.setID(F("encryption"));
+      KV_SETID(F("encryption"));
       return kv;
     }
     case LabelType::CONNECTED:
     {
-      KeyValueStruct kv(F("Connected"), format_msec_duration(ESPEasy::net::NetworkConnectDuration_ms()));
-      return kv;
+      return KeyValueStruct(F("Connected"), format_msec_duration(ESPEasy::net::NetworkConnectDuration_ms()));
     }
     case LabelType::CONNECTED_MSEC:
     {
-      KeyValueStruct kv(F("Connected msec"), ESPEasy::net::NetworkConnectDuration_ms());
-      return kv;
+      return KeyValueStruct(F("Connected msec"), ESPEasy::net::NetworkConnectDuration_ms());
     }
     case LabelType::LAST_DISCONNECT_REASON:
     {
-      KeyValueStruct kv(F("Last Disconnect Reason"), getWiFi_disconnectReason());
-      return kv;
+      return KeyValueStruct(F("Last Disconnect Reason"), getWiFi_disconnectReason());
     }
     case LabelType::LAST_DISC_REASON_STR:
     {
-      KeyValueStruct kv(F("Last Disconnect Reason str"), getWiFi_disconnectReason_str());
-      return kv;
+      return KeyValueStruct(F("Last Disconnect Reason str"), getWiFi_disconnectReason_str());
     }
     case LabelType::NUMBER_RECONNECTS:
     {
-      KeyValueStruct kv(F("Number Reconnects"), ESPEasy::net::NetworkConnectCount());
-      return kv;
+      return KeyValueStruct(F("Number Reconnects"), ESPEasy::net::NetworkConnectCount());
     }
     case LabelType::WIFI_STORED_SSID1:
     {
-      KeyValueStruct kv(F("Configured SSID1"), SecuritySettings.WifiSSID);
-      return kv;
+      return KeyValueStruct(F("Configured SSID1"), SecuritySettings.WifiSSID);
     }
     case LabelType::WIFI_STORED_SSID2:
     {
-      KeyValueStruct kv(F("Configured SSID2"), SecuritySettings.WifiSSID2);
-      return kv;
+      return KeyValueStruct(F("Configured SSID2"), SecuritySettings.WifiSSID2);
     }
 
 
     case LabelType::FORCE_WIFI_BG:
     {
-      KeyValueStruct kv(F("Force WiFi B/G"), Settings.ForceWiFi_bg_mode());
-      return kv;
+      return KeyValueStruct(F("Force WiFi B/G"), Settings.ForceWiFi_bg_mode());
     }
     case LabelType::RESTART_WIFI_LOST_CONN:
     {
-      KeyValueStruct kv(F("Restart WiFi Lost Conn"), Settings.WiFiRestart_connection_lost());
-      return kv;
+      return KeyValueStruct(F("Restart WiFi Lost Conn"), Settings.WiFiRestart_connection_lost());
     }
     case LabelType::FORCE_WIFI_NOSLEEP:
     {
-      KeyValueStruct kv(F("Force WiFi No Sleep"), Settings.WifiNoneSleep());
-      return kv;
+      return KeyValueStruct(F("Force WiFi No Sleep"), Settings.WifiNoneSleep());
     }
     case LabelType::PERIODICAL_GRAT_ARP:
     {
-      KeyValueStruct kv(F("Periodical send Gratuitous ARP"), Settings.gratuitousARP());
-      return kv;
+      return KeyValueStruct(F("Periodical send Gratuitous ARP"), Settings.gratuitousARP());
     }
     case LabelType::CONNECTION_FAIL_THRESH:
     {
-      KeyValueStruct kv(F("Connection Failure Threshold"), Settings.ConnectionFailuresThreshold);
-      return kv;
+      return KeyValueStruct(F("Connection Failure Threshold"), Settings.ConnectionFailuresThreshold);
     }
 #ifndef ESP32
     case LabelType::WAIT_WIFI_CONNECT:
     {
-      KeyValueStruct kv(F("Extra Wait WiFi Connect"), Settings.WaitWiFiConnect());
-      return kv;
+      return KeyValueStruct(F("Extra Wait WiFi Connect"), Settings.WaitWiFiConnect());
     }
 #endif // ifndef ESP32
     case LabelType::CONNECT_HIDDEN_SSID:
     {
-      KeyValueStruct kv(F("Include Hidden SSID"), Settings.IncludeHiddenSSID());
-      return kv;
+      return KeyValueStruct(F("Include Hidden SSID"), Settings.IncludeHiddenSSID());
     }
 #ifdef ESP32
     case LabelType::WIFI_PASSIVE_SCAN:
     {
-      KeyValueStruct kv(F("Passive WiFi Scan"), Settings.PassiveWiFiScan());
-      return kv;
+      return KeyValueStruct(F("Passive WiFi Scan"), Settings.PassiveWiFiScan());
     }
 #endif // ifdef ESP32
     case LabelType::HIDDEN_SSID_SLOW_CONNECT:
     {
-      KeyValueStruct kv(F("Hidden SSID Slow Connect"), Settings.HiddenSSID_SlowConnectPerBSSID());
-      return kv;
+      return KeyValueStruct(F("Hidden SSID Slow Connect"), Settings.HiddenSSID_SlowConnectPerBSSID());
     }
     case LabelType::SDK_WIFI_AUTORECONNECT:
     {
-      KeyValueStruct kv(F("Enable SDK WiFi Auto Reconnect"), Settings.SDK_WiFi_autoreconnect());
-      return kv;
+      return KeyValueStruct(F("Enable SDK WiFi Auto Reconnect"), Settings.SDK_WiFi_autoreconnect());
     }
 #if FEATURE_USE_IPV6
     case LabelType::ENABLE_IPV6:
     {
-      KeyValueStruct kv(F("Enable IPv6"), Settings.EnableIPv6());
-      return kv;
+      return KeyValueStruct(F("Enable IPv6"), Settings.EnableIPv6());
     }
 #endif // if FEATURE_USE_IPV6
 
@@ -748,155 +682,133 @@ KeyValueStruct getKeyValue(LabelType::Enum label, bool extendedValue)
         descr += ' ';
         descr += F(BUILD_NOTES);
       }
-      KeyValueStruct kv(F("Build"), descr);
-      return kv;
+      return KeyValueStruct(F("Build"), descr);
     }
     case LabelType::BUILD_ORIGIN:
     {
-      KeyValueStruct kv(F("Build Origin"), get_build_origin());
-      return kv;
+      return KeyValueStruct(F("Build Origin"), get_build_origin());
     }
     case LabelType::GIT_BUILD:
     {
       String res(F(BUILD_GIT));
 
       if (res.isEmpty()) { res = get_git_head(); }
-      KeyValueStruct kv(F("Git Build"), res);
-      return kv;
+      return KeyValueStruct(F("Git Build"), res);
     }
     case LabelType::SYSTEM_LIBRARIES:
     {
-      KeyValueStruct kv(F("System Libraries"), getSystemLibraryString());
-      return kv;
+      return KeyValueStruct(F("System Libraries"), getSystemLibraryString());
     }
 #ifdef ESP32
     case LabelType::ESP_IDF_SDK_VERSION:
     {
-      KeyValueStruct kv(F("ESP-IDF Version"), strformat(
-                          F("%d.%d.%d"),
-                          ESP_IDF_VERSION_MAJOR,
-                          ESP_IDF_VERSION_MINOR,
-                          ESP_IDF_VERSION_PATCH));
-      return kv;
+      return KeyValueStruct(F("ESP-IDF Version"), strformat(
+                              F("%d.%d.%d"),
+                              ESP_IDF_VERSION_MAJOR,
+                              ESP_IDF_VERSION_MINOR,
+                              ESP_IDF_VERSION_PATCH));
     }
 #endif // ifdef ESP32
     case LabelType::PLUGIN_COUNT:
     {
-      KeyValueStruct kv(F("Plugin Count"), getDeviceCount() + 1);
-      return kv;
+      return KeyValueStruct(F("Plugin Count"), getDeviceCount() + 1);
     }
     case LabelType::PLUGIN_DESCRIPTION:
     {
-      KeyValueStruct kv(F("Plugin Description"), getPluginDescriptionString());
-      return kv;
+      return KeyValueStruct(F("Plugin Description"), getPluginDescriptionString());
     }
     case LabelType::BUILD_TIME:
     {
-      KeyValueStruct kv(F("Build Time"), String(get_build_date()) + ' ' + get_build_time());
-      return kv;
+      return KeyValueStruct(F("Build Time"), String(get_build_date()) + ' ' + get_build_time());
     }
     case LabelType::BINARY_FILENAME:
     {
-      KeyValueStruct kv(F("Binary Filename"), get_binary_filename());
-      return kv;
+      return KeyValueStruct(F("Binary Filename"), get_binary_filename());
     }
     case LabelType::BUILD_PLATFORM:
     {
-      KeyValueStruct kv(F("Build Platform"), get_build_platform());
-      return kv;
+      return KeyValueStruct(F("Build Platform"), get_build_platform());
     }
     case LabelType::GIT_HEAD:
     {
-      KeyValueStruct kv(F("Git HEAD"), get_git_head());
-      return kv;
+      return KeyValueStruct(F("Git HEAD"), get_git_head());
     }
     #ifdef CONFIGURATION_CODE
     case LabelType::CONFIGURATION_CODE_LBL:
     {
-      KeyValueStruct kv(F("Configuration code"), getConfigurationCode());
-      return kv;
+      return KeyValueStruct(F("Configuration code"), getConfigurationCode());
     }
     #endif // ifdef CONFIGURATION_CODE
-
+#if FEATURE_CLEAR_I2C_STUCK
     case LabelType::I2C_BUS_STATE:
     {
-      KeyValueStruct kv(F("I2C Bus State"), toString(I2C_state));
-      return kv;
+      return KeyValueStruct(F("I2C Bus State"), toString(I2C_state));
     }
     case LabelType::I2C_BUS_CLEARED_COUNT:
     {
-      KeyValueStruct kv(F("I2C bus cleared count"), I2C_bus_cleared_count);
-      return kv;
+      return KeyValueStruct(F("I2C bus cleared count"), I2C_bus_cleared_count);
     }
+#endif
 
     case LabelType::SYSLOG_LOG_LEVEL:
     {
-      KeyValueStruct kv(F("Syslog Log Level"), getLogLevelDisplayString(Settings.SyslogLevel));
-      return kv;
+      return KeyValueStruct(F("Syslog Log Level"), getLogLevelDisplayString(Settings.SyslogLevel));
     }
     case LabelType::SERIAL_LOG_LEVEL:
     {
-      KeyValueStruct kv(F("Serial Log Level"), getLogLevelDisplayString(getSerialLogLevel()));
-      return kv;
+      return KeyValueStruct(F("Serial Log Level"), getLogLevelDisplayString(getSerialLogLevel()));
     }
     case LabelType::WEB_LOG_LEVEL:
     {
-      KeyValueStruct kv(F("Web Log Level"), getLogLevelDisplayString(getWebLogLevel()));
-      return kv;
+      return KeyValueStruct(F("Web Log Level"), getLogLevelDisplayString(getWebLogLevel()));
     }
   #if FEATURE_SD
     case LabelType::SD_LOG_LEVEL:
     {
-      KeyValueStruct kv(F("SD Log Level"), getLogLevelDisplayString(Settings.SDLogLevel));
-      return kv;
+      return KeyValueStruct(F("SD Log Level"), getLogLevelDisplayString(Settings.SDLogLevel));
     }
   #endif // if FEATURE_SD
 
     case LabelType::ESP_CHIP_ID:
     {
-      KeyValueStruct kv(F("ESP Chip ID"), formatToHex(getChipId(), 6));
-      return kv;
+      return KeyValueStruct(F("ESP Chip ID"), formatToHex(getChipId(), 6));
     }
     case LabelType::ESP_CHIP_FREQ:
     {
       KeyValueStruct kv(F("ESP Chip Frequency"), ESP.getCpuFreqMHz());
-      kv.setUnit(F("MHz"));
+      KV_SETUNIT(F("MHz"));
       return kv;
     }
 #ifdef ESP32
     case LabelType::ESP_CHIP_XTAL_FREQ:
     {
       KeyValueStruct kv(F("ESP Crystal Frequency"), getXtalFrequencyMHz());
-      kv.setUnit(F("MHz"));
+      KV_SETUNIT(F("MHz"));
       return kv;
     }
     case LabelType::ESP_CHIP_APB_FREQ:
     {
       KeyValueStruct kv(F("ESP APB Frequency"), rtc_clk_apb_freq_get() / 1000000);
-      kv.setUnit(F("MHz"));
+      KV_SETUNIT(F("MHz"));
       return kv;
     }
 #endif // ifdef ESP32
     case LabelType::ESP_CHIP_MODEL:
     {
-      KeyValueStruct kv(F("ESP Chip Model"), getChipModel());
-      return kv;
+      return KeyValueStruct(F("ESP Chip Model"), getChipModel());
     }
     case LabelType::ESP_CHIP_REVISION:
     {
-      KeyValueStruct kv(F("ESP Chip Revision"), getChipRevision());
-      return kv;
+      return KeyValueStruct(F("ESP Chip Revision"), getChipRevision());
     }
     case LabelType::ESP_CHIP_CORES:
     {
-      KeyValueStruct kv(F("ESP Chip Cores"), getChipCores());
-      return kv;
+      return KeyValueStruct(F("ESP Chip Cores"), getChipCores());
     }
 
     case LabelType::BOARD_NAME:
     {
-      KeyValueStruct kv(F("ESP Board Name"), get_board_name());
-      return kv;
+      return KeyValueStruct(F("ESP Board Name"), get_board_name());
     }
 
     case LabelType::FLASH_CHIP_ID:
@@ -904,8 +816,7 @@ KeyValueStruct getKeyValue(LabelType::Enum label, bool extendedValue)
       auto flashChipId = getFlashChipId();
 
       if (flashChipId == 0) { break; }
-      KeyValueStruct kv(F("Flash Chip ID"), formatToHex(flashChipId, 6));
-      return kv;
+      return KeyValueStruct(F("Flash Chip ID"), formatToHex(flashChipId, 6));
     }
     case LabelType::FLASH_CHIP_VENDOR:
     {
@@ -918,52 +829,54 @@ KeyValueStruct getKeyValue(LabelType::Enum label, bool extendedValue)
         id += concat(F(" (PUYA"), puyaSupport() ? F(", supported") : F(HTML_SYMBOL_WARNING)) + ')';
       }
 
-      KeyValueStruct kv(F("Flash Chip Vendor"), id);
-      return kv;
+      return KeyValueStruct(F("Flash Chip Vendor"), id);
     }
     case LabelType::FLASH_CHIP_MODEL:
     {
+      #ifndef LIMIT_BUILD_SIZE
       const uint32_t flashChipId = getFlashChipId();
       const uint32_t flashDevice = (flashChipId & 0xFF00) | ((flashChipId >> 16) & 0xFF);
 
       String model(formatToHex(flashDevice, 4));
-          #ifdef ESP32
+    #ifdef ESP32
 
       if (extendedValue && getChipFeatures().embeddedFlash) {
         model += F(" (Embedded)");
       }
     #endif // ifdef ESP32
-      KeyValueStruct kv(F("Flash Chip Model"), model);
-      return kv;
+      return KeyValueStruct(F("Flash Chip Model"), model);
+      #else
+      return KeyValueStruct(F("Flash Chip Model"), getFlashChipId());
+      #endif
     }
     case LabelType::FLASH_CHIP_REAL_SIZE:
     {
       KeyValueStruct kv(F("Flash Chip Real Size"), getFlashRealSizeInBytes() >> 10);
-      kv.setUnit(F("kB"));
+      KV_SETUNIT(F("kB"));
       return kv;
     }
     case LabelType::FLASH_CHIP_SPEED:
     {
       KeyValueStruct kv(F("Flash Chip Speed"), getFlashChipSpeed() / 1000000);
-      kv.setUnit(F("MHz"));
+      KV_SETUNIT(F("MHz"));
       return kv;
     }
     case LabelType::FLASH_IDE_SIZE:
     {
       KeyValueStruct kv(F("Flash IDE Size"), ESP.getFlashChipSize() >> 10);
-      kv.setUnit(F("kB"));
+      KV_SETUNIT(F("kB"));
       return kv;
     }
     case LabelType::FLASH_IDE_SPEED:
     {
       KeyValueStruct kv(F("Flash IDE Speed"), getFlashChipSpeed() / 1000000);
-      kv.setUnit(F("MHz"));
+      KV_SETUNIT(F("MHz"));
       return kv;
     }
     case LabelType::FLASH_IDE_MODE:
     {
       KeyValueStruct kv(F("Flash IDE Mode"), getFlashChipMode());
-      kv.setID(F("mode"));
+      KV_SETID(F("mode"));
       return kv;
     }
     case LabelType::FLASH_WRITE_COUNT:
@@ -977,8 +890,7 @@ KeyValueStruct getKeyValue(LabelType::Enum label, bool extendedValue)
             static_cast(RTC.flashCounter)));
         return kv;
       }
-      KeyValueStruct kv(F("Flash Writes"), RTC.flashCounter);
-      return kv;
+      return KeyValueStruct(F("Flash Writes"), RTC.flashCounter);
     }
     case LabelType::SKETCH_SIZE:
     {
@@ -997,18 +909,18 @@ KeyValueStruct getKeyValue(LabelType::Enum label, bool extendedValue)
       }
 
       KeyValueStruct kv(F("Sketch Size"), str);
-      kv.setID(F("sketch_size"));
+      KV_SETID(F("sketch_size"));
 
       if (!extendedValue) {
-        kv.setUnit(F("kB"));
+        KV_SETUNIT(F("kB"));
       }
       return kv;
     }
     case LabelType::SKETCH_FREE:
     {
       KeyValueStruct kv(F("Sketch Free"), getFreeSketchSpace() >> 10);
-      kv.setID(F("sketch_free"));
-      kv.setUnit(F("kB"));
+      KV_SETID(F("sketch_free"));
+      KV_SETUNIT(F("kB"));
       return kv;
     }
     case LabelType::FS_SIZE:
@@ -1032,10 +944,10 @@ KeyValueStruct getKeyValue(LabelType::Enum label, bool extendedValue)
         F("SPIFFS Size"),
         #endif // ifdef USE_LITTLEFS
         SpiffsTotalBytes() >> 10);
-      kv.setID(F("fs_size"));
+      KV_SETID(F("fs_size"));
 
       if (!extendedValue) {
-        kv.setUnit(F("kB"));
+        KV_SETUNIT(F("kB"));
       }
       return kv;
     }
@@ -1048,8 +960,8 @@ KeyValueStruct getKeyValue(LabelType::Enum label, bool extendedValue)
         F("SPIFFS Free"),
         #endif // ifdef USE_LITTLEFS
         SpiffsFreeSpace() >> 10);
-      kv.setID(F("fs_free"));
-      kv.setUnit(F("kB"));
+      KV_SETID(F("fs_free"));
+      KV_SETUNIT(F("kB"));
       return kv;
     }
     case LabelType::MAX_OTA_SKETCH_SIZE:
@@ -1058,11 +970,10 @@ KeyValueStruct getKeyValue(LabelType::Enum label, bool extendedValue)
       bool     use2step;
       OTA_possible(maxSketchSize, use2step);
 
-      KeyValueStruct kv(F("Max. OTA Sketch Size"), strformat(
-                          F("%d [kB] (%d bytes)"),
-                          maxSketchSize / 1024,
-                          maxSketchSize));
-      return kv;
+      return KeyValueStruct(F("Max. OTA Sketch Size"), strformat(
+                              F("%d [kB] (%d bytes)"),
+                              maxSketchSize / 1024,
+                              maxSketchSize));
     }
 #ifdef ESP8266
     case LabelType::OTA_2STEP:
@@ -1071,8 +982,7 @@ KeyValueStruct getKeyValue(LabelType::Enum label, bool extendedValue)
       bool     use2step;
       OTA_possible(maxSketchSize, use2step);
 
-      KeyValueStruct kv(F("OTA 2-step Needed"), use2step);
-      return kv;
+      return KeyValueStruct(F("OTA 2-step Needed"), use2step);
     }
     case LabelType::OTA_POSSIBLE:
     {
@@ -1082,61 +992,59 @@ KeyValueStruct getKeyValue(LabelType::Enum label, bool extendedValue)
       bool otaEnabled =
     # endif // if defined(ESP8266)
       OTA_possible(maxSketchSize, use2step);
-      KeyValueStruct kv(F("OTA possible"), otaEnabled);
-      return kv;
+      return KeyValueStruct(F("OTA possible"), otaEnabled);
     }
 #endif // ifdef ESP8266
     #if FEATURE_INTERNAL_TEMPERATURE
     case LabelType::INTERNAL_TEMPERATURE:
     {
       KeyValueStruct kv(F("Internal Temperature"), getInternalTemperature(), 1);
-      kv.setUnit(F("°C"));
+      KV_SETUNIT(F("°C"));
       return kv;
     }
     #endif // if FEATURE_INTERNAL_TEMPERATURE
 #if FEATURE_ETHERNET
     case LabelType::ETH_MAC:
     {
-      KeyValueStruct kv(F("Eth MAC"), ESPEasy::net::NetworkMacAddress().toString());
-      return kv;
+      return KeyValueStruct(F("Eth MAC"), ESPEasy::net::NetworkMacAddress().toString());
     }
     case LabelType::ETH_DUPLEX:
     {
       KeyValueStruct kv(F("Eth Mode"), ESPEasy::net::EthLinkUp() ?
                         (ESPEasy::net::EthFullDuplex() ? F("Full Duplex") : F("Half Duplex")) : F("Link Down"));
-      kv.setID(F("ethduplex"));
+      KV_SETID(F("ethduplex"));
       return kv;
     }
     case LabelType::ETH_SPEED:
     {
       KeyValueStruct kv(F("Eth Speed"), getEthSpeed());
-      kv.setID(F("ethspeed"));
-      kv.setUnit(F("Mbps"));
+      KV_SETID(F("ethspeed"));
+      KV_SETUNIT(F("Mbps"));
       return kv;
     }
     case LabelType::ETH_STATE:
     {
       KeyValueStruct kv(F("Eth State"), ESPEasy::net::EthLinkUp() ? F("Link Up") : F("Link Down"));
-      kv.setID(F("ethstate"));
+      KV_SETID(F("ethstate"));
       return kv;
     }
     case LabelType::ETH_SPEED_STATE:
     {
       if (active_network_medium != ESPEasy::net::NetworkMedium_t::Ethernet) { break; }
       KeyValueStruct kv(F("Eth Speed State"), getEthLinkSpeedState());
-      kv.setID(F("ethspeedstate"));
+      KV_SETID(F("ethspeedstate"));
       return kv;
     }
     case LabelType::ETH_CONNECTED:
     {
       KeyValueStruct kv(F("Eth connected"), ESPEasy::net::eth::ETHConnected() ? F("CONNECTED") : F("DISCONNECTED"));
-      kv.setID(F("ethconnected"));
+      KV_SETID(F("ethconnected"));
       return kv;
     }
     case LabelType::ETH_CHIP:
     {
       KeyValueStruct kv(F("Eth chip"), toString(Settings.ETH_Phy_Type));
-      kv.setID(F("ethchip"));
+      KV_SETID(F("ethchip"));
       return kv;
     }
 #endif // if FEATURE_ETHERNET
@@ -1144,65 +1052,54 @@ KeyValueStruct getKeyValue(LabelType::Enum label, bool extendedValue)
     case LabelType::ETH_WIFI_MODE:
     {
       KeyValueStruct kv(F("Network Type"), toString(active_network_medium));
-      kv.setID(F("ethwifimode"));
+      KV_SETID(F("ethwifimode"));
       return kv;
     }
 #endif // if FEATURE_ETHERNET || defined(USES_ESPEASY_NOW)
     case LabelType::SUNRISE:
     {
-      KeyValueStruct kv(F("Sunrise"), node_time.getSunriseTimeString(':'));
-      return kv;
+      return KeyValueStruct(F("Sunrise"), node_time.getSunriseTimeString(':'));
     }
     case LabelType::SUNSET:
     {
-      KeyValueStruct kv(F("Sunset"), node_time.getSunsetTimeString(':'));
-      return kv;
+      return KeyValueStruct(F("Sunset"), node_time.getSunsetTimeString(':'));
     }
     case LabelType::SUNRISE_S:
     {
-      KeyValueStruct kv(F("Sunrise sec."), node_time.sunRise.tm_hour * 3600 + node_time.sunRise.tm_min * 60 +
-                        node_time.sunRise.tm_sec);
-      return kv;
+      return KeyValueStruct(F("Sunrise sec."), node_time.sunRise.tm_hour * 3600 + node_time.sunRise.tm_min * 60 +
+                            node_time.sunRise.tm_sec);
     }
     case LabelType::SUNSET_S:
     {
-      KeyValueStruct kv(F("Sunset sec."), node_time.sunSet.tm_hour * 3600 + node_time.sunSet.tm_min * 60 + node_time.sunSet.tm_sec);
-      return kv;
+      return KeyValueStruct(F("Sunset sec."), node_time.sunSet.tm_hour * 3600 + node_time.sunSet.tm_min * 60 + node_time.sunSet.tm_sec);
     }
     case LabelType::SUNRISE_M:
     {
-      KeyValueStruct kv(F("Sunrise min."), node_time.sunRise.tm_hour * 60 + node_time.sunRise.tm_min);
-      return kv;
+      return KeyValueStruct(F("Sunrise min."), node_time.sunRise.tm_hour * 60 + node_time.sunRise.tm_min);
     }
     case LabelType::SUNSET_M:
     {
-      KeyValueStruct kv(F("Sunset min."), node_time.sunSet.tm_hour * 60 + node_time.sunSet.tm_min);
-      return kv;
+      return KeyValueStruct(F("Sunset min."), node_time.sunSet.tm_hour * 60 + node_time.sunSet.tm_min);
     }
     case LabelType::ISNTP:
     {
-      KeyValueStruct kv(F("Use NTP"), Settings.UseNTP());
-      return kv;
+      return KeyValueStruct(F("Use NTP"), Settings.UseNTP());
     }
     case LabelType::UPTIME_MS:
     {
-      KeyValueStruct kv(F("Uptime (ms)"), getMicros64() / 1000);
-      return kv;
+      return KeyValueStruct(F("Uptime (ms)"), getMicros64() / 1000);
     }
     case LabelType::TIMEZONE_OFFSET:
     {
-      KeyValueStruct kv(F("Timezone Offset"), Settings.TimeZone);
-      return kv;
+      return KeyValueStruct(F("Timezone Offset"), Settings.TimeZone);
     }
     case LabelType::LATITUDE:
     {
-      KeyValueStruct kv(F("Latitude"), Settings.Latitude, 6);
-      return kv;
+      return KeyValueStruct(F("Latitude"), Settings.Latitude, 6);
     }
     case LabelType::LONGITUDE:
     {
-      KeyValueStruct kv(F("Longitude"), Settings.Longitude, 6);
-      return kv;
+      return KeyValueStruct(F("Longitude"), Settings.Longitude, 6);
     }
 
     case LabelType::MAX_LABEL:
diff --git a/src/src/Helpers/StringProvider.h b/src/src/Helpers/StringProvider.h
index 5695504c6..8547fb832 100644
--- a/src/src/Helpers/StringProvider.h
+++ b/src/src/Helpers/StringProvider.h
@@ -182,10 +182,10 @@ struct LabelType {
     CONFIGURATION_CODE_LBL,
     #endif // ifdef CONFIGURATION_CODE
 
-
+#if FEATURE_CLEAR_I2C_STUCK
     I2C_BUS_STATE,
     I2C_BUS_CLEARED_COUNT,
-
+#endif
     SYSLOG_LOG_LEVEL,
     SERIAL_LOG_LEVEL,
     WEB_LOG_LEVEL,
diff --git a/src/src/WebServer/Chart_JS.cpp b/src/src/WebServer/Chart_JS.cpp
index fbc0cee4f..b17ef1ac1 100644
--- a/src/src/WebServer/Chart_JS.cpp
+++ b/src/src/WebServer/Chart_JS.cpp
@@ -79,7 +79,7 @@ Up_KeyValueWriter add_ChartJS_chart_header(
     addHtml(strformat(
               F(""));
+      chartJSON->setFooter(F("\n);"));
     }
 
     add_ChartJS_chart_JSON_header(
@@ -192,13 +192,13 @@ void add_ChartJS_chart_labels(
 
 void add_ChartJS_scatter_data_point(
   KeyValueWriter& parent,
-  float x, float y, uint8_t nrDecimals)
+  float x, float y, uint8_t nrDecimalsX, uint8_t nrDecimalsY)
 {
   auto element = parent.createChild();
 
   if (element) {
-    element->write({ F("x"), x, nrDecimals });
-    element->write({ F("y"), y, nrDecimals });
+    element->write({ F("x"), x, nrDecimalsX });
+    element->write({ F("y"), y, nrDecimalsY });
   }
 }
 
diff --git a/src/src/WebServer/Chart_JS.h b/src/src/WebServer/Chart_JS.h
index e9e9afeb9..1d447d7d8 100644
--- a/src/src/WebServer/Chart_JS.h
+++ b/src/src/WebServer/Chart_JS.h
@@ -95,7 +95,8 @@ void add_ChartJS_scatter_data_point(
   KeyValueWriter& parent,
   float           x,
   float           y,
-  uint8_t             nrDecimals);
+  uint8_t         nrDecimalsX,
+  uint8_t         nrDecimalsY);
 
 void add_ChartJS_dataset(
   KeyValueWriter              & datasets,
diff --git a/src/src/WebServer/HTML_wrappers.cpp b/src/src/WebServer/HTML_wrappers.cpp
index dbbc61364..196dc2508 100644
--- a/src/src/WebServer/HTML_wrappers.cpp
+++ b/src/src/WebServer/HTML_wrappers.cpp
@@ -13,18 +13,11 @@
 // Flash strings are not checked for duplication.
 // ********************************************************************************
 void wrap_html_tag(const __FlashStringHelper * tag, const String& text) {
-  addHtml('<');
-  addHtml(tag);
-  addHtml('>');
-  addHtml(text);
-  addHtml('<', '/');
-  addHtml(tag);
-  addHtml('>');
+  wrap_html_tag(String(tag), text);
 }
 
 void wrap_html_tag(const String& tag, const String& text) {
-  addHtml(strformat(
-    F("<%s>%s"),
+  addHtml(strformat(F("<%s>%s"),
     tag.c_str(),
     text.c_str(),
     tag.c_str()));
@@ -55,13 +48,11 @@ void html_U(const String& text) {
 }
 
 void html_TR_TD_highlight() {
-  addHtml(F(""));
-  html_TD();
+  addHtml(F(""));
 }
 
 void html_TR_TD() {
-  html_TR();
-  html_TD();
+  addHtml(F("\n"));
 }
 
 void html_BR() {
@@ -69,7 +60,7 @@ void html_BR() {
 }
 
 void html_TR() {
-  addHtml(F(""));
+  addHtml(F("\n"));
 }
 
 void html_TR_TD_height(int height) {
@@ -267,11 +258,18 @@ void html_add_form() {
   addHtml(F("
    "));
 }
 
+void html_add_JQuery_script(const __FlashStringHelper * url)
+{
+  addHtml(F(""));
+}
+
 void html_add_JQuery_script() {
   #ifndef CDN_URL_JQUERY
     #define CDN_URL_JQUERY "https://code.jquery.com/jquery-3.6.4.min.js"
   #endif // ifndef CDN_URL_JQUERY
-  addHtml(F(""));
+  html_add_JQuery_script(F(CDN_URL_JQUERY));
 }
 
 #if FEATURE_CHART_JS
@@ -296,11 +294,10 @@ void html_add_ChartJS_script() {
     #define CDN_URL_CHART_JS_PLUGIN_ZOOM "https://cdn.jsdelivr.net/npm/chartjs-plugin-zoom@2.0.1/dist/chartjs-plugin-zoom.min.js"
   #endif
 
-
-  addHtml(F(""));
-  addHtml(F(""));
-  addHtml(F(""));
-  addHtml(F(""));
+  html_add_JQuery_script(F(CDN_URL_CHART_JS));
+  html_add_JQuery_script(F(CDN_URL_CHART_JS_ADAPTER_DATE));
+  html_add_JQuery_script(F(CDN_URL_CHART_JS_HAMMERJS));
+  html_add_JQuery_script(F(CDN_URL_CHART_JS_PLUGIN_ZOOM));
 }
 #endif // if FEATURE_CHART_JS
 
@@ -511,11 +508,7 @@ void addHtmlAttribute(const __FlashStringHelper * label, float value) {
 }
 
 void addHtmlAttribute(const String& label, int value) {
-  addHtml(' ');
-  addHtml(label);
-  addHtml('=');
-  addHtmlInt(value);
-  addHtml(' ');
+  addHtml(strformat(F(" %s=%d "), label.c_str(), value));
 }
 
 void addHtmlAttribute(const __FlashStringHelper * label, const __FlashStringHelper * value) {
@@ -523,19 +516,11 @@ void addHtmlAttribute(const __FlashStringHelper * label, const __FlashStringHelp
 }
 
 void addHtmlAttribute(const __FlashStringHelper * label, const String& value) {
-  addHtml(' ');
-  addHtml(label);
-  addHtml('=', '\'');
-  addEncodedHtml(value);
-  addHtml('\'', ' ');
+  addHtmlAttribute(String(label), value);
 }
 
 void addHtmlAttribute(const String& label, const String& value) {
-  addHtml(' ');
-  addHtml(label);
-  addHtml('=', '\'');
-  addEncodedHtml(value);
-  addHtml('\'', ' ');
+  addHtml(strformat(F(" %s=\'%s\' "), label.c_str(), value.c_str()));
 }
 
 void addDisabled() {
diff --git a/src/src/WebServer/HTML_wrappers.h b/src/src/WebServer/HTML_wrappers.h
index aebb11dfe..7e8633f21 100644
--- a/src/src/WebServer/HTML_wrappers.h
+++ b/src/src/WebServer/HTML_wrappers.h
@@ -92,6 +92,7 @@ void html_add_wide_button_prefix(const String& classes, bool enabled);
 
 void html_add_form();
 
+void html_add_JQuery_script(const __FlashStringHelper * url);
 void html_add_JQuery_script();
 #if FEATURE_CHART_JS
 void html_add_ChartJS_script();
diff --git a/src/src/WebServer/KeyValueWriter_WebForm.cpp b/src/src/WebServer/KeyValueWriter_WebForm.cpp
index 51248e310..b8e02a076 100644
--- a/src/src/WebServer/KeyValueWriter_WebForm.cpp
+++ b/src/src/WebServer/KeyValueWriter_WebForm.cpp
@@ -155,7 +155,8 @@ Up_KeyValueWriter KeyValueWriter_WebForm::createChildArray(const String& header)
   if (child) {
     child->setIsArray();
   }
-  return std::move(child);
+  // return std::move(child);
+  return child;
 }
 
 Up_KeyValueWriter KeyValueWriter_WebForm::createNew()
diff --git a/src/src/WebServer/Markup_Forms.cpp b/src/src/WebServer/Markup_Forms.cpp
index 3d180618a..ff7f4bc8c 100644
--- a/src/src/WebServer/Markup_Forms.cpp
+++ b/src/src/WebServer/Markup_Forms.cpp
@@ -35,9 +35,7 @@ void addFormSeparator(int clspan)
 void addFormNote(const __FlashStringHelper * text)
 {
   addRowLabel_tr_id(EMPTY_STRING, EMPTY_STRING);
-  addHtml(F(" 
    Note: "));
-  addHtml(text);
-  addHtml(F("
    "));
+  addHtmlDiv(F("note"), concat(F("Note: "), text));
 }
 
 void addFormNote(const String& text, const String& id)
diff --git a/src/src/WebServer/SysInfoPage.cpp b/src/src/WebServer/SysInfoPage.cpp
index 94ab2c9ed..4c408a2e3 100644
--- a/src/src/WebServer/SysInfoPage.cpp
+++ b/src/src/WebServer/SysInfoPage.cpp
@@ -437,7 +437,7 @@ void handle_sysinfo_Network() {
 
     addRowLabelValues(labels);
   }
-
+#ifndef LIMIT_BUILD_SIZE
   for (ESPEasy::net::networkIndex_t x = 0; x < NETWORK_MAX; ++x)
   {
     if (Settings.getNetworkEnabled(x)) {
@@ -458,6 +458,7 @@ void handle_sysinfo_Network() {
       }
     }
   }
+#endif
 
   html_TR();
 }

From ccb7819f9aa818f916c2753c204835514edab406 Mon Sep 17 00:00:00 2001
From: TD-er 
Date: Sun, 19 Oct 2025 00:14:23 +0200
Subject: [PATCH 392/564] [Climate] Remove P169 (AS3935 lightning Detector)
 from ESP8266 builds

---
 src/src/CustomBuild/define_plugin_sets.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/src/CustomBuild/define_plugin_sets.h b/src/src/CustomBuild/define_plugin_sets.h
index b12ebdca0..83fc01ce1 100644
--- a/src/src/CustomBuild/define_plugin_sets.h
+++ b/src/src/CustomBuild/define_plugin_sets.h
@@ -2237,7 +2237,7 @@ To create/register a plugin, you have to :
     #define USES_P168   // Light - VEML6030/VEML7700
   #endif
 
-  #ifndef USES_P169
+  #if !defined(USES_P169) && defined(ESP32)
     #define USES_P169   // Environment - AS3935 Lightning Detector
   #endif
   #if !defined(USES_P173) // && defined(ESP32)

From 3aab6eb4a6a4853adc9450191efb7d015a567bf6 Mon Sep 17 00:00:00 2001
From: TD-er 
Date: Sun, 19 Oct 2025 13:18:38 +0200
Subject: [PATCH 393/564] [Build] Revert ESP-IDF/Arduino to make Solo1 and
 ESP32-P4 build again

---
 platformio_core_defs.ini | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/platformio_core_defs.ini b/platformio_core_defs.ini
index 2027553f9..84b204ea2 100644
--- a/platformio_core_defs.ini
+++ b/platformio_core_defs.ini
@@ -164,9 +164,11 @@ extra_scripts             = ${esp82xx_common.extra_scripts}
 
 ; ESP_IDF 5.5.0
 [core_esp32_IDF5_5_0__3_2_0_LittleFS]
-platform                    = https://github.com/Jason2866/platform-espressif32.git#Arduino/IDF55_gcc15
+;platform                    = https://github.com/Jason2866/platform-espressif32.git#Arduino/IDF55_gcc15
 ;platform_packages           = framework-arduinoespressif32 @ https://github.com/Jason2866/esp32-arduino-lib-builder/releases/download/0410-1232-5.5/framework-arduinoespressif32-release_v5.5-2f303469.tar.xz
-platform_packages           = 
+platform                    = https://github.com/Jason2866/platform-espressif32.git#23aed73e4e570d3b6608c15677fea01d6a722d94
+platform_packages           =
+
 build_flags                 = -DESP32_STAGE
                               -DESP_IDF_VERSION_MAJOR=5
                               -DLIBRARIES_NO_LOG=1
@@ -187,6 +189,7 @@ build_flags                 = -DESP32_STAGE
                               -include "ESPEasy_config.h"
                               -include "esp32x_fixes.h"
                               -DUPDATE_NOCRYPT 
+                              -O3
 ;                              -Wnull-dereference
 lib_ignore                = 
 lib_extra_dirs            =

From dc02e77c0f91d9d150f37761335ab7efe173e25e Mon Sep 17 00:00:00 2001
From: TD-er 
Date: Tue, 21 Oct 2025 00:18:23 +0200
Subject: [PATCH 394/564] [Cleanup] Simplify ValueStruct to reduce bin size +
 speed up processing

---
 src/src/DataStructs/KeyValueStruct.cpp       |  38 +--
 src/src/DataStructs/KeyValueStruct.h         |   5 +-
 src/src/DataStructs/LogEntry.cpp             |   7 +-
 src/src/DataStructs/ValueStruct.cpp          | 317 ++++++++++++-------
 src/src/DataStructs/ValueStruct.h            | 203 +++++-------
 src/src/Helpers/KeyValueWriter_JSON.cpp      |  15 +-
 src/src/Helpers/KeyValueWriter_JSON.h        |   2 +-
 src/src/Helpers/StringProvider.cpp           |   2 +-
 src/src/Helpers/ValueStruct_Factory.cpp      | 127 --------
 src/src/Helpers/ValueStruct_Factory.h        |  43 ---
 src/src/WebServer/KeyValueWriter_WebForm.cpp |   4 +-
 11 files changed, 323 insertions(+), 440 deletions(-)
 delete mode 100644 src/src/Helpers/ValueStruct_Factory.cpp
 delete mode 100644 src/src/Helpers/ValueStruct_Factory.h

diff --git a/src/src/DataStructs/KeyValueStruct.cpp b/src/src/DataStructs/KeyValueStruct.cpp
index ee943b2ba..5ff687172 100644
--- a/src/src/DataStructs/KeyValueStruct.cpp
+++ b/src/src/DataStructs/KeyValueStruct.cpp
@@ -17,14 +17,14 @@ KeyValueStruct::KeyValueStruct(const String& key,
                                const bool  & val,
                                Format        format)
   : _key(key), _format(format) {
-  _values.emplace_back(ValueStruct_Factory::create(val));
+  _values.emplace_back(ValueStruct(val));
 }
 
 KeyValueStruct::KeyValueStruct(const String& key,
                                int           val,
                                Format        format)
   : _key(key), _format(format) {
-  _values.emplace_back(ValueStruct_Factory::create(val));
+  _values.emplace_back(ValueStruct(val));
 }
 
 #if defined(ESP32) && !defined(__riscv)
@@ -32,7 +32,7 @@ KeyValueStruct::KeyValueStruct(const String& key,
                                int32_t       val,
                                Format        format)
   : _key(key), _format(format) {
-  _values.emplace_back(ValueStruct_Factory::create(val));
+  _values.emplace_back(ValueStruct(val));
 }
 
 #endif // if defined(ESP32) && !defined(__riscv)
@@ -40,7 +40,7 @@ KeyValueStruct::KeyValueStruct(const String& key,
                                uint32_t      val,
                                Format        format)
   : _key(key), _format(format) {
-  _values.emplace_back(ValueStruct_Factory::create(val));
+  _values.emplace_back(ValueStruct(val));
 }
 
 #if defined(ESP32) && !defined(__riscv)
@@ -48,7 +48,7 @@ KeyValueStruct::KeyValueStruct(const String& key,
                                size_t        val,
                                Format        format)
   : _key(key), _format(format) {
-  _values.emplace_back(ValueStruct_Factory::create(val));
+  _values.emplace_back(ValueStruct(val));
 }
 
 #endif // if defined(ESP32) && !defined(__riscv)
@@ -56,14 +56,14 @@ KeyValueStruct::KeyValueStruct(const String  & key,
                                const uint64_t& val,
                                Format          format)
   : _key(key), _format(format) {
-  _values.emplace_back(ValueStruct_Factory::create(val));
+  _values.emplace_back(ValueStruct(val));
 }
 
 KeyValueStruct::KeyValueStruct(const String & key,
                                const int64_t& val,
                                Format         format)
   : _key(key), _format(format) {
-  _values.emplace_back(ValueStruct_Factory::create(val));
+  _values.emplace_back(ValueStruct(val));
 }
 
 KeyValueStruct::KeyValueStruct(const String& key,
@@ -71,7 +71,7 @@ KeyValueStruct::KeyValueStruct(const String& key,
                                uint8_t       nrDecimals,
                                Format        format)
   : _key(key), _format(format) {
-  _values.emplace_back(ValueStruct_Factory::create(val, nrDecimals));
+  _values.emplace_back(ValueStruct(val, nrDecimals));
 }
 
 KeyValueStruct::KeyValueStruct(const String& key,
@@ -79,56 +79,56 @@ KeyValueStruct::KeyValueStruct(const String& key,
                                uint8_t       nrDecimals,
                                Format        format)
   : _key(key), _format(format) {
-  _values.emplace_back(ValueStruct_Factory::create(val, nrDecimals));
+  _values.emplace_back(ValueStruct(val, nrDecimals));
 }
 
 KeyValueStruct::KeyValueStruct(const __FlashStringHelper *key,
                                const String             & val,
                                Format                     format)
   : _key(key), _format(format) {
-  _values.emplace_back(ValueStruct_Factory::create(val));
+  _values.emplace_back(ValueStruct(val));
 }
 
 KeyValueStruct::KeyValueStruct(const String             & key,
                                const __FlashStringHelper *val,
                                Format                     format)
   : _key(key), _format(format) {
-  _values.emplace_back(ValueStruct_Factory::create(val));
+  _values.emplace_back(ValueStruct(val));
 }
 
 KeyValueStruct::KeyValueStruct(const __FlashStringHelper *key,
                                const __FlashStringHelper *val,
                                Format                     format)
   : _key(key), _format(format) {
-  _values.emplace_back(ValueStruct_Factory::create(val));
+  _values.emplace_back(ValueStruct(val));
 }
 
 KeyValueStruct::KeyValueStruct(const __FlashStringHelper *key,
                                const char                *val,
                                Format                     format)
   : _key(key), _format(format) {
-  _values.emplace_back(ValueStruct_Factory::create(String(val)));
+  _values.emplace_back(ValueStruct(String(val)));
 }
 
 KeyValueStruct::KeyValueStruct(const String& key,
                                const String& val,
                                Format        format)
   : _key(key), _format(format) {
-  _values.emplace_back(ValueStruct_Factory::create(val));
+  _values.emplace_back(ValueStruct(val));
 }
 
 KeyValueStruct::KeyValueStruct(const __FlashStringHelper *key,
                                String                  && val,
                                Format                     format)
   : _key(key), _format(format) {
-  _values.emplace_back(ValueStruct_Factory::create(std::move(val)));
+  _values.emplace_back(ValueStruct(std::move(val)));
 }
 
 KeyValueStruct::KeyValueStruct(const String& key,
                                String     && val,
                                Format        format)
   : _key(key), _format(format) {
-  _values.emplace_back(ValueStruct_Factory::create(std::move(val)));
+  _values.emplace_back(ValueStruct(std::move(val)));
 }
 
 void KeyValueStruct::setUnit(const String& unit)              { _unit = unit; }
@@ -139,7 +139,7 @@ void KeyValueStruct::setID(const String& id)                  { __id = id; }
 
 void KeyValueStruct::setID(const __FlashStringHelper *id)     { __id = id; }
 
-void KeyValueStruct::appendValue(Up_ValueStruct value)
+void KeyValueStruct::appendValue(ValueStruct value)
 {
   _values.emplace_back(std::move(value));
   _isArray = true;
@@ -147,13 +147,13 @@ void KeyValueStruct::appendValue(Up_ValueStruct value)
 
 void KeyValueStruct::appendValue(const String& value)
 {
-  _values.emplace_back(ValueStruct_Factory::create(value));
+  _values.emplace_back(ValueStruct(value));
   _isArray = true;
 }
 
 void KeyValueStruct::appendValue(String&& value)
 {
-  _values.emplace_back(ValueStruct_Factory::create(std::move(value)));
+  _values.emplace_back(ValueStruct(std::move(value)));
   _isArray = true;
 }
 
diff --git a/src/src/DataStructs/KeyValueStruct.h b/src/src/DataStructs/KeyValueStruct.h
index f93913b17..3e02a7583 100644
--- a/src/src/DataStructs/KeyValueStruct.h
+++ b/src/src/DataStructs/KeyValueStruct.h
@@ -3,7 +3,6 @@
 #include "../DataStructs/ValueStruct.h"
 
 #include "../Helpers/StringProvider.h"
-#include "../Helpers/ValueStruct_Factory.h"
 
 #include 
 
@@ -116,7 +115,7 @@ struct KeyValueStruct
   void setID(const String& id);
   void setID(const __FlashStringHelper *id);
 
-  void appendValue(Up_ValueStruct value);
+  void appendValue(ValueStruct value);
   void appendValue(const String& value);
   void appendValue(String&& value);
 
@@ -127,7 +126,7 @@ struct KeyValueStruct
   String __id;
   String _unit;
 
-  std::vector_values;
+  std::vector_values;
 
   Format _format = Format::Default;
 
diff --git a/src/src/DataStructs/LogEntry.cpp b/src/src/DataStructs/LogEntry.cpp
index d766b8c2f..3e5c21dc8 100644
--- a/src/src/DataStructs/LogEntry.cpp
+++ b/src/src/DataStructs/LogEntry.cpp
@@ -61,10 +61,11 @@ LogEntry_t::LogEntry_t(const uint8_t logLevel,
   _logLevel(logLevel),
   _subscriberPendingRead(0)
 {
+  // We can't move the allocated memory from 'message'.
+  // Just use move so we make sure the memory is de-allocated after this call.
+  String str = std::move(message);
+
   if (_strLength) {
-    // We can't move the allocated memory from 'message'.
-    // Just use move so we make sure the memory is de-allocated after this call.
-    String str        = std::move(message);
     const size_t size = str.length();
     _message = special_calloc(1, size + 1);
 
diff --git a/src/src/DataStructs/ValueStruct.cpp b/src/src/DataStructs/ValueStruct.cpp
index 90afd5b33..bc0938cad 100644
--- a/src/src/DataStructs/ValueStruct.cpp
+++ b/src/src/DataStructs/ValueStruct.cpp
@@ -1,11 +1,148 @@
 #include "../DataStructs/ValueStruct.h"
 
+#include "../Helpers/Memory.h"
 #include "../Helpers/PrintToString.h"
 #include "../Helpers/StringConverter_Numerical.h"
 
 // ********************************************************************************
 // ValueStruct
 // ********************************************************************************
+ValueStruct::~ValueStruct()
+{
+  if (static_cast(valueType) == ValueStruct::ValueType::String)
+  {
+    if (str_val != nullptr) {
+      free(str_val);
+    }
+  }
+}
+
+ValueStruct::ValueStruct(ValueStruct&& rhs)
+{
+  memcpy(bytes_metadata, rhs.bytes_metadata, sizeof(bytes_metadata));
+  memcpy(bytes_val,      rhs.bytes_val,      sizeof(bytes_val));
+  memset(rhs.bytes_metadata, 0, sizeof(bytes_metadata));
+  memset(rhs.bytes_val,      0, sizeof(bytes_val));
+}
+
+ValueStruct::ValueStruct(const bool& val) :
+  valueType((uint64_t)ValueStruct::ValueType::Bool),
+  size(1),
+  u64_val(val ? 1ull : 0ull)
+{}
+
+ValueStruct::ValueStruct(int val) :
+  valueType((uint64_t)ValueStruct::ValueType::Int),
+  size(sizeof(val) * 8),
+  i64_val(val)
+{}
+
+#if defined(ESP32) && !defined(__riscv)
+ValueStruct::ValueStruct(int32_t val) :
+  valueType((uint64_t)ValueStruct::ValueType::Int),
+  size(sizeof(val) * 8),
+  i64_val(val)
+{}
+
+#endif // if defined(ESP32) && !defined(__riscv)
+ValueStruct::ValueStruct(uint32_t val) :
+  valueType((uint64_t)ValueStruct::ValueType::UInt),
+  size(sizeof(val) * 8),
+  u64_val(val)
+{}
+
+#if defined(ESP32) && !defined(__riscv)
+ValueStruct::ValueStruct(size_t val) :
+  valueType((uint64_t)ValueStruct::ValueType::UInt),
+  size(sizeof(val) * 8),
+  u64_val(val)
+{}
+
+#endif // if defined(ESP32) && !defined(__riscv)
+ValueStruct::ValueStruct(const uint64_t& val) :
+  valueType((uint64_t)ValueStruct::ValueType::UInt),
+  size(sizeof(val) * 8),
+  u64_val(val)
+{}
+
+ValueStruct::ValueStruct(const int64_t& val) :
+  valueType((uint64_t)ValueStruct::ValueType::Int),
+  size(sizeof(val) * 8),
+  i64_val(val)
+{}
+
+ValueStruct::ValueStruct(const float& val,
+                         uint8_t      nrDecimals,
+                         bool         trimTrailingZeros) :
+  nrDecimals((uint64_t)nrDecimals),
+  trimTrailingZeros((uint64_t)trimTrailingZeros),
+  valueType((uint64_t)ValueStruct::ValueType::Float),
+  size(sizeof(val) * 8),
+  f_val(val)
+{}
+
+ValueStruct::ValueStruct(const double& val,
+                         uint8_t       nrDecimals,
+                         bool          trimTrailingZeros) :
+  nrDecimals((uint64_t)nrDecimals),
+  trimTrailingZeros((uint64_t)trimTrailingZeros),
+  valueType((uint64_t)ValueStruct::ValueType::Double),
+  size(sizeof(val) * 8),
+  d_val(val)
+{}
+
+ValueStruct::ValueStruct(const char*val) :
+  valueType((uint64_t)ValueStruct::ValueType::String),
+  size(val ? strlen_P((const char *)(val)) : 0),
+  str_val(nullptr)
+{
+  if (size) {
+    str_val = special_calloc(1, size + 1);
+
+    if (str_val) {
+      memcpy_P(str_val, val, size);
+    }
+  }
+}
+
+ValueStruct::ValueStruct(const String& val) :
+  valueType((uint64_t)ValueStruct::ValueType::String),
+  size(val.length()),
+  str_val(nullptr)
+{
+  if (size) {
+    str_val = special_calloc(1, size + 1);
+
+    if (str_val) {
+      memcpy_P(str_val, val.begin(), size);
+    }
+  }
+}
+
+ValueStruct::ValueStruct(String&& val) :
+  valueType((uint64_t)ValueStruct::ValueType::String),
+  size(val.length()),
+  str_val(nullptr)
+{
+  // We can't move the allocated memory from 'message'.
+  // Just use move so we make sure the memory is de-allocated after this call.
+  const String str = std::move(val);
+
+  if (size) {
+    str_val = special_calloc(1, size + 1);
+
+    if (str_val) {
+      memcpy_P(str_val, str.begin(), size);
+    }
+  }
+}
+
+ValueStruct::ValueStruct(const __FlashStringHelper *val) :
+  valueType((uint64_t)ValueStruct::ValueType::FlashString),
+  size(val ? strlen_P((const char *)(val)) : 0),
+  str_val((void *)(val))
+{}
+
 String ValueStruct::toString() const
 {
   PrintToString p;
@@ -21,125 +158,85 @@ String ValueStruct::toString(ValueType& valueType) const
   return toString();
 }
 
-// ********************************************************************************
-// ValueStruct_String
-// ********************************************************************************
-
-ValueStruct_String::~ValueStruct_String() {}
-
-ValueStruct_String::ValueStruct_String(const String& val)
-  : ValueStruct(ValueType::String), _val(val) {}
-
-ValueStruct_String::ValueStruct_String(String&& val)
-  : ValueStruct(ValueType::String), _val(std::move(val)) {}
-
-size_t ValueStruct_String::print(Print& out) const
+size_t ValueStruct::print(Print& out) const
 {
-  return out.print(_val);
+  ValueStruct::ValueType v;
+
+  return print(out, v);
 }
 
-// ********************************************************************************
-// ValueStruct_FlashString
-// ********************************************************************************
-
-ValueStruct_FlashString::~ValueStruct_FlashString() {}
-
-ValueStruct_FlashString::ValueStruct_FlashString(const __FlashStringHelper *val)
-  : ValueStruct(ValueType::FlashString), _val(val) {}
-
-size_t ValueStruct_FlashString::print(Print& out) const
+size_t ValueStruct::print(Print& out, ValueType& valueType) const
 {
-  return out.print(_val);
-}
-
-// ********************************************************************************
-// ValueStruct_Double
-// ********************************************************************************
-
-ValueStruct_Double::~ValueStruct_Double() {}
-
-ValueStruct_Double::ValueStruct_Double(
-  double  val,
-  uint8_t nrDecimals,
-  bool    trimTrailingZeros)
-  : ValueStruct(ValueType::Double), _val(val), _nrDecimals(nrDecimals), _trimTrailingZeros(trimTrailingZeros) {}
-
-size_t ValueStruct_Double::print(Print& out) const
-{
-  return out.print(doubleToString(_val, _nrDecimals, _trimTrailingZeros));
-}
-
-String ValueStruct_Double::toString(ValueType& valueType) const
-{
-  String res;
-
   valueType = getValueType();
 
-  if (!doubleToValidString(res, _val, _nrDecimals, _trimTrailingZeros)) {
-    valueType = ValueType::String;
+  switch (valueType)
+  {
+    case ValueStruct::ValueType::Bool:
+    {
+      const bool v = u64_val != 0;
+      return out.print(u64_val == 0 ? 0 : 1);
+    }
+    case ValueStruct::ValueType::String:
+    {
+      if (str_val == nullptr) { return 0; }
+      return out.write((const uint8_t *)str_val, size);
+    }
+    case ValueStruct::ValueType::FlashString:
+    {
+      if (str_val == nullptr) { return 0; }
+      return out.print((const __FlashStringHelper *)str_val);
+    }
+    case ValueStruct::ValueType::Float:
+    {
+      String res;
+
+      if (!toValidString(res, f_val, nrDecimals, trimTrailingZeros))
+      {
+        valueType = ValueStruct::ValueType::String;
+      }
+      return out.print(res);
+    }
+    case ValueStruct::ValueType::Double:
+    {
+      String res;
+
+      if (!doubleToValidString(res, d_val, nrDecimals, trimTrailingZeros))
+      {
+        valueType = ValueStruct::ValueType::String;
+      }
+      return out.print(res);
+    }
+    case ValueStruct::ValueType::Int:
+    {
+      if (size == 8) {
+        return out.print(ll2String(i64_val));
+      }
+      auto v = static_cast(i64_val);
+      return out.print(v);
+    }
+    case ValueStruct::ValueType::UInt:
+    {
+      if (size == 8) {
+        return out.print(ull2String(u64_val));
+      }
+      auto v = static_cast(u64_val);
+      return out.print(v);
+    }
+    case ValueStruct::ValueType::Unset:  break;
   }
-
-  return res;
+  return 0;
 }
 
-// ********************************************************************************
-// ValueStruct_Float
-// ********************************************************************************
-
-ValueStruct_Float::~ValueStruct_Float() {}
-
-ValueStruct_Float::ValueStruct_Float(
-  float   val,
-  uint8_t nrDecimals,
-  bool    trimTrailingZeros)
-  : ValueStruct(ValueType::Float), _val(val), _nrDecimals(nrDecimals), _trimTrailingZeros(trimTrailingZeros) {}
-
-size_t ValueStruct_Float::print(Print& out) const
+bool ValueStruct::isEmpty() const
 {
-  String res;
-
-  toValidString(res, _val, _nrDecimals, _trimTrailingZeros);
-  return out.print(res);
-}
-
-String ValueStruct_Float::toString(ValueType& valueType) const
-{
-  String res;
-
-  valueType = getValueType();
-
-  if (!toValidString(res, _val, _nrDecimals, _trimTrailingZeros)) {
-    valueType = ValueType::String;
+  switch (getValueType())
+  {
+    case ValueStruct::ValueType::String:
+    case ValueStruct::ValueType::FlashString:
+      return size == 0;
+    case ValueStruct::ValueType::Unset:
+      return true;
+    default: break;
   }
-
-  return res;
-}
-
-// ********************************************************************************
-// ValueStruct_uint64_t
-// ********************************************************************************
-
-ValueStruct_uint64_t::~ValueStruct_uint64_t() {}
-
-ValueStruct_uint64_t::ValueStruct_uint64_t(uint64_t  val,
-                                           ValueType vType)
-  : ValueStruct(vType), _val(val) {}
-
-size_t ValueStruct_uint64_t::print(Print& out) const
-{
-  return out.print(ull2String(_val));
-}
-
-// ********************************************************************************
-// ValueStruct_int64_t
-// ********************************************************************************
-
-ValueStruct_int64_t::~ValueStruct_int64_t() {}
-
-ValueStruct_int64_t::ValueStruct_int64_t(int64_t val, ValueType vType)
-  : ValueStruct(vType), _val(val) {}
-
-size_t ValueStruct_int64_t::print(Print& out) const
-{
-  return out.print(ll2String(_val));
+  return false;
 }
diff --git a/src/src/DataStructs/ValueStruct.h b/src/src/DataStructs/ValueStruct.h
index 7f9bcb778..9f99b6994 100644
--- a/src/src/DataStructs/ValueStruct.h
+++ b/src/src/DataStructs/ValueStruct.h
@@ -8,157 +8,112 @@
 // ********************************************************************************
 // ValueStruct
 // ********************************************************************************
+
+
 class ValueStruct
 {
 public:
 
-  enum class ValueType {
-    Auto,
+  enum class ValueType : uint8_t {
+    Unset = 0,
     String,
     FlashString,
     Float,
     Double,
     Int,
+    UInt,
     Bool
 
   };
 
-  ValueStruct(ValueType valueType = ValueType::Auto) : _valueType(valueType) {}
+  ValueStruct() :
+    valueType((uint64_t)ValueStruct::ValueType::Unset),
+    str_val(nullptr)
+  {}
 
-  virtual ~ValueStruct() {}
+  ~ValueStruct();
 
-  virtual size_t    print(Print& out) const = 0;
+  ValueStruct(const ValueStruct& rhs) = delete;
+  ValueStruct(ValueStruct&& rhs);
 
-  virtual String    toString() const;
+  ValueStruct(const bool& val);
 
-  virtual String    toString(ValueType& valueType) const;
+  ValueStruct(int val);
+#if defined(ESP32) && !defined(__riscv)
+  ValueStruct(int32_t val);
+#endif
+  ValueStruct(uint32_t val);
+#if defined(ESP32) && !defined(__riscv)
+  ValueStruct(size_t val);
+#endif
+  ValueStruct(const uint64_t& val);
 
-  virtual ValueType getValueType() const { return _valueType; }
-
-protected:
-
-  const ValueType _valueType;
-
-}; // class ValueStruct
-
-typedef std::unique_ptr Up_ValueStruct;
+  ValueStruct(const int64_t& val);
 
 
-// ********************************************************************************
-// Derived types from ValueStruct
-// ********************************************************************************
+  ValueStruct(const float& val,
+               uint8_t      nrDecimals        = 4,
+               bool         trimTrailingZeros = false);
 
-class ValueStruct_String : public ValueStruct
-{
-public:
-
-  virtual ~ValueStruct_String();
-
-  ValueStruct_String(const String& val);
-  ValueStruct_String(String&& val);
-
-  virtual size_t print(Print& out) const;
-
-  String _val;
-}; // class ValueStruct_String
+  ValueStruct(const double& val,
+               uint8_t       nrDecimals        = 4,
+               bool          trimTrailingZeros = false);
 
 
-class ValueStruct_FlashString : public ValueStruct
-{
-public:
+  ValueStruct(const char*val);
 
-  virtual ~ValueStruct_FlashString();
+  ValueStruct(const String& val);
 
-  ValueStruct_FlashString(const __FlashStringHelper *val);
+  ValueStruct(String&& val);
 
-  virtual size_t print(Print& out) const;
+  ValueStruct(const __FlashStringHelper *val);
 
-  const __FlashStringHelper *_val;
-}; // class ValueStruct_FlashString
-
-class ValueStruct_Double : public ValueStruct
-{
-public:
-
-  virtual ~ValueStruct_Double();
-
-  ValueStruct_Double(double  val,
-                     uint8_t nrDecimals        = 2,
-                     bool    trimTrailingZeros = false);
-
-  virtual size_t print(Print& out) const;
-
-  virtual String toString(ValueType& valueType) const override;
-
-  const double _val;
-  const uint8_t _nrDecimals;
-  const bool _trimTrailingZeros;
-}; // class ValueStruct_Double
-
-class ValueStruct_Float : public ValueStruct
-{
-public:
-
-  virtual ~ValueStruct_Float();
-
-  ValueStruct_Float(float   val,
-                    uint8_t nrDecimals        = 2,
-                    bool    trimTrailingZeros = false);
-
-  virtual size_t print(Print& out) const;
-
-  virtual String toString(ValueType& valueType) const override;
-
-  const float _val;
-  const uint8_t _nrDecimals;
-  const bool _trimTrailingZeros;
-}; // class ValueStruct_Float
-
-class ValueStruct_uint64_t : public ValueStruct
-{
-public:
-
-  virtual ~ValueStruct_uint64_t();
-
-  ValueStruct_uint64_t(uint64_t  val,
-                       ValueType vType);
-
-  virtual size_t print(Print& out) const;
-
-  const uint64_t _val;
-}; // class ValueStruct_uint64_t
-
-
-class ValueStruct_int64_t : public ValueStruct
-{
-public:
-
-  virtual ~ValueStruct_int64_t();
-
-  ValueStruct_int64_t(int64_t   val,
-                      ValueType vType);
-
-  virtual size_t print(Print& out) const;
-
-  const int64_t _val;
-}; // class ValueStruct_int64_t
-
-
-template
-class ValueStruct_T : public ValueStruct
-{
-public:
-
-  virtual ~ValueStruct_T() {}
-
-  ValueStruct_T(T         val,
-                ValueType vType)
-    : ValueStruct(vType), _val(val) {}
-
-  virtual size_t print(Print& out) const
+  ValueStruct::ValueType getValueType() const
   {
-    return out.print(_val);
+    return static_cast(valueType);
   }
 
-  const T _val;
-}; // class ValueStruct_T
+  ValueStruct& operator=(ValueStruct&& rhs) = delete;
+  ValueStruct& operator=(const ValueStruct& rhs) = delete;
+
+  String toString() const;
+
+  String toString(ValueType& valueType) const;
+
+  size_t print(Print& out) const;
+
+  bool   isEmpty() const;
+
+  bool   isSet() const { return getValueType() != ValueStruct::ValueType::Unset; }
+
+private:
+
+  size_t print(Print    & out,
+               ValueType& valueType) const;
+
+  union {
+    struct {
+      uint64_t nrDecimals        : 8;
+      uint64_t trimTrailingZeros : 1;
+      uint64_t valueType         : 7;
+      uint64_t size              : 16;
+
+      uint64_t unused : 32; // TODO TD-er: Store UoM enum
+
+    };
+
+    uint8_t bytes_metadata[8] = {};
+
+  };
+
+  union {
+    void    *str_val;
+    float    f_val;
+    double   d_val;
+    int64_t  i64_val;
+    uint64_t u64_val;
+    uint8_t  bytes_val[8] = {};
+
+  };
+
+}; // class ValueStruct
diff --git a/src/src/Helpers/KeyValueWriter_JSON.cpp b/src/src/Helpers/KeyValueWriter_JSON.cpp
index bd1aca348..4e2ec9c97 100644
--- a/src/src/Helpers/KeyValueWriter_JSON.cpp
+++ b/src/src/Helpers/KeyValueWriter_JSON.cpp
@@ -125,7 +125,7 @@ void KeyValueWriter_JSON::write(const KeyValueStruct& kv)
       pr.write('"');
     }
     else {
-      writeValue(kv._values[0].get());
+      writeValue(kv._values[0]);
     }
   } else {
     // Multiple values, so we must wrap it in []
@@ -149,7 +149,7 @@ void KeyValueWriter_JSON::write(const KeyValueStruct& kv)
       pr.write('\t');
 #endif // ifdef USE_KWH_JSON_PRETTY_PRINT
 
-      writeValue(kv._values[i].get());
+      writeValue(kv._values[i]);
     }
     getPrint().write(']');
 #ifndef USE_KWH_JSON_PRETTY_PRINT
@@ -158,14 +158,14 @@ void KeyValueWriter_JSON::write(const KeyValueStruct& kv)
   }
 }
 
-void KeyValueWriter_JSON::writeValue(const ValueStruct*val)
+void KeyValueWriter_JSON::writeValue(const ValueStruct& val)
 {
-  if (val == nullptr) { return; }
+  if (!val.isSet()) { return; }
   auto& pr = getPrint();
 
-  ValueStruct::ValueType valueType = val->getValueType();
+  ValueStruct::ValueType valueType = val.getValueType();
   ValueStruct::ValueType valueType_afterPrint;
-  String str                       = val->toString(valueType_afterPrint);
+  String str                       = val.toString(valueType_afterPrint);
 
   switch (valueType)
   {
@@ -178,6 +178,7 @@ void KeyValueWriter_JSON::writeValue(const ValueStruct*val)
       }
 
     case ValueStruct::ValueType::Int:
+    case ValueStruct::ValueType::UInt:
       pr.print(str);
       return;
     case ValueStruct::ValueType::Bool:
@@ -188,7 +189,7 @@ void KeyValueWriter_JSON::writeValue(const ValueStruct*val)
       if (_allowFormatOverrides && !Settings.JSONBoolWithoutQuotes()) { pr.write('"'); }
       return;
 
-    case ValueStruct::ValueType::Auto:
+    case ValueStruct::ValueType::Unset:
     case ValueStruct::ValueType::String:
     case ValueStruct::ValueType::FlashString:
       break;
diff --git a/src/src/Helpers/KeyValueWriter_JSON.h b/src/src/Helpers/KeyValueWriter_JSON.h
index c1b5df6af..cad189ce0 100644
--- a/src/src/Helpers/KeyValueWriter_JSON.h
+++ b/src/src/Helpers/KeyValueWriter_JSON.h
@@ -72,7 +72,7 @@ public:
 
 private:
 
-  void writeValue(const ValueStruct* value);
+  void writeValue(const ValueStruct& value);
 
 #ifdef USE_KWH_JSON_PRETTY_PRINT
 
diff --git a/src/src/Helpers/StringProvider.cpp b/src/src/Helpers/StringProvider.cpp
index f017747a4..ce07d7be2 100644
--- a/src/src/Helpers/StringProvider.cpp
+++ b/src/src/Helpers/StringProvider.cpp
@@ -1126,7 +1126,7 @@ String getLabel(LabelType::Enum label) {
 String getValue(LabelType::Enum label) {
   auto kv = getKeyValue(label);
 
-  if (kv._values.size() && kv._values[0]) { return kv._values[0]->toString(); }
+  if (kv._values.size() && kv._values[0].isSet()) { return kv._values[0].toString(); }
   return EMPTY_STRING;
 }
 
diff --git a/src/src/Helpers/ValueStruct_Factory.cpp b/src/src/Helpers/ValueStruct_Factory.cpp
deleted file mode 100644
index 57c61931b..000000000
--- a/src/src/Helpers/ValueStruct_Factory.cpp
+++ /dev/null
@@ -1,127 +0,0 @@
-#include "../Helpers/ValueStruct_Factory.h"
-
-Up_ValueStruct ValueStruct_Factory::create(const bool& val)
-{
-  std::unique_ptr > child(new (std::nothrow) ValueStruct_T(val, ValueStruct::ValueType::Bool));
-
-  return std::move(child);
-
-  // return std::make_unique >(val, ValueStruct::ValueType::Bool);
-}
-
-Up_ValueStruct ValueStruct_Factory::create(int val)
-{
-  std::unique_ptr > child(new (std::nothrow) ValueStruct_T(val, ValueStruct::ValueType::Int));
-
-  return std::move(child);
-
-  // return std::make_unique >(val, ValueStruct::ValueType::Int);
-}
-
-#if defined(ESP32) && !defined(__riscv)
-
-Up_ValueStruct ValueStruct_Factory::create(int32_t val)
-{
-  std::unique_ptr > child(new (std::nothrow) ValueStruct_T(val, ValueStruct::ValueType::Int));
-
-  return std::move(child);
-
-  //  return std::make_unique >(val, ValueStruct::ValueType::Int);
-}
-
-#endif // if defined(ESP32) && !defined(__riscv)
-
-Up_ValueStruct ValueStruct_Factory::create(uint32_t val)
-{
-  std::unique_ptr > child(new (std::nothrow) ValueStruct_T(val, ValueStruct::ValueType::Int));
-
-  return std::move(child);
-
-  // return std::make_unique >(val, ValueStruct::ValueType::Int);
-}
-
-#if defined(ESP32) && !defined(__riscv)
-
-Up_ValueStruct ValueStruct_Factory::create(size_t val)
-{
-  std::unique_ptr > child(new (std::nothrow) ValueStruct_T(val, ValueStruct::ValueType::Int));
-
-  return std::move(child);
-
-  // return std::make_unique >(val, ValueStruct::ValueType::Int);
-}
-
-#endif // if defined(ESP32) && !defined(__riscv)
-
-Up_ValueStruct ValueStruct_Factory::create(const uint64_t& val)
-{
-  std::unique_ptr child(new (std::nothrow) ValueStruct_uint64_t(val, ValueStruct::ValueType::Int));
-
-  return std::move(child);
-
-  //  return std::make_unique(val, ValueStruct::ValueType::Int);
-}
-
-Up_ValueStruct ValueStruct_Factory::create(const int64_t& val)
-{
-
-  std::unique_ptr child(new (std::nothrow) ValueStruct_int64_t(val, ValueStruct::ValueType::Int));
-
-  return std::move(child);
-
-  // return std::make_unique(val, ValueStruct::ValueType::Int);
-}
-
-Up_ValueStruct ValueStruct_Factory::create(
-  const float& val,
-  uint8_t                    nrDecimals,
-  bool         trimTrailingZeros)
-{
-  std::unique_ptr child(new (std::nothrow) ValueStruct_Float(val, nrDecimals, trimTrailingZeros));
-
-  return std::move(child);
-
-  // return std::make_unique(val, nrDecimals, trimTrailingZeros);
-}
-
-Up_ValueStruct ValueStruct_Factory::create(
-  const double& val,
-  uint8_t                    nrDecimals,
-  bool          trimTrailingZeros)
-{
-  std::unique_ptr child(new (std::nothrow) ValueStruct_Double(val, nrDecimals, trimTrailingZeros));
-
-  return std::move(child);
-
-  // return std::make_unique(val, nrDecimals, trimTrailingZeros);
-}
-
-Up_ValueStruct ValueStruct_Factory::create(
-  const String& val)
-{
-  std::unique_ptr child(new (std::nothrow) ValueStruct_String(val));
-
-  return std::move(child);
-
-  // return std::make_unique(val);
-}
-
-Up_ValueStruct ValueStruct_Factory::create(
-  String&& val)
-{
-  std::unique_ptr child(new (std::nothrow) ValueStruct_String(std::move(val)));
-
-  return std::move(child);
-
-  // return std::make_unique(std::move(val));
-}
-
-Up_ValueStruct ValueStruct_Factory::create(
-  const __FlashStringHelper *val)
-{
-  std::unique_ptr child(new (std::nothrow) ValueStruct_FlashString(val));
-
-  return std::move(child);
-
-  // return std::make_unique(val);
-}
diff --git a/src/src/Helpers/ValueStruct_Factory.h b/src/src/Helpers/ValueStruct_Factory.h
deleted file mode 100644
index 61270ebdf..000000000
--- a/src/src/Helpers/ValueStruct_Factory.h
+++ /dev/null
@@ -1,43 +0,0 @@
-#pragma once
-
-#include "../DataStructs/ValueStruct.h"
-#include "../Helpers/StringProvider.h"
-
-class ValueStruct_Factory
-{
-public:
-
-  static Up_ValueStruct create(const bool& val);
-
-  static Up_ValueStruct create(int val);
-#if defined(ESP32) && !defined(__riscv)
-  static Up_ValueStruct create(int32_t val);
-#endif
-  static Up_ValueStruct create(uint32_t val);
-#if defined(ESP32) && !defined(__riscv)
-  static Up_ValueStruct create(size_t val);
-#endif
-  static Up_ValueStruct create(const uint64_t& val);
-
-  static Up_ValueStruct create(const int64_t& val);
-
-
-  static Up_ValueStruct create(const float& val,
-                               uint8_t      nrDecimals        = 4,
-                               bool         trimTrailingZeros = false);
-
-  static Up_ValueStruct create(const double& val,
-                               uint8_t       nrDecimals        = 4,
-                               bool          trimTrailingZeros = false);
-
-  static Up_ValueStruct create(
-    const String& val);
-
-  static Up_ValueStruct create(
-    String&& val);
-
-  static Up_ValueStruct create(
-    const __FlashStringHelper *val);
-
-
-}; // class ValueStruct_Factory
diff --git a/src/src/WebServer/KeyValueWriter_WebForm.cpp b/src/src/WebServer/KeyValueWriter_WebForm.cpp
index b8e02a076..2059c7268 100644
--- a/src/src/WebServer/KeyValueWriter_WebForm.cpp
+++ b/src/src/WebServer/KeyValueWriter_WebForm.cpp
@@ -97,9 +97,9 @@ void KeyValueWriter_WebForm::write(const KeyValueStruct& kv)
       }
     }
 
-    if (kv._values[i]) {
+    if (kv._values[i].isSet()) {
 
-      String str(kv._values[i]->toString());
+      String str(kv._values[i].toString());
 
       if (!plain_text && (str.indexOf('\n') != -1))
       {

From 4df452cb4b902c00b075d354bef89c3b205916f7 Mon Sep 17 00:00:00 2001
From: TD-er 
Date: Tue, 21 Oct 2025 00:18:57 +0200
Subject: [PATCH 395/564] [ESPEasy] Increase nr of ints in EventStruct

---
 src/src/DataStructs/ESPEasy_EventStruct.h | 10 ++++++++--
 src/src/Helpers/ESPEasy_checks.cpp        |  4 ++--
 2 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/src/src/DataStructs/ESPEasy_EventStruct.h b/src/src/DataStructs/ESPEasy_EventStruct.h
index d0a230dba..36d057f80 100644
--- a/src/src/DataStructs/ESPEasy_EventStruct.h
+++ b/src/src/DataStructs/ESPEasy_EventStruct.h
@@ -83,6 +83,8 @@ public:
       int Par4;
       int Par5;
       int Par6;
+      int Par7;
+      int Par8;
 
     };
 
@@ -93,18 +95,22 @@ public:
       float Parf_4;
       float Parf_5;
       float Parf_6;
+      float Parf_7;
+      float Parf_8;
 
     };
 
-    float ParfN[6];
+    float ParfN[8];
     struct {
       int64_t Par64_1;
       int64_t Par64_2;
       int64_t Par64_3;
+      int64_t Par64_4;
 
     };
+    int64_t Par64N[4];
 
-    int ParN[6] = { 0 };
+    int ParN[8] = { 0 };
 
   };
 
diff --git a/src/src/Helpers/ESPEasy_checks.cpp b/src/src/Helpers/ESPEasy_checks.cpp
index 1611598f6..26a41c870 100644
--- a/src/src/Helpers/ESPEasy_checks.cpp
+++ b/src/src/Helpers/ESPEasy_checks.cpp
@@ -103,9 +103,9 @@ void run_compiletime_checks() {
   check_max_size();
   #ifdef ESP32  // ESP_IDF_VERSION_MAJOR > 3
   // String class has increased with 4 bytes
-  check_size(); // Is not stored
+  check_size(); // Is not stored
   #else
-  check_size(); // Is not stored
+  check_size(); // Is not stored
   #endif
 
   check_size(); // Is not stored

From cc731f5f8eb7f30b309538b073829d365bac4ff5 Mon Sep 17 00:00:00 2001
From: TD-er 
Date: Tue, 21 Oct 2025 00:19:30 +0200
Subject: [PATCH 396/564] [PPP modem] Show mobile provider name from SIM card

---
 .../NW005_data_struct_PPP_modem.cpp                | 14 +++++++++++++-
 1 file changed, 13 insertions(+), 1 deletion(-)

diff --git a/src/ESPEasy/net/NWPluginStructs/NW005_data_struct_PPP_modem.cpp b/src/ESPEasy/net/NWPluginStructs/NW005_data_struct_PPP_modem.cpp
index 4d9609c7f..72e9f2012 100644
--- a/src/ESPEasy/net/NWPluginStructs/NW005_data_struct_PPP_modem.cpp
+++ b/src/ESPEasy/net/NWPluginStructs/NW005_data_struct_PPP_modem.cpp
@@ -353,6 +353,18 @@ void NW005_data_struct_PPP_modem::webform_load_UE_system_information(KeyValueWri
     const __FlashStringHelper*sysmode_str[] = {
       F("NO SERVICE"), F("GSM"), F("WCDMA"), F("LTE")
     };
+    {
+      String provider_name = write_AT_cmd(F("AT+CSPN?"), 1000);
+
+      if (!provider_name.isEmpty()) {
+        int pos1 = provider_name.indexOf('"');
+        int pos2 = provider_name.lastIndexOf('"');
+
+        if ((pos1 != -1) && (pos2 != pos1)) {
+          writer->write({ F("Provider"), provider_name.substring(pos1 + 1, pos2) });
+        }
+      }
+    }
     int sysmode_index = -1;
 
     for (int i = 0; i < NR_ELEMENTS(sysmode_str) && sysmode_index == -1; ++i) {
@@ -985,7 +997,7 @@ bool NW005_data_struct_PPP_modem::handle_nwplugin_write(EventStruct *event, Stri
       const String writeCommand = parseStringToEnd(str, 3);
       const String res          = write_AT_cmd(writeCommand);
       addLog(LOG_LEVEL_INFO, strformat(
-               F("PPP cmd: %s -> %s"),
+               F("PPP cmd: %s -> %s\n"),
                writeCommand.c_str(),
                res.c_str()));
       success = true;

From 1b01cbb16b95f9e6c6b995da0f78a9894882f42e Mon Sep 17 00:00:00 2001
From: TD-er 
Date: Tue, 21 Oct 2025 10:14:40 +0200
Subject: [PATCH 397/564] [ValueStruct] Reduce memory allocations on short
 strings

---
 src/src/DataStructs/KeyValueStruct.cpp       |   6 +-
 src/src/DataStructs/KeyValueStruct.h         |   8 +-
 src/src/DataStructs/ValueStruct.cpp          | 163 ++++++++++++-------
 src/src/DataStructs/ValueStruct.h            |  61 ++++---
 src/src/Helpers/KeyValueWriter_JSON.cpp      |   4 +-
 src/src/Helpers/StringProvider.cpp           |   4 +-
 src/src/WebServer/KeyValueWriter_WebForm.cpp |   5 +-
 7 files changed, 152 insertions(+), 99 deletions(-)

diff --git a/src/src/DataStructs/KeyValueStruct.cpp b/src/src/DataStructs/KeyValueStruct.cpp
index 5ff687172..6e4e549e3 100644
--- a/src/src/DataStructs/KeyValueStruct.cpp
+++ b/src/src/DataStructs/KeyValueStruct.cpp
@@ -139,7 +139,7 @@ void KeyValueStruct::setID(const String& id)                  { __id = id; }
 
 void KeyValueStruct::setID(const __FlashStringHelper *id)     { __id = id; }
 
-void KeyValueStruct::appendValue(ValueStruct value)
+void KeyValueStruct::appendValue(ValueStruct&& value)
 {
   _values.emplace_back(std::move(value));
   _isArray = true;
@@ -159,6 +159,6 @@ void KeyValueStruct::appendValue(String&& value)
 
 String KeyValueStruct::getID() const
 {
-  if (__id.isEmpty()) { return to_internal_string(_key, '_'); }
-  return __id;
+  if (__id.isEmpty()) { return to_internal_string(_key.toString(), '_'); }
+  return __id.toString();
 }
diff --git a/src/src/DataStructs/KeyValueStruct.h b/src/src/DataStructs/KeyValueStruct.h
index 3e02a7583..9ca8473ae 100644
--- a/src/src/DataStructs/KeyValueStruct.h
+++ b/src/src/DataStructs/KeyValueStruct.h
@@ -115,16 +115,16 @@ struct KeyValueStruct
   void setID(const String& id);
   void setID(const __FlashStringHelper *id);
 
-  void appendValue(ValueStruct value);
+  void appendValue(ValueStruct&& value);
   void appendValue(const String& value);
   void appendValue(String&& value);
 
   String getID() const;
 
 
-  String _key;
-  String __id;
-  String _unit;
+  ValueStruct _key;
+  ValueStruct __id;
+  ValueStruct _unit;
 
   std::vector_values;
 
diff --git a/src/src/DataStructs/ValueStruct.cpp b/src/src/DataStructs/ValueStruct.cpp
index bc0938cad..37e9d29f3 100644
--- a/src/src/DataStructs/ValueStruct.cpp
+++ b/src/src/DataStructs/ValueStruct.cpp
@@ -4,12 +4,17 @@
 #include "../Helpers/PrintToString.h"
 #include "../Helpers/StringConverter_Numerical.h"
 
+#define VALUE_STRUCT_SSO_FIRST_CHAR_INDEX  2
+#define VALUE_STRUCT_SSO_MAX_SIZE          13
+
 // ********************************************************************************
 // ValueStruct
 // ********************************************************************************
 ValueStruct::~ValueStruct()
 {
-  if (static_cast(valueType) == ValueStruct::ValueType::String)
+  const auto vtype = static_cast(_valueType);
+
+  if (!_isSSO && (vtype == ValueStruct::ValueType::String))
   {
     if (str_val != nullptr) {
       free(str_val);
@@ -19,127 +24,160 @@ ValueStruct::~ValueStruct()
 
 ValueStruct::ValueStruct(ValueStruct&& rhs)
 {
-  memcpy(bytes_metadata, rhs.bytes_metadata, sizeof(bytes_metadata));
-  memcpy(bytes_val,      rhs.bytes_val,      sizeof(bytes_val));
-  memset(rhs.bytes_metadata, 0, sizeof(bytes_metadata));
-  memset(rhs.bytes_val,      0, sizeof(bytes_val));
+  memcpy(bytes_all, rhs.bytes_all, sizeof(bytes_all));
+  memset(rhs.bytes_all, 0, sizeof(bytes_all));
+}
+
+ValueStruct& ValueStruct::operator=(ValueStruct&& rhs)
+{
+  memcpy(bytes_all, rhs.bytes_all, sizeof(bytes_all));
+  memset(rhs.bytes_all, 0, sizeof(bytes_all));
+  return *this;
 }
 
 ValueStruct::ValueStruct(const bool& val) :
-  valueType((uint64_t)ValueStruct::ValueType::Bool),
-  size(1),
+  _isSSO(0),
+  _valueType((uint64_t)ValueStruct::ValueType::Bool),
+  _size(1),
   u64_val(val ? 1ull : 0ull)
 {}
 
 ValueStruct::ValueStruct(int val) :
-  valueType((uint64_t)ValueStruct::ValueType::Int),
-  size(sizeof(val) * 8),
+  _isSSO(0),
+  _valueType((uint64_t)ValueStruct::ValueType::Int),
+  _size(sizeof(val) * 8),
   i64_val(val)
 {}
 
 #if defined(ESP32) && !defined(__riscv)
 ValueStruct::ValueStruct(int32_t val) :
-  valueType((uint64_t)ValueStruct::ValueType::Int),
-  size(sizeof(val) * 8),
+  _isSSO(0),
+  _valueType((uint64_t)ValueStruct::ValueType::Int),
+  _size(sizeof(val) * 8),
   i64_val(val)
 {}
 
 #endif // if defined(ESP32) && !defined(__riscv)
 ValueStruct::ValueStruct(uint32_t val) :
-  valueType((uint64_t)ValueStruct::ValueType::UInt),
-  size(sizeof(val) * 8),
+  _isSSO(0),
+  _valueType((uint64_t)ValueStruct::ValueType::UInt),
+  _size(sizeof(val) * 8),
   u64_val(val)
 {}
 
 #if defined(ESP32) && !defined(__riscv)
 ValueStruct::ValueStruct(size_t val) :
-  valueType((uint64_t)ValueStruct::ValueType::UInt),
-  size(sizeof(val) * 8),
+  _isSSO(0),
+  _valueType((uint64_t)ValueStruct::ValueType::UInt),
+  _size(sizeof(val) * 8),
   u64_val(val)
 {}
 
 #endif // if defined(ESP32) && !defined(__riscv)
 ValueStruct::ValueStruct(const uint64_t& val) :
-  valueType((uint64_t)ValueStruct::ValueType::UInt),
-  size(sizeof(val) * 8),
+  _isSSO(0),
+  _valueType((uint64_t)ValueStruct::ValueType::UInt),
+  _size(sizeof(val) * 8),
   u64_val(val)
 {}
 
 ValueStruct::ValueStruct(const int64_t& val) :
-  valueType((uint64_t)ValueStruct::ValueType::Int),
-  size(sizeof(val) * 8),
+  _isSSO(0),
+  _valueType((uint64_t)ValueStruct::ValueType::Int),
+  _size(sizeof(val) * 8),
   i64_val(val)
 {}
 
 ValueStruct::ValueStruct(const float& val,
                          uint8_t      nrDecimals,
                          bool         trimTrailingZeros) :
-  nrDecimals((uint64_t)nrDecimals),
-  trimTrailingZeros((uint64_t)trimTrailingZeros),
-  valueType((uint64_t)ValueStruct::ValueType::Float),
-  size(sizeof(val) * 8),
+  _isSSO(0),
+  _nrDecimals((uint64_t)nrDecimals),
+  _trimTrailingZeros((uint64_t)trimTrailingZeros),
+  _valueType((uint64_t)ValueStruct::ValueType::Float),
+  _size(sizeof(val) * 8),
   f_val(val)
 {}
 
 ValueStruct::ValueStruct(const double& val,
                          uint8_t       nrDecimals,
                          bool          trimTrailingZeros) :
-  nrDecimals((uint64_t)nrDecimals),
-  trimTrailingZeros((uint64_t)trimTrailingZeros),
-  valueType((uint64_t)ValueStruct::ValueType::Double),
-  size(sizeof(val) * 8),
+  _isSSO(0),
+  _nrDecimals((uint64_t)nrDecimals),
+  _trimTrailingZeros((uint64_t)trimTrailingZeros),
+  _valueType((uint64_t)ValueStruct::ValueType::Double),
+  _size(sizeof(val) * 8),
   d_val(val)
 {}
 
 ValueStruct::ValueStruct(const char*val) :
-  valueType((uint64_t)ValueStruct::ValueType::String),
-  size(val ? strlen_P((const char *)(val)) : 0),
+  _isSSO(0),
+  _valueType((uint64_t)ValueStruct::ValueType::String),
+  _size(val ? strlen_P((const char *)(val)) : 0),
   str_val(nullptr)
 {
-  if (size) {
-    str_val = special_calloc(1, size + 1);
+  if (_size <= VALUE_STRUCT_SSO_MAX_SIZE) {
+    _isSSO = true;
+
+    // Make sure it is zero-terminated when nullptr is given
+    bytes_all[VALUE_STRUCT_SSO_FIRST_CHAR_INDEX] = 0;
+
+    if (val) {
+      memcpy(&bytes_all[VALUE_STRUCT_SSO_FIRST_CHAR_INDEX], (uint8_t *)val, _size + 1);
+    }
+  } else {
+    str_val = special_calloc(1, _size + 1);
 
     if (str_val) {
-      memcpy_P(str_val, val, size);
+      memcpy_P(str_val, val, _size);
     }
   }
 }
 
 ValueStruct::ValueStruct(const String& val) :
-  valueType((uint64_t)ValueStruct::ValueType::String),
-  size(val.length()),
+  _isSSO(0),
+  _valueType((uint64_t)ValueStruct::ValueType::String),
+  _size(val.length()),
   str_val(nullptr)
 {
-  if (size) {
-    str_val = special_calloc(1, size + 1);
+  if (_size <= VALUE_STRUCT_SSO_MAX_SIZE) {
+    _isSSO = true;
+    memcpy(&bytes_all[VALUE_STRUCT_SSO_FIRST_CHAR_INDEX], (uint8_t *)val.c_str(), _size + 1);
+  } else {
+    str_val = special_calloc(1, _size + 1);
 
     if (str_val) {
-      memcpy_P(str_val, val.begin(), size);
+      memcpy_P(str_val, val.begin(), _size);
     }
   }
 }
 
 ValueStruct::ValueStruct(String&& val) :
-  valueType((uint64_t)ValueStruct::ValueType::String),
-  size(val.length()),
+  _isSSO(0),
+  _valueType((uint64_t)ValueStruct::ValueType::String),
+  _size(val.length()),
   str_val(nullptr)
 {
   // We can't move the allocated memory from 'message'.
   // Just use move so we make sure the memory is de-allocated after this call.
   const String str = std::move(val);
 
-  if (size) {
-    str_val = special_calloc(1, size + 1);
+  if (_size <= VALUE_STRUCT_SSO_MAX_SIZE) {
+    _isSSO = true;
+    memcpy(&bytes_all[VALUE_STRUCT_SSO_FIRST_CHAR_INDEX], (uint8_t *)str.c_str(), _size + 1);
+  } else {
+    str_val = special_calloc(1, _size + 1);
 
     if (str_val) {
-      memcpy_P(str_val, str.begin(), size);
+      memcpy_P(str_val, str.begin(), _size);
     }
   }
 }
 
 ValueStruct::ValueStruct(const __FlashStringHelper *val) :
-  valueType((uint64_t)ValueStruct::ValueType::FlashString),
-  size(val ? strlen_P((const char *)(val)) : 0),
+  _isSSO(0),
+  _valueType((uint64_t)ValueStruct::ValueType::FlashString),
+  _size(val ? strlen_P((const char *)(val)) : 0),
   str_val((void *)(val))
 {}
 
@@ -152,9 +190,9 @@ String ValueStruct::toString() const
   return res;
 }
 
-String ValueStruct::toString(ValueType& valueType) const
+String ValueStruct::toString(ValueType& _valueType) const
 {
-  valueType = getValueType();
+  _valueType = getValueType();
   return toString();
 }
 
@@ -165,21 +203,24 @@ size_t ValueStruct::print(Print& out) const
   return print(out, v);
 }
 
-size_t ValueStruct::print(Print& out, ValueType& valueType) const
+size_t ValueStruct::print(Print& out, ValueType& _valueType) const
 {
-  valueType = getValueType();
+  _valueType = getValueType();
 
-  switch (valueType)
+  if (_isSSO) {
+    return out.write((const char *)&bytes_all[VALUE_STRUCT_SSO_FIRST_CHAR_INDEX]);
+  }
+
+  switch (_valueType)
   {
     case ValueStruct::ValueType::Bool:
     {
-      const bool v = u64_val != 0;
       return out.print(u64_val == 0 ? 0 : 1);
     }
     case ValueStruct::ValueType::String:
     {
       if (str_val == nullptr) { return 0; }
-      return out.write((const uint8_t *)str_val, size);
+      return out.write((const uint8_t *)str_val, _size);
     }
     case ValueStruct::ValueType::FlashString:
     {
@@ -190,9 +231,9 @@ size_t ValueStruct::print(Print& out, ValueType& valueType) const
     {
       String res;
 
-      if (!toValidString(res, f_val, nrDecimals, trimTrailingZeros))
+      if (!toValidString(res, f_val, _nrDecimals, _trimTrailingZeros))
       {
-        valueType = ValueStruct::ValueType::String;
+        _valueType = ValueStruct::ValueType::String;
       }
       return out.print(res);
     }
@@ -200,15 +241,15 @@ size_t ValueStruct::print(Print& out, ValueType& valueType) const
     {
       String res;
 
-      if (!doubleToValidString(res, d_val, nrDecimals, trimTrailingZeros))
+      if (!doubleToValidString(res, d_val, _nrDecimals, _trimTrailingZeros))
       {
-        valueType = ValueStruct::ValueType::String;
+        _valueType = ValueStruct::ValueType::String;
       }
       return out.print(res);
     }
     case ValueStruct::ValueType::Int:
     {
-      if (size == 8) {
+      if (_size == 8) {
         return out.print(ll2String(i64_val));
       }
       auto v = static_cast(i64_val);
@@ -216,24 +257,28 @@ size_t ValueStruct::print(Print& out, ValueType& valueType) const
     }
     case ValueStruct::ValueType::UInt:
     {
-      if (size == 8) {
+      if (_size == 8) {
         return out.print(ull2String(u64_val));
       }
       auto v = static_cast(u64_val);
       return out.print(v);
     }
-    case ValueStruct::ValueType::Unset:  break;
+    case ValueStruct::ValueType::SSO_string:
+    case ValueStruct::ValueType::Unset:
+      break;
   }
   return 0;
 }
 
 bool ValueStruct::isEmpty() const
 {
+  if (_isSSO) { return bytes_all[2] == 0; }
+
   switch (getValueType())
   {
     case ValueStruct::ValueType::String:
     case ValueStruct::ValueType::FlashString:
-      return size == 0;
+      return _size == 0;
     case ValueStruct::ValueType::Unset:
       return true;
     default: break;
diff --git a/src/src/DataStructs/ValueStruct.h b/src/src/DataStructs/ValueStruct.h
index 9f99b6994..7b3ded693 100644
--- a/src/src/DataStructs/ValueStruct.h
+++ b/src/src/DataStructs/ValueStruct.h
@@ -16,6 +16,7 @@ public:
 
   enum class ValueType : uint8_t {
     Unset = 0,
+    SSO_string,
     String,
     FlashString,
     Float,
@@ -27,7 +28,8 @@ public:
   };
 
   ValueStruct() :
-    valueType((uint64_t)ValueStruct::ValueType::Unset),
+    _isSSO(0),
+    _valueType((uint64_t)ValueStruct::ValueType::Unset),
     str_val(nullptr)
   {}
 
@@ -52,12 +54,12 @@ public:
 
 
   ValueStruct(const float& val,
-               uint8_t      nrDecimals        = 4,
-               bool         trimTrailingZeros = false);
+              uint8_t      nrDecimals        = 4,
+              bool         trimTrailingZeros = false);
 
   ValueStruct(const double& val,
-               uint8_t       nrDecimals        = 4,
-               bool          trimTrailingZeros = false);
+              uint8_t       nrDecimals        = 4,
+              bool          trimTrailingZeros = false);
 
 
   ValueStruct(const char*val);
@@ -70,21 +72,22 @@ public:
 
   ValueStruct::ValueType getValueType() const
   {
-    return static_cast(valueType);
+    if (_isSSO) { return ValueStruct::ValueType::String; }
+    return static_cast(_valueType);
   }
 
-  ValueStruct& operator=(ValueStruct&& rhs) = delete;
+  ValueStruct& operator=(ValueStruct&& rhs);
   ValueStruct& operator=(const ValueStruct& rhs) = delete;
 
-  String toString() const;
+  String       toString() const;
 
-  String toString(ValueType& valueType) const;
+  String       toString(ValueType& valueType) const;
 
-  size_t print(Print& out) const;
+  size_t       print(Print& out) const;
 
-  bool   isEmpty() const;
+  bool         isEmpty() const;
 
-  bool   isSet() const { return getValueType() != ValueStruct::ValueType::Unset; }
+  bool         isSet() const { return getValueType() != ValueStruct::ValueType::Unset; }
 
 private:
 
@@ -93,27 +96,31 @@ private:
 
   union {
     struct {
-      uint64_t nrDecimals        : 8;
-      uint64_t trimTrailingZeros : 1;
-      uint64_t valueType         : 7;
-      uint64_t size              : 16;
+      uint64_t _unitOfMeasure     : 8;
+      uint64_t _isSSO             : 1;
+      uint64_t _trimTrailingZeros : 1;
+      uint64_t _valueType         : 6;
+      uint64_t _nrDecimals        : 8;
+      uint64_t _size              : 16;
 
-      uint64_t unused : 32; // TODO TD-er: Store UoM enum
+      uint64_t unused : 24;
+
+      union {
+        void    *str_val;
+        float    f_val;
+        double   d_val;
+        int64_t  i64_val;
+        uint64_t u64_val;
+
+      };
 
     };
 
-    uint8_t bytes_metadata[8] = {};
+    // When _isSSO, the short string will be stored in bytes 2 ... 15
+    // The short string will be zero-terminated.
+    uint8_t bytes_all[16] = {};
 
   };
 
-  union {
-    void    *str_val;
-    float    f_val;
-    double   d_val;
-    int64_t  i64_val;
-    uint64_t u64_val;
-    uint8_t  bytes_val[8] = {};
-
-  };
 
 }; // class ValueStruct
diff --git a/src/src/Helpers/KeyValueWriter_JSON.cpp b/src/src/Helpers/KeyValueWriter_JSON.cpp
index 4e2ec9c97..9d7c4440f 100644
--- a/src/src/Helpers/KeyValueWriter_JSON.cpp
+++ b/src/src/Helpers/KeyValueWriter_JSON.cpp
@@ -107,10 +107,10 @@ void KeyValueWriter_JSON::write(const KeyValueStruct& kv)
   getPrint().write('\t');
 #endif // ifdef USE_KWH_JSON_PRETTY_PRINT
 
-  if (kv._key.length()) {
+  if (!kv._key.isEmpty()) {
     auto& pr = getPrint();
     pr.write('"');
-    pr.print(kv._key);
+    kv._key.print(pr);
     pr.write('"');
     pr.write(':');
   }
diff --git a/src/src/Helpers/StringProvider.cpp b/src/src/Helpers/StringProvider.cpp
index ce07d7be2..beb53fea2 100644
--- a/src/src/Helpers/StringProvider.cpp
+++ b/src/src/Helpers/StringProvider.cpp
@@ -1120,7 +1120,7 @@ String getLabel(LabelType::Enum label) {
   if (kv._key.isEmpty()) {
     return F("MissingString");
   }
-  return kv._key;
+  return kv._key.toString();
 }
 
 String getValue(LabelType::Enum label) {
@@ -1248,5 +1248,5 @@ String getFormUnit(LabelType::Enum label)
 {
   auto kv = getKeyValue(label);
 
-  return kv._unit;
+  return kv._unit.toString();
 }
diff --git a/src/src/WebServer/KeyValueWriter_WebForm.cpp b/src/src/WebServer/KeyValueWriter_WebForm.cpp
index 2059c7268..3cfac3ccc 100644
--- a/src/src/WebServer/KeyValueWriter_WebForm.cpp
+++ b/src/src/WebServer/KeyValueWriter_WebForm.cpp
@@ -79,7 +79,8 @@ void KeyValueWriter_WebForm::write(const KeyValueStruct& kv)
   if (!summary_value_only) {
     if (format_note) { addRowLabel_tr_id(EMPTY_STRING, EMPTY_STRING); }
     else {
-      addRowLabel(kv._key, kv.__id);
+      // Use the __id value, not the getID function, so we only output the set value, not a generated value based on the key.
+      addRowLabel(kv._key.toString(), kv.__id.toString());
     }
   }
 
@@ -112,7 +113,7 @@ void KeyValueWriter_WebForm::write(const KeyValueStruct& kv)
   // May need to include the unit before ending
    // or else it will be shown on the next line if (!plain_text && (nrValues == 1) && !summary_value_only) { - addUnit(kv._unit); + addUnit(kv._unit.toString()); } if (format_pre) { getPrint().print(F("")); } From 3314d213b88b6609de03419061c7515614a12d66 Mon Sep 17 00:00:00 2001 From: TD-er Date: Tue, 21 Oct 2025 10:41:42 +0200 Subject: [PATCH 398/564] [LogEntry] Reduce LogEntry struct to 16 bytes per log item in memory --- src/src/DataStructs/LogEntry.cpp | 23 ++++----- src/src/DataStructs/LogEntry.h | 13 ++--- src/src/ESPEasyCore/ESPEasy_Log.cpp | 77 +++++------------------------ 3 files changed, 25 insertions(+), 88 deletions(-) diff --git a/src/src/DataStructs/LogEntry.cpp b/src/src/DataStructs/LogEntry.cpp index 3e5c21dc8..d13ad9220 100644 --- a/src/src/DataStructs/LogEntry.cpp +++ b/src/src/DataStructs/LogEntry.cpp @@ -8,8 +8,8 @@ LogEntry_t::LogEntry_t(const uint8_t logLevel, const __FlashStringHelper *message) : _message((void *)(message)), - _strLength(message ? strlen_P((const char *)(message)) : 0), _timestamp(millis()), + _strLength(message ? strlen_P((const char *)(message)) : 0), _isFlashString(true), _logLevel(logLevel), _subscriberPendingRead(0) @@ -18,13 +18,13 @@ LogEntry_t::LogEntry_t(const uint8_t logLevel, LogEntry_t::LogEntry_t(const uint8_t logLevel, const char *message) : _message(nullptr), - _strLength(message ? strlen_P((const char *)(message)) : 0), _timestamp(millis()), + _strLength(message ? strlen_P((const char *)(message)) : 0), _isFlashString(false), _logLevel(logLevel), _subscriberPendingRead(0) { - if (_strLength) { + if (_strLength && loglevelActiveFor(logLevel)) { _message = special_calloc(1, _strLength + 1); if (_message) { @@ -36,13 +36,13 @@ LogEntry_t::LogEntry_t(const uint8_t logLevel, LogEntry_t::LogEntry_t(const uint8_t logLevel, const String& message) : _message(nullptr), - _strLength(message.length()), _timestamp(millis()), + _strLength(message.length()), _isFlashString(false), _logLevel(logLevel), _subscriberPendingRead(0) { - if (_strLength) { + if (_strLength && loglevelActiveFor(logLevel)) { _message = special_calloc(1, _strLength + 1); @@ -55,8 +55,8 @@ LogEntry_t::LogEntry_t(const uint8_t logLevel, LogEntry_t::LogEntry_t(const uint8_t logLevel, String && message) : _message(nullptr), - _strLength(message.length()), _timestamp(millis()), + _strLength(message.length()), _isFlashString(false), _logLevel(logLevel), _subscriberPendingRead(0) @@ -65,12 +65,11 @@ LogEntry_t::LogEntry_t(const uint8_t logLevel, // Just use move so we make sure the memory is de-allocated after this call. String str = std::move(message); - if (_strLength) { - const size_t size = str.length(); - _message = special_calloc(1, size + 1); + if (_strLength && loglevelActiveFor(logLevel)) { + _message = special_calloc(1, _strLength + 1); if (_message) { - memcpy_P(_message, str.begin(), size); + memcpy_P(_message, str.begin(), _strLength); } } } @@ -84,12 +83,10 @@ LogEntry_t::~LogEntry_t() LogEntry_t::LogEntry_t(LogEntry_t&& rhs) : _message(rhs._message), - _strLength(rhs._strLength), _timestamp(rhs._timestamp), _flags(rhs._flags) { rhs._message = nullptr; - rhs._strLength = 0; rhs._timestamp = 0; rhs._flags = 0; } @@ -97,12 +94,10 @@ LogEntry_t::LogEntry_t(LogEntry_t&& rhs) : LogEntry_t& LogEntry_t::operator=(LogEntry_t&& rhs) { _message = rhs._message; - _strLength = rhs._strLength; _timestamp = rhs._timestamp; _flags = rhs._flags; rhs._message = nullptr; - rhs._strLength = 0; rhs._timestamp = 0; rhs._flags = 0; return *this; diff --git a/src/src/DataStructs/LogEntry.h b/src/src/DataStructs/LogEntry.h index 38723ee5b..36bb9680b 100644 --- a/src/src/DataStructs/LogEntry.h +++ b/src/src/DataStructs/LogEntry.h @@ -4,8 +4,6 @@ #include "../DataTypes/LogLevels.h" -#include - #ifdef ESP32 # define LOG_BUFFER_EXPIRE 30000 // Time after which a buffered log item is considered expired. @@ -68,23 +66,18 @@ struct LogEntry_t { private: void *_message{}; - size_t _strLength; uint32_t _timestamp; union { uint32_t _flags; struct { + uint32_t _strLength : 19; uint32_t _isFlashString : 1; uint32_t _logLevel : 4; - uint32_t _subscriberPendingRead : 8; - - uint32_t unused : 19; + uint32_t _subscriberPendingRead : 8; // See NR_LOG_TO_DESTINATIONS }; + }; }; - - -typedef std::unique_ptrUp_LogEntry; -typedef std::shared_ptrSp_LogEntry; diff --git a/src/src/ESPEasyCore/ESPEasy_Log.cpp b/src/src/ESPEasyCore/ESPEasy_Log.cpp index 37dab4ad8..a5ffd0085 100644 --- a/src/src/ESPEasyCore/ESPEasy_Log.cpp +++ b/src/src/ESPEasyCore/ESPEasy_Log.cpp @@ -26,10 +26,10 @@ void initLog() #ifdef ESP32 setLogLevelFor(LOG_TO_SYSLOG, 2); setLogLevelFor(LOG_TO_WEBLOG, 2); - #else + #else // ifdef ESP32 setLogLevelFor(LOG_TO_SYSLOG, 0); setLogLevelFor(LOG_TO_WEBLOG, 0); - #endif + #endif // ifdef ESP32 setLogLevelFor(LOG_TO_SERIAL, 2); // logging during initialisation @@ -206,72 +206,25 @@ void addLog(uint8_t logLevel, const __FlashStringHelper *str) return; } #endif // ifdef ESP32 - // Up_LogEntry entry(new (std::nothrow) LogEntry_t(logLevel, str)); - // Logging.addLogEntry(std::move(entry)); Logging.addLogEntry(LogEntry_t(logLevel, str)); } -void addLog(uint8_t logLevel, const char *line) -{ - // Please note all functions called from here handling line must be PROGMEM aware. - if (loglevelActiveFor(logLevel)) { +void addLog(uint8_t logLevel, const char *line) { + #ifdef ESP32 - String copy; - #ifdef USE_SECOND_HEAP - { - // Allow to store the logs in 2nd heap if present. - if (mmu_is_iram(line)) { - size_t length = 0; - const char*cur_char = line; - bool copying = false; - bool done = false; - - while (!done) { - const uint8_t ch = mmu_get_uint8(cur_char++); - - if (ch == 0) { - if (copying) { - done = true; - } else { - if (!reserve_special(copy, length)) { - return; - } - copying = true; - cur_char = line; - } - } else { - if (copying) { - copy += (char)ch; - } else { - ++length; - } - } - } - } else { - if (!reserve_special(copy, strlen_P((PGM_P)line))) { - return; - } - copy = line; - } - } - #else // ifdef USE_SECOND_HEAP - - if (!reserve_special(copy, strlen_P((PGM_P)line))) { - return; - } - copy = line; - #endif // ifdef USE_SECOND_HEAP - addToLogMove(logLevel, std::move(copy)); + if (xPortInIsrContext()) { + // When called from an ISR, you should not send out logs. + // Allocating memory from within an ISR is a big no-no. + // Also long-time blocking like sending logs (especially to a syslog server) + // is also really not a good idea from an ISR call. + return; } + #endif // ifdef ESP32 + Logging.addLogEntry(LogEntry_t(logLevel, line)); } void addLog(uint8_t logLevel, String&& str) { addToLogMove(logLevel, std::move(str)); } - -#ifndef LIMIT_BUILD_SIZE -# include "../Helpers/Memory.h" -#endif - void addLog(uint8_t logLevel, const String& str) { #ifdef ESP32 @@ -284,8 +237,6 @@ void addLog(uint8_t logLevel, const String& str) return; } #endif // ifdef ESP32 - // Up_LogEntry entry(new (std::nothrow) LogEntry_t(logLevel, str)); - // Logging.addLogEntry(std::move(entry)); Logging.addLogEntry(LogEntry_t(logLevel, str)); } @@ -301,7 +252,5 @@ void addToLogMove(uint8_t logLevel, String&& str) return; } #endif // ifdef ESP32 - // Up_LogEntry entry(new (std::nothrow) LogEntry_t(logLevel, str)); - // Logging.addLogEntry(std::move(entry)); - Logging.addLogEntry(LogEntry_t(logLevel, str)); + Logging.addLogEntry(LogEntry_t(logLevel, std::move(str))); } From b12ce6a0b8598a0b51aaaf38e321c6e137e1cfc0 Mon Sep 17 00:00:00 2001 From: TD-er Date: Tue, 21 Oct 2025 10:42:14 +0200 Subject: [PATCH 399/564] [ValueStruct] Fix order initialization members --- src/src/DataStructs/ValueStruct.cpp | 5 ++--- src/src/DataStructs/ValueStruct.h | 1 - 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/src/src/DataStructs/ValueStruct.cpp b/src/src/DataStructs/ValueStruct.cpp index 37e9d29f3..83c01f5c0 100644 --- a/src/src/DataStructs/ValueStruct.cpp +++ b/src/src/DataStructs/ValueStruct.cpp @@ -92,9 +92,9 @@ ValueStruct::ValueStruct(const float& val, uint8_t nrDecimals, bool trimTrailingZeros) : _isSSO(0), - _nrDecimals((uint64_t)nrDecimals), _trimTrailingZeros((uint64_t)trimTrailingZeros), _valueType((uint64_t)ValueStruct::ValueType::Float), + _nrDecimals((uint64_t)nrDecimals), _size(sizeof(val) * 8), f_val(val) {} @@ -103,9 +103,9 @@ ValueStruct::ValueStruct(const double& val, uint8_t nrDecimals, bool trimTrailingZeros) : _isSSO(0), - _nrDecimals((uint64_t)nrDecimals), _trimTrailingZeros((uint64_t)trimTrailingZeros), _valueType((uint64_t)ValueStruct::ValueType::Double), + _nrDecimals((uint64_t)nrDecimals), _size(sizeof(val) * 8), d_val(val) {} @@ -263,7 +263,6 @@ size_t ValueStruct::print(Print& out, ValueType& _valueType) const auto v = static_cast(u64_val); return out.print(v); } - case ValueStruct::ValueType::SSO_string: case ValueStruct::ValueType::Unset: break; } diff --git a/src/src/DataStructs/ValueStruct.h b/src/src/DataStructs/ValueStruct.h index 7b3ded693..2b7d6d5d6 100644 --- a/src/src/DataStructs/ValueStruct.h +++ b/src/src/DataStructs/ValueStruct.h @@ -16,7 +16,6 @@ public: enum class ValueType : uint8_t { Unset = 0, - SSO_string, String, FlashString, Float, From e156670a8ff5ad5df879e8d6032b895f45c7b4e5 Mon Sep 17 00:00:00 2001 From: TD-er Date: Tue, 21 Oct 2025 14:08:22 +0200 Subject: [PATCH 400/564] [KeyValueStruct] Add standard Unit-of-Measure units --- src/ESPEasy/net/Helpers/NW_info_writer.cpp | 12 +- .../NW005_data_struct_PPP_modem.cpp | 48 +++--- src/ESPEasy/net/_NW001_WiFi_STA.cpp | 19 ++- src/ESPEasy/net/_NW003_ETH_RMII.cpp | 5 +- src/ESPEasy/net/_NW004_ETH_SPI.cpp | 5 +- src/src/DataStructs/KeyValueStruct.cpp | 17 ++- src/src/DataStructs/KeyValueStruct.h | 12 +- src/src/DataStructs/ValueStruct.cpp | 43 +++--- src/src/DataStructs/ValueStruct.h | 5 +- src/src/Helpers/StringProvider.cpp | 137 +++++++++++++----- src/src/WebServer/KeyValueWriter_WebForm.cpp | 2 +- src/src/WebServer/Markup.cpp | 2 +- src/src/WebServer/Markup.h | 13 ++ 13 files changed, 214 insertions(+), 106 deletions(-) diff --git a/src/ESPEasy/net/Helpers/NW_info_writer.cpp b/src/ESPEasy/net/Helpers/NW_info_writer.cpp index 704d9ee2a..fbbfe2083 100644 --- a/src/ESPEasy/net/Helpers/NW_info_writer.cpp +++ b/src/ESPEasy/net/Helpers/NW_info_writer.cpp @@ -3,6 +3,8 @@ #include "../../../src/DataStructs/ESPEasy_EventStruct.h" #include "../../../src/DataTypes/ESPEasy_plugin_functions.h" #include "../../../src/Globals/Settings.h" +#include "../../../src/Helpers/StringConverter.h" + #include "../Globals/NWPlugins.h" @@ -51,12 +53,12 @@ bool write_NetworkAdapterFlags(ESPEasy::net::networkIndex_t networkindex, KeyVal if (NWPlugin::isFlagSet(flags[i], TempEvent.networkInterface)) { String labels_str = NWPlugin::toString(flags[i]); - if (flags[i] == NWPlugin::NetforkFlags::DHCP_client) { - if (TempEvent.networkInterface->getStatusBits() & ESP_NETIF_HAS_STATIC_IP_BIT) { - labels_str += F(" (static IP)"); - } + if ((flags[i] == NWPlugin::NetforkFlags::DHCP_client) && + (TempEvent.networkInterface->getStatusBits() & ESP_NETIF_HAS_STATIC_IP_BIT)) { + kv.appendValue(concat(NWPlugin::toString(flags[i]), F(" (static IP)"))); + } else { + kv.appendValue(NWPlugin::toString(flags[i])); } - kv.appendValue(std::move(labels_str)); } } writer->write(kv); diff --git a/src/ESPEasy/net/NWPluginStructs/NW005_data_struct_PPP_modem.cpp b/src/ESPEasy/net/NWPluginStructs/NW005_data_struct_PPP_modem.cpp index 72e9f2012..c7dcc6907 100644 --- a/src/ESPEasy/net/NWPluginStructs/NW005_data_struct_PPP_modem.cpp +++ b/src/ESPEasy/net/NWPluginStructs/NW005_data_struct_PPP_modem.cpp @@ -241,7 +241,7 @@ String NW005_data_struct_PPP_modem::operatorName() const return NW_PLUGIN_INTERFACE.operatorName(); } -const __FlashStringHelper* NW005_decode_label(int sysmode_index, uint8_t i, String& value_str, String& unit) +const __FlashStringHelper* NW005_decode_label(int sysmode_index, uint8_t i, String& value_str, bool& has_dBm_unit) { const __FlashStringHelper*res = F(""); @@ -300,23 +300,21 @@ const __FlashStringHelper* NW005_decode_label(int sysmode_index, uint8_t i, Stri // RSRQ { float val = value_str.toInt(); - val -= 40; - val /= 2.0f; - value_str = String(val, 1); - unit = F("dBm"); + val -= 40; + val /= 2.0f; + value_str = String(val, 1); + has_dBm_unit = true; break; } case 11: // RSRP - value_str = value_str.toInt() - 140; - unit = F("dBm"); - + value_str = value_str.toInt() - 140; + has_dBm_unit = true; break; case 12: // RSSI - value_str = value_str.toInt() - 110; - unit = F("dBm"); - + value_str = value_str.toInt() - 110; + has_dBm_unit = true; break; } @@ -383,25 +381,31 @@ void NW005_data_struct_PPP_modem::webform_load_UE_system_information(KeyValueWri for (int i = 0; start_index < res.length() && end_index != -1 && i < 15; ++i) { - String value_str = res.substring(start_index, end_index); - String unit; - const String label = NW005_decode_label(sysmode_index, i, value_str, unit); + String value_str = res.substring(start_index, end_index); + bool has_dBm_unit = false; + const String label = NW005_decode_label(sysmode_index, i, value_str, has_dBm_unit); if (!label.isEmpty()) { if (i == 0) { // We have some leading characters left here, so use the 'clean' strings KeyValueStruct kv(label, sysmode_str[sysmode_index]); - if (unit.length()) { - kv.setUnit(unit); + if (has_dBm_unit) { +#if FEATURE_TASKVALUE_UNIT_OF_MEASURE + kv.setUnit(UOM_dBm); +#endif } + writer->write(kv); } else { KeyValueStruct kv(label, value_str, KeyValueStruct::Format::PreFormatted); - if (unit.length()) { - kv.setUnit(unit); + if (has_dBm_unit) { +#if FEATURE_TASKVALUE_UNIT_OF_MEASURE + kv.setUnit(UOM_dBm); +#endif } + writer->write(kv); } } @@ -678,7 +682,9 @@ bool NW005_data_struct_PPP_modem::write_ModemState(KeyValueWriter*modemState) } { KeyValueStruct kv(F("RSSI"), getRSSI()); - kv.setUnit(F("dBm")); +#if FEATURE_TASKVALUE_UNIT_OF_MEASURE + kv.setUnit(UOM_dBm); +#endif modemState->write(kv); } STATE_WRITE(F("BER"), getBER()); @@ -742,7 +748,9 @@ bool NW005_data_struct_PPP_modem::write_ModemState(KeyValueWriter*modemState) if (batVolt >= 0) { KeyValueStruct kv(F("Battery Voltage"), batVolt); - kv.setUnit(F("mV")); +#if FEATURE_TASKVALUE_UNIT_OF_MEASURE + kv.setUnit(UOM_milliVolt); +#endif modemState->write(kv); } diff --git a/src/ESPEasy/net/_NW001_WiFi_STA.cpp b/src/ESPEasy/net/_NW001_WiFi_STA.cpp index d4151bda2..b3242b65b 100644 --- a/src/ESPEasy/net/_NW001_WiFi_STA.cpp +++ b/src/ESPEasy/net/_NW001_WiFi_STA.cpp @@ -140,7 +140,9 @@ bool NWPlugin_001(NWPlugin::Function function, EventStruct *event, String& strin KeyValueStruct kv( F("Band"), (WiFi.channel() < 36) ? F("2.4") : F("5")); - kv.setUnit(F("GHz")); +#if FEATURE_TASKVALUE_UNIT_OF_MEASURE + kv.setUnit(UOM_GHz); +#endif event->kvWriter->write(kv); } # endif // if CONFIG_SOC_WIFI_SUPPORT_5G @@ -152,9 +154,9 @@ bool NWPlugin_001(NWPlugin::Function function, EventStruct *event, String& strin strformat( event->kvWriter->summaryValueOnly() ? F("RSSI: %d dBm") : F("%d"), WiFi.RSSI())); - - kv.setUnit(F("dBm")); - +#if FEATURE_TASKVALUE_UNIT_OF_MEASURE + kv.setUnit(UOM_dBm); +#endif event->kvWriter->write(kv); } @@ -164,7 +166,10 @@ bool NWPlugin_001(NWPlugin::Function function, EventStruct *event, String& strin KeyValueStruct kv( F("WiFi TX Power"), ESPEasy::net::wifi::GetWiFiTXpower(), 2); - kv.setUnit(F("dBm")); +#if FEATURE_TASKVALUE_UNIT_OF_MEASURE + kv.setUnit(UOM_dBm); +#endif + event->kvWriter->write(kv); } #endif @@ -188,7 +193,9 @@ bool NWPlugin_001(NWPlugin::Function function, EventStruct *event, String& strin secondsToDayHourMinuteSecond(micros_to_sec_usec(tsf_time, tsf_usec)), strformat(F(".%06u"), tsf_usec)) ); - kv.setUnit(F("usec")); +#if FEATURE_TASKVALUE_UNIT_OF_MEASURE + kv.setUnit(UOM_usec); +#endif event->kvWriter->write(kv); } } diff --git a/src/ESPEasy/net/_NW003_ETH_RMII.cpp b/src/ESPEasy/net/_NW003_ETH_RMII.cpp index 7e4e4a1ef..c305be9c8 100644 --- a/src/ESPEasy/net/_NW003_ETH_RMII.cpp +++ b/src/ESPEasy/net/_NW003_ETH_RMII.cpp @@ -102,9 +102,10 @@ bool NWPlugin_003(NWPlugin::Function function, EventStruct *event, String& strin event->kvWriter->write({ EMPTY_STRING, s }); } else { KeyValueStruct kv(F("Link Speed"), ETH.linkSpeed()); - kv.setUnit(F("Mbps")); +#if FEATURE_TASKVALUE_UNIT_OF_MEASURE + kv.setUnit(UOM_Mbps); +#endif event->kvWriter->write(kv); - event->kvWriter->write({ F("Link Speed"), ETH.linkSpeed() }); event->kvWriter->write({ F("Duplex Mode"), ETH.fullDuplex() ? F("Full Duplex") : F("Half Duplex") }); event->kvWriter->write({ F("Negotiation Mode"), ETH.autoNegotiation() ? F("Auto") : F("Manual") }); } diff --git a/src/ESPEasy/net/_NW004_ETH_SPI.cpp b/src/ESPEasy/net/_NW004_ETH_SPI.cpp index ae1d09662..3f9b47009 100644 --- a/src/ESPEasy/net/_NW004_ETH_SPI.cpp +++ b/src/ESPEasy/net/_NW004_ETH_SPI.cpp @@ -107,9 +107,10 @@ bool NWPlugin_004(NWPlugin::Function function, EventStruct *event, String& strin event->kvWriter->write({ EMPTY_STRING, s }); } else { KeyValueStruct kv(F("Link Speed"), ETH.linkSpeed()); - kv.setUnit(F("Mbps")); +#if FEATURE_TASKVALUE_UNIT_OF_MEASURE + kv.setUnit(UOM_Mbps); +#endif event->kvWriter->write(kv); - event->kvWriter->write({ F("Link Speed"), ETH.linkSpeed() }); event->kvWriter->write({ F("Duplex Mode"), ETH.fullDuplex() ? F("Full Duplex") : F("Half Duplex") }); event->kvWriter->write({ F("Negotiation Mode"), ETH.autoNegotiation() ? F("Auto") : F("Manual") }); } diff --git a/src/src/DataStructs/KeyValueStruct.cpp b/src/src/DataStructs/KeyValueStruct.cpp index 6e4e549e3..f7a1a48dc 100644 --- a/src/src/DataStructs/KeyValueStruct.cpp +++ b/src/src/DataStructs/KeyValueStruct.cpp @@ -3,6 +3,8 @@ #include "../Helpers/StringConverter.h" #include "../Helpers/StringConverter_Numerical.h" +#include "../WebServer/Markup.h" + // ******************************************************************************** // KeyValueStruct @@ -131,9 +133,12 @@ KeyValueStruct::KeyValueStruct(const String& key, _values.emplace_back(ValueStruct(std::move(val))); } -void KeyValueStruct::setUnit(const String& unit) { _unit = unit; } - -void KeyValueStruct::setUnit(const __FlashStringHelper *unit) { _unit = unit; } +#if FEATURE_TASKVALUE_UNIT_OF_MEASURE + String KeyValueStruct::getUnit() const + { + return toUnitOfMeasureName(_uomIndex); + } +#endif void KeyValueStruct::setID(const String& id) { __id = id; } @@ -151,6 +156,12 @@ void KeyValueStruct::appendValue(const String& value) _isArray = true; } +void KeyValueStruct::appendValue(const __FlashStringHelper * value) +{ + _values.emplace_back(ValueStruct(value)); + _isArray = true; +} + void KeyValueStruct::appendValue(String&& value) { _values.emplace_back(ValueStruct(std::move(value))); diff --git a/src/src/DataStructs/KeyValueStruct.h b/src/src/DataStructs/KeyValueStruct.h index 9ca8473ae..902b75b05 100644 --- a/src/src/DataStructs/KeyValueStruct.h +++ b/src/src/DataStructs/KeyValueStruct.h @@ -109,14 +109,17 @@ struct KeyValueStruct } */ - void setUnit(const String& unit); - void setUnit(const __FlashStringHelper *unit); +#if FEATURE_TASKVALUE_UNIT_OF_MEASURE + void setUnit(uint8_t uomIndex) { _uomIndex = uomIndex; } + String getUnit() const; +#endif void setID(const String& id); void setID(const __FlashStringHelper *id); void appendValue(ValueStruct&& value); void appendValue(const String& value); + void appendValue(const __FlashStringHelper * value); void appendValue(String&& value); String getID() const; @@ -124,11 +127,12 @@ struct KeyValueStruct ValueStruct _key; ValueStruct __id; - ValueStruct _unit; - std::vector_values; Format _format = Format::Default; +#if FEATURE_TASKVALUE_UNIT_OF_MEASURE + uint8_t _uomIndex{}; +#endif bool _isArray{}; diff --git a/src/src/DataStructs/ValueStruct.cpp b/src/src/DataStructs/ValueStruct.cpp index 83c01f5c0..db00c298f 100644 --- a/src/src/DataStructs/ValueStruct.cpp +++ b/src/src/DataStructs/ValueStruct.cpp @@ -4,8 +4,9 @@ #include "../Helpers/PrintToString.h" #include "../Helpers/StringConverter_Numerical.h" -#define VALUE_STRUCT_SSO_FIRST_CHAR_INDEX 2 -#define VALUE_STRUCT_SSO_MAX_SIZE 13 +#define VALUE_STRUCT_SSO_FIRST_CHAR_INDEX 1 +#define VALUE_STRUCT_SSO_FIRST_CHAR bytes_all[VALUE_STRUCT_SSO_FIRST_CHAR_INDEX] +#define VALUE_STRUCT_SSO_MAX_SIZE 14 // ******************************************************************************** // ValueStruct @@ -120,10 +121,10 @@ ValueStruct::ValueStruct(const char*val) : _isSSO = true; // Make sure it is zero-terminated when nullptr is given - bytes_all[VALUE_STRUCT_SSO_FIRST_CHAR_INDEX] = 0; + VALUE_STRUCT_SSO_FIRST_CHAR = 0; if (val) { - memcpy(&bytes_all[VALUE_STRUCT_SSO_FIRST_CHAR_INDEX], (uint8_t *)val, _size + 1); + memcpy(&VALUE_STRUCT_SSO_FIRST_CHAR, (uint8_t *)val, _size + 1); } } else { str_val = special_calloc(1, _size + 1); @@ -142,7 +143,7 @@ ValueStruct::ValueStruct(const String& val) : { if (_size <= VALUE_STRUCT_SSO_MAX_SIZE) { _isSSO = true; - memcpy(&bytes_all[VALUE_STRUCT_SSO_FIRST_CHAR_INDEX], (uint8_t *)val.c_str(), _size + 1); + memcpy(&VALUE_STRUCT_SSO_FIRST_CHAR, (uint8_t *)val.c_str(), _size + 1); } else { str_val = special_calloc(1, _size + 1); @@ -164,7 +165,7 @@ ValueStruct::ValueStruct(String&& val) : if (_size <= VALUE_STRUCT_SSO_MAX_SIZE) { _isSSO = true; - memcpy(&bytes_all[VALUE_STRUCT_SSO_FIRST_CHAR_INDEX], (uint8_t *)str.c_str(), _size + 1); + memcpy(&VALUE_STRUCT_SSO_FIRST_CHAR, (uint8_t *)str.c_str(), _size + 1); } else { str_val = special_calloc(1, _size + 1); @@ -183,17 +184,17 @@ ValueStruct::ValueStruct(const __FlashStringHelper *val) : String ValueStruct::toString() const { - PrintToString p; - - print(p); - String res(p.getMove()); - return res; + ValueType valueType; + return toString(valueType); } -String ValueStruct::toString(ValueType& _valueType) const +String ValueStruct::toString(ValueType& valueType) const { - _valueType = getValueType(); - return toString(); + PrintToString p; + + print(p, valueType); + String res(p.getMove()); + return res; } size_t ValueStruct::print(Print& out) const @@ -203,15 +204,15 @@ size_t ValueStruct::print(Print& out) const return print(out, v); } -size_t ValueStruct::print(Print& out, ValueType& _valueType) const +size_t ValueStruct::print(Print& out, ValueType& valueType) const { - _valueType = getValueType(); + valueType = getValueType(); if (_isSSO) { - return out.write((const char *)&bytes_all[VALUE_STRUCT_SSO_FIRST_CHAR_INDEX]); + return out.write((const char *)&VALUE_STRUCT_SSO_FIRST_CHAR); } - switch (_valueType) + switch (valueType) { case ValueStruct::ValueType::Bool: { @@ -233,7 +234,7 @@ size_t ValueStruct::print(Print& out, ValueType& _valueType) const if (!toValidString(res, f_val, _nrDecimals, _trimTrailingZeros)) { - _valueType = ValueStruct::ValueType::String; + valueType = ValueStruct::ValueType::String; } return out.print(res); } @@ -243,7 +244,7 @@ size_t ValueStruct::print(Print& out, ValueType& _valueType) const if (!doubleToValidString(res, d_val, _nrDecimals, _trimTrailingZeros)) { - _valueType = ValueStruct::ValueType::String; + valueType = ValueStruct::ValueType::String; } return out.print(res); } @@ -271,7 +272,7 @@ size_t ValueStruct::print(Print& out, ValueType& _valueType) const bool ValueStruct::isEmpty() const { - if (_isSSO) { return bytes_all[2] == 0; } + if (_isSSO) { return VALUE_STRUCT_SSO_FIRST_CHAR == 0; } switch (getValueType()) { diff --git a/src/src/DataStructs/ValueStruct.h b/src/src/DataStructs/ValueStruct.h index 2b7d6d5d6..dde95e03f 100644 --- a/src/src/DataStructs/ValueStruct.h +++ b/src/src/DataStructs/ValueStruct.h @@ -95,14 +95,13 @@ private: union { struct { - uint64_t _unitOfMeasure : 8; uint64_t _isSSO : 1; uint64_t _trimTrailingZeros : 1; uint64_t _valueType : 6; uint64_t _nrDecimals : 8; uint64_t _size : 16; - uint64_t unused : 24; + uint64_t unused : 32; union { void *str_val; @@ -115,7 +114,7 @@ private: }; - // When _isSSO, the short string will be stored in bytes 2 ... 15 + // When _isSSO, the short string will be stored in bytes 1 ... 15 // The short string will be zero-terminated. uint8_t bytes_all[16] = {}; diff --git a/src/src/Helpers/StringProvider.cpp b/src/src/Helpers/StringProvider.cpp index beb53fea2..4c1282085 100644 --- a/src/src/Helpers/StringProvider.cpp +++ b/src/src/Helpers/StringProvider.cpp @@ -43,6 +43,7 @@ #include "../WebServer/JSON.h" #include "../WebServer/AccessControl.h" +#include "../WebServer/Markup.h" #ifdef ESP32 # include @@ -111,7 +112,9 @@ KeyValueStruct getKeyValue(LabelType::Enum label, bool extendedValue) if (node_time.systemTimePresent()) { KeyValueStruct kv(F("Time Wander"), node_time.timeWander, 3); - KV_SETUNIT(F("ppm")); +#if FEATURE_TASKVALUE_UNIT_OF_MEASURE + KV_SETUNIT(UOM_ppm); +#endif return kv; } break; @@ -153,7 +156,9 @@ KeyValueStruct getKeyValue(LabelType::Enum label, bool extendedValue) getLoopCountPerSec())); } KeyValueStruct kv(F("Load"), getCPUload(), 2); - KV_SETUNIT(F("%")); +#if FEATURE_TASKVALUE_UNIT_OF_MEASURE + KV_SETUNIT(UOM_percent); +#endif return kv; } break; @@ -170,19 +175,25 @@ KeyValueStruct getKeyValue(LabelType::Enum label, bool extendedValue) case LabelType::WIFI_TX_MAX_PWR: { KeyValueStruct kv(F("Max WiFi TX Power"), Settings.getWiFi_TX_power(), 2); - KV_SETUNIT(F("dBm")); +# if FEATURE_TASKVALUE_UNIT_OF_MEASURE + KV_SETUNIT(UOM_dBm); +# endif return kv; } case LabelType::WIFI_CUR_TX_PWR: { KeyValueStruct kv(F("Current WiFi TX Power"), ESPEasy::net::wifi::GetWiFiTXpower(), 2); - KV_SETUNIT(F("dBm")); +# if FEATURE_TASKVALUE_UNIT_OF_MEASURE + KV_SETUNIT(UOM_dBm); +# endif return kv; } case LabelType::WIFI_SENS_MARGIN: { KeyValueStruct kv(F("WiFi Sensitivity Margin"), Settings.WiFi_sensitivity_margin); - KV_SETUNIT(F("dB")); +# if FEATURE_TASKVALUE_UNIT_OF_MEASURE + KV_SETUNIT(UOM_dB); +# endif return kv; } case LabelType::WIFI_SEND_AT_MAX_TX_PWR: @@ -206,7 +217,7 @@ KeyValueStruct getKeyValue(LabelType::Enum label, bool extendedValue) if (extendedValue) { return KeyValueStruct(F("Free RAM"), strformat( - F("%d [byte] (%d - %s)"), + F("%d [B] (%d - %s)"), FreeMem(), lowestRAM, lowestRAMfunction.c_str())); @@ -214,7 +225,9 @@ KeyValueStruct getKeyValue(LabelType::Enum label, bool extendedValue) #endif // ifndef BUILD_NO_RAM_TRACKER KeyValueStruct kv(F("Free RAM"), FreeMem()); - KV_SETUNIT(F("byte")); +#if FEATURE_TASKVALUE_UNIT_OF_MEASURE + KV_SETUNIT(UOM_Byte); +#endif return kv; } case LabelType::FREE_STACK: @@ -224,14 +237,16 @@ KeyValueStruct getKeyValue(LabelType::Enum label, bool extendedValue) if (extendedValue) { return KeyValueStruct(F("Free Stack"), strformat( - F("%d [byte] (%d - %s)"), + F("%d [B] (%d - %s)"), getCurrentFreeStack(), lowestFreeStack, lowestFreeStackfunction.c_str())); } #endif // ifndef BUILD_NO_RAM_TRACKER KeyValueStruct kv(F("Free Stack"), getCurrentFreeStack()); - KV_SETUNIT(F("byte")); +#if FEATURE_TASKVALUE_UNIT_OF_MEASURE + KV_SETUNIT(UOM_Byte); +#endif return kv; } @@ -239,7 +254,9 @@ KeyValueStruct getKeyValue(LabelType::Enum label, bool extendedValue) case LabelType::FREE_HEAP_IRAM: { KeyValueStruct kv(F("Free 2nd Heap"), FreeMem2ndHeap()); - KV_SETUNIT(F("byte")); +# if FEATURE_TASKVALUE_UNIT_OF_MEASURE + KV_SETUNIT(UOM_Byte); +# endif return kv; } #endif // ifdef USE_SECOND_HEAP @@ -255,7 +272,9 @@ KeyValueStruct getKeyValue(LabelType::Enum label, bool extendedValue) ESP.getMaxFreeBlockSize() # endif // ifdef ESP32 ); - KV_SETUNIT(F("byte")); +# if FEATURE_TASKVALUE_UNIT_OF_MEASURE + KV_SETUNIT(UOM_Byte); +# endif return kv; } # endif // ifndef LIMIT_BUILD_SIZE @@ -265,7 +284,9 @@ KeyValueStruct getKeyValue(LabelType::Enum label, bool extendedValue) case LabelType::HEAP_FRAGMENTATION: { KeyValueStruct kv(F("Heap Fragmentation"), ESP.getHeapFragmentation()); - KV_SETUNIT(F("%")); +# if FEATURE_TASKVALUE_UNIT_OF_MEASURE + KV_SETUNIT(UOM_percent); +# endif return kv; } # endif // ifndef LIMIT_BUILD_SIZE @@ -275,13 +296,17 @@ KeyValueStruct getKeyValue(LabelType::Enum label, bool extendedValue) case LabelType::HEAP_SIZE: { KeyValueStruct kv(F("Heap Size"), ESP.getHeapSize()); - KV_SETUNIT(F("byte")); +# if FEATURE_TASKVALUE_UNIT_OF_MEASURE + KV_SETUNIT(UOM_Byte); +# endif return kv; } case LabelType::HEAP_MIN_FREE: { KeyValueStruct kv(F("Heap Min Free"), ESP.getMinFreeHeap()); - KV_SETUNIT(F("byte")); +# if FEATURE_TASKVALUE_UNIT_OF_MEASURE + KV_SETUNIT(UOM_Byte); +# endif return kv; } # ifdef BOARD_HAS_PSRAM @@ -289,28 +314,36 @@ KeyValueStruct getKeyValue(LabelType::Enum label, bool extendedValue) { if (!UsePSRAM()) { break; } KeyValueStruct kv(F("PSRAM Size"), ESP.getPsramSize()); - KV_SETUNIT(F("byte")); +# if FEATURE_TASKVALUE_UNIT_OF_MEASURE + KV_SETUNIT(UOM_Byte); +# endif return kv; } case LabelType::PSRAM_FREE: { if (!UsePSRAM()) { break; } KeyValueStruct kv(F("PSRAM Free"), ESP.getFreePsram()); - KV_SETUNIT(F("byte")); +# if FEATURE_TASKVALUE_UNIT_OF_MEASURE + KV_SETUNIT(UOM_Byte); +# endif return kv; } case LabelType::PSRAM_MIN_FREE: { if (!UsePSRAM()) { break; } KeyValueStruct kv(F("PSRAM Min Free"), ESP.getMinFreePsram()); - KV_SETUNIT(F("byte")); +# if FEATURE_TASKVALUE_UNIT_OF_MEASURE + KV_SETUNIT(UOM_Byte); +# endif return kv; } case LabelType::PSRAM_MAX_FREE_BLOCK: { if (!UsePSRAM()) { break; } KeyValueStruct kv(F("PSRAM Max Free Block"), ESP.getMaxAllocPsram()); - KV_SETUNIT(F("byte")); +# if FEATURE_TASKVALUE_UNIT_OF_MEASURE + KV_SETUNIT(UOM_Byte); +# endif return kv; } # endif // BOARD_HAS_PSRAM @@ -462,7 +495,9 @@ KeyValueStruct getKeyValue(LabelType::Enum label, bool extendedValue) WiFi.SSID().c_str())); } KeyValueStruct kv(F("RSSI"), WiFi.RSSI()); - KV_SETUNIT(F("dBm")); +#if FEATURE_TASKVALUE_UNIT_OF_MEASURE + KV_SETUNIT(UOM_dBm); +#endif return kv; } case LabelType::IP_CONFIG: @@ -748,7 +783,7 @@ KeyValueStruct getKeyValue(LabelType::Enum label, bool extendedValue) { return KeyValueStruct(F("I2C bus cleared count"), I2C_bus_cleared_count); } -#endif +#endif // if FEATURE_CLEAR_I2C_STUCK case LabelType::SYSLOG_LOG_LEVEL: { @@ -776,20 +811,26 @@ KeyValueStruct getKeyValue(LabelType::Enum label, bool extendedValue) case LabelType::ESP_CHIP_FREQ: { KeyValueStruct kv(F("ESP Chip Frequency"), ESP.getCpuFreqMHz()); - KV_SETUNIT(F("MHz")); +#if FEATURE_TASKVALUE_UNIT_OF_MEASURE + KV_SETUNIT(UOM_MHz); +#endif return kv; } #ifdef ESP32 case LabelType::ESP_CHIP_XTAL_FREQ: { KeyValueStruct kv(F("ESP Crystal Frequency"), getXtalFrequencyMHz()); - KV_SETUNIT(F("MHz")); +# if FEATURE_TASKVALUE_UNIT_OF_MEASURE + KV_SETUNIT(UOM_MHz); +# endif return kv; } case LabelType::ESP_CHIP_APB_FREQ: { KeyValueStruct kv(F("ESP APB Frequency"), rtc_clk_apb_freq_get() / 1000000); - KV_SETUNIT(F("MHz")); +# if FEATURE_TASKVALUE_UNIT_OF_MEASURE + KV_SETUNIT(UOM_MHz); +# endif return kv; } #endif // ifdef ESP32 @@ -838,39 +879,47 @@ KeyValueStruct getKeyValue(LabelType::Enum label, bool extendedValue) const uint32_t flashDevice = (flashChipId & 0xFF00) | ((flashChipId >> 16) & 0xFF); String model(formatToHex(flashDevice, 4)); - #ifdef ESP32 + # ifdef ESP32 if (extendedValue && getChipFeatures().embeddedFlash) { model += F(" (Embedded)"); } - #endif // ifdef ESP32 + # endif // ifdef ESP32 return KeyValueStruct(F("Flash Chip Model"), model); - #else + #else // ifndef LIMIT_BUILD_SIZE return KeyValueStruct(F("Flash Chip Model"), getFlashChipId()); - #endif + #endif // ifndef LIMIT_BUILD_SIZE } case LabelType::FLASH_CHIP_REAL_SIZE: { KeyValueStruct kv(F("Flash Chip Real Size"), getFlashRealSizeInBytes() >> 10); - KV_SETUNIT(F("kB")); +#if FEATURE_TASKVALUE_UNIT_OF_MEASURE + KV_SETUNIT(UOM_kB); +#endif return kv; } case LabelType::FLASH_CHIP_SPEED: { KeyValueStruct kv(F("Flash Chip Speed"), getFlashChipSpeed() / 1000000); - KV_SETUNIT(F("MHz")); +#if FEATURE_TASKVALUE_UNIT_OF_MEASURE + KV_SETUNIT(UOM_MHz); +#endif return kv; } case LabelType::FLASH_IDE_SIZE: { KeyValueStruct kv(F("Flash IDE Size"), ESP.getFlashChipSize() >> 10); - KV_SETUNIT(F("kB")); +#if FEATURE_TASKVALUE_UNIT_OF_MEASURE + KV_SETUNIT(UOM_kB); +#endif return kv; } case LabelType::FLASH_IDE_SPEED: { KeyValueStruct kv(F("Flash IDE Speed"), getFlashChipSpeed() / 1000000); - KV_SETUNIT(F("MHz")); +#if FEATURE_TASKVALUE_UNIT_OF_MEASURE + KV_SETUNIT(UOM_MHz); +#endif return kv; } case LabelType::FLASH_IDE_MODE: @@ -912,7 +961,9 @@ KeyValueStruct getKeyValue(LabelType::Enum label, bool extendedValue) KV_SETID(F("sketch_size")); if (!extendedValue) { - KV_SETUNIT(F("kB")); +#if FEATURE_TASKVALUE_UNIT_OF_MEASURE + KV_SETUNIT(UOM_kB); +#endif } return kv; } @@ -920,7 +971,9 @@ KeyValueStruct getKeyValue(LabelType::Enum label, bool extendedValue) { KeyValueStruct kv(F("Sketch Free"), getFreeSketchSpace() >> 10); KV_SETID(F("sketch_free")); - KV_SETUNIT(F("kB")); +#if FEATURE_TASKVALUE_UNIT_OF_MEASURE + KV_SETUNIT(UOM_kB); +#endif return kv; } case LabelType::FS_SIZE: @@ -947,7 +1000,9 @@ KeyValueStruct getKeyValue(LabelType::Enum label, bool extendedValue) KV_SETID(F("fs_size")); if (!extendedValue) { - KV_SETUNIT(F("kB")); +#if FEATURE_TASKVALUE_UNIT_OF_MEASURE + KV_SETUNIT(UOM_kB); +#endif } return kv; } @@ -961,7 +1016,9 @@ KeyValueStruct getKeyValue(LabelType::Enum label, bool extendedValue) #endif // ifdef USE_LITTLEFS SpiffsFreeSpace() >> 10); KV_SETID(F("fs_free")); - KV_SETUNIT(F("kB")); +#if FEATURE_TASKVALUE_UNIT_OF_MEASURE + KV_SETUNIT(UOM_kB); +#endif return kv; } case LabelType::MAX_OTA_SKETCH_SIZE: @@ -999,7 +1056,9 @@ KeyValueStruct getKeyValue(LabelType::Enum label, bool extendedValue) case LabelType::INTERNAL_TEMPERATURE: { KeyValueStruct kv(F("Internal Temperature"), getInternalTemperature(), 1); - KV_SETUNIT(F("°C")); +# if FEATURE_TASKVALUE_UNIT_OF_MEASURE + KV_SETUNIT(UOM_degC); +# endif return kv; } #endif // if FEATURE_INTERNAL_TEMPERATURE @@ -1019,7 +1078,9 @@ KeyValueStruct getKeyValue(LabelType::Enum label, bool extendedValue) { KeyValueStruct kv(F("Eth Speed"), getEthSpeed()); KV_SETID(F("ethspeed")); - KV_SETUNIT(F("Mbps")); +# if FEATURE_TASKVALUE_UNIT_OF_MEASURE + KV_SETUNIT(UOM_Mbps); +# endif return kv; } case LabelType::ETH_STATE: @@ -1248,5 +1309,5 @@ String getFormUnit(LabelType::Enum label) { auto kv = getKeyValue(label); - return kv._unit.toString(); + return kv.getUnit(); } diff --git a/src/src/WebServer/KeyValueWriter_WebForm.cpp b/src/src/WebServer/KeyValueWriter_WebForm.cpp index 3cfac3ccc..23f5aab17 100644 --- a/src/src/WebServer/KeyValueWriter_WebForm.cpp +++ b/src/src/WebServer/KeyValueWriter_WebForm.cpp @@ -113,7 +113,7 @@ void KeyValueWriter_WebForm::write(const KeyValueStruct& kv) // May need to include the unit before ending // or else it will be shown on the next line if (!plain_text && (nrValues == 1) && !summary_value_only) { - addUnit(kv._unit.toString()); + addUnit(kv.getUnit()); } if (format_pre) { getPrint().print(F("")); } diff --git a/src/src/WebServer/Markup.cpp b/src/src/WebServer/Markup.cpp index 4c38c8c7e..e1c865e00 100644 --- a/src/src/WebServer/Markup.cpp +++ b/src/src/WebServer/Markup.cpp @@ -380,7 +380,7 @@ const char unit_of_measure_list[] PROGMEM = // *** DO NOT CHANGE ORDER, SAVED IN "W/m²|" // 64 "mm/h|" // 65 "mm/s|in/s|m/s|in/h|km/h|mph|" // 66..71 - "db|dBm|" // 72..73 + "dB|dBm|" // 72..73 "bit|kbit|Mbit|Gbit|B|kB|MB|GB|TB|PB|EB|ZB|YB|KiB|MiB|GiB|TiB|PiB|EiB|ZiB|YiB|" // 74..94 "bit/s|kbit/s|Mbit/s|Gbit/s|B/s|kB/s|MB/s|GB/s|KiB/s|MiB/s|GiB/s|" // 95..105 "ft/s|kn|" // 106..107 diff --git a/src/src/WebServer/Markup.h b/src/src/WebServer/Markup.h index 906077fc0..4aacce0e3 100644 --- a/src/src/WebServer/Markup.h +++ b/src/src/WebServer/Markup.h @@ -113,6 +113,19 @@ void addUnit(const String& unit); void addUnit(char unit); #if FEATURE_TASKVALUE_UNIT_OF_MEASURE + +#define UOM_dB 72 +#define UOM_dBm 73 +#define UOM_milliVolt 119 +#define UOM_Mbps 97 // Mbit/s +#define UOM_usec 39 +#define UOM_GHz 53 +#define UOM_MHz 132 +#define UOM_ppm 33 +#define UOM_degC 1 +#define UOM_kB 79 +#define UOM_Byte 78 +#define UOM_percent 4 String toUnitOfMeasureName(const uint32_t unitOfMeasureIndex, const String & defUoM = EMPTY_STRING); int getUnitOfMeasureIndex(const String& uomName); From 6181ca0c3b02a1345ac9cd5521d4b73b86458fba Mon Sep 17 00:00:00 2001 From: TD-er Date: Tue, 21 Oct 2025 15:34:51 +0200 Subject: [PATCH 401/564] [WebForm] Show bool types from key/value struct as checkmark --- src/src/WebServer/KeyValueWriter_WebForm.cpp | 19 ++++++++++++++++--- 1 file changed, 16 insertions(+), 3 deletions(-) diff --git a/src/src/WebServer/KeyValueWriter_WebForm.cpp b/src/src/WebServer/KeyValueWriter_WebForm.cpp index 23f5aab17..42438434c 100644 --- a/src/src/WebServer/KeyValueWriter_WebForm.cpp +++ b/src/src/WebServer/KeyValueWriter_WebForm.cpp @@ -102,9 +102,21 @@ void KeyValueWriter_WebForm::write(const KeyValueStruct& kv) String str(kv._values[i].toString()); - if (!plain_text && (str.indexOf('\n') != -1)) - { - str.replace(F("\n"), F("
    ")); + if (!plain_text) { + + const auto vtype = kv._values[i].getValueType(); + + if (vtype == ValueStruct::ValueType::Bool) { + str = concat(F("❌") + : F("on'>✔")); + str += F(""); + } else { + if (str.indexOf('\n') != -1) + { + str.replace(F("\n"), F("
    ")); + } + } } getPrint().print(str); } @@ -156,6 +168,7 @@ Up_KeyValueWriter KeyValueWriter_WebForm::createChildArray(const String& header) if (child) { child->setIsArray(); } + // return std::move(child); return child; } From a0658f9a01efbbec29aaeb2abd156e8cb8ba6951 Mon Sep 17 00:00:00 2001 From: TD-er Date: Tue, 21 Oct 2025 15:35:38 +0200 Subject: [PATCH 402/564] [ValueStruct] Fix edge case crash copying values. --- src/src/DataStructs/ValueStruct.cpp | 33 +++++++++++++++++++++-------- 1 file changed, 24 insertions(+), 9 deletions(-) diff --git a/src/src/DataStructs/ValueStruct.cpp b/src/src/DataStructs/ValueStruct.cpp index db00c298f..d5091afc9 100644 --- a/src/src/DataStructs/ValueStruct.cpp +++ b/src/src/DataStructs/ValueStruct.cpp @@ -123,7 +123,7 @@ ValueStruct::ValueStruct(const char*val) : // Make sure it is zero-terminated when nullptr is given VALUE_STRUCT_SSO_FIRST_CHAR = 0; - if (val) { + if (_size > 0) { memcpy(&VALUE_STRUCT_SSO_FIRST_CHAR, (uint8_t *)val, _size + 1); } } else { @@ -143,12 +143,19 @@ ValueStruct::ValueStruct(const String& val) : { if (_size <= VALUE_STRUCT_SSO_MAX_SIZE) { _isSSO = true; - memcpy(&VALUE_STRUCT_SSO_FIRST_CHAR, (uint8_t *)val.c_str(), _size + 1); + + if (_size == 0) { + // Make sure it is zero-terminated + VALUE_STRUCT_SSO_FIRST_CHAR = 0; + } + else { + memcpy(&VALUE_STRUCT_SSO_FIRST_CHAR, (uint8_t *)val.c_str(), val.length() + 1); + } } else { str_val = special_calloc(1, _size + 1); if (str_val) { - memcpy_P(str_val, val.begin(), _size); + memcpy_P(str_val, (uint8_t *)val.c_str(), val.length() + 1); } } } @@ -159,20 +166,27 @@ ValueStruct::ValueStruct(String&& val) : _size(val.length()), str_val(nullptr) { - // We can't move the allocated memory from 'message'. - // Just use move so we make sure the memory is de-allocated after this call. - const String str = std::move(val); - if (_size <= VALUE_STRUCT_SSO_MAX_SIZE) { _isSSO = true; - memcpy(&VALUE_STRUCT_SSO_FIRST_CHAR, (uint8_t *)str.c_str(), _size + 1); + + if (_size == 0) { + // Make sure it is zero-terminated + VALUE_STRUCT_SSO_FIRST_CHAR = 0; + } + else { + memcpy(&VALUE_STRUCT_SSO_FIRST_CHAR, (uint8_t *)val.c_str(), val.length() + 1); + } } else { str_val = special_calloc(1, _size + 1); if (str_val) { - memcpy_P(str_val, str.begin(), _size); + memcpy_P(str_val, (uint8_t *)val.c_str(), val.length() + 1); } } + + // We can't move the allocated memory from 'message'. + // Just use move so we make sure the memory is de-allocated after this call. + const String str = std::move(val); } ValueStruct::ValueStruct(const __FlashStringHelper *val) : @@ -185,6 +199,7 @@ ValueStruct::ValueStruct(const __FlashStringHelper *val) : String ValueStruct::toString() const { ValueType valueType; + return toString(valueType); } From 069305a6f01b1d2cfa2f0f805d159fd4839db542 Mon Sep 17 00:00:00 2001 From: TD-er Date: Tue, 21 Oct 2025 19:58:05 +0200 Subject: [PATCH 403/564] [Build] Wrap calls to setUnit in #if FEATURE_TASKVALUE_UNIT_OF_MEASURE --- src/src/Helpers/StringProvider.cpp | 2 ++ src/src/Helpers/StringProvider.h | 3 ++- src/src/WebServer/KeyValueWriter_WebForm.cpp | 2 ++ src/src/WebServer/Markup.cpp | 4 ++++ src/src/WebServer/Markup_Forms.cpp | 2 ++ src/src/WebServer/SysInfoPage.cpp | 5 ++++- 6 files changed, 16 insertions(+), 2 deletions(-) diff --git a/src/src/Helpers/StringProvider.cpp b/src/src/Helpers/StringProvider.cpp index 4c1282085..491efd204 100644 --- a/src/src/Helpers/StringProvider.cpp +++ b/src/src/Helpers/StringProvider.cpp @@ -1305,9 +1305,11 @@ String getFormNote(LabelType::Enum label) return flash_str; } +#if FEATURE_TASKVALUE_UNIT_OF_MEASURE String getFormUnit(LabelType::Enum label) { auto kv = getKeyValue(label); return kv.getUnit(); } +#endif diff --git a/src/src/Helpers/StringProvider.h b/src/src/Helpers/StringProvider.h index 8547fb832..325d5a885 100644 --- a/src/src/Helpers/StringProvider.h +++ b/src/src/Helpers/StringProvider.h @@ -268,8 +268,9 @@ String getValue(LabelType::Enum label); String getExtendedValue(LabelType::Enum label); String getFormNote(LabelType::Enum label); +#if FEATURE_TASKVALUE_UNIT_OF_MEASURE String getFormUnit(LabelType::Enum label); - +#endif KeyValueStruct getKeyValue(LabelType::Enum label, bool extendedValue = false); diff --git a/src/src/WebServer/KeyValueWriter_WebForm.cpp b/src/src/WebServer/KeyValueWriter_WebForm.cpp index 42438434c..34a3dd55f 100644 --- a/src/src/WebServer/KeyValueWriter_WebForm.cpp +++ b/src/src/WebServer/KeyValueWriter_WebForm.cpp @@ -122,11 +122,13 @@ void KeyValueWriter_WebForm::write(const KeyValueStruct& kv) } } +#if FEATURE_TASKVALUE_UNIT_OF_MEASURE // May need to include the unit before ending // or else it will be shown on the next line if (!plain_text && (nrValues == 1) && !summary_value_only) { addUnit(kv.getUnit()); } +#endif if (format_pre) { getPrint().print(F("")); } diff --git a/src/src/WebServer/Markup.cpp b/src/src/WebServer/Markup.cpp index e1c865e00..154538eff 100644 --- a/src/src/WebServer/Markup.cpp +++ b/src/src/WebServer/Markup.cpp @@ -585,7 +585,9 @@ void addRowLabel(LabelType::Enum label) { void addRowLabelValue(LabelType::Enum label) { addRowLabel(getLabel(label)); addHtml(getValue(label)); +#if FEATURE_TASKVALUE_UNIT_OF_MEASURE addUnit(getFormUnit(label)); +#endif } void addRowLabelValues(const LabelType::Enum labels[]) { @@ -597,7 +599,9 @@ void addRowLabelValues(const LabelType::Enum labels[]) { void addRowLabelValue_copy(LabelType::Enum label) { addRowLabel_copy(getLabel(label)); addHtml(getValue(label)); +#if FEATURE_TASKVALUE_UNIT_OF_MEASURE addUnit(getFormUnit(label)); +#endif } // ******************************************************************************** diff --git a/src/src/WebServer/Markup_Forms.cpp b/src/src/WebServer/Markup_Forms.cpp index ff7f4bc8c..a3c6a9f86 100644 --- a/src/src/WebServer/Markup_Forms.cpp +++ b/src/src/WebServer/Markup_Forms.cpp @@ -47,7 +47,9 @@ void addFormNote(const String& text, const String& id) void addFormNote(const LabelType::Enum& label) { +#if FEATURE_TASKVALUE_UNIT_OF_MEASURE addUnit(getFormUnit(label)); +#endif addFormNote(getFormNote(label)); } diff --git a/src/src/WebServer/SysInfoPage.cpp b/src/src/WebServer/SysInfoPage.cpp index 4c408a2e3..350a96010 100644 --- a/src/src/WebServer/SysInfoPage.cpp +++ b/src/src/WebServer/SysInfoPage.cpp @@ -660,11 +660,14 @@ void handle_sysinfo_Storage() { # ifndef LIMIT_BUILD_SIZE addRowLabel(F("Page size")); addHtmlInt(SpiffsPagesize()); +#if FEATURE_TASKVALUE_UNIT_OF_MEASURE addUnit(getFormUnit(LabelType::FREE_MEM)); // FIXME TD-er: Add labeltype - +#endif addRowLabel(F("Block size")); addHtmlInt(SpiffsBlocksize()); +#if FEATURE_TASKVALUE_UNIT_OF_MEASURE addUnit(getFormUnit(LabelType::FREE_MEM)); // FIXME TD-er: Add labeltype +#endif addRowLabel(F("Number of blocks")); addHtmlInt(SpiffsTotalBytes() / SpiffsBlocksize()); From 1125659383cbc557b2fc8cf9aa0dc810e837cefa Mon Sep 17 00:00:00 2001 From: TD-er Date: Thu, 23 Oct 2025 01:35:43 +0200 Subject: [PATCH 404/564] [ChartJS] Make charts appear on the full width and responsive --- .../NW001_data_struct_WiFi_STA.cpp | 6 +- src/_P028_BME280.ino | 2 + src/src/PluginStructs/P002_data_struct.cpp | 13 +- src/src/PluginStructs/P082_data_struct.cpp | 3 +- src/src/PluginStructs/P169_data_struct.cpp | 11 +- src/src/WebServer/Chart_JS.cpp | 13 +- src/src/WebServer/DevicesPage.cpp | 236 ++++++++++-------- src/src/WebServer/HTML_wrappers.cpp | 2 +- src/src/WebServer/NetworkPage.cpp | 5 +- src/src/WebServer/SysInfoPage.cpp | 1 - 10 files changed, 173 insertions(+), 119 deletions(-) diff --git a/src/ESPEasy/net/NWPluginStructs/NW001_data_struct_WiFi_STA.cpp b/src/ESPEasy/net/NWPluginStructs/NW001_data_struct_WiFi_STA.cpp index 1e9e09efc..e5a68e026 100644 --- a/src/ESPEasy/net/NWPluginStructs/NW001_data_struct_WiFi_STA.cpp +++ b/src/ESPEasy/net/NWPluginStructs/NW001_data_struct_WiFi_STA.cpp @@ -7,6 +7,7 @@ # include "../../../src/Helpers/ESPEasy_time_calc.h" # include "../../../src/Helpers/LongTermOnOffTimer.h" # include "../../../src/Helpers/StringConverter.h" +# include "../../../src/WebServer/HTML_wrappers.h" # include "../wifi/ESPEasyWifi.h" @@ -173,7 +174,7 @@ bool NW001_data_struct_WiFi_STA::record_stats() if (_plugin_stats_array != nullptr) { EventStruct tmpEvent; size_t valueCount{}; - const int rssi = + const int rssi = # ifdef ESP32 WiFi.STA.RSSI(); # else @@ -197,6 +198,8 @@ bool NW001_data_struct_WiFi_STA::webformLoad_show_stats(struct EventStruct *even if (_plugin_stats_array != nullptr) { # if FEATURE_SET_WIFI_TX_PWR # if FEATURE_CHART_JS + addHtml(F("")); + plot_ChartJS_scatter( NW001_RSSI_STATS_INDEX, NW001_TX_PWR_STATS_INDEX, @@ -205,6 +208,7 @@ bool NW001_data_struct_WiFi_STA::webformLoad_show_stats(struct EventStruct *even { F("rssi/tx_pwr"), F("rgb(255, 99, 132)") }, 500, 500); + addHtml(F("")); # endif // if FEATURE_CHART_JS # endif // if FEATURE_SET_WIFI_TX_PWR return _plugin_stats_array->webformLoad_show_stats(event); diff --git a/src/_P028_BME280.ino b/src/_P028_BME280.ino index e9de7c543..2aa89ab8a 100644 --- a/src/_P028_BME280.ino +++ b/src/_P028_BME280.ino @@ -210,6 +210,7 @@ boolean Plugin_028(uint8_t function, struct EventStruct *event, String& string) if ((P028_data_struct::BMx_DetectMode::BMP280 != static_cast(P028_DETECTION_MODE)) && P028_data->hasHumidity()) { + addHtml(F("")); P028_data->plot_ChartJS_scatter( 0, 1, @@ -218,6 +219,7 @@ boolean Plugin_028(uint8_t function, struct EventStruct *event, String& string) { F("temp/hum"), F("rgb(255, 99, 132)") }, 500, 500); + addHtml(F("")); } } diff --git a/src/src/PluginStructs/P002_data_struct.cpp b/src/src/PluginStructs/P002_data_struct.cpp index 8774d2b21..50c8d9148 100644 --- a/src/src/PluginStructs/P002_data_struct.cpp +++ b/src/src/PluginStructs/P002_data_struct.cpp @@ -378,7 +378,7 @@ void P002_data_struct::webformLoad_calibrationCurve(struct EventStruct *event) { if (!hasADC_factory_calibration()) { return; } - addRowLabel(F("Calibration Curve")); + addHtml(F("")); const int valueCount = 33; int xAxisValues[valueCount]; @@ -448,6 +448,7 @@ void P002_data_struct::webformLoad_calibrationCurve(struct EventStruct *event) } } } + addHtml(F("")); } # endif // if FEATURE_CHART_JS @@ -502,7 +503,7 @@ void P002_data_struct::getChartRange(struct EventStruct *event, int values[], in void P002_data_struct::webformLoad_2pt_calibrationCurve(struct EventStruct *event) { - addRowLabel(F("Two Point Calibration")); + addHtml(F("")); const int valueCount = 33; int xAxisValues[valueCount]; @@ -559,6 +560,7 @@ void P002_data_struct::webformLoad_2pt_calibrationCurve(struct EventStruct *even } } } + addHtml(F("")); } # endif // if FEATURE_CHART_JS @@ -669,8 +671,7 @@ void P002_data_struct::webformLoad_multipointCurve(struct EventStruct *event) co if (P002_MULTIPOINT_ENABLED) { const bool useBinning = P002_OVERSAMPLING == P002_USE_BINNING; - addRowLabel(useBinning ? F("Binning Curve") : F("Multipoint Curve")); - + addHtml(F("")); ChartJS_options_scales scales; { @@ -727,11 +728,12 @@ void P002_data_struct::webformLoad_multipointCurve(struct EventStruct *event) co } } } + addHtml(F("")); if (!useBinning) { // Try to compute the expected mapping from ADC to multipoint values - addRowLabel(F("Input to Output Curve")); + addHtml(F("")); const int valueCount = 33; int xAxisValues[valueCount]; getChartRange(event, xAxisValues, valueCount); @@ -821,6 +823,7 @@ void P002_data_struct::webformLoad_multipointCurve(struct EventStruct *event) co } } } + addHtml(F("")); } } } diff --git a/src/src/PluginStructs/P082_data_struct.cpp b/src/src/PluginStructs/P082_data_struct.cpp index c51b682bf..2d19fa93d 100644 --- a/src/src/PluginStructs/P082_data_struct.cpp +++ b/src/src/PluginStructs/P082_data_struct.cpp @@ -758,7 +758,7 @@ void P082_data_struct::webformLoad_show_position_scatterplot(struct EventStruct break; } } - +addHtml(F("")); plot_ChartJS_scatter( stats_long, stats_lat, @@ -767,6 +767,7 @@ void P082_data_struct::webformLoad_show_position_scatterplot(struct EventStruct { F("Coordinates"), F("rgb(255, 99, 132)") }, 500, 500); + addHtml(F("")); } # endif // if FEATURE_CHART_JS diff --git a/src/src/PluginStructs/P169_data_struct.cpp b/src/src/PluginStructs/P169_data_struct.cpp index 0ceed5860..a59108cf8 100644 --- a/src/src/PluginStructs/P169_data_struct.cpp +++ b/src/src/PluginStructs/P169_data_struct.cpp @@ -187,11 +187,14 @@ void P169_data_struct::html_show_sensor_info(struct EventStruct *event) addEnabled(false); } - addRowLabel(F("Error % per cap")); -# if FEATURE_CHART_JS - addCalibrationChart(event); -# else // if FEATURE_CHART_JS + +# if FEATURE_CHART_JS + addHtml(F("")); + addCalibrationChart(event); + addHtml(F("")); +# else // if FEATURE_CHART_JS + addRowLabel(F("Error % per cap")); for (uint8_t i = 0; i < 16; ++i) { const int32_t freq = _sensor->getAntCapFrequency(i); diff --git a/src/src/WebServer/Chart_JS.cpp b/src/src/WebServer/Chart_JS.cpp index b17ef1ac1..a74ea816a 100644 --- a/src/src/WebServer/Chart_JS.cpp +++ b/src/src/WebServer/Chart_JS.cpp @@ -70,11 +70,13 @@ Up_KeyValueWriter add_ChartJS_chart_header( bool onlyJSON) { if (!onlyJSON) { + addHtml(F("
    ")); addHtml(F("")); + addHtml(F("
    ")); const char *id_c_str = id.c_str(); addHtml(strformat( F("" }; +#endif #ifdef WEBSERVER_INCLUDE_JS // Manually minified js diff --git a/src/src/WebServer/DevicesPage.cpp b/src/src/WebServer/DevicesPage.cpp index 0b1597e63..afc66ade8 100644 --- a/src/src/WebServer/DevicesPage.cpp +++ b/src/src/WebServer/DevicesPage.cpp @@ -1048,7 +1048,7 @@ void format_SPI_pin_description(int8_t spi_gpios[3], taskIndex_t x, bool showCSp if (Settings.InitSPI > static_cast(SPI_Options_e::None)) { const __FlashStringHelper*labels[] = { F("CLK"), F("MISO"), F("MOSI") }; - for (int i = 0; i < 3; ++i) { + for (int i = 0; i < NR_ELEMENTS(labels); ++i) { if (i != 0) { html_BR(); } diff --git a/src/src/WebServer/HTML_wrappers.cpp b/src/src/WebServer/HTML_wrappers.cpp index 36cbb5e3a..70525ed24 100644 --- a/src/src/WebServer/HTML_wrappers.cpp +++ b/src/src/WebServer/HTML_wrappers.cpp @@ -324,14 +324,14 @@ void html_add_Easy_color_code_script() { #endif void html_add_autosubmit_form() { - addHtml(F("")); + "\n//-->"), false); } void html_add_script(const __FlashStringHelper * script, bool defer) { @@ -374,6 +374,7 @@ void addHtmlError(const __FlashStringHelper * error) { void addHtmlError(const String& error) { if (error.length() > 0) { + addLog(LOG_LEVEL_ERROR, error); addHtml(F("
    createChild(F("Interface")).get()); + ESPEasy::net::write_NetworkAdapterPort(x, writer->createChild(F("Port")).get()); ESPEasy::net::write_IP_config(x, writer->createChild(F("IP")).get()); # endif // ifdef ESP32 #endif // ifdef WEBSERVER_NETWORK diff --git a/src/src/WebServer/Markup_Buttons.cpp b/src/src/WebServer/Markup_Buttons.cpp index b7bae4bb9..29c5845f7 100644 --- a/src/src/WebServer/Markup_Buttons.cpp +++ b/src/src/WebServer/Markup_Buttons.cpp @@ -34,7 +34,7 @@ void addButton(const String& url, const String& label, const String& classes, bo addHtml(label); addHtml(F("")); } - +# ifdef WEBSERVER_NEW_RULES void addButtonWithSvg(const String& url, const String& label) { addButtonWithSvg(url, label, EMPTY_STRING, false); @@ -105,7 +105,7 @@ void addDeleteButton(const String& url, const String& label) true); #endif // ifdef BUILD_MINIMAL_OTA } - +#endif void addWideButton(const __FlashStringHelper * url, const __FlashStringHelper * label) { html_add_wide_button_prefix(EMPTY_STRING, true); addHtml(url); diff --git a/src/src/WebServer/Markup_Buttons.h b/src/src/WebServer/Markup_Buttons.h index cb4f95c4e..e8a3f5754 100644 --- a/src/src/WebServer/Markup_Buttons.h +++ b/src/src/WebServer/Markup_Buttons.h @@ -12,6 +12,7 @@ void addButton(const String& url, const String& label); void addButton(const String& url, const String& label, const String& classes, bool enabled = true); +# ifdef WEBSERVER_NEW_RULES void addButtonWithSvg(const String& url, const String& label); void addButtonWithSvg(const String& url, const String& label, const String& svgPath, bool needConfirm); @@ -19,7 +20,7 @@ void addButtonWithSvg(const String& url, const String& label, const String& svgP void addSaveButton(const String& url, const String& label); void addDeleteButton(const String& url, const String& label); - +#endif void addWideButton(const __FlashStringHelper * url, const __FlashStringHelper * label); void addWideButton(const String& url, const String& label); diff --git a/src/src/WebServer/NetworkPage.cpp b/src/src/WebServer/NetworkPage.cpp index f7ea22657..936f3b9f7 100644 --- a/src/src/WebServer/NetworkPage.cpp +++ b/src/src/WebServer/NetworkPage.cpp @@ -59,7 +59,7 @@ void handle_networks() // TODO TD-er: Implement saving submitted settings const nwpluginID_t nwpluginID = nwpluginID_t::toPluginID(networkDriver_webarg_value); - MakeNetworkSettings(NetworkSettings); + auto NetworkSettings = MakeNetworkSettings(); if (Settings.getNWPluginID_for_network(networkindex) != nwpluginID) { @@ -393,6 +393,12 @@ void handle_networks_NetworkSettingsPage(ESPEasy::net::networkIndex_t networkind KeyValueWriter_WebForm writer(F("Network Interface")); ESPEasy::net::write_NetworkAdapterFlags(networkindex, writer.createChild().get()); } +/* + { + KeyValueWriter_WebForm writer(F("Port")); + ESPEasy::net::write_NetworkAdapterPort(networkindex, writer.createChild().get()); + } +*/ { KeyValueWriter_WebForm writer(F("IP Config")); ESPEasy::net::write_IP_config(networkindex, writer.createChild().get()); diff --git a/src/src/WebServer/Rules.cpp b/src/src/WebServer/Rules.cpp index f1c7d821e..97b38a906 100644 --- a/src/src/WebServer/Rules.cpp +++ b/src/src/WebServer/Rules.cpp @@ -551,7 +551,7 @@ void Rule_showRuleTextArea(const String& fileName) { size = streamFromFS(fileName, true); addHtml(F("")); #if FEATURE_RULES_EASY_COLOR_CODE - addHtml(F("")); + html_add_script(F("initCM();"), false); #endif html_TR_TD(); From fef2fb4de0a2080bdcca751a2eb0e633138e2ce9 Mon Sep 17 00:00:00 2001 From: TD-er Date: Sat, 25 Oct 2025 20:57:44 +0200 Subject: [PATCH 411/564] [Units Of Measure] fix merge issues PR #5419 --- src/ESPEasy/net/Helpers/_NWPlugin_Helper_webform.h | 2 ++ .../net/NWPluginStructs/NW005_data_struct_PPP_modem.cpp | 2 +- src/ESPEasy/net/_NW003_ETH_RMII.cpp | 4 ++-- src/ESPEasy/net/_NW004_ETH_SPI.cpp | 4 ++-- src/src/DataStructs/KeyValueStruct.cpp | 1 + src/src/Helpers/StringProvider.cpp | 1 + src/src/PluginStructs/P026_data_struct.cpp | 1 + src/src/WebServer/DevicesPage.cpp | 4 ++-- 8 files changed, 12 insertions(+), 7 deletions(-) diff --git a/src/ESPEasy/net/Helpers/_NWPlugin_Helper_webform.h b/src/ESPEasy/net/Helpers/_NWPlugin_Helper_webform.h index 0e368a842..0adfe3684 100644 --- a/src/ESPEasy/net/Helpers/_NWPlugin_Helper_webform.h +++ b/src/ESPEasy/net/Helpers/_NWPlugin_Helper_webform.h @@ -2,6 +2,8 @@ #include "../../../ESPEasy_common.h" +#include "../../../src/Helpers/ESPEasy_UnitOfMeasure.h" + #include "../DataStructs/NetworkSettingsStruct.h" #include "../Globals/NWPlugins.h" diff --git a/src/ESPEasy/net/NWPluginStructs/NW005_data_struct_PPP_modem.cpp b/src/ESPEasy/net/NWPluginStructs/NW005_data_struct_PPP_modem.cpp index c7dcc6907..86b2fe6ff 100644 --- a/src/ESPEasy/net/NWPluginStructs/NW005_data_struct_PPP_modem.cpp +++ b/src/ESPEasy/net/NWPluginStructs/NW005_data_struct_PPP_modem.cpp @@ -16,7 +16,7 @@ # include "../../../src/WebServer/ESPEasy_key_value_store_webform.h" # include "../Globals/NetworkState.h" - +# include "../Helpers/_NWPlugin_Helper_webform.h" # include # include diff --git a/src/ESPEasy/net/_NW003_ETH_RMII.cpp b/src/ESPEasy/net/_NW003_ETH_RMII.cpp index 6b8ec4e1c..d42410b24 100644 --- a/src/ESPEasy/net/_NW003_ETH_RMII.cpp +++ b/src/ESPEasy/net/_NW003_ETH_RMII.cpp @@ -162,7 +162,7 @@ bool NWPlugin_003(NWPlugin::Function function, EventStruct *event, String& strin if (event->kvWriter->summaryValueOnly()) { KeyValueStruct kv(EMPTY_STRING); - for (int i = 0; i < NR_ELEMENTS(labels); ++i) { + for (size_t i = 0; i < NR_ELEMENTS(labels); ++i) { if (pins[i] >= 0) { kv.appendValue(concat(labels[i], F(": ")) + formatGpioLabel(pins[i], false)); } @@ -173,7 +173,7 @@ bool NWPlugin_003(NWPlugin::Function function, EventStruct *event, String& strin event->kvWriter->write(kv); } } else { - for (int i = 0; i < NR_ELEMENTS(labels); ++i) { + for (size_t i = 0; i < NR_ELEMENTS(labels); ++i) { if (pins[i] >= 0) { success = true; event->kvWriter->write({ diff --git a/src/ESPEasy/net/_NW004_ETH_SPI.cpp b/src/ESPEasy/net/_NW004_ETH_SPI.cpp index ac60d6aa0..8cd7ab80b 100644 --- a/src/ESPEasy/net/_NW004_ETH_SPI.cpp +++ b/src/ESPEasy/net/_NW004_ETH_SPI.cpp @@ -166,7 +166,7 @@ bool NWPlugin_004(NWPlugin::Function function, EventStruct *event, String& strin if (event->kvWriter->summaryValueOnly()) { KeyValueStruct kv(EMPTY_STRING); - for (int i = 0; i < NR_ELEMENTS(labels); ++i) { + for (size_t i = 0; i < NR_ELEMENTS(labels); ++i) { if (pins[i] >= 0) { kv.appendValue(concat(labels[i], F(": ")) + formatGpioLabel(pins[i], false)); } @@ -177,7 +177,7 @@ bool NWPlugin_004(NWPlugin::Function function, EventStruct *event, String& strin event->kvWriter->write(kv); } } else { - for (int i = 0; i < NR_ELEMENTS(labels); ++i) { + for (size_t i = 0; i < NR_ELEMENTS(labels); ++i) { if (pins[i] >= 0) { success = true; event->kvWriter->write({ diff --git a/src/src/DataStructs/KeyValueStruct.cpp b/src/src/DataStructs/KeyValueStruct.cpp index f7a1a48dc..99c75cc87 100644 --- a/src/src/DataStructs/KeyValueStruct.cpp +++ b/src/src/DataStructs/KeyValueStruct.cpp @@ -1,5 +1,6 @@ #include "../DataStructs/KeyValueStruct.h" +#include "../Helpers/ESPEasy_UnitOfMeasure.h" #include "../Helpers/StringConverter.h" #include "../Helpers/StringConverter_Numerical.h" diff --git a/src/src/Helpers/StringProvider.cpp b/src/src/Helpers/StringProvider.cpp index 3101b37cc..7a2b5dbc3 100644 --- a/src/src/Helpers/StringProvider.cpp +++ b/src/src/Helpers/StringProvider.cpp @@ -30,6 +30,7 @@ #include "../Helpers/Convert.h" #include "../Helpers/ESPEasy_Storage.h" +#include "../Helpers/ESPEasy_UnitOfMeasure.h" #include "../Helpers/Hardware_device_info.h" #include "../Helpers/Hardware_temperature_sensor.h" #include "../Helpers/Memory.h" diff --git a/src/src/PluginStructs/P026_data_struct.cpp b/src/src/PluginStructs/P026_data_struct.cpp index 261c4778d..6e491d350 100644 --- a/src/src/PluginStructs/P026_data_struct.cpp +++ b/src/src/PluginStructs/P026_data_struct.cpp @@ -6,6 +6,7 @@ # include "../../ESPEasy/net/ESPEasyNetwork.h" # include "../../ESPEasy/net/wifi/ESPEasyWifi.h" # include "../../ESPEasy/net/Globals/ESPEasyWiFiEvent.h" +# include "../Helpers/ESPEasy_UnitOfMeasure.h" # include "../Helpers/Memory.h" # include "../Helpers/Hardware_temperature_sensor.h" # ifdef ESP32 diff --git a/src/src/WebServer/DevicesPage.cpp b/src/src/WebServer/DevicesPage.cpp index 7256e38a4..edadaac7f 100644 --- a/src/src/WebServer/DevicesPage.cpp +++ b/src/src/WebServer/DevicesPage.cpp @@ -1052,7 +1052,7 @@ void format_SPI_pin_description(int8_t spi_gpios[3], taskIndex_t x, bool showCSp if (Settings.InitSPI > static_cast(SPI_Options_e::None)) { const __FlashStringHelper*labels[] = { F("CLK"), F("MISO"), F("MOSI") }; - for (int i = 0; i < NR_ELEMENTS(labels); ++i) { + for (size_t i = 0; i < NR_ELEMENTS(labels); ++i) { if (i != 0) { html_BR(); } @@ -1781,7 +1781,7 @@ void devicePage_show_task_values(taskIndex_t taskIndex, deviceIndex_t DeviceInde ++colCount; EventStruct uomEvent(taskIndex); String uomDummy; - bool limitedUom = PluginCall(DeviceIndex, PLUGIN_GET_UOM_GROUPS, &uomEvent, uomDummy); + bool limitedUom = PluginCall(PLUGIN_GET_UOM_GROUPS, &uomEvent, uomDummy); if (!limitedUom) { PluginCall(PLUGIN_GET_DEVICEVTYPE, &uomEvent, uomDummy); // Get Sensor_VType limitedUom = getDefaultUoMforSensorVType(&uomEvent); // Populate UoM groups for known Sensor_VTypes From 069d6f9734543b75865dee3a995c7f9504d384e5 Mon Sep 17 00:00:00 2001 From: Ton Huisman Date: Sat, 25 Oct 2025 23:12:39 +0200 Subject: [PATCH 412/564] [Build] Add Collection H and split Climate into Climate A and Climate B --- README.md | 7 +- docs/builds_overview.py | 14 +- docs/source/Plugin/_Plugin.rst | 2 +- docs/source/Plugin/_plugin_sets_overview.repl | 861 +++++++++++++----- .../Plugin/_plugin_substitutions_p16x.repl | 6 +- .../Plugin/_plugin_substitutions_p17x.repl | 10 +- platformio_esp32_envs.ini | 29 +- platformio_esp32_solo1.ini | 11 +- platformio_esp32c3_envs.ini | 15 +- platformio_esp32c6_envs.ini | 9 +- platformio_esp32s2_envs.ini | 17 +- platformio_esp32s3_envs.ini | 17 +- platformio_esp82xx_envs.ini | 31 +- src/src/CustomBuild/define_plugin_sets.h | 146 ++- 14 files changed, 885 insertions(+), 290 deletions(-) diff --git a/README.md b/README.md index 7e170d399..531e62296 100644 --- a/README.md +++ b/README.md @@ -40,7 +40,8 @@ ESPEasy_mega\_*[releasedate]*\_*[build-type]*\_*[opt-arduino-library]*\_*[hardwa *[build-type]* can be any of: Build type | Description | included plugins | -------------|-------------------------------------------|----------------------------------| -climate | All plugins related to climate measurement| Stable + Climate | +climate A | Plugins related to climate measurement A | Stable + Climate A | +climate B | Plugins related to climate measurement B | Stable + Climate B | custom | Custom predefined set/Defined in Custom.h | Specific | normal | Standard plugins | Stable | collection_A | Normal + plugin collection A | Stable + Collection base + set A | @@ -50,9 +51,11 @@ collection_D | Normal + plugin collection D | Stable + Collection b collection_E | Normal + plugin collection E | Stable + Collection base + set E | collection_F | Normal + plugin collection F | Stable + Collection base + set F | collection_G | Normal + plugin collection G | Stable + Collection base + set G | +collection_H | Normal + plugin collection H | Stable + Collection base + set H | max | All available plugins | All available | energy | All plugins related to energy measurement | Stable + Energy measurement | -display | All plugins related to displays | Stable + Displays | +display A | All plugins related to displays A | Stable + Displays A | +display B | All plugins related to displays B | Stable + Displays B | neopixel | All plugins related to neopixel | Stable + Neopixel | hard | hardware specific builds | Minimal | minimal | minimal plugins for specific use-cases | Switch and Controller | diff --git a/docs/builds_overview.py b/docs/builds_overview.py index 2935714bd..a0898d8ac 100644 --- a/docs/builds_overview.py +++ b/docs/builds_overview.py @@ -32,9 +32,10 @@ appendBuilds = {'MAX'} # What build set to add plugins also appendAlso = { - 'NORMAL': {'CLIMATE', 'COLLECTION A', 'COLLECTION B', 'COLLECTION C', 'COLLECTION D', 'COLLECTION E', 'COLLECTION F', 'COLLECTION G', 'DISPLAY A', 'DISPLAY B', 'ENERGY', 'IR', 'IRext', 'NEOPIXEL'}, - 'COLLECTION': {'COLLECTION A', 'COLLECTION B', 'COLLECTION C', 'COLLECTION D', 'COLLECTION E', 'COLLECTION F', 'COLLECTION G'}, - 'DISPLAY': {'DISPLAY A', 'DISPLAY B'} + 'NORMAL': {'CLIMATE', 'COLLECTION A', 'COLLECTION B', 'COLLECTION C', 'COLLECTION D', 'COLLECTION E', 'COLLECTION F', 'COLLECTION G', 'COLLECTION H', 'DISPLAY A', 'DISPLAY B', 'ENERGY', 'IR', 'IRext', 'NEOPIXEL'}, + 'COLLECTION': {'COLLECTION A', 'COLLECTION B', 'COLLECTION C', 'COLLECTION D', 'COLLECTION E', 'COLLECTION F', 'COLLECTION G', 'COLLECTION H'}, + 'DISPLAY': {'DISPLAY A', 'DISPLAY B'}, + 'CLIMATE': {'CLIMATE A', 'CLIMATE B'} } # Ignore these, not real build sets @@ -42,7 +43,8 @@ excludeBuilds = {'DEVELOPMENT', 'RETIRED'} # Plugins not included excludePlugins = { - 'CLIMATE': {'P007', 'P008', 'P009', 'P017', 'P022', 'P027', 'P030', 'P035', 'P040', 'P041', 'P042', 'P045'}, + 'CLIMATE A': {'P007', 'P008', 'P009', 'P017', 'P022', 'P027', 'P030', 'P035', 'P040', 'P041', 'P042', 'P045'}, + 'CLIMATE B': {'P007', 'P008', 'P009', 'P017', 'P022', 'P027', 'P030', 'P035', 'P040', 'P041', 'P042', 'P045'}, 'DISPLAY A': {'P038', 'P041', 'P042', 'P070'}, 'DISPLAY B': {'P038', 'P041', 'P042', 'P057', 'P070', 'P075', 'P104'}, # 'MAX': {''}, @@ -60,7 +62,9 @@ buildColors = { 'COLLECTION E': 'yellow', 'COLLECTION F': 'yellow', 'COLLECTION G': 'yellow', - 'CLIMATE': 'yellow', + 'COLLECTION H': 'yellow', + 'CLIMATE A': 'yellow', + 'CLIMATE B': 'yellow', 'DISPLAY A': 'yellow', 'DISPLAY B': 'yellow', 'ENERGY': 'yellow', diff --git a/docs/source/Plugin/_Plugin.rst b/docs/source/Plugin/_Plugin.rst index 4c2d2086e..5772636c1 100644 --- a/docs/source/Plugin/_Plugin.rst +++ b/docs/source/Plugin/_Plugin.rst @@ -325,7 +325,7 @@ There are different released versions of ESP Easy: :red:`DEVELOPMENT` is used for plugins that are still being developed and are not considered stable at all. Currently there are no DEVELOPMENT builds available. -:yellow:`ENERGY` :yellow:`DISPLAY` (split into sets A..B) :yellow:`IR` :yellow:`IRext` :yellow:`NEOPIXEL` :yellow:`CLIMATE` are specialized builds holding all Energy-, Display-, Infra Red- (extended), NeoPixel- and Climate- related plugins. +:yellow:`ENERGY` :yellow:`DISPLAY` (split into sets A..B) :yellow:`IR` :yellow:`IRext` :yellow:`NEOPIXEL` :yellow:`CLIMATE` (split into sets A..B) are specialized builds holding all Energy-, Display-, Infra Red- (extended), NeoPixel- and Climate- related plugins. :yellow:`MAX` is the build that has all plugins that are available in the ESPEasy repository. Available for ESP32 16MB and ESP32 8MB Flash units (available for ESP32 Classic, ESP32-S3 and ESP32-C6). diff --git a/docs/source/Plugin/_plugin_sets_overview.repl b/docs/source/Plugin/_plugin_sets_overview.repl index 84a7d39ab..6ba38b911 100644 --- a/docs/source/Plugin/_plugin_sets_overview.repl +++ b/docs/source/Plugin/_plugin_sets_overview.repl @@ -71,6 +71,8 @@ Build set: :green:`NORMAL` ":ref:`C009_page`","C009" ":ref:`C010_page`","C010" ":ref:`C013_page`","C013" + ":ref:`N001_page`","N001" + ":ref:`N002_page`","N002" Build set: :yellow:`COLLECTION A` --------------------------------------------- @@ -88,20 +90,26 @@ Build set: :yellow:`COLLECTION A` ":ref:`P004_page`","P004" ":ref:`P005_page`","P005" ":ref:`P006_page`","P006" + ":ref:`P007_page`","P007" + ":ref:`P008_page`","P008" + ":ref:`P009_page`","P009" ":ref:`P010_page`","P010" ":ref:`P011_page`","P011" ":ref:`P012_page`","P012" ":ref:`P013_page`","P013" ":ref:`P014_page`","P014" ":ref:`P015_page`","P015" + ":ref:`P017_page`","P017" ":ref:`P018_page`","P018" ":ref:`P019_page`","P019" ":ref:`P020_page`","P020" ":ref:`P021_page`","P021" + ":ref:`P022_page`","P022" ":ref:`P023_page`","P023" ":ref:`P024_page`","P024" ":ref:`P025_page`","P025" ":ref:`P026_page`","P026" + ":ref:`P027_page`","P027" ":ref:`P028_page`","P028" ":ref:`P029_page`","P029" ":ref:`P031_page`","P031" @@ -110,7 +118,6 @@ Build set: :yellow:`COLLECTION A` ":ref:`P034_page`","P034" ":ref:`P036_page`","P036" ":ref:`P037_page`","P037" - ":ref:`P038_page`","P038" ":ref:`P039_page`","P039" ":ref:`P040_page`","P040" ":ref:`P043_page`","P043" @@ -161,8 +168,10 @@ Build set: :yellow:`COLLECTION A` ":ref:`P134_page`","P134" ":ref:`P137_page`","P137" ":ref:`P138_page`","P138" + ":ref:`P139_page`","P139" ":ref:`P146_page`","P146" ":ref:`P152_page`","P152" + ":ref:`P180_page`","P180" ":ref:`C001_page`","C001" ":ref:`C002_page`","C002" ":ref:`C003_page`","C003" @@ -179,6 +188,8 @@ Build set: :yellow:`COLLECTION A` ":ref:`C014_page`","C014" ":ref:`C017_page`","C017" ":ref:`C018_page`","C018" + ":ref:`N001_page`","N001" + ":ref:`N002_page`","N002" Build set: :yellow:`COLLECTION B` --------------------------------------------- @@ -196,20 +207,26 @@ Build set: :yellow:`COLLECTION B` ":ref:`P004_page`","P004" ":ref:`P005_page`","P005" ":ref:`P006_page`","P006" + ":ref:`P007_page`","P007" + ":ref:`P008_page`","P008" + ":ref:`P009_page`","P009" ":ref:`P010_page`","P010" ":ref:`P011_page`","P011" ":ref:`P012_page`","P012" ":ref:`P013_page`","P013" ":ref:`P014_page`","P014" ":ref:`P015_page`","P015" + ":ref:`P017_page`","P017" ":ref:`P018_page`","P018" ":ref:`P019_page`","P019" ":ref:`P020_page`","P020" ":ref:`P021_page`","P021" + ":ref:`P022_page`","P022" ":ref:`P023_page`","P023" ":ref:`P024_page`","P024" ":ref:`P025_page`","P025" ":ref:`P026_page`","P026" + ":ref:`P027_page`","P027" ":ref:`P028_page`","P028" ":ref:`P029_page`","P029" ":ref:`P031_page`","P031" @@ -220,6 +237,7 @@ Build set: :yellow:`COLLECTION B` ":ref:`P037_page`","P037" ":ref:`P038_page`","P038" ":ref:`P039_page`","P039" + ":ref:`P040_page`","P040" ":ref:`P043_page`","P043" ":ref:`P044_page`","P044" ":ref:`P045_page`","P045" @@ -262,8 +280,10 @@ Build set: :yellow:`COLLECTION B` ":ref:`P115_page`","P115" ":ref:`P137_page`","P137" ":ref:`P138_page`","P138" + ":ref:`P139_page`","P139" ":ref:`P146_page`","P146" ":ref:`P152_page`","P152" + ":ref:`P180_page`","P180" ":ref:`C001_page`","C001" ":ref:`C002_page`","C002" ":ref:`C003_page`","C003" @@ -280,6 +300,8 @@ Build set: :yellow:`COLLECTION B` ":ref:`C014_page`","C014" ":ref:`C017_page`","C017" ":ref:`C018_page`","C018" + ":ref:`N001_page`","N001" + ":ref:`N002_page`","N002" Build set: :yellow:`COLLECTION C` --------------------------------------------- @@ -297,20 +319,26 @@ Build set: :yellow:`COLLECTION C` ":ref:`P004_page`","P004" ":ref:`P005_page`","P005" ":ref:`P006_page`","P006" + ":ref:`P007_page`","P007" + ":ref:`P008_page`","P008" + ":ref:`P009_page`","P009" ":ref:`P010_page`","P010" ":ref:`P011_page`","P011" ":ref:`P012_page`","P012" ":ref:`P013_page`","P013" ":ref:`P014_page`","P014" ":ref:`P015_page`","P015" + ":ref:`P017_page`","P017" ":ref:`P018_page`","P018" ":ref:`P019_page`","P019" ":ref:`P020_page`","P020" ":ref:`P021_page`","P021" + ":ref:`P022_page`","P022" ":ref:`P023_page`","P023" ":ref:`P024_page`","P024" ":ref:`P025_page`","P025" ":ref:`P026_page`","P026" + ":ref:`P027_page`","P027" ":ref:`P028_page`","P028" ":ref:`P029_page`","P029" ":ref:`P031_page`","P031" @@ -319,8 +347,8 @@ Build set: :yellow:`COLLECTION C` ":ref:`P034_page`","P034" ":ref:`P036_page`","P036" ":ref:`P037_page`","P037" - ":ref:`P038_page`","P038" ":ref:`P039_page`","P039" + ":ref:`P040_page`","P040" ":ref:`P043_page`","P043" ":ref:`P044_page`","P044" ":ref:`P045_page`","P045" @@ -359,9 +387,11 @@ Build set: :yellow:`COLLECTION C` ":ref:`P111_page`","P111" ":ref:`P137_page`","P137" ":ref:`P138_page`","P138" + ":ref:`P139_page`","P139" ":ref:`P143_page`","P143" ":ref:`P146_page`","P146" ":ref:`P152_page`","P152" + ":ref:`P180_page`","P180" ":ref:`C001_page`","C001" ":ref:`C002_page`","C002" ":ref:`C003_page`","C003" @@ -378,6 +408,8 @@ Build set: :yellow:`COLLECTION C` ":ref:`C014_page`","C014" ":ref:`C017_page`","C017" ":ref:`C018_page`","C018" + ":ref:`N001_page`","N001" + ":ref:`N002_page`","N002" Build set: :yellow:`COLLECTION D` --------------------------------------------- @@ -395,20 +427,26 @@ Build set: :yellow:`COLLECTION D` ":ref:`P004_page`","P004" ":ref:`P005_page`","P005" ":ref:`P006_page`","P006" + ":ref:`P007_page`","P007" + ":ref:`P008_page`","P008" + ":ref:`P009_page`","P009" ":ref:`P010_page`","P010" ":ref:`P011_page`","P011" ":ref:`P012_page`","P012" ":ref:`P013_page`","P013" ":ref:`P014_page`","P014" ":ref:`P015_page`","P015" + ":ref:`P017_page`","P017" ":ref:`P018_page`","P018" ":ref:`P019_page`","P019" ":ref:`P020_page`","P020" ":ref:`P021_page`","P021" + ":ref:`P022_page`","P022" ":ref:`P023_page`","P023" ":ref:`P024_page`","P024" ":ref:`P025_page`","P025" ":ref:`P026_page`","P026" + ":ref:`P027_page`","P027" ":ref:`P028_page`","P028" ":ref:`P029_page`","P029" ":ref:`P031_page`","P031" @@ -417,7 +455,6 @@ Build set: :yellow:`COLLECTION D` ":ref:`P034_page`","P034" ":ref:`P036_page`","P036" ":ref:`P037_page`","P037" - ":ref:`P038_page`","P038" ":ref:`P039_page`","P039" ":ref:`P040_page`","P040" ":ref:`P043_page`","P043" @@ -459,8 +496,10 @@ Build set: :yellow:`COLLECTION D` ":ref:`P127_page`","P127" ":ref:`P137_page`","P137" ":ref:`P138_page`","P138" + ":ref:`P139_page`","P139" ":ref:`P146_page`","P146" ":ref:`P152_page`","P152" + ":ref:`P180_page`","P180" ":ref:`C001_page`","C001" ":ref:`C002_page`","C002" ":ref:`C003_page`","C003" @@ -477,6 +516,8 @@ Build set: :yellow:`COLLECTION D` ":ref:`C014_page`","C014" ":ref:`C017_page`","C017" ":ref:`C018_page`","C018" + ":ref:`N001_page`","N001" + ":ref:`N002_page`","N002" Build set: :yellow:`COLLECTION E` --------------------------------------------- @@ -494,20 +535,26 @@ Build set: :yellow:`COLLECTION E` ":ref:`P004_page`","P004" ":ref:`P005_page`","P005" ":ref:`P006_page`","P006" + ":ref:`P007_page`","P007" + ":ref:`P008_page`","P008" + ":ref:`P009_page`","P009" ":ref:`P010_page`","P010" ":ref:`P011_page`","P011" ":ref:`P012_page`","P012" ":ref:`P013_page`","P013" ":ref:`P014_page`","P014" ":ref:`P015_page`","P015" + ":ref:`P017_page`","P017" ":ref:`P018_page`","P018" ":ref:`P019_page`","P019" ":ref:`P020_page`","P020" ":ref:`P021_page`","P021" + ":ref:`P022_page`","P022" ":ref:`P023_page`","P023" ":ref:`P024_page`","P024" ":ref:`P025_page`","P025" ":ref:`P026_page`","P026" + ":ref:`P027_page`","P027" ":ref:`P028_page`","P028" ":ref:`P029_page`","P029" ":ref:`P031_page`","P031" @@ -560,9 +607,11 @@ Build set: :yellow:`COLLECTION E` ":ref:`P135_page`","P135" ":ref:`P137_page`","P137" ":ref:`P138_page`","P138" + ":ref:`P139_page`","P139" ":ref:`P144_page`","P144" ":ref:`P146_page`","P146" ":ref:`P152_page`","P152" + ":ref:`P180_page`","P180" ":ref:`C001_page`","C001" ":ref:`C002_page`","C002" ":ref:`C003_page`","C003" @@ -579,6 +628,8 @@ Build set: :yellow:`COLLECTION E` ":ref:`C014_page`","C014" ":ref:`C017_page`","C017" ":ref:`C018_page`","C018" + ":ref:`N001_page`","N001" + ":ref:`N002_page`","N002" Build set: :yellow:`COLLECTION F` --------------------------------------------- @@ -596,20 +647,26 @@ Build set: :yellow:`COLLECTION F` ":ref:`P004_page`","P004" ":ref:`P005_page`","P005" ":ref:`P006_page`","P006" + ":ref:`P007_page`","P007" + ":ref:`P008_page`","P008" + ":ref:`P009_page`","P009" ":ref:`P010_page`","P010" ":ref:`P011_page`","P011" ":ref:`P012_page`","P012" ":ref:`P013_page`","P013" ":ref:`P014_page`","P014" ":ref:`P015_page`","P015" + ":ref:`P017_page`","P017" ":ref:`P018_page`","P018" ":ref:`P019_page`","P019" ":ref:`P020_page`","P020" ":ref:`P021_page`","P021" + ":ref:`P022_page`","P022" ":ref:`P023_page`","P023" ":ref:`P024_page`","P024" ":ref:`P025_page`","P025" ":ref:`P026_page`","P026" + ":ref:`P027_page`","P027" ":ref:`P028_page`","P028" ":ref:`P029_page`","P029" ":ref:`P031_page`","P031" @@ -618,8 +675,8 @@ Build set: :yellow:`COLLECTION F` ":ref:`P034_page`","P034" ":ref:`P036_page`","P036" ":ref:`P037_page`","P037" - ":ref:`P038_page`","P038" ":ref:`P039_page`","P039" + ":ref:`P040_page`","P040" ":ref:`P043_page`","P043" ":ref:`P044_page`","P044" ":ref:`P045_page`","P045" @@ -656,6 +713,7 @@ Build set: :yellow:`COLLECTION F` ":ref:`P122_page`","P122" ":ref:`P137_page`","P137" ":ref:`P138_page`","P138" + ":ref:`P139_page`","P139" ":ref:`P145_page`","P145" ":ref:`P146_page`","P146" ":ref:`P147_page`","P147" @@ -663,6 +721,7 @@ Build set: :yellow:`COLLECTION F` ":ref:`P151_page`","P151" ":ref:`P152_page`","P152" ":ref:`P153_page`","P153" + ":ref:`P180_page`","P180" ":ref:`C001_page`","C001" ":ref:`C002_page`","C002" ":ref:`C003_page`","C003" @@ -679,6 +738,8 @@ Build set: :yellow:`COLLECTION F` ":ref:`C014_page`","C014" ":ref:`C017_page`","C017" ":ref:`C018_page`","C018" + ":ref:`N001_page`","N001" + ":ref:`N002_page`","N002" Build set: :yellow:`COLLECTION G` --------------------------------------------- @@ -696,20 +757,26 @@ Build set: :yellow:`COLLECTION G` ":ref:`P004_page`","P004" ":ref:`P005_page`","P005" ":ref:`P006_page`","P006" + ":ref:`P007_page`","P007" + ":ref:`P008_page`","P008" + ":ref:`P009_page`","P009" ":ref:`P010_page`","P010" ":ref:`P011_page`","P011" ":ref:`P012_page`","P012" ":ref:`P013_page`","P013" ":ref:`P014_page`","P014" ":ref:`P015_page`","P015" + ":ref:`P017_page`","P017" ":ref:`P018_page`","P018" ":ref:`P019_page`","P019" ":ref:`P020_page`","P020" ":ref:`P021_page`","P021" + ":ref:`P022_page`","P022" ":ref:`P023_page`","P023" ":ref:`P024_page`","P024" ":ref:`P025_page`","P025" ":ref:`P026_page`","P026" + ":ref:`P027_page`","P027" ":ref:`P028_page`","P028" ":ref:`P029_page`","P029" ":ref:`P031_page`","P031" @@ -718,8 +785,124 @@ Build set: :yellow:`COLLECTION G` ":ref:`P034_page`","P034" ":ref:`P036_page`","P036" ":ref:`P037_page`","P037" - ":ref:`P038_page`","P038" ":ref:`P039_page`","P039" + ":ref:`P040_page`","P040" + ":ref:`P043_page`","P043" + ":ref:`P044_page`","P044" + ":ref:`P045_page`","P045" + ":ref:`P046_page`","P046" + ":ref:`P047_page`","P047" + ":ref:`P048_page`","P048" + ":ref:`P049_page`","P049" + ":ref:`P050_page`","P050" + ":ref:`P051_page`","P051" + ":ref:`P052_page`","P052" + ":ref:`P053_page`","P053" + ":ref:`P054_page`","P054" + ":ref:`P055_page`","P055" + ":ref:`P056_page`","P056" + ":ref:`P057_page`","P057" + ":ref:`P058_page`","P058" + ":ref:`P059_page`","P059" + ":ref:`P060_page`","P060" + ":ref:`P061_page`","P061" + ":ref:`P062_page`","P062" + ":ref:`P063_page`","P063" + ":ref:`P064_page`","P064" + ":ref:`P065_page`","P065" + ":ref:`P066_page`","P066" + ":ref:`P073_page`","P073" + ":ref:`P075_page`","P075" + ":ref:`P079_page`","P079" + ":ref:`P081_page`","P081" + ":ref:`P082_page`","P082" + ":ref:`P089_page`","P089" + ":ref:`P095_page`","P095" + ":ref:`P105_page`","P105" + ":ref:`P137_page`","P137" + ":ref:`P138_page`","P138" + ":ref:`P139_page`","P139" + ":ref:`P142_page`","P142" + ":ref:`P146_page`","P146" + ":ref:`P152_page`","P152" + ":ref:`P154_page`","P154" + ":ref:`P159_page`","P159" + ":ref:`P162_page`","P162" + ":ref:`P163_page`","P163" + ":ref:`P164_page`","P164" + ":ref:`P166_page`","P166" + ":ref:`P168_page`","P168" + ":ref:`P170_page`","P170" + ":ref:`P172_page`","P172" + ":ref:`P173_page`","P173" + ":ref:`P177_page`","P177" + ":ref:`P178_page`","P178" + ":ref:`P180_page`","P180" + ":ref:`C001_page`","C001" + ":ref:`C002_page`","C002" + ":ref:`C003_page`","C003" + ":ref:`C004_page`","C004" + ":ref:`C005_page`","C005" + ":ref:`C006_page`","C006" + ":ref:`C007_page`","C007" + ":ref:`C008_page`","C008" + ":ref:`C009_page`","C009" + ":ref:`C010_page`","C010" + ":ref:`C011_page`","C011" + ":ref:`C012_page`","C012" + ":ref:`C013_page`","C013" + ":ref:`C014_page`","C014" + ":ref:`C017_page`","C017" + ":ref:`C018_page`","C018" + ":ref:`N001_page`","N001" + ":ref:`N002_page`","N002" + +Build set: :yellow:`COLLECTION H` +--------------------------------------------- + +.. collapse:: Details... + + .. csv-table:: + :header: "Plugin name", "Plugin number" + :widths: 10, 5 + + ":ref:`P000_page`","P000" + ":ref:`P001_page`","P001" + ":ref:`P002_page`","P002" + ":ref:`P003_page`","P003" + ":ref:`P004_page`","P004" + ":ref:`P005_page`","P005" + ":ref:`P006_page`","P006" + ":ref:`P007_page`","P007" + ":ref:`P008_page`","P008" + ":ref:`P009_page`","P009" + ":ref:`P010_page`","P010" + ":ref:`P011_page`","P011" + ":ref:`P012_page`","P012" + ":ref:`P013_page`","P013" + ":ref:`P014_page`","P014" + ":ref:`P015_page`","P015" + ":ref:`P017_page`","P017" + ":ref:`P018_page`","P018" + ":ref:`P019_page`","P019" + ":ref:`P020_page`","P020" + ":ref:`P021_page`","P021" + ":ref:`P022_page`","P022" + ":ref:`P023_page`","P023" + ":ref:`P024_page`","P024" + ":ref:`P025_page`","P025" + ":ref:`P026_page`","P026" + ":ref:`P027_page`","P027" + ":ref:`P028_page`","P028" + ":ref:`P029_page`","P029" + ":ref:`P031_page`","P031" + ":ref:`P032_page`","P032" + ":ref:`P033_page`","P033" + ":ref:`P034_page`","P034" + ":ref:`P036_page`","P036" + ":ref:`P037_page`","P037" + ":ref:`P039_page`","P039" + ":ref:`P040_page`","P040" ":ref:`P043_page`","P043" ":ref:`P044_page`","P044" ":ref:`P045_page`","P045" @@ -753,20 +936,10 @@ Build set: :yellow:`COLLECTION G` ":ref:`P095_page`","P095" ":ref:`P137_page`","P137" ":ref:`P138_page`","P138" - ":ref:`P142_page`","P142" + ":ref:`P139_page`","P139" ":ref:`P146_page`","P146" ":ref:`P152_page`","P152" - ":ref:`P154_page`","P154" - ":ref:`P159_page`","P159" - ":ref:`P162_page`","P162" - ":ref:`P163_page`","P163" - ":ref:`P164_page`","P164" - ":ref:`P166_page`","P166" - ":ref:`P168_page`","P168" - ":ref:`P170_page`","P170" - ":ref:`P172_page`","P172" - ":ref:`P173_page`","P173" - ":ref:`P178_page`","P178" + ":ref:`P180_page`","P180" ":ref:`C001_page`","C001" ":ref:`C002_page`","C002" ":ref:`C003_page`","C003" @@ -783,8 +956,10 @@ Build set: :yellow:`COLLECTION G` ":ref:`C014_page`","C014" ":ref:`C017_page`","C017" ":ref:`C018_page`","C018" + ":ref:`N001_page`","N001" + ":ref:`N002_page`","N002" -Build set: :yellow:`CLIMATE` +Build set: :yellow:`CLIMATE A` --------------------------------------------- .. collapse:: Details... @@ -801,14 +976,12 @@ Build set: :yellow:`CLIMATE` ":ref:`P005_page`","P005" ":ref:`P006_page`","P006" ":ref:`P010_page`","P010" - ":ref:`P011_page`","P011" ":ref:`P012_page`","P012" ":ref:`P013_page`","P013" ":ref:`P014_page`","P014" ":ref:`P015_page`","P015" ":ref:`P018_page`","P018" ":ref:`P019_page`","P019" - ":ref:`P020_page`","P020" ":ref:`P021_page`","P021" ":ref:`P023_page`","P023" ":ref:`P024_page`","P024" @@ -833,14 +1006,89 @@ Build set: :yellow:`CLIMATE` ":ref:`P053_page`","P053" ":ref:`P056_page`","P056" ":ref:`P059_page`","P059" - ":ref:`P063_page`","P063" ":ref:`P068_page`","P068" ":ref:`P069_page`","P069" ":ref:`P072_page`","P072" ":ref:`P073_page`","P073" - ":ref:`P079_page`","P079" ":ref:`P081_page`","P081" ":ref:`P083_page`","P083" + ":ref:`P089_page`","P089" + ":ref:`P090_page`","P090" + ":ref:`P103_page`","P103" + ":ref:`P105_page`","P105" + ":ref:`P106_page`","P106" + ":ref:`P117_page`","P117" + ":ref:`P118_page`","P118" + ":ref:`P127_page`","P127" + ":ref:`P133_page`","P133" + ":ref:`P135_page`","P135" + ":ref:`P142_page`","P142" + ":ref:`P144_page`","P144" + ":ref:`P147_page`","P147" + ":ref:`P150_page`","P150" + ":ref:`P151_page`","P151" + ":ref:`P153_page`","P153" + ":ref:`P154_page`","P154" + ":ref:`P164_page`","P164" + ":ref:`P180_page`","P180" + ":ref:`C011_page`","C011" + ":ref:`N001_page`","N001" + ":ref:`N002_page`","N002" + +Build set: :yellow:`CLIMATE B` +--------------------------------------------- + +.. collapse:: Details... + + .. csv-table:: + :header: "Plugin name", "Plugin number" + :widths: 10, 5 + + ":ref:`P000_page`","P000" + ":ref:`P001_page`","P001" + ":ref:`P002_page`","P002" + ":ref:`P003_page`","P003" + ":ref:`P004_page`","P004" + ":ref:`P005_page`","P005" + ":ref:`P006_page`","P006" + ":ref:`P010_page`","P010" + ":ref:`P012_page`","P012" + ":ref:`P013_page`","P013" + ":ref:`P014_page`","P014" + ":ref:`P015_page`","P015" + ":ref:`P018_page`","P018" + ":ref:`P019_page`","P019" + ":ref:`P021_page`","P021" + ":ref:`P023_page`","P023" + ":ref:`P024_page`","P024" + ":ref:`P025_page`","P025" + ":ref:`P026_page`","P026" + ":ref:`P028_page`","P028" + ":ref:`P029_page`","P029" + ":ref:`P031_page`","P031" + ":ref:`P032_page`","P032" + ":ref:`P033_page`","P033" + ":ref:`P034_page`","P034" + ":ref:`P036_page`","P036" + ":ref:`P037_page`","P037" + ":ref:`P038_page`","P038" + ":ref:`P039_page`","P039" + ":ref:`P043_page`","P043" + ":ref:`P044_page`","P044" + ":ref:`P047_page`","P047" + ":ref:`P049_page`","P049" + ":ref:`P051_page`","P051" + ":ref:`P052_page`","P052" + ":ref:`P053_page`","P053" + ":ref:`P056_page`","P056" + ":ref:`P059_page`","P059" + ":ref:`P068_page`","P068" + ":ref:`P069_page`","P069" + ":ref:`P072_page`","P072" + ":ref:`P073_page`","P073" + ":ref:`P081_page`","P081" + ":ref:`P083_page`","P083" + ":ref:`P089_page`","P089" ":ref:`P090_page`","P090" ":ref:`P103_page`","P103" ":ref:`P105_page`","P105" @@ -852,11 +1100,9 @@ Build set: :yellow:`CLIMATE` ":ref:`P135_page`","P135" ":ref:`P142_page`","P142" ":ref:`P144_page`","P144" - ":ref:`P146_page`","P146" ":ref:`P147_page`","P147" ":ref:`P150_page`","P150" ":ref:`P151_page`","P151" - ":ref:`P152_page`","P152" ":ref:`P153_page`","P153" ":ref:`P154_page`","P154" ":ref:`P164_page`","P164" @@ -866,7 +1112,80 @@ Build set: :yellow:`CLIMATE` ":ref:`P172_page`","P172" ":ref:`P173_page`","P173" ":ref:`P175_page`","P175" + ":ref:`P177_page`","P177" ":ref:`P178_page`","P178" + ":ref:`P180_page`","P180" + ":ref:`C011_page`","C011" + ":ref:`N001_page`","N001" + ":ref:`N002_page`","N002" + +Build set: :yellow:`DISPLAY A` +--------------------------------------------- + +.. collapse:: Details... + + .. csv-table:: + :header: "Plugin name", "Plugin number" + :widths: 10, 5 + + ":ref:`P000_page`","P000" + ":ref:`P001_page`","P001" + ":ref:`P002_page`","P002" + ":ref:`P003_page`","P003" + ":ref:`P004_page`","P004" + ":ref:`P005_page`","P005" + ":ref:`P006_page`","P006" + ":ref:`P007_page`","P007" + ":ref:`P008_page`","P008" + ":ref:`P009_page`","P009" + ":ref:`P010_page`","P010" + ":ref:`P011_page`","P011" + ":ref:`P012_page`","P012" + ":ref:`P013_page`","P013" + ":ref:`P014_page`","P014" + ":ref:`P015_page`","P015" + ":ref:`P017_page`","P017" + ":ref:`P018_page`","P018" + ":ref:`P019_page`","P019" + ":ref:`P020_page`","P020" + ":ref:`P021_page`","P021" + ":ref:`P022_page`","P022" + ":ref:`P023_page`","P023" + ":ref:`P024_page`","P024" + ":ref:`P025_page`","P025" + ":ref:`P026_page`","P026" + ":ref:`P027_page`","P027" + ":ref:`P028_page`","P028" + ":ref:`P029_page`","P029" + ":ref:`P031_page`","P031" + ":ref:`P032_page`","P032" + ":ref:`P033_page`","P033" + ":ref:`P034_page`","P034" + ":ref:`P036_page`","P036" + ":ref:`P037_page`","P037" + ":ref:`P039_page`","P039" + ":ref:`P040_page`","P040" + ":ref:`P043_page`","P043" + ":ref:`P044_page`","P044" + ":ref:`P049_page`","P049" + ":ref:`P052_page`","P052" + ":ref:`P053_page`","P053" + ":ref:`P056_page`","P056" + ":ref:`P057_page`","P057" + ":ref:`P059_page`","P059" + ":ref:`P063_page`","P063" + ":ref:`P073_page`","P073" + ":ref:`P075_page`","P075" + ":ref:`P079_page`","P079" + ":ref:`P104_page`","P104" + ":ref:`P109_page`","P109" + ":ref:`P137_page`","P137" + ":ref:`P138_page`","P138" + ":ref:`P139_page`","P139" + ":ref:`P143_page`","P143" + ":ref:`P146_page`","P146" + ":ref:`P152_page`","P152" + ":ref:`P180_page`","P180" ":ref:`C001_page`","C001" ":ref:`C002_page`","C002" ":ref:`C003_page`","C003" @@ -877,10 +1196,257 @@ Build set: :yellow:`CLIMATE` ":ref:`C008_page`","C008" ":ref:`C009_page`","C009" ":ref:`C010_page`","C010" - ":ref:`C011_page`","C011" ":ref:`C013_page`","C013" + ":ref:`N001_page`","N001" + ":ref:`N002_page`","N002" -Build set: :yellow:`DISPLAY` +Build set: :yellow:`DISPLAY B` +--------------------------------------------- + +.. collapse:: Details... + + .. csv-table:: + :header: "Plugin name", "Plugin number" + :widths: 10, 5 + + ":ref:`P000_page`","P000" + ":ref:`P001_page`","P001" + ":ref:`P002_page`","P002" + ":ref:`P003_page`","P003" + ":ref:`P004_page`","P004" + ":ref:`P005_page`","P005" + ":ref:`P006_page`","P006" + ":ref:`P007_page`","P007" + ":ref:`P008_page`","P008" + ":ref:`P009_page`","P009" + ":ref:`P010_page`","P010" + ":ref:`P011_page`","P011" + ":ref:`P012_page`","P012" + ":ref:`P013_page`","P013" + ":ref:`P014_page`","P014" + ":ref:`P015_page`","P015" + ":ref:`P017_page`","P017" + ":ref:`P018_page`","P018" + ":ref:`P019_page`","P019" + ":ref:`P020_page`","P020" + ":ref:`P021_page`","P021" + ":ref:`P022_page`","P022" + ":ref:`P023_page`","P023" + ":ref:`P024_page`","P024" + ":ref:`P025_page`","P025" + ":ref:`P026_page`","P026" + ":ref:`P027_page`","P027" + ":ref:`P028_page`","P028" + ":ref:`P029_page`","P029" + ":ref:`P031_page`","P031" + ":ref:`P032_page`","P032" + ":ref:`P033_page`","P033" + ":ref:`P034_page`","P034" + ":ref:`P036_page`","P036" + ":ref:`P037_page`","P037" + ":ref:`P039_page`","P039" + ":ref:`P040_page`","P040" + ":ref:`P043_page`","P043" + ":ref:`P044_page`","P044" + ":ref:`P049_page`","P049" + ":ref:`P052_page`","P052" + ":ref:`P053_page`","P053" + ":ref:`P056_page`","P056" + ":ref:`P059_page`","P059" + ":ref:`P063_page`","P063" + ":ref:`P073_page`","P073" + ":ref:`P079_page`","P079" + ":ref:`P095_page`","P095" + ":ref:`P099_page`","P099" + ":ref:`P109_page`","P109" + ":ref:`P116_page`","P116" + ":ref:`P123_page`","P123" + ":ref:`P137_page`","P137" + ":ref:`P138_page`","P138" + ":ref:`P139_page`","P139" + ":ref:`P141_page`","P141" + ":ref:`P143_page`","P143" + ":ref:`P146_page`","P146" + ":ref:`P148_page`","P148" + ":ref:`P152_page`","P152" + ":ref:`P180_page`","P180" + ":ref:`C001_page`","C001" + ":ref:`C002_page`","C002" + ":ref:`C003_page`","C003" + ":ref:`C004_page`","C004" + ":ref:`C005_page`","C005" + ":ref:`C006_page`","C006" + ":ref:`C007_page`","C007" + ":ref:`C008_page`","C008" + ":ref:`C009_page`","C009" + ":ref:`C010_page`","C010" + ":ref:`C013_page`","C013" + ":ref:`N001_page`","N001" + ":ref:`N002_page`","N002" + +Build set: :yellow:`ENERGY` +--------------------------------------------- + +.. collapse:: Details... + + .. csv-table:: + :header: "Plugin name", "Plugin number" + :widths: 10, 5 + + ":ref:`P000_page`","P000" + ":ref:`P001_page`","P001" + ":ref:`P002_page`","P002" + ":ref:`P003_page`","P003" + ":ref:`P004_page`","P004" + ":ref:`P005_page`","P005" + ":ref:`P006_page`","P006" + ":ref:`P007_page`","P007" + ":ref:`P008_page`","P008" + ":ref:`P009_page`","P009" + ":ref:`P010_page`","P010" + ":ref:`P011_page`","P011" + ":ref:`P012_page`","P012" + ":ref:`P013_page`","P013" + ":ref:`P014_page`","P014" + ":ref:`P015_page`","P015" + ":ref:`P017_page`","P017" + ":ref:`P018_page`","P018" + ":ref:`P019_page`","P019" + ":ref:`P020_page`","P020" + ":ref:`P021_page`","P021" + ":ref:`P022_page`","P022" + ":ref:`P023_page`","P023" + ":ref:`P024_page`","P024" + ":ref:`P025_page`","P025" + ":ref:`P026_page`","P026" + ":ref:`P027_page`","P027" + ":ref:`P028_page`","P028" + ":ref:`P029_page`","P029" + ":ref:`P031_page`","P031" + ":ref:`P032_page`","P032" + ":ref:`P033_page`","P033" + ":ref:`P034_page`","P034" + ":ref:`P036_page`","P036" + ":ref:`P037_page`","P037" + ":ref:`P039_page`","P039" + ":ref:`P040_page`","P040" + ":ref:`P043_page`","P043" + ":ref:`P044_page`","P044" + ":ref:`P049_page`","P049" + ":ref:`P052_page`","P052" + ":ref:`P053_page`","P053" + ":ref:`P056_page`","P056" + ":ref:`P059_page`","P059" + ":ref:`P063_page`","P063" + ":ref:`P073_page`","P073" + ":ref:`P076_page`","P076" + ":ref:`P077_page`","P077" + ":ref:`P078_page`","P078" + ":ref:`P079_page`","P079" + ":ref:`P085_page`","P085" + ":ref:`P089_page`","P089" + ":ref:`P093_page`","P093" + ":ref:`P102_page`","P102" + ":ref:`P108_page`","P108" + ":ref:`P115_page`","P115" + ":ref:`P132_page`","P132" + ":ref:`P137_page`","P137" + ":ref:`P138_page`","P138" + ":ref:`P139_page`","P139" + ":ref:`P146_page`","P146" + ":ref:`P148_page`","P148" + ":ref:`P152_page`","P152" + ":ref:`P176_page`","P176" + ":ref:`P180_page`","P180" + ":ref:`C001_page`","C001" + ":ref:`C002_page`","C002" + ":ref:`C003_page`","C003" + ":ref:`C004_page`","C004" + ":ref:`C005_page`","C005" + ":ref:`C006_page`","C006" + ":ref:`C007_page`","C007" + ":ref:`C008_page`","C008" + ":ref:`C009_page`","C009" + ":ref:`C010_page`","C010" + ":ref:`C013_page`","C013" + ":ref:`N001_page`","N001" + ":ref:`N002_page`","N002" + +Build set: :yellow:`IR` +--------------------------------------------- + +.. collapse:: Details... + + .. csv-table:: + :header: "Plugin name", "Plugin number" + :widths: 10, 5 + + ":ref:`P000_page`","P000" + ":ref:`P001_page`","P001" + ":ref:`P002_page`","P002" + ":ref:`P003_page`","P003" + ":ref:`P004_page`","P004" + ":ref:`P005_page`","P005" + ":ref:`P006_page`","P006" + ":ref:`P007_page`","P007" + ":ref:`P008_page`","P008" + ":ref:`P009_page`","P009" + ":ref:`P010_page`","P010" + ":ref:`P011_page`","P011" + ":ref:`P012_page`","P012" + ":ref:`P013_page`","P013" + ":ref:`P014_page`","P014" + ":ref:`P015_page`","P015" + ":ref:`P016_page`","P016" + ":ref:`P017_page`","P017" + ":ref:`P018_page`","P018" + ":ref:`P019_page`","P019" + ":ref:`P020_page`","P020" + ":ref:`P021_page`","P021" + ":ref:`P022_page`","P022" + ":ref:`P023_page`","P023" + ":ref:`P024_page`","P024" + ":ref:`P025_page`","P025" + ":ref:`P026_page`","P026" + ":ref:`P027_page`","P027" + ":ref:`P028_page`","P028" + ":ref:`P029_page`","P029" + ":ref:`P031_page`","P031" + ":ref:`P032_page`","P032" + ":ref:`P033_page`","P033" + ":ref:`P034_page`","P034" + ":ref:`P035_page`","P035" + ":ref:`P036_page`","P036" + ":ref:`P037_page`","P037" + ":ref:`P039_page`","P039" + ":ref:`P040_page`","P040" + ":ref:`P043_page`","P043" + ":ref:`P044_page`","P044" + ":ref:`P049_page`","P049" + ":ref:`P052_page`","P052" + ":ref:`P053_page`","P053" + ":ref:`P056_page`","P056" + ":ref:`P059_page`","P059" + ":ref:`P063_page`","P063" + ":ref:`P073_page`","P073" + ":ref:`P079_page`","P079" + ":ref:`P146_page`","P146" + ":ref:`P152_page`","P152" + ":ref:`C001_page`","C001" + ":ref:`C002_page`","C002" + ":ref:`C003_page`","C003" + ":ref:`C004_page`","C004" + ":ref:`C005_page`","C005" + ":ref:`C006_page`","C006" + ":ref:`C007_page`","C007" + ":ref:`C008_page`","C008" + ":ref:`C009_page`","C009" + ":ref:`C010_page`","C010" + ":ref:`C013_page`","C013" + ":ref:`N001_page`","N001" + ":ref:`N002_page`","N002" + +Build set: :yellow:`IRext` --------------------------------------------- .. collapse:: Details... @@ -933,229 +1499,6 @@ Build set: :yellow:`DISPLAY` ":ref:`P052_page`","P052" ":ref:`P053_page`","P053" ":ref:`P056_page`","P056" - ":ref:`P057_page`","P057" - ":ref:`P059_page`","P059" - ":ref:`P063_page`","P063" - ":ref:`P073_page`","P073" - ":ref:`P075_page`","P075" - ":ref:`P079_page`","P079" - ":ref:`P095_page`","P095" - ":ref:`P099_page`","P099" - ":ref:`P104_page`","P104" - ":ref:`P109_page`","P109" - ":ref:`P116_page`","P116" - ":ref:`P123_page`","P123" - ":ref:`P137_page`","P137" - ":ref:`P138_page`","P138" - ":ref:`P141_page`","P141" - ":ref:`P143_page`","P143" - ":ref:`P146_page`","P146" - ":ref:`P148_page`","P148" - ":ref:`P152_page`","P152" - ":ref:`P165_page`","P165" - ":ref:`C001_page`","C001" - ":ref:`C002_page`","C002" - ":ref:`C003_page`","C003" - ":ref:`C004_page`","C004" - ":ref:`C005_page`","C005" - ":ref:`C006_page`","C006" - ":ref:`C007_page`","C007" - ":ref:`C008_page`","C008" - ":ref:`C009_page`","C009" - ":ref:`C010_page`","C010" - ":ref:`C013_page`","C013" - -Build set: :yellow:`ENERGY` ---------------------------------------------- - -.. collapse:: Details... - - .. csv-table:: - :header: "Plugin name", "Plugin number" - :widths: 10, 5 - - ":ref:`P000_page`","P000" - ":ref:`P001_page`","P001" - ":ref:`P002_page`","P002" - ":ref:`P003_page`","P003" - ":ref:`P004_page`","P004" - ":ref:`P005_page`","P005" - ":ref:`P006_page`","P006" - ":ref:`P010_page`","P010" - ":ref:`P011_page`","P011" - ":ref:`P012_page`","P012" - ":ref:`P013_page`","P013" - ":ref:`P014_page`","P014" - ":ref:`P015_page`","P015" - ":ref:`P018_page`","P018" - ":ref:`P019_page`","P019" - ":ref:`P020_page`","P020" - ":ref:`P021_page`","P021" - ":ref:`P023_page`","P023" - ":ref:`P024_page`","P024" - ":ref:`P025_page`","P025" - ":ref:`P026_page`","P026" - ":ref:`P027_page`","P027" - ":ref:`P028_page`","P028" - ":ref:`P029_page`","P029" - ":ref:`P031_page`","P031" - ":ref:`P032_page`","P032" - ":ref:`P033_page`","P033" - ":ref:`P034_page`","P034" - ":ref:`P036_page`","P036" - ":ref:`P037_page`","P037" - ":ref:`P038_page`","P038" - ":ref:`P039_page`","P039" - ":ref:`P043_page`","P043" - ":ref:`P044_page`","P044" - ":ref:`P049_page`","P049" - ":ref:`P052_page`","P052" - ":ref:`P053_page`","P053" - ":ref:`P056_page`","P056" - ":ref:`P059_page`","P059" - ":ref:`P063_page`","P063" - ":ref:`P073_page`","P073" - ":ref:`P076_page`","P076" - ":ref:`P077_page`","P077" - ":ref:`P078_page`","P078" - ":ref:`P079_page`","P079" - ":ref:`P085_page`","P085" - ":ref:`P093_page`","P093" - ":ref:`P102_page`","P102" - ":ref:`P108_page`","P108" - ":ref:`P115_page`","P115" - ":ref:`P132_page`","P132" - ":ref:`P137_page`","P137" - ":ref:`P138_page`","P138" - ":ref:`P146_page`","P146" - ":ref:`P148_page`","P148" - ":ref:`P152_page`","P152" - ":ref:`P176_page`","P176" - ":ref:`C001_page`","C001" - ":ref:`C002_page`","C002" - ":ref:`C003_page`","C003" - ":ref:`C004_page`","C004" - ":ref:`C005_page`","C005" - ":ref:`C006_page`","C006" - ":ref:`C007_page`","C007" - ":ref:`C008_page`","C008" - ":ref:`C009_page`","C009" - ":ref:`C010_page`","C010" - ":ref:`C013_page`","C013" - -Build set: :yellow:`IR` ---------------------------------------------- - -.. collapse:: Details... - - .. csv-table:: - :header: "Plugin name", "Plugin number" - :widths: 10, 5 - - ":ref:`P000_page`","P000" - ":ref:`P001_page`","P001" - ":ref:`P002_page`","P002" - ":ref:`P003_page`","P003" - ":ref:`P004_page`","P004" - ":ref:`P005_page`","P005" - ":ref:`P006_page`","P006" - ":ref:`P010_page`","P010" - ":ref:`P011_page`","P011" - ":ref:`P012_page`","P012" - ":ref:`P013_page`","P013" - ":ref:`P014_page`","P014" - ":ref:`P015_page`","P015" - ":ref:`P016_page`","P016" - ":ref:`P018_page`","P018" - ":ref:`P019_page`","P019" - ":ref:`P020_page`","P020" - ":ref:`P021_page`","P021" - ":ref:`P023_page`","P023" - ":ref:`P024_page`","P024" - ":ref:`P025_page`","P025" - ":ref:`P026_page`","P026" - ":ref:`P028_page`","P028" - ":ref:`P029_page`","P029" - ":ref:`P031_page`","P031" - ":ref:`P032_page`","P032" - ":ref:`P033_page`","P033" - ":ref:`P034_page`","P034" - ":ref:`P035_page`","P035" - ":ref:`P036_page`","P036" - ":ref:`P037_page`","P037" - ":ref:`P038_page`","P038" - ":ref:`P039_page`","P039" - ":ref:`P040_page`","P040" - ":ref:`P043_page`","P043" - ":ref:`P044_page`","P044" - ":ref:`P049_page`","P049" - ":ref:`P052_page`","P052" - ":ref:`P053_page`","P053" - ":ref:`P056_page`","P056" - ":ref:`P059_page`","P059" - ":ref:`P063_page`","P063" - ":ref:`P073_page`","P073" - ":ref:`P079_page`","P079" - ":ref:`P146_page`","P146" - ":ref:`P152_page`","P152" - ":ref:`C001_page`","C001" - ":ref:`C002_page`","C002" - ":ref:`C003_page`","C003" - ":ref:`C004_page`","C004" - ":ref:`C005_page`","C005" - ":ref:`C006_page`","C006" - ":ref:`C007_page`","C007" - ":ref:`C008_page`","C008" - ":ref:`C009_page`","C009" - ":ref:`C010_page`","C010" - ":ref:`C013_page`","C013" - -Build set: :yellow:`IRext` ---------------------------------------------- - -.. collapse:: Details... - - .. csv-table:: - :header: "Plugin name", "Plugin number" - :widths: 10, 5 - - ":ref:`P000_page`","P000" - ":ref:`P001_page`","P001" - ":ref:`P002_page`","P002" - ":ref:`P003_page`","P003" - ":ref:`P004_page`","P004" - ":ref:`P005_page`","P005" - ":ref:`P006_page`","P006" - ":ref:`P010_page`","P010" - ":ref:`P011_page`","P011" - ":ref:`P012_page`","P012" - ":ref:`P013_page`","P013" - ":ref:`P014_page`","P014" - ":ref:`P015_page`","P015" - ":ref:`P018_page`","P018" - ":ref:`P019_page`","P019" - ":ref:`P020_page`","P020" - ":ref:`P021_page`","P021" - ":ref:`P023_page`","P023" - ":ref:`P024_page`","P024" - ":ref:`P025_page`","P025" - ":ref:`P026_page`","P026" - ":ref:`P028_page`","P028" - ":ref:`P029_page`","P029" - ":ref:`P031_page`","P031" - ":ref:`P032_page`","P032" - ":ref:`P033_page`","P033" - ":ref:`P034_page`","P034" - ":ref:`P036_page`","P036" - ":ref:`P037_page`","P037" - ":ref:`P038_page`","P038" - ":ref:`P039_page`","P039" - ":ref:`P043_page`","P043" - ":ref:`P044_page`","P044" - ":ref:`P049_page`","P049" - ":ref:`P052_page`","P052" - ":ref:`P053_page`","P053" - ":ref:`P056_page`","P056" ":ref:`P059_page`","P059" ":ref:`P063_page`","P063" ":ref:`P073_page`","P073" @@ -1174,6 +1517,8 @@ Build set: :yellow:`IRext` ":ref:`C009_page`","C009" ":ref:`C010_page`","C010" ":ref:`C013_page`","C013" + ":ref:`N001_page`","N001" + ":ref:`N002_page`","N002" Build set: :yellow:`NEOPIXEL` --------------------------------------------- @@ -1191,20 +1536,26 @@ Build set: :yellow:`NEOPIXEL` ":ref:`P004_page`","P004" ":ref:`P005_page`","P005" ":ref:`P006_page`","P006" + ":ref:`P007_page`","P007" + ":ref:`P008_page`","P008" + ":ref:`P009_page`","P009" ":ref:`P010_page`","P010" ":ref:`P011_page`","P011" ":ref:`P012_page`","P012" ":ref:`P013_page`","P013" ":ref:`P014_page`","P014" ":ref:`P015_page`","P015" + ":ref:`P017_page`","P017" ":ref:`P018_page`","P018" ":ref:`P019_page`","P019" ":ref:`P020_page`","P020" ":ref:`P021_page`","P021" + ":ref:`P022_page`","P022" ":ref:`P023_page`","P023" ":ref:`P024_page`","P024" ":ref:`P025_page`","P025" ":ref:`P026_page`","P026" + ":ref:`P027_page`","P027" ":ref:`P028_page`","P028" ":ref:`P029_page`","P029" ":ref:`P031_page`","P031" @@ -1215,6 +1566,7 @@ Build set: :yellow:`NEOPIXEL` ":ref:`P037_page`","P037" ":ref:`P038_page`","P038" ":ref:`P039_page`","P039" + ":ref:`P040_page`","P040" ":ref:`P041_page`","P041" ":ref:`P042_page`","P042" ":ref:`P043_page`","P043" @@ -1228,10 +1580,12 @@ Build set: :yellow:`NEOPIXEL` ":ref:`P070_page`","P070" ":ref:`P073_page`","P073" ":ref:`P079_page`","P079" + ":ref:`P089_page`","P089" ":ref:`P128_page`","P128" ":ref:`P131_page`","P131" ":ref:`P137_page`","P137" ":ref:`P138_page`","P138" + ":ref:`P139_page`","P139" ":ref:`P146_page`","P146" ":ref:`P152_page`","P152" ":ref:`P165_page`","P165" @@ -1246,6 +1600,8 @@ Build set: :yellow:`NEOPIXEL` ":ref:`C009_page`","C009" ":ref:`C010_page`","C010" ":ref:`C013_page`","C013" + ":ref:`N001_page`","N001" + ":ref:`N002_page`","N002" Build set: :yellow:`MAX` --------------------------------------------- @@ -1345,6 +1701,7 @@ Build set: :yellow:`MAX` ":ref:`P086_page`","P086" ":ref:`P087_page`","P087" ":ref:`P088_page`","P088" + ":ref:`P089_page`","P089" ":ref:`P090_page`","P090" ":ref:`P091_page`","P091" ":ref:`P092_page`","P092" @@ -1391,6 +1748,8 @@ Build set: :yellow:`MAX` ":ref:`P135_page`","P135" ":ref:`P137_page`","P137" ":ref:`P138_page`","P138" + ":ref:`P139_page`","P139" + ":ref:`P140_page`","P140" ":ref:`P141_page`","P141" ":ref:`P142_page`","P142" ":ref:`P143_page`","P143" @@ -1418,7 +1777,9 @@ Build set: :yellow:`MAX` ":ref:`P173_page`","P173" ":ref:`P175_page`","P175" ":ref:`P176_page`","P176" + ":ref:`P177_page`","P177" ":ref:`P178_page`","P178" + ":ref:`P180_page`","P180" ":ref:`C001_page`","C001" ":ref:`C002_page`","C002" ":ref:`C003_page`","C003" @@ -1436,4 +1797,6 @@ Build set: :yellow:`MAX` ":ref:`C016_page`","C016" ":ref:`C017_page`","C017" ":ref:`C018_page`","C018" + ":ref:`N001_page`","N001" + ":ref:`N002_page`","N002" diff --git a/docs/source/Plugin/_plugin_substitutions_p16x.repl b/docs/source/Plugin/_plugin_substitutions_p16x.repl index 82079032e..4c533a76e 100644 --- a/docs/source/Plugin/_plugin_substitutions_p16x.repl +++ b/docs/source/Plugin/_plugin_substitutions_p16x.repl @@ -67,7 +67,7 @@ .. |P167_type| replace:: :cyan:`Environment` .. |P167_typename| replace:: :cyan:`Environment - Sensirion SEN5x (IKEA Vindstyrka)` .. |P167_porttype| replace:: `.` -.. |P167_status| replace:: :yellow:`CLIMATE` +.. |P167_status| replace:: :yellow:`CLIMATE B` .. |P167_github| replace:: P167_Vindstyrka.ino .. _P167_github: https://github.com/letscontrolit/ESPEasy/blob/mega/src/_P167_Vindstyrka.ino .. |P167_usedby| replace:: `.` @@ -80,7 +80,7 @@ .. |P168_type| replace:: :cyan:`Light/Lux` .. |P168_typename| replace:: :cyan:`Light/Lux - VEML6030/VEML7700` .. |P168_porttype| replace:: `.` -.. |P168_status| replace:: :yellow:`COLLECTION G` :yellow:`CLIMATE` +.. |P168_status| replace:: :yellow:`COLLECTION G` :yellow:`CLIMATE B` .. |P168_github| replace:: P168_VEML6030_7700.ino .. _P168_github: https://github.com/letscontrolit/ESPEasy/blob/mega/src/_P168_VEML6030_7700.ino .. |P168_usedby| replace:: `.` @@ -93,7 +93,7 @@ .. |P169_type| replace:: :cyan:`Environment` .. |P169_typename| replace:: :cyan:`Environment - AS3935 Lightning Detector` .. |P169_porttype| replace:: `.` -.. |P169_status| replace:: :yellow:`CLIMATE` +.. |P169_status| replace:: :yellow:`CLIMATE B` .. |P169_github| replace:: P169_AS3935_LightningDetector.ino .. _P169_github: https://github.com/letscontrolit/ESPEasy/blob/mega/src/_P169_AS3935_LightningDetector.ino .. |P169_usedby| replace:: `.` diff --git a/docs/source/Plugin/_plugin_substitutions_p17x.repl b/docs/source/Plugin/_plugin_substitutions_p17x.repl index d22d9a31e..8f07c78bf 100644 --- a/docs/source/Plugin/_plugin_substitutions_p17x.repl +++ b/docs/source/Plugin/_plugin_substitutions_p17x.repl @@ -15,7 +15,7 @@ .. |P172_type| replace:: :cyan:`Environment` .. |P172_typename| replace:: :cyan:`Environment - BMP3xx (SPI)` .. |P172_porttype| replace:: `.` -.. |P172_status| replace:: :yellow:`COLLECTION G` :yellow:`CLIMATE` +.. |P172_status| replace:: :yellow:`COLLECTION G` :yellow:`CLIMATE B` .. |P172_github| replace:: P172_BMP3xx_SPI.ino .. _P172_github: https://github.com/letscontrolit/ESPEasy/blob/mega/src/_P172_BMP3xx_SPI.ino .. |P172_usedby| replace:: `.` @@ -28,7 +28,7 @@ .. |P173_type| replace:: :cyan:`Environment` .. |P173_typename| replace:: :cyan:`Environment - SHTC3` .. |P173_porttype| replace:: `.` -.. |P173_status| replace:: :yellow:`COLLECTION G` :yellow:`CLIMATE` +.. |P173_status| replace:: :yellow:`COLLECTION G` :yellow:`CLIMATE B` .. |P173_github| replace:: P173_SHTC3.ino .. _P173_github: https://github.com/letscontrolit/ESPEasy/blob/mega/src/_P173_SHTC3.ino .. |P173_usedby| replace:: `.` @@ -41,7 +41,7 @@ .. |P175_type| replace:: :cyan:`Dust` .. |P175_typename| replace:: :cyan:`Dust - PMSx003i (I2C)` .. |P175_porttype| replace:: `I2C` -.. |P175_status| replace:: :yellow:`CLIMATE` +.. |P175_status| replace:: :yellow:`CLIMATE B` .. |P175_github| replace:: P175_PMSx003i.ino .. _P175_github: https://github.com/letscontrolit/ESPEasy/blob/mega/src/_P175_PMSx003i.ino .. |P175_usedby| replace:: `.` @@ -67,7 +67,7 @@ .. |P177_type| replace:: :cyan:`Environment` .. |P177_typename| replace:: :cyan:`Environment - XDB401 I2C Pressure` .. |P177_porttype| replace:: `.` -.. |P177_status| replace:: :yellow:`COLLECTION G` :yellow:`CLIMATE` +.. |P177_status| replace:: :yellow:`COLLECTION G` :yellow:`CLIMATE B` .. |P177_github| replace:: P177_XDB_pressure.ino .. _P177_github: https://github.com/letscontrolit/ESPEasy/blob/mega/src/_P177_XDB_pressure.ino .. |P177_usedby| replace:: `.` @@ -80,7 +80,7 @@ .. |P178_type| replace:: :cyan:`Extra IO` .. |P178_typename| replace:: :cyan:`Extra IO - LU9685 Servo controller` .. |P178_porttype| replace:: `.` -.. |P178_status| replace:: :yellow:`COLLECTION G` :yellow:`CLIMATE` +.. |P178_status| replace:: :yellow:`COLLECTION H` :yellow:`CLIMATE B` .. |P178_github| replace:: P178_LU9685.ino .. _P178_github: https://github.com/letscontrolit/ESPEasy/blob/mega/src/_P178_LU9685.ino .. |P178_usedby| replace:: `LU9685 16/20 channel servo controller` diff --git a/platformio_esp32_envs.ini b/platformio_esp32_envs.ini index e64577096..56a6d0cc2 100644 --- a/platformio_esp32_envs.ini +++ b/platformio_esp32_envs.ini @@ -186,6 +186,15 @@ build_flags = ${esp32_common_LittleFS_ETH.build_flags} -DCOLLECTION_FEATURE_RTTTL=1 +[env:collection_H_ESP32_4M316k_LittleFS_ETH] +extends = esp32_common_LittleFS_ETH +board = esp32_4M +build_flags = ${esp32_common_LittleFS_ETH.build_flags} + -DFEATURE_ARDUINO_OTA=1 + -DPLUGIN_SET_COLLECTION_H_ESP32 + -DCOLLECTION_FEATURE_RTTTL=1 + + [env:collection_A_ESP32_IRExt_4M316k_LittleFS_ETH] extends = esp32_IRExt_LittleFS_ETH @@ -229,6 +238,12 @@ board = esp32_4M build_flags = ${esp32_IRExt_LittleFS_ETH.build_flags} -DPLUGIN_SET_COLLECTION_G_ESP32 +[env:collection_H_ESP32_IRExt_4M316k_LittleFS_ETH] +extends = esp32_IRExt_LittleFS_ETH +board = esp32_4M +build_flags = ${esp32_IRExt_LittleFS_ETH.build_flags} + -DPLUGIN_SET_COLLECTION_H_ESP32 + [env:energy_ESP32_4M316k_LittleFS_ETH] extends = esp32_common_LittleFS_ETH board = esp32_4M @@ -257,7 +272,7 @@ build_flags = ${esp32_common_LittleFS_ETH.build_flags} -[env:climate_ESP32_4M316k_LittleFS_ETH] +[env:climate_A_ESP32_4M316k_LittleFS_ETH] extends = esp32_common_LittleFS_ETH board = esp32_4M lib_ignore = ${esp32_always.lib_ignore} @@ -265,7 +280,17 @@ lib_ignore = ${esp32_always.lib_ignore} ${esp32_common_LittleFS_ETH.lib_ignore} ${no_ir.lib_ignore} build_flags = ${esp32_common_LittleFS_ETH.build_flags} - -DPLUGIN_CLIMATE_COLLECTION + -DPLUGIN_CLIMATE_A_COLLECTION + +[env:climate_B_ESP32_4M316k_LittleFS_ETH] +extends = esp32_common_LittleFS_ETH +board = esp32_4M +lib_ignore = ${esp32_always.lib_ignore} + ESP32_ping + ${esp32_common_LittleFS_ETH.lib_ignore} + ${no_ir.lib_ignore} +build_flags = ${esp32_common_LittleFS_ETH.build_flags} + -DPLUGIN_CLIMATE_B_COLLECTION [env:neopixel_ESP32_4M316k_LittleFS_ETH] diff --git a/platformio_esp32_solo1.ini b/platformio_esp32_solo1.ini index 0c755e934..a3c72208b 100644 --- a/platformio_esp32_solo1.ini +++ b/platformio_esp32_solo1.ini @@ -41,9 +41,16 @@ build_flags = ${esp32_solo1_common_LittleFS.build_flags} -DFEATURE_ETHERNET=1 extra_scripts = ${esp32_solo1_common_LittleFS.extra_scripts} -[env:climate_ESP32solo1_4M316k_LittleFS_ETH] +[env:climate_A_ESP32solo1_4M316k_LittleFS_ETH] extends = esp32_solo1_common_LittleFS build_flags = ${esp32_solo1_common_LittleFS.build_flags} - -D PLUGIN_CLIMATE_COLLECTION + -D PLUGIN_CLIMATE_A_COLLECTION + -DFEATURE_ETHERNET=1 +extra_scripts = ${esp32_solo1_common_LittleFS.extra_scripts} + +[env:climate_B_ESP32solo1_4M316k_LittleFS_ETH] +extends = esp32_solo1_common_LittleFS +build_flags = ${esp32_solo1_common_LittleFS.build_flags} + -D PLUGIN_CLIMATE_B_COLLECTION -DFEATURE_ETHERNET=1 extra_scripts = ${esp32_solo1_common_LittleFS.extra_scripts} diff --git a/platformio_esp32c3_envs.ini b/platformio_esp32c3_envs.ini index 686d0476d..0e89fc4e2 100644 --- a/platformio_esp32c3_envs.ini +++ b/platformio_esp32c3_envs.ini @@ -70,6 +70,12 @@ build_flags = ${esp32c3_common_LittleFS.build_flags} -DPLUGIN_SET_COLLECTION_G_ESP32 -DCOLLECTION_FEATURE_RTTTL=1 +[env:collection_H_ESP32c3_4M316k_LittleFS_ETH] +extends = esp32c3_common_LittleFS +build_flags = ${esp32c3_common_LittleFS.build_flags} + -DPLUGIN_SET_COLLECTION_H_ESP32 + -DCOLLECTION_FEATURE_RTTTL=1 + [env:energy_ESP32c3_4M316k_LittleFS_ETH] extends = esp32c3_common_LittleFS @@ -91,10 +97,15 @@ build_flags = ${esp32c3_common_LittleFS.build_flags} -D ST7789_EXTRA_INIT=1 -D P116_EXTRA_ST7789=1 -[env:climate_ESP32c3_4M316k_LittleFS_ETH] +[env:climate_A_ESP32c3_4M316k_LittleFS_ETH] extends = esp32c3_common_LittleFS build_flags = ${esp32c3_common_LittleFS.build_flags} - -D PLUGIN_CLIMATE_COLLECTION + -D PLUGIN_CLIMATE_A_COLLECTION + +[env:climate_B_ESP32c3_4M316k_LittleFS_ETH] +extends = esp32c3_common_LittleFS +build_flags = ${esp32c3_common_LittleFS.build_flags} + -D PLUGIN_CLIMATE_B_COLLECTION [env:neopixel_ESP32c3_4M316k_LittleFS_ETH] extends = esp32c3_common_LittleFS diff --git a/platformio_esp32c6_envs.ini b/platformio_esp32c6_envs.ini index b90d518ce..251d322d6 100644 --- a/platformio_esp32c6_envs.ini +++ b/platformio_esp32c6_envs.ini @@ -48,10 +48,15 @@ build_flags = ${esp32c6_common_LittleFS.build_flags} -D ST7789_EXTRA_INIT=1 -D P116_EXTRA_ST7789=1 -[env:climate_ESP32c6_4M316k_LittleFS_ETH] +[env:climate_A_ESP32c6_4M316k_LittleFS_ETH] extends = esp32c6_common_LittleFS build_flags = ${esp32c6_common_LittleFS.build_flags} - -D PLUGIN_CLIMATE_COLLECTION + -D PLUGIN_CLIMATE_A_COLLECTION + +[env:climate_B_ESP32c6_4M316k_LittleFS_ETH] +extends = esp32c6_common_LittleFS +build_flags = ${esp32c6_common_LittleFS.build_flags} + -D PLUGIN_CLIMATE_B_COLLECTION [env:neopixel_ESP32c6_4M316k_LittleFS_ETH] extends = esp32c6_common_LittleFS diff --git a/platformio_esp32s2_envs.ini b/platformio_esp32s2_envs.ini index 2e44e2151..825b20a0c 100644 --- a/platformio_esp32s2_envs.ini +++ b/platformio_esp32s2_envs.ini @@ -105,6 +105,13 @@ build_flags = ${esp32s2_common_LittleFS.build_flags} -DPLUGIN_SET_COLLECTION_G_ESP32 -DCOLLECTION_FEATURE_RTTTL=1 +[env:collection_H_ESP32s2_4M316k_LittleFS_ETH] +extends = esp32s2_common_LittleFS +board = esp32s2cdc +build_flags = ${esp32s2_common_LittleFS.build_flags} + -DPLUGIN_SET_COLLECTION_H_ESP32 + -DCOLLECTION_FEATURE_RTTTL=1 + [env:energy_ESP32s2_4M316k_LittleFS_ETH] extends = esp32s2_common_LittleFS @@ -128,9 +135,15 @@ build_flags = ${esp32s2_common_LittleFS.build_flags} -D ST7789_EXTRA_INIT=1 -D P116_EXTRA_ST7789=1 -[env:climate_ESP32s2_4M316k_LittleFS_ETH] +[env:climate_A_ESP32s2_4M316k_LittleFS_ETH] extends = esp32s2_common_LittleFS board = esp32s2cdc build_flags = ${esp32s2_common_LittleFS.build_flags} - -D PLUGIN_CLIMATE_COLLECTION + -D PLUGIN_CLIMATE_A_COLLECTION + +[env:climate_B_ESP32s2_4M316k_LittleFS_ETH] +extends = esp32s2_common_LittleFS +board = esp32s2cdc +build_flags = ${esp32s2_common_LittleFS.build_flags} + -D PLUGIN_CLIMATE_B_COLLECTION diff --git a/platformio_esp32s3_envs.ini b/platformio_esp32s3_envs.ini index 3aa8aa6c8..d402e1745 100644 --- a/platformio_esp32s3_envs.ini +++ b/platformio_esp32s3_envs.ini @@ -96,6 +96,13 @@ build_flags = ${esp32s3_common_LittleFS.build_flags} -DPLUGIN_SET_COLLECTION_G_ESP32 -DCOLLECTION_FEATURE_RTTTL=1 +[env:collection_H_ESP32s3_4M316k_LittleFS_ETH] +extends = esp32s3_common_LittleFS +board = esp32s3cdc-qio_qspi +build_flags = ${esp32s3_common_LittleFS.build_flags} + -DPLUGIN_SET_COLLECTION_H_ESP32 + -DCOLLECTION_FEATURE_RTTTL=1 + [env:energy_ESP32s3_4M316k_LittleFS_ETH] extends = esp32s3_common_LittleFS @@ -119,11 +126,17 @@ build_flags = ${esp32s3_common_LittleFS.build_flags} -D ST7789_EXTRA_INIT=1 -D P116_EXTRA_ST7789=1 -[env:climate_ESP32s3_4M316k_LittleFS_ETH] +[env:climate_A_ESP32s3_4M316k_LittleFS_ETH] extends = esp32s3_common_LittleFS board = esp32s3cdc-qio_qspi build_flags = ${esp32s3_common_LittleFS.build_flags} - -D PLUGIN_CLIMATE_COLLECTION + -D PLUGIN_CLIMATE_A_COLLECTION + +[env:climate_B_ESP32s3_4M316k_LittleFS_ETH] +extends = esp32s3_common_LittleFS +board = esp32s3cdc-qio_qspi +build_flags = ${esp32s3_common_LittleFS.build_flags} + -D PLUGIN_CLIMATE_B_COLLECTION [env:neopixel_ESP32s3_4M316k_LittleFS_ETH] diff --git a/platformio_esp82xx_envs.ini b/platformio_esp82xx_envs.ini index 9e226ff5b..7082a24ee 100644 --- a/platformio_esp82xx_envs.ini +++ b/platformio_esp82xx_envs.ini @@ -528,6 +528,12 @@ build_flags = ${collection_ESP8266_4M1M.build_flags} -DPLUGIN_BUILD_COLLECTION_G -DCOLLECTION_FEATURE_RTTTL=1 +[env:collection_H_ESP8266_4M1M] +extends = collection_ESP8266_4M1M +build_flags = ${collection_ESP8266_4M1M.build_flags} + -DPLUGIN_BUILD_COLLECTION_H + -DCOLLECTION_FEATURE_RTTTL=1 + ; COLL: 4096k version + FEATURE_ADC_VCC ---------- [env:collection_A_ESP8266_4M1M_VCC] @@ -577,6 +583,13 @@ build_flags = ${collection_ESP8266_4M1M.build_flags} -DPLUGIN_BUILD_COLLECTION_G -DCOLLECTION_FEATURE_RTTTL=1 +[env:collection_H_ESP8266_4M1M_VCC] +extends = collection_ESP8266_4M1M +build_flags = ${collection_ESP8266_4M1M.build_flags} + -DFEATURE_ADC_VCC=1 + -DPLUGIN_BUILD_COLLECTION_H + -DCOLLECTION_FEATURE_RTTTL=1 + ;;; Collection builds ************************************************ @@ -632,11 +645,25 @@ lib_ignore = ${regular_platform.lib_ignore} ; climate : 4096k version ---------------------------- -[env:climate_ESP8266_4M1M] +[env:climate_A_ESP8266_4M1M] extends = esp8266_4M1M, regular_platform build_flags = ${regular_platform.build_flags} ${esp8266_4M1M.build_flags} - -D PLUGIN_CLIMATE_COLLECTION + -D PLUGIN_CLIMATE_A_COLLECTION + -D KEEP_RTTTL + -D WEBSERVER_USE_CDN_JS_CSS +lib_ignore = ${regular_platform.lib_ignore} + ESP8266SdFat + SD(esp8266) + SD + SDFS + LittleFS(esp8266) + +[env:climate_B_ESP8266_4M1M] +extends = esp8266_4M1M, regular_platform +build_flags = ${regular_platform.build_flags} + ${esp8266_4M1M.build_flags} + -D PLUGIN_CLIMATE_B_COLLECTION -D KEEP_RTTTL -D WEBSERVER_USE_CDN_JS_CSS lib_ignore = ${regular_platform.lib_ignore} diff --git a/src/src/CustomBuild/define_plugin_sets.h b/src/src/CustomBuild/define_plugin_sets.h index 64eb91524..80332169d 100644 --- a/src/src/CustomBuild/define_plugin_sets.h +++ b/src/src/CustomBuild/define_plugin_sets.h @@ -267,6 +267,8 @@ To create/register a plugin, you have to : #define PLUGIN_DESCR "Collection_F, IR with AC" #elif defined(PLUGIN_SET_COLLECTION_G_ESP32) #define PLUGIN_DESCR "Collection_G, IR with AC" + #elif defined(PLUGIN_SET_COLLECTION_H_ESP32) + #define PLUGIN_DESCR "Collection_H, IR with AC" #else #define PLUGIN_DESCR "Normal, IR with AC" #endif @@ -345,13 +347,22 @@ To create/register a plugin, you have to : #define PLUGIN_BUILD_NORMAL // add stable #endif +#ifdef PLUGIN_BUILD_COLLECTION_H + #define PLUGIN_DESCR "Collection_H" + #define PLUGIN_SET_COLLECTION + #define PLUGIN_SET_COLLECTION_H + #define CONTROLLER_SET_COLLECTION + #define NOTIFIER_SET_COLLECTION + #define PLUGIN_BUILD_NORMAL // add stable +#endif + #ifndef PLUGIN_BUILD_CUSTOM #ifndef PLUGIN_BUILD_NORMAL #define PLUGIN_BUILD_NORMAL // defaults to stable, if not custom #endif #endif -#ifdef PLUGIN_CLIMATE_COLLECTION +#ifdef PLUGIN_CLIMATE_A_COLLECTION #ifdef PLUGIN_BUILD_NORMAL #undef PLUGIN_BUILD_NORMAL #endif @@ -894,7 +905,7 @@ To create/register a plugin, you have to : #endif #ifdef PLUGIN_SET_COLLECTION_ESP32 - #if !defined(PLUGIN_SET_COLLECTION_B_ESP32) && !defined(PLUGIN_SET_COLLECTION_C_ESP32) && !defined(PLUGIN_SET_COLLECTION_D_ESP32) && !defined(PLUGIN_SET_COLLECTION_E_ESP32) && !defined(PLUGIN_SET_COLLECTION_F_ESP32) && !defined(PLUGIN_SET_COLLECTION_G_ESP32) + #if !defined(PLUGIN_SET_COLLECTION_B_ESP32) && !defined(PLUGIN_SET_COLLECTION_C_ESP32) && !defined(PLUGIN_SET_COLLECTION_D_ESP32) && !defined(PLUGIN_SET_COLLECTION_E_ESP32) && !defined(PLUGIN_SET_COLLECTION_F_ESP32) && !defined(PLUGIN_SET_COLLECTION_G_ESP32) && !defined(PLUGIN_SET_COLLECTION_H_ESP32) #ifndef PLUGIN_DESCR // COLLECTION_A_ESP32_IRExt also passes here #define PLUGIN_DESCR "Collection_A ESP32" #endif @@ -1112,6 +1123,37 @@ To create/register a plugin, you have to : // TODO : Check compatibility of plugins for ESP32 board. #endif +#ifdef PLUGIN_SET_COLLECTION_H_ESP32 + #ifndef PLUGIN_DESCR // COLLECTION_H_ESP32_IRExt also passes here + #define PLUGIN_DESCR "Collection_H ESP32" + #endif + #ifndef ESP32 + #define ESP32 + #endif + #ifdef ESP8266 + #undef ESP8266 + #endif + // Undefine contradictionary defines + #ifdef PLUGIN_SET_NONE + #undef PLUGIN_SET_NONE + #endif + #ifdef PLUGIN_SET_ONLY_SWITCH + #undef PLUGIN_SET_ONLY_SWITCH + #endif + #ifdef PLUGIN_SET_ONLY_TEMP_HUM + #undef PLUGIN_SET_ONLY_TEMP_HUM + #endif + #define PLUGIN_SET_COLLECTION + #define PLUGIN_SET_COLLECTION_H + #define CONTROLLER_SET_STABLE + #define CONTROLLER_SET_COLLECTION + #define NOTIFIER_SET_STABLE + #define PLUGIN_SET_STABLE // add stable + // See also PLUGIN_SET_COLLECTION_ESP32 section at end, + // where incompatible plugins will be disabled. + // TODO : Check compatibility of plugins for ESP32 board. +#endif + #ifdef PLUGIN_BUILD_MAX_ESP32 #ifndef PLUGIN_DESCR #define PLUGIN_DESCR "MAX ESP32" @@ -1138,8 +1180,11 @@ To create/register a plugin, you have to : #ifndef PLUGIN_DISPLAY_B_COLLECTION #define PLUGIN_DISPLAY_B_COLLECTION #endif - #ifndef PLUGIN_CLIMATE_COLLECTION - #define PLUGIN_CLIMATE_COLLECTION + #ifndef PLUGIN_CLIMATE_A_COLLECTION + #define PLUGIN_CLIMATE_A_COLLECTION + #endif + #ifndef PLUGIN_CLIMATE_B_COLLECTION + #define PLUGIN_CLIMATE_B_COLLECTION #endif #ifndef PLUGIN_NEOPIXEL_COLLECTION #define PLUGIN_NEOPIXEL_COLLECTION @@ -1294,6 +1339,9 @@ To create/register a plugin, you have to : #ifdef PLUGIN_SET_COLLECTION_G #undef PLUGIN_SET_COLLECTION_G #endif + #ifdef PLUGIN_SET_COLLECTION_H + #undef PLUGIN_SET_COLLECTION_H + #endif #ifdef PLUGIN_SET_EXPERIMENTAL #undef PLUGIN_SET_EXPERIMENTAL #endif @@ -1393,6 +1441,9 @@ To create/register a plugin, you have to : #ifndef PLUGIN_SET_COLLECTION_G #define PLUGIN_SET_COLLECTION_G #endif + #ifndef PLUGIN_SET_COLLECTION_H + #define PLUGIN_SET_COLLECTION_H + #endif #endif @@ -1505,7 +1556,7 @@ To create/register a plugin, you have to : #endif #endif -#if defined(PLUGIN_SET_COLLECTION) || defined(PLUGIN_SET_COLLECTION_A) || defined(PLUGIN_SET_COLLECTION_B) || defined(PLUGIN_SET_COLLECTION_C) || defined(PLUGIN_SET_COLLECTION_D) || defined(PLUGIN_SET_COLLECTION_E) || defined(PLUGIN_SET_COLLECTION_F) || defined(PLUGIN_SET_COLLECTION_G) +#if defined(PLUGIN_SET_COLLECTION) || defined(PLUGIN_SET_COLLECTION_A) || defined(PLUGIN_SET_COLLECTION_B) || defined(PLUGIN_SET_COLLECTION_C) || defined(PLUGIN_SET_COLLECTION_D) || defined(PLUGIN_SET_COLLECTION_E) || defined(PLUGIN_SET_COLLECTION_F) || defined(PLUGIN_SET_COLLECTION_G) || defined(PLUGIN_SET_COLLECTION_H) #if !defined(PLUGIN_SET_MAX) && !defined(ESP32) #ifndef LIMIT_BUILD_SIZE #define LIMIT_BUILD_SIZE @@ -1731,10 +1782,13 @@ To create/register a plugin, you have to : #if !defined(USES_P177) && defined(ESP32) #define USES_P177 // Environment - I2C XDB401 pressure #endif +#endif // ifdef PLUGIN_SET_COLLECTION_G + +#ifdef PLUGIN_SET_COLLECTION_H #if !defined(USES_P178) && defined(ESP32) #define USES_P178 // Extra IO - LU9685 Servo controller #endif -#endif // ifdef PLUGIN_SET_COLLECTION_G +#endif // ifdef PLUGIN_SET_COLLECTION_H // Collection of all energy related plugins. #ifdef PLUGIN_ENERGY_COLLECTION @@ -2031,10 +2085,10 @@ To create/register a plugin, you have to : #endif #endif // ifdef PLUGIN_DISPLAY_B_COLLECTION -// Collection of all climate plugins. -#ifdef PLUGIN_CLIMATE_COLLECTION +// Collection of climate A plugins. +#ifdef PLUGIN_CLIMATE_A_COLLECTION #ifndef PLUGIN_DESCR - #define PLUGIN_DESCR "Climate" + #define PLUGIN_DESCR "Climate A" #endif // Features and plugins cherry picked from stable set @@ -2191,6 +2245,76 @@ To create/register a plugin, you have to : #define USES_P168 // Light - VEML6030/VEML7700 #endif + #if !defined(USES_P180) && defined(ESP32) + #define USES_P180 // Generic - I2C Generic + #endif + + + // Controllers + #ifndef USES_C011 + #define USES_C011 // HTTP Advanced + #endif +#endif // ifdef PLUGIN_CLIMATE_A_COLLECTION + +#ifdef PLUGIN_CLIMATE_B_COLLECTION + #ifndef PLUGIN_DESCR + #define PLUGIN_DESCR "Climate B" + #endif + + // Features and plugins cherry picked from stable set + #ifndef FEATURE_SERVO + #define FEATURE_SERVO 1 + #endif + #ifndef FEATURE_RTTTL + #define FEATURE_RTTTL 1 + #endif + + #define USES_P001 // Switch + #define USES_P002 // ADC + #define USES_P003 // Pulse + #define USES_P004 // Dallas + #define USES_P005 // DHT + #define USES_P006 // BMP085 + + #define USES_P010 // BH1750 + #define USES_P011 // PME + #define USES_P012 // LCD + #define USES_P013 // HCSR04 + #define USES_P014 // SI7021 + #define USES_P015 // TSL2561 + #define USES_P018 // Dust + #define USES_P019 // PCF8574 + + #define USES_P021 // Level + #define USES_P023 // OLED + #define USES_P024 // MLX90614 + #define USES_P025 // ADS1x15 + #define USES_P026 // SysInfo + #define USES_P028 // BME280 + #define USES_P029 // Output + + #define USES_P031 // SHT1X + #define USES_P032 // MS5611 + #define USES_P033 // Dummy + #define USES_P034 // DHT12 + #define USES_P036 // FrameOLED + #define USES_P037 // MQTTImport + #define USES_P038 // NeoPixel + #define USES_P039 // Environment - Thermocouple + + #define USES_P043 // ClkOutput + #define USES_P044 // P1WifiGateway + #define USES_P049 // MHZ19 + + #define USES_P052 // SenseAir + #define USES_P053 // PMSx003 + #define USES_P056 // SDS011-Dust + #define USES_P059 // Encoder + + #define USES_P073 // 7DGT + + // Enable extra climate-related plugins (CO2/Temp/Hum) + #ifndef USES_P169 #define USES_P169 // Environment - AS3935 Lightning Detector #endif @@ -2215,7 +2339,7 @@ To create/register a plugin, you have to : #ifndef USES_C011 #define USES_C011 // HTTP Advanced #endif -#endif // ifdef PLUGIN_CLIMATE_COLLECTION +#endif // ifdef PLUGIN_CLIMATE_B_COLLECTION // Collection of all NeoPixel plugins #ifdef PLUGIN_NEOPIXEL_COLLECTION @@ -3237,7 +3361,7 @@ To create/register a plugin, you have to : #endif // Here we can re-enable specific features in the COLLECTION sets as we have created some space there by splitting them up -#if defined(COLLECTION_FEATURE_RTTTL) && (defined(PLUGIN_SET_COLLECTION_A) || defined(PLUGIN_SET_COLLECTION_B) || defined(PLUGIN_SET_COLLECTION_C) || defined(PLUGIN_SET_COLLECTION_D) || defined(PLUGIN_SET_COLLECTION_E) || defined(PLUGIN_SET_COLLECTION_F) || defined(PLUGIN_SET_COLLECTION_G)) +#if defined(COLLECTION_FEATURE_RTTTL) && (defined(PLUGIN_SET_COLLECTION_A) || defined(PLUGIN_SET_COLLECTION_B) || defined(PLUGIN_SET_COLLECTION_C) || defined(PLUGIN_SET_COLLECTION_D) || defined(PLUGIN_SET_COLLECTION_E) || defined(PLUGIN_SET_COLLECTION_F) || defined(PLUGIN_SET_COLLECTION_G) || defined(PLUGIN_SET_COLLECTION_H)) #ifndef FEATURE_RTTTL #define FEATURE_RTTTL 1 #endif From da826cca805dc2ca2e53ad2b4b42ebfda4105940 Mon Sep 17 00:00:00 2001 From: Ton Huisman Date: Sun, 26 Oct 2025 09:53:56 +0100 Subject: [PATCH 413/564] [Build] Fix build errors for Collection H and Climate B --- src/src/CustomBuild/define_plugin_sets.h | 36 ++++++++++++++++++++++-- 1 file changed, 34 insertions(+), 2 deletions(-) diff --git a/src/src/CustomBuild/define_plugin_sets.h b/src/src/CustomBuild/define_plugin_sets.h index 80332169d..7061833d5 100644 --- a/src/src/CustomBuild/define_plugin_sets.h +++ b/src/src/CustomBuild/define_plugin_sets.h @@ -283,7 +283,7 @@ To create/register a plugin, you have to : #endif #ifdef PLUGIN_BUILD_COLLECTION - #if !defined(PLUGIN_BUILD_COLLECTION_B) && !defined(PLUGIN_BUILD_COLLECTION_C) && !defined(PLUGIN_BUILD_COLLECTION_D) && !defined(PLUGIN_BUILD_COLLECTION_E) && !defined(PLUGIN_BUILD_COLLECTION_F) && !defined(PLUGIN_BUILD_COLLECTION_G) + #if !defined(PLUGIN_BUILD_COLLECTION_B) && !defined(PLUGIN_BUILD_COLLECTION_C) && !defined(PLUGIN_BUILD_COLLECTION_D) && !defined(PLUGIN_BUILD_COLLECTION_E) && !defined(PLUGIN_BUILD_COLLECTION_F) && !defined(PLUGIN_BUILD_COLLECTION_G) && !defined(PLUGIN_BUILD_COLLECTION_H) #define PLUGIN_DESCR "Collection_A" #define PLUGIN_SET_COLLECTION_A #endif @@ -392,7 +392,39 @@ To create/register a plugin, you have to : #ifndef FEATURE_RULES_EASY_COLOR_CODE #define FEATURE_RULES_EASY_COLOR_CODE 1 #endif -#endif +#endif // ifdef PLUGIN_CLIMATE_A_COLLECTION + +#ifdef PLUGIN_CLIMATE_B_COLLECTION + #ifdef PLUGIN_BUILD_NORMAL + #undef PLUGIN_BUILD_NORMAL + #endif + #define PLUGIN_SET_NONE // Specifically configured below + #define CONTROLLER_SET_STABLE + #define NOTIFIER_SET_STABLE + #ifndef FEATURE_ESPEASY_P2P + #define FEATURE_ESPEASY_P2P 1 + #endif + #if defined(ESP8266) && !defined(LIMIT_BUILD_SIZE) + #define LIMIT_BUILD_SIZE + #endif + + #ifndef FEATURE_I2CMULTIPLEXER + #define FEATURE_I2CMULTIPLEXER 1 + #endif + #ifndef FEATURE_TRIGONOMETRIC_FUNCTIONS_RULES + #define FEATURE_TRIGONOMETRIC_FUNCTIONS_RULES 1 + #endif + #define KEEP_TRIGONOMETRIC_FUNCTIONS_RULES + #ifndef FEATURE_PLUGIN_STATS + #define FEATURE_PLUGIN_STATS 1 + #endif + #ifndef FEATURE_CHART_JS + #define FEATURE_CHART_JS 1 + #endif + #ifndef FEATURE_RULES_EASY_COLOR_CODE + #define FEATURE_RULES_EASY_COLOR_CODE 1 + #endif +#endif // ifdef PLUGIN_CLIMATE_B_COLLECTION #ifdef PLUGIN_BUILD_NORMAL #define PLUGIN_SET_STABLE From 84feba288e90ea733a8d9a29d6fd411bdba3aa55 Mon Sep 17 00:00:00 2001 From: TD-er Date: Sun, 26 Oct 2025 09:33:22 +0100 Subject: [PATCH 414/564] [ESP32P4] Disable USB HWCDC to fix ESPEasy console for ESP32P4 --- src/ESPEasy/net/_NW001_WiFi_STA.cpp | 4 ++-- src/ESPEasy/net/wifi/ESPEasyWifi.cpp | 4 ++-- src/ESPEasy/net/wifi/ESPEasyWifi.h | 4 ++-- src/src/CustomBuild/define_plugin_sets.h | 7 ++++++- src/src/Helpers/StringProvider.cpp | 8 ++++++-- 5 files changed, 18 insertions(+), 9 deletions(-) diff --git a/src/ESPEasy/net/_NW001_WiFi_STA.cpp b/src/ESPEasy/net/_NW001_WiFi_STA.cpp index d01c10dcd..659e32b93 100644 --- a/src/ESPEasy/net/_NW001_WiFi_STA.cpp +++ b/src/ESPEasy/net/_NW001_WiFi_STA.cpp @@ -280,7 +280,7 @@ bool NWPlugin_001(NWPlugin::Function function, EventStruct *event, String& strin } # endif // ifdef ESP8266 -#ifdef ESP32P4 +#ifdef BOARD_HAS_SDIO_ESP_HOSTED case NWPlugin::Function::NWPLUGIN_WEBFORM_SHOW_HW_ADDRESS: { @@ -367,7 +367,7 @@ bool NWPlugin_001(NWPlugin::Function function, EventStruct *event, String& strin case NWPlugin::Function::NWPLUGIN_WEBFORM_LOAD: { KeyValueWriter_WebForm writer(true); - #ifdef ESP32P4 + #ifdef BOARD_HAS_SDIO_ESP_HOSTED ESPEasy::net::wifi::write_WiFi_Hosted_MCU_info( writer.createChild(F("ESP-Hosted-MCU")).get()); #endif diff --git a/src/ESPEasy/net/wifi/ESPEasyWifi.cpp b/src/ESPEasy/net/wifi/ESPEasyWifi.cpp index 7d3d0f95c..e9fad9c8a 100644 --- a/src/ESPEasy/net/wifi/ESPEasyWifi.cpp +++ b/src/ESPEasy/net/wifi/ESPEasyWifi.cpp @@ -170,7 +170,7 @@ void exitWiFi() { ESPEasyWiFi.disable(); } void loopWiFi() { ESPEasyWiFi.loop(); } -# ifdef ESP32P4 +# ifdef BOARD_HAS_SDIO_ESP_HOSTED // ******************************************************************************** // ESP-Hosted-MCU @@ -293,7 +293,7 @@ bool write_WiFi_Hosted_MCU_info(KeyValueWriter*writer) return true; } -# endif // ifdef ESP32P4 +# endif // ******************************************************************************** diff --git a/src/ESPEasy/net/wifi/ESPEasyWifi.h b/src/ESPEasy/net/wifi/ESPEasyWifi.h index fad085e29..8408e0fc3 100644 --- a/src/ESPEasy/net/wifi/ESPEasyWifi.h +++ b/src/ESPEasy/net/wifi/ESPEasyWifi.h @@ -51,7 +51,7 @@ void initWiFi(); void exitWiFi(); void loopWiFi(); -# ifdef ESP32P4 +# ifdef BOARD_HAS_SDIO_ESP_HOSTED // ******************************************************************************** // ESP-Hosted-MCU @@ -73,7 +73,7 @@ void HostedMCUStatus(); bool write_WiFi_Hosted_MCU_info(KeyValueWriter*writer); -# endif // ifdef ESP32P4 +# endif # if FEATURE_SET_WIFI_TX_PWR void SetWiFiTXpower(); diff --git a/src/src/CustomBuild/define_plugin_sets.h b/src/src/CustomBuild/define_plugin_sets.h index bedbcb1f2..788b2bd63 100644 --- a/src/src/CustomBuild/define_plugin_sets.h +++ b/src/src/CustomBuild/define_plugin_sets.h @@ -3752,7 +3752,12 @@ To create/register a plugin, you have to : #if FEATURE_DEFINE_SERIAL_CONSOLE_PORT # if USES_HWCDC || USES_USBCDC -# define USES_ESPEASY_CONSOLE_FALLBACK_PORT 1 +# ifdef ESP32P4 +// FIXME TD-er: No idea why, but with fallback enabled, the P4 will not show anything on the serial console +# define USES_ESPEASY_CONSOLE_FALLBACK_PORT 0 +# else +# define USES_ESPEASY_CONSOLE_FALLBACK_PORT 1 +# endif # endif // if USES_HWCDC || USES_USBCDC # ifndef PLUGIN_USES_SERIAL // Needs Plugin_Helper_serial diff --git a/src/src/Helpers/StringProvider.cpp b/src/src/Helpers/StringProvider.cpp index 7a2b5dbc3..b85412878 100644 --- a/src/src/Helpers/StringProvider.cpp +++ b/src/src/Helpers/StringProvider.cpp @@ -524,7 +524,11 @@ KeyValueStruct getKeyValue(LabelType::Enum label, bool extendedValue) case LabelType::IP6_GLOBAL: if (Settings.EnableIPv6()) { - return KeyValueStruct(F("IPv6 global"), formatIP(ESPEasy::net::NetworkGlobalIP6())); + auto ip = ESPEasy::net::NetworkGlobalIP6(); + + if (ip != IN6ADDR_ANY) { + return KeyValueStruct(F("IPv6 global"), formatIP(ip)); + } } break; @@ -1203,7 +1207,7 @@ String getValue(LabelType::Enum label) { String getEthSpeed() { if (ESPEasy::net::EthLinkUp()) { - return strformat(F("%d [Mbps]"), ESPEasy::net::EthLinkSpeed()); + return String(ESPEasy::net::EthLinkSpeed()); } return getValue(LabelType::ETH_STATE); } From 7cab77c5e5bd792546f38f145c3ad18ee48ad0cc Mon Sep 17 00:00:00 2001 From: TD-er Date: Sun, 26 Oct 2025 11:41:42 +0100 Subject: [PATCH 415/564] [ESP-Hosted] Show more info on ESP-Hosted-MCU WiFi (ESP32-P4) --- src/ESPEasy/net/_NW001_WiFi_STA.cpp | 70 ++++++++++++++-------------- src/ESPEasy/net/wifi/ESPEasyWifi.cpp | 61 +++++++++++++++++++++++- src/ESPEasy/net/wifi/ESPEasyWifi.h | 1 + src/src/WebServer/NetworkPage.cpp | 24 +++------- 4 files changed, 103 insertions(+), 53 deletions(-) diff --git a/src/ESPEasy/net/_NW001_WiFi_STA.cpp b/src/ESPEasy/net/_NW001_WiFi_STA.cpp index 659e32b93..1ddcb5a40 100644 --- a/src/ESPEasy/net/_NW001_WiFi_STA.cpp +++ b/src/ESPEasy/net/_NW001_WiFi_STA.cpp @@ -33,9 +33,9 @@ # include "../net/NWPluginStructs/NW001_data_struct_WiFi_STA.h" # include "../net/wifi/ESPEasyWifi.h" -#if FEATURE_STORE_CREDENTIALS_SEPARATE_FILE -# include "../../src/WebServer/SecurityStruct_deviceSpecific_webform.h" -#endif +# if FEATURE_STORE_CREDENTIALS_SEPARATE_FILE +# include "../../src/WebServer/SecurityStruct_deviceSpecific_webform.h" +# endif # ifdef ESP8266 @@ -61,13 +61,14 @@ bool NWPlugin_001(NWPlugin::Function function, EventStruct *event, String& strin NetworkDriverStruct& nw = getNetworkDriverStruct(networkDriverIndex_t::toNetworkDriverIndex(event->idx)); nw.onlySingleInstance = true; nw.alwaysPresent = true; -#ifdef ESP32P4 +# ifdef ESP32P4 nw.enabledOnFactoryReset = false; -// ESPEasy::net::wifi::GetHostedMCUFwVersion() > 0x00020600; -#else + + // ESPEasy::net::wifi::GetHostedMCUFwVersion() > 0x00020600; +# else // ifdef ESP32P4 nw.enabledOnFactoryReset = true; -#endif - nw.fixedNetworkIndex = NWPLUGIN_ID_001 - 1; // Start counting at 0 +# endif // ifdef ESP32P4 + nw.fixedNetworkIndex = NWPLUGIN_ID_001 - 1; // Start counting at 0 break; } @@ -146,9 +147,9 @@ bool NWPlugin_001(NWPlugin::Function function, EventStruct *event, String& strin KeyValueStruct kv( F("Band"), (WiFi.channel() < 36) ? F("2.4") : F("5")); -#if FEATURE_TASKVALUE_UNIT_OF_MEASURE +# if FEATURE_TASKVALUE_UNIT_OF_MEASURE kv.setUnit(UOM_GHz); -#endif +# endif event->kvWriter->write(kv); } # endif // if CONFIG_SOC_WIFI_SUPPORT_5G @@ -160,9 +161,9 @@ bool NWPlugin_001(NWPlugin::Function function, EventStruct *event, String& strin strformat( event->kvWriter->summaryValueOnly() ? F("RSSI: %d dBm") : F("%d"), WiFi.RSSI())); -#if FEATURE_TASKVALUE_UNIT_OF_MEASURE - kv.setUnit(UOM_dBm); -#endif +# if FEATURE_TASKVALUE_UNIT_OF_MEASURE + kv.setUnit(UOM_dBm); +# endif event->kvWriter->write(kv); } @@ -172,13 +173,13 @@ bool NWPlugin_001(NWPlugin::Function function, EventStruct *event, String& strin KeyValueStruct kv( F("WiFi TX Power"), ESPEasy::net::wifi::GetWiFiTXpower(), 2); -#if FEATURE_TASKVALUE_UNIT_OF_MEASURE +# if FEATURE_TASKVALUE_UNIT_OF_MEASURE kv.setUnit(UOM_dBm); -#endif +# endif event->kvWriter->write(kv); } -#endif +# endif // if FEATURE_SET_WIFI_TX_PWR event->kvWriter->write({ F("Last Disconnect Reason"), getWiFi_disconnectReason_str() @@ -199,15 +200,15 @@ bool NWPlugin_001(NWPlugin::Function function, EventStruct *event, String& strin secondsToDayHourMinuteSecond(micros_to_sec_usec(tsf_time, tsf_usec)), strformat(F(".%06u"), tsf_usec)) ); -#if FEATURE_TASKVALUE_UNIT_OF_MEASURE +# if FEATURE_TASKVALUE_UNIT_OF_MEASURE kv.setUnit(UOM_usec); -#endif +# endif event->kvWriter->write(kv); } } # endif // ifdef ESP32 } -#ifndef LIMIT_BUILD_SIZE +# ifndef LIMIT_BUILD_SIZE event->kvWriter->write({ F("BSSID"), STA_BSSID_STR, @@ -226,7 +227,7 @@ bool NWPlugin_001(NWPlugin::Function function, EventStruct *event, String& strin F("Encryption Type"), NW_data->getWiFi_encryptionType() }); } -#endif +# endif // ifndef LIMIT_BUILD_SIZE } break; @@ -241,7 +242,7 @@ bool NWPlugin_001(NWPlugin::Function function, EventStruct *event, String& strin } break; } - + case NWPlugin::Function::NWPLUGIN_WEBFORM_SHOW_HW_ADDRESS: { @@ -280,7 +281,7 @@ bool NWPlugin_001(NWPlugin::Function function, EventStruct *event, String& strin } # endif // ifdef ESP8266 -#ifdef BOARD_HAS_SDIO_ESP_HOSTED +# ifdef BOARD_HAS_SDIO_ESP_HOSTED case NWPlugin::Function::NWPLUGIN_WEBFORM_SHOW_HW_ADDRESS: { @@ -293,12 +294,12 @@ bool NWPlugin_001(NWPlugin::Function function, EventStruct *event, String& strin case NWPlugin::Function::NWPLUGIN_WEBFORM_SHOW_PORT: { if (event->kvWriter) { - // See HostedMCUStatus + success = ESPEasy::net::wifi::write_WiFi_Hosted_MCU_pins(event->kvWriter); } break; } -#endif +# endif // ifdef BOARD_HAS_SDIO_ESP_HOSTED case NWPlugin::Function::NWPLUGIN_WEBFORM_SAVE: { // SSID 1 @@ -309,14 +310,15 @@ bool NWPlugin_001(NWPlugin::Function function, EventStruct *event, String& strin strncpy_webserver_arg(SecuritySettings.WifiSSID2, F("ssid2")); copyFormPassword(F("key2"), SecuritySettings.WifiKey2, sizeof(SecuritySettings.WifiKey2)); -#if FEATURE_STORE_CREDENTIALS_SEPARATE_FILE +# if FEATURE_STORE_CREDENTIALS_SEPARATE_FILE + for (uint16_t i = 0; i < MAX_EXTRA_WIFI_CREDENTIALS_SEPARATE_FILE; ++i) { store_SecurityStruct_deviceSpecific_WebFormItem( SecurityStruct_deviceSpecific::KeyType::WiFi_SSID, i); store_SecurityStruct_deviceSpecific_WebFormItem( - SecurityStruct_deviceSpecific::KeyType::WiFi_Password, i); + SecurityStruct_deviceSpecific::KeyType::WiFi_Password, i); } -#endif +# endif // if FEATURE_STORE_CREDENTIALS_SEPARATE_FILE // Hidden SSID Settings.IncludeHiddenSSID(isFormItemChecked(LabelType::CONNECT_HIDDEN_SSID)); @@ -367,10 +369,9 @@ bool NWPlugin_001(NWPlugin::Function function, EventStruct *event, String& strin case NWPlugin::Function::NWPLUGIN_WEBFORM_LOAD: { KeyValueWriter_WebForm writer(true); - #ifdef BOARD_HAS_SDIO_ESP_HOSTED - ESPEasy::net::wifi::write_WiFi_Hosted_MCU_info( - writer.createChild(F("ESP-Hosted-MCU")).get()); - #endif + # ifdef BOARD_HAS_SDIO_ESP_HOSTED + ESPEasy::net::wifi::write_WiFi_Hosted_MCU_info(writer.createChild(F("ESP-Hosted-MCU")).get()); + # endif // ifdef BOARD_HAS_SDIO_ESP_HOSTED addFormSubHeader(F("Wifi Credentials")); @@ -384,16 +385,17 @@ bool NWPlugin_001(NWPlugin::Function function, EventStruct *event, String& strin addFormPasswordBox(F("Fallback WPA Key"), F("key2"), SecuritySettings.WifiKey2, 63); addFormNote(F("WPA Key must be at least 8 characters long")); -#if FEATURE_STORE_CREDENTIALS_SEPARATE_FILE +# if FEATURE_STORE_CREDENTIALS_SEPARATE_FILE addFormSubHeader(F("Wifi Credentials Extra")); + for (uint16_t i = 0; i < MAX_EXTRA_WIFI_CREDENTIALS_SEPARATE_FILE; ++i) { show_SecurityStruct_deviceSpecific_WebFormItem( SecurityStruct_deviceSpecific::KeyType::WiFi_SSID, i); show_SecurityStruct_deviceSpecific_WebFormItem( - SecurityStruct_deviceSpecific::KeyType::WiFi_Password, i); + SecurityStruct_deviceSpecific::KeyType::WiFi_Password, i); } addFormNote(F("These credentials will be stored in a separate file: devsecurity.dat")); -#endif +# endif // if FEATURE_STORE_CREDENTIALS_SEPARATE_FILE addFormSubHeader(F("Wifi Settings")); addFormCheckBox(LabelType::CONNECT_HIDDEN_SSID, Settings.IncludeHiddenSSID()); diff --git a/src/ESPEasy/net/wifi/ESPEasyWifi.cpp b/src/ESPEasy/net/wifi/ESPEasyWifi.cpp index e9fad9c8a..c9a2c8a04 100644 --- a/src/ESPEasy/net/wifi/ESPEasyWifi.cpp +++ b/src/ESPEasy/net/wifi/ESPEasyWifi.cpp @@ -15,6 +15,7 @@ # include "../../../src/Globals/Settings.h" # include "../Globals/WiFi_AP_Candidates.h" # include "../../../src/Helpers/ESPEasy_time_calc.h" +# include "../../../src/Helpers/ESPEasy_UnitOfMeasure.h" # include "../../../src/Helpers/Hardware_defines.h" # include "../../../src/Helpers/Misc.h" # include "../../../src/Helpers/Networking.h" @@ -271,6 +272,64 @@ void HostedMCUStatus() } } +bool write_WiFi_Hosted_MCU_pins(KeyValueWriter*writer) +{ + if (!esp_hosted_is_config_valid()) { return false; } + struct esp_hosted_transport_config *pconfig; + + if (ESP_TRANSPORT_OK != esp_hosted_transport_get_config(&pconfig)) { return false; } + + switch (pconfig->transport_in_use) + { + case H_TRANSPORT_NONE: + case H_TRANSPORT_SPI_HD: + case H_TRANSPORT_SPI: + case H_TRANSPORT_UART: + break; + case H_TRANSPORT_SDIO: + { + struct esp_hosted_sdio_config *psdio_config; + + if (ESP_TRANSPORT_OK == esp_hosted_sdio_get_config(&psdio_config)) { + if (writer->summaryValueOnly()) { + KeyValueStruct kv(EMPTY_STRING); + + kv.appendValue(concat(F("CLK: "), psdio_config->pin_clk.pin)); + kv.appendValue(concat(F("CMD: "), psdio_config->pin_cmd.pin)); + kv.appendValue(concat(F("RST: "), psdio_config->pin_reset.pin)); + kv.appendValue(strformat( + F("D0..3: %d/%d/%d/%d"), + psdio_config->pin_d0.pin, + psdio_config->pin_d1.pin, + psdio_config->pin_d2.pin, + psdio_config->pin_d3.pin + )); + + writer->write(kv); + } else { + KeyValueStruct freq(F("SDIO Freq"), psdio_config->clock_freq_khz / 1000); + freq.setUnit(UOM_MHz); + writer->write(freq); + writer->write({ F("SDIO D0"), psdio_config->pin_d0.pin }); + writer->write({ F("SDIO D1"), psdio_config->pin_d1.pin }); + writer->write({ F("SDIO D2"), psdio_config->pin_d2.pin }); + writer->write({ F("SDIO D3"), psdio_config->pin_d3.pin }); + writer->write({ F("SDIO CLK"), psdio_config->pin_clk.pin }); + writer->write({ F("SDIO CMD"), psdio_config->pin_cmd.pin }); + writer->write({ F("SDIO RST"), psdio_config->pin_reset.pin }); + // Hide TX/RX queue size for now as it is unclear what these mean + //writer->write({ F("SDIO TX queue"), psdio_config->tx_queue_size }); + //writer->write({ F("SDIO RX queue"), psdio_config->rx_queue_size }); + } + return true; + } + break; + } + + } + return false; +} + bool write_WiFi_Hosted_MCU_info(KeyValueWriter*writer) { if (writer == nullptr) { return false; } @@ -293,7 +352,7 @@ bool write_WiFi_Hosted_MCU_info(KeyValueWriter*writer) return true; } -# endif +# endif // ifdef BOARD_HAS_SDIO_ESP_HOSTED // ******************************************************************************** diff --git a/src/ESPEasy/net/wifi/ESPEasyWifi.h b/src/ESPEasy/net/wifi/ESPEasyWifi.h index 8408e0fc3..def0dfb99 100644 --- a/src/ESPEasy/net/wifi/ESPEasyWifi.h +++ b/src/ESPEasy/net/wifi/ESPEasyWifi.h @@ -71,6 +71,7 @@ String GetHostedFwVersion(EspHostTypes hostType); String GetHostedMCU(); void HostedMCUStatus(); +bool write_WiFi_Hosted_MCU_pins(KeyValueWriter*writer); bool write_WiFi_Hosted_MCU_info(KeyValueWriter*writer); # endif diff --git a/src/src/WebServer/NetworkPage.cpp b/src/src/WebServer/NetworkPage.cpp index 936f3b9f7..09060c30d 100644 --- a/src/src/WebServer/NetworkPage.cpp +++ b/src/src/WebServer/NetworkPage.cpp @@ -389,24 +389,12 @@ void handle_networks_NetworkSettingsPage(ESPEasy::net::networkIndex_t networkind if (NWPluginCall(NWPlugin::Function::NWPLUGIN_GET_INTERFACE, &TempEvent, str)) { - { - KeyValueWriter_WebForm writer(F("Network Interface")); - ESPEasy::net::write_NetworkAdapterFlags(networkindex, writer.createChild().get()); - } -/* - { - KeyValueWriter_WebForm writer(F("Port")); - ESPEasy::net::write_NetworkAdapterPort(networkindex, writer.createChild().get()); - } -*/ - { - KeyValueWriter_WebForm writer(F("IP Config")); - ESPEasy::net::write_IP_config(networkindex, writer.createChild().get()); - } - { - KeyValueWriter_WebForm writer(F("Connection Information")); - ESPEasy::net::write_NetworkConnectionInfo(networkindex, writer.createChild().get()); - } + KeyValueWriter_WebForm writer(true); + + ESPEasy::net::write_NetworkAdapterFlags(networkindex, writer.createChild(F("Network Interface")).get()); + ESPEasy::net::write_NetworkAdapterPort(networkindex, writer.createChild(F("Port")).get()); + ESPEasy::net::write_IP_config(networkindex, writer.createChild(F("IP Config")).get()); + ESPEasy::net::write_NetworkConnectionInfo(networkindex, writer.createChild(F("Connection Information")).get()); } # endif // ifdef ESP32 From 2dc1b8f5408c3cc3bda7a5f0accc949b045d1991 Mon Sep 17 00:00:00 2001 From: TD-er Date: Sun, 26 Oct 2025 11:52:29 +0100 Subject: [PATCH 416/564] [ESP-Hosted] Make sure hostname is set on ESP-Hosted-MCU before DHCP --- src/ESPEasy/net/wifi/ESPEasyWiFi_STA_Event_ESP32.cpp | 1 + 1 file changed, 1 insertion(+) diff --git a/src/ESPEasy/net/wifi/ESPEasyWiFi_STA_Event_ESP32.cpp b/src/ESPEasy/net/wifi/ESPEasyWiFi_STA_Event_ESP32.cpp index 45bb3d6ca..a60612d66 100644 --- a/src/ESPEasy/net/wifi/ESPEasyWiFi_STA_Event_ESP32.cpp +++ b/src/ESPEasy/net/wifi/ESPEasyWiFi_STA_Event_ESP32.cpp @@ -118,6 +118,7 @@ void ESPEasyWiFi_STA_EventHandler::WiFiEvent(WiFiEvent_t event_id, arduino_event addLog(LOG_LEVEL_INFO, F("SCAN_DONE")); break; case ARDUINO_EVENT_WIFI_STA_START: + WiFi.STA.setHostname(NetworkCreateRFCCompliantHostname().c_str()); clear_wifi_event_sta_connected = true; stats_and_cache.mark_start(); break; From ddb0afc4cd84149334ec195631a98eb4752e4579 Mon Sep 17 00:00:00 2001 From: TD-er Date: Sun, 26 Oct 2025 14:40:18 +0100 Subject: [PATCH 417/564] [IPv6] Add option to enable/disable IPv6 per network adapter --- .../net/DataStructs/NWPluginData_base.cpp | 11 +++-- .../net/DataStructs/NWPluginData_base.h | 2 +- .../NWPluginData_static_runtime.cpp | 3 ++ .../DataStructs/NWPluginData_static_runtime.h | 4 ++ .../NWPluginData_static_runtime_ESP32.cpp | 8 ++++ .../NW003_data_struct_ETH_RMII.cpp | 1 - .../NW004_data_struct_ETH_SPI.cpp | 1 - .../net/wifi/ESPEasyWiFi_STA_Event_ESP32.cpp | 1 - src/src/DataStructs/SettingsStruct.h | 31 +++++--------- src/src/DataStructs_templ/SettingsStruct.cpp | 42 +++++++++++++++++++ src/src/WebServer/NetworkPage.cpp | 10 +++++ 11 files changed, 86 insertions(+), 28 deletions(-) diff --git a/src/ESPEasy/net/DataStructs/NWPluginData_base.cpp b/src/ESPEasy/net/DataStructs/NWPluginData_base.cpp index dc369e9ac..645ec1170 100644 --- a/src/ESPEasy/net/DataStructs/NWPluginData_base.cpp +++ b/src/ESPEasy/net/DataStructs/NWPluginData_base.cpp @@ -313,11 +313,13 @@ bool NWPluginData_base::handle_priority_route_changed() bool res{}; if ((_netif != nullptr) && _netif->isDefault()) { - if (NWPlugin::forceDHCP_request(_netif)) { return true; } - auto cache = getNWPluginData_static_runtime(); - if (!cache) { return res; } + if (!cache) { + if (NWPlugin::forceDHCP_request(_netif)) { + return true; + } + } // Check to see if we may need to restore any cached DNS server for (size_t i = 0; i < NR_ELEMENTS(cache->_dns_cache); ++i) { @@ -383,7 +385,7 @@ PluginStats * NWPluginData_base::getPluginStats(networkStatsVarIndex_t networkSt #endif // if FEATURE_NETWORK_STATS #ifdef ESP32 - +/* bool NWPluginData_base::_restore_DNS_cache() { bool res{}; @@ -415,6 +417,7 @@ bool NWPluginData_base::_restore_DNS_cache() } return res; } + */ #endif // ifdef ESP32 diff --git a/src/ESPEasy/net/DataStructs/NWPluginData_base.h b/src/ESPEasy/net/DataStructs/NWPluginData_base.h index f269c173e..5988c1563 100644 --- a/src/ESPEasy/net/DataStructs/NWPluginData_base.h +++ b/src/ESPEasy/net/DataStructs/NWPluginData_base.h @@ -134,7 +134,7 @@ protected: protected: #ifdef ESP32 - bool _restore_DNS_cache(); +// bool _restore_DNS_cache(); #endif #if FEATURE_STORE_NETWORK_INTERFACE_SETTINGS diff --git a/src/ESPEasy/net/DataStructs/NWPluginData_static_runtime.cpp b/src/ESPEasy/net/DataStructs/NWPluginData_static_runtime.cpp index 67fdba313..a6ad52a87 100644 --- a/src/ESPEasy/net/DataStructs/NWPluginData_static_runtime.cpp +++ b/src/ESPEasy/net/DataStructs/NWPluginData_static_runtime.cpp @@ -114,6 +114,9 @@ void NWPluginData_static_runtime::clear(networkIndex_t networkIndex) } } #endif // ifdef ESP32 +# if FEATURE_USE_IPV6 + _enableIPv6 = Settings.EnableIPv6() && Settings.getNetworkEnabled_IPv6(_networkIndex); +#endif _connectionFailures = 0; diff --git a/src/ESPEasy/net/DataStructs/NWPluginData_static_runtime.h b/src/ESPEasy/net/DataStructs/NWPluginData_static_runtime.h index e25335cb8..bc3dc9e5b 100644 --- a/src/ESPEasy/net/DataStructs/NWPluginData_static_runtime.h +++ b/src/ESPEasy/net/DataStructs/NWPluginData_static_runtime.h @@ -151,6 +151,10 @@ struct NWPluginData_static_runtime { int _route_prio = -1; #endif // ifdef ESP32 +# if FEATURE_USE_IPV6 + bool _enableIPv6{}; +#endif + private: #ifdef ESP32 diff --git a/src/ESPEasy/net/DataStructs/NWPluginData_static_runtime_ESP32.cpp b/src/ESPEasy/net/DataStructs/NWPluginData_static_runtime_ESP32.cpp index 7ae16ca1d..3997486c3 100644 --- a/src/ESPEasy/net/DataStructs/NWPluginData_static_runtime_ESP32.cpp +++ b/src/ESPEasy/net/DataStructs/NWPluginData_static_runtime_ESP32.cpp @@ -2,6 +2,8 @@ #ifdef ESP32 +#include "../ESPEasyNetwork.h" + # include "../../../src/Helpers/StringConverter.h" # include "../Globals/NetworkState.h" @@ -79,6 +81,12 @@ void NWPluginData_static_runtime::mark_start() _startStopStats.setOn(); if (!_netif) { return; } + + _netif->setHostname(NetworkCreateRFCCompliantHostname().c_str()); +#if FEATURE_USE_IPV6 + _netif->enableIPv6(_enableIPv6); +#endif + # if ESP_IDF_VERSION >= ESP_IDF_VERSION_VAL(5, 5, 0) if (_route_prio > 0) { diff --git a/src/ESPEasy/net/NWPluginStructs/NW003_data_struct_ETH_RMII.cpp b/src/ESPEasy/net/NWPluginStructs/NW003_data_struct_ETH_RMII.cpp index c349ccbf2..0bdb859f7 100644 --- a/src/ESPEasy/net/NWPluginStructs/NW003_data_struct_ETH_RMII.cpp +++ b/src/ESPEasy/net/NWPluginStructs/NW003_data_struct_ETH_RMII.cpp @@ -69,7 +69,6 @@ void NW003_data_struct_ETH_RMII::onEvent(arduino_event_ switch (event) { case ARDUINO_EVENT_ETH_START: - ETH.setHostname(NetworkCreateRFCCompliantHostname().c_str()); stats_and_cache.mark_start(); break; case ARDUINO_EVENT_ETH_STOP: diff --git a/src/ESPEasy/net/NWPluginStructs/NW004_data_struct_ETH_SPI.cpp b/src/ESPEasy/net/NWPluginStructs/NW004_data_struct_ETH_SPI.cpp index 5dac56b90..d66cac3b2 100644 --- a/src/ESPEasy/net/NWPluginStructs/NW004_data_struct_ETH_SPI.cpp +++ b/src/ESPEasy/net/NWPluginStructs/NW004_data_struct_ETH_SPI.cpp @@ -70,7 +70,6 @@ void NW004_data_struct_ETH_SPI::onEvent(arduino_event_i switch (event) { case ARDUINO_EVENT_ETH_START: - ETH.setHostname(NetworkCreateRFCCompliantHostname().c_str()); stats_and_cache.mark_start(); break; case ARDUINO_EVENT_ETH_STOP: diff --git a/src/ESPEasy/net/wifi/ESPEasyWiFi_STA_Event_ESP32.cpp b/src/ESPEasy/net/wifi/ESPEasyWiFi_STA_Event_ESP32.cpp index a60612d66..45bb3d6ca 100644 --- a/src/ESPEasy/net/wifi/ESPEasyWiFi_STA_Event_ESP32.cpp +++ b/src/ESPEasy/net/wifi/ESPEasyWiFi_STA_Event_ESP32.cpp @@ -118,7 +118,6 @@ void ESPEasyWiFi_STA_EventHandler::WiFiEvent(WiFiEvent_t event_id, arduino_event addLog(LOG_LEVEL_INFO, F("SCAN_DONE")); break; case ARDUINO_EVENT_WIFI_STA_START: - WiFi.STA.setHostname(NetworkCreateRFCCompliantHostname().c_str()); clear_wifi_event_sta_connected = true; stats_and_cache.mark_start(); break; diff --git a/src/src/DataStructs/SettingsStruct.h b/src/src/DataStructs/SettingsStruct.h index a21597436..b8fafe209 100644 --- a/src/src/DataStructs/SettingsStruct.h +++ b/src/src/DataStructs/SettingsStruct.h @@ -419,28 +419,19 @@ public: memcpy(&VariousBits_2, &value, sizeof(VariousBits_2)); } - bool getNetworkEnabled(ESPEasy::net::networkIndex_t index) const { - //if (index == 1) return true; - if (validNetworkIndex(index)) return bitRead(NetworkEnabled_bits, index); - return false; - } + bool getNetworkEnabled(ESPEasy::net::networkIndex_t index) const; - void setNetworkEnabled(ESPEasy::net::networkIndex_t index, bool enabled) { - if (validNetworkIndex(index)) { - bitWrite(NetworkEnabled_bits, index, enabled); - } - } + void setNetworkEnabled(ESPEasy::net::networkIndex_t index, bool enabled); - bool getNetworkInterfaceSubnetBlockClientIP(ESPEasy::net::networkIndex_t index) const { - if (validNetworkIndex(index)) return bitRead(NetworkInterfaceSubnetBlockClientIP_bits, index); - return false; - } + bool getNetworkInterfaceSubnetBlockClientIP(ESPEasy::net::networkIndex_t index) const; - void setNetworkInterfaceSubnetBlockClientIP(ESPEasy::net::networkIndex_t index, bool enabled) { - if (validNetworkIndex(index)) { - bitWrite(NetworkInterfaceSubnetBlockClientIP_bits, index, enabled); - } - } + void setNetworkInterfaceSubnetBlockClientIP(ESPEasy::net::networkIndex_t index, bool enabled); + +#if FEATURE_USE_IPV6 + bool getNetworkEnabled_IPv6(ESPEasy::net::networkIndex_t index) const; + + void setNetworkEnabled_IPv6(ESPEasy::net::networkIndex_t index, bool enabled); +#endif ESPEasy::net::nwpluginID_t getNWPluginID_for_network(ESPEasy::net::networkIndex_t index) const; @@ -700,7 +691,7 @@ public: uint8_t NWPluginID[NETWORK_MAX] = {0}; uint8_t NetworkEnabled_bits{}; uint8_t NetworkInterfaceSubnetBlockClientIP_bits{}; // Client IP Block Level. Allow from subnet of this interface - uint8_t NetworkUnused_2{}; + uint8_t NetworkEnabled_ipv6_bits{}; // Whether or not to use IPv6 for the given interface (Settings.EnableIPv6() is the global on/off for IPv6) uint8_t NetworkUnused_3{}; #ifdef ESP32 uint8_t NetworkRoutePrio[NETWORK_MAX] = {0}; diff --git a/src/src/DataStructs_templ/SettingsStruct.cpp b/src/src/DataStructs_templ/SettingsStruct.cpp index 90d83daa8..f6ba2de02 100644 --- a/src/src/DataStructs_templ/SettingsStruct.cpp +++ b/src/src/DataStructs_templ/SettingsStruct.cpp @@ -1368,6 +1368,48 @@ void SettingsStruct_tmpl::setNWPluginID_for_network(ESPEasy::net::netwo } } +template +bool SettingsStruct_tmpl::getNetworkEnabled(ESPEasy::net::networkIndex_t index) const { + //if (index == 1) return true; + if (validNetworkIndex(index)) return bitRead(NetworkEnabled_bits, index); + return false; +} + +template +void SettingsStruct_tmpl::setNetworkEnabled(ESPEasy::net::networkIndex_t index, bool enabled) { + if (validNetworkIndex(index)) { + bitWrite(NetworkEnabled_bits, index, enabled); + } +} + +template +bool SettingsStruct_tmpl::getNetworkInterfaceSubnetBlockClientIP(ESPEasy::net::networkIndex_t index) const { + if (validNetworkIndex(index)) return bitRead(NetworkInterfaceSubnetBlockClientIP_bits, index); + return false; +} + +template +void SettingsStruct_tmpl::setNetworkInterfaceSubnetBlockClientIP(ESPEasy::net::networkIndex_t index, bool enabled) { + if (validNetworkIndex(index)) { + bitWrite(NetworkInterfaceSubnetBlockClientIP_bits, index, enabled); + } +} + +#if FEATURE_USE_IPV6 +template +bool SettingsStruct_tmpl::getNetworkEnabled_IPv6(ESPEasy::net::networkIndex_t index) const { + //if (index == 1) return true; + if (validNetworkIndex(index)) return bitRead(NetworkEnabled_ipv6_bits, index); + return false; +} + +template +void SettingsStruct_tmpl::setNetworkEnabled_IPv6(ESPEasy::net::networkIndex_t index, bool enabled) { + if (validNetworkIndex(index)) { + bitWrite(NetworkEnabled_ipv6_bits, index, enabled); + } +} +#endif #ifdef ESP32 diff --git a/src/src/WebServer/NetworkPage.cpp b/src/src/WebServer/NetworkPage.cpp index 09060c30d..e6c7f05d6 100644 --- a/src/src/WebServer/NetworkPage.cpp +++ b/src/src/WebServer/NetworkPage.cpp @@ -162,6 +162,9 @@ void handle_networks_CopySubmittedSettings_NWPluginCall(ESPEasy::net::networkInd Settings.setRoutePrio_for_network(networkindex, getFormItemInt(F("routeprio"), 0)); Settings.setNetworkInterfaceSubnetBlockClientIP(networkindex, isFormItemChecked(F("block_web_access"))); # endif // ifdef ESP32 +# if FEATURE_USE_IPV6 + Settings.setNetworkEnabled_IPv6(networkindex, isFormItemChecked(F("en_ipv6"))); +#endif Settings.setNetworkInterfaceStartupDelayAtBoot(networkindex, getFormItemInt(F("delay_start"))); String dummy; NWPluginCall(NWPlugin::Function::NWPLUGIN_WEBFORM_SAVE, &TempEvent, dummy); @@ -348,6 +351,13 @@ void handle_networks_NetworkSettingsPage(ESPEasy::net::networkIndex_t networkind addFormNumericBox(F("Delay Startup At Boot"), F("delay_start"), Settings.getNetworkInterfaceStartupDelayAtBoot(networkindex), 0, 60000); addUnit(F("ms")); +#if FEATURE_USE_IPV6 + addFormCheckBox(F("Enable IPv6"), F("en_ipv6"), Settings.getNetworkEnabled_IPv6(networkindex)); + if (!Settings.EnableIPv6()) { + addFormNote(F("IPv6 is disabled on tools->Advanced page")); + } +#endif + String str; NWPluginCall(NWPlugin::Function::NWPLUGIN_WEBFORM_LOAD, &TempEvent, str); From 058ea2ad7f637acf9ee3d11ef7d577c89c9c26e1 Mon Sep 17 00:00:00 2001 From: Ton Huisman Date: Sun, 26 Oct 2025 17:01:57 +0100 Subject: [PATCH 418/564] [Build] Remove obsolete comments --- src/src/CustomBuild/define_plugin_sets.h | 24 ------------------------ 1 file changed, 24 deletions(-) diff --git a/src/src/CustomBuild/define_plugin_sets.h b/src/src/CustomBuild/define_plugin_sets.h index 7061833d5..ee9aef40d 100644 --- a/src/src/CustomBuild/define_plugin_sets.h +++ b/src/src/CustomBuild/define_plugin_sets.h @@ -964,9 +964,6 @@ To create/register a plugin, you have to : #define CONTROLLER_SET_COLLECTION #define NOTIFIER_SET_STABLE #define PLUGIN_SET_STABLE // add stable - // See also PLUGIN_SET_COLLECTION_ESP32 section at end, - // where incompatible plugins will be disabled. - // TODO : Check compatibility of plugins for ESP32 board. #endif #ifdef PLUGIN_SET_COLLECTION_B_ESP32 @@ -995,9 +992,6 @@ To create/register a plugin, you have to : #define CONTROLLER_SET_COLLECTION #define NOTIFIER_SET_STABLE #define PLUGIN_SET_STABLE // add stable - // See also PLUGIN_SET_COLLECTION_ESP32 section at end, - // where incompatible plugins will be disabled. - // TODO : Check compatibility of plugins for ESP32 board. #endif #ifdef PLUGIN_SET_COLLECTION_C_ESP32 @@ -1026,9 +1020,6 @@ To create/register a plugin, you have to : #define CONTROLLER_SET_COLLECTION #define NOTIFIER_SET_STABLE #define PLUGIN_SET_STABLE // add stable - // See also PLUGIN_SET_COLLECTION_ESP32 section at end, - // where incompatible plugins will be disabled. - // TODO : Check compatibility of plugins for ESP32 board. #endif #ifdef PLUGIN_SET_COLLECTION_D_ESP32 @@ -1057,9 +1048,6 @@ To create/register a plugin, you have to : #define CONTROLLER_SET_COLLECTION #define NOTIFIER_SET_STABLE #define PLUGIN_SET_STABLE // add stable - // See also PLUGIN_SET_COLLECTION_ESP32 section at end, - // where incompatible plugins will be disabled. - // TODO : Check compatibility of plugins for ESP32 board. #endif #ifdef PLUGIN_SET_COLLECTION_E_ESP32 @@ -1088,9 +1076,6 @@ To create/register a plugin, you have to : #define CONTROLLER_SET_COLLECTION #define NOTIFIER_SET_STABLE #define PLUGIN_SET_STABLE // add stable - // See also PLUGIN_SET_COLLECTION_ESP32 section at end, - // where incompatible plugins will be disabled. - // TODO : Check compatibility of plugins for ESP32 board. #endif #ifdef PLUGIN_SET_COLLECTION_F_ESP32 @@ -1119,9 +1104,6 @@ To create/register a plugin, you have to : #define CONTROLLER_SET_COLLECTION #define NOTIFIER_SET_STABLE #define PLUGIN_SET_STABLE // add stable - // See also PLUGIN_SET_COLLECTION_ESP32 section at end, - // where incompatible plugins will be disabled. - // TODO : Check compatibility of plugins for ESP32 board. #endif #ifdef PLUGIN_SET_COLLECTION_G_ESP32 @@ -1150,9 +1132,6 @@ To create/register a plugin, you have to : #define CONTROLLER_SET_COLLECTION #define NOTIFIER_SET_STABLE #define PLUGIN_SET_STABLE // add stable - // See also PLUGIN_SET_COLLECTION_ESP32 section at end, - // where incompatible plugins will be disabled. - // TODO : Check compatibility of plugins for ESP32 board. #endif #ifdef PLUGIN_SET_COLLECTION_H_ESP32 @@ -1181,9 +1160,6 @@ To create/register a plugin, you have to : #define CONTROLLER_SET_COLLECTION #define NOTIFIER_SET_STABLE #define PLUGIN_SET_STABLE // add stable - // See also PLUGIN_SET_COLLECTION_ESP32 section at end, - // where incompatible plugins will be disabled. - // TODO : Check compatibility of plugins for ESP32 board. #endif #ifdef PLUGIN_BUILD_MAX_ESP32 From 497121b2629beaeb2676f493ca78de8d2e14fcdc Mon Sep 17 00:00:00 2001 From: Ton Huisman Date: Sun, 26 Oct 2025 17:04:37 +0100 Subject: [PATCH 419/564] [Build] Move more plugins from Collection G to H to make Collection G fit --- docs/source/Plugin/_plugin_substitutions_p17x.repl | 4 ++-- src/src/CustomBuild/define_plugin_sets.h | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/docs/source/Plugin/_plugin_substitutions_p17x.repl b/docs/source/Plugin/_plugin_substitutions_p17x.repl index 8f07c78bf..48d81f750 100644 --- a/docs/source/Plugin/_plugin_substitutions_p17x.repl +++ b/docs/source/Plugin/_plugin_substitutions_p17x.repl @@ -28,7 +28,7 @@ .. |P173_type| replace:: :cyan:`Environment` .. |P173_typename| replace:: :cyan:`Environment - SHTC3` .. |P173_porttype| replace:: `.` -.. |P173_status| replace:: :yellow:`COLLECTION G` :yellow:`CLIMATE B` +.. |P173_status| replace:: :yellow:`COLLECTION H` :yellow:`CLIMATE B` .. |P173_github| replace:: P173_SHTC3.ino .. _P173_github: https://github.com/letscontrolit/ESPEasy/blob/mega/src/_P173_SHTC3.ino .. |P173_usedby| replace:: `.` @@ -67,7 +67,7 @@ .. |P177_type| replace:: :cyan:`Environment` .. |P177_typename| replace:: :cyan:`Environment - XDB401 I2C Pressure` .. |P177_porttype| replace:: `.` -.. |P177_status| replace:: :yellow:`COLLECTION G` :yellow:`CLIMATE B` +.. |P177_status| replace:: :yellow:`COLLECTION H` :yellow:`CLIMATE B` .. |P177_github| replace:: P177_XDB_pressure.ino .. _P177_github: https://github.com/letscontrolit/ESPEasy/blob/mega/src/_P177_XDB_pressure.ino .. |P177_usedby| replace:: `.` diff --git a/src/src/CustomBuild/define_plugin_sets.h b/src/src/CustomBuild/define_plugin_sets.h index ee9aef40d..a64d1eda9 100644 --- a/src/src/CustomBuild/define_plugin_sets.h +++ b/src/src/CustomBuild/define_plugin_sets.h @@ -1784,15 +1784,15 @@ To create/register a plugin, you have to : #ifndef USES_P170 #define USES_P170 // Input - I2C Liquid level sensor #endif +#endif // ifdef PLUGIN_SET_COLLECTION_G + +#ifdef PLUGIN_SET_COLLECTION_H #if !defined(USES_P173) && defined(ESP32) #define USES_P173 // Environment - SHTC3 #endif #if !defined(USES_P177) && defined(ESP32) #define USES_P177 // Environment - I2C XDB401 pressure #endif -#endif // ifdef PLUGIN_SET_COLLECTION_G - -#ifdef PLUGIN_SET_COLLECTION_H #if !defined(USES_P178) && defined(ESP32) #define USES_P178 // Extra IO - LU9685 Servo controller #endif From 102db4c7ae91ffce21dfc6195bb3a202b7332fe4 Mon Sep 17 00:00:00 2001 From: Ton Huisman Date: Sun, 26 Oct 2025 21:41:54 +0100 Subject: [PATCH 420/564] [Build] Reduce build-size for all Collection builds using BUILD_NO_DEBUG --- src/src/CustomBuild/define_plugin_sets.h | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/src/src/CustomBuild/define_plugin_sets.h b/src/src/CustomBuild/define_plugin_sets.h index a64d1eda9..0529573fd 100644 --- a/src/src/CustomBuild/define_plugin_sets.h +++ b/src/src/CustomBuild/define_plugin_sets.h @@ -949,6 +949,12 @@ To create/register a plugin, you have to : #ifdef ESP8266 #undef ESP8266 #endif + #ifndef BUILD_NO_DEBUG + #define BUILD_NO_DEBUG + #endif + #ifndef P036_LIMIT_BUILD_SIZE + #define P036_LIMIT_BUILD_SIZE + #endif // Undefine contradictionary defines #ifdef PLUGIN_SET_NONE #undef PLUGIN_SET_NONE @@ -2323,7 +2329,7 @@ To create/register a plugin, you have to : // Enable extra climate-related plugins (CO2/Temp/Hum) - #ifndef USES_P169 + #if defined(USES_P169) && defined(ESP32) #define USES_P169 // Environment - AS3935 Lightning Detector #endif #if !defined(USES_P173) // && defined(ESP32) @@ -2354,6 +2360,9 @@ To create/register a plugin, you have to : #ifndef PLUGIN_DESCR #define PLUGIN_DESCR "NeoPixel" #endif + #ifndef BUILD_NO_DEBUG + #define BUILD_NO_DEBUG + #endif #if !defined(FEATURE_SD) && !defined(ESP8266) #define FEATURE_SD 1 #endif From 2d4aa54d752e32542bdb98da6854aaa5e85fa997 Mon Sep 17 00:00:00 2001 From: TD-er Date: Sun, 26 Oct 2025 22:04:25 +0100 Subject: [PATCH 421/564] [JSON] Write empty "Sensors" array when no tasks defined --- src/src/Helpers/KeyValueWriter.h | 5 +++++ src/src/Helpers/KeyValueWriter_JSON.cpp | 6 ++++++ src/src/WebServer/JSON.cpp | 1 + 3 files changed, 12 insertions(+) diff --git a/src/src/Helpers/KeyValueWriter.h b/src/src/Helpers/KeyValueWriter.h index 0e907c45b..d1a4ddbe5 100644 --- a/src/src/Helpers/KeyValueWriter.h +++ b/src/src/Helpers/KeyValueWriter.h @@ -77,6 +77,9 @@ public: virtual bool summaryValueOnly() const; + // Force to even write the header when list/array is empty. + virtual void setWriteWhenEmpty() { _writeWhenEmpty = true; } + // This should be override by any writer outputting data which is not intended to be human readable. virtual bool dataOnlyOutput() const { return false; } @@ -139,6 +142,8 @@ protected: bool _isEmpty = true; + bool _writeWhenEmpty = false; + bool _isArray{}; // private: diff --git a/src/src/Helpers/KeyValueWriter_JSON.cpp b/src/src/Helpers/KeyValueWriter_JSON.cpp index 61e93345e..0d45907c7 100644 --- a/src/src/Helpers/KeyValueWriter_JSON.cpp +++ b/src/src/Helpers/KeyValueWriter_JSON.cpp @@ -37,6 +37,12 @@ KeyValueWriter_JSON::KeyValueWriter_JSON(const __FlashStringHelper *header, KeyV KeyValueWriter_JSON::~KeyValueWriter_JSON() { + if (_writeWhenEmpty && _isEmpty) { + // Make sure the header is written and then write the closing braces. + write(); + } + + if (!_isEmpty) { #ifdef USE_KWH_JSON_PRETTY_PRINT getPrint().write('\n'); diff --git a/src/src/WebServer/JSON.cpp b/src/src/WebServer/JSON.cpp index cd74518f3..d2f920bd2 100644 --- a/src/src/WebServer/JSON.cpp +++ b/src/src/WebServer/JSON.cpp @@ -440,6 +440,7 @@ void handle_json() : mainLevelWriter.createChildArray(F("Sensors")); if (sensorsWriter) { + sensorsWriter->setWriteWhenEmpty(); for (taskIndex_t TaskIndex = firstTaskIndex; TaskIndex <= lastActiveTaskIndex && validTaskIndex(TaskIndex); TaskIndex++) { const deviceIndex_t DeviceIndex = getDeviceIndex_from_TaskIndex(TaskIndex); From 69046537184606e00bc838cc0ebc03fe0c939b29 Mon Sep 17 00:00:00 2001 From: TD-er Date: Sun, 26 Oct 2025 22:06:17 +0100 Subject: [PATCH 422/564] [Eth] Move duplicate code to shared functions to display info --- src/ESPEasy/net/Helpers/NW_info_writer.cpp | 88 +++++++++++++++++++++- src/ESPEasy/net/Helpers/NW_info_writer.h | 18 ++++- src/ESPEasy/net/_NW003_ETH_RMII.cpp | 83 +++----------------- src/ESPEasy/net/_NW004_ETH_SPI.cpp | 73 ++---------------- 4 files changed, 119 insertions(+), 143 deletions(-) diff --git a/src/ESPEasy/net/Helpers/NW_info_writer.cpp b/src/ESPEasy/net/Helpers/NW_info_writer.cpp index 5ad62b03c..9eb200a10 100644 --- a/src/ESPEasy/net/Helpers/NW_info_writer.cpp +++ b/src/ESPEasy/net/Helpers/NW_info_writer.cpp @@ -3,9 +3,9 @@ #include "../../../src/DataStructs/ESPEasy_EventStruct.h" #include "../../../src/DataTypes/ESPEasy_plugin_functions.h" #include "../../../src/Globals/Settings.h" +#include "../../../src/Helpers/ESPEasy_UnitOfMeasure.h" #include "../../../src/Helpers/StringConverter.h" - #include "../Globals/NWPlugins.h" namespace ESPEasy { @@ -67,7 +67,7 @@ bool write_NetworkAdapterFlags(ESPEasy::net::networkIndex_t networkindex, KeyVal } bool write_NetworkAdapterPort(ESPEasy::net::networkIndex_t networkindex, - KeyValueWriter *writer) + KeyValueWriter *writer) { if (writer == nullptr) { return false; } struct EventStruct TempEvent; @@ -80,7 +80,6 @@ bool write_NetworkAdapterPort(ESPEasy::net::networkIndex_t networkindex, return true; } - bool write_IP_config(ESPEasy::net::networkIndex_t networkindex, KeyValueWriter*writer) { if (writer == nullptr) { return false; } @@ -144,5 +143,88 @@ bool write_NetworkConnectionInfo(ESPEasy::net::networkIndex_t networkindex, KeyV return res; } +#if defined(USES_NW003) || defined(USES_NW004) + +bool write_Eth_Show_Connected(const ETHClass& eth, KeyValueWriter *writer) +{ + if ((writer == nullptr) || !eth.connected() || !eth.linkUp()) { return false; } + + if (writer->summaryValueOnly()) { + String s = concat( + String(eth.linkSpeed()), + eth.fullDuplex() ? F("Mbps FD") : F("Mbps HD")); + + if (!eth.autoNegotiation()) { s += F("(manual)"); } + writer->write({ EMPTY_STRING, s }); + } else { + KeyValueStruct kv(F("Link Speed"), eth.linkSpeed()); +# if FEATURE_TASKVALUE_UNIT_OF_MEASURE + kv.setUnit(UOM_Mbps); +# endif + writer->write(kv); + writer->write({ F("Duplex Mode"), eth.fullDuplex() ? F("Full Duplex") : F("Half Duplex") }); + writer->write({ F("Negotiation Mode"), eth.autoNegotiation() ? F("Auto") : F("Manual") }); + } + + return true; +} + +bool write_Eth_HW_Address(const ETHClass& eth, KeyValueWriter *writer) +{ + if (writer == nullptr) { return false; } + + if (writer->summaryValueOnly()) { + KeyValueStruct kv(EMPTY_STRING); + kv.appendValue(toString(Settings.ETH_Phy_Type)); + kv.appendValue(concat(F("MAC: "), eth.macAddress())); + + writer->write(kv); + } else { + writer->write({ + F("Adapter"), + toString(Settings.ETH_Phy_Type) }); + writer->write({ + F("MAC"), + eth.macAddress(), + KeyValueStruct::Format::PreFormatted }); + } + return true; +} + +#endif // if defined(USES_NW003) || defined(USES_NW004) + +bool write_NetworkPort(const __FlashStringHelper*labels[], const int pins[], size_t nrElements, KeyValueWriter *writer) +{ + if (writer == nullptr) { return false; } + bool success = false; + + if (writer->summaryValueOnly()) { + KeyValueStruct kv(EMPTY_STRING); + + for (size_t i = 0; i < nrElements; ++i) { + if (pins[i] >= 0) { + kv.appendValue(concat(labels[i], F(": ")) + formatGpioLabel(pins[i], false)); + } + } + + if (kv._values.size()) { + success = true; + writer->write(kv); + } + } else { + for (size_t i = 0; i < nrElements; ++i) { + if (pins[i] >= 0) { + success = true; + writer->write({ + concat(labels[i], F(" GPIO")), + pins[i], + KeyValueStruct::Format::PreFormatted }); + } + } + } + + return success; +} + } // namespace net } // namespace ESPEasy diff --git a/src/ESPEasy/net/Helpers/NW_info_writer.h b/src/ESPEasy/net/Helpers/NW_info_writer.h index 91fec6060..e28d8c3a2 100644 --- a/src/ESPEasy/net/Helpers/NW_info_writer.h +++ b/src/ESPEasy/net/Helpers/NW_info_writer.h @@ -6,6 +6,10 @@ #include "../DataTypes/NetworkIndex.h" +#if defined(USES_NW003) || defined(USES_NW004) +#include +#endif + namespace ESPEasy { namespace net { @@ -14,7 +18,7 @@ bool write_NetworkAdapterFlags(ESPEasy::net::networkIndex_t networkindex, KeyValueWriter *writer); bool write_NetworkAdapterPort(ESPEasy::net::networkIndex_t networkindex, - KeyValueWriter *writer); + KeyValueWriter *writer); bool write_IP_config(ESPEasy::net::networkIndex_t networkindex, KeyValueWriter *writer); @@ -23,5 +27,17 @@ bool write_IP_config(ESPEasy::net::networkIndex_t networkindex, bool write_NetworkConnectionInfo(ESPEasy::net::networkIndex_t networkindex, KeyValueWriter *writer); +#if defined(USES_NW003) || defined(USES_NW004) + +bool write_Eth_Show_Connected(const ETHClass& eth, + KeyValueWriter *writer); + +bool write_Eth_HW_Address(const ETHClass& eth, + KeyValueWriter *writer); + +#endif // if defined(USES_NW003) || defined(USES_NW004) + +bool write_NetworkPort(const __FlashStringHelper*labels[], const int pins[], size_t nrElements, KeyValueWriter *writer); + } // namespace net } // namespace ESPEasy diff --git a/src/ESPEasy/net/_NW003_ETH_RMII.cpp b/src/ESPEasy/net/_NW003_ETH_RMII.cpp index d42410b24..1ab3014c2 100644 --- a/src/ESPEasy/net/_NW003_ETH_RMII.cpp +++ b/src/ESPEasy/net/_NW003_ETH_RMII.cpp @@ -26,6 +26,7 @@ # include "../net/Globals/NWPlugins.h" # include "../net/Helpers/_NWPlugin_Helper_webform.h" # include "../net/Helpers/_NWPlugin_init.h" +# include "../net/Helpers/NW_info_writer.h" # include "../net/NWPluginStructs/NW003_data_struct_ETH_RMII.h" @@ -44,13 +45,13 @@ bool NWPlugin_003(NWPlugin::Function function, EventStruct *event, String& strin { NetworkDriverStruct& nw = getNetworkDriverStruct(networkDriverIndex_t::toNetworkDriverIndex(event->idx)); nw.onlySingleInstance = true; -#ifdef ESP32P4 - nw.alwaysPresent = true; +# ifdef ESP32P4 + nw.alwaysPresent = true; nw.enabledOnFactoryReset = true; - nw.fixedNetworkIndex = NWPLUGIN_ID_003 - 1; // Start counting at 0 -#else - nw.alwaysPresent = false; -#endif + nw.fixedNetworkIndex = NWPLUGIN_ID_003 - 1; // Start counting at 0 +# else // ifdef ESP32P4 + nw.alwaysPresent = false; +# endif // ifdef ESP32P4 break; } @@ -95,53 +96,15 @@ bool NWPlugin_003(NWPlugin::Function function, EventStruct *event, String& strin case NWPlugin::Function::NWPLUGIN_WEBFORM_SHOW_CONNECTED: { - if (event->kvWriter) { - success = ETH.connected(); - - if (ETH.linkUp()) { - if (event->kvWriter->summaryValueOnly()) { - String s = concat( - String(ETH.linkSpeed()), - ETH.fullDuplex() ? F("Mbps FD") : F("Mbps HD")); - - if (!ETH.autoNegotiation()) { s += F("(manual)"); } - event->kvWriter->write({ EMPTY_STRING, s }); - } else { - KeyValueStruct kv(F("Link Speed"), ETH.linkSpeed()); -# if FEATURE_TASKVALUE_UNIT_OF_MEASURE - kv.setUnit(UOM_Mbps); -# endif - event->kvWriter->write(kv); - event->kvWriter->write({ F("Duplex Mode"), ETH.fullDuplex() ? F("Full Duplex") : F("Half Duplex") }); - event->kvWriter->write({ F("Negotiation Mode"), ETH.autoNegotiation() ? F("Auto") : F("Manual") }); - } - } - } + success = write_Eth_Show_Connected(ETH, event->kvWriter); break; } case NWPlugin::Function::NWPLUGIN_WEBFORM_SHOW_HW_ADDRESS: { - if (event->kvWriter) { - if (isValid(Settings.ETH_Phy_Type) && !isSPI_EthernetType(Settings.ETH_Phy_Type)) { - success = true; - if (event->kvWriter->summaryValueOnly()) { - KeyValueStruct kv(EMPTY_STRING); - kv.appendValue(toString(Settings.ETH_Phy_Type)); - kv.appendValue(concat(F("MAC: "), ETH.macAddress())); - - event->kvWriter->write(kv); - } else { - event->kvWriter->write({ - F("Adapter"), - toString(Settings.ETH_Phy_Type) }); - event->kvWriter->write({ - F("MAC"), - ETH.macAddress(), - KeyValueStruct::Format::PreFormatted }); - } - } + if (isValid(Settings.ETH_Phy_Type) && !isSPI_EthernetType(Settings.ETH_Phy_Type)) { + success = ESPEasy::net::write_Eth_HW_Address(ETH, event->kvWriter); } break; } @@ -158,31 +121,7 @@ bool NWPlugin_003(NWPlugin::Function function, EventStruct *event, String& strin Settings.ETH_Pin_mdio_irq, Settings.ETH_Pin_power_rst }; - - if (event->kvWriter->summaryValueOnly()) { - KeyValueStruct kv(EMPTY_STRING); - - for (size_t i = 0; i < NR_ELEMENTS(labels); ++i) { - if (pins[i] >= 0) { - kv.appendValue(concat(labels[i], F(": ")) + formatGpioLabel(pins[i], false)); - } - } - - if (kv._values.size()) { - success = true; - event->kvWriter->write(kv); - } - } else { - for (size_t i = 0; i < NR_ELEMENTS(labels); ++i) { - if (pins[i] >= 0) { - success = true; - event->kvWriter->write({ - concat(labels[i], F(" GPIO")), - pins[i], - KeyValueStruct::Format::PreFormatted }); - } - } - } + success = write_NetworkPort(labels, pins, NR_ELEMENTS(labels), event->kvWriter); } } break; diff --git a/src/ESPEasy/net/_NW004_ETH_SPI.cpp b/src/ESPEasy/net/_NW004_ETH_SPI.cpp index 8cd7ab80b..9e0d6c36e 100644 --- a/src/ESPEasy/net/_NW004_ETH_SPI.cpp +++ b/src/ESPEasy/net/_NW004_ETH_SPI.cpp @@ -26,6 +26,7 @@ # include "../net/Globals/NWPlugins.h" # include "../net/Helpers/_NWPlugin_Helper_webform.h" # include "../net/Helpers/_NWPlugin_init.h" +# include "../net/Helpers/NW_info_writer.h" # include "../net/NWPluginStructs/NW004_data_struct_ETH_SPI.h" @@ -94,53 +95,14 @@ bool NWPlugin_004(NWPlugin::Function function, EventStruct *event, String& strin case NWPlugin::Function::NWPLUGIN_WEBFORM_SHOW_CONNECTED: { - if (event->kvWriter) { - success = ETH.connected(); - - if (ETH.linkUp()) { - if (event->kvWriter->summaryValueOnly()) { - String s = concat( - String(ETH.linkSpeed()), - ETH.fullDuplex() ? F("Mbps FD") : F("Mbps HD")); - - if (!ETH.autoNegotiation()) { s += F("(manual)"); } - event->kvWriter->write({ EMPTY_STRING, s }); - } else { - KeyValueStruct kv(F("Link Speed"), ETH.linkSpeed()); -# if FEATURE_TASKVALUE_UNIT_OF_MEASURE - kv.setUnit(UOM_Mbps); -# endif - event->kvWriter->write(kv); - event->kvWriter->write({ F("Duplex Mode"), ETH.fullDuplex() ? F("Full Duplex") : F("Half Duplex") }); - event->kvWriter->write({ F("Negotiation Mode"), ETH.autoNegotiation() ? F("Auto") : F("Manual") }); - } - } - } + success = write_Eth_Show_Connected(ETH, event->kvWriter); break; } case NWPlugin::Function::NWPLUGIN_WEBFORM_SHOW_HW_ADDRESS: { - if (event->kvWriter) { - if (isValid(Settings.ETH_Phy_Type) && isSPI_EthernetType(Settings.ETH_Phy_Type)) { - success = true; - - if (event->kvWriter->summaryValueOnly()) { - KeyValueStruct kv(EMPTY_STRING); - kv.appendValue(toString(Settings.ETH_Phy_Type)); - kv.appendValue(concat(F("MAC: "), ETH.macAddress())); - - event->kvWriter->write(kv); - } else { - event->kvWriter->write({ - F("Adapter"), - toString(Settings.ETH_Phy_Type) }); - event->kvWriter->write({ - F("MAC"), - ETH.macAddress(), - KeyValueStruct::Format::PreFormatted }); - } - } + if (isValid(Settings.ETH_Phy_Type) && isSPI_EthernetType(Settings.ETH_Phy_Type)) { + success = ESPEasy::net::write_Eth_HW_Address(ETH, event->kvWriter); } break; } @@ -163,30 +125,7 @@ bool NWPlugin_004(NWPlugin::Function function, EventStruct *event, String& strin Settings.ETH_Pin_power_rst }; - if (event->kvWriter->summaryValueOnly()) { - KeyValueStruct kv(EMPTY_STRING); - - for (size_t i = 0; i < NR_ELEMENTS(labels); ++i) { - if (pins[i] >= 0) { - kv.appendValue(concat(labels[i], F(": ")) + formatGpioLabel(pins[i], false)); - } - } - - if (kv._values.size()) { - success = true; - event->kvWriter->write(kv); - } - } else { - for (size_t i = 0; i < NR_ELEMENTS(labels); ++i) { - if (pins[i] >= 0) { - success = true; - event->kvWriter->write({ - concat(labels[i], F(" GPIO")), - pins[i], - KeyValueStruct::Format::PreFormatted }); - } - } - } + success = write_NetworkPort(labels, pins, NR_ELEMENTS(labels), event->kvWriter); } } } @@ -425,11 +364,11 @@ bool NWPlugin_004(NWPlugin::Function function, EventStruct *event, String& strin break; } + return success; } } // namespace net - } // namespace ESPEasy #endif // ifdef USES_NW004 From 764ab0eac5fd43477e4c0b63eb345a503af663d5 Mon Sep 17 00:00:00 2001 From: TD-er Date: Sun, 26 Oct 2025 22:21:54 +0100 Subject: [PATCH 423/564] [ETH] Remove left-over code duplication after split RMII/SPI adapters --- src/ESPEasy/net/_NW003_ETH_RMII.cpp | 77 +++++------------------ src/ESPEasy/net/_NW004_ETH_SPI.cpp | 96 ++--------------------------- 2 files changed, 22 insertions(+), 151 deletions(-) diff --git a/src/ESPEasy/net/_NW003_ETH_RMII.cpp b/src/ESPEasy/net/_NW003_ETH_RMII.cpp index 1ab3014c2..435111a7d 100644 --- a/src/ESPEasy/net/_NW003_ETH_RMII.cpp +++ b/src/ESPEasy/net/_NW003_ETH_RMII.cpp @@ -141,10 +141,8 @@ bool NWPlugin_003(NWPlugin::Function function, EventStruct *event, String& strin Settings.ETH_Pin_mdio_irq = getFormItemInt(F("ethmdio")); Settings.ETH_Pin_power_rst = getFormItemInt(F("ethpower")); Settings.ETH_Phy_Type = static_cast(getFormItemInt(F("ethtype"))); -# if CONFIG_ETH_USE_ESP32_EMAC && FEATURE_ETHERNET - Settings.ETH_Clock_Mode = static_cast(getFormItemInt(F("ethclock"))); -# endif - Settings.NetworkMedium = static_cast(getFormItemInt(F("ethwifi"))); + Settings.ETH_Clock_Mode = static_cast(getFormItemInt(F("ethclock"))); + Settings.NetworkMedium = static_cast(getFormItemInt(F("ethwifi"))); break; } @@ -177,62 +175,35 @@ bool NWPlugin_003(NWPlugin::Function function, EventStruct *event, String& strin const __FlashStringHelper *ethPhyTypes[] = { toString(EthPhyType_t::notSet), -# if CONFIG_ETH_USE_ESP32_EMAC && FEATURE_ETHERNET toString(EthPhyType_t::LAN8720), -# if ETH_PHY_LAN867X_SUPPORTED +# if ETH_PHY_LAN867X_SUPPORTED toString(ESPEasy::net::EthPhyType_t::LAN867X), -# endif +# endif toString(EthPhyType_t::TLK110), toString(EthPhyType_t::RTL8201), -# if ETH_TYPE_JL1101_SUPPORTED +# if ETH_TYPE_JL1101_SUPPORTED toString(EthPhyType_t::JL1101), -# endif +# endif toString(EthPhyType_t::DP83848), toString(EthPhyType_t::KSZ8041), toString(EthPhyType_t::KSZ8081), -# endif // if CONFIG_ETH_USE_ESP32_EMAC && FEATURE_ETHERNET - -# if ESP_IDF_VERSION_MAJOR >= 5 -# if CONFIG_ETH_SPI_ETHERNET_DM9051 - toString(EthPhyType_t::DM9051), -# endif // if CONFIG_ETH_SPI_ETHERNET_DM9051 -# if CONFIG_ETH_SPI_ETHERNET_W5500 - toString(EthPhyType_t::W5500), -# endif // if CONFIG_ETH_SPI_ETHERNET_W5500 -# if CONFIG_ETH_SPI_ETHERNET_KSZ8851SNL - toString(EthPhyType_t::KSZ8851), -# endif // if CONFIG_ETH_SPI_ETHERNET_KSZ8851SNL -# endif // if ESP_IDF_VERSION_MAJOR >= 5 }; const int ethPhyTypes_index[] = { static_cast(EthPhyType_t::notSet), -# if CONFIG_ETH_USE_ESP32_EMAC && FEATURE_ETHERNET static_cast(EthPhyType_t::LAN8720), -# if ETH_PHY_LAN867X_SUPPORTED +# if ETH_PHY_LAN867X_SUPPORTED static_cast(ESPEasy::net::EthPhyType_t::LAN867X), -# endif +# endif static_cast(EthPhyType_t::TLK110), static_cast(EthPhyType_t::RTL8201), -# if ETH_TYPE_JL1101_SUPPORTED +# if ETH_TYPE_JL1101_SUPPORTED static_cast(EthPhyType_t::JL1101), -# endif +# endif static_cast(EthPhyType_t::DP83848), static_cast(EthPhyType_t::KSZ8041), static_cast(EthPhyType_t::KSZ8081), -# endif // if CONFIG_ETH_USE_ESP32_EMAC && FEATURE_ETHERNET -# if ESP_IDF_VERSION_MAJOR >= 5 -# if CONFIG_ETH_SPI_ETHERNET_DM9051 - static_cast(EthPhyType_t::DM9051), -# endif // if CONFIG_ETH_SPI_ETHERNET_DM9051 -# if CONFIG_ETH_SPI_ETHERNET_W5500 - static_cast(EthPhyType_t::W5500), -# endif // if CONFIG_ETH_SPI_ETHERNET_W5500 -# if CONFIG_ETH_SPI_ETHERNET_KSZ8851SNL - static_cast(EthPhyType_t::KSZ8851), -# endif // if CONFIG_ETH_SPI_ETHERNET_KSZ8851SNL -# endif // if ESP_IDF_VERSION_MAJOR >= 5 }; constexpr unsigned nrItems = NR_ELEMENTS(ethPhyTypes_index); @@ -253,25 +224,13 @@ bool NWPlugin_003(NWPlugin::Function function, EventStruct *event, String& strin choice); } -# if CONFIG_ETH_USE_SPI_ETHERNET && CONFIG_ETH_USE_ESP32_EMAC -# define MDC_CS_PIN_DESCR "Ethernet MDC/CS pin" -# define MIO_IRQ_PIN_DESCR "Ethernet MDIO/IRQ pin" -# define PWR_RST_PIN_DESCR "Ethernet Power/RST pin" -# elif CONFIG_ETH_USE_SPI_ETHERNET -# define MDC_CS_PIN_DESCR "Ethernet CS pin" -# define MIO_IRQ_PIN_DESCR "Ethernet IRQ pin" -# define PWR_RST_PIN_DESCR "Ethernet RST pin" -# else // #elif CONFIG_ETH_USE_ESP32_EMAC && FEATURE_ETHERNET -# define MDC_CS_PIN_DESCR "Ethernet MDC pin" -# define MIO_IRQ_PIN_DESCR "Ethernet MIO pin" -# define PWR_RST_PIN_DESCR "Ethernet Power pin" -# endif // if CONFIG_ETH_USE_SPI_ETHERNET && CONFIG_ETH_USE_ESP32_EMAC + # define MDC_CS_PIN_DESCR "Ethernet MDC pin" + # define MIO_IRQ_PIN_DESCR "Ethernet MIO pin" + # define PWR_RST_PIN_DESCR "Ethernet Power pin" addFormNumericBox(F("Ethernet PHY Address"), F("ethphy"), Settings.ETH_Phy_Addr, -1, 127); addFormNote(F("I²C-address of Ethernet PHY" -# if CONFIG_ETH_USE_ESP32_EMAC && FEATURE_ETHERNET " (0 or 1 for LAN8720, 31 for TLK110, -1 autodetect)" -# endif )); addFormPinSelect(PinSelectPurpose::Ethernet, formatGpioName_output( F(MDC_CS_PIN_DESCR)), @@ -282,10 +241,9 @@ bool NWPlugin_003(NWPlugin::Function function, EventStruct *event, String& strin addFormPinSelect(PinSelectPurpose::Ethernet, formatGpioName_output( F(PWR_RST_PIN_DESCR)), F("ethpower"), Settings.ETH_Pin_power_rst); -# if CONFIG_ETH_USE_ESP32_EMAC && FEATURE_ETHERNET addRowLabel_tr_id(F("Ethernet Clock"), F("ethclock")); { - # if CONFIG_IDF_TARGET_ESP32 + # if CONFIG_IDF_TARGET_ESP32 const __FlashStringHelper *ethClockOptions[] = { toString(EthClockMode_t::Ext_crystal_osc), toString(EthClockMode_t::Int_50MHz_GPIO_0), @@ -298,8 +256,8 @@ bool NWPlugin_003(NWPlugin::Function function, EventStruct *event, String& strin static_cast(EthClockMode_t::Int_50MHz_GPIO_16), static_cast(EthClockMode_t::Int_50MHz_GPIO_17_inv) }; - # endif // if CONFIG_IDF_TARGET_ESP32 - # if CONFIG_IDF_TARGET_ESP32P4 + # endif // if CONFIG_IDF_TARGET_ESP32 + # if CONFIG_IDF_TARGET_ESP32P4 const __FlashStringHelper *ethClockOptions[] = { // toString(EthClockMode_t::Default), toString(EthClockMode_t::Ext_crystal), @@ -310,14 +268,13 @@ bool NWPlugin_003(NWPlugin::Function function, EventStruct *event, String& strin static_cast(EthClockMode_t::Ext_crystal), static_cast(EthClockMode_t::Int_50MHz) }; - # endif // if CONFIG_IDF_TARGET_ESP32P4 + # endif // if CONFIG_IDF_TARGET_ESP32P4 const FormSelectorOptions selector( NR_ELEMENTS(ethClockOptions), ethClockOptions, indices); selector.addSelector(F("ethclock"), static_cast(Settings.ETH_Clock_Mode)); } -# endif // if CONFIG_ETH_USE_ESP32_EMAC && FEATURE_ETHERNET break; } diff --git a/src/ESPEasy/net/_NW004_ETH_SPI.cpp b/src/ESPEasy/net/_NW004_ETH_SPI.cpp index 9e0d6c36e..88efb0380 100644 --- a/src/ESPEasy/net/_NW004_ETH_SPI.cpp +++ b/src/ESPEasy/net/_NW004_ETH_SPI.cpp @@ -50,7 +50,6 @@ bool NWPlugin_004(NWPlugin::Function function, EventStruct *event, String& strin break; } - case NWPlugin::Function::NWPLUGIN_LOAD_DEFAULTS: { Settings.setRoutePrio_for_network(event->NetworkIndex, 50); @@ -145,10 +144,7 @@ bool NWPlugin_004(NWPlugin::Function function, EventStruct *event, String& strin Settings.ETH_Pin_mdio_irq = getFormItemInt(F("ethmdio")); Settings.ETH_Pin_power_rst = getFormItemInt(F("ethpower")); Settings.ETH_Phy_Type = static_cast(getFormItemInt(F("ethtype"))); -# if CONFIG_ETH_USE_ESP32_EMAC && FEATURE_ETHERNET - Settings.ETH_Clock_Mode = static_cast(getFormItemInt(F("ethclock"))); -# endif - Settings.NetworkMedium = static_cast(getFormItemInt(F("ethwifi"))); + Settings.NetworkMedium = static_cast(getFormItemInt(F("ethwifi"))); break; } @@ -180,22 +176,6 @@ bool NWPlugin_004(NWPlugin::Function function, EventStruct *event, String& strin { const __FlashStringHelper *ethPhyTypes[] = { toString(EthPhyType_t::notSet), - -# if CONFIG_ETH_USE_ESP32_EMAC && FEATURE_ETHERNET - toString(EthPhyType_t::LAN8720), -# if ETH_PHY_LAN867X_SUPPORTED - toString(ESPEasy::net::EthPhyType_t::LAN867X), -# endif - toString(EthPhyType_t::TLK110), - toString(EthPhyType_t::RTL8201), -# if ETH_TYPE_JL1101_SUPPORTED - toString(EthPhyType_t::JL1101), -# endif - toString(EthPhyType_t::DP83848), - toString(EthPhyType_t::KSZ8041), - toString(EthPhyType_t::KSZ8081), -# endif // if CONFIG_ETH_USE_ESP32_EMAC && FEATURE_ETHERNET - # if ESP_IDF_VERSION_MAJOR >= 5 # if CONFIG_ETH_SPI_ETHERNET_DM9051 toString(EthPhyType_t::DM9051), @@ -211,21 +191,6 @@ bool NWPlugin_004(NWPlugin::Function function, EventStruct *event, String& strin const int ethPhyTypes_index[] = { static_cast(EthPhyType_t::notSet), -# if CONFIG_ETH_USE_ESP32_EMAC && FEATURE_ETHERNET - static_cast(EthPhyType_t::LAN8720), -# if ETH_PHY_LAN867X_SUPPORTED - static_cast(ESPEasy::net::EthPhyType_t::LAN867X), -# endif - static_cast(EthPhyType_t::TLK110), - static_cast(EthPhyType_t::RTL8201), -# if ETH_TYPE_JL1101_SUPPORTED - static_cast(EthPhyType_t::JL1101), -# endif - static_cast(EthPhyType_t::DP83848), - static_cast(EthPhyType_t::KSZ8041), - static_cast(EthPhyType_t::KSZ8081), -# endif // if CONFIG_ETH_USE_ESP32_EMAC && FEATURE_ETHERNET - # if ESP_IDF_VERSION_MAJOR >= 5 # if CONFIG_ETH_SPI_ETHERNET_DM9051 static_cast(EthPhyType_t::DM9051), @@ -257,26 +222,12 @@ bool NWPlugin_004(NWPlugin::Function function, EventStruct *event, String& strin choice); } -# if CONFIG_ETH_USE_SPI_ETHERNET && CONFIG_ETH_USE_ESP32_EMAC -# define MDC_CS_PIN_DESCR "Ethernet MDC/CS pin" -# define MIO_IRQ_PIN_DESCR "Ethernet MDIO/IRQ pin" -# define PWR_RST_PIN_DESCR "Ethernet Power/RST pin" -# elif CONFIG_ETH_USE_SPI_ETHERNET -# define MDC_CS_PIN_DESCR "Ethernet CS pin" -# define MIO_IRQ_PIN_DESCR "Ethernet IRQ pin" -# define PWR_RST_PIN_DESCR "Ethernet RST pin" -# else // #elif CONFIG_ETH_USE_ESP32_EMAC && FEATURE_ETHERNET -# define MDC_CS_PIN_DESCR "Ethernet MDC pin" -# define MIO_IRQ_PIN_DESCR "Ethernet MIO pin" -# define PWR_RST_PIN_DESCR "Ethernet Power pin" -# endif // if CONFIG_ETH_USE_SPI_ETHERNET && CONFIG_ETH_USE_ESP32_EMAC + # define MDC_CS_PIN_DESCR "Ethernet CS pin" + # define MIO_IRQ_PIN_DESCR "Ethernet IRQ pin" + # define PWR_RST_PIN_DESCR "Ethernet RST pin" addFormNumericBox(F("Ethernet PHY Address"), F("ethphy"), Settings.ETH_Phy_Addr, -1, 127); - addFormNote(F("I²C-address of Ethernet PHY" -# if CONFIG_ETH_USE_ESP32_EMAC && FEATURE_ETHERNET - " (0 or 1 for LAN8720, 31 for TLK110, -1 autodetect)" -# endif - )); + addFormNote(F("I²C-address of Ethernet PHY")); addFormPinSelect(PinSelectPurpose::Ethernet, formatGpioName_output( F(MDC_CS_PIN_DESCR)), F("ethmdc"), Settings.ETH_Pin_mdc_cs); @@ -286,43 +237,6 @@ bool NWPlugin_004(NWPlugin::Function function, EventStruct *event, String& strin addFormPinSelect(PinSelectPurpose::Ethernet, formatGpioName_output( F(PWR_RST_PIN_DESCR)), F("ethpower"), Settings.ETH_Pin_power_rst); -# if CONFIG_ETH_USE_ESP32_EMAC && FEATURE_ETHERNET - addRowLabel_tr_id(F("Ethernet Clock"), F("ethclock")); - { - # if CONFIG_IDF_TARGET_ESP32 - const __FlashStringHelper *ethClockOptions[] = { - toString(EthClockMode_t::Ext_crystal_osc), - toString(EthClockMode_t::Int_50MHz_GPIO_0), - toString(EthClockMode_t::Int_50MHz_GPIO_16), - toString(EthClockMode_t::Int_50MHz_GPIO_17_inv) - }; - const int indices[] = { - static_cast(EthClockMode_t::Ext_crystal_osc), - static_cast(EthClockMode_t::Int_50MHz_GPIO_0), - static_cast(EthClockMode_t::Int_50MHz_GPIO_16), - static_cast(EthClockMode_t::Int_50MHz_GPIO_17_inv) - }; - # endif // if CONFIG_IDF_TARGET_ESP32 - # if CONFIG_IDF_TARGET_ESP32P4 - const __FlashStringHelper *ethClockOptions[] = { - // toString(EthClockMode_t::Default), - toString(EthClockMode_t::Ext_crystal), - toString(EthClockMode_t::Int_50MHz) - }; - const int indices[] = { - // static_cast(EthClockMode_t::Default), - static_cast(EthClockMode_t::Ext_crystal), - static_cast(EthClockMode_t::Int_50MHz) - }; - # endif // if CONFIG_IDF_TARGET_ESP32P4 - const FormSelectorOptions selector( - NR_ELEMENTS(ethClockOptions), - ethClockOptions, - indices); - selector.addSelector(F("ethclock"), static_cast(Settings.ETH_Clock_Mode)); - } -# endif // if CONFIG_ETH_USE_ESP32_EMAC && FEATURE_ETHERNET - break; } From c1cfb4a0be081c7d6cf78aa08e92a19beb755637 Mon Sep 17 00:00:00 2001 From: Ton Huisman Date: Sun, 26 Oct 2025 23:22:02 +0100 Subject: [PATCH 424/564] [Build] Reduce build-size for Collection C build --- src/src/CustomBuild/define_plugin_sets.h | 3 +++ 1 file changed, 3 insertions(+) diff --git a/src/src/CustomBuild/define_plugin_sets.h b/src/src/CustomBuild/define_plugin_sets.h index 0529573fd..6e2c8c743 100644 --- a/src/src/CustomBuild/define_plugin_sets.h +++ b/src/src/CustomBuild/define_plugin_sets.h @@ -1010,6 +1010,9 @@ To create/register a plugin, you have to : #ifdef ESP8266 #undef ESP8266 #endif + #ifndef P037_LIMIT_BUILD_SIZE + #define P037_LIMIT_BUILD_SIZE // Reduce build size for P037 (MQTT Import) only + #endif // Undefine contradictionary defines #ifdef PLUGIN_SET_NONE #undef PLUGIN_SET_NONE From bb78389dfc68ee6591b91250b4cf4323f0c51fe9 Mon Sep 17 00:00:00 2001 From: TD-er Date: Mon, 27 Oct 2025 13:40:56 +0100 Subject: [PATCH 425/564] [ESPEasy Console] Fix console on both HWCDC and Serial0 --- boards/esp32p4_ev.json | 2 +- .../Port_ESPEasySerial_USB_HWCDC.cpp | 40 ++++++++++--------- .../Port_ESPEasySerial_USB_HWCDC.h | 4 +- src/src/CustomBuild/define_plugin_sets.h | 7 +--- src/src/DataStructs/LogBuffer.cpp | 20 +++++----- src/src/DataStructs/LogBuffer.h | 4 +- src/src/DataStructs/LogEntry.cpp | 22 ++++++++-- src/src/DataStructs/LogEntry.h | 3 ++ src/src/ESPEasyCore/ESPEasy_Log.cpp | 7 +++- .../ESPEasyCore/ESPEasy_backgroundtasks.cpp | 1 + src/src/Helpers/Log_Helper.cpp | 5 ++- src/src/Helpers/Log_Helper.h | 2 +- 12 files changed, 71 insertions(+), 46 deletions(-) diff --git a/boards/esp32p4_ev.json b/boards/esp32p4_ev.json index b994b281a..c14b3511c 100644 --- a/boards/esp32p4_ev.json +++ b/boards/esp32p4_ev.json @@ -2,7 +2,7 @@ "build": { "core": "esp32", "extra_flags": [ - "-DARDUINO_TASMOTA -DESP32P4 -DBOARD_HAS_PSRAM -DARDUINO_USB_MODE=1 -DUSE_USB_CDC_CONSOLE -DARDUINO_USB_CDC_ON_BOOT=1" + "-DARDUINO_TASMOTA -DESP32P4 -DBOARD_HAS_PSRAM -DARDUINO_USB_MODE=1 -DUSE_USB_CDC_CONSOLE" ], "f_cpu": "360000000L", "f_flash": "80000000L", diff --git a/lib/ESPEasySerial/Port_ESPEasySerial_USB_HWCDC.cpp b/lib/ESPEasySerial/Port_ESPEasySerial_USB_HWCDC.cpp index 0da2053c0..f57ae8ec4 100644 --- a/lib/ESPEasySerial/Port_ESPEasySerial_USB_HWCDC.cpp +++ b/lib/ESPEasySerial/Port_ESPEasySerial_USB_HWCDC.cpp @@ -2,7 +2,9 @@ #if USES_HWCDC -// #include +#if !ARDUINO_USB_CDC_ON_BOOT + #include +#endif volatile bool usbActive = false; @@ -47,18 +49,19 @@ static void hwcdcEventCallback(void *arg, esp_event_base_t event_base, int32_t e } Port_ESPEasySerial_USB_HWCDC_t::Port_ESPEasySerial_USB_HWCDC_t(const ESPEasySerialConfig& config) - : + # if ARDUINO_USB_CDC_ON_BOOT // Serial used for USB CDC - _hwcdc_serial(&Serial) + : _hwcdc_serial(&Serial) # else // if ARDUINO_USB_CDC_ON_BOOT - _hwcdc_serial(&USBSerial) + : _hwcdc_serial(&myUsbSerial) # endif // if ARDUINO_USB_CDC_ON_BOOT { _config.port = ESPEasySerialPort::usb_hw_cdc; - - // USB.begin(); + #if !ARDUINO_USB_CDC_ON_BOOT + USB.begin(); + #endif if (_hwcdc_serial != nullptr) { - // _hwcdc_serial->end(); + _hwcdc_serial->end(); // _config.rxBuffSize = _hwcdc_serial->setRxBufferSize(_config.rxBuffSize); // _config.txBuffSize = _hwcdc_serial->setTxBufferSize(_config.txBuffSize); @@ -103,24 +106,24 @@ void Port_ESPEasySerial_USB_HWCDC_t::end() { int Port_ESPEasySerial_USB_HWCDC_t::available(void) { - if (_hwcdc_serial != nullptr) { - return _hwcdc_serial->available(); + if (_hwcdc_serial != nullptr && _hwcdc_serial->isConnected()) { + return _hwcdc_serial->available(); } return 0; } int Port_ESPEasySerial_USB_HWCDC_t::availableForWrite(void) { - if (_hwcdc_serial != nullptr) { - const int res = _hwcdc_serial->availableForWrite(); - return res > 64 ? 64 : res; + if (_hwcdc_serial != nullptr && _hwcdc_serial->isConnected()) { + const int res = _hwcdc_serial->availableForWrite(); + return res > 64 ? 64 : res; } return 0; } int Port_ESPEasySerial_USB_HWCDC_t::peek(void) { - if (_hwcdc_serial != nullptr) { + if (_hwcdc_serial != nullptr && _hwcdc_serial->isConnected()) { return _hwcdc_serial->peek(); } return 0; @@ -128,7 +131,7 @@ int Port_ESPEasySerial_USB_HWCDC_t::peek(void) int Port_ESPEasySerial_USB_HWCDC_t::read(void) { - if (_hwcdc_serial != nullptr) { + if (_hwcdc_serial != nullptr && _hwcdc_serial->isConnected()) { return _hwcdc_serial->read(); } return 0; @@ -137,7 +140,7 @@ int Port_ESPEasySerial_USB_HWCDC_t::read(void) size_t Port_ESPEasySerial_USB_HWCDC_t::read(uint8_t *buffer, size_t size) { - if (_hwcdc_serial != nullptr) { + if (_hwcdc_serial != nullptr && _hwcdc_serial->isConnected()) { return _hwcdc_serial->read(buffer, size); } return 0; @@ -145,7 +148,7 @@ size_t Port_ESPEasySerial_USB_HWCDC_t::read(uint8_t *buffer, void Port_ESPEasySerial_USB_HWCDC_t::flush(void) { - if (_hwcdc_serial != nullptr) { + if (_hwcdc_serial != nullptr && _hwcdc_serial->isConnected()) { return _hwcdc_serial->flush(); } } @@ -174,10 +177,9 @@ size_t Port_ESPEasySerial_USB_HWCDC_t::write(const uint8_t *buffer, Port_ESPEasySerial_USB_HWCDC_t::operator bool() const { - if (_hwcdc_serial != nullptr) { + if (_hwcdc_serial != nullptr && _hwcdc_serial->isConnected()) { // return usbActive; - const bool connected = (*_hwcdc_serial); - return connected; + return true; } return false; } diff --git a/lib/ESPEasySerial/Port_ESPEasySerial_USB_HWCDC.h b/lib/ESPEasySerial/Port_ESPEasySerial_USB_HWCDC.h index a71bfd411..7de5565a5 100644 --- a/lib/ESPEasySerial/Port_ESPEasySerial_USB_HWCDC.h +++ b/lib/ESPEasySerial/Port_ESPEasySerial_USB_HWCDC.h @@ -43,7 +43,9 @@ public: bool setRS485Mode(int8_t rtsPin, bool enableCollisionDetection = false); private: - +#if !ARDUINO_USB_CDC_ON_BOOT + HWCDC myUsbSerial; +#endif HWCDC *_hwcdc_serial= nullptr; }; diff --git a/src/src/CustomBuild/define_plugin_sets.h b/src/src/CustomBuild/define_plugin_sets.h index 788b2bd63..bedbcb1f2 100644 --- a/src/src/CustomBuild/define_plugin_sets.h +++ b/src/src/CustomBuild/define_plugin_sets.h @@ -3752,12 +3752,7 @@ To create/register a plugin, you have to : #if FEATURE_DEFINE_SERIAL_CONSOLE_PORT # if USES_HWCDC || USES_USBCDC -# ifdef ESP32P4 -// FIXME TD-er: No idea why, but with fallback enabled, the P4 will not show anything on the serial console -# define USES_ESPEASY_CONSOLE_FALLBACK_PORT 0 -# else -# define USES_ESPEASY_CONSOLE_FALLBACK_PORT 1 -# endif +# define USES_ESPEASY_CONSOLE_FALLBACK_PORT 1 # endif // if USES_HWCDC || USES_USBCDC # ifndef PLUGIN_USES_SERIAL // Needs Plugin_Helper_serial diff --git a/src/src/DataStructs/LogBuffer.cpp b/src/src/DataStructs/LogBuffer.cpp index 50da7159d..6f70bbfc3 100644 --- a/src/src/DataStructs/LogBuffer.cpp +++ b/src/src/DataStructs/LogBuffer.cpp @@ -15,9 +15,7 @@ bool LogBuffer::getNext(uint8_t logDestination, uint32_t& timestamp, String& mes { if (logDestination >= NR_LOG_TO_DESTINATIONS) { return false; } - if (logDestination == LOG_TO_WEBLOG) { - lastReadTimeStamp = millis(); - } + lastReadTimeStamp[logDestination] = millis(); while (cache_iterator_pos[logDestination] < LogEntries.size()) { @@ -39,27 +37,29 @@ bool LogBuffer::getNext(uint8_t logDestination, uint32_t& timestamp, String& mes uint32_t LogBuffer::getNrMessages(uint8_t logDestination) const { uint32_t res{}; + if (logDestination >= NR_LOG_TO_DESTINATIONS) { return res; } uint32_t pos = cache_iterator_pos[logDestination]; - for (;pos < LogEntries.size(); ++pos) { + + for (; pos < LogEntries.size(); ++pos) { if (LogEntries[pos].validForSubscriber(logDestination)) { ++res; - } + } } return res; - - } -bool LogBuffer::logActiveRead() { - clearExpiredEntries(); - return timePassedSince(lastReadTimeStamp) < LOG_BUFFER_ACTIVE_READ_TIMEOUT; +bool LogBuffer::logActiveRead(uint8_t logDestination) { + if (logDestination >= NR_LOG_TO_DESTINATIONS) { return false; } + return timePassedSince(lastReadTimeStamp[logDestination]) < LOG_BUFFER_ACTIVE_READ_TIMEOUT; } void LogBuffer::clearExpiredEntries() { for (auto it = LogEntries.begin(); it != LogEntries.end();) { + it->updateSubscribers(); + if (it->isExpired()) { for (size_t i = 0; i < NR_LOG_TO_DESTINATIONS; ++i) { if (cache_iterator_pos[i]) { diff --git a/src/src/DataStructs/LogBuffer.h b/src/src/DataStructs/LogBuffer.h index 00ef61622..08fb85d25 100644 --- a/src/src/DataStructs/LogBuffer.h +++ b/src/src/DataStructs/LogBuffer.h @@ -55,14 +55,14 @@ struct LogBuffer { // Return the number of messages left for given log destination. uint32_t getNrMessages(uint8_t logDestination) const; - bool logActiveRead(); + bool logActiveRead(uint8_t logDestination); void clearExpiredEntries(); private: LogEntry_queue LogEntries; - uint32_t lastReadTimeStamp{}; + uint32_t lastReadTimeStamp[NR_LOG_TO_DESTINATIONS]{}; uint32_t cache_iterator_pos[NR_LOG_TO_DESTINATIONS]{}; diff --git a/src/src/DataStructs/LogEntry.cpp b/src/src/DataStructs/LogEntry.cpp index d13ad9220..d0a09296f 100644 --- a/src/src/DataStructs/LogEntry.cpp +++ b/src/src/DataStructs/LogEntry.cpp @@ -117,7 +117,7 @@ void LogEntry_t::setSubscribers() { if (isValid()) { for (uint32_t i = 0; i < NR_LOG_TO_DESTINATIONS; ++i) { - bitWrite(_subscriberPendingRead, (1 << i), + bitWrite(_subscriberPendingRead, i, loglevelActiveFor(i, _logLevel)); } } @@ -127,10 +127,26 @@ void LogEntry_t::setSubscribers() } } +void LogEntry_t::updateSubscribers() +{ + if (isValid()) { + for (uint32_t i = 0; i < NR_LOG_TO_DESTINATIONS; ++i) { + if (bitRead(_subscriberPendingRead, i)) { + if (!loglevelActiveFor(i, _logLevel)) { + bitClear(_subscriberPendingRead, i); + } + } + } + if (_subscriberPendingRead == 0) { + clear(); + } + } +} + void LogEntry_t::markReadBySubscriber(uint8_t subscriber) { if (subscriber < NR_LOG_TO_DESTINATIONS) { - bitClear(_subscriberPendingRead, (1 << subscriber)); + bitClear(_subscriberPendingRead, subscriber); } if (_subscriberPendingRead == 0) { @@ -140,7 +156,7 @@ void LogEntry_t::markReadBySubscriber(uint8_t subscriber) bool LogEntry_t::validForSubscriber(uint8_t subscriber) const { - return isValid() && (subscriber < NR_LOG_TO_DESTINATIONS) && bitRead(_subscriberPendingRead, (1 << subscriber)); + return isValid() && (subscriber < NR_LOG_TO_DESTINATIONS) && bitRead(_subscriberPendingRead, subscriber); } size_t LogEntry_t::print(Print& out, size_t offset, size_t length) const diff --git a/src/src/DataStructs/LogEntry.h b/src/src/DataStructs/LogEntry.h index 36bb9680b..15c81fd7c 100644 --- a/src/src/DataStructs/LogEntry.h +++ b/src/src/DataStructs/LogEntry.h @@ -45,6 +45,9 @@ struct LogEntry_t { void setSubscribers(); + // This may clear pending reads when a log subscriber is no longer actively reading + void updateSubscribers(); + void markReadBySubscriber(uint8_t subscriber); bool validForSubscriber(uint8_t subscriber) const; diff --git a/src/src/ESPEasyCore/ESPEasy_Log.cpp b/src/src/ESPEasyCore/ESPEasy_Log.cpp index a5ffd0085..85c752573 100644 --- a/src/src/ESPEasyCore/ESPEasy_Log.cpp +++ b/src/src/ESPEasyCore/ESPEasy_Log.cpp @@ -86,7 +86,7 @@ void updateLogLevelCache() { } max_lvl = _max(max_lvl, Settings.SyslogLevel); - if (Logging.webLogActiveRead()) { + if (Logging.logActiveRead(LOG_TO_WEBLOG)) { max_lvl = _max(max_lvl, Settings.WebLogLevel); } #if FEATURE_SD @@ -136,7 +136,7 @@ uint8_t getSerialLogLevel() { } uint8_t getWebLogLevel() { - if (Logging.webLogActiveRead()) { + if (Logging.logActiveRead(LOG_TO_WEBLOG)) { return Settings.WebLogLevel; } @@ -158,11 +158,14 @@ bool loglevelActiveFor(uint8_t destination, uint8_t logLevel) { } #endif // ifdef ESP32 + if (!Logging.logActiveRead(destination)) { return false; } + uint8_t logLevelSettings = 0; switch (destination) { case LOG_TO_SERIAL: + case LOG_TO_SERIAL_EXTRA: { logLevelSettings = getSerialLogLevel(); break; diff --git a/src/src/ESPEasyCore/ESPEasy_backgroundtasks.cpp b/src/src/ESPEasyCore/ESPEasy_backgroundtasks.cpp index c92ad6dec..f45d20653 100644 --- a/src/src/ESPEasyCore/ESPEasy_backgroundtasks.cpp +++ b/src/src/ESPEasyCore/ESPEasy_backgroundtasks.cpp @@ -76,6 +76,7 @@ void backgroundtasks() process_serialWriteBuffer(); syslogWriter.process(); + Logging.loop(); if (!UseRTOSMultitasking) { serial(); diff --git a/src/src/Helpers/Log_Helper.cpp b/src/src/Helpers/Log_Helper.cpp index 6ecdb1ad1..efa2d08fc 100644 --- a/src/src/Helpers/Log_Helper.cpp +++ b/src/src/Helpers/Log_Helper.cpp @@ -91,7 +91,10 @@ void LogHelper::loop() _logBuffer.clearExpiredEntries(); } -bool LogHelper::webLogActiveRead() { return _logBuffer.logActiveRead(); } +bool LogHelper::logActiveRead(uint8_t logDestination) +{ + return _logBuffer.logActiveRead(logDestination); +} void LogHelper::consolePrint(const __FlashStringHelper *text) { _tmpConsoleOutput += text; } diff --git a/src/src/Helpers/Log_Helper.h b/src/src/Helpers/Log_Helper.h index ef352b064..af637a74a 100644 --- a/src/src/Helpers/Log_Helper.h +++ b/src/src/Helpers/Log_Helper.h @@ -23,7 +23,7 @@ public: void loop(); - bool webLogActiveRead(); + bool logActiveRead(uint8_t logDestination); // Append to internal buffer, which will only be flushed on consolePrintln From e577c7d78634c9c1d3fd2a3e2f53a4f43ecb8469 Mon Sep 17 00:00:00 2001 From: TD-er Date: Mon, 27 Oct 2025 13:42:32 +0100 Subject: [PATCH 426/564] [Network] Make connected check more direct when starting connection --- src/ESPEasy/net/ESPEasyNetwork.h | 2 +- src/ESPEasy/net/ESPEasyNetwork_ESP32.cpp | 14 ++++++++++++-- src/ESPEasy/net/ESPEasyNetwork_ESP8266.cpp | 4 ++-- src/src/Helpers/ESPEasy_time.cpp | 6 +++--- src/src/Helpers/MDNS_Helper.cpp | 2 +- src/src/Helpers/Networking.cpp | 10 ++++++---- src/src/PluginStructs/P020_data_struct.cpp | 2 +- 7 files changed, 26 insertions(+), 14 deletions(-) diff --git a/src/ESPEasy/net/ESPEasyNetwork.h b/src/ESPEasy/net/ESPEasyNetwork.h index 3e08d45d6..22534cf74 100644 --- a/src/ESPEasy/net/ESPEasyNetwork.h +++ b/src/ESPEasy/net/ESPEasyNetwork.h @@ -24,7 +24,7 @@ namespace net { void setNetworkMedium(NetworkMedium_t medium); // void NetworkConnectRelaxed(); -bool NetworkConnected(); +bool NetworkConnected(bool force = false); IPAddress NetworkLocalIP(); IPAddress NetworkID(); IPAddress NetworkBroadcast(); diff --git a/src/ESPEasy/net/ESPEasyNetwork_ESP32.cpp b/src/ESPEasy/net/ESPEasyNetwork_ESP32.cpp index 571edabca..d570d917a 100644 --- a/src/ESPEasy/net/ESPEasyNetwork_ESP32.cpp +++ b/src/ESPEasy/net/ESPEasyNetwork_ESP32.cpp @@ -123,13 +123,23 @@ NetworkInterface* getDefaultNonAP_interface() return network_if; } -bool NetworkConnected() { +bool NetworkConnected(bool force) { static bool last_result = false; static uint32_t last_check_millis = 0; - if (timePassedSince(last_check_millis) > 50 || last_check_millis == 0) { + if (force || timePassedSince(last_check_millis) > 50 || last_check_millis == 0) { last_check_millis = millis(); auto network_if = getDefaultNonAP_interface(); + + // FIXME TD-er: This is checking for NonAP interfaces, however we also have ESPEasy::net::NWPluginCall(NWPlugin::Function::NWPLUGIN_WEBSERVER_SHOULD_RUN); + // So maybe we should keep bitmasks for interfaces that can be used for certain services and update those whenever an interface is connected/disconnected + // This way a service may 'subscribe' to changes and stopped/started/restarted when needed. + // For example: + // - updateUDPport() + // - CheckRunningServices() + // - mDNS + // - Webserver + if (network_if == nullptr) { return false; } diff --git a/src/ESPEasy/net/ESPEasyNetwork_ESP8266.cpp b/src/ESPEasy/net/ESPEasyNetwork_ESP8266.cpp index 159261cb3..935ece720 100644 --- a/src/ESPEasy/net/ESPEasyNetwork_ESP8266.cpp +++ b/src/ESPEasy/net/ESPEasyNetwork_ESP8266.cpp @@ -56,10 +56,10 @@ void setNetworkMedium(NetworkMedium_t new_medium) { // ESPEasy::net::wifi::WiFiConnectRelaxed(); // } -bool NetworkConnected() { +bool NetworkConnected(bool force) { static bool last_result = false; static uint32_t last_check_millis = 0; - if (timePassedSince(last_check_millis) > 50 || last_check_millis == 0) { + if (force || timePassedSince(last_check_millis) > 50 || last_check_millis == 0) { last_check_millis = millis(); processNetworkEvents(); last_result = ESPEasy::net::wifi::WiFiConnected(); diff --git a/src/src/Helpers/ESPEasy_time.cpp b/src/src/Helpers/ESPEasy_time.cpp index 65eb326ab..9b06b7f54 100644 --- a/src/src/Helpers/ESPEasy_time.cpp +++ b/src/src/Helpers/ESPEasy_time.cpp @@ -509,7 +509,7 @@ bool ESPEasy_time::systemTimePresent() const { bool ESPEasy_time::getNtpTime(double& unixTime_d) { - if (!Settings.UseNTP() || !NetworkConnected(10)) { + if (!Settings.UseNTP() || !ESPEasy::net::NetworkConnected()) { return false; } @@ -526,7 +526,7 @@ bool ESPEasy_time::getNtpTime(double& unixTime_d) bool useNTPpool = false; if (Settings.NTPHost[0] != 0) { - resolveHostByName(Settings.NTPHost, timeServerIP); + if (!resolveHostByName(Settings.NTPHost, timeServerIP)) return false; log += Settings.NTPHost; // When single set host fails, retry again in 20 seconds @@ -535,7 +535,7 @@ bool ESPEasy_time::getNtpTime(double& unixTime_d) // Have to do a lookup each time, since the NTP pool always returns another IP const String ntpServerName = strformat( F("%d.pool.ntp.org"), HwRandom(0, 3)); - resolveHostByName(ntpServerName.c_str(), timeServerIP); + if (!resolveHostByName(ntpServerName.c_str(), timeServerIP)) return false; log += ntpServerName; // When pool host fails, retry can be much sooner diff --git a/src/src/Helpers/MDNS_Helper.cpp b/src/src/Helpers/MDNS_Helper.cpp index fe03ea81a..bef39c021 100644 --- a/src/src/Helpers/MDNS_Helper.cpp +++ b/src/src/Helpers/MDNS_Helper.cpp @@ -16,7 +16,7 @@ void set_mDNS() { #if FEATURE_MDNS - if (!ESPEasy::net::NetworkConnected()) return; + if (!ESPEasy::net::NetworkConnected(true)) return; update_mDNS(); #endif // if FEATURE_MDNS diff --git a/src/src/Helpers/Networking.cpp b/src/src/Helpers/Networking.cpp index 51dac8ca1..021d900eb 100644 --- a/src/src/Helpers/Networking.cpp +++ b/src/src/Helpers/Networking.cpp @@ -210,7 +210,9 @@ boolean runningUPDCheck = false; void checkUDP() { - if (!ESPEasy::net::NetworkConnected()) { + if (!ESPEasy::net::NetworkConnected(true)) { + portUDP.clear(); + portUDP.stop(); return; } @@ -1064,7 +1066,7 @@ bool connectClient(WiFiClient& client, IPAddress ip, uint16_t port, uint32_t tim { START_TIMER; - if (!ESPEasy::net::NetworkConnected()) { + if (!ESPEasy::net::NetworkConnected(true)) { client.stop(); return false; } @@ -1185,7 +1187,7 @@ bool setDNS(int index, const IPAddress& dns) { bool resolveHostByName(const char *aHostname, IPAddress& aResult, uint32_t timeout_ms) { START_TIMER; - if (!ESPEasy::net::NetworkConnected()) { + if (!ESPEasy::net::NetworkConnected(true)) { return false; } @@ -1225,7 +1227,7 @@ bool hostReachable(const String& hostname) { // Create a random port for the UDP connection. // Return true when successful. bool beginWiFiUDP_randomPort(WiFiUDP& udp) { - if (!ESPEasy::net::NetworkConnected()) { + if (!ESPEasy::net::NetworkConnected(true)) { return false; } unsigned int attempts = 3; diff --git a/src/src/PluginStructs/P020_data_struct.cpp b/src/src/PluginStructs/P020_data_struct.cpp index e05ae2efd..d30b6b708 100644 --- a/src/src/PluginStructs/P020_data_struct.cpp +++ b/src/src/PluginStructs/P020_data_struct.cpp @@ -71,7 +71,7 @@ void P020_Task::startServer(uint16_t portnumber) { gatewayPort = portnumber; ser2netServer = new (std::nothrow) WiFiServer(portnumber); - if ((nullptr != ser2netServer) && ESPEasy::net::NetworkConnected()) { + if ((nullptr != ser2netServer) && ESPEasy::net::NetworkConnected(true)) { ser2netServer->begin(); if (serverActive(ser2netServer)) { From 073dc200a04cb3095b6656cd1f17c26256767ca7 Mon Sep 17 00:00:00 2001 From: TD-er Date: Mon, 27 Oct 2025 14:45:54 +0100 Subject: [PATCH 427/564] [Build] Fix flush() vs. clear() as it differs between ESP8266 and ESP32 --- src/src/Helpers/Networking.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/src/Helpers/Networking.cpp b/src/src/Helpers/Networking.cpp index 021d900eb..abd9c5408 100644 --- a/src/src/Helpers/Networking.cpp +++ b/src/src/Helpers/Networking.cpp @@ -211,7 +211,7 @@ boolean runningUPDCheck = false; void checkUDP() { if (!ESPEasy::net::NetworkConnected(true)) { - portUDP.clear(); + portUDP.PR_9453_FLUSH_TO_CLEAR(); portUDP.stop(); return; } From ff9c33f6151b82e3c142b478fd1d4af9f1d7e07c Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 27 Oct 2025 14:52:49 +0000 Subject: [PATCH 428/564] Bump actions/download-artifact from 5 to 6 Bumps [actions/download-artifact](https://github.com/actions/download-artifact) from 5 to 6. - [Release notes](https://github.com/actions/download-artifact/releases) - [Commits](https://github.com/actions/download-artifact/compare/v5...v6) --- updated-dependencies: - dependency-name: actions/download-artifact dependency-version: '6' dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] --- .github/workflows/build.yml | 2 +- .github/workflows/release.yml | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index f2884eac2..436a6bb78 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -110,7 +110,7 @@ jobs: run: | echo "builddate=$(date +'%Y%m%d')" >> $GITHUB_OUTPUT - name: Download all artifacts - uses: actions/download-artifact@v5 + uses: actions/download-artifact@v6 with: path: artifacts/Binaries/bin/ pattern: Bin-* diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 3093a4dff..c5ddfeee8 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -127,13 +127,13 @@ jobs: run: | echo "builddate=$(date +'%Y%m%d')" >> $GITHUB_OUTPUT - name: Download all successfully compiled artifacts - uses: actions/download-artifact@v5 + uses: actions/download-artifact@v6 with: path: artifacts/bin/ pattern: Bin-* merge-multiple: true - name: Download dist and docs zip files - uses: actions/download-artifact@v5 + uses: actions/download-artifact@v6 with: path: distribution/ name: Distribution From 9da96ebb15e27395b611c860a75f2c6ceb0dd134 Mon Sep 17 00:00:00 2001 From: TD-er Date: Mon, 27 Oct 2025 15:59:28 +0100 Subject: [PATCH 429/564] [Build] Make normal_ESP8266_1M_VCC not fail building (still too big) --- src/src/DataStructs/LogBuffer.cpp | 6 ++-- src/src/DataStructs/LogBuffer.h | 6 ++-- src/src/DataStructs/LogEntry.cpp | 4 +-- src/src/DataStructs_templ/SettingsStruct.cpp | 1 + src/src/DataTypes/LogLevels.h | 18 ++++++++---- src/src/ESPEasyCore/ESPEasy_Console_Port.cpp | 2 +- src/src/ESPEasyCore/ESPEasy_Console_Port.h | 2 +- src/src/ESPEasyCore/ESPEasy_Log.cpp | 17 +++++++++--- src/src/ESPEasyCore/ESPEasy_Log.h | 8 +++--- src/src/Helpers/ESPEasy_FactoryDefault.cpp | 2 ++ src/src/Helpers/LogStreamWriter.h | 4 +-- src/src/Helpers/Log_Helper.cpp | 29 ++++++-------------- src/src/Helpers/Log_Helper.h | 6 ++-- src/src/Helpers/SerialWriteBuffer.h | 2 +- src/src/Helpers/SyslogWriter.h | 2 +- src/src/PluginStructs/P002_data_struct.cpp | 5 +++- src/src/WebServer/AdvancedConfigPage.cpp | 2 +- 17 files changed, 63 insertions(+), 53 deletions(-) diff --git a/src/src/DataStructs/LogBuffer.cpp b/src/src/DataStructs/LogBuffer.cpp index 6f70bbfc3..065db1c90 100644 --- a/src/src/DataStructs/LogBuffer.cpp +++ b/src/src/DataStructs/LogBuffer.cpp @@ -11,7 +11,7 @@ void LogBuffer::add(LogEntry_t&& logEntry) { } } -bool LogBuffer::getNext(uint8_t logDestination, uint32_t& timestamp, String& message, uint8_t& loglevel) +bool LogBuffer::getNext(LogDestination logDestination, uint32_t& timestamp, String& message, uint8_t& loglevel) { if (logDestination >= NR_LOG_TO_DESTINATIONS) { return false; } @@ -34,7 +34,7 @@ bool LogBuffer::getNext(uint8_t logDestination, uint32_t& timestamp, String& mes return false; } -uint32_t LogBuffer::getNrMessages(uint8_t logDestination) const +uint32_t LogBuffer::getNrMessages(LogDestination logDestination) const { uint32_t res{}; @@ -50,7 +50,7 @@ uint32_t LogBuffer::getNrMessages(uint8_t logDestination) const return res; } -bool LogBuffer::logActiveRead(uint8_t logDestination) { +bool LogBuffer::logActiveRead(LogDestination logDestination) { if (logDestination >= NR_LOG_TO_DESTINATIONS) { return false; } return timePassedSince(lastReadTimeStamp[logDestination]) < LOG_BUFFER_ACTIVE_READ_TIMEOUT; } diff --git a/src/src/DataStructs/LogBuffer.h b/src/src/DataStructs/LogBuffer.h index 08fb85d25..8df20ab07 100644 --- a/src/src/DataStructs/LogBuffer.h +++ b/src/src/DataStructs/LogBuffer.h @@ -47,15 +47,15 @@ struct LogBuffer { } // Returns whether a line was retrieved. - bool getNext(uint8_t logDestination, + bool getNext(LogDestination logDestination, uint32_t& timestamp, String & message, uint8_t & loglevel); // Return the number of messages left for given log destination. - uint32_t getNrMessages(uint8_t logDestination) const; + uint32_t getNrMessages(LogDestination logDestination) const; - bool logActiveRead(uint8_t logDestination); + bool logActiveRead(LogDestination logDestination); void clearExpiredEntries(); diff --git a/src/src/DataStructs/LogEntry.cpp b/src/src/DataStructs/LogEntry.cpp index d0a09296f..3d915b0bf 100644 --- a/src/src/DataStructs/LogEntry.cpp +++ b/src/src/DataStructs/LogEntry.cpp @@ -118,7 +118,7 @@ void LogEntry_t::setSubscribers() if (isValid()) { for (uint32_t i = 0; i < NR_LOG_TO_DESTINATIONS; ++i) { bitWrite(_subscriberPendingRead, i, - loglevelActiveFor(i, _logLevel)); + loglevelActiveFor(static_cast(i), _logLevel)); } } @@ -132,7 +132,7 @@ void LogEntry_t::updateSubscribers() if (isValid()) { for (uint32_t i = 0; i < NR_LOG_TO_DESTINATIONS; ++i) { if (bitRead(_subscriberPendingRead, i)) { - if (!loglevelActiveFor(i, _logLevel)) { + if (!loglevelActiveFor(static_cast(i), _logLevel)) { bitClear(_subscriberPendingRead, i); } } diff --git a/src/src/DataStructs_templ/SettingsStruct.cpp b/src/src/DataStructs_templ/SettingsStruct.cpp index f6ba2de02..57330ef15 100644 --- a/src/src/DataStructs_templ/SettingsStruct.cpp +++ b/src/src/DataStructs_templ/SettingsStruct.cpp @@ -583,6 +583,7 @@ void SettingsStruct_tmpl::validate() { } } } else { + } } diff --git a/src/src/DataTypes/LogLevels.h b/src/src/DataTypes/LogLevels.h index 201855589..454cec104 100644 --- a/src/src/DataTypes/LogLevels.h +++ b/src/src/DataTypes/LogLevels.h @@ -13,14 +13,20 @@ # define LOG_LEVEL_DEBUG_DEV 9 // use for testing/debugging only, not for regular use #endif // ifndef BUILD_NO_DEBUG -#define LOG_TO_SERIAL 0 -#define LOG_TO_SYSLOG 1 -#define LOG_TO_WEBLOG 2 -#define LOG_TO_SDCARD 3 -#define LOG_TO_SERIAL_EXTRA 4 +enum LogDestination { -#define NR_LOG_TO_DESTINATIONS 5 // Update this when adding extra log output streams + LOG_TO_SERIAL , + LOG_TO_SYSLOG , + LOG_TO_WEBLOG , +#if FEATURE_SD + LOG_TO_SDCARD , +#endif +#if USES_ESPEASY_CONSOLE_FALLBACK_PORT + LOG_TO_SERIAL_EXTRA , +#endif + NR_LOG_TO_DESTINATIONS +}; #ifdef BUILD_NO_DEBUG # define LOG_LEVEL_MAX_STRING_LENGTH 6 diff --git a/src/src/ESPEasyCore/ESPEasy_Console_Port.cpp b/src/src/ESPEasyCore/ESPEasy_Console_Port.cpp index a70a99e06..ec5dfb6b8 100644 --- a/src/src/ESPEasyCore/ESPEasy_Console_Port.cpp +++ b/src/src/ESPEasyCore/ESPEasy_Console_Port.cpp @@ -23,7 +23,7 @@ #endif // if FEATURE_DEFINE_SERIAL_CONSOLE_PORT */ -EspEasy_Console_Port::EspEasy_Console_Port(uint8_t log_destination) +EspEasy_Console_Port::EspEasy_Console_Port(LogDestination log_destination) : _serialWriteBuffer(log_destination) {} EspEasy_Console_Port::~EspEasy_Console_Port() diff --git a/src/src/ESPEasyCore/ESPEasy_Console_Port.h b/src/src/ESPEasyCore/ESPEasy_Console_Port.h index 201a8e066..4be62cf27 100644 --- a/src/src/ESPEasyCore/ESPEasy_Console_Port.h +++ b/src/src/ESPEasyCore/ESPEasy_Console_Port.h @@ -21,7 +21,7 @@ struct EspEasy_Console_Port { - EspEasy_Console_Port(uint8_t log_destination); + EspEasy_Console_Port(LogDestination log_destination); ~EspEasy_Console_Port(); operator bool() const; diff --git a/src/src/ESPEasyCore/ESPEasy_Log.cpp b/src/src/ESPEasyCore/ESPEasy_Log.cpp index 85c752573..99bc7412a 100644 --- a/src/src/ESPEasyCore/ESPEasy_Log.cpp +++ b/src/src/ESPEasyCore/ESPEasy_Log.cpp @@ -33,7 +33,9 @@ void initLog() setLogLevelFor(LOG_TO_SERIAL, 2); // logging during initialisation +#if FEATURE_SD setLogLevelFor(LOG_TO_SDCARD, 0); +#endif } /********************************************************************************************\ @@ -44,10 +46,13 @@ void disableSerialLog() { setLogLevelFor(LOG_TO_SERIAL, 0); } -void setLogLevelFor(uint8_t destination, uint8_t logLevel) { +void setLogLevelFor(LogDestination destination, uint8_t logLevel) { switch (destination) { case LOG_TO_SERIAL: +#if USES_ESPEASY_CONSOLE_FALLBACK_PORT + case LOG_TO_SERIAL_EXTRA: +#endif if (!log_to_serial_disabled || (logLevel == 0)) { Settings.SerialLogLevel = logLevel; @@ -57,8 +62,10 @@ void setLogLevelFor(uint8_t destination, uint8_t logLevel) { break; case LOG_TO_WEBLOG: Settings.WebLogLevel = logLevel; break; +#if FEATURE_SD case LOG_TO_SDCARD: Settings.SDLogLevel = logLevel; break; +#endif // if FEATURE_SD default: break; } @@ -146,7 +153,7 @@ uint8_t getWebLogLevel() { return LOG_LEVEL_NONE; } -bool loglevelActiveFor(uint8_t destination, uint8_t logLevel) { +bool loglevelActiveFor(LogDestination destination, uint8_t logLevel) { #ifdef ESP32 if (xPortInIsrContext()) { @@ -165,7 +172,9 @@ bool loglevelActiveFor(uint8_t destination, uint8_t logLevel) { switch (destination) { case LOG_TO_SERIAL: +#if USES_ESPEASY_CONSOLE_FALLBACK_PORT case LOG_TO_SERIAL_EXTRA: +#endif { logLevelSettings = getSerialLogLevel(); break; @@ -183,14 +192,14 @@ bool loglevelActiveFor(uint8_t destination, uint8_t logLevel) { if (logLevel == LOG_LEVEL_NONE) { return logLevelSettings != LOG_LEVEL_NONE; } break; } +#if FEATURE_SD case LOG_TO_SDCARD: { if (logLevel == LOG_LEVEL_NONE) { return false; } - #if FEATURE_SD logLevelSettings = Settings.SDLogLevel; - #endif break; } +#endif // if FEATURE_SD default: return false; } diff --git a/src/src/ESPEasyCore/ESPEasy_Log.h b/src/src/ESPEasyCore/ESPEasy_Log.h index 54bf5e5ea..227703f96 100644 --- a/src/src/ESPEasyCore/ESPEasy_Log.h +++ b/src/src/ESPEasyCore/ESPEasy_Log.h @@ -19,8 +19,8 @@ void initLog(); void disableSerialLog(); -void setLogLevelFor(uint8_t destination, - uint8_t logLevel); +void setLogLevelFor(LogDestination destination, + uint8_t logLevel); void updateLogLevelCache(); @@ -30,8 +30,8 @@ uint8_t getSerialLogLevel(); uint8_t getWebLogLevel(); -bool loglevelActiveFor(uint8_t destination, - uint8_t logLevel); +bool loglevelActiveFor(LogDestination destination, + uint8_t logLevel); void addLog(uint8_t logLevel, const __FlashStringHelper *str); diff --git a/src/src/Helpers/ESPEasy_FactoryDefault.cpp b/src/src/Helpers/ESPEasy_FactoryDefault.cpp index 1199b6d63..826ffbcb6 100644 --- a/src/src/Helpers/ESPEasy_FactoryDefault.cpp +++ b/src/src/Helpers/ESPEasy_FactoryDefault.cpp @@ -236,7 +236,9 @@ void ResetFactory(bool formatFS) setLogLevelFor(LOG_TO_SYSLOG, DEFAULT_SYSLOG_LEVEL); setLogLevelFor(LOG_TO_SERIAL, DEFAULT_SERIAL_LOG_LEVEL); setLogLevelFor(LOG_TO_WEBLOG, DEFAULT_WEB_LOG_LEVEL); +#if FEATURE_SD setLogLevelFor(LOG_TO_SDCARD, DEFAULT_SD_LOG_LEVEL); +#endif Settings.SyslogFacility = DEFAULT_SYSLOG_FACILITY; Settings.SyslogPort = DEFAULT_SYSLOG_PORT; Settings.UseValueLogger = DEFAULT_USE_SD_LOG; diff --git a/src/src/Helpers/LogStreamWriter.h b/src/src/Helpers/LogStreamWriter.h index 6cab5cae3..2e94453ed 100644 --- a/src/src/Helpers/LogStreamWriter.h +++ b/src/src/Helpers/LogStreamWriter.h @@ -7,7 +7,7 @@ class LogStreamWriter public: - LogStreamWriter(uint8_t log_destination) : _log_destination(log_destination) {} + LogStreamWriter(LogDestination log_destination) : _log_destination(log_destination) {} virtual ~LogStreamWriter() {} @@ -48,7 +48,7 @@ protected: uint32_t _readpos{}; uint8_t _loglevel{}; - const uint8_t _log_destination; + const LogDestination _log_destination; }; // class LogStreamWriter diff --git a/src/src/Helpers/Log_Helper.cpp b/src/src/Helpers/Log_Helper.cpp index efa2d08fc..b96f3e00e 100644 --- a/src/src/Helpers/Log_Helper.cpp +++ b/src/src/Helpers/Log_Helper.cpp @@ -13,10 +13,9 @@ # include "../Helpers/ESPEasy_Storage.h" #endif // if FEATURE_SD +#if FEATURE_SD void addToSDLog(uint8_t logLevel, const String& str) { -#if FEATURE_SD - if (!str.isEmpty() && loglevelActiveFor(LOG_TO_SDCARD, logLevel)) { String logName = patch_fname(F("log.txt")); fs::File logFile = SD.open(logName, "a+"); @@ -31,8 +30,8 @@ void addToSDLog(uint8_t logLevel, const String& str) } logFile.close(); } -#endif // if FEATURE_SD } +#endif // if FEATURE_SD void LogHelper::addLogEntry(LogEntry_t&& logEntry) { @@ -56,42 +55,32 @@ void LogHelper::addLogEntry(LogEntry_t&& logEntry) loop(); } -bool LogHelper::getNext(uint8_t logDestination, uint32_t& timestamp, String& message, uint8_t& loglevel) +bool LogHelper::getNext(LogDestination logDestination, uint32_t& timestamp, String& message, uint8_t& loglevel) { return _logBuffer.getNext(logDestination, timestamp, message, loglevel); } -uint32_t LogHelper::getNrMessages(uint8_t logDestination) const +uint32_t LogHelper::getNrMessages(LogDestination logDestination) const { return _logBuffer.getNrMessages(logDestination); } void LogHelper::loop() { - const uint8_t destinations[] = { - LOG_TO_SDCARD - }; - - for (uint8_t i = 0; i < NR_ELEMENTS(destinations); ++i) { +#if FEATURE_SD String message; uint32_t timestamp{}; uint8_t loglevel{}; - if (_logBuffer.getNext(destinations[i], timestamp, message, loglevel)) + if (_logBuffer.getNext(LOG_TO_SDCARD, timestamp, message, loglevel)) { - switch (destinations[i]) - { - case LOG_TO_SDCARD: - addToSDLog(loglevel, message); - break; - } + addToSDLog(loglevel, message); } - } - +#endif _logBuffer.clearExpiredEntries(); } -bool LogHelper::logActiveRead(uint8_t logDestination) +bool LogHelper::logActiveRead(LogDestination logDestination) { return _logBuffer.logActiveRead(logDestination); } diff --git a/src/src/Helpers/Log_Helper.h b/src/src/Helpers/Log_Helper.h index af637a74a..a858f7915 100644 --- a/src/src/Helpers/Log_Helper.h +++ b/src/src/Helpers/Log_Helper.h @@ -14,16 +14,16 @@ public: void addLogEntry(LogEntry_t&& logEntry); - bool getNext(uint8_t logDestination, + bool getNext(LogDestination logDestination, uint32_t& timestamp, String & message, uint8_t & loglevel); - uint32_t getNrMessages(uint8_t logDestination) const; + uint32_t getNrMessages(LogDestination logDestination) const; void loop(); - bool logActiveRead(uint8_t logDestination); + bool logActiveRead(LogDestination logDestination); // Append to internal buffer, which will only be flushed on consolePrintln diff --git a/src/src/Helpers/SerialWriteBuffer.h b/src/src/Helpers/SerialWriteBuffer.h index 791299970..556561570 100644 --- a/src/src/Helpers/SerialWriteBuffer.h +++ b/src/src/Helpers/SerialWriteBuffer.h @@ -8,7 +8,7 @@ class SerialWriteBuffer_t : public LogStreamWriter { public: - SerialWriteBuffer_t(uint8_t log_destination) : LogStreamWriter(log_destination) {} + SerialWriteBuffer_t(LogDestination log_destination) : LogStreamWriter(log_destination) {} diff --git a/src/src/Helpers/SyslogWriter.h b/src/src/Helpers/SyslogWriter.h index a4a38a3ba..ed426ab12 100644 --- a/src/src/Helpers/SyslogWriter.h +++ b/src/src/Helpers/SyslogWriter.h @@ -12,7 +12,7 @@ class SyslogWriter : public LogStreamWriter { public: - SyslogWriter(uint8_t log_destination) : LogStreamWriter(log_destination) {} + SyslogWriter(LogDestination log_destination) : LogStreamWriter(log_destination) {} virtual bool process() override; diff --git a/src/src/PluginStructs/P002_data_struct.cpp b/src/src/PluginStructs/P002_data_struct.cpp index 3770e44fe..d8e716c12 100644 --- a/src/src/PluginStructs/P002_data_struct.cpp +++ b/src/src/PluginStructs/P002_data_struct.cpp @@ -224,7 +224,9 @@ void P002_data_struct::webformLoad(struct EventStruct *event) # ifdef ESP8266 # if FEATURE_ADC_VCC +#ifndef LIMIT_BUILD_SIZE addFormNote(F("Measuring ESP VCC, not A0. Unit is 1/1024 V. See documentation.")); +#endif # endif // if FEATURE_ADC_VCC # endif // ifdef ESP8266 @@ -241,8 +243,9 @@ void P002_data_struct::webformLoad(struct EventStruct *event) F("out2"), P002_CALIBRATION_POINT2, P002_CALIBRATION_VALUE2); - +#ifndef LIMIT_BUILD_SIZE addFormNote(F("Input float values will be stored as int, calibration values will be adjusted accordingly")); +#endif { // Output the statistics for the current settings. diff --git a/src/src/WebServer/AdvancedConfigPage.cpp b/src/src/WebServer/AdvancedConfigPage.cpp index f1d493214..4930119ff 100644 --- a/src/src/WebServer/AdvancedConfigPage.cpp +++ b/src/src/WebServer/AdvancedConfigPage.cpp @@ -25,7 +25,7 @@ #include "../Helpers/I2C_access.h" #endif -void setLogLevelFor(uint8_t destination, LabelType::Enum label) { +void setLogLevelFor(LogDestination destination, LabelType::Enum label) { setLogLevelFor(destination, getFormItemInt(getInternalLabel(label))); } From c33f19e96262128b2f1fc4396bff7cdca080d037 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 27 Oct 2025 15:10:52 +0000 Subject: [PATCH 430/564] Bump actions/upload-artifact from 4 to 5 Bumps [actions/upload-artifact](https://github.com/actions/upload-artifact) from 4 to 5. - [Release notes](https://github.com/actions/upload-artifact/releases) - [Commits](https://github.com/actions/upload-artifact/compare/v4...v5) --- updated-dependencies: - dependency-name: actions/upload-artifact dependency-version: '5' dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] --- .github/workflows/build.yml | 6 +++--- .github/workflows/release.yml | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index f2884eac2..97ccbd9f9 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -37,7 +37,7 @@ jobs: make html cd .. zip -r -qq ESPEasy_docs.zip docs/build/* - - uses: actions/upload-artifact@v4 + - uses: actions/upload-artifact@v5 with: name: Documentation path: ESPEasy_docs.zip @@ -88,7 +88,7 @@ jobs: uses: Entepotenz/change-string-case-action-min-dependencies@v1 with: string: ${{ matrix.chip }} - - uses: actions/upload-artifact@v4 + - uses: actions/upload-artifact@v5 with: # FIXME Workaround to (temporarily) not use # in the artifact name, see https://github.com/actions/upload-artifact/issues/473 name: Bin-${{ steps.string.outputs.uppercase }}-${{ matrix.env }}-${{ steps.date.outputs.builddate }}_PR_${{ github.event.number }}_${{ github.run_id }} # Sort by ESP type @@ -119,7 +119,7 @@ jobs: run: | cd artifacts/Binaries/ ls -R - - uses: actions/upload-artifact@v4 + - uses: actions/upload-artifact@v5 with: # FIXME Workaround to (temporarily) not use # in the artifact name, see https://github.com/actions/upload-artifact/issues/473 name: ESPEasy-all-Binaries-${{ steps.date.outputs.builddate }}_PR_${{ github.event.number }}_${{ github.run_id }} diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 3093a4dff..4bdb3e6f5 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -56,7 +56,7 @@ jobs: uses: Entepotenz/change-string-case-action-min-dependencies@v1 with: string: ${{ matrix.chip }} - - uses: actions/upload-artifact@v4 + - uses: actions/upload-artifact@v5 with: name: Bin-${{ steps.string.outputs.uppercase }}-${{ matrix.env }} path: | @@ -83,7 +83,7 @@ jobs: cd dist zip -r -qq ../ESPEasy_dist.zip * cd .. - - uses: actions/upload-artifact@v4 + - uses: actions/upload-artifact@v5 with: name: Distribution path: | From 0515e5182649b16badbfc248dbe6714b0b3e3cdf Mon Sep 17 00:00:00 2001 From: TD-er Date: Mon, 27 Oct 2025 17:30:05 +0100 Subject: [PATCH 431/564] [Build] Fix build issue due to missing forward decl. of enum --- src/src/DataTypes/LogLevels.h | 2 +- src/src/ESPEasyCore/ESPEasy_Log.h | 4 +++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/src/src/DataTypes/LogLevels.h b/src/src/DataTypes/LogLevels.h index 454cec104..0ccbefa7f 100644 --- a/src/src/DataTypes/LogLevels.h +++ b/src/src/DataTypes/LogLevels.h @@ -13,7 +13,7 @@ # define LOG_LEVEL_DEBUG_DEV 9 // use for testing/debugging only, not for regular use #endif // ifndef BUILD_NO_DEBUG -enum LogDestination { +enum LogDestination : uint8_t { LOG_TO_SERIAL , LOG_TO_SYSLOG , diff --git a/src/src/ESPEasyCore/ESPEasy_Log.h b/src/src/ESPEasyCore/ESPEasy_Log.h index 227703f96..8d2377236 100644 --- a/src/src/ESPEasyCore/ESPEasy_Log.h +++ b/src/src/ESPEasyCore/ESPEasy_Log.h @@ -2,15 +2,17 @@ #include "../../ESPEasy_common.h" +#include "../DataTypes/LogLevels.h" #include "../DataStructs/LogEntry.h" -#include "../DataTypes/LogLevels.h" // Move the log String so it does not have to be copied in the web log #define addLogMove(L, S) addToLogMove(L, std::move(S)) +enum LogDestination : uint8_t; + /********************************************************************************************\ Logging \*********************************************************************************************/ From 36b81547e9915d3108704805031efa2c87a82b7d Mon Sep 17 00:00:00 2001 From: Ton Huisman Date: Mon, 27 Oct 2025 20:08:11 +0100 Subject: [PATCH 432/564] [P169] Fix DEBUG log --- src/src/PluginStructs/P169_data_struct.cpp | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/src/src/PluginStructs/P169_data_struct.cpp b/src/src/PluginStructs/P169_data_struct.cpp index 9f29c7efb..30bb1282f 100644 --- a/src/src/PluginStructs/P169_data_struct.cpp +++ b/src/src/PluginStructs/P169_data_struct.cpp @@ -20,7 +20,7 @@ P169_data_struct::P169_data_struct(struct EventStruct *event) : _irqPin(P169_IRQ_PIN) { // Do not try to construct the sensor if not needed as it will set the pinmode of the pin - if (_irqPin >= 0 && Settings.TaskDeviceDataFeed[event->TaskIndex] == 0) { + if ((_irqPin >= 0) && (Settings.TaskDeviceDataFeed[event->TaskIndex] == 0)) { _sensor = new (std::nothrow) AS3935I2C(P169_I2C_ADDRESS, P169_IRQ_PIN); } } @@ -249,6 +249,8 @@ bool P169_data_struct::plugin_init(struct EventStruct *event) # ifdef ESP32 + # ifndef BUILD_NO_DEBUG + if (loglevelActiveFor(LOG_LEVEL_DEBUG)) { // Short test checking effect of nr samples during calibration @@ -284,6 +286,7 @@ bool P169_data_struct::plugin_init(struct EventStruct *event) addLogMove(LOG_LEVEL_DEBUG, log); } } + # endif // ifndef BUILD_NO_DEBUG # endif // ifdef ESP32 From 50a4f6d95edd1196e7cd5f9281a3aac27a0227af Mon Sep 17 00:00:00 2001 From: Ton Huisman Date: Mon, 27 Oct 2025 20:17:07 +0100 Subject: [PATCH 433/564] [Build] Avoid build-reduction for MAX builds --- src/src/CustomBuild/define_plugin_sets.h | 22 +++++++++++++--------- 1 file changed, 13 insertions(+), 9 deletions(-) diff --git a/src/src/CustomBuild/define_plugin_sets.h b/src/src/CustomBuild/define_plugin_sets.h index 6e2c8c743..41a1f88e3 100644 --- a/src/src/CustomBuild/define_plugin_sets.h +++ b/src/src/CustomBuild/define_plugin_sets.h @@ -949,12 +949,14 @@ To create/register a plugin, you have to : #ifdef ESP8266 #undef ESP8266 #endif - #ifndef BUILD_NO_DEBUG - #define BUILD_NO_DEBUG - #endif - #ifndef P036_LIMIT_BUILD_SIZE - #define P036_LIMIT_BUILD_SIZE - #endif + #if !defined(PLUGIN_BUILD_MAX_ESP32) + #ifndef BUILD_NO_DEBUG + #define BUILD_NO_DEBUG + #endif + #ifndef P036_LIMIT_BUILD_SIZE + #define P036_LIMIT_BUILD_SIZE + #endif + #endif // if !defined(PLUGIN_BUILD_MAX_ESP32) // Undefine contradictionary defines #ifdef PLUGIN_SET_NONE #undef PLUGIN_SET_NONE @@ -1010,9 +1012,11 @@ To create/register a plugin, you have to : #ifdef ESP8266 #undef ESP8266 #endif - #ifndef P037_LIMIT_BUILD_SIZE - #define P037_LIMIT_BUILD_SIZE // Reduce build size for P037 (MQTT Import) only - #endif + #if !defined(PLUGIN_BUILD_MAX_ESP32) + #ifndef P037_LIMIT_BUILD_SIZE + #define P037_LIMIT_BUILD_SIZE // Reduce build size for P037 (MQTT Import) only + #endif + #endif // if !defined(PLUGIN_BUILD_MAX_ESP32) // Undefine contradictionary defines #ifdef PLUGIN_SET_NONE #undef PLUGIN_SET_NONE From e71f847609d52ce207d397aa64209da8d7fd0ffa Mon Sep 17 00:00:00 2001 From: Ton Huisman Date: Mon, 27 Oct 2025 20:48:33 +0100 Subject: [PATCH 434/564] [Build] Avoid build-reduction for MAX builds --- src/src/CustomBuild/define_plugin_sets.h | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/src/CustomBuild/define_plugin_sets.h b/src/src/CustomBuild/define_plugin_sets.h index 41a1f88e3..4d798d1a4 100644 --- a/src/src/CustomBuild/define_plugin_sets.h +++ b/src/src/CustomBuild/define_plugin_sets.h @@ -2603,6 +2603,10 @@ To create/register a plugin, you have to : #define FEATURE_EMAIL_TLS 1 #endif + #ifdef BUILD_NO_DEBUG + #undef BUILD_NO_DEBUG + #endif + // Plugins #ifndef USES_P016 #define USES_P016 // IR TSOP4838 From a854c91e6094d52408bab005abec970a1ebaf6fb Mon Sep 17 00:00:00 2001 From: TD-er Date: Tue, 28 Oct 2025 09:56:11 +0100 Subject: [PATCH 435/564] [Sysinfo] Add missing Unit-of-measure on file system size --- src/src/Helpers/StringProvider.cpp | 3 +++ 1 file changed, 3 insertions(+) diff --git a/src/src/Helpers/StringProvider.cpp b/src/src/Helpers/StringProvider.cpp index b85412878..67453ec2c 100644 --- a/src/src/Helpers/StringProvider.cpp +++ b/src/src/Helpers/StringProvider.cpp @@ -1010,6 +1010,9 @@ KeyValueStruct getKeyValue(LabelType::Enum label, bool extendedValue) #endif // ifdef USE_LITTLEFS SpiffsTotalBytes() >> 10); KV_SETID(F("fs_size")); +#if FEATURE_TASKVALUE_UNIT_OF_MEASURE + KV_SETUNIT(UOM_kB); +#endif if (!extendedValue) { #if FEATURE_TASKVALUE_UNIT_OF_MEASURE From b2a4dbf18f1bbde417c671a64ff7cf22e00a98f5 Mon Sep 17 00:00:00 2001 From: TD-er Date: Tue, 28 Oct 2025 10:41:52 +0100 Subject: [PATCH 436/564] [Ethernet] Add already setup Ethernet when upgrading ESPEasy --- .../net/DataTypes/EthernetParameters.cpp | 23 ++++- .../net/DataTypes/EthernetParameters.h | 1 + src/src/DataStructs_templ/SettingsStruct.cpp | 95 ++++++++++++------- 3 files changed, 83 insertions(+), 36 deletions(-) diff --git a/src/ESPEasy/net/DataTypes/EthernetParameters.cpp b/src/ESPEasy/net/DataTypes/EthernetParameters.cpp index 717d1e2d1..8d8b20639 100644 --- a/src/ESPEasy/net/DataTypes/EthernetParameters.cpp +++ b/src/ESPEasy/net/DataTypes/EthernetParameters.cpp @@ -10,9 +10,9 @@ bool isValid(EthPhyType_t phyType) { { # if CONFIG_ETH_USE_ESP32_EMAC && FEATURE_ETHERNET case EthPhyType_t::LAN8720: -# if ETH_PHY_LAN867X_SUPPORTED +# if ETH_PHY_LAN867X_SUPPORTED case EthPhyType_t::LAN867X: -# endif +# endif case EthPhyType_t::TLK110: case EthPhyType_t::RTL8201: # if ETH_TYPE_JL1101_SUPPORTED @@ -59,6 +59,25 @@ bool isSPI_EthernetType(EthPhyType_t phyType) { # endif // if ESP_IDF_VERSION_MAJOR >= 5 } +bool isRMII_EthernetType(EthPhyType_t phyType) { + return +# if CONFIG_ETH_USE_ESP32_EMAC && FEATURE_ETHERNET + phyType == EthPhyType_t::LAN8720 || +# if ETH_PHY_LAN867X_SUPPORTED + phyType == EthPhyType_t::LAN867X || +# endif + phyType == EthPhyType_t::TLK110 || + phyType == EthPhyType_t::RTL8201 || +# if ETH_TYPE_JL1101_SUPPORTED + phyType == EthPhyType_t::JL1101 || +# endif + phyType == EthPhyType_t::DP83848 || + phyType == EthPhyType_t::KSZ8041 || + phyType == EthPhyType_t::KSZ8081 || +# endif // if CONFIG_ETH_USE_ESP32_EMAC && FEATURE_ETHERNET + false; +} + eth_phy_type_t to_ESP_phy_type(EthPhyType_t phyType) { switch (phyType) diff --git a/src/ESPEasy/net/DataTypes/EthernetParameters.h b/src/ESPEasy/net/DataTypes/EthernetParameters.h index 2481818fc..11b43836d 100644 --- a/src/ESPEasy/net/DataTypes/EthernetParameters.h +++ b/src/ESPEasy/net/DataTypes/EthernetParameters.h @@ -86,6 +86,7 @@ enum class EthPhyType_t : uint8_t { bool isValid(EthPhyType_t phyType); bool isSPI_EthernetType(EthPhyType_t phyType); +bool isRMII_EthernetType(EthPhyType_t phyType); // Convert to internal enum type as those enum values may not always be the same int value eth_phy_type_t to_ESP_phy_type(EthPhyType_t phyType); diff --git a/src/src/DataStructs_templ/SettingsStruct.cpp b/src/src/DataStructs_templ/SettingsStruct.cpp index 57330ef15..a925c7e8c 100644 --- a/src/src/DataStructs_templ/SettingsStruct.cpp +++ b/src/src/DataStructs_templ/SettingsStruct.cpp @@ -3,41 +3,45 @@ #include "../../ESPEasy_common.h" #ifndef DATASTRUCTS_SETTINGSSTRUCT_CPP -#define DATASTRUCTS_SETTINGSSTRUCT_CPP +# define DATASTRUCTS_SETTINGSSTRUCT_CPP -#include "../CustomBuild/CompiletimeDefines.h" -#include "../CustomBuild/ESPEasyLimits.h" -#include "../DataStructs/DeviceStruct.h" -#include "../ESPEasy/net/DataStructs/NetworkDriverStruct.h" -#include "../DataTypes/NPluginID.h" -#include "../ESPEasy/net/DataTypes/NWPluginID.h" -#include "../ESPEasy/net/DataTypes/NWPluginID.h" -#include "../DataTypes/PluginID.h" -#include "../DataTypes/SPI_options.h" -#include "../Globals/CPlugins.h" -#include "../Globals/Plugins.h" -#include "../Helpers/Misc.h" -#include "../Helpers/StringParser.h" -#include "../ESPEasy/net/Helpers/_NWPlugin_init.h" +# include "../CustomBuild/CompiletimeDefines.h" +# include "../CustomBuild/ESPEasyLimits.h" +# include "../DataStructs/DeviceStruct.h" +# include "../ESPEasy/net/DataStructs/NetworkDriverStruct.h" +# include "../DataTypes/NPluginID.h" +# include "../ESPEasy/net/DataTypes/NWPluginID.h" +# include "../ESPEasy/net/DataTypes/NWPluginID.h" +# include "../DataTypes/PluginID.h" +# include "../DataTypes/SPI_options.h" +# include "../Globals/CPlugins.h" +# include "../Globals/Plugins.h" +# include "../Helpers/Misc.h" +# include "../Helpers/StringParser.h" +# include "../ESPEasy/net/Helpers/_NWPlugin_init.h" -#include "../../ESPEasy/net/Globals/NWPlugins.h" +# include "../../ESPEasy/net/Globals/NWPlugins.h" -#if FEATURE_I2C_MULTIPLE -#include "../Helpers/Hardware_device_info.h" -#endif +# if FEATURE_I2C_MULTIPLE +# include "../Helpers/Hardware_device_info.h" +# endif -#if ESP_IDF_VERSION_MAJOR >= 5 -#include -#include "include/esp32x_fixes.h" -#endif +# if ESP_IDF_VERSION_MAJOR >= 5 +# include +# include "include/esp32x_fixes.h" +# endif // if ESP_IDF_VERSION_MAJOR >= 5 -#if CONFIG_ETH_USE_ESP32_EMAC && FEATURE_ETHERNET -#include -#endif +# if FEATURE_ETHERNET +# include "../../ESPEasy/net/DataTypes/EthernetParameters.h" +# endif + +# if CONFIG_ETH_USE_ESP32_EMAC && FEATURE_ETHERNET +# include +# endif /* -// VariousBits1 defaults to 0, keep in mind when adding bit lookups. + // VariousBits1 defaults to 0, keep in mind when adding bit lookups. template bool SettingsStruct_tmpl::appendUnitToHostname() const { return !bitRead(VariousBits1, 1); @@ -564,28 +568,51 @@ void SettingsStruct_tmpl::validate() { console_serial_rxpin = 13; console_serial_txpin = 15; } -#endif - #endif +# endif // ifdef ESP8266 + # endif // if FEATURE_DEFINE_SERIAL_CONSOLE_PORT - // Make sure the WiFi and AP drivers are always added and set enabled when loading older settings, + // Make sure the WiFi and AP drivers are always added and set enabled when loading older settings, // or factory default settings +# if FEATURE_ETHERNET bool fixedNetworkIndex_drivers_added = false; +# endif + for (ESPEasy::net::networkDriverIndex_t index; ESPEasy::net::validNetworkDriverIndex(index); ++index) { const ESPEasy::net::NetworkDriverStruct& nw = ESPEasy::net::getNetworkDriverStruct(index); + if (nw.alwaysPresent) { if (validNetworkIndex(nw.fixedNetworkIndex)) { const ESPEasy::net::nwpluginID_t nwpluginID = ESPEasy::net::getNWPluginID_from_NetworkDriverIndex(index); + if (getNWPluginID_for_network(nw.fixedNetworkIndex) != nwpluginID) { - setNWPluginID_for_network(nw.fixedNetworkIndex, nwpluginID); + setNWPluginID_for_network(nw.fixedNetworkIndex, nwpluginID); +# if FEATURE_ETHERNET fixedNetworkIndex_drivers_added = true; +# endif setNetworkEnabled(nw.fixedNetworkIndex, nw.enabledOnFactoryReset); } } - } else { - - } +# if FEATURE_ETHERNET + else if (fixedNetworkIndex_drivers_added) { + // Check to see if there are other network adapters configured in the settings and not setup yet + if (ETH_Phy_Type != ESPEasy::net::EthPhyType_t::notSet) { + const ESPEasy::net::nwpluginID_t nwpluginID = ESPEasy::net::getNWPluginID_from_NetworkDriverIndex(index); + + if ((nwpluginID.value == 3 && ESPEasy::net::isRMII_EthernetType(ETH_Phy_Type)) || + (nwpluginID.value == 4 && ESPEasy::net::isSPI_EthernetType(ETH_Phy_Type))) + { + const ESPEasy::net::networkIndex_t nw_index = nwpluginID.value - 1; + + if (getNWPluginID_for_network(nw_index) != nwpluginID) { + setNWPluginID_for_network(nw_index, nwpluginID); + setNetworkEnabled(nw_index, nw.enabledOnFactoryReset); + } + } + } + } +#endif } } From 56a5d84914890a20e2f78dff1a3168aef62d22b8 Mon Sep 17 00:00:00 2001 From: TD-er Date: Tue, 28 Oct 2025 11:08:23 +0100 Subject: [PATCH 437/564] [Sysinfo] Hide WiFi info when no WiFi is enabled --- src/src/Helpers/StringProvider.cpp | 2 ++ src/src/WebServer/SysInfoPage.cpp | 1 + 2 files changed, 3 insertions(+) diff --git a/src/src/Helpers/StringProvider.cpp b/src/src/Helpers/StringProvider.cpp index 67453ec2c..bac5f9aa3 100644 --- a/src/src/Helpers/StringProvider.cpp +++ b/src/src/Helpers/StringProvider.cpp @@ -182,6 +182,7 @@ KeyValueStruct getKeyValue(LabelType::Enum label, bool extendedValue) return kv; } case LabelType::WIFI_CUR_TX_PWR: + if (ESPEasy::net::wifi::WiFiConnected()) { KeyValueStruct kv(F("Current WiFi TX Power"), ESPEasy::net::wifi::GetWiFiTXpower(), 2); # if FEATURE_TASKVALUE_UNIT_OF_MEASURE @@ -189,6 +190,7 @@ KeyValueStruct getKeyValue(LabelType::Enum label, bool extendedValue) # endif return kv; } + break; case LabelType::WIFI_SENS_MARGIN: { KeyValueStruct kv(F("WiFi Sensitivity Margin"), Settings.WiFi_sensitivity_margin); diff --git a/src/src/WebServer/SysInfoPage.cpp b/src/src/WebServer/SysInfoPage.cpp index 661181477..264e1b797 100644 --- a/src/src/WebServer/SysInfoPage.cpp +++ b/src/src/WebServer/SysInfoPage.cpp @@ -467,6 +467,7 @@ void handle_sysinfo_Network() { # ifndef WEBSERVER_SYSINFO_MINIMAL void handle_sysinfo_WiFiSettings() { + if (!ESPEasy::net::wifi::WiFiConnected()) return; addTableSeparator(F("WiFi Settings"), 2, 3); static const LabelType::Enum labels[] PROGMEM = From 4c76e51dd16450f88bb8758e8356744955b3b30f Mon Sep 17 00:00:00 2001 From: TD-er Date: Tue, 28 Oct 2025 22:05:21 +0100 Subject: [PATCH 438/564] [Network] Start adding JSON import/export Network settings per adapter --- .../net/DataStructs/NWPluginData_base.h | 6 + src/ESPEasy/net/Globals/NWPlugins.cpp | 10 + src/ESPEasy/net/Helpers/NW_info_writer.cpp | 3 +- src/ESPEasy/net/Helpers/NW_info_writer.h | 3 +- .../NW001_data_struct_WiFi_STA.cpp | 5 + .../NW001_data_struct_WiFi_STA.h | 5 + .../NW002_data_struct_WiFi_AP.cpp | 6 + .../NW002_data_struct_WiFi_AP.h | 5 + .../NW003_data_struct_ETH_RMII.cpp | 6 + .../NW003_data_struct_ETH_RMII.h | 6 + .../NW004_data_struct_ETH_SPI.cpp | 6 + .../NW004_data_struct_ETH_SPI.h | 5 + .../NW005_data_struct_PPP_modem.cpp | 64 ++-- .../NW005_data_struct_PPP_modem.h | 5 + src/ESPEasy/net/_NW001_WiFi_STA.cpp | 14 +- src/ESPEasy/net/_NW002_WiFi_AP.cpp | 15 +- src/ESPEasy/net/_NW003_ETH_RMII.cpp | 4 +- src/ESPEasy/net/_NW004_ETH_SPI.cpp | 4 +- src/ESPEasy/net/_NW005_PPP_modem.cpp | 4 +- .../SecurityStruct_deviceSpecific.cpp | 4 +- .../ESPEasy_key_value_store_StorageType.cpp | 52 ++++ .../ESPEasy_key_value_store_StorageType.h | 50 +++ .../DataTypes/ESPEasy_plugin_functions.cpp | 1 + src/src/DataTypes/ESPEasy_plugin_functions.h | 4 +- .../ESPEasy_key_value_store_import_export.cpp | 171 +++++++++++ .../ESPEasy_key_value_store_import_export.h | 49 +++ src/src/Helpers/_ESPEasy_key_value_store.cpp | 290 ++++++++---------- src/src/Helpers/_ESPEasy_key_value_store.h | 104 +++---- .../ESPEasy_key_value_store_webform.cpp | 36 +-- .../ESPEasy_key_value_store_webform.h | 10 +- src/src/WebServer/JSON.cpp | 2 + src/src/WebServer/NetworkPage.cpp | 20 +- .../SecurityStruct_deviceSpecific_webform.cpp | 8 +- 33 files changed, 680 insertions(+), 297 deletions(-) create mode 100644 src/src/DataTypes/ESPEasy_key_value_store_StorageType.cpp create mode 100644 src/src/DataTypes/ESPEasy_key_value_store_StorageType.h create mode 100644 src/src/Helpers/ESPEasy_key_value_store_import_export.cpp create mode 100644 src/src/Helpers/ESPEasy_key_value_store_import_export.h diff --git a/src/ESPEasy/net/DataStructs/NWPluginData_base.h b/src/ESPEasy/net/DataStructs/NWPluginData_base.h index 5988c1563..51012f47a 100644 --- a/src/ESPEasy/net/DataStructs/NWPluginData_base.h +++ b/src/ESPEasy/net/DataStructs/NWPluginData_base.h @@ -10,6 +10,7 @@ #if FEATURE_STORE_NETWORK_INTERFACE_SETTINGS # include "../../../src/Helpers/_ESPEasy_key_value_store.h" +# include "../../../src/Helpers/ESPEasy_key_value_store_import_export.h" #endif namespace ESPEasy { @@ -131,6 +132,11 @@ protected: PluginStats_array *_plugin_stats_array = nullptr; #endif // if FEATURE_NETWORK_STATS +#if FEATURE_STORE_NETWORK_INTERFACE_SETTINGS + virtual bool _export(KeyValueWriter* writer) const = 0; + virtual bool _import(const String& json) = 0; +#endif + protected: #ifdef ESP32 diff --git a/src/ESPEasy/net/Globals/NWPlugins.cpp b/src/ESPEasy/net/Globals/NWPlugins.cpp index e47a404b3..0b61eda61 100644 --- a/src/ESPEasy/net/Globals/NWPlugins.cpp +++ b/src/ESPEasy/net/Globals/NWPlugins.cpp @@ -244,8 +244,11 @@ bool NWPluginCall(NWPlugin::Function Function, EventStruct *event, String& str) case NWPlugin::Function::NWPLUGIN_WEBFORM_SHOW_EXTENDED: case NWPlugin::Function::NWPLUGIN_WEBFORM_SHOW_HW_ADDRESS: case NWPlugin::Function::NWPLUGIN_WEBFORM_SHOW_IP: +#ifndef LIMIT_BUILD_SIZE case NWPlugin::Function::NWPLUGIN_WEBFORM_SHOW_PORT: +#endif case NWPlugin::Function::NWPLUGIN_WEBFORM_SHOW_HOSTNAME: + case NWPlugin::Function::NWPLUGIN_WEBFORM_SHOW_NAME: case NWPlugin::Function::NWPLUGIN_CLIENT_IP_WEB_ACCESS_ALLOWED: #ifdef ESP32 @@ -306,6 +309,13 @@ bool NWPluginCall(NWPlugin::Function Function, EventStruct *event, String& str) success = true; break; + case NWPlugin::Function::NWPLUGIN_WEBFORM_SHOW_NAME: + if (event->kvWriter) { + event->kvWriter->write({ F("Name"), event->networkInterface->desc() }); + success = true; + } + break; + case NWPlugin::Function::NWPLUGIN_WEBFORM_SHOW_HOSTNAME: if (event->kvWriter) { diff --git a/src/ESPEasy/net/Helpers/NW_info_writer.cpp b/src/ESPEasy/net/Helpers/NW_info_writer.cpp index 9eb200a10..0129c437e 100644 --- a/src/ESPEasy/net/Helpers/NW_info_writer.cpp +++ b/src/ESPEasy/net/Helpers/NW_info_writer.cpp @@ -65,7 +65,7 @@ bool write_NetworkAdapterFlags(ESPEasy::net::networkIndex_t networkindex, KeyVal } return true; } - +#ifndef LIMIT_BUILD_SIZE bool write_NetworkAdapterPort(ESPEasy::net::networkIndex_t networkindex, KeyValueWriter *writer) { @@ -79,6 +79,7 @@ bool write_NetworkAdapterPort(ESPEasy::net::networkIndex_t networkindex, NWPluginCall(NWPlugin::Function::NWPLUGIN_WEBFORM_SHOW_PORT, &TempEvent, str); return true; } +#endif bool write_IP_config(ESPEasy::net::networkIndex_t networkindex, KeyValueWriter*writer) { diff --git a/src/ESPEasy/net/Helpers/NW_info_writer.h b/src/ESPEasy/net/Helpers/NW_info_writer.h index e28d8c3a2..4a27b27cd 100644 --- a/src/ESPEasy/net/Helpers/NW_info_writer.h +++ b/src/ESPEasy/net/Helpers/NW_info_writer.h @@ -16,9 +16,10 @@ namespace net { #ifdef ESP32 bool write_NetworkAdapterFlags(ESPEasy::net::networkIndex_t networkindex, KeyValueWriter *writer); - +#ifndef LIMIT_BUILD_SIZE bool write_NetworkAdapterPort(ESPEasy::net::networkIndex_t networkindex, KeyValueWriter *writer); +#endif bool write_IP_config(ESPEasy::net::networkIndex_t networkindex, KeyValueWriter *writer); diff --git a/src/ESPEasy/net/NWPluginStructs/NW001_data_struct_WiFi_STA.cpp b/src/ESPEasy/net/NWPluginStructs/NW001_data_struct_WiFi_STA.cpp index 9ed625e64..c5d5cdd87 100644 --- a/src/ESPEasy/net/NWPluginStructs/NW001_data_struct_WiFi_STA.cpp +++ b/src/ESPEasy/net/NWPluginStructs/NW001_data_struct_WiFi_STA.cpp @@ -112,6 +112,11 @@ NWPluginData_static_runtime * NW001_data_struct_WiFi_STA::getNWPluginData_static return _WiFiEventHandler.getNWPluginData_static_runtime(); } +#if FEATURE_STORE_NETWORK_INTERFACE_SETTINGS + bool NW001_data_struct_WiFi_STA::_export(KeyValueWriter* writer) const { return false; } + bool NW001_data_struct_WiFi_STA::_import(const String& json) { return false; } +#endif + const __FlashStringHelper * NW001_data_struct_WiFi_STA::getWiFi_encryptionType() const { return _WiFiEventHandler.getWiFi_encryptionType(); diff --git a/src/ESPEasy/net/NWPluginStructs/NW001_data_struct_WiFi_STA.h b/src/ESPEasy/net/NWPluginStructs/NW001_data_struct_WiFi_STA.h index 165453ee8..a19df4275 100644 --- a/src/ESPEasy/net/NWPluginStructs/NW001_data_struct_WiFi_STA.h +++ b/src/ESPEasy/net/NWPluginStructs/NW001_data_struct_WiFi_STA.h @@ -45,6 +45,11 @@ struct NW001_data_struct_WiFi_STA : public NWPluginData_base { WiFiDisconnectReason getWiFi_disconnectReason() const; +#if FEATURE_STORE_NETWORK_INTERFACE_SETTINGS + virtual bool _export(KeyValueWriter* writer) const; + virtual bool _import(const String& json); +#endif + private: ESPEasyWiFi_STA_EventHandler _WiFiEventHandler; diff --git a/src/ESPEasy/net/NWPluginStructs/NW002_data_struct_WiFi_AP.cpp b/src/ESPEasy/net/NWPluginStructs/NW002_data_struct_WiFi_AP.cpp index 074a706c6..e045af0d3 100644 --- a/src/ESPEasy/net/NWPluginStructs/NW002_data_struct_WiFi_AP.cpp +++ b/src/ESPEasy/net/NWPluginStructs/NW002_data_struct_WiFi_AP.cpp @@ -123,6 +123,12 @@ NWPluginData_static_runtime * NW002_data_struct_WiFi_AP::getNWPluginData_static_ return nullptr; } +#if FEATURE_STORE_NETWORK_INTERFACE_SETTINGS + bool NW002_data_struct_WiFi_AP::_export(KeyValueWriter* writer) const { return false; } + bool NW002_data_struct_WiFi_AP::_import(const String& json) { return false; } +#endif + + # ifdef ESP32 bool NW002_data_struct_WiFi_AP::handle_priority_route_changed() { return NW002_update_NAPT(); } diff --git a/src/ESPEasy/net/NWPluginStructs/NW002_data_struct_WiFi_AP.h b/src/ESPEasy/net/NWPluginStructs/NW002_data_struct_WiFi_AP.h index 351ae8a61..f437f1d85 100644 --- a/src/ESPEasy/net/NWPluginStructs/NW002_data_struct_WiFi_AP.h +++ b/src/ESPEasy/net/NWPluginStructs/NW002_data_struct_WiFi_AP.h @@ -35,6 +35,11 @@ struct NW002_data_struct_WiFi_AP : public NWPluginData_base { NWPluginData_static_runtime* getNWPluginData_static_runtime(); +#if FEATURE_STORE_NETWORK_INTERFACE_SETTINGS + virtual bool _export(KeyValueWriter* writer) const; + virtual bool _import(const String& json); +#endif + private: # ifdef ESP32 diff --git a/src/ESPEasy/net/NWPluginStructs/NW003_data_struct_ETH_RMII.cpp b/src/ESPEasy/net/NWPluginStructs/NW003_data_struct_ETH_RMII.cpp index 0bdb859f7..9bb85aa11 100644 --- a/src/ESPEasy/net/NWPluginStructs/NW003_data_struct_ETH_RMII.cpp +++ b/src/ESPEasy/net/NWPluginStructs/NW003_data_struct_ETH_RMII.cpp @@ -61,6 +61,12 @@ bool NW003_data_struct_ETH_RMII::exit(EventStruct *event) { return true; } +#if FEATURE_STORE_NETWORK_INTERFACE_SETTINGS + bool NW003_data_struct_ETH_RMII::_export(KeyValueWriter* writer) const { return false; } + bool NW003_data_struct_ETH_RMII::_import(const String& json) { return false; } +#endif + + NWPluginData_static_runtime * NW003_data_struct_ETH_RMII::getNWPluginData_static_runtime() { return &stats_and_cache; } void NW003_data_struct_ETH_RMII::onEvent(arduino_event_id_t event, diff --git a/src/ESPEasy/net/NWPluginStructs/NW003_data_struct_ETH_RMII.h b/src/ESPEasy/net/NWPluginStructs/NW003_data_struct_ETH_RMII.h index 4bc81846b..0a4a94f24 100644 --- a/src/ESPEasy/net/NWPluginStructs/NW003_data_struct_ETH_RMII.h +++ b/src/ESPEasy/net/NWPluginStructs/NW003_data_struct_ETH_RMII.h @@ -25,6 +25,12 @@ struct NW003_data_struct_ETH_RMII : public NWPluginData_base { NWPluginData_static_runtime* getNWPluginData_static_runtime(); +#if FEATURE_STORE_NETWORK_INTERFACE_SETTINGS + virtual bool _export(KeyValueWriter* writer) const; + virtual bool _import(const String& json); +#endif + + private: static void onEvent(arduino_event_id_t event, diff --git a/src/ESPEasy/net/NWPluginStructs/NW004_data_struct_ETH_SPI.cpp b/src/ESPEasy/net/NWPluginStructs/NW004_data_struct_ETH_SPI.cpp index d66cac3b2..37f1c8c5d 100644 --- a/src/ESPEasy/net/NWPluginStructs/NW004_data_struct_ETH_SPI.cpp +++ b/src/ESPEasy/net/NWPluginStructs/NW004_data_struct_ETH_SPI.cpp @@ -64,6 +64,12 @@ bool NW004_data_struct_ETH_SPI::exit(EventStruct *event) NWPluginData_static_runtime * NW004_data_struct_ETH_SPI::getNWPluginData_static_runtime() { return &stats_and_cache; } +#if FEATURE_STORE_NETWORK_INTERFACE_SETTINGS + bool NW004_data_struct_ETH_SPI::_export(KeyValueWriter* writer) const { return false; } + bool NW004_data_struct_ETH_SPI::_import(const String& json) { return false; } +#endif + + void NW004_data_struct_ETH_SPI::onEvent(arduino_event_id_t event, arduino_event_info_t info) { diff --git a/src/ESPEasy/net/NWPluginStructs/NW004_data_struct_ETH_SPI.h b/src/ESPEasy/net/NWPluginStructs/NW004_data_struct_ETH_SPI.h index ade588b38..c969e7717 100644 --- a/src/ESPEasy/net/NWPluginStructs/NW004_data_struct_ETH_SPI.h +++ b/src/ESPEasy/net/NWPluginStructs/NW004_data_struct_ETH_SPI.h @@ -25,6 +25,11 @@ struct NW004_data_struct_ETH_SPI : public NWPluginData_base { NWPluginData_static_runtime* getNWPluginData_static_runtime(); +#if FEATURE_STORE_NETWORK_INTERFACE_SETTINGS + virtual bool _export(KeyValueWriter* writer) const; + virtual bool _import(const String& json); +#endif + private: static void onEvent(arduino_event_id_t event, diff --git a/src/ESPEasy/net/NWPluginStructs/NW005_data_struct_PPP_modem.cpp b/src/ESPEasy/net/NWPluginStructs/NW005_data_struct_PPP_modem.cpp index 86b2fe6ff..9020abf1b 100644 --- a/src/ESPEasy/net/NWPluginStructs/NW005_data_struct_PPP_modem.cpp +++ b/src/ESPEasy/net/NWPluginStructs/NW005_data_struct_PPP_modem.cpp @@ -49,9 +49,9 @@ static NWPluginData_static_runtime stats_and_cache(&NW_PLUGIN_INTERFACE, F("PPP" # define NW005_KEY_SIM_PIN 13 # define NW005_KEY_PIN_DTR 14 -const __FlashStringHelper* NW005_getLabelString(uint32_t key, bool displayString, ESPEasy_key_value_store::StorageType& storageType) +const __FlashStringHelper* NW005_getLabelString(uint32_t key, bool displayString, KVS_StorageType::Enum& storageType) { - storageType = ESPEasy_key_value_store::StorageType::int8_type; + storageType = KVS_StorageType::Enum::int8_type; switch (key) { @@ -64,22 +64,22 @@ const __FlashStringHelper* NW005_getLabelString(uint32_t key, bool displayString case NW005_KEY_PIN_DTR: return F("DTR"); case NW005_KEY_PIN_RESET: return displayString ? F("Reset") : F("rst"); case NW005_KEY_PIN_RESET_ACTIVE_LOW: - storageType = ESPEasy_key_value_store::StorageType::bool_type; + storageType = KVS_StorageType::Enum::bool_type; return displayString ? F("Reset Active Low") : F("rst_act_low"); case NW005_KEY_PIN_RESET_DELAY: - storageType = ESPEasy_key_value_store::StorageType::uint16_type; + storageType = KVS_StorageType::Enum::uint16_type; return displayString ? F("Reset Delay") : F("rst_delay"); case NW005_KEY_BAUDRATE: - storageType = ESPEasy_key_value_store::StorageType::uint32_type; + storageType = KVS_StorageType::Enum::uint32_type; return displayString ? F("Baud rate") : F("baudrate"); case NW005_KEY_FLOWCTRL: return displayString ? F("Flow Control") : F("flowctrl"); case NW005_KEY_MODEM_MODEL: return displayString ? F("Modem Model") : F("mmodel"); case NW005_KEY_APN: - storageType = ESPEasy_key_value_store::StorageType::string_type; + storageType = KVS_StorageType::Enum::string_type; return displayString ? F("Access Point Name (APN)") : F("apn"); case NW005_KEY_SIM_PIN: - storageType = ESPEasy_key_value_store::StorageType::string_type; + storageType = KVS_StorageType::Enum::string_type; return displayString ? F("SIM Card Pin") : F("pin"); } @@ -94,7 +94,7 @@ NW005_data_struct_PPP_modem::NW005_data_struct_PPP_modem(networkIndex_t networkI } WebFormItemParams NW005_makeWebFormItemParams(uint32_t key) { - ESPEasy_key_value_store::StorageType storageType; + KVS_StorageType::Enum storageType; const __FlashStringHelper*label = NW005_getLabelString(key, true, storageType); const __FlashStringHelper*id = NW005_getLabelString(key, false, storageType); @@ -390,20 +390,20 @@ void NW005_data_struct_PPP_modem::webform_load_UE_system_information(KeyValueWri // We have some leading characters left here, so use the 'clean' strings KeyValueStruct kv(label, sysmode_str[sysmode_index]); - if (has_dBm_unit) { -#if FEATURE_TASKVALUE_UNIT_OF_MEASURE + if (has_dBm_unit) { +# if FEATURE_TASKVALUE_UNIT_OF_MEASURE kv.setUnit(UOM_dBm); -#endif +# endif } writer->write(kv); } else { KeyValueStruct kv(label, value_str, KeyValueStruct::Format::PreFormatted); - if (has_dBm_unit) { -#if FEATURE_TASKVALUE_UNIT_OF_MEASURE + if (has_dBm_unit) { +# if FEATURE_TASKVALUE_UNIT_OF_MEASURE kv.setUnit(UOM_dBm); -#endif +# endif } writer->write(kv); @@ -505,7 +505,7 @@ void NW005_data_struct_PPP_modem::webform_load(EventStruct *event) for (int i = 0; i < NR_ELEMENTS(gpio_keys); ++i) { const int key = gpio_keys[i]; - ESPEasy_key_value_store::StorageType storageType; + KVS_StorageType::Enum storageType; const __FlashStringHelper *id = NW005_getLabelString(key, false, storageType); PinSelectPurpose purpose = PinSelectPurpose::Generic; String label = NW005_formatGpioLabel(key, purpose); @@ -601,7 +601,7 @@ void NW005_data_struct_PPP_modem::webform_save(EventStruct *event) for (int i = 0; i < NR_ELEMENTS(keys); ++i) { - ESPEasy_key_value_store::StorageType storageType; + KVS_StorageType::Enum storageType; const __FlashStringHelper *id = NW005_getLabelString(keys[i], false, storageType); storeWebformItem(*_kvs, keys[i], storageType, id); } @@ -682,9 +682,9 @@ bool NW005_data_struct_PPP_modem::write_ModemState(KeyValueWriter*modemState) } { KeyValueStruct kv(F("RSSI"), getRSSI()); -#if FEATURE_TASKVALUE_UNIT_OF_MEASURE +# if FEATURE_TASKVALUE_UNIT_OF_MEASURE kv.setUnit(UOM_dBm); -#endif +# endif modemState->write(kv); } STATE_WRITE(F("BER"), getBER()); @@ -748,9 +748,9 @@ bool NW005_data_struct_PPP_modem::write_ModemState(KeyValueWriter*modemState) if (batVolt >= 0) { KeyValueStruct kv(F("Battery Voltage"), batVolt); -#if FEATURE_TASKVALUE_UNIT_OF_MEASURE +# if FEATURE_TASKVALUE_UNIT_OF_MEASURE kv.setUnit(UOM_milliVolt); -#endif +# endif modemState->write(kv); } @@ -1068,7 +1068,27 @@ bool NW005_data_struct_PPP_modem::record_stats() NWPluginData_static_runtime * NW005_data_struct_PPP_modem::getNWPluginData_static_runtime() { return &stats_and_cache; } -void NW005_data_struct_PPP_modem::onEvent(arduino_event_id_t event, arduino_event_info_t info) { + +# if FEATURE_STORE_NETWORK_INTERFACE_SETTINGS + +bool NW005_data_struct_PPP_modem::_export(KeyValueWriter*writer) const { + if (writer == nullptr) return false; + auto child = writer->createChild(); + + + ESPEasy_key_value_store_import_export e(_kvs, NW005_getLabelString, NW005_KEY_PIN_DTR); + + for (uint32_t i = NW005_KEY_SERIAL_PORT; i <= NW005_KEY_PIN_DTR; ++i) { + if (!e.write(i, writer)) { return false; } + } + return true; +} + +bool NW005_data_struct_PPP_modem::_import(const String& json) { return false; } + +# endif // if FEATURE_STORE_NETWORK_INTERFACE_SETTINGS + +void NW005_data_struct_PPP_modem::onEvent(arduino_event_id_t event, arduino_event_info_t info) { // TODO TD-er: Must store flags from events in static (or global) object to act on it later. switch (event) { @@ -1115,7 +1135,7 @@ String NW005_data_struct_PPP_modem::NW005_formatGpioLabel(uint32_t key, PinSelec if ((key == NW005_KEY_PIN_DTR) || ((key >= NW005_KEY_PIN_RX) && (key <= NW005_KEY_PIN_RESET))) { - ESPEasy_key_value_store::StorageType storageType; + KVS_StorageType::Enum storageType; purpose = PinSelectPurpose::Generic; label = NW005_getLabelString(key, true, storageType); diff --git a/src/ESPEasy/net/NWPluginStructs/NW005_data_struct_PPP_modem.h b/src/ESPEasy/net/NWPluginStructs/NW005_data_struct_PPP_modem.h index 58a256597..7ed56d048 100644 --- a/src/ESPEasy/net/NWPluginStructs/NW005_data_struct_PPP_modem.h +++ b/src/ESPEasy/net/NWPluginStructs/NW005_data_struct_PPP_modem.h @@ -67,6 +67,11 @@ struct NW005_data_struct_PPP_modem : public NWPluginData_base { NWPluginData_static_runtime* getNWPluginData_static_runtime(); +#if FEATURE_STORE_NETWORK_INTERFACE_SETTINGS + virtual bool _export(KeyValueWriter* writer) const; + virtual bool _import(const String& json); +#endif + private: static void onEvent(arduino_event_id_t event, diff --git a/src/ESPEasy/net/_NW001_WiFi_STA.cpp b/src/ESPEasy/net/_NW001_WiFi_STA.cpp index 1ddcb5a40..ed23fb44f 100644 --- a/src/ESPEasy/net/_NW001_WiFi_STA.cpp +++ b/src/ESPEasy/net/_NW001_WiFi_STA.cpp @@ -234,6 +234,15 @@ bool NWPlugin_001(NWPlugin::Function function, EventStruct *event, String& strin } # ifdef ESP8266 + case NWPlugin::Function::NWPLUGIN_WEBFORM_SHOW_NAME: + { + if (event->kvWriter) { + event->kvWriter->write({ F("Name"), F("sta") }); + success = true; + } + break; + } + case NWPlugin::Function::NWPLUGIN_WEBFORM_SHOW_HOSTNAME: { if (event->kvWriter) { @@ -243,7 +252,6 @@ bool NWPlugin_001(NWPlugin::Function function, EventStruct *event, String& strin break; } - case NWPlugin::Function::NWPLUGIN_WEBFORM_SHOW_HW_ADDRESS: { if (event->kvWriter) { @@ -290,7 +298,7 @@ bool NWPlugin_001(NWPlugin::Function function, EventStruct *event, String& strin } break; } - +#ifndef LIMIT_BUILD_SIZE case NWPlugin::Function::NWPLUGIN_WEBFORM_SHOW_PORT: { if (event->kvWriter) { @@ -298,7 +306,7 @@ bool NWPlugin_001(NWPlugin::Function function, EventStruct *event, String& strin } break; } - +#endif # endif // ifdef BOARD_HAS_SDIO_ESP_HOSTED case NWPlugin::Function::NWPLUGIN_WEBFORM_SAVE: { diff --git a/src/ESPEasy/net/_NW002_WiFi_AP.cpp b/src/ESPEasy/net/_NW002_WiFi_AP.cpp index 31e01be59..9e45b130c 100644 --- a/src/ESPEasy/net/_NW002_WiFi_AP.cpp +++ b/src/ESPEasy/net/_NW002_WiFi_AP.cpp @@ -156,6 +156,15 @@ bool NWPlugin_002(NWPlugin::Function function, EventStruct *event, String& strin break; } + case NWPlugin::Function::NWPLUGIN_WEBFORM_SHOW_NAME: + { + if (event->kvWriter) { + event->kvWriter->write({ F("Name"), F("ap") }); + success = true; + } + break; + } + case NWPlugin::Function::NWPLUGIN_WEBFORM_SHOW_HOSTNAME: { if (event->kvWriter) { @@ -212,12 +221,6 @@ bool NWPlugin_002(NWPlugin::Function function, EventStruct *event, String& strin } # endif // ifdef ESP8266 - case NWPlugin::Function::NWPLUGIN_WEBFORM_SHOW_PORT: - { - break; - } - - case NWPlugin::Function::NWPLUGIN_WEBFORM_SAVE: { diff --git a/src/ESPEasy/net/_NW003_ETH_RMII.cpp b/src/ESPEasy/net/_NW003_ETH_RMII.cpp index 435111a7d..14dd49927 100644 --- a/src/ESPEasy/net/_NW003_ETH_RMII.cpp +++ b/src/ESPEasy/net/_NW003_ETH_RMII.cpp @@ -108,7 +108,7 @@ bool NWPlugin_003(NWPlugin::Function function, EventStruct *event, String& strin } break; } - +#ifndef LIMIT_BUILD_SIZE case NWPlugin::Function::NWPLUGIN_WEBFORM_SHOW_PORT: { if (event->kvWriter) { @@ -126,7 +126,7 @@ bool NWPlugin_003(NWPlugin::Function function, EventStruct *event, String& strin } break; } - +#endif case NWPlugin::Function::NWPLUGIN_WEBFORM_SAVE: { diff --git a/src/ESPEasy/net/_NW004_ETH_SPI.cpp b/src/ESPEasy/net/_NW004_ETH_SPI.cpp index 88efb0380..76b779d25 100644 --- a/src/ESPEasy/net/_NW004_ETH_SPI.cpp +++ b/src/ESPEasy/net/_NW004_ETH_SPI.cpp @@ -105,7 +105,7 @@ bool NWPlugin_004(NWPlugin::Function function, EventStruct *event, String& strin } break; } - +#ifndef LIMIT_BUILD_SIZE case NWPlugin::Function::NWPLUGIN_WEBFORM_SHOW_PORT: { if (event->kvWriter) { @@ -130,7 +130,7 @@ bool NWPlugin_004(NWPlugin::Function function, EventStruct *event, String& strin } break; } - +#endif case NWPlugin::Function::NWPLUGIN_WEBFORM_SAVE: { diff --git a/src/ESPEasy/net/_NW005_PPP_modem.cpp b/src/ESPEasy/net/_NW005_PPP_modem.cpp index abc851699..dba7c3358 100644 --- a/src/ESPEasy/net/_NW005_PPP_modem.cpp +++ b/src/ESPEasy/net/_NW005_PPP_modem.cpp @@ -137,7 +137,7 @@ bool NWPlugin_005(NWPlugin::Function function, EventStruct *event, String& strin break; } - +#ifndef LIMIT_BUILD_SIZE case NWPlugin::Function::NWPLUGIN_WEBFORM_SHOW_PORT: { if (event->kvWriter) { @@ -155,7 +155,7 @@ bool NWPlugin_005(NWPlugin::Function function, EventStruct *event, String& strin } break; } - +#endif case NWPlugin::Function::NWPLUGIN_WEBFORM_SAVE: { diff --git a/src/src/DataStructs/SecurityStruct_deviceSpecific.cpp b/src/src/DataStructs/SecurityStruct_deviceSpecific.cpp index 6f9ba169d..c596eeb82 100644 --- a/src/src/DataStructs/SecurityStruct_deviceSpecific.cpp +++ b/src/src/DataStructs/SecurityStruct_deviceSpecific.cpp @@ -75,9 +75,9 @@ bool SecurityStruct_deviceSpecific::hasWiFiCredentials(uint8_t index) const { return (index < MAX_EXTRA_WIFI_CREDENTIALS_SEPARATE_FILE) && - _kvs.hasKey(ESPEasy_key_value_store::StorageType::string_type, + _kvs.hasKey(KVS_StorageType::Enum::string_type, createKey(KeyType::WiFi_SSID, index)) && - _kvs.hasKey(ESPEasy_key_value_store::StorageType::string_type, + _kvs.hasKey(KVS_StorageType::Enum::string_type, createKey(KeyType::WiFi_Password, index)); } diff --git a/src/src/DataTypes/ESPEasy_key_value_store_StorageType.cpp b/src/src/DataTypes/ESPEasy_key_value_store_StorageType.cpp new file mode 100644 index 000000000..f3794be43 --- /dev/null +++ b/src/src/DataTypes/ESPEasy_key_value_store_StorageType.cpp @@ -0,0 +1,52 @@ +#include "../DataTypes/ESPEasy_key_value_store_StorageType.h" +#if FEATURE_ESPEASY_KEY_VALUE_STORE + +uint32_t KVS_StorageType::combine_StorageType_and_key( + KVS_StorageType::Enum storageType, + uint32_t key) +{ + uint32_t res = key & ((1 << 24) - 1); + + res |= (static_cast(storageType) << 24); + return res; +} + +KVS_StorageType::Enum KVS_StorageType::get_StorageType_from_combined_key(uint32_t combined_key) +{ + return static_cast(combined_key >> 24); +} + +uint32_t KVS_StorageType::getKey_from_combined_key(uint32_t combined_key) +{ + const uint32_t res = combined_key & ((1 << 24) - 1); + + return res; +} + +size_t KVS_StorageType::getStorageSizePerType(KVS_StorageType::Enum storageType) +{ + switch (storageType) + { + case KVS_StorageType::Enum::not_set: break; + case KVS_StorageType::Enum::string_type: break; + case KVS_StorageType::Enum::int8_type: return 4 + 1; + case KVS_StorageType::Enum::uint8_type: return 4 + 1; + case KVS_StorageType::Enum::int16_type: return 4 + 2; + case KVS_StorageType::Enum::uint16_type: return 4 + 2; + case KVS_StorageType::Enum::int32_type: return 4 + 4; + case KVS_StorageType::Enum::uint32_type: return 4 + 4; + case KVS_StorageType::Enum::int64_type: return 4 + 8; + case KVS_StorageType::Enum::uint64_type: return 4 + 8; + case KVS_StorageType::Enum::float_type: return 4 + 4; + case KVS_StorageType::Enum::double_type: return 4 + 8; + case KVS_StorageType::Enum::bool_type: return 4 + 0; + case KVS_StorageType::Enum::MAX_Type: break; + case KVS_StorageType::Enum::bool_true: + case KVS_StorageType::Enum::bool_false: return 4 + 0; + + case KVS_StorageType::Enum::binary: break; + } + return 0; +} + +#endif // if FEATURE_ESPEASY_KEY_VALUE_STORE diff --git a/src/src/DataTypes/ESPEasy_key_value_store_StorageType.h b/src/src/DataTypes/ESPEasy_key_value_store_StorageType.h new file mode 100644 index 000000000..119e293de --- /dev/null +++ b/src/src/DataTypes/ESPEasy_key_value_store_StorageType.h @@ -0,0 +1,50 @@ +#pragma once + +#include "../../ESPEasy_common.h" +#if FEATURE_ESPEASY_KEY_VALUE_STORE + +class KVS_StorageType +{ + +public: + + // Type is stored, so do not change the order/values + enum class Enum : uint8_t { + not_set = 0, + string_type = 1, + int8_type = 2, + uint8_type = 3, + int16_type = 4, + uint16_type = 5, + int32_type = 6, + uint32_type = 7, + int64_type = 8, + uint64_type = 9, + float_type = 10, + double_type = 11, + bool_type = 12, + + MAX_Type, // Leave this one after the generic type and before 'special' types + + + bool_true = 126, // small optimization to store 'true' as extra type + bool_false = 127, // small optimization to store 'false' as extra type + binary = 255 + + }; + + static uint32_t combine_StorageType_and_key( + KVS_StorageType::Enum storageType, + uint32_t key); + + static KVS_StorageType::Enum get_StorageType_from_combined_key( + uint32_t combined_key); + + static uint32_t getKey_from_combined_key(uint32_t combined_key); + + static size_t getStorageSizePerType(KVS_StorageType::Enum storageType); + + +}; // class KVS_StorageType + +#endif // if FEATURE_ESPEASY_KEY_VALUE_STORE diff --git a/src/src/DataTypes/ESPEasy_plugin_functions.cpp b/src/src/DataTypes/ESPEasy_plugin_functions.cpp index 8748f7e12..3fad56ae6 100644 --- a/src/src/DataTypes/ESPEasy_plugin_functions.cpp +++ b/src/src/DataTypes/ESPEasy_plugin_functions.cpp @@ -13,6 +13,7 @@ bool NWPlugin::canQueryViaNetworkInterface(NWPlugin::Function function) // TD-er: Do not try to fetch hostname via base class. No idea why, but it doesn't work well case NWPlugin::Function::NWPLUGIN_WEBFORM_SHOW_ROUTE_PRIO: case NWPlugin::Function::NWPLUGIN_WEBFORM_SHOW_HOSTNAME: + case NWPlugin::Function::NWPLUGIN_WEBFORM_SHOW_NAME: case NWPlugin::Function::NWPLUGIN_WEBFORM_SHOW_HW_ADDRESS: case NWPlugin::Function::NWPLUGIN_WEBFORM_SHOW_IP: case NWPlugin::Function::NWPLUGIN_CLIENT_IP_WEB_ACCESS_ALLOWED: diff --git a/src/src/DataTypes/ESPEasy_plugin_functions.h b/src/src/DataTypes/ESPEasy_plugin_functions.h index 87c67986a..b5ae25cd9 100644 --- a/src/src/DataTypes/ESPEasy_plugin_functions.h +++ b/src/src/DataTypes/ESPEasy_plugin_functions.h @@ -191,13 +191,15 @@ public: NWPLUGIN_RECORD_STATS, NWPLUGIN_WEBFORM_LOAD_SHOW_STATS, #endif + NWPLUGIN_WEBFORM_SHOW_NAME, // Name like "ppp", "eth0", etc. NWPLUGIN_WEBFORM_SHOW_CONNECTED, // Used for showing connected state/speed NWPLUGIN_WEBFORM_SHOW_EXTENDED, // Used for showing all connection info NWPLUGIN_WEBFORM_SHOW_HOSTNAME, // Used for showing hostname NWPLUGIN_WEBFORM_SHOW_HW_ADDRESS, // Used for showing MAC NWPLUGIN_WEBFORM_SHOW_IP, // Used for showing IP +#ifndef LIMIT_BUILD_SIZE NWPLUGIN_WEBFORM_SHOW_PORT, // Used for showing host information for the network adapter. - +#endif NWPLUGIN_MAX_FUNCTION // Keep as last diff --git a/src/src/Helpers/ESPEasy_key_value_store_import_export.cpp b/src/src/Helpers/ESPEasy_key_value_store_import_export.cpp new file mode 100644 index 000000000..badf96915 --- /dev/null +++ b/src/src/Helpers/ESPEasy_key_value_store_import_export.cpp @@ -0,0 +1,171 @@ +#include "../Helpers/ESPEasy_key_value_store_import_export.h" + +#if FEATURE_ESPEASY_KEY_VALUE_STORE +# include "../Helpers/_ESPEasy_key_value_store.h" +# include "../Helpers/KeyValueWriter.h" +# include "../Helpers/StringConverter.h" + +ESPEasy_key_value_store_import_export::ESPEasy_key_value_store_import_export( + ESPEasy_key_value_store*store, + getLabelStringFunction fnc, + uint32_t maxKey) +: _store(store), _getLabelStringFunction(fnc), _maxKey(maxKey) {} + + +ESPEasy_key_value_store_import_export::ESPEasy_key_value_store_import_export( + ESPEasy_key_value_store*store, + getLabelStringFunction fnc, + validKeyFunction validKey) + : _store(store), _getLabelStringFunction(fnc), _validKey(validKey) {} + +bool ESPEasy_key_value_store_import_export::write( + uint32_t key, + KeyValueWriter*writer) const +{ + if ((_store == nullptr) || (_getLabelStringFunction == nullptr) || (writer == nullptr)) { + return false; + } + KVS_StorageType::Enum storageType = KVS_StorageType::Enum::not_set; + + auto label = _getLabelStringFunction(key, false, storageType); + + if (!_store->hasKey(storageType, key)) { + return false; + } + + switch (storageType) + { + case KVS_StorageType::Enum::not_set: + case KVS_StorageType::Enum::MAX_Type: + break; + case KVS_StorageType::Enum::binary: + // TODO TD-er: Implement + break; + case KVS_StorageType::Enum::bool_type: + case KVS_StorageType::Enum::bool_true: + case KVS_StorageType::Enum::bool_false: + { + bool value{}; + + if (_store->getValue(key, value)) { + writer->write({ label, value }); + return true; + } + break; + } + case KVS_StorageType::Enum::float_type: + { + float value{}; + + if (_store->getValue(key, value)) { + writer->write({ label, value }); + return true; + } + break; + } + case KVS_StorageType::Enum::double_type: + { + double value{}; + + if (_store->getValue(key, value)) { + writer->write({ label, value }); + return true; + } + break; + } + default: + { + String value; + + if (_store->getValueAsString(key, value)) { + writer->write({ label, value }); + return true; + } + break; + } + } + return false; +} + +String ESPEasy_key_value_store_import_export::read(const String& json) +{ + if (_store == nullptr) { + return F("No Store Set"); + } + + if (!_store->isEmpty()) { + return F("Store not empty"); + } + + String tmp(json); + tmp.trim(); + + if (tmp.startsWith("{") && tmp.endsWith("}")) { + tmp = tmp.substring(1, tmp.length() - 2); + } + + int index = 1; + + do + { + String keyValueStr = parseStringKeepCase(tmp, index); + + if (!keyValueStr.isEmpty()) { + ++index; + + // KeyValueStr now contains something like this: + // "key": value + // "key": "value" + + String key_str = parseStringKeepCase(keyValueStr, 1, ':'); + String value = parseStringKeepCase(keyValueStr, 2, ':'); + uint32_t key{}; + KVS_StorageType::Enum storageType; + + if (!findKey(key_str, key, storageType)) { + return strformat( + F("Unknown key: '%s' with value: '%s'"), + key_str.c_str(), + value.c_str()); + } + _store->setValue(storageType, key, value); + } else { index = -1; } + + } while (index > 0); + + _store->dump(); + return EMPTY_STRING; +} + +bool ESPEasy_key_value_store_import_export::findKey( + const String & key_str, + uint32_t & key, + KVS_StorageType::Enum& storageType) const +{ + if ((_getLabelStringFunction == nullptr)) { + return false; + } + key = 0; + + while (validKey(key)) { + storageType = KVS_StorageType::Enum::not_set; + + auto label = _getLabelStringFunction(key, false, storageType); + + if (key_str.equalsIgnoreCase(label)) { + return true; + } + ++key; + } + return false; +} + +bool ESPEasy_key_value_store_import_export::validKey(uint32_t key) const +{ + if (_validKey) { + return _validKey(key); + } + return key <= _maxKey && _maxKey > 0; +} + +#endif // if FEATURE_ESPEASY_KEY_VALUE_STORE diff --git a/src/src/Helpers/ESPEasy_key_value_store_import_export.h b/src/src/Helpers/ESPEasy_key_value_store_import_export.h new file mode 100644 index 000000000..75fe12e19 --- /dev/null +++ b/src/src/Helpers/ESPEasy_key_value_store_import_export.h @@ -0,0 +1,49 @@ +#pragma once +#include "../../ESPEasy_common.h" + +#if FEATURE_ESPEASY_KEY_VALUE_STORE +# include "../DataTypes/ESPEasy_key_value_store_StorageType.h" + +class ESPEasy_key_value_store; +class KeyValueWriter; + +class ESPEasy_key_value_store_import_export +{ +public: + + using getLabelStringFunction = const __FlashStringHelper * (*)(uint32_t, bool, KVS_StorageType::Enum&); + using validKeyFunction = bool (*)(uint32_t); + + ESPEasy_key_value_store_import_export( + ESPEasy_key_value_store*store, + getLabelStringFunction fnc, + uint32_t maxKey); + + + ESPEasy_key_value_store_import_export( + ESPEasy_key_value_store*store, + getLabelStringFunction fnc, + validKeyFunction validKey); + + bool write(uint32_t key, + KeyValueWriter*writer) const; + String read(const String& json); + +private: + + bool findKey( + const String & key_str, + uint32_t & key, + KVS_StorageType::Enum& storageType) const; + + bool validKey(uint32_t key) const; + + ESPEasy_key_value_store*_store{}; + getLabelStringFunction _getLabelStringFunction{}; + validKeyFunction _validKey{}; + + uint32_t _maxKey{}; + +}; // class ESPEasy_key_value_store_import_export + +#endif // if FEATURE_ESPEASY_KEY_VALUE_STORE diff --git a/src/src/Helpers/_ESPEasy_key_value_store.cpp b/src/src/Helpers/_ESPEasy_key_value_store.cpp index 40fb52288..3f5fb623c 100644 --- a/src/src/Helpers/_ESPEasy_key_value_store.cpp +++ b/src/src/Helpers/_ESPEasy_key_value_store.cpp @@ -2,57 +2,12 @@ #if FEATURE_ESPEASY_KEY_VALUE_STORE -# include "../Helpers/StringConverter_Numerical.h" # include "../Helpers/ESPEasy_Storage.h" # include "../Helpers/ESPEasy_time_calc.h" +# include "../Helpers/KeyValueWriter.h" # include "../Helpers/StringConverter.h" +# include "../Helpers/StringConverter_Numerical.h" -uint32_t ESPEasy_key_value_store::combine_StorageType_and_key( - ESPEasy_key_value_store::StorageType storageType, - uint32_t key) -{ - uint32_t res = key & ((1 << 24) - 1); - res |= (static_cast(storageType) << 24); - return res; -} - -ESPEasy_key_value_store::StorageType ESPEasy_key_value_store::get_StorageType_from_combined_key(uint32_t combined_key) -{ - return static_cast(combined_key >> 24); -} - -uint32_t ESPEasy_key_value_store::getKey_from_combined_key(uint32_t combined_key) -{ - const uint32_t res = combined_key & ((1 << 24) - 1); - - return res; -} - -size_t getStorageSizePerType(ESPEasy_key_value_store::StorageType storageType) -{ - switch (storageType) - { - case ESPEasy_key_value_store::StorageType::not_set: break; - case ESPEasy_key_value_store::StorageType::string_type: break; - case ESPEasy_key_value_store::StorageType::int8_type: return 4 + 1; - case ESPEasy_key_value_store::StorageType::uint8_type: return 4 + 1; - case ESPEasy_key_value_store::StorageType::int16_type: return 4 + 2; - case ESPEasy_key_value_store::StorageType::uint16_type: return 4 + 2; - case ESPEasy_key_value_store::StorageType::int32_type: return 4 + 4; - case ESPEasy_key_value_store::StorageType::uint32_type: return 4 + 4; - case ESPEasy_key_value_store::StorageType::int64_type: return 4 + 8; - case ESPEasy_key_value_store::StorageType::uint64_type: return 4 + 8; - case ESPEasy_key_value_store::StorageType::float_type: return 4 + 4; - case ESPEasy_key_value_store::StorageType::double_type: return 4 + 8; - case ESPEasy_key_value_store::StorageType::bool_type: return 4 + 0; - case ESPEasy_key_value_store::StorageType::MAX_Type: break; - case ESPEasy_key_value_store::StorageType::bool_true: - case ESPEasy_key_value_store::StorageType::bool_false: return 4 + 0; - - case ESPEasy_key_value_store::StorageType::binary: break; - } - return 0; -} bool ESPEasy_key_value_store::isEmpty() const { @@ -141,7 +96,7 @@ bool ESPEasy_key_value_store::load( size_t bytesLeftPartialString{}; String partialString; - ESPEasy_key_value_store::StorageType storageType{}; + KVS_StorageType::Enum storageType{}; size_t sizePerType{}; uint32_t key{}; @@ -172,18 +127,18 @@ bool ESPEasy_key_value_store::load( const uint32_t bufPos_start_loop = bufPos; if (!bytesLeftPartialString) { - // Parse StorageType + key + // Parse KVS_StorageType::Enum + key if ((readSize - bufPos) < 4) { // Read next block loadNextFromFile = true; } else { const ESPEasy_key_value_store_4byte_data_t combined_key(buf_start + bufPos); - storageType = get_StorageType_from_combined_key(combined_key.getUint32()); - sizePerType = getStorageSizePerType(storageType); - key = getKey_from_combined_key(combined_key.getUint32()); + storageType = KVS_StorageType::get_StorageType_from_combined_key(combined_key.getUint32()); + sizePerType = KVS_StorageType::getStorageSizePerType(storageType); + key = KVS_StorageType::getKey_from_combined_key(combined_key.getUint32()); - if ((sizePerType < 4) && (storageType != ESPEasy_key_value_store::StorageType::string_type)) { + if ((sizePerType < 4) && (storageType != KVS_StorageType::Enum::string_type)) { // Should not happen as those should not be stored in the file _state = State::ErrorOnLoad; # ifndef BUILD_NO_DEBUG @@ -198,18 +153,18 @@ bool ESPEasy_key_value_store::load( if (!loadNextFromFile) { switch (storageType) { - case ESPEasy_key_value_store::StorageType::bool_false: - case ESPEasy_key_value_store::StorageType::bool_type: - case ESPEasy_key_value_store::StorageType::bool_true: + case KVS_StorageType::Enum::bool_false: + case KVS_StorageType::Enum::bool_type: + case KVS_StorageType::Enum::bool_true: { // Store bool type - const bool res = storageType != ESPEasy_key_value_store::StorageType::bool_false; + const bool res = storageType != KVS_StorageType::Enum::bool_false; setValue(key, res); bufPos += 4; break; } - case ESPEasy_key_value_store::StorageType::string_type: + case KVS_StorageType::Enum::string_type: { if (bytesLeftPartialString == 0) { // Found new string type @@ -301,7 +256,7 @@ bool ESPEasy_key_value_store::load( if ((bufPos_start_loop == bufPos) && !loadNextFromFile) { _state = State::ErrorOnLoad; # ifndef BUILD_NO_DEBUG - _lastError = strformat(F("KVS: BUG! Did not increment bufPos while processing StorageType %d at readPos %d"), + _lastError = strformat(F("KVS: BUG! Did not increment bufPos while processing KVS_StorageType::Enum %d at readPos %d"), static_cast(storageType), LOG_READPOS_OFFSET); addLog(LOG_LEVEL_ERROR, _lastError); # endif // ifndef BUILD_NO_DEBUG @@ -316,7 +271,7 @@ bool ESPEasy_key_value_store::load( _state = State::ErrorOnLoad; # ifndef BUILD_NO_DEBUG _lastError = strformat( - F("KVS: Timeout! bufPos while processing StorageType %d at readPos %d, startChecksumPos: %d"), + F("KVS: Timeout! bufPos while processing KVS_StorageType::Enum %d at readPos %d, startChecksumPos: %d"), static_cast(storageType), readPos, startChecksumPos); addLog(LOG_LEVEL_ERROR, _lastError); dump(); @@ -473,9 +428,9 @@ bool ESPEasy_key_value_store::store( } else if (it_4byte != _4byte_data.end()) { // Write 4-byte data uint32_t combined_key = it_4byte->first; - ESPEasy_key_value_store::StorageType storageType = get_StorageType_from_combined_key(combined_key); - const uint32_t key = getKey_from_combined_key(combined_key); - const size_t sizePerType = getStorageSizePerType(storageType); + KVS_StorageType::Enum storageType = KVS_StorageType::get_StorageType_from_combined_key(combined_key); + const uint32_t key = KVS_StorageType::getKey_from_combined_key(combined_key); + const size_t sizePerType = KVS_StorageType::getStorageSizePerType(storageType); if (sizePerType >= 4) { if ((buffer.size() - bufPos) < sizePerType) { @@ -484,16 +439,16 @@ bool ESPEasy_key_value_store::store( switch (storageType) { - case ESPEasy_key_value_store::StorageType::bool_false: - case ESPEasy_key_value_store::StorageType::bool_true: - case ESPEasy_key_value_store::StorageType::bool_type: + case KVS_StorageType::Enum::bool_false: + case KVS_StorageType::Enum::bool_true: + case KVS_StorageType::Enum::bool_type: { bool value{}; getValue(key, value); - combined_key = combine_StorageType_and_key( + combined_key = KVS_StorageType::combine_StorageType_and_key( value - ? ESPEasy_key_value_store::StorageType::bool_true - : ESPEasy_key_value_store::StorageType::bool_false + ? KVS_StorageType::Enum::bool_true + : KVS_StorageType::Enum::bool_false , key); break; } @@ -579,29 +534,29 @@ size_t ESPEasy_key_value_store::getPayloadStorageSize() const for (auto it = _4byte_data.begin(); it != _4byte_data.end(); ++it) { - res += getStorageSizePerType( - get_StorageType_from_combined_key(it->first)); + res += KVS_StorageType::getStorageSizePerType( + KVS_StorageType::get_StorageType_from_combined_key(it->first)); } for (auto it = _8byte_data.begin(); it != _8byte_data.end(); ++it) { - res += getStorageSizePerType( - get_StorageType_from_combined_key(it->first)); + res += KVS_StorageType::getStorageSizePerType( + KVS_StorageType::get_StorageType_from_combined_key(it->first)); } return res; } -bool ESPEasy_key_value_store::hasKey(StorageType storageType, uint32_t key) const +bool ESPEasy_key_value_store::hasKey(KVS_StorageType::Enum storageType, uint32_t key) const { if (!hasStorageType(storageType)) { return false; } - const uint32_t combined_key = combine_StorageType_and_key(storageType, key); + const uint32_t combined_key = KVS_StorageType::combine_StorageType_and_key(storageType, key); - if (storageType == ESPEasy_key_value_store::StorageType::string_type) + if (storageType == KVS_StorageType::Enum::string_type) { return _string_data.find(combined_key) != _string_data.end(); } - const size_t size = getStorageSizePerType(storageType); + const size_t size = KVS_StorageType::getStorageSizePerType(storageType); if (size == 12) { @@ -614,22 +569,22 @@ bool ESPEasy_key_value_store::hasKey(StorageType storageType, uint32_t key) cons return false; } -ESPEasy_key_value_store::StorageType ESPEasy_key_value_store::getStorageType(uint32_t key) const +KVS_StorageType::Enum ESPEasy_key_value_store::getStorageType(uint32_t key) const { uint32_t cached_bitmap = _storage_type_present_cache; // Search all storage types, skipping the 'not_set' for (size_t i = 0; cached_bitmap && - i < static_cast(ESPEasy_key_value_store::StorageType::MAX_Type); + i < static_cast(KVS_StorageType::Enum::MAX_Type); ++i) { - const ESPEasy_key_value_store::StorageType res = static_cast(i); + const KVS_StorageType::Enum res = static_cast(i); if (hasKey(res, key)) { return res; } cached_bitmap >>= 1; } - return ESPEasy_key_value_store::StorageType::not_set; + return KVS_StorageType::Enum::not_set; } #define KVS_STRINGPAIR_SEPARATOR ((char)1) bool ESPEasy_key_value_store::getValue(uint32_t key, StringPair& stringPair) const @@ -658,8 +613,8 @@ void ESPEasy_key_value_store::setValue(uint32_t key, const StringPair& stringPai bool ESPEasy_key_value_store::getValue(uint32_t key, String& value) const { - const uint32_t combined_key = combine_StorageType_and_key( - ESPEasy_key_value_store::StorageType::string_type, + const uint32_t combined_key = KVS_StorageType::combine_StorageType_and_key( + KVS_StorageType::Enum::string_type, key); auto it = _string_data.find(combined_key); @@ -676,8 +631,8 @@ void ESPEasy_key_value_store::setValue(uint32_t key, void ESPEasy_key_value_store::setValue(uint32_t key, String&& value) { - const uint32_t combined_key = combine_StorageType_and_key( - ESPEasy_key_value_store::StorageType::string_type, + const uint32_t combined_key = KVS_StorageType::combine_StorageType_and_key( + KVS_StorageType::Enum::string_type, key); auto it = _string_data.find(combined_key); @@ -691,52 +646,52 @@ void ESPEasy_key_value_store::setValue(uint32_t key, String&& value) _state = State::Changed; } } - setHasStorageType(ESPEasy_key_value_store::StorageType::string_type); + setHasStorageType(KVS_StorageType::Enum::string_type); } ESPEasy_key_value_store::map_4byte_data::const_iterator ESPEasy_key_value_store::get4byteIterator( - ESPEasy_key_value_store::StorageType storageType, + KVS_StorageType::Enum storageType, uint32_t key) const { if (!hasStorageType(storageType)) { return _4byte_data.end(); } - const uint32_t combined_key = combine_StorageType_and_key(storageType, key); + const uint32_t combined_key = KVS_StorageType::combine_StorageType_and_key(storageType, key); return _4byte_data.find(combined_key); } ESPEasy_key_value_store::map_8byte_data::const_iterator ESPEasy_key_value_store::get8byteIterator( - ESPEasy_key_value_store::StorageType storageType, + KVS_StorageType::Enum storageType, uint32_t key) const { if (!hasStorageType(storageType)) { return _8byte_data.end(); } - const uint32_t combined_key = combine_StorageType_and_key(storageType, key); + const uint32_t combined_key = KVS_StorageType::combine_StorageType_and_key(storageType, key); return _8byte_data.find(combined_key); } # define GET_4BYTE_TYPE(T, GF) \ - auto it = get4byteIterator(ESPEasy_key_value_store::StorageType::T, key); \ + auto it = get4byteIterator(KVS_StorageType::Enum::T, key); \ if (it == _4byte_data.end()) return false; \ value = it->second.GF(); \ return true; \ # define GET_8BYTE_TYPE(T, GF) \ - auto it = get8byteIterator(ESPEasy_key_value_store::StorageType::T, key); \ + auto it = get8byteIterator(KVS_StorageType::Enum::T, key); \ if (it == _8byte_data.end()) return false; \ value = it->second.GF(); \ return true; \ # define SET_4BYTE_TYPE(T, SF) \ - const uint32_t combined_key = combine_StorageType_and_key( \ - ESPEasy_key_value_store::StorageType::T, key); \ + const uint32_t combined_key = KVS_StorageType::combine_StorageType_and_key( \ + KVS_StorageType::Enum::T, key); \ if (_4byte_data[combined_key].SF(value)) _state = State::Changed; \ - setHasStorageType(ESPEasy_key_value_store::StorageType::T); + setHasStorageType(KVS_StorageType::Enum::T); # define SET_8BYTE_TYPE(T, SF) \ - const uint32_t combined_key = combine_StorageType_and_key( \ - ESPEasy_key_value_store::StorageType::T, key); \ + const uint32_t combined_key = KVS_StorageType::combine_StorageType_and_key( \ + KVS_StorageType::Enum::T, key); \ if (_8byte_data[combined_key].SF(value)) _state = State::Changed; \ - setHasStorageType(ESPEasy_key_value_store::StorageType::T); + setHasStorageType(KVS_StorageType::Enum::T); bool ESPEasy_key_value_store::getValue(uint32_t key, int8_t& value) const { @@ -813,7 +768,7 @@ bool ESPEasy_key_value_store::getValue(uint32_t key, bool& boolValue) const { boolValue = false; uint32_t value{}; - auto it = get4byteIterator(ESPEasy_key_value_store::StorageType::bool_type, key); + auto it = get4byteIterator(KVS_StorageType::Enum::bool_type, key); if (it == _4byte_data.end()) { return false; } value = it->second.getUint32(); @@ -826,23 +781,23 @@ void ESPEasy_key_value_store::setValue(uint32_t key, const bool& boolValue) { SET_4BYTE_TYPE(bool_type, setUint32); } -bool ESPEasy_key_value_store::getValueAsString(const StorageType& storageType, uint32_t key, String& value) const +bool ESPEasy_key_value_store::getValueAsString(const KVS_StorageType::Enum& storageType, uint32_t key, String& value) const { if (!hasKey(storageType, key)) { return false; } switch (storageType) { - case ESPEasy_key_value_store::StorageType::string_type: + case KVS_StorageType::Enum::string_type: return getValue(key, value); - case ESPEasy_key_value_store::StorageType::bool_type: - case ESPEasy_key_value_store::StorageType::int8_type: - case ESPEasy_key_value_store::StorageType::uint8_type: - case ESPEasy_key_value_store::StorageType::int16_type: - case ESPEasy_key_value_store::StorageType::uint16_type: - case ESPEasy_key_value_store::StorageType::int32_type: - case ESPEasy_key_value_store::StorageType::uint32_type: - case ESPEasy_key_value_store::StorageType::int64_type: + case KVS_StorageType::Enum::bool_type: + case KVS_StorageType::Enum::int8_type: + case KVS_StorageType::Enum::uint8_type: + case KVS_StorageType::Enum::int16_type: + case KVS_StorageType::Enum::uint16_type: + case KVS_StorageType::Enum::int32_type: + case KVS_StorageType::Enum::uint32_type: + case KVS_StorageType::Enum::int64_type: { int64_t int64_value{}; @@ -853,7 +808,7 @@ bool ESPEasy_key_value_store::getValueAsString(const StorageType& storageType, u break; } - case ESPEasy_key_value_store::StorageType::float_type: + case KVS_StorageType::Enum::float_type: { float v{}; @@ -864,7 +819,7 @@ bool ESPEasy_key_value_store::getValueAsString(const StorageType& storageType, u break; } - case ESPEasy_key_value_store::StorageType::uint64_type: + case KVS_StorageType::Enum::uint64_type: { uint64_t v{}; @@ -875,7 +830,7 @@ bool ESPEasy_key_value_store::getValueAsString(const StorageType& storageType, u break; } - case ESPEasy_key_value_store::StorageType::double_type: + case KVS_StorageType::Enum::double_type: { double v{}; @@ -886,11 +841,11 @@ bool ESPEasy_key_value_store::getValueAsString(const StorageType& storageType, u break; } - case ESPEasy_key_value_store::StorageType::not_set: - case ESPEasy_key_value_store::StorageType::bool_true: - case ESPEasy_key_value_store::StorageType::bool_false: - case ESPEasy_key_value_store::StorageType::binary: - case ESPEasy_key_value_store::StorageType::MAX_Type: + case KVS_StorageType::Enum::not_set: + case KVS_StorageType::Enum::bool_true: + case KVS_StorageType::Enum::bool_false: + case KVS_StorageType::Enum::binary: + case KVS_StorageType::Enum::MAX_Type: break; } return false; @@ -902,7 +857,7 @@ bool ESPEasy_key_value_store::getValueAsString(uint32_t key, String& value) cons } # define GET_TYPE_AS_INT64(T, CT) \ - case ESPEasy_key_value_store::StorageType::T: \ + case KVS_StorageType::Enum::T: \ { \ CT v{}; \ if (getValue(key, v)) { \ @@ -922,9 +877,9 @@ bool ESPEasy_key_value_store::getValueAsInt( switch (storageType) { - case ESPEasy_key_value_store::StorageType::bool_type: - case ESPEasy_key_value_store::StorageType::bool_true: - case ESPEasy_key_value_store::StorageType::bool_false: + case KVS_StorageType::Enum::bool_type: + case KVS_StorageType::Enum::bool_true: + case KVS_StorageType::Enum::bool_false: { bool v{}; @@ -945,7 +900,7 @@ bool ESPEasy_key_value_store::getValueAsInt( GET_TYPE_AS_INT64(uint64_type, uint64_t) GET_TYPE_AS_INT64(double_type, double) - case ESPEasy_key_value_store::StorageType::int64_type: + case KVS_StorageType::Enum::int64_type: return getValue(key, value); default: break; } @@ -966,18 +921,18 @@ int64_t ESPEasy_key_value_store::getValueAsInt(uint32_t key) const } # define GET_4BYTE_INT_TYPE_FROM_STRING(T, CT) \ - case ESPEasy_key_value_store::StorageType::T: \ + case KVS_StorageType::Enum::T: \ { \ CT v(value.toInt()); \ setValue(key, v); \ break; \ } -void ESPEasy_key_value_store::setValue(const StorageType& storageType, uint32_t key, const String& value) +void ESPEasy_key_value_store::setValue(const KVS_StorageType::Enum& storageType, uint32_t key, const String& value) { switch (storageType) { - case ESPEasy_key_value_store::StorageType::string_type: + case KVS_StorageType::Enum::string_type: setValue(key, value); break; GET_4BYTE_INT_TYPE_FROM_STRING(int8_type, int8_t) @@ -986,26 +941,26 @@ void ESPEasy_key_value_store::setValue(const StorageType& storageType, uint32_t GET_4BYTE_INT_TYPE_FROM_STRING(uint16_type, uint16_t) GET_4BYTE_INT_TYPE_FROM_STRING(int32_type, int32_t) GET_4BYTE_INT_TYPE_FROM_STRING(uint32_type, uint32_t) - case ESPEasy_key_value_store::StorageType::double_type: + case KVS_StorageType::Enum::double_type: setValue(key, value.toDouble()); break; - case ESPEasy_key_value_store::StorageType::float_type: + case KVS_StorageType::Enum::float_type: setValue(key, value.toFloat()); break; - case ESPEasy_key_value_store::StorageType::int64_type: + case KVS_StorageType::Enum::int64_type: { // TODO TD-er: Implement break; } - case ESPEasy_key_value_store::StorageType::uint64_type: + case KVS_StorageType::Enum::uint64_type: { // TODO TD-er: Implement break; } - case ESPEasy_key_value_store::StorageType::bool_type: - case ESPEasy_key_value_store::StorageType::bool_true: - case ESPEasy_key_value_store::StorageType::bool_false: + case KVS_StorageType::Enum::bool_type: + case KVS_StorageType::Enum::bool_true: + case KVS_StorageType::Enum::bool_false: setValue(key, static_cast(value.toInt())); break; default: return; @@ -1014,11 +969,11 @@ void ESPEasy_key_value_store::setValue(const StorageType& storageType, uint32_t } bool ESPEasy_key_value_store::getValue( - StorageType & storageType, + KVS_StorageType::Enum & storageType, uint32_t key, ESPEasy_key_value_store_4byte_data_t& value) const { - auto it = _4byte_data.find(combine_StorageType_and_key(storageType, key)); + auto it = _4byte_data.find(KVS_StorageType::combine_StorageType_and_key(storageType, key)); if (it == _4byte_data.end()) { return false; } memcpy(value.getBinary(), it->second.getBinary(), 4); @@ -1026,11 +981,11 @@ bool ESPEasy_key_value_store::getValue( } void ESPEasy_key_value_store::setValue( - StorageType & storageType, + KVS_StorageType::Enum & storageType, uint32_t key, const ESPEasy_key_value_store_4byte_data_t& value) { - auto combined_key = combine_StorageType_and_key(storageType, key); + auto combined_key = KVS_StorageType::combine_StorageType_and_key(storageType, key); auto it = _4byte_data.find(combined_key); if (it == _4byte_data.end()) { @@ -1044,11 +999,11 @@ void ESPEasy_key_value_store::setValue( } bool ESPEasy_key_value_store::getValue( - StorageType & storageType, + KVS_StorageType::Enum & storageType, uint32_t key, ESPEasy_key_value_store_8byte_data_t& value) const { - auto it = _8byte_data.find(combine_StorageType_and_key(storageType, key)); + auto it = _8byte_data.find(KVS_StorageType::combine_StorageType_and_key(storageType, key)); if (it == _8byte_data.end()) { return false; } memcpy(value.getBinary(), it->second.getBinary(), 8); @@ -1056,11 +1011,11 @@ bool ESPEasy_key_value_store::getValue( } void ESPEasy_key_value_store::setValue( - StorageType & storageType, + KVS_StorageType::Enum & storageType, uint32_t key, const ESPEasy_key_value_store_8byte_data_t& value) { - auto combined_key = combine_StorageType_and_key(storageType, key); + auto combined_key = KVS_StorageType::combine_StorageType_and_key(storageType, key); auto it = _8byte_data.find(combined_key); if (it == _8byte_data.end()) { @@ -1073,29 +1028,29 @@ void ESPEasy_key_value_store::setValue( setHasStorageType(storageType); } -bool ESPEasy_key_value_store::hasStorageType(StorageType storageType) const +bool ESPEasy_key_value_store::hasStorageType(KVS_StorageType::Enum storageType) const { // return true; - if ((storageType == ESPEasy_key_value_store::StorageType::bool_true) || - (storageType == ESPEasy_key_value_store::StorageType::bool_false)) { - storageType = ESPEasy_key_value_store::StorageType::bool_type; + if ((storageType == KVS_StorageType::Enum::bool_true) || + (storageType == KVS_StorageType::Enum::bool_false)) { + storageType = KVS_StorageType::Enum::bool_type; } const uint32_t bitnr = static_cast(storageType); - constexpr uint32_t max_bitnr = static_cast(StorageType::MAX_Type); + constexpr uint32_t max_bitnr = static_cast(KVS_StorageType::Enum::MAX_Type); if (bitnr >= max_bitnr) { return false; } return bitRead(_storage_type_present_cache, bitnr); } -void ESPEasy_key_value_store::setHasStorageType(StorageType storageType) +void ESPEasy_key_value_store::setHasStorageType(KVS_StorageType::Enum storageType) { - if ((storageType == ESPEasy_key_value_store::StorageType::bool_true) || - (storageType == ESPEasy_key_value_store::StorageType::bool_false)) { - storageType = ESPEasy_key_value_store::StorageType::bool_type; + if ((storageType == KVS_StorageType::Enum::bool_true) || + (storageType == KVS_StorageType::Enum::bool_false)) { + storageType = KVS_StorageType::Enum::bool_type; } const uint32_t bitnr = static_cast(storageType); - constexpr uint32_t max_bitnr = static_cast(StorageType::MAX_Type); + constexpr uint32_t max_bitnr = static_cast(KVS_StorageType::Enum::MAX_Type); if (bitnr < max_bitnr) { if (!bitRead(_storage_type_present_cache, bitnr)) { @@ -1117,16 +1072,16 @@ void ESPEasy_key_value_store::dump() const String val; if (!getValueAsString( - get_StorageType_from_combined_key(it->first), - getKey_from_combined_key(it->first), + KVS_StorageType::get_StorageType_from_combined_key(it->first), + KVS_StorageType::getKey_from_combined_key(it->first), val)) { val = '-'; } addLog(LOG_LEVEL_INFO, strformat( F("KVS: type: %d, combined-key: %x, key: %d, value: '%s' '%s'"), - get_StorageType_from_combined_key(it->first), - it->first, getKey_from_combined_key(it->first), + KVS_StorageType::get_StorageType_from_combined_key(it->first), + it->first, KVS_StorageType::getKey_from_combined_key(it->first), it->second.c_str(), val.c_str())); @@ -1137,16 +1092,16 @@ void ESPEasy_key_value_store::dump() const String val; if (!getValueAsString( - get_StorageType_from_combined_key(it->first), - getKey_from_combined_key(it->first), + KVS_StorageType::get_StorageType_from_combined_key(it->first), + KVS_StorageType::getKey_from_combined_key(it->first), val)) { val = '-'; } addLog(LOG_LEVEL_INFO, strformat( F("KVS: type: %d, comb: %x, key: %d, val: '%x %x %x %x' strval: '%s'"), - get_StorageType_from_combined_key(it->first), - it->first, getKey_from_combined_key(it->first), + KVS_StorageType::get_StorageType_from_combined_key(it->first), + it->first, KVS_StorageType::getKey_from_combined_key(it->first), it->second.getBinary()[0], it->second.getBinary()[1], it->second.getBinary()[2], @@ -1161,16 +1116,16 @@ void ESPEasy_key_value_store::dump() const String val; if (!getValueAsString( - get_StorageType_from_combined_key(it->first), - getKey_from_combined_key(it->first), + KVS_StorageType::get_StorageType_from_combined_key(it->first), + KVS_StorageType::getKey_from_combined_key(it->first), val)) { val = '-'; } addLog(LOG_LEVEL_INFO, strformat( F("KVS: type: %d, comb: %x, key: %d, val: '%x %x %x %x %x %x %x %x' strval: '%s'"), - get_StorageType_from_combined_key(it->first), - it->first, getKey_from_combined_key(it->first), + KVS_StorageType::get_StorageType_from_combined_key(it->first), + it->first, KVS_StorageType::getKey_from_combined_key(it->first), it->second.getBinary()[0], it->second.getBinary()[1], it->second.getBinary()[2], @@ -1186,4 +1141,15 @@ void ESPEasy_key_value_store::dump() const } +bool ESPEasy_key_value_store::_export(KeyValueWriter* writer) const +{ + return false; +} + +bool ESPEasy_key_value_store::_import(const String& json) +{ + return false; +} + + #endif // if FEATURE_ESPEASY_KEY_VALUE_STORE diff --git a/src/src/Helpers/_ESPEasy_key_value_store.h b/src/src/Helpers/_ESPEasy_key_value_store.h index 8264b71b1..c3882d705 100644 --- a/src/src/Helpers/_ESPEasy_key_value_store.h +++ b/src/src/Helpers/_ESPEasy_key_value_store.h @@ -6,10 +6,14 @@ #if FEATURE_ESPEASY_KEY_VALUE_STORE # include "../DataTypes/ESPEasy_key_value_store_data.h" +# include "../DataTypes/ESPEasy_key_value_store_StorageType.h" + # include "../DataTypes/SettingsType.h" # include +class KeyValueWriter; + // Generic storage layer, which on a low level will store everything as a string. // Low level storage structure: // - uint8_t: version of storage layer @@ -27,34 +31,9 @@ class ESPEasy_key_value_store { public: + typedef std::pair StringPair; - - // Type is stored, so do not change the order/values - enum class StorageType { - not_set = 0, - string_type = 1, - int8_type = 2, - uint8_type = 3, - int16_type = 4, - uint16_type = 5, - int32_type = 6, - uint32_type = 7, - int64_type = 8, - uint64_type = 9, - float_type = 10, - double_type = 11, - bool_type = 12, - - MAX_Type, // Leave this one after the generic type and before 'special' types - - - bool_true = 126, // small optimization to store 'true' as extra type - bool_false = 127, // small optimization to store 'false' as extra type - binary = 255 - - }; - enum class State { Empty, NotChanged, // Not changed since last load/save @@ -64,25 +43,17 @@ public: }; - static uint32_t combine_StorageType_and_key( - ESPEasy_key_value_store::StorageType storageType, - uint32_t key); + State getState() const { return _state; } - static ESPEasy_key_value_store::StorageType get_StorageType_from_combined_key(uint32_t combined_key); + bool isEmpty() const; - static uint32_t getKey_from_combined_key(uint32_t combined_key); - - State getState() const { return _state; } - - bool isEmpty() const; - - void clear(); + void clear(); - bool load(SettingsType::Enum settingsType, - int index, - uint32_t offset_in_block, - uint16_t id_to_match); + bool load(SettingsType::Enum settingsType, + int index, + uint32_t offset_in_block, + uint16_t id_to_match); bool store(SettingsType::Enum settingsType, int index, uint32_t offset_in_block, @@ -92,11 +63,11 @@ public: size_t getPayloadStorageSize() const; // Check to see if there is a key stored with given storage type - bool hasKey(StorageType storageType, - uint32_t key) const; + bool hasKey(KVS_StorageType::Enum storageType, + uint32_t key) const; // Try to find a key and get its storage type or 'not_set' if the key is not present - StorageType getStorageType(uint32_t key) const; + KVS_StorageType::Enum getStorageType(uint32_t key) const; /* @@ -105,8 +76,10 @@ public: ############################################### */ - bool getValue(uint32_t key, StringPair& stringPair) const; - void setValue(uint32_t key, const StringPair& stringPair); + bool getValue(uint32_t key, + StringPair& stringPair) const; + void setValue(uint32_t key, + const StringPair& stringPair); bool getValue(uint32_t key, String & value) const; @@ -175,9 +148,9 @@ public: // Generic get function for any given storageType/key and represent its value as a string. // Return false when storageType/key is not present. - bool getValueAsString(const StorageType& storageType, - uint32_t key, - String & value) const; + bool getValueAsString(const KVS_StorageType::Enum& storageType, + uint32_t key, + String & value) const; bool getValueAsString(uint32_t key, String & value) const; @@ -192,48 +165,51 @@ public: // Generic set function for any given storageType/key. // Given value is a string representation of that storage type. // TODO TD-er: Implement - void setValue(const StorageType& storageType, - uint32_t key, - const String & value); + void setValue(const KVS_StorageType::Enum& storageType, + uint32_t key, + const String & value); String getLastError() const { return _lastError; } void dump() const; + bool _export(KeyValueWriter*writer) const; + bool _import(const String& json); + private: - bool getValue(StorageType & storageType, + bool getValue(KVS_StorageType::Enum & storageType, uint32_t key, ESPEasy_key_value_store_4byte_data_t& value) const; - void setValue(StorageType & storageType, + void setValue(KVS_StorageType::Enum & storageType, uint32_t key, const ESPEasy_key_value_store_4byte_data_t& value); - bool getValue(StorageType & storageType, + bool getValue(KVS_StorageType::Enum & storageType, uint32_t key, ESPEasy_key_value_store_8byte_data_t& value) const; - void setValue(StorageType & storageType, + void setValue(KVS_StorageType::Enum & storageType, uint32_t key, const ESPEasy_key_value_store_8byte_data_t& value); // Query cache to see if we have any of the asked storage type - bool hasStorageType(StorageType storageType) const; + bool hasStorageType(KVS_StorageType::Enum storageType) const; // Update cache to indicate we have at least one of the given storage type - void setHasStorageType(StorageType storageType); + void setHasStorageType(KVS_StorageType::Enum storageType); - typedef std::mapmap_4byte_data; - typedef std::mapmap_8byte_data; + typedef std::map map_4byte_data; + typedef std::map map_8byte_data; map_4byte_data::const_iterator get4byteIterator( - ESPEasy_key_value_store::StorageType storageType, - uint32_t key) const; + KVS_StorageType::Enum storageType, + uint32_t key) const; map_8byte_data::const_iterator get8byteIterator( - ESPEasy_key_value_store::StorageType storageType, - uint32_t key) const; + KVS_StorageType::Enum storageType, + uint32_t key) const; String _lastError; diff --git a/src/src/WebServer/ESPEasy_key_value_store_webform.cpp b/src/src/WebServer/ESPEasy_key_value_store_webform.cpp index 36cc20b91..8edccfb4f 100644 --- a/src/src/WebServer/ESPEasy_key_value_store_webform.cpp +++ b/src/src/WebServer/ESPEasy_key_value_store_webform.cpp @@ -8,19 +8,19 @@ WebFormItemParams::WebFormItemParams( const String & label, const String & id, - ESPEasy_key_value_store::StorageType storageType, + KVS_StorageType::Enum storageType, uint32_t key) : _label(label), _id(id), _storageType(storageType), _key(key) {} WebFormItemParams::WebFormItemParams( const __FlashStringHelper *label, const __FlashStringHelper *id, - ESPEasy_key_value_store::StorageType storageType, + KVS_StorageType::Enum storageType, uint32_t key) : _label(label), _id(id), _storageType(storageType), _key(key) {} # define CORRECT_RANGE(T, CT) \ - case ESPEasy_key_value_store::StorageType::T: \ + case KVS_StorageType::Enum::T: \ if (_max > std::numeric_limits::max()) _max = std::numeric_limits::max(); \ if (_min < std::numeric_limits::min()) _min = std::numeric_limits::min(); \ break; @@ -52,7 +52,7 @@ bool showWebformItem(const ESPEasy_key_value_store& store, switch (params._storageType) { - case ESPEasy_key_value_store::StorageType::string_type: + case KVS_StorageType::Enum::string_type: { String value; @@ -87,12 +87,12 @@ bool showWebformItem(const ESPEasy_key_value_store& store, } return true; } - case ESPEasy_key_value_store::StorageType::int8_type: - case ESPEasy_key_value_store::StorageType::uint8_type: - case ESPEasy_key_value_store::StorageType::int16_type: - case ESPEasy_key_value_store::StorageType::uint16_type: - case ESPEasy_key_value_store::StorageType::int32_type: - case ESPEasy_key_value_store::StorageType::uint32_type: + case KVS_StorageType::Enum::int8_type: + case KVS_StorageType::Enum::uint8_type: + case KVS_StorageType::Enum::int16_type: + case KVS_StorageType::Enum::uint16_type: + case KVS_StorageType::Enum::int32_type: + case KVS_StorageType::Enum::uint32_type: { int64_t value; @@ -112,18 +112,18 @@ bool showWebformItem(const ESPEasy_key_value_store& store, return true; } - case ESPEasy_key_value_store::StorageType::int64_type: + case KVS_StorageType::Enum::int64_type: { break; } - case ESPEasy_key_value_store::StorageType::uint64_type: + case KVS_StorageType::Enum::uint64_type: { break; } - case ESPEasy_key_value_store::StorageType::float_type: - case ESPEasy_key_value_store::StorageType::double_type: + case KVS_StorageType::Enum::float_type: + case KVS_StorageType::Enum::double_type: { float value{}; @@ -146,7 +146,7 @@ bool showWebformItem(const ESPEasy_key_value_store& store, return true; } - case ESPEasy_key_value_store::StorageType::bool_type: + case KVS_StorageType::Enum::bool_type: { bool value{}; @@ -177,17 +177,17 @@ void showFormSelector(const ESPEasy_key_value_store& store, void storeWebformItem(ESPEasy_key_value_store & store, uint32_t key, - ESPEasy_key_value_store::StorageType storageType, + KVS_StorageType::Enum storageType, const __FlashStringHelper *id) { storeWebformItem(store, key, storageType, String(id)); } void storeWebformItem(ESPEasy_key_value_store & store, uint32_t key, - ESPEasy_key_value_store::StorageType storageType, + KVS_StorageType::Enum storageType, const String & id) { String _id = id.isEmpty() ? concat(F("KVS_ID_"), key) : id; - if (storageType == ESPEasy_key_value_store::StorageType::bool_type) { + if (storageType == KVS_StorageType::Enum::bool_type) { store.setValue(key, isFormItemChecked(_id)); return; } diff --git a/src/src/WebServer/ESPEasy_key_value_store_webform.h b/src/src/WebServer/ESPEasy_key_value_store_webform.h index ad9958b1d..6508c8aa6 100644 --- a/src/src/WebServer/ESPEasy_key_value_store_webform.h +++ b/src/src/WebServer/ESPEasy_key_value_store_webform.h @@ -11,12 +11,12 @@ struct WebFormItemParams { WebFormItemParams(const String & label, const String & id, - ESPEasy_key_value_store::StorageType storageType, + KVS_StorageType::Enum storageType, uint32_t key = 0); WebFormItemParams(const __FlashStringHelper *label, const __FlashStringHelper *id, - ESPEasy_key_value_store::StorageType storageType, + KVS_StorageType::Enum storageType, uint32_t key = 0); @@ -31,7 +31,7 @@ struct WebFormItemParams { float _max = INT_MAX; uint8_t _nrDecimals{}; float _stepsize = 1; - ESPEasy_key_value_store::StorageType _storageType = ESPEasy_key_value_store::StorageType::not_set; + KVS_StorageType::Enum _storageType = KVS_StorageType::Enum::not_set; uint32_t _key{}; int _maxLength{}; bool _disabled{}; @@ -56,12 +56,12 @@ void showFormSelector(const ESPEasy_key_value_store& store, void storeWebformItem(ESPEasy_key_value_store & store, uint32_t key, - ESPEasy_key_value_store::StorageType storageType, + KVS_StorageType::Enum storageType, const __FlashStringHelper *id); void storeWebformItem(ESPEasy_key_value_store & store, uint32_t key, - ESPEasy_key_value_store::StorageType storageType, + KVS_StorageType::Enum storageType, const String & id = EMPTY_STRING); #endif // if FEATURE_ESPEASY_KEY_VALUE_STORE diff --git a/src/src/WebServer/JSON.cpp b/src/src/WebServer/JSON.cpp index d2f920bd2..2594bfc6a 100644 --- a/src/src/WebServer/JSON.cpp +++ b/src/src/WebServer/JSON.cpp @@ -280,7 +280,9 @@ void handle_json() #ifdef WEBSERVER_NETWORK # ifdef ESP32 ESPEasy::net::write_NetworkAdapterFlags(x, writer->createChild(F("Interface")).get()); +#ifndef LIMIT_BUILD_SIZE ESPEasy::net::write_NetworkAdapterPort(x, writer->createChild(F("Port")).get()); +#endif ESPEasy::net::write_IP_config(x, writer->createChild(F("IP")).get()); # endif // ifdef ESP32 #endif // ifdef WEBSERVER_NETWORK diff --git a/src/src/WebServer/NetworkPage.cpp b/src/src/WebServer/NetworkPage.cpp index e6c7f05d6..cc82d5d94 100644 --- a/src/src/WebServer/NetworkPage.cpp +++ b/src/src/WebServer/NetworkPage.cpp @@ -179,7 +179,12 @@ void handle_networks_ShowAllNetworksTable() html_table_header(F(""), 70); html_table_header(F("Nr"), 50); html_table_header(F("Enabled"), 100); +#ifndef LIMIT_BUILD_SIZE html_table_header(F("Network Adapter")); +#else + html_table_header(F("")); +#endif + html_table_header(F("Name"), 50); # ifdef ESP32 html_table_header(F("Route Prio"), 50); # endif @@ -187,7 +192,9 @@ void handle_networks_ShowAllNetworksTable() html_table_header(F("Hostname/SSID")); html_table_header(F("HW Address")); html_table_header(F("IP")); +#ifndef LIMIT_BUILD_SIZE html_table_header(F("Port")); +#endif for (ESPEasy::net::networkIndex_t x = 0; x < MAX_NR_NETWORKS_IN_TABLE; x++) { @@ -207,14 +214,17 @@ void handle_networks_ShowAllNetworksTable() addHtml(getNWPluginNameFromNWPluginID(Settings.getNWPluginID_for_network(x))); const NWPlugin::Function functions[] { + NWPlugin::Function::NWPLUGIN_WEBFORM_SHOW_NAME, # ifdef ESP32 NWPlugin::Function::NWPLUGIN_WEBFORM_SHOW_ROUTE_PRIO, # endif NWPlugin::Function::NWPLUGIN_WEBFORM_SHOW_CONNECTED, NWPlugin::Function::NWPLUGIN_WEBFORM_SHOW_HOSTNAME, NWPlugin::Function::NWPLUGIN_WEBFORM_SHOW_HW_ADDRESS, - NWPlugin::Function::NWPLUGIN_WEBFORM_SHOW_IP, - NWPlugin::Function::NWPLUGIN_WEBFORM_SHOW_PORT + NWPlugin::Function::NWPLUGIN_WEBFORM_SHOW_IP +#ifndef LIMIT_BUILD_SIZE + ,NWPlugin::Function::NWPLUGIN_WEBFORM_SHOW_PORT +#endif }; // const networkDriverIndex_t NetworkDriverIndex = getNetworkDriverIndex_from_NetworkIndex(x); @@ -263,7 +273,11 @@ void handle_networks_ShowAllNetworksTable() } else { +#ifndef LIMIT_BUILD_SIZE + html_TD(8); +#else html_TD(7); +#endif } } @@ -402,7 +416,9 @@ void handle_networks_NetworkSettingsPage(ESPEasy::net::networkIndex_t networkind KeyValueWriter_WebForm writer(true); ESPEasy::net::write_NetworkAdapterFlags(networkindex, writer.createChild(F("Network Interface")).get()); +#ifndef LIMIT_BUILD_SIZE ESPEasy::net::write_NetworkAdapterPort(networkindex, writer.createChild(F("Port")).get()); +#endif ESPEasy::net::write_IP_config(networkindex, writer.createChild(F("IP Config")).get()); ESPEasy::net::write_NetworkConnectionInfo(networkindex, writer.createChild(F("Connection Information")).get()); } diff --git a/src/src/WebServer/SecurityStruct_deviceSpecific_webform.cpp b/src/src/WebServer/SecurityStruct_deviceSpecific_webform.cpp index fec4fa805..ab74b53b2 100644 --- a/src/src/WebServer/SecurityStruct_deviceSpecific_webform.cpp +++ b/src/src/WebServer/SecurityStruct_deviceSpecific_webform.cpp @@ -9,10 +9,10 @@ String DevSpecific_Security_getLabelString(SecurityStruct_deviceSpecific::KeyType keytype, uint16_t index, bool displayString, - ESPEasy_key_value_store::StorageType & storageType, + KVS_StorageType::Enum & storageType, bool suppressIndex_displayString = false) { - storageType = ESPEasy_key_value_store::StorageType::string_type; + storageType = KVS_StorageType::Enum::string_type; String res = SecurityStruct_deviceSpecific::toString(keytype); if ((keytype == SecurityStruct_deviceSpecific::KeyType::WiFi_SSID) || @@ -40,7 +40,7 @@ WebFormItemParams make_DevSpecific_Security_WebFormItemParams( uint16_t index, bool suppressIndex_displayString) { - ESPEasy_key_value_store::StorageType storageType; + KVS_StorageType::Enum storageType; auto res = WebFormItemParams( DevSpecific_Security_getLabelString( @@ -69,7 +69,7 @@ void store_SecurityStruct_deviceSpecific_WebFormItem( SecurityStruct_deviceSpecific::KeyType keytype, uint16_t index) { - ESPEasy_key_value_store::StorageType storageType; + KVS_StorageType::Enum storageType; auto id = DevSpecific_Security_getLabelString(keytype, index, false, storageType); From 8833610d9c34edcbd6894bd04e72d5fa2b10cf1f Mon Sep 17 00:00:00 2001 From: TD-er Date: Tue, 28 Oct 2025 22:06:12 +0100 Subject: [PATCH 439/564] [Build] Disable Framed OLED on 1M ESP8266 Normal builds due to size --- src/src/CustomBuild/define_plugin_sets.h | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/src/CustomBuild/define_plugin_sets.h b/src/src/CustomBuild/define_plugin_sets.h index bedbcb1f2..cdf43ec3c 100644 --- a/src/src/CustomBuild/define_plugin_sets.h +++ b/src/src/CustomBuild/define_plugin_sets.h @@ -1493,7 +1493,9 @@ To create/register a plugin, you have to : #define USES_P033 // Dummy #define USES_P034 // DHT12 // #define USES_P035 // IRTX +#ifndef ESP8266_1M #define USES_P036 // FrameOLED +#endif #define USES_P037 // MQTTImport #define USES_P038 // NeoPixel #define USES_P039 // Environment - Thermocouple From 7fd75fd945a9888c717d40820204584e84b50334 Mon Sep 17 00:00:00 2001 From: TD-er Date: Wed, 29 Oct 2025 16:17:30 +0100 Subject: [PATCH 440/564] [Network] Add networkexportconfig command to export to JSON --- .../net/DataStructs/NWPluginData_base.h | 5 - src/ESPEasy/net/Globals/NWPlugins.cpp | 5 + .../net/Helpers/NWPlugin_import_export.cpp | 223 ++++++++++++++++++ .../net/Helpers/NWPlugin_import_export.h | 31 +++ .../NW001_data_struct_WiFi_STA.cpp | 7 +- .../NW001_data_struct_WiFi_STA.h | 7 +- .../NW002_data_struct_WiFi_AP.cpp | 7 +- .../NW002_data_struct_WiFi_AP.h | 7 +- .../NW003_data_struct_ETH_RMII.cpp | 7 +- .../NW003_data_struct_ETH_RMII.h | 7 +- .../NW004_data_struct_ETH_SPI.cpp | 7 +- .../NW004_data_struct_ETH_SPI.h | 7 +- .../NW005_data_struct_PPP_modem.cpp | 90 ++++--- .../NW005_data_struct_PPP_modem.h | 17 +- src/ESPEasy/net/_NW005_PPP_modem.cpp | 15 +- src/src/Commands/InternalCommands.cpp | 5 + src/src/Commands/InternalCommands_decoder.cpp | 4 + src/src/Commands/InternalCommands_decoder.h | 4 + src/src/Commands/Networks.cpp | 32 +++ src/src/Commands/Networks.h | 4 + src/src/DataTypes/ESPEasy_plugin_functions.h | 4 + .../ESPEasy_key_value_store_import_export.cpp | 121 ++++++---- .../ESPEasy_key_value_store_import_export.h | 34 +-- src/src/Helpers/_ESPEasy_key_value_store.cpp | 10 - src/src/Helpers/_ESPEasy_key_value_store.h | 3 - src/src/WebServer/NetworkPage.cpp | 4 - 26 files changed, 477 insertions(+), 190 deletions(-) create mode 100644 src/ESPEasy/net/Helpers/NWPlugin_import_export.cpp create mode 100644 src/ESPEasy/net/Helpers/NWPlugin_import_export.h diff --git a/src/ESPEasy/net/DataStructs/NWPluginData_base.h b/src/ESPEasy/net/DataStructs/NWPluginData_base.h index 51012f47a..8ea8a01db 100644 --- a/src/ESPEasy/net/DataStructs/NWPluginData_base.h +++ b/src/ESPEasy/net/DataStructs/NWPluginData_base.h @@ -132,11 +132,6 @@ protected: PluginStats_array *_plugin_stats_array = nullptr; #endif // if FEATURE_NETWORK_STATS -#if FEATURE_STORE_NETWORK_INTERFACE_SETTINGS - virtual bool _export(KeyValueWriter* writer) const = 0; - virtual bool _import(const String& json) = 0; -#endif - protected: #ifdef ESP32 diff --git a/src/ESPEasy/net/Globals/NWPlugins.cpp b/src/ESPEasy/net/Globals/NWPlugins.cpp index 0b61eda61..39051efb9 100644 --- a/src/ESPEasy/net/Globals/NWPlugins.cpp +++ b/src/ESPEasy/net/Globals/NWPlugins.cpp @@ -267,6 +267,11 @@ bool NWPluginCall(NWPlugin::Function Function, EventStruct *event, String& str) case NWPlugin::Function::NWPLUGIN_GET_DEVICENAME: case NWPlugin::Function::NWPLUGIN_WEBFORM_LOAD: case NWPlugin::Function::NWPLUGIN_WEBFORM_SAVE: +#if FEATURE_STORE_NETWORK_INTERFACE_SETTINGS + case NWPlugin::Function::NWPLUGIN_EXPORT_CONFIG: + case NWPlugin::Function::NWPLUGIN_IMPORT_CONFIG: +#endif + case NWPlugin::Function::NWPLUGIN_DRIVER_TEMPLATE: { const networkIndex_t networkIndex = event->NetworkIndex; diff --git a/src/ESPEasy/net/Helpers/NWPlugin_import_export.cpp b/src/ESPEasy/net/Helpers/NWPlugin_import_export.cpp new file mode 100644 index 000000000..c7c38b309 --- /dev/null +++ b/src/ESPEasy/net/Helpers/NWPlugin_import_export.cpp @@ -0,0 +1,223 @@ +#include "../Helpers/NWPlugin_import_export.h" + +#if FEATURE_STORE_NETWORK_INTERFACE_SETTINGS + +# include "../../../src/Globals/Settings.h" +# include "../../../src/Helpers/_ESPEasy_key_value_store.h" +# include "../../../src/Helpers/ESPEasy_key_value_store_import_export.h" + +// # include "../../../src/Helpers/StringConverter.h" + +# include "../DataTypes/NWPluginID.h" +# include "../Globals/NWPlugins.h" + + +# ifdef USES_NW001 +# include "../NWPluginStructs/NW001_data_struct_WiFi_STA.h" +# endif +# ifdef USES_NW002 +# include "../NWPluginStructs/NW002_data_struct_WiFi_AP.h" +# endif +# ifdef USES_NW003 +# include "../NWPluginStructs/NW003_data_struct_ETH_RMII.h" +# endif +# ifdef USES_NW004 +# include "../NWPluginStructs/NW004_data_struct_ETH_SPI.h" +# endif +# ifdef USES_NW005 +# include "../NWPluginStructs/NW005_data_struct_PPP_modem.h" +# endif + +namespace ESPEasy { +namespace net { + +ESPEasy_key_value_store_import_export::LabelStringFunction getLabelFnc(ESPEasy::net::nwpluginID_t nwpluginID) +{ + + switch (nwpluginID.value) + { +# ifdef USES_NW005 + case 5: + { + return ESPEasy::net::ppp::NW005_data_struct_PPP_modem::getLabelString; + } +# endif // ifdef USES_NW005 + +# ifdef USES_NW001 + case 1: +# endif +# ifdef USES_NW002 + case 2: +# endif +# ifdef USES_NW003 + case 3: +# endif +# ifdef USES_NW004 + case 4: +# endif + default: + break; + + } + return nullptr; +} + +ESPEasy_key_value_store_import_export::NextKeyFunction getNextKeyFnc(ESPEasy::net::nwpluginID_t nwpluginID, bool includeCredentials) +{ + + switch (nwpluginID.value) + { +# ifdef USES_NW005 + case 5: + { + if (includeCredentials) { + return ESPEasy::net::ppp::NW005_data_struct_PPP_modem::getNextKey; + } + return ESPEasy::net::ppp::NW005_data_struct_PPP_modem::getNextKey_noCredentials; + } +# endif // ifdef USES_NW005 + +# ifdef USES_NW001 + case 1: +# endif +# ifdef USES_NW002 + case 2: +# endif +# ifdef USES_NW003 + case 3: +# endif +# ifdef USES_NW004 + case 4: +# endif + default: + break; + + } + return nullptr; +} + +String NWPlugin_import_export::exportConfig( + networkIndex_t networkIndex, + KeyValueWriter *writer, + bool includeCredentials) +{ + if (writer == nullptr) { return F("KVS : No writer"); } + + if (!validNetworkIndex(networkIndex)) { return F("KVS : Invalid Network Index"); } + + const ESPEasy::net::nwpluginID_t nwpluginID(Settings.NWPluginID[networkIndex]); + + if (!nwpluginID.isValid()) { return F("KVS : Invalid NW-Plugin ID"); } + + ESPEasy_key_value_store kvs; + + if (!kvs.load( + SettingsType::Enum::NetworkInterfaceSettings_Type, + networkIndex, + 0, + nwpluginID.value)) { return F("KVS : Failed loading"); } + auto labelFnc = getLabelFnc(nwpluginID); + auto nextKeyFnc = getNextKeyFnc(nwpluginID, includeCredentials); + + if ((labelFnc == nullptr) || (nextKeyFnc == nullptr)) { + return F("KVS : NWPlugin ID does not support import/export"); + } + + auto child = writer->createChild(); + + if (child) { + child->write({ F("nwpluginID"), nwpluginID.value }); + child->write({ F("route_prio"), Settings.getRoutePrio_for_network(networkIndex) }); + child->write({ F("sn_block"), Settings.getNetworkInterfaceSubnetBlockClientIP(networkIndex) }); + child->write({ F("start_delay"), Settings.getNetworkInterfaceStartupDelayAtBoot(networkIndex) }); + ESPEasy_key_value_store_import_export e(&kvs, labelFnc, nextKeyFnc); + + int32_t key = nextKeyFnc(-1); + + while (key >= 0) { + e.write(key, child.get()); + key = nextKeyFnc(key); + } + } + return EMPTY_STRING; +} + +String NWPlugin_import_export::importConfig( + networkIndex_t networkIndex, + const String & json) +{ + if (!validNetworkIndex(networkIndex)) { return F("KVS : Invalid Network Index"); } + + ESPEasy::net::nwpluginID_t nwpluginID(Settings.NWPluginID[networkIndex]); + + if (nwpluginID.isValid()) { return F("KVS : Network Index is already in use"); } + + // FIXME set fixed right now. + nwpluginID.value = 5; + + auto labelFnc = getLabelFnc(nwpluginID); + auto nextKeyFnc = getNextKeyFnc(nwpluginID, true); + + if ((labelFnc == nullptr) || (nextKeyFnc == nullptr)) { + return F("KVS : NWPlugin ID does not support import/export"); + } + + ESPEasy_key_value_store kvs; + ESPEasy_key_value_store_import_export e(&kvs, labelFnc, nextKeyFnc); + String res = e.read(json); + + if (res.isEmpty()) { + { + String value; + + if (!e.getParsedJSON(F("nwpluginID"), value)) { return F("KVS : No NWPlugin ID"); } + nwpluginID.value = value.toInt(); + } + + if (!nwpluginID.isValid()) { return F("KVS : No valid NWPlugin ID"); } + + if (!kvs.store( + SettingsType::Enum::NetworkInterfaceSettings_Type, + networkIndex, + 0, + nwpluginID.value)) { return F("KVS : Error saving, see log for more details"); } + + // Add entry, calls NWPLUGIN_LOAD_DEFAULTS + Settings.setNWPluginID_for_network(networkIndex, nwpluginID); + + const String non_kvs_keys[] = { + F("route_prio"), + F("sn_block"), + F("start_delay") + }; + + for (size_t i = 0; i < NR_ELEMENTS(non_kvs_keys); ++i) { + String value; + + if (e.getParsedJSON(non_kvs_keys[i], value)) + { + switch (i) + { + case 0: Settings.setRoutePrio_for_network(networkIndex, value.toInt()); + break; + case 1: + { + bool val = !(value.equalsIgnoreCase(F("false")) || value.equals(F("0"))); + Settings.setNetworkInterfaceSubnetBlockClientIP(networkIndex, val); + break; + } + case 2: Settings.setNetworkInterfaceStartupDelayAtBoot(networkIndex, value.toInt()); + break; + } + } + } + } + + return res; +} + +} // namespace net + +} // namespace ESPEasy + +#endif // if FEATURE_ESPEASY_KEY_VALUE_STORE diff --git a/src/ESPEasy/net/Helpers/NWPlugin_import_export.h b/src/ESPEasy/net/Helpers/NWPlugin_import_export.h new file mode 100644 index 000000000..3688f1f1f --- /dev/null +++ b/src/ESPEasy/net/Helpers/NWPlugin_import_export.h @@ -0,0 +1,31 @@ +#pragma once + +#include "../../../ESPEasy_common.h" +#if FEATURE_STORE_NETWORK_INTERFACE_SETTINGS + +#include "../DataTypes/NetworkIndex.h" +# include "../../../src/Helpers/KeyValueWriter.h" + +namespace ESPEasy { +namespace net { + +class NWPlugin_import_export +{ +public: + + static String exportConfig( + networkIndex_t networkIndex, + KeyValueWriter *writer, + bool includeCredentials = false); + + static String importConfig( + networkIndex_t networkIndex, + const String & json); + + +}; // class NWPlugin_import_export + +} // namespace net +} // namespace ESPEasy + +#endif \ No newline at end of file diff --git a/src/ESPEasy/net/NWPluginStructs/NW001_data_struct_WiFi_STA.cpp b/src/ESPEasy/net/NWPluginStructs/NW001_data_struct_WiFi_STA.cpp index c5d5cdd87..0ae4cb4fe 100644 --- a/src/ESPEasy/net/NWPluginStructs/NW001_data_struct_WiFi_STA.cpp +++ b/src/ESPEasy/net/NWPluginStructs/NW001_data_struct_WiFi_STA.cpp @@ -48,7 +48,7 @@ void NW001_data_struct_WiFi_STA::webform_load(EventStruct *event) void NW001_data_struct_WiFi_STA::webform_save(EventStruct *event) {} -bool NW001_data_struct_WiFi_STA::webform_getPort(String& str) { return true; } +bool NW001_data_struct_WiFi_STA::webform_getPort(KeyValueWriter *writer) { return true; } bool NW001_data_struct_WiFi_STA::init(EventStruct *event) { @@ -112,11 +112,6 @@ NWPluginData_static_runtime * NW001_data_struct_WiFi_STA::getNWPluginData_static return _WiFiEventHandler.getNWPluginData_static_runtime(); } -#if FEATURE_STORE_NETWORK_INTERFACE_SETTINGS - bool NW001_data_struct_WiFi_STA::_export(KeyValueWriter* writer) const { return false; } - bool NW001_data_struct_WiFi_STA::_import(const String& json) { return false; } -#endif - const __FlashStringHelper * NW001_data_struct_WiFi_STA::getWiFi_encryptionType() const { return _WiFiEventHandler.getWiFi_encryptionType(); diff --git a/src/ESPEasy/net/NWPluginStructs/NW001_data_struct_WiFi_STA.h b/src/ESPEasy/net/NWPluginStructs/NW001_data_struct_WiFi_STA.h index a19df4275..2d9a6c3ec 100644 --- a/src/ESPEasy/net/NWPluginStructs/NW001_data_struct_WiFi_STA.h +++ b/src/ESPEasy/net/NWPluginStructs/NW001_data_struct_WiFi_STA.h @@ -24,7 +24,7 @@ struct NW001_data_struct_WiFi_STA : public NWPluginData_base { void webform_load(EventStruct *event); void webform_save(EventStruct *event); - bool webform_getPort(String& str); + bool webform_getPort(KeyValueWriter *writer); bool init(EventStruct *event); @@ -45,11 +45,6 @@ struct NW001_data_struct_WiFi_STA : public NWPluginData_base { WiFiDisconnectReason getWiFi_disconnectReason() const; -#if FEATURE_STORE_NETWORK_INTERFACE_SETTINGS - virtual bool _export(KeyValueWriter* writer) const; - virtual bool _import(const String& json); -#endif - private: ESPEasyWiFi_STA_EventHandler _WiFiEventHandler; diff --git a/src/ESPEasy/net/NWPluginStructs/NW002_data_struct_WiFi_AP.cpp b/src/ESPEasy/net/NWPluginStructs/NW002_data_struct_WiFi_AP.cpp index e045af0d3..920304858 100644 --- a/src/ESPEasy/net/NWPluginStructs/NW002_data_struct_WiFi_AP.cpp +++ b/src/ESPEasy/net/NWPluginStructs/NW002_data_struct_WiFi_AP.cpp @@ -85,7 +85,7 @@ void NW002_data_struct_WiFi_AP::webform_load(EventStruct *event) {} void NW002_data_struct_WiFi_AP::webform_save(EventStruct *event) {} -bool NW002_data_struct_WiFi_AP::webform_getPort(String& str) { return true; } +bool NW002_data_struct_WiFi_AP::webform_getPort(KeyValueWriter *writer) { return true; } bool NW002_data_struct_WiFi_AP::init(EventStruct *event) { @@ -123,11 +123,6 @@ NWPluginData_static_runtime * NW002_data_struct_WiFi_AP::getNWPluginData_static_ return nullptr; } -#if FEATURE_STORE_NETWORK_INTERFACE_SETTINGS - bool NW002_data_struct_WiFi_AP::_export(KeyValueWriter* writer) const { return false; } - bool NW002_data_struct_WiFi_AP::_import(const String& json) { return false; } -#endif - # ifdef ESP32 diff --git a/src/ESPEasy/net/NWPluginStructs/NW002_data_struct_WiFi_AP.h b/src/ESPEasy/net/NWPluginStructs/NW002_data_struct_WiFi_AP.h index f437f1d85..7ba19a6e2 100644 --- a/src/ESPEasy/net/NWPluginStructs/NW002_data_struct_WiFi_AP.h +++ b/src/ESPEasy/net/NWPluginStructs/NW002_data_struct_WiFi_AP.h @@ -17,7 +17,7 @@ struct NW002_data_struct_WiFi_AP : public NWPluginData_base { void webform_load(EventStruct *event); void webform_save(EventStruct *event); - bool webform_getPort(String& str); + bool webform_getPort(KeyValueWriter *writer); bool init(EventStruct *event); @@ -35,11 +35,6 @@ struct NW002_data_struct_WiFi_AP : public NWPluginData_base { NWPluginData_static_runtime* getNWPluginData_static_runtime(); -#if FEATURE_STORE_NETWORK_INTERFACE_SETTINGS - virtual bool _export(KeyValueWriter* writer) const; - virtual bool _import(const String& json); -#endif - private: # ifdef ESP32 diff --git a/src/ESPEasy/net/NWPluginStructs/NW003_data_struct_ETH_RMII.cpp b/src/ESPEasy/net/NWPluginStructs/NW003_data_struct_ETH_RMII.cpp index 9bb85aa11..30dd341e4 100644 --- a/src/ESPEasy/net/NWPluginStructs/NW003_data_struct_ETH_RMII.cpp +++ b/src/ESPEasy/net/NWPluginStructs/NW003_data_struct_ETH_RMII.cpp @@ -42,7 +42,7 @@ void NW003_data_struct_ETH_RMII::webform_load(EventStruct *event) {} void NW003_data_struct_ETH_RMII::webform_save(EventStruct *event) {} -bool NW003_data_struct_ETH_RMII::webform_getPort(String& str) { return true; } +bool NW003_data_struct_ETH_RMII::webform_getPort(KeyValueWriter *writer) { return true; } bool NW003_data_struct_ETH_RMII::init(EventStruct *event) { @@ -61,11 +61,6 @@ bool NW003_data_struct_ETH_RMII::exit(EventStruct *event) { return true; } -#if FEATURE_STORE_NETWORK_INTERFACE_SETTINGS - bool NW003_data_struct_ETH_RMII::_export(KeyValueWriter* writer) const { return false; } - bool NW003_data_struct_ETH_RMII::_import(const String& json) { return false; } -#endif - NWPluginData_static_runtime * NW003_data_struct_ETH_RMII::getNWPluginData_static_runtime() { return &stats_and_cache; } diff --git a/src/ESPEasy/net/NWPluginStructs/NW003_data_struct_ETH_RMII.h b/src/ESPEasy/net/NWPluginStructs/NW003_data_struct_ETH_RMII.h index 0a4a94f24..eda0c00cb 100644 --- a/src/ESPEasy/net/NWPluginStructs/NW003_data_struct_ETH_RMII.h +++ b/src/ESPEasy/net/NWPluginStructs/NW003_data_struct_ETH_RMII.h @@ -17,7 +17,7 @@ struct NW003_data_struct_ETH_RMII : public NWPluginData_base { void webform_load(EventStruct *event); void webform_save(EventStruct *event); - bool webform_getPort(String& str); + bool webform_getPort(KeyValueWriter *writer); bool init(EventStruct *event); @@ -25,11 +25,6 @@ struct NW003_data_struct_ETH_RMII : public NWPluginData_base { NWPluginData_static_runtime* getNWPluginData_static_runtime(); -#if FEATURE_STORE_NETWORK_INTERFACE_SETTINGS - virtual bool _export(KeyValueWriter* writer) const; - virtual bool _import(const String& json); -#endif - private: diff --git a/src/ESPEasy/net/NWPluginStructs/NW004_data_struct_ETH_SPI.cpp b/src/ESPEasy/net/NWPluginStructs/NW004_data_struct_ETH_SPI.cpp index 37f1c8c5d..f774372ad 100644 --- a/src/ESPEasy/net/NWPluginStructs/NW004_data_struct_ETH_SPI.cpp +++ b/src/ESPEasy/net/NWPluginStructs/NW004_data_struct_ETH_SPI.cpp @@ -41,7 +41,7 @@ void NW004_data_struct_ETH_SPI::webform_load(EventStruct *event) {} void NW004_data_struct_ETH_SPI::webform_save(EventStruct *event) {} -bool NW004_data_struct_ETH_SPI::webform_getPort(String& str) { return true; } +bool NW004_data_struct_ETH_SPI::webform_getPort(KeyValueWriter *writer) { return true; } bool NW004_data_struct_ETH_SPI::init(EventStruct *event) { @@ -64,11 +64,6 @@ bool NW004_data_struct_ETH_SPI::exit(EventStruct *event) NWPluginData_static_runtime * NW004_data_struct_ETH_SPI::getNWPluginData_static_runtime() { return &stats_and_cache; } -#if FEATURE_STORE_NETWORK_INTERFACE_SETTINGS - bool NW004_data_struct_ETH_SPI::_export(KeyValueWriter* writer) const { return false; } - bool NW004_data_struct_ETH_SPI::_import(const String& json) { return false; } -#endif - void NW004_data_struct_ETH_SPI::onEvent(arduino_event_id_t event, arduino_event_info_t info) diff --git a/src/ESPEasy/net/NWPluginStructs/NW004_data_struct_ETH_SPI.h b/src/ESPEasy/net/NWPluginStructs/NW004_data_struct_ETH_SPI.h index c969e7717..bfa44d55a 100644 --- a/src/ESPEasy/net/NWPluginStructs/NW004_data_struct_ETH_SPI.h +++ b/src/ESPEasy/net/NWPluginStructs/NW004_data_struct_ETH_SPI.h @@ -17,7 +17,7 @@ struct NW004_data_struct_ETH_SPI : public NWPluginData_base { void webform_load(EventStruct *event); void webform_save(EventStruct *event); - bool webform_getPort(String& str); + bool webform_getPort(KeyValueWriter *writer); bool init(EventStruct *event); @@ -25,11 +25,6 @@ struct NW004_data_struct_ETH_SPI : public NWPluginData_base { NWPluginData_static_runtime* getNWPluginData_static_runtime(); -#if FEATURE_STORE_NETWORK_INTERFACE_SETTINGS - virtual bool _export(KeyValueWriter* writer) const; - virtual bool _import(const String& json); -#endif - private: static void onEvent(arduino_event_id_t event, diff --git a/src/ESPEasy/net/NWPluginStructs/NW005_data_struct_PPP_modem.cpp b/src/ESPEasy/net/NWPluginStructs/NW005_data_struct_PPP_modem.cpp index 9020abf1b..4cf5949b0 100644 --- a/src/ESPEasy/net/NWPluginStructs/NW005_data_struct_PPP_modem.cpp +++ b/src/ESPEasy/net/NWPluginStructs/NW005_data_struct_PPP_modem.cpp @@ -49,7 +49,7 @@ static NWPluginData_static_runtime stats_and_cache(&NW_PLUGIN_INTERFACE, F("PPP" # define NW005_KEY_SIM_PIN 13 # define NW005_KEY_PIN_DTR 14 -const __FlashStringHelper* NW005_getLabelString(uint32_t key, bool displayString, KVS_StorageType::Enum& storageType) +const __FlashStringHelper* NW005_data_struct_PPP_modem::getLabelString(uint32_t key, bool displayString, KVS_StorageType::Enum& storageType) { storageType = KVS_StorageType::Enum::int8_type; @@ -86,6 +86,20 @@ const __FlashStringHelper* NW005_getLabelString(uint32_t key, bool displayString return F(""); } +int32_t NW005_data_struct_PPP_modem::getNextKey(int32_t key) +{ + if (key == -1) return NW005_KEY_SERIAL_PORT; + if (key < NW005_KEY_PIN_DTR) return key+1; + return -2; +} + +int32_t NW005_data_struct_PPP_modem::getNextKey_noCredentials(int32_t key) +{ + if (key == -1) return NW005_KEY_SERIAL_PORT; + if (key < NW005_KEY_MODEM_MODEL) return key+1; + return -2; +} + NW005_data_struct_PPP_modem::NW005_data_struct_PPP_modem(networkIndex_t networkIndex) : NWPluginData_base(nwpluginID_t(NW_PLUGIN_ID), networkIndex, &NW_PLUGIN_INTERFACE) { @@ -95,8 +109,8 @@ NW005_data_struct_PPP_modem::NW005_data_struct_PPP_modem(networkIndex_t networkI WebFormItemParams NW005_makeWebFormItemParams(uint32_t key) { KVS_StorageType::Enum storageType; - const __FlashStringHelper*label = NW005_getLabelString(key, true, storageType); - const __FlashStringHelper*id = NW005_getLabelString(key, false, storageType); + const __FlashStringHelper*label = NW005_data_struct_PPP_modem::getLabelString(key, true, storageType); + const __FlashStringHelper*id = NW005_data_struct_PPP_modem::getLabelString(key, false, storageType); return WebFormItemParams(label, id, storageType, key); } @@ -506,7 +520,7 @@ void NW005_data_struct_PPP_modem::webform_load(EventStruct *event) { const int key = gpio_keys[i]; KVS_StorageType::Enum storageType; - const __FlashStringHelper *id = NW005_getLabelString(key, false, storageType); + const __FlashStringHelper *id = getLabelString(key, false, storageType); PinSelectPurpose purpose = PinSelectPurpose::Generic; String label = NW005_formatGpioLabel(key, purpose); @@ -602,19 +616,17 @@ void NW005_data_struct_PPP_modem::webform_save(EventStruct *event) for (int i = 0; i < NR_ELEMENTS(keys); ++i) { KVS_StorageType::Enum storageType; - const __FlashStringHelper *id = NW005_getLabelString(keys[i], false, storageType); + const __FlashStringHelper *id = getLabelString(keys[i], false, storageType); storeWebformItem(*_kvs, keys[i], storageType, id); } _store(); } -bool NW005_data_struct_PPP_modem::webform_getPort(String& str) +bool NW005_data_struct_PPP_modem::webform_getPort(KeyValueWriter *writer) { - str.clear(); - - if (_KVS_initialized() && _load()) { - int serialPort = _kvs->getValueAsInt_or_default(NW005_KEY_SERIAL_PORT, -1); - str = serialHelper_getSerialTypeLabel(static_cast(serialPort)); + if (_KVS_initialized() && _load() && writer) { + int serialPort = _kvs->getValueAsInt_or_default(NW005_KEY_SERIAL_PORT, -1); + auto serialTypeLabel = serialHelper_getSerialTypeLabel(static_cast(serialPort)); if (serialPort >= 0) { const uint32_t keys[] { @@ -626,21 +638,42 @@ bool NW005_data_struct_PPP_modem::webform_getPort(String& str) NW005_KEY_PIN_RESET }; + KeyValueStruct kv(EMPTY_STRING, serialTypeLabel); + + if (!writer->summaryValueOnly()) { + writer->write({ F("Serial Type"), serialTypeLabel }); + } + for (int i = 0; i < NR_ELEMENTS(keys); ++i) { int pin = _kvs->getValueAsInt_or_default(keys[i], -1); if (pin >= 0) { - PinSelectPurpose purpose = PinSelectPurpose::Generic; - const bool shortNotation = true; - String label = NW005_formatGpioLabel(keys[i], purpose, shortNotation); - str += strformat(F("\n%s: %d"), - label.c_str(), - pin); + PinSelectPurpose purpose = PinSelectPurpose::Generic; + const bool shortNotation = true; + const String label = NW005_formatGpioLabel(keys[i], purpose, shortNotation); + + if (writer->summaryValueOnly()) { + kv.appendValue(strformat(F("%s: %d"), + label.c_str(), + pin)); + } else { + if (writer->plainText()) { + KVS_StorageType::Enum storageType; + writer->write({ getLabelString(keys[i], false, storageType), pin }); + } else { + writer->write({ label, pin }); + } + } } } + + if (writer->summaryValueOnly()) { + writer->write(kv); + } } + return true; } - return !str.isEmpty(); + return false; } bool NW005_data_struct_PPP_modem::write_ModemState(KeyValueWriter*modemState) @@ -1069,25 +1102,6 @@ bool NW005_data_struct_PPP_modem::record_stats() NWPluginData_static_runtime * NW005_data_struct_PPP_modem::getNWPluginData_static_runtime() { return &stats_and_cache; } -# if FEATURE_STORE_NETWORK_INTERFACE_SETTINGS - -bool NW005_data_struct_PPP_modem::_export(KeyValueWriter*writer) const { - if (writer == nullptr) return false; - auto child = writer->createChild(); - - - ESPEasy_key_value_store_import_export e(_kvs, NW005_getLabelString, NW005_KEY_PIN_DTR); - - for (uint32_t i = NW005_KEY_SERIAL_PORT; i <= NW005_KEY_PIN_DTR; ++i) { - if (!e.write(i, writer)) { return false; } - } - return true; -} - -bool NW005_data_struct_PPP_modem::_import(const String& json) { return false; } - -# endif // if FEATURE_STORE_NETWORK_INTERFACE_SETTINGS - void NW005_data_struct_PPP_modem::onEvent(arduino_event_id_t event, arduino_event_info_t info) { // TODO TD-er: Must store flags from events in static (or global) object to act on it later. switch (event) @@ -1137,7 +1151,7 @@ String NW005_data_struct_PPP_modem::NW005_formatGpioLabel(uint32_t key, PinSelec { KVS_StorageType::Enum storageType; purpose = PinSelectPurpose::Generic; - label = NW005_getLabelString(key, true, storageType); + label = getLabelString(key, true, storageType); const bool optional = !shortNotation; diff --git a/src/ESPEasy/net/NWPluginStructs/NW005_data_struct_PPP_modem.h b/src/ESPEasy/net/NWPluginStructs/NW005_data_struct_PPP_modem.h index 7ed56d048..b0ab4e8fd 100644 --- a/src/ESPEasy/net/NWPluginStructs/NW005_data_struct_PPP_modem.h +++ b/src/ESPEasy/net/NWPluginStructs/NW005_data_struct_PPP_modem.h @@ -30,6 +30,16 @@ struct NW005_modem_task_data { struct NW005_data_struct_PPP_modem : public NWPluginData_base { +// See: ESPEasy_key_value_store_import_export::LabelStringFunction +static const __FlashStringHelper* getLabelString(uint32_t key, bool displayString, KVS_StorageType::Enum& storageType); + +// When queried with a key of -1, it will return the first key index +// Return next key, or -2 when no next key exists. +// See: ESPEasy_key_value_store_import_export::NextKeyFunction +static int32_t getNextKey(int32_t key); +static int32_t getNextKey_noCredentials(int32_t key); + + NW005_data_struct_PPP_modem(networkIndex_t networkIndex); ~NW005_data_struct_PPP_modem(); @@ -45,7 +55,7 @@ struct NW005_data_struct_PPP_modem : public NWPluginData_base { void webform_load(EventStruct *event); void webform_save(EventStruct *event); - bool webform_getPort(String& str); + bool webform_getPort(KeyValueWriter *writer); bool write_ModemState(KeyValueWriter*writer); @@ -67,11 +77,6 @@ struct NW005_data_struct_PPP_modem : public NWPluginData_base { NWPluginData_static_runtime* getNWPluginData_static_runtime(); -#if FEATURE_STORE_NETWORK_INTERFACE_SETTINGS - virtual bool _export(KeyValueWriter* writer) const; - virtual bool _import(const String& json); -#endif - private: static void onEvent(arduino_event_id_t event, diff --git a/src/ESPEasy/net/_NW005_PPP_modem.cpp b/src/ESPEasy/net/_NW005_PPP_modem.cpp index dba7c3358..8636e75d5 100644 --- a/src/ESPEasy/net/_NW005_PPP_modem.cpp +++ b/src/ESPEasy/net/_NW005_PPP_modem.cpp @@ -137,7 +137,7 @@ bool NWPlugin_005(NWPlugin::Function function, EventStruct *event, String& strin break; } -#ifndef LIMIT_BUILD_SIZE +# ifndef LIMIT_BUILD_SIZE case NWPlugin::Function::NWPLUGIN_WEBFORM_SHOW_PORT: { if (event->kvWriter) { @@ -145,17 +145,12 @@ bool NWPlugin_005(NWPlugin::Function function, EventStruct *event, String& strin static_cast(getNWPluginData(event->NetworkIndex)); if (NW_data) { - String portStr; - success = NW_data->webform_getPort(portStr); - - if (success) { - event->kvWriter->write({ F("Port"), portStr }); - } + success = NW_data->webform_getPort(event->kvWriter); } } break; } -#endif +# endif // ifndef LIMIT_BUILD_SIZE case NWPlugin::Function::NWPLUGIN_WEBFORM_SAVE: { @@ -262,6 +257,10 @@ bool NWPlugin_005(NWPlugin::Function function, EventStruct *event, String& strin break; } +#if FEATURE_STORE_NETWORK_INTERFACE_SETTINGS + case NWPlugin::Function::NWPLUGIN_EXPORT_CONFIG: + case NWPlugin::Function::NWPLUGIN_IMPORT_CONFIG: +#endif default: break; diff --git a/src/src/Commands/InternalCommands.cpp b/src/src/Commands/InternalCommands.cpp index 275fcc2b1..15acb3e61 100644 --- a/src/src/Commands/InternalCommands.cpp +++ b/src/src/Commands/InternalCommands.cpp @@ -376,6 +376,11 @@ bool InternalCommands::executeInternalCommand() case ESPEasy_cmd_e::name: COMMAND_CASE_R(Command_Settings_Name, 1); // Settings.h case ESPEasy_cmd_e::networkdisable: COMMAND_CASE_R(Command_Network_Disable, 1); // Networks.h case ESPEasy_cmd_e::networkenable: COMMAND_CASE_R(Command_Network_Enable, 1); // Networks.h +#if FEATURE_STORE_NETWORK_INTERFACE_SETTINGS + case ESPEasy_cmd_e::networkexportconfig: COMMAND_CASE_R(Command_Network_ExportConfig, 1); // Networks.h + case ESPEasy_cmd_e::networkimportconfig: COMMAND_CASE_R(Command_Network_ImportConfig, 2); // Networks.h +#endif + case ESPEasy_cmd_e::nosleep: COMMAND_CASE_R(Command_System_NoSleep, 1); // System.h #if FEATURE_NOTIFIER diff --git a/src/src/Commands/InternalCommands_decoder.cpp b/src/src/Commands/InternalCommands_decoder.cpp index c2e6371a1..0c62640df 100644 --- a/src/src/Commands/InternalCommands_decoder.cpp +++ b/src/src/Commands/InternalCommands_decoder.cpp @@ -155,6 +155,10 @@ const char Internal_commands_no[] PROGMEM = "name|" "networkdisable|" "networkenable|" +#if FEATURE_STORE_NETWORK_INTERFACE_SETTINGS + "networkexportconfig|" + "networkimportconfig|" +#endif "nosleep|" #if FEATURE_NOTIFIER "notify|" diff --git a/src/src/Commands/InternalCommands_decoder.h b/src/src/Commands/InternalCommands_decoder.h index 534d583b0..a54f0280f 100644 --- a/src/src/Commands/InternalCommands_decoder.h +++ b/src/src/Commands/InternalCommands_decoder.h @@ -122,6 +122,10 @@ enum class ESPEasy_cmd_e : uint8_t { name, networkdisable, networkenable, +#if FEATURE_STORE_NETWORK_INTERFACE_SETTINGS + networkexportconfig, + networkimportconfig, +#endif nosleep, #if FEATURE_NOTIFIER notify, diff --git a/src/src/Commands/Networks.cpp b/src/src/Commands/Networks.cpp index 6452e0ef1..0f5a36344 100644 --- a/src/src/Commands/Networks.cpp +++ b/src/src/Commands/Networks.cpp @@ -15,6 +15,10 @@ #include #endif +#if FEATURE_STORE_NETWORK_INTERFACE_SETTINGS +#include "../Helpers/KeyValueWriter_JSON.h" +#include "../../ESPEasy/net/Helpers/NWPlugin_import_export.h" +#endif // networkIndex = (event->Par1 - 1); Par1 is here for 1 ... NETWORK_MAX bool validNetworkVar(struct EventStruct *event, ESPEasy::net::networkIndex_t& networkIndex) @@ -183,3 +187,31 @@ String Command_ETH_Disconnect (struct EventStruct *event, const char* Line) } #endif // if FEATURE_ETHERNET + + +#if FEATURE_STORE_NETWORK_INTERFACE_SETTINGS +String Command_Network_ExportConfig (struct EventStruct *event, const char* Line) +{ + ESPEasy::net::networkIndex_t networkIndex; + if (!validNetworkVar(event, networkIndex)) return return_command_failed(); + + PrintToString p2s; + KeyValueWriter_JSON writer(true, &p2s); + + String res = ESPEasy::net::NWPlugin_import_export::exportConfig(networkIndex, &writer); + if (!res.isEmpty()) return res; + return p2s.getMove(); +} + +String Command_Network_ImportConfig (struct EventStruct *event, const char* Line) +{ + ESPEasy::net::networkIndex_t networkIndex; + if (!validNetworkVar(event, networkIndex)) return return_command_failed(); + const String json = parseStringToEndKeepCase(Line, 3); + + String res = ESPEasy::net::NWPlugin_import_export::importConfig(networkIndex, json); + if (!res.isEmpty()) return res; + + return return_command_success(); +} +#endif diff --git a/src/src/Commands/Networks.h b/src/src/Commands/Networks.h index 853170bc3..38871814d 100644 --- a/src/src/Commands/Networks.h +++ b/src/src/Commands/Networks.h @@ -36,5 +36,9 @@ String Command_ETH_DNS (struct EventStruct *event, const char* Line); String Command_ETH_Wifi_Mode (struct EventStruct *event, const char* Line); String Command_ETH_Disconnect (struct EventStruct *event, const char* Line); #endif +#if FEATURE_STORE_NETWORK_INTERFACE_SETTINGS +String Command_Network_ExportConfig (struct EventStruct *event, const char* Line); +String Command_Network_ImportConfig (struct EventStruct *event, const char* Line); +#endif #endif // COMMAND_NETWORKS_H diff --git a/src/src/DataTypes/ESPEasy_plugin_functions.h b/src/src/DataTypes/ESPEasy_plugin_functions.h index b5ae25cd9..dac75044d 100644 --- a/src/src/DataTypes/ESPEasy_plugin_functions.h +++ b/src/src/DataTypes/ESPEasy_plugin_functions.h @@ -200,6 +200,10 @@ public: #ifndef LIMIT_BUILD_SIZE NWPLUGIN_WEBFORM_SHOW_PORT, // Used for showing host information for the network adapter. #endif +#if FEATURE_STORE_NETWORK_INTERFACE_SETTINGS + NWPLUGIN_EXPORT_CONFIG, + NWPLUGIN_IMPORT_CONFIG, +#endif NWPLUGIN_MAX_FUNCTION // Keep as last diff --git a/src/src/Helpers/ESPEasy_key_value_store_import_export.cpp b/src/src/Helpers/ESPEasy_key_value_store_import_export.cpp index badf96915..a26d67e88 100644 --- a/src/src/Helpers/ESPEasy_key_value_store_import_export.cpp +++ b/src/src/Helpers/ESPEasy_key_value_store_import_export.cpp @@ -5,29 +5,23 @@ # include "../Helpers/KeyValueWriter.h" # include "../Helpers/StringConverter.h" -ESPEasy_key_value_store_import_export::ESPEasy_key_value_store_import_export( - ESPEasy_key_value_store*store, - getLabelStringFunction fnc, - uint32_t maxKey) -: _store(store), _getLabelStringFunction(fnc), _maxKey(maxKey) {} - ESPEasy_key_value_store_import_export::ESPEasy_key_value_store_import_export( ESPEasy_key_value_store*store, - getLabelStringFunction fnc, - validKeyFunction validKey) - : _store(store), _getLabelStringFunction(fnc), _validKey(validKey) {} + LabelStringFunction fnc, + NextKeyFunction nextKey) + : _store(store), _LabelStringFunction(fnc), _nextKey(nextKey) {} bool ESPEasy_key_value_store_import_export::write( uint32_t key, KeyValueWriter*writer) const { - if ((_store == nullptr) || (_getLabelStringFunction == nullptr) || (writer == nullptr)) { + if ((_store == nullptr) || (_LabelStringFunction == nullptr) || (writer == nullptr)) { return false; } KVS_StorageType::Enum storageType = KVS_StorageType::Enum::not_set; - auto label = _getLabelStringFunction(key, false, storageType); + auto label = _LabelStringFunction(key, false, storageType); if (!_store->hasKey(storageType, key)) { return false; @@ -97,75 +91,98 @@ String ESPEasy_key_value_store_import_export::read(const String& json) return F("Store not empty"); } - String tmp(json); - tmp.trim(); + String tmp_json(json); - if (tmp.startsWith("{") && tmp.endsWith("}")) { - tmp = tmp.substring(1, tmp.length() - 2); - } + String key_str; + String value; - int index = 1; + while (getNextKeyValue(tmp_json, key_str, value)) { + uint32_t key{}; + KVS_StorageType::Enum storageType; - do - { - String keyValueStr = parseStringKeepCase(tmp, index); - - if (!keyValueStr.isEmpty()) { - ++index; - - // KeyValueStr now contains something like this: - // "key": value - // "key": "value" - - String key_str = parseStringKeepCase(keyValueStr, 1, ':'); - String value = parseStringKeepCase(keyValueStr, 2, ':'); - uint32_t key{}; - KVS_StorageType::Enum storageType; - - if (!findKey(key_str, key, storageType)) { - return strformat( - F("Unknown key: '%s' with value: '%s'"), - key_str.c_str(), - value.c_str()); - } + if (!findKey(key_str, key, storageType)) { + key_str.toLowerCase(); + _parsedJSON[key_str] = value; + /* + return strformat( + F("Unknown key: '%s' with value: '%s'"), + key_str.c_str(), + value.c_str()); + */ + } else { _store->setValue(storageType, key, value); - } else { index = -1; } - - } while (index > 0); + } + } _store->dump(); return EMPTY_STRING; } +bool ESPEasy_key_value_store_import_export::getNextKeyValue(String& json, String& key, String& value) +{ + json.trim(); + + if (json.startsWith("{") && json.endsWith("}")) { + json = json.substring(1, json.length() - 2); + } + json.trim(); + + String keyValueStr = parseStringKeepCase(json, 1); + + if (keyValueStr.isEmpty()) { + return false; + } + + // KeyValueStr now contains something like this: + // "key": value + // "key": "value" + + key = parseStringKeepCase(keyValueStr, 1, ':'); + value = parseStringKeepCase(keyValueStr, 2, ':'); + + addLog(LOG_LEVEL_INFO, strformat(F("KVS : key:'%s' value:'%s'"), key.c_str(), value.c_str() )); + + // Strip found item off + json = json.substring(keyValueStr.length()); + json.trim(); + + if (json.startsWith(",")) { + json = json.substring(1); + } + return true; +} + bool ESPEasy_key_value_store_import_export::findKey( const String & key_str, uint32_t & key, KVS_StorageType::Enum& storageType) const { - if ((_getLabelStringFunction == nullptr)) { + if ((_LabelStringFunction == nullptr) || (_nextKey == nullptr)) { return false; } - key = 0; + key = _nextKey(-1); - while (validKey(key)) { + while (key >= 0) { storageType = KVS_StorageType::Enum::not_set; - auto label = _getLabelStringFunction(key, false, storageType); + auto label = _LabelStringFunction(key, false, storageType); if (key_str.equalsIgnoreCase(label)) { return true; } - ++key; + key = _nextKey(key); } return false; } -bool ESPEasy_key_value_store_import_export::validKey(uint32_t key) const +bool ESPEasy_key_value_store_import_export::getParsedJSON(const String& key, String& value) const { - if (_validKey) { - return _validKey(key); - } - return key <= _maxKey && _maxKey > 0; + String key_lc = key; + key_lc.toLowerCase(); + auto it = _parsedJSON.find(key_lc); + if (it == _parsedJSON.end()) return false; + value = it->second; + return true; } #endif // if FEATURE_ESPEASY_KEY_VALUE_STORE diff --git a/src/src/Helpers/ESPEasy_key_value_store_import_export.h b/src/src/Helpers/ESPEasy_key_value_store_import_export.h index 75fe12e19..d0283ef83 100644 --- a/src/src/Helpers/ESPEasy_key_value_store_import_export.h +++ b/src/src/Helpers/ESPEasy_key_value_store_import_export.h @@ -4,6 +4,8 @@ #if FEATURE_ESPEASY_KEY_VALUE_STORE # include "../DataTypes/ESPEasy_key_value_store_StorageType.h" +#include + class ESPEasy_key_value_store; class KeyValueWriter; @@ -11,38 +13,38 @@ class ESPEasy_key_value_store_import_export { public: - using getLabelStringFunction = const __FlashStringHelper * (*)(uint32_t, bool, KVS_StorageType::Enum&); - using validKeyFunction = bool (*)(uint32_t); + using LabelStringFunction = const __FlashStringHelper * (*)(uint32_t, bool, KVS_StorageType::Enum&); + + + // When queried with a key of -1, it will return the first key index + // Return next key, or -2 when no next key exists. + using NextKeyFunction = int32_t (*)(int32_t); ESPEasy_key_value_store_import_export( ESPEasy_key_value_store*store, - getLabelStringFunction fnc, - uint32_t maxKey); - - - ESPEasy_key_value_store_import_export( - ESPEasy_key_value_store*store, - getLabelStringFunction fnc, - validKeyFunction validKey); + LabelStringFunction fnc, + NextKeyFunction nextKey); bool write(uint32_t key, KeyValueWriter*writer) const; String read(const String& json); + static bool getNextKeyValue(String& json, String& key, String& value); + + bool getParsedJSON(const String& key, String& value) const; + private: + std::map _parsedJSON; + bool findKey( const String & key_str, uint32_t & key, KVS_StorageType::Enum& storageType) const; - bool validKey(uint32_t key) const; - ESPEasy_key_value_store*_store{}; - getLabelStringFunction _getLabelStringFunction{}; - validKeyFunction _validKey{}; - - uint32_t _maxKey{}; + LabelStringFunction _LabelStringFunction{}; + NextKeyFunction _nextKey{}; }; // class ESPEasy_key_value_store_import_export diff --git a/src/src/Helpers/_ESPEasy_key_value_store.cpp b/src/src/Helpers/_ESPEasy_key_value_store.cpp index 3f5fb623c..c03ecb35a 100644 --- a/src/src/Helpers/_ESPEasy_key_value_store.cpp +++ b/src/src/Helpers/_ESPEasy_key_value_store.cpp @@ -1141,15 +1141,5 @@ void ESPEasy_key_value_store::dump() const } -bool ESPEasy_key_value_store::_export(KeyValueWriter* writer) const -{ - return false; -} - -bool ESPEasy_key_value_store::_import(const String& json) -{ - return false; -} - #endif // if FEATURE_ESPEASY_KEY_VALUE_STORE diff --git a/src/src/Helpers/_ESPEasy_key_value_store.h b/src/src/Helpers/_ESPEasy_key_value_store.h index c3882d705..5b4bec57e 100644 --- a/src/src/Helpers/_ESPEasy_key_value_store.h +++ b/src/src/Helpers/_ESPEasy_key_value_store.h @@ -173,9 +173,6 @@ public: void dump() const; - bool _export(KeyValueWriter*writer) const; - bool _import(const String& json); - private: bool getValue(KVS_StorageType::Enum & storageType, diff --git a/src/src/WebServer/NetworkPage.cpp b/src/src/WebServer/NetworkPage.cpp index cc82d5d94..959e0bb67 100644 --- a/src/src/WebServer/NetworkPage.cpp +++ b/src/src/WebServer/NetworkPage.cpp @@ -179,11 +179,7 @@ void handle_networks_ShowAllNetworksTable() html_table_header(F(""), 70); html_table_header(F("Nr"), 50); html_table_header(F("Enabled"), 100); -#ifndef LIMIT_BUILD_SIZE html_table_header(F("Network Adapter")); -#else - html_table_header(F("")); -#endif html_table_header(F("Name"), 50); # ifdef ESP32 html_table_header(F("Route Prio"), 50); From 8c7b919c2498942abe9367bdd65912cd4121fc39 Mon Sep 17 00:00:00 2001 From: TD-er Date: Wed, 29 Oct 2025 20:29:55 +0100 Subject: [PATCH 441/564] [Network] Add NetworkImportConfig command --- src/ESPEasy/net/Globals/NWPlugins.cpp | 4 - .../net/Helpers/NWPlugin_import_export.cpp | 67 +++++---- .../net/Helpers/NWPlugin_import_export.h | 14 +- .../NW005_data_struct_PPP_modem.cpp | 17 ++- src/ESPEasy/net/_NW005_PPP_modem.cpp | 5 - src/src/DataTypes/ESPEasy_plugin_functions.h | 4 - src/src/ESPEasyCore/ESPEasy_Console_Port.cpp | 13 +- src/src/ESPEasyCore/ESPEasy_Console_Port.h | 4 +- .../ESPEasy_key_value_store_import_export.cpp | 141 +++++++++--------- .../ESPEasy_key_value_store_import_export.h | 35 +++-- src/src/Helpers/_ESPEasy_key_value_store.cpp | 5 +- 11 files changed, 165 insertions(+), 144 deletions(-) diff --git a/src/ESPEasy/net/Globals/NWPlugins.cpp b/src/ESPEasy/net/Globals/NWPlugins.cpp index 39051efb9..bf5c15ce7 100644 --- a/src/ESPEasy/net/Globals/NWPlugins.cpp +++ b/src/ESPEasy/net/Globals/NWPlugins.cpp @@ -267,10 +267,6 @@ bool NWPluginCall(NWPlugin::Function Function, EventStruct *event, String& str) case NWPlugin::Function::NWPLUGIN_GET_DEVICENAME: case NWPlugin::Function::NWPLUGIN_WEBFORM_LOAD: case NWPlugin::Function::NWPLUGIN_WEBFORM_SAVE: -#if FEATURE_STORE_NETWORK_INTERFACE_SETTINGS - case NWPlugin::Function::NWPLUGIN_EXPORT_CONFIG: - case NWPlugin::Function::NWPLUGIN_IMPORT_CONFIG: -#endif case NWPlugin::Function::NWPLUGIN_DRIVER_TEMPLATE: { diff --git a/src/ESPEasy/net/Helpers/NWPlugin_import_export.cpp b/src/ESPEasy/net/Helpers/NWPlugin_import_export.cpp index c7c38b309..1723cc833 100644 --- a/src/ESPEasy/net/Helpers/NWPlugin_import_export.cpp +++ b/src/ESPEasy/net/Helpers/NWPlugin_import_export.cpp @@ -6,7 +6,7 @@ # include "../../../src/Helpers/_ESPEasy_key_value_store.h" # include "../../../src/Helpers/ESPEasy_key_value_store_import_export.h" -// # include "../../../src/Helpers/StringConverter.h" +# include "../../../src/Helpers/StringConverter.h" # include "../DataTypes/NWPluginID.h" # include "../Globals/NWPlugins.h" @@ -127,15 +127,21 @@ String NWPlugin_import_export::exportConfig( if (child) { child->write({ F("nwpluginID"), nwpluginID.value }); + child->write({ F("enabled"), Settings.getNetworkEnabled(networkIndex) }); child->write({ F("route_prio"), Settings.getRoutePrio_for_network(networkIndex) }); child->write({ F("sn_block"), Settings.getNetworkInterfaceSubnetBlockClientIP(networkIndex) }); child->write({ F("start_delay"), Settings.getNetworkInterfaceStartupDelayAtBoot(networkIndex) }); - ESPEasy_key_value_store_import_export e(&kvs, labelFnc, nextKeyFnc); + +# if FEATURE_USE_IPV6 + child->write({ F("en_ipv6"), Settings.getNetworkEnabled_IPv6(networkIndex) }); +# endif + + ESPEasy_key_value_store_import_export e(&kvs); int32_t key = nextKeyFnc(-1); while (key >= 0) { - e.write(key, child.get()); + e.write(key, child.get(), labelFnc); key = nextKeyFnc(key); } } @@ -152,8 +158,18 @@ String NWPlugin_import_export::importConfig( if (nwpluginID.isValid()) { return F("KVS : Network Index is already in use"); } - // FIXME set fixed right now. - nwpluginID.value = 5; + addLog(LOG_LEVEL_INFO, concat(F("KVS : JSON: "), json)); + + ESPEasy_key_value_store kvs; + ESPEasy_key_value_store_import_export e(&kvs, json); + { + String value; + + if (!e.getParsedJSON(F("nwpluginID"), value)) { return F("KVS : No NWPlugin ID"); } + nwpluginID.value = value.toInt(); + } + + if (!nwpluginID.isValid()) { return F("KVS : No valid NWPlugin ID"); } auto labelFnc = getLabelFnc(nwpluginID); auto nextKeyFnc = getNextKeyFnc(nwpluginID, true); @@ -162,33 +178,30 @@ String NWPlugin_import_export::importConfig( return F("KVS : NWPlugin ID does not support import/export"); } - ESPEasy_key_value_store kvs; - ESPEasy_key_value_store_import_export e(&kvs, labelFnc, nextKeyFnc); - String res = e.read(json); + String res = e.read(labelFnc, nextKeyFnc); if (res.isEmpty()) { - { - String value; - - if (!e.getParsedJSON(F("nwpluginID"), value)) { return F("KVS : No NWPlugin ID"); } - nwpluginID.value = value.toInt(); - } - - if (!nwpluginID.isValid()) { return F("KVS : No valid NWPlugin ID"); } if (!kvs.store( SettingsType::Enum::NetworkInterfaceSettings_Type, networkIndex, 0, - nwpluginID.value)) { return F("KVS : Error saving, see log for more details"); } - + nwpluginID.value)) + { + return F("KVS : Error saving, see log for more details"); + } + // Add entry, calls NWPLUGIN_LOAD_DEFAULTS Settings.setNWPluginID_for_network(networkIndex, nwpluginID); const String non_kvs_keys[] = { + F("enabled"), F("route_prio"), F("sn_block"), F("start_delay") +# if FEATURE_USE_IPV6 + , F("en_ipv6") +# endif }; for (size_t i = 0; i < NR_ELEMENTS(non_kvs_keys); ++i) { @@ -196,18 +209,22 @@ String NWPlugin_import_export::importConfig( if (e.getParsedJSON(non_kvs_keys[i], value)) { + const bool bool_val = !(value.equalsIgnoreCase(F("false")) || value.equals(F("0"))); + switch (i) { - case 0: Settings.setRoutePrio_for_network(networkIndex, value.toInt()); + case 0: Settings.setNetworkEnabled(networkIndex, bool_val); break; - case 1: - { - bool val = !(value.equalsIgnoreCase(F("false")) || value.equals(F("0"))); - Settings.setNetworkInterfaceSubnetBlockClientIP(networkIndex, val); + case 1: Settings.setRoutePrio_for_network(networkIndex, value.toInt()); break; - } - case 2: Settings.setNetworkInterfaceStartupDelayAtBoot(networkIndex, value.toInt()); + case 2: Settings.setNetworkInterfaceSubnetBlockClientIP(networkIndex, bool_val); break; + case 3: Settings.setNetworkInterfaceStartupDelayAtBoot(networkIndex, value.toInt()); + break; +# if FEATURE_USE_IPV6 + case 4: Settings.setNetworkEnabled_IPv6(networkIndex, bool_val); + break; +# endif // if FEATURE_USE_IPV6 } } } diff --git a/src/ESPEasy/net/Helpers/NWPlugin_import_export.h b/src/ESPEasy/net/Helpers/NWPlugin_import_export.h index 3688f1f1f..c619a6ade 100644 --- a/src/ESPEasy/net/Helpers/NWPlugin_import_export.h +++ b/src/ESPEasy/net/Helpers/NWPlugin_import_export.h @@ -3,7 +3,7 @@ #include "../../../ESPEasy_common.h" #if FEATURE_STORE_NETWORK_INTERFACE_SETTINGS -#include "../DataTypes/NetworkIndex.h" +# include "../DataTypes/NetworkIndex.h" # include "../../../src/Helpers/KeyValueWriter.h" namespace ESPEasy { @@ -14,13 +14,13 @@ class NWPlugin_import_export public: static String exportConfig( - networkIndex_t networkIndex, - KeyValueWriter *writer, - bool includeCredentials = false); + networkIndex_t networkIndex, + KeyValueWriter *writer, + bool includeCredentials = false); static String importConfig( - networkIndex_t networkIndex, - const String & json); + networkIndex_t networkIndex, + const String & json); }; // class NWPlugin_import_export @@ -28,4 +28,4 @@ public: } // namespace net } // namespace ESPEasy -#endif \ No newline at end of file +#endif // if FEATURE_STORE_NETWORK_INTERFACE_SETTINGS diff --git a/src/ESPEasy/net/NWPluginStructs/NW005_data_struct_PPP_modem.cpp b/src/ESPEasy/net/NWPluginStructs/NW005_data_struct_PPP_modem.cpp index 4cf5949b0..1dff2be7e 100644 --- a/src/ESPEasy/net/NWPluginStructs/NW005_data_struct_PPP_modem.cpp +++ b/src/ESPEasy/net/NWPluginStructs/NW005_data_struct_PPP_modem.cpp @@ -49,7 +49,7 @@ static NWPluginData_static_runtime stats_and_cache(&NW_PLUGIN_INTERFACE, F("PPP" # define NW005_KEY_SIM_PIN 13 # define NW005_KEY_PIN_DTR 14 -const __FlashStringHelper* NW005_data_struct_PPP_modem::getLabelString(uint32_t key, bool displayString, KVS_StorageType::Enum& storageType) +const __FlashStringHelper * NW005_data_struct_PPP_modem::getLabelString(uint32_t key, bool displayString, KVS_StorageType::Enum& storageType) { storageType = KVS_StorageType::Enum::int8_type; @@ -88,15 +88,19 @@ const __FlashStringHelper* NW005_data_struct_PPP_modem::getLabelString(uint32_t int32_t NW005_data_struct_PPP_modem::getNextKey(int32_t key) { - if (key == -1) return NW005_KEY_SERIAL_PORT; - if (key < NW005_KEY_PIN_DTR) return key+1; + if (key == -1) { return NW005_KEY_SERIAL_PORT; } + + if (key < NW005_KEY_PIN_DTR) { return key + 1; } return -2; } int32_t NW005_data_struct_PPP_modem::getNextKey_noCredentials(int32_t key) { - if (key == -1) return NW005_KEY_SERIAL_PORT; - if (key < NW005_KEY_MODEM_MODEL) return key+1; + if (key == -1) { return NW005_KEY_SERIAL_PORT; } + + if (key < NW005_KEY_MODEM_MODEL) { return key + 1; } + + if (key < NW005_KEY_PIN_DTR) { return NW005_KEY_PIN_DTR; } return -2; } @@ -1101,8 +1105,7 @@ bool NW005_data_struct_PPP_modem::record_stats() NWPluginData_static_runtime * NW005_data_struct_PPP_modem::getNWPluginData_static_runtime() { return &stats_and_cache; } - -void NW005_data_struct_PPP_modem::onEvent(arduino_event_id_t event, arduino_event_info_t info) { +void NW005_data_struct_PPP_modem::onEvent(arduino_event_id_t event, arduino_event_info_t info) { // TODO TD-er: Must store flags from events in static (or global) object to act on it later. switch (event) { diff --git a/src/ESPEasy/net/_NW005_PPP_modem.cpp b/src/ESPEasy/net/_NW005_PPP_modem.cpp index 8636e75d5..5265a76d7 100644 --- a/src/ESPEasy/net/_NW005_PPP_modem.cpp +++ b/src/ESPEasy/net/_NW005_PPP_modem.cpp @@ -257,11 +257,6 @@ bool NWPlugin_005(NWPlugin::Function function, EventStruct *event, String& strin break; } -#if FEATURE_STORE_NETWORK_INTERFACE_SETTINGS - case NWPlugin::Function::NWPLUGIN_EXPORT_CONFIG: - case NWPlugin::Function::NWPLUGIN_IMPORT_CONFIG: -#endif - default: break; diff --git a/src/src/DataTypes/ESPEasy_plugin_functions.h b/src/src/DataTypes/ESPEasy_plugin_functions.h index dac75044d..b5ae25cd9 100644 --- a/src/src/DataTypes/ESPEasy_plugin_functions.h +++ b/src/src/DataTypes/ESPEasy_plugin_functions.h @@ -200,10 +200,6 @@ public: #ifndef LIMIT_BUILD_SIZE NWPLUGIN_WEBFORM_SHOW_PORT, // Used for showing host information for the network adapter. #endif -#if FEATURE_STORE_NETWORK_INTERFACE_SETTINGS - NWPLUGIN_EXPORT_CONFIG, - NWPLUGIN_IMPORT_CONFIG, -#endif NWPLUGIN_MAX_FUNCTION // Keep as last diff --git a/src/src/ESPEasyCore/ESPEasy_Console_Port.cpp b/src/src/ESPEasyCore/ESPEasy_Console_Port.cpp index ec5dfb6b8..5f36d2aa2 100644 --- a/src/src/ESPEasyCore/ESPEasy_Console_Port.cpp +++ b/src/src/ESPEasyCore/ESPEasy_Console_Port.cpp @@ -17,6 +17,13 @@ #include +#ifdef ESP32 +#define CONSOLE_INPUT_BUFFER_SIZE 1280 +#else +#define CONSOLE_INPUT_BUFFER_SIZE 128 +#endif + + /* #if FEATURE_DEFINE_SERIAL_CONSOLE_PORT # include "../Helpers/_Plugin_Helper_serial.h" @@ -24,7 +31,10 @@ */ EspEasy_Console_Port::EspEasy_Console_Port(LogDestination log_destination) -: _serialWriteBuffer(log_destination) {} +: _serialWriteBuffer(log_destination) +{ + InputBuffer_Serial = (char*)calloc(1, CONSOLE_INPUT_BUFFER_SIZE); +} EspEasy_Console_Port::~EspEasy_Console_Port() { @@ -34,6 +44,7 @@ EspEasy_Console_Port::~EspEasy_Console_Port() _serial = nullptr; } #endif + free(InputBuffer_Serial); } EspEasy_Console_Port::operator bool() const diff --git a/src/src/ESPEasyCore/ESPEasy_Console_Port.h b/src/src/ESPEasyCore/ESPEasy_Console_Port.h index 4be62cf27..ec7db6fda 100644 --- a/src/src/ESPEasyCore/ESPEasy_Console_Port.h +++ b/src/src/ESPEasyCore/ESPEasy_Console_Port.h @@ -17,8 +17,6 @@ #endif -#define CONSOLE_INPUT_BUFFER_SIZE 128 - struct EspEasy_Console_Port { EspEasy_Console_Port(LogDestination log_destination); @@ -38,7 +36,7 @@ struct EspEasy_Console_Port { String getPortDescription() const; int SerialInByteCounter{}; - char InputBuffer_Serial[CONSOLE_INPUT_BUFFER_SIZE + 2]{}; + char *InputBuffer_Serial{}; SerialWriteBuffer_t _serialWriteBuffer; #if FEATURE_DEFINE_SERIAL_CONSOLE_PORT diff --git a/src/src/Helpers/ESPEasy_key_value_store_import_export.cpp b/src/src/Helpers/ESPEasy_key_value_store_import_export.cpp index a26d67e88..9ba43e080 100644 --- a/src/src/Helpers/ESPEasy_key_value_store_import_export.cpp +++ b/src/src/Helpers/ESPEasy_key_value_store_import_export.cpp @@ -7,21 +7,21 @@ ESPEasy_key_value_store_import_export::ESPEasy_key_value_store_import_export( - ESPEasy_key_value_store*store, - LabelStringFunction fnc, - NextKeyFunction nextKey) - : _store(store), _LabelStringFunction(fnc), _nextKey(nextKey) {} + ESPEasy_key_value_store*store) + : _store(store) {} + bool ESPEasy_key_value_store_import_export::write( uint32_t key, - KeyValueWriter*writer) const + KeyValueWriter*writer, + LabelStringFunction fnc) const { - if ((_store == nullptr) || (_LabelStringFunction == nullptr) || (writer == nullptr)) { + if ((_store == nullptr) || (fnc == nullptr) || (writer == nullptr)) { return false; } KVS_StorageType::Enum storageType = KVS_StorageType::Enum::not_set; - auto label = _LabelStringFunction(key, false, storageType); + auto label = fnc(key, false, storageType); if (!_store->hasKey(storageType, key)) { return false; @@ -81,53 +81,13 @@ bool ESPEasy_key_value_store_import_export::write( return false; } -String ESPEasy_key_value_store_import_export::read(const String& json) + +bool getNextKeyValue(String& json, String& key, String& value) { - if (_store == nullptr) { - return F("No Store Set"); - } - - if (!_store->isEmpty()) { - return F("Store not empty"); - } - - String tmp_json(json); - - String key_str; - String value; - - while (getNextKeyValue(tmp_json, key_str, value)) { - uint32_t key{}; - KVS_StorageType::Enum storageType; - - if (!findKey(key_str, key, storageType)) { - key_str.toLowerCase(); - _parsedJSON[key_str] = value; - /* - return strformat( - F("Unknown key: '%s' with value: '%s'"), - key_str.c_str(), - value.c_str()); - */ - } else { - _store->setValue(storageType, key, value); - } - } - - _store->dump(); - return EMPTY_STRING; -} - -bool ESPEasy_key_value_store_import_export::getNextKeyValue(String& json, String& key, String& value) -{ - json.trim(); - - if (json.startsWith("{") && json.endsWith("}")) { - json = json.substring(1, json.length() - 2); - } - json.trim(); - - String keyValueStr = parseStringKeepCase(json, 1); + String keyValueStr; + int pos = json.indexOf(','); + if (pos == -1) keyValueStr = json; + else keyValueStr = json.substring(0, pos); if (keyValueStr.isEmpty()) { return false; @@ -140,7 +100,7 @@ bool ESPEasy_key_value_store_import_export::getNextKeyValue(String& json, String key = parseStringKeepCase(keyValueStr, 1, ':'); value = parseStringKeepCase(keyValueStr, 2, ':'); - addLog(LOG_LEVEL_INFO, strformat(F("KVS : key:'%s' value:'%s'"), key.c_str(), value.c_str() )); + addLog(LOG_LEVEL_INFO, strformat(F("KVS : kvs: '%s' key:'%s' value:'%s'"), keyValueStr.c_str(), key.c_str(), value.c_str())); // Strip found item off json = json.substring(keyValueStr.length()); @@ -152,37 +112,80 @@ bool ESPEasy_key_value_store_import_export::getNextKeyValue(String& json, String return true; } -bool ESPEasy_key_value_store_import_export::findKey( - const String & key_str, - uint32_t & key, - KVS_StorageType::Enum& storageType) const + +ESPEasy_key_value_store_import_export::ESPEasy_key_value_store_import_export( + ESPEasy_key_value_store*store, const String& json) + : _store(store) { - if ((_LabelStringFunction == nullptr) || (_nextKey == nullptr)) { - return false; + if ((_store != nullptr) && _store->isEmpty()) { + String tmp_json(json); + + tmp_json.trim(); + + if (tmp_json.startsWith("{") && tmp_json.endsWith("}")) { + tmp_json = tmp_json.substring(1, tmp_json.length() - 1); + } + tmp_json.trim(); + + String key_str; + String value; + + while (getNextKeyValue(tmp_json, key_str, value)) { + key_str.toLowerCase(); + _parsedJSON[key_str] = value; + } } - key = _nextKey(-1); +} + + + + +String ESPEasy_key_value_store_import_export::read( + LabelStringFunction fnc, + NextKeyFunction nextKey) +{ + if (_store == nullptr) { + return F("No Store Set"); + } + + if (!_store->isEmpty()) { + return F("Store not empty"); + } + fnc = fnc; + + if ((fnc == nullptr) || (nextKey == nullptr)) { + return F("No decoder functions set"); + } + + int32_t key = nextKey(-1); while (key >= 0) { - storageType = KVS_StorageType::Enum::not_set; + KVS_StorageType::Enum storageType = KVS_StorageType::Enum::not_set; - auto label = _LabelStringFunction(key, false, storageType); + auto label = fnc(key, false, storageType); - if (key_str.equalsIgnoreCase(label)) { - return true; + String value; + + if (getParsedJSON(label, value)) { + _store->setValue(storageType, key, value); } - key = _nextKey(key); + key = nextKey(key); } - return false; + + _store->dump(); + return EMPTY_STRING; } bool ESPEasy_key_value_store_import_export::getParsedJSON(const String& key, String& value) const { String key_lc = key; + key_lc.toLowerCase(); auto it = _parsedJSON.find(key_lc); - if (it == _parsedJSON.end()) return false; + + if (it == _parsedJSON.end()) { return false; } value = it->second; - return true; + return true; } #endif // if FEATURE_ESPEASY_KEY_VALUE_STORE diff --git a/src/src/Helpers/ESPEasy_key_value_store_import_export.h b/src/src/Helpers/ESPEasy_key_value_store_import_export.h index d0283ef83..d17794f81 100644 --- a/src/src/Helpers/ESPEasy_key_value_store_import_export.h +++ b/src/src/Helpers/ESPEasy_key_value_store_import_export.h @@ -4,7 +4,7 @@ #if FEATURE_ESPEASY_KEY_VALUE_STORE # include "../DataTypes/ESPEasy_key_value_store_StorageType.h" -#include +# include class ESPEasy_key_value_store; class KeyValueWriter; @@ -18,33 +18,32 @@ public: // When queried with a key of -1, it will return the first key index // Return next key, or -2 when no next key exists. - using NextKeyFunction = int32_t (*)(int32_t); + using NextKeyFunction = int32_t (*)(int32_t); + + ESPEasy_key_value_store_import_export( + ESPEasy_key_value_store*store); + + bool write(uint32_t key, + KeyValueWriter *writer, + LabelStringFunction fnc) const; + ESPEasy_key_value_store_import_export( ESPEasy_key_value_store*store, - LabelStringFunction fnc, - NextKeyFunction nextKey); + const String & json); - bool write(uint32_t key, - KeyValueWriter*writer) const; - String read(const String& json); + String read( + LabelStringFunction fnc, + NextKeyFunction nextKey); - static bool getNextKeyValue(String& json, String& key, String& value); - - bool getParsedJSON(const String& key, String& value) const; + bool getParsedJSON(const String& key, + String & value) const; private: - std::map _parsedJSON; - - bool findKey( - const String & key_str, - uint32_t & key, - KVS_StorageType::Enum& storageType) const; + std::map_parsedJSON; ESPEasy_key_value_store*_store{}; - LabelStringFunction _LabelStringFunction{}; - NextKeyFunction _nextKey{}; }; // class ESPEasy_key_value_store_import_export diff --git a/src/src/Helpers/_ESPEasy_key_value_store.cpp b/src/src/Helpers/_ESPEasy_key_value_store.cpp index c03ecb35a..2ce7638f6 100644 --- a/src/src/Helpers/_ESPEasy_key_value_store.cpp +++ b/src/src/Helpers/_ESPEasy_key_value_store.cpp @@ -961,8 +961,11 @@ void ESPEasy_key_value_store::setValue(const KVS_StorageType::Enum& storageType, case KVS_StorageType::Enum::bool_type: case KVS_StorageType::Enum::bool_true: case KVS_StorageType::Enum::bool_false: - setValue(key, static_cast(value.toInt())); + { + const bool val = !(value.equalsIgnoreCase(F("false")) || value.equals(F("0"))); + setValue(key, val); break; + } default: return; } setHasStorageType(storageType); From e9a5fd965255238ebebbaa747d66a9c8ac3e2820 Mon Sep 17 00:00:00 2001 From: TD-er Date: Sun, 2 Nov 2025 23:02:53 +0100 Subject: [PATCH 442/564] [Eth] Store settings for RMII and SPI Ethernet to KV-store --- .../net/DataStructs/NWPluginData_base.cpp | 15 +- .../net/Helpers/NWPlugin_import_export.cpp | 38 +-- .../NW003_data_struct_ETH_RMII.cpp | 282 +++++++++++++++++- .../NW003_data_struct_ETH_RMII.h | 26 +- .../NW004_data_struct_ETH_SPI.cpp | 232 +++++++++++++- .../NW004_data_struct_ETH_SPI.h | 25 +- .../NW005_data_struct_PPP_modem.cpp | 27 +- src/ESPEasy/net/_NW003_ETH_RMII.cpp | 17 +- src/ESPEasy/net/_NW004_ETH_SPI.cpp | 18 +- src/ESPEasy/net/_NWPlugin_Helper.cpp | 59 +++- src/ESPEasy/net/_NWPlugin_Helper.h | 5 +- src/src/Commands/Networks.cpp | 28 +- src/src/CustomBuild/define_plugin_sets.h | 2 +- .../ESPEasy_key_value_store_import_export.cpp | 4 +- .../ESPEasy_key_value_store_import_export.h | 4 +- 15 files changed, 673 insertions(+), 109 deletions(-) diff --git a/src/ESPEasy/net/DataStructs/NWPluginData_base.cpp b/src/ESPEasy/net/DataStructs/NWPluginData_base.cpp index 645ec1170..14074c7d2 100644 --- a/src/ESPEasy/net/DataStructs/NWPluginData_base.cpp +++ b/src/ESPEasy/net/DataStructs/NWPluginData_base.cpp @@ -6,6 +6,7 @@ #include "../../../src/Helpers/StringConverter.h" #if FEATURE_STORE_NETWORK_INTERFACE_SETTINGS # include "../../../src/Helpers/_ESPEasy_key_value_store.h" +#include "../_NWPlugin_Helper.h" #endif #ifdef ESP32 # include "../Globals/NetworkState.h" @@ -425,22 +426,12 @@ bool NWPluginData_base::_restore_DNS_cache() bool NWPluginData_base::_load() { - if (!_kvs) { return false; } - return _kvs->load( - SettingsType::Enum::NetworkInterfaceSettings_Type, - _networkIndex, - 0, - _nw_data_pluginID.value); + return load_nwpluginTaskData_KVS(_kvs, _networkIndex, _nw_data_pluginID); } bool NWPluginData_base::_store() { - if (!_kvs) { return false; } - return _kvs->store( - SettingsType::Enum::NetworkInterfaceSettings_Type, - _networkIndex, - 0, - _nw_data_pluginID.value); + return store_nwpluginTaskData_KVS(_kvs, _networkIndex, _nw_data_pluginID); } #endif // if FEATURE_STORE_NETWORK_INTERFACE_SETTINGS diff --git a/src/ESPEasy/net/Helpers/NWPlugin_import_export.cpp b/src/ESPEasy/net/Helpers/NWPlugin_import_export.cpp index 1723cc833..113bbbf0e 100644 --- a/src/ESPEasy/net/Helpers/NWPlugin_import_export.cpp +++ b/src/ESPEasy/net/Helpers/NWPlugin_import_export.cpp @@ -36,6 +36,15 @@ ESPEasy_key_value_store_import_export::LabelStringFunction getLabelFnc(ESPEasy:: switch (nwpluginID.value) { +# ifdef USES_NW003 + case 3: + return ESPEasy::net::eth::NW003_data_struct_ETH_RMII::getLabelString; +# endif +# ifdef USES_NW004 + case 4: + return ESPEasy::net::eth::NW004_data_struct_ETH_SPI::getLabelString; +# endif + # ifdef USES_NW005 case 5: { @@ -48,12 +57,6 @@ ESPEasy_key_value_store_import_export::LabelStringFunction getLabelFnc(ESPEasy:: # endif # ifdef USES_NW002 case 2: -# endif -# ifdef USES_NW003 - case 3: -# endif -# ifdef USES_NW004 - case 4: # endif default: break; @@ -67,6 +70,14 @@ ESPEasy_key_value_store_import_export::NextKeyFunction getNextKeyFnc(ESPEasy::ne switch (nwpluginID.value) { +# ifdef USES_NW003 + case 3: + return ESPEasy::net::eth::NW003_data_struct_ETH_RMII::getNextKey; +# endif +# ifdef USES_NW004 + case 4: + return ESPEasy::net::eth::NW004_data_struct_ETH_SPI::getNextKey; +# endif # ifdef USES_NW005 case 5: { @@ -82,12 +93,6 @@ ESPEasy_key_value_store_import_export::NextKeyFunction getNextKeyFnc(ESPEasy::ne # endif # ifdef USES_NW002 case 2: -# endif -# ifdef USES_NW003 - case 3: -# endif -# ifdef USES_NW004 - case 4: # endif default: break; @@ -141,7 +146,7 @@ String NWPlugin_import_export::exportConfig( int32_t key = nextKeyFnc(-1); while (key >= 0) { - e.write(key, child.get(), labelFnc); + e.do_export(key, child.get(), labelFnc); key = nextKeyFnc(key); } } @@ -178,9 +183,11 @@ String NWPlugin_import_export::importConfig( return F("KVS : NWPlugin ID does not support import/export"); } - String res = e.read(labelFnc, nextKeyFnc); + String res = e.do_import(labelFnc, nextKeyFnc); if (res.isEmpty()) { + // Add entry, calls NWPLUGIN_LOAD_DEFAULTS + Settings.setNWPluginID_for_network(networkIndex, nwpluginID); if (!kvs.store( SettingsType::Enum::NetworkInterfaceSettings_Type, @@ -191,9 +198,6 @@ String NWPlugin_import_export::importConfig( return F("KVS : Error saving, see log for more details"); } - // Add entry, calls NWPLUGIN_LOAD_DEFAULTS - Settings.setNWPluginID_for_network(networkIndex, nwpluginID); - const String non_kvs_keys[] = { F("enabled"), F("route_prio"), diff --git a/src/ESPEasy/net/NWPluginStructs/NW003_data_struct_ETH_RMII.cpp b/src/ESPEasy/net/NWPluginStructs/NW003_data_struct_ETH_RMII.cpp index 30dd341e4..1f5e7dd94 100644 --- a/src/ESPEasy/net/NWPluginStructs/NW003_data_struct_ETH_RMII.cpp +++ b/src/ESPEasy/net/NWPluginStructs/NW003_data_struct_ETH_RMII.cpp @@ -8,6 +8,10 @@ # include "../../../src/Helpers/LongTermOnOffTimer.h" # include "../../../src/Helpers/StringConverter.h" +# include "../../../src/WebServer/Markup.h" +# include "../../../src/WebServer/Markup_Forms.h" +# include "../../../src/WebServer/ESPEasy_key_value_store_webform.h" + # include "../Globals/NetworkState.h" # include "../eth/ESPEasyEth.h" @@ -21,6 +25,99 @@ namespace eth { static NWPluginData_static_runtime stats_and_cache(&NW_PLUGIN_INTERFACE); + +// Keys as used in the Key-value-store +# define NW003_KEY_ETH_INDEX 1 +# define NW003_KEY_ETH_PHY_TYPE 2 +# define NW003_KEY_ETH_PHY_ADDR 3 +# define NW003_KEY_ETH_PIN_MDC 4 +# define NW003_KEY_ETH_PIN_MDIO 5 +# define NW003_KEY_ETH_PIN_POWER 6 +# define NW003_KEY_CLOCK_MODE 7 +# define NW003_KEY_IP 8 +# define NW003_KEY_GW 9 +# define NW003_KEY_SN 10 +# define NW003_KEY_DNS 11 + +# define NW003_MAX_KEY 12 + +const __FlashStringHelper * NW003_data_struct_ETH_RMII::getLabelString(uint32_t key, bool displayString, KVS_StorageType::Enum& storageType) +{ + storageType = KVS_StorageType::Enum::int8_type; + + switch (key) + { + case NW003_KEY_ETH_INDEX: return F("Index"); + case NW003_KEY_ETH_PHY_TYPE: return displayString ? F("Ethernet PHY type") : F("phytype"); + case NW003_KEY_ETH_PHY_ADDR: return displayString ? F("Ethernet PHY Address") : F("phyaddr"); + case NW003_KEY_ETH_PIN_MDC: return displayString ? F("Ethernet MDC pin") : F("MDC"); + case NW003_KEY_ETH_PIN_MDIO: return displayString ? F("Ethernet MDIO pin") : F("MDIO"); + case NW003_KEY_ETH_PIN_POWER: return displayString ? F("Ethernet Power pin") : F("pwr"); + case NW003_KEY_CLOCK_MODE: return displayString ? F("Ethernet Clock") : F("clock"); + case NW003_KEY_IP: + storageType = KVS_StorageType::Enum::string_type; + return F("IP"); + case NW003_KEY_GW: + storageType = KVS_StorageType::Enum::string_type; + return displayString ? F("Gateway") : F("gw"); + case NW003_KEY_SN: + storageType = KVS_StorageType::Enum::string_type; + return displayString ? F("Subnetmask") : F("sn"); + case NW003_KEY_DNS: + storageType = KVS_StorageType::Enum::string_type; + return F("DNS"); + } + return F(""); +} + +int32_t NW003_data_struct_ETH_RMII::getNextKey(int32_t key) +{ + if (key == -1) { return NW003_KEY_ETH_INDEX; } + + if (key >= NW003_MAX_KEY) { return -2; } + return key + 1; +} + +String NW003_data_struct_ETH_RMII::formatGpioLabel(uint32_t key, + PinSelectPurpose& purpose, + bool shortNotation) +{ + String label; + + if ((key >= NW003_KEY_ETH_PIN_MDC) && (key <= NW003_KEY_ETH_PIN_POWER)) + { + KVS_StorageType::Enum storageType; + purpose = PinSelectPurpose::Generic; + label = getLabelString(key, true, storageType); + + const bool optional = !shortNotation; + + switch (key) + { + case NW003_KEY_ETH_PIN_MDIO: + purpose = PinSelectPurpose::Generic_input; + label = formatGpioName( + label, gpio_direction::gpio_input, optional); + break; + case NW003_KEY_ETH_PIN_MDC: + case NW003_KEY_ETH_PIN_POWER: + purpose = PinSelectPurpose::Generic_output; + label = formatGpioName( + label, gpio_direction::gpio_output, optional); + break; + } + } + return label; +} + +WebFormItemParams NW003_makeWebFormItemParams(uint32_t key) { + KVS_StorageType::Enum storageType; + const __FlashStringHelper*label = NW003_data_struct_ETH_RMII::getLabelString(key, true, storageType); + const __FlashStringHelper*id = NW003_data_struct_ETH_RMII::getLabelString(key, false, storageType); + + return WebFormItemParams(label, id, storageType, key); +} + NW003_data_struct_ETH_RMII::NW003_data_struct_ETH_RMII(networkIndex_t networkIndex) : NWPluginData_base(nwpluginID_t(NW_PLUGIN_ID), networkIndex, &NW_PLUGIN_INTERFACE) { @@ -38,17 +135,188 @@ NW003_data_struct_ETH_RMII::~NW003_data_struct_ETH_RMII() stats_and_cache.processEvent_and_clear(); } -void NW003_data_struct_ETH_RMII::webform_load(EventStruct *event) {} +void NW003_data_struct_ETH_RMII::loadDefaults(ESPEasy_key_value_store *kvs, + ESPEasy::net::networkIndex_t networkIndex, + ESPEasy::net::nwpluginID_t nwPluginID) +{ + // Only load the defaults when the settings are empty + if (kvs && kvs->isEmpty()) { + if (isValid(Settings.ETH_Phy_Type) && + !ESPEasy::net::isSPI_EthernetType(Settings.ETH_Phy_Type)) + { + kvs->setValue(NW003_KEY_ETH_INDEX, static_cast(-1)); + kvs->setValue(NW003_KEY_ETH_PHY_TYPE, static_cast(Settings.ETH_Phy_Type)); + kvs->setValue(NW003_KEY_ETH_PHY_ADDR, static_cast(Settings.ETH_Phy_Addr)); + kvs->setValue(NW003_KEY_ETH_PIN_MDC, static_cast(Settings.ETH_Pin_mdc_cs)); + kvs->setValue(NW003_KEY_ETH_PIN_MDIO, static_cast(Settings.ETH_Pin_mdio_irq)); + kvs->setValue(NW003_KEY_ETH_PIN_POWER, static_cast(Settings.ETH_Pin_power_rst)); + kvs->setValue(NW003_KEY_CLOCK_MODE, static_cast(Settings.ETH_Clock_Mode)); -void NW003_data_struct_ETH_RMII::webform_save(EventStruct *event) {} + // TODO TD-er: Copy IP info -bool NW003_data_struct_ETH_RMII::webform_getPort(KeyValueWriter *writer) { return true; } + store_nwpluginTaskData_KVS(kvs, networkIndex, nwPluginID); + } + # if defined(DEFAULT_ETH_PHY_TYPE) && defined(DEFAULT_ETH_CLOCK_MODE) && defined(DEFAULT_ETH_PHY_ADDR) && \ + defined(DEFAULT_ETH_PIN_MDC) && defined(DEFAULT_ETH_PIN_MDIO) + else if (isValid(DEFAULT_ETH_PHY_TYPE) && + !ESPEasy::net::isSPI_EthernetType(DEFAULT_ETH_PHY_TYPE)) + { + kvs->setValue(NW003_KEY_ETH_INDEX, static_cast(-1)); + kvs->setValue(NW003_KEY_ETH_PHY_TYPE, static_cast(DEFAULT_ETH_PHY_TYPE)); + kvs->setValue(NW003_KEY_ETH_PHY_ADDR, static_cast(DEFAULT_ETH_PHY_ADDR)); + kvs->setValue(NW003_KEY_ETH_PIN_MDC, static_cast(DEFAULT_ETH_PIN_MDC)); + kvs->setValue(NW003_KEY_ETH_PIN_MDIO, static_cast(DEFAULT_ETH_PIN_MDIO)); + kvs->setValue(NW003_KEY_ETH_PIN_POWER, static_cast(DEFAULT_ETH_PIN_POWER)); + kvs->setValue(NW003_KEY_CLOCK_MODE, static_cast(DEFAULT_ETH_CLOCK_MODE)); + + // TODO TD-er: Copy IP info + + store_nwpluginTaskData_KVS(kvs, networkIndex, nwPluginID); + } + # endif // if defined(DEFAULT_ETH_PHY_TYPE) && defined(DEFAULT_ETH_CLOCK_MODE) && defined(DEFAULT_ETH_PHY_ADDR) && + // defined(DEFAULT_ETH_PIN_MDC) && defined(DEFAULT_ETH_PIN_MDIO) + } +} + +void NW003_data_struct_ETH_RMII::webform_load(EventStruct *event) +{ + + addFormSubHeader(F("Ethernet IP Settings")); + + addFormIPBox(F("ESP Ethernet IP"), F("espethip"), Settings.ETH_IP); + addFormIPBox(F("ESP Ethernet Gateway"), F("espethgateway"), Settings.ETH_Gateway); + addFormIPBox(F("ESP Ethernet Subnetmask"), F("espethsubnet"), Settings.ETH_Subnet); + addFormIPBox(F("ESP Ethernet DNS"), F("espethdns"), Settings.ETH_DNS); + addFormNote(F("Leave empty for DHCP")); + + addFormSubHeader(F("Ethernet")); + + { + const __FlashStringHelper *options[] = { + toString(EthPhyType_t::notSet), + + toString(EthPhyType_t::LAN8720), +# if ETH_PHY_LAN867X_SUPPORTED + toString(ESPEasy::net::EthPhyType_t::LAN867X), +# endif + toString(EthPhyType_t::TLK110), + toString(EthPhyType_t::RTL8201), +# if ETH_TYPE_JL1101_SUPPORTED + toString(EthPhyType_t::JL1101), +# endif + toString(EthPhyType_t::DP83848), + toString(EthPhyType_t::KSZ8041), + toString(EthPhyType_t::KSZ8081), + }; + const int ids[] = { + static_cast(EthPhyType_t::notSet), + + static_cast(EthPhyType_t::LAN8720), +# if ETH_PHY_LAN867X_SUPPORTED + static_cast(ESPEasy::net::EthPhyType_t::LAN867X), +# endif + static_cast(EthPhyType_t::TLK110), + static_cast(EthPhyType_t::RTL8201), +# if ETH_TYPE_JL1101_SUPPORTED + static_cast(EthPhyType_t::JL1101), +# endif + static_cast(EthPhyType_t::DP83848), + static_cast(EthPhyType_t::KSZ8041), + static_cast(EthPhyType_t::KSZ8081), + + }; + FormSelectorOptions selector(NR_ELEMENTS(ids), options, ids); + auto params = NW003_makeWebFormItemParams(NW003_KEY_ETH_PHY_TYPE); + params._defaultIntValue = static_cast(EthPhyType_t::notSet); + showFormSelector(*_kvs, selector, params); + } + { + auto params = NW003_makeWebFormItemParams(NW003_KEY_ETH_PHY_ADDR); + params._min = -1; + params._max = 127; + params._defaultIntValue = 1; + showWebformItem(*_kvs, params); + addFormNote(F("I²C-address of Ethernet PHY" + " (0 or 1 for LAN8720, 31 for TLK110, -1 autodetect)" + )); + + } + { + const int gpio_keys[] = { + NW003_KEY_ETH_PIN_MDC, + NW003_KEY_ETH_PIN_MDIO, + NW003_KEY_ETH_PIN_POWER + }; + + for (int i = 0; i < NR_ELEMENTS(gpio_keys); ++i) + { + const int key = gpio_keys[i]; + KVS_StorageType::Enum storageType; + const __FlashStringHelper *id = getLabelString(key, false, storageType); + PinSelectPurpose purpose = PinSelectPurpose::Ethernet; + String label = formatGpioLabel(key, purpose); + + int8_t pin = -1; + _kvs->getValue(key, pin); + + addFormPinSelect(purpose, label, id, pin); + } + } + { +# if CONFIG_IDF_TARGET_ESP32 + const __FlashStringHelper *ethClockOptions[] = { + toString(EthClockMode_t::Ext_crystal_osc), + toString(EthClockMode_t::Int_50MHz_GPIO_0), + toString(EthClockMode_t::Int_50MHz_GPIO_16), + toString(EthClockMode_t::Int_50MHz_GPIO_17_inv) + }; + const int indices[] = { + static_cast(EthClockMode_t::Ext_crystal_osc), + static_cast(EthClockMode_t::Int_50MHz_GPIO_0), + static_cast(EthClockMode_t::Int_50MHz_GPIO_16), + static_cast(EthClockMode_t::Int_50MHz_GPIO_17_inv) + }; +# endif // if CONFIG_IDF_TARGET_ESP32 +# if CONFIG_IDF_TARGET_ESP32P4 + const __FlashStringHelper *ethClockOptions[] = { + // toString(EthClockMode_t::Default), + toString(EthClockMode_t::Ext_crystal), + toString(EthClockMode_t::Int_50MHz) + }; + const int indices[] = { + // static_cast(EthClockMode_t::Default), + static_cast(EthClockMode_t::Ext_crystal), + static_cast(EthClockMode_t::Int_50MHz) + }; +# endif // if CONFIG_IDF_TARGET_ESP32P4 + const FormSelectorOptions selector( + NR_ELEMENTS(ethClockOptions), + ethClockOptions, + indices); + } +} + +void NW003_data_struct_ETH_RMII::webform_save(EventStruct *event) +{ + // TODO TD-er: Move this to a central function, like done with import/export + int32_t key = getNextKey(-1); + + while (key >= 0) { + KVS_StorageType::Enum storageType; + const __FlashStringHelper *id = getLabelString(key, false, storageType); + storeWebformItem(*_kvs, key, storageType, id); + key = getNextKey(key); + } + _store(); +} + +bool NW003_data_struct_ETH_RMII::webform_getPort(KeyValueWriter *writer) { return true; } bool NW003_data_struct_ETH_RMII::init(EventStruct *event) { auto data = getNWPluginData_static_runtime(); - if (data) { + if (data) { ESPEasy::net::eth::ETHConnectRelaxed(*data); } @@ -61,11 +329,11 @@ bool NW003_data_struct_ETH_RMII::exit(EventStruct *event) { return true; } - NWPluginData_static_runtime * NW003_data_struct_ETH_RMII::getNWPluginData_static_runtime() { return &stats_and_cache; } -void NW003_data_struct_ETH_RMII::onEvent(arduino_event_id_t event, - arduino_event_info_t info) +void NW003_data_struct_ETH_RMII::onEvent( + arduino_event_id_t event, + arduino_event_info_t info) { switch (event) { diff --git a/src/ESPEasy/net/NWPluginStructs/NW003_data_struct_ETH_RMII.h b/src/ESPEasy/net/NWPluginStructs/NW003_data_struct_ETH_RMII.h index eda0c00cb..38cf029e9 100644 --- a/src/ESPEasy/net/NWPluginStructs/NW003_data_struct_ETH_RMII.h +++ b/src/ESPEasy/net/NWPluginStructs/NW003_data_struct_ETH_RMII.h @@ -10,10 +10,24 @@ namespace eth { struct NW003_data_struct_ETH_RMII : public NWPluginData_base { + // See: ESPEasy_key_value_store_import_export::LabelStringFunction + static const __FlashStringHelper* getLabelString(uint32_t key, + bool displayString, + KVS_StorageType::Enum& storageType); + + // When queried with a key of -1, it will return the first key index + // Return next key, or -2 when no next key exists. + // See: ESPEasy_key_value_store_import_export::NextKeyFunction + static int32_t getNextKey(int32_t key); + + static void loadDefaults(ESPEasy_key_value_store *kvs, + ESPEasy::net::networkIndex_t networkIndex, + ESPEasy::net::nwpluginID_t nwPluginID); + + NW003_data_struct_ETH_RMII(networkIndex_t networkIndex); ~NW003_data_struct_ETH_RMII(); - void webform_load(EventStruct *event); void webform_save(EventStruct *event); @@ -25,11 +39,15 @@ struct NW003_data_struct_ETH_RMII : public NWPluginData_base { NWPluginData_static_runtime* getNWPluginData_static_runtime(); - private: - static void onEvent(arduino_event_id_t event, - arduino_event_info_t info); + static void onEvent(arduino_event_id_t event, + arduino_event_info_t info); + + static String formatGpioLabel(uint32_t key, + PinSelectPurpose& purpose, + bool shortNotation = false); + network_event_handle_t nw_event_id = 0; diff --git a/src/ESPEasy/net/NWPluginStructs/NW004_data_struct_ETH_SPI.cpp b/src/ESPEasy/net/NWPluginStructs/NW004_data_struct_ETH_SPI.cpp index f774372ad..6595fe8dc 100644 --- a/src/ESPEasy/net/NWPluginStructs/NW004_data_struct_ETH_SPI.cpp +++ b/src/ESPEasy/net/NWPluginStructs/NW004_data_struct_ETH_SPI.cpp @@ -8,6 +8,10 @@ # include "../../../src/Helpers/LongTermOnOffTimer.h" # include "../../../src/Helpers/StringConverter.h" +# include "../../../src/WebServer/Markup.h" +# include "../../../src/WebServer/Markup_Forms.h" +# include "../../../src/WebServer/ESPEasy_key_value_store_webform.h" + # include "../Globals/NetworkState.h" # include "../eth/ESPEasyEth.h" @@ -21,6 +25,96 @@ namespace eth { static NWPluginData_static_runtime stats_and_cache(&NW_PLUGIN_INTERFACE); +// Keys as used in the Key-value-store +# define NW004_KEY_ETH_INDEX 1 +# define NW004_KEY_ETH_PHY_TYPE 2 +# define NW004_KEY_ETH_PHY_ADDR 3 +# define NW004_KEY_ETH_PIN_CS 4 +# define NW004_KEY_ETH_PIN_IRQ 5 +# define NW004_KEY_ETH_PIN_RST 6 +# define NW004_KEY_IP 7 +# define NW004_KEY_GW 8 +# define NW004_KEY_SN 9 +# define NW004_KEY_DNS 10 + +# define NW004_MAX_KEY 11 + +const __FlashStringHelper * NW004_data_struct_ETH_SPI::getLabelString(uint32_t key, bool displayString, KVS_StorageType::Enum& storageType) +{ + storageType = KVS_StorageType::Enum::int8_type; + + switch (key) + { + case NW004_KEY_ETH_INDEX: return F("Index"); + case NW004_KEY_ETH_PHY_TYPE: return displayString ? F("Ethernet PHY type") : F("phytype"); + case NW004_KEY_ETH_PHY_ADDR: return displayString ? F("Ethernet PHY Address") : F("phyaddr"); + case NW004_KEY_ETH_PIN_CS: return displayString ? F("Ethernet CS pin") : F("CS"); + case NW004_KEY_ETH_PIN_IRQ: return displayString ? F("Ethernet IRQ pin") : F("IRQ"); + case NW004_KEY_ETH_PIN_RST: return displayString ? F("Ethernet RST pin") : F("RST"); + case NW004_KEY_IP: + storageType = KVS_StorageType::Enum::string_type; + return F("IP"); + case NW004_KEY_GW: + storageType = KVS_StorageType::Enum::string_type; + return displayString ? F("Gateway") : F("gw"); + case NW004_KEY_SN: + storageType = KVS_StorageType::Enum::string_type; + return displayString ? F("Subnetmask") : F("sn"); + case NW004_KEY_DNS: + storageType = KVS_StorageType::Enum::string_type; + return F("DNS"); + } + return F(""); +} + +int32_t NW004_data_struct_ETH_SPI::getNextKey(int32_t key) +{ + if (key == -1) { return NW004_KEY_ETH_INDEX; } + + if (key >= NW004_MAX_KEY) { return -2; } + return key + 1; +} + +String NW004_data_struct_ETH_SPI::formatGpioLabel(uint32_t key, + PinSelectPurpose& purpose, + bool shortNotation) +{ + String label; + + if ((key >= NW004_KEY_ETH_PIN_CS) && (key <= NW004_KEY_ETH_PIN_RST)) + { + KVS_StorageType::Enum storageType; + purpose = PinSelectPurpose::Generic; + label = getLabelString(key, true, storageType); + + const bool optional = !shortNotation; + + switch (key) + { + case NW004_KEY_ETH_PIN_IRQ: + purpose = PinSelectPurpose::Generic_input; + label = formatGpioName( + label, gpio_direction::gpio_input, optional); + break; + case NW004_KEY_ETH_PIN_CS: + case NW004_KEY_ETH_PIN_RST: + purpose = PinSelectPurpose::Generic_output; + label = formatGpioName( + label, gpio_direction::gpio_output, optional); + break; + } + } + return label; +} + +WebFormItemParams NW004_makeWebFormItemParams(uint32_t key) { + KVS_StorageType::Enum storageType; + const __FlashStringHelper*label = NW004_data_struct_ETH_SPI::getLabelString(key, true, storageType); + const __FlashStringHelper*id = NW004_data_struct_ETH_SPI::getLabelString(key, false, storageType); + + return WebFormItemParams(label, id, storageType, key); +} + NW004_data_struct_ETH_SPI::NW004_data_struct_ETH_SPI(networkIndex_t networkIndex) : NWPluginData_base(nwpluginID_t(NW_PLUGIN_ID), networkIndex, &NW_PLUGIN_INTERFACE) { @@ -37,17 +131,146 @@ NW004_data_struct_ETH_SPI::~NW004_data_struct_ETH_SPI() stats_and_cache.processEvent_and_clear(); } -void NW004_data_struct_ETH_SPI::webform_load(EventStruct *event) {} +void NW004_data_struct_ETH_SPI::loadDefaults(ESPEasy_key_value_store *kvs, + ESPEasy::net::networkIndex_t networkIndex, + ESPEasy::net::nwpluginID_t nwPluginID) +{ + // Only load the defaults when the settings are empty + if (kvs && kvs->isEmpty()) { + if (isValid(Settings.ETH_Phy_Type) && + ESPEasy::net::isSPI_EthernetType(Settings.ETH_Phy_Type)) + { + kvs->setValue(NW004_KEY_ETH_INDEX, static_cast(-1)); + kvs->setValue(NW004_KEY_ETH_PHY_TYPE, static_cast(Settings.ETH_Phy_Type)); + kvs->setValue(NW004_KEY_ETH_PHY_ADDR, static_cast(Settings.ETH_Phy_Addr)); + kvs->setValue(NW004_KEY_ETH_PIN_CS, static_cast(Settings.ETH_Pin_mdc_cs)); + kvs->setValue(NW004_KEY_ETH_PIN_IRQ, static_cast(Settings.ETH_Pin_mdio_irq)); + kvs->setValue(NW004_KEY_ETH_PIN_RST, static_cast(Settings.ETH_Pin_power_rst)); -void NW004_data_struct_ETH_SPI::webform_save(EventStruct *event) {} + // TODO TD-er: Copy IP info -bool NW004_data_struct_ETH_SPI::webform_getPort(KeyValueWriter *writer) { return true; } + store_nwpluginTaskData_KVS(kvs, networkIndex, nwPluginID); + } + # if defined(DEFAULT_ETH_PHY_TYPE) && defined(DEFAULT_ETH_CLOCK_MODE) && defined(DEFAULT_ETH_PHY_ADDR) && \ + defined(DEFAULT_ETH_PIN_MDC) && defined(DEFAULT_ETH_PIN_MDIO) + else if (isValid(DEFAULT_ETH_PHY_TYPE) && + ESPEasy::net::isSPI_EthernetType(DEFAULT_ETH_PHY_TYPE)) + { + kvs->setValue(NW004_KEY_ETH_INDEX, static_cast(-1)); + kvs->setValue(NW004_KEY_ETH_PHY_TYPE, static_cast(DEFAULT_ETH_PHY_TYPE)); + kvs->setValue(NW004_KEY_ETH_PHY_ADDR, static_cast(DEFAULT_ETH_PHY_ADDR)); + kvs->setValue(NW004_KEY_ETH_PIN_CS, static_cast(DEFAULT_ETH_PIN_MDC)); + kvs->setValue(NW004_KEY_ETH_PIN_IRQ, static_cast(DEFAULT_ETH_PIN_MDIO)); + kvs->setValue(NW004_KEY_ETH_PIN_RST, static_cast(DEFAULT_ETH_PIN_POWER)); + + // TODO TD-er: Copy IP info + + store_nwpluginTaskData_KVS(kvs, networkIndex, nwPluginID); + } + # endif // if defined(DEFAULT_ETH_PHY_TYPE) && defined(DEFAULT_ETH_CLOCK_MODE) && defined(DEFAULT_ETH_PHY_ADDR) && + // defined(DEFAULT_ETH_PIN_MDC) && defined(DEFAULT_ETH_PIN_MDIO) + } +} + +void NW004_data_struct_ETH_SPI::webform_load(EventStruct *event) +{ + addFormSubHeader(F("Ethernet IP Settings")); + + addFormIPBox(F("ESP Ethernet IP"), F("espethip"), Settings.ETH_IP); + addFormIPBox(F("ESP Ethernet Gateway"), F("espethgateway"), Settings.ETH_Gateway); + addFormIPBox(F("ESP Ethernet Subnetmask"), F("espethsubnet"), Settings.ETH_Subnet); + addFormIPBox(F("ESP Ethernet DNS"), F("espethdns"), Settings.ETH_DNS); + addFormNote(F("Leave empty for DHCP")); + + addFormSubHeader(F("Ethernet")); + + { + const __FlashStringHelper *options[] = { + toString(EthPhyType_t::notSet), +# if ESP_IDF_VERSION_MAJOR >= 5 +# if CONFIG_ETH_SPI_ETHERNET_DM9051 + toString(EthPhyType_t::DM9051), +# endif // if CONFIG_ETH_SPI_ETHERNET_DM9051 +# if CONFIG_ETH_SPI_ETHERNET_W5500 + toString(EthPhyType_t::W5500), +# endif // if CONFIG_ETH_SPI_ETHERNET_W5500 +# if CONFIG_ETH_SPI_ETHERNET_KSZ8851SNL + toString(EthPhyType_t::KSZ8851), +# endif // if CONFIG_ETH_SPI_ETHERNET_KSZ8851SNL +# endif // if ESP_IDF_VERSION_MAJOR >= 5 + }; + const int ids[] = { + static_cast(EthPhyType_t::notSet), + +# if ESP_IDF_VERSION_MAJOR >= 5 +# if CONFIG_ETH_SPI_ETHERNET_DM9051 + static_cast(EthPhyType_t::DM9051), +# endif // if CONFIG_ETH_SPI_ETHERNET_DM9051 +# if CONFIG_ETH_SPI_ETHERNET_W5500 + static_cast(EthPhyType_t::W5500), +# endif // if CONFIG_ETH_SPI_ETHERNET_W5500 +# if CONFIG_ETH_SPI_ETHERNET_KSZ8851SNL + static_cast(EthPhyType_t::KSZ8851), +# endif // if CONFIG_ETH_SPI_ETHERNET_KSZ8851SNL +# endif // if ESP_IDF_VERSION_MAJOR >= 5 + }; + + FormSelectorOptions selector(NR_ELEMENTS(ids), options, ids); + auto params = NW004_makeWebFormItemParams(NW004_KEY_ETH_PHY_TYPE); + params._defaultIntValue = static_cast(EthPhyType_t::notSet); + showFormSelector(*_kvs, selector, params); + } + { + auto params = NW004_makeWebFormItemParams(NW004_KEY_ETH_PHY_ADDR); + params._min = -1; + params._max = 127; + params._defaultIntValue = 1; + showWebformItem(*_kvs, params); + addFormNote(F("I²C-address of Ethernet PHY")); + } + { + const int gpio_keys[] = { + NW004_KEY_ETH_PIN_CS, + NW004_KEY_ETH_PIN_IRQ, + NW004_KEY_ETH_PIN_RST + }; + + for (int i = 0; i < NR_ELEMENTS(gpio_keys); ++i) + { + const int key = gpio_keys[i]; + KVS_StorageType::Enum storageType; + const __FlashStringHelper *id = getLabelString(key, false, storageType); + PinSelectPurpose purpose = PinSelectPurpose::Ethernet; + String label = formatGpioLabel(key, purpose); + + int8_t pin = -1; + _kvs->getValue(key, pin); + + addFormPinSelect(purpose, label, id, pin); + } + } +} + +void NW004_data_struct_ETH_SPI::webform_save(EventStruct *event) { + // TODO TD-er: Move this to a central function, like done with import/export + int32_t key = getNextKey(-1); + + while (key >= 0) { + KVS_StorageType::Enum storageType; + const __FlashStringHelper *id = getLabelString(key, false, storageType); + storeWebformItem(*_kvs, key, storageType, id); + key = getNextKey(key); + } + _store(); +} + +bool NW004_data_struct_ETH_SPI::webform_getPort(KeyValueWriter *writer) { return true; } bool NW004_data_struct_ETH_SPI::init(EventStruct *event) { auto data = getNWPluginData_static_runtime(); - if (data) { + if (data) { ESPEasy::net::eth::ETHConnectRelaxed(*data); } @@ -64,7 +287,6 @@ bool NW004_data_struct_ETH_SPI::exit(EventStruct *event) NWPluginData_static_runtime * NW004_data_struct_ETH_SPI::getNWPluginData_static_runtime() { return &stats_and_cache; } - void NW004_data_struct_ETH_SPI::onEvent(arduino_event_id_t event, arduino_event_info_t info) { diff --git a/src/ESPEasy/net/NWPluginStructs/NW004_data_struct_ETH_SPI.h b/src/ESPEasy/net/NWPluginStructs/NW004_data_struct_ETH_SPI.h index bfa44d55a..f6ea81381 100644 --- a/src/ESPEasy/net/NWPluginStructs/NW004_data_struct_ETH_SPI.h +++ b/src/ESPEasy/net/NWPluginStructs/NW004_data_struct_ETH_SPI.h @@ -10,10 +10,24 @@ namespace eth { struct NW004_data_struct_ETH_SPI : public NWPluginData_base { + // See: ESPEasy_key_value_store_import_export::LabelStringFunction + static const __FlashStringHelper* getLabelString(uint32_t key, + bool displayString, + KVS_StorageType::Enum& storageType); + + // When queried with a key of -1, it will return the first key index + // Return next key, or -2 when no next key exists. + // See: ESPEasy_key_value_store_import_export::NextKeyFunction + static int32_t getNextKey(int32_t key); + + static void loadDefaults(ESPEasy_key_value_store *kvs, + ESPEasy::net::networkIndex_t networkIndex, + ESPEasy::net::nwpluginID_t nwPluginID); + + NW004_data_struct_ETH_SPI(networkIndex_t networkIndex); ~NW004_data_struct_ETH_SPI(); - void webform_load(EventStruct *event); void webform_save(EventStruct *event); @@ -27,8 +41,13 @@ struct NW004_data_struct_ETH_SPI : public NWPluginData_base { private: - static void onEvent(arduino_event_id_t event, - arduino_event_info_t info); + static void onEvent(arduino_event_id_t event, + arduino_event_info_t info); + + static String formatGpioLabel(uint32_t key, + PinSelectPurpose& purpose, + bool shortNotation = false); + network_event_handle_t nw_event_id = 0; diff --git a/src/ESPEasy/net/NWPluginStructs/NW005_data_struct_PPP_modem.cpp b/src/ESPEasy/net/NWPluginStructs/NW005_data_struct_PPP_modem.cpp index 1dff2be7e..fcd66de19 100644 --- a/src/ESPEasy/net/NWPluginStructs/NW005_data_struct_PPP_modem.cpp +++ b/src/ESPEasy/net/NWPluginStructs/NW005_data_struct_PPP_modem.cpp @@ -599,29 +599,14 @@ void NW005_data_struct_PPP_modem::webform_load(EventStruct *event) void NW005_data_struct_PPP_modem::webform_save(EventStruct *event) { - const uint32_t keys[] { - NW005_KEY_SERIAL_PORT, - NW005_KEY_PIN_RX, - NW005_KEY_PIN_TX, - NW005_KEY_PIN_RTS, - NW005_KEY_PIN_CTS, - NW005_KEY_PIN_RESET, - NW005_KEY_PIN_RESET_ACTIVE_LOW, - NW005_KEY_PIN_RESET_DELAY, - NW005_KEY_BAUDRATE, - NW005_KEY_FLOWCTRL, - NW005_KEY_MODEM_MODEL, - NW005_KEY_APN, - NW005_KEY_SIM_PIN, - NW005_KEY_PIN_DTR - }; + // TODO TD-er: Move this to a central function, like done with import/export + int32_t key = getNextKey(-1); - - for (int i = 0; i < NR_ELEMENTS(keys); ++i) - { + while (key >= 0) { KVS_StorageType::Enum storageType; - const __FlashStringHelper *id = getLabelString(keys[i], false, storageType); - storeWebformItem(*_kvs, keys[i], storageType, id); + const __FlashStringHelper *id = getLabelString(key, false, storageType); + storeWebformItem(*_kvs, key, storageType, id); + key = getNextKey(key); } _store(); } diff --git a/src/ESPEasy/net/_NW003_ETH_RMII.cpp b/src/ESPEasy/net/_NW003_ETH_RMII.cpp index 14dd49927..86c98a81e 100644 --- a/src/ESPEasy/net/_NW003_ETH_RMII.cpp +++ b/src/ESPEasy/net/_NW003_ETH_RMII.cpp @@ -60,16 +60,13 @@ bool NWPlugin_003(NWPlugin::Function function, EventStruct *event, String& strin Settings.setRoutePrio_for_network(event->NetworkIndex, 50); Settings.setNetworkInterfaceSubnetBlockClientIP(event->NetworkIndex, false); Settings.setNetworkInterfaceStartupDelayAtBoot(event->NetworkIndex, 500 * event->NetworkIndex); - # if CONFIG_IDF_TARGET_ESP32P4 - Settings.ETH_Clock_Mode = EthClockMode_t::Ext_crystal; - Settings.ETH_Phy_Type = EthPhyType_t::TLK110; - Settings.ETH_Phy_Addr = ETH_PHY_ADDR; - Settings.ETH_Pin_mdc_cs = ETH_PHY_MDC; - Settings.ETH_Pin_mdio_irq = ETH_PHY_MDIO; - Settings.ETH_Pin_power_rst = ETH_PHY_POWER; - # else // if CONFIG_IDF_TARGET_ESP32P4 - Settings.ETH_Clock_Mode = EthClockMode_t::Ext_crystal_osc; - # endif // if CONFIG_IDF_TARGET_ESP32P4 + + ESPEasy_key_value_store kvs; + ESPEasy::net::eth::NW003_data_struct_ETH_RMII::loadDefaults( + &kvs, + event->NetworkIndex, + ESPEasy::net::nwpluginID_t(NWPLUGIN_ID_003)); + break; } diff --git a/src/ESPEasy/net/_NW004_ETH_SPI.cpp b/src/ESPEasy/net/_NW004_ETH_SPI.cpp index 76b779d25..97edcdbb2 100644 --- a/src/ESPEasy/net/_NW004_ETH_SPI.cpp +++ b/src/ESPEasy/net/_NW004_ETH_SPI.cpp @@ -56,18 +56,12 @@ bool NWPlugin_004(NWPlugin::Function function, EventStruct *event, String& strin Settings.setNetworkInterfaceSubnetBlockClientIP(event->NetworkIndex, false); Settings.setNetworkInterfaceStartupDelayAtBoot(event->NetworkIndex, 500 * event->NetworkIndex); - /* - # if CONFIG_IDF_TARGET_ESP32P4 - Settings.ETH_Clock_Mode = EthClockMode_t::Ext_crystal; - Settings.ETH_Phy_Type = EthPhyType_t::TLK110; - Settings.ETH_Phy_Addr = ETH_PHY_ADDR; - Settings.ETH_Pin_mdc_cs = ETH_PHY_MDC; - Settings.ETH_Pin_mdio_irq = ETH_PHY_MDIO; - Settings.ETH_Pin_power_rst = ETH_PHY_POWER; - # else // if CONFIG_IDF_TARGET_ESP32P4 - Settings.ETH_Clock_Mode = EthClockMode_t::Ext_crystal_osc; - # endif // if CONFIG_IDF_TARGET_ESP32P4 - */ + ESPEasy_key_value_store kvs; + ESPEasy::net::eth::NW004_data_struct_ETH_SPI::loadDefaults( + &kvs, + event->NetworkIndex, + ESPEasy::net::nwpluginID_t(NWPLUGIN_ID_004)); + break; } diff --git a/src/ESPEasy/net/_NWPlugin_Helper.cpp b/src/ESPEasy/net/_NWPlugin_Helper.cpp index d6e76c6f3..66791ba06 100644 --- a/src/ESPEasy/net/_NWPlugin_Helper.cpp +++ b/src/ESPEasy/net/_NWPlugin_Helper.cpp @@ -9,7 +9,7 @@ namespace ESPEasy { namespace net { -NWPluginData_base *NWPlugin_task_data[NETWORK_MAX]{0}; +NWPluginData_base *NWPlugin_task_data[NETWORK_MAX]{ 0 }; void resetNWPluginData() { for (ESPEasy::net::networkIndex_t i = 0; i < NR_ELEMENTS(NWPlugin_task_data); ++i) { @@ -59,7 +59,7 @@ bool initNWPluginData(ESPEasy::net::networkIndex_t networkIndex, NWPluginData_ba #if FEATURE_NETWORK_STATS NWPlugin_task_data[networkIndex]->initPluginStats(); -#endif +#endif // if FEATURE_NETWORK_STATS } else { delete data; @@ -84,5 +84,60 @@ bool nwpluginTaskData_initialized(ESPEasy::net::networkIndex_t networkIndex) { (NWPlugin_task_data[networkIndex]->getNWPluginID() == Settings.getNWPluginID_for_network(networkIndex)); } +#if FEATURE_ESPEASY_KEY_VALUE_STORE + +bool load_nwpluginTaskData_KVS(ESPEasy_key_value_store *kvs, ESPEasy::net::networkIndex_t networkIndex, ESPEasy::net::nwpluginID_t nwPluginID) +{ + if (!kvs) { return false; } + return kvs->load( + SettingsType::Enum::NetworkInterfaceSettings_Type, + networkIndex, + 0, + nwPluginID.value); +} + +bool store_nwpluginTaskData_KVS(ESPEasy_key_value_store *kvs, ESPEasy::net::networkIndex_t networkIndex, + ESPEasy::net::nwpluginID_t nwPluginID) +{ + if (!kvs) { return false; } + +# if defined(USES_NW003) || defined(USES_NW004) + + if (!kvs->isEmpty()) { + // Check if NW003_KEY_ETH_INDEX or NW004_KEY_ETH_INDEX is set. + // If not, then make sure there is no conflict with existing other network interfaces. + int8_t value = -1; + + if (kvs->getValue(1, value)) { + if (value == -1) { + // Value has not been set. Check if there are other Ethernet adapters set. + ++value; + + for (uint8_t i = 2; i < NETWORK_MAX; ++i) { + if (i != networkIndex) { + auto id = Settings.getNWPluginID_for_network(i); + + if ((id == ESPEasy::net::nwpluginID_t(3)) || + (id == ESPEasy::net::nwpluginID_t(4))) { + ++value; + } + } + } + kvs->setValue(1, value); + } + } + + } +# endif // if defined(USES_NW003) || defined(USES_NW004) + + return kvs->store( + SettingsType::Enum::NetworkInterfaceSettings_Type, + networkIndex, + 0, + nwPluginID.value); +} + +#endif // if FEATURE_ESPEASY_KEY_VALUE_STORE + } // namespace net } // namespace ESPEasy diff --git a/src/ESPEasy/net/_NWPlugin_Helper.h b/src/ESPEasy/net/_NWPlugin_Helper.h index 00af4c67b..24098291b 100644 --- a/src/ESPEasy/net/_NWPlugin_Helper.h +++ b/src/ESPEasy/net/_NWPlugin_Helper.h @@ -34,6 +34,9 @@ bool initNWPluginData(ESPEasy::net::networkIndex_t networkIndex, NWPluginData_base* getNWPluginData(ESPEasy::net::networkIndex_t networkIndex); bool nwpluginTaskData_initialized(ESPEasy::net::networkIndex_t networkIndex); - +#if FEATURE_ESPEASY_KEY_VALUE_STORE +bool load_nwpluginTaskData_KVS(ESPEasy_key_value_store *kvs, ESPEasy::net::networkIndex_t networkIndex, ESPEasy::net::nwpluginID_t nwPluginID); +bool store_nwpluginTaskData_KVS(ESPEasy_key_value_store *kvs, ESPEasy::net::networkIndex_t networkIndex, ESPEasy::net::nwpluginID_t nwPluginID); +#endif } // namespace net } // namespace ESPEasy diff --git a/src/src/Commands/Networks.cpp b/src/src/Commands/Networks.cpp index 0f5a36344..00309d786 100644 --- a/src/src/Commands/Networks.cpp +++ b/src/src/Commands/Networks.cpp @@ -190,28 +190,36 @@ String Command_ETH_Disconnect (struct EventStruct *event, const char* Line) #if FEATURE_STORE_NETWORK_INTERFACE_SETTINGS -String Command_Network_ExportConfig (struct EventStruct *event, const char* Line) + +String Command_Network_ExportConfig(struct EventStruct *event, const char*Line) { ESPEasy::net::networkIndex_t networkIndex; - if (!validNetworkVar(event, networkIndex)) return return_command_failed(); + + if (!validNetworkVar(event, networkIndex)) { return return_command_failed(); } PrintToString p2s; - KeyValueWriter_JSON writer(true, &p2s); + { + KeyValueWriter_JSON writer(false, &p2s); - String res = ESPEasy::net::NWPlugin_import_export::exportConfig(networkIndex, &writer); - if (!res.isEmpty()) return res; + String res = ESPEasy::net::NWPlugin_import_export::exportConfig(networkIndex, &writer); + + if (!res.isEmpty()) { return res; } + } return p2s.getMove(); } -String Command_Network_ImportConfig (struct EventStruct *event, const char* Line) +String Command_Network_ImportConfig(struct EventStruct *event, const char*Line) { ESPEasy::net::networkIndex_t networkIndex; - if (!validNetworkVar(event, networkIndex)) return return_command_failed(); + + if (!validNetworkVar(event, networkIndex)) { return return_command_failed(); } const String json = parseStringToEndKeepCase(Line, 3); String res = ESPEasy::net::NWPlugin_import_export::importConfig(networkIndex, json); - if (!res.isEmpty()) return res; - + + if (!res.isEmpty()) { return res; } + return return_command_success(); } -#endif + +#endif // if FEATURE_STORE_NETWORK_INTERFACE_SETTINGS diff --git a/src/src/CustomBuild/define_plugin_sets.h b/src/src/CustomBuild/define_plugin_sets.h index cdf43ec3c..b500e9bf3 100644 --- a/src/src/CustomBuild/define_plugin_sets.h +++ b/src/src/CustomBuild/define_plugin_sets.h @@ -4188,7 +4188,7 @@ To create/register a plugin, you have to : #endif -#if /*defined(USES_NW003) || defined(USES_NW004) ||*/ defined(USES_NW005) +#if defined(USES_NW003) || defined(USES_NW004) || defined(USES_NW005) # ifndef FEATURE_STORE_NETWORK_INTERFACE_SETTINGS # define FEATURE_STORE_NETWORK_INTERFACE_SETTINGS 1 # endif diff --git a/src/src/Helpers/ESPEasy_key_value_store_import_export.cpp b/src/src/Helpers/ESPEasy_key_value_store_import_export.cpp index 9ba43e080..6fdff263f 100644 --- a/src/src/Helpers/ESPEasy_key_value_store_import_export.cpp +++ b/src/src/Helpers/ESPEasy_key_value_store_import_export.cpp @@ -11,7 +11,7 @@ ESPEasy_key_value_store_import_export::ESPEasy_key_value_store_import_export( : _store(store) {} -bool ESPEasy_key_value_store_import_export::write( +bool ESPEasy_key_value_store_import_export::do_export( uint32_t key, KeyValueWriter*writer, LabelStringFunction fnc) const @@ -140,7 +140,7 @@ ESPEasy_key_value_store_import_export::ESPEasy_key_value_store_import_export( -String ESPEasy_key_value_store_import_export::read( +String ESPEasy_key_value_store_import_export::do_import( LabelStringFunction fnc, NextKeyFunction nextKey) { diff --git a/src/src/Helpers/ESPEasy_key_value_store_import_export.h b/src/src/Helpers/ESPEasy_key_value_store_import_export.h index d17794f81..b4187d063 100644 --- a/src/src/Helpers/ESPEasy_key_value_store_import_export.h +++ b/src/src/Helpers/ESPEasy_key_value_store_import_export.h @@ -23,7 +23,7 @@ public: ESPEasy_key_value_store_import_export( ESPEasy_key_value_store*store); - bool write(uint32_t key, + bool do_export(uint32_t key, KeyValueWriter *writer, LabelStringFunction fnc) const; @@ -32,7 +32,7 @@ public: ESPEasy_key_value_store*store, const String & json); - String read( + String do_import( LabelStringFunction fnc, NextKeyFunction nextKey); From 097182fdd9ef879110387c6dd2bd95b7812e579f Mon Sep 17 00:00:00 2001 From: TD-er Date: Sun, 2 Nov 2025 23:03:52 +0100 Subject: [PATCH 443/564] [Ethernet] Allocate unused ETH interface support multiple ETH instances --- .../NWPluginData_static_runtime.cpp | 4 +- .../DataStructs/NWPluginData_static_runtime.h | 1 + .../NWPluginData_static_runtime_ESP32.cpp | 50 ++-- src/ESPEasy/net/ESPEasyNetwork_ESP32.cpp | 28 +- src/ESPEasy/net/Globals/NWPlugins.cpp | 14 +- src/ESPEasy/net/Globals/NWPlugins.h | 7 +- src/ESPEasy/net/Globals/NetworkState.cpp | 4 + src/ESPEasy/net/Globals/NetworkState.h | 8 + .../NW003_data_struct_ETH_RMII.cpp | 67 +---- .../NW003_data_struct_ETH_RMII.h | 7 +- .../NW004_data_struct_ETH_SPI.cpp | 62 +---- .../NW004_data_struct_ETH_SPI.h | 3 +- src/ESPEasy/net/_NW003_ETH_RMII.cpp | 40 ++- src/ESPEasy/net/_NW004_ETH_SPI.cpp | 41 ++- src/ESPEasy/net/eth/ESPEasyEth.cpp | 116 ++++---- src/ESPEasy/net/eth/ESPEasyEth.h | 5 +- .../eth/ETH_NWPluginData_static_runtime.cpp | 254 ++++++++++++++++++ .../net/eth/ETH_NWPluginData_static_runtime.h | 46 ++++ 18 files changed, 526 insertions(+), 231 deletions(-) create mode 100644 src/ESPEasy/net/eth/ETH_NWPluginData_static_runtime.cpp create mode 100644 src/ESPEasy/net/eth/ETH_NWPluginData_static_runtime.h diff --git a/src/ESPEasy/net/DataStructs/NWPluginData_static_runtime.cpp b/src/ESPEasy/net/DataStructs/NWPluginData_static_runtime.cpp index a6ad52a87..6254423b4 100644 --- a/src/ESPEasy/net/DataStructs/NWPluginData_static_runtime.cpp +++ b/src/ESPEasy/net/DataStructs/NWPluginData_static_runtime.cpp @@ -169,7 +169,7 @@ void NWPluginData_static_runtime::processEvents() if (ip != INADDR_NONE) { addLog(LOG_LEVEL_INFO, strformat( F("%s: Got IP: %s/%d GW: %s"), - _netif->desc(), + _eventInterfaceName.c_str(), ip.toString().c_str(), _netif->subnetCIDR(), _netif->gatewayIP().toString().c_str() @@ -207,7 +207,7 @@ void NWPluginData_static_runtime::processEvents() if (addr_type < NR_ELEMENTS(addr_types)) { addLog(LOG_LEVEL_INFO, strformat( F("%s: Got IPv6: IP Index: %d, Type: %s, Zone: %d, Address: " IPV6STR), - _netif->desc(), + _eventInterfaceName.c_str(), ip6Event.ip_index, addr_types[addr_type], ip6Event.ip6_info.ip.zone, diff --git a/src/ESPEasy/net/DataStructs/NWPluginData_static_runtime.h b/src/ESPEasy/net/DataStructs/NWPluginData_static_runtime.h index bc3dc9e5b..04566bf7b 100644 --- a/src/ESPEasy/net/DataStructs/NWPluginData_static_runtime.h +++ b/src/ESPEasy/net/DataStructs/NWPluginData_static_runtime.h @@ -180,6 +180,7 @@ private: }; +DEF_UP(NWPluginData_static_runtime); } // namespace net } // namespace ESPEasy diff --git a/src/ESPEasy/net/DataStructs/NWPluginData_static_runtime_ESP32.cpp b/src/ESPEasy/net/DataStructs/NWPluginData_static_runtime_ESP32.cpp index 3997486c3..68ab3a193 100644 --- a/src/ESPEasy/net/DataStructs/NWPluginData_static_runtime_ESP32.cpp +++ b/src/ESPEasy/net/DataStructs/NWPluginData_static_runtime_ESP32.cpp @@ -2,7 +2,7 @@ #ifdef ESP32 -#include "../ESPEasyNetwork.h" +# include "../ESPEasyNetwork.h" # include "../../../src/Helpers/StringConverter.h" @@ -22,7 +22,12 @@ NWPluginData_static_runtime::NWPluginData_static_runtime( : _netif(netif), _isAP(false), _eventInterfaceName(eventInterfaceName) -{} +{ + if (eventInterfaceName.isEmpty() && (_netif != nullptr)) { + _eventInterfaceName = _netif->desc(); + _eventInterfaceName.toUpperCase(); + } +} NWPluginData_static_runtime::NWPluginData_static_runtime( bool isAP, @@ -31,7 +36,12 @@ NWPluginData_static_runtime::NWPluginData_static_runtime( : _netif(netif), _isAP(isAP), _eventInterfaceName(eventInterfaceName) -{} +{ + if (eventInterfaceName.isEmpty() && (_netif != nullptr)) { + _eventInterfaceName = _netif->desc(); + _eventInterfaceName.toUpperCase(); + } +} bool NWPluginData_static_runtime::started() const { @@ -45,14 +55,15 @@ bool NWPluginData_static_runtime::connected() const return _netif->connected(); } -#if FEATURE_ETHERNET +# if FEATURE_ETHERNET + bool NWPluginData_static_runtime::linkUp() const { if (!_netif) { return false; } return _netif->linkUp(); } -#endif +# endif // if FEATURE_ETHERNET bool NWPluginData_static_runtime::isDefaultRoute() const { @@ -78,14 +89,15 @@ bool NWPluginData_static_runtime::hasIPv6() const void NWPluginData_static_runtime::mark_start() { + // if (!_startStopStats.setOn()) { return; } _startStopStats.setOn(); if (!_netif) { return; } _netif->setHostname(NetworkCreateRFCCompliantHostname().c_str()); -#if FEATURE_USE_IPV6 +# if FEATURE_USE_IPV6 _netif->enableIPv6(_enableIPv6); -#endif +# endif # if ESP_IDF_VERSION >= ESP_IDF_VERSION_VAL(5, 5, 0) @@ -98,7 +110,7 @@ void NWPluginData_static_runtime::mark_start() if (loglevelActiveFor(LOG_LEVEL_INFO)) { addLog(LOG_LEVEL_INFO, strformat( F("%s: Started"), - _netif->desc())); + _eventInterfaceName.c_str())); } # endif // if NW_PLUGIN_LOG_EVENTS } @@ -111,7 +123,7 @@ void NWPluginData_static_runtime::mark_stop() if (_netif && loglevelActiveFor(LOG_LEVEL_INFO)) { addLog(LOG_LEVEL_INFO, strformat( F("%s: Stopped"), - _netif->desc())); + _eventInterfaceName.c_str())); } # endif // if NW_PLUGIN_LOG_EVENTS } @@ -136,7 +148,7 @@ void NWPluginData_static_runtime::mark_got_IP() if ((tmp != INADDR_NONE) && loglevelActiveFor(LOG_LEVEL_INFO)) { addLog(LOG_LEVEL_INFO, strformat( F("%s: DNS Cache %d set to %s"), - _netif->desc(), + _eventInterfaceName.c_str(), i, tmp.toString(true).c_str())); } @@ -147,7 +159,7 @@ void NWPluginData_static_runtime::mark_got_IP() if (loglevelActiveFor(LOG_LEVEL_INFO)) { addLog(LOG_LEVEL_INFO, strformat( F("%s: Got IP: %s"), - _netif->desc(), + _eventInterfaceName.c_str(), _netif->localIP().toString().c_str() )); } @@ -159,14 +171,16 @@ void NWPluginData_static_runtime::mark_got_IP() void NWPluginData_static_runtime::mark_got_IPv6(ip_event_got_ip6_t *event) { + if (!_netif || !event) { return; } + + if (_netif->netif() != event->esp_netif) { return; } _gotIP6Stats.setOn(); - if (!_netif) { return; } if (!_netif->isDefault()) { nonDefaultNetworkInterface_gotIP = true; } - + if (event) { if (event->ip_index < NR_ELEMENTS(_gotIP6Events)) { memcpy(&_gotIP6Events[event->ip_index], event, sizeof(ip_event_got_ip6_t)); @@ -188,7 +202,7 @@ void NWPluginData_static_runtime::mark_lost_IP() if (_netif && loglevelActiveFor(LOG_LEVEL_INFO)) { addLog(LOG_LEVEL_INFO, strformat( F("%s: Lost IP"), - _netif->desc())); + _eventInterfaceName.c_str())); } # endif // if NW_PLUGIN_LOG_EVENTS } @@ -214,20 +228,20 @@ void NWPluginData_static_runtime::log_connected() // Log duration addLog(LOG_LEVEL_INFO, strformat( F("%s: Connected, took: %s in %d attempts"), - _netif->desc(), + _eventInterfaceName.c_str(), format_msec_duration_HMS( _establishConnectStats.getLastOnDuration_ms()).c_str(), _establishConnectStats.getCycleCount())); } else if (_establishConnectStats.isOff()) { addLog(LOG_LEVEL_INFO, strformat( F("%s: Connected, took: %s"), - _netif->desc(), + _eventInterfaceName.c_str(), format_msec_duration_HMS( _establishConnectStats.getLastOnDuration_ms()).c_str())); } else { addLog(LOG_LEVEL_INFO, strformat( F("%s: Connected"), - _netif->desc())); + _eventInterfaceName.c_str())); } } } @@ -246,7 +260,7 @@ void NWPluginData_static_runtime::log_disconnected() if (_netif && loglevelActiveFor(LOG_LEVEL_INFO)) { addLog(LOG_LEVEL_INFO, strformat( F("%s: Disconnected. Connected for: %s"), - _netif->desc(), + _eventInterfaceName.c_str(), format_msec_duration_HMS( _connectedStats.getLastOnDuration_ms()).c_str())); } diff --git a/src/ESPEasy/net/ESPEasyNetwork_ESP32.cpp b/src/ESPEasy/net/ESPEasyNetwork_ESP32.cpp index d570d917a..05ae01c9f 100644 --- a/src/ESPEasy/net/ESPEasyNetwork_ESP32.cpp +++ b/src/ESPEasy/net/ESPEasyNetwork_ESP32.cpp @@ -124,22 +124,25 @@ NetworkInterface* getDefaultNonAP_interface() } bool NetworkConnected(bool force) { - static bool last_result = false; + static bool last_result = false; static uint32_t last_check_millis = 0; - if (force || timePassedSince(last_check_millis) > 50 || last_check_millis == 0) { + + if (force || (timePassedSince(last_check_millis) > 50) || (last_check_millis == 0)) { last_check_millis = millis(); auto network_if = getDefaultNonAP_interface(); - // FIXME TD-er: This is checking for NonAP interfaces, however we also have ESPEasy::net::NWPluginCall(NWPlugin::Function::NWPLUGIN_WEBSERVER_SHOULD_RUN); - // So maybe we should keep bitmasks for interfaces that can be used for certain services and update those whenever an interface is connected/disconnected + // FIXME TD-er: This is checking for NonAP interfaces, however we also have + // ESPEasy::net::NWPluginCall(NWPlugin::Function::NWPLUGIN_WEBSERVER_SHOULD_RUN); + // So maybe we should keep bitmasks for interfaces that can be used for certain services and update those whenever an interface is + // connected/disconnected // This way a service may 'subscribe' to changes and stopped/started/restarted when needed. // For example: // - updateUDPport() // - CheckRunningServices() // - mDNS // - Webserver - + if (network_if == nullptr) { return false; } @@ -341,22 +344,25 @@ MAC_address WifiSTAmacAddress() { bool EthFullDuplex() { - auto data = getFirst_ETH_NWPluginData_static_runtime(); - if (data && data->connected()) return ETH.fullDuplex(); + auto data = getFirst_Enabled_ETH_interface(); + + if (data && data->connected()) { return data->fullDuplex(); } return false; } bool EthLinkUp() { - auto data = getFirst_ETH_NWPluginData_static_runtime(); - if (data) return data->linkUp(); + auto data = getFirst_Enabled_ETH_interface(); + + if (data) { return data->linkUp(); } return false; } uint8_t EthLinkSpeed() { - auto data = getFirst_ETH_NWPluginData_static_runtime(); - if (data && data->connected()) return ETH.linkSpeed(); + auto data = getFirst_Enabled_ETH_interface(); + + if (data) { return data->linkSpeed(); } return 0; } diff --git a/src/ESPEasy/net/Globals/NWPlugins.cpp b/src/ESPEasy/net/Globals/NWPlugins.cpp index bf5c15ce7..3aa35d28b 100644 --- a/src/ESPEasy/net/Globals/NWPlugins.cpp +++ b/src/ESPEasy/net/Globals/NWPlugins.cpp @@ -12,6 +12,11 @@ #include "../Helpers/NWAccessControl.h" #include "../_NWPlugin_Helper.h" +#if FEATURE_ETHERNET +# include "../eth/ETH_NWPluginData_static_runtime.h" +#endif + + namespace ESPEasy { namespace net { @@ -311,6 +316,7 @@ bool NWPluginCall(NWPlugin::Function Function, EventStruct *event, String& str) break; case NWPlugin::Function::NWPLUGIN_WEBFORM_SHOW_NAME: + if (event->kvWriter) { event->kvWriter->write({ F("Name"), event->networkInterface->desc() }); success = true; @@ -469,20 +475,24 @@ NWPluginData_static_runtime* getWiFi_STA_NWPluginData_static_runtime() { return NWPluginData_static_runtime* getWiFi_AP_NWPluginData_static_runtime() { return getNWPluginData_static_runtime(NETWORK_INDEX_WIFI_AP); } -NWPluginData_static_runtime* getFirst_ETH_NWPluginData_static_runtime() +#if FEATURE_ETHERNET + +ETHClass* getFirst_Enabled_ETH_interface() { for (networkIndex_t i = 0; validNetworkIndex(i); ++i) { if (Settings.getNetworkEnabled(i)) { const auto nwpluginID = Settings.getNWPluginID_for_network(i); if ((nwpluginID.value == 3) || (nwpluginID.value == 4)) { - return getNWPluginData_static_runtime(i); + return ESPEasy::net::eth::ETH_NWPluginData_static_runtime::getInterface(i); } } } return nullptr; } +#endif // if FEATURE_ETHERNET + NWPluginData_static_runtime* getNWPluginData_static_runtime(networkIndex_t index) { auto NW_data = getNWPluginData(index); diff --git a/src/ESPEasy/net/Globals/NWPlugins.h b/src/ESPEasy/net/Globals/NWPlugins.h index b46c43212..e89915f48 100644 --- a/src/ESPEasy/net/Globals/NWPlugins.h +++ b/src/ESPEasy/net/Globals/NWPlugins.h @@ -9,6 +9,9 @@ #include "../DataTypes/NetworkIndex.h" #include "../DataTypes/NetworkDriverIndex.h" #include "../DataStructs/NWPluginData_static_runtime.h" +#if FEATURE_ETHERNET +#include "../eth/ETH_NWPluginData_static_runtime.h" +#endif namespace ESPEasy { namespace net { @@ -46,7 +49,9 @@ String getNWPluginNameFromNWPluginID(nwpluginID_t nwpluginID); NWPluginData_static_runtime* getWiFi_STA_NWPluginData_static_runtime(); NWPluginData_static_runtime* getWiFi_AP_NWPluginData_static_runtime(); -NWPluginData_static_runtime* getFirst_ETH_NWPluginData_static_runtime(); +#if FEATURE_ETHERNET +ETHClass* getFirst_Enabled_ETH_interface(); +#endif NWPluginData_static_runtime* getNWPluginData_static_runtime(networkIndex_t index); const NWPluginData_static_runtime* getDefaultRoute_NWPluginData_static_runtime(); diff --git a/src/ESPEasy/net/Globals/NetworkState.cpp b/src/ESPEasy/net/Globals/NetworkState.cpp index c4a60567b..7d9bc0cd9 100644 --- a/src/ESPEasy/net/Globals/NetworkState.cpp +++ b/src/ESPEasy/net/Globals/NetworkState.cpp @@ -27,4 +27,8 @@ IPAddress apIP(DEFAULT_AP_IP); WiFiUDP portUDP; #ifdef ESP32 bool nonDefaultNetworkInterface_gotIP{}; +#endif + +#if FEATURE_ETHERNET +ESPEasy::net::eth::ETH_NWPluginData_static_runtime eth_NWPluginData_static_runtime{}; #endif \ No newline at end of file diff --git a/src/ESPEasy/net/Globals/NetworkState.h b/src/ESPEasy/net/Globals/NetworkState.h index b579c6f13..fa67cf2ee 100644 --- a/src/ESPEasy/net/Globals/NetworkState.h +++ b/src/ESPEasy/net/Globals/NetworkState.h @@ -8,6 +8,10 @@ #include "../../../src/DataTypes/ESPEasy_plugin_functions.h" #include "../../../src/DataTypes/NetworkMedium.h" +#if FEATURE_ETHERNET +#include "../eth/ETH_NWPluginData_static_runtime.h" +#endif + // Ethernet Connectiopn status extern ESPEasy::net::NetworkMedium_t active_network_medium; @@ -30,4 +34,8 @@ extern IPAddress apIP; extern WiFiUDP portUDP; #ifdef ESP32 extern bool nonDefaultNetworkInterface_gotIP; +#endif + +#if FEATURE_ETHERNET +extern ESPEasy::net::eth::ETH_NWPluginData_static_runtime eth_NWPluginData_static_runtime; #endif \ No newline at end of file diff --git a/src/ESPEasy/net/NWPluginStructs/NW003_data_struct_ETH_RMII.cpp b/src/ESPEasy/net/NWPluginStructs/NW003_data_struct_ETH_RMII.cpp index 1f5e7dd94..0628a105b 100644 --- a/src/ESPEasy/net/NWPluginStructs/NW003_data_struct_ETH_RMII.cpp +++ b/src/ESPEasy/net/NWPluginStructs/NW003_data_struct_ETH_RMII.cpp @@ -17,14 +17,11 @@ # include "../eth/ESPEasyEth.h" # define NW_PLUGIN_ID 3 -# define NW_PLUGIN_INTERFACE ETH namespace ESPEasy { namespace net { namespace eth { -static NWPluginData_static_runtime stats_and_cache(&NW_PLUGIN_INTERFACE); - // Keys as used in the Key-value-store # define NW003_KEY_ETH_INDEX 1 @@ -118,21 +115,13 @@ WebFormItemParams NW003_makeWebFormItemParams(uint32_t key) { return WebFormItemParams(label, id, storageType, key); } -NW003_data_struct_ETH_RMII::NW003_data_struct_ETH_RMII(networkIndex_t networkIndex) - : NWPluginData_base(nwpluginID_t(NW_PLUGIN_ID), networkIndex, &NW_PLUGIN_INTERFACE) -{ - stats_and_cache.clear(networkIndex); - - nw_event_id = Network.onEvent(NW003_data_struct_ETH_RMII::onEvent); -} +NW003_data_struct_ETH_RMII::NW003_data_struct_ETH_RMII(networkIndex_t networkIndex, NetworkInterface *netif) + : NWPluginData_base(nwpluginID_t(NW_PLUGIN_ID), networkIndex, netif) +{} NW003_data_struct_ETH_RMII::~NW003_data_struct_ETH_RMII() { - if (nw_event_id != 0) { - Network.removeEvent(nw_event_id); - } - nw_event_id = 0; - stats_and_cache.processEvent_and_clear(); + ESPEasy::net::eth::ETH_NWPluginData_static_runtime::exit(_networkIndex); } void NW003_data_struct_ETH_RMII::loadDefaults(ESPEasy_key_value_store *kvs, @@ -316,55 +305,27 @@ bool NW003_data_struct_ETH_RMII::init(EventStruct *event) { auto data = getNWPluginData_static_runtime(); - if (data) { - ESPEasy::net::eth::ETHConnectRelaxed(*data); + auto iface = ESPEasy::net::eth::ETH_NWPluginData_static_runtime::getInterface(_networkIndex); + + if (data && iface) { + ESPEasy::net::eth::ETHConnectRelaxed( + *iface, + *data); } return true; } bool NW003_data_struct_ETH_RMII::exit(EventStruct *event) { - ETH.end(); - stats_and_cache.processEvents(); return true; } -NWPluginData_static_runtime * NW003_data_struct_ETH_RMII::getNWPluginData_static_runtime() { return &stats_and_cache; } - -void NW003_data_struct_ETH_RMII::onEvent( - arduino_event_id_t event, - arduino_event_info_t info) -{ - switch (event) - { - case ARDUINO_EVENT_ETH_START: - stats_and_cache.mark_start(); - break; - case ARDUINO_EVENT_ETH_STOP: - stats_and_cache.mark_stop(); - break; - case ARDUINO_EVENT_ETH_CONNECTED: - stats_and_cache.mark_connected(); - break; - case ARDUINO_EVENT_ETH_DISCONNECTED: - stats_and_cache.mark_disconnected(); - break; - case ARDUINO_EVENT_ETH_GOT_IP: - stats_and_cache.mark_got_IP(); - break; -# if FEATURE_USE_IPV6 - case ARDUINO_EVENT_ETH_GOT_IP6: - stats_and_cache.mark_got_IPv6(&info.got_ip6); - break; -# endif // if FEATURE_USE_IPV6 - case ARDUINO_EVENT_ETH_LOST_IP: - stats_and_cache.mark_lost_IP(); - break; - - default: break; - } +NWPluginData_static_runtime * NW003_data_struct_ETH_RMII::getNWPluginData_static_runtime() { + return ESPEasy::net::eth::ETH_NWPluginData_static_runtime::getNWPluginData_static_runtime(_networkIndex); } + + } // namespace eth } // namespace net } // namespace ESPEasy diff --git a/src/ESPEasy/net/NWPluginStructs/NW003_data_struct_ETH_RMII.h b/src/ESPEasy/net/NWPluginStructs/NW003_data_struct_ETH_RMII.h index 38cf029e9..d3c47001f 100644 --- a/src/ESPEasy/net/NWPluginStructs/NW003_data_struct_ETH_RMII.h +++ b/src/ESPEasy/net/NWPluginStructs/NW003_data_struct_ETH_RMII.h @@ -3,6 +3,7 @@ #include "../_NWPlugin_Helper.h" #ifdef USES_NW003 +#include "../eth/ETH_NWPluginData_static_runtime.h" namespace ESPEasy { namespace net { @@ -25,7 +26,7 @@ struct NW003_data_struct_ETH_RMII : public NWPluginData_base { ESPEasy::net::nwpluginID_t nwPluginID); - NW003_data_struct_ETH_RMII(networkIndex_t networkIndex); + NW003_data_struct_ETH_RMII(networkIndex_t networkIndex, NetworkInterface *netif); ~NW003_data_struct_ETH_RMII(); void webform_load(EventStruct *event); @@ -41,16 +42,12 @@ struct NW003_data_struct_ETH_RMII : public NWPluginData_base { private: - static void onEvent(arduino_event_id_t event, - arduino_event_info_t info); static String formatGpioLabel(uint32_t key, PinSelectPurpose& purpose, bool shortNotation = false); - network_event_handle_t nw_event_id = 0; - }; diff --git a/src/ESPEasy/net/NWPluginStructs/NW004_data_struct_ETH_SPI.cpp b/src/ESPEasy/net/NWPluginStructs/NW004_data_struct_ETH_SPI.cpp index 6595fe8dc..1e9f3cbf9 100644 --- a/src/ESPEasy/net/NWPluginStructs/NW004_data_struct_ETH_SPI.cpp +++ b/src/ESPEasy/net/NWPluginStructs/NW004_data_struct_ETH_SPI.cpp @@ -17,13 +17,11 @@ # include "../eth/ESPEasyEth.h" # define NW_PLUGIN_ID 4 -# define NW_PLUGIN_INTERFACE ETH namespace ESPEasy { namespace net { namespace eth { -static NWPluginData_static_runtime stats_and_cache(&NW_PLUGIN_INTERFACE); // Keys as used in the Key-value-store # define NW004_KEY_ETH_INDEX 1 @@ -115,20 +113,14 @@ WebFormItemParams NW004_makeWebFormItemParams(uint32_t key) { return WebFormItemParams(label, id, storageType, key); } -NW004_data_struct_ETH_SPI::NW004_data_struct_ETH_SPI(networkIndex_t networkIndex) - : NWPluginData_base(nwpluginID_t(NW_PLUGIN_ID), networkIndex, &NW_PLUGIN_INTERFACE) +NW004_data_struct_ETH_SPI::NW004_data_struct_ETH_SPI(networkIndex_t networkIndex, NetworkInterface *netif) + : NWPluginData_base(nwpluginID_t(NW_PLUGIN_ID), networkIndex, netif) { - stats_and_cache.clear(networkIndex); - nw_event_id = Network.onEvent(NW004_data_struct_ETH_SPI::onEvent); } NW004_data_struct_ETH_SPI::~NW004_data_struct_ETH_SPI() { - if (nw_event_id != 0) { - Network.removeEvent(nw_event_id); - } - nw_event_id = 0; - stats_and_cache.processEvent_and_clear(); + ESPEasy::net::eth::ETH_NWPluginData_static_runtime::exit(_networkIndex); } void NW004_data_struct_ETH_SPI::loadDefaults(ESPEasy_key_value_store *kvs, @@ -270,8 +262,12 @@ bool NW004_data_struct_ETH_SPI::init(EventStruct *event) { auto data = getNWPluginData_static_runtime(); - if (data) { - ESPEasy::net::eth::ETHConnectRelaxed(*data); + auto iface = ESPEasy::net::eth::ETH_NWPluginData_static_runtime::getInterface(_networkIndex); + + if (data && iface) { + ESPEasy::net::eth::ETHConnectRelaxed( + *iface, + *data); } return true; @@ -279,47 +275,15 @@ bool NW004_data_struct_ETH_SPI::init(EventStruct *event) bool NW004_data_struct_ETH_SPI::exit(EventStruct *event) { - ETH.end(); - stats_and_cache.processEvents(); - return true; } -NWPluginData_static_runtime * NW004_data_struct_ETH_SPI::getNWPluginData_static_runtime() { return &stats_and_cache; } - -void NW004_data_struct_ETH_SPI::onEvent(arduino_event_id_t event, - arduino_event_info_t info) -{ - switch (event) - { - case ARDUINO_EVENT_ETH_START: - stats_and_cache.mark_start(); - break; - case ARDUINO_EVENT_ETH_STOP: - stats_and_cache.mark_stop(); - break; - case ARDUINO_EVENT_ETH_CONNECTED: - stats_and_cache.mark_connected(); - break; - case ARDUINO_EVENT_ETH_DISCONNECTED: - stats_and_cache.mark_disconnected(); - break; - case ARDUINO_EVENT_ETH_GOT_IP: - stats_and_cache.mark_got_IP(); - break; -# if FEATURE_USE_IPV6 - case ARDUINO_EVENT_ETH_GOT_IP6: - stats_and_cache.mark_got_IPv6(&info.got_ip6); - break; -# endif // if FEATURE_USE_IPV6 - case ARDUINO_EVENT_ETH_LOST_IP: - stats_and_cache.mark_lost_IP(); - break; - - default: break; - } +NWPluginData_static_runtime * NW004_data_struct_ETH_SPI::getNWPluginData_static_runtime() { + return ESPEasy::net::eth::ETH_NWPluginData_static_runtime::getNWPluginData_static_runtime(_networkIndex); } + + } // namespace eth } // namespace net } // namespace ESPEasy diff --git a/src/ESPEasy/net/NWPluginStructs/NW004_data_struct_ETH_SPI.h b/src/ESPEasy/net/NWPluginStructs/NW004_data_struct_ETH_SPI.h index f6ea81381..5d70e8841 100644 --- a/src/ESPEasy/net/NWPluginStructs/NW004_data_struct_ETH_SPI.h +++ b/src/ESPEasy/net/NWPluginStructs/NW004_data_struct_ETH_SPI.h @@ -3,6 +3,7 @@ #include "../_NWPlugin_Helper.h" #ifdef USES_NW004 +#include "../eth/ETH_NWPluginData_static_runtime.h" namespace ESPEasy { namespace net { @@ -25,7 +26,7 @@ struct NW004_data_struct_ETH_SPI : public NWPluginData_base { ESPEasy::net::nwpluginID_t nwPluginID); - NW004_data_struct_ETH_SPI(networkIndex_t networkIndex); + NW004_data_struct_ETH_SPI(networkIndex_t networkIndex, NetworkInterface *netif); ~NW004_data_struct_ETH_SPI(); void webform_load(EventStruct *event); diff --git a/src/ESPEasy/net/_NW003_ETH_RMII.cpp b/src/ESPEasy/net/_NW003_ETH_RMII.cpp index 86c98a81e..40dc75a0f 100644 --- a/src/ESPEasy/net/_NW003_ETH_RMII.cpp +++ b/src/ESPEasy/net/_NW003_ETH_RMII.cpp @@ -24,6 +24,7 @@ # include "../../src/WebServer/common.h" # include "../net/eth/ESPEasyEth.h" # include "../net/Globals/NWPlugins.h" +# include "../net/Globals/NetworkState.h" # include "../net/Helpers/_NWPlugin_Helper_webform.h" # include "../net/Helpers/_NWPlugin_init.h" # include "../net/Helpers/NW_info_writer.h" @@ -63,8 +64,8 @@ bool NWPlugin_003(NWPlugin::Function function, EventStruct *event, String& strin ESPEasy_key_value_store kvs; ESPEasy::net::eth::NW003_data_struct_ETH_RMII::loadDefaults( - &kvs, - event->NetworkIndex, + &kvs, + event->NetworkIndex, ESPEasy::net::nwpluginID_t(NWPLUGIN_ID_003)); break; @@ -79,7 +80,7 @@ bool NWPlugin_003(NWPlugin::Function function, EventStruct *event, String& strin # ifdef ESP32 case NWPlugin::Function::NWPLUGIN_GET_INTERFACE: { - event->networkInterface = Ð + event->networkInterface = ESPEasy::net::eth::ETH_NWPluginData_static_runtime::getInterface(event->NetworkIndex); success = event->networkInterface != nullptr; break; } @@ -87,25 +88,34 @@ bool NWPlugin_003(NWPlugin::Function function, EventStruct *event, String& strin case NWPlugin::Function::NWPLUGIN_WEBSERVER_SHOULD_RUN: { - success = ETH.connected(); + auto iface = ESPEasy::net::eth::ETH_NWPluginData_static_runtime::getInterface(event->NetworkIndex); + + if (iface) { + success = iface->connected(); + } break; } case NWPlugin::Function::NWPLUGIN_WEBFORM_SHOW_CONNECTED: { - success = write_Eth_Show_Connected(ETH, event->kvWriter); + auto iface = ESPEasy::net::eth::ETH_NWPluginData_static_runtime::getInterface(event->NetworkIndex); + + if (iface) { + success = write_Eth_Show_Connected(*iface, event->kvWriter); + } break; } case NWPlugin::Function::NWPLUGIN_WEBFORM_SHOW_HW_ADDRESS: { + auto iface = ESPEasy::net::eth::ETH_NWPluginData_static_runtime::getInterface(event->NetworkIndex); - if (isValid(Settings.ETH_Phy_Type) && !isSPI_EthernetType(Settings.ETH_Phy_Type)) { - success = ESPEasy::net::write_Eth_HW_Address(ETH, event->kvWriter); + if (iface) { + success = ESPEasy::net::write_Eth_HW_Address(*iface, event->kvWriter); } break; } -#ifndef LIMIT_BUILD_SIZE +# ifndef LIMIT_BUILD_SIZE case NWPlugin::Function::NWPLUGIN_WEBFORM_SHOW_PORT: { if (event->kvWriter) { @@ -123,7 +133,7 @@ bool NWPlugin_003(NWPlugin::Function function, EventStruct *event, String& strin } break; } -#endif +# endif // ifndef LIMIT_BUILD_SIZE case NWPlugin::Function::NWPLUGIN_WEBFORM_SAVE: { @@ -278,11 +288,15 @@ bool NWPlugin_003(NWPlugin::Function function, EventStruct *event, String& strin case NWPlugin::Function::NWPLUGIN_INIT: { - initNWPluginData(event->NetworkIndex, new (std::nothrow) ESPEasy::net::eth::NW003_data_struct_ETH_RMII(event->NetworkIndex)); - auto *NW_data = getNWPluginData(event->NetworkIndex); + auto iface = eth_NWPluginData_static_runtime.init(event->NetworkIndex); - if (NW_data) { - success = NW_data->init(event); + if (iface) { + initNWPluginData(event->NetworkIndex, new (std::nothrow) ESPEasy::net::eth::NW003_data_struct_ETH_RMII(event->NetworkIndex, iface)); + auto *NW_data = getNWPluginData(event->NetworkIndex); + + if (NW_data) { + success = NW_data->init(event); + } } break; } diff --git a/src/ESPEasy/net/_NW004_ETH_SPI.cpp b/src/ESPEasy/net/_NW004_ETH_SPI.cpp index 97edcdbb2..bd6f14923 100644 --- a/src/ESPEasy/net/_NW004_ETH_SPI.cpp +++ b/src/ESPEasy/net/_NW004_ETH_SPI.cpp @@ -24,6 +24,7 @@ # include "../../src/WebServer/Markup_Forms.h" # include "../../src/WebServer/common.h" # include "../net/Globals/NWPlugins.h" +# include "../net/Globals/NetworkState.h" # include "../net/Helpers/_NWPlugin_Helper_webform.h" # include "../net/Helpers/_NWPlugin_init.h" # include "../net/Helpers/NW_info_writer.h" @@ -58,8 +59,8 @@ bool NWPlugin_004(NWPlugin::Function function, EventStruct *event, String& strin ESPEasy_key_value_store kvs; ESPEasy::net::eth::NW004_data_struct_ETH_SPI::loadDefaults( - &kvs, - event->NetworkIndex, + &kvs, + event->NetworkIndex, ESPEasy::net::nwpluginID_t(NWPLUGIN_ID_004)); break; @@ -74,7 +75,7 @@ bool NWPlugin_004(NWPlugin::Function function, EventStruct *event, String& strin # ifdef ESP32 case NWPlugin::Function::NWPLUGIN_GET_INTERFACE: { - event->networkInterface = Ð + event->networkInterface = ESPEasy::net::eth::ETH_NWPluginData_static_runtime::getInterface(event->NetworkIndex); success = event->networkInterface != nullptr; break; } @@ -82,24 +83,34 @@ bool NWPlugin_004(NWPlugin::Function function, EventStruct *event, String& strin case NWPlugin::Function::NWPLUGIN_WEBSERVER_SHOULD_RUN: { - success = ETH.connected(); + auto iface = ESPEasy::net::eth::ETH_NWPluginData_static_runtime::getInterface(event->NetworkIndex); + + if (iface) { + success = iface->connected(); + } break; } case NWPlugin::Function::NWPLUGIN_WEBFORM_SHOW_CONNECTED: { - success = write_Eth_Show_Connected(ETH, event->kvWriter); + auto iface = ESPEasy::net::eth::ETH_NWPluginData_static_runtime::getInterface(event->NetworkIndex); + + if (iface) { + success = write_Eth_Show_Connected(*iface, event->kvWriter); + } break; } case NWPlugin::Function::NWPLUGIN_WEBFORM_SHOW_HW_ADDRESS: { - if (isValid(Settings.ETH_Phy_Type) && isSPI_EthernetType(Settings.ETH_Phy_Type)) { - success = ESPEasy::net::write_Eth_HW_Address(ETH, event->kvWriter); + auto iface = ESPEasy::net::eth::ETH_NWPluginData_static_runtime::getInterface(event->NetworkIndex); + + if (iface) { + success = ESPEasy::net::write_Eth_HW_Address(*iface, event->kvWriter); } break; } -#ifndef LIMIT_BUILD_SIZE +# ifndef LIMIT_BUILD_SIZE case NWPlugin::Function::NWPLUGIN_WEBFORM_SHOW_PORT: { if (event->kvWriter) { @@ -124,7 +135,7 @@ bool NWPlugin_004(NWPlugin::Function function, EventStruct *event, String& strin } break; } -#endif +# endif // ifndef LIMIT_BUILD_SIZE case NWPlugin::Function::NWPLUGIN_WEBFORM_SAVE: { @@ -237,11 +248,15 @@ bool NWPlugin_004(NWPlugin::Function function, EventStruct *event, String& strin case NWPlugin::Function::NWPLUGIN_INIT: { - initNWPluginData(event->NetworkIndex, new (std::nothrow) ESPEasy::net::eth::NW004_data_struct_ETH_SPI(event->NetworkIndex)); - auto *NW_data = getNWPluginData(event->NetworkIndex); + auto iface = eth_NWPluginData_static_runtime.init(event->NetworkIndex); - if (NW_data) { - success = NW_data->init(event); + if (iface) { + initNWPluginData(event->NetworkIndex, new (std::nothrow) ESPEasy::net::eth::NW004_data_struct_ETH_SPI(event->NetworkIndex, iface)); + auto *NW_data = getNWPluginData(event->NetworkIndex); + + if (NW_data) { + success = NW_data->init(event); + } } break; } diff --git a/src/ESPEasy/net/eth/ESPEasyEth.cpp b/src/ESPEasy/net/eth/ESPEasyEth.cpp index 83d62b47d..0144e7132 100644 --- a/src/ESPEasy/net/eth/ESPEasyEth.cpp +++ b/src/ESPEasy/net/eth/ESPEasyEth.cpp @@ -67,15 +67,6 @@ bool ethCheckSettings() { ); // Some boards have fixed power } -bool ethPrepare() { - char hostname[40]; - - safe_strncpy(hostname, NetworkCreateRFCCompliantHostname().c_str(), sizeof(hostname)); - ETH.setHostname(hostname); - ethSetupStaticIPconfig(); - return true; -} - void ethPrintSettings() { if (loglevelActiveFor(LOG_LEVEL_INFO)) { String log; @@ -89,11 +80,12 @@ void ethPrintSettings() { log += Settings.ETH_Phy_Addr; # if CONFIG_ETH_USE_ESP32_EMAC && FEATURE_ETHERNET + if (!isSPI_EthernetType(Settings.ETH_Phy_Type)) { log += F(" Eth Clock mode: "); log += ESPEasy::net::toString(Settings.ETH_Clock_Mode); } -#endif +# endif // if CONFIG_ETH_USE_ESP32_EMAC && FEATURE_ETHERNET log += strformat(isSPI_EthernetType(Settings.ETH_Phy_Type) ? F(" CS: %d IRQ: %d RST: %d") : F(" MDC: %d MIO: %d PWR: %d"), Settings.ETH_Pin_mdc_cs, @@ -106,17 +98,18 @@ void ethPrintSettings() { MAC_address ETHMacAddress() { MAC_address mac; -/* - if (!EthEventData.ethInitSuccess) { - addLog(LOG_LEVEL_ERROR, F("Call NetworkMacAddress() only on connected Ethernet!")); - } else { - ETH.macAddress(mac.mac); - } - */ + + /* + if (!EthEventData.ethInitSuccess) { + addLog(LOG_LEVEL_ERROR, F("Call NetworkMacAddress() only on connected Ethernet!")); + } else { + ETH.macAddress(mac.mac); + } + */ return mac; } -bool ETHConnectRelaxed(NWPluginData_static_runtime& runtimeData) { +bool ETHConnectRelaxed(ETHClass& iface, NWPluginData_static_runtime& runtimeData) { if (runtimeData.started() && runtimeData.connected()) { return EthLinkUp(); } @@ -130,24 +123,24 @@ bool ETHConnectRelaxed(NWPluginData_static_runtime& runtimeData) { } ethPower(runtimeData, true); - runtimeData.mark_begin_establish_connection(); + runtimeData.mark_begin_establish_connection(); bool success = runtimeData.started(); if (!success) { -# if FEATURE_USE_IPV6 +# if FEATURE_USE_IPV6 if (Settings.EnableIPv6()) { - ETH.enableIPv6(true); + iface.enableIPv6(true); } -# endif // if FEATURE_USE_IPV6 +# endif // if FEATURE_USE_IPV6 if (isSPI_EthernetType(Settings.ETH_Phy_Type)) { spi_host_device_t SPI_host = Settings.getSPI_host(); if (SPI_host == spi_host_device_t::SPI_HOST_MAX) { addLog(LOG_LEVEL_ERROR, F("SPI not enabled")); - # ifdef ESP32C3 + # ifdef ESP32C3 // FIXME TD-er: Fallback for ETH01-EVO board SPI_host = spi_host_device_t::SPI2_HOST; @@ -155,21 +148,21 @@ bool ETHConnectRelaxed(NWPluginData_static_runtime& runtimeData) { Settings.SPI_SCLK_pin = 7; Settings.SPI_MISO_pin = 3; Settings.SPI_MOSI_pin = 10; - # endif // ifdef ESP32C3 + # endif // ifdef ESP32C3 } // else { -# if ETH_SPI_SUPPORTS_CUSTOM - success = ETH.begin( +# if ETH_SPI_SUPPORTS_CUSTOM + success = iface.begin( to_ESP_phy_type(Settings.ETH_Phy_Type), Settings.ETH_Phy_Addr, Settings.ETH_Pin_mdc_cs, Settings.ETH_Pin_mdio_irq, Settings.ETH_Pin_power_rst, SPI); -# else // if ETH_SPI_SUPPORTS_CUSTOM - success = ETH.begin( +# else // if ETH_SPI_SUPPORTS_CUSTOM + success = iface.begin( to_ESP_phy_type(Settings.ETH_Phy_Type), Settings.ETH_Phy_Addr, Settings.ETH_Pin_mdc_cs, @@ -179,21 +172,21 @@ bool ETHConnectRelaxed(NWPluginData_static_runtime& runtimeData) { static_cast(Settings.SPI_SCLK_pin), static_cast(Settings.SPI_MISO_pin), static_cast(Settings.SPI_MOSI_pin)); -# endif // if ETH_SPI_SUPPORTS_CUSTOM +# endif // if ETH_SPI_SUPPORTS_CUSTOM } } else { -# if CONFIG_ETH_USE_ESP32_EMAC && FEATURE_ETHERNET -# ifndef ESP32P4 +# if CONFIG_ETH_USE_ESP32_EMAC && FEATURE_ETHERNET +# ifndef ESP32P4 ethResetGPIOpins(); -# endif - success = ETH.begin( +# endif + success = iface.begin( to_ESP_phy_type(Settings.ETH_Phy_Type), Settings.ETH_Phy_Addr, Settings.ETH_Pin_mdc_cs, Settings.ETH_Pin_mdio_irq, Settings.ETH_Pin_power_rst, (eth_clock_mode_t)Settings.ETH_Clock_Mode); -# endif // if CONFIG_ETH_USE_ESP32_EMAC && FEATURE_ETHERNET +# endif // if CONFIG_ETH_USE_ESP32_EMAC && FEATURE_ETHERNET } } @@ -205,20 +198,20 @@ bool ETHConnectRelaxed(NWPluginData_static_runtime& runtimeData) { # if ESP_IDF_VERSION_MAJOR < 5 addLog(LOG_LEVEL_INFO, strformat( F("ETH : MAC: %s speed: %dM %s Link: %s"), - ETH.macAddress().c_str(), - ETH.linkSpeed(), - String(ETH.fullDuplex() ? F("Full Duplex") : F("Half Duplex")).c_str(), - String(ETH.linkUp() ? F("Up") : F("Down")).c_str())); + iface.macAddress().c_str(), + iface.linkSpeed(), + String(iface.fullDuplex() ? F("Full Duplex") : F("Half Duplex")).c_str(), + String(iface.linkUp() ? F("Up") : F("Down")).c_str())); # else // if ESP_IDF_VERSION_MAJOR < 5 addLog(LOG_LEVEL_INFO, strformat( F("ETH : MAC: %s phy addr: %d speed: %dM %s Link: %s"), - ETH.macAddress().c_str(), - ETH.phyAddr(), - ETH.linkSpeed(), + iface.macAddress().c_str(), + iface.phyAddr(), + iface.linkSpeed(), concat( - ETH.fullDuplex() ? F("Full Duplex") : F("Half Duplex"), - ETH.autoNegotiation() ? F("(auto)") : F("")).c_str(), - String(ETH.linkUp() ? F("Up") : F("Down")).c_str())); + iface.fullDuplex() ? F("Full Duplex") : F("Half Duplex"), + iface.autoNegotiation() ? F("(auto)") : F("")).c_str(), + String(iface.linkUp() ? F("Up") : F("Down")).c_str())); # endif // if ESP_IDF_VERSION_MAJOR < 5 } @@ -244,24 +237,24 @@ void ethPower(NWPluginData_static_runtime& runtimeData, bool enable) { } addLog(LOG_LEVEL_INFO, enable ? F("ETH power ON") : F("ETH power OFF")); -/* - if (!enable) { - EthEventData.ethInitSuccess = false; - EthEventData.clearAll(); - # ifdef ESP_IDF_VERSION_MAJOR + /* + if (!enable) { + EthEventData.ethInitSuccess = false; + EthEventData.clearAll(); + # ifdef ESP_IDF_VERSION_MAJOR - // FIXME TD-er: See: https://github.com/espressif/arduino-esp32/issues/6105 - // Need to store the last link state, as it will be cleared after destructing the object. - EthEventData.setEthDisconnected(); + // FIXME TD-er: See: https://github.com/espressif/arduino-esp32/issues/6105 + // Need to store the last link state, as it will be cleared after destructing the object. + EthEventData.setEthDisconnected(); - if (ETH.linkUp()) { - EthEventData.setEthConnected(); - } - # endif // ifdef ESP_IDF_VERSION_MAJOR + if (ETH.linkUp()) { + EthEventData.setEthConnected(); + } + # endif // ifdef ESP_IDF_VERSION_MAJOR - // ETH = ETHClass(); - } -*/ + // ETH = ETHClass(); + } + */ if (enable) { // ethResetGPIOpins(); @@ -329,8 +322,9 @@ void ethResetGPIOpins() { } bool ETHConnected() { - auto data = getFirst_ETH_NWPluginData_static_runtime(); - if (data) return data->connected(); + auto data = getFirst_Enabled_ETH_interface(); + + if (data) { return data->connected(); } return false; } diff --git a/src/ESPEasy/net/eth/ESPEasyEth.h b/src/ESPEasy/net/eth/ESPEasyEth.h index d63fd5dad..fdaab5566 100644 --- a/src/ESPEasy/net/eth/ESPEasyEth.h +++ b/src/ESPEasy/net/eth/ESPEasyEth.h @@ -10,6 +10,8 @@ # include +#include + namespace ESPEasy { namespace net { namespace eth { @@ -17,9 +19,8 @@ namespace eth { bool ethUseStaticIP(); void ethSetupStaticIPconfig(); bool ethCheckSettings(); -bool ethPrepare(); void ethPrintSettings(); -bool ETHConnectRelaxed(NWPluginData_static_runtime& runtimeData); +bool ETHConnectRelaxed(ETHClass& iface, NWPluginData_static_runtime& runtimeData); bool ETHConnected(); void ethPower(NWPluginData_static_runtime& runtimeData, bool enable); void ethResetGPIOpins(); diff --git a/src/ESPEasy/net/eth/ETH_NWPluginData_static_runtime.cpp b/src/ESPEasy/net/eth/ETH_NWPluginData_static_runtime.cpp new file mode 100644 index 000000000..2c31675f8 --- /dev/null +++ b/src/ESPEasy/net/eth/ETH_NWPluginData_static_runtime.cpp @@ -0,0 +1,254 @@ +#include "../eth/ETH_NWPluginData_static_runtime.h" + +#if FEATURE_ETHERNET + + +# include "../../../src/Helpers/StringConverter.h" + + +namespace ESPEasy { +namespace net { +namespace eth { + +struct ETH_stats_and_cache_t { + ETH_stats_and_cache_t(uint8_t eth_index, networkIndex_t networkIndex) : + _networkIndex(networkIndex), + _eth_index(eth_index), + _eth(eth_index), + _stats_and_cache(&_eth, concat(F("eth"), eth_index)) { + _stats_and_cache.clear(networkIndex); + if (_eth.getStatusBits() & ESP_NETIF_STARTED_BIT) { + // Bit has been set, so it might be for this interface + _stats_and_cache.mark_start(); + } + } + + ~ETH_stats_and_cache_t() { + _eth.end(); + _stats_and_cache.processEvent_and_clear(); + } + + void mark_start() + { + if (_eth.getStatusBits() & ESP_NETIF_STARTED_BIT) { + // Bit has been set, so it might be for this interface + _stats_and_cache.mark_start(); + _eth.enableIPv6(_stats_and_cache._enableIPv6); + } + } + + void mark_stop() + { + constexpr int bitmask = ESP_NETIF_STARTED_BIT | + ESP_NETIF_CONNECTED_BIT | + ESP_NETIF_HAS_IP_BIT | + ESP_NETIF_HAS_LOCAL_IP6_BIT | + ESP_NETIF_HAS_GLOBAL_IP6_BIT | + ESP_NETIF_HAS_STATIC_IP_BIT; + + if ((_eth.getStatusBits() & bitmask) == 0) { + // Bits have been cleared, so it might be for this interface + _stats_and_cache.mark_stop(); + } + } + + void mark_got_IP(ip_event_got_ip_t *event) + { + if (event && (_eth.netif() == event->esp_netif)) + { + _stats_and_cache.mark_got_IP(); + } + } + +# if FEATURE_USE_IPV6 + + void mark_got_IPv6(ip_event_got_ip6_t *event) + { + if (event && (_eth.netif() == event->esp_netif)) + { + _stats_and_cache.mark_got_IPv6(event); + } + } + +# endif // if FEATURE_USE_IPV6 + + void mark_lost_IP() + { + if ((_eth.getStatusBits() & ESP_NETIF_HAS_IP_BIT) == 0) { + // Bit has been cleared, so it might be for this interface + _stats_and_cache.mark_lost_IP(); + } + } + + void mark_connected(esp_eth_handle_t eth_connected) + { + if (_eth.handle() == eth_connected) { + _stats_and_cache.mark_connected(); + } + } + + void mark_disconnected() + { + constexpr int bitmask = ESP_NETIF_CONNECTED_BIT | + ESP_NETIF_HAS_IP_BIT | + ESP_NETIF_HAS_LOCAL_IP6_BIT | + ESP_NETIF_HAS_GLOBAL_IP6_BIT; + + if ((_eth.getStatusBits() & bitmask) == 0) { + // Bits have been cleared, so it might be for this interface + _stats_and_cache.mark_disconnected(); + } + } + + const networkIndex_t _networkIndex; + + const uint8_t _eth_index; + ETHClass _eth; + NWPluginData_static_runtime _stats_and_cache; + +}; + +DEF_UP(ETH_stats_and_cache_t); + + +UP_ETH_stats_and_cache_t ETH_stats_and_cache[3]{}; + +ETH_stats_and_cache_t* getStatsAndCache(networkIndex_t networkIndex) +{ + for (size_t i = 0; i < NR_ELEMENTS(ETH_stats_and_cache); ++i) { + if (ETH_stats_and_cache[i] && (ETH_stats_and_cache[i]->_networkIndex == networkIndex)) { + return ETH_stats_and_cache[i].get(); + } + } + return nullptr; +} + +ETH_NWPluginData_static_runtime::ETH_NWPluginData_static_runtime() +{ + nw_event_id = Network.onEvent(ETH_NWPluginData_static_runtime::onEvent); +} + +ETH_NWPluginData_static_runtime::~ETH_NWPluginData_static_runtime() +{ + if (nw_event_id != 0) { + Network.removeEvent(nw_event_id); + } + nw_event_id = 0; +} + +ETHClass * ETH_NWPluginData_static_runtime::getInterface(networkIndex_t networkIndex) +{ + auto data = getStatsAndCache(networkIndex); + + if (data) { return &data->_eth; } + + return nullptr; +} + +NWPluginData_static_runtime * ETH_NWPluginData_static_runtime::getNWPluginData_static_runtime(networkIndex_t networkIndex) +{ + auto data = getStatsAndCache(networkIndex); + + if (data) { return &data->_stats_and_cache; } + + return nullptr; +} + +ETHClass * ETH_NWPluginData_static_runtime::init(networkIndex_t networkIndex) +{ + auto data = getStatsAndCache(networkIndex); + + if (data) { + // TODO TD-er: What to do here? This should not occur + return &data->_eth; + } + + for (size_t i = 0; i < NR_ELEMENTS(ETH_stats_and_cache); ++i) { + if (!ETH_stats_and_cache[i]) { + // Found an empty slot + if (nw_event_id != 0) { + Network.removeEvent(nw_event_id); + } + + ETH_stats_and_cache[i].reset(new (std::nothrow) ETH_stats_and_cache_t(i, networkIndex)); + nw_event_id = Network.onEvent(ETH_NWPluginData_static_runtime::onEvent); + + if (ETH_stats_and_cache[i]) { return Ð_stats_and_cache[i]->_eth; } + return nullptr; + } + } + return nullptr; +} + +void ETH_NWPluginData_static_runtime::exit(networkIndex_t networkIndex) +{ + for (size_t i = 0; i < NR_ELEMENTS(ETH_stats_and_cache); ++i) { + if (ETH_stats_and_cache[i] && (ETH_stats_and_cache[i]->_networkIndex == networkIndex)) { + ETH_stats_and_cache[i].reset(nullptr); + return; + } + } +} + +void ETH_NWPluginData_static_runtime::onEvent( + arduino_event_id_t event, + arduino_event_info_t info) +{ + switch (event) + { + case ARDUINO_EVENT_ETH_START: + + for (size_t i = 0; i < NR_ELEMENTS(ETH_stats_and_cache); ++i) { + if (ETH_stats_and_cache[i]) { ETH_stats_and_cache[i]->mark_start(); } + } + break; + case ARDUINO_EVENT_ETH_STOP: + + for (size_t i = 0; i < NR_ELEMENTS(ETH_stats_and_cache); ++i) { + if (ETH_stats_and_cache[i]) { ETH_stats_and_cache[i]->mark_stop(); } + } + break; + case ARDUINO_EVENT_ETH_CONNECTED: + + for (size_t i = 0; i < NR_ELEMENTS(ETH_stats_and_cache); ++i) { + if (ETH_stats_and_cache[i]) { ETH_stats_and_cache[i]->mark_connected(info.eth_connected); } + } + break; + case ARDUINO_EVENT_ETH_DISCONNECTED: + + for (size_t i = 0; i < NR_ELEMENTS(ETH_stats_and_cache); ++i) { + if (ETH_stats_and_cache[i]) { ETH_stats_and_cache[i]->mark_disconnected(); } + } + + break; + case ARDUINO_EVENT_ETH_GOT_IP: + + for (size_t i = 0; i < NR_ELEMENTS(ETH_stats_and_cache); ++i) { + if (ETH_stats_and_cache[i]) { ETH_stats_and_cache[i]->mark_got_IP(&info.got_ip); } + } + break; +# if FEATURE_USE_IPV6 + case ARDUINO_EVENT_ETH_GOT_IP6: + + for (size_t i = 0; i < NR_ELEMENTS(ETH_stats_and_cache); ++i) { + if (ETH_stats_and_cache[i]) { ETH_stats_and_cache[i]->mark_got_IPv6(&info.got_ip6); } + } + break; +# endif // if FEATURE_USE_IPV6 + case ARDUINO_EVENT_ETH_LOST_IP: + + for (size_t i = 0; i < NR_ELEMENTS(ETH_stats_and_cache); ++i) { + if (ETH_stats_and_cache[i]) { ETH_stats_and_cache[i]->mark_lost_IP(); } + } + break; + + default: break; + } +} + +} // namespace eth +} // namespace net +} // namespace ESPEasy + + +#endif // if FEATURE_ETHERNET diff --git a/src/ESPEasy/net/eth/ETH_NWPluginData_static_runtime.h b/src/ESPEasy/net/eth/ETH_NWPluginData_static_runtime.h new file mode 100644 index 000000000..b3cce3da0 --- /dev/null +++ b/src/ESPEasy/net/eth/ETH_NWPluginData_static_runtime.h @@ -0,0 +1,46 @@ +#pragma once + +#include "../../../ESPEasy_common.h" + +#if FEATURE_ETHERNET +# include "../DataStructs/NWPluginData_static_runtime.h" + +# include + +namespace ESPEasy { +namespace net { +namespace eth { + + +class ETH_NWPluginData_static_runtime +{ +public: + + ETH_NWPluginData_static_runtime(); + + ~ETH_NWPluginData_static_runtime(); + + static ETHClass* getInterface(networkIndex_t networkIndex); + + static NWPluginData_static_runtime* getNWPluginData_static_runtime(networkIndex_t networkIndex); + + ETHClass* init(networkIndex_t networkIndex); + + static void exit(networkIndex_t networkIndex); + +private: + + static void onEvent(arduino_event_id_t event, + arduino_event_info_t info); + + + network_event_handle_t nw_event_id = 0; + + +}; // class ETH_NWPluginData_static_runtime + +} // namespace eth +} // namespace net +} // namespace ESPEasy + +#endif // if FEATURE_ETHERNET From 21c591e6ad2ee6bcdcde93123e72ef583d6dc7ef Mon Sep 17 00:00:00 2001 From: Ton Huisman Date: Mon, 3 Nov 2025 21:56:17 +0100 Subject: [PATCH 444/564] [P021] Code optimizations --- src/_P021_Level.ino | 244 +++++++++-------------- src/src/PluginStructs/P021_data_struct.h | 20 ++ 2 files changed, 116 insertions(+), 148 deletions(-) diff --git a/src/_P021_Level.ino b/src/_P021_Level.ino index 9d6230a3c..85ccc4441 100644 --- a/src/_P021_Level.ino +++ b/src/_P021_Level.ino @@ -8,19 +8,24 @@ // Original intention to control a level by opening a valve or switching a pump // Extended by timer based state control to support pumps with additional requirements (floor heating ciculation pump) -// Changelog: -// 2025-05-21, tonhuisman: Add support for MQTT Discovery and MQTT Device Class user-configuration -// 2024-12-14, tonhuisman: Move most defines to .h file to avoid compiler warnings, as Arduino doesn't support #ifdef in .ino files -// Format source using Uncrustify -// Remove unneeded includes -// 2024-07-07, flashmark: Reworked to support floor heating pump (added state machine control) -// 2023-03-13, tonhuisman: Add setting to invert the Output state -// 2022-08-22, tonhuisman: Add setting to auto-save a changed setting after x minutes, size optimizations, add PCONFIG defines -// 2021-12-29, tonhuisman: Add setting to enable/disable saving the settings when the Set Level value is changed using the config -// command -// 2021-12-28, tonhuisman: Avoid saving settings if no change on config command https://github.com/letscontrolit/ESPEasy/issues/3477, -// cleanup source, prevent crashing when hysteresis is 0.0, run Uncrustify source formatter, -// apply float/double math compare functions instead of regular comparisons +/** Changelog: + * 2025-11-03 tonhuisman: Unify changelog format + * Use enum class instead of regular enum for compile-time validations + * Replace switch by if where possible/useful for code-size reduction + * Minor code cleanup + * 2025-05-21 tonhuisman: Add support for MQTT Discovery and MQTT Device Class user-configuration + * 2024-12-14 tonhuisman: Move most defines to .h file to avoid compiler warnings, as Arduino doesn't support #ifdef in .ino files + * Format source using Uncrustify + * Remove unneeded includes + * 2024-07-07 flashmark: Reworked to support floor heating pump (added state machine control) + * 2023-03-13 tonhuisman: Add setting to invert the Output state + * 2022-08-22 tonhuisman: Add setting to auto-save a changed setting after x minutes, size optimizations, add PCONFIG defines + * 2021-12-29 tonhuisman: Add setting to enable/disable saving the settings when the Set Level value is changed using the config + * command + * 2021-12-28 tonhuisman: Avoid saving settings if no change on config command https://github.com/letscontrolit/ESPEasy/issues/3477, + * cleanup source, prevent crashing when hysteresis is 0.0, run Uncrustify source formatter, + * apply float/double math compare functions instead of regular comparisons + */ // NOTE: Due to lack of flash memory for most ESP8266 builds the extensions are only available on a limited set of builds. // Code size and functionality is controlled by several build flags: @@ -73,26 +78,6 @@ int seconds2hours(int x) { # endif // ifndef P021_MIN_BUILD_SIZE -// Operation modes for the control algorithm -enum P021_opmode -{ - P021_OPMODE_CLASSIC, // Original, stateless control - P021_OPMODE_OFF, // Output is fully shut down, no forced curculation - P021_OPMODE_STANDBY, // Output is only switched on for forced maintenance runs - P021_OPMODE_ON, // Output is always switched on - P021_OPMODE_TEMP, // Control algorithm based on temperature only - P021_OPMODE_REMOTE // Both temperature and remote command can switch on Output -}; - -// Control state for the control algorithm -enum P021_control_state -{ - P021_STATE_IDLE, // Output is inactive - P021_STATE_ACTIVE, // Output is active due to level control (based on input value) - P021_STATE_EXTEND, // Output is active due to minimum duration - P021_STATE_FORCE // Output is forced active due to maximum inactive duration is exceeded -}; - // Static storage for global state info. Track per ESPeasy plugin instance static bool P021_remote[TASKS_MAX]; // Static storage for remote control. // Static storage for last change timestamp. Not required with extended features disabled @@ -149,19 +134,18 @@ boolean Plugin_021(uint8_t function, struct EventStruct *event, String& string) case PLUGIN_SET_DEFAULTS: { - P021_DONT_ALWAYS_SAVE = 1; // Do not save - P021_GPIO_RELAY = -1; // GPIO for relay output not assigned - P021_CHECK_TASK = -1; // No input source assigned - P021_CHECK_VALUE = -1; // No input source assigned - P021_SETPOINT = 25.0f; // Switch output active above 25 [deg C] - P021_HYSTERESIS = 5.0f; // Switch off hysteresis 5 [deg C] below switch on value - P021_MIN_TIME = 30 * 60; // Once switched on output should be active at least 30 [min] - P021_INTERVAL_TIME = 24 * 60 * 60; // Output shall run after 24 [hour] stand still - P021_FORCE_TIME = 5 * 30; // Forced circulation for 5 [min] - P021_OPMODE = P021_OPMODE_OFF; // Don't touch output unless selected by operator - P021_FLAGS = 0; // Reset all flags - // UserVar.setFloat(event->TaskIndex, P021_VALUE_STATE, (float)P021_STATE_IDLE); - // P021_remote[event->TaskIndex] = 0; // Remote control state is "off" + P021_DONT_ALWAYS_SAVE = 1; // Do not save + P021_GPIO_RELAY = -1; // GPIO for relay output not assigned + P021_CHECK_TASK = -1; // No input source assigned + P021_CHECK_VALUE = -1; // No input source assigned + P021_SETPOINT = 25.0f; // Switch output active above 25 [deg C] + P021_HYSTERESIS = 5.0f; // Switch off hysteresis 5 [deg C] below switch on value + P021_MIN_TIME = 30 * 60; // Once switched on output should be active at least 30 [min] + P021_INTERVAL_TIME = 24 * 60 * 60; // Output shall run after 24 [hour] stand still + P021_FORCE_TIME = 5 * 30; // Forced circulation for 5 [min] + // Don't touch output unless selected by operator + P021_OPMODE = static_cast(P021_opmode::P021_OPMODE_OFF); + P021_FLAGS = 0; // Reset all flags break; } @@ -187,19 +171,19 @@ boolean Plugin_021(uint8_t function, struct EventStruct *event, String& string) # endif // if FEATURE_P021_EXTRAS >= 1 // For debugging purposes the webform provides some internal data - # ifdef PLUGIN_021_DEBUG + # if (FEATURE_P021_EXTRAS >= 1) && defined(PLUGIN_021_DEBUG) { const P021_control_state control_state = (P021_control_state)UserVar.getFloat(event->TaskIndex, P021_VALUE_STATE); // Add some debug information const String outpstring = essentiallyZero(UserVar.getFloat(event->TaskIndex, P021_VALUE_OUTPUT)) ? F("off") : F("on"); addFormNote(strformat(F("State= %s, Output= %s, Remote= %d, Timer= %d sec"), - P021_printControlState(control_state), + FsP(P021_printControlState(static_cast(control_state))), outpstring.c_str(), P021_remote[event->TaskIndex], millis2seconds(timePassedSince(P021_timestamp[event->TaskIndex])))); } - # endif // ifdef PLUGIN_021_DEBUG + # endif // if (FEATURE_P021_EXTRAS >= 1) && defined(PLUGIN_021_DEBUG) const taskIndex_t check_task = P021_CHECK_TASK; // Optimze reference addRowLabel(F("Input Task")); @@ -250,10 +234,6 @@ boolean Plugin_021(uint8_t function, struct EventStruct *event, String& string) // FormSelector with all operation mode options const __FlashStringHelper *options[] = { F("Classic"), F("Off"), F("Standby"), F("On"), F("Local"), F("Remote") }; - /* - const int optionValues[] = - { P021_OPMODE_CLASSIC, P021_OPMODE_OFF, P021_OPMODE_STANDBY, P021_OPMODE_ON, P021_OPMODE_TEMP, P021_OPMODE_REMOTE }; - */ constexpr size_t optionCount = NR_ELEMENTS(options); const FormSelectorOptions selector(optionCount, options /*, optionValues*/); selector.addFormSelector(F("Control mode"), F(P021_GUID_OPMODE), P021_OPMODE); @@ -388,12 +368,12 @@ boolean Plugin_021(uint8_t function, struct EventStruct *event, String& string) // Set extended parameters to backwards compatible values when extension is disabled if (!newExtFunct) { - P021_OPMODE = P021_OPMODE_CLASSIC; // Switch to classic control algorithm - bitWrite(flags, P021_INV_INPUT, false); // Standard input direction - bitWrite(flags, P021_SYM_HYSTERESIS, true); // Symetrical hysteresis - bitWrite(flags, P021_SLOW_EVAL, false); // 10Hz evaluation - bitWrite(flags, P021_STATE_OUTP, false); // Don't provide state as value - // Keep al other extra settings, thay should not affect CLASSIC mode + P021_OPMODE = static_cast(P021_opmode::P021_OPMODE_CLASSIC); // Switch to classic control algorithm + bitWrite(flags, P021_INV_INPUT, false); // Standard input direction + bitWrite(flags, P021_SYM_HYSTERESIS, true); // Symetrical hysteresis + bitWrite(flags, P021_SLOW_EVAL, false); // 10Hz evaluation + bitWrite(flags, P021_STATE_OUTP, false); // Don't provide state as value + // Keep al other extra settings, they should not affect CLASSIC mode } bitWrite(flags, P021_EXT_FUNCT, newExtFunct); @@ -421,7 +401,7 @@ boolean Plugin_021(uint8_t function, struct EventStruct *event, String& string) const bool isRemote = equals(command, F("remote")); if (isRemote) { - P021_remote[event->TaskIndex] = !essentiallyZero(result); + P021_remote[event->TaskIndex] = !essentiallyZero(result); // FIXME result is always 0.0 here!? } # endif // ifndef P021_MIN_BUILD_SIZE @@ -490,7 +470,7 @@ boolean Plugin_021(uint8_t function, struct EventStruct *event, String& string) // I am not sure we want to reset the state at every init. // UserVar seems to be persistent - UserVar.setFloat(event->TaskIndex, P021_VALUE_STATE, (float)P021_STATE_IDLE); + UserVar.setFloat(event->TaskIndex, P021_VALUE_STATE, (float)P021_control_state::P021_STATE_IDLE); P021_remote[event->TaskIndex] = false; // Remote control state is "off" # if FEATURE_P021_EXTRAS >= 1 P021_timestamp[event->TaskIndex] = millis(); // Initialize last switching time @@ -506,9 +486,9 @@ boolean Plugin_021(uint8_t function, struct EventStruct *event, String& string) // this case defines code to be executed when the plugin executes an action (command). // Commands can be accessed via rules or via http. // As an example, http://192.168.1.12//control?cmd=dothis - // implies that there exists the comamnd "dothis" + // implies that there exists the command "dothis" // Expected commands: - // * levelcontrol,remote, [on|off] + // * levelcontrol,remote, [1|0] (1=on, 0=off) # if FEATURE_P021_EXTRAS >= 1 @@ -571,14 +551,14 @@ boolean Plugin_021(uint8_t function, struct EventStruct *event, String& string) # ifdef PLUGIN_021_DEBUG const __FlashStringHelper* P021_printControlState(int state) { - switch (state) + switch (static_cast(state)) { - case P021_STATE_IDLE: return F("Idle"); - case P021_STATE_ACTIVE: return F("Active"); - case P021_STATE_EXTEND: return F("Extend"); - case P021_STATE_FORCE: return F("Force"); - default: return F("***ERROR***"); + case P021_control_state::P021_STATE_IDLE: return F("Idle"); + case P021_control_state::P021_STATE_ACTIVE: return F("Active"); + case P021_control_state::P021_STATE_EXTEND: return F("Extend"); + case P021_control_state::P021_STATE_FORCE: return F("Force"); } + return F(""); } # endif // ifdef PLUGIN_021_DEBUG @@ -589,16 +569,16 @@ const __FlashStringHelper* P021_printControlState(int state) # ifdef PLUGIN_021_DEBUG const __FlashStringHelper* P021_printControlMode(int mode) { - switch (mode) + switch (static_cast(mode)) { - case P021_OPMODE_CLASSIC: return F("Classic"); - case P021_OPMODE_OFF: return F("Off"); - case P021_OPMODE_STANDBY: return F("Standby"); - case P021_OPMODE_ON: return F("On"); - case P021_OPMODE_TEMP: return F("Local"); - case P021_OPMODE_REMOTE: return F("Remote"); - default: return F("***ERROR***"); + case P021_opmode::P021_OPMODE_CLASSIC: return F("Classic"); + case P021_opmode::P021_OPMODE_OFF: return F("Off"); + case P021_opmode::P021_OPMODE_STANDBY: return F("Standby"); + case P021_opmode::P021_OPMODE_ON: return F("On"); + case P021_opmode::P021_OPMODE_TEMP: return F("Local"); + case P021_opmode::P021_OPMODE_REMOTE: return F("Remote"); } + return F(""); } # endif // ifdef PLUGIN_021_DEBUG @@ -666,50 +646,50 @@ void P021_evaluate(struct EventStruct *event) value = UserVar.getFloat(TaskIndex, P021_CHECK_VALUE); } - switch ((P021_opmode)(P021_OPMODE)) + switch (static_cast(P021_OPMODE)) { // Classic (original P021) stateless control using hysteresis only - case P021_OPMODE_CLASSIC: + case P021_opmode::P021_OPMODE_CLASSIC: if (P021_check_on(value, setpoint, hysteresis, invert_input, symetric_hyst, remote_state)) { - new_control_state = P021_STATE_ACTIVE; + new_control_state = P021_control_state::P021_STATE_ACTIVE; } else if (P021_check_off(value, setpoint, hysteresis, invert_input, symetric_hyst, remote_state)) { - new_control_state = P021_STATE_IDLE; + new_control_state = P021_control_state::P021_STATE_IDLE; } break; // Control is switched off completely - case P021_OPMODE_OFF: + case P021_opmode::P021_OPMODE_OFF: - if (old_control_state != P021_STATE_IDLE) + if (old_control_state != P021_control_state::P021_STATE_IDLE) { timestamp = millis(); - new_control_state = P021_STATE_IDLE; + new_control_state = P021_control_state::P021_STATE_IDLE; } break; // Control is always on - case P021_OPMODE_ON: + case P021_opmode::P021_OPMODE_ON: - if (old_control_state == P021_STATE_IDLE) + if (old_control_state == P021_control_state::P021_STATE_IDLE) { timestamp = millis(); } - new_control_state = P021_STATE_ACTIVE; + new_control_state = P021_control_state::P021_STATE_ACTIVE; break; // Control is switched off with maintnenance interval enabled - case P021_OPMODE_STANDBY: + case P021_opmode::P021_OPMODE_STANDBY: - if (old_control_state == P021_STATE_IDLE) // Output was idling + if (old_control_state == P021_control_state::P021_STATE_IDLE) // Output was idling { if ((beyond_interval) && (P021_FORCE_TIME > 1)) { timestamp = millis(); - new_control_state = P021_STATE_FORCE; + new_control_state = P021_control_state::P021_STATE_FORCE; } } @@ -717,50 +697,50 @@ void P021_evaluate(struct EventStruct *event) else if (!beyond_force) { // Output was active shorter than the forced on time - new_control_state = P021_STATE_FORCE; // Keep running in state FORCE + new_control_state = P021_control_state::P021_STATE_FORCE; // Keep running in state FORCE } else { timestamp = millis(); - new_control_state = P021_STATE_IDLE; // Switch off + new_control_state = P021_control_state::P021_STATE_IDLE; // Switch off } break; // Control based on temperature and optional remote control - case P021_OPMODE_TEMP: + case P021_opmode::P021_OPMODE_TEMP: remote_state = false; // Don't look at requests from remote systems // Continue with shared handling, break deliberately not used // ---------------------------------------------------------- - case P021_OPMODE_REMOTE: + case P021_opmode::P021_OPMODE_REMOTE: switch (old_control_state) { // Output is inactive - case P021_STATE_IDLE: + case P021_control_state::P021_STATE_IDLE: if (P021_check_on(value, setpoint, hysteresis, invert_input, symetric_hyst, remote_state)) { // Setpoint comparator or remote request to activate the output timestamp = millis(); - new_control_state = P021_STATE_ACTIVE; + new_control_state = P021_control_state::P021_STATE_ACTIVE; } else if (beyond_interval) { // Inactive for a long period, forced maintenance run timestamp = millis(); - new_control_state = P021_STATE_FORCE; + new_control_state = P021_control_state::P021_STATE_FORCE; } break; // Output is active due to setpoint comparator request - case P021_STATE_ACTIVE: + case P021_control_state::P021_STATE_ACTIVE: if (P021_check_off(value, setpoint, hysteresis, invert_input, symetric_hyst, remote_state)) { if ((beyond_min_time) && (!extend_at_end)) { timestamp = millis(); - new_control_state = P021_STATE_IDLE; + new_control_state = P021_control_state::P021_STATE_IDLE; } else { @@ -769,67 +749,47 @@ void P021_evaluate(struct EventStruct *event) { timestamp = millis(); } - new_control_state = P021_STATE_EXTEND; + new_control_state = P021_control_state::P021_STATE_EXTEND; } } break; // Output is active to extend a started cycle untill minimum time exceeded - case P021_STATE_EXTEND: + case P021_control_state::P021_STATE_EXTEND: if (P021_check_on(value, setpoint, hysteresis, invert_input, symetric_hyst, remote_state)) { - new_control_state = P021_STATE_ACTIVE; + new_control_state = P021_control_state::P021_STATE_ACTIVE; } else if (beyond_min_time) { timestamp = millis(); - new_control_state = P021_STATE_IDLE; + new_control_state = P021_control_state::P021_STATE_IDLE; } break; // Output was forced active when operation mode switched to temperature control - case P021_STATE_FORCE: + case P021_control_state::P021_STATE_FORCE: if (P021_check_on(value, setpoint, hysteresis, invert_input, symetric_hyst, remote_state)) { // Keep timestamp from moment pump was swiched on - new_control_state = P021_STATE_ACTIVE; + new_control_state = P021_control_state::P021_STATE_ACTIVE; } else if (beyond_force) { timestamp = millis(); - new_control_state = P021_STATE_IDLE; + new_control_state = P021_control_state::P021_STATE_IDLE; } break; } break; // switch(opmode) case P021_OPMODE_TEMP, P021_OPMODE_REMOTE - - // Unexpected opmode, force to OPMODE_OFF - default: - P021_OPMODE = P021_OPMODE_OFF; - break; } // switch P021_OPMODE // Calculate output state from the newly calculated control state - switch (new_control_state) - { - case P021_STATE_IDLE: - relay_output = false; // Relay output state - break; - case P021_STATE_ACTIVE: - relay_output = true; // Relay output state - break; - case P021_STATE_EXTEND: - relay_output = true; // Relay output state - break; - case P021_STATE_FORCE: - relay_output = true; // Relay output state - break; - default: // unexpected state, switch pump off - relay_output = false; // Relay output state - break; - } + relay_output = (P021_control_state::P021_STATE_ACTIVE == new_control_state || + P021_control_state::P021_STATE_EXTEND == new_control_state || + P021_control_state::P021_STATE_FORCE == new_control_state); relay_output ^= bitRead(P021_FLAGS, P021_INV_OUTPUT); // Invert when selected @@ -845,10 +805,10 @@ void P021_evaluate(struct EventStruct *event) { addLogMove(LOG_LEVEL_DEBUG, strformat(F("P021: Calculated State= %s; GPIO= %d; timer= %d sec; mode= %s; value= %f; remote= %d"), - P021_printControlState(new_control_state), + FsP(P021_printControlState(static_cast(new_control_state))), relay_output, millis2seconds(timePassedSince(timestamp)), - P021_printControlMode((P021_opmode)P021_OPMODE), + P021_printControlMode(P021_OPMODE), value, remote_state)); } @@ -859,7 +819,6 @@ void P021_evaluate(struct EventStruct *event) // - The state of the internal state machine // - Timestamp for last change of the output signal // Note: the actual state of the output is not stored, it can be calculated from the control_state - // UserVar.setFloat(event->TaskIndex, P021_VALUE_OUTPUT, (float)(((P021_control_state)new_control_state == P021_STATE_IDLE) ? 0 : 1)); UserVar.setFloat(event->TaskIndex, P021_VALUE_OUTPUT, relay_output ? 1.0f : 0.0f); UserVar.setFloat(event->TaskIndex, P021_VALUE_STATE, (float)new_control_state); P021_timestamp[event->TaskIndex] = timestamp; @@ -900,29 +859,18 @@ void P021_evaluate(struct EventStruct *event) // All new goodies to default (backwards compatible with previous versions) if (P021_check_on(value, setpoint, hysteresis, false, true, false)) { - new_control_state = P021_STATE_ACTIVE; + new_control_state = P021_control_state::P021_STATE_ACTIVE; } else if (P021_check_off(value, setpoint, hysteresis, false, true, false)) { - new_control_state = P021_STATE_IDLE; + new_control_state = P021_control_state::P021_STATE_IDLE; } // Calculate output state from the newly calculated control state - switch (new_control_state) - { - case P021_STATE_IDLE: - relay_output = false; // Relay output state - break; - case P021_STATE_ACTIVE: - relay_output = true; // Relay output state - break; - default: // unexpected state, switch pump off - relay_output = false; // Relay output state - break; - } + relay_output = P021_control_state::P021_STATE_ACTIVE == new_control_state; // Simplified // Actuate the output pin taking output invert flag into account - relay_output ^= bitRead(P021_FLAGS, P021_INV_OUTPUT); // Invert when selected + relay_output ^= bitRead(P021_FLAGS, P021_INV_OUTPUT); // Invert when selected if (validGpio(P021_GPIO_RELAY)) { @@ -935,7 +883,7 @@ void P021_evaluate(struct EventStruct *event) { addLogMove(LOG_LEVEL_DEBUG, strformat(F("P021: Calculated State= %s; GPIO= %d; value= %f"), - P021_printControlState(new_control_state), + FsP(P021_printControlState(static_cast(new_control_state))), relay_output, value)); } diff --git a/src/src/PluginStructs/P021_data_struct.h b/src/src/PluginStructs/P021_data_struct.h index 1a8bde1fe..a2e705087 100644 --- a/src/src/PluginStructs/P021_data_struct.h +++ b/src/src/PluginStructs/P021_data_struct.h @@ -87,6 +87,26 @@ # define P021_FORCE_TIME PCONFIG_ULONG(3) # define P021_GUID_FORCE_TIME "f11" +// Operation modes for the control algorithm +enum class P021_opmode : uint8_t +{ + P021_OPMODE_CLASSIC, // Original, stateless control + P021_OPMODE_OFF, // Output is fully shut down, no forced curculation + P021_OPMODE_STANDBY, // Output is only switched on for forced maintenance runs + P021_OPMODE_ON, // Output is always switched on + P021_OPMODE_TEMP, // Control algorithm based on temperature only + P021_OPMODE_REMOTE // Both temperature and remote command can switch on Output +}; + +// Control state for the control algorithm +enum class P021_control_state : uint8_t +{ + P021_STATE_IDLE, // Output is inactive + P021_STATE_ACTIVE, // Output is active due to level control (based on input value) + P021_STATE_EXTEND, // Output is active due to minimum duration + P021_STATE_FORCE // Output is forced active due to maximum inactive duration is exceeded +}; + // Positions in userVar array for the output values of this plugin // For now we only advertise output & state. Autosave bookkeeping is hidden and used as static storage # define P021_VALUE_OUTPUT 0 // Switch output, logical state [inactive/active] From 07b9298caf4469da24d43399c5e91672c6232dcd Mon Sep 17 00:00:00 2001 From: TD-er Date: Tue, 4 Nov 2025 13:12:08 +0100 Subject: [PATCH 445/564] [Ethernet] Fix saving settings to KVS --- .../NW003_data_struct_ETH_RMII.cpp | 3 + .../NW004_data_struct_ETH_SPI.cpp | 6 +- src/ESPEasy/net/_NW003_ETH_RMII.cpp | 164 ++++-------------- src/ESPEasy/net/_NW004_ETH_SPI.cpp | 124 ++++--------- 4 files changed, 74 insertions(+), 223 deletions(-) diff --git a/src/ESPEasy/net/NWPluginStructs/NW003_data_struct_ETH_RMII.cpp b/src/ESPEasy/net/NWPluginStructs/NW003_data_struct_ETH_RMII.cpp index 0628a105b..95a4e5c5a 100644 --- a/src/ESPEasy/net/NWPluginStructs/NW003_data_struct_ETH_RMII.cpp +++ b/src/ESPEasy/net/NWPluginStructs/NW003_data_struct_ETH_RMII.cpp @@ -169,6 +169,8 @@ void NW003_data_struct_ETH_RMII::loadDefaults(ESPEasy_key_value_store *kvs, void NW003_data_struct_ETH_RMII::webform_load(EventStruct *event) { + _load(); + NW003_data_struct_ETH_RMII::loadDefaults(_kvs, event->NetworkIndex, nwpluginID_t(3)); addFormSubHeader(F("Ethernet IP Settings")); @@ -303,6 +305,7 @@ bool NW003_data_struct_ETH_RMII::webform_getPort(KeyValueWriter *writer) { retur bool NW003_data_struct_ETH_RMII::init(EventStruct *event) { + _load(); auto data = getNWPluginData_static_runtime(); auto iface = ESPEasy::net::eth::ETH_NWPluginData_static_runtime::getInterface(_networkIndex); diff --git a/src/ESPEasy/net/NWPluginStructs/NW004_data_struct_ETH_SPI.cpp b/src/ESPEasy/net/NWPluginStructs/NW004_data_struct_ETH_SPI.cpp index 1e9f3cbf9..5b0afcc05 100644 --- a/src/ESPEasy/net/NWPluginStructs/NW004_data_struct_ETH_SPI.cpp +++ b/src/ESPEasy/net/NWPluginStructs/NW004_data_struct_ETH_SPI.cpp @@ -166,6 +166,8 @@ void NW004_data_struct_ETH_SPI::loadDefaults(ESPEasy_key_value_store *kvs, void NW004_data_struct_ETH_SPI::webform_load(EventStruct *event) { + _load(); + NW004_data_struct_ETH_SPI::loadDefaults(_kvs, event->NetworkIndex, nwpluginID_t(4)); addFormSubHeader(F("Ethernet IP Settings")); addFormIPBox(F("ESP Ethernet IP"), F("espethip"), Settings.ETH_IP); @@ -243,7 +245,8 @@ void NW004_data_struct_ETH_SPI::webform_load(EventStruct *event) } } -void NW004_data_struct_ETH_SPI::webform_save(EventStruct *event) { +void NW004_data_struct_ETH_SPI::webform_save(EventStruct *event) +{ // TODO TD-er: Move this to a central function, like done with import/export int32_t key = getNextKey(-1); @@ -260,6 +263,7 @@ bool NW004_data_struct_ETH_SPI::webform_getPort(KeyValueWriter *writer) { return bool NW004_data_struct_ETH_SPI::init(EventStruct *event) { + _load(); auto data = getNWPluginData_static_runtime(); auto iface = ESPEasy::net::eth::ETH_NWPluginData_static_runtime::getInterface(_networkIndex); diff --git a/src/ESPEasy/net/_NW003_ETH_RMII.cpp b/src/ESPEasy/net/_NW003_ETH_RMII.cpp index 40dc75a0f..4c94ee458 100644 --- a/src/ESPEasy/net/_NW003_ETH_RMII.cpp +++ b/src/ESPEasy/net/_NW003_ETH_RMII.cpp @@ -137,150 +137,52 @@ bool NWPlugin_003(NWPlugin::Function function, EventStruct *event, String& strin case NWPlugin::Function::NWPLUGIN_WEBFORM_SAVE: { + ESPEasy::net::eth::NW003_data_struct_ETH_RMII *NW_data = + static_cast(getNWPluginData(event->NetworkIndex)); + bool mustCleanup = NW_data == nullptr; - webArg2ip(F("espethip"), Settings.ETH_IP); - webArg2ip(F("espethgateway"), Settings.ETH_Gateway); - webArg2ip(F("espethsubnet"), Settings.ETH_Subnet); - webArg2ip(F("espethdns"), Settings.ETH_DNS); + if (mustCleanup) { + NW_data = new (std::nothrow) ESPEasy::net::eth::NW003_data_struct_ETH_RMII(event->NetworkIndex, nullptr); +# if FEATURE_STORE_NETWORK_INTERFACE_SETTINGS - Settings.ETH_Phy_Addr = getFormItemInt(F("ethphy")); - Settings.ETH_Pin_mdc_cs = getFormItemInt(F("ethmdc")); - Settings.ETH_Pin_mdio_irq = getFormItemInt(F("ethmdio")); - Settings.ETH_Pin_power_rst = getFormItemInt(F("ethpower")); - Settings.ETH_Phy_Type = static_cast(getFormItemInt(F("ethtype"))); - Settings.ETH_Clock_Mode = static_cast(getFormItemInt(F("ethclock"))); - Settings.NetworkMedium = static_cast(getFormItemInt(F("ethwifi"))); + if (NW_data) { + NW_data->init_KVS(); + } +# endif // if FEATURE_STORE_NETWORK_INTERFACE_SETTINGS + } + + if (NW_data) { + NW_data->webform_save(event); + + if (mustCleanup) { delete NW_data; } + success = true; + } break; } case NWPlugin::Function::NWPLUGIN_WEBFORM_LOAD: { - addFormSubHeader(F("Ethernet IP Settings")); + ESPEasy::net::eth::NW003_data_struct_ETH_RMII *NW_data = + static_cast(getNWPluginData(event->NetworkIndex)); + bool mustCleanup = NW_data == nullptr; - addFormIPBox(F("ESP Ethernet IP"), F("espethip"), Settings.ETH_IP); - addFormIPBox(F("ESP Ethernet Gateway"), F("espethgateway"), Settings.ETH_Gateway); - addFormIPBox(F("ESP Ethernet Subnetmask"), F("espethsubnet"), Settings.ETH_Subnet); - addFormIPBox(F("ESP Ethernet DNS"), F("espethdns"), Settings.ETH_DNS); - addFormNote(F("Leave empty for DHCP")); + if (mustCleanup) { + NW_data = new (std::nothrow) ESPEasy::net::eth::NW003_data_struct_ETH_RMII(event->NetworkIndex, nullptr); +# if FEATURE_STORE_NETWORK_INTERFACE_SETTINGS - - addFormSubHeader(F("Ethernet")); - addRowLabel_tr_id(F("Preferred network medium"), F("ethwifi")); - { - const __FlashStringHelper *ethWifiOptions[] = { - toString(NetworkMedium_t::WIFI), - toString(NetworkMedium_t::Ethernet) - }; - const FormSelectorOptions selector(NR_ELEMENTS(ethWifiOptions), ethWifiOptions); - selector.addSelector( - F("ethwifi"), - static_cast(Settings.NetworkMedium)); - } - addFormNote(F("Change Switch between WiFi and Ethernet requires reboot to activate")); - { - const __FlashStringHelper *ethPhyTypes[] = { - toString(EthPhyType_t::notSet), - - toString(EthPhyType_t::LAN8720), -# if ETH_PHY_LAN867X_SUPPORTED - toString(ESPEasy::net::EthPhyType_t::LAN867X), -# endif - toString(EthPhyType_t::TLK110), - toString(EthPhyType_t::RTL8201), -# if ETH_TYPE_JL1101_SUPPORTED - toString(EthPhyType_t::JL1101), -# endif - toString(EthPhyType_t::DP83848), - toString(EthPhyType_t::KSZ8041), - toString(EthPhyType_t::KSZ8081), - }; - const int ethPhyTypes_index[] = { - static_cast(EthPhyType_t::notSet), - - static_cast(EthPhyType_t::LAN8720), -# if ETH_PHY_LAN867X_SUPPORTED - static_cast(ESPEasy::net::EthPhyType_t::LAN867X), -# endif - static_cast(EthPhyType_t::TLK110), - static_cast(EthPhyType_t::RTL8201), -# if ETH_TYPE_JL1101_SUPPORTED - static_cast(EthPhyType_t::JL1101), -# endif - static_cast(EthPhyType_t::DP83848), - static_cast(EthPhyType_t::KSZ8041), - static_cast(EthPhyType_t::KSZ8081), - - }; - - constexpr unsigned nrItems = NR_ELEMENTS(ethPhyTypes_index); - - - const int choice = - isValid(Settings.ETH_Phy_Type) - ? static_cast(Settings.ETH_Phy_Type) - : static_cast(EthPhyType_t::notSet); - - const FormSelectorOptions selector( - nrItems, - ethPhyTypes, - ethPhyTypes_index); - selector.addFormSelector( - F("Ethernet PHY type"), - F("ethtype"), - choice); + if (NW_data) { + NW_data->init_KVS(); + } +# endif // if FEATURE_STORE_NETWORK_INTERFACE_SETTINGS } - # define MDC_CS_PIN_DESCR "Ethernet MDC pin" - # define MIO_IRQ_PIN_DESCR "Ethernet MIO pin" - # define PWR_RST_PIN_DESCR "Ethernet Power pin" + if (NW_data) { + NW_data->webform_load(event); + success = true; + + if (mustCleanup) { delete NW_data; } - addFormNumericBox(F("Ethernet PHY Address"), F("ethphy"), Settings.ETH_Phy_Addr, -1, 127); - addFormNote(F("I²C-address of Ethernet PHY" - " (0 or 1 for LAN8720, 31 for TLK110, -1 autodetect)" - )); - addFormPinSelect(PinSelectPurpose::Ethernet, formatGpioName_output( - F(MDC_CS_PIN_DESCR)), - F("ethmdc"), Settings.ETH_Pin_mdc_cs); - addFormPinSelect(PinSelectPurpose::Ethernet, formatGpioName_input( - F(MIO_IRQ_PIN_DESCR)), - F("ethmdio"), Settings.ETH_Pin_mdio_irq); - addFormPinSelect(PinSelectPurpose::Ethernet, formatGpioName_output( - F(PWR_RST_PIN_DESCR)), - F("ethpower"), Settings.ETH_Pin_power_rst); - addRowLabel_tr_id(F("Ethernet Clock"), F("ethclock")); - { - # if CONFIG_IDF_TARGET_ESP32 - const __FlashStringHelper *ethClockOptions[] = { - toString(EthClockMode_t::Ext_crystal_osc), - toString(EthClockMode_t::Int_50MHz_GPIO_0), - toString(EthClockMode_t::Int_50MHz_GPIO_16), - toString(EthClockMode_t::Int_50MHz_GPIO_17_inv) - }; - const int indices[] = { - static_cast(EthClockMode_t::Ext_crystal_osc), - static_cast(EthClockMode_t::Int_50MHz_GPIO_0), - static_cast(EthClockMode_t::Int_50MHz_GPIO_16), - static_cast(EthClockMode_t::Int_50MHz_GPIO_17_inv) - }; - # endif // if CONFIG_IDF_TARGET_ESP32 - # if CONFIG_IDF_TARGET_ESP32P4 - const __FlashStringHelper *ethClockOptions[] = { - // toString(EthClockMode_t::Default), - toString(EthClockMode_t::Ext_crystal), - toString(EthClockMode_t::Int_50MHz) - }; - const int indices[] = { - // static_cast(EthClockMode_t::Default), - static_cast(EthClockMode_t::Ext_crystal), - static_cast(EthClockMode_t::Int_50MHz) - }; - # endif // if CONFIG_IDF_TARGET_ESP32P4 - const FormSelectorOptions selector( - NR_ELEMENTS(ethClockOptions), - ethClockOptions, - indices); - selector.addSelector(F("ethclock"), static_cast(Settings.ETH_Clock_Mode)); } break; diff --git a/src/ESPEasy/net/_NW004_ETH_SPI.cpp b/src/ESPEasy/net/_NW004_ETH_SPI.cpp index bd6f14923..241a75b5b 100644 --- a/src/ESPEasy/net/_NW004_ETH_SPI.cpp +++ b/src/ESPEasy/net/_NW004_ETH_SPI.cpp @@ -138,110 +138,52 @@ bool NWPlugin_004(NWPlugin::Function function, EventStruct *event, String& strin # endif // ifndef LIMIT_BUILD_SIZE case NWPlugin::Function::NWPLUGIN_WEBFORM_SAVE: { + ESPEasy::net::eth::NW004_data_struct_ETH_SPI *NW_data = + static_cast(getNWPluginData(event->NetworkIndex)); + bool mustCleanup = NW_data == nullptr; - webArg2ip(F("espethip"), Settings.ETH_IP); - webArg2ip(F("espethgateway"), Settings.ETH_Gateway); - webArg2ip(F("espethsubnet"), Settings.ETH_Subnet); - webArg2ip(F("espethdns"), Settings.ETH_DNS); + if (mustCleanup) { + NW_data = new (std::nothrow) ESPEasy::net::eth::NW004_data_struct_ETH_SPI(event->NetworkIndex, nullptr); +# if FEATURE_STORE_NETWORK_INTERFACE_SETTINGS - Settings.ETH_Phy_Addr = getFormItemInt(F("ethphy")); - Settings.ETH_Pin_mdc_cs = getFormItemInt(F("ethmdc")); - Settings.ETH_Pin_mdio_irq = getFormItemInt(F("ethmdio")); - Settings.ETH_Pin_power_rst = getFormItemInt(F("ethpower")); - Settings.ETH_Phy_Type = static_cast(getFormItemInt(F("ethtype"))); - Settings.NetworkMedium = static_cast(getFormItemInt(F("ethwifi"))); + if (NW_data) { + NW_data->init_KVS(); + } +# endif // if FEATURE_STORE_NETWORK_INTERFACE_SETTINGS + } + if (NW_data) { + NW_data->webform_save(event); + + if (mustCleanup) { delete NW_data; } + success = true; + } break; } case NWPlugin::Function::NWPLUGIN_WEBFORM_LOAD: { - addFormSubHeader(F("Ethernet IP Settings")); + ESPEasy::net::eth::NW004_data_struct_ETH_SPI *NW_data = + static_cast(getNWPluginData(event->NetworkIndex)); + bool mustCleanup = NW_data == nullptr; - addFormIPBox(F("ESP Ethernet IP"), F("espethip"), Settings.ETH_IP); - addFormIPBox(F("ESP Ethernet Gateway"), F("espethgateway"), Settings.ETH_Gateway); - addFormIPBox(F("ESP Ethernet Subnetmask"), F("espethsubnet"), Settings.ETH_Subnet); - addFormIPBox(F("ESP Ethernet DNS"), F("espethdns"), Settings.ETH_DNS); - addFormNote(F("Leave empty for DHCP")); + if (mustCleanup) { + NW_data = new (std::nothrow) ESPEasy::net::eth::NW004_data_struct_ETH_SPI(event->NetworkIndex, nullptr); +# if FEATURE_STORE_NETWORK_INTERFACE_SETTINGS - - addFormSubHeader(F("Ethernet")); - addRowLabel_tr_id(F("Preferred network medium"), F("ethwifi")); - { - const __FlashStringHelper *ethWifiOptions[] = { - toString(NetworkMedium_t::WIFI), - toString(NetworkMedium_t::Ethernet) - }; - const FormSelectorOptions selector(NR_ELEMENTS(ethWifiOptions), ethWifiOptions); - selector.addSelector( - F("ethwifi"), - static_cast(Settings.NetworkMedium)); - } - addFormNote(F("Change Switch between WiFi and Ethernet requires reboot to activate")); - { - const __FlashStringHelper *ethPhyTypes[] = { - toString(EthPhyType_t::notSet), -# if ESP_IDF_VERSION_MAJOR >= 5 -# if CONFIG_ETH_SPI_ETHERNET_DM9051 - toString(EthPhyType_t::DM9051), -# endif // if CONFIG_ETH_SPI_ETHERNET_DM9051 -# if CONFIG_ETH_SPI_ETHERNET_W5500 - toString(EthPhyType_t::W5500), -# endif // if CONFIG_ETH_SPI_ETHERNET_W5500 -# if CONFIG_ETH_SPI_ETHERNET_KSZ8851SNL - toString(EthPhyType_t::KSZ8851), -# endif // if CONFIG_ETH_SPI_ETHERNET_KSZ8851SNL -# endif // if ESP_IDF_VERSION_MAJOR >= 5 - }; - const int ethPhyTypes_index[] = { - static_cast(EthPhyType_t::notSet), - -# if ESP_IDF_VERSION_MAJOR >= 5 -# if CONFIG_ETH_SPI_ETHERNET_DM9051 - static_cast(EthPhyType_t::DM9051), -# endif // if CONFIG_ETH_SPI_ETHERNET_DM9051 -# if CONFIG_ETH_SPI_ETHERNET_W5500 - static_cast(EthPhyType_t::W5500), -# endif // if CONFIG_ETH_SPI_ETHERNET_W5500 -# if CONFIG_ETH_SPI_ETHERNET_KSZ8851SNL - static_cast(EthPhyType_t::KSZ8851), -# endif // if CONFIG_ETH_SPI_ETHERNET_KSZ8851SNL -# endif // if ESP_IDF_VERSION_MAJOR >= 5 - }; - - constexpr unsigned nrItems = NR_ELEMENTS(ethPhyTypes_index); - - - const int choice = - isValid(Settings.ETH_Phy_Type) - ? static_cast(Settings.ETH_Phy_Type) - : static_cast(EthPhyType_t::notSet); - - const FormSelectorOptions selector( - nrItems, - ethPhyTypes, - ethPhyTypes_index); - selector.addFormSelector( - F("Ethernet PHY type"), - F("ethtype"), - choice); + if (NW_data) { + NW_data->init_KVS(); + } +# endif // if FEATURE_STORE_NETWORK_INTERFACE_SETTINGS } - # define MDC_CS_PIN_DESCR "Ethernet CS pin" - # define MIO_IRQ_PIN_DESCR "Ethernet IRQ pin" - # define PWR_RST_PIN_DESCR "Ethernet RST pin" + if (NW_data) { + NW_data->webform_load(event); + success = true; - addFormNumericBox(F("Ethernet PHY Address"), F("ethphy"), Settings.ETH_Phy_Addr, -1, 127); - addFormNote(F("I²C-address of Ethernet PHY")); - addFormPinSelect(PinSelectPurpose::Ethernet, formatGpioName_output( - F(MDC_CS_PIN_DESCR)), - F("ethmdc"), Settings.ETH_Pin_mdc_cs); - addFormPinSelect(PinSelectPurpose::Ethernet, formatGpioName_input( - F(MIO_IRQ_PIN_DESCR)), - F("ethmdio"), Settings.ETH_Pin_mdio_irq); - addFormPinSelect(PinSelectPurpose::Ethernet, formatGpioName_output( - F(PWR_RST_PIN_DESCR)), - F("ethpower"), Settings.ETH_Pin_power_rst); + if (mustCleanup) { delete NW_data; } + + } break; } From a5032fd5e8e0dba90fd0c8fb8e3af3c69146e62c Mon Sep 17 00:00:00 2001 From: TD-er Date: Tue, 4 Nov 2025 13:26:08 +0100 Subject: [PATCH 446/564] [Network] Restart services (e.g. ESPEasy p2p) when default route changes --- src/ESPEasy/net/Globals/NWPlugins.cpp | 3 +++ 1 file changed, 3 insertions(+) diff --git a/src/ESPEasy/net/Globals/NWPlugins.cpp b/src/ESPEasy/net/Globals/NWPlugins.cpp index 3aa35d28b..413d3390c 100644 --- a/src/ESPEasy/net/Globals/NWPlugins.cpp +++ b/src/ESPEasy/net/Globals/NWPlugins.cpp @@ -108,6 +108,9 @@ bool NWPluginCall(NWPlugin::Function Function, EventStruct *event, String& str) } } } + if (Function == NWPlugin::Function::NWPLUGIN_PRIORITY_ROUTE_CHANGED) { + CheckRunningServices(); + } return success; } From 6953c3723f58970ed75bf467d97bbcc49ac5565f Mon Sep 17 00:00:00 2001 From: TD-er Date: Wed, 5 Nov 2025 00:20:10 +0100 Subject: [PATCH 447/564] [ESP-IDF] Update to latest Arduino/IDF code with fix for SPI Eth MAC --- platformio_core_defs.ini | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/platformio_core_defs.ini b/platformio_core_defs.ini index 84b204ea2..b466c0628 100644 --- a/platformio_core_defs.ini +++ b/platformio_core_defs.ini @@ -167,7 +167,8 @@ extra_scripts = ${esp82xx_common.extra_scripts} ;platform = https://github.com/Jason2866/platform-espressif32.git#Arduino/IDF55_gcc15 ;platform_packages = framework-arduinoespressif32 @ https://github.com/Jason2866/esp32-arduino-lib-builder/releases/download/0410-1232-5.5/framework-arduinoespressif32-release_v5.5-2f303469.tar.xz platform = https://github.com/Jason2866/platform-espressif32.git#23aed73e4e570d3b6608c15677fea01d6a722d94 -platform_packages = +;platform_packages = +platform_packages = framework-arduinoespressif32 @ https://github.com/Jason2866/esp32-arduino-lib-builder/releases/download/0411-1300-5.5/framework-arduinoespressif32-release_v5.5-0fb83661.tar.xz build_flags = -DESP32_STAGE -DESP_IDF_VERSION_MAJOR=5 From bb18ba21ab4f00be12e88be4fbcab37b4e408cca Mon Sep 17 00:00:00 2001 From: TD-er Date: Wed, 5 Nov 2025 00:31:18 +0100 Subject: [PATCH 448/564] [ESP8266] Fix failing ESP8266 build --- src/ESPEasy/net/Globals/NWPlugins.cpp | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/ESPEasy/net/Globals/NWPlugins.cpp b/src/ESPEasy/net/Globals/NWPlugins.cpp index 413d3390c..11392fa55 100644 --- a/src/ESPEasy/net/Globals/NWPlugins.cpp +++ b/src/ESPEasy/net/Globals/NWPlugins.cpp @@ -108,9 +108,11 @@ bool NWPluginCall(NWPlugin::Function Function, EventStruct *event, String& str) } } } +#ifdef ESP32 if (Function == NWPlugin::Function::NWPLUGIN_PRIORITY_ROUTE_CHANGED) { CheckRunningServices(); } +#endif return success; } From 611f884b4e60e695fd22bbeec78c2b9175b40e14 Mon Sep 17 00:00:00 2001 From: TD-er Date: Wed, 5 Nov 2025 08:48:00 +0100 Subject: [PATCH 449/564] [Build] Remove _LittleFS and _ETH from build names due to linker issues --- .gitignore | 6 +-- README.md | 26 +++++----- platformio.ini | 4 +- platformio_esp32_envs.ini | 98 ++++++++++++++++++------------------ platformio_esp32_solo1.ini | 8 +-- platformio_esp32c3_envs.ini | 30 +++++------ platformio_esp32c5_envs.ini | 2 +- platformio_esp32c61_envs.ini | 2 +- platformio_esp32c6_envs.ini | 18 +++---- platformio_esp32p4_envs.ini | 2 +- platformio_esp32s2_envs.ini | 30 +++++------ platformio_esp32s3_envs.ini | 52 +++++++++---------- 12 files changed, 140 insertions(+), 138 deletions(-) diff --git a/.gitignore b/.gitignore index dc91c45bc..66033fd3b 100644 --- a/.gitignore +++ b/.gitignore @@ -77,7 +77,7 @@ managed_components/ CMakeLists.txt -sdkconfig.max_ESP32s3_16M8M_LittleFS_OPI_PSRAM_ETH +sdkconfig.max_ESP32s3_16M8M_OPI_PSRAM sdkconfig.defaults @@ -88,5 +88,5 @@ dependencies.lock .cache/ src/src/CustomBuild/CompiletimeDefines_generated.h - -bhutan_16m.bin + +bhutan_16m.bin diff --git a/README.md b/README.md index 7e170d399..c01e8dcdd 100644 --- a/README.md +++ b/README.md @@ -112,6 +112,8 @@ Flash size | Description | N.B. Starting with release 2023/12/25, All ESP32 LittleFS builds use IDF 5.3, to support newer ESP32 chips like ESP32-C2 and ESP32-C6, and SPI Ethernet. Other SPIFFS based ESP32 builds will be migrated to LittleFS as SPIFFS is no longer officially available in IDF 5 and later. As a temporary solution, a specially crafted IDF 5.1 build that still includes SPIFFS, is used for the SPIFFS builds. A migration plan will be made available in 2025. +N.B.2 Starting with builds made after 2025/11/04, ESP32 builds will no longer have ``_LittleFS`` in the name as all ESP32 builds use LittleFS. Also the suffix ``_ETH`` has been removed since all builds will have Ethernet support, except for ESP32C2 builds. + *[opt-build-features]* can be any of: Build features | Description | ----------------|-----------------------------------------------------------------------------------------------------------| @@ -129,18 +131,18 @@ noOTA/NO_OTA | Does not support OTA (Over The Air-updating of the firmware) U N.B. Starting ca. 2025/02/27, many ESP32 builds are *only* available with _ETH suffix, indicating that Ethernet support is enabled, to reduce the (rather high) number of builds. Some example firmware names: -Firmware name | Hardware | Included plugins | -----------------------------------------------------------------------|-------------------------------------------------|----------------------------------| -ESPEasy_mega-20230822_normal_ESP8266_1M.bin | ESP8266/ESP8285 with 1MB flash | Stable | -ESPEasy_mega-20230822_normal_ESP8266_4M1M.bin | ESP8266 with 4MB flash | Stable | -ESPEasy_mega-20230822_collection_A_ESP8266_4M1M.bin | ESP8266 with 4MB flash | Stable + Collection base + set A | -ESPEasy_mega-20230822_normal_ESP32_4M316k_ETH.bin | ESP32 with 4MB flash | Stable | -ESPEasy_mega-20230822_collection_A_ESP32_4M316k_ETH.bin | ESP32 with 4MB flash | Stable + Collection base + set A | -ESPEasy_mega-20230822_collection_B_ESP32_4M316k_ETH.bin | ESP32 with 4MB flash | Stable + Collection base + set B | -ESPEasy_mega-20230822_max_ESP32s3_8M1M_LittleFS_ETH.bin | ESP32-S3 with 8MB flash, CDC-serial, Ethernet | All available plugins | -ESPEasy_mega-20230822_max_ESP32s3_8M1M_LittleFS_OPI_PSRAM_ETH.bin | ESP32-S3 8MB flash, PSRAM, CDC-serial, Ethernet | All available plugins | -ESPEasy_mega-20230822_max_ESP32_16M1M_ETH.bin | ESP32 with 16MB flash, SPIFFS, Ethernet | All available plugins | -ESPEasy_mega-20230822_max_ESP32_16M8M_LittleFS_ETH.bin | ESP32 with 16MB flash, LittleFS, Ethernet | All available plugins | +Firmware name | Hardware | Included plugins | +--------------------------------------------------------|-------------------------------------------------|----------------------------------| +ESPEasy_mega-20230822_normal_ESP8266_1M.bin | ESP8266/ESP8285 with 1MB flash | Stable | +ESPEasy_mega-20230822_normal_ESP8266_4M1M.bin | ESP8266 with 4MB flash | Stable | +ESPEasy_mega-20230822_collection_A_ESP8266_4M1M.bin | ESP8266 with 4MB flash | Stable + Collection base + set A | +ESPEasy_mega-20230822_normal_ESP32_4M316k_ETH.bin | ESP32 with 4MB flash | Stable | +ESPEasy_mega-20230822_collection_A_ESP32_4M316k_ETH.bin | ESP32 with 4MB flash | Stable + Collection base + set A | +ESPEasy_mega-20230822_collection_B_ESP32_4M316k_ETH.bin | ESP32 with 4MB flash | Stable + Collection base + set B | +ESPEasy_mega-20230822_max_ESP32s3_8M1M.bin | ESP32-S3 with 8MB flash, CDC-serial, Ethernet | All available plugins | +ESPEasy_mega-20230822_max_ESP32s3_8M1M_OPI_PSRAM.bin | ESP32-S3 8MB flash, PSRAM, CDC-serial, Ethernet | All available plugins | +ESPEasy_mega-20230822_max_ESP32_16M1M_ETH.bin | ESP32 with 16MB flash, SPIFFS, Ethernet | All available plugins | +ESPEasy_mega-20230822_max_ESP32_16M8M.bin | ESP32 with 16MB flash, LittleFS, Ethernet | All available plugins | The binary files for the different ESP32 variants (S2, C3, S3, C2, C6, Solo1, 'Classic') are available in separate archives. diff --git a/platformio.ini b/platformio.ini index 5c939704f..4f3ed51be 100644 --- a/platformio.ini +++ b/platformio.ini @@ -34,8 +34,8 @@ extra_configs = ;default_envs = normal_ESP32_4M -default_envs = max_ESP32_16M8M_LittleFS_ETH -;default_envs = max_ESP32c5_8M1M_LittleFS_ETH +default_envs = max_ESP32_16M8M +;default_envs = max_ESP32c5_8M1M ;default_envs = normal_ESP32c6_4M316k_LittleFS_CDC ; default_envs = custom_ESP8266_4M1M diff --git a/platformio_esp32_envs.ini b/platformio_esp32_envs.ini index da566d704..9453f1935 100644 --- a/platformio_esp32_envs.ini +++ b/platformio_esp32_envs.ini @@ -73,7 +73,7 @@ build_flags = ${esp32_common_LittleFS.build_flags} -DFEATURE_ETHERNET=1 -[esp32_IRExt_LittleFS_ETH] +[esp32_IRExt] extends = esp32_common_LittleFS_ETH lib_ignore = ${esp32_always.lib_ignore} ESP32_ping @@ -95,21 +95,21 @@ extra_scripts = ${esp32_common_LittleFS_ETH.extra_scripts} pre:tools/pio/pre_custom_esp32.py -[env:custom_ESP32_4M316k_LittleFS_ETH] +[env:custom_ESP32_4M316k] extends = esp32_custom_base_LittleFS board = esp32_4M build_flags = ${esp32_custom_base_LittleFS.build_flags} -DFEATURE_ETHERNET=1 -[env:custom_ESP32_16M8M_LittleFS_ETH] -extends = env:custom_ESP32_4M316k_LittleFS_ETH +[env:custom_ESP32_16M8M] +extends = env:custom_ESP32_4M316k board = esp32_16M8M board_upload.flash_size = 16MB -build_flags = ${env:custom_ESP32_4M316k_LittleFS_ETH.build_flags} +build_flags = ${env:custom_ESP32_4M316k.build_flags} -[env:custom_IR_ESP32_4M316k_LittleFS_ETH] +[env:custom_IR_ESP32_4M316k] extends = esp32_common_LittleFS_ETH board = esp32_4M build_flags = ${esp32_common_LittleFS_ETH.build_flags} @@ -122,15 +122,15 @@ extra_scripts = ${esp32_common_LittleFS_ETH.extra_scripts} pre:tools/pio/pre_custom_esp32_IR.py pre:tools/pio/ir_build_check.py -[env:custom_ESP32_4M2M_NO_OTA_LittleFS_ETH] -extends = env:custom_ESP32_4M316k_LittleFS_ETH +[env:custom_ESP32_4M2M_NO_OTA] +extends = env:custom_ESP32_4M316k board = esp32_4M2M -build_flags = ${env:custom_ESP32_4M316k_LittleFS_ETH.build_flags} +build_flags = ${env:custom_ESP32_4M316k.build_flags} -DNO_HTTP_UPDATER -[env:collection_A_ESP32_4M316k_LittleFS_ETH] +[env:collection_A_ESP32_4M316k] extends = esp32_common_LittleFS_ETH board = esp32_4M build_flags = ${esp32_common_LittleFS_ETH.build_flags} @@ -140,7 +140,7 @@ build_flags = ${esp32_common_LittleFS_ETH.build_flags} -DCOLLECTION_FEATURE_RTTTL=1 -[env:collection_B_ESP32_4M316k_LittleFS_ETH] +[env:collection_B_ESP32_4M316k] extends = esp32_common_LittleFS_ETH board = esp32_4M build_flags = ${esp32_common_LittleFS_ETH.build_flags} @@ -149,7 +149,7 @@ build_flags = ${esp32_common_LittleFS_ETH.build_flags} -DCOLLECTION_FEATURE_RTTTL=1 -[env:collection_C_ESP32_4M316k_LittleFS_ETH] +[env:collection_C_ESP32_4M316k] extends = esp32_common_LittleFS_ETH board = esp32_4M build_flags = ${esp32_common_LittleFS_ETH.build_flags} @@ -158,7 +158,7 @@ build_flags = ${esp32_common_LittleFS_ETH.build_flags} -DCOLLECTION_FEATURE_RTTTL=1 -[env:collection_D_ESP32_4M316k_LittleFS_ETH] +[env:collection_D_ESP32_4M316k] extends = esp32_common_LittleFS_ETH board = esp32_4M build_flags = ${esp32_common_LittleFS_ETH.build_flags} @@ -167,7 +167,7 @@ build_flags = ${esp32_common_LittleFS_ETH.build_flags} -DCOLLECTION_FEATURE_RTTTL=1 -[env:collection_E_ESP32_4M316k_LittleFS_ETH] +[env:collection_E_ESP32_4M316k] extends = esp32_common_LittleFS_ETH board = esp32_4M build_flags = ${esp32_common_LittleFS_ETH.build_flags} @@ -176,7 +176,7 @@ build_flags = ${esp32_common_LittleFS_ETH.build_flags} -DCOLLECTION_FEATURE_RTTTL=1 -[env:collection_F_ESP32_4M316k_LittleFS_ETH] +[env:collection_F_ESP32_4M316k] extends = esp32_common_LittleFS_ETH board = esp32_4M build_flags = ${esp32_common_LittleFS_ETH.build_flags} @@ -185,7 +185,7 @@ build_flags = ${esp32_common_LittleFS_ETH.build_flags} -DCOLLECTION_FEATURE_RTTTL=1 -[env:collection_G_ESP32_4M316k_LittleFS_ETH] +[env:collection_G_ESP32_4M316k] extends = esp32_common_LittleFS_ETH board = esp32_4M build_flags = ${esp32_common_LittleFS_ETH.build_flags} @@ -195,50 +195,50 @@ build_flags = ${esp32_common_LittleFS_ETH.build_flags} -[env:collection_A_ESP32_IRExt_4M316k_LittleFS_ETH] -extends = esp32_IRExt_LittleFS_ETH +[env:collection_A_ESP32_IRExt_4M316k] +extends = esp32_IRExt board = esp32_4M -build_flags = ${esp32_IRExt_LittleFS_ETH.build_flags} +build_flags = ${esp32_IRExt.build_flags} -DPLUGIN_SET_COLLECTION_ESP32 -DPLUGIN_SET_COLLECTION_A_ESP32 -[env:collection_B_ESP32_IRExt_4M316k_LittleFS_ETH] -extends = esp32_IRExt_LittleFS_ETH +[env:collection_B_ESP32_IRExt_4M316k] +extends = esp32_IRExt board = esp32_4M -build_flags = ${esp32_IRExt_LittleFS_ETH.build_flags} +build_flags = ${esp32_IRExt.build_flags} -DPLUGIN_SET_COLLECTION_B_ESP32 -[env:collection_C_ESP32_IRExt_4M316k_LittleFS_ETH] -extends = esp32_IRExt_LittleFS_ETH +[env:collection_C_ESP32_IRExt_4M316k] +extends = esp32_IRExt board = esp32_4M -build_flags = ${esp32_IRExt_LittleFS_ETH.build_flags} +build_flags = ${esp32_IRExt.build_flags} -DPLUGIN_SET_COLLECTION_C_ESP32 -[env:collection_D_ESP32_IRExt_4M316k_LittleFS_ETH] -extends = esp32_IRExt_LittleFS_ETH +[env:collection_D_ESP32_IRExt_4M316k] +extends = esp32_IRExt board = esp32_4M -build_flags = ${esp32_IRExt_LittleFS_ETH.build_flags} +build_flags = ${esp32_IRExt.build_flags} -DPLUGIN_SET_COLLECTION_D_ESP32 -[env:collection_E_ESP32_IRExt_4M316k_LittleFS_ETH] -extends = esp32_IRExt_LittleFS_ETH +[env:collection_E_ESP32_IRExt_4M316k] +extends = esp32_IRExt board = esp32_4M -build_flags = ${esp32_IRExt_LittleFS_ETH.build_flags} +build_flags = ${esp32_IRExt.build_flags} -DPLUGIN_SET_COLLECTION_E_ESP32 -[env:collection_F_ESP32_IRExt_4M316k_LittleFS_ETH] -extends = esp32_IRExt_LittleFS_ETH +[env:collection_F_ESP32_IRExt_4M316k] +extends = esp32_IRExt board = esp32_4M -build_flags = ${esp32_IRExt_LittleFS_ETH.build_flags} +build_flags = ${esp32_IRExt.build_flags} -DPLUGIN_SET_COLLECTION_F_ESP32 -[env:collection_G_ESP32_IRExt_4M316k_LittleFS_ETH] -extends = esp32_IRExt_LittleFS_ETH +[env:collection_G_ESP32_IRExt_4M316k] +extends = esp32_IRExt board = esp32_4M -build_flags = ${esp32_IRExt_LittleFS_ETH.build_flags} +build_flags = ${esp32_IRExt.build_flags} -DPLUGIN_SET_COLLECTION_G_ESP32 -[env:energy_ESP32_4M316k_LittleFS_ETH] +[env:energy_ESP32_4M316k] extends = esp32_common_LittleFS_ETH board = esp32_4M build_flags = ${esp32_common_LittleFS_ETH.build_flags} @@ -246,7 +246,7 @@ build_flags = ${esp32_common_LittleFS_ETH.build_flags} -DPLUGIN_ENERGY_COLLECTION -[env:display_A_ESP32_4M316k_LittleFS_ETH] +[env:display_A_ESP32_4M316k] extends = esp32_common_LittleFS_ETH board = esp32_4M build_flags = ${esp32_common_LittleFS.build_flags} @@ -255,7 +255,7 @@ build_flags = ${esp32_common_LittleFS.build_flags} -D ST7789_EXTRA_INIT=1 -D P116_EXTRA_ST7789=1 -[env:display_B_ESP32_4M316k_LittleFS_ETH] +[env:display_B_ESP32_4M316k] extends = esp32_common_LittleFS_ETH board = esp32_4M build_flags = ${esp32_common_LittleFS_ETH.build_flags} @@ -266,7 +266,7 @@ build_flags = ${esp32_common_LittleFS_ETH.build_flags} -[env:climate_ESP32_4M316k_LittleFS_ETH] +[env:climate_ESP32_4M316k] extends = esp32_common_LittleFS_ETH board = esp32_4M lib_ignore = ${esp32_always.lib_ignore} @@ -277,7 +277,7 @@ build_flags = ${esp32_common_LittleFS_ETH.build_flags} -DPLUGIN_CLIMATE_COLLECTION -[env:neopixel_ESP32_4M316k_LittleFS_ETH] +[env:neopixel_ESP32_4M316k] extends = esp32_common_LittleFS_ETH board = esp32_4M build_flags = ${esp32_common_LittleFS_ETH.build_flags} @@ -288,7 +288,7 @@ build_flags = ${esp32_common_LittleFS_ETH.build_flags} -[env:custom_IR_ESP32_16M8M_LittleFS_ETH] +[env:custom_IR_ESP32_16M8M] extends = esp32_common_LittleFS_ETH board = esp32_16M8M board_upload.flash_size = 16MB @@ -304,7 +304,7 @@ extra_scripts = ${esp32_common_LittleFS_ETH.extra_scripts} -[env:normal_ESP32_4M316k_LittleFS_ETH] +[env:normal_ESP32_4M316k] extends = esp32_common_LittleFS_ETH board = esp32_4M lib_ignore = ${esp32_always.lib_ignore} @@ -315,10 +315,10 @@ build_flags = ${esp32_common_LittleFS_ETH.build_flags} -[env:normal_ESP32_IRExt_4M316k_LittleFS_ETH] -extends = esp32_IRExt_LittleFS_ETH +[env:normal_ESP32_IRExt_4M316k] +extends = esp32_IRExt board = esp32_4M -build_flags = ${esp32_IRExt_LittleFS_ETH.build_flags} +build_flags = ${esp32_IRExt.build_flags} @@ -326,7 +326,7 @@ build_flags = ${esp32_IRExt_LittleFS_ETH.build_flags} ; ESP32 MAX builds 16M flash ------------------------------ ; A Lolin D32 PRO with 16MB Flash, allowing 4MB sketch size, and file storage using LittleFS filesystem -[env:max_ESP32_16M8M_LittleFS_ETH] +[env:max_ESP32_16M8M] extends = esp32_common_LittleFS_ETH board = esp32_16M8M board_upload.flash_size = 16MB @@ -343,7 +343,7 @@ extra_scripts = ${esp32_common_LittleFS_ETH.extra_scripts} board_build.filesystem = littlefs ; If you have a board with Ethernet integrated and 16MB Flash, then this configuration could be enabled, it's based on the max_ESP32_16M8M_LittleFS definition -; [env:max_ESP32_16M8M_LittleFS_ETH] +; [env:max_ESP32_16M8M] ; extends = env:max_ESP32_16M8M_LittleFS ; board = ${env:max_ESP32_16M8M_LittleFS.board} ; build_flags = ${env:max_ESP32_16M8M_LittleFS.build_flags} diff --git a/platformio_esp32_solo1.ini b/platformio_esp32_solo1.ini index 9ef308bf0..ce6f9ffd4 100644 --- a/platformio_esp32_solo1.ini +++ b/platformio_esp32_solo1.ini @@ -16,7 +16,7 @@ build_unflags = ${esp32_base_idf5_5.build_unflags} board_build.filesystem = littlefs -[env:custom_ESP32solo1_4M316k_LittleFS_ETH] +[env:custom_ESP32solo1_4M316k] extends = esp32_solo1_common_LittleFS build_flags = ${esp32_solo1_common_LittleFS.build_flags} -DPLUGIN_BUILD_CUSTOM @@ -25,7 +25,7 @@ extra_scripts = ${esp32_solo1_common_LittleFS.extra_scripts} pre:tools/pio/pre_custom_esp32.py -[env:normal_ESP32solo1_4M316k_LittleFS_ETH] +[env:normal_ESP32solo1_4M316k] extends = esp32_solo1_common_LittleFS build_flags = ${esp32_solo1_common_LittleFS.build_flags} -DFEATURE_ETHERNET=1 @@ -34,14 +34,14 @@ lib_ignore = ${esp32_solo1_common_LittleFS.lib_ignore} extra_scripts = ${esp32_solo1_common_LittleFS.extra_scripts} -[env:energy_ESP32solo1_4M316k_LittleFS_ETH] +[env:energy_ESP32solo1_4M316k] extends = esp32_solo1_common_LittleFS build_flags = ${esp32_solo1_common_LittleFS.build_flags} -D PLUGIN_ENERGY_COLLECTION -DFEATURE_ETHERNET=1 extra_scripts = ${esp32_solo1_common_LittleFS.extra_scripts} -[env:climate_ESP32solo1_4M316k_LittleFS_ETH] +[env:climate_ESP32solo1_4M316k] extends = esp32_solo1_common_LittleFS build_flags = ${esp32_solo1_common_LittleFS.build_flags} -D PLUGIN_CLIMATE_COLLECTION diff --git a/platformio_esp32c3_envs.ini b/platformio_esp32c3_envs.ini index 4b1a77f9b..92e8d7e1f 100644 --- a/platformio_esp32c3_envs.ini +++ b/platformio_esp32c3_envs.ini @@ -13,7 +13,7 @@ lib_ignore = ${esp32_base_idf5_5.lib_ignore} board = esp32c3cdc -[env:custom_ESP32c3_4M316k_LittleFS_ETH] +[env:custom_ESP32c3_4M316k] extends = esp32c3_common_LittleFS build_flags = ${esp32c3_common_LittleFS.build_flags} -DPLUGIN_BUILD_CUSTOM @@ -22,89 +22,89 @@ extra_scripts = ${esp32c3_common_LittleFS.extra_scripts} -[env:normal_ESP32c3_4M316k_LittleFS_ETH] +[env:normal_ESP32c3_4M316k] extends = esp32c3_common_LittleFS build_flags = ${esp32c3_common_LittleFS.build_flags} lib_ignore = ${esp32c3_common_LittleFS.lib_ignore} ${no_ir.lib_ignore} -[env:collection_A_ESP32c3_4M316k_LittleFS_ETH] +[env:collection_A_ESP32c3_4M316k] extends = esp32c3_common_LittleFS build_flags = ${esp32c3_common_LittleFS.build_flags} -DPLUGIN_SET_COLLECTION_ESP32 -DPLUGIN_SET_COLLECTION_A_ESP32 -DCOLLECTION_FEATURE_RTTTL=1 -[env:collection_B_ESP32c3_4M316k_LittleFS_ETH] +[env:collection_B_ESP32c3_4M316k] extends = esp32c3_common_LittleFS build_flags = ${esp32c3_common_LittleFS.build_flags} -DPLUGIN_SET_COLLECTION_B_ESP32 -DCOLLECTION_FEATURE_RTTTL=1 -[env:collection_C_ESP32c3_4M316k_LittleFS_ETH] +[env:collection_C_ESP32c3_4M316k] extends = esp32c3_common_LittleFS build_flags = ${esp32c3_common_LittleFS.build_flags} -DPLUGIN_SET_COLLECTION_C_ESP32 -DCOLLECTION_FEATURE_RTTTL=1 -[env:collection_D_ESP32c3_4M316k_LittleFS_ETH] +[env:collection_D_ESP32c3_4M316k] extends = esp32c3_common_LittleFS build_flags = ${esp32c3_common_LittleFS.build_flags} -DPLUGIN_SET_COLLECTION_D_ESP32 -DCOLLECTION_FEATURE_RTTTL=1 -[env:collection_E_ESP32c3_4M316k_LittleFS_ETH] +[env:collection_E_ESP32c3_4M316k] extends = esp32c3_common_LittleFS build_flags = ${esp32c3_common_LittleFS.build_flags} -DPLUGIN_SET_COLLECTION_E_ESP32 -DCOLLECTION_FEATURE_RTTTL=1 -[env:collection_F_ESP32c3_4M316k_LittleFS_ETH] +[env:collection_F_ESP32c3_4M316k] extends = esp32c3_common_LittleFS build_flags = ${esp32c3_common_LittleFS.build_flags} -DPLUGIN_SET_COLLECTION_F_ESP32 -DCOLLECTION_FEATURE_RTTTL=1 -[env:collection_G_ESP32c3_4M316k_LittleFS_ETH] +[env:collection_G_ESP32c3_4M316k] extends = esp32c3_common_LittleFS build_flags = ${esp32c3_common_LittleFS.build_flags} -DPLUGIN_SET_COLLECTION_G_ESP32 -DCOLLECTION_FEATURE_RTTTL=1 -[env:energy_ESP32c3_4M316k_LittleFS_ETH] +[env:energy_ESP32c3_4M316k] extends = esp32c3_common_LittleFS build_flags = ${esp32c3_common_LittleFS.build_flags} -D PLUGIN_ENERGY_COLLECTION -[env:display_A_ESP32c3_4M316k_LittleFS_ETH] +[env:display_A_ESP32c3_4M316k] extends = esp32c3_common_LittleFS build_flags = ${esp32c3_common_LittleFS.build_flags} -D PLUGIN_DISPLAY_A_COLLECTION -D ST7789_EXTRA_INIT=1 -D P116_EXTRA_ST7789=1 -[env:display_B_ESP32c3_4M316k_LittleFS_ETH] +[env:display_B_ESP32c3_4M316k] extends = esp32c3_common_LittleFS build_flags = ${esp32c3_common_LittleFS.build_flags} -D PLUGIN_DISPLAY_B_COLLECTION -D ST7789_EXTRA_INIT=1 -D P116_EXTRA_ST7789=1 -[env:climate_ESP32c3_4M316k_LittleFS_ETH] +[env:climate_ESP32c3_4M316k] extends = esp32c3_common_LittleFS build_flags = ${esp32c3_common_LittleFS.build_flags} -D PLUGIN_CLIMATE_COLLECTION -[env:neopixel_ESP32c3_4M316k_LittleFS_ETH] +[env:neopixel_ESP32c3_4M316k] extends = esp32c3_common_LittleFS build_flags = ${esp32c3_common_LittleFS.build_flags} -DFEATURE_ARDUINO_OTA=1 -DFEATURE_SD=1 -DPLUGIN_NEOPIXEL_COLLECTION -[env:max_ESP32c3_16M8M_LittleFS_ETH] +[env:max_ESP32c3_16M8M] extends = esp32c3_common_LittleFS board = esp32c3cdc-16M build_flags = ${esp32c3_common_LittleFS.build_flags} diff --git a/platformio_esp32c5_envs.ini b/platformio_esp32c5_envs.ini index 6998ba52e..d84a15971 100644 --- a/platformio_esp32c5_envs.ini +++ b/platformio_esp32c5_envs.ini @@ -14,7 +14,7 @@ lib_ignore = ${esp32_base_idf5_5.lib_ignore} board = esp32c5cdc -[env:max_ESP32c5_8M1M_LittleFS_ETH] +[env:max_ESP32c5_8M1M] extends = esp32c5_common_LittleFS board = esp32c5cdc-8M build_flags = ${esp32c5_common_LittleFS.build_flags} diff --git a/platformio_esp32c61_envs.ini b/platformio_esp32c61_envs.ini index 9f5a7d750..f0f0b5f34 100644 --- a/platformio_esp32c61_envs.ini +++ b/platformio_esp32c61_envs.ini @@ -12,7 +12,7 @@ lib_ignore = ${esp32_base_idf5_5.lib_ignore} board = esp32c61cdc -[env:max_ESP32c61_8M1M_LittleFS_ETH] +[env:max_ESP32c61_8M1M] extends = esp32c61_common_LittleFS board = esp32c61cdc-8M build_flags = ${esp32c61_common_LittleFS.build_flags} diff --git a/platformio_esp32c6_envs.ini b/platformio_esp32c6_envs.ini index ff2f7c9f8..5cb174807 100644 --- a/platformio_esp32c6_envs.ini +++ b/platformio_esp32c6_envs.ini @@ -13,7 +13,7 @@ lib_ignore = ${esp32_base_idf5_5.lib_ignore} board = esp32c6cdc -[env:custom_ESP32c6_4M316k_LittleFS_ETH] +[env:custom_ESP32c6_4M316k] extends = esp32c6_common_LittleFS build_flags = ${esp32c6_common_LittleFS.build_flags} -DPLUGIN_BUILD_CUSTOM @@ -22,39 +22,39 @@ extra_scripts = ${esp32c6_common_LittleFS.extra_scripts} pre:tools/pio/pre_custom_esp32c6.py -[env:normal_ESP32c6_4M316k_LittleFS_ETH] +[env:normal_ESP32c6_4M316k] extends = esp32c6_common_LittleFS build_flags = ${esp32c6_common_LittleFS.build_flags} -DFEATURE_ETHERNET=1 lib_ignore = ${esp32c6_common_LittleFS.lib_ignore} ${no_ir.lib_ignore} -[env:energy_ESP32c6_4M316k_LittleFS_ETH] +[env:energy_ESP32c6_4M316k] extends = esp32c6_common_LittleFS build_flags = ${esp32c6_common_LittleFS.build_flags} -D PLUGIN_ENERGY_COLLECTION -[env:display_A_ESP32c6_4M316k_LittleFS_ETH] +[env:display_A_ESP32c6_4M316k] extends = esp32c6_common_LittleFS build_flags = ${esp32c6_common_LittleFS.build_flags} -D PLUGIN_DISPLAY_A_COLLECTION -D ST7789_EXTRA_INIT=1 -D P116_EXTRA_ST7789=1 -[env:display_B_ESP32c6_4M316k_LittleFS_ETH] +[env:display_B_ESP32c6_4M316k] extends = esp32c6_common_LittleFS build_flags = ${esp32c6_common_LittleFS.build_flags} -D PLUGIN_DISPLAY_B_COLLECTION -D ST7789_EXTRA_INIT=1 -D P116_EXTRA_ST7789=1 -[env:climate_ESP32c6_4M316k_LittleFS_ETH] +[env:climate_ESP32c6_4M316k] extends = esp32c6_common_LittleFS build_flags = ${esp32c6_common_LittleFS.build_flags} -D PLUGIN_CLIMATE_COLLECTION -[env:neopixel_ESP32c6_4M316k_LittleFS_ETH] +[env:neopixel_ESP32c6_4M316k] extends = esp32c6_common_LittleFS build_flags = ${esp32c6_common_LittleFS.build_flags} -DFEATURE_ARDUINO_OTA=1 @@ -62,7 +62,7 @@ build_flags = ${esp32c6_common_LittleFS.build_flags} -DPLUGIN_NEOPIXEL_COLLECTION -[env:max_ESP32c6_8M1M_LittleFS_ETH] +[env:max_ESP32c6_8M1M] extends = esp32c6_common_LittleFS board = esp32c6cdc-8M build_flags = ${esp32c6_common_LittleFS.build_flags} @@ -75,7 +75,7 @@ build_flags = ${esp32c6_common_LittleFS.build_flags} extra_scripts = ${esp32c6_common_LittleFS.extra_scripts} -[env:max_ESP32c6_16M8M_LittleFS_ETH] +[env:max_ESP32c6_16M8M] extends = esp32c6_common_LittleFS board = esp32c6cdc-16M build_flags = ${esp32c6_common_LittleFS.build_flags} diff --git a/platformio_esp32p4_envs.ini b/platformio_esp32p4_envs.ini index 5f3380910..fb4bd2dcd 100644 --- a/platformio_esp32p4_envs.ini +++ b/platformio_esp32p4_envs.ini @@ -14,7 +14,7 @@ lib_ignore = ${esp32_base_idf5_5.lib_ignore} board = esp32p4_ev -[env:max_ESP32p4_16M8M_LittleFS_ETH] +[env:max_ESP32p4_16M8M] extends = esp32p4_common_LittleFS board = esp32p4_ev build_flags = ${esp32p4_common_LittleFS.build_flags} diff --git a/platformio_esp32s2_envs.ini b/platformio_esp32s2_envs.ini index c3b50a24c..3acd10a1d 100644 --- a/platformio_esp32s2_envs.ini +++ b/platformio_esp32s2_envs.ini @@ -12,7 +12,7 @@ board_build.filesystem = littlefs lib_ignore = ${esp32_base_idf5_5.lib_ignore} -[env:neopixel_ESP32s2_4M316k_LittleFS_ETH] +[env:neopixel_ESP32s2_4M316k] extends = esp32s2_common_LittleFS board = esp32s2cdc build_flags = ${esp32s2_common_LittleFS.build_flags} @@ -22,7 +22,7 @@ build_flags = ${esp32s2_common_LittleFS.build_flags} -[env:custom_IR_ESP32s2_4M316k_LittleFS_ETH] +[env:custom_IR_ESP32s2_4M316k] extends = esp32s2_common_LittleFS board = esp32s2cdc build_flags = ${esp32s2_common_LittleFS.build_flags} @@ -35,7 +35,7 @@ extra_scripts = ${esp32s2_common_LittleFS.extra_scripts} pre:tools/pio/ir_build_check.py -[env:custom_ESP32s2_4M316k_LittleFS_ETH] +[env:custom_ESP32s2_4M316k] extends = esp32s2_common_LittleFS board = esp32s2cdc lib_ignore = ${esp32s2_common_LittleFS.lib_ignore} @@ -48,7 +48,7 @@ extra_scripts = ${esp32s2_common_LittleFS.extra_scripts} -[env:normal_ESP32s2_4M316k_LittleFS_ETH] +[env:normal_ESP32s2_4M316k] extends = esp32s2_common_LittleFS board = esp32s2cdc build_flags = ${esp32s2_common_LittleFS.build_flags} @@ -56,7 +56,7 @@ build_flags = ${esp32s2_common_LittleFS.build_flags} lib_ignore = ${esp32s2_common_LittleFS.lib_ignore} ${no_ir.lib_ignore} -[env:collection_A_ESP32s2_4M316k_LittleFS_ETH] +[env:collection_A_ESP32s2_4M316k] extends = esp32s2_common_LittleFS board = esp32s2cdc build_flags = ${esp32s2_common_LittleFS.build_flags} @@ -64,42 +64,42 @@ build_flags = ${esp32s2_common_LittleFS.build_flags} -DPLUGIN_SET_COLLECTION_A_ESP32 -DCOLLECTION_FEATURE_RTTTL=1 -[env:collection_B_ESP32s2_4M316k_LittleFS_ETH] +[env:collection_B_ESP32s2_4M316k] extends = esp32s2_common_LittleFS board = esp32s2cdc build_flags = ${esp32s2_common_LittleFS.build_flags} -DPLUGIN_SET_COLLECTION_B_ESP32 -DCOLLECTION_FEATURE_RTTTL=1 -[env:collection_C_ESP32s2_4M316k_LittleFS_ETH] +[env:collection_C_ESP32s2_4M316k] extends = esp32s2_common_LittleFS board = esp32s2cdc build_flags = ${esp32s2_common_LittleFS.build_flags} -DPLUGIN_SET_COLLECTION_C_ESP32 -DCOLLECTION_FEATURE_RTTTL=1 -[env:collection_D_ESP32s2_4M316k_LittleFS_ETH] +[env:collection_D_ESP32s2_4M316k] extends = esp32s2_common_LittleFS board = esp32s2cdc build_flags = ${esp32s2_common_LittleFS.build_flags} -DPLUGIN_SET_COLLECTION_D_ESP32 -DCOLLECTION_FEATURE_RTTTL=1 -[env:collection_E_ESP32s2_4M316k_LittleFS_ETH] +[env:collection_E_ESP32s2_4M316k] extends = esp32s2_common_LittleFS board = esp32s2cdc build_flags = ${esp32s2_common_LittleFS.build_flags} -DPLUGIN_SET_COLLECTION_E_ESP32 -DCOLLECTION_FEATURE_RTTTL=1 -[env:collection_F_ESP32s2_4M316k_LittleFS_ETH] +[env:collection_F_ESP32s2_4M316k] extends = esp32s2_common_LittleFS board = esp32s2cdc build_flags = ${esp32s2_common_LittleFS.build_flags} -DPLUGIN_SET_COLLECTION_F_ESP32 -DCOLLECTION_FEATURE_RTTTL=1 -[env:collection_G_ESP32s2_4M316k_LittleFS_ETH] +[env:collection_G_ESP32s2_4M316k] extends = esp32s2_common_LittleFS board = esp32s2cdc build_flags = ${esp32s2_common_LittleFS.build_flags} @@ -107,13 +107,13 @@ build_flags = ${esp32s2_common_LittleFS.build_flags} -DCOLLECTION_FEATURE_RTTTL=1 -[env:energy_ESP32s2_4M316k_LittleFS_ETH] +[env:energy_ESP32s2_4M316k] extends = esp32s2_common_LittleFS board = esp32s2cdc build_flags = ${esp32s2_common_LittleFS.build_flags} -D PLUGIN_ENERGY_COLLECTION -[env:display_A_ESP32s2_4M316k_LittleFS_ETH] +[env:display_A_ESP32s2_4M316k] extends = esp32s2_common_LittleFS board = esp32s2cdc build_flags = ${esp32s2_common_LittleFS.build_flags} @@ -121,7 +121,7 @@ build_flags = ${esp32s2_common_LittleFS.build_flags} -D ST7789_EXTRA_INIT=1 -D P116_EXTRA_ST7789=1 -[env:display_B_ESP32s2_4M316k_LittleFS_ETH] +[env:display_B_ESP32s2_4M316k] extends = esp32s2_common_LittleFS board = esp32s2cdc build_flags = ${esp32s2_common_LittleFS.build_flags} @@ -129,7 +129,7 @@ build_flags = ${esp32s2_common_LittleFS.build_flags} -D ST7789_EXTRA_INIT=1 -D P116_EXTRA_ST7789=1 -[env:climate_ESP32s2_4M316k_LittleFS_ETH] +[env:climate_ESP32s2_4M316k] extends = esp32s2_common_LittleFS board = esp32s2cdc build_flags = ${esp32s2_common_LittleFS.build_flags} diff --git a/platformio_esp32s3_envs.ini b/platformio_esp32s3_envs.ini index 26098b043..eca111a84 100644 --- a/platformio_esp32s3_envs.ini +++ b/platformio_esp32s3_envs.ini @@ -15,7 +15,7 @@ build_unflags = ${esp32_base_idf5_5.build_unflags} board_build.filesystem = littlefs -[env:custom_ESP32s3_4M316k_LittleFS_ETH] +[env:custom_ESP32s3_4M316k] extends = esp32s3_common_LittleFS board = esp32s3cdc-qio_qspi build_flags = ${esp32s3_common_LittleFS.build_flags} @@ -24,7 +24,7 @@ extra_scripts = ${esp32s3_common_LittleFS.extra_scripts} pre:tools/pio/pre_custom_esp32.py -[env:custom_IR_ESP32s3_4M316k_LittleFS_ETH] +[env:custom_IR_ESP32s3_4M316k] extends = esp32s3_common_LittleFS board = esp32s3cdc-qio_qspi build_flags = ${esp32s3_common_LittleFS.build_flags} @@ -37,7 +37,7 @@ extra_scripts = ${esp32s3_common_LittleFS.extra_scripts} pre:tools/pio/ir_build_check.py -[env:normal_ESP32s3_4M316k_LittleFS_ETH] +[env:normal_ESP32s3_4M316k] extends = esp32s3_common_LittleFS board = esp32s3cdc-qio_qspi lib_ignore = ${esp32s3_common_LittleFS.lib_ignore} @@ -47,7 +47,7 @@ build_flags = ${esp32s3_common_LittleFS.build_flags} -DFEATURE_SD=1 -[env:collection_A_ESP32s3_4M316k_LittleFS_ETH] +[env:collection_A_ESP32s3_4M316k] extends = esp32s3_common_LittleFS board = esp32s3cdc-qio_qspi build_flags = ${esp32s3_common_LittleFS.build_flags} @@ -55,42 +55,42 @@ build_flags = ${esp32s3_common_LittleFS.build_flags} -DPLUGIN_SET_COLLECTION_A_ESP32 -DCOLLECTION_FEATURE_RTTTL=1 -[env:collection_B_ESP32s3_4M316k_LittleFS_ETH] +[env:collection_B_ESP32s3_4M316k] extends = esp32s3_common_LittleFS board = esp32s3cdc-qio_qspi build_flags = ${esp32s3_common_LittleFS.build_flags} -DPLUGIN_SET_COLLECTION_B_ESP32 -DCOLLECTION_FEATURE_RTTTL=1 -[env:collection_C_ESP32s3_4M316k_LittleFS_ETH] +[env:collection_C_ESP32s3_4M316k] extends = esp32s3_common_LittleFS board = esp32s3cdc-qio_qspi build_flags = ${esp32s3_common_LittleFS.build_flags} -DPLUGIN_SET_COLLECTION_C_ESP32 -DCOLLECTION_FEATURE_RTTTL=1 -[env:collection_D_ESP32s3_4M316k_LittleFS_ETH] +[env:collection_D_ESP32s3_4M316k] extends = esp32s3_common_LittleFS board = esp32s3cdc-qio_qspi build_flags = ${esp32s3_common_LittleFS.build_flags} -DPLUGIN_SET_COLLECTION_D_ESP32 -DCOLLECTION_FEATURE_RTTTL=1 -[env:collection_E_ESP32s3_4M316k_LittleFS_ETH] +[env:collection_E_ESP32s3_4M316k] extends = esp32s3_common_LittleFS board = esp32s3cdc-qio_qspi build_flags = ${esp32s3_common_LittleFS.build_flags} -DPLUGIN_SET_COLLECTION_E_ESP32 -DCOLLECTION_FEATURE_RTTTL=1 -[env:collection_F_ESP32s3_4M316k_LittleFS_ETH] +[env:collection_F_ESP32s3_4M316k] extends = esp32s3_common_LittleFS board = esp32s3cdc-qio_qspi build_flags = ${esp32s3_common_LittleFS.build_flags} -DPLUGIN_SET_COLLECTION_F_ESP32 -DCOLLECTION_FEATURE_RTTTL=1 -[env:collection_G_ESP32s3_4M316k_LittleFS_ETH] +[env:collection_G_ESP32s3_4M316k] extends = esp32s3_common_LittleFS board = esp32s3cdc-qio_qspi build_flags = ${esp32s3_common_LittleFS.build_flags} @@ -98,13 +98,13 @@ build_flags = ${esp32s3_common_LittleFS.build_flags} -DCOLLECTION_FEATURE_RTTTL=1 -[env:energy_ESP32s3_4M316k_LittleFS_ETH] +[env:energy_ESP32s3_4M316k] extends = esp32s3_common_LittleFS board = esp32s3cdc-qio_qspi build_flags = ${esp32s3_common_LittleFS.build_flags} -D PLUGIN_ENERGY_COLLECTION -[env:display_A_ESP32s3_4M316k_LittleFS_ETH] +[env:display_A_ESP32s3_4M316k] extends = esp32s3_common_LittleFS board = esp32s3cdc-qio_qspi build_flags = ${esp32s3_common_LittleFS.build_flags} @@ -112,7 +112,7 @@ build_flags = ${esp32s3_common_LittleFS.build_flags} -D ST7789_EXTRA_INIT=1 -D P116_EXTRA_ST7789=1 -[env:display_B_ESP32s3_4M316k_LittleFS_ETH] +[env:display_B_ESP32s3_4M316k] extends = esp32s3_common_LittleFS board = esp32s3cdc-qio_qspi build_flags = ${esp32s3_common_LittleFS.build_flags} @@ -120,14 +120,14 @@ build_flags = ${esp32s3_common_LittleFS.build_flags} -D ST7789_EXTRA_INIT=1 -D P116_EXTRA_ST7789=1 -[env:climate_ESP32s3_4M316k_LittleFS_ETH] +[env:climate_ESP32s3_4M316k] extends = esp32s3_common_LittleFS board = esp32s3cdc-qio_qspi build_flags = ${esp32s3_common_LittleFS.build_flags} -D PLUGIN_CLIMATE_COLLECTION -[env:neopixel_ESP32s3_4M316k_LittleFS_ETH] +[env:neopixel_ESP32s3_4M316k] extends = esp32s3_common_LittleFS board = esp32s3cdc-qio_qspi build_flags = ${esp32s3_common_LittleFS.build_flags} @@ -137,7 +137,7 @@ build_flags = ${esp32s3_common_LittleFS.build_flags} -[env:custom_ESP32s3_8M1M_LittleFS_ETH] +[env:custom_ESP32s3_8M1M] extends = esp32s3_common_LittleFS board = esp32s3cdc-qio_qspi-8M build_flags = ${esp32s3_common_LittleFS.build_flags} @@ -147,12 +147,12 @@ build_flags = ${esp32s3_common_LittleFS.build_flags} extra_scripts = ${esp32s3_common_LittleFS.extra_scripts} pre:tools/pio/pre_custom_esp32.py -[env:custom_ESP32s3_8M1M_LittleFS_OPI_PSRAM_ETH] -extends = env:custom_ESP32s3_8M1M_LittleFS_ETH +[env:custom_ESP32s3_8M1M_OPI_PSRAM] +extends = env:custom_ESP32s3_8M1M board = esp32s3cdc-qio_opi-8M -[env:max_ESP32s3_8M1M_LittleFS_ETH] +[env:max_ESP32s3_8M1M] extends = esp32s3_common_LittleFS board = esp32s3cdc-qio_qspi-8M build_flags = ${esp32s3_common_LittleFS.build_flags} @@ -164,12 +164,12 @@ build_flags = ${esp32s3_common_LittleFS.build_flags} extra_scripts = ${esp32s3_common_LittleFS.extra_scripts} -[env:max_ESP32s3_8M1M_LittleFS_OPI_PSRAM_ETH] -extends = env:max_ESP32s3_8M1M_LittleFS_ETH +[env:max_ESP32s3_8M1M_OPI_PSRAM] +extends = env:max_ESP32s3_8M1M board = esp32s3cdc-qio_opi-8M -[env:custom_ESP32s3_16M8M_LittleFS_ETH] +[env:custom_ESP32s3_16M8M] extends = esp32s3_common_LittleFS board = esp32s3cdc-qio_qspi-16M build_flags = ${esp32s3_common_LittleFS.build_flags} @@ -180,12 +180,12 @@ build_flags = ${esp32s3_common_LittleFS.build_flags} extra_scripts = ${esp32s3_common_LittleFS.extra_scripts} pre:tools/pio/pre_custom_esp32.py -[env:custom_ESP32s3_16M8M_LittleFS_OPI_PSRAM_ETH] -extends = env:custom_ESP32s3_16M8M_LittleFS_ETH +[env:custom_ESP32s3_16M8M_OPI_PSRAM] +extends = env:custom_ESP32s3_16M8M board = esp32s3cdc-qio_opi-16M -[env:max_ESP32s3_16M8M_LittleFS_ETH] +[env:max_ESP32s3_16M8M] extends = esp32s3_common_LittleFS board = esp32s3cdc-qio_qspi-16M build_flags = ${esp32s3_common_LittleFS.build_flags} @@ -198,7 +198,7 @@ extra_scripts = ${esp32s3_common_LittleFS.extra_scripts} ;custom_sdkconfig = '# CONFIG_ESP_MODEM_CMUX_DEFRAGMENT_PAYLOAD is not set' -[env:max_ESP32s3_16M8M_LittleFS_OPI_PSRAM_ETH] +[env:max_ESP32s3_16M8M_OPI_PSRAM] extends = esp32s3_common_LittleFS board = esp32s3cdc-qio_opi-16M build_flags = ${esp32s3_common_LittleFS.build_flags} From b3aa9a9d263764aea9e9c697aab71cdaea2bfce6 Mon Sep 17 00:00:00 2001 From: TD-er Date: Wed, 5 Nov 2025 10:23:27 +0100 Subject: [PATCH 450/564] [Build] Fix build fail with builds without Ethernet support --- src/ESPEasy/net/_NWPlugin_Helper.cpp | 2 +- src/ESPEasy/net/_NWPlugin_Helper.h | 6 +++++- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/src/ESPEasy/net/_NWPlugin_Helper.cpp b/src/ESPEasy/net/_NWPlugin_Helper.cpp index 66791ba06..b8cedd639 100644 --- a/src/ESPEasy/net/_NWPlugin_Helper.cpp +++ b/src/ESPEasy/net/_NWPlugin_Helper.cpp @@ -84,7 +84,7 @@ bool nwpluginTaskData_initialized(ESPEasy::net::networkIndex_t networkIndex) { (NWPlugin_task_data[networkIndex]->getNWPluginID() == Settings.getNWPluginID_for_network(networkIndex)); } -#if FEATURE_ESPEASY_KEY_VALUE_STORE +#if FEATURE_STORE_NETWORK_INTERFACE_SETTINGS bool load_nwpluginTaskData_KVS(ESPEasy_key_value_store *kvs, ESPEasy::net::networkIndex_t networkIndex, ESPEasy::net::nwpluginID_t nwPluginID) { diff --git a/src/ESPEasy/net/_NWPlugin_Helper.h b/src/ESPEasy/net/_NWPlugin_Helper.h index 24098291b..04137ca2a 100644 --- a/src/ESPEasy/net/_NWPlugin_Helper.h +++ b/src/ESPEasy/net/_NWPlugin_Helper.h @@ -9,6 +9,10 @@ #include "../net/DataStructs/NWPluginData_base.h" #include "../net/ESPEasyNetwork.h" +#if FEATURE_STORE_NETWORK_INTERFACE_SETTINGS +#include "../../src/Helpers/_ESPEasy_key_value_store.h" +#endif + namespace ESPEasy { namespace net { @@ -34,7 +38,7 @@ bool initNWPluginData(ESPEasy::net::networkIndex_t networkIndex, NWPluginData_base* getNWPluginData(ESPEasy::net::networkIndex_t networkIndex); bool nwpluginTaskData_initialized(ESPEasy::net::networkIndex_t networkIndex); -#if FEATURE_ESPEASY_KEY_VALUE_STORE +#if FEATURE_STORE_NETWORK_INTERFACE_SETTINGS bool load_nwpluginTaskData_KVS(ESPEasy_key_value_store *kvs, ESPEasy::net::networkIndex_t networkIndex, ESPEasy::net::nwpluginID_t nwPluginID); bool store_nwpluginTaskData_KVS(ESPEasy_key_value_store *kvs, ESPEasy::net::networkIndex_t networkIndex, ESPEasy::net::nwpluginID_t nwPluginID); #endif From d4b1f02b6e87d7bbf02dd82a5f1e024c7fd91919 Mon Sep 17 00:00:00 2001 From: TD-er Date: Wed, 5 Nov 2025 11:37:58 +0100 Subject: [PATCH 451/564] [ESP32-P4] Disable OTA update for ESP-HOSTED-MCU on ESP32P4 for now --- src/src/Commands/WiFi.cpp | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/src/src/Commands/WiFi.cpp b/src/src/Commands/WiFi.cpp index f87464cef..bd58228dd 100644 --- a/src/src/Commands/WiFi.cpp +++ b/src/src/Commands/WiFi.cpp @@ -177,7 +177,9 @@ String Command_Wifi_OTA_hosted_mcu( } addLog(LOG_LEVEL_INFO, concat(F("OTA update esp-hosted-mcu: "), url)); - +// FIXME TD-er: Must implement new API. See https://github.com/espressif/esp-hosted-mcu/blob/main/examples/host_performs_slave_ota/main/main.c +// Current implementation does not work, so will disable for now... +/* esp_err_t err = esp_hosted_slave_ota(url.c_str()); if (err != ESP_OK) { @@ -185,6 +187,7 @@ String Command_Wifi_OTA_hosted_mcu( addLog(LOG_LEVEL_ERROR, str); return str; } +*/ } return return_command_success_flashstr(); } From c3f952f086ebe543b50613279d712c9165accced Mon Sep 17 00:00:00 2001 From: TD-er Date: Wed, 5 Nov 2025 11:38:48 +0100 Subject: [PATCH 452/564] [Build] Enable `custom_remove_include` to not build ignored libs --- platformio_core_defs.ini | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/platformio_core_defs.ini b/platformio_core_defs.ini index b466c0628..ddb4c8f7e 100644 --- a/platformio_core_defs.ini +++ b/platformio_core_defs.ini @@ -170,6 +170,7 @@ platform = https://github.com/Jason2866/platform-espressif32. ;platform_packages = platform_packages = framework-arduinoespressif32 @ https://github.com/Jason2866/esp32-arduino-lib-builder/releases/download/0411-1300-5.5/framework-arduinoespressif32-release_v5.5-0fb83661.tar.xz +custom_remove_include = true build_flags = -DESP32_STAGE -DESP_IDF_VERSION_MAJOR=5 -DLIBRARIES_NO_LOG=1 @@ -192,7 +193,7 @@ build_flags = -DESP32_STAGE -DUPDATE_NOCRYPT -O3 ; -Wnull-dereference -lib_ignore = +lib_ignore = BLE lib_extra_dirs = lib/lib_ssl From e729dc57a6ac25bc8988db0f98e31c4a088b4f7a Mon Sep 17 00:00:00 2001 From: Ton Huisman Date: Wed, 5 Nov 2025 21:07:30 +0100 Subject: [PATCH 453/564] [Build] Remove _LittleFS and _ETH from build names due to linker issues --- .gitignore | 22 +++++---- README.md | 26 +++++----- platformio.ini | 4 +- platformio_esp32_envs.ini | 98 ++++++++++++++++++------------------- platformio_esp32_solo1.ini | 8 +-- platformio_esp32c3_envs.ini | 30 ++++++------ platformio_esp32c6_envs.ini | 18 +++---- platformio_esp32s2_envs.ini | 30 ++++++------ platformio_esp32s3_envs.ini | 52 ++++++++++---------- 9 files changed, 146 insertions(+), 142 deletions(-) diff --git a/.gitignore b/.gitignore index 71a3dc59c..66033fd3b 100644 --- a/.gitignore +++ b/.gitignore @@ -72,19 +72,21 @@ docs/source/Plugin/_plugin_sets_overview.repl .platformio/ .pio/ - -managed_components/ + +managed_components/ CMakeLists.txt -sdkconfig.max_ESP32s3_16M8M_LittleFS_OPI_PSRAM_ETH +sdkconfig.max_ESP32s3_16M8M_OPI_PSRAM sdkconfig.defaults -dependencies.lock - -.dummy/ - -.cache/ - -src/src/CustomBuild/CompiletimeDefines_generated.h +dependencies.lock + +.dummy/ + +.cache/ + +src/src/CustomBuild/CompiletimeDefines_generated.h + +bhutan_16m.bin diff --git a/README.md b/README.md index 7e170d399..c01e8dcdd 100644 --- a/README.md +++ b/README.md @@ -112,6 +112,8 @@ Flash size | Description | N.B. Starting with release 2023/12/25, All ESP32 LittleFS builds use IDF 5.3, to support newer ESP32 chips like ESP32-C2 and ESP32-C6, and SPI Ethernet. Other SPIFFS based ESP32 builds will be migrated to LittleFS as SPIFFS is no longer officially available in IDF 5 and later. As a temporary solution, a specially crafted IDF 5.1 build that still includes SPIFFS, is used for the SPIFFS builds. A migration plan will be made available in 2025. +N.B.2 Starting with builds made after 2025/11/04, ESP32 builds will no longer have ``_LittleFS`` in the name as all ESP32 builds use LittleFS. Also the suffix ``_ETH`` has been removed since all builds will have Ethernet support, except for ESP32C2 builds. + *[opt-build-features]* can be any of: Build features | Description | ----------------|-----------------------------------------------------------------------------------------------------------| @@ -129,18 +131,18 @@ noOTA/NO_OTA | Does not support OTA (Over The Air-updating of the firmware) U N.B. Starting ca. 2025/02/27, many ESP32 builds are *only* available with _ETH suffix, indicating that Ethernet support is enabled, to reduce the (rather high) number of builds. Some example firmware names: -Firmware name | Hardware | Included plugins | -----------------------------------------------------------------------|-------------------------------------------------|----------------------------------| -ESPEasy_mega-20230822_normal_ESP8266_1M.bin | ESP8266/ESP8285 with 1MB flash | Stable | -ESPEasy_mega-20230822_normal_ESP8266_4M1M.bin | ESP8266 with 4MB flash | Stable | -ESPEasy_mega-20230822_collection_A_ESP8266_4M1M.bin | ESP8266 with 4MB flash | Stable + Collection base + set A | -ESPEasy_mega-20230822_normal_ESP32_4M316k_ETH.bin | ESP32 with 4MB flash | Stable | -ESPEasy_mega-20230822_collection_A_ESP32_4M316k_ETH.bin | ESP32 with 4MB flash | Stable + Collection base + set A | -ESPEasy_mega-20230822_collection_B_ESP32_4M316k_ETH.bin | ESP32 with 4MB flash | Stable + Collection base + set B | -ESPEasy_mega-20230822_max_ESP32s3_8M1M_LittleFS_ETH.bin | ESP32-S3 with 8MB flash, CDC-serial, Ethernet | All available plugins | -ESPEasy_mega-20230822_max_ESP32s3_8M1M_LittleFS_OPI_PSRAM_ETH.bin | ESP32-S3 8MB flash, PSRAM, CDC-serial, Ethernet | All available plugins | -ESPEasy_mega-20230822_max_ESP32_16M1M_ETH.bin | ESP32 with 16MB flash, SPIFFS, Ethernet | All available plugins | -ESPEasy_mega-20230822_max_ESP32_16M8M_LittleFS_ETH.bin | ESP32 with 16MB flash, LittleFS, Ethernet | All available plugins | +Firmware name | Hardware | Included plugins | +--------------------------------------------------------|-------------------------------------------------|----------------------------------| +ESPEasy_mega-20230822_normal_ESP8266_1M.bin | ESP8266/ESP8285 with 1MB flash | Stable | +ESPEasy_mega-20230822_normal_ESP8266_4M1M.bin | ESP8266 with 4MB flash | Stable | +ESPEasy_mega-20230822_collection_A_ESP8266_4M1M.bin | ESP8266 with 4MB flash | Stable + Collection base + set A | +ESPEasy_mega-20230822_normal_ESP32_4M316k_ETH.bin | ESP32 with 4MB flash | Stable | +ESPEasy_mega-20230822_collection_A_ESP32_4M316k_ETH.bin | ESP32 with 4MB flash | Stable + Collection base + set A | +ESPEasy_mega-20230822_collection_B_ESP32_4M316k_ETH.bin | ESP32 with 4MB flash | Stable + Collection base + set B | +ESPEasy_mega-20230822_max_ESP32s3_8M1M.bin | ESP32-S3 with 8MB flash, CDC-serial, Ethernet | All available plugins | +ESPEasy_mega-20230822_max_ESP32s3_8M1M_OPI_PSRAM.bin | ESP32-S3 8MB flash, PSRAM, CDC-serial, Ethernet | All available plugins | +ESPEasy_mega-20230822_max_ESP32_16M1M_ETH.bin | ESP32 with 16MB flash, SPIFFS, Ethernet | All available plugins | +ESPEasy_mega-20230822_max_ESP32_16M8M.bin | ESP32 with 16MB flash, LittleFS, Ethernet | All available plugins | The binary files for the different ESP32 variants (S2, C3, S3, C2, C6, Solo1, 'Classic') are available in separate archives. diff --git a/platformio.ini b/platformio.ini index 6430530f1..e2f149034 100644 --- a/platformio.ini +++ b/platformio.ini @@ -31,8 +31,8 @@ extra_configs = ;default_envs = normal_ESP32_4M -default_envs = max_ESP32_16M8M_LittleFS_ETH -;default_envs = max_ESP32c5_8M1M_LittleFS_ETH +default_envs = max_ESP32_16M8M +;default_envs = max_ESP32c5_8M1M ;default_envs = normal_ESP32c6_4M316k_LittleFS_CDC ; default_envs = custom_ESP8266_4M1M diff --git a/platformio_esp32_envs.ini b/platformio_esp32_envs.ini index e64577096..060e49fc7 100644 --- a/platformio_esp32_envs.ini +++ b/platformio_esp32_envs.ini @@ -66,7 +66,7 @@ lib_ignore = ${esp32_always.lib_ignore} ${esp32_base_idf5.lib_ignore} -[esp32_IRExt_LittleFS_ETH] +[esp32_IRExt] extends = esp32_common_LittleFS_ETH lib_ignore = ${esp32_always.lib_ignore} ESP32_ping @@ -88,21 +88,21 @@ extra_scripts = ${esp32_common_LittleFS_ETH.extra_scripts} pre:tools/pio/pre_custom_esp32.py -[env:custom_ESP32_4M316k_LittleFS_ETH] +[env:custom_ESP32_4M316k] extends = esp32_custom_base_LittleFS board = esp32_4M build_flags = ${esp32_custom_base_LittleFS.build_flags} -DFEATURE_ETHERNET=1 -[env:custom_ESP32_16M8M_LittleFS_ETH] -extends = env:custom_ESP32_4M316k_LittleFS_ETH +[env:custom_ESP32_16M8M] +extends = env:custom_ESP32_4M316k board = esp32_16M8M board_upload.flash_size = 16MB -build_flags = ${env:custom_ESP32_4M316k_LittleFS_ETH.build_flags} +build_flags = ${env:custom_ESP32_4M316k.build_flags} -[env:custom_IR_ESP32_4M316k_LittleFS_ETH] +[env:custom_IR_ESP32_4M316k] extends = esp32_common_LittleFS_ETH board = esp32_4M build_flags = ${esp32_common_LittleFS_ETH.build_flags} @@ -115,15 +115,15 @@ extra_scripts = ${esp32_common_LittleFS_ETH.extra_scripts} pre:tools/pio/pre_custom_esp32_IR.py pre:tools/pio/ir_build_check.py -[env:custom_ESP32_4M2M_NO_OTA_LittleFS_ETH] -extends = env:custom_ESP32_4M316k_LittleFS_ETH +[env:custom_ESP32_4M2M_NO_OTA] +extends = env:custom_ESP32_4M316k board = esp32_4M2M -build_flags = ${env:custom_ESP32_4M316k_LittleFS_ETH.build_flags} +build_flags = ${env:custom_ESP32_4M316k.build_flags} -DNO_HTTP_UPDATER -[env:collection_A_ESP32_4M316k_LittleFS_ETH] +[env:collection_A_ESP32_4M316k] extends = esp32_common_LittleFS_ETH board = esp32_4M build_flags = ${esp32_common_LittleFS_ETH.build_flags} @@ -132,7 +132,7 @@ build_flags = ${esp32_common_LittleFS_ETH.build_flags} -DCOLLECTION_FEATURE_RTTTL=1 -[env:collection_B_ESP32_4M316k_LittleFS_ETH] +[env:collection_B_ESP32_4M316k] extends = esp32_common_LittleFS_ETH board = esp32_4M build_flags = ${esp32_common_LittleFS_ETH.build_flags} @@ -141,7 +141,7 @@ build_flags = ${esp32_common_LittleFS_ETH.build_flags} -DCOLLECTION_FEATURE_RTTTL=1 -[env:collection_C_ESP32_4M316k_LittleFS_ETH] +[env:collection_C_ESP32_4M316k] extends = esp32_common_LittleFS_ETH board = esp32_4M build_flags = ${esp32_common_LittleFS_ETH.build_flags} @@ -150,7 +150,7 @@ build_flags = ${esp32_common_LittleFS_ETH.build_flags} -DCOLLECTION_FEATURE_RTTTL=1 -[env:collection_D_ESP32_4M316k_LittleFS_ETH] +[env:collection_D_ESP32_4M316k] extends = esp32_common_LittleFS_ETH board = esp32_4M build_flags = ${esp32_common_LittleFS_ETH.build_flags} @@ -159,7 +159,7 @@ build_flags = ${esp32_common_LittleFS_ETH.build_flags} -DCOLLECTION_FEATURE_RTTTL=1 -[env:collection_E_ESP32_4M316k_LittleFS_ETH] +[env:collection_E_ESP32_4M316k] extends = esp32_common_LittleFS_ETH board = esp32_4M build_flags = ${esp32_common_LittleFS_ETH.build_flags} @@ -168,7 +168,7 @@ build_flags = ${esp32_common_LittleFS_ETH.build_flags} -DCOLLECTION_FEATURE_RTTTL=1 -[env:collection_F_ESP32_4M316k_LittleFS_ETH] +[env:collection_F_ESP32_4M316k] extends = esp32_common_LittleFS_ETH board = esp32_4M build_flags = ${esp32_common_LittleFS_ETH.build_flags} @@ -177,7 +177,7 @@ build_flags = ${esp32_common_LittleFS_ETH.build_flags} -DCOLLECTION_FEATURE_RTTTL=1 -[env:collection_G_ESP32_4M316k_LittleFS_ETH] +[env:collection_G_ESP32_4M316k] extends = esp32_common_LittleFS_ETH board = esp32_4M build_flags = ${esp32_common_LittleFS_ETH.build_flags} @@ -187,49 +187,49 @@ build_flags = ${esp32_common_LittleFS_ETH.build_flags} -[env:collection_A_ESP32_IRExt_4M316k_LittleFS_ETH] -extends = esp32_IRExt_LittleFS_ETH +[env:collection_A_ESP32_IRExt_4M316k] +extends = esp32_IRExt board = esp32_4M -build_flags = ${esp32_IRExt_LittleFS_ETH.build_flags} +build_flags = ${esp32_IRExt.build_flags} -DPLUGIN_SET_COLLECTION_ESP32 -[env:collection_B_ESP32_IRExt_4M316k_LittleFS_ETH] -extends = esp32_IRExt_LittleFS_ETH +[env:collection_B_ESP32_IRExt_4M316k] +extends = esp32_IRExt board = esp32_4M -build_flags = ${esp32_IRExt_LittleFS_ETH.build_flags} +build_flags = ${esp32_IRExt.build_flags} -DPLUGIN_SET_COLLECTION_B_ESP32 -[env:collection_C_ESP32_IRExt_4M316k_LittleFS_ETH] -extends = esp32_IRExt_LittleFS_ETH +[env:collection_C_ESP32_IRExt_4M316k] +extends = esp32_IRExt board = esp32_4M -build_flags = ${esp32_IRExt_LittleFS_ETH.build_flags} +build_flags = ${esp32_IRExt.build_flags} -DPLUGIN_SET_COLLECTION_C_ESP32 -[env:collection_D_ESP32_IRExt_4M316k_LittleFS_ETH] -extends = esp32_IRExt_LittleFS_ETH +[env:collection_D_ESP32_IRExt_4M316k] +extends = esp32_IRExt board = esp32_4M -build_flags = ${esp32_IRExt_LittleFS_ETH.build_flags} +build_flags = ${esp32_IRExt.build_flags} -DPLUGIN_SET_COLLECTION_D_ESP32 -[env:collection_E_ESP32_IRExt_4M316k_LittleFS_ETH] -extends = esp32_IRExt_LittleFS_ETH +[env:collection_E_ESP32_IRExt_4M316k] +extends = esp32_IRExt board = esp32_4M -build_flags = ${esp32_IRExt_LittleFS_ETH.build_flags} +build_flags = ${esp32_IRExt.build_flags} -DPLUGIN_SET_COLLECTION_E_ESP32 -[env:collection_F_ESP32_IRExt_4M316k_LittleFS_ETH] -extends = esp32_IRExt_LittleFS_ETH +[env:collection_F_ESP32_IRExt_4M316k] +extends = esp32_IRExt board = esp32_4M -build_flags = ${esp32_IRExt_LittleFS_ETH.build_flags} +build_flags = ${esp32_IRExt.build_flags} -DPLUGIN_SET_COLLECTION_F_ESP32 -[env:collection_G_ESP32_IRExt_4M316k_LittleFS_ETH] -extends = esp32_IRExt_LittleFS_ETH +[env:collection_G_ESP32_IRExt_4M316k] +extends = esp32_IRExt board = esp32_4M -build_flags = ${esp32_IRExt_LittleFS_ETH.build_flags} +build_flags = ${esp32_IRExt.build_flags} -DPLUGIN_SET_COLLECTION_G_ESP32 -[env:energy_ESP32_4M316k_LittleFS_ETH] +[env:energy_ESP32_4M316k] extends = esp32_common_LittleFS_ETH board = esp32_4M build_flags = ${esp32_common_LittleFS_ETH.build_flags} @@ -237,7 +237,7 @@ build_flags = ${esp32_common_LittleFS_ETH.build_flags} -DPLUGIN_ENERGY_COLLECTION -[env:display_A_ESP32_4M316k_LittleFS_ETH] +[env:display_A_ESP32_4M316k] extends = esp32_common_LittleFS_ETH board = esp32_4M build_flags = ${esp32_common_LittleFS_ETH.build_flags} @@ -246,7 +246,7 @@ build_flags = ${esp32_common_LittleFS_ETH.build_flags} -D ST7789_EXTRA_INIT=1 -D P116_EXTRA_ST7789=1 -[env:display_B_ESP32_4M316k_LittleFS_ETH] +[env:display_B_ESP32_4M316k] extends = esp32_common_LittleFS_ETH board = esp32_4M build_flags = ${esp32_common_LittleFS_ETH.build_flags} @@ -257,7 +257,7 @@ build_flags = ${esp32_common_LittleFS_ETH.build_flags} -[env:climate_ESP32_4M316k_LittleFS_ETH] +[env:climate_ESP32_4M316k] extends = esp32_common_LittleFS_ETH board = esp32_4M lib_ignore = ${esp32_always.lib_ignore} @@ -268,7 +268,7 @@ build_flags = ${esp32_common_LittleFS_ETH.build_flags} -DPLUGIN_CLIMATE_COLLECTION -[env:neopixel_ESP32_4M316k_LittleFS_ETH] +[env:neopixel_ESP32_4M316k] extends = esp32_common_LittleFS_ETH board = esp32_4M build_flags = ${esp32_common_LittleFS_ETH.build_flags} @@ -279,7 +279,7 @@ build_flags = ${esp32_common_LittleFS_ETH.build_flags} -[env:custom_IR_ESP32_16M8M_LittleFS_ETH] +[env:custom_IR_ESP32_16M8M] extends = esp32_common_LittleFS_ETH board = esp32_16M8M board_upload.flash_size = 16MB @@ -295,7 +295,7 @@ extra_scripts = ${esp32_common_LittleFS_ETH.extra_scripts} -[env:normal_ESP32_4M316k_LittleFS_ETH] +[env:normal_ESP32_4M316k] extends = esp32_common_LittleFS_ETH board = esp32_4M lib_ignore = ${esp32_always.lib_ignore} @@ -306,10 +306,10 @@ build_flags = ${esp32_common_LittleFS_ETH.build_flags} -[env:normal_ESP32_IRExt_4M316k_LittleFS_ETH] -extends = esp32_IRExt_LittleFS_ETH +[env:normal_ESP32_IRExt_4M316k] +extends = esp32_IRExt board = esp32_4M -build_flags = ${esp32_IRExt_LittleFS_ETH.build_flags} +build_flags = ${esp32_IRExt.build_flags} @@ -317,7 +317,7 @@ build_flags = ${esp32_IRExt_LittleFS_ETH.build_flags} ; ESP32 MAX builds 16M flash ------------------------------ ; A Lolin D32 PRO with 16MB Flash, allowing 4MB sketch size, and file storage using LittleFS filesystem -[env:max_ESP32_16M8M_LittleFS_ETH] +[env:max_ESP32_16M8M] extends = esp32_common_LittleFS_ETH board = esp32_16M8M board_upload.flash_size = 16MB @@ -334,7 +334,7 @@ extra_scripts = ${esp32_common_LittleFS_ETH.extra_scripts} board_build.filesystem = littlefs ; If you have a board with Ethernet integrated and 16MB Flash, then this configuration could be enabled, it's based on the max_ESP32_16M8M_LittleFS definition -; [env:max_ESP32_16M8M_LittleFS_ETH] +; [env:max_ESP32_16M8M] ; extends = env:max_ESP32_16M8M_LittleFS ; board = ${env:max_ESP32_16M8M_LittleFS.board} ; build_flags = ${env:max_ESP32_16M8M_LittleFS.build_flags} diff --git a/platformio_esp32_solo1.ini b/platformio_esp32_solo1.ini index 0c755e934..266dd7774 100644 --- a/platformio_esp32_solo1.ini +++ b/platformio_esp32_solo1.ini @@ -16,7 +16,7 @@ build_unflags = ${esp32_base_idf5.build_unflags} board_build.filesystem = littlefs -[env:custom_ESP32solo1_4M316k_LittleFS_ETH] +[env:custom_ESP32solo1_4M316k] extends = esp32_solo1_common_LittleFS build_flags = ${esp32_solo1_common_LittleFS.build_flags} -DPLUGIN_BUILD_CUSTOM @@ -25,7 +25,7 @@ extra_scripts = ${esp32_solo1_common_LittleFS.extra_scripts} pre:tools/pio/pre_custom_esp32.py -[env:normal_ESP32solo1_4M316k_LittleFS_ETH] +[env:normal_ESP32solo1_4M316k] extends = esp32_solo1_common_LittleFS build_flags = ${esp32_solo1_common_LittleFS.build_flags} -DFEATURE_ETHERNET=1 @@ -34,14 +34,14 @@ lib_ignore = ${esp32_solo1_common_LittleFS.lib_ignore} extra_scripts = ${esp32_solo1_common_LittleFS.extra_scripts} -[env:energy_ESP32solo1_4M316k_LittleFS_ETH] +[env:energy_ESP32solo1_4M316k] extends = esp32_solo1_common_LittleFS build_flags = ${esp32_solo1_common_LittleFS.build_flags} -D PLUGIN_ENERGY_COLLECTION -DFEATURE_ETHERNET=1 extra_scripts = ${esp32_solo1_common_LittleFS.extra_scripts} -[env:climate_ESP32solo1_4M316k_LittleFS_ETH] +[env:climate_ESP32solo1_4M316k] extends = esp32_solo1_common_LittleFS build_flags = ${esp32_solo1_common_LittleFS.build_flags} -D PLUGIN_CLIMATE_COLLECTION diff --git a/platformio_esp32c3_envs.ini b/platformio_esp32c3_envs.ini index 686d0476d..eeffbfac8 100644 --- a/platformio_esp32c3_envs.ini +++ b/platformio_esp32c3_envs.ini @@ -13,7 +13,7 @@ lib_ignore = ${esp32_base_idf5.lib_ignore} board = esp32c3cdc -[env:custom_ESP32c3_4M316k_LittleFS_ETH] +[env:custom_ESP32c3_4M316k] extends = esp32c3_common_LittleFS build_flags = ${esp32c3_common_LittleFS.build_flags} -DPLUGIN_BUILD_CUSTOM @@ -22,88 +22,88 @@ extra_scripts = ${esp32c3_common_LittleFS.extra_scripts} -[env:normal_ESP32c3_4M316k_LittleFS_ETH] +[env:normal_ESP32c3_4M316k] extends = esp32c3_common_LittleFS build_flags = ${esp32c3_common_LittleFS.build_flags} lib_ignore = ${esp32c3_common_LittleFS.lib_ignore} ${no_ir.lib_ignore} -[env:collection_A_ESP32c3_4M316k_LittleFS_ETH] +[env:collection_A_ESP32c3_4M316k] extends = esp32c3_common_LittleFS build_flags = ${esp32c3_common_LittleFS.build_flags} -DPLUGIN_SET_COLLECTION_ESP32 -DCOLLECTION_FEATURE_RTTTL=1 -[env:collection_B_ESP32c3_4M316k_LittleFS_ETH] +[env:collection_B_ESP32c3_4M316k] extends = esp32c3_common_LittleFS build_flags = ${esp32c3_common_LittleFS.build_flags} -DPLUGIN_SET_COLLECTION_B_ESP32 -DCOLLECTION_FEATURE_RTTTL=1 -[env:collection_C_ESP32c3_4M316k_LittleFS_ETH] +[env:collection_C_ESP32c3_4M316k] extends = esp32c3_common_LittleFS build_flags = ${esp32c3_common_LittleFS.build_flags} -DPLUGIN_SET_COLLECTION_C_ESP32 -DCOLLECTION_FEATURE_RTTTL=1 -[env:collection_D_ESP32c3_4M316k_LittleFS_ETH] +[env:collection_D_ESP32c3_4M316k] extends = esp32c3_common_LittleFS build_flags = ${esp32c3_common_LittleFS.build_flags} -DPLUGIN_SET_COLLECTION_D_ESP32 -DCOLLECTION_FEATURE_RTTTL=1 -[env:collection_E_ESP32c3_4M316k_LittleFS_ETH] +[env:collection_E_ESP32c3_4M316k] extends = esp32c3_common_LittleFS build_flags = ${esp32c3_common_LittleFS.build_flags} -DPLUGIN_SET_COLLECTION_E_ESP32 -DCOLLECTION_FEATURE_RTTTL=1 -[env:collection_F_ESP32c3_4M316k_LittleFS_ETH] +[env:collection_F_ESP32c3_4M316k] extends = esp32c3_common_LittleFS build_flags = ${esp32c3_common_LittleFS.build_flags} -DPLUGIN_SET_COLLECTION_F_ESP32 -DCOLLECTION_FEATURE_RTTTL=1 -[env:collection_G_ESP32c3_4M316k_LittleFS_ETH] +[env:collection_G_ESP32c3_4M316k] extends = esp32c3_common_LittleFS build_flags = ${esp32c3_common_LittleFS.build_flags} -DPLUGIN_SET_COLLECTION_G_ESP32 -DCOLLECTION_FEATURE_RTTTL=1 -[env:energy_ESP32c3_4M316k_LittleFS_ETH] +[env:energy_ESP32c3_4M316k] extends = esp32c3_common_LittleFS build_flags = ${esp32c3_common_LittleFS.build_flags} -D PLUGIN_ENERGY_COLLECTION -[env:display_A_ESP32c3_4M316k_LittleFS_ETH] +[env:display_A_ESP32c3_4M316k] extends = esp32c3_common_LittleFS build_flags = ${esp32c3_common_LittleFS.build_flags} -D PLUGIN_DISPLAY_A_COLLECTION -D ST7789_EXTRA_INIT=1 -D P116_EXTRA_ST7789=1 -[env:display_B_ESP32c3_4M316k_LittleFS_ETH] +[env:display_B_ESP32c3_4M316k] extends = esp32c3_common_LittleFS build_flags = ${esp32c3_common_LittleFS.build_flags} -D PLUGIN_DISPLAY_B_COLLECTION -D ST7789_EXTRA_INIT=1 -D P116_EXTRA_ST7789=1 -[env:climate_ESP32c3_4M316k_LittleFS_ETH] +[env:climate_ESP32c3_4M316k] extends = esp32c3_common_LittleFS build_flags = ${esp32c3_common_LittleFS.build_flags} -D PLUGIN_CLIMATE_COLLECTION -[env:neopixel_ESP32c3_4M316k_LittleFS_ETH] +[env:neopixel_ESP32c3_4M316k] extends = esp32c3_common_LittleFS build_flags = ${esp32c3_common_LittleFS.build_flags} -DFEATURE_ARDUINO_OTA=1 -DFEATURE_SD=1 -DPLUGIN_NEOPIXEL_COLLECTION -[env:max_ESP32c3_16M8M_LittleFS_ETH] +[env:max_ESP32c3_16M8M] extends = esp32c3_common_LittleFS board = esp32c3cdc-16M build_flags = ${esp32c3_common_LittleFS.build_flags} diff --git a/platformio_esp32c6_envs.ini b/platformio_esp32c6_envs.ini index b90d518ce..a83d6d907 100644 --- a/platformio_esp32c6_envs.ini +++ b/platformio_esp32c6_envs.ini @@ -12,7 +12,7 @@ lib_ignore = ${esp32_base_idf5.lib_ignore} board = esp32c6cdc -[env:custom_ESP32c6_4M316k_LittleFS_ETH] +[env:custom_ESP32c6_4M316k] extends = esp32c6_common_LittleFS build_flags = ${esp32c6_common_LittleFS.build_flags} -DPLUGIN_BUILD_CUSTOM @@ -21,39 +21,39 @@ extra_scripts = ${esp32c6_common_LittleFS.extra_scripts} pre:tools/pio/pre_custom_esp32c6.py -[env:normal_ESP32c6_4M316k_LittleFS_ETH] +[env:normal_ESP32c6_4M316k] extends = esp32c6_common_LittleFS build_flags = ${esp32c6_common_LittleFS.build_flags} -DFEATURE_ETHERNET=1 lib_ignore = ${esp32c6_common_LittleFS.lib_ignore} ${no_ir.lib_ignore} -[env:energy_ESP32c6_4M316k_LittleFS_ETH] +[env:energy_ESP32c6_4M316k] extends = esp32c6_common_LittleFS build_flags = ${esp32c6_common_LittleFS.build_flags} -D PLUGIN_ENERGY_COLLECTION -[env:display_A_ESP32c6_4M316k_LittleFS_ETH] +[env:display_A_ESP32c6_4M316k] extends = esp32c6_common_LittleFS build_flags = ${esp32c6_common_LittleFS.build_flags} -D PLUGIN_DISPLAY_A_COLLECTION -D ST7789_EXTRA_INIT=1 -D P116_EXTRA_ST7789=1 -[env:display_B_ESP32c6_4M316k_LittleFS_ETH] +[env:display_B_ESP32c6_4M316k] extends = esp32c6_common_LittleFS build_flags = ${esp32c6_common_LittleFS.build_flags} -D PLUGIN_DISPLAY_B_COLLECTION -D ST7789_EXTRA_INIT=1 -D P116_EXTRA_ST7789=1 -[env:climate_ESP32c6_4M316k_LittleFS_ETH] +[env:climate_ESP32c6_4M316k] extends = esp32c6_common_LittleFS build_flags = ${esp32c6_common_LittleFS.build_flags} -D PLUGIN_CLIMATE_COLLECTION -[env:neopixel_ESP32c6_4M316k_LittleFS_ETH] +[env:neopixel_ESP32c6_4M316k] extends = esp32c6_common_LittleFS build_flags = ${esp32c6_common_LittleFS.build_flags} -DFEATURE_ARDUINO_OTA=1 @@ -61,7 +61,7 @@ build_flags = ${esp32c6_common_LittleFS.build_flags} -DPLUGIN_NEOPIXEL_COLLECTION -[env:max_ESP32c6_8M1M_LittleFS_ETH] +[env:max_ESP32c6_8M1M] extends = esp32c6_common_LittleFS board = esp32c6cdc-8M build_flags = ${esp32c6_common_LittleFS.build_flags} @@ -74,7 +74,7 @@ build_flags = ${esp32c6_common_LittleFS.build_flags} extra_scripts = ${esp32c6_common_LittleFS.extra_scripts} -[env:max_ESP32c6_16M8M_LittleFS_ETH] +[env:max_ESP32c6_16M8M] extends = esp32c6_common_LittleFS board = esp32c6cdc-16M build_flags = ${esp32c6_common_LittleFS.build_flags} diff --git a/platformio_esp32s2_envs.ini b/platformio_esp32s2_envs.ini index 2e44e2151..01ca4ab09 100644 --- a/platformio_esp32s2_envs.ini +++ b/platformio_esp32s2_envs.ini @@ -12,7 +12,7 @@ board_build.filesystem = littlefs lib_ignore = ${esp32_base_idf5.lib_ignore} -[env:neopixel_ESP32s2_4M316k_LittleFS_ETH] +[env:neopixel_ESP32s2_4M316k] extends = esp32s2_common_LittleFS board = esp32s2cdc build_flags = ${esp32s2_common_LittleFS.build_flags} @@ -22,7 +22,7 @@ build_flags = ${esp32s2_common_LittleFS.build_flags} -[env:custom_IR_ESP32s2_4M316k_LittleFS_ETH] +[env:custom_IR_ESP32s2_4M316k] extends = esp32s2_common_LittleFS board = esp32s2cdc build_flags = ${esp32s2_common_LittleFS.build_flags} @@ -35,7 +35,7 @@ extra_scripts = ${esp32s2_common_LittleFS.extra_scripts} pre:tools/pio/ir_build_check.py -[env:custom_ESP32s2_4M316k_LittleFS_ETH] +[env:custom_ESP32s2_4M316k] extends = esp32s2_common_LittleFS board = esp32s2cdc lib_ignore = ${esp32s2_common_LittleFS.lib_ignore} @@ -48,7 +48,7 @@ extra_scripts = ${esp32s2_common_LittleFS.extra_scripts} -[env:normal_ESP32s2_4M316k_LittleFS_ETH] +[env:normal_ESP32s2_4M316k] extends = esp32s2_common_LittleFS board = esp32s2cdc build_flags = ${esp32s2_common_LittleFS.build_flags} @@ -56,49 +56,49 @@ build_flags = ${esp32s2_common_LittleFS.build_flags} lib_ignore = ${esp32s2_common_LittleFS.lib_ignore} ${no_ir.lib_ignore} -[env:collection_A_ESP32s2_4M316k_LittleFS_ETH] +[env:collection_A_ESP32s2_4M316k] extends = esp32s2_common_LittleFS board = esp32s2cdc build_flags = ${esp32s2_common_LittleFS.build_flags} -DPLUGIN_SET_COLLECTION_ESP32 -DCOLLECTION_FEATURE_RTTTL=1 -[env:collection_B_ESP32s2_4M316k_LittleFS_ETH] +[env:collection_B_ESP32s2_4M316k] extends = esp32s2_common_LittleFS board = esp32s2cdc build_flags = ${esp32s2_common_LittleFS.build_flags} -DPLUGIN_SET_COLLECTION_B_ESP32 -DCOLLECTION_FEATURE_RTTTL=1 -[env:collection_C_ESP32s2_4M316k_LittleFS_ETH] +[env:collection_C_ESP32s2_4M316k] extends = esp32s2_common_LittleFS board = esp32s2cdc build_flags = ${esp32s2_common_LittleFS.build_flags} -DPLUGIN_SET_COLLECTION_C_ESP32 -DCOLLECTION_FEATURE_RTTTL=1 -[env:collection_D_ESP32s2_4M316k_LittleFS_ETH] +[env:collection_D_ESP32s2_4M316k] extends = esp32s2_common_LittleFS board = esp32s2cdc build_flags = ${esp32s2_common_LittleFS.build_flags} -DPLUGIN_SET_COLLECTION_D_ESP32 -DCOLLECTION_FEATURE_RTTTL=1 -[env:collection_E_ESP32s2_4M316k_LittleFS_ETH] +[env:collection_E_ESP32s2_4M316k] extends = esp32s2_common_LittleFS board = esp32s2cdc build_flags = ${esp32s2_common_LittleFS.build_flags} -DPLUGIN_SET_COLLECTION_E_ESP32 -DCOLLECTION_FEATURE_RTTTL=1 -[env:collection_F_ESP32s2_4M316k_LittleFS_ETH] +[env:collection_F_ESP32s2_4M316k] extends = esp32s2_common_LittleFS board = esp32s2cdc build_flags = ${esp32s2_common_LittleFS.build_flags} -DPLUGIN_SET_COLLECTION_F_ESP32 -DCOLLECTION_FEATURE_RTTTL=1 -[env:collection_G_ESP32s2_4M316k_LittleFS_ETH] +[env:collection_G_ESP32s2_4M316k] extends = esp32s2_common_LittleFS board = esp32s2cdc build_flags = ${esp32s2_common_LittleFS.build_flags} @@ -106,13 +106,13 @@ build_flags = ${esp32s2_common_LittleFS.build_flags} -DCOLLECTION_FEATURE_RTTTL=1 -[env:energy_ESP32s2_4M316k_LittleFS_ETH] +[env:energy_ESP32s2_4M316k] extends = esp32s2_common_LittleFS board = esp32s2cdc build_flags = ${esp32s2_common_LittleFS.build_flags} -D PLUGIN_ENERGY_COLLECTION -[env:display_A_ESP32s2_4M316k_LittleFS_ETH] +[env:display_A_ESP32s2_4M316k] extends = esp32s2_common_LittleFS board = esp32s2cdc build_flags = ${esp32s2_common_LittleFS.build_flags} @@ -120,7 +120,7 @@ build_flags = ${esp32s2_common_LittleFS.build_flags} -D ST7789_EXTRA_INIT=1 -D P116_EXTRA_ST7789=1 -[env:display_B_ESP32s2_4M316k_LittleFS_ETH] +[env:display_B_ESP32s2_4M316k] extends = esp32s2_common_LittleFS board = esp32s2cdc build_flags = ${esp32s2_common_LittleFS.build_flags} @@ -128,7 +128,7 @@ build_flags = ${esp32s2_common_LittleFS.build_flags} -D ST7789_EXTRA_INIT=1 -D P116_EXTRA_ST7789=1 -[env:climate_ESP32s2_4M316k_LittleFS_ETH] +[env:climate_ESP32s2_4M316k] extends = esp32s2_common_LittleFS board = esp32s2cdc build_flags = ${esp32s2_common_LittleFS.build_flags} diff --git a/platformio_esp32s3_envs.ini b/platformio_esp32s3_envs.ini index 3aa8aa6c8..10f06922a 100644 --- a/platformio_esp32s3_envs.ini +++ b/platformio_esp32s3_envs.ini @@ -15,7 +15,7 @@ build_unflags = ${esp32_base_idf5.build_unflags} board_build.filesystem = littlefs -[env:custom_ESP32s3_4M316k_LittleFS_ETH] +[env:custom_ESP32s3_4M316k] extends = esp32s3_common_LittleFS board = esp32s3cdc-qio_qspi build_flags = ${esp32s3_common_LittleFS.build_flags} @@ -24,7 +24,7 @@ extra_scripts = ${esp32s3_common_LittleFS.extra_scripts} pre:tools/pio/pre_custom_esp32.py -[env:custom_IR_ESP32s3_4M316k_LittleFS_ETH] +[env:custom_IR_ESP32s3_4M316k] extends = esp32s3_common_LittleFS board = esp32s3cdc-qio_qspi build_flags = ${esp32s3_common_LittleFS.build_flags} @@ -37,7 +37,7 @@ extra_scripts = ${esp32s3_common_LittleFS.extra_scripts} pre:tools/pio/ir_build_check.py -[env:normal_ESP32s3_4M316k_LittleFS_ETH] +[env:normal_ESP32s3_4M316k] extends = esp32s3_common_LittleFS board = esp32s3cdc-qio_qspi lib_ignore = ${esp32s3_common_LittleFS.lib_ignore} @@ -47,49 +47,49 @@ build_flags = ${esp32s3_common_LittleFS.build_flags} -DFEATURE_SD=1 -[env:collection_A_ESP32s3_4M316k_LittleFS_ETH] +[env:collection_A_ESP32s3_4M316k] extends = esp32s3_common_LittleFS board = esp32s3cdc-qio_qspi build_flags = ${esp32s3_common_LittleFS.build_flags} -DPLUGIN_SET_COLLECTION_ESP32 -DCOLLECTION_FEATURE_RTTTL=1 -[env:collection_B_ESP32s3_4M316k_LittleFS_ETH] +[env:collection_B_ESP32s3_4M316k] extends = esp32s3_common_LittleFS board = esp32s3cdc-qio_qspi build_flags = ${esp32s3_common_LittleFS.build_flags} -DPLUGIN_SET_COLLECTION_B_ESP32 -DCOLLECTION_FEATURE_RTTTL=1 -[env:collection_C_ESP32s3_4M316k_LittleFS_ETH] +[env:collection_C_ESP32s3_4M316k] extends = esp32s3_common_LittleFS board = esp32s3cdc-qio_qspi build_flags = ${esp32s3_common_LittleFS.build_flags} -DPLUGIN_SET_COLLECTION_C_ESP32 -DCOLLECTION_FEATURE_RTTTL=1 -[env:collection_D_ESP32s3_4M316k_LittleFS_ETH] +[env:collection_D_ESP32s3_4M316k] extends = esp32s3_common_LittleFS board = esp32s3cdc-qio_qspi build_flags = ${esp32s3_common_LittleFS.build_flags} -DPLUGIN_SET_COLLECTION_D_ESP32 -DCOLLECTION_FEATURE_RTTTL=1 -[env:collection_E_ESP32s3_4M316k_LittleFS_ETH] +[env:collection_E_ESP32s3_4M316k] extends = esp32s3_common_LittleFS board = esp32s3cdc-qio_qspi build_flags = ${esp32s3_common_LittleFS.build_flags} -DPLUGIN_SET_COLLECTION_E_ESP32 -DCOLLECTION_FEATURE_RTTTL=1 -[env:collection_F_ESP32s3_4M316k_LittleFS_ETH] +[env:collection_F_ESP32s3_4M316k] extends = esp32s3_common_LittleFS board = esp32s3cdc-qio_qspi build_flags = ${esp32s3_common_LittleFS.build_flags} -DPLUGIN_SET_COLLECTION_F_ESP32 -DCOLLECTION_FEATURE_RTTTL=1 -[env:collection_G_ESP32s3_4M316k_LittleFS_ETH] +[env:collection_G_ESP32s3_4M316k] extends = esp32s3_common_LittleFS board = esp32s3cdc-qio_qspi build_flags = ${esp32s3_common_LittleFS.build_flags} @@ -97,13 +97,13 @@ build_flags = ${esp32s3_common_LittleFS.build_flags} -DCOLLECTION_FEATURE_RTTTL=1 -[env:energy_ESP32s3_4M316k_LittleFS_ETH] +[env:energy_ESP32s3_4M316k] extends = esp32s3_common_LittleFS board = esp32s3cdc-qio_qspi build_flags = ${esp32s3_common_LittleFS.build_flags} -D PLUGIN_ENERGY_COLLECTION -[env:display_A_ESP32s3_4M316k_LittleFS_ETH] +[env:display_A_ESP32s3_4M316k] extends = esp32s3_common_LittleFS board = esp32s3cdc-qio_qspi build_flags = ${esp32s3_common_LittleFS.build_flags} @@ -111,7 +111,7 @@ build_flags = ${esp32s3_common_LittleFS.build_flags} -D ST7789_EXTRA_INIT=1 -D P116_EXTRA_ST7789=1 -[env:display_B_ESP32s3_4M316k_LittleFS_ETH] +[env:display_B_ESP32s3_4M316k] extends = esp32s3_common_LittleFS board = esp32s3cdc-qio_qspi build_flags = ${esp32s3_common_LittleFS.build_flags} @@ -119,14 +119,14 @@ build_flags = ${esp32s3_common_LittleFS.build_flags} -D ST7789_EXTRA_INIT=1 -D P116_EXTRA_ST7789=1 -[env:climate_ESP32s3_4M316k_LittleFS_ETH] +[env:climate_ESP32s3_4M316k] extends = esp32s3_common_LittleFS board = esp32s3cdc-qio_qspi build_flags = ${esp32s3_common_LittleFS.build_flags} -D PLUGIN_CLIMATE_COLLECTION -[env:neopixel_ESP32s3_4M316k_LittleFS_ETH] +[env:neopixel_ESP32s3_4M316k] extends = esp32s3_common_LittleFS board = esp32s3cdc-qio_qspi build_flags = ${esp32s3_common_LittleFS.build_flags} @@ -136,7 +136,7 @@ build_flags = ${esp32s3_common_LittleFS.build_flags} -[env:custom_ESP32s3_8M1M_LittleFS_ETH] +[env:custom_ESP32s3_8M1M] extends = esp32s3_common_LittleFS board = esp32s3cdc-qio_qspi-8M build_flags = ${esp32s3_common_LittleFS.build_flags} @@ -146,12 +146,12 @@ build_flags = ${esp32s3_common_LittleFS.build_flags} extra_scripts = ${esp32s3_common_LittleFS.extra_scripts} pre:tools/pio/pre_custom_esp32.py -[env:custom_ESP32s3_8M1M_LittleFS_OPI_PSRAM_ETH] -extends = env:custom_ESP32s3_8M1M_LittleFS_ETH +[env:custom_ESP32s3_8M1M_OPI_PSRAM] +extends = env:custom_ESP32s3_8M1M board = esp32s3cdc-qio_opi-8M -[env:max_ESP32s3_8M1M_LittleFS_ETH] +[env:max_ESP32s3_8M1M] extends = esp32s3_common_LittleFS board = esp32s3cdc-qio_qspi-8M build_flags = ${esp32s3_common_LittleFS.build_flags} @@ -163,12 +163,12 @@ build_flags = ${esp32s3_common_LittleFS.build_flags} extra_scripts = ${esp32s3_common_LittleFS.extra_scripts} -[env:max_ESP32s3_8M1M_LittleFS_OPI_PSRAM_ETH] -extends = env:max_ESP32s3_8M1M_LittleFS_ETH +[env:max_ESP32s3_8M1M_OPI_PSRAM] +extends = env:max_ESP32s3_8M1M board = esp32s3cdc-qio_opi-8M -[env:custom_ESP32s3_16M8M_LittleFS_ETH] +[env:custom_ESP32s3_16M8M] extends = esp32s3_common_LittleFS board = esp32s3cdc-qio_qspi-16M build_flags = ${esp32s3_common_LittleFS.build_flags} @@ -179,12 +179,12 @@ build_flags = ${esp32s3_common_LittleFS.build_flags} extra_scripts = ${esp32s3_common_LittleFS.extra_scripts} pre:tools/pio/pre_custom_esp32.py -[env:custom_ESP32s3_16M8M_LittleFS_OPI_PSRAM_ETH] -extends = env:custom_ESP32s3_16M8M_LittleFS_ETH +[env:custom_ESP32s3_16M8M_OPI_PSRAM] +extends = env:custom_ESP32s3_16M8M board = esp32s3cdc-qio_opi-16M -[env:max_ESP32s3_16M8M_LittleFS_ETH] +[env:max_ESP32s3_16M8M] extends = esp32s3_common_LittleFS board = esp32s3cdc-qio_qspi-16M build_flags = ${esp32s3_common_LittleFS.build_flags} @@ -196,7 +196,7 @@ build_flags = ${esp32s3_common_LittleFS.build_flags} extra_scripts = ${esp32s3_common_LittleFS.extra_scripts} -[env:max_ESP32s3_16M8M_LittleFS_OPI_PSRAM_ETH] +[env:max_ESP32s3_16M8M_OPI_PSRAM] extends = esp32s3_common_LittleFS board = esp32s3cdc-qio_opi-16M build_flags = ${esp32s3_common_LittleFS.build_flags} From 4118c8d8c6983f48e8d08c1f7b61181ed6c14b8a Mon Sep 17 00:00:00 2001 From: Ton Huisman Date: Wed, 5 Nov 2025 21:23:18 +0100 Subject: [PATCH 454/564] [Build] Enable `custom_remove_include` to not build ignored libs --- platformio_core_defs.ini | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/platformio_core_defs.ini b/platformio_core_defs.ini index 81fb7e44b..cb90eb396 100644 --- a/platformio_core_defs.ini +++ b/platformio_core_defs.ini @@ -168,6 +168,7 @@ extra_scripts = ${esp82xx_common.extra_scripts} platform = https://github.com/Jason2866/platform-espressif32.git#Arduino/IDF54 platform_packages = ;platform_packages = framework-arduinoespressif32 @ https://github.com/Jason2866/esp32-arduino-lib-builder/releases/download/3743/framework-arduinoespressif32-all-release_v5.4-a4437683.zip +custom_remove_include = true build_flags = -DESP32_STAGE -DESP_IDF_VERSION_MAJOR=5 -DLIBRARIES_NO_LOG=1 @@ -187,7 +188,7 @@ build_flags = -DESP32_STAGE -include "ESPEasy_config.h" -include "esp32x_fixes.h" ; -Wnull-dereference -lib_ignore = +lib_ignore = BLE lib_extra_dirs = lib/lib_ssl From 249cf80259f03aab1d20d5c704be9b2133da435e Mon Sep 17 00:00:00 2001 From: TD-er Date: Wed, 5 Nov 2025 16:44:15 +0100 Subject: [PATCH 455/564] [Web Flasher] Update script to generate webflasher for new build names --- tools/pio/generate_web_flasher_manifest.py | 19 ++++++++++++------- 1 file changed, 12 insertions(+), 7 deletions(-) diff --git a/tools/pio/generate_web_flasher_manifest.py b/tools/pio/generate_web_flasher_manifest.py index a92646c59..8c0aab657 100644 --- a/tools/pio/generate_web_flasher_manifest.py +++ b/tools/pio/generate_web_flasher_manifest.py @@ -177,8 +177,6 @@ def parse_filename(file, version, variant, file_suffix): specials.append('IR') if '_VCC' in variant: specials.append('VCC') - if '_ETH' in variant: - specials.append('ETH') if 'solo1' in variant: specials.append('Solo1') @@ -204,6 +202,11 @@ def parse_filename(file, version, variant, file_suffix): main_group = 'Custom Misc' else: main_group = 'Custom' + if 'safeboot_' in variant: + if 'Misc' in main_group: + main_group = 'SafeBoot Misc' + else: + main_group = 'Safeboot' if 'hard_' in variant: main_group = 'Device Specific' @@ -212,10 +215,10 @@ def parse_filename(file, version, variant, file_suffix): # Thus make a separate group for the solo1 main_group = '4M Flash ESP32-solo1' - if 'LittleFS' in variant: - main_group += ' LittleFS' + if 'ESP32' in variant: + main_group += ' ESP32' else: - main_group += ' SPIFFS' + main_group += ' ESP8266' if ".factory.bin" in file_suffix or 'ESP32' not in file: #print('{:10s}: {:34s}\t{:10s} {} / {}'.format(state, sub_group, chipFamily, version, file)) @@ -300,8 +303,8 @@ def generate_manifest_files(bin_folder, output_prefix): main_group_list_littlefs = [] main_group_list_spiffs = [] for main_group in main_group_list: - main_group_list_littlefs.append("{} {}".format(main_group, 'LittleFS')) - main_group_list_spiffs.append("{} {}".format(main_group, 'SPIFFS')) + main_group_list_littlefs.append("{} {}".format(main_group, 'ESP32')) + main_group_list_spiffs.append("{} {}".format(main_group, 'ESP8266')) main_group_list_littlefs.extend(main_group_list_spiffs) main_group_list = main_group_list_littlefs @@ -406,6 +409,8 @@ def generate_manifest_files(bin_folder, output_prefix): '

    Migrate ESP32 installs from SPIFFS to LittleFS

    \n', ' From 2025/06/26 onward, there will be no longer SPIFFS builds for ESP32-xx.\n', '
    \n', + ' This means all ESP32 builds are now LittleFS and thus this is no longer mentioned in the name of the build.' + '
    \n', ' See Migrate from SPIFFS to LittleFS (ESP32) in the documentation on how to migrate older (ESP32) SPIFFS installs to LittleFS\n', ' \n', ' \n', ' \n', From 4501588df26f7028f4435beec1f2939062539e26 Mon Sep 17 00:00:00 2001 From: TD-er Date: Mon, 17 Nov 2025 23:56:39 +0100 Subject: [PATCH 480/564] [ESPEasy p2p] Add IDs of not yet supported ESP MCUs --- src/src/DataStructs/NodeStruct.cpp | 2 +- src/src/DataStructs/NodeStruct.h | 2 +- src/src/DataTypes/NodeTypeID.cpp | 45 +++++++++++++++++------------- src/src/DataTypes/NodeTypeID.h | 8 +++++- src/src/Helpers/Networking.cpp | 4 +-- src/src/Helpers/Networking.h | 2 +- 6 files changed, 38 insertions(+), 25 deletions(-) diff --git a/src/src/DataStructs/NodeStruct.cpp b/src/src/DataStructs/NodeStruct.cpp index 69ac8e779..f79f7f4d0 100644 --- a/src/src/DataStructs/NodeStruct.cpp +++ b/src/src/DataStructs/NodeStruct.cpp @@ -135,7 +135,7 @@ bool NodeStruct::operator<(const NodeStruct &other) const { } -const __FlashStringHelper * NodeStruct::getNodeTypeDisplayString() const { +String NodeStruct::getNodeTypeDisplayString() const { return toNodeTypeDisplayString(nodeType); } diff --git a/src/src/DataStructs/NodeStruct.h b/src/src/DataStructs/NodeStruct.h index cbd406099..2c0e1308f 100644 --- a/src/src/DataStructs/NodeStruct.h +++ b/src/src/DataStructs/NodeStruct.h @@ -29,7 +29,7 @@ struct __attribute__((__packed__)) NodeStruct // - lower load (TODO TD-er) bool operator<(const NodeStruct &other) const; - const __FlashStringHelper * getNodeTypeDisplayString() const; + String getNodeTypeDisplayString() const; String getNodeName() const; diff --git a/src/src/DataTypes/NodeTypeID.cpp b/src/src/DataTypes/NodeTypeID.cpp index 0001a954d..475df69eb 100644 --- a/src/src/DataTypes/NodeTypeID.cpp +++ b/src/src/DataTypes/NodeTypeID.cpp @@ -1,25 +1,32 @@ #include "../DataTypes/NodeTypeID.h" +#include "../Helpers/StringConverter.h" + +String toNodeTypeDisplayString(uint8_t nodeType) { + const __FlashStringHelper* suffix = F(""); -const __FlashStringHelper* toNodeTypeDisplayString(uint8_t nodeType) { switch (nodeType) { - case NODE_TYPE_ID_ESP_EASY_STD: return F("ESP Easy"); - case NODE_TYPE_ID_ESP_EASYM_STD: return F("ESP Easy Mega"); - case NODE_TYPE_ID_ESP_EASY32_STD: return F("ESP Easy 32"); - case NODE_TYPE_ID_ESP_EASY32S2_STD: return F("ESP Easy 32-S2"); - case NODE_TYPE_ID_ESP_EASY32S3_STD: return F("ESP Easy 32-S3"); - case NODE_TYPE_ID_ESP_EASY32C2_STD: return F("ESP Easy 32-C2"); - case NODE_TYPE_ID_ESP_EASY32C3_STD: return F("ESP Easy 32-C3"); - case NODE_TYPE_ID_ESP_EASY32C5_STD: return F("ESP Easy 32-C5"); - case NODE_TYPE_ID_ESP_EASY32C6_STD: return F("ESP Easy 32-C6"); - case NODE_TYPE_ID_ESP_EASY32C61_STD: return F("ESP Easy 32-C61"); - case NODE_TYPE_ID_ESP_EASY32H2_STD: return F("ESP Easy 32-H2"); - case NODE_TYPE_ID_ESP_EASY32H21_STD: return F("ESP Easy 32-H21"); - case NODE_TYPE_ID_ESP_EASY32P4_STD: return F("ESP Easy 32-P4"); - case NODE_TYPE_ID_RPI_EASY_STD: return F("RPI Easy"); - case NODE_TYPE_ID_ARDUINO_EASY_STD: return F("Arduino Easy"); - case NODE_TYPE_ID_NANO_EASY_STD: return F("Nano Easy"); + case NODE_TYPE_ID_ESP_EASY_STD: return F("ESP Easy"); + case NODE_TYPE_ID_ESP_EASYM_STD: return F("ESP Easy Mega"); + case NODE_TYPE_ID_ESP_EASY32_STD: break; + case NODE_TYPE_ID_ESP_EASY32S2_STD: suffix = F("-S2"); break; + case NODE_TYPE_ID_ESP_EASY32S3_STD: suffix = F("-S3"); break; + case NODE_TYPE_ID_ESP_EASY32C2_STD: suffix = F("-C2"); break; + case NODE_TYPE_ID_ESP_EASY32C3_STD: suffix = F("-C3"); break; + case NODE_TYPE_ID_ESP_EASY32C5_STD: suffix = F("-C5"); break; + case NODE_TYPE_ID_ESP_EASY32C6_STD: suffix = F("-C6"); break; + case NODE_TYPE_ID_ESP_EASY32C61_STD: suffix = F("-C61"); break; + case NODE_TYPE_ID_ESP_EASY32H2_STD: suffix = F("-H2"); break; + case NODE_TYPE_ID_ESP_EASY32H21_STD: suffix = F("-H21"); break; + case NODE_TYPE_ID_ESP_EASY32H4_STD: suffix = F("-H4"); break; + case NODE_TYPE_ID_ESP_EASY32P4_STD: suffix = F("-P4"); break; + case NODE_TYPE_ID_ESP_EASY32P4r3_STD: suffix = F("-P4r3"); break; + case NODE_TYPE_ID_RPI_EASY_STD: return F("RPI Easy"); + case NODE_TYPE_ID_ARDUINO_EASY_STD: return F("Arduino Easy"); + case NODE_TYPE_ID_NANO_EASY_STD: return F("Nano Easy"); + default: + return EMPTY_STRING; } - return F(""); -} \ No newline at end of file + return concat(F("ESP Easy 32"), suffix); +} diff --git a/src/src/DataTypes/NodeTypeID.h b/src/src/DataTypes/NodeTypeID.h index 46c672f55..0474310e3 100644 --- a/src/src/DataTypes/NodeTypeID.h +++ b/src/src/DataTypes/NodeTypeID.h @@ -19,6 +19,8 @@ #define NODE_TYPE_ID_ESP_EASY32C5_STD 41 #define NODE_TYPE_ID_ESP_EASY32P4_STD 42 #define NODE_TYPE_ID_ESP_EASY32H21_STD 43 +#define NODE_TYPE_ID_ESP_EASY32H4_STD 44 +#define NODE_TYPE_ID_ESP_EASY32P4r3_STD 45 #define NODE_TYPE_ID_ARDUINO_EASY_STD 65 #define NODE_TYPE_ID_NANO_EASY_STD 81 @@ -47,8 +49,12 @@ # define NODE_TYPE_ID NODE_TYPE_ID_ESP_EASY32H2_STD # elif defined(ESP32H21) # define NODE_TYPE_ID NODE_TYPE_ID_ESP_EASY32H21_STD + # elif defined(ESP32H4) + # define NODE_TYPE_ID NODE_TYPE_ID_ESP_EASY32H4_STD # elif defined(ESP32P4) # define NODE_TYPE_ID NODE_TYPE_ID_ESP_EASY32P4_STD + # elif defined(ESP32P4r3) + # define NODE_TYPE_ID NODE_TYPE_ID_ESP_EASY32P4r3_STD # elif defined(ESP32_CLASSIC) # define NODE_TYPE_ID NODE_TYPE_ID_ESP_EASY32_STD # else @@ -59,6 +65,6 @@ static_assert(false, "Implement processor architecture"); #endif -const __FlashStringHelper* toNodeTypeDisplayString(uint8_t nodeType); +String toNodeTypeDisplayString(uint8_t nodeType); #endif // ifndef DATATYPES_NODETYPEID_H diff --git a/src/src/Helpers/Networking.cpp b/src/src/Helpers/Networking.cpp index 3f6a6df42..48ae6fd4e 100644 --- a/src/src/Helpers/Networking.cpp +++ b/src/src/Helpers/Networking.cpp @@ -450,11 +450,11 @@ uint8_t getTypeForUnit(uint8_t unit) { return it->second.nodeType; } -const __FlashStringHelper* getTypeStringForUnit(uint8_t unit) { +String getTypeStringForUnit(uint8_t unit) { auto it = Nodes.find(unit); if (it == Nodes.end()) { - return F(""); + return EMPTY_STRING; } return it->second.getNodeTypeDisplayString(); } diff --git a/src/src/Helpers/Networking.h b/src/src/Helpers/Networking.h index 6bf69bb2b..a7bd79a10 100644 --- a/src/src/Helpers/Networking.h +++ b/src/src/Helpers/Networking.h @@ -80,7 +80,7 @@ uint8_t getTypeForUnit(uint8_t unit); /*********************************************************************************************\ Get nodeTypeString for specific unit \*********************************************************************************************/ -const __FlashStringHelper* getTypeStringForUnit(uint8_t unit); +String getTypeStringForUnit(uint8_t unit); /*********************************************************************************************\ Send UDP message to specific unit (unit 255=broadcast) From 872a27e51784b87913f185af36ecc19a1ecf5467 Mon Sep 17 00:00:00 2001 From: TD-er Date: Mon, 17 Nov 2025 15:51:35 +0100 Subject: [PATCH 481/564] [Collection] Remove P038 and P095 from ESP32 Collection builds --- src/src/CustomBuild/define_plugin_sets.h | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/src/src/CustomBuild/define_plugin_sets.h b/src/src/CustomBuild/define_plugin_sets.h index 7241b83d9..b9206c35d 100644 --- a/src/src/CustomBuild/define_plugin_sets.h +++ b/src/src/CustomBuild/define_plugin_sets.h @@ -1631,7 +1631,7 @@ To create/register a plugin, you have to : #define USES_P082 // GPS #define USES_P089 // Ping #if !defined(USES_P095) && defined(ESP32) && !defined(PLUGIN_BUILD_IR_EXTENDED) - #define USES_P095 // TFT ILI9xxx +// #define USES_P095 // TFT ILI9xxx #endif #if !defined(PLUGIN_BUILD_NORMAL_IRext) // IRext builds do need quite a lot of build space @@ -1650,6 +1650,11 @@ To create/register a plugin, you have to : #if !defined(USES_P180) && defined(ESP32) #define USES_P180 // Generic - I2C Generic #endif + // Remove plugins from 'collection' builds which rely on the neopixel library + // to make sure those builds will fit again. + #ifdef USES_P038 + #undef USES_P038 + #endif #endif #ifdef PLUGIN_SET_COLLECTION_A From 6e0f9227c5c87619162cd86686591c451500a449 Mon Sep 17 00:00:00 2001 From: Ton Huisman Date: Tue, 18 Nov 2025 07:55:56 +0100 Subject: [PATCH 482/564] [Build] Fix SafeBoot build --- src/src/DataStructs/ControllerSettingsStruct.h | 2 +- tools/pio/pre_safeboot_esp32c2.py | 5 ++++- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/src/src/DataStructs/ControllerSettingsStruct.h b/src/src/DataStructs/ControllerSettingsStruct.h index 1f981be4a..e9efcfde2 100644 --- a/src/src/DataStructs/ControllerSettingsStruct.h +++ b/src/src/DataStructs/ControllerSettingsStruct.h @@ -15,7 +15,7 @@ #include "../DataStructs/ChecksumType.h" -#if FEATURE_MQTT_TLS +#if FEATURE_MQTT_TLS || FEATURE_HTTP_TLS #include "../DataTypes/TLS_types.h" #endif diff --git a/tools/pio/pre_safeboot_esp32c2.py b/tools/pio/pre_safeboot_esp32c2.py index c696729c0..c32071f52 100644 --- a/tools/pio/pre_safeboot_esp32c2.py +++ b/tools/pio/pre_safeboot_esp32c2.py @@ -40,7 +40,10 @@ else: "-DFEATURE_DEFINE_SERIAL_CONSOLE_PORT=0", "-DFEATURE_ESPEASY_P2P=1", "-DFEATURE_CUSTOM_PROVISIONING", - "-DDISABLE_SC16IS752_SPI" + "-DDISABLE_SC16IS752_SPI", + "-DFEATURE_MQTT_TLS=0", + "-DFEATURE_HTTP_TLS=0", + "-DFEATURE_EMAIL_TLS=0" ] From db679eb9de19503bf247508c2fe11d276812cf8a Mon Sep 17 00:00:00 2001 From: TD-er Date: Fri, 21 Nov 2025 12:51:04 +0100 Subject: [PATCH 483/564] [ESP32-P4/-C61] Update Arduino/IDF to support ESP32-C61 & ESP32-P4 preV3 --- boards/esp32c61cdc-8M.json | 2 +- .../ESPEasySerial_common_defines.h | 2 +- platformio_core_defs.ini | 21 ++++++++++++++++--- src/include/esp32x_fixes.h | 2 +- src/src/CustomBuild/ESPEasy_buildinfo.h | 4 ++++ src/src/DataTypes/NodeTypeID.h | 4 +++- src/src/Helpers/Hardware.cpp | 6 +++++- src/src/Helpers/Hardware_GPIO.h | 3 ++- src/src/Helpers/Hardware_device_info.cpp | 10 +++++++-- src/src/Helpers/Hardware_device_info.h | 1 + .../Helpers/Hardware_device_info_ESP32P4.cpp | 3 ++- src/src/WebServer/ESPEasy_WebServer.cpp | 2 +- 12 files changed, 47 insertions(+), 13 deletions(-) diff --git a/boards/esp32c61cdc-8M.json b/boards/esp32c61cdc-8M.json index 3bc30400c..be0ed214d 100644 --- a/boards/esp32c61cdc-8M.json +++ b/boards/esp32c61cdc-8M.json @@ -5,7 +5,7 @@ }, "core": "esp32", "extra_flags": "-DARDUINO_TASMOTA -DBOARD_HAS_PSRAM -DARDUINO_USB_MODE=1 -DUSE_USB_CDC_CONSOLE -DESP32_8M -DESP32C61 -DARDUINO_USB_CDC_ON_BOOT=1", - "f_cpu": "120000000L", + "f_cpu": "160000000L", "f_flash": "80000000L", "flash_mode": "qio", "mcu": "esp32c61", diff --git a/lib/ESPEasySerial/ESPEasySerial_common_defines.h b/lib/ESPEasySerial/ESPEasySerial_common_defines.h index 1a580627a..3c6312b17 100644 --- a/lib/ESPEasySerial/ESPEasySerial_common_defines.h +++ b/lib/ESPEasySerial/ESPEasySerial_common_defines.h @@ -40,7 +40,7 @@ static_assert(false, "Implement processor architecture"); CONFIG_IDF_TARGET_ESP32S2 || // support USB via USBCDC CONFIG_IDF_TARGET_ESP32S3 // support USB via HWCDC using JTAG interface or USBCDC */ -# if CONFIG_IDF_TARGET_ESP32C3 || CONFIG_IDF_TARGET_ESP32C5 || CONFIG_IDF_TARGET_ESP32C6 || CONFIG_IDF_TARGET_ESP32C61 || CONFIG_IDF_TARGET_ESP32C61 || CONFIG_IDF_TARGET_ESP32S2 || CONFIG_IDF_TARGET_ESP32S3 +# if CONFIG_IDF_TARGET_ESP32C3 || CONFIG_IDF_TARGET_ESP32C5 || CONFIG_IDF_TARGET_ESP32C6 || CONFIG_IDF_TARGET_ESP32C61 || CONFIG_IDF_TARGET_ESP32S2 || CONFIG_IDF_TARGET_ESP32S3 // #if CONFIG_TINYUSB_CDC_ENABLED // This define is not recognized here so use USE_USB_CDC_CONSOLE # ifdef USE_USB_CDC_CONSOLE diff --git a/platformio_core_defs.ini b/platformio_core_defs.ini index d29b70441..57a93d287 100644 --- a/platformio_core_defs.ini +++ b/platformio_core_defs.ini @@ -169,10 +169,25 @@ extra_scripts = ${esp82xx_common.extra_scripts} ;platform = https://github.com/Jason2866/platform-espressif32.git#23aed73e4e570d3b6608c15677fea01d6a722d94 ;platform_packages = framework-arduinoespressif32 @ https://github.com/Jason2866/esp32-arduino-lib-builder/releases/download/1311-2008-5.5_orig/framework-arduinoespressif32-release_v5.5_orig-276436da.tar.xz -platform = https://github.com/Jason2866/platform-espressif32.git#Arduino/IDF55 -platform_packages = -custom_remove_include = true +platform = https://github.com/Jason2866/platform-espressif32.git#Arduino/IDF55_gcc15 +platform_packages = framework-arduinoespressif32 @ https://github.com/Jason2866/esp32-arduino-lib-builder/releases/download/2011-1659-5.5/framework-arduinoespressif32-release_v5.5-74429121.tar.xz + +custom_remove_include = true + +custom_component_remove = + espressif/esp_wifi_remote + espressif/esp-dsp + espressif/esp32-camera + espressif/libsodium + espressif/esp-modbus + espressif/qrcode + espressif/esp_insights + espressif/esp_diag_data_store + espressif/esp_diagnostics + espressif/esp_rainmaker + espressif/rmaker_common + build_flags = -DESP32_STAGE -DESP_IDF_VERSION_MAJOR=5 -DLIBRARIES_NO_LOG=1 diff --git a/src/include/esp32x_fixes.h b/src/include/esp32x_fixes.h index f279e16d7..9121bc179 100644 --- a/src/include/esp32x_fixes.h +++ b/src/include/esp32x_fixes.h @@ -119,7 +119,7 @@ #ifndef CONFIG_SOC_WIFI_HE_SUPPORT -#if CONFIG_IDF_TARGET_ESP32C5 || CONFIG_IDF_TARGET_ESP32C6 || CONFIG_IDF_TARGET_ESP32C61 || CONFIG_IDF_TARGET_ESP32C61 +#if CONFIG_IDF_TARGET_ESP32C5 || CONFIG_IDF_TARGET_ESP32C6 || CONFIG_IDF_TARGET_ESP32C61 #define CONFIG_SOC_WIFI_HE_SUPPORT 1 #else #define CONFIG_SOC_WIFI_HE_SUPPORT 0 diff --git a/src/src/CustomBuild/ESPEasy_buildinfo.h b/src/src/CustomBuild/ESPEasy_buildinfo.h index 3472ca609..06f8560ff 100644 --- a/src/src/CustomBuild/ESPEasy_buildinfo.h +++ b/src/src/CustomBuild/ESPEasy_buildinfo.h @@ -49,7 +49,11 @@ #elif defined(ESP32H21) # define BUILD_NOTES " - Mega32-h21" #elif defined(ESP32P4) + #ifdef CONFIG_ESP32P4_SELECTS_REV_LESS_V3 # define BUILD_NOTES " - Mega32-p4" + #else + # define BUILD_NOTES " - Mega32-p4r3" + #endif # elif defined(ESP32_CLASSIC) # define BUILD_NOTES " - Mega32" # else diff --git a/src/src/DataTypes/NodeTypeID.h b/src/src/DataTypes/NodeTypeID.h index 0474310e3..083c6fe73 100644 --- a/src/src/DataTypes/NodeTypeID.h +++ b/src/src/DataTypes/NodeTypeID.h @@ -52,9 +52,11 @@ # elif defined(ESP32H4) # define NODE_TYPE_ID NODE_TYPE_ID_ESP_EASY32H4_STD # elif defined(ESP32P4) + #ifdef CONFIG_ESP32P4_SELECTS_REV_LESS_V3 # define NODE_TYPE_ID NODE_TYPE_ID_ESP_EASY32P4_STD - # elif defined(ESP32P4r3) + #else # define NODE_TYPE_ID NODE_TYPE_ID_ESP_EASY32P4r3_STD + #endif # elif defined(ESP32_CLASSIC) # define NODE_TYPE_ID NODE_TYPE_ID_ESP_EASY32_STD # else diff --git a/src/src/Helpers/Hardware.cpp b/src/src/Helpers/Hardware.cpp index ffb469e1b..6763dbb4d 100644 --- a/src/src/Helpers/Hardware.cpp +++ b/src/src/Helpers/Hardware.cpp @@ -457,14 +457,18 @@ int getCPU_MaxFreqMHz() #elif CONFIG_IDF_TARGET_ESP32C6 return 160; #elif CONFIG_IDF_TARGET_ESP32C61 - return 120; + return 160; #elif CONFIG_IDF_TARGET_ESP32C5 return 240; #elif CONFIG_IDF_TARGET_ESP32H2 //IDF-6570 return 96; #elif CONFIG_IDF_TARGET_ESP32P4 + #ifdef CONFIG_ESP32P4_SELECTS_REV_LESS_V3 + return 360; + #else return 400; + #endif #elif CONFIG_IDF_TARGET_ESP32S2 return 240; #elif CONFIG_IDF_TARGET_ESP32S3 diff --git a/src/src/Helpers/Hardware_GPIO.h b/src/src/Helpers/Hardware_GPIO.h index 6177f3629..64417d583 100644 --- a/src/src/Helpers/Hardware_GPIO.h +++ b/src/src/Helpers/Hardware_GPIO.h @@ -20,7 +20,8 @@ bool getGpioInfo(int gpio, bool& warning); -// For ESP32, see: https://github.com/espressif/arduino-esp32/blob/9d84c78cf2d44911639530e54a9dbb9ee9164f6c/cores/esp32/esp32-hal.h#L64-L75 +// For ESP32, see: https://github.com/espressif/arduino-esp32/blob/9d84c78cf2d44911639530e54a9dbb9ee9164f6c/cores/esp32/esp32-hal.h#L64-L75 +// BOOT_PIN is defined for all ESP32 chips. bool isBootModePin(int gpio); bool isBootStrapPin(int gpio); diff --git a/src/src/Helpers/Hardware_device_info.cpp b/src/src/Helpers/Hardware_device_info.cpp index 29f9c8fed..527c8ec2e 100644 --- a/src/src/Helpers/Hardware_device_info.cpp +++ b/src/src/Helpers/Hardware_device_info.cpp @@ -383,8 +383,8 @@ bool isESP8285() { #endif // ifdef ESP32 - -String getChipRevision() { +uint16_t getChipRevision_val() +{ static uint16_t rev = 0; #ifdef ESP32 @@ -400,6 +400,12 @@ String getChipRevision() { # endif // if ESP_IDF_VERSION_MAJOR < 5 } #endif // ifdef ESP32 + return rev; +} + + +String getChipRevision() { + const uint16_t rev = getChipRevision_val(); return strformat(F("%d.%02d"), rev / 100, rev % 100); } diff --git a/src/src/Helpers/Hardware_device_info.h b/src/src/Helpers/Hardware_device_info.h index 8b8610017..48548fc1b 100644 --- a/src/src/Helpers/Hardware_device_info.h +++ b/src/src/Helpers/Hardware_device_info.h @@ -88,6 +88,7 @@ const __FlashStringHelper* getChipModel( bool isESP8285(uint32_t& pkg_version, bool& high_temp_version); bool isESP8285(); +uint16_t getChipRevision_val(); String getChipRevision(); uint32_t getSketchSize(); diff --git a/src/src/Helpers/Hardware_device_info_ESP32P4.cpp b/src/src/Helpers/Hardware_device_info_ESP32P4.cpp index d26ba698e..1ae9fc977 100644 --- a/src/src/Helpers/Hardware_device_info_ESP32P4.cpp +++ b/src/src/Helpers/Hardware_device_info_ESP32P4.cpp @@ -7,7 +7,8 @@ const __FlashStringHelper* getChipModel(uint32_t chip_model, uint32_t chip_revision, uint32_t pkg_version, bool single_core) { if (18 == chip_model) { // ESP32-P4 - return F("ESP32-P4"); + const uint16_t rev = getChipRevision_val(); + return rev < 300 ? F("ESP32-P4") : F("ESP32-P4r3"); } return F("Unknown"); diff --git a/src/src/WebServer/ESPEasy_WebServer.cpp b/src/src/WebServer/ESPEasy_WebServer.cpp index f252d560d..b7aba443c 100644 --- a/src/src/WebServer/ESPEasy_WebServer.cpp +++ b/src/src/WebServer/ESPEasy_WebServer.cpp @@ -177,7 +177,7 @@ bool captivePortal() { const bool fromAP = client_localIP == apIP; const bool hasWiFiCredentials = SecuritySettings.hasWiFiCredentials(); #ifndef BUILD_NO_DEBUG - addLog(LOG_LEVEL_INFO, concat(F("CaptivePortal: hostHeader: "), web_server.hostHeader())); + addLog(LOG_LEVEL_DEBUG, concat(F("CaptivePortal: hostHeader: "), web_server.hostHeader())); #endif if (hasWiFiCredentials || !fromAP) { return false; From 94090570f1358a1e3759cadc91c06ec0329c8b9f Mon Sep 17 00:00:00 2001 From: TD-er Date: Fri, 21 Nov 2025 12:51:56 +0100 Subject: [PATCH 484/564] [ColorCode] Add NetworkEnable/Disable commands to ColorCode JavaScript --- static/espeasy.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/static/espeasy.js b/static/espeasy.js index 163cc2e35..38d2197b9 100644 --- a/static/espeasy.js +++ b/static/espeasy.js @@ -6,7 +6,7 @@ var commonAtoms = ["And", "Or"]; var commonKeywords = ["If", "Else", "Elseif", "Endif"]; var commonCommands = ["AccessInfo", "Background", "Build", "ClearAccessBlock", "ClearRTCam", "Config", "ControllerDisable", "ControllerEnable", "DateTime", "Debug", "Dec", "DeepSleep", "DisablePriorityTask", "DNS", "DST", "EraseSDKWiFi", "ExecuteRules", "FactoryReset", "Gateway", "I2Cscanner", "Inc", - "IP", "Let", "LetStr", "Load", "LogEntry", "LogPortStatus", "LoopTimerSet", "LoopTimerSet_ms", "LoopTimerSetAndRun", "LoopTimerSetAndRun_ms", "MemInfo", "MemInfoDetail", "Name", "Password", "PostToHTTP", "PostToHTTPS", "Publish", "PublishR", + "IP", "Let", "LetStr", "Load", "LogEntry", "LogPortStatus", "LoopTimerSet", "LoopTimerSet_ms", "LoopTimerSetAndRun", "LoopTimerSetAndRun_ms", "MemInfo", "MemInfoDetail", "Name", "NetworkDisable", "NetworkEnable", "Password", "PostToHTTP", "PostToHTTPS", "Publish", "PublishR", "PutToHTTP", "PutToHTTPS", "Reboot", "Save", "SendTo", "SendToHTTP", "SendToHTTPS", "SendToUDP", "SendToUDPMix", "Settings", "Subnet", "Subscribe", "TaskClear", "TaskClearAll", "TaskDisable", "TaskEnable", "TaskRun", "TaskValueSet", "TaskValueSetAndRun", "TaskValueSetDerived", "TaskValueSetPresentation", "TimerPause", "TimerResume", "TimerSet", "TimerSet_ms", "TimeZone", "UdpPort", "UdpTest", "Unit", "UseNTP", "WdConfig", "WdRead", "WiFi", "WiFiAllowAP", "WiFiAPMode", "WiFiConnect", "WiFiDisconnect", "WiFiKey", From bec0c2f7426aac0809a6bc36e897bfbff178e5b2 Mon Sep 17 00:00:00 2001 From: TD-er Date: Fri, 21 Nov 2025 12:53:23 +0100 Subject: [PATCH 485/564] [WiFi] Fix check for available credentials only in device specific file --- .../net/Helpers/WiFi_AP_CandidatesList.cpp | 29 +++++++++++++------ .../net/Helpers/WiFi_AP_CandidatesList.h | 2 ++ src/ESPEasy/net/_NW001_WiFi_STA.cpp | 4 +-- src/src/DataStructs/SecurityStruct.cpp | 17 +++++++++++ src/src/DataStructs/SecurityStruct.h | 2 ++ .../SecurityStruct_deviceSpecific.cpp | 9 ++++++ .../SecurityStruct_deviceSpecific.h | 2 ++ 7 files changed, 54 insertions(+), 11 deletions(-) diff --git a/src/ESPEasy/net/Helpers/WiFi_AP_CandidatesList.cpp b/src/ESPEasy/net/Helpers/WiFi_AP_CandidatesList.cpp index 26d87fa43..adeffb7c9 100644 --- a/src/ESPEasy/net/Helpers/WiFi_AP_CandidatesList.cpp +++ b/src/ESPEasy/net/Helpers/WiFi_AP_CandidatesList.cpp @@ -79,15 +79,15 @@ void WiFi_AP_CandidatesList::load_knownCredentials() { HeapSelectDram ephemeral; # endif // ifdef USE_SECOND_HEAP - known.emplace_back(index, ssid); - + WiFi_AP_Candidate tmp_known(index, ssid); if (SettingsIndexMatchCustomCredentials(index)) { if (SettingsIndexMatchEmergencyFallback(index)) { - known.back().bits.isEmergencyFallback = true; + tmp_known.bits.isEmergencyFallback = true; } else { - known.back().bits.lowPriority = true; + tmp_known.bits.lowPriority = true; } } + known.push_back(tmp_known); ++index; } } @@ -131,7 +131,7 @@ void WiFi_AP_CandidatesList::process_WiFiscan() { // Append or update found APs from scan. int scancount = WiFi.scanComplete(); - if (scancount < 0) {} else { + if (scancount > 0) { for (int i = 0; i < scancount; ++i) { const WiFi_AP_Candidate tmp(i); @@ -371,14 +371,14 @@ void WiFi_AP_CandidatesList::loadCandidatesFromScanned() { } else { if (scan->bits.isHidden) { if (Settings.IncludeHiddenSSID()) { - if (SecuritySettings.hasWiFiCredentials()) { + if (WiFi_AP_CandidatesList::hasWiFiCredentials()) { candidates.push_back(*scan); } } } else if (scan->ssid.length() > 0) { for (auto kn_it = known.begin(); kn_it != known.end(); ++kn_it) { if (scan->ssid.equals(kn_it->ssid)) { - WiFi_AP_Candidate tmp = *scan; + WiFi_AP_Candidate tmp(*scan); tmp.index = kn_it->index; tmp.bits.lowPriority = kn_it->bits.lowPriority; tmp.bits.isEmergencyFallback = kn_it->bits.isEmergencyFallback; @@ -533,11 +533,11 @@ bool WiFi_AP_CandidatesList::get_SSID_key(uint8_t index, String& ssid, String& k switch (index) { case 1: - ssid = SecuritySettings.WifiSSID; + ssid = SecuritySettings.getSSID(SecurityStruct::WiFiCredentialsSlot::first); key = SecuritySettings.WifiKey; break; case 2: - ssid = SecuritySettings.WifiSSID2; + ssid = SecuritySettings.getSSID(SecurityStruct::WiFiCredentialsSlot::second); key = SecuritySettings.WifiKey2; break; case WIFI_CUSTOM_DEPLOYMENT_KEY_INDEX: @@ -593,6 +593,17 @@ bool WiFi_AP_CandidatesList::get_SSID_key(uint8_t index, String& ssid, String& k return !ssid.isEmpty() && key.length() >= 8; } +bool WiFi_AP_CandidatesList::hasWiFiCredentials() +{ + uint8_t index = 1; // Index 0 is the "unset" value + + for (; index < WIFI_CREDENTIALS_MAX_INDEX; ++index) { + String ssid; + if (get_SSID(index, ssid)) return true; + } + return false; +} + bool WiFi_AP_CandidatesList::get_SSID(uint8_t index, String& ssid) { String key; diff --git a/src/ESPEasy/net/Helpers/WiFi_AP_CandidatesList.h b/src/ESPEasy/net/Helpers/WiFi_AP_CandidatesList.h index eca8fae3b..c2bb3e38e 100644 --- a/src/ESPEasy/net/Helpers/WiFi_AP_CandidatesList.h +++ b/src/ESPEasy/net/Helpers/WiFi_AP_CandidatesList.h @@ -96,6 +96,8 @@ private: String& ssid, String& key); + static bool hasWiFiCredentials(); + public: static bool get_SSID(uint8_t index, diff --git a/src/ESPEasy/net/_NW001_WiFi_STA.cpp b/src/ESPEasy/net/_NW001_WiFi_STA.cpp index ed23fb44f..065a66aeb 100644 --- a/src/ESPEasy/net/_NW001_WiFi_STA.cpp +++ b/src/ESPEasy/net/_NW001_WiFi_STA.cpp @@ -387,9 +387,9 @@ bool NWPlugin_001(NWPlugin::Function function, EventStruct *event, String& strin // ESP32-C5 may use different SDIO pins. // See: https://github.com/espressif/esp-hosted-mcu/blob/main/docs/sdio.md#esp32-p4-function-ev-board-host-pin-mapping - addFormTextBox(getLabel(LabelType::SSID), F("ssid"), SecuritySettings.WifiSSID, 31); + addFormTextBox(getLabel(LabelType::SSID), F("ssid"), SecuritySettings.getSSID(SecurityStruct::WiFiCredentialsSlot::first), 31); addFormPasswordBox(F("WPA Key"), F("key"), SecuritySettings.WifiKey, 63); - addFormTextBox(F("Fallback SSID"), F("ssid2"), SecuritySettings.WifiSSID2, 31); + addFormTextBox(F("Fallback SSID"), F("ssid2"), SecuritySettings.getSSID(SecurityStruct::WiFiCredentialsSlot::second), 31); addFormPasswordBox(F("Fallback WPA Key"), F("key2"), SecuritySettings.WifiKey2, 63); addFormNote(F("WPA Key must be at least 8 characters long")); diff --git a/src/src/DataStructs/SecurityStruct.cpp b/src/src/DataStructs/SecurityStruct.cpp index e25bf83dc..a789960a0 100644 --- a/src/src/DataStructs/SecurityStruct.cpp +++ b/src/src/DataStructs/SecurityStruct.cpp @@ -5,6 +5,9 @@ #include "../ESPEasyCore/ESPEasy_Log.h" #include "../Globals/CPlugins.h" +#include "../Globals/SecuritySettings.h" + + SecurityStruct::SecurityStruct() { ZERO_FILL(WifiSSID); ZERO_FILL(WifiKey); @@ -81,6 +84,9 @@ void SecurityStruct::clearWiFiCredentials(SecurityStruct::WiFiCredentialsSlot sl //TODO TD-er: Let SecurityStruct load/save/handle the device specific security settings bool SecurityStruct::hasWiFiCredentials() const { +#if FEATURE_STORE_CREDENTIALS_SEPARATE_FILE + if (SecuritySettings_deviceSpecific.hasWiFiCredentials()) return true; +#endif return hasWiFiCredentials(SecurityStruct::WiFiCredentialsSlot::first) || hasWiFiCredentials(SecurityStruct::WiFiCredentialsSlot::second); } @@ -94,6 +100,17 @@ bool SecurityStruct::hasWiFiCredentials(SecurityStruct::WiFiCredentialsSlot slot return false; } +String SecurityStruct::getSSID(WiFiCredentialsSlot slot) const +{ + if (hasWiFiCredentials(slot)) { + if (slot == SecurityStruct::WiFiCredentialsSlot::first) + return WifiSSID; + if (slot == SecurityStruct::WiFiCredentialsSlot::second) + return WifiSSID2; + } + return EMPTY_STRING; +} + String SecurityStruct::getPassword() const { String res; const size_t passLength = strnlen(Password, sizeof(Password)); diff --git a/src/src/DataStructs/SecurityStruct.h b/src/src/DataStructs/SecurityStruct.h index 662fb3a6e..06d6126d7 100644 --- a/src/src/DataStructs/SecurityStruct.h +++ b/src/src/DataStructs/SecurityStruct.h @@ -40,6 +40,8 @@ struct SecurityStruct bool hasWiFiCredentials(WiFiCredentialsSlot slot) const; + String getSSID(WiFiCredentialsSlot slot) const; + String getPassword() const; char WifiSSID[32]; diff --git a/src/src/DataStructs/SecurityStruct_deviceSpecific.cpp b/src/src/DataStructs/SecurityStruct_deviceSpecific.cpp index c596eeb82..21fedf9e0 100644 --- a/src/src/DataStructs/SecurityStruct_deviceSpecific.cpp +++ b/src/src/DataStructs/SecurityStruct_deviceSpecific.cpp @@ -71,6 +71,15 @@ void SecurityStruct_deviceSpecific::clearWiFiCredentials() } } +bool SecurityStruct_deviceSpecific::hasWiFiCredentials() const +{ + for (uint8_t i = 0; i < MAX_EXTRA_WIFI_CREDENTIALS_SEPARATE_FILE; ++i) + { + if (hasWiFiCredentials(i)) return true; + } + return false; +} + bool SecurityStruct_deviceSpecific::hasWiFiCredentials(uint8_t index) const { return diff --git a/src/src/DataStructs/SecurityStruct_deviceSpecific.h b/src/src/DataStructs/SecurityStruct_deviceSpecific.h index 5cca8eb75..2a4c05ec5 100644 --- a/src/src/DataStructs/SecurityStruct_deviceSpecific.h +++ b/src/src/DataStructs/SecurityStruct_deviceSpecific.h @@ -47,6 +47,8 @@ public: void clearWiFiCredentials(); + bool hasWiFiCredentials() const; + bool hasWiFiCredentials(uint8_t index) const; // Move all set WiFi credentials to free up first entry From 809838150abde1ff7267aa52674c736db6b32d8f Mon Sep 17 00:00:00 2001 From: TD-er Date: Fri, 21 Nov 2025 12:54:16 +0100 Subject: [PATCH 486/564] [Network] Fix processing network events on disconnect + simplify check --- src/ESPEasy/net/ESPEasyNetwork_ESP32.cpp | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/src/ESPEasy/net/ESPEasyNetwork_ESP32.cpp b/src/ESPEasy/net/ESPEasyNetwork_ESP32.cpp index 05ae01c9f..346f53627 100644 --- a/src/ESPEasy/net/ESPEasyNetwork_ESP32.cpp +++ b/src/ESPEasy/net/ESPEasyNetwork_ESP32.cpp @@ -129,8 +129,7 @@ bool NetworkConnected(bool force) { if (force || (timePassedSince(last_check_millis) > 50) || (last_check_millis == 0)) { last_check_millis = millis(); - auto network_if = getDefaultNonAP_interface(); - + last_result = Network.isOnline(); // FIXME TD-er: This is checking for NonAP interfaces, however we also have // ESPEasy::net::NWPluginCall(NWPlugin::Function::NWPLUGIN_WEBSERVER_SHOULD_RUN); @@ -143,11 +142,7 @@ bool NetworkConnected(bool force) { // - mDNS // - Webserver - if (network_if == nullptr) { - return false; - } processNetworkEvents(); - last_result = network_if->connected(); } return last_result; } From 1be70d1e4e472d4c2f72b6faaf385483ef6a8699 Mon Sep 17 00:00:00 2001 From: Ton Huisman Date: Sat, 22 Nov 2025 21:23:19 +0100 Subject: [PATCH 487/564] [Bugfix] Derived values avoid parsing invalid values causing crashes --- src/src/WebServer/DevicesPage.cpp | 9 +++++++-- src/src/WebServer/JSON.cpp | 14 ++++++++++---- 2 files changed, 17 insertions(+), 6 deletions(-) diff --git a/src/src/WebServer/DevicesPage.cpp b/src/src/WebServer/DevicesPage.cpp index de29b343e..450dfae3f 100644 --- a/src/src/WebServer/DevicesPage.cpp +++ b/src/src/WebServer/DevicesPage.cpp @@ -896,8 +896,13 @@ void handle_devicess_ShowAllTasksTable(uint8_t page) } if (!it->second.isEmpty()) { String value(it->second); - value = parseTemplateAndCalculate(value); - String presentation = getCustomStringVar(strformat(F(TASK_VALUE_PRESENTATION_PREFIX_TEMPLATE), taskName.c_str(), valueName.c_str())); + String presentation; + if (Settings.TaskDeviceEnabled[x]) { + value = parseTemplateAndCalculate(value); + presentation = getCustomStringVar(strformat(F(TASK_VALUE_PRESENTATION_PREFIX_TEMPLATE), taskName.c_str(), valueName.c_str())); + } else { + value = F("0"); + } if (!uom.isEmpty()) { value = strformat(F("%s %s"), value.c_str(), uom.c_str()); } diff --git a/src/src/WebServer/JSON.cpp b/src/src/WebServer/JSON.cpp index c8a4d58b6..0e9fb81fa 100644 --- a/src/src/WebServer/JSON.cpp +++ b/src/src/WebServer/JSON.cpp @@ -506,11 +506,17 @@ void handle_json() } if (!it->second.isEmpty()) { String value(it->second); - stripEscapeCharacters(value); - value = parseTemplate(value); uint8_t nrDecimals = 255; // FIXME Use the minimal number of decimals needed - bool hasPresentation; - const String presentation = formatUserVarForPresentation(&TempEvent, INVALID_TASKVAR_INDEX, hasPresentation, value, DeviceIndex, valueName); + String presentation; + if (Settings.TaskDeviceEnabled[TaskIndex]) { + stripEscapeCharacters(value); + value = parseTemplate(value); + bool hasPresentation; + presentation = formatUserVarForPresentation(&TempEvent, INVALID_TASKVAR_INDEX, hasPresentation, value, DeviceIndex, valueName); + } else { + value = F("0"); + nrDecimals = 0; + } stream_comma_newline(); // Push out a comma and newline handle_json_stream_task_value_data(varNr + 1, From ec21ef30c1b2c5dadf2cb50cc1cefc3549c83468 Mon Sep 17 00:00:00 2001 From: Ton Huisman Date: Sun, 23 Nov 2025 15:51:31 +0100 Subject: [PATCH 488/564] [Bugfix] Derived values avoid parsing invalid values causing crashes, more global fix --- src/src/Helpers/StringParser.cpp | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/src/Helpers/StringParser.cpp b/src/src/Helpers/StringParser.cpp index 0cfab43dd..515d1f23d 100644 --- a/src/src/Helpers/StringParser.cpp +++ b/src/src/Helpers/StringParser.cpp @@ -320,7 +320,7 @@ String parseTemplate_padded(String& tmpString, uint8_t minimal_lineSize, bool us } } #if FEATURE_STRING_VARIABLES - if (!isHandled) { + if (!isHandled && Settings.TaskDeviceEnabled[taskIndex]) { String value; const String valName = parseString(valueName, 1); String derived = getCustomStringVar(strformat(F(TASK_VALUE_DERIVED_PREFIX_TEMPLATE), deviceName.c_str(), valName.c_str())); @@ -334,6 +334,7 @@ String parseTemplate_padded(String& tmpString, uint8_t minimal_lineSize, bool us } } } + #endif // if FEATURE_STRING_VARIABLES #if FEATURE_TASKVALUE_ATTRIBUTES if (!isHandled && valueName.indexOf('.') > -1) { // TaskValue specific attributes @@ -377,6 +378,7 @@ String parseTemplate_padded(String& tmpString, uint8_t minimal_lineSize, bool us } #endif // if FEATURE_TASKVALUE_ATTRIBUTES + #if FEATURE_STRING_VARIABLES if (!isHandled && valueName.indexOf('.') > -1) { String value; const String fullValueName = parseString(valueName, 1); From a135aabe8e30ed52fe137444a1c83ed4f654fd00 Mon Sep 17 00:00:00 2001 From: Ton Huisman Date: Sun, 23 Nov 2025 15:52:24 +0100 Subject: [PATCH 489/564] [Bugfix] Revert previous change as that didn't really fix the issue --- src/src/WebServer/DevicesPage.cpp | 9 ++------- src/src/WebServer/JSON.cpp | 14 ++++---------- 2 files changed, 6 insertions(+), 17 deletions(-) diff --git a/src/src/WebServer/DevicesPage.cpp b/src/src/WebServer/DevicesPage.cpp index 450dfae3f..de29b343e 100644 --- a/src/src/WebServer/DevicesPage.cpp +++ b/src/src/WebServer/DevicesPage.cpp @@ -896,13 +896,8 @@ void handle_devicess_ShowAllTasksTable(uint8_t page) } if (!it->second.isEmpty()) { String value(it->second); - String presentation; - if (Settings.TaskDeviceEnabled[x]) { - value = parseTemplateAndCalculate(value); - presentation = getCustomStringVar(strformat(F(TASK_VALUE_PRESENTATION_PREFIX_TEMPLATE), taskName.c_str(), valueName.c_str())); - } else { - value = F("0"); - } + value = parseTemplateAndCalculate(value); + String presentation = getCustomStringVar(strformat(F(TASK_VALUE_PRESENTATION_PREFIX_TEMPLATE), taskName.c_str(), valueName.c_str())); if (!uom.isEmpty()) { value = strformat(F("%s %s"), value.c_str(), uom.c_str()); } diff --git a/src/src/WebServer/JSON.cpp b/src/src/WebServer/JSON.cpp index 0e9fb81fa..c8a4d58b6 100644 --- a/src/src/WebServer/JSON.cpp +++ b/src/src/WebServer/JSON.cpp @@ -506,17 +506,11 @@ void handle_json() } if (!it->second.isEmpty()) { String value(it->second); + stripEscapeCharacters(value); + value = parseTemplate(value); uint8_t nrDecimals = 255; // FIXME Use the minimal number of decimals needed - String presentation; - if (Settings.TaskDeviceEnabled[TaskIndex]) { - stripEscapeCharacters(value); - value = parseTemplate(value); - bool hasPresentation; - presentation = formatUserVarForPresentation(&TempEvent, INVALID_TASKVAR_INDEX, hasPresentation, value, DeviceIndex, valueName); - } else { - value = F("0"); - nrDecimals = 0; - } + bool hasPresentation; + const String presentation = formatUserVarForPresentation(&TempEvent, INVALID_TASKVAR_INDEX, hasPresentation, value, DeviceIndex, valueName); stream_comma_newline(); // Push out a comma and newline handle_json_stream_task_value_data(varNr + 1, From 51be54227ca2b2fb2134360af49f3d402e3726d1 Mon Sep 17 00:00:00 2001 From: Ton Huisman Date: Sun, 23 Nov 2025 15:53:16 +0100 Subject: [PATCH 490/564] [AutoDiscovery] Show Auto Discovery for Controllers that have this enabled (Task configuration) --- src/src/WebServer/DevicesPage.cpp | 32 +++++++++++++++++-------------- 1 file changed, 18 insertions(+), 14 deletions(-) diff --git a/src/src/WebServer/DevicesPage.cpp b/src/src/WebServer/DevicesPage.cpp index de29b343e..f7abbe428 100644 --- a/src/src/WebServer/DevicesPage.cpp +++ b/src/src/WebServer/DevicesPage.cpp @@ -1592,20 +1592,6 @@ void devicePage_show_controller_config(taskIndex_t taskIndex, deviceIndex_t Devi if (!separatorAdded) { addFormSeparator(2); } - separatorAdded = true; - html_TR_TD(); - addHtml(F("Send to Controller ")); - addHtml(getControllerSymbol(controllerNr)); - addHtmlDiv(F("note"), wrap_braces(getCPluginNameFromCPluginID(Settings.Protocol[controllerNr]) + F(", ") + // Most compact code... - (Settings.ControllerEnabled[controllerNr] ? F("enabled") : F("disabled")))); - html_TD(); - - addHtml(F("")); // remove left padding 2x to align vertically with other inputs - html_TD(F("width:50px;padding-left:0")); - addCheckBox( - getPluginCustomArgName(F("TDSD"), controllerNr), // ="taskdevicesenddata" - Settings.TaskDeviceSendData[controllerNr][taskIndex]); - protocolIndex_t ProtocolIndex = getProtocolIndex_from_ControllerIndex(controllerNr); const bool showControllerIDX = validProtocolIndex(ProtocolIndex) && getProtocolStruct(ProtocolIndex).usesID && @@ -1614,6 +1600,24 @@ void devicePage_show_controller_config(taskIndex_t taskIndex, deviceIndex_t Devi const bool showMqttGroup = (validProtocolIndex(ProtocolIndex) && getProtocolStruct(ProtocolIndex).mqttAutoDiscover); # endif // if FEATURE_MQTT_DISCOVER + separatorAdded = true; + html_TR_TD(); + addHtml(F("Send to Controller ")); + addHtml(getControllerSymbol(controllerNr)); + addHtmlDiv(F("note"), wrap_braces(getCPluginNameFromCPluginID(Settings.Protocol[controllerNr]) + F(", ") + // Most compact code... + (Settings.ControllerEnabled[controllerNr] ? F("enabled") : F("disabled")) + #if FEATURE_MQTT_DISCOVER + + (showMqttGroup ? F(", Auto Discovery") : F("")) + #endif // if FEATURE_MQTT_DISCOVER + )); + html_TD(); + + addHtml(F("
    ")); // remove left padding 2x to align vertically with other inputs + html_TD(F("width:50px;padding-left:0")); + addCheckBox( + getPluginCustomArgName(F("TDSD"), controllerNr), // ="taskdevicesenddata" + Settings.TaskDeviceSendData[controllerNr][taskIndex]); + # if FEATURE_STRING_VARIABLES const bool allowSendDerived = !device.HideDerivedValues && (validProtocolIndex(ProtocolIndex) && From c54e1f5dda59b3e5c32424bf4b87c8a639384a08 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 24 Nov 2025 14:08:40 +0000 Subject: [PATCH 491/564] Bump actions/checkout from 5 to 6 Bumps [actions/checkout](https://github.com/actions/checkout) from 5 to 6. - [Release notes](https://github.com/actions/checkout/releases) - [Changelog](https://github.com/actions/checkout/blob/main/CHANGELOG.md) - [Commits](https://github.com/actions/checkout/compare/v5...v6) --- updated-dependencies: - dependency-name: actions/checkout dependency-version: '6' dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] --- .github/workflows/build.yml | 8 ++++---- .github/workflows/release.yml | 6 +++--- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 306f97ff9..bbf22ff2e 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -23,7 +23,7 @@ jobs: documentation: runs-on: ubuntu-latest steps: - - uses: actions/checkout@v5 + - uses: actions/checkout@v6 - uses: actions/setup-python@v6 with: python-version: '3.13' @@ -46,7 +46,7 @@ jobs: outputs: matrix: ${{ steps.set-matrix.outputs.matrix }} steps: - - uses: actions/checkout@v5 + - uses: actions/checkout@v6 - uses: actions/setup-python@v6 with: python-version: '3.13' @@ -62,7 +62,7 @@ jobs: strategy: matrix: ${{ fromJson(needs.generate-matrix.outputs.matrix) }} steps: - - uses: actions/checkout@v5 + - uses: actions/checkout@v6 - uses: actions/setup-python@v6 with: python-version: '3.13' @@ -101,7 +101,7 @@ jobs: needs: build runs-on: ubuntu-latest steps: - - uses: actions/checkout@v5 + - uses: actions/checkout@v6 - uses: actions/setup-python@v6 with: python-version: '3.13' diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index d465aab77..3de04216e 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -21,7 +21,7 @@ jobs: outputs: matrix: ${{ steps.set-matrix.outputs.matrix }} steps: - - uses: actions/checkout@v5 + - uses: actions/checkout@v6 - uses: actions/setup-python@v6 with: python-version: '3.13' @@ -37,7 +37,7 @@ jobs: strategy: matrix: ${{ fromJson(needs.generate-matrix.outputs.matrix) }} steps: - - uses: actions/checkout@v5 + - uses: actions/checkout@v6 - uses: actions/setup-python@v6 with: python-version: '3.13' @@ -69,7 +69,7 @@ jobs: needs: build runs-on: ubuntu-latest steps: - - uses: actions/checkout@v5 + - uses: actions/checkout@v6 - uses: actions/setup-python@v6 - name: Build documentation run: | From 392854da488f2b573311f9d33f505ba6f481c4b4 Mon Sep 17 00:00:00 2001 From: Ton Huisman Date: Tue, 25 Nov 2025 22:13:09 +0100 Subject: [PATCH 492/564] [Bugfix] Calculation missed value when returning from multiple brackets --- src/src/Helpers/Rules_calculate.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/src/Helpers/Rules_calculate.cpp b/src/src/Helpers/Rules_calculate.cpp index dfa39a4c3..1506264ae 100644 --- a/src/src/Helpers/Rules_calculate.cpp +++ b/src/src/Helpers/Rules_calculate.cpp @@ -568,7 +568,7 @@ CalculateReturnCode RulesCalculate_t::doCalculate(const char *input, ESPEASY_RUL if (sl > 1) { sc = stack[sl - 2]; if (!(is_operator(sc) || is_unary_operator(sc) || is_quinary_operator(sc))) { - sc = '('; + sc = '\0'; } } } From 31affa1e6b7b660f927ef038cab2af904e7b7fb4 Mon Sep 17 00:00:00 2001 From: TD-er Date: Thu, 27 Nov 2025 09:27:15 +0100 Subject: [PATCH 493/564] [webflasher] Add 'chipVariant' to distinguish ESP32-P4 variants --- tools/pio/generate_web_flasher_manifest.py | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/tools/pio/generate_web_flasher_manifest.py b/tools/pio/generate_web_flasher_manifest.py index ad51b9868..353f11e27 100644 --- a/tools/pio/generate_web_flasher_manifest.py +++ b/tools/pio/generate_web_flasher_manifest.py @@ -58,6 +58,7 @@ def parse_filename(file, version, variant, file_suffix): #print("{} : {} {} {}".format(file, version, variant, file_suffix)) chipFamily = 'NotSet' + chipVariant = '' manifest_suff = '' add_improv = True @@ -94,6 +95,10 @@ def parse_filename(file, version, variant, file_suffix): chipFamily = 'ESP32-H2' elif 'ESP32p4' in variant: chipFamily = 'ESP32-P4' + if 'rev300' in variant: + chipVariant = 'rev300' + else: + chipVariant = 'rev0' else: chipFamily = 'ESP32' @@ -240,17 +245,17 @@ def parse_filename(file, version, variant, file_suffix): manifest['build_flags'] = build_flags parts = dict([('path', file), ('offset', 0)]) if add_improv: - builds = dict([('chipFamily', chipFamily), ('improv', False), ('parts', [parts])]) + builds = dict([('chipFamily', chipFamily), ('chipVariant', chipVariant), ('improv', False), ('parts', [parts])]) else: - builds = dict([('chipFamily', chipFamily), ('parts', [parts])]) + builds = dict([('chipFamily', chipFamily), ('chipVariant', chipVariant), ('parts', [parts])]) manifest['builds'] = [builds] manifest_binfiles[main_group][sub_group] = manifest else: parts = dict([('path', file), ('offset', 0)]) if add_improv: - builds = dict([('chipFamily', chipFamily), ('improv', False), ('parts', [parts])]) + builds = dict([('chipFamily', chipFamily), ('chipVariant', chipVariant), ('improv', False), ('parts', [parts])]) else: - builds = dict([('chipFamily', chipFamily), ('parts', [parts])]) + builds = dict([('chipFamily', chipFamily), ('chipVariant', chipVariant), ('parts', [parts])]) manifest_binfiles[main_group][sub_group]['builds'].append(builds) manifest_binfiles[main_group][sub_group]['families'].append(chipFamily) From d25e41e52b0a8fdb178eea13a0d54e0df805b7f3 Mon Sep 17 00:00:00 2001 From: TD-er Date: Thu, 27 Nov 2025 09:28:22 +0100 Subject: [PATCH 494/564] [Hardware Info] Show differences between ESP32-C6H4 and ESP32-C6H8 --- src/src/Helpers/Hardware_device_info_ESP32C6.cpp | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/src/src/Helpers/Hardware_device_info_ESP32C6.cpp b/src/src/Helpers/Hardware_device_info_ESP32C6.cpp index 22b8ddf3e..3ae98765a 100644 --- a/src/src/Helpers/Hardware_device_info_ESP32C6.cpp +++ b/src/src/Helpers/Hardware_device_info_ESP32C6.cpp @@ -112,9 +112,14 @@ const __FlashStringHelper* getChipModel(uint32_t chip_model, uint32_t chip_revis // AddLog(LOG_LEVEL_DEBUG_MORE, PSTR("HDW: ESP32 Model %d, Revision %d, Core %d, Package %d"), chip_info.model, chip_revision, // chip_info.cores, chip_ver); + const int32_t flash_cap = getEmbeddedFlashSize(); + switch (pkg_version) { - case 0: return F("ESP32-C6"); - case 1: return F("ESP32-C6FH4 (QFN32)"); + case 0: return F("ESP32-C6 (QFN40)"); + case 1: + if (flash_cap == 4) return F("ESP32-C6FH4 (QFN32)"); + if (flash_cap == 8) return F("ESP32-C6FH8 (QFN32)"); + break; } return F("ESP32-C6"); From 47c2d30dd01d23e72ba116cf4ba5c07b42e087fd Mon Sep 17 00:00:00 2001 From: TD-er Date: Thu, 27 Nov 2025 09:28:59 +0100 Subject: [PATCH 495/564] [Cleanup] Mark unused members in SettingsStruct --- src/src/DataStructs/SettingsStruct.h | 2 +- src/src/DataStructs_templ/SettingsStruct.cpp | 2 +- src/src/Helpers/ESPEasy_FactoryDefault.cpp | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/src/DataStructs/SettingsStruct.h b/src/src/DataStructs/SettingsStruct.h index b8fafe209..5d7c10e3b 100644 --- a/src/src/DataStructs/SettingsStruct.h +++ b/src/src/DataStructs/SettingsStruct.h @@ -482,7 +482,7 @@ public: boolean UseSSDP = false; uint8_t ExternalTimeSource = 0; uint32_t WireClockStretchLimit = 0; - boolean GlobalSync = false; + boolean GlobalSync_unused = false; uint32_t ConnectionFailuresThreshold = 0; int16_t TimeZone = 0; boolean MQTTRetainFlag_unused = false; diff --git a/src/src/DataStructs_templ/SettingsStruct.cpp b/src/src/DataStructs_templ/SettingsStruct.cpp index 65622222b..bdebeed4d 100644 --- a/src/src/DataStructs_templ/SettingsStruct.cpp +++ b/src/src/DataStructs_templ/SettingsStruct.cpp @@ -745,7 +745,7 @@ void SettingsStruct_tmpl::clearMisc() { I2C_clockSpeed = DEFAULT_I2C_CLOCK_SPEED; WebserverPort = 80; SyslogPort = 514; - GlobalSync = false; + GlobalSync_unused = false; ConnectionFailuresThreshold = 0; MQTTRetainFlag_unused = false; InitSPI = DEFAULT_SPI; diff --git a/src/src/Helpers/ESPEasy_FactoryDefault.cpp b/src/src/Helpers/ESPEasy_FactoryDefault.cpp index 826ffbcb6..aac872006 100644 --- a/src/src/Helpers/ESPEasy_FactoryDefault.cpp +++ b/src/src/Helpers/ESPEasy_FactoryDefault.cpp @@ -320,10 +320,10 @@ void ResetFactory(bool formatFS) Settings.NetworkMedium = gpio_settings.network_medium; /* - Settings.GlobalSync = DEFAULT_USE_GLOBAL_SYNC; + Settings.GlobalSync_unused = DEFAULT_USE_GLOBAL_SYNC; Settings.IP_Octet = DEFAULT_IP_OCTET; - Settings.WDI2CAddress = DEFAULT_WD_IC2_ADDRESS; + Settings.WDI2CAddress = DEFAULT_WD_IC2_ADDRESS; Settings.UseSSDP = DEFAULT_USE_SSDP; Settings.ConnectionFailuresThreshold = DEFAULT_CON_FAIL_THRES; Settings.WireClockStretchLimit = DEFAULT_I2C_CLOCK_LIMIT; From ebb9da32889afc7c0a0c15a77c26b8d1666dd092 Mon Sep 17 00:00:00 2001 From: TD-er Date: Sun, 30 Nov 2025 01:46:29 +0100 Subject: [PATCH 496/564] [WiFi] Cleanup WiFi/AP settings + simplify when to start AP mode --- src/ESPEasy/net/Globals/NWPlugins.cpp | 18 +- src/ESPEasy/net/Helpers/NW_info_writer.cpp | 2 +- .../NW005_data_struct_PPP_modem.cpp | 2 +- src/ESPEasy/net/_NW001_WiFi_STA.cpp | 56 ++-- src/ESPEasy/net/_NW002_WiFi_AP.cpp | 87 ++--- .../net/wifi/ESPEasyWiFi_state_machine.cpp | 10 +- .../net/wifi/ESPEasyWifi_abstracted_ESP32.cpp | 2 +- .../wifi/ESPEasyWifi_abstracted_ESP8266.cpp | 2 +- src/src/Commands/WiFi.cpp | 2 +- .../DataStructs/FactoryDefault_WiFi_NVS.cpp | 4 +- src/src/DataStructs/FactoryDefault_WiFi_NVS.h | 2 +- src/src/DataStructs/SettingsStruct.h | 260 ++++++++------- src/src/DataStructs_templ/SettingsStruct.cpp | 8 +- .../DataTypes/ESPEasy_plugin_functions.cpp | 1 + src/src/DataTypes/ESPEasy_plugin_functions.h | 1 + src/src/DataTypes/FormSelectorOptions.cpp | 19 ++ src/src/DataTypes/FormSelectorOptions.h | 4 + src/src/Helpers/ESPEasy_Storage.cpp | 2 +- src/src/Helpers/ESPEasy_UnitOfMeasure.h | 5 + src/src/Helpers/ESPEasy_checks.cpp | 4 + src/src/Helpers/KeyValueWriter.cpp | 4 + src/src/Helpers/KeyValueWriter.h | 2 + src/src/Helpers/StringProvider.cpp | 120 ++++++- src/src/Helpers/StringProvider.h | 27 +- src/src/WebServer/AdvancedConfigPage.cpp | 86 ++--- src/src/WebServer/JSON.cpp | 4 +- src/src/WebServer/KeyValueWriter_WebForm.cpp | 4 + src/src/WebServer/KeyValueWriter_WebForm.h | 2 + src/src/WebServer/Markup_Forms.cpp | 57 +++- src/src/WebServer/Markup_Forms.h | 6 +- src/src/WebServer/NetworkPage.cpp | 92 ++--- src/src/WebServer/SetupPage.cpp | 313 +++++++++--------- src/src/WebServer/SysInfoPage.cpp | 4 +- 33 files changed, 767 insertions(+), 445 deletions(-) diff --git a/src/ESPEasy/net/Globals/NWPlugins.cpp b/src/ESPEasy/net/Globals/NWPlugins.cpp index 11392fa55..3dbd783e0 100644 --- a/src/ESPEasy/net/Globals/NWPlugins.cpp +++ b/src/ESPEasy/net/Globals/NWPlugins.cpp @@ -219,15 +219,20 @@ bool NWPluginCall(NWPlugin::Function Function, EventStruct *event, String& str) { auto runtime_data = NW_data->getNWPluginData_static_runtime(); - if (runtime_data) { - auto duration = runtime_data->_connectedStats.getLastOnDuration_ms(); + if (runtime_data && runtime_data->_connectedStats.isSet()) { + const bool connected = runtime_data->_connectedStats.isOn(); + auto duration = connected + ? runtime_data->_connectedStats.getLastOnDuration_ms() + : runtime_data->_connectedStats.getLastOffDuration_ms(); if (duration > 0) { event->Par64_1 = duration; event->Par64_2 = runtime_data->_connectedStats.getCycleCount(); if (event->kvWriter) { - event->kvWriter->write({ F("Connection Duration"), format_msec_duration_HMS(duration) }); + event->kvWriter->write({ + connected ? F("Connection Duration") : F("Disconnected Duration"), + format_msec_duration_HMS(duration) }); if (!event->kvWriter->summaryValueOnly()) { event->kvWriter->write({ F("Number of Reconnects"), event->Par64_2 }); @@ -250,6 +255,7 @@ bool NWPluginCall(NWPlugin::Function Function, EventStruct *event, String& str) case NWPlugin::Function::NWPLUGIN_INIT: case NWPlugin::Function::NWPLUGIN_CONNECT_SUCCESS: case NWPlugin::Function::NWPLUGIN_CONNECT_FAIL: + case NWPlugin::Function::NWPLUGIN_WEBFORM_SHOW_ACTIVE: case NWPlugin::Function::NWPLUGIN_WEBFORM_SHOW_CONNECTED: case NWPlugin::Function::NWPLUGIN_WEBFORM_SHOW_EXTENDED: case NWPlugin::Function::NWPLUGIN_WEBFORM_SHOW_HW_ADDRESS: @@ -320,6 +326,12 @@ bool NWPluginCall(NWPlugin::Function Function, EventStruct *event, String& str) success = true; break; + case NWPlugin::Function::NWPLUGIN_WEBFORM_SHOW_ACTIVE: + { + success = event->networkInterface->started(); + break; + } + case NWPlugin::Function::NWPLUGIN_WEBFORM_SHOW_NAME: if (event->kvWriter) { diff --git a/src/ESPEasy/net/Helpers/NW_info_writer.cpp b/src/ESPEasy/net/Helpers/NW_info_writer.cpp index 6f8103592..9829c453b 100644 --- a/src/ESPEasy/net/Helpers/NW_info_writer.cpp +++ b/src/ESPEasy/net/Helpers/NW_info_writer.cpp @@ -222,7 +222,7 @@ bool write_NetworkPort(const __FlashStringHelper*labels[], const int pins[], siz if (pins[i] >= 0) { success = true; writer->write({ - concat(labels[i], F(" GPIO")), + labels[i], pins[i], KeyValueStruct::Format::PreFormatted }); } diff --git a/src/ESPEasy/net/NWPluginStructs/NW005_data_struct_PPP_modem.cpp b/src/ESPEasy/net/NWPluginStructs/NW005_data_struct_PPP_modem.cpp index fcd66de19..779789473 100644 --- a/src/ESPEasy/net/NWPluginStructs/NW005_data_struct_PPP_modem.cpp +++ b/src/ESPEasy/net/NWPluginStructs/NW005_data_struct_PPP_modem.cpp @@ -646,7 +646,7 @@ bool NW005_data_struct_PPP_modem::webform_getPort(KeyValueWriter *writer) label.c_str(), pin)); } else { - if (writer->plainText()) { + if (writer->plainText() || !writer->allowHTML()) { KVS_StorageType::Enum storageType; writer->write({ getLabelString(keys[i], false, storageType), pin }); } else { diff --git a/src/ESPEasy/net/_NW001_WiFi_STA.cpp b/src/ESPEasy/net/_NW001_WiFi_STA.cpp index 065a66aeb..ad73b967d 100644 --- a/src/ESPEasy/net/_NW001_WiFi_STA.cpp +++ b/src/ESPEasy/net/_NW001_WiFi_STA.cpp @@ -106,6 +106,12 @@ bool NWPlugin_001(NWPlugin::Function function, EventStruct *event, String& strin break; } + case NWPlugin::Function::NWPLUGIN_WEBFORM_SHOW_ACTIVE: + { + success = ESPEasy::net::wifi::WifiIsSTA(WiFi.getMode()); + break; + } + case NWPlugin::Function::NWPLUGIN_WEBFORM_SHOW_CONNECTED: { # ifdef ESP32 @@ -298,7 +304,7 @@ bool NWPlugin_001(NWPlugin::Function function, EventStruct *event, String& strin } break; } -#ifndef LIMIT_BUILD_SIZE +# ifndef LIMIT_BUILD_SIZE case NWPlugin::Function::NWPLUGIN_WEBFORM_SHOW_PORT: { if (event->kvWriter) { @@ -306,7 +312,7 @@ bool NWPlugin_001(NWPlugin::Function function, EventStruct *event, String& strin } break; } -#endif +# endif // ifndef LIMIT_BUILD_SIZE # endif // ifdef BOARD_HAS_SDIO_ESP_HOSTED case NWPlugin::Function::NWPLUGIN_WEBFORM_SAVE: { @@ -354,7 +360,7 @@ bool NWPlugin_001(NWPlugin::Function function, EventStruct *event, String& strin Settings.WiFi_sensitivity_margin = getFormItemInt(LabelType::WIFI_SENS_MARGIN); Settings.UseMaxTXpowerForSending(isFormItemChecked(LabelType::WIFI_SEND_AT_MAX_TX_PWR)); # endif // if FEATURE_SET_WIFI_TX_PWR - Settings.NumberExtraWiFiScans = getFormItemInt(LabelType::WIFI_NR_EXTRA_SCANS); + Settings.ConnectFailRetryCount = getFormItemInt(LabelType::WIFI_NR_RECONNECT_ATTEMPTS); Settings.UseLastWiFiFromRTC(isFormItemChecked(LabelType::WIFI_USE_LAST_CONN_FROM_RTC)); # ifndef ESP32 @@ -405,12 +411,16 @@ bool NWPlugin_001(NWPlugin::Function function, EventStruct *event, String& strin addFormNote(F("These credentials will be stored in a separate file: devsecurity.dat")); # endif // if FEATURE_STORE_CREDENTIALS_SEPARATE_FILE addFormSubHeader(F("Wifi Settings")); - - addFormCheckBox(LabelType::CONNECT_HIDDEN_SSID, Settings.IncludeHiddenSSID()); - addFormCheckBox(LabelType::HIDDEN_SSID_SLOW_CONNECT, Settings.HiddenSSID_SlowConnectPerBSSID()); + { + LabelType::Enum labels[]{ + LabelType::CONNECT_HIDDEN_SSID + , LabelType::HIDDEN_SSID_SLOW_CONNECT # ifdef ESP32 - addFormCheckBox(LabelType::WIFI_PASSIVE_SCAN, Settings.PassiveWiFiScan()); + , LabelType::WIFI_PASSIVE_SCAN # endif + }; + addFormCheckBoxes(labels, NR_ELEMENTS(labels)); + } addFormSubHeader(F("WiFi IP Settings")); @@ -422,12 +432,12 @@ bool NWPlugin_001(NWPlugin::Function function, EventStruct *event, String& strin /* # if FEATURE_USE_IPV6 - addFormCheckBox(LabelType::ENABLE_IPV6, Settings.EnableIPv6()); + addFormCheckBox(LabelType::ENABLE_IPV6); # endif */ addFormSubHeader(F("WiFi Mode")); - addFormCheckBox(LabelType::FORCE_WIFI_BG, Settings.ForceWiFi_bg_mode()); + addFormCheckBox(LabelType::FORCE_WIFI_BG); # if CONFIG_SOC_WIFI_SUPPORT_5G { const __FlashStringHelper *wifiModeNames[] = { @@ -442,36 +452,38 @@ bool NWPlugin_001(NWPlugin::Function function, EventStruct *event, String& strin wifiModeNames, wifiModeOptions); selector.addFormSelector( - getLabel(LabelType::WIFI_BAND_MODE), - getInternalLabel(LabelType::WIFI_BAND_MODE), + LabelType::WIFI_BAND_MODE, Settings.WiFi_band_mode()); } # endif // if CONFIG_SOC_WIFI_SUPPORT_5G addFormSubHeader(F("WiFi Power")); - addFormCheckBox(LabelType::FORCE_WIFI_NOSLEEP, Settings.WifiNoneSleep()); + addFormCheckBox(LabelType::FORCE_WIFI_NOSLEEP); # if FEATURE_SET_WIFI_TX_PWR addFormFloatNumberBox(LabelType::WIFI_TX_MAX_PWR, Settings.getWiFi_TX_power(), 0.0f, MAX_TX_PWR_DBM_11b, 2, 0.25f); addFormNumericBox(LabelType::WIFI_SENS_MARGIN, Settings.WiFi_sensitivity_margin, -20, 30); - addFormCheckBox(LabelType::WIFI_SEND_AT_MAX_TX_PWR, Settings.UseMaxTXpowerForSending()); + addFormCheckBox(LabelType::WIFI_SEND_AT_MAX_TX_PWR); # endif // if FEATURE_SET_WIFI_TX_PWR addFormSubHeader(F("WiFi Tweaks")); - addFormCheckBox(LabelType::RESTART_WIFI_LOST_CONN, Settings.WiFiRestart_connection_lost()); - - addFormNumericBox(LabelType::WIFI_NR_EXTRA_SCANS, Settings.NumberExtraWiFiScans, 0, 5); - addFormCheckBox(LabelType::WIFI_USE_LAST_CONN_FROM_RTC, Settings.UseLastWiFiFromRTC()); - + addFormNumericBox(LabelType::WIFI_NR_RECONNECT_ATTEMPTS, Settings.ConnectFailRetryCount, 0, 255); + { + LabelType::Enum labels[]{ + LabelType::RESTART_WIFI_LOST_CONN + , LabelType::WIFI_USE_LAST_CONN_FROM_RTC # ifndef ESP32 - addFormCheckBox(LabelType::WAIT_WIFI_CONNECT, Settings.WaitWiFiConnect()); + , LabelType::WAIT_WIFI_CONNECT # endif - addFormCheckBox(LabelType::SDK_WIFI_AUTORECONNECT, Settings.SDK_WiFi_autoreconnect()); - + , LabelType::SDK_WIFI_AUTORECONNECT # ifdef SUPPORT_ARP - addFormCheckBox(LabelType::PERIODICAL_GRAT_ARP, Settings.gratuitousARP()); + , LabelType::PERIODICAL_GRAT_ARP # endif // ifdef SUPPORT_ARP + }; + + addFormCheckBoxes(labels, NR_ELEMENTS(labels)); + } break; } diff --git a/src/ESPEasy/net/_NW002_WiFi_AP.cpp b/src/ESPEasy/net/_NW002_WiFi_AP.cpp index 9e45b130c..f7dac12ba 100644 --- a/src/ESPEasy/net/_NW002_WiFi_AP.cpp +++ b/src/ESPEasy/net/_NW002_WiFi_AP.cpp @@ -49,10 +49,10 @@ bool NWPlugin_002(NWPlugin::Function function, EventStruct *event, String& strin case NWPlugin::Function::NWPLUGIN_DRIVER_ADD: { NetworkDriverStruct& nw = getNetworkDriverStruct(networkDriverIndex_t::toNetworkDriverIndex(event->idx)); - nw.onlySingleInstance = true; - nw.alwaysPresent = true; + nw.onlySingleInstance = true; + nw.alwaysPresent = true; nw.enabledOnFactoryReset = false; - nw.fixedNetworkIndex = NWPLUGIN_ID_002 - 1; // Start counting at 0 + nw.fixedNetworkIndex = NWPLUGIN_ID_002 - 1; // Start counting at 0 break; } @@ -88,6 +88,12 @@ bool NWPlugin_002(NWPlugin::Function function, EventStruct *event, String& strin break; } + case NWPlugin::Function::NWPLUGIN_WEBFORM_SHOW_ACTIVE: + { + success = ESPEasy::net::wifi::WifiIsAP(WiFi.getMode()); + break; + } + case NWPlugin::Function::NWPLUGIN_WEBFORM_SHOW_CONNECTED: { if (event->kvWriter == nullptr) { @@ -168,13 +174,13 @@ bool NWPlugin_002(NWPlugin::Function function, EventStruct *event, String& strin case NWPlugin::Function::NWPLUGIN_WEBFORM_SHOW_HOSTNAME: { if (event->kvWriter) { - event->kvWriter->write({ F("Hostname"), + event->kvWriter->write({ F("Hostname"), # ifdef ESP32 - WiFi.AP.SSID() + WiFi.AP.SSID() # else - WiFi.softAPSSID() + WiFi.softAPSSID() # endif // ifdef ESP32 - }); + }); success = true; } break; @@ -227,16 +233,20 @@ bool NWPlugin_002(NWPlugin::Function function, EventStruct *event, String& strin // Access point password. copyFormPassword(F("apkey"), SecuritySettings.WifiAPKey, sizeof(SecuritySettings.WifiAPKey)); - Settings.WiFiAP_channel = getFormItemInt(F("apchannel")); + Settings.WiFiAP_channel = getFormItemInt(LabelType::WIFI_AP_CHANNEL); // When set, user will be redirected to /setup or root page when connecting to this AP - Settings.ApCaptivePortal(isFormItemChecked(F("captiveportal"))); + Settings.ApCaptivePortal(isFormItemChecked(LabelType::WIFI_ENABLE_CAPTIVE_PORTAL)); // Usually the AP will be started when no WiFi is defined, or the defined one cannot be found. This flag may prevent it. - Settings.DoNotStartAP(isFormItemChecked(F("DoNotStartAP"))); + Settings.StartAPfallback_NoCredentials(!isFormItemChecked(LabelType::WIFI_START_AP_NO_CREDENTIALS)); + Settings.DoNotStartAPfallback_ConnectFail(!isFormItemChecked(LabelType::WIFI_START_AP_ON_CONNECT_FAIL)); + Settings.APfallback_autostart_max_uptime_m(getFormItemInt(LabelType::WIFI_MAX_UPTIME_AUTO_START_AP)); + Settings.APfallback_minimal_on_time_sec(getFormItemInt(LabelType::WIFI_AP_MINIMAL_ON_TIME)); + # ifdef ESP32 - Settings.WiFi_AP_enable_NAPT(isFormItemChecked(F("napt"))); + Settings.WiFi_AP_enable_NAPT(isFormItemChecked(LabelType::WIFI_AP_ENABLE_NAPT)); # endif break; @@ -254,48 +264,43 @@ bool NWPlugin_002(NWPlugin::Function function, EventStruct *event, String& strin // See wifi_5g_channel_bit_t for all supported channels const int wifiChannels[] = - { 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14 // 2.4 GHz - , 36, 40, 44, 48 // 5 GHz U-NII-1 - , 52, 56, 60, 64, 68 // 5 GHz U-NII-2A - // ,72, 76, 80, 84, 88 /* , 92 */ // 5 GHz U-NII-2B - , /* 96,*/ 100, 104, 108, 112, 116, 120, 124, 128, 132, 136, 140 // 5 GHz U-NII-2C - , 144 // 5 GHz U-NII-2C/3 - , 149, 153, 157, 161, 165 // 5 GHz U-NII-3 - , 169 // 5 GHz U-NII-3/4 - , 173, 177 // 5 GHz U-NII-4 + { 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14 // 2.4 GHz + ,36, 40, 44, 48 // 5 GHz U-NII-1 + ,52, 56, 60, 64, 68 // 5 GHz U-NII-2A + // ,72, 76, 80, 84, 88 /* , 92 */ // 5 GHz U-NII-2B + ,/* 96,*/ 100,104, 108, 112, 116, 120, 124, 128, 132, 136, 140 // 5 GHz U-NII-2C + ,144 // 5 GHz U-NII-2C/3 + ,149, 153, 157, 161, 165 // 5 GHz U-NII-3 + ,169 // 5 GHz U-NII-3/4 + ,173, 177 // 5 GHz U-NII-4 }; constexpr int nrwifiChannels = NR_ELEMENTS(wifiChannels); const FormSelectorOptions selector( nrwifiChannels, wifiChannels); selector.addFormSelector( - F("Wifi AP channel"), F("apchannel"), + LabelType::WIFI_AP_CHANNEL, Settings.WiFiAP_channel); # else // if CONFIG_SOC_WIFI_SUPPORT_5G - addFormNumericBox(F("Wifi AP channel"), F("apchannel"), Settings.WiFiAP_channel, 1, 14); + addFormNumericBox(LabelType::WIFI_AP_CHANNEL, Settings.WiFiAP_channel, 1, 14); # endif // if CONFIG_SOC_WIFI_SUPPORT_5G - addFormNote(F("WiFi channel to be used when only WiFi AP is active")); + } + { + LabelType::Enum labels[]{ + LabelType::WIFI_ENABLE_CAPTIVE_PORTAL + # ifdef ESP32 + , LabelType::WIFI_AP_ENABLE_NAPT + # endif // ifdef ESP32 + , LabelType::WIFI_START_AP_NO_CREDENTIALS + , LabelType::WIFI_START_AP_ON_CONNECT_FAIL + }; + + addFormCheckBoxes(labels, NR_ELEMENTS(labels)); } - - addFormCheckBox(F("Force /setup in AP-Mode"), F("captiveportal"), Settings.ApCaptivePortal()); - addFormNote(F( - "When set, user will be redirected to /setup or root page when connecting to this AP. /setup can still be called when disabled.")); - - addFormCheckBox(F("Do Not Start AP"), F("DoNotStartAP"), Settings.DoNotStartAP()); - # if FEATURE_ETHERNET - addFormNote(F("Do not allow to start an AP when unable to connect to configured LAN/WiFi")); - # else // if FEATURE_ETHERNET -#ifndef LIMIT_BUILD_SIZE - addFormNote(F("Do not allow to start an AP when configured WiFi cannot be found")); -#endif - # endif // if FEATURE_ETHERNET - # ifdef ESP32 - addFormCheckBox(F("Enable NAPT"), F("napt"), Settings.WiFi_AP_enable_NAPT()); - addFormNote(F("NAPT will have no effect when 'force /setup' is enabled")); - # endif // ifdef ESP32 - + addFormNumericBox(LabelType::WIFI_MAX_UPTIME_AUTO_START_AP, Settings.APfallback_autostart_max_uptime_m(), 0, 255); + addFormNumericBox(LabelType::WIFI_AP_MINIMAL_ON_TIME, Settings.APfallback_minimal_on_time_sec(), 0, 255); break; } diff --git a/src/ESPEasy/net/wifi/ESPEasyWiFi_state_machine.cpp b/src/ESPEasy/net/wifi/ESPEasyWiFi_state_machine.cpp index e44c24509..9490a4036 100644 --- a/src/ESPEasy/net/wifi/ESPEasyWiFi_state_machine.cpp +++ b/src/ESPEasy/net/wifi/ESPEasyWiFi_state_machine.cpp @@ -52,7 +52,7 @@ void ESPEasyWiFi_t::begin() { if (WiFi_AP_Candidates.hasCandidates()) { setState(WiFiState_e::IdleWaiting, 100); } else { -// if (!Settings.DoNotStartAP()) { +// if (!Settings.DoNotStartAPfallback_ConnectFail()) { // setState(WiFiState_e::AP_only, WIFI_STATE_MACHINE_AP_ONLY_TIMEOUT); // } else { @@ -133,7 +133,7 @@ void ESPEasyWiFi_t::loop() // Move up? } else if (!WiFi_AP_Candidates.hasCandidateCredentials() || - !Settings.DoNotStartAP()) { + !Settings.DoNotStartAPfallback_ConnectFail()) { if (!WiFi_AP_Candidates.hasCandidateCredentials() // && !WiFiEventData.warnedNoValidWiFiSettings @@ -183,7 +183,7 @@ void ESPEasyWiFi_t::loop() if (WiFi_AP_Candidates.hasCandidates()) { setState(WiFiState_e::WiFiOFF, 100); } else { - if (!Settings.DoNotStartAP()) { + if (!Settings.DoNotStartAPfallback_ConnectFail()) { setState(WiFiState_e::AP_only, WIFI_STATE_MACHINE_AP_ONLY_TIMEOUT); } else { setState(WiFiState_e::WiFiOFF, 1000); @@ -227,7 +227,7 @@ void ESPEasyWiFi_t::loop() _scan_channel = 0; if (!WiFi_AP_Candidates.hasCandidateCredentials() && - !Settings.DoNotStartAP()) { + !Settings.DoNotStartAPfallback_ConnectFail()) { setState(WiFiState_e::AP_only, WIFI_STATE_MACHINE_AP_ONLY_TIMEOUT); } else { setState(WiFiState_e::WiFiOFF, 100); @@ -458,7 +458,7 @@ bool ESPEasyWiFi_t::connectSTA() */ // No need to wait longer to start AP mode. - if (!Settings.DoNotStartAP()) + if (!Settings.DoNotStartAPfallback_ConnectFail()) { // setAPinternal(true); } diff --git a/src/ESPEasy/net/wifi/ESPEasyWifi_abstracted_ESP32.cpp b/src/ESPEasy/net/wifi/ESPEasyWifi_abstracted_ESP32.cpp index 4f41b90bd..c6ad5ef33 100644 --- a/src/ESPEasy/net/wifi/ESPEasyWifi_abstracted_ESP32.cpp +++ b/src/ESPEasy/net/wifi/ESPEasyWifi_abstracted_ESP32.cpp @@ -256,7 +256,7 @@ void doWifiScan(bool async, uint8_t channel) { // WiFiEventData.lastGetScanMoment.setNow(); // WiFiEventData.lastScanChannel = channel; - unsigned int nrScans = 1 + (async ? 0 : Settings.NumberExtraWiFiScans); + unsigned int nrScans = 1 + (async ? 0 : Settings.ConnectFailRetryCount); while (nrScans > 0) { WiFi_AP_Candidates.begin_scan(); diff --git a/src/ESPEasy/net/wifi/ESPEasyWifi_abstracted_ESP8266.cpp b/src/ESPEasy/net/wifi/ESPEasyWifi_abstracted_ESP8266.cpp index 99ea37b5d..9cdddf39e 100644 --- a/src/ESPEasy/net/wifi/ESPEasyWifi_abstracted_ESP8266.cpp +++ b/src/ESPEasy/net/wifi/ESPEasyWifi_abstracted_ESP8266.cpp @@ -179,7 +179,7 @@ void doWifiScan(bool async, uint8_t channel) { // WiFiEventData.lastGetScanMoment.setNow(); // WiFiEventData.lastScanChannel = channel; - unsigned int nrScans = 1 + (async ? 0 : Settings.NumberExtraWiFiScans); + unsigned int nrScans = 1 + (async ? 0 : Settings.ConnectFailRetryCount); while (nrScans > 0) { WiFi_AP_Candidates.begin_scan(); diff --git a/src/src/Commands/WiFi.cpp b/src/src/Commands/WiFi.cpp index bd58228dd..0a41c8517 100644 --- a/src/src/Commands/WiFi.cpp +++ b/src/src/Commands/WiFi.cpp @@ -139,7 +139,7 @@ String Command_Wifi_Mode(struct EventStruct *event, const char *Line) const __FlashStringHelper* Command_Wifi_AllowAP(struct EventStruct *event, const char *Line) { - Settings.DoNotStartAP(false); + Settings.DoNotStartAPfallback_ConnectFail(false); return return_command_success_flashstr(); } diff --git a/src/src/DataStructs/FactoryDefault_WiFi_NVS.cpp b/src/src/DataStructs/FactoryDefault_WiFi_NVS.cpp index 623a1b533..736afce27 100644 --- a/src/src/DataStructs/FactoryDefault_WiFi_NVS.cpp +++ b/src/src/DataStructs/FactoryDefault_WiFi_NVS.cpp @@ -18,7 +18,7 @@ void FactoryDefault_WiFi_NVS::fromSettings() { bits.IncludeHiddenSSID = Settings.IncludeHiddenSSID(); bits.ApCaptivePortal_inv = Settings.ApCaptivePortal(); - bits.DoNotStartAP = Settings.DoNotStartAP(); + bits.DoNotStartAPfallback_ConnectFail = Settings.DoNotStartAPfallback_ConnectFail(); bits.ForceWiFi_bg_mode = Settings.ForceWiFi_bg_mode(); bits.WiFiRestart_connection_lost = Settings.WiFiRestart_connection_lost(); bits.WifiNoneSleep = Settings.WifiNoneSleep(); @@ -35,7 +35,7 @@ void FactoryDefault_WiFi_NVS::fromSettings() { void FactoryDefault_WiFi_NVS::applyToSettings() const { Settings.IncludeHiddenSSID(bits.IncludeHiddenSSID); Settings.ApCaptivePortal(bits.ApCaptivePortal_inv); - Settings.DoNotStartAP(bits.DoNotStartAP); + Settings.DoNotStartAPfallback_ConnectFail(bits.DoNotStartAPfallback_ConnectFail); Settings.ForceWiFi_bg_mode(bits.ForceWiFi_bg_mode); Settings.WiFiRestart_connection_lost(bits.WiFiRestart_connection_lost); Settings.WifiNoneSleep(bits.WifiNoneSleep); diff --git a/src/src/DataStructs/FactoryDefault_WiFi_NVS.h b/src/src/DataStructs/FactoryDefault_WiFi_NVS.h index a4af361c6..ab89546b6 100644 --- a/src/src/DataStructs/FactoryDefault_WiFi_NVS.h +++ b/src/src/DataStructs/FactoryDefault_WiFi_NVS.h @@ -30,7 +30,7 @@ private: struct { uint64_t IncludeHiddenSSID : 1; uint64_t ApCaptivePortal_inv : 1; // Was ApDontForceSetup, so store inverted to remain compatible with existing settings - uint64_t DoNotStartAP : 1; + uint64_t DoNotStartAPfallback_ConnectFail : 1; uint64_t ForceWiFi_bg_mode : 1; uint64_t WiFiRestart_connection_lost : 1; uint64_t WifiNoneSleep : 1; diff --git a/src/src/DataStructs/SettingsStruct.h b/src/src/DataStructs/SettingsStruct.h index 5d7c10e3b..341bf7e41 100644 --- a/src/src/DataStructs/SettingsStruct.h +++ b/src/src/DataStructs/SettingsStruct.h @@ -73,156 +73,156 @@ class SettingsStruct_tmpl // SettingsStruct_tmpl() = default; // VariousBits1 defaults to 0, keep in mind when adding bit lookups. - bool appendUnitToHostname() const { return !VariousBits_1.appendUnitToHostname; } - void appendUnitToHostname(bool value) { VariousBits_1.appendUnitToHostname = !value;} + inline bool appendUnitToHostname() const { return !VariousBits_1.appendUnitToHostname; } + inline void appendUnitToHostname(bool value) { VariousBits_1.appendUnitToHostname = !value;} - bool uniqueMQTTclientIdReconnect_unused() const { return VariousBits_1.unused_02; } - void uniqueMQTTclientIdReconnect_unused(bool value) { VariousBits_1.unused_02 = value; } + inline bool uniqueMQTTclientIdReconnect_unused() const { return VariousBits_1.unused_02; } + inline void uniqueMQTTclientIdReconnect_unused(bool value) { VariousBits_1.unused_02 = value; } - bool OldRulesEngine() const { + inline bool OldRulesEngine() const { #ifdef WEBSERVER_NEW_RULES return !VariousBits_1.OldRulesEngine; #else return true; #endif } - void OldRulesEngine(bool value) { VariousBits_1.OldRulesEngine = !value; } + inline void OldRulesEngine(bool value) { VariousBits_1.OldRulesEngine = !value; } - bool ForceWiFi_bg_mode() const { return VariousBits_1.ForceWiFi_bg_mode; } - void ForceWiFi_bg_mode(bool value) { VariousBits_1.ForceWiFi_bg_mode = value; } + inline bool ForceWiFi_bg_mode() const { return VariousBits_1.ForceWiFi_bg_mode; } + inline void ForceWiFi_bg_mode(bool value) { VariousBits_1.ForceWiFi_bg_mode = value; } - bool WiFiRestart_connection_lost() const { return VariousBits_1.WiFiRestart_connection_lost; } - void WiFiRestart_connection_lost(bool value) { VariousBits_1.WiFiRestart_connection_lost = value; } + inline bool WiFiRestart_connection_lost() const { return VariousBits_1.WiFiRestart_connection_lost; } + inline void WiFiRestart_connection_lost(bool value) { VariousBits_1.WiFiRestart_connection_lost = value; } - bool EcoPowerMode() const { return VariousBits_1.EcoPowerMode; } - void EcoPowerMode(bool value) { VariousBits_1.EcoPowerMode = value; } + inline bool EcoPowerMode() const { return VariousBits_1.EcoPowerMode; } + inline void EcoPowerMode(bool value) { VariousBits_1.EcoPowerMode = value; } - bool WifiNoneSleep() const { return VariousBits_1.WifiNoneSleep; } - void WifiNoneSleep(bool value) { VariousBits_1.WifiNoneSleep = value; } + inline bool WifiNoneSleep() const { return VariousBits_1.WifiNoneSleep; } + inline void WifiNoneSleep(bool value) { VariousBits_1.WifiNoneSleep = value; } // Enable send gratuitous ARP by default, so invert the values (default = 0) - bool gratuitousARP() const { return !VariousBits_1.gratuitousARP; } - void gratuitousARP(bool value) { VariousBits_1.gratuitousARP = !value; } + inline bool gratuitousARP() const { return !VariousBits_1.gratuitousARP; } + inline void gratuitousARP(bool value) { VariousBits_1.gratuitousARP = !value; } // Be a bit more tolerant when parsing the last argument of a command. // See: https://github.com/letscontrolit/ESPEasy/issues/2724 - bool TolerantLastArgParse() const { return VariousBits_1.TolerantLastArgParse; } - void TolerantLastArgParse(bool value) { VariousBits_1.TolerantLastArgParse = value; } + inline bool TolerantLastArgParse() const { return VariousBits_1.TolerantLastArgParse; } + inline void TolerantLastArgParse(bool value) { VariousBits_1.TolerantLastArgParse = value; } // SendToHttp command does not wait for ack, with this flag it does wait. - bool SendToHttp_ack() const { return VariousBits_1.SendToHttp_ack; } - void SendToHttp_ack(bool value) { VariousBits_1.SendToHttp_ack = value; } + inline bool SendToHttp_ack() const { return VariousBits_1.SendToHttp_ack; } + inline void SendToHttp_ack(bool value) { VariousBits_1.SendToHttp_ack = value; } // Enable/disable ESPEasyNow protocol - bool UseESPEasyNow() const { + inline bool UseESPEasyNow() const { #ifdef USES_ESPEASY_NOW return VariousBits_1.UseESPEasyNow; #else return false; #endif } - void UseESPEasyNow(bool value) { + inline void UseESPEasyNow(bool value) { #ifdef USES_ESPEASY_NOW VariousBits_1.UseESPEasyNow = value; #endif } // Whether to try to connect to a hidden SSID network - bool IncludeHiddenSSID() const { return VariousBits_1.IncludeHiddenSSID; } - void IncludeHiddenSSID(bool value) { VariousBits_1.IncludeHiddenSSID = value; } + inline bool IncludeHiddenSSID() const { return VariousBits_1.IncludeHiddenSSID; } + inline void IncludeHiddenSSID(bool value) { VariousBits_1.IncludeHiddenSSID = value; } // When sending, the TX power may be boosted to max TX power. - bool UseMaxTXpowerForSending() const { return VariousBits_1.UseMaxTXpowerForSending; } - void UseMaxTXpowerForSending(bool value) { VariousBits_1.UseMaxTXpowerForSending = value; } + inline bool UseMaxTXpowerForSending() const { return VariousBits_1.UseMaxTXpowerForSending; } + inline void UseMaxTXpowerForSending(bool value) { VariousBits_1.UseMaxTXpowerForSending = value; } // When set, user will be redirected to /setup or root page when connecting to this AP - bool ApCaptivePortal() const { return !VariousBits_1.ApCaptivePortal; } - void ApCaptivePortal(bool value) { VariousBits_1.ApCaptivePortal = !value; } + inline bool ApCaptivePortal() const { return !VariousBits_1.ApCaptivePortal; } + inline void ApCaptivePortal(bool value) { VariousBits_1.ApCaptivePortal = !value; } // When outputting JSON bools use quoted values (on, backward compatible) or use official JSON true/false unquoted - bool JSONBoolWithoutQuotes() const { return VariousBits_1.JSONBoolWithoutQuotes; } - void JSONBoolWithoutQuotes(bool value) { VariousBits_1.JSONBoolWithoutQuotes = value; } + inline bool JSONBoolWithoutQuotes() const { return VariousBits_1.JSONBoolWithoutQuotes; } + inline void JSONBoolWithoutQuotes(bool value) { VariousBits_1.JSONBoolWithoutQuotes = value; } // Enable timing statistics (may consume a few kB of RAM) - bool EnableTimingStats() const { return VariousBits_1.EnableTimingStats; } - void EnableTimingStats(bool value) { VariousBits_1.EnableTimingStats = value; } + inline bool EnableTimingStats() const { return VariousBits_1.EnableTimingStats; } + inline void EnableTimingStats(bool value) { VariousBits_1.EnableTimingStats = value; } // Allow to actively reset I2C bus if it appears to be hanging. - bool EnableClearHangingI2Cbus() const { + inline bool EnableClearHangingI2Cbus() const { #if FEATURE_CLEAR_I2C_STUCK return VariousBits_1.EnableClearHangingI2Cbus; #else return false; #endif } - void EnableClearHangingI2Cbus(bool value) { VariousBits_1.EnableClearHangingI2Cbus = value; } + inline void EnableClearHangingI2Cbus(bool value) { VariousBits_1.EnableClearHangingI2Cbus = value; } // Enable RAM Tracking (may consume a few kB of RAM and cause some performance hit) - bool EnableRAMTracking() const { return VariousBits_1.EnableRAMTracking; } - void EnableRAMTracking(bool value) { VariousBits_1.EnableRAMTracking = value; } + inline bool EnableRAMTracking() const { return VariousBits_1.EnableRAMTracking; } + inline void EnableRAMTracking(bool value) { VariousBits_1.EnableRAMTracking = value; } // Enable caching of rules, to speed up rules processing - bool EnableRulesCaching() const { return !VariousBits_1.EnableRulesCaching; } - void EnableRulesCaching(bool value) { VariousBits_1.EnableRulesCaching = !value; } + inline bool EnableRulesCaching() const { return !VariousBits_1.EnableRulesCaching; } + inline void EnableRulesCaching(bool value) { VariousBits_1.EnableRulesCaching = !value; } // Allow the cached event entries to be sorted based on how frequent they occur. // This may speed up rules processing, especially on large rule sets with lots of rules blocks. - bool EnableRulesEventReorder() const { return !VariousBits_1.EnableRulesEventReorder; } - void EnableRulesEventReorder(bool value) { VariousBits_1.EnableRulesEventReorder = !value; } + inline bool EnableRulesEventReorder() const { return !VariousBits_1.EnableRulesEventReorder; } + inline void EnableRulesEventReorder(bool value) { VariousBits_1.EnableRulesEventReorder = !value; } // Allow OTA to use 'unlimited' bin sized files, possibly overwriting the file-system, and trashing files // Can be used if the configuration is later retrieved/restored manually - bool AllowOTAUnlimited() const { return VariousBits_1.AllowOTAUnlimited; } - void AllowOTAUnlimited(bool value) { VariousBits_1.AllowOTAUnlimited = value; } + inline bool AllowOTAUnlimited() const { return VariousBits_1.AllowOTAUnlimited; } + inline void AllowOTAUnlimited(bool value) { VariousBits_1.AllowOTAUnlimited = value; } // Default behavior is to not allow following redirects - bool SendToHTTP_follow_redirects() const { return VariousBits_1.SendToHTTP_follow_redirects; } - void SendToHTTP_follow_redirects(bool value) { VariousBits_1.SendToHTTP_follow_redirects = value; } + inline bool SendToHTTP_follow_redirects() const { return VariousBits_1.SendToHTTP_follow_redirects; } + inline void SendToHTTP_follow_redirects(bool value) { VariousBits_1.SendToHTTP_follow_redirects = value; } #if FEATURE_I2C_DEVICE_CHECK // Check if an I2C device is found at configured address at plugin_INIT and plugin_READ - bool CheckI2Cdevice() const { return !VariousBits_1.CheckI2Cdevice; } - void CheckI2Cdevice(bool value) { VariousBits_1.CheckI2Cdevice = !value; } + inline bool CheckI2Cdevice() const { return !VariousBits_1.CheckI2Cdevice; } + inline void CheckI2Cdevice(bool value) { VariousBits_1.CheckI2Cdevice = !value; } #endif // if FEATURE_I2C_DEVICE_CHECK // Wait for a second after calling WiFi.begin() // Especially useful for some FritzBox routers. - bool WaitWiFiConnect() const { return VariousBits_2.WaitWiFiConnect; } - void WaitWiFiConnect(bool value) { VariousBits_2.WaitWiFiConnect = value; } + inline bool WaitWiFiConnect() const { return VariousBits_2.WaitWiFiConnect; } + inline void WaitWiFiConnect(bool value) { VariousBits_2.WaitWiFiConnect = value; } #ifdef ESP32 // Toggle between passive/active WiFi scan. - bool PassiveWiFiScan() const { return !VariousBits_2.PassiveWiFiScan; } - void PassiveWiFiScan(bool value) { VariousBits_2.PassiveWiFiScan = !value; } + inline bool PassiveWiFiScan() const { return !VariousBits_2.PassiveWiFiScan; } + inline void PassiveWiFiScan(bool value) { VariousBits_2.PassiveWiFiScan = !value; } #endif // Connect to Hidden SSID using channel and BSSID // This is much slower, but appears to be needed for some access points // like MikroTik. - bool HiddenSSID_SlowConnectPerBSSID() const { return !VariousBits_2.HiddenSSID_SlowConnectPerBSSID; } - void HiddenSSID_SlowConnectPerBSSID(bool value) { VariousBits_2.HiddenSSID_SlowConnectPerBSSID = !value; } + inline bool HiddenSSID_SlowConnectPerBSSID() const { return !VariousBits_2.HiddenSSID_SlowConnectPerBSSID; } + inline void HiddenSSID_SlowConnectPerBSSID(bool value) { VariousBits_2.HiddenSSID_SlowConnectPerBSSID = !value; } - bool EnableIPv6() const { return !VariousBits_2.EnableIPv6; } - void EnableIPv6(bool value) { VariousBits_2.EnableIPv6 = !value; } + inline bool EnableIPv6() const { return !VariousBits_2.EnableIPv6; } + inline void EnableIPv6(bool value) { VariousBits_2.EnableIPv6 = !value; } // Use Espressif's auto reconnect. - bool SDK_WiFi_autoreconnect() const { return VariousBits_2.SDK_WiFi_autoreconnect; } - void SDK_WiFi_autoreconnect(bool value) { VariousBits_2.SDK_WiFi_autoreconnect = value; } + inline bool SDK_WiFi_autoreconnect() const { return VariousBits_2.SDK_WiFi_autoreconnect; } + inline void SDK_WiFi_autoreconnect(bool value) { VariousBits_2.SDK_WiFi_autoreconnect = value; } #if FEATURE_RULES_EASY_COLOR_CODE // Inhibit RulesCodeCompletion - bool DisableRulesCodeCompletion() const { return VariousBits_2.DisableRulesCodeCompletion; } - void DisableRulesCodeCompletion(bool value) { VariousBits_2.DisableRulesCodeCompletion = value; } + inline bool DisableRulesCodeCompletion() const { return VariousBits_2.DisableRulesCodeCompletion; } + inline void DisableRulesCodeCompletion(bool value) { VariousBits_2.DisableRulesCodeCompletion = value; } #endif // if FEATURE_RULES_EASY_COLOR_CODE #if FEATURE_TARSTREAM_SUPPORT - bool DisableSaveConfigAsTar() const { return VariousBits_2.DisableSaveConfigAsTar; } - void DisableSaveConfigAsTar(bool value) { VariousBits_2.DisableSaveConfigAsTar = value; } + inline bool DisableSaveConfigAsTar() const { return VariousBits_2.DisableSaveConfigAsTar; } + inline void DisableSaveConfigAsTar(bool value) { VariousBits_2.DisableSaveConfigAsTar = value; } #endif // if FEATURE_TARSTREAM_SUPPORT #if FEATURE_TASKVALUE_UNIT_OF_MEASURE - bool ShowUnitOfMeasureOnDevicesPage() const { return !VariousBits_2.ShowUnitOfMeasureOnDevicesPage; } - void ShowUnitOfMeasureOnDevicesPage(bool value) { VariousBits_2.ShowUnitOfMeasureOnDevicesPage = !value; } + inline bool ShowUnitOfMeasureOnDevicesPage() const { return !VariousBits_2.ShowUnitOfMeasureOnDevicesPage; } + inline void ShowUnitOfMeasureOnDevicesPage(bool value) { VariousBits_2.ShowUnitOfMeasureOnDevicesPage = !value; } #endif // if FEATURE_TASKVALUE_UNIT_OF_MEASURE #if CONFIG_SOC_WIFI_SUPPORT_5G @@ -230,18 +230,18 @@ class SettingsStruct_tmpl if (VariousBits_2.WiFi_band_mode == 0) return WIFI_BAND_MODE_AUTO; return static_cast(VariousBits_2.WiFi_band_mode); } - void WiFi_band_mode(wifi_band_mode_t value) { VariousBits_2.WiFi_band_mode = value; } + inline void WiFi_band_mode(wifi_band_mode_t value) { VariousBits_2.WiFi_band_mode = value; } #endif #ifdef ESP32 - bool WiFi_AP_enable_NAPT() const { return !VariousBits_2.WiFi_AP_enable_NAPT; } - void WiFi_AP_enable_NAPT(bool enable) { VariousBits_2.WiFi_AP_enable_NAPT = !enable; } + inline bool WiFi_AP_enable_NAPT() const { return !VariousBits_2.WiFi_AP_enable_NAPT; } + inline void WiFi_AP_enable_NAPT(bool enable) { VariousBits_2.WiFi_AP_enable_NAPT = !enable; } #endif #if FEATURE_MQTT_CONNECT_BACKGROUND - bool MQTTConnectInBackground() const { return !VariousBits_2.MQTTConnectInBackground; } // Inverted! - void MQTTConnectInBackground(bool value) { VariousBits_2.MQTTConnectInBackground = !value; } + inline bool MQTTConnectInBackground() const { return !VariousBits_2.MQTTConnectInBackground; } // Inverted! + inline void MQTTConnectInBackground(bool value) { VariousBits_2.MQTTConnectInBackground = !value; } #endif // if FEATURE_MQTT_CONNECT_BACKGROUND // Flag indicating whether all task values should be sent in a single event or one event per task value (default behavior) @@ -257,14 +257,24 @@ class SettingsStruct_tmpl void SendDerivedTaskValues(taskIndex_t taskIndex, controllerIndex_t controllerIndex, bool value); #endif // if FEATURE_STRING_VARIABLES - bool DoNotStartAP() const { return VariousBits_1.DoNotStartAP; } - void DoNotStartAP(bool value) { VariousBits_1.DoNotStartAP = value; } + inline bool StartAPfallback_NoCredentials() const { return !VariousBits_2.StartAPfallback_NoCredentials; } + inline void StartAPfallback_NoCredentials(bool value) { VariousBits_2.StartAPfallback_NoCredentials = !value; } - bool UseAlternativeDeepSleep() const { return VariousBits_1.UseAlternativeDeepSleep; } - void UseAlternativeDeepSleep(bool value) { VariousBits_1.UseAlternativeDeepSleep = value; } + inline bool DoNotStartAPfallback_ConnectFail() const { return VariousBits_1.DoNotStartAPfallback_ConnectFail; } + inline void DoNotStartAPfallback_ConnectFail(bool value) { VariousBits_1.DoNotStartAPfallback_ConnectFail = value; } - bool UseLastWiFiFromRTC() const { return VariousBits_1.UseLastWiFiFromRTC; } - void UseLastWiFiFromRTC(bool value) { VariousBits_1.UseLastWiFiFromRTC = value; } + inline uint8_t APfallback_autostart_max_uptime_m() const { return VariousBits_2.APfallback_autostart_max_uptime_m; } + inline void APfallback_autostart_max_uptime_m(uint8_t count) { VariousBits_2.APfallback_autostart_max_uptime_m = count; } + + inline uint8_t APfallback_minimal_on_time_sec() const { return VariousBits_2.APfallback_minimal_on_time_sec; } + inline void APfallback_minimal_on_time_sec(uint8_t count) { VariousBits_2.APfallback_minimal_on_time_sec = count; } + + + inline bool UseAlternativeDeepSleep() const { return VariousBits_1.UseAlternativeDeepSleep; } + inline void UseAlternativeDeepSleep(bool value) { VariousBits_1.UseAlternativeDeepSleep = value; } + + inline bool UseLastWiFiFromRTC() const { return VariousBits_1.UseLastWiFiFromRTC; } + inline void UseLastWiFiFromRTC(bool value) { VariousBits_1.UseLastWiFiFromRTC = value; } ExtTimeSource_e ExtTimeSource() const; void ExtTimeSource(ExtTimeSource_e value); @@ -272,12 +282,12 @@ class SettingsStruct_tmpl bool UseNTP() const; void UseNTP(bool value); - bool AllowTaskValueSetAllPlugins() const { return VariousBits_1.AllowTaskValueSetAllPlugins; } - void AllowTaskValueSetAllPlugins(bool value) { VariousBits_1.AllowTaskValueSetAllPlugins = value; } + inline bool AllowTaskValueSetAllPlugins() const { return VariousBits_1.AllowTaskValueSetAllPlugins; } + inline void AllowTaskValueSetAllPlugins(bool value) { VariousBits_1.AllowTaskValueSetAllPlugins = value; } #if FEATURE_AUTO_DARK_MODE - uint8_t getCssMode() const { return VariousBits_1.CssMode; } - void setCssMode(uint8_t value) { VariousBits_1.CssMode = value; } + inline uint8_t getCssMode() const { return VariousBits_1.CssMode; } + inline void setCssMode(uint8_t value) { VariousBits_1.CssMode = value; } #endif // FEATURE_AUTO_DARK_MODE bool isTaskEnableReadonly(taskIndex_t taskIndex) const; @@ -482,7 +492,44 @@ public: boolean UseSSDP = false; uint8_t ExternalTimeSource = 0; uint32_t WireClockStretchLimit = 0; - boolean GlobalSync_unused = false; + union { + struct { + uint32_t unused_00 : 1; // Bit 0 + uint32_t unused_01 : 1; // Bit 1 + uint32_t unused_02 : 1; // Bit 2 + uint32_t unused_03 : 1; // Bit 3 + uint32_t unused_04 : 1; // Bit 4 + uint32_t unused_05 : 1; // Bit 5 + uint32_t unused_06 : 1; // Bit 6 + uint32_t unused_07 : 1; // Bit 7 + uint32_t unused_08 : 1; // Bit 8 + uint32_t unused_09 : 1; // Bit 9 + uint32_t unused_10 : 1; // Bit 10 + uint32_t unused_11 : 1; // Bit 11 + uint32_t unused_12 : 1; // Bit 12 + uint32_t unused_13 : 1; // Bit 13 + uint32_t unused_14 : 1; // Bit 14 + uint32_t unused_15 : 1; // Bit 15 + uint32_t unused_16 : 1; // Bit 16 + uint32_t unused_17 : 1; // Bit 17 + uint32_t unused_18 : 1; // Bit 18 + uint32_t unused_19 : 1; // Bit 19 + uint32_t unused_20 : 1; // Bit 20 + uint32_t unused_21 : 1; // Bit 21 + uint32_t unused_22 : 1; // Bit 22 + uint32_t unused_23 : 1; // Bit 23 + uint32_t unused_24 : 1; // Bit 24 + uint32_t unused_25 : 1; // Bit 25 + uint32_t unused_26 : 1; // Bit 26 + uint32_t unused_27 : 1; // Bit 27 + uint32_t unused_28 : 1; // Bit 28 + uint32_t unused_29 : 1; // Bit 29 + uint32_t unused_30 : 1; // Bit 30 + uint32_t unused_31 : 1; // Bit 31 + }; + uint32_t _all_bits{}; + } VariousBits_3; //-V730 + uint32_t ConnectionFailuresThreshold = 0; int16_t TimeZone = 0; boolean MQTTRetainFlag_unused = false; @@ -577,7 +624,7 @@ public: uint32_t ApCaptivePortal : 1; // Bit 14 Inverted uint32_t unused_15 : 1; // Bit 15 was used by PeriodicalScanWiFi uint32_t JSONBoolWithoutQuotes : 1; // Bit 16 - uint32_t DoNotStartAP : 1; // Bit 17 + uint32_t DoNotStartAPfallback_ConnectFail : 1; // Bit 17 uint32_t UseAlternativeDeepSleep : 1; // Bit 18 uint32_t UseLastWiFiFromRTC : 1; // Bit 19 uint32_t EnableTimingStats : 1; // Bit 20 @@ -632,7 +679,7 @@ public: #endif uint8_t WiFi_TX_power = 70; // 70 = 17.5dBm. unit: 0.25 dBm int8_t WiFi_sensitivity_margin = 5; // Margin in dBm on top of sensitivity. - uint8_t NumberExtraWiFiScans = 0; + uint8_t ConnectFailRetryCount = 0; int8_t SPI_SCLK_pin = -1; int8_t SPI_MISO_pin = -1; int8_t SPI_MOSI_pin = -1; @@ -643,39 +690,28 @@ public: uint8_t md5[16]{}; // Store checksum of the settings. // VariousBits_2 defaults to 0, keep in mind when adding bit lookups. - struct { - uint32_t WaitWiFiConnect : 1; // Bit 00 - uint32_t SDK_WiFi_autoreconnect : 1; // Bit 01 - uint32_t DisableRulesCodeCompletion : 1; // Bit 02 - uint32_t HiddenSSID_SlowConnectPerBSSID : 1; // Bit 03 // inverted - uint32_t EnableIPv6 : 1; // Bit 04 // inverted - uint32_t DisableSaveConfigAsTar : 1; // Bit 05 - uint32_t PassiveWiFiScan : 1; // Bit 06 // inverted - uint32_t ShowUnitOfMeasureOnDevicesPage : 1; // Bit 07 // inverted - uint32_t WiFi_band_mode : 2; // Bit 08 & 09 - uint32_t WiFi_AP_enable_NAPT : 1; // Bit 10 // inverted - uint32_t RestoreUserVarsFromEEPROMOnColdBoot : 1; // Bit 11 - uint32_t RestoreUserVarsFromEEPROMOnWarmBoot : 1; // Bit 12 - uint32_t MQTTConnectInBackground : 1; // Bit 13 // inverted - uint32_t unused_14 : 1; // Bit 14 - uint32_t unused_15 : 1; // Bit 15 - uint32_t unused_16 : 1; // Bit 16 - uint32_t unused_17 : 1; // Bit 17 - uint32_t unused_18 : 1; // Bit 18 - uint32_t unused_19 : 1; // Bit 19 - uint32_t unused_20 : 1; // Bit 20 - uint32_t unused_21 : 1; // Bit 21 - uint32_t unused_22 : 1; // Bit 22 - uint32_t unused_23 : 1; // Bit 23 - uint32_t unused_24 : 1; // Bit 24 - uint32_t unused_25 : 1; // Bit 25 - uint32_t unused_26 : 1; // Bit 26 - uint32_t unused_27 : 1; // Bit 27 - uint32_t unused_28 : 1; // Bit 28 - uint32_t unused_29 : 1; // Bit 29 - uint32_t unused_30 : 1; // Bit 30 - uint32_t unused_31 : 1; // Bit 31 + union { + struct { + uint32_t WaitWiFiConnect : 1; // Bit 00 + uint32_t SDK_WiFi_autoreconnect : 1; // Bit 01 + uint32_t DisableRulesCodeCompletion : 1; // Bit 02 + uint32_t HiddenSSID_SlowConnectPerBSSID : 1; // Bit 03 // inverted + uint32_t EnableIPv6 : 1; // Bit 04 // inverted + uint32_t DisableSaveConfigAsTar : 1; // Bit 05 + uint32_t PassiveWiFiScan : 1; // Bit 06 // inverted + uint32_t ShowUnitOfMeasureOnDevicesPage : 1; // Bit 07 // inverted + uint32_t WiFi_band_mode : 2; // Bit 08 & 09 + uint32_t WiFi_AP_enable_NAPT : 1; // Bit 10 // inverted + uint32_t RestoreUserVarsFromEEPROMOnColdBoot : 1; // Bit 11 + uint32_t RestoreUserVarsFromEEPROMOnWarmBoot : 1; // Bit 12 + uint32_t MQTTConnectInBackground : 1; // Bit 13 // inverted + uint32_t StartAPfallback_NoCredentials : 1; // Bit 14 // inverted + uint32_t StartAPfallback_NoKnownAP_visible : 1; // Bit 15 // inverted + uint32_t APfallback_minimal_on_time_sec : 8; // Bit 16 - 23 + uint32_t APfallback_autostart_max_uptime_m : 8; // Bit 23 - 31 '0' == disabled + }; + uint32_t _all_bits{}; } VariousBits_2; //-V730 uint8_t console_serial_port = DEFAULT_CONSOLE_PORT; diff --git a/src/src/DataStructs_templ/SettingsStruct.cpp b/src/src/DataStructs_templ/SettingsStruct.cpp index bdebeed4d..41f017435 100644 --- a/src/src/DataStructs_templ/SettingsStruct.cpp +++ b/src/src/DataStructs_templ/SettingsStruct.cpp @@ -270,12 +270,12 @@ void SettingsStruct_tmpl::SendDerivedTaskValues(taskIndex_t taskIndex, #endif // if FEATURE_STRING_VARIABLES /* template -bool SettingsStruct_tmpl::DoNotStartAP() const { +bool SettingsStruct_tmpl::DoNotStartAPfallback_ConnectFail() const { return bitRead(VariousBits1, 17); } template -void SettingsStruct_tmpl::DoNotStartAP(bool value) { +void SettingsStruct_tmpl::DoNotStartAPfallback_ConnectFail(bool value) { bitWrite(VariousBits1, 17, value); } @@ -745,7 +745,7 @@ void SettingsStruct_tmpl::clearMisc() { I2C_clockSpeed = DEFAULT_I2C_CLOCK_SPEED; WebserverPort = 80; SyslogPort = 514; - GlobalSync_unused = false; + VariousBits_3._all_bits = 0; ConnectionFailuresThreshold = 0; MQTTRetainFlag_unused = false; InitSPI = DEFAULT_SPI; @@ -778,7 +778,7 @@ void SettingsStruct_tmpl::clearMisc() { UseESPEasyNow(false); #endif ApCaptivePortal(DEFAULT_AP_FORCE_SETUP); - DoNotStartAP(DEFAULT_DONT_ALLOW_START_AP); + DoNotStartAPfallback_ConnectFail(DEFAULT_DONT_ALLOW_START_AP); } diff --git a/src/src/DataTypes/ESPEasy_plugin_functions.cpp b/src/src/DataTypes/ESPEasy_plugin_functions.cpp index 3fad56ae6..58948aa81 100644 --- a/src/src/DataTypes/ESPEasy_plugin_functions.cpp +++ b/src/src/DataTypes/ESPEasy_plugin_functions.cpp @@ -11,6 +11,7 @@ bool NWPlugin::canQueryViaNetworkInterface(NWPlugin::Function function) switch (function) { // TD-er: Do not try to fetch hostname via base class. No idea why, but it doesn't work well + case NWPlugin::Function::NWPLUGIN_WEBFORM_SHOW_ACTIVE: case NWPlugin::Function::NWPLUGIN_WEBFORM_SHOW_ROUTE_PRIO: case NWPlugin::Function::NWPLUGIN_WEBFORM_SHOW_HOSTNAME: case NWPlugin::Function::NWPLUGIN_WEBFORM_SHOW_NAME: diff --git a/src/src/DataTypes/ESPEasy_plugin_functions.h b/src/src/DataTypes/ESPEasy_plugin_functions.h index b5ae25cd9..224a02034 100644 --- a/src/src/DataTypes/ESPEasy_plugin_functions.h +++ b/src/src/DataTypes/ESPEasy_plugin_functions.h @@ -192,6 +192,7 @@ public: NWPLUGIN_WEBFORM_LOAD_SHOW_STATS, #endif NWPLUGIN_WEBFORM_SHOW_NAME, // Name like "ppp", "eth0", etc. + NWPLUGIN_WEBFORM_SHOW_ACTIVE, // Check whether interface is active and if not, return some error value NWPLUGIN_WEBFORM_SHOW_CONNECTED, // Used for showing connected state/speed NWPLUGIN_WEBFORM_SHOW_EXTENDED, // Used for showing all connection info NWPLUGIN_WEBFORM_SHOW_HOSTNAME, // Used for showing hostname diff --git a/src/src/DataTypes/FormSelectorOptions.cpp b/src/src/DataTypes/FormSelectorOptions.cpp index 8b157d1f1..a5845d189 100644 --- a/src/src/DataTypes/FormSelectorOptions.cpp +++ b/src/src/DataTypes/FormSelectorOptions.cpp @@ -91,6 +91,25 @@ void FormSelectorOptions::clearClassName() classname = F(""); } +void FormSelectorOptions::addFormSelector(LabelType::Enum label, int selectedIndex) const +{ + String internalLabel; + #if FEATURE_TASKVALUE_UNIT_OF_MEASURE + String unit; + #endif + String note; + const String labelStr = getLabel(label, internalLabel + #if FEATURE_TASKVALUE_UNIT_OF_MEASURE + , unit + #endif + ,note); + addFormSelector(labelStr, internalLabel, selectedIndex); + #if FEATURE_TASKVALUE_UNIT_OF_MEASURE + addUnit(unit); + #endif + addFormNote(note); +} + void FormSelectorOptions::addFormSelector( const __FlashStringHelper *label, const __FlashStringHelper *id, diff --git a/src/src/DataTypes/FormSelectorOptions.h b/src/src/DataTypes/FormSelectorOptions.h index e5b01a24a..c5133b53e 100644 --- a/src/src/DataTypes/FormSelectorOptions.h +++ b/src/src/DataTypes/FormSelectorOptions.h @@ -2,6 +2,7 @@ #define DATATYPES_FORMSELECTOROPTIONS_H #include "../../ESPEasy_common.h" +#include "../Helpers/StringProvider.h" class FormSelectorOptions { public: @@ -40,6 +41,9 @@ public: const __FlashStringHelper *id, int selectedIndex) const; + + void addFormSelector(LabelType::Enum label, int selectedIndex) const; + void addFormSelector(const String & label, const __FlashStringHelper *id, int selectedIndex) const; diff --git a/src/src/Helpers/ESPEasy_Storage.cpp b/src/src/Helpers/ESPEasy_Storage.cpp index 14c7f5199..c75b15727 100644 --- a/src/src/Helpers/ESPEasy_Storage.cpp +++ b/src/src/Helpers/ESPEasy_Storage.cpp @@ -448,7 +448,7 @@ bool BuildFixes() } if (Settings.Build < 20113) { - Settings.NumberExtraWiFiScans = 0; + Settings.ConnectFailRetryCount = 0; } if (Settings.Build < 20114) { diff --git a/src/src/Helpers/ESPEasy_UnitOfMeasure.h b/src/src/Helpers/ESPEasy_UnitOfMeasure.h index ddffd6f9e..6f39edadc 100644 --- a/src/src/Helpers/ESPEasy_UnitOfMeasure.h +++ b/src/src/Helpers/ESPEasy_UnitOfMeasure.h @@ -47,6 +47,11 @@ const uint64_t UOM_GROUP_NONE = 0x0; # define UOM_milliVolt 119 # define UOM_Mbps 97 // Mbit/s # define UOM_usec 39 +# define UOM_msec 40 +# define UOM_sec 41 +# define UOM_min 42 +# define UOM_hour 43 +# define UOM_day 44 # define UOM_GHz 53 # define UOM_MHz 132 # define UOM_ppm 33 diff --git a/src/src/Helpers/ESPEasy_checks.cpp b/src/src/Helpers/ESPEasy_checks.cpp index 26a41c870..f7265d487 100644 --- a/src/src/Helpers/ESPEasy_checks.cpp +++ b/src/src/Helpers/ESPEasy_checks.cpp @@ -168,6 +168,10 @@ void run_compiletime_checks() { #endif } + constexpr size_t offset_WireClockStretchLimit = offsetof(SettingsStruct, WireClockStretchLimit); + constexpr size_t offset_ConnectionFailuresThreshold = offsetof(SettingsStruct, ConnectionFailuresThreshold); + static_assert(184 == offset_ConnectionFailuresThreshold, ""); + static_assert(192u == offsetof(SettingsStruct, Protocol), ""); static_assert(195u == offsetof(SettingsStruct, Notification), "CONTROLLER_MAX has changed?"); diff --git a/src/src/Helpers/KeyValueWriter.cpp b/src/src/Helpers/KeyValueWriter.cpp index 292cbc40d..a0896e046 100644 --- a/src/src/Helpers/KeyValueWriter.cpp +++ b/src/src/Helpers/KeyValueWriter.cpp @@ -62,6 +62,10 @@ bool KeyValueWriter::plainText() const { return _plainText; } +bool KeyValueWriter::allowHTML() const { + return false; +} + bool KeyValueWriter::summaryValueOnly() const { if (_parent && _parent->summaryValueOnly()) { return true; } diff --git a/src/src/Helpers/KeyValueWriter.h b/src/src/Helpers/KeyValueWriter.h index d1a4ddbe5..7735bc4be 100644 --- a/src/src/Helpers/KeyValueWriter.h +++ b/src/src/Helpers/KeyValueWriter.h @@ -70,6 +70,8 @@ public: virtual bool plainText() const; + virtual bool allowHTML() const; + // 'summaryValueOnly' means the key will not be output and this is also a hint to generate a summary of data. // Typically this is intended for human readable texts. // When set to true, any child writer will also have this set to true diff --git a/src/src/Helpers/StringProvider.cpp b/src/src/Helpers/StringProvider.cpp index 1bcbcabab..552f473e1 100644 --- a/src/src/Helpers/StringProvider.cpp +++ b/src/src/Helpers/StringProvider.cpp @@ -204,10 +204,50 @@ KeyValueStruct getKeyValue(LabelType::Enum label, bool extendedValue) return KeyValueStruct(F("Send With Max TX Power"), Settings.UseMaxTXpowerForSending()); } #endif // if FEATURE_SET_WIFI_TX_PWR - case LabelType::WIFI_NR_EXTRA_SCANS: + case LabelType::WIFI_AP_CHANNEL: { - return KeyValueStruct(F("Extra WiFi scan loops"), Settings.NumberExtraWiFiScans); + return KeyValueStruct(F("Wifi AP channel"), Settings.WiFiAP_channel); } + case LabelType::WIFI_ENABLE_CAPTIVE_PORTAL: + { + return KeyValueStruct(F("Force /setup in AP-Mode"), Settings.ApCaptivePortal()); + } + case LabelType::WIFI_START_AP_NO_CREDENTIALS: + { + return KeyValueStruct(F("Start AP on No Credentials"), Settings.StartAPfallback_NoCredentials()); + } + case LabelType::WIFI_START_AP_ON_CONNECT_FAIL: + { + return KeyValueStruct(F("Start AP on Connect Fail"), !Settings.DoNotStartAPfallback_ConnectFail()); + } + + case LabelType::WIFI_NR_RECONNECT_ATTEMPTS: + { + return KeyValueStruct(F("Connect Retry Attempts"), Settings.ConnectFailRetryCount); + } + case LabelType::WIFI_MAX_UPTIME_AUTO_START_AP: + { + KeyValueStruct kv(F("Max. Uptime to Start AP"), Settings.APfallback_autostart_max_uptime_m()); +# if FEATURE_TASKVALUE_UNIT_OF_MEASURE + KV_SETUNIT(UOM_min); +# endif + return kv; + } + case LabelType::WIFI_AP_MINIMAL_ON_TIME: + { + KeyValueStruct kv(F("AP Minimal 'on' Time"), Settings.APfallback_minimal_on_time_sec()); +# if FEATURE_TASKVALUE_UNIT_OF_MEASURE + KV_SETUNIT(UOM_sec); +# endif + return kv; + } +#ifdef ESP32 + case LabelType::WIFI_AP_ENABLE_NAPT: + { + return KeyValueStruct(F("Enable NAPT"), Settings.WiFi_AP_enable_NAPT()); + } +#endif + case LabelType::WIFI_USE_LAST_CONN_FROM_RTC: { return KeyValueStruct(F("Use Last Connected AP from RTC"), Settings.UseLastWiFiFromRTC()); @@ -1188,28 +1228,68 @@ KeyValueStruct getKeyValue(LabelType::Enum label, bool extendedValue) return KeyValueStruct(); } -String getInternalLabel(LabelType::Enum label, char replaceSpace) { +String getLabel( + LabelType::Enum label, + String& internalLabel, +#if FEATURE_TASKVALUE_UNIT_OF_MEASURE + String& unit, +#endif + String& note, + char replaceSpace) +{ auto kv = getKeyValue(label); + internalLabel = kv.getID(); + if (replaceSpace != '\0') internalLabel.replace(" ", String(replaceSpace)); - return kv.getID(); + if (kv._key.isEmpty()) { + return F("MissingString"); + } +#if FEATURE_TASKVALUE_UNIT_OF_MEASURE + unit = kv.getUnit(); +#endif +#ifndef MINIMAL_OTA + note = getFormNote(label); +#endif + return kv._key.toString(); } -String getLabel(LabelType::Enum label) { - auto kv = getKeyValue(label); +String getInternalLabel(const KeyValueStruct& kv, + char replaceSpace) +{ + String res = kv.getID(); + if (replaceSpace != '\0') res.replace(" ", String(replaceSpace)); + return res; +} + + +String getInternalLabel(LabelType::Enum label, char replaceSpace) { + return getInternalLabel(getKeyValue(label), replaceSpace); +} + +String getLabel(const KeyValueStruct& kv) +{ if (kv._key.isEmpty()) { return F("MissingString"); } return kv._key.toString(); } -String getValue(LabelType::Enum label) { - auto kv = getKeyValue(label); +String getLabel(LabelType::Enum label) { + return getLabel(getKeyValue(label)); +} + +String getValue(const KeyValueStruct& kv) +{ if (kv._values.size() && kv._values[0].isSet()) { return kv._values[0].toString(); } return EMPTY_STRING; } +String getValue(LabelType::Enum label) { + return getValue(getKeyValue(label)); +} + #if FEATURE_ETHERNET String getEthSpeed() { @@ -1289,14 +1369,33 @@ String getFormNote(LabelType::Enum label) flash_str = F("Node may miss receiving packets with Eco mode enabled"); break; - case LabelType::WIFI_NR_EXTRA_SCANS: - flash_str = F("Number of extra times to scan all channels to have higher chance of finding the desired AP"); + case LabelType::WIFI_AP_CHANNEL: + flash_str = F("WiFi channel to be used when only WiFi AP is active"); + break; + case LabelType::WIFI_ENABLE_CAPTIVE_PORTAL: + flash_str = F("When set, user will be redirected to /setup or root page when connecting to this AP. /setup can still be called when disabled."); + break; + + case LabelType::WIFI_NR_RECONNECT_ATTEMPTS: + flash_str = F("Number of retry attempts before counting as 'failed'"); + break; + case LabelType::WIFI_MAX_UPTIME_AUTO_START_AP: + flash_str = F("Only start AP automatically when system uptime is less than set minutes (0 = allow always)"); + break; + case LabelType::WIFI_AP_MINIMAL_ON_TIME: + flash_str = F("Minimal time to have the AP actively waiting for a user to connect"); break; # ifndef ESP32 case LabelType::WAIT_WIFI_CONNECT: flash_str = F("Wait for 1000 msec right after connecting to WiFi.
    May improve success on some APs like Fritz!Box"); break; # endif // ifndef ESP32 +#ifdef ESP32 + case LabelType::WIFI_AP_ENABLE_NAPT: + flash_str = F("NAPT will have no effect when 'force /setup' is enabled"); + break; + +#endif #endif // ifndef MINIMAL_OTA @@ -1325,7 +1424,6 @@ String getFormNote(LabelType::Enum label) } #if FEATURE_TASKVALUE_UNIT_OF_MEASURE - String getFormUnit(LabelType::Enum label) { auto kv = getKeyValue(label); diff --git a/src/src/Helpers/StringProvider.h b/src/src/Helpers/StringProvider.h index 325d5a885..fee967c38 100644 --- a/src/src/Helpers/StringProvider.h +++ b/src/src/Helpers/StringProvider.h @@ -32,7 +32,16 @@ struct LabelType { WIFI_SENS_MARGIN, // Margin in dB on top of sensitivity WIFI_SEND_AT_MAX_TX_PWR, #endif - WIFI_NR_EXTRA_SCANS, + WIFI_AP_CHANNEL, + WIFI_ENABLE_CAPTIVE_PORTAL, + WIFI_START_AP_NO_CREDENTIALS, + WIFI_START_AP_ON_CONNECT_FAIL, + WIFI_NR_RECONNECT_ATTEMPTS, + WIFI_MAX_UPTIME_AUTO_START_AP, + WIFI_AP_MINIMAL_ON_TIME, +#ifdef ESP32 + WIFI_AP_ENABLE_NAPT, +#endif WIFI_USE_LAST_CONN_FROM_RTC, FREE_MEM, // 9876 @@ -261,9 +270,25 @@ String getEthSpeed(); String getEthLinkSpeedState(); #endif // if FEATURE_ETHERNET + +String getLabel( + LabelType::Enum label, + String& internalLabel, +#if FEATURE_TASKVALUE_UNIT_OF_MEASURE + String& unit, +#endif + String& note, + char replaceSpace = '_'); + +String getInternalLabel(const KeyValueStruct& kv, + char replaceSpace = '_'); String getInternalLabel(LabelType::Enum label, char replaceSpace = '_'); + +String getLabel(const KeyValueStruct& kv); String getLabel(LabelType::Enum label); + +String getValue(const KeyValueStruct& kv); String getValue(LabelType::Enum label); String getExtendedValue(LabelType::Enum label); diff --git a/src/src/WebServer/AdvancedConfigPage.cpp b/src/src/WebServer/AdvancedConfigPage.cpp index 896c5f472..f4cca1694 100644 --- a/src/src/WebServer/AdvancedConfigPage.cpp +++ b/src/src/WebServer/AdvancedConfigPage.cpp @@ -182,8 +182,8 @@ void handle_advanced() { #ifdef WEBSERVER_NEW_RULES addFormCheckBox(F("Old Engine"), F("oldrulesengine"), Settings.OldRulesEngine()); #endif // WEBSERVER_NEW_RULES - addFormCheckBox(LabelType::ENABLE_RULES_CACHING, Settings.EnableRulesCaching()); -// addFormCheckBox(LabelType::ENABLE_RULES_EVENT_REORDER, Settings.EnableRulesEventReorder()); // TD-er: Disabled for now + addFormCheckBox(LabelType::ENABLE_RULES_CACHING); +// addFormCheckBox(LabelType::ENABLE_RULES_EVENT_REORDER); // TD-er: Disabled for now addFormCheckBox(F("Tolerant last parameter"), F("tolerantargparse"), Settings.TolerantLastArgParse()); addFormNote(F("Perform less strict parsing on last argument of some commands (e.g. publish and sendToHttp)")); @@ -254,7 +254,7 @@ void handle_advanced() { addFormSubHeader(F("Serial Console Settings")); - addFormCheckBox(LabelType::ENABLE_SERIAL_PORT_CONSOLE, Settings.UseSerial); + addFormCheckBox(LabelType::ENABLE_SERIAL_PORT_CONSOLE); addFormNumericBox(F("Baud Rate"), F("baudrate"), Settings.BaudRate, 0, 1000000); #if FEATURE_DEFINE_SERIAL_CONSOLE_PORT @@ -278,7 +278,7 @@ void handle_advanced() { html_add_script(F("document.getElementById('serPort').onchange();"), false); #if USES_ESPEASY_CONSOLE_FALLBACK_PORT - addFormCheckBox(LabelType::CONSOLE_FALLBACK_TO_SERIAL0, Settings.console_serial0_fallback); + addFormCheckBox(LabelType::CONSOLE_FALLBACK_TO_SERIAL0); #endif #endif @@ -318,34 +318,40 @@ void handle_advanced() { #if defined(ESP32) addFormCheckBox_disabled(F("Enable RTOS Multitasking"), F("usertosmultitasking"), Settings.UseRTOSMultitasking); #endif // if defined(ESP32) + { + LabelType::Enum labels[]{ - addFormCheckBox(LabelType::JSON_BOOL_QUOTES, Settings.JSONBoolWithoutQuotes()); -#if FEATURE_TIMING_STATS - addFormCheckBox(LabelType::ENABLE_TIMING_STATISTICS, Settings.EnableTimingStats()); -#endif // if FEATURE_TIMING_STATS -#ifndef BUILD_NO_RAM_TRACKER - addFormCheckBox(LabelType::ENABLE_RAM_TRACKING, Settings.EnableRAMTracking()); -#endif + LabelType::JSON_BOOL_QUOTES + #if FEATURE_TIMING_STATS + ,LabelType::ENABLE_TIMING_STATISTICS + #endif // if FEATURE_TIMING_STATS + #ifndef BUILD_NO_RAM_TRACKER + ,LabelType::ENABLE_RAM_TRACKING + #endif - addFormCheckBox(LabelType::TASKVALUESET_ALL_PLUGINS, Settings.AllowTaskValueSetAllPlugins()); -#if FEATURE_CLEAR_I2C_STUCK - addFormCheckBox(LabelType::ENABLE_CLEAR_HUNG_I2C_BUS, Settings.EnableClearHangingI2Cbus()); -#endif - #if FEATURE_I2C_DEVICE_CHECK - addFormCheckBox(LabelType::ENABLE_I2C_DEVICE_CHECK, Settings.CheckI2Cdevice()); - #endif // if FEATURE_I2C_DEVICE_CHECK + ,LabelType::TASKVALUESET_ALL_PLUGINS + #if FEATURE_CLEAR_I2C_STUCK + ,LabelType::ENABLE_CLEAR_HUNG_I2C_BUS + #endif + #if FEATURE_I2C_DEVICE_CHECK + ,LabelType::ENABLE_I2C_DEVICE_CHECK + #endif // if FEATURE_I2C_DEVICE_CHECK - #if FEATURE_TASKVALUE_UNIT_OF_MEASURE - addFormCheckBox(LabelType::SHOW_UOM_ON_DEVICES_PAGE, Settings.ShowUnitOfMeasureOnDevicesPage()); - #endif // if FEATURE_TASKVALUE_UNIT_OF_MEASURE + #if FEATURE_TASKVALUE_UNIT_OF_MEASURE + ,LabelType::SHOW_UOM_ON_DEVICES_PAGE + #endif // if FEATURE_TASKVALUE_UNIT_OF_MEASURE - #if FEATURE_MQTT_CONNECT_BACKGROUND - addFormCheckBox(LabelType::MQTT_CONNECT_IN_BACKGROUND, Settings.MQTTConnectInBackground()); - #endif // if FEATURE_MQTT_CONNECT_BACKGROUND + #if FEATURE_MQTT_CONNECT_BACKGROUND + ,LabelType::MQTT_CONNECT_IN_BACKGROUND + #endif // if FEATURE_MQTT_CONNECT_BACKGROUND - # ifndef NO_HTTP_UPDATER - addFormCheckBox(LabelType::ALLOW_OTA_UNLIMITED, Settings.AllowOTAUnlimited()); - # endif // ifndef NO_HTTP_UPDATER + # ifndef NO_HTTP_UPDATER + ,LabelType::ALLOW_OTA_UNLIMITED + # endif // ifndef NO_HTTP_UPDATER + }; + + addFormCheckBoxes(labels, NR_ELEMENTS(labels)); + } #if FEATURE_AUTO_DARK_MODE { const __FlashStringHelper * cssModeNames[] = { @@ -365,29 +371,31 @@ void handle_advanced() { Settings.getCssMode()); } #endif // FEATURE_AUTO_DARK_MODE +{ + LabelType::Enum labels[]{ + LabelType::CPU_ECO_MODE + #ifdef ESP8266 + ,LabelType::DEEP_SLEEP_ALTERNATIVE_CALL + #endif #if FEATURE_RULES_EASY_COLOR_CODE - addFormCheckBox(LabelType::DISABLE_RULES_AUTOCOMPLETE, Settings.DisableRulesCodeCompletion()); + ,LabelType::DISABLE_RULES_AUTOCOMPLETE #endif // if FEATURE_RULES_EASY_COLOR_CODE #if FEATURE_TARSTREAM_SUPPORT - addFormCheckBox(LabelType::DISABLE_SAVE_CONFIG_AS_TAR, Settings.DisableSaveConfigAsTar()); + ,LabelType::DISABLE_SAVE_CONFIG_AS_TAR #endif // if FEATURE_TARSTREAM_SUPPORT - #ifdef ESP8266 - addFormCheckBox(LabelType::DEEP_SLEEP_ALTERNATIVE_CALL, Settings.UseAlternativeDeepSleep()); - #endif - - +#if FEATURE_USE_IPV6 + ,LabelType::ENABLE_IPV6 +#endif + }; + addFormCheckBoxes(labels, NR_ELEMENTS(labels)); +} #if FEATURE_SSDP addFormCheckBox_disabled(F("Use SSDP"), F("usessdp"), Settings.UseSSDP); #endif // if FEATURE_SSDP addFormNumericBox(LabelType::CONNECTION_FAIL_THRESH, Settings.ConnectionFailuresThreshold, 0, 100); - addFormCheckBox(LabelType::CPU_ECO_MODE, Settings.EcoPowerMode()); - -#if FEATURE_USE_IPV6 - addFormCheckBox(LabelType::ENABLE_IPV6, Settings.EnableIPv6()); -#endif diff --git a/src/src/WebServer/JSON.cpp b/src/src/WebServer/JSON.cpp index 2594bfc6a..0a98a142a 100644 --- a/src/src/WebServer/JSON.cpp +++ b/src/src/WebServer/JSON.cpp @@ -337,7 +337,9 @@ void handle_json() LabelType::WIFI_SENS_MARGIN, LabelType::WIFI_SEND_AT_MAX_TX_PWR, #endif // if FEATURE_SET_WIFI_TX_PWR - LabelType::WIFI_NR_EXTRA_SCANS, + LabelType::WIFI_NR_RECONNECT_ATTEMPTS, + LabelType::WIFI_MAX_UPTIME_AUTO_START_AP, + LabelType::WIFI_AP_MINIMAL_ON_TIME, #ifdef ESP32 LabelType::WIFI_PASSIVE_SCAN, #endif diff --git a/src/src/WebServer/KeyValueWriter_WebForm.cpp b/src/src/WebServer/KeyValueWriter_WebForm.cpp index 26a246de4..b7c2820ae 100644 --- a/src/src/WebServer/KeyValueWriter_WebForm.cpp +++ b/src/src/WebServer/KeyValueWriter_WebForm.cpp @@ -192,3 +192,7 @@ UP_KeyValueWriter KeyValueWriter_WebForm::createNew(const String& header) // return std::make_unique(header); } + +bool KeyValueWriter_WebForm::allowHTML() const { + return true; +} \ No newline at end of file diff --git a/src/src/WebServer/KeyValueWriter_WebForm.h b/src/src/WebServer/KeyValueWriter_WebForm.h index 9be055831..90065476a 100644 --- a/src/src/WebServer/KeyValueWriter_WebForm.h +++ b/src/src/WebServer/KeyValueWriter_WebForm.h @@ -47,6 +47,8 @@ public: virtual UP_KeyValueWriter createNew(); virtual UP_KeyValueWriter createNew(const String& header); + virtual bool allowHTML() const override; + }; // class KeyValueWriter_WebForm diff --git a/src/src/WebServer/Markup_Forms.cpp b/src/src/WebServer/Markup_Forms.cpp index 26439bfd0..a42d9f739 100644 --- a/src/src/WebServer/Markup_Forms.cpp +++ b/src/src/WebServer/Markup_Forms.cpp @@ -99,21 +99,36 @@ void addFormCheckBox(const String& label, const String& id, bool checked, bool d ); } -void addFormCheckBox(LabelType::Enum label, bool checked, bool disabled +void addFormCheckBoxes(const LabelType::Enum* label, size_t nrLabels) +{ + if (label == nullptr) return; + for (size_t i = 0; i < nrLabels; ++i) { + addFormCheckBox(*label); + ++label; + } +} + +void addFormCheckBox(LabelType::Enum label, bool disabled #if FEATURE_TOOLTIPS , const String& tooltip #endif // if FEATURE_TOOLTIPS ) { - addFormCheckBox(getLabel(label), getInternalLabel(label), checked, disabled + auto kv = getKeyValue(label); + const bool checked = !getValue(kv).equals("0"); + + addFormCheckBox(getLabel(kv), getInternalLabel(kv), checked, disabled #if FEATURE_TOOLTIPS , tooltip #endif // if FEATURE_TOOLTIPS ); + #if FEATURE_TASKVALUE_UNIT_OF_MEASURE + addUnit(kv.getUnit()); + #endif addFormNote(label); } -void addFormCheckBox_disabled(LabelType::Enum label, bool checked) { - addFormCheckBox(label, checked, true); +void addFormCheckBox_disabled(LabelType::Enum label) { + addFormCheckBox(label, true); } // ******************************************************************************** @@ -126,13 +141,26 @@ void addFormNumericBox(LabelType::Enum label, int value, int min, int max , bool disabled ) { - addFormNumericBox(getLabel(label), getInternalLabel(label), value, min, max + String internalLabel; + #if FEATURE_TASKVALUE_UNIT_OF_MEASURE + String unit; + #endif + String note; + const String labelStr = getLabel(label, internalLabel + #if FEATURE_TASKVALUE_UNIT_OF_MEASURE + , unit + #endif + ,note); + addFormNumericBox(labelStr, internalLabel, value, min, max #if FEATURE_TOOLTIPS , tooltip #endif // if FEATURE_TOOLTIPS , disabled ); - addFormNote(label); + #if FEATURE_TASKVALUE_UNIT_OF_MEASURE + addUnit(unit); + #endif + addFormNote(note); } void addFormNumericBox(const __FlashStringHelper * label, @@ -179,12 +207,25 @@ void addFormFloatNumberBox(LabelType::Enum label, float value, float min, float , const String& tooltip #endif // if FEATURE_TOOLTIPS ) { - addFormFloatNumberBox(getLabel(label), getInternalLabel(label), value, min, max, nrDecimals, stepsize + String internalLabel; + #if FEATURE_TASKVALUE_UNIT_OF_MEASURE + String unit; + #endif + String note; + const String labelStr = getLabel(label, internalLabel + #if FEATURE_TASKVALUE_UNIT_OF_MEASURE + , unit + #endif + ,note); + addFormFloatNumberBox(labelStr, internalLabel, value, min, max, nrDecimals, stepsize #if FEATURE_TOOLTIPS , tooltip #endif // if FEATURE_TOOLTIPS ); - addFormNote(label); + #if FEATURE_TASKVALUE_UNIT_OF_MEASURE + addUnit(unit); + #endif + addFormNote(note); } void addFormFloatNumberBox(const String& label, diff --git a/src/src/WebServer/Markup_Forms.h b/src/src/WebServer/Markup_Forms.h index 64cf22ed5..0baa7347a 100644 --- a/src/src/WebServer/Markup_Forms.h +++ b/src/src/WebServer/Markup_Forms.h @@ -49,8 +49,9 @@ void addFormCheckBox(const String& label, #endif // if FEATURE_TOOLTIPS ); +void addFormCheckBoxes(const LabelType::Enum* label, size_t nrLabels); + void addFormCheckBox(LabelType::Enum label, - bool checked, bool disabled = false #if FEATURE_TOOLTIPS , @@ -58,8 +59,7 @@ void addFormCheckBox(LabelType::Enum label, #endif // if FEATURE_TOOLTIPS ); -void addFormCheckBox_disabled(LabelType::Enum label, - bool checked); +void addFormCheckBox_disabled(LabelType::Enum label); void addFormCheckBox(const __FlashStringHelper * label, const __FlashStringHelper * id, bool checked, bool disabled = false); void addFormCheckBox(const __FlashStringHelper * label, const String& id, bool checked, bool disabled = false); diff --git a/src/src/WebServer/NetworkPage.cpp b/src/src/WebServer/NetworkPage.cpp index 959e0bb67..01dea1c60 100644 --- a/src/src/WebServer/NetworkPage.cpp +++ b/src/src/WebServer/NetworkPage.cpp @@ -164,10 +164,10 @@ void handle_networks_CopySubmittedSettings_NWPluginCall(ESPEasy::net::networkInd # endif // ifdef ESP32 # if FEATURE_USE_IPV6 Settings.setNetworkEnabled_IPv6(networkindex, isFormItemChecked(F("en_ipv6"))); -#endif +# endif Settings.setNetworkInterfaceStartupDelayAtBoot(networkindex, getFormItemInt(F("delay_start"))); String dummy; - NWPluginCall(NWPlugin::Function::NWPLUGIN_WEBFORM_SAVE, &TempEvent, dummy); + ESPEasy::net::NWPluginCall(NWPlugin::Function::NWPLUGIN_WEBFORM_SAVE, &TempEvent, dummy); } } @@ -180,6 +180,7 @@ void handle_networks_ShowAllNetworksTable() html_table_header(F("Nr"), 50); html_table_header(F("Enabled"), 100); html_table_header(F("Network Adapter")); + html_table_header(F("Active"), 100); html_table_header(F("Name"), 50); # ifdef ESP32 html_table_header(F("Route Prio"), 50); @@ -188,9 +189,9 @@ void handle_networks_ShowAllNetworksTable() html_table_header(F("Hostname/SSID")); html_table_header(F("HW Address")); html_table_header(F("IP")); -#ifndef LIMIT_BUILD_SIZE +# ifndef LIMIT_BUILD_SIZE html_table_header(F("Port")); -#endif +# endif for (ESPEasy::net::networkIndex_t x = 0; x < MAX_NR_NETWORKS_IN_TABLE; x++) { @@ -210,6 +211,7 @@ void handle_networks_ShowAllNetworksTable() addHtml(getNWPluginNameFromNWPluginID(Settings.getNWPluginID_for_network(x))); const NWPlugin::Function functions[] { + NWPlugin::Function::NWPLUGIN_WEBFORM_SHOW_ACTIVE, NWPlugin::Function::NWPLUGIN_WEBFORM_SHOW_NAME, # ifdef ESP32 NWPlugin::Function::NWPLUGIN_WEBFORM_SHOW_ROUTE_PRIO, @@ -218,47 +220,62 @@ void handle_networks_ShowAllNetworksTable() NWPlugin::Function::NWPLUGIN_WEBFORM_SHOW_HOSTNAME, NWPlugin::Function::NWPLUGIN_WEBFORM_SHOW_HW_ADDRESS, NWPlugin::Function::NWPLUGIN_WEBFORM_SHOW_IP -#ifndef LIMIT_BUILD_SIZE - ,NWPlugin::Function::NWPLUGIN_WEBFORM_SHOW_PORT -#endif +# ifndef LIMIT_BUILD_SIZE + , NWPlugin::Function::NWPLUGIN_WEBFORM_SHOW_PORT +# endif }; // const networkDriverIndex_t NetworkDriverIndex = getNetworkDriverIndex_from_NetworkIndex(x); for (uint8_t i = 0; i < NR_ELEMENTS(functions); ++i) { html_TD(); - KeyValueWriter_WebForm webFormWriter; - webFormWriter.setSummaryValueOnly(); - struct EventStruct TempEvent; - TempEvent.kvWriter = &webFormWriter; - TempEvent.NetworkIndex = x; + if (Settings.getNetworkEnabled(x) || + (functions[i] == NWPlugin::Function::NWPLUGIN_WEBFORM_SHOW_PORT)) { + KeyValueWriter_WebForm webFormWriter; + webFormWriter.setSummaryValueOnly(); + struct EventStruct TempEvent; + TempEvent.kvWriter = &webFormWriter; - String str; + TempEvent.NetworkIndex = x; - const bool res = NWPluginCall(functions[i], &TempEvent); + String str; + + const bool res = ESPEasy::net::NWPluginCall(functions[i], &TempEvent); + + switch (functions[i]) + { # ifdef ESP32 - if (functions[i] == NWPlugin::Function::NWPLUGIN_WEBFORM_SHOW_ROUTE_PRIO) { - if (TempEvent.Par1 > 0) { - addHtmlInt(TempEvent.Par1); + case NWPlugin::Function::NWPLUGIN_WEBFORM_SHOW_ROUTE_PRIO: - if (TempEvent.Par2) { - addHtml(F("(*)")); - } - } - } else + if (TempEvent.Par1 > 0) { + addHtmlInt(TempEvent.Par1); + + if (TempEvent.Par2) { + addHtml(F("(*)")); + } + } + break; # endif // ifdef ESP32 - if (functions[i] == NWPlugin::Function::NWPLUGIN_WEBFORM_SHOW_CONNECTED) { - NWPluginCall(NWPlugin::Function::NWPLUGIN_GET_CONNECTED_DURATION, &TempEvent); + case NWPlugin::Function::NWPLUGIN_WEBFORM_SHOW_ACTIVE: + addEnabled(res); + break; + case NWPlugin::Function::NWPLUGIN_WEBFORM_SHOW_CONNECTED: - if (!res) { - addEnabled(res); + ESPEasy::net::NWPluginCall(NWPlugin::Function::NWPLUGIN_GET_CONNECTED_DURATION, &TempEvent); + + if (!res) { + addEnabled(res); + } + break; + default: break; } } } + /* const NetworkDriverStruct& driver = ESPEasy::net::getNetworkDriverStruct(NetworkDriverIndex); @@ -269,11 +286,11 @@ void handle_networks_ShowAllNetworksTable() } else { -#ifndef LIMIT_BUILD_SIZE +# ifndef LIMIT_BUILD_SIZE + html_TD(9); +# else html_TD(8); -#else - html_TD(7); -#endif +# endif // ifndef LIMIT_BUILD_SIZE } } @@ -361,15 +378,16 @@ void handle_networks_NetworkSettingsPage(ESPEasy::net::networkIndex_t networkind addFormNumericBox(F("Delay Startup At Boot"), F("delay_start"), Settings.getNetworkInterfaceStartupDelayAtBoot(networkindex), 0, 60000); addUnit(F("ms")); -#if FEATURE_USE_IPV6 +# if FEATURE_USE_IPV6 addFormCheckBox(F("Enable IPv6"), F("en_ipv6"), Settings.getNetworkEnabled_IPv6(networkindex)); + if (!Settings.EnableIPv6()) { addFormNote(F("IPv6 is disabled on tools->Advanced page")); } -#endif +# endif // if FEATURE_USE_IPV6 String str; - NWPluginCall(NWPlugin::Function::NWPLUGIN_WEBFORM_LOAD, &TempEvent, str); + ESPEasy::net::NWPluginCall(NWPlugin::Function::NWPLUGIN_WEBFORM_LOAD, &TempEvent, str); # if FEATURE_NETWORK_STATS @@ -407,14 +425,14 @@ void handle_networks_NetworkSettingsPage(ESPEasy::net::networkIndex_t networkind # ifdef ESP32 - if (NWPluginCall(NWPlugin::Function::NWPLUGIN_GET_INTERFACE, &TempEvent, str)) + if (ESPEasy::net::NWPluginCall(NWPlugin::Function::NWPLUGIN_GET_INTERFACE, &TempEvent, str)) { KeyValueWriter_WebForm writer(true); - + ESPEasy::net::write_NetworkAdapterFlags(networkindex, writer.createChild(F("Network Interface")).get()); -#ifndef LIMIT_BUILD_SIZE +# ifndef LIMIT_BUILD_SIZE ESPEasy::net::write_NetworkAdapterPort(networkindex, writer.createChild(F("Port")).get()); -#endif +# endif ESPEasy::net::write_IP_config(networkindex, writer.createChild(F("IP Config")).get()); ESPEasy::net::write_NetworkConnectionInfo(networkindex, writer.createChild(F("Connection Information")).get()); } diff --git a/src/src/WebServer/SetupPage.cpp b/src/src/WebServer/SetupPage.cpp index 7272589ef..219402b85 100644 --- a/src/src/WebServer/SetupPage.cpp +++ b/src/src/WebServer/SetupPage.cpp @@ -16,7 +16,7 @@ # include "../../ESPEasy/net/Globals/ESPEasyWiFiEvent.h" -#include "../../ESPEasy/net/Globals/NetworkState.h" +# include "../../ESPEasy/net/Globals/NetworkState.h" # include "../Globals/RTC.h" # include "../Globals/Settings.h" # include "../Globals/SecuritySettings.h" @@ -28,11 +28,9 @@ # include "../Helpers/StringConverter.h" - -#ifndef SETUP_PAGE_SHOW_CONFIG_BUTTON - #define SETUP_PAGE_SHOW_CONFIG_BUTTON true -#endif - +# ifndef SETUP_PAGE_SHOW_CONFIG_BUTTON + # define SETUP_PAGE_SHOW_CONFIG_BUTTON true +# endif // ******************************************************************************** @@ -53,16 +51,17 @@ void handle_setup() { const bool connected = ESPEasy::net::NetworkConnected(); -// if (connected) { - navMenuIndex = MENU_INDEX_SETUP; - sendHeadandTail_stdtemplate(_HEAD); -/* } else { - sendHeadandTail(F("TmplAP")); - } - */ + // if (connected) { + navMenuIndex = MENU_INDEX_SETUP; + sendHeadandTail_stdtemplate(_HEAD); - const bool clearButtonPressed = hasArg(F("performclearcredentials")); - const bool clearWiFiCredentials = + /* } else { + sendHeadandTail(F("TmplAP")); + } + */ + + const bool clearButtonPressed = hasArg(F("performclearcredentials")); + const bool clearWiFiCredentials = isFormItemChecked(F("clearcredentials")) && clearButtonPressed; { @@ -86,121 +85,131 @@ void handle_setup() { addFormHeader(F("WiFi credentials cleared, reboot now")); html_end_table(); - } else { - // if (active_network_medium == ESPEasy::net::NetworkMedium_t::WIFI) - // { - static uint8_t status = HANDLE_SETUP_SCAN_STAGE; - static uint8_t refreshCount = 0; + } else { + // if (active_network_medium == ESPEasy::net::NetworkMedium_t::WIFI) + // { + static uint8_t status = HANDLE_SETUP_SCAN_STAGE; + static uint8_t refreshCount = 0; - String ssid = webArg(F("ssid")); - String other = webArg(F("other")); - String password; - bool passwordGiven = getFormPassword(F("pass"), password); - if (passwordGiven) { - passwordGiven = !password.isEmpty(); - } - const bool emptyPassAllowed = isFormItemChecked(F("emptypass")); - const bool performRescan = hasArg(F("performrescan")); - if (performRescan) { -// WiFiEventData.lastScanMoment.clear(); - ESPEasy::net::wifi::WifiScan(false); - } - - if (!other.isEmpty()) - { - ssid = other; - } - - if (!performRescan) { - // if ssid config not set and params are both provided - if ((status == HANDLE_SETUP_SCAN_STAGE) && (!ssid.isEmpty()) /*&& strcasecmp(SecuritySettings.WifiSSID, "ssid") == 0 */) - { - if (clearButtonPressed) { - addHtmlError(F("Warning: Need to confirm to clear WiFi credentials")); - } else if (!passwordGiven && !emptyPassAllowed) { - addHtmlError(F("No password entered")); - } else { -// TODO TD-er: Must store in separate file when system password is set -#if FEATURE_STORE_CREDENTIALS_SEPARATE_FILE -// TODO TD-er: Must check whether password is set: SecuritySettings.Password - SecuritySettings_deviceSpecific.setWiFiCredentials(0, ssid, password); -#else - safe_strncpy(SecuritySettings.WifiKey, password.c_str(), sizeof(SecuritySettings.WifiKey)); - safe_strncpy(SecuritySettings.WifiSSID, ssid.c_str(), sizeof(SecuritySettings.WifiSSID)); -#endif - // Hidden SSID - Settings.IncludeHiddenSSID(isFormItemChecked(LabelType::CONNECT_HIDDEN_SSID)); - Settings.HiddenSSID_SlowConnectPerBSSID(isFormItemChecked(LabelType::HIDDEN_SSID_SLOW_CONNECT)); -#ifdef ESP32 - Settings.PassiveWiFiScan(isFormItemChecked(LabelType::WIFI_PASSIVE_SCAN)); -#endif - - addHtmlError(SaveSettings()); -// WiFiEventData.wifiSetupConnect = true; -// WiFiEventData.wifiConnectAttemptNeeded = true; - ESPEasy::net::wifi::WiFi_AP_Candidates.force_reload(); // Force reload of the credentials and found APs from the last scan -#ifndef BUILD_NO_DEBUG - if (loglevelActiveFor(LOG_LEVEL_INFO)) { - String reconnectlog = F("WIFI : Credentials Changed, retry connection. SSID: "); - reconnectlog += ssid; - addLogMove(LOG_LEVEL_INFO, reconnectlog); - } -#endif - status = HANDLE_SETUP_CONNECTING_STAGE; - refreshCount = 0; - String dummy; - ESPEasy::net::NWPluginCall( - NWPlugin::Function::NWPLUGIN_CREDENTIALS_CHANGED, 0, dummy); - } - } - } - html_BR(); - wrap_html_tag(F("h1"), connected ? F("Connected to a network") : F("Wifi Setup wizard")); - html_add_form(); - - switch (status) { - case HANDLE_SETUP_SCAN_STAGE: - { - // first step, scan and show access points within reach... - handle_setup_scan_and_show(ssid, other, password); - break; - } - case HANDLE_SETUP_CONNECTING_STAGE: - { - if (!handle_setup_connectingStage(refreshCount)) { - status = HANDLE_SETUP_SCAN_STAGE; - } - ++refreshCount; - break; - } - } - /* - } else { - html_add_form(); - addFormHeader(F("Ethernet Setup Complete")); + String ssid = webArg(F("ssid")); + String other = webArg(F("other")); + String password; + bool passwordGiven = getFormPassword(F("pass"), password); + if (passwordGiven) { + passwordGiven = !password.isEmpty(); } - */ + const bool emptyPassAllowed = isFormItemChecked(F("emptypass")); + const bool performRescan = hasArg(F("performrescan")); + + if (performRescan) { + // WiFiEventData.lastScanMoment.clear(); + ESPEasy::net::wifi::WifiScan(false); + } + + if (!other.isEmpty()) + { + ssid = other; + } + + if (!performRescan) { + // if ssid config not set and params are both provided + if ((status == HANDLE_SETUP_SCAN_STAGE) && (!ssid.isEmpty()) /*&& strcasecmp(SecuritySettings.WifiSSID, "ssid") == 0 */) + { + if (clearButtonPressed) { + addHtmlError(F("Warning: Need to confirm to clear WiFi credentials")); + } else if (!passwordGiven && !emptyPassAllowed) { + addHtmlError(F("No password entered")); + } else { + // TODO TD-er: Must store in separate file when system password is set +# if FEATURE_STORE_CREDENTIALS_SEPARATE_FILE + + // TODO TD-er: Must check whether password is set: SecuritySettings.Password + SecuritySettings_deviceSpecific.setWiFiCredentials(0, ssid, password); +# else // if FEATURE_STORE_CREDENTIALS_SEPARATE_FILE + safe_strncpy(SecuritySettings.WifiKey, password.c_str(), sizeof(SecuritySettings.WifiKey)); + safe_strncpy(SecuritySettings.WifiSSID, ssid.c_str(), sizeof(SecuritySettings.WifiSSID)); +# endif // if FEATURE_STORE_CREDENTIALS_SEPARATE_FILE + + // Hidden SSID + Settings.IncludeHiddenSSID(isFormItemChecked(LabelType::CONNECT_HIDDEN_SSID)); + Settings.HiddenSSID_SlowConnectPerBSSID(isFormItemChecked(LabelType::HIDDEN_SSID_SLOW_CONNECT)); +# ifdef ESP32 + Settings.PassiveWiFiScan(isFormItemChecked(LabelType::WIFI_PASSIVE_SCAN)); +# endif + + addHtmlError(SaveSettings()); + + // WiFiEventData.wifiSetupConnect = true; + // WiFiEventData.wifiConnectAttemptNeeded = true; + ESPEasy::net::wifi::WiFi_AP_Candidates.force_reload(); // Force reload of the credentials and found APs from the last scan +# ifndef BUILD_NO_DEBUG + + if (loglevelActiveFor(LOG_LEVEL_INFO)) { + String reconnectlog = F("WIFI : Credentials Changed, retry connection. SSID: "); + reconnectlog += ssid; + addLogMove(LOG_LEVEL_INFO, reconnectlog); + } +# endif // ifndef BUILD_NO_DEBUG + status = HANDLE_SETUP_CONNECTING_STAGE; + refreshCount = 0; + String dummy; + ESPEasy::net::NWPluginCall( + NWPlugin::Function::NWPLUGIN_CREDENTIALS_CHANGED, 0, dummy); + } + } + } + html_BR(); + wrap_html_tag(F("h1"), connected ? F("Connected to a network") : F("Wifi Setup wizard")); + html_add_form(); + + switch (status) + { + case HANDLE_SETUP_SCAN_STAGE: + { + // first step, scan and show access points within reach... + handle_setup_scan_and_show(ssid, other, password); + break; + } + case HANDLE_SETUP_CONNECTING_STAGE: + { + if (!handle_setup_connectingStage(refreshCount)) { + status = HANDLE_SETUP_SCAN_STAGE; + } + ++refreshCount; + break; + } + } + + /* + } else { + html_add_form(); + addFormHeader(F("Ethernet Setup Complete")); + + } + */ html_table_class_normal(); html_TR(); -#if defined(WEBSERVER_SYSINFO) && !defined(WEBSERVER_SYSINFO_MINIMAL) +# if defined(WEBSERVER_SYSINFO) && !defined(WEBSERVER_SYSINFO_MINIMAL) handle_sysinfo_NetworkServices(); -#endif +# endif + if (connected) { - //addFormHeader(F("Current network configuration")); + // addFormHeader(F("Current network configuration")); -#ifdef WEBSERVER_SYSINFO +# ifdef WEBSERVER_SYSINFO handle_sysinfo_Network(); -#endif +# endif addFormSeparator(2); html_TR_TD(); html_TD(); - - #if SETUP_PAGE_SHOW_CONFIG_BUTTON + + # if SETUP_PAGE_SHOW_CONFIG_BUTTON + if (!clientIPinSubnetDefaultNetwork()) { String host = formatIP(ESPEasy::net::NetworkLocalIP()); String url = F("http://"); @@ -208,10 +217,10 @@ void handle_setup() { url += F("/config"); addButton(url, host); } - #endif + # endif // if SETUP_PAGE_SHOW_CONFIG_BUTTON -// WiFiEventData.wifiSetup = false; - } + // WiFiEventData.wifiSetup = false; + } html_end_table(); html_BR(); @@ -225,14 +234,16 @@ void handle_setup() { html_table_class_normal(); addFormHeader(F("Advanced WiFi settings")); - - addFormCheckBox(LabelType::CONNECT_HIDDEN_SSID, Settings.IncludeHiddenSSID()); - -#ifdef ESP32 - addFormCheckBox(LabelType::WIFI_PASSIVE_SCAN, Settings.PassiveWiFiScan()); -#endif - - addFormCheckBox(LabelType::HIDDEN_SSID_SLOW_CONNECT, Settings.HiddenSSID_SlowConnectPerBSSID()); + { + LabelType::Enum labels[]{ + LabelType::CONNECT_HIDDEN_SSID +# ifdef ESP32 + , LabelType::WIFI_PASSIVE_SCAN +# endif + , LabelType::HIDDEN_SSID_SLOW_CONNECT + }; + addFormCheckBoxes(labels, NR_ELEMENTS(labels)); + } html_BR(); html_BR(); @@ -248,14 +259,17 @@ void handle_setup() { html_end_form(); } -// if (connected) { - sendHeadandTail_stdtemplate(_TAIL); -/* } else { - sendHeadandTail(F("TmplAP"), true); - } -*/ + + // if (connected) { + sendHeadandTail_stdtemplate(_TAIL); + + /* } else { + sendHeadandTail(F("TmplAP"), true); + } + */ TXBuffer.endStream(); delay(10); + if (clearWiFiCredentials) { reboot(IntendedRebootReason_e::RestoreSettings); } @@ -263,10 +277,11 @@ void handle_setup() { void handle_setup_scan_and_show(const String& ssid, const String& other, const String& password) { int8_t scanCompleteStatus = ESPEasy::net::wifi::WiFi_AP_Candidates.scanComplete(); - const bool needsRescan = + const bool needsRescan = (scanCompleteStatus == 0 || // No AP found scanCompleteStatus == -2) // Scan not triggered && ESPEasy::net::wifi::WiFiScanAllowed(); + if (needsRescan) { WiFiMode_t cur_wifimode = WiFi.getMode(); ESPEasy::net::wifi::WifiScan(false); @@ -292,10 +307,11 @@ void handle_setup_scan_and_show(const String& ssid, const String& other, const S const String id = it->toString(""); addHtml(F("

    4-TC2;D}+uaU1>W?}sw}f-NPqNy!nt5)L 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%0ALmr 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�F z*3s->ecPzct>*SP=hz(3B+#Hfc6hTxyQ1Z^6S``f??4kr}hE%in~RnA!HLu=1Jo)U&vr zHfSa+CI7M?&Jto(`>}3?Z7joo74c+bKEM(;H}}6H4Tn()!Tp11^f9j@G~z6MVgY+Tbzj$wd@h%^31RJCCj6)UB7{_fOfj zi$u=t3#k~LnqpaiJU;Syuplem$-`IB#9b7~OEB+o*~^5x25-n%{CgYz5jY!!jYTWv z^HcuCztcTn#$hY#{I%f=KtLMqg;wiWo9Iir?}Hhl}MqdIWK z)3i2NaPw+#KSO;h+PQQFeaop^kUzoeXSSz=RnXhu$6)h*9o|>SV!_NAbN~BC@&1aE zjm~h3f~V61t7z`>h^;%-5zpR_ai!khx(cm(m6+b`kG{7fcc=lmY+Y`=A zCEb|K)WVp}WR;>ZQZ^F}MQv=qyOr7&I~q8{EsYdAWr7d?vm?oqpK5;^W`Z_nt(~|U zxW`3;Kc?TM6(uRj61L5`>sK=tw%_?iy`y5<8Cc@=l`9$~U#A?R?C>J`9I{hJptWo! zWX@eAIS`+gk_`UrJZGtHk7#>n+Z~`@wo0ruawbBF#`Ti<5Pc8c7#=EKfyKO6a5ZTU@@@5{=3 zS9NL|oILP1+it{sCoA(^-l;7!{r~+|TUP<*`=T=6Wu4mAPkZdQ+WP*Awqum}E>YY1 zvx49Kt=09d1*AsFEeE>WTP}n{C8gkmG~Opd>cMG@_2tyTjI~p!jM_+4ijiu!~|DZvC z;4CfR!DU|V{xK0XvHBHbkvoPuZnWZbEnmo7;*6I+|FNpSX+K2zM3Sr?Q>FX3!gY9 zaT&Em4#a@?I(~%rBr>Bp`H+5=!70e>cgB;mrJjXN)z)JRbA0~>zF|$vodsD95&FBQ z_N!V=jpTiU{%;$AGvG6m?$&@mDX?3K3klXD$`ifYF4r-h{9z1ovVwoIEvVBymy<1e zxJWH)(K9yV39XYSt#6dRVU_oed=l&Ls6C!L*l`NW+{L>k@AC=ynIl*4r<3*mryZG$ z@0Vxe+@CJm;ocktuigss1*F;o`mZ@<r&0PXSCJP*RY78$3YVmep|X^E z3H&lG0+m?(Q;RwKhs+^i86;IFt#Q;5Hl#t3%$ zpR?dOt`=mSNha@^V)ucO_BxB!FiZ7PZOa{id`x-!qqv>O1qq)NaKW%m{@5WW?vOl4 zJpb7v#g1pXrI%Xp`??t*A&%7$#nZcZ1YU(kR8Jiy}vXA>1+ww}r zrah&#Ex*n*uwUHVnNydvb9WsxWFeP4B;ZuihSzpp*K3YmkMNC#wZmY{Na8HxM`n)b zDGpnGFh6r2Y^H$6>RhT`yIInz$PtpzFDzaS%?Gq*6?_uuWo2C~*&LzST}hm?zS3kU zhX!t8Qb5w+D&l8NT!oJ46lqG3;{g1wD~RrO{DvnH$LTwM)AP>1`7T0VWcA6Xsskaq zhS0vh%C-R|n*#WG8sFBDhHT1PPMmxP)yl4+Z)4PTv$O~KD!UNe0=W>GDuOxYVke5b z0+0}cdhNH1vFvKA;urK2JXc>NzaZ?)Qn~(;5XnjHonl1UMd&22Ko{?WRhDA6kt@(B zw~P{zF@RYiUM)dxzLoNmD?QG7^Tf;E)#7PyL^Am6*IM=ClkF$R_Ym1tN~d8e&ML*w;3nOM!hnH*A5lg<+v zEHzwjT31^q6-A#8Y;kok6FuTP(>=DlN7N@0qC(W$& zk~xQelr-=I$SquWA;6UX2xD06x!#kRkZZ5(Yj7_%{kbP|bT10SCTj zPG-gN$-=_&0Mp8T%+5w$6SC-i{n6YFi@Nj4i^*@86=x(r!o&MlOSHIe0ItZ_Fq_8w zX0lTZ@j0!)6;mB_0EpwptQ@GOMGy_O2wR#1OwKnAGL#}4)V)f+>I5-@7CaxpW#sK5 ze1ZOq=cMS@j&&|M;$OCHxxCKv|9<~EBU?%$C*G>H$2zH&)eOoAy6v$1{qkYzie`OB zD~jy$!#mbA>05iOW7s^=lY`i(|EXiL5iyIrhL&egOKsX8U#A*S1qH7bW^KZnjmI|- zBS-Hbn3GMNk%)YOJ8iG@>*C+uXD4~V6gu$UL`UNDv#=A^dvbhj@X1|ZLv1Kna`eIq zti08XUb02oJkUvNbE3hzLNvKf%5^Gimzdoy!j(-K@bbnNKhG$X{_2v*^Fqd)`g*5PksrONw!zeH&4Vef|}3f^roR+LtFJ8bDME8h@&3@HJNj9nfVLw8fFZ?!#!0 zhyc@D@HLY66l$oh_sV_9aUIg`#vTvhTD)P^9b+ijreew3QF-#IcF69UWu#He-`Oz= z^tWT)gldK6YeL9pm#FyIO7LwCe*rT#@)NDqT#;%SaokJ(QqP}gU1bR*I2q@@@e)H%H$Yoj z@v?tVLl9217)x(&#V6l;oGm}t_}$WT=u)Rudxb4UkSnXO{_=_Ean-@%#4~dn;-TY& zg!Qzr@q7TCBUCjIp4|T)Wo;aRnccRYU1;y zR&ihaoun(k;14^JZu~u7%qDmUr@o^zlD;JGr)f73xk#0!IBupt()12I$$wB+)WelR zUj~^0vIX4(^lye=A^9Mj>@4+C4CA1wHz@8wUQvX!fwy$+jwq9_e7iH1D{*&3g?vx^ zDzn0i(IDgY&4?=b9=|73xpI9Kaa3vhbwsst^;KrIw@42gQ*2`9QLm4##K$8}C{Mr4 zRIWsC#A&%_ep%*eZx712J!?+HS>?SiGLza&*6X7ye%*W0sD#Ji!RX>~dT{|N^jy1CnE7@AW)f`0UF|U2t-?(F zLWPve3rI<@b^Q)-Y?S7c4VcO6@}&whkzf`pjdKrRCOzf%0#Z_oMhBoG^}_cB%zOla zSUq4S!NN5Pkn&0pnDJf(DEe`Y#juO$u0r2#>MI|xzQ*WocBW)1|HYk`aj)Vvf9Wqz zm^#Hj%d$$bBOn=P0%9FOi<)we5iLSBg^0ByInm@!j<6wGHxQl=(787aJbBa$DIu>> zix|HXip7&tth9sfRtL^Bp{9Vv8-k3)jkoar-xb|Ef3?J4tCBu{~f{~MK7sE|PJ zI0*u=F9QN(@u{ylOOdKL$8$0N-I(X^{I%JrZrtar5II}}diN#x2MHRvpDz{HmfnU% zT9pcBe-+q%R;phJt59Hkds10{0zv1P7mmmy`Y^`OS2WC3&^{wS9ogN2p#&xjNw2K>bP; zSscBv+TA`;X=P5iWZ@pPezQa?J6T!fxQyu0AB-lup>ziO%&R;O^QzVG6H$F8us&M@ zXTHFl_Bx5X1U9A@`KM)>-D3Pl{0Q>?^YDflnWcgbbp|P4LFLj}CRY!{T$l`o88*$u zu5R8I)Y4UBcBgTOVM*%aec3oI{%b^CcN#S!;Ut{0R>Fdhd_>R;4Vu4()+V_?(ktm^ zLbucpQJJ}=gDa?Ie+#Fx{|)}SMLhDrFIc}ws`94+=_-r z&27rQ)O6gRy1erkdX*WJHO0D0->TU|@?p&fLY5BmuE~#fmhFa7f@*aJ2QdwZ9HBaB!vF0Qzo&`r39IVK_`2PR3U;ck5 zm4$Tbx8{?7*Khh#)E7Iybe5A>y_h<%KX-8yFt&Xz&9HweT%L-*R6!#{qC0|GL8F3d zrO9LIF{d4Sg64KYn%ix~Gg{8}9_OIwHUF~ON2T0LRrztn#b+N%aKY|7#ny~W`uH0$+M~~UB>T`eIr3e|E&9?a ztWeH4Q+B$xXl`A-!*m9iB6#)DJJ zEOSeS1pHIG6V(rP@?XG@d$iekdHe`_Wll(g@6s(3pVWtHNneAXHcsuXYR>C~6(lJQ zu~0QY_|>kvcuVfTVN%_#$t5&88u!`So%}`ZI`|%u$C2vq_2NEMD_Ml7<6j^@_Ur`v zUmAO=)>iqHb0D@8ToE`!oaXuVD%j`sOn}K1&X8XxBCK`9(~%{X?I-8xfe&0{a__cs z#O5)Bk*{D`K(8xy(pJG^itrhfgYq976fKj=K{OwU!_Ffz3=QxNl61zlkh z=?ZZIQN%y()UuKlz&+#;^wQ}rW@Wb5U!*!FCgi8s;zT8rNYXhK{7kf>#vbQLz1`5& zc!SQjKIh^VWt;tx8^S$3oSO5lhEo29E$1VhvTwBpIX)IL&%E)7f5I44TueP0CSiR% zz6{*Uk|=5@b}=%H)3=2v@)b}|~m5JK-T~niu zWR^h4a`O-Rn}R0`!JBZdCDyPLVZT?S+^X@Z=L@61JrBC{=Mb5US8U8|9%fUFP$Hd31!*W3&{rf_v_a$qn>29M&}qEytWoqvHwH$@tqMUs90)N$_C-`zjFGv#S*)I}Y* ze=LJht7(u_>$Ck^RkZdB?Kyz+AFGZtxwho&!{|>WYBbSo6hF=SlCQ%$Q|{XjQf{35 z(u&T?n}lx{NR@-6^SX9@-M?B>S;rn-F3Ixs^LO_v0}ZYRu{OJQ@8zXYDd)$tYLQ0N=7{-UMR8kQ9G zs*Y-(rMgSQs{7rGADz~0)(;(PHh-V`4Vedu1Rq7KMVL&Zk1j8EU_Wda40sZqvi&o^ z(@Co_%MdkG(`f{Lc;lq9G4gkHE2vJv*Wl3F^DwCT<@WuzR#Qzo&QR`88vJHJ>HRy3 zY(=V`-P6Xgw)YK6)}YF2nH%;G@=LM*W46Yj-Wcfl$_cdYmt!Tr?QAm(S_|$Vyj2TN z_ePg~?kP2PVK^c&T5q*SH}8|9o89I>RBs7w_iIw2`Fz=6Wmf$(g_xPZ4Ta|*VX0b! z0rLCrWvFt~XV>=m#PiOZ$XYo^*O1qEeVzGFUZ;7AH_trAyA+jm2;y{_sVAAdvK_mG zbeVeO&z3Q##66iX=coLDR4Lmr&587j?eqMptHqyZu_l|I8}d>v#W3vv@($$Gt1*1*c1R zFK5(Nszgd_vhB9b$OT~rKg4$HUuvJ&mszpDedMR)k*~jY|Hz3tA~IIuQ!BqyRy(p! z6XDBwDJuz`qt3-uhdl4_Y<465zkxjF^807o-@j5;f+xCl<`oT|cSL5XInVETCzf%W z^M3Ta(}Qs$me_-uN3Zb=^=|RWJ6I|vauY<PFTjj-GODW zsA1$95f${9Xjh@`BKgz7GK|by@YPo_jNs_MLF1<^;32>=8ZqTsyLV@FJN278jkoV+I|Aeg^#1|KFXFe&yfoj1CMKcz80=stefH<(WxKJN87AJm#s;tgE}3 zX!8S5uKrh0)`$dU&-EV6>U}JH4++lh#Ts$-eikuI0(Vh?G{JfHKkkKdB;ZWYp56{^ znF^(s{X2a9E!aH_Uy=DjI#FeO^`HK~;;S;AFQT9^kS)3PO5&_+Ghrw3#rN5>|9(gX zDyNfc0puiwjuXXGF;2p_qxXN`Af2_rh^0{RPX6+??NMc)mG^&O*Y>JTmHSpDw0mnD zu2ea)^h5W4i6|PK>gtyyJ86A-F>y(omU5WH z*~P)|>zK=!%&0fY!v{ilwVhH%SE?g4@xj4dg*-}`Bap_WKtzb?r=c+-;`*yNmwEy| z=Oq1A;4F^sq!Fr5U-NLTX2QRQz*ij*=(g)#2y}2YBnJ{tL0nC@<-@Cqr}?bYT9Rxf z^E9Iwu0sBrGLx@HSKtfkT%>vAej4W(%>-IuHW|?AqLR4Zy$WOJyAE=6E=a zqwa-qXU_4c%;V6vY9tPTxQz!nN8<2k*3jtGmfY@NCdbr+1JkO~HCeRS&5Cr5eO$Q2 zHBOSEaZk>))0vN<)g%p#O#dYdVr}9L;z`k`?*4reRrb0(1MF~>ufd58%C6KKZB+MS z?guKK+rz5CS!#Qy!2e@YqEqgd#T)`y7SJ$mqy;j#82-b9k@L#l~?an3Au#lUl{@|X7bn#kOGK%7URMD6g zBNJwD@cHALtsL^Cp+W}YG3K9ei-MDMn~W9~e*6vA!m7>84JB_j`D+e_^fAbe3@r=l z8T2+V!q(Mskm8m#L;G^DUHh^Nn$w1!ZFhuX^{McF|EM<5KdRw~m4IG?@;5C^iaB^| z6k??}yOBj|9BdjC_hd4nMtwfp&j=eu`CzVU-35AI_NEgaH^#{r>XtCH^V~HS+V5;X z^Aqo$#rM}W-|EyZP8TNxEss1Zog>oDtDS#%xO93c+RI;|d7x-F-XXTm6+KZ;wV{Ca z{iA^PS{X(Asa9G7J5tn9Sq8D*ly%nr$eK-S&3T8;Bq8Sx`egg1GBQ4O{&s)KGICm~ z(0N(>k&ip012Ud)#24ojzd)44|4 zq0&i&RXht`+5jpl_b_$S!+Q`XckZF2;bA?@PWtRWI{sb#4{sem;@!E>%?>E!H!ukY zQvy8vRmN%2pG-j1KkRzvc4SzvKe#G6vTa?(yK@sNsTEGRfddXui}yOee@1?vIHLtw zG-rA@t{m3MUMck6k%WEVUYgFGmS@-Tyr|DT&+Fvp!{$F-=wKL796kdq>cc$7|if#T9Avw_4D*3QrE zRY9W-KP>lBWKKAUUYL}Cn9Aq_G8FC}>4?;)o~k9DOwQ68hsy7$9=5n&XR6TBsP7BU z!HrJC1@8pd0G%8xlL~(3sb_$SqoA3=VPziV0hYK22^+*=s#dt42G+^alEUJ4t}8*} zy2u`ZYSy#d{6(+YBjE?_l0sg?(7p_;F!8mzjy)*8MAQd)uoX^dQia6Rm7ZI7Er~^b zY{EA>sbxx0bGzTYn5s7+dxY)BMusJwc&zIM%BhNT99awrg3oVtTN{jZchu3S^9z%> zY50wo($_O&ePo9{u=MVVhtWP+kEM>KTMH+7D;W-;3d~Rb;B6ZNQ1^1+)%&Sk$LRf6 zC*P|f24*)?eWw4GwJ(&}Jm(hqM?jMwoOp?5pi)B5JAD~dBaw4Qedlfi#WUQ;*Gqgn zv}fPZ+?G8sx5R}sx0#Y>BdYk~{G2QCLNbK6HMaX;)%w4u^P8kCct6$VV)v?}k#RR3 zc#rSE^D;J?^6jINpr$n%(Sfud#JbbipKteIJa5M`y((GmEu*{Ao+BEEa3{2$w?!te z(okW~nP|-0XW*h18+>+Okuh(-9v-S1%f(}?Q#4-2xYT^;9*1rXH-q$8G0Wl8n8=D3 z5^WbC>!*elm|U)OBOjB`_J z$nbcEuBg&^VJ?3PEl&BFyXQ3rBA`#(0ct0m#1fVh9#XxzUKa4hP7PT)wRBzM&>)j8 zT@7?3hs5P9#Wity>2@{JO#{n}^n8KFx-j(EGP`Ncwwnzn+?12w`B=n|it6qsNe!6`=;O@#}^L%SZW&4l^3*P6qCl(r; zyBBt8?k+^&Utn{0e|_y+v`U~N-=6iI8mVct*SVMzkjqJ4=hwhTFxhE2eMp0Sle!gI zE+czEBh;v)oPl{}4|-jZVhS+4ut9t_*lE>RV@f&8fFu4nC0|^#tPm4QJ3r;Dfa;t+ z-a_N@?$fnBX=C-HOY<(j4QQ_dP@nOTyJynnEj&56_!%|AAN#AKrT zQ|4|#Z4UUFVfg>VZMoq19)W#xu`P&0-V=DgjPut|9|J$) zp`I6CV>}jpfO8RYVzTS9>FH5PXU~d&MkW0EMdZisZued2ZClLaZ*yIYGW>T-y_-rTY_y}T7$6`#`jvqk$GxNWKQEeYz?%C@BlCQUuuz95PlVD)sCA%q!%QiA!DfGOpM}&f zXZ>RUYPzyQ5TeQ9p+R^dY<0nB8!f=sQVn{@FTLRdZZvW3Rq)L1P23*#gB0ySmQnXA zP-*3tmxGs;v)|9~>kQH$TEV>vF&`DWKDQ=0xuxJ5aZXZBeCI_i^&-Ck>VVeI?;^-W zCHd>m$7f@wWLu`}WhXkcN6B*syAnIx7?C8HblSq~#!$QUbEA-57ix3NVx?^SlCJiAR(;L&|GzTd;$h5;u25@d_XCk%Arn9Qe1Ee_YtYN6MUZ^kI@wkhkR{)VE{KAzQ_h!25hg z(s}(s8l4YWvyjQjs}C3H_#ihgSAQhVQI(D83DoOTV+ny1*h6f}GtZjPkNri5 zwr2(_I5c*lT$AA3vCyUqU_1dch5**j#+8pi&MJ*%jjQ)Ue`MaD*aiyi5zdtQ(kRq6M9e4ZAN2NcSv+0U_x7S5YrGZvHOFc(=`T46 zrcJ^A+Tge2T;bJn|CJZi5p=7VH}P7Mtl^|*ag~_KCH3jR{ZEV4Ub&6_vU<0sOe0NbZ%akt`>@m5w?9S4&8;*#X%mcplA2V<}vk|2AM7`usmTARXDoUoXR#37~P4 z-wsZgA61BK+b+T0gmZPyw2W{_?J|#xENVVF{gYDT92-%WMGJ3@g4829Y2fK-RbtG$ zlUADLjPTQ^&#tX~xn~kp1vNCr_n=B9eDZiRqEC?fV>wfC(7Uzk2+zWlF`=XByTi)I zr*M{G`$ALH{3LomxXrDgs2UpM2J(#lg{n3K9$UI5eNsKZIpB!Av!?C2W^r0gZ?|;A z)7p%ADM>@i?A8g$r7{%X>W6r^FoyDIP<{~$a;e}ur3x0bNbuc|lH{-5{y(h6!El$c zueGByY=Ip3DkjAX&p)n;E0#xlV6+>NbVQFP!?!i#f7+0#BK-i($!6e!kTa@2DRaXN zySNg(RxG0oNi0Q3mR5%KY4Ub!B_SwzD?2U$ObN!ZHh$Ks219-mu0Or(YQRH%B$_F zA*2s+xQavSmXmDXsZJW8EcP4g7-WDqArT(SUSSxPX`9 z0%b}~Ga_rFV-#|?_EvcO0)-D^=Ko5wTzbI1#T>Mv5|L-1ub<5na;_T-vzx*Dl=tQ= zh0aSxf~b&v0pqhqf~&m|j|w%2(a0bO_y_g54k_>K!XyLy!)vOA0v+?-q(WZTdo?sq z^4N*`vX=7R;NHOzlNTKEc9b>DpE31IU_x&e`QQo-yQC_&uOlzcxv$^7id=Fh-~mgS z4l|~HG2!$CDa(7DL(P$7GU$f*2hB+e(G@$Qa}GLNA4pFs8+c3Nd{J~rdINkdk-2xZ~}JUj%~@7R59L)-3lZe9B4cTa>{DGG47LFwoq{TOA)p9@neanZ=j_%freV#c8?2~d8kp7_)4iXZd%+uWS=K4) z4YJSRY-asAI^W@;l>VtB8`3NMo*c?IXPXecs4Jy&>4H(dH|-602cV+RjBd#jg=LM5 zn{VjVawiqim-76N@r2GHoZx18^nBLt{CPdva`&P3gvLVEfM_2@mqUg>EnC6EFLcHd zf)w;y(n>Hh!pq=L@8v8N$YdCEjIb^GIQeAjPm*2%xw#SvGvgcy<#urbgVSPIh&5p! zqWh4qiR8b8()+0`XUR?lUwO#B3H4eHhBfOBgj=^bqm?h#XRbAKS5Su))l=HqEt_g2 zJ*r_Rq7p<Nx2{kUT<}k}_30K3K7u1fGu`zavA<@vqP^!63=&mg&HUZ)h%YZUqO@ z**Hg{&=-7lh!K2wd7|)S-^3jmP98fdp`%s+;XnB1ruCOJ7lpp5n$smTMoHF5k~nUr z&mNLEYdUJvuZ_kq;ta|3_Ps(*3 z$T$BFrT%IDy=*GSki0E%GbC~A7M(&Cz^=%k+BE$l{`bFrUK&|(asc$sgYAbdC$fJN zdDG(O3?}2EQ`zRtqit)S(8M@wy`eYpRVCtV3vBJKG4Cp1`x>!FKY!fq^R#-qfhXeZ zzBohPA-M_kqtnwC6gXwbjjLVdEu zIz}E>8uO|$uE>EF%Kuz{uFQ7)V`iMAc(FW|Jl$n4yUCrPNt1fu{%}?5;Ul$&)b<{j zC!VT+H1xP#-19iqW28*;pkwgmEQZhzAK9;Mzkf@U=HQH`|Gn8QPdA}N_VBf~gvmN3 zX8v-D1PS!E`_bN@C)kf4pncQSjSZn()8xJ592#$$qh+tG?;BUn9&9`vgQ_p2`y*dK zcrUm;4#z1}GK*LQO`wk{NLf5d6xQW=Gw^m+HR98;gCI}LC6b{~MI z^=)BS?8q2lKky909_Y(pe5hBuDFke2Vszx4_lS z1b$2aS7(v9I;w)9X10@BKT2&A9R#bX-x)4<$V1P6xN5%zIp-T5X}L+*N%}Fi$d?2; z2|As|q!&u!Np|A-HO|+*S!u7llo)6Q=eou=>m;Og+q9EflPd?h)GzZF`l!8APdx~^ zbqQoKvRif;;~}w_^f{-pkpn}Ik$z#c_4xv_scB&k#+H0Q3q6b0gFY4^=ShI?tr9s` z3NmJ|zJBX6Y6iWXzKHvBg?+1&@o;zx*Yh3`Hic=Rx#?Es^|!$|vRbkX`z|Ni{?x_@xrPK)lBU)CK(Z#AbnbLd zkG{;7{Iw#xSrkJm$kIzRXhFW`QQTi+FIohRsLv8o)$xSx37_)j&TsJ62i_>)t)1Tx zAADmYZ#C*-mIs*WoXxgy%Bha{f7C<~`sx@r&Zg+&Do--*uw7gs$zwQ`a1sGtIaaew zuJF-4~G=?%(ypItT57V2V9t%M=X5h8rnaI?NdylZ13(KGoi7w8k6TBJ)f-E8h= z`@;{NIGI<|h&n7A>B$LY@_1XH93yPeq6XHa&bnko9s^SM-b3uMneC^;?C-lDsk5RF z>-~MmuuxCU(tmnf4q(nf#3J*I9jmEPa)b!EZ3(u2ikh7+F`4v1rj@ab$N71>$+;;# zdi)~J$kBO5XA0Gpq7$XZFRiy{F~Wu24o=Oj0)4^cxm%>uf8+6kwMUMapnJ_ZdF=4X zgWn$bzVaXCvNplq-+=hCseh#kG00o$C?AZ9-hFLaF4~_lA6hwNCP{TSvZu19R&YLj75Af$Tfmk+-p z1Cfu3A)i5- zgnMLt&JJ3mxG>-2R(xpD&6-s|+#0jqENM#)BXK9?sZSBeF zVp5@+{@GeZ3bI=_p&e+nG7=gUW$9eb&>2EfG~{H9$%wn99{rMQnC~a}-s6-vTwvN@ zZ!dprT?0Hsu(_(o=2Y<;6fe49IHWj=X>OX zT^{~V#K7(YKNZ@ddv*M^j41G|*~8KQaGARKAbYRyN#o@U^m0oRt{`C;3%RSn;MvP0 z3}y&}`+R&2))}(QyeoZ^F$2s~}(N46BafYQea(-D8_ndkbtnPK5 z6^#a9wUO!sfFt^(GpBwGba{5u)SZNN^ViW_sU{V4C#BnGNWXIUGeif3_xV-yw~+qg ztwP+l`*hJ9MeXWYlAA?jHhUCWaw8}@PC<#c<{YRkB5NSvCnf!ovFG5u*mIVikp|)* zqKG|QBun@q-}9F?rJHn38IXLKvCgO&{@TdlkYJL$bP~A?YtD?M6UVu@?9gYkrYuqH zO*#5oq_d!Pa*CKu(_gQvdzI~^^+k0&6}PNiT6a((pkq=rZJ{Pix{W%7;-J5U+ach z=W{pzBIy_^c!PghXGES=@xX|VR=BGG;JCOe>~D1*4A^JmnxxTj44L_ zAVud}x;=3(^qm%Nmu%YxFG_e6U7j^c-d~kkbvLAyqL%Z;@SkL9SevRmXXWRRjGKDH zpUh#PQ*6b4T0z5WCSCIxct`5>b3o;t<%224*B{w5TwrwA<*B^89ah;ts&j+g>z5)% zt>-Rzem1SIp|8>I)N|^1{7t>jO8Oc-6G>-C#bAGA#xtm@aS@(|5^c~cd(GeUmv7~L zeD^B-g+58?tx|add%Y>)l+s(0+S{Cg{%Hg24Ha_R#GmE1q`5~%l!DLRqh8{0B31J8 zm;j%@)4WMHW#8iJ3;afH8SoB$fsql}uqspSr=hO_9+CzFl>;IN^@ntKI;4W2N-#Xv zsQNTanM?ZWht;7Qu)!r?!EdU36~6LBJocH_z+@3ORrX)pAH9dGG((In zklS5rG^3~vN>IdUfq>s`{|a^zL~J@#L%NxqMZrwESUO(?Zu&*9b&ONVbR7#T$emV zQaREa!hXGZ(gD9PSjQdAhC^OomB!<0jknc{9E%>hi+0xxqwPc^PT~_om%`iP^T(q_ zTZ{bL?YE2l410VFEa9*i4mIT0lLjj*BkT%E^xIC7rT1aAP-C1c&7`e|t@Lqw#g~sa zyu0gq!lF;S35(WA(m(L$8Fj4^_GFu9N>aBP4Ntr-s(>hbEGnD|4Y?R=XSI=*f<6NJ8tI_XtjO(Ut7_PECZ{y)Dja}fN$ z&Futm2_GQvOgxy({0otF?J(2-Bzahy0_r3ucpz|A&3~=uokO8O~>q12a zkfA(nxUdQJ!VI3awr;&jJS!1Dn8;VStJDnBUA+AR4fc!GcPK#H| z@)L|ZT`fr={(tc2U4_~fV@N?utDxOwl<57Ex+Ky??sWN(uY3saLxgm)xYO6Dt%7W5 zi?|Lg&RfP$^9$J)eB~{p?KsaAvYgbGE#klZ2=Q7)%wEy1$FtLQc-CUX>3Fk{-DNB* zabL3OikR6=>AMzWWg-J(G%8gf1LH(9GBE0owB=IX#bgc|+=X#C(L)A44JjdW5-Og6 zC$ojNYFCJbx)vkuRK#oi+apJD74V`f%eI79DfY(t*&lP(mI;(!=yHj2ul6qTUCNcU zG?xl>yD%Q~*5f*`c?Hb`J(8bT%)U<@JDkzw;np}u85hFAIw@iDG{M9@!$+HI$1fRA zaaMb+*!#h`AArli`8e)4>dbt5%R)XmFCNo>pLS~O$(L$hfkhR)En3}B$a4d3Wn}xD zRM~VaNl_H*e(PluyqNd+BsyBRiGf#2qAjaYhrAgYXAQeWvZ?hv2`jr8M%lPl_{249xlz;~^xW{pfaMs`1Ug9? zv%SwhZU;vS@7Kp!=>2SO!KzGkhl@~mSdwX_H!FI8Up;i)z`+)bd^|$jCaZn3+yh$~ z#u)Spd_w4LyDyf>L*>81uFdAdnYM*oU%M|1@%iFqaKquo5}!D>5yBeIKqVpSw7z8)!bZ;q4lf(11Xu#4{gLbnT#OTPn~)9m8v z{!*SXx}KOCDfA{T-yMmQEY2=ojuhDDINMqyvv#!m5R35^@)xv-(_sW2m2E-!4v&tq z3Xe2v!H;O%e-A61OEVSWbuz@P(kQd@MgTdq6NeBO%un84bvYUIFf*e%nI(i5Uzs>}fyA^|bOy?nAboix^J}2m4LcV1Lr~ zXHX-65yG0a5lO_mxM#s{C7TcZTaxX4u6w2#S?3#Lnapy3@Sxw@CKn)EEn0JLQvIr= zrosM#xj}@XLf=hs+2lFYbjNcGR?gMP?%wCs@moDf%{;lez(Koc^kjw_jdo3 zWLv}qZ8zI^eUS9+P%j?h*-%n;|+4hu>BN4z5@(KX-wwjH%Mt?E7IR$TI z)%IQjU75)Y z=mgkUA1qd}4E!%2(dN(n>V7F-h|^guU$NrkNW{&CwlWPa?hIs39i97|M0u5%%Y|Ka z)(Kz9_vL$~jY5Dj%9PQUNNB`ttr@O{@X|%vCUQ0n>@9NM1)Ycd}C2C7&aY)9I)A%j2OD zBwkJqNh^&9<%Iu;u4-^V3fXL+-!w=NMSs(|;owL+AW1z_9|Ylh`|j67_XASi6{F4e zSWD23ByFnwgbQ@G{Q3uG*{_L*=hJi!oTn>~Vnl;%mo5=?eW0(-<5W1`?;rM_{7pX- zH9~>pHWiXbK9=~)EW%|_fXGOeP85>;dZsuRuk(>)Lo2cr+K9^WDlhcL)(Az%)7d7g zzKd+rIo21|cR$@6k%HVEq0l~k`ub^A8ldccvzxlD(1g6WkE*6owKP=SK`vQ3kJRiW zV=G@OrP@wZvxVxV*)Ha5J*&Y3t!9g=f~GX6mFi7gRyv@Mj3C06kAk4fxN>jqLeimX zM-d($1QqP|HL_|lly}m@bMQ13jGMZj1Xs1r=MSC>4=l5ZMP+u`&-5g`P*n?z>U(-p z((kdGtAfHIZy__PbVf&hWRG=+aN>|2`HT?R7xh$N4-5XJ#HpiPAFH8fr;cTv;e=ijS!aIDXVl%-Ndvs5FEe%x8+$Ow7Vhc_JNsj9-`a_! znS(aOVm1*k=?_l+i!=jpZt@Hc-ZKMGa2I*k$~sDa{VNwT%{U2kn|+|0!Sl}{U(29v zF583x2IojnTcjQRL_0}iqn^rgbP?r&5n_x%Y>_*}DelbAXUK!PEm!zk8_sz79pZiD zsD6U~*Xe-23%*+EN6!fc-B`Qtv{3ck?H+~iw?)71m7x^n#W@obKKIB;`$rtJ@l4M5 zTfRMb>e%s<$G)xo{>T7_Ez1yXFLImMs+rojMV`eLDo_nSgJgi#87wjLGaPX9|sZS|MmUTNo6@3f-Vn)RpN9 zbysx)cV1`XQIpSSFxjnr*?Ef#^;dOv@w~2(JF3h65G%`H)gdA!|N5i$*z#xCSjRJL zih1a1JJo<&x_F))`2WAMf03ZqaQ^zgw6LOXAh;$Y>NvyV4=s+)Ev~M&i)A_ieW&#F z2WP)-7n50=9l)ihB8f0-V(*+?{t+Shddvdqc z_5SVW!-iQ>vwOMy!7qfe{mO^h@dmIv5!l=-6IL-3);HY8ev}$&nmk-%dN-UQzq__v z%_z5z{n#CC`hSlx>_W^H(0b81;&{SIf9Zy9_ECM=Vz<-s3LyK}9jutGi=MP&BF*r* z%DD2h!`g!{9e8Em*wT{=rTDzR$n*8re{;#EG3eNo3t^^ro@Gpv9%oE{{xdVe`P|77 z$Nk%1nE&)drx-oSqpxFj=EGxaCG5Zp;W?S3cd9-7^&if|DqSVaWBYYPMv|=(wt(JP zA05XFu15Hh!bXZWC{FTv#%tqGj<-(UJvrv3l`rXEzCOx;J+B#+ZLZk48j)z%{|ODU zp&|VGKjk%;zRSNoFZk--3FqeZm{0->5pqGIajny5NNu zd?~V@cvbdZokq1g>%ZGMu{8;t7tT3dyLJMyAG8(avDt^9t?5SnsJ7+UYtPOnt!8n*0FqHqf4^x2rm8%e0|%! z!`C&CR?NAdv;ZXKuU72LlAK>lay~PzKkTs%QMR(`Zz)#R`rhBHO(DqxT4HT$cRSvI z)Da9DI^+P1`LSEb2P@e%YR~=PoRzRfh%_d(x4=HN*Of=^Rs0Qe;0Kp2O17%{zkabc zg}gfXP{<;^{K4mAkjH=$DFt#6Qt*^4f;~b`!m!3t}hsjsD02*;0$h1?Nua09dpm94Ficl!A6Ty;`l* zTeQ@-+%sKw?pgI8b3%)R3}msihkW)^BZu!_CAvjK0O%CHaiY2p6JPwvE zrIB~o8Q`w~&79(;CV7QmEi%i~9Y` z5>0_hVW9~%#hp|r2WaWj6WSpkWOKP5fs8V6DZJIFMuTI}L*JC1f&M(KmltPfS+bkK zVs%hYmNUt21sj#!f?WS6Vl=iT`rzn;^zL6`n4I7Hx;Zr`Erc zE#VAw&9cp6!+ubdfry3x59R>}gfm~F1*O5LOQB^amXAf1J1sOG`2R~+NP|;E<-4BG zTTt^(>o2Xz&onz1f41K~d4|@uzz}e2Qnru!Tl(X@z14S-dm79Z25KJCPr4`5Tn4{e z$;-YzXxT<5_F&%ZSoY9(Qa0^vI6n|iIx)^zn)4t8UMpSU%_t%qN zGoLhDQ+KEK!>L6ufabPTTMjsUp~B%v)5X0kdO;P5fru3gY#q?6Wb)jclN*n3IYu^N z)fy~t8f_u|{VS~CzLc>--=za9f_?;60KY$V#Ua{;vwTW=OdI@C>fgBRF_;;Oy99g? zc{$c8LwnlIkZR&$IniD@E7A7tC9MUXSD4MRu|Eyps$ReUqat;Dqt4=u3pC@Y$5V?v zybBc~4(6W`ZMm*TIerA6Y@bF+Z27lrwLJ>65JQn%z z$J(trcFRIjK>0wE{u!2hcyuPMXK*!mb1n2mXajErlS%)X_RPy3ZUbWAyO1nk{S4JS zH)sjQM|NbIsk-C5+z=oB-X$MId=oQ5rd42k_KzwyffENdJ!tElNw^5C03DmD(y=!V zXry(f@A;R#Up=?v>N}@%Nsbdt&03P>>?g&?oTG;1|A^`d8=ag*Skw5ZsY@CBPP^^< zmN2Atz&aMR!EP-#5`9S16NOOegB`x!Ea*e(0+RX~R_nj_=D;64M_*F?6~!sYkt$;= zQMLWb82DdK$QNfCsqFav~W-2iwXzY{~}fT(+t6`P;f zh}t;L252>Tnj>N_<6vug5?FRp@tUsxbdUNj;o(MpO0LYOVs9X4<`J*@6c(}s>W$7b zz!cw(ankvwZP%mhNYzN05oBmqo>sr`{?0bZt|0TA{?eq$9W&A%p}F`=r=ANuFSpB? zuC@!>u3A?u(`Pr8{H#1b-2VJidyH;?J=Q!R?;m^idm2ULmTexONy!$Sh}K}VL-Jdg zw{k=Fa{*4&oATW;85S~WIjH#>Fap_d-dO&0O0ffVPu`Z+Uc*^mS8eEL_Lls&m?vgi zX}I>gOFUMyswhsPCtv5@7F`&7`<^JTh1>2FU)U|Shr>;S4qh3~IC#k~H0NaYYz zs28vwoV-)tuyXgE^P;e(S&|GqJq(&MyYOLO&2-W~tVQ%0`P$dNQ9x8isW2N%6=t*c zV@81z?V0n&ri;7g&W-uIdSXPMc<~VIlfaU+qho8>kN9uNuX$XxzV4+eKhyL_X}8Cj zgYpclZ(=g>CER|yuXU)~AGes!1K3tMi$Xt=J`Oqmt=sm9QS$$nyxF>v=c&JbK)%NE zWk%fiHRFwwZ>Ihs?c21pQDd-oU}r{!d)U#R9Nm-bsoz`ye1dv`V#czz)t5kB#Ajvt zn6tz)DIOBjM8-357UQ|m6OvO;wB;77^Zt36X;CUeYj@1~pFKgi|D9W(Usr=x%(m(g~*T3(!AD9to5IwG~QbrDF)1%vS1^T|sUp10AWi}vHiV!59 zK}RI^>MHtD0=#1~(Z^V1Px9BNA4VK@bqDum@JZZTV5_!6lVfJu`3PuXRBnXM)yU~~ z+yR#?`(!lLPi>b8ezf;9gA*W`Adiz_61j}v%vN}f{-krK2tLZbJC`XEZ%pS!rexRP z#KNpbGiT`~`fIYk830KMu zCN3mEV6Fxz=YtD=V?kwBi)a^j84KB~@TVUisZ@@-e4QaU;v}wshnoxMn6$Fs$VNR^ zp|rQtNXT~+HGkyVRF9w!NH1qZ@WB#Y&N;8p<=Q(xqX%|LaEJvJR@}0G!U~av4i6Nq zL4E75KT#Ykc5hZ=r~vFOglJD+(TJ$S{487KdKNXApY^_d>#ir~`uw+Yg-wmm-k2n8 zCzSXlWx1@d_c1dI~Jssz(bf5Ma6}|#fh z53MBA^t5VIr&>=WX^7`wiFc6?scdE6vhP7V`w&-U68R!D>Yhe6WiP5r1QM?Vt~r$1 z?Z_`BNp;$+Ugz!Nqp+En8PWx!QX1meOq}7|fJ*s|q?tP`hKqqSOu9{a!$x|7=LQEO zKdpcD;G*o*>`|VswSgg{nvpZp8~JumzaiSu3tU;S9c9vzR&-5jpsvN<1|of&v#ukWXEl=G~FEH?wdTq zV47^u>~!=^R%O6fNG_wQd#=G}*~(COF}}$pIREsBGCtTzLz&y*)Q3m!y=&li@+X)t zmp6Q9xV6*qPO^tjV-gN~_+sQmks<5*-egR>Iqrzt_e#zdXG(x9{i%@#yOW}wF=jPt z?bu5rUf%I?bmj+{+9^_uowPQ-?^id_%E&oL(rO1d;@mqNA93N<#~IS&>~_mzi%dtw zD5|8V+q3_1!rg!Ls*CYKeDYhIOp zHESX&qWKBAlPXx>aVAgHSSVx1k(`*EjYQ#^62I^8&ar^{qy7T7S>NKNC`nYD*2lDw zroD-W2T8`91k{;Uco$(SA0ZUu-x5B8JWfuFaV}eFk#;F0cv~%^&GP3k(A>I*zypGF zn=D}rqSX1Y8$*WHFvq@n`t*=;QygNpJV&Go(bV=CwcWr4D67a zfDxD9Uw7num=`|T_AS=>bxT(qG(j?At;00Wt%zPBOVaZm88WPt0Zej0)dtmklYE+1 z&F&MK>E5GZM-_RPV5UJ9i)9*`p|G*2KHfr6yA=C4v+L}pjMvGdSJ+Z?1Kg~HH?A?+ zzFQ+{UlWIuj7rDg=z<^(fiuDC)F!Oiku+}t^;7!0Udg2pRiYk(6&% z^5zMa+kh{ry|eNfFjltn!?vIq;)rEfbNOAw<-!tu_WvX8-Q$|N()IDRv$GR|pkP#_ z^#VkpGA&h6sh(2`O0oqnRY#*Spqw*L!(hQM%b2 z==ZlzJFFm#xvj`&m97C2SbIBLhn@Jf0Ps}KRh`wcQ7*}@*ObUt0uYzaj5%B3xjQgz zU8?c5j$ZK9Y%A59c^+dW7(%t7b|G(DQAtiSeB&w~Jey~-(zkkiEAf2`l}$FfcI80{ zK0SlR-u3(Lk545V1GMuBrV?R$koSP@A|ZTCJu{vj*;~OzDj@8bNnAg z&Z%!#*5&o<>S}+$*CU3>q)zQ|Sx!&@({~GJytH!}6 z?&4RT@Xzj%P45pcIJ~@joFa#8gU6KZ1SBA(#*2tDXc;7ke|Q1DQkvs`^MnN5iMC5x zSir?!^pOvzA#PzDv<;QM7(d%d|C4c@g=KQ}I3^Xnr}?}=8XUw(M}i&ct$lWqzv$WM zRgf~zbhy+z`nSGz6&{rgJv978^si9IOM`yyDYWnWk~04@O)f~n`j$bwI}K-1#E1o4 z8D!Gc4=T}V2gy}>%oORvD)9J~LE+UhFc+j(A^irR{6y{GF?LrQVvYjPiW=Ijx7mq` zYi{{hU-I36rT!6(G5z{EP1(>JR5H8h4=?OLD)kN0`Fksau0$_6MWq+@o%(IL=%>`0 z>qNibLO+X@iidpy8SGCuc=QD;!(chx{+w0sKjqLnIE#AD;mo1?{Zv?jjF;NM{Psyb zt$IA6q0C@WmB_0)Kvyl>W5CT71G0`H%A&APq^t!Cg#}g<2ZZ^|5rK1(q@}G|Z{|9~ zoTP#IF0mI@zIGG5{BUhLICvDscLH*Q{x`m__fklB${m`)u=p{~P(46de}W`^=FWoH_WWF1Kc z4GMn|c8I+3`R}qbH(}i$&1Cmb7KM|b>^3t~|0WBNgAA<}`en_7{TX}({ICD=N%fc1 z^Ww6)o~K`cNAT87tsCIiLF0+m4@)vz`oJ@=09x*W#*EY?A&<1XRaSPVpZkeI;3BRgWmgqO;1bpsU?sZ6$vwJ?U7SIu?Xo zvX_+GK;MI9)Mmnn>frgKn{oa33~> zXg0;Q^d2w)5q!O&eJ{?6Q%72N$Y;T-du1Qwi`(Hx5HI_p%D?&{@#(D^)5a}P$_O>6 zBa~)StVlP93+gy$`DAt5fB0qf+T9pujFn<-z(^Z#Zi!*aXcxb8bmGKe=YRr`z8gNd z1BFeL6%|-4RmrM{NOTQigloMaWi3Yil?PT4sDqu&4EuLr3(FF@!~UL9FM(Vk+`>6` z7heK2GjGK6&flF>s1FP?zPjj_%AHkTSd3%(G1!U!iKyg|PrMZ_ib&C>s_`hNj!_&6 z|HtHj%azy5oxidr+0LA)xq2{mwSsyO^4vf89XW=LqOs*}uh@L4Sv0ul^b;0~`RzWA zeAR!_GuS;FV|>?#`L2I7f#^GR)gtT!x??`=UtL^rn$`5DAqG(Tmb@dSr{oCK%I>s4 ziVVR?A)q5xYK{>kgCP+1f#8n+`l)6sdh&adbyGMclEL*P=IrWYx07A!>~-H>;i700 zc}Gr9s&S>OQ1lG$xbxOyLaOIKQt$fr!jC2?{NdL3Sw~g~4XxkECrR3hJ^nFVQ%D{V zF@23T!vmt<8ASHN7wa0VMiJIj^^D}X)DerA#Fo#>{A;~nhTaM%U8)hat?}2k6X#lr zu+QOs)^4ZV!x{Q#Y=Kw{8XJF0Pj{W68;k#g&LR1t;&q_EGfuiD@}QUY&P?(;^VonQ zpbt{KMy9U9D82G>z7o5 zsI2?a-}(be?+qf+k$UGXU$$jz8MJyqQlAzrKJU>pq(#Tbf1eNCiDCsUPyCiB5-bum z=sDb7Y{XMt_pf3^0z*^w?*%`FwP>i^29d_j_6m)iGQQ;(Jyc6L=>vnPmf)0U_hTl( z1G2lkZuvvy8@tK}Qh9DaupWb{JU%<=8DC3RZ0Ks~$6u?@Q2D*C$a1x2(BMD)ZGHRi z-6eL5lD>se>!?lUzdH3d?@^sr;2L*4(dycy^w{^7SG(Vm*r3)ywbPr{!TO4Kysq-; zywgOD$P{ZSkN&E4(2lOwqkF5no&%>It%ur3HQD}48PB>%j4cZs_E#!J*6rB}&c_BS z@rSPd)T(t*J7Dqb2`}GAc+TNgXUz#K@UApQ-Exf-(89vMrMY2R6BtLD0~UmtwEW@; zZ+YD^@9+h$%3D)DsDW4Gf)S4Gd?Af>~7Q+2X#HIwqb4Oexr6*(Dx{>j#2PGsDv^` z@A@f__{BqGgnF;J(L$_-plSaWU7=#R-1@1+i3(K|>aF)b`}QuCdNjUHeX+8N!pmVm z3nb&&5kp1E+RTy(Nd|j$*)fbkNXs368==Rw*$VwNUHoI{rw{e#m3AdYl6b}=>(Ro8 zS1KRZ?0V<2w|wnX@9@Z9`gx-4Smc3xacn)>a&ObmP+C`%{1bXszrPpMFYX>c^aE7> zV519hPs6;s-YHsk^Fa=@jRV2uEc^s74ivc)yu0RU!*_oERJ4%GKizPf4e0448| z*h5H_UQHdW>^geZL(1uh01pL8_Kpbhp@0P3z5CVG{Wtwyr&YZgXl1T^$fp5Ohkd(| zYnuK-b|YG=$<`!SixJ_#X}mf}SVEK~dK&eHJLth@G*9QfM|F{2#(+#ldd!?`^vBzd zF&=QIt*dpp9sLneM!!2f>kMuFeTmL_gfWi2shQty;OGqwpKMsY$v<|3))5~QLY8`m_i_d!()>{r zpP~Pt$WXdUJyats>58%s)_wEG?){6_(V|_X`-}*CXb)4auzuZp*kEh-{-xXg(EgPL z%nfA+r6}O;z3k5)2Jfdmm87o$ikFYnD@LIcVX#$y?59C(rz(3XI+`A|q8-R?`m6Kq z-Ch-<=i4{FsaWi^hdo=`@CIki^JMBTUMlM@IVjWgrxe4rQbc2R#hvAU=Pm#JOro}; z``O`t&(wArZ+?p&wz}WX*kL8>pJx5Cn;s@>L$=#Tvx3+b!*4N9vp#I1h!)}n;9X9r~O`NmGC9YzN3+2 zj>TlTFDTJ*^j(tm2Q#0SnD(GIrbXSwtMdK3$4<1JCFRe}6-@U4BVuXO~|R^%Rz7`t9?0`iI(2zXuTY zRGl3-SKAc}1L}V_g@aBK8i|_)e^Nbp=+vE^352qc?)IjYOFgtb6CDmwX?0H^&!W|s z6*kNNsM6Qex<_06=k4Bzcg`;O|J`c%qCe8^y;!e0G-MN{7MQZHM5uHdO*`U#Z+Weo zEHSF4R+FmE9rSMb)MHXFAh;^6rYQXCa<$#HmBxM!_L+;G(4-Q@yD75l!-svFKochP zBWvazEwCc5$?Zq_gDyFu13cEy>(+NpeLprbN4nDhe}sN)-5RT2s%r@1MID30Gq_#n z)PMUx5TzyU%v{Nn4qVRya6JGruI9E5l1Ja$T7Ijx$4?L>KGg=Sd-FG!BtV@eICw+p{s?cDEKn)y;A#(_N6i$}bkJJjp}jPH%AvLzud{CRM1k zCP_u-R%y_4XRxJpKfgW400|(x{Z0a*mFd`gvOrXg*bjf#w^qzJMiJpEju2r8jjWE# zefGG|ldOk9w=d@_2jaM!pQ_qpmhut7tVcEmM+Z*k!)_ncSID5n@7hBW5S8TAA00uI zguE4abOcdTS_?cq_^6O|4)+cf3KHt?8davi94amWYR1l>?dWN zTnS5$T^-q@BY<^uqr@H@2aS-MExBuYx)9^q2=t!6sENd+Lj`QiJqHCPk(^gF+ z-4w-#Y&y}kiwowT_0`4r9PbOgq=JXg8`!h34lBN`I@ZI1v99dmHgH+9magGCr<%TNGnBT-5sF7@jMIFdg-qGg=@w(M0 zWb*O0?a7Eq9ue!1IHCXVMW_BXCjGX(AMC!c^}@=8Z)WTPqg7q2n9dF=Hn^ABLg-#4 zJrFsud)uFp+F&1ho%SzFZ(knSUGwgbUPM$*)~Vd?ZT#dkXKwuzTIuJl78TV8TKB2a zy*6JKMO}aYvmf6%so;b<^&&7AbWJ{O$F4ygex3q?o=?MqoYjKLAKmg)r6NQ6Ijh@8 zR^1!BePpf39?b(KR~E;@8*+)Sm$TVrfwNFgzs@JVb0WpV4gvhui+1qQWk(Pt-l3)b zredyJ9{0C8(QACq!4%F~q~rX(ey-XZ;cXjuZDsnMq@^k6Q_@nuN{vnXAT4lG+piYQ zIWxyHci-G#aDYlbTcp3XdDo|u`Fr~>Bn<3;-TfI#J0M!D?s_yssKv8gkldlW2xFdk zZEdm`jPJ!-X_b4tw5%-xXF0@PHjkHASPE2U>gcN?uMIA-A&CR z+hy`ME04>o7Admvj7UCem?MFXX7BQ3-n4BCV((JaSjRkllH>?ZxY0Q zBW^r;P$UfN97HhYyS;TcYWi0A@xdJw={PMZN;mO`jD;DeW{rpLoUTNKo)R7I15|Iw z+PKSN7NXk9-ZfNRrn`+#x08fG7!2@>1(HJk(F83TP`<#mL@&RqFmojk&+JgdrE!Yn{xUV4eiSm73vMiG{V-x3nJ~0?Y*RB?QwEO zrN)sb_I|*0Dz=Xv?lc!A%nD$kXso0(b9NXXUZY65+vGymkVAbrw zDwP zrrz^$^F^obGnQ<*PBfVo@%s0rPF-EFl+~cac=z&r+;AcMJ0I@qzp1Ez-d*$dpDdNd zr^s@lk!%gH_zZ^^Zu0=A-Q7t&3l}{L+t0r)<^ntHqY2serH7~gb?N!!zb?J7qIBuS z1*O-^rpj@g&ov=y+#)2vdj4Gn)QQ5THSziP2ewfA4U1w z&9J8bi}JeBdYr~DN$VRR890TN3_U8J>ZJcWb36v2PW91Oe;Z1HPYRA>A*}_Q4nfD= z(OgTl^XS)RWo4Yg#*DlDnG?($_d(GAVs$W+v@Ey>| zPt+JZ_JGQFGZutVesHJmbIkpf${Rz?+3yE`xmll}AI&z&$kBYslihq!j>!%3tU+*j z20yeW=(^2_ab9Q6E{fcJ{b1v`PnrK?*HTwmREU}??i151xp9r&vHdgb@~mR5hg z?|T06eM{>*4lF%$4f)ANe~q2t(t%@SVIVnAiJ7+Rk7ZY9S7uGhKBz(bQg*rKqUM6; zyymc`T60!&MpKVSq13D?S(CZRgp5q_)dy;)ADENUifD{syTP|yg8ruBLp!#VbXw3` z+Nzh3HyO_Sy9O17!<)NTqh?m2dX{K>{stm|r!Lq-QmlWTel#iSm`?HPOgk(z`sG04 z*NT@>+fZ<$*{-(3}XN^J=coY5-u#!Ynj*h*(9Sj8z`eml;KhRP9LvKM~S_lHl9-Lh8|u>^gQx=p&#(8>=RZlYXlCmW$Oi}B4n<65O@(^=R)04==;)u)T%##C5L$Z3C zo>&lSie3?lGWZPb{ncty+=x(9?DSCF4K+n<3cc~op1d)6Ma86NXF^uD_$^4Q?uJP2H+neR?{-3GSOk1}1=T@( z3UPK!(3|Ydj3imCW`o*C`6*@;8nK6xeG2-CAMB&)^fAv4dE~P1T)ivq>WlV^wps9t z!l~tEuk#7eoWa{-gdF33oG%dtNzV_5-$0D<^d#^`Y0-8>Bm$`p{>o{*F)WYcCdzI* zvIi`%J9S&wLhP&*v8!>O`xBkHveKmdyITKSt8c#iIj#mtj=R6bXRyb5HxQpaJZtaX z@9s@IdQ;--4bB=p+7&$xxU}Bi<{Rg?{>hpK*-2O40}&+(J?DSdRYQZD$wO0nl6DSs zd9Rs~j!v=*y~8nQfd#SE9JEfU!*lO?` zJg1ztZQt;29nL~A=--|qAZPJ1M+38Rl9B+ zg;gU{n~3;@khjc;0U33|2?_MRV1=YyK zrI;DW!o3LouP2?DeT`~zS>RP-(+xR0;iG8-3*?L? zQKj|<4eaAO(y8JcYuMjR+{Iyq*VU3fl94@aSM6W?GaOp1hb*v&oAS+a@2=;52>ukl zfDw%e{(cTCyCYiLy{xP?_#|=AjCA4{wWSf&9=&i=j;QF(W3J0Xl6&*RxZd)xicmf_ zD^!k64&{Hrh04FE2;ra13Xz{o4&k5TLhjE^ht!U!Tz zV~|z!1h!xA=0&nNQYrhL_a|(^I^oIFe@nFY*!AD~Q4}0*=zoVlxV{zMOyS@T%y-_T zfweL7xg#6*QtACb^(gz+^<8!nMPeVl%S{fh;-5ZHaZc84GPQtcj;S$VjZ;k&$@jtBl06b3!!l z!vfLM1MCc1feJ;>!1jOee@xZGe@R0$B);>F_ioQ%;kv)|S~{x<>k?GbZXCMVO@29A~)C&U*qneeM5SkqAQYgruFc= zBijb;ty%}yt*-=bOqb>wey(UW>3tQn35DaaXX)n~O07*A>2Iy<0QOFJ4Rt<8_r!R?8-bYvPJUzo%uEF->xoiKMf0y8ABU{VdEgbC> z@~f4}Slt-H?@y9S3Qp+(fMrJ0qlxF2zov^uEzw^Spm{9&id*xOw&)ws_lDN#r5& z>+0|Kb?rTFJ%>GKRWk$1grTn}*_v5Lm>_yyYX2Y7z8OjTmf?;lR7UxNi1X!9zmM)# zprxf4XZVmG5{rUFZ$t=u>4m?5I!u0XDJOp>vf2+ybH^oPt@wL}%l{<&(CQsNEp8Nz z)>UP!ir@a$*e{0}7wLjX&j6iQU0K<)2jI^F|F`20;34ytqm-YSqx2Ia=83W|=`&ud z_BA=vTm1GF&u<*NWOx13p7r`&z#DDg_VM)wHrvN-BzycX{rzqGpNu_H5Nk0x07&C& zN#bF@HyrPdP4r(aUhe59?C7EmMnInBjv)W<{k1fo>MhpXy*2Rp{t0cSjrN2K+kTcd zUuSHkb`ocVT8JV#uS$`54L*tlcJ5W_(9sS$yyhtBri1R=D0|cXum4U@@jBTpQ^W|&Gz(3u;BkJZp`;}*n_T7i6d9i3UIBj`E zei^Vr?a70&*NSp9R@4n&6~zbLOBx?!oD;;EHjm*v+&T(iFR|azNwsw@!Kn2jx~E|51+^Lao9n@}|-gH41n8q!?Vw z(ch$A|5UnE=`b2Af+t9@RqcfyA71^uI~?n4hz1@EH$9nJn{N+#ygjFBzg3)5HD^kK zUJC@Pa|LsbCv4S?r&ELwxvVZz^THJ88|`HqDx8b;Npp^?zMd3Kud6oZjAmIWp{cSN zh}p+Uk1tz>FzMTBoZ?3@V`~dyQszflwF9-DPlj}=d$!)=$3}w1M9=2sTMQP5*+5pL zy5hkP+f0&S@#3q~SzL}>Wk!uJG3P7`+wXWb*MN9_Zyg)RE0Nc);@+gM8~riQ^dbWzber{qLp_7LkHyRQL29 zW51a!-`wQ70IWXPe{v5a+RTjejf$K@{+qK7b`-?r?4j5NpG;M}S;g~Ii???q#k;PtQrr2Y z4QnD7zg7Ux&wcPfr1}1=Poq?v_`Ye#Sk4qZo8w~w1E(eZkTi3`obmm|ee1Us%{hpu zU~Wv&sgw-`CU}=DOi_L8f#i9&qP}J8$D2NEW&9IW21l+OV>N88b=tyMsjH2ZTJ<=~2?57WtUqC5Zbp%p>z{Xx z4jvzAF>wv}4y|$KrtA`YmuGD?m^Apb>@}3&v;KJ#PycZjpYp6GgGq}|u@$!3?Z^<{ z?weB)1N<34owgXZ#6>YSv9=D1BboM2MXaq;`Swlu+!Yu(O-*?~K%67XY^&aOaOy?M z2D!OX9r5{LeA+p7GKJ8Ij4zI3rP>c5EdY~O@o`A?(CMOfJ!y*RYL~WLT*Bb>)P|8+ zb5(1VH|Eh>f&vn25U;I4#>&H{pk&UQ`SgcCUz4ldN-P`lIc0xv-^4> zbMERYF+T7P{KCc(mdTT+Hca*HK=Tbsk6xq9g-xVK=sDF!Jt~BKLVtO)Rr;r0k*=tJ zihR|J{41`!x;b9hqQo-0(6dCWf0V(=JRDw(eRSIB!q{pJ^e9K#Hm{dY zYZ*y^Bh8#8yJ$Lc$(gj9SX^}^@(CG*2#v0`M9VQ?5-?yAFz@nj9#CdJ#lky?);LJC zSUEh z=!1|YnEI{Ln)JY&0@l=xa;a}H;&stZlb>fZ2PzTsDKD|o^*P+m+9>VZ)h_VuwSriD zi(5@xuo~14(QFRfe9XK2lW$GEM)1yaEy-y%>*VNFwX4q9H`^B4t>zh46A-XUdU2XX z7fOJK<(=R7*fzVS{Nk#qt7h4wY?p0M_Q$&!_aBI5Hup5t6y+Q;ZBF1!!5^6awN*)t z%3A?6Q_7>RJEQV;(itB6jGuEIVxI|#<-u914v4TaS_=joI*IevCKivgM%P&adIyzP zL{DO&rYM&zEE?(`_~|@Zjm_XF9(%)u+N75&w{sU}BNtu6 ztI&;LtuJT*eV8WPgMF9tYv;1eihi!1{9J&hWi}cdBc7$`a_CNd?XQ9N{6tf*HpMig z#bS!q0^tajaV^tW#l&NYYVe z5&dx7Z|$bGcdjxPjbgDBn_&q#H1iN2V*o~0ksnztqJ!;r%P~0?KBf{f$H}|K0Q8@% zGWIJPV^IR0>@$InuC%-`K^~f8krugu%Y2ndE&JF`+eo`#XCRcifJ4miC`VKkB~MtX*jXa z?bOd-0dy5eOiUwfXw_t808Il{Qs8Apk2Jp;Fwk<&?2Sko5^LWxZJd?*TiW2ldBLcU z2sz^FbU2#?ovGJu*5RVs5eqpSR^dKsR3~MQnp!*KSa+5q!nR$RF3CcO(ILX`U?|R4 zO*s2hnzOpH_hD?IQ&MnaU;Z&?e}v}u z(bDi`Qc6cr=@cs6+h023Q_7SxRCMN!Vx3{74b7UNldO}CK}=)9C~~Q#h9x{bGt_d% zTADYC<7@uNl)X{Elus;Fxh!G}wGX&hnMKe?{TnO9+O`f_#6Ik}LAsj235KnKo&k=# zKgNR}KWWdTsLAh6CJIv~8X0k0Mym+zfIGW~Y-RFvn>RUgzfB?Xls9 zAgjf~9*lClyI~qm$p38C5QaGr(C+%@B6=PS9pL;G&+kbhDUf#3?98z%qR-Q=LQ#XU z4#HR6(@Zx`)ho>UlFS_!=@ux};Enmo3P!^!-`L$9-7*n$t`Y4{>sjAuKL$U#?&g z^knx6*6uHR`1wp5ET_d-)anBtcKRH`kTdN51`+7T_%#YE z5q)Cc>qVb4u_CqH#~A{+RcbCW;uqqT{6p%fKZl$#qd`?O+mjRzzv7jBNe@qBJ{DuH zmU(c_Unah(nHhj)&>3cIZSSQb;QMP_cT_DsxM5EcZywF44xy`#veR_U&_t#AsyC9l z(esfl<8SnYS$RUO7M~!Q5$l=Fhb5P^jHEUxXD1B2}Tu3>; zZobnZ{c{WBaB5L0sNjhybB<`3)odJHh4^ghC9-%eMn(`N$1+9!BD&6Dbm*^eDNg7R zje)F(0rq%El$oT{D1S+~mM_L@TQsG1VBu87u+KzgH$)wXAUu;;_(Rgd6hFGAfVnPc zgAJa+DOeA_Ms`7Jd-TEGReZI;oH;{rB8;|YL7v8L(Oj(^D`H-=CLQ`CBWC?7adDQY z>?N-^K*j`5FKWX1w-1xv+^(_e*J)3?R2#j;Bp|8~(!kop!&%~pPobY<(t^{#9SOrc z*v1gixgKXPwlPnoc%qdkYSoA8r~6t(T>Jp>anE@T$9Iqg|K_h-jiZNljgrb0U;Fag z`LhP9EB}rhoby2ccfOllK^gvnEzs*L^h%nZm13QwWY50Qf|bR;ulhZ%_9z(oMj)t` z>XD_sCV}xsV;IE>z5P!q{578BF(9RLFJWx}8qo(<{h6Xt`{HEaEWy$;n}bb_<;z%q z_!3;PDwwXRWh>Jcbmieg+Z-cvcGyBKgrK84;~kz@GVqd0HQf;Gp8|u0*1Pt=7eWeJ z=gVtHtMm)ADPm~Agn^dWYCW{P9-C ziO3FF{wB^YjlbLjdld@?cScigb3$4t98*_W+(vDmd8Zdt5IM(F@4~(vD*n|EP*E z7vRI;o-?82_0E2q^m7j33YRdE-CWuKQW%ZBTEf)3RWo41x<#G+zLZ-FNauekthJ!e z1p4-szO+rporbI|XS~cg7TpRnt!ia+CV-OMg{qZd@d=IW{o}k?&CVX-@jgO&f)>Os zvd{GIS6rxgR5p)31?gOwN%IHL-Y;(vr*5c>vQ8$XjFyQkd%ZfNXsi;f0pqC**~E>) z(5FnB^;4Ja8vaYV7HL*~l_&i-t;-2M4}I7M1C6>&NK?>k4ABNaW)3htfxlS%J&C_K zZGigrOl0{*i6E2+ib_#dX?dhE^@}4BO^980`E}kgcSsl=p$gS zM|Px;4Ehc~%&Ogu(AI0Ge`?yS?E|FJDBe;TYc*r0WWLg};B@y2O6#X7%HS)r1!b_d zXU6?tK79*wqB0h?Z{UIAxm~pvD4!xPZt-11xm|1izU~;6g3mg%hE(d6^Y|YU@}?B5 zmR0Xi+1j)CAF}*)>`h-Qt(@N&iU_^~-kbNXff_ncB^IBtSRem^GS^_Eg>1C}`w>ZC zgRgs&KB@Ok+w});=8f_$+3S(0=1N~wGet)1K8BsXFMNV2PbWNqsBQPJ`MpY9IQ8>e z9W8|AOy_v|j(0P{6jgs$_Qa{4d@yjAG&A&Fi7DT;cGP5K1oxH~>--)pds2l3%cj+C z;2vp>KgOC`v$y=Gtr>LbU$*9nhg*~LGp+Gve)6d|^Viq1%&=GP8vcu*iQVlXw6$fs z*8V{~LlBxT?IH^+7ai1{nOZxqIyQG-?pHa9K=_T%t75|B($&q_9rBW-7w$1RwGXuL z;m8TuuEFl!wO)7cCw>_l9;M6)iBH-na?;TaT(s?sHQxFQ&bKdpyW(Vg&cAUlyKvqD z<`U$(b}qC;zX_gbx3K35A}|(uAxit^H?68p1nX)iBA+@FY${@mEi}sT(b*^r0{5BnZn0B_LzA^Bt0L6WF1c@iiCO$=qs zVnFgG40Y&Ogpd#^Knr>U+c6dSa*eQdK39GiUc1kmtiZ?%Y(d;vd2e`9M$xnCbEfDm zJuz$U(^ESfvfK5XDXS&+!bB--s2(DzISYU#O&YT1?eyE1AsSxJeXsjnvFiS1qu z{24bNrX2DVbWu*BTl4=)w;+{ngbqM!o9uQQGF8giRLX5257dY0HiYQ5^SVN9#14RP#OY_rjNtvI1$qN0JxIjO|y({#~SLheJ()APieflW< zXgz%knW`zaz(KeJTx+1@-L4%9M1*gy$L5Uqo=%d22pRc~k@WuF=yZd)@d5>*_w=DfSMRLhrqVZ1lIFb0GV<`wrCtz6d`44b6k}4%l_qwrJ7n zJ>6}~@U^Y_AJjInt8EErTMXJ3hPLU^HoUJ8wlCOfAu)=c^(}3J>t|~5Cc=x;SIaS3 zOu&XDG! zcIKsFWgBNDIgWHO`yAtPeS7u>S%eN$`wP^(Tzg=Bye%hbn>F5cGzoNrl{cJq_Brr@ z^xX&A*qq2Cl{OotX)NBHm zk6o>~e)vXpZ2g!z#eU>~{V0&^Hb#A#=92zYQDP17$~1|`PKg@|5)UHE@JNQhyG7x1 z5jk)9C`0^`Ypk~@9ctEeX0-hTd4AF4Gm|Y-_DxB&5(a&5$l+-kq7QcUPqM@X=Twf< z-`%l$uEqssFL7IoGTdERgn7SupG`bpp{LWt(I=g3YxfT zqEUCmw~97qel+oHQg6tyZUOrI0C3Ru<83n!shXcuyXtHsp0J1jKmGE0X^epuZ6aYR;h1mG+*^3#Hw? zCV~^=tvIEc1>hN-)R{Qsk@SFOnLw4Bb;nag-M1%gT zkED%7k5dl`&yIG1gW`CyiX=(=mB8J4(}yi=bH>Pw>{S;?x706F6q%;fCAInPADwmZ126TJH|CKbQnpw5vm9l*J zsLl+Jw)Lu0AItc($59Auef9`<>p1B!$0(LZ!wz@0u5yU$mdHrP(l6WwEx{)#t57VVVF$>$V-a z(@)Eox##{Si$hrj{tsgdtysB0LzTOB^v8(V$ISPh}}02$^Va^tN0!$5zsl1>Vb(L*d`h7cn2Dh!)!{uG1%; z^^f7AB2Q!U6}~Enc^((eT7#Ngc={i2{nf+i8xN+BvmGym{yJD%+op92Ls{&_z7U(9 zWWK&m^$Zd&{62$+*5WI)2wDV{29tlEL7EH`?5PgjnDrHZRa+f<(V)9kw#O15md^w& z>^{)yjjN8_n{V+L8?O3Ci4ea`7%j(sWMaim7JZ6Nf;)3oC(o*pq4{*`%~($ z^x3*IGmfe6oo|+pXbncgOYw-Y3*c+|7$g>`BMsr5C?M!RBR6ObPU{eZ^mscwU(%4j z)A!u?J?7wwaEpl>HMWFH84C@i(vSH`u;#~~f;P#UbW*FXkt*i@DeUyLKJKuVaN1|6 zF7=6|XZb3vK^BKRBRRGMooqb}Oua$*^S4^SWXZ%kzj`b#u=zZFy z>HwoEAGI758;p7pc~ERmc3BQG2W{nwVV~j1(hY0$6JHgr6s3vnUD`7`?Wy(~!*Al> z&~q0i(1{f*E)(*Go!C>PtPpSNHB!$2P2@yrjgAkO#}y(MAgmOK`^ay;L%S>1J><6` zDdMZ5OfkIxD_#MX8;$%OXXo5c+N)3Y^3`mTv5DL9=P3(W0?}wL=KhUvdpx zvH4id;Zv1o4%%wB)zns>FQ0dD;e|!#m!91U^go~(|#x@q22A?`+Sj>NpeI_GS zqht>ZhBqna?2!*Yyi&(qoVKCEhi@3ykC7EzM0lk-z;E*T=4gmw;yZc z)0c3@pb$ttV%T&6=$<(e4}V<5YNcY|nu7U&y$6vW2Ep0>#=VkWt@l-~X$eMRIkWnnX z?kPn_rh(j)`F1w7%75bg{8Oj!Irx5JK%$@Td-Eb}cu%Bi_K2on()quH-GTwTg1*m$ z#+yDyOoJa;_WK*lX4ry4jMmS5v`Gru zU$$~iHzI#@+IwlbNk9DR)SU5i7g`t28LG$_V^>h_MODTyES`Escad^1rkz!-9Se^w zs#$utqhO~ZS@7qUaK|B~CWT11V+3PRF1K(4FJ8M(d?6vPBrkT{ub>!X*b>4YV2?$d z@n+%ce5ajwqe7Pc0CXwP3Ulh|Zc5d9S0b|=FeiVMC2ry5QdMyq61~3IjiLDfhkTRK~=vHLiAW3)h2}9vYKZfkv*5$@=^7 zD7gQ>jfo|pyANy5bk6+wjI;iHv);zU_ti1ka{tjWNowjIlj@-ljmca@a6B?5u?~!h z+dyN28Lf^#s6URa00n=Maw_XiSmm!zR{$%H%0d zT>^`DU1f1aeU86y+?3gXtEMbHR%SPgluMv{=QFl)rfhtQd$|&PzA(ik(|^H?`}juZ z4GwzB9gc4AG}2N=*U-sgB+Y-JR6CR-`x|^YHIDE6*n8v`CSaDT{f$TnT0p4nYS@l*Mv!SNTTTS&<+v*}@;OK*u@I6xe z>?(ED9R;!QuG^$FTH$?Ke4=)TePw$7A%43)aAp!`o-?7pXtde6M8r4ql0p>8U|PGDd|Qp6S0p0N zVBMTp4}E+kxbF*$#1=N@pbXDM#F{CqqUD)xu6pI;Zf`I0^FnE^GY^>_-2Zny)z7|M z=9dQ}2FaH79Jrt3EiKq>59%q_Glz@Pt<0cr_1tCU$`x+z8Yjj>$+cI4@#xcpGf7E+ z)CU&fo`+bxeH%Oqud?`nMM?1i-zG&aCi&*sLvs2{oIj3^ED*G3#hs0&8Kv7x% ze16O=lB)D4)%e)i*hQN)kh}Ew#0X|*;zaSi>%OrNJB>Xna!1kHLp1+B7d@B#SGlp@ zyPyZT?z*Rz;-0%!)^W?Ur6MXj^XpF2j*5RL97^23ar(iJ+V?lLednNcX{B?cURu?vefEfJJACu(&7Wr#qn+1~>mm&2OSF?p z4=qM3z3zMJHEwJxwX(VE_j9+(7W^P@&x#U`Y;Oa?=Pz@ z{fGOu@5)niU1as$VW0aWdQN|oo~PCJLK4nv)++SOYu5dko)r;4OV2UiyO7nci=N4* zYh{H*Zy$ZLp1r2h+egoesNa=+eap0&=#AFjaNYKe!@o~)ooh9HO7!>9+ka>10#|TT zw?|NNs8c`fao7rTAg`r?Hx-{C=%$y?Yvzh&QOD+rkX?y)-XPu~e~m}`E1vJ_ueDjH z^f$XXKpmZ!og0DA(2p5J&u`lA8;fEvLKP8Iez$V{Dbe%W_Iv7eZcLMl$|`Z&zH7-Q zlIi=gzV!SZwOrP-6-qfl^t{r3+gE4QYs$4F?HI|Z!lT)Cc{}%PlkzOeEp2b}z2o1f zE9H#DgUi}md{>9=SA1a+qiJh`4=j2=eA!yRuWWKC*%YHHA*H=KG6(x-iZx2zOYI9xnef8Rbm1gPd)QcHRcT^~($SbW`b@f0 zqG^KXAbn?AlR%%twI#|Y({*N)=$df;hhLaJf+v}vgcF!agFhbM`P1<4ZDl4M{veZ= z=v!H`ke%86Zr&Zk`W}+qVXSkOiJfNomJWcApJc|~XG_9;Jp5c@%JR2YJ7E3}@ zz1vDQR6l0`Kd_1`j?FoTUbL{4>CiyHYjq3GmM!d~tA$`G0G?nOK3wo#pZM4`STq&|;drAquuhC!1 z%g;SsVA8>oFQBZTWx(PF1@MVKL};@T{Fw}uti*u2MR!VUwN;b`wri{+pHabn3%zCv zx8lRO1*U#DM`T=Lp_Ubt1vKmyE1FLlrunHqU=(vW75P0&yyk*V#K^m|o^!gwnDM(llOpvSfel2j>s$FDwTE{7n62?-8N~ip#3dM|M+SypkitXUyrl0D}|p5 zNIqR;E`Mme%?k@50k6Ipj(7bnivL;1a}H3t!>j* zEWQ=C53Rpb1O@&s8yJTN^)p)*yWezL$W9jk=qBI?l2t4Sp+p4W0x~4+T$F zEN%^Zt?cJBbUezbb%TAJI<=eE5jb$N)8(W2Qmy*<3pk z9>8Yk^!NNq7PFWW^U0Ii-eO?f(n-tw|};A+%|d>9oN%PeMm z75Ryg55B#ZfEdH}6Q=%`SWtjbU(QEc$687Z@S6*S-(28y&eS8BE9o(UGX+I*B|%y6 z0M5d^xdcx$|4bC+VuR69IH7Q8mWp&v`dk{n?o$&wjlZeGn-ovA1{gs^82xoH>)4n zYR0igwNoK6zVV;d{hqkH;8P!#iu{?L!?~Wrd*>(aj&+b9qZBx*Z$bun)rjK+OZ_D2 zu_Jw?zV&_hs_n5g6nii~t{kxkx?W1`fyK~QwK*-{*(yDj!ola7EKrSc8}NU4@<=Ic zlyVJv&c+)>(DV&yiAty>>u%0(HkfCV_VXTnUuT|+?TPO zCpwI}m$ZdS**=Nl8YDet*# zHLt{bpKnPxO=y0{VLyC%t#|FsQ3*}-`v`uUH{y4^djBMTH|@mlkqP_g`EB#8=3(^w zO}|$)S!mRI)k$>EykObQW#?4SBe%`GpRaPq{%$|$312r?Ed6eX{oP)_A6r`aqvKZ> z>*JFy8N|Ch?i;Q+fyNIRDv;xgyD-T#M2Ip)3sK0e0q+CYAs|5mwRDho{(a}1i94)< zD7`;KkOnouU%5rYo43Sz=iexyHtn#Zew!MLq)GMVmF=O9D6HzsUpdR0D`StqR*Kco z{6*{~7jLeQJpzwV)b&vju2EfapAf%LUE;X(GJ2vF)@i!?MeK3qiCanpNc4H#MK#j~ z`L}s9KRyy#bs>dvG@mQDPzh9@_yv~D3bmvG`r;mGHiY@XnXiC^ISSIMk& zrCb(YVXh}DQm5)4A# zxbif6ydjo%o()T)Hydw<9{k{50%5)p#6?K2}!`r`9P(xFE;Gx>;>jW=x8$1ec}lzTMWY~X8NX6mok zu$#u^lwO0jyZnAra0PFHp7xEl9$6=xvlcO@Sr=fjOPL9Sof!^Rk~?HH<)bp?wTvps8!}qfzr;+dQ%0LMjv6gp)DzeE z`E$@f+28w}8+r36hV1CWxuRedNjA!4#+DG22 z)Jn7v2;Wweype~@eWQsgMt$9L&`gz^J|oEstt@ILo-8|8uxFZTeWEAcMVwBU@vZxd zVd?b_-~G%H*TeQHvQ7E@wH}W6(4ARyP(C&qBhfS({zAMLM&VRh@SBO>?V8j|3P-2MFgRaxT0y&}ZOJxWwYqLq4xOkl6K_M+Gz zfcpWV@78bqzI?L%WhPbY14&|jYX#Y)rq+@)LjJQr-RMb3og;JBHS^mQM4s?=9gWuK zZmgD&{oDAF)njYBJnG2%(yE;gtBw!bS^Y)$E#%QR(&E}0FkVKqBF^!b=pL@)9b_>< zl;UZ-hDy=(Qfre2c5*z|-78M9Ba)7XbbH%;8g^SXMSrS#cDWj{&WO}R#D3Ikvt#VO)Q7#mkzG)=MZuOJLFy7xqYdS(7{W8n2WPRF%7BgKV*mkq`j zbCaFt9LdlejyX7a#^lSBexE9RyqK5um1Cq2GVobH2CEG|uZ)r2P2gcOOprcC+)YeM zg7kqMpE(KAdvD;gGC|6Z2`v#`N-*hWCY0z>5={D03H)Kq7%lvXu@*RAzzkD%#Qy9& zc3#^^bu}08lA5>4zk(a&t+%wowpP*-aPh$^B@U0~C=ba?o z@wz<62`YQWZnVb=SmXb#>;4J4zbS98a{m-$4&{Dg*Zt%4TrHj(M$aYtuU|Y$*B99@ zlZ=q!zxsAfbjrS@_fq`wJLTL%6r+95uXL$OTW!@Awd{fg%jSRV&PwId()T_ZU+d4+ zM>0R{3-J4SM&jDFGKcl<%;K+6ZDM=Zd`26oT>$|q$9Q`-p8wEAS#Y73Dk}<_0Wz|*5E-c@bf6a zFU07KfAX3yTZQ?>(1aDG(2)a>EgXC*0D1OQDpmo zeP`xGM3mU7XCN90b|dif_U^a~TIHypPcXHYECI2p&pYkgLlP@pdM!Jy=ghF?GK#)# zTpoKkt|skRbS+Lsb4Eeu{h67p-=A!nQl`cSsX8@Sz@c}v%>tIU5PT~R?z-chKksAWC-u7J1^*K${}I`NedT9&U!V7(uk5e7uMPTuRzhFdIo;PkejhTd zzwUY6*9R4m?b%oU*WK4YE>t8F&1#kxDta$a)ED-l=zzrFdDe?0tV-4g$sYdindn;U~in#rRU z(R6mi-ktk@X~)h#o6ACv^X^3qC?S2?86sr7eJ5r?H>u}<>(_=DU@NUs(KX1PZC1U8 z<8sL3x~Pugb=ZH!+JM4nR{LI_V$QF~H@@7L8B<#yIFGbGNVC@Z>GI3c#bY^O^Q+^z zRP7Uu>MJ(|a~8B}iqC2rqN`J|$M-=DnKrv9{#C0+(2`Ck+V)Ugse&W?_{u(XJ^Wk3 z8F_eBqcO2+J@2PyBaBf?4jpNQ54oLU-9{p+tZcuZ*C81zypFjJ zs~zNjPQ^t{;bilx+(LnDcQ0|5h1vNB!R24)!{6;@w@#iH7cp98Lnli8^&Iw+4!?9( zXz@JWa9`z^D*H&&Tw7FEq{{&0@mtrtGM#E8{l2&SmG^#k4!)yXk;VPygB=u| zN2g#;(VwfH_|Y|-S+3MGAAh_Mo8zZwQbuep&P4{R2>LrDM~e=gv+G+leJi6L8r$+; zIN#{YvW~jKn0Cl?N8s0&v(qs$cTCR4L(sXzQ8YFX zg-=-3tX)G|nyJ-Kk18-VKNbtKewfBhMP;f9s^v--bu-#VGf- zB7bU(AiKY0WD^c|^LWmP7+!WCK@DNd zUtX^TiMvZs3>u)d0iMS@TA*({ z|E02?Vi#QXsb5~(_*9v1om>sGbhx2{)S@#Muk@fLK5nO^ou+%NLD6*cJdc4pt{iBsqvt?g`^xu5Jqn^n5g zJz=@hh@(Jf(jBci?A|?Tq+rH7clPWd51rT}@_9?XIplp}RU^vzE46Apq!1;zD9*f8 z;coXc&*lnBcyhecq8v;)5|n`da2-|qC~8$&HydG8p_2+9tnM4ughl3Ddg2hyzaYar<)y9|nH;rj@B(Sfxhh2w>8U zK^loh5$WeLd7MYCKRC`POGpOjvYlkyy~dV;V&t?%3f~kfFC4L(1MAv;)F}HtC*`2? z^>)wjLh39AhFZuNp$i`C<1)9fk_7q;G>>Cz`aZWY_gVVoVBhDSqC88Lyg9A3z#J&R zRfyjb%JFB?>Sp-SiC>-rZ{LfDb!JZ3_* zvElQSU^l%gW?mOAwjcsX&r|%_jh;g9GnmVgf9oTM4EFkHKUH=+YGcRKn;+s$zrX9v z))s}{(v%=Pa^}CzK))(J)Q4&1D6i!4CFMX!a9pDdVNAu{1jh~W)1&zGo%re9JJ_L+ z$DS6ED$eseigU)p8)7IT(fL}`X#aUGnt2g`Zx_zK%Vw8xw}J&1Y&8rvTmAk;!cQ{M zY{EW}4-o9?QYMZtifKP;f(`XwXL@t5xNL z*?pb}V~vU zDb7RJl*wpvpSo&Q4P$@{YgE8gOPQ=0h;WC81pE~gGiG?zoG7PdP4vRIVzd3^>a4?v zSXt9>c9}Ocw~QCzMfm)8^4wGfMPA@k_y94gz?#;Mx>ZXUs5MFs~V>N7c$17vA0~=E0zSq|8@qMu*^MMi=}y2f=A5VnwBE}fe8xXH*d&U}0j~a0daVwR(j2_1}#ol6%s$7wnRIV7k&NKQH^sAp0bMf`c&x#MMn*@E!yI1+} z!P-EN+*`z<>$Ag=X+_JBU9u}56vZ(R$4;}gBbTe0r3`V)SL>PoU)@NzQGKT{BNig|>Ir;Q5HEzr-CfLfbxyS@wp$R~4)!&tT3=85MME zZc#?dWW+p@m7M=1GD{H;IF)X>a+S96LbxYOIrK(QB zOUS410l#?v4UBM^NjM~0ru_>T@+7kQr@?xt*B)n(*Tnx8JfMo;$AlrE+2j0n<_+UZ zl<~yBRnqJE_DD5l{I$$V``9C-hf8h<#(el6=_Xjs(;3RNMX@H5*MJ;t@@ei<=3O>n zO{+q-?>@MXyX@G7(z&(psZ8N~>OO3$&Q+DN$&{Gs0H0^9w$={8+?`><`IO%P)BPi446N_H5sU8ofW0pbbXWbCHIzTYq|s|PmBC`E^%G(w0=|853H|~RWrSKOuFZq%?K!J%b!+qFCz0f?psI`!vJILx#gRU+* zvzpe#BfhhPQ7JjUijh_aufXhfhE}NKW1?_BPVa-aXz_K@{LNGBa2bu1QxnlWeKh8s zxrx8O#kkd}h*zsGUSDm5y)nH=ANFb=3BxiqwENJyg?Vf5+v$FoVoy}L5JAKF3$Y>_ zps5DXMewtQksxX}Bf%4-NIoeA_b&ujml*f7ULn|O6E(#i=hBpt)w<#i)^0tMU(hP$ zD-~{dnW6=-30|b}r`WqPmQLOSUW5~h)xEPIO~uvAF#=?Vk@HH-s)T1hMb{`PmI2gV zf%8xn1fUTn$g5HJ`K)mHY=S*|+OYrJ$#lD_41(eo__T@AK8%0zu!NU<>$_lJ(kA&F zq%%0P+M#YJUY@C6)B2Ol4T_0Gb7Dg@Df>H*dOOZ<2=)rFjk@%@0d`h5J2%Bsyj{$! zxIFLUipj9g&!f^Je}jy5kI2g%t>r|kq~a?t>uo$ z#Qwiyb?G0R4FGFCjRLr{7KXLSn-Ag>sDV9>$X45EFgIQ$IsVrpyUqL(8-Ld zz&UGF%Gi?ihzfu$v|NRJ`YVb%y-P~ZZsM9V_UtWVTX<4ARBxX3E33`x%d?5vi9tZf*M*Kq!R~ZhT0^Sg}vvM)ON$E zR8!jCG&y4Kr7Vh>+cjq>aB#&BGS9VPqRUUYUWGndU<7*eSsu|_$azZ=da4vjsf0fF zAqW~<$QrF_LzvKgI!g22k-O8TwIlPQIQQ%|y3S?HakEF=sYpUb*d#>G>$)A8?>@VX zX>lcQu*M&4e+l?XvWQEcCEPWHMp6++iu!YpP`jZ<;5Fof+>y^;Ac&Nq5%+&{(2)Ei z&6@bYr@U@{2s6|q&7d@ggXV=ab&$oRn+a{+MHSs)x}T(bhGhr(n#B&0Nw*s!opXKZ1peMsX7Ako2Vle3pw4i+B|o7#9~Y8rsu#xUSD#4P_4BbTtN9m zaMgK?r=^uCXz)01B5vp=lc>IG=(T#5db{<^>dnZ9c{`NxEV|pK@IXPKn3o(<;vzat zoPn}zRqJaO*c$PTk65fp0S}++6`xD+A;nV4kTJB-oeVi#^2qs z*5VvZ$B|#&Qyf|~)^~|XqPomG-2mSMe1`GF6&Fgqe|=Bxect=j`*K7x zpFrMp*63)U+dR_N;G^5Tt)810$H;Nbi%&^2idiq-Dc5k9c&EfuG|VQOsryfVW^}Xh z?`_h^AJV2fjRI#t(G!S$k>QJi`WRy317V8pgT_3fhr|-;T79`ys}xvnnbE^ zewlgEF4BGMxU}2SIcx#$`FhoNOA!}uK$aD6D|4r}$DWijy4d6O;-<%^3_`X&!YJD< zgg4IQ1DmMAMGqv8=2t1)QAmugAt|1uU$Nwg?mn}fnWdq%B)&R^b$8Q_Md5~2ckWk< zcym&if!XxDCo>;fOZQvwDsQy{|?Uyia?U{>W_f>r02Rys|*Esav4m zZmG_}eJnAzV2XVfa?K#`#0J(FvF9a78>nk>{TGm>x-m2c_%3I;LSNd+yoER{PjRM* zALx#hMRvR<-Idn+cSX7wJ#tDj(CI&QUTZWolj_};KR z)Q{EZU!+Ggj@Gf!%bOGXWU^=S-8XJ@zX3ZbX&uBoTHtGl|C!{o)~WlT8j`IlWs=LD zj?8q5u54uFQxf7X=gZ^3zr=9B4O^)QSCy}LoLfK{AWwl;LF9jLsyA%}SG28IU#b={ zVL2mZWhWfq>FflSAs*e|uFrWIT!$0&L3mAE(TZZD*{xP;6P1?~4!liO041*$?i3OO zE%4ZFs7Y`l)nb~@V-D9>?@TO2MwryLdx^_j%qCG*mwo3S)=^bX4avo?@uBFipy2~2 zTWa;kAp`FY8`00bt|!w90ugCef1&Z~`&yPl12k3}TEa+URdsk9vW$ottLCHE5et5W zc1Fak=vVUY2pS$)LART*Eb7Nyr_Wv9XCwzdq`%7UWJ=7GS7D^F0WzVqqs`rC%(#GD zniR>RhaQBqQ&Eh5z!2n3%sMPq`pMq8YmqlJ7sK$&3AXv)$#d~7Dyks5&qf0_%4F(K z)f?&Lr5tLrDwEn)7=ngL9k7)bZkU+gDDkeUt#bRIVbzWM)tPvkTulv`C=oFvS5q^r z>8Aq}N%W&;zFVo*=(K7bamn8L$Z?dZFX?dPxPcS${ccBnc~{>JL2G%Pn9EGWA)(KN zLpD%b)!`joZ6i_Fvrdeym)laDJ+(cqoU9D2O}#~$8-19jx13jYZMwuwdvOy;>$qVe z*-)VOfHhm*g`uLh5j64Ru8|hEa7HC_JdHdN2e}gYQ5<;^O4PMxKH)opQEEfaLoF~9 zdP+}ZPb`93;3U*-M~og?b84kXSCJuY(MFf>8@00PJXu1?p2nG;hMYsbG8}N>9FZQy zs)4z2jSrEc3(*8*LNZ9|d$|^tS zS0@i`w3>LxAbpY*H42}gY|M6i93_seSVI-xsU9lTHw89kyJBQ6_^n&a zk(8gc3RxqS$#sVb>IhF4w(C#cl?!$^N^>{C6U=}Q&cA-KKY3OS&Nll5$ZA|*<#4$C@@RI2#UOKXO<;XmX zX~8S8c6jTGo(z0zs8A{=PjwjCfpe){P}MxK3vfK zlI0_W&tGM~bP0R}=TT2(6TMDmO3B!g1+Q34$>=xPW><#rPyb;P0)>Tlgf$UL+6k&4 z+-S1aY#_)5425BLQ6|`PO zfsd;#=0LHUe{mKX8BWMi$55_k*#n-|xohG!J85#4teJcAyK`25G3Qkwzne|u% z<{V6f#_Y&JkE)HKTxt3|)iWgREn7u0oj$t`F`+8vczU8elUw$HyeG+mZ-9$z5#wn= zEq^_-7*WbmP0W-cd@~G88(B=>Hdf32?-E~qb_UIvs7fL~jU#$D1ym;V)URP+QBadb zVKXcWO0p^R3x zSQKiok6%1sQRs80YQJRdzz$>QX_uGp|0&E%dC9xzD`m|jJS?6Q&O$yf`b%dcpBtSQ z;cork)FVRYlYRfZVno~ByL_sm0rAoBSc?5`wv|#Q5|R*npZ?qLu}6ZXOgB_3x__F3 zMLulqK4}Gnf4gQq^NkZn9H%yavF$|tv4#fnpgHHeSkrRw-<6BciCP|xPY_sbf;*%E z1fNLyzx0T2;->D+ST|KQvpwyV^i%1kiF+r;J-6;T)$`xak$7d_D>6U0VE&R3cblQt z6M1E3x5r6(J#Y}jE4zf~j<{N*ho@YD#4$IB9J4OJ>eorwIZ#+p8fZW~&QQjB^duu! z3gT)I!Bh{s&6`g{YWox8fNu}+)OuU-kKB0NdJv@|&?MBk9yBK~u8)2Q)lJ?Qs zq-KUU=)OWmq^LV0cV0|#4rKCRM$|Lh^a$pAW5N;7uSyvUasU7${CLsq{%SU($##GF zJ4EpgV3y~I)q`&KXDqFxZ5}an*z*E}M3z_w3s#FXf;SG)~=YAhn<8Jh06FrZKyQ2PIQe9M~tvb5uqVspoC!!RU zEjcgdVD@XGUUjcS4JH0P_-3D2r_bB^4Cwwd(64a%&2MuYW=c8&4w*_~NnZ_~%x$wp ztyIcf*@;3)ekGsh@f)MJEimd;JD!34X^h}o z$_ndl;Wj$imz?LEBqMEC=o4-N--YC($Nv2c-F=deCK2!H*YqLD5jqw~Qm|O$boTzK zmsA%lE&#MAmOw&E>%5ov<`8z1sPU0FV)7Irs-f~}j%*^o^<(e00XHI&fxP13*|DZ# zrR)v*|2IpJeB(~P;DuJBbM@sPq}x#H0mp{hkjgxmH)zQJySzc#fBg90^9Fr<_x~nu zP|1C2D$j1uRm#4^&J?pRz4Bn@C9A1OL)n*LuMMMoOYq`SyIWL>GJNj&0_9zT&k19t z%5^L77nSRHV;Me8eL-)f|53XRe+Ryh@q*itBv!=RRot^Nt5NdoOK`Zz%cS{{rUbw^ zeR}8Am^ac-OLW0?GxjW1S|jTz=U=F#=-vd|ocDDLfB977{zL)ALyndg5AMwsQwiNXRQD3=WVdv`n>Idy{QZ%un zKlRGP8*#~q58MM0o2QPsa!(v#&D?*@KZ87ZH_5kT;P^f8r_x7sgoW_lTKa`ISTuL{Xmh{^b>=Xrg%jwoa(x<)cBN%X3QkuF5K%xgSs-HHt6RJ+nX3RMx6iO9Dp z(Nsh$YZRjAbh+8C^p`F->h zYpYjL93Xj)14G5vw8tGJ*^b+4Lw+GAut_vevTzNu^4o4o-eUB8J`b;QC(VF6=|r5t z)RZJ}Pdb(A5AK}yd%Cbs<_t`kF)qv)HBR_*UtSkhIY)T&H11jDoRY)BrBCQn#?;Yx>1RLFZ@`xuMkap91S+b_G zIA7xcX`g@o%hvw$=>)dfZX%;Ve{gX9QIn!SxYKCsM-GnrNX4C<#rgMYMjpg{Q}!}# zHNra)cL{441Zp^9_^AgWK*rp+XVaNe?IG7;;)fNmXvx$8Qp1ROf7sz%a8hGtje(-p zyCkR4-BLAbL>%<(vE|e1#3&e1mx8Pm>4y?rIjD&tRTP?jkTdh}`$x{Xm3v*3r(Spj zH(aEF&YMvx(V!6xys z>ATYOrSa^zG}I88%|lYScTLh3(25=Vq!l+*$-5}&FPBfF`$RW(l8-P3VJk@sOZun; z7h#ViEl$DZdd|B8Ud2Od`WJlja39n|oYSpJA1Gm-;E2Wl#7*nJVYWW5t$#^C|Jc(5 z^dBh|f=WXbGcsORA`h8En|;6b%!tMRK%}sU5e%c3iPfZ}TWq@-hpJKOl_Fii?C1pC zZ}(yL*IWHdl_8(oDH4PSM?~(n#@lWZbn2n34aN*du3Et1P{IIa+;qDCUEgW%0mZv+ z&mjBJgPxYu%h|a%n&|JLxw=ukVD~RIbXMG+aRad_bQ;8=IB)K-Bl{~~qfv#h8AM`= zvC+!#C!d?%qSg|3FP&nUrTl?!hrY`Ds_VC$^Q46lE|nvmC9ZywPr9R|6DP09y)L1+ zT{(Q^zB-aKM!JMnzfz|(C=zWp1;HM-b>&Tq(WAD*hLy^HayYh#GzQYXGP~*5bc)q1 zlAgqX=aOawZFpXi=I3WB&gDY6LT;DnENArH)W8)OlfSIkQLO(+t(4@JnPP0UB(a>T zr+gufQ{??GNiLuQF~d*nu)PJDCoIak0~x3qq*-L|i1>zXIVukTTlq#vG;eV+SF2?H z8~;e0BkD0lT8E`Y3N}q7tXHyf~qh22I~*u~mb^aQ%g=)k2*Ke}C7ttC~b ztqkKQdc(Vqv-ZITeYnR8FUgf=1}K zVWG2JH>re+*TDBBjp5b8U#*8GfaGDcoh|ChQBNesNbF;bRD=ew!`#z!WAp zUJJXwzO@k-sI@esZBB6)$BJ``IdF$F?h7m0Bdx2zD=>WDId3d(pq%>F^8B0I4pN5L z`bw#4aaWF5>*0k;ir^zTO|XS4?wF~*m(bzwL8A=M8HrsK{qcV-jg#EL8vlC)v|`Tp z&(8-OB&y%TJ}`*myrXm3bZCN}v!uDZ0U9E@k1MI5 z*qanY*IAG&DaSCz#Faa4{?VLV46Y55bD+e3m!2f46wDj>dPG36!ubDx!TY$L=NO_z`;(hDsBtg$ib4 zQ3buhnbnA{^3AIPRYfehFW4NT=*r@R@EwW!k9qOT_XeV7kRN|RwCdMZqM}xRW){&R zRf8Q_-G@7c_nVacL@I_p_Y(!9bNb*Uyw+e@A-YpiM>Gz5c2NHHz~`*_!cx2X!s@M} zC6ZuQ^#*S$5Z^s_{J0mj06uI|6v%d#+67*XsKFiXL(6)(pXA1o$gBmqu-UFgymzCd zKT*9or=s75!7nfCIr(0anu%G~XL7|G_q<^Q`#Cq4tskf4%KXZd>}BuUO%^k6e0GBS zMtgU@CUN=~48Ky-pmX$L-Ycd(_VhuX4amyN^N_)%yImF7pt?g+1#28M$v)}H7ruMJ z@{ukKv}d}SSyRf8Dp>wDd^x18f`t_s2ZDh!&)7^2S zdw~kFV0S_JBRkIi{4EZ1WQ_y`ReN-f-ik9`8Ml|^mxnz-hY&k}`~nQyXfb`q*{itPXP@zVfj!i&5o|t8O@V>dP-rpF6b| z-m?c*O3+_95xG;r;S--9x)157x1e!{Z-E~bqk!+W%3?%z5b3T=;2uv?%z{Sc!wx~q zN5QunRkoq8<=Yg{vML}CDmPYJeQNN@s7v5(VG7ioFA4c@OiYPCVx=8{2 zOZ`>lI`dyDxuJDjuUZjCsihw+{nTNXWFaJ zjz@jiP|sxVUQrx<`TIB%!L$lY%mgA=zJ3E4`A~p?X%i&dG(p<&6&Cmb(p5{X+wlrSlPn7X%L*yh<6N$>Q}wdjCeTm zwLJWc0Xw4ZVE$+jAmNvo_wN^VfY7|T+lEAqt{e$D0lFg6#!Yw`8IIm$EJq}2VRDAJ z)0pIy`R0;6p{J|lr{{8B-A{eoxK92&^eeqh(T315qA%(SEO2jf4 z7OZ~qur&8*%uWbPVlg*9iKUqj?x0y)q*?Pc>p-85w*T81`_{{Ii@aB0p8QW~#;VeN zUYh5fw*TjO`jA-`S(Lo?g_n^dW0SeypI)_sxxBi-@9r4JlvHmwyFBiWo?#ms-5sbQ z-v}sQ->Go7DZ}hFPtz`2;6top!Zv3LeVT9%h(fO3XC8xh)L|vn`_0jwA~Orl)j)k> z2gLIU^}W^n^`~BSHghMh;L!bFI)^cP%z*QZhUW&uiU7-czZUYH5B?Mctrwq_jON|9RAl-*I~pfgn5%zfR^~j&p&(t zR%z4@_GhN-JIsAlqY=Wwl$`kx;0zgYRPZTYZ8r(4o3x;38=9iVuD6;`Q}toA`34ml zE-6oEEx(FfyS#upd`W$w)qtYM8Xt!2q-OXi{s>)sYS=7iS)`3eMPmhuIYEal<#MUm zOlu11Po#Q=<#jq#>11|gWLJ~61TkiIu1U@4ce;ASPUY3)H!Mn5TWxKMnQNzZ*|1`t z`_~Ib_!|`6qTh9VGi*jw6>q}nUKi-ef3thVK1W^(^w!^|>Qv2~gx#2LZf6CY>Tl_- zQAVkku(N?k{y+c88fB8&R9^mW53M<{qV@adz4}L$%3&2hw-LpP)w~H85gtPODE$WY zWBRqNF?y>yMsLHvb@=C0#~=&p{m443`9g9L$McMo+xx9IPJOBJ$JWMGr&l$cJ8|~h zso^&3UsJ-qJiWse%viF4C?a_Dz9HQF6^9DmqMiX#Ea={7KD{Ks)$bn0`E4xj0V-AS zX%gP*!dmHeZ5m-N_OQ0V*oO?#vYLPG>0JH+MU(jjupu303Xuz z!#?63PZeqCTx+ij+_s5;9dO^ucGOItSwWOTXU`4M;?fgu-9U7jrl^|wEeXO`7`nPK zsFR~%3#z*rP@_qt%Q45^_>N|v>xf6hzciK}V=ea-g7dD0~^|2jVHZ5z0 zutGgUcvL%8x&vn9l~PYf{ZGg!&;?nHwXn2YqR*?!V2jbxJZKi2*``4(B;SGhPs)LH z0jYOXJVA5`^-OOpE|uR%aM3$y$WsE(FL1BGvkMXX?Z3j%ZX*60*$NOJUPBoUfRm9a z0XYH=!A^E)Y7F8rVsLUX!I)Klb5%h9_SO0cvAADmtvnWV+wD`QS{gWiZ-z9WE;DLs z@t>&sO%SGb^yY>twF1v0M_|9X&M`RuW*g^|zA$>rOwuQEHQqxkzCwIo+Nsy+eHrQ|!4v$j7`Z}q zC$4$0AN4Oy$4RK-*geSQ($2tgYHf>2LVj-8`zDjlQokAhw&343H3Q!Wo}VnuJ$w6u zeLcKVyO~E;l9?%%!vv*N`FH>mC{iE6c-2zN{qNH`6QoVvljvxNeN07}+|)wUHU;N< zD~0_Q_BV~tPsN7TyNqN5w!*Idcn_@(wGdM*jrk^FWfN{o6%Pud5V@edw#PWLGX*!5 zbpFyWO8TV?zYvu2sHNsi5$r7t=if4nhp$rMu!w+n8^M*z5@C9^LK@NZ7kP)j%|WKq zx}_=LRdt;TM4t>R35MF+B0>_&PKN~B@g<*r%K4|p03QwNP;%*2{PKQcUgAG#705{f zd#UhUJkP}|!@)af+;6L6K0bJ*5BYiXW?^v$U`?x(^20jUgvQ8`$5@=b)m*lsErxE- zRx@nB-Do{lU&koneZ+Bs0)5>o!J_JaivAhO+B<1c#YU4*(4+$26*b5Yd$i)={!Pg5 zCrVvW@7&yEHhSgvj(Yz~+tqU0106+X)XXZ{s;$G6pzkw5`}*OOz*ip{gWHVSd(b+k z;no+B)>(va)tittqt1OxRDvfx``Pby2Vb9bhb&pNPeoU~@#MGSw|+6cz_-C{@dIYo zG${!0lmwAsbg8%dR+Es|qzK*OrBCjo-!@i*cHbkZY&-H2z*eVj-sov+GEj|hsio;p z>^`CuRc32i=P2P?D>K$U_7vnG)D42~&h8z|f{G3pvQAm0F9?ZNQ+Og@<%;(Qv67|86owkJBVASxFfSBfYbA!x*bC{o~iS`0_ za^?lfGLBd3V|eD(_x0Rmr3P8{FDp6lG10iO=19dunrTT>4ZDg6hdzuHZPxEpD?TL+ zM%01YXvCl%SVcLanJA3c9Bf|gBc6!cnk({Z9Q4-o85ANKvPLyGwsG_jm2xo7GYQ{_aeO5UQ)m)^tOe5{u#81)YH|F)ak>}Ak=|7$!l5xfV=)hxZC{vVRrfs{5QZJ4K>g5ry)XPWXtGr45z`tr-c59|agnMcCNt3CXgYkCL zbNDWXk@pR~#T(;@ACE4>_u%!0qd(Uqk_Pcw8#Gr;FuP&jg5$8iq5^svW4}s!1xgN^ zfn+hD&*c3@&&hs6K9m$iF!VpMpsG^qpTh}Yovb{(L4}c=l+#m&HVMkQ^rO}~uZD8s zqq<6W0re{_Y5ec<(-9MzJ^1%kzd!!bZS!Zv)*3b0PF|nun^T9s%!^kOTo2pLvnNV+ zb4QomJnHUdwsfG8!+zxF3Lj>w2afl2nAxqZ^aP*V7qZ7&JRM8f0zb4Vlp!i+6ZpPN zr5$w@I*_%gK$_F4wjR>ikw@;9y&<){$Rwep6P@* zf2I=jQW==v^u1eoy?a_kAouBx3l-F|U}4YkH&$N=(2C!!q}Fq4Yi7f$z=>~8IL;>Z zgvAz+>sBf4W!bR3E_90C2B6Dqv}s!oMU95;kC|X9y%O-W)@2+Mg5=T^KzU5m8#1oJ zY4uxCobKRjgE6l!A$&qP;QRwt6mK^tswnFPthVj(Y@(`8kvP3wk)+m)^R}P{j#_EQ zzW);5b_2HAe;XEzid=Jazin=utE56X_gaO8d^E40|3~M3S<^=M4Y)o?vqSwChi`re z2Lkuqb?!32QhR-_h+k!R0fr^L0Nx`XQ{Tjp4mIi#J7F0sunT41da7}IZvJ6vDe1G( zauVp*3Ta$KV4^MAy(PG`7^6kY_rMf7^%CfwNQ3Ebe{P!SAuL)fsWr{!-7jQ|7S-e; z2{sPi4s}lv-k(y#p%SOHT(&2}VtNQZAXr<1b0=YyiP7-Y+PMY^Bjoi=ZY$se>vAu3G8+%i5pkx-k@)?ia6j=&L9QLV-&@N3 zko=>XB<*4_YUd9YqovfnG@j{fdh7i&Ucs(aT4DF^vdT)Bb(2wqABQO;+N1-mCYvf@ zzMVn4QL?SdF&-@P=po*HL*EpyTFF3j6xF%9llafBKJi&v15rMliN83ysu8(=*@9Lf zObh8I9lq=IOZ39R@o%jj8eBiS(=6O-1um7}>~~atv*56py;uCj83ml3J#QFpe2~r- zR;Ixrdqq^_5J`UdVUZ2^xlU_RIQdFS*l4OwNzQ8b1=?d5*7IsJri>Ql}DQ->eX;2 z0@SNvvvmk?^ui5><*PN&a4Mn0rCt5_aM=na{G)$y*BWQLxgIcYQgR>pIO|6$WDI*n zIkqAB$hdmbpXR&)0FayEWL`qOuiRl=Hozm53GvhgZUHw35XQY;^h|()SRymwYI0Po(;E z*!?!LSHO;sakwpJqvjiGL(hrcBHpUBpQ%CgZ7F8R1{8C)-?ax@bmh~OD%UXv%F9Xj zjBaFIyEJa>k=qjyCjt(K?D80myj%cJ^hCeIiAtjqeWzz#C(D5XhEDJW32FcbQLBI= zf4&-;G4WxOe5e~wy~h(5VQaJ2fk(iKXf^bV`s0n%GcZhsXsL=?{4d#h3_p8h`IT(K zKlSJ1k8tHqO_5pX+oAYNO3_tRie=z|G~90TtZRX%CrKsxm^R98xK{KHP>A<&FJT`R zIh~*dX^Ll};Q@B1iQbi@7*ko!^o$xHSVQp$nhwzQu3Xk zb-K0Wv(!MD(8bd=9N;gI?wTT2k%f*g6aTjHkggcGKNw&=LY{QF^}K&Bht379Euq%p z-!>lE3z0F&8egj+Ygk;ps)2Z8%9~_AjJ&|e8oj$}ZWj~w5<7~%aSc9O%zBQk^u!K0^NRiH?78}(90LH6qp*|xk!Bg-PHkp7h}qe)vxz`@c0A6~8{bLik;?FyRaCXl9DFiE96Ho0gngWl_kG;h@yd9NlF zET8ss8$n#wx-8Y4_UB3C7KrlRqd9^5tIbUDjQRw8X_#; zxCA4^PP8HuyU_2Zatii#FfZ+F_Qt^%gzj2JR+c?zO@RK^seObb7M;^ip;f~bbU zw*J9vHxH~1j(GQs6)^}2D?@gW=nidMuH;d)67(cVD}1OPl9j>1wxjV|{qc-YtR52R z9uWq;nkJAP-YqLDkdHj~5BGn9ZS9filKTH#?Egrp|Lz?F-Ok@L$qn4$!|<O6bDEB#ET zfPK>y(i4L%!1MnO^}J_mh1LJKW~2Y%HrW==bY?JVq?#4F(Y`<&z=>T zG=|%mq)E0HUvCFS&whv6@30RxO07TGYdll1hn?u!!^NjF!oaJD{&CyC!d|XKrUiPV z`OjFLB;7rJa{t;)+683W%Z)gE(JZaNtdLq7mPKFr-bgl6oP+po%pW7FLhnAYVE>BD zlE$CDll|5~b6l?AR{z%c@vcmI`@z|k{?Eg+J@D80$EzwV&k4$i-wHj#e+%lb5mu>R zsr__Y-VNM+C$wyW0yz(u@Wndy4$?(H+xF|#LSOzhYx&BXFPVk#2u9F^Gstj+XcMy% zRooTu0XkHyv75Nsc&*UmbkuVh*JoROxFe77sJedYx4=Mlr<&-ww5rPA3sL-U|6r!I z5ajqnt2MkT^yFU|X|}F&v9YFe&dqlC*f+l*`V0XMBSO3o^WqmYm-XYp!5H{z;_O0a z++ECQ3*Js{dEhv15qzP}IXGV*=3AVyT^&4j{&US%;n7nsO7oKDl>L&>n}6}AW3O(O zdNxJLJ$?X5QyzQT=Urp_qUEtCdxb|&Dj!~1>1?47KjWvp|NYC*ymfN#2Yg+Oq_h{lXzyHJT5>=L^E4{5Zla(0;;#>+bM&7uL0o z3(nh#OsYI%0XL}`_@K=qO)c9jOur22rI>gA(WQ0T3NJnl+Y5Z1x~H(QMPWrOKppb2 z&Wz#BCq;dx@P`h?ge=ZiXnykY&~GQq;CxDM@`Yzxp!?J!^OrfT^~_bQS1YXTrUlgE z8DXi8QOB>sVu}FEAk)2ciV3+`L|AGJSWPoyo;B}q3I#1;35SC7A}ct|{Gb_mbHqEU zO0gVZ>)rM(W@*igVe(1o7gMslf*1d0{Oqk$$V|h9;Q84n&wN)=;^)lqpmp&~AgrT3 z)LT-B1~HFpUnFTNv8Q{Q!VFuzh;B;|K2Sa)*6iF4HL_@vJ=3pFEeZT;s>_dl znBe*`r4)q@TL@y`hVO%CTCt1WjFR8r!C-+z#>!+weS9fPe47F?EJOF+AGLEsd^mB) z+}1SFyA!vVlXNlkM3P}?1bRvw5Lvc1HH!PHflUiLF4?qTFA=e7Wh{GC=oYRZs+Y>h zPv;GWjS}}LbaJV5x9Rlcn+N`sIgrnHlA8I#ZI<1}%>=2ai?rV@ez=H7)6JTUKG8~7Zo%z(!-=OqQW3P$gQKMYQg zphG;v*Way^A>{98e-05Zte|tJUf;d80QM5_Cgz38Ymm@8ltqW=#5cB{O}+O1*_uJ6 z2hI7_2hD^n`qk0Cc4K9%(HtI7@b3wIA`oAT+8?b4%@^(k!o%;zi1%_m^^!XZeXK&4fH+nX#?}CH;gZ7Op1pr7w@;u7_T|}MBi9@ zGAQ1Xe_k{{)>nkF0o+b_ttcYHswz*Q+C9UU1n_?t7q5vg$fhW$Vg?>#i0B~BjaCB4 zljd9YzGqH)iswG=gEnJw3B|3B4huUbK| zLVcefY%R-f#oscEA2v`uK1)7dTs*JkJ~HCj)bZB%2~1z}=ykh_^|A0L5UaqKpbqv8 zwDo3c=fPrLzka+|_5D4{vb(-o_Av9eC-nj!%p2>(({v^g*Q!?M{Kafn7X<9)zxaRJ z(q1UFg#R_##v+$6`GxD8>KsVL#y*IAQ|Ab*UC}GePO)l+;%rf0%~|lx75X+$QI>5( zwHB&qDdp7NVIO8(a_sdO3-p3Zj$MD$VtkUmKf1#{l)gV=F%G8h_=~8gW7h{+jQ!|4 z{zlXHffi#g`i{R5^nHNEsG;uzXpUTMpPc2r$a@@X!FTA5atIDJ@Cqa!BmCautp|Rm z_78q9%P!B6-sEaq@k!@o=U7egxH0<naerSETkVA)+nBh zi=6{IZO+->xRrd)rhvOwAtPx8kQKq6nlc<*3F*g!^GYY|GSc}Cx{TWfD~x1;v5MMn z9dE89J4|q%!8GTNEIpH43XKAbNSI_;z7&Br@9hKjI&Wy#AdkB-FTR#H>+@R`(PrV# zn6bL{o=PqJrkqJ|>QEUZ#iCzVu7u9&2YtR;flO#$(%WUZ>d>CS{~?!ljqFsUD@InQ z9LVF0$`^OA=&+_f_E4l--Q9e4 zvW|DYx1!iiz7hSq#-=uI+!I7Uur!j&w`}TmKi!|K#9L8AVn@&@w#q)h*`tI&SuNLl_Jr|OS!^$S^RT_#KQL6tdxy;^;E8-q$r zOmJTIW4$iWC)8wm$gh6^V4+Nlx+HjhrNV6=!t^srcQ+gUm6w=(RaRrqft#SkNqyX6 zvn8IPpxp5IeqF?y9aiX!s(QKi7+Hc1Kx88ej%h`4 z%6IzkRJKg}G`mrXH3`9obY9?>`@o_laxKpB+XM25&D~vQ)>y{0!IF61YsZb3=E>~0 z0~>_!&A$k42rB?`tV;no`hU{t(VnJ6!_JAyDscychRP>3*X~1Qd}GYufYpi6~YHZkCUdiE_@}gE@p{ngIaTa5Ty1iG($bF zG;ObtMx9r8;h{S~tCH5d=`htO!m3~qyacL4E5>X@??3(D;>DOr{mx=Us62S0;IPs5 zPDjY!*v^X(5xhRMrzzH-+Chz#i!1AuKF>-tQ_XXb%l#@rP9998eMf=C7yh_LPN(bk_Cl3B^q zt4QtKDox)F)7MWqHvNk!z^X|d%&v8mmDy=P&KBTY%KnPFq{vSIKlLGJ5aHO_ALI4q z{_0e~qd;LDqERDqN$puUo2{$nGOzTV2Kg8xgxBe2!OARIoa@`Uzp1+ySBemiOyc$J zJ63{H!4~ORxkEt~W!5yy?y-NSP;3xde#r_OmT|(L3Ly=kcaph`iAtw|W|NrYWIQWd z#eIp*jdh@xe!$<-7<~v zW?@*O!)Ea8u3bPxI$-JSNC_-pwT^fBA}>tpxz|KIsiS99_(m5e zIRsCvlIE!?Gk#IIdK&sg_h! zgkpq64rQX+VepJ5%-3k)}l6sL>HtRSz0%$ zmhK60v{qkF@QXU)ZSz{lI(hvU$7C7+TW?6RM*Tqg1fOA8w^F^WD-2}iH7j+FsjS=n zGP^dFDq^f~(*3num2f^i!QHWT(H+=8&s_tD?1X2Re3Bj4#XZrQ>6Q{bTv0r% z>OM6D{(+xsY7G;D|46~QMIn8zjL4dyS8YKw<_$%#GAcpl(EyvMC??mb7xxbH>s8D7 z)x)Cwz!<}L%BibN0vFtO{Dw?|3F3Tbj2Hggp;+<>Gf4VneG})8XBXV!{2femBi?5F zUFA;t!D*o~;wLeWh}Q5==JkSArAi(pCHlFPW3$6jWG>Uz*J2{sBsHVBS>#ieWEuGU zU53PIHxzM26OPHVT#*gy<1Lx~Nf?)C73nsB#Uo%3g3ZmXRCcGFauQysYmdo-4@7r~ zYxVG3u;yKcID5U5I3M zwrWI1G! zN9sZQB-tdfl7SQtOOdd%DuK%pb4dG>KzI=xy!aWlZ*d2JCF$D^7k#1$T`_V&j;b83l)@8@2r&4IV%En$PY2X5MkH9A=2(UWzH zv!66dqGLOFJK)d4;PtSzp1Y4}HDx0ecNGpom(s`foA?_$kqLz~tgnLoET zlKdIM&%NpV+&Dktm+0J%R{smQzSEHC?PU7p{p&2vp!uxMrUaarBV`YzEm_tb_aVo= z1(F7Sd5`)>z6EeG-PdU(tMt!St0??AU($7Al!a5uY52d}tIqvyr>iQ_o5U{fIkwOq ziZ~;_#XL~Tyr5sH&gm0qM-GR;Lit`17og8m_qU7OpCp9|zmcR6!ahX7>3494V$H}G zzy-*#FXI-(Sk+N~7-^HMHRM_IBmG^GP0}05x9~d7L1u%;Bo4#6SAK4V3=QnHsx`Hw z-s*vZala%UzY1J!KOJCi*j0Umk}0}M@R$AjUbWN)QerBdqy*R2p~?YC;+oXmDQke8 zB*i0ubI6+5ivb;B5>_Pr#**tV6hnG0XbnRxW7eyRWc2w;rp(r6>N?Rf7x=-IN{QR_ z_hc;aTAs=dI&Af`bMmX<+YC&E*~C;n)2|8?{M!e6uPFRWYUe%rwR!Zi&MOtbvhTMt zT`ixsdhZ<@E!->Zhsk2uB| zzae^<76>+T*6$f0#ieLsaWKbPe@Ho}mT)lrA)h*39_6R{jEwYLBOgY+A7N$hpuk7O+ zi)uJan$Leu@{pyK!`f4tgjJfz2c$;vtYdCb9|ee>>6udE&&t>XD0=r8^(73_sOar7 zrIOjyWHr}}E2&0o={T!-3-kj@X8U2Cz3m?9@F?13&~e1hk~X9HyjMDbm~SM=arRyR z8`MhsT%!4gQ8z-~euU+SKIvlsqp`bF-|$K|>N~_Ryv#xlV*)Pqe_%}+Px_CI_r36l zazl!T*ZOYO9*}l8o0G>n{Q{__`ZS_Je&I~p9~!eKJmvdplmV;yoBI%hxk}^nujo{c zXFzH0^3bFd0*>I}scd6@x|bCfF+c1D-TG0;nI0I}d68xs$Wi0(7M5m-$P4op-~`Cv zd>ga8g5+3QNr>MGf2dE<@9g~Thhd-Oe9|0rHcGg$4fRf0V+s0Ift z98p!3Y`-dv@tXIiXWV>tV~AsQjxX}dylZ|y=3Om~5)3+(Iu*EL{$+3;D~jj9{x+4} z7Z7@Ah`Ww@{dbs2o!xAQ*CuJD;I;g~nb1kfJNfr3(Y5gGZ2qt@!uV;$_S1WCvR!X| zc<58a9mnAv*~XlKE*(+R;D9bM1+8>4 zxG~ooAqilQtAow=>@uvl`R|xAHB0c)pLWJ-{Eiuph}|{)aVk9uPSK}+Qvc8Bxa$J=1~UeMaGSy7TjDo-sR89IGY-Fw#XaO$ox8M21z(Kyc4DdKZ%+X zHY00la*-X_yvt`#I(y;@rXY?1S}Jh(Jy9=jRp_9nNSsy<=^Q+Cxf#4TV4|76Wn@XxFTvU53V3sT z+v|am?1W!T`K`g`?q><&M?3{S9CNcY(*1e}y8xCy{7l|Y^2rlvjY!L#eNRu6u@1>& zyxI*oI}N_(683<2v+ek-WIt^U8rJ-Zc8P2by+Hpn`9XeA`56&a!RBA@wL|Bt&jr*s z-&=E^7Z7Q?kb_p!;34BL=VoM-_}O3=t&bMZAG*O$zVm|WFn4}{{+hi&w!?q`(cP0$wPwzojU4YmW8z$vN8&S)DyuPaeL>t zXJy>^oMu5BZm@ao4$jzfyWl&oNyy4xfncyeH&#Uji3hSf&BFvm% zW3Pnn?zP0HOPT&kS=(H-;0`olehEWBD3?tErR$re0dnzw7;sBLF*~FjvKqo(5MFpE_UV+W;Px`192HXU&$wkUMH=-n8TAMW~?j zAT1^Qr$abf)ON#%nsk&?j_j`{>3pwfH*xpb%0yqdybv+6$T*O7TB81y!({!Ygh~3< zO_)KlC25o7ouGTqB7gTJyMD+J^~+!AHEm3KO`I=umYomk(Tu>y5AK%A2RPqMF}df@ z%QT@2cM$LY_bpgo4@vV5nC|hZA9;&G7l^*tkxN~&GU&q~PpFiAi|2{<*T+R`gZMc+ zf$SpE^U7h;{zzPMb)&rJ^2jtZoNXlS7R>_mF;>|FnFC=*ps_bL0uLeb^1f|D9AVy& zuF*>MWYv&HYmR+zw7?;Gw0>`Vc`Rvw)zEP2fXl587bWVJ`hOq#*5^34`RukY>rbEf z;?#+A4Hu7${epX*4YNK6Ka%GyVZwU#2#K#S&ritPxpKqok*?7z588aWI%RkcLBfm- z#OoQDr6V)RM|lTDDeae`?Bgqo8(ul`J9tOU1f`(gDdKoG?6{^1)ZX@4{Sz6oqEOWF zFU6?i$Hl1Q0f-Bv{x8PfJs_$&?;k&B&YU?j2nvk~6c#cHN=oLW zSWnt;nK^=5=6b>HH24{w0Py`xqv~VLaNw->8(rMjCMFmFj5}E=U zmWE22hPqtDGJmi4IWsb~`#itzA28?o`Fzgj^8UQ9uQ&A6BPja%P#5w@CaHDAFB0cV zoE~w4#Mv2!sMWM5C=#e)*d|1jeXgY^{a0dfCGJ;OhTuwk;0jq+-H}@vNgu*oTr{t_ zcmM32#XytxuV?UBnH79G>z6B_FFn*{7?jQuXVJTh@@C9$tX9L2#{`2eoo(M{{R6N< zM9dT6$p&CUryA613#`-A;td6!5A?hNGo46FQ2X=PeJQ}A|jAO13<488tb0d$oXNSLoxO|Ru28O8g;rb@XnyV^8 z;rZlKtNB&l0lHLh(!*>`FCy~&!Z5w2PoCjHy4zn3q{Nrd%3)gtLwH9b{O;6{{D&D- zIBv3YhKPw+bd*FIzF?wNrk*ckP^O?_H^}?bvZJ z$B4cgJ`r-|-_L|x%nOU3uDH9VE}Y&t-7B<+WMkF;97XJkL`J*&|NpQ*7^1>GAM ze3qUPd`9|}-Y3&XC}+g$nJk!fev2N_@Zh)%iu$1WNPKLf9Xp`B(q*KylYzB1vWXz{lb6e6?)eY??>*(m(hzl5pybe=) zc_DO#uw^2eC{QkXGpv&#B-IuDrSF}LGV3C z5L}gi6oHM4=j#;-Imm zJso@oXPLpEhNX zMm}Z|FrV8ZnV7@W_i_Yf(C(Ql$LcCkl+tP;w!Pt@zbkK>;_xN^jnRw6H*I4eu{?B} z+Gm5`8_hyJd|M#>6cxdb2Tv@SI{DW#QKZ=huFdcuxZ6Pgbjkhmg};5tw#`72O|a|W z^P;nD&JBO!$b@4n*8VXxEItqU=MDHMReh$sWFrpo3-!MajI#HpN z+3%o**W2MM8SrAku6^$JTLL>(%Uqd9AwA(?7qThCPK^B=9DT#xlgenDW+`&BGwsxu z%8`(M^q%#n7Bep3F{2mM+If>~!v(g=-f5cmOw=<~x-lv4wLa!q+l<2FHshEv>=TU> zPP$gNSFf?!hSum1*Dw^Q1Z!)MH$H3e`E)k*gyo3RqfG18{LPN19sd6PZY#ye z$a`7&VgK*h`?9{9IC|Dbc~4EONvexBPpd|cen~yr-Y~uc-(NH+*AS*t!JBeD_1LfD zQYqqBUcnSgtYN@C03!ghlcF0_YO&_%?YcZZ1Kdy?Y#9wtt*4o@PD~y{D6Ls1*G(#g zEpI_&RCDvB3Lct|h#_27%YsE&&Fg+=(BOQ~5H_mi3$f*Q6#~wNTu6Nq8a)4)Vjr!b zeHG)0af<>*MQS?}K0_&cJ<1&#MKiITY4{!WHSHe?ZB+1L&95p{P`OT2Qn_CHpTXCO zUizQ^)peqr{^$P?{5;W6|MS1PPSn)@{42rF6J7N`AACJm2P=vXcwn`{*NN`>Yk0~3yn}j~t|Gd6HokqtN>7dm&SXf({WMkuBKVL8Ao~n6M9OR8K81QQ z|ADbDU-Ab?+yA&}s?ZEcGcZHg;5ev&e8N=<7G5xvw^{D3i{D{gID;$;l_EW{vG<9x zS-*J#`kNIqBH%|0n-{D#m6jY|GJo^#3RngaEezRRsm<3oq4c*`wgMH@2~Qf=wc(-> z@^|3LT^>V;z%0&gh*)V&T$8M~nUWj@X4}&&kkt+}NBV3c>vIV}$oW536= zQ? zZ(ck#d@=l!r*341+plw7H>ZN!@=dEg4ik)Vu-Mf2|L6c0u2LeK&NPQb}iscL-Vh?XSba0Up`@ zy0NK};a5c*t}6YAao2Xhq=0nuF{vB6(xf`7^zvJgo-U zrLZSMCU-rN-yWMiP3gyJ&SSZRvz-Za*VGKTH_Mr1dT%tW>|^c99%9!=s&kPrdIvA0W$?fzt zBG>z&93Z01NU)fDw7tN?WBQ|*WLBMR<~y}Dn$IhiZA+o05vuxA|6q-qaEb&l4OU? zClfL3>2ZiIiG4HC{`h4?7G%c?iS|b?f|ff1d|5J3H}t%DJ$8l||4xA`ZpVTR;MHSD zk4W)D(9FD>88n zIG3_XIKiNC69T=O8$SaQ{P+B%36Zo$kc67i>(dm zi>=`qpjA`D2jW_I_*nR@Ua4f{zPA>Q2&QbxwFYq03LRWLbxHpPA1yX*`@`a?=bl_V z$~u|&)0Bv4!f!bPZpsXQmxhtwwuf&^2#nj}@ai`fhnE`{hnwE=f;UIBWuejGg+{)U zsdD(3#pUI{hsJCVtPA*S$6vp_&@t|PYpGiZk2MUu!4!z3>mu(w!b&t?k6<${XS~hS zdu%=dyA%BW&36X4J39NNq{rp*>Ksu0Fth%Rj((7UvRfk`yUXja`lEV&W-|_D%*g!r zZ%SI&Of7L(pTHR~G0*X8Dxq~iy7KnGo}YX7GbQUCaMmC}Uw=x{bS47DTxqRpun1m5 zxS{IJ!gS)uuk$cD#3$;cyiTSE9>xP0x5vy(Kys5u2PhQVI)+xNUbj!>g#{LI5Gxb+ z*RRT%g3PY@`L+p1l1E~`*7RXEJB!ab#5;0aTfWffDN7q|&R0*US4xR}^gA)J=05YD zlGVsCSg<@N!+-rT?<`>Pe4;t#JFo;&l)0EsolWHcK37x^GeqzBBa&R)3qh6 zM|AXQ{qvn4si)9GITH@jS3$|qirCpn1sR;EV|FjU3868*hgJxKZ;A2Lmx?+Ek(e7*dA zP|f+jdqDft`J?>r4&V|BgevsGmVpJilIv}J|MKAPcfQIR9&A!c_P1HX+5(N+8N;}L z?(XLbiwJ8id$L>CXT8Yliq);*Ki&Ly823uPt_7f^tflppCx2+oTmJ)_{_2h#ORMee zpV)LW?0+fHkP;>1hN?S|+vHF{a|(K>lYOl_l)LF2!S{T?-Gqj$gEXLIGgxUQlxG{F z9hD4HLmAFIhN1jX^O3U(Qhk$yF)%wIv2-%-CZ0W?V_-X(3U&uL*kpmd>yAXO0YSLl zQ73gd9ivwqpS>aRh6mUJ#41 z_pc)iN!}VQQ=~9t0Rne$%?l|Rl(tg11!~+cpa0C0cYw+W)CC^@7V$`4WabecPs}rR zb}<7k+J=cHV`n5AcAh;})fP!;kS1v1`sVXV9z(o|gVfzWU8~ah;J8MGtYlZX{m6k~5z_zZm1hFYU(ed=ziO#ajqc(kKBs1VzS*lkP z%iLMB;mY(`rS-PPI^=57XbUd67Iqf$=7QFFY1}MP)dGx|hyx!AT&=)7>QZ8e0_7@P zih>A1{%~x1sl0z)f1Is_ZMNs-i+-9nu;drHpEe1%^dTnBk!dxtSD{l%mO^!E_*Pv1 zplkLuZn%!C-5cj$9pztD31%+Qwb^6aBB-QdovKR6;5K^>&ZV+H_~-bG#`TG8AZyo@ zy-%Z*r*00uX4|6U4(;W()Fcyf4VC@v_2K80vh^;t3XuSPY{PYoRHOsyLk8D+|N38U z%HE>AnQ@78kjuNqUZnDl@8#2P>|JT4*{K(-T6eckD}B(0**bs;6M<*77Cz(Vi|lw8 zX0h49Ufi34-d1{tat|SUG@jHUZ$`nYB)i_VfRS?AG+{t_ZqtDO)_nwN$IY7=sRVv> zJkQ?igB-&1Km@2F|5(A1T)*4B4+xE&7~7jB@<6T7DB76{XlR0^Oe!xLo^_sWBs(!H zDC$wo&H&OX&-Pxo{vWz-XP07k3}l54SE|B zPBNoc@67j?J;p6`GW*^)vNue&Ss5zbBKImgq7J!)45lh{S&F{EewQ0AGFx4DVnXr} z9jQA({xsL0`tgcvVUjnrTu!HhEOwnL04~Y9v3GfHIpP@0~P#Z=2R#RVJoLQ0i$QHpVOa*CdBA-l~j=u2)HhT-pi z^(|$*vm=m`ib;9j9l9F6zNIN41xEI~>CV7>$JSLd9fn~iy9|j#Apd;;ge!ZuUbFhH zR$Jw`jR+iBAMlJVUfr$7jL9!ESg$fwLJrG{Qg%}~wNkG|HWon*>@ES(ed->)rskHL zx8Kt9Z`^`US=WNvS8}+aA)KV==TraK;%mCEy-z(uZ^xuzhIGdqpz)z^GYkt+86F@% zhD^qoe+e=nV_lb)8KR$)Df=tRe6or7Wclcv5@U*E3v->0jf+Hf-GS#e79;C$!S471 z>Gd*Zeu3P3rCn;N)y~7Sq}!NV$!-B(u4t01{k9f7es+4wE4jwdPf`x1V&s`QrAJb~ zDfNHU}kE=KAFlt_94|$EbZ48e&4y0MgFZtj-_!=C2 z>)N^+y|j3_{yPWm^`Lk2&qrUvaSe{Yb-8W++n!NDKrjkLMV+xCdV(L{k?1weQ{5ro@QQY z8*KGc7+ce;tgUehJ27pr1u-y~y%S0?);%u_P@Lr`)bo+`!XevIAoiE-*R$&G{~eEqR)Ar|g)XC`4V34v9mdI@Fz$gdtb5kaz>caq z;$at-%?AbfYgg5gPnd;e?wKvDJMu}o=ku@=%G~ot;Q6a8hgMZxZDFd8{EVj}fch(i z_0iHea|x4y)N&+sVp_d_w9mz&mpR8Gcdl?fY7%tDqm~ug;wK|E--j$5LXi~iOFEhA z=;QwBr+%DoCeTkT$Qb!2X1#`FtVsyoWOG9xpJCUCt)0b=pP&QaKpwbC=mpAJJwaDp3w4Ebm76tL)c#_#(l4fcl4>YN{pvrj=4SpUOTJ`3I$raS zyp`pKu4W<@t{51V5}J}ck-7djW@@UCVtd-7{H}g3rc1eCmw`dPOC{lh#hj{x=c z%Y}p5n^RthY{uQm>|nugzcL0Hg@*gCB8NsM6O|GubFi?qFg%4ye?m~c4`qIAW(Grh zkm_&cxo&ReWR_}5%!^ns+Cxus@j&zEop<;1D+cV#S^E0r0^^?+GE>$VVv!{Ptx480 z)|U&5Qj*PB^8=_4i}vA6%a~A4@7cK(QB*74`>x<+WV2njj~fxn&EA6j`J!)G${Z zG34xI^o=}guw7!#=M2WIufwdz%*XlgD(+JYQ(C2-Z5YO@lxW`Af_TT}?XuJ(`-Irf z#F#X7r3d^L)fNQKTynRz}tf|s2B-#g^_v4(N(Sc87)KvDhqrqG&ajafJ%j^^89WulXWo-#MX6f?X zc|C=opDNO%XU&GycF0iHFc7$NY456Y%-G?s*A~u$yy9=;!pT_^Px?K+AGU2G6kD=O zA^u5T!`5bQ7PNb_(%F;gyFB$mvhVIghiuD0Gh1rlA#lqO(t`+V9rF?V1L>coj=wkeODRo5+e?Q@6}!eHw=#FjY`IyynsoD48q%nP)r>pVj4RMBO8c91g=U@QYQQeW4j~L&&zNw^@%l%phtsLgxNAwQ&k-9^X^S$uk zLBDqdJ$Y7na!Q5rWCorjsh`e1H0yaQ`Bsn?VB?k!-8Fyip8`csj`Bay^WovcH^!vU z>>&Rj!?5m~AGRvbzhQl7ErMf_kYW_&HYkpbL>}z#VE2 z@~dx0a;e3Fy@W7?ZF{-5=0*=$(QJyvSHXtiWU)Fle!21(9owZu*6X zcSxJcu(C~qjIr9mq9MOc3yk8>4d}<@Y(s97%3y8MP|fi2V**(hkiU^JY!#Swl<66m zqg!3cV<-j`$OZX&N-g^g8=#|6DIrzL~rdi!;d!5p#>YsSv@dt$rM_ zWQgk}zZ!fU&Emv7XmwPC*IoDRJ$kzB&MoQBcKBq3hX>PDiYX)7N@Z|EbquejUWy>S zR+8?Q9@N2PQObv@RWlEBLvT@k5PVE+c-m^ zz(mWm$lvxGVMl3fIcTha)}CB|midxP;RTFw)(B&{Iu8^5UBe{Zk40(GSGag_9D4=0 zkz8v@(=SRK8*9FZJmIo7tRoOVB6gJe$j;&=dqgGB_u?Ma6zW zKC18hBZm;)<^9I=^PpOIjqIZL?yVpkb3^U&3fgXhByy81D~kS*o}+upy1OjzLIJ$e zUhR}pc6Dp?H9F0&w$+oZmwHSyLS=aJ$l`xc>P!cos^xb(`hwdUOL8V8=ykfKTLl5IJ=Ny)t zv)BT&^u}$*yB@Wd+(uN}+Dyi?6JRsvPk$0WIIv&^h*#sc7XKJD03x}V>dGrF$5h*6EU zcth3f)>ZB>wQ5?y=v6tH$=Zn~uhzu4SC23aPHV|3OEY#0tP~chlMV}7W4DK$-RACg zYNe7zuu+BH+DP^h?$dT#Q#xxq^&^=W5Q&3PxH&%fqrK0*0-9U+Ec8&vy4+-E}A_yWf@+ssU0 z2tW_A@Wz^~wBr5XStGicU>};)x!dQ)&3ktqW#F9YI5Fo1tkTcy6IPAfd&YUli**Jq zID8tE`FM-CHOkBk%cakwif%hN7qM;fXvOjY9hvo*?qYyLQ>di%$5S$r2YI5?UI_`} z7Wa{uJm_fDY{S;JvFu@)E0if}^$$nAfi-;1i~FCojn%d3oxWtO_Hn(>nJz1(_>!02 zVbk|PU#iSGtmKZ?`%8XNT4ikxS{2t9pZ2%s;!!zfmHSBOATPA1znOXFGuPJqq};8L z--4o_?XizEO8xl$4?+AKgR7nZ2qp+gvHT~~E^W% z_@RPcjpC&;Ic5}ZJ9SUz=9s5BJms{?${(4AjP-H3gm>H?`@y@3GFsnMzCHHKL%`$V z8dQ%TC5yt~FKw2gjN93Dm-bX?!9UeDu}=(g#i*rzmE6;iItL&UqOeYfc)w^yde4dI zlgD9K=wvt`rYtPcd0WeXzU#k6`5VdZaLVg;4qvLX11 z=dAzci4TIG7>ON6q4~$fDxp(F@|5fuVz(y*8;=H|FrijYp?p#SNCoarJBl+K%L;d;EjSYN+1bN z;Y#A`CzNb;!6S?zZiKkjQg9@|U>}+<=R;AO)?cOb`RR0}H+uBlOeIT9Sr%Q7sitR$ zE)vqY=$abWppl`GZV z$vv=?3c591lgQ|Gx;4?Q;4ajD|C|KkWDS3A(>fqASk8x8AhB*c`kgHygSQQJ@$lS9 zAZ!ELn~KkGF&ox>9s)k^p}}VON3uxhaWcC`oI8+i)e?`0jK7^9&s z^Kd-7w=vN^`#e2IUPhW5%9C!p%c9ripKae3c49!L+oitGkhorD2+LqI9q1FaGSgz6 zKqKc`-H+Y?m5P}}Q)U%tLrDKD7=G_b6&NbHtdBGEYyI?QL ze6ZlHC7)^Rj6Cg(JSe~L3%mef)rdZT%s5uE>&bMZP8@@k>lDY7UV+y%Q+kD~O<)G? z)4?m{GiVKAKauxWAjxS^%4Q9+@KymwuwspmK`GE0AOas_b{za5PaNeh^7G`42zo>1 zCVFg^CU&RCVSy|Fe~gO0-FQ=e`eWs3TG#tM6)Rymg_mN5-NzUlpj^K|Lusc>RVI#} z*agotL(KQg;#gB$Ygg?r20VAltJl&u@?7sXR@l8NgTtq)a5Sk5xoxVI)}%aOJKy6H zl)l*I!5kiCSXl}EkH7}%q%sX1r{13^1goRCM$wMV-zUr z;`cYW8R;sA8T-o%elMTcqL-+ZnbpMI7<4?7=sGwf$?jj@nM04xGwBx9KtrCc*r3$& zvK;2TNzdktcln9caKzA= z9CZ5Uk#h`ZSp;wXS*#qpV7G^+sHN8$nZD|cB{m;0$OIrv1jS5n;&SYCA}hVp?SICO zXAF4e#@@ba4@0$Pr*ABYt|fF_+;JfHffq=)R1%J#gAJIQWme5gaV=a{*pepO#gTc` ztzp7|_T3M8V#959PBuc6-o1n)=#YhQl~i`AFPCJ7B?Y#<_`b}t!W9QNaRO_rt%ROQ zWE`TTgZJ)4j2B|&ax9BS#m=%NJPq!r`c`sQNOm#od@^o}pnXQqF}zzl@fp1~@0kgn z@U%VaY@4-=QCNtzLb+j=zG)o0P_=8V(R+#EDj<{p&cH(RnX7588r#UMh}^YyjYdDK zkv+YJtJE@mHOA!v%R%x6=P$J~&~6JGZ2Io*caVw4RP2Mb!6{gc&Nh>~FEgx4_=@X% zv#-{jr>)+<&iI9vg|6246$HboFCtk5gY5ow``6WZIPEvgNc5GWp&*%^kbkDtaN;S} z1s*0z_GXmMx2cO}4>-2nxhJ=5Zs%QD`us?^HIJeRxw1*e@!hCfmFNlm-Rd(r7eUXs z>0i-3>WvAd;l~lgML9UHe|xrNDx`3srD0xHg)4zAgY`}bm24t=%z@dYjO(LWS!C72 z_4h?q8#IrZexU335J3a6yCk)$Q$BNMRv*b~HpSJHq>v3e85x8%b;}A9?HNDZX|;)` zn2Y$|$+&zK0uNg}4_j0^EZ}6d9jxQTAuQ&rwp(>@y0T`h<6E*|6-3V9p2D0jwWfKq zIiHW&ElQW#ko#1g^;hYt`~~Xuhn2U=xfoN+TpN5{4H58(Hm5^pqsYvJtrE$RX0O61 z?+39wLu(nkVu!4UCS7s)_#b*}b+waTaJxyBu^C7oJdm0qD`dQz8_HF}|8T$`N4a|7 zuEH-U7`5ahkZ4bG{3k6+|%-r_X4D-%z&Pc))48v;_Ii?%&EpG zxVF1?=C9u$@m;|owaIbyw{5h(h_%Zp{b$+I+r}03Y`H8IZxXwa!#fcitdKtjG4zn{ zX0iH^{4r8z8__$y15(-rm7_hzWV3wEw9G9_le&;6Z<3vnz7;eaW}(uDOviXa2T@70 ze!?3vMOAk&2eXhHi)bi^c(7>r+jxN4BF>7@VaR{ys34GVi)ui4t$ z`VD(9n(!umcCXYTz~?5=hUy~dC_+9iUyTwa_2Y}BEw-(Tjxe%p$a2=I(= zLbrO?PjT*15Xh|M<2`ISd0;QT{(&sREBhI(#F;=Spp`h|iaMotE!AKxi9u`0pb1_} zHOgA*xumsaVlABzw7v7#w08{j5Lio1@HP3>T3SXcht?8dAN~7v^v=Joqu4h<6~ToN z70vxi?>ZWk-%ABP#G2W}yygA%iYni!tSGD{tf)`-{>zH$Pb;e6->j%#t*32RPsTy} z{PS4Onf>ea7nq#~uF@I-enzGut-=dWo9daEwzt!o$9azEcPs<_QlB&u9i_gj^~!TK`rjcsBS<$lOHrr|>3R zl0CvGq;s~)kYDN@#u68!Pw%*Uel_;pG*2w?Ro2>i2Q1x+?$Aa4hrhpa78;n}jyUP) zMk5k)xP`JtLKksAd_`c3<>D>fQ|FjcNd}3qNN?u;%ZOyZjS>09zt%nr>d&v(a=oS@ zL|UZb-J0t<>6%7xSfr3acn?`W+kw*R_o0b3O) zUwPOu=p{m1BM<&8kM&0ZnYjaeF|D;uX1Dw<^>ScuIIumnZbHoy``gR^T0eT?M)5vT zDcN!*P;z^D!9j)A5_SE3b4e<_adOTR`%5y9uGDu91TGSdYxdLki5tby6Gz^l{v#b3 z$!MB7g}+CiT_C@xXU+zXw10ovx&?OctHbqeRJ$dOq?}@lbh}ICSP(o@L7DT+ zR_qXW{B!-Ufu1GGT(BFn9Xf~s7ScjUuU>);UHajYYS5SHVWCMC>6Urhm*n2M--ppr zq=#s6rw4ejjO*G~#{>svVMoqI`hDn-!+gUFG}`y*o2YLow{#d}a6$>QVNJD9H9emK z4?XIKbJjTE!e!4%bkVOV3v&0=?0HgOoeJkmOq|T;A(C!SNuCL#;_6_+j&5}L=VMtf zzYT6%-l1(}^oCL0q1sqdW?JuSp6k`9n3yz*o(tx~d-2;dtNo=tH|S`hJ-QT%R*U&hS(8$CR3R zS+-&6Do%V+MG_~n;IJpO{uy}ViE4NAL^j^pI}@*c5a-zJ@2hIp^ep1P;vDNzdkRZi zIbepB656I(mKnikmt~T)SOt6JE_jH;wxi6`Me+!M(>BEFn9b`AE?p3ZJwNk=%v~$m zhU#aI?_CD@k$QYxnv8gE*~AVITi0FsxolE0Sw`WZ5?sr3r+S5hlk5AYmZlqp$2eGNe}T6ybaBOBMw@}%pvmk~ zdIQfF>X#w*==ukjcr|Q9KL=AS7VDejY(>hZ8sd&9*&_AGu?PuS6>)xWCi+2Fh5R~X zNhjQajUH*0F4VSFd;~V-B+x|@(MYBdG)QO6tx>tP!{LE_XXc7ota*(#Ztdv2s#CWa zhfDuUcR$BI+t9p6>Poo^o;i{tUAhRK#LGy_zGB|XO>+Lx;Sk)N-Tfl8t!?HzfqLBz z%R^N=PcggJ>V@IZb@UbZvbv3Ng@6(pz|gGbbQpAu!`>q1$|f{ei0$lXSJ*N8&iL11rzbeP~T%qR-P^ki}jha)a>wTm96cV|7UXi@yy#BqoQEs3w+YUj*D z*!JvguPeU|Z^*x+MrCnkAQzfxoZGXPyrjpt8=cSv3&5JdxFfdvVZbJQ58SUzce2L|OC6;;&C=l{mFntt3 z{>Igbp6@39abnfjN@i=p&Qj^z=g28p%1HltSu6Lga8(uO;f9HiNDqW*lQBQs14lq} z=es)A(?5;37zeIpkFV)}fJ;b!1X+T|%_!8h(Nh)b$ZLW3`6*QcH?UQgG>C*?P#R)* zk`#J_OxX#}fhuUFr>cyoX(5h$eL{pdkJguQ+3#@#{exoxG{8k?kNmB?N;8`^?u=*m zmyC67FLCV+6I=DyZc&aNeI$I2b1m0)tu0D5&RWazs|L4HONatra#D-o5Azc|w%}I< z?23bWJ~q6|v@pFf-IB30BR+F&re@O3x%20pn3ww8_UDFz=J2915*kji`|eVB<2}At zdLUF~U^fkN=d#bi-fr} z((38+b6~8i3%0J>TELr=j$r;hJ|EapI_#><*jGt{jERPJCOwI5@9k;v+E`CiT68P2 zLhKz3PpnWvKD__x2x!Aq(%P#da5m^#T<`NVGUT&FSI{23O=p3zaQB(2N)F32RrPtB zi}S$O`4OooEG}@D#zsgo48vbM{)Pxi(tV*r2+xYzrWYfb3id*bP%$37|%a!0MQVh=T++{cr`YNteE0B=-Pb zy0KYp%-d|L+NlAO%NM4qyk=8!WT+gghLQc8=0UWX#!~2RFS_#=WpB-8U=fhV^z7F8 z$S_Cx`En5`lkzMtH!Bty=eX~H29W@Y5R@6f5h^fZI~c;rF#uZx$BFn&j5+LI)88t;%t@up*bmx^ zo@p9%QMr2VZ;ACdKZUG^MeV2di_>K86uw%y7B(;|cmG+A2p3;uBU(T7O*r<%5#`<3 z&*w^RKB2O3_uhX`=@X4M&?g(#E1H7dR}WS-*2mTDYfDlCGiS7?|AF&WuQ?PhsQjg>+`rH>eeyLM*CsmiEMt#FBY)k| zt|yMzKH~eVEWK%&FB&#!pzk+&+8A0lRd=p2<|+edEzN3q{-`b_wZ5wZqI+x9&nH?n z!io8iRGumit8!TMXoD1UHbkl4cNO)g83%1(^;7QLt?Js$_CFBRvNYvNVCFi^RclLG zcU{-rIM5Jb*h_Pl6}UAGjvxm7+B_+M`XY zno-I+T&<;iP1V}9?4dQqdkw13lV0^o147|pp^hmO7o*9~g~`KlKyTiJcPnE{8AWe*46<9sXjQWnVazD4Z%cIC~*e~pI6 z52VndFSn8HQ}JU{_GZN8VF#C1UxaTYZWxDU@`(J~0kR3o} zxTp;0!#v7>_hjO-y@q_{ZIl38l+r>)+Db%5oWdTMip_Qv_yx0_1HWM2#F3<+^bYlw zrmh100yL(sLHpXXvlH+2PNnZ*>HbPs$9SNB%ixAC(0U zk8$+H(a7zw-9++&pT^u$Rv4A=>IL$8kjrGqCxI+;dPn-_wtKko8~yeNTP5b%Sny}G7Ph&sL` zCY|#|G7;@I@GGSUknQb(m~_Kun-c3C2h;c*@X$8{^(Y=B4tzZ@Rg3=mkBc%!vOIGt zog>lzpR|oo<^s^>K39&okDNPt^XPH4P4)iVRI>ij*G2OR-vz{MejjEfW+FJpdXfh~ z8M+`1fD%(Lg`H6P`K_f23IQQ+k|pIcS7yWWb>z95nD6%n0M=D~SE8N16h2zOH#Mq} z%Ryt(xO3Hcir@Da)2>bfDlzPIRo*tnsHss^@!L!r3ZC%Orr1$R87%yeg$I*Xt@MPQ z57=7VNKy>Hc{kekg|dUR7mYj!Ej!if0wM)rDLqi-dN~FD%ec06mC_0>L&sDJ`6lBN zw;7{ui>k_%k;2tofGrf6aCC2RMrQ&`IXsSezG(irIb#3krYcR7oSSHU;pZ(swz&$AroT@6#}7{QbBd^HON0wxlK6i_LkkRcG=UIm*5eYs1#f#^vtIfpjkK zzSakEBumcOmU+;5CU9~NS67<~l#ROpKZQ0`U=1s~lW>bhPE20!YnhveSxj?|N38Kh zG0`chIyFGsP_0KSK_%mziJ2A&f4AH^#0-?Bt#pnAT{{azREh0YUlxsyHWT@xuC%&^ zBGq`ar0G^kKeS;Nk5%c+Qa|Ky6h^67pxd~Ga@FJJ%ib|~pQ6wo#ov0W?^m_t>XcfB z;x3gq#*BOgkT%LykD4Whj>1uz)Tf&{A5=HBX}J7Gxe9G(NZ$k9S)U1|oSBFGr01{8 zEeyUZ^!@GKB9+vqlK}$S9g@0?e7XP2sI@@fG_t*{{qw zGbeNIuDOZx-kTTl-0dkZW5(u~fg&Z(f!K;)%Ui`UNAGxCs&0+OA zR}Lb9Y&jyKE+I~C`TSLECh=zz>Xi4-{fE)<39^dH`lv2=EHQjYM3{1(ecSetj)~}_ zoK=6DSi=pSA}D9E9dY7T;Bfixb^REi72W=KuMf5u&9$oG6Ss>!6RCDX(qDdQ)ra(K z5%i&}RS~*kUF*6?MCDqA5n7#hr8VN%03eQ$XA$!3Ifb)ZOLKvTz?~8>qClqVz4I;I zIqSU$y|z!|78d>jA1U(9485q8=2vRQTthidltXhlH#d5MCqy7=Dw&54MjYC}nTIwE zw-}+_GxDcYVa`%Zn8UcBR%H}@Dw+vZj#H{9N{I{EgL>S8a27sGMU`lUThQEn7BUgg zEAGE|JGhp*0aVM&dxNi82GOYo=a(ycoAD_j=kE1I>^ zcN#%@P^;MjujeLJGQLBv(Tv)&Hea(H(ieRPd{X7_0BTxp9loPhRggM=aS2#7_{`xBl;M>#sK=bY3I&z0m9ZUEA>RK{gd%+ugO*5FTmBKrV1^0rn z3ZGDe=&^9OGr=^W4%uAUd=Iz~*(1Zi?a&%>+8St7E38fOufghVz-nsuGT>PL=v4t< ziiPf^Zrv`dEYnMv8-Nb-mt?2^2 zG3f@E?^|@#dt5X`bZU=-@>o@8@xNMKyB8(vb|S`AE}550F7GX=bxqgLt({Fjqa+WN zWYw+MOC{mm`+#&H6lp;nwV+u)RH{MOxIxH3+pPh;Q`L$?iS}XKVpW5QHfj`aRElr{ zLc7JyGqKPwTQ@WXJWbI~_)_3~q6C@&&=R|abD_Lh;sO-3Tn8!}N))s@L}y-x`&0X} z<{91y&?B0A=hRYYrv|OLNUd3-LTPA$bfrzTLqr>xZp~#;ZlOA;Er)vBa`sqITetz{ z)A+(zZEy>$nm`Mt3Oe(1xXdU^t1FTX3OLeO??O*GcvNjp_~QRv!}OHU-sR zcQ~m2x}f@15pw;E2K9%@->du%KZW~>{tj#J7kC(Gq35?Zsie*> zRga8ZRA6as?fQiiFKRc4Ne(3=(+A%|!~cB}^!s<)>HoJ~JK#m;WynA7Q+UfQo_g+K z(y7z=KEijIdJf#X%n_SLrI4RJ(PW#?l}7&cig!IlV$3`<|0G3Va2Y$a;7{{Mui9zf zwaRfI`WT0n5pSH7R}T+UOSG)XjfG~#x?=lg$Md053)(@VJ~VVGeD`B^Po&y+ z$U6wtj@}rbVgbjwN;l<=X77{0+Ce`#78tl1W?akY>IzkVc4nU5d87nShNItP%$;`Y zoj-pl($`4G#Ro8}8pH>7h|;%W^gdDgMvOisN@vCB%c9gGMt6$R*T|tpo_D9|*92=i z{T8Vj?NYtS=7{*cG>et&vw#^}$x6CD%ph^IQ+nOQY!KZY*okaFH@Dlw)vWtA&N`sw zxZTn3QL$>(1=ZVGM&}h(Rqk^3jRt6nYoYTLHUZ~Ywu|lDO8#c@ad}m-IdB~7g&za5 zx(3e6x1GRq@LOwoJL?;{4CI>{nRtvdBhSm!h7pNJBFtRoYSuQXhQ;g{_Z{>Z@(iha zzGm9~nbqi=FJ5TPcmhSI!pI=IQ^2w7lTO9|aetqDJFrA@3-i(=8H=uVWo`uy) zY3sR4uk)RE;C0#^Qw>}DeNRr`X?pu)eEQmSO~%dH^XCM|G*Cpt4tY#J4I0zjS&!40 zzROM-v*T0IyyHW0>Fy2U3%l2g&+aZ2Q+5}NOLr8AFYIuM&+c%DDLbTx`e>B4`lh_y zOyfETINW`hN9DOXJZP>uJ>y!S*VFf5#>g{vq_`zrdR}Bx#L{$Wj>ygs3(}>T@Nr1I z!n*t4&(LUYu*5s1f3C%-y59(l=A+;#F2G~q?S}Ka{k;YQau9KPP?04*y&8FYlf=8*#=e#a@&wuSe&kW<)SPzVzuv zlFe+xYgN-u0!NIAYteiYebIxHIk-dMp(_Py-+k#VPc|q| zS@WNqM>Fchtd*X>f&c1MRXH~?Z#UR{m9WMZ5Eg{6O1SDk!}*5aS z;DywmsrSESwQ|1ojC&T)?Z7DxDwG;8gh;FUFi%cRjvUYEh3-P>#cn1Sc>9yHP}34x zji&!gz2vmF{!)3p_2)%52oFlHd+Uz=t)70Mq8Afb$o^ahVid3rHmkaOVTb9cI?+ya(!OyU*NqI4&7cUR{4M9Nk83u^)PwN&0ye@jEM36DeyMaE-Ref znl)wc4^bKOQn+C}GsQ+V>|VvM!Va>#x0X+RzpZ82C%v_3s(Wh*t3@pqCzG5^@kGwF zh%ZN4^xa+kq}Lmnk)jb=3B5TIx+dZTjXRofHh?*bz5Nd2>u6SKz;y~slZQge*oaxR zNnrL-yzh952!J#Ons>}X=9G+9^O>DW|g!>7LYn{mT#N zjL@vj8PI_JdAo_uT{!3GLkn~L%MHDeL+Yg=eB2SEeG>z;uHosxM9n-{)pUq*Uiygl z)knr-efhp8kCM@@Xp5d706YkqXVpF)Sumcx~V=URzdJ0<(5(0pd zPqf$bN!jx-Qc-~&4wfzJr`rN6EQFs>+B|7`iXo0?#uPRmCS7N56fJ2xpbv=D^Nfz- z5*7UfB-QU3Q2Utfu(D0D1Pvk^B3Vk!`n*+^R=xy`l%B5g`r&yKP1?$(T+H zv`cj_fdkgw`l{pWFPd&OZTs4=*2@^|f~vwMXe(9v z(RZ3>aWYCF^%ChdG2_%VYSLB8@$b-7LO14*e@7HI5bJ)eCp<*DkMAlqa_a^{!-Ba$ zx(}-T!^39y?MrGOQ#JM+lMHJcyoEx!CLd#**~swue4T!6JVSN_jCh~zYi)HJM!zT- zJ=%om5zrRk$IBBZ6~4i->Qf)h_x^$TzHT_QAB-;N9^E{*Hc-OJNwQUtIlboOVfWhM$liN0 z&7dm5ym(AE12K#h+;q;MR;vh8y0^qwH{q>4bfwhGraQc{o=uK+!zzx7d|k%WE<&H6 zhe)G}Z+u8WL4Rv0p}6jGDadubxOI?Ctv%rszvdP)2VsmtG6&u9Q5>}`;RrOC=qbt> zGcaitWjflGkGNO+TeZ7I&=5Y_B6ZH{<92|jlUH{();dM4==mWU<%%gUS=s4dw~0;g zXYpaZRP*l&<5!(7tN;c|J?(DtyX6kIv*)hc8;SMNp+RIm`(%qD{tdwp^`h`%v*E$% zLMc$Kd(?Mk86N7;B-6JggaGTvIcTE;YZ`5hbNt%Jgmj^ClWC?x@9E4zRv}sM^MC(_ z?13)+>|Nw{VT)~3_V)Ub2Q;X0$ed2|Dv)Dl#vZ4(HSSq?fBI0s4V}_Y|iVmTg z;xx~#K|A=N`{>Ehh=Hdk2`41c1^W`c9W-izu{!2ZzAgJjml#uRh#SIgbc`|k z=LzhoQZ&5c@h%XyWID7UXbfrOAOnlMER%t!dEI~*Hi~XWR0U$$lof2)TKPv>C5uOy zGHIQ_(*r&$v~Ofqd!g}62Eq{S9EjE&xvAIAF{ zL%6yU)~$gA8q=udEGHS8rH0`qLITvxSOZUL<};_wJVdo$b9@bFc}z85Yka9$#-yT1 zi{hO7fLjGG>ZcHciI^^_yOzPXNc zYu8fw$Fu>>g=Bu zCH{TowKY3E`-OeBkM`zd=+)JH!Q>Ccx4b!%9pVdK*W}|+pSbz+3?wVrAEFxg+g2g5 zK#J~B6Frh86@|tQa}Nk(_vH+>Y%cAkK-L69`TMM4<0|Hxd#ky68&>m!o#BCY6Iby! zFRoo&B>cL}as$zOrQ9NL66ySXnv9iUYc`iEGpu~D&G&|C_p0OHwif7s%7VSYPwx(< z1*lz)pV}SsQ@gusc6+(uAxy-p`(BM(br$m(Vwu_i`5H|nJ2*4 z(d_5VNB0t6A?HJstwQ$KGaE>rpch09DU_6F}$KT%U{lUgE%wN65D=m2cdCrkecQUTJ= zaPz=djRiNWQ9NARmt4C*h*HI`SkvJjY|_W**gN+Z>-Ov1r*&-dB<4Ch#T}Ny>gR>B zRX@*WS3DqP6tIR(Va!eRz~^jPby)d591`F*J$_B$N$N(zvq1g|_~D@DSMX(;kU*WE zo+XSJxkb5}(7@FxEz;7FI_ifjPPr$V0zL8R8SE10kM1TMk;FP>4aEMiU0k}H4?|S8 zsi&~2&BMmv2vV~3bYV<&lqtq!Tt16c@DQuI7qN6zzF)l}vL|qSPB}JgDquDiJgOex zEi)A_B&0)c?Wf<|8MyS#6$9Lk&L3TEhCDUwp{2Xmr4=D+no3<7Nxy`7m|_E}9kA*G zcV1regz#)(L)y9nq5IeQpMGL(=>9Ts0rUdkVf)c;-X2@@U+|DKWe)>SZi46Mf{<+G z%dBUUUqt3I)6(UHLMtNyKBauooq?G`gsl_Ealzjzf0gOpHUBqxg+lUqWw)EM5Vx-I z0Elp3yf`-dby_tQst*~1>TisJ+s7o?qb)l@hn6xLIiKh*JNY&2ai!*4T>dtloX$)G zW()ZJ@a$xVMLL(OlD=8XM94B>h?;ntjh!LDH^uL$u4F}yy@Zu>tM}YF#*ox4<3B6+!OIQ7IrugI`9r{O4?YjY`(2cm zK)Elb`+9F%ggn$8^sG1rWe44NMxm|Oi5?T*NIaJ^ zYt9+AI+DkPr9yABwmo}rB>X(Cc>PkZo2Pszpr+s#s8++U$}aw%&ZF)ut^M{TVebbt z9z^w%BN?)soXXml?6Km=wX7n=^Xsg@QA^ZO z<(hCh%YWo+jymoyxjD;!C zaqpXf_SK9#oxGgB+!y<1;ON4*v;J#Wyno6uy?GY$B4Q6V73+e9v$Jx7pHFafez~>}6IRTYR1BwWr5Q4#j+N2$W(f!hs3>X`tv4(pwNo3MibyN^zw4YF zP^aJj{LlaRVD{Pfz4qE`uf5jVYdaT49SNq^r5*9i7W6<@qmGNAMb&A+kf}cElxGp8 zI=@Xj6)f>pRD;-t^UJgbu|D6AQRl@}--)zf$XOS4IT&{=Ef{j18ha?%gM-V1A!U!T z!Tu>vEf0o#C&wNU+t}?`9tUW1H#BvV;elXg;Abd z-Vp3T{n+#3IDAW&2SdA8j1Bfmd1AQ`0{kMdhgJ{_Y0SI#OE7dElVIp82Mh(cI;*;1 zSOpl0abE$30=%v{0Yjlb*De5tLVczRz)%P|^8rJlgpy$Bqu%Zg0EQy0pX!3)aS4W| zQxXh)-vEYUYu^BdLL0tp35LF-T`;T#48=B%0fu5oFb5tCiPEmo`v}T4|~ueO~7bAxnzfrRT*|XUgcyI*bqb z<}AIeyG=OD#UO7~#GzoRGcyk9&;sg>iSUc17JWOzufw?2%0;?}BVx!jZpINY-=aXo zaj~rO^b9F-DrQXwTnxGA?20PN5p)KK3f_LIX@pQ^{;yA zaZ1(1aZdmimzDpfgeJ&YuBCA+);zDsqQ{s}k=p+)}$9Nz_XRVshq1;<7SjwY`J zN9UP{2HhfIhIY>gLe$g%I0_I|ZUh{M&pWB+Ur=;O44MCM_LA6x#czL7DaI|Xy;G^10}L9(;pRk3@g1Me+=Kdk_s&Ui7xb_E zMx1(z`1{Kr8twOEv-^$`(B^!0A6oX?p^?l#9X1i38-5Otn{I$${|i*cOH5^*%Ax_ie%9 z;0hT~a7;(AS1wZRJuHT2P@hie!)sO%MVlBCYgaKQzU6Caj5hUXD~(#(f`DwD6XiX==|C9ln2x|1?$h?L2SXPqRW&@@owie zq+LVWP{UV;>Ko2p{ukcnlel5xn~4{8b9x0VrwXZ0kPBz@732bf7Vxsb5og@EE^@@g z4+p%zZDft7ML3Lw4p3oOpn|OUzoZ(FcXUI7Y}e(JdNa03&}PZAIuqmzW$}I_j_Obn$0-=)cM2?p1$0Cm{t=P&f?NwO6D60s~T83H_u&Pa7e8T8{Y5T znB;v*CC}MnD%JdYZNEbCW>?qMZ zROO%D@?p?!3=3y${|v`1RQXVZhRB(S25w-ySosw`w_rdyg3Aa=1i=fr1NxQ zCrMO1f}t8disy|L%Fg$HLNDC537AQ zBH684tNpS_Q(VK8;)au2sTz^^Zd7IICdiew86Cg#w~2m(Zf*)U&pEGkL?9=7h_+VVPAx}CSf@k#(-3D0A_y?8@lMgAC$UOFIs zAiS7D^MxDMx0T1HLIdT3E`@ZDRkz*TOr{q};`>S83m*Ai_R#l8hR)&Lxi>uWz5S8z zk01K}<3n}1xf73kUtxwnRQt`YZ~3I{pc)$>8@EEwvW$_N7QjcEC^LfB&PKWE1imXE zL;4uDB<0`Pj5iU!g77mp2!A2nx=0X?N!gkr$`Vb{Buj)gDI>3tBtIncA-smYLP$|E zS)dXw6NZX2(v8zPu6?3uBi!8jE zLw8YK=B|*dE9CDA@z$<*Jukdt~FF=;wGF8uvd|$lU{cqUAa1BJmhqE z38H-*-e$wQ**W8L)T?XnTdeR49h9z+Hd62lZI7;=45?}13_;&qI2+p4c!&6>yoKsBcn8eUmb3(K%2e{n&`+RNg1eH>(t_5x zmFBF{cehr0X45>ItOdz5gF5yEUYc@cZLOT_+~Ih7lQ`nIwHD<@Mf?L=UeT9CpPj47 z6W^z!?4A2{%B%Nx88drZ`g<51AI02+v=!EbvZgKH{RexFVw|Uc?qtx0XwQQZP0=F- zVI?>TYi1tZXArd$;=C!(2(xAX2)EY9+cz8uYVOAeAw6T;_k>er@OVKu6^T3aYHlpE z8?R09S*S4!dzG(HFU;YaHgg4|gU7;6CRo8?c21C$0<+JoZg8=^ay86VM%~cDYFJne z^8)~V3+HEQZSLE6`57|ioy=E^+u_I}`vkS}DQ5R3x{Wp6@t@RX?-}87jI1_xuAq_N zm53}IFK3D>@rprKQKi}iJ7EFO{lYKSl9l!}!TyJQc~Kdxfwd_{E8TJuzxk}{azRTD zUvXl(x_y5*XF{(OR6E|5h}c|-T_~>T&<2wZdB8ncEt^lvqVN`(o&hbsOE>XB1C>lx zC?8@YA0OSdPb)_)5lhM`w-^4EZ_95AxhdzB@?KY{RcZ(PW3WeNE2u1F$Q{Big&Vuk zZTGrz?P$rmULIn$$eLxPF3Tdwr8gOw%`I!PdYLU@%?xpnJ2agJr1}LFJHE=@TgjeSGu~S%+NM{!&#LgsmB6$7CWLH+VEdsw7ML-y=0AF( zd9*u>u}hvsW>-F)tvm+ZZ_WYS#GHS}W=I3p7_f??m>r6X>uhH5ApE?1n|Tm?r;lZX zw_6qS*3n)Ko^+%o7v60#CUE={yYRI_Of`?R^pH|biBjspaxv94!jcOguR>YnGg9is zgJLS~vF4hCslKk%&d-BoM^=EJvgCG1ZR@+re=6l5ZKb7$l*5!Hk+^%S^e#q+Iae;#3;Cb9L?$bGb%Pt~u~gN_7eTr{S|#ggxeW zub9g(fi8`VO%XYMJOZ?rt6JNLZ5OSz*`DsT%2 zFE@stV`7B-$T_VeKg0w*nK1i-8JT;!trW=%+HlzZyxur)dEaG|Vs>0`UK(ZJ{q^Cq z$IhJm>deWn>n|Pq=IFJ<-_`u!lU>j}!OCP`2O^Gr|J)phd1MUkgUH*l#|I+90`kr==*8)kExXVGMO=6Tg?)T8sl?;WBSwvs{?o_ z;7HrP12DPSr>U~zPJfTP-AOYOex=EVmelPlvHtVc%tJ4FGnOSGk#gTW+@8n#jK?xX z%NO4g=9@72v4f0Y`GOvl{cs66@{nq)naIF42K{?EY=?@{6aGYLPck2etgI^g_AKK* zGl}_g<#;bEsOJeGwaash?{ln6e@)&e%p9t9TQLXTqD_Yq|Ri>CVZ2%=8>v>sB6JHqSE;_nF$lVcXwz z1J-4NH+Bc@gqgF}WUW|svdc1OYf60eDEqpU$rX{WeQM3@Th=z19df9WE47netilS* z#eMYVtkVDWS!-%Qf8`aj&+$CnD_IV!k=PWn$`~qGWmt}O#KJ>;BdgnVbe+CHzfoVL ze`?KEJ=K`7atJHmV_@3WthOa9D>{7BvIX?0Q z;`T<6Rf>F)fwN6oE+e}X8+L?voY;BRX0iiw?92hYQ~?iPj8Nm97-q8#HGLM)FL)8V zh0JD*k_q~~Geem?%-_X4E(f-s6-a+UZXOE`4?Bt}ic!y6#kgOX!>C^{Gj3S3_eH<7 zl}~$j@OAk%@P_W$vxOGaa~3g<95>ogzY)V^qAp`qK)?NYn|ZkmH05>!)(3oY8`Bth zih-G`kLTzVC{KBXai48w)Mp(`vOK}E6Q_jbSUD@e2aRKJZbTk!jr#Nowtu$Pr#?N4 z?Uk*qQlB12zm@9KZSZOCJ~J3^2}UzouQXDu54j_EBH+j6z<(C!I1Knrv6()=s5Xkd zebz3vNr$8PfJA?X6 zON!G|)Q-ddI#y`IjU-1%Kwn|#yZ>M=Zq*dF#QgF|SFq}{u)%y_q_|DpuwNP}M&!WA z+|*{*hz{l+%pn^{N45yvJIq8_(^fa4y@@m)@+2zGVns2e7G-~ z=Hm&u#=z(}@T9ZVz}XZ=J?DAYIF$jfe*}J8*n|~38TSe`(?7?NLvT2ltA67Rh9GWH zbNz%Ka@8NJf9Gb^|MLXXujbD__3!?|lCO95Uw&lN|C7jYauEanT-C1z4VT-ckDPv3}kXQ6!~`Z11Cs~t>#Yl7tvE7sDl(tYPQ!dh}* zwvFu={}VRzS9pQ7N^X1hs<0tx#ik(^H-$_JAr{cY z+*V=T+ht_23!ISIroSSWPah-~aKf}vCQrF4Lyu*)WV?di@vIC>4oj9NgT~yF%P0K{ zRv{Y|GxN%RxQ8+QONNy#Px#XhOoHVU_)&P%Gu@K)uCgVkDQqbQ#mmYava)af%-B+1 zQGBC%Syd@7YkHosB`;Te!@tabBc%1Nw52E%w&W) z)mVM|S$D%GR^8xW)mUX(Z>4~J-LU3zE7owqb?)E;dMjW1F>p1+@_vWHX8xCit09R; zvF-%i z3GHI_m;<9{zIl$u(4(oKKEAv5`|D|3LhUDMOj;+wGO?b<#F2ge=)_~f$S`7z z3}eN}&<~6ZJunDk9V?7=kkDonR7VY%X~)XT*=BQ}eU-69e}@}gjLNd@dKjczN?3Sdf8~`H z9&(XBu!rIKq%#haxNQKU74H9*c$2iD^&t&Hd=X|gD4*SC?Yg1Nt$rYsBYg00*d_!mky@Ml45B$}!DSzd1_-q@= zoF%KIAfG>x&S{?BA&}Pj4Q}Uw;;2I;sZu+6BW5K68VDy3e=?9Oxy*(ll!o1P#NG(f z&xkb?|AuPN_36<=&3pDjvS=Xr2yYbrM@jq&CCL}f>k$#XDEFQDBy+rTSqJMfcn16n za;Qj#A?UBta8l)~YB28ISy`gLTJgnO$0Cm*G(!wS_7Rb^h{A5Ay|yShv$xuzh?uv9 zTD6DcZQT$ii@f>a<=pU|DL3!rjj7XWbKH`w@ zt)TCyl)9jNB?52Wi;@_(OA$%Bfj$gbHX@EKI;3_PB4eRJ7|PPy@NM}XzKUPrTSg6J;d?ZKfi5R~S??U|GMM#f=4)EK83Sd%i;1TC% zQO9HJDq+oOP&-{wIJ=KVywlt}b2i#=@~9tacw@&;X?nEbboDN%H1f!!ra9%K9i}M2 z-`^X4sKbR&WK>GzBGOZkY%D5;G%)UK*Z82EOeM<5lE_21FVL9Zg868C{agC~pVtW^ zk$-eiiq1Lb8YE^5#Cawe7}~0eN+AgvN%}fxqs^+QLvEK}&=d^?HqaV#^ZtulQyjU? zm-p#Ob7k{K<5a~lVc^_wHun!^lIg_mAIE%yZymL#^m8PoC6AsqpAk|&Ub%yRdK2&m z&`(;7nZ<0#QI8GvkOoYUNTH@MP6xSPrBLrU#y#ow{g+XRA>*NZDh)UeQfQMy5uZSG7HZUYK5XtBJski#q22kbe#Wr;@t zOkdUhWziwXEBoD2P`}g7Sb6%>`RV>&|3Kf7yt~g>+^{Q3A$?`hAm7X;#e|351oRRQ9kXWVZ zeG{6G0Y9wv2+;Cc4a-Qbs>B;MX7Z;bQo(h{p^=_KI=!<;h$?n{tLQFjbOq@-Cd@(G zYftA-XrRzq=#^+KtDy6k&>+_G3FUZ$Xz(Wu6s9~BUXvA4jW)yEaCb?dU0oWy9{FU-EX02DEYglYl!h^V@+{JDPoH1~98$%mIC+PyTcgQW6{TDeG?zqc zwlC5_)=GGw=9Nzpjamg7L3XV+AOC^%So&lS$KL6TzL8(4#2ka_v~3aeJ_5$_Pi{?K zurjmvl`YUN5Y}UDY{c5wDAwTTKiKR~$4F2EAeavLl4SQnGAI?F%&pGT@$4PKhIx54 zl~^O@(+at{TCsyL+1#uUR*1Px0nb_7H;4njz?H#+7-S3JzqqsT2qzo0schVSrnAqN zo7QvgIj7l+d0`w{q2A$+yFgikD_!g#ty0qNi}xx?Tclo0YgSy@erU?L+=Z8EjnnD| z-d1JK!HUK%vwAfo!-ZCZI@I1v9n$ghhE#gX{v`06-YB->g%N%jL6mNJVU3hi*r8A_ zo+IoJ39E>Q!O> z{+D)3Kka?k--O+bw?mU$v66J3v}Z~?5a~KsDq`lxR3&y4Z;zJtGX!3qinp75j?XZ|EXr(?nu&MctM9M zijs87xGe15t9Y+^@v0~xhV%9SKTy3aA38};v1R!>W#e$7T6A~7V}j>%Jwb-(tZw{c zRG0q0>w<=!YX610n5eG0u7xnzU$TtCP6rHvR=@9cKt4{Sl+qkv%u1$FvXZP0_Ya=e9<>Sa1A{S*GqpLkQp)N6>8Efp zSMiLOC;i#%KAVlxbcm>#xFcx$=}q@HM46(tYIfywUf`U5+Q%_^1#Y1~eN1Ylc&hfO ze7J&9>7`b(rj%yOwG^ZNtJI2qve3#4Xr)0Rw4#M~nCXxdNo|?l65FCyZj?Uk--CR6 z==y+vASP{&HRddgkI7q+54IJs?JY8pFRiF zvcYpEG~8MIG*ZV8gB1LW!w=urxbfa*Pwev!lfbo|ihW+HJNA?nCmwi+u?&@q zm}Mo3F`zAfh@v7t_Ean|krno}*oI7xG`7|29K86tIN?w147@$7z^ib_n)6SzSn*z? z%&U2fWn|cCS?sj=7jnphHT1p6V8;N^N|0+EVqr(5xyY#PK zz>5cHyH95R3uj|yfK~=#>SJaY^XY%0X!uRTcrk0SU(t+-^HkC2#(Nu&G;M7OzGXvN zyy$9iZ1l1LyAqtzsi@~W=adzC1YauP+Xn3B$u=bxD~i@m(eqYu=Mz?@jMjQ1ty3{| z@Rg$H^J;MhP{E3aa&V3OY~_;m9xe_$;F5e;W1Y%_^(d`Vtm6o=UY(M;li7QjPy)0o z7`{?2Vi5NDR+_!7C)Z@1og>vQtpES2y}m)LJ)NioYNs_X)lMa(+RrwKwO^Pm)qdd& z?Vh+pEo%5{3X(bVw%oEl?bsQgQ1)MQjX#kO&JsBalJjiaaubl^;T88X`*ijpP5nHa ziv&AAjBVq59p0lD#hqKf@$$y`*nzTWpN8I;Z-2XE{j9vTm(R|3EFvliI)*T0LvMSO zS-7LlXW=bp#EgNKfqp%=-)2^<_w>#Zc%!-N>n~$Gm{rtS6PwaM`%2K_snj*zVX5YX zHMc>jF4QrCPec{-n;&4Y#IZURQrN|O%>+c}ZeH-_U>D9-qdFu-eBc#P zq7%7StUrO%AKJjEL5XXjRbSc04qU`;q5WhddJf6tDn1c+p(~^q$Q-a2F3Vp)mQ~N( z6nJ#XiQT{%&S39zwi2BP^6nmGEBhR5(LBnCd$iAVTZ-WX;@_A;+!^s>1as2=Gb+(i zK;#nyz8mLk;a4I2u4?b3--%o3|7BZ5?t=E7_zRtLh$;;En)qz&Bq@{6(mvuaCK;8N z#NCMeKfQc3z(n*1Jmu=uA$JpA`y1>E@P3rhXr$Z$X2#?0Rc+xL{&4fJ?%W=&?wp^( zVF9^%F03S1LH0-|Q?b@moRSM-bfFdZbv>S8GW#WS39C~fKVAsCw!!RLulyg>_B7-g z-CGyJRCq#|XEOUjm+{s}Whug)i+LX0kh2CLYK>h1Ut-5b1 z?$)kTcpb)tMui^rg^KN!-AWVMtA?%PADP!+nRSIB`;{2|ADK$vv>B=5-OMF;E#TL0 zi)sIv@eNq%;4^X(!W?=kA*u|Kd9@l7Fk0r_wGc-2KIz;l&XBb4PWd`umyv zl*0W*dhO=Ln&0_et}1Ic!z=$S*vZ-To{)P=k=)fEs#8HE5{@L(-E*@HxrBUJSZ* z4`aGF?w4vn8hU+C$A?Na3=w07V^qO0pmf!}&cVOXzK~aOU&q5|mI#GmR9bO=uv8k~ z=>2`;lfO_}$ZJ692w*kAu&f0yC1|Mz!~GjS8UOzi@UuooUQB4RYVUqt5w_I33g8b3$Cr+Q}y10T?2XG<4ZiDt;pX-d!=x4qZ}Q`tzOj!r#7-F7S1n9j-e97pFo;rE=tBu zVaACB_OQ4eAk>aMRLm2!U8J)V`1wmwDX}RhY@N9aY8|`|JHbipnjX@z2o=Zn9MFOYY~h3lvd;*{yF zoXM5(UbU*RCuZ(3*djVfN)CJS(I5UGohs=>naB4k7xzrpWs*^d5WN|cS_Ex-F)Kq3 zV;`#7swacx5es(>X*e?)AuM|lgdl;k+El@rXFtKFCnce{=x zsNoa*kkUfN+CQWX;|FZ++#JLj3mfTGk+^-cW<`#IM;Ukn<-a7VcP@XcmwJdLNC@wRpR?JzCnep#t!lOtEgl(R}XGVNIeymydpoQ5)w^F ztqFg~XFAStPX7_Y1y@ZF7a(QBN#edJub>^9B+oe8L27d|pXQ7;1zN+ezRI}yy)uoG zWMP3z=%1eERwmf%#?GJ<4e{i$^|3QL@?-J(`m+_1RTR;CSVXlRKOEFQjPI3A8i-h& z*56=`!Qxtyg!1^P*JJy(*f4-y6UK=kyB#HxWnJ4c`7TbkZSBo z^`C#V?7(bz;6d^`jGk(R{`csGsCDO7{dL&#WQ0ol8m z;urI(W{;5GUhNV4>W7q~bLEQskY>yhc4i%lwq!9ZG1^YG$ETafRV6 zdz1U!p?F1XV=^dE#0Fp4yKT&@Ja7)-4!+6lhnIKit*ykb(g7aw!MuMTuj66lV_Tg! zFHcOB@8VU0T`AELLH;H2Z-Oim{@q3YaM%xrL6Q}+SGL1J(kq7|FvGe!MA5W)(0zCz zydu4UK^}DiKNHLr0uugVmcNuRbEB1PP>lATDwvGy(oQ7vH;e z{?<$GYf2gY9>iDE#+G~Hc>J(-Tp-X&kxC0EBb>#zzDQQGqTI4mIFrxITl;koTU_Qa zqVF<+PD92hlwTqIFVbCTqQn&eEE2G#LBK}=f>btmGNrUGof1hV=^OMw_$8`M-z4J` zej#z}k~oumTNo$FVAbsh?r*M8x0p~u?4jCaj)+RBR939P9#|KZLOUL44m4wcN4Q91 zX6DzHt6i>eK+lA;4B|=8u`y)@?jZ@M2aZbN^eOf_oJM?ywrA?QtT)Vh?? zcjbO1>`8F9g?}v{zc+>3Dad;^d0mR<_A|^F9uh#|=En`;MC9gu)zmA-E4C;|^GTLY z()=S65PC?OPZH^dptN0-=0mpLCCx`_WHZ53^MU7*Ad~AY+Hh<3&^IK50=&(aic+%c zq?P6{H$5R*O9OtFE_zmPx#1Cd@vNW&fMmXxpks)|3z&@RGY*vd`~-yW-v89vmS2}Y zf#^~Y+aOsW*#Y4gdb#%aQBiXN4S*N}YRiYgpJpt$UWWXeRQy7`up3fJp4oB@ukE5H z-~#XNJr2}H*kM8iO$}(Ins04Sm{S5dvVb+n367)(?u8J)Pzh`amBNC4LP1&xu|?tg zE}cL>IRcsqxhdhhm}c8!=8|5`j7j>-aQI46vSoMR$!k$>wiUNZ@sf#BIYw1EwX%K= zBrkXSaZA?swWhAGZ>XPAsiYIVdXX}s{z&T-DmiO?>yeG~%Wf|Mt=~w}1oZH&DZ{PF zT*b;HKyO~&tLTpyo6M2zb8Y@xhzY5sIGTMXj_?5e0)$Dn#t6P(zBr5+VQ1jS*mjx6 ztjXHeWxFW&RY@&{Z&cJgm^^h<-yz)&e3rs4fZncwHxH-Q4o&9_wZlFJT5y32@~(B` ztq_W_Tz4__4hZ>x@lW4@nnXWMB(HwdQc`GbZm>1f51Xu+!psFNDJk6#Tgr!fBfMVn zZ+J>ZE9Bo2dCcU^mBvYy_V8inRDK#_+CaL_xK4QfmqtQ;$c%<{@dNd{raW5zHu4bq zaQ#yst>5%nSN$g*u78_(J!ko`ggM7SBCUtMp;O%lxK~(|f;Sa@gzsht);zBev^egD z!Q?M{c?pxp-`t|!#It1m;GSK`R4QRn#8j-o9y7q*);u7=*&r)(waChx2V@DnM|Pla zH>5#2)RWogv%*@}zQToq|0|j)^0>0iyw7g=sYK@HS9Fq;hBI4!-!4ls!w%!I1bYj( zrSi5iej{`V@rJ}r$sDxfR)Wq3^Kdhbo$NKPlpi!F!Am`)LS}j;fl;2r|9V-4N4g=q z_1Wwrlkj4W(ns&;kcETz#*7#j82#+`Qfx4$;Pq3F#OPn&^l(g}@U{+f?w4Y-t~?T3 zPyA}e)L)AAnjVe~jQ-~%r30h$FFl$k{M$!j^si?<5;OW&Uq2EP_r6<-p>?JCsALRT znNS!UOu{Iq)nDouXk6nWYhZ#FG_>Ju3@8-tjKR~FN0o8*S&3h9|ui+Fh-evoMfV~>2*5S245xlotvA%>5R07jCgU1;KDphZH3f9LmP=(C}Jzv zU8PpUm?c}z9