fix: build for nodemcu32, c3, c6 boards; formatting `platformio.ini`

lib/WebServerHandlers/UpgradeHandler.h

@@ -1,6 +1,6 @@
 #include <Arduino.h>
 
-class UpgradeHandler : public AsyncWebHandler {
+class UpgradeHandler : public RequestHandler {
 public:
   enum class UpgradeType {
     FIRMWARE = 0,
@@ -12,7 +12,7 @@ public:
     NO_FILE,
     SUCCESS,
     PROHIBITED,
-    SIZE_MISMATCH,
+    ABORTED,
     ERROR_ON_START,
     ERROR_ON_WRITE,
     ERROR_ON_FINISH
@@ -22,21 +22,27 @@ public:
     UpgradeType type;
     UpgradeStatus status;
     String error;
-    size_t progress = 0;
-    size_t size = 0;
   } UpgradeResult;
 
-  typedef std::function<bool(AsyncWebServerRequest *request, UpgradeType)> BeforeUpgradeCallback;
+  typedef std::function<bool(HTTPMethod, const String&)> CanHandleCallback;
-  typedef std::function<void(AsyncWebServerRequest *request, const UpgradeResult&, const UpgradeResult&)> AfterUpgradeCallback;
+  typedef std::function<bool(const String&)> CanUploadCallback;
+  typedef std::function<bool(UpgradeType)> BeforeUpgradeCallback;
+  typedef std::function<void(const UpgradeResult&, const UpgradeResult&)> AfterUpgradeCallback;
   
-  UpgradeHandler(AsyncURIMatcher uri) : uri(uri) {}
+  UpgradeHandler(const char* uri) {
+    this->uri = uri;
+  }
 
-  bool canHandle(AsyncWebServerRequest *request) const override final {
+  UpgradeHandler* setCanHandleCallback(CanHandleCallback callback = nullptr) {
-    if (!request->isHTTP()) {
+    this->canHandleCallback = callback;
-      return false;
+
-    }
+    return this;
-    
+  }
-    return this->uri.matches(request);
+
+  UpgradeHandler* setCanUploadCallback(CanUploadCallback callback = nullptr) {
+    this->canUploadCallback = callback;
+
+    return this;
   }
 
   UpgradeHandler* setBeforeUpgradeCallback(BeforeUpgradeCallback callback = nullptr) {
@@ -51,9 +57,29 @@ public:
     return this;
   }
 
-  void handleRequest(AsyncWebServerRequest *request) override final {
+  #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 {
     if (this->afterUpgradeCallback) {
-      this->afterUpgradeCallback(request, this->firmwareResult, this->filesystemResult);
+      this->afterUpgradeCallback(this->firmwareResult, this->filesystemResult);
     }
 
     this->firmwareResult.status = UpgradeStatus::NONE;
@@ -61,147 +87,129 @@ public:
 
     this->filesystemResult.status = UpgradeStatus::NONE;
     this->filesystemResult.error.clear();
+
+    return true;
   }
 
-  void handleUpload(AsyncWebServerRequest *request, const String &fileName, size_t index, uint8_t *data, size_t dataLength, bool isFinal) override final {
+  void upload(WebServer& server, const String& uri, HTTPUpload& upload) override {
-    UpgradeResult* result = nullptr;
+    UpgradeResult* result;
-
+    if (upload.name.equals(F("firmware"))) {
-    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) {
+    } else if (upload.name.equals(F("filesystem"))) {
-        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(request, result->type)) {
+    if (this->beforeUpgradeCallback && !this->beforeUpgradeCallback(result->type)) {
       result->status = UpgradeStatus::PROHIBITED;
       return;
     }
 
-    if (!fileName.length()) {
+    if (!upload.filename.length()) {
       result->status = UpgradeStatus::NO_FILE;
       return;
     }
 
-    if (!index) {
+    if (upload.status == UPLOAD_FILE_START) {
       // 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), "File '%s', on start: %s", fileName.c_str(), result->error.c_str());
+        Log.serrorln(FPSTR(L_PORTAL_OTA), F("File '%s', on start: %s"), upload.filename.c_str(), result->error.c_str());
         return;
       }
       
-      Log.sinfoln(FPSTR(L_PORTAL_OTA), "File '%s', started", fileName.c_str());
+      Log.sinfoln(FPSTR(L_PORTAL_OTA), F("File '%s', started"), upload.filename.c_str());
-    }
+
-    
+    } else if (upload.status == UPLOAD_FILE_WRITE) {
-    if (dataLength) {
+      if (Update.write(upload.buf, upload.currentSize) != upload.currentSize) {
-      if (Update.write(data, dataLength) != dataLength) {
         Update.end(false);
+
         result->status = UpgradeStatus::ERROR_ON_WRITE;
+        #ifdef ARDUINO_ARCH_ESP8266
+        result->error = Update.getErrorString();
+        #else
         result->error = Update.errorString();
+        #endif
 
         Log.serrorln(
-          FPSTR(L_PORTAL_OTA), "File '%s', on write %d bytes, %d of %d bytes",
+          FPSTR(L_PORTAL_OTA),
-          fileName.c_str(),
+          F("File '%s', on writing %d bytes: %s"),
-          dataLength,
+          upload.filename.c_str(), upload.totalSize, result->error.c_str()
-          result->progress + dataLength,
-          result->size
         );
-        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
-      );
-    }
 
-    if (result->size > 0) {
+      } else {
-      if (result->progress > result->size || (isFinal && result->progress < result->size)) {
+        Log.sinfoln(FPSTR(L_PORTAL_OTA), F("File '%s', writed %d bytes"), upload.filename.c_str(), upload.totalSize);
-        Update.end(false);
-        result->status = UpgradeStatus::SIZE_MISMATCH;
-
-        Log.serrorln(
-          FPSTR(L_PORTAL_OTA), "File '%s', size mismatch: %d of %d bytes",
-          fileName.c_str(),
-          result->progress,
-          result->size
-        );
-        return;
       }
-    }
+
-    
+    } else if (upload.status == UPLOAD_FILE_END) {
-    if (isFinal) {
+      if (Update.end(true)) {
-      if (!Update.end(true)) {
+        result->status = UpgradeStatus::SUCCESS;
+
+        Log.sinfoln(FPSTR(L_PORTAL_OTA), F("File '%s': finish"), upload.filename.c_str());
+
+      } else {
         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), "File '%s', on finish: %s", fileName.c_str(), result->error);
+        Log.serrorln(FPSTR(L_PORTAL_OTA), F("File '%s', on finish: %s"), upload.filename.c_str(), result->error);
-        return;
       }
 
-      result->status = UpgradeStatus::SUCCESS;
+    } else if (upload.status == UPLOAD_FILE_ABORTED) {
-      Log.sinfoln(FPSTR(L_PORTAL_OTA), "File '%s': finish", fileName.c_str());
+      Update.end(false);
-    }
+      result->status = UpgradeStatus::ABORTED;
-  }
 
-  bool isRequestHandlerTrivial() const override final {
+      Log.serrorln(FPSTR(L_PORTAL_OTA), F("File '%s': aborted"), upload.filename.c_str());
-    return false;
+    }
   }
 
 protected:
+  CanHandleCallback canHandleCallback;
+  CanUploadCallback canUploadCallback;
   BeforeUpgradeCallback beforeUpgradeCallback;
   AfterUpgradeCallback afterUpgradeCallback;
-  AsyncURIMatcher uri;
+  const char* uri = nullptr;
 
   UpgradeResult firmwareResult{UpgradeType::FIRMWARE, UpgradeStatus::NONE};
   UpgradeResult filesystemResult{UpgradeType::FILESYSTEM, UpgradeStatus::NONE};

platformio.ini

@@ -1,386 +1,269 @@
-; 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.ini
-extra_configs = secrets.default.ini
+extra_configs           = secrets.default.ini
-core_dir = .pio
+core_dir                = .pio
 
 [env]
-version = 1.5.6
+version                 = 1.5.7-passiveble
-framework = arduino
+framework               = arduino
-lib_deps = 
+lib_deps                = bblanchon/ArduinoJson@^7.4.2
-  ESP32Async/AsyncTCP
+                          ;ihormelnyk/OpenTherm Library@^1.1.5
-  ;ESP32Async/ESPAsyncWebServer
+                          https://github.com/Laxilef/opentherm_library#esp32_timer
-  https://github.com/ESP32Async/ESPAsyncWebServer#main
+                          arduino-libraries/ArduinoMqttClient@^0.1.8
-  mathieucarbou/MycilaWebSerial@^8.2.0
+                          lennarthennigs/ESP Telnet@^2.2.3
-	bblanchon/ArduinoJson@^7.4.2
+                          gyverlibs/FileData@^1.0.3
-	;ihormelnyk/OpenTherm Library@^1.1.5
+                          gyverlibs/GyverPID@^3.3.2
-	https://github.com/Laxilef/opentherm_library#esp32_timer
+                          gyverlibs/GyverBlinker@^1.1.1
-	arduino-libraries/ArduinoMqttClient@^0.1.8
+                          https://github.com/pstolarz/Arduino-Temperature-Control-Library.git#OneWireNg
-	gyverlibs/FileData@^1.0.3
+                          laxilef/TinyLogger@^1.1.1
-	gyverlibs/GyverPID@^3.3.2
+build_type              = ${secrets.build_type}
-	gyverlibs/GyverBlinker@^1.1.1
+build_flags             = -mtext-section-literals
-	https://github.com/pstolarz/Arduino-Temperature-Control-Library.git#OneWireNg
+                          -Wno-deprecated-declarations
-	;laxilef/TinyLogger@^1.1.1
+                          -D MQTT_CLIENT_STD_FUNCTION_CALLBACK=1
-  https://github.com/Laxilef/TinyLogger#custom_handlers
+                          ;-D DEBUG_ESP_CORE -D DEBUG_ESP_WIFI -D DEBUG_ESP_HTTP_SERVER -D DEBUG_ESP_PORT=Serial
-build_type = ${secrets.build_type}
+                          -D BUILD_VERSION='"${this.version}"'
-build_flags = 
+                          -D BUILD_ENV='"$PIOENV"'
-	-mtext-section-literals
+                          -D DEFAULT_SERIAL_ENABLED=${secrets.serial_enabled}
-	-D MQTT_CLIENT_STD_FUNCTION_CALLBACK=1
+                          -D DEFAULT_SERIAL_BAUD=${secrets.serial_baud}
-	;-D DEBUG_ESP_CORE -D DEBUG_ESP_WIFI -D DEBUG_ESP_HTTP_SERVER -D DEBUG_ESP_PORT=Serial
+                          -D DEFAULT_TELNET_ENABLED=${secrets.telnet_enabled}
-	-D BUILD_VERSION='"${this.version}"'
+                          -D DEFAULT_TELNET_PORT=${secrets.telnet_port}
-	-D BUILD_ENV='"$PIOENV"'
+                          -D DEFAULT_LOG_LEVEL=${secrets.log_level}
-  -D CONFIG_ASYNC_TCP_STACK_SIZE=4096
+                          -D DEFAULT_HOSTNAME='"${secrets.hostname}"'
-	-D ARDUINOJSON_USE_DOUBLE=0
+                          -D DEFAULT_AP_SSID='"${secrets.ap_ssid}"'
-	-D ARDUINOJSON_USE_LONG_LONG=0
+                          -D DEFAULT_AP_PASSWORD='"${secrets.ap_password}"'
-  -D TINYLOGGER_GLOBAL
+                          -D DEFAULT_STA_SSID='"${secrets.sta_ssid}"'
-	-D DEFAULT_SERIAL_ENABLED=${secrets.serial_enabled}
+                          -D DEFAULT_STA_PASSWORD='"${secrets.sta_password}"'
-	-D DEFAULT_SERIAL_BAUD=${secrets.serial_baud}
+                          -D DEFAULT_PORTAL_LOGIN='"${secrets.portal_login}"'
-	-D DEFAULT_WEBSERIAL_ENABLED=${secrets.webserial_enabled}
+                          -D DEFAULT_PORTAL_PASSWORD='"${secrets.portal_password}"'
-	-D DEFAULT_LOG_LEVEL=${secrets.log_level}
+                          -D DEFAULT_MQTT_ENABLED=${secrets.mqtt_enabled}
-	-D DEFAULT_HOSTNAME='"${secrets.hostname}"'
+                          -D DEFAULT_MQTT_SERVER='"${secrets.mqtt_server}"'
-	-D DEFAULT_AP_SSID='"${secrets.ap_ssid}"'
+                          -D DEFAULT_MQTT_PORT=${secrets.mqtt_port}
-	-D DEFAULT_AP_PASSWORD='"${secrets.ap_password}"'
+                          -D DEFAULT_MQTT_USER='"${secrets.mqtt_user}"'
-	-D DEFAULT_STA_SSID='"${secrets.sta_ssid}"'
+                          -D DEFAULT_MQTT_PASSWORD='"${secrets.mqtt_password}"'
-	-D DEFAULT_STA_PASSWORD='"${secrets.sta_password}"'
+                          -D DEFAULT_MQTT_PREFIX='"${secrets.mqtt_prefix}"'
-	-D DEFAULT_PORTAL_LOGIN='"${secrets.portal_login}"'
+upload_speed            = 921600
-	-D DEFAULT_PORTAL_PASSWORD='"${secrets.portal_password}"'
+monitor_speed           = 115200
-	-D DEFAULT_MQTT_ENABLED=${secrets.mqtt_enabled}
+;monitor_filters        = direct
-	-D DEFAULT_MQTT_SERVER='"${secrets.mqtt_server}"'
+monitor_filters         = esp32_exception_decoder
-	-D DEFAULT_MQTT_PORT=${secrets.mqtt_port}
+                          esp8266_exception_decoder
-	-D DEFAULT_MQTT_USER='"${secrets.mqtt_user}"'
+board_build.flash_mode  = dio
-	-D DEFAULT_MQTT_PASSWORD='"${secrets.mqtt_password}"'
+board_build.filesystem  = littlefs
-	-D DEFAULT_MQTT_PREFIX='"${secrets.mqtt_prefix}"'
+check_tool              = ;pvs-studio
-upload_speed = 921600
+check_flags             = ;pvs-studio: --analysis-mode=4 --exclude-path=./.pio/libdeps
-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
 
 ; Defaults
 [esp8266_defaults]
-platform = espressif8266@^4.2.1
+platform                = espressif8266@^4.2.1
-platform_packages = ${env.platform_packages}
+platform_packages       = ${env.platform_packages}
-lib_deps = 
+lib_deps                = ${env.lib_deps}
-	${env.lib_deps}
+                          nrwiersma/ESP8266Scheduler@^1.2
-	nrwiersma/ESP8266Scheduler@^1.2
+lib_ignore              = 
-lib_ignore = 
+extra_scripts           = post:tools/build.py
-extra_scripts = 
+build_type              = ${env.build_type}
-	post:tools/build.py
+build_flags             = ${env.build_flags}
-build_type = ${env.build_type}
+                          -D PIO_FRAMEWORK_ARDUINO_LWIP2_LOW_MEMORY
-build_flags = 
+                          ;-D PIO_FRAMEWORK_ARDUINO_LWIP2_HIGHER_BANDWIDTH_LOW_FLASH
-	${env.build_flags}
+                          -D PIO_FRAMEWORK_ARDUINO_ESPRESSIF_SDK305
-	-D PIO_FRAMEWORK_ARDUINO_LWIP2_LOW_MEMORY
+board_build.ldscript    = eagle.flash.4m1m.ld
-	;-D PIO_FRAMEWORK_ARDUINO_LWIP2_HIGHER_BANDWIDTH_LOW_FLASH
+check_tool              = ${env.check_tool}
-	-D PIO_FRAMEWORK_ARDUINO_ESPRESSIF_SDK305
+check_flags             = ${env.check_flags}
-board_build.ldscript = eagle.flash.4m1m.ld
-check_tool = ${env.check_tool}
-check_flags = ${env.check_flags}
 
 [esp32_defaults]
-;platform = espressif32@^6.7
+platform                = https://github.com/pioarduino/platform-espressif32/releases/download/55.03.32/platform-espressif32.zip
-;platform = https://github.com/platformio/platform-espressif32.git
+platform_packages       = ${env.platform_packages}
-;platform_packages = 
+board_build.partitions  = esp32_partitions.csv
-;  framework-arduinoespressif32 @ https://github.com/espressif/arduino-esp32.git#3.0.5
+lib_deps                = ${env.lib_deps}
-;  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
+                          laxilef/ESP32Scheduler@^1.0.1
-platform = https://github.com/pioarduino/platform-espressif32/releases/download/55.03.33/platform-espressif32.zip
+nimble_lib              = h2zero/NimBLE-Arduino@2.3.6
-platform_packages = ${env.platform_packages}
+lib_ignore              = ble
-board_build.partitions = esp32_partitions.csv
+                          BluetoothSerial
-lib_deps =
+                          SimpleBLE
-	${env.lib_deps}
+                          ESP RainMaker
-	laxilef/ESP32Scheduler@^1.0.1
+                          RainMaker
-nimble_lib = https://github.com/h2zero/NimBLE-Arduino
+                          ESP Insights
-lib_ignore = 
+                          Insights
-extra_scripts = 
+                          Zigbee
-	post:tools/esp32.py
+                          Matter
-	post:tools/build.py
+                          OpenThread
-build_type = ${env.build_type}
+                          dsp
-build_flags = 
+custom_component_remove = espressif/esp_hosted
-	${env.build_flags}
+                          espressif/esp_wifi_remote
-	-D CORE_DEBUG_LEVEL=0
+                          espressif/esp-dsp
-	-Wl,--wrap=esp_panic_handler
+                          espressif/esp_modem
-check_tool = ${env.check_tool}
+                          espressif/esp_rainmaker
-check_flags = ${env.check_flags}
+                          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}
+extends                 = esp8266_defaults
-platform_packages = ${esp8266_defaults.platform_packages}
+board                   = d1_mini
-board = d1_mini
+build_flags             = ${esp8266_defaults.build_flags}
-lib_deps = ${esp8266_defaults.lib_deps}
+                          -D DEFAULT_OT_IN_GPIO=4
-lib_ignore = ${esp8266_defaults.lib_ignore}
+                          -D DEFAULT_OT_OUT_GPIO=5
-extra_scripts = ${esp8266_defaults.extra_scripts}
+                          -D DEFAULT_SENSOR_OUTDOOR_GPIO=12
-board_build.ldscript = ${esp8266_defaults.board_build.ldscript}
+                          -D DEFAULT_SENSOR_INDOOR_GPIO=14
-build_type = ${esp8266_defaults.build_type}
+                          -D DEFAULT_STATUS_LED_GPIO=13
-build_flags = 
+                          -D DEFAULT_OT_RX_LED_GPIO=15
-	${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}
+extends                 = esp8266_defaults
-platform_packages = ${esp8266_defaults.platform_packages}
+board                   = d1_mini_lite
-board = d1_mini_lite
+build_flags             = ${esp8266_defaults.build_flags}
-lib_deps = ${esp8266_defaults.lib_deps}
+                          -D DEFAULT_OT_IN_GPIO=4
-lib_ignore = ${esp8266_defaults.lib_ignore}
+                          -D DEFAULT_OT_OUT_GPIO=5
-extra_scripts = ${esp8266_defaults.extra_scripts}
+                          -D DEFAULT_SENSOR_OUTDOOR_GPIO=12
-board_build.ldscript = ${esp8266_defaults.board_build.ldscript}
+                          -D DEFAULT_SENSOR_INDOOR_GPIO=14
-build_type = ${esp8266_defaults.build_type}
+                          -D DEFAULT_STATUS_LED_GPIO=13
-build_flags = 
+                          -D DEFAULT_OT_RX_LED_GPIO=15
-	${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}
+extends                 = esp8266_defaults
-platform_packages = ${esp8266_defaults.platform_packages}
+board                   = d1_mini_pro
-board = d1_mini_pro
+build_flags             = ${esp8266_defaults.build_flags}
-lib_deps = ${esp8266_defaults.lib_deps}
+                          -D DEFAULT_OT_IN_GPIO=4
-lib_ignore = ${esp8266_defaults.lib_ignore}
+                          -D DEFAULT_OT_OUT_GPIO=5
-extra_scripts = ${esp8266_defaults.extra_scripts}
+                          -D DEFAULT_SENSOR_OUTDOOR_GPIO=12
-board_build.ldscript = ${esp8266_defaults.board_build.ldscript}
+                          -D DEFAULT_SENSOR_INDOOR_GPIO=14
-build_type = ${esp8266_defaults.build_type}
+                          -D DEFAULT_STATUS_LED_GPIO=13
-build_flags = 
+                          -D DEFAULT_OT_RX_LED_GPIO=15
-	${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}
+extends                 = esp8266_defaults
-platform_packages = ${esp8266_defaults.platform_packages}
+board                   = nodemcuv2
-board = nodemcuv2
+build_flags             = ${esp8266_defaults.build_flags}
-lib_deps = ${esp8266_defaults.lib_deps}
+                          -D DEFAULT_OT_IN_GPIO=13
-lib_ignore = ${esp8266_defaults.lib_ignore}
+                          -D DEFAULT_OT_OUT_GPIO=15
-extra_scripts = ${esp8266_defaults.extra_scripts}
+                          -D DEFAULT_SENSOR_OUTDOOR_GPIO=12
-board_build.ldscript = ${esp8266_defaults.board_build.ldscript}
+                          -D DEFAULT_SENSOR_INDOOR_GPIO=4
-build_type = ${esp8266_defaults.build_type}
+                          -D DEFAULT_STATUS_LED_GPIO=2
-build_flags = 
+                          -D DEFAULT_OT_RX_LED_GPIO=16
-	${esp8266_defaults.build_flags}
-	-D DEFAULT_OT_IN_GPIO=13
-	-D DEFAULT_OT_OUT_GPIO=15
-	-D DEFAULT_SENSOR_OUTDOOR_GPIO=12
-	-D DEFAULT_SENSOR_INDOOR_GPIO=4
-	-D DEFAULT_STATUS_LED_GPIO=2
-	-D DEFAULT_OT_RX_LED_GPIO=16
-check_tool = ${esp8266_defaults.check_tool}
-check_flags = ${esp8266_defaults.check_flags}
 
 [env:s2_mini]
-platform = ${esp32_defaults.platform}
+extends                 = esp32_defaults
-platform_packages = ${esp32_defaults.platform_packages}
+board                   = lolin_s2_mini
-board = lolin_s2_mini
+build_unflags           = -DARDUINO_USB_MODE=1
-board_build.partitions = ${esp32_defaults.board_build.partitions}
+build_flags             = ${esp32_defaults.build_flags}
-lib_deps = ${esp32_defaults.lib_deps}
+                          -D ARDUINO_USB_MODE=0
-lib_ignore = ${esp32_defaults.lib_ignore}
+                          -D ARDUINO_USB_CDC_ON_BOOT=1
-extra_scripts = ${esp32_defaults.extra_scripts}
+                          -D DEFAULT_OT_IN_GPIO=33
-build_unflags =
+                          -D DEFAULT_OT_OUT_GPIO=35
-	-DARDUINO_USB_MODE=1
+                          -D DEFAULT_SENSOR_OUTDOOR_GPIO=9
-build_type = ${esp32_defaults.build_type}
+                          -D DEFAULT_SENSOR_INDOOR_GPIO=7
-build_flags = 
+                          -D DEFAULT_STATUS_LED_GPIO=11
-	${esp32_defaults.build_flags}
+                          -D DEFAULT_OT_RX_LED_GPIO=12
-	-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}
 
-[env:s3_mini] 
+[env:s3_mini]
-platform = ${esp32_defaults.platform}
+extends                 = esp32_defaults
-platform_packages = ${esp32_defaults.platform_packages}
+board                   = lolin_s3_mini
-board = lolin_s3_mini
+lib_deps                = ${esp32_defaults.lib_deps}
-board_build.partitions = ${esp32_defaults.board_build.partitions}
+                          ${esp32_defaults.nimble_lib}
-lib_deps = 
+build_unflags           = -DARDUINO_USB_MODE=1
-	${esp32_defaults.lib_deps}
+build_flags             = ${esp32_defaults.build_flags}
-	${esp32_defaults.nimble_lib}
+                          -D ARDUINO_USB_MODE=0
-lib_ignore = ${esp32_defaults.lib_ignore}
+                          -D ARDUINO_USB_CDC_ON_BOOT=1
-extra_scripts = ${esp32_defaults.extra_scripts}
+                          -D USE_BLE=1
-build_unflags =
+                          -D DEFAULT_OT_IN_GPIO=35
-	-DARDUINO_USB_MODE=1
+                          -D DEFAULT_OT_OUT_GPIO=36
-build_type = ${esp32_defaults.build_type}
+                          -D DEFAULT_SENSOR_OUTDOOR_GPIO=13
-build_flags = 
+                          -D DEFAULT_SENSOR_INDOOR_GPIO=12
-	${esp32_defaults.build_flags}
+                          -D DEFAULT_STATUS_LED_GPIO=11
-	-D ARDUINO_USB_MODE=0
+                          -D DEFAULT_OT_RX_LED_GPIO=10
-	-D ARDUINO_USB_CDC_ON_BOOT=1
-	;-D CONFIG_BT_NIMBLE_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:c3_mini] 
+[env:c3_mini]
-platform = ${esp32_defaults.platform}
+extends                 = esp32_defaults
-platform_packages = ${esp32_defaults.platform_packages}
+board                   = lolin_c3_mini
-board = lolin_c3_mini
+lib_deps                = ${esp32_defaults.lib_deps}
-board_build.partitions = ${esp32_defaults.board_build.partitions}
+                          ${esp32_defaults.nimble_lib}
-lib_deps = 
+build_unflags           = -mtext-section-literals
-	${esp32_defaults.lib_deps}
+build_flags             = ${esp32_defaults.build_flags}
-	${esp32_defaults.nimble_lib}
+                          -D USE_BLE=1
-lib_ignore = ${esp32_defaults.lib_ignore}
+                          -D DEFAULT_OT_IN_GPIO=8
-extra_scripts = ${esp32_defaults.extra_scripts}
+                          -D DEFAULT_OT_OUT_GPIO=10
-build_unflags = 
+                          -D DEFAULT_SENSOR_OUTDOOR_GPIO=0
-	-mtext-section-literals
+                          -D DEFAULT_SENSOR_INDOOR_GPIO=1
-build_type = ${esp32_defaults.build_type}
+                          -D DEFAULT_STATUS_LED_GPIO=4
-build_flags = 
+                          -D DEFAULT_OT_RX_LED_GPIO=5
-	${esp32_defaults.build_flags}
-	-D CONFIG_BT_NIMBLE_EXT_ADV=1
-	-D USE_BLE=1
-	-D DEFAULT_OT_IN_GPIO=8
-	-D DEFAULT_OT_OUT_GPIO=10
-	-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:nodemcu_32]
-platform = ${esp32_defaults.platform}
+extends                 = esp32_defaults
-platform_packages = ${esp32_defaults.platform_packages}
+board                   = nodemcu-32s
-board = nodemcu-32s
+lib_deps                = ${esp32_defaults.lib_deps}
-board_build.partitions = ${esp32_defaults.board_build.partitions}
+                          ${esp32_defaults.nimble_lib}
-lib_deps = 
+build_flags             = ${esp32_defaults.build_flags}
-	${esp32_defaults.lib_deps}
+                          -D USE_BLE=1
-	${esp32_defaults.nimble_lib}
+                          -D DEFAULT_OT_IN_GPIO=16
-lib_ignore = ${esp32_defaults.lib_ignore}
+                          -D DEFAULT_OT_OUT_GPIO=4
-extra_scripts = ${esp32_defaults.extra_scripts}
+                          -D DEFAULT_SENSOR_OUTDOOR_GPIO=15
-build_type = ${esp32_defaults.build_type}
+                          -D DEFAULT_SENSOR_INDOOR_GPIO=26
-build_flags = 
+                          -D DEFAULT_STATUS_LED_GPIO=2
-	${esp32_defaults.build_flags}
+                          -D DEFAULT_OT_RX_LED_GPIO=19
-	-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}
 
