jeans/openHASP
jeans/openHASP
1
0
Fork 0
mirror of https://github.com/HASwitchPlate/openHASP.git synced 2025-07-22 02:36:34 +00:00
Code Issues Packages Projects Releases Wiki Activity

Add retain flag to mqtt_send_state #781

Browse Source
This commit is contained in:
fvanroie 2024-08-22 14:29:40 +02:00
parent 73c1539fda
commit e6eae8b391
5 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/mqtt/hasp_mqtt.h
View File

@ -24,7 +24,7 @@ void mqttStart();
void mqttStop(); void mqttStop();
// int mqtt_send_object_state(uint8_t pageid, uint8_t btnid, const char* payload); // int mqtt_send_object_state(uint8_t pageid, uint8_t btnid, const char* payload);
int mqtt_send_state(const char* subtopic, const char* payload); int mqtt_send_state(const char* subtopic, const char* payload, bool retain=false);
int mqtt_send_discovery(const char* payload, size_t len); int mqtt_send_discovery(const char* payload, size_t len);
int mqttPublish(const char* topic, const char* payload, size_t len, bool retain); int mqttPublish(const char* topic, const char* payload, size_t len, bool retain);

4
src/mqtt/hasp_mqtt_esp.cpp
View File

@ -165,7 +165,7 @@ bool mqtt_send_lwt(bool online)
// return mqttPublish(tmp_topic, payload, false); // return mqttPublish(tmp_topic, payload, false);
// } // }
int mqtt_send_state(const char* subtopic, const char* payload) int mqtt_send_state(const char* subtopic, const char* payload, bool retain)
{ {
String tmp_topic((char*)0); String tmp_topic((char*)0);
tmp_topic.reserve(128); tmp_topic.reserve(128);
@ -174,7 +174,7 @@ int mqtt_send_state(const char* subtopic, const char* payload)
// tmp_topic += "/"; // tmp_topic += "/";
tmp_topic += subtopic; tmp_topic += subtopic;
return mqttPublish(tmp_topic.c_str(), payload, false); return mqttPublish(tmp_topic.c_str(), payload, retain);
} }
int mqtt_send_discovery(const char* payload, size_t len) int mqtt_send_discovery(const char* payload, size_t len)

4
src/mqtt/hasp_mqtt_paho_async.cpp
View File

@ -284,11 +284,11 @@ bool mqttIsConnected()
return mqttConnected; // MQTTAsync_isConnected(mqtt_client); // <- deadlocking on Linux return mqttConnected; // MQTTAsync_isConnected(mqtt_client); // <- deadlocking on Linux
} }
int mqtt_send_state(const __FlashStringHelper* subtopic, const char* payload) int mqtt_send_state(const __FlashStringHelper* subtopic, const char* payload, bool retain)
{ {
char tmp_topic[mqttNodeTopic.length() + 20]; char tmp_topic[mqttNodeTopic.length() + 20];
snprintf_P(tmp_topic, sizeof(tmp_topic), ("%s" MQTT_TOPIC_STATE "/%s"), mqttNodeTopic.c_str(), subtopic); snprintf_P(tmp_topic, sizeof(tmp_topic), ("%s" MQTT_TOPIC_STATE "/%s"), mqttNodeTopic.c_str(), subtopic);
return mqttPublish(tmp_topic, payload, strlen(payload), false); return mqttPublish(tmp_topic, payload, strlen(payload), retain);
} }
int mqtt_send_discovery(const char* payload, size_t len) int mqtt_send_discovery(const char* payload, size_t len)

4
src/mqtt/hasp_mqtt_paho_single.cpp
View File

@ -226,11 +226,11 @@ bool mqttIsConnected()
return MQTTClient_isConnected(mqtt_client); return MQTTClient_isConnected(mqtt_client);
} }
int mqtt_send_state(const __FlashStringHelper* subtopic, const char* payload) int mqtt_send_state(const __FlashStringHelper* subtopic, const char* payload, bool retain)
{ {
char tmp_topic[mqttNodeTopic.length() + 20]; char tmp_topic[mqttNodeTopic.length() + 20];
snprintf_P(tmp_topic, sizeof(tmp_topic), ("%s" MQTT_TOPIC_STATE "/%s"), mqttNodeTopic.c_str(), subtopic); snprintf_P(tmp_topic, sizeof(tmp_topic), ("%s" MQTT_TOPIC_STATE "/%s"), mqttNodeTopic.c_str(), subtopic);
return mqttPublish(tmp_topic, payload, strlen(payload), false); return mqttPublish(tmp_topic, payload, strlen(payload), retain);
} }
int mqtt_send_discovery(const char* payload, size_t len) int mqtt_send_discovery(const char* payload, size_t len)

4
src/mqtt/hasp_mqtt_pubsubclient.cpp
View File

@ -117,11 +117,11 @@ bool mqtt_send_lwt(bool online)
// return mqttPublish(tmp_topic, payload, false); // return mqttPublish(tmp_topic, payload, false);
// } // }
int mqtt_send_state(const char* subtopic, const char* payload) int mqtt_send_state(const char* subtopic, const char* payload, bool retain)
{ {
char tmp_topic[strlen(mqttNodeTopic) + strlen(subtopic) + 16]; char tmp_topic[strlen(mqttNodeTopic) + strlen(subtopic) + 16];
snprintf_P(tmp_topic, sizeof(tmp_topic), PSTR("%s" MQTT_TOPIC_STATE "/%s"), mqttNodeTopic, subtopic); snprintf_P(tmp_topic, sizeof(tmp_topic), PSTR("%s" MQTT_TOPIC_STATE "/%s"), mqttNodeTopic, subtopic);
return mqttPublish(tmp_topic, payload, false); return mqttPublish(tmp_topic, payload, retain);
} }
int mqtt_send_discovery(const char* payload, size_t len) int mqtt_send_discovery(const char* payload, size_t len)