flx: typo

Merge branch 'master' into new-equitherm
chore: added additional description of the `T` parameter for Equitherm
2025-12-14 12:14:28 +05: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 · 2025-09-19 19:25:24 +03:00 · 2025-09-19 02:09:12 +03:00
22 changed files with 339 additions and 649 deletions
--- a/.github/workflows/pio-dependabot.yaml
+++ b/.github/workflows/pio-dependabot.yaml
@@ -0,0 +1,22 @@
+name: PlatformIO Dependabot
+on:
+  workflow_dispatch: # option to manually trigger the workflow
+  schedule:
+    # Runs every day at 00:00
+    - cron: "0 0 * * *"
+
+permissions:
+  contents: write
+  pull-requests: write
+
+jobs:
+  dependabot:
+    runs-on: ubuntu-latest
+    name: run PlatformIO Dependabot
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v5
+      - name: run PlatformIO Dependabot
+        uses: peterus/platformio_dependabot@v1.2.0
+        with:
+          github_token: ${{ secrets.GITHUB_TOKEN }}
--- 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/lib/HomeAssistantHelper/HomeAssistantHelper.h
+++ b/lib/HomeAssistantHelper/HomeAssistantHelper.h
@@ -147,19 +147,8 @@ public:
    return topic;
  }

-  template <class DT, class VT> 
-  String getEntityIdWithPrefix(DT domain, VT value, char separator = '_') {
-    String topic = "";
-    topic.concat(domain);
-    topic.concat('.');
-    topic.concat(this->devicePrefix);
-    topic.concat(separator);
-    topic.concat(value);
-    return topic;
-  }
-
  template <class T> 
