chore: minimizing flash size with NimBLE

* feat: Added support DHT11/DHT22 sensors

* chore: formatting

* fix: typo

* fix: `HaHelper::publishDynamicSensor()` for DHT sensors fixed

* refactor: optimization of wired sensors

.github/workflows/pio-dependabot.yaml

@@ -1,22 +0,0 @@
-name: PlatformIO Dependabot
-on:
-  workflow_dispatch: # option to manually trigger the workflow
-  schedule:
-    # Runs every day at 00:00
-    - cron: "0 0 * * *"
-
-permissions:
-  contents: write
-  pull-requests: write
-
-jobs:
-  dependabot:
-    runs-on: ubuntu-latest
-    name: run PlatformIO Dependabot
-    steps:
-      - name: Checkout
-        uses: actions/checkout@v5
-      - name: run PlatformIO Dependabot
-        uses: peterus/platformio_dependabot@v1.2.0
-        with:
-          github_token: ${{ secrets.GITHUB_TOKEN }}

.gitignore

@@ -1,4 +1,5 @@
 .pio
+.dummy
 .vscode
 .PVS-Studio
 build/*
@@ -10,5 +11,4 @@ package-lock.json
 *.lock
 sdkconfig.*
 CMakeLists.txt
-!sdkconfig.defaults
 !.gitkeep

assets/ha/report_temp_to_otgateway.yaml

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

assets/ha/report_temp_to_otgateway_from_weather.yaml

@@ -1,5 +1,5 @@
 # Blueprint for reporting temperature to OpenTherm Gateway from home assistant weather integration
-# Updated: 03.09.2024
+# Updated: 26.01.2026
 
 blueprint:
   name: Report temp to OpenTherm Gateway from Weather
@@ -37,8 +37,12 @@ condition:
     value_template: "{{ states(source_entity) != 'unavailable' and states(target_entity) != 'unavailable' }}"
 action:
   - if:
+      - condition: or
+        conditions:
           - condition: template
             value_template: "{{ (state_attr(source_entity, 'temperature')|float(0) - states(target_entity)|float(0)) | abs | round(2) >= 0.1 }}"
+          - condition: template
+            value_template: "{{ (as_timestamp(now()) - as_timestamp(states[target_entity].last_updated)) | int(0) > 300 }}"
     then:
       - service: number.set_value
         data:

lib/CustomOpenTherm/CustomOpenTherm.h

@@ -70,40 +70,79 @@ public:
     }
   }
 
-  bool sendBoilerReset() {
+  inline auto sendBoilerReset() {
-    unsigned int data = 1;
+    return this->sendRequestCode(1);
-    data <<= 8;
-    unsigned long response = this->sendRequest(buildRequest(
-      OpenThermMessageType::WRITE_DATA,
-      OpenThermMessageID::RemoteRequest,
-      data
-    ));
-
-    return isValidResponse(response) && isValidResponseId(response, OpenThermMessageID::RemoteRequest);
   }
 
-  bool sendServiceReset() {
+  inline auto sendServiceReset() {
-    unsigned int data = 10;
+    return this->sendRequestCode(10);
-    data <<= 8;
-    unsigned long response = this->sendRequest(buildRequest(
-      OpenThermMessageType::WRITE_DATA,
-      OpenThermMessageID::RemoteRequest,
-      data
-    ));
-
-    return isValidResponse(response) && isValidResponseId(response, OpenThermMessageID::RemoteRequest);
   }
 
-  bool sendWaterFilling() {
+  inline auto sendWaterFilling() {
-    unsigned int data = 2;
+    return this->sendRequestCode(2);
-    data <<= 8;
+  }
+
+  bool sendRequestCode(const uint8_t requestCode) {
     unsigned long response = this->sendRequest(buildRequest(
       OpenThermMessageType::WRITE_DATA,
       OpenThermMessageID::RemoteRequest,
-      data
+      static_cast<unsigned int>(requestCode) << 8
     ));
 
-    return isValidResponse(response) && isValidResponseId(response, OpenThermMessageID::RemoteRequest);
+    if (!isValidResponse(response) || !isValidResponseId(response, OpenThermMessageID::RemoteRequest)) {
+      return false;
+    }
+
+    const uint8_t responseRequestCode = (response & 0xFFFF) >> 8;
+    const uint8_t responseCode = response & 0xFF;
+    if (responseRequestCode != requestCode || responseCode < 128) {
+      return false;
+    }
+
+    // reset
+    this->sendRequest(buildRequest(
+      OpenThermMessageType::WRITE_DATA,
+      OpenThermMessageID::RemoteRequest,
+      0u << 8
+    ));
+
+    return true;
+  }
+
+  bool getStr(OpenThermMessageID id, char* buffer, uint16_t length = 50) {
+    if (buffer == nullptr || length == 0) {
+      return false;
+    }
+
+    unsigned long response;
+    uint8_t index = 0;
+    uint8_t maxIndex = 255;
+
+    while (index <= maxIndex && index < length) {
+      response = this->sendRequest(buildRequest(
+        OpenThermMessageType::READ_DATA,
+        id,
+        static_cast<unsigned int>(index) << 8
+      ));
+
+      if (!isValidResponse(response) || !isValidResponseId(response, id)) {
+        break;
+      }
+
+      const uint8_t character = response & 0xFF;
+      if (character == 0) {
+        break;
+      }
+
+      if (index == 0) {
+        maxIndex = (response & 0xFFFF) >> 8;
+      }
+
+      buffer[index++] = static_cast<char>(character);
+    }
+
+    buffer[index] = '\0';
+    return index > 0;
   }
 
   static bool isCh2Active(unsigned long response) {
@@ -111,9 +150,9 @@ public:
   }
 
   static bool isValidResponseId(unsigned long response, OpenThermMessageID id) {
-    uint8_t responseId = (response >> 16) & 0xFF;
+    const uint8_t responseId = (response >> 16) & 0xFF;
 
-    return (uint8_t)id == responseId;
+    return static_cast<uint8_t>(id) == responseId;
   }
 
   static uint8_t getResponseMessageTypeId(unsigned long response) {
@@ -124,10 +163,10 @@ public:
     uint8_t msgType = getResponseMessageTypeId(response);
 
     switch (msgType) {
-      case (uint8_t) OpenThermMessageType::READ_ACK:
+      case static_cast<uint8_t>(OpenThermMessageType::READ_ACK):
-      case (uint8_t) OpenThermMessageType::WRITE_ACK:
+      case static_cast<uint8_t>(OpenThermMessageType::WRITE_ACK):
-      case (uint8_t) OpenThermMessageType::DATA_INVALID:
+      case static_cast<uint8_t>(OpenThermMessageType::DATA_INVALID):
-      case (uint8_t) OpenThermMessageType::UNKNOWN_DATA_ID:
+      case static_cast<uint8_t>(OpenThermMessageType::UNKNOWN_DATA_ID):
         return CustomOpenTherm::messageTypeToString(
           static_cast<OpenThermMessageType>(msgType)
         );

lib/HomeAssistantHelper/HomeAssistantHelper.h

@@ -147,8 +147,19 @@ public:
     return topic;
   }
 
+  template <class DT, class VT> 
+  String getEntityIdWithPrefix(DT domain, VT value, char separator = '_') {
+    String topic = "";
+    topic.concat(domain);
+    topic.concat('.');
+    topic.concat(this->devicePrefix);
+    topic.concat(separator);
+    topic.concat(value);
+    return topic;
+  }
+
   template <class T> 
-  String getObjectIdWithPrefix(T value, char separator = '_') {
+  String getUniqueIdWithPrefix(T value, char separator = '_') {
     String topic = "";
     topic.concat(this->devicePrefix);
     topic.concat(separator);

lib/HomeAssistantHelper/strings.h

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

lib/WebServerHandlers/UpgradeHandler.h

@@ -1,6 +1,6 @@
 #include <Arduino.h>
 
-class UpgradeHandler : public RequestHandler {
+class UpgradeHandler : public AsyncWebHandler {
 public:
   enum class UpgradeType {
     FIRMWARE = 0,
@@ -12,7 +12,7 @@ public:
     NO_FILE,
     SUCCESS,
     PROHIBITED,
-    ABORTED,
+    SIZE_MISMATCH,
     ERROR_ON_START,
     ERROR_ON_WRITE,
     ERROR_ON_FINISH
@@ -22,27 +22,21 @@ public:
     UpgradeType type;
     UpgradeStatus status;
     String error;
+    size_t progress = 0;
+    size_t size = 0;
   } UpgradeResult;
 
-  typedef std::function<bool(HTTPMethod, const String&)> CanHandleCallback;
+  typedef std::function<bool(AsyncWebServerRequest *request, UpgradeType)> BeforeUpgradeCallback;
-  typedef std::function<bool(const String&)> CanUploadCallback;
+  typedef std::function<void(AsyncWebServerRequest *request, const UpgradeResult&, const UpgradeResult&)> AfterUpgradeCallback;
-  typedef std::function<bool(UpgradeType)> BeforeUpgradeCallback;
-  typedef std::function<void(const UpgradeResult&, const UpgradeResult&)> AfterUpgradeCallback;
   
-  UpgradeHandler(const char* uri) {
+  UpgradeHandler(AsyncURIMatcher uri) : uri(uri) {}
-    this->uri = uri;
+
+  bool canHandle(AsyncWebServerRequest *request) const override final {
+    if (!request->isHTTP()) {
+      return false;
     }
     
-  UpgradeHandler* setCanHandleCallback(CanHandleCallback callback = nullptr) {
+    return this->uri.matches(request);
-    this->canHandleCallback = callback;
-
-    return this;
-  }
-
-  UpgradeHandler* setCanUploadCallback(CanUploadCallback callback = nullptr) {
-    this->canUploadCallback = callback;
-
-    return this;
   }
 
   UpgradeHandler* setBeforeUpgradeCallback(BeforeUpgradeCallback callback = nullptr) {
@@ -57,29 +51,9 @@ public:
     return this;
   }
 
-  #if defined(ARDUINO_ARCH_ESP32)
+  void handleRequest(AsyncWebServerRequest *request) override final {
-  bool canHandle(WebServer &server, HTTPMethod method, const String &uri) override {
-    return this->canHandle(method, uri);
-  }
-  #endif
-
-  bool canHandle(HTTPMethod method, const String& uri) override {
-    return method == HTTP_POST && uri.equals(this->uri) && (!this->canHandleCallback || this->canHandleCallback(method, uri));
-  }
-
-  #if defined(ARDUINO_ARCH_ESP32)
-  bool canUpload(WebServer &server, const String &uri) override {
-    return this->canUpload(uri);
-  }
-  #endif
-
-  bool canUpload(const String& uri) override {
-    return uri.equals(this->uri) && (!this->canUploadCallback || this->canUploadCallback(uri));
-  }
-
-  bool handle(WebServer& server, HTTPMethod method, const String& uri) override {
     if (this->afterUpgradeCallback) {
-      this->afterUpgradeCallback(this->firmwareResult, this->filesystemResult);
+      this->afterUpgradeCallback(request, this->firmwareResult, this->filesystemResult);
     }
 
     this->firmwareResult.status = UpgradeStatus::NONE;
@@ -87,129 +61,147 @@ public:
 
     this->filesystemResult.status = UpgradeStatus::NONE;
     this->filesystemResult.error.clear();
-
-    return true;
   }
 
-  void upload(WebServer& server, const String& uri, HTTPUpload& upload) override {
+  void handleUpload(AsyncWebServerRequest *request, const String &fileName, size_t index, uint8_t *data, size_t dataLength, bool isFinal) override final {
-    UpgradeResult* result;
+    UpgradeResult* result = nullptr;
-    if (upload.name.equals(F("firmware"))) {
-      result = &this->firmwareResult;
 
-    } else if (upload.name.equals(F("filesystem"))) {
+    if (!request->hasParam(asyncsrv::T_name, true, true)) {
-      result = &this->filesystemResult;
+      // Missing content-disposition 'name' parameter
-      
-    } else {
       return;
     }
 
+    const auto& pName = request->getParam(asyncsrv::T_name, true, true)->value();
+    if (pName.equals("fw")) {
+      result = &this->firmwareResult;
+
+      if (!index) {
+        result->progress = 0;
+        result->size = request->hasParam("fw_size", true)
+          ? request->getParam("fw_size", true)->value().toInt()
+          : 0;
+      }
+
+    } else if (pName.equals("fs")) {
+      result = &this->filesystemResult;
+
+      if (!index) {
+        result->progress = 0;
+        result->size = request->hasParam("fs_size", true)
+          ? request->getParam("fs_size", true)->value().toInt()
+          : 0;
+      }
+
+    } else {
+      // Unknown parameter name
+      return;
+    }
+
+    // check result status
     if (result->status != UpgradeStatus::NONE) {
       return;
     }
 
-    if (this->beforeUpgradeCallback && !this->beforeUpgradeCallback(result->type)) {
+    if (this->beforeUpgradeCallback && !this->beforeUpgradeCallback(request, result->type)) {
       result->status = UpgradeStatus::PROHIBITED;
       return;
     }
 
-    if (!upload.filename.length()) {
+    if (!fileName.length()) {
       result->status = UpgradeStatus::NO_FILE;
       return;
     }
 
-    if (upload.status == UPLOAD_FILE_START) {
+    if (!index) {
       // reset
       if (Update.isRunning()) {
         Update.end(false);
         Update.clearError();
       }
 
+      // try begin
       bool begin = false;
-      #ifdef ARDUINO_ARCH_ESP8266
-      Update.runAsync(true);
-      
-      if (result->type == UpgradeType::FIRMWARE) {
-        begin = Update.begin((ESP.getFreeSketchSpace() - 0x1000) & 0xFFFFF000, U_FLASH);
-        
-      } else if (result->type == UpgradeType::FILESYSTEM) {
-        close_all_fs();
-        begin = Update.begin((size_t)FS_end - (size_t)FS_start, U_FS);
-      }
-      #elif defined(ARDUINO_ARCH_ESP32)
       if (result->type == UpgradeType::FIRMWARE) {
         begin = Update.begin(UPDATE_SIZE_UNKNOWN, U_FLASH);
         
       } else if (result->type == UpgradeType::FILESYSTEM) {
         begin = Update.begin(UPDATE_SIZE_UNKNOWN, U_SPIFFS);
       }
-      #endif
 
       if (!begin || Update.hasError()) {
         result->status = UpgradeStatus::ERROR_ON_START;
-        #ifdef ARDUINO_ARCH_ESP8266
-        result->error = Update.getErrorString();
-        #else
         result->error = Update.errorString();
-        #endif
 
-        Log.serrorln(FPSTR(L_PORTAL_OTA), F("File '%s', on start: %s"), upload.filename.c_str(), result->error.c_str());
+        Log.serrorln(FPSTR(L_PORTAL_OTA), "File '%s', on start: %s", fileName.c_str(), result->error.c_str());
         return;
       }
       
-      Log.sinfoln(FPSTR(L_PORTAL_OTA), F("File '%s', started"), upload.filename.c_str());
+      Log.sinfoln(FPSTR(L_PORTAL_OTA), "File '%s', started", fileName.c_str());
+    }
     
-    } else if (upload.status == UPLOAD_FILE_WRITE) {
+    if (dataLength) {
-      if (Update.write(upload.buf, upload.currentSize) != upload.currentSize) {
+      if (Update.write(data, dataLength) != dataLength) {
         Update.end(false);
-
         result->status = UpgradeStatus::ERROR_ON_WRITE;
-        #ifdef ARDUINO_ARCH_ESP8266
-        result->error = Update.getErrorString();
-        #else
         result->error = Update.errorString();
-        #endif
 
         Log.serrorln(
-          FPSTR(L_PORTAL_OTA),
+          FPSTR(L_PORTAL_OTA), "File '%s', on write %d bytes, %d of %d bytes",
-          F("File '%s', on writing %d bytes: %s"),
+          fileName.c_str(),
-          upload.filename.c_str(), upload.totalSize, result->error.c_str()
+          dataLength,
+          result->progress + dataLength,
+          result->size
         );
-
+        return;
-      } else {
-        Log.sinfoln(FPSTR(L_PORTAL_OTA), F("File '%s', writed %d bytes"), upload.filename.c_str(), upload.totalSize);
       }
       
-    } else if (upload.status == UPLOAD_FILE_END) {
+      result->progress += dataLength;
-      if (Update.end(true)) {
+      Log.sinfoln(
-        result->status = UpgradeStatus::SUCCESS;
+        FPSTR(L_PORTAL_OTA), "File '%s', write %d bytes, %d of %d bytes",
-
+        fileName.c_str(),
-        Log.sinfoln(FPSTR(L_PORTAL_OTA), F("File '%s': finish"), upload.filename.c_str());
+        dataLength,
-
+        result->progress,
-      } else {
+        result->size
-        result->status = UpgradeStatus::ERROR_ON_FINISH;
+      );
-        #ifdef ARDUINO_ARCH_ESP8266
-        result->error = Update.getErrorString();
-        #else
-        result->error = Update.errorString();
-        #endif
-
-        Log.serrorln(FPSTR(L_PORTAL_OTA), F("File '%s', on finish: %s"), upload.filename.c_str(), result->error);
     }
 
-    } else if (upload.status == UPLOAD_FILE_ABORTED) {
+    if (result->size > 0) {
+      if (result->progress > result->size || (isFinal && result->progress < result->size)) {
         Update.end(false);
-      result->status = UpgradeStatus::ABORTED;
+        result->status = UpgradeStatus::SIZE_MISMATCH;
 
-      Log.serrorln(FPSTR(L_PORTAL_OTA), F("File '%s': aborted"), upload.filename.c_str());
+        Log.serrorln(
+          FPSTR(L_PORTAL_OTA), "File '%s', size mismatch: %d of %d bytes",
+          fileName.c_str(),
+          result->progress,
+          result->size
+        );
+        return;
       }
     }
     
+    if (isFinal) {
+      if (!Update.end(true)) {
+        result->status = UpgradeStatus::ERROR_ON_FINISH;
+        result->error = Update.errorString();
+
+        Log.serrorln(FPSTR(L_PORTAL_OTA), "File '%s', on finish: %s", fileName.c_str(), result->error);
+        return;
+      }
+
+      result->status = UpgradeStatus::SUCCESS;
+      Log.sinfoln(FPSTR(L_PORTAL_OTA), "File '%s': finish", fileName.c_str());
+    }
+  }
+
+  bool isRequestHandlerTrivial() const override final {
+    return false;
+  }
+
 protected:
-  CanHandleCallback canHandleCallback;
-  CanUploadCallback canUploadCallback;
   BeforeUpgradeCallback beforeUpgradeCallback;
   AfterUpgradeCallback afterUpgradeCallback;
-  const char* uri = nullptr;
+  AsyncURIMatcher uri;
 
   UpgradeResult firmwareResult{UpgradeType::FIRMWARE, UpgradeStatus::NONE};
   UpgradeResult filesystemResult{UpgradeType::FILESYSTEM, UpgradeStatus::NONE};

platformio.ini

@@ -1,43 +1,43 @@
-; PlatformIO Project Configuration File
-;
-;   Build options: build flags, source filter
-;   Upload options: custom upload port, speed and extra flags
-;   Library options: dependencies, extra library storages
-;   Advanced options: extra scripting
-;
-; Please visit documentation for the other options and examples
-; https://docs.platformio.org/page/projectconf.html
-
 [platformio]
 ;extra_configs          = secrets.ini
 extra_configs           = secrets.default.ini
 core_dir                = .pio
 
 [env]
-version = 1.5.6
+version                 = 1.6.0-passiveble
 framework               = arduino
-lib_deps = 
+lib_deps                = ESP32Async/AsyncTCP@^3.4.10
+                          ESP32Async/ESPAsyncWebServer@^3.9.4
+                          mathieucarbou/MycilaWebSerial@^8.2.0
                           bblanchon/ArduinoJson@^7.4.2
                           ;ihormelnyk/OpenTherm Library@^1.1.5
                           https://github.com/Laxilef/opentherm_library#esp32_timer
                           arduino-libraries/ArduinoMqttClient@^0.1.8
-	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
+                          pstolarz/OneWireNg@^0.14.1
-	laxilef/TinyLogger@^1.1.1
+                          milesburton/DallasTemperature@^4.0.6
+                          https://github.com/Laxilef/esp32DHT#idf5
+                          ;laxilef/TinyLogger@^1.1.1
+                          https://github.com/Laxilef/TinyLogger#custom_handlers
+lib_ignore              = OneWire
 build_type              = ${secrets.build_type}
-build_flags = 
+build_flags             = ;-mtext-section-literals
-	-mtext-section-literals
+                          -O2
+                          -Wno-deprecated-declarations
                           -D MQTT_CLIENT_STD_FUNCTION_CALLBACK=1
                           ;-D DEBUG_ESP_CORE -D DEBUG_ESP_WIFI -D DEBUG_ESP_HTTP_SERVER -D DEBUG_ESP_PORT=Serial
                           -D BUILD_VERSION='"${this.version}"'
                           -D BUILD_ENV='"$PIOENV"'
+                          -D CONFIG_ASYNC_TCP_STACK_SIZE=4096
+                          -D ARDUINOJSON_USE_DOUBLE=0
+                          -D ARDUINOJSON_USE_LONG_LONG=0
+                          -D TINYLOGGER_GLOBAL
+                          -D DHT_TASK_STACK_SIZE=4096
                           -D DEFAULT_SERIAL_ENABLED=${secrets.serial_enabled}
                           -D DEFAULT_SERIAL_BAUD=${secrets.serial_baud}
-	-D DEFAULT_TELNET_ENABLED=${secrets.telnet_enabled}
+                          -D DEFAULT_WEBSERIAL_ENABLED=${secrets.webserial_enabled}
-	-D DEFAULT_TELNET_PORT=${secrets.telnet_port}
                           -D DEFAULT_LOG_LEVEL=${secrets.log_level}
                           -D DEFAULT_HOSTNAME='"${secrets.hostname}"'
                           -D DEFAULT_AP_SSID='"${secrets.ap_ssid}"'
@@ -55,57 +55,55 @@ build_flags =
 upload_speed            = 921600
 monitor_speed           = 115200
 ;monitor_filters        = direct
-monitor_filters = 
+monitor_filters         = esp32_exception_decoder
-	esp32_exception_decoder
-	esp8266_exception_decoder
 board_build.flash_mode  = dio
 board_build.filesystem  = littlefs
-check_tool = ; pvs-studio
+check_tool              = ;pvs-studio
-check_flags =
+check_flags             = ;pvs-studio: --analysis-mode=4 --exclude-path=./.pio/libdeps
-;  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
-lib_ignore = 
-extra_scripts = 
-	post:tools/build.py
-build_type = ${env.build_type}
-build_flags = 
-	${env.build_flags}
-	-D PIO_FRAMEWORK_ARDUINO_LWIP2_LOW_MEMORY
-	;-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
+platform                = https://github.com/pioarduino/platform-espressif32/releases/download/55.03.37/platform-espressif32.zip
-;platform = https://github.com/platformio/platform-espressif32.git
-;platform_packages = 
-;  framework-arduinoespressif32 @ https://github.com/espressif/arduino-esp32.git#3.0.5
-;  framework-arduinoespressif32-libs @ https://github.com/espressif/esp32-arduino-lib-builder/releases/download/idf-release_v5.1/esp32-arduino-libs-idf-release_v5.1-33fbade6.zip
-platform = https://github.com/pioarduino/platform-espressif32/releases/download/55.03.32/platform-espressif32.zip
 platform_packages       = ${env.platform_packages}
 board_build.partitions  = esp32_partitions.csv
-lib_deps =
+lib_deps                = ${env.lib_deps}
-	${env.lib_deps}
                           laxilef/ESP32Scheduler@^1.0.1
-nimble_lib = h2zero/NimBLE-Arduino@2.3.3
+nimble_lib              = https://github.com/h2zero/NimBLE-Arduino
-lib_ignore = 
+lib_ignore              = ${env.lib_ignore}
-extra_scripts = 
+                          BluetoothSerial
+                          SimpleBLE
+                          ESP RainMaker
+                          RainMaker
+                          ESP Insights
+                          Insights
+                          Zigbee
+                          Matter
+                          OpenThread
+                          dsp
+custom_component_remove = espressif/esp_hosted
+                          espressif/esp_wifi_remote
+                          espressif/esp-dsp
+                          espressif/esp_modem
+                          espressif/esp_rainmaker
+                          espressif/rmaker_common
+                          espressif/esp_insights
+                          espressif/esp_diag_data_store
+                          espressif/esp_diagnostics
+                          espressif/libsodium
+                          espressif/esp-modbus
+                          espressif/esp-cbor
+                          espressif/esp-sr
+                          espressif/esp32-camera
+                          espressif/qrcode
+                          espressif/esp-zboss-lib
+                          espressif/esp-zigbee-lib
+                          chmorgan/esp-libhelix-mp3
+extra_scripts           = pre:tools/add_build_commit.py
                           post:tools/esp32.py
                           post:tools/build.py
 build_type              = ${env.build_type}
-build_flags = 
+build_flags             = ${env.build_flags}
-	${env.build_flags}
+                          -D MYNEWT_VAL_BLE_ROLE_CENTRAL=0
                           -D CORE_DEBUG_LEVEL=0
                           -Wl,--wrap=esp_panic_handler
 check_tool              = ${env.check_tool}
@@ -113,99 +111,11 @@ 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}
-extra_scripts = ${esp8266_defaults.extra_scripts}
-board_build.ldscript = ${esp8266_defaults.board_build.ldscript}
-build_type = ${esp8266_defaults.build_type}
-build_flags = 
-	${esp8266_defaults.build_flags}
-	-D DEFAULT_OT_IN_GPIO=4
-	-D DEFAULT_OT_OUT_GPIO=5
-	-D DEFAULT_SENSOR_OUTDOOR_GPIO=12
-	-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}
-extra_scripts = ${esp8266_defaults.extra_scripts}
-board_build.ldscript = ${esp8266_defaults.board_build.ldscript}
-build_type = ${esp8266_defaults.build_type}
-build_flags = 
-	${esp8266_defaults.build_flags}
-	-D DEFAULT_OT_IN_GPIO=4
-	-D DEFAULT_OT_OUT_GPIO=5
-	-D DEFAULT_SENSOR_OUTDOOR_GPIO=12
-	-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}
-extra_scripts = ${esp8266_defaults.extra_scripts}
-board_build.ldscript = ${esp8266_defaults.board_build.ldscript}
-build_type = ${esp8266_defaults.build_type}
-build_flags = 
-	${esp8266_defaults.build_flags}
-	-D DEFAULT_OT_IN_GPIO=4
-	-D DEFAULT_OT_OUT_GPIO=5
-	-D DEFAULT_SENSOR_OUTDOOR_GPIO=12
-	-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}
-extra_scripts = ${esp8266_defaults.extra_scripts}
-board_build.ldscript = ${esp8266_defaults.board_build.ldscript}
-build_type = ${esp8266_defaults.build_type}
-build_flags = 
-	${esp8266_defaults.build_flags}
-	-D DEFAULT_OT_IN_GPIO=13
-	-D DEFAULT_OT_OUT_GPIO=15
-	-D DEFAULT_SENSOR_OUTDOOR_GPIO=12
-	-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}
+extends                 = esp32_defaults
-platform_packages = ${esp32_defaults.platform_packages}
 board                   = lolin_s2_mini
-board_build.partitions = ${esp32_defaults.board_build.partitions}
+build_unflags           = -DARDUINO_USB_MODE=1
-lib_deps = ${esp32_defaults.lib_deps}
+build_flags             = ${esp32_defaults.build_flags}
-lib_ignore = ${esp32_defaults.lib_ignore}
-extra_scripts = ${esp32_defaults.extra_scripts}
-build_unflags =
-	-DARDUINO_USB_MODE=1
-build_type = ${esp32_defaults.build_type}
-build_flags = 
-	${esp32_defaults.build_flags}
                           -D ARDUINO_USB_MODE=0
                           -D ARDUINO_USB_CDC_ON_BOOT=1
                           -D DEFAULT_OT_IN_GPIO=33
@@ -214,27 +124,17 @@ 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}
+extends                 = esp32_defaults
-platform_packages = ${esp32_defaults.platform_packages}
 board                   = lolin_s3_mini
-board_build.partitions = ${esp32_defaults.board_build.partitions}
+lib_deps                = ${esp32_defaults.lib_deps}
-lib_deps = 
-	${esp32_defaults.lib_deps}
                           ${esp32_defaults.nimble_lib}
-lib_ignore = ${esp32_defaults.lib_ignore}
+build_unflags           = -DARDUINO_USB_MODE=1
-extra_scripts = ${esp32_defaults.extra_scripts}
+build_flags             = ${esp32_defaults.build_flags}
-build_unflags =
-	-DARDUINO_USB_MODE=1
-build_type = ${esp32_defaults.build_type}
-build_flags = 
-	${esp32_defaults.build_flags}
                           -D ARDUINO_USB_MODE=0
                           -D ARDUINO_USB_CDC_ON_BOOT=1
-	-D CONFIG_BT_NIMBLE_EXT_ADV=1
+                          -D MYNEWT_VAL_BLE_EXT_ADV=1
                           -D USE_BLE=1
                           -D DEFAULT_OT_IN_GPIO=35
                           -D DEFAULT_OT_OUT_GPIO=36
@@ -242,25 +142,15 @@ 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}
+extends                 = esp32_defaults
-platform_packages = ${esp32_defaults.platform_packages}
 board                   = lolin_c3_mini
-board_build.partitions = ${esp32_defaults.board_build.partitions}
+lib_deps                = ${esp32_defaults.lib_deps}
-lib_deps = 
-	${esp32_defaults.lib_deps}
                           ${esp32_defaults.nimble_lib}
-lib_ignore = ${esp32_defaults.lib_ignore}
+;build_unflags           = -mtext-section-literals
-extra_scripts = ${esp32_defaults.extra_scripts}
+build_flags             = ${esp32_defaults.build_flags}
-build_unflags = 
+                          -D MYNEWT_VAL_BLE_EXT_ADV=1
-	-mtext-section-literals
-build_type = ${esp32_defaults.build_type}
-build_flags = 
-	${esp32_defaults.build_flags}
-	-D CONFIG_BT_NIMBLE_EXT_ADV=1
                           -D USE_BLE=1
                           -D DEFAULT_OT_IN_GPIO=8
                           -D DEFAULT_OT_OUT_GPIO=10
@@ -268,22 +158,13 @@ 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}
+extends                 = esp32_defaults
-platform_packages = ${esp32_defaults.platform_packages}
 board                   = nodemcu-32s
-board_build.partitions = ${esp32_defaults.board_build.partitions}
+lib_deps                = ${esp32_defaults.lib_deps}
-lib_deps = 
-	${esp32_defaults.lib_deps}
                           ${esp32_defaults.nimble_lib}
-lib_ignore = ${esp32_defaults.lib_ignore}
+build_flags             = ${esp32_defaults.build_flags}
-extra_scripts = ${esp32_defaults.extra_scripts}
-build_type = ${esp32_defaults.build_type}
-build_flags = 
-	${esp32_defaults.build_flags}
                           -D USE_BLE=1
                           -D DEFAULT_OT_IN_GPIO=16
                           -D DEFAULT_OT_OUT_GPIO=4
@@ -291,26 +172,17 @@ 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}
+extends                 = esp32_defaults
-platform_packages = ${esp32_defaults.platform_packages}
 board                   = wemos_d1_mini32
-board_build.partitions = ${esp32_defaults.board_build.partitions}
+lib_deps                = ${esp32_defaults.lib_deps}
-lib_deps = 
-	${esp32_defaults.lib_deps}
                           ${esp32_defaults.nimble_lib}
-lib_ignore = ${esp32_defaults.lib_ignore}
+build_flags             = ${esp32_defaults.build_flags}
-extra_scripts = ${esp32_defaults.extra_scripts}
-build_type = ${esp32_defaults.build_type}
-build_flags = 
-	${esp32_defaults.build_flags}
                           -D USE_BLE=1
                           -D DEFAULT_OT_IN_GPIO=21
                           -D DEFAULT_OT_OUT_GPIO=22
@@ -318,29 +190,14 @@ 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}
+extends                 = esp32_defaults
-framework = arduino, espidf
+board                   = esp32-c6-devkitc-1
-platform_packages = ${esp32_defaults.platform_packages}
-board = esp32-c6-devkitm-1
-board_build.partitions = ${esp32_defaults.board_build.partitions}
-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.nimble_lib}
-	${esp32_defaults.lib_ignore}
+;build_unflags           = -mtext-section-literals
-extra_scripts = ${esp32_defaults.extra_scripts}
+build_flags             = ${esp32_defaults.build_flags}
-build_unflags = 
-	-mtext-section-literals
-build_type = ${esp32_defaults.build_type}
-build_flags = 
-	${esp32_defaults.build_flags}
                           -D USE_BLE=1
                           -D DEFAULT_OT_IN_GPIO=15
                           -D DEFAULT_OT_OUT_GPIO=23
@@ -348,32 +205,25 @@ build_flags =
                           -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}
+custom_sdkconfig        = '# CONFIG_OPENTHREAD_ENABLED is not set'
-check_flags = ${esp32_defaults.check_flags}
+                          '# CONFIG_ESP_WIFI_ENTERPRISE_SUPPORT is not set'
+                          '# CONFIG_LWIP_IPV6 is not set'
+                          '# CONFIG_LWIP_IPV6_AUTOCONFIG is not set'
+                          '# CONFIG_LWIP_PPP_SUPPORT is not set'
 
 [env:otthing]
-platform = ${esp32_defaults.platform}
+extends                 = esp32_defaults
-platform_packages = ${esp32_defaults.platform_packages}
 board                   = lolin_c3_mini
-board_build.partitions = ${esp32_defaults.board_build.partitions}
+lib_deps                = ${esp32_defaults.lib_deps}
-lib_deps = 
-	${esp32_defaults.lib_deps}
                           ${esp32_defaults.nimble_lib}
-lib_ignore = ${esp32_defaults.lib_ignore}
+;build_unflags           = -mtext-section-literals
-extra_scripts = ${esp32_defaults.extra_scripts}
+build_flags             = ${esp32_defaults.build_flags}
-build_unflags = 
+                          -D MYNEWT_VAL_BLE_EXT_ADV=1
-	-mtext-section-literals
-build_type = ${esp32_defaults.build_type}
-build_flags = 
-	${esp32_defaults.build_flags}
-	-D CONFIG_BT_NIMBLE_EXT_ADV=1
                           -D USE_BLE=1
                           -D DEFAULT_OT_IN_GPIO=3
                           -D DEFAULT_OT_OUT_GPIO=1
-;	-D DEFAULT_SENSOR_OUTDOOR_GPIO=0
+                          ;-D DEFAULT_SENSOR_OUTDOOR_GPIO=0
-;	-D DEFAULT_SENSOR_INDOOR_GPIO=1
+                          ;-D DEFAULT_SENSOR_INDOOR_GPIO=1
                           -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}

sdkconfig.defaults

@@ -1,33 +0,0 @@
-# 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

secrets.default.ini

@@ -3,8 +3,7 @@ build_type = release
 
 serial_enabled = true
 serial_baud = 115200
-telnet_enabled = true
+webserial_enabled = true
-telnet_port = 23
 log_level = 5
 hostname = opentherm
 

src/HaHelper.h

@@ -176,9 +176,10 @@ public:
       objId.c_str()
     );
 
-    // set device class, name, value template for bluetooth sensors
+    // set device class, name, value template for Bluetooth/DHT sensors
     // or name & value template for another sensors
-    if (sSensor.type == Sensors::Type::BLUETOOTH) {
+    if (sSensor.type == Sensors::Type::BLUETOOTH ||
+        sSensor.type == Sensors::Type::DHT11 || sSensor.type == Sensors::Type::DHT22) {
       // available state topic
       doc[FPSTR(HA_AVAILABILITY)][1][FPSTR(HA_TOPIC)] = doc[FPSTR(HA_STATE_TOPIC)];
       doc[FPSTR(HA_AVAILABILITY)][1][FPSTR(HA_VALUE_TEMPLATE)] = JsonString(AVAILABILITY_SENSOR_CONN, true);
@@ -261,8 +262,13 @@ public:
     }
 
     // object id's
-    doc[FPSTR(HA_UNIQUE_ID)] = this->getObjectIdWithPrefix(objId.c_str());
+    doc[FPSTR(HA_UNIQUE_ID)] = this->getUniqueIdWithPrefix(objId.c_str());
-    doc[FPSTR(HA_DEFAULT_ENTITY_ID)] = doc[FPSTR(HA_UNIQUE_ID)];
+    doc[FPSTR(HA_DEFAULT_ENTITY_ID)] = this->getEntityIdWithPrefix(
+      sSensor.type == Sensors::Type::MANUAL 
+        ? FPSTR(HA_ENTITY_NUMBER) 
+        : FPSTR(HA_ENTITY_SENSOR),
+      objId.c_str()
+    );
 
     const String& configTopic = this->makeConfigTopic(
       sSensor.type == Sensors::Type::MANUAL ? FPSTR(HA_ENTITY_NUMBER) : FPSTR(HA_ENTITY_SENSOR),
@@ -323,8 +329,8 @@ public:
     String objId = Sensors::makeObjectIdWithSuffix(sSensor.name, F("connected"));
 
     // object id's
-    doc[FPSTR(HA_UNIQUE_ID)] = this->getObjectIdWithPrefix(objId.c_str());
+    doc[FPSTR(HA_UNIQUE_ID)] = this->getUniqueIdWithPrefix(objId.c_str());
-    doc[FPSTR(HA_DEFAULT_ENTITY_ID)] = doc[FPSTR(HA_UNIQUE_ID)];
+    doc[FPSTR(HA_DEFAULT_ENTITY_ID)] = this->getEntityIdWithPrefix(FPSTR(HA_ENTITY_BINARY_SENSOR), objId.c_str());
 
     // state topic
     doc[FPSTR(HA_STATE_TOPIC)] = this->getDeviceTopic(
@@ -370,8 +376,8 @@ public:
     String objId = Sensors::makeObjectIdWithSuffix(sSensor.name, F("signal_quality"));
 
     // object id's
-    doc[FPSTR(HA_UNIQUE_ID)] = this->getObjectIdWithPrefix(objId.c_str());
+    doc[FPSTR(HA_UNIQUE_ID)] = this->getUniqueIdWithPrefix(objId.c_str());
-    doc[FPSTR(HA_DEFAULT_ENTITY_ID)] = doc[FPSTR(HA_UNIQUE_ID)];
+    doc[FPSTR(HA_DEFAULT_ENTITY_ID)] = this->getEntityIdWithPrefix(FPSTR(HA_ENTITY_SENSOR), objId.c_str());
 
     // state topic
     doc[FPSTR(HA_STATE_TOPIC)] = this->getDeviceTopic(
@@ -407,7 +413,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 +426,8 @@ public:
     JsonDocument doc;
     doc[FPSTR(HA_AVAILABILITY)][FPSTR(HA_TOPIC)] = this->statusTopic.c_str();
     doc[FPSTR(HA_ENABLED_BY_DEFAULT)] = enabledByDefault;
-    doc[FPSTR(HA_UNIQUE_ID)] = this->getObjectIdWithPrefix(F("heating_turbo"));
+    doc[FPSTR(HA_UNIQUE_ID)] = this->getUniqueIdWithPrefix(F("heating_turbo"));
-    doc[FPSTR(HA_DEFAULT_ENTITY_ID)] = doc[FPSTR(HA_UNIQUE_ID)];
+    doc[FPSTR(HA_DEFAULT_ENTITY_ID)] = this->getEntityIdWithPrefix(FPSTR(HA_ENTITY_SWITCH), F("heating_turbo"));
     doc[FPSTR(HA_ENTITY_CATEGORY)] = FPSTR(HA_ENTITY_CATEGORY_CONFIG);
     doc[FPSTR(HA_NAME)] = F("Turbo heating");
     doc[FPSTR(HA_ICON)] = F("mdi:rocket-launch-outline");
@@ -439,12 +444,34 @@ public:
     return this->publish(this->makeConfigTopic(FPSTR(HA_ENTITY_SWITCH), F("heating_turbo")).c_str(), doc);
   }
 
+  bool publishSwitchHeatingHysteresis(bool enabledByDefault = true) {
+    JsonDocument doc;
+    doc[FPSTR(HA_AVAILABILITY)][FPSTR(HA_TOPIC)] = this->statusTopic.c_str();
+    doc[FPSTR(HA_ENABLED_BY_DEFAULT)] = enabledByDefault;
+    doc[FPSTR(HA_UNIQUE_ID)] = this->getUniqueIdWithPrefix(F("heating_hysteresis"));
+    doc[FPSTR(HA_DEFAULT_ENTITY_ID)] = this->getEntityIdWithPrefix(FPSTR(HA_ENTITY_SWITCH), F("heating_hysteresis"));
+    doc[FPSTR(HA_ENTITY_CATEGORY)] = FPSTR(HA_ENTITY_CATEGORY_CONFIG);
+    doc[FPSTR(HA_NAME)] = F("Use heating hysteresis");
+    doc[FPSTR(HA_ICON)] = F("mdi:altimeter");
+    doc[FPSTR(HA_STATE_TOPIC)] = this->settingsTopic.c_str();
+    doc[FPSTR(HA_STATE_ON)] = true;
+    doc[FPSTR(HA_STATE_OFF)] = false;
+    doc[FPSTR(HA_VALUE_TEMPLATE)] = F("{{ value_json.heating.hysteresis.enabled }}");
+    doc[FPSTR(HA_COMMAND_TOPIC)] = this->setSettingsTopic.c_str();
+    doc[FPSTR(HA_PAYLOAD_ON)] = F("{\"heating\": {\"hysteresis\" : {\"enabled\" : true}}}");
+    doc[FPSTR(HA_PAYLOAD_OFF)] = F("{\"heating\": {\"hysteresis\" : {\"enabled\" : false}}}");
+    doc[FPSTR(HA_EXPIRE_AFTER)] = this->expireAfter;
+    doc.shrinkToFit();
+
+    return this->publish(this->makeConfigTopic(FPSTR(HA_ENTITY_SWITCH), F("heating_hysteresis")).c_str(), doc);
+  }
+
   bool publishInputHeatingHysteresis(UnitSystem unit = UnitSystem::METRIC, bool enabledByDefault = true) {
     JsonDocument doc;
     doc[FPSTR(HA_AVAILABILITY)][FPSTR(HA_TOPIC)] = this->statusTopic.c_str();
     doc[FPSTR(HA_ENABLED_BY_DEFAULT)] = enabledByDefault;
-    doc[FPSTR(HA_UNIQUE_ID)] = this->getObjectIdWithPrefix(F("heating_hysteresis"));
+    doc[FPSTR(HA_UNIQUE_ID)] = this->getUniqueIdWithPrefix(F("heating_hysteresis"));
-    doc[FPSTR(HA_DEFAULT_ENTITY_ID)] = doc[FPSTR(HA_UNIQUE_ID)];
+    doc[FPSTR(HA_DEFAULT_ENTITY_ID)] = this->getEntityIdWithPrefix(FPSTR(HA_ENTITY_NUMBER), F("heating_hysteresis"));
     doc[FPSTR(HA_ENTITY_CATEGORY)] = FPSTR(HA_ENTITY_CATEGORY_CONFIG);
     doc[FPSTR(HA_DEVICE_CLASS)] = FPSTR(S_TEMPERATURE);
 
@@ -458,9 +485,9 @@ public:
     doc[FPSTR(HA_NAME)] = F("Heating hysteresis");
     doc[FPSTR(HA_ICON)] = F("mdi:altimeter");
     doc[FPSTR(HA_STATE_TOPIC)] = this->settingsTopic.c_str();
-    doc[FPSTR(HA_VALUE_TEMPLATE)] = F("{{ value_json.heating.hysteresis|float(0)|round(2) }}");
+    doc[FPSTR(HA_VALUE_TEMPLATE)] = F("{{ value_json.heating.hysteresis.value|float(0)|round(2) }}");
     doc[FPSTR(HA_COMMAND_TOPIC)] = this->setSettingsTopic.c_str();
-    doc[FPSTR(HA_COMMAND_TEMPLATE)] = F("{\"heating\": {\"hysteresis\" : {{ value }}}}");
+    doc[FPSTR(HA_COMMAND_TEMPLATE)] = F("{\"heating\": {\"hysteresis\" : {\"value\" : {{ value }}}}}");
     doc[FPSTR(HA_MIN)] = 0;
     doc[FPSTR(HA_MAX)] = 15;
     doc[FPSTR(HA_STEP)] = 0.01f;
@@ -475,8 +502,8 @@ public:
     JsonDocument doc;
     doc[FPSTR(HA_AVAILABILITY)][FPSTR(HA_TOPIC)] = this->statusTopic.c_str();
     doc[FPSTR(HA_ENABLED_BY_DEFAULT)] = enabledByDefault;
-    doc[FPSTR(HA_UNIQUE_ID)] = this->getObjectIdWithPrefix(F("heating_turbo_factor"));
+    doc[FPSTR(HA_UNIQUE_ID)] = this->getUniqueIdWithPrefix(F("heating_turbo_factor"));
-    doc[FPSTR(HA_DEFAULT_ENTITY_ID)] = doc[FPSTR(HA_UNIQUE_ID)];
+    doc[FPSTR(HA_DEFAULT_ENTITY_ID)] = this->getEntityIdWithPrefix(FPSTR(HA_ENTITY_NUMBER), F("heating_turbo_factor"));
     doc[FPSTR(HA_ENTITY_CATEGORY)] = FPSTR(HA_ENTITY_CATEGORY_CONFIG);
     doc[FPSTR(HA_DEVICE_CLASS)] = F("power_factor");
     doc[FPSTR(HA_NAME)] = F("Heating turbo factor");
@@ -499,8 +526,8 @@ public:
     JsonDocument doc;
     doc[FPSTR(HA_AVAILABILITY)][FPSTR(HA_TOPIC)] = this->statusTopic.c_str();
     doc[FPSTR(HA_ENABLED_BY_DEFAULT)] = enabledByDefault;
-    doc[FPSTR(HA_UNIQUE_ID)] = this->getObjectIdWithPrefix(F("heating_min_temp"));
+    doc[FPSTR(HA_UNIQUE_ID)] = this->getUniqueIdWithPrefix(F("heating_min_temp"));
-    doc[FPSTR(HA_DEFAULT_ENTITY_ID)] = doc[FPSTR(HA_UNIQUE_ID)];
+    doc[FPSTR(HA_DEFAULT_ENTITY_ID)] = this->getEntityIdWithPrefix(FPSTR(HA_ENTITY_NUMBER), F("heating_min_temp"));
     doc[FPSTR(HA_ENTITY_CATEGORY)] = FPSTR(HA_ENTITY_CATEGORY_CONFIG);
     doc[FPSTR(HA_DEVICE_CLASS)] = FPSTR(S_TEMPERATURE);
 
@@ -533,8 +560,8 @@ public:
     JsonDocument doc;
     doc[FPSTR(HA_AVAILABILITY)][FPSTR(HA_TOPIC)] = this->statusTopic.c_str();
     doc[FPSTR(HA_ENABLED_BY_DEFAULT)] = enabledByDefault;
-    doc[FPSTR(HA_UNIQUE_ID)] = this->getObjectIdWithPrefix(F("heating_max_temp"));
+    doc[FPSTR(HA_UNIQUE_ID)] = this->getUniqueIdWithPrefix(F("heating_max_temp"));
-    doc[FPSTR(HA_DEFAULT_ENTITY_ID)] = doc[FPSTR(HA_UNIQUE_ID)];
+    doc[FPSTR(HA_DEFAULT_ENTITY_ID)] = this->getEntityIdWithPrefix(FPSTR(HA_ENTITY_NUMBER), F("heating_max_temp"));
     doc[FPSTR(HA_ENTITY_CATEGORY)] = FPSTR(HA_ENTITY_CATEGORY_CONFIG);
     doc[FPSTR(HA_DEVICE_CLASS)] = FPSTR(S_TEMPERATURE);
 
@@ -568,8 +595,8 @@ public:
     JsonDocument doc;
     doc[FPSTR(HA_AVAILABILITY)][FPSTR(HA_TOPIC)] = this->statusTopic.c_str();
     doc[FPSTR(HA_ENABLED_BY_DEFAULT)] = enabledByDefault;
-    doc[FPSTR(HA_UNIQUE_ID)] = this->getObjectIdWithPrefix(F("dhw_min_temp"));
+    doc[FPSTR(HA_UNIQUE_ID)] = this->getUniqueIdWithPrefix(F("dhw_min_temp"));
-    doc[FPSTR(HA_DEFAULT_ENTITY_ID)] = doc[FPSTR(HA_UNIQUE_ID)];
+    doc[FPSTR(HA_DEFAULT_ENTITY_ID)] = this->getEntityIdWithPrefix(FPSTR(HA_ENTITY_NUMBER), F("dhw_min_temp"));
     doc[FPSTR(HA_ENTITY_CATEGORY)] = FPSTR(HA_ENTITY_CATEGORY_CONFIG);
     doc[FPSTR(HA_DEVICE_CLASS)] = FPSTR(S_TEMPERATURE);
 
@@ -602,8 +629,8 @@ public:
     JsonDocument doc;
     doc[FPSTR(HA_AVAILABILITY)][FPSTR(HA_TOPIC)] = this->statusTopic.c_str();
     doc[FPSTR(HA_ENABLED_BY_DEFAULT)] = enabledByDefault;
-    doc[FPSTR(HA_UNIQUE_ID)] = this->getObjectIdWithPrefix(F("dhw_max_temp"));
+    doc[FPSTR(HA_UNIQUE_ID)] = this->getUniqueIdWithPrefix(F("dhw_max_temp"));
-    doc[FPSTR(HA_DEFAULT_ENTITY_ID)] = doc[FPSTR(HA_UNIQUE_ID)];
+    doc[FPSTR(HA_DEFAULT_ENTITY_ID)] = this->getEntityIdWithPrefix(FPSTR(HA_ENTITY_NUMBER), F("dhw_max_temp"));
     doc[FPSTR(HA_ENTITY_CATEGORY)] = FPSTR(HA_ENTITY_CATEGORY_CONFIG);
     doc[FPSTR(HA_DEVICE_CLASS)] = FPSTR(S_TEMPERATURE);
 
@@ -637,8 +664,8 @@ public:
     JsonDocument doc;
     doc[FPSTR(HA_AVAILABILITY)][FPSTR(HA_TOPIC)] = this->statusTopic.c_str();
     doc[FPSTR(HA_ENABLED_BY_DEFAULT)] = enabledByDefault;
-    doc[FPSTR(HA_UNIQUE_ID)] = this->getObjectIdWithPrefix(F("pid"));
+    doc[FPSTR(HA_UNIQUE_ID)] = this->getUniqueIdWithPrefix(F("pid"));
-    doc[FPSTR(HA_DEFAULT_ENTITY_ID)] = doc[FPSTR(HA_UNIQUE_ID)];
+    doc[FPSTR(HA_DEFAULT_ENTITY_ID)] = this->getEntityIdWithPrefix(FPSTR(HA_ENTITY_SWITCH), F("pid"));
     doc[FPSTR(HA_ENTITY_CATEGORY)] = FPSTR(HA_ENTITY_CATEGORY_CONFIG);
     doc[FPSTR(HA_NAME)] = F("PID");
     doc[FPSTR(HA_ICON)] = F("mdi:chart-bar-stacked");
@@ -659,8 +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_p"));
+    doc[FPSTR(HA_UNIQUE_ID)] = this->getUniqueIdWithPrefix(F("pid_p"));
-    doc[FPSTR(HA_DEFAULT_ENTITY_ID)] = doc[FPSTR(HA_UNIQUE_ID)];
+    doc[FPSTR(HA_DEFAULT_ENTITY_ID)] = this->getEntityIdWithPrefix(FPSTR(HA_ENTITY_NUMBER), F("pid_p"));
     doc[FPSTR(HA_ENTITY_CATEGORY)] = FPSTR(HA_ENTITY_CATEGORY_CONFIG);
     doc[FPSTR(HA_NAME)] = F("PID factor P");
     doc[FPSTR(HA_ICON)] = F("mdi:alpha-p-circle-outline");
@@ -682,8 +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_i"));
+    doc[FPSTR(HA_UNIQUE_ID)] = this->getUniqueIdWithPrefix(F("pid_i"));
-    doc[FPSTR(HA_DEFAULT_ENTITY_ID)] = doc[FPSTR(HA_UNIQUE_ID)];
+    doc[FPSTR(HA_DEFAULT_ENTITY_ID)] = this->getEntityIdWithPrefix(FPSTR(HA_ENTITY_NUMBER), F("pid_i"));
     doc[FPSTR(HA_ENTITY_CATEGORY)] = FPSTR(HA_ENTITY_CATEGORY_CONFIG);
     doc[FPSTR(HA_NAME)] = F("PID factor I");
     doc[FPSTR(HA_ICON)] = F("mdi:alpha-i-circle-outline");
@@ -705,8 +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_d"));
+    doc[FPSTR(HA_UNIQUE_ID)] = this->getUniqueIdWithPrefix(F("pid_d"));
-    doc[FPSTR(HA_DEFAULT_ENTITY_ID)] = doc[FPSTR(HA_UNIQUE_ID)];
+    doc[FPSTR(HA_DEFAULT_ENTITY_ID)] = this->getEntityIdWithPrefix(FPSTR(HA_ENTITY_NUMBER), F("pid_d"));
     doc[FPSTR(HA_ENTITY_CATEGORY)] = FPSTR(HA_ENTITY_CATEGORY_CONFIG);
     doc[FPSTR(HA_NAME)] = F("PID factor D");
     doc[FPSTR(HA_ICON)] = F("mdi:alpha-d-circle-outline");
@@ -728,8 +755,8 @@ public:
     JsonDocument doc;
     doc[FPSTR(HA_AVAILABILITY)][FPSTR(HA_TOPIC)] = this->statusTopic.c_str();
     doc[FPSTR(HA_ENABLED_BY_DEFAULT)] = enabledByDefault;
-    doc[FPSTR(HA_UNIQUE_ID)] = this->getObjectIdWithPrefix(F("pid_dt"));
+    doc[FPSTR(HA_UNIQUE_ID)] = this->getUniqueIdWithPrefix(F("pid_dt"));
-    doc[FPSTR(HA_DEFAULT_ENTITY_ID)] = doc[FPSTR(HA_UNIQUE_ID)];
+    doc[FPSTR(HA_DEFAULT_ENTITY_ID)] = this->getEntityIdWithPrefix(FPSTR(HA_ENTITY_NUMBER), F("pid_dt"));
     doc[FPSTR(HA_ENTITY_CATEGORY)] = FPSTR(HA_ENTITY_CATEGORY_CONFIG);
     doc[FPSTR(HA_DEVICE_CLASS)] = F("duration");
     doc[FPSTR(HA_UNIT_OF_MEASUREMENT)] = F("s");
@@ -753,8 +780,8 @@ public:
     JsonDocument doc;
     doc[FPSTR(HA_AVAILABILITY)][FPSTR(HA_TOPIC)] = this->statusTopic.c_str();
     doc[FPSTR(HA_ENABLED_BY_DEFAULT)] = enabledByDefault;
-    doc[FPSTR(HA_UNIQUE_ID)] = this->getObjectIdWithPrefix(F("pid_min_temp"));
+    doc[FPSTR(HA_UNIQUE_ID)] = this->getUniqueIdWithPrefix(F("pid_min_temp"));
-    doc[FPSTR(HA_DEFAULT_ENTITY_ID)] = doc[FPSTR(HA_UNIQUE_ID)];
+    doc[FPSTR(HA_DEFAULT_ENTITY_ID)] = this->getEntityIdWithPrefix(FPSTR(HA_ENTITY_NUMBER), F("pid_min_temp"));
     doc[FPSTR(HA_ENTITY_CATEGORY)] = FPSTR(HA_ENTITY_CATEGORY_CONFIG);
     doc[FPSTR(HA_DEVICE_CLASS)] = FPSTR(S_TEMPERATURE);
 
@@ -787,8 +814,8 @@ public:
     JsonDocument doc;
     doc[FPSTR(HA_AVAILABILITY)][FPSTR(HA_TOPIC)] = this->statusTopic.c_str();
     doc[FPSTR(HA_ENABLED_BY_DEFAULT)] = enabledByDefault;
-    doc[FPSTR(HA_UNIQUE_ID)] = this->getObjectIdWithPrefix(F("pid_max_temp"));
+    doc[FPSTR(HA_UNIQUE_ID)] = this->getUniqueIdWithPrefix(F("pid_max_temp"));
-    doc[FPSTR(HA_DEFAULT_ENTITY_ID)] = doc[FPSTR(HA_UNIQUE_ID)];
+    doc[FPSTR(HA_DEFAULT_ENTITY_ID)] = this->getEntityIdWithPrefix(FPSTR(HA_ENTITY_NUMBER), F("pid_max_temp"));
     doc[FPSTR(HA_ENTITY_CATEGORY)] = FPSTR(HA_ENTITY_CATEGORY_CONFIG);
     doc[FPSTR(HA_DEVICE_CLASS)] = FPSTR(S_TEMPERATURE);
 
@@ -822,8 +849,8 @@ public:
     JsonDocument doc;
     doc[FPSTR(HA_AVAILABILITY)][FPSTR(HA_TOPIC)] = this->statusTopic.c_str();
     doc[FPSTR(HA_ENABLED_BY_DEFAULT)] = enabledByDefault;
-    doc[FPSTR(HA_UNIQUE_ID)] = this->getObjectIdWithPrefix(F("equitherm"));
+    doc[FPSTR(HA_UNIQUE_ID)] = this->getUniqueIdWithPrefix(F("equitherm"));
-    doc[FPSTR(HA_DEFAULT_ENTITY_ID)] = doc[FPSTR(HA_UNIQUE_ID)];
+    doc[FPSTR(HA_DEFAULT_ENTITY_ID)] = this->getEntityIdWithPrefix(FPSTR(HA_ENTITY_SWITCH), F("equitherm"));
     doc[FPSTR(HA_ENTITY_CATEGORY)] = FPSTR(HA_ENTITY_CATEGORY_CONFIG);
     doc[FPSTR(HA_NAME)] = F("Equitherm");
     doc[FPSTR(HA_ICON)] = F("mdi:sun-snowflake-variant");
@@ -844,8 +871,8 @@ public:
     JsonDocument doc;
     doc[FPSTR(HA_AVAILABILITY)][FPSTR(HA_TOPIC)] = this->statusTopic.c_str();
     doc[FPSTR(HA_ENABLED_BY_DEFAULT)] = enabledByDefault;
-    doc[FPSTR(HA_UNIQUE_ID)] = this->getObjectIdWithPrefix(F("equitherm_slope"));
+    doc[FPSTR(HA_UNIQUE_ID)] = this->getUniqueIdWithPrefix(F("equitherm_slope"));
-    doc[FPSTR(HA_DEFAULT_ENTITY_ID)] = doc[FPSTR(HA_UNIQUE_ID)];
+    doc[FPSTR(HA_DEFAULT_ENTITY_ID)] = this->getEntityIdWithPrefix(FPSTR(HA_ENTITY_NUMBER), F("equitherm_slope"));
     doc[FPSTR(HA_ENTITY_CATEGORY)] = FPSTR(HA_ENTITY_CATEGORY_CONFIG);
     doc[FPSTR(HA_NAME)] = F("Equitherm slope");
     doc[FPSTR(HA_ICON)] = F("mdi:slope-uphill");
@@ -867,8 +894,8 @@ public:
     JsonDocument doc;
     doc[FPSTR(HA_AVAILABILITY)][FPSTR(HA_TOPIC)] = this->statusTopic.c_str();
     doc[FPSTR(HA_ENABLED_BY_DEFAULT)] = enabledByDefault;
-    doc[FPSTR(HA_UNIQUE_ID)] = this->getObjectIdWithPrefix(F("equitherm_exponent"));
+    doc[FPSTR(HA_UNIQUE_ID)] = this->getUniqueIdWithPrefix(F("equitherm_exponent"));
-    doc[FPSTR(HA_DEFAULT_ENTITY_ID)] = doc[FPSTR(HA_UNIQUE_ID)];
+    doc[FPSTR(HA_DEFAULT_ENTITY_ID)] = this->getEntityIdWithPrefix(FPSTR(HA_ENTITY_NUMBER), F("equitherm_exponent"));
     doc[FPSTR(HA_ENTITY_CATEGORY)] = FPSTR(HA_ENTITY_CATEGORY_CONFIG);
     doc[FPSTR(HA_NAME)] = F("Equitherm exponent");
     doc[FPSTR(HA_ICON)] = F("mdi:exponent");
@@ -890,8 +917,8 @@ public:
     JsonDocument doc;
     doc[FPSTR(HA_AVAILABILITY)][FPSTR(HA_TOPIC)] = this->statusTopic.c_str();
     doc[FPSTR(HA_ENABLED_BY_DEFAULT)] = enabledByDefault;
-    doc[FPSTR(HA_UNIQUE_ID)] = this->getObjectIdWithPrefix(F("equitherm_shift"));
+    doc[FPSTR(HA_UNIQUE_ID)] = this->getUniqueIdWithPrefix(F("equitherm_shift"));
-    doc[FPSTR(HA_DEFAULT_ENTITY_ID)] = doc[FPSTR(HA_UNIQUE_ID)];
+    doc[FPSTR(HA_DEFAULT_ENTITY_ID)] = this->getEntityIdWithPrefix(FPSTR(HA_ENTITY_NUMBER), F("equitherm_shift"));
     doc[FPSTR(HA_ENTITY_CATEGORY)] = FPSTR(HA_ENTITY_CATEGORY_CONFIG);
     doc[FPSTR(HA_DEVICE_CLASS)] = FPSTR(S_TEMPERATURE);
     doc[FPSTR(HA_NAME)] = F("Equitherm shift");
@@ -917,8 +944,8 @@ public:
     doc[FPSTR(HA_AVAILABILITY)][1][FPSTR(HA_VALUE_TEMPLATE)] = F("{{ iif(value_json.pid.enabled, 'offline', 'online') }}");
     doc[FPSTR(HA_AVAILABILITY_MODE)] = F("all");
     doc[FPSTR(HA_ENABLED_BY_DEFAULT)] = enabledByDefault;
-    doc[FPSTR(HA_UNIQUE_ID)] = this->getObjectIdWithPrefix(F("equitherm_target_diff_factor"));
+    doc[FPSTR(HA_UNIQUE_ID)] = this->getUniqueIdWithPrefix(F("equitherm_target_diff_factor"));
-    doc[FPSTR(HA_DEFAULT_ENTITY_ID)] = doc[FPSTR(HA_UNIQUE_ID)];
+    doc[FPSTR(HA_DEFAULT_ENTITY_ID)] = this->getEntityIdWithPrefix(FPSTR(HA_ENTITY_NUMBER), F("equitherm_target_diff_factor"));
     doc[FPSTR(HA_ENTITY_CATEGORY)] = FPSTR(HA_ENTITY_CATEGORY_CONFIG);
     doc[FPSTR(HA_NAME)] = F("Equitherm target diff factor");
     doc[FPSTR(HA_ICON)] = F("mdi:chart-timeline-variant-shimmer");
@@ -940,8 +967,8 @@ public:
   bool publishStatusState(bool enabledByDefault = true) {
     JsonDocument doc;
     doc[FPSTR(HA_ENABLED_BY_DEFAULT)] = enabledByDefault;
-    doc[FPSTR(HA_UNIQUE_ID)] = this->getObjectIdWithPrefix(F("status"));
+    doc[FPSTR(HA_UNIQUE_ID)] = this->getUniqueIdWithPrefix(F("status"));
-    doc[FPSTR(HA_DEFAULT_ENTITY_ID)] = doc[FPSTR(HA_UNIQUE_ID)];
+    doc[FPSTR(HA_DEFAULT_ENTITY_ID)] = this->getEntityIdWithPrefix(FPSTR(HA_ENTITY_BINARY_SENSOR), F("status"));
     doc[FPSTR(HA_ENTITY_CATEGORY)] = FPSTR(HA_ENTITY_CATEGORY_DIAGNOSTIC);
     doc[FPSTR(HA_DEVICE_CLASS)] = F("problem");
     doc[FPSTR(HA_NAME)] = F("Status");
@@ -958,8 +985,8 @@ public:
     JsonDocument doc;
     doc[FPSTR(HA_AVAILABILITY)][FPSTR(HA_TOPIC)] = this->statusTopic.c_str();
     doc[FPSTR(HA_ENABLED_BY_DEFAULT)] = enabledByDefault;
-    doc[FPSTR(HA_UNIQUE_ID)] = this->getObjectIdWithPrefix(F("emergency"));
+    doc[FPSTR(HA_UNIQUE_ID)] = this->getUniqueIdWithPrefix(F("emergency"));
-    doc[FPSTR(HA_DEFAULT_ENTITY_ID)] = doc[FPSTR(HA_UNIQUE_ID)];
+    doc[FPSTR(HA_DEFAULT_ENTITY_ID)] = this->getEntityIdWithPrefix(FPSTR(HA_ENTITY_BINARY_SENSOR), F("emergency"));
     doc[FPSTR(HA_ENTITY_CATEGORY)] = FPSTR(HA_ENTITY_CATEGORY_DIAGNOSTIC);
     doc[FPSTR(HA_DEVICE_CLASS)] = F("problem");
     doc[FPSTR(HA_NAME)] = F("Emergency");
@@ -976,8 +1003,8 @@ public:
     JsonDocument doc;
     doc[FPSTR(HA_AVAILABILITY)][FPSTR(HA_TOPIC)] = this->statusTopic.c_str();
     doc[FPSTR(HA_ENABLED_BY_DEFAULT)] = enabledByDefault;
-    doc[FPSTR(HA_UNIQUE_ID)] = this->getObjectIdWithPrefix(F("ot_status"));
+    doc[FPSTR(HA_UNIQUE_ID)] = this->getUniqueIdWithPrefix(F("ot_status"));
-    doc[FPSTR(HA_DEFAULT_ENTITY_ID)] = doc[FPSTR(HA_UNIQUE_ID)];
+    doc[FPSTR(HA_DEFAULT_ENTITY_ID)] = this->getEntityIdWithPrefix(FPSTR(HA_ENTITY_BINARY_SENSOR), F("ot_status"));
     doc[FPSTR(HA_ENTITY_CATEGORY)] = FPSTR(HA_ENTITY_CATEGORY_DIAGNOSTIC);
     doc[FPSTR(HA_DEVICE_CLASS)] = F("connectivity");
     doc[FPSTR(HA_NAME)] = F("Opentherm status");
@@ -997,9 +1024,8 @@ public:
     doc[FPSTR(HA_AVAILABILITY)][1][FPSTR(HA_VALUE_TEMPLATE)] = JsonString(AVAILABILITY_OT_CONN, true);
     doc[FPSTR(HA_AVAILABILITY_MODE)] = F("all");
     doc[FPSTR(HA_ENABLED_BY_DEFAULT)] = enabledByDefault;
-    doc[FPSTR(HA_UNIQUE_ID)] = this->getObjectIdWithPrefix(F("heating"));
+    doc[FPSTR(HA_UNIQUE_ID)] = this->getUniqueIdWithPrefix(F("heating"));
-    doc[FPSTR(HA_DEFAULT_ENTITY_ID)] = doc[FPSTR(HA_UNIQUE_ID)];
+    doc[FPSTR(HA_DEFAULT_ENTITY_ID)] = this->getEntityIdWithPrefix(FPSTR(HA_ENTITY_BINARY_SENSOR), F("heating"));
-    //doc[FPSTR(HA_ENTITY_CATEGORY)] = FPSTR(HA_ENTITY_CATEGORY_DIAGNOSTIC);
     doc[FPSTR(HA_DEVICE_CLASS)] = F("running");
     doc[FPSTR(HA_NAME)] = F("Heating");
     doc[FPSTR(HA_ICON)] = F("mdi:radiator");
@@ -1018,9 +1044,8 @@ public:
     doc[FPSTR(HA_AVAILABILITY)][1][FPSTR(HA_VALUE_TEMPLATE)] = JsonString(AVAILABILITY_OT_CONN, true);
     doc[FPSTR(HA_AVAILABILITY_MODE)] = F("all");
     doc[FPSTR(HA_ENABLED_BY_DEFAULT)] = enabledByDefault;
-    doc[FPSTR(HA_UNIQUE_ID)] = this->getObjectIdWithPrefix(F("dhw"));
+    doc[FPSTR(HA_UNIQUE_ID)] = this->getUniqueIdWithPrefix(F("dhw"));
-    doc[FPSTR(HA_DEFAULT_ENTITY_ID)] = doc[FPSTR(HA_UNIQUE_ID)];
+    doc[FPSTR(HA_DEFAULT_ENTITY_ID)] = this->getEntityIdWithPrefix(FPSTR(HA_ENTITY_BINARY_SENSOR), F("dhw"));
-    //doc[FPSTR(HA_ENTITY_CATEGORY)] = FPSTR(HA_ENTITY_CATEGORY_DIAGNOSTIC);
     doc[FPSTR(HA_DEVICE_CLASS)] = F("running");
     doc[FPSTR(HA_NAME)] = F("DHW");
     doc[FPSTR(HA_ICON)] = F("mdi:faucet");
@@ -1039,9 +1064,8 @@ public:
     doc[FPSTR(HA_AVAILABILITY)][1][FPSTR(HA_VALUE_TEMPLATE)] = JsonString(AVAILABILITY_OT_CONN, true);
     doc[FPSTR(HA_AVAILABILITY_MODE)] = F("all");
     doc[FPSTR(HA_ENABLED_BY_DEFAULT)] = enabledByDefault;
-    doc[FPSTR(HA_UNIQUE_ID)] = this->getObjectIdWithPrefix(F("flame"));
+    doc[FPSTR(HA_UNIQUE_ID)] = this->getUniqueIdWithPrefix(F("flame"));
-    doc[FPSTR(HA_DEFAULT_ENTITY_ID)] = doc[FPSTR(HA_UNIQUE_ID)];
+    doc[FPSTR(HA_DEFAULT_ENTITY_ID)] = this->getEntityIdWithPrefix(FPSTR(HA_ENTITY_BINARY_SENSOR), F("flame"));
-    //doc[FPSTR(HA_ENTITY_CATEGORY)] = FPSTR(HA_ENTITY_CATEGORY_DIAGNOSTIC);
     doc[FPSTR(HA_DEVICE_CLASS)] = F("running");
     doc[FPSTR(HA_NAME)] = F("Flame");
     doc[FPSTR(HA_ICON)] = F("mdi:gas-burner");
@@ -1060,8 +1084,8 @@ public:
     doc[FPSTR(HA_AVAILABILITY)][1][FPSTR(HA_VALUE_TEMPLATE)] = JsonString(AVAILABILITY_OT_CONN, true);
     doc[FPSTR(HA_AVAILABILITY_MODE)] = F("all");
     doc[FPSTR(HA_ENABLED_BY_DEFAULT)] = enabledByDefault;
-    doc[FPSTR(HA_UNIQUE_ID)] = this->getObjectIdWithPrefix(F("fault"));
+    doc[FPSTR(HA_UNIQUE_ID)] = this->getUniqueIdWithPrefix(F("fault"));
-    doc[FPSTR(HA_DEFAULT_ENTITY_ID)] = doc[FPSTR(HA_UNIQUE_ID)];
+    doc[FPSTR(HA_DEFAULT_ENTITY_ID)] = this->getEntityIdWithPrefix(FPSTR(HA_ENTITY_BINARY_SENSOR), F("fault"));
     doc[FPSTR(HA_ENTITY_CATEGORY)] = FPSTR(HA_ENTITY_CATEGORY_DIAGNOSTIC);
     doc[FPSTR(HA_DEVICE_CLASS)] = F("problem");
     doc[FPSTR(HA_NAME)] = F("Fault");
@@ -1081,8 +1105,8 @@ public:
     doc[FPSTR(HA_AVAILABILITY)][1][FPSTR(HA_VALUE_TEMPLATE)] = JsonString(AVAILABILITY_OT_CONN, true);
     doc[FPSTR(HA_AVAILABILITY_MODE)] = F("all");
     doc[FPSTR(HA_ENABLED_BY_DEFAULT)] = enabledByDefault;
-    doc[FPSTR(HA_UNIQUE_ID)] = this->getObjectIdWithPrefix(FPSTR(HA_ENTITY_CATEGORY_DIAGNOSTIC));
+    doc[FPSTR(HA_UNIQUE_ID)] = this->getUniqueIdWithPrefix(FPSTR(HA_ENTITY_CATEGORY_DIAGNOSTIC));
-    doc[FPSTR(HA_DEFAULT_ENTITY_ID)] = doc[FPSTR(HA_UNIQUE_ID)];
+    doc[FPSTR(HA_DEFAULT_ENTITY_ID)] = this->getEntityIdWithPrefix(FPSTR(HA_ENTITY_BINARY_SENSOR), FPSTR(HA_ENTITY_CATEGORY_DIAGNOSTIC));
     doc[FPSTR(HA_ENTITY_CATEGORY)] = FPSTR(HA_ENTITY_CATEGORY_DIAGNOSTIC);
     doc[FPSTR(HA_DEVICE_CLASS)] = F("problem");
     doc[FPSTR(HA_NAME)] = F("Diagnostic");
@@ -1099,8 +1123,8 @@ public:
     JsonDocument doc;
     doc[FPSTR(HA_AVAILABILITY)][FPSTR(HA_TOPIC)] = this->statusTopic.c_str();
     doc[FPSTR(HA_ENABLED_BY_DEFAULT)] = enabledByDefault;
-    doc[FPSTR(HA_UNIQUE_ID)] = this->getObjectIdWithPrefix(F("ext_pump"));
+    doc[FPSTR(HA_UNIQUE_ID)] = this->getUniqueIdWithPrefix(F("ext_pump"));
-    doc[FPSTR(HA_DEFAULT_ENTITY_ID)] = doc[FPSTR(HA_UNIQUE_ID)];
+    doc[FPSTR(HA_DEFAULT_ENTITY_ID)] = this->getEntityIdWithPrefix(FPSTR(HA_ENTITY_BINARY_SENSOR), F("ext_pump"));
     doc[FPSTR(HA_ENTITY_CATEGORY)] = FPSTR(HA_ENTITY_CATEGORY_DIAGNOSTIC);
     doc[FPSTR(HA_DEVICE_CLASS)] = F("running");
     doc[FPSTR(HA_NAME)] = F("External pump");
@@ -1120,8 +1144,8 @@ public:
     doc[FPSTR(HA_AVAILABILITY)][1][FPSTR(HA_VALUE_TEMPLATE)] = F("{{ iif(value_json.slave.connected and value_json.slave.fault.active, 'online', 'offline') }}");
     doc[FPSTR(HA_AVAILABILITY_MODE)] = F("all");
     doc[FPSTR(HA_ENABLED_BY_DEFAULT)] = enabledByDefault;
-    doc[FPSTR(HA_UNIQUE_ID)] = this->getObjectIdWithPrefix(F("fault_code"));
+    doc[FPSTR(HA_UNIQUE_ID)] = this->getUniqueIdWithPrefix(F("fault_code"));
-    doc[FPSTR(HA_DEFAULT_ENTITY_ID)] = doc[FPSTR(HA_UNIQUE_ID)];
+    doc[FPSTR(HA_DEFAULT_ENTITY_ID)] = this->getEntityIdWithPrefix(FPSTR(HA_ENTITY_SENSOR), F("fault_code"));
     doc[FPSTR(HA_ENTITY_CATEGORY)] = FPSTR(HA_ENTITY_CATEGORY_DIAGNOSTIC);
     doc[FPSTR(HA_NAME)] = F("Fault code");
     doc[FPSTR(HA_ICON)] = F("mdi:cog-box");
@@ -1140,8 +1164,8 @@ public:
     doc[FPSTR(HA_AVAILABILITY)][1][FPSTR(HA_VALUE_TEMPLATE)] = F("{{ iif(value_json.slave.connected and value_json.slave.fault.active or value_json.slave.diag.active, 'online', 'offline') }}");
     doc[FPSTR(HA_AVAILABILITY_MODE)] = F("all");
     doc[FPSTR(HA_ENABLED_BY_DEFAULT)] = enabledByDefault;
-    doc[FPSTR(HA_UNIQUE_ID)] = this->getObjectIdWithPrefix(F("diagnostic_code"));
+    doc[FPSTR(HA_UNIQUE_ID)] = this->getUniqueIdWithPrefix(F("diagnostic_code"));
-    doc[FPSTR(HA_DEFAULT_ENTITY_ID)] = doc[FPSTR(HA_UNIQUE_ID)];
+    doc[FPSTR(HA_DEFAULT_ENTITY_ID)] = this->getEntityIdWithPrefix(FPSTR(HA_ENTITY_SENSOR), F("diagnostic_code"));
     doc[FPSTR(HA_ENTITY_CATEGORY)] = FPSTR(HA_ENTITY_CATEGORY_DIAGNOSTIC);
     doc[FPSTR(HA_NAME)] = F("Diagnostic code");
     doc[FPSTR(HA_ICON)] = F("mdi:information-box");
@@ -1157,8 +1181,8 @@ public:
     JsonDocument doc;
     doc[FPSTR(HA_AVAILABILITY)][FPSTR(HA_TOPIC)] = this->statusTopic.c_str();
     doc[FPSTR(HA_ENABLED_BY_DEFAULT)] = enabledByDefault;
-    doc[FPSTR(HA_UNIQUE_ID)] = this->getObjectIdWithPrefix(FPSTR(S_RSSI));
+    doc[FPSTR(HA_UNIQUE_ID)] = this->getUniqueIdWithPrefix(FPSTR(S_RSSI));
-    doc[FPSTR(HA_DEFAULT_ENTITY_ID)] = doc[FPSTR(HA_UNIQUE_ID)];
+    doc[FPSTR(HA_DEFAULT_ENTITY_ID)] = this->getEntityIdWithPrefix(FPSTR(HA_ENTITY_SENSOR), FPSTR(S_RSSI));
     doc[FPSTR(HA_ENTITY_CATEGORY)] = FPSTR(HA_ENTITY_CATEGORY_DIAGNOSTIC);
     doc[FPSTR(HA_DEVICE_CLASS)] = F("signal_strength");
     doc[FPSTR(HA_STATE_CLASS)] = FPSTR(HA_STATE_CLASS_MEASUREMENT);
@@ -1177,8 +1201,8 @@ public:
     JsonDocument doc;
     doc[FPSTR(HA_AVAILABILITY)][FPSTR(HA_TOPIC)] = this->statusTopic.c_str();
     doc[FPSTR(HA_ENABLED_BY_DEFAULT)] = enabledByDefault;
-    doc[FPSTR(HA_UNIQUE_ID)] = this->getObjectIdWithPrefix(F("uptime"));
+    doc[FPSTR(HA_UNIQUE_ID)] = this->getUniqueIdWithPrefix(F("uptime"));
-    doc[FPSTR(HA_DEFAULT_ENTITY_ID)] = doc[FPSTR(HA_UNIQUE_ID)];
+    doc[FPSTR(HA_DEFAULT_ENTITY_ID)] = this->getEntityIdWithPrefix(FPSTR(HA_ENTITY_SENSOR), F("uptime"));
     doc[FPSTR(HA_ENTITY_CATEGORY)] = FPSTR(HA_ENTITY_CATEGORY_DIAGNOSTIC);
     doc[FPSTR(HA_DEVICE_CLASS)] = F("duration");
     doc[FPSTR(HA_STATE_CLASS)] = F("total_increasing");
@@ -1198,8 +1222,8 @@ public:
     JsonDocument doc;
     doc[FPSTR(HA_AVAILABILITY)][FPSTR(HA_TOPIC)] = this->statusTopic.c_str();
     doc[FPSTR(HA_ENABLED_BY_DEFAULT)] = enabledByDefault;
-    doc[FPSTR(HA_UNIQUE_ID)] = this->getObjectIdWithPrefix(F("heating"));
+    doc[FPSTR(HA_UNIQUE_ID)] = this->getUniqueIdWithPrefix(F("heating"));
-    doc[FPSTR(HA_DEFAULT_ENTITY_ID)] = doc[FPSTR(HA_UNIQUE_ID)];
+    doc[FPSTR(HA_DEFAULT_ENTITY_ID)] = this->getEntityIdWithPrefix(FPSTR(HA_ENTITY_CLIMATE), F("heating"));
     doc[FPSTR(HA_NAME)] = F("Heating");
     doc[FPSTR(HA_ICON)] = F("mdi:radiator");
 
@@ -1250,8 +1274,8 @@ public:
     JsonDocument doc;
     doc[FPSTR(HA_AVAILABILITY)][FPSTR(HA_TOPIC)] = this->statusTopic.c_str();
     doc[FPSTR(HA_ENABLED_BY_DEFAULT)] = enabledByDefault;
-    doc[FPSTR(HA_UNIQUE_ID)] = this->getObjectIdWithPrefix(F("dhw"));
+    doc[FPSTR(HA_UNIQUE_ID)] = this->getUniqueIdWithPrefix(F("dhw"));
-    doc[FPSTR(HA_DEFAULT_ENTITY_ID)] = doc[FPSTR(HA_UNIQUE_ID)];
+    doc[FPSTR(HA_DEFAULT_ENTITY_ID)] = this->getEntityIdWithPrefix(FPSTR(HA_ENTITY_CLIMATE), F("dhw"));
     doc[FPSTR(HA_NAME)] = F("DHW");
     doc[FPSTR(HA_ICON)] = F("mdi:faucet");
 
@@ -1295,8 +1319,8 @@ public:
     JsonDocument doc;
     doc[FPSTR(HA_AVAILABILITY)][FPSTR(HA_TOPIC)] = this->statusTopic.c_str();
     doc[FPSTR(HA_ENABLED_BY_DEFAULT)] = enabledByDefault;
-    doc[FPSTR(HA_UNIQUE_ID)] = this->getObjectIdWithPrefix(FPSTR(S_RESTART));
+    doc[FPSTR(HA_UNIQUE_ID)] = this->getUniqueIdWithPrefix(FPSTR(S_RESTART));
-    doc[FPSTR(HA_DEFAULT_ENTITY_ID)] = doc[FPSTR(HA_UNIQUE_ID)];
+    doc[FPSTR(HA_DEFAULT_ENTITY_ID)] = this->getEntityIdWithPrefix(FPSTR(HA_ENTITY_BUTTON), FPSTR(S_RESTART));
     doc[FPSTR(HA_ENTITY_CATEGORY)] = FPSTR(HA_ENTITY_CATEGORY_CONFIG);
     doc[FPSTR(HA_DEVICE_CLASS)] = FPSTR(S_RESTART);
     doc[FPSTR(HA_NAME)] = F("Restart");
@@ -1315,8 +1339,8 @@ public:
     doc[FPSTR(HA_AVAILABILITY)][1][FPSTR(HA_VALUE_TEMPLATE)] = F("{{ iif(value_json.slave.fault.active, 'online', 'offline') }}");
     doc[FPSTR(HA_AVAILABILITY_MODE)] = F("all");
     doc[FPSTR(HA_ENABLED_BY_DEFAULT)] = enabledByDefault;
-    doc[FPSTR(HA_UNIQUE_ID)] = this->getObjectIdWithPrefix(F("reset_fault"));
+    doc[FPSTR(HA_UNIQUE_ID)] = this->getUniqueIdWithPrefix(F("reset_fault"));
-    doc[FPSTR(HA_DEFAULT_ENTITY_ID)] = doc[FPSTR(HA_UNIQUE_ID)];
+    doc[FPSTR(HA_DEFAULT_ENTITY_ID)] = this->getEntityIdWithPrefix(FPSTR(HA_ENTITY_BUTTON), F("reset_fault"));
     doc[FPSTR(HA_ENTITY_CATEGORY)] = FPSTR(HA_ENTITY_CATEGORY_CONFIG);
     doc[FPSTR(HA_DEVICE_CLASS)] = FPSTR(S_RESTART);
     doc[FPSTR(HA_NAME)] = F("Reset fault");
@@ -1335,8 +1359,8 @@ public:
     doc[FPSTR(HA_AVAILABILITY)][1][FPSTR(HA_VALUE_TEMPLATE)] = F("{{ iif(value_json.slave.diag.active, 'online', 'offline') }}");
     doc[FPSTR(HA_AVAILABILITY_MODE)] = F("all");
     doc[FPSTR(HA_ENABLED_BY_DEFAULT)] = enabledByDefault;
-    doc[FPSTR(HA_UNIQUE_ID)] = this->getObjectIdWithPrefix(F("reset_diagnostic"));
+    doc[FPSTR(HA_UNIQUE_ID)] = this->getUniqueIdWithPrefix(F("reset_diagnostic"));
-    doc[FPSTR(HA_DEFAULT_ENTITY_ID)] = doc[FPSTR(HA_UNIQUE_ID)];
+    doc[FPSTR(HA_DEFAULT_ENTITY_ID)] = this->getEntityIdWithPrefix(FPSTR(HA_ENTITY_BUTTON), F("reset_diagnostic"));
     doc[FPSTR(HA_ENTITY_CATEGORY)] = FPSTR(HA_ENTITY_CATEGORY_CONFIG);
     doc[FPSTR(HA_DEVICE_CLASS)] = FPSTR(S_RESTART);
     doc[FPSTR(HA_NAME)] = F("Reset diagnostic");

src/MainTask.h

@@ -6,7 +6,6 @@ extern NetworkMgr* network;
 extern MqttTask* tMqtt;
 extern OpenThermTask* tOt;
 extern FileData fsNetworkSettings, fsSettings, fsSensorsSettings;
-extern ESPTelnetStream* telnetStream;
 
 
 class MainTask : public Task {
@@ -40,7 +39,6 @@ protected:
   PumpStartReason extPumpStartReason = PumpStartReason::NONE;
   unsigned long externalPumpStartTime = 0;
   bool ntpStarted = false;
-  bool telnetStarted = false;
   bool emergencyDetected = false;
   unsigned long emergencyFlipTime = 0;
   bool freezeDetected = false;
@@ -51,6 +49,10 @@ protected:
     return "Main";
   }
 
+  uint32_t getTaskStackSize() override {
+    return 6000;
+  }
+
   /*BaseType_t getTaskCore() override {
     return 1;
   }*/
