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

.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

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(const String&)> CanUploadCallback;
-  typedef std::function<bool(UpgradeType)> BeforeUpgradeCallback;
-  typedef std::function<void(const UpgradeResult&, const UpgradeResult&)> AfterUpgradeCallback;
+  typedef std::function<bool(AsyncWebServerRequest *request, UpgradeType)> BeforeUpgradeCallback;
+  typedef std::function<void(AsyncWebServerRequest *request, const UpgradeResult&, const UpgradeResult&)> AfterUpgradeCallback;
   
-  UpgradeHandler(const char* uri) {
-    this->uri = uri;
-  }
+  UpgradeHandler(AsyncURIMatcher uri) : uri(uri) {}
 
-  UpgradeHandler* setCanHandleCallback(CanHandleCallback callback = nullptr) {
-    this->canHandleCallback = callback;
-
-    return this;
-  }
-
-  UpgradeHandler* setCanUploadCallback(CanUploadCallback callback = nullptr) {
-    this->canUploadCallback = callback;
-
-    return this;
+  bool canHandle(AsyncWebServerRequest *request) const override final {
+    if (!request->isHTTP()) {
+      return false;
+    }
+    
+    return this->uri.matches(request);
   }
 
   UpgradeHandler* setBeforeUpgradeCallback(BeforeUpgradeCallback callback = nullptr) {
@@ -57,29 +51,9 @@ public:
     return this;
   }
 
-  #if defined(ARDUINO_ARCH_ESP32)
-  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 {
+  void handleRequest(AsyncWebServerRequest *request) override final {
     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 {
-    UpgradeResult* result;
-    if (upload.name.equals(F("firmware"))) {
-      result = &this->firmwareResult;
+  void handleUpload(AsyncWebServerRequest *request, const String &fileName, size_t index, uint8_t *data, size_t dataLength, bool isFinal) override final {
+    UpgradeResult* result = nullptr;
 
-    } else if (upload.name.equals(F("filesystem"))) {
-      result = &this->filesystemResult;
-      
-    } else {
+    if (!request->hasParam(asyncsrv::T_name, true, true)) {
+      // Missing content-disposition 'name' parameter
       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());
-
-    } else if (upload.status == UPLOAD_FILE_WRITE) {
-      if (Update.write(upload.buf, upload.currentSize) != upload.currentSize) {
+      Log.sinfoln(FPSTR(L_PORTAL_OTA), "File '%s', started", fileName.c_str());
+    }
+    
+    if (dataLength) {
+      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),
-          F("File '%s', on writing %d bytes: %s"),
-          upload.filename.c_str(), upload.totalSize, result->error.c_str()
+          FPSTR(L_PORTAL_OTA), "File '%s', on write %d bytes, %d of %d bytes",
+          fileName.c_str(),
+          dataLength,
+          result->progress + dataLength,
+          result->size
         );
-
-      } else {
-        Log.sinfoln(FPSTR(L_PORTAL_OTA), F("File '%s', writed %d bytes"), upload.filename.c_str(), upload.totalSize);
+        return;
       }
+      
+      result->progress += dataLength;
+      Log.sinfoln(
+        FPSTR(L_PORTAL_OTA), "File '%s', write %d bytes, %d of %d bytes",
+        fileName.c_str(),
+        dataLength,
+        result->progress,
+        result->size
+      );
+    }
 
-    } else if (upload.status == UPLOAD_FILE_END) {
-      if (Update.end(true)) {
-        result->status = UpgradeStatus::SUCCESS;
+    if (result->size > 0) {
+      if (result->progress > result->size || (isFinal && result->progress < result->size)) {
+        Update.end(false);
+        result->status = UpgradeStatus::SIZE_MISMATCH;
 
-        Log.sinfoln(FPSTR(L_PORTAL_OTA), F("File '%s': finish"), upload.filename.c_str());
-
-      } else {
+        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;
-        #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);
+        Log.serrorln(FPSTR(L_PORTAL_OTA), "File '%s', on finish: %s", fileName.c_str(), result->error);
+        return;
       }
 
-    } else if (upload.status == UPLOAD_FILE_ABORTED) {
-      Update.end(false);
-      result->status = UpgradeStatus::ABORTED;
-
-      Log.serrorln(FPSTR(L_PORTAL_OTA), F("File '%s': aborted"), upload.filename.c_str());
+      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,382 +1,229 @@
-; 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
+;extra_configs          = secrets.ini
+extra_configs           = secrets.default.ini
+core_dir                = .pio
 
 [env]
-version = 1.6.0
-framework = arduino
-lib_deps = 
-	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
-	pstolarz/OneWireNg@^0.14.1
-	;milesburton/DallasTemperature@^4.0.5
-	https://github.com/Laxilef/Arduino-Temperature-Control-Library#fix_85c
-	laxilef/TinyLogger@^1.1.1
-lib_ignore = OneWire
-build_type = ${secrets.build_type}
-build_flags = 
-	-mtext-section-literals
-	-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 DEFAULT_SERIAL_ENABLED=${secrets.serial_enabled}
-	-D DEFAULT_SERIAL_BAUD=${secrets.serial_baud}
-	-D DEFAULT_TELNET_ENABLED=${secrets.telnet_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}"'
-	-D DEFAULT_AP_PASSWORD='"${secrets.ap_password}"'
-	-D DEFAULT_STA_SSID='"${secrets.sta_ssid}"'
-	-D DEFAULT_STA_PASSWORD='"${secrets.sta_password}"'
-	-D DEFAULT_PORTAL_LOGIN='"${secrets.portal_login}"'
-	-D DEFAULT_PORTAL_PASSWORD='"${secrets.portal_password}"'
-	-D DEFAULT_MQTT_ENABLED=${secrets.mqtt_enabled}
-	-D DEFAULT_MQTT_SERVER='"${secrets.mqtt_server}"'
-	-D DEFAULT_MQTT_PORT=${secrets.mqtt_port}
-	-D DEFAULT_MQTT_USER='"${secrets.mqtt_user}"'
-	-D DEFAULT_MQTT_PASSWORD='"${secrets.mqtt_password}"'
-	-D DEFAULT_MQTT_PREFIX='"${secrets.mqtt_prefix}"'
-upload_speed = 921600
-monitor_speed = 115200
-;monitor_filters = direct
-monitor_filters = 
-	esp32_exception_decoder
-	esp8266_exception_decoder
-board_build.flash_mode = dio
-board_build.filesystem = littlefs
-check_tool = ; pvs-studio
-check_flags =
-;  pvs-studio:
-;    --analysis-mode=4
-;    --exclude-path=./.pio/libdeps
+version                 = 1.6.0-passiveble
+framework               = arduino
+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
+                          gyverlibs/FileData@^1.0.3
+                          gyverlibs/GyverPID@^3.3.2
+                          gyverlibs/GyverBlinker@^1.1.1
+                          pstolarz/OneWireNg@^0.14.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             = ;-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_WEBSERIAL_ENABLED=${secrets.webserial_enabled}
+                          -D DEFAULT_LOG_LEVEL=${secrets.log_level}
+                          -D DEFAULT_HOSTNAME='"${secrets.hostname}"'
+                          -D DEFAULT_AP_SSID='"${secrets.ap_ssid}"'
+                          -D DEFAULT_AP_PASSWORD='"${secrets.ap_password}"'
+                          -D DEFAULT_STA_SSID='"${secrets.sta_ssid}"'
+                          -D DEFAULT_STA_PASSWORD='"${secrets.sta_password}"'
+                          -D DEFAULT_PORTAL_LOGIN='"${secrets.portal_login}"'
+                          -D DEFAULT_PORTAL_PASSWORD='"${secrets.portal_password}"'
+                          -D DEFAULT_MQTT_ENABLED=${secrets.mqtt_enabled}
+                          -D DEFAULT_MQTT_SERVER='"${secrets.mqtt_server}"'
+                          -D DEFAULT_MQTT_PORT=${secrets.mqtt_port}
+                          -D DEFAULT_MQTT_USER='"${secrets.mqtt_user}"'
+                          -D DEFAULT_MQTT_PASSWORD='"${secrets.mqtt_password}"'
+                          -D DEFAULT_MQTT_PREFIX='"${secrets.mqtt_prefix}"'
+upload_speed            = 921600
+monitor_speed           = 115200
+;monitor_filters        = direct
+monitor_filters         = esp32_exception_decoder
+board_build.flash_mode  = dio
+board_build.filesystem  = littlefs
+check_tool              = ;pvs-studio
+check_flags             = ;pvs-studio: --analysis-mode=4 --exclude-path=./.pio/libdeps
 
 ; Defaults
-[esp8266_defaults]
-platform = espressif8266@^4.2.1
-platform_packages = ${env.platform_packages}
-lib_deps = 
-	${env.lib_deps}
-	nrwiersma/ESP8266Scheduler@^1.2
-lib_ignore = ${env.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/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.36/platform-espressif32.zip
-platform_packages = ${env.platform_packages}
-board_build.partitions = esp32_partitions.csv
-lib_deps =
-	${env.lib_deps}
-	laxilef/ESP32Scheduler@^1.0.1
-nimble_lib = h2zero/NimBLE-Arduino@2.3.7
-lib_ignore = ${env.lib_ignore}
-extra_scripts = 
-	post:tools/esp32.py
-	post:tools/build.py
-build_type = ${env.build_type}
-build_flags = 
-	${env.build_flags}
-	-D CORE_DEBUG_LEVEL=0
-	-Wl,--wrap=esp_panic_handler
-check_tool = ${env.check_tool}
-check_flags = ${env.check_flags}
+platform                = https://github.com/pioarduino/platform-espressif32/releases/download/55.03.37/platform-espressif32.zip
+platform_packages       = ${env.platform_packages}
+board_build.partitions  = esp32_partitions.csv
+lib_deps                = ${env.lib_deps}
+                          laxilef/ESP32Scheduler@^1.0.1
+nimble_lib              = https://github.com/h2zero/NimBLE-Arduino
+lib_ignore              = ${env.lib_ignore}
+                          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             = ${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}
+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}
-platform_packages = ${esp32_defaults.platform_packages}
-board = lolin_s2_mini
-board_build.partitions = ${esp32_defaults.board_build.partitions}
-lib_deps = ${esp32_defaults.lib_deps}
-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
-	-D DEFAULT_OT_OUT_GPIO=35
-	-D DEFAULT_SENSOR_OUTDOOR_GPIO=9
-	-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}
+extends                 = esp32_defaults
+board                   = lolin_s2_mini
+build_unflags           = -DARDUINO_USB_MODE=1
+build_flags             = ${esp32_defaults.build_flags}
+                          -D ARDUINO_USB_MODE=0
+                          -D ARDUINO_USB_CDC_ON_BOOT=1
+                          -D DEFAULT_OT_IN_GPIO=33
+                          -D DEFAULT_OT_OUT_GPIO=35
+                          -D DEFAULT_SENSOR_OUTDOOR_GPIO=9
+                          -D DEFAULT_SENSOR_INDOOR_GPIO=7
+                          -D DEFAULT_STATUS_LED_GPIO=11
+                          -D DEFAULT_OT_RX_LED_GPIO=12
 
-[env:s3_mini] 
-platform = ${esp32_defaults.platform}
-platform_packages = ${esp32_defaults.platform_packages}
-board = lolin_s3_mini
-board_build.partitions = ${esp32_defaults.board_build.partitions}
-lib_deps = 
-	${esp32_defaults.lib_deps}
-	${esp32_defaults.nimble_lib}
-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 MYNEWT_VAL_BLE_EXT_ADV=1
-	-D USE_BLE=1
-	-D DEFAULT_OT_IN_GPIO=35
-	-D DEFAULT_OT_OUT_GPIO=36
-	-D DEFAULT_SENSOR_OUTDOOR_GPIO=13
-	-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:s3_mini]
+extends                 = esp32_defaults
+board                   = lolin_s3_mini
+lib_deps                = ${esp32_defaults.lib_deps}
+                          ${esp32_defaults.nimble_lib}
+build_unflags           = -DARDUINO_USB_MODE=1
+build_flags             = ${esp32_defaults.build_flags}
+                          -D ARDUINO_USB_MODE=0
+                          -D ARDUINO_USB_CDC_ON_BOOT=1
+                          -D MYNEWT_VAL_BLE_EXT_ADV=1
+                          -D USE_BLE=1
+                          -D DEFAULT_OT_IN_GPIO=35
+                          -D DEFAULT_OT_OUT_GPIO=36
+                          -D DEFAULT_SENSOR_OUTDOOR_GPIO=13
+                          -D DEFAULT_SENSOR_INDOOR_GPIO=12
+                          -D DEFAULT_STATUS_LED_GPIO=11
+                          -D DEFAULT_OT_RX_LED_GPIO=10
 
-[env:c3_mini] 
-platform = ${esp32_defaults.platform}
-platform_packages = ${esp32_defaults.platform_packages}
-board = lolin_c3_mini
-board_build.partitions = ${esp32_defaults.board_build.partitions}
-lib_deps = 
-	${esp32_defaults.lib_deps}
-	${esp32_defaults.nimble_lib}
-lib_ignore = ${esp32_defaults.lib_ignore}
-extra_scripts = ${esp32_defaults.extra_scripts}
-build_unflags = 
-	-mtext-section-literals
-build_type = ${esp32_defaults.build_type}
-build_flags = 
-	${esp32_defaults.build_flags}
-	-D MYNEWT_VAL_BLE_EXT_ADV=1
-	-D USE_BLE=1
-	-D DEFAULT_OT_IN_GPIO=8
-	-D DEFAULT_OT_OUT_GPIO=10
-	-D DEFAULT_SENSOR_OUTDOOR_GPIO=0
-	-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:c3_mini]
+extends                 = esp32_defaults
+board                   = lolin_c3_mini
+lib_deps                = ${esp32_defaults.lib_deps}
+                          ${esp32_defaults.nimble_lib}
+;build_unflags           = -mtext-section-literals
+build_flags             = ${esp32_defaults.build_flags}
+                          -D MYNEWT_VAL_BLE_EXT_ADV=1
+                          -D USE_BLE=1
+                          -D DEFAULT_OT_IN_GPIO=8
+                          -D DEFAULT_OT_OUT_GPIO=10
+                          -D DEFAULT_SENSOR_OUTDOOR_GPIO=0
+                          -D DEFAULT_SENSOR_INDOOR_GPIO=1
+                          -D DEFAULT_STATUS_LED_GPIO=4
+                          -D DEFAULT_OT_RX_LED_GPIO=5
 
 [env:nodemcu_32]
-platform = ${esp32_defaults.platform}
-platform_packages = ${esp32_defaults.platform_packages}
-board = nodemcu-32s
-board_build.partitions = ${esp32_defaults.board_build.partitions}
-lib_deps = 
-	${esp32_defaults.lib_deps}
-	${esp32_defaults.nimble_lib}
-lib_ignore = ${esp32_defaults.lib_ignore}
-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
-	-D DEFAULT_SENSOR_OUTDOOR_GPIO=15
-	-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}
+extends                 = esp32_defaults
+board                   = nodemcu-32s
+lib_deps                = ${esp32_defaults.lib_deps}
+                          ${esp32_defaults.nimble_lib}
+build_flags             = ${esp32_defaults.build_flags}
+                          -D USE_BLE=1
+                          -D DEFAULT_OT_IN_GPIO=16
+                          -D DEFAULT_OT_OUT_GPIO=4
+                          -D DEFAULT_SENSOR_OUTDOOR_GPIO=15
+                          -D DEFAULT_SENSOR_INDOOR_GPIO=26
+                          -D DEFAULT_STATUS_LED_GPIO=2
+                          -D DEFAULT_OT_RX_LED_GPIO=19
 
-[env:nodemcu_32_160mhz] 
-extends = env:nodemcu_32 
-board_build.f_cpu = 160000000L ; set frequency to 160MHz
+[env:nodemcu_32_160mhz]
+extends                 = env:nodemcu_32 
+board_build.f_cpu       = 160000000L ; set frequency to 160MHz
 
 [env:d1_mini32]
-platform = ${esp32_defaults.platform}
-platform_packages = ${esp32_defaults.platform_packages}
-board = wemos_d1_mini32
-board_build.partitions = ${esp32_defaults.board_build.partitions}
-lib_deps = 
-	${esp32_defaults.lib_deps}
-	${esp32_defaults.nimble_lib}
-lib_ignore = ${esp32_defaults.lib_ignore}
-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
-	-D DEFAULT_SENSOR_OUTDOOR_GPIO=12
-	-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}
+extends                 = esp32_defaults
+board                   = wemos_d1_mini32
+lib_deps                = ${esp32_defaults.lib_deps}
+                          ${esp32_defaults.nimble_lib}
+build_flags             = ${esp32_defaults.build_flags}
+                          -D USE_BLE=1
+                          -D DEFAULT_OT_IN_GPIO=21
+                          -D DEFAULT_OT_OUT_GPIO=22
+                          -D DEFAULT_SENSOR_OUTDOOR_GPIO=12
+                          -D DEFAULT_SENSOR_INDOOR_GPIO=18
+                          -D DEFAULT_STATUS_LED_GPIO=2
+                          -D DEFAULT_OT_RX_LED_GPIO=19
 
 [env:esp32_c6]