-  String getUniqueIdWithPrefix(T value, char separator = '_') {
+  String getObjectIdWithPrefix(T value, char separator = '_') {
    String topic = "";
    topic.concat(this->devicePrefix);
    topic.concat(separator);
--- a/lib/HomeAssistantHelper/strings.h
+++ b/lib/HomeAssistantHelper/strings.h
@@ -12,67 +12,66 @@ const char HA_ENTITY_SELECT[]                   PROGMEM = "select";
 const char HA_ENTITY_SENSOR[]                   PROGMEM = "sensor";
 const char HA_ENTITY_SWITCH[]                   PROGMEM = "switch";

-// https://www.home-assistant.io/integrations/mqtt/#supported-abbreviations-in-mqtt-discovery-messages
-const char HA_DEFAULT_ENTITY_ID[]               PROGMEM = "def_ent_id";               // "default_entity_id "
-const char HA_DEVICE[]                          PROGMEM = "dev";                      // "device"
-const char HA_IDENTIFIERS[]                     PROGMEM = "ids";                      // "identifiers"
-const char HA_SW_VERSION[]                      PROGMEM = "sw";                       // "sw_version"
-const char HA_MANUFACTURER[]                    PROGMEM = "mf";                       // "manufacturer"
-const char HA_MODEL[]                           PROGMEM = "mdl";                      // "model"
+const char HA_DEFAULT_ENTITY_ID[]               PROGMEM = "def_ent_id";
+const char HA_DEVICE[]                          PROGMEM = "device";
+const char HA_IDENTIFIERS[]                     PROGMEM = "identifiers";
+const char HA_SW_VERSION[]                      PROGMEM = "sw_version";
+const char HA_MANUFACTURER[]                    PROGMEM = "manufacturer";
+const char HA_MODEL[]                           PROGMEM = "model";
 const char HA_NAME[]                            PROGMEM = "name";
-const char HA_CONF_URL[]                        PROGMEM = "cu";                       // "configuration_url"
-const char HA_COMMAND_TOPIC[]                   PROGMEM = "cmd_t";                    // "command_topic"
-const char HA_COMMAND_TEMPLATE[]                PROGMEM = "cmd_tpl";                  // "command_template"
-const char HA_ENABLED_BY_DEFAULT[]              PROGMEM = "en";                       // "enabled_by_default"
-const char HA_UNIQUE_ID[]                       PROGMEM = "uniq_id";                  // "unique_id"
-const char HA_ENTITY_CATEGORY[]                 PROGMEM = "ent_cat";                  // "entity_category"
+const char HA_CONF_URL[]                        PROGMEM = "configuration_url";
+const char HA_COMMAND_TOPIC[]                   PROGMEM = "command_topic";
+const char HA_COMMAND_TEMPLATE[]                PROGMEM = "command_template";
+const char HA_ENABLED_BY_DEFAULT[]              PROGMEM = "enabled_by_default";
+const char HA_UNIQUE_ID[]                       PROGMEM = "unique_id";
+const char HA_ENTITY_CATEGORY[]                 PROGMEM = "entity_category";
 const char HA_ENTITY_CATEGORY_DIAGNOSTIC[]      PROGMEM = "diagnostic";
 const char HA_ENTITY_CATEGORY_CONFIG[]          PROGMEM = "config";
-const char HA_STATE_TOPIC[]                     PROGMEM = "stat_t";                   // "state_topic"
-const char HA_VALUE_TEMPLATE[]                  PROGMEM = "val_tpl";                  // "value_template"
-const char HA_OPTIONS[]                         PROGMEM = "ops";                      // "options"
-const char HA_AVAILABILITY[]                    PROGMEM = "avty";                     // "availability"
-const char HA_AVAILABILITY_MODE[]               PROGMEM = "avty_mode";                // "availability_mode"
-const char HA_TOPIC[]                           PROGMEM = "t";                        // "topic"
-const char HA_DEVICE_CLASS[]                    PROGMEM = "dev_cla";                  // "device_class"
-const char HA_UNIT_OF_MEASUREMENT[]             PROGMEM = "unit_of_meas";             // "unit_of_measurement"
+const char HA_STATE_TOPIC[]                     PROGMEM = "state_topic";
+const char HA_VALUE_TEMPLATE[]                  PROGMEM = "value_template";
+const char HA_OPTIONS[]                         PROGMEM = "options";
+const char HA_AVAILABILITY[]                    PROGMEM = "availability";
+const char HA_AVAILABILITY_MODE[]               PROGMEM = "availability_mode";
+const char HA_TOPIC[]                           PROGMEM = "topic";
+const char HA_DEVICE_CLASS[]                    PROGMEM = "device_class";
+const char HA_UNIT_OF_MEASUREMENT[]             PROGMEM = "unit_of_measurement";
 const char HA_UNIT_OF_MEASUREMENT_C[]           PROGMEM = "°C";
 const char HA_UNIT_OF_MEASUREMENT_F[]           PROGMEM = "°F";
 const char HA_UNIT_OF_MEASUREMENT_PERCENT[]     PROGMEM = "%";
 const char HA_UNIT_OF_MEASUREMENT_L_MIN[]       PROGMEM = "L/min";
 const char HA_UNIT_OF_MEASUREMENT_GAL_MIN[]     PROGMEM = "gal/min";
-const char HA_ICON[]                            PROGMEM = "ic";                       // "icon"
+const char HA_ICON[]                            PROGMEM = "icon";
 const char HA_MIN[]                             PROGMEM = "min";
 const char HA_MAX[]                             PROGMEM = "max";
 const char HA_STEP[]                            PROGMEM = "step";
 const char HA_MODE[]                            PROGMEM = "mode";
 const char HA_MODE_BOX[]                        PROGMEM = "box";
-const char HA_STATE_ON[]                        PROGMEM = "stat_on";                  // "state_on"
-const char HA_STATE_OFF[]                       PROGMEM = "stat_off";                 // "state_off"
-const char HA_PAYLOAD_ON[]                      PROGMEM = "pl_on";                    // "payload_on"
-const char HA_PAYLOAD_OFF[]                     PROGMEM = "pl_off";                   // "payload_off"
-const char HA_STATE_CLASS[]                     PROGMEM = "stat_cla";                 // "state_class"
+const char HA_STATE_ON[]                        PROGMEM = "state_on";
+const char HA_STATE_OFF[]                       PROGMEM = "state_off";
+const char HA_PAYLOAD_ON[]                      PROGMEM = "payload_on";
+const char HA_PAYLOAD_OFF[]                     PROGMEM = "payload_off";
+const char HA_STATE_CLASS[]                     PROGMEM = "state_class";
 const char HA_STATE_CLASS_MEASUREMENT[]         PROGMEM = "measurement";
-const char HA_EXPIRE_AFTER[]                    PROGMEM = "exp_aft";                  // "expire_after"
-const char HA_CURRENT_TEMPERATURE_TOPIC[]       PROGMEM = "curr_temp_t";              // "current_temperature_topic"
-const char HA_CURRENT_TEMPERATURE_TEMPLATE[]    PROGMEM = "curr_temp_tpl";            // "current_temperature_template"
-const char HA_TEMPERATURE_COMMAND_TOPIC[]       PROGMEM = "temp_cmd_t";               // "temperature_command_topic"
-const char HA_TEMPERATURE_COMMAND_TEMPLATE[]    PROGMEM = "temp_cmd_tpl";             // "temperature_command_template"
-const char HA_TEMPERATURE_STATE_TOPIC[]         PROGMEM = "temp_stat_t";              // "temperature_state_topic"
-const char HA_TEMPERATURE_STATE_TEMPLATE[]      PROGMEM = "temp_stat_tpl";            // "temperature_state_template"
-const char HA_TEMPERATURE_UNIT[]                PROGMEM = "temp_unit";                // "temperature_unit"
-const char HA_MODE_COMMAND_TOPIC[]              PROGMEM = "mode_cmd_t";               // "mode_command_topic"
-const char HA_MODE_COMMAND_TEMPLATE[]           PROGMEM = "mode_cmd_tpl";             // "mode_command_template"
-const char HA_MODE_STATE_TOPIC[]                PROGMEM = "mode_stat_t";              // "mode_state_topic"
-const char HA_MODE_STATE_TEMPLATE[]             PROGMEM = "mode_stat_tpl";            // "mode_state_template"
+const char HA_EXPIRE_AFTER[]                    PROGMEM = "expire_after";
+const char HA_CURRENT_TEMPERATURE_TOPIC[]       PROGMEM = "current_temperature_topic";
+const char HA_CURRENT_TEMPERATURE_TEMPLATE[]    PROGMEM = "current_temperature_template";
+const char HA_TEMPERATURE_COMMAND_TOPIC[]       PROGMEM = "temperature_command_topic";
+const char HA_TEMPERATURE_COMMAND_TEMPLATE[]    PROGMEM = "temperature_command_template";
+const char HA_TEMPERATURE_STATE_TOPIC[]         PROGMEM = "temperature_state_topic";
+const char HA_TEMPERATURE_STATE_TEMPLATE[]      PROGMEM = "temperature_state_template";
+const char HA_TEMPERATURE_UNIT[]                PROGMEM = "temperature_unit";
+const char HA_MODE_COMMAND_TOPIC[]              PROGMEM = "mode_command_topic";
+const char HA_MODE_COMMAND_TEMPLATE[]           PROGMEM = "mode_command_template";
+const char HA_MODE_STATE_TOPIC[]                PROGMEM = "mode_state_topic";
+const char HA_MODE_STATE_TEMPLATE[]             PROGMEM = "mode_state_template";
 const char HA_MODES[]                           PROGMEM = "modes";
-const char HA_ACTION_TOPIC[]                    PROGMEM = "act_t";                    // "action_topic"
-const char HA_ACTION_TEMPLATE[]                 PROGMEM = "act_tpl";                  // "action_template"
+const char HA_ACTION_TOPIC[]                    PROGMEM = "action_topic";
+const char HA_ACTION_TEMPLATE[]                 PROGMEM = "action_template";
 const char HA_MIN_TEMP[]                        PROGMEM = "min_temp";
 const char HA_MAX_TEMP[]                        PROGMEM = "max_temp";
 const char HA_TEMP_STEP[]                       PROGMEM = "temp_step";
-const char HA_PRESET_MODE_COMMAND_TOPIC[]       PROGMEM = "pr_mode_cmd_t";            // "preset_mode_command_topic"
-const char HA_PRESET_MODE_COMMAND_TEMPLATE[]    PROGMEM = "pr_mode_cmd_tpl";          // "preset_mode_command_template"
-const char HA_PRESET_MODE_STATE_TOPIC[]         PROGMEM = "pr_mode_stat_t";           // "preset_mode_state_topic"
-const char HA_PRESET_MODE_VALUE_TEMPLATE[]      PROGMEM = "pr_mode_val_tpl";          // "preset_mode_value_template"
-const char HA_PRESET_MODES[]                    PROGMEM = "pr_modes";                 // "preset_modes"
+const char HA_PRESET_MODE_COMMAND_TOPIC[]       PROGMEM = "preset_mode_command_topic";
+const char HA_PRESET_MODE_COMMAND_TEMPLATE[]    PROGMEM = "preset_mode_command_template";
+const char HA_PRESET_MODE_STATE_TOPIC[]         PROGMEM = "preset_mode_state_topic";
+const char HA_PRESET_MODE_VALUE_TEMPLATE[]      PROGMEM = "preset_mode_value_template";
+const char HA_PRESET_MODES[]                    PROGMEM = "preset_modes";
--- a/platformio.ini
+++ b/platformio.ini
@@ -92,13 +92,13 @@ 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.34/platform-espressif32.zip
+platform = https://github.com/pioarduino/platform-espressif32/releases/download/55.03.32/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
+nimble_lib = h2zero/NimBLE-Arduino@2.3.3
 lib_ignore = 
 extra_scripts = 
 	post:tools/esp32.py
@@ -234,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
@@ -260,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
@@ -366,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
@@ -261,13 +261,8 @@ public:
    }

    // object id's
-    doc[FPSTR(HA_UNIQUE_ID)] = this->getUniqueIdWithPrefix(objId.c_str());
-    doc[FPSTR(HA_DEFAULT_ENTITY_ID)] = this->getEntityIdWithPrefix(
-      sSensor.type == Sensors::Type::MANUAL 
-        ? FPSTR(HA_ENTITY_NUMBER) 
-        : FPSTR(HA_ENTITY_SENSOR),
-      objId.c_str()
-    );
+    doc[FPSTR(HA_UNIQUE_ID)] = this->getObjectIdWithPrefix(objId.c_str());
+    doc[FPSTR(HA_DEFAULT_ENTITY_ID)] = doc[FPSTR(HA_UNIQUE_ID)];

    const String& configTopic = this->makeConfigTopic(
      sSensor.type == Sensors::Type::MANUAL ? FPSTR(HA_ENTITY_NUMBER) : FPSTR(HA_ENTITY_SENSOR),
@@ -328,8 +323,8 @@ public:
    String objId = Sensors::makeObjectIdWithSuffix(sSensor.name, F("connected"));

    // object id's
-    doc[FPSTR(HA_UNIQUE_ID)] = this->getUniqueIdWithPrefix(objId.c_str());
-    doc[FPSTR(HA_DEFAULT_ENTITY_ID)] = this->getEntityIdWithPrefix(FPSTR(HA_ENTITY_BINARY_SENSOR), objId.c_str());
+    doc[FPSTR(HA_UNIQUE_ID)] = this->getObjectIdWithPrefix(objId.c_str());
+    doc[FPSTR(HA_DEFAULT_ENTITY_ID)] = doc[FPSTR(HA_UNIQUE_ID)];

    // state topic
    doc[FPSTR(HA_STATE_TOPIC)] = this->getDeviceTopic(
@@ -375,8 +370,8 @@ public:
    String objId = Sensors::makeObjectIdWithSuffix(sSensor.name, F("signal_quality"));

    // object id's
-    doc[FPSTR(HA_UNIQUE_ID)] = this->getUniqueIdWithPrefix(objId.c_str());
-    doc[FPSTR(HA_DEFAULT_ENTITY_ID)] = this->getEntityIdWithPrefix(FPSTR(HA_ENTITY_SENSOR), objId.c_str());
+    doc[FPSTR(HA_UNIQUE_ID)] = this->getObjectIdWithPrefix(objId.c_str());
+    doc[FPSTR(HA_DEFAULT_ENTITY_ID)] = doc[FPSTR(HA_UNIQUE_ID)];

    // state topic
    doc[FPSTR(HA_STATE_TOPIC)] = this->getDeviceTopic(
@@ -412,6 +407,7 @@ public:
  }

  bool deleteSignalQualityDynamicSensor(Sensors::Settings& sSensor) {
+    JsonDocument doc;
    const String& configTopic = this->makeConfigTopic(
      FPSTR(HA_ENTITY_SENSOR),
      Sensors::makeObjectIdWithSuffix(sSensor.name, F("signal_quality")).c_str()
@@ -425,8 +421,8 @@ public:
    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_turbo"));
-    doc[FPSTR(HA_DEFAULT_ENTITY_ID)] = this->getEntityIdWithPrefix(FPSTR(HA_ENTITY_SWITCH), F("heating_turbo"));
+    doc[FPSTR(HA_UNIQUE_ID)] = this->getObjectIdWithPrefix(F("heating_turbo"));
+    doc[FPSTR(HA_DEFAULT_ENTITY_ID)] = doc[FPSTR(HA_UNIQUE_ID)];
    doc[FPSTR(HA_ENTITY_CATEGORY)] = FPSTR(HA_ENTITY_CATEGORY_CONFIG);
    doc[FPSTR(HA_NAME)] = F("Turbo heating");
    doc[FPSTR(HA_ICON)] = F("mdi:rocket-launch-outline");
@@ -443,34 +439,12 @@ 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();
    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_NUMBER), F("heating_hysteresis"));
+    doc[FPSTR(HA_UNIQUE_ID)] = this->getObjectIdWithPrefix(F("heating_hysteresis"));
+    doc[FPSTR(HA_DEFAULT_ENTITY_ID)] = doc[FPSTR(HA_UNIQUE_ID)];
    doc[FPSTR(HA_ENTITY_CATEGORY)] = FPSTR(HA_ENTITY_CATEGORY_CONFIG);
    doc[FPSTR(HA_DEVICE_CLASS)] = FPSTR(S_TEMPERATURE);

@@ -484,9 +458,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;
@@ -501,8 +475,8 @@ public:
    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_turbo_factor"));
-    doc[FPSTR(HA_DEFAULT_ENTITY_ID)] = this->getEntityIdWithPrefix(FPSTR(HA_ENTITY_NUMBER), F("heating_turbo_factor"));
+    doc[FPSTR(HA_UNIQUE_ID)] = this->getObjectIdWithPrefix(F("heating_turbo_factor"));
+    doc[FPSTR(HA_DEFAULT_ENTITY_ID)] = doc[FPSTR(HA_UNIQUE_ID)];
    doc[FPSTR(HA_ENTITY_CATEGORY)] = FPSTR(HA_ENTITY_CATEGORY_CONFIG);
    doc[FPSTR(HA_DEVICE_CLASS)] = F("power_factor");
    doc[FPSTR(HA_NAME)] = F("Heating turbo factor");
@@ -525,8 +499,8 @@ public:
    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_min_temp"));
-    doc[FPSTR(HA_DEFAULT_ENTITY_ID)] = this->getEntityIdWithPrefix(FPSTR(HA_ENTITY_NUMBER), F("heating_min_temp"));
+    doc[FPSTR(HA_UNIQUE_ID)] = this->getObjectIdWithPrefix(F("heating_min_temp"));
+    doc[FPSTR(HA_DEFAULT_ENTITY_ID)] = doc[FPSTR(HA_UNIQUE_ID)];
    doc[FPSTR(HA_ENTITY_CATEGORY)] = FPSTR(HA_ENTITY_CATEGORY_CONFIG);
    doc[FPSTR(HA_DEVICE_CLASS)] = FPSTR(S_TEMPERATURE);

@@ -559,8 +533,8 @@ public:
    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_max_temp"));
-    doc[FPSTR(HA_DEFAULT_ENTITY_ID)] = this->getEntityIdWithPrefix(FPSTR(HA_ENTITY_NUMBER), F("heating_max_temp"));
+    doc[FPSTR(HA_UNIQUE_ID)] = this->getObjectIdWithPrefix(F("heating_max_temp"));
+    doc[FPSTR(HA_DEFAULT_ENTITY_ID)] = doc[FPSTR(HA_UNIQUE_ID)];
    doc[FPSTR(HA_ENTITY_CATEGORY)] = FPSTR(HA_ENTITY_CATEGORY_CONFIG);
    doc[FPSTR(HA_DEVICE_CLASS)] = FPSTR(S_TEMPERATURE);

@@ -594,8 +568,8 @@ public:
    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("dhw_min_temp"));
-    doc[FPSTR(HA_DEFAULT_ENTITY_ID)] = this->getEntityIdWithPrefix(FPSTR(HA_ENTITY_NUMBER), F("dhw_min_temp"));
+    doc[FPSTR(HA_UNIQUE_ID)] = this->getObjectIdWithPrefix(F("dhw_min_temp"));
+    doc[FPSTR(HA_DEFAULT_ENTITY_ID)] = doc[FPSTR(HA_UNIQUE_ID)];
    doc[FPSTR(HA_ENTITY_CATEGORY)] = FPSTR(HA_ENTITY_CATEGORY_CONFIG);
    doc[FPSTR(HA_DEVICE_CLASS)] = FPSTR(S_TEMPERATURE);

@@ -628,8 +602,8 @@ public:
    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("dhw_max_temp"));
-    doc[FPSTR(HA_DEFAULT_ENTITY_ID)] = this->getEntityIdWithPrefix(FPSTR(HA_ENTITY_NUMBER), F("dhw_max_temp"));
+    doc[FPSTR(HA_UNIQUE_ID)] = this->getObjectIdWithPrefix(F("dhw_max_temp"));
+    doc[FPSTR(HA_DEFAULT_ENTITY_ID)] = doc[FPSTR(HA_UNIQUE_ID)];
    doc[FPSTR(HA_ENTITY_CATEGORY)] = FPSTR(HA_ENTITY_CATEGORY_CONFIG);
    doc[FPSTR(HA_DEVICE_CLASS)] = FPSTR(S_TEMPERATURE);

@@ -663,8 +637,8 @@ public:
    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("pid"));
