andry/EMS-ESP32
1
0
Fork 0
mirror of https://github.com/emsesp/EMS-ESP32.git synced 2025-12-07 16:29:51 +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

38
src/devices/boiler.cpp
View File

@@ -675,17 +675,18 @@ 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) {
wwComfort = 1; // Eco wwComfort = 1; // Eco
} else if (wwComfort == 0xEC) { } else if (wwComfort == 0xEC) {
wwComfort = 2; // Intelligent wwComfort = 2; // Intelligent
} else { } else {
wwComfort = EMS_VALUE_UINT_NOTSET; wwComfort = EMS_VALUE_UINT_NOTSET;
}
has_update(wwComfort_, wwComfort);
} }
has_update(wwComfort_, wwComfort);
} }
/* /*
@@ -847,15 +848,16 @@ 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) {
wwComfort1 = 1; // Eco wwComfort1 = 1; // Eco
} else { } else {
wwComfort1 = EMS_VALUE_UINT_NOTSET; wwComfort1 = EMS_VALUE_UINT_NOTSET;
}
has_update(wwComfort1_, wwComfort1);
} }
has_update(wwComfort1_, wwComfort1);
} }
// 0xE9 - WW monitor ems+ // 0xE9 - WW monitor ems+