-platform = ${esp32_defaults.platform}
-framework = arduino, espidf
-platform_packages = ${esp32_defaults.platform_packages}
-board = esp32-c6-devkitm-1
-board_build.partitions = ${esp32_defaults.board_build.partitions}
-board_build.embed_txtfiles = 
-	managed_components/espressif__esp_insights/server_certs/https_server.crt
-	managed_components/espressif__esp_rainmaker/server_certs/rmaker_mqtt_server.crt
-	managed_components/espressif__esp_rainmaker/server_certs/rmaker_claim_service_server.crt
-	managed_components/espressif__esp_rainmaker/server_certs/rmaker_ota_server.crt
-lib_deps = ${esp32_defaults.lib_deps}
-lib_ignore = 
-	${esp32_defaults.lib_ignore}
-extra_scripts = ${esp32_defaults.extra_scripts}
-build_unflags = 
-	-mtext-section-literals
-build_type = ${esp32_defaults.build_type}
-build_flags = 
-	${esp32_defaults.build_flags}
-	-D USE_BLE=1
-	-D DEFAULT_OT_IN_GPIO=15
-	-D DEFAULT_OT_OUT_GPIO=23
-	-D DEFAULT_SENSOR_OUTDOOR_GPIO=0
-	-D DEFAULT_SENSOR_INDOOR_GPIO=0
-	-D DEFAULT_STATUS_LED_GPIO=11
-	-D DEFAULT_OT_RX_LED_GPIO=10
-check_tool = ${esp32_defaults.check_tool}
-check_flags = ${esp32_defaults.check_flags}
+extends                 = esp32_defaults
+board                   = esp32-c6-devkitc-1
+lib_deps                = ${esp32_defaults.lib_deps}
+                          ${esp32_defaults.nimble_lib}
+;build_unflags           = -mtext-section-literals
+build_flags             = ${esp32_defaults.build_flags}
+                          -D USE_BLE=1
+                          -D DEFAULT_OT_IN_GPIO=15
+                          -D DEFAULT_OT_OUT_GPIO=23
+                          -D DEFAULT_SENSOR_OUTDOOR_GPIO=0
+                          -D DEFAULT_SENSOR_INDOOR_GPIO=0
+                          -D DEFAULT_STATUS_LED_GPIO=11
+                          -D DEFAULT_OT_RX_LED_GPIO=10
+custom_sdkconfig        = '# CONFIG_OPENTHREAD_ENABLED is not set'
+                          '# 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}
-platform_packages = ${esp32_defaults.platform_packages}
-board = lolin_c3_mini
-board_build.partitions = ${esp32_defaults.board_build.partitions}
-lib_deps = 
-	${esp32_defaults.lib_deps}
-	${esp32_defaults.nimble_lib}
-lib_ignore = ${esp32_defaults.lib_ignore}
-extra_scripts = ${esp32_defaults.extra_scripts}
-build_unflags = 
-	-mtext-section-literals
-build_type = ${esp32_defaults.build_type}
-build_flags = 
-	${esp32_defaults.build_flags}
-	-D MYNEWT_VAL_BLE_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_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}
+[env:otthing]
+extends                 = esp32_defaults
+board                   = lolin_c3_mini
+lib_deps                = ${esp32_defaults.lib_deps}
+                          ${esp32_defaults.nimble_lib}
+;build_unflags           = -mtext-section-literals
+build_flags             = ${esp32_defaults.build_flags}
+                          -D MYNEWT_VAL_BLE_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_INDOOR_GPIO=1
+                          -D DEFAULT_STATUS_LED_GPIO=8
+                          -D DEFAULT_OT_RX_LED_GPIO=2
+                          -D OT_BYPASS_RELAY_GPIO=20

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
-telnet_port = 23
+webserial_enabled = true
 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);

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,15 +39,20 @@ 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;
+  unsigned long freezeDetectedTime = 0;
 
   #if defined(ARDUINO_ARCH_ESP32)
   const char* getTaskName() override {
     return "Main";
   }
 