@@ -106,9 +108,9 @@ protected:
     vars.network.connected = network->isConnected();
     vars.network.rssi = network->isConnected() ? WiFi.RSSI() : 0;
 
-    if (settings.system.logLevel >= TinyLogger::Level::SILENT && settings.system.logLevel <= TinyLogger::Level::VERBOSE) {
+    if (settings.system.logLevel >= TinyLoggerLevel::SILENT && settings.system.logLevel <= TinyLoggerLevel::VERBOSE) {
       if (Log.getLevel() != settings.system.logLevel) {
-        Log.setLevel(static_cast<TinyLogger::Level>(settings.system.logLevel));
+        Log.setLevel(static_cast<TinyLoggerLevel>(settings.system.logLevel));
       }
     }
 
@@ -123,11 +125,6 @@ protected:
         }
       }
 
-      if (!this->telnetStarted && telnetStream != nullptr) {
-        telnetStream->begin(23, false);
-        this->telnetStarted = true;
-      }
-
       if (settings.mqtt.enabled && !tMqtt->isEnabled()) {
         tMqtt->enable();
 
@@ -135,18 +132,11 @@ protected:
         tMqtt->disable();
       }
 
-      Sensors::setConnectionStatusByType(Sensors::Type::MANUAL, !settings.mqtt.enabled || vars.mqtt.connected, false);
-
     } else {
       if (this->ntpStarted) {
         this->ntpStarted = false;
       }
 
-      if (this->telnetStarted) {
-        telnetStream->stop();
-        this->telnetStarted = false;
-      }
-
       if (tMqtt->isEnabled()) {
         tMqtt->disable();
       }
@@ -160,23 +150,10 @@ protected:
     }
     this->ledStatus();
 
