refactor: migrating from Telnet to WebSerial for remote logging

lib/HomeAssistantHelper/HomeAssistantHelper.h

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

lib/HomeAssistantHelper/strings.h

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

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

@@ -17,16 +17,20 @@ core_dir = .pio
 version = 1.5.6
 framework = arduino
 lib_deps = 
+  ESP32Async/AsyncTCP
+  ;ESP32Async/ESPAsyncWebServer
+  https://github.com/ESP32Async/ESPAsyncWebServer#main
+  mathieucarbou/MycilaWebSerial@^8.2.0
 	bblanchon/ArduinoJson@^7.4.2
 	;ihormelnyk/OpenTherm Library@^1.1.5
 	https://github.com/Laxilef/opentherm_library#esp32_timer
 	arduino-libraries/ArduinoMqttClient@^0.1.8
-	lennarthennigs/ESP Telnet@^2.2.3
 	gyverlibs/FileData@^1.0.3
 	gyverlibs/GyverPID@^3.3.2
 	gyverlibs/GyverBlinker@^1.1.1
 	https://github.com/pstolarz/Arduino-Temperature-Control-Library.git#OneWireNg
-	laxilef/TinyLogger@^1.1.1
+	;laxilef/TinyLogger@^1.1.1
+  https://github.com/Laxilef/TinyLogger#custom_handlers
 build_type = ${secrets.build_type}
 build_flags = 
 	-mtext-section-literals
@@ -34,10 +38,13 @@ build_flags =
 	;-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_TELNET_ENABLED=${secrets.telnet_enabled}
-	-D DEFAULT_TELNET_PORT=${secrets.telnet_port}
+	-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}"'
@@ -92,13 +99,13 @@ check_flags = ${env.check_flags}
 ;platform_packages = 
 ;  framework-arduinoespressif32 @ https://github.com/espressif/arduino-esp32.git#3.0.5
 ;  framework-arduinoespressif32-libs @ https://github.com/espressif/esp32-arduino-lib-builder/releases/download/idf-release_v5.1/esp32-arduino-libs-idf-release_v5.1-33fbade6.zip
-platform = https://github.com/pioarduino/platform-espressif32/releases/download/55.03.32/platform-espressif32.zip
+platform = https://github.com/pioarduino/platform-espressif32/releases/download/55.03.33/platform-espressif32.zip
 platform_packages = ${env.platform_packages}
 board_build.partitions = esp32_partitions.csv
 lib_deps =
 	${env.lib_deps}
 	laxilef/ESP32Scheduler@^1.0.1
-nimble_lib = h2zero/NimBLE-Arduino@2.3.3
+nimble_lib = https://github.com/h2zero/NimBLE-Arduino
 lib_ignore = 
 extra_scripts = 
 	post:tools/esp32.py
@@ -234,7 +241,7 @@ build_flags =
 	${esp32_defaults.build_flags}
 	-D ARDUINO_USB_MODE=0
 	-D ARDUINO_USB_CDC_ON_BOOT=1
-	-D CONFIG_BT_NIMBLE_EXT_ADV=1
+	;-D CONFIG_BT_NIMBLE_EXT_ADV=1
 	-D USE_BLE=1
 	-D DEFAULT_OT_IN_GPIO=35
 	-D DEFAULT_OT_OUT_GPIO=36

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

@@ -261,13 +261,8 @@ public:
     }
 
     // object id's
