refactor: after merge

Merge branch 'master' into new-equitherm
flx: typo
2026-03-20 09:18:39 +05:00 · 2025-12-09 19:26:08 +03:00 · 2025-12-09 19:19:30 +03:00 · 2025-11-03 01:09:13 +03:00 · 2025-11-03 00:04:57 +03:00 · 2025-09-19 20:07:31 +03:00
24 changed files with 274 additions and 697 deletions
--- a/assets/ha/report_temp_to_otgateway.yaml
+++ b/assets/ha/report_temp_to_otgateway.yaml
@@ -1,5 +1,5 @@
 # Blueprint for reporting indoor/outdoor temperature to OpenTherm Gateway from any home assistant sensor
-# Updated: 26.01.2026
+# Updated: 03.09.2024

 blueprint:
  name: Report temp to OpenTherm Gateway
@@ -15,6 +15,7 @@ blueprint:
          multiple: false
          filter:
            - domain: sensor
+              device_class: temperature
    target_entity:
      name: Target entity
      description: "Usually ``number.opentherm_indoor_temp`` or ``number.opentherm_outdoor_temp``"
@@ -37,12 +38,8 @@ condition:
    value_template: "{{ states(source_entity) != 'unavailable' and states(target_entity) != 'unavailable' }}"
 action:
  - if:
-      - condition: or
-        conditions:
-          - condition: template
-            value_template: "{{ (states(source_entity)|float(0) - states(target_entity)|float(0)) | abs | round(2) >= 0.01 }}"
-          - condition: template
-            value_template: "{{ (as_timestamp(now()) - as_timestamp(states[target_entity].last_updated)) | int(0) > 300 }}"
+      - condition: template
+        value_template: "{{ (states(source_entity)|float(0) - states(target_entity)|float(0)) | abs | round(2) >= 0.01 }}"
    then:
      - service: number.set_value
        data:
--- a/assets/ha/report_temp_to_otgateway_from_weather.yaml
+++ b/assets/ha/report_temp_to_otgateway_from_weather.yaml
@@ -1,5 +1,5 @@
 # Blueprint for reporting temperature to OpenTherm Gateway from home assistant weather integration
-# Updated: 26.01.2026
+# Updated: 03.09.2024

 blueprint:
  name: Report temp to OpenTherm Gateway from Weather
@@ -37,12 +37,8 @@ condition:
    value_template: "{{ states(source_entity) != 'unavailable' and states(target_entity) != 'unavailable' }}"
 action:
  - if:
-      - condition: or
-        conditions:
-          - condition: template
-            value_template: "{{ (state_attr(source_entity, 'temperature')|float(0) - states(target_entity)|float(0)) | abs | round(2) >= 0.1 }}"
-          - condition: template
-            value_template: "{{ (as_timestamp(now()) - as_timestamp(states[target_entity].last_updated)) | int(0) > 300 }}"
+      - condition: template
+        value_template: "{{ (state_attr(source_entity, 'temperature')|float(0) - states(target_entity)|float(0)) | abs | round(2) >= 0.1 }}"
    then:
      - service: number.set_value
        data:
--- a/lib/CustomOpenTherm/CustomOpenTherm.h
+++ b/lib/CustomOpenTherm/CustomOpenTherm.h
@@ -70,89 +70,50 @@ public:
    }
  }