-    // telnet
-    if (this->telnetStarted) {
-      this->yield();
-      telnetStream->loop();
-      this->yield();
-    }
-
 
     // anti memory leak
-    for (Stream* stream : Log.getStreams()) {
+    while (Serial.available() > 0) {
-      while (stream->available() > 0) {
+      Serial.read();
-        stream->read();
-
-        #ifdef ARDUINO_ARCH_ESP8266
-        ::optimistic_yield(1000);
-        #endif
-      }
     }
 
     // heap info
@@ -215,7 +192,7 @@ protected:
       vars.states.restarting = true;
     }
 
-    if (settings.system.logLevel < TinyLogger::Level::VERBOSE) {
+    if (settings.system.logLevel < TinyLoggerLevel::VERBOSE) {
       return;
     }
 
@@ -319,7 +296,7 @@ protected:
         emergencyFlags |= 0b00000010;
       }
       
-      if (settings.opentherm.options.nativeHeatingControl) {
+      if (settings.opentherm.options.nativeOTC) {
         emergencyFlags |= 0b00000100;
       }
     }

src/MqttTask.h

@@ -292,6 +292,14 @@ protected:
               this->haHelper->deleteDynamicSensor(prevSettings, Sensors::ValueType::RSSI);
               break;
 
+            case Sensors::Type::DHT11:
+            case Sensors::Type::DHT22:
+              this->haHelper->deleteConnectionDynamicSensor(prevSettings);
+              this->haHelper->deleteSignalQualityDynamicSensor(prevSettings);
+              this->haHelper->deleteDynamicSensor(prevSettings, Sensors::ValueType::TEMPERATURE);
+              this->haHelper->deleteDynamicSensor(prevSettings, Sensors::ValueType::HUMIDITY);
+              break;
+
             case Sensors::Type::DALLAS_TEMP:
               this->haHelper->deleteConnectionDynamicSensor(prevSettings);
               this->haHelper->deleteSignalQualityDynamicSensor(prevSettings);
