* merge upstream changes

emsesp · Mar 1, 2021 · e0016b5 · e0016b5
2 parents 863c98d + 7c98337
commit e0016b5
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 4 deletions.
diff --git a/CHANGELOG_LATEST.md b/CHANGELOG_LATEST.md
@@ -12,7 +12,9 @@
 - Thermostat ES72/RC20, device 66 to RC20_2 command-set
 - recognize sending devices which are not in telegram 0x07
 - MQTT payloads not adding to queue when MQTT is re-connecting (fixes #369)
-
+- fix mixerTemp and tankMiddleTemp (PR #714 @joanwa)
+- icon update for pumps
+- add mixer wiring naming from documentation
 
 ### Changed
 - split `show values` in smaller packages and separate heating circuits

diff --git a/src/devices/mixer.cpp b/src/devices/mixer.cpp
@@ -298,12 +298,12 @@ void Mixer::process_IPMStatusMessage(std::shared_ptr<const Telegram> telegram) {
 
     // do we have a mixed circuit
     if (ismixed == 2) {
-        changed_ |= telegram->read_value(flowTempLowLoss_, 5); // T0
         changed_ |= telegram->read_value(flowTempHc_, 3); // TC1, is * 10
         changed_ |= telegram->read_value(status_, 2); // valve status
     }
 
     changed_ |= telegram->read_bitvalue(pumpStatus_, 1, 0); // pump is also in unmixed circuits
+    changed_ |= telegram->read_value(flowTempLowLoss_, 5);  // T0, flowTempLowLoss_ is also in unmixed circuits, see #711
 }
 
 // Mixer on a MM10 - 0xAB

diff --git a/src/devices/thermostat.cpp b/src/devices/thermostat.cpp
@@ -241,7 +241,7 @@ void Thermostat::device_info_web(JsonArray & root, uint8_t & part) {
             create_value_json(root, F("minflowtemp"), FPSTR(prefix_str), F_(minflowtemp), F_(degrees), json);
             create_value_json(root, F("maxflowtemp"), FPSTR(prefix_str), F_(maxflowtemp), F_(degrees), json);
             create_value_json(root, F("summertemp"), FPSTR(prefix_str), F_(summertemp), F_(degrees), json);
-            create_value_json(root, F("summermode"), FPSTR(prefix_str), F_(summermode), F_(degrees), json);
+            create_value_json(root, F("summermode"), FPSTR(prefix_str), F_(summermode), nullptr, json);
             create_value_json(root, F("reducemode"), FPSTR(prefix_str), F_(reducemode), nullptr, json);
             create_value_json(root, F("program"), FPSTR(prefix_str), F_(program), nullptr, json);
             create_value_json(root, F("controlmode"), FPSTR(prefix_str), F_(controlmode), nullptr, json);

diff --git a/src/system.cpp b/src/system.cpp
@@ -319,7 +319,7 @@ void System::show_mem(const char * note) {
 
 // send periodic MQTT message with system information
 void System::send_heartbeat() {
-    // don't send heartbeat if WiFi or MQTT is connected
+    // don't send heartbeat if WiFi or MQTT is not connected
     if (!Mqtt::connected()) {
         return;
     }