3pp-mirror/ahoy
1
0
Fork 0
mirror of https://github.com/lumapu/ahoy.git synced 2025-06-05 20:21:38 +02:00
Code Issues Projects Releases Packages Wiki Activity

fixed mixed reset flags #648

Browse source 
fixed `mCbAlarm` if MQTT is not used #653
This commit is contained in:
lumapu 2023-02-05 22:14:59 +01:00
parent 1a3d101094
commit a9179ec1ea
3 changed files with 11 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

4
src/CHANGES.md
View file

@ -2,6 +2,10 @@
(starting from release version `0.5.66`) (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 ## 0.5.78
* further improvements regarding wifi #611, fix connection if only one AP with same SSID is there * further improvements regarding wifi #611, fix connection if only one AP with same SSID is there
* fix endless loop in `zerovalues` #564 * fix endless loop in `zerovalues` #564

7
src/hm/payload.h
View file

@ -47,6 +47,7 @@ class Payload {
} }
mSerialDebug = false; mSerialDebug = false;
mHighPrioIv = NULL; mHighPrioIv = NULL;
mCbAlarm = NULL;
} }
void enableSerialDebug(bool enable) { void enableSerialDebug(bool enable) {
@ -266,7 +267,8 @@ class Payload {
code = iv->parseAlarmLog(i++, payload, payloadLen, &start, &end); code = iv->parseAlarmLog(i++, payload, payloadLen, &start, &end);
if(0 == code) if(0 == code)
break; break;
(mCbAlarm)(code, start, end); if(NULL != mCbAlarm)
(mCbAlarm)(code, start, end);
yield(); yield();
} }
} }
@ -290,7 +292,8 @@ class Payload {
} }
void notify(uint16_t code, uint32_t start, uint32_t endTime) { 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) { bool build(uint8_t id, bool *complete) {

4
src/web/web.h
View file

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