-[env:nodemcu_32_160mhz] 
+[env:nodemcu_32_160mhz]
-extends = env:nodemcu_32 
+extends                 = env:nodemcu_32 
-board_build.f_cpu = 160000000L ; set frequency to 160MHz
+board_build.f_cpu       = 160000000L ; set frequency to 160MHz
 
 [env:d1_mini32]
-platform = ${esp32_defaults.platform}
+extends                 = esp32_defaults
-platform_packages = ${esp32_defaults.platform_packages}
+board                   = wemos_d1_mini32
-board = wemos_d1_mini32
+lib_deps                = ${esp32_defaults.lib_deps}
-board_build.partitions = ${esp32_defaults.board_build.partitions}
+                          ${esp32_defaults.nimble_lib}
-lib_deps = 
+build_flags             = ${esp32_defaults.build_flags}
-	${esp32_defaults.lib_deps}
+                          -D USE_BLE=1
-	${esp32_defaults.nimble_lib}
+                          -D DEFAULT_OT_IN_GPIO=21
-lib_ignore = ${esp32_defaults.lib_ignore}
+                          -D DEFAULT_OT_OUT_GPIO=22
-extra_scripts = ${esp32_defaults.extra_scripts}
+                          -D DEFAULT_SENSOR_OUTDOOR_GPIO=12
-build_type = ${esp32_defaults.build_type}
+                          -D DEFAULT_SENSOR_INDOOR_GPIO=18
-build_flags = 
+                          -D DEFAULT_STATUS_LED_GPIO=2
-	${esp32_defaults.build_flags}
+                          -D DEFAULT_OT_RX_LED_GPIO=19
-	-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}
 
 [env:esp32_c6]
-platform = ${esp32_defaults.platform}
+extends                 = esp32_defaults
-framework = arduino, espidf
+board                   = esp32-c6-devkitc-1
-platform_packages = ${esp32_defaults.platform_packages}
+lib_deps                = ${esp32_defaults.lib_deps}
-board = esp32-c6-devkitm-1
+                          ${esp32_defaults.nimble_lib}
-board_build.partitions = ${esp32_defaults.board_build.partitions}
+build_unflags           = -mtext-section-literals
-board_build.embed_txtfiles = 
+build_flags             = ${esp32_defaults.build_flags}
-	managed_components/espressif__esp_insights/server_certs/https_server.crt
+                          -D USE_BLE=1
-	managed_components/espressif__esp_rainmaker/server_certs/rmaker_mqtt_server.crt
+                          -D DEFAULT_OT_IN_GPIO=15
-	managed_components/espressif__esp_rainmaker/server_certs/rmaker_claim_service_server.crt
+                          -D DEFAULT_OT_OUT_GPIO=23
-	managed_components/espressif__esp_rainmaker/server_certs/rmaker_ota_server.crt
+                          -D DEFAULT_SENSOR_OUTDOOR_GPIO=0
-lib_deps = ${esp32_defaults.lib_deps}
+                          -D DEFAULT_SENSOR_INDOOR_GPIO=0
-lib_ignore = 
+                          -D DEFAULT_STATUS_LED_GPIO=11
-	${esp32_defaults.lib_ignore}
+                          -D DEFAULT_OT_RX_LED_GPIO=10
-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}
 
