andry/EMS-ESP32
1
0
Fork 0
mirror of https://github.com/emsesp/EMS-ESP32.git synced 2025-12-06 07:49:52 +03:00
Code Issues Packages Projects Releases Wiki Activity

requested changes on PR from @MichaelDvP

Browse Source
This commit is contained in:
tp1de
2022-05-27 14:05:56 +02:00
parent 622a5db8d1
commit 107106d759
2 changed files with 2 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/devices/thermostat.cpp
View File

@@ -379,7 +379,7 @@ std::shared_ptr<Thermostat::HeatingCircuit> Thermostat::heating_circuit(std::sha
if (set_typeids.size()) { if (set_typeids.size()) {
toggle_fetch(set_typeids[hc_num - 1], toggle_); toggle_fetch(set_typeids[hc_num - 1], toggle_);
} }
if (set2_typeids.size()) { if (hc_num <= set2_typeids.size()) {
toggle_fetch(set2_typeids[hc_num - 1], toggle_); toggle_fetch(set2_typeids[hc_num - 1], toggle_);
} }
if (summer_typeids.size()) { if (summer_typeids.size()) {
@@ -2971,13 +2971,11 @@ bool Thermostat::set_temperature(const float temperature, const uint8_t mode, co
factor = 1; factor = 1;
break; break;
case HeatingCircuit::Mode::NOREDUCE: case HeatingCircuit::Mode::NOREDUCE:
set_typeid = set_typeids[hc->hc()];
validate_typeid = set_typeid; validate_typeid = set_typeid;
offset = 12; offset = 12;
factor = 1; factor = 1;
break; break;
case HeatingCircuit::Mode::REDUCE: case HeatingCircuit::Mode::REDUCE:
set_typeid = set_typeids[hc->hc()];
validate_typeid = set_typeid; validate_typeid = set_typeid;
offset = 9; offset = 9;
factor = 1; factor = 1;

2
src/emsesp.cpp
View File

@@ -187,7 +187,7 @@ uint8_t EMSESP::check_master_device(const uint8_t device_id, const uint16_t type
// look for heating circuits // look for heating circuits
for (uint8_t i = 0; i < sizeof(mon_ids) / 2; i++) { for (uint8_t i = 0; i < sizeof(mon_ids) / 2; i++) {
if (type_id == mon_ids[i] || type_id == set_ids[i] || type_id == summer_ids[i] if (type_id == mon_ids[i] || type_id == set_ids[i] || type_id == summer_ids[i]
|| type_id == curve_ids[i] || type_id == summer2_ids[i] || type_id == set2_ids[i]) { || type_id == curve_ids[i] || type_id == summer2_ids[i] || (i <4 && type_id == set2_ids[i])) {
if (read) { if (read) {
// receiving telegrams and map all to master thermostat at 0x18 (src manipulated) // receiving telegrams and map all to master thermostat at 0x18 (src manipulated)
return 0x18; return 0x18;