optimizations

src/ESP32React/APSettingsService.cpp

@@ -21,24 +21,24 @@ void APSettingsService::begin() {
 
 // wait 10 sec on STA disconnect before starting AP
 void APSettingsService::WiFiEvent(WiFiEvent_t event) {
-    uint8_t was_connected = _connected;
+    const uint8_t was_connected = _connected;
     switch (event) {
     case ARDUINO_EVENT_WIFI_STA_DISCONNECTED:
-        _connected &= ~1;
+        _connected &= ~1U;
         break;
     case ARDUINO_EVENT_ETH_DISCONNECTED:
-        _connected &= ~2;
+        _connected &= ~2U;
         break;
     case ARDUINO_EVENT_WIFI_STA_GOT_IP:
     case ARDUINO_EVENT_WIFI_STA_GOT_IP6:
-        _connected |= 1;
+        _connected |= 1U;
         break;
     case ARDUINO_EVENT_ETH_GOT_IP:
     case ARDUINO_EVENT_ETH_GOT_IP6:
-        _connected |= 2;
+        _connected |= 2U;
         break;
     default:
-        break;
+        return;
     }
     // wait 10 sec before starting AP
     if (was_connected && !_connected) {
@@ -52,18 +52,19 @@ void APSettingsService::reconfigureAP() {
 }
 
 void APSettingsService::loop() {
-    unsigned long currentMillis = uuid::get_uptime();
+    const unsigned long currentMillis = uuid::get_uptime();
-    unsigned long manageElapsed = static_cast<uint32_t>(currentMillis - _lastManaged);
+    if ((currentMillis - _lastManaged) >= MANAGE_NETWORK_DELAY) {
-    if (manageElapsed >= MANAGE_NETWORK_DELAY) {
         _lastManaged = currentMillis;
         manageAP();
     }
 
+    if (_dnsServer) {
         handleDNS();
     }
+}
 
 void APSettingsService::manageAP() {
-    WiFiMode_t currentWiFiMode = WiFi.getMode();
+    const WiFiMode_t currentWiFiMode = WiFi.getMode();
     if (_state.provisionMode == AP_MODE_ALWAYS || (_state.provisionMode == AP_MODE_DISCONNECTED && !_connected)) {
         if (_reconfigureAp || currentWiFiMode == WIFI_OFF || currentWiFiMode == WIFI_STA) {
             startAP();
@@ -87,8 +88,10 @@ void APSettingsService::startAP() {
     WiFi.setTxPower(WIFI_POWER_8_5dBm); // https://www.wemos.cc/en/latest/c3/c3_mini_1_0_0.html#about-wifi
 #endif
     if (!_dnsServer) {
-        IPAddress apIp = WiFi.softAPIP();
+        const IPAddress apIp = WiFi.softAPIP();
-        emsesp::EMSESP::logger().info("Starting Access Point with captive portal on %s", apIp.toString().c_str());
+        char            ipStr[16];
+        snprintf(ipStr, sizeof(ipStr), "%u.%u.%u.%u", apIp[0], apIp[1], apIp[2], apIp[3]);
+        emsesp::EMSESP::logger().info("Starting Access Point with captive portal on %s", ipStr);
         _dnsServer = new DNSServer;
         _dnsServer->start(DNS_PORT, "*", apIp);
     }
@@ -111,8 +114,8 @@ void APSettingsService::handleDNS() {
 }
 
 APNetworkStatus APSettingsService::getAPNetworkStatus() {
-    WiFiMode_t currentWiFiMode = WiFi.getMode();
+    const WiFiMode_t currentWiFiMode = WiFi.getMode();
-    bool       apActive        = currentWiFiMode == WIFI_AP || currentWiFiMode == WIFI_AP_STA;
+    const bool       apActive        = (currentWiFiMode == WIFI_AP || currentWiFiMode == WIFI_AP_STA);
 
     if (apActive && _state.provisionMode != AP_MODE_ALWAYS && WiFi.status() == WL_CONNECTED) {
         return APNetworkStatus::LINGERING;
@@ -135,7 +138,7 @@ void APSettings::read(const APSettings & settings, JsonObject root) {
 }
 
 StateUpdateResult APSettings::update(JsonObject root, APSettings & settings) {
-    APSettings newSettings    = {};
+    APSettings newSettings{};
     newSettings.provisionMode = static_cast<uint8_t>(root["provision_mode"] | FACTORY_AP_PROVISION_MODE);
 
     switch (settings.provisionMode) {

src/ESP32React/APSettingsService.h

@@ -1,5 +1,5 @@
-#ifndef APSettingsConfig_h
+#ifndef APSettingsService_h
-#define APSettingsConfig_h
+#define APSettingsService_h
 
 #include "HttpEndpoint.h"
 #include "FSPersistence.h"
@@ -70,9 +70,9 @@ class APSettings {
     IPAddress subnetMask;
 
     bool operator==(const APSettings & settings) const {
-        return provisionMode == settings.provisionMode && ssid == settings.ssid && password == settings.password && channel == settings.channel
+        return provisionMode == settings.provisionMode && channel == settings.channel && ssidHidden == settings.ssidHidden
-               && ssidHidden == settings.ssidHidden && maxClients == settings.maxClients && localIP == settings.localIP && gatewayIP == settings.gatewayIP
+               && maxClients == settings.maxClients && localIP == settings.localIP && gatewayIP == settings.gatewayIP
-               && subnetMask == settings.subnetMask;
+               && subnetMask == settings.subnetMask && ssid == settings.ssid && password == settings.password;
     }
 
     static void              read(const APSettings & settings, JsonObject root);
@@ -96,8 +96,8 @@ class APSettingsService : public StatefulService<APSettings> {
 
     // for the management delay loop
     volatile unsigned long _lastManaged;
-    volatile boolean       _reconfigureAp;
+    volatile bool          _reconfigureAp;
-    uint8_t                _connected;
+    volatile uint8_t       _connected;
 
     void reconfigureAP();
     void manageAP();

src/ESP32React/JsonUtils.h

@@ -10,20 +10,23 @@
 class JsonUtils {
   public:
     static void readIP(JsonObject root, const String & key, IPAddress & ip, const String & def) {
-        IPAddress defaultIp = {};
+        IPAddress defaultIp{};
         if (!defaultIp.fromString(def)) {
             defaultIp = INADDR_NONE;
         }
         readIP(root, key, ip, defaultIp);
     }
     static void readIP(JsonObject root, const String & key, IPAddress & ip, const IPAddress & defaultIp = INADDR_NONE) {
-        if (!root[key].is<String>() || !ip.fromString(root[key].as<String>())) {
+        const JsonVariant value = root[key];
+        if (!value.is<String>() || !ip.fromString(value.as<const char *>())) {
             ip = defaultIp;
         }
     }
     static void writeIP(JsonObject root, const String & key, const IPAddress & ip) {
         if (IPUtils::isSet(ip)) {
-            root[key] = ip.toString();
+            char ipStr[16];
+            snprintf(ipStr, sizeof(ipStr), "%u.%u.%u.%u", ip[0], ip[1], ip[2], ip[3]);
+            root[key] = ipStr;
         }
     }
 };

src/ESP32React/MqttSettingsService.cpp

@@ -255,7 +255,7 @@ void MqttSettings::read(MqttSettings & settings, JsonObject root) {
 }
 
 StateUpdateResult MqttSettings::update(JsonObject root, MqttSettings & settings) {
-    MqttSettings newSettings = {};
+    MqttSettings newSettings;
     bool         changed     = false;
 
 #ifndef TASMOTA_SDK

src/ESP32React/MqttSettingsService.h

@@ -125,11 +125,11 @@ class MqttSettingsService : public StatefulService<MqttSettings> {
     FSPersistence<MqttSettings> _fsPersistence;
 
     // variable to help manage connection
-    bool          _reconfigureMqtt;
+    volatile bool          _reconfigureMqtt;
-    unsigned long _disconnectedAt;
+    volatile unsigned long _disconnectedAt;
 
     // connection status
-    espMqttClientTypes::DisconnectReason _disconnectReason;
+    volatile espMqttClientTypes::DisconnectReason _disconnectReason;
 
     // the MQTT client instance
     MqttClient * _mqttClient;

src/ESP32React/NTPSettingsService.h

@@ -49,7 +49,7 @@ class NTPSettingsService : public StatefulService<NTPSettings> {
   private:
     HttpEndpoint<NTPSettings>  _httpEndpoint;
     FSPersistence<NTPSettings> _fsPersistence;
-    bool                       _connected;
+    volatile bool              _connected;
 
     void WiFiEvent(WiFiEvent_t event);
     void configureNTP();

src/ESP32React/NetworkSettingsService.h

@@ -102,10 +102,10 @@ class NetworkSettingsService : public StatefulService<NetworkSettings> {
     HttpEndpoint<NetworkSettings>  _httpEndpoint;
     FSPersistence<NetworkSettings> _fsPersistence;
 
-    unsigned long _lastConnectionAttempt;
+    volatile unsigned long _lastConnectionAttempt;
-    bool          _stopping;
+    volatile bool          _stopping;
 
-    uint16_t connectcount_ = 0; // number of wifi reconnects
+    volatile uint16_t connectcount_ = 0; // number of wifi reconnects
 
     void         WiFiEvent(WiFiEvent_t event, WiFiEventInfo_t info);
     void         mDNS_start() const;

src/devices/thermostat.cpp

@@ -59,7 +59,8 @@ Thermostat::Thermostat(uint8_t device_type, uint8_t device_id, uint8_t product_i
     if (model == EMSdevice::EMS_DEVICE_FLAG_RC10) {
         monitor_typeids = {0xB1};
         set_typeids     = {0xB0};
-        for (uint8_t i = 0; i < monitor_typeids.size(); i++) {
+        const size_t size = monitor_typeids.size();
+        for (uint8_t i = 0; i < size; i++) {
             register_telegram_type(monitor_typeids[i], "RC10Monitor", false, MAKE_PF_CB(process_RC10Monitor));
             register_telegram_type(set_typeids[i], "RC10Set", false, MAKE_PF_CB(process_RC10Set));
         }
@@ -70,7 +71,8 @@ Thermostat::Thermostat(uint8_t device_type, uint8_t device_id, uint8_t product_i
         set_typeids     = {0x3D, 0x47, 0x51, 0x5B};
         timer_typeids   = {0x3F, 0x49, 0x53, 0x5D};
         timer2_typeids  = {0x42, 0x4C, 0x56, 0x60};
-        for (uint8_t i = 0; i < monitor_typeids.size(); i++) {
+        const size_t size = monitor_typeids.size();
+        for (uint8_t i = 0; i < size; i++) {
             register_telegram_type(monitor_typeids[i], "RC35Monitor", false, MAKE_PF_CB(process_RC35Monitor));
             register_telegram_type(set_typeids[i], "RC35Set", false, MAKE_PF_CB(process_RC35Set));
             register_telegram_type(timer_typeids[i], "RC35Timer", false, MAKE_PF_CB(process_RC35Timer));
@@ -88,7 +90,8 @@ Thermostat::Thermostat(uint8_t device_type, uint8_t device_id, uint8_t product_i
             set_typeids     = {0xA8};
             curve_typeids   = {0x90};
             timer_typeids   = {0x8F};
-            for (uint8_t i = 0; i < monitor_typeids.size(); i++) {
+            const size_t size = monitor_typeids.size();
+            for (uint8_t i = 0; i < size; i++) {
                 register_telegram_type(monitor_typeids[i], "RC20Monitor", false, MAKE_PF_CB(process_RC20Monitor));
                 register_telegram_type(set_typeids[i], "RC20Set", false, MAKE_PF_CB(process_RC20Set));
                 register_telegram_type(curve_typeids[i], "RC20Temp", false, MAKE_PF_CB(process_RC20Temp));
@@ -103,7 +106,8 @@ Thermostat::Thermostat(uint8_t device_type, uint8_t device_id, uint8_t product_i
         if (device_id == 0x17) { // master
             monitor_typeids = {0xAE};
             set_typeids     = {0xAD};
-            for (uint8_t i = 0; i < monitor_typeids.size(); i++) {
+            const size_t size = monitor_typeids.size();
+            for (uint8_t i = 0; i < size; i++) {
                 register_telegram_type(monitor_typeids[i], "RC20Monitor", false, MAKE_PF_CB(process_RC20Monitor_2));
                 register_telegram_type(set_typeids[i], "RC20Set", false, MAKE_PF_CB(process_RC20Set_2));
             }
@@ -117,7 +121,8 @@ Thermostat::Thermostat(uint8_t device_type, uint8_t device_id, uint8_t product_i
         set_typeids     = {0xA7};
         curve_typeids   = {0x40};
         timer_typeids   = {0x3F};
-        for (uint8_t i = 0; i < monitor_typeids.size(); i++) {
+        const size_t size = monitor_typeids.size();
+        for (uint8_t i = 0; i < size; i++) {
             register_telegram_type(monitor_typeids[i], "RC30Monitor", false, MAKE_PF_CB(process_RC30Monitor));
             register_telegram_type(set_typeids[i], "RC30Set", false, MAKE_PF_CB(process_RC30Set));
             register_telegram_type(curve_typeids[i], "RC30Temp", false, MAKE_PF_CB(process_RC30Temp));
@@ -131,15 +136,16 @@ Thermostat::Thermostat(uint8_t device_type, uint8_t device_id, uint8_t product_i
         // EASY
     } else if (model == EMSdevice::EMS_DEVICE_FLAG_EASY) {
         monitor_typeids = {0x0A};
-        set_typeids     = {};
+        set_typeids.clear();
         register_telegram_type(monitor_typeids[0], "EasyMonitor", true, MAKE_PF_CB(process_EasyMonitor));
         register_telegram_type(0x02A5, "EasyMonitor", false, MAKE_PF_CB(process_EasyMonitor));
 
         // CRF
     } else if (model == EMSdevice::EMS_DEVICE_FLAG_CRF) {
         monitor_typeids = {0x02A5, 0x02A6, 0x02A7, 0x02A8};
-        set_typeids     = {};
+        set_typeids.clear();
-        for (uint8_t i = 0; i < monitor_typeids.size(); i++) {
+        const size_t size = monitor_typeids.size();
+        for (uint8_t i = 0; i < size; i++) {
             register_telegram_type(monitor_typeids[i], "CRFMonitor", false, MAKE_PF_CB(process_CRFMonitor));
         }
 
@@ -163,14 +169,16 @@ Thermostat::Thermostat(uint8_t device_type, uint8_t device_id, uint8_t product_i
         summer2_typeids = {0x0471, 0x0472, 0x0473, 0x0474, 0x0475, 0x0476, 0x0477, 0x0478};
         hp_typeids      = {0x0467, 0x0468, 0x0469, 0x046A};
         hpmode_typeids  = {0x0291, 0x0292, 0x0293, 0x0294};
-        for (uint8_t i = 0; i < monitor_typeids.size(); i++) {
+        const size_t monitor_size = monitor_typeids.size();
+        for (uint8_t i = 0; i < monitor_size; i++) {
             register_telegram_type(monitor_typeids[i], "RC300Monitor", false, MAKE_PF_CB(process_RC300Monitor));
             register_telegram_type(set_typeids[i], "RC300Set", false, MAKE_PF_CB(process_RC300Set));
             register_telegram_type(summer_typeids[i], "RC300Summer", false, MAKE_PF_CB(process_RC300Summer));
             register_telegram_type(curve_typeids[i], "RC300Curves", false, MAKE_PF_CB(process_RC300Curve));
             register_telegram_type(summer2_typeids[i], "RC300Summer2", false, MAKE_PF_CB(process_RC300Summer2));
         }
-        for (uint8_t i = 0; i < set2_typeids.size(); i++) {
+        const size_t set2_size = set2_typeids.size();
+        for (uint8_t i = 0; i < set2_size; i++) {
             // register_telegram_type(set2_typeids[i], "RC300Set2", false, MAKE_PF_CB(process_RC300Set2));
             register_telegram_type(set2_typeids[i], "RC300Set2", false, MAKE_PF_CB(process_PID));
             register_telegram_type(hp_typeids[i], "HPSet", false, MAKE_PF_CB(process_HPSet));
@@ -210,19 +218,20 @@ Thermostat::Thermostat(uint8_t device_type, uint8_t device_id, uint8_t product_i
         }
 
         monitor_typeids = {0x016F, 0x0170, 0x0171, 0x0172};
-        for (uint8_t i = 0; i < monitor_typeids.size(); i++) {
+        const size_t junkers_size = monitor_typeids.size();
+        for (uint8_t i = 0; i < junkers_size; i++) {
             register_telegram_type(monitor_typeids[i], "JunkersMonitor", false, MAKE_PF_CB(process_JunkersMonitor));
         }
 
         if (has_flags(EMSdevice::EMS_DEVICE_FLAG_JUNKERS_OLD)) {
             // FR120, FR100
             set_typeids = {0x0179, 0x017A, 0x017B, 0x017C};
-            for (uint8_t i = 0; i < monitor_typeids.size(); i++) {
+            for (uint8_t i = 0; i < junkers_size; i++) {
                 register_telegram_type(set_typeids[i], "JunkersSet", false, MAKE_PF_CB(process_JunkersSet2));
             }
         } else {
             set_typeids = {0x0165, 0x0166, 0x0167, 0x0168};
-            for (uint8_t i = 0; i < monitor_typeids.size(); i++) {
+            for (uint8_t i = 0; i < junkers_size; i++) {
                 register_telegram_type(set_typeids[i], "JunkersSet", false, MAKE_PF_CB(process_JunkersSet));
             }
         }
@@ -237,10 +246,12 @@ Thermostat::Thermostat(uint8_t device_type, uint8_t device_id, uint8_t product_i
 
     // query all the heating circuits. This is only done once.
     // The automatic fetch will from now on only update the active heating circuits
-    for (uint8_t i = 0; i < monitor_typeids.size(); i++) {
+    const size_t monitor_size_final = monitor_typeids.size();
+    for (uint8_t i = 0; i < monitor_size_final; i++) {
         EMSESP::send_read_request(monitor_typeids[i], device_id);
     }
-    for (uint8_t i = 0; i < set_typeids.size(); i++) {
+    const size_t set_size = set_typeids.size();
+    for (uint8_t i = 0; i < set_size; i++) {
         EMSESP::send_read_request(set_typeids[i], device_id);
     }
 
@@ -293,7 +304,8 @@ std::shared_ptr<Thermostat::HeatingCircuit> Thermostat::heating_circuit(std::sha
 
     // not found, search monitor message types
     if (hc_num == 0) {
-        for (uint8_t i = 0; i < monitor_typeids.size(); i++) {
+        const size_t monitor_size = monitor_typeids.size();
+        for (uint8_t i = 0; i < monitor_size; i++) {
             if (monitor_typeids[i] == telegram->type_id) {
                 hc_num  = i + 1;
                 toggle_ = true;
@@ -304,7 +316,8 @@ std::shared_ptr<Thermostat::HeatingCircuit> Thermostat::heating_circuit(std::sha
 
     // not found, search status message/set types
     if (hc_num == 0) {
-        for (uint8_t i = 0; i < set_typeids.size(); i++) {
+        const size_t set_size = set_typeids.size();
+        for (uint8_t i = 0; i < set_size; i++) {
             if (set_typeids[i] == telegram->type_id) {
                 hc_num = i + 1;
                 break;
@@ -314,7 +327,8 @@ std::shared_ptr<Thermostat::HeatingCircuit> Thermostat::heating_circuit(std::sha
 
     // not found, search set2 types
     if (hc_num == 0) {
-        for (uint8_t i = 0; i < set2_typeids.size(); i++) {
+        const size_t set2_size = set2_typeids.size();
+        for (uint8_t i = 0; i < set2_size; i++) {
             if (set2_typeids[i] == telegram->type_id) {
                 hc_num = i + 1;
                 break;
@@ -324,7 +338,8 @@ std::shared_ptr<Thermostat::HeatingCircuit> Thermostat::heating_circuit(std::sha
 
     // not found, search summer message types
     if (hc_num == 0) {
-        for (uint8_t i = 0; i < summer_typeids.size(); i++) {
+        const size_t summer_size = summer_typeids.size();
+        for (uint8_t i = 0; i < summer_size; i++) {
             if (summer_typeids[i] == telegram->type_id) {
                 hc_num = i + 1;
                 break;
@@ -334,7 +349,8 @@ std::shared_ptr<Thermostat::HeatingCircuit> Thermostat::heating_circuit(std::sha
 
     // not found, search summer message types
     if (hc_num == 0) {
-        for (uint8_t i = 0; i < summer2_typeids.size(); i++) {
+        const size_t summer2_size = summer2_typeids.size();
+        for (uint8_t i = 0; i < summer2_size; i++) {
             if (summer2_typeids[i] == telegram->type_id) {
                 hc_num = i + 1;
                 break;
@@ -344,7 +360,8 @@ std::shared_ptr<Thermostat::HeatingCircuit> Thermostat::heating_circuit(std::sha
 
     // not found, search heating_curve message types
     if (hc_num == 0) {
-        for (uint8_t i = 0; i < curve_typeids.size(); i++) {
+        const size_t curve_size = curve_typeids.size();
+        for (uint8_t i = 0; i < curve_size; i++) {
             if (curve_typeids[i] == telegram->type_id) {
                 hc_num = i + 1;
                 break;
@@ -354,7 +371,8 @@ std::shared_ptr<Thermostat::HeatingCircuit> Thermostat::heating_circuit(std::sha
 
     // not found, search timer message types
     if (hc_num == 0) {
-        for (uint8_t i = 0; i < timer_typeids.size(); i++) {
+        const size_t timer_size = timer_typeids.size();
+        for (uint8_t i = 0; i < timer_size; i++) {
             if (timer_typeids[i] == telegram->type_id) {
                 hc_num = i + 1;
                 break;
@@ -364,7 +382,8 @@ std::shared_ptr<Thermostat::HeatingCircuit> Thermostat::heating_circuit(std::sha
 
     // not found, search timer message types
     if (hc_num == 0) {
-        for (uint8_t i = 0; i < timer2_typeids.size(); i++) {
+        const size_t timer2_size = timer2_typeids.size();
+        for (uint8_t i = 0; i < timer2_size; i++) {
             if (timer2_typeids[i] == telegram->type_id) {
                 hc_num = i + 1;
                 break;
@@ -374,7 +393,8 @@ std::shared_ptr<Thermostat::HeatingCircuit> Thermostat::heating_circuit(std::sha
 
     // not found, search heatpump message types
     if (hc_num == 0) {
-        for (uint8_t i = 0; i < hp_typeids.size(); i++) {
+        const size_t hp_size = hp_typeids.size();
+        for (uint8_t i = 0; i < hp_size; i++) {
             if (hp_typeids[i] == telegram->type_id) {
                 hc_num = i + 1;
                 break;
@@ -383,7 +403,8 @@ std::shared_ptr<Thermostat::HeatingCircuit> Thermostat::heating_circuit(std::sha
     }
 
     if (hc_num == 0) {
-        for (uint8_t i = 0; i < hpmode_typeids.size(); i++) {
+        const size_t hpmode_size = hpmode_typeids.size();
+        for (uint8_t i = 0; i < hpmode_size; i++) {
             if (hpmode_typeids[i] == telegram->type_id) {
                 hc_num = i + 1;
                 break;