-    doc[FPSTR(HA_UNIQUE_ID)] = this->getUniqueIdWithPrefix(objId.c_str());
-    doc[FPSTR(HA_DEFAULT_ENTITY_ID)] = this->getEntityIdWithPrefix(
-      sSensor.type == Sensors::Type::MANUAL 
-        ? FPSTR(HA_ENTITY_NUMBER) 
-        : FPSTR(HA_ENTITY_SENSOR),
-      objId.c_str()
-    );
+    doc[FPSTR(HA_UNIQUE_ID)] = this->getObjectIdWithPrefix(objId.c_str());
+    doc[FPSTR(HA_OBJECT_ID)] = doc[FPSTR(HA_UNIQUE_ID)];
 
     const String& configTopic = this->makeConfigTopic(
       sSensor.type == Sensors::Type::MANUAL ? FPSTR(HA_ENTITY_NUMBER) : FPSTR(HA_ENTITY_SENSOR),
@@ -328,8 +323,8 @@ public:
     String objId = Sensors::makeObjectIdWithSuffix(sSensor.name, F("connected"));
 
     // object id's
-    doc[FPSTR(HA_UNIQUE_ID)] = this->getUniqueIdWithPrefix(objId.c_str());
-    doc[FPSTR(HA_DEFAULT_ENTITY_ID)] = this->getEntityIdWithPrefix(FPSTR(HA_ENTITY_BINARY_SENSOR), objId.c_str());
+    doc[FPSTR(HA_UNIQUE_ID)] = this->getObjectIdWithPrefix(objId.c_str());
+    doc[FPSTR(HA_OBJECT_ID)] = doc[FPSTR(HA_UNIQUE_ID)];
 
     // state topic
     doc[FPSTR(HA_STATE_TOPIC)] = this->getDeviceTopic(
@@ -375,8 +370,8 @@ public:
     String objId = Sensors::makeObjectIdWithSuffix(sSensor.name, F("signal_quality"));
 
     // object id's
-    doc[FPSTR(HA_UNIQUE_ID)] = this->getUniqueIdWithPrefix(objId.c_str());
-    doc[FPSTR(HA_DEFAULT_ENTITY_ID)] = this->getEntityIdWithPrefix(FPSTR(HA_ENTITY_SENSOR), objId.c_str());
+    doc[FPSTR(HA_UNIQUE_ID)] = this->getObjectIdWithPrefix(objId.c_str());
+    doc[FPSTR(HA_OBJECT_ID)] = doc[FPSTR(HA_UNIQUE_ID)];
 
     // state topic
     doc[FPSTR(HA_STATE_TOPIC)] = this->getDeviceTopic(
@@ -412,6 +407,7 @@ public:
   }
 
   bool deleteSignalQualityDynamicSensor(Sensors::Settings& sSensor) {
+    JsonDocument doc;
     const String& configTopic = this->makeConfigTopic(
       FPSTR(HA_ENTITY_SENSOR),
       Sensors::makeObjectIdWithSuffix(sSensor.name, F("signal_quality")).c_str()
@@ -425,8 +421,8 @@ public:
     JsonDocument doc;
     doc[FPSTR(HA_AVAILABILITY)][FPSTR(HA_TOPIC)] = this->statusTopic.c_str();
     doc[FPSTR(HA_ENABLED_BY_DEFAULT)] = enabledByDefault;
-    doc[FPSTR(HA_UNIQUE_ID)] = this->getUniqueIdWithPrefix(F("heating_turbo"));
-    doc[FPSTR(HA_DEFAULT_ENTITY_ID)] = this->getEntityIdWithPrefix(FPSTR(HA_ENTITY_SWITCH), F("heating_turbo"));
+    doc[FPSTR(HA_UNIQUE_ID)] = this->getObjectIdWithPrefix(F("heating_turbo"));
+    doc[FPSTR(HA_OBJECT_ID)] = doc[FPSTR(HA_UNIQUE_ID)];
     doc[FPSTR(HA_ENTITY_CATEGORY)] = FPSTR(HA_ENTITY_CATEGORY_CONFIG);
     doc[FPSTR(HA_NAME)] = F("Turbo heating");
     doc[FPSTR(HA_ICON)] = F("mdi:rocket-launch-outline");
@@ -447,8 +443,8 @@ public:
     JsonDocument doc;
     doc[FPSTR(HA_AVAILABILITY)][FPSTR(HA_TOPIC)] = this->statusTopic.c_str();
     doc[FPSTR(HA_ENABLED_BY_DEFAULT)] = enabledByDefault;
-    doc[FPSTR(HA_UNIQUE_ID)] = this->getUniqueIdWithPrefix(F("heating_hysteresis"));
-    doc[FPSTR(HA_DEFAULT_ENTITY_ID)] = this->getEntityIdWithPrefix(FPSTR(HA_ENTITY_NUMBER), F("heating_hysteresis"));
+    doc[FPSTR(HA_UNIQUE_ID)] = this->getObjectIdWithPrefix(F("heating_hysteresis"));
+    doc[FPSTR(HA_OBJECT_ID)] = doc[FPSTR(HA_UNIQUE_ID)];
     doc[FPSTR(HA_ENTITY_CATEGORY)] = FPSTR(HA_ENTITY_CATEGORY_CONFIG);
     doc[FPSTR(HA_DEVICE_CLASS)] = FPSTR(S_TEMPERATURE);
 
@@ -479,8 +475,8 @@ public:
     JsonDocument doc;
     doc[FPSTR(HA_AVAILABILITY)][FPSTR(HA_TOPIC)] = this->statusTopic.c_str();
     doc[FPSTR(HA_ENABLED_BY_DEFAULT)] = enabledByDefault;
-    doc[FPSTR(HA_UNIQUE_ID)] = this->getUniqueIdWithPrefix(F("heating_turbo_factor"));
-    doc[FPSTR(HA_DEFAULT_ENTITY_ID)] = this->getEntityIdWithPrefix(FPSTR(HA_ENTITY_NUMBER), F("heating_turbo_factor"));
+    doc[FPSTR(HA_UNIQUE_ID)] = this->getObjectIdWithPrefix(F("heating_turbo_factor"));
+    doc[FPSTR(HA_OBJECT_ID)] = doc[FPSTR(HA_UNIQUE_ID)];
     doc[FPSTR(HA_ENTITY_CATEGORY)] = FPSTR(HA_ENTITY_CATEGORY_CONFIG);
     doc[FPSTR(HA_DEVICE_CLASS)] = F("power_factor");
     doc[FPSTR(HA_NAME)] = F("Heating turbo factor");
@@ -503,8 +499,8 @@ public:
     JsonDocument doc;
     doc[FPSTR(HA_AVAILABILITY)][FPSTR(HA_TOPIC)] = this->statusTopic.c_str();
     doc[FPSTR(HA_ENABLED_BY_DEFAULT)] = enabledByDefault;
-    doc[FPSTR(HA_UNIQUE_ID)] = this->getUniqueIdWithPrefix(F("heating_min_temp"));
-    doc[FPSTR(HA_DEFAULT_ENTITY_ID)] = this->getEntityIdWithPrefix(FPSTR(HA_ENTITY_NUMBER), F("heating_min_temp"));
+    doc[FPSTR(HA_UNIQUE_ID)] = this->getObjectIdWithPrefix(F("heating_min_temp"));
+    doc[FPSTR(HA_OBJECT_ID)] = doc[FPSTR(HA_UNIQUE_ID)];
     doc[FPSTR(HA_ENTITY_CATEGORY)] = FPSTR(HA_ENTITY_CATEGORY_CONFIG);
     doc[FPSTR(HA_DEVICE_CLASS)] = FPSTR(S_TEMPERATURE);
 
@@ -537,8 +533,8 @@ public:
     JsonDocument doc;
     doc[FPSTR(HA_AVAILABILITY)][FPSTR(HA_TOPIC)] = this->statusTopic.c_str();
     doc[FPSTR(HA_ENABLED_BY_DEFAULT)] = enabledByDefault;
-    doc[FPSTR(HA_UNIQUE_ID)] = this->getUniqueIdWithPrefix(F("heating_max_temp"));
-    doc[FPSTR(HA_DEFAULT_ENTITY_ID)] = this->getEntityIdWithPrefix(FPSTR(HA_ENTITY_NUMBER), F("heating_max_temp"));
+    doc[FPSTR(HA_UNIQUE_ID)] = this->getObjectIdWithPrefix(F("heating_max_temp"));
+    doc[FPSTR(HA_OBJECT_ID)] = doc[FPSTR(HA_UNIQUE_ID)];
     doc[FPSTR(HA_ENTITY_CATEGORY)] = FPSTR(HA_ENTITY_CATEGORY_CONFIG);
     doc[FPSTR(HA_DEVICE_CLASS)] = FPSTR(S_TEMPERATURE);
 
@@ -572,8 +568,8 @@ public:
     JsonDocument doc;
     doc[FPSTR(HA_AVAILABILITY)][FPSTR(HA_TOPIC)] = this->statusTopic.c_str();
     doc[FPSTR(HA_ENABLED_BY_DEFAULT)] = enabledByDefault;
-    doc[FPSTR(HA_UNIQUE_ID)] = this->getUniqueIdWithPrefix(F("dhw_min_temp"));
-    doc[FPSTR(HA_DEFAULT_ENTITY_ID)] = this->getEntityIdWithPrefix(FPSTR(HA_ENTITY_NUMBER), F("dhw_min_temp"));
+    doc[FPSTR(HA_UNIQUE_ID)] = this->getObjectIdWithPrefix(F("dhw_min_temp"));
+    doc[FPSTR(HA_OBJECT_ID)] = doc[FPSTR(HA_UNIQUE_ID)];
     doc[FPSTR(HA_ENTITY_CATEGORY)] = FPSTR(HA_ENTITY_CATEGORY_CONFIG);
     doc[FPSTR(HA_DEVICE_CLASS)] = FPSTR(S_TEMPERATURE);
 
@@ -606,8 +602,8 @@ public:
     JsonDocument doc;
     doc[FPSTR(HA_AVAILABILITY)][FPSTR(HA_TOPIC)] = this->statusTopic.c_str();
     doc[FPSTR(HA_ENABLED_BY_DEFAULT)] = enabledByDefault;
-    doc[FPSTR(HA_UNIQUE_ID)] = this->getUniqueIdWithPrefix(F("dhw_max_temp"));
-    doc[FPSTR(HA_DEFAULT_ENTITY_ID)] = this->getEntityIdWithPrefix(FPSTR(HA_ENTITY_NUMBER), F("dhw_max_temp"));
+    doc[FPSTR(HA_UNIQUE_ID)] = this->getObjectIdWithPrefix(F("dhw_max_temp"));
+    doc[FPSTR(HA_OBJECT_ID)] = doc[FPSTR(HA_UNIQUE_ID)];
     doc[FPSTR(HA_ENTITY_CATEGORY)] = FPSTR(HA_ENTITY_CATEGORY_CONFIG);
     doc[FPSTR(HA_DEVICE_CLASS)] = FPSTR(S_TEMPERATURE);
 
@@ -641,8 +637,8 @@ public:
     JsonDocument doc;
     doc[FPSTR(HA_AVAILABILITY)][FPSTR(HA_TOPIC)] = this->statusTopic.c_str();
     doc[FPSTR(HA_ENABLED_BY_DEFAULT)] = enabledByDefault;
-    doc[FPSTR(HA_UNIQUE_ID)] = this->getUniqueIdWithPrefix(F("pid"));
-    doc[FPSTR(HA_DEFAULT_ENTITY_ID)] = this->getEntityIdWithPrefix(FPSTR(HA_ENTITY_SWITCH), F("pid"));
+    doc[FPSTR(HA_UNIQUE_ID)] = this->getObjectIdWithPrefix(F("pid"));
+    doc[FPSTR(HA_OBJECT_ID)] = doc[FPSTR(HA_UNIQUE_ID)];
     doc[FPSTR(HA_ENTITY_CATEGORY)] = FPSTR(HA_ENTITY_CATEGORY_CONFIG);
     doc[FPSTR(HA_NAME)] = F("PID");
     doc[FPSTR(HA_ICON)] = F("mdi:chart-bar-stacked");
@@ -663,8 +659,8 @@ public:
     JsonDocument doc;
     doc[FPSTR(HA_AVAILABILITY)][FPSTR(HA_TOPIC)] = this->statusTopic.c_str();
     doc[FPSTR(HA_ENABLED_BY_DEFAULT)] = enabledByDefault;
-    doc[FPSTR(HA_UNIQUE_ID)] = this->getUniqueIdWithPrefix(F("pid_p"));
-    doc[FPSTR(HA_DEFAULT_ENTITY_ID)] = this->getEntityIdWithPrefix(FPSTR(HA_ENTITY_NUMBER), F("pid_p"));
+    doc[FPSTR(HA_UNIQUE_ID)] = this->getObjectIdWithPrefix(F("pid_p"));
+    doc[FPSTR(HA_OBJECT_ID)] = doc[FPSTR(HA_UNIQUE_ID)];
     doc[FPSTR(HA_ENTITY_CATEGORY)] = FPSTR(HA_ENTITY_CATEGORY_CONFIG);
     doc[FPSTR(HA_NAME)] = F("PID factor P");
     doc[FPSTR(HA_ICON)] = F("mdi:alpha-p-circle-outline");
@@ -686,8 +682,8 @@ public:
     JsonDocument doc;
     doc[FPSTR(HA_AVAILABILITY)][FPSTR(HA_TOPIC)] = this->statusTopic.c_str();
     doc[FPSTR(HA_ENABLED_BY_DEFAULT)] = enabledByDefault;
-    doc[FPSTR(HA_UNIQUE_ID)] = this->getUniqueIdWithPrefix(F("pid_i"));
-    doc[FPSTR(HA_DEFAULT_ENTITY_ID)] = this->getEntityIdWithPrefix(FPSTR(HA_ENTITY_NUMBER), F("pid_i"));
+    doc[FPSTR(HA_UNIQUE_ID)] = this->getObjectIdWithPrefix(F("pid_i"));
+    doc[FPSTR(HA_OBJECT_ID)] = doc[FPSTR(HA_UNIQUE_ID)];
     doc[FPSTR(HA_ENTITY_CATEGORY)] = FPSTR(HA_ENTITY_CATEGORY_CONFIG);
     doc[FPSTR(HA_NAME)] = F("PID factor I");
     doc[FPSTR(HA_ICON)] = F("mdi:alpha-i-circle-outline");
@@ -709,8 +705,8 @@ public:
     JsonDocument doc;
     doc[FPSTR(HA_AVAILABILITY)][FPSTR(HA_TOPIC)] = this->statusTopic.c_str();
     doc[FPSTR(HA_ENABLED_BY_DEFAULT)] = enabledByDefault;
-    doc[FPSTR(HA_UNIQUE_ID)] = this->getUniqueIdWithPrefix(F("pid_d"));
-    doc[FPSTR(HA_DEFAULT_ENTITY_ID)] = this->getEntityIdWithPrefix(FPSTR(HA_ENTITY_NUMBER), F("pid_d"));
+    doc[FPSTR(HA_UNIQUE_ID)] = this->getObjectIdWithPrefix(F("pid_d"));
+    doc[FPSTR(HA_OBJECT_ID)] = doc[FPSTR(HA_UNIQUE_ID)];
     doc[FPSTR(HA_ENTITY_CATEGORY)] = FPSTR(HA_ENTITY_CATEGORY_CONFIG);
     doc[FPSTR(HA_NAME)] = F("PID factor D");
     doc[FPSTR(HA_ICON)] = F("mdi:alpha-d-circle-outline");
@@ -732,8 +728,8 @@ public:
     JsonDocument doc;
     doc[FPSTR(HA_AVAILABILITY)][FPSTR(HA_TOPIC)] = this->statusTopic.c_str();
     doc[FPSTR(HA_ENABLED_BY_DEFAULT)] = enabledByDefault;
-    doc[FPSTR(HA_UNIQUE_ID)] = this->getUniqueIdWithPrefix(F("pid_dt"));
-    doc[FPSTR(HA_DEFAULT_ENTITY_ID)] = this->getEntityIdWithPrefix(FPSTR(HA_ENTITY_NUMBER), F("pid_dt"));
+    doc[FPSTR(HA_UNIQUE_ID)] = this->getObjectIdWithPrefix(F("pid_dt"));
+    doc[FPSTR(HA_OBJECT_ID)] = doc[FPSTR(HA_UNIQUE_ID)];
     doc[FPSTR(HA_ENTITY_CATEGORY)] = FPSTR(HA_ENTITY_CATEGORY_CONFIG);
     doc[FPSTR(HA_DEVICE_CLASS)] = F("duration");
     doc[FPSTR(HA_UNIT_OF_MEASUREMENT)] = F("s");
@@ -757,8 +753,8 @@ public:
     JsonDocument doc;
     doc[FPSTR(HA_AVAILABILITY)][FPSTR(HA_TOPIC)] = this->statusTopic.c_str();
     doc[FPSTR(HA_ENABLED_BY_DEFAULT)] = enabledByDefault;
-    doc[FPSTR(HA_UNIQUE_ID)] = this->getUniqueIdWithPrefix(F("pid_min_temp"));
-    doc[FPSTR(HA_DEFAULT_ENTITY_ID)] = this->getEntityIdWithPrefix(FPSTR(HA_ENTITY_NUMBER), F("pid_min_temp"));
+    doc[FPSTR(HA_UNIQUE_ID)] = this->getObjectIdWithPrefix(F("pid_min_temp"));
+    doc[FPSTR(HA_OBJECT_ID)] = doc[FPSTR(HA_UNIQUE_ID)];
     doc[FPSTR(HA_ENTITY_CATEGORY)] = FPSTR(HA_ENTITY_CATEGORY_CONFIG);
     doc[FPSTR(HA_DEVICE_CLASS)] = FPSTR(S_TEMPERATURE);
 
@@ -791,8 +787,8 @@ public:
     JsonDocument doc;
     doc[FPSTR(HA_AVAILABILITY)][FPSTR(HA_TOPIC)] = this->statusTopic.c_str();
     doc[FPSTR(HA_ENABLED_BY_DEFAULT)] = enabledByDefault;
-    doc[FPSTR(HA_UNIQUE_ID)] = this->getUniqueIdWithPrefix(F("pid_max_temp"));
-    doc[FPSTR(HA_DEFAULT_ENTITY_ID)] = this->getEntityIdWithPrefix(FPSTR(HA_ENTITY_NUMBER), F("pid_max_temp"));
+    doc[FPSTR(HA_UNIQUE_ID)] = this->getObjectIdWithPrefix(F("pid_max_temp"));
+    doc[FPSTR(HA_OBJECT_ID)] = doc[FPSTR(HA_UNIQUE_ID)];
     doc[FPSTR(HA_ENTITY_CATEGORY)] = FPSTR(HA_ENTITY_CATEGORY_CONFIG);
     doc[FPSTR(HA_DEVICE_CLASS)] = FPSTR(S_TEMPERATURE);
 
@@ -826,8 +822,8 @@ public:
     JsonDocument doc;
     doc[FPSTR(HA_AVAILABILITY)][FPSTR(HA_TOPIC)] = this->statusTopic.c_str();
     doc[FPSTR(HA_ENABLED_BY_DEFAULT)] = enabledByDefault;
-    doc[FPSTR(HA_UNIQUE_ID)] = this->getUniqueIdWithPrefix(F("equitherm"));
-    doc[FPSTR(HA_DEFAULT_ENTITY_ID)] = this->getEntityIdWithPrefix(FPSTR(HA_ENTITY_SWITCH), F("equitherm"));
+    doc[FPSTR(HA_UNIQUE_ID)] = this->getObjectIdWithPrefix(F("equitherm"));
+    doc[FPSTR(HA_OBJECT_ID)] = doc[FPSTR(HA_UNIQUE_ID)];
     doc[FPSTR(HA_ENTITY_CATEGORY)] = FPSTR(HA_ENTITY_CATEGORY_CONFIG);
     doc[FPSTR(HA_NAME)] = F("Equitherm");
     doc[FPSTR(HA_ICON)] = F("mdi:sun-snowflake-variant");
@@ -848,8 +844,8 @@ public:
     JsonDocument doc;
     doc[FPSTR(HA_AVAILABILITY)][FPSTR(HA_TOPIC)] = this->statusTopic.c_str();
     doc[FPSTR(HA_ENABLED_BY_DEFAULT)] = enabledByDefault;
-    doc[FPSTR(HA_UNIQUE_ID)] = this->getUniqueIdWithPrefix(F("equitherm_n"));
-    doc[FPSTR(HA_DEFAULT_ENTITY_ID)] = this->getEntityIdWithPrefix(FPSTR(HA_ENTITY_NUMBER), F("equitherm_n"));
+    doc[FPSTR(HA_UNIQUE_ID)] = this->getObjectIdWithPrefix(F("equitherm_n"));
+    doc[FPSTR(HA_OBJECT_ID)] = doc[FPSTR(HA_UNIQUE_ID)];
     doc[FPSTR(HA_ENTITY_CATEGORY)] = FPSTR(HA_ENTITY_CATEGORY_CONFIG);
     doc[FPSTR(HA_NAME)] = F("Equitherm factor N");
     doc[FPSTR(HA_ICON)] = F("mdi:alpha-n-circle-outline");
@@ -871,8 +867,8 @@ public:
     JsonDocument doc;
     doc[FPSTR(HA_AVAILABILITY)][FPSTR(HA_TOPIC)] = this->statusTopic.c_str();
     doc[FPSTR(HA_ENABLED_BY_DEFAULT)] = enabledByDefault;
-    doc[FPSTR(HA_UNIQUE_ID)] = this->getUniqueIdWithPrefix(F("equitherm_k"));
-    doc[FPSTR(HA_DEFAULT_ENTITY_ID)] = this->getEntityIdWithPrefix(FPSTR(HA_ENTITY_NUMBER), F("equitherm_k"));
+    doc[FPSTR(HA_UNIQUE_ID)] = this->getObjectIdWithPrefix(F("equitherm_k"));
+    doc[FPSTR(HA_OBJECT_ID)] = doc[FPSTR(HA_UNIQUE_ID)];
     doc[FPSTR(HA_ENTITY_CATEGORY)] = FPSTR(HA_ENTITY_CATEGORY_CONFIG);
     doc[FPSTR(HA_NAME)] = F("Equitherm factor K");
     doc[FPSTR(HA_ICON)] = F("mdi:alpha-k-circle-outline");
@@ -897,8 +893,8 @@ public:
     doc[FPSTR(HA_AVAILABILITY)][1][FPSTR(HA_VALUE_TEMPLATE)] = F("{{ iif(value_json.pid.enabled, 'offline', 'online') }}");
     doc[FPSTR(HA_AVAILABILITY_MODE)] = F("all");
     doc[FPSTR(HA_ENABLED_BY_DEFAULT)] = enabledByDefault;
-    doc[FPSTR(HA_UNIQUE_ID)] = this->getUniqueIdWithPrefix(F("equitherm_t"));
-    doc[FPSTR(HA_DEFAULT_ENTITY_ID)] = this->getEntityIdWithPrefix(FPSTR(HA_ENTITY_NUMBER), F("equitherm_t"));
+    doc[FPSTR(HA_UNIQUE_ID)] = this->getObjectIdWithPrefix(F("equitherm_t"));
+    doc[FPSTR(HA_OBJECT_ID)] = doc[FPSTR(HA_UNIQUE_ID)];
     doc[FPSTR(HA_ENTITY_CATEGORY)] = FPSTR(HA_ENTITY_CATEGORY_CONFIG);
     doc[FPSTR(HA_NAME)] = F("Equitherm factor T");
     doc[FPSTR(HA_ICON)] = F("mdi:alpha-t-circle-outline");
@@ -920,8 +916,8 @@ public:
   bool publishStatusState(bool enabledByDefault = true) {
     JsonDocument doc;
     doc[FPSTR(HA_ENABLED_BY_DEFAULT)] = enabledByDefault;
-    doc[FPSTR(HA_UNIQUE_ID)] = this->getUniqueIdWithPrefix(F("status"));
-    doc[FPSTR(HA_DEFAULT_ENTITY_ID)] = this->getEntityIdWithPrefix(FPSTR(HA_ENTITY_BINARY_SENSOR), F("status"));
+    doc[FPSTR(HA_UNIQUE_ID)] = this->getObjectIdWithPrefix(F("status"));
+    doc[FPSTR(HA_OBJECT_ID)] = doc[FPSTR(HA_UNIQUE_ID)];
     doc[FPSTR(HA_ENTITY_CATEGORY)] = FPSTR(HA_ENTITY_CATEGORY_DIAGNOSTIC);
     doc[FPSTR(HA_DEVICE_CLASS)] = F("problem");
     doc[FPSTR(HA_NAME)] = F("Status");
@@ -938,8 +934,8 @@ public:
     JsonDocument doc;
     doc[FPSTR(HA_AVAILABILITY)][FPSTR(HA_TOPIC)] = this->statusTopic.c_str();
     doc[FPSTR(HA_ENABLED_BY_DEFAULT)] = enabledByDefault;
-    doc[FPSTR(HA_UNIQUE_ID)] = this->getUniqueIdWithPrefix(F("emergency"));
-    doc[FPSTR(HA_DEFAULT_ENTITY_ID)] = this->getEntityIdWithPrefix(FPSTR(HA_ENTITY_BINARY_SENSOR), F("emergency"));
+    doc[FPSTR(HA_UNIQUE_ID)] = this->getObjectIdWithPrefix(F("emergency"));
+    doc[FPSTR(HA_OBJECT_ID)] = doc[FPSTR(HA_UNIQUE_ID)];
     doc[FPSTR(HA_ENTITY_CATEGORY)] = FPSTR(HA_ENTITY_CATEGORY_DIAGNOSTIC);
     doc[FPSTR(HA_DEVICE_CLASS)] = F("problem");
     doc[FPSTR(HA_NAME)] = F("Emergency");
@@ -956,8 +952,8 @@ public:
     JsonDocument doc;
     doc[FPSTR(HA_AVAILABILITY)][FPSTR(HA_TOPIC)] = this->statusTopic.c_str();
     doc[FPSTR(HA_ENABLED_BY_DEFAULT)] = enabledByDefault;
-    doc[FPSTR(HA_UNIQUE_ID)] = this->getUniqueIdWithPrefix(F("ot_status"));
-    doc[FPSTR(HA_DEFAULT_ENTITY_ID)] = this->getEntityIdWithPrefix(FPSTR(HA_ENTITY_BINARY_SENSOR), F("ot_status"));
+    doc[FPSTR(HA_UNIQUE_ID)] = this->getObjectIdWithPrefix(F("ot_status"));
+    doc[FPSTR(HA_OBJECT_ID)] = doc[FPSTR(HA_UNIQUE_ID)];
     doc[FPSTR(HA_ENTITY_CATEGORY)] = FPSTR(HA_ENTITY_CATEGORY_DIAGNOSTIC);
     doc[FPSTR(HA_DEVICE_CLASS)] = F("connectivity");
     doc[FPSTR(HA_NAME)] = F("Opentherm status");
@@ -977,8 +973,9 @@ public:
     doc[FPSTR(HA_AVAILABILITY)][1][FPSTR(HA_VALUE_TEMPLATE)] = JsonString(AVAILABILITY_OT_CONN, true);
     doc[FPSTR(HA_AVAILABILITY_MODE)] = F("all");
     doc[FPSTR(HA_ENABLED_BY_DEFAULT)] = enabledByDefault;
-    doc[FPSTR(HA_UNIQUE_ID)] = this->getUniqueIdWithPrefix(F("heating"));
-    doc[FPSTR(HA_DEFAULT_ENTITY_ID)] = this->getEntityIdWithPrefix(FPSTR(HA_ENTITY_BINARY_SENSOR), F("heating"));
+    doc[FPSTR(HA_UNIQUE_ID)] = this->getObjectIdWithPrefix(F("heating"));
+    doc[FPSTR(HA_OBJECT_ID)] = doc[FPSTR(HA_UNIQUE_ID)];
+    //doc[FPSTR(HA_ENTITY_CATEGORY)] = FPSTR(HA_ENTITY_CATEGORY_DIAGNOSTIC);
     doc[FPSTR(HA_DEVICE_CLASS)] = F("running");
     doc[FPSTR(HA_NAME)] = F("Heating");
     doc[FPSTR(HA_ICON)] = F("mdi:radiator");
@@ -997,8 +994,9 @@ public:
     doc[FPSTR(HA_AVAILABILITY)][1][FPSTR(HA_VALUE_TEMPLATE)] = JsonString(AVAILABILITY_OT_CONN, true);
     doc[FPSTR(HA_AVAILABILITY_MODE)] = F("all");
     doc[FPSTR(HA_ENABLED_BY_DEFAULT)] = enabledByDefault;
-    doc[FPSTR(HA_UNIQUE_ID)] = this->getUniqueIdWithPrefix(F("dhw"));
-    doc[FPSTR(HA_DEFAULT_ENTITY_ID)] = this->getEntityIdWithPrefix(FPSTR(HA_ENTITY_BINARY_SENSOR), F("dhw"));
+    doc[FPSTR(HA_UNIQUE_ID)] = this->getObjectIdWithPrefix(F("dhw"));
+    doc[FPSTR(HA_OBJECT_ID)] = doc[FPSTR(HA_UNIQUE_ID)];
+    //doc[FPSTR(HA_ENTITY_CATEGORY)] = FPSTR(HA_ENTITY_CATEGORY_DIAGNOSTIC);
     doc[FPSTR(HA_DEVICE_CLASS)] = F("running");
     doc[FPSTR(HA_NAME)] = F("DHW");
     doc[FPSTR(HA_ICON)] = F("mdi:faucet");
@@ -1017,8 +1015,9 @@ public:
     doc[FPSTR(HA_AVAILABILITY)][1][FPSTR(HA_VALUE_TEMPLATE)] = JsonString(AVAILABILITY_OT_CONN, true);
     doc[FPSTR(HA_AVAILABILITY_MODE)] = F("all");
     doc[FPSTR(HA_ENABLED_BY_DEFAULT)] = enabledByDefault;
-    doc[FPSTR(HA_UNIQUE_ID)] = this->getUniqueIdWithPrefix(F("flame"));
-    doc[FPSTR(HA_DEFAULT_ENTITY_ID)] = this->getEntityIdWithPrefix(FPSTR(HA_ENTITY_BINARY_SENSOR), F("flame"));
+    doc[FPSTR(HA_UNIQUE_ID)] = this->getObjectIdWithPrefix(F("flame"));
+    doc[FPSTR(HA_OBJECT_ID)] = doc[FPSTR(HA_UNIQUE_ID)];
+    //doc[FPSTR(HA_ENTITY_CATEGORY)] = FPSTR(HA_ENTITY_CATEGORY_DIAGNOSTIC);
     doc[FPSTR(HA_DEVICE_CLASS)] = F("running");
     doc[FPSTR(HA_NAME)] = F("Flame");
     doc[FPSTR(HA_ICON)] = F("mdi:gas-burner");
@@ -1037,8 +1036,8 @@ public:
     doc[FPSTR(HA_AVAILABILITY)][1][FPSTR(HA_VALUE_TEMPLATE)] = JsonString(AVAILABILITY_OT_CONN, true);
     doc[FPSTR(HA_AVAILABILITY_MODE)] = F("all");
     doc[FPSTR(HA_ENABLED_BY_DEFAULT)] = enabledByDefault;
-    doc[FPSTR(HA_UNIQUE_ID)] = this->getUniqueIdWithPrefix(F("fault"));
-    doc[FPSTR(HA_DEFAULT_ENTITY_ID)] = this->getEntityIdWithPrefix(FPSTR(HA_ENTITY_BINARY_SENSOR), F("fault"));
+    doc[FPSTR(HA_UNIQUE_ID)] = this->getObjectIdWithPrefix(F("fault"));
+    doc[FPSTR(HA_OBJECT_ID)] = doc[FPSTR(HA_UNIQUE_ID)];
     doc[FPSTR(HA_ENTITY_CATEGORY)] = FPSTR(HA_ENTITY_CATEGORY_DIAGNOSTIC);
     doc[FPSTR(HA_DEVICE_CLASS)] = F("problem");
     doc[FPSTR(HA_NAME)] = F("Fault");
@@ -1058,8 +1057,8 @@ public:
     doc[FPSTR(HA_AVAILABILITY)][1][FPSTR(HA_VALUE_TEMPLATE)] = JsonString(AVAILABILITY_OT_CONN, true);
     doc[FPSTR(HA_AVAILABILITY_MODE)] = F("all");
     doc[FPSTR(HA_ENABLED_BY_DEFAULT)] = enabledByDefault;
-    doc[FPSTR(HA_UNIQUE_ID)] = this->getUniqueIdWithPrefix(FPSTR(HA_ENTITY_CATEGORY_DIAGNOSTIC));
-    doc[FPSTR(HA_DEFAULT_ENTITY_ID)] = this->getEntityIdWithPrefix(FPSTR(HA_ENTITY_BINARY_SENSOR), FPSTR(HA_ENTITY_CATEGORY_DIAGNOSTIC));
+    doc[FPSTR(HA_UNIQUE_ID)] = this->getObjectIdWithPrefix(FPSTR(HA_ENTITY_CATEGORY_DIAGNOSTIC));
+    doc[FPSTR(HA_OBJECT_ID)] = doc[FPSTR(HA_UNIQUE_ID)];
     doc[FPSTR(HA_ENTITY_CATEGORY)] = FPSTR(HA_ENTITY_CATEGORY_DIAGNOSTIC);
     doc[FPSTR(HA_DEVICE_CLASS)] = F("problem");
     doc[FPSTR(HA_NAME)] = F("Diagnostic");
@@ -1076,8 +1075,8 @@ public:
     JsonDocument doc;
     doc[FPSTR(HA_AVAILABILITY)][FPSTR(HA_TOPIC)] = this->statusTopic.c_str();
     doc[FPSTR(HA_ENABLED_BY_DEFAULT)] = enabledByDefault;
-    doc[FPSTR(HA_UNIQUE_ID)] = this->getUniqueIdWithPrefix(F("ext_pump"));
-    doc[FPSTR(HA_DEFAULT_ENTITY_ID)] = this->getEntityIdWithPrefix(FPSTR(HA_ENTITY_BINARY_SENSOR), F("ext_pump"));
+    doc[FPSTR(HA_UNIQUE_ID)] = this->getObjectIdWithPrefix(F("ext_pump"));
+    doc[FPSTR(HA_OBJECT_ID)] = doc[FPSTR(HA_UNIQUE_ID)];
     doc[FPSTR(HA_ENTITY_CATEGORY)] = FPSTR(HA_ENTITY_CATEGORY_DIAGNOSTIC);
     doc[FPSTR(HA_DEVICE_CLASS)] = F("running");
     doc[FPSTR(HA_NAME)] = F("External pump");
@@ -1097,8 +1096,8 @@ public:
     doc[FPSTR(HA_AVAILABILITY)][1][FPSTR(HA_VALUE_TEMPLATE)] = F("{{ iif(value_json.slave.connected and value_json.slave.fault.active, 'online', 'offline') }}");
     doc[FPSTR(HA_AVAILABILITY_MODE)] = F("all");
     doc[FPSTR(HA_ENABLED_BY_DEFAULT)] = enabledByDefault;
-    doc[FPSTR(HA_UNIQUE_ID)] = this->getUniqueIdWithPrefix(F("fault_code"));
-    doc[FPSTR(HA_DEFAULT_ENTITY_ID)] = this->getEntityIdWithPrefix(FPSTR(HA_ENTITY_SENSOR), F("fault_code"));
+    doc[FPSTR(HA_UNIQUE_ID)] = this->getObjectIdWithPrefix(F("fault_code"));
+    doc[FPSTR(HA_OBJECT_ID)] = doc[FPSTR(HA_UNIQUE_ID)];
     doc[FPSTR(HA_ENTITY_CATEGORY)] = FPSTR(HA_ENTITY_CATEGORY_DIAGNOSTIC);
     doc[FPSTR(HA_NAME)] = F("Fault code");
     doc[FPSTR(HA_ICON)] = F("mdi:cog-box");
@@ -1117,8 +1116,8 @@ public:
     doc[FPSTR(HA_AVAILABILITY)][1][FPSTR(HA_VALUE_TEMPLATE)] = F("{{ iif(value_json.slave.connected and value_json.slave.fault.active or value_json.slave.diag.active, 'online', 'offline') }}");
     doc[FPSTR(HA_AVAILABILITY_MODE)] = F("all");
     doc[FPSTR(HA_ENABLED_BY_DEFAULT)] = enabledByDefault;
-    doc[FPSTR(HA_UNIQUE_ID)] = this->getUniqueIdWithPrefix(F("diagnostic_code"));
-    doc[FPSTR(HA_DEFAULT_ENTITY_ID)] = this->getEntityIdWithPrefix(FPSTR(HA_ENTITY_SENSOR), F("diagnostic_code"));
+    doc[FPSTR(HA_UNIQUE_ID)] = this->getObjectIdWithPrefix(F("diagnostic_code"));
+    doc[FPSTR(HA_OBJECT_ID)] = doc[FPSTR(HA_UNIQUE_ID)];
     doc[FPSTR(HA_ENTITY_CATEGORY)] = FPSTR(HA_ENTITY_CATEGORY_DIAGNOSTIC);
     doc[FPSTR(HA_NAME)] = F("Diagnostic code");
     doc[FPSTR(HA_ICON)] = F("mdi:information-box");
@@ -1134,8 +1133,8 @@ public:
     JsonDocument doc;
     doc[FPSTR(HA_AVAILABILITY)][FPSTR(HA_TOPIC)] = this->statusTopic.c_str();
     doc[FPSTR(HA_ENABLED_BY_DEFAULT)] = enabledByDefault;
-    doc[FPSTR(HA_UNIQUE_ID)] = this->getUniqueIdWithPrefix(FPSTR(S_RSSI));
-    doc[FPSTR(HA_DEFAULT_ENTITY_ID)] = this->getEntityIdWithPrefix(FPSTR(HA_ENTITY_SENSOR), FPSTR(S_RSSI));
+    doc[FPSTR(HA_UNIQUE_ID)] = this->getObjectIdWithPrefix(FPSTR(S_RSSI));
+    doc[FPSTR(HA_OBJECT_ID)] = doc[FPSTR(HA_UNIQUE_ID)];
     doc[FPSTR(HA_ENTITY_CATEGORY)] = FPSTR(HA_ENTITY_CATEGORY_DIAGNOSTIC);
     doc[FPSTR(HA_DEVICE_CLASS)] = F("signal_strength");
     doc[FPSTR(HA_STATE_CLASS)] = FPSTR(HA_STATE_CLASS_MEASUREMENT);
@@ -1154,8 +1153,8 @@ public:
     JsonDocument doc;
     doc[FPSTR(HA_AVAILABILITY)][FPSTR(HA_TOPIC)] = this->statusTopic.c_str();
     doc[FPSTR(HA_ENABLED_BY_DEFAULT)] = enabledByDefault;
-    doc[FPSTR(HA_UNIQUE_ID)] = this->getUniqueIdWithPrefix(F("uptime"));
-    doc[FPSTR(HA_DEFAULT_ENTITY_ID)] = this->getEntityIdWithPrefix(FPSTR(HA_ENTITY_SENSOR), F("uptime"));
+    doc[FPSTR(HA_UNIQUE_ID)] = this->getObjectIdWithPrefix(F("uptime"));
+    doc[FPSTR(HA_OBJECT_ID)] = doc[FPSTR(HA_UNIQUE_ID)];
     doc[FPSTR(HA_ENTITY_CATEGORY)] = FPSTR(HA_ENTITY_CATEGORY_DIAGNOSTIC);
     doc[FPSTR(HA_DEVICE_CLASS)] = F("duration");
     doc[FPSTR(HA_STATE_CLASS)] = F("total_increasing");
@@ -1175,8 +1174,8 @@ public:
     JsonDocument doc;
     doc[FPSTR(HA_AVAILABILITY)][FPSTR(HA_TOPIC)] = this->statusTopic.c_str();
     doc[FPSTR(HA_ENABLED_BY_DEFAULT)] = enabledByDefault;
-    doc[FPSTR(HA_UNIQUE_ID)] = this->getUniqueIdWithPrefix(F("heating"));
-    doc[FPSTR(HA_DEFAULT_ENTITY_ID)] = this->getEntityIdWithPrefix(FPSTR(HA_ENTITY_CLIMATE), F("heating"));
+    doc[FPSTR(HA_UNIQUE_ID)] = this->getObjectIdWithPrefix(F("heating"));
+    doc[FPSTR(HA_OBJECT_ID)] = doc[FPSTR(HA_UNIQUE_ID)];
     doc[FPSTR(HA_NAME)] = F("Heating");
     doc[FPSTR(HA_ICON)] = F("mdi:radiator");
 
@@ -1227,8 +1226,8 @@ public:
     JsonDocument doc;
     doc[FPSTR(HA_AVAILABILITY)][FPSTR(HA_TOPIC)] = this->statusTopic.c_str();
     doc[FPSTR(HA_ENABLED_BY_DEFAULT)] = enabledByDefault;
-    doc[FPSTR(HA_UNIQUE_ID)] = this->getUniqueIdWithPrefix(F("dhw"));
-    doc[FPSTR(HA_DEFAULT_ENTITY_ID)] = this->getEntityIdWithPrefix(FPSTR(HA_ENTITY_CLIMATE), F("dhw"));
+    doc[FPSTR(HA_UNIQUE_ID)] = this->getObjectIdWithPrefix(F("dhw"));
+    doc[FPSTR(HA_OBJECT_ID)] = doc[FPSTR(HA_UNIQUE_ID)];
     doc[FPSTR(HA_NAME)] = F("DHW");
     doc[FPSTR(HA_ICON)] = F("mdi:faucet");
 
@@ -1272,8 +1271,8 @@ public:
     JsonDocument doc;
     doc[FPSTR(HA_AVAILABILITY)][FPSTR(HA_TOPIC)] = this->statusTopic.c_str();
     doc[FPSTR(HA_ENABLED_BY_DEFAULT)] = enabledByDefault;
-    doc[FPSTR(HA_UNIQUE_ID)] = this->getUniqueIdWithPrefix(FPSTR(S_RESTART));
-    doc[FPSTR(HA_DEFAULT_ENTITY_ID)] = this->getEntityIdWithPrefix(FPSTR(HA_ENTITY_BUTTON), FPSTR(S_RESTART));
+    doc[FPSTR(HA_UNIQUE_ID)] = this->getObjectIdWithPrefix(FPSTR(S_RESTART));
+    doc[FPSTR(HA_OBJECT_ID)] = doc[FPSTR(HA_UNIQUE_ID)];
     doc[FPSTR(HA_ENTITY_CATEGORY)] = FPSTR(HA_ENTITY_CATEGORY_CONFIG);
     doc[FPSTR(HA_DEVICE_CLASS)] = FPSTR(S_RESTART);
     doc[FPSTR(HA_NAME)] = F("Restart");
@@ -1292,8 +1291,8 @@ public:
     doc[FPSTR(HA_AVAILABILITY)][1][FPSTR(HA_VALUE_TEMPLATE)] = F("{{ iif(value_json.slave.fault.active, 'online', 'offline') }}");
     doc[FPSTR(HA_AVAILABILITY_MODE)] = F("all");
     doc[FPSTR(HA_ENABLED_BY_DEFAULT)] = enabledByDefault;
-    doc[FPSTR(HA_UNIQUE_ID)] = this->getUniqueIdWithPrefix(F("reset_fault"));
-    doc[FPSTR(HA_DEFAULT_ENTITY_ID)] = this->getEntityIdWithPrefix(FPSTR(HA_ENTITY_BUTTON), F("reset_fault"));
+    doc[FPSTR(HA_UNIQUE_ID)] = this->getObjectIdWithPrefix(F("reset_fault"));
+    doc[FPSTR(HA_OBJECT_ID)] = doc[FPSTR(HA_UNIQUE_ID)];
     doc[FPSTR(HA_ENTITY_CATEGORY)] = FPSTR(HA_ENTITY_CATEGORY_CONFIG);
     doc[FPSTR(HA_DEVICE_CLASS)] = FPSTR(S_RESTART);
     doc[FPSTR(HA_NAME)] = F("Reset fault");
@@ -1312,8 +1311,8 @@ public:
     doc[FPSTR(HA_AVAILABILITY)][1][FPSTR(HA_VALUE_TEMPLATE)] = F("{{ iif(value_json.slave.diag.active, 'online', 'offline') }}");
     doc[FPSTR(HA_AVAILABILITY_MODE)] = F("all");
     doc[FPSTR(HA_ENABLED_BY_DEFAULT)] = enabledByDefault;
-    doc[FPSTR(HA_UNIQUE_ID)] = this->getUniqueIdWithPrefix(F("reset_diagnostic"));
-    doc[FPSTR(HA_DEFAULT_ENTITY_ID)] = this->getEntityIdWithPrefix(FPSTR(HA_ENTITY_BUTTON), F("reset_diagnostic"));
+    doc[FPSTR(HA_UNIQUE_ID)] = this->getObjectIdWithPrefix(F("reset_diagnostic"));
+    doc[FPSTR(HA_OBJECT_ID)] = doc[FPSTR(HA_UNIQUE_ID)];
     doc[FPSTR(HA_ENTITY_CATEGORY)] = FPSTR(HA_ENTITY_CATEGORY_CONFIG);
     doc[FPSTR(HA_DEVICE_CLASS)] = FPSTR(S_RESTART);
     doc[FPSTR(HA_NAME)] = F("Reset diagnostic");

src/MainTask.h

@@ -6,7 +6,6 @@ extern NetworkMgr* network;
 extern MqttTask* tMqtt;
 extern OpenThermTask* tOt;
 extern FileData fsNetworkSettings, fsSettings, fsSensorsSettings;
-extern ESPTelnetStream* telnetStream;
 
 
 class MainTask : public Task {
@@ -40,7 +39,6 @@ protected:
   PumpStartReason extPumpStartReason = PumpStartReason::NONE;
   unsigned long externalPumpStartTime = 0;
   bool ntpStarted = false;
-  bool telnetStarted = false;
   bool emergencyDetected = false;
   unsigned long emergencyFlipTime = 0;
   bool freezeDetected = false;
@@ -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();
 
@@ -142,11 +135,6 @@ protected:
         this->ntpStarted = false;
       }
 
-      if (this->telnetStarted) {
-        telnetStream->stop();
-        this->telnetStarted = false;
-      }
-
       if (tMqtt->isEnabled()) {
         tMqtt->disable();
       }
@@ -160,23 +148,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 +190,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/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

@@ -164,6 +164,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";
@@ -197,7 +198,6 @@ const char S_SUMMER_WINTER_MODE[]                   PROGMEM = "summerWinterMode"
 const char S_SYSTEM[]                               PROGMEM = "system";
 const char S_TARGET[]                               PROGMEM = "target";
 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";
@@ -216,3 +216,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;
@@ -576,7 +575,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;
       }
@@ -602,20 +601,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;
       }
     }

src_data/locales/cn.json

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

src_data/locales/en.json

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

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

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

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

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>
@@ -876,8 +870,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

@@ -313,19 +313,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;
+            }
           }
         }