feat: added OT option alwaysSetIndoorTemp #180

chore: bump version to 1.6.0
2025-12-12 19:24:27 +05:00 · 2025-12-10 17:31:19 +03:00 · 2025-12-10 17:16:20 +03:00
13 changed files with 66 additions and 70 deletions
--- a/platformio.ini
+++ b/platformio.ini
@@ -14,7 +14,7 @@ extra_configs = secrets.default.ini
 core_dir = .pio

 [env]
-version = 1.5.6
+version = 1.6.0
 framework = arduino
 lib_deps = 
 	bblanchon/ArduinoJson@^7.4.2
--- a/src/MainTask.h
+++ b/src/MainTask.h
@@ -319,7 +319,7 @@ protected:
        emergencyFlags |= 0b00000010;
      }
      
-      if (settings.opentherm.options.nativeOTC) {
+      if (settings.opentherm.options.nativeHeatingControl) {
        emergencyFlags |= 0b00000100;
      }
    }
--- a/src/OpenThermTask.h
+++ b/src/OpenThermTask.h
@@ -218,7 +218,7 @@ protected:
      vars.master.heating.enabled,
      vars.master.dhw.enabled,
      settings.opentherm.options.coolingSupport,
-      settings.opentherm.options.nativeOTC,
+      settings.opentherm.options.nativeHeatingControl,
      vars.master.ch2.enabled,
      summerWinterMode,
      dhwBlocking,
