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

RC300 offsettemp factor, fetch curve-setpoint

Browse Source
This commit is contained in:
MichaelDvP
2020-11-21 09:09:58 +01:00
parent bfc7555dd2
commit 0639b3923e
1 changed files with 14 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
src/devices/thermostat.cpp
View File

@@ -623,7 +623,11 @@ bool Thermostat::export_values_hc(uint8_t mqtt_format, JsonObject & rootThermost
// Offset temperature
if (Helpers::hasValue(hc->offsettemp)) {
dataThermostat["offsettemp"] = hc->offsettemp / 2;
if (flags == EMSdevice::EMS_DEVICE_FLAG_RC300 || flags == EMSdevice::EMS_DEVICE_FLAG_RC100) {
dataThermostat["offsettemp"] = hc->offsettemp;
} else {
dataThermostat["offsettemp"] = hc->offsettemp / 2;
}
}
// Design temperature
@@ -847,6 +851,15 @@ std::shared_ptr<Thermostat::HeatingCircuit> Thermostat::heating_circuit(std::sha
if (set_typeids.size()) {
toggle_fetch(set_typeids[hc_num - 1], toggle_);
}
if (summer_typeids.size()) {
toggle_fetch(summer_typeids[hc_num - 1], toggle_);
}
if (curve_typeids.size()) {
toggle_fetch(curve_typeids[hc_num - 1], toggle_);
}
if (timer_typeids.size()) {
toggle_fetch(timer_typeids[hc_num - 1], toggle_);
}
return heating_circuits_.back(); // even after sorting, this should still point back to the newly created HC
}