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

Add define for LWT_TOPIC

Browse Source
This commit is contained in:
fvanroie 2021-02-08 01:06:24 +01:00
parent 7997ed53ea
commit f90a2a1e57
1 changed files with 15 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
src/svc/hasp_mqtt.cpp
View File

@ -77,6 +77,8 @@ bool mqttHAautodiscover = true;
#define MQTT_PREFIX "hasp" #define MQTT_PREFIX "hasp"
#endif #endif
#define LWT_TOPIC "LWT"
char mqttServer[16] = MQTT_HOST; char mqttServer[16] = MQTT_HOST;
char mqttUser[23] = MQTT_USER; char mqttUser[23] = MQTT_USER;
char mqttPassword[32] = MQTT_PASSW; char mqttPassword[32] = MQTT_PASSW;
@ -111,7 +113,7 @@ static bool mqttPublish(const char * topic, const char * payload, bool retain =
//////////////////////////////////////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////////////////////////////////////
// Send changed values OUT // Send changed values OUT
bool IRAM_ATTR mqttIsConnected() bool mqttIsConnected()
{ {
return mqttEnabled && mqttClient.connected(); return mqttEnabled && mqttClient.connected();
} }
@ -120,25 +122,26 @@ void mqtt_send_lwt(bool online)
{ {
char tmp_payload[8]; char tmp_payload[8];
char tmp_topic[strlen(mqttNodeTopic) + 4]; char tmp_topic[strlen(mqttNodeTopic) + 4];
snprintf_P(tmp_topic, sizeof(tmp_topic), PSTR("%sLWT"), mqttNodeTopic); strncpy(tmp_topic, mqttNodeTopic, sizeof(tmp_topic));
strncat_P(tmp_topic, PSTR(LWT_TOPIC), sizeof(tmp_topic));
// snprintf_P(tmp_topic, sizeof(tmp_topic), PSTR("%s" LWT_TOPIC), mqttNodeTopic);
size_t len = snprintf_P(tmp_payload, sizeof(tmp_payload), online ? PSTR("online") : PSTR("offline")); size_t len = snprintf_P(tmp_payload, sizeof(tmp_payload), online ? PSTR("online") : PSTR("offline"));
bool res = mqttPublish(tmp_topic, tmp_payload, len, true); bool res = mqttPublish(tmp_topic, tmp_payload, len, true);
// mqttResult(res, tmp_topic, tmp_payload);
} }
void mqtt_send_object_state(uint8_t pageid, uint8_t btnid, char * payload) void mqtt_send_object_state(uint8_t pageid, uint8_t btnid, char * payload)
{ {
char tmp_topic[strlen(mqttNodeTopic) + 16]; char tmp_topic[strlen(mqttNodeTopic) + 16];
snprintf_P(tmp_topic, sizeof(tmp_topic), PSTR("%sstate/" HASP_OBJECT_NOTATION), mqttNodeTopic, pageid, btnid); snprintf_P(tmp_topic, sizeof(tmp_topic), PSTR("%sstate/" HASP_OBJECT_NOTATION), mqttNodeTopic, pageid, btnid);
bool res = mqttPublish(tmp_topic, payload); mqttPublish(tmp_topic, payload);
} }
void mqtt_send_state(const __FlashStringHelper * subtopic, const char * payload) void mqtt_send_state(const __FlashStringHelper * subtopic, const char * payload)
{ {
char tmp_topic[strlen(mqttNodeTopic) + 20]; char tmp_topic[strlen(mqttNodeTopic) + 20];
snprintf_P(tmp_topic, sizeof(tmp_topic), PSTR("%sstate/%s"), mqttNodeTopic, subtopic); snprintf_P(tmp_topic, sizeof(tmp_topic), PSTR("%sstate/%s"), mqttNodeTopic, subtopic);
bool res = mqttPublish(tmp_topic, payload); mqttPublish(tmp_topic, payload);
} }
//////////////////////////////////////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////////////////////////////////////
@ -180,12 +183,12 @@ 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("LWT"))) { // endsWith LWT if(!strcmp_P(topic, PSTR(LWT_TOPIC))) { // endsWith LWT
if(!strcasecmp_P((char *)payload, PSTR("offline"))) { if(!strcasecmp_P((char *)payload, PSTR("offline"))) {
{ {
char msg[8]; char msg[8];
char tmp_topic[strlen(mqttNodeTopic) + 8]; char tmp_topic[strlen(mqttNodeTopic) + 8];
snprintf_P(tmp_topic, sizeof(tmp_topic), PSTR("%sLWT"), mqttNodeTopic); snprintf_P(tmp_topic, sizeof(tmp_topic), PSTR("%s" LWT_TOPIC), mqttNodeTopic);
snprintf_P(msg, sizeof(msg), PSTR("online")); snprintf_P(msg, sizeof(msg), PSTR("online"));
/*bool res =*/mqttClient.publish(tmp_topic, msg, true); /*bool res =*/mqttClient.publish(tmp_topic, msg, true);
@ -231,8 +234,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("%sLWT"), mqttNodeTopic); // lastWillTopic snprintf_P(buffer, sizeof(buffer), PSTR("%s" LWT_TOPIC), mqttNodeTopic); // lastWillTopic
snprintf_P(lastWillPayload, sizeof(lastWillPayload), PSTR("offline")); // lastWillPayload snprintf_P(lastWillPayload, sizeof(lastWillPayload), PSTR("offline")); // lastWillPayload
haspProgressMsg(F(D_MQTT_CONNECTING)); haspProgressMsg(F(D_MQTT_CONNECTING));
haspProgressVal(mqttReconnectCount * 5); haspProgressVal(mqttReconnectCount * 5);
@ -291,7 +294,7 @@ 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("%sLWT"), mqttNodeTopic); // mqttSubscribeTo(PSTR("%s"LWT_TOPIC), mqttNodeTopic);
mqttSubscribeTo(PSTR("hass/status"), ""); mqttSubscribeTo(PSTR("hass/status"), "");
/* Home Assistant auto-configuration */ /* Home Assistant auto-configuration */
@ -318,7 +321,7 @@ void mqttSetup()
mqttClient.setServer(mqttServer, mqttPort); mqttClient.setServer(mqttServer, mqttPort);
mqttClient.setCallback(mqtt_message_cb); mqttClient.setCallback(mqtt_message_cb);
// if(!mqttClient.setBufferSize(1024)) { // if(!mqttClient.setBufferSize(1024)) {
// Log.error(TAG_MQTT, F("Buffer allocation failed")); // Log.error(TAG_MQTT, F("Buffer allocation failed"));
// } else { // } else {
Log.trace(TAG_MQTT, F(D_MQTT_STARTED), mqttClient.getBufferSize()); Log.trace(TAG_MQTT, F(D_MQTT_STARTED), mqttClient.getBufferSize());
// } // }
@ -327,7 +330,7 @@ void mqttSetup()
} }
} }
void IRAM_ATTR mqttLoop(void) void mqttLoop(void)
{ {
if(mqttEnabled) mqttClient.loop(); if(mqttEnabled) mqttClient.loop();
} }