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

Memory optimization

Browse Source
This commit is contained in:
fvanroie 2020-11-12 19:52:50 +01:00
parent 5011e5c063
commit b426655333
1 changed files with 9 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
src/hasp_mqtt.cpp
View File

@ -250,7 +250,7 @@ void mqtt_send_statusupdate()
//////////////////////////////////////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////////////////////////////////////
// Receive incoming messages // Receive incoming messages
static void mqtt_message_cb(char * topic_p, byte * payload, unsigned int length) static void mqtt_message_cb(char * topic, byte * payload, unsigned int length)
{ // Handle incoming commands from MQTT { // Handle incoming commands from MQTT
if(length >= MQTT_MAX_PACKET_SIZE) { if(length >= MQTT_MAX_PACKET_SIZE) {
Log.error(TAG_MQTT_RCV, F("Payload too long (%d bytes)"), length); Log.error(TAG_MQTT_RCV, F("Payload too long (%d bytes)"), length);
@ -276,7 +276,7 @@ static void mqtt_message_cb(char * topic_p, byte * payload, unsigned int length)
// '[...]/device/command/p[1].b[4].txt' -m '' = nextionGetAttr("p[1].b[4].txt") // '[...]/device/command/p[1].b[4].txt' -m '' = nextionGetAttr("p[1].b[4].txt")
// '[...]/device/command/p[1].b[4].txt' -m '"Lights On"' = nextionSetAttr("p[1].b[4].txt", "\"Lights On\"") // '[...]/device/command/p[1].b[4].txt' -m '"Lights On"' = nextionSetAttr("p[1].b[4].txt", "\"Lights On\"")
char * topic = (char *)topic_p; // char * topic = (char *)topic_p;
Log.notice(TAG_MQTT_RCV, F("%s = %s"), topic, (char *)payload); Log.notice(TAG_MQTT_RCV, F("%s = %s"), topic, (char *)payload);
if(topic == strstr(topic, mqttNodeTopic)) { // startsWith mqttNodeTopic if(topic == strstr(topic, mqttNodeTopic)) { // startsWith mqttNodeTopic
@ -293,7 +293,7 @@ static void mqtt_message_cb(char * topic_p, byte * payload, unsigned int length)
if(!strcasecmp_P((char *)payload, PSTR("OFF"))) { if(!strcasecmp_P((char *)payload, PSTR("OFF"))) {
char topicBuffer[128]; char topicBuffer[128];
snprintf_P(topicBuffer, sizeof(topicBuffer), PSTR("%sstatus"), mqttNodeTopic); snprintf_P(topicBuffer, sizeof(topicBuffer), PSTR("%sstatus"), mqttNodeTopic);
mqttClient.publish(topicBuffer, "ON", true); mqttClient.publish(topicBuffer, "ON", true); // Literal String
Log.notice(TAG_MQTT, F("binary_sensor state: [status] : ON")); Log.notice(TAG_MQTT, F("binary_sensor state: [status] : ON"));
} else { } else {
// already ON // already ON
@ -436,14 +436,13 @@ void mqttReconnect()
// 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 OFF,
// "ON" will be sent by the mqttStatusTopic subscription action. // "ON" will be sent by the mqttStatusTopic subscription action.
snprintf_P(buffer, sizeof(buffer), PSTR("%sstatus"), mqttNodeTopic); snprintf_P(buffer, sizeof(buffer), PSTR("%sstatus"), mqttNodeTopic);
mqttClient.publish(buffer, mqttFirstConnect ? "OFF" : "ON", true); //, 1); {
char msg[8];
snprintf_P(msg, sizeof(msg), mqttFirstConnect ? PSTR("OFF") : PSTR("ON"));
mqttClient.publish(buffer, msg, true); // Literal String
Log.notice(TAG_MQTT, F("binary_sensor state: [%sstatus] : %S"), mqttNodeTopic, Log.notice(TAG_MQTT, F("binary_sensor state: [%sstatus] : %s"), mqttNodeTopic, msg);
mqttFirstConnect ? F("OFF") : F("ON")); }
/* snprintf_P(buffer, sizeof(buffer), PSTR("binary_sensor state: [%sstatus] : %s"), mqttNodeTopic,
mqttFirstConnect ? PSTR("OFF") : PSTR("ON"));
debugPrintln(buffer); */
mqttFirstConnect = false; mqttFirstConnect = false;
mqttReconnectCount = 0; mqttReconnectCount = 0;