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

Test for fixing #1378

Browse Source
This commit is contained in:
MichaelDvP
2023-11-01 18:20:32 +01:00
parent 41666458d9
commit 0838d06ec4
1 changed files with 18 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

46
src/devices/thermostat.cpp
View File

@@ -237,15 +237,23 @@ std::shared_ptr<Thermostat::HeatingCircuit> Thermostat::heating_circuit(std::sha
// look through the Monitor and Set arrays to see if there is a match // look through the Monitor and Set arrays to see if there is a match
uint8_t hc_num = 0; uint8_t hc_num = 0;
bool toggle_ = false; bool toggle_ = false;
// search monitor message types
for (uint8_t i = 0; i < monitor_typeids.size(); i++) { // search device-id types for remote thermostats first, they have only a single typeid for all hcs
if (monitor_typeids[i] == telegram->type_id) { if (telegram->src >= 0x18 && telegram->src <= 0x1F) {
hc_num = i + 1; hc_num = telegram->src - 0x17;
toggle_ = true; toggle_ = true;
break;
}
} }
// not found, search monitor message types
if (hc_num == 0) {
for (uint8_t i = 0; i < monitor_typeids.size(); i++) {
if (monitor_typeids[i] == telegram->type_id) {
hc_num = i + 1;
toggle_ = true;
break;
}
}
}
// not found, search status message/set types // not found, search status message/set types
if (hc_num == 0) { if (hc_num == 0) {
for (uint8_t i = 0; i < set_typeids.size(); i++) { for (uint8_t i = 0; i < set_typeids.size(); i++) {
@@ -335,12 +343,6 @@ std::shared_ptr<Thermostat::HeatingCircuit> Thermostat::heating_circuit(std::sha
} }
} }
// not found, search device-id types for remote thermostats
if (hc_num == 0 && telegram->src >= 0x18 && telegram->src <= 0x1F) {
hc_num = telegram->src - 0x17;
toggle_ = true;
}
// not found, search device-id types for remote thermostats // not found, search device-id types for remote thermostats
if (hc_num == 0 && telegram->dest >= 0x20 && telegram->dest <= 0x27) { if (hc_num == 0 && telegram->dest >= 0x20 && telegram->dest <= 0x27) {
hc_num = telegram->dest - 0x20; hc_num = telegram->dest - 0x20;
@@ -4223,13 +4225,8 @@ void Thermostat::register_device_values_hc(std::shared_ptr<Thermostat::HeatingCi
MAKE_CF_CB(set_tempautotemp), MAKE_CF_CB(set_tempautotemp),
-1, -1,
30); 30);
register_device_value(tag, register_device_value(tag, &hc->remoteseltemp, DeviceValueType::INT, DeviceValueNumOp::DV_NUMOP_DIV2, FL_(remoteseltemp), DeviceValueUOM::DEGREES);
&hc->remoteseltemp, // a command is only accepted from the remote device, not from ems-esp.
DeviceValueType::INT,
DeviceValueNumOp::DV_NUMOP_DIV2,
FL_(remoteseltemp),
DeviceValueUOM::DEGREES);
// a command is only accepted from the remote device, not from ems-esp.
register_device_value(tag, &hc->fastHeatup, DeviceValueType::UINT, FL_(fastheatup), DeviceValueUOM::PERCENT, MAKE_CF_CB(set_fastheatup)); register_device_value(tag, &hc->fastHeatup, DeviceValueType::UINT, FL_(fastheatup), DeviceValueUOM::PERCENT, MAKE_CF_CB(set_fastheatup));
register_device_value(tag, register_device_value(tag,
&hc->switchonoptimization, &hc->switchonoptimization,
@@ -4258,14 +4255,7 @@ void Thermostat::register_device_values_hc(std::shared_ptr<Thermostat::HeatingCi
MAKE_CF_CB(set_remotetemp), MAKE_CF_CB(set_remotetemp),
-1, -1,
101); 101);
register_device_value(tag, register_device_value(tag, &hc->remotehum, DeviceValueType::UINT, FL_(remotehum), DeviceValueUOM::PERCENT, MAKE_CF_CB(set_remotehum), -1, 101);
&hc->remotehum,
DeviceValueType::UINT,
FL_(remotehum),
DeviceValueUOM::PERCENT,
MAKE_CF_CB(set_remotehum),
-1,
101);
break; break;
case EMS_DEVICE_FLAG_CRF: case EMS_DEVICE_FLAG_CRF: