andry/EMS-ESP32
1
0
Fork 0
mirror of https://github.com/emsesp/EMS-ESP32.git synced 2025-12-07 16:29:51 +03:00
Code Issues Packages Projects Releases Wiki Activity

error handling in mqtt to prevent bogus commands crashing the system - #298

Browse Source
This commit is contained in:
Paul
2020-02-02 12:22:14 +01:00
parent d70b101973
commit a57c26fdbe
1 changed files with 85 additions and 42 deletions
Download Patch File Download Diff File Expand all files Collapse all files

127
src/ems-esp.cpp
View File

@@ -1456,6 +1456,9 @@ void MQTTCallback(unsigned int type, const char * topic, const char * message) {
strlcat(topic_s, itoa(hc, buffer, 10), sizeof(topic_s)); strlcat(topic_s, itoa(hc, buffer, 10), sizeof(topic_s));
myESP.mqttSubscribe(topic_s); myESP.mqttSubscribe(topic_s);
} }
// also subscribe without the HC appended to the end of the topic
myESP.mqttSubscribe(TOPIC_THERMOSTAT_CMD_TEMP_HA);
myESP.mqttSubscribe(TOPIC_THERMOSTAT_CMD_MODE_HA);
// generic incoming MQTT command for Thermostat // generic incoming MQTT command for Thermostat
// this is used for example for setting daytemp, nighttemp, holidaytemp // this is used for example for setting daytemp, nighttemp, holidaytemp
@@ -1552,10 +1555,16 @@ void MQTTCallback(unsigned int type, const char * topic, const char * message) {
return; return;
} }
const char * command = doc["cmd"]; const char * command = doc["cmd"];
if (command == nullptr) {
return;
}
// boiler ww comfort setting // boiler ww comfort setting
if (strcmp(command, TOPIC_BOILER_CMD_COMFORT) == 0) { if (strcmp(command, TOPIC_BOILER_CMD_COMFORT) == 0) {
const char * data = doc["data"]; const char * data = doc["data"];
if (data == nullptr) {
return;
}
if (strcmp((char *)data, "hot") == 0) { if (strcmp((char *)data, "hot") == 0) {
ems_setWarmWaterModeComfort(1); ems_setWarmWaterModeComfort(1);
} else if (strcmp((char *)data, "comfort") == 0) { } else if (strcmp((char *)data, "comfort") == 0) {
@@ -1569,7 +1578,9 @@ void MQTTCallback(unsigned int type, const char * topic, const char * message) {
// boiler flowtemp setting // boiler flowtemp setting
if (strcmp(command, TOPIC_BOILER_CMD_FLOWTEMP) == 0) { if (strcmp(command, TOPIC_BOILER_CMD_FLOWTEMP) == 0) {
uint8_t t = doc["data"]; uint8_t t = doc["data"];
ems_setFlowTemp(t); if (t) {
ems_setFlowTemp(t);
}
return; return;
} }
@@ -1611,32 +1622,40 @@ void MQTTCallback(unsigned int type, const char * topic, const char * message) {
// boiler wwtemp changes // boiler wwtemp changes
if (strcmp(topic, TOPIC_BOILER_CMD_WWTEMP) == 0) { if (strcmp(topic, TOPIC_BOILER_CMD_WWTEMP) == 0) {
uint8_t t = atoi((char *)message); uint8_t t = atoi((char *)message);
ems_setWarmWaterTemp(t); if (t) {
publishEMSValues(true); ems_setWarmWaterTemp(t);
publishEMSValues(true);
}
return; return;
} }
uint8_t hc; uint8_t hc;
// thermostat temp changes // thermostat temp changes
hc = _hasHCspecified(TOPIC_THERMOSTAT_CMD_TEMP_HA, topic); hc = _hasHCspecified(TOPIC_THERMOSTAT_CMD_TEMP_HA, topic);
if (hc && EMS_Thermostat.hc[hc - 1].active) { if (hc) {
float f = strtof((char *)message, 0); if (EMS_Thermostat.hc[hc - 1].active) {
ems_setThermostatTemp(f, hc); float f = strtof((char *)message, 0);
publishEMSValues(true); // publish back immediately if (f) {
return; ems_setThermostatTemp(f, hc);
publishEMSValues(true); // publish back immediately }
return;
}
}
} }
// thermostat mode changes // thermostat mode changes
hc = _hasHCspecified(TOPIC_THERMOSTAT_CMD_MODE_HA, topic); hc = _hasHCspecified(TOPIC_THERMOSTAT_CMD_MODE_HA, topic);
if (hc && EMS_Thermostat.hc[hc - 1].active) { if (hc) {
if (strncmp(message, "auto", 4) == 0) { if (EMS_Thermostat.hc[hc - 1].active) {
ems_setThermostatMode(2, hc); if (strncmp(message, "auto", 4) == 0) {
} else if ((strncmp(message, "day", 4) == 0) || (strncmp(message, "manual", 6) == 0) || (strncmp(message, "heat", 4) == 0)) { ems_setThermostatMode(2, hc);
ems_setThermostatMode(1, hc); } else if ((strncmp(message, "day", 4) == 0) || (strncmp(message, "manual", 6) == 0) || (strncmp(message, "heat", 4) == 0)) {
} else if ((strncmp(message, "night", 5) == 0) || (strncmp(message, "off", 3) == 0)) { ems_setThermostatMode(1, hc);
ems_setThermostatMode(0, hc); } else if ((strncmp(message, "night", 5) == 0) || (strncmp(message, "off", 3) == 0)) {
ems_setThermostatMode(0, hc);
}
return;
} }
return;
} }
// check for generic thermostat commands // check for generic thermostat commands
@@ -1649,52 +1668,76 @@ void MQTTCallback(unsigned int type, const char * topic, const char * message) {
return; return;
} }
const char * command = doc["cmd"]; const char * command = doc["cmd"];
if (command == nullptr) {
return;
}
// thermostat temp changes // thermostat temp changes
hc = _hasHCspecified(TOPIC_THERMOSTAT_CMD_TEMP, command); hc = _hasHCspecified(TOPIC_THERMOSTAT_CMD_TEMP, command);
if (hc && EMS_Thermostat.hc[hc - 1].active) { if (hc) {
float f = doc["data"]; if (EMS_Thermostat.hc[hc - 1].active) {
ems_setThermostatTemp(f, hc); float f = doc["data"];
publishEMSValues(true); // publish back immediately if (f) {
return; ems_setThermostatTemp(f, hc);
publishEMSValues(true); // publish back immediately }
return;
}
}
} }
// thermostat mode changes // thermostat mode changes
hc = _hasHCspecified(TOPIC_THERMOSTAT_CMD_MODE, command); hc = _hasHCspecified(TOPIC_THERMOSTAT_CMD_MODE, command);
if (hc && EMS_Thermostat.hc[hc - 1].active) { if (hc) {
const char * data_cmd = doc["data"]; if (EMS_Thermostat.hc[hc - 1].active) {
if (strncmp(data_cmd, "auto", 4) == 0) { const char * data_cmd = doc["data"];
ems_setThermostatMode(2, hc); if (data_cmd == nullptr) {
} else if ((strncmp(data_cmd, "day", 4) == 0) || (strncmp(data_cmd, "manual", 6) == 0) || (strncmp(data_cmd, "heat", 4) == 0)) { return;
ems_setThermostatMode(1, hc); }
} else if ((strncmp(data_cmd, "night", 5) == 0) || (strncmp(data_cmd, "off", 3) == 0)) { if (strncmp(data_cmd, "auto", 4) == 0) {
ems_setThermostatMode(0, hc); ems_setThermostatMode(2, hc);
} else if ((strncmp(data_cmd, "day", 4) == 0) || (strncmp(data_cmd, "manual", 6) == 0) || (strncmp(data_cmd, "heat", 4) == 0)) {
ems_setThermostatMode(1, hc);
} else if ((strncmp(data_cmd, "night", 5) == 0) || (strncmp(data_cmd, "off", 3) == 0)) {
ems_setThermostatMode(0, hc);
}
return;
} }
return;
} }
// set night temp value // set night temp value
hc = _hasHCspecified(TOPIC_THERMOSTAT_CMD_NIGHTTEMP, command); hc = _hasHCspecified(TOPIC_THERMOSTAT_CMD_NIGHTTEMP, command);
if (hc && EMS_Thermostat.hc[hc - 1].active) { if (hc) {
float f = doc["data"]; if (EMS_Thermostat.hc[hc - 1].active) {
ems_setThermostatTemp(f, hc, 1); // night float f = doc["data"];
return; if (f) {
ems_setThermostatTemp(f, hc, 1); // night }
return;
}
}
} }
// set daytemp value // set daytemp value
hc = _hasHCspecified(TOPIC_THERMOSTAT_CMD_DAYTEMP, command); hc = _hasHCspecified(TOPIC_THERMOSTAT_CMD_DAYTEMP, command);
if (hc && EMS_Thermostat.hc[hc - 1].active) { if (hc) {
float f = doc["data"]; if (EMS_Thermostat.hc[hc - 1].active) {
ems_setThermostatTemp(f, hc, 2); // day float f = doc["data"];
return; if (f) {
ems_setThermostatTemp(f, hc, 2); // day
}
return;
}
} }
// set holiday value // set holiday value
hc = _hasHCspecified(TOPIC_THERMOSTAT_CMD_HOLIDAYTEMP, command); hc = _hasHCspecified(TOPIC_THERMOSTAT_CMD_HOLIDAYTEMP, command);
if (hc && EMS_Thermostat.hc[hc - 1].active) { if (hc) {
float f = doc["data"]; if (EMS_Thermostat.hc[hc - 1].active) {
ems_setThermostatTemp(f, hc, 3); // holiday float f = doc["data"];
return; if (f) {
ems_setThermostatTemp(f, hc, 3); // holiday
}
return;
}
} }
} }
} }