-    doc[FPSTR(HA_DEFAULT_ENTITY_ID)] = this->getEntityIdWithPrefix(FPSTR(HA_ENTITY_SWITCH), F("pid"));
+    doc[FPSTR(HA_UNIQUE_ID)] = this->getObjectIdWithPrefix(F("pid"));
+    doc[FPSTR(HA_DEFAULT_ENTITY_ID)] = doc[FPSTR(HA_UNIQUE_ID)];
    doc[FPSTR(HA_ENTITY_CATEGORY)] = FPSTR(HA_ENTITY_CATEGORY_CONFIG);
    doc[FPSTR(HA_NAME)] = F("PID");
    doc[FPSTR(HA_ICON)] = F("mdi:chart-bar-stacked");
@@ -685,8 +659,8 @@ public:
    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("pid_p"));
-    doc[FPSTR(HA_DEFAULT_ENTITY_ID)] = this->getEntityIdWithPrefix(FPSTR(HA_ENTITY_NUMBER), F("pid_p"));
+    doc[FPSTR(HA_UNIQUE_ID)] = this->getObjectIdWithPrefix(F("pid_p"));
+    doc[FPSTR(HA_DEFAULT_ENTITY_ID)] = doc[FPSTR(HA_UNIQUE_ID)];
    doc[FPSTR(HA_ENTITY_CATEGORY)] = FPSTR(HA_ENTITY_CATEGORY_CONFIG);
    doc[FPSTR(HA_NAME)] = F("PID factor P");
    doc[FPSTR(HA_ICON)] = F("mdi:alpha-p-circle-outline");
