jeka/OTGateway
1
0
Fork 0
mirror of https://github.com/Laxilef/OTGateway.git synced 2025-12-11 18:54:28 +05:00
Code Issues Packages Projects Releases Wiki Activity

fix: added C/F temperature conversion in overheating protection

Browse Source
This commit is contained in:
Yurii
2025-06-20 02:46:25 +03:00
parent b985275309
commit 58b0c18448
1 changed files with 21 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

34
src/OpenThermTask.h
View File

@@ -1320,11 +1320,15 @@ protected:
// Heating overheat control // Heating overheat control
if (settings.heating.overheatHighTemp > 0 && settings.heating.overheatLowTemp > 0) { if (settings.heating.overheatHighTemp > 0 && settings.heating.overheatLowTemp > 0) {
float highTemp = max({ float highTemp = convertTemp(
vars.slave.heating.currentTemp, max({
vars.slave.heating.returnTemp, vars.slave.heating.currentTemp,
vars.slave.heatExchangerTemp vars.slave.heating.returnTemp,
}); vars.slave.heatExchangerTemp
}),
settings.opentherm.unitSystem,
settings.system.unitSystem
);
if (vars.master.heating.overheat) { if (vars.master.heating.overheat) {
if ((float) settings.heating.overheatLowTemp - highTemp + 0.0001f >= 0.0f) { if ((float) settings.heating.overheatLowTemp - highTemp + 0.0001f >= 0.0f) {
@@ -1353,14 +1357,18 @@ protected:
// DHW overheat control // DHW overheat control
if (settings.dhw.overheatHighTemp > 0 && settings.dhw.overheatLowTemp > 0) { if (settings.dhw.overheatHighTemp > 0 && settings.dhw.overheatLowTemp > 0) {
float highTemp = max({ float highTemp = convertTemp(
vars.slave.heating.currentTemp, max({
vars.slave.heating.returnTemp, vars.slave.heating.currentTemp,
vars.slave.heatExchangerTemp, vars.slave.heating.returnTemp,
vars.slave.dhw.currentTemp, vars.slave.heatExchangerTemp,
vars.slave.dhw.currentTemp2, vars.slave.dhw.currentTemp,
vars.slave.dhw.returnTemp vars.slave.dhw.currentTemp2,
}); vars.slave.dhw.returnTemp
}),
settings.opentherm.unitSystem,
settings.system.unitSystem
);
if (vars.master.dhw.overheat) { if (vars.master.dhw.overheat) {
if ((float) settings.dhw.overheatLowTemp - highTemp + 0.0001f >= 0.0f) { if ((float) settings.dhw.overheatLowTemp - highTemp + 0.0001f >= 0.0f) {