-[env:otthing] 
+[env:otthing]
-platform = ${esp32_defaults.platform}
+extends                 = esp32_defaults
-platform_packages = ${esp32_defaults.platform_packages}
+board                   = lolin_c3_mini
-board = lolin_c3_mini
+lib_deps                = ${esp32_defaults.lib_deps}
-board_build.partitions = ${esp32_defaults.board_build.partitions}
+                          ${esp32_defaults.nimble_lib}
-lib_deps = 
+build_unflags           = -mtext-section-literals
-	${esp32_defaults.lib_deps}
+build_flags             = ${esp32_defaults.build_flags}
-	${esp32_defaults.nimble_lib}
+                          -D USE_BLE=1
-lib_ignore = ${esp32_defaults.lib_ignore}
+                          -D DEFAULT_OT_IN_GPIO=3
-extra_scripts = ${esp32_defaults.extra_scripts}
+                          -D DEFAULT_OT_OUT_GPIO=1
-build_unflags = 
+                          ;-D DEFAULT_SENSOR_OUTDOOR_GPIO=0
-	-mtext-section-literals
+                          ;-D DEFAULT_SENSOR_INDOOR_GPIO=1
-build_type = ${esp32_defaults.build_type}
+                          -D DEFAULT_STATUS_LED_GPIO=8
-build_flags = 
+                          -D DEFAULT_OT_RX_LED_GPIO=2
-	${esp32_defaults.build_flags}
+                          -D OT_BYPASS_RELAY_GPIO=20
-	-D CONFIG_BT_NIMBLE_EXT_ADV=1
-	-D USE_BLE=1
-	-D DEFAULT_OT_IN_GPIO=3
-	-D DEFAULT_OT_OUT_GPIO=1
-;	-D DEFAULT_SENSOR_OUTDOOR_GPIO=0
-;	-D DEFAULT_SENSOR_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}

secrets.default.ini

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

src/MainTask.h

@@ -6,6 +6,7 @@ extern NetworkMgr* network;
 extern MqttTask* tMqtt;
 extern OpenThermTask* tOt;
 extern FileData fsNetworkSettings, fsSettings, fsSensorsSettings;
+extern ESPTelnetStream* telnetStream;
 
 
 class MainTask : public Task {
@@ -39,6 +40,7 @@ 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;
@@ -104,9 +106,9 @@ protected:
     vars.network.connected = network->isConnected();
     vars.network.rssi = network->isConnected() ? WiFi.RSSI() : 0;
 
-    if (settings.system.logLevel >= TinyLoggerLevel::SILENT && settings.system.logLevel <= TinyLoggerLevel::VERBOSE) {
+    if (settings.system.logLevel >= TinyLogger::Level::SILENT && settings.system.logLevel <= TinyLogger::Level::VERBOSE) {
       if (Log.getLevel() != settings.system.logLevel) {
-        Log.setLevel(static_cast<TinyLoggerLevel>(settings.system.logLevel));
+        Log.setLevel(static_cast<TinyLogger::Level>(settings.system.logLevel));
       }
     }
 
@@ -121,6 +123,11 @@ protected:
         }
       }
 
+      if (!this->telnetStarted && telnetStream != nullptr) {
+        telnetStream->begin(23, false);
+        this->telnetStarted = true;
+      }
+
       if (settings.mqtt.enabled && !tMqtt->isEnabled()) {
         tMqtt->enable();
 
@@ -135,6 +142,11 @@ protected:
         this->ntpStarted = false;
       }
 
+      if (this->telnetStarted) {
+        telnetStream->stop();
+        this->telnetStarted = false;
+      }
+
       if (tMqtt->isEnabled()) {
         tMqtt->disable();
       }
@@ -148,10 +160,23 @@ protected:
     }
     this->ledStatus();
 
+    // telnet
+    if (this->telnetStarted) {
+      this->yield();
+      telnetStream->loop();
+      this->yield();
+    }
+
 
     // anti memory leak
-    while (Serial.available() > 0) {
+    for (Stream* stream : Log.getStreams()) {
-      Serial.read();
+      while (stream->available() > 0) {
+        stream->read();
+
+        #ifdef ARDUINO_ARCH_ESP8266
+        ::optimistic_yield(1000);
+        #endif
+      }
     }
 
     // heap info
@@ -190,7 +215,7 @@ protected:
       vars.states.restarting = true;
     }
 