@@ -708,8 +682,8 @@ public:
    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("pid_i"));
-    doc[FPSTR(HA_DEFAULT_ENTITY_ID)] = this->getEntityIdWithPrefix(FPSTR(HA_ENTITY_NUMBER), F("pid_i"));
+    doc[FPSTR(HA_UNIQUE_ID)] = this->getObjectIdWithPrefix(F("pid_i"));
+    doc[FPSTR(HA_DEFAULT_ENTITY_ID)] = doc[FPSTR(HA_UNIQUE_ID)];
    doc[FPSTR(HA_ENTITY_CATEGORY)] = FPSTR(HA_ENTITY_CATEGORY_CONFIG);
    doc[FPSTR(HA_NAME)] = F("PID factor I");
    doc[FPSTR(HA_ICON)] = F("mdi:alpha-i-circle-outline");
@@ -731,8 +705,8 @@ public:
    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("pid_d"));
-    doc[FPSTR(HA_DEFAULT_ENTITY_ID)] = this->getEntityIdWithPrefix(FPSTR(HA_ENTITY_NUMBER), F("pid_d"));
+    doc[FPSTR(HA_UNIQUE_ID)] = this->getObjectIdWithPrefix(F("pid_d"));
+    doc[FPSTR(HA_DEFAULT_ENTITY_ID)] = doc[FPSTR(HA_UNIQUE_ID)];
    doc[FPSTR(HA_ENTITY_CATEGORY)] = FPSTR(HA_ENTITY_CATEGORY_CONFIG);
    doc[FPSTR(HA_NAME)] = F("PID factor D");
    doc[FPSTR(HA_ICON)] = F("mdi:alpha-d-circle-outline");
@@ -754,8 +728,8 @@ public:
    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("pid_dt"));
-    doc[FPSTR(HA_DEFAULT_ENTITY_ID)] = this->getEntityIdWithPrefix(FPSTR(HA_ENTITY_NUMBER), F("pid_dt"));
+    doc[FPSTR(HA_UNIQUE_ID)] = this->getObjectIdWithPrefix(F("pid_dt"));
+    doc[FPSTR(HA_DEFAULT_ENTITY_ID)] = doc[FPSTR(HA_UNIQUE_ID)];
    doc[FPSTR(HA_ENTITY_CATEGORY)] = FPSTR(HA_ENTITY_CATEGORY_CONFIG);
    doc[FPSTR(HA_DEVICE_CLASS)] = F("duration");
    doc[FPSTR(HA_UNIT_OF_MEASUREMENT)] = F("s");
@@ -779,8 +753,8 @@ public:
    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("pid_min_temp"));
-    doc[FPSTR(HA_DEFAULT_ENTITY_ID)] = this->getEntityIdWithPrefix(FPSTR(HA_ENTITY_NUMBER), F("pid_min_temp"));
+    doc[FPSTR(HA_UNIQUE_ID)] = this->getObjectIdWithPrefix(F("pid_min_temp"));
+    doc[FPSTR(HA_DEFAULT_ENTITY_ID)] = doc[FPSTR(HA_UNIQUE_ID)];
    doc[FPSTR(HA_ENTITY_CATEGORY)] = FPSTR(HA_ENTITY_CATEGORY_CONFIG);
    doc[FPSTR(HA_DEVICE_CLASS)] = FPSTR(S_TEMPERATURE);

@@ -813,8 +787,8 @@ public:
    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("pid_max_temp"));
