fixed mixed reset flags #648

fixed `mCbAlarm` if MQTT is not used #653
lumapu · Feb 5, 2023 · a9179ec · a9179ec
1 parent 1a3d101
commit a9179ec
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 4 deletions.
diff --git a/src/CHANGES.md b/src/CHANGES.md
@@ -2,6 +2,10 @@
 
 (starting from release version `0.5.66`)
 
+## 0.5.79
+* fixed mixed reset flags #648
+* fixed `mCbAlarm` if MQTT is not used #653
+
 ## 0.5.78
 * further improvements regarding wifi #611, fix connection if only one AP with same SSID is there
 * fix endless loop in `zerovalues` #564

diff --git a/src/hm/payload.h b/src/hm/payload.h
@@ -47,6 +47,7 @@ class Payload {
             }
             mSerialDebug  = false;
             mHighPrioIv = NULL;
+            mCbAlarm = NULL;
         }
 
         void enableSerialDebug(bool enable) {
@@ -266,7 +267,8 @@ class Payload {
                                     code = iv->parseAlarmLog(i++, payload, payloadLen, &start, &end);
                                     if(0 == code)
                                         break;
-                                    (mCbAlarm)(code, start, end);
+                                    if(NULL != mCbAlarm)
+                                        (mCbAlarm)(code, start, end);
                                     yield();
                                 }
                             }
@@ -290,7 +292,8 @@ class Payload {
         }
 
         void notify(uint16_t code, uint32_t start, uint32_t endTime) {
-            (mCbAlarm)(code, start, endTime);
+            if(NULL != mCbAlarm)
+                (mCbAlarm)(code, start, endTime);
         }
 
         bool build(uint8_t id, bool *complete) {

diff --git a/src/web/web.h b/src/web/web.h
@@ -550,8 +550,8 @@ class Web {
             mConfig->mqtt.port = request->arg("mqttPort").toInt();
             mConfig->mqtt.interval = request->arg("mqttInterval").toInt();
             mConfig->mqtt.rstYieldMidNight = (request->arg("mqttRstMid") == "on");
-            mConfig->mqtt.rstValsNotAvail  = (request->arg("mqttRstComStop") == "on");
-            mConfig->mqtt.rstValsCommStop  = (request->arg("mqttRstNotAvail") == "on");
+            mConfig->mqtt.rstValsCommStop  = (request->arg("mqttRstComStop") == "on");
+            mConfig->mqtt.rstValsNotAvail  = (request->arg("mqttRstNotAvail") == "on");
 
             // serial console
             if(request->arg("serIntvl") != "") {