Skip to content

Commit aed4596

Browse files
committed
set/read thermostat mode for RC100-RC300, fix emsesp#1440
1 parent 2de855e commit aed4596

File tree

1 file changed

+4
-5
lines changed

1 file changed

+4
-5
lines changed

src/devices/thermostat.cpp

+4-5
Original file line numberDiff line numberDiff line change
@@ -1023,13 +1023,12 @@ void Thermostat::process_RC300Set(std::shared_ptr<const Telegram> telegram) {
10231023
// has_update(telegram, hc->selTemp, 10, 1); // single byte conversion, value is * 2 - manual
10241024

10251025
telegram->read_value(hc->mode_new, 21); // 0-off, 1-manual, 2-auto
1026-
if (hc->mode_new <= 2) {
1026+
if (Helpers::hasValue(hc->mode_new)) {
10271027
has_update(hc->mode, hc->mode_new);
10281028
} else {
10291029
uint8_t mode = hc->mode == 2 ? 0xFF : 0; // auto : manual
1030-
if (telegram->read_value(mode, 0)) {
1031-
has_update(hc->mode, mode == 0xFF ? 2 : 1);
1032-
}
1030+
telegram->read_value(mode, 0);
1031+
has_update(hc->mode, mode == 0xFF ? 2 : 1);
10331032
}
10341033
has_update(telegram, hc->daytemp, 2); // is * 2
10351034
has_update(telegram, hc->nighttemp, 4); // is * 2
@@ -2598,7 +2597,7 @@ bool Thermostat::set_mode_n(const uint8_t mode, const uint8_t hc_num) {
25982597
if (model_ == EMSdevice::EMS_DEVICE_FLAG_RC10) {
25992598
hc->mode = set_mode_value >> 1;
26002599
} else if (model_ == EMSdevice::EMS_DEVICE_FLAG_RC300 || model_ == EMSdevice::EMS_DEVICE_FLAG_RC100) {
2601-
hc->mode = set_mode_value ? 1 : 0;
2600+
hc->mode = Helpers::hasValue(hc->mode_new) ? set_mode_value : set_mode_value == 0xFF ? 2 : 1;
26022601
} else if (model_ == EMSdevice::EMS_DEVICE_FLAG_JUNKERS) {
26032602
hc->mode = set_mode_value - 1;
26042603
} else {

0 commit comments

Comments
 (0)