-    doc[FPSTR(HA_DEFAULT_ENTITY_ID)] = this->getEntityIdWithPrefix(FPSTR(HA_ENTITY_NUMBER), F("pid_max_temp"));
+    doc[FPSTR(HA_UNIQUE_ID)] = this->getObjectIdWithPrefix(F("pid_max_temp"));
+    doc[FPSTR(HA_DEFAULT_ENTITY_ID)] = doc[FPSTR(HA_UNIQUE_ID)];
    doc[FPSTR(HA_ENTITY_CATEGORY)] = FPSTR(HA_ENTITY_CATEGORY_CONFIG);
    doc[FPSTR(HA_DEVICE_CLASS)] = FPSTR(S_TEMPERATURE);

@@ -848,8 +822,8 @@ public:
    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("equitherm"));
-    doc[FPSTR(HA_DEFAULT_ENTITY_ID)] = this->getEntityIdWithPrefix(FPSTR(HA_ENTITY_SWITCH), F("equitherm"));
+    doc[FPSTR(HA_UNIQUE_ID)] = this->getObjectIdWithPrefix(F("equitherm"));
+    doc[FPSTR(HA_DEFAULT_ENTITY_ID)] = doc[FPSTR(HA_UNIQUE_ID)];
    doc[FPSTR(HA_ENTITY_CATEGORY)] = FPSTR(HA_ENTITY_CATEGORY_CONFIG);
    doc[FPSTR(HA_NAME)] = F("Equitherm");
    doc[FPSTR(HA_ICON)] = F("mdi:sun-snowflake-variant");
@@ -870,8 +844,8 @@ public:
    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("equitherm_slope"));
-    doc[FPSTR(HA_DEFAULT_ENTITY_ID)] = this->getEntityIdWithPrefix(FPSTR(HA_ENTITY_NUMBER), F("equitherm_slope"));
+    doc[FPSTR(HA_UNIQUE_ID)] = this->getObjectIdWithPrefix(F("equitherm_slope"));
+    doc[FPSTR(HA_DEFAULT_ENTITY_ID)] = doc[FPSTR(HA_UNIQUE_ID)];
    doc[FPSTR(HA_ENTITY_CATEGORY)] = FPSTR(HA_ENTITY_CATEGORY_CONFIG);
    doc[FPSTR(HA_NAME)] = F("Equitherm slope");
    doc[FPSTR(HA_ICON)] = F("mdi:slope-uphill");
@@ -893,8 +867,8 @@ public:
    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("equitherm_exponent"));
-    doc[FPSTR(HA_DEFAULT_ENTITY_ID)] = this->getEntityIdWithPrefix(FPSTR(HA_ENTITY_NUMBER), F("equitherm_exponent"));
+    doc[FPSTR(HA_UNIQUE_ID)] = this->getObjectIdWithPrefix(F("equitherm_exponent"));
+    doc[FPSTR(HA_DEFAULT_ENTITY_ID)] = doc[FPSTR(HA_UNIQUE_ID)];
    doc[FPSTR(HA_ENTITY_CATEGORY)] = FPSTR(HA_ENTITY_CATEGORY_CONFIG);
    doc[FPSTR(HA_NAME)] = F("Equitherm exponent");
    doc[FPSTR(HA_ICON)] = F("mdi:exponent");
@@ -916,8 +890,8 @@ public:
    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("equitherm_shift"));
-    doc[FPSTR(HA_DEFAULT_ENTITY_ID)] = this->getEntityIdWithPrefix(FPSTR(HA_ENTITY_NUMBER), F("equitherm_shift"));
+    doc[FPSTR(HA_UNIQUE_ID)] = this->getObjectIdWithPrefix(F("equitherm_shift"));
+    doc[FPSTR(HA_DEFAULT_ENTITY_ID)] = doc[FPSTR(HA_UNIQUE_ID)];
    doc[FPSTR(HA_ENTITY_CATEGORY)] = FPSTR(HA_ENTITY_CATEGORY_CONFIG);
    doc[FPSTR(HA_DEVICE_CLASS)] = FPSTR(S_TEMPERATURE);
    doc[FPSTR(HA_NAME)] = F("Equitherm shift");
@@ -943,8 +917,8 @@ public:
    doc[FPSTR(HA_AVAILABILITY)][1][FPSTR(HA_VALUE_TEMPLATE)] = F("{{ iif(value_json.pid.enabled, 'offline', 'online') }}");
    doc[FPSTR(HA_AVAILABILITY_MODE)] = F("all");
    doc[FPSTR(HA_ENABLED_BY_DEFAULT)] = enabledByDefault;
-    doc[FPSTR(HA_UNIQUE_ID)] = this->getUniqueIdWithPrefix(F("equitherm_target_diff_factor"));
-    doc[FPSTR(HA_DEFAULT_ENTITY_ID)] = this->getEntityIdWithPrefix(FPSTR(HA_ENTITY_NUMBER), F("equitherm_target_diff_factor"));
+    doc[FPSTR(HA_UNIQUE_ID)] = this->getObjectIdWithPrefix(F("equitherm_target_diff_factor"));
+    doc[FPSTR(HA_DEFAULT_ENTITY_ID)] = doc[FPSTR(HA_UNIQUE_ID)];
    doc[FPSTR(HA_ENTITY_CATEGORY)] = FPSTR(HA_ENTITY_CATEGORY_CONFIG);
    doc[FPSTR(HA_NAME)] = F("Equitherm target diff factor");
    doc[FPSTR(HA_ICON)] = F("mdi:chart-timeline-variant-shimmer");
@@ -966,8 +940,8 @@ public:
  bool publishStatusState(bool enabledByDefault = true) {
    JsonDocument doc;
    doc[FPSTR(HA_ENABLED_BY_DEFAULT)] = enabledByDefault;
-    doc[FPSTR(HA_UNIQUE_ID)] = this->getUniqueIdWithPrefix(F("status"));
-    doc[FPSTR(HA_DEFAULT_ENTITY_ID)] = this->getEntityIdWithPrefix(FPSTR(HA_ENTITY_BINARY_SENSOR), F("status"));
+    doc[FPSTR(HA_UNIQUE_ID)] = this->getObjectIdWithPrefix(F("status"));
+    doc[FPSTR(HA_DEFAULT_ENTITY_ID)] = doc[FPSTR(HA_UNIQUE_ID)];
    doc[FPSTR(HA_ENTITY_CATEGORY)] = FPSTR(HA_ENTITY_CATEGORY_DIAGNOSTIC);
    doc[FPSTR(HA_DEVICE_CLASS)] = F("problem");
    doc[FPSTR(HA_NAME)] = F("Status");
@@ -984,8 +958,8 @@ public:
    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("emergency"));
