jeans/openHASP
jeans/openHASP
1
0
Fork 0
mirror of https://github.com/HASwitchPlate/openHASP.git synced 2025-07-27 13:16:45 +00:00
Code Issues Packages Projects Releases Wiki Activity

Rename status to LWT with online/offline payload

Browse Source
This commit is contained in:
fvanroie 2021-01-06 21:15:35 +01:00
parent 79bb4792f2
commit 877400bb18
1 changed files with 17 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
src/svc/hasp_mqtt.cpp
View File

@ -212,19 +212,19 @@ static void mqtt_message_cb(char * topic, byte * payload, unsigned int length)
} }
// catch a dangling LWT from a previous connection if it appears // catch a dangling LWT from a previous connection if it appears
if(!strcmp_P(topic, PSTR("status"))) { // endsWith status if(!strcmp_P(topic, PSTR("LWT"))) { // endsWith LWT
if(!strcasecmp_P((char *)payload, PSTR("OFF"))) { if(!strcasecmp_P((char *)payload, PSTR("offline"))) {
{ {
char msg[4]; char msg[8];
char tmp_topic[strlen(mqttNodeTopic) + 8]; char tmp_topic[strlen(mqttNodeTopic) + 8];
snprintf_P(tmp_topic, sizeof(tmp_topic), PSTR("%sstatus"), mqttNodeTopic); snprintf_P(tmp_topic, sizeof(tmp_topic), PSTR("%sLWT"), mqttNodeTopic);
snprintf_P(msg, sizeof(msg), PSTR("ON")); snprintf_P(msg, sizeof(msg), PSTR("online"));
/*bool res =*/mqttClient.publish(tmp_topic, msg, true); /*bool res =*/mqttClient.publish(tmp_topic, msg, true);
} }
} else { } else {
// Log.notice(TAG_MQTT, F("ignoring status = ON")); // Log.notice(TAG_MQTT, F("ignoring LWT = online"));
} }
} else { } else {
dispatch_topic_payload(topic, (const char *)payload); dispatch_topic_payload(topic, (const char *)payload);
@ -246,7 +246,7 @@ void mqttStart()
{ {
char buffer[64]; char buffer[64];
char mqttClientId[64]; char mqttClientId[64];
char lastWillPayload[4]; char lastWillPayload[8];
static uint8_t mqttReconnectCount = 0; static uint8_t mqttReconnectCount = 0;
bool mqttFirstConnect = true; bool mqttFirstConnect = true;
@ -263,8 +263,8 @@ void mqttStart()
} }
// Attempt to connect and set LWT and Clean Session // Attempt to connect and set LWT and Clean Session
snprintf_P(buffer, sizeof(buffer), PSTR("%sstatus"), mqttNodeTopic); // lastWillTopic snprintf_P(buffer, sizeof(buffer), PSTR("%sLWT"), mqttNodeTopic); // lastWillTopic
snprintf_P(lastWillPayload, sizeof(lastWillPayload), PSTR("OFF")); // lastWillPayload snprintf_P(lastWillPayload, sizeof(lastWillPayload), PSTR("offline")); // lastWillPayload
haspProgressMsg(F("Connecting MQTT...")); haspProgressMsg(F("Connecting MQTT..."));
haspProgressVal(mqttReconnectCount * 5); haspProgressVal(mqttReconnectCount * 5);
@ -337,18 +337,17 @@ void mqttStart()
mqttSubscribeTo(PSTR("%sconfig/#"), mqttNodeTopic); mqttSubscribeTo(PSTR("%sconfig/#"), mqttNodeTopic);
mqttSubscribeTo(PSTR("%slight/#"), mqttNodeTopic); mqttSubscribeTo(PSTR("%slight/#"), mqttNodeTopic);
mqttSubscribeTo(PSTR("%sbrightness/#"), mqttNodeTopic); mqttSubscribeTo(PSTR("%sbrightness/#"), mqttNodeTopic);
mqttSubscribeTo(PSTR("%sstatus"), mqttNodeTopic); mqttSubscribeTo(PSTR("%sLWT"), mqttNodeTopic);
// Force any subscribed clients to toggle OFF/ON when we first connect to // Force any subscribed clients to toggle offline/online when we first connect to
// make sure we get a full panel refresh at power on. Sending OFF, // make sure we get a full panel refresh at power on. Sending offline,
// "ON" will be sent by the mqttStatusTopic subscription action. // "online" will be sent by the mqttStatusTopic subscription action.
snprintf_P(buffer, sizeof(buffer), PSTR("%sstatus"), mqttNodeTopic); snprintf_P(buffer, sizeof(buffer), PSTR("%sLWT"), mqttNodeTopic);
{ {
char msg[8]; snprintf_P(lastWillPayload, sizeof(lastWillPayload), mqttFirstConnect ? PSTR("offline") : PSTR("online"));
snprintf_P(msg, sizeof(msg), mqttFirstConnect ? PSTR("OFF") : PSTR("ON"));
mqttClient.publish(buffer, msg, true); mqttClient.publish(buffer, lastWillPayload, true);
Log.notice(TAG_MQTT, F("binary_sensor state: [%sstatus] : %s"), mqttNodeTopic, msg); Log.notice(TAG_MQTT, F("%s = %s"), buffer, lastWillPayload);
} }
mqttFirstConnect = false; mqttFirstConnect = false;