+  uint32_t getTaskStackSize() override {
+    return 6000;
+  }
+
   /*BaseType_t getTaskCore() override {
     return 1;
   }*/
@@ -104,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));
       }
     }
 
@@ -121,11 +125,6 @@ protected:
         }
       }
 
-      if (!this->telnetStarted && telnetStream != nullptr) {
-        telnetStream->begin(23, false);
-        this->telnetStarted = true;
-      }
-
       if (settings.mqtt.enabled && !tMqtt->isEnabled()) {
         tMqtt->enable();
 
@@ -138,11 +137,6 @@ protected:
         this->ntpStarted = false;
       }
 
-      if (this->telnetStarted) {
-        telnetStream->stop();
-        this->telnetStarted = false;
-      }
-
       if (tMqtt->isEnabled()) {
         tMqtt->disable();
       }
@@ -156,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 (stream->available() > 0) {
-        stream->read();
-
-        #ifdef ARDUINO_ARCH_ESP8266
-        ::optimistic_yield(1000);
-        #endif
-      }
+    while (Serial.available() > 0) {
+      Serial.read();
     }
 
     // heap info
@@ -211,7 +192,7 @@ protected:
       vars.states.restarting = true;
     }
 
-    if (settings.system.logLevel < TinyLogger::Level::VERBOSE) {
+    if (settings.system.logLevel < TinyLoggerLevel::VERBOSE) {
       return;
     }
 
@@ -241,7 +222,7 @@ protected:
 
   void heating() {
     // freeze protection
-    {
+    if (!settings.heating.enabled) {
       float lowTemp = 255.0f;
       uint8_t availableSensors = 0;
 
@@ -272,40 +253,29 @@ protected:
         availableSensors++;
       }
 
-      if (availableSensors) {
-        if (vars.master.heating.freezing) {
-          if (lowTemp - (float) settings.heating.freezeProtection.highTemp + 0.0001f >= 0.0f) {
-            vars.master.heating.freezing = false;
+      if (availableSensors && lowTemp <= settings.heating.freezeProtection.lowTemp) {
+        if (!this->freezeDetected) {
+          this->freezeDetected = true;
+          this->freezeDetectedTime = millis();
 
-            Log.sinfoln(
-              FPSTR(L_MAIN),
-              F("No freezing detected. Current low temp: %.2f, threshold (high): %hhu"),
-              lowTemp, settings.heating.freezeProtection.highTemp
-            );
-          }
+        } else if (millis() - this->freezeDetectedTime > (settings.heating.freezeProtection.thresholdTime * 1000)) {
+          this->freezeDetected = false;
+          settings.heating.enabled = true;
+          fsSettings.update();
 
-        } else {
-          if ((float) settings.heating.freezeProtection.lowTemp - lowTemp + 0.0001f >= 0.0f) {
-            vars.master.heating.freezing = true;
-
-            if (!settings.heating.enabled) {
-              settings.heating.enabled = true;
-              fsSettings.update();
-            }
-
-            Log.sinfoln(
-              FPSTR(L_MAIN),
-              F("Freezing detected! Current low temp: %.2f, threshold (low): %hhu"),
-              lowTemp, settings.heating.freezeProtection.lowTemp
-            );
-          }
+          Log.sinfoln(
+            FPSTR(L_MAIN),
+            F("Heating turned on by freeze protection, current low temp: %.2f, threshold: %hhu"),
+            lowTemp, settings.heating.freezeProtection.lowTemp
+          );
         }
 
-      } else if (vars.master.heating.freezing) {
-        vars.master.heating.freezing = false;
-
-        Log.sinfoln(FPSTR(L_MAIN), F("No sensors available, freeze protection unavailable!"));
+      } else if (this->freezeDetected) {
+        this->freezeDetected = false;
       }
+
+    } else if (this->freezeDetected) {
+      this->freezeDetected = false;
     }
   }
 

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++) {

src/OpenThermTask.h

@@ -37,9 +37,13 @@ protected:
   const char* getTaskName() override {
     return "OpenTherm";
   }
+
+  uint32_t getTaskStackSize() override {
+    return 7500;
+  }
   
   BaseType_t getTaskCore() override {
-    return 1;
+    return 0;
   }
 
   int getTaskPriority() override {
@@ -170,7 +174,8 @@ protected:
     // Heating settings
     vars.master.heating.enabled = this->isReady()
       && settings.heating.enabled
-      && (vars.master.heating.freezing || (vars.cascadeControl.input && !vars.master.heating.blocking))
+      && vars.cascadeControl.input 
+      && !vars.master.heating.blocking
       && !vars.master.heating.overheat;
 
     // DHW settings

src/RegulatorTask.h

@@ -19,6 +19,10 @@ protected:
   const char* getTaskName() override {
     return "Regulator";
   }
+
+  uint32_t getTaskStackSize() override {
+    return 5000;
+  }
   
   /*BaseType_t getTaskCore() override {
     return 1;
@@ -28,7 +32,7 @@ protected:
     return 4;
   }
   #endif
-  
+
   void loop() {
     if (vars.states.restarting || vars.states.upgrading) {
       return;
@@ -155,7 +159,7 @@ protected:
       );
       float etResult = settings.heating.target + settings.equitherm.shift + sf * (
         tempDelta >= 0 
-          ? pow(tempDelta, 1.0f / settings.equitherm.exponent) 
+          ? pow(tempDelta, 1.0f / settings.equitherm.exponent)
           : -(pow(-(tempDelta), 1.0f / settings.equitherm.exponent))
       );
 
@@ -204,7 +208,7 @@ protected:
         }*/
 
         float error = pidRegulator.setpoint - pidRegulator.input;
-        bool hasDeadband = settings.pid.deadband.enabled 
+        bool hasDeadband = settings.pid.deadband.enabled
           && (error > -(settings.pid.deadband.thresholdHigh))
           && (error < settings.pid.deadband.thresholdLow);
 
@@ -240,11 +244,6 @@ protected:
       ) * settings.heating.turboFactor;
     }
 
-    // If freezing, set temperature to no lower than low temp provided by freeze protection
-    if (vars.master.heating.freezing && fabsf(settings.heating.freezeProtection.lowTemp - newTemp) < 0.0001f) {
-      newTemp = settings.heating.freezeProtection.lowTemp;
-    }
-
     return newTemp;
   }
 };