@@ -911,7 +911,7 @@ protected:

    // Update CH2 temp
    if (Sensors::getAmountByType(Sensors::Type::OT_CH2_TEMP, true)) {
-      if (vars.master.ch2.enabled && !settings.opentherm.options.nativeOTC) {
+      if (vars.master.ch2.enabled && !settings.opentherm.options.nativeHeatingControl) {
        if (this->updateCh2Temp()) {
          float convertedCh2Temp = convertTemp(
            vars.slave.ch2.currentTemp,
@@ -1209,8 +1209,8 @@ protected:
      }
    }

-    // Send indoor temp if AlwaysSendIndoorTemp option is enabled.
-    if (settings.opentherm.options.nativeOTC || settings.opentherm.options.alwaysSendIndoorTemp) {
+    // Set indoor temp for Native heating control/Always set indoor temp
+    if (settings.opentherm.options.nativeHeatingControl || settings.opentherm.options.alwaysSetIndoorTemp) {
      // Converted current indoor temp
      float convertedTemp = convertTemp(vars.master.heating.indoorTemp, settings.system.unitSystem, settings.opentherm.unitSystem);

@@ -1239,8 +1239,9 @@ protected:
      }
    }

-    // NativeOTC
-    if (settings.opentherm.options.nativeOTC) {
+
+    // Native heating control
+    if (settings.opentherm.options.nativeHeatingControl) {
      // Converted target indoor temp
      float convertedTemp = convertTemp(vars.master.heating.targetTemp, settings.system.unitSystem, settings.opentherm.unitSystem);

@@ -1276,7 +1277,7 @@ protected:
    }

    // Normal heating control
-    if (!settings.opentherm.options.nativeOTC && vars.master.heating.enabled) {
+    if (!settings.opentherm.options.nativeHeatingControl && vars.master.heating.enabled) {
      // Converted target heating temp
      float convertedTemp = convertTemp(vars.master.heating.setpointTemp, settings.system.unitSystem, settings.opentherm.unitSystem);

@@ -1313,7 +1314,7 @@ protected:
    }

    // Set CH2 temp
-    if (!settings.opentherm.options.nativeOTC && vars.master.ch2.enabled) {
+    if (!settings.opentherm.options.nativeHeatingControl && vars.master.ch2.enabled) {
      if (settings.opentherm.options.heatingToCh2 || settings.opentherm.options.dhwToCh2) {
        // Converted target CH2 temp
        float convertedTemp = convertTemp(
--- a/src/RegulatorTask.h
+++ b/src/RegulatorTask.h
@@ -37,7 +37,7 @@ protected:
    this->indoorSensorsConnected = Sensors::existsConnectedSensorsByPurpose(Sensors::Purpose::INDOOR_TEMP);
    //this->outdoorSensorsConnected = Sensors::existsConnectedSensorsByPurpose(Sensors::Purpose::OUTDOOR_TEMP);

-    if (settings.equitherm.enabled || settings.pid.enabled || settings.opentherm.options.nativeOTC) {
+    if (settings.equitherm.enabled || settings.pid.enabled || settings.opentherm.options.nativeHeatingControl) {
      vars.master.heating.indoorTempControl = true;
      vars.master.heating.minTemp = THERMOSTAT_INDOOR_MIN_TEMP;
      vars.master.heating.maxTemp = THERMOSTAT_INDOOR_MAX_TEMP;
@@ -102,7 +102,7 @@ protected:
  void hysteresis() {
    bool useHyst = false;
    if (settings.heating.hysteresis.enabled && this->indoorSensorsConnected) {
-      useHyst = settings.equitherm.enabled || settings.pid.enabled || settings.opentherm.options.nativeOTC;
+      useHyst = settings.equitherm.enabled || settings.pid.enabled || settings.opentherm.options.nativeHeatingControl;
    }

    if (useHyst) {
@@ -119,13 +119,13 @@ protected:
  }

  inline float getHeatingMinSetpointTemp() {
-    return settings.opentherm.options.nativeOTC
+    return settings.opentherm.options.nativeHeatingControl
      ? vars.master.heating.minTemp
      : settings.heating.minTemp;
  }

  inline float getHeatingMaxSetpointTemp() {
-    return settings.opentherm.options.nativeOTC
+    return settings.opentherm.options.nativeHeatingControl
      ? vars.master.heating.maxTemp
      : settings.heating.maxTemp;
  }
@@ -146,7 +146,7 @@ protected:
    if (vars.emergency.state) {
      return settings.emergency.target;

-    } else if (settings.opentherm.options.nativeOTC) {
+    } else if (settings.opentherm.options.nativeHeatingControl) {
      return settings.heating.target;

    } else if (!settings.equitherm.enabled && !settings.pid.enabled) {
--- a/src/Settings.h
+++ b/src/Settings.h
@@ -78,8 +78,8 @@ struct Settings {
      bool autoFaultReset = false;
      bool autoDiagReset = false;
      bool setDateAndTime = false;
-      bool alwaysSendIndoorTemp = true;
-      bool nativeOTC = false;
+      bool alwaysSetIndoorTemp = true;
+      bool nativeHeatingControl = false;
      bool immergasFix = false;
    } options;
  } opentherm;
--- a/src/strings.h
+++ b/src/strings.h
@@ -38,6 +38,7 @@ const char S_ACTION[]                               PROGMEM = "action";
 const char S_ACTIONS[]                              PROGMEM = "actions";
 const char S_ACTIVE[]                               PROGMEM = "active";
 const char S_ADDRESS[]                              PROGMEM = "address";
+const char S_ALWAYS_SET_INDOOR_TEMP[]               PROGMEM = "alwaysSetIndoorTemp";
 const char S_ANTI_STUCK_INTERVAL[]                  PROGMEM = "antiStuckInterval";
 const char S_ANTI_STUCK_TIME[]                      PROGMEM = "antiStuckTime";
 const char S_AP[]                                   PROGMEM = "ap";
@@ -110,7 +111,6 @@ const char S_HYSTERESIS[]                           PROGMEM = "hysteresis";
 const char S_ID[]                                   PROGMEM = "id";
 const char S_IGNORE_DIAG_STATE[]                    PROGMEM = "ignoreDiagState";
 const char S_IMMERGAS_FIX[]                         PROGMEM = "immergasFix";
-const char S_ALWAYS_SEND_INDOOR_TEMP[]              PROGMEM = "alwaysSendIndoorTemp";
 const char S_INDOOR_TEMP[]                          PROGMEM = "indoorTemp";
 const char S_INDOOR_TEMP_CONTROL[]                  PROGMEM = "indoorTempControl";
 const char S_IN_GPIO[]                              PROGMEM = "inGpio";
@@ -142,7 +142,7 @@ const char S_MODEL[]                                PROGMEM = "model";
 const char S_MODULATION[]                           PROGMEM = "modulation";
 const char S_MQTT[]                                 PROGMEM = "mqtt";
 const char S_NAME[]                                 PROGMEM = "name";
-const char S_NATIVE_OTC[]                           PROGMEM = "nativeOTC";
+const char S_NATIVE_HEATING_CONTROL[]               PROGMEM = "nativeHeatingControl";
 const char S_NETWORK[]                              PROGMEM = "network";
 const char S_NTP[]                                  PROGMEM = "ntp";
 const char S_OFFSET[]                               PROGMEM = "offset";
--- a/src/utils.h
+++ b/src/utils.h
@@ -468,10 +468,9 @@ void settingsToJson(const Settings& src, JsonVariant dst, bool safe = false) {
    otOptions[FPSTR(S_AUTO_FAULT_RESET)] = src.opentherm.options.autoFaultReset;
    otOptions[FPSTR(S_AUTO_DIAG_RESET)] = src.opentherm.options.autoDiagReset;
    otOptions[FPSTR(S_SET_DATE_AND_TIME)] = src.opentherm.options.setDateAndTime;
-    otOptions[FPSTR(S_ALWAYS_SEND_INDOOR_TEMP)] = src.opentherm.options.alwaysSendIndoorTemp;
-    otOptions[FPSTR(S_NATIVE_OTC)] = src.opentherm.options.nativeOTC;
+    otOptions[FPSTR(S_ALWAYS_SET_INDOOR_TEMP)] = src.opentherm.options.alwaysSetIndoorTemp;
+    otOptions[FPSTR(S_NATIVE_HEATING_CONTROL)] = src.opentherm.options.nativeHeatingControl;
    otOptions[FPSTR(S_IMMERGAS_FIX)] = src.opentherm.options.immergasFix;
-    

    auto mqtt = dst[FPSTR(S_MQTT)].to<JsonObject>();
    mqtt[FPSTR(S_ENABLED)] = src.mqtt.enabled;
@@ -1005,20 +1004,20 @@ bool jsonToSettings(const JsonVariantConst src, Settings& dst, bool safe = false
      }
    }

-    if (src[FPSTR(S_OPENTHERM)][FPSTR(S_OPTIONS)][FPSTR(S_ALWAYS_SEND_INDOOR_TEMP)].is<bool>()) {
-      bool value = src[FPSTR(S_OPENTHERM)][FPSTR(S_OPTIONS)][FPSTR(S_ALWAYS_SEND_INDOOR_TEMP)].as<bool>();
+    if (src[FPSTR(S_OPENTHERM)][FPSTR(S_OPTIONS)][FPSTR(S_ALWAYS_SET_INDOOR_TEMP)].is<bool>()) {
+      bool value = src[FPSTR(S_OPENTHERM)][FPSTR(S_OPTIONS)][FPSTR(S_ALWAYS_SET_INDOOR_TEMP)].as<bool>();

-      if (value != dst.opentherm.options.alwaysSendIndoorTemp) {
-        dst.opentherm.options.alwaysSendIndoorTemp = value;
+      if (value != dst.opentherm.options.alwaysSetIndoorTemp) {
+        dst.opentherm.options.alwaysSetIndoorTemp = value;
        changed = true;
      }
    }

-    if (src[FPSTR(S_OPENTHERM)][FPSTR(S_OPTIONS)][FPSTR(S_NATIVE_OTC)].is<bool>()) {
-      bool value = src[FPSTR(S_OPENTHERM)][FPSTR(S_OPTIONS)][FPSTR(S_NATIVE_OTC)].as<bool>();
+    if (src[FPSTR(S_OPENTHERM)][FPSTR(S_OPTIONS)][FPSTR(S_NATIVE_HEATING_CONTROL)].is<bool>()) {
+      bool value = src[FPSTR(S_OPENTHERM)][FPSTR(S_OPTIONS)][FPSTR(S_NATIVE_HEATING_CONTROL)].as<bool>();

-      if (value != dst.opentherm.options.nativeOTC) {
-        dst.opentherm.options.nativeOTC = value;
+      if (value != dst.opentherm.options.nativeHeatingControl) {
+        dst.opentherm.options.nativeHeatingControl = value;

        if (value) {
          dst.equitherm.enabled = false;
@@ -1038,6 +1037,7 @@ bool jsonToSettings(const JsonVariantConst src, Settings& dst, bool safe = false
      }
    }

+
    // mqtt
    if (src[FPSTR(S_MQTT)][FPSTR(S_ENABLED)].is<bool>()) {
      bool value = src[FPSTR(S_MQTT)][FPSTR(S_ENABLED)].as<bool>();
@@ -1128,7 +1128,7 @@ bool jsonToSettings(const JsonVariantConst src, Settings& dst, bool safe = false
  if (src[FPSTR(S_EQUITHERM)][FPSTR(S_ENABLED)].is<bool>()) {
    bool value = src[FPSTR(S_EQUITHERM)][FPSTR(S_ENABLED)].as<bool>();

-    if (!dst.opentherm.options.nativeOTC) {
+    if (!dst.opentherm.options.nativeHeatingControl) {
      if (value != dst.equitherm.enabled) {
        dst.equitherm.enabled = value;
        changed = true;
@@ -1181,7 +1181,7 @@ bool jsonToSettings(const JsonVariantConst src, Settings& dst, bool safe = false
  if (src[FPSTR(S_PID)][FPSTR(S_ENABLED)].is<bool>()) {
    bool value = src[FPSTR(S_PID)][FPSTR(S_ENABLED)].as<bool>();

-    if (!dst.opentherm.options.nativeOTC) {
+    if (!dst.opentherm.options.nativeHeatingControl) {
      if (value != dst.pid.enabled) {
        dst.pid.enabled = value;
        changed = true;
@@ -1714,7 +1714,7 @@ bool jsonToSettings(const JsonVariantConst src, Settings& dst, bool safe = false
  // force check emergency target
  {
    float value = !src[FPSTR(S_EMERGENCY)][FPSTR(S_TARGET)].isNull() ? src[FPSTR(S_EMERGENCY)][FPSTR(S_TARGET)].as<float>() : dst.emergency.target;
-    bool noRegulators = !dst.opentherm.options.nativeOTC;
+    bool noRegulators = !dst.opentherm.options.nativeHeatingControl;
    bool valid = isValidTemp(
      value,
      dst.system.unitSystem,
@@ -1739,7 +1739,7 @@ bool jsonToSettings(const JsonVariantConst src, Settings& dst, bool safe = false

  // force check heating target
  {
-    bool indoorTempControl = dst.equitherm.enabled || dst.pid.enabled || dst.opentherm.options.nativeOTC;
+    bool indoorTempControl = dst.equitherm.enabled || dst.pid.enabled || dst.opentherm.options.nativeHeatingControl;
    float minTemp = indoorTempControl ? THERMOSTAT_INDOOR_MIN_TEMP : dst.heating.minTemp;
    float maxTemp = indoorTempControl ? THERMOSTAT_INDOOR_MAX_TEMP : dst.heating.maxTemp;

--- a/src_data/locales/cn.json
+++ b/src_data/locales/cn.json
@@ -457,13 +457,12 @@
          "autoFaultReset": "自动报警复位 <small>(不推荐！)</small>",
          "autoDiagReset": "自动诊断复位 <small>(不推荐！)</small>",
          "setDateAndTime": "同步设置锅炉日期与时间",
-          "immergasFix": "针对Immergas锅炉的兼容性修复",
-          "alwaysSendIndoorTemp": "向锅炉发送当前室内温度"
+          "immergasFix": "针对Immergas锅炉的兼容性修复"
        },

-        "nativeOTC": {
-          "title": "原生热载体温度计算模式",
-          "note": "仅在锅炉处于 OTC 模式时<u>才</u>工作：需要并接受目标室内温度，并基于内置曲线模式自行调节热载体温度。与 PID 和 Equitherm 不兼容。"
+        "nativeHeating": {
+          "title": "原生锅炉供暖控制",
+          "note": "<u>注意：</u> 仅适用于锅炉需接收目标室温并自主调节载热介质温度的场景，与固件中的PID及Equithermq气候补偿功能不兼容。"
        }
      },

--- a/src_data/locales/en.json
+++ b/src_data/locales/en.json
@@ -457,13 +457,13 @@
          "autoFaultReset": "Auto fault reset <small>(not recommended!)</small>",
          "autoDiagReset": "Auto diag reset <small>(not recommended!)</small>",
          "setDateAndTime": "Set date & time on boiler",
-          "immergasFix": "Fix for Immergas boilers",
-          "alwaysSendIndoorTemp": "Send current indoor temp to boiler"
+          "alwaysSetIndoorTemp": "Always set indoor temperature",
+          "immergasFix": "Fix for Immergas boilers"
        },

-        "nativeOTC": {
-          "title": "Native OTC mode",
-          "note": "Works <u>ONLY</u> if the boiler is in OTC mode: requires and accepts the target indoor temperature and self-regulates the heat carrier temperature based on the built-in curves mode. Incompatible with PID and Equitherm."
+        "nativeHeating": {
+          "title": "Native heating control (boiler)",
+          "note": "Works <u>ONLY</u> if the boiler requires the desired room temperature and regulates the temperature of the coolant itself. Not compatible with PID and Equitherm regulators in firmware."
        }
      },

--- a/src_data/locales/it.json
+++ b/src_data/locales/it.json
@@ -457,13 +457,12 @@
          "autoFaultReset": "Ripristino automatico degli errori <small>(sconsigliato!)</small>",
          "autoDiagReset": "Ripristino diagnostico automatica <small>(sconsigliato!)</small>",
          "setDateAndTime": "Imposta data e ora sulla caldaia",
-          "immergasFix": "Fix per caldiaie Immergas",
-          "alwaysSendIndoorTemp": "Invia la temp attuale interna alla caldaia"
+          "immergasFix": "Fix per caldiaie Immergas"
        },

-        "nativeOTC": {
-          "title": "Modalità nativa di calcolo della temperatura del vettore termico",
-          "note": "Funziona <u>SOLO</u> se la caldaia è in modalità OTC: richiede e accetta la temperatura interna target e regola autonomamente la temperatura del vettore termico basata sulla modalità curve integrata. Incompatibile con PID e Equitherm."
+        "nativeHeating": {
+          "title": "Controllo del riscaldamento nativo (caldaia)",
+          "note": "Lavora <u>SOLO</u> se la caldaia richiede la temperatura ambiente desiderata e regola autonomamente la temperatura del fluido. Non compatiblile con regolazioni PID e Equitherm del sistema."
        }
      },

--- a/src_data/locales/nl.json
+++ b/src_data/locales/nl.json
@@ -422,13 +422,11 @@
          "autoFaultReset": "Automatische storingsreset <small>(niet aanbevolen!)</small>",
          "autoDiagReset": "Automatische diagnosereset <small>(niet aanbevolen!)</small>",
          "setDateAndTime": "Stel datum & tijd in op ketel",
-          "immergasFix": "Fix voor Immergas-ketels",
-          "alwaysSendIndoorTemp": "Stuur huidige binnentemp naar ketel"
+          "immergasFix": "Fix voor Immergas-ketels"
        },
-
-        "nativeOTC": {
-          "title": "Native warmtedrager temperatuur berekeningsmodus",
-          "note": "Werkt <u>ALLEEN</u> als de ketel in OTC-modus is: vereist en accepteert de doel binnentemperatuur en regelt zelf de warmtedrager temperatuur op basis van de ingebouwde curves modus. Incompatibel met PID en Equitherm."
+        "nativeHeating": {
+          "title": "Natuurlijke verwarmingsregeling (ketel)",
+          "note": "Werkt <u>ALLEEN</u> als de ketel de gewenste kamertemperatuur vereist en zelf de temperatuur van de warmtedrager regelt. Niet compatibel met PID- en Equitherm-regelaars in de firmware."
        }
      },
      "mqtt": {
--- a/src_data/locales/ru.json
+++ b/src_data/locales/ru.json
@@ -457,13 +457,12 @@
          "autoFaultReset": "Автоматический сброс ошибок <small>(не рекомендуется!)</small>",
          "autoDiagReset": "Автоматический сброс диагностики <small>(не рекомендуется!)</small>",
          "setDateAndTime": "Устанавливать время и дату на котле",
-          "immergasFix": "Фикс для котлов Immergas",
-          "alwaysSendIndoorTemp": "Передавать текущую темп. в помещении котлу"
+          "immergasFix": "Фикс для котлов Immergas"
        },

-        "nativeOTC": {
-          "title": "Нативный режим OTC (расчёт температуры теплоносителя)",
-          "note": "Работает <u>ТОЛЬКО</u> если котел в режиме OTC: требует и принимает целевую температуру в помещении и сам регулирует температуру теплоносителя на основе встроенного режима кривых. Несовместимо с ПИД и ПЗА."
+        "nativeHeating": {
+          "title": "Передать управление отоплением котлу",
+          "note": "Работает <u>ТОЛЬКО</u> если котел требует и принимает целевую температуру в помещении и сам регулирует температуру теплоносителя на основе встроенного режима кривых. Несовместимо с ПИД и ПЗА."
        }
      },

--- a/src_data/pages/settings.html
+++ b/src_data/pages/settings.html
@@ -688,21 +688,21 @@
                    </label>

                    <label>
-                      <input type="checkbox" name="opentherm[options][immergasFix]" value="true">
-                      <span data-i18n>settings.ot.options.immergasFix</span>
+                      <input type="checkbox" name="opentherm[options][alwaysSetIndoorTemp]" value="true">
+                      <span data-i18n>settings.ot.options.alwaysSetIndoorTemp</span>
                    </label>

                    <label>
-                      <input type="checkbox" name="opentherm[options][alwaysSendIndoorTemp]" value="true">
-                      <span data-i18n>settings.ot.options.alwaysSendIndoorTemp</span>
+                      <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][nativeOTC]" value="true">
-                      <span data-i18n>settings.ot.nativeOTC.title</span><br />
-                      <small data-i18n>settings.ot.nativeOTC.note</small>
+                      <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>
@@ -1122,9 +1122,9 @@
          setCheckboxValue("[name='opentherm[options][autoFaultReset]']", data.opentherm.options.autoFaultReset);
          setCheckboxValue("[name='opentherm[options][autoDiagReset]']", data.opentherm.options.autoDiagReset);
          setCheckboxValue("[name='opentherm[options][setDateAndTime]']", data.opentherm.options.setDateAndTime);
-          setCheckboxValue("[name='opentherm[options][nativeOTC]']", data.opentherm.options.nativeOTC);
+          setCheckboxValue("[name='opentherm[options][alwaysSetIndoorTemp]']", data.opentherm.options.alwaysSetIndoorTemp);
+          setCheckboxValue("[name='opentherm[options][nativeHeatingControl]']", data.opentherm.options.nativeHeatingControl);
          setCheckboxValue("[name='opentherm[options][immergasFix]']", data.opentherm.options.immergasFix);
-          setCheckboxValue("[name='opentherm[options][alwaysSendIndoorTemp]']", data.opentherm.options.alwaysSendIndoorTemp);
          setBusy('#ot-settings-busy', '#ot-settings', false);

          // MQTT
@@ -1212,7 +1212,7 @@
          setBusy('#dhw-settings-busy', '#dhw-settings', false);

          // Emergency mode
-          if (data.opentherm.options.nativeOTC) {
+          if (data.opentherm.options.nativeHeatingControl) {
            setInputValue("[name='emergency[target]']", data.emergency.target, {
              "min": data.system.unitSystem == 0 ? 5 : 41,
              "max": data.system.unitSystem == 0 ? 40 : 104
Author	SHA1	Message	Date
Yurii	8641f9f1e4	feat: added OT option `alwaysSetIndoorTemp` #180	2025-12-10 17:31:19 +03:00
Yurii	c9fee6f1eb	chore: bump version to 1.6.0	2025-12-10 17:16:20 +03:00