-    doc[FPSTR(HA_DEFAULT_ENTITY_ID)] = this->getEntityIdWithPrefix(FPSTR(HA_ENTITY_BINARY_SENSOR), F("emergency"));
+    doc[FPSTR(HA_UNIQUE_ID)] = this->getObjectIdWithPrefix(F("emergency"));
+    doc[FPSTR(HA_DEFAULT_ENTITY_ID)] = doc[FPSTR(HA_UNIQUE_ID)];
    doc[FPSTR(HA_ENTITY_CATEGORY)] = FPSTR(HA_ENTITY_CATEGORY_DIAGNOSTIC);
    doc[FPSTR(HA_DEVICE_CLASS)] = F("problem");
    doc[FPSTR(HA_NAME)] = F("Emergency");
@@ -1002,8 +976,8 @@ public:
    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("ot_status"));
-    doc[FPSTR(HA_DEFAULT_ENTITY_ID)] = this->getEntityIdWithPrefix(FPSTR(HA_ENTITY_BINARY_SENSOR), F("ot_status"));
+    doc[FPSTR(HA_UNIQUE_ID)] = this->getObjectIdWithPrefix(F("ot_status"));
+    doc[FPSTR(HA_DEFAULT_ENTITY_ID)] = doc[FPSTR(HA_UNIQUE_ID)];
    doc[FPSTR(HA_ENTITY_CATEGORY)] = FPSTR(HA_ENTITY_CATEGORY_DIAGNOSTIC);
    doc[FPSTR(HA_DEVICE_CLASS)] = F("connectivity");
    doc[FPSTR(HA_NAME)] = F("Opentherm status");
@@ -1023,8 +997,9 @@ public:
    doc[FPSTR(HA_AVAILABILITY)][1][FPSTR(HA_VALUE_TEMPLATE)] = JsonString(AVAILABILITY_OT_CONN, true);
    doc[FPSTR(HA_AVAILABILITY_MODE)] = F("all");
    doc[FPSTR(HA_ENABLED_BY_DEFAULT)] = enabledByDefault;
-    doc[FPSTR(HA_UNIQUE_ID)] = this->getUniqueIdWithPrefix(F("heating"));
-    doc[FPSTR(HA_DEFAULT_ENTITY_ID)] = this->getEntityIdWithPrefix(FPSTR(HA_ENTITY_BINARY_SENSOR), F("heating"));
+    doc[FPSTR(HA_UNIQUE_ID)] = this->getObjectIdWithPrefix(F("heating"));
+    doc[FPSTR(HA_DEFAULT_ENTITY_ID)] = doc[FPSTR(HA_UNIQUE_ID)];
+    //doc[FPSTR(HA_ENTITY_CATEGORY)] = FPSTR(HA_ENTITY_CATEGORY_DIAGNOSTIC);
    doc[FPSTR(HA_DEVICE_CLASS)] = F("running");
    doc[FPSTR(HA_NAME)] = F("Heating");
    doc[FPSTR(HA_ICON)] = F("mdi:radiator");
@@ -1043,8 +1018,9 @@ public:
    doc[FPSTR(HA_AVAILABILITY)][1][FPSTR(HA_VALUE_TEMPLATE)] = JsonString(AVAILABILITY_OT_CONN, true);
    doc[FPSTR(HA_AVAILABILITY_MODE)] = F("all");
    doc[FPSTR(HA_ENABLED_BY_DEFAULT)] = enabledByDefault;
-    doc[FPSTR(HA_UNIQUE_ID)] = this->getUniqueIdWithPrefix(F("dhw"));
-    doc[FPSTR(HA_DEFAULT_ENTITY_ID)] = this->getEntityIdWithPrefix(FPSTR(HA_ENTITY_BINARY_SENSOR), F("dhw"));
+    doc[FPSTR(HA_UNIQUE_ID)] = this->getObjectIdWithPrefix(F("dhw"));
+    doc[FPSTR(HA_DEFAULT_ENTITY_ID)] = doc[FPSTR(HA_UNIQUE_ID)];
+    //doc[FPSTR(HA_ENTITY_CATEGORY)] = FPSTR(HA_ENTITY_CATEGORY_DIAGNOSTIC);
    doc[FPSTR(HA_DEVICE_CLASS)] = F("running");
    doc[FPSTR(HA_NAME)] = F("DHW");
    doc[FPSTR(HA_ICON)] = F("mdi:faucet");
@@ -1063,8 +1039,9 @@ public:
    doc[FPSTR(HA_AVAILABILITY)][1][FPSTR(HA_VALUE_TEMPLATE)] = JsonString(AVAILABILITY_OT_CONN, true);
    doc[FPSTR(HA_AVAILABILITY_MODE)] = F("all");
    doc[FPSTR(HA_ENABLED_BY_DEFAULT)] = enabledByDefault;
-    doc[FPSTR(HA_UNIQUE_ID)] = this->getUniqueIdWithPrefix(F("flame"));
-    doc[FPSTR(HA_DEFAULT_ENTITY_ID)] = this->getEntityIdWithPrefix(FPSTR(HA_ENTITY_BINARY_SENSOR), F("flame"));
+    doc[FPSTR(HA_UNIQUE_ID)] = this->getObjectIdWithPrefix(F("flame"));
+    doc[FPSTR(HA_DEFAULT_ENTITY_ID)] = doc[FPSTR(HA_UNIQUE_ID)];
+    //doc[FPSTR(HA_ENTITY_CATEGORY)] = FPSTR(HA_ENTITY_CATEGORY_DIAGNOSTIC);
    doc[FPSTR(HA_DEVICE_CLASS)] = F("running");
    doc[FPSTR(HA_NAME)] = F("Flame");
    doc[FPSTR(HA_ICON)] = F("mdi:gas-burner");
@@ -1083,8 +1060,8 @@ public:
    doc[FPSTR(HA_AVAILABILITY)][1][FPSTR(HA_VALUE_TEMPLATE)] = JsonString(AVAILABILITY_OT_CONN, true);
    doc[FPSTR(HA_AVAILABILITY_MODE)] = F("all");
    doc[FPSTR(HA_ENABLED_BY_DEFAULT)] = enabledByDefault;
-    doc[FPSTR(HA_UNIQUE_ID)] = this->getUniqueIdWithPrefix(F("fault"));
-    doc[FPSTR(HA_DEFAULT_ENTITY_ID)] = this->getEntityIdWithPrefix(FPSTR(HA_ENTITY_BINARY_SENSOR), F("fault"));
+    doc[FPSTR(HA_UNIQUE_ID)] = this->getObjectIdWithPrefix(F("fault"));
+    doc[FPSTR(HA_DEFAULT_ENTITY_ID)] = doc[FPSTR(HA_UNIQUE_ID)];
    doc[FPSTR(HA_ENTITY_CATEGORY)] = FPSTR(HA_ENTITY_CATEGORY_DIAGNOSTIC);
    doc[FPSTR(HA_DEVICE_CLASS)] = F("problem");
    doc[FPSTR(HA_NAME)] = F("Fault");
@@ -1104,8 +1081,8 @@ public:
    doc[FPSTR(HA_AVAILABILITY)][1][FPSTR(HA_VALUE_TEMPLATE)] = JsonString(AVAILABILITY_OT_CONN, true);
    doc[FPSTR(HA_AVAILABILITY_MODE)] = F("all");
    doc[FPSTR(HA_ENABLED_BY_DEFAULT)] = enabledByDefault;