-    if (settings.system.logLevel < TinyLoggerLevel::VERBOSE) {
+    if (settings.system.logLevel < TinyLogger::Level::VERBOSE) {
       return;
     }
 
@@ -584,12 +609,7 @@ protected:
       if (GPIO_IS_VALID(settings.externalPump.gpio)) {
         configuredGpio = settings.externalPump.gpio;
         pinMode(configuredGpio, OUTPUT);
-        digitalWrite(
+        digitalWrite(configuredGpio, LOW);
-          configuredGpio,
-          settings.externalPump.invertState
-            ? HIGH 
-            : LOW
-        );
 
       } else if (configuredGpio != GPIO_IS_NOT_CONFIGURED) {
         configuredGpio = GPIO_IS_NOT_CONFIGURED;
@@ -617,12 +637,7 @@ protected:
     
     if (!settings.externalPump.use) {
       if (vars.externalPump.state) {
-        digitalWrite(
+        digitalWrite(configuredGpio, LOW);
-          configuredGpio,
-          settings.externalPump.invertState
-            ? HIGH 
-            : LOW
-        );
 
         vars.externalPump.state = false;
         vars.externalPump.lastEnabledTime = millis();
@@ -635,12 +650,7 @@ protected:
 
     if (vars.externalPump.state && !this->heatingEnabled) {
       if (this->extPumpStartReason == MainTask::PumpStartReason::HEATING && millis() - this->heatingDisabledTime > (settings.externalPump.postCirculationTime * 1000u)) {
-        digitalWrite(
+        digitalWrite(configuredGpio, LOW);
-          configuredGpio,
-          settings.externalPump.invertState
-            ? HIGH 
-            : LOW
-        );
 
         vars.externalPump.state = false;
         vars.externalPump.lastEnabledTime = millis();
@@ -648,12 +658,7 @@ protected:
         Log.sinfoln(FPSTR(L_EXTPUMP), F("Disabled: expired post circulation time"));
 
       } else if (this->extPumpStartReason == MainTask::PumpStartReason::ANTISTUCK && millis() - this->externalPumpStartTime >= (settings.externalPump.antiStuckTime * 1000u)) {
-        digitalWrite(
+        digitalWrite(configuredGpio, LOW);
-          configuredGpio,
-          settings.externalPump.invertState
-            ? HIGH 
-            : LOW
-        );
 
         vars.externalPump.state = false;
         vars.externalPump.lastEnabledTime = millis();
@@ -669,12 +674,7 @@ protected:
       this->externalPumpStartTime = millis();
       this->extPumpStartReason = MainTask::PumpStartReason::HEATING;
 
-      digitalWrite(
+      digitalWrite(configuredGpio, HIGH);
-        configuredGpio,
-        settings.externalPump.invertState
-          ? LOW 
-          : HIGH
-      );
 
       Log.sinfoln(FPSTR(L_EXTPUMP), F("Enabled: heating on"));
 
@@ -683,12 +683,7 @@ protected:
       this->externalPumpStartTime = millis();
       this->extPumpStartReason = MainTask::PumpStartReason::ANTISTUCK;
 
-      digitalWrite(
+      digitalWrite(configuredGpio, HIGH);
-        configuredGpio,
-        settings.externalPump.invertState
-          ? LOW 
-          : HIGH
-      );
 
       Log.sinfoln(FPSTR(L_EXTPUMP), F("Enabled: anti stuck"));
     }

src/MqttTask.h

@@ -416,7 +416,7 @@ protected:
       return;
     }
 
-    if (settings.system.logLevel >= TinyLoggerLevel::TRACE) {
+    if (settings.system.logLevel >= TinyLogger::Level::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/Sensors.h

@@ -149,7 +149,7 @@ public:
 
   static int16_t getIdByName(const char* name) {
     if (settings == nullptr) {
-      return 0;
+      return -1;
     }
 
     for (uint8_t id = 0; id <= getMaxSensorId(); id++) {
@@ -163,7 +163,7 @@ public:
 
   static int16_t getIdByObjectId(const char* objectId) {
     if (settings == nullptr) {
-      return 0;
+      return -1;
     }
 
     String refObjectId;

src/SensorsTask.h

@@ -9,41 +9,136 @@
 extern FileData fsSensorsSettings;
 
 #if USE_BLE
-class BluetoothClientCallbacks : public NimBLEClientCallbacks {
+class BluetoothScanCallbacks : public NimBLEScanCallbacks {
 public:
-  BluetoothClientCallbacks(uint8_t sensorId) : sensorId(sensorId) {}
+  void onDiscovered(const NimBLEAdvertisedDevice* device) override {
+    auto& deviceAddress = device->getAddress();
 
-  void onConnect(NimBLEClient* pClient) {
+    bool found = false;
-    auto& sSensor = Sensors::settings[this->sensorId];
+    uint8_t sensorId;
+    for (sensorId = 0; sensorId <= Sensors::getMaxSensorId(); sensorId++) {
+      auto& sSensor = Sensors::settings[sensorId];
+      if (!sSensor.enabled || sSensor.type != Sensors::Type::BLUETOOTH || sSensor.purpose == Sensors::Purpose::NOT_CONFIGURED) {
+        continue;
+      }
 
-    Log.sinfoln(
+      const auto sensorAddress = NimBLEAddress(sSensor.address, deviceAddress.getType());
-      FPSTR(L_SENSORS_BLE), F("Sensor #%hhu '%s': connected to %s"),
+      if (sensorAddress.isNull() || sensorAddress != deviceAddress) {
-      sensorId, sSensor.name, pClient->getPeerAddress().toString().c_str()
+        continue;
-    );
+      }
-  }
 
-  void onDisconnect(NimBLEClient* pClient, int reason) {
+      found = true;
-    auto& sSensor = Sensors::settings[this->sensorId];
+      break;
+    }
 
-    Log.sinfoln(
+    if (!found) {
-      FPSTR(L_SENSORS_BLE), F("Sensor #%hhu '%s': disconnected, reason %i"),
+      return;
-      sensorId, sSensor.name, reason
+    }
-    );
-  }
 
-  void onConnectFail(NimBLEClient* pClient, int reason) {
+    auto& sSensor = Sensors::settings[sensorId];
-    auto& sSensor = Sensors::settings[this->sensorId];
+    auto& rSensor = Sensors::results[sensorId];
+    auto deviceName = device->getName();
+    auto deviceRssi = device->getRSSI();
 
-    Log.sinfoln(
+    Log.straceln(
-      FPSTR(L_SENSORS_BLE), F("Sensor #%hhu '%s': failed to connect, reason %i"),
+      FPSTR(L_SENSORS_BLE), F("Sensor #%hhu '%s': discovered device %s, name: %s, RSSI: %hhd"),
-      sensorId, sSensor.name, reason
+      sensorId, sSensor.name,
+      deviceAddress.toString().c_str(), deviceName.c_str(), deviceRssi
     );
 
-    pClient->cancelConnect();
+    if (!device->haveServiceData()) {
-  }
+      Log.straceln(
+        FPSTR(L_SENSORS_BLE), F("Sensor #%hhu '%s': not found service data"),
+        sensorId, sSensor.name
+      );
+      return;
+    }
 
-protected:
+    auto serviceDataCount = device->getServiceDataCount();
-  uint8_t sensorId;
+    Log.straceln(
+      FPSTR(L_SENSORS_BLE), F("Sensor #%hhu '%s': found %hhu service data"),
+      sensorId, sSensor.name, serviceDataCount
+    );
+
+    NimBLEUUID serviceUuid((uint16_t) 0x181A);
+    auto serviceData = device->getServiceData(serviceUuid);
+    if (!serviceData.size()) {
+      Log.straceln(
+        FPSTR(L_SENSORS_BLE), F("Sensor #%hhu '%s': NOT found %s env service data"),
+        sensorId, sSensor.name, serviceUuid.toString().c_str()
+      );
+      return;
+    }
+  
+    Log.straceln(
+      FPSTR(L_SENSORS_BLE), F("Sensor #%hhu '%s': found %s env service data"),
+      sensorId, sSensor.name, serviceUuid.toString().c_str()
+    );
+
+    float temperature, humidity;
+    uint16_t batteryMv;
+    uint8_t batteryLevel;
+
+    if (serviceData.size() == 13) {
+      // atc1441 format
+
+      // Temperature (2 bytes, big-endian)
+      temperature = (
+        (static_cast<uint8_t>(serviceData[6]) << 8) | static_cast<uint8_t>(serviceData[7])
+      ) * 0.1f;
+
+      // Humidity (1 byte)
+      humidity = static_cast<uint8_t>(serviceData[8]);
+
+      // Battery mV (2 bytes, big-endian)
+      batteryMv = (static_cast<uint8_t>(serviceData[10]) << 8) | static_cast<uint8_t>(serviceData[11]);
+
+      // Battery level (1 byte)
+      batteryLevel = static_cast<uint8_t>(serviceData[9]);
+
+    } else if (serviceData.size() == 15) {
+      // custom pvvx format
+
+      // Temperature (2 bytes, little-endian)
+      temperature = (
+        (static_cast<uint8_t>(serviceData[7]) << 8) | static_cast<uint8_t>(serviceData[6])
+      ) * 0.01f;
+
+      // Humidity (2 bytes, little-endian)
+      humidity = (
+        (static_cast<uint8_t>(serviceData[9]) << 8) | static_cast<uint8_t>(serviceData[8])
+      ) * 0.01f;
+
+      // Battery mV (2 bytes, little-endian)
+      batteryMv = (static_cast<uint8_t>(serviceData[11]) << 8) | static_cast<uint8_t>(serviceData[10]);
+
+      // Battery level (1 byte)
+      batteryLevel = static_cast<uint8_t>(serviceData[12]);
+
+    } else {
+      // unknown format
+      Log.straceln(
+        FPSTR(L_SENSORS_BLE), F("Sensor #%hhu '%s': unknown data format (size: %i)"),
+        sensorId, sSensor.name, serviceData.size()
+      );
+      return;
+    }
+
+    Log.straceln(
+      FPSTR(L_SENSORS_BLE),
+      F("Sensor #%hhu '%s', received temp: %.2f; humidity: %.2f, battery voltage: %hu, battery level: %hhu"),
+      sensorId, sSensor.name,
+      temperature, humidity, batteryMv, batteryLevel
+    );
+
+    // update data
+    Sensors::setValueById(sensorId, temperature, Sensors::ValueType::TEMPERATURE, true, true);
+    Sensors::setValueById(sensorId, humidity, Sensors::ValueType::HUMIDITY, true, true);
+    Sensors::setValueById(sensorId, batteryLevel, Sensors::ValueType::BATTERY, true, true);
+
+    // update rssi
+    Sensors::setValueById(sensorId, deviceRssi, Sensors::ValueType::RSSI, false, false);
+  }
 };
 #endif
 
@@ -55,6 +150,10 @@ public:
     this->dallasSearchTime.reserve(2);
     this->dallasPolling.reserve(2);
     this->dallasLastPollingTime.reserve(2);
+
+    #if USE_BLE
+    this->bluetoothScanCallbacks = new BluetoothScanCallbacks();
+    #endif
   }
 
   ~SensorsTask() {
@@ -63,16 +162,17 @@ public:
     this->dallasSearchTime.clear();
     this->dallasPolling.clear();
     this->dallasLastPollingTime.clear();
+
+    #if USE_BLE
+    delete this->bluetoothScanCallbacks;
+    #endif
   }
 
 protected:
-  const unsigned int disconnectedTimeout = 120000;
+  const unsigned int disconnectedTimeout = 180000u;
-  const unsigned short dallasSearchInterval = 60000;
+  const unsigned short dallasSearchInterval = 60000u;
-  const unsigned short dallasPollingInterval = 10000;
+  const unsigned short dallasPollingInterval = 10000u;
-  const unsigned short globalPollingInterval = 15000;
+  const unsigned short globalPollingInterval = 15000u;
-  #if USE_BLE
-  const unsigned int bleSetDtInterval = 7200000;
-  #endif
 
   std::unordered_map<uint8_t, OneWire> owInstances;
   std::unordered_map<uint8_t, DallasTemperature> dallasInstances;
@@ -80,9 +180,8 @@ protected:
   std::unordered_map<uint8_t, bool> dallasPolling;
   std::unordered_map<uint8_t, unsigned long> dallasLastPollingTime;
   #if USE_BLE
-  std::unordered_map<uint8_t, NimBLEClient*> bleClients;
+  NimBLEScan* pBLEScan = nullptr;
-  std::unordered_map<uint8_t, bool> bleSubscribed;
+  BluetoothScanCallbacks* bluetoothScanCallbacks = nullptr;
-  std::unordered_map<uint8_t, unsigned long> bleLastSetDtTime;
   #endif
   unsigned long globalLastPollingTime = 0;
 
@@ -131,8 +230,7 @@ protected:
       this->yield();
 
       #if USE_BLE
-      cleanBleInstances();
+      scanBleSensors();
-      pollingBleSensors();
       this->yield();
       #endif
 
@@ -444,549 +542,62 @@ protected:
   }
 
   #if USE_BLE
-  void cleanBleInstances() {
+  void scanBleSensors() {
-    if (!NimBLEDevice::isInitialized()) {
-      return;
-    }
-
-    for (auto& [sensorId, pClient]: this->bleClients) {
-      if (pClient == nullptr) {
-        continue;
-      }
-
-      auto& sSensor = Sensors::settings[sensorId];
-      const auto sAddress = NimBLEAddress(sSensor.address, 0);
-
-      if (sAddress.isNull() || !sSensor.enabled || sSensor.type != Sensors::Type::BLUETOOTH || sSensor.purpose == Sensors::Purpose::NOT_CONFIGURED) {
-        Log.sinfoln(
-          FPSTR(L_SENSORS_BLE), F("Sensor #%hhu '%s', deleted unused client"),
-          sensorId, sSensor.name
-        );
-
-        NimBLEDevice::deleteClient(pClient);
-        pClient = nullptr;
-      }
-    }
-  }
-
-  void pollingBleSensors() {
     if (!Sensors::getAmountByType(Sensors::Type::BLUETOOTH, true)) {
+      if (NimBLEDevice::isInitialized()) {
+        if (this->pBLEScan != nullptr) {
+          if (this->pBLEScan->isScanning()) {
+            this->pBLEScan->stop();
+
+          } else {
+            this->pBLEScan = nullptr;
+          }
+        }
+
+        if (this->pBLEScan == nullptr) {
+          if (NimBLEDevice::deinit(true)) {
+            Log.sinfoln(FPSTR(L_SENSORS_BLE), F("Deinitialized"));
+
+          } else {
+            Log.swarningln(FPSTR(L_SENSORS_BLE), F("Unable to deinitialize!"));
+          }
+        }
+      }
+
       return;
     }
 
     if (!NimBLEDevice::isInitialized() && millis() > 5000) {
       Log.sinfoln(FPSTR(L_SENSORS_BLE), F("Initialized"));
       BLEDevice::init("");
-      NimBLEDevice::setPower(9);
-    }
-
-    for (uint8_t sensorId = 0; sensorId <= Sensors::getMaxSensorId(); sensorId++) {
-      auto& sSensor = Sensors::settings[sensorId];
-      auto& rSensor = Sensors::results[sensorId];
       
-      if (!sSensor.enabled || sSensor.type != Sensors::Type::BLUETOOTH || sSensor.purpose == Sensors::Purpose::NOT_CONFIGURED) {
+      #if defined(ESP_PWR_LVL_P20)
-        continue;
+      NimBLEDevice::setPower(ESP_PWR_LVL_P20);
-      }
+      #elif defined(ESP_PWR_LVL_P9)
-
+      NimBLEDevice::setPower(ESP_PWR_LVL_P9);
-      const auto address = NimBLEAddress(sSensor.address, 0);
+      #endif
-      if (address.isNull()) {
-        continue;
-      }
-
-      auto pClient = this->getBleClient(sensorId);
-      if (pClient == nullptr) {
-        continue;
-      }
-
-      if (pClient->getPeerAddress() != address) {
-        if (pClient->isConnected()) {
-          if (!pClient->disconnect()) {
-            continue;
-          }
-        }
-
-        pClient->setPeerAddress(address);
-      }
-
-      if (!pClient->isConnected()) {
-        this->bleSubscribed[sensorId] = false;
-        this->bleLastSetDtTime[sensorId] = 0;
-
-        if (pClient->connect(false, true, true)) {
-          Log.sinfoln(
-            FPSTR(L_SENSORS_BLE), F("Sensor #%hhu '%s': trying connecting to %s..."),
-            sensorId, sSensor.name, pClient->getPeerAddress().toString().c_str()
-          );
-        }
-
-        continue;
-      }
-      
-      if (!this->bleSubscribed[sensorId]) {
-        if (this->subscribeToBleDevice(sensorId, pClient)) {
-          this->bleSubscribed[sensorId] = true;
-
-        } else {
-          this->bleSubscribed[sensorId] = false;
-          pClient->disconnect();
-          continue;
-        }
-      }
-
-      // Mark connected
-      Sensors::setConnectionStatusById(sensorId, true, true);
-
-      if (!this->bleLastSetDtTime[sensorId] || millis() - this->bleLastSetDtTime[sensorId] > this->bleSetDtInterval) {
-        struct tm ti;
-        
-        if (getLocalTime(&ti)) {
-          if (this->setDateOnBleSensor(pClient, &ti)) {
-            Log.sinfoln(
-              FPSTR(L_SENSORS_BLE), F("Sensor #%hhu '%s', successfully set date: %02d.%02d.%04d %02d:%02d:%02d"),
-              sensorId, sSensor.name,
-              ti.tm_mday, ti.tm_mon + 1, ti.tm_year + 1900, ti.tm_hour, ti.tm_min, ti.tm_sec
-            );
-
-          } else {
-            Log.swarningln(
-              FPSTR(L_SENSORS_BLE), F("Sensor #%hhu '%s', failed set date: %02d.%02d.%04d %02d:%02d:%02d"),
-              sensorId, sSensor.name,
-              ti.tm_mday, ti.tm_mon + 1, ti.tm_year + 1900, ti.tm_hour, ti.tm_min, ti.tm_sec
-            );
-          }
-
-          this->bleLastSetDtTime[sensorId] = millis();
-        }
-      }
-    }
-  }
-
-  NimBLEClient* getBleClient(const uint8_t sensorId) {
-    if (!NimBLEDevice::isInitialized()) {
-      return nullptr;
     }
 
-    auto& sSensor = Sensors::settings[sensorId];
+    if (this->pBLEScan == nullptr) {
-    auto& rSensor = Sensors::results[sensorId];
+      this->pBLEScan = NimBLEDevice::getScan();
+      this->pBLEScan->setScanCallbacks(this->bluetoothScanCallbacks);
+      this->pBLEScan->setActiveScan(false);
+      this->pBLEScan->setDuplicateFilter(false);
+      this->pBLEScan->setMaxResults(0);
+      this->pBLEScan->setInterval(100);
+      this->pBLEScan->setWindow(100);
 
-    if (!sSensor.enabled || sSensor.type != Sensors::Type::BLUETOOTH || sSensor.purpose == Sensors::Purpose::NOT_CONFIGURED) {
+      Log.sinfoln(FPSTR(L_SENSORS_BLE), F("Scanning initialized"));
-      return nullptr;
     }
 
-    if (this->bleClients[sensorId] && this->bleClients[sensorId] != nullptr) {
+    if (!this->pBLEScan->isScanning()) {
-      return this->bleClients[sensorId];
+      if (this->pBLEScan->start(0, false, true)) {
-    }
+        Log.sinfoln(FPSTR(L_SENSORS_BLE), F("Scanning started"));
-
-    auto pClient = NimBLEDevice::createClient();
-    if (pClient == nullptr) {
-      return nullptr;
-    }
-
-    //pClient->setConnectionParams(BLE_GAP_CONN_ITVL_MS(10), BLE_GAP_CONN_ITVL_MS(100), 10, 150);
-    pClient->setConnectTimeout(30000);
-    pClient->setSelfDelete(false, false);
-    pClient->setClientCallbacks(new BluetoothClientCallbacks(sensorId), true);
-
-    this->bleClients[sensorId] = pClient;
-
-    return pClient;
-  }
-
-  bool subscribeToBleDevice(const uint8_t sensorId, NimBLEClient* pClient) {
-    auto& sSensor = Sensors::settings[sensorId];
-    auto pAddress = pClient->getPeerAddress().toString();
-    
-    NimBLERemoteService* pService = nullptr;
-    NimBLERemoteCharacteristic* pChar = nullptr;
-
-    // ENV Service (0x181A)
-    NimBLEUUID serviceUuid((uint16_t) 0x181AU);
-    pService = pClient->getService(serviceUuid);
-    if (!pService) {
-      Log.straceln(
-        FPSTR(L_SENSORS_BLE), F("Sensor #%hhu '%s': failed to find env service (%s) on device %s"),
-        sensorId, sSensor.name, serviceUuid.toString().c_str(), pAddress.c_str()
-      );
-
-    } else {
-      Log.straceln(
-        FPSTR(L_SENSORS_BLE), F("Sensor #%hhu '%s': found env service (%s) on device %s"),
-        sensorId, sSensor.name, serviceUuid.toString().c_str(), pAddress.c_str()
-      );
-
-      // 0x2A6E - Notify temperature x0.01C (pvvx)
-      bool tempNotifyCreated = false;
-      if (!tempNotifyCreated) {
-        NimBLEUUID charUuid((uint16_t) 0x2A6E);
-        pChar = pService->getCharacteristic(charUuid);
-
-        if (pChar && (pChar->canNotify() || pChar->canIndicate())) {
-          Log.straceln(
-            FPSTR(L_SENSORS_BLE), F("Sensor #%hhu '%s': found temp char (%s) in env service on device %s"),
-            sensorId, sSensor.name, charUuid.toString().c_str(), pAddress.c_str()
-          );
-
-          pChar->unsubscribe();
-          tempNotifyCreated = pChar->subscribe(
-            pChar->canNotify(),
-            [sensorId](NimBLERemoteCharacteristic* pChar, uint8_t* pData, size_t length, bool isNotify) {
-              if (pChar == nullptr) {
-                return;
-              }
-
-              const NimBLERemoteService* pService = pChar->getRemoteService();
-              if (pService == nullptr) {
-                return;
-              }
-
-              NimBLEClient* pClient = pService->getClient();
-              if (pClient == nullptr) {
-                return;
-              }
-
-              auto& sSensor = Sensors::settings[sensorId];
-
-              if (length != 2) {
-                Log.swarningln(
-                  FPSTR(L_SENSORS_BLE),
-                  F("Sensor #%hhu '%s': invalid notification data at temp char (%s) on device %s"),
-                  sensorId,
-                  sSensor.name,
-                  pChar->getUUID().toString().c_str(),
-                  pClient->getPeerAddress().toString().c_str()
-                );
-
-                return;
-              }
-
-              float rawTemp = (pChar->getValue<int16_t>() * 0.01f);
-              Log.straceln(
-                FPSTR(L_SENSORS_BLE),
-                F("Sensor #%hhu '%s': received temp: %.2f"),
-                sensorId, sSensor.name, rawTemp
-              );
-
-              // set temp
-              Sensors::setValueById(sensorId, rawTemp, Sensors::ValueType::TEMPERATURE, true, true);
-
-              // update rssi
-              Sensors::setValueById(sensorId, pClient->getRssi(), Sensors::ValueType::RSSI, false, false);
-            }
-          );
-
-          if (tempNotifyCreated) {
-            Log.straceln(
-              FPSTR(L_SENSORS_BLE), F("Sensor #%hhu '%s': subscribed to temp char (%s) in env service on device %s"),
-              sensorId, sSensor.name,
-              charUuid.toString().c_str(), pAddress.c_str()
-            );
-
-          } else {
-            Log.swarningln(
-              FPSTR(L_SENSORS_BLE), F("Sensor #%hhu '%s': failed to subscribe to temp char (%s) in env service on device %s"),
-              sensorId, sSensor.name,
-              charUuid.toString().c_str(), pAddress.c_str()
-            );
-          }
-        }
-      }
-
-
-      // 0x2A1F - Notify temperature x0.1C (atc1441/pvvx)
-      if (!tempNotifyCreated) {
-        NimBLEUUID charUuid((uint16_t) 0x2A1F);
-        pChar = pService->getCharacteristic(charUuid);
-
-        if (pChar && (pChar->canNotify() || pChar->canIndicate())) {
-          Log.straceln(
-            FPSTR(L_SENSORS_BLE), F("Sensor #%hhu '%s': found temp char (%s) in env service on device %s"),
-            sensorId, sSensor.name, charUuid.toString().c_str(), pAddress.c_str()
-          );
-
-          pChar->unsubscribe();
-          tempNotifyCreated = pChar->subscribe(
-            pChar->canNotify(),
-            [sensorId](NimBLERemoteCharacteristic* pChar, uint8_t* pData, size_t length, bool isNotify) {
-              if (pChar == nullptr) {
-                return;
-              }
-
-              const NimBLERemoteService* pService = pChar->getRemoteService();
-              if (pService == nullptr) {
-                return;
-              }
-
-              NimBLEClient* pClient = pService->getClient();
-              if (pClient == nullptr) {
-                return;
-              }
-
-              auto& sSensor = Sensors::settings[sensorId];
-
-              if (length != 2) {
-                Log.swarningln(
-                  FPSTR(L_SENSORS_BLE),
-                  F("Sensor #%hhu '%s': invalid notification data at temp char (%s) on device %s"),
-                  sensorId,
-                  sSensor.name,
-                  pChar->getUUID().toString().c_str(),
-                  pClient->getPeerAddress().toString().c_str()
-                );
-
-                return;
-              }
-
-              float rawTemp = (pChar->getValue<int16_t>() * 0.1f);
-              Log.straceln(
-                FPSTR(L_SENSORS_BLE),
-                F("Sensor #%hhu '%s': received temp: %.2f"),
-                sensorId, sSensor.name, rawTemp
-              );
-
-              // set temp
-              Sensors::setValueById(sensorId, rawTemp, Sensors::ValueType::TEMPERATURE, true, true);
-
-              // update rssi
-              Sensors::setValueById(sensorId, pClient->getRssi(), Sensors::ValueType::RSSI, false, false);
-            }
-          );
-
-          if (tempNotifyCreated) {
-            Log.straceln(
-              FPSTR(L_SENSORS_BLE), F("Sensor #%hhu '%s': subscribed to temp char (%s) in env service on device %s"),
-              sensorId, sSensor.name,
-              charUuid.toString().c_str(), pAddress.c_str()
-            );
-
-          } else {
-            Log.swarningln(
-              FPSTR(L_SENSORS_BLE), F("Sensor #%hhu '%s': failed to subscribe to temp char (%s) in env service on device %s"),
-              sensorId, sSensor.name,
-              charUuid.toString().c_str(), pAddress.c_str()
-            );
-          }
-        }
-      }
-
-      if (!tempNotifyCreated) {
-        Log.swarningln(
-          FPSTR(L_SENSORS_BLE), F("Sensor #%hhu '%s': not found supported temp chars in env service on device %s"),
-          sensorId, sSensor.name, pAddress.c_str()
-        );
-
-        pClient->disconnect();
-        return false;
-      }
-
-
-      // 0x2A6F - Notify about humidity x0.01% (pvvx)
-      {
-        bool humidityNotifyCreated = false;
-        if (!humidityNotifyCreated) {
-          NimBLEUUID charUuid((uint16_t) 0x2A6F);
-          pChar = pService->getCharacteristic(charUuid);
-
-          if (pChar && (pChar->canNotify() || pChar->canIndicate())) {
-            Log.straceln(
-              FPSTR(L_SENSORS_BLE), F("Sensor #%hhu '%s': found humidity char (%s) in env service on device %s"),
-              sensorId, sSensor.name, charUuid.toString().c_str(), pAddress.c_str()
-            );
-
-            pChar->unsubscribe();
-            humidityNotifyCreated = pChar->subscribe(
-              pChar->canNotify(),
-              [sensorId](NimBLERemoteCharacteristic* pChar, uint8_t* pData, size_t length, bool isNotify) {
-                if (pChar == nullptr) {
-                  return;
-                }
-
-                const NimBLERemoteService* pService = pChar->getRemoteService();
-                if (pService == nullptr) {
-                  return;
-                }
-
-                NimBLEClient* pClient = pService->getClient();
-                if (pClient == nullptr) {
-                  return;
-                }
-
-                auto& sSensor = Sensors::settings[sensorId];
-
-                if (length != 2) {
-                  Log.swarningln(
-                    FPSTR(L_SENSORS_BLE),
-                    F("Sensor #%hhu '%s': invalid notification data at humidity char (%s) on device %s"),
-                    sensorId,
-                    sSensor.name,
-                    pChar->getUUID().toString().c_str(),
-                    pClient->getPeerAddress().toString().c_str()
-                  );
-
-                  return;
-                }
-
-                float rawHumidity = (pChar->getValue<uint16_t>() * 0.01f);
-                Log.straceln(
-                  FPSTR(L_SENSORS_BLE),
-                  F("Sensor #%hhu '%s': received humidity: %.2f"),
-                  sensorId, sSensor.name, rawHumidity
-                );
-
-                // set humidity
-                Sensors::setValueById(sensorId, rawHumidity, Sensors::ValueType::HUMIDITY, true, true);
-
-                // update rssi
-                Sensors::setValueById(sensorId, pClient->getRssi(), Sensors::ValueType::RSSI, false, false);
-              }
-            );
-
-            if (humidityNotifyCreated) {
-              Log.straceln(
-                FPSTR(L_SENSORS_BLE), F("Sensor #%hhu '%s': subscribed to humidity char (%s) in env service on device %s"),
-                sensorId, sSensor.name,
-                charUuid.toString().c_str(), pAddress.c_str()
-              );
-
-            } else {
-              Log.swarningln(
-                FPSTR(L_SENSORS_BLE), F("Sensor #%hhu '%s': failed to subscribe to humidity char (%s) in env service on device %s"),
-                sensorId, sSensor.name,
-                charUuid.toString().c_str(), pAddress.c_str()
-              );
-            }
-          }
-        }
-
-        if (!humidityNotifyCreated) {
-          Log.swarningln(
-            FPSTR(L_SENSORS_BLE), F("Sensor #%hhu '%s': not found supported humidity chars in env service on device %s"),
-            sensorId, sSensor.name, pAddress.c_str()
-          );
-        }
-      }
-    }
-
-
-    // Battery Service (0x180F)
-    {
-      NimBLEUUID serviceUuid((uint16_t) 0x180F);
-      pService = pClient->getService(serviceUuid);
-      if (!pService) {
-        Log.straceln(
-          FPSTR(L_SENSORS_BLE), F("Sensor #%hhu '%s': failed to find battery service (%s) on device %s"),
-          sensorId, sSensor.name, serviceUuid.toString().c_str(), pAddress.c_str()
-        );
 
       } else {
-        Log.straceln(
+        Log.sinfoln(FPSTR(L_SENSORS_BLE), F("Unable to start scanning"));
-          FPSTR(L_SENSORS_BLE), F("Sensor #%hhu '%s': found battery service (%s) on device %s"),
-          sensorId, sSensor.name, serviceUuid.toString().c_str(), pAddress.c_str()
-        );
-
-        // 0x2A19 - Notify the battery charge level 0..99% (pvvx)
-        bool batteryNotifyCreated = false;
-        if (!batteryNotifyCreated) {
-          NimBLEUUID charUuid((uint16_t) 0x2A19);
-          pChar = pService->getCharacteristic(charUuid);
-
-          if (pChar && (pChar->canNotify() || pChar->canIndicate())) {
-            Log.straceln(
-              FPSTR(L_SENSORS_BLE), F("Sensor #%hhu '%s': found battery char (%s) in battery service on device %s"),
-              sensorId, sSensor.name, charUuid.toString().c_str(), pAddress.c_str()
-            );
-
-            pChar->unsubscribe();
-            batteryNotifyCreated = pChar->subscribe(
-              pChar->canNotify(),
-              [sensorId](NimBLERemoteCharacteristic* pChar, uint8_t* pData, size_t length, bool isNotify) {
-                if (pChar == nullptr) {
-                  return;
-                }
-
-                const NimBLERemoteService* pService = pChar->getRemoteService();
-                if (pService == nullptr) {
-                  return;
-                }
-
-                NimBLEClient* pClient = pService->getClient();
-                if (pClient == nullptr) {
-                  return;
-                }
-
-                auto& sSensor = Sensors::settings[sensorId];
-
-                if (length != 1) {
-                  Log.swarningln(
-                    FPSTR(L_SENSORS_BLE),
-                    F("Sensor #%hhu '%s': invalid notification data at battery char (%s) on device %s"),
-                    sensorId,
-                    sSensor.name,
-                    pChar->getUUID().toString().c_str(),
-                    pClient->getPeerAddress().toString().c_str()
-                  );
-
-                  return;
-                }
-
-                auto rawBattery = pChar->getValue<uint8_t>();
-                Log.straceln(
-                  FPSTR(L_SENSORS_BLE),
-                  F("Sensor #%hhu '%s': received battery: %hhu"),
-                  sensorId, sSensor.name, rawBattery
-                );
-
-                // set battery
-                Sensors::setValueById(sensorId, rawBattery, Sensors::ValueType::BATTERY, true, true);
-                
-                // update rssi
-                Sensors::setValueById(sensorId, pClient->getRssi(), Sensors::ValueType::RSSI, false, false);
-              }
-            );
-
-            if (batteryNotifyCreated) {
-              Log.straceln(
-                FPSTR(L_SENSORS_BLE), F("Sensor #%hhu '%s': subscribed to battery char (%s) in battery service on device %s"),
-                sensorId, sSensor.name,
-                charUuid.toString().c_str(), pAddress.c_str()
-              );
-
-            } else {
-              Log.swarningln(
-                FPSTR(L_SENSORS_BLE), F("Sensor #%hhu '%s': failed to subscribe to battery char (%s) in battery service on device %s"),
-                sensorId, sSensor.name,
-                charUuid.toString().c_str(), pAddress.c_str()
-              );
-            }
-          }
-        }
-
-        if (!batteryNotifyCreated) {
-          Log.swarningln(
-            FPSTR(L_SENSORS_BLE), F("Sensor #%hhu '%s': not found supported battery chars in battery service on device %s"),
-            sensorId, sSensor.name, pAddress.c_str()
-          );
-        }
       }
     }
-
-    return true;
-  }
-
-  bool setDateOnBleSensor(NimBLEClient* pClient, const struct tm *ptm) {
-    auto ts = mkgmtime(ptm);
-
-    uint8_t data[5] = {};
-    data[0] = 0x23;
-    data[1] = ts & 0xff;
-    data[2] = (ts >> 8) & 0xff;
-    data[3] = (ts >> 16) & 0xff;
-    data[4] = (ts >> 24) & 0xff;
-
-    return pClient->setValue(
-      NimBLEUUID((uint16_t) 0x1f10),
-      NimBLEUUID((uint16_t) 0x1f1f),
-      NimBLEAttValue(data, sizeof(data))
-    );
   }
   #endif
 

src/Settings.h

@@ -32,8 +32,9 @@ struct Settings {
     } serial;
 
     struct {
-      bool enabled = DEFAULT_WEBSERIAL_ENABLED;
+      bool enabled = DEFAULT_TELNET_ENABLED;
-    } webSerial;
+      unsigned short port = DEFAULT_TELNET_PORT;
+    } telnet;
 
     struct {
       char server[49] = "pool.ntp.org";
@@ -161,7 +162,6 @@ struct Settings {
   struct {
     bool use = false;
     uint8_t gpio = DEFAULT_EXT_PUMP_GPIO;
-    bool invertState = false;
     unsigned short postCirculationTime = 600;
     unsigned int antiStuckInterval = 2592000;
     unsigned short antiStuckTime = 300;

src/defines.h

@@ -42,8 +42,12 @@
   #define DEFAULT_SERIAL_BAUD 115200
 #endif
 
-#ifndef DEFAULT_WEBSERIAL_ENABLED
+#ifndef DEFAULT_TELNET_ENABLED
-  #define DEFAULT_WEBSERIAL_ENABLED true
+  #define DEFAULT_TELNET_ENABLED true
+#endif
+
+#ifndef DEFAULT_TELNET_PORT
+  #define DEFAULT_TELNET_PORT 23
 #endif
 
 #ifndef USE_BLE
@@ -71,7 +75,7 @@
 #endif
 
 #ifndef DEFAULT_LOG_LEVEL
-  #define DEFAULT_LOG_LEVEL TinyLoggerLevel::VERBOSE
+  #define DEFAULT_LOG_LEVEL TinyLogger::Level::VERBOSE
 #endif
 
 #ifndef DEFAULT_STATUS_LED_GPIO

src/main.cpp

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

src/strings.h

@@ -164,7 +164,6 @@ 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";
@@ -198,6 +197,7 @@ 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,4 +216,3 @@ 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,8 +425,9 @@ 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 webSerial = system[FPSTR(S_WEBSERIAL)].to<JsonObject>();
+    auto telnet = system[FPSTR(S_TELNET)].to<JsonObject>();
-    webSerial[FPSTR(S_ENABLED)] = src.system.webSerial.enabled;
+    telnet[FPSTR(S_ENABLED)] = src.system.telnet.enabled;
+    telnet[FPSTR(S_PORT)] = src.system.telnet.port;
 
     auto ntp = system[FPSTR(S_NTP)].to<JsonObject>();
     ntp[FPSTR(S_SERVER)] = src.system.ntp.server;
@@ -541,7 +542,6 @@ void settingsToJson(const Settings& src, JsonVariant dst, bool safe = false) {
     auto externalPump = dst[FPSTR(S_EXTERNAL_PUMP)].to<JsonObject>();
     externalPump[FPSTR(S_USE)] = src.externalPump.use;
     externalPump[FPSTR(S_GPIO)] = src.externalPump.gpio;
-    externalPump[FPSTR(S_INVERT_STATE)] = src.externalPump.invertState;
     externalPump[FPSTR(S_POST_CIRCULATION_TIME)] = roundf(src.externalPump.postCirculationTime / 60, 0);
     externalPump[FPSTR(S_ANTI_STUCK_INTERVAL)] = roundf(src.externalPump.antiStuckInterval / 86400, 0);
     externalPump[FPSTR(S_ANTI_STUCK_TIME)] = roundf(src.externalPump.antiStuckTime / 60, 0);
@@ -575,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 >= TinyLoggerLevel::SILENT && value <= TinyLoggerLevel::VERBOSE) {
+      if (value != dst.system.logLevel && value >= TinyLogger::Level::SILENT && value <= TinyLogger::Level::VERBOSE) {
         dst.system.logLevel = value;
         changed = true;
       }
@@ -601,11 +601,20 @@ bool jsonToSettings(const JsonVariantConst src, Settings& dst, bool safe = false
       }
     }
 
-    if (src[FPSTR(S_SYSTEM)][FPSTR(S_WEBSERIAL)][FPSTR(S_ENABLED)].is<bool>()) {
+    if (src[FPSTR(S_SYSTEM)][FPSTR(S_TELNET)][FPSTR(S_ENABLED)].is<bool>()) {
-      bool value = src[FPSTR(S_SYSTEM)][FPSTR(S_WEBSERIAL)][FPSTR(S_ENABLED)].as<bool>();
+      bool value = src[FPSTR(S_SYSTEM)][FPSTR(S_TELNET)][FPSTR(S_ENABLED)].as<bool>();
 
-      if (value != dst.system.webSerial.enabled) {
+      if (value != dst.system.telnet.enabled) {
-        dst.system.webSerial.enabled = value;
+        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;
         changed = true;
       }
     }
@@ -1483,15 +1492,6 @@ bool jsonToSettings(const JsonVariantConst src, Settings& dst, bool safe = false
       }
     }
 
-    if (src[FPSTR(S_EXTERNAL_PUMP)][FPSTR(S_INVERT_STATE)].is<bool>()) {
-      bool value = src[FPSTR(S_EXTERNAL_PUMP)][FPSTR(S_INVERT_STATE)].as<bool>();
-
-      if (value != dst.externalPump.invertState) {
-        dst.externalPump.invertState = value;
-        changed = true;
-      }
-    }
-
     if (!src[FPSTR(S_EXTERNAL_PUMP)][FPSTR(S_POST_CIRCULATION_TIME)].isNull()) {
       unsigned short value = src[FPSTR(S_EXTERNAL_PUMP)][FPSTR(S_POST_CIRCULATION_TIME)].as<unsigned short>();
 

src_data/locales/cn.json

@@ -341,8 +341,12 @@
           "enable": "启用串口",
           "baud": "串口波特率"
         },
-        "webSerial": {
+        "telnet": {
-          "enable": "启用 WebSerial"
+          "enable": "启用 Telnet",
+          "port": {
+            "title": "Telnet 端口",
+            "note": "默认值：23"
+          }
         },
         "ntp": {
           "server": "NTP服务器",
@@ -451,7 +455,6 @@
       "extPump": {
         "use": "使用外置循环泵",
         "gpio": "继电器 GPIO引脚",
-        "invertState": "切换 GPIO 状态",
         "postCirculationTime": "后循环时间 <small>(分钟)</small>",
         "antiStuckInterval": "防卡死间隔时间<small>(天)</small>",
         "antiStuckTime": "防卡死运行时长<small>(分钟)</small>"

src_data/locales/en.json

@@ -341,8 +341,12 @@
           "enable": "Enabled Serial port",
           "baud": "Serial port baud rate"
         },
-        "webSerial": {
+        "telnet": {
-          "enable": "Enabled WebSerial"
+          "enable": "Enabled Telnet",
+          "port": {
+            "title": "Telnet port",
+            "note": "Default: 23"
+          }
         },
         "ntp": {
           "server": "NTP server",
@@ -451,7 +455,6 @@
       "extPump": {
         "use": "Use external pump",
         "gpio": "Relay GPIO",
-        "invertState": "Invert GPIO state",
         "postCirculationTime": "Post circulation time <small>(min)</small>",
         "antiStuckInterval": "Anti stuck interval <small>(days)</small>",
         "antiStuckTime": "Anti stuck time <small>(min)</small>"

src_data/locales/it.json

@@ -341,8 +341,12 @@
           "enable": "Porta seriale attivata",
           "baud": "Porta seriale baud rate"
         },
-        "webSerial": {
+        "telnet": {
-          "enable": "WebSerial attivato"
+          "enable": "Telnet attivato",
+          "port": {
+            "title": "Porta Telnet",
+            "note": "Default: 23"
+          }
         },
         "ntp": {
           "server": "NTP server",
@@ -451,7 +455,6 @@
       "extPump": {
         "use": "Usa pompa/circolatore esterno",
         "gpio": "GPIO relè",
-        "invertState": "Inverti stato GPIO",
         "postCirculationTime": "Tempo di post circolazione <small>(min)</small>",
         "antiStuckInterval": "Intervallo antiblocco <small>(days)</small>",
         "antiStuckTime": "Tempo antiblocco <small>(min)</small>"

src_data/locales/nl.json

@@ -313,8 +313,12 @@
           "enable": "Seriële poort ingeschakeld",
           "baud": "Baudrate seriële poort"
         },
-        "webSerial": {
+        "telnet": {
-          "enable": "WebSerial ingeschakeld"
+          "enable": "Telnet ingeschakeld",
+          "port": {
+            "title": "Telnet-poort",
+            "note": "Standaard: 23"
+          }
         },
         "ntp": {
           "server": "NTP-server",
@@ -413,7 +417,6 @@
       "extPump": {
         "use": "Gebruik externe pomp",
         "gpio": "Relais GPIO",
-        "invertState": "Inverteer GPIO-status",
         "postCirculationTime": "Nacirculatietijd <small>(min)</small>",
         "antiStuckInterval": "Anti-vastloopinterval <small>(dagen)</small>",
         "antiStuckTime": "Anti-vastlooptijd <small>(min)</small>"

src_data/locales/ru.json

@@ -341,8 +341,12 @@
           "enable": "Вкл. Serial порт",
           "baud": "Скорость Serial порта"
         },
-        "webSerial": {
+        "telnet": {
-          "enable": "Вкл. WebSerial"
+          "enable": "Вкл. Telnet",
+          "port": {
+            "title": "Telnet порт",
+            "note": "По умолчанию: 23"
+          }
         },
         "ntp": {
           "server": "NTP сервер",
@@ -451,7 +455,6 @@
       "extPump": {
         "use": "Использовать доп. насос",
         "gpio": "GPIO реле",
-        "invertState": "Инвертировать состояние GPIO",
         "postCirculationTime": "Время постциркуляции <small>(в минутах)</small>",
         "antiStuckInterval": "Интервал защиты от блокировки <small>(в днях)</small>",
         "antiStuckTime": "Время работы насоса <small>(в минутах)</small>"

src_data/pages/settings.html

@@ -126,8 +126,8 @@
                 </label>
 
                 <label>
-                  <input type="checkbox" name="system[webSerial][enabled]" value="true">
+                  <input type="checkbox" name="system[telnet][enabled]" value="true">
-                  <span data-i18n>settings.system.webSerial.enable</span>
+                  <span data-i18n>settings.system.telnet.enable</span>
                 </label>
 
                 <label>
@@ -156,6 +156,12 @@
                       <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>
@@ -725,11 +731,6 @@
                   <input type="checkbox" name="externalPump[use]" value="true">
                   <span data-i18n>settings.extPump.use</span>
                 </label>
-
-                <label>
-                  <input type="checkbox" name="externalPump[invertState]" value="true">
-                  <span data-i18n>settings.externalPump.invertState</span>
-                </label>
               </fieldset>
 
               <div class="grid">
@@ -870,7 +871,8 @@
           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[webSerial][enabled]']", data.system.webSerial.enabled);
+          setCheckboxValue("[name='system[telnet][enabled]']", data.system.telnet.enabled);
+          setInputValue("[name='system[telnet][port]']", data.system.telnet.port);
           setInputValue("[name='system[ntp][server]']", data.system.ntp.server);
           setInputValue("[name='system[ntp][timezone]']", data.system.ntp.timezone);
           setRadioValue("[name='system[unitSystem]']", data.system.unitSystem);
@@ -926,7 +928,6 @@
           // Extpump
           setCheckboxValue("[name='externalPump[use]']", data.externalPump.use);
           setInputValue("[name='externalPump[gpio]']", data.externalPump.gpio < 255 ? data.externalPump.gpio : '');
-          setCheckboxValue("[name='externalPump[invertState]']", data.externalPump.invertState);
           setInputValue("[name='externalPump[postCirculationTime]']", data.externalPump.postCirculationTime);
           setInputValue("[name='externalPump[antiStuckInterval]']", data.externalPump.antiStuckInterval);
           setInputValue("[name='externalPump[antiStuckTime]']", data.externalPump.antiStuckTime);

src_data/pages/upgrade.html

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