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

refactor: reworked the setting of the maximum modulation level, added the parameter of the maximum modulation level for DHW

Browse Source
This commit is contained in:
Yurii
2025-05-18 15:31:49 +03:00
parent 7c032ddc2f
commit 612b17b86f
8 changed files with 75 additions and 68 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src_data/locales/en.json
View File

@@ -292,6 +292,7 @@
"min": "Minimum temperature",
"max": "Maximum temperature"
},
"maxModulation": "Max modulation level",
"portal": {
"login": "Login",
@@ -375,7 +376,6 @@
"ledGpio": "RX LED GPIO",
"memberId": "Master member ID",
"flags": "Master flags",
"maxMod": "Max modulation level",
"minPower": {
"title": "Min boiler power <small>(kW)</small>",
"note": "This value is at 0-1% boiler modulation level. Typically found in the boiler specification as \"minimum useful heat output\"."
@@ -395,7 +395,6 @@
"heatingToCh2": "Duplicate heating to CH2",
"dhwToCh2": "Duplicate DHW to CH2",
"dhwBlocking": "DHW blocking",
"modulationSyncWithHeating": "Sync modulation with heating",
"maxTempSyncWithTargetTemp": "Sync max heating temp with target temp",
"getMinMaxTemp": "Get min/max temp from boiler",
"immergasFix": "Fix for Immergas boilers"

3
src_data/locales/it.json
View File

@@ -292,6 +292,7 @@
"min": "Temperatura minima",
"max": "Temperatura massima"
},
"maxModulation": "Max livello modulazione",
"portal": {
"login": "Login",
@@ -375,7 +376,6 @@
"ledGpio": "RX LED GPIO",
"memberId": "Master member ID",
"flags": "Master flags",
"maxMod": "Max livello modulazione",
"minPower": {
"title": "Potenza minima caldaia <small>(kW)</small>",
"note": "Questo valore corrisponde allo livello 0-1% di modulazione della caldaia. Di solito si trova nelle specifiche delle caldaia come \"potenza minima disponibile\"."
@@ -395,7 +395,6 @@
"heatingToCh2": "Riproduci riscaldamento su CH2",
"dhwToCh2": "Riproduci ACS su CH2",
"dhwBlocking": "Bloccare ACS",
"modulationSyncWithHeating": "Sincronizzare modulazione con caldaia",
"maxTempSyncWithTargetTemp": "Sincronizza la temperatura massima di riscaldamento con la temperatura target",
"getMinMaxTemp": "Prendi temp min/max dalla caldaia",
"immergasFix": "Fix per caldiaie Immergas"

3
src_data/locales/ru.json
View File

@@ -292,6 +292,7 @@
"min": "Мин. температура",
"max": "Макс. температура"
},
"maxModulation": "Макс. уровень модуляции",
"portal": {
"login": "Логин",
@@ -375,7 +376,6 @@
"ledGpio": "RX LED GPIO",
"memberId": "Master member ID",
"flags": "Master flags",
"maxMod": "Макс. уровень модуляции",
"minPower": {
"title": "Мин. мощность котла <small>(кВт)</small>",
"note": "Это значение соответствует уровню модуляции котла 0–1%. Обычно можно найти в спецификации котла как \"минимальная полезная тепловая мощность\"."
@@ -395,7 +395,6 @@
"heatingToCh2": "Дублировать параметры отопления в канал 2",
"dhwToCh2": "Дублировать параметры ГВС в канал 2",
"dhwBlocking": "DHW blocking",
"modulationSyncWithHeating": "Синхронизировать модуляцию с отоплением",
"maxTempSyncWithTargetTemp": "Синхронизировать макс. темп. отопления с целевой темп.",
"getMinMaxTemp": "Получать мин. и макс. температуру от котла",
"immergasFix": "Фикс для котлов Immergas"

24
src_data/pages/settings.html
View File

@@ -202,6 +202,11 @@
</label>
</div>
<label>
<span data-i18n>settings.maxModulation</span>
<input type="number" inputmode="numeric" name="heating[maxModulation]" min="1" max="100" step="1" required>
</label>
<button type="submit" data-i18n>button.save</button>
</form>
</div>
@@ -226,6 +231,11 @@
</label>
</div>
<label>
<span data-i18n>settings.maxModulation</span>
<input type="number" inputmode="numeric" name="dhw[maxModulation]" min="1" max="100" step="1" required>
</label>
<button type="submit" data-i18n>button.save</button>
</form>
</div>
@@ -457,11 +467,6 @@
<span data-i18n>settings.ot.flags</span>
<input type="number" inputmode="numeric" name="opentherm[flags]" min="0" max="255" step="1" required>
</label>
<label>
<span data-i18n>settings.ot.maxMod</span>
<input type="number" inputmode="numeric" name="opentherm[maxModulation]" min="1" max="100" step="1" required>
</label>
</div>
<div class="grid">
@@ -521,11 +526,6 @@
<span data-i18n>settings.ot.options.dhwBlocking</span>
</label>
<label>
<input type="checkbox" name="opentherm[options][modulationSyncWithHeating]" value="true">
<span data-i18n>settings.ot.options.modulationSyncWithHeating</span>
</label>
<label>
<input type="checkbox" name="opentherm[options][maxTempSyncWithTargetTemp]" value="true">
<span data-i18n>settings.ot.options.maxTempSyncWithTargetTemp</span>
@@ -788,7 +788,6 @@
setInputValue("[name='opentherm[rxLedGpio]']", data.opentherm.rxLedGpio < 255 ? data.opentherm.rxLedGpio : '');
setInputValue("[name='opentherm[memberId]']", data.opentherm.memberId);
setInputValue("[name='opentherm[flags]']", data.opentherm.flags);
setInputValue("[name='opentherm[maxModulation]']", data.opentherm.maxModulation);
setInputValue("[name='opentherm[minPower]']", data.opentherm.minPower);
setInputValue("[name='opentherm[maxPower]']", data.opentherm.maxPower);
setCheckboxValue("[name='opentherm[options][dhwSupport]']", data.opentherm.options.dhwSupport);
@@ -799,7 +798,6 @@
setCheckboxValue("[name='opentherm[options][heatingToCh2]']", data.opentherm.options.heatingToCh2);
setCheckboxValue("[name='opentherm[options][dhwToCh2]']", data.opentherm.options.dhwToCh2);
setCheckboxValue("[name='opentherm[options][dhwBlocking]']", data.opentherm.options.dhwBlocking);
setCheckboxValue("[name='opentherm[options][modulationSyncWithHeating]']", data.opentherm.options.modulationSyncWithHeating);
setCheckboxValue("[name='opentherm[options][maxTempSyncWithTargetTemp]']", data.opentherm.options.maxTempSyncWithTargetTemp);
setCheckboxValue("[name='opentherm[options][getMinMaxTemp]']", data.opentherm.options.getMinMaxTemp);
setCheckboxValue("[name='opentherm[options][nativeHeatingControl]']", data.opentherm.options.nativeHeatingControl);
@@ -851,6 +849,7 @@
});
setInputValue("[name='heating[hysteresis]']", data.heating.hysteresis);
setInputValue("[name='heating[turboFactor]']", data.heating.turboFactor);
setInputValue("[name='heating[maxModulation]']", data.heating.maxModulation);
setBusy('#heating-settings-busy', '#heating-settings', false);
// DHW
@@ -862,6 +861,7 @@
"min": data.system.unitSystem == 0 ? 1 : 33,
"max": data.system.unitSystem == 0 ? 100 : 212
});
setInputValue("[name='dhw[maxModulation]']", data.dhw.maxModulation);
setBusy('#dhw-settings-busy', '#dhw-settings', false);
// Emergency mode