src/Sensors.h

@@ -39,6 +39,8 @@ public:
     NTC_10K_TEMP            = 50,
     DALLAS_TEMP             = 51,
     BLUETOOTH               = 52,
+    DHT11                   = 53,
+    DHT22                   = 54,
 
     HEATING_SETPOINT_TEMP   = 253,
     MANUAL                  = 254,

src/Settings.h

@@ -32,9 +32,8 @@ struct Settings {
     } serial;
 
     struct {
-      bool enabled = DEFAULT_TELNET_ENABLED;
-      unsigned short port = DEFAULT_TELNET_PORT;
-    } telnet;
+      bool enabled = DEFAULT_WEBSERIAL_ENABLED;
+    } webSerial;
 
     struct {
       char server[49] = "pool.ntp.org";
@@ -121,8 +120,8 @@ struct Settings {
     } overheatProtection;
 
     struct {
-      uint8_t highTemp = 15;
       uint8_t lowTemp = 10;
+      unsigned short thresholdTime = 600;
     } freezeProtection;
   } heating;
 
@@ -304,7 +303,6 @@ struct Variables {
       bool enabled = false;
       bool indoorTempControl = false;
       bool overheat = false;
-      bool freezing = false;
       float setpointTemp = 0.0f;
       float targetTemp = 0.0f;
       float currentTemp = 0.0f;

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
-  #define DEFAULT_TELNET_ENABLED true
-#endif
-
-#ifndef DEFAULT_TELNET_PORT
-  #define DEFAULT_TELNET_PORT 23
+#ifndef DEFAULT_WEBSERIAL_ENABLED
+  #define DEFAULT_WEBSERIAL_ENABLED true
 #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

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) {
-    telnetStream = new ESPTelnetStream;
-    telnetStream->setKeepAliveInterval(500);
-    Log.addStream(telnetStream);
+  if (settings.system.webSerial.enabled) {
+    webSerial = new WebSerial();
+    webSerial->setBuffer(100);
+    Log.addHandler(webSerial);
   }
 
-  if (settings.system.logLevel >= TinyLogger::Level::SILENT && settings.system.logLevel <= TinyLogger::Level::VERBOSE) {
-    Log.setLevel(static_cast<TinyLogger::Level>(settings.system.logLevel));
+  if (settings.system.logLevel >= TinyLoggerLevel::SILENT && settings.system.logLevel <= TinyLoggerLevel::VERBOSE) {
+    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";
@@ -56,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";
@@ -87,7 +89,6 @@ const char S_EXTERNAL_PUMP[]                        PROGMEM = "externalPump";
 const char S_FACTOR[]                               PROGMEM = "factor";
 const char S_FAULT[]                                PROGMEM = "fault";
 const char S_FREEZE_PROTECTION[]                    PROGMEM = "freezeProtection";
-const char S_FREEZING[]                             PROGMEM = "freezing";
 const char S_FILTERING[]                            PROGMEM = "filtering";
 const char S_FILTERING_FACTOR[]                     PROGMEM = "filteringFactor";
 const char S_FLAGS[]                                PROGMEM = "flags";
@@ -166,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";
@@ -202,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";
@@ -220,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>();
-    telnet[FPSTR(S_ENABLED)] = src.system.telnet.enabled;
-    telnet[FPSTR(S_PORT)] = src.system.telnet.port;
+    auto webSerial = system[FPSTR(S_WEBSERIAL)].to<JsonObject>();
+    webSerial[FPSTR(S_ENABLED)] = src.system.webSerial.enabled;
 
     auto ntp = system[FPSTR(S_NTP)].to<JsonObject>();
     ntp[FPSTR(S_SERVER)] = src.system.ntp.server;
@@ -505,8 +504,8 @@ void settingsToJson(const Settings& src, JsonVariant dst, bool safe = false) {
   heatingOverheatProtection[FPSTR(S_LOW_TEMP)] = src.heating.overheatProtection.lowTemp;
 
   auto freezeProtection = heating[FPSTR(S_FREEZE_PROTECTION)].to<JsonObject>();
-  freezeProtection[FPSTR(S_HIGH_TEMP)] = src.heating.freezeProtection.highTemp;
   freezeProtection[FPSTR(S_LOW_TEMP)] = src.heating.freezeProtection.lowTemp;
+  freezeProtection[FPSTR(S_THRESHOLD_TIME)] = src.heating.freezeProtection.thresholdTime;
 
   auto dhw = dst[FPSTR(S_DHW)].to<JsonObject>();
   dhw[FPSTR(S_ENABLED)] = src.dhw.enabled;
@@ -581,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;
       }
@@ -607,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>()) {
-      bool value = src[FPSTR(S_SYSTEM)][FPSTR(S_TELNET)][FPSTR(S_ENABLED)].as<bool>();
+    if (src[FPSTR(S_SYSTEM)][FPSTR(S_WEBSERIAL)][FPSTR(S_ENABLED)].is<bool>()) {
+      bool value = src[FPSTR(S_SYSTEM)][FPSTR(S_WEBSERIAL)][FPSTR(S_ENABLED)].as<bool>();
 
-      if (value != dst.system.telnet.enabled) {
-        dst.system.telnet.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;
+      if (value != dst.system.webSerial.enabled) {
+        dst.system.webSerial.enabled = value;
         changed = true;
       }
     }
@@ -1426,15 +1416,6 @@ bool jsonToSettings(const JsonVariantConst src, Settings& dst, bool safe = false
     changed = true;
   }
 
-  if (!src[FPSTR(S_HEATING)][FPSTR(S_FREEZE_PROTECTION)][FPSTR(S_HIGH_TEMP)].isNull()) {
-    unsigned short value = src[FPSTR(S_HEATING)][FPSTR(S_FREEZE_PROTECTION)][FPSTR(S_HIGH_TEMP)].as<uint8_t>();
-
-    if (isValidTemp(value, dst.system.unitSystem, 1, 50) && value != dst.heating.freezeProtection.highTemp) {
-      dst.heating.freezeProtection.highTemp = value;
-      changed = true;
-    }
-  }
-
   if (!src[FPSTR(S_HEATING)][FPSTR(S_FREEZE_PROTECTION)][FPSTR(S_LOW_TEMP)].isNull()) {
     unsigned short value = src[FPSTR(S_HEATING)][FPSTR(S_FREEZE_PROTECTION)][FPSTR(S_LOW_TEMP)].as<uint8_t>();
 
@@ -1444,9 +1425,15 @@ bool jsonToSettings(const JsonVariantConst src, Settings& dst, bool safe = false
     }
   }
 
-  if (dst.heating.freezeProtection.highTemp < dst.heating.freezeProtection.lowTemp) {
-    dst.heating.freezeProtection.highTemp = dst.heating.freezeProtection.lowTemp;
-    changed = true;
+  if (!src[FPSTR(S_HEATING)][FPSTR(S_FREEZE_PROTECTION)][FPSTR(S_THRESHOLD_TIME)].isNull()) {
+    unsigned short value = src[FPSTR(S_HEATING)][FPSTR(S_FREEZE_PROTECTION)][FPSTR(S_THRESHOLD_TIME)].as<unsigned short>();
+
+    if (value >= 30 && value <= 1800) {
+      if (value != dst.heating.freezeProtection.thresholdTime) {
+        dst.heating.freezeProtection.thresholdTime = value;
+        changed = true;
+      }
+    }
   }
 
 
@@ -1940,6 +1927,8 @@ bool jsonToSensorSettings(const uint8_t sensorId, const JsonVariantConst src, Se
       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):
@@ -1956,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;
@@ -2097,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);
   }
@@ -2173,7 +2167,6 @@ void varsToJson(const Variables& src, JsonVariant dst) {
   mHeating[FPSTR(S_BLOCKING)] = src.master.heating.blocking;
   mHeating[FPSTR(S_INDOOR_TEMP_CONTROL)] = src.master.heating.indoorTempControl;
   mHeating[FPSTR(S_OVERHEAT)] = src.master.heating.overheat;
-  mHeating[FPSTR(S_FREEZING)] = src.master.heating.freezing;
   mHeating[FPSTR(S_SETPOINT_TEMP)] = roundf(src.master.heating.setpointTemp, 2);
   mHeating[FPSTR(S_TARGET_TEMP)] = roundf(src.master.heating.targetTemp, 2);
   mHeating[FPSTR(S_CURRENT_TEMP)] = roundf(src.master.heating.currentTemp, 2);

src_data/locales/cn.json

@@ -44,6 +44,7 @@
         "build": {
           "title": "Build",
           "version": "固件版本",
+          "commit": "Commit",
           "date": "日期",
           "core": "内核版本",
           "sdk": "SDK"
@@ -248,6 +249,8 @@
         "ntcTemp": "NTC 传感器",
         "dallasTemp": "DALLAS 传感器",
         "bluetooth": "BLE 传感器",
+        "dht11": "DHT11 传感器",
+        "dht22": "DHT22 传感器",
         "heatSetpointTemp": "Heating, setpoint temp",
         "manual": "通过 MQTT/API 手动配置",
         "notConfigured": "未配置"
@@ -320,15 +323,9 @@
       },
       "freezeProtection": {
         "title": "防冻保护",
-        "desc": "如果热载体或室内温度低于 <b>低温</b>，加热将被强制开启。",
-        "highTemp": {
-          "title": "高温阈值",
-          "note": "防冻保护激活后系统恢复正常模式的阈值"
-        },
-        "lowTemp": {
-          "title": "低温阈值",
-          "note": "强制开启加热的阈值"
-        }
+        "desc": "当热媒或室内温度在<b>等待时间</b> 内降至<b>低温阈值</b>以下时，系统将强制启动加热功能。",
+        "lowTemp": "低温阈值",
+        "thresholdTime": "等待时间<small>(秒)</small>"
       },
 
       "portal": {
@@ -348,12 +345,8 @@
           "enable": "启用串口",
           "baud": "串口波特率"
         },
-        "telnet": {
-          "enable": "启用 Telnet",
-          "port": {
-            "title": "Telnet 端口",
-            "note": "默认值：23"
-          }
+        "webSerial": {
+          "enable": "启用 WebSerial"
         },
         "ntp": {
           "server": "NTP服务器",

src_data/locales/en.json

@@ -44,6 +44,7 @@
         "build": {
           "title": "Build",
           "version": "Version",
+          "commit": "Commit",
           "date": "Date",
           "core": "Core",
           "sdk": "SDK"
@@ -119,7 +120,6 @@
         "mHeatEnabled": "Heating enabled",
         "mHeatBlocking": "Heating blocked",
         "mHeatOverheat": "Heating overheat",
-        "mHeatFreezing": "Heating freezing",
         "sHeatActive": "Heating active",
         "mHeatSetpointTemp": "Heating setpoint temp",
         "mHeatTargetTemp": "Heating target temp",
@@ -249,6 +249,8 @@
         "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"
@@ -321,15 +323,9 @@
       },
       "freezeProtection": {
         "title": "Freeze protection",
-        "desc": "Heating will be forced to turn on if the heat carrier or indoor temperature drops below <b>Low temperature</b>.",
-        "highTemp": {
-          "title": "High temperature threshold",
-          "note": "Threshold when the system returns to normal mode after freeze protection activation"
-        },
-        "lowTemp": {
-          "title": "Low temperature threshold",
-          "note": "Threshold when heating is forced to turn on"
-        }
+        "desc": "Heating will be forced to turn on if the heat carrier or indoor temperature drops below <b>Low temperature</b> during <b>Waiting time</b>.",
+        "lowTemp": "Low temperature threshold",
+        "thresholdTime": "Waiting time <small>(sec)</small>"
       },
 
       "portal": {
@@ -349,12 +345,8 @@
           "enable": "Enabled Serial port",
           "baud": "Serial port baud rate"
         },
-        "telnet": {
-          "enable": "Enabled Telnet",
-          "port": {
-            "title": "Telnet port",
-            "note": "Default: 23"
-          }
+        "webSerial": {
+          "enable": "Enabled WebSerial"
         },
         "ntp": {
           "server": "NTP server",

src_data/locales/it.json

@@ -44,6 +44,7 @@
         "build": {
           "title": "Build",
           "version": "Versione",
+          "commit": "Commit",
           "date": "Data",
           "core": "Core",
           "sdk": "SDK"
@@ -248,6 +249,8 @@
         "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"
@@ -320,15 +323,9 @@
       },
       "freezeProtection": {
         "title": "Protezione antigelo",
-        "desc": "Il riscaldamento verrà forzatamente attivato se la temperatura del vettore termico o la temperatura interna scende al di sotto della <b>Soglia di temperatura bassa</b>.",
-        "highTemp": {
-          "title": "Soglia di temperatura alta",
-          "note": "Soglia quando il sistema ritorna alla modalità normale dopo l'attivazione della protezione antigelo"
-        },
-        "lowTemp": {
-          "title": "Soglia di temperatura bassa",
-          "note": "Soglia quando il riscaldamento viene forzatamente attivato"
-        }
+        "desc": "Il riscaldamento verrà attivato forzatamente se la temperatura del vettore di calore o interna scende al di sotto della <b>temperatura minima</b> durante il <b>tempo di attesa</b>.",
+        "lowTemp": "Soglia di temperatura minima",
+        "thresholdTime": "Tempo di attesa <small>(sec)</small>"
       },
 
       "portal": {
@@ -348,12 +345,8 @@
           "enable": "Porta seriale attivata",
           "baud": "Porta seriale baud rate"
         },
-        "telnet": {
-          "enable": "Telnet attivato",
-          "port": {
-            "title": "Porta Telnet",
-            "note": "Default: 23"
-          }
+        "webSerial": {
+          "enable": "WebSerial attivato"
         },
         "ntp": {
           "server": "NTP server",

src_data/locales/nl.json

@@ -40,6 +40,7 @@
         "build": {
           "title": "Build",
           "version": "Versie",
+          "commit": "Commit",
           "date": "Datum",
           "core": "Core",
           "sdk": "SDK"
@@ -227,6 +228,8 @@
         "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"
@@ -294,18 +297,11 @@
         }
       },
       "freezeProtection": {
-        "title": "Vorbeveiliging",
-        "desc": "Verwarming zal geforceerd worden ingeschakeld als de temperatuur van de warmtedrager of de binnentemperatuur daalt onder de <b>Lage temperatuurdrempel</b>.",
-        "highTemp": {
-          "title": "Hoge temperatuurdrempel",
-          "note": "Drempel waarna het systeem terugkeert naar de normale modus na activering van de vorbeveiliging"
-        },
-        "lowTemp": {
-          "title": "Lage temperatuurdrempel",
-          "note": "Drempel wanneer de verwarming geforceerd wordt ingeschakeld"
-        }
+        "title": "Vorstbeveiliging",
+        "desc": "De verwarming wordt geforceerd ingeschakeld als de temperatuur van de warmtedrager of de binnentemperatuur onder de <b>Lage temperatuur</b> daalt gedurende de <b>Wachttijd</b>.",
+        "lowTemp": "Drempelwaarde lage temperatuur",
+        "thresholdTime": "Wachttijd <small>(sec)</small>"
       },
-
       "portal": {
         "login": "Gebruikersnaam",
         "password": "Wachtwoord",
@@ -322,12 +318,8 @@
           "enable": "Seriële poort ingeschakeld",
           "baud": "Baudrate seriële poort"
         },
-        "telnet": {
-          "enable": "Telnet ingeschakeld",
-          "port": {
-            "title": "Telnet-poort",
-            "note": "Standaard: 23"
-          }
+        "webSerial": {
+          "enable": "WebSerial ingeschakeld"
         },
         "ntp": {
           "server": "NTP-server",

src_data/locales/ru.json

@@ -44,6 +44,7 @@
         "build": {
           "title": "Билд",
           "version": "Версия",
+          "commit": "Коммит",
           "date": "Дата",
           "core": "Ядро",
           "sdk": "SDK"
@@ -248,6 +249,8 @@
         "ntcTemp": "NTC датчик",
         "dallasTemp": "DALLAS датчик",
         "bluetooth": "BLE датчик",
+        "dht11": "DHT11 датчик",
+        "dht22": "DHT22 датчик",
         "heatSetpointTemp": "Отопление, температура уставки",
         "manual": "Вручную через MQTT/API",
         "notConfigured": "Не сконфигурировано"
@@ -320,15 +323,9 @@
       },
       "freezeProtection": {
         "title": "Защита от замерзания",
-        "desc": "Отопление будет принудительно включено, если темп. теплоносителя или внутренняя темп. опустится ниже <b>нижнего порога</b>.",
-        "highTemp": {
-          "title": "Верхний порог температуры",
-          "note": "Порог, при котором система вернется в нормальное состояние после активации защиты от замерзания"
-        },
-        "lowTemp": {
-          "title": "Нижний порог температуры",
-          "note": "Порог, при котором отопление будет принудительно включено"
-        }
+        "desc": "Отопление будет принудительно включено, если темп. теплоносителя или внутренняя темп. опустится ниже <b>нижнего порога</b> в течение <b>времени ожидания</b>.",
+        "lowTemp": "Нижний порог температуры",
+        "thresholdTime": "Время ожидания <small>(сек)</small>"
       },
 
       "portal": {
@@ -348,12 +345,8 @@
           "enable": "Вкл. Serial порт",
           "baud": "Скорость Serial порта"
         },
-        "telnet": {
-          "enable": "Вкл. Telnet",
-          "port": {
-            "title": "Telnet порт",
-            "note": "По умолчанию: 23"
-          }
+        "webSerial": {
+          "enable": "Вкл. WebSerial"
         },
         "ntp": {
           "server": "NTP сервер",

src_data/pages/dashboard.html

@@ -195,10 +195,6 @@
                   <th scope="row" data-i18n>dashboard.states.mHeatOverheat</th>
                   <td><i class="mHeatOverheat"></i></td>
                 </tr>
-                <tr>
-                  <th scope="row" data-i18n>dashboard.states.mHeatFreezing</th>
-                  <td><i class="mHeatFreezing"></i></td>
-                </tr>
                 <tr>
                   <th scope="row" data-i18n>dashboard.states.sHeatActive</th>
                   <td><i class="sHeatActive"></i></td>
@@ -495,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);
@@ -637,11 +636,6 @@
               result.master.heating.overheat ? "success" : "error",
               result.master.heating.overheat ? "red" : "green"
             );
-            setStatus(
-              '.mHeatFreezing',
-              result.master.heating.freezing ? "success" : "error",
-              result.master.heating.freezing ? "red" : "green"
-            );
             setValue('.mHeatSetpointTemp', result.master.heating.setpointTemp);
             setValue('.mHeatTargetTemp', result.master.heating.targetTemp);
             setValue('.mHeatCurrTemp', result.master.heating.currentTemp);

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

@@ -118,6 +118,8 @@
                       <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>
@@ -271,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">
-                  <span data-i18n>settings.system.telnet.enable</span>
+                  <input type="checkbox" name="system[webSerial][enabled]" value="true">
+                  <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>
@@ -265,15 +259,13 @@
 
                 <div class="grid">
                   <label>
-                    <span data-i18n>settings.freezeProtection.highTemp.title</span>
-                    <input type="number" inputmode="numeric" name="heating[freezeProtection][highTemp]" min="0" max="0" step="1" required>
-                    <small data-i18n>settings.freezeProtection.highTemp.note</small>
+                    <span data-i18n>settings.freezeProtection.lowTemp</span>
+                    <input type="number" inputmode="numeric" name="heating[freezeProtection][lowTemp]" min="0" max="0" step="1" required>
                   </label>
 
                   <label>
-                    <span data-i18n>settings.freezeProtection.lowTemp.title</span>
-                    <input type="number" inputmode="numeric" name="heating[freezeProtection][lowTemp]" min="0" max="0" step="1" required>
-                    <small data-i18n>settings.freezeProtection.lowTemp.note</small>
+                    <span data-i18n>settings.freezeProtection.thresholdTime</span>
+                    <input type="number" inputmode="numeric" name="heating[freezeProtection][thresholdTime]" min="30" max="1800" step="1" required>
                   </label>
                 </div>
 
@@ -1085,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);
-          setInputValue("[name='system[telnet][port]']", data.system.telnet.port);
+          setCheckboxValue("[name='system[webSerial][enabled]']", data.system.webSerial.enabled);
           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);
@@ -1186,14 +1177,11 @@
             "min": 0,
             "max": data.system.unitSystem == 0 ? 99 : 211
           });
-          setInputValue("[name='heating[freezeProtection][highTemp]']", data.heating.freezeProtection.highTemp, {
-            "min": data.system.unitSystem == 0 ? 1 : 34,
-            "max": data.system.unitSystem == 0 ? 50 : 122
-          });
           setInputValue("[name='heating[freezeProtection][lowTemp]']", data.heating.freezeProtection.lowTemp, {
             "min": data.system.unitSystem == 0 ? 1 : 34,
             "max": data.system.unitSystem == 0 ? 30 : 86
           });
+          setInputValue("[name='heating[freezeProtection][thresholdTime]']", data.heating.freezeProtection.thresholdTime);
           setBusy('#heating-settings-busy', '#heating-settings', false);
 
           // DHW

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">
-                  <button type="button" class="upgrade-firmware-result hidden" disabled></button>
+                  <input type="file" name="fw" accept=".bin">
+                  <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">
-                  <button type="button" class="upgrade-filesystem-result hidden" disabled></button>
+                  <input type="file" name="fs" accept=".bin">
+                  <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,19 +318,25 @@ const setupRestoreBackupForm = (formSelector) => {
         console.log("Backup: ", data);
 
         if (data.settings != undefined) {
-          let response = await fetch(url, {
-            method: "POST",
-            cache: "no-cache",
-            credentials: "include",
-            headers: {
-              "Content-Type": "application/json"
-            },
-            body: JSON.stringify({"settings": data.settings})
-          });
+          for (var key in data.settings) {
+            let response = await fetch(url, {
+              method: "POST",
+              cache: "no-cache",
+              credentials: "include",
+              headers: {
+                "Content-Type": "application/json"
+              },
+              body: JSON.stringify({
+                "settings": {
+                  [key]: data.settings[key]
+                }
+              })
+            });
 
-          if (!response.ok) {
-            onFailed();
-            return;
+            if (!response.ok) {
+              onFailed();
+              return;
+            }
           }
         }
 

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))