refactor: improved freeze protection & overheat protection; added desc for OT options

This commit is contained in:
Yurii
2025-06-30 02:41:44 +03:00
parent 792c6a6668
commit e63a0dc7eb
9 changed files with 299 additions and 193 deletions

View File

@@ -304,7 +304,7 @@
"max": "Maximum temperature"
},
"maxModulation": "Max modulation level",
"overheat": {
"ohProtection": {
"title": "Overheating protection",
"desc": "<b>Note:</b> This feature can be useful if the built-in boiler overheating protection does not work or does not work correctly and the heat carrier boils. To disable, set 0 as <b>high</b> and <b>low</b> temperature.",
"highTemp": {
@@ -316,6 +316,12 @@
"note": "Threshold at which the burner can be turned on again"
}
},
"freezeProtection": {
"title": "Freeze protection",
"desc": "Heating will be forced to turn on if the heat carrier or indoor temperature drops below <b>Low temperature</b> during <b>Waiting time</b>.",
"lowTemp": "Low temperature threshold",
"thresholdTime": "Waiting time <small>(sec)</small>"
},
"portal": {
"login": "Login",
@@ -350,11 +356,7 @@
"heating": {
"hyst": "Hysteresis <small>(in degrees)</small>",
"turboFactor": "Turbo mode coeff.",
"antiFreezeTemp": {
"title": "Freeze protection temperature",
"note": "If the heat carrier or indoor temperature drops below this value, the heating will be forced to turn on"
}
"turboFactor": "Turbo mode coeff."
},
"emergency": {
@@ -413,7 +415,8 @@
},
"options": {
"desc": "Options",
"title": "Options (additional settings)",
"desc": "Options can change the logic of the boiler. Not all options are documented in the protocol, so the same option can have different effects on different boilers.<br /><b>Note:</b> There is no need to change anything if everything works well.",
"dhwSupport": "DHW support",
"coolingSupport": "Cooling support",
"summerWinterMode": "Summer/winter mode",

View File

@@ -304,7 +304,7 @@
"max": "Temperatura massima"
},
"maxModulation": "Max livello modulazione",
"overheat": {
"ohProtection": {
"title": "Protezione contro il surriscaldamento",
"desc": "<b>Nota:</b> questa funzione può essere utile se la protezione contro il surriscaldamento integrata nella caldaia non funziona o non funziona correttamente e il fluido termovettore bolle. Per disattivarla, impostare 0 come temperatura <b>alta</b> e <b>bassa</b>.",
"highTemp": {
@@ -316,6 +316,12 @@
"note": "Soglia alla quale il bruciatore può essere riacceso"
}
},
"freezeProtection": {
"title": "Protezione antigelo",
"desc": "Il riscaldamento verrà attivato forzatamente se la temperatura del vettore di calore o interna scende al di sotto della <b>temperatura minima</b> durante il <b>tempo di attesa</b>.",
"lowTemp": "Soglia di temperatura minima",
"thresholdTime": "Tempo di attesa <small>(sec)</small>"
},
"portal": {
"login": "Login",
@@ -350,11 +356,7 @@
"heating": {
"hyst": "Isteresi <small>(in gradi)</small>",
"turboFactor": "Turbo mode coeff.",
"antiFreezeTemp": {
"title": "Temperatura di protezione antigelo",
"note": "Se la temperatura del fluido termovettore o interna scende al di sotto di questo valore, il riscaldamento verrà forzato ad accendersi"
}
"turboFactor": "Turbo mode coeff."
},
"emergency": {
@@ -413,7 +415,8 @@
},
"options": {
"desc": "Opzioni",
"title": "Opzioni (impostazioni aggiuntive)",
"desc": "Le opzioni possono modificare la logica della caldaia. Non tutte le opzioni sono documentate nel protocollo, quindi la stessa opzione può avere effetti diversi su caldaie diverse.<br /><b>Nota:</b> Non è necessario modificare nulla se tutto funziona correttamente.",
"dhwSupport": "Supporto ACS",
"coolingSupport": "Supporto rafferscamento",
"summerWinterMode": "Modalità Estate/inverno",

View File

@@ -304,7 +304,7 @@
"max": "Макс. температура"
},
"maxModulation": "Макс. уровень модуляции",
"overheat": {
"ohProtection": {
"title": "Защита от перегрева",
"desc": "<b>Примечание:</b> Эта функция может быть полезна, если встроенная защита от перегрева котла не срабатывает или срабатывает некорректно и теплоноситель закипает. Для отключения установите 0 в качестве <b>верхнего</b> и <b>нижнего</b> порога температуры.",
"highTemp": {
@@ -316,6 +316,12 @@
"note": "Порог, при котором горелка может быть включена снова"
}
},
"freezeProtection": {
"title": "Защита от замерзания",
"desc": "Отопление будет принудительно включено, если темп. теплоносителя или внутренняя темп. опустится ниже <b>нижнего порога</b> в течение <b>времени ожидания</b>.",
"lowTemp": "Нижний порог температуры",
"thresholdTime": "Время ожидания <small>(сек)</small>"
},
"portal": {
"login": "Логин",
@@ -350,11 +356,7 @@
"heating": {
"hyst": "Гистерезис <small>(в градусах)</small>",
"turboFactor": "Коэфф. турбо режима",
"antiFreezeTemp": {
"title": "Температура защиты от замерзания",
"note": "Отопление будет принудительно включено, если температура теплоносителя или внутренняя температура опустится ниже этого значения"
}
"turboFactor": "Коэфф. турбо режима"
},
"emergency": {
@@ -413,7 +415,8 @@
},
"options": {
"desc": "Опции",
"title": "Опции (дополнительные настройки)",
"desc": "Опции могут менять логику работы котла. Не все опции задокументированы в протоколе, поэтому одна и та же опция может иметь разный эффект на разных котлах.<br /><b>Примечание:</b> Нет необходимости что-то менять, если всё работает хорошо.",
"dhwSupport": "Поддержка ГВС",
"coolingSupport": "Поддержка охлаждения",
"summerWinterMode": "Летний/зимний режим",

View File

@@ -207,33 +207,49 @@
<input type="number" inputmode="numeric" name="heating[maxModulation]" min="1" max="100" step="1" required>
</label>
<label>
<span data-i18n>settings.heating.antiFreezeTemp.title</span>
<input type="number" inputmode="numeric" name="heating[antiFreezeTemp]" min="0" max="0" step="1" required>
<small data-i18n>settings.heating.antiFreezeTemp.note</small>
</label>
<hr />
<details>
<summary><b data-i18n>settings.overheat.title</b></summary>
<summary><b data-i18n>settings.ohProtection.title</b></summary>
<div class="grid">
<label>
<span data-i18n>settings.overheat.highTemp.title</span>
<input type="number" inputmode="numeric" name="heating[overheatHighTemp]" min="0" max="212" step="1" required>
<small data-i18n>settings.overheat.highTemp.note</small>
<span data-i18n>settings.ohProtection.highTemp.title</span>
<input type="number" inputmode="numeric" name="heating[overheatProtection][highTemp]" min="0" max="0" step="1" required>
<small data-i18n>settings.ohProtection.highTemp.note</small>
</label>
<label>
<span data-i18n>settings.overheat.lowTemp.title</span>
<input type="number" inputmode="numeric" name="heating[overheatLowTemp]" min="0" max="211" step="1" required>
<small data-i18n>settings.overheat.lowTemp.note</small>
<span data-i18n>settings.ohProtection.lowTemp.title</span>
<input type="number" inputmode="numeric" name="heating[overheatProtection][lowTemp]" min="0" max="0" step="1" required>
<small data-i18n>settings.ohProtection.lowTemp.note</small>
</label>
</div>
<small data-i18n>settings.overheat.desc</small>
<small data-i18n>settings.ohProtection.desc</small>
</details>
<br>
<hr />
<details>
<summary><b data-i18n>settings.freezeProtection.title</b></summary>
<div class="grid">
<label>
<span data-i18n>settings.freezeProtection.lowTemp</span>
<input type="number" inputmode="numeric" name="heating[freezeProtection][lowTemp]" min="0" max="0" step="1" required>
</label>
<label>
<span data-i18n>settings.freezeProtection.thresholdTime</span>
<input type="number" inputmode="numeric" name="heating[freezeProtection][thresholdTime]" min="30" max="1800" step="1" required>
</label>
</div>
<small data-i18n>settings.freezeProtection.desc</small>
</details>
<br />
<button type="submit" data-i18n>button.save</button>
</form>
@@ -264,27 +280,29 @@
<input type="number" inputmode="numeric" name="dhw[maxModulation]" min="1" max="100" step="1" required>
</label>
<hr />
<details>
<summary><b data-i18n>settings.overheat.title</b></summary>
<summary><b data-i18n>settings.ohProtection.title</b></summary>
<div class="grid">
<label>
<span data-i18n>settings.overheat.highTemp.title</span>
<input type="number" inputmode="numeric" name="dhw[overheatHighTemp]" min="0" max="212" step="1" required>
<small data-i18n>settings.overheat.highTemp.note</small>
<span data-i18n>settings.ohProtection.highTemp.title</span>
<input type="number" inputmode="numeric" name="dhw[overheatProtection][highTemp]" min="0" max="0" step="1" required>
<small data-i18n>settings.ohProtection.highTemp.note</small>
</label>
<label>
<span data-i18n>settings.overheat.lowTemp.title</span>
<input type="number" inputmode="numeric" name="dhw[overheatLowTemp]" min="0" max="211" step="1" required>
<small data-i18n>settings.overheat.lowTemp.note</small>
<span data-i18n>settings.ohProtection.lowTemp.title</span>
<input type="number" inputmode="numeric" name="dhw[overheatProtection][lowTemp]" min="0" max="0" step="1" required>
<small data-i18n>settings.ohProtection.lowTemp.note</small>
</label>
</div>
<small data-i18n>settings.overheat.desc</small>
<small data-i18n>settings.ohProtection.desc</small>
</details>
<br>
<br />
<button type="submit" data-i18n>button.save</button>
</form>
@@ -533,97 +551,107 @@
</label>
</div>
<fieldset>
<legend data-i18n>settings.ot.options.desc</legend>
<details>
<summary><b data-i18n>settings.ot.options.title</b></summary>
<label>
<input type="checkbox" name="opentherm[options][dhwSupport]" value="true">
<span data-i18n>settings.ot.options.dhwSupport</span>
</label>
<div>
<fieldset>
<small data-i18n>settings.ot.options.desc</small>
</fieldset>
<label>
<input type="checkbox" name="opentherm[options][coolingSupport]" value="true">
<span data-i18n>settings.ot.options.coolingSupport</span>
</label>
<fieldset>
<label>
<input type="checkbox" name="opentherm[options][dhwSupport]" value="true">
<span data-i18n>settings.ot.options.dhwSupport</span>
</label>
<label>
<input type="checkbox" name="opentherm[options][summerWinterMode]" value="true">
<span data-i18n>settings.ot.options.summerWinterMode</span>
</label>
<label>
<input type="checkbox" name="opentherm[options][coolingSupport]" value="true">
<span data-i18n>settings.ot.options.coolingSupport</span>
</label>
<label>
<input type="checkbox" name="opentherm[options][heatingStateToSummerWinterMode]" value="true">
<span data-i18n>settings.ot.options.heatingStateToSummerWinterMode</span>
</label>
<label>
<input type="checkbox" name="opentherm[options][summerWinterMode]" value="true">
<span data-i18n>settings.ot.options.summerWinterMode</span>
</label>
<label>
<input type="checkbox" name="opentherm[options][ch2AlwaysEnabled]" value="true">
<span data-i18n>settings.ot.options.ch2AlwaysEnabled</span>
</label>
<label>
<input type="checkbox" name="opentherm[options][heatingStateToSummerWinterMode]" value="true">
<span data-i18n>settings.ot.options.heatingStateToSummerWinterMode</span>
</label>
<label>
<input type="checkbox" name="opentherm[options][heatingToCh2]" value="true">
<span data-i18n>settings.ot.options.heatingToCh2</span>
</label>
<label>
<input type="checkbox" name="opentherm[options][ch2AlwaysEnabled]" value="true">
<span data-i18n>settings.ot.options.ch2AlwaysEnabled</span>
</label>
<label>
<input type="checkbox" name="opentherm[options][dhwToCh2]" value="true">
<span data-i18n>settings.ot.options.dhwToCh2</span>
</label>
<label>
<input type="checkbox" name="opentherm[options][heatingToCh2]" value="true">
<span data-i18n>settings.ot.options.heatingToCh2</span>
</label>
<label>
<input type="checkbox" name="opentherm[options][dhwBlocking]" value="true">
<span data-i18n>settings.ot.options.dhwBlocking</span>
</label>
<label>
<input type="checkbox" name="opentherm[options][dhwToCh2]" value="true">
<span data-i18n>settings.ot.options.dhwToCh2</span>
</label>
<label>
<input type="checkbox" name="opentherm[options][dhwStateAsDhwBlocking]" value="true">
<span data-i18n>settings.ot.options.dhwStateAsDhwBlocking</span>
</label>
<label>
<input type="checkbox" name="opentherm[options][dhwBlocking]" value="true">
<span data-i18n>settings.ot.options.dhwBlocking</span>
</label>
<label>
<input type="checkbox" name="opentherm[options][maxTempSyncWithTargetTemp]" value="true">
<span data-i18n>settings.ot.options.maxTempSyncWithTargetTemp</span>
</label>
<label>
<input type="checkbox" name="opentherm[options][dhwStateAsDhwBlocking]" value="true">
<span data-i18n>settings.ot.options.dhwStateAsDhwBlocking</span>
</label>
<label>
<input type="checkbox" name="opentherm[options][getMinMaxTemp]" value="true">
<span data-i18n>settings.ot.options.getMinMaxTemp</span>
</label>
<label>
<input type="checkbox" name="opentherm[options][maxTempSyncWithTargetTemp]" value="true">
<span data-i18n>settings.ot.options.maxTempSyncWithTargetTemp</span>
</label>
<label>
<input type="checkbox" name="opentherm[options][ignoreDiagState]" value="true">
<span data-i18n>settings.ot.options.ignoreDiagState</span>
</label>
<label>
<input type="checkbox" name="opentherm[options][getMinMaxTemp]" value="true">
<span data-i18n>settings.ot.options.getMinMaxTemp</span>
</label>
<label>
<input type="checkbox" name="opentherm[options][autoFaultReset]" value="true">
<span data-i18n>settings.ot.options.autoFaultReset</span>
</label>
<label>
<input type="checkbox" name="opentherm[options][ignoreDiagState]" value="true">
<span data-i18n>settings.ot.options.ignoreDiagState</span>
</label>
<label>
<input type="checkbox" name="opentherm[options][autoDiagReset]" value="true">
<span data-i18n>settings.ot.options.autoDiagReset</span>
</label>
<label>
<input type="checkbox" name="opentherm[options][autoFaultReset]" value="true">
<span data-i18n>settings.ot.options.autoFaultReset</span>
</label>
<label>
<input type="checkbox" name="opentherm[options][setDateAndTime]" value="true">
<span data-i18n>settings.ot.options.setDateAndTime</span>
</label>
<label>
<input type="checkbox" name="opentherm[options][autoDiagReset]" value="true">
<span data-i18n>settings.ot.options.autoDiagReset</span>
</label>
<label>
<input type="checkbox" name="opentherm[options][immergasFix]" value="true">
<span data-i18n>settings.ot.options.immergasFix</span>
</label>
<label>
<input type="checkbox" name="opentherm[options][setDateAndTime]" value="true">
<span data-i18n>settings.ot.options.setDateAndTime</span>
</label>
<hr />
<label>
<input type="checkbox" name="opentherm[options][nativeHeatingControl]" value="true">
<span data-i18n>settings.ot.nativeHeating.title</span><br />
<small data-i18n>settings.ot.nativeHeating.note</small>
</label>
</fieldset>
<label>
<input type="checkbox" name="opentherm[options][immergasFix]" value="true">
<span data-i18n>settings.ot.options.immergasFix</span>
</label>
<hr />
<label>
<input type="checkbox" name="opentherm[options][nativeHeatingControl]" value="true">
<span data-i18n>settings.ot.nativeHeating.title</span><br />
<small data-i18n>settings.ot.nativeHeating.note</small>
</label>
</fieldset>
</div>
</details>
<br />
<button type="submit" data-i18n>button.save</button>
</form>
</div>
@@ -930,12 +958,19 @@
setInputValue("[name='heating[hysteresis]']", data.heating.hysteresis);
setInputValue("[name='heating[turboFactor]']", data.heating.turboFactor);
setInputValue("[name='heating[maxModulation]']", data.heating.maxModulation);
setInputValue("[name='heating[overheatHighTemp]']", data.heating.overheatHighTemp);
setInputValue("[name='heating[overheatLowTemp]']", data.heating.overheatLowTemp);
setInputValue("[name='heating[antiFreezeTemp]']", data.heating.antiFreezeTemp, {
setInputValue("[name='heating[overheatProtection][highTemp]']", data.heating.overheatProtection.highTemp, {
"min": 0,
"max": data.system.unitSystem == 0 ? 100 : 212
});
setInputValue("[name='heating[overheatProtection][lowTemp]']", data.heating.overheatProtection.lowTemp, {
"min": 0,
"max": data.system.unitSystem == 0 ? 99 : 211
});
setInputValue("[name='heating[freezeProtection][lowTemp]']", data.heating.freezeProtection.lowTemp, {
"min": data.system.unitSystem == 0 ? 1 : 34,
"max": data.system.unitSystem == 0 ? 30 : 86
});
setInputValue("[name='heating[freezeProtection][thresholdTime]']", data.heating.freezeProtection.thresholdTime);
setBusy('#heating-settings-busy', '#heating-settings', false);
// DHW
@@ -948,8 +983,14 @@
"max": data.system.unitSystem == 0 ? 100 : 212
});
setInputValue("[name='dhw[maxModulation]']", data.dhw.maxModulation);
setInputValue("[name='dhw[overheatHighTemp]']", data.dhw.overheatHighTemp);
setInputValue("[name='dhw[overheatLowTemp]']", data.dhw.overheatLowTemp);
setInputValue("[name='dhw[overheatProtection][highTemp]']", data.dhw.overheatProtection.highTemp, {
"min": 0,
"max": data.system.unitSystem == 0 ? 100 : 212
});
setInputValue("[name='dhw[overheatProtection][lowTemp]']", data.dhw.overheatProtection.lowTemp, {
"min": 0,
"max": data.system.unitSystem == 0 ? 99 : 211
});
setBusy('#dhw-settings-busy', '#dhw-settings', false);
// Emergency mode