-    doc[FPSTR(HA_UNIQUE_ID)] = this->getUniqueIdWithPrefix(FPSTR(HA_ENTITY_CATEGORY_DIAGNOSTIC));
-    doc[FPSTR(HA_DEFAULT_ENTITY_ID)] = this->getEntityIdWithPrefix(FPSTR(HA_ENTITY_BINARY_SENSOR), FPSTR(HA_ENTITY_CATEGORY_DIAGNOSTIC));
+    doc[FPSTR(HA_UNIQUE_ID)] = this->getObjectIdWithPrefix(FPSTR(HA_ENTITY_CATEGORY_DIAGNOSTIC));
+    doc[FPSTR(HA_DEFAULT_ENTITY_ID)] = doc[FPSTR(HA_UNIQUE_ID)];
    doc[FPSTR(HA_ENTITY_CATEGORY)] = FPSTR(HA_ENTITY_CATEGORY_DIAGNOSTIC);
    doc[FPSTR(HA_DEVICE_CLASS)] = F("problem");
    doc[FPSTR(HA_NAME)] = F("Diagnostic");
@@ -1122,8 +1099,8 @@ public:
    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("ext_pump"));
-    doc[FPSTR(HA_DEFAULT_ENTITY_ID)] = this->getEntityIdWithPrefix(FPSTR(HA_ENTITY_BINARY_SENSOR), F("ext_pump"));
+    doc[FPSTR(HA_UNIQUE_ID)] = this->getObjectIdWithPrefix(F("ext_pump"));
+    doc[FPSTR(HA_DEFAULT_ENTITY_ID)] = doc[FPSTR(HA_UNIQUE_ID)];
    doc[FPSTR(HA_ENTITY_CATEGORY)] = FPSTR(HA_ENTITY_CATEGORY_DIAGNOSTIC);
    doc[FPSTR(HA_DEVICE_CLASS)] = F("running");
    doc[FPSTR(HA_NAME)] = F("External pump");
@@ -1143,8 +1120,8 @@ public:
    doc[FPSTR(HA_AVAILABILITY)][1][FPSTR(HA_VALUE_TEMPLATE)] = F("{{ iif(value_json.slave.connected and value_json.slave.fault.active, 'online', 'offline') }}");
    doc[FPSTR(HA_AVAILABILITY_MODE)] = F("all");
    doc[FPSTR(HA_ENABLED_BY_DEFAULT)] = enabledByDefault;
-    doc[FPSTR(HA_UNIQUE_ID)] = this->getUniqueIdWithPrefix(F("fault_code"));
-    doc[FPSTR(HA_DEFAULT_ENTITY_ID)] = this->getEntityIdWithPrefix(FPSTR(HA_ENTITY_SENSOR), F("fault_code"));
+    doc[FPSTR(HA_UNIQUE_ID)] = this->getObjectIdWithPrefix(F("fault_code"));
+    doc[FPSTR(HA_DEFAULT_ENTITY_ID)] = doc[FPSTR(HA_UNIQUE_ID)];
    doc[FPSTR(HA_ENTITY_CATEGORY)] = FPSTR(HA_ENTITY_CATEGORY_DIAGNOSTIC);
    doc[FPSTR(HA_NAME)] = F("Fault code");
    doc[FPSTR(HA_ICON)] = F("mdi:cog-box");
@@ -1163,8 +1140,8 @@ public:
    doc[FPSTR(HA_AVAILABILITY)][1][FPSTR(HA_VALUE_TEMPLATE)] = F("{{ iif(value_json.slave.connected and value_json.slave.fault.active or value_json.slave.diag.active, 'online', 'offline') }}");
    doc[FPSTR(HA_AVAILABILITY_MODE)] = F("all");
    doc[FPSTR(HA_ENABLED_BY_DEFAULT)] = enabledByDefault;
-    doc[FPSTR(HA_UNIQUE_ID)] = this->getUniqueIdWithPrefix(F("diagnostic_code"));
-    doc[FPSTR(HA_DEFAULT_ENTITY_ID)] = this->getEntityIdWithPrefix(FPSTR(HA_ENTITY_SENSOR), F("diagnostic_code"));
+    doc[FPSTR(HA_UNIQUE_ID)] = this->getObjectIdWithPrefix(F("diagnostic_code"));
+    doc[FPSTR(HA_DEFAULT_ENTITY_ID)] = doc[FPSTR(HA_UNIQUE_ID)];
    doc[FPSTR(HA_ENTITY_CATEGORY)] = FPSTR(HA_ENTITY_CATEGORY_DIAGNOSTIC);
    doc[FPSTR(HA_NAME)] = F("Diagnostic code");
    doc[FPSTR(HA_ICON)] = F("mdi:information-box");
@@ -1180,8 +1157,8 @@ public:
    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(FPSTR(S_RSSI));
-    doc[FPSTR(HA_DEFAULT_ENTITY_ID)] = this->getEntityIdWithPrefix(FPSTR(HA_ENTITY_SENSOR), FPSTR(S_RSSI));
+    doc[FPSTR(HA_UNIQUE_ID)] = this->getObjectIdWithPrefix(FPSTR(S_RSSI));
+    doc[FPSTR(HA_DEFAULT_ENTITY_ID)] = doc[FPSTR(HA_UNIQUE_ID)];
    doc[FPSTR(HA_ENTITY_CATEGORY)] = FPSTR(HA_ENTITY_CATEGORY_DIAGNOSTIC);
    doc[FPSTR(HA_DEVICE_CLASS)] = F("signal_strength");
    doc[FPSTR(HA_STATE_CLASS)] = FPSTR(HA_STATE_CLASS_MEASUREMENT);
@@ -1200,8 +1177,8 @@ public:
    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("uptime"));
-    doc[FPSTR(HA_DEFAULT_ENTITY_ID)] = this->getEntityIdWithPrefix(FPSTR(HA_ENTITY_SENSOR), F("uptime"));
+    doc[FPSTR(HA_UNIQUE_ID)] = this->getObjectIdWithPrefix(F("uptime"));
+    doc[FPSTR(HA_DEFAULT_ENTITY_ID)] = doc[FPSTR(HA_UNIQUE_ID)];
    doc[FPSTR(HA_ENTITY_CATEGORY)] = FPSTR(HA_ENTITY_CATEGORY_DIAGNOSTIC);
    doc[FPSTR(HA_DEVICE_CLASS)] = F("duration");
    doc[FPSTR(HA_STATE_CLASS)] = F("total_increasing");
@@ -1221,8 +1198,8 @@ public:
    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"));
