Merge branch 'master' into async

* feat: generate dynamic filenames for JSON file downloads (backup and debug) based on hostname and timestamp

* fix: threadsafe getFilename

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: template
-        value_template: "{{ (states(source_entity)|float(0) - states(target_entity)|float(0)) | abs | round(2) >= 0.01 }}"
+      - 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: template
-        value_template: "{{ (state_attr(source_entity, 'temperature')|float(0) - states(target_entity)|float(0)) | abs | round(2) >= 0.1 }}"
+      - 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/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,379 +1,220 @@
-; 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
-	https://github.com/pstolarz/Arduino-Temperature-Control-Library.git#OneWireNg
-	laxilef/TinyLogger@^1.1.1
-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-async
+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.5
+                          https://github.com/Laxilef/Arduino-Temperature-Control-Library#fix_85c
+                          ;laxilef/TinyLogger@^1.1.1
+                          https://github.com/Laxilef/TinyLogger#custom_handlers
+lib_ignore              = paulstoffregen/OneWire
+build_type              = ${secrets.build_type}
+build_flags             = -mtext-section-literals
+                          -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 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 = 
-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.35/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 = 
-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.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              = 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           = 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}
 
 
 ; 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
 
-[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

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/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;
@@ -106,9 +104,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 +121,6 @@ protected:
         }
       }
 
-      if (!this->telnetStarted && telnetStream != nullptr) {
-        telnetStream->begin(23, false);
-        this->telnetStarted = true;
-      }
-
       if (settings.mqtt.enabled && !tMqtt->isEnabled()) {
         tMqtt->enable();
 
@@ -135,18 +128,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 +146,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
@@ -215,7 +188,7 @@ protected:
       vars.states.restarting = true;
     }
 
-    if (settings.system.logLevel < TinyLogger::Level::VERBOSE) {
+    if (settings.system.logLevel < TinyLoggerLevel::VERBOSE) {
       return;
     }
 

src/MqttTask.h

@@ -416,7 +416,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/SensorsTask.h

@@ -66,7 +66,8 @@ public:
   }
 
 protected:
-  const unsigned int disconnectedTimeout = 120000;
+  const unsigned int wiredDisconnectTimeout = 180000u;
+  const unsigned int wirelessDisconnectTimeout = 600000u;
   const unsigned short dallasSearchInterval = 60000;
   const unsigned short dallasPollingInterval = 10000;
   const unsigned short globalPollingInterval = 15000;
@@ -1004,12 +1005,16 @@ protected:
       } else if (rSensor.connected && sSensor.purpose == Sensors::Purpose::NOT_CONFIGURED) {
         Sensors::setConnectionStatusById(sensorId, false, false);
 
-      } else if (sSensor.type != Sensors::Type::MANUAL && rSensor.connected && (millis() - rSensor.activityTime) > this->disconnectedTimeout) {
-        Sensors::setConnectionStatusById(sensorId, false, false);
+      } else if (rSensor.connected) {
+        if (sSensor.type == Sensors::Type::MANUAL || sSensor.type == Sensors::Type::BLUETOOTH) {
+          if ((millis() - rSensor.activityTime) > this->wirelessDisconnectTimeout) {
+            Sensors::setConnectionStatusById(sensorId, false, false);
+          }
 
-      }/* else if (!rSensor.connected) {
-        rSensor.connected = true;
-      }*/
+        } else if ((millis() - rSensor.activityTime) > this->wiredDisconnectTimeout) {
+          Sensors::setConnectionStatusById(sensorId, false, false);
+        }
+      }
     }
   }
 

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";

src/defines.h

@@ -42,12 +42,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 +71,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/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

@@ -165,6 +165,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";
@@ -201,7 +202,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";
@@ -219,3 +219,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;
@@ -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;
       }
     }
@@ -2109,21 +2099,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>();
-
-    uint8_t vType = static_cast<uint8_t>(Sensors::ValueType::PRIMARY);
-    if (fabsf(value - dst.values[vType]) > 0.0001f) {
-      dst.values[vType] = roundf(value, 2);
-      changed = true;
-    }
+    return Sensors::setValueById(
+      sensorId,
+      src[FPSTR(S_VALUE)].as<float>(),
+      Sensors::ValueType::PRIMARY,
+      true,
+      true
+    );
   }
 
-  return changed;
+  return false;
 }
 
 void varsToJson(const Variables& src, JsonVariant dst) {

src_data/locales/cn.json

@@ -342,12 +342,8 @@
           "enable": "启用串口",
           "baud": "串口波特率"
         },
-        "telnet": {
-          "enable": "启用 Telnet",
-          "port": {
-            "title": "Telnet 端口",
-            "note": "默认值：23"
-          }
+        "webSerial": {
+          "enable": "启用 WebSerial"
         },
         "ntp": {
           "server": "NTP服务器",

src_data/locales/en.json

@@ -342,12 +342,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

@@ -342,12 +342,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

@@ -315,12 +315,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

@@ -342,12 +342,8 @@
           "enable": "Вкл. Serial порт",
           "baud": "Скорость Serial порта"
         },
-        "telnet": {
-          "enable": "Вкл. Telnet",
-          "port": {
-            "title": "Telnet порт",
-            "note": "По умолчанию: 23"
-          }
+        "webSerial": {
+          "enable": "Вкл. WebSerial"
         },
         "ntp": {
           "server": "NTP сервер",

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/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>
@@ -1083,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);

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;
+            }
           }
         }