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

quick adjustment to MQTT HC - 1549cf5e75

Browse Source
This commit is contained in:
Paul
2019-09-27 10:19:10 +02:00
parent 1549cf5e75
commit 814f477cf9
1 changed files with 6 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/ems-esp.cpp
View File

@@ -839,7 +839,8 @@ void publishValues(bool force) {
// handle the thermostat values // handle the thermostat values
if (ems_getThermostatEnabled()) { if (ems_getThermostatEnabled()) {
uint8_t total_active_hc = 0; // number of HCs uint8_t total_active_hc = 0; // number of HCs
bool hc_1_active = EMS_Thermostat.hc[0].active; // do we have HC1 active?
for (uint8_t hc_v = 1; hc_v <= EMS_THERMOSTAT_MAXHC; hc_v++) { for (uint8_t hc_v = 1; hc_v <= EMS_THERMOSTAT_MAXHC; hc_v++) {
_EMS_Thermostat_HC * thermostat = &EMS_Thermostat.hc[hc_v - 1]; _EMS_Thermostat_HC * thermostat = &EMS_Thermostat.hc[hc_v - 1];
@@ -916,8 +917,10 @@ void publishValues(bool force) {
previousThermostatPublishCRC = fchecksum; previousThermostatPublishCRC = fchecksum;
char thermostat_topicname[20]; char thermostat_topicname[20];
strlcpy(thermostat_topicname, TOPIC_THERMOSTAT_DATA, sizeof(thermostat_topicname)); // "thermostat_data" strlcpy(thermostat_topicname, TOPIC_THERMOSTAT_DATA, sizeof(thermostat_topicname)); // "thermostat_data"
// if we have more than 1 active Heating Circuit, postfix with the HC number // if we have more than 1 active Heating Circuit
if (total_active_hc > 1) { // or this is single HC and its not HC1
// append topic name with the HC number
if ((total_active_hc > 1) || ((total_active_hc == 1) && (!hc_1_active))) {
char buffer[4]; char buffer[4];
strlcat(thermostat_topicname, itoa(total_active_hc, buffer, 10), sizeof(thermostat_topicname)); strlcat(thermostat_topicname, itoa(total_active_hc, buffer, 10), sizeof(thermostat_topicname));
} }