-  inline auto sendBoilerReset() {
-    return this->sendRequestCode(1);
-  }
-
-  inline auto sendServiceReset() {
-    return this->sendRequestCode(10);
-  }
-
-  inline auto sendWaterFilling() {
-    return this->sendRequestCode(2);
-  }
-
-  bool sendRequestCode(const uint8_t requestCode) {
+  bool sendBoilerReset() {
+    unsigned int data = 1;
+    data <<= 8;
    unsigned long response = this->sendRequest(buildRequest(
      OpenThermMessageType::WRITE_DATA,
      OpenThermMessageID::RemoteRequest,
-      static_cast<unsigned int>(requestCode) << 8
+      data
    ));

-    if (!isValidResponse(response) || !isValidResponseId(response, OpenThermMessageID::RemoteRequest)) {
-      return false;
-    }
-
-    const uint8_t responseRequestCode = (response & 0xFFFF) >> 8;
-    const uint8_t responseCode = response & 0xFF;
-    if (responseRequestCode != requestCode || responseCode < 128) {
-      return false;
-    }
-
-    // reset
-    this->sendRequest(buildRequest(
-      OpenThermMessageType::WRITE_DATA,
-      OpenThermMessageID::RemoteRequest,
-      0u << 8
-    ));
-
-    return true;
+    return isValidResponse(response) && isValidResponseId(response, OpenThermMessageID::RemoteRequest);
  }

-  bool getStr(OpenThermMessageID id, char* buffer, uint16_t length = 50) {
-    if (buffer == nullptr || length == 0) {
-      return false;
-    }
+  bool sendServiceReset() {
+    unsigned int data = 10;
+    data <<= 8;
+    unsigned long response = this->sendRequest(buildRequest(
+      OpenThermMessageType::WRITE_DATA,
+      OpenThermMessageID::RemoteRequest,
+      data
+    ));

-    unsigned long response;
-    uint8_t index = 0;
-    uint8_t maxIndex = 255;
+    return isValidResponse(response) && isValidResponseId(response, OpenThermMessageID::RemoteRequest);
+  }

-    while (index <= maxIndex && index < length) {
-      response = this->sendRequest(buildRequest(
-        OpenThermMessageType::READ_DATA,
-        id,
-        static_cast<unsigned int>(index) << 8
-      ));
+  bool sendWaterFilling() {
+    unsigned int data = 2;
+    data <<= 8;
+    unsigned long response = this->sendRequest(buildRequest(
+      OpenThermMessageType::WRITE_DATA,
+      OpenThermMessageID::RemoteRequest,
+      data
+    ));

-      if (!isValidResponse(response) || !isValidResponseId(response, id)) {
-        break;
-      }
-
-      const uint8_t character = response & 0xFF;
-      if (character == 0) {
-        break;
-      }
-
-      if (index == 0) {
-        maxIndex = (response & 0xFFFF) >> 8;
-      }
-
-      buffer[index++] = static_cast<char>(character);
-    }
-
-    buffer[index] = '\0';
-    return index > 0;
+    return isValidResponse(response) && isValidResponseId(response, OpenThermMessageID::RemoteRequest);
  }

  static bool isCh2Active(unsigned long response) {
-    return response & 0x20;
+      return response & 0x20;
  }

  static bool isValidResponseId(unsigned long response, OpenThermMessageID id) {
-    const uint8_t responseId = (response >> 16) & 0xFF;
+    uint8_t responseId = (response >> 16) & 0xFF;

-    return static_cast<uint8_t>(id) == responseId;
+    return (uint8_t)id == responseId;
  }

  static uint8_t getResponseMessageTypeId(unsigned long response) {
@@ -163,10 +124,10 @@ public:
    uint8_t msgType = getResponseMessageTypeId(response);

    switch (msgType) {
-      case static_cast<uint8_t>(OpenThermMessageType::READ_ACK):
-      case static_cast<uint8_t>(OpenThermMessageType::WRITE_ACK):
-      case static_cast<uint8_t>(OpenThermMessageType::DATA_INVALID):
-      case static_cast<uint8_t>(OpenThermMessageType::UNKNOWN_DATA_ID):
+      case (uint8_t) OpenThermMessageType::READ_ACK:
+      case (uint8_t) OpenThermMessageType::WRITE_ACK:
+      case (uint8_t) OpenThermMessageType::DATA_INVALID:
+      case (uint8_t) OpenThermMessageType::UNKNOWN_DATA_ID:
        return CustomOpenTherm::messageTypeToString(
          static_cast<OpenThermMessageType>(msgType)
        );
--- a/platformio.ini
+++ b/platformio.ini
@@ -14,7 +14,7 @@ extra_configs = secrets.default.ini
 core_dir = .pio

 [env]
-version = 1.6.0
+version = 1.5.6
 framework = arduino
 lib_deps = 
 	bblanchon/ArduinoJson@^7.4.2
@@ -25,11 +25,8 @@ lib_deps =
 	gyverlibs/FileData@^1.0.3
 	gyverlibs/GyverPID@^3.3.2
 	gyverlibs/GyverBlinker@^1.1.1
-	pstolarz/OneWireNg@^0.14.1
-	;milesburton/DallasTemperature@^4.0.5
-	https://github.com/Laxilef/Arduino-Temperature-Control-Library#fix_85c
+	https://github.com/pstolarz/Arduino-Temperature-Control-Library.git#OneWireNg
 	laxilef/TinyLogger@^1.1.1
-lib_ignore = OneWire
 build_type = ${secrets.build_type}
 build_flags = 
 	-mtext-section-literals
@@ -76,7 +73,7 @@ platform_packages = ${env.platform_packages}
 lib_deps = 
 	${env.lib_deps}
 	nrwiersma/ESP8266Scheduler@^1.2
-lib_ignore = ${env.lib_ignore}
+lib_ignore = 
 extra_scripts = 
 	post:tools/build.py
 build_type = ${env.build_type}
@@ -95,14 +92,14 @@ check_flags = ${env.check_flags}
 ;platform_packages = 
 ;  framework-arduinoespressif32 @ https://github.com/espressif/arduino-esp32.git#3.0.5
 ;  framework-arduinoespressif32-libs @ https://github.com/espressif/esp32-arduino-lib-builder/releases/download/idf-release_v5.1/esp32-arduino-libs-idf-release_v5.1-33fbade6.zip
-platform = https://github.com/pioarduino/platform-espressif32/releases/download/55.03.36/platform-espressif32.zip
+platform = https://github.com/pioarduino/platform-espressif32/releases/download/55.03.34/platform-espressif32.zip
 platform_packages = ${env.platform_packages}
 board_build.partitions = esp32_partitions.csv
 lib_deps =
 	${env.lib_deps}
 	laxilef/ESP32Scheduler@^1.0.1
-nimble_lib = h2zero/NimBLE-Arduino@2.3.7
-lib_ignore = ${env.lib_ignore}
+nimble_lib = h2zero/NimBLE-Arduino@2.3.3
+lib_ignore = 
 extra_scripts = 
 	post:tools/esp32.py
 	post:tools/build.py
@@ -237,7 +234,7 @@ build_flags =
 	${esp32_defaults.build_flags}
 	-D ARDUINO_USB_MODE=0
 	-D ARDUINO_USB_CDC_ON_BOOT=1
-	-D MYNEWT_VAL_BLE_EXT_ADV=1
+	-D CONFIG_BT_NIMBLE_EXT_ADV=1
 	-D USE_BLE=1
 	-D DEFAULT_OT_IN_GPIO=35
 	-D DEFAULT_OT_OUT_GPIO=36
@@ -263,7 +260,7 @@ build_unflags =
 build_type = ${esp32_defaults.build_type}
 build_flags = 
 	${esp32_defaults.build_flags}
-	-D MYNEWT_VAL_BLE_EXT_ADV=1
+	-D CONFIG_BT_NIMBLE_EXT_ADV=1
 	-D USE_BLE=1
 	-D DEFAULT_OT_IN_GPIO=8
 	-D DEFAULT_OT_OUT_GPIO=10
@@ -369,7 +366,7 @@ build_unflags =
 build_type = ${esp32_defaults.build_type}
 build_flags = 
 	${esp32_defaults.build_flags}
-	-D MYNEWT_VAL_BLE_EXT_ADV=1
+	-D CONFIG_BT_NIMBLE_EXT_ADV=1
 	-D USE_BLE=1
 	-D DEFAULT_OT_IN_GPIO=3
 	-D DEFAULT_OT_OUT_GPIO=1
--- a/src/HaHelper.h
+++ b/src/HaHelper.h
@@ -443,28 +443,6 @@ public:
    return this->publish(this->makeConfigTopic(FPSTR(HA_ENTITY_SWITCH), F("heating_turbo")).c_str(), doc);
  }

-  bool publishSwitchHeatingHysteresis(bool enabledByDefault = true) {
-    JsonDocument doc;
-    doc[FPSTR(HA_AVAILABILITY)][FPSTR(HA_TOPIC)] = this->statusTopic.c_str();
-    doc[FPSTR(HA_ENABLED_BY_DEFAULT)] = enabledByDefault;
-    doc[FPSTR(HA_UNIQUE_ID)] = this->getUniqueIdWithPrefix(F("heating_hysteresis"));
-    doc[FPSTR(HA_DEFAULT_ENTITY_ID)] = this->getEntityIdWithPrefix(FPSTR(HA_ENTITY_SWITCH), F("heating_hysteresis"));
-    doc[FPSTR(HA_ENTITY_CATEGORY)] = FPSTR(HA_ENTITY_CATEGORY_CONFIG);
-    doc[FPSTR(HA_NAME)] = F("Use heating hysteresis");
-    doc[FPSTR(HA_ICON)] = F("mdi:altimeter");
-    doc[FPSTR(HA_STATE_TOPIC)] = this->settingsTopic.c_str();
-    doc[FPSTR(HA_STATE_ON)] = true;
-    doc[FPSTR(HA_STATE_OFF)] = false;
-    doc[FPSTR(HA_VALUE_TEMPLATE)] = F("{{ value_json.heating.hysteresis.enabled }}");
-    doc[FPSTR(HA_COMMAND_TOPIC)] = this->setSettingsTopic.c_str();
-    doc[FPSTR(HA_PAYLOAD_ON)] = F("{\"heating\": {\"hysteresis\" : {\"enabled\" : true}}}");
-    doc[FPSTR(HA_PAYLOAD_OFF)] = F("{\"heating\": {\"hysteresis\" : {\"enabled\" : false}}}");
-    doc[FPSTR(HA_EXPIRE_AFTER)] = this->expireAfter;
-    doc.shrinkToFit();
-
-    return this->publish(this->makeConfigTopic(FPSTR(HA_ENTITY_SWITCH), F("heating_hysteresis")).c_str(), doc);
-  }
-
  bool publishInputHeatingHysteresis(UnitSystem unit = UnitSystem::METRIC, bool enabledByDefault = true) {
    JsonDocument doc;
    doc[FPSTR(HA_AVAILABILITY)][FPSTR(HA_TOPIC)] = this->statusTopic.c_str();
@@ -484,9 +462,9 @@ public:
    doc[FPSTR(HA_NAME)] = F("Heating hysteresis");
    doc[FPSTR(HA_ICON)] = F("mdi:altimeter");
    doc[FPSTR(HA_STATE_TOPIC)] = this->settingsTopic.c_str();
-    doc[FPSTR(HA_VALUE_TEMPLATE)] = F("{{ value_json.heating.hysteresis.value|float(0)|round(2) }}");
+    doc[FPSTR(HA_VALUE_TEMPLATE)] = F("{{ value_json.heating.hysteresis|float(0)|round(2) }}");
    doc[FPSTR(HA_COMMAND_TOPIC)] = this->setSettingsTopic.c_str();
-    doc[FPSTR(HA_COMMAND_TEMPLATE)] = F("{\"heating\": {\"hysteresis\" : {\"value\" : {{ value }}}}}");
+    doc[FPSTR(HA_COMMAND_TEMPLATE)] = F("{\"heating\": {\"hysteresis\" : {{ value }}}}");
    doc[FPSTR(HA_MIN)] = 0;
    doc[FPSTR(HA_MAX)] = 15;
    doc[FPSTR(HA_STEP)] = 0.01f;
--- a/src/MainTask.h
+++ b/src/MainTask.h
@@ -43,6 +43,8 @@ protected:
  bool telnetStarted = false;
  bool emergencyDetected = false;
  unsigned long emergencyFlipTime = 0;
+  bool freezeDetected = false;
+  unsigned long freezeDetectedTime = 0;

  #if defined(ARDUINO_ARCH_ESP32)
  const char* getTaskName() override {
@@ -133,6 +135,8 @@ protected:
        tMqtt->disable();
      }

+      Sensors::setConnectionStatusByType(Sensors::Type::MANUAL, !settings.mqtt.enabled || vars.mqtt.connected, false);
+
    } else {
      if (this->ntpStarted) {
        this->ntpStarted = false;
@@ -241,7 +245,7 @@ protected:

  void heating() {
    // freeze protection
-    {
+    if (!settings.heating.enabled) {
      float lowTemp = 255.0f;
      uint8_t availableSensors = 0;

@@ -272,40 +276,29 @@ protected:
        availableSensors++;
      }

-      if (availableSensors) {
-        if (vars.master.heating.freezing) {
-          if (lowTemp - (float) settings.heating.freezeProtection.highTemp + 0.0001f >= 0.0f) {
-            vars.master.heating.freezing = false;
+      if (availableSensors && lowTemp <= settings.heating.freezeProtection.lowTemp) {
+        if (!this->freezeDetected) {
+          this->freezeDetected = true;
+          this->freezeDetectedTime = millis();

-            Log.sinfoln(
-              FPSTR(L_MAIN),
-              F("No freezing detected. Current low temp: %.2f, threshold (high): %hhu"),
-              lowTemp, settings.heating.freezeProtection.highTemp
-            );
-          }
+        } else if (millis() - this->freezeDetectedTime > (settings.heating.freezeProtection.thresholdTime * 1000)) {
+          this->freezeDetected = false;
+          settings.heating.enabled = true;
+          fsSettings.update();

-        } else {
-          if ((float) settings.heating.freezeProtection.lowTemp - lowTemp + 0.0001f >= 0.0f) {
-            vars.master.heating.freezing = true;
-
-            if (!settings.heating.enabled) {
-              settings.heating.enabled = true;
-              fsSettings.update();
-            }
-
-            Log.sinfoln(
-              FPSTR(L_MAIN),
-              F("Freezing detected! Current low temp: %.2f, threshold (low): %hhu"),
-              lowTemp, settings.heating.freezeProtection.lowTemp
-            );
-          }
+          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 (vars.master.heating.freezing) {
-        vars.master.heating.freezing = false;
-
-        Log.sinfoln(FPSTR(L_MAIN), F("No sensors available, freeze protection unavailable!"));
+      } else if (this->freezeDetected) {
+        this->freezeDetected = false;
      }
+
+    } else if (this->freezeDetected) {
+      this->freezeDetected = false;
    }
  }

@@ -326,7 +319,7 @@ protected:
        emergencyFlags |= 0b00000010;
      }
      
-      if (settings.opentherm.options.nativeOTC) {
+      if (settings.opentherm.options.nativeHeatingControl) {
        emergencyFlags |= 0b00000100;
      }
    }
--- a/src/MqttTask.h
+++ b/src/MqttTask.h
@@ -486,7 +486,6 @@ protected:
  void publishHaEntities() {
    // heating
    this->haHelper->publishSwitchHeatingTurbo(false);
-    this->haHelper->publishSwitchHeatingHysteresis();
    this->haHelper->publishInputHeatingHysteresis(settings.system.unitSystem);
    this->haHelper->publishInputHeatingTurboFactor(false);
    this->haHelper->publishInputHeatingMinTemp(settings.system.unitSystem);
--- a/src/OpenThermTask.h
+++ b/src/OpenThermTask.h
@@ -170,7 +170,8 @@ protected:
    // Heating settings
    vars.master.heating.enabled = this->isReady()
      && settings.heating.enabled
-      && (vars.master.heating.freezing || (vars.cascadeControl.input && !vars.master.heating.blocking))
+      && vars.cascadeControl.input 
+      && !vars.master.heating.blocking
      && !vars.master.heating.overheat;

    // DHW settings
@@ -185,9 +186,7 @@ protected:
      || (settings.opentherm.options.dhwToCh2 && settings.opentherm.options.dhwSupport && settings.dhw.enabled);

    if (settings.opentherm.options.heatingToCh2) {
-      vars.master.ch2.targetTemp = !settings.opentherm.options.nativeOTC
-        ? vars.master.heating.setpointTemp
-        : vars.master.heating.targetTemp;
+      vars.master.ch2.targetTemp = vars.master.heating.setpointTemp;

    } else if (settings.opentherm.options.dhwToCh2) {
      vars.master.ch2.targetTemp = vars.master.dhw.targetTemp;
@@ -219,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,
@@ -306,7 +305,6 @@ protected:
      Sensors::setConnectionStatusByType(Sensors::Type::OT_DHW_BURNER_HOURS, false);
      Sensors::setConnectionStatusByType(Sensors::Type::OT_HEATING_PUMP_HOURS, false);
      Sensors::setConnectionStatusByType(Sensors::Type::OT_DHW_PUMP_HOURS, false);
-      Sensors::setConnectionStatusByType(Sensors::Type::OT_COOLING_HOURS, false);

      this->initialized = false;
      this->disconnectedTime = millis();
@@ -679,21 +677,6 @@ protected:
        }
      }

-      // Update cooling hours
-      if (Sensors::getAmountByType(Sensors::Type::OT_COOLING_HOURS, true)) {
-        if (this->updateCoolingHours()) {
-          Log.snoticeln(FPSTR(L_OT), F("Received cooling hours: %hu"), vars.slave.stats.coolingHours);
-
-          Sensors::setValueByType(
-            Sensors::Type::OT_COOLING_HOURS, vars.slave.stats.coolingHours,
-            Sensors::ValueType::PRIMARY, true, true
-          );
-
-        } else {
-          Log.swarningln(FPSTR(L_OT), F("Failed receive cooling hours"));
-        }
-      }
-
      // Auto fault reset
      if (settings.opentherm.options.autoFaultReset && vars.slave.fault.active && !vars.actions.resetFault) {
        vars.actions.resetFault = true;
@@ -809,7 +792,7 @@ protected:
      bool result = this->updateDhwTemp();

      if (result) {
-        const float convertedDhwTemp = convertTemp(
+        float convertedDhwTemp = convertTemp(
          vars.slave.dhw.currentTemp,
          settings.opentherm.unitSystem,
          settings.system.unitSystem
@@ -833,7 +816,7 @@ protected:
    // Update DHW temp 2
    if (settings.opentherm.options.dhwSupport && Sensors::getAmountByType(Sensors::Type::OT_DHW_TEMP2, true)) {
      if (this->updateDhwTemp2()) {
-        const float convertedDhwTemp2 = convertTemp(
+        float convertedDhwTemp2 = convertTemp(
          vars.slave.dhw.currentTemp2,
          settings.opentherm.unitSystem,
          settings.system.unitSystem
@@ -857,7 +840,7 @@ protected:
    // Update DHW flow rate
    if (settings.opentherm.options.dhwSupport && Sensors::getAmountByType(Sensors::Type::OT_DHW_FLOW_RATE, true)) {
      if (this->updateDhwFlowRate()) {
-        const float convertedDhwFlowRate = convertVolume(
+        float convertedDhwFlowRate = convertVolume(
          vars.slave.dhw.flowRate,
          settings.opentherm.unitSystem,
          settings.system.unitSystem
@@ -881,7 +864,7 @@ protected:
    // Update heating temp
    if (Sensors::getAmountByType(Sensors::Type::OT_HEATING_TEMP, true)) {
      if (this->updateHeatingTemp()) {
-        const float convertedHeatingTemp = convertTemp(
+        float convertedHeatingTemp = convertTemp(
          vars.slave.heating.currentTemp,
          settings.opentherm.unitSystem,
          settings.system.unitSystem
@@ -905,7 +888,7 @@ protected:
    // Update heating return temp
    if (Sensors::getAmountByType(Sensors::Type::OT_HEATING_RETURN_TEMP, true)) {
      if (this->updateHeatingReturnTemp()) {
-        const float convertedHeatingReturnTemp = convertTemp(
+        float convertedHeatingReturnTemp = convertTemp(
          vars.slave.heating.returnTemp,
          settings.opentherm.unitSystem,
          settings.system.unitSystem
@@ -928,9 +911,9 @@ 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()) {
-          const float convertedCh2Temp = convertTemp(
+          float convertedCh2Temp = convertTemp(
            vars.slave.ch2.currentTemp,
            settings.opentherm.unitSystem,
            settings.system.unitSystem
@@ -955,7 +938,7 @@ protected:
    // Update exhaust temp
    if (Sensors::getAmountByType(Sensors::Type::OT_EXHAUST_TEMP, true)) {
      if (this->updateExhaustTemp()) {
-        const float convertedExhaustTemp = convertTemp(
+        float convertedExhaustTemp = convertTemp(
          vars.slave.exhaust.temp,
          settings.opentherm.unitSystem,
          settings.system.unitSystem
@@ -979,7 +962,7 @@ protected:
    // Update heat exchanger temp
    if (Sensors::getAmountByType(Sensors::Type::OT_HEAT_EXCHANGER_TEMP, true)) {
      if (this->updateHeatExchangerTemp()) {
-        const float convertedHeatExchTemp = convertTemp(
+        float convertedHeatExchTemp = convertTemp(
          vars.slave.heatExchangerTemp,
          settings.opentherm.unitSystem,
          settings.system.unitSystem
@@ -1003,7 +986,7 @@ protected:
    // Update outdoor temp
    if (Sensors::getAmountByType(Sensors::Type::OT_OUTDOOR_TEMP, true)) {
      if (this->updateOutdoorTemp()) {
-        const float convertedOutdoorTemp = convertTemp(
+        float convertedOutdoorTemp = convertTemp(
          vars.slave.heating.outdoorTemp,
          settings.opentherm.unitSystem,
          settings.system.unitSystem
@@ -1027,7 +1010,7 @@ protected:
    // Update solar storage temp
    if (Sensors::getAmountByType(Sensors::Type::OT_SOLAR_STORAGE_TEMP, true)) {
      if (this->updateSolarStorageTemp()) {
-        const float convertedSolarStorageTemp = convertTemp(
+        float convertedSolarStorageTemp = convertTemp(
          vars.slave.solar.storage,
          settings.opentherm.unitSystem,
          settings.system.unitSystem
@@ -1051,7 +1034,7 @@ protected:
    // Update solar collector temp
    if (Sensors::getAmountByType(Sensors::Type::OT_SOLAR_COLLECTOR_TEMP, true)) {
      if (this->updateSolarCollectorTemp()) {
-        const float convertedSolarCollectorTemp = convertTemp(
+        float convertedSolarCollectorTemp = convertTemp(
          vars.slave.solar.collector,
          settings.opentherm.unitSystem,
          settings.system.unitSystem
@@ -1097,7 +1080,7 @@ protected:
    // Update pressure
    if (Sensors::getAmountByType(Sensors::Type::OT_PRESSURE, true)) {
      if (this->updatePressure()) {
-        const float convertedPressure = convertPressure(
+        float convertedPressure = convertPressure(
          vars.slave.pressure,
          settings.opentherm.unitSystem,
          settings.system.unitSystem
@@ -1203,12 +1186,9 @@ protected:

    // Update DHW temp
    if (vars.master.dhw.enabled) {
-      // Target dhw temp
-      const float& targetTemp = vars.master.dhw.targetTemp;
-
      // Converted target dhw temp
-      const float convertedTemp = convertTemp(
-        targetTemp,
+      float convertedTemp = convertTemp(
+        vars.master.dhw.targetTemp,
        settings.system.unitSystem,
        settings.opentherm.unitSystem
      );
@@ -1220,7 +1200,7 @@ protected:

          Log.sinfoln(
            FPSTR(L_OT_DHW), F("Set temp: %.2f (converted: %.2f, response: %.2f)"),
-            targetTemp, convertedTemp, vars.slave.dhw.targetTemp
+            vars.master.dhw.targetTemp, convertedTemp, vars.slave.dhw.targetTemp
          );

        } else {
@@ -1229,19 +1209,16 @@ protected:
      }
    }

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

      // Set current indoor temp
      if (this->setRoomTemp(convertedTemp)) {
        Log.sinfoln(
          FPSTR(L_OT_HEATING), F("Set current indoor temp: %.2f (converted: %.2f, response: %.2f)"),
-          indoorTemp, convertedTemp, vars.slave.heating.indoorTemp
+          vars.master.heating.indoorTemp, convertedTemp, vars.slave.heating.indoorTemp
        );
        
      } else {
@@ -1253,26 +1230,17 @@ protected:
        if (this->setRoomTempCh2(convertedTemp)) {
          Log.sinfoln(
            FPSTR(L_OT_HEATING), F("Set current CH2 indoor temp: %.2f (converted: %.2f, response: %.2f)"),
-            indoorTemp, convertedTemp, vars.slave.ch2.indoorTemp
+            vars.master.heating.indoorTemp, convertedTemp, vars.slave.ch2.indoorTemp
          );

        } else {
          Log.swarningln(FPSTR(L_OT_HEATING), F("Failed set current CH2 indoor temp"));
        }
      }
-    }

-    // NativeOTC
-    if (settings.opentherm.options.nativeOTC) {
-      // Target indoor temp
-      const float& targetTemp = vars.master.heating.targetTemp;

      // Converted target indoor temp
-      const float convertedTemp = convertTemp(
-        targetTemp,
-        settings.system.unitSystem,
-        settings.opentherm.unitSystem
-      );
+      convertedTemp = convertTemp(vars.master.heating.targetTemp, settings.system.unitSystem, settings.opentherm.unitSystem);

      // Set target indoor temp
      if (this->needSetHeatingTemp(convertedTemp)) {
@@ -1281,7 +1249,7 @@ protected:

          Log.sinfoln(
            FPSTR(L_OT_HEATING), F("Set target indoor temp: %.2f (converted: %.2f, response: %.2f)"),
-            targetTemp, convertedTemp, vars.slave.heating.targetTemp
+            vars.master.heating.targetTemp, convertedTemp, vars.slave.heating.targetTemp
          );

        } else {
@@ -1296,7 +1264,7 @@ protected:

          Log.sinfoln(
            FPSTR(L_OT_HEATING), F("Set target CH2 indoor temp: %.2f (converted: %.2f, response: %.2f)"),
-            targetTemp, convertedTemp, vars.slave.ch2.targetTemp
+            vars.master.heating.targetTemp, convertedTemp, vars.slave.ch2.targetTemp
          );

        } else {
@@ -1305,22 +1273,10 @@ protected:
      }
    }

-    // Set heating temp
-    {
-      // Target heating temp
-      float targetTemp = 0.0f;
-      if (vars.master.heating.enabled) {
-        targetTemp = !settings.opentherm.options.nativeOTC
-          ? vars.master.heating.setpointTemp
-          : vars.master.heating.targetTemp;
-      }
-
+    // Normal heating control
+    if (!settings.opentherm.options.nativeHeatingControl && vars.master.heating.enabled) {
      // Converted target heating temp
-      const float convertedTemp = convertTemp(
-        targetTemp,
-        settings.system.unitSystem,
-        settings.opentherm.unitSystem
-      );
+      float convertedTemp = convertTemp(vars.master.heating.setpointTemp, settings.system.unitSystem, settings.opentherm.unitSystem);

      if (this->needSetHeatingTemp(convertedTemp)) {
        // Set max heating temp
@@ -1328,13 +1284,13 @@ protected:
          if (this->setMaxHeatingTemp(convertedTemp)) {
            Log.sinfoln(
              FPSTR(L_OT_HEATING), F("Set max heating temp: %.2f (converted: %.2f)"),
-              targetTemp, convertedTemp
+              vars.master.heating.setpointTemp, convertedTemp
            );

          } else {
            Log.swarningln(
              FPSTR(L_OT_HEATING), F("Failed set max heating temp: %.2f (converted: %.2f)"),
-              targetTemp, convertedTemp
+              vars.master.heating.setpointTemp, convertedTemp
            );
          }
        }
@@ -1345,7 +1301,7 @@ protected:

          Log.sinfoln(
            FPSTR(L_OT_HEATING), F("Set target temp: %.2f (converted: %.2f, response: %.2f)"),
-            targetTemp, convertedTemp, vars.slave.heating.targetTemp
+            vars.master.heating.setpointTemp, convertedTemp, vars.slave.heating.targetTemp
          );

        } else {
@@ -1355,30 +1311,27 @@ protected:
    }

    // Set CH2 temp
-    if (settings.opentherm.options.heatingToCh2 || settings.opentherm.options.dhwToCh2) {
-      // Target CH2 heating temp
-      const float targetTemp = vars.master.ch2.enabled
-        ? vars.master.ch2.targetTemp
-        : 0.0f;
+    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(
+          vars.master.ch2.targetTemp,
+          settings.system.unitSystem,
+          settings.opentherm.unitSystem
+        );

-      // Converted target CH2 temp
-      const float convertedTemp = convertTemp(
-        targetTemp,
-        settings.system.unitSystem,
-        settings.opentherm.unitSystem
-      );
+        if (this->needSetCh2Temp(convertedTemp)) {
+          if (this->setCh2Temp(convertedTemp)) {
+            this->ch2SetTempTime = millis();

-      if (this->needSetCh2Temp(convertedTemp)) {
-        if (this->setCh2Temp(convertedTemp)) {
-          this->ch2SetTempTime = millis();
+            Log.sinfoln(
+              FPSTR(L_OT_CH2), F("Set temp: %.2f (converted: %.2f, response: %.2f)"),
+              vars.master.ch2.targetTemp, convertedTemp, vars.slave.ch2.targetTemp
+            );

-          Log.sinfoln(
-            FPSTR(L_OT_CH2), F("Set temp: %.2f (converted: %.2f, response: %.2f)"),
-            targetTemp, convertedTemp, vars.slave.ch2.targetTemp
-          );
-
-        } else {
-          Log.swarningln(FPSTR(L_OT_CH2), F("Failed set temp"));
+          } else {
+            Log.swarningln(FPSTR(L_OT_CH2), F("Failed set temp"));
+          }
        }
      }
    }
@@ -1386,7 +1339,7 @@ protected:

    // Heating overheat control
    if (settings.heating.overheatProtection.highTemp > 0 && settings.heating.overheatProtection.lowTemp > 0) {
-      const float highTemp = convertTemp(
+      float highTemp = convertTemp(
        max({
          vars.slave.heating.currentTemp,
          vars.slave.heating.returnTemp,
@@ -1423,7 +1376,7 @@ protected:

    // DHW overheat control
    if (settings.dhw.overheatProtection.highTemp > 0 && settings.dhw.overheatProtection.lowTemp > 0) {
-      const float highTemp = convertTemp(
+      float highTemp = convertTemp(
        max({
          vars.slave.heating.currentTemp,
          vars.slave.heating.returnTemp,
@@ -1517,19 +1470,6 @@ protected:
    } else {
      Log.swarningln(FPSTR(L_OT), F("Failed set master config"));
    }
-
-    /*char buf[100];
-    if (this->instance->getStr(OpenThermMessageID::Brand, buf, sizeof(buf) - 1)) {
-      Log.snoticeln(FPSTR(L_OT), F("Slave brand: %s"), buf);
-    }
-
-    if (this->instance->getStr(OpenThermMessageID::BrandVersion, buf, sizeof(buf) - 1)) {
-      Log.snoticeln(FPSTR(L_OT), F("Slave brand version: %s"), buf);
-    }
-
-    if (this->instance->getStr(OpenThermMessageID::BrandSerialNumber, buf, sizeof(buf) - 1)) {
-      Log.snoticeln(FPSTR(L_OT), F("Slave brand s/n: %s"), buf);
-    }*/
  }

  bool isReady() {
@@ -1707,7 +1647,7 @@ protected:
  }


-  bool setRoomTemp(const float temperature) {
+  bool setRoomTemp(float temperature) {
    const unsigned int request = CustomOpenTherm::temperatureToData(temperature);
    const unsigned long response = this->instance->sendRequest(CustomOpenTherm::buildRequest(
      OpenThermMessageType::WRITE_DATA,
@@ -1727,7 +1667,7 @@ protected:
    return CustomOpenTherm::getUInt(response) == request;
  }

-  bool setRoomTempCh2(const float temperature) {
+  bool setRoomTempCh2(float temperature) {
    const unsigned int request = CustomOpenTherm::temperatureToData(temperature);
    const unsigned long response = this->instance->sendRequest(CustomOpenTherm::buildRequest(
      OpenThermMessageType::WRITE_DATA,
@@ -2229,25 +2169,6 @@ protected:
    return true;
  }

-  bool updateCoolingHours() {
-    const unsigned long response = this->instance->sendRequest(CustomOpenTherm::buildRequest(
-      OpenThermRequestType::READ_DATA,
-      OpenThermMessageID::CoolingOperationHours,
-      0
-    ));
-
-    if (!CustomOpenTherm::isValidResponse(response)) {
-      return false;
-
-    } else if (!CustomOpenTherm::isValidResponseId(response, OpenThermMessageID::CoolingOperationHours)) {
-      return false;
-    }
-
-    vars.slave.stats.coolingHours = CustomOpenTherm::getUInt(response);
-
-    return true;
-  }
-
  bool updateModulationLevel() {
    const unsigned long response = this->instance->sendRequest(CustomOpenTherm::buildRequest(
      OpenThermRequestType::READ_DATA,
@@ -2262,7 +2183,7 @@ protected:
      return false;
    }

-    const float value = CustomOpenTherm::getFloat(response);
+    float value = CustomOpenTherm::getFloat(response);
    if (value < 0) {
      return false;
    }
@@ -2286,7 +2207,7 @@ protected:
      return false;
    }

-    const float value = CustomOpenTherm::getFloat(response);
+    float value = CustomOpenTherm::getFloat(response);
    if (value <= 0) {
      return false;
    }
@@ -2310,7 +2231,7 @@ protected:
      return false;
    }

-    const float value = CustomOpenTherm::getFloat(response);
+    float value = CustomOpenTherm::getFloat(response);
    if (value <= 0) {
      return false;
    }
@@ -2364,7 +2285,7 @@ protected:
      return false;
    }

-    const float value = CustomOpenTherm::getFloat(response);
+    float value = CustomOpenTherm::getFloat(response);
    if (value <= 0) {
      return false;
    }
@@ -2428,7 +2349,7 @@ protected:
      return false;
    }

-    const float value = (float) CustomOpenTherm::getInt(response);
+    float value = (float) CustomOpenTherm::getInt(response);
    if (!isValidTemp(value, settings.opentherm.unitSystem, -40, 500)) {
      return false;
    }
@@ -2452,7 +2373,7 @@ protected:
      return false;
    }

-    const float value = (float) CustomOpenTherm::getInt(response);
+    float value = (float) CustomOpenTherm::getInt(response);
    if (value <= 0) {
      return false;
    }
@@ -2553,7 +2474,7 @@ protected:
      return false;
    }

-    const float value = CustomOpenTherm::getFloat(response);
+    float value = CustomOpenTherm::getFloat(response);
    if (value < 0) {
      return false;
    }
--- a/src/PortalTask.h
+++ b/src/PortalTask.h
@@ -241,17 +241,7 @@ protected:

      doc.shrinkToFit();

-      char filename[64];
-      getFilename(filename, sizeof(filename), "backup");
-
-      char contentDispositionHeaderValue[128];
-      snprintf_P(
-        contentDispositionHeaderValue,
-        sizeof(contentDispositionHeaderValue),
-        PSTR("attachment; filename=\"%s\""),
-        filename
-      );
-      this->webServer->sendHeader(F("Content-Disposition"), contentDispositionHeaderValue);
+      this->webServer->sendHeader(F("Content-Disposition"), F("attachment; filename=\"backup.json\""));
      this->bufferedWebServer->send(200, F("application/json"), doc);
    });

@@ -849,18 +839,7 @@ protected:
      
      doc.shrinkToFit();

-      char filename[64];
-      getFilename(filename, sizeof(filename), "debug");
-
-      char contentDispositionHeaderValue[128];
-      snprintf_P(
-        contentDispositionHeaderValue,
-        sizeof(contentDispositionHeaderValue),
-        PSTR("attachment; filename=\"%s\""),
-        filename
-      );
-
-      this->webServer->sendHeader(F("Content-Disposition"), contentDispositionHeaderValue);
+      this->webServer->sendHeader(F("Content-Disposition"), F("attachment; filename=\"debug.json\""));
      this->bufferedWebServer->send(200, F("application/json"), doc, true);
    });

@@ -1067,12 +1046,4 @@ protected:
    this->dnsServer->stop();
    this->dnsServerEnabled = false;
  }
-
-  static void getFilename(char* filename, size_t maxSizeFilename, const char* type) {
-    const time_t now = time(nullptr);
-    const tm* localNow = localtime(&now);
-    char localNowValue[20];
-    strftime(localNowValue, sizeof(localNowValue), PSTR("%Y-%m-%d-%H-%M-%S"), localNow);
-    snprintf_P(filename, maxSizeFilename, PSTR("%s_%s_%s.json"), networkSettings.hostname, localNowValue, type);
-  }
 };
--- 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;
@@ -90,15 +90,15 @@ protected:

  void hysteresis() {
    bool useHyst = false;
-    if (settings.heating.hysteresis.enabled && this->indoorSensorsConnected) {
-      useHyst = settings.equitherm.enabled || settings.pid.enabled || settings.opentherm.options.nativeOTC;
+    if (settings.heating.hysteresis > 0.01f && this->indoorSensorsConnected) {
+      useHyst = settings.equitherm.enabled || settings.pid.enabled || settings.opentherm.options.nativeHeatingControl;
    }

    if (useHyst) {
-      if (!vars.master.heating.blocking && vars.master.heating.indoorTemp - settings.heating.target + 0.0001f >= settings.heating.hysteresis.value) {
+      if (!vars.master.heating.blocking && vars.master.heating.indoorTemp - settings.heating.target + 0.0001f >= settings.heating.hysteresis) {
        vars.master.heating.blocking = true;

-      } else if (vars.master.heating.blocking && vars.master.heating.indoorTemp - settings.heating.target - 0.0001f <= -(settings.heating.hysteresis.value)) {
+      } else if (vars.master.heating.blocking && vars.master.heating.indoorTemp - settings.heating.target - 0.0001f <= -(settings.heating.hysteresis)) {
        vars.master.heating.blocking = false;
      }

@@ -108,13 +108,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;
  }
@@ -135,7 +135,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) {
@@ -240,11 +240,6 @@ 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;
  }
 };
--- a/src/Sensors.h
+++ b/src/Sensors.h
@@ -34,7 +34,6 @@ public:
    OT_DHW_BURNER_HOURS     = 24,
    OT_HEATING_PUMP_HOURS   = 25,
    OT_DHW_PUMP_HOURS       = 26,
-    OT_COOLING_HOURS        = 27,
    
    NTC_10K_TEMP            = 50,
    DALLAS_TEMP             = 51,
@@ -150,7 +149,7 @@ public:

  static int16_t getIdByName(const char* name) {
    if (settings == nullptr) {
-      return -1;
+      return 0;
    }

    for (uint8_t id = 0; id <= getMaxSensorId(); id++) {
@@ -164,7 +163,7 @@ public:

  static int16_t getIdByObjectId(const char* objectId) {
    if (settings == nullptr) {
-      return -1;
+      return 0;
    }

    String refObjectId;
@@ -330,12 +329,12 @@ public:

  static float getMeanValueByPurpose(Purpose purpose, const ValueType valueType, bool onlyConnected = true) {
    if (settings == nullptr || results == nullptr) {
-      return 0.0f;
+      return 0;
    }

    uint8_t valueId = (uint8_t) valueType;
    if (!isValidValueId(valueId)) {
-      return 0.0f;
+      return 0;
    }
    
    float value = 0.0f;
@@ -364,7 +363,7 @@ public:

  static bool existsConnectedSensorsByPurpose(Purpose purpose) {
    if (settings == nullptr || results == nullptr) {
-      return false;
+      return 0;
    }

    for (uint8_t id = 0; id <= getMaxSensorId(); id++) {
--- a/src/SensorsTask.h
+++ b/src/SensorsTask.h
@@ -66,8 +66,7 @@ public:
  }

 protected:
-  const unsigned int wiredDisconnectTimeout = 180000u;
-  const unsigned int wirelessDisconnectTimeout = 600000u;
+  const unsigned int disconnectedTimeout = 120000;
  const unsigned short dallasSearchInterval = 60000;
  const unsigned short dallasPollingInterval = 10000;
  const unsigned short globalPollingInterval = 15000;
@@ -1005,16 +1004,12 @@ protected:
      } else if (rSensor.connected && sSensor.purpose == Sensors::Purpose::NOT_CONFIGURED) {
        Sensors::setConnectionStatusById(sensorId, false, false);

-      } else if (rSensor.connected) {
-        if (sSensor.type == Sensors::Type::MANUAL || sSensor.type == Sensors::Type::BLUETOOTH) {
-          if ((millis() - rSensor.activityTime) > this->wirelessDisconnectTimeout) {
-            Sensors::setConnectionStatusById(sensorId, false, false);
-          }
+      } else if (sSensor.type != Sensors::Type::MANUAL && rSensor.connected && (millis() - rSensor.activityTime) > this->disconnectedTimeout) {
+        Sensors::setConnectionStatusById(sensorId, false, false);

-        } else if ((millis() - rSensor.activityTime) > this->wiredDisconnectTimeout) {
-          Sensors::setConnectionStatusById(sensorId, false, false);
-        }
-      }
+      }/* else if (!rSensor.connected) {
+        rSensor.connected = true;
+      }*/
    }
  }

--- a/src/Settings.h
+++ b/src/Settings.h
@@ -78,8 +78,7 @@ struct Settings {
      bool autoFaultReset = false;
      bool autoDiagReset = false;
      bool setDateAndTime = false;
-      bool alwaysSendIndoorTemp = true;
-      bool nativeOTC = false;
+      bool nativeHeatingControl = false;
      bool immergasFix = false;
    } options;
  } opentherm;
@@ -104,25 +103,20 @@ struct Settings {
    bool enabled = true;
    bool turbo = false;
    float target = DEFAULT_HEATING_TARGET_TEMP;
+    float hysteresis = 0.5f;
    float turboFactor = 7.5f;
    uint8_t minTemp = DEFAULT_HEATING_MIN_TEMP;
    uint8_t maxTemp = DEFAULT_HEATING_MAX_TEMP;
    uint8_t maxModulation = 100;

-    struct {
-      bool enabled = true;
-      float value = 0.5f;
-      HysteresisAction action = HysteresisAction::DISABLE_HEATING;
-    } hysteresis;
-
    struct {
      uint8_t highTemp = 95;
      uint8_t lowTemp = 90;
    } overheatProtection;

    struct {
-      uint8_t highTemp = 15;
      uint8_t lowTemp = 10;
+      unsigned short thresholdTime = 600;
    } freezeProtection;
  } heating;

@@ -304,7 +298,6 @@ 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;
@@ -390,7 +383,6 @@ struct Variables {
      uint16_t dhwBurnerStarts = 0;
      uint16_t heatingPumpStarts = 0;
      uint16_t dhwPumpStarts = 0;
-      uint16_t coolingHours = 0;
      uint16_t burnerHours = 0;
      uint16_t dhwBurnerHours = 0;
      uint16_t heatingPumpHours = 0;
--- a/src/defines.h
+++ b/src/defines.h
@@ -163,9 +163,4 @@ enum class UnitSystem : uint8_t {
  IMPERIAL  = 1
 };

-enum class HysteresisAction : uint8_t {
-  DISABLE_HEATING = 0,
-  SET_ZERO_TARGET = 1
-};
-
 char buffer[255];
--- a/src/strings.h
+++ b/src/strings.h
@@ -34,7 +34,6 @@ const char L_CASCADE_OUTPUT[]                       PROGMEM = "CASCADE.OUTPUT";
 const char L_EXTPUMP[]                              PROGMEM = "EXTPUMP";


-const char S_ACTION[]                               PROGMEM = "action";
 const char S_ACTIONS[]                              PROGMEM = "actions";
 const char S_ACTIVE[]                               PROGMEM = "active";
 const char S_ADDRESS[]                              PROGMEM = "address";
@@ -87,7 +86,6 @@ 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";
@@ -111,7 +109,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";
@@ -143,7 +140,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,8 @@ 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_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;
@@ -492,9 +490,7 @@ void settingsToJson(const Settings& src, JsonVariant dst, bool safe = false) {
  heating[FPSTR(S_ENABLED)] = src.heating.enabled;
  heating[FPSTR(S_TURBO)] = src.heating.turbo;
  heating[FPSTR(S_TARGET)] = roundf(src.heating.target, 2);
-  heating[FPSTR(S_HYSTERESIS)][FPSTR(S_ENABLED)] = src.heating.hysteresis.enabled;
-  heating[FPSTR(S_HYSTERESIS)][FPSTR(S_VALUE)] = roundf(src.heating.hysteresis.value, 3);
-  heating[FPSTR(S_HYSTERESIS)][FPSTR(S_ACTION)] = static_cast<uint8_t>(src.heating.hysteresis.action);
+  heating[FPSTR(S_HYSTERESIS)] = roundf(src.heating.hysteresis, 3);
  heating[FPSTR(S_TURBO_FACTOR)] = roundf(src.heating.turboFactor, 3);
  heating[FPSTR(S_MIN_TEMP)] = src.heating.minTemp;
  heating[FPSTR(S_MAX_TEMP)] = src.heating.maxTemp;
@@ -505,8 +501,8 @@ void settingsToJson(const Settings& src, JsonVariant dst, bool safe = false) {
  heatingOverheatProtection[FPSTR(S_LOW_TEMP)] = src.heating.overheatProtection.lowTemp;

  auto freezeProtection = heating[FPSTR(S_FREEZE_PROTECTION)].to<JsonObject>();
-  freezeProtection[FPSTR(S_HIGH_TEMP)] = src.heating.freezeProtection.highTemp;
  freezeProtection[FPSTR(S_LOW_TEMP)] = src.heating.freezeProtection.lowTemp;
+  freezeProtection[FPSTR(S_THRESHOLD_TIME)] = src.heating.freezeProtection.thresholdTime;

  auto dhw = dst[FPSTR(S_DHW)].to<JsonObject>();
  dhw[FPSTR(S_ENABLED)] = src.dhw.enabled;
@@ -1005,20 +1001,11 @@ 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_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.alwaysSendIndoorTemp) {
-        dst.opentherm.options.alwaysSendIndoorTemp = 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 (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 +1025,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 +1116,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 +1169,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;
@@ -1326,41 +1314,15 @@ bool jsonToSettings(const JsonVariantConst src, Settings& dst, bool safe = false
    }
  }

-  if (src[FPSTR(S_HEATING)][FPSTR(S_HYSTERESIS)][FPSTR(S_ENABLED)].is<bool>()) {
-    bool value = src[FPSTR(S_HEATING)][FPSTR(S_HYSTERESIS)][FPSTR(S_ENABLED)].as<bool>();
+  if (!src[FPSTR(S_HEATING)][FPSTR(S_HYSTERESIS)].isNull()) {
+    float value = src[FPSTR(S_HEATING)][FPSTR(S_HYSTERESIS)].as<float>();

-    if (value != dst.heating.hysteresis.enabled) {
-      dst.heating.hysteresis.enabled = value;
+    if (value >= 0.0f && value <= 15.0f && fabsf(value - dst.heating.hysteresis) > 0.0001f) {
+      dst.heating.hysteresis = roundf(value, 2);
      changed = true;
    }
  }

-  if (!src[FPSTR(S_HEATING)][FPSTR(S_HYSTERESIS)][FPSTR(S_VALUE)].isNull()) {
-    float value = src[FPSTR(S_HEATING)][FPSTR(S_HYSTERESIS)][FPSTR(S_VALUE)].as<float>();
-
-    if (value >= 0.0f && value <= 15.0f && fabsf(value - dst.heating.hysteresis.value) > 0.0001f) {
-      dst.heating.hysteresis.value = roundf(value, 2);
-      changed = true;
-    }
-  }
-
-  if (!src[FPSTR(S_HEATING)][FPSTR(S_HYSTERESIS)][FPSTR(S_ACTION)].isNull()) {
-    uint8_t value = src[FPSTR(S_HEATING)][FPSTR(S_HYSTERESIS)][FPSTR(S_ACTION)].as<uint8_t>();
-
-    switch (value) {
-      case static_cast<uint8_t>(HysteresisAction::DISABLE_HEATING):
-      case static_cast<uint8_t>(HysteresisAction::SET_ZERO_TARGET):
-        if (static_cast<uint8_t>(dst.heating.hysteresis.action) != value) {
-         dst.heating.hysteresis.action = static_cast<HysteresisAction>(value);
-          changed = true;
-        }
-        break;
-
-      default:
-        break;
-    }
-  }
-
  if (!src[FPSTR(S_HEATING)][FPSTR(S_TURBO_FACTOR)].isNull()) {
    float value = src[FPSTR(S_HEATING)][FPSTR(S_TURBO_FACTOR)].as<float>();

@@ -1426,15 +1388,6 @@ bool jsonToSettings(const JsonVariantConst src, Settings& dst, bool safe = false
    changed = true;
  }

-  if (!src[FPSTR(S_HEATING)][FPSTR(S_FREEZE_PROTECTION)][FPSTR(S_HIGH_TEMP)].isNull()) {
-    unsigned short value = src[FPSTR(S_HEATING)][FPSTR(S_FREEZE_PROTECTION)][FPSTR(S_HIGH_TEMP)].as<uint8_t>();
-
-    if (isValidTemp(value, dst.system.unitSystem, 1, 50) && value != dst.heating.freezeProtection.highTemp) {
-      dst.heating.freezeProtection.highTemp = value;
-      changed = true;
-    }
-  }
-
  if (!src[FPSTR(S_HEATING)][FPSTR(S_FREEZE_PROTECTION)][FPSTR(S_LOW_TEMP)].isNull()) {
    unsigned short value = src[FPSTR(S_HEATING)][FPSTR(S_FREEZE_PROTECTION)][FPSTR(S_LOW_TEMP)].as<uint8_t>();

@@ -1444,9 +1397,15 @@ bool jsonToSettings(const JsonVariantConst src, Settings& dst, bool safe = false
    }
  }

-  if (dst.heating.freezeProtection.highTemp < dst.heating.freezeProtection.lowTemp) {
-    dst.heating.freezeProtection.highTemp = dst.heating.freezeProtection.lowTemp;
-    changed = true;
+  if (!src[FPSTR(S_HEATING)][FPSTR(S_FREEZE_PROTECTION)][FPSTR(S_THRESHOLD_TIME)].isNull()) {
+    unsigned short value = src[FPSTR(S_HEATING)][FPSTR(S_FREEZE_PROTECTION)][FPSTR(S_THRESHOLD_TIME)].as<unsigned short>();
+
+    if (value >= 30 && value <= 1800) {
+      if (value != dst.heating.freezeProtection.thresholdTime) {
+        dst.heating.freezeProtection.thresholdTime = value;
+        changed = true;
+      }
+    }
  }


@@ -1717,7 +1676,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,
@@ -1742,7 +1701,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;

@@ -1935,7 +1894,6 @@ bool jsonToSensorSettings(const uint8_t sensorId, const JsonVariantConst src, Se
      case static_cast<uint8_t>(Sensors::Type::OT_DHW_BURNER_HOURS):
      case static_cast<uint8_t>(Sensors::Type::OT_HEATING_PUMP_HOURS):
      case static_cast<uint8_t>(Sensors::Type::OT_DHW_PUMP_HOURS):
-      case static_cast<uint8_t>(Sensors::Type::OT_COOLING_HOURS):

      case static_cast<uint8_t>(Sensors::Type::NTC_10K_TEMP):
      case static_cast<uint8_t>(Sensors::Type::DALLAS_TEMP):
@@ -2112,18 +2070,21 @@ bool jsonToSensorResult(const uint8_t sensorId, const JsonVariantConst src) {
    return false;
  }

+  auto& dst = Sensors::results[sensorId];
+  bool changed = false;
+
  // value
  if (!src[FPSTR(S_VALUE)].isNull()) {
-    return Sensors::setValueById(
-      sensorId,
-      src[FPSTR(S_VALUE)].as<float>(),
-      Sensors::ValueType::PRIMARY,
-      true,
-      true
-    );
+    float value = src[FPSTR(S_VALUE)].as<float>();
+
+    uint8_t vType = static_cast<uint8_t>(Sensors::ValueType::PRIMARY);
+    if (fabsf(value - dst.values[vType]) > 0.0001f) {
+      dst.values[vType] = roundf(value, 2);
+      changed = true;
+    }
  }

-  return false;
+  return changed;
 }

 void varsToJson(const Variables& src, JsonVariant dst) {
@@ -2132,7 +2093,7 @@ void varsToJson(const Variables& src, JsonVariant dst) {
  slave[FPSTR(S_FLAGS)] = src.slave.flags;
  slave[FPSTR(S_TYPE)] = src.slave.type;
  slave[FPSTR(S_APP_VERSION)] = src.slave.appVersion;
-  slave[FPSTR(S_PROTOCOL_VERSION)] = src.slave.protocolVersion;
+  slave[FPSTR(S_PROTOCOL_VERSION)] = src.slave.appVersion;
  slave[FPSTR(S_CONNECTED)] = src.slave.connected;
  slave[FPSTR(S_FLAME)] = src.slave.flame;

@@ -2173,7 +2134,6 @@ 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);
--- a/src_data/locales/cn.json
+++ b/src_data/locales/cn.json
@@ -243,7 +243,6 @@
        "otDhwBurnerHours": "OpenTherm, number of burner operating hours (DHW)",
        "otHeatingPumpHours": "OpenTherm, number of pump operating hours (heating)",
        "otDhwPumpHours": "OpenTherm, number of pump operating hours (DHW)",
-        "otCoolingHours": "OpenTherm, number of cooling hours",
        
        "ntcTemp": "NTC 传感器",
        "dallasTemp": "DALLAS 传感器",
@@ -320,15 +319,9 @@
      },
      "freezeProtection": {
        "title": "防冻保护",
-        "desc": "如果热载体或室内温度低于 <b>低温</b>，加热将被强制开启。",
-        "highTemp": {
-          "title": "高温阈值",
-          "note": "防冻保护激活后系统恢复正常模式的阈值"
-        },
-        "lowTemp": {
-          "title": "低温阈值",
-          "note": "强制开启加热的阈值"
-        }
+        "desc": "当热媒或室内温度在<b>等待时间</b> 内降至<b>低温阈值</b>以下时，系统将强制启动加热功能。",
+        "lowTemp": "低温阈值",
+        "thresholdTime": "等待时间<small>(秒)</small>"
      },

      "portal": {
@@ -363,16 +356,7 @@
      },

      "heating": {
-        "hyst": {
-          "title": "滞回",
-          "desc": "滞回有助于维持设定的室内温度（在使用«Equitherm»和/或«PID»时）。强制禁用加热当<code>current indoor > target + value</code>，启用加热当<code>current indoor < (target - value)</code>。",
-          "value": "值 <small>(以度为单位)</small>",
-          "action": {
-            "title": "行动",
-            "disableHeating": "禁用加热",
-            "set0target": "设置空目标"
-          }
-        },
+        "hyst": "滞后值<small>(单位：度)</small>",
        "turboFactor": "Turbo 模式系数"
      },

@@ -387,26 +371,11 @@
      },

      "equitherm": {
-        "slope": {
-          "title": "斜率",
-          "note": "热损失补偿。主要调谐参数。"
-        },
-        "exponent": {
-          "title": "指数",
-          "note": "散热器效率。典型值：<code>1.1</code> - 地板采暖，<code>1.2</code> - 铸铁，<code>1.3</code> - 面板散热器，<code>1.4</code> - 对流器。"
-        },
-        "shift": {
-          "title": "偏移",
-          "note": "补偿额外热损失（例如，在管道中）或额外热源。"
-        },
-        "targetDiffFactor": {
-          "title": "T 因子",
-          "note": "如果启用 PID，则不使用。将目标和当前室内温度之间的差值添加到设定点：<code>setpoint = setpoint + ((target - indoor) * T)</code>。"
-        },
-        "chart": {
-          "targetTemp": "目标室内温度",
-          "setpointTemp": "热载体温度",
-          "outdoorTemp": "室外温度"
+        "n": "N 系数",
+        "k": "K 系数",
+        "t": {
+          "title": "T 系数",
+          "note": "启用PID时此参数无效"
        }
      },

@@ -464,13 +433,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
@@ -119,7 +119,6 @@
        "mHeatEnabled": "Heating enabled",
        "mHeatBlocking": "Heating blocked",
        "mHeatOverheat": "Heating overheat",
-        "mHeatFreezing": "Heating freezing",
        "sHeatActive": "Heating active",
        "mHeatSetpointTemp": "Heating setpoint temp",
        "mHeatTargetTemp": "Heating target temp",
@@ -244,7 +243,6 @@
        "otDhwBurnerHours": "OpenTherm, number of burner operating hours (DHW)",
        "otHeatingPumpHours": "OpenTherm, number of pump operating hours (heating)",
        "otDhwPumpHours": "OpenTherm, number of pump operating hours (DHW)",
-        "otCoolingHours": "OpenTherm, number of cooling hours",
        
        "ntcTemp": "NTC sensor",
        "dallasTemp": "DALLAS sensor",
@@ -321,15 +319,9 @@
      },
      "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>.",
-        "highTemp": {
-          "title": "High temperature threshold",
-          "note": "Threshold when the system returns to normal mode after freeze protection activation"
-        },
-        "lowTemp": {
-          "title": "Low temperature threshold",
-          "note": "Threshold when heating is forced to turn on"
-        }
+        "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": {
@@ -364,16 +356,7 @@
      },

      "heating": {
-        "hyst": {
-          "title": "Hysteresis",
-          "desc": "Hysteresis is useful for maintaining a set indoor temp (when using «Equitherm» and/or «PID»). Forces disable heating when <code>current indoor > target + value</code> and enable heating when <code>current indoor < (target - value)</code>.",
-          "value": "Value <small>(in degrees)</small>",
-          "action": {
-            "title": "Action",
-            "disableHeating": "Disable heating",
-            "set0target": "Set null target"
-          }
-        },
+        "hyst": "Hysteresis <small>(in degrees)</small>",
        "turboFactor": "Turbo mode coeff."
      },

@@ -465,13 +448,12 @@
          "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"
+          "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
@@ -243,7 +243,6 @@
        "otDhwBurnerHours": "OpenTherm, numero di ore di funzionamento del bruciatore (ACS)",
        "otHeatingPumpHours": "OpenTherm, numero di ore di funzionamento della pompa (riscaldamento)",
        "otDhwPumpHours": "OpenTherm, numero di ore di funzionamento della pompa (ACS)",
-        "otCoolingHours": "OpenTherm, numero di ore di funzionamento della cooling",
        
        "ntcTemp": "Sensore NTC",
        "dallasTemp": "Sensore DALLAS",
@@ -320,15 +319,9 @@
      },
      "freezeProtection": {
        "title": "Protezione antigelo",
-        "desc": "Il riscaldamento verrà forzatamente attivato se la temperatura del vettore termico o la temperatura interna scende al di sotto della <b>Soglia di temperatura bassa</b>.",
-        "highTemp": {
-          "title": "Soglia di temperatura alta",
-          "note": "Soglia quando il sistema ritorna alla modalità normale dopo l'attivazione della protezione antigelo"
-        },
-        "lowTemp": {
-          "title": "Soglia di temperatura bassa",
-          "note": "Soglia quando il riscaldamento viene forzatamente attivato"
-        }
+        "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": {
@@ -363,16 +356,7 @@
      },

      "heating": {
-        "hyst": {
-          "title": "Isteresi",
-          "desc": "L'isteresi è utile per mantenere una temperatura interna impostata (quando si utilizza «Equitherm» e/o «PID»). Forza la disabilitazione del riscaldamento quando <code>current indoor > target + value</code> e abilita il riscaldamento quando <code>current indoor < (target - value)</code>.",
-          "value": "Valore <small>(in gradi)</small>",
-          "action": {
-            "title": "Azione",
-            "disableHeating": "Disabilita riscaldamento",
-            "set0target": "Imposta target nullo"
-          }
-        },
+        "hyst": "Isteresi <small>(in gradi)</small>",
        "turboFactor": "Turbo mode coeff."
      },

@@ -389,23 +373,23 @@
      "equitherm": {
        "slope": {
          "title": "Pendenza",
-          "note": "Compensazione della perdita di calore. Parametro di regolazione principale."
+          "note": "Compensazione delle perdite di calore. Principale parametro di regolazione."
        },
        "exponent": {
          "title": "Esponente",
-          "note": "Efficienza del radiatore. Valori tipici: <code>1.1</code> - Riscaldamento a pavimento, <code>1.2</code> - Ghisa, <code>1.3</code> - Radiatori a pannello, <code>1.4</code> - Convettori."
+          "note": "Efficienza del radiatore. Valori tipici: <code>1.1</code> - Riscaldamento a pavimento, <code>1.2</code> - Radiatori in ghisa, <code>1.3</code> - Radiatori a pannelli, <code>1.4</code> - Convetttori."
        },
        "shift": {
-          "title": "Spostamento",
-          "note": "Compensa perdite di calore aggiuntive (ad es., nelle tubature) o fonti di calore extra."
+          "title": "Spostare",
+          "note": "Compensa le perdite di calore aggiuntive (ad esempio, nelle tubature) o fonti di calore extra."
        },
        "targetDiffFactor": {
          "title": "Fattore T",
-          "note": "Non utilizzato se PID è abilitato. Aggiunge al setpoint la differenza tra la temperatura target e quella interna attuale: <code>setpoint = setpoint + ((target - indoor) * T)</code>."
+          "note": "Non usato se PID è attivato. Aggiunge al setpoint la differenza tra la temperatura interna target e quella attuale: <code>setpoint = setpoint + ((target - indoor) * T)</code>."
        },
        "chart": {
          "targetTemp": "Temperatura interna target",
-          "setpointTemp": "Temperatura del vettore termico",
+          "setpointTemp": "Temperatura del portatore di calore",
          "outdoorTemp": "Temperatura esterna"
        }
      },
@@ -464,13 +448,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
@@ -222,8 +222,6 @@
        "otDhwBurnerHours": "OpenTherm, aantal branderuren (warm water)",
        "otHeatingPumpHours": "OpenTherm, aantal pompuren (verwarming)",
        "otDhwPumpHours": "OpenTherm, aantal pompuren (warm water)",
-        "otCoolingHours": "OpenTherm, aantal cooling",
-
        "ntcTemp": "NTC-sensor",
        "dallasTemp": "DALLAS-sensor",
        "bluetooth": "BLE-sensor",
@@ -294,18 +292,11 @@
        }
      },
      "freezeProtection": {
-        "title": "Vorbeveiliging",
-        "desc": "Verwarming zal geforceerd worden ingeschakeld als de temperatuur van de warmtedrager of de binnentemperatuur daalt onder de <b>Lage temperatuurdrempel</b>.",
-        "highTemp": {
-          "title": "Hoge temperatuurdrempel",
-          "note": "Drempel waarna het systeem terugkeert naar de normale modus na activering van de vorbeveiliging"
-        },
-        "lowTemp": {
-          "title": "Lage temperatuurdrempel",
-          "note": "Drempel wanneer de verwarming geforceerd wordt ingeschakeld"
-        }
+        "title": "Vorstbeveiliging",
+        "desc": "De verwarming wordt geforceerd ingeschakeld als de temperatuur van de warmtedrager of de binnentemperatuur onder de <b>Lage temperatuur</b> daalt gedurende de <b>Wachttijd</b>.",
+        "lowTemp": "Drempelwaarde lage temperatuur",
+        "thresholdTime": "Wachttijd <small>(sec)</small>"
      },
-
      "portal": {
        "login": "Gebruikersnaam",
        "password": "Wachtwoord",
@@ -336,16 +327,7 @@
        }
      },
      "heating": {
-        "hyst": {
-          "title": "Hysterese",
-          "desc": "Hysterese is nuttig voor het handhaven van een ingestelde binnentemperatuur (bij gebruik van «Equitherm» en/of «PID»). Forceert uitschakelen van verwarming wanneer <code>current indoor > target + value</code> en inschakelen van verwarming wanneer <code>current indoor < (target - value)</code>.",
-          "value": "Waarde <small>(in graden)</small>",
-          "action": {
-            "title": "Actie",
-            "disableHeating": "Verwarming uitschakelen",
-            "set0target": "Stel null target in"
-          }
-        },
+        "hyst": "Hysterese <small>(in graden)</small>",
        "turboFactor": "Turbomodus coëff."
      },
      "emergency": {
@@ -357,26 +339,11 @@
        "treshold": "Drempeltijd <small>(sec)</small>"
      },
      "equitherm": {
-        "slope": {
-          "title": "Helling",
-          "note": "Compensatie voor warmteverlies. Hoofdafstelparameter."
-        },
-        "exponent": {
-          "title": "Exponent",
-          "note": "Radiator efficiëntie. Typische waarden: <code>1.1</code> - Vloerverwarming, <code>1.2</code> - Gietijzer, <code>1.3</code> - Paneelradiatoren, <code>1.4</code> - Convectors."
-        },
-        "shift": {
-          "title": "Verschuiving",
-          "note": "Compenseert voor extra warmteverliezen (bijv. in leidingen) of extra warmtebronnen."
-        },
-        "targetDiffFactor": {
-          "title": "T factor",
-          "note": "Niet gebruikt als PID is ingeschakeld. Voegt aan de setpoint de verschil tussen de target en huidige binnentemperatuur toe: <code>setpoint = setpoint + ((target - indoor) * T)</code>."
-        },
-        "chart": {
-          "targetTemp": "Doel binnentemperatuur",
-          "setpointTemp": "Warmtedrager temperatuur",
-          "outdoorTemp": "Buitentemperatuur"
+        "n": "N-factor",
+        "k": "K-factor",
+        "t": {
+          "title": "T-factor",
+          "note": "Niet gebruikt als PID is ingeschakeld"
        }
      },
      "pid": {
@@ -431,13 +398,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
@@ -243,7 +243,6 @@
        "otDhwBurnerHours": "OpenTherm, кол-во часов работы горелки (ГВС)",
        "otHeatingPumpHours": "OpenTherm, кол-во часов работы насоса (отопление)",
        "otDhwPumpHours": "OpenTherm, кол-во часов работы насоса (ГВС)",
-        "otCoolingHours": "OpenTherm, кол-во часов работы охлаждения",
        
        "ntcTemp": "NTC датчик",
        "dallasTemp": "DALLAS датчик",
@@ -320,15 +319,9 @@
      },
      "freezeProtection": {
        "title": "Защита от замерзания",
-        "desc": "Отопление будет принудительно включено, если темп. теплоносителя или внутренняя темп. опустится ниже <b>нижнего порога</b>.",
-        "highTemp": {
-          "title": "Верхний порог температуры",
-          "note": "Порог, при котором система вернется в нормальное состояние после активации защиты от замерзания"
-        },
-        "lowTemp": {
-          "title": "Нижний порог температуры",
-          "note": "Порог, при котором отопление будет принудительно включено"
-        }
+        "desc": "Отопление будет принудительно включено, если темп. теплоносителя или внутренняя темп. опустится ниже <b>нижнего порога</b> в течение <b>времени ожидания</b>.",
+        "lowTemp": "Нижний порог температуры",
+        "thresholdTime": "Время ожидания <small>(сек)</small>"
      },

      "portal": {
@@ -363,16 +356,7 @@
      },

      "heating": {
-        "hyst": {
-          "title": "Гистерезис",
-          "desc": "Гистерезис полезен для поддержания заданной внутр. темп. (при использовании «ПЗА» и/или «ПИД»). Принудительно откл. отопление, когда <code>current indoor > target + value</code>, и вкл. отопление, когда <code>current indoor < (target - value)</code>.",
-          "value": "Значение <small>(в градусах)</small>",
-          "action": {
-            "title": "Действие",
-            "disableHeating": "Отключить отопление",
-            "set0target": "Установить 0 в качестве целевой темп."
-          }
-        },
+        "hyst": "Гистерезис <small>(в градусах)</small>",
        "turboFactor": "Коэфф. турбо режима"
      },

@@ -464,13 +448,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/dashboard.html
+++ b/src_data/pages/dashboard.html
@@ -195,10 +195,6 @@
                  <th scope="row" data-i18n>dashboard.states.mHeatOverheat</th>
                  <td><i class="mHeatOverheat"></i></td>
                </tr>
-                <tr>
-                  <th scope="row" data-i18n>dashboard.states.mHeatFreezing</th>
-                  <td><i class="mHeatFreezing"></i></td>
-                </tr>
                <tr>
                  <th scope="row" data-i18n>dashboard.states.sHeatActive</th>
                  <td><i class="sHeatActive"></i></td>
@@ -637,11 +633,6 @@
              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);
--- a/src_data/pages/sensors.html
+++ b/src_data/pages/sensors.html
@@ -113,7 +113,6 @@
                      <option value="24" data-i18n>sensors.types.otDhwBurnerHours</option>
                      <option value="25" data-i18n>sensors.types.otHeatingPumpHours</option>
                      <option value="26" data-i18n>sensors.types.otDhwPumpHours</option>
-                      <option value="27" data-i18n>sensors.types.otCoolingHours</option>

                      <option value="50" data-i18n>sensors.types.ntcTemp</option>
                      <option value="51" data-i18n>sensors.types.dallasTemp</option>
--- a/src_data/pages/settings.html
+++ b/src_data/pages/settings.html
@@ -194,47 +194,20 @@

              <div class="grid">
                <label>
-                  <span data-i18n>settings.heating.turboFactor</span>
-                  <input type="number" inputmode="decimal" name="heating[turboFactor]" min="1.5" max="10" step="0.1" required>
+                  <span data-i18n>settings.heating.hyst</span>
+                  <input type="number" inputmode="decimal" name="heating[hysteresis]" min="0" max="5" step="0.05" required>
                </label>

                <label>
-                  <span data-i18n>settings.maxModulation</span>
-                  <input type="number" inputmode="numeric" name="heating[maxModulation]" min="1" max="100" step="1" required>
+                  <span data-i18n>settings.heating.turboFactor</span>
+                  <input type="number" inputmode="decimal" name="heating[turboFactor]" min="1.5" max="10" step="0.1" required>
                </label>
              </div>

-              <hr />
-
-              <details>
-                <summary><b data-i18n>settings.heating.hyst.title</b></summary>
-                
-                <div>
-                  <fieldset>
-                    <label>
-                      <input type="checkbox" name="heating[hysteresis][enabled]" value="true">
-                      <span data-i18n>settings.enable</span>
-                    </label>
-                  </fieldset>
-
-                  <div class="grid">
-                    <label>
-                      <span data-i18n>settings.heating.hyst.value</span>
-                      <input type="number" inputmode="decimal" name="heating[hysteresis][value]" min="0" max="5" step="0.05" required>
-                    </label>
-
-                    <label>
-                      <span data-i18n>settings.heating.hyst.action.title</span>
-                      <select name="heating[hysteresis][action]">
-                        <option value="0" data-i18n>settings.heating.hyst.action.disableHeating</option>
-                        <option value="1" data-i18n>settings.heating.hyst.action.set0target</option>
-                      </select>
-                    </label>
-                  </div>
-                </div>
-
-                <small data-i18n>settings.heating.hyst.desc</small>
-              </details>
+              <label>
+                <span data-i18n>settings.maxModulation</span>
+                <input type="number" inputmode="numeric" name="heating[maxModulation]" min="1" max="100" step="1" required>
+              </label>

              <hr />

@@ -265,15 +238,13 @@

                <div class="grid">
                  <label>
-                    <span data-i18n>settings.freezeProtection.highTemp.title</span>
-                    <input type="number" inputmode="numeric" name="heating[freezeProtection][highTemp]" min="0" max="0" step="1" required>
-                    <small data-i18n>settings.freezeProtection.highTemp.note</small>
+                    <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.lowTemp.title</span>
-                    <input type="number" inputmode="numeric" name="heating[freezeProtection][lowTemp]" min="0" max="0" step="1" required>
-                    <small data-i18n>settings.freezeProtection.lowTemp.note</small>
+                    <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>

@@ -694,17 +665,12 @@
                      <span data-i18n>settings.ot.options.immergasFix</span>
                    </label>

-                    <label>
-                      <input type="checkbox" name="opentherm[options][alwaysSendIndoorTemp]" value="true">
-                      <span data-i18n>settings.ot.options.alwaysSendIndoorTemp</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>
@@ -1124,9 +1090,8 @@
          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][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
@@ -1173,9 +1138,7 @@
            "min": data.system.unitSystem == 0 ? 1 : 33,
            "max": data.system.unitSystem == 0 ? 100 : 212
          });
-          setCheckboxValue("[name='heating[hysteresis][enabled]']", data.heating.hysteresis.enabled);
-          setInputValue("[name='heating[hysteresis][value]']", data.heating.hysteresis.value);
-          setSelectValue("[name='heating[hysteresis][action]']", data.heating.hysteresis.action);
+          setInputValue("[name='heating[hysteresis]']", data.heating.hysteresis);
          setInputValue("[name='heating[turboFactor]']", data.heating.turboFactor);
          setInputValue("[name='heating[maxModulation]']", data.heating.maxModulation);
          setInputValue("[name='heating[overheatProtection][highTemp]']", data.heating.overheatProtection.highTemp, {
@@ -1186,14 +1149,11 @@
            "min": 0,
            "max": data.system.unitSystem == 0 ? 99 : 211
          });
-          setInputValue("[name='heating[freezeProtection][highTemp]']", data.heating.freezeProtection.highTemp, {
-            "min": data.system.unitSystem == 0 ? 1 : 34,
-            "max": data.system.unitSystem == 0 ? 50 : 122
-          });
          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
@@ -1217,7 +1177,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	131ad2fdfd	refactor: after merge	2025-12-09 19:26:08 +03:00
Yurii	28099f2d07	Merge branch 'master' into new-equitherm	2025-12-09 19:19:30 +03:00
Yurii	ec50d5ecbb	flx: typo	2025-11-03 01:09:13 +03:00
Yurii	32e0a06c19	Merge branch 'master' into new-equitherm	2025-11-03 00:04:57 +03:00
Yurii	ff89c6d478	chore: added additional description of the ``T`` parameter for Equitherm	2025-09-19 20:07:31 +03:00
Yurii	d867c355ed	style: HTML code formatting	2025-09-19 19:25:24 +03:00
Yurii	e751c3aba0	fix: decimation for Equitherm chart fixed; chartjs updated	2025-09-19 02:09:12 +03:00
Yurii	30b55f1946	Merge branch 'master' into new-equitherm	2025-09-19 00:45:07 +03:00
Yurii	5544f43162	Merge branch 'master' into new-equitherm	2025-06-30 02:42:33 +03:00
Yurii	06c2ddcf96	Merge branch 'master' into new-equitherm	2025-05-21 01:20:55 +03:00
Yurii	0bb05006f4	Merge branch 'master' into new-equitherm	2025-05-19 23:45:13 +03:00
Yurii	5046bc0e8f	Merge branch 'master' into new-equitherm	2025-05-19 22:49:09 +03:00
P43YM	0d3adad446	refactor: added notes for equitherm parameters	2025-03-18 09:38:09 +03:00
Yurii	587678f184	Merge branch 'master' into new-equitherm	2025-03-06 04:52:12 +03:00
Yurii	72235286c0	chore: resolve conflicts	2025-03-06 04:50:02 +03:00
Yurii	ee868b22ce	chore: remove unused files	2025-03-04 21:31:44 +03:00
Yurii	8046a7e13f	refactor: cosmetic changes	2025-03-03 04:03:08 +03:00
Yurii	0ec1fc5f24	chore: fix typo	2025-03-03 02:26:09 +03:00
Yurii	061136b13e	refactor: cosmetic changes (equitherm chart)	2025-03-03 02:05:33 +03:00
Yurii	3e61dabeab	refactor: refactoring after #144	2025-03-02 22:44:53 +03:00
P43YM	e5f4281d4c	feat: new equitherm algorithm and chart for it (#144 )	2025-02-28 23:21:55 +03:00