-    doc[FPSTR(HA_DEFAULT_ENTITY_ID)] = this->getEntityIdWithPrefix(FPSTR(HA_ENTITY_CLIMATE), F("heating"));
+    doc[FPSTR(HA_UNIQUE_ID)] = this->getObjectIdWithPrefix(F("heating"));
+    doc[FPSTR(HA_DEFAULT_ENTITY_ID)] = doc[FPSTR(HA_UNIQUE_ID)];
    doc[FPSTR(HA_NAME)] = F("Heating");
    doc[FPSTR(HA_ICON)] = F("mdi:radiator");

@@ -1273,8 +1250,8 @@ public:
    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("dhw"));
-    doc[FPSTR(HA_DEFAULT_ENTITY_ID)] = this->getEntityIdWithPrefix(FPSTR(HA_ENTITY_CLIMATE), F("dhw"));
+    doc[FPSTR(HA_UNIQUE_ID)] = this->getObjectIdWithPrefix(F("dhw"));
+    doc[FPSTR(HA_DEFAULT_ENTITY_ID)] = doc[FPSTR(HA_UNIQUE_ID)];
    doc[FPSTR(HA_NAME)] = F("DHW");
    doc[FPSTR(HA_ICON)] = F("mdi:faucet");

@@ -1318,8 +1295,8 @@ public:
    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(FPSTR(S_RESTART));
-    doc[FPSTR(HA_DEFAULT_ENTITY_ID)] = this->getEntityIdWithPrefix(FPSTR(HA_ENTITY_BUTTON), FPSTR(S_RESTART));
+    doc[FPSTR(HA_UNIQUE_ID)] = this->getObjectIdWithPrefix(FPSTR(S_RESTART));
+    doc[FPSTR(HA_DEFAULT_ENTITY_ID)] = doc[FPSTR(HA_UNIQUE_ID)];
    doc[FPSTR(HA_ENTITY_CATEGORY)] = FPSTR(HA_ENTITY_CATEGORY_CONFIG);
    doc[FPSTR(HA_DEVICE_CLASS)] = FPSTR(S_RESTART);
    doc[FPSTR(HA_NAME)] = F("Restart");
@@ -1338,8 +1315,8 @@ public:
    doc[FPSTR(HA_AVAILABILITY)][1][FPSTR(HA_VALUE_TEMPLATE)] = F("{{ iif(value_json.slave.fault.active, 'online', 'offline') }}");
    doc[FPSTR(HA_AVAILABILITY_MODE)] = F("all");
    doc[FPSTR(HA_ENABLED_BY_DEFAULT)] = enabledByDefault;
-    doc[FPSTR(HA_UNIQUE_ID)] = this->getUniqueIdWithPrefix(F("reset_fault"));
-    doc[FPSTR(HA_DEFAULT_ENTITY_ID)] = this->getEntityIdWithPrefix(FPSTR(HA_ENTITY_BUTTON), F("reset_fault"));
+    doc[FPSTR(HA_UNIQUE_ID)] = this->getObjectIdWithPrefix(F("reset_fault"));
+    doc[FPSTR(HA_DEFAULT_ENTITY_ID)] = doc[FPSTR(HA_UNIQUE_ID)];
    doc[FPSTR(HA_ENTITY_CATEGORY)] = FPSTR(HA_ENTITY_CATEGORY_CONFIG);
    doc[FPSTR(HA_DEVICE_CLASS)] = FPSTR(S_RESTART);
    doc[FPSTR(HA_NAME)] = F("Reset fault");
@@ -1358,8 +1335,8 @@ public:
    doc[FPSTR(HA_AVAILABILITY)][1][FPSTR(HA_VALUE_TEMPLATE)] = F("{{ iif(value_json.slave.diag.active, 'online', 'offline') }}");
    doc[FPSTR(HA_AVAILABILITY_MODE)] = F("all");
    doc[FPSTR(HA_ENABLED_BY_DEFAULT)] = enabledByDefault;
-    doc[FPSTR(HA_UNIQUE_ID)] = this->getUniqueIdWithPrefix(F("reset_diagnostic"));
-    doc[FPSTR(HA_DEFAULT_ENTITY_ID)] = this->getEntityIdWithPrefix(FPSTR(HA_ENTITY_BUTTON), F("reset_diagnostic"));
+    doc[FPSTR(HA_UNIQUE_ID)] = this->getObjectIdWithPrefix(F("reset_diagnostic"));
+    doc[FPSTR(HA_DEFAULT_ENTITY_ID)] = doc[FPSTR(HA_UNIQUE_ID)];
    doc[FPSTR(HA_ENTITY_CATEGORY)] = FPSTR(HA_ENTITY_CATEGORY_CONFIG);
    doc[FPSTR(HA_DEVICE_CLASS)] = FPSTR(S_RESTART);
    doc[FPSTR(HA_NAME)] = F("Reset diagnostic");
--- 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/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
@@ -186,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;
@@ -220,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,
@@ -307,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();
@@ -680,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;
@@ -810,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
@@ -834,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
@@ -858,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
@@ -882,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
@@ -906,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
@@ -929,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
@@ -956,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
@@ -980,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
@@ -1004,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
@@ -1028,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
@@ -1052,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
@@ -1098,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
@@ -1204,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
      );
@@ -1221,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 {
@@ -1230,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 {
@@ -1254,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)) {
@@ -1282,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 {
@@ -1297,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 {
@@ -1306,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
@@ -1329,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
            );
          }
        }
@@ -1346,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 {
@@ -1356,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"));
+          }
        }
      }
    }
@@ -1387,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,
@@ -1424,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,
@@ -1518,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() {
@@ -1708,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,
@@ -1728,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,
@@ -2230,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,
@@ -2263,7 +2183,7 @@ protected:
      return false;
    }

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

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

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

-    const float value = CustomOpenTherm::getFloat(response);
+    float value = CustomOpenTherm::getFloat(response);
    if (value <= 0) {
      return false;
    }
@@ -2429,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;
    }
@@ -2453,7 +2373,7 @@ protected:
      return false;
    }

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

-    const float value = CustomOpenTherm::getFloat(response);
+    float value = CustomOpenTherm::getFloat(response);
    if (value < 0) {
      return false;
    }
--- 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) {
--- 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/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,17 +103,12 @@ 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;
@@ -389,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";
@@ -110,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";
@@ -142,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;
@@ -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>();

@@ -1714,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,
@@ -1739,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;

@@ -1932,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):
@@ -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;

--- 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 传感器",
@@ -357,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 模式系数"
      },

@@ -381,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时此参数无效"
        }
      },

@@ -458,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
@@ -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 sensor",
        "dallasTemp": "DALLAS sensor",
@@ -357,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."
      },

@@ -458,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",
@@ -357,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."
      },

@@ -383,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"
        }
      },
@@ -458,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",
@@ -329,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": {
@@ -350,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": {
@@ -424,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 датчик",
@@ -357,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": "Коэфф. турбо режима"
      },

@@ -458,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/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 />

@@ -692,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>
@@ -1122,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
@@ -1171,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, {
@@ -1212,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	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