refactor: always set temperature to ID 1

* added option to always send the current and target indoor temp, even if the current heating mode doesnt officially need it. This is a direct fix for WeHeat heatpumps which seem to require it.

* add option to AlwaysSendIndoorTemp and rename NativeHeatingControl to
NativeOTC.

Updated locals and settings page.

* change minor order

.github/workflows/pio-dependabot.yaml

@@ -1,22 +0,0 @@
-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 }}

lib/CustomOpenTherm/CustomOpenTherm.h

@@ -70,50 +70,89 @@ public:
     }
   }
 
-  bool sendBoilerReset() {
+  inline auto sendBoilerReset() {
-    unsigned int data = 1;
+    return this->sendRequestCode(1);
-    data <<= 8;
-    unsigned long response = this->sendRequest(buildRequest(
-      OpenThermMessageType::WRITE_DATA,
-      OpenThermMessageID::RemoteRequest,
-      data
-    ));
-
-    return isValidResponse(response) && isValidResponseId(response, OpenThermMessageID::RemoteRequest);
   }
 
-  bool sendServiceReset() {
+  inline auto sendServiceReset() {
-    unsigned int data = 10;
+    return this->sendRequestCode(10);
-    data <<= 8;
-    unsigned long response = this->sendRequest(buildRequest(
-      OpenThermMessageType::WRITE_DATA,
-      OpenThermMessageID::RemoteRequest,
-      data
-    ));
-
-    return isValidResponse(response) && isValidResponseId(response, OpenThermMessageID::RemoteRequest);
   }
 
-  bool sendWaterFilling() {
+  inline auto sendWaterFilling() {
-    unsigned int data = 2;
+    return this->sendRequestCode(2);
-    data <<= 8;
+  }
+
+  bool sendRequestCode(const uint8_t requestCode) {
     unsigned long response = this->sendRequest(buildRequest(
       OpenThermMessageType::WRITE_DATA,
       OpenThermMessageID::RemoteRequest,
-      data
+      static_cast<unsigned int>(requestCode) << 8
     ));
 
-    return isValidResponse(response) && isValidResponseId(response, OpenThermMessageID::RemoteRequest);
+    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;
+  }
+
+  bool getStr(OpenThermMessageID id, char* buffer, uint16_t length = 50) {
+    if (buffer == nullptr || length == 0) {
+      return false;
+    }
+
+    unsigned long response;
+    uint8_t index = 0;
+    uint8_t maxIndex = 255;
+
+    while (index <= maxIndex && index < length) {
+      response = this->sendRequest(buildRequest(
+        OpenThermMessageType::READ_DATA,
+        id,
+        static_cast<unsigned int>(index) << 8
+      ));
+
+      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;
   }
 
   static bool isCh2Active(unsigned long response) {
-      return response & 0x20;
+    return response & 0x20;
   }
 
   static bool isValidResponseId(unsigned long response, OpenThermMessageID id) {
-    uint8_t responseId = (response >> 16) & 0xFF;
+    const uint8_t responseId = (response >> 16) & 0xFF;
 
-    return (uint8_t)id == responseId;
+    return static_cast<uint8_t>(id) == responseId;
   }
 
   static uint8_t getResponseMessageTypeId(unsigned long response) {
@@ -124,10 +163,10 @@ public:
     uint8_t msgType = getResponseMessageTypeId(response);
 
     switch (msgType) {
-      case (uint8_t) OpenThermMessageType::READ_ACK:
+      case static_cast<uint8_t>(OpenThermMessageType::READ_ACK):
-      case (uint8_t) OpenThermMessageType::WRITE_ACK:
+      case static_cast<uint8_t>(OpenThermMessageType::WRITE_ACK):
-      case (uint8_t) OpenThermMessageType::DATA_INVALID:
+      case static_cast<uint8_t>(OpenThermMessageType::DATA_INVALID):
-      case (uint8_t) OpenThermMessageType::UNKNOWN_DATA_ID:
+      case static_cast<uint8_t>(OpenThermMessageType::UNKNOWN_DATA_ID):
         return CustomOpenTherm::messageTypeToString(
           static_cast<OpenThermMessageType>(msgType)
         );

lib/HomeAssistantHelper/HomeAssistantHelper.h

@@ -147,8 +147,19 @@ 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 getObjectIdWithPrefix(T value, char separator = '_') {
+  String getUniqueIdWithPrefix(T value, char separator = '_') {
     String topic = "";
     topic.concat(this->devicePrefix);
     topic.concat(separator);

lib/HomeAssistantHelper/strings.h

@@ -12,66 +12,67 @@ const char HA_ENTITY_SELECT[]                   PROGMEM = "select";
 const char HA_ENTITY_SENSOR[]                   PROGMEM = "sensor";
 const char HA_ENTITY_SWITCH[]                   PROGMEM = "switch";
 
-const char HA_DEFAULT_ENTITY_ID[]               PROGMEM = "def_ent_id";
+// https://www.home-assistant.io/integrations/mqtt/#supported-abbreviations-in-mqtt-discovery-messages
-const char HA_DEVICE[]                          PROGMEM = "device";
+const char HA_DEFAULT_ENTITY_ID[]               PROGMEM = "def_ent_id";               // "default_entity_id "
-const char HA_IDENTIFIERS[]                     PROGMEM = "identifiers";
+const char HA_DEVICE[]                          PROGMEM = "dev";                      // "device"
-const char HA_SW_VERSION[]                      PROGMEM = "sw_version";
+const char HA_IDENTIFIERS[]                     PROGMEM = "ids";                      // "identifiers"
-const char HA_MANUFACTURER[]                    PROGMEM = "manufacturer";
+const char HA_SW_VERSION[]                      PROGMEM = "sw";                       // "sw_version"
-const char HA_MODEL[]                           PROGMEM = "model";
+const char HA_MANUFACTURER[]                    PROGMEM = "mf";                       // "manufacturer"
+const char HA_MODEL[]                           PROGMEM = "mdl";                      // "model"
 const char HA_NAME[]                            PROGMEM = "name";
-const char HA_CONF_URL[]                        PROGMEM = "configuration_url";
+const char HA_CONF_URL[]                        PROGMEM = "cu";                       // "configuration_url"
-const char HA_COMMAND_TOPIC[]                   PROGMEM = "command_topic";
+const char HA_COMMAND_TOPIC[]                   PROGMEM = "cmd_t";                    // "command_topic"
-const char HA_COMMAND_TEMPLATE[]                PROGMEM = "command_template";
+const char HA_COMMAND_TEMPLATE[]                PROGMEM = "cmd_tpl";                  // "command_template"
-const char HA_ENABLED_BY_DEFAULT[]              PROGMEM = "enabled_by_default";
+const char HA_ENABLED_BY_DEFAULT[]              PROGMEM = "en";                       // "enabled_by_default"
-const char HA_UNIQUE_ID[]                       PROGMEM = "unique_id";
+const char HA_UNIQUE_ID[]                       PROGMEM = "uniq_id";                  // "unique_id"
-const char HA_ENTITY_CATEGORY[]                 PROGMEM = "entity_category";
+const char HA_ENTITY_CATEGORY[]                 PROGMEM = "ent_cat";                  // "entity_category"
 const char HA_ENTITY_CATEGORY_DIAGNOSTIC[]      PROGMEM = "diagnostic";
 const char HA_ENTITY_CATEGORY_CONFIG[]          PROGMEM = "config";
-const char HA_STATE_TOPIC[]                     PROGMEM = "state_topic";
+const char HA_STATE_TOPIC[]                     PROGMEM = "stat_t";                   // "state_topic"
-const char HA_VALUE_TEMPLATE[]                  PROGMEM = "value_template";
+const char HA_VALUE_TEMPLATE[]                  PROGMEM = "val_tpl";                  // "value_template"
-const char HA_OPTIONS[]                         PROGMEM = "options";
+const char HA_OPTIONS[]                         PROGMEM = "ops";                      // "options"
-const char HA_AVAILABILITY[]                    PROGMEM = "availability";
+const char HA_AVAILABILITY[]                    PROGMEM = "avty";                     // "availability"
-const char HA_AVAILABILITY_MODE[]               PROGMEM = "availability_mode";
+const char HA_AVAILABILITY_MODE[]               PROGMEM = "avty_mode";                // "availability_mode"
-const char HA_TOPIC[]                           PROGMEM = "topic";
+const char HA_TOPIC[]                           PROGMEM = "t";                        // "topic"
-const char HA_DEVICE_CLASS[]                    PROGMEM = "device_class";
+const char HA_DEVICE_CLASS[]                    PROGMEM = "dev_cla";                  // "device_class"
-const char HA_UNIT_OF_MEASUREMENT[]             PROGMEM = "unit_of_measurement";
+const char HA_UNIT_OF_MEASUREMENT[]             PROGMEM = "unit_of_meas";             // "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 = "icon";
+const char HA_ICON[]                            PROGMEM = "ic";                       // "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 = "state_on";
+const char HA_STATE_ON[]                        PROGMEM = "stat_on";                  // "state_on"
-const char HA_STATE_OFF[]                       PROGMEM = "state_off";
+const char HA_STATE_OFF[]                       PROGMEM = "stat_off";                 // "state_off"
-const char HA_PAYLOAD_ON[]                      PROGMEM = "payload_on";
+const char HA_PAYLOAD_ON[]                      PROGMEM = "pl_on";                    // "payload_on"
-const char HA_PAYLOAD_OFF[]                     PROGMEM = "payload_off";
+const char HA_PAYLOAD_OFF[]                     PROGMEM = "pl_off";                   // "payload_off"
-const char HA_STATE_CLASS[]                     PROGMEM = "state_class";
+const char HA_STATE_CLASS[]                     PROGMEM = "stat_cla";                 // "state_class"
 const char HA_STATE_CLASS_MEASUREMENT[]         PROGMEM = "measurement";
-const char HA_EXPIRE_AFTER[]                    PROGMEM = "expire_after";
+const char HA_EXPIRE_AFTER[]                    PROGMEM = "exp_aft";                  // "expire_after"
-const char HA_CURRENT_TEMPERATURE_TOPIC[]       PROGMEM = "current_temperature_topic";
+const char HA_CURRENT_TEMPERATURE_TOPIC[]       PROGMEM = "curr_temp_t";              // "current_temperature_topic"
-const char HA_CURRENT_TEMPERATURE_TEMPLATE[]    PROGMEM = "current_temperature_template";
+const char HA_CURRENT_TEMPERATURE_TEMPLATE[]    PROGMEM = "curr_temp_tpl";            // "current_temperature_template"
-const char HA_TEMPERATURE_COMMAND_TOPIC[]       PROGMEM = "temperature_command_topic";
+const char HA_TEMPERATURE_COMMAND_TOPIC[]       PROGMEM = "temp_cmd_t";               // "temperature_command_topic"
-const char HA_TEMPERATURE_COMMAND_TEMPLATE[]    PROGMEM = "temperature_command_template";
+const char HA_TEMPERATURE_COMMAND_TEMPLATE[]    PROGMEM = "temp_cmd_tpl";             // "temperature_command_template"
-const char HA_TEMPERATURE_STATE_TOPIC[]         PROGMEM = "temperature_state_topic";
+const char HA_TEMPERATURE_STATE_TOPIC[]         PROGMEM = "temp_stat_t";              // "temperature_state_topic"
-const char HA_TEMPERATURE_STATE_TEMPLATE[]      PROGMEM = "temperature_state_template";
+const char HA_TEMPERATURE_STATE_TEMPLATE[]      PROGMEM = "temp_stat_tpl";            // "temperature_state_template"
-const char HA_TEMPERATURE_UNIT[]                PROGMEM = "temperature_unit";
+const char HA_TEMPERATURE_UNIT[]                PROGMEM = "temp_unit";                // "temperature_unit"
-const char HA_MODE_COMMAND_TOPIC[]              PROGMEM = "mode_command_topic";
+const char HA_MODE_COMMAND_TOPIC[]              PROGMEM = "mode_cmd_t";               // "mode_command_topic"
-const char HA_MODE_COMMAND_TEMPLATE[]           PROGMEM = "mode_command_template";
+const char HA_MODE_COMMAND_TEMPLATE[]           PROGMEM = "mode_cmd_tpl";             // "mode_command_template"
-const char HA_MODE_STATE_TOPIC[]                PROGMEM = "mode_state_topic";
+const char HA_MODE_STATE_TOPIC[]                PROGMEM = "mode_stat_t";              // "mode_state_topic"
-const char HA_MODE_STATE_TEMPLATE[]             PROGMEM = "mode_state_template";
+const char HA_MODE_STATE_TEMPLATE[]             PROGMEM = "mode_stat_tpl";            // "mode_state_template"
 const char HA_MODES[]                           PROGMEM = "modes";
-const char HA_ACTION_TOPIC[]                    PROGMEM = "action_topic";
+const char HA_ACTION_TOPIC[]                    PROGMEM = "act_t";                    // "action_topic"
-const char HA_ACTION_TEMPLATE[]                 PROGMEM = "action_template";
+const char HA_ACTION_TEMPLATE[]                 PROGMEM = "act_tpl";                  // "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 = "preset_mode_command_topic";
+const char HA_PRESET_MODE_COMMAND_TOPIC[]       PROGMEM = "pr_mode_cmd_t";            // "preset_mode_command_topic"
-const char HA_PRESET_MODE_COMMAND_TEMPLATE[]    PROGMEM = "preset_mode_command_template";
+const char HA_PRESET_MODE_COMMAND_TEMPLATE[]    PROGMEM = "pr_mode_cmd_tpl";          // "preset_mode_command_template"
-const char HA_PRESET_MODE_STATE_TOPIC[]         PROGMEM = "preset_mode_state_topic";
+const char HA_PRESET_MODE_STATE_TOPIC[]         PROGMEM = "pr_mode_stat_t";           // "preset_mode_state_topic"
-const char HA_PRESET_MODE_VALUE_TEMPLATE[]      PROGMEM = "preset_mode_value_template";
+const char HA_PRESET_MODE_VALUE_TEMPLATE[]      PROGMEM = "pr_mode_val_tpl";          // "preset_mode_value_template"
-const char HA_PRESET_MODES[]                    PROGMEM = "preset_modes";
+const char HA_PRESET_MODES[]                    PROGMEM = "pr_modes";                 // "preset_modes"

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.32/platform-espressif32.zip
+platform = https://github.com/pioarduino/platform-espressif32/releases/download/55.03.34/platform-espressif32.zip
 platform_packages = ${env.platform_packages}
 board_build.partitions = esp32_partitions.csv
 lib_deps =
 	${env.lib_deps}
 	laxilef/ESP32Scheduler@^1.0.1
-nimble_lib = h2zero/NimBLE-Arduino@2.3.3
+nimble_lib = h2zero/NimBLE-Arduino@2.3.7
 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 CONFIG_BT_NIMBLE_EXT_ADV=1
+	-D MYNEWT_VAL_BLE_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 CONFIG_BT_NIMBLE_EXT_ADV=1
+	-D MYNEWT_VAL_BLE_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 CONFIG_BT_NIMBLE_EXT_ADV=1
+	-D MYNEWT_VAL_BLE_EXT_ADV=1
 	-D USE_BLE=1
 	-D DEFAULT_OT_IN_GPIO=3
 	-D DEFAULT_OT_OUT_GPIO=1

src/HaHelper.h

@@ -261,8 +261,13 @@ public:
     }
 
     // object id's
-    doc[FPSTR(HA_UNIQUE_ID)] = this->getObjectIdWithPrefix(objId.c_str());
+    doc[FPSTR(HA_UNIQUE_ID)] = this->getUniqueIdWithPrefix(objId.c_str());
-    doc[FPSTR(HA_DEFAULT_ENTITY_ID)] = doc[FPSTR(HA_UNIQUE_ID)];
+    doc[FPSTR(HA_DEFAULT_ENTITY_ID)] = this->getEntityIdWithPrefix(
+      sSensor.type == Sensors::Type::MANUAL 
+        ? FPSTR(HA_ENTITY_NUMBER) 
+        : FPSTR(HA_ENTITY_SENSOR),
+      objId.c_str()
+    );
 
     const String& configTopic = this->makeConfigTopic(
       sSensor.type == Sensors::Type::MANUAL ? FPSTR(HA_ENTITY_NUMBER) : FPSTR(HA_ENTITY_SENSOR),
@@ -323,8 +328,8 @@ public:
     String objId = Sensors::makeObjectIdWithSuffix(sSensor.name, F("connected"));
 
     // object id's
-    doc[FPSTR(HA_UNIQUE_ID)] = this->getObjectIdWithPrefix(objId.c_str());
+    doc[FPSTR(HA_UNIQUE_ID)] = this->getUniqueIdWithPrefix(objId.c_str());
-    doc[FPSTR(HA_DEFAULT_ENTITY_ID)] = doc[FPSTR(HA_UNIQUE_ID)];
+    doc[FPSTR(HA_DEFAULT_ENTITY_ID)] = this->getEntityIdWithPrefix(FPSTR(HA_ENTITY_BINARY_SENSOR), objId.c_str());
 
     // state topic
     doc[FPSTR(HA_STATE_TOPIC)] = this->getDeviceTopic(
@@ -370,8 +375,8 @@ public:
     String objId = Sensors::makeObjectIdWithSuffix(sSensor.name, F("signal_quality"));
 
     // object id's
-    doc[FPSTR(HA_UNIQUE_ID)] = this->getObjectIdWithPrefix(objId.c_str());
+    doc[FPSTR(HA_UNIQUE_ID)] = this->getUniqueIdWithPrefix(objId.c_str());
-    doc[FPSTR(HA_DEFAULT_ENTITY_ID)] = doc[FPSTR(HA_UNIQUE_ID)];
+    doc[FPSTR(HA_DEFAULT_ENTITY_ID)] = this->getEntityIdWithPrefix(FPSTR(HA_ENTITY_SENSOR), objId.c_str());
 
     // state topic
     doc[FPSTR(HA_STATE_TOPIC)] = this->getDeviceTopic(
@@ -407,7 +412,6 @@ 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()
@@ -421,8 +425,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->getObjectIdWithPrefix(F("heating_turbo"));
+    doc[FPSTR(HA_UNIQUE_ID)] = this->getUniqueIdWithPrefix(F("heating_turbo"));
-    doc[FPSTR(HA_DEFAULT_ENTITY_ID)] = doc[FPSTR(HA_UNIQUE_ID)];
+    doc[FPSTR(HA_DEFAULT_ENTITY_ID)] = this->getEntityIdWithPrefix(FPSTR(HA_ENTITY_SWITCH), F("heating_turbo"));
     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");
@@ -439,12 +443,34 @@ 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->getObjectIdWithPrefix(F("heating_hysteresis"));
+    doc[FPSTR(HA_UNIQUE_ID)] = this->getUniqueIdWithPrefix(F("heating_hysteresis"));
-    doc[FPSTR(HA_DEFAULT_ENTITY_ID)] = doc[FPSTR(HA_UNIQUE_ID)];
+    doc[FPSTR(HA_DEFAULT_ENTITY_ID)] = this->getEntityIdWithPrefix(FPSTR(HA_ENTITY_NUMBER), F("heating_hysteresis"));
     doc[FPSTR(HA_ENTITY_CATEGORY)] = FPSTR(HA_ENTITY_CATEGORY_CONFIG);
     doc[FPSTR(HA_DEVICE_CLASS)] = FPSTR(S_TEMPERATURE);
 
@@ -458,9 +484,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|float(0)|round(2) }}");
+    doc[FPSTR(HA_VALUE_TEMPLATE)] = F("{{ value_json.heating.hysteresis.value|float(0)|round(2) }}");
     doc[FPSTR(HA_COMMAND_TOPIC)] = this->setSettingsTopic.c_str();
-    doc[FPSTR(HA_COMMAND_TEMPLATE)] = F("{\"heating\": {\"hysteresis\" : {{ value }}}}");
+    doc[FPSTR(HA_COMMAND_TEMPLATE)] = F("{\"heating\": {\"hysteresis\" : {\"value\" : {{ value }}}}}");
     doc[FPSTR(HA_MIN)] = 0;
     doc[FPSTR(HA_MAX)] = 15;
     doc[FPSTR(HA_STEP)] = 0.01f;
@@ -475,8 +501,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->getObjectIdWithPrefix(F("heating_turbo_factor"));
+    doc[FPSTR(HA_UNIQUE_ID)] = this->getUniqueIdWithPrefix(F("heating_turbo_factor"));
-    doc[FPSTR(HA_DEFAULT_ENTITY_ID)] = doc[FPSTR(HA_UNIQUE_ID)];
+    doc[FPSTR(HA_DEFAULT_ENTITY_ID)] = this->getEntityIdWithPrefix(FPSTR(HA_ENTITY_NUMBER), F("heating_turbo_factor"));
     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");
@@ -499,8 +525,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->getObjectIdWithPrefix(F("heating_min_temp"));
+    doc[FPSTR(HA_UNIQUE_ID)] = this->getUniqueIdWithPrefix(F("heating_min_temp"));
-    doc[FPSTR(HA_DEFAULT_ENTITY_ID)] = doc[FPSTR(HA_UNIQUE_ID)];
+    doc[FPSTR(HA_DEFAULT_ENTITY_ID)] = this->getEntityIdWithPrefix(FPSTR(HA_ENTITY_NUMBER), F("heating_min_temp"));
     doc[FPSTR(HA_ENTITY_CATEGORY)] = FPSTR(HA_ENTITY_CATEGORY_CONFIG);
     doc[FPSTR(HA_DEVICE_CLASS)] = FPSTR(S_TEMPERATURE);
 
@@ -533,8 +559,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->getObjectIdWithPrefix(F("heating_max_temp"));
+    doc[FPSTR(HA_UNIQUE_ID)] = this->getUniqueIdWithPrefix(F("heating_max_temp"));
-    doc[FPSTR(HA_DEFAULT_ENTITY_ID)] = doc[FPSTR(HA_UNIQUE_ID)];
+    doc[FPSTR(HA_DEFAULT_ENTITY_ID)] = this->getEntityIdWithPrefix(FPSTR(HA_ENTITY_NUMBER), F("heating_max_temp"));
     doc[FPSTR(HA_ENTITY_CATEGORY)] = FPSTR(HA_ENTITY_CATEGORY_CONFIG);
     doc[FPSTR(HA_DEVICE_CLASS)] = FPSTR(S_TEMPERATURE);
 
@@ -568,8 +594,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->getObjectIdWithPrefix(F("dhw_min_temp"));
+    doc[FPSTR(HA_UNIQUE_ID)] = this->getUniqueIdWithPrefix(F("dhw_min_temp"));
-    doc[FPSTR(HA_DEFAULT_ENTITY_ID)] = doc[FPSTR(HA_UNIQUE_ID)];
+    doc[FPSTR(HA_DEFAULT_ENTITY_ID)] = this->getEntityIdWithPrefix(FPSTR(HA_ENTITY_NUMBER), F("dhw_min_temp"));
     doc[FPSTR(HA_ENTITY_CATEGORY)] = FPSTR(HA_ENTITY_CATEGORY_CONFIG);
     doc[FPSTR(HA_DEVICE_CLASS)] = FPSTR(S_TEMPERATURE);
 
@@ -602,8 +628,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->getObjectIdWithPrefix(F("dhw_max_temp"));
+    doc[FPSTR(HA_UNIQUE_ID)] = this->getUniqueIdWithPrefix(F("dhw_max_temp"));
-    doc[FPSTR(HA_DEFAULT_ENTITY_ID)] = doc[FPSTR(HA_UNIQUE_ID)];
+    doc[FPSTR(HA_DEFAULT_ENTITY_ID)] = this->getEntityIdWithPrefix(FPSTR(HA_ENTITY_NUMBER), F("dhw_max_temp"));
     doc[FPSTR(HA_ENTITY_CATEGORY)] = FPSTR(HA_ENTITY_CATEGORY_CONFIG);
     doc[FPSTR(HA_DEVICE_CLASS)] = FPSTR(S_TEMPERATURE);
 
@@ -637,8 +663,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->getObjectIdWithPrefix(F("pid"));
+    doc[FPSTR(HA_UNIQUE_ID)] = this->getUniqueIdWithPrefix(F("pid"));
-    doc[FPSTR(HA_DEFAULT_ENTITY_ID)] = doc[FPSTR(HA_UNIQUE_ID)];
+    doc[FPSTR(HA_DEFAULT_ENTITY_ID)] = this->getEntityIdWithPrefix(FPSTR(HA_ENTITY_SWITCH), F("pid"));
     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");
@@ -659,8 +685,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->getObjectIdWithPrefix(F("pid_p"));
+    doc[FPSTR(HA_UNIQUE_ID)] = this->getUniqueIdWithPrefix(F("pid_p"));
-    doc[FPSTR(HA_DEFAULT_ENTITY_ID)] = doc[FPSTR(HA_UNIQUE_ID)];
+    doc[FPSTR(HA_DEFAULT_ENTITY_ID)] = this->getEntityIdWithPrefix(FPSTR(HA_ENTITY_NUMBER), F("pid_p"));
     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");
@@ -682,8 +708,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->getObjectIdWithPrefix(F("pid_i"));
+    doc[FPSTR(HA_UNIQUE_ID)] = this->getUniqueIdWithPrefix(F("pid_i"));
-    doc[FPSTR(HA_DEFAULT_ENTITY_ID)] = doc[FPSTR(HA_UNIQUE_ID)];
+    doc[FPSTR(HA_DEFAULT_ENTITY_ID)] = this->getEntityIdWithPrefix(FPSTR(HA_ENTITY_NUMBER), F("pid_i"));
     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");
@@ -705,8 +731,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->getObjectIdWithPrefix(F("pid_d"));
+    doc[FPSTR(HA_UNIQUE_ID)] = this->getUniqueIdWithPrefix(F("pid_d"));
-    doc[FPSTR(HA_DEFAULT_ENTITY_ID)] = doc[FPSTR(HA_UNIQUE_ID)];
+    doc[FPSTR(HA_DEFAULT_ENTITY_ID)] = this->getEntityIdWithPrefix(FPSTR(HA_ENTITY_NUMBER), F("pid_d"));
     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");
@@ -728,8 +754,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->getObjectIdWithPrefix(F("pid_dt"));
+    doc[FPSTR(HA_UNIQUE_ID)] = this->getUniqueIdWithPrefix(F("pid_dt"));
-    doc[FPSTR(HA_DEFAULT_ENTITY_ID)] = doc[FPSTR(HA_UNIQUE_ID)];
+    doc[FPSTR(HA_DEFAULT_ENTITY_ID)] = this->getEntityIdWithPrefix(FPSTR(HA_ENTITY_NUMBER), F("pid_dt"));
     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");
@@ -753,8 +779,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->getObjectIdWithPrefix(F("pid_min_temp"));
+    doc[FPSTR(HA_UNIQUE_ID)] = this->getUniqueIdWithPrefix(F("pid_min_temp"));
-    doc[FPSTR(HA_DEFAULT_ENTITY_ID)] = doc[FPSTR(HA_UNIQUE_ID)];
+    doc[FPSTR(HA_DEFAULT_ENTITY_ID)] = this->getEntityIdWithPrefix(FPSTR(HA_ENTITY_NUMBER), F("pid_min_temp"));
     doc[FPSTR(HA_ENTITY_CATEGORY)] = FPSTR(HA_ENTITY_CATEGORY_CONFIG);
     doc[FPSTR(HA_DEVICE_CLASS)] = FPSTR(S_TEMPERATURE);
 
@@ -787,8 +813,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->getObjectIdWithPrefix(F("pid_max_temp"));
+    doc[FPSTR(HA_UNIQUE_ID)] = this->getUniqueIdWithPrefix(F("pid_max_temp"));
-    doc[FPSTR(HA_DEFAULT_ENTITY_ID)] = doc[FPSTR(HA_UNIQUE_ID)];
+    doc[FPSTR(HA_DEFAULT_ENTITY_ID)] = this->getEntityIdWithPrefix(FPSTR(HA_ENTITY_NUMBER), F("pid_max_temp"));
     doc[FPSTR(HA_ENTITY_CATEGORY)] = FPSTR(HA_ENTITY_CATEGORY_CONFIG);
     doc[FPSTR(HA_DEVICE_CLASS)] = FPSTR(S_TEMPERATURE);
 
@@ -822,8 +848,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->getObjectIdWithPrefix(F("equitherm"));
+    doc[FPSTR(HA_UNIQUE_ID)] = this->getUniqueIdWithPrefix(F("equitherm"));
-    doc[FPSTR(HA_DEFAULT_ENTITY_ID)] = doc[FPSTR(HA_UNIQUE_ID)];
+    doc[FPSTR(HA_DEFAULT_ENTITY_ID)] = this->getEntityIdWithPrefix(FPSTR(HA_ENTITY_SWITCH), F("equitherm"));
     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");
@@ -844,8 +870,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->getObjectIdWithPrefix(F("equitherm_slope"));
+    doc[FPSTR(HA_UNIQUE_ID)] = this->getUniqueIdWithPrefix(F("equitherm_slope"));
-    doc[FPSTR(HA_DEFAULT_ENTITY_ID)] = doc[FPSTR(HA_UNIQUE_ID)];
+    doc[FPSTR(HA_DEFAULT_ENTITY_ID)] = this->getEntityIdWithPrefix(FPSTR(HA_ENTITY_NUMBER), F("equitherm_slope"));
     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");
@@ -867,8 +893,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->getObjectIdWithPrefix(F("equitherm_exponent"));
+    doc[FPSTR(HA_UNIQUE_ID)] = this->getUniqueIdWithPrefix(F("equitherm_exponent"));
-    doc[FPSTR(HA_DEFAULT_ENTITY_ID)] = doc[FPSTR(HA_UNIQUE_ID)];
+    doc[FPSTR(HA_DEFAULT_ENTITY_ID)] = this->getEntityIdWithPrefix(FPSTR(HA_ENTITY_NUMBER), F("equitherm_exponent"));
     doc[FPSTR(HA_ENTITY_CATEGORY)] = FPSTR(HA_ENTITY_CATEGORY_CONFIG);
     doc[FPSTR(HA_NAME)] = F("Equitherm exponent");
     doc[FPSTR(HA_ICON)] = F("mdi:exponent");
@@ -890,8 +916,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->getObjectIdWithPrefix(F("equitherm_shift"));
+    doc[FPSTR(HA_UNIQUE_ID)] = this->getUniqueIdWithPrefix(F("equitherm_shift"));
-    doc[FPSTR(HA_DEFAULT_ENTITY_ID)] = doc[FPSTR(HA_UNIQUE_ID)];
+    doc[FPSTR(HA_DEFAULT_ENTITY_ID)] = this->getEntityIdWithPrefix(FPSTR(HA_ENTITY_NUMBER), F("equitherm_shift"));
     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");
@@ -917,8 +943,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->getObjectIdWithPrefix(F("equitherm_target_diff_factor"));
+    doc[FPSTR(HA_UNIQUE_ID)] = this->getUniqueIdWithPrefix(F("equitherm_target_diff_factor"));
-    doc[FPSTR(HA_DEFAULT_ENTITY_ID)] = doc[FPSTR(HA_UNIQUE_ID)];
+    doc[FPSTR(HA_DEFAULT_ENTITY_ID)] = this->getEntityIdWithPrefix(FPSTR(HA_ENTITY_NUMBER), F("equitherm_target_diff_factor"));
     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");
@@ -940,8 +966,8 @@ public:
   bool publishStatusState(bool enabledByDefault = true) {
     JsonDocument doc;
     doc[FPSTR(HA_ENABLED_BY_DEFAULT)] = enabledByDefault;
-    doc[FPSTR(HA_UNIQUE_ID)] = this->getObjectIdWithPrefix(F("status"));
+    doc[FPSTR(HA_UNIQUE_ID)] = this->getUniqueIdWithPrefix(F("status"));
-    doc[FPSTR(HA_DEFAULT_ENTITY_ID)] = doc[FPSTR(HA_UNIQUE_ID)];
+    doc[FPSTR(HA_DEFAULT_ENTITY_ID)] = this->getEntityIdWithPrefix(FPSTR(HA_ENTITY_BINARY_SENSOR), F("status"));
     doc[FPSTR(HA_ENTITY_CATEGORY)] = FPSTR(HA_ENTITY_CATEGORY_DIAGNOSTIC);
     doc[FPSTR(HA_DEVICE_CLASS)] = F("problem");
     doc[FPSTR(HA_NAME)] = F("Status");
@@ -958,8 +984,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->getObjectIdWithPrefix(F("emergency"));
+    doc[FPSTR(HA_UNIQUE_ID)] = this->getUniqueIdWithPrefix(F("emergency"));
-    doc[FPSTR(HA_DEFAULT_ENTITY_ID)] = doc[FPSTR(HA_UNIQUE_ID)];
+    doc[FPSTR(HA_DEFAULT_ENTITY_ID)] = this->getEntityIdWithPrefix(FPSTR(HA_ENTITY_BINARY_SENSOR), F("emergency"));
     doc[FPSTR(HA_ENTITY_CATEGORY)] = FPSTR(HA_ENTITY_CATEGORY_DIAGNOSTIC);
     doc[FPSTR(HA_DEVICE_CLASS)] = F("problem");
     doc[FPSTR(HA_NAME)] = F("Emergency");
@@ -976,8 +1002,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->getObjectIdWithPrefix(F("ot_status"));
+    doc[FPSTR(HA_UNIQUE_ID)] = this->getUniqueIdWithPrefix(F("ot_status"));
-    doc[FPSTR(HA_DEFAULT_ENTITY_ID)] = doc[FPSTR(HA_UNIQUE_ID)];
+    doc[FPSTR(HA_DEFAULT_ENTITY_ID)] = this->getEntityIdWithPrefix(FPSTR(HA_ENTITY_BINARY_SENSOR), F("ot_status"));
     doc[FPSTR(HA_ENTITY_CATEGORY)] = FPSTR(HA_ENTITY_CATEGORY_DIAGNOSTIC);
     doc[FPSTR(HA_DEVICE_CLASS)] = F("connectivity");
     doc[FPSTR(HA_NAME)] = F("Opentherm status");
@@ -997,9 +1023,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->getObjectIdWithPrefix(F("heating"));
+    doc[FPSTR(HA_UNIQUE_ID)] = this->getUniqueIdWithPrefix(F("heating"));
-    doc[FPSTR(HA_DEFAULT_ENTITY_ID)] = doc[FPSTR(HA_UNIQUE_ID)];
+    doc[FPSTR(HA_DEFAULT_ENTITY_ID)] = this->getEntityIdWithPrefix(FPSTR(HA_ENTITY_BINARY_SENSOR), F("heating"));
-    //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");
@@ -1018,9 +1043,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->getObjectIdWithPrefix(F("dhw"));
+    doc[FPSTR(HA_UNIQUE_ID)] = this->getUniqueIdWithPrefix(F("dhw"));
-    doc[FPSTR(HA_DEFAULT_ENTITY_ID)] = doc[FPSTR(HA_UNIQUE_ID)];
+    doc[FPSTR(HA_DEFAULT_ENTITY_ID)] = this->getEntityIdWithPrefix(FPSTR(HA_ENTITY_BINARY_SENSOR), F("dhw"));
-    //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");
@@ -1039,9 +1063,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->getObjectIdWithPrefix(F("flame"));
+    doc[FPSTR(HA_UNIQUE_ID)] = this->getUniqueIdWithPrefix(F("flame"));
-    doc[FPSTR(HA_DEFAULT_ENTITY_ID)] = doc[FPSTR(HA_UNIQUE_ID)];
+    doc[FPSTR(HA_DEFAULT_ENTITY_ID)] = this->getEntityIdWithPrefix(FPSTR(HA_ENTITY_BINARY_SENSOR), F("flame"));
-    //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");
@@ -1060,8 +1083,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->getObjectIdWithPrefix(F("fault"));
+    doc[FPSTR(HA_UNIQUE_ID)] = this->getUniqueIdWithPrefix(F("fault"));
-    doc[FPSTR(HA_DEFAULT_ENTITY_ID)] = doc[FPSTR(HA_UNIQUE_ID)];
+    doc[FPSTR(HA_DEFAULT_ENTITY_ID)] = this->getEntityIdWithPrefix(FPSTR(HA_ENTITY_BINARY_SENSOR), F("fault"));
     doc[FPSTR(HA_ENTITY_CATEGORY)] = FPSTR(HA_ENTITY_CATEGORY_DIAGNOSTIC);
     doc[FPSTR(HA_DEVICE_CLASS)] = F("problem");
     doc[FPSTR(HA_NAME)] = F("Fault");
@@ -1081,8 +1104,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->getObjectIdWithPrefix(FPSTR(HA_ENTITY_CATEGORY_DIAGNOSTIC));
+    doc[FPSTR(HA_UNIQUE_ID)] = this->getUniqueIdWithPrefix(FPSTR(HA_ENTITY_CATEGORY_DIAGNOSTIC));
-    doc[FPSTR(HA_DEFAULT_ENTITY_ID)] = doc[FPSTR(HA_UNIQUE_ID)];
+    doc[FPSTR(HA_DEFAULT_ENTITY_ID)] = this->getEntityIdWithPrefix(FPSTR(HA_ENTITY_BINARY_SENSOR), FPSTR(HA_ENTITY_CATEGORY_DIAGNOSTIC));
     doc[FPSTR(HA_ENTITY_CATEGORY)] = FPSTR(HA_ENTITY_CATEGORY_DIAGNOSTIC);
     doc[FPSTR(HA_DEVICE_CLASS)] = F("problem");
     doc[FPSTR(HA_NAME)] = F("Diagnostic");
@@ -1099,8 +1122,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->getObjectIdWithPrefix(F("ext_pump"));
+    doc[FPSTR(HA_UNIQUE_ID)] = this->getUniqueIdWithPrefix(F("ext_pump"));
-    doc[FPSTR(HA_DEFAULT_ENTITY_ID)] = doc[FPSTR(HA_UNIQUE_ID)];
+    doc[FPSTR(HA_DEFAULT_ENTITY_ID)] = this->getEntityIdWithPrefix(FPSTR(HA_ENTITY_BINARY_SENSOR), F("ext_pump"));
     doc[FPSTR(HA_ENTITY_CATEGORY)] = FPSTR(HA_ENTITY_CATEGORY_DIAGNOSTIC);
     doc[FPSTR(HA_DEVICE_CLASS)] = F("running");
     doc[FPSTR(HA_NAME)] = F("External pump");
@@ -1120,8 +1143,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->getObjectIdWithPrefix(F("fault_code"));
+    doc[FPSTR(HA_UNIQUE_ID)] = this->getUniqueIdWithPrefix(F("fault_code"));
-    doc[FPSTR(HA_DEFAULT_ENTITY_ID)] = doc[FPSTR(HA_UNIQUE_ID)];
+    doc[FPSTR(HA_DEFAULT_ENTITY_ID)] = this->getEntityIdWithPrefix(FPSTR(HA_ENTITY_SENSOR), F("fault_code"));
     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");
@@ -1140,8 +1163,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->getObjectIdWithPrefix(F("diagnostic_code"));
+    doc[FPSTR(HA_UNIQUE_ID)] = this->getUniqueIdWithPrefix(F("diagnostic_code"));
-    doc[FPSTR(HA_DEFAULT_ENTITY_ID)] = doc[FPSTR(HA_UNIQUE_ID)];
+    doc[FPSTR(HA_DEFAULT_ENTITY_ID)] = this->getEntityIdWithPrefix(FPSTR(HA_ENTITY_SENSOR), F("diagnostic_code"));
     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");
@@ -1157,8 +1180,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->getObjectIdWithPrefix(FPSTR(S_RSSI));
+    doc[FPSTR(HA_UNIQUE_ID)] = this->getUniqueIdWithPrefix(FPSTR(S_RSSI));
-    doc[FPSTR(HA_DEFAULT_ENTITY_ID)] = doc[FPSTR(HA_UNIQUE_ID)];
+    doc[FPSTR(HA_DEFAULT_ENTITY_ID)] = this->getEntityIdWithPrefix(FPSTR(HA_ENTITY_SENSOR), FPSTR(S_RSSI));
     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);
@@ -1177,8 +1200,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->getObjectIdWithPrefix(F("uptime"));
+    doc[FPSTR(HA_UNIQUE_ID)] = this->getUniqueIdWithPrefix(F("uptime"));
-    doc[FPSTR(HA_DEFAULT_ENTITY_ID)] = doc[FPSTR(HA_UNIQUE_ID)];
+    doc[FPSTR(HA_DEFAULT_ENTITY_ID)] = this->getEntityIdWithPrefix(FPSTR(HA_ENTITY_SENSOR), F("uptime"));
     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");
@@ -1198,8 +1221,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->getObjectIdWithPrefix(F("heating"));
+    doc[FPSTR(HA_UNIQUE_ID)] = this->getUniqueIdWithPrefix(F("heating"));
-    doc[FPSTR(HA_DEFAULT_ENTITY_ID)] = doc[FPSTR(HA_UNIQUE_ID)];
+    doc[FPSTR(HA_DEFAULT_ENTITY_ID)] = this->getEntityIdWithPrefix(FPSTR(HA_ENTITY_CLIMATE), F("heating"));
     doc[FPSTR(HA_NAME)] = F("Heating");
     doc[FPSTR(HA_ICON)] = F("mdi:radiator");
 
@@ -1250,8 +1273,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->getObjectIdWithPrefix(F("dhw"));
+    doc[FPSTR(HA_UNIQUE_ID)] = this->getUniqueIdWithPrefix(F("dhw"));
-    doc[FPSTR(HA_DEFAULT_ENTITY_ID)] = doc[FPSTR(HA_UNIQUE_ID)];
+    doc[FPSTR(HA_DEFAULT_ENTITY_ID)] = this->getEntityIdWithPrefix(FPSTR(HA_ENTITY_CLIMATE), F("dhw"));
     doc[FPSTR(HA_NAME)] = F("DHW");
     doc[FPSTR(HA_ICON)] = F("mdi:faucet");
 
@@ -1295,8 +1318,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->getObjectIdWithPrefix(FPSTR(S_RESTART));
+    doc[FPSTR(HA_UNIQUE_ID)] = this->getUniqueIdWithPrefix(FPSTR(S_RESTART));
-    doc[FPSTR(HA_DEFAULT_ENTITY_ID)] = doc[FPSTR(HA_UNIQUE_ID)];
+    doc[FPSTR(HA_DEFAULT_ENTITY_ID)] = this->getEntityIdWithPrefix(FPSTR(HA_ENTITY_BUTTON), FPSTR(S_RESTART));
     doc[FPSTR(HA_ENTITY_CATEGORY)] = FPSTR(HA_ENTITY_CATEGORY_CONFIG);
     doc[FPSTR(HA_DEVICE_CLASS)] = FPSTR(S_RESTART);
     doc[FPSTR(HA_NAME)] = F("Restart");
@@ -1315,8 +1338,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->getObjectIdWithPrefix(F("reset_fault"));
+    doc[FPSTR(HA_UNIQUE_ID)] = this->getUniqueIdWithPrefix(F("reset_fault"));
-    doc[FPSTR(HA_DEFAULT_ENTITY_ID)] = doc[FPSTR(HA_UNIQUE_ID)];
+    doc[FPSTR(HA_DEFAULT_ENTITY_ID)] = this->getEntityIdWithPrefix(FPSTR(HA_ENTITY_BUTTON), F("reset_fault"));
     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");
@@ -1335,8 +1358,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->getObjectIdWithPrefix(F("reset_diagnostic"));
+    doc[FPSTR(HA_UNIQUE_ID)] = this->getUniqueIdWithPrefix(F("reset_diagnostic"));
-    doc[FPSTR(HA_DEFAULT_ENTITY_ID)] = doc[FPSTR(HA_UNIQUE_ID)];
+    doc[FPSTR(HA_DEFAULT_ENTITY_ID)] = this->getEntityIdWithPrefix(FPSTR(HA_ENTITY_BUTTON), F("reset_diagnostic"));
     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");

src/MainTask.h

@@ -319,7 +319,7 @@ protected:
         emergencyFlags |= 0b00000010;
       }
       
-      if (settings.opentherm.options.nativeHeatingControl) {
+      if (settings.opentherm.options.nativeOTC) {
         emergencyFlags |= 0b00000100;
       }
     }

src/MqttTask.h

@@ -486,6 +486,7 @@ 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);

src/OpenThermTask.h

@@ -186,7 +186,9 @@ protected:
       || (settings.opentherm.options.dhwToCh2 && settings.opentherm.options.dhwSupport && settings.dhw.enabled);
 
     if (settings.opentherm.options.heatingToCh2) {
-      vars.master.ch2.targetTemp = vars.master.heating.setpointTemp;
+      vars.master.ch2.targetTemp = !settings.opentherm.options.nativeOTC
+        ? vars.master.heating.setpointTemp
+        : vars.master.heating.targetTemp;
 
     } else if (settings.opentherm.options.dhwToCh2) {
       vars.master.ch2.targetTemp = vars.master.dhw.targetTemp;
@@ -218,7 +220,7 @@ protected:
       vars.master.heating.enabled,
       vars.master.dhw.enabled,
       settings.opentherm.options.coolingSupport,
-      settings.opentherm.options.nativeHeatingControl,
+      settings.opentherm.options.nativeOTC,
       vars.master.ch2.enabled,
       summerWinterMode,
       dhwBlocking,
@@ -305,6 +307,7 @@ 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();
@@ -677,6 +680,21 @@ 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;
@@ -792,7 +810,7 @@ protected:
       bool result = this->updateDhwTemp();
 
       if (result) {
-        float convertedDhwTemp = convertTemp(
+        const float convertedDhwTemp = convertTemp(
           vars.slave.dhw.currentTemp,
           settings.opentherm.unitSystem,
           settings.system.unitSystem
@@ -816,7 +834,7 @@ protected:
     // Update DHW temp 2
     if (settings.opentherm.options.dhwSupport && Sensors::getAmountByType(Sensors::Type::OT_DHW_TEMP2, true)) {
       if (this->updateDhwTemp2()) {
-        float convertedDhwTemp2 = convertTemp(
+        const float convertedDhwTemp2 = convertTemp(
           vars.slave.dhw.currentTemp2,
           settings.opentherm.unitSystem,
           settings.system.unitSystem
@@ -840,7 +858,7 @@ protected:
     // Update DHW flow rate
     if (settings.opentherm.options.dhwSupport && Sensors::getAmountByType(Sensors::Type::OT_DHW_FLOW_RATE, true)) {
       if (this->updateDhwFlowRate()) {
-        float convertedDhwFlowRate = convertVolume(
+        const float convertedDhwFlowRate = convertVolume(
           vars.slave.dhw.flowRate,
           settings.opentherm.unitSystem,
           settings.system.unitSystem
@@ -864,7 +882,7 @@ protected:
     // Update heating temp
     if (Sensors::getAmountByType(Sensors::Type::OT_HEATING_TEMP, true)) {
       if (this->updateHeatingTemp()) {
-        float convertedHeatingTemp = convertTemp(
+        const float convertedHeatingTemp = convertTemp(
           vars.slave.heating.currentTemp,
           settings.opentherm.unitSystem,
           settings.system.unitSystem
@@ -888,7 +906,7 @@ protected:
     // Update heating return temp
     if (Sensors::getAmountByType(Sensors::Type::OT_HEATING_RETURN_TEMP, true)) {
       if (this->updateHeatingReturnTemp()) {
-        float convertedHeatingReturnTemp = convertTemp(
+        const float convertedHeatingReturnTemp = convertTemp(
           vars.slave.heating.returnTemp,
           settings.opentherm.unitSystem,
           settings.system.unitSystem
@@ -911,9 +929,9 @@ protected:
 
     // Update CH2 temp
     if (Sensors::getAmountByType(Sensors::Type::OT_CH2_TEMP, true)) {
-      if (vars.master.ch2.enabled && !settings.opentherm.options.nativeHeatingControl) {
+      if (vars.master.ch2.enabled && !settings.opentherm.options.nativeOTC) {
         if (this->updateCh2Temp()) {
-          float convertedCh2Temp = convertTemp(
+          const float convertedCh2Temp = convertTemp(
             vars.slave.ch2.currentTemp,
             settings.opentherm.unitSystem,
             settings.system.unitSystem
@@ -938,7 +956,7 @@ protected:
     // Update exhaust temp
     if (Sensors::getAmountByType(Sensors::Type::OT_EXHAUST_TEMP, true)) {
       if (this->updateExhaustTemp()) {
-        float convertedExhaustTemp = convertTemp(
+        const float convertedExhaustTemp = convertTemp(
           vars.slave.exhaust.temp,
           settings.opentherm.unitSystem,
           settings.system.unitSystem
@@ -962,7 +980,7 @@ protected:
     // Update heat exchanger temp
     if (Sensors::getAmountByType(Sensors::Type::OT_HEAT_EXCHANGER_TEMP, true)) {
       if (this->updateHeatExchangerTemp()) {
-        float convertedHeatExchTemp = convertTemp(
+        const float convertedHeatExchTemp = convertTemp(
           vars.slave.heatExchangerTemp,
           settings.opentherm.unitSystem,
           settings.system.unitSystem
@@ -986,7 +1004,7 @@ protected:
     // Update outdoor temp
     if (Sensors::getAmountByType(Sensors::Type::OT_OUTDOOR_TEMP, true)) {
       if (this->updateOutdoorTemp()) {
-        float convertedOutdoorTemp = convertTemp(
+        const float convertedOutdoorTemp = convertTemp(
           vars.slave.heating.outdoorTemp,
           settings.opentherm.unitSystem,
           settings.system.unitSystem
@@ -1010,7 +1028,7 @@ protected:
     // Update solar storage temp
     if (Sensors::getAmountByType(Sensors::Type::OT_SOLAR_STORAGE_TEMP, true)) {
       if (this->updateSolarStorageTemp()) {
-        float convertedSolarStorageTemp = convertTemp(
+        const float convertedSolarStorageTemp = convertTemp(
           vars.slave.solar.storage,
           settings.opentherm.unitSystem,
           settings.system.unitSystem
@@ -1034,7 +1052,7 @@ protected:
     // Update solar collector temp
     if (Sensors::getAmountByType(Sensors::Type::OT_SOLAR_COLLECTOR_TEMP, true)) {
       if (this->updateSolarCollectorTemp()) {
-        float convertedSolarCollectorTemp = convertTemp(
+        const float convertedSolarCollectorTemp = convertTemp(
           vars.slave.solar.collector,
           settings.opentherm.unitSystem,
           settings.system.unitSystem
@@ -1080,7 +1098,7 @@ protected:
     // Update pressure
     if (Sensors::getAmountByType(Sensors::Type::OT_PRESSURE, true)) {
       if (this->updatePressure()) {
-        float convertedPressure = convertPressure(
+        const float convertedPressure = convertPressure(
           vars.slave.pressure,
           settings.opentherm.unitSystem,
           settings.system.unitSystem
@@ -1186,9 +1204,12 @@ protected:
 
     // Update DHW temp
     if (vars.master.dhw.enabled) {
+      // Target dhw temp
+      const float& targetTemp = vars.master.dhw.targetTemp;
+
       // Converted target dhw temp
-      float convertedTemp = convertTemp(
+      const float convertedTemp = convertTemp(
-        vars.master.dhw.targetTemp,
+        targetTemp,
         settings.system.unitSystem,
         settings.opentherm.unitSystem
       );
@@ -1200,7 +1221,7 @@ protected:
 
           Log.sinfoln(
             FPSTR(L_OT_DHW), F("Set temp: %.2f (converted: %.2f, response: %.2f)"),
-            vars.master.dhw.targetTemp, convertedTemp, vars.slave.dhw.targetTemp
+            targetTemp, convertedTemp, vars.slave.dhw.targetTemp
           );
 
         } else {
@@ -1209,16 +1230,19 @@ protected:
       }
     }
 
-    // Native heating control
+    // Send indoor temp if AlwaysSendIndoorTemp option is enabled.
-    if (settings.opentherm.options.nativeHeatingControl) {
+    if (settings.opentherm.options.nativeOTC || settings.opentherm.options.alwaysSendIndoorTemp) {
+      // Current indoor temp
+      const float& indoorTemp = vars.master.heating.indoorTemp;
+
       // Converted current indoor temp
-      float convertedTemp = convertTemp(vars.master.heating.indoorTemp, settings.system.unitSystem, settings.opentherm.unitSystem);
+      const float convertedTemp = convertTemp(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)"),
-          vars.master.heating.indoorTemp, convertedTemp, vars.slave.heating.indoorTemp
+          indoorTemp, convertedTemp, vars.slave.heating.indoorTemp
         );
         
       } else {
@@ -1230,17 +1254,26 @@ protected:
         if (this->setRoomTempCh2(convertedTemp)) {
           Log.sinfoln(
             FPSTR(L_OT_HEATING), F("Set current CH2 indoor temp: %.2f (converted: %.2f, response: %.2f)"),
-            vars.master.heating.indoorTemp, convertedTemp, vars.slave.ch2.indoorTemp
+            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
-      convertedTemp = convertTemp(vars.master.heating.targetTemp, settings.system.unitSystem, settings.opentherm.unitSystem);
+      const float convertedTemp = convertTemp(
+        targetTemp,
+        settings.system.unitSystem,
+        settings.opentherm.unitSystem
+      );
 
       // Set target indoor temp
       if (this->needSetHeatingTemp(convertedTemp)) {
@@ -1249,7 +1282,7 @@ protected:
 
           Log.sinfoln(
             FPSTR(L_OT_HEATING), F("Set target indoor temp: %.2f (converted: %.2f, response: %.2f)"),
-            vars.master.heating.targetTemp, convertedTemp, vars.slave.heating.targetTemp
+            targetTemp, convertedTemp, vars.slave.heating.targetTemp
           );
 
         } else {
@@ -1264,7 +1297,7 @@ protected:
 
           Log.sinfoln(
             FPSTR(L_OT_HEATING), F("Set target CH2 indoor temp: %.2f (converted: %.2f, response: %.2f)"),
-            vars.master.heating.targetTemp, convertedTemp, vars.slave.ch2.targetTemp
+            targetTemp, convertedTemp, vars.slave.ch2.targetTemp
           );
 
         } else {
@@ -1273,10 +1306,22 @@ protected:
       }
     }
 
-    // Normal heating control
+    // Set heating temp
-    if (!settings.opentherm.options.nativeHeatingControl && vars.master.heating.enabled) {
+    {
+      // 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;
+      }
+
       // Converted target heating temp
-      float convertedTemp = convertTemp(vars.master.heating.setpointTemp, settings.system.unitSystem, settings.opentherm.unitSystem);
+      const float convertedTemp = convertTemp(
+        targetTemp,
+        settings.system.unitSystem,
+        settings.opentherm.unitSystem
+      );
 
       if (this->needSetHeatingTemp(convertedTemp)) {
         // Set max heating temp
@@ -1284,13 +1329,13 @@ protected:
           if (this->setMaxHeatingTemp(convertedTemp)) {
             Log.sinfoln(
               FPSTR(L_OT_HEATING), F("Set max heating temp: %.2f (converted: %.2f)"),
-              vars.master.heating.setpointTemp, convertedTemp
+              targetTemp, convertedTemp
             );
 
           } else {
             Log.swarningln(
               FPSTR(L_OT_HEATING), F("Failed set max heating temp: %.2f (converted: %.2f)"),
-              vars.master.heating.setpointTemp, convertedTemp
+              targetTemp, convertedTemp
             );
           }
         }
@@ -1301,7 +1346,7 @@ protected:
 
           Log.sinfoln(
             FPSTR(L_OT_HEATING), F("Set target temp: %.2f (converted: %.2f, response: %.2f)"),
-            vars.master.heating.setpointTemp, convertedTemp, vars.slave.heating.targetTemp
+            targetTemp, convertedTemp, vars.slave.heating.targetTemp
           );
 
         } else {
@@ -1311,27 +1356,30 @@ protected:
     }
 
     // Set CH2 temp
-    if (!settings.opentherm.options.nativeHeatingControl && vars.master.ch2.enabled) {
+    if (settings.opentherm.options.heatingToCh2 || settings.opentherm.options.dhwToCh2) {
-      if (settings.opentherm.options.heatingToCh2 || settings.opentherm.options.dhwToCh2) {
+      // Target CH2 heating temp
-        // Converted target CH2 temp
+      const float targetTemp = vars.master.ch2.enabled
-        float convertedTemp = convertTemp(
+        ? vars.master.ch2.targetTemp
-          vars.master.ch2.targetTemp,
+        : 0.0f;
-          settings.system.unitSystem,
-          settings.opentherm.unitSystem
-        );
 
-        if (this->needSetCh2Temp(convertedTemp)) {
+      // Converted target CH2 temp
-          if (this->setCh2Temp(convertedTemp)) {
+      const float convertedTemp = convertTemp(
-            this->ch2SetTempTime = millis();
+        targetTemp,
+        settings.system.unitSystem,
+        settings.opentherm.unitSystem
+      );
 
-            Log.sinfoln(
+      if (this->needSetCh2Temp(convertedTemp)) {
-              FPSTR(L_OT_CH2), F("Set temp: %.2f (converted: %.2f, response: %.2f)"),
+        if (this->setCh2Temp(convertedTemp)) {
-              vars.master.ch2.targetTemp, convertedTemp, vars.slave.ch2.targetTemp
+          this->ch2SetTempTime = millis();
-            );
 
-          } else {
+          Log.sinfoln(
-            Log.swarningln(FPSTR(L_OT_CH2), F("Failed set temp"));
+            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"));
         }
       }
     }
@@ -1339,7 +1387,7 @@ protected:
 
     // Heating overheat control
     if (settings.heating.overheatProtection.highTemp > 0 && settings.heating.overheatProtection.lowTemp > 0) {
-      float highTemp = convertTemp(
+      const float highTemp = convertTemp(
         max({
           vars.slave.heating.currentTemp,
           vars.slave.heating.returnTemp,
@@ -1376,7 +1424,7 @@ protected:
 
     // DHW overheat control
     if (settings.dhw.overheatProtection.highTemp > 0 && settings.dhw.overheatProtection.lowTemp > 0) {
-      float highTemp = convertTemp(
+      const float highTemp = convertTemp(
         max({
           vars.slave.heating.currentTemp,
           vars.slave.heating.returnTemp,
@@ -1470,6 +1518,19 @@ 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() {
@@ -1647,7 +1708,7 @@ protected:
   }
 
 
-  bool setRoomTemp(float temperature) {
+  bool setRoomTemp(const float temperature) {
     const unsigned int request = CustomOpenTherm::temperatureToData(temperature);
     const unsigned long response = this->instance->sendRequest(CustomOpenTherm::buildRequest(
       OpenThermMessageType::WRITE_DATA,
@@ -1667,7 +1728,7 @@ protected:
     return CustomOpenTherm::getUInt(response) == request;
   }
 
-  bool setRoomTempCh2(float temperature) {
+  bool setRoomTempCh2(const float temperature) {
     const unsigned int request = CustomOpenTherm::temperatureToData(temperature);
     const unsigned long response = this->instance->sendRequest(CustomOpenTherm::buildRequest(
       OpenThermMessageType::WRITE_DATA,
@@ -2169,6 +2230,25 @@ 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,
@@ -2183,7 +2263,7 @@ protected:
       return false;
     }
 
-    float value = CustomOpenTherm::getFloat(response);
+    const float value = CustomOpenTherm::getFloat(response);
     if (value < 0) {
       return false;
     }
@@ -2207,7 +2287,7 @@ protected:
       return false;
     }
 
-    float value = CustomOpenTherm::getFloat(response);
+    const float value = CustomOpenTherm::getFloat(response);
     if (value <= 0) {
       return false;
     }
@@ -2231,7 +2311,7 @@ protected:
       return false;
     }
 
-    float value = CustomOpenTherm::getFloat(response);
+    const float value = CustomOpenTherm::getFloat(response);
     if (value <= 0) {
       return false;
     }
@@ -2285,7 +2365,7 @@ protected:
       return false;
     }
 
-    float value = CustomOpenTherm::getFloat(response);
+    const float value = CustomOpenTherm::getFloat(response);
     if (value <= 0) {
       return false;
     }
@@ -2349,7 +2429,7 @@ protected:
       return false;
     }
 
-    float value = (float) CustomOpenTherm::getInt(response);
+    const float value = (float) CustomOpenTherm::getInt(response);
     if (!isValidTemp(value, settings.opentherm.unitSystem, -40, 500)) {
       return false;
     }
@@ -2373,7 +2453,7 @@ protected:
       return false;
     }
 
-    float value = (float) CustomOpenTherm::getInt(response);
+    const float value = (float) CustomOpenTherm::getInt(response);
     if (value <= 0) {
       return false;
     }
@@ -2474,7 +2554,7 @@ protected:
       return false;
     }
 
-    float value = CustomOpenTherm::getFloat(response);
+    const float value = CustomOpenTherm::getFloat(response);
     if (value < 0) {
       return false;
     }

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.nativeHeatingControl) {
+    if (settings.equitherm.enabled || settings.pid.enabled || settings.opentherm.options.nativeOTC) {
       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 > 0.01f && this->indoorSensorsConnected) {
+    if (settings.heating.hysteresis.enabled && this->indoorSensorsConnected) {
-      useHyst = settings.equitherm.enabled || settings.pid.enabled || settings.opentherm.options.nativeHeatingControl;
+      useHyst = settings.equitherm.enabled || settings.pid.enabled || settings.opentherm.options.nativeOTC;
     }
 
     if (useHyst) {
-      if (!vars.master.heating.blocking && vars.master.heating.indoorTemp - settings.heating.target + 0.0001f >= settings.heating.hysteresis) {
+      if (!vars.master.heating.blocking && vars.master.heating.indoorTemp - settings.heating.target + 0.0001f >= settings.heating.hysteresis.value) {
         vars.master.heating.blocking = true;
 
-      } else if (vars.master.heating.blocking && vars.master.heating.indoorTemp - settings.heating.target - 0.0001f <= -(settings.heating.hysteresis)) {
+      } else if (vars.master.heating.blocking && vars.master.heating.indoorTemp - settings.heating.target - 0.0001f <= -(settings.heating.hysteresis.value)) {
         vars.master.heating.blocking = false;
       }
 
@@ -108,13 +108,13 @@ protected:
   }
 
   inline float getHeatingMinSetpointTemp() {
-    return settings.opentherm.options.nativeHeatingControl
+    return settings.opentherm.options.nativeOTC
       ? vars.master.heating.minTemp
       : settings.heating.minTemp;
   }
 
   inline float getHeatingMaxSetpointTemp() {
-    return settings.opentherm.options.nativeHeatingControl
+    return settings.opentherm.options.nativeOTC
       ? 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.nativeHeatingControl) {
+    } else if (settings.opentherm.options.nativeOTC) {
       return settings.heating.target;
 
     } else if (!settings.equitherm.enabled && !settings.pid.enabled) {

src/Sensors.h

@@ -34,6 +34,7 @@ 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,
@@ -149,7 +150,7 @@ public:
 
   static int16_t getIdByName(const char* name) {
     if (settings == nullptr) {
-      return 0;
+      return -1;
     }
 
     for (uint8_t id = 0; id <= getMaxSensorId(); id++) {
@@ -163,7 +164,7 @@ public:
 
   static int16_t getIdByObjectId(const char* objectId) {
     if (settings == nullptr) {
-      return 0;
+      return -1;
     }
 
     String refObjectId;
@@ -329,12 +330,12 @@ public:
 
   static float getMeanValueByPurpose(Purpose purpose, const ValueType valueType, bool onlyConnected = true) {
     if (settings == nullptr || results == nullptr) {
-      return 0;
+      return 0.0f;
     }
 
     uint8_t valueId = (uint8_t) valueType;
     if (!isValidValueId(valueId)) {
-      return 0;
+      return 0.0f;
     }
     
     float value = 0.0f;
@@ -363,7 +364,7 @@ public:
 
   static bool existsConnectedSensorsByPurpose(Purpose purpose) {
     if (settings == nullptr || results == nullptr) {
-      return 0;
+      return false;
     }
 
     for (uint8_t id = 0; id <= getMaxSensorId(); id++) {

src/Settings.h

@@ -78,7 +78,8 @@ struct Settings {
       bool autoFaultReset = false;
       bool autoDiagReset = false;
       bool setDateAndTime = false;
-      bool nativeHeatingControl = false;
+      bool alwaysSendIndoorTemp = true;
+      bool nativeOTC = false;
       bool immergasFix = false;
     } options;
   } opentherm;
@@ -103,12 +104,17 @@ 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;
@@ -383,6 +389,7 @@ 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;

src/defines.h

@@ -163,4 +163,9 @@ enum class UnitSystem : uint8_t {
   IMPERIAL  = 1
 };
 
+enum class HysteresisAction : uint8_t {
+  DISABLE_HEATING = 0,
+  SET_ZERO_TARGET = 1
+};
+
 char buffer[255];

src/strings.h

@@ -34,6 +34,7 @@ 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";
@@ -109,6 +110,7 @@ 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";
@@ -140,7 +142,7 @@ const char S_MODEL[]                                PROGMEM = "model";
 const char S_MODULATION[]                           PROGMEM = "modulation";
 const char S_MQTT[]                                 PROGMEM = "mqtt";
 const char S_NAME[]                                 PROGMEM = "name";
-const char S_NATIVE_HEATING_CONTROL[]               PROGMEM = "nativeHeatingControl";
+const char S_NATIVE_OTC[]                           PROGMEM = "nativeOTC";
 const char S_NETWORK[]                              PROGMEM = "network";
 const char S_NTP[]                                  PROGMEM = "ntp";
 const char S_OFFSET[]                               PROGMEM = "offset";

src/utils.h

@@ -468,8 +468,10 @@ 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_NATIVE_HEATING_CONTROL)] = src.opentherm.options.nativeHeatingControl;
+    otOptions[FPSTR(S_ALWAYS_SEND_INDOOR_TEMP)] = src.opentherm.options.alwaysSendIndoorTemp;
+    otOptions[FPSTR(S_NATIVE_OTC)] = src.opentherm.options.nativeOTC;
     otOptions[FPSTR(S_IMMERGAS_FIX)] = src.opentherm.options.immergasFix;
+    
 
     auto mqtt = dst[FPSTR(S_MQTT)].to<JsonObject>();
     mqtt[FPSTR(S_ENABLED)] = src.mqtt.enabled;
@@ -490,7 +492,9 @@ 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)] = roundf(src.heating.hysteresis, 3);
+  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_TURBO_FACTOR)] = roundf(src.heating.turboFactor, 3);
   heating[FPSTR(S_MIN_TEMP)] = src.heating.minTemp;
   heating[FPSTR(S_MAX_TEMP)] = src.heating.maxTemp;
@@ -1001,11 +1005,20 @@ bool jsonToSettings(const JsonVariantConst src, Settings& dst, bool safe = false
       }
     }
 
-    if (src[FPSTR(S_OPENTHERM)][FPSTR(S_OPTIONS)][FPSTR(S_NATIVE_HEATING_CONTROL)].is<bool>()) {
+    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_NATIVE_HEATING_CONTROL)].as<bool>();
+      bool value = src[FPSTR(S_OPENTHERM)][FPSTR(S_OPTIONS)][FPSTR(S_ALWAYS_SEND_INDOOR_TEMP)].as<bool>();
 
-      if (value != dst.opentherm.options.nativeHeatingControl) {
+      if (value != dst.opentherm.options.alwaysSendIndoorTemp) {
-        dst.opentherm.options.nativeHeatingControl = value;
+        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.equitherm.enabled = false;
@@ -1025,7 +1038,6 @@ 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>();
@@ -1116,7 +1128,7 @@ bool jsonToSettings(const JsonVariantConst src, Settings& dst, bool safe = false
   if (src[FPSTR(S_EQUITHERM)][FPSTR(S_ENABLED)].is<bool>()) {
     bool value = src[FPSTR(S_EQUITHERM)][FPSTR(S_ENABLED)].as<bool>();
 
-    if (!dst.opentherm.options.nativeHeatingControl) {
+    if (!dst.opentherm.options.nativeOTC) {
       if (value != dst.equitherm.enabled) {
         dst.equitherm.enabled = value;
         changed = true;
@@ -1169,7 +1181,7 @@ bool jsonToSettings(const JsonVariantConst src, Settings& dst, bool safe = false
   if (src[FPSTR(S_PID)][FPSTR(S_ENABLED)].is<bool>()) {
     bool value = src[FPSTR(S_PID)][FPSTR(S_ENABLED)].as<bool>();
 
-    if (!dst.opentherm.options.nativeHeatingControl) {
+    if (!dst.opentherm.options.nativeOTC) {
       if (value != dst.pid.enabled) {
         dst.pid.enabled = value;
         changed = true;
@@ -1314,15 +1326,41 @@ bool jsonToSettings(const JsonVariantConst src, Settings& dst, bool safe = false
     }
   }
 
-  if (!src[FPSTR(S_HEATING)][FPSTR(S_HYSTERESIS)].isNull()) {
+  if (src[FPSTR(S_HEATING)][FPSTR(S_HYSTERESIS)][FPSTR(S_ENABLED)].is<bool>()) {
-    float value = src[FPSTR(S_HEATING)][FPSTR(S_HYSTERESIS)].as<float>();
+    bool value = src[FPSTR(S_HEATING)][FPSTR(S_HYSTERESIS)][FPSTR(S_ENABLED)].as<bool>();
 
-    if (value >= 0.0f && value <= 15.0f && fabsf(value - dst.heating.hysteresis) > 0.0001f) {
+    if (value != dst.heating.hysteresis.enabled) {
-      dst.heating.hysteresis = roundf(value, 2);
+      dst.heating.hysteresis.enabled = value;
       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>();
 
@@ -1676,7 +1714,7 @@ bool jsonToSettings(const JsonVariantConst src, Settings& dst, bool safe = false
   // force check emergency target
   {
     float value = !src[FPSTR(S_EMERGENCY)][FPSTR(S_TARGET)].isNull() ? src[FPSTR(S_EMERGENCY)][FPSTR(S_TARGET)].as<float>() : dst.emergency.target;
-    bool noRegulators = !dst.opentherm.options.nativeHeatingControl;
+    bool noRegulators = !dst.opentherm.options.nativeOTC;
     bool valid = isValidTemp(
       value,
       dst.system.unitSystem,
@@ -1701,7 +1739,7 @@ bool jsonToSettings(const JsonVariantConst src, Settings& dst, bool safe = false
 
   // force check heating target
   {
-    bool indoorTempControl = dst.equitherm.enabled || dst.pid.enabled || dst.opentherm.options.nativeHeatingControl;
+    bool indoorTempControl = dst.equitherm.enabled || dst.pid.enabled || dst.opentherm.options.nativeOTC;
     float minTemp = indoorTempControl ? THERMOSTAT_INDOOR_MIN_TEMP : dst.heating.minTemp;
     float maxTemp = indoorTempControl ? THERMOSTAT_INDOOR_MAX_TEMP : dst.heating.maxTemp;
 
@@ -1894,6 +1932,7 @@ 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):
@@ -2093,7 +2132,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.appVersion;
+  slave[FPSTR(S_PROTOCOL_VERSION)] = src.slave.protocolVersion;
   slave[FPSTR(S_CONNECTED)] = src.slave.connected;
   slave[FPSTR(S_FLAME)] = src.slave.flame;
 

src_data/locales/cn.json

@@ -243,6 +243,7 @@
         "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 传感器",
@@ -356,7 +357,16 @@
       },
 
       "heating": {
-        "hyst": "滞后值<small>(单位：度)</small>",
+        "hyst": {
+          "title": "滞回",
+          "desc": "滞回有助于维持设定的室内温度（在使用«Equitherm»和/或«PID»时）。强制禁用加热当<code>current indoor > target + value</code>，启用加热当<code>current indoor < (target - value)</code>。",
+          "value": "值 <small>(以度为单位)</small>",
+          "action": {
+            "title": "行动",
+            "disableHeating": "禁用加热",
+            "set0target": "设置空目标"
+          }
+        },
         "turboFactor": "Turbo 模式系数"
       },
 
@@ -371,11 +381,26 @@
       },
 
       "equitherm": {
-        "n": "N 系数",
+        "slope": {
-        "k": "K 系数",
+          "title": "斜率",
-        "t": {
+          "note": "热损失补偿。主要调谐参数。"
-          "title": "T 系数",
+        },
-          "note": "启用PID时此参数无效"
+        "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": "室外温度"
         }
       },
 
@@ -433,12 +458,13 @@
           "autoFaultReset": "自动报警复位 <small>(不推荐！)</small>",
           "autoDiagReset": "自动诊断复位 <small>(不推荐！)</small>",
           "setDateAndTime": "同步设置锅炉日期与时间",
-          "immergasFix": "针对Immergas锅炉的兼容性修复"
+          "immergasFix": "针对Immergas锅炉的兼容性修复",
+          "alwaysSendIndoorTemp": "向锅炉发送当前室内温度"
         },
 
-        "nativeHeating": {
+        "nativeOTC": {
-          "title": "原生锅炉供暖控制",
+          "title": "原生热载体温度计算模式",
-          "note": "<u>注意：</u> 仅适用于锅炉需接收目标室温并自主调节载热介质温度的场景，与固件中的PID及Equithermq气候补偿功能不兼容。"
+          "note": "仅在锅炉处于 OTC 模式时<u>才</u>工作：需要并接受目标室内温度，并基于内置曲线模式自行调节热载体温度。与 PID 和 Equitherm 不兼容。"
         }
       },
 

src_data/locales/en.json

@@ -243,6 +243,7 @@
         "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",
@@ -356,7 +357,16 @@
       },
 
       "heating": {
-        "hyst": "Hysteresis <small>(in degrees)</small>",
+        "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"
+          }
+        },
         "turboFactor": "Turbo mode coeff."
       },
 
@@ -448,12 +458,13 @@
           "autoFaultReset": "Auto fault reset <small>(not recommended!)</small>",
           "autoDiagReset": "Auto diag reset <small>(not recommended!)</small>",
           "setDateAndTime": "Set date & time on boiler",
-          "immergasFix": "Fix for Immergas boilers"
+          "immergasFix": "Fix for Immergas boilers",
+          "alwaysSendIndoorTemp": "Send current indoor temp to boiler"
         },
 
-        "nativeHeating": {
+        "nativeOTC": {
-          "title": "Native heating control (boiler)",
+          "title": "Native OTC mode",
-          "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."
+          "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."
         }
       },
 

src_data/locales/it.json

@@ -243,6 +243,7 @@
         "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",
@@ -356,7 +357,16 @@
       },
 
       "heating": {
-        "hyst": "Isteresi <small>(in gradi)</small>",
+        "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"
+          }
+        },
         "turboFactor": "Turbo mode coeff."
       },
 
@@ -373,23 +383,23 @@
       "equitherm": {
         "slope": {
           "title": "Pendenza",
-          "note": "Compensazione delle perdite di calore. Principale parametro di regolazione."
+          "note": "Compensazione della perdita di calore. Parametro di regolazione principale."
         },
         "exponent": {
           "title": "Esponente",
-          "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."
+          "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."
         },
         "shift": {
-          "title": "Spostare",
+          "title": "Spostamento",
-          "note": "Compensa le perdite di calore aggiuntive (ad esempio, nelle tubature) o fonti di calore extra."
+          "note": "Compensa perdite di calore aggiuntive (ad es., nelle tubature) o fonti di calore extra."
         },
         "targetDiffFactor": {
           "title": "Fattore T",
-          "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>."
+          "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>."
         },
         "chart": {
           "targetTemp": "Temperatura interna target",
-          "setpointTemp": "Temperatura del portatore di calore",
+          "setpointTemp": "Temperatura del vettore termico",
           "outdoorTemp": "Temperatura esterna"
         }
       },
@@ -448,12 +458,13 @@
           "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"
+          "immergasFix": "Fix per caldiaie Immergas",
+          "alwaysSendIndoorTemp": "Invia la temp attuale interna alla caldaia"
         },
 
-        "nativeHeating": {
+        "nativeOTC": {
-          "title": "Controllo del riscaldamento nativo (caldaia)",
+          "title": "Modalità nativa di calcolo della temperatura del vettore termico",
-          "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."
+          "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."
         }
       },
 

src_data/locales/nl.json

@@ -222,6 +222,8 @@
         "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",
@@ -327,7 +329,16 @@
         }
       },
       "heating": {
-        "hyst": "Hysterese <small>(in graden)</small>",
+        "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"
+          }
+        },
         "turboFactor": "Turbomodus coëff."
       },
       "emergency": {
@@ -339,11 +350,26 @@
         "treshold": "Drempeltijd <small>(sec)</small>"
       },
       "equitherm": {
-        "n": "N-factor",
+        "slope": {
-        "k": "K-factor",
+          "title": "Helling",
-        "t": {
+          "note": "Compensatie voor warmteverlies. Hoofdafstelparameter."
-          "title": "T-factor",
+        },
-          "note": "Niet gebruikt als PID is ingeschakeld"
+        "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"
         }
       },
       "pid": {
@@ -398,11 +424,13 @@
           "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"
+          "immergasFix": "Fix voor Immergas-ketels",
+          "alwaysSendIndoorTemp": "Stuur huidige binnentemp naar ketel"
         },
-        "nativeHeating": {
+
-          "title": "Natuurlijke verwarmingsregeling (ketel)",
+        "nativeOTC": {
-          "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."
+          "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."
         }
       },
       "mqtt": {

src_data/locales/ru.json

@@ -243,6 +243,7 @@
         "otDhwBurnerHours": "OpenTherm, кол-во часов работы горелки (ГВС)",
         "otHeatingPumpHours": "OpenTherm, кол-во часов работы насоса (отопление)",
         "otDhwPumpHours": "OpenTherm, кол-во часов работы насоса (ГВС)",
+        "otCoolingHours": "OpenTherm, кол-во часов работы охлаждения",
         
         "ntcTemp": "NTC датчик",
         "dallasTemp": "DALLAS датчик",
@@ -356,7 +357,16 @@
       },
 
       "heating": {
-        "hyst": "Гистерезис <small>(в градусах)</small>",
+        "hyst": {
+          "title": "Гистерезис",
+          "desc": "Гистерезис полезен для поддержания заданной внутр. темп. (при использовании «ПЗА» и/или «ПИД»). Принудительно откл. отопление, когда <code>current indoor > target + value</code>, и вкл. отопление, когда <code>current indoor < (target - value)</code>.",
+          "value": "Значение <small>(в градусах)</small>",
+          "action": {
+            "title": "Действие",
+            "disableHeating": "Отключить отопление",
+            "set0target": "Установить 0 в качестве целевой темп."
+          }
+        },
         "turboFactor": "Коэфф. турбо режима"
       },
 
@@ -448,12 +458,13 @@
           "autoFaultReset": "Автоматический сброс ошибок <small>(не рекомендуется!)</small>",
           "autoDiagReset": "Автоматический сброс диагностики <small>(не рекомендуется!)</small>",
           "setDateAndTime": "Устанавливать время и дату на котле",
-          "immergasFix": "Фикс для котлов Immergas"
+          "immergasFix": "Фикс для котлов Immergas",
+          "alwaysSendIndoorTemp": "Передавать текущую темп. в помещении котлу"
         },
 
-        "nativeHeating": {
+        "nativeOTC": {
-          "title": "Передать управление отоплением котлу",
+          "title": "Нативный режим OTC (расчёт температуры теплоносителя)",
-          "note": "Работает <u>ТОЛЬКО</u> если котел требует и принимает целевую температуру в помещении и сам регулирует температуру теплоносителя на основе встроенного режима кривых. Несовместимо с ПИД и ПЗА."
+          "note": "Работает <u>ТОЛЬКО</u> если котел в режиме OTC: требует и принимает целевую температуру в помещении и сам регулирует температуру теплоносителя на основе встроенного режима кривых. Несовместимо с ПИД и ПЗА."
         }
       },
 

src_data/pages/sensors.html

@@ -113,6 +113,7 @@
                       <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>

src_data/pages/settings.html

@@ -193,21 +193,48 @@
               </div>
 
               <div class="grid">
-                <label>
-                  <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.heating.turboFactor</span>
                   <input type="number" inputmode="decimal" name="heating[turboFactor]" min="1.5" max="10" step="0.1" required>
                 </label>
+
+                <label>
+                  <span data-i18n>settings.maxModulation</span>
+                  <input type="number" inputmode="numeric" name="heating[maxModulation]" min="1" max="100" step="1" required>
+                </label>
               </div>
 
-              <label>
+              <hr />
-                <span data-i18n>settings.maxModulation</span>
+
-                <input type="number" inputmode="numeric" name="heating[maxModulation]" min="1" max="100" step="1" required>
+              <details>
-              </label>
+                <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>
 
               <hr />
 
@@ -665,12 +692,17 @@
                       <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][nativeHeatingControl]" value="true">
+                      <input type="checkbox" name="opentherm[options][nativeOTC]" value="true">
-                      <span data-i18n>settings.ot.nativeHeating.title</span><br />
+                      <span data-i18n>settings.ot.nativeOTC.title</span><br />
-                      <small data-i18n>settings.ot.nativeHeating.note</small>
+                      <small data-i18n>settings.ot.nativeOTC.note</small>
                     </label>
                   </fieldset>
                 </div>
@@ -1090,8 +1122,9 @@
           setCheckboxValue("[name='opentherm[options][autoFaultReset]']", data.opentherm.options.autoFaultReset);
           setCheckboxValue("[name='opentherm[options][autoDiagReset]']", data.opentherm.options.autoDiagReset);
           setCheckboxValue("[name='opentherm[options][setDateAndTime]']", data.opentherm.options.setDateAndTime);
-          setCheckboxValue("[name='opentherm[options][nativeHeatingControl]']", data.opentherm.options.nativeHeatingControl);
+          setCheckboxValue("[name='opentherm[options][nativeOTC]']", data.opentherm.options.nativeOTC);
           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
@@ -1138,7 +1171,9 @@
             "min": data.system.unitSystem == 0 ? 1 : 33,
             "max": data.system.unitSystem == 0 ? 100 : 212
           });
-          setInputValue("[name='heating[hysteresis]']", data.heating.hysteresis);
+          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[turboFactor]']", data.heating.turboFactor);
           setInputValue("[name='heating[maxModulation]']", data.heating.maxModulation);
           setInputValue("[name='heating[overheatProtection][highTemp]']", data.heating.overheatProtection.highTemp, {
@@ -1177,7 +1212,7 @@
           setBusy('#dhw-settings-busy', '#dhw-settings', false);
 
           // Emergency mode
-          if (data.opentherm.options.nativeHeatingControl) {
+          if (data.opentherm.options.nativeOTC) {
             setInputValue("[name='emergency[target]']", data.emergency.target, {
               "min": data.system.unitSystem == 0 ? 5 : 41,
               "max": data.system.unitSystem == 0 ? 40 : 104