From 21b1c9ed75d5e10fe015bacc594682600f79c9e0 Mon Sep 17 00:00:00 2001 From: proddy Date: Tue, 20 Oct 2020 12:02:56 +0200 Subject: [PATCH] added missing heatingtype --- CHANGELOG.md | 3 ++- src/devices/thermostat.cpp | 1 + src/locale_EN.h | 1 + 3 files changed, 4 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 0ac6f3eb1..6df3f25c1 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -34,6 +34,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 - Accurate detection of warm water and heating (#515) - Fix writing to the Junkers FR120 thermostat - support for changing summermode +- added missing `heatingtype` to thermostat data ### Changed - renamed wWCircPumpType to wWChargeType @@ -45,12 +46,12 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 - Updated EMS-ESP official documentation (https://emsesp.github.io/docs/#/) - JWT Secret renamed to Super User Password - EMS Devices in Web UI shows button and tooltip to remind users they can click on a device +- MQTT boiler_data payload split into two topics `boiler_data_main` and `boiler_data_ww` ### Removed - Console contexts for thermostat and boiler - Removed option to enable/disable the MQTT Heartbeat. It's always on. - ## [2.0.1] September 13 2020 ### Added diff --git a/src/devices/thermostat.cpp b/src/devices/thermostat.cpp index e171441a7..001c7701a 100644 --- a/src/devices/thermostat.cpp +++ b/src/devices/thermostat.cpp @@ -215,6 +215,7 @@ void Thermostat::device_info_web(JsonArray & root) { print_value_json(root, F("manualtemp"), FPSTR(prefix_str), F_(manualtemp), F_(degrees), output); print_value_json(root, F("holidaytemp"), FPSTR(prefix_str), F_(holidaytemp), F_(degrees), output); print_value_json(root, F("nofrosttemp"), FPSTR(prefix_str), F_(nofrosttemp), F_(degrees), output); + print_value_json(root, F("heatingtype"), FPSTR(prefix_str), F_(heatingtype), nullptr, output); print_value_json(root, F("targetflowtemp"), FPSTR(prefix_str), F_(targetflowtemp), F_(degrees), output); print_value_json(root, F("offsettemp"), FPSTR(prefix_str), F_(offsettemp), F_(degrees), output); print_value_json(root, F("designtemp"), FPSTR(prefix_str), F_(designtemp), F_(degrees), output); diff --git a/src/locale_EN.h b/src/locale_EN.h index 618a3c563..16d0eeda4 100644 --- a/src/locale_EN.h +++ b/src/locale_EN.h @@ -249,6 +249,7 @@ MAKE_PSTR(nighttemp, "Night temperature") MAKE_PSTR(manualtemp, "Manual temperature") MAKE_PSTR(holidaytemp, "Holiday temperature") MAKE_PSTR(nofrosttemp, "Nofrost temperature") +MAKE_PSTR(heatingtype, "Heating type") MAKE_PSTR(targetflowtemp, "Target flow temperature") MAKE_PSTR(offsettemp, "Offset temperature") MAKE_PSTR(designtemp, "Design temperature")