refactor: after merge

Merge branch 'master' into new-equitherm
chore: removed platformio_dependabot
2025-12-11 18:54:28 +05:00 · 2025-12-09 19:26:08 +03:00 · 2025-12-09 19:19:30 +03:00 · 2025-12-09 18:18:10 +03:00 · 2025-11-15 13:08:43 +03:00 · 2025-11-12 20:21:39 +03:00
42 changed files with 3578 additions and 879 deletions
--- a/.github/workflows/pio-dependabot.yaml
+++ b/.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@v4
-      - name: run PlatformIO Dependabot
-        uses: peterus/platformio_dependabot@v1.2.0
-        with:
-          github_token: ${{ secrets.GITHUB_TOKEN }}
--- a/.github/workflows/stale.yaml
+++ b/.github/workflows/stale.yaml
@@ -7,7 +7,7 @@ jobs:
  stale:
    runs-on: ubuntu-latest
    steps:
-      - uses: actions/stale@v9
+      - uses: actions/stale@v10
        with:
          stale-issue-message: >
            This issue is stale because it has been open 15 days with no activity. Remove stale label or comment or this will be closed in 5 days.
--- a/.gitignore
+++ b/.gitignore
@@ -1,8 +1,14 @@
 .pio
 .vscode
-build/*.bin
+.PVS-Studio
+build/*
 data/*
+managed_components/*
+node_modules/*
 secrets.ini
-node_modules
 package-lock.json
+*.lock
+sdkconfig.*
+CMakeLists.txt
+!sdkconfig.defaults
 !.gitkeep
--- a/README.md
+++ b/README.md
@@ -71,5 +71,10 @@ All available information and instructions can be found in the wiki:
      * [Connection](https://github.com/Laxilef/OTGateway/wiki/OT-adapters#connection)
      * [Leds on board](https://github.com/Laxilef/OTGateway/wiki/OT-adapters#leds-on-board)

-___
-This project is tested with BrowserStack.
+## Gratitude
+* To the developers of the libraries used: [OpenTherm Library](https://github.com/ihormelnyk/opentherm_library), [ESP8266Scheduler](https://github.com/nrwiersma/ESP8266Scheduler), [ArduinoJson](https://github.com/bblanchon/ArduinoJson), [NimBLE-Arduino](https://github.com/h2zero/NimBLE-Arduino), [ArduinoMqttClient](https://github.com/arduino-libraries/ArduinoMqttClient), [ESPTelnet](https://github.com/LennartHennigs/ESPTelnet), [FileData](https://github.com/GyverLibs/FileData), [GyverPID](https://github.com/GyverLibs/GyverPID), [GyverBlinker](https://github.com/GyverLibs/GyverBlinker), [OneWireNg](https://github.com/pstolarz/OneWireNg) & [OneWire](https://github.com/PaulStoffregen/OneWire)
+* To the [PlatformIO](https://platformio.org/) Team
+* To the team and contributors of the [pioarduino](https://github.com/pioarduino/platform-espressif32) project
+* To the [BrowserStack](https://www.browserstack.com/) team. This project is tested with BrowserStack.
+* To the [PVS-Studio](https://pvs-studio.com/pvs-studio/?utm_source=website&utm_medium=github&utm_campaign=open_source) - static analyzer for C, C++, C#, and Java code.
+* And of course to the contributors for their contribution to the development of the project!
--- a/gulpfile.js
+++ b/gulpfile.js
@@ -27,6 +27,9 @@ let paths = {
        'src_data/scripts/i18n.min.js',
        'src_data/scripts/lang.js',
        'src_data/scripts/utils.js'
+      ],
+      'chart.js': [
+        'src_data/scripts/chart.js'
      ]
    }
  },
@@ -48,6 +51,10 @@ let paths = {
    {
      src: 'src_data/images/*.*',
      dest: 'data/static/images/'
+    },
+    {
+      src: 'src_data/*.txt',
+      dest: 'data/static/'
    }
  ],
  pages: {
--- a/lib/CustomOpenTherm/CustomOpenTherm.h
+++ b/lib/CustomOpenTherm/CustomOpenTherm.h
@@ -4,10 +4,10 @@
 class CustomOpenTherm : public OpenTherm {
 public:
  typedef std::function<void(unsigned int)> DelayCallback;
-  typedef std::function<void(unsigned long, byte)> BeforeSendRequestCallback;
-  typedef std::function<void(unsigned long, unsigned long, OpenThermResponseStatus, byte)> AfterSendRequestCallback;
+  typedef std::function<void(unsigned long, uint8_t)> BeforeSendRequestCallback;
+  typedef std::function<void(unsigned long, unsigned long, OpenThermResponseStatus, uint8_t)> AfterSendRequestCallback;

-  CustomOpenTherm(int inPin = 4, int outPin = 5, bool isSlave = false) : OpenTherm(inPin, outPin, isSlave) {}
+  CustomOpenTherm(int inPin = 4, int outPin = 5, bool isSlave = false, bool alwaysReceive = false) : OpenTherm(inPin, outPin, isSlave, alwaysReceive) {}
  ~CustomOpenTherm() {}

  CustomOpenTherm* setDelayCallback(DelayCallback callback = nullptr) {
@@ -28,8 +28,8 @@ public:
    return this;
  }

-  unsigned long sendRequest(unsigned long request, byte attempts = 5, byte _attempt = 0) {
-    _attempt++;
+  unsigned long sendRequest(unsigned long request) override {
+    this->sendRequestAttempt++;

    while (!this->isReady()) {
      if (this->delayCallback) {
@@ -40,15 +40,10 @@ public:
    }

    if (this->beforeSendRequestCallback) {
-      this->beforeSendRequestCallback(request, _attempt);
+      this->beforeSendRequestCallback(request, this->sendRequestAttempt);
    }

-    unsigned long _response;
-    OpenThermResponseStatus _responseStatus = OpenThermResponseStatus::NONE;
-    if (!this->sendRequestAsync(request)) {
-      _response = 0;
-
-    } else {
+    if (this->sendRequestAsync(request)) {
      do {
        if (this->delayCallback) {
          this->delayCallback(150);
@@ -56,42 +51,25 @@ public:

        this->process();
      } while (this->status != OpenThermStatus::READY && this->status != OpenThermStatus::DELAY);
-
-      _response = this->getLastResponse();
-      _responseStatus = this->getLastResponseStatus();
    }

    if (this->afterSendRequestCallback) {
-      this->afterSendRequestCallback(request, _response, _responseStatus, _attempt);
+      this->afterSendRequestCallback(request, this->response, this->responseStatus, this->sendRequestAttempt);
    }

-    if (_responseStatus == OpenThermResponseStatus::SUCCESS || _responseStatus == OpenThermResponseStatus::INVALID || _attempt >= attempts) {
-      return _response;
+    if (this->responseStatus == OpenThermResponseStatus::SUCCESS || this->responseStatus == OpenThermResponseStatus::INVALID) {
+      this->sendRequestAttempt = 0;
+      return this->response;
+
+    } else if (this->sendRequestAttempt >= this->sendRequestMaxAttempts) {
+      this->sendRequestAttempt = 0;
+      return this->response;

    } else {
-      return this->sendRequest(request, attempts, _attempt);
+      return this->sendRequest(request);
    }
  }

-  unsigned long setBoilerStatus(bool enableCentralHeating, bool enableHotWater, bool enableCooling, bool enableOutsideTemperatureCompensation, bool enableCentralHeating2, bool summerWinterMode, bool dhwBlocking, uint8_t lb = 0) {
-    unsigned int data = enableCentralHeating
-      | (enableHotWater << 1)
-      | (enableCooling << 2)
-      | (enableOutsideTemperatureCompensation << 3)
-      | (enableCentralHeating2 << 4)
-      | (summerWinterMode << 5)
-      | (dhwBlocking << 6);
-    
-    data <<= 8;
-    data |= lb;
-
-    return this->sendRequest(buildRequest(
-      OpenThermMessageType::READ_DATA,
-      OpenThermMessageID::Status,
-      data
-    ));
-  }
-
  bool sendBoilerReset() {
    unsigned int data = 1;
    data <<= 8;
@@ -128,10 +106,35 @@ public:
    return isValidResponse(response) && isValidResponseId(response, OpenThermMessageID::RemoteRequest);
  }

+  static bool isCh2Active(unsigned long response) {
+      return response & 0x20;
+  }
+
  static bool isValidResponseId(unsigned long response, OpenThermMessageID id) {
-    byte responseId = (response >> 16) & 0xFF;
-    
-    return (byte)id == responseId;
+    uint8_t responseId = (response >> 16) & 0xFF;
+
+    return (uint8_t)id == responseId;
+  }
+
+  static uint8_t getResponseMessageTypeId(unsigned long response) {
+    return (response << 1) >> 29;
+  }
+
+  static const char* getResponseMessageTypeString(unsigned long response) {
+    uint8_t msgType = getResponseMessageTypeId(response);
+
+    switch (msgType) {
+      case (uint8_t) OpenThermMessageType::READ_ACK:
+      case (uint8_t) OpenThermMessageType::WRITE_ACK:
+      case (uint8_t) OpenThermMessageType::DATA_INVALID:
+      case (uint8_t) OpenThermMessageType::UNKNOWN_DATA_ID:
+        return CustomOpenTherm::messageTypeToString(
+          static_cast<OpenThermMessageType>(msgType)
+        );
+
+      default:
+        return "UNKNOWN";
+    }
  }

  // converters
@@ -145,6 +148,8 @@ public:
  }

 protected:
+  const uint8_t sendRequestMaxAttempts = 5;
+  uint8_t sendRequestAttempt = 0;
  DelayCallback delayCallback;
  BeforeSendRequestCallback beforeSendRequestCallback;
  AfterSendRequestCallback afterSendRequestCallback;
--- a/lib/Equitherm/Equitherm.h
+++ b/lib/Equitherm/Equitherm.h
@@ -1,63 +0,0 @@
-#include <Arduino.h>
-
-#if defined(EQUITHERM_INTEGER)
-// расчёты с целыми числами
-typedef int datatype;
-#else
-// расчёты с float числами
-typedef float datatype;
-#endif
-
-class Equitherm {
-public:
-  datatype targetTemp = 0;
-  datatype indoorTemp = 0;
-  datatype outdoorTemp = 0;
-  float Kn = 0.0;
-  float Kk = 0.0;
-  float Kt = 0.0;
-
-  Equitherm() = default;
-
-  // kn, kk, kt
-  Equitherm(float new_kn, float new_kk, float new_kt) {
-    Kn = new_kn;
-    Kk = new_kk;
-    Kt = new_kt;
-  }
-
-  // лимит выходной величины
-  void setLimits(unsigned short min_output, unsigned short max_output) {
-    _minOut = min_output;
-    _maxOut = max_output;
-  }
-
-  // возвращает новое значение при вызове
-  datatype getResult() {
-    datatype output = getResultN() + getResultK() + getResultT();
-    output = constrain(output, _minOut, _maxOut);		// ограничиваем выход
-    return output;
-  }
-
-private:
-  unsigned short _minOut = 20, _maxOut = 90;
-
-  // температура контура отопления в зависимости от наружной температуры
-  datatype getResultN() {
-    float a = (-0.21 * Kn) - 0.06;     // a = -0,21k — 0,06
-    float b = (6.04 * Kn) + 1.98;      // b = 6,04k + 1,98
-    float c = (-5.06 * Kn) + 18.06;    // с = -5,06k + 18,06
-    float x = (-0.2 * outdoorTemp) + 5; // x = -0.2*t1 + 5
-    return (a * x * x) + (b * x) + c;       // Tn = ax2 + bx + c
-  }
-
-  // поправка на желаемую комнатную температуру
-  datatype getResultK() {
-    return (targetTemp - 20) * Kk;
-  }
-
-  // Расчет поправки (ошибки) термостата
-  datatype getResultT() {
-    return constrain((targetTemp - indoorTemp), -3, 3) * Kt;
-  }
-};
--- a/lib/HomeAssistantHelper/HomeAssistantHelper.h
+++ b/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);
--- a/lib/HomeAssistantHelper/strings.h
+++ b/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_DEVICE[]                          PROGMEM = "device";
-const char HA_IDENTIFIERS[]                     PROGMEM = "identifiers";
-const char HA_SW_VERSION[]                      PROGMEM = "sw_version";
-const char HA_MANUFACTURER[]                    PROGMEM = "manufacturer";
-const char HA_MODEL[]                           PROGMEM = "model";
+// https://www.home-assistant.io/integrations/mqtt/#supported-abbreviations-in-mqtt-discovery-messages
+const char HA_DEFAULT_ENTITY_ID[]               PROGMEM = "def_ent_id";               // "default_entity_id "
+const char HA_DEVICE[]                          PROGMEM = "dev";                      // "device"
+const char HA_IDENTIFIERS[]                     PROGMEM = "ids";                      // "identifiers"
+const char HA_SW_VERSION[]                      PROGMEM = "sw";                       // "sw_version"
+const char HA_MANUFACTURER[]                    PROGMEM = "mf";                       // "manufacturer"
+const char HA_MODEL[]                           PROGMEM = "mdl";                      // "model"
 const char HA_NAME[]                            PROGMEM = "name";
-const char HA_CONF_URL[]                        PROGMEM = "configuration_url";
-const char HA_COMMAND_TOPIC[]                   PROGMEM = "command_topic";
-const char HA_COMMAND_TEMPLATE[]                PROGMEM = "command_template";
-const char HA_ENABLED_BY_DEFAULT[]              PROGMEM = "enabled_by_default";
-const char HA_UNIQUE_ID[]                       PROGMEM = "unique_id";
-const char HA_OBJECT_ID[]                       PROGMEM = "object_id";
-const char HA_ENTITY_CATEGORY[]                 PROGMEM = "entity_category";
+const char HA_CONF_URL[]                        PROGMEM = "cu";                       // "configuration_url"
+const char HA_COMMAND_TOPIC[]                   PROGMEM = "cmd_t";                    // "command_topic"
+const char HA_COMMAND_TEMPLATE[]                PROGMEM = "cmd_tpl";                  // "command_template"
+const char HA_ENABLED_BY_DEFAULT[]              PROGMEM = "en";                       // "enabled_by_default"
+const char HA_UNIQUE_ID[]                       PROGMEM = "uniq_id";                  // "unique_id"
+const char HA_ENTITY_CATEGORY[]                 PROGMEM = "ent_cat";                  // "entity_category"
 const char HA_ENTITY_CATEGORY_DIAGNOSTIC[]      PROGMEM = "diagnostic";
 const char HA_ENTITY_CATEGORY_CONFIG[]          PROGMEM = "config";
-const char HA_STATE_TOPIC[]                     PROGMEM = "state_topic";
-const char HA_VALUE_TEMPLATE[]                  PROGMEM = "value_template";
-const char HA_OPTIONS[]                         PROGMEM = "options";
-const char HA_AVAILABILITY[]                    PROGMEM = "availability";
-const char HA_AVAILABILITY_MODE[]               PROGMEM = "availability_mode";
-const char HA_TOPIC[]                           PROGMEM = "topic";
-const char HA_DEVICE_CLASS[]                    PROGMEM = "device_class";
-const char HA_UNIT_OF_MEASUREMENT[]             PROGMEM = "unit_of_measurement";
+const char HA_STATE_TOPIC[]                     PROGMEM = "stat_t";                   // "state_topic"
+const char HA_VALUE_TEMPLATE[]                  PROGMEM = "val_tpl";                  // "value_template"
+const char HA_OPTIONS[]                         PROGMEM = "ops";                      // "options"
+const char HA_AVAILABILITY[]                    PROGMEM = "avty";                     // "availability"
+const char HA_AVAILABILITY_MODE[]               PROGMEM = "avty_mode";                // "availability_mode"
+const char HA_TOPIC[]                           PROGMEM = "t";                        // "topic"
+const char HA_DEVICE_CLASS[]                    PROGMEM = "dev_cla";                  // "device_class"
+const char HA_UNIT_OF_MEASUREMENT[]             PROGMEM = "unit_of_meas";             // "unit_of_measurement"
 const char HA_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_OFF[]                       PROGMEM = "state_off";
-const char HA_PAYLOAD_ON[]                      PROGMEM = "payload_on";
-const char HA_PAYLOAD_OFF[]                     PROGMEM = "payload_off";
-const char HA_STATE_CLASS[]                     PROGMEM = "state_class";
+const char HA_STATE_ON[]                        PROGMEM = "stat_on";                  // "state_on"
+const char HA_STATE_OFF[]                       PROGMEM = "stat_off";                 // "state_off"
+const char HA_PAYLOAD_ON[]                      PROGMEM = "pl_on";                    // "payload_on"
+const char HA_PAYLOAD_OFF[]                     PROGMEM = "pl_off";                   // "payload_off"
+const char HA_STATE_CLASS[]                     PROGMEM = "stat_cla";                 // "state_class"
 const char HA_STATE_CLASS_MEASUREMENT[]         PROGMEM = "measurement";
-const char HA_EXPIRE_AFTER[]                    PROGMEM = "expire_after";
-const char HA_CURRENT_TEMPERATURE_TOPIC[]       PROGMEM = "current_temperature_topic";
-const char HA_CURRENT_TEMPERATURE_TEMPLATE[]    PROGMEM = "current_temperature_template";
-const char HA_TEMPERATURE_COMMAND_TOPIC[]       PROGMEM = "temperature_command_topic";
-const char HA_TEMPERATURE_COMMAND_TEMPLATE[]    PROGMEM = "temperature_command_template";
-const char HA_TEMPERATURE_STATE_TOPIC[]         PROGMEM = "temperature_state_topic";
-const char HA_TEMPERATURE_STATE_TEMPLATE[]      PROGMEM = "temperature_state_template";
-const char HA_TEMPERATURE_UNIT[]                PROGMEM = "temperature_unit";
-const char HA_MODE_COMMAND_TOPIC[]              PROGMEM = "mode_command_topic";
-const char HA_MODE_COMMAND_TEMPLATE[]           PROGMEM = "mode_command_template";
-const char HA_MODE_STATE_TOPIC[]                PROGMEM = "mode_state_topic";
-const char HA_MODE_STATE_TEMPLATE[]             PROGMEM = "mode_state_template";
+const char HA_EXPIRE_AFTER[]                    PROGMEM = "exp_aft";                  // "expire_after"
+const char HA_CURRENT_TEMPERATURE_TOPIC[]       PROGMEM = "curr_temp_t";              // "current_temperature_topic"
+const char HA_CURRENT_TEMPERATURE_TEMPLATE[]    PROGMEM = "curr_temp_tpl";            // "current_temperature_template"
+const char HA_TEMPERATURE_COMMAND_TOPIC[]       PROGMEM = "temp_cmd_t";               // "temperature_command_topic"
+const char HA_TEMPERATURE_COMMAND_TEMPLATE[]    PROGMEM = "temp_cmd_tpl";             // "temperature_command_template"
+const char HA_TEMPERATURE_STATE_TOPIC[]         PROGMEM = "temp_stat_t";              // "temperature_state_topic"
+const char HA_TEMPERATURE_STATE_TEMPLATE[]      PROGMEM = "temp_stat_tpl";            // "temperature_state_template"
+const char HA_TEMPERATURE_UNIT[]                PROGMEM = "temp_unit";                // "temperature_unit"
+const char HA_MODE_COMMAND_TOPIC[]              PROGMEM = "mode_cmd_t";               // "mode_command_topic"
+const char HA_MODE_COMMAND_TEMPLATE[]           PROGMEM = "mode_cmd_tpl";             // "mode_command_template"
+const char HA_MODE_STATE_TOPIC[]                PROGMEM = "mode_stat_t";              // "mode_state_topic"
+const char HA_MODE_STATE_TEMPLATE[]             PROGMEM = "mode_stat_tpl";            // "mode_state_template"
 const char HA_MODES[]                           PROGMEM = "modes";
-const char HA_ACTION_TOPIC[]                    PROGMEM = "action_topic";
-const char HA_ACTION_TEMPLATE[]                 PROGMEM = "action_template";
+const char HA_ACTION_TOPIC[]                    PROGMEM = "act_t";                    // "action_topic"
+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_TEMPLATE[]    PROGMEM = "preset_mode_command_template";
-const char HA_PRESET_MODE_STATE_TOPIC[]         PROGMEM = "preset_mode_state_topic";
-const char HA_PRESET_MODE_VALUE_TEMPLATE[]      PROGMEM = "preset_mode_value_template";
-const char HA_PRESET_MODES[]                    PROGMEM = "preset_modes";
+const char HA_PRESET_MODE_COMMAND_TOPIC[]       PROGMEM = "pr_mode_cmd_t";            // "preset_mode_command_topic"
+const char HA_PRESET_MODE_COMMAND_TEMPLATE[]    PROGMEM = "pr_mode_cmd_tpl";          // "preset_mode_command_template"
+const char HA_PRESET_MODE_STATE_TOPIC[]         PROGMEM = "pr_mode_stat_t";           // "preset_mode_state_topic"
+const char HA_PRESET_MODE_VALUE_TEMPLATE[]      PROGMEM = "pr_mode_val_tpl";          // "preset_mode_value_template"
+const char HA_PRESET_MODES[]                    PROGMEM = "pr_modes";                 // "preset_modes"
--- a/lib/NetworkUtils/NetworkMgr.h
+++ b/lib/NetworkUtils/NetworkMgr.h
@@ -35,7 +35,7 @@ namespace NetworkUtils {
      return this;
    }

-    NetworkMgr* setApCredentials(const char* ssid, const char* password = nullptr, byte channel = 0) {
+    NetworkMgr* setApCredentials(const char* ssid, const char* password = nullptr, uint8_t channel = 0) {
      this->apName = ssid;
      this->apPassword = password;
      this->apChannel = channel;
@@ -43,7 +43,7 @@ namespace NetworkUtils {
      return this;
    }

-    NetworkMgr* setStaCredentials(const char* ssid = nullptr, const char* password = nullptr, byte channel = 0) {
+    NetworkMgr* setStaCredentials(const char* ssid = nullptr, const char* password = nullptr, uint8_t channel = 0) {
      this->staSsid = ssid;
      this->staPassword = password;
      this->staChannel = channel;
@@ -140,7 +140,7 @@ namespace NetworkUtils {
      return this->staPassword;
    }

-    byte getStaChannel() {
+    uint8_t getStaChannel() {
      return this->staChannel;
    }

@@ -377,7 +377,7 @@ namespace NetworkUtils {
      }
    }

-    static byte rssiToSignalQuality(short int rssi) {
+    static uint8_t rssiToSignalQuality(short int rssi) {
      return constrain(map(rssi, -100, -50, 0, 100), 0, 100);
    }

@@ -397,11 +397,11 @@ namespace NetworkUtils {
    const char* hostname = "esp";
    const char* apName = "ESP";
    const char* apPassword = nullptr;
-    byte apChannel = 1;
+    uint8_t apChannel = 1;

    const char* staSsid = nullptr;
    const char* staPassword = nullptr;
-    byte staChannel = 0;
+    uint8_t staChannel = 0;

    bool useDhcp = true;
    IPAddress staticIp;
--- a/platformio.ini
+++ b/platformio.ini
@@ -14,15 +14,15 @@ extra_configs = secrets.default.ini
 core_dir = .pio

 [env]
-version = 1.5.3
+version = 1.5.6
 framework = arduino
 lib_deps = 
-	bblanchon/ArduinoJson@^7.3.0
+	bblanchon/ArduinoJson@^7.4.2
 	;ihormelnyk/OpenTherm Library@^1.1.5
-	https://github.com/ihormelnyk/opentherm_library#master
+	https://github.com/Laxilef/opentherm_library#esp32_timer
 	arduino-libraries/ArduinoMqttClient@^0.1.8
-	lennarthennigs/ESP Telnet@^2.2
-	gyverlibs/FileData@^1.0.2
+	lennarthennigs/ESP Telnet@^2.2.3
+	gyverlibs/FileData@^1.0.3
 	gyverlibs/GyverPID@^3.3.2
 	gyverlibs/GyverBlinker@^1.1.1
 	https://github.com/pstolarz/Arduino-Temperature-Control-Library.git#OneWireNg
@@ -60,10 +60,16 @@ monitor_filters =
 	esp8266_exception_decoder
 board_build.flash_mode = dio
 board_build.filesystem = littlefs
+check_tool = ; pvs-studio
+check_flags =
+;  pvs-studio:
+;    --analysis-mode=4
+;    --exclude-path=./.pio/libdeps

 ; Defaults
 [esp8266_defaults]
 platform = espressif8266@^4.2.1
+platform_packages = ${env.platform_packages}
 lib_deps = 
 	${env.lib_deps}
 	nrwiersma/ESP8266Scheduler@^1.2
@@ -77,6 +83,8 @@ build_flags =
 	;-D PIO_FRAMEWORK_ARDUINO_LWIP2_HIGHER_BANDWIDTH_LOW_FLASH
 	-D PIO_FRAMEWORK_ARDUINO_ESPRESSIF_SDK305
 board_build.ldscript = eagle.flash.4m1m.ld
+check_tool = ${env.check_tool}
+check_flags = ${env.check_flags}

 [esp32_defaults]
 ;platform = espressif32@^6.7
@@ -84,13 +92,13 @@ board_build.ldscript = eagle.flash.4m1m.ld
 ;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/53.03.11/platform-espressif32.zip
-platform_packages =
+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.1.0
+nimble_lib = h2zero/NimBLE-Arduino@2.3.3
 lib_ignore = 
 extra_scripts = 
 	post:tools/esp32.py
@@ -100,11 +108,14 @@ build_flags =
 	${env.build_flags}
 	-D CORE_DEBUG_LEVEL=0
 	-Wl,--wrap=esp_panic_handler
+check_tool = ${env.check_tool}
+check_flags = ${env.check_flags}


 ; Boards
 [env:d1_mini]
 platform = ${esp8266_defaults.platform}
+platform_packages = ${esp8266_defaults.platform_packages}
 board = d1_mini
 lib_deps = ${esp8266_defaults.lib_deps}
 lib_ignore = ${esp8266_defaults.lib_ignore}
@@ -119,9 +130,12 @@ build_flags =
 	-D DEFAULT_SENSOR_INDOOR_GPIO=14
 	-D DEFAULT_STATUS_LED_GPIO=13
 	-D DEFAULT_OT_RX_LED_GPIO=15
+check_tool = ${esp8266_defaults.check_tool}
+check_flags = ${esp8266_defaults.check_flags}

 [env:d1_mini_lite]
 platform = ${esp8266_defaults.platform}
+platform_packages = ${esp8266_defaults.platform_packages}
 board = d1_mini_lite
 lib_deps = ${esp8266_defaults.lib_deps}
 lib_ignore = ${esp8266_defaults.lib_ignore}
@@ -136,9 +150,12 @@ build_flags =
 	-D DEFAULT_SENSOR_INDOOR_GPIO=14
 	-D DEFAULT_STATUS_LED_GPIO=13
 	-D DEFAULT_OT_RX_LED_GPIO=15
+check_tool = ${esp8266_defaults.check_tool}
+check_flags = ${esp8266_defaults.check_flags}

 [env:d1_mini_pro]
 platform = ${esp8266_defaults.platform}
+platform_packages = ${esp8266_defaults.platform_packages}
 board = d1_mini_pro
 lib_deps = ${esp8266_defaults.lib_deps}
 lib_ignore = ${esp8266_defaults.lib_ignore}
@@ -153,9 +170,12 @@ build_flags =
 	-D DEFAULT_SENSOR_INDOOR_GPIO=14
 	-D DEFAULT_STATUS_LED_GPIO=13
 	-D DEFAULT_OT_RX_LED_GPIO=15
+check_tool = ${esp8266_defaults.check_tool}
+check_flags = ${esp8266_defaults.check_flags}

 [env:nodemcu_8266]
 platform = ${esp8266_defaults.platform}
+platform_packages = ${esp8266_defaults.platform_packages}
 board = nodemcuv2
 lib_deps = ${esp8266_defaults.lib_deps}
 lib_ignore = ${esp8266_defaults.lib_ignore}
@@ -170,6 +190,8 @@ build_flags =
 	-D DEFAULT_SENSOR_INDOOR_GPIO=4
 	-D DEFAULT_STATUS_LED_GPIO=2
 	-D DEFAULT_OT_RX_LED_GPIO=16
+check_tool = ${esp8266_defaults.check_tool}
+check_flags = ${esp8266_defaults.check_flags}

 [env:s2_mini]
 platform = ${esp32_defaults.platform}
@@ -192,6 +214,8 @@ build_flags =
 	-D DEFAULT_SENSOR_INDOOR_GPIO=7
 	-D DEFAULT_STATUS_LED_GPIO=11
 	-D DEFAULT_OT_RX_LED_GPIO=12
+check_tool = ${esp32_defaults.check_tool}
+check_flags = ${esp32_defaults.check_flags}

 [env:s3_mini] 
 platform = ${esp32_defaults.platform}
@@ -218,6 +242,8 @@ build_flags =
 	-D DEFAULT_SENSOR_INDOOR_GPIO=12
 	-D DEFAULT_STATUS_LED_GPIO=11
 	-D DEFAULT_OT_RX_LED_GPIO=10
+check_tool = ${esp32_defaults.check_tool}
+check_flags = ${esp32_defaults.check_flags}

 [env:c3_mini] 
 platform = ${esp32_defaults.platform}
@@ -242,6 +268,8 @@ build_flags =
 	-D DEFAULT_SENSOR_INDOOR_GPIO=1
 	-D DEFAULT_STATUS_LED_GPIO=4
 	-D DEFAULT_OT_RX_LED_GPIO=5
+check_tool = ${esp32_defaults.check_tool}
+check_flags = ${esp32_defaults.check_flags}

 [env:nodemcu_32]
 platform = ${esp32_defaults.platform}
@@ -263,6 +291,12 @@ build_flags =
 	-D DEFAULT_SENSOR_INDOOR_GPIO=26
 	-D DEFAULT_STATUS_LED_GPIO=2
 	-D DEFAULT_OT_RX_LED_GPIO=19
+check_tool = ${esp32_defaults.check_tool}
+check_flags = ${esp32_defaults.check_flags}
+
+[env:nodemcu_32_160mhz] 
+extends = env:nodemcu_32 
+board_build.f_cpu = 160000000L ; set frequency to 160MHz

 [env:d1_mini32]
 platform = ${esp32_defaults.platform}
@@ -284,24 +318,38 @@ build_flags =
 	-D DEFAULT_SENSOR_INDOOR_GPIO=18
 	-D DEFAULT_STATUS_LED_GPIO=2
 	-D DEFAULT_OT_RX_LED_GPIO=19
+check_tool = ${esp32_defaults.check_tool}
+check_flags = ${esp32_defaults.check_flags}

 [env:esp32_c6]
 platform = ${esp32_defaults.platform}
+framework = arduino, espidf
 platform_packages = ${esp32_defaults.platform_packages}
 board = esp32-c6-devkitm-1
 board_build.partitions = ${esp32_defaults.board_build.partitions}
-lib_deps = 
-	${esp32_defaults.lib_deps}
-	;${esp32_defaults.nimble_lib}
-lib_ignore = ${esp32_defaults.lib_ignore}
+board_build.embed_txtfiles = 
+	managed_components/espressif__esp_insights/server_certs/https_server.crt
+	managed_components/espressif__esp_rainmaker/server_certs/rmaker_mqtt_server.crt
+	managed_components/espressif__esp_rainmaker/server_certs/rmaker_claim_service_server.crt
+	managed_components/espressif__esp_rainmaker/server_certs/rmaker_ota_server.crt
+lib_deps = ${esp32_defaults.lib_deps}
+lib_ignore = 
+	${esp32_defaults.lib_ignore}
 extra_scripts = ${esp32_defaults.extra_scripts}
 build_unflags = 
 	-mtext-section-literals
 build_type = ${esp32_defaults.build_type}
 build_flags = 
 	${esp32_defaults.build_flags}
-	; Currently the NimBLE library is incompatible with ESP32 C6
-	;-D USE_BLE=1
+	-D USE_BLE=1
+	-D DEFAULT_OT_IN_GPIO=15
+	-D DEFAULT_OT_OUT_GPIO=23
+	-D DEFAULT_SENSOR_OUTDOOR_GPIO=0
+	-D DEFAULT_SENSOR_INDOOR_GPIO=0
+	-D DEFAULT_STATUS_LED_GPIO=11
+	-D DEFAULT_OT_RX_LED_GPIO=10
+check_tool = ${esp32_defaults.check_tool}
+check_flags = ${esp32_defaults.check_flags}

 [env:otthing] 
 platform = ${esp32_defaults.platform}
@@ -327,3 +375,5 @@ build_flags =
 	-D DEFAULT_STATUS_LED_GPIO=8
 	-D DEFAULT_OT_RX_LED_GPIO=2
 	-D OT_BYPASS_RELAY_GPIO=20
+check_tool = ${esp32_defaults.check_tool}
+check_flags = ${esp32_defaults.check_flags}
--- a/sdkconfig.defaults
+++ b/sdkconfig.defaults
@@ -0,0 +1,33 @@
+# Source:
+# https://github.com/pioarduino/platform-espressif32/tree/main/examples/espidf-arduino-h2zero-BLE_scan
+
+CONFIG_FREERTOS_HZ=1000
+CONFIG_MBEDTLS_PSK_MODES=y
+CONFIG_MBEDTLS_KEY_EXCHANGE_PSK=y
+CONFIG_BOOTLOADER_COMPILER_OPTIMIZATION_SIZE=y
+CONFIG_COMPILER_OPTIMIZATION_SIZE=y
+CONFIG_ESPTOOLPY_FLASHSIZE_4MB=y
+CONFIG_ESPTOOLPY_HEADER_FLASHSIZE_UPDATE=y
+
+#
+# BT config
+CONFIG_BT_ENABLED=y
+CONFIG_BTDM_CTRL_MODE_BLE_ONLY=y
+CONFIG_BTDM_CTRL_MODE_BR_EDR_ONLY=n
+CONFIG_BTDM_CTRL_MODE_BTDM=n
+CONFIG_BT_BLUEDROID_ENABLED=n
+CONFIG_BT_NIMBLE_ENABLED=y
+
+#
+# Arduino Configuration
+CONFIG_AUTOSTART_ARDUINO=y
+CONFIG_ARDUINO_SELECTIVE_COMPILATION=y
+CONFIG_ARDUINO_SELECTIVE_Zigbee=n
+CONFIG_ARDUINO_SELECTIVE_Matter=n
+CONFIG_ARDUINO_SELECTIVE_WiFiProv=n
+CONFIG_ARDUINO_SELECTIVE_BLE=n
+CONFIG_ARDUINO_SELECTIVE_BluetoothSerial=n
+CONFIG_ARDUINO_SELECTIVE_SimpleBLE=n
+CONFIG_ARDUINO_SELECTIVE_RainMaker=n
+CONFIG_ARDUINO_SELECTIVE_OpenThread=n
+CONFIG_ARDUINO_SELECTIVE_Insights=n
--- a/src/HaHelper.h
+++ b/src/HaHelper.h
@@ -3,8 +3,8 @@

 class HaHelper : public HomeAssistantHelper {
 public:
-  static const byte TEMP_SOURCE_HEATING = 0;
-  static const byte TEMP_SOURCE_INDOOR = 1;
+  static const uint8_t TEMP_SOURCE_HEATING = 0;
+  static const uint8_t TEMP_SOURCE_INDOOR = 1;
  static const char AVAILABILITY_OT_CONN[];
  static const char AVAILABILITY_SENSOR_CONN[];

@@ -261,8 +261,13 @@ public:
    }

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

    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_OBJECT_ID)] = doc[FPSTR(HA_UNIQUE_ID)];
+    doc[FPSTR(HA_UNIQUE_ID)] = this->getUniqueIdWithPrefix(objId.c_str());
+    doc[FPSTR(HA_DEFAULT_ENTITY_ID)] = this->getEntityIdWithPrefix(FPSTR(HA_ENTITY_BINARY_SENSOR), objId.c_str());

    // 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_OBJECT_ID)] = doc[FPSTR(HA_UNIQUE_ID)];
+    doc[FPSTR(HA_UNIQUE_ID)] = this->getUniqueIdWithPrefix(objId.c_str());
+    doc[FPSTR(HA_DEFAULT_ENTITY_ID)] = this->getEntityIdWithPrefix(FPSTR(HA_ENTITY_SENSOR), objId.c_str());

    // state topic
    doc[FPSTR(HA_STATE_TOPIC)] = this->getDeviceTopic(
@@ -395,7 +400,7 @@ public:
    doc[FPSTR(HA_AVAILABILITY)][FPSTR(HA_TOPIC)] = this->statusTopic.c_str();
    doc[FPSTR(HA_ENABLED_BY_DEFAULT)] = enabledByDefault;
    doc[FPSTR(HA_ENTITY_CATEGORY)] = FPSTR(HA_ENTITY_CATEGORY_DIAGNOSTIC);
-    doc[FPSTR(HA_DEVICE_CLASS)] = F("signal_strength");
+    //doc[FPSTR(HA_DEVICE_CLASS)] = F("signal_strength");
    doc[FPSTR(HA_STATE_CLASS)] = FPSTR(HA_STATE_CLASS_MEASUREMENT);
    doc[FPSTR(HA_UNIT_OF_MEASUREMENT)] = FPSTR(HA_UNIT_OF_MEASUREMENT_PERCENT);
    doc[FPSTR(HA_ICON)] = F("mdi:signal");
@@ -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_OBJECT_ID)] = doc[FPSTR(HA_UNIQUE_ID)];
+    doc[FPSTR(HA_UNIQUE_ID)] = this->getUniqueIdWithPrefix(F("heating_turbo"));
+    doc[FPSTR(HA_DEFAULT_ENTITY_ID)] = this->getEntityIdWithPrefix(FPSTR(HA_ENTITY_SWITCH), F("heating_turbo"));
    doc[FPSTR(HA_ENTITY_CATEGORY)] = FPSTR(HA_ENTITY_CATEGORY_CONFIG);
    doc[FPSTR(HA_NAME)] = F("Turbo heating");
    doc[FPSTR(HA_ICON)] = F("mdi:rocket-launch-outline");
@@ -443,8 +447,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_hysteresis"));
-    doc[FPSTR(HA_OBJECT_ID)] = doc[FPSTR(HA_UNIQUE_ID)];
+    doc[FPSTR(HA_UNIQUE_ID)] = this->getUniqueIdWithPrefix(F("heating_hysteresis"));
+    doc[FPSTR(HA_DEFAULT_ENTITY_ID)] = this->getEntityIdWithPrefix(FPSTR(HA_ENTITY_NUMBER), F("heating_hysteresis"));
    doc[FPSTR(HA_ENTITY_CATEGORY)] = FPSTR(HA_ENTITY_CATEGORY_CONFIG);
    doc[FPSTR(HA_DEVICE_CLASS)] = FPSTR(S_TEMPERATURE);

@@ -475,8 +479,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_OBJECT_ID)] = doc[FPSTR(HA_UNIQUE_ID)];
+    doc[FPSTR(HA_UNIQUE_ID)] = this->getUniqueIdWithPrefix(F("heating_turbo_factor"));
+    doc[FPSTR(HA_DEFAULT_ENTITY_ID)] = this->getEntityIdWithPrefix(FPSTR(HA_ENTITY_NUMBER), F("heating_turbo_factor"));
    doc[FPSTR(HA_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 +503,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_OBJECT_ID)] = doc[FPSTR(HA_UNIQUE_ID)];
+    doc[FPSTR(HA_UNIQUE_ID)] = this->getUniqueIdWithPrefix(F("heating_min_temp"));
+    doc[FPSTR(HA_DEFAULT_ENTITY_ID)] = this->getEntityIdWithPrefix(FPSTR(HA_ENTITY_NUMBER), F("heating_min_temp"));
    doc[FPSTR(HA_ENTITY_CATEGORY)] = FPSTR(HA_ENTITY_CATEGORY_CONFIG);
    doc[FPSTR(HA_DEVICE_CLASS)] = FPSTR(S_TEMPERATURE);

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

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

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

@@ -637,8 +641,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_OBJECT_ID)] = doc[FPSTR(HA_UNIQUE_ID)];
+    doc[FPSTR(HA_UNIQUE_ID)] = this->getUniqueIdWithPrefix(F("pid"));
+    doc[FPSTR(HA_DEFAULT_ENTITY_ID)] = this->getEntityIdWithPrefix(FPSTR(HA_ENTITY_SWITCH), F("pid"));
    doc[FPSTR(HA_ENTITY_CATEGORY)] = FPSTR(HA_ENTITY_CATEGORY_CONFIG);
    doc[FPSTR(HA_NAME)] = F("PID");
    doc[FPSTR(HA_ICON)] = F("mdi:chart-bar-stacked");
@@ -659,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_p"));
-    doc[FPSTR(HA_OBJECT_ID)] = doc[FPSTR(HA_UNIQUE_ID)];
+    doc[FPSTR(HA_UNIQUE_ID)] = this->getUniqueIdWithPrefix(F("pid_p"));
+    doc[FPSTR(HA_DEFAULT_ENTITY_ID)] = this->getEntityIdWithPrefix(FPSTR(HA_ENTITY_NUMBER), F("pid_p"));
    doc[FPSTR(HA_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 +686,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_OBJECT_ID)] = doc[FPSTR(HA_UNIQUE_ID)];
+    doc[FPSTR(HA_UNIQUE_ID)] = this->getUniqueIdWithPrefix(F("pid_i"));
+    doc[FPSTR(HA_DEFAULT_ENTITY_ID)] = this->getEntityIdWithPrefix(FPSTR(HA_ENTITY_NUMBER), F("pid_i"));
    doc[FPSTR(HA_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 +709,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_OBJECT_ID)] = doc[FPSTR(HA_UNIQUE_ID)];
+    doc[FPSTR(HA_UNIQUE_ID)] = this->getUniqueIdWithPrefix(F("pid_d"));
+    doc[FPSTR(HA_DEFAULT_ENTITY_ID)] = this->getEntityIdWithPrefix(FPSTR(HA_ENTITY_NUMBER), F("pid_d"));
    doc[FPSTR(HA_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 +732,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_OBJECT_ID)] = doc[FPSTR(HA_UNIQUE_ID)];
+    doc[FPSTR(HA_UNIQUE_ID)] = this->getUniqueIdWithPrefix(F("pid_dt"));
+    doc[FPSTR(HA_DEFAULT_ENTITY_ID)] = this->getEntityIdWithPrefix(FPSTR(HA_ENTITY_NUMBER), F("pid_dt"));
    doc[FPSTR(HA_ENTITY_CATEGORY)] = FPSTR(HA_ENTITY_CATEGORY_CONFIG);
    doc[FPSTR(HA_DEVICE_CLASS)] = F("duration");
    doc[FPSTR(HA_UNIT_OF_MEASUREMENT)] = F("s");
@@ -753,8 +757,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_OBJECT_ID)] = doc[FPSTR(HA_UNIQUE_ID)];
+    doc[FPSTR(HA_UNIQUE_ID)] = this->getUniqueIdWithPrefix(F("pid_min_temp"));
+    doc[FPSTR(HA_DEFAULT_ENTITY_ID)] = this->getEntityIdWithPrefix(FPSTR(HA_ENTITY_NUMBER), F("pid_min_temp"));
    doc[FPSTR(HA_ENTITY_CATEGORY)] = FPSTR(HA_ENTITY_CATEGORY_CONFIG);
    doc[FPSTR(HA_DEVICE_CLASS)] = FPSTR(S_TEMPERATURE);

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

@@ -822,8 +826,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_OBJECT_ID)] = doc[FPSTR(HA_UNIQUE_ID)];
+    doc[FPSTR(HA_UNIQUE_ID)] = this->getUniqueIdWithPrefix(F("equitherm"));
+    doc[FPSTR(HA_DEFAULT_ENTITY_ID)] = this->getEntityIdWithPrefix(FPSTR(HA_ENTITY_SWITCH), F("equitherm"));
    doc[FPSTR(HA_ENTITY_CATEGORY)] = FPSTR(HA_ENTITY_CATEGORY_CONFIG);
    doc[FPSTR(HA_NAME)] = F("Equitherm");
    doc[FPSTR(HA_ICON)] = F("mdi:sun-snowflake-variant");
@@ -840,19 +844,19 @@ public:
    return this->publish(this->makeConfigTopic(FPSTR(HA_ENTITY_SWITCH), F("equitherm")).c_str(), doc);
  }

-  bool publishInputEquithermFactorN(bool enabledByDefault = true) {
+  bool publishInputEquithermSlope(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("equitherm_n"));
-    doc[FPSTR(HA_OBJECT_ID)] = doc[FPSTR(HA_UNIQUE_ID)];
+    doc[FPSTR(HA_UNIQUE_ID)] = this->getUniqueIdWithPrefix(F("equitherm_slope"));
+    doc[FPSTR(HA_DEFAULT_ENTITY_ID)] = this->getEntityIdWithPrefix(FPSTR(HA_ENTITY_NUMBER), F("equitherm_slope"));
    doc[FPSTR(HA_ENTITY_CATEGORY)] = FPSTR(HA_ENTITY_CATEGORY_CONFIG);
-    doc[FPSTR(HA_NAME)] = F("Equitherm factor N");
-    doc[FPSTR(HA_ICON)] = F("mdi:alpha-n-circle-outline");
+    doc[FPSTR(HA_NAME)] = F("Equitherm slope");
+    doc[FPSTR(HA_ICON)] = F("mdi:slope-uphill");
    doc[FPSTR(HA_STATE_TOPIC)] = this->settingsTopic.c_str();
-    doc[FPSTR(HA_VALUE_TEMPLATE)] = F("{{ value_json.equitherm.n_factor|float(0)|round(3) }}");
+    doc[FPSTR(HA_VALUE_TEMPLATE)] = F("{{ value_json.equitherm.slope|float(0)|round(3) }}");
    doc[FPSTR(HA_COMMAND_TOPIC)] = this->setSettingsTopic.c_str();
-    doc[FPSTR(HA_COMMAND_TEMPLATE)] = F("{\"equitherm\": {\"n_factor\" : {{ value }}}}");
+    doc[FPSTR(HA_COMMAND_TEMPLATE)] = F("{\"equitherm\": {\"slope\" : {{ value }}}}");
    doc[FPSTR(HA_MIN)] = 0.001f;
    doc[FPSTR(HA_MAX)] = 10;
    doc[FPSTR(HA_STEP)] = 0.001f;
@@ -860,64 +864,88 @@ public:
    doc[FPSTR(HA_EXPIRE_AFTER)] = this->expireAfter;
    doc.shrinkToFit();

-    return this->publish(this->makeConfigTopic(FPSTR(HA_ENTITY_NUMBER), F("equitherm_n_factor")).c_str(), doc);
+    return this->publish(this->makeConfigTopic(FPSTR(HA_ENTITY_NUMBER), F("equitherm_slope")).c_str(), doc);
  }

-  bool publishInputEquithermFactorK(bool enabledByDefault = true) {
+  bool publishInputEquithermExponent(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("equitherm_k"));
-    doc[FPSTR(HA_OBJECT_ID)] = doc[FPSTR(HA_UNIQUE_ID)];
+    doc[FPSTR(HA_UNIQUE_ID)] = this->getUniqueIdWithPrefix(F("equitherm_exponent"));
+    doc[FPSTR(HA_DEFAULT_ENTITY_ID)] = this->getEntityIdWithPrefix(FPSTR(HA_ENTITY_NUMBER), F("equitherm_exponent"));
    doc[FPSTR(HA_ENTITY_CATEGORY)] = FPSTR(HA_ENTITY_CATEGORY_CONFIG);
-    doc[FPSTR(HA_NAME)] = F("Equitherm factor K");
-    doc[FPSTR(HA_ICON)] = F("mdi:alpha-k-circle-outline");
+    doc[FPSTR(HA_NAME)] = F("Equitherm exponent");
+    doc[FPSTR(HA_ICON)] = F("mdi:exponent");
    doc[FPSTR(HA_STATE_TOPIC)] = this->settingsTopic.c_str();
-    doc[FPSTR(HA_VALUE_TEMPLATE)] = F("{{ value_json.equitherm.k_factor|float(0)|round(2) }}");
+    doc[FPSTR(HA_VALUE_TEMPLATE)] = F("{{ value_json.equitherm.exponent|float(0)|round(3) }}");
    doc[FPSTR(HA_COMMAND_TOPIC)] = this->setSettingsTopic.c_str();
-    doc[FPSTR(HA_COMMAND_TEMPLATE)] = F("{\"equitherm\": {\"k_factor\" : {{ value }}}}");
-    doc[FPSTR(HA_MIN)] = 0;
-    doc[FPSTR(HA_MAX)] = 10;
+    doc[FPSTR(HA_COMMAND_TEMPLATE)] = F("{\"equitherm\": {\"exponent\" : {{ value }}}}");
+    doc[FPSTR(HA_MIN)] = 0.1;
+    doc[FPSTR(HA_MAX)] = 2;
+    doc[FPSTR(HA_STEP)] = 0.001f;
+    doc[FPSTR(HA_MODE)] = FPSTR(HA_MODE_BOX);
+    doc[FPSTR(HA_EXPIRE_AFTER)] = this->expireAfter;
+    doc.shrinkToFit();
+
+    return this->publish(this->makeConfigTopic(FPSTR(HA_ENTITY_NUMBER), F("equitherm_exponent")).c_str(), doc);
+  }
+
+  bool publishInputEquithermShift(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("equitherm_shift"));
+    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");
+    doc[FPSTR(HA_ICON)] = F("mdi:chart-areaspline");
+    doc[FPSTR(HA_STATE_TOPIC)] = this->settingsTopic.c_str();
+    doc[FPSTR(HA_VALUE_TEMPLATE)] = F("{{ value_json.equitherm.shift|float(0)|round(2) }}");
+    doc[FPSTR(HA_COMMAND_TOPIC)] = this->setSettingsTopic.c_str();
+    doc[FPSTR(HA_COMMAND_TEMPLATE)] = F("{\"equitherm\": {\"shift\" : {{ value }}}}");
+    doc[FPSTR(HA_MIN)] = -15;
+    doc[FPSTR(HA_MAX)] = 15;
    doc[FPSTR(HA_STEP)] = 0.01f;
    doc[FPSTR(HA_MODE)] = FPSTR(HA_MODE_BOX);
    doc[FPSTR(HA_EXPIRE_AFTER)] = this->expireAfter;
    doc.shrinkToFit();

-    return this->publish(this->makeConfigTopic(FPSTR(HA_ENTITY_NUMBER), F("equitherm_k_factor")).c_str(), doc);
+    return this->publish(this->makeConfigTopic(FPSTR(HA_ENTITY_NUMBER), F("equitherm_shift")).c_str(), doc);
  }

-  bool publishInputEquithermFactorT(bool enabledByDefault = true) {
+  bool publishInputEquithermTargetDiffFactor(bool enabledByDefault = true) {
    JsonDocument doc;
    doc[FPSTR(HA_AVAILABILITY)][0][FPSTR(HA_TOPIC)] = this->statusTopic.c_str();
    doc[FPSTR(HA_AVAILABILITY)][1][FPSTR(HA_TOPIC)] = this->settingsTopic.c_str();
    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_t"));
-    doc[FPSTR(HA_OBJECT_ID)] = doc[FPSTR(HA_UNIQUE_ID)];
+    doc[FPSTR(HA_UNIQUE_ID)] = this->getUniqueIdWithPrefix(F("equitherm_target_diff_factor"));
+    doc[FPSTR(HA_DEFAULT_ENTITY_ID)] = this->getEntityIdWithPrefix(FPSTR(HA_ENTITY_NUMBER), F("equitherm_target_diff_factor"));
    doc[FPSTR(HA_ENTITY_CATEGORY)] = FPSTR(HA_ENTITY_CATEGORY_CONFIG);
-    doc[FPSTR(HA_NAME)] = F("Equitherm factor T");
-    doc[FPSTR(HA_ICON)] = F("mdi:alpha-t-circle-outline");
+    doc[FPSTR(HA_NAME)] = F("Equitherm target diff factor");
+    doc[FPSTR(HA_ICON)] = F("mdi:chart-timeline-variant-shimmer");
    doc[FPSTR(HA_STATE_TOPIC)] = this->settingsTopic.c_str();
-    doc[FPSTR(HA_VALUE_TEMPLATE)] = F("{{ value_json.equitherm.t_factor|float(0)|round(2) }}");
+    doc[FPSTR(HA_VALUE_TEMPLATE)] = F("{{ value_json.equitherm.targetDiffFactor|float(0)|round(3) }}");
    doc[FPSTR(HA_COMMAND_TOPIC)] = this->setSettingsTopic.c_str();
-    doc[FPSTR(HA_COMMAND_TEMPLATE)] = F("{\"equitherm\": {\"t_factor\" : {{ value }}}}");
+    doc[FPSTR(HA_COMMAND_TEMPLATE)] = F("{\"equitherm\": {\"targetDiffFactor\" : {{ value }}}}");
    doc[FPSTR(HA_MIN)] = 0;
    doc[FPSTR(HA_MAX)] = 10;
-    doc[FPSTR(HA_STEP)] = 0.01f;
+    doc[FPSTR(HA_STEP)] = 0.001f;
    doc[FPSTR(HA_MODE)] = FPSTR(HA_MODE_BOX);
    doc[FPSTR(HA_EXPIRE_AFTER)] = this->expireAfter;
    doc.shrinkToFit();

-    return this->publish(this->makeConfigTopic(FPSTR(HA_ENTITY_NUMBER), F("equitherm_t_factor")).c_str(), doc);
+    return this->publish(this->makeConfigTopic(FPSTR(HA_ENTITY_NUMBER), F("equitherm_target_diff_factor")).c_str(), doc);
  }


  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_OBJECT_ID)] = doc[FPSTR(HA_UNIQUE_ID)];
+    doc[FPSTR(HA_UNIQUE_ID)] = this->getUniqueIdWithPrefix(F("status"));
+    doc[FPSTR(HA_DEFAULT_ENTITY_ID)] = this->getEntityIdWithPrefix(FPSTR(HA_ENTITY_BINARY_SENSOR), F("status"));
    doc[FPSTR(HA_ENTITY_CATEGORY)] = FPSTR(HA_ENTITY_CATEGORY_DIAGNOSTIC);
    doc[FPSTR(HA_DEVICE_CLASS)] = F("problem");
    doc[FPSTR(HA_NAME)] = F("Status");
@@ -934,8 +962,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_OBJECT_ID)] = doc[FPSTR(HA_UNIQUE_ID)];
+    doc[FPSTR(HA_UNIQUE_ID)] = this->getUniqueIdWithPrefix(F("emergency"));
+    doc[FPSTR(HA_DEFAULT_ENTITY_ID)] = this->getEntityIdWithPrefix(FPSTR(HA_ENTITY_BINARY_SENSOR), F("emergency"));
    doc[FPSTR(HA_ENTITY_CATEGORY)] = FPSTR(HA_ENTITY_CATEGORY_DIAGNOSTIC);
    doc[FPSTR(HA_DEVICE_CLASS)] = F("problem");
    doc[FPSTR(HA_NAME)] = F("Emergency");
@@ -952,8 +980,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_OBJECT_ID)] = doc[FPSTR(HA_UNIQUE_ID)];
+    doc[FPSTR(HA_UNIQUE_ID)] = this->getUniqueIdWithPrefix(F("ot_status"));
+    doc[FPSTR(HA_DEFAULT_ENTITY_ID)] = this->getEntityIdWithPrefix(FPSTR(HA_ENTITY_BINARY_SENSOR), F("ot_status"));
    doc[FPSTR(HA_ENTITY_CATEGORY)] = FPSTR(HA_ENTITY_CATEGORY_DIAGNOSTIC);
    doc[FPSTR(HA_DEVICE_CLASS)] = F("connectivity");
    doc[FPSTR(HA_NAME)] = F("Opentherm status");
@@ -973,9 +1001,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_OBJECT_ID)] = doc[FPSTR(HA_UNIQUE_ID)];
-    //doc[FPSTR(HA_ENTITY_CATEGORY)] = FPSTR(HA_ENTITY_CATEGORY_DIAGNOSTIC);
+    doc[FPSTR(HA_UNIQUE_ID)] = this->getUniqueIdWithPrefix(F("heating"));
+    doc[FPSTR(HA_DEFAULT_ENTITY_ID)] = this->getEntityIdWithPrefix(FPSTR(HA_ENTITY_BINARY_SENSOR), F("heating"));
    doc[FPSTR(HA_DEVICE_CLASS)] = F("running");
    doc[FPSTR(HA_NAME)] = F("Heating");
    doc[FPSTR(HA_ICON)] = F("mdi:radiator");
@@ -994,9 +1021,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_OBJECT_ID)] = doc[FPSTR(HA_UNIQUE_ID)];
-    //doc[FPSTR(HA_ENTITY_CATEGORY)] = FPSTR(HA_ENTITY_CATEGORY_DIAGNOSTIC);
+    doc[FPSTR(HA_UNIQUE_ID)] = this->getUniqueIdWithPrefix(F("dhw"));
+    doc[FPSTR(HA_DEFAULT_ENTITY_ID)] = this->getEntityIdWithPrefix(FPSTR(HA_ENTITY_BINARY_SENSOR), F("dhw"));
    doc[FPSTR(HA_DEVICE_CLASS)] = F("running");
    doc[FPSTR(HA_NAME)] = F("DHW");
    doc[FPSTR(HA_ICON)] = F("mdi:faucet");
@@ -1015,9 +1041,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_OBJECT_ID)] = doc[FPSTR(HA_UNIQUE_ID)];
-    //doc[FPSTR(HA_ENTITY_CATEGORY)] = FPSTR(HA_ENTITY_CATEGORY_DIAGNOSTIC);
+    doc[FPSTR(HA_UNIQUE_ID)] = this->getUniqueIdWithPrefix(F("flame"));
+    doc[FPSTR(HA_DEFAULT_ENTITY_ID)] = this->getEntityIdWithPrefix(FPSTR(HA_ENTITY_BINARY_SENSOR), F("flame"));
    doc[FPSTR(HA_DEVICE_CLASS)] = F("running");
    doc[FPSTR(HA_NAME)] = F("Flame");
    doc[FPSTR(HA_ICON)] = F("mdi:gas-burner");
@@ -1036,8 +1061,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_OBJECT_ID)] = doc[FPSTR(HA_UNIQUE_ID)];
+    doc[FPSTR(HA_UNIQUE_ID)] = this->getUniqueIdWithPrefix(F("fault"));
+    doc[FPSTR(HA_DEFAULT_ENTITY_ID)] = this->getEntityIdWithPrefix(FPSTR(HA_ENTITY_BINARY_SENSOR), F("fault"));
    doc[FPSTR(HA_ENTITY_CATEGORY)] = FPSTR(HA_ENTITY_CATEGORY_DIAGNOSTIC);
    doc[FPSTR(HA_DEVICE_CLASS)] = F("problem");
    doc[FPSTR(HA_NAME)] = F("Fault");
@@ -1057,8 +1082,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_OBJECT_ID)] = doc[FPSTR(HA_UNIQUE_ID)];
+    doc[FPSTR(HA_UNIQUE_ID)] = this->getUniqueIdWithPrefix(FPSTR(HA_ENTITY_CATEGORY_DIAGNOSTIC));
+    doc[FPSTR(HA_DEFAULT_ENTITY_ID)] = this->getEntityIdWithPrefix(FPSTR(HA_ENTITY_BINARY_SENSOR), FPSTR(HA_ENTITY_CATEGORY_DIAGNOSTIC));
    doc[FPSTR(HA_ENTITY_CATEGORY)] = FPSTR(HA_ENTITY_CATEGORY_DIAGNOSTIC);
    doc[FPSTR(HA_DEVICE_CLASS)] = F("problem");
    doc[FPSTR(HA_NAME)] = F("Diagnostic");
@@ -1075,8 +1100,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_OBJECT_ID)] = doc[FPSTR(HA_UNIQUE_ID)];
+    doc[FPSTR(HA_UNIQUE_ID)] = this->getUniqueIdWithPrefix(F("ext_pump"));
+    doc[FPSTR(HA_DEFAULT_ENTITY_ID)] = this->getEntityIdWithPrefix(FPSTR(HA_ENTITY_BINARY_SENSOR), F("ext_pump"));
    doc[FPSTR(HA_ENTITY_CATEGORY)] = FPSTR(HA_ENTITY_CATEGORY_DIAGNOSTIC);
    doc[FPSTR(HA_DEVICE_CLASS)] = F("running");
    doc[FPSTR(HA_NAME)] = F("External pump");
@@ -1096,8 +1121,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_OBJECT_ID)] = doc[FPSTR(HA_UNIQUE_ID)];
+    doc[FPSTR(HA_UNIQUE_ID)] = this->getUniqueIdWithPrefix(F("fault_code"));
+    doc[FPSTR(HA_DEFAULT_ENTITY_ID)] = this->getEntityIdWithPrefix(FPSTR(HA_ENTITY_SENSOR), F("fault_code"));
    doc[FPSTR(HA_ENTITY_CATEGORY)] = FPSTR(HA_ENTITY_CATEGORY_DIAGNOSTIC);
    doc[FPSTR(HA_NAME)] = F("Fault code");
    doc[FPSTR(HA_ICON)] = F("mdi:cog-box");
@@ -1116,8 +1141,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_OBJECT_ID)] = doc[FPSTR(HA_UNIQUE_ID)];
+    doc[FPSTR(HA_UNIQUE_ID)] = this->getUniqueIdWithPrefix(F("diagnostic_code"));
+    doc[FPSTR(HA_DEFAULT_ENTITY_ID)] = this->getEntityIdWithPrefix(FPSTR(HA_ENTITY_SENSOR), F("diagnostic_code"));
    doc[FPSTR(HA_ENTITY_CATEGORY)] = FPSTR(HA_ENTITY_CATEGORY_DIAGNOSTIC);
    doc[FPSTR(HA_NAME)] = F("Diagnostic code");
    doc[FPSTR(HA_ICON)] = F("mdi:information-box");
@@ -1133,8 +1158,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_OBJECT_ID)] = doc[FPSTR(HA_UNIQUE_ID)];
+    doc[FPSTR(HA_UNIQUE_ID)] = this->getUniqueIdWithPrefix(FPSTR(S_RSSI));
+    doc[FPSTR(HA_DEFAULT_ENTITY_ID)] = this->getEntityIdWithPrefix(FPSTR(HA_ENTITY_SENSOR), FPSTR(S_RSSI));
    doc[FPSTR(HA_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);
@@ -1153,8 +1178,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_OBJECT_ID)] = doc[FPSTR(HA_UNIQUE_ID)];
+    doc[FPSTR(HA_UNIQUE_ID)] = this->getUniqueIdWithPrefix(F("uptime"));
+    doc[FPSTR(HA_DEFAULT_ENTITY_ID)] = this->getEntityIdWithPrefix(FPSTR(HA_ENTITY_SENSOR), F("uptime"));
    doc[FPSTR(HA_ENTITY_CATEGORY)] = FPSTR(HA_ENTITY_CATEGORY_DIAGNOSTIC);
    doc[FPSTR(HA_DEVICE_CLASS)] = F("duration");
    doc[FPSTR(HA_STATE_CLASS)] = F("total_increasing");
@@ -1170,12 +1195,12 @@ public:
  }


-  bool publishClimateHeating(UnitSystem unit = UnitSystem::METRIC, byte minTemp = 20, byte maxTemp = 90, bool enabledByDefault = true) {
+  bool publishClimateHeating(UnitSystem unit = UnitSystem::METRIC, uint8_t minTemp = 20, uint8_t maxTemp = 90, 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"));
-    doc[FPSTR(HA_OBJECT_ID)] = doc[FPSTR(HA_UNIQUE_ID)];
+    doc[FPSTR(HA_UNIQUE_ID)] = this->getUniqueIdWithPrefix(F("heating"));
+    doc[FPSTR(HA_DEFAULT_ENTITY_ID)] = this->getEntityIdWithPrefix(FPSTR(HA_ENTITY_CLIMATE), F("heating"));
    doc[FPSTR(HA_NAME)] = F("Heating");
    doc[FPSTR(HA_ICON)] = F("mdi:radiator");

@@ -1215,19 +1240,19 @@ public:

    doc[FPSTR(HA_MIN_TEMP)] = minTemp;
    doc[FPSTR(HA_MAX_TEMP)] = maxTemp;
-    doc[FPSTR(HA_TEMP_STEP)] = 0.5f;
+    doc[FPSTR(HA_TEMP_STEP)] = 0.1f;
    doc[FPSTR(HA_EXPIRE_AFTER)] = this->expireAfter;
    doc.shrinkToFit();

    return this->publish(this->makeConfigTopic(FPSTR(HA_ENTITY_CLIMATE), F("heating"), '_').c_str(), doc);
  }

-  bool publishClimateDhw(UnitSystem unit = UnitSystem::METRIC, byte minTemp = 40, byte maxTemp = 60, bool enabledByDefault = true) {
+  bool publishClimateDhw(UnitSystem unit = UnitSystem::METRIC, uint8_t minTemp = 40, uint8_t maxTemp = 60, 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("dhw"));
-    doc[FPSTR(HA_OBJECT_ID)] = doc[FPSTR(HA_UNIQUE_ID)];
+    doc[FPSTR(HA_UNIQUE_ID)] = this->getUniqueIdWithPrefix(F("dhw"));
+    doc[FPSTR(HA_DEFAULT_ENTITY_ID)] = this->getEntityIdWithPrefix(FPSTR(HA_ENTITY_CLIMATE), F("dhw"));
    doc[FPSTR(HA_NAME)] = F("DHW");
    doc[FPSTR(HA_ICON)] = F("mdi:faucet");

@@ -1271,8 +1296,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_OBJECT_ID)] = doc[FPSTR(HA_UNIQUE_ID)];
+    doc[FPSTR(HA_UNIQUE_ID)] = this->getUniqueIdWithPrefix(FPSTR(S_RESTART));
+    doc[FPSTR(HA_DEFAULT_ENTITY_ID)] = this->getEntityIdWithPrefix(FPSTR(HA_ENTITY_BUTTON), FPSTR(S_RESTART));
    doc[FPSTR(HA_ENTITY_CATEGORY)] = FPSTR(HA_ENTITY_CATEGORY_CONFIG);
    doc[FPSTR(HA_DEVICE_CLASS)] = FPSTR(S_RESTART);
    doc[FPSTR(HA_NAME)] = F("Restart");
@@ -1291,8 +1316,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_OBJECT_ID)] = doc[FPSTR(HA_UNIQUE_ID)];
+    doc[FPSTR(HA_UNIQUE_ID)] = this->getUniqueIdWithPrefix(F("reset_fault"));
+    doc[FPSTR(HA_DEFAULT_ENTITY_ID)] = this->getEntityIdWithPrefix(FPSTR(HA_ENTITY_BUTTON), F("reset_fault"));
    doc[FPSTR(HA_ENTITY_CATEGORY)] = FPSTR(HA_ENTITY_CATEGORY_CONFIG);
    doc[FPSTR(HA_DEVICE_CLASS)] = FPSTR(S_RESTART);
    doc[FPSTR(HA_NAME)] = F("Reset fault");
@@ -1311,8 +1336,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_OBJECT_ID)] = doc[FPSTR(HA_UNIQUE_ID)];
+    doc[FPSTR(HA_UNIQUE_ID)] = this->getUniqueIdWithPrefix(F("reset_diagnostic"));
+    doc[FPSTR(HA_DEFAULT_ENTITY_ID)] = this->getEntityIdWithPrefix(FPSTR(HA_ENTITY_BUTTON), F("reset_diagnostic"));
    doc[FPSTR(HA_ENTITY_CATEGORY)] = FPSTR(HA_ENTITY_CATEGORY_CONFIG);
    doc[FPSTR(HA_DEVICE_CLASS)] = FPSTR(S_RESTART);
    doc[FPSTR(HA_NAME)] = F("Reset diagnostic");
--- a/src/MainTask.h
+++ b/src/MainTask.h
@@ -29,6 +29,7 @@ protected:
  enum class PumpStartReason {NONE, HEATING, ANTISTUCK};

  Blinker* blinker = nullptr;
+  unsigned long miscRunned = 0;
  unsigned long lastHeapInfo = 0;
  unsigned int minFreeHeap = 0;
  unsigned int minMaxFreeBlockHeap = 0;
@@ -42,6 +43,8 @@ protected:
  bool telnetStarted = false;
  bool emergencyDetected = false;
  unsigned long emergencyFlipTime = 0;
+  bool freezeDetected = false;
+  unsigned long freezeDetectedTime = 0;

  #if defined(ARDUINO_ARCH_ESP32)
  const char* getTaskName() override {
@@ -150,17 +153,16 @@ protected:

      Sensors::setConnectionStatusByType(Sensors::Type::MANUAL, false, false);
    }
-    this->yield();

-    this->emergency();
+    this->yield();
+    if (this->misc()) {
+      this->yield();
+    }
    this->ledStatus();
-    this->cascadeControl();
-    this->externalPump();
-    this->yield();
-

    // telnet
    if (this->telnetStarted) {
+      this->yield();
      telnetStream->loop();
      this->yield();
    }
@@ -179,14 +181,27 @@ protected:

    // heap info
    this->heap();
+  }

+  bool misc() {
+    if (millis() - this->miscRunned < 1000) {
+      return false;
+    }

-    // restart
+    // restart if required
    if (this->restartSignalReceived && millis() - this->restartSignalReceivedTime > 15000) {
      this->restartSignalReceived = false;

      ESP.restart();
    }
+
+    this->heating();
+    this->emergency();
+    this->cascadeControl();
+    this->externalPump();
+    this->miscRunned = millis();
+    
+    return true;
  }

  void heap() {
@@ -196,6 +211,7 @@ protected:
    // critical heap
    if (!vars.states.restarting && (freeHeap < 2048 || maxFreeBlockHeap < 2048)) {
      this->restartSignalReceivedTime = millis();
+      this->restartSignalReceived = true;
      vars.states.restarting = true;
    }

@@ -227,6 +243,65 @@ protected:
    }
  }

+  void heating() {
+    // freeze protection
+    if (!settings.heating.enabled) {
+      float lowTemp = 255.0f;
+      uint8_t availableSensors = 0;
+
+      if (Sensors::existsConnectedSensorsByPurpose(Sensors::Purpose::INDOOR_TEMP)) {
+        auto value = Sensors::getMeanValueByPurpose(Sensors::Purpose::INDOOR_TEMP, Sensors::ValueType::PRIMARY);
+        if (value < lowTemp) {
+          lowTemp = value;
+        }
+        
+        availableSensors++;
+      }
+
+      if (Sensors::existsConnectedSensorsByPurpose(Sensors::Purpose::HEATING_TEMP)) {
+        auto value = Sensors::getMeanValueByPurpose(Sensors::Purpose::HEATING_TEMP, Sensors::ValueType::PRIMARY);
+        if (value < lowTemp) {
+          lowTemp = value;
+        }
+        
+        availableSensors++;
+      }
+
+      if (Sensors::existsConnectedSensorsByPurpose(Sensors::Purpose::HEATING_RETURN_TEMP)) {
+        auto value = Sensors::getMeanValueByPurpose(Sensors::Purpose::HEATING_RETURN_TEMP, Sensors::ValueType::PRIMARY);
+        if (value < lowTemp) {
+          lowTemp = value;
+        }
+
+        availableSensors++;
+      }
+
+      if (availableSensors && lowTemp <= settings.heating.freezeProtection.lowTemp) {
+        if (!this->freezeDetected) {
+          this->freezeDetected = true;
+          this->freezeDetectedTime = millis();
+
+        } else if (millis() - this->freezeDetectedTime > (settings.heating.freezeProtection.thresholdTime * 1000)) {
+          this->freezeDetected = false;
+          settings.heating.enabled = true;
+          fsSettings.update();
+
+          Log.sinfoln(
+            FPSTR(L_MAIN),
+            F("Heating turned on by freeze protection, current low temp: %.2f, threshold: %hhu"),
+            lowTemp, settings.heating.freezeProtection.lowTemp
+          );
+        }
+
+      } else if (this->freezeDetected) {
+        this->freezeDetected = false;
+      }
+
+    } else if (this->freezeDetected) {
+      this->freezeDetected = false;
+    }
+  }
+
  void emergency() {
    // flags
    uint8_t emergencyFlags = 0b00000000;
@@ -534,7 +609,12 @@ protected:
      if (GPIO_IS_VALID(settings.externalPump.gpio)) {
        configuredGpio = settings.externalPump.gpio;
        pinMode(configuredGpio, OUTPUT);
-        digitalWrite(configuredGpio, LOW);
+        digitalWrite(
+          configuredGpio,
+          settings.externalPump.invertState
+            ? HIGH 
+            : LOW
+        );

      } else if (configuredGpio != GPIO_IS_NOT_CONFIGURED) {
        configuredGpio = GPIO_IS_NOT_CONFIGURED;
@@ -562,7 +642,12 @@ protected:
    
    if (!settings.externalPump.use) {
      if (vars.externalPump.state) {
-        digitalWrite(configuredGpio, LOW);
+        digitalWrite(
+          configuredGpio,
+          settings.externalPump.invertState
+            ? HIGH 
+            : LOW
+        );

        vars.externalPump.state = false;
        vars.externalPump.lastEnabledTime = millis();
@@ -575,7 +660,12 @@ protected:

    if (vars.externalPump.state && !this->heatingEnabled) {
      if (this->extPumpStartReason == MainTask::PumpStartReason::HEATING && millis() - this->heatingDisabledTime > (settings.externalPump.postCirculationTime * 1000u)) {
-        digitalWrite(configuredGpio, LOW);
+        digitalWrite(
+          configuredGpio,
+          settings.externalPump.invertState
+            ? HIGH 
+            : LOW
+        );

        vars.externalPump.state = false;
        vars.externalPump.lastEnabledTime = millis();
@@ -583,7 +673,12 @@ protected:
        Log.sinfoln(FPSTR(L_EXTPUMP), F("Disabled: expired post circulation time"));

      } else if (this->extPumpStartReason == MainTask::PumpStartReason::ANTISTUCK && millis() - this->externalPumpStartTime >= (settings.externalPump.antiStuckTime * 1000u)) {
-        digitalWrite(configuredGpio, LOW);
+        digitalWrite(
+          configuredGpio,
+          settings.externalPump.invertState
+            ? HIGH 
+            : LOW
+        );

        vars.externalPump.state = false;
        vars.externalPump.lastEnabledTime = millis();
@@ -599,7 +694,12 @@ protected:
      this->externalPumpStartTime = millis();
      this->extPumpStartReason = MainTask::PumpStartReason::HEATING;

-      digitalWrite(configuredGpio, HIGH);
+      digitalWrite(
+        configuredGpio,
+        settings.externalPump.invertState
+          ? LOW 
+          : HIGH
+      );

      Log.sinfoln(FPSTR(L_EXTPUMP), F("Enabled: heating on"));

@@ -608,7 +708,12 @@ protected:
      this->externalPumpStartTime = millis();
      this->extPumpStartReason = MainTask::PumpStartReason::ANTISTUCK;

-      digitalWrite(configuredGpio, HIGH);
+      digitalWrite(
+        configuredGpio,
+        settings.externalPump.invertState
+          ? LOW 
+          : HIGH
+      );

      Log.sinfoln(FPSTR(L_EXTPUMP), F("Enabled: anti stuck"));
    }
--- a/src/MqttTask.h
+++ b/src/MqttTask.h
@@ -70,8 +70,8 @@ public:
    this->prevPubVarsTime = 0;
  }

-  inline void rebuildHaEntity(uint8_t sensorId, Sensors::Settings& prevSettings) {
-    this->queueRebuildingHaEntities[sensorId] = prevSettings;
+  inline void reconfigureSensor(uint8_t sensorId, Sensors::Settings& prevSettings) {
+    this->queueReconfigureSensors[sensorId] = prevSettings;
  }

 protected:
@@ -81,7 +81,7 @@ protected:
  MqttWriter* writer = nullptr;
  UnitSystem currentUnitSystem = UnitSystem::METRIC;
  bool currentHomeAssistantDiscovery = false;
-  std::unordered_map<uint8_t, Sensors::Settings> queueRebuildingHaEntities;
+  std::unordered_map<uint8_t, Sensors::Settings> queueReconfigureSensors;
  unsigned short readyForSendTime = 30000;
  unsigned long lastReconnectTime = 0;
  unsigned long connectedTime = 0;
@@ -276,8 +276,8 @@ protected:
        this->publishNonStaticHaEntities();
      }

-
-      for (auto& [sensorId, prevSettings] : this->queueRebuildingHaEntities) {
+      // rebuilding ha configs
+      for (auto& [sensorId, prevSettings] : this->queueReconfigureSensors) {
        Log.sinfoln(FPSTR(L_MQTT_HA), F("Rebuilding config for sensor #%hhu '%s'"), sensorId, prevSettings.name);

        // delete old config
@@ -297,15 +297,6 @@ protected:
              this->haHelper->deleteSignalQualityDynamicSensor(prevSettings);
              this->haHelper->deleteDynamicSensor(prevSettings, Sensors::ValueType::TEMPERATURE);
              break;
-            
-            case Sensors::Type::MANUAL:
-              this->client->unsubscribe(
-                this->haHelper->getDeviceTopic(
-                  F("sensors"),
-                  Sensors::makeObjectId(prevSettings.name).c_str(),
-                  F("set")
-                ).c_str()
-              );

            default:
              this->haHelper->deleteDynamicSensor(prevSettings, Sensors::ValueType::PRIMARY);
@@ -333,26 +324,51 @@ protected:
            this->haHelper->publishSignalQualityDynamicSensor(sSettings, false);
            this->haHelper->publishDynamicSensor(sSettings, Sensors::ValueType::TEMPERATURE, settings.system.unitSystem);
            break;
-
-          case Sensors::Type::MANUAL: 
-            this->client->subscribe(
-              this->haHelper->getDeviceTopic(
-                F("sensors"),
-                Sensors::makeObjectId(prevSettings.name).c_str(),
-                F("set")
-              ).c_str()
-            );
          
          default:
            this->haHelper->publishDynamicSensor(sSettings, Sensors::ValueType::PRIMARY, settings.system.unitSystem);
        }
      }
-      this->queueRebuildingHaEntities.clear();

    } else if (this->currentHomeAssistantDiscovery) {
      this->currentHomeAssistantDiscovery = false;
    }

+    // reconfigure manual sensors
+    for (auto& [sensorId, prevSettings] : this->queueReconfigureSensors) {
+      // unsubscribe from old topic
+      if (strlen(prevSettings.name) && prevSettings.enabled) {
+        if (prevSettings.type == Sensors::Type::MANUAL) {
+          this->client->unsubscribe(
+            this->haHelper->getDeviceTopic(
+              F("sensors"),
+              Sensors::makeObjectId(prevSettings.name).c_str(),
+              F("set")
+            ).c_str()
+          );
+        }
+      }
+
+      if (!Sensors::hasEnabledAndValid(sensorId)) {
+        continue;
+      }
+
+      // subscribe to new topic
+      auto& sSettings = Sensors::settings[sensorId];
+      if (sSettings.type == Sensors::Type::MANUAL) {
+        this->client->subscribe(
+          this->haHelper->getDeviceTopic(
+            F("sensors"),
+            Sensors::makeObjectId(sSettings.name).c_str(),
+            F("set")
+          ).c_str()
+        );
+      }
+    }
+
+    // clear queue
+    this->queueReconfigureSensors.clear();
+
    if (this->newConnection) {
      this->newConnection = false;
    }
@@ -366,6 +382,26 @@ protected:

    this->client->subscribe(this->haHelper->getDeviceTopic(F("settings/set")).c_str());
    this->client->subscribe(this->haHelper->getDeviceTopic(F("state/set")).c_str());
+
+    // subscribe to manual sensors
+    for (uint8_t sensorId = 0; sensorId <= Sensors::getMaxSensorId(); sensorId++) {
+      if (!Sensors::hasEnabledAndValid(sensorId)) {
+        continue;
+      }
+
+      auto& sSettings = Sensors::settings[sensorId];
+      if (sSettings.type != Sensors::Type::MANUAL) {
+        continue;
+      }
+
+      this->client->subscribe(
+        this->haHelper->getDeviceTopic(
+          F("sensors"),
+          Sensors::makeObjectId(sSettings.name).c_str(),
+          F("set")
+        ).c_str()
+      );
+    }
  }

  void onDisconnect() {
@@ -466,9 +502,10 @@ protected:

    // equitherm
    this->haHelper->publishSwitchEquitherm();
-    this->haHelper->publishInputEquithermFactorN(false);
-    this->haHelper->publishInputEquithermFactorK(false);
-    this->haHelper->publishInputEquithermFactorT(false);
+    this->haHelper->publishInputEquithermSlope(false);
+    this->haHelper->publishInputEquithermExponent(false);
+    this->haHelper->publishInputEquithermShift(false);
+    this->haHelper->publishInputEquithermTargetDiffFactor(false);

    // states
    this->haHelper->publishStatusState();
@@ -513,15 +550,6 @@ protected:
          this->haHelper->publishSignalQualityDynamicSensor(sSettings, false);
          this->haHelper->publishDynamicSensor(sSettings, Sensors::ValueType::TEMPERATURE, settings.system.unitSystem);
          break;
-
-        case Sensors::Type::MANUAL:
-          this->client->subscribe(
-            this->haHelper->getDeviceTopic(
-              F("sensors"),
-              Sensors::makeObjectId(sSettings.name).c_str(),
-              F("set")
-            ).c_str()
-          );
        
        default:
          this->haHelper->publishDynamicSensor(sSettings, Sensors::ValueType::PRIMARY, settings.system.unitSystem);
@@ -530,7 +558,7 @@ protected:
  }

  bool publishNonStaticHaEntities(bool force = false) {
-    static byte _heatingMinTemp, _heatingMaxTemp, _dhwMinTemp, _dhwMaxTemp = 0;
+    static uint8_t _heatingMinTemp, _heatingMaxTemp, _dhwMinTemp, _dhwMaxTemp = 0;
    static bool _indoorTempControl, _dhwSupport = false;

    bool published = false;
--- a/src/OpenThermTask.h
+++ b/src/OpenThermTask.h
@@ -19,8 +19,8 @@ protected:

  CustomOpenTherm* instance = nullptr;
  unsigned long instanceCreatedTime = 0;
-  byte instanceInGpio = 0;
-  byte instanceOutGpio = 0;
+  uint8_t instanceInGpio = 0;
+  uint8_t instanceOutGpio = 0;
  bool initialized = false;
  unsigned long connectedTime = 0;
  unsigned long disconnectedTime = 0;
@@ -31,7 +31,7 @@ protected:
  unsigned long heatingSetTempTime = 0;
  unsigned long dhwSetTempTime = 0;
  unsigned long ch2SetTempTime = 0;
-  byte configuredRxLedGpio = GPIO_IS_NOT_CONFIGURED;
+  uint8_t configuredRxLedGpio = GPIO_IS_NOT_CONFIGURED;

  #if defined(ARDUINO_ARCH_ESP32)
  const char* getTaskName() override {
@@ -90,11 +90,16 @@ protected:

    Log.sinfoln(FPSTR(L_OT), F("Started. GPIO IN: %hhu, GPIO OUT: %hhu"), settings.opentherm.inGpio, settings.opentherm.outGpio);

-    this->instance->setAfterSendRequestCallback([this](unsigned long request, unsigned long response, OpenThermResponseStatus status, byte attempt) {
+    this->instance->setAfterSendRequestCallback([this](unsigned long request, unsigned long response, OpenThermResponseStatus status, uint8_t attempt) {
      Log.sverboseln(
        FPSTR(L_OT),
-        F("ID: %4d   Request: %8lx   Response: %8lx   Attempt: %2d   Status: %s"),
-        CustomOpenTherm::getDataID(request), request, response, attempt, CustomOpenTherm::statusToString(status)
+        F("ID: %4d   Request: %8lx   Response: %8lx   Msg type: %s   Attempt: %2d   Status: %s"),
+        CustomOpenTherm::getDataID(request),
+        request,
+        response,
+        CustomOpenTherm::getResponseMessageTypeString(response),
+        attempt,
+        CustomOpenTherm::statusToString(status)
      );

      if (status == OpenThermResponseStatus::SUCCESS) {
@@ -138,7 +143,12 @@ protected:
      return;

    } else if (this->instance->status == OpenThermStatus::NOT_INITIALIZED) {
-      this->instance->begin();
+      if (!this->instance->begin()) {
+        Log.swarningln(FPSTR(L_OT), F("Failed begin"));
+
+        this->delay(5000);
+        return;
+      }
    }

    // RX LED GPIO setup
@@ -159,12 +169,15 @@ protected:

    // Heating settings
    vars.master.heating.enabled = this->isReady()
-      && (settings.heating.enabled || vars.emergency.state) 
+      && settings.heating.enabled
      && vars.cascadeControl.input 
-      && !vars.master.heating.blocking;
+      && !vars.master.heating.blocking
+      && !vars.master.heating.overheat;

    // DHW settings
-    vars.master.dhw.enabled = settings.opentherm.options.dhwSupport && settings.dhw.enabled;
+    vars.master.dhw.enabled = settings.opentherm.options.dhwSupport 
+      && settings.dhw.enabled 
+      && !vars.master.dhw.overheat;
    vars.master.dhw.targetTemp = settings.dhw.target;

    // CH2 settings
@@ -195,6 +208,12 @@ protected:
      summerWinterMode = vars.master.heating.enabled == summerWinterMode;
    }

+    // DHW blocking
+    bool dhwBlocking = settings.opentherm.options.dhwBlocking;
+    if (settings.opentherm.options.dhwStateAsDhwBlocking) {
+      dhwBlocking = vars.master.dhw.enabled == dhwBlocking;
+    }
+
    unsigned long response = this->instance->setBoilerStatus(
      vars.master.heating.enabled,
      vars.master.dhw.enabled,
@@ -202,7 +221,7 @@ protected:
      settings.opentherm.options.nativeHeatingControl,
      vars.master.ch2.enabled,
      summerWinterMode,
-      settings.opentherm.options.dhwBlocking,
+      dhwBlocking,
      statusLb
    );

@@ -212,9 +231,35 @@ protected:
        F("Failed receive boiler status: %s"),
        CustomOpenTherm::statusToString(this->instance->getLastResponseStatus())
      );
+      
+    } else {
+      vars.slave.heating.active = CustomOpenTherm::isCentralHeatingActive(response);
+      vars.slave.dhw.active = settings.opentherm.options.dhwSupport ? CustomOpenTherm::isHotWaterActive(response) : false;
+      vars.slave.flame = CustomOpenTherm::isFlameOn(response);
+      vars.slave.cooling.active = CustomOpenTherm::isCoolingActive(response);
+      vars.slave.ch2.active = CustomOpenTherm::isCh2Active(response);
+      vars.slave.fault.active = CustomOpenTherm::isFault(response);
+
+      if (!settings.opentherm.options.ignoreDiagState) {
+        vars.slave.diag.active = CustomOpenTherm::isDiagnostic(response);
+
+      } else if (vars.slave.diag.active) {
+        vars.slave.diag.active = false;
+      }
+  
+      Log.snoticeln(
+        FPSTR(L_OT), F("Received boiler status. Heating: %hhu; DHW: %hhu; flame: %hhu; cooling: %hhu; channel 2: %hhu; fault: %hhu; diag: %hhu"),
+        vars.slave.heating.active, vars.slave.dhw.active,
+        vars.slave.flame, vars.slave.cooling.active, vars.slave.ch2.active, vars.slave.fault.active, vars.slave.diag.active
+      );
    }

-    if (!vars.slave.connected && millis() - this->lastSuccessResponse < 1325) {
+    // 5 request retries
+    // 1000ms maximum response waiting time
+    // 100ms delay between requests
+    // +15%
+    // 5 * (1000 + 100) * 1.15 = 6325 ms
+    if (!vars.slave.connected && millis() - this->lastSuccessResponse < 6325) {
      Log.sinfoln(
        FPSTR(L_OT),
        F("Connected, downtime: %lu s."),
@@ -224,7 +269,7 @@ protected:
      this->connectedTime = millis();
      vars.slave.connected = true;
      
-    } else if (vars.slave.connected && millis() - this->lastSuccessResponse > 1325) {
+    } else if (vars.slave.connected && millis() - this->lastSuccessResponse > 6325) {
      Log.swarningln(
        FPSTR(L_OT),
        F("Disconnected, uptime: %lu s."),
@@ -252,6 +297,15 @@ protected:
      Sensors::setConnectionStatusByType(Sensors::Type::OT_FAN_SPEED_SETPOINT, false);
      Sensors::setConnectionStatusByType(Sensors::Type::OT_FAN_SPEED_CURRENT, false);

+      Sensors::setConnectionStatusByType(Sensors::Type::OT_BURNER_STARTS, false);
+      Sensors::setConnectionStatusByType(Sensors::Type::OT_DHW_BURNER_STARTS, false);
+      Sensors::setConnectionStatusByType(Sensors::Type::OT_HEATING_PUMP_STARTS, false);
+      Sensors::setConnectionStatusByType(Sensors::Type::OT_DHW_PUMP_STARTS, false);
+      Sensors::setConnectionStatusByType(Sensors::Type::OT_BURNER_HOURS, false);
+      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);
+
      this->initialized = false;
      this->disconnectedTime = millis();
      vars.slave.connected = false;
@@ -264,6 +318,8 @@ protected:
      vars.slave.dhw.enabled = false;
      vars.slave.dhw.active = false;
      vars.slave.flame = false;
+      vars.slave.cooling.active = false;
+      vars.slave.cooling.setpoint = 0;
      vars.slave.fault.active = false;
      vars.slave.fault.code = 0;
      vars.slave.diag.active = false;
@@ -305,34 +361,60 @@ protected:
      Log.sinfoln(FPSTR(L_OT_DHW), vars.master.dhw.enabled ? F("Enabled") : F("Disabled"));
    }

-    vars.slave.heating.active = CustomOpenTherm::isCentralHeatingActive(response);
-    vars.slave.dhw.active = settings.opentherm.options.dhwSupport ? CustomOpenTherm::isHotWaterActive(response) : false;
-    vars.slave.flame = CustomOpenTherm::isFlameOn(response);
-    vars.slave.cooling = CustomOpenTherm::isCoolingActive(response);
-    vars.slave.fault.active = CustomOpenTherm::isFault(response);
-    vars.slave.diag.active = CustomOpenTherm::isDiagnostic(response);
-
-    Log.snoticeln(
-      FPSTR(L_OT), F("Received boiler status. Heating: %hhu; DHW: %hhu; flame: %hhu; cooling: %hhu; fault: %hhu; diag: %hhu"),
-      vars.slave.heating.active, vars.slave.dhw.active,
-      vars.slave.flame, vars.slave.cooling, vars.slave.fault.active, vars.slave.diag.active
-    );
-
    // These parameters will be updated every minute
    if (millis() - this->prevUpdateNonEssentialVars > 60000) {
+      // Set date & time
+      if (settings.opentherm.options.setDateAndTime) {
+        struct tm ti;
+
+        if (getLocalTime(&ti)) {
+          if (this->setYear(&ti)) {
+            Log.sinfoln(FPSTR(L_OT), F("Year of date set successfully"));
+
+          } else {
+            Log.sinfoln(FPSTR(L_OT), F("Failed set year of date"));
+          }
+
+          if (this->setDayAndMonth(&ti)) {
+            Log.sinfoln(FPSTR(L_OT), F("Day and month of date set successfully"));
+
+          } else {
+            Log.sinfoln(FPSTR(L_OT), F("Failed set day and month of date"));
+          }
+
+          if (this->setTime(&ti)) {
+            Log.sinfoln(FPSTR(L_OT), F("Time set successfully"));
+
+          } else {
+            Log.sinfoln(FPSTR(L_OT), F("Failed set time"));
+          }
+        }
+      }
+
+      // Get min modulation level & max power
      if (this->updateMinModulationLevel()) {
        Log.snoticeln(
          FPSTR(L_OT), F("Received min modulation: %hhu%%, max power: %.2f kW"),
          vars.slave.modulation.min, vars.slave.power.max
        );
        
-        if (settings.opentherm.maxModulation < vars.slave.modulation.min) {
-          settings.opentherm.maxModulation = vars.slave.modulation.min;
+        if (settings.heating.maxModulation < vars.slave.modulation.min) {
+          settings.heating.maxModulation = vars.slave.modulation.min;
          fsSettings.update();

          Log.swarningln(
-            FPSTR(L_SETTINGS_OT), F("Updated min modulation: %hhu%%"),
-            settings.opentherm.maxModulation
+            FPSTR(L_SETTINGS_HEATING), F("Updated min modulation: %hhu%%"),
+            settings.heating.maxModulation
+          );
+        }
+
+        if (settings.dhw.maxModulation < vars.slave.modulation.min) {
+          settings.dhw.maxModulation = vars.slave.modulation.min;
+          fsSettings.update();
+
+          Log.swarningln(
+            FPSTR(L_SETTINGS_DHW), F("Updated min modulation: %hhu%%"),
+            settings.dhw.maxModulation
          );
        }

@@ -351,29 +433,6 @@ protected:
        Log.swarningln(FPSTR(L_OT), F("Failed receive min modulation and max power"));
      }

-      if (!vars.master.heating.enabled && settings.opentherm.options.modulationSyncWithHeating) {
-        if (this->setMaxModulationLevel(0)) {
-          Log.snoticeln(FPSTR(L_OT), F("Set max modulation: 0% (response: %hhu%%)"), vars.slave.modulation.max);
-
-        } else {
-          Log.swarningln(FPSTR(L_OT), F("Failed set max modulation: 0% (response: %hhu%%)"), vars.slave.modulation.max);
-        }
-
-      } else {
-        if (this->setMaxModulationLevel(settings.opentherm.maxModulation)) {
-          Log.snoticeln(
-            FPSTR(L_OT), F("Set max modulation: %hhu%% (response: %hhu%%)"),
-            settings.opentherm.maxModulation, vars.slave.modulation.max
-          );
-
-        } else {
-          Log.swarningln(
-            FPSTR(L_OT), F("Failed set max modulation: %hhu%% (response: %hhu%%)"),
-            settings.opentherm.maxModulation, vars.slave.modulation.max
-          );
-        }
-      }
-

      // Get DHW min/max temp (if necessary)
      if (settings.opentherm.options.dhwSupport && settings.opentherm.options.getMinMaxTemp) {
@@ -498,9 +557,176 @@ protected:
        vars.slave.diag.code = 0;
      }

+      // Update burner starts
+      if (Sensors::getAmountByType(Sensors::Type::OT_BURNER_STARTS, true)) {
+        if (this->updateBurnerStarts()) {
+          Log.snoticeln(FPSTR(L_OT), F("Received burner starts: %hu"), vars.slave.stats.burnerStarts);
+
+          Sensors::setValueByType(
+            Sensors::Type::OT_BURNER_STARTS, vars.slave.stats.burnerStarts,
+            Sensors::ValueType::PRIMARY, true, true
+          );
+
+        } else {
+          Log.swarningln(FPSTR(L_OT), F("Failed receive burner starts"));
+        }
+      }
+
+      // Update DHW burner starts
+      if (Sensors::getAmountByType(Sensors::Type::OT_DHW_BURNER_STARTS, true)) {
+        if (this->updateDhwBurnerStarts()) {
+          Log.snoticeln(FPSTR(L_OT), F("Received DHW burner starts: %hu"), vars.slave.stats.dhwBurnerStarts);
+
+          Sensors::setValueByType(
+            Sensors::Type::OT_DHW_BURNER_STARTS, vars.slave.stats.dhwBurnerStarts,
+            Sensors::ValueType::PRIMARY, true, true
+          );
+
+        } else {
+          Log.swarningln(FPSTR(L_OT), F("Failed receive DHW burner starts"));
+        }
+      }
+
+      // Update heating pump starts
+      if (Sensors::getAmountByType(Sensors::Type::OT_HEATING_PUMP_STARTS, true)) {
+        if (this->updateHeatingPumpStarts()) {
+          Log.snoticeln(FPSTR(L_OT), F("Received heating pump starts: %hu"), vars.slave.stats.heatingPumpStarts);
+
+          Sensors::setValueByType(
+            Sensors::Type::OT_HEATING_PUMP_STARTS, vars.slave.stats.heatingPumpStarts,
+            Sensors::ValueType::PRIMARY, true, true
+          );
+
+        } else {
+          Log.swarningln(FPSTR(L_OT), F("Failed receive heating pump starts"));
+        }
+      }
+
+      // Update DHW pump starts
+      if (Sensors::getAmountByType(Sensors::Type::OT_DHW_PUMP_STARTS, true)) {
+        if (this->updateDhwPumpStarts()) {
+          Log.snoticeln(FPSTR(L_OT), F("Received DHW pump starts: %hu"), vars.slave.stats.dhwPumpStarts);
+
+          Sensors::setValueByType(
+            Sensors::Type::OT_DHW_PUMP_STARTS, vars.slave.stats.dhwPumpStarts,
+            Sensors::ValueType::PRIMARY, true, true
+          );
+
+        } else {
+          Log.swarningln(FPSTR(L_OT), F("Failed receive DHW pump starts"));
+        }
+      }
+
+      // Update burner hours
+      if (Sensors::getAmountByType(Sensors::Type::OT_BURNER_HOURS, true)) {
+        if (this->updateBurnerHours()) {
+          Log.snoticeln(FPSTR(L_OT), F("Received burner hours: %hu"), vars.slave.stats.burnerHours);
+
+          Sensors::setValueByType(
+            Sensors::Type::OT_BURNER_HOURS, vars.slave.stats.burnerHours,
+            Sensors::ValueType::PRIMARY, true, true
+          );
+
+        } else {
+          Log.swarningln(FPSTR(L_OT), F("Failed receive burner hours"));
+        }
+      }
+
+      // Update DHW burner hours
+      if (Sensors::getAmountByType(Sensors::Type::OT_DHW_BURNER_HOURS, true)) {
+        if (this->updateDhwBurnerHours()) {
+          Log.snoticeln(FPSTR(L_OT), F("Received DHW burner hours: %hu"), vars.slave.stats.dhwBurnerHours);
+
+          Sensors::setValueByType(
+            Sensors::Type::OT_DHW_BURNER_HOURS, vars.slave.stats.dhwBurnerHours,
+            Sensors::ValueType::PRIMARY, true, true
+          );
+
+        } else {
+          Log.swarningln(FPSTR(L_OT), F("Failed receive DHW burner hours"));
+        }
+      }
+
+      // Update heating pump hours
+      if (Sensors::getAmountByType(Sensors::Type::OT_HEATING_PUMP_HOURS, true)) {
+        if (this->updateHeatingPumpHours()) {
+          Log.snoticeln(FPSTR(L_OT), F("Received heating pump hours: %hu"), vars.slave.stats.heatingPumpHours);
+
+          Sensors::setValueByType(
+            Sensors::Type::OT_HEATING_PUMP_HOURS, vars.slave.stats.heatingPumpHours,
+            Sensors::ValueType::PRIMARY, true, true
+          );
+
+        } else {
+          Log.swarningln(FPSTR(L_OT), F("Failed receive heating pump hours"));
+        }
+      }
+
+      // Update DHW pump hours
+      if (Sensors::getAmountByType(Sensors::Type::OT_DHW_PUMP_HOURS, true)) {
+        if (this->updateDhwPumpHours()) {
+          Log.snoticeln(FPSTR(L_OT), F("Received DHW pump hours: %hu"), vars.slave.stats.dhwPumpHours);
+
+          Sensors::setValueByType(
+            Sensors::Type::OT_DHW_PUMP_HOURS, vars.slave.stats.dhwPumpHours,
+            Sensors::ValueType::PRIMARY, true, true
+          );
+
+        } else {
+          Log.swarningln(FPSTR(L_OT), F("Failed receive DHW pump hours"));
+        }
+      }
+
+      // Auto fault reset
+      if (settings.opentherm.options.autoFaultReset && vars.slave.fault.active && !vars.actions.resetFault) {
+        vars.actions.resetFault = true;
+      }
+
+      // Auto diag reset
+      if (settings.opentherm.options.autoDiagReset && vars.slave.diag.active && !vars.actions.resetDiagnostic) {
+        vars.actions.resetDiagnostic = true;
+      }
+
      this->prevUpdateNonEssentialVars = millis();
    }

+    // Set cooling setpoint = heating max modulation
+    if (settings.opentherm.options.coolingSupport) {
+      if (this->setCoolingSetpoint(settings.heating.maxModulation)) {
+        Log.snoticeln(
+          FPSTR(L_OT), F("Set cooling setpoint: %hhu%% (response: %hhu%%)"),
+          settings.heating.maxModulation, vars.slave.cooling.setpoint
+        );
+
+      } else {
+        Log.swarningln(
+          FPSTR(L_OT), F("Failed set cooling setpoint: %hhu%% (response: %hhu%%)"),
+          settings.heating.maxModulation, vars.slave.cooling.setpoint
+        );
+      }
+    }
+
+    // Set max modulation level
+    uint8_t targetMaxModulation = vars.slave.modulation.max;
+    if (vars.slave.heating.active) {
+      targetMaxModulation = settings.heating.maxModulation;
+
+    } else if (vars.slave.dhw.active) {
+      targetMaxModulation = settings.dhw.maxModulation;
+    }
+
+    if (this->setMaxModulationLevel(targetMaxModulation)) {
+      Log.snoticeln(
+        FPSTR(L_OT), F("Set max modulation: %hhu%% (response: %hhu%%)"),
+        targetMaxModulation, vars.slave.modulation.max
+      );
+
+    } else {
+      Log.swarningln(
+        FPSTR(L_OT), F("Failed set max modulation: %hhu%% (response: %hhu%%)"),
+        targetMaxModulation, vars.slave.modulation.max
+      );
+    }

    // Update modulation level
    if (
@@ -1109,6 +1335,84 @@ protected:
        }
      }
    }
+
+
+    // Heating overheat control
+    if (settings.heating.overheatProtection.highTemp > 0 && settings.heating.overheatProtection.lowTemp > 0) {
+      float highTemp = convertTemp(
+        max({
+          vars.slave.heating.currentTemp,
+          vars.slave.heating.returnTemp,
+          vars.slave.heatExchangerTemp
+        }),
+        settings.opentherm.unitSystem,
+        settings.system.unitSystem
+      );
+
+      if (vars.master.heating.overheat) {
+        if ((float) settings.heating.overheatProtection.lowTemp - highTemp + 0.0001f >= 0.0f) {
+          vars.master.heating.overheat = false;
+
+          Log.sinfoln(
+            FPSTR(L_OT_HEATING), F("Overheating not detected. Current high temp: %.2f, threshold (low): %hhu"),
+            highTemp, settings.heating.overheatProtection.lowTemp
+          );
+        }
+
+      } else if (vars.slave.heating.active) {
+        if (highTemp - (float) settings.heating.overheatProtection.highTemp + 0.0001f >= 0.0f) {
+          vars.master.heating.overheat = true;
+
+          Log.swarningln(
+            FPSTR(L_OT_HEATING), F("Overheating detected! Current high temp: %.2f, threshold (high): %hhu"),
+            highTemp, settings.heating.overheatProtection.highTemp
+          );
+        }
+      }
+
+    } else if (vars.master.heating.overheat) {
+      vars.master.heating.overheat = false;
+    }
+
+    // DHW overheat control
+    if (settings.dhw.overheatProtection.highTemp > 0 && settings.dhw.overheatProtection.lowTemp > 0) {
+      float highTemp = convertTemp(
+        max({
+          vars.slave.heating.currentTemp,
+          vars.slave.heating.returnTemp,
+          vars.slave.heatExchangerTemp,
+          vars.slave.dhw.currentTemp,
+          vars.slave.dhw.currentTemp2,
+          vars.slave.dhw.returnTemp
+        }),
+        settings.opentherm.unitSystem,
+        settings.system.unitSystem
+      );
+
+      if (vars.master.dhw.overheat) {
+        if ((float) settings.dhw.overheatProtection.lowTemp - highTemp + 0.0001f >= 0.0f) {
+          vars.master.dhw.overheat = false;
+
+          Log.sinfoln(
+            FPSTR(L_OT_DHW), F("Overheating not detected. Current high temp: %.2f, threshold (low): %hhu"),
+            highTemp, settings.dhw.overheatProtection.lowTemp
+          );
+        }
+
+      } else if (vars.slave.dhw.active) {
+        if (highTemp - (float) settings.dhw.overheatProtection.highTemp + 0.0001f >= 0.0f) {
+          vars.master.dhw.overheat = true;
+
+          Log.swarningln(
+            FPSTR(L_OT_DHW), F("Overheating detected! Current high temp: %.2f, threshold (high): %hhu"),
+            highTemp, settings.dhw.overheatProtection.highTemp
+          );
+        }
+      }
+
+    } else if (vars.master.dhw.overheat) {
+      vars.master.dhw.overheat = false;
+    }
  }

  void initialize() {
@@ -1174,17 +1478,17 @@ protected:

  bool needSetDhwTemp(const float target) {
    return millis() - this->dhwSetTempTime > this->dhwSetTempInterval
-      || fabsf(target - vars.slave.dhw.targetTemp) > 0.001f;
+      || fabsf(target - vars.slave.dhw.targetTemp) > 0.05f;
  }

  bool needSetHeatingTemp(const float target) {
    return millis() - this->heatingSetTempTime > this->heatingSetTempInterval
-      || fabsf(target - vars.slave.heating.targetTemp) > 0.001f;
+      || fabsf(target - vars.slave.heating.targetTemp) > 0.05f;
  }

  bool needSetCh2Temp(const float target) {
    return millis() - this->ch2SetTempTime > this->ch2SetTempInterval
-      || fabsf(target - vars.slave.ch2.targetTemp) > 0.001f;
+      || fabsf(target - vars.slave.ch2.targetTemp) > 0.05f;
  }

  bool updateSlaveConfig() {
@@ -1223,6 +1527,84 @@ protected:
    return true;
  }

+  bool setYear(const struct tm *ptm) {
+    const unsigned int request = (ptm->tm_year + 1900) & 0xFFFF;
+    const unsigned long response = this->instance->sendRequest(CustomOpenTherm::buildRequest(
+      OpenThermRequestType::WRITE_DATA,
+      OpenThermMessageID::Year,
+      request
+    ));
+
+    if (!CustomOpenTherm::isValidResponse(response)) {
+      return false;
+
+    } else if (!CustomOpenTherm::isValidResponseId(response, OpenThermMessageID::Year)) {
+      return false;
+    }
+
+    return CustomOpenTherm::getUInt(response) == request;
+  }
+
+  bool setDayAndMonth(const struct tm *ptm) {
+    const uint8_t month = (ptm->tm_mon + 1) & 0xFF;
+    const unsigned int request = (month << 8) | (ptm->tm_mday & 0xFF);
+    const unsigned long response = this->instance->sendRequest(CustomOpenTherm::buildRequest(
+      OpenThermRequestType::WRITE_DATA,
+      OpenThermMessageID::Date,
+      request
+    ));
+
+    if (!CustomOpenTherm::isValidResponse(response)) {
+      return false;
+
+    } else if (!CustomOpenTherm::isValidResponseId(response, OpenThermMessageID::Date)) {
+      return false;
+    }
+
+    return CustomOpenTherm::getUInt(response) == request;
+  }
+
+  bool setTime(const struct tm *ptm) {
+    const uint8_t dayOfWeek = ptm->tm_wday == 0 ? 6 : ptm->tm_wday - 1;
+    const unsigned int request = ((dayOfWeek & 0x07) << 13)
+      | ((ptm->tm_hour & 0x1F) << 8)
+      | (ptm->tm_min & 0x3F);
+    
+    const unsigned long response = this->instance->sendRequest(CustomOpenTherm::buildRequest(
+      OpenThermRequestType::WRITE_DATA,
+      OpenThermMessageID::DayTime,
+      request
+    ));
+
+    if (!CustomOpenTherm::isValidResponse(response)) {
+      return false;
+
+    } else if (!CustomOpenTherm::isValidResponseId(response, OpenThermMessageID::DayTime)) {
+      return false;
+    }
+
+    return CustomOpenTherm::getUInt(response) == request;
+  }
+
+  bool setCoolingSetpoint(const uint8_t value) {
+    const unsigned int request = CustomOpenTherm::toFloat(value);
+    const unsigned long response = this->instance->sendRequest(CustomOpenTherm::buildRequest(
+      OpenThermRequestType::WRITE_DATA,
+      OpenThermMessageID::CoolingControl,
+      request
+    ));
+
+    if (!CustomOpenTherm::isValidResponse(response)) {
+      return false;
+
+    } else if (!CustomOpenTherm::isValidResponseId(response, OpenThermMessageID::CoolingControl)) {
+      return false;
+    }
+
+    vars.slave.cooling.setpoint = CustomOpenTherm::getFloat(response);
+
+    return CustomOpenTherm::getUInt(response) == request;
+  }

  bool setMaxModulationLevel(const uint8_t value) {
    const unsigned int request = CustomOpenTherm::toFloat(value);
@@ -1345,7 +1727,7 @@ protected:
    return CustomOpenTherm::getUInt(response) == request;
  }

-  bool setMaxHeatingTemp(const uint8_t temperature) {
+  bool setMaxHeatingTemp(const float temperature) {
    const unsigned int request = CustomOpenTherm::temperatureToData(temperature);
    const unsigned long response = this->instance->sendRequest(CustomOpenTherm::buildRequest(
      OpenThermMessageType::WRITE_DATA,
@@ -1635,6 +2017,158 @@ protected:
    return true;
  }

+  bool updateBurnerStarts() {
+    const unsigned long response = this->instance->sendRequest(CustomOpenTherm::buildRequest(
+      OpenThermRequestType::READ_DATA,
+      OpenThermMessageID::SuccessfulBurnerStarts,
+      0
+    ));
+
+    if (!CustomOpenTherm::isValidResponse(response)) {
+      return false;
+
+    } else if (!CustomOpenTherm::isValidResponseId(response, OpenThermMessageID::SuccessfulBurnerStarts)) {
+      return false;
+    }
+
+    vars.slave.stats.burnerStarts = CustomOpenTherm::getUInt(response);
+
+    return true;
+  }
+
+  bool updateDhwBurnerStarts() {
+    const unsigned long response = this->instance->sendRequest(CustomOpenTherm::buildRequest(
+      OpenThermRequestType::READ_DATA,
+      OpenThermMessageID::DHWBurnerStarts,
+      0
+    ));
+
+    if (!CustomOpenTherm::isValidResponse(response)) {
+      return false;
+
+    } else if (!CustomOpenTherm::isValidResponseId(response, OpenThermMessageID::DHWBurnerStarts)) {
+      return false;
+    }
+
+    vars.slave.stats.dhwBurnerStarts = CustomOpenTherm::getUInt(response);
+
+    return true;
+  }
+
+  bool updateHeatingPumpStarts() {
+    const unsigned long response = this->instance->sendRequest(CustomOpenTherm::buildRequest(
+      OpenThermRequestType::READ_DATA,
+      OpenThermMessageID::CHPumpStarts,
+      0
+    ));
+
+    if (!CustomOpenTherm::isValidResponse(response)) {
+      return false;
+
+    } else if (!CustomOpenTherm::isValidResponseId(response, OpenThermMessageID::CHPumpStarts)) {
+      return false;
+    }
+
+    vars.slave.stats.heatingPumpStarts = CustomOpenTherm::getUInt(response);
+
+    return true;
+  }
+
+  bool updateDhwPumpStarts() {
+    const unsigned long response = this->instance->sendRequest(CustomOpenTherm::buildRequest(
+      OpenThermRequestType::READ_DATA,
+      OpenThermMessageID::DHWPumpValveStarts,
+      0
+    ));
+
+    if (!CustomOpenTherm::isValidResponse(response)) {
+      return false;
+
+    } else if (!CustomOpenTherm::isValidResponseId(response, OpenThermMessageID::DHWPumpValveStarts)) {
+      return false;
+    }
+
+    vars.slave.stats.dhwPumpStarts = CustomOpenTherm::getUInt(response);
+
+    return true;
+  }
+
+  bool updateBurnerHours() {
+    const unsigned long response = this->instance->sendRequest(CustomOpenTherm::buildRequest(
+      OpenThermRequestType::READ_DATA,
+      OpenThermMessageID::BurnerOperationHours,
+      0
+    ));
+
+    if (!CustomOpenTherm::isValidResponse(response)) {
+      return false;
+
+    } else if (!CustomOpenTherm::isValidResponseId(response, OpenThermMessageID::BurnerOperationHours)) {
+      return false;
+    }
+
+    vars.slave.stats.burnerHours = CustomOpenTherm::getUInt(response);
+
+    return true;
+  }
+
+  bool updateDhwBurnerHours() {
+    const unsigned long response = this->instance->sendRequest(CustomOpenTherm::buildRequest(
+      OpenThermRequestType::READ_DATA,
+      OpenThermMessageID::DHWBurnerOperationHours,
+      0
+    ));
+
+    if (!CustomOpenTherm::isValidResponse(response)) {
+      return false;
+
+    } else if (!CustomOpenTherm::isValidResponseId(response, OpenThermMessageID::DHWBurnerOperationHours)) {
+      return false;
+    }
+
+    vars.slave.stats.dhwBurnerHours = CustomOpenTherm::getUInt(response);
+
+    return true;
+  }
+
+  bool updateHeatingPumpHours() {
+    const unsigned long response = this->instance->sendRequest(CustomOpenTherm::buildRequest(
+      OpenThermRequestType::READ_DATA,
+      OpenThermMessageID::CHPumpOperationHours,
+      0
+    ));
+
+    if (!CustomOpenTherm::isValidResponse(response)) {
+      return false;
+
+    } else if (!CustomOpenTherm::isValidResponseId(response, OpenThermMessageID::CHPumpOperationHours)) {
+      return false;
+    }
+
+    vars.slave.stats.heatingPumpHours = CustomOpenTherm::getUInt(response);
+
+    return true;
+  }
+
+  bool updateDhwPumpHours() {
+    const unsigned long response = this->instance->sendRequest(CustomOpenTherm::buildRequest(
+      OpenThermRequestType::READ_DATA,
+      OpenThermMessageID::DHWPumpValveOperationHours,
+      0
+    ));
+
+    if (!CustomOpenTherm::isValidResponse(response)) {
+      return false;
+
+    } else if (!CustomOpenTherm::isValidResponseId(response, OpenThermMessageID::DHWPumpValveOperationHours)) {
+      return false;
+    }
+
+    vars.slave.stats.dhwPumpHours = CustomOpenTherm::getUInt(response);
+
+    return true;
+  }
+
  bool updateModulationLevel() {
    const unsigned long response = this->instance->sendRequest(CustomOpenTherm::buildRequest(
      OpenThermRequestType::READ_DATA,
--- a/src/PortalTask.h
+++ b/src/PortalTask.h
@@ -1,10 +1,12 @@
 //#define PORTAL_CACHE "max-age=86400"
 #define PORTAL_CACHE nullptr
 #ifdef ARDUINO_ARCH_ESP8266
+#include <ESP8266mDNS.h>
 #include <ESP8266WebServer.h>
 #include <Updater.h>
 using WebServer = ESP8266WebServer;
 #else
+#include <ESPmDNS.h>
 #include <WebServer.h>
 #include <Update.h>
 #endif
@@ -53,7 +55,7 @@ protected:
  bool webServerEnabled = false;
  bool dnsServerEnabled = false;
  unsigned long webServerChangeState = 0;
-  unsigned long dnsServerChangeState = 0;
+  bool mDnsState = false;

  #if defined(ARDUINO_ARCH_ESP32)
  const char* getTaskName() override {
@@ -616,7 +618,7 @@ protected:
      }

      if (changed) {
-        tMqtt->rebuildHaEntity(sensorId, prevSettings);
+        tMqtt->reconfigureSensor(sensorId, prevSettings);
        fsSensorsSettings.update();
      }
    });
@@ -858,6 +860,7 @@ protected:
      }
    });

+    this->webServer->serveStatic("/robots.txt", LittleFS, "/static/robots.txt", PORTAL_CACHE);
    this->webServer->serveStatic("/favicon.ico", LittleFS, "/static/images/favicon.ico", PORTAL_CACHE);
    this->webServer->serveStatic("/static", LittleFS, "/static", PORTAL_CACHE);
  }
@@ -872,6 +875,16 @@ protected:
      this->startWebServer();
      Log.straceln(FPSTR(L_PORTAL_WEBSERVER), F("Started: AP up or STA connected"));

+      // Enabling mDNS
+      if (!this->mDnsState && settings.portal.mdns) {
+        if (MDNS.begin(networkSettings.hostname)) {
+          MDNS.addService("http", "tcp", 80);
+          this->mDnsState = true;
+
+          Log.straceln(FPSTR(L_PORTAL_WEBSERVER), F("mDNS enabled and service added"));
+        }
+      }
+
      #ifdef ARDUINO_ARCH_ESP8266
      ::optimistic_yield(1000);
      #endif
@@ -880,13 +893,29 @@ protected:
      this->stopWebServer();
      Log.straceln(FPSTR(L_PORTAL_WEBSERVER), F("Stopped: AP and STA down"));

+      // Disabling mDNS
+      if (this->mDnsState) {
+        MDNS.end();
+        this->mDnsState = false;
+
+        Log.straceln(FPSTR(L_PORTAL_WEBSERVER), F("mDNS disabled"));
+      }
+
      #ifdef ARDUINO_ARCH_ESP8266
      ::optimistic_yield(1000);
      #endif
    }

+    // Disabling mDNS if disabled in settings
+    if (this->mDnsState && !settings.portal.mdns) {
+      MDNS.end();
+      this->mDnsState = false;
+
+      Log.straceln(FPSTR(L_PORTAL_WEBSERVER), F("mDNS disabled"));
+    }
+
    // dns server
-    if (!this->stateDnsServer() && this->stateWebServer() && network->isApEnabled() && network->hasApClients() && millis() - this->dnsServerChangeState >= this->changeStateInterval) {
+    if (!this->stateDnsServer() && !network->isConnected() && network->isApEnabled() && this->stateWebServer()) {
      this->startDnsServer();
      Log.straceln(FPSTR(L_PORTAL_DNSSERVER), F("Started: AP up"));
      
@@ -894,9 +923,9 @@ protected:
      ::optimistic_yield(1000);
      #endif

-    } else if (this->stateDnsServer() && (!network->isApEnabled() || !this->stateWebServer())) {
+    } else if (this->stateDnsServer() && (network->isConnected() || !network->isApEnabled() || !this->stateWebServer())) {
      this->stopDnsServer();
-      Log.straceln(FPSTR(L_PORTAL_DNSSERVER), F("Stopped: AP down"));
+      Log.straceln(FPSTR(L_PORTAL_DNSSERVER), F("Stopped: AP down/STA connected"));

      #ifdef ARDUINO_ARCH_ESP8266
      ::optimistic_yield(1000);
@@ -1006,7 +1035,6 @@ protected:

    this->dnsServer->start(53, "*", network->getApIp());
    this->dnsServerEnabled = true;
-    this->dnsServerChangeState = millis();
  }

  void stopDnsServer() {
@@ -1017,6 +1045,5 @@ protected:
    //this->dnsServer->processNextRequest();
    this->dnsServer->stop();
    this->dnsServerEnabled = false;
-    this->dnsServerChangeState = millis();
  }
 };
--- a/src/RegulatorTask.h
+++ b/src/RegulatorTask.h
@@ -1,7 +1,5 @@
-#include <Equitherm.h>
 #include <GyverPID.h>

-Equitherm etRegulator;
 GyverPID pidRegulator(0, 0, 0);


@@ -60,11 +58,11 @@ protected:
    this->hysteresis();

    vars.master.heating.targetTemp = settings.heating.target;
-    vars.master.heating.setpointTemp = constrain(
+    vars.master.heating.setpointTemp = roundf(constrain(
      this->getHeatingSetpointTemp(),
      this->getHeatingMinSetpointTemp(),
      this->getHeatingMaxSetpointTemp()
-    );
+    ), 0);

    Sensors::setValueByType(
      Sensors::Type::HEATING_SETPOINT_TEMP, vars.master.heating.setpointTemp,
@@ -146,39 +144,32 @@ protected:

    // if use equitherm
    if (settings.equitherm.enabled) {
-      unsigned short minTemp = settings.heating.minTemp;
-      unsigned short maxTemp = settings.heating.maxTemp;
-      float targetTemp = settings.heating.target;
-      float indoorTemp = vars.master.heating.indoorTemp;
-      float outdoorTemp = vars.master.heating.outdoorTemp;
+      float tempDelta = settings.heating.target - vars.master.heating.outdoorTemp;
+      float maxPoint = settings.heating.target - (
+        settings.heating.maxTemp - settings.heating.target
+      ) / settings.equitherm.slope;

-      if (settings.system.unitSystem == UnitSystem::IMPERIAL) {
-        minTemp = f2c(minTemp);
-        maxTemp = f2c(maxTemp);
-        targetTemp = f2c(targetTemp);
-        indoorTemp = f2c(indoorTemp);
-        outdoorTemp = f2c(outdoorTemp);
+      float sf = (settings.heating.maxTemp - settings.heating.target) / pow(
+        settings.heating.target - maxPoint,
+        1.0f / settings.equitherm.exponent
+      );
+      float etResult = settings.heating.target + settings.equitherm.shift + sf * (
+        tempDelta >= 0 
+          ? pow(tempDelta, 1.0f / settings.equitherm.exponent) 
+          : -(pow(-(tempDelta), 1.0f / settings.equitherm.exponent))
+      );
+
+      // add diff
+      if (this->indoorSensorsConnected && !settings.pid.enabled && !settings.heating.turbo) {
+        etResult += constrain(
+          settings.heating.target - vars.master.heating.indoorTemp,
+          -3.0f,
+          3.0f
+        ) * settings.equitherm.targetDiffFactor;
      }

-      if (!this->indoorSensorsConnected || settings.pid.enabled) {
-        etRegulator.Kt = 0.0f;
-        etRegulator.indoorTemp = 0.0f;
-
-      } else {
-        etRegulator.Kt = settings.heating.turbo ? 0.0f : settings.equitherm.t_factor;
-        etRegulator.indoorTemp = indoorTemp;
-      }
-
-      etRegulator.setLimits(minTemp, maxTemp);
-      etRegulator.Kn = settings.equitherm.n_factor;
-      etRegulator.Kk = settings.equitherm.k_factor;
-      etRegulator.targetTemp = targetTemp;
-      etRegulator.outdoorTemp = outdoorTemp;
-      float etResult = etRegulator.getResult();
-
-      if (settings.system.unitSystem == UnitSystem::IMPERIAL) {
-        etResult = c2f(etResult);
-      }
+      // limit
+      etResult = constrain(etResult, settings.heating.minTemp, settings.heating.maxTemp);

      if (fabsf(prevEtResult - etResult) > 0.09f) {
        prevEtResult = etResult;
@@ -213,7 +204,8 @@ protected:
        }*/

        float error = pidRegulator.setpoint - pidRegulator.input;
-        bool hasDeadband = (error > -(settings.pid.deadband.thresholdHigh))
+        bool hasDeadband = settings.pid.deadband.enabled 
+          && (error > -(settings.pid.deadband.thresholdHigh))
          && (error < settings.pid.deadband.thresholdLow);

        if (hasDeadband) {
--- a/src/Sensors.h
+++ b/src/Sensors.h
@@ -25,6 +25,15 @@ public:
    OT_SOLAR_COLLECTOR_TEMP = 16,
    OT_FAN_SPEED_SETPOINT   = 17,
    OT_FAN_SPEED_CURRENT    = 18,
+
+    OT_BURNER_STARTS        = 19,
+    OT_DHW_BURNER_STARTS    = 20,
+    OT_HEATING_PUMP_STARTS  = 21,
+    OT_DHW_PUMP_STARTS      = 22,
+    OT_BURNER_HOURS         = 23,
+    OT_DHW_BURNER_HOURS     = 24,
+    OT_HEATING_PUMP_HOURS   = 25,
+    OT_DHW_PUMP_HOURS       = 26,
    
    NTC_10K_TEMP            = 50,
    DALLAS_TEMP             = 51,
@@ -46,6 +55,7 @@ public:
    EXHAUST_TEMP          = 7,
    MODULATION_LEVEL      = 8,

+    NUMBER                = 247,
    POWER_FACTOR          = 248,
    POWER                 = 249,
    FAN_SPEED             = 250,
@@ -128,7 +138,7 @@ public:
    }

    uint8_t amount = 0;
-    for (uint8_t id = 0; id < getMaxSensorId(); id++) {
+    for (uint8_t id = 0; id <= getMaxSensorId(); id++) {
      if (settings[id].type == type && (!onlyEnabled || settings[id].enabled)) {
        amount++;
      }
@@ -142,7 +152,7 @@ public:
      return 0;
    }

-    for (uint8_t id = 0; id < getMaxSensorId(); id++) {
+    for (uint8_t id = 0; id <= getMaxSensorId(); id++) {
      if (strcmp(settings[id].name, name) == 0) {
        return id;
      }
@@ -157,7 +167,7 @@ public:
    }

    String refObjectId;
-    for (uint8_t id = 0; id < getMaxSensorId(); id++) {
+    for (uint8_t id = 0; id <= getMaxSensorId(); id++) {
      Sensors::makeObjectId(refObjectId, settings[id].name);
      if (refObjectId.equals(objectId)) {
        return id;
@@ -237,7 +247,7 @@ public:
    uint8_t updated = 0;
    
    // read sensors data for current instance
-    for (uint8_t sensorId = 0; sensorId < getMaxSensorId(); sensorId++) {
+    for (uint8_t sensorId = 0; sensorId <= getMaxSensorId(); sensorId++) {
      auto& sSensor = settings[sensorId];
      
      // only target & valid sensors
@@ -301,7 +311,7 @@ public:
    uint8_t updated = 0;
    
    // read sensors data for current instance
-    for (uint8_t sensorId = 0; sensorId < getMaxSensorId(); sensorId++) {
+    for (uint8_t sensorId = 0; sensorId <= getMaxSensorId(); sensorId++) {
      auto& sSensor = settings[sensorId];
      
      // only target & valid sensors
@@ -324,13 +334,13 @@ public:

    uint8_t valueId = (uint8_t) valueType;
    if (!isValidValueId(valueId)) {
-      return false;
+      return 0;
    }
    
    float value = 0.0f;
    uint8_t amount = 0;

-    for (uint8_t id = 0; id < getMaxSensorId(); id++) {
+    for (uint8_t id = 0; id <= getMaxSensorId(); id++) {
      auto& sSensor = settings[id];
      auto& rSensor = results[id];

@@ -356,7 +366,7 @@ public:
      return 0;
    }

-    for (uint8_t id = 0; id < getMaxSensorId(); id++) {
+    for (uint8_t id = 0; id <= getMaxSensorId(); id++) {
      if (settings[id].purpose == purpose && results[id].connected) {
        return true;
      }
--- a/src/SensorsTask.h
+++ b/src/SensorsTask.h
@@ -8,6 +8,45 @@

 extern FileData fsSensorsSettings;

+#if USE_BLE
+class BluetoothClientCallbacks : public NimBLEClientCallbacks {
+public:
+  BluetoothClientCallbacks(uint8_t sensorId) : sensorId(sensorId) {}
+
+  void onConnect(NimBLEClient* pClient) {
+    auto& sSensor = Sensors::settings[this->sensorId];
+
+    Log.sinfoln(
+      FPSTR(L_SENSORS_BLE), F("Sensor #%hhu '%s': connected to %s"),
+      sensorId, sSensor.name, pClient->getPeerAddress().toString().c_str()
+    );
+  }
+
+  void onDisconnect(NimBLEClient* pClient, int reason) {
+    auto& sSensor = Sensors::settings[this->sensorId];
+
+    Log.sinfoln(
+      FPSTR(L_SENSORS_BLE), F("Sensor #%hhu '%s': disconnected, reason %i"),
+      sensorId, sSensor.name, reason
+    );
+  }
+
+  void onConnectFail(NimBLEClient* pClient, int reason) {
+    auto& sSensor = Sensors::settings[this->sensorId];
+
+    Log.sinfoln(
+      FPSTR(L_SENSORS_BLE), F("Sensor #%hhu '%s': failed to connect, reason %i"),
+      sensorId, sSensor.name, reason
+    );
+
+    pClient->cancelConnect();
+  }
+
+protected:
+  uint8_t sensorId;
+};
+#endif
+
 class SensorsTask : public LeanTask {
 public:
  SensorsTask(bool _enabled = false, unsigned long _interval = 0) : LeanTask(_enabled, _interval) {
@@ -41,6 +80,7 @@ protected:
  std::unordered_map<uint8_t, bool> dallasPolling;
  std::unordered_map<uint8_t, unsigned long> dallasLastPollingTime;
  #if USE_BLE
+  std::unordered_map<uint8_t, NimBLEClient*> bleClients;
  std::unordered_map<uint8_t, bool> bleSubscribed;
  std::unordered_map<uint8_t, unsigned long> bleLastSetDtTime;
  #endif
@@ -385,7 +425,7 @@ protected:
        continue;
      }

-      const float sensorResistance = value > 0.001f
+      const float sensorResistance = value > 1
        ? DEFAULT_NTC_REF_RESISTANCE / (DEFAULT_NTC_VREF / (float) value - 1.0f)
        : 0.0f;
      const float rawTemp = 1.0f / (
@@ -405,47 +445,35 @@ protected:

  #if USE_BLE
  void cleanBleInstances() {
-    #if USE_BLE
    if (!NimBLEDevice::isInitialized()) {
      return;
    }

-    for (auto client : NimBLEDevice::getConnectedClients()) {
-      auto address = client->getPeerAddress();
-      bool used = false;
-
-      for (uint8_t sensorId = 0; sensorId <= Sensors::getMaxSensorId(); sensorId++) {
-        auto& sSensor = Sensors::settings[sensorId];
-        
-        if (!sSensor.enabled || sSensor.type != Sensors::Type::BLUETOOTH || sSensor.purpose == Sensors::Purpose::NOT_CONFIGURED) {
-          continue;
-        }
-        
-        auto pAddress = address.getVal();
-        uint8_t addr[] = {
-          pAddress[5], pAddress[4], pAddress[3],
-          pAddress[2], pAddress[1], pAddress[0]
-        };
-
-        if (isEqualAddress(addr, sSensor.address, sizeof(addr))) {
-          used = true;
-          break;
-        }
+    for (auto& [sensorId, pClient]: this->bleClients) {
+      if (pClient == nullptr) {
+        continue;
      }

-      if (!used) {
+      auto& sSensor = Sensors::settings[sensorId];
+      const auto sAddress = NimBLEAddress(sSensor.address, 0);
+
+      if (sAddress.isNull() || !sSensor.enabled || sSensor.type != Sensors::Type::BLUETOOTH || sSensor.purpose == Sensors::Purpose::NOT_CONFIGURED) {
        Log.sinfoln(
-          FPSTR(L_SENSORS_BLE), F("Deleted unused client connected to %s"),
-          address.toString().c_str()
+          FPSTR(L_SENSORS_BLE), F("Sensor #%hhu '%s', deleted unused client"),
+          sensorId, sSensor.name
        );

-        NimBLEDevice::deleteClient(client);
+        NimBLEDevice::deleteClient(pClient);
+        pClient = nullptr;
      }
    }
-    #endif
  }

  void pollingBleSensors() {
+    if (!Sensors::getAmountByType(Sensors::Type::BLUETOOTH, true)) {
+      return;
+    }
+
    if (!NimBLEDevice::isInitialized() && millis() > 5000) {
      Log.sinfoln(FPSTR(L_SENSORS_BLE), F("Initialized"));
      BLEDevice::init("");
@@ -460,51 +488,59 @@ protected:
        continue;
      }

-      auto client = this->getBleClient(sensorId);
-      if (client == nullptr) {
+      const auto address = NimBLEAddress(sSensor.address, 0);
+      if (address.isNull()) {
        continue;
      }

-      if (!client->isConnected()) {
+      auto pClient = this->getBleClient(sensorId);
+      if (pClient == nullptr) {
+        continue;
+      }
+
+      if (pClient->getPeerAddress() != address) {
+        if (pClient->isConnected()) {
+          if (!pClient->disconnect()) {
+            continue;
+          }
+        }
+
+        pClient->setPeerAddress(address);
+      }
+
+      if (!pClient->isConnected()) {
        this->bleSubscribed[sensorId] = false;
        this->bleLastSetDtTime[sensorId] = 0;

-        if (client->connect()) {
+        if (pClient->connect(false, true, true)) {
          Log.sinfoln(
-            FPSTR(L_SENSORS_BLE), F("Sensor #%hhu '%s': connected to %s"),
-            sensorId, sSensor.name, client->getPeerAddress().toString().c_str()
+            FPSTR(L_SENSORS_BLE), F("Sensor #%hhu '%s': trying connecting to %s..."),
+            sensorId, sSensor.name, pClient->getPeerAddress().toString().c_str()
          );
-
-        } else {
-          Log.swarningln(
-            FPSTR(L_SENSORS_BLE), F("Sensor #%hhu '%s': failed connecting to %s"),
-            sensorId, sSensor.name, client->getPeerAddress().toString().c_str()
-          );
-
-          continue;
        }
+
+        continue;
      }
      
      if (!this->bleSubscribed[sensorId]) {
-        if (this->subscribeToBleDevice(sensorId, client)) {
+        if (this->subscribeToBleDevice(sensorId, pClient)) {
          this->bleSubscribed[sensorId] = true;

        } else {
          this->bleSubscribed[sensorId] = false;
-          client->disconnect();
+          pClient->disconnect();
          continue;
        }
      }

-      if (!rSensor.connected) {
-        rSensor.connected = true;
-      }
+      // Mark connected
+      Sensors::setConnectionStatusById(sensorId, true, true);

      if (!this->bleLastSetDtTime[sensorId] || millis() - this->bleLastSetDtTime[sensorId] > this->bleSetDtInterval) {
        struct tm ti;
        
        if (getLocalTime(&ti)) {
-          if (this->setDateOnBleSensor(client, &ti)) {
+          if (this->setDateOnBleSensor(pClient, &ti)) {
            Log.sinfoln(
              FPSTR(L_SENSORS_BLE), F("Sensor #%hhu '%s', successfully set date: %02d.%02d.%04d %02d:%02d:%02d"),
              sensorId, sSensor.name,
@@ -521,7 +557,6 @@ protected:

          this->bleLastSetDtTime[sensorId] = millis();
        }
-        
      }
    }
  }
@@ -537,49 +572,29 @@ protected:
    if (!sSensor.enabled || sSensor.type != Sensors::Type::BLUETOOTH || sSensor.purpose == Sensors::Purpose::NOT_CONFIGURED) {
      return nullptr;
    }
-    
-    uint8_t addr[6] = {
-      sSensor.address[0], sSensor.address[1], sSensor.address[2],
-      sSensor.address[3], sSensor.address[4], sSensor.address[5]
-    };
-    const auto address = NimBLEAddress(addr, 0);
-    
-    NimBLEClient* pClient = NimBLEDevice::getClientByPeerAddress(address);
+
+    if (this->bleClients[sensorId] && this->bleClients[sensorId] != nullptr) {
+      return this->bleClients[sensorId];
+    }
+
+    auto pClient = NimBLEDevice::createClient();
    if (pClient == nullptr) {
-      pClient = NimBLEDevice::getDisconnectedClient();
+      return nullptr;
    }

-    if (pClient == nullptr) {
-      if (NimBLEDevice::getCreatedClientCount() >= NIMBLE_MAX_CONNECTIONS) {
-        return nullptr;
-      }
+    //pClient->setConnectionParams(BLE_GAP_CONN_ITVL_MS(10), BLE_GAP_CONN_ITVL_MS(100), 10, 150);
+    pClient->setConnectTimeout(30000);
+    pClient->setSelfDelete(false, false);
+    pClient->setClientCallbacks(new BluetoothClientCallbacks(sensorId), true);

-      pClient = NimBLEDevice::createClient();
-      if (pClient == nullptr) {
-        return nullptr;
-      }
-
-      /**
-       *  Set initial connection parameters:
-       *  These settings are safe for 3 clients to connect reliably, can go faster if you have less
-       *  connections. Timeout should be a multiple of the interval, minimum is 100ms.
-       *  Min interval: 12 * 1.25ms = 15, Max interval: 12 * 1.25ms = 15, 0 latency, 1000 * 10ms = 10000ms timeout
-       */
-      pClient->setConnectionParams(12, 12, 0, 1000);
-      pClient->setConnectTimeout(5000);
-      pClient->setSelfDelete(false, true);
-    }
-
-    if (!pClient->isConnected()) {
-      pClient->setPeerAddress(address);
-    }
+    this->bleClients[sensorId] = pClient;

    return pClient;
  }

  bool subscribeToBleDevice(const uint8_t sensorId, NimBLEClient* pClient) {
    auto& sSensor = Sensors::settings[sensorId];
-    auto pAddress = pClient->getPeerAddress().toString().c_str();
+    auto pAddress = pClient->getPeerAddress().toString();
    
    NimBLERemoteService* pService = nullptr;
    NimBLERemoteCharacteristic* pChar = nullptr;
@@ -590,13 +605,13 @@ protected:
    if (!pService) {
      Log.straceln(
        FPSTR(L_SENSORS_BLE), F("Sensor #%hhu '%s': failed to find env service (%s) on device %s"),
-        sensorId, sSensor.name, serviceUuid.toString().c_str(), pAddress
+        sensorId, sSensor.name, serviceUuid.toString().c_str(), pAddress.c_str()
      );

    } else {
      Log.straceln(
        FPSTR(L_SENSORS_BLE), F("Sensor #%hhu '%s': found env service (%s) on device %s"),
-        sensorId, sSensor.name, serviceUuid.toString().c_str(), pAddress
+        sensorId, sSensor.name, serviceUuid.toString().c_str(), pAddress.c_str()
      );

      // 0x2A6E - Notify temperature x0.01C (pvvx)
@@ -608,7 +623,7 @@ protected:
        if (pChar && (pChar->canNotify() || pChar->canIndicate())) {
          Log.straceln(
            FPSTR(L_SENSORS_BLE), F("Sensor #%hhu '%s': found temp char (%s) in env service on device %s"),
-            sensorId, sSensor.name, charUuid.toString().c_str(), pAddress
+            sensorId, sSensor.name, charUuid.toString().c_str(), pAddress.c_str()
          );

          pChar->unsubscribe();
@@ -663,14 +678,14 @@ protected:
            Log.straceln(
              FPSTR(L_SENSORS_BLE), F("Sensor #%hhu '%s': subscribed to temp char (%s) in env service on device %s"),
              sensorId, sSensor.name,
-              charUuid.toString().c_str(), pAddress
+              charUuid.toString().c_str(), pAddress.c_str()
            );

          } else {
            Log.swarningln(
              FPSTR(L_SENSORS_BLE), F("Sensor #%hhu '%s': failed to subscribe to temp char (%s) in env service on device %s"),
              sensorId, sSensor.name,
-              charUuid.toString().c_str(), pAddress
+              charUuid.toString().c_str(), pAddress.c_str()
            );
          }
        }
@@ -685,7 +700,7 @@ protected:
        if (pChar && (pChar->canNotify() || pChar->canIndicate())) {
          Log.straceln(
            FPSTR(L_SENSORS_BLE), F("Sensor #%hhu '%s': found temp char (%s) in env service on device %s"),
-            sensorId, sSensor.name, charUuid.toString().c_str(), pAddress
+            sensorId, sSensor.name, charUuid.toString().c_str(), pAddress.c_str()
          );

          pChar->unsubscribe();
@@ -740,14 +755,14 @@ protected:
            Log.straceln(
              FPSTR(L_SENSORS_BLE), F("Sensor #%hhu '%s': subscribed to temp char (%s) in env service on device %s"),
              sensorId, sSensor.name,
-              charUuid.toString().c_str(), pAddress
+              charUuid.toString().c_str(), pAddress.c_str()
            );

          } else {
            Log.swarningln(
              FPSTR(L_SENSORS_BLE), F("Sensor #%hhu '%s': failed to subscribe to temp char (%s) in env service on device %s"),
              sensorId, sSensor.name,
-              charUuid.toString().c_str(), pAddress
+              charUuid.toString().c_str(), pAddress.c_str()
            );
          }
        }
@@ -756,7 +771,7 @@ protected:
      if (!tempNotifyCreated) {
        Log.swarningln(
          FPSTR(L_SENSORS_BLE), F("Sensor #%hhu '%s': not found supported temp chars in env service on device %s"),
-          sensorId, sSensor.name, pAddress
+          sensorId, sSensor.name, pAddress.c_str()
        );

        pClient->disconnect();
@@ -774,7 +789,7 @@ protected:
          if (pChar && (pChar->canNotify() || pChar->canIndicate())) {
            Log.straceln(
              FPSTR(L_SENSORS_BLE), F("Sensor #%hhu '%s': found humidity char (%s) in env service on device %s"),
-              sensorId, sSensor.name, charUuid.toString().c_str(), pAddress
+              sensorId, sSensor.name, charUuid.toString().c_str(), pAddress.c_str()
            );

            pChar->unsubscribe();
@@ -829,14 +844,14 @@ protected:
              Log.straceln(
                FPSTR(L_SENSORS_BLE), F("Sensor #%hhu '%s': subscribed to humidity char (%s) in env service on device %s"),
                sensorId, sSensor.name,
-                charUuid.toString().c_str(), pAddress
+                charUuid.toString().c_str(), pAddress.c_str()
              );

            } else {
              Log.swarningln(
                FPSTR(L_SENSORS_BLE), F("Sensor #%hhu '%s': failed to subscribe to humidity char (%s) in env service on device %s"),
                sensorId, sSensor.name,
-                charUuid.toString().c_str(), pAddress
+                charUuid.toString().c_str(), pAddress.c_str()
              );
            }
          }
@@ -845,7 +860,7 @@ protected:
        if (!humidityNotifyCreated) {
          Log.swarningln(
            FPSTR(L_SENSORS_BLE), F("Sensor #%hhu '%s': not found supported humidity chars in env service on device %s"),
-            sensorId, sSensor.name, pAddress
+            sensorId, sSensor.name, pAddress.c_str()
          );
        }
      }
@@ -859,13 +874,13 @@ protected:
      if (!pService) {
        Log.straceln(
          FPSTR(L_SENSORS_BLE), F("Sensor #%hhu '%s': failed to find battery service (%s) on device %s"),
-          sensorId, sSensor.name, serviceUuid.toString().c_str(), pAddress
+          sensorId, sSensor.name, serviceUuid.toString().c_str(), pAddress.c_str()
        );

      } else {
        Log.straceln(
          FPSTR(L_SENSORS_BLE), F("Sensor #%hhu '%s': found battery service (%s) on device %s"),
-          sensorId, sSensor.name, serviceUuid.toString().c_str(), pAddress
+          sensorId, sSensor.name, serviceUuid.toString().c_str(), pAddress.c_str()
        );

        // 0x2A19 - Notify the battery charge level 0..99% (pvvx)
@@ -877,7 +892,7 @@ protected:
          if (pChar && (pChar->canNotify() || pChar->canIndicate())) {
            Log.straceln(
              FPSTR(L_SENSORS_BLE), F("Sensor #%hhu '%s': found battery char (%s) in battery service on device %s"),
-              sensorId, sSensor.name, charUuid.toString().c_str(), pAddress
+              sensorId, sSensor.name, charUuid.toString().c_str(), pAddress.c_str()
            );

            pChar->unsubscribe();
@@ -932,14 +947,14 @@ protected:
              Log.straceln(
                FPSTR(L_SENSORS_BLE), F("Sensor #%hhu '%s': subscribed to battery char (%s) in battery service on device %s"),
                sensorId, sSensor.name,
-                charUuid.toString().c_str(), pAddress
+                charUuid.toString().c_str(), pAddress.c_str()
              );

            } else {
              Log.swarningln(
                FPSTR(L_SENSORS_BLE), F("Sensor #%hhu '%s': failed to subscribe to battery char (%s) in battery service on device %s"),
                sensorId, sSensor.name,
-                charUuid.toString().c_str(), pAddress
+                charUuid.toString().c_str(), pAddress.c_str()
              );
            }
          }
@@ -948,7 +963,7 @@ protected:
        if (!batteryNotifyCreated) {
          Log.swarningln(
            FPSTR(L_SENSORS_BLE), F("Sensor #%hhu '%s': not found supported battery chars in battery service on device %s"),
-            sensorId, sSensor.name, pAddress
+            sensorId, sSensor.name, pAddress.c_str()
          );
        }
      }
@@ -981,16 +996,16 @@ protected:
      auto& rSensor = Sensors::results[sensorId];

      if (rSensor.connected && !sSensor.enabled) {
-        rSensor.connected = false;
+        Sensors::setConnectionStatusById(sensorId, false, false);

      } else if (rSensor.connected && sSensor.type == Sensors::Type::NOT_CONFIGURED) {
-        rSensor.connected = false;
+        Sensors::setConnectionStatusById(sensorId, false, false);

      } else if (rSensor.connected && sSensor.purpose == Sensors::Purpose::NOT_CONFIGURED) {
-        rSensor.connected = false;
+        Sensors::setConnectionStatusById(sensorId, false, false);

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

      }/* else if (!rSensor.connected) {
        rSensor.connected = true;
--- a/src/Settings.h
+++ b/src/Settings.h
@@ -12,13 +12,13 @@ struct NetworkSettings {
  struct {
    char ssid[33] = DEFAULT_AP_SSID;
    char password[65] = DEFAULT_AP_PASSWORD;
-    byte channel = 6;
+    uint8_t channel = 6;
  } ap;

  struct {
    char ssid[33] = DEFAULT_STA_SSID;
    char password[65] = DEFAULT_STA_PASSWORD;
-    byte channel = 0;
+    uint8_t channel = 0;
  } sta;
 } networkSettings;

@@ -42,23 +42,23 @@ struct Settings {
    } ntp;

    UnitSystem unitSystem = UnitSystem::METRIC;
-    byte statusLedGpio = DEFAULT_STATUS_LED_GPIO;
+    uint8_t statusLedGpio = DEFAULT_STATUS_LED_GPIO;
  } system;

  struct {
    bool auth = false;
    char login[13] = DEFAULT_PORTAL_LOGIN;
    char password[33] = DEFAULT_PORTAL_PASSWORD;
+    bool mdns = true;
  } portal;

  struct {
    UnitSystem unitSystem = UnitSystem::METRIC;
-    byte inGpio = DEFAULT_OT_IN_GPIO;
-    byte outGpio = DEFAULT_OT_OUT_GPIO;
-    byte rxLedGpio = DEFAULT_OT_RX_LED_GPIO;
+    uint8_t inGpio = DEFAULT_OT_IN_GPIO;
+    uint8_t outGpio = DEFAULT_OT_OUT_GPIO;
+    uint8_t rxLedGpio = DEFAULT_OT_RX_LED_GPIO;
    uint8_t memberId = 0;
    uint8_t flags = 0;
-    uint8_t maxModulation = 100;
    float minPower = 0.0f;
    float maxPower = 0.0f;

@@ -71,9 +71,13 @@ struct Settings {
      bool heatingToCh2 = false;
      bool dhwToCh2 = false;
      bool dhwBlocking = false;
-      bool modulationSyncWithHeating = false;
+      bool dhwStateAsDhwBlocking = false;
      bool maxTempSyncWithTargetTemp = true;
      bool getMinMaxTemp = true;
+      bool ignoreDiagState = false;
+      bool autoFaultReset = false;
+      bool autoDiagReset = false;
+      bool setDateAndTime = false;
      bool nativeHeatingControl = false;
      bool immergasFix = false;
    } options;
@@ -101,15 +105,32 @@ struct Settings {
    float target = DEFAULT_HEATING_TARGET_TEMP;
    float hysteresis = 0.5f;
    float turboFactor = 7.5f;
-    byte minTemp = DEFAULT_HEATING_MIN_TEMP;
-    byte maxTemp = DEFAULT_HEATING_MAX_TEMP;
+    uint8_t minTemp = DEFAULT_HEATING_MIN_TEMP;
+    uint8_t maxTemp = DEFAULT_HEATING_MAX_TEMP;
+    uint8_t maxModulation = 100;
+
+    struct {
+      uint8_t highTemp = 95;
+      uint8_t lowTemp = 90;
+    } overheatProtection;
+
+    struct {
+      uint8_t lowTemp = 10;
+      unsigned short thresholdTime = 600;
+    } freezeProtection;
  } heating;

  struct {
    bool enabled = true;
    float target = DEFAULT_DHW_TARGET_TEMP;
-    byte minTemp = DEFAULT_DHW_MIN_TEMP;
-    byte maxTemp = DEFAULT_DHW_MAX_TEMP;
+    uint8_t minTemp = DEFAULT_DHW_MIN_TEMP;
+    uint8_t maxTemp = DEFAULT_DHW_MAX_TEMP;
+    uint8_t maxModulation = 100;
+    
+    struct {
+      uint8_t highTemp = 95;
+      uint8_t lowTemp = 90;
+    } overheatProtection;
  } dhw;

  struct {
@@ -133,14 +154,16 @@ struct Settings {

  struct {
    bool enabled = false;
-    float n_factor = 0.7f;
-    float k_factor = 3.0f;
-    float t_factor = 2.0f;
+    float slope = 0.7f;
+    float exponent = 1.3f;
+    float shift = 0.0f;
+    float targetDiffFactor = 2.0f;
  } equitherm;

  struct {
    bool use = false;
-    byte gpio = DEFAULT_EXT_PUMP_GPIO;
+    uint8_t gpio = DEFAULT_EXT_PUMP_GPIO;
+    bool invertState = false;
    unsigned short postCirculationTime = 600;
    unsigned int antiStuckInterval = 2592000;
    unsigned short antiStuckTime = 300;
@@ -149,15 +172,15 @@ struct Settings {
  struct {
    struct {
      bool enabled = false;
-      byte gpio = GPIO_IS_NOT_CONFIGURED;
-      byte invertState = false;
+      uint8_t gpio = GPIO_IS_NOT_CONFIGURED;
+      bool invertState = false;
      unsigned short thresholdTime = 60;
    } input;

    struct {
      bool enabled = false;
-      byte gpio = GPIO_IS_NOT_CONFIGURED;
-      byte invertState = false;
+      uint8_t gpio = GPIO_IS_NOT_CONFIGURED;
+      bool invertState = false;
      unsigned short thresholdTime = 60;
      bool onFault = true;
      bool onLossConnection = true;
@@ -274,6 +297,7 @@ struct Variables {
      bool blocking = false;
      bool enabled = false;
      bool indoorTempControl = false;
+      bool overheat = false;
      float setpointTemp = 0.0f;
      float targetTemp = 0.0f;
      float currentTemp = 0.0f;
@@ -286,6 +310,7 @@ struct Variables {

    struct {
      bool enabled = false;
+      bool overheat = false;
      float targetTemp = 0.0f;
      float currentTemp = 0.0f;
      float returnTemp = 0.0f;
@@ -306,10 +331,14 @@ struct Variables {

    bool connected = false;
    bool flame = false;
-    bool cooling = false;
    float pressure = 0.0f;
    float heatExchangerTemp = 0.0f;

+    struct {
+      bool active = false;
+      uint8_t setpoint = 0;
+    } cooling;
+
    struct {
      bool active = false;
      uint8_t code = 0;
@@ -349,6 +378,17 @@ struct Variables {
      uint16_t supply = 0;
    } fanSpeed;

+    struct {
+      uint16_t burnerStarts = 0;
+      uint16_t dhwBurnerStarts = 0;
+      uint16_t heatingPumpStarts = 0;
+      uint16_t dhwPumpStarts = 0;
+      uint16_t burnerHours = 0;
+      uint16_t dhwBurnerHours = 0;
+      uint16_t heatingPumpHours = 0;
+      uint16_t dhwPumpHours = 0;
+    } stats;
+
    struct {
      bool active = false;
      bool enabled = false;
@@ -374,6 +414,7 @@ struct Variables {
    } dhw;

    struct {
+      bool active = false;
      bool enabled = false;
      float targetTemp = 0.0f;
      float currentTemp = 0.0f;
--- a/src/defines.h
+++ b/src/defines.h
@@ -16,7 +16,7 @@

 #define THERMOSTAT_INDOOR_DEFAULT_TEMP  20
 #define THERMOSTAT_INDOOR_MIN_TEMP      5
-#define THERMOSTAT_INDOOR_MAX_TEMP      30
+#define THERMOSTAT_INDOOR_MAX_TEMP      40

 #define DEFAULT_NTC_NOMINAL_RESISTANCE  10000.0f
 #define DEFAULT_NTC_NOMINAL_TEMP        25.0f
@@ -55,7 +55,7 @@
 #endif

 #ifndef DEFAULT_HOSTNAME
-  #define DEFAULT_HOSTNAME "opentherm"
+  #define DEFAULT_HOSTNAME ""
 #endif

 #ifndef DEFAULT_AP_SSID
@@ -111,7 +111,7 @@
 #endif

 #ifndef DEFAULT_MQTT_PREFIX
-  #define DEFAULT_MQTT_PREFIX "opentherm"
+  #define DEFAULT_MQTT_PREFIX ""
 #endif

 #ifndef DEFAULT_OT_IN_GPIO
--- a/src/idf_component.yml
+++ b/src/idf_component.yml
@@ -0,0 +1,3 @@
+dependencies:
+  idf: ">=5.3.2"
+  h2zero/esp-nimble-cpp: ">=2.2.1"
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -102,6 +102,12 @@ void setup() {
      break;
  }

+  // generate hostname if it is empty
+  if (!strlen(networkSettings.hostname)) {
+    strcpy(networkSettings.hostname, getChipId("otgateway-").c_str());
+    fsNetworkSettings.update();
+  }
+
  network = (new NetworkMgr)
    ->setHostname(networkSettings.hostname)
    ->setStaCredentials(
@@ -148,6 +154,12 @@ void setup() {
      break;
  }

+  // generate mqtt prefix if it is empty
+  if (!strlen(settings.mqtt.prefix)) {
+    strcpy(settings.mqtt.prefix, getChipId("otgateway_").c_str());
+    fsSettings.update();
+  }
+
  // Logs settings
  if (!settings.system.serial.enabled) {
    Serial.end();
--- a/src/strings.h
+++ b/src/strings.h
@@ -42,6 +42,8 @@ const char S_ANTI_STUCK_TIME[]                      PROGMEM = "antiStuckTime";
 const char S_AP[]                                   PROGMEM = "ap";
 const char S_APP_VERSION[]                          PROGMEM = "appVersion";
 const char S_AUTH[]                                 PROGMEM = "auth";
+const char S_AUTO_DIAG_RESET[]                      PROGMEM = "autoDiagReset";
+const char S_AUTO_FAULT_RESET[]                     PROGMEM = "autoFaultReset";
 const char S_BACKTRACE[]                            PROGMEM = "backtrace";
 const char S_BATTERY[]                              PROGMEM = "battery";
 const char S_BAUDRATE[]                             PROGMEM = "baudrate";
@@ -66,6 +68,7 @@ const char S_DATE[]                                 PROGMEM = "date";
 const char S_DEADBAND[]                             PROGMEM = "deadband";
 const char S_DHW[]                                  PROGMEM = "dhw";
 const char S_DHW_BLOCKING[]                         PROGMEM = "dhwBlocking";
+const char S_DHW_STATE_AS_DHW_BLOCKING[]            PROGMEM = "dhwStateAsDhwBlocking";
 const char S_DHW_SUPPORT[]                          PROGMEM = "dhwSupport";
 const char S_DHW_TO_CH2[]                           PROGMEM = "dhwToCh2";
 const char S_DIAG[]                                 PROGMEM = "diag";
@@ -78,9 +81,11 @@ const char S_ENABLED[]                              PROGMEM = "enabled";
 const char S_ENV[]                                  PROGMEM = "env";
 const char S_EPC[]                                  PROGMEM = "epc";
 const char S_EQUITHERM[]                            PROGMEM = "equitherm";
+const char S_EXPONENT[]                             PROGMEM = "exponent";
 const char S_EXTERNAL_PUMP[]                        PROGMEM = "externalPump";
 const char S_FACTOR[]                               PROGMEM = "factor";
 const char S_FAULT[]                                PROGMEM = "fault";
+const char S_FREEZE_PROTECTION[]                    PROGMEM = "freezeProtection";
 const char S_FILTERING[]                            PROGMEM = "filtering";
 const char S_FILTERING_FACTOR[]                     PROGMEM = "filteringFactor";
 const char S_FLAGS[]                                PROGMEM = "flags";
@@ -96,11 +101,13 @@ const char S_HEATING[]                              PROGMEM = "heating";
 const char S_HEATING_TO_CH2[]                       PROGMEM = "heatingToCh2";
 const char S_HEATING_STATE_TO_SUMMER_WINTER_MODE[]  PROGMEM = "heatingStateToSummerWinterMode";
 const char S_HIDDEN[]                               PROGMEM = "hidden";
+const char S_HIGH_TEMP[]                            PROGMEM = "highTemp";
 const char S_HOME_ASSISTANT_DISCOVERY[]             PROGMEM = "homeAssistantDiscovery";
 const char S_HOSTNAME[]                             PROGMEM = "hostname";
 const char S_HUMIDITY[]                             PROGMEM = "humidity";
 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_INDOOR_TEMP[]                          PROGMEM = "indoorTemp";
 const char S_INDOOR_TEMP_CONTROL[]                  PROGMEM = "indoorTempControl";
@@ -111,9 +118,9 @@ const char S_INVERT_STATE[]                         PROGMEM = "invertState";
 const char S_IP[]                                   PROGMEM = "ip";
 const char S_I_FACTOR[]                             PROGMEM = "i_factor";
 const char S_I_MULTIPLIER[]                         PROGMEM = "i_multiplier";
-const char S_K_FACTOR[]                             PROGMEM = "k_factor";
 const char S_LOGIN[]                                PROGMEM = "login";
 const char S_LOG_LEVEL[]                            PROGMEM = "logLevel";
+const char S_LOW_TEMP[]                             PROGMEM = "lowTemp";
 const char S_MAC[]                                  PROGMEM = "mac";
 const char S_MASTER[]                               PROGMEM = "master";
 const char S_MAX[]                                  PROGMEM = "max";
@@ -122,6 +129,7 @@ const char S_MAX_MODULATION[]                       PROGMEM = "maxModulation";
 const char S_MAX_POWER[]                            PROGMEM = "maxPower";
 const char S_MAX_TEMP[]                             PROGMEM = "maxTemp";
 const char S_MAX_TEMP_SYNC_WITH_TARGET_TEMP[]       PROGMEM = "maxTempSyncWithTargetTemp";
+const char S_MDNS[]                                 PROGMEM = "mdns";
 const char S_MEMBER_ID[]                            PROGMEM = "memberId";
 const char S_MIN[]                                  PROGMEM = "min";
 const char S_MIN_FREE[]                             PROGMEM = "minFree";
@@ -130,13 +138,11 @@ const char S_MIN_POWER[]                            PROGMEM = "minPower";
 const char S_MIN_TEMP[]                             PROGMEM = "minTemp";
 const char S_MODEL[]                                PROGMEM = "model";
 const char S_MODULATION[]                           PROGMEM = "modulation";
-const char S_MODULATION_SYNC_WITH_HEATING[]         PROGMEM = "modulationSyncWithHeating";
 const char S_MQTT[]                                 PROGMEM = "mqtt";
 const char S_NAME[]                                 PROGMEM = "name";
 const char S_NATIVE_HEATING_CONTROL[]               PROGMEM = "nativeHeatingControl";
 const char S_NETWORK[]                              PROGMEM = "network";
 const char S_NTP[]                                  PROGMEM = "ntp";
-const char S_N_FACTOR[]                             PROGMEM = "n_factor";
 const char S_OFFSET[]                               PROGMEM = "offset";
 const char S_ON_ENABLED_HEATING[]                   PROGMEM = "onEnabledHeating";
 const char S_ON_FAULT[]                             PROGMEM = "onFault";
@@ -146,6 +152,8 @@ const char S_OPTIONS[]                              PROGMEM = "options";
 const char S_OUTDOOR_TEMP[]                         PROGMEM = "outdoorTemp";
 const char S_OUT_GPIO[]                             PROGMEM = "outGpio";
 const char S_OUTPUT[]                               PROGMEM = "output";
+const char S_OVERHEAT[]                             PROGMEM = "overheat";
+const char S_OVERHEAT_PROTECTION[]                  PROGMEM = "overheatProtection";
 const char S_PASSWORD[]                             PROGMEM = "password";
 const char S_PID[]                                  PROGMEM = "pid";
 const char S_PORT[]                                 PROGMEM = "port";
@@ -172,19 +180,24 @@ const char S_SENSORS[]                              PROGMEM = "sensors";
 const char S_SERIAL[]                               PROGMEM = "serial";
 const char S_SERVER[]                               PROGMEM = "server";
 const char S_SETTINGS[]                             PROGMEM = "settings";
+const char S_SET_DATE_AND_TIME[]                    PROGMEM = "setDateAndTime";
+const char S_SHIFT[]                                PROGMEM = "shift";
 const char S_SIGNAL_QUALITY[]                       PROGMEM = "signalQuality";
 const char S_SIZE[]                                 PROGMEM = "size";
 const char S_SLAVE[]                                PROGMEM = "slave";
+const char S_SLOPE[]                                PROGMEM = "slope";
 const char S_SSID[]                                 PROGMEM = "ssid";
 const char S_STA[]                                  PROGMEM = "sta";
 const char S_STATE[]                                PROGMEM = "state";
 const char S_STATIC_CONFIG[]                        PROGMEM = "staticConfig";
 const char S_STATUS_LED_GPIO[]                      PROGMEM = "statusLedGpio";
+const char S_SETPOINT[]                             PROGMEM = "setpoint";
 const char S_SETPOINT_TEMP[]                        PROGMEM = "setpointTemp";
 const char S_SUBNET[]                               PROGMEM = "subnet";
 const char S_SUMMER_WINTER_MODE[]                   PROGMEM = "summerWinterMode";
 const char S_SYSTEM[]                               PROGMEM = "system";
 const char S_TARGET[]                               PROGMEM = "target";
+const char S_TARGET_DIFF_FACTOR[]                   PROGMEM = "targetDiffFactor";
 const char S_TARGET_TEMP[]                          PROGMEM = "targetTemp";
 const char S_TELNET[]                               PROGMEM = "telnet";
 const char S_TEMPERATURE[]                          PROGMEM = "temperature";
@@ -197,7 +210,6 @@ const char S_TRESHOLD_TIME[]                        PROGMEM = "tresholdTime";
 const char S_TURBO[]                                PROGMEM = "turbo";
 const char S_TURBO_FACTOR[]                         PROGMEM = "turboFactor";
 const char S_TYPE[]                                 PROGMEM = "type";
-const char S_T_FACTOR[]                             PROGMEM = "t_factor";
 const char S_UNIT_SYSTEM[]                          PROGMEM = "unitSystem";
 const char S_UPTIME[]                               PROGMEM = "uptime";
 const char S_USE[]                                  PROGMEM = "use";
--- a/src/utils.h
+++ b/src/utils.h
@@ -1,5 +1,37 @@
 #include <Arduino.h>

+String getChipId(const char* prefix = nullptr, const char* suffix = nullptr) {
+  String chipId;
+  chipId.reserve(
+    6
+    + (prefix != nullptr ? strlen(prefix) : 0)
+    + (suffix != nullptr ? strlen(suffix) : 0)
+  );
+  
+  if (prefix != nullptr) {
+    chipId.concat(prefix);
+  }
+
+  uint32_t cid = 0;
+  #if defined(ARDUINO_ARCH_ESP8266)
+  cid = ESP.getChipId();
+  #elif defined(ARDUINO_ARCH_ESP32)
+  // https://github.com/espressif/arduino-esp32/blob/master/libraries/ESP32/examples/ChipID/GetChipID/GetChipID.ino
+  for (uint8_t i = 0; i < 17; i = i + 8) {
+    cid |= ((ESP.getEfuseMac() >> (40 - i)) & 0xff) << i;
+  }
+  #endif
+
+  chipId += String(cid, HEX);
+
+  if (suffix != nullptr) {
+    chipId.concat(suffix);
+  }
+
+  chipId.trim();
+  return chipId;
+}
+
 bool isLeapYear(short year) {
  if (year % 4 != 0) {
    return false;
@@ -40,7 +72,7 @@ time_t mkgmtime(const struct tm *ptm) {

 inline bool isDigit(const char* ptr) {
  char* endPtr;
-  strtol(ptr, &endPtr, 10);
+  auto tmp = strtol(ptr, &endPtr, 10);
  return *endPtr == 0;
 }

@@ -408,6 +440,7 @@ void settingsToJson(const Settings& src, JsonVariant dst, bool safe = false) {
    portal[FPSTR(S_AUTH)] = src.portal.auth;
    portal[FPSTR(S_LOGIN)] = src.portal.login;
    portal[FPSTR(S_PASSWORD)] = src.portal.password;
+    portal[FPSTR(S_MDNS)] = src.portal.mdns;

    auto opentherm = dst[FPSTR(S_OPENTHERM)].to<JsonObject>();
    opentherm[FPSTR(S_UNIT_SYSTEM)] = static_cast<uint8_t>(src.opentherm.unitSystem);
@@ -416,7 +449,6 @@ void settingsToJson(const Settings& src, JsonVariant dst, bool safe = false) {
    opentherm[FPSTR(S_RX_LED_GPIO)] = src.opentherm.rxLedGpio;
    opentherm[FPSTR(S_MEMBER_ID)] = src.opentherm.memberId;
    opentherm[FPSTR(S_FLAGS)] = src.opentherm.flags;
-    opentherm[FPSTR(S_MAX_MODULATION)] = src.opentherm.maxModulation;
    opentherm[FPSTR(S_MIN_POWER)] = roundf(src.opentherm.minPower, 2);
    opentherm[FPSTR(S_MAX_POWER)] = roundf(src.opentherm.maxPower, 2);

@@ -429,9 +461,13 @@ void settingsToJson(const Settings& src, JsonVariant dst, bool safe = false) {
    otOptions[FPSTR(S_HEATING_TO_CH2)] = src.opentherm.options.heatingToCh2;
    otOptions[FPSTR(S_DHW_TO_CH2)] = src.opentherm.options.dhwToCh2;
    otOptions[FPSTR(S_DHW_BLOCKING)] = src.opentherm.options.dhwBlocking;
-    otOptions[FPSTR(S_MODULATION_SYNC_WITH_HEATING)] = src.opentherm.options.modulationSyncWithHeating;
+    otOptions[FPSTR(S_DHW_STATE_AS_DHW_BLOCKING)] = src.opentherm.options.dhwStateAsDhwBlocking;
    otOptions[FPSTR(S_MAX_TEMP_SYNC_WITH_TARGET_TEMP)] = src.opentherm.options.maxTempSyncWithTargetTemp;
    otOptions[FPSTR(S_GET_MIN_MAX_TEMP)] = src.opentherm.options.getMinMaxTemp;
+    otOptions[FPSTR(S_IGNORE_DIAG_STATE)] = src.opentherm.options.ignoreDiagState;
+    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_IMMERGAS_FIX)] = src.opentherm.options.immergasFix;

@@ -458,18 +494,33 @@ void settingsToJson(const Settings& src, JsonVariant dst, bool safe = false) {
  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;
+  heating[FPSTR(S_MAX_MODULATION)] = src.heating.maxModulation;
+
+  auto heatingOverheatProtection = heating[FPSTR(S_OVERHEAT_PROTECTION)].to<JsonObject>();
+  heatingOverheatProtection[FPSTR(S_HIGH_TEMP)] = src.heating.overheatProtection.highTemp;
+  heatingOverheatProtection[FPSTR(S_LOW_TEMP)] = src.heating.overheatProtection.lowTemp;
+
+  auto freezeProtection = heating[FPSTR(S_FREEZE_PROTECTION)].to<JsonObject>();
+  freezeProtection[FPSTR(S_LOW_TEMP)] = src.heating.freezeProtection.lowTemp;
+  freezeProtection[FPSTR(S_THRESHOLD_TIME)] = src.heating.freezeProtection.thresholdTime;

  auto dhw = dst[FPSTR(S_DHW)].to<JsonObject>();
  dhw[FPSTR(S_ENABLED)] = src.dhw.enabled;
  dhw[FPSTR(S_TARGET)] = roundf(src.dhw.target, 1);
  dhw[FPSTR(S_MIN_TEMP)] = src.dhw.minTemp;
  dhw[FPSTR(S_MAX_TEMP)] = src.dhw.maxTemp;
+  dhw[FPSTR(S_MAX_MODULATION)] = src.dhw.maxModulation;
+
+  auto dhwOverheatProtection = dhw[FPSTR(S_OVERHEAT_PROTECTION)].to<JsonObject>();
+  dhwOverheatProtection[FPSTR(S_HIGH_TEMP)] = src.dhw.overheatProtection.highTemp;
+  dhwOverheatProtection[FPSTR(S_LOW_TEMP)] = src.dhw.overheatProtection.lowTemp;

  auto equitherm = dst[FPSTR(S_EQUITHERM)].to<JsonObject>();
  equitherm[FPSTR(S_ENABLED)] = src.equitherm.enabled;
-  equitherm[FPSTR(S_N_FACTOR)] = roundf(src.equitherm.n_factor, 3);
-  equitherm[FPSTR(S_K_FACTOR)] = roundf(src.equitherm.k_factor, 3);
-  equitherm[FPSTR(S_T_FACTOR)] = roundf(src.equitherm.t_factor, 3);
+  equitherm[FPSTR(S_SLOPE)] = roundf(src.equitherm.slope, 3);
+  equitherm[FPSTR(S_EXPONENT)] = roundf(src.equitherm.exponent, 3);
+  equitherm[FPSTR(S_SHIFT)] = roundf(src.equitherm.shift, 2);
+  equitherm[FPSTR(S_TARGET_DIFF_FACTOR)] = roundf(src.equitherm.targetDiffFactor, 3);

  auto pid = dst[FPSTR(S_PID)].to<JsonObject>();
  pid[FPSTR(S_ENABLED)] = src.pid.enabled;
@@ -492,6 +543,7 @@ void settingsToJson(const Settings& src, JsonVariant dst, bool safe = false) {
    auto externalPump = dst[FPSTR(S_EXTERNAL_PUMP)].to<JsonObject>();
    externalPump[FPSTR(S_USE)] = src.externalPump.use;
    externalPump[FPSTR(S_GPIO)] = src.externalPump.gpio;
+    externalPump[FPSTR(S_INVERT_STATE)] = src.externalPump.invertState;
    externalPump[FPSTR(S_POST_CIRCULATION_TIME)] = roundf(src.externalPump.postCirculationTime / 60, 0);
    externalPump[FPSTR(S_ANTI_STUCK_INTERVAL)] = roundf(src.externalPump.antiStuckInterval / 86400, 0);
    externalPump[FPSTR(S_ANTI_STUCK_TIME)] = roundf(src.externalPump.antiStuckTime / 60, 0);
@@ -675,6 +727,15 @@ bool jsonToSettings(const JsonVariantConst src, Settings& dst, bool safe = false
      changed = true;
    }

+    if (src[FPSTR(S_PORTAL)][FPSTR(S_MDNS)].is<bool>()) {
+      bool value = src[FPSTR(S_PORTAL)][FPSTR(S_MDNS)].as<bool>();
+
+      if (value != dst.portal.mdns) {
+        dst.portal.mdns = value;
+        changed = true;
+      }
+    }
+

    // opentherm
    if (!src[FPSTR(S_OPENTHERM)][FPSTR(S_UNIT_SYSTEM)].isNull()) {
@@ -769,15 +830,6 @@ bool jsonToSettings(const JsonVariantConst src, Settings& dst, bool safe = false
      }
    }

-    if (!src[FPSTR(S_OPENTHERM)][FPSTR(S_MAX_MODULATION)].isNull()) {
-      unsigned char value = src[FPSTR(S_OPENTHERM)][FPSTR(S_MAX_MODULATION)].as<unsigned char>();
-
-      if (value > 0 && value <= 100 && value != dst.opentherm.maxModulation) {
-        dst.opentherm.maxModulation = value;
-        changed = true;
-      }
-    }
-
    if (!src[FPSTR(S_OPENTHERM)][FPSTR(S_MIN_POWER)].isNull()) {
      float value = src[FPSTR(S_OPENTHERM)][FPSTR(S_MIN_POWER)].as<float>();

@@ -886,11 +938,11 @@ bool jsonToSettings(const JsonVariantConst src, Settings& dst, bool safe = false
      }
    }

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

-      if (value != dst.opentherm.options.modulationSyncWithHeating) {
-        dst.opentherm.options.modulationSyncWithHeating = value;
+      if (value != dst.opentherm.options.dhwStateAsDhwBlocking) {
+        dst.opentherm.options.dhwStateAsDhwBlocking = value;
        changed = true;
      }
    }
@@ -913,6 +965,42 @@ bool jsonToSettings(const JsonVariantConst src, Settings& dst, bool safe = false
      }
    }

+    if (src[FPSTR(S_OPENTHERM)][FPSTR(S_OPTIONS)][FPSTR(S_IGNORE_DIAG_STATE)].is<bool>()) {
+      bool value = src[FPSTR(S_OPENTHERM)][FPSTR(S_OPTIONS)][FPSTR(S_IGNORE_DIAG_STATE)].as<bool>();
+
+      if (value != dst.opentherm.options.ignoreDiagState) {
+        dst.opentherm.options.ignoreDiagState = value;
+        changed = true;
+      }
+    }
+
+    if (src[FPSTR(S_OPENTHERM)][FPSTR(S_OPTIONS)][FPSTR(S_AUTO_FAULT_RESET)].is<bool>()) {
+      bool value = src[FPSTR(S_OPENTHERM)][FPSTR(S_OPTIONS)][FPSTR(S_AUTO_FAULT_RESET)].as<bool>();
+
+      if (value != dst.opentherm.options.autoFaultReset) {
+        dst.opentherm.options.autoFaultReset = value;
+        changed = true;
+      }
+    }
+
+    if (src[FPSTR(S_OPENTHERM)][FPSTR(S_OPTIONS)][FPSTR(S_AUTO_DIAG_RESET)].is<bool>()) {
+      bool value = src[FPSTR(S_OPENTHERM)][FPSTR(S_OPTIONS)][FPSTR(S_AUTO_DIAG_RESET)].as<bool>();
+
+      if (value != dst.opentherm.options.autoDiagReset) {
+        dst.opentherm.options.autoDiagReset = value;
+        changed = true;
+      }
+    }
+
+    if (src[FPSTR(S_OPENTHERM)][FPSTR(S_OPTIONS)][FPSTR(S_SET_DATE_AND_TIME)].is<bool>()) {
+      bool value = src[FPSTR(S_OPENTHERM)][FPSTR(S_OPTIONS)][FPSTR(S_SET_DATE_AND_TIME)].as<bool>();
+
+      if (value != dst.opentherm.options.setDateAndTime) {
+        dst.opentherm.options.setDateAndTime = value;
+        changed = true;
+      }
+    }
+
    if (src[FPSTR(S_OPENTHERM)][FPSTR(S_OPTIONS)][FPSTR(S_NATIVE_HEATING_CONTROL)].is<bool>()) {
      bool value = src[FPSTR(S_OPENTHERM)][FPSTR(S_OPTIONS)][FPSTR(S_NATIVE_HEATING_CONTROL)].as<bool>();

@@ -1040,29 +1128,38 @@ bool jsonToSettings(const JsonVariantConst src, Settings& dst, bool safe = false
    }
  }

-  if (!src[FPSTR(S_EQUITHERM)][FPSTR(S_N_FACTOR)].isNull()) {
-    float value = src[FPSTR(S_EQUITHERM)][FPSTR(S_N_FACTOR)].as<float>();
+  if (!src[FPSTR(S_EQUITHERM)][FPSTR(S_SLOPE)].isNull()) {
+    float value = src[FPSTR(S_EQUITHERM)][FPSTR(S_SLOPE)].as<float>();

-    if (value > 0 && value <= 10 && fabsf(value - dst.equitherm.n_factor) > 0.0001f) {
-      dst.equitherm.n_factor = roundf(value, 3);
+    if (value > 0.0f && value <= 10.0f && fabsf(value - dst.equitherm.slope) > 0.0001f) {
+      dst.equitherm.slope = roundf(value, 3);
      changed = true;
    }
  }

-  if (!src[FPSTR(S_EQUITHERM)][FPSTR(S_K_FACTOR)].isNull()) {
-    float value = src[FPSTR(S_EQUITHERM)][FPSTR(S_K_FACTOR)].as<float>();
+  if (!src[FPSTR(S_EQUITHERM)][FPSTR(S_EXPONENT)].isNull()) {
+    float value = src[FPSTR(S_EQUITHERM)][FPSTR(S_EXPONENT)].as<float>();

-    if (value >= 0 && value <= 10 && fabsf(value - dst.equitherm.k_factor) > 0.0001f) {
-      dst.equitherm.k_factor = roundf(value, 3);
+    if (value > 0.0f && value <= 2.0f && fabsf(value - dst.equitherm.exponent) > 0.0001f) {
+      dst.equitherm.exponent = roundf(value, 3);
      changed = true;
    }
  }

-  if (!src[FPSTR(S_EQUITHERM)][FPSTR(S_T_FACTOR)].isNull()) {
-    float value = src[FPSTR(S_EQUITHERM)][FPSTR(S_T_FACTOR)].as<float>();
+  if (!src[FPSTR(S_EQUITHERM)][FPSTR(S_SHIFT)].isNull()) {
+    float value = src[FPSTR(S_EQUITHERM)][FPSTR(S_SHIFT)].as<float>();

-    if (value >= 0 && value <= 10 && fabsf(value - dst.equitherm.t_factor) > 0.0001f) {
-      dst.equitherm.t_factor = roundf(value, 3);
+    if (value >= -15.0f && value <= 15.0f && fabsf(value - dst.equitherm.shift) > 0.0001f) {
+      dst.equitherm.shift = roundf(value, 2);
+      changed = true;
+    }
+  }
+
+  if (!src[FPSTR(S_EQUITHERM)][FPSTR(S_TARGET_DIFF_FACTOR)].isNull()) {
+    float value = src[FPSTR(S_EQUITHERM)][FPSTR(S_TARGET_DIFF_FACTOR)].as<float>();
+
+    if (value >= 0.0f && value <= 10.0f && fabsf(value - dst.equitherm.targetDiffFactor) > 0.0001f) {
+      dst.equitherm.targetDiffFactor = roundf(value, 3);
      changed = true;
    }
  }
@@ -1238,7 +1335,7 @@ bool jsonToSettings(const JsonVariantConst src, Settings& dst, bool safe = false
  if (!src[FPSTR(S_HEATING)][FPSTR(S_MIN_TEMP)].isNull()) {
    unsigned char value = src[FPSTR(S_HEATING)][FPSTR(S_MIN_TEMP)].as<unsigned char>();

-    if (value != dst.heating.minTemp && value >= vars.slave.heating.minTemp && value < vars.slave.heating.maxTemp && value != dst.heating.minTemp) {
+    if (value != dst.heating.minTemp && value >= vars.slave.heating.minTemp && value < vars.slave.heating.maxTemp && value != dst.heating.maxTemp) {
      dst.heating.minTemp = value;
      changed = true;
    }
@@ -1247,7 +1344,7 @@ bool jsonToSettings(const JsonVariantConst src, Settings& dst, bool safe = false
  if (!src[FPSTR(S_HEATING)][FPSTR(S_MAX_TEMP)].isNull()) {
    unsigned char value = src[FPSTR(S_HEATING)][FPSTR(S_MAX_TEMP)].as<unsigned char>();

-    if (value != dst.heating.maxTemp && value > vars.slave.heating.minTemp && value <= vars.slave.heating.maxTemp && value != dst.heating.maxTemp) {
+    if (value != dst.heating.maxTemp && value > vars.slave.heating.minTemp && value <= vars.slave.heating.maxTemp && value != dst.heating.minTemp) {
      dst.heating.maxTemp = value;
      changed = true;
    }
@@ -1259,6 +1356,59 @@ bool jsonToSettings(const JsonVariantConst src, Settings& dst, bool safe = false
  }


+  if (!src[FPSTR(S_HEATING)][FPSTR(S_MAX_MODULATION)].isNull()) {
+    unsigned char value = src[FPSTR(S_HEATING)][FPSTR(S_MAX_MODULATION)].as<unsigned char>();
+
+    if (value > 0 && value <= 100 && value != dst.heating.maxModulation) {
+      dst.heating.maxModulation = value;
+      changed = true;
+    }
+  }
+
+  if (!src[FPSTR(S_HEATING)][FPSTR(S_OVERHEAT_PROTECTION)][FPSTR(S_HIGH_TEMP)].isNull()) {
+    unsigned char value = src[FPSTR(S_HEATING)][FPSTR(S_OVERHEAT_PROTECTION)][FPSTR(S_HIGH_TEMP)].as<unsigned char>();
+
+    if (isValidTemp(value, dst.system.unitSystem, 0.0f, 100.0f) && value != dst.heating.overheatProtection.highTemp) {
+      dst.heating.overheatProtection.highTemp = value;
+      changed = true;
+    }
+  }
+
+  if (!src[FPSTR(S_HEATING)][FPSTR(S_OVERHEAT_PROTECTION)][FPSTR(S_LOW_TEMP)].isNull()) {
+    unsigned char value = src[FPSTR(S_HEATING)][FPSTR(S_OVERHEAT_PROTECTION)][FPSTR(S_LOW_TEMP)].as<unsigned char>();
+
+    if (isValidTemp(value, dst.system.unitSystem, 0.0f, 99.0f) && value != dst.heating.overheatProtection.lowTemp) {
+      dst.heating.overheatProtection.lowTemp = value;
+      changed = true;
+    }
+  }
+
+  if (dst.heating.overheatProtection.highTemp < dst.heating.overheatProtection.lowTemp) {
+    dst.heating.overheatProtection.highTemp = dst.heating.overheatProtection.lowTemp;
+    changed = true;
+  }
+
+  if (!src[FPSTR(S_HEATING)][FPSTR(S_FREEZE_PROTECTION)][FPSTR(S_LOW_TEMP)].isNull()) {
+    unsigned short value = src[FPSTR(S_HEATING)][FPSTR(S_FREEZE_PROTECTION)][FPSTR(S_LOW_TEMP)].as<uint8_t>();
+
+    if (isValidTemp(value, dst.system.unitSystem, 1, 30) && value != dst.heating.freezeProtection.lowTemp) {
+      dst.heating.freezeProtection.lowTemp = value;
+      changed = true;
+    }
+  }
+
+  if (!src[FPSTR(S_HEATING)][FPSTR(S_FREEZE_PROTECTION)][FPSTR(S_THRESHOLD_TIME)].isNull()) {
+    unsigned short value = src[FPSTR(S_HEATING)][FPSTR(S_FREEZE_PROTECTION)][FPSTR(S_THRESHOLD_TIME)].as<unsigned short>();
+
+    if (value >= 30 && value <= 1800) {
+      if (value != dst.heating.freezeProtection.thresholdTime) {
+        dst.heating.freezeProtection.thresholdTime = value;
+        changed = true;
+      }
+    }
+  }
+
+
  // dhw
  if (src[FPSTR(S_DHW)][FPSTR(S_ENABLED)].is<bool>()) {
    bool value = src[FPSTR(S_DHW)][FPSTR(S_ENABLED)].as<bool>();
@@ -1292,6 +1442,38 @@ bool jsonToSettings(const JsonVariantConst src, Settings& dst, bool safe = false
    changed = true;
  }

+  if (!src[FPSTR(S_DHW)][FPSTR(S_MAX_MODULATION)].isNull()) {
+    unsigned char value = src[FPSTR(S_DHW)][FPSTR(S_MAX_MODULATION)].as<unsigned char>();
+
+    if (value > 0 && value <= 100 && value != dst.dhw.maxModulation) {
+      dst.dhw.maxModulation = value;
+      changed = true;
+    }
+  }
+
+  if (!src[FPSTR(S_DHW)][FPSTR(S_OVERHEAT_PROTECTION)][FPSTR(S_HIGH_TEMP)].isNull()) {
+    unsigned char value = src[FPSTR(S_DHW)][FPSTR(S_OVERHEAT_PROTECTION)][FPSTR(S_HIGH_TEMP)].as<unsigned char>();
+
+    if (isValidTemp(value, dst.system.unitSystem, 0.0f, 100.0f) && value != dst.dhw.overheatProtection.highTemp) {
+      dst.dhw.overheatProtection.highTemp = value;
+      changed = true;
+    }
+  }
+
+  if (!src[FPSTR(S_DHW)][FPSTR(S_OVERHEAT_PROTECTION)][FPSTR(S_LOW_TEMP)].isNull()) {
+    unsigned char value = src[FPSTR(S_DHW)][FPSTR(S_OVERHEAT_PROTECTION)][FPSTR(S_LOW_TEMP)].as<unsigned char>();
+
+    if (isValidTemp(value, dst.system.unitSystem, 0.0f, 99.0f) && value != dst.dhw.overheatProtection.lowTemp) {
+      dst.dhw.overheatProtection.lowTemp = value;
+      changed = true;
+    }
+  }
+
+  if (dst.dhw.overheatProtection.highTemp < dst.dhw.overheatProtection.lowTemp) {
+    dst.dhw.overheatProtection.highTemp = dst.dhw.overheatProtection.lowTemp;
+    changed = true;
+  }
+

  if (!safe) {
    // external pump
@@ -1321,6 +1503,15 @@ bool jsonToSettings(const JsonVariantConst src, Settings& dst, bool safe = false
      }
    }

+    if (src[FPSTR(S_EXTERNAL_PUMP)][FPSTR(S_INVERT_STATE)].is<bool>()) {
+      bool value = src[FPSTR(S_EXTERNAL_PUMP)][FPSTR(S_INVERT_STATE)].as<bool>();
+
+      if (value != dst.externalPump.invertState) {
+        dst.externalPump.invertState = value;
+        changed = true;
+      }
+    }
+
    if (!src[FPSTR(S_EXTERNAL_PUMP)][FPSTR(S_POST_CIRCULATION_TIME)].isNull()) {
      unsigned short value = src[FPSTR(S_EXTERNAL_PUMP)][FPSTR(S_POST_CIRCULATION_TIME)].as<unsigned short>();

@@ -1650,6 +1841,7 @@ bool jsonToSensorSettings(const uint8_t sensorId, const JsonVariantConst src, Se
      case static_cast<uint8_t>(Sensors::Purpose::EXHAUST_TEMP):
      case static_cast<uint8_t>(Sensors::Purpose::MODULATION_LEVEL):

+      case static_cast<uint8_t>(Sensors::Purpose::NUMBER):
      case static_cast<uint8_t>(Sensors::Purpose::POWER_FACTOR):
      case static_cast<uint8_t>(Sensors::Purpose::POWER):
      case static_cast<uint8_t>(Sensors::Purpose::FAN_SPEED):
@@ -1694,6 +1886,15 @@ bool jsonToSensorSettings(const uint8_t sensorId, const JsonVariantConst src, Se
      case static_cast<uint8_t>(Sensors::Type::OT_FAN_SPEED_SETPOINT):
      case static_cast<uint8_t>(Sensors::Type::OT_FAN_SPEED_CURRENT):

+      case static_cast<uint8_t>(Sensors::Type::OT_BURNER_STARTS):
+      case static_cast<uint8_t>(Sensors::Type::OT_DHW_BURNER_STARTS):
+      case static_cast<uint8_t>(Sensors::Type::OT_HEATING_PUMP_STARTS):
+      case static_cast<uint8_t>(Sensors::Type::OT_DHW_PUMP_STARTS):
+      case static_cast<uint8_t>(Sensors::Type::OT_BURNER_HOURS):
+      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::NTC_10K_TEMP):
      case static_cast<uint8_t>(Sensors::Type::DALLAS_TEMP):
      case static_cast<uint8_t>(Sensors::Type::BLUETOOTH):
@@ -1713,7 +1914,7 @@ bool jsonToSensorSettings(const uint8_t sensorId, const JsonVariantConst src, Se

  // gpio
  if (!src[FPSTR(S_GPIO)].isNull()) {
-    if (dst.type != Sensors::Type::DALLAS_TEMP && dst.type == Sensors::Type::BLUETOOTH && dst.type == Sensors::Type::NTC_10K_TEMP) {
+    if (dst.type != Sensors::Type::DALLAS_TEMP && dst.type != Sensors::Type::NTC_10K_TEMP) {
      if (dst.gpio != GPIO_IS_NOT_CONFIGURED) {
        dst.gpio = GPIO_IS_NOT_CONFIGURED;
        changed = true;
@@ -1749,12 +1950,20 @@ bool jsonToSensorSettings(const uint8_t sensorId, const JsonVariantConst src, Se
      );

      if (parsed == 8) {
-        for (uint8_t i = 0; i < 8; i++) {
+        for (uint8_t i = 0; i < parsed; i++) {
          if (dst.address[i] != tmp[i]) {
            dst.address[i] = tmp[i];
            changed = true;
          }
        }
+
+      } else {
+        // reset
+        for (uint8_t i = 0; i < sizeof(dst.address); i++) {
+          dst.address[i] = 0x00;
+        }
+
+        changed = true;
      }

    } else if (dst.type == Sensors::Type::BLUETOOTH) {
@@ -1767,12 +1976,20 @@ bool jsonToSensorSettings(const uint8_t sensorId, const JsonVariantConst src, Se
      );

      if (parsed == 6) {
-        for (uint8_t i = 0; i < 6; i++) {
+        for (uint8_t i = 0; i < parsed; i++) {
          if (dst.address[i] != tmp[i]) {
            dst.address[i] = tmp[i];
            changed = true;
          }
        }
+
+      } else {
+        // reset
+        for (uint8_t i = 0; i < sizeof(dst.address); i++) {
+          dst.address[i] = 0x00;
+        }
+        
+        changed = true;
      }
    }
  }
@@ -1791,7 +2008,7 @@ bool jsonToSensorSettings(const uint8_t sensorId, const JsonVariantConst src, Se
  if (!src[FPSTR(S_FACTOR)].isNull()) {
    float value = src[FPSTR(S_FACTOR)].as<float>();

-    if (value > 0.09f && value <= 10.0f && fabsf(value - dst.factor) > 0.0001f) {
+    if (value > 0.09f && value <= 100.0f && fabsf(value - dst.factor) > 0.0001f) {
      dst.factor = roundf(value, 3);
      changed = true;
    }
@@ -1879,7 +2096,10 @@ void varsToJson(const Variables& src, JsonVariant dst) {
  slave[FPSTR(S_PROTOCOL_VERSION)] = src.slave.appVersion;
  slave[FPSTR(S_CONNECTED)] = src.slave.connected;
  slave[FPSTR(S_FLAME)] = src.slave.flame;
-  slave[FPSTR(S_COOLING)] = src.slave.cooling;
+
+  auto sCooling = slave[FPSTR(S_COOLING)].to<JsonObject>();
+  sCooling[FPSTR(S_ACTIVE)] = src.slave.cooling.active;
+  sCooling[FPSTR(S_SETPOINT)] = src.slave.cooling.setpoint;

  auto sModulation = slave[FPSTR(S_MODULATION)].to<JsonObject>();
  sModulation[FPSTR(S_MIN)] = src.slave.modulation.min;
@@ -1913,6 +2133,7 @@ void varsToJson(const Variables& src, JsonVariant dst) {
  mHeating[FPSTR(S_ENABLED)] = src.master.heating.enabled;
  mHeating[FPSTR(S_BLOCKING)] = src.master.heating.blocking;
  mHeating[FPSTR(S_INDOOR_TEMP_CONTROL)] = src.master.heating.indoorTempControl;
+  mHeating[FPSTR(S_OVERHEAT)] = src.master.heating.overheat;
  mHeating[FPSTR(S_SETPOINT_TEMP)] = roundf(src.master.heating.setpointTemp, 2);
  mHeating[FPSTR(S_TARGET_TEMP)] = roundf(src.master.heating.targetTemp, 2);
  mHeating[FPSTR(S_CURRENT_TEMP)] = roundf(src.master.heating.currentTemp, 2);
@@ -1924,6 +2145,7 @@ void varsToJson(const Variables& src, JsonVariant dst) {

  auto mDhw = master[FPSTR(S_DHW)].to<JsonObject>();
  mDhw[FPSTR(S_ENABLED)] = src.master.dhw.enabled;
+  mDhw[FPSTR(S_OVERHEAT)] = src.master.dhw.overheat;
  mDhw[FPSTR(S_TARGET_TEMP)] = roundf(src.master.dhw.targetTemp, 2);
  mDhw[FPSTR(S_CURRENT_TEMP)] = roundf(src.master.dhw.currentTemp, 2);
  mDhw[FPSTR(S_RETURN_TEMP)] = roundf(src.master.dhw.returnTemp, 2);
--- a/src_data/locales/cn.json
+++ b/src_data/locales/cn.json
@@ -0,0 +1,509 @@
+{
+  "values": {
+    "logo": "OpenTherm Gateway",
+    "nav": {
+      "license": "授权许可",
+      "source": "源代码",
+      "help": "帮助",
+      "issues": "问题与反馈",
+      "releases": "发行版"
+    },
+    "dbm": "dBm",
+    "kw": "kW",
+    "time": {
+      "days": "天",
+      "hours": "小时",
+      "min": "分",
+      "sec": "秒"
+    },
+
+    "button": {
+      "upgrade": "固件升级",
+      "restart": "重启",
+      "save": "保存",
+      "saved": "已保存",
+      "refresh": "刷新",
+      "restore": "恢复",
+      "restored": "已恢复",
+      "backup": "备份",
+      "wait": "请等待...",
+      "uploading": "上传中...",
+      "success": "成功",
+      "error": "错误"
+    },
+
+    "index": {
+      "title": "OpenTherm Gateway",
+
+      "section": {
+        "network": "网络",
+        "system": "系统"
+      },
+
+      "system": {
+        "build": {
+          "title": "Build",
+          "version": "固件版本",
+          "date": "日期",
+          "core": "内核版本",
+          "sdk": "SDK"
+        },
+        "uptime": "运行时间",
+        "memory": {
+          "title": "可用内存",
+          "maxFreeBlock": "max free block",
+          "min": "min"
+        },
+        "board": "开发板",
+        "chip": {
+          "model": "芯片",
+          "cores": "核心数",
+          "freq": "频率"
+        },
+        "flash": {
+          "size": "闪存容量",
+          "realSize": "实际容量"
+        },
+        "lastResetReason": "上次重置原因"
+      }
+    },
+
+    "dashboard": {
+      "name": "仪表盘",
+      "title": "仪表盘 - OpenTherm Gateway",
+
+      "section": {
+        "control": "调节",
+        "states": "状态",
+        "sensors": "传感器",
+        "diag": "OpenTherm 诊断"
+      },
+
+      "thermostat": {
+        "heating": "供暖",
+        "dhw": "生活热水",
+        "temp.current": "当前温度",
+        "enable": "启用",
+        "turbo": "Turbo 模式"
+      },
+
+      "notify": {
+        "fault": {
+          "title": "锅炉报警状态已激活!",
+          "note": "建议检查锅炉并查看说明书对应的报警代码:"
+        },
+        "diag": {
+          "title": "锅炉诊断状态已激活!",
+          "note": "锅炉可能需要检查，建议查看说明书对应的诊断代码:"
+        },
+        "reset": "点击复位"
+      },
+
+      "states": {
+        "mNetworkConnected": "网络连接状态",
+        "mMqttConnected": "MQTT服务器连接状态",
+        "mEmergencyState": "应急模式",
+        "mExtPumpState": "外置循环泵",
+        "mCascadeControlInput": "Cascade 控制 (input)",
+        "mCascadeControlOutput": "Cascade 控制 (output)",
+
+        "sConnected": "OpenTherm 通讯状态",
+        "sFlame": "火焰",
+        "sCoolingActive": "制冷",
+        "sCoolingSetpoint": "冷却设定点",
+        "sFaultActive": "报警状态",
+        "sFaultCode": "报警代码",
+        "sDiagActive": "诊断状态",
+        "sDiagCode": "诊断代码",
+        
+        "mHeatEnabled": "供暖功能已启用",
+        "mHeatBlocking": "供暖",
+        "mHeatOverheat": "供暖超热保护",
+        "sHeatActive": "供暖激活状态",
+        "mHeatSetpointTemp": "供暖供水设定温度",
+        "mHeatTargetTemp": "供暖供水目标温度",
+        "mHeatCurrTemp": "供暖当前供水温度",
+        "mHeatRetTemp": "供暖回水温度",
+        "mHeatIndoorTemp": "供暖，室内温度",
+        "mHeatOutdoorTemp": "供暖，室外温度",
+
+        "mDhwEnabled": "生活热水功能已启用",
+        "mDhwOverheat": "生活热水超热保护",
+        "sDhwActive": "生活热水激活",
+        "mDhwTargetTemp": "生活热水目标温度",
+        "mDhwCurrTemp": "生活热水当前出水温度",
+        "mDhwRetTemp": "生活热水回水温度"
+      },
+
+      "sensors": {
+        "values": {
+          "temp": "温度",
+          "humidity": "湿度",
+          "battery": "电量",
+          "rssi": "RSSI"
+        }
+      }
+    },
+
+    "network": {
+      "title": "网络 - OpenTherm Gateway",
+      "name": "网络设置",
+
+      "section": {
+        "static": "静态设置",
+        "availableNetworks": "可用网络",
+        "staSettings": "WiFi 设置",
+        "apSettings": "AP 设置"
+      },
+
+      "scan": {
+        "pos": "#",
+        "info": "Info"
+      },
+
+      "wifi": {
+        "ssid": "SSID",
+        "password": "密码",
+        "channel": "频道",
+        "signal": "信号强度",
+        "connected": "已连接"
+      },
+
+      "params": {
+        "hostname": "Hostname",
+        "dhcp": "自动 (DHCP)",
+        "mac": "物理地址 (MAC)",
+        "ip": "IP",
+        "subnet": "子网掩码",
+        "gateway": "网关",
+        "dns": "DNS 服务器"
+      },
+
+      "sta": {
+        "channel.note": "自动选择设置为0"
+      }
+    },
+
+    "sensors": {
+      "title": "传感器设置 - OpenTherm Gateway",
+      "name": "传感器设置",
+
+      "enabled": "启用",
+      "sensorName": {
+        "title": "传感器名称",
+        "note": "只能包含：a-z、A-Z、0-9、下划线和空格"
+      },
+      "purpose": "用途",
+      "purposes": {
+        "outdoorTemp": "室外温度",
+        "indoorTemp": "室内温度",
+        "heatTemp": "供暖，温度",
+        "heatRetTemp": "供暖回水温度",
+        "dhwTemp": "生活热水温度",
+        "dhwRetTemp": "生活热水回水温度",
+        "dhwFlowRate": "生活热水水流量",
+        "exhaustTemp": "烟气温度",
+        "modLevel": "Modulation level (%)",
+        "number": "Number (raw)",
+        "powerFactor": "功率 (%)",
+        "power": "功率(kW)",
+        "fanSpeed": "风机转速",
+        "co2": "CO2",
+        "pressure": "压力",
+        "humidity": "湿度",
+        "temperature": "温度",
+        "notConfigured": "未配置"
+      },
+      "type": "类型/来源",
+      "types": {
+        "otOutdoorTemp": "OpenTherm, outdoor temp",
+        "otHeatTemp": "OpenTherm, heating, temp",
+        "otHeatRetTemp": "OpenTherm, heating, return temp",
+        "otDhwTemp": "OpenTherm, DHW, temperature",
+        "otDhwTemp2": "OpenTherm, DHW, temperature 2",
+        "otDhwFlowRate": "OpenTherm, DHW, flow rate",
+        "otCh2Temp": "OpenTherm, channel 2, temp",
+        "otExhaustTemp": "OpenTherm, exhaust temp",
+        "otHeatExchangerTemp": "OpenTherm, heat exchanger temp",
+        "otPressure": "OpenTherm, pressure",
+        "otModLevel": "OpenTherm, modulation level",
+        "otCurrentPower": "OpenTherm, current power",
+        "otExhaustCo2": "OpenTherm, exhaust CO2",
+        "otExhaustFanSpeed": "OpenTherm, exhaust fan speed",
+        "otSupplyFanSpeed": "OpenTherm, supply fan speed",
+        "otSolarStorageTemp": "OpenTherm, solar storage temp",
+        "otSolarCollectorTemp": "OpenTherm, solar collector temp",
+        "otFanSpeedSetpoint": "OpenTherm, setpoint fan speed",
+        "otFanSpeedCurrent": "OpenTherm, current fan speed",
+        "otBurnerStarts": "OpenTherm, number of burner starts",
+        "otDhwBurnerStarts": "OpenTherm, number of burner starts (DHW)",
+        "otHeatingPumpStarts": "OpenTherm, number of pump starts (heating)",
+        "otDhwPumpStarts": "OpenTherm, number of pump starts (DHW)",
+        "otBurnerHours": "OpenTherm, number of burner operating hours",
+        "otDhwBurnerHours": "OpenTherm, number of burner operating hours (DHW)",
+        "otHeatingPumpHours": "OpenTherm, number of pump operating hours (heating)",
+        "otDhwPumpHours": "OpenTherm, number of pump operating hours (DHW)",
+        
+        "ntcTemp": "NTC 传感器",
+        "dallasTemp": "DALLAS 传感器",
+        "bluetooth": "BLE 传感器",
+        "heatSetpointTemp": "Heating, setpoint temp",
+        "manual": "通过 MQTT/API 手动配置",
+        "notConfigured": "未配置"
+      },
+      "gpio": "GPIO",
+      "address": {
+        "title": "传感器地址",
+        "note": "如需自动检测DALLAS传感器，请保持默认设置；如需连接BLE设备，则需提供MAC地址"
+      },
+      "correction": {
+        "desc": "数值校正",
+        "offset": "补偿值（偏移量）",
+        "factor": "Multiplier"
+      },
+      "filtering": {
+        "desc": "数值滤波",
+        "enabled": {
+          "title": "启用滤波",
+          "note": "如果图表中有大量尖锐的噪声，此功能会很有用。使用的滤波器是 \"滑动平均滤波器\"."
+        },
+        "factor": {
+          "title": "滤波系数",
+          "note": "数值越低，数值变化越平滑且响应越滞后"
+        }
+      }
+    },
+
+    "settings": {
+      "title": "设置 - OpenTherm Gateway",
+      "name": "设置",
+
+      "section": {
+        "portal": "Portal 设置",
+        "system": "系统设置",
+        "diag": "诊断",
+        "heating": "供热设置",
+        "dhw": "生活热水设置",
+        "emergency": "应急模式设置",
+        "equitherm": "气候补偿设置",
+        "pid": "PID 参数设置",
+        "ot": "OpenTherm协议设置",
+        "mqtt": "MQTT 服务器设置",
+        "extPump": "外置循环泵设置",
+        "cascadeControl": "Cascade 级联控制设置"
+      },
+
+      "enable": "启用",
+      "note": {
+        "restart": "更改这些设置后，必须重启设备以使变更生效",
+        "blankNotUse": "空白 - 未使用",
+        "bleDevice": "BLE设备仅支持搭载BLE功能的特定ESP32开发板使用!"
+      },
+
+      "temp": {
+        "min": "最低温度",
+        "max": "最高温度"
+      },
+      "maxModulation": "最大调制范围",
+      "ohProtection": {
+        "title": "超温保护",
+        "desc": "<b>注意：</b> 当锅炉内置过热保护失效或工作异常导致系统超温时，此功能可提供额外保护。如需禁用，请将<b>最高温度</b>和<b>最低温度</b>均设为0。",
+        "highTemp": {
+          "title": "高温阈值",
+          "note": "触发燃烧器强制关闭的阈值温度"
+        },
+        "lowTemp": {
+          "title": "低温阈值",
+          "note": "燃烧器重新启动的阈值温度"
+        }
+      },
+      "freezeProtection": {
+        "title": "防冻保护",
+        "desc": "当热媒或室内温度在<b>等待时间</b> 内降至<b>低温阈值</b>以下时，系统将强制启动加热功能。",
+        "lowTemp": "低温阈值",
+        "thresholdTime": "等待时间<small>(秒)</small>"
+      },
+
+      "portal": {
+        "login": "登录",
+        "password": "密码",
+        "auth": "需身份验证",
+        "mdns": "使用 mDNS"
+      },
+
+      "system": {
+        "unit": "单位",
+        "metric": "公制 <small>(摄氏度、升、巴)</small>",
+        "imperial": "英制 <small>(华氏度、加仑、psi)</small>",
+        "statusLedGpio": "状态指示灯GPIO引脚",
+        "logLevel": "日志级别",
+        "serial": {
+          "enable": "启用串口",
+          "baud": "串口波特率"
+        },
+        "telnet": {
+          "enable": "启用 Telnet",
+          "port": {
+            "title": "Telnet 端口",
+            "note": "默认值：23"
+          }
+        },
+        "ntp": {
+          "server": "NTP服务器",
+          "timezone": "时区",
+          "timezonePresets": "选择预设配置..."
+        }
+      },
+
+      "heating": {
+        "hyst": "滞后值<small>(单位：度)</small>",
+        "turboFactor": "Turbo 模式系数"
+      },
+
+      "emergency": {
+        "desc": "紧急模式会在以下情况自动激活（当PID或气候补偿无法计算热媒设定值时）：<br />启用气候补偿但室外温度传感器断开连接；<br />启用PID或 OpenTherm 选项中启用<i>原生供暖控制</i>但室内温度传感器断开连接。<br /><b>注意：</b> 网络故障或MQTT 服务器连接故障时，类型为<i>通过MQTT/API手动控制<i>的传感器将显示为断开连接状态。",
+        
+        "target": {
+          "title": "目标温度",
+          "note": "<b>重要提示：</b> 若启用OpenTherm选项 <i>«原生供暖控制»</i>，此处设定值为<u>目标室内温度</u>；<br />其他所有情况下，此处设定值为 <u>目标热媒出水温度</u>."
+        },
+        "treshold": "阈值时间 <small>(秒)</small>"
+      },
+
+      "equitherm": {
+        "n": "N 系数",
+        "k": "K 系数",
+        "t": {
+          "title": "T 系数",
+          "note": "启用PID时此参数无效"
+        }
+      },
+
+      "pid": {
+        "p": "P 系数",
+        "i": "I 系数",
+        "d": "D 系数",
+        "dt": "DT <small>以秒为单位</small>",
+        "limits": {
+          "title": "Limits",
+          "note": "<b>重要提示：</b> When using «Equitherm» and «PID» at the same time, the min and max temperatures limit the influence on the «Equitherm» result temperature.<br />Thus, if the min temperature is set to -15 and the max temperature is set to 15, then the final heat carrier setpoint will be from <code>equitherm_result - 15</code> to <code>equitherm_result + 15</code>."
+        },
+        "deadband": {
+          "title": "Deadband",
+          "note": "Deadband is a range around the target temperature where PID regulation becomes less active. Within this range, the algorithm can reduce intensity or pause adjustments to avoid overreacting to small fluctuations.<br /><br />For instance, with a target temperature of 22°, a lower threshold of 1.0, and an upper threshold of 0.5, the deadband operates between 21° and 22.5°. If the I coefficient is 0.0005 and the I multiplier is 0.05, then within the deadband, the I coefficient becomes: <code>0.0005 * 0.05 = 0.000025</code>",
+          "p_multiplier": "Multiplier for P factor",
+          "i_multiplier": "Multiplier for I factor",
+          "d_multiplier": "Multiplier for D factor",
+          "thresholdHigh": "Threshold high",
+          "thresholdLow": "Threshold low"
+        }
+      },
+
+      "ot": {
+        "advanced": "高级设置",
+        "inGpio": "In GPIO",
+        "outGpio": "Out GPIO",
+        "ledGpio": "RX LED GPIO",
+        "memberId": "主设备成员 ID",
+        "flags": "主设备标志",
+        "minPower": {
+          "title": "最小锅炉功率 <small>(kW)</small>",
+          "note": "该值对应锅炉0-1%的调制水平，通常在锅炉参数设置中的\"最小有效热输出\"。"
+        },
+        "maxPower": {
+          "title": "最大锅炉功率 <small>(kW)</small>",
+          "note": "<b>0</b> - 自动检测，通常在锅炉参数设置中的\"最大有效热输出\"。 "
+        },
+
+        "options": {
+          "title": "选项（附加设置）",
+          "desc": "附加设置选项可调整锅炉的运行逻辑。由于协议未完整记录所有选项，同一选项在不同锅炉上可能产生不同效果。<br /><b>注意：</b>若系统运行正常，无需修改设置。",
+          "dhwSupport": "生活热水支持",
+          "coolingSupport": "制冷支持",
+          "summerWinterMode": "夏季/冬季模式",
+          "heatingStateToSummerWinterMode": "以供暖状态作为夏季/冬季模式",
+          "ch2AlwaysEnabled": "CH2 始终启用",
+          "heatingToCh2": "将供暖同步至 CH2",
+          "dhwToCh2": "将生活热水同步至 CH2",
+          "dhwBlocking": "生活热水锁定",
+          "dhwStateAsDhwBlocking": "以生活热水状态作为生活热水锁定依据",
+          "maxTempSyncWithTargetTemp": "将最高供暖温度与目标温度同步",
+          "getMinMaxTemp": "从锅炉获取最小/最大温度参数",
+          "ignoreDiagState": "忽略诊断状态",
+          "autoFaultReset": "自动报警复位 <small>(不推荐！)</small>",
+          "autoDiagReset": "自动诊断复位 <small>(不推荐！)</small>",
+          "setDateAndTime": "同步设置锅炉日期与时间",
+          "immergasFix": "针对Immergas锅炉的兼容性修复"
+        },
+
+        "nativeHeating": {
+          "title": "原生锅炉供暖控制",
+          "note": "<u>注意：</u> 仅适用于锅炉需接收目标室温并自主调节载热介质温度的场景，与固件中的PID及Equithermq气候补偿功能不兼容。"
+        }
+      },
+
+      "mqtt": {
+        "homeAssistantDiscovery": "Home Assistant 自动发现",
+        "server": "服务器地址",
+        "port": "端口",
+        "user": "用户名",
+        "password": "密码",
+        "prefix": "Prefix 前缀",
+        "interval": "发布间隔 <small>(秒)</small>"
+      },
+
+      "extPump": {
+        "use": "使用外置循环泵",
+        "gpio": "继电器 GPIO引脚",
+        "invertState": "切换 GPIO 状态",
+        "postCirculationTime": "后循环时间 <small>(分钟)</small>",
+        "antiStuckInterval": "防卡死间隔时间<small>(天)</small>",
+        "antiStuckTime": "防卡死运行时长<small>(分钟)</small>"
+      },
+
+      "cascadeControl": {
+        "input": {
+          "desc": "仅当另一台锅炉发生故障时启用本锅炉加热。另一台锅炉的控制器需在故障发生时切换GPIO输入状态以触发本功能。",
+          "enable": "启用 input",
+          "gpio": "GPIO",
+          "invertState": "切换 GPIO 状态",
+          "thresholdTime": "状态变化阈值时间<small>(秒)</small>"
+        },
+        "output": {
+          "desc": "可通过<u>继电器</u>控制另一台锅炉的启停。",
+          "enable": "启用 output",
+          "gpio": "GPIO",
+          "invertState": "切换 GPIO 状态",
+          "thresholdTime": "状态变化阈值时间 <small>(秒)</small>",
+          "events": {
+            "desc": "事件",
+            "onFault": "当故障状态激活时",
+            "onLossConnection": "当OpenTherm连接中断时",
+            "onEnabledHeating": "当供暖功能启用时"
+          }
+        }
+      }
+    },
+
+    "upgrade": {
+      "title": "固件升级 - OpenTherm Gateway",
+      "name": "固件升级",
+
+      "section": {
+        "backupAndRestore": "备份与恢复",
+        "backupAndRestore.desc": "本功能支持备份和恢复全部设置",
+        "upgrade": "升级",
+        "upgrade.desc": "本模块支持升级设备的固件与系统文件。<br />可从以下地址下载最新版本 <a href=\"https://github.com/Laxilef/OTGateway/releases\" target=\"_blank\">Releases page</a> 。" 
+      },
+
+      "note": {
+        "disclaimer1": "升级系统文件成功后，所有设置将恢复为默认值！升级前请务必备份配置。",
+        "disclaimer2": "升级成功后，设备将在15秒后自动重启。"
+      },
+
+      "settingsFile": "设置文件",
+      "fw": "Firmware",
+      "fs": "Filesystem"
+    }
+  }
+}
--- a/src_data/locales/en.json
+++ b/src_data/locales/en.json
@@ -109,7 +109,8 @@

        "sConnected": "OpenTherm connection",
        "sFlame": "Flame",
-        "sCooling": "Cooling",
+        "sCoolingActive": "Cooling",
+        "sCoolingSetpoint": "Cooling setpoint",
        "sFaultActive": "Fault",
        "sFaultCode": "Fault code",
        "sDiagActive": "Diagnostic",
@@ -117,6 +118,7 @@
        
        "mHeatEnabled": "Heating enabled",
        "mHeatBlocking": "Heating blocked",
+        "mHeatOverheat": "Heating overheat",
        "sHeatActive": "Heating active",
        "mHeatSetpointTemp": "Heating setpoint temp",
        "mHeatTargetTemp": "Heating target temp",
@@ -126,6 +128,7 @@
        "mHeatOutdoorTemp": "Heating, outdoor temp",

        "mDhwEnabled": "DHW enabled",
+        "mDhwOverheat": "DHW overheat",
        "sDhwActive": "DHW active",
        "mDhwTargetTemp": "DHW target temp",
        "mDhwCurrTemp": "DHW current temp",
@@ -201,6 +204,7 @@
        "dhwFlowRate": "DHW, flow rate",
        "exhaustTemp": "Exhaust temperature",
        "modLevel": "Modulation level (in percents)",
+        "number": "Number (raw)",
        "powerFactor": "Power (in percent)",
        "power": "Power (in kWt)",
        "fanSpeed": "Fan speed",
@@ -231,6 +235,14 @@
        "otSolarCollectorTemp": "OpenTherm, solar collector temp",
        "otFanSpeedSetpoint": "OpenTherm, setpoint fan speed",
        "otFanSpeedCurrent": "OpenTherm, current fan speed",
+        "otBurnerStarts": "OpenTherm, number of burner starts",
+        "otDhwBurnerStarts": "OpenTherm, number of burner starts (DHW)",
+        "otHeatingPumpStarts": "OpenTherm, number of pump starts (heating)",
+        "otDhwPumpStarts": "OpenTherm, number of pump starts (DHW)",
+        "otBurnerHours": "OpenTherm, number of burner operating hours",
+        "otDhwBurnerHours": "OpenTherm, number of burner operating hours (DHW)",
+        "otHeatingPumpHours": "OpenTherm, number of pump operating hours (heating)",
+        "otDhwPumpHours": "OpenTherm, number of pump operating hours (DHW)",
        
        "ntcTemp": "NTC sensor",
        "dallasTemp": "DALLAS sensor",
@@ -292,11 +304,31 @@
        "min": "Minimum temperature",
        "max": "Maximum temperature"
      },
+      "maxModulation": "Max modulation level",
+      "ohProtection": {
+        "title": "Overheating protection",
+        "desc": "<b>Note:</b> This feature can be useful if the built-in boiler overheating protection does not work or does not work correctly and the heat carrier boils. To disable, set 0 as <b>high</b> and <b>low</b> temperature.",
+        "highTemp": {
+          "title": "High temperature threshold",
+          "note": "Threshold at which the burner will be forcibly switched off"
+        },
+        "lowTemp": {
+          "title": "Low temperature threshold",
+          "note": "Threshold at which the burner can be turned on again"
+        }
+      },
+      "freezeProtection": {
+        "title": "Freeze protection",
+        "desc": "Heating will be forced to turn on if the heat carrier or indoor temperature drops below <b>Low temperature</b> during <b>Waiting time</b>.",
+        "lowTemp": "Low temperature threshold",
+        "thresholdTime": "Waiting time <small>(sec)</small>"
+      },

      "portal": {
        "login": "Login",
        "password": "Password",
-        "auth": "Require authentication"
+        "auth": "Require authentication",
+        "mdns": "Use mDNS"
      },

      "system": {
@@ -339,11 +371,26 @@
      },

      "equitherm": {
-        "n": "N factor",
-        "k": "K factor",
-        "t": {
+        "slope": {
+          "title": "Slope",
+          "note": "Heat loss compensation. Main tuning parameter."
+        },
+        "exponent": {
+          "title": "Exponent",
+          "note": "Radiator efficiency.  Typical values: <code>1.1</code> - Floor heating, <code>1.2</code> - Cast iron, <code>1.3</code> - Panel radiators, <code>1.4</code> - Convectors."
+        },
+        "shift": {
+          "title": "Shift",
+          "note": "Compensates for additional heat losses (e.g., in pipes) or extra heat sources."
+        },
+        "targetDiffFactor": {
          "title": "T factor",
-          "note": "Not used if PID is enabled"
+          "note": "Not used if PID is enabled. Adds to the setpoint the difference between the target and current indoor temp: <code>setpoint = setpoint + ((target - indoor) * T)</code>."
+        },
+        "chart": {
+          "targetTemp": "Target indoor temperature",
+          "setpointTemp": "Heat carrier temperature",
+          "outdoorTemp": "Outdoor temperature"
        }
      },

@@ -374,7 +421,6 @@
        "ledGpio": "RX LED GPIO",
        "memberId": "Master member ID",
        "flags": "Master flags",
-        "maxMod": "Max modulation level",
        "minPower": {
          "title": "Min boiler power <small>(kW)</small>",
          "note": "This value is at 0-1% boiler modulation level. Typically found in the boiler specification as \"minimum useful heat output\"."
@@ -385,7 +431,8 @@
        },

        "options": {
-          "desc": "Options",
+          "title": "Options (additional settings)",
+          "desc": "Options can change the logic of the boiler. Not all options are documented in the protocol, so the same option can have different effects on different boilers.<br /><b>Note:</b> There is no need to change anything if everything works well.",
          "dhwSupport": "DHW support",
          "coolingSupport": "Cooling support",
          "summerWinterMode": "Summer/winter mode",
@@ -394,9 +441,13 @@
          "heatingToCh2": "Duplicate heating to CH2",
          "dhwToCh2": "Duplicate DHW to CH2",
          "dhwBlocking": "DHW blocking",
-          "modulationSyncWithHeating": "Sync modulation with heating",
+          "dhwStateAsDhwBlocking": "DHW state as DHW blocking",
          "maxTempSyncWithTargetTemp": "Sync max heating temp with target temp",
          "getMinMaxTemp": "Get min/max temp from boiler",
+          "ignoreDiagState": "Ignore diag state",
+          "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"
        },

@@ -419,6 +470,7 @@
      "extPump": {
        "use": "Use external pump",
        "gpio": "Relay GPIO",
+        "invertState": "Invert GPIO state",
        "postCirculationTime": "Post circulation time <small>(min)</small>",
        "antiStuckInterval": "Anti stuck interval <small>(days)</small>",
        "antiStuckTime": "Anti stuck time <small>(min)</small>"
--- a/src_data/locales/it.json
+++ b/src_data/locales/it.json
@@ -109,7 +109,8 @@

        "sConnected": "Connessione OpenTherm",
        "sFlame": "Fiamma",
-        "sCooling": "Raffrescamento",
+        "sCoolingActive": "Raffrescamento",
+        "sCoolingSetpoint": "Raffrescamento setpoint",
        "sFaultActive": "Anomalia",
        "sFaultCode": "Codice anomalia",
        "sDiagActive": "Diagnostica",
@@ -117,6 +118,7 @@
        
        "mHeatEnabled": "Riscaldamento attivato",
        "mHeatBlocking": "Riscaldamento bloccato",
+        "mHeatOverheat": "Riscaldamento surriscaldamento",
        "sHeatActive": "Riscaldamento attivo",
        "mHeatSetpointTemp": "Temp riscaldamento impostato",
        "mHeatTargetTemp": "Target Temp caldaia",
@@ -126,6 +128,7 @@
        "mHeatOutdoorTemp": "Riscaldamento, temp esterna",

        "mDhwEnabled": "ACS attivata",
+        "mDhwOverheat": "ACS surriscaldamento",
        "sDhwActive": "ACS attiva",
        "mDhwTargetTemp": "ACS temp impostata",
        "mDhwCurrTemp": "ACS temp attuale",
@@ -201,6 +204,7 @@
        "dhwFlowRate": "ACS, prelievo",
        "exhaustTemp": "Temperatura fumi",
        "modLevel": "Livello Modulazione (%)",
+        "number": "Numero (raw)",
        "powerFactor": "Potenza (%)",
        "power": "Potenza (in kW)",
        "fanSpeed": "Velocità ventilatore",
@@ -231,6 +235,14 @@
        "otSolarCollectorTemp": "OpenTherm, temp collettore solare",
        "otFanSpeedSetpoint": "OpenTherm, velocità ventola impostata",
        "otFanSpeedCurrent": "OpenTherm, velocità ventola attuale",
+        "otBurnerStarts": "OpenTherm, numero di avviamenti del bruciatore",
+        "otDhwBurnerStarts": "OpenTherm, numero di avviamenti del bruciatore (ACS)",
+        "otHeatingPumpStarts": "OpenTherm, numero di avviamenti della pompa (riscaldamento)",
+        "otDhwPumpStarts": "OpenTherm, numero di avviamenti della pompa (ACS)",
+        "otBurnerHours": "OpenTherm, numero di ore di funzionamento del bruciatore",
+        "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)",
        
        "ntcTemp": "Sensore NTC",
        "dallasTemp": "Sensore DALLAS",
@@ -292,11 +304,31 @@
        "min": "Temperatura minima",
        "max": "Temperatura massima"
      },
+      "maxModulation": "Max livello modulazione",
+      "ohProtection": {
+        "title": "Protezione contro il surriscaldamento",
+        "desc": "<b>Nota:</b> questa funzione può essere utile se la protezione contro il surriscaldamento integrata nella caldaia non funziona o non funziona correttamente e il fluido termovettore bolle. Per disattivarla, impostare 0 come temperatura <b>alta</b> e <b>bassa</b>.",
+        "highTemp": {
+          "title": "Soglia di temperatura alta",
+          "note": "Soglia alla quale il bruciatore verrà spento forzatamente"
+        },
+        "lowTemp": {
+          "title": "Soglia di temperatura bassa",
+          "note": "Soglia alla quale il bruciatore può essere riacceso"
+        }
+      },
+      "freezeProtection": {
+        "title": "Protezione antigelo",
+        "desc": "Il riscaldamento verrà attivato forzatamente se la temperatura del vettore di calore o interna scende al di sotto della <b>temperatura minima</b> durante il <b>tempo di attesa</b>.",
+        "lowTemp": "Soglia di temperatura minima",
+        "thresholdTime": "Tempo di attesa <small>(sec)</small>"
+      },

      "portal": {
        "login": "Login",
        "password": "Password",
-        "auth": "Richiede autenticazione"
+        "auth": "Richiede autenticazione",
+        "mdns": "Usa mDNS"
      },

      "system": {
@@ -339,11 +371,26 @@
      },

      "equitherm": {
-        "n": "Fattore N",
-        "k": "Fattore K",
-        "t": {
+        "slope": {
+          "title": "Pendenza",
+          "note": "Compensazione delle perdite di calore. Principale parametro di regolazione."
+        },
+        "exponent": {
+          "title": "Esponente",
+          "note": "Efficienza del radiatore. Valori tipici: <code>1.1</code> - Riscaldamento a pavimento, <code>1.2</code> - Radiatori in ghisa, <code>1.3</code> - Radiatori a pannelli, <code>1.4</code> - Convetttori."
+        },
+        "shift": {
+          "title": "Spostare",
+          "note": "Compensa le perdite di calore aggiuntive (ad esempio, nelle tubature) o fonti di calore extra."
+        },
+        "targetDiffFactor": {
          "title": "Fattore T",
-          "note": "Non usato se PID è attivato"
+          "note": "Non usato se PID è attivato. Aggiunge al setpoint la differenza tra la temperatura interna target e quella attuale: <code>setpoint = setpoint + ((target - indoor) * T)</code>."
+        },
+        "chart": {
+          "targetTemp": "Temperatura interna target",
+          "setpointTemp": "Temperatura del portatore di calore",
+          "outdoorTemp": "Temperatura esterna"
        }
      },

@@ -374,7 +421,6 @@
        "ledGpio": "RX LED GPIO",
        "memberId": "Master member ID",
        "flags": "Master flags",
-        "maxMod": "Max livello modulazione",
        "minPower": {
          "title": "Potenza minima caldaia <small>(kW)</small>",
          "note": "Questo valore corrisponde allo livello 0-1% di modulazione della caldaia. Di solito si trova nelle specifiche delle caldaia come \"potenza minima disponibile\"."
@@ -385,7 +431,8 @@
        },

        "options": {
-          "desc": "Opzioni",
+          "title": "Opzioni (impostazioni aggiuntive)",
+          "desc": "Le opzioni possono modificare la logica della caldaia. Non tutte le opzioni sono documentate nel protocollo, quindi la stessa opzione può avere effetti diversi su caldaie diverse.<br /><b>Nota:</b> Non è necessario modificare nulla se tutto funziona correttamente.",
          "dhwSupport": "Supporto ACS",
          "coolingSupport": "Supporto rafferscamento",
          "summerWinterMode": "Modalità Estate/inverno",
@@ -394,9 +441,13 @@
          "heatingToCh2": "Riproduci riscaldamento su CH2",
          "dhwToCh2": "Riproduci ACS su CH2",
          "dhwBlocking": "Bloccare ACS",
-          "modulationSyncWithHeating": "Sincronizzare modulazione con caldaia",
+          "dhwStateAsDhwBlocking": "Stato ACS come bloccare ACS",
          "maxTempSyncWithTargetTemp": "Sincronizza la temperatura massima di riscaldamento con la temperatura target",
          "getMinMaxTemp": "Prendi temp min/max dalla caldaia",
+          "ignoreDiagState": "Ignora lo stato diagnostico",
+          "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"
        },

@@ -419,6 +470,7 @@
      "extPump": {
        "use": "Usa pompa/circolatore esterno",
        "gpio": "GPIO relè",
+        "invertState": "Inverti stato GPIO",
        "postCirculationTime": "Tempo di post circolazione <small>(min)</small>",
        "antiStuckInterval": "Intervallo antiblocco <small>(days)</small>",
        "antiStuckTime": "Tempo antiblocco <small>(min)</small>"
--- a/src_data/locales/nl.json
+++ b/src_data/locales/nl.json
@@ -0,0 +1,466 @@
+{
+  "values": {
+    "logo": "OpenTherm Gateway",
+    "nav": {
+      "license": "Licentie",
+      "source": "Broncode",
+      "help": "Help",
+      "issues": "Problemen & vragen",
+      "releases": "Releases"
+    },
+    "dbm": "dBm",
+    "kw": "kW",
+    "time": {
+      "days": "d.",
+      "hours": "u.",
+      "min": "min.",
+      "sec": "sec."
+    },
+    "button": {
+      "upgrade": "Upgraden",
+      "restart": "Herstarten",
+      "save": "Opslaan",
+      "saved": "Opgeslagen",
+      "refresh": "Vernieuwen",
+      "restore": "Herstellen",
+      "restored": "Hersteld",
+      "backup": "Back-up",
+      "wait": "Even wachten...",
+      "uploading": "Uploaden...",
+      "success": "Succes",
+      "error": "Fout"
+    },
+    "index": {
+      "title": "OpenTherm Gateway",
+      "section": {
+        "network": "Netwerk",
+        "system": "Systeem"
+      },
+      "system": {
+        "build": {
+          "title": "Build",
+          "version": "Versie",
+          "date": "Datum",
+          "core": "Core",
+          "sdk": "SDK"
+        },
+        "uptime": "Uptime",
+        "memory": {
+          "title": "Vrij geheugen",
+          "maxFreeBlock": "max. vrij blok",
+          "min": "min"
+        },
+        "board": "Board",
+        "chip": {
+          "model": "Chip",
+          "cores": "Kernen",
+          "freq": "frequentie"
+        },
+        "flash": {
+          "size": "Flash-grootte",
+          "realSize": "werkelijke grootte"
+        },
+        "lastResetReason": "Reden laatste herstart"
+      }
+    },
+    "dashboard": {
+      "name": "Dashboard",
+      "title": "Dashboard - OpenTherm Gateway",
+      "section": {
+        "control": "Bediening",
+        "states": "Statussen",
+        "sensors": "Sensoren",
+        "diag": "OpenTherm diagnose"
+      },
+      "thermostat": {
+        "heating": "Verwarming",
+        "dhw": "Warm water",
+        "temp.current": "Huidig",
+        "enable": "Inschakelen",
+        "turbo": "Turbomodus"
+      },
+      "notify": {
+        "fault": {
+          "title": "Ketelstoring is actief!",
+          "note": "Het wordt aanbevolen de ketel te inspecteren en de documentatie te raadplegen om de storingscode te interpreteren:"
+        },
+        "diag": {
+          "title": "Keteldiagnose is actief!",
+          "note": "Heeft uw ketel misschien een inspectie nodig? Het wordt aanbevolen de documentatie te raadplegen om de diagnosecode te interpreteren:"
+        },
+        "reset": "Probeer te resetten"
+      },
+      "states": {
+        "mNetworkConnected": "Netwerkverbinding",
+        "mMqttConnected": "MQTT-verbinding",
+        "mEmergencyState": "Noodmodus",
+        "mExtPumpState": "Externe pomp",
+        "mCascadeControlInput": "Cascaderegeling (ingang)",
+        "mCascadeControlOutput": "Cascaderegeling (uitgang)",
+        "sConnected": "OpenTherm-verbinding",
+        "sFlame": "Vlam",
+        "sCoolingActive": "Koeling",
+        "sCoolingSetpoint": "Koelinstelpunt",
+        "sFaultActive": "Storing",
+        "sFaultCode": "Storingscode",
+        "sDiagActive": "Diagnose",
+        "sDiagCode": "Diagnosecode",
+        "mHeatEnabled": "Verwarming ingeschakeld",
+        "mHeatBlocking": "Verwarming geblokkeerd",
+        "mHeatOverheat": "Verwarming oververhit",
+        "sHeatActive": "Verwarming actief",
+        "mHeatSetpointTemp": "Insteltemperatuur verwarming",
+        "mHeatTargetTemp": "Doeltemperatuur verwarming",
+        "mHeatCurrTemp": "Huidige temperatuur verwarming",
+        "mHeatRetTemp": "Retourtemperatuur verwarming",
+        "mHeatIndoorTemp": "Verwarming, binnentemperatuur",
+        "mHeatOutdoorTemp": "Verwarming, buitentemperatuur",
+        "mDhwEnabled": "Warm water ingeschakeld",
+        "mDhwOverheat": "Warm water oververhit",
+        "sDhwActive": "Warm water actief",
+        "mDhwTargetTemp": "Doeltemperatuur warm water",
+        "mDhwCurrTemp": "Huidige temperatuur warm water",
+        "mDhwRetTemp": "Retourtemperatuur warm water"
+      },
+      "sensors": {
+        "values": {
+          "temp": "Temperatuur",
+          "humidity": "Luchtvochtigheid",
+          "battery": "Batterij",
+          "rssi": "RSSI"
+        }
+      }
+    },
+    "network": {
+      "title": "Netwerk - OpenTherm Gateway",
+      "name": "Netwerkinstellingen",
+      "section": {
+        "static": "Statische instellingen",
+        "availableNetworks": "Beschikbare netwerken",
+        "staSettings": "WiFi-instellingen",
+        "apSettings": "AP-instellingen"
+      },
+      "scan": {
+        "pos": "#",
+        "info": "Info"
+      },
+      "wifi": {
+        "ssid": "SSID",
+        "password": "Wachtwoord",
+        "channel": "Kanaal",
+        "signal": "Signaal",
+        "connected": "Verbonden"
+      },
+      "params": {
+        "hostname": "Hostnaam",
+        "dhcp": "Gebruik DHCP",
+        "mac": "MAC",
+        "ip": "IP",
+        "subnet": "Subnet",
+        "gateway": "Gateway",
+        "dns": "DNS"
+      },
+      "sta": {
+        "channel.note": "zet op 0 voor automatische selectie"
+      }
+    },
+    "sensors": {
+      "title": "Sensorinstellingen - OpenTherm Gateway",
+      "name": "Sensorinstellingen",
+      "enabled": "Ingeschakeld",
+      "sensorName": {
+        "title": "Sensornaam",
+        "note": "Mag alleen bevatten: a-z, A-Z, 0-9, _ en spatie"
+      },
+      "purpose": "Doel",
+      "purposes": {
+        "outdoorTemp": "Buitentemperatuur",
+        "indoorTemp": "Binnentemperatuur",
+        "heatTemp": "Verwarming, temperatuur",
+        "heatRetTemp": "Verwarming, retourtemperatuur",
+        "dhwTemp": "Warm water, temperatuur",
+        "dhwRetTemp": "Warm water, retourtemperatuur",
+        "dhwFlowRate": "Warm water, doorstroomsnelheid",
+        "exhaustTemp": "Rookgastemperatuur",
+        "modLevel": "Modulatieniveau (in procenten)",
+        "number": "Getal (ruw)",
+        "powerFactor": "Vermogen (in procent)",
+        "power": "Vermogen (in kWt)",
+        "fanSpeed": "Ventilatorsnelheid",
+        "co2": "CO2",
+        "pressure": "Druk",
+        "humidity": "Luchtvochtigheid",
+        "temperature": "Temperatuur",
+        "notConfigured": "Niet geconfigureerd"
+      },
+      "type": "Type/bron",
+      "types": {
+        "otOutdoorTemp": "OpenTherm, buitentemp.",
+        "otHeatTemp": "OpenTherm, verwarming, temp.",
+        "otHeatRetTemp": "OpenTherm, verwarming, retourtemp.",
+        "otDhwTemp": "OpenTherm, warm water, temperatuur",
+        "otDhwTemp2": "OpenTherm, warm water, temperatuur 2",
+        "otDhwFlowRate": "OpenTherm, warm water, doorstroomsnelheid",
+        "otCh2Temp": "OpenTherm, kanaal 2, temp.",
+        "otExhaustTemp": "OpenTherm, rookgastemp.",
+        "otHeatExchangerTemp": "OpenTherm, warmtewisselaar temp.",
+        "otPressure": "OpenTherm, druk",
+        "otModLevel": "OpenTherm, modulatieniveau",
+        "otCurrentPower": "OpenTherm, huidig vermogen",
+        "otExhaustCo2": "OpenTherm, rookgas CO2",
+        "otExhaustFanSpeed": "OpenTherm, rookgasventilator snelheid",
+        "otSupplyFanSpeed": "OpenTherm, toevoerventilator snelheid",
+        "otSolarStorageTemp": "OpenTherm, zonneboiler opslagtemp.",
+        "otSolarCollectorTemp": "OpenTherm, zonnecollector temp.",
+        "otFanSpeedSetpoint": "OpenTherm, instelpunt ventilatorsnelheid",
+        "otFanSpeedCurrent": "OpenTherm, huidige ventilatorsnelheid",
+        "otBurnerStarts": "OpenTherm, aantal branderstarts",
+        "otDhwBurnerStarts": "OpenTherm, aantal branderstarts (warm water)",
+        "otHeatingPumpStarts": "OpenTherm, aantal pompstarts (verwarming)",
+        "otDhwPumpStarts": "OpenTherm, aantal pompstarts (warm water)",
+        "otBurnerHours": "OpenTherm, aantal branderuren",
+        "otDhwBurnerHours": "OpenTherm, aantal branderuren (warm water)",
+        "otHeatingPumpHours": "OpenTherm, aantal pompuren (verwarming)",
+        "otDhwPumpHours": "OpenTherm, aantal pompuren (warm water)",
+        "ntcTemp": "NTC-sensor",
+        "dallasTemp": "DALLAS-sensor",
+        "bluetooth": "BLE-sensor",
+        "heatSetpointTemp": "Verwarming, insteltemperatuur",
+        "manual": "Handmatig via MQTT/API",
+        "notConfigured": "Niet geconfigureerd"
+      },
+      "gpio": "GPIO",
+      "address": {
+        "title": "Sensoradres",
+        "note": "Laat leeg voor automatische detectie van DALLAS-sensoren. Voor BLE-apparaten is een MAC-adres vereist."
+      },
+      "correction": {
+        "desc": "Correctie van waarden",
+        "offset": "Compensatie (offset)",
+        "factor": "Vermenigvuldiger"
+      },
+      "filtering": {
+        "desc": "Filteren van waarden",
+        "enabled": {
+          "title": "Filteren ingeschakeld",
+          "note": "Kan handig zijn bij veel scherpe ruis in de grafieken. Het gebruikte filter is \"Voortschrijdend gemiddelde\"."
+        },
+        "factor": {
+          "title": "Filterfactor",
+          "note": "Hoe lager de waarde, hoe vloeiender en <u>langer</u> de verandering in numerieke waarden."
+        }
+      }
+    },
+    "settings": {
+      "title": "Instellingen - OpenTherm Gateway",
+      "name": "Instellingen",
+      "section": {
+        "portal": "Portaalinstellingen",
+        "system": "Systeeminstellingen",
+        "diag": "Diagnose",
+        "heating": "Verwarmingsinstellingen",
+        "dhw": "Warmwaterinstellingen",
+        "emergency": "Instellingen noodmodus",
+        "equitherm": "Equitherm-instellingen",
+        "pid": "PID-instellingen",
+        "ot": "OpenTherm-instellingen",
+        "mqtt": "MQTT-instellingen",
+        "extPump": "Instellingen externe pomp",
+        "cascadeControl": "Instellingen cascaderegeling"
+      },
+      "enable": "Inschakelen",
+      "note": {
+        "restart": "Na het wijzigen van deze instellingen moet het apparaat opnieuw worden opgestart om de wijzigingen door te voeren.",
+        "blankNotUse": "leeg - niet gebruiken",
+        "bleDevice": "BLE-apparaat kan <u>alleen</u> worden gebruikt met sommige ESP32-boards met BLE-ondersteuning!"
+      },
+      "temp": {
+        "min": "Minimumtemperatuur",
+        "max": "Maximumtemperatuur"
+      },
+      "maxModulation": "Max. modulatieniveau",
+      "ohProtection": {
+        "title": "Oververhittingsbeveiliging",
+        "desc": "<b>Let op:</b> Deze functie kan handig zijn als de ingebouwde oververhittingsbeveiliging van de ketel niet of niet correct werkt en de warmtedrager kookt. Om uit te schakelen, stel 0 in als <b>hoge</b> en <b>lage</b> temperatuur.",
+        "highTemp": {
+          "title": "Drempelwaarde hoge temperatuur",
+          "note": "Drempelwaarde waarbij de brander geforceerd wordt uitgeschakeld"
+        },
+        "lowTemp": {
+          "title": "Drempelwaarde lage temperatuur",
+          "note": "Drempelwaarde waarbij de brander weer ingeschakeld kan worden"
+        }
+      },
+      "freezeProtection": {
+        "title": "Vorstbeveiliging",
+        "desc": "De verwarming wordt geforceerd ingeschakeld als de temperatuur van de warmtedrager of de binnentemperatuur onder de <b>Lage temperatuur</b> daalt gedurende de <b>Wachttijd</b>.",
+        "lowTemp": "Drempelwaarde lage temperatuur",
+        "thresholdTime": "Wachttijd <small>(sec)</small>"
+      },
+      "portal": {
+        "login": "Gebruikersnaam",
+        "password": "Wachtwoord",
+        "auth": "Authenticatie vereisen",
+        "mdns": "Gebruik mDNS"
+      },
+      "system": {
+        "unit": "Eenheidssysteem",
+        "metric": "Metrisch <small>(celsius, liters, bar)</small>",
+        "imperial": "Imperiaal <small>(fahrenheit, gallons, psi)</small>",
+        "statusLedGpio": "Status LED GPIO",
+        "logLevel": "Logniveau",
+        "serial": {
+          "enable": "Seriële poort ingeschakeld",
+          "baud": "Baudrate seriële poort"
+        },
+        "telnet": {
+          "enable": "Telnet ingeschakeld",
+          "port": {
+            "title": "Telnet-poort",
+            "note": "Standaard: 23"
+          }
+        },
+        "ntp": {
+          "server": "NTP-server",
+          "timezone": "Tijdzone",
+          "timezonePresets": "Selecteer voorinstelling..."
+        }
+      },
+      "heating": {
+        "hyst": "Hysterese <small>(in graden)</small>",
+        "turboFactor": "Turbomodus coëff."
+      },
+      "emergency": {
+        "desc": "Noodmodus wordt automatisch geactiveerd wanneer «PID» of «Equitherm» het instelpunt van de warmtedrager niet kan berekenen:<br />- als «Equitherm» is ingeschakeld en de buitentemperatuursensor is losgekoppeld;<br />- als «PID» of OT-optie <i>«Natuurlijke verwarmingsregeling»</i> is ingeschakeld en de binnentemperatuursensor is losgekoppeld.<br /><b>Let op:</b> Bij een netwerk- of MQTT-storing krijgen sensoren van het type <i>«Handmatig via MQTT/API»</i> de status ONVERBONDEN.",
+        "target": {
+          "title": "Doeltemperatuur",
+          "note": "<b>Belangrijk:</b> <u>Doel binnentemperatuur</u> als OT-optie <i>«Natuurlijke verwarmingsregeling»</i> is ingeschakeld.<br />In alle andere gevallen, de <u>doel warmtedragertemperatuur</u>."
+        },
+        "treshold": "Drempeltijd <small>(sec)</small>"
+      },
+      "equitherm": {
+        "n": "N-factor",
+        "k": "K-factor",
+        "t": {
+          "title": "T-factor",
+          "note": "Niet gebruikt als PID is ingeschakeld"
+        }
+      },
+      "pid": {
+        "p": "P-factor",
+        "i": "I-factor",
+        "d": "D-factor",
+        "dt": "DT <small>in seconden</small>",
+        "limits": {
+          "title": "Limieten",
+          "note": "<b>Belangrijk:</b> Bij gelijktijdig gebruik van «Equitherm» en «PID» beperken de min- en maxtemperaturen de invloed op de resulterende «Equitherm»-temperatuur.<br />Dus, als de min-temperatuur is ingesteld op -15 en de max-temperatuur op 15, zal het uiteindelijke instelpunt van de warmtedrager liggen tussen <code>equitherm_resultaat - 15</code> en <code>equitherm_resultaat + 15</code>."
+        },
+        "deadband": {
+          "title": "Deadband",
+          "note": "Deadband is een bereik rond de doeltemperatuur waarbinnen de PID-regeling minder actief wordt. Binnen dit bereik kan het algoritme de intensiteit verminderen of aanpassingen pauzeren om overreactie op kleine schommelingen te voorkomen.<br /><br />Bijvoorbeeld, met een doeltemperatuur van 22°, een onderdrempel van 1.0 en een bovendrempel van 0.5, werkt de deadband tussen 21° en 22.5°. Als de I-coëfficiënt 0.0005 is en de I-vermenigvuldiger 0.05, dan wordt de I-coëfficiënt binnen de deadband: <code>0.0005 * 0.05 = 0.000025</code>",
+          "p_multiplier": "Vermenigvuldiger voor P-factor",
+          "i_multiplier": "Vermenigvuldiger voor I-factor",
+          "d_multiplier": "Vermenigvuldiger voor D-factor",
+          "thresholdHigh": "Bovendrempel",
+          "thresholdLow": "Onderdrempel"
+        }
+      },
+      "ot": {
+        "advanced": "Geavanceerde instellingen",
+        "inGpio": "In GPIO",
+        "outGpio": "Uit GPIO",
+        "ledGpio": "RX LED GPIO",
+        "memberId": "Master member ID",
+        "flags": "Master flags",
+        "minPower": {
+          "title": "Min. ketelvermogen <small>(kW)</small>",
+          "note": "Deze waarde is bij 0-1% modulatieniveau van de ketel. Typisch te vinden in de ketelspecificatie als \"minimum nuttig warmtevermogen\"."
+        },
+        "maxPower": {
+          "title": "Max. ketelvermogen <small>(kW)</small>",
+          "note": "<b>0</b> - probeer automatisch te detecteren. Typisch te vinden in de ketelspecificatie als \"maximum nuttig warmtevermogen\"."
+        },
+        "options": {
+          "title": "Opties (aanvullende instellingen)",
+          "desc": "Opties kunnen de logica van de ketel veranderen. Niet alle opties zijn gedocumenteerd in het protocol, dus dezelfde optie kan verschillende effecten hebben op verschillende ketels.<br /><b>Let op:</b> Het is niet nodig om iets te veranderen als alles goed werkt.",
+          "dhwSupport": "Warm water ondersteuning",
+          "coolingSupport": "Koeling ondersteuning",
+          "summerWinterMode": "Zomer/wintermodus",
+          "heatingStateToSummerWinterMode": "Verwarmingsstatus als zomer/wintermodus",
+          "ch2AlwaysEnabled": "CH2 altijd ingeschakeld",
+          "heatingToCh2": "Dupliceer verwarming naar CH2",
+          "dhwToCh2": "Dupliceer warm water naar CH2",
+          "dhwBlocking": "Blokkering warm water",
+          "dhwStateAsDhwBlocking": "Status warm water als blokkering warm water",
+          "maxTempSyncWithTargetTemp": "Synchroniseer max. verwarmingstemp. met doeltemp.",
+          "getMinMaxTemp": "Haal min/max temp. op van ketel",
+          "ignoreDiagState": "Negeer diagnosestatus",
+          "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"
+        },
+        "nativeHeating": {
+          "title": "Natuurlijke verwarmingsregeling (ketel)",
+          "note": "Werkt <u>ALLEEN</u> als de ketel de gewenste kamertemperatuur vereist en zelf de temperatuur van de warmtedrager regelt. Niet compatibel met PID- en Equitherm-regelaars in de firmware."
+        }
+      },
+      "mqtt": {
+        "homeAssistantDiscovery": "Home Assistant Discovery",
+        "server": "Server",
+        "port": "Poort",
+        "user": "Gebruiker",
+        "password": "Wachtwoord",
+        "prefix": "Prefix",
+        "interval": "Publicatie-interval <small>(sec)</small>"
+      },
+      "extPump": {
+        "use": "Gebruik externe pomp",
+        "gpio": "Relais GPIO",
+        "invertState": "Inverteer GPIO-status",
+        "postCirculationTime": "Nacirculatietijd <small>(min)</small>",
+        "antiStuckInterval": "Anti-vastloopinterval <small>(dagen)</small>",
+        "antiStuckTime": "Anti-vastlooptijd <small>(min)</small>"
+      },
+      "cascadeControl": {
+        "input": {
+          "desc": "Kan worden gebruikt om de verwarming alleen in te schakelen als een andere ketel defect is. De besturing van de andere ketel moet de status van de GPIO-ingang wijzigen in geval van een storing.",
+          "enable": "Ingang ingeschakeld",
+          "gpio": "GPIO",
+          "invertState": "Inverteer GPIO-status",
+          "thresholdTime": "Drempeltijd statuswijziging <small>(sec)</small>"
+        },
+        "output": {
+          "desc": "Kan worden gebruikt om een andere ketel in te schakelen <u>via een relais</u>.",
+          "enable": "Uitgang ingeschakeld",
+          "gpio": "GPIO",
+          "invertState": "Inverteer GPIO-status",
+          "thresholdTime": "Drempeltijd statuswijziging <small>(sec)</small>",
+          "events": {
+            "desc": "Gebeurtenissen",
+            "onFault": "Als de storingsstatus actief is",
+            "onLossConnection": "Als de verbinding via Opentherm is verbroken",
+            "onEnabledHeating": "Als de verwarming is ingeschakeld"
+          }
+        }
+      }
+    },
+    "upgrade": {
+      "title": "Upgrade - OpenTherm Gateway",
+      "name": "Upgrade",
+      "section": {
+        "backupAndRestore": "Back-up & herstel",
+        "backupAndRestore.desc": "In deze sectie kunt u een back-up van ALLE instellingen opslaan en herstellen.",
+        "upgrade": "Upgrade",
+        "upgrade.desc": "In deze sectie kunt u de firmware en het bestandssysteem van uw apparaat upgraden.<br />De nieuwste releases kunnen worden gedownload van de <a href=\"https://github.com/Laxilef/OTGateway/releases\" target=\"_blank\">Releases-pagina</a> van de projectrepository."
+      },
+      "note": {
+        "disclaimer1": "Na een succesvolle upgrade van het bestandssysteem worden ALLE instellingen teruggezet naar de standaardwaarden! Sla een back-up op voordat u gaat upgraden.",
+        "disclaimer2": "Na een succesvolle upgrade zal het apparaat automatisch herstarten na 15 seconden."
+      },
+      "settingsFile": "Instellingenbestand",
+      "fw": "Firmware",
+      "fs": "Bestandssysteem"
+    }
+  }
+}
--- a/src_data/locales/ru.json
+++ b/src_data/locales/ru.json
@@ -109,7 +109,8 @@

        "sConnected": "Подключение к OpenTherm",
        "sFlame": "Пламя",
-        "sCooling": "Охлаждение",
+        "sCoolingActive": "Охлаждение",
+        "sCoolingSetpoint": "Охлаждение, уставка",
        "sFaultActive": "Ошибка",
        "sFaultCode": "Код ошибки",
        "sDiagActive": "Диагностика",
@@ -117,6 +118,7 @@
        
        "mHeatEnabled": "Отопление",
        "mHeatBlocking": "Блокировка отопления",
+        "mHeatOverheat": "Отопление, перегрев",
        "sHeatActive": "Активность отопления",
        "mHeatSetpointTemp": "Отопление, уставка",
        "mHeatTargetTemp": "Отопление, целевая температура",
@@ -126,6 +128,7 @@
        "mHeatOutdoorTemp": "Отопление, наружная темп.",

        "mDhwEnabled": "ГВС",
+        "mDhwOverheat": "ГВС, перегрев",
        "sDhwActive": "Активность ГВС",
        "mDhwTargetTemp": "ГВС, целевая температура",
        "mDhwCurrTemp": "ГВС, текущая температура",
@@ -201,6 +204,7 @@
        "dhwFlowRate": "ГВС, расход/скорость потока",
        "exhaustTemp": "Температура выхлопных газов",
        "modLevel": "Уровень модуляции (в процентах)",
+        "number": "Число (raw)",
        "powerFactor": "Мощность (в процентах)",
        "power": "Мощность (в кВт)",
        "fanSpeed": "Скорость вентилятора",
@@ -231,6 +235,14 @@
        "otSolarCollectorTemp": "OpenTherm, темп. солн. коллектора",
        "otFanSpeedSetpoint": "OpenTherm, установленная мощн. вентилятора",
        "otFanSpeedCurrent": "OpenTherm, текущая мощн. вентилятора",
+        "otBurnerStarts": "OpenTherm, кол-во запусков горелки",
+        "otDhwBurnerStarts": "OpenTherm, кол-во запусков горелки (ГВС)",
+        "otHeatingPumpStarts": "OpenTherm, кол-во запусков насоса (отопление)",
+        "otDhwPumpStarts": "OpenTherm, кол-во запусков насоса (ГВС)",
+        "otBurnerHours": "OpenTherm, кол-во часов работы горелки",
+        "otDhwBurnerHours": "OpenTherm, кол-во часов работы горелки (ГВС)",
+        "otHeatingPumpHours": "OpenTherm, кол-во часов работы насоса (отопление)",
+        "otDhwPumpHours": "OpenTherm, кол-во часов работы насоса (ГВС)",
        
        "ntcTemp": "NTC датчик",
        "dallasTemp": "DALLAS датчик",
@@ -292,11 +304,31 @@
        "min": "Мин. температура",
        "max": "Макс. температура"
      },
+      "maxModulation": "Макс. уровень модуляции",
+      "ohProtection": {
+        "title": "Защита от перегрева",
+        "desc": "<b>Примечание:</b> Эта функция может быть полезна, если встроенная защита от перегрева котла не срабатывает или срабатывает некорректно и теплоноситель закипает. Для отключения установите 0 в качестве <b>верхнего</b> и <b>нижнего</b> порога температуры.",
+        "highTemp": {
+          "title": "Верхний порог температуры",
+          "note": "Порог, при котором горелка будет принудительно отключена"
+        },
+        "lowTemp": {
+          "title": "Нижний порог температуры",
+          "note": "Порог, при котором горелка может быть включена снова"
+        }
+      },
+      "freezeProtection": {
+        "title": "Защита от замерзания",
+        "desc": "Отопление будет принудительно включено, если темп. теплоносителя или внутренняя темп. опустится ниже <b>нижнего порога</b> в течение <b>времени ожидания</b>.",
+        "lowTemp": "Нижний порог температуры",
+        "thresholdTime": "Время ожидания <small>(сек)</small>"
+      },

      "portal": {
        "login": "Логин",
        "password": "Пароль",
-        "auth": "Требовать аутентификацию"
+        "auth": "Требовать аутентификацию",
+        "mdns": "Использовать mDNS"
      },

      "system": {
@@ -339,11 +371,26 @@
      },

      "equitherm": {
-        "n": "Коэффициент N",
-        "k": "Коэффициент K",
-        "t": {
+        "slope": {
+          "title": "Наклон",
+          "note": "Компенсация теплопотерь. Основной параметр настройки."
+        },
+        "exponent": {
+          "title": "Экспонента",
+          "note": "Эффективность радиатора. Типичные значения: <code>1.1</code> - Тёплый пол, <code>1.2</code> - Чугунные радиаторы, <code>1.3</code> - Панельные радиаторы, <code>1.4</code> - Конвекторы."
+        },
+        "shift": {
+          "title": "Смещение",
+          "note": "Компенсирует дополнительные теплопотери (например, в трубах) или дополнительные источники тепла."
+        },
+        "targetDiffFactor": {
          "title": "Коэффициент T",
-          "note": "Не используется, если ПИД включен"
+          "note": "Не используется, если ПИД включен. Добавляет разницу между целевой и текущей температурой в помещении: <code>setpoint = setpoint + ((target - indoor) * T)</code>."
+        },
+        "chart": {
+          "targetTemp": "Целевая внутренняя температура",
+          "setpointTemp": "Температура теплоносителя",
+          "outdoorTemp": "Наружная температура"
        }
      },

@@ -374,7 +421,6 @@
        "ledGpio": "RX LED GPIO",
        "memberId": "Master member ID",
        "flags": "Master flags",
-        "maxMod": "Макс. уровень модуляции",
        "minPower": {
          "title": "Мин. мощность котла <small>(кВт)</small>",
          "note": "Это значение соответствует уровню модуляции котла 0–1%. Обычно можно найти в спецификации котла как \"минимальная полезная тепловая мощность\"."
@@ -385,7 +431,8 @@
        },

        "options": {
-          "desc": "Опции",
+          "title": "Опции (дополнительные настройки)",
+          "desc": "Опции могут менять логику работы котла. Не все опции задокументированы в протоколе, поэтому одна и та же опция может иметь разный эффект на разных котлах.<br /><b>Примечание:</b> Нет необходимости что-то менять, если всё работает хорошо.",
          "dhwSupport": "Поддержка ГВС",
          "coolingSupport": "Поддержка охлаждения",
          "summerWinterMode": "Летний/зимний режим",
@@ -394,9 +441,13 @@
          "heatingToCh2": "Дублировать параметры отопления в канал 2",
          "dhwToCh2": "Дублировать параметры ГВС в канал 2",
          "dhwBlocking": "DHW blocking",
-          "modulationSyncWithHeating": "Синхронизировать модуляцию с отоплением",
+          "dhwStateAsDhwBlocking": "DHW blocking в качестве состояния ГВС",
          "maxTempSyncWithTargetTemp": "Синхронизировать макс. темп. отопления с целевой темп.",
          "getMinMaxTemp": "Получать мин. и макс. температуру от котла",
+          "ignoreDiagState": "Игнорировать состояние диагностики",
+          "autoFaultReset": "Автоматический сброс ошибок <small>(не рекомендуется!)</small>",
+          "autoDiagReset": "Автоматический сброс диагностики <small>(не рекомендуется!)</small>",
+          "setDateAndTime": "Устанавливать время и дату на котле",
          "immergasFix": "Фикс для котлов Immergas"
        },

@@ -419,6 +470,7 @@
      "extPump": {
        "use": "Использовать доп. насос",
        "gpio": "GPIO реле",
+        "invertState": "Инвертировать состояние GPIO",
        "postCirculationTime": "Время постциркуляции <small>(в минутах)</small>",
        "antiStuckInterval": "Интервал защиты от блокировки <small>(в днях)</small>",
        "antiStuckTime": "Время работы насоса <small>(в минутах)</small>"
--- a/src_data/pages/dashboard.html
+++ b/src_data/pages/dashboard.html
@@ -21,7 +21,9 @@
          <li>
            <select id="lang" aria-label="Lang">
              <option value="en" selected>EN</option>
+              <option value="cn">CN</option>
              <option value="it">IT</option>
+              <option value="nl">NL</option>
              <option value="ru">RU</option>
            </select>
          </li>
@@ -41,14 +43,18 @@
          <details open>
            <summary><b data-i18n>dashboard.section.control</b></summary>
            <div class="grid">
-              <div class="thermostat" id="thermostat-heating">
+              <div class="thermostat tHeat" data-purpose="heating" data-min="0" data-max="100" data-step="0.1" data-big-step="1">
                <div class="thermostat-header" data-i18n>dashboard.thermostat.heating</div>
                <div class="thermostat-temp">
-                  <div class="thermostat-temp-target"><span id="tHeatTargetTemp"></span> <span class="tempUnit"></span></div>
+                  <div class="thermostat-temp-target"><span class="targetTemp"></span> <span class="tempUnit"></span></div>
                  <div class="thermostat-temp-current"><span data-i18n>dashboard.thermostat.temp.current</span>: <span id="tHeatCurrentTemp"></span> <span class="tempUnit"></span></div>
                </div>
-                <div class="thermostat-minus"><button id="tHeatActionMinus" class="outline"><i class="icons-down"></i></button></div>
-                <div class="thermostat-plus"><button id="tHeatActionPlus" class="outline"><i class="icons-up"></i></button></div>
+                <div class="thermostat-minus">
+                  <button class="tAction outline" data-action="decrement"><i class="icons-down"></i></button>
+                </div>
+                <div class="thermostat-plus">
+                  <button class="tAction outline" data-action="increment"><i class="icons-up"></i></button>
+                </div>
                <div class="thermostat-control">
                  <input type="checkbox" role="switch" id="tHeatEnabled" value="true">
                  <label htmlFor="tHeatEnabled" data-i18n>dashboard.thermostat.enable</label>
@@ -58,21 +64,25 @@
                </div>
              </div>

-              <div class="thermostat" id="thermostat-dhw">
+              <div class="thermostat tDhw" data-purpose="dhw" data-min="0" data-max="100" data-step="1" data-big-step="5">
                <div class="thermostat-header" data-i18n>dashboard.thermostat.dhw</div>
                <div class="thermostat-temp">
-                  <div class="thermostat-temp-target"><span id="tDhwTargetTemp"></span> <span class="tempUnit"></span></div>
+                  <div class="thermostat-temp-target"><span class="targetTemp"></span> <span class="tempUnit"></span></div>
                  <div class="thermostat-temp-current"><span data-i18n>dashboard.thermostat.temp.current</span>: <span id="tDhwCurrentTemp"></span> <span class="tempUnit"></span></div>
                </div>
-                <div class="thermostat-minus"><button class="outline" id="tDhwActionMinus"><i class="icons-down"></i></button></div>
-                <div class="thermostat-plus"><button class="outline" id="tDhwActionPlus"><i class="icons-up"></i></button></div>
+                <div class="thermostat-minus">
+                  <button class="tAction outline" data-action="decrement"><i class="icons-down"></i></button>
+                </div>
+                <div class="thermostat-plus">
+                  <button class="tAction outline" data-action="increment"><i class="icons-up"></i></button>
+                </div>
                <div class="thermostat-control">
                  <input type="checkbox" role="switch" id="tDhwEnabled" value="true">
                  <label htmlFor="tDhwEnabled" data-i18n>dashboard.thermostat.enable</label>
                </div>
              </div>
            </div>
-            
+
            <div class="notify notify-error notify-fault hidden">
              <div class="notify-icon">
                <i class="icons-error"></i>
@@ -144,9 +154,14 @@
                  <th scope="row" data-i18n>dashboard.states.sFlame</th>
                  <td><i class="sFlame"></i></td>
                </tr>
+
                <tr>
-                  <th scope="row" data-i18n>dashboard.states.sCooling</th>
-                  <td><i class="sCooling"></i></td>
+                  <th scope="row" data-i18n>dashboard.states.sCoolingActive</th>
+                  <td><i class="sCoolingActive"></i></td>
+                </tr>
+                <tr>
+                  <th scope="row" data-i18n>dashboard.states.sCoolingSetpoint</th>
+                  <td><b class="sCoolingSetpoint"></b> %</td>
                </tr>


@@ -176,6 +191,10 @@
                  <th scope="row" data-i18n>dashboard.states.mHeatBlocking</th>
                  <td><i class="mHeatBlocking"></i></td>
                </tr>
+                <tr>
+                  <th scope="row" data-i18n>dashboard.states.mHeatOverheat</th>
+                  <td><i class="mHeatOverheat"></i></td>
+                </tr>
                <tr>
                  <th scope="row" data-i18n>dashboard.states.sHeatActive</th>
                  <td><i class="sHeatActive"></i></td>
@@ -210,6 +229,10 @@
                  <th scope="row" data-i18n>dashboard.states.mDhwEnabled</th>
                  <td><i class="mDhwEnabled"></i></td>
                </tr>
+                <tr>
+                  <th scope="row" data-i18n>dashboard.states.mDhwOverheat</th>
+                  <td><i class="mDhwOverheat"></i></td>
+                </tr>
                <tr>
                  <th scope="row" data-i18n>dashboard.states.sDhwActive</th>
                  <td><i class="sDhwActive"></i></td>
@@ -253,16 +276,16 @@

          <details>
            <summary><b data-i18n>dashboard.section.diag</b></summary>
-            <pre><b>Vendor:</b>             <span class="sVendor"></span>
-<b>Member ID:</b>          <span class="sMemberId"></span>
-<b>Flags:</b>              <span class="sFlags"></span>
-<b>Type:</b>               <span class="sType"></span>
-<b>AppVersion:</b>         <span class="sAppVersion"></span>
-<b>OT version:</b>         <span class="sProtocolVersion"></span>
-<b>Modulation limits:</b>  <span class="sModMin"></span>...<span class="sAbsModMax"></span> %, curr. max: <span class="sModMax"></span> %
-<b>Power limits:</b>       <span class="sPowerMin"></span>...<span class="sPowerMax"></span> kW
-<b>Heating limits:</b>     <span class="sHeatMinTemp"></span>...<span class="sHeatMaxTemp"></span> <span class="tempUnit"></span>
-<b>DHW limits:</b>         <span class="sDhwMinTemp"></span>...<span class="sDhwMaxTemp"></span> <span class="tempUnit"></span></pre>
+            <pre><b>Vendor:</b>         <span class="sVendor"></span>
+<b>Member ID:</b>      <span class="sMemberId"></span>
+<b>Flags:</b>          <span class="sFlags"></span>
+<b>Type:</b>           <span class="sType"></span>
+<b>AppVersion:</b>     <span class="sAppVersion"></span>
+<b>OT version:</b>     <span class="sProtocolVersion"></span>
+<b>Modulation:</b>     min: <span class="sModMin"></span> %, curr. max: <span class="sModMax"></span> %
+<b>Power limits:</b>   <span class="sPowerMin"></span>...<span class="sPowerMax"></span> kW
+<b>Heating limits:</b> <span class="sHeatMinTemp"></span>...<span class="sHeatMaxTemp"></span> <span class="tempUnit"></span>
+<b>DHW limits:</b>     <span class="sDhwMinTemp"></span>...<span class="sDhwMaxTemp"></span> <span class="tempUnit"></span></pre>
          </details>
        </div>
      </article>
@@ -282,7 +305,6 @@
    <script src="/static/app.js?{BUILD_TIME}"></script>
    <script>
      let modifiedTime = null;
-      let noRegulators;
      let prevSettings;
      let newSettings = {
        heating: {
@@ -300,78 +322,69 @@
        const lang = new Lang(document.getElementById('lang'));
        lang.build();

-        document.querySelector('#tHeatActionMinus').addEventListener('click', (event) => {
-          if (!prevSettings) {
-            return;
+        let actionTimer = null;
+        let actionLongPress = false;
+        document.querySelectorAll('.tAction').forEach((item) => {
+          const action = item.dataset.action;
+          const tContainer = item.parentNode.parentNode;
+
+          for (const eName of ['pointerup', 'pointercancel']) {
+            item.addEventListener(eName, (event) => {
+              clearInterval(actionTimer);
+
+              const purpose = tContainer.dataset.purpose;
+              const minTemp = parseFloat(tContainer.dataset.min);
+              const maxTemp = parseFloat(tContainer.dataset.max);
+              const step = parseFloat(tContainer.dataset.step);
+              const bigStep = parseFloat(tContainer.dataset.bigStep);
+
+              if (!actionLongPress && prevSettings) {
+                let value = 0;
+                if (action == 'increment') {
+                  value = step;
+
+                } else if (action == 'decrement') {
+                  value = -(step);
+                }
+
+                newSettings[purpose].target = parseFloat(constrain(newSettings[purpose].target + value, minTemp, maxTemp).toFixed(2));
+                modifiedTime = Date.now();
+                setValue('.targetTemp', newSettings[purpose].target, tContainer);
+              }
+            });
          }

-          newSettings.heating.target -= 0.5;
-          modifiedTime = Date.now();
+          item.addEventListener('pointerdown', (event) => {
+            if (!prevSettings) {
+              return;
+            }

-          let minTemp;
-          if (noRegulators) {
-            minTemp = prevSettings.heating.minTemp;
-          } else {
-            minTemp = prevSettings.system.unitSystem == 0 ? 5 : 41;
-          }
+            const purpose = tContainer.dataset.purpose;
+            const minTemp = parseFloat(tContainer.dataset.min);
+            const maxTemp = parseFloat(tContainer.dataset.max);
+            const step = parseFloat(tContainer.dataset.step);
+            const bigStep = parseFloat(tContainer.dataset.bigStep);

-          if (prevSettings && newSettings.heating.target < minTemp) {
-            newSettings.heating.target = minTemp;
-          }
+            actionLongPress = false;
+            actionTimer = setInterval(() => {
+              if (!actionLongPress) {
+                actionLongPress = true;
+              }

-          setValue('#tHeatTargetTemp', newSettings.heating.target);
-        });
+              let value = 0;
+              if (action == 'increment') {
+                value = bigStep;

-        document.querySelector('#tHeatActionPlus').addEventListener('click', (event) => {
-          if (!prevSettings) {
-            return;
-          }
+              } else if (action == 'decrement') {
+                value = -(bigStep);
+              }

-          newSettings.heating.target += 0.5;
-          modifiedTime = Date.now();
+              newSettings[purpose].target = parseFloat(constrain(newSettings[purpose].target + value, minTemp, maxTemp).toFixed(2));
+              modifiedTime = Date.now();

-          let maxTemp;
-          if (noRegulators) {
-            maxTemp = prevSettings.heating.maxTemp;
-          } else {
-            maxTemp = prevSettings.system.unitSystem == 0 ? 30 : 86;
-          }
-
-          if (prevSettings && newSettings.heating.target > maxTemp) {
-            newSettings.heating.target = maxTemp;
-          }
-
-          setValue('#tHeatTargetTemp', newSettings.heating.target);
-        });
-
-        document.querySelector('#tDhwActionMinus').addEventListener('click', (event) => {
-          if (!prevSettings) {
-            return;
-          }
-
-          newSettings.dhw.target -= 1.0;
-          modifiedTime = Date.now();
-
-          if (newSettings.dhw.target < prevSettings.dhw.minTemp) {
-            newSettings.dhw.target = prevSettings.dhw.minTemp;
-          }
-
-          setValue('#tDhwTargetTemp', newSettings.dhw.target);
-        });
-
-        document.querySelector('#tDhwActionPlus').addEventListener('click', (event) => {
-          if (!prevSettings) {
-            return;
-          }
-
-          newSettings.dhw.target += 1.0;
-          modifiedTime = Date.now();
-
-          if (newSettings.dhw.target > prevSettings.dhw.maxTemp) {
-            newSettings.dhw.target = prevSettings.dhw.maxTemp;
-          }
-
-          setValue('#tDhwTargetTemp', newSettings.dhw.target);
+              setValue('.targetTemp', newSettings[purpose].target, tContainer);
+            }, 500);
+          });
        });

        document.querySelector('#tHeatEnabled').addEventListener('change', (event) => {
@@ -486,7 +499,6 @@
            }

            const result = await response.json();
-            noRegulators = !result.opentherm.options.nativeHeatingControl && !result.equitherm.enabled && !result.pid.enabled;
            prevSettings = result;
            unitSystem = result.system.unitSystem;
            newSettings.heating.enabled = result.heating.enabled;
@@ -496,22 +508,21 @@
            newSettings.dhw.target = result.dhw.target;

            if (result.opentherm.options.dhwSupport) {
-              show('#thermostat-dhw');
+              show('.tDhw');
            } else {
-              hide('#thermostat-dhw');
+              hide('.tDhw');
            }

            setCheckboxValue('#tHeatEnabled', result.heating.enabled);
            setCheckboxValue('#tHeatTurbo', result.heating.turbo);
-            setValue('#tHeatTargetTemp', result.heating.target);
+            setValue('.tHeat .targetTemp', result.heating.target);

            setCheckboxValue('#tDhwEnabled', result.dhw.enabled);
-            setValue('#tDhwTargetTemp', result.dhw.target);
+            setValue('.tDhw .targetTemp', result.dhw.target);

            setValue('.tempUnit', temperatureUnit(unitSystem));
            setValue('.pressureUnit', pressureUnit(unitSystem));
            setValue('.volumeUnit', volumeUnit(unitSystem));
-            setValue('.sAbsModMax', result.opentherm.maxModulation);

          } catch (error) {
            console.log(error);
@@ -523,20 +534,20 @@
              cache: "no-cache",
              credentials: "include"
            });
-            
+
            if (!response.ok) {
              throw new Error('Response not valid');
            }

            const result = await response.json();
-            
+
            // Graph
-            setValue('#tHeatCurrentTemp', result.master.heating.indoorTempControl 
-              ? result.master.heating.indoorTemp 
+            setValue('#tHeatCurrentTemp', result.master.heating.indoorTempControl
+              ? result.master.heating.indoorTemp
              : result.master.heating.currentTemp
            );
            setValue('#tDhwCurrentTemp', result.master.dhw.currentTemp);
-            
+

            // SLAVE
            setValue('.sMemberId', result.slave.memberId);
@@ -552,7 +563,9 @@
              result.slave.connected ? "green" : "red"
            );
            setState('.sFlame', result.slave.flame);
-            setState('.sCooling', result.slave.cooling);
+
+            setState('.sCoolingActive', result.slave.cooling.active);
+            setValue('.sCoolingSetpoint', result.slave.cooling.setpoint);

            setValue('.sModMin', result.slave.modulation.min);
            setValue('.sModMax', result.slave.modulation.max);
@@ -615,6 +628,11 @@
              result.master.heating.blocking ? "red" : "green"
            );
            setState('.mHeatIndoorTempControl', result.master.heating.indoorTempControl);
+            setStatus(
+              '.mHeatOverheat',
+              result.master.heating.overheat ? "success" : "error",
+              result.master.heating.overheat ? "red" : "green"
+            );
            setValue('.mHeatSetpointTemp', result.master.heating.setpointTemp);
            setValue('.mHeatTargetTemp', result.master.heating.targetTemp);
            setValue('.mHeatCurrTemp', result.master.heating.currentTemp);
@@ -625,6 +643,11 @@
            setValue('.mHeatMaxTemp', result.master.heating.maxTemp);

            setState('.mDhwEnabled', result.master.dhw.enabled);
+            setStatus(
+              '.mDhwOverheat',
+              result.master.dhw.overheat ? "success" : "error",
+              result.master.dhw.overheat ? "red" : "green"
+            );
            setValue('.mDhwTargetTemp', result.master.dhw.targetTemp);
            setValue('.mDhwCurrTemp', result.master.dhw.currentTemp);
            setValue('.mDhwRetTemp', result.master.dhw.returnTemp);
@@ -646,6 +669,14 @@
            setState('.mCascadeControlInput', result.master.cascadeControl.input);
            setState('.mCascadeControlOutput', result.master.cascadeControl.output);

+            const tHeat = document.querySelector('.tHeat');
+            tHeat.dataset.min = result.master.heating.minTemp;
+            tHeat.dataset.max = result.master.heating.maxTemp;
+
+            const tDhw = document.querySelector('.tDhw');
+            tDhw.dataset.min = result.master.dhw.minTemp;
+            tDhw.dataset.max = result.master.dhw.maxTemp;
+
            setBusy('#dashboard-busy', '#dashboard-container', false);

          } catch (error) {
@@ -658,7 +689,7 @@
              cache: "no-cache",
              credentials: "include"
            });
-            
+
            if (!response.ok) {
              throw new Error("Response not valid");
            }
@@ -684,7 +715,7 @@
              if (!sensorNode) {
                continue;
              }
-              
+
              const sData = result[sensorId];
              if (!sData.enabled || sData.purpose == 255) {
                sensorNode.classList.toggle("hidden", true);
--- a/src_data/pages/index.html
+++ b/src_data/pages/index.html
@@ -21,7 +21,9 @@
          <li>
            <select id="lang" aria-label="Lang">
              <option value="en" selected>EN</option>
+              <option value="cn">CN</option>
              <option value="it">IT</option>
+              <option value="nl">NL</option>
              <option value="ru">RU</option>
            </select>
          </li>
--- a/src_data/pages/network.html
+++ b/src_data/pages/network.html
@@ -21,7 +21,9 @@
          <li>
            <select id="lang" aria-label="Lang">
              <option value="en" selected>EN</option>
+              <option value="cn">CN</option>
              <option value="it">IT</option>
+              <option value="nl">NL</option>
              <option value="ru">RU</option>
            </select>
          </li>
--- a/src_data/pages/sensors.html
+++ b/src_data/pages/sensors.html
@@ -21,7 +21,9 @@
          <li>
            <select id="lang" aria-label="Lang">
              <option value="en" selected>EN</option>
+              <option value="cn">CN</option>
              <option value="it">IT</option>
+              <option value="nl">NL</option>
              <option value="ru">RU</option>
            </select>
          </li>
@@ -69,6 +71,7 @@
                      <option value="6" data-i18n>sensors.purposes.dhwFlowRate</option>
                      <option value="7" data-i18n>sensors.purposes.exhaustTemp</option>
                      <option value="8" data-i18n>sensors.purposes.modLevel</option>
+                      <option value="247" data-i18n>sensors.purposes.number</option>
                      <option value="248" data-i18n>sensors.purposes.powerFactor</option>
                      <option value="249" data-i18n>sensors.purposes.power</option>
                      <option value="250" data-i18n>sensors.purposes.fanSpeed</option>
@@ -102,6 +105,14 @@
                      <option value="16" data-i18n>sensors.types.otSolarCollectorTemp</option>
                      <option value="17" data-i18n>sensors.types.otFanSpeedSetpoint</option>
                      <option value="18" data-i18n>sensors.types.otFanSpeedCurrent</option>
+                      <option value="19" data-i18n>sensors.types.otBurnerStarts</option>
+                      <option value="20" data-i18n>sensors.types.otDhwBurnerStarts</option>
+                      <option value="21" data-i18n>sensors.types.otHeatingPumpStarts</option>
+                      <option value="22" data-i18n>sensors.types.otDhwPumpStarts</option>
+                      <option value="23" data-i18n>sensors.types.otBurnerHours</option>
+                      <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="50" data-i18n>sensors.types.ntcTemp</option>
                      <option value="51" data-i18n>sensors.types.dallasTemp</option>
@@ -140,7 +151,7 @@

                  <label>
                    <span data-i18n>sensors.correction.factor</span>
-                    <input type="number" inputmode="decimal" name="factor" min="0.01" max="10" step="0.01" required>
+                    <input type="number" inputmode="decimal" name="factor" min="0.01" max="100" step="0.01" required>
                  </label>
                </div>
              </details>
@@ -230,7 +241,9 @@
              setCheckboxValue("[name='filtering']", data.filtering, sensorForm);
              setInputValue("[name='filteringFactor']", data.filteringFactor, {}, sensorForm);

-              sensorForm.querySelector("[name='type']").dispatchEvent(new Event("change"));
+              setTimeout(() => {
+                sensorForm.querySelector("[name='type']").dispatchEvent(new Event("change"));
+              }, 10);

              setBusy(".form-busy", "form", false, sensorNode);
            };
--- a/src_data/pages/settings.html
+++ b/src_data/pages/settings.html
@@ -21,7 +21,9 @@
          <li>
            <select id="lang" aria-label="Lang">
              <option value="en" selected>EN</option>
+              <option value="cn">CN</option>
              <option value="it">IT</option>
+              <option value="nl">NL</option>
              <option value="ru">RU</option>
            </select>
          </li>
@@ -57,6 +59,11 @@
                <input type="checkbox" name="portal[auth]" value="true">
                <span data-i18n>settings.portal.auth</span>
              </label>
+
+              <label>
+                <input type="checkbox" name="portal[mdns]" value="true">
+                <span data-i18n>settings.portal.mdns</span>
+              </label>
              <br />

              <button type="submit" data-i18n>button.save</button>
@@ -99,7 +106,7 @@
                      <option disabled selected data-i18n>settings.system.ntp.timezonePresets</option>
                    </select>
                  </div>
-                  </label>
+                </label>
              </fieldset>

              <fieldset>
@@ -197,6 +204,55 @@
                </label>
              </div>

+              <label>
+                <span data-i18n>settings.maxModulation</span>
+                <input type="number" inputmode="numeric" name="heating[maxModulation]" min="1" max="100" step="1" required>
+              </label>
+
+              <hr />
+
+              <details>
+                <summary><b data-i18n>settings.ohProtection.title</b></summary>
+
+                <div class="grid">
+                  <label>
+                    <span data-i18n>settings.ohProtection.highTemp.title</span>
+                    <input type="number" inputmode="numeric" name="heating[overheatProtection][highTemp]" min="0" max="0" step="1" required>
+                    <small data-i18n>settings.ohProtection.highTemp.note</small>
+                  </label>
+
+                  <label>
+                    <span data-i18n>settings.ohProtection.lowTemp.title</span>
+                    <input type="number" inputmode="numeric" name="heating[overheatProtection][lowTemp]" min="0" max="0" step="1" required>
+                    <small data-i18n>settings.ohProtection.lowTemp.note</small>
+                  </label>
+                </div>
+
+                <small data-i18n>settings.ohProtection.desc</small>
+              </details>
+
+              <hr />
+
+              <details>
+                <summary><b data-i18n>settings.freezeProtection.title</b></summary>
+
+                <div class="grid">
+                  <label>
+                    <span data-i18n>settings.freezeProtection.lowTemp</span>
+                    <input type="number" inputmode="numeric" name="heating[freezeProtection][lowTemp]" min="0" max="0" step="1" required>
+                  </label>
+
+                  <label>
+                    <span data-i18n>settings.freezeProtection.thresholdTime</span>
+                    <input type="number" inputmode="numeric" name="heating[freezeProtection][thresholdTime]" min="30" max="1800" step="1" required>
+                  </label>
+                </div>
+
+                <small data-i18n>settings.freezeProtection.desc</small>
+              </details>
+
+              <br />
+
              <button type="submit" data-i18n>button.save</button>
            </form>
          </div>
@@ -221,6 +277,35 @@
                </label>
              </div>

+              <label>
+                <span data-i18n>settings.maxModulation</span>
+                <input type="number" inputmode="numeric" name="dhw[maxModulation]" min="1" max="100" step="1" required>
+              </label>
+
+              <hr />
+
+              <details>
+                <summary><b data-i18n>settings.ohProtection.title</b></summary>
+
+                <div class="grid">
+                  <label>
+                    <span data-i18n>settings.ohProtection.highTemp.title</span>
+                    <input type="number" inputmode="numeric" name="dhw[overheatProtection][highTemp]" min="0" max="0" step="1" required>
+                    <small data-i18n>settings.ohProtection.highTemp.note</small>
+                  </label>
+
+                  <label>
+                    <span data-i18n>settings.ohProtection.lowTemp.title</span>
+                    <input type="number" inputmode="numeric" name="dhw[overheatProtection][lowTemp]" min="0" max="0" step="1" required>
+                    <small data-i18n>settings.ohProtection.lowTemp.note</small>
+                  </label>
+                </div>
+
+                <small data-i18n>settings.ohProtection.desc</small>
+              </details>
+
+              <br />
+
              <button type="submit" data-i18n>button.save</button>
            </form>
          </div>
@@ -269,21 +354,44 @@
                </label>
              </fieldset>

+              <div>
+                <div>
+                  <canvas id="etChart"></canvas>
+                </div>
+
+                <label>
+                  <div>
+                    <span data-i18n>settings.equitherm.chart.targetTemp</span>: <b class="etChartTargetTempValue"></b>°
+                  </div>
+                  <input class="etChartTargetTemp" type="range" value="0" min="0" max="0" step="0.5">
+                </label>
+              </div>
+
              <div class="grid">
                <label>
-                  <span data-i18n>settings.equitherm.n</span>
-                  <input type="number" inputmode="decimal" name="equitherm[n_factor]" min="0.001" max="10" step="0.001" required>
+                  <span data-i18n>settings.equitherm.slope.title</span>
+                  <input type="number" inputmode="decimal" name="equitherm[slope]" min="0.001" max="10" step="0.001" required>
+                  <small data-i18n>settings.equitherm.slope.note</small>
                </label>

                <label>
-                  <span data-i18n>settings.equitherm.k</span>
-                  <input type="number" inputmode="decimal" name="equitherm[k_factor]" min="0" max="10" step="0.01" required>
+                  <span data-i18n>settings.equitherm.exponent.title</span>
+                  <input type="number" inputmode="decimal" name="equitherm[exponent]" min="0.1" max="2" step="0.001" required>
+                  <small data-i18n>settings.equitherm.exponent.note</small>
+                </label>
+              </div>
+
+              <div class="grid">
+                <label>
+                  <span data-i18n>settings.equitherm.shift.title</span>
+                  <input type="number" inputmode="decimal" name="equitherm[shift]" min="-15" max="15" step="0.01" required>
+                  <small data-i18n>settings.equitherm.shift.note</small>
                </label>

                <label>
-                  <span data-i18n>settings.equitherm.t.title</span>
-                  <input type="number" inputmode="decimal" name="equitherm[t_factor]" min="0" max="10" step="0.01" required>
-                  <small data-i18n>settings.equitherm.t.note</small>
+                  <span data-i18n>settings.equitherm.targetDiffFactor.title</span>
+                  <input type="number" inputmode="decimal" name="equitherm[targetDiffFactor]" min="0" max="10" step="0.01" required>
+                  <small data-i18n>settings.equitherm.targetDiffFactor.note</small>
                </label>
              </div>

@@ -339,7 +447,7 @@
                      <span data-i18n>settings.temp.min</span>
                      <input type="number" inputmode="decimal" name="pid[minTemp]" min="0" max="0" step="1" required>
                    </label>
-    
+
                    <label>
                      <span data-i18n>settings.temp.max</span>
                      <input type="number" inputmode="numeric" name="pid[maxTemp]" min="0" max="0" step="1" required>
@@ -368,12 +476,12 @@
                      <span data-i18n>settings.pid.deadband.p_multiplier</span>
                      <input type="number" inputmode="decimal" name="pid[deadband][p_multiplier]" min="0" max="5" step="0.001" required>
                    </label>
-    
+
                    <label>
                      <span data-i18n>settings.pid.deadband.i_multiplier</span>
                      <input type="number" inputmode="decimal" name="pid[deadband][i_multiplier]" min="0" max="1" step="0.001" required>
                    </label>
-    
+
                    <label>
                      <span data-i18n>settings.pid.deadband.d_multiplier</span>
                      <input type="number" inputmode="decimal" name="pid[deadband][d_multiplier]" min="0" max="1" step="0.001" required>
@@ -385,7 +493,7 @@
                      <span data-i18n>settings.pid.deadband.thresholdHigh</span>
                      <input type="number" inputmode="decimal" name="pid[deadband][thresholdHigh]" min="0" max="5" step="0.01" required>
                    </label>
-    
+
                    <label>
                      <span data-i18n>settings.pid.deadband.thresholdLow</span>
                      <input type="number" inputmode="decimal" name="pid[deadband][thresholdLow]" min="0" max="5" step="0.01" required>
@@ -452,11 +560,6 @@
                  <span data-i18n>settings.ot.flags</span>
                  <input type="number" inputmode="numeric" name="opentherm[flags]" min="0" max="255" step="1" required>
                </label>
-
-                <label>
-                  <span data-i18n>settings.ot.maxMod</span>
-                  <input type="number" inputmode="numeric" name="opentherm[maxModulation]" min="1" max="100" step="1" required>
-                </label>
              </div>

              <div class="grid">
@@ -473,77 +576,107 @@
                </label>
              </div>

-              <fieldset>
-                <legend data-i18n>settings.ot.options.desc</legend>
+              <details>
+                <summary><b data-i18n>settings.ot.options.title</b></summary>

-                <label>
-                  <input type="checkbox" name="opentherm[options][dhwSupport]" value="true">
-                  <span data-i18n>settings.ot.options.dhwSupport</span>
-                </label>
+                <div>
+                  <fieldset>
+                    <small data-i18n>settings.ot.options.desc</small>
+                  </fieldset>

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

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

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

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

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

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

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

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

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

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

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

-                <hr />
-                <label>
-                  <input type="checkbox" name="opentherm[options][nativeHeatingControl]" value="true">
-                  <span data-i18n>settings.ot.nativeHeating.title</span><br />
-                  <small data-i18n>settings.ot.nativeHeating.note</small>
-                </label>
-              </fieldset>
+                    <label>
+                      <input type="checkbox" name="opentherm[options][ignoreDiagState]" value="true">
+                      <span data-i18n>settings.ot.options.ignoreDiagState</span>
+                    </label>

+                    <label>
+                      <input type="checkbox" name="opentherm[options][autoFaultReset]" value="true">
+                      <span data-i18n>settings.ot.options.autoFaultReset</span>
+                    </label>
+
+                    <label>
+                      <input type="checkbox" name="opentherm[options][autoDiagReset]" value="true">
+                      <span data-i18n>settings.ot.options.autoDiagReset</span>
+                    </label>
+
+                    <label>
+                      <input type="checkbox" name="opentherm[options][setDateAndTime]" value="true">
+                      <span data-i18n>settings.ot.options.setDateAndTime</span>
+                    </label>
+
+                    <label>
+                      <input type="checkbox" name="opentherm[options][immergasFix]" value="true">
+                      <span data-i18n>settings.ot.options.immergasFix</span>
+                    </label>
+
+                    <hr />
+
+                    <label>
+                      <input type="checkbox" name="opentherm[options][nativeHeatingControl]" value="true">
+                      <span data-i18n>settings.ot.nativeHeating.title</span><br />
+                      <small data-i18n>settings.ot.nativeHeating.note</small>
+                    </label>
+                  </fieldset>
+                </div>
+              </details>
+
+              <br />
              <button type="submit" data-i18n>button.save</button>
            </form>
          </div>
@@ -621,6 +754,11 @@
                  <input type="checkbox" name="externalPump[use]" value="true">
                  <span data-i18n>settings.extPump.use</span>
                </label>
+
+                <label>
+                  <input type="checkbox" name="externalPump[invertState]" value="true">
+                  <span data-i18n>settings.externalPump.invertState</span>
+                </label>
              </fieldset>

              <div class="grid">
@@ -751,11 +889,163 @@
    </footer>

    <script src="/static/app.js?{BUILD_TIME}"></script>
+    <script src="/static/chart.js?{BUILD_TIME}"></script>
    <script>
      document.addEventListener('DOMContentLoaded', async () => {
        const lang = new Lang(document.getElementById('lang'));
        lang.build();

+        let etChart = null;
+        let etChartConfig = {
+          slope: null,
+          exponent: null,
+          shift: null,
+          unitSystem: null,
+          targetTemp: null,
+          minTemp: null,
+          maxTemp: null,
+          decimated: false
+        };
+
+        const hasNeedDecimationChart = () => {
+          return window.innerWidth <= 800;
+        }
+
+        const makeEquithermChart = () => {
+          if (etChart == null) {
+            const ctx = document.getElementById('etChart').getContext('2d');
+
+            try {
+              etChart = new Chart(ctx, {
+                type: 'line',
+                data: {
+                  datasets: [{
+                    borderColor: (context) => {
+                      const chart = context.chart;
+                      const { ctx, chartArea } = chart;
+
+                      if (!chartArea) {
+                        return;
+                      }
+
+                      const gradient = ctx.createLinearGradient(0, chartArea.bottom, 0, chartArea.top);
+                      gradient.addColorStop(0, 'rgba(1, 114, 173, 1)');
+                      gradient.addColorStop(0.5, 'rgba(255, 99, 132, 1)');
+
+                      return gradient;
+                    },
+                    borderWidth: 3,
+                    fill: false,
+                    tension: 0.1,
+                    pointRadius: 2,
+                    pointHoverRadius: 4,
+                    indexAxis: "x",
+                    data: []
+                  }]
+                },
+                options: {
+                  responsive: true,
+                  resizeDelay: 500,
+                  parsing: false,
+                  interaction: {
+                    mode: 'nearest',
+                    intersect: false
+                  },
+                  plugins: {
+                    tooltip: {
+                      enabled: true,
+                      position: 'nearest',
+                      displayColors: false,
+                      callbacks: {
+                        title: (items) => {
+                          return `${i18n("settings.equitherm.chart.outdoorTemp")}: ${items[0].label}`;
+                        }
+                      }
+                    },
+                    legend: {
+                      display: false
+                    }
+                  },
+                  scales: {
+                    x: {
+                      display: true,
+                      type: "linear",
+                      reverse: true,
+                      title: {
+                        display: true
+                      },
+                      ticks: {
+                        stepSize: 1,
+                        format: {
+                          style: "unit",
+                          unit: "degree",
+                          unitDisplay: "narrow"
+                        }
+                      }
+                    },
+                    y: {
+                      display: true,
+                      title: {
+                        display: true
+                      },
+                      ticks: {
+                        format: {
+                          style: "unit",
+                          unit: "degree",
+                          unitDisplay: "narrow"
+                        }
+                      }
+                    }
+                  }
+                }
+              });
+
+            } catch (error) {
+              console.log(error);
+            }
+          }
+
+          if (!etChart) {
+            return;
+          }
+
+          let data = [];
+          etChartConfig.decimated = hasNeedDecimationChart();
+          for (let value = 30; value >= -30; value -= etChartConfig.decimated ? 2 : 1) {
+            const outdoorTemp = etChartConfig.unitSystem == 0 ? value : c2f(value);
+
+            data.push({
+              x: parseFloat(outdoorTemp.toFixed(1)),
+              y: parseFloat(calculateEquithermTemp(outdoorTemp).toFixed(1))
+            });
+          }
+
+          etChart.data.datasets[0].data = data;
+          etChart.data.datasets[0].label = i18n("settings.equitherm.chart.setpointTemp");
+          etChart.options.scales.x.title.text = i18n("settings.equitherm.chart.outdoorTemp");
+          etChart.options.scales.y.title.text = i18n("settings.equitherm.chart.setpointTemp");
+          etChart.update();
+        }
+
+        const calculateEquithermTemp = (outdoorTemp) => {
+          const tempDelta = etChartConfig.targetTemp - outdoorTemp;
+          const maxPoint = etChartConfig.targetTemp - (
+            etChartConfig.maxTemp - etChartConfig.targetTemp
+          ) / etChartConfig.slope;
+
+          const sf = (etChartConfig.maxTemp - etChartConfig.targetTemp) / Math.pow(
+            etChartConfig.targetTemp - maxPoint,
+            1 / etChartConfig.exponent
+          );
+          const result = etChartConfig.targetTemp + etChartConfig.shift + sf * (
+            tempDelta >= 0
+              ? Math.pow(tempDelta, 1 / etChartConfig.exponent)
+              : -(Math.pow(-(tempDelta), 1 / etChartConfig.exponent))
+          );
+
+          return Math.max(Math.min(result, etChartConfig.maxTemp), etChartConfig.minTemp);
+        }
+
        const fillData = (data) => {
          // System
          setSelectValue("[name='system[logLevel]']", data.system.logLevel);
@@ -773,6 +1063,7 @@
          setCheckboxValue("[name='portal[auth]']", data.portal.auth);
          setInputValue("[name='portal[login]']", data.portal.login);
          setInputValue("[name='portal[password]']", data.portal.password);
+          setCheckboxValue("[name='portal[mdns]']", data.portal.mdns);
          setBusy('#portal-settings-busy', '#portal-settings', false);

          // Opentherm
@@ -782,7 +1073,6 @@
          setInputValue("[name='opentherm[rxLedGpio]']", data.opentherm.rxLedGpio < 255 ? data.opentherm.rxLedGpio : '');
          setInputValue("[name='opentherm[memberId]']", data.opentherm.memberId);
          setInputValue("[name='opentherm[flags]']", data.opentherm.flags);
-          setInputValue("[name='opentherm[maxModulation]']", data.opentherm.maxModulation);
          setInputValue("[name='opentherm[minPower]']", data.opentherm.minPower);
          setInputValue("[name='opentherm[maxPower]']", data.opentherm.maxPower);
          setCheckboxValue("[name='opentherm[options][dhwSupport]']", data.opentherm.options.dhwSupport);
@@ -793,9 +1083,13 @@
          setCheckboxValue("[name='opentherm[options][heatingToCh2]']", data.opentherm.options.heatingToCh2);
          setCheckboxValue("[name='opentherm[options][dhwToCh2]']", data.opentherm.options.dhwToCh2);
          setCheckboxValue("[name='opentherm[options][dhwBlocking]']", data.opentherm.options.dhwBlocking);
-          setCheckboxValue("[name='opentherm[options][modulationSyncWithHeating]']", data.opentherm.options.modulationSyncWithHeating);
+          setCheckboxValue("[name='opentherm[options][dhwStateAsDhwBlocking]']", data.opentherm.options.dhwStateAsDhwBlocking);
          setCheckboxValue("[name='opentherm[options][maxTempSyncWithTargetTemp]']", data.opentherm.options.maxTempSyncWithTargetTemp);
          setCheckboxValue("[name='opentherm[options][getMinMaxTemp]']", data.opentherm.options.getMinMaxTemp);
+          setCheckboxValue("[name='opentherm[options][ignoreDiagState]']", data.opentherm.options.ignoreDiagState);
+          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][immergasFix]']", data.opentherm.options.immergasFix);
          setBusy('#ot-settings-busy', '#ot-settings', false);
@@ -814,6 +1108,7 @@
          // Extpump
          setCheckboxValue("[name='externalPump[use]']", data.externalPump.use);
          setInputValue("[name='externalPump[gpio]']", data.externalPump.gpio < 255 ? data.externalPump.gpio : '');
+          setCheckboxValue("[name='externalPump[invertState]']", data.externalPump.invertState);
          setInputValue("[name='externalPump[postCirculationTime]']", data.externalPump.postCirculationTime);
          setInputValue("[name='externalPump[antiStuckInterval]']", data.externalPump.antiStuckInterval);
          setInputValue("[name='externalPump[antiStuckTime]']", data.externalPump.antiStuckTime);
@@ -845,6 +1140,20 @@
          });
          setInputValue("[name='heating[hysteresis]']", data.heating.hysteresis);
          setInputValue("[name='heating[turboFactor]']", data.heating.turboFactor);
+          setInputValue("[name='heating[maxModulation]']", data.heating.maxModulation);
+          setInputValue("[name='heating[overheatProtection][highTemp]']", data.heating.overheatProtection.highTemp, {
+            "min": 0,
+            "max": data.system.unitSystem == 0 ? 100 : 212
+          });
+          setInputValue("[name='heating[overheatProtection][lowTemp]']", data.heating.overheatProtection.lowTemp, {
+            "min": 0,
+            "max": data.system.unitSystem == 0 ? 99 : 211
+          });
+          setInputValue("[name='heating[freezeProtection][lowTemp]']", data.heating.freezeProtection.lowTemp, {
+            "min": data.system.unitSystem == 0 ? 1 : 34,
+            "max": data.system.unitSystem == 0 ? 30 : 86
+          });
+          setInputValue("[name='heating[freezeProtection][thresholdTime]']", data.heating.freezeProtection.thresholdTime);
          setBusy('#heating-settings-busy', '#heating-settings', false);

          // DHW
@@ -856,14 +1165,22 @@
            "min": data.system.unitSystem == 0 ? 1 : 33,
            "max": data.system.unitSystem == 0 ? 100 : 212
          });
+          setInputValue("[name='dhw[maxModulation]']", data.dhw.maxModulation);
+          setInputValue("[name='dhw[overheatProtection][highTemp]']", data.dhw.overheatProtection.highTemp, {
+            "min": 0,
+            "max": data.system.unitSystem == 0 ? 100 : 212
+          });
+          setInputValue("[name='dhw[overheatProtection][lowTemp]']", data.dhw.overheatProtection.lowTemp, {
+            "min": 0,
+            "max": data.system.unitSystem == 0 ? 99 : 211
+          });
          setBusy('#dhw-settings-busy', '#dhw-settings', false);

          // Emergency mode
-          setInputValue("[name='emergency[tresholdTime]']", data.emergency.tresholdTime);
          if (data.opentherm.options.nativeHeatingControl) {
            setInputValue("[name='emergency[target]']", data.emergency.target, {
              "min": data.system.unitSystem == 0 ? 5 : 41,
-              "max": data.system.unitSystem == 0 ? 30 : 86
+              "max": data.system.unitSystem == 0 ? 40 : 104
            });

          } else {
@@ -872,14 +1189,15 @@
              "max": data.heating.maxTemp,
            });
          }
-
+          setInputValue("[name='emergency[tresholdTime]']", data.emergency.tresholdTime);
          setBusy('#emergency-settings-busy', '#emergency-settings', false);

          // Equitherm
          setCheckboxValue("[name='equitherm[enabled]']", data.equitherm.enabled);
-          setInputValue("[name='equitherm[n_factor]']", data.equitherm.n_factor);
-          setInputValue("[name='equitherm[k_factor]']", data.equitherm.k_factor);
-          setInputValue("[name='equitherm[t_factor]']", data.equitherm.t_factor);
+          setInputValue("[name='equitherm[slope]']", data.equitherm.slope);
+          setInputValue("[name='equitherm[exponent]']", data.equitherm.exponent);
+          setInputValue("[name='equitherm[shift]']", data.equitherm.shift);
+          setInputValue("[name='equitherm[targetDiffFactor]']", data.equitherm.targetDiffFactor);
          setBusy('#equitherm-settings-busy', '#equitherm-settings', false);

          // PID
@@ -903,6 +1221,24 @@
          setInputValue("[name='pid[deadband][thresholdHigh]']", data.pid.deadband.thresholdHigh);
          setInputValue("[name='pid[deadband][thresholdLow]']", data.pid.deadband.thresholdLow);
          setBusy('#pid-settings-busy', '#pid-settings', false);
+
+          const etMinTemp = parseInt(data.system.unitSystem == 0 ? 5 : 41);
+          const etMaxTemp = parseInt(data.system.unitSystem == 0 ? 30 : 86);
+          const etTargetTemp = constrain(parseFloat(data.heating.target), etMinTemp, etMaxTemp);
+
+          setInputValue(".etChartTargetTemp", etTargetTemp.toFixed(1), {
+            "min": etMinTemp,
+            "max": etMaxTemp
+          });
+
+          etChartConfig.slope = data.equitherm.slope;
+          etChartConfig.exponent = data.equitherm.exponent;
+          etChartConfig.shift = data.equitherm.shift;
+          etChartConfig.unitSystem = data.system.unitSystem;
+          etChartConfig.minTemp = data.heating.minTemp;
+          etChartConfig.maxTemp = data.heating.maxTemp;
+
+          makeEquithermChart();
        };

        try {
@@ -932,7 +1268,7 @@
            cache: "no-cache",
            credentials: "include"
          });
-          
+
          if (!response.ok) {
            throw new Error('Response not valid');
          }
@@ -955,6 +1291,57 @@
        } catch (error) {
          console.log(error);
        }
+
+        document.querySelector(".etChartTargetTemp").addEventListener("input", async (event) => {
+          setValue('.etChartTargetTempValue', parseFloat(event.target.value).toFixed(1));
+        });
+
+        document.querySelector(".etChartTargetTemp").addEventListener("change", async (event) => {
+          if (!event.target.checkValidity()) {
+            return;
+          }
+
+          etChartConfig.targetTemp = parseFloat(event.target.value);
+          setValue('.etChartTargetTempValue', etChartConfig.targetTemp.toFixed(1));
+          makeEquithermChart();
+        });
+
+        document.querySelector("[name='equitherm[slope]']").addEventListener("change", async (event) => {
+          if (!event.target.checkValidity()) {
+            return;
+          }
+
+          etChartConfig.slope = parseFloat(event.target.value);
+          makeEquithermChart();
+        });
+
+        document.querySelector("[name='equitherm[exponent]']").addEventListener("change", async (event) => {
+          if (!event.target.checkValidity()) {
+            return;
+          }
+
+          etChartConfig.exponent = parseFloat(event.target.value);
+          makeEquithermChart();
+        });
+
+        document.querySelector("[name='equitherm[shift]']").addEventListener("change", async (event) => {
+          if (!event.target.checkValidity()) {
+            return;
+          }
+
+          etChartConfig.shift = parseFloat(event.target.value);
+          makeEquithermChart();
+        });
+
+        window.addEventListener('resize', async (event) => {
+          if (etChart) {
+            etChart.resize();
+
+            if (etChartConfig.decimated != hasNeedDecimationChart()) {
+              makeEquithermChart();
+            }
+          }
+        });
      });
    </script>
  </body>
--- a/src_data/pages/upgrade.html
+++ b/src_data/pages/upgrade.html
@@ -21,7 +21,9 @@
          <li>
            <select id="lang" aria-label="Lang">
              <option value="en" selected>EN</option>
+              <option value="cn">CN</option>
              <option value="it">IT</option>
+              <option value="nl">NL</option>
              <option value="ru">RU</option>
            </select>
          </li>
--- a/src_data/robots.txt
+++ b/src_data/robots.txt
@@ -0,0 +1,2 @@
+User-agent: *
+Disallow: /
--- a/src_data/scripts/chart.js
+++ b/src_data/scripts/chart.js
--- a/src_data/scripts/utils.js
+++ b/src_data/scripts/utils.js
@@ -5,8 +5,13 @@ const setupForm = (formSelector, onResultCallback = null, noCastItems = []) => {
  }

  form.querySelectorAll('input').forEach(item => {
-    item.addEventListener('change', (e) => {
-      e.target.setAttribute('aria-invalid', !e.target.checkValidity());
+    item.addEventListener('change', (event) => {
+      if (!event.target.checkValidity()) {
+        event.target.setAttribute('aria-invalid', true);
+
+      } else if (event.target.hasAttribute('aria-invalid')) {
+        event.target.removeAttribute('aria-invalid');
+      }
    })
  });

@@ -132,10 +137,14 @@ const setupNetworkScanForm = (formSelector, tableSelector) => {
      for (let i = 0; i < result.length; i++) {
        let row = tbody.insertRow(-1);
        row.classList.add("network");
-        row.setAttribute('data-ssid', result[i].hidden ? '' : result[i].ssid);
-        row.onclick = () => {
-          const input = document.querySelector('input#sta-ssid');
-          const ssid = this.getAttribute('data-ssid');
+        row.dataset.ssid = result[i].hidden ? '' : result[i].ssid;
+        row.insertCell().textContent = `#${i + 1}`;
+
+        const nameCell = row.insertCell();
+        nameCell.innerHTML = result[i].hidden ? `<i>${result[i].bssid}</i>` : result[i].ssid;
+        nameCell.onclick = (event) => {
+          const input = document.querySelector("[name='sta[ssid]']");
+          const ssid = event.target.parentNode.dataset.ssid;
          if (!input || !ssid) {
            return;
          }
@@ -144,9 +153,6 @@ const setupNetworkScanForm = (formSelector, tableSelector) => {
          input.focus();
        };

-        row.insertCell().textContent = `#${i + 1}`;
-        row.insertCell().innerHTML = result[i].hidden ? `<i>${result[i].bssid}</i>` : result[i].ssid;
-
        // info cell
        let infoCell = row.insertCell();

@@ -165,7 +171,7 @@ const setupNetworkScanForm = (formSelector, tableSelector) => {
        }
        
        let signalQualityContainer = document.createElement("span");
-        signalQualityContainer.setAttribute('data-tooltip', `${result[i].signalQuality}%`);
+        signalQualityContainer.dataset.tooltip = `${result[i].signalQuality}%`;
        signalQualityContainer.appendChild(signalQualityIcon);
        infoCell.appendChild(signalQualityContainer);

@@ -192,7 +198,7 @@ const setupNetworkScanForm = (formSelector, tableSelector) => {
        }

        let authContainer = document.createElement("span");
-        authContainer.setAttribute('data-tooltip', (result[i].auth in authList) ? authList[result[i].auth] : "unknown");
+        authContainer.dataset.tooltip = (result[i].auth in authList) ? authList[result[i].auth] : "unknown";
        authContainer.appendChild(authIcon);
        infoCell.appendChild(authContainer);
      }
@@ -629,6 +635,10 @@ const setCheckboxValue = (selector, value, parent = undefined) => {
  }

  item.checked = value;
+
+  setTimeout(() => {
+    item.dispatchEvent(new Event("change"));
+  }, 10);
 }

 const setRadioValue = (selector, value, parent = undefined) => {
@@ -642,7 +652,14 @@ const setRadioValue = (selector, value, parent = undefined) => {
  }

  for (let item of items) {
-    item.checked = item.value == value;
+    const checked = item.value == value;
+    if (item.checked != checked) {
+      item.checked = checked;
+
+      setTimeout(() => {
+        item.dispatchEvent(new Event("change"));
+      }, 10);
+    }
  }
 }

@@ -657,13 +674,17 @@ const setInputValue = (selector, value, attrs = {}, parent = undefined) => {
  }

  for (let item of items) {
-    item.value = value;
-
    if (attrs instanceof Object) {
      for (let attrKey of Object.keys(attrs)) {
        item.setAttribute(attrKey, attrs[attrKey]);
      }
    }
+
+    item.value = value;
+
+    setTimeout(() => {
+      item.dispatchEvent(new Event("change"));
+    }, 10);
  }
 }

@@ -848,4 +869,16 @@ function dec2hex(i) {
  }
  
  return hex.toUpperCase();
+}
+
+function constrain(amt, low, high) {
+  return ((amt) < (low) ? (low) : ((amt) > (high) ? (high) : (amt)));
+}
+
+function c2f(value) {
+  return (9 / 5) * value + 32;
+}
+
+function f2c(value) {
+  return (value - 32) * (5 / 9);
 }
--- a/src_data/styles/app.css
+++ b/src_data/styles/app.css
@@ -3,6 +3,10 @@
    --pico-block-spacing-vertical: calc(var(--pico-spacing) * 0.75);
    --pico-block-spacing-horizontal: calc(var(--pico-spacing) * 0.75);
  }
+
+  .logo {
+    font-size: 1.2rem;
+  }
 }

@media (min-width: 768px) {
@@ -10,6 +14,10 @@
    --pico-block-spacing-vertical: var(--pico-spacing);
    --pico-block-spacing-horizontal: var(--pico-spacing);
  }
+
+  .logo {
+    font-size: 1.25rem;
+  }
 }

@media (min-width: 1024px) {
@@ -17,6 +25,10 @@
    --pico-block-spacing-vertical: calc(var(--pico-spacing) * 1.25);
    --pico-block-spacing-horizontal: calc(var(--pico-spacing) * 1.25);
  }
+
+  .logo {
+    font-size: 1.25rem;
+  }
 }

@media (min-width: 1280px) {
@@ -25,6 +37,10 @@
    --pico-block-spacing-horizontal: calc(var(--pico-spacing) * 1.5);
  }

+  .logo {
+    font-size: 1.3rem;
+  }
+
  .container {
    max-width: 1000px;
  }
@@ -36,6 +52,10 @@
    --pico-block-spacing-horizontal: calc(var(--pico-spacing) * 1.75);
  }

+  .logo {
+    font-size: 1.3rem;
+  }
+
  .container {
    max-width: 1000px;
  }
@@ -111,7 +131,7 @@ tr.network:hover {
  border-radius: var(--pico-border-radius);
  color: var(--pico-code-kbd-color);
  font-weight: bolder;
-  font-size: 1.3rem;
+  /*font-size: 1.3rem;*/
  font-family: var(--pico-font-family-monospace);
 }

--- a/tools/esp32.py
+++ b/tools/esp32.py
@@ -23,10 +23,15 @@ Import("env")
 platform = env.PioPlatform()

 import sys
+import os
+import subprocess
 from os.path import join

-sys.path.append(join(platform.get_package_dir("tool-esptoolpy")))
-import esptool
+def normalize_paths(cmd):
+    for i, arg in enumerate(cmd):
+        if isinstance(arg, str) and '/' in arg:
+            cmd[i] = os.path.normpath(arg)
+    return cmd

 def esp32_create_combined_bin(source, target, env):
    print("Generating combined binary for serial flashing")
@@ -39,26 +44,21 @@ def esp32_create_combined_bin(source, target, env):
    sections = env.subst(env.get("FLASH_EXTRA_IMAGES"))
    firmware_name = env.subst("$BUILD_DIR/${PROGNAME}.bin")
    chip = env.get("BOARD_MCU")
-    flash_size = env.BoardConfig().get("upload.flash_size")
-    flash_freq = env.BoardConfig().get("build.f_flash", '40m')
-    flash_freq = flash_freq.replace('000000L', 'm')
-    flash_mode = env.BoardConfig().get("build.flash_mode", "dio")
-    memory_type = env.BoardConfig().get("build.arduino.memory_type", "qio_qspi")
-    if flash_mode == "qio" or flash_mode == "qout":
-        flash_mode = "dio"
-    if memory_type == "opi_opi" or memory_type == "opi_qspi":
-        flash_mode = "dout"
+    flash_size = env.BoardConfig().get("upload.flash_size", "4MB")
+    flash_mode = env["__get_board_flash_mode"](env)
+    flash_freq = env["__get_board_f_flash"](env)
+
    cmd = [
        "--chip",
        chip,
-        "merge_bin",
+        "merge-bin",
        "-o",
        new_file_name,
-        "--flash_mode",
+        "--flash-mode",
        flash_mode,
-        "--flash_freq",
+        "--flash-freq",
        flash_freq,
-        "--flash_size",
+        "--flash-size",
        flash_size,
    ]

@@ -71,9 +71,12 @@ def esp32_create_combined_bin(source, target, env):
    print(f" - {hex(app_offset)} | {firmware_name}")
    cmd += [hex(app_offset), firmware_name]

-    print('Using esptool.py arguments: %s' % ' '.join(cmd))
-
-    esptool.main(cmd)
+    # print('Using esptool.py arguments: %s' % ' '.join(cmd))
+    cmdline = [env.subst("$OBJCOPY")] + normalize_paths(cmd)
+    print('Command Line: %s' % cmdline)
+    result = subprocess.run(cmdline, text=True, check=False, stdout=subprocess.DEVNULL)
+    if result.returncode != 0:
+        print(f"esptool create firmware failed with exit code: {result.returncode}")


 env.AddPostAction("$BUILD_DIR/${PROGNAME}.bin", esp32_create_combined_bin)
Author	SHA1	Message	Date
Yurii	131ad2fdfd	refactor: after merge	2025-12-09 19:26:08 +03:00
Yurii	28099f2d07	Merge branch 'master' into new-equitherm	2025-12-09 19:19:30 +03:00
Yurii	00baf10b9f	chore: removed `platformio_dependabot`	2025-12-09 18:18:10 +03:00
Yurii	6f8c8567a0	chore: bump `pioarduino/platform-espressif32` from 3.3.2 to 3.3.4	2025-11-15 13:08:43 +03:00
Yurii	e573ce582f	fix: generation of `default_entity_id` for HA fixed	2025-11-12 20:21:39 +03:00
Yurii	0b60734a3b	refactor: using abbreviations for HA	2025-11-12 20:18:16 +03:00
Yurii	ec50d5ecbb	flx: typo	2025-11-03 01:09:13 +03:00
Yurii	32e0a06c19	Merge branch 'master' into new-equitherm	2025-11-03 00:04:57 +03:00
Yurii	d4603aa0de	fix: compatibility with HA 2025.10+ fixed #189	2025-11-02 23:43:02 +03:00
Yurii	b9010643f0	feat: added GPIO inversion setting for extpump	2025-10-31 21:08:35 +03:00
Yurii	5667199988	refactor: reset BLE/DALLAS address if not valid	2025-10-14 07:38:30 +03:00
Yurii	cf81ff5856	refactor: improved work with BLE sensors	2025-10-10 05:35:57 +03:00
Yurii	78b5a12e90	feat: setting the cooling setpoint if cooling support is enabled	2025-10-09 22:57:04 +03:00
Yurii	cc5bbb7a87	refactor: refactoring after #184	2025-10-09 08:22:07 +03:00
Douwe	dda79151f3	feat: added Dutch locale #184 * Create nl.json * Update nl.json	2025-10-09 08:19:55 +03:00
Yurii	1375d8c7a5	chore: bump pioarduino/platform-espressif32 from 3.3.1 to 3.3.2	2025-10-09 08:16:04 +03:00
Yurii	d4addf887f	refactor: improved work with BLE sensors	2025-10-09 08:13:33 +03:00
Yurii	9d77256051	refactor: not initialize Bluetooth if BLE sensors are not used	2025-10-03 20:56:04 +03:00
Yurii	d3e7a13e1f	fix: rollback NimBLE-Arduino from 2.3.6 to 2.3.3	2025-10-03 20:54:42 +03:00
Yurii	14826c10cd	chore: ``byte` `to` `uint8_t``	2025-09-23 04:03:36 +03:00
Yurii	28a5218b7c	fix: various fixes Found by PVS-Studio	2025-09-23 04:02:40 +03:00
Yurii	f3ba43adbd	docs: fix typo	2025-09-19 21:14:38 +03:00
Yurii	062c6714d1	chore: bump dependencies	2025-09-19 21:09:55 +03:00
Yurii	502f73db0e	chore: bump pioarduino/platform-espressif32 from 3.3.0 to 3.3.1	2025-09-19 21:06:17 +03:00
zedward	c2ee30d1ab	fix: added ``nodemcu_32_160mhz`` env, deadband usage in PID fixed (#176 ) * Small fixes: CPU limit for odemcu_32, deadbamd usage in PID * PR review fixes * Fix: remove spaces --------- Co-authored-by: Edward Zhuravlov <Edward.Zhuravlev@topsoft.by>	2025-09-19 21:00:11 +03:00
Yurii	ff89c6d478	chore: added additional description of the ``T`` parameter for Equitherm	2025-09-19 20:07:31 +03:00
Yurii	d867c355ed	style: HTML code formatting	2025-09-19 19:25:24 +03:00
Yurii	e751c3aba0	fix: decimation for Equitherm chart fixed; chartjs updated	2025-09-19 02:09:12 +03:00
Yurii	30b55f1946	Merge branch 'master' into new-equitherm	2025-09-19 00:45:07 +03:00
dependabot[bot]	9217bb7448	chore: bump actions/stale from 9 to 10 (#172 ) Bumps [actions/stale](https://github.com/actions/stale) from 9 to 10. - [Release notes](https://github.com/actions/stale/releases) - [Changelog](https://github.com/actions/stale/blob/main/CHANGELOG.md) - [Commits](https://github.com/actions/stale/compare/v9...v10) --- updated-dependencies: - dependency-name: actions/stale dependency-version: '10' dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>	2025-09-05 06:33:43 +03:00
Yurii	d694ae18c0	chore: bump version to 1.5.6	2025-08-21 19:34:07 +03:00
dependabot[bot]	0f4fa2e406	chore(deps): bump actions/checkout from 4 to 5 (#169 ) Bumps [actions/checkout](https://github.com/actions/checkout) from 4 to 5. - [Release notes](https://github.com/actions/checkout/releases) - [Changelog](https://github.com/actions/checkout/blob/main/CHANGELOG.md) - [Commits](https://github.com/actions/checkout/compare/v4...v5) --- updated-dependencies: - dependency-name: actions/checkout dependency-version: '5' dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>	2025-08-12 13:24:55 +03:00
Yurii	df2af928a5	chore: bump pioarduino/platform-espressif32 from 3.2.1 to 3.3.0	2025-08-04 07:08:37 +03:00
Yurii	3e6a2d93d4	chore: updated esp32.py Source: https://raw.githubusercontent.com/letscontrolit/ESPEasy/mega/tools/pio/post_esp32.py	2025-08-04 07:07:31 +03:00
Yurii	062468c6b1	chore: updated esp32.py to be compatible with new versions of esptool Source: https://raw.githubusercontent.com/letscontrolit/ESPEasy/mega/tools/pio/post_esp32.py	2025-07-04 04:12:06 +03:00
Yurii	530892dc09	chore: bump pioarduino/platform-espressif32 from 3.2.0 to 3.2.1	2025-07-04 04:10:06 +03:00
Yurii	c73f74ad45	chore: upd platformio.ini	2025-07-04 03:08:51 +03:00
Yurii	a67ff046b0	refactor: refactoring after #163	2025-07-04 03:00:41 +03:00
menyuguren	0f496fee42	feat: added Chinese locale by @menyuguren #163 * Add files via upload 支持中文 * fix typo --------- Co-authored-by: Yurii <34578544+Laxilef@users.noreply.github.com>	2025-07-04 02:55:09 +03:00
Yurii	5544f43162	Merge branch 'master' into new-equitherm	2025-06-30 02:42:33 +03:00
Yurii	e63a0dc7eb	refactor: improved freeze protection & overheat protection; added desc for OT options	2025-06-30 02:41:44 +03:00
Yurii	792c6a6668	chore: upd gitignore	2025-06-30 02:38:25 +03:00
Yurii	94f6f14795	refactor: fixed logo size on mobile devices	2025-06-30 02:38:00 +03:00
Yurii	47696a0721	refactor: added print to log channel 2 activity state #155	2025-06-28 20:16:19 +03:00
Yurii	5c4ad8cd07	chore: upd readme	2025-06-27 14:53:17 +03:00
Yurii	f6cfdf3263	feat: added freeze protection parameter for heating, removed forced start of heating in emergency mode #157	2025-06-27 00:28:38 +03:00
Yurii	58b0c18448	fix: added C/F temperature conversion in overheating protection	2025-06-20 02:46:25 +03:00
Yurii	b985275309	feat: added software overheating protection	2025-06-17 17:50:15 +03:00
Yurii	1eee184887	feat: added OT option dhwStateAsDhwBlocking For Baxi Slim with Bertelli	2025-06-16 01:04:07 +03:00
Yurii	ba03c9cda3	fix: last sensor was ignored	2025-06-08 03:10:10 +03:00
Yurii	14b1eac732	chore: bump version to 1.5.5	2025-06-05 05:40:09 +03:00
Yurii	d16f56d280	fix: build for ESP32 C6	2025-05-23 00:42:29 +03:00
Yurii	06c2ddcf96	Merge branch 'master' into new-equitherm	2025-05-21 01:20:55 +03:00
Yurii	8b50ed48c1	fix: revert default value of slave max modulation; always set max modulation level Baxi Ampera resets the maximum modulation level to 0 when the heating is turned off	2025-05-21 01:17:43 +03:00
Yurii	f212d9d9a8	fix: changed default value of slave max modulation to 0	2025-05-20 00:05:29 +03:00
Yurii	0bb05006f4	Merge branch 'master' into new-equitherm	2025-05-19 23:45:13 +03:00
Yurii	0e78e71493	refactor: more logs	2025-05-19 23:39:15 +03:00
Yurii	655313562d	fix: typo	2025-05-19 23:28:55 +03:00
Yurii	c8e7724da8	refactor: cosmetic changes	2025-05-19 23:26:44 +03:00
Yurii	f986129c72	fix: set month of date to OT fixed	2025-05-19 23:16:34 +03:00
Yurii	5046bc0e8f	Merge branch 'master' into new-equitherm	2025-05-19 22:49:09 +03:00
Yurii	7b31315242	feat: added OT option to set date and time on the boiler	2025-05-19 22:38:35 +03:00
Yurii	6872cad8ce	feat: added new purpose (number) for sensors and added polling for OpenTherm statistical IDs New sensor types: * Number of burner starts * Number of burner starts (DHW) * Number of pump starts (heating) * Number of pump starts (DHW) * Number of burner operating hours * Number of burner operating hours (DHW) * Number of pump operating hours (heating) * Number of pump operating hours (DHW)	2025-05-19 21:09:39 +03:00
Yurii	4b1b7f5857	feat: added OT options: ignore diag state, auto fault reset, auto diag reset	2025-05-18 16:47:28 +03:00
Yurii	a667317412	refactor: increased max. target indoor temp. from 30 to 40 degrees (for control by return temperature)	2025-05-18 16:01:04 +03:00
Yurii	612b17b86f	refactor: reworked the setting of the maximum modulation level, added the parameter of the maximum modulation level for DHW	2025-05-18 15:31:49 +03:00
Yurii	7c032ddc2f	fix: removed ``device_class`` for signal quality entities for compatibility with HA 2025.7.0	2025-05-18 15:29:32 +03:00
Yurii	9dd5ee8da5	chore: bump pioarduino/platform-espressif32 from 3.1.3 to 3.2.0	2025-05-08 09:39:30 +03:00
Yurii	7dbd503e1e	fix: restarting on critically low heap #151	2025-05-07 06:12:39 +03:00
Yurii	85932fdc1d	refactor: rounding ``heating.setpointTemp``	2025-03-26 16:14:32 +03:00
P43YM	0d3adad446	refactor: added notes for equitherm parameters	2025-03-18 09:38:09 +03:00
Yurii	77d80225ad	refactor: small changes	2025-03-18 09:26:53 +03:00
Yurii	dc68315166	refactor: added ``Msg type`` output to opentherm log	2025-03-18 09:21:00 +03:00
Yurii	5d0ca68dc0	fix: ``OpenThermTask::setMaxHeatingTemp(const uint8_t temperature)`` changed to OpenThermTask::setMaxHeatingTemp(const float temperature)	2025-03-18 09:19:24 +03:00
Yurii	d50b70c211	refactor: improved work with opentherm on esp32	2025-03-14 05:12:20 +03:00
Yurii	dd53d1ef3e	chore: bump version to 1.5.4	2025-03-06 19:15:56 +03:00
Yurii	587678f184	Merge branch 'master' into new-equitherm	2025-03-06 04:52:12 +03:00
Yurii	72235286c0	chore: resolve conflicts	2025-03-06 04:50:02 +03:00
Yurii	3bd8010b74	refactor: BLE device support for ESP32 C6 (#147 ) Building on ``Arduino``+``ESP-IDF`` with ``h2zero/esp-nimble-cpp`` for ESP32 C6	2025-03-06 04:45:13 +03:00
Yurii	6a26e27d39	refactor: heating temperature step changed * step changed to 0.1 * added processing of long presses on thermostats in the dashboard	2025-03-06 04:29:01 +03:00
Yurii	8fa440810c	refactor: status BLE sensors	2025-03-05 02:28:17 +03:00
Yurii	ee868b22ce	chore: remove unused files	2025-03-04 21:31:44 +03:00
Yurii	95b18385ba	chore: gitignore update	2025-03-04 17:50:59 +03:00
Yurii	8046a7e13f	refactor: cosmetic changes	2025-03-03 04:03:08 +03:00
Yurii	0ec1fc5f24	chore: fix typo	2025-03-03 02:26:09 +03:00
Yurii	061136b13e	refactor: cosmetic changes (equitherm chart)	2025-03-03 02:05:33 +03:00
Yurii	3e61dabeab	refactor: refactoring after #144	2025-03-02 22:44:53 +03:00
P43YM	e5f4281d4c	feat: new equitherm algorithm and chart for it (#144 )	2025-02-28 23:21:55 +03:00
Yurii	4457e16a8f	refactor: increased opentherm disconnect timeout	2025-02-27 12:48:27 +03:00
Yurii	1965ca671e	chore: bump pioarduino/platform-espressif32 from 3.1.2 to 3.1.3	2025-02-20 16:50:06 +03:00
Yurii	0d1873ec77	fix: set SSID on click in table of available networks fixed	2025-02-17 19:37:51 +03:00
Yurii	38ec56fb33	fix: working with ``Sensors::Type::MANUAL`` sensors fixed	2025-02-17 18:58:01 +03:00
Yurii	bb7c3eeba3	feat: added mDNS settings	2025-02-15 00:05:10 +03:00
Yurii	0c778d4c7f	refactor: added ``robots.txt`` to disallow indexing	2025-02-14 23:43:25 +03:00
Yurii	2e5e5e59a8	feat: added mDNS	2025-02-14 07:43:52 +03:00
Yurii	e1623e7b63	chore: bump pioarduino/platform-espressif32 from 3.1.1 to 3.1.2	2025-02-14 06:34:46 +03:00
Yurii	80b91d9a01	feat: generate ``network.hostname` `and` `settings.mqtt.prefix`` if they are empty	2025-02-03 06:38:36 +03:00
Roman Andriadi	25b70e4db5	refactor: allow up to 100x correction of sensor values (#137 )	2025-02-03 04:56:00 +03:00