refactor: some changes

Currently translated at 100.0% (346 of 346 strings)

Translation: OTGateway/Portal
Translate-URL: https://hosted.weblate.org/projects/otgateway/portal/nl/

.gitignore

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

README.md

@@ -2,6 +2,7 @@
 
    [![GitHub version](https://img.shields.io/github/release/Laxilef/OTGateway.svg?include_prereleases)](https://github.com/Laxilef/OTGateway/releases)
    [![GitHub download](https://img.shields.io/github/downloads/Laxilef/OTGateway/total.svg)](https://github.com/Laxilef/OTGateway/releases/latest)
+   [![Translations](https://hosted.weblate.org/widget/otgateway/svg-badge.svg)](https://hosted.weblate.org/engage/otgateway/)
    [![License](https://img.shields.io/github/license/Laxilef/OTGateway.svg)](LICENSE.txt)
    [![Telegram](https://img.shields.io/badge/Telegram-Channel-33A8E3)](https://t.me/otgateway)
 
@@ -71,6 +72,14 @@ All available information and instructions can be found in the wiki:
       * [Connection](https://github.com/Laxilef/OTGateway/wiki/OT-adapters#connection)
       * [Leds on board](https://github.com/Laxilef/OTGateway/wiki/OT-adapters#leds-on-board)
 
+## Translations
+The project uses [Weblate](https://hosted.weblate.org/new-lang/otgateway/) to manage translations of the interface.<br />
+Anyone is welcome to add their native language as a [new localization](https://hosted.weblate.org/new-lang/otgateway/portal/). All contributions are welcome!
+
+<a href="https://hosted.weblate.org/engage/otgateway/">
+<img src="https://hosted.weblate.org/widget/otgateway/multi-auto.svg" alt="Translation status" />
+</a>
+
 ## Gratitude
 * To the developers of the libraries used: [OpenTherm Library](https://github.com/ihormelnyk/opentherm_library), [ESP8266Scheduler](https://github.com/nrwiersma/ESP8266Scheduler), [ArduinoJson](https://github.com/bblanchon/ArduinoJson), [NimBLE-Arduino](https://github.com/h2zero/NimBLE-Arduino), [ArduinoMqttClient](https://github.com/arduino-libraries/ArduinoMqttClient), [ESPTelnet](https://github.com/LennartHennigs/ESPTelnet), [FileData](https://github.com/GyverLibs/FileData), [GyverPID](https://github.com/GyverLibs/GyverPID), [GyverBlinker](https://github.com/GyverLibs/GyverBlinker), [OneWireNg](https://github.com/pstolarz/OneWireNg) & [OneWire](https://github.com/PaulStoffregen/OneWire)
 * To the [PlatformIO](https://platformio.org/) Team

lib/WebServerHandlers/UpgradeHandler.h

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

platformio.ini

@@ -1,381 +1,231 @@
-; PlatformIO Project Configuration File
-;
-;   Build options: build flags, source filter
-;   Upload options: custom upload port, speed and extra flags
-;   Library options: dependencies, extra library storages
-;   Advanced options: extra scripting
-;
-; Please visit documentation for the other options and examples
-; https://docs.platformio.org/page/projectconf.html
-
 [platformio]
-;extra_configs = secrets.ini
-extra_configs = secrets.default.ini
-core_dir = .pio
+;extra_configs          = secrets.ini
+extra_configs           = secrets.default.ini
+core_dir                = .pio
 
 [env]
-version = 1.6.0
-framework = arduino
-lib_deps = 
-	bblanchon/ArduinoJson@^7.4.2
-	;ihormelnyk/OpenTherm Library@^1.1.5
-	https://github.com/Laxilef/opentherm_library#esp32_timer
-	arduino-libraries/ArduinoMqttClient@^0.1.8
-	lennarthennigs/ESP Telnet@^2.2.3
-	gyverlibs/FileData@^1.0.3
-	gyverlibs/GyverPID@^3.3.2
-	gyverlibs/GyverBlinker@^1.1.1
-	pstolarz/OneWireNg@^0.14.1
-	milesburton/DallasTemperature@^4.0.6
-	laxilef/TinyLogger@^1.1.1
-lib_ignore = OneWire
-build_type = ${secrets.build_type}
-build_flags = 
-	-mtext-section-literals
-	-D MQTT_CLIENT_STD_FUNCTION_CALLBACK=1
-	;-D DEBUG_ESP_CORE -D DEBUG_ESP_WIFI -D DEBUG_ESP_HTTP_SERVER -D DEBUG_ESP_PORT=Serial
-	-D BUILD_VERSION='"${this.version}"'
-	-D BUILD_ENV='"$PIOENV"'
-	-D DEFAULT_SERIAL_ENABLED=${secrets.serial_enabled}
-	-D DEFAULT_SERIAL_BAUD=${secrets.serial_baud}
-	-D DEFAULT_TELNET_ENABLED=${secrets.telnet_enabled}
-	-D DEFAULT_TELNET_PORT=${secrets.telnet_port}
-	-D DEFAULT_LOG_LEVEL=${secrets.log_level}
-	-D DEFAULT_HOSTNAME='"${secrets.hostname}"'
-	-D DEFAULT_AP_SSID='"${secrets.ap_ssid}"'
-	-D DEFAULT_AP_PASSWORD='"${secrets.ap_password}"'
-	-D DEFAULT_STA_SSID='"${secrets.sta_ssid}"'
-	-D DEFAULT_STA_PASSWORD='"${secrets.sta_password}"'
-	-D DEFAULT_PORTAL_LOGIN='"${secrets.portal_login}"'
-	-D DEFAULT_PORTAL_PASSWORD='"${secrets.portal_password}"'
-	-D DEFAULT_MQTT_ENABLED=${secrets.mqtt_enabled}
-	-D DEFAULT_MQTT_SERVER='"${secrets.mqtt_server}"'
-	-D DEFAULT_MQTT_PORT=${secrets.mqtt_port}
-	-D DEFAULT_MQTT_USER='"${secrets.mqtt_user}"'
-	-D DEFAULT_MQTT_PASSWORD='"${secrets.mqtt_password}"'
-	-D DEFAULT_MQTT_PREFIX='"${secrets.mqtt_prefix}"'
-upload_speed = 921600
-monitor_speed = 115200
-;monitor_filters = direct
-monitor_filters = 
-	esp32_exception_decoder
-	esp8266_exception_decoder
-board_build.flash_mode = dio
-board_build.filesystem = littlefs
-check_tool = ; pvs-studio
-check_flags =
-;  pvs-studio:
-;    --analysis-mode=4
-;    --exclude-path=./.pio/libdeps
+version                 = 1.6.0-async
+framework               = arduino
+lib_deps                = ESP32Async/AsyncTCP@^3.4.10
+                          ESP32Async/ESPAsyncWebServer@^3.11.0
+                          mathieucarbou/MycilaWebSerial@^8.2.3
+                          bblanchon/ArduinoJson@^7.4.3
+                          ;ihormelnyk/OpenTherm Library@^1.1.5
+                          https://github.com/Laxilef/opentherm_library#esp32_timer
+                          arduino-libraries/ArduinoMqttClient@^0.1.8
+                          gyverlibs/FileData@^1.0.3
+                          gyverlibs/GyverPID@^3.3.2
+                          gyverlibs/GyverBlinker@^1.1.1
+                          pstolarz/OneWireNg@^0.14.1
+                          milesburton/DallasTemperature@^4.0.6
+                          https://github.com/Laxilef/esp32DHT#idf5
+                          ;laxilef/TinyLogger@^1.1.1
+                          https://github.com/Laxilef/TinyLogger#custom_handlers
+lib_ignore              = OneWire
+build_type              = ${secrets.build_type}
+build_flags             = ;-mtext-section-literals
+                          -O2
+                          -Wno-deprecated-declarations
+                          -D MQTT_CLIENT_STD_FUNCTION_CALLBACK=1
+                          ;-D DEBUG_ESP_CORE -D DEBUG_ESP_WIFI -D DEBUG_ESP_HTTP_SERVER -D DEBUG_ESP_PORT=Serial
+                          -D BUILD_VERSION='"${this.version}"'
+                          -D BUILD_ENV='"$PIOENV"'
+                          -D CONFIG_ASYNC_TCP_STACK_SIZE=4096
+                          -D ARDUINOJSON_USE_DOUBLE=0
+                          -D ARDUINOJSON_USE_LONG_LONG=0
+                          -D TINYLOGGER_GLOBAL
+                          -D DHT_TASK_STACK_SIZE=4096
+                          -D DEFAULT_SERIAL_ENABLED=${secrets.serial_enabled}
+                          -D DEFAULT_SERIAL_BAUD=${secrets.serial_baud}
+                          -D DEFAULT_WEBSERIAL_ENABLED=${secrets.webserial_enabled}
+                          -D DEFAULT_LOG_LEVEL=${secrets.log_level}
+                          -D DEFAULT_HOSTNAME='"${secrets.hostname}"'
+                          -D DEFAULT_AP_SSID='"${secrets.ap_ssid}"'
+                          -D DEFAULT_AP_PASSWORD='"${secrets.ap_password}"'
+                          -D DEFAULT_STA_SSID='"${secrets.sta_ssid}"'
+                          -D DEFAULT_STA_PASSWORD='"${secrets.sta_password}"'
+                          -D DEFAULT_PORTAL_LOGIN='"${secrets.portal_login}"'
+                          -D DEFAULT_PORTAL_PASSWORD='"${secrets.portal_password}"'
+                          -D DEFAULT_MQTT_ENABLED=${secrets.mqtt_enabled}
+                          -D DEFAULT_MQTT_SERVER='"${secrets.mqtt_server}"'
+                          -D DEFAULT_MQTT_PORT=${secrets.mqtt_port}
+                          -D DEFAULT_MQTT_USER='"${secrets.mqtt_user}"'
+                          -D DEFAULT_MQTT_PASSWORD='"${secrets.mqtt_password}"'
+                          -D DEFAULT_MQTT_PREFIX='"${secrets.mqtt_prefix}"'
+upload_speed            = 921600
+monitor_speed           = 115200
+;monitor_filters        = direct
+monitor_filters         = esp32_exception_decoder
+board_build.flash_mode  = dio
+board_build.filesystem  = littlefs
+check_tool              = ;pvs-studio
+check_flags             = ;pvs-studio: --analysis-mode=4 --exclude-path=./.pio/libdeps
 
 ; Defaults
-[esp8266_defaults]
-platform = espressif8266@^4.2.1
-platform_packages = ${env.platform_packages}
-lib_deps = 
-	${env.lib_deps}
-	nrwiersma/ESP8266Scheduler@^1.2
-lib_ignore = ${env.lib_ignore}
-extra_scripts = 
-	post:tools/build.py
-build_type = ${env.build_type}
-build_flags = 
-	${env.build_flags}
-	-D PIO_FRAMEWORK_ARDUINO_LWIP2_LOW_MEMORY
-	;-D PIO_FRAMEWORK_ARDUINO_LWIP2_HIGHER_BANDWIDTH_LOW_FLASH
-	-D PIO_FRAMEWORK_ARDUINO_ESPRESSIF_SDK305
-board_build.ldscript = eagle.flash.4m1m.ld
-check_tool = ${env.check_tool}
-check_flags = ${env.check_flags}
-
 [esp32_defaults]
-;platform = espressif32@^6.7
-;platform = https://github.com/platformio/platform-espressif32.git
-;platform_packages = 
-;  framework-arduinoespressif32 @ https://github.com/espressif/arduino-esp32.git#3.0.5
-;  framework-arduinoespressif32-libs @ https://github.com/espressif/esp32-arduino-lib-builder/releases/download/idf-release_v5.1/esp32-arduino-libs-idf-release_v5.1-33fbade6.zip
-platform = https://github.com/pioarduino/platform-espressif32/releases/download/55.03.36/platform-espressif32.zip
-platform_packages = ${env.platform_packages}
-board_build.partitions = esp32_partitions.csv
-lib_deps =
-	${env.lib_deps}
-	laxilef/ESP32Scheduler@^1.0.1
-nimble_lib = h2zero/NimBLE-Arduino@2.3.7
-lib_ignore = ${env.lib_ignore}
-extra_scripts = 
-	post:tools/esp32.py
-	post:tools/build.py
-build_type = ${env.build_type}
-build_flags = 
-	${env.build_flags}
-	-D CORE_DEBUG_LEVEL=0
-	-Wl,--wrap=esp_panic_handler
-check_tool = ${env.check_tool}
-check_flags = ${env.check_flags}
+platform                = https://github.com/pioarduino/platform-espressif32/releases/download/55.03.37/platform-espressif32.zip
+platform_packages       = ${env.platform_packages}
+board_build.partitions  = esp32_partitions.csv
+lib_deps                = ${env.lib_deps}
+                          laxilef/ESP32Scheduler@^1.0.1
+nimble_lib              = https://github.com/h2zero/NimBLE-Arduino
+lib_ignore              = ${env.lib_ignore}
+                          BluetoothSerial
+                          SimpleBLE
+                          ESP RainMaker
+                          RainMaker
+                          ESP Insights
+                          Insights
+                          Zigbee
+                          Matter
+                          OpenThread
+                          dsp
+custom_component_remove = espressif/esp_hosted
+                          espressif/esp_wifi_remote
+                          espressif/esp-dsp
+                          espressif/esp_modem
+                          espressif/esp_rainmaker
+                          espressif/rmaker_common
+                          espressif/esp_insights
+                          espressif/esp_diag_data_store
+                          espressif/esp_diagnostics
+                          espressif/libsodium
+                          espressif/esp-modbus
+                          espressif/esp-cbor
+                          espressif/esp-sr
+                          espressif/esp32-camera
+                          espressif/qrcode
+                          espressif/esp-zboss-lib
+                          espressif/esp-zigbee-lib
+                          chmorgan/esp-libhelix-mp3
+extra_scripts           = pre:tools/add_build_commit.py
+                          post:tools/esp32.py
+                          post:tools/build.py
+build_type              = ${env.build_type}
+build_flags             = ${env.build_flags}
+                          -D MYNEWT_VAL_BLE_MAX_CONNECTIONS=1
+                          -D MYNEWT_VAL_BLE_STORE_MAX_BONDS=1
+                          -D MYNEWT_VAL_BLE_ROLE_CENTRAL=0
+                          -D CORE_DEBUG_LEVEL=0
+                          -Wl,--wrap=esp_panic_handler
+check_tool              = ${env.check_tool}
+check_flags             = ${env.check_flags}
 
 
 ; Boards
-[env:d1_mini]
-platform = ${esp8266_defaults.platform}
-platform_packages = ${esp8266_defaults.platform_packages}
-board = d1_mini
-lib_deps = ${esp8266_defaults.lib_deps}
-lib_ignore = ${esp8266_defaults.lib_ignore}
-extra_scripts = ${esp8266_defaults.extra_scripts}
-board_build.ldscript = ${esp8266_defaults.board_build.ldscript}
-build_type = ${esp8266_defaults.build_type}
-build_flags = 
-	${esp8266_defaults.build_flags}
-	-D DEFAULT_OT_IN_GPIO=4
-	-D DEFAULT_OT_OUT_GPIO=5
-	-D DEFAULT_SENSOR_OUTDOOR_GPIO=12
-	-D DEFAULT_SENSOR_INDOOR_GPIO=14
-	-D DEFAULT_STATUS_LED_GPIO=13
-	-D DEFAULT_OT_RX_LED_GPIO=15
-check_tool = ${esp8266_defaults.check_tool}
-check_flags = ${esp8266_defaults.check_flags}
-
-[env:d1_mini_lite]
-platform = ${esp8266_defaults.platform}
-platform_packages = ${esp8266_defaults.platform_packages}
-board = d1_mini_lite
-lib_deps = ${esp8266_defaults.lib_deps}
-lib_ignore = ${esp8266_defaults.lib_ignore}
-extra_scripts = ${esp8266_defaults.extra_scripts}
-board_build.ldscript = ${esp8266_defaults.board_build.ldscript}
-build_type = ${esp8266_defaults.build_type}
-build_flags = 
-	${esp8266_defaults.build_flags}
-	-D DEFAULT_OT_IN_GPIO=4
-	-D DEFAULT_OT_OUT_GPIO=5
-	-D DEFAULT_SENSOR_OUTDOOR_GPIO=12
-	-D DEFAULT_SENSOR_INDOOR_GPIO=14
-	-D DEFAULT_STATUS_LED_GPIO=13
-	-D DEFAULT_OT_RX_LED_GPIO=15
-check_tool = ${esp8266_defaults.check_tool}
-check_flags = ${esp8266_defaults.check_flags}
-
-[env:d1_mini_pro]
-platform = ${esp8266_defaults.platform}
-platform_packages = ${esp8266_defaults.platform_packages}
-board = d1_mini_pro
-lib_deps = ${esp8266_defaults.lib_deps}
-lib_ignore = ${esp8266_defaults.lib_ignore}
-extra_scripts = ${esp8266_defaults.extra_scripts}
-board_build.ldscript = ${esp8266_defaults.board_build.ldscript}
-build_type = ${esp8266_defaults.build_type}
-build_flags = 
-	${esp8266_defaults.build_flags}
-	-D DEFAULT_OT_IN_GPIO=4
-	-D DEFAULT_OT_OUT_GPIO=5
-	-D DEFAULT_SENSOR_OUTDOOR_GPIO=12
-	-D DEFAULT_SENSOR_INDOOR_GPIO=14
-	-D DEFAULT_STATUS_LED_GPIO=13
-	-D DEFAULT_OT_RX_LED_GPIO=15
-check_tool = ${esp8266_defaults.check_tool}
-check_flags = ${esp8266_defaults.check_flags}
-
-[env:nodemcu_8266]
-platform = ${esp8266_defaults.platform}
-platform_packages = ${esp8266_defaults.platform_packages}
-board = nodemcuv2
-lib_deps = ${esp8266_defaults.lib_deps}
-lib_ignore = ${esp8266_defaults.lib_ignore}
-extra_scripts = ${esp8266_defaults.extra_scripts}
-board_build.ldscript = ${esp8266_defaults.board_build.ldscript}
-build_type = ${esp8266_defaults.build_type}
-build_flags = 
-	${esp8266_defaults.build_flags}
-	-D DEFAULT_OT_IN_GPIO=13
-	-D DEFAULT_OT_OUT_GPIO=15
-	-D DEFAULT_SENSOR_OUTDOOR_GPIO=12
-	-D DEFAULT_SENSOR_INDOOR_GPIO=4
-	-D DEFAULT_STATUS_LED_GPIO=2
-	-D DEFAULT_OT_RX_LED_GPIO=16
-check_tool = ${esp8266_defaults.check_tool}
-check_flags = ${esp8266_defaults.check_flags}
-
 [env:s2_mini]
-platform = ${esp32_defaults.platform}
-platform_packages = ${esp32_defaults.platform_packages}
-board = lolin_s2_mini
-board_build.partitions = ${esp32_defaults.board_build.partitions}
-lib_deps = ${esp32_defaults.lib_deps}
-lib_ignore = ${esp32_defaults.lib_ignore}
-extra_scripts = ${esp32_defaults.extra_scripts}
-build_unflags =
-	-DARDUINO_USB_MODE=1
-build_type = ${esp32_defaults.build_type}
-build_flags = 
-	${esp32_defaults.build_flags}
-	-D ARDUINO_USB_MODE=0
-	-D ARDUINO_USB_CDC_ON_BOOT=1
-	-D DEFAULT_OT_IN_GPIO=33
-	-D DEFAULT_OT_OUT_GPIO=35
-	-D DEFAULT_SENSOR_OUTDOOR_GPIO=9
-	-D DEFAULT_SENSOR_INDOOR_GPIO=7
-	-D DEFAULT_STATUS_LED_GPIO=11
-	-D DEFAULT_OT_RX_LED_GPIO=12
-check_tool = ${esp32_defaults.check_tool}
-check_flags = ${esp32_defaults.check_flags}
+extends                 = esp32_defaults
+board                   = lolin_s2_mini
+build_unflags           = -DARDUINO_USB_MODE=1
+build_flags             = ${esp32_defaults.build_flags}
+                          -D ARDUINO_USB_MODE=0
+                          -D ARDUINO_USB_CDC_ON_BOOT=1
+                          -D DEFAULT_OT_IN_GPIO=33
+                          -D DEFAULT_OT_OUT_GPIO=35
+                          -D DEFAULT_SENSOR_OUTDOOR_GPIO=9
+                          -D DEFAULT_SENSOR_INDOOR_GPIO=7
+                          -D DEFAULT_STATUS_LED_GPIO=11
+                          -D DEFAULT_OT_RX_LED_GPIO=12
 
 [env:s3_mini]
-platform = ${esp32_defaults.platform}
-platform_packages = ${esp32_defaults.platform_packages}
-board = lolin_s3_mini
-board_build.partitions = ${esp32_defaults.board_build.partitions}
-lib_deps = 
-	${esp32_defaults.lib_deps}
-	${esp32_defaults.nimble_lib}
-lib_ignore = ${esp32_defaults.lib_ignore}
-extra_scripts = ${esp32_defaults.extra_scripts}
-build_unflags =
-	-DARDUINO_USB_MODE=1
-build_type = ${esp32_defaults.build_type}
-build_flags = 
-	${esp32_defaults.build_flags}
-	-D ARDUINO_USB_MODE=0
-	-D ARDUINO_USB_CDC_ON_BOOT=1
-	-D MYNEWT_VAL_BLE_EXT_ADV=1
-	-D USE_BLE=1
-	-D DEFAULT_OT_IN_GPIO=35
-	-D DEFAULT_OT_OUT_GPIO=36
-	-D DEFAULT_SENSOR_OUTDOOR_GPIO=13
-	-D DEFAULT_SENSOR_INDOOR_GPIO=12
-	-D DEFAULT_STATUS_LED_GPIO=11
-	-D DEFAULT_OT_RX_LED_GPIO=10
-check_tool = ${esp32_defaults.check_tool}
-check_flags = ${esp32_defaults.check_flags}
+extends                 = esp32_defaults
+board                   = lolin_s3_mini
+lib_deps                = ${esp32_defaults.lib_deps}
+                          ${esp32_defaults.nimble_lib}
+build_unflags           = -DARDUINO_USB_MODE=1
+build_flags             = ${esp32_defaults.build_flags}
+                          -D ARDUINO_USB_MODE=0
+                          -D ARDUINO_USB_CDC_ON_BOOT=1
+                          -D MYNEWT_VAL_BLE_EXT_ADV=1
+                          -D USE_BLE=1
+                          -D DEFAULT_OT_IN_GPIO=35
+                          -D DEFAULT_OT_OUT_GPIO=36
+                          -D DEFAULT_SENSOR_OUTDOOR_GPIO=13
+                          -D DEFAULT_SENSOR_INDOOR_GPIO=12
+                          -D DEFAULT_STATUS_LED_GPIO=11
+                          -D DEFAULT_OT_RX_LED_GPIO=10
 
 [env:c3_mini]
-platform = ${esp32_defaults.platform}
-platform_packages = ${esp32_defaults.platform_packages}
-board = lolin_c3_mini
-board_build.partitions = ${esp32_defaults.board_build.partitions}
-lib_deps = 
-	${esp32_defaults.lib_deps}
-	${esp32_defaults.nimble_lib}
-lib_ignore = ${esp32_defaults.lib_ignore}
-extra_scripts = ${esp32_defaults.extra_scripts}
-build_unflags = 
-	-mtext-section-literals
-build_type = ${esp32_defaults.build_type}
-build_flags = 
-	${esp32_defaults.build_flags}
-	-D MYNEWT_VAL_BLE_EXT_ADV=1
-	-D USE_BLE=1
-	-D DEFAULT_OT_IN_GPIO=8
-	-D DEFAULT_OT_OUT_GPIO=10
-	-D DEFAULT_SENSOR_OUTDOOR_GPIO=0
-	-D DEFAULT_SENSOR_INDOOR_GPIO=1
-	-D DEFAULT_STATUS_LED_GPIO=4
-	-D DEFAULT_OT_RX_LED_GPIO=5
-check_tool = ${esp32_defaults.check_tool}
-check_flags = ${esp32_defaults.check_flags}
+extends                 = esp32_defaults
+board                   = lolin_c3_mini
+lib_deps                = ${esp32_defaults.lib_deps}
+                          ${esp32_defaults.nimble_lib}
+;build_unflags           = -mtext-section-literals
+build_flags             = ${esp32_defaults.build_flags}
+                          -D MYNEWT_VAL_BLE_EXT_ADV=1
+                          -D USE_BLE=1
+                          -D DEFAULT_OT_IN_GPIO=8
+                          -D DEFAULT_OT_OUT_GPIO=10
+                          -D DEFAULT_SENSOR_OUTDOOR_GPIO=0
+                          -D DEFAULT_SENSOR_INDOOR_GPIO=1
+                          -D DEFAULT_STATUS_LED_GPIO=4
+                          -D DEFAULT_OT_RX_LED_GPIO=5
 
 [env:nodemcu_32]
-platform = ${esp32_defaults.platform}
-platform_packages = ${esp32_defaults.platform_packages}
-board = nodemcu-32s
-board_build.partitions = ${esp32_defaults.board_build.partitions}
-lib_deps = 
-	${esp32_defaults.lib_deps}
-	${esp32_defaults.nimble_lib}
-lib_ignore = ${esp32_defaults.lib_ignore}
-extra_scripts = ${esp32_defaults.extra_scripts}
-build_type = ${esp32_defaults.build_type}
-build_flags = 
-	${esp32_defaults.build_flags}
-	-D USE_BLE=1
-	-D DEFAULT_OT_IN_GPIO=16
-	-D DEFAULT_OT_OUT_GPIO=4
-	-D DEFAULT_SENSOR_OUTDOOR_GPIO=15
-	-D DEFAULT_SENSOR_INDOOR_GPIO=26
-	-D DEFAULT_STATUS_LED_GPIO=2
-	-D DEFAULT_OT_RX_LED_GPIO=19
-check_tool = ${esp32_defaults.check_tool}
-check_flags = ${esp32_defaults.check_flags}
+extends                 = esp32_defaults
+board                   = nodemcu-32s
+lib_deps                = ${esp32_defaults.lib_deps}
+                          ${esp32_defaults.nimble_lib}
+build_flags             = ${esp32_defaults.build_flags}
+                          -D USE_BLE=1
+                          -D DEFAULT_OT_IN_GPIO=16
+                          -D DEFAULT_OT_OUT_GPIO=4
+                          -D DEFAULT_SENSOR_OUTDOOR_GPIO=15
+                          -D DEFAULT_SENSOR_INDOOR_GPIO=26
+                          -D DEFAULT_STATUS_LED_GPIO=2
+                          -D DEFAULT_OT_RX_LED_GPIO=19
 
 [env:nodemcu_32_160mhz]
-extends = env:nodemcu_32 
-board_build.f_cpu = 160000000L ; set frequency to 160MHz
+extends                 = env:nodemcu_32 
+board_build.f_cpu       = 160000000L ; set frequency to 160MHz
 
 [env:d1_mini32]
-platform = ${esp32_defaults.platform}
-platform_packages = ${esp32_defaults.platform_packages}
-board = wemos_d1_mini32
-board_build.partitions = ${esp32_defaults.board_build.partitions}
-lib_deps = 
-	${esp32_defaults.lib_deps}
-	${esp32_defaults.nimble_lib}
-lib_ignore = ${esp32_defaults.lib_ignore}
-extra_scripts = ${esp32_defaults.extra_scripts}
-build_type = ${esp32_defaults.build_type}
-build_flags = 
-	${esp32_defaults.build_flags}
-	-D USE_BLE=1
-	-D DEFAULT_OT_IN_GPIO=21
-	-D DEFAULT_OT_OUT_GPIO=22
-	-D DEFAULT_SENSOR_OUTDOOR_GPIO=12
-	-D DEFAULT_SENSOR_INDOOR_GPIO=18
-	-D DEFAULT_STATUS_LED_GPIO=2
-	-D DEFAULT_OT_RX_LED_GPIO=19
-check_tool = ${esp32_defaults.check_tool}
-check_flags = ${esp32_defaults.check_flags}
+extends                 = esp32_defaults
+board                   = wemos_d1_mini32
+lib_deps                = ${esp32_defaults.lib_deps}
+                          ${esp32_defaults.nimble_lib}
+build_flags             = ${esp32_defaults.build_flags}
+                          -D USE_BLE=1
+                          -D DEFAULT_OT_IN_GPIO=21
+                          -D DEFAULT_OT_OUT_GPIO=22
+                          -D DEFAULT_SENSOR_OUTDOOR_GPIO=12
+                          -D DEFAULT_SENSOR_INDOOR_GPIO=18
+                          -D DEFAULT_STATUS_LED_GPIO=2
+                          -D DEFAULT_OT_RX_LED_GPIO=19
 
 [env:esp32_c6]
-platform = ${esp32_defaults.platform}
-framework = arduino, espidf
-platform_packages = ${esp32_defaults.platform_packages}
-board = esp32-c6-devkitm-1
-board_build.partitions = ${esp32_defaults.board_build.partitions}
-board_build.embed_txtfiles = 
-	managed_components/espressif__esp_insights/server_certs/https_server.crt
-	managed_components/espressif__esp_rainmaker/server_certs/rmaker_mqtt_server.crt
-	managed_components/espressif__esp_rainmaker/server_certs/rmaker_claim_service_server.crt
-	managed_components/espressif__esp_rainmaker/server_certs/rmaker_ota_server.crt
-lib_deps = ${esp32_defaults.lib_deps}
-lib_ignore = 
-	${esp32_defaults.lib_ignore}
-extra_scripts = ${esp32_defaults.extra_scripts}
-build_unflags = 
-	-mtext-section-literals
-build_type = ${esp32_defaults.build_type}
-build_flags = 
-	${esp32_defaults.build_flags}
-	-D USE_BLE=1
-	-D DEFAULT_OT_IN_GPIO=15
-	-D DEFAULT_OT_OUT_GPIO=23
-	-D DEFAULT_SENSOR_OUTDOOR_GPIO=0
-	-D DEFAULT_SENSOR_INDOOR_GPIO=0
-	-D DEFAULT_STATUS_LED_GPIO=11
-	-D DEFAULT_OT_RX_LED_GPIO=10
-check_tool = ${esp32_defaults.check_tool}
-check_flags = ${esp32_defaults.check_flags}
+extends                 = esp32_defaults
+board                   = esp32-c6-devkitc-1
+lib_deps                = ${esp32_defaults.lib_deps}
+                          ${esp32_defaults.nimble_lib}
+;build_unflags           = -mtext-section-literals
+build_flags             = ${esp32_defaults.build_flags}
+                          -D USE_BLE=1
+                          -D DEFAULT_OT_IN_GPIO=15
+                          -D DEFAULT_OT_OUT_GPIO=23
+                          -D DEFAULT_SENSOR_OUTDOOR_GPIO=0
+                          -D DEFAULT_SENSOR_INDOOR_GPIO=0
+                          -D DEFAULT_STATUS_LED_GPIO=11
+                          -D DEFAULT_OT_RX_LED_GPIO=10
+custom_sdkconfig        = '# CONFIG_OPENTHREAD_ENABLED is not set'
+                          '# CONFIG_ESP_WIFI_ENTERPRISE_SUPPORT is not set'
+                          '# CONFIG_LWIP_IPV6 is not set'
+                          '# CONFIG_LWIP_IPV6_AUTOCONFIG is not set'
+                          '# CONFIG_LWIP_PPP_SUPPORT is not set'
 
 [env:otthing]
-platform = ${esp32_defaults.platform}
-platform_packages = ${esp32_defaults.platform_packages}
-board = lolin_c3_mini
-board_build.partitions = ${esp32_defaults.board_build.partitions}
-lib_deps = 
-	${esp32_defaults.lib_deps}
-	${esp32_defaults.nimble_lib}
-lib_ignore = ${esp32_defaults.lib_ignore}
-extra_scripts = ${esp32_defaults.extra_scripts}
-build_unflags = 
-	-mtext-section-literals
-build_type = ${esp32_defaults.build_type}
-build_flags = 
-	${esp32_defaults.build_flags}
-	-D MYNEWT_VAL_BLE_EXT_ADV=1
-	-D USE_BLE=1
-	-D DEFAULT_OT_IN_GPIO=3
-	-D DEFAULT_OT_OUT_GPIO=1
-;	-D DEFAULT_SENSOR_OUTDOOR_GPIO=0
-;	-D DEFAULT_SENSOR_INDOOR_GPIO=1
-	-D DEFAULT_STATUS_LED_GPIO=8
-	-D DEFAULT_OT_RX_LED_GPIO=2
-	-D OT_BYPASS_RELAY_GPIO=20
-check_tool = ${esp32_defaults.check_tool}
-check_flags = ${esp32_defaults.check_flags}
+extends                 = esp32_defaults
+board                   = lolin_c3_mini
+lib_deps                = ${esp32_defaults.lib_deps}
+                          ${esp32_defaults.nimble_lib}
+;build_unflags           = -mtext-section-literals
+build_flags             = ${esp32_defaults.build_flags}
+                          -D MYNEWT_VAL_BLE_EXT_ADV=1
+                          -D USE_BLE=1
+                          -D DEFAULT_OT_IN_GPIO=3
+                          -D DEFAULT_OT_OUT_GPIO=1
+                          ;-D DEFAULT_SENSOR_OUTDOOR_GPIO=0
+                          ;-D DEFAULT_SENSOR_INDOOR_GPIO=1
+                          -D DEFAULT_STATUS_LED_GPIO=8
+                          -D DEFAULT_OT_RX_LED_GPIO=2
+                          -D OT_BYPASS_RELAY_GPIO=20

sdkconfig.defaults

@@ -1,33 +0,0 @@
-# Source:
-# https://github.com/pioarduino/platform-espressif32/tree/main/examples/espidf-arduino-h2zero-BLE_scan
-
-CONFIG_FREERTOS_HZ=1000
-CONFIG_MBEDTLS_PSK_MODES=y
-CONFIG_MBEDTLS_KEY_EXCHANGE_PSK=y
-CONFIG_BOOTLOADER_COMPILER_OPTIMIZATION_SIZE=y
-CONFIG_COMPILER_OPTIMIZATION_SIZE=y
-CONFIG_ESPTOOLPY_FLASHSIZE_4MB=y
-CONFIG_ESPTOOLPY_HEADER_FLASHSIZE_UPDATE=y
-
-#
-# BT config
-CONFIG_BT_ENABLED=y
-CONFIG_BTDM_CTRL_MODE_BLE_ONLY=y
-CONFIG_BTDM_CTRL_MODE_BR_EDR_ONLY=n
-CONFIG_BTDM_CTRL_MODE_BTDM=n
-CONFIG_BT_BLUEDROID_ENABLED=n
-CONFIG_BT_NIMBLE_ENABLED=y
-
-#
-# Arduino Configuration
-CONFIG_AUTOSTART_ARDUINO=y
-CONFIG_ARDUINO_SELECTIVE_COMPILATION=y
-CONFIG_ARDUINO_SELECTIVE_Zigbee=n
-CONFIG_ARDUINO_SELECTIVE_Matter=n
-CONFIG_ARDUINO_SELECTIVE_WiFiProv=n
-CONFIG_ARDUINO_SELECTIVE_BLE=n
-CONFIG_ARDUINO_SELECTIVE_BluetoothSerial=n
-CONFIG_ARDUINO_SELECTIVE_SimpleBLE=n
-CONFIG_ARDUINO_SELECTIVE_RainMaker=n
-CONFIG_ARDUINO_SELECTIVE_OpenThread=n
-CONFIG_ARDUINO_SELECTIVE_Insights=n

secrets.default.ini

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

src/HaHelper.h

@@ -176,9 +176,10 @@ public:
       objId.c_str()
     );
 
-    // set device class, name, value template for bluetooth sensors
+    // set device class, name, value template for Bluetooth/DHT sensors
     // or name & value template for another sensors
-    if (sSensor.type == Sensors::Type::BLUETOOTH) {
+    if (sSensor.type == Sensors::Type::BLUETOOTH ||
+        sSensor.type == Sensors::Type::DHT11 || sSensor.type == Sensors::Type::DHT22) {
       // available state topic
       doc[FPSTR(HA_AVAILABILITY)][1][FPSTR(HA_TOPIC)] = doc[FPSTR(HA_STATE_TOPIC)];
       doc[FPSTR(HA_AVAILABILITY)][1][FPSTR(HA_VALUE_TEMPLATE)] = JsonString(AVAILABILITY_SENSOR_CONN, true);

src/MainTask.h

@@ -6,7 +6,6 @@ extern NetworkMgr* network;
 extern MqttTask* tMqtt;
 extern OpenThermTask* tOt;
 extern FileData fsNetworkSettings, fsSettings, fsSensorsSettings;
-extern ESPTelnetStream* telnetStream;
 
 
 class MainTask : public Task {
@@ -40,7 +39,6 @@ protected:
   PumpStartReason extPumpStartReason = PumpStartReason::NONE;
   unsigned long externalPumpStartTime = 0;
   bool ntpStarted = false;
-  bool telnetStarted = false;
   bool emergencyDetected = false;
   unsigned long emergencyFlipTime = 0;
 
@@ -49,6 +47,10 @@ protected:
     return "Main";
   }
 
+  uint32_t getTaskStackSize() override {
+    return 6000;
+  }
+
   /*BaseType_t getTaskCore() override {
     return 1;
   }*/
@@ -104,9 +106,9 @@ protected:
     vars.network.connected = network->isConnected();
     vars.network.rssi = network->isConnected() ? WiFi.RSSI() : 0;
 
-    if (settings.system.logLevel >= TinyLogger::Level::SILENT && settings.system.logLevel <= TinyLogger::Level::VERBOSE) {
+    if (settings.system.logLevel >= TinyLoggerLevel::SILENT && settings.system.logLevel <= TinyLoggerLevel::VERBOSE) {
       if (Log.getLevel() != settings.system.logLevel) {
-        Log.setLevel(static_cast<TinyLogger::Level>(settings.system.logLevel));
+        Log.setLevel(static_cast<TinyLoggerLevel>(settings.system.logLevel));
       }
     }
 
@@ -121,11 +123,6 @@ protected:
         }
       }
 
-      if (!this->telnetStarted && telnetStream != nullptr) {
-        telnetStream->begin(23, false);
-        this->telnetStarted = true;
-      }
-
       if (settings.mqtt.enabled && !tMqtt->isEnabled()) {
         tMqtt->enable();
 
@@ -138,11 +135,6 @@ protected:
         this->ntpStarted = false;
       }
 
-      if (this->telnetStarted) {
-        telnetStream->stop();
-        this->telnetStarted = false;
-      }
-
       if (tMqtt->isEnabled()) {
         tMqtt->disable();
       }
@@ -156,23 +148,10 @@ protected:
     }
     this->ledStatus();
 
-    // telnet
-    if (this->telnetStarted) {
-      this->yield();
-      telnetStream->loop();
-      this->yield();
-    }
-
 
     // anti memory leak
-    for (Stream* stream : Log.getStreams()) {
-      while (stream->available() > 0) {
-        stream->read();
-
-        #ifdef ARDUINO_ARCH_ESP8266
-        ::optimistic_yield(1000);
-        #endif
-      }
+    while (Serial.available() > 0) {
+      Serial.read();
     }
 
     // heap info
@@ -211,7 +190,7 @@ protected:
       vars.states.restarting = true;
     }
 
-    if (settings.system.logLevel < TinyLogger::Level::VERBOSE) {
+    if (settings.system.logLevel < TinyLoggerLevel::VERBOSE) {
       return;
     }
 
@@ -246,7 +225,7 @@ protected:
       uint8_t availableSensors = 0;
 
       if (Sensors::existsConnectedSensorsByPurpose(Sensors::Purpose::INDOOR_TEMP)) {
-        auto value = Sensors::getMeanValueByPurpose(Sensors::Purpose::INDOOR_TEMP, Sensors::ValueType::PRIMARY);
+        auto value = Sensors::getMeanValueByPurpose(Sensors::Purpose::INDOOR_TEMP, Sensors::ValueType::PRIMARY, settings.heating.indoorTempAvgType);
         if (value < lowTemp) {
           lowTemp = value;
         }

src/MqttTask.h

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

src/OpenThermTask.h

@@ -38,8 +38,12 @@ protected:
     return "OpenTherm";
   }
 
+  uint32_t getTaskStackSize() override {
+    return 7500;
+  }
+  
   BaseType_t getTaskCore() override {
-    return 1;
+    return 0;
   }
 
   int getTaskPriority() override {

src/RegulatorTask.h

@@ -20,6 +20,10 @@ protected:
     return "Regulator";
   }
 
+  uint32_t getTaskStackSize() override {
+    return 5000;
+  }
+  
   /*BaseType_t getTaskCore() override {
     return 1;
   }*/

src/Sensors.h

@@ -39,6 +39,8 @@ public:
     NTC_10K_TEMP            = 50,
     DALLAS_TEMP             = 51,
     BLUETOOTH               = 52,
+    DHT11                   = 53,
+    DHT22                   = 54,
 
     HEATING_SETPOINT_TEMP   = 253,
     MANUAL                  = 254,
@@ -75,6 +77,12 @@ public:
     RSSI        = 3
   };
 
+  enum class AverageType : uint8_t {
+    MEAN    = 0,
+    MINIMUM = 1,
+    MAXIMUM = 2
+  };
+
   typedef struct {
     bool enabled = false;
     char name[33];
@@ -328,38 +336,61 @@ public:
     return updated;
   }
 
-  static float getMeanValueByPurpose(Purpose purpose, const ValueType valueType, bool onlyConnected = true) {
+  static float getMeanValueByPurpose(Purpose purpose, const ValueType valueType, const AverageType avgType = AverageType::MEAN, const bool onlyConnected = true, const float defaultValue = NAN) {
     if (settings == nullptr || results == nullptr) {
-      return 0.0f;
+      return defaultValue;
     }
 
     uint8_t valueId = (uint8_t) valueType;
     if (!isValidValueId(valueId)) {
-      return 0.0f;
+      return defaultValue;
     }
     
     float value = 0.0f;
     uint8_t amount = 0;
 
-    for (uint8_t id = 0; id <= getMaxSensorId(); id++) {
-      auto& sSensor = settings[id];
-      auto& rSensor = results[id];
+    if (avgType == AverageType::MEAN) {
+      float sum = 0.0f;
+      for (uint8_t id = 0; id <= getMaxSensorId(); id++) {
+        auto& sSensor = settings[id];
+        auto& rSensor = results[id];
 
-      if (sSensor.purpose == purpose && (!onlyConnected || rSensor.connected)) {
-        value += rSensor.values[valueId];
-        amount++;
+        if (sSensor.purpose == purpose && (!onlyConnected || rSensor.connected)) {
+          sum += rSensor.values[valueId];
+          amount++;
+        }
+      }
+
+      value = amount == 1 ? sum : (sum / amount);
+
+    } else if (avgType == AverageType::MINIMUM) {
+      for (uint8_t id = 0; id <= getMaxSensorId(); id++) {
+        auto& sSensor = settings[id];
+        auto& rSensor = results[id];
+
+        if (sSensor.purpose == purpose && (!onlyConnected || rSensor.connected)) {
+          if (amount == 0 || rSensor.values[valueId] < value) {
+            value = rSensor.values[valueId];
+            amount++;
+          }
+        }
+      }
+
+    } else if (avgType == AverageType::MAXIMUM) {
+      for (uint8_t id = 0; id <= getMaxSensorId(); id++) {
+        auto& sSensor = settings[id];
+        auto& rSensor = results[id];
+
+        if (sSensor.purpose == purpose && (!onlyConnected || rSensor.connected)) {
+          if (amount == 0 || rSensor.values[valueId] > value) {
+            value = rSensor.values[valueId];
+            amount++;
+          }
+        }
       }
     }
 
-    if (!amount) {
-      return 0.0f;
-      
-    } else if (amount == 1) {
-      return value;
-
-    } else {
-      return value / amount;
-    }
+    return amount > 0 ? value : defaultValue;
   }
 
   static bool existsConnectedSensorsByPurpose(Purpose purpose) {

src/Settings.h

@@ -32,9 +32,8 @@ struct Settings {
     } serial;
 
     struct {
-      bool enabled = DEFAULT_TELNET_ENABLED;
-      unsigned short port = DEFAULT_TELNET_PORT;
-    } telnet;
+      bool enabled = DEFAULT_WEBSERIAL_ENABLED;
+    } webSerial;
 
     struct {
       char server[49] = "pool.ntp.org";
@@ -108,6 +107,8 @@ struct Settings {
     uint8_t minTemp = DEFAULT_HEATING_MIN_TEMP;
     uint8_t maxTemp = DEFAULT_HEATING_MAX_TEMP;
     uint8_t maxModulation = 100;
+    Sensors::AverageType indoorTempAvgType = Sensors::AverageType::MEAN;
+    Sensors::AverageType outdoorTempAvgType = Sensors::AverageType::MEAN;
 
     struct {
       bool enabled = true;

src/defines.h

@@ -30,6 +30,10 @@
   #define BUILD_VERSION                 "0.0.0"
 #endif
 
+#ifndef BUILD_COMMIT
+  #define BUILD_COMMIT                  "undefined"
+#endif
+
 #ifndef BUILD_ENV
   #define BUILD_ENV                     "undefined"
 #endif
@@ -42,12 +46,8 @@
   #define DEFAULT_SERIAL_BAUD 115200
 #endif
 
-#ifndef DEFAULT_TELNET_ENABLED
-  #define DEFAULT_TELNET_ENABLED true
-#endif
-
-#ifndef DEFAULT_TELNET_PORT
-  #define DEFAULT_TELNET_PORT 23
+#ifndef DEFAULT_WEBSERIAL_ENABLED
+  #define DEFAULT_WEBSERIAL_ENABLED true
 #endif
 
 #ifndef USE_BLE
@@ -75,7 +75,7 @@
 #endif
 
 #ifndef DEFAULT_LOG_LEVEL
-  #define DEFAULT_LOG_LEVEL TinyLogger::Level::VERBOSE
+  #define DEFAULT_LOG_LEVEL TinyLoggerLevel::VERBOSE
 #endif
 
 #ifndef DEFAULT_STATUS_LED_GPIO

src/idf_component.yml

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

src/main.cpp

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

src/strings.h

@@ -24,6 +24,7 @@ const char L_OT_CH2[]                               PROGMEM = "OT.CH2";
 const char L_SENSORS[]                              PROGMEM = "SENSORS";
 const char L_SENSORS_SETTINGS[]                     PROGMEM = "SENSORS.SETTINGS";
 const char L_SENSORS_DALLAS[]                       PROGMEM = "SENSORS.DALLAS";
+const char L_SENSORS_DHT[]                          PROGMEM = "SENSORS.DHT";
 const char L_SENSORS_NTC[]                          PROGMEM = "SENSORS.NTC";
 const char L_SENSORS_BLE[]                          PROGMEM = "SENSORS.BLE";
 const char L_REGULATOR[]                            PROGMEM = "REGULATOR";
@@ -56,6 +57,7 @@ const char S_CHANNEL[]                              PROGMEM = "channel";
 const char S_CH2_ALWAYS_ENABLED[]                   PROGMEM = "ch2AlwaysEnabled";
 const char S_CHIP[]                                 PROGMEM = "chip";
 const char S_CODE[]                                 PROGMEM = "code";
+const char S_COMMIT[]                               PROGMEM = "commit";
 const char S_CONNECTED[]                            PROGMEM = "connected";
 const char S_CONTINUES[]                            PROGMEM = "continues";
 const char S_COOLING[]                              PROGMEM = "cooling";
@@ -113,6 +115,7 @@ const char S_IGNORE_DIAG_STATE[]                    PROGMEM = "ignoreDiagState";
 const char S_IMMERGAS_FIX[]                         PROGMEM = "immergasFix";
 const char S_ALWAYS_SEND_INDOOR_TEMP[]              PROGMEM = "alwaysSendIndoorTemp";
 const char S_INDOOR_TEMP[]                          PROGMEM = "indoorTemp";
+const char S_INDOOR_TEMP_AVG_TYPE[]                 PROGMEM = "indoorTempAvgType";
 const char S_INDOOR_TEMP_CONTROL[]                  PROGMEM = "indoorTempControl";
 const char S_IN_GPIO[]                              PROGMEM = "inGpio";
 const char S_INPUT[]                                PROGMEM = "input";
@@ -153,6 +156,7 @@ const char S_ON_LOSS_CONNECTION[]                   PROGMEM = "onLossConnection"
 const char S_OPENTHERM[]                            PROGMEM = "opentherm";
 const char S_OPTIONS[]                              PROGMEM = "options";
 const char S_OUTDOOR_TEMP[]                         PROGMEM = "outdoorTemp";
+const char S_OUTDOOR_TEMP_AVG_TYPE[]                PROGMEM = "outdoorTempAvgType";
 const char S_OUT_GPIO[]                             PROGMEM = "outGpio";
 const char S_OUTPUT[]                               PROGMEM = "output";
 const char S_OVERHEAT[]                             PROGMEM = "overheat";
@@ -166,6 +170,7 @@ const char S_POWER[]                                PROGMEM = "power";
 const char S_PREFIX[]                               PROGMEM = "prefix";
 const char S_PROTOCOL_VERSION[]                     PROGMEM = "protocolVersion";
 const char S_PURPOSE[]                              PROGMEM = "purpose";
+const char S_PSRAM[]                                PROGMEM = "psram";
 const char S_P_FACTOR[]                             PROGMEM = "p_factor";
 const char S_P_MULTIPLIER[]                         PROGMEM = "p_multiplier";
 const char S_REAL_SIZE[]                            PROGMEM = "realSize";
@@ -202,7 +207,6 @@ const char S_SYSTEM[]                               PROGMEM = "system";
 const char S_TARGET[]                               PROGMEM = "target";
 const char S_TARGET_DIFF_FACTOR[]                   PROGMEM = "targetDiffFactor";
 const char S_TARGET_TEMP[]                          PROGMEM = "targetTemp";
-const char S_TELNET[]                               PROGMEM = "telnet";
 const char S_TEMPERATURE[]                          PROGMEM = "temperature";
 const char S_THRESHOLD_HIGH[]                       PROGMEM = "thresholdHigh";
 const char S_THRESHOLD_LOW[]                        PROGMEM = "thresholdLow";
@@ -220,3 +224,4 @@ const char S_USE_DHCP[]                             PROGMEM = "useDhcp";
 const char S_USER[]                                 PROGMEM = "user";
 const char S_VALUE[]                                PROGMEM = "value";
 const char S_VERSION[]                              PROGMEM = "version";
+const char S_WEBSERIAL[]                            PROGMEM = "webSerial";

src/utils.h

@@ -425,9 +425,8 @@ void settingsToJson(const Settings& src, JsonVariant dst, bool safe = false) {
     serial[FPSTR(S_ENABLED)] = src.system.serial.enabled;
     serial[FPSTR(S_BAUDRATE)] = src.system.serial.baudrate;
 
-    auto telnet = system[FPSTR(S_TELNET)].to<JsonObject>();
-    telnet[FPSTR(S_ENABLED)] = src.system.telnet.enabled;
-    telnet[FPSTR(S_PORT)] = src.system.telnet.port;
+    auto webSerial = system[FPSTR(S_WEBSERIAL)].to<JsonObject>();
+    webSerial[FPSTR(S_ENABLED)] = src.system.webSerial.enabled;
 
     auto ntp = system[FPSTR(S_NTP)].to<JsonObject>();
     ntp[FPSTR(S_SERVER)] = src.system.ntp.server;
@@ -499,6 +498,8 @@ void settingsToJson(const Settings& src, JsonVariant dst, bool safe = false) {
   heating[FPSTR(S_MIN_TEMP)] = src.heating.minTemp;
   heating[FPSTR(S_MAX_TEMP)] = src.heating.maxTemp;
   heating[FPSTR(S_MAX_MODULATION)] = src.heating.maxModulation;
+  heating[FPSTR(S_INDOOR_TEMP_AVG_TYPE)] = static_cast<uint8_t>(src.heating.indoorTempAvgType);
+  heating[FPSTR(S_OUTDOOR_TEMP_AVG_TYPE)] = static_cast<uint8_t>(src.heating.outdoorTempAvgType);
 
   auto heatingOverheatProtection = heating[FPSTR(S_OVERHEAT_PROTECTION)].to<JsonObject>();
   heatingOverheatProtection[FPSTR(S_HIGH_TEMP)] = src.heating.overheatProtection.highTemp;
@@ -581,7 +582,7 @@ bool jsonToSettings(const JsonVariantConst src, Settings& dst, bool safe = false
     if (!src[FPSTR(S_SYSTEM)][FPSTR(S_LOG_LEVEL)].isNull()) {
       uint8_t value = src[FPSTR(S_SYSTEM)][FPSTR(S_LOG_LEVEL)].as<uint8_t>();
 
-      if (value != dst.system.logLevel && value >= TinyLogger::Level::SILENT && value <= TinyLogger::Level::VERBOSE) {
+      if (value != dst.system.logLevel && value >= TinyLoggerLevel::SILENT && value <= TinyLoggerLevel::VERBOSE) {
         dst.system.logLevel = value;
         changed = true;
       }
@@ -607,20 +608,11 @@ bool jsonToSettings(const JsonVariantConst src, Settings& dst, bool safe = false
       }
     }
 
-    if (src[FPSTR(S_SYSTEM)][FPSTR(S_TELNET)][FPSTR(S_ENABLED)].is<bool>()) {
-      bool value = src[FPSTR(S_SYSTEM)][FPSTR(S_TELNET)][FPSTR(S_ENABLED)].as<bool>();
+    if (src[FPSTR(S_SYSTEM)][FPSTR(S_WEBSERIAL)][FPSTR(S_ENABLED)].is<bool>()) {
+      bool value = src[FPSTR(S_SYSTEM)][FPSTR(S_WEBSERIAL)][FPSTR(S_ENABLED)].as<bool>();
 
-      if (value != dst.system.telnet.enabled) {
-        dst.system.telnet.enabled = value;
-        changed = true;
-      }
-    }
-
-    if (!src[FPSTR(S_SYSTEM)][FPSTR(S_TELNET)][FPSTR(S_PORT)].isNull()) {
-      unsigned short value = src[FPSTR(S_SYSTEM)][FPSTR(S_TELNET)][FPSTR(S_PORT)].as<unsigned short>();
-
-      if (value > 0 && value <= 65535 && value != dst.system.telnet.port) {
-        dst.system.telnet.port = value;
+      if (value != dst.system.webSerial.enabled) {
+        dst.system.webSerial.enabled = value;
         changed = true;
       }
     }
@@ -1403,6 +1395,42 @@ bool jsonToSettings(const JsonVariantConst src, Settings& dst, bool safe = false
     }
   }
 
+  if (!src[FPSTR(S_HEATING)][FPSTR(S_INDOOR_TEMP_AVG_TYPE)].isNull()) {
+    uint8_t value = src[FPSTR(S_HEATING)][FPSTR(S_INDOOR_TEMP_AVG_TYPE)].as<uint8_t>();
+
+    switch (value) {
+      case static_cast<uint8_t>(Sensors::AverageType::MEAN):
+      case static_cast<uint8_t>(Sensors::AverageType::MINIMUM):
+      case static_cast<uint8_t>(Sensors::AverageType::MAXIMUM):
+        if (static_cast<uint8_t>(dst.heating.indoorTempAvgType) != value) {
+          dst.heating.indoorTempAvgType = static_cast<Sensors::AverageType>(value);
+          changed = true;
+        }
+        break;
+
+      default:
+        break;
+    }
+  }
+
+  if (!src[FPSTR(S_HEATING)][FPSTR(S_OUTDOOR_TEMP_AVG_TYPE)].isNull()) {
+    uint8_t value = src[FPSTR(S_HEATING)][FPSTR(S_OUTDOOR_TEMP_AVG_TYPE)].as<uint8_t>();
+
+    switch (value) {
+      case static_cast<uint8_t>(Sensors::AverageType::MEAN):
+      case static_cast<uint8_t>(Sensors::AverageType::MINIMUM):
+      case static_cast<uint8_t>(Sensors::AverageType::MAXIMUM):
+        if (static_cast<uint8_t>(dst.heating.outdoorTempAvgType) != value) {
+          dst.heating.outdoorTempAvgType = static_cast<Sensors::AverageType>(value);
+          changed = true;
+        }
+        break;
+
+      default:
+        break;
+    }
+  }
+
   if (!src[FPSTR(S_HEATING)][FPSTR(S_OVERHEAT_PROTECTION)][FPSTR(S_HIGH_TEMP)].isNull()) {
     unsigned char value = src[FPSTR(S_HEATING)][FPSTR(S_OVERHEAT_PROTECTION)][FPSTR(S_HIGH_TEMP)].as<unsigned char>();
 
@@ -1940,6 +1968,8 @@ bool jsonToSensorSettings(const uint8_t sensorId, const JsonVariantConst src, Se
       case static_cast<uint8_t>(Sensors::Type::NTC_10K_TEMP):
       case static_cast<uint8_t>(Sensors::Type::DALLAS_TEMP):
       case static_cast<uint8_t>(Sensors::Type::BLUETOOTH):
+      case static_cast<uint8_t>(Sensors::Type::DHT11):
+      case static_cast<uint8_t>(Sensors::Type::DHT22):
       case static_cast<uint8_t>(Sensors::Type::HEATING_SETPOINT_TEMP):
       case static_cast<uint8_t>(Sensors::Type::MANUAL):
       case static_cast<uint8_t>(Sensors::Type::NOT_CONFIGURED):
@@ -1956,7 +1986,8 @@ bool jsonToSensorSettings(const uint8_t sensorId, const JsonVariantConst src, Se
 
   // gpio
   if (!src[FPSTR(S_GPIO)].isNull()) {
-    if (dst.type != Sensors::Type::DALLAS_TEMP && dst.type != Sensors::Type::NTC_10K_TEMP) {
+    if (dst.type != Sensors::Type::DALLAS_TEMP && dst.type != Sensors::Type::NTC_10K_TEMP &&
+        dst.type != Sensors::Type::DHT11 && dst.type != Sensors::Type::DHT22) {
       if (dst.gpio != GPIO_IS_NOT_CONFIGURED) {
         dst.gpio = GPIO_IS_NOT_CONFIGURED;
         changed = true;
@@ -2097,6 +2128,10 @@ void sensorResultToJson(const uint8_t sensorId, JsonVariant dst) {
     dst[FPSTR(S_BATTERY)] = roundf(rSensor.values[static_cast<uint8_t>(Sensors::ValueType::BATTERY)], 1);
     dst[FPSTR(S_RSSI)] = roundf(rSensor.values[static_cast<uint8_t>(Sensors::ValueType::RSSI)], 0);
 
+  } else if (sSensor.type == Sensors::Type::DHT11 || sSensor.type == Sensors::Type::DHT22) {
+    dst[FPSTR(S_TEMPERATURE)] = roundf(rSensor.values[static_cast<uint8_t>(Sensors::ValueType::TEMPERATURE)], 3);
+    dst[FPSTR(S_HUMIDITY)] = roundf(rSensor.values[static_cast<uint8_t>(Sensors::ValueType::HUMIDITY)], 3);
+
   } else {
     dst[FPSTR(S_VALUE)] = roundf(rSensor.values[static_cast<uint8_t>(Sensors::ValueType::PRIMARY)], 3);
   }

src_data/locales/cn.json

@@ -8,15 +8,19 @@
       "issues": "问题与反馈",
       "releases": "发行版"
     },
-    "dbm": "dBm",
-    "kw": "kW",
-    "time": {
+    "units": {
       "days": "天",
       "hours": "小时",
       "min": "分",
-      "sec": "秒"
+      "sec": "秒",
+      "dbm": "dBm",
+      "mhz": "MHz",
+      "kw": "kW",
+      "rpm": "RPM",
+      "ppm": "ppm",
+      "byte": "byte",
+      "mbyte": "MB"
     },
-
     "button": {
       "upgrade": "固件升级",
       "restart": "重启",
@@ -31,26 +35,25 @@
       "success": "成功",
       "error": "错误"
     },
-
     "index": {
       "title": "OpenTherm Gateway",
-
       "section": {
         "network": "网络",
         "system": "系统"
       },
-
       "system": {
         "build": {
           "title": "Build",
           "version": "固件版本",
+          "commit": "Commit",
           "date": "日期",
           "core": "内核版本",
           "sdk": "SDK"
         },
         "uptime": "运行时间",
         "memory": {
-          "title": "可用内存",
+          "heap": "内存 (heap)",
+          "psram": "内存 (PSRAM)",
           "maxFreeBlock": "max free block",
           "min": "min"
         },
@@ -67,26 +70,22 @@
         "lastResetReason": "上次重置原因"
       }
     },
-
     "dashboard": {
       "name": "仪表盘",
       "title": "仪表盘 - OpenTherm Gateway",
-
       "section": {
         "control": "调节",
         "states": "状态",
         "sensors": "传感器",
         "diag": "OpenTherm 诊断"
       },
-
       "thermostat": {
         "heating": "供暖",
         "dhw": "生活热水",
-        "temp.current": "当前温度",
+        "currentTemp": "当前温度",
         "enable": "启用",
         "turbo": "Turbo 模式"
       },
-
       "notify": {
         "fault": {
           "title": "锅炉报警状态已激活!",
@@ -98,7 +97,6 @@
         },
         "reset": "点击复位"
       },
-
       "states": {
         "mNetworkConnected": "网络连接状态",
         "mMqttConnected": "MQTT服务器连接状态",
@@ -106,7 +104,6 @@
         "mExtPumpState": "外置循环泵",
         "mCascadeControlInput": "Cascade 控制 (input)",
         "mCascadeControlOutput": "Cascade 控制 (output)",
-
         "sConnected": "OpenTherm 通讯状态",
         "sFlame": "火焰",
         "sCoolingActive": "制冷",
@@ -115,10 +112,10 @@
         "sFaultCode": "报警代码",
         "sDiagActive": "诊断状态",
         "sDiagCode": "诊断代码",
-        
         "mHeatEnabled": "供暖功能已启用",
         "mHeatBlocking": "供暖",
         "mHeatOverheat": "供暖超热保护",
+        "mHeatFreezing": "防冻保护",
         "sHeatActive": "供暖激活状态",
         "mHeatSetpointTemp": "供暖供水设定温度",
         "mHeatTargetTemp": "供暖供水目标温度",
@@ -126,7 +123,6 @@
         "mHeatRetTemp": "供暖回水温度",
         "mHeatIndoorTemp": "供暖，室内温度",
         "mHeatOutdoorTemp": "供暖，室外温度",
-
         "mDhwEnabled": "生活热水功能已启用",
         "mDhwOverheat": "生活热水超热保护",
         "sDhwActive": "生活热水激活",
@@ -134,7 +130,6 @@
         "mDhwCurrTemp": "生活热水当前出水温度",
         "mDhwRetTemp": "生活热水回水温度"
       },
-
       "sensors": {
         "values": {
           "temp": "温度",
@@ -144,23 +139,19 @@
         }
       }
     },
-
     "network": {
       "title": "网络 - OpenTherm Gateway",
       "name": "网络设置",
-
       "section": {
         "static": "静态设置",
         "availableNetworks": "可用网络",
         "staSettings": "WiFi 设置",
         "apSettings": "AP 设置"
       },
-
       "scan": {
         "pos": "#",
         "info": "Info"
       },
-
       "wifi": {
         "ssid": "SSID",
         "password": "密码",
@@ -168,7 +159,6 @@
         "signal": "信号强度",
         "connected": "已连接"
       },
-
       "params": {
         "hostname": "Hostname",
         "dhcp": "自动 (DHCP)",
@@ -178,16 +168,15 @@
         "gateway": "网关",
         "dns": "DNS 服务器"
       },
-
       "sta": {
-        "channel.note": "自动选择设置为0"
+        "channel": {
+          "note": "自动选择设置为0"
+        }
       }
     },
-
     "sensors": {
       "title": "传感器设置 - OpenTherm Gateway",
       "name": "传感器设置",
-
       "enabled": "启用",
       "sensorName": {
         "title": "传感器名称",
@@ -244,10 +233,11 @@
         "otHeatingPumpHours": "OpenTherm, number of pump operating hours (heating)",
         "otDhwPumpHours": "OpenTherm, number of pump operating hours (DHW)",
         "otCoolingHours": "OpenTherm, number of cooling hours",
-        
         "ntcTemp": "NTC 传感器",
         "dallasTemp": "DALLAS 传感器",
         "bluetooth": "BLE 传感器",
+        "dht11": "DHT11 传感器",
+        "dht22": "DHT22 传感器",
         "heatSetpointTemp": "Heating, setpoint temp",
         "manual": "通过 MQTT/API 手动配置",
         "notConfigured": "未配置"
@@ -274,11 +264,9 @@
         }
       }
     },
-
     "settings": {
       "title": "设置 - OpenTherm Gateway",
       "name": "设置",
-
       "section": {
         "portal": "Portal 设置",
         "system": "系统设置",
@@ -293,18 +281,21 @@
         "extPump": "外置循环泵设置",
         "cascadeControl": "Cascade 级联控制设置"
       },
-
       "enable": "启用",
       "note": {
         "restart": "更改这些设置后，必须重启设备以使变更生效",
         "blankNotUse": "空白 - 未使用",
         "bleDevice": "BLE设备仅支持搭载BLE功能的特定ESP32开发板使用!"
       },
-
       "temp": {
         "min": "最低温度",
         "max": "最高温度"
       },
+      "avgType": {
+        "mean": "平均温度",
+        "min": "最低温度",
+        "max": "最高温度"
+      },
       "maxModulation": "最大调制范围",
       "ohProtection": {
         "title": "超温保护",
@@ -330,14 +321,12 @@
           "note": "强制开启加热的阈值"
         }
       },
-
       "portal": {
         "login": "登录",
         "password": "密码",
         "auth": "需身份验证",
         "mdns": "使用 mDNS"
       },
-
       "system": {
         "unit": "单位",
         "metric": "公制 <small>(摄氏度、升、巴)</small>",
@@ -348,12 +337,8 @@
           "enable": "启用串口",
           "baud": "串口波特率"
         },
-        "telnet": {
-          "enable": "启用 Telnet",
-          "port": {
-            "title": "Telnet 端口",
-            "note": "默认值：23"
-          }
+        "webSerial": {
+          "enable": "启用 WebSerial"
         },
         "ntp": {
           "server": "NTP服务器",
@@ -361,7 +346,6 @@
           "timezonePresets": "选择预设配置..."
         }
       },
-
       "heating": {
         "hyst": {
           "title": "滞回",
@@ -373,19 +357,24 @@
             "set0target": "设置空目标"
           }
         },
-        "turboFactor": "Turbo 模式系数"
+        "turboFactor": "Turbo 模式系数",
+        "indoorTempAvgType": {
+          "title": "室内温度平均类型",
+          "desc": "使用两个或更多室内温度传感器时可能有用（使用 «Equitherm» 和/或 «PID» 时）。"
+        },
+        "outdoorTempAvgType": {
+          "title": "室外温度平均类型",
+          "desc": "使用两个或更多室外温度传感器时可能有用（使用 «Equitherm» 时）。"
+        }
       },
-
       "emergency": {
-        "desc": "紧急模式会在以下情况自动激活（当PID或气候补偿无法计算热媒设定值时）：<br />启用气候补偿但室外温度传感器断开连接；<br />启用PID或 OpenTherm 选项中启用<i>原生供暖控制</i>但室内温度传感器断开连接。<br /><b>注意：</b> 网络故障或MQTT 服务器连接故障时，类型为<i>通过MQTT/API手动控制<i>的传感器将显示为断开连接状态。",
-        
+        "desc": "紧急模式会在以下情况自动激活（当PID或气候补偿无法计算热媒设定值时）：<br />启用气候补偿但室外温度传感器断开连接；<br />启用PID或 OpenTherm 选项中启用<i>原生供暖控制</i>但室内温度传感器断开连接。<br /><b>注意：</b> 网络故障或MQTT 服务器连接故障时，类型为<i>通过MQTT/API手动控制</i>的传感器将显示为断开连接状态。",
         "target": {
           "title": "目标温度",
           "note": "<b>重要提示：</b> 若启用OpenTherm选项 <i>«原生供暖控制»</i>，此处设定值为<u>目标室内温度</u>；<br />其他所有情况下，此处设定值为 <u>目标热媒出水温度</u>."
         },
         "treshold": "阈值时间 <small>(秒)</small>"
       },
-
       "equitherm": {
         "slope": {
           "title": "斜率",
@@ -409,7 +398,6 @@
           "outdoorTemp": "室外温度"
         }
       },
-
       "pid": {
         "p": "P 系数",
         "i": "I 系数",
@@ -429,7 +417,6 @@
           "thresholdLow": "Threshold low"
         }
       },
-
       "ot": {
         "advanced": "高级设置",
         "inGpio": "In GPIO",
@@ -443,9 +430,8 @@
         },
         "maxPower": {
           "title": "最大锅炉功率 <small>(kW)</small>",
-          "note": "<b>0</b> - 自动检测，通常在锅炉参数设置中的\"最大有效热输出\"。 "
+          "note": "<b>0</b> - 自动检测，通常在锅炉参数设置中的\"最大有效热输出\"。"
         },
-
         "options": {
           "title": "选项（附加设置）",
           "desc": "附加设置选项可调整锅炉的运行逻辑。由于协议未完整记录所有选项，同一选项在不同锅炉上可能产生不同效果。<br /><b>注意：</b>若系统运行正常，无需修改设置。",
@@ -467,13 +453,11 @@
           "immergasFix": "针对Immergas锅炉的兼容性修复",
           "alwaysSendIndoorTemp": "向锅炉发送当前室内温度"
         },
-
         "nativeOTC": {
           "title": "原生热载体温度计算模式",
           "note": "仅在锅炉处于 OTC 模式时<u>才</u>工作：需要并接受目标室内温度，并基于内置曲线模式自行调节热载体温度。与 PID 和 Equitherm 不兼容。"
         }
       },
-
       "mqtt": {
         "homeAssistantDiscovery": "Home Assistant 自动发现",
         "server": "服务器地址",
@@ -483,7 +467,6 @@
         "prefix": "Prefix 前缀",
         "interval": "发布间隔 <small>(秒)</small>"
       },
-
       "extPump": {
         "use": "使用外置循环泵",
         "gpio": "继电器 GPIO引脚",
@@ -492,7 +475,6 @@
         "antiStuckInterval": "防卡死间隔时间<small>(天)</small>",
         "antiStuckTime": "防卡死运行时长<small>(分钟)</small>"
       },
-
       "cascadeControl": {
         "input": {
           "desc": "仅当另一台锅炉发生故障时启用本锅炉加热。另一台锅炉的控制器需在故障发生时切换GPIO输入状态以触发本功能。",
@@ -516,23 +498,23 @@
         }
       }
     },
-
     "upgrade": {
       "title": "固件升级 - OpenTherm Gateway",
       "name": "固件升级",
-
       "section": {
-        "backupAndRestore": "备份与恢复",
-        "backupAndRestore.desc": "本功能支持备份和恢复全部设置",
-        "upgrade": "升级",
-        "upgrade.desc": "本模块支持升级设备的固件与系统文件。<br />可从以下地址下载最新版本 <a href=\"https://github.com/Laxilef/OTGateway/releases\" target=\"_blank\">Releases page</a> 。" 
+        "backupAndRestore": {
+          "title": "备份与恢复",
+          "desc": "本功能支持备份和恢复全部设置"
+        },
+        "upgrade": {
+          "title": "升级",
+          "desc": "本模块支持升级设备的固件与系统文件。<br />可从以下地址下载最新版本 <a href=\"https://github.com/Laxilef/OTGateway/releases\" target=\"_blank\">Releases page</a> 。"
+        }
       },
-
       "note": {
         "disclaimer1": "升级系统文件成功后，所有设置将恢复为默认值！升级前请务必备份配置。",
         "disclaimer2": "升级成功后，设备将在15秒后自动重启。"
       },
-
       "settingsFile": "设置文件",
       "fw": "Firmware",
       "fs": "Filesystem"

src_data/locales/en.json

@@ -8,15 +8,19 @@
       "issues": "Issues & questions",
       "releases": "Releases"
     },
-    "dbm": "dBm",
-    "kw": "kW",
-    "time": {
+    "units": {
       "days": "d.",
       "hours": "h.",
       "min": "min.",
-      "sec": "sec."
+      "sec": "sec.",
+      "dbm": "dBm",
+      "mhz": "MHz",
+      "kw": "kW",
+      "rpm": "RPM",
+      "ppm": "ppm",
+      "byte": "byte",
+      "mbyte": "MB"
     },
-
     "button": {
       "upgrade": "Upgrade",
       "restart": "Restart",
@@ -31,26 +35,25 @@
       "success": "Success",
       "error": "Error"
     },
-
     "index": {
       "title": "OpenTherm Gateway",
-
       "section": {
         "network": "Network",
         "system": "System"
       },
-
       "system": {
         "build": {
           "title": "Build",
           "version": "Version",
+          "commit": "Commit",
           "date": "Date",
           "core": "Core",
           "sdk": "SDK"
         },
         "uptime": "Uptime",
         "memory": {
-          "title": "Free memory",
+          "heap": "Memory (heap)",
+          "psram": "Memory (PSRAM)",
           "maxFreeBlock": "max free block",
           "min": "min"
         },
@@ -67,26 +70,22 @@
         "lastResetReason": "Last reset reason"
       }
     },
-
     "dashboard": {
       "name": "Dashboard",
       "title": "Dashboard - OpenTherm Gateway",
-
       "section": {
         "control": "Control",
         "states": "States",
         "sensors": "Sensors",
         "diag": "OpenTherm diagnostic"
       },
-
       "thermostat": {
         "heating": "Heating",
         "dhw": "DHW",
-        "temp.current": "Current",
+        "currentTemp": "Current",
         "enable": "Enable",
         "turbo": "Turbo mode"
       },
-
       "notify": {
         "fault": {
           "title": "Boiler Fault state is active!",
@@ -98,7 +97,6 @@
         },
         "reset": "Try reset"
       },
-
       "states": {
         "mNetworkConnected": "Network connection",
         "mMqttConnected": "MQTT connection",
@@ -106,7 +104,6 @@
         "mExtPumpState": "External pump",
         "mCascadeControlInput": "Cascade control (input)",
         "mCascadeControlOutput": "Cascade control (output)",
-
         "sConnected": "OpenTherm connection",
         "sFlame": "Flame",
         "sCoolingActive": "Cooling",
@@ -115,7 +112,6 @@
         "sFaultCode": "Fault code",
         "sDiagActive": "Diagnostic",
         "sDiagCode": "Diagnostic code",
-        
         "mHeatEnabled": "Heating enabled",
         "mHeatBlocking": "Heating blocked",
         "mHeatOverheat": "Heating overheat",
@@ -127,7 +123,6 @@
         "mHeatRetTemp": "Heating return temp",
         "mHeatIndoorTemp": "Heating, indoor temp",
         "mHeatOutdoorTemp": "Heating, outdoor temp",
-
         "mDhwEnabled": "DHW enabled",
         "mDhwOverheat": "DHW overheat",
         "sDhwActive": "DHW active",
@@ -135,7 +130,6 @@
         "mDhwCurrTemp": "DHW current temp",
         "mDhwRetTemp": "DHW return temp"
       },
-
       "sensors": {
         "values": {
           "temp": "Temperature",
@@ -145,23 +139,19 @@
         }
       }
     },
-
     "network": {
       "title": "Network - OpenTherm Gateway",
       "name": "Network settings",
-
       "section": {
         "static": "Static settings",
         "availableNetworks": "Available networks",
         "staSettings": "WiFi settings",
         "apSettings": "AP settings"
       },
-
       "scan": {
         "pos": "#",
         "info": "Info"
       },
-
       "wifi": {
         "ssid": "SSID",
         "password": "Password",
@@ -169,7 +159,6 @@
         "signal": "Signal",
         "connected": "Connected"
       },
-
       "params": {
         "hostname": "Hostname",
         "dhcp": "Use DHCP",
@@ -179,16 +168,15 @@
         "gateway": "Gateway",
         "dns": "DNS"
       },
-
       "sta": {
-        "channel.note": "set 0 for auto select"
+        "channel": {
+          "note": "set 0 for auto select"
+        }
       }
     },
-
     "sensors": {
       "title": "Sensors settings - OpenTherm Gateway",
       "name": "Sensors settings",
-
       "enabled": "Enabled",
       "sensorName": {
         "title": "Sensor name",
@@ -245,10 +233,11 @@
         "otHeatingPumpHours": "OpenTherm, number of pump operating hours (heating)",
         "otDhwPumpHours": "OpenTherm, number of pump operating hours (DHW)",
         "otCoolingHours": "OpenTherm, number of cooling hours",
-        
         "ntcTemp": "NTC sensor",
         "dallasTemp": "DALLAS sensor",
         "bluetooth": "BLE sensor",
+        "dht11": "DHT11 sensor",
+        "dht22": "DHT22 sensor",
         "heatSetpointTemp": "Heating, setpoint temp",
         "manual": "Manual via MQTT/API",
         "notConfigured": "Not configured"
@@ -275,11 +264,9 @@
         }
       }
     },
-
     "settings": {
       "title": "Settings - OpenTherm Gateway",
       "name": "Settings",
-
       "section": {
         "portal": "Portal settings",
         "system": "System settings",
@@ -294,18 +281,21 @@
         "extPump": "External pump settings",
         "cascadeControl": "Cascade control settings"
       },
-
       "enable": "Enable",
       "note": {
         "restart": "After changing these settings, the device must be restarted for the changes to take effect.",
         "blankNotUse": "blank - not use",
         "bleDevice": "BLE device can be used <u>only</u> with some ESP32 boards with BLE support!"
       },
-
       "temp": {
         "min": "Minimum temperature",
         "max": "Maximum temperature"
       },
+      "avgType": {
+        "mean": "Mean temperature",
+        "min": "Minimum temperature",
+        "max": "Maximum temperature"
+      },
       "maxModulation": "Max modulation level",
       "ohProtection": {
         "title": "Overheating protection",
@@ -331,14 +321,12 @@
           "note": "Threshold when heating is forced to turn on"
         }
       },
-
       "portal": {
         "login": "Login",
         "password": "Password",
         "auth": "Require authentication",
         "mdns": "Use mDNS"
       },
-
       "system": {
         "unit": "Unit system",
         "metric": "Metric <small>(celsius, liters, bar)</small>",
@@ -349,12 +337,8 @@
           "enable": "Enabled Serial port",
           "baud": "Serial port baud rate"
         },
-        "telnet": {
-          "enable": "Enabled Telnet",
-          "port": {
-            "title": "Telnet port",
-            "note": "Default: 23"
-          }
+        "webSerial": {
+          "enable": "Enabled WebSerial"
         },
         "ntp": {
           "server": "NTP server",
@@ -362,7 +346,6 @@
           "timezonePresets": "Select preset..."
         }
       },
-
       "heating": {
         "hyst": {
           "title": "Hysteresis",
@@ -374,19 +357,24 @@
             "set0target": "Set null target"
           }
         },
-        "turboFactor": "Turbo mode coeff."
+        "turboFactor": "Turbo mode coeff.",
+        "indoorTempAvgType": {
+          "title": "Indoor temp. averaging type",
+          "desc": "May be useful when using two or more indoor temp. sensors (when using «Equitherm» and/or «PID»)."
+        },
+        "outdoorTempAvgType": {
+          "title": "Outdoor temp. averaging type",
+          "desc": "May be useful when using two or more outdoor temp. sensors (when using «Equitherm»)."
+        }
       },
-
       "emergency": {
         "desc": "Emergency mode is activated automatically when «PID» or «Equitherm» cannot calculate the heat carrier setpoint:<br />- if «Equitherm» is enabled and the outdoor temperature sensor is disconnected;<br />- if «PID» or OT option <i>«Native heating control»</i> is enabled and the indoor temperature sensor is disconnected.<br /><b>Note:</b> On network fault or MQTT fault, sensors with <i>«Manual via MQTT/API»</i> type will be in DISCONNECTED state.",
-        
         "target": {
           "title": "Target temperature",
           "note": "<b>Important:</b> <u>Target indoor temperature</u> if OT option <i>«Native heating control»</i> is enabled.<br />In all other cases, the <u>target heat carrier temperature</u>."
         },
         "treshold": "Treshold time <small>(sec)</small>"
       },
-
       "equitherm": {
         "slope": {
           "title": "Slope",
@@ -410,7 +398,6 @@
           "outdoorTemp": "Outdoor temperature"
         }
       },
-
       "pid": {
         "p": "P factor",
         "i": "I factor",
@@ -430,7 +417,6 @@
           "thresholdLow": "Threshold low"
         }
       },
-
       "ot": {
         "advanced": "Advanced Settings",
         "inGpio": "In GPIO",
@@ -446,7 +432,6 @@
           "title": "Max boiler power <small>(kW)</small>",
           "note": "<b>0</b> - try detect automatically. Typically found in the boiler specification as \"maximum useful heat output\"."
         },
-
         "options": {
           "title": "Options (additional settings)",
           "desc": "Options can change the logic of the boiler. Not all options are documented in the protocol, so the same option can have different effects on different boilers.<br /><b>Note:</b> There is no need to change anything if everything works well.",
@@ -468,13 +453,11 @@
           "immergasFix": "Fix for Immergas boilers",
           "alwaysSendIndoorTemp": "Send current indoor temp to boiler"
         },
-
         "nativeOTC": {
           "title": "Native OTC mode",
           "note": "Works <u>ONLY</u> if the boiler is in OTC mode: requires and accepts the target indoor temperature and self-regulates the heat carrier temperature based on the built-in curves mode. Incompatible with PID and Equitherm."
         }
       },
-
       "mqtt": {
         "homeAssistantDiscovery": "Home Assistant Discovery",
         "server": "Server",
@@ -484,7 +467,6 @@
         "prefix": "Prefix",
         "interval": "Publish interval <small>(sec)</small>"
       },
-
       "extPump": {
         "use": "Use external pump",
         "gpio": "Relay GPIO",
@@ -493,7 +475,6 @@
         "antiStuckInterval": "Anti stuck interval <small>(days)</small>",
         "antiStuckTime": "Anti stuck time <small>(min)</small>"
       },
-
       "cascadeControl": {
         "input": {
           "desc": "Can be used to turn on the heating only if another boiler is faulty. The other boiler controller must change the state of the GPIO input in the event of a fault.",
@@ -517,23 +498,23 @@
         }
       }
     },
-
     "upgrade": {
       "title": "Upgrade - OpenTherm Gateway",
       "name": "Upgrade",
-
       "section": {
-        "backupAndRestore": "Backup & restore",
-        "backupAndRestore.desc": "In this section you can save and restore a backup of ALL settings.",
-        "upgrade": "Upgrade",
-        "upgrade.desc": "In this section you can upgrade the firmware and filesystem of your device.<br />Latest releases can be downloaded from the <a href=\"https://github.com/Laxilef/OTGateway/releases\" target=\"_blank\">Releases page</a> of the project repository." 
+        "backupAndRestore": {
+          "title": "Backup & restore",
+          "desc": "In this section you can save and restore a backup of ALL settings."
+        },
+        "upgrade": {
+          "title": "Upgrade",
+          "desc": "In this section you can upgrade the firmware and filesystem of your device.<br />Latest releases can be downloaded from the <a href=\"https://github.com/Laxilef/OTGateway/releases\" target=\"_blank\">Releases page</a> of the project repository."
+        }
       },
-
       "note": {
         "disclaimer1": "After a successful upgrade the filesystem, ALL settings will be reset to default values! Save backup before upgrading.",
         "disclaimer2": "After a successful upgrade, the device will automatically reboot after 15 seconds."
       },
-
       "settingsFile": "Settings file",
       "fw": "Firmware",
       "fs": "Filesystem"

src_data/locales/it.json

@@ -8,15 +8,19 @@
       "issues": "Problemi e domande",
       "releases": "Versione"
     },
-    "dbm": "dBm",
-    "kw": "kW",
-    "time": {
+    "units": {
       "days": "d.",
       "hours": "h.",
       "min": "min.",
-      "sec": "sec."
+      "sec": "sec.",
+      "dbm": "dBm",
+      "mhz": "MHz",
+      "kw": "kW",
+      "rpm": "RPM",
+      "ppm": "ppm",
+      "byte": "byte",
+      "mbyte": "MB"
     },
-
     "button": {
       "upgrade": "Aggiorna",
       "restart": "Riavvia",
@@ -31,26 +35,25 @@
       "success": "Riuscito",
       "error": "Errore"
     },
-
     "index": {
       "title": "OpenTherm Gateway",
-
       "section": {
         "network": "Rete",
         "system": "Sistema"
       },
-
       "system": {
         "build": {
           "title": "Build",
           "version": "Versione",
+          "commit": "Commit",
           "date": "Data",
           "core": "Core",
           "sdk": "SDK"
         },
         "uptime": "Tempo di attività",
         "memory": {
-          "title": "Memoria libera",
+          "heap": "Memoria (heap)",
+          "psram": "Memoria (PSRAM)",
           "maxFreeBlock": "max free block",
           "min": "min"
         },
@@ -67,26 +70,22 @@
         "lastResetReason": "Motivo ultimo Reset"
       }
     },
-
     "dashboard": {
       "name": "Pannello",
       "title": "Pannello - OpenTherm Gateway",
-
       "section": {
         "control": "Controlli",
         "states": "Stato",
         "sensors": "Sensori",
         "diag": "Diagnostica OpenTherm"
       },
-
       "thermostat": {
         "heating": "Riscaldamento",
         "dhw": "ACS",
-        "temp.current": "Attuale",
+        "currentTemp": "Attuale",
         "enable": "Attiva",
         "turbo": "Turbo"
       },
-
       "notify": {
         "fault": {
           "title": "Rilevamento guasti caldiaia attivo!",
@@ -98,7 +97,6 @@
         },
         "reset": "Prova a resettare"
       },
-
       "states": {
         "mNetworkConnected": "Connessione Rete",
         "mMqttConnected": "Connessione MQTT",
@@ -106,7 +104,6 @@
         "mExtPumpState": "Pompa esterna",
         "mCascadeControlInput": "Controllo a cascata (input)",
         "mCascadeControlOutput": "Controllo a cascata (output)",
-
         "sConnected": "Connessione OpenTherm",
         "sFlame": "Fiamma",
         "sCoolingActive": "Raffrescamento",
@@ -115,10 +112,10 @@
         "sFaultCode": "Codice anomalia",
         "sDiagActive": "Diagnostica",
         "sDiagCode": "Codice Diagnostica",
-        
         "mHeatEnabled": "Riscaldamento attivato",
         "mHeatBlocking": "Riscaldamento bloccato",
         "mHeatOverheat": "Riscaldamento surriscaldamento",
+        "mHeatFreezing": "Protezione antigelo",
         "sHeatActive": "Riscaldamento attivo",
         "mHeatSetpointTemp": "Temp riscaldamento impostato",
         "mHeatTargetTemp": "Target Temp caldaia",
@@ -126,7 +123,6 @@
         "mHeatRetTemp": "Temp ritorno riscaldamento",
         "mHeatIndoorTemp": "Riscaldamento, temp interna",
         "mHeatOutdoorTemp": "Riscaldamento, temp esterna",
-
         "mDhwEnabled": "ACS attivata",
         "mDhwOverheat": "ACS surriscaldamento",
         "sDhwActive": "ACS attiva",
@@ -134,7 +130,6 @@
         "mDhwCurrTemp": "ACS temp attuale",
         "mDhwRetTemp": "ACS temp ricircolo"
       },
-
       "sensors": {
         "values": {
           "temp": "Temperatura",
@@ -144,23 +139,19 @@
         }
       }
     },
-
     "network": {
       "title": "Rete - OpenTherm Gateway",
       "name": "Impostazioni rete",
-
       "section": {
         "static": "Impostazioni statico",
         "availableNetworks": "Reti disponibili",
         "staSettings": "Impostazioni WiFi",
         "apSettings": "Impostazioni AP"
       },
-
       "scan": {
         "pos": "#",
         "info": "Info"
       },
-
       "wifi": {
         "ssid": "SSID",
         "password": "Password",
@@ -168,7 +159,6 @@
         "signal": "Segnale",
         "connected": "Connesso"
       },
-
       "params": {
         "hostname": "Hostname",
         "dhcp": "Usa DHCP",
@@ -178,16 +168,15 @@
         "gateway": "Gateway",
         "dns": "DNS"
       },
-
       "sta": {
-        "channel.note": "Metti 0 per auto selezione"
+        "channel": {
+          "note": "Metti 0 per auto selezione"
+        }
       }
     },
-
     "sensors": {
       "title": "Impostazione sensori - OpenTherm Gateway",
       "name": "Impostazione sensori",
-
       "enabled": "Attivato",
       "sensorName": {
         "title": "Nome sensore",
@@ -244,10 +233,11 @@
         "otHeatingPumpHours": "OpenTherm, numero di ore di funzionamento della pompa (riscaldamento)",
         "otDhwPumpHours": "OpenTherm, numero di ore di funzionamento della pompa (ACS)",
         "otCoolingHours": "OpenTherm, numero di ore di funzionamento della cooling",
-        
         "ntcTemp": "Sensore NTC",
         "dallasTemp": "Sensore DALLAS",
         "bluetooth": "Sensore BLE",
+        "dht11": "Sensore DHT11",
+        "dht22": "Sensore DHT22",
         "heatSetpointTemp": "Riscaldamento, temp impostata",
         "manual": "Manuale via MQTT/API",
         "notConfigured": "Non configurato"
@@ -274,11 +264,9 @@
         }
       }
     },
-
     "settings": {
       "title": "Impostazioni - OpenTherm Gateway",
       "name": "Impostazioni",
-
       "section": {
         "portal": "Impostazioni Accesso",
         "system": "Impostazioni sistema",
@@ -293,18 +281,21 @@
         "extPump": "Impostazioni pompa esterna",
         "cascadeControl": "Impostazioni controllo a cascata"
       },
-
       "enable": "Attiva",
       "note": {
         "restart": "Dopo aver cambiato queste impostazioni, il sistema sarà riavviato perchè i cambiamenti abbiano effetto.",
         "blankNotUse": "vuoto - non usare",
         "bleDevice": "Dispositivi BLE possono essere usati <u>solo</u> con alcune schede ESP32 che supportano il bluetooth!"
       },
-
       "temp": {
         "min": "Temperatura minima",
         "max": "Temperatura massima"
       },
+      "avgType": {
+        "mean": "Temperatura media",
+        "min": "Temperatura minima",
+        "max": "Temperatura massima"
+      },
       "maxModulation": "Max livello modulazione",
       "ohProtection": {
         "title": "Protezione contro il surriscaldamento",
@@ -330,14 +321,12 @@
           "note": "Soglia quando il riscaldamento viene forzatamente attivato"
         }
       },
-
       "portal": {
         "login": "Login",
         "password": "Password",
         "auth": "Richiede autenticazione",
         "mdns": "Usa mDNS"
       },
-
       "system": {
         "unit": "Unità di misura",
         "metric": "Metrico <small>(celsius, litri, bar)</small>",
@@ -348,12 +337,8 @@
           "enable": "Porta seriale attivata",
           "baud": "Porta seriale baud rate"
         },
-        "telnet": {
-          "enable": "Telnet attivato",
-          "port": {
-            "title": "Porta Telnet",
-            "note": "Default: 23"
-          }
+        "webSerial": {
+          "enable": "WebSerial attivato"
         },
         "ntp": {
           "server": "NTP server",
@@ -361,7 +346,6 @@
           "timezonePresets": "Seleziona preimpostato..."
         }
       },
-
       "heating": {
         "hyst": {
           "title": "Isteresi",
@@ -373,19 +357,24 @@
             "set0target": "Imposta target nullo"
           }
         },
-        "turboFactor": "Turbo mode coeff."
+        "turboFactor": "Turbo mode coeff.",
+        "indoorTempAvgType": {
+          "title": "Tipo di media temperatura interna",
+          "desc": "Utile con due o più sensori di temperatura interna (quando si usa «Equitherm» e/o «PID»)."
+        },
+        "outdoorTempAvgType": {
+          "title": "Tipo di media temperatura esterna",
+          "desc": "Utile con due o più sensori di temperatura esterna (quando si usa «Equitherm»)."
+        }
       },
-
       "emergency": {
         "desc": "Il modo emergenza è attivato automaticamente quando «PID» o «Equitherm» non possono calcolare il setpoint:<br />- se «Equitherm» è attivato e il sensore della temperatura esternare è disconnesso;<br />- se «PID» o l'opzione OT <i>«Impostazioni riscaldamento native»</i> è attiva e il sensore di temperatura interno è disconnesso.<br /><b>Nota:</b> In mancanza di rete o MQTT, sensore di tipo <i>«Manuale via MQTT/API»</i> è in stato Disconnesso.",
-        
         "target": {
           "title": "Temperatura impostata",
           "note": "<b>Importante:</b> <u>Temperatura interna impostata</u> se l'opzione OT <i>«Controllo riscaldamento interno»</i> è attivato.<br />In tutti gli altri casi, la <u>target heat carrier temperature</u>."
         },
         "treshold": "Tempo di soglia <small>(sec)</small>"
       },
-
       "equitherm": {
         "slope": {
           "title": "Pendenza",
@@ -409,7 +398,6 @@
           "outdoorTemp": "Temperatura esterna"
         }
       },
-
       "pid": {
         "p": "Fattore P",
         "i": "Fattore I",
@@ -429,7 +417,6 @@
           "thresholdLow": "Soglia inferiore"
         }
       },
-
       "ot": {
         "advanced": "Impostazioni avanzate",
         "inGpio": "In GPIO",
@@ -445,7 +432,6 @@
           "title": "Potenza massima caldaia <small>(kW)</small>",
           "note": "<b>0</b> - prova a rilevarla automaticamente. Di solito si trova nelle specifiche delle caldaia come \"potenza massima disponibile\"."
         },
-
         "options": {
           "title": "Opzioni (impostazioni aggiuntive)",
           "desc": "Le opzioni possono modificare la logica della caldaia. Non tutte le opzioni sono documentate nel protocollo, quindi la stessa opzione può avere effetti diversi su caldaie diverse.<br /><b>Nota:</b> Non è necessario modificare nulla se tutto funziona correttamente.",
@@ -467,13 +453,11 @@
           "immergasFix": "Fix per caldiaie Immergas",
           "alwaysSendIndoorTemp": "Invia la temp attuale interna alla caldaia"
         },
-
         "nativeOTC": {
           "title": "Modalità nativa di calcolo della temperatura del vettore termico",
           "note": "Funziona <u>SOLO</u> se la caldaia è in modalità OTC: richiede e accetta la temperatura interna target e regola autonomamente la temperatura del vettore termico basata sulla modalità curve integrata. Incompatibile con PID e Equitherm."
         }
       },
-
       "mqtt": {
         "homeAssistantDiscovery": "Home Assistant Discovery",
         "server": "Server",
@@ -483,7 +467,6 @@
         "prefix": "Prefisso",
         "interval": "Intervallo invio <small>(sec)</small>"
       },
-
       "extPump": {
         "use": "Usa pompa/circolatore esterno",
         "gpio": "GPIO relè",
@@ -492,7 +475,6 @@
         "antiStuckInterval": "Intervallo antiblocco <small>(days)</small>",
         "antiStuckTime": "Tempo antiblocco <small>(min)</small>"
       },
-
       "cascadeControl": {
         "input": {
           "desc": "Può essere attivata la caldaia se un'altra ha fallito. Il controllo dell'altra caldaia cambia lo stato dell'ingresso del GPIO in caso di errore.",
@@ -516,23 +498,23 @@
         }
       }
     },
-
     "upgrade": {
       "title": "Aggiornamenti - OpenTherm Gateway",
       "name": "Aggiornamenti",
-
       "section": {
-        "backupAndRestore": "Backup & restore",
-        "backupAndRestore.desc": "In questa sezione puoi salvare e recuperare un backup di tutte le impostazioni.",
-        "upgrade": "Aggiorna",
-        "upgrade.desc": "In questa sezione puoi aggiornare il firmware il filesystem del tuo dispositivo.<br />L'ultimo aggiornamento può essere scaricato da <a href=\"https://github.com/Laxilef/OTGateway/releases\" target=\"_blank\">Releases page</a> del progetto." 
+        "backupAndRestore": {
+          "title": "Backup & restore",
+          "desc": "In questa sezione puoi salvare e recuperare un backup di tutte le impostazioni."
+        },
+        "upgrade": {
+          "title": "Aggiorna",
+          "desc": "In questa sezione puoi aggiornare il firmware il filesystem del tuo dispositivo.<br />L'ultimo aggiornamento può essere scaricato da <a href=\"https://github.com/Laxilef/OTGateway/releases\" target=\"_blank\">Releases page</a> del progetto."
+        }
       },
-
       "note": {
         "disclaimer1": "Dopo un aggiornamento riuscito del filesystem, tutte le impostazioni sono impostate di default! Salva un backup prima di aggiornare.",
         "disclaimer2": "Dopo un aggiornamento riuscito, il sistema viene automaticamente riavviato dopo 15 secondi."
       },
-
       "settingsFile": "Settings file",
       "fw": "Firmware",
       "fs": "Filesystem"

src_data/locales/nl.json

@@ -8,13 +8,18 @@
       "issues": "Problemen & vragen",
       "releases": "Releases"
     },
-    "dbm": "dBm",
-    "kw": "kW",
-    "time": {
+    "units": {
       "days": "d.",
       "hours": "u.",
       "min": "min.",
-      "sec": "sec."
+      "sec": "sec.",
+      "dbm": "dBm",
+      "mhz": "MHz",
+      "kw": "kW",
+      "rpm": "RPM",
+      "ppm": "ppm",
+      "byte": "byte",
+      "mbyte": "MB"
     },
     "button": {
       "upgrade": "Upgraden",
@@ -40,13 +45,15 @@
         "build": {
           "title": "Build",
           "version": "Versie",
+          "commit": "Commit",
           "date": "Datum",
           "core": "Core",
           "sdk": "SDK"
         },
         "uptime": "Uptime",
         "memory": {
-          "title": "Vrij geheugen",
+          "heap": "Geheugen (heap)",
+          "psram": "Geheugen (PSRAM)",
           "maxFreeBlock": "max. vrij blok",
           "min": "min"
         },
@@ -75,7 +82,7 @@
       "thermostat": {
         "heating": "Verwarming",
         "dhw": "Warm water",
-        "temp.current": "Huidig",
+        "currentTemp": "Huidig",
         "enable": "Inschakelen",
         "turbo": "Turbomodus"
       },
@@ -108,6 +115,7 @@
         "mHeatEnabled": "Verwarming ingeschakeld",
         "mHeatBlocking": "Verwarming geblokkeerd",
         "mHeatOverheat": "Verwarming oververhit",
+        "mHeatFreezing": "Verwarming vorstbescherming",
         "sHeatActive": "Verwarming actief",
         "mHeatSetpointTemp": "Insteltemperatuur verwarming",
         "mHeatTargetTemp": "Doeltemperatuur verwarming",
@@ -161,7 +169,9 @@
         "dns": "DNS"
       },
       "sta": {
-        "channel.note": "zet op 0 voor automatische selectie"
+        "channel": {
+          "note": "zet op 0 voor automatische selectie"
+        }
       }
     },
     "sensors": {
@@ -223,10 +233,11 @@
         "otHeatingPumpHours": "OpenTherm, aantal pompuren (verwarming)",
         "otDhwPumpHours": "OpenTherm, aantal pompuren (warm water)",
         "otCoolingHours": "OpenTherm, aantal cooling",
-
         "ntcTemp": "NTC-sensor",
         "dallasTemp": "DALLAS-sensor",
         "bluetooth": "BLE-sensor",
+        "dht11": "DHT11-sensor",
+        "dht22": "DHT22-sensor",
         "heatSetpointTemp": "Verwarming, insteltemperatuur",
         "manual": "Handmatig via MQTT/API",
         "notConfigured": "Niet geconfigureerd"
@@ -280,6 +291,11 @@
         "min": "Minimumtemperatuur",
         "max": "Maximumtemperatuur"
       },
+      "avgType": {
+        "mean": "Gemiddelde temperatuur",
+        "min": "Minimum temperatuur",
+        "max": "Maximum temperatuur"
+      },
       "maxModulation": "Max. modulatieniveau",
       "ohProtection": {
         "title": "Oververhittingsbeveiliging",
@@ -305,7 +321,6 @@
           "note": "Drempel wanneer de verwarming geforceerd wordt ingeschakeld"
         }
       },
-
       "portal": {
         "login": "Gebruikersnaam",
         "password": "Wachtwoord",
@@ -322,12 +337,8 @@
           "enable": "Seriële poort ingeschakeld",
           "baud": "Baudrate seriële poort"
         },
-        "telnet": {
-          "enable": "Telnet ingeschakeld",
-          "port": {
-            "title": "Telnet-poort",
-            "note": "Standaard: 23"
-          }
+        "webSerial": {
+          "enable": "WebSerial ingeschakeld"
         },
         "ntp": {
           "server": "NTP-server",
@@ -346,7 +357,15 @@
             "set0target": "Stel null target in"
           }
         },
-        "turboFactor": "Turbomodus coëff."
+        "turboFactor": "Turbomodus coëff.",
+        "indoorTempAvgType": {
+          "title": "Binnentemperatuur gemiddelde type",
+          "desc": "Nuttig bij twee of meer binnentemperatuursensoren (bij gebruik van «Equitherm» en/of «PID»)."
+        },
+        "outdoorTempAvgType": {
+          "title": "Buitentemperatuur gemiddelde type",
+          "desc": "Nuttig bij twee of meer buitensensoren (bij gebruik van «Equitherm»)."
+        }
       },
       "emergency": {
         "desc": "Noodmodus wordt automatisch geactiveerd wanneer «PID» of «Equitherm» het instelpunt van de warmtedrager niet kan berekenen:<br />- als «Equitherm» is ingeschakeld en de buitentemperatuursensor is losgekoppeld;<br />- als «PID» of OT-optie <i>«Natuurlijke verwarmingsregeling»</i> is ingeschakeld en de binnentemperatuursensor is losgekoppeld.<br /><b>Let op:</b> Bij een netwerk- of MQTT-storing krijgen sensoren van het type <i>«Handmatig via MQTT/API»</i> de status ONVERBONDEN.",
@@ -434,7 +453,6 @@
           "immergasFix": "Fix voor Immergas-ketels",
           "alwaysSendIndoorTemp": "Stuur huidige binnentemp naar ketel"
         },
-
         "nativeOTC": {
           "title": "Native warmtedrager temperatuur berekeningsmodus",
           "note": "Werkt <u>ALLEEN</u> als de ketel in OTC-modus is: vereist en accepteert de doel binnentemperatuur en regelt zelf de warmtedrager temperatuur op basis van de ingebouwde curves modus. Incompatibel met PID en Equitherm."
@@ -484,10 +502,14 @@
       "title": "Upgrade - OpenTherm Gateway",
       "name": "Upgrade",
       "section": {
-        "backupAndRestore": "Back-up & herstel",
-        "backupAndRestore.desc": "In deze sectie kunt u een back-up van ALLE instellingen opslaan en herstellen.",
-        "upgrade": "Upgrade",
-        "upgrade.desc": "In deze sectie kunt u de firmware en het bestandssysteem van uw apparaat upgraden.<br />De nieuwste releases kunnen worden gedownload van de <a href=\"https://github.com/Laxilef/OTGateway/releases\" target=\"_blank\">Releases-pagina</a> van de projectrepository."
+        "backupAndRestore": {
+          "title": "Back-up & herstel",
+          "desc": "In deze sectie kunt u een back-up van ALLE instellingen opslaan en herstellen."
+        },
+        "upgrade": {
+          "title": "Upgrade",
+          "desc": "In deze sectie kunt u de firmware en het bestandssysteem van uw apparaat upgraden.<br />De nieuwste releases kunnen worden gedownload van de <a href=\"https://github.com/Laxilef/OTGateway/releases\" target=\"_blank\">Releases-pagina</a> van de projectrepository."
+        }
       },
       "note": {
         "disclaimer1": "Na een succesvolle upgrade van het bestandssysteem worden ALLE instellingen teruggezet naar de standaardwaarden! Sla een back-up op voordat u gaat upgraden.",

src_data/locales/ru.json

@@ -8,15 +8,19 @@
       "issues": "Проблемы и вопросы",
       "releases": "Релизы"
     },
-    "dbm": "дБм",
-    "kw": "кВт",
-    "time": {
+    "units": {
       "days": "д.",
       "hours": "ч.",
       "min": "мин.",
-      "sec": "сек."
+      "sec": "сек.",
+      "dbm": "дБм",
+      "mhz": "МГц",
+      "kw": "кВт",
+      "rpm": "RPM",
+      "ppm": "ppm",
+      "byte": "байт",
+      "mbyte": "мбайт"
     },
-
     "button": {
       "upgrade": "Обновить",
       "restart": "Перезагрузка",
@@ -31,26 +35,25 @@
       "success": "Успешно",
       "error": "Ошибка"
     },
-
     "index": {
       "title": "OpenTherm Gateway",
-
       "section": {
         "network": "Сеть",
         "system": "Система"
       },
-
       "system": {
         "build": {
           "title": "Билд",
           "version": "Версия",
+          "commit": "Коммит",
           "date": "Дата",
           "core": "Ядро",
           "sdk": "SDK"
         },
         "uptime": "Аптайм",
         "memory": {
-          "title": "ОЗУ",
+          "heap": "Память (heap)",
+          "psram": "Память (PSRAM)",
           "maxFreeBlock": "макс. блок",
           "min": "мин."
         },
@@ -67,26 +70,22 @@
         "lastResetReason": "Причина перезагрузки"
       }
     },
-
     "dashboard": {
       "name": "Дашборд",
       "title": "Дашборд - OpenTherm Gateway",
-
       "section": {
         "control": "Управление",
         "states": "Состояние",
         "sensors": "Сенсоры",
         "diag": "Диагностика OpenTherm"
       },
-
       "thermostat": {
         "heating": "Отопление",
         "dhw": "ГВС",
-        "temp.current": "Текущая",
+        "currentTemp": "Текущая",
         "enable": "Вкл",
         "turbo": "Турбо"
       },
-
       "notify": {
         "fault": {
           "title": "Состояние неисправности котла активно!",
@@ -98,7 +97,6 @@
         },
         "reset": "Сбросить"
       },
-
       "states": {
         "mNetworkConnected": "Подключение к сети",
         "mMqttConnected": "Подключение к MQTT",
@@ -106,7 +104,6 @@
         "mExtPumpState": "Внешний насос",
         "mCascadeControlInput": "Каскадное управление (вход)",
         "mCascadeControlOutput": "Каскадное управление (выход)",
-
         "sConnected": "Подключение к OpenTherm",
         "sFlame": "Пламя",
         "sCoolingActive": "Охлаждение",
@@ -115,10 +112,10 @@
         "sFaultCode": "Код ошибки",
         "sDiagActive": "Диагностика",
         "sDiagCode": "Диагностический код",
-        
         "mHeatEnabled": "Отопление",
         "mHeatBlocking": "Блокировка отопления",
         "mHeatOverheat": "Отопление, перегрев",
+        "mHeatFreezing": "Отопление, защита от замерзания",
         "sHeatActive": "Активность отопления",
         "mHeatSetpointTemp": "Отопление, уставка",
         "mHeatTargetTemp": "Отопление, целевая температура",
@@ -126,7 +123,6 @@
         "mHeatRetTemp": "Отопление, температура обратки",
         "mHeatIndoorTemp": "Отопление, внутренняя темп.",
         "mHeatOutdoorTemp": "Отопление, наружная темп.",
-
         "mDhwEnabled": "ГВС",
         "mDhwOverheat": "ГВС, перегрев",
         "sDhwActive": "Активность ГВС",
@@ -134,7 +130,6 @@
         "mDhwCurrTemp": "ГВС, текущая температура",
         "mDhwRetTemp": "ГВС, температура обратки"
       },
-      
       "sensors": {
         "values": {
           "temp": "Температура",
@@ -144,23 +139,19 @@
         }
       }
     },
-
     "network": {
       "title": "Сеть - OpenTherm Gateway",
       "name": "Настройки сети",
-
       "section": {
         "static": "Статические параметры",
         "availableNetworks": "Доступные сети",
         "staSettings": "Настройки подключения",
         "apSettings": "Настройки точки доступа"
       },
-
       "scan": {
         "pos": "#",
         "info": "Инфо"
       },
-
       "wifi": {
         "ssid": "Имя сети",
         "password": "Пароль",
@@ -168,7 +159,6 @@
         "signal": "Сигнал",
         "connected": "Подключено"
       },
-
       "params": {
         "hostname": "Имя хоста",
         "dhcp": "Использовать DHCP",
@@ -178,16 +168,15 @@
         "gateway": "Адрес шлюза",
         "dns": "DNS адрес"
       },
-
       "sta": {
-        "channel.note": "установите 0 для автоматического выбора"
+        "channel": {
+          "note": "установите 0 для автоматического выбора"
+        }
       }
     },
-
     "sensors": {
       "title": "Настройки сенсоров - OpenTherm Gateway",
       "name": "Настройки сенсоров",
-
       "enabled": "Включить и использовать",
       "sensorName": {
         "title": "Имя сенсора",
@@ -244,10 +233,11 @@
         "otHeatingPumpHours": "OpenTherm, кол-во часов работы насоса (отопление)",
         "otDhwPumpHours": "OpenTherm, кол-во часов работы насоса (ГВС)",
         "otCoolingHours": "OpenTherm, кол-во часов работы охлаждения",
-        
         "ntcTemp": "NTC датчик",
         "dallasTemp": "DALLAS датчик",
         "bluetooth": "BLE датчик",
+        "dht11": "DHT11 датчик",
+        "dht22": "DHT22 датчик",
         "heatSetpointTemp": "Отопление, температура уставки",
         "manual": "Вручную через MQTT/API",
         "notConfigured": "Не сконфигурировано"
@@ -274,11 +264,9 @@
         }
       }
     },
-
     "settings": {
       "title": "Настройки - OpenTherm Gateway",
       "name": "Настройки",
-
       "section": {
         "portal": "Настройки портала",
         "system": "Системные настройки",
@@ -293,18 +281,21 @@
         "extPump": "Настройки дополнительного насоса",
         "cascadeControl": "Настройки каскадного управления"
       },
-
       "enable": "Вкл",
       "note": {
         "restart": "После изменения этих настроек устройство необходимо перезагрузить, чтобы изменения вступили в силу.",
         "blankNotUse": "пусто - не использовать",
         "bleDevice": "BLE устройство можно использовать <u>только</u> с некоторыми платами ESP32, которые поддерживают BLE!"
       },
-
       "temp": {
         "min": "Мин. температура",
         "max": "Макс. температура"
       },
+      "avgType": {
+        "mean": "Средняя температура",
+        "min": "Минимальная температура",
+        "max": "Максимальная температура"
+      },
       "maxModulation": "Макс. уровень модуляции",
       "ohProtection": {
         "title": "Защита от перегрева",
@@ -330,14 +321,12 @@
           "note": "Порог, при котором отопление будет принудительно включено"
         }
       },
-
       "portal": {
         "login": "Логин",
         "password": "Пароль",
         "auth": "Требовать аутентификацию",
         "mdns": "Использовать mDNS"
       },
-
       "system": {
         "unit": "Система единиц",
         "metric": "Метрическая <small>(цельсии, литры, бары)</small>",
@@ -348,12 +337,8 @@
           "enable": "Вкл. Serial порт",
           "baud": "Скорость Serial порта"
         },
-        "telnet": {
-          "enable": "Вкл. Telnet",
-          "port": {
-            "title": "Telnet порт",
-            "note": "По умолчанию: 23"
-          }
+        "webSerial": {
+          "enable": "Вкл. WebSerial"
         },
         "ntp": {
           "server": "NTP сервер",
@@ -361,7 +346,6 @@
           "timezonePresets": "Выберите пресет..."
         }
       },
-
       "heating": {
         "hyst": {
           "title": "Гистерезис",
@@ -373,19 +357,24 @@
             "set0target": "Установить 0 в качестве целевой темп."
           }
         },
-        "turboFactor": "Коэфф. турбо режима"
+        "turboFactor": "Коэфф. турбо режима",
+        "indoorTempAvgType": {
+          "title": "Тип усреднения внутренней темп.",
+          "desc": "Полезно при использовании двух и более датчиков внутренней температуры (при использовании «Equitherm» и/или «PID»)."
+        },
+        "outdoorTempAvgType": {
+          "title": "Тип усреднения наружнной темп.",
+          "desc": "Полезно при использовании двух и более датчиков наружной температуры (при использовании «Equitherm»)."
+        }
       },
-
       "emergency": {
         "desc": "Аварийный режим активируется автоматически, если «ПИД» или «ПЗА» не могут рассчитать уставку теплоносителя:<br />- если «ПЗА» включен и датчик наружной температуры отключен;<br />- если включен «ПИД» или OT опция <i>«Передать управление отоплением котлу»</i> и датчик внутренней температуры отключен.<br /><b>Примечание:</b> При сбое сети или MQTT датчики с типом <i>«Вручную через MQTT/API»</i> будут находиться в состоянии ОТКЛЮЧЕН.",
-        
         "target": {
           "title": "Целевая температура",
           "note": "<b>Важно:</b> <u>Целевая температура в помещении</u>, если включена ОТ опция <i>«Передать управление отоплением котлу»</i>.<br />Во всех остальных случаях <u>целевая температура теплоносителя</u>."
         },
         "treshold": "Пороговое время включения <small>(сек)</small>"
       },
-
       "equitherm": {
         "slope": {
           "title": "Наклон",
@@ -409,7 +398,6 @@
           "outdoorTemp": "Наружная температура"
         }
       },
-
       "pid": {
         "p": "Коэффициент P",
         "i": "Коэффициент I",
@@ -429,7 +417,6 @@
           "thresholdLow": "Нижний порог"
         }
       },
-
       "ot": {
         "advanced": "Дополнительные настройки",
         "inGpio": "Вход GPIO",
@@ -445,7 +432,6 @@
           "title": "Макс. мощность котла <small>(кВт)</small>",
           "note": "<b>0</b> - попробовать определить автоматически. Обычно можно найти в спецификации котла как \"максимальная полезная тепловая мощность\"."
         },
-
         "options": {
           "title": "Опции (дополнительные настройки)",
           "desc": "Опции могут менять логику работы котла. Не все опции задокументированы в протоколе, поэтому одна и та же опция может иметь разный эффект на разных котлах.<br /><b>Примечание:</b> Нет необходимости что-то менять, если всё работает хорошо.",
@@ -467,13 +453,11 @@
           "immergasFix": "Фикс для котлов Immergas",
           "alwaysSendIndoorTemp": "Передавать текущую темп. в помещении котлу"
         },
-
         "nativeOTC": {
           "title": "Нативный режим OTC (расчёт температуры теплоносителя)",
           "note": "Работает <u>ТОЛЬКО</u> если котел в режиме OTC: требует и принимает целевую температуру в помещении и сам регулирует температуру теплоносителя на основе встроенного режима кривых. Несовместимо с ПИД и ПЗА."
         }
       },
-
       "mqtt": {
         "homeAssistantDiscovery": "Home Assistant Discovery",
         "server": "Адрес сервера",
@@ -483,7 +467,6 @@
         "prefix": "Префикс",
         "interval": "Интервал публикации <small>(сек)</small>"
       },
-
       "extPump": {
         "use": "Использовать доп. насос",
         "gpio": "GPIO реле",
@@ -492,7 +475,6 @@
         "antiStuckInterval": "Интервал защиты от блокировки <small>(в днях)</small>",
         "antiStuckTime": "Время работы насоса <small>(в минутах)</small>"
       },
-
       "cascadeControl": {
         "input": {
           "desc": "Может использоваться для включения отопления только при неисправности другого котла. Контроллер другого котла должен изменить состояние входа GPIO в случае неисправности.",
@@ -516,23 +498,23 @@
         }
       }
     },
-
     "upgrade": {
       "title": "Обновление - OpenTherm Gateway",
       "name": "Обновление",
-
       "section": {
-        "backupAndRestore": "Резервное копирование и восстановление",
-        "backupAndRestore.desc": "В этом разделе вы можете сохранить и восстановить резервную копию ВСЕХ настроек.",
-        "upgrade": "Обновление",
-        "upgrade.desc": "В этом разделе вы можете обновить прошивку и файловую систему вашего устройства.<br />Последнюю версию можно загрузить со страницы <a href=\"https://github.com/Laxilef/OTGateway/releases\" target=\"_blank\">Релизы</a> в репозитории проекта." 
+        "backupAndRestore": {
+          "title": "Резервное копирование и восстановление",
+          "desc": "В этом разделе вы можете сохранить и восстановить резервную копию ВСЕХ настроек."
+        },
+        "upgrade": {
+          "title": "Обновление",
+          "desc": "В этом разделе вы можете обновить прошивку и файловую систему вашего устройства.<br />Последнюю версию можно загрузить со страницы <a href=\"https://github.com/Laxilef/OTGateway/releases\" target=\"_blank\">Релизы</a> в репозитории проекта."
+        }
       },
-
       "note": {
         "disclaimer1": "После успешного обновления файловой системы ВСЕ настройки будут сброшены на стандартные! Создайте резервную копию ПЕРЕД обновлением.",
         "disclaimer2": "После успешного обновления устройство автоматически перезагрузится через 15 секунд."
       },
-
       "settingsFile": "Файл настроек",
       "fw": "Прошивка",
       "fs": "Файловая система"

src_data/pages/dashboard.html

@@ -47,7 +47,7 @@
                 <div class="thermostat-header" data-i18n>dashboard.thermostat.heating</div>
                 <div class="thermostat-temp">
                   <div class="thermostat-temp-target"><span class="targetTemp"></span> <span class="tempUnit"></span></div>
-                  <div class="thermostat-temp-current"><span data-i18n>dashboard.thermostat.temp.current</span>: <span id="tHeatCurrentTemp"></span> <span class="tempUnit"></span></div>
+                  <div class="thermostat-temp-current"><span data-i18n>dashboard.thermostat.currentTemp</span>: <span id="tHeatCurrentTemp"></span> <span class="tempUnit"></span></div>
                 </div>
                 <div class="thermostat-minus">
                   <button class="tAction outline" data-action="decrement"><i class="icons-down"></i></button>
@@ -68,7 +68,7 @@
                 <div class="thermostat-header" data-i18n>dashboard.thermostat.dhw</div>
                 <div class="thermostat-temp">
                   <div class="thermostat-temp-target"><span class="targetTemp"></span> <span class="tempUnit"></span></div>
-                  <div class="thermostat-temp-current"><span data-i18n>dashboard.thermostat.temp.current</span>: <span id="tDhwCurrentTemp"></span> <span class="tempUnit"></span></div>
+                  <div class="thermostat-temp-current"><span data-i18n>dashboard.thermostat.currentTemp</span>: <span id="tDhwCurrentTemp"></span> <span class="tempUnit"></span></div>
                 </div>
                 <div class="thermostat-minus">
                   <button class="tAction outline" data-action="decrement"><i class="icons-down"></i></button>
@@ -495,6 +495,9 @@
             if (modified) {
               parameters.method = "POST";
               parameters.body = JSON.stringify(newSettings);
+              parameters.headers = {
+                "Content-Type": "application/json"
+              };
             }
 
             const response = await fetch("/api/settings", parameters);
@@ -766,7 +769,7 @@
               }
 
               if (sData.rssi !== undefined) {
-                appendValue(".sValue", `${i18n('dashboard.sensors.values.rssi')}: <b>${sData.rssi.toFixed(0)}</b> ${i18n('dbm')}`, `<br />`, sensorNode);
+                appendValue(".sValue", `${i18n('dashboard.sensors.values.rssi')}: <b>${sData.rssi.toFixed(0)}</b> ${i18n('units.dbm')}`, `<br />`, sensorNode);
               }
             }
 

src_data/pages/index.html

@@ -104,6 +104,7 @@
                 <th scope="row" data-i18n>index.system.build.title</th>
                 <td>
                   Env: <b id="build-env"></b><br />
+                  <span data-i18n>index.system.build.commit</span>: <b id="build-commit"></b><br />
                   <span data-i18n>index.system.build.date</span>: <b id="build-date"></b><br />
                   <span data-i18n>index.system.build.core</span>: <b id="build-core"></b><br />
                   <span data-i18n>index.system.build.sdk</span>: <b id="build-sdk"></b>
@@ -112,25 +113,32 @@
               <tr>
                 <th scope="row" data-i18n>index.system.uptime</th>
                 <td>
-                  <b id="uptime-days"></b> <span data-i18n>time.days</span>, 
-                  <b id="uptime-hours"></b> <span data-i18n>time.hours</span>, 
-                  <b id="uptime-min"></b> <span data-i18n>time.min</span>, 
-                  <b id="uptime-sec"></b> <span data-i18n>time.sec</span>
+                  <b id="uptime-days"></b> <span data-i18n>units.days</span>, 
+                  <b id="uptime-hours"></b> <span data-i18n>units.hours</span>, 
+                  <b id="uptime-min"></b> <span data-i18n>units.min</span>, 
+                  <b id="uptime-sec"></b> <span data-i18n>units.sec</span>
                 </td>
               </tr>
               <tr>
-                <th scope="row" data-i18n>index.system.memory.title</th>
+                <th scope="row" data-i18n>index.system.memory.heap</th>
                 <td>
-                  <b id="heap-free"></b> of <b id="heap-total"></b> bytes (<span data-i18n>index.system.memory.min</span>: <b id="heap-min-free"></b> bytes)<br />
-                  <span data-i18n>index.system.memory.maxFreeBlock</span>: <b id="heap-max-free-block"></b> bytes (<span data-i18n>index.system.memory.min</span>: <b id="heap-min-max-free-block"></b> bytes)
+                  <b id="heap-free"></b> of <b id="heap-total"></b> <span data-i18n>units.byte</span> (<span data-i18n>index.system.memory.min</span>: <b id="heap-min-free"></b> <span data-i18n>units.byte</span>)<br />
+                  <span data-i18n>index.system.memory.maxFreeBlock</span>: <b id="heap-max-free-block"></b> <span data-i18n>units.byte</span> (<span data-i18n>index.system.memory.min</span>: <b id="heap-min-max-free-block"></b> <span data-i18n>units.byte</span>)
+                </td>
+              </tr>
+              <tr>
+                <th scope="row" data-i18n>index.system.memory.psram</th>
+                <td>
+                  <b id="psram-free"></b> of <b id="psram-total"></b> <span data-i18n>units.byte</span> (<span data-i18n>index.system.memory.min</span>: <b id="psram-min-free"></b> <span data-i18n>units.byte</span>)<br />
+                  <span data-i18n>index.system.memory.maxFreeBlock</span>: <b id="psram-max-free-block"></b> <span data-i18n>units.byte</span>
                 </td>
               </tr>
               <tr>
                 <th scope="row" data-i18n>index.system.board</th>
                 <td>
                   <span data-i18n>index.system.chip.model</span>: <b id="chip-model"></b> (rev. <span id="chip-rev"></span>)<br />
-                  <span data-i18n>index.system.chip.cores</span>: <b id="chip-cores"></b>, <span data-i18n>index.system.chip.freq</span>: <b id="chip-freq"></b> mHz<br />
-                  <span data-i18n>index.system.flash.size</span>: <b id="flash-size"></b> MB (<span data-i18n>index.system.flash.realSize</span>: <b id="flash-real-size"></b> MB)
+                  <span data-i18n>index.system.chip.cores</span>: <b id="chip-cores"></b>, <span data-i18n>index.system.chip.freq</span>: <b id="chip-freq"></b> <span data-i18n>units.mhz</span><br />
+                  <span data-i18n>index.system.flash.size</span>: <b id="flash-size"></b> <span data-i18n>units.mbyte</span> (<span data-i18n>index.system.flash.realSize</span>: <b id="flash-real-size"></b> <span data-i18n>units.mbyte</span>)
                 </td>
               </tr>
               <tr>
@@ -206,6 +214,7 @@
             setBusy('#main-busy', '#main-table', false);
 
             setValue('#build-version', result.build.version);
+            setValue('#build-commit', result.build.commit);
             setValue('#build-date', result.build.date);
             setValue('#build-env', result.build.env);
             setValue('#build-core', result.build.core);
@@ -217,6 +226,11 @@
             setValue('#heap-max-free-block', result.heap.maxFreeBlock);
             setValue('#heap-min-max-free-block', result.heap.minMaxFreeBlock);
 
+            setValue('#psram-total', result.psram.total);
+            setValue('#psram-free', result.psram.free);
+            setValue('#psram-min-free', result.psram.minFree);
+            setValue('#psram-max-free-block', result.psram.maxFreeBlock);
+
             setValue('#chip-model', result.chip.model);
             setValue('#chip-rev', result.chip.rev);
             setValue('#chip-cores', result.chip.cores);

src_data/pages/sensors.html

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

src_data/pages/settings.html

@@ -126,8 +126,8 @@
                 </label>
 
                 <label>
-                  <input type="checkbox" name="system[telnet][enabled]" value="true">
-                  <span data-i18n>settings.system.telnet.enable</span>
+                  <input type="checkbox" name="system[webSerial][enabled]" value="true">
+                  <span data-i18n>settings.system.webSerial.enable</span>
                 </label>
 
                 <label>
@@ -156,12 +156,6 @@
                       <option value="115200">115200</option>
                     </select>
                   </label>
-
-                  <label>
-                    <span data-i18n>settings.system.telnet.port.title</span>
-                    <input type="number" inputmode="numeric" name="system[telnet][port]" min="1" max="65535" step="1" required>
-                    <small data-i18n>settings.system.telnet.port.note</small>
-                  </label>
                 </div>
 
                 <mark data-i18n>settings.note.restart</mark>
@@ -204,6 +198,28 @@
                 </label>
               </div>
 
+              <div class="grid">
+                <label>
+                  <span data-i18n>settings.heating.indoorTempAvgType.title</span>
+                  <select name="heating[indoorTempAvgType]">
+                    <option value="0" data-i18n>settings.avgType.mean</option>
+                    <option value="1" data-i18n>settings.avgType.min</option>
+                    <option value="2" data-i18n>settings.avgType.max</option>
+                  </select>
+                  <small data-i18n>settings.heating.indoorTempAvgType.desc</small>
+                </label>
+
+                <label>
+                  <span data-i18n>settings.heating.outdoorTempAvgType.title</span>
+                  <select name="heating[outdoorTempAvgType]">
+                    <option value="0" data-i18n>settings.avgType.mean</option>
+                    <option value="1" data-i18n>settings.avgType.min</option>
+                    <option value="2" data-i18n>settings.avgType.max</option>
+                  </select>
+                  <small data-i18n>settings.heating.outdoorTempAvgType.desc</small>
+                </label>
+              </div>
+
               <hr />
 
               <details>
@@ -1085,8 +1101,7 @@
           setSelectValue("[name='system[logLevel]']", data.system.logLevel);
           setCheckboxValue("[name='system[serial][enabled]']", data.system.serial.enabled);
           setSelectValue("[name='system[serial][baudrate]']", data.system.serial.baudrate);
-          setCheckboxValue("[name='system[telnet][enabled]']", data.system.telnet.enabled);
-          setInputValue("[name='system[telnet][port]']", data.system.telnet.port);
+          setCheckboxValue("[name='system[webSerial][enabled]']", data.system.webSerial.enabled);
           setInputValue("[name='system[ntp][server]']", data.system.ntp.server);
           setInputValue("[name='system[ntp][timezone]']", data.system.ntp.timezone);
           setRadioValue("[name='system[unitSystem]']", data.system.unitSystem);
@@ -1178,6 +1193,8 @@
           setSelectValue("[name='heating[hysteresis][action]']", data.heating.hysteresis.action);
           setInputValue("[name='heating[turboFactor]']", data.heating.turboFactor);
           setInputValue("[name='heating[maxModulation]']", data.heating.maxModulation);
+          setSelectValue("[name='heating[indoorTempAvgType]']", data.heating.indoorTempAvgType);
+          setSelectValue("[name='heating[outdoorTempAvgType]']", data.heating.outdoorTempAvgType);
           setInputValue("[name='heating[overheatProtection][highTemp]']", data.heating.overheatProtection.highTemp, {
             "min": 0,
             "max": data.system.unitSystem == 0 ? 100 : 212

src_data/pages/upgrade.html

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

src_data/scripts/utils.js

@@ -318,19 +318,25 @@ const setupRestoreBackupForm = (formSelector) => {
         console.log("Backup: ", data);
 
         if (data.settings != undefined) {
-          let response = await fetch(url, {
-            method: "POST",
-            cache: "no-cache",
-            credentials: "include",
-            headers: {
-              "Content-Type": "application/json"
-            },
-            body: JSON.stringify({"settings": data.settings})
-          });
+          for (var key in data.settings) {
+            let response = await fetch(url, {
+              method: "POST",
+              cache: "no-cache",
+              credentials: "include",
+              headers: {
+                "Content-Type": "application/json"
+              },
+              body: JSON.stringify({
+                "settings": {
+                  [key]: data.settings[key]
+                }
+              })
+            });
 
-          if (!response.ok) {
-            onFailed();
-            return;
+            if (!response.ok) {
+              onFailed();
+              return;
+            }
           }
         }
 
@@ -778,9 +784,9 @@ const purposeUnit = (purpose, unitSystem) => {
     7:    tUnit,
     8:    "%",
     248:  "%",
-    249:  i18n('kw'),
-    250:  "RPM",
-    251:  "ppm",
+    249:  i18n('units.kw'),
+    250:  i18n('units.rpm'),
+    251:  i18n('units.ppm'),
     252:  pressureUnit(unitSystem),
     253:  "%",
     254:  tUnit

tools/add_build_commit.py

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