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

fix #581

Browse Source
This commit is contained in:
MichaelDvP
2022-07-21 17:49:38 +02:00
parent c81e3e832a
commit 295bbed4ae
1 changed files with 20 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/devices/boiler.cpp
View File

@@ -675,7 +675,7 @@ void Boiler::process_UBAParameterWW(std::shared_ptr<const Telegram> telegram) {
has_bitupdate(telegram, wwChargeType_, 10, 0); // 0 = charge pump, 0xff = 3-way valve has_bitupdate(telegram, wwChargeType_, 10, 0); // 0 = charge pump, 0xff = 3-way valve
uint8_t wwComfort = EMS_VALUE_UINT_NOTSET; uint8_t wwComfort = EMS_VALUE_UINT_NOTSET;
telegram->read_value(wwComfort, 9); if (telegram->read_value(wwComfort, 9)) {
if (wwComfort == 0) { if (wwComfort == 0) {
wwComfort = 0; // Hot wwComfort = 0; // Hot
} else if (wwComfort == 0xD8) { } else if (wwComfort == 0xD8) {
@@ -687,6 +687,7 @@ void Boiler::process_UBAParameterWW(std::shared_ptr<const Telegram> telegram) {
} }
has_update(wwComfort_, wwComfort); has_update(wwComfort_, wwComfort);
} }
}
/* /*
* UBAMonitorWW - type 0x34 - dhw monitor. 19 bytes long * UBAMonitorWW - type 0x34 - dhw monitor. 19 bytes long
@@ -847,7 +848,7 @@ void Boiler::process_UBAParameterWWPlus(std::shared_ptr<const Telegram> telegram
has_update(telegram, wwChargeOptimization_, 25); has_update(telegram, wwChargeOptimization_, 25);
uint8_t wwComfort1 = EMS_VALUE_UINT_NOTSET; uint8_t wwComfort1 = EMS_VALUE_UINT_NOTSET;
telegram->read_value(wwComfort1, 13); if (telegram->read_value(wwComfort1, 13)) {
if (wwComfort1 == 0) { if (wwComfort1 == 0) {
wwComfort1 = 0; // High_Comfort wwComfort1 = 0; // High_Comfort
} else if (wwComfort1 == 0xD8) { } else if (wwComfort1 == 0xD8) {
@@ -857,6 +858,7 @@ void Boiler::process_UBAParameterWWPlus(std::shared_ptr<const Telegram> telegram
} }
has_update(wwComfort1_, wwComfort1); has_update(wwComfort1_, wwComfort1);
} }
}
// 0xE9 - WW monitor ems+ // 0xE9 - WW monitor ems+
// e.g. 08 00 E9 00 37 01 F6 01 ED 00 00 00 00 41 3C 00 00 00 00 00 00 00 00 00 00 00 00 37 00 00 00 (CRC=77) #data=27 // e.g. 08 00 E9 00 37 01 F6 01 ED 00 00 00 00 41 3C 00 00 00 00 00 00 00 00 00 00 00 00 37 00 00 00 (CRC=77) #data=27