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

Merge branch 'dev' into dev

Browse Source
This commit is contained in:
Proddy
2020-10-25 18:38:30 +01:00
committed by GitHub
parent 5e7e80e390 9ee95985b7
commit 243a467234
16 changed files with 62 additions and 105 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/devices/mixer.cpp
View File

@@ -137,9 +137,9 @@ void Mixer::publish_values(JsonObject & json, bool force) {
if (export_values_format(Mqtt::mqtt_format(), json)) {
char topic[30];
if (type() == Type::HC) {
snprintf_P(topic, 30, PSTR("mixer_data_hc%d"),hc_);
snprintf_P(topic, 30, PSTR("mixer_data_hc%d"), hc_);
} else {
snprintf_P(topic, 30, PSTR("mixer_data_wwc%d"),hc_);
snprintf_P(topic, 30, PSTR("mixer_data_wwc%d"), hc_);
}
Mqtt::publish(topic, doc.as<JsonObject>());
}

2
src/devices/thermostat.cpp
View File

@@ -615,7 +615,7 @@ bool Thermostat::export_values_hc(uint8_t mqtt_format, JsonObject & rootThermost
// the topic will have the hc number appended
if (mqtt_format == Mqtt::Format::SINGLE) {
char topic[30];
snprintf_P(topic, 30, PSTR("thermostat_data_hc%d"),hc->hc_num());
snprintf_P(topic, 30, PSTR("thermostat_data_hc%d"), hc->hc_num());
Mqtt::publish(topic, rootThermostat);
rootThermostat.clear(); // clear object
}