@@ -319,6 +327,14 @@ protected:
             this->haHelper->publishDynamicSensor(sSettings, Sensors::ValueType::RSSI, settings.system.unitSystem, false);
             break;
 
+          case Sensors::Type::DHT11:
+          case Sensors::Type::DHT22:
+            this->haHelper->publishConnectionDynamicSensor(sSettings);
+            this->haHelper->publishSignalQualityDynamicSensor(sSettings, false);
+            this->haHelper->publishDynamicSensor(sSettings, Sensors::ValueType::TEMPERATURE, settings.system.unitSystem);
+            this->haHelper->publishDynamicSensor(sSettings, Sensors::ValueType::HUMIDITY, settings.system.unitSystem);
+            break;
+
           case Sensors::Type::DALLAS_TEMP:
             this->haHelper->publishConnectionDynamicSensor(sSettings);
             this->haHelper->publishSignalQualityDynamicSensor(sSettings, false);
@@ -416,7 +432,7 @@ protected:
       return;
     }
 
-    if (settings.system.logLevel >= TinyLogger::Level::TRACE) {
+    if (settings.system.logLevel >= TinyLoggerLevel::TRACE) {
       Log.strace(FPSTR(L_MQTT_MSG), F("Topic: %s\r\n>  "), topic.c_str());
       if (Log.lock()) {
         for (size_t i = 0; i < length; i++) {
@@ -486,6 +502,7 @@ protected:
   void publishHaEntities() {
     // heating
     this->haHelper->publishSwitchHeatingTurbo(false);
+    this->haHelper->publishSwitchHeatingHysteresis();
     this->haHelper->publishInputHeatingHysteresis(settings.system.unitSystem);
     this->haHelper->publishInputHeatingTurboFactor(false);
     this->haHelper->publishInputHeatingMinTemp(settings.system.unitSystem);

src/OpenThermTask.h

@@ -38,8 +38,12 @@ protected:
     return "OpenTherm";
   }
 
+  uint32_t getTaskStackSize() override {
+    return 7500;
+  }
+  
   BaseType_t getTaskCore() override {
-    return 1;
+    return 0;
   }
 
   int getTaskPriority() override {
@@ -186,7 +190,9 @@ protected:
       || (settings.opentherm.options.dhwToCh2 && settings.opentherm.options.dhwSupport && settings.dhw.enabled);
 
     if (settings.opentherm.options.heatingToCh2) {
-      vars.master.ch2.targetTemp = vars.master.heating.setpointTemp;
+      vars.master.ch2.targetTemp = !settings.opentherm.options.nativeOTC
+        ? vars.master.heating.setpointTemp
+        : vars.master.heating.targetTemp;
 
     } else if (settings.opentherm.options.dhwToCh2) {
       vars.master.ch2.targetTemp = vars.master.dhw.targetTemp;
@@ -218,7 +224,7 @@ protected:
       vars.master.heating.enabled,
       vars.master.dhw.enabled,
       settings.opentherm.options.coolingSupport,
-      settings.opentherm.options.nativeHeatingControl,
+      settings.opentherm.options.nativeOTC,
       vars.master.ch2.enabled,
       summerWinterMode,
       dhwBlocking,
@@ -305,6 +311,7 @@ protected:
       Sensors::setConnectionStatusByType(Sensors::Type::OT_DHW_BURNER_HOURS, false);
       Sensors::setConnectionStatusByType(Sensors::Type::OT_HEATING_PUMP_HOURS, false);
       Sensors::setConnectionStatusByType(Sensors::Type::OT_DHW_PUMP_HOURS, false);
+      Sensors::setConnectionStatusByType(Sensors::Type::OT_COOLING_HOURS, false);
 
       this->initialized = false;
       this->disconnectedTime = millis();
@@ -677,6 +684,21 @@ protected:
         }
       }
 
+      // Update cooling hours
+      if (Sensors::getAmountByType(Sensors::Type::OT_COOLING_HOURS, true)) {
+        if (this->updateCoolingHours()) {
+          Log.snoticeln(FPSTR(L_OT), F("Received cooling hours: %hu"), vars.slave.stats.coolingHours);
+
+          Sensors::setValueByType(
+            Sensors::Type::OT_COOLING_HOURS, vars.slave.stats.coolingHours,
+            Sensors::ValueType::PRIMARY, true, true
+          );
+
+        } else {
+          Log.swarningln(FPSTR(L_OT), F("Failed receive cooling hours"));
+        }
+      }
+
       // Auto fault reset
       if (settings.opentherm.options.autoFaultReset && vars.slave.fault.active && !vars.actions.resetFault) {
         vars.actions.resetFault = true;
@@ -792,7 +814,7 @@ protected:
       bool result = this->updateDhwTemp();
 
       if (result) {
-        float convertedDhwTemp = convertTemp(
+        const float convertedDhwTemp = convertTemp(
           vars.slave.dhw.currentTemp,
           settings.opentherm.unitSystem,
           settings.system.unitSystem
@@ -816,7 +838,7 @@ protected:
     // Update DHW temp 2
     if (settings.opentherm.options.dhwSupport && Sensors::getAmountByType(Sensors::Type::OT_DHW_TEMP2, true)) {
       if (this->updateDhwTemp2()) {
-        float convertedDhwTemp2 = convertTemp(
+        const float convertedDhwTemp2 = convertTemp(
           vars.slave.dhw.currentTemp2,
           settings.opentherm.unitSystem,
           settings.system.unitSystem
@@ -840,7 +862,7 @@ protected:
     // Update DHW flow rate
     if (settings.opentherm.options.dhwSupport && Sensors::getAmountByType(Sensors::Type::OT_DHW_FLOW_RATE, true)) {
       if (this->updateDhwFlowRate()) {
-        float convertedDhwFlowRate = convertVolume(
+        const float convertedDhwFlowRate = convertVolume(
           vars.slave.dhw.flowRate,
           settings.opentherm.unitSystem,
           settings.system.unitSystem
@@ -864,7 +886,7 @@ protected:
     // Update heating temp
     if (Sensors::getAmountByType(Sensors::Type::OT_HEATING_TEMP, true)) {
       if (this->updateHeatingTemp()) {
-        float convertedHeatingTemp = convertTemp(
+        const float convertedHeatingTemp = convertTemp(
           vars.slave.heating.currentTemp,
           settings.opentherm.unitSystem,
           settings.system.unitSystem
@@ -888,7 +910,7 @@ protected:
     // Update heating return temp
     if (Sensors::getAmountByType(Sensors::Type::OT_HEATING_RETURN_TEMP, true)) {
       if (this->updateHeatingReturnTemp()) {
-        float convertedHeatingReturnTemp = convertTemp(
+        const float convertedHeatingReturnTemp = convertTemp(
           vars.slave.heating.returnTemp,
           settings.opentherm.unitSystem,
           settings.system.unitSystem
@@ -911,9 +933,9 @@ protected:
 
     // Update CH2 temp
     if (Sensors::getAmountByType(Sensors::Type::OT_CH2_TEMP, true)) {
-      if (vars.master.ch2.enabled && !settings.opentherm.options.nativeHeatingControl) {
+      if (vars.master.ch2.enabled && !settings.opentherm.options.nativeOTC) {
         if (this->updateCh2Temp()) {
-          float convertedCh2Temp = convertTemp(
+          const float convertedCh2Temp = convertTemp(
             vars.slave.ch2.currentTemp,
             settings.opentherm.unitSystem,
             settings.system.unitSystem
@@ -938,7 +960,7 @@ protected:
     // Update exhaust temp
     if (Sensors::getAmountByType(Sensors::Type::OT_EXHAUST_TEMP, true)) {
       if (this->updateExhaustTemp()) {
-        float convertedExhaustTemp = convertTemp(
+        const float convertedExhaustTemp = convertTemp(
           vars.slave.exhaust.temp,
           settings.opentherm.unitSystem,
           settings.system.unitSystem
@@ -962,7 +984,7 @@ protected:
     // Update heat exchanger temp
     if (Sensors::getAmountByType(Sensors::Type::OT_HEAT_EXCHANGER_TEMP, true)) {
       if (this->updateHeatExchangerTemp()) {
-        float convertedHeatExchTemp = convertTemp(
+        const float convertedHeatExchTemp = convertTemp(
           vars.slave.heatExchangerTemp,
           settings.opentherm.unitSystem,
           settings.system.unitSystem
@@ -986,7 +1008,7 @@ protected:
     // Update outdoor temp
     if (Sensors::getAmountByType(Sensors::Type::OT_OUTDOOR_TEMP, true)) {
       if (this->updateOutdoorTemp()) {
-        float convertedOutdoorTemp = convertTemp(
+        const float convertedOutdoorTemp = convertTemp(
           vars.slave.heating.outdoorTemp,
           settings.opentherm.unitSystem,
           settings.system.unitSystem
@@ -1010,7 +1032,7 @@ protected:
     // Update solar storage temp
     if (Sensors::getAmountByType(Sensors::Type::OT_SOLAR_STORAGE_TEMP, true)) {
       if (this->updateSolarStorageTemp()) {
-        float convertedSolarStorageTemp = convertTemp(
+        const float convertedSolarStorageTemp = convertTemp(
           vars.slave.solar.storage,
           settings.opentherm.unitSystem,
           settings.system.unitSystem
@@ -1034,7 +1056,7 @@ protected:
     // Update solar collector temp
     if (Sensors::getAmountByType(Sensors::Type::OT_SOLAR_COLLECTOR_TEMP, true)) {
       if (this->updateSolarCollectorTemp()) {
-        float convertedSolarCollectorTemp = convertTemp(
+        const float convertedSolarCollectorTemp = convertTemp(
           vars.slave.solar.collector,
           settings.opentherm.unitSystem,
           settings.system.unitSystem
@@ -1080,7 +1102,7 @@ protected:
     // Update pressure
     if (Sensors::getAmountByType(Sensors::Type::OT_PRESSURE, true)) {
       if (this->updatePressure()) {
-        float convertedPressure = convertPressure(
+        const float convertedPressure = convertPressure(
           vars.slave.pressure,
           settings.opentherm.unitSystem,
           settings.system.unitSystem
@@ -1186,9 +1208,12 @@ protected:
 
     // Update DHW temp
     if (vars.master.dhw.enabled) {
+      // Target dhw temp
+      const float& targetTemp = vars.master.dhw.targetTemp;
+
       // Converted target dhw temp
-      float convertedTemp = convertTemp(
+      const float convertedTemp = convertTemp(
-        vars.master.dhw.targetTemp,
+        targetTemp,
         settings.system.unitSystem,
         settings.opentherm.unitSystem
       );
@@ -1200,7 +1225,7 @@ protected:
 
           Log.sinfoln(
             FPSTR(L_OT_DHW), F("Set temp: %.2f (converted: %.2f, response: %.2f)"),
-            vars.master.dhw.targetTemp, convertedTemp, vars.slave.dhw.targetTemp
+            targetTemp, convertedTemp, vars.slave.dhw.targetTemp
           );
 
         } else {
@@ -1209,16 +1234,19 @@ protected:
       }
     }
 
-    // Native heating control
+    // Send indoor temp if AlwaysSendIndoorTemp option is enabled.
-    if (settings.opentherm.options.nativeHeatingControl) {
+    if (settings.opentherm.options.nativeOTC || settings.opentherm.options.alwaysSendIndoorTemp) {
+      // Current indoor temp
+      const float& indoorTemp = vars.master.heating.indoorTemp;
+
       // Converted current indoor temp
-      float convertedTemp = convertTemp(vars.master.heating.indoorTemp, settings.system.unitSystem, settings.opentherm.unitSystem);
+      const float convertedTemp = convertTemp(indoorTemp, settings.system.unitSystem, settings.opentherm.unitSystem);
 
       // Set current indoor temp
       if (this->setRoomTemp(convertedTemp)) {
         Log.sinfoln(
           FPSTR(L_OT_HEATING), F("Set current indoor temp: %.2f (converted: %.2f, response: %.2f)"),
-          vars.master.heating.indoorTemp, convertedTemp, vars.slave.heating.indoorTemp
+          indoorTemp, convertedTemp, vars.slave.heating.indoorTemp
         );
         
       } else {
@@ -1230,17 +1258,26 @@ protected:
         if (this->setRoomTempCh2(convertedTemp)) {
           Log.sinfoln(
             FPSTR(L_OT_HEATING), F("Set current CH2 indoor temp: %.2f (converted: %.2f, response: %.2f)"),
-            vars.master.heating.indoorTemp, convertedTemp, vars.slave.ch2.indoorTemp
+            indoorTemp, convertedTemp, vars.slave.ch2.indoorTemp
           );
 
         } else {
           Log.swarningln(FPSTR(L_OT_HEATING), F("Failed set current CH2 indoor temp"));
         }
       }
+    }
 
+    // NativeOTC
+    if (settings.opentherm.options.nativeOTC) {
+      // Target indoor temp
+      const float& targetTemp = vars.master.heating.targetTemp;
 
       // Converted target indoor temp
-      convertedTemp = convertTemp(vars.master.heating.targetTemp, settings.system.unitSystem, settings.opentherm.unitSystem);
+      const float convertedTemp = convertTemp(
+        targetTemp,
+        settings.system.unitSystem,
+        settings.opentherm.unitSystem
+      );
 
       // Set target indoor temp
       if (this->needSetHeatingTemp(convertedTemp)) {
@@ -1249,7 +1286,7 @@ protected:
 
           Log.sinfoln(
             FPSTR(L_OT_HEATING), F("Set target indoor temp: %.2f (converted: %.2f, response: %.2f)"),
-            vars.master.heating.targetTemp, convertedTemp, vars.slave.heating.targetTemp
+            targetTemp, convertedTemp, vars.slave.heating.targetTemp
           );
 
         } else {
@@ -1264,7 +1301,7 @@ protected:
 
           Log.sinfoln(
             FPSTR(L_OT_HEATING), F("Set target CH2 indoor temp: %.2f (converted: %.2f, response: %.2f)"),
-            vars.master.heating.targetTemp, convertedTemp, vars.slave.ch2.targetTemp
+            targetTemp, convertedTemp, vars.slave.ch2.targetTemp
           );
 
         } else {
@@ -1273,10 +1310,22 @@ protected:
       }
     }
 
-    // Normal heating control
+    // Set heating temp
-    if (!settings.opentherm.options.nativeHeatingControl && vars.master.heating.enabled) {
+    {
+      // Target heating temp
+      float targetTemp = 0.0f;
+      if (vars.master.heating.enabled) {
+        targetTemp = !settings.opentherm.options.nativeOTC
+          ? vars.master.heating.setpointTemp
+          : vars.master.heating.targetTemp;
+      }
+
       // Converted target heating temp
-      float convertedTemp = convertTemp(vars.master.heating.setpointTemp, settings.system.unitSystem, settings.opentherm.unitSystem);
+      const float convertedTemp = convertTemp(
+        targetTemp,
+        settings.system.unitSystem,
+        settings.opentherm.unitSystem
+      );
 
       if (this->needSetHeatingTemp(convertedTemp)) {
         // Set max heating temp
@@ -1284,13 +1333,13 @@ protected:
           if (this->setMaxHeatingTemp(convertedTemp)) {
             Log.sinfoln(
               FPSTR(L_OT_HEATING), F("Set max heating temp: %.2f (converted: %.2f)"),
-              vars.master.heating.setpointTemp, convertedTemp
+              targetTemp, convertedTemp
             );
 
           } else {
             Log.swarningln(
               FPSTR(L_OT_HEATING), F("Failed set max heating temp: %.2f (converted: %.2f)"),
-              vars.master.heating.setpointTemp, convertedTemp
+              targetTemp, convertedTemp
             );
           }
         }
@@ -1301,7 +1350,7 @@ protected:
 
           Log.sinfoln(
             FPSTR(L_OT_HEATING), F("Set target temp: %.2f (converted: %.2f, response: %.2f)"),
-            vars.master.heating.setpointTemp, convertedTemp, vars.slave.heating.targetTemp
+            targetTemp, convertedTemp, vars.slave.heating.targetTemp
           );
 
         } else {
@@ -1311,11 +1360,15 @@ protected:
     }
 
     // Set CH2 temp
-    if (!settings.opentherm.options.nativeHeatingControl && vars.master.ch2.enabled) {
     if (settings.opentherm.options.heatingToCh2 || settings.opentherm.options.dhwToCh2) {
+      // Target CH2 heating temp
+      const float targetTemp = vars.master.ch2.enabled
+        ? vars.master.ch2.targetTemp
+        : 0.0f;
+
       // Converted target CH2 temp
-        float convertedTemp = convertTemp(
+      const float convertedTemp = convertTemp(
-          vars.master.ch2.targetTemp,
+        targetTemp,
         settings.system.unitSystem,
         settings.opentherm.unitSystem
       );
@@ -1326,7 +1379,7 @@ protected:
 
           Log.sinfoln(
             FPSTR(L_OT_CH2), F("Set temp: %.2f (converted: %.2f, response: %.2f)"),
-              vars.master.ch2.targetTemp, convertedTemp, vars.slave.ch2.targetTemp
+            targetTemp, convertedTemp, vars.slave.ch2.targetTemp
           );
 
         } else {
@@ -1334,12 +1387,11 @@ protected:
         }
       }
     }
-    }
 
 
     // Heating overheat control
     if (settings.heating.overheatProtection.highTemp > 0 && settings.heating.overheatProtection.lowTemp > 0) {
-      float highTemp = convertTemp(
+      const float highTemp = convertTemp(
         max({
           vars.slave.heating.currentTemp,
           vars.slave.heating.returnTemp,
@@ -1376,7 +1428,7 @@ protected:
 
     // DHW overheat control
     if (settings.dhw.overheatProtection.highTemp > 0 && settings.dhw.overheatProtection.lowTemp > 0) {
-      float highTemp = convertTemp(
+      const float highTemp = convertTemp(
         max({
           vars.slave.heating.currentTemp,
           vars.slave.heating.returnTemp,
@@ -1470,6 +1522,19 @@ protected:
     } else {
       Log.swarningln(FPSTR(L_OT), F("Failed set master config"));
     }
+
+    /*char buf[100];
+    if (this->instance->getStr(OpenThermMessageID::Brand, buf, sizeof(buf) - 1)) {
+      Log.snoticeln(FPSTR(L_OT), F("Slave brand: %s"), buf);
+    }
+
+    if (this->instance->getStr(OpenThermMessageID::BrandVersion, buf, sizeof(buf) - 1)) {
+      Log.snoticeln(FPSTR(L_OT), F("Slave brand version: %s"), buf);
+    }
+
+    if (this->instance->getStr(OpenThermMessageID::BrandSerialNumber, buf, sizeof(buf) - 1)) {
+      Log.snoticeln(FPSTR(L_OT), F("Slave brand s/n: %s"), buf);
+    }*/
   }
 
   bool isReady() {
@@ -1647,7 +1712,7 @@ protected:
   }
 
 
-  bool setRoomTemp(float temperature) {
+  bool setRoomTemp(const float temperature) {
     const unsigned int request = CustomOpenTherm::temperatureToData(temperature);
     const unsigned long response = this->instance->sendRequest(CustomOpenTherm::buildRequest(
       OpenThermMessageType::WRITE_DATA,
@@ -1667,7 +1732,7 @@ protected:
     return CustomOpenTherm::getUInt(response) == request;
   }
 
-  bool setRoomTempCh2(float temperature) {
+  bool setRoomTempCh2(const float temperature) {
     const unsigned int request = CustomOpenTherm::temperatureToData(temperature);
     const unsigned long response = this->instance->sendRequest(CustomOpenTherm::buildRequest(
       OpenThermMessageType::WRITE_DATA,
@@ -2169,6 +2234,25 @@ protected:
     return true;
   }
 
+  bool updateCoolingHours() {
+    const unsigned long response = this->instance->sendRequest(CustomOpenTherm::buildRequest(
+      OpenThermRequestType::READ_DATA,
+      OpenThermMessageID::CoolingOperationHours,
+      0
+    ));
+
+    if (!CustomOpenTherm::isValidResponse(response)) {
+      return false;
+
+    } else if (!CustomOpenTherm::isValidResponseId(response, OpenThermMessageID::CoolingOperationHours)) {
+      return false;
+    }
+
+    vars.slave.stats.coolingHours = CustomOpenTherm::getUInt(response);
+
+    return true;
+  }
+
   bool updateModulationLevel() {
     const unsigned long response = this->instance->sendRequest(CustomOpenTherm::buildRequest(
       OpenThermRequestType::READ_DATA,
@@ -2183,7 +2267,7 @@ protected:
       return false;
     }
 
-    float value = CustomOpenTherm::getFloat(response);
+    const float value = CustomOpenTherm::getFloat(response);
     if (value < 0) {
       return false;
     }
@@ -2207,7 +2291,7 @@ protected:
       return false;
     }
 
-    float value = CustomOpenTherm::getFloat(response);
+    const float value = CustomOpenTherm::getFloat(response);
     if (value <= 0) {
       return false;
     }
@@ -2231,7 +2315,7 @@ protected:
       return false;
     }
 
-    float value = CustomOpenTherm::getFloat(response);
+    const float value = CustomOpenTherm::getFloat(response);
     if (value <= 0) {
       return false;
     }
@@ -2285,7 +2369,7 @@ protected:
       return false;
     }
 
-    float value = CustomOpenTherm::getFloat(response);
+    const float value = CustomOpenTherm::getFloat(response);
     if (value <= 0) {
       return false;
     }
@@ -2349,7 +2433,7 @@ protected:
       return false;
     }
 
-    float value = (float) CustomOpenTherm::getInt(response);
+    const float value = (float) CustomOpenTherm::getInt(response);
     if (!isValidTemp(value, settings.opentherm.unitSystem, -40, 500)) {
       return false;
     }
@@ -2373,7 +2457,7 @@ protected:
       return false;
     }
 
-    float value = (float) CustomOpenTherm::getInt(response);
+    const float value = (float) CustomOpenTherm::getInt(response);
     if (value <= 0) {
       return false;
     }
@@ -2474,7 +2558,7 @@ protected:
       return false;
     }
 
-    float value = CustomOpenTherm::getFloat(response);
+    const float value = CustomOpenTherm::getFloat(response);
     if (value < 0) {
       return false;
     }

src/RegulatorTask.h

@@ -20,6 +20,10 @@ protected:
     return "Regulator";
   }
 
+  uint32_t getTaskStackSize() override {
+    return 5000;
+  }
+  
   /*BaseType_t getTaskCore() override {
     return 1;
   }*/
@@ -37,7 +41,7 @@ protected:
     this->indoorSensorsConnected = Sensors::existsConnectedSensorsByPurpose(Sensors::Purpose::INDOOR_TEMP);
     //this->outdoorSensorsConnected = Sensors::existsConnectedSensorsByPurpose(Sensors::Purpose::OUTDOOR_TEMP);
 
-    if (settings.equitherm.enabled || settings.pid.enabled || settings.opentherm.options.nativeHeatingControl) {
+    if (settings.equitherm.enabled || settings.pid.enabled || settings.opentherm.options.nativeOTC) {
       vars.master.heating.indoorTempControl = true;
       vars.master.heating.minTemp = THERMOSTAT_INDOOR_MIN_TEMP;
       vars.master.heating.maxTemp = THERMOSTAT_INDOOR_MAX_TEMP;
@@ -90,15 +94,15 @@ protected:
 
   void hysteresis() {
     bool useHyst = false;
-    if (settings.heating.hysteresis > 0.01f && this->indoorSensorsConnected) {
+    if (settings.heating.hysteresis.enabled && this->indoorSensorsConnected) {
-      useHyst = settings.equitherm.enabled || settings.pid.enabled || settings.opentherm.options.nativeHeatingControl;
+      useHyst = settings.equitherm.enabled || settings.pid.enabled || settings.opentherm.options.nativeOTC;
     }
 
     if (useHyst) {
-      if (!vars.master.heating.blocking && vars.master.heating.indoorTemp - settings.heating.target + 0.0001f >= settings.heating.hysteresis) {
+      if (!vars.master.heating.blocking && vars.master.heating.indoorTemp - settings.heating.target + 0.0001f >= settings.heating.hysteresis.value) {
         vars.master.heating.blocking = true;
 
-      } else if (vars.master.heating.blocking && vars.master.heating.indoorTemp - settings.heating.target - 0.0001f <= -(settings.heating.hysteresis)) {
+      } else if (vars.master.heating.blocking && vars.master.heating.indoorTemp - settings.heating.target - 0.0001f <= -(settings.heating.hysteresis.value)) {
         vars.master.heating.blocking = false;
       }
 
@@ -108,13 +112,13 @@ protected:
   }
 
   inline float getHeatingMinSetpointTemp() {
-    return settings.opentherm.options.nativeHeatingControl
+    return settings.opentherm.options.nativeOTC
       ? vars.master.heating.minTemp
       : settings.heating.minTemp;
   }
 
   inline float getHeatingMaxSetpointTemp() {
-    return settings.opentherm.options.nativeHeatingControl
+    return settings.opentherm.options.nativeOTC
       ? vars.master.heating.maxTemp
       : settings.heating.maxTemp;
   }
@@ -135,7 +139,7 @@ protected:
     if (vars.emergency.state) {
       return settings.emergency.target;
 
-    } else if (settings.opentherm.options.nativeHeatingControl) {
+    } else if (settings.opentherm.options.nativeOTC) {
       return settings.heating.target;
 
     } else if (!settings.equitherm.enabled && !settings.pid.enabled) {

src/Sensors.h

@@ -34,10 +34,13 @@ public:
     OT_DHW_BURNER_HOURS     = 24,
     OT_HEATING_PUMP_HOURS   = 25,
     OT_DHW_PUMP_HOURS       = 26,
+    OT_COOLING_HOURS        = 27,
     
     NTC_10K_TEMP            = 50,
     DALLAS_TEMP             = 51,
     BLUETOOTH               = 52,
+    DHT11                   = 53,
+    DHT22                   = 54,
 
     HEATING_SETPOINT_TEMP   = 253,
     MANUAL                  = 254,
@@ -149,7 +152,7 @@ public:
 
   static int16_t getIdByName(const char* name) {
     if (settings == nullptr) {
-      return 0;
+      return -1;
     }
 
     for (uint8_t id = 0; id <= getMaxSensorId(); id++) {
@@ -163,7 +166,7 @@ public:
 
   static int16_t getIdByObjectId(const char* objectId) {
     if (settings == nullptr) {
-      return 0;
+      return -1;
     }
 
     String refObjectId;
@@ -329,12 +332,12 @@ public:
 
   static float getMeanValueByPurpose(Purpose purpose, const ValueType valueType, bool onlyConnected = true) {
     if (settings == nullptr || results == nullptr) {
-      return 0;
+      return 0.0f;
     }
 
     uint8_t valueId = (uint8_t) valueType;
     if (!isValidValueId(valueId)) {
-      return 0;
+      return 0.0f;
     }
     
     float value = 0.0f;
@@ -363,7 +366,7 @@ public:
 
   static bool existsConnectedSensorsByPurpose(Purpose purpose) {
     if (settings == nullptr || results == nullptr) {
-      return 0;
+      return false;
     }
 
     for (uint8_t id = 0; id <= getMaxSensorId(); id++) {

src/Settings.h

@@ -32,9 +32,8 @@ struct Settings {
     } serial;
 
     struct {
-      bool enabled = DEFAULT_TELNET_ENABLED;
+      bool enabled = DEFAULT_WEBSERIAL_ENABLED;
-      unsigned short port = DEFAULT_TELNET_PORT;
+    } webSerial;
-    } telnet;
 
     struct {
       char server[49] = "pool.ntp.org";
@@ -78,7 +77,8 @@ struct Settings {
       bool autoFaultReset = false;
       bool autoDiagReset = false;
       bool setDateAndTime = false;
-      bool nativeHeatingControl = false;
+      bool alwaysSendIndoorTemp = true;
+      bool nativeOTC = false;
       bool immergasFix = false;
     } options;
   } opentherm;
@@ -103,12 +103,17 @@ struct Settings {
     bool enabled = true;
     bool turbo = false;
     float target = DEFAULT_HEATING_TARGET_TEMP;
-    float hysteresis = 0.5f;
     float turboFactor = 7.5f;
     uint8_t minTemp = DEFAULT_HEATING_MIN_TEMP;
     uint8_t maxTemp = DEFAULT_HEATING_MAX_TEMP;
     uint8_t maxModulation = 100;
 
+    struct {
+      bool enabled = true;
+      float value = 0.5f;
+      HysteresisAction action = HysteresisAction::DISABLE_HEATING;
+    } hysteresis;
+
     struct {
       uint8_t highTemp = 95;
       uint8_t lowTemp = 90;
@@ -383,6 +388,7 @@ struct Variables {
       uint16_t dhwBurnerStarts = 0;
       uint16_t heatingPumpStarts = 0;
       uint16_t dhwPumpStarts = 0;
+      uint16_t coolingHours = 0;
       uint16_t burnerHours = 0;
       uint16_t dhwBurnerHours = 0;
       uint16_t heatingPumpHours = 0;

src/defines.h

@@ -30,6 +30,10 @@
   #define BUILD_VERSION                 "0.0.0"
 #endif
 
+#ifndef BUILD_COMMIT
+  #define BUILD_COMMIT                  "undefined"
+#endif
+
 #ifndef BUILD_ENV
   #define BUILD_ENV                     "undefined"
 #endif
@@ -42,12 +46,8 @@
   #define DEFAULT_SERIAL_BAUD 115200
 #endif
 
-#ifndef DEFAULT_TELNET_ENABLED
+#ifndef DEFAULT_WEBSERIAL_ENABLED
-  #define DEFAULT_TELNET_ENABLED true
+  #define DEFAULT_WEBSERIAL_ENABLED true
-#endif
-
-#ifndef DEFAULT_TELNET_PORT
-  #define DEFAULT_TELNET_PORT 23
 #endif
 
 #ifndef USE_BLE
@@ -75,7 +75,7 @@
 #endif
 
 #ifndef DEFAULT_LOG_LEVEL
-  #define DEFAULT_LOG_LEVEL TinyLogger::Level::VERBOSE
+  #define DEFAULT_LOG_LEVEL TinyLoggerLevel::VERBOSE
 #endif
 
 #ifndef DEFAULT_STATUS_LED_GPIO
@@ -163,4 +163,9 @@ enum class UnitSystem : uint8_t {
   IMPERIAL  = 1
 };
 
+enum class HysteresisAction : uint8_t {
+  DISABLE_HEATING = 0,
+  SET_ZERO_TARGET = 1
+};
+
 char buffer[255];

src/idf_component.yml

@@ -1,3 +0,0 @@
-dependencies:
-  idf: ">=5.3.2"
-  h2zero/esp-nimble-cpp: ">=2.2.1"

src/main.cpp

@@ -1,11 +1,8 @@
-#define ARDUINOJSON_USE_DOUBLE 0
-#define ARDUINOJSON_USE_LONG_LONG 0
-
 #include <Arduino.h>
 #include <ArduinoJson.h>
 #include <FileData.h>
 #include <LittleFS.h>
-#include <ESPTelnetStream.h>
+#include <MycilaWebSerial.h>
 
 #include "defines.h"
 #include "strings.h"
@@ -37,7 +34,7 @@
 using namespace NetworkUtils;
 
 // Vars
-ESPTelnetStream* telnetStream = nullptr;
+WebSerial* webSerial = nullptr;
 NetworkMgr* network = nullptr;
 Sensors::Result sensorsResults[SENSORS_AMOUNT];
 
@@ -61,7 +58,7 @@ void setup() {
   Sensors::results = sensorsResults;
   LittleFS.begin();
 
-  Log.setLevel(TinyLogger::Level::VERBOSE);
+  Log.setLevel(TinyLoggerLevel::VERBOSE);
   Log.setServiceTemplate("\033[1m[%s]\033[22m");
   Log.setLevelTemplate("\033[1m[%s]\033[22m");
   Log.setMsgPrefix("\033[m ");
@@ -79,7 +76,7 @@ void setup() {
   #if ARDUINO_USB_MODE
   Serial.setTxBufferSize(512);
   #endif
-  Log.addStream(&Serial);
+  Log.addHandler(&Serial);
   Log.print("\n\n\r");
 
   //
@@ -163,24 +160,24 @@ void setup() {
   // Logs settings
   if (!settings.system.serial.enabled) {
     Serial.end();
-    Log.clearStreams();
+    Log.clearHandlers();
 
   } else if (settings.system.serial.baudrate != 115200) {
     Serial.end();
-    Log.clearStreams();
+    Log.clearHandlers();
 
     Serial.begin(settings.system.serial.baudrate);
-    Log.addStream(&Serial);
+    Log.addHandler(&Serial);
   }
 
-  if (settings.system.telnet.enabled) {
+  if (settings.system.webSerial.enabled) {
-    telnetStream = new ESPTelnetStream;
+    webSerial = new WebSerial();
-    telnetStream->setKeepAliveInterval(500);
+    webSerial->setBuffer(100);
-    Log.addStream(telnetStream);
+    Log.addHandler(webSerial);
   }
 
-  if (settings.system.logLevel >= TinyLogger::Level::SILENT && settings.system.logLevel <= TinyLogger::Level::VERBOSE) {
+  if (settings.system.logLevel >= TinyLoggerLevel::SILENT && settings.system.logLevel <= TinyLoggerLevel::VERBOSE) {
-    Log.setLevel(static_cast<TinyLogger::Level>(settings.system.logLevel));
+    Log.setLevel(static_cast<TinyLoggerLevel>(settings.system.logLevel));
   }
 
   //
@@ -216,7 +213,7 @@ void setup() {
   tRegulator = new RegulatorTask(true, 10000);
   Scheduler.start(tRegulator);
 
-  tPortal = new PortalTask(true, 0);
+  tPortal = new PortalTask(true, 10);
   Scheduler.start(tPortal);
 
   tMain = new MainTask(true, 100);

src/strings.h

@@ -24,6 +24,7 @@ const char L_OT_CH2[]                               PROGMEM = "OT.CH2";
 const char L_SENSORS[]                              PROGMEM = "SENSORS";
 const char L_SENSORS_SETTINGS[]                     PROGMEM = "SENSORS.SETTINGS";
 const char L_SENSORS_DALLAS[]                       PROGMEM = "SENSORS.DALLAS";
+const char L_SENSORS_DHT[]                          PROGMEM = "SENSORS.DHT";
 const char L_SENSORS_NTC[]                          PROGMEM = "SENSORS.NTC";
 const char L_SENSORS_BLE[]                          PROGMEM = "SENSORS.BLE";
 const char L_REGULATOR[]                            PROGMEM = "REGULATOR";
@@ -34,6 +35,7 @@ const char L_CASCADE_OUTPUT[]                       PROGMEM = "CASCADE.OUTPUT";
 const char L_EXTPUMP[]                              PROGMEM = "EXTPUMP";
 
 
+const char S_ACTION[]                               PROGMEM = "action";
 const char S_ACTIONS[]                              PROGMEM = "actions";
 const char S_ACTIVE[]                               PROGMEM = "active";
 const char S_ADDRESS[]                              PROGMEM = "address";
@@ -55,6 +57,7 @@ const char S_CHANNEL[]                              PROGMEM = "channel";
 const char S_CH2_ALWAYS_ENABLED[]                   PROGMEM = "ch2AlwaysEnabled";
 const char S_CHIP[]                                 PROGMEM = "chip";
 const char S_CODE[]                                 PROGMEM = "code";
+const char S_COMMIT[]                               PROGMEM = "commit";
 const char S_CONNECTED[]                            PROGMEM = "connected";
 const char S_CONTINUES[]                            PROGMEM = "continues";
 const char S_COOLING[]                              PROGMEM = "cooling";
@@ -109,6 +112,7 @@ const char S_HYSTERESIS[]                           PROGMEM = "hysteresis";
 const char S_ID[]                                   PROGMEM = "id";
 const char S_IGNORE_DIAG_STATE[]                    PROGMEM = "ignoreDiagState";
 const char S_IMMERGAS_FIX[]                         PROGMEM = "immergasFix";
+const char S_ALWAYS_SEND_INDOOR_TEMP[]              PROGMEM = "alwaysSendIndoorTemp";
 const char S_INDOOR_TEMP[]                          PROGMEM = "indoorTemp";
 const char S_INDOOR_TEMP_CONTROL[]                  PROGMEM = "indoorTempControl";
 const char S_IN_GPIO[]                              PROGMEM = "inGpio";
@@ -140,7 +144,7 @@ const char S_MODEL[]                                PROGMEM = "model";
 const char S_MODULATION[]                           PROGMEM = "modulation";
 const char S_MQTT[]                                 PROGMEM = "mqtt";
 const char S_NAME[]                                 PROGMEM = "name";
-const char S_NATIVE_HEATING_CONTROL[]               PROGMEM = "nativeHeatingControl";
+const char S_NATIVE_OTC[]                           PROGMEM = "nativeOTC";
 const char S_NETWORK[]                              PROGMEM = "network";
 const char S_NTP[]                                  PROGMEM = "ntp";
 const char S_OFFSET[]                               PROGMEM = "offset";
@@ -163,6 +167,7 @@ const char S_POWER[]                                PROGMEM = "power";
 const char S_PREFIX[]                               PROGMEM = "prefix";
 const char S_PROTOCOL_VERSION[]                     PROGMEM = "protocolVersion";
 const char S_PURPOSE[]                              PROGMEM = "purpose";
+const char S_PSRAM[]                                PROGMEM = "psram";
 const char S_P_FACTOR[]                             PROGMEM = "p_factor";
 const char S_P_MULTIPLIER[]                         PROGMEM = "p_multiplier";
 const char S_REAL_SIZE[]                            PROGMEM = "realSize";
@@ -199,7 +204,6 @@ 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";
 const char S_THRESHOLD_HIGH[]                       PROGMEM = "thresholdHigh";
 const char S_THRESHOLD_LOW[]                        PROGMEM = "thresholdLow";
@@ -217,3 +221,4 @@ const char S_USE_DHCP[]                             PROGMEM = "useDhcp";
 const char S_USER[]                                 PROGMEM = "user";
 const char S_VALUE[]                                PROGMEM = "value";
 const char S_VERSION[]                              PROGMEM = "version";
+const char S_WEBSERIAL[]                            PROGMEM = "webSerial";

src/utils.h

@@ -425,9 +425,8 @@ void settingsToJson(const Settings& src, JsonVariant dst, bool safe = false) {
     serial[FPSTR(S_ENABLED)] = src.system.serial.enabled;
     serial[FPSTR(S_BAUDRATE)] = src.system.serial.baudrate;
 
-    auto telnet = system[FPSTR(S_TELNET)].to<JsonObject>();
+    auto webSerial = system[FPSTR(S_WEBSERIAL)].to<JsonObject>();
-    telnet[FPSTR(S_ENABLED)] = src.system.telnet.enabled;
+    webSerial[FPSTR(S_ENABLED)] = src.system.webSerial.enabled;
-    telnet[FPSTR(S_PORT)] = src.system.telnet.port;
 
     auto ntp = system[FPSTR(S_NTP)].to<JsonObject>();
     ntp[FPSTR(S_SERVER)] = src.system.ntp.server;
@@ -468,9 +467,11 @@ void settingsToJson(const Settings& src, JsonVariant dst, bool safe = false) {
     otOptions[FPSTR(S_AUTO_FAULT_RESET)] = src.opentherm.options.autoFaultReset;
     otOptions[FPSTR(S_AUTO_DIAG_RESET)] = src.opentherm.options.autoDiagReset;
     otOptions[FPSTR(S_SET_DATE_AND_TIME)] = src.opentherm.options.setDateAndTime;
-    otOptions[FPSTR(S_NATIVE_HEATING_CONTROL)] = src.opentherm.options.nativeHeatingControl;
+    otOptions[FPSTR(S_ALWAYS_SEND_INDOOR_TEMP)] = src.opentherm.options.alwaysSendIndoorTemp;
+    otOptions[FPSTR(S_NATIVE_OTC)] = src.opentherm.options.nativeOTC;
     otOptions[FPSTR(S_IMMERGAS_FIX)] = src.opentherm.options.immergasFix;
     
+
     auto mqtt = dst[FPSTR(S_MQTT)].to<JsonObject>();
     mqtt[FPSTR(S_ENABLED)] = src.mqtt.enabled;
     mqtt[FPSTR(S_SERVER)] = src.mqtt.server;
@@ -490,7 +491,9 @@ void settingsToJson(const Settings& src, JsonVariant dst, bool safe = false) {
   heating[FPSTR(S_ENABLED)] = src.heating.enabled;
   heating[FPSTR(S_TURBO)] = src.heating.turbo;
   heating[FPSTR(S_TARGET)] = roundf(src.heating.target, 2);
-  heating[FPSTR(S_HYSTERESIS)] = roundf(src.heating.hysteresis, 3);
+  heating[FPSTR(S_HYSTERESIS)][FPSTR(S_ENABLED)] = src.heating.hysteresis.enabled;
+  heating[FPSTR(S_HYSTERESIS)][FPSTR(S_VALUE)] = roundf(src.heating.hysteresis.value, 3);
+  heating[FPSTR(S_HYSTERESIS)][FPSTR(S_ACTION)] = static_cast<uint8_t>(src.heating.hysteresis.action);
   heating[FPSTR(S_TURBO_FACTOR)] = roundf(src.heating.turboFactor, 3);
   heating[FPSTR(S_MIN_TEMP)] = src.heating.minTemp;
   heating[FPSTR(S_MAX_TEMP)] = src.heating.maxTemp;
@@ -577,7 +580,7 @@ bool jsonToSettings(const JsonVariantConst src, Settings& dst, bool safe = false
     if (!src[FPSTR(S_SYSTEM)][FPSTR(S_LOG_LEVEL)].isNull()) {
       uint8_t value = src[FPSTR(S_SYSTEM)][FPSTR(S_LOG_LEVEL)].as<uint8_t>();
 
-      if (value != dst.system.logLevel && value >= TinyLogger::Level::SILENT && value <= TinyLogger::Level::VERBOSE) {
+      if (value != dst.system.logLevel && value >= TinyLoggerLevel::SILENT && value <= TinyLoggerLevel::VERBOSE) {
         dst.system.logLevel = value;
         changed = true;
       }
@@ -603,20 +606,11 @@ bool jsonToSettings(const JsonVariantConst src, Settings& dst, bool safe = false
       }
     }
 
-    if (src[FPSTR(S_SYSTEM)][FPSTR(S_TELNET)][FPSTR(S_ENABLED)].is<bool>()) {
+    if (src[FPSTR(S_SYSTEM)][FPSTR(S_WEBSERIAL)][FPSTR(S_ENABLED)].is<bool>()) {
-      bool value = src[FPSTR(S_SYSTEM)][FPSTR(S_TELNET)][FPSTR(S_ENABLED)].as<bool>();
+      bool value = src[FPSTR(S_SYSTEM)][FPSTR(S_WEBSERIAL)][FPSTR(S_ENABLED)].as<bool>();
 
-      if (value != dst.system.telnet.enabled) {
+      if (value != dst.system.webSerial.enabled) {
-        dst.system.telnet.enabled = value;
+        dst.system.webSerial.enabled = value;
-        changed = true;
-      }
-    }
-
-    if (!src[FPSTR(S_SYSTEM)][FPSTR(S_TELNET)][FPSTR(S_PORT)].isNull()) {
-      unsigned short value = src[FPSTR(S_SYSTEM)][FPSTR(S_TELNET)][FPSTR(S_PORT)].as<unsigned short>();
-
-      if (value > 0 && value <= 65535 && value != dst.system.telnet.port) {
-        dst.system.telnet.port = value;
         changed = true;
       }
     }
@@ -1001,11 +995,20 @@ bool jsonToSettings(const JsonVariantConst src, Settings& dst, bool safe = false
       }
     }
 
-    if (src[FPSTR(S_OPENTHERM)][FPSTR(S_OPTIONS)][FPSTR(S_NATIVE_HEATING_CONTROL)].is<bool>()) {
+    if (src[FPSTR(S_OPENTHERM)][FPSTR(S_OPTIONS)][FPSTR(S_ALWAYS_SEND_INDOOR_TEMP)].is<bool>()) {
-      bool value = src[FPSTR(S_OPENTHERM)][FPSTR(S_OPTIONS)][FPSTR(S_NATIVE_HEATING_CONTROL)].as<bool>();
+      bool value = src[FPSTR(S_OPENTHERM)][FPSTR(S_OPTIONS)][FPSTR(S_ALWAYS_SEND_INDOOR_TEMP)].as<bool>();
 
-      if (value != dst.opentherm.options.nativeHeatingControl) {
+      if (value != dst.opentherm.options.alwaysSendIndoorTemp) {
-        dst.opentherm.options.nativeHeatingControl = value;
+        dst.opentherm.options.alwaysSendIndoorTemp = value;
+        changed = true;
+      }
+    }
+
+    if (src[FPSTR(S_OPENTHERM)][FPSTR(S_OPTIONS)][FPSTR(S_NATIVE_OTC)].is<bool>()) {
+      bool value = src[FPSTR(S_OPENTHERM)][FPSTR(S_OPTIONS)][FPSTR(S_NATIVE_OTC)].as<bool>();
+
+      if (value != dst.opentherm.options.nativeOTC) {
+        dst.opentherm.options.nativeOTC = value;
 
         if (value) {
           dst.equitherm.enabled = false;
@@ -1025,7 +1028,6 @@ bool jsonToSettings(const JsonVariantConst src, Settings& dst, bool safe = false
       }
     }
 
-
     // mqtt
     if (src[FPSTR(S_MQTT)][FPSTR(S_ENABLED)].is<bool>()) {
       bool value = src[FPSTR(S_MQTT)][FPSTR(S_ENABLED)].as<bool>();
@@ -1116,7 +1118,7 @@ bool jsonToSettings(const JsonVariantConst src, Settings& dst, bool safe = false
   if (src[FPSTR(S_EQUITHERM)][FPSTR(S_ENABLED)].is<bool>()) {
     bool value = src[FPSTR(S_EQUITHERM)][FPSTR(S_ENABLED)].as<bool>();
 
-    if (!dst.opentherm.options.nativeHeatingControl) {
+    if (!dst.opentherm.options.nativeOTC) {
       if (value != dst.equitherm.enabled) {
         dst.equitherm.enabled = value;
         changed = true;
@@ -1169,7 +1171,7 @@ bool jsonToSettings(const JsonVariantConst src, Settings& dst, bool safe = false
   if (src[FPSTR(S_PID)][FPSTR(S_ENABLED)].is<bool>()) {
     bool value = src[FPSTR(S_PID)][FPSTR(S_ENABLED)].as<bool>();
 
-    if (!dst.opentherm.options.nativeHeatingControl) {
+    if (!dst.opentherm.options.nativeOTC) {
       if (value != dst.pid.enabled) {
         dst.pid.enabled = value;
         changed = true;
@@ -1314,15 +1316,41 @@ bool jsonToSettings(const JsonVariantConst src, Settings& dst, bool safe = false
     }
   }
 
-  if (!src[FPSTR(S_HEATING)][FPSTR(S_HYSTERESIS)].isNull()) {
+  if (src[FPSTR(S_HEATING)][FPSTR(S_HYSTERESIS)][FPSTR(S_ENABLED)].is<bool>()) {
-    float value = src[FPSTR(S_HEATING)][FPSTR(S_HYSTERESIS)].as<float>();
+    bool value = src[FPSTR(S_HEATING)][FPSTR(S_HYSTERESIS)][FPSTR(S_ENABLED)].as<bool>();
 
-    if (value >= 0.0f && value <= 15.0f && fabsf(value - dst.heating.hysteresis) > 0.0001f) {
+    if (value != dst.heating.hysteresis.enabled) {
-      dst.heating.hysteresis = roundf(value, 2);
+      dst.heating.hysteresis.enabled = value;
       changed = true;
     }
   }
 
+  if (!src[FPSTR(S_HEATING)][FPSTR(S_HYSTERESIS)][FPSTR(S_VALUE)].isNull()) {
+    float value = src[FPSTR(S_HEATING)][FPSTR(S_HYSTERESIS)][FPSTR(S_VALUE)].as<float>();
+
+    if (value >= 0.0f && value <= 15.0f && fabsf(value - dst.heating.hysteresis.value) > 0.0001f) {
+      dst.heating.hysteresis.value = roundf(value, 2);
+      changed = true;
+    }
+  }
+
+  if (!src[FPSTR(S_HEATING)][FPSTR(S_HYSTERESIS)][FPSTR(S_ACTION)].isNull()) {
+    uint8_t value = src[FPSTR(S_HEATING)][FPSTR(S_HYSTERESIS)][FPSTR(S_ACTION)].as<uint8_t>();
+
+    switch (value) {
+      case static_cast<uint8_t>(HysteresisAction::DISABLE_HEATING):
+      case static_cast<uint8_t>(HysteresisAction::SET_ZERO_TARGET):
+        if (static_cast<uint8_t>(dst.heating.hysteresis.action) != value) {
+         dst.heating.hysteresis.action = static_cast<HysteresisAction>(value);
+          changed = true;
+        }
+        break;
+
+      default:
+        break;
+    }
+  }
+
   if (!src[FPSTR(S_HEATING)][FPSTR(S_TURBO_FACTOR)].isNull()) {
     float value = src[FPSTR(S_HEATING)][FPSTR(S_TURBO_FACTOR)].as<float>();
 
@@ -1676,7 +1704,7 @@ bool jsonToSettings(const JsonVariantConst src, Settings& dst, bool safe = false
   // force check emergency target
   {
     float value = !src[FPSTR(S_EMERGENCY)][FPSTR(S_TARGET)].isNull() ? src[FPSTR(S_EMERGENCY)][FPSTR(S_TARGET)].as<float>() : dst.emergency.target;
-    bool noRegulators = !dst.opentherm.options.nativeHeatingControl;
+    bool noRegulators = !dst.opentherm.options.nativeOTC;
     bool valid = isValidTemp(
       value,
       dst.system.unitSystem,
@@ -1701,7 +1729,7 @@ bool jsonToSettings(const JsonVariantConst src, Settings& dst, bool safe = false
 
   // force check heating target
   {
-    bool indoorTempControl = dst.equitherm.enabled || dst.pid.enabled || dst.opentherm.options.nativeHeatingControl;
+    bool indoorTempControl = dst.equitherm.enabled || dst.pid.enabled || dst.opentherm.options.nativeOTC;
     float minTemp = indoorTempControl ? THERMOSTAT_INDOOR_MIN_TEMP : dst.heating.minTemp;
     float maxTemp = indoorTempControl ? THERMOSTAT_INDOOR_MAX_TEMP : dst.heating.maxTemp;
 
@@ -1894,10 +1922,13 @@ bool jsonToSensorSettings(const uint8_t sensorId, const JsonVariantConst src, Se
       case static_cast<uint8_t>(Sensors::Type::OT_DHW_BURNER_HOURS):
       case static_cast<uint8_t>(Sensors::Type::OT_HEATING_PUMP_HOURS):
       case static_cast<uint8_t>(Sensors::Type::OT_DHW_PUMP_HOURS):
+      case static_cast<uint8_t>(Sensors::Type::OT_COOLING_HOURS):
 
       case static_cast<uint8_t>(Sensors::Type::NTC_10K_TEMP):
       case static_cast<uint8_t>(Sensors::Type::DALLAS_TEMP):
       case static_cast<uint8_t>(Sensors::Type::BLUETOOTH):
+      case static_cast<uint8_t>(Sensors::Type::DHT11):
+      case static_cast<uint8_t>(Sensors::Type::DHT22):
       case static_cast<uint8_t>(Sensors::Type::HEATING_SETPOINT_TEMP):
       case static_cast<uint8_t>(Sensors::Type::MANUAL):
       case static_cast<uint8_t>(Sensors::Type::NOT_CONFIGURED):
@@ -1914,7 +1945,8 @@ 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::NTC_10K_TEMP) {
+    if (dst.type != Sensors::Type::DALLAS_TEMP && dst.type != Sensors::Type::NTC_10K_TEMP &&
+        dst.type != Sensors::Type::DHT11 && dst.type != Sensors::Type::DHT22) {
       if (dst.gpio != GPIO_IS_NOT_CONFIGURED) {
         dst.gpio = GPIO_IS_NOT_CONFIGURED;
         changed = true;
@@ -2055,6 +2087,10 @@ void sensorResultToJson(const uint8_t sensorId, JsonVariant dst) {
     dst[FPSTR(S_BATTERY)] = roundf(rSensor.values[static_cast<uint8_t>(Sensors::ValueType::BATTERY)], 1);
     dst[FPSTR(S_RSSI)] = roundf(rSensor.values[static_cast<uint8_t>(Sensors::ValueType::RSSI)], 0);
 
+  } else if (sSensor.type == Sensors::Type::DHT11 || sSensor.type == Sensors::Type::DHT22) {
+    dst[FPSTR(S_TEMPERATURE)] = roundf(rSensor.values[static_cast<uint8_t>(Sensors::ValueType::TEMPERATURE)], 3);
+    dst[FPSTR(S_HUMIDITY)] = roundf(rSensor.values[static_cast<uint8_t>(Sensors::ValueType::HUMIDITY)], 3);
+
   } else {
     dst[FPSTR(S_VALUE)] = roundf(rSensor.values[static_cast<uint8_t>(Sensors::ValueType::PRIMARY)], 3);
   }
@@ -2070,21 +2106,18 @@ bool jsonToSensorResult(const uint8_t sensorId, const JsonVariantConst src) {
     return false;
   }
 
-  auto& dst = Sensors::results[sensorId];
-  bool changed = false;
-
   // value
   if (!src[FPSTR(S_VALUE)].isNull()) {
-    float value = src[FPSTR(S_VALUE)].as<float>();
+    return Sensors::setValueById(
-
+      sensorId,
-    uint8_t vType = static_cast<uint8_t>(Sensors::ValueType::PRIMARY);
+      src[FPSTR(S_VALUE)].as<float>(),
-    if (fabsf(value - dst.values[vType]) > 0.0001f) {
+      Sensors::ValueType::PRIMARY,
-      dst.values[vType] = roundf(value, 2);
+      true,
-      changed = true;
+      true
-    }
+    );
   }
 
-  return changed;
+  return false;
 }
 
 void varsToJson(const Variables& src, JsonVariant dst) {
@@ -2093,7 +2126,7 @@ void varsToJson(const Variables& src, JsonVariant dst) {
   slave[FPSTR(S_FLAGS)] = src.slave.flags;
   slave[FPSTR(S_TYPE)] = src.slave.type;
   slave[FPSTR(S_APP_VERSION)] = src.slave.appVersion;
-  slave[FPSTR(S_PROTOCOL_VERSION)] = src.slave.appVersion;
+  slave[FPSTR(S_PROTOCOL_VERSION)] = src.slave.protocolVersion;
   slave[FPSTR(S_CONNECTED)] = src.slave.connected;
   slave[FPSTR(S_FLAME)] = src.slave.flame;
 

src_data/locales/cn.json

@@ -44,6 +44,7 @@
         "build": {
           "title": "Build",
           "version": "固件版本",
+          "commit": "Commit",
           "date": "日期",
           "core": "内核版本",
           "sdk": "SDK"
@@ -243,10 +244,13 @@
         "otDhwBurnerHours": "OpenTherm, number of burner operating hours (DHW)",
         "otHeatingPumpHours": "OpenTherm, number of pump operating hours (heating)",
         "otDhwPumpHours": "OpenTherm, number of pump operating hours (DHW)",
+        "otCoolingHours": "OpenTherm, number of cooling hours",
         
         "ntcTemp": "NTC 传感器",
         "dallasTemp": "DALLAS 传感器",
         "bluetooth": "BLE 传感器",
+        "dht11": "DHT11 传感器",
+        "dht22": "DHT22 传感器",
         "heatSetpointTemp": "Heating, setpoint temp",
         "manual": "通过 MQTT/API 手动配置",
         "notConfigured": "未配置"
@@ -341,12 +345,8 @@
           "enable": "启用串口",
           "baud": "串口波特率"
         },
-        "telnet": {
+        "webSerial": {
-          "enable": "启用 Telnet",
+          "enable": "启用 WebSerial"
-          "port": {
-            "title": "Telnet 端口",
-            "note": "默认值：23"
-          }
         },
         "ntp": {
           "server": "NTP服务器",
@@ -356,7 +356,16 @@
       },
 
       "heating": {
-        "hyst": "滞后值<small>(单位：度)</small>",
+        "hyst": {
+          "title": "滞回",
+          "desc": "滞回有助于维持设定的室内温度（在使用«Equitherm»和/或«PID»时）。强制禁用加热当<code>current indoor > target + value</code>，启用加热当<code>current indoor < (target - value)</code>。",
+          "value": "值 <small>(以度为单位)</small>",
+          "action": {
+            "title": "行动",
+            "disableHeating": "禁用加热",
+            "set0target": "设置空目标"
+          }
+        },
         "turboFactor": "Turbo 模式系数"
       },
 
@@ -371,11 +380,26 @@
       },
 
       "equitherm": {
-        "n": "N 系数",
+        "slope": {
-        "k": "K 系数",
+          "title": "斜率",
-        "t": {
+          "note": "热损失补偿。主要调谐参数。"
-          "title": "T 系数",
+        },
-          "note": "启用PID时此参数无效"
+        "exponent": {
+          "title": "指数",
+          "note": "散热器效率。典型值：<code>1.1</code> - 地板采暖，<code>1.2</code> - 铸铁，<code>1.3</code> - 面板散热器，<code>1.4</code> - 对流器。"
+        },
+        "shift": {
+          "title": "偏移",
+          "note": "补偿额外热损失（例如，在管道中）或额外热源。"
+        },
+        "targetDiffFactor": {
+          "title": "T 因子",
+          "note": "如果启用 PID，则不使用。将目标和当前室内温度之间的差值添加到设定点：<code>setpoint = setpoint + ((target - indoor) * T)</code>。"
+        },
+        "chart": {
+          "targetTemp": "目标室内温度",
+          "setpointTemp": "热载体温度",
+          "outdoorTemp": "室外温度"
         }
       },
 
@@ -433,12 +457,13 @@
           "autoFaultReset": "自动报警复位 <small>(不推荐！)</small>",
           "autoDiagReset": "自动诊断复位 <small>(不推荐！)</small>",
           "setDateAndTime": "同步设置锅炉日期与时间",
-          "immergasFix": "针对Immergas锅炉的兼容性修复"
+          "immergasFix": "针对Immergas锅炉的兼容性修复",
+          "alwaysSendIndoorTemp": "向锅炉发送当前室内温度"
         },
 
-        "nativeHeating": {
+        "nativeOTC": {
-          "title": "原生锅炉供暖控制",
+          "title": "原生热载体温度计算模式",
-          "note": "<u>注意：</u> 仅适用于锅炉需接收目标室温并自主调节载热介质温度的场景，与固件中的PID及Equithermq气候补偿功能不兼容。"
+          "note": "仅在锅炉处于 OTC 模式时<u>才</u>工作：需要并接受目标室内温度，并基于内置曲线模式自行调节热载体温度。与 PID 和 Equitherm 不兼容。"
         }
       },
 

src_data/locales/en.json

@@ -44,6 +44,7 @@
         "build": {
           "title": "Build",
           "version": "Version",
+          "commit": "Commit",
           "date": "Date",
           "core": "Core",
           "sdk": "SDK"
@@ -243,10 +244,13 @@
         "otDhwBurnerHours": "OpenTherm, number of burner operating hours (DHW)",
         "otHeatingPumpHours": "OpenTherm, number of pump operating hours (heating)",
         "otDhwPumpHours": "OpenTherm, number of pump operating hours (DHW)",
+        "otCoolingHours": "OpenTherm, number of cooling hours",
         
         "ntcTemp": "NTC sensor",
         "dallasTemp": "DALLAS sensor",
         "bluetooth": "BLE sensor",
+        "dht11": "DHT11 sensor",
+        "dht22": "DHT22 sensor",
         "heatSetpointTemp": "Heating, setpoint temp",
         "manual": "Manual via MQTT/API",
         "notConfigured": "Not configured"
@@ -341,12 +345,8 @@
           "enable": "Enabled Serial port",
           "baud": "Serial port baud rate"
         },
-        "telnet": {
+        "webSerial": {
-          "enable": "Enabled Telnet",
+          "enable": "Enabled WebSerial"
-          "port": {
-            "title": "Telnet port",
-            "note": "Default: 23"
-          }
         },
         "ntp": {
           "server": "NTP server",
@@ -356,7 +356,16 @@
       },
 
       "heating": {
-        "hyst": "Hysteresis <small>(in degrees)</small>",
+        "hyst": {
+          "title": "Hysteresis",
+          "desc": "Hysteresis is useful for maintaining a set indoor temp (when using «Equitherm» and/or «PID»). Forces disable heating when <code>current indoor > target + value</code> and enable heating when <code>current indoor < (target - value)</code>.",
+          "value": "Value <small>(in degrees)</small>",
+          "action": {
+            "title": "Action",
+            "disableHeating": "Disable heating",
+            "set0target": "Set null target"
+          }
+        },
         "turboFactor": "Turbo mode coeff."
       },
 
@@ -448,12 +457,13 @@
           "autoFaultReset": "Auto fault reset <small>(not recommended!)</small>",
           "autoDiagReset": "Auto diag reset <small>(not recommended!)</small>",
           "setDateAndTime": "Set date & time on boiler",
-          "immergasFix": "Fix for Immergas boilers"
+          "immergasFix": "Fix for Immergas boilers",
+          "alwaysSendIndoorTemp": "Send current indoor temp to boiler"
         },
 
-        "nativeHeating": {
+        "nativeOTC": {
-          "title": "Native heating control (boiler)",
+          "title": "Native OTC mode",
-          "note": "Works <u>ONLY</u> if the boiler requires the desired room temperature and regulates the temperature of the coolant itself. Not compatible with PID and Equitherm regulators in firmware."
+          "note": "Works <u>ONLY</u> if the boiler is in OTC mode: requires and accepts the target indoor temperature and self-regulates the heat carrier temperature based on the built-in curves mode. Incompatible with PID and Equitherm."
         }
       },
 

src_data/locales/it.json

@@ -44,6 +44,7 @@
         "build": {
           "title": "Build",
           "version": "Versione",
+          "commit": "Commit",
           "date": "Data",
           "core": "Core",
           "sdk": "SDK"
@@ -243,10 +244,13 @@
         "otDhwBurnerHours": "OpenTherm, numero di ore di funzionamento del bruciatore (ACS)",
         "otHeatingPumpHours": "OpenTherm, numero di ore di funzionamento della pompa (riscaldamento)",
         "otDhwPumpHours": "OpenTherm, numero di ore di funzionamento della pompa (ACS)",
+        "otCoolingHours": "OpenTherm, numero di ore di funzionamento della cooling",
         
         "ntcTemp": "Sensore NTC",
         "dallasTemp": "Sensore DALLAS",
         "bluetooth": "Sensore BLE",
+        "dht11": "Sensore DHT11",
+        "dht22": "Sensore DHT22",
         "heatSetpointTemp": "Riscaldamento, temp impostata",
         "manual": "Manuale via MQTT/API",
         "notConfigured": "Non configurato"
@@ -341,12 +345,8 @@
           "enable": "Porta seriale attivata",
           "baud": "Porta seriale baud rate"
         },
-        "telnet": {
+        "webSerial": {
-          "enable": "Telnet attivato",
+          "enable": "WebSerial attivato"
-          "port": {
-            "title": "Porta Telnet",
-            "note": "Default: 23"
-          }
         },
         "ntp": {
           "server": "NTP server",
@@ -356,7 +356,16 @@
       },
 
       "heating": {
-        "hyst": "Isteresi <small>(in gradi)</small>",
+        "hyst": {
+          "title": "Isteresi",
+          "desc": "L'isteresi è utile per mantenere una temperatura interna impostata (quando si utilizza «Equitherm» e/o «PID»). Forza la disabilitazione del riscaldamento quando <code>current indoor > target + value</code> e abilita il riscaldamento quando <code>current indoor < (target - value)</code>.",
+          "value": "Valore <small>(in gradi)</small>",
+          "action": {
+            "title": "Azione",
+            "disableHeating": "Disabilita riscaldamento",
+            "set0target": "Imposta target nullo"
+          }
+        },
         "turboFactor": "Turbo mode coeff."
       },
 
@@ -373,23 +382,23 @@
       "equitherm": {
         "slope": {
           "title": "Pendenza",
-          "note": "Compensazione delle perdite di calore. Principale parametro di regolazione."
+          "note": "Compensazione della perdita di calore. Parametro di regolazione principale."
         },
         "exponent": {
           "title": "Esponente",
-          "note": "Efficienza del radiatore. Valori tipici: <code>1.1</code> - Riscaldamento a pavimento, <code>1.2</code> - Radiatori in ghisa, <code>1.3</code> - Radiatori a pannelli, <code>1.4</code> - Convetttori."
+          "note": "Efficienza del radiatore. Valori tipici: <code>1.1</code> - Riscaldamento a pavimento, <code>1.2</code> - Ghisa, <code>1.3</code> - Radiatori a pannello, <code>1.4</code> - Convettori."
         },
         "shift": {
-          "title": "Spostare",
+          "title": "Spostamento",
-          "note": "Compensa le perdite di calore aggiuntive (ad esempio, nelle tubature) o fonti di calore extra."
+          "note": "Compensa perdite di calore aggiuntive (ad es., nelle tubature) o fonti di calore extra."
         },
         "targetDiffFactor": {
           "title": "Fattore T",
-          "note": "Non usato se PID è attivato. Aggiunge al setpoint la differenza tra la temperatura interna target e quella attuale: <code>setpoint = setpoint + ((target - indoor) * T)</code>."
+          "note": "Non utilizzato se PID è abilitato. Aggiunge al setpoint la differenza tra la temperatura target e quella interna attuale: <code>setpoint = setpoint + ((target - indoor) * T)</code>."
         },
         "chart": {
           "targetTemp": "Temperatura interna target",
-          "setpointTemp": "Temperatura del portatore di calore",
+          "setpointTemp": "Temperatura del vettore termico",
           "outdoorTemp": "Temperatura esterna"
         }
       },
@@ -448,12 +457,13 @@
           "autoFaultReset": "Ripristino automatico degli errori <small>(sconsigliato!)</small>",
           "autoDiagReset": "Ripristino diagnostico automatica <small>(sconsigliato!)</small>",
           "setDateAndTime": "Imposta data e ora sulla caldaia",
-          "immergasFix": "Fix per caldiaie Immergas"
+          "immergasFix": "Fix per caldiaie Immergas",
+          "alwaysSendIndoorTemp": "Invia la temp attuale interna alla caldaia"
         },
 
-        "nativeHeating": {
+        "nativeOTC": {
-          "title": "Controllo del riscaldamento nativo (caldaia)",
+          "title": "Modalità nativa di calcolo della temperatura del vettore termico",
-          "note": "Lavora <u>SOLO</u> se la caldaia richiede la temperatura ambiente desiderata e regola autonomamente la temperatura del fluido. Non compatiblile con regolazioni PID e Equitherm del sistema."
+          "note": "Funziona <u>SOLO</u> se la caldaia è in modalità OTC: richiede e accetta la temperatura interna target e regola autonomamente la temperatura del vettore termico basata sulla modalità curve integrata. Incompatibile con PID e Equitherm."
         }
       },
 

src_data/locales/nl.json

@@ -40,6 +40,7 @@
         "build": {
           "title": "Build",
           "version": "Versie",
+          "commit": "Commit",
           "date": "Datum",
           "core": "Core",
           "sdk": "SDK"
@@ -222,9 +223,13 @@
         "otDhwBurnerHours": "OpenTherm, aantal branderuren (warm water)",
         "otHeatingPumpHours": "OpenTherm, aantal pompuren (verwarming)",
         "otDhwPumpHours": "OpenTherm, aantal pompuren (warm water)",
+        "otCoolingHours": "OpenTherm, aantal cooling",
+
         "ntcTemp": "NTC-sensor",
         "dallasTemp": "DALLAS-sensor",
         "bluetooth": "BLE-sensor",
+        "dht11": "DHT11-sensor",
+        "dht22": "DHT22-sensor",
         "heatSetpointTemp": "Verwarming, insteltemperatuur",
         "manual": "Handmatig via MQTT/API",
         "notConfigured": "Niet geconfigureerd"
@@ -313,12 +318,8 @@
           "enable": "Seriële poort ingeschakeld",
           "baud": "Baudrate seriële poort"
         },
-        "telnet": {
+        "webSerial": {
-          "enable": "Telnet ingeschakeld",
+          "enable": "WebSerial ingeschakeld"
-          "port": {
-            "title": "Telnet-poort",
-            "note": "Standaard: 23"
-          }
         },
         "ntp": {
           "server": "NTP-server",
@@ -327,7 +328,16 @@
         }
       },
       "heating": {
-        "hyst": "Hysterese <small>(in graden)</small>",
+        "hyst": {
+          "title": "Hysterese",
+          "desc": "Hysterese is nuttig voor het handhaven van een ingestelde binnentemperatuur (bij gebruik van «Equitherm» en/of «PID»). Forceert uitschakelen van verwarming wanneer <code>current indoor > target + value</code> en inschakelen van verwarming wanneer <code>current indoor < (target - value)</code>.",
+          "value": "Waarde <small>(in graden)</small>",
+          "action": {
+            "title": "Actie",
+            "disableHeating": "Verwarming uitschakelen",
+            "set0target": "Stel null target in"
+          }
+        },
         "turboFactor": "Turbomodus coëff."
       },
       "emergency": {
@@ -339,11 +349,26 @@
         "treshold": "Drempeltijd <small>(sec)</small>"
       },
       "equitherm": {
-        "n": "N-factor",
+        "slope": {
-        "k": "K-factor",
+          "title": "Helling",
-        "t": {
+          "note": "Compensatie voor warmteverlies. Hoofdafstelparameter."
-          "title": "T-factor",
+        },
-          "note": "Niet gebruikt als PID is ingeschakeld"
+        "exponent": {
+          "title": "Exponent",
+          "note": "Radiator efficiëntie. Typische waarden: <code>1.1</code> - Vloerverwarming, <code>1.2</code> - Gietijzer, <code>1.3</code> - Paneelradiatoren, <code>1.4</code> - Convectors."
+        },
+        "shift": {
+          "title": "Verschuiving",
+          "note": "Compenseert voor extra warmteverliezen (bijv. in leidingen) of extra warmtebronnen."
+        },
+        "targetDiffFactor": {
+          "title": "T factor",
+          "note": "Niet gebruikt als PID is ingeschakeld. Voegt aan de setpoint de verschil tussen de target en huidige binnentemperatuur toe: <code>setpoint = setpoint + ((target - indoor) * T)</code>."
+        },
+        "chart": {
+          "targetTemp": "Doel binnentemperatuur",
+          "setpointTemp": "Warmtedrager temperatuur",
+          "outdoorTemp": "Buitentemperatuur"
         }
       },
       "pid": {
@@ -398,11 +423,13 @@
           "autoFaultReset": "Automatische storingsreset <small>(niet aanbevolen!)</small>",
           "autoDiagReset": "Automatische diagnosereset <small>(niet aanbevolen!)</small>",
           "setDateAndTime": "Stel datum & tijd in op ketel",
-          "immergasFix": "Fix voor Immergas-ketels"
+          "immergasFix": "Fix voor Immergas-ketels",
+          "alwaysSendIndoorTemp": "Stuur huidige binnentemp naar ketel"
         },
-        "nativeHeating": {
+
-          "title": "Natuurlijke verwarmingsregeling (ketel)",
+        "nativeOTC": {
-          "note": "Werkt <u>ALLEEN</u> als de ketel de gewenste kamertemperatuur vereist en zelf de temperatuur van de warmtedrager regelt. Niet compatibel met PID- en Equitherm-regelaars in de firmware."
+          "title": "Native warmtedrager temperatuur berekeningsmodus",
+          "note": "Werkt <u>ALLEEN</u> als de ketel in OTC-modus is: vereist en accepteert de doel binnentemperatuur en regelt zelf de warmtedrager temperatuur op basis van de ingebouwde curves modus. Incompatibel met PID en Equitherm."
         }
       },
       "mqtt": {

src_data/locales/ru.json

@@ -44,6 +44,7 @@
         "build": {
           "title": "Билд",
           "version": "Версия",
+          "commit": "Коммит",
           "date": "Дата",
           "core": "Ядро",
           "sdk": "SDK"
@@ -243,10 +244,13 @@
         "otDhwBurnerHours": "OpenTherm, кол-во часов работы горелки (ГВС)",
         "otHeatingPumpHours": "OpenTherm, кол-во часов работы насоса (отопление)",
         "otDhwPumpHours": "OpenTherm, кол-во часов работы насоса (ГВС)",
+        "otCoolingHours": "OpenTherm, кол-во часов работы охлаждения",
         
         "ntcTemp": "NTC датчик",
         "dallasTemp": "DALLAS датчик",
         "bluetooth": "BLE датчик",
+        "dht11": "DHT11 датчик",
+        "dht22": "DHT22 датчик",
         "heatSetpointTemp": "Отопление, температура уставки",
         "manual": "Вручную через MQTT/API",
         "notConfigured": "Не сконфигурировано"
@@ -341,12 +345,8 @@
           "enable": "Вкл. Serial порт",
           "baud": "Скорость Serial порта"
         },
-        "telnet": {
+        "webSerial": {
-          "enable": "Вкл. Telnet",
+          "enable": "Вкл. WebSerial"
-          "port": {
-            "title": "Telnet порт",
-            "note": "По умолчанию: 23"
-          }
         },
         "ntp": {
           "server": "NTP сервер",
@@ -356,7 +356,16 @@
       },
 
       "heating": {
-        "hyst": "Гистерезис <small>(в градусах)</small>",
+        "hyst": {
+          "title": "Гистерезис",
+          "desc": "Гистерезис полезен для поддержания заданной внутр. темп. (при использовании «ПЗА» и/или «ПИД»). Принудительно откл. отопление, когда <code>current indoor > target + value</code>, и вкл. отопление, когда <code>current indoor < (target - value)</code>.",
+          "value": "Значение <small>(в градусах)</small>",
+          "action": {
+            "title": "Действие",
+            "disableHeating": "Отключить отопление",
+            "set0target": "Установить 0 в качестве целевой темп."
+          }
+        },
         "turboFactor": "Коэфф. турбо режима"
       },
 
@@ -448,12 +457,13 @@
           "autoFaultReset": "Автоматический сброс ошибок <small>(не рекомендуется!)</small>",
           "autoDiagReset": "Автоматический сброс диагностики <small>(не рекомендуется!)</small>",
           "setDateAndTime": "Устанавливать время и дату на котле",
-          "immergasFix": "Фикс для котлов Immergas"
+          "immergasFix": "Фикс для котлов Immergas",
+          "alwaysSendIndoorTemp": "Передавать текущую темп. в помещении котлу"
         },
 
-        "nativeHeating": {
+        "nativeOTC": {
-          "title": "Передать управление отоплением котлу",
+          "title": "Нативный режим OTC (расчёт температуры теплоносителя)",
-          "note": "Работает <u>ТОЛЬКО</u> если котел требует и принимает целевую температуру в помещении и сам регулирует температуру теплоносителя на основе встроенного режима кривых. Несовместимо с ПИД и ПЗА."
+          "note": "Работает <u>ТОЛЬКО</u> если котел в режиме OTC: требует и принимает целевую температуру в помещении и сам регулирует температуру теплоносителя на основе встроенного режима кривых. Несовместимо с ПИД и ПЗА."
         }
       },
 

src_data/pages/dashboard.html

@@ -491,6 +491,9 @@
             if (modified) {
               parameters.method = "POST";
               parameters.body = JSON.stringify(newSettings);
+              parameters.headers = {
+                "Content-Type": "application/json"
+              };
             }
 
             const response = await fetch("/api/settings", parameters);

src_data/pages/index.html

@@ -104,6 +104,7 @@
                 <th scope="row" data-i18n>index.system.build.title</th>
                 <td>
                   Env: <b id="build-env"></b><br />
+                  <span data-i18n>index.system.build.commit</span>: <b id="build-commit"></b><br />
                   <span data-i18n>index.system.build.date</span>: <b id="build-date"></b><br />
                   <span data-i18n>index.system.build.core</span>: <b id="build-core"></b><br />
                   <span data-i18n>index.system.build.sdk</span>: <b id="build-sdk"></b>
@@ -206,6 +207,7 @@
             setBusy('#main-busy', '#main-table', false);
 
             setValue('#build-version', result.build.version);
+            setValue('#build-commit', result.build.commit);
             setValue('#build-date', result.build.date);
             setValue('#build-env', result.build.env);
             setValue('#build-core', result.build.core);

src_data/pages/sensors.html

@@ -113,10 +113,13 @@
                       <option value="24" data-i18n>sensors.types.otDhwBurnerHours</option>
                       <option value="25" data-i18n>sensors.types.otHeatingPumpHours</option>
                       <option value="26" data-i18n>sensors.types.otDhwPumpHours</option>
+                      <option value="27" data-i18n>sensors.types.otCoolingHours</option>
 
                       <option value="50" data-i18n>sensors.types.ntcTemp</option>
                       <option value="51" data-i18n>sensors.types.dallasTemp</option>
                       <option value="52" data-i18n>sensors.types.bluetooth</option>
+                      <option value="53" data-i18n>sensors.types.dht11</option>
+                      <option value="54" data-i18n>sensors.types.dht22</option>
                       <option value="253" data-i18n>sensors.types.heatSetpointTemp</option>
                       <option value="254" data-i18n>sensors.types.manual</option>
                       <option value="255" data-i18n>sensors.types.notConfigured</option>
@@ -270,27 +273,35 @@
               }
 
               switch(parseInt(event.target.value)) {
-                // ntc
+                // NTC10K
                 case 50:
                   parentGpio.classList.remove("hidden");
                   parentAddress.classList.add("hidden");
                   address.removeAttribute("pattern");
                   break;
 
-                // dallas
+                // OneWire
                 case 51:
                   parentGpio.classList.remove("hidden");
                   parentAddress.classList.remove("hidden");
                   address.setAttribute("pattern", "([A-Fa-f0-9]{2}:){7}[A-Fa-f0-9]{2}");
                   break;
 
-                // ble
+                // Bluetooth
                 case 52:
                   parentGpio.classList.add("hidden");
                   parentAddress.classList.remove("hidden");
                   address.setAttribute("pattern", "([A-Fa-f0-9]{2}:){5}[A-Fa-f0-9]{2}");
                   break;
 
+                // DHT
+                case 53:
+                case 54:
+                  parentGpio.classList.remove("hidden");
+                  parentAddress.classList.add("hidden");
+                  address.removeAttribute("pattern");
+                  break;
+
                 // other
                 default:
                   parentGpio.classList.add("hidden");

src_data/pages/settings.html

@@ -126,8 +126,8 @@
                 </label>
 
                 <label>
-                  <input type="checkbox" name="system[telnet][enabled]" value="true">
+                  <input type="checkbox" name="system[webSerial][enabled]" value="true">
-                  <span data-i18n>settings.system.telnet.enable</span>
+                  <span data-i18n>settings.system.webSerial.enable</span>
                 </label>
 
                 <label>
@@ -156,12 +156,6 @@
                       <option value="115200">115200</option>
                     </select>
                   </label>
-
-                  <label>
-                    <span data-i18n>settings.system.telnet.port.title</span>
-                    <input type="number" inputmode="numeric" name="system[telnet][port]" min="1" max="65535" step="1" required>
-                    <small data-i18n>settings.system.telnet.port.note</small>
-                  </label>
                 </div>
 
                 <mark data-i18n>settings.note.restart</mark>
@@ -193,21 +187,48 @@
               </div>
 
               <div class="grid">
-                <label>
-                  <span data-i18n>settings.heating.hyst</span>
-                  <input type="number" inputmode="decimal" name="heating[hysteresis]" min="0" max="5" step="0.05" required>
-                </label>
-
                 <label>
                   <span data-i18n>settings.heating.turboFactor</span>
                   <input type="number" inputmode="decimal" name="heating[turboFactor]" min="1.5" max="10" step="0.1" required>
                 </label>
-              </div>
 
                 <label>
                   <span data-i18n>settings.maxModulation</span>
                   <input type="number" inputmode="numeric" name="heating[maxModulation]" min="1" max="100" step="1" required>
                 </label>
+              </div>
+
+              <hr />
+
+              <details>
+                <summary><b data-i18n>settings.heating.hyst.title</b></summary>
+                
+                <div>
+                  <fieldset>
+                    <label>
+                      <input type="checkbox" name="heating[hysteresis][enabled]" value="true">
+                      <span data-i18n>settings.enable</span>
+                    </label>
+                  </fieldset>
+
+                  <div class="grid">
+                    <label>
+                      <span data-i18n>settings.heating.hyst.value</span>
+                      <input type="number" inputmode="decimal" name="heating[hysteresis][value]" min="0" max="5" step="0.05" required>
+                    </label>
+
+                    <label>
+                      <span data-i18n>settings.heating.hyst.action.title</span>
+                      <select name="heating[hysteresis][action]">
+                        <option value="0" data-i18n>settings.heating.hyst.action.disableHeating</option>
+                        <option value="1" data-i18n>settings.heating.hyst.action.set0target</option>
+                      </select>
+                    </label>
+                  </div>
+                </div>
+
+                <small data-i18n>settings.heating.hyst.desc</small>
+              </details>
 
               <hr />
 
@@ -665,12 +686,17 @@
                       <span data-i18n>settings.ot.options.immergasFix</span>
                     </label>
 
+                    <label>
+                      <input type="checkbox" name="opentherm[options][alwaysSendIndoorTemp]" value="true">
+                      <span data-i18n>settings.ot.options.alwaysSendIndoorTemp</span>
+                    </label>
+
                     <hr />
 
                     <label>
-                      <input type="checkbox" name="opentherm[options][nativeHeatingControl]" value="true">
+                      <input type="checkbox" name="opentherm[options][nativeOTC]" value="true">
-                      <span data-i18n>settings.ot.nativeHeating.title</span><br />
+                      <span data-i18n>settings.ot.nativeOTC.title</span><br />
-                      <small data-i18n>settings.ot.nativeHeating.note</small>
+                      <small data-i18n>settings.ot.nativeOTC.note</small>
                     </label>
                   </fieldset>
                 </div>
@@ -1051,8 +1077,7 @@
           setSelectValue("[name='system[logLevel]']", data.system.logLevel);
           setCheckboxValue("[name='system[serial][enabled]']", data.system.serial.enabled);
           setSelectValue("[name='system[serial][baudrate]']", data.system.serial.baudrate);
-          setCheckboxValue("[name='system[telnet][enabled]']", data.system.telnet.enabled);
+          setCheckboxValue("[name='system[webSerial][enabled]']", data.system.webSerial.enabled);
-          setInputValue("[name='system[telnet][port]']", data.system.telnet.port);
           setInputValue("[name='system[ntp][server]']", data.system.ntp.server);
           setInputValue("[name='system[ntp][timezone]']", data.system.ntp.timezone);
           setRadioValue("[name='system[unitSystem]']", data.system.unitSystem);
@@ -1090,8 +1115,9 @@
           setCheckboxValue("[name='opentherm[options][autoFaultReset]']", data.opentherm.options.autoFaultReset);
           setCheckboxValue("[name='opentherm[options][autoDiagReset]']", data.opentherm.options.autoDiagReset);
           setCheckboxValue("[name='opentherm[options][setDateAndTime]']", data.opentherm.options.setDateAndTime);
-          setCheckboxValue("[name='opentherm[options][nativeHeatingControl]']", data.opentherm.options.nativeHeatingControl);
+          setCheckboxValue("[name='opentherm[options][nativeOTC]']", data.opentherm.options.nativeOTC);
           setCheckboxValue("[name='opentherm[options][immergasFix]']", data.opentherm.options.immergasFix);
+          setCheckboxValue("[name='opentherm[options][alwaysSendIndoorTemp]']", data.opentherm.options.alwaysSendIndoorTemp);
           setBusy('#ot-settings-busy', '#ot-settings', false);
 
           // MQTT
@@ -1138,7 +1164,9 @@
             "min": data.system.unitSystem == 0 ? 1 : 33,
             "max": data.system.unitSystem == 0 ? 100 : 212
           });
-          setInputValue("[name='heating[hysteresis]']", data.heating.hysteresis);
+          setCheckboxValue("[name='heating[hysteresis][enabled]']", data.heating.hysteresis.enabled);
+          setInputValue("[name='heating[hysteresis][value]']", data.heating.hysteresis.value);
+          setSelectValue("[name='heating[hysteresis][action]']", data.heating.hysteresis.action);
           setInputValue("[name='heating[turboFactor]']", data.heating.turboFactor);
           setInputValue("[name='heating[maxModulation]']", data.heating.maxModulation);
           setInputValue("[name='heating[overheatProtection][highTemp]']", data.heating.overheatProtection.highTemp, {
@@ -1177,7 +1205,7 @@
           setBusy('#dhw-settings-busy', '#dhw-settings', false);
 
           // Emergency mode
-          if (data.opentherm.options.nativeHeatingControl) {
+          if (data.opentherm.options.nativeOTC) {
             setInputValue("[name='emergency[target]']", data.emergency.target, {
               "min": data.system.unitSystem == 0 ? 5 : 41,
               "max": data.system.unitSystem == 0 ? 40 : 104

src_data/pages/upgrade.html

@@ -62,19 +62,19 @@
 
           <form action="/api/upgrade" id="upgrade">
             <fieldset class="primary">
-              <label for="firmware-file">
+              <label>
                 <span data-i18n>upgrade.fw</span>:
                 <div class="grid">
-                  <input type="file" name="firmware" id="firmware-file" accept=".bin">
+                  <input type="file" name="fw" accept=".bin">
-                  <button type="button" class="upgrade-firmware-result hidden" disabled></button>
+                  <button type="button" class="fwResult hidden" disabled></button>
                 </div>
               </label>
 
-              <label for="filesystem-file">
+              <label>
                 <span data-i18n>upgrade.fs</span>:
                 <div class="grid">
-                  <input type="file" name="filesystem" id="filesystem-file" accept=".bin">
+                  <input type="file" name="fs" accept=".bin">
-                  <button type="button" class="upgrade-filesystem-result hidden" disabled></button>
+                  <button type="button" class="fsResult hidden" disabled></button>
                 </div>
               </label>
             </fieldset>
@@ -108,7 +108,123 @@
         lang.build();
 
         setupRestoreBackupForm('#restore');
-        setupUpgradeForm('#upgrade');
+
+        const upgradeForm = document.querySelector('#upgrade');
+        if (upgradeForm) {
+          upgradeForm.reset();
+          const statusToText = (status) => {
+            switch (status) {
+              case 0:
+                return "None";
+              case 1:
+                return "No file";
+              case 2:
+                return "Success";
+              case 3:
+                return "Prohibited";
+              case 4:
+                return "Size mismatch";
+              case 5:
+                return "Error on start";
+              case 6:
+                return "Error on write";
+              case 7:
+                return "Error on finish";
+              default:
+                return "Unknown";
+            }
+          };
+
+          upgradeForm.addEventListener('submit', async (event) => {
+            event.preventDefault();
+
+            hide('.fwResult');
+            hide('.fsResult');
+
+            let button = upgradeForm.querySelector('button[type="submit"]');
+            button.textContent = i18n('button.uploading');
+            button.setAttribute('disabled', true);
+            button.setAttribute('aria-busy', true);
+
+            try {
+              let fd = new FormData();
+
+              const fw = upgradeForm.querySelector("[name='fw']").files;
+              if (fw.length > 0) {
+                fd.append("fw_size", fw[0].size);
+                fd.append("fw", fw[0]);
+              }
+
+              const fs = upgradeForm.querySelector("[name='fs']").files;
+              if (fs.length > 0) {
+                fd.append("fs_size", fs[0].size);
+                fd.append("fs", fs[0]);
+              }
+
+              let response = await fetch(upgradeForm.action, {
+                method: "POST",
+                cache: "no-cache",
+                credentials: "include",
+                body: fd
+              });
+              
+              if (response.status != 202 && response.status != 406) {
+                throw new Error('Response not valid');
+              }
+
+              const result = await response.json();
+              let resItem = upgradeForm.querySelector('.fwResult');
+              if (resItem && result.firmware.status > 1) {
+                resItem.textContent = statusToText(result.firmware.status);
+                resItem.classList.remove('hidden');
+
+                if (result.firmware.status == 2) {
+                  resItem.classList.remove('failed');
+                  resItem.classList.add('success');
+                } else {
+                  resItem.classList.remove('success');
+                  resItem.classList.add('failed');
+
+                  if (result.firmware.error != "") {
+                    resItem.textContent += `: ${result.firmware.error}`;
+                  }
+                }
+              }
+
+              resItem = upgradeForm.querySelector('.fsResult');
+              if (resItem && result.filesystem.status > 1) {
+                resItem.textContent = statusToText(result.filesystem.status);
+                resItem.classList.remove('hidden');
+
+                if (result.filesystem.status == 2) {
+                  resItem.classList.remove('failed');
+                  resItem.classList.add('success');
+                } else {
+                  resItem.classList.remove('success');
+                  resItem.classList.add('failed');
+
+                  if (result.filesystem.error != "") {
+                    resItem.textContent += `: ${result.filesystem.error}`;
+                  }
+                }
+              }
+
+            } catch (err) {
+              console.log(err);
+              button.textContent = i18n('button.error');
+              button.classList.add('failed');
+
+            } finally {
+              setTimeout(() => {
+                button.removeAttribute('aria-busy');
+                button.removeAttribute('disabled');
+                button.classList.remove('success', 'failed');
+                button.textContent = i18n(button.dataset.i18n);
+                upgradeForm.reset();
+              }, 10000);
+            }
+          });
+        }
       });
     </script>
   </body>

src_data/scripts/utils.js

@@ -318,6 +318,7 @@ const setupRestoreBackupForm = (formSelector) => {
         console.log("Backup: ", data);
 
         if (data.settings != undefined) {
+          for (var key in data.settings) {
             let response = await fetch(url, {
               method: "POST",
               cache: "no-cache",
@@ -325,7 +326,11 @@ const setupRestoreBackupForm = (formSelector) => {
               headers: {
                 "Content-Type": "application/json"
               },
-            body: JSON.stringify({"settings": data.settings})
+              body: JSON.stringify({
+                "settings": {
+                  [key]: data.settings[key]
+                }
+              })
             });
 
             if (!response.ok) {
@@ -333,6 +338,7 @@ const setupRestoreBackupForm = (formSelector) => {
               return;
             }
           }
+        }
 
         if (data.sensors != undefined) {
           for (const sensorId in data.sensors) {

tools/add_build_commit.py

@@ -0,0 +1,16 @@
+import subprocess
+Import("env")
+
+try:
+  commit_hash = "undefined"
+  result = subprocess.check_output(
+    ["git", "rev-parse", "--short", "HEAD"]
+  )
+  commit_hash = result.decode("utf-8").strip()
+  env.Append(
+    CPPDEFINES=[
+      ("BUILD_COMMIT", '\\"{}\\"'.format(commit_hash))
+    ]
+  )
+except Exception as error:
+  print("Failed to get commit hash: {}".format(error))