From 40fe40eb8a7d4b0eccb4c269ac5c212b980296aa Mon Sep 17 00:00:00 2001 From: Yurii Date: Thu, 12 Feb 2026 23:33:22 +0300 Subject: [PATCH] refactor: impoved freeze protection --- src/MainTask.h | 43 +++++++++++++++++++++++------------ src/OpenThermTask.h | 3 +-- src/RegulatorTask.h | 5 ++++ src/Settings.h | 1 + src/strings.h | 1 + src/utils.h | 1 + src_data/locales/en.json | 1 + src_data/pages/dashboard.html | 9 ++++++++ 8 files changed, 48 insertions(+), 16 deletions(-) diff --git a/src/MainTask.h b/src/MainTask.h index 689438f..f3c2f2d 100644 --- a/src/MainTask.h +++ b/src/MainTask.h @@ -243,7 +243,7 @@ protected: void heating() { // freeze protection - if (!settings.heating.enabled) { + { float lowTemp = 255.0f; uint8_t availableSensors = 0; @@ -275,28 +275,43 @@ protected: } if (availableSensors && lowTemp <= settings.heating.freezeProtection.lowTemp) { - if (!this->freezeDetected) { - this->freezeDetected = true; - this->freezeDetectedTime = millis(); + if (!vars.master.heating.freezing) { + if (!this->freezeDetected) { + this->freezeDetected = true; + this->freezeDetectedTime = millis(); - } else if (millis() - this->freezeDetectedTime > (settings.heating.freezeProtection.thresholdTime * 1000)) { + } else if (millis() - this->freezeDetectedTime > (settings.heating.freezeProtection.thresholdTime * 1000)) { + this->freezeDetected = false; + vars.master.heating.freezing = true; + + if (!settings.heating.enabled) { + settings.heating.enabled = true; + fsSettings.update(); + } + + Log.sinfoln( + FPSTR(L_MAIN), + F("Heating turned on by freeze protection, current low temp: %.2f, threshold: %hhu"), + lowTemp, settings.heating.freezeProtection.lowTemp + ); + } + } + + } else { + if (this->freezeDetected) { this->freezeDetected = false; - settings.heating.enabled = true; - fsSettings.update(); + } + + if (vars.master.heating.freezing) { + vars.master.heating.freezing = false; Log.sinfoln( FPSTR(L_MAIN), - F("Heating turned on by freeze protection, current low temp: %.2f, threshold: %hhu"), + F("No freezing detected, current low temp: %.2f, threshold: %hhu"), lowTemp, settings.heating.freezeProtection.lowTemp ); } - - } else if (this->freezeDetected) { - this->freezeDetected = false; } - - } else if (this->freezeDetected) { - this->freezeDetected = false; } } diff --git a/src/OpenThermTask.h b/src/OpenThermTask.h index 0bb7df6..ff5aacd 100644 --- a/src/OpenThermTask.h +++ b/src/OpenThermTask.h @@ -170,8 +170,7 @@ protected: // Heating settings vars.master.heating.enabled = this->isReady() && settings.heating.enabled - && vars.cascadeControl.input - && !vars.master.heating.blocking + && (vars.master.heating.freezing || (vars.cascadeControl.input && !vars.master.heating.blocking)) && !vars.master.heating.overheat; // DHW settings diff --git a/src/RegulatorTask.h b/src/RegulatorTask.h index a36137b..cc170d0 100644 --- a/src/RegulatorTask.h +++ b/src/RegulatorTask.h @@ -240,6 +240,11 @@ protected: ) * settings.heating.turboFactor; } + // If freezing, set temperature to no lower than low temp provided by freeze protection + if (vars.master.heating.freezing && fabsf(settings.heating.freezeProtection.lowTemp - newTemp) < 0.0001f) { + newTemp = settings.heating.freezeProtection.lowTemp; + } + return newTemp; } }; diff --git a/src/Settings.h b/src/Settings.h index 580c9d5..c52bece 100644 --- a/src/Settings.h +++ b/src/Settings.h @@ -304,6 +304,7 @@ struct Variables { bool enabled = false; bool indoorTempControl = false; bool overheat = false; + bool freezing = false; float setpointTemp = 0.0f; float targetTemp = 0.0f; float currentTemp = 0.0f; diff --git a/src/strings.h b/src/strings.h index d438a6e..4019263 100644 --- a/src/strings.h +++ b/src/strings.h @@ -87,6 +87,7 @@ const char S_EXTERNAL_PUMP[] PROGMEM = "externalPump"; const char S_FACTOR[] PROGMEM = "factor"; const char S_FAULT[] PROGMEM = "fault"; const char S_FREEZE_PROTECTION[] PROGMEM = "freezeProtection"; +const char S_FREEZING[] PROGMEM = "freezing"; const char S_FILTERING[] PROGMEM = "filtering"; const char S_FILTERING_FACTOR[] PROGMEM = "filteringFactor"; const char S_FLAGS[] PROGMEM = "flags"; diff --git a/src/utils.h b/src/utils.h index a47339c..de39c47 100644 --- a/src/utils.h +++ b/src/utils.h @@ -2170,6 +2170,7 @@ void varsToJson(const Variables& src, JsonVariant dst) { mHeating[FPSTR(S_BLOCKING)] = src.master.heating.blocking; mHeating[FPSTR(S_INDOOR_TEMP_CONTROL)] = src.master.heating.indoorTempControl; mHeating[FPSTR(S_OVERHEAT)] = src.master.heating.overheat; + mHeating[FPSTR(S_FREEZING)] = src.master.heating.freezing; mHeating[FPSTR(S_SETPOINT_TEMP)] = roundf(src.master.heating.setpointTemp, 2); mHeating[FPSTR(S_TARGET_TEMP)] = roundf(src.master.heating.targetTemp, 2); mHeating[FPSTR(S_CURRENT_TEMP)] = roundf(src.master.heating.currentTemp, 2); diff --git a/src_data/locales/en.json b/src_data/locales/en.json index 1514791..8797eb2 100644 --- a/src_data/locales/en.json +++ b/src_data/locales/en.json @@ -119,6 +119,7 @@ "mHeatEnabled": "Heating enabled", "mHeatBlocking": "Heating blocked", "mHeatOverheat": "Heating overheat", + "mHeatFreezing": "Heating freezing", "sHeatActive": "Heating active", "mHeatSetpointTemp": "Heating setpoint temp", "mHeatTargetTemp": "Heating target temp", diff --git a/src_data/pages/dashboard.html b/src_data/pages/dashboard.html index f01b72b..dad42d8 100644 --- a/src_data/pages/dashboard.html +++ b/src_data/pages/dashboard.html @@ -195,6 +195,10 @@ dashboard.states.mHeatOverheat + + dashboard.states.mHeatFreezing + + dashboard.states.sHeatActive @@ -633,6 +637,11 @@ result.master.heating.overheat ? "success" : "error", result.master.heating.overheat ? "red" : "green" ); + setStatus( + '.mHeatFreezing', + result.master.heating.freezing ? "success" : "error", + result.master.heating.freezing ? "red" : "green" + ); setValue('.mHeatSetpointTemp', result.master.heating.setpointTemp); setValue('.mHeatTargetTemp', result.master.heating.targetTemp); setValue('.mHeatCurrTemp', result.master.heating.currentTemp);