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

Merge branch 'esp32_dev' of https://github.com/proddy/EMS-ESP into esp32_dev

Browse Source
This commit is contained in:
proddy
2021-02-23 14:11:07 +01:00
parent c1effa9681 644b88bf44
commit 1d64285f09
2 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/devices/mixer.cpp
View File

@@ -145,11 +145,11 @@ void Mixer::process_IPMStatusMessage(std::shared_ptr<const Telegram> telegram) {
// do we have a mixed circuit // do we have a mixed circuit
if (ismixed == 2) { if (ismixed == 2) {
has_update(telegram->read_value(flowTemp_, 3)); // is * 10 has_update(telegram->read_value(flowTemp_, 3)); // is * 10
has_update(telegram->read_value(flowSetTemp_, 5));
has_update(telegram->read_value(status_, 2)); // valve status has_update(telegram->read_value(status_, 2)); // valve status
} }
has_update(telegram->read_bitvalue(pumpStatus_, 1, 0)); // pump is also in unmixed circuits has_update(telegram->read_bitvalue(pumpStatus_, 1, 0)); // pump is also in unmixed circuits
has_update(telegram->read_value(flowSetTemp_, 5)); // flowSettemp is also in unmixed circuits, see #711
} }
// Mixer on a MM10 - 0xAB // Mixer on a MM10 - 0xAB

2
src/system.cpp
View File

@@ -373,7 +373,7 @@ void System::show_mem(const char * note) {
// send periodic MQTT message with system information // send periodic MQTT message with system information
void System::send_heartbeat() { 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()) { if (!Mqtt::connected()) {
return; return;
} }