Bump NimBLE-Arduino to 2.1.0

Digest auth not working on ios #99

README.md

@@ -1,40 +1,44 @@
 <div align="center">
-   
-   ![logo](/assets/logo.svg)
-   <br>
+
    [![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)
    [![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)
-   
+
 </div>
+<hr />
+
+![Dashboard](/assets/poster-1.png) 
+![Configuration](/assets/poster-2.png) 
+![Integration with HomeAssistant](/assets/poster-3.png)
 
 ## Features
-- Hot water temperature control
+- DHW temperature control
 - Heating temperature control
 - Smart heating temperature control modes:
    - PID
    - Equithermic curves - adjusts the temperature based on indoor and outdoor temperatures
-- Hysteresis setting (for accurate maintenance of room temperature)
-- Ability to connect an external sensors to monitor outdoor and indoor temperature ([compatible sensors](https://github.com/Laxilef/OTGateway/wiki/Compatibility#temperature-sensors))
-- Emergency mode. If the Wi-Fi connection is lost or the gateway cannot connect to the MQTT server, the mode will turn on. This mode will automatically maintain the set temperature and prevent your home from freezing. In this mode it is also possible to use equithermal curves (weather-compensated control).
-- Automatic error reset (not with all boilers)
+- Hysteresis setting _(for accurate maintenance of room temperature)_
+- Ability to connect [additional (external) sensors](https://github.com/Laxilef/OTGateway/wiki/Compatibility#temperature-sensors): Dallas (1-wire), NTC 10k, Bluetooth (BLE). Makes it possible to monitor indoor and outdoor temperatures, temperatures on pipes/heat exchangers/etc.
+- Emergency mode. In any dangerous situation _(loss of connection with Wifi, MQTT, sensors, etc)_ it will not let you and your home freeze.
+- Ability of remote fault reset _(not with all boilers)_
 - Diagnostics:
-  - The process of heating: works/does not work
-  - The process of heating water for hot water: working/not working
-  - Display of boiler errors
-  - Burner status (flame): on/off
-  - Burner modulation level in percent
-  - Pressure in the heating system
-  - Gateway status (depending on errors and connection status)
-  - Boiler connection status via OpenTherm interface
-  - The current temperature of the heat carrier (usually the return heat carrier)
-  - Set heat carrier temperature (depending on the selected mode)
-  - Current hot water temperature
+  - Displaying gateway status
+  - Displaying the connection status to the boiler via OpenTherm
+  - Displaying the fault status and fault code
+  - Displaying the diagnostic status & diagnostic code
+  - Display of the process of heating: works/does not work
+  - Display of burner (flame) status: on/off
+  - Display of burner modulation level in percent
+  - Display of pressure in the heating system
+  - Display of current temperature of the heat carrier
+  - Display of return temperature of the heat carrier
+  - Display of setpoint heat carrier temperature (useful when using PID or Equitherm)
+  - Display of the process of DHW: working/not working
+  - Display of current DHW temperature
+  - _And other information..._
 - [Home Assistant](https://www.home-assistant.io/) integration via MQTT. The ability to create any automation for the boiler!
 
-![logo](/assets/ha.png)
-
 ## Documentation
 All available information and instructions can be found in the wiki:
 
@@ -52,6 +56,7 @@ All available information and instructions can be found in the wiki:
       * [Ratios](https://github.com/Laxilef/OTGateway/wiki#ratios)
       * [Fit coefficients](https://github.com/Laxilef/OTGateway/wiki#fit-coefficients)
    * [PID mode](https://github.com/Laxilef/OTGateway/wiki#pid-mode)
+   * [Logs and debug](https://github.com/Laxilef/OTGateway/wiki#logs-and-debug)
 * [Compatibility](https://github.com/Laxilef/OTGateway/wiki/Compatibility)
    * [Boilers](https://github.com/Laxilef/OTGateway/wiki/Compatibility#boilers)
    * [Boards](https://github.com/Laxilef/OTGateway/wiki/Compatibility#boards)
@@ -64,21 +69,5 @@ 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)
 
-
-
-## Dependencies
-- [ESP8266Scheduler](https://github.com/nrwiersma/ESP8266Scheduler) (for ESP8266)
-- [ESP32Scheduler](https://github.com/laxilef/ESP32Scheduler) (for ESP32)
-- [ArduinoJson](https://github.com/bblanchon/ArduinoJson)
-- [OpenTherm Library](https://github.com/ihormelnyk/opentherm_library)
-- [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)
-- [DallasTemperature](https://github.com/milesburton/Arduino-Temperature-Control-Library)
-- [TinyLogger](https://github.com/laxilef/TinyLogger)
-
-## Debug
-To display DEBUG messages you must enable debug in settings (switch is disabled by default).
-You can connect via Telnet to read messages. IP: ESP8266 ip, port: 23
+___
+This project is tested with BrowserStack.

gulpfile.js

@@ -6,6 +6,7 @@ const cssnano = require('cssnano');
 const terser = require('gulp-terser');
 const jsonminify = require('gulp-jsonminify');
 const htmlmin = require('gulp-html-minifier-terser');
+const replace = require('gulp-replace');
 
 // Paths for tasks
 let paths = {
@@ -59,6 +60,10 @@ const styles = (cb) => {
     const items = paths.styles.bundles[name];
 
     src(items)
+      .pipe(replace(
+        "{BUILD_TIME}",
+        Math.floor(Date.now() / 1000)
+      ))
       .pipe(postcss([
         cssnano({ preset: 'advanced' })
       ]))
@@ -77,6 +82,10 @@ const scripts = (cb) => {
     const items = paths.scripts.bundles[name];
 
     src(items)
+      .pipe(replace(
+        "{BUILD_TIME}",
+        Math.floor(Date.now() / 1000)
+      ))
       .pipe(terser().on('error', console.error))
       .pipe(concat(name))
       .pipe(gzip({
@@ -93,6 +102,10 @@ const jsonFiles = (cb) => {
     const item = paths.json[i];
 
     src(item.src)
+      .pipe(replace(
+        "{BUILD_TIME}",
+        Math.floor(Date.now() / 1000)
+      ))
       .pipe(jsonminify())
       .pipe(gzip({
         append: true
@@ -119,6 +132,10 @@ const staticFiles = (cb) => {
 
 const pages = () => {
   return src(paths.pages.src)
+    .pipe(replace(
+      "{BUILD_TIME}",
+      Math.floor(Date.now() / 1000)
+    ))
     .pipe(htmlmin({
       html5: true,
       caseSensitive: true,

lib/BufferedWebServer/BufferedWebServer.h

@@ -10,7 +10,8 @@ public:
     free(this->buffer);
   }
 
-  void send(int code, const char* contentType, const JsonVariantConst content, bool pretty = false) {
+  template <class T>
+  void send(int code, T contentType, const JsonVariantConst content, bool pretty = false) {
     #ifdef ARDUINO_ARCH_ESP8266
     if (!this->webServer->chunkedResponseModeStart(code, contentType)) {
       this->webServer->send(505, F("text/html"), F("HTTP1.1 required"));
@@ -76,10 +77,19 @@ public:
       return;
     }
 
-    this->webServer->sendContent((const char*)this->buffer, this->bufferPos);
-    this->bufferPos = 0;
     #ifdef ARDUINO_ARCH_ESP8266
-    ::delay(0);
+    ::optimistic_yield(1000);
+    #endif
+
+    auto& client = this->webServer->client();
+    if (client.connected()) {
+      this->webServer->sendContent((const char*)this->buffer, this->bufferPos);
+    }
+
+    this->bufferPos = 0;
+
+    #ifdef ARDUINO_ARCH_ESP8266
+    ::optimistic_yield(1000);
     #endif
   }
 

lib/HomeAssistantHelper/HomeAssistantHelper.h

@@ -110,7 +110,7 @@ public:
     topic.concat(this->devicePrefix);
     topic.concat(nameSeparator);
     topic.concat(name);
-    topic.concat("/config");
+    topic.concat(F("/config"));
     return topic;
   }
 

lib/HomeAssistantHelper/strings.h

@@ -37,11 +37,15 @@ const char HA_DEVICE_CLASS[]                    PROGMEM = "device_class";
 const char HA_UNIT_OF_MEASUREMENT[]             PROGMEM = "unit_of_measurement";
 const char HA_UNIT_OF_MEASUREMENT_C[]           PROGMEM = "°C";
 const char HA_UNIT_OF_MEASUREMENT_F[]           PROGMEM = "°F";
+const char HA_UNIT_OF_MEASUREMENT_PERCENT[]     PROGMEM = "%";
+const char HA_UNIT_OF_MEASUREMENT_L_MIN[]       PROGMEM = "L/min";
+const char HA_UNIT_OF_MEASUREMENT_GAL_MIN[]     PROGMEM = "gal/min";
 const char HA_ICON[]                            PROGMEM = "icon";
 const char HA_MIN[]                             PROGMEM = "min";
 const char HA_MAX[]                             PROGMEM = "max";
 const char HA_STEP[]                            PROGMEM = "step";
 const char HA_MODE[]                            PROGMEM = "mode";
+const char HA_MODE_BOX[]                        PROGMEM = "box";
 const char HA_STATE_ON[]                        PROGMEM = "state_on";
 const char HA_STATE_OFF[]                       PROGMEM = "state_off";
 const char HA_PAYLOAD_ON[]                      PROGMEM = "payload_on";

lib/WebServerHandlers/DynamicPage.h

@@ -61,7 +61,7 @@ public:
     }
 
     if (this->cacheHeader != nullptr) {
-      server.sendHeader("Cache-Control", this->cacheHeader);
+      server.sendHeader(F("Cache-Control"), this->cacheHeader);
     }
 
     #ifdef ARDUINO_ARCH_ESP8266
@@ -218,7 +218,6 @@ protected:
   CanHandleCallback canHandleCallback;
   BeforeSendCallback beforeSendCallback;
   TemplateCallback templateCallback;
-  String eTag;
   const char* uri = nullptr;
   const char* path = nullptr;
   const char* cacheHeader = nullptr;

lib/WebServerHandlers/StaticPage.h

@@ -1,5 +1,8 @@
 #include <FS.h>
 #include <detail/mimetable.h>
+#if defined(ARDUINO_ARCH_ESP32)
+  #include <detail/RequestHandlersImpl.h>
+#endif
 
 using namespace mime;
 
@@ -8,7 +11,8 @@ public:
   typedef std::function<bool(HTTPMethod, const String&)> CanHandleCallback;
   typedef std::function<bool()> BeforeSendCallback;
   
-  StaticPage(const char* uri, FS* fs, const char* path, const char* cacheHeader = nullptr) {
+  template <class T>
+  StaticPage(const char* uri, FS* fs, T path, const char* cacheHeader = nullptr) {
     this->uri = uri;
     this->fs = fs;
     this->path = path;
@@ -46,21 +50,25 @@ public:
       return true;
     }
 
-    #if defined(ARDUINO_ARCH_ESP8266)
     if (server._eTagEnabled) {
-      if (server._eTagFunction) {
-        this->eTag = (server._eTagFunction)(*this->fs, this->path);
+      if (this->eTag.isEmpty()) {
+        if (server._eTagFunction) {
+          this->eTag = (server._eTagFunction)(*this->fs, this->path);
 
-      } else  if (this->eTag.isEmpty()) {
-        this->eTag = esp8266webserver::calcETag(*this->fs, this->path);
+        } else {
+          #if defined(ARDUINO_ARCH_ESP8266)
+          this->eTag = esp8266webserver::calcETag(*this->fs, this->path);
+          #elif defined(ARDUINO_ARCH_ESP32)
+          this->eTag = StaticRequestHandler::calcETag(*this->fs, this->path);
+          #endif
+        }
       }
 
-      if (server.header("If-None-Match").equals(this->eTag.c_str())) {
+      if (!this->eTag.isEmpty() && server.header(F("If-None-Match")).equals(this->eTag.c_str())) {
         server.send(304);
         return true;
       }
     }
-    #endif
 
     if (!this->path.endsWith(FPSTR(mimeTable[gz].endsWith)) && !this->fs->exists(path))  {
       String pathWithGz = this->path + FPSTR(mimeTable[gz].endsWith);
@@ -80,14 +88,14 @@ public:
     }
 
     if (this->cacheHeader != nullptr) {
-      server.sendHeader("Cache-Control", this->cacheHeader);
+      server.sendHeader(F("Cache-Control"), this->cacheHeader);
     }
 
-    #if defined(ARDUINO_ARCH_ESP8266)
-    if (server._eTagEnabled && this->eTag.length() > 0) {
-      server.sendHeader("ETag", this->eTag);
+    if (server._eTagEnabled && !this->eTag.isEmpty()) {
+      server.sendHeader(F("ETag"), this->eTag);
     }
     
+    #if defined(ARDUINO_ARCH_ESP8266)
     server.streamFile(file, F("text/html"), method);
     #else
     server.streamFile(file, F("text/html"), 200);

lib/WebServerHandlers/UpgradeHandler.h

@@ -93,10 +93,12 @@ public:
 
   void upload(WebServer& server, const String& uri, HTTPUpload& upload) override {
     UpgradeResult* result;
-    if (upload.name.equals("firmware")) {
+    if (upload.name.equals(F("firmware"))) {
       result = &this->firmwareResult;
-    } else if (upload.name.equals("filesystem")) {
+
+    } else if (upload.name.equals(F("filesystem"))) {
       result = &this->filesystemResult;
+      
     } else {
       return;
     }

otgateway.ino

@@ -1,4 +0,0 @@
-/*
-  This file is needed by the Arduino IDE because the ino file needs to be named as the directory name.
-  Don't worry, the Arduino compiler will "merge" all files, including src/main.cpp
-*/

package.json

@@ -12,6 +12,7 @@
     "gulp-html-minifier-terser": "^7.1.0",
     "gulp-jsonminify": "^1.1.0",
     "gulp-postcss": "^10.0.0",
-    "gulp-terser": "^2.1.0"
+    "gulp-terser": "^2.1.0",
+    "gulp-replace": "^1.1.4"
   }
 }

platformio.ini

@@ -14,7 +14,7 @@ extra_configs = secrets.default.ini
 core_dir = .pio
 
 [env]
-version = 1.5.0-alpha
+version = 1.5.0
 framework = arduino
 lib_deps = 
 	bblanchon/ArduinoJson@^7.1.0
@@ -30,9 +30,6 @@ lib_deps =
 	laxilef/TinyLogger@^1.1.1
 build_type = ${secrets.build_type}
 build_flags = 
-	-D PIO_FRAMEWORK_ARDUINO_LWIP2_LOW_MEMORY
-	;-D PIO_FRAMEWORK_ARDUINO_LWIP2_HIGHER_BANDWIDTH_LOW_FLASH
-	-D PIO_FRAMEWORK_ARDUINO_ESPRESSIF_SDK305
 	-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
@@ -59,7 +56,9 @@ build_flags =
 upload_speed = 921600
 monitor_speed = 115200
 ;monitor_filters = direct
-monitor_filters = esp32_exception_decoder
+monitor_filters = 
+	esp32_exception_decoder
+	esp8266_exception_decoder
 board_build.flash_mode = dio
 board_build.filesystem = littlefs
 
@@ -73,7 +72,11 @@ lib_ignore =
 extra_scripts = 
 	post:tools/build.py
 build_type = ${env.build_type}
-build_flags = ${env.build_flags}
+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
 
 [esp32_defaults]
@@ -82,13 +85,13 @@ board_build.ldscript = eagle.flash.4m1m.ld
 ;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/53.03.10-rc2/platform-espressif32.zip
+platform = https://github.com/pioarduino/platform-espressif32/releases/download/53.03.10-rc3/platform-espressif32.zip
 platform_packages =
 board_build.partitions = esp32_partitions.csv
 lib_deps =
 	${env.lib_deps}
 	laxilef/ESP32Scheduler@^1.0.1
-nimble_lib = h2zero/NimBLE-Arduino@^1.4.2
+nimble_lib = h2zero/NimBLE-Arduino@^2.1.0
 lib_ignore = 
 extra_scripts = 
 	post:tools/esp32.py

src/MainTask.h

@@ -32,7 +32,8 @@ protected:
   unsigned long lastHeapInfo = 0;
   unsigned int minFreeHeap = 0;
   unsigned int minMaxFreeBlockHeap = 0;
-  unsigned long restartSignalTime = 0;
+  bool restartSignalReceived = false;
+  unsigned long restartSignalReceivedTime = 0;
   bool heatingEnabled = false;
   unsigned long heatingDisabledTime = 0;
   PumpStartReason extPumpStartReason = PumpStartReason::NONE;
@@ -73,8 +74,15 @@ protected:
     }
 
     if (vars.actions.restart) {
+      this->restartSignalReceivedTime = millis();
+      this->restartSignalReceived = true;
       vars.actions.restart = false;
-      this->restartSignalTime = millis();
+
+      Log.sinfoln(FPSTR(L_MAIN), F("Received restart signal"));
+    }
+
+    if (!vars.states.restarting && this->restartSignalReceived && millis() - this->restartSignalReceivedTime > 5000) {
+      vars.states.restarting = true;
 
       // save settings
       fsSettings.updateNow();
@@ -87,7 +95,7 @@ protected:
         fsNetworkSettings.write();
       }
 
-      Log.sinfoln(FPSTR(L_MAIN), F("Restart signal received. Restart after 10 sec."));
+      Log.sinfoln(FPSTR(L_MAIN), F("Restart scheduled in 10 sec."));
     }
 
     vars.mqtt.connected = tMqtt->isConnected();
@@ -147,8 +155,9 @@ protected:
     for (Stream* stream : Log.getStreams()) {
       while (stream->available() > 0) {
         stream->read();
+
         #ifdef ARDUINO_ARCH_ESP8266
-        ::delay(0);
+        ::optimistic_yield(1000);
         #endif
       }
     }
@@ -158,8 +167,9 @@ protected:
 
 
     // restart
-    if (this->restartSignalTime > 0 && millis() - this->restartSignalTime > 10000) {
-      this->restartSignalTime = 0;
+    if (this->restartSignalReceived && millis() - this->restartSignalReceivedTime > 15000) {
+      this->restartSignalReceived = false;
+
       ESP.restart();
     }
   }
@@ -168,8 +178,10 @@ protected:
     unsigned int freeHeap = getFreeHeap();
     unsigned int maxFreeBlockHeap = getMaxFreeBlockHeap();
 
-    if (!this->restartSignalTime && (freeHeap < 2048 || maxFreeBlockHeap < 2048)) {
-      this->restartSignalTime = millis();
+    // critical heap
+    if (!vars.states.restarting && (freeHeap < 2048 || maxFreeBlockHeap < 2048)) {
+      this->restartSignalReceivedTime = millis();
+      vars.states.restarting = true;
     }
 
     if (settings.system.logLevel < TinyLogger::Level::VERBOSE) {
@@ -206,13 +218,13 @@ protected:
 
     // set outdoor sensor flag
     if (settings.equitherm.enabled) {
-      if (!Sensors::existsConnectedSensorsByPurpose(Sensors::Purpose::INDOOR_TEMP)) {
+      if (!Sensors::existsConnectedSensorsByPurpose(Sensors::Purpose::OUTDOOR_TEMP)) {
         emergencyFlags |= 0b00000001;
       }
     }
 
     // set indoor sensor flags
-    if (!Sensors::existsConnectedSensorsByPurpose(Sensors::Purpose::OUTDOOR_TEMP)) {
+    if (!Sensors::existsConnectedSensorsByPurpose(Sensors::Purpose::INDOOR_TEMP)) {
       if (!settings.equitherm.enabled && settings.pid.enabled) {
         emergencyFlags |= 0b00000010;
       }
@@ -517,7 +529,7 @@ protected:
     if (configuredGpio == GPIO_IS_NOT_CONFIGURED) {
       if (vars.externalPump.state) {
         vars.externalPump.state = false;
-        vars.externalPump.lastEnableTime = millis();
+        vars.externalPump.lastEnabledTime = millis();
 
         Log.sinfoln(FPSTR(L_EXTPUMP), F("Disabled: use = off"));
       }
@@ -538,7 +550,7 @@ protected:
         digitalWrite(configuredGpio, LOW);
 
         vars.externalPump.state = false;
-        vars.externalPump.lastEnableTime = millis();
+        vars.externalPump.lastEnabledTime = millis();
 
         Log.sinfoln(FPSTR(L_EXTPUMP), F("Disabled: use = off"));
       }
@@ -551,7 +563,7 @@ protected:
         digitalWrite(configuredGpio, LOW);
 
         vars.externalPump.state = false;
-        vars.externalPump.lastEnableTime = millis();
+        vars.externalPump.lastEnabledTime = millis();
 
         Log.sinfoln(FPSTR(L_EXTPUMP), F("Disabled: expired post circulation time"));
 
@@ -559,7 +571,7 @@ protected:
         digitalWrite(configuredGpio, LOW);
 
         vars.externalPump.state = false;
-        vars.externalPump.lastEnableTime = millis();
+        vars.externalPump.lastEnabledTime = millis();
 
         Log.sinfoln(FPSTR(L_EXTPUMP), F("Disabled: expired anti stuck time"));
       }
@@ -576,7 +588,7 @@ protected:
 
       Log.sinfoln(FPSTR(L_EXTPUMP), F("Enabled: heating on"));
 
-    } else if (!vars.externalPump.state && (vars.externalPump.lastEnableTime == 0 || millis() - vars.externalPump.lastEnableTime >= (settings.externalPump.antiStuckInterval * 1000ul))) {
+    } else if (!vars.externalPump.state && (vars.externalPump.lastEnabledTime == 0 || millis() - vars.externalPump.lastEnabledTime >= (settings.externalPump.antiStuckInterval * 1000lu))) {
       vars.externalPump.state = true;
       this->externalPumpStartTime = millis();
       this->extPumpStartReason = MainTask::PumpStartReason::ANTISTUCK;

src/MqttTask.h

@@ -129,7 +129,7 @@ protected:
     #endif
 
     this->client->onMessage([this] (void*, size_t length) {
-      String topic = this->client->messageTopic();
+      const String& topic = this->client->messageTopic();
       if (!length || length > 2048 || !topic.length()) {
         return;
       }
@@ -139,7 +139,7 @@ protected:
         payload[i] = this->client->read();
       }
       
-      this->onMessage(topic.c_str(), payload, length);
+      this->onMessage(topic, payload, length);
     });
 
     // writer settings
@@ -153,7 +153,7 @@ protected:
       Log.straceln(FPSTR(L_MQTT), F("%s publish %u of %u bytes to topic: %s"), result ? F("Successfully") : F("Failed"), written, length, topic);
 
       #ifdef ARDUINO_ARCH_ESP8266
-      ::delay(0);
+      ::optimistic_yield(1000);
       #endif
 
       //this->client->poll();
@@ -162,13 +162,13 @@ protected:
 
     #ifdef ARDUINO_ARCH_ESP8266
     this->writer->setFlushEventCallback([this] (size_t, size_t) {
-      ::delay(0);
+      ::optimistic_yield(1000);
 
       if (this->wifiClient->connected()) {
         this->wifiClient->flush();
       }
 
-      ::delay(0);
+      ::optimistic_yield(1000);
     });
     #endif
 
@@ -184,6 +184,10 @@ protected:
   }
 
   void loop() {
+    if (vars.states.restarting || vars.states.upgrading) {
+      return;
+    }
+
     if (this->connected && !this->client->connected()) {
       this->connected = false;
       this->onDisconnect();
@@ -192,9 +196,15 @@ protected:
       Log.sinfoln(FPSTR(L_MQTT), F("Connecting to %s:%u..."), settings.mqtt.server, settings.mqtt.port);
 
       this->haHelper->setDevicePrefix(settings.mqtt.prefix);
+      this->haHelper->updateCachedTopics();
       this->client->stop();
       this->client->setId(networkSettings.hostname);
       this->client->setUsernamePassword(settings.mqtt.user, settings.mqtt.password);
+
+      this->client->beginWill(this->haHelper->getDeviceTopic(F("status")).c_str(), 7, true, 1);
+      this->client->print(F("offline"));
+      this->client->endWill();
+
       this->client->connect(settings.mqtt.server, settings.mqtt.port);
       this->lastReconnectTime = millis();
       this->yield();
@@ -216,19 +226,19 @@ protected:
     }
 
     #ifdef ARDUINO_ARCH_ESP8266
-    ::delay(0);
+    ::optimistic_yield(1000);
     #endif
 
     // publish variables and status
     if (this->newConnection || millis() - this->prevPubVarsTime > (settings.mqtt.interval * 1000u)) {
-      this->writer->publish(this->haHelper->getDeviceTopic("status").c_str(), "online", false);
-      this->publishVariables(this->haHelper->getDeviceTopic("state").c_str());
+      this->writer->publish(this->haHelper->getDeviceTopic(F("status")).c_str(), "online", false);
+      this->publishVariables(this->haHelper->getDeviceTopic(F("state")).c_str());
       this->prevPubVarsTime = millis();
     }
 
     // publish settings
     if (this->newConnection || millis() - this->prevPubSettingsTime > (settings.mqtt.interval * 10000u)) {
-      this->publishSettings(this->haHelper->getDeviceTopic("settings").c_str());
+      this->publishSettings(this->haHelper->getDeviceTopic(F("settings")).c_str());
       this->prevPubSettingsTime = millis();
     }
 
@@ -289,14 +299,14 @@ protected:
               this->haHelper->deleteDynamicSensor(prevSettings, Sensors::ValueType::TEMPERATURE);
               break;
             
-            case Sensors::Type::MANUAL: {
-              String topic = this->haHelper->getDeviceTopic(
-                F("sensors"),
-                Sensors::makeObjectId(prevSettings.name),
-                F("set")
+            case Sensors::Type::MANUAL:
+              this->client->unsubscribe(
+                this->haHelper->getDeviceTopic(
+                  F("sensors"),
+                  Sensors::makeObjectId(prevSettings.name).c_str(),
+                  F("set")
+                ).c_str()
               );
-              this->client->unsubscribe(topic.c_str());
-            }
 
             default:
               this->haHelper->deleteDynamicSensor(prevSettings, Sensors::ValueType::PRIMARY);
@@ -325,14 +335,14 @@ protected:
             this->haHelper->publishDynamicSensor(sSettings, Sensors::ValueType::TEMPERATURE, settings.system.unitSystem);
             break;
 
-          case Sensors::Type::MANUAL: {
-            String topic = this->haHelper->getDeviceTopic(
-              F("sensors"),
-              Sensors::makeObjectId(prevSettings.name),
-              F("set")
+          case Sensors::Type::MANUAL: 
+            this->client->subscribe(
+              this->haHelper->getDeviceTopic(
+                F("sensors"),
+                Sensors::makeObjectId(prevSettings.name).c_str(),
+                F("set")
+              ).c_str()
             );
-            this->client->subscribe(topic.c_str());
-          }
           
           default:
             this->haHelper->publishDynamicSensor(sSettings, Sensors::ValueType::PRIMARY, settings.system.unitSystem);
@@ -355,24 +365,24 @@ protected:
     unsigned long downtime = (millis() - this->disconnectedTime) / 1000;
     Log.sinfoln(FPSTR(L_MQTT), F("Connected (downtime: %u s.)"), downtime);
 
-    this->client->subscribe(this->haHelper->getDeviceTopic("settings/set").c_str());
-    this->client->subscribe(this->haHelper->getDeviceTopic("state/set").c_str());
+    this->client->subscribe(this->haHelper->getDeviceTopic(F("settings/set")).c_str());
+    this->client->subscribe(this->haHelper->getDeviceTopic(F("state/set")).c_str());
   }
 
   void onDisconnect() {
     this->disconnectedTime = millis();
 
     unsigned long uptime = (millis() - this->connectedTime) / 1000;
-    Log.swarningln(FPSTR(L_MQTT), F("Disconnected (reason: %d uptime: %u s.)"), this->client->connectError(), uptime);
+    Log.swarningln(FPSTR(L_MQTT), F("Disconnected (reason: %d uptime: %lu s.)"), this->client->connectError(), uptime);
   }
 
-  void onMessage(const char* topic, uint8_t* payload, size_t length) {
+  void onMessage(const String& topic, uint8_t* payload, size_t length) {
     if (!length) {
       return;
     }
 
     if (settings.system.logLevel >= TinyLogger::Level::TRACE) {
-      Log.strace(FPSTR(L_MQTT_MSG), F("Topic: %s\r\n>  "), topic);
+      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++) {
           if (payload[i] == 0) {
@@ -380,12 +390,12 @@ protected:
           } else if (payload[i] == 13) {
             continue;
           } else if (payload[i] == 10) {
-            Log.print("\r\n>  ");
+            Log.print(F("\r\n>  "));
           } else {
             Log.print((char) payload[i]);
           }
         }
-        Log.print("\r\n\n");
+        Log.print(F("\r\n\n"));
         Log.flush();
         Log.unlock();
       }
@@ -403,31 +413,27 @@ protected:
     }
     doc.shrinkToFit();
 
-    if (this->haHelper->getDeviceTopic("state/set").equals(topic)) {
-      this->writer->publish(topic, nullptr, 0, true);
-      
+    // delete topic
+    this->writer->publish(topic.c_str(), nullptr, 0, true);
+
+    if (this->haHelper->getDeviceTopic(F("state/set")).equals(topic)) {
       if (jsonToVars(doc, vars)) {
         this->resetPublishedVarsTime();
       }
 
-    } else if (this->haHelper->getDeviceTopic("settings/set").equals(topic)) {
-      this->writer->publish(topic, nullptr, 0, true);
-      
+    } else if (this->haHelper->getDeviceTopic(F("settings/set")).equals(topic)) {
       if (safeJsonToSettings(doc, settings)) {
         this->resetPublishedSettingsTime();
         fsSettings.update();
       }
 
     } else {
-      this->writer->publish(topic, nullptr, 0, true);
+      const String& sensorsTopic = this->haHelper->getDeviceTopic(F("sensors/"));
+      auto stLength = sensorsTopic.length();
 
-      String _topic = topic;
-      String sensorsTopic = this->haHelper->getDeviceTopic("sensors/");
-      unsigned short stLength = sensorsTopic.length();
-
-      if (_topic.startsWith(sensorsTopic) && _topic.endsWith("/set")) {
-        if (_topic.length() > stLength + 4) {
-          String name = _topic.substring(stLength, _topic.indexOf('/', stLength));
+      if (topic.startsWith(sensorsTopic) && topic.endsWith(F("/set"))) {
+        if (topic.length() > stLength + 4) {
+          const String& name = topic.substring(stLength, topic.indexOf('/', stLength));
           int16_t id = Sensors::getIdByObjectId(name.c_str());
 
           if (id == -1) {
@@ -509,14 +515,14 @@ protected:
           this->haHelper->publishDynamicSensor(sSettings, Sensors::ValueType::TEMPERATURE, settings.system.unitSystem);
           break;
 
-        case Sensors::Type::MANUAL: {
-          String topic = this->haHelper->getDeviceTopic(
-            F("sensors"),
-            Sensors::makeObjectId(sSettings.name),
-            F("set")
+        case Sensors::Type::MANUAL:
+          this->client->subscribe(
+            this->haHelper->getDeviceTopic(
+              F("sensors"),
+              Sensors::makeObjectId(sSettings.name).c_str(),
+              F("set")
+            ).c_str()
           );
-          this->client->subscribe(topic.c_str());
-        }
         
         default:
           this->haHelper->publishDynamicSensor(sSettings, Sensors::ValueType::PRIMARY, settings.system.unitSystem);
@@ -597,9 +603,14 @@ protected:
     sensorResultToJson(sensorId, doc);
     doc.shrinkToFit();
 
-    String objId = Sensors::makeObjectId(sSettings.name);
-    String topic = this->haHelper->getDeviceTopic(F("sensors"), objId);
-    return this->writer->publish(topic.c_str(), doc, true);
+    return this->writer->publish(
+      this->haHelper->getDeviceTopic(
+        F("sensors"),
+        Sensors::makeObjectId(sSettings.name).c_str()
+      ).c_str(),
+      doc,
+      true
+    );
   }
 
   bool publishVariables(const char* topic) {

src/PortalTask.h

@@ -1,5 +1,5 @@
-#define PORTAL_CACHE_TIME "max-age=86400"
-#define PORTAL_CACHE (settings.system.logLevel >= TinyLogger::Level::TRACE ? nullptr : PORTAL_CACHE_TIME)
+//#define PORTAL_CACHE "max-age=86400"
+#define PORTAL_CACHE nullptr
 #ifdef ARDUINO_ARCH_ESP8266
 #include <ESP8266WebServer.h>
 #include <Updater.h>
@@ -72,9 +72,24 @@ protected:
   void setup() {
     this->dnsServer->setTTL(0);
     this->dnsServer->setErrorReplyCode(DNSReplyCode::NoError);
-    #ifdef ARDUINO_ARCH_ESP8266
-    this->webServer->enableETag(true);
-    #endif
+    this->webServer->enableETag(true, [](FS &fs, const String &fName) -> const String {
+      char buf[32];
+      {
+        MD5Builder md5;
+        md5.begin();
+        md5.add(fName);
+        md5.add(" " BUILD_ENV " " BUILD_VERSION " " __DATE__ " " __TIME__);
+        md5.calculate();
+        md5.getChars(buf);
+      }
+
+      String etag;
+      etag.reserve(34);
+      etag += '\"';
+      etag.concat(buf, 32);
+      etag += '\"';
+      return etag;
+    });
 
     // index page
     /*auto indexPage = (new DynamicPage("/", &LittleFS, "/pages/index.html"))
@@ -88,13 +103,13 @@ protected:
         return result;
       });
     this->webServer->addHandler(indexPage);*/
-    this->webServer->addHandler(new StaticPage("/", &LittleFS, "/pages/index.html", PORTAL_CACHE));
+    this->webServer->addHandler(new StaticPage("/", &LittleFS, F("/pages/index.html"), PORTAL_CACHE));
 
     // dashboard page
-    auto dashboardPage = (new StaticPage("/dashboard.html", &LittleFS, "/pages/dashboard.html", PORTAL_CACHE))
+    auto dashboardPage = (new StaticPage("/dashboard.html", &LittleFS, F("/pages/dashboard.html"), PORTAL_CACHE))
       ->setBeforeSendCallback([this]() {
-        if (this->isAuthRequired() && !this->webServer->authenticate(settings.portal.login, settings.portal.password)) {
-          this->webServer->requestAuthentication(DIGEST_AUTH);
+        if (this->isAuthRequired() && !this->isValidCredentials()) {
+          this->webServer->requestAuthentication(BASIC_AUTH);
           return false;
         }
 
@@ -103,24 +118,22 @@ protected:
     this->webServer->addHandler(dashboardPage);
 
     // restart
-    this->webServer->on("/restart.html", HTTP_GET, [this]() {
-      if (this->isAuthRequired()) {
-        if (!this->webServer->authenticate(settings.portal.login, settings.portal.password)) {
-          this->webServer->send(401);
-          return;
-        }
+    this->webServer->on(F("/restart.html"), HTTP_GET, [this]() {
+      if (this->isAuthRequired() && !this->isValidCredentials()) {
+        this->webServer->requestAuthentication(BASIC_AUTH);
+        return;
       }
 
       vars.actions.restart = true;
-      this->webServer->sendHeader("Location", "/");
+      this->webServer->sendHeader(F("Location"), "/");
       this->webServer->send(302);
     });
 
     // network settings page
-    auto networkPage = (new StaticPage("/network.html", &LittleFS, "/pages/network.html", PORTAL_CACHE))
+    auto networkPage = (new StaticPage("/network.html", &LittleFS, F("/pages/network.html"), PORTAL_CACHE))
       ->setBeforeSendCallback([this]() {
-        if (this->isAuthRequired() && !this->webServer->authenticate(settings.portal.login, settings.portal.password)) {
-          this->webServer->requestAuthentication(DIGEST_AUTH);
+        if (this->isAuthRequired() && !this->isValidCredentials()) {
+          this->webServer->requestAuthentication(BASIC_AUTH);
           return false;
         }
 
@@ -129,10 +142,10 @@ protected:
     this->webServer->addHandler(networkPage);
 
     // settings page
-    auto settingsPage = (new StaticPage("/settings.html", &LittleFS, "/pages/settings.html", PORTAL_CACHE))
+    auto settingsPage = (new StaticPage("/settings.html", &LittleFS, F("/pages/settings.html"), PORTAL_CACHE))
       ->setBeforeSendCallback([this]() {
-        if (this->isAuthRequired() && !this->webServer->authenticate(settings.portal.login, settings.portal.password)) {
-          this->webServer->requestAuthentication(DIGEST_AUTH);
+        if (this->isAuthRequired() && !this->isValidCredentials()) {
+          this->webServer->requestAuthentication(BASIC_AUTH);
           return false;
         }
 
@@ -141,10 +154,10 @@ protected:
     this->webServer->addHandler(settingsPage);
 
     // sensors page
-    auto sensorsPage = (new StaticPage("/sensors.html", &LittleFS, "/pages/sensors.html", PORTAL_CACHE))
+    auto sensorsPage = (new StaticPage("/sensors.html", &LittleFS, F("/pages/sensors.html"), PORTAL_CACHE))
       ->setBeforeSendCallback([this]() {
-        if (this->isAuthRequired() && !this->webServer->authenticate(settings.portal.login, settings.portal.password)) {
-          this->webServer->requestAuthentication(DIGEST_AUTH);
+        if (this->isAuthRequired() && !this->isValidCredentials()) {
+          this->webServer->requestAuthentication(BASIC_AUTH);
           return false;
         }
 
@@ -153,10 +166,10 @@ protected:
     this->webServer->addHandler(sensorsPage);
 
     // upgrade page
-    auto upgradePage = (new StaticPage("/upgrade.html", &LittleFS, "/pages/upgrade.html", PORTAL_CACHE))
+    auto upgradePage = (new StaticPage("/upgrade.html", &LittleFS, F("/pages/upgrade.html"), PORTAL_CACHE))
       ->setBeforeSendCallback([this]() {
-        if (this->isAuthRequired() && !this->webServer->authenticate(settings.portal.login, settings.portal.password)) {
-          this->webServer->requestAuthentication(DIGEST_AUTH);
+        if (this->isAuthRequired() && !this->isValidCredentials()) {
+          this->webServer->requestAuthentication(BASIC_AUTH);
           return false;
         }
 
@@ -166,14 +179,19 @@ protected:
 
     // OTA
     auto upgradeHandler = (new UpgradeHandler("/api/upgrade"))->setCanUploadCallback([this](const String& uri) {
-      if (this->isAuthRequired() && !this->webServer->authenticate(settings.portal.login, settings.portal.password)) {
-        this->webServer->sendHeader("Connection", "close");
+      if (this->isAuthRequired() && !this->isValidCredentials()) {
+        this->webServer->sendHeader(F("Connection"), F("close"));
         this->webServer->send(401);
         return false;
       }
 
       return true;
     })->setBeforeUpgradeCallback([](UpgradeHandler::UpgradeType type) -> bool {
+      if (vars.states.restarting) {
+        return false;
+      }
+
+      vars.states.upgrading = true;
       return true;
     })->setAfterUpgradeCallback([this](const UpgradeHandler::UpgradeResult& fwResult, const UpgradeHandler::UpgradeResult& fsResult) {
       unsigned short status = 200;
@@ -184,55 +202,57 @@ protected:
         status = 400;
       }
 
-      String response = "{\"firmware\": {\"status\": ";
+      String response = F("{\"firmware\": {\"status\": ");
       response.concat((short int) fwResult.status);
-      response.concat(", \"error\": \"");
+      response.concat(F(", \"error\": \""));
       response.concat(fwResult.error);
-      response.concat("\"}, \"filesystem\": {\"status\": ");
+      response.concat(F("\"}, \"filesystem\": {\"status\": "));
       response.concat((short int) fsResult.status);
-      response.concat(", \"error\": \"");
+      response.concat(F(", \"error\": \""));
       response.concat(fsResult.error);
-      response.concat("\"}}");
-      this->webServer->send(status, "application/json", response);
+      response.concat(F("\"}}"));
+      this->webServer->send(status, F("application/json"), response);
+
+      vars.states.upgrading = false;
     });
     this->webServer->addHandler(upgradeHandler);
 
 
     // backup
-    this->webServer->on("/api/backup/save", HTTP_GET, [this]() {
-      if (this->isAuthRequired()) {
-        if (!this->webServer->authenticate(settings.portal.login, settings.portal.password)) {
-          return this->webServer->send(401);
-        }
+    this->webServer->on(F("/api/backup/save"), HTTP_GET, [this]() {
+      if (this->isAuthRequired() && !this->isValidCredentials()) {
+        return this->webServer->send(401);
       }
 
       JsonDocument doc;
 
-      auto networkDoc = doc["network"].to<JsonObject>();
+      auto networkDoc = doc[FPSTR(S_NETWORK)].to<JsonObject>();
       networkSettingsToJson(networkSettings, networkDoc);
 
-      auto settingskDoc = doc["settings"].to<JsonObject>();
-      settingsToJson(settings, settingskDoc);
+      auto settingsDoc = doc[FPSTR(S_SETTINGS)].to<JsonObject>();
+      settingsToJson(settings, settingsDoc);
 
       for (uint8_t sensorId = 0; sensorId <= Sensors::getMaxSensorId(); sensorId++) {
-        auto sensorSettingskDoc = doc["sensors"][sensorId].to<JsonObject>();
-        sensorSettingsToJson(sensorId, Sensors::settings[sensorId], sensorSettingskDoc);
+        auto sensorsettingsDoc = doc[FPSTR(S_SENSORS)][sensorId].to<JsonObject>();
+        sensorSettingsToJson(sensorId, Sensors::settings[sensorId], sensorsettingsDoc);
       }
 
       doc.shrinkToFit();
 
       this->webServer->sendHeader(F("Content-Disposition"), F("attachment; filename=\"backup.json\""));
-      this->bufferedWebServer->send(200, "application/json", doc);
+      this->bufferedWebServer->send(200, F("application/json"), doc);
     });
 
-    this->webServer->on("/api/backup/restore", HTTP_POST, [this]() {
-      if (this->isAuthRequired()) {
-        if (!this->webServer->authenticate(settings.portal.login, settings.portal.password)) {
-          return this->webServer->send(401);
-        }
+    this->webServer->on(F("/api/backup/restore"), HTTP_POST, [this]() {
+      if (this->isAuthRequired() && !this->isValidCredentials()) {
+        return this->webServer->send(401);
       }
 
-      String plain = this->webServer->arg(0);
+      if (vars.states.restarting) {
+        return this->webServer->send(503);
+      }
+
+      const String& plain = this->webServer->arg(0);
       Log.straceln(FPSTR(L_PORTAL_WEBSERVER), F("Request /api/backup/restore %d bytes: %s"), plain.length(), plain.c_str());
 
       if (plain.length() < 5) {
@@ -246,7 +266,6 @@ protected:
 
       JsonDocument doc;
       DeserializationError dErr = deserializeJson(doc, plain);
-      plain.clear();
 
       if (dErr != DeserializationError::Ok || doc.isNull() || !doc.size()) {
         this->webServer->send(400);
@@ -254,13 +273,7 @@ protected:
       }
 
       bool changed = false;
-      if (!doc["settings"].isNull() && jsonToSettings(doc["settings"], settings)) {
-        vars.actions.restart = true;
-        fsSettings.update();
-        changed = true;
-      }
-
-      if (!doc["network"].isNull() && jsonToNetworkSettings(doc["network"], networkSettings)) {
+      if (!doc[FPSTR(S_NETWORK)].isNull() && jsonToNetworkSettings(doc[FPSTR(S_NETWORK)], networkSettings)) {
         fsNetworkSettings.update();
         network->setHostname(networkSettings.hostname)
           ->setStaCredentials(networkSettings.sta.ssid, networkSettings.sta.password, networkSettings.sta.channel)
@@ -271,53 +284,66 @@ protected:
             networkSettings.staticConfig.gateway,
             networkSettings.staticConfig.subnet,
             networkSettings.staticConfig.dns
-          )
-          ->reconnect();
+          );
         changed = true;
       }
 
-      if (!doc["sensors"].isNull()) {
-        for (uint8_t sensorId = 0; sensorId <= Sensors::getMaxSensorId(); sensorId++) {
-          if (doc["sensors"][sensorId].isNull()) {
+      if (!doc[FPSTR(S_SETTINGS)].isNull() && jsonToSettings(doc[FPSTR(S_SETTINGS)], settings)) {
+        fsSettings.update();
+        changed = true;
+      }
+
+      if (!doc[FPSTR(S_SENSORS)].isNull()) {
+        for (auto sensor : doc[FPSTR(S_SENSORS)].as<JsonObject>()) {
+          if (!isDigit(sensor.key().c_str())) {
             continue;
           }
 
-          auto sensorSettingsDoc = doc["sensors"][sensorId].to<JsonObject>();
-          if (jsonToSensorSettings(sensorId, sensorSettingsDoc, Sensors::settings[sensorId])){
+          int sensorId = atoi(sensor.key().c_str());
+          if (sensorId < 0 || sensorId > 255 || !Sensors::isValidSensorId(sensorId)) {
+            continue;
+          }
+          
+          if (jsonToSensorSettings(sensorId, sensor.value(), Sensors::settings[sensorId])) {
+            fsSensorsSettings.update();
             changed = true;
           }
         }
       }
-
+      
       doc.clear();
       doc.shrinkToFit();
 
+      if (changed) {
+        vars.actions.restart = true;
+      }
+
       this->webServer->send(changed ? 201 : 200);
     });
 
     // network
-    this->webServer->on("/api/network/settings", HTTP_GET, [this]() {
-      if (this->isAuthRequired()) {
-        if (!this->webServer->authenticate(settings.portal.login, settings.portal.password)) {
-          return this->webServer->send(401);
-        }
+    this->webServer->on(F("/api/network/settings"), HTTP_GET, [this]() {
+      if (this->isAuthRequired() && !this->isValidCredentials()) {
+        return this->webServer->send(401);
       }
 
       JsonDocument doc;
       networkSettingsToJson(networkSettings, doc);
       doc.shrinkToFit();
 
-      this->bufferedWebServer->send(200, "application/json", doc);
+      this->bufferedWebServer->send(200, F("application/json"), doc);
     });
 
-    this->webServer->on("/api/network/settings", HTTP_POST, [this]() {
-      if (this->isAuthRequired()) {
-        if (!this->webServer->authenticate(settings.portal.login, settings.portal.password)) {
-          return this->webServer->send(401);
-        }
+    this->webServer->on(F("/api/network/settings"), HTTP_POST, [this]() {
+      if (this->isAuthRequired() && !this->isValidCredentials()) {
+        return this->webServer->send(401);
+      }
+      
+      if (vars.states.restarting) {
+        return this->webServer->send(503);
       }
 
-      String plain = this->webServer->arg(0);
+      const String& plain = this->webServer->arg(0);
       Log.straceln(FPSTR(L_PORTAL_WEBSERVER), F("Request /api/network/settings %d bytes: %s"), plain.length(), plain.c_str());
 
       if (plain.length() < 5) {
@@ -331,7 +357,6 @@ protected:
 
       JsonDocument doc;
       DeserializationError dErr = deserializeJson(doc, plain);
-      plain.clear();
 
       if (dErr != DeserializationError::Ok || doc.isNull() || !doc.size()) {
         this->webServer->send(400);
@@ -345,7 +370,7 @@ protected:
       networkSettingsToJson(networkSettings, doc);
       doc.shrinkToFit();
       
-      this->bufferedWebServer->send(changed ? 201 : 200, "application/json", doc);
+      this->bufferedWebServer->send(changed ? 201 : 200, F("application/json"), doc);
 
       if (changed) {
         doc.clear();
@@ -366,12 +391,9 @@ protected:
       }
     });
 
-    this->webServer->on("/api/network/scan", HTTP_GET, [this]() {
-      if (this->isAuthRequired()) {
-        if (!this->webServer->authenticate(settings.portal.login, settings.portal.password)) {
-          this->webServer->send(401);
-          return;
-        }
+    this->webServer->on(F("/api/network/scan"), HTTP_GET, [this]() {
+      if (this->isAuthRequired() && !this->isValidCredentials()) {
+        return this->webServer->send(401);
       }
 
       auto apCount = WiFi.scanComplete();
@@ -390,50 +412,50 @@ protected:
       
       JsonDocument doc;
       for (short int i = 0; i < apCount; i++) {
-        String ssid = WiFi.SSID(i);
-        doc[i]["ssid"] = ssid;
-        doc[i]["bssid"] = WiFi.BSSIDstr(i);
-        doc[i]["signalQuality"] = NetworkMgr::rssiToSignalQuality(WiFi.RSSI(i));
-        doc[i]["channel"] = WiFi.channel(i);
-        doc[i]["hidden"] = !ssid.length();
+        const String& ssid = WiFi.SSID(i);
+        doc[i][FPSTR(S_SSID)] = ssid;
+        doc[i][FPSTR(S_BSSID)] = WiFi.BSSIDstr(i);
+        doc[i][FPSTR(S_SIGNAL_QUALITY)] = NetworkMgr::rssiToSignalQuality(WiFi.RSSI(i));
+        doc[i][FPSTR(S_CHANNEL)] = WiFi.channel(i);
+        doc[i][FPSTR(S_HIDDEN)] = !ssid.length();
         #ifdef ARDUINO_ARCH_ESP8266
         const bss_info* info = WiFi.getScanInfoByIndex(i);
-        doc[i]["auth"] = info->authmode;
+        doc[i][FPSTR(S_AUTH)] = info->authmode;
         #else
-        doc[i]["auth"] = WiFi.encryptionType(i);
+        doc[i][FPSTR(S_AUTH)] = WiFi.encryptionType(i);
         #endif
       }
       doc.shrinkToFit();
 
-      this->bufferedWebServer->send(200, "application/json", doc);
+      this->bufferedWebServer->send(200, F("application/json"), doc);
 
       WiFi.scanDelete();
     });
 
 
     // settings
-    this->webServer->on("/api/settings", HTTP_GET, [this]() {
-      if (this->isAuthRequired()) {
-        if (!this->webServer->authenticate(settings.portal.login, settings.portal.password)) {
-          return this->webServer->send(401);
-        }
+    this->webServer->on(F("/api/settings"), HTTP_GET, [this]() {
+      if (this->isAuthRequired() && !this->isValidCredentials()) {
+        return this->webServer->send(401);
       }
 
       JsonDocument doc;
       settingsToJson(settings, doc);
       doc.shrinkToFit();
       
-      this->bufferedWebServer->send(200, "application/json", doc);
+      this->bufferedWebServer->send(200, F("application/json"), doc);
     });
 
-    this->webServer->on("/api/settings", HTTP_POST, [this]() {
-      if (this->isAuthRequired()) {
-        if (!this->webServer->authenticate(settings.portal.login, settings.portal.password)) {
-          return this->webServer->send(401);
-        }
+    this->webServer->on(F("/api/settings"), HTTP_POST, [this]() {
+      if (this->isAuthRequired() && !this->isValidCredentials()) {
+        return this->webServer->send(401);
+      }
+      
+      if (vars.states.restarting) {
+        return this->webServer->send(503);
       }
 
-      String plain = this->webServer->arg(0);
+      const String& plain = this->webServer->arg(0);
       Log.straceln(FPSTR(L_PORTAL_WEBSERVER), F("Request /api/settings %d bytes: %s"), plain.length(), plain.c_str());
 
       if (plain.length() < 5) {
@@ -447,7 +469,6 @@ protected:
 
       JsonDocument doc;
       DeserializationError dErr = deserializeJson(doc, plain);
-      plain.clear();
 
       if (dErr != DeserializationError::Ok || doc.isNull() || !doc.size()) {
         this->webServer->send(400);
@@ -461,7 +482,7 @@ protected:
       settingsToJson(settings, doc);
       doc.shrinkToFit();
 
-      this->bufferedWebServer->send(changed ? 201 : 200, "application/json", doc);
+      this->bufferedWebServer->send(changed ? 201 : 200, F("application/json"), doc);
 
       if (changed) {
         doc.clear();
@@ -474,24 +495,23 @@ protected:
 
 
     // sensors list
-    this->webServer->on("/api/sensors", HTTP_GET, [this]() {
-      if (this->isAuthRequired()) {
-        if (!this->webServer->authenticate(settings.portal.login, settings.portal.password)) {
-          return this->webServer->send(401);
-        }
+    this->webServer->on(F("/api/sensors"), HTTP_GET, [this]() {
+      if (this->isAuthRequired() && !this->isValidCredentials()) {
+        return this->webServer->send(401);
       }
 
       bool detailed = false;
-      if (this->webServer->hasArg("detailed")) {
-        detailed = this->webServer->arg("detailed").toInt() > 0;
+      if (this->webServer->hasArg(F("detailed"))) {
+        detailed = this->webServer->arg(F("detailed")).toInt() > 0;
       }
       
       JsonDocument doc;
       for (uint8_t sensorId = 0; sensorId <= Sensors::getMaxSensorId(); sensorId++) {
         if (detailed) {
           auto& sSensor = Sensors::settings[sensorId];
-          doc[sensorId]["name"] = sSensor.name;
-          doc[sensorId]["purpose"] = static_cast<uint8_t>(sSensor.purpose);
+          doc[sensorId][FPSTR(S_ENABLED)] = sSensor.enabled;
+          doc[sensorId][FPSTR(S_NAME)] = sSensor.name;
+          doc[sensorId][FPSTR(S_PURPOSE)] = static_cast<uint8_t>(sSensor.purpose);
           sensorResultToJson(sensorId, doc[sensorId]);
 
         } else {
@@ -500,22 +520,20 @@ protected:
       }
       
       doc.shrinkToFit();
-      this->bufferedWebServer->send(200, "application/json", doc);
+      this->bufferedWebServer->send(200, F("application/json"), doc);
     });
 
     // sensor settings
-    this->webServer->on("/api/sensor", HTTP_GET, [this]() {
-      if (this->isAuthRequired()) {
-        if (!this->webServer->authenticate(settings.portal.login, settings.portal.password)) {
-          return this->webServer->send(401);
-        }
+    this->webServer->on(F("/api/sensor"), HTTP_GET, [this]() {
+      if (this->isAuthRequired() && !this->isValidCredentials()) {
+        return this->webServer->send(401);
       }
       
-      if (!this->webServer->hasArg("id")) {
+      if (!this->webServer->hasArg(F("id"))) {
         return this->webServer->send(400);
       }
 
-      auto id = this->webServer->arg("id");
+      auto id = this->webServer->arg(F("id"));
       if (!isDigit(id.c_str())) {
         return this->webServer->send(400);
       }
@@ -529,27 +547,29 @@ protected:
       JsonDocument doc;
       sensorSettingsToJson(sensorId, Sensors::settings[sensorId], doc);
       doc.shrinkToFit();
-      this->bufferedWebServer->send(200, "application/json", doc);
+      this->bufferedWebServer->send(200, F("application/json"), doc);
     });
     
-    this->webServer->on("/api/sensor", HTTP_POST, [this]() {
-      if (this->isAuthRequired()) {
-        if (!this->webServer->authenticate(settings.portal.login, settings.portal.password)) {
-          return this->webServer->send(401);
-        }
+    this->webServer->on(F("/api/sensor"), HTTP_POST, [this]() {
+      if (this->isAuthRequired() && !this->isValidCredentials()) {
+        return this->webServer->send(401);
+      }
+      
+      if (vars.states.restarting) {
+        return this->webServer->send(503);
       }
 
       #ifdef ARDUINO_ARCH_ESP8266
-      if (!this->webServer->hasArg("id") || this->webServer->args() != 1) {
+      if (!this->webServer->hasArg(F("id")) || this->webServer->args() != 1) {
         return this->webServer->send(400);
       }
       #else
-      if (!this->webServer->hasArg("id") || this->webServer->args() != 2) {
+      if (!this->webServer->hasArg(F("id")) || this->webServer->args() != 2) {
         return this->webServer->send(400);
       }
       #endif
 
-      auto id = this->webServer->arg("id");
+      auto id = this->webServer->arg(F("id"));
       if (!isDigit(id.c_str())) {
         return this->webServer->send(400);
       }
@@ -592,7 +612,7 @@ protected:
         sensorSettingsToJson(sensorId, sSettings, doc);
         doc.shrinkToFit();
         
-        this->bufferedWebServer->send(changed ? 201 : 200, "application/json", doc);
+        this->bufferedWebServer->send(changed ? 201 : 200, F("application/json"), doc);
       }
 
       if (changed) {
@@ -603,22 +623,20 @@ protected:
 
 
     // vars
-    this->webServer->on("/api/vars", HTTP_GET, [this]() {
+    this->webServer->on(F("/api/vars"), HTTP_GET, [this]() {
       JsonDocument doc;
       varsToJson(vars, doc);
       doc.shrinkToFit();
 
-      this->bufferedWebServer->send(200, "application/json", doc);
+      this->bufferedWebServer->send(200, F("application/json"), doc);
     });
 
-    this->webServer->on("/api/vars", HTTP_POST, [this]() {
-      if (this->isAuthRequired()) {
-        if (!this->webServer->authenticate(settings.portal.login, settings.portal.password)) {
-          return this->webServer->send(401);
-        }
+    this->webServer->on(F("/api/vars"), HTTP_POST, [this]() {
+      if (this->isAuthRequired() && !this->isValidCredentials()) {
+        return this->webServer->send(401);
       }
 
-      String plain = this->webServer->arg(0);
+      const String& plain = this->webServer->arg(0);
       Log.straceln(FPSTR(L_PORTAL_WEBSERVER), F("Request /api/vars %d bytes: %s"), plain.length(), plain.c_str());
 
       if (plain.length() < 5) {
@@ -632,7 +650,6 @@ protected:
 
       JsonDocument doc;
       DeserializationError dErr = deserializeJson(doc, plain);
-      plain.clear();
 
       if (dErr != DeserializationError::Ok || doc.isNull() || !doc.size()) {
         this->webServer->send(400);
@@ -646,7 +663,7 @@ protected:
       varsToJson(vars, doc);
       doc.shrinkToFit();
       
-      this->bufferedWebServer->send(changed ? 201 : 200, "application/json", doc);
+      this->bufferedWebServer->send(changed ? 201 : 200, F("application/json"), doc);
 
       if (changed) {
         doc.clear();
@@ -656,78 +673,138 @@ protected:
       }
     });
 
-    this->webServer->on("/api/info", HTTP_GET, [this]() {
+    this->webServer->on(F("/api/info"), HTTP_GET, [this]() {
       bool isConnected = network->isConnected();
 
       JsonDocument doc;
-      doc["system"]["resetReason"] = getResetReason();
-      doc["system"]["uptime"] = millis() / 1000ul;
 
-      doc["network"]["hostname"] = networkSettings.hostname;
-      doc["network"]["mac"] = network->getStaMac();
-      doc["network"]["connected"] = isConnected;
-      doc["network"]["ssid"] = network->getStaSsid();
-      doc["network"]["signalQuality"] = isConnected ? NetworkMgr::rssiToSignalQuality(network->getRssi()) : 0;
-      doc["network"]["channel"] = isConnected ? network->getStaChannel() : 0;
-      doc["network"]["ip"] = isConnected ? network->getStaIp().toString() : "";
-      doc["network"]["subnet"] = isConnected ? network->getStaSubnet().toString() : "";
-      doc["network"]["gateway"] = isConnected ? network->getStaGateway().toString() : "";
-      doc["network"]["dns"] = isConnected ? network->getStaDns().toString() : "";
+      auto docSystem = doc[FPSTR(S_SYSTEM)].to<JsonObject>();
+      docSystem[FPSTR(S_RESET_REASON)] = getResetReason();
+      docSystem[FPSTR(S_UPTIME)] = millis() / 1000;
 
-      doc["build"]["version"] = BUILD_VERSION;
-      doc["build"]["date"] = __DATE__ " " __TIME__;
-      doc["build"]["env"] = BUILD_ENV;
+      auto docNetwork = doc[FPSTR(S_NETWORK)].to<JsonObject>();
+      docNetwork[FPSTR(S_HOSTNAME)] = networkSettings.hostname;
+      docNetwork[FPSTR(S_MAC)] = network->getStaMac();
+      docNetwork[FPSTR(S_CONNECTED)] = isConnected;
+      docNetwork[FPSTR(S_SSID)] = network->getStaSsid();
+      docNetwork[FPSTR(S_SIGNAL_QUALITY)] = isConnected ? NetworkMgr::rssiToSignalQuality(network->getRssi()) : 0;
+      docNetwork[FPSTR(S_CHANNEL)] = isConnected ? network->getStaChannel() : 0;
+      docNetwork[FPSTR(S_IP)] = isConnected ? network->getStaIp().toString() : "";
+      docNetwork[FPSTR(S_SUBNET)] = isConnected ? network->getStaSubnet().toString() : "";
+      docNetwork[FPSTR(S_GATEWAY)] = isConnected ? network->getStaGateway().toString() : "";
+      docNetwork[FPSTR(S_DNS)] = isConnected ? network->getStaDns().toString() : "";
 
-      doc["heap"]["total"] = getTotalHeap();
-      doc["heap"]["free"] = getFreeHeap();
-      doc["heap"]["minFree"] = getFreeHeap(true);
-      doc["heap"]["maxFreeBlock"] = getMaxFreeBlockHeap();
-      doc["heap"]["minMaxFreeBlock"] = getMaxFreeBlockHeap(true);
-      
+      auto docBuild = doc[FPSTR(S_BUILD)].to<JsonObject>();
+      docBuild[FPSTR(S_VERSION)] = BUILD_VERSION;
+      docBuild[FPSTR(S_DATE)] = __DATE__ " " __TIME__;
+      docBuild[FPSTR(S_ENV)] = BUILD_ENV;
       #ifdef ARDUINO_ARCH_ESP8266
-      doc["build"]["core"] = ESP.getCoreVersion();
-      doc["build"]["sdk"] = ESP.getSdkVersion();
-      doc["chip"]["model"] = esp_is_8285() ? "ESP8285" : "ESP8266";
-      doc["chip"]["rev"] = 0;
-      doc["chip"]["cores"] = 1;
-      doc["chip"]["freq"] = ESP.getCpuFreqMHz();
-      doc["flash"]["size"] = ESP.getFlashChipSize();
-      doc["flash"]["realSize"] = ESP.getFlashChipRealSize();
+      docBuild[FPSTR(S_CORE)] = ESP.getCoreVersion();
+      docBuild[FPSTR(S_SDK)] = ESP.getSdkVersion();
       #elif ARDUINO_ARCH_ESP32
-      doc["build"]["core"] = ESP.getCoreVersion();
-      doc["build"]["sdk"] = ESP.getSdkVersion();
-      doc["chip"]["model"] = ESP.getChipModel();
-      doc["chip"]["rev"] = ESP.getChipRevision();
-      doc["chip"]["cores"] = ESP.getChipCores();
-      doc["chip"]["freq"] = ESP.getCpuFreqMHz();
-      doc["flash"]["size"] = ESP.getFlashChipSize();
-      doc["flash"]["realSize"] = doc["flash"]["size"];
+      docBuild[FPSTR(S_CORE)] = ESP.getCoreVersion();
+      docBuild[FPSTR(S_SDK)] = ESP.getSdkVersion();
       #else
-      doc["build"]["core"] = 0;
-      doc["build"]["sdk"] = 0;
-      doc["chip"]["model"] = 0;
-      doc["chip"]["rev"] = 0;
-      doc["chip"]["cores"] = 0;
-      doc["chip"]["freq"] = 0;
-      doc["flash"]["size"] = 0;
-      doc["flash"]["realSize"] = 0;
+      docBuild[FPSTR(S_CORE)] = 0;
+      docBuild[FPSTR(S_SDK)] = 0;
+      #endif
+
+      auto docHeap = doc[FPSTR(S_HEAP)].to<JsonObject>();
+      docHeap[FPSTR(S_TOTAL)] = getTotalHeap();
+      docHeap[FPSTR(S_FREE)] = getFreeHeap();
+      docHeap[FPSTR(S_MIN_FREE)] = getFreeHeap(true);
+      docHeap[FPSTR(S_MAX_FREE_BLOCK)] = getMaxFreeBlockHeap();
+      docHeap[FPSTR(S_MIN_MAX_FREE_BLOCK)] = getMaxFreeBlockHeap(true);
+      
+      auto docChip = doc[FPSTR(S_CHIP)].to<JsonObject>();
+      #ifdef ARDUINO_ARCH_ESP8266
+      docChip[FPSTR(S_MODEL)] = esp_is_8285() ? F("ESP8285") : F("ESP8266");
+      docChip[FPSTR(S_REV)] = 0;
+      docChip[FPSTR(S_CORES)] = 1;
+      docChip[FPSTR(S_FREQ)] = ESP.getCpuFreqMHz();
+      #elif ARDUINO_ARCH_ESP32
+      docChip[FPSTR(S_MODEL)] = ESP.getChipModel();
+      docChip[FPSTR(S_REV)] = ESP.getChipRevision();
+      docChip[FPSTR(S_CORES)] = ESP.getChipCores();
+      docChip[FPSTR(S_FREQ)] = ESP.getCpuFreqMHz();
+      #else
+      docChip[FPSTR(S_MODEL)] = 0;
+      docChip[FPSTR(S_REV)] = 0;
+      docChip[FPSTR(S_CORES)] = 0;
+      docChip[FPSTR(S_FREQ)] = 0;
+      #endif
+
+      auto docFlash = doc[FPSTR(S_FLASH)].to<JsonObject>();
+      #ifdef ARDUINO_ARCH_ESP8266
+      docFlash[FPSTR(S_SIZE)] = ESP.getFlashChipSize();
+      docFlash[FPSTR(S_REAL_SIZE)] = ESP.getFlashChipRealSize();
+      #elif ARDUINO_ARCH_ESP32
+      docFlash[FPSTR(S_SIZE)] = ESP.getFlashChipSize();
+      docFlash[FPSTR(S_REAL_SIZE)] = docFlash[FPSTR(S_SIZE)];
+      #else
+      docFlash[FPSTR(S_SIZE)] = 0;
+      docFlash[FPSTR(S_REAL_SIZE)] = 0;
       #endif
 
       doc.shrinkToFit();
 
-      this->bufferedWebServer->send(200, "application/json", doc);
+      this->bufferedWebServer->send(200, F("application/json"), doc);
     });
 
-    this->webServer->on("/api/debug", HTTP_GET, [this]() {
+    this->webServer->on(F("/api/debug"), HTTP_GET, [this]() {
       JsonDocument doc;
-      doc["build"]["version"] = BUILD_VERSION;
-      doc["build"]["date"] = __DATE__ " " __TIME__;
-      doc["build"]["env"] = BUILD_ENV;
-      doc["heap"]["total"] = getTotalHeap();
-      doc["heap"]["free"] = getFreeHeap();
-      doc["heap"]["minFree"] = getFreeHeap(true);
-      doc["heap"]["maxFreeBlock"] = getMaxFreeBlockHeap();
-      doc["heap"]["minMaxFreeBlock"] = getMaxFreeBlockHeap(true);
+
+      auto docBuild = doc[FPSTR(S_BUILD)].to<JsonObject>();
+      docBuild[FPSTR(S_VERSION)] = BUILD_VERSION;
+      docBuild[FPSTR(S_DATE)] = __DATE__ " " __TIME__;
+      docBuild[FPSTR(S_ENV)] = BUILD_ENV;
+      #ifdef ARDUINO_ARCH_ESP8266
+      docBuild[FPSTR(S_CORE)] = ESP.getCoreVersion();
+      docBuild[FPSTR(S_SDK)] = ESP.getSdkVersion();
+      #elif ARDUINO_ARCH_ESP32
+      docBuild[FPSTR(S_CORE)] = ESP.getCoreVersion();
+      docBuild[FPSTR(S_SDK)] = ESP.getSdkVersion();
+      #else
+      docBuild[FPSTR(S_CORE)] = 0;
+      docBuild[FPSTR(S_SDK)] = 0;
+      #endif
+
+      auto docHeap = doc[FPSTR(S_HEAP)].to<JsonObject>();
+      docHeap[FPSTR(S_TOTAL)] = getTotalHeap();
+      docHeap[FPSTR(S_FREE)] = getFreeHeap();
+      docHeap[FPSTR(S_MIN_FREE)] = getFreeHeap(true);
+      docHeap[FPSTR(S_MAX_FREE_BLOCK)] = getMaxFreeBlockHeap();
+      docHeap[FPSTR(S_MIN_MAX_FREE_BLOCK)] = getMaxFreeBlockHeap(true);
+      
+      auto docChip = doc[FPSTR(S_CHIP)].to<JsonObject>();
+      #ifdef ARDUINO_ARCH_ESP8266
+      docChip[FPSTR(S_MODEL)] = esp_is_8285() ? F("ESP8285") : F("ESP8266");
+      docChip[FPSTR(S_REV)] = 0;
+      docChip[FPSTR(S_CORES)] = 1;
+      docChip[FPSTR(S_FREQ)] = ESP.getCpuFreqMHz();
+      #elif ARDUINO_ARCH_ESP32
+      docChip[FPSTR(S_MODEL)] = ESP.getChipModel();
+      docChip[FPSTR(S_REV)] = ESP.getChipRevision();
+      docChip[FPSTR(S_CORES)] = ESP.getChipCores();
+      docChip[FPSTR(S_FREQ)] = ESP.getCpuFreqMHz();
+      #else
+      docChip[FPSTR(S_MODEL)] = 0;
+      docChip[FPSTR(S_REV)] = 0;
+      docChip[FPSTR(S_CORES)] = 0;
+      docChip[FPSTR(S_FREQ)] = 0;
+      #endif
+
+      auto docFlash = doc[FPSTR(S_FLASH)].to<JsonObject>();
+      #ifdef ARDUINO_ARCH_ESP8266
+      docFlash[FPSTR(S_SIZE)] = ESP.getFlashChipSize();
+      docFlash[FPSTR(S_REAL_SIZE)] = ESP.getFlashChipRealSize();
+      #elif ARDUINO_ARCH_ESP32
+      docFlash[FPSTR(S_SIZE)] = ESP.getFlashChipSize();
+      docFlash[FPSTR(S_REAL_SIZE)] = docFlash[FPSTR(S_SIZE)];
+      #else
+      docFlash[FPSTR(S_SIZE)] = 0;
+      docFlash[FPSTR(S_REAL_SIZE)] = 0;
+      #endif
 
       #if defined(ARDUINO_ARCH_ESP32)
       auto reason = esp_reset_reason();
@@ -738,58 +815,30 @@ protected:
       #else
       if (false) {
       #endif
-        doc["crash"]["reason"] = getResetReason();
-        doc["crash"]["core"] = CrashRecorder::ext.core;
-        doc["crash"]["heap"] = CrashRecorder::ext.heap;
-        doc["crash"]["uptime"] = CrashRecorder::ext.uptime;
+        auto docCrash = doc[FPSTR(S_CRASH)].to<JsonObject>();
+        docCrash[FPSTR(S_REASON)] = getResetReason();
+        docCrash[FPSTR(S_CORE)] = CrashRecorder::ext.core;
+        docCrash[FPSTR(S_HEAP)] = CrashRecorder::ext.heap;
+        docCrash[FPSTR(S_UPTIME)] = CrashRecorder::ext.uptime;
 
         if (CrashRecorder::backtrace.length > 0 && CrashRecorder::backtrace.length <= CrashRecorder::backtraceMaxLength) {
           String backtraceStr;
           arr2str(backtraceStr, CrashRecorder::backtrace.data, CrashRecorder::backtrace.length);
-          doc["crash"]["backtrace"]["data"] = backtraceStr;
-          doc["crash"]["backtrace"]["continues"] = CrashRecorder::backtrace.continues;
+          docCrash[FPSTR(S_BACKTRACE)][FPSTR(S_DATA)] = backtraceStr;
+          docCrash[FPSTR(S_BACKTRACE)][FPSTR(S_CONTINUES)] = CrashRecorder::backtrace.continues;
         }
 
         if (CrashRecorder::epc.length > 0 && CrashRecorder::epc.length <= CrashRecorder::epcMaxLength) {
           String epcStr;
           arr2str(epcStr, CrashRecorder::epc.data, CrashRecorder::epc.length);
-          doc["crash"]["epc"] = epcStr;
+          docCrash[FPSTR(S_EPC)] = epcStr;
         }
       }
       
-      #ifdef ARDUINO_ARCH_ESP8266
-      doc["build"]["core"] = ESP.getCoreVersion();
-      doc["build"]["sdk"] = ESP.getSdkVersion();
-      doc["chip"]["model"] = esp_is_8285() ? "ESP8285" : "ESP8266";
-      doc["chip"]["rev"] = 0;
-      doc["chip"]["cores"] = 1;
-      doc["chip"]["freq"] = ESP.getCpuFreqMHz();
-      doc["flash"]["size"] = ESP.getFlashChipSize();
-      doc["flash"]["realSize"] = ESP.getFlashChipRealSize();
-      #elif ARDUINO_ARCH_ESP32
-      doc["build"]["core"] = ESP.getCoreVersion();
-      doc["build"]["sdk"] = ESP.getSdkVersion();
-      doc["chip"]["model"] = ESP.getChipModel();
-      doc["chip"]["rev"] = ESP.getChipRevision();
-      doc["chip"]["cores"] = ESP.getChipCores();
-      doc["chip"]["freq"] = ESP.getCpuFreqMHz();
-      doc["flash"]["size"] = ESP.getFlashChipSize();
-      doc["flash"]["realSize"] = doc["flash"]["size"];
-      #else
-      doc["build"]["core"] = 0;
-      doc["build"]["sdk"] = 0;
-      doc["chip"]["model"] = 0;
-      doc["chip"]["rev"] = 0;
-      doc["chip"]["cores"] = 0;
-      doc["chip"]["freq"] = 0;
-      doc["flash"]["size"] = 0;
-      doc["flash"]["realSize"] = 0;
-      #endif
-      
       doc.shrinkToFit();
 
       this->webServer->sendHeader(F("Content-Disposition"), F("attachment; filename=\"debug.json\""));
-      this->bufferedWebServer->send(200, "application/json", doc, true);
+      this->bufferedWebServer->send(200, F("application/json"), doc, true);
     });
 
 
@@ -797,15 +846,15 @@ protected:
     this->webServer->onNotFound([this]() {
       Log.straceln(FPSTR(L_PORTAL_WEBSERVER), F("Page not found, uri: %s"), this->webServer->uri().c_str());
 
-      const String uri = this->webServer->uri();
-      if (uri.equals("/")) {
-        this->webServer->send(200, "text/plain", F("The file system is not flashed!"));
+      const String& uri = this->webServer->uri();
+      if (uri.equals(F("/"))) {
+        this->webServer->send(200, F("text/plain"), F("The file system is not flashed!"));
 
       } else if (network->isApEnabled()) {
         this->onCaptivePortal();
 
       } else {
-        this->webServer->send(404, "text/plain", F("Page not found"));
+        this->webServer->send(404, F("text/plain"), F("Page not found"));
       }
     });
 
@@ -824,7 +873,7 @@ protected:
       Log.straceln(FPSTR(L_PORTAL_WEBSERVER), F("Started: AP up or STA connected"));
 
       #ifdef ARDUINO_ARCH_ESP8266
-      ::delay(0);
+      ::optimistic_yield(1000);
       #endif
 
     } else if (this->stateWebServer() && !network->isApEnabled() && !network->isStaEnabled()) {
@@ -832,7 +881,7 @@ protected:
       Log.straceln(FPSTR(L_PORTAL_WEBSERVER), F("Stopped: AP and STA down"));
 
       #ifdef ARDUINO_ARCH_ESP8266
-      ::delay(0);
+      ::optimistic_yield(1000);
       #endif
     }
 
@@ -842,7 +891,7 @@ protected:
       Log.straceln(FPSTR(L_PORTAL_DNSSERVER), F("Started: AP up"));
       
       #ifdef ARDUINO_ARCH_ESP8266
-      ::delay(0);
+      ::optimistic_yield(1000);
       #endif
 
     } else if (this->stateDnsServer() && (!network->isApEnabled() || !this->stateWebServer())) {
@@ -850,18 +899,27 @@ protected:
       Log.straceln(FPSTR(L_PORTAL_DNSSERVER), F("Stopped: AP down"));
 
       #ifdef ARDUINO_ARCH_ESP8266
-      ::delay(0);
+      ::optimistic_yield(1000);
       #endif
     }
 
     if (this->stateDnsServer()) {
       this->dnsServer->processNextRequest();
+
       #ifdef ARDUINO_ARCH_ESP8266
-      ::delay(0);
+      ::optimistic_yield(1000);
       #endif
     }
 
     if (this->stateWebServer()) {
+      #ifdef ARDUINO_ARCH_ESP32
+      // Fix ERR_CONNECTION_RESET for Chrome based browsers
+      auto& client = this->webServer->client();
+      if (!client.getNoDelay()) {
+        client.setNoDelay(true);
+      }
+      #endif
+
       this->webServer->handleClient();
     }
 
@@ -874,29 +932,35 @@ protected:
     return !network->isApEnabled() && settings.portal.auth && strlen(settings.portal.password);
   }
 
-  void onCaptivePortal() {
-    const String uri = this->webServer->uri();
+  bool isValidCredentials() {
+    return this->webServer->authenticate(settings.portal.login, settings.portal.password);
+  }
 
-    if (uri.equals("/connecttest.txt")) {
+  void onCaptivePortal() {
+    const String& uri = this->webServer->uri();
+
+    if (uri.equals(F("/connecttest.txt"))) {
       this->webServer->sendHeader(F("Location"), F("http://logout.net"));
       this->webServer->send(302);
 
       Log.straceln(FPSTR(L_PORTAL_CAPTIVE), F("Redirect to http://logout.net with 302 code"));
 
-    } else if (uri.equals("/wpad.dat")) {
+    } else if (uri.equals(F("/wpad.dat"))) {
       this->webServer->send(404);
 
       Log.straceln(FPSTR(L_PORTAL_CAPTIVE), F("Send empty page with 404 code"));
 
-    } else if (uri.equals("/success.txt")) {
+    } else if (uri.equals(F("/success.txt"))) {
       this->webServer->send(200);
 
       Log.straceln(FPSTR(L_PORTAL_CAPTIVE), F("Send empty page with 200 code"));
 
     } else {
-      String portalUrl = "http://" + network->getApIp().toString() + '/';
+      String portalUrl = F("http://");
+      portalUrl += network->getApIp().toString().c_str();
+      portalUrl += '/';
 
-      this->webServer->sendHeader("Location", portalUrl.c_str());
+      this->webServer->sendHeader(F("Location"), portalUrl);
       this->webServer->send(302);
 
       Log.straceln(FPSTR(L_PORTAL_CAPTIVE), F("Redirect to portal page with 302 code"));

src/RegulatorTask.h

@@ -32,6 +32,10 @@ protected:
   #endif
   
   void loop() {
+    if (vars.states.restarting || vars.states.upgrading) {
+      return;
+    }
+
     this->indoorSensorsConnected = Sensors::existsConnectedSensorsByPurpose(Sensors::Purpose::INDOOR_TEMP);
     //this->outdoorSensorsConnected = Sensors::existsConnectedSensorsByPurpose(Sensors::Purpose::OUTDOOR_TEMP);
 
@@ -55,14 +59,15 @@ protected:
     this->turbo();
     this->hysteresis();
 
-    vars.master.heating.targetTemp = constrain(
-      this->getHeatingSetpoint(),
-      vars.master.heating.minTemp,
-      vars.master.heating.maxTemp
+    vars.master.heating.targetTemp = settings.heating.target;
+    vars.master.heating.setpointTemp = constrain(
+      this->getHeatingSetpointTemp(),
+      this->getHeatingMinSetpointTemp(),
+      this->getHeatingMaxSetpointTemp()
     );
 
     Sensors::setValueByType(
-      Sensors::Type::HEATING_SETPOINT_TEMP, vars.master.heating.targetTemp,
+      Sensors::Type::HEATING_SETPOINT_TEMP, vars.master.heating.setpointTemp,
       Sensors::ValueType::PRIMARY, true, true
     );
   }
@@ -104,8 +109,19 @@ protected:
     }
   }
 
+  inline float getHeatingMinSetpointTemp() {
+    return settings.opentherm.nativeHeatingControl
+      ? vars.master.heating.minTemp
+      : settings.heating.minTemp;
+  }
 
-  float getHeatingSetpoint() {
+  inline float getHeatingMaxSetpointTemp() {
+    return settings.opentherm.nativeHeatingControl
+      ? vars.master.heating.maxTemp
+      : settings.heating.maxTemp;
+  }
+
+  float getHeatingSetpointTemp() {
     float newTemp = 0;
 
     if (fabsf(prevHeatingTarget - settings.heating.target) > 0.0001f) {

src/Sensors.h

@@ -18,6 +18,13 @@ public:
     OT_PRESSURE             = 9,
     OT_MODULATION_LEVEL     = 10,
     OT_CURRENT_POWER        = 11,
+    OT_EXHAUST_CO2          = 12,
+    OT_EXHAUST_FAN_SPEED    = 13,
+    OT_SUPPLY_FAN_SPEED     = 14,
+    OT_SOLAR_STORAGE_TEMP   = 15,
+    OT_SOLAR_COLLECTOR_TEMP = 16,
+    OT_FAN_SPEED_SETPOINT   = 17,
+    OT_FAN_SPEED_CURRENT    = 18,
     
     NTC_10K_TEMP            = 50,
     DALLAS_TEMP             = 51,
@@ -38,8 +45,11 @@ public:
     DHW_FLOW_RATE         = 6,
     EXHAUST_TEMP          = 7,
     MODULATION_LEVEL      = 8,
-    CURRENT_POWER         = 9,
 
+    POWER_FACTOR          = 248,
+    POWER                 = 249,
+    FAN_SPEED             = 250,
+    CO2                   = 251,
     PRESSURE              = 252,
     HUMIDITY              = 253,
     TEMPERATURE           = 254,
@@ -70,7 +80,7 @@ public:
   typedef struct {
     bool connected = false;
     unsigned long activityTime = 0;
-    uint8_t signalQuality = 0;
+    uint8_t signalQuality = 100;
     //float raw[4] = {0.0f, 0.0f, 0.0f, 0.0f};
     float values[4] = {0.0f, 0.0f, 0.0f, 0.0f};
   } Result;
@@ -112,14 +122,14 @@ public:
     return true;
   }
 
-  static uint8_t getAmountByType(Type type) {
+  static uint8_t getAmountByType(Type type, bool onlyEnabled = false) {
     if (settings == nullptr) {
       return 0;
     }
 
     uint8_t amount = 0;
     for (uint8_t id = 0; id < getMaxSensorId(); id++) {
-      if (settings[id].type == type) {
+      if (settings[id].type == type && (!onlyEnabled || settings[id].enabled)) {
         amount++;
       }
     }
@@ -146,9 +156,10 @@ public:
       return 0;
     }
 
+    String refObjectId;
     for (uint8_t id = 0; id < getMaxSensorId(); id++) {
-      String _objectId = Sensors::makeObjectId(settings[id].name);
-      if (strcmp(_objectId.c_str(), objectId) == 0) {
+      Sensors::makeObjectId(refObjectId, settings[id].name);
+      if (refObjectId.equals(objectId)) {
         return id;
       }
     }
@@ -170,41 +181,44 @@ public:
     auto& rSensor = results[sensorId];
     
     float compensatedValue = value;
-    if (valueType == ValueType::PRIMARY) {
-      if (fabsf(sSensor.factor) > 0.001f) {
-        compensatedValue *= sSensor.factor;
-      }
-
-      if (fabsf(sSensor.offset) > 0.001f) {
-        compensatedValue += sSensor.offset;
-      }
-
-    } else if (valueType == ValueType::RSSI) {
-      if (sSensor.type == Type::BLUETOOTH) {
-        rSensor.signalQuality = Sensors::bluetoothRssiToQuality(value);
-      }
-    }
-
-    if (sSensor.filtering && fabs(rSensor.values[valueId]) >= 0.1f) {
-      rSensor.values[valueId] += (compensatedValue - rSensor.values[valueId]) * sSensor.filteringFactor;
-      
-    } else {
+    if (sSensor.type == Type::HEATING_SETPOINT_TEMP || sSensor.type == Type::MANUAL) {
       rSensor.values[valueId] = compensatedValue;
+
+    } else {
+      if (valueType == ValueType::PRIMARY) {
+        if (fabsf(sSensor.factor) > 0.001f) {
+          compensatedValue *= sSensor.factor;
+        }
+
+        if (fabsf(sSensor.offset) > 0.001f) {
+          compensatedValue += sSensor.offset;
+        }
+
+      } else if (valueType == ValueType::RSSI) {
+        if (sSensor.type == Type::BLUETOOTH) {
+          rSensor.signalQuality = Sensors::bluetoothRssiToQuality(value);
+        }
+      }
+
+      if (sSensor.filtering && fabsf(rSensor.values[valueId]) >= 0.1f) {
+        rSensor.values[valueId] += (compensatedValue - rSensor.values[valueId]) * sSensor.filteringFactor;
+        
+      } else {
+        rSensor.values[valueId] = compensatedValue;
+      }
     }
 
     if (updateActivityTime) {
       rSensor.activityTime = millis();
     }
 
-    if (markConnected) {
-      if (!rSensor.connected) {        
-        rSensor.connected = true;
+    if (markConnected && !rSensor.connected) {
+      rSensor.connected = true;
 
-        Log.snoticeln(
-          FPSTR(L_SENSORS), F("#%hhu '%s' new status: CONNECTED"),
-          sensorId, sSensor.name
-        );
-      }
+      Log.snoticeln(
+        FPSTR(L_SENSORS), F("#%hhu '%s' new status: CONNECTED"),
+        sensorId, sSensor.name
+      );
     }
 
     Log.snoticeln(
@@ -351,13 +365,10 @@ public:
     return false;
   }
 
-  template <class T> 
-  static String cleanName(T value, char space = ' ') {
-    String clean = value;
-
+  static String& cleanName(String& value, char space = ' ') {
     // only valid symbols
-    for (uint8_t pos = 0; pos < clean.length(); pos++) {
-      char symbol = clean.charAt(pos);
+    for (uint8_t pos = 0; pos < value.length(); pos++) {
+      char symbol = value.charAt(pos);
 
       // 0..9
       if (symbol >= 48 && symbol <= 57) {
@@ -379,39 +390,68 @@ public:
         continue;
       }
 
-      clean.setCharAt(pos, space);
+      value.setCharAt(pos, space);
     }
 
-    clean.trim();
+    value.trim();
 
-    return clean;
+    return value;
+  }
+
+  template <class T> 
+  static String cleanName(T value, char space = ' ') {
+    String res = value;
+    return cleanName(res, space);
+  }
+
+  template <class T> 
+  static String& makeObjectId(String& res, T value, char separator = '_') {
+    res = value;
+    cleanName(res);
+    res.toLowerCase();
+    res.replace(' ', separator);
+
+    return res;
   }
 
   template <class T> 
   static String makeObjectId(T value, char separator = '_') {
-    auto objId = cleanName(value);
-    objId.toLowerCase();
-    objId.replace(' ', separator);
+    String res;
+    makeObjectId(res, value, separator);
 
-    return objId;
+    return res;
   }
 
   template <class TV, class TS> 
-  static auto makeObjectIdWithSuffix(TV value, TS suffix, char separator = '_') {
-    auto objId = makeObjectId(value, separator);
-    objId += separator;
-    objId += suffix;
+  static String& makeObjectIdWithSuffix(String& res, TV value, TS suffix, char separator = '_') {
+    res.clear();
+    makeObjectId(res, value, separator);
+    res += separator;
+    res += suffix;
 
-    return objId;
+    return res;
+  }
+
+  template <class TV, class TS> 
+  static String makeObjectIdWithSuffix(TV value, TS suffix, char separator = '_') {
+    String res;
+    makeObjectIdWithSuffix(res, value, suffix, separator);
+    return res;
   }
 
   template <class TV, class TP> 
-  static auto makeObjectIdWithPrefix(TV value, TP prefix, char separator = '_') {
-    String objId = prefix;
-    objId += separator;
-    objId += makeObjectId(value, separator);
+  static String& makeObjectIdWithPrefix(String& res, TV value, TP prefix, char separator = '_') {
+    res = prefix;
+    res += separator;
+    res += makeObjectId(value, separator).c_str();
 
-    return objId;
+    return res;
+  }
+
+  template <class TV, class TP> 
+  static String makeObjectIdWithPrefix(TV value, TP prefix, char separator = '_') {
+    String res;
+    return makeObjectIdWithPrefix(res, value, prefix, separator);
   }
 
   static uint8_t bluetoothRssiToQuality(int rssi) {

src/SensorsTask.h

@@ -59,18 +59,32 @@ protected:
   #endif
 
   void loop() {
+    if (vars.states.restarting || vars.states.upgrading) {
+      return;
+    }
+
     if (isPollingDallasSensors()) {
       pollingDallasSensors(false);
+      this->yield();
     }
 
     if (millis() - this->globalLastPollingTime > this->globalPollingInterval) {
-      makeDallasInstances();
       cleanDallasInstances();
+      makeDallasInstances();
+      this->yield();
+
       searchDallasSensors();
       fillingAddressesDallasSensors();
+      this->yield();
+
       pollingDallasSensors();
+      this->yield();
+
       pollingNtcSensors();
+      this->yield();
+
       pollingBleSensors();
+      this->yield();
 
       this->globalLastPollingTime = millis();
     }
@@ -292,6 +306,7 @@ protected:
             continue;
           }
           
+          auto& rSensor = Sensors::results[sensorId];
           float value = instance.getTempC(sSensor.address);
           if (value == DEVICE_DISCONNECTED_C) {
             Log.swarningln(
@@ -299,6 +314,10 @@ protected:
               sSensor.gpio, sensorId, sSensor.name
             );
 
+            if (rSensor.signalQuality > 0) {
+              rSensor.signalQuality--;
+            }
+
             continue;
           }
 
@@ -307,6 +326,10 @@ protected:
             sSensor.gpio, sensorId, sSensor.name, value
           );
 
+          if (rSensor.signalQuality < 100) {
+            rSensor.signalQuality++;
+          }
+
           // set sensor value
           Sensors::setValueById(sensorId, value, Sensors::ValueType::TEMPERATURE, true, true);
         }
@@ -324,6 +347,23 @@ protected:
 
         // check sensors on bus
         if (!instance.getDeviceCount()) {
+          for (uint8_t sensorId = 0; sensorId <= Sensors::getMaxSensorId(); sensorId++) {
+            auto& sSensor = Sensors::settings[sensorId];
+            
+            // only target & valid sensors
+            if (!sSensor.enabled || sSensor.type != Sensors::Type::DALLAS_TEMP || sSensor.purpose == Sensors::Purpose::NOT_CONFIGURED) {
+              continue;
+
+            } else if (sSensor.gpio != gpio || isEmptyAddress(sSensor.address)) {
+              continue;
+            }
+            
+            auto& rSensor = Sensors::results[sensorId];
+            if (rSensor.signalQuality > 0) {
+              rSensor.signalQuality--;
+            }
+          }
+
           continue;
         }
 
@@ -372,13 +412,13 @@ protected:
       const auto value = analogRead(sSensor.gpio) / 1023 * DEFAULT_NTC_VREF;
       #endif
 
-      if (value < DEFAULT_NTC_VLOW_TRESHOLD) {
+      if (value < DEFAULT_NTC_VLOW_TRESHOLD || value > DEFAULT_NTC_VHIGH_TRESHOLD) {
         if (Sensors::getConnectionStatusById(sensorId)) {
           Sensors::setConnectionStatusById(sensorId, false, false);
         }
 
         Log.swarningln(
-          FPSTR(L_SENSORS_NTC), F("GPIO %hhu, sensor #%hhu '%s', voltage too low: %.2f"),
+          FPSTR(L_SENSORS_NTC), F("GPIO %hhu, sensor #%hhu '%s', voltage is out of threshold: %.3f"),
           sSensor.gpio, sensorId, sSensor.name, (value / 1000.0f)
         );
 
@@ -521,7 +561,7 @@ protected:
               return;
             }
 
-            float rawTemp = ((pData[0] | (pData[1] << 8)) * 0.01f);
+            float rawTemp = (pChar->getValue<int16_t>() * 0.01f);
             Log.straceln(
               FPSTR(L_SENSORS_BLE),
               F("Sensor #%hhu '%s': received temp: %.2f"),
@@ -594,7 +634,7 @@ protected:
               return;
             }
 
-            float rawTemp = ((pData[0] | (pData[1] << 8)) * 0.1f);
+            float rawTemp = (pChar->getValue<int16_t>() * 0.1f);
             Log.straceln(
               FPSTR(L_SENSORS_BLE),
               F("Sensor #%hhu '%s': received temp: %.2f"),
@@ -679,7 +719,7 @@ protected:
                 return;
               }
 
-              float rawHumidity = ((pData[0] | (pData[1] << 8)) * 0.01f);
+              float rawHumidity = (pChar->getValue<uint16_t>() * 0.01f);
               Log.straceln(
                 FPSTR(L_SENSORS_BLE),
                 F("Sensor #%hhu '%s': received humidity: %.2f"),
@@ -778,7 +818,7 @@ protected:
                 return;
               }
 
-              uint8_t rawBattery = pData[0];
+              auto rawBattery = pChar->getValue<uint8_t>();
               Log.straceln(
                 FPSTR(L_SENSORS_BLE),
                 F("Sensor #%hhu '%s': received battery: %.2f"),

src/Settings.h

@@ -154,7 +154,7 @@ Sensors::Settings sensorsSettings[SENSORS_AMOUNT] = {
     false,
     "Outdoor temp",
     Sensors::Purpose::OUTDOOR_TEMP,
-    Sensors::Type::DALLAS_TEMP,
+    Sensors::Type::OT_OUTDOOR_TEMP,
     DEFAULT_SENSOR_OUTDOOR_GPIO
   },
   {
@@ -215,7 +215,7 @@ Sensors::Settings sensorsSettings[SENSORS_AMOUNT] = {
   {
     true,
     "Power",
-    Sensors::Purpose::CURRENT_POWER,
+    Sensors::Purpose::POWER,
     Sensors::Type::OT_CURRENT_POWER,
   }
 };
@@ -236,7 +236,7 @@ struct Variables {
 
   struct {
     bool state = false;
-    unsigned long lastEnableTime = 0;
+    unsigned long lastEnabledTime = 0;
   } externalPump;
 
   struct {
@@ -255,6 +255,7 @@ struct Variables {
       bool blocking = false;
       bool enabled = false;
       bool indoorTempControl = false;
+      float setpointTemp = 0.0f;
       float targetTemp = 0.0f;
       float currentTemp = 0.0f;
       float returnTemp = 0.0f;
@@ -287,7 +288,6 @@ struct Variables {
     bool connected = false;
     bool flame = false;
     float pressure = 0.0f;
-    float exhaustTemp = 0.0f;
     float heatExchangerTemp = 0.0f;
 
     struct {
@@ -312,6 +312,23 @@ struct Variables {
       float max = 0.0f;
     } power;
 
+    struct {
+      float temp = 0.0f;
+      uint16_t co2 = 0;
+      uint16_t fanSpeed = 0;
+    } exhaust;
+
+    struct {
+      float storage = 0.0f;
+      float collector = 0.0f;
+    } solar;
+
+    struct {
+      uint8_t setpoint = 0;
+      uint8_t current = 0;
+      uint16_t supply = 0;
+    } fanSpeed;
+
     struct {
       bool active = false;
       bool enabled = false;
@@ -349,4 +366,9 @@ struct Variables {
     bool resetFault = false;
     bool resetDiagnostic = false;
   } actions;
+
+  struct {
+    bool restarting = false;
+    bool upgrading = false;
+  } states;
 } vars;

src/defines.h

@@ -24,6 +24,7 @@
 #define DEFAULT_NTC_BETA_FACTOR         3950.0f
 #define DEFAULT_NTC_VREF                3300.0f
 #define DEFAULT_NTC_VLOW_TRESHOLD       25.0f
+#define DEFAULT_NTC_VHIGH_TRESHOLD      3298.0f
 
 #ifndef BUILD_VERSION
   #define BUILD_VERSION                 "0.0.0"
@@ -152,7 +153,7 @@
 #ifdef ARDUINO_ARCH_ESP32
   #include <driver/gpio.h>
 #elif !defined(GPIO_IS_VALID_GPIO)
-  #define GPIO_IS_VALID_GPIO(gpioNum) (gpioNum >= 0 && gpioNum <= 16)
+  #define GPIO_IS_VALID_GPIO(gpioNum) (gpioNum >= 0 && gpioNum <= 17)
 #endif
 
 #define GPIO_IS_VALID(gpioNum) (gpioNum != GPIO_IS_NOT_CONFIGURED && GPIO_IS_VALID_GPIO(gpioNum))

src/main.cpp

@@ -1,13 +1,17 @@
+#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 <TinyLogger.h>
-#include <NetworkMgr.h>
 
 #include "defines.h"
 #include "strings.h"
+
+#include <TinyLogger.h>
+#include <NetworkMgr.h>
 #include "CrashRecorder.h"
 #include "Sensors.h"
 #include "Settings.h"

src/strings.h

@@ -3,32 +3,192 @@
   #define PROGMEM 
 #endif
 
-const char L_SETTINGS[]             PROGMEM = "SETTINGS";
-const char L_SETTINGS_OT[]          PROGMEM = "SETTINGS.OT";
-const char L_SETTINGS_DHW[]         PROGMEM = "SETTINGS.DHW";
-const char L_SETTINGS_HEATING[]     PROGMEM = "SETTINGS.HEATING";
-const char L_NETWORK[]              PROGMEM = "NETWORK";
-const char L_NETWORK_SETTINGS[]     PROGMEM = "NETWORK.SETTINGS";
-const char L_PORTAL_WEBSERVER[]     PROGMEM = "PORTAL.WEBSERVER";
-const char L_PORTAL_DNSSERVER[]     PROGMEM = "PORTAL.DNSSERVER";
-const char L_PORTAL_CAPTIVE[]       PROGMEM = "PORTAL.CAPTIVE";
-const char L_PORTAL_OTA[]           PROGMEM = "PORTAL.OTA";
-const char L_MAIN[]                 PROGMEM = "MAIN";
-const char L_MQTT[]                 PROGMEM = "MQTT";
-const char L_MQTT_HA[]              PROGMEM = "MQTT.HA";
-const char L_MQTT_MSG[]             PROGMEM = "MQTT.MSG";
-const char L_OT[]                   PROGMEM = "OT";
-const char L_OT_DHW[]               PROGMEM = "OT.DHW";
-const char L_OT_HEATING[]           PROGMEM = "OT.HEATING";
-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_NTC[]          PROGMEM = "SENSORS.NTC";
-const char L_SENSORS_BLE[]          PROGMEM = "SENSORS.BLE";
-const char L_REGULATOR[]            PROGMEM = "REGULATOR";
-const char L_REGULATOR_PID[]        PROGMEM = "REGULATOR.PID";
-const char L_REGULATOR_EQUITHERM[]  PROGMEM = "REGULATOR.EQUITHERM";
-const char L_CASCADE_INPUT[]        PROGMEM = "CASCADE.INPUT";
-const char L_CASCADE_OUTPUT[]       PROGMEM = "CASCADE.OUTPUT";
-const char L_EXTPUMP[]              PROGMEM = "EXTPUMP";
+const char L_SETTINGS[]                        PROGMEM = "SETTINGS";
+const char L_SETTINGS_OT[]                     PROGMEM = "SETTINGS.OT";
+const char L_SETTINGS_DHW[]                    PROGMEM = "SETTINGS.DHW";
+const char L_SETTINGS_HEATING[]                PROGMEM = "SETTINGS.HEATING";
+const char L_NETWORK[]                         PROGMEM = "NETWORK";
+const char L_NETWORK_SETTINGS[]                PROGMEM = "NETWORK.SETTINGS";
+const char L_PORTAL_WEBSERVER[]                PROGMEM = "PORTAL.WEBSERVER";
+const char L_PORTAL_DNSSERVER[]                PROGMEM = "PORTAL.DNSSERVER";
+const char L_PORTAL_CAPTIVE[]                  PROGMEM = "PORTAL.CAPTIVE";
+const char L_PORTAL_OTA[]                      PROGMEM = "PORTAL.OTA";
+const char L_MAIN[]                            PROGMEM = "MAIN";
+const char L_MQTT[]                            PROGMEM = "MQTT";
+const char L_MQTT_HA[]                         PROGMEM = "MQTT.HA";
+const char L_MQTT_MSG[]                        PROGMEM = "MQTT.MSG";
+const char L_OT[]                              PROGMEM = "OT";
+const char L_OT_DHW[]                          PROGMEM = "OT.DHW";
+const char L_OT_HEATING[]                      PROGMEM = "OT.HEATING";
+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_NTC[]                     PROGMEM = "SENSORS.NTC";
+const char L_SENSORS_BLE[]                     PROGMEM = "SENSORS.BLE";
+const char L_REGULATOR[]                       PROGMEM = "REGULATOR";
+const char L_REGULATOR_PID[]                   PROGMEM = "REGULATOR.PID";
+const char L_REGULATOR_EQUITHERM[]             PROGMEM = "REGULATOR.EQUITHERM";
+const char L_CASCADE_INPUT[]                   PROGMEM = "CASCADE.INPUT";
+const char L_CASCADE_OUTPUT[]                  PROGMEM = "CASCADE.OUTPUT";
+const char L_EXTPUMP[]                         PROGMEM = "EXTPUMP";
+
+
+const char S_ACTIONS[]                         PROGMEM = "actions";
+const char S_ACTIVE[]                          PROGMEM = "active";
+const char S_ADDRESS[]                         PROGMEM = "address";
+const char S_ANTI_STUCK_INTERVAL[]             PROGMEM = "antiStuckInterval";
+const char S_ANTI_STUCK_TIME[]                 PROGMEM = "antiStuckTime";
+const char S_AP[]                              PROGMEM = "ap";
+const char S_APP_VERSION[]                     PROGMEM = "appVersion";
+const char S_AUTH[]                            PROGMEM = "auth";
+const char S_BACKTRACE[]                       PROGMEM = "backtrace";
+const char S_BATTERY[]                         PROGMEM = "battery";
+const char S_BAUDRATE[]                        PROGMEM = "baudrate";
+const char S_BLOCKING[]                        PROGMEM = "blocking";
+const char S_BSSID[]                           PROGMEM = "bssid";
+const char S_BUILD[]                           PROGMEM = "build";
+const char S_CASCADE_CONTROL[]                 PROGMEM = "cascadeControl";
+const char S_CHANNEL[]                         PROGMEM = "channel";
+const char S_CHIP[]                            PROGMEM = "chip";
+const char S_CODE[]                            PROGMEM = "code";
+const char S_CONNECTED[]                       PROGMEM = "connected";
+const char S_CONTINUES[]                       PROGMEM = "continues";
+const char S_CORE[]                            PROGMEM = "core";
+const char S_CORES[]                           PROGMEM = "cores";
+const char S_CRASH[]                           PROGMEM = "crash";
+const char S_CURRENT_TEMP[]                    PROGMEM = "currentTemp";
+const char S_DATA[]                            PROGMEM = "data";
+const char S_DATE[]                            PROGMEM = "date";
+const char S_DHW[]                             PROGMEM = "dhw";
+const char S_DHW_BLOCKING[]                    PROGMEM = "dhwBlocking";
+const char S_DHW_PRESENT[]                     PROGMEM = "dhwPresent";
+const char S_DHW_TO_CH2[]                      PROGMEM = "dhwToCh2";
+const char S_DIAG[]                            PROGMEM = "diag";
+const char S_DNS[]                             PROGMEM = "dns";
+const char S_DT[]                              PROGMEM = "dt";
+const char S_D_FACTOR[]                        PROGMEM = "d_factor";
+const char S_EMERGENCY[]                       PROGMEM = "emergency";
+const char S_ENABLED[]                         PROGMEM = "enabled";
+const char S_ENV[]                             PROGMEM = "env";
+const char S_EPC[]                             PROGMEM = "epc";
+const char S_EQUITHERM[]                       PROGMEM = "equitherm";
+const char S_EXTERNAL_PUMP[]                   PROGMEM = "externalPump";
+const char S_FACTOR[]                          PROGMEM = "factor";
+const char S_FAULT[]                           PROGMEM = "fault";
+const char S_FILTERING[]                       PROGMEM = "filtering";
+const char S_FILTERING_FACTOR[]                PROGMEM = "filteringFactor";
+const char S_FLAGS[]                           PROGMEM = "flags";
+const char S_FLAME[]                           PROGMEM = "flame";
+const char S_FLASH[]                           PROGMEM = "flash";
+const char S_FREE[]                            PROGMEM = "free";
+const char S_FREQ[]                            PROGMEM = "freq";
+const char S_GATEWAY[]                         PROGMEM = "gateway";
+const char S_GET_MIN_MAX_TEMP[]                PROGMEM = "getMinMaxTemp";
+const char S_GPIO[]                            PROGMEM = "gpio";
+const char S_HEAP[]                            PROGMEM = "heap";
+const char S_HEATING[]                         PROGMEM = "heating";
+const char S_HEATING_CH1_TO_CH2[]              PROGMEM = "heatingCh1ToCh2";
+const char S_HEATING_CH2_ENABLED[]             PROGMEM = "heatingCh2Enabled";
+const char S_HIDDEN[]                          PROGMEM = "hidden";
+const char S_HOME_ASSISTANT_DISCOVERY[]        PROGMEM = "homeAssistantDiscovery";
+const char S_HOSTNAME[]                        PROGMEM = "hostname";
+const char S_HUMIDITY[]                        PROGMEM = "humidity";
+const char S_HYSTERESIS[]                      PROGMEM = "hysteresis";
+const char S_ID[]                              PROGMEM = "id";
+const char S_IMMERGAS_FIX[]                    PROGMEM = "immergasFix";
+const char S_INDOOR_TEMP[]                     PROGMEM = "indoorTemp";
+const char S_INDOOR_TEMP_CONTROL[]             PROGMEM = "indoorTempControl";
+const char S_IN_GPIO[]                         PROGMEM = "inGpio";
+const char S_INPUT[]                           PROGMEM = "input";
+const char S_INTERVAL[]                        PROGMEM = "interval";
+const char S_INVERT_STATE[]                    PROGMEM = "invertState";
+const char S_IP[]                              PROGMEM = "ip";
+const char S_I_FACTOR[]                        PROGMEM = "i_factor";
+const char S_K_FACTOR[]                        PROGMEM = "k_factor";
+const char S_LOGIN[]                           PROGMEM = "login";
+const char S_LOG_LEVEL[]                       PROGMEM = "logLevel";
+const char S_MAC[]                             PROGMEM = "mac";
+const char S_MASTER[]                          PROGMEM = "master";
+const char S_MAX[]                             PROGMEM = "max";
+const char S_MAX_FREE_BLOCK[]                  PROGMEM = "maxFreeBlock";
+const char S_MAX_MODULATION[]                  PROGMEM = "maxModulation";
+const char S_MAX_POWER[]                       PROGMEM = "maxPower";
+const char S_MAX_TEMP[]                        PROGMEM = "maxTemp";
+const char S_MEMBER_ID[]                       PROGMEM = "memberId";
+const char S_MIN[]                             PROGMEM = "min";
+const char S_MIN_FREE[]                        PROGMEM = "minFree";
+const char S_MIN_MAX_FREE_BLOCK[]              PROGMEM = "minMaxFreeBlock";
+const char S_MIN_POWER[]                       PROGMEM = "minPower";
+const char S_MIN_TEMP[]                        PROGMEM = "minTemp";
+const char S_MODEL[]                           PROGMEM = "model";
+const char S_MODULATION[]                      PROGMEM = "modulation";
+const char S_MODULATION_SYNC_WITH_HEATING[]    PROGMEM = "modulationSyncWithHeating";
+const char S_MQTT[]                            PROGMEM = "mqtt";
+const char S_NAME[]                            PROGMEM = "name";
+const char S_NATIVE_HEATING_CONTROL[]          PROGMEM = "nativeHeatingControl";
+const char S_NETWORK[]                         PROGMEM = "network";
+const char S_N_FACTOR[]                        PROGMEM = "n_factor";
+const char S_OFFSET[]                          PROGMEM = "offset";
+const char S_ON_ENABLED_HEATING[]              PROGMEM = "onEnabledHeating";
+const char S_ON_FAULT[]                        PROGMEM = "onFault";
+const char S_ON_LOSS_CONNECTION[]              PROGMEM = "onLossConnection";
+const char S_OPENTHERM[]                       PROGMEM = "opentherm";
+const char S_OUTDOOR_TEMP[]                    PROGMEM = "outdoorTemp";
+const char S_OUT_GPIO[]                        PROGMEM = "outGpio";
+const char S_OUTPUT[]                          PROGMEM = "output";
+const char S_PASSWORD[]                        PROGMEM = "password";
+const char S_PID[]                             PROGMEM = "pid";
+const char S_PORT[]                            PROGMEM = "port";
+const char S_PORTAL[]                          PROGMEM = "portal";
+const char S_POST_CIRCULATION_TIME[]           PROGMEM = "postCirculationTime";
+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_P_FACTOR[]                        PROGMEM = "p_factor";
+const char S_REAL_SIZE[]                       PROGMEM = "realSize";
+const char S_REASON[]                          PROGMEM = "reason";
+const char S_RESET_DIAGNOSTIC[]                PROGMEM = "resetDiagnostic";
+const char S_RESET_FAULT[]                     PROGMEM = "resetFault";
+const char S_RESET_REASON[]                    PROGMEM = "resetReason";
+const char S_RESTART[]                         PROGMEM = "restart";
+const char S_RETURN_TEMP[]                     PROGMEM = "returnTemp";
+const char S_REV[]                             PROGMEM = "rev";
+const char S_RSSI[]                            PROGMEM = "rssi";
+const char S_RX_LED_GPIO[]                     PROGMEM = "rxLedGpio";
+const char S_SDK[]                             PROGMEM = "sdk";
+const char S_SENSORS[]                         PROGMEM = "sensors";
+const char S_SERIAL[]                          PROGMEM = "serial";
+const char S_SERVER[]                          PROGMEM = "server";
+const char S_SETTINGS[]                        PROGMEM = "settings";
+const char S_SIGNAL_QUALITY[]                  PROGMEM = "signalQuality";
+const char S_SIZE[]                            PROGMEM = "size";
+const char S_SLAVE[]                           PROGMEM = "slave";
+const char S_SSID[]                            PROGMEM = "ssid";
+const char S_STA[]                             PROGMEM = "sta";
+const char S_STATE[]                           PROGMEM = "state";
+const char S_STATIC_CONFIG[]                   PROGMEM = "staticConfig";
+const char S_STATUS_LED_GPIO[]                 PROGMEM = "statusLedGpio";
+const char S_SETPOINT_TEMP[]                   PROGMEM = "setpointTemp";
+const char S_SUBNET[]                          PROGMEM = "subnet";
+const char S_SUMMER_WINTER_MODE[]              PROGMEM = "summerWinterMode";
+const char S_SYSTEM[]                          PROGMEM = "system";
+const char S_TARGET[]                          PROGMEM = "target";
+const char S_TARGET_TEMP[]                     PROGMEM = "targetTemp";
+const char S_TELNET[]                          PROGMEM = "telnet";
+const char S_TEMPERATURE[]                     PROGMEM = "temperature";
+const char S_THRESHOLD_TIME[]                  PROGMEM = "thresholdTime";
+const char S_TOTAL[]                           PROGMEM = "total";
+const char S_TRESHOLD_TIME[]                   PROGMEM = "tresholdTime";
+const char S_TURBO[]                           PROGMEM = "turbo";
+const char S_TURBO_FACTOR[]                    PROGMEM = "turboFactor";
+const char S_TYPE[]                            PROGMEM = "type";
+const char S_T_FACTOR[]                        PROGMEM = "t_factor";
+const char S_UNIT_SYSTEM[]                     PROGMEM = "unitSystem";
+const char S_UPTIME[]                          PROGMEM = "uptime";
+const char S_USE[]                             PROGMEM = "use";
+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";

src_data/fonts/iconly.svg

@@ -49,6 +49,12 @@
     <glyph glyph-name="wifi-strength-2-1"
       unicode="&#x77;&#x69;&#x66;&#x69;&#x5F;&#x73;&#x74;&#x72;&#x65;&#x6E;&#x67;&#x74;&#x68;&#x5F;&#x32;"
       horiz-adv-x="1022.9733303792667" d="M511.4866651896334 768.1283337025917C332.0397604864727 768.1283337025917 157.7087214326013 708.0286505428097 16.1967447318741 597.6324456402496C187.9713494571903 381.9559014844185 336.3024823621839 198.2472739029395 511.4866651896334 -20.4132754656288C685.3921313541088 196.1154134663874 862.7071756207173 416.9078232715078 1008.0553023103668 597.6324456402497C866.1177527202434 708.0286505428097 691.3591427821901 768.1283337025917 511.4866651896334 768.1283337025917M511.4866651896334 682.8808891701171C642.3423366997788 682.8808891701171 771.0661477733722 646.2236788332648 882.7410693389065 578.4516956956384L745.9183864006797 408.8089514068742C693.0644313319532 438.2194346552781 612.505281564586 469.7607793428413 511.4866651896334 469.7607793428413C410.0414769278917 469.7607793428413 329.9088990473136 437.7928627684892 277.0549439785871 408.8089514068743L139.3801162641751 578.8782675824273C251.9071826058945 646.6502507200537 380.6309936794878 682.8808891701171 511.4866651896334 682.8808891701171z" />
+    <glyph glyph-name="error"
+      unicode="&#xE007;"
+      horiz-adv-x="1024" d="M512 810.667C747.605 810.667 938.667 619.605 938.667 384C938.667 148.395 747.6049999999999 -42.6669999999999 511.9999999999999 -42.6669999999999C276.395 -42.6669999999999 85.333 148.3950000000001 85.333 384.0000000000001C85.333 619.605 276.395 810.667 512 810.667zM512 725.333C323.7970000000001 725.333 170.667 572.203 170.667 384C170.667 195.797 323.797 42.6669999999999 512 42.6669999999999C700.203 42.6669999999999 853.3330000000001 195.7969999999999 853.3330000000001 384C853.3330000000001 572.203 700.2030000000001 725.3330000000001 512 725.3330000000001zM609.835 542.165L670.1650000000001 481.835L572.33 384L670.1650000000001 286.165L609.835 225.8349999999999L512 323.67L414.165 225.8349999999999L353.8350000000001 286.165L451.67 384L353.8350000000001 481.835L414.165 542.165L512 444.33L609.835 542.165z" />
+    <glyph glyph-name="error-1"
+      unicode="&#x65;&#x72;&#x72;&#x6F;&#x72;"
+      horiz-adv-x="1024" d="M512 810.667C747.605 810.667 938.667 619.605 938.667 384C938.667 148.395 747.6049999999999 -42.6669999999999 511.9999999999999 -42.6669999999999C276.395 -42.6669999999999 85.333 148.3950000000001 85.333 384.0000000000001C85.333 619.605 276.395 810.667 512 810.667zM512 725.333C323.7970000000001 725.333 170.667 572.203 170.667 384C170.667 195.797 323.797 42.6669999999999 512 42.6669999999999C700.203 42.6669999999999 853.3330000000001 195.7969999999999 853.3330000000001 384C853.3330000000001 572.203 700.2030000000001 725.3330000000001 512 725.3330000000001zM609.835 542.165L670.1650000000001 481.835L572.33 384L670.1650000000001 286.165L609.835 225.8349999999999L512 323.67L414.165 225.8349999999999L353.8350000000001 286.165L451.67 384L353.8350000000001 481.835L414.165 542.165L512 444.33L609.835 542.165z" />
     <glyph glyph-name="wifi-strength-3"
       unicode="&#xE008;"
       horiz-adv-x="1022.9733303792667" d="M511.4866651896334 768.1283337025917C332.0397604864727 768.1283337025917 157.7087214326013 708.0286505428097 16.1967447318741 597.6324456402496C187.9713494571903 381.9559014844185 336.3024823621839 198.2472739029395 511.4866651896334 -20.4132754656288C685.3921313541088 196.1154134663874 862.7071756207173 416.9078232715078 1008.0553023103668 597.6324456402497C866.1177527202434 708.0286505428097 691.3591427821901 768.1283337025917 511.4866651896334 768.1283337025917M511.4866651896334 682.8808891701171C642.3423366997788 682.8808891701171 771.0661477733722 646.2236788332648 882.7410693389065 578.4516956956384L800.0500591349871 474.8756459947375C735.688653096887 512.385001107775 634.2434648351453 555.0092228727087 511.4866651896334 555.0092228727087C383.614998892225 555.0092228727087 284.7272439564316 512.385001107775 222.0701274707015 476.5809345445006L139.3801162641751 578.8782675824273C251.9071826058945 646.6502507200537 380.6309936794878 682.8808891701171 511.4866651896334 682.8808891701171z" />
@@ -67,12 +73,24 @@
     <glyph glyph-name="wifi-strength-4-1"
       unicode="&#x77;&#x69;&#x66;&#x69;&#x5F;&#x73;&#x74;&#x72;&#x65;&#x6E;&#x67;&#x74;&#x68;&#x5F;&#x34;"
       horiz-adv-x="1022.9733303792667" d="M511.4866651896334 768.1283337025917C332.0397604864727 768.1283337025917 157.7087214326013 708.0286505428097 16.1967447318741 597.6324456402496C187.9713494571903 381.9559014844185 336.3024823621839 198.2472739029395 511.4866651896334 -20.4132754656288C685.3921313541088 196.1154134663874 862.7071756207173 416.9078232715078 1008.0553023103668 597.6324456402497C866.1177527202434 708.0286505428097 691.3591427821901 768.1283337025917 511.4866651896334 768.1283337025917z" />
+    <glyph glyph-name="success"
+      unicode="&#xE00B;"
+      horiz-adv-x="1024" d="M512 810.667C276.36 810.667 85.333 619.64 85.333 384C85.333 148.36 276.3590000000001 -42.6669999999999 512 -42.6669999999999C747.64 -42.6669999999999 938.667 148.3590000000002 938.667 384.0000000000001C938.667 619.64 747.64 810.667 512 810.667zM512 42.667C323.79 42.667 170.667 195.789 170.667 384.0000000000001C170.667 572.21 323.789 725.3330000000001 512 725.3330000000001C700.21 725.3330000000001 853.3330000000001 572.211 853.3330000000001 384.0000000000001C853.3330000000001 195.7900000000001 700.211 42.667 512 42.667zM672.672 536.437L733.005 476.104L469.333 211.328L311.167 369.495L371.5 429.828L469.333 331.995L672.673 536.438z" />
+    <glyph glyph-name="success-1"
+      unicode="&#x73;&#x75;&#x63;&#x63;&#x65;&#x73;&#x73;"
+      horiz-adv-x="1024" d="M512 810.667C276.36 810.667 85.333 619.64 85.333 384C85.333 148.36 276.3590000000001 -42.6669999999999 512 -42.6669999999999C747.64 -42.6669999999999 938.667 148.3590000000002 938.667 384.0000000000001C938.667 619.64 747.64 810.667 512 810.667zM512 42.667C323.79 42.667 170.667 195.789 170.667 384.0000000000001C170.667 572.21 323.789 725.3330000000001 512 725.3330000000001C700.21 725.3330000000001 853.3330000000001 572.211 853.3330000000001 384.0000000000001C853.3330000000001 195.7900000000001 700.211 42.667 512 42.667zM672.672 536.437L733.005 476.104L469.333 211.328L311.167 369.495L371.5 429.828L469.333 331.995L672.673 536.438z" />
     <glyph glyph-name="up"
       unicode="&#xE00C;"
       horiz-adv-x="893.7641930109211" d="M69.6258266430383 317.8562626928574L25.3366188643721 362.1454704715236C6.5835308860179 380.8985584498777 6.5835308860179 411.2227007127483 25.3366188643721 429.7762877551625L412.9669373956711 817.6021172036826C431.7200253740253 836.3552051820368 462.0441676368958 836.3552051820368 480.59775467931 817.6021172036826L868.2280732106092 429.9717986723836C886.9811611889633 411.2187106940295 886.9811611889633 380.894568431159 868.2280732106092 362.3409813887447L823.938865431943 318.0517736100786C804.9862765176489 299.0991846957845 774.0636314469585 299.4981865676644 755.5100444045443 318.8497773538383L526.6824708814356 559.0528942442421V-14.3127956471388C526.6824708814356 -40.8464201271506 505.3358707358623 -62.1930202727239 478.8022462558506 -62.1930202727239H414.9619467550705C388.4283222750588 -62.1930202727239 367.0817221294855 -40.8464201271506 367.0817221294855 -14.3127956471388V559.0528942442422L138.0546476704369 318.6542664366173C119.5010606280227 299.1031747145034 88.5784155573324 298.7041728426234 69.6258266430383 317.8562626928575z" />
     <glyph glyph-name="up-1"
       unicode="&#x75;&#x70;"
       horiz-adv-x="893.7641930109211" d="M69.6258266430383 317.8562626928574L25.3366188643721 362.1454704715236C6.5835308860179 380.8985584498777 6.5835308860179 411.2227007127483 25.3366188643721 429.7762877551625L412.9669373956711 817.6021172036826C431.7200253740253 836.3552051820368 462.0441676368958 836.3552051820368 480.59775467931 817.6021172036826L868.2280732106092 429.9717986723836C886.9811611889633 411.2187106940295 886.9811611889633 380.894568431159 868.2280732106092 362.3409813887447L823.938865431943 318.0517736100786C804.9862765176489 299.0991846957845 774.0636314469585 299.4981865676644 755.5100444045443 318.8497773538383L526.6824708814356 559.0528942442421V-14.3127956471388C526.6824708814356 -40.8464201271506 505.3358707358623 -62.1930202727239 478.8022462558506 -62.1930202727239H414.9619467550705C388.4283222750588 -62.1930202727239 367.0817221294855 -40.8464201271506 367.0817221294855 -14.3127956471388V559.0528942442422L138.0546476704369 318.6542664366173C119.5010606280227 299.1031747145034 88.5784155573324 298.7041728426234 69.6258266430383 317.8562626928575z" />
+    <glyph glyph-name="alarm"
+      unicode="&#xE00D;"
+      horiz-adv-x="1024" d="M512 810.667C747.22 810.667 938.667 619.22 938.667 384C938.667 148.78 747.2199999999999 -42.6669999999999 511.9999999999999 -42.6669999999999C276.78 -42.667 85.333 148.78 85.333 384C85.333 619.22 276.78 810.667 512 810.667zM512 725.333C323.082 725.333 170.667 572.918 170.667 384C170.667 195.082 323.082 42.6669999999999 512 42.6669999999999C700.918 42.6669999999999 853.3330000000001 195.0819999999999 853.3330000000001 384C853.3330000000001 572.918 700.9180000000001 725.3330000000001 512 725.3330000000001zM512 266.581C542.476 266.581 565.333 244.054 565.333 213.3340000000001S542.476 160.085 512 160.085C480.83 160.085 458.667 182.6130000000001 458.667 214.015C458.667 244.053 481.524 266.581 512 266.581zM554.667 640V341.3330000000001H469.333V640H554.667z" />
+    <glyph glyph-name="alarm-1"
+      unicode="&#x61;&#x6C;&#x61;&#x72;&#x6D;"
+      horiz-adv-x="1024" d="M512 810.667C747.22 810.667 938.667 619.22 938.667 384C938.667 148.78 747.2199999999999 -42.6669999999999 511.9999999999999 -42.6669999999999C276.78 -42.667 85.333 148.78 85.333 384C85.333 619.22 276.78 810.667 512 810.667zM512 725.333C323.082 725.333 170.667 572.918 170.667 384C170.667 195.082 323.082 42.6669999999999 512 42.6669999999999C700.918 42.6669999999999 853.3330000000001 195.0819999999999 853.3330000000001 384C853.3330000000001 572.918 700.9180000000001 725.3330000000001 512 725.3330000000001zM512 266.581C542.476 266.581 565.333 244.054 565.333 213.3340000000001S542.476 160.085 512 160.085C480.83 160.085 458.667 182.6130000000001 458.667 214.015C458.667 244.053 481.524 266.581 512 266.581zM554.667 640V341.3330000000001H469.333V640H554.667z" />
   </font>
 </defs>
 </svg>

src_data/locales/en.json

@@ -105,7 +105,8 @@
         "mHeatEnabled": "Heating enabled",
         "mHeatBlocking": "Heating blocked",
         "sHeatActive": "Heating active",
-        "mHeatTargetTemp": "Heating setpoint temp",
+        "mHeatSetpointTemp": "Heating setpoint temp",
+        "mHeatTargetTemp": "Heating target temp",
         "mHeatCurrTemp": "Heating current temp",
         "mHeatRetTemp": "Heating return temp",
         "mHeatIndoorTemp": "Heating, indoor temp",
@@ -113,9 +114,18 @@
 
         "mDhwEnabled": "DHW enabled",
         "sDhwActive": "DHW active",
-        "mDhwTargetTemp": "DHW setpoint temp",
+        "mDhwTargetTemp": "DHW target temp",
         "mDhwCurrTemp": "DHW current temp",
         "mDhwRetTemp": "DHW return temp"
+      },
+
+      "sensors": {
+        "values": {
+          "temp": "Temperature",
+          "humidity": "Humidity",
+          "battery": "Battery",
+          "rssi": "RSSI"
+        }
       }
     },
 
@@ -178,7 +188,10 @@
         "dhwFlowRate": "DHW, flow rate",
         "exhaustTemp": "Exhaust temperature",
         "modLevel": "Modulation level (in percents)",
-        "currentPower": "Current power (in kWt)",
+        "powerFactor": "Power (in percent)",
+        "power": "Power (in kWt)",
+        "fanSpeed": "Fan speed",
+        "co2": "CO2",
         "pressure": "Pressure",
         "humidity": "Humidity",
         "temperature": "Temperature",
@@ -198,6 +211,14 @@
         "otPressure": "OpenTherm, pressure",
         "otModLevel": "OpenTherm, modulation level",
         "otCurrentPower": "OpenTherm, current power",
+        "otExhaustCo2": "OpenTherm, exhaust CO2",
+        "otExhaustFanSpeed": "OpenTherm, exhaust fan speed",
+        "otSupplyFanSpeed": "OpenTherm, supply fan speed",
+        "otSolarStorageTemp": "OpenTherm, solar storage temp",
+        "otSolarCollectorTemp": "OpenTherm, solar collector temp",
+        "otFanSpeedSetpoint": "OpenTherm, setpoint fan speed",
+        "otFanSpeedCurrent": "OpenTherm, current fan speed",
+        
         "ntcTemp": "NTC sensor",
         "dallasTemp": "DALLAS sensor",
         "bluetooth": "BLE sensor",
@@ -407,7 +428,7 @@
 
       "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 10 seconds."
+        "disclaimer2": "After a successful upgrade, the device will automatically reboot after 15 seconds."
       },
 
       "settingsFile": "Settings file",

src_data/locales/ru.json

@@ -105,6 +105,7 @@
         "mHeatEnabled": "Отопление",
         "mHeatBlocking": "Блокировка отопления",
         "sHeatActive": "Активность отопления",
+        "mHeatSetpointTemp": "Отопление, уставка",
         "mHeatTargetTemp": "Отопление, целевая температура",
         "mHeatCurrTemp": "Отопление, текущая температура",
         "mHeatRetTemp": "Отопление, температура обратки",
@@ -116,6 +117,15 @@
         "mDhwTargetTemp": "ГВС, целевая температура",
         "mDhwCurrTemp": "ГВС, текущая температура",
         "mDhwRetTemp": "ГВС, температура обратки"
+      },
+      
+      "sensors": {
+        "values": {
+          "temp": "Температура",
+          "humidity": "Влажность",
+          "battery": "Уровень заряда",
+          "rssi": "RSSI"
+        }
       }
     },
 
@@ -178,7 +188,10 @@
         "dhwFlowRate": "ГВС, расход/скорость потока",
         "exhaustTemp": "Температура выхлопных газов",
         "modLevel": "Уровень модуляции (в процентах)",
-        "currentPower": "Текущая мощность (в кВт)",
+        "powerFactor": "Мощность (в процентах)",
+        "power": "Мощность (в кВт)",
+        "fanSpeed": "Скорость вентилятора",
+        "co2": "CO2",
         "pressure": "Давление",
         "humidity": "Влажность",
         "temperature": "Температура",
@@ -198,6 +211,14 @@
         "otPressure": "OpenTherm, давление",
         "otModLevel": "OpenTherm, уровень модуляции",
         "otCurrentPower": "OpenTherm, текущая мощность",
+        "otExhaustCo2": "OpenTherm, CO2 вытяжного воздуха",
+        "otExhaustFanSpeed": "OpenTherm, скорость вытяжного вентилятора",
+        "otSupplyFanSpeed": "OpenTherm, скорость приточного вентилятора",
+        "otSolarStorageTemp": "OpenTherm, темп. бойлера солн. коллектора",
+        "otSolarCollectorTemp": "OpenTherm, темп. солн. коллектора",
+        "otFanSpeedSetpoint": "OpenTherm, установленная мощн. вентилятора",
+        "otFanSpeedCurrent": "OpenTherm, текущая мощн. вентилятора",
+        
         "ntcTemp": "NTC датчик",
         "dallasTemp": "DALLAS датчик",
         "bluetooth": "BLE датчик",
@@ -407,7 +428,7 @@
 
       "note": {
         "disclaimer1": "После успешного обновления файловой системы ВСЕ настройки будут сброшены на стандартные! Создайте резервную копию ПЕРЕД обновлением.",
-        "disclaimer2": "После успешного обновления устройство автоматически перезагрузится через 10 секунд."
+        "disclaimer2": "После успешного обновления устройство автоматически перезагрузится через 15 секунд."
       },
 
       "settingsFile": "Файл настроек",

src_data/pages/dashboard.html

@@ -4,19 +4,20 @@
     <meta charset="utf-8" />
     <meta name="viewport" content="width=device-width, initial-scale=1" />
     <title data-i18n>dashboard.title</title>
-    <link rel="stylesheet" href="/static/app.css" />
+    <link rel="stylesheet" href="/static/app.css?{BUILD_TIME}" />
   </head>
 
   <body>
     <header class="container">
       <nav>
         <ul>
-          <li><a href="/">
+          <li>
+            <a href="/">
               <div class="logo" data-i18n>logo</div>
-            </a></li>
+            </a>
+          </li>
         </ul>
         <ul>
-          <!--<li><a href="https://github.com/Laxilef/OTGateway/wiki" role="button" class="secondary" target="_blank">Help</a></li>-->
           <li>
             <select id="lang" aria-label="Lang">
               <option value="en" selected>EN</option>
@@ -80,43 +81,43 @@
               <tbody>
                 <tr>
                   <th scope="row" data-i18n>dashboard.states.mNetworkConnected</th>
-                  <td><input type="radio" class="mNetworkConnected" aria-invalid="false" checked disabled /></td>
+                  <td><i class="mNetworkConnected"></i></td>
                 </tr>
                 <tr>
                   <th scope="row" data-i18n>dashboard.states.mMqttConnected</th>
-                  <td><input type="radio" class="mMqttConnected" aria-invalid="false" checked disabled /></td>
+                  <td><i class="mMqttConnected"></i></td>
                 </tr>
                 <tr>
                   <th scope="row" data-i18n>dashboard.states.mEmergencyState</th>
-                  <td><input type="radio" class="mEmergencyState" aria-invalid="false" checked disabled /></td>
+                  <td><i class="mEmergencyState"></i></td>
                 </tr>
                 <tr>
                   <th scope="row" data-i18n>dashboard.states.mExtPumpState</th>
-                  <td><input type="radio" class="mExtPumpState" aria-invalid="false" checked disabled /></td>
+                  <td><i class="mExtPumpState"></i></td>
                 </tr>
                 <tr>
                   <th scope="row" data-i18n>dashboard.states.mCascadeControlInput</th>
-                  <td><input type="radio" id="mCascadeControlInput" aria-invalid="false" checked disabled /></td>
+                  <td><i class="mCascadeControlInput"></i></td>
                 </tr>
                 <tr>
                   <th scope="row" data-i18n>dashboard.states.mCascadeControlOutput</th>
-                  <td><input type="radio" id="mCascadeControlOutput" aria-invalid="false" checked disabled /></td>
+                  <td><i class="mCascadeControlOutput"></i></td>
                 </tr>
 
 
                 <tr>
                   <th scope="row" data-i18n>dashboard.states.sConnected</th>
-                  <td><input type="radio" class="sConnected" aria-invalid="false" checked disabled /></td>
+                  <td><i class="sConnected"></i></td>
                 </tr>
                 <tr>
                   <th scope="row" data-i18n>dashboard.states.sFlame</th>
-                  <td><input type="radio" class="sFlame" aria-invalid="false" checked disabled /></td>
+                  <td><i class="sFlame"></i></td>
                 </tr>
 
 
                 <tr>
                   <th scope="row" data-i18n>dashboard.states.sFaultActive</th>
-                  <td><input type="radio" class="sFaultActive" aria-invalid="false" checked disabled /></td>
+                  <td><i class="sFaultActive"></i></td>
                 </tr>
                 <tr>
                   <th scope="row" data-i18n>dashboard.states.sFaultCode</th>
@@ -124,7 +125,7 @@
                 </tr>
                 <tr>
                   <th scope="row" data-i18n>dashboard.states.sDiagActive</th>
-                  <td><input type="radio" class="sDiagActive" aria-invalid="false" checked disabled /></td>
+                  <td><i class="sDiagActive"></i></td>
                 </tr>
                 <tr>
                   <th scope="row" data-i18n>dashboard.states.sDiagCode</th>
@@ -134,20 +135,24 @@
 
                 <tr>
                   <th scope="row" data-i18n>dashboard.states.mHeatEnabled</th>
-                  <td><input type="radio" class="mHeatEnabled" aria-invalid="false" checked disabled /></td>
+                  <td><i class="mHeatEnabled"></i></td>
                 </tr>
                 <tr>
                   <th scope="row" data-i18n>dashboard.states.mHeatBlocking</th>
-                  <td><input type="radio" class="mHeatBlocking" aria-invalid="false" checked disabled /></td>
+                  <td><i class="mHeatBlocking"></i></td>
                 </tr>
                 <tr>
                   <th scope="row" data-i18n>dashboard.states.sHeatActive</th>
-                  <td><input type="radio" class="sHeatActive" aria-invalid="false" checked disabled /></td>
+                  <td><i class="sHeatActive"></i></td>
                 </tr>
                 <tr>
                   <th scope="row" data-i18n>dashboard.states.mHeatTargetTemp</th>
                   <td><b class="mHeatTargetTemp"></b> <span class="tempUnit"></span></td>
                 </tr>
+                <tr>
+                  <th scope="row" data-i18n>dashboard.states.mHeatSetpointTemp</th>
+                  <td><b class="mHeatSetpointTemp"></b> <span class="tempUnit"></span></td>
+                </tr>
                 <tr>
                   <th scope="row" data-i18n>dashboard.states.mHeatCurrTemp</th>
                   <td><b class="mHeatCurrTemp"></b> <span class="tempUnit"></span></td>
@@ -168,11 +173,11 @@
 
                 <tr>
                   <th scope="row" data-i18n>dashboard.states.mDhwEnabled</th>
-                  <td><input type="radio" class="mDhwEnabled" aria-invalid="false" checked disabled /></td>
+                  <td><i class="mDhwEnabled"></i></td>
                 </tr>
                 <tr>
                   <th scope="row" data-i18n>dashboard.states.sDhwActive</th>
-                  <td><input type="radio" class="sDhwActive" aria-invalid="false" checked disabled /></td>
+                  <td><i class="sDhwActive"></i></td>
                 </tr>
                 <tr>
                   <th scope="row" data-i18n>dashboard.states.mDhwTargetTemp</th>
@@ -192,6 +197,25 @@
 
           <hr />
 
+          <details>
+            <summary><b data-i18n>dashboard.section.sensors</b></summary>
+            <table>
+              <tbody class="sensors">
+                <tr class="sensor template hidden">
+                  <td style="width: 1.35rem">
+                    <span class="sStatusContainer">
+                      <i class="sStatus"></i>
+                    </span>
+                  </td>
+                  <th scope="row" class="sName"></th>
+                  <td class="sValue"></td>
+                </tr>
+              </tbody>
+            </table>
+          </details>
+
+          <hr />
+
           <details>
             <summary><b data-i18n>dashboard.section.diag</b></summary>
             <pre><b>Vendor:</b>             <span class="sVendor"></span>
@@ -220,7 +244,7 @@
       </small>
     </footer>
 
-    <script src="/static/app.js"></script>
+    <script src="/static/app.js?{BUILD_TIME}"></script>
     <script>
       let modifiedTime = null;
       let noRegulators;
@@ -331,6 +355,8 @@
         });
 
         setTimeout(async function onLoadPage() {
+          let unitSystem = null;
+
           if (modifiedTime) {
             if ((Date.now() - modifiedTime) < 5000) {
               setTimeout(onLoadPage, 1000);
@@ -354,13 +380,18 @@
               console.log(newSettings);
             }
 
-            let parameters = { cache: 'no-cache' };
+            let parameters = {
+              method: "GET",
+              cache: "no-cache",
+              credentials: "include"
+            };
+
             if (modified) {
               parameters.method = "POST";
               parameters.body = JSON.stringify(newSettings);
             }
 
-            const response = await fetch('/api/settings', parameters);
+            const response = await fetch("/api/settings", parameters);
             if (!response.ok) {
               throw new Error('Response not valid');
             }
@@ -368,6 +399,7 @@
             const result = await response.json();
             noRegulators = !result.opentherm.nativeHeatingControl && !result.equitherm.enabled && !result.pid.enabled;
             prevSettings = result;
+            unitSystem = result.system.unitSystem;
             newSettings.heating.enabled = result.heating.enabled;
             newSettings.heating.turbo = result.heating.turbo;
             newSettings.heating.target = result.heating.target;
@@ -387,9 +419,9 @@
             setCheckboxValue('#tDhwEnabled', result.dhw.enabled);
             setValue('#tDhwTargetTemp', result.dhw.target);
 
-            setValue('.tempUnit', temperatureUnit(result.system.unitSystem));
-            setValue('.pressureUnit', pressureUnit(result.system.unitSystem));
-            setValue('.volumeUnit', volumeUnit(result.system.unitSystem));
+            setValue('.tempUnit', temperatureUnit(unitSystem));
+            setValue('.pressureUnit', pressureUnit(unitSystem));
+            setValue('.volumeUnit', volumeUnit(unitSystem));
 
           } catch (error) {
             console.log(error);
@@ -397,7 +429,11 @@
 
           // vars
           try {
-            const response = await fetch('/api/vars', { cache: 'no-cache' });
+            const response = await fetch("/api/vars", {
+              cache: "no-cache",
+              credentials: "include"
+            });
+            
             if (!response.ok) {
               throw new Error('Response not valid');
             }
@@ -405,7 +441,7 @@
             const result = await response.json();
             
             // Graph
-            setValue('#tHeatCurrentTemp', result.master.indoorTempControl 
+            setValue('#tHeatCurrentTemp', result.master.heating.indoorTempControl 
               ? result.master.heating.indoorTemp 
               : result.master.heating.currentTemp
             );
@@ -420,7 +456,11 @@
             setValue('.sAppVersion', result.slave.appVersion);
             setValue('.sProtocolVersion', result.slave.protocolVersion);
 
-            setState('.sConnected', result.slave.connected);
+            setStatus(
+              '.sConnected',
+              result.slave.connected ? "success" : "error",
+              result.slave.connected ? "green" : "red"
+            );
             setState('.sFlame', result.slave.flame);
 
             setValue('.sModMin', result.slave.modulation.min);
@@ -437,27 +477,40 @@
             setValue('.sDhwMinTemp', result.slave.dhw.minTemp);
             setValue('.sDhwMaxTemp', result.slave.dhw.maxTemp);
 
-            setState('.sFaultActive', result.slave.fault.active);
+            setStatus(
+              '.sFaultActive',
+              result.slave.fault.active ? "success" : "error",
+              result.slave.fault.active ? "red" : "green"
+            );
             setValue(
               '.sFaultCode',
               result.slave.fault.active
-                ? (result.slave.fault.code + " (0x" + dec2hex(result.slave.fault.code) + ")")
+                ? `${result.slave.fault.code} (0x${dec2hex(result.slave.fault.code)})`
                 : "-"
             );
 
-            setState('.sDiagActive', result.slave.diag.active);
+            setStatus(
+              '.sDiagActive',
+              result.slave.diag.active ? "success" : "error",
+              result.slave.diag.active ? "red" : "green"
+            );
             setValue(
               '.sDiagCode',
               result.slave.diag.active
-                ? (result.slave.diag.code + " (0x" + dec2hex(result.slave.diag.code) + ")")
+                ? `${result.slave.diag.code} (0x${dec2hex(result.slave.diag.code)})`
                 : "-"
             );
 
 
             // MASTER
             setState('.mHeatEnabled', result.master.heating.enabled);
-            setState('.mHeatBlocking', result.master.heating.blocking);
+            setStatus(
+              '.mHeatBlocking',
+              result.master.heating.blocking ? "success" : "error",
+              result.master.heating.blocking ? "red" : "green"
+            );
             setState('.mHeatIndoorTempControl', result.master.heating.indoorTempControl);
+            setValue('.mHeatSetpointTemp', result.master.heating.setpointTemp);
             setValue('.mHeatTargetTemp', result.master.heating.targetTemp);
             setValue('.mHeatCurrTemp', result.master.heating.currentTemp);
             setValue('.mHeatRetTemp', result.master.heating.returnTemp);
@@ -473,9 +526,17 @@
             setValue('.mDhwMinTemp', result.master.dhw.minTemp);
             setValue('.mDhwMaxTemp', result.master.dhw.maxTemp);
 
-            setState('.mNetworkConnected', result.master.network.connected);
+            setStatus(
+              '.mNetworkConnected',
+              result.master.network.connected ? "success" : "error",
+              result.master.network.connected ? "green" : "red"
+            );
             setState('.mMqttConnected', result.master.mqtt.connected);
-            setState('.mEmergencyState', result.master.emergency.state);
+            setStatus(
+              '.mEmergencyState',
+              result.master.emergency.state ? "success" : "error",
+              result.master.emergency.state ? "red" : "green"
+            );
             setState('.mExtPumpState', result.master.externalPump.state);
             setState('.mCascadeControlInput', result.master.cascadeControl.input);
             setState('.mCascadeControlOutput', result.master.cascadeControl.output);
@@ -486,6 +547,88 @@
             console.log(error);
           }
 
+          // sensors
+          try {
+            const response = await fetch("/api/sensors?detailed=1", {
+              cache: "no-cache",
+              credentials: "include"
+            });
+            
+            if (!response.ok) {
+              throw new Error("Response not valid");
+            }
+
+            const container = document.querySelector(".sensors");
+            const templateNode = container.querySelector(".template");
+            const result = await response.json();
+
+            for (const sensorId in result) {
+              let sensorNode = container.querySelector(`.sensor[data-id='${sensorId}']`);
+              if (sensorNode) {
+                continue;
+              }
+
+              sensorNode = templateNode.cloneNode(true);
+              sensorNode.dataset.id = sensorId;
+              sensorNode.classList.remove("template");
+              container.appendChild(sensorNode);
+            }
+
+            for (const sensorId in result) {
+              const sensorNode = container.querySelector(`.sensor[data-id='${sensorId}']`);
+              if (!sensorNode) {
+                continue;
+              }
+              
+              const sData = result[sensorId];
+              if (!sData.enabled || sData.purpose == 255) {
+                sensorNode.classList.toggle("hidden", true);
+                continue;
+              }
+
+              sensorNode.classList.toggle("hidden", false);
+
+              setStatus(
+                ".sStatus",
+                sData.connected ? "success" : "error",
+                sData.connected ? "green" : "red",
+                sensorNode
+              );
+              setValue(".sName", sData.name, sensorNode);
+              setValue(".sValue", "", sensorNode);
+
+              const statusNode = sensorNode.querySelector(`.sStatusContainer`);
+              if (statusNode) {
+                statusNode.dataset.tooltip = `${sData.signalQuality}%`;
+              }
+
+              if (sData.value !== undefined) {
+                const sUnit = purposeUnit(sData.purpose, unitSystem);
+                appendValue(".sValue", `<b>${sData.value.toFixed(2)}</b> ${sUnit !== null ? sUnit : ``}`, `<br />`, sensorNode);
+              }
+
+              if (sData.temperature !== undefined) {
+                const sUnit = temperatureUnit(unitSystem);
+                appendValue(".sValue", `${i18n('dashboard.sensors.values.temp')}: <b>${sData.temperature.toFixed(2)}</b> ${sUnit !== null ? sUnit : ``}`, `<br />`, sensorNode);
+              }
+
+              if (sData.humidity !== undefined) {
+                appendValue(".sValue", `${i18n('dashboard.sensors.values.humidity')}: <b>${sData.humidity.toFixed(2)}</b> %`, `<br />`, sensorNode);
+              }
+
+              if (sData.battery !== undefined) {
+                appendValue(".sValue", `${i18n('dashboard.sensors.values.battery')}: <b>${sData.battery.toFixed(2)}</b> %`, `<br />`, sensorNode);
+              }
+
+              if (sData.rssi !== undefined) {
+                appendValue(".sValue", `${i18n('dashboard.sensors.values.rssi')}: <b>${sData.rssi.toFixed(0)}</b> ${i18n('dbm')}`, `<br />`, sensorNode);
+              }
+            }
+
+          } catch (error) {
+            console.log(error);
+          }
+
           setTimeout(onLoadPage, 10000);
         }, 1000);
       });

src_data/pages/index.html

@@ -4,19 +4,20 @@
     <meta charset="utf-8" />
     <meta name="viewport" content="width=device-width, initial-scale=1" />
     <title data-i18n>index.title</title>
-    <link rel="stylesheet" href="/static/app.css" />
+    <link rel="stylesheet" href="/static/app.css?{BUILD_TIME}" />
   </head>
 
   <body>
     <header class="container">
       <nav>
         <ul>
-          <li><a href="/">
+          <li>
+            <a href="/">
               <div class="logo" data-i18n>logo</div>
-            </a></li>
+            </a>
+          </li>
         </ul>
         <ul>
-          <!--<li><a href="https://github.com/Laxilef/OTGateway/wiki" role="button" class="secondary" target="_blank">Help</a></li>-->
           <li>
             <select id="lang" aria-label="Lang">
               <option value="en" selected>EN</option>
@@ -48,7 +49,7 @@
               </tr>
               <tr>
                 <th scope="row" data-i18n>network.wifi.connected</th>
-                <td><input type="radio" id="network-connected" aria-invalid="false" checked disabled /></td>
+                <td><i id="network-connected"></i></td>
               </tr>
               <tr>
                 <th scope="row" data-i18n>network.wifi.ssid</th>
@@ -161,7 +162,7 @@
       </small>
     </footer>
 
-    <script src="/static/app.js"></script>
+    <script src="/static/app.js?{BUILD_TIME}"></script>
     <script>
       document.addEventListener('DOMContentLoaded', async () => {
         const lang = new Lang(document.getElementById('lang'));
@@ -169,7 +170,11 @@
 
         setTimeout(async function onLoadPage() {
           try {
-            const response = await fetch('/api/info', { cache: 'no-cache' });
+            const response = await fetch("/api/info", {
+              cache: "no-cache",
+              credentials: "include"
+            });
+            
             if (!response.ok) {
               throw new Error('Response not valid');
             }
@@ -184,7 +189,11 @@
 
             setValue('#network-hostname', result.network.hostname);
             setValue('#network-mac', result.network.mac);
-            setState('#network-connected', result.network.connected);
+            setStatus(
+              '#network-connected',
+              result.network.connected ? "success" : "error",
+              result.network.connected ? "green" : "red"
+            );
             setValue('#network-ssid', result.network.ssid);
             setValue('#network-signal', result.network.signalQuality);
             setValue('#network-ip', result.network.ip);

src_data/pages/network.html

@@ -4,19 +4,20 @@
     <meta charset="utf-8" />
     <meta name="viewport" content="width=device-width, initial-scale=1" />
     <title data-i18n>network.title</title>
-    <link rel="stylesheet" href="/static/app.css" />
+    <link rel="stylesheet" href="/static/app.css?{BUILD_TIME}" />
   </head>
 
   <body>
     <header class="container">
       <nav>
         <ul>
-          <li><a href="/">
+          <li>
+            <a href="/">
               <div class="logo" data-i18n>logo</div>
-            </a></li>
+            </a>
+          </li>
         </ul>
         <ul>
-          <!--<li><a href="https://github.com/Laxilef/OTGateway/wiki" role="button" class="secondary" target="_blank">Help</a></li>-->
           <li>
             <select id="lang" aria-label="Lang">
               <option value="en" selected>EN</option>
@@ -171,7 +172,7 @@
       </small>
     </footer>
 
-    <script src="/static/app.js"></script>
+    <script src="/static/app.js?{BUILD_TIME}"></script>
     <script>
       document.addEventListener('DOMContentLoaded', async () => {
         const lang = new Lang(document.getElementById('lang'));
@@ -198,7 +199,11 @@
         };
 
         try {
-          const response = await fetch('/api/network/settings', { cache: 'no-cache' });
+          const response = await fetch("/api/network/settings", {
+            cache: "no-cache",
+            credentials: "include"
+          });
+          
           if (!response.ok) {
             throw new Error('Response not valid');
           }

src_data/pages/sensors.html

@@ -4,19 +4,20 @@
     <meta charset="utf-8" />
     <meta name="viewport" content="width=device-width, initial-scale=1" />
     <title data-i18n>sensors.title</title>
-    <link rel="stylesheet" href="/static/app.css" />
+    <link rel="stylesheet" href="/static/app.css?{BUILD_TIME}" />
   </head>
 
   <body>
     <header class="container">
       <nav>
         <ul>
-          <li><a href="/">
+          <li>
+            <a href="/">
               <div class="logo" data-i18n>logo</div>
-            </a></li>
+            </a>
+          </li>
         </ul>
         <ul>
-          <!--<li><a href="https://github.com/Laxilef/OTGateway/wiki" role="button" class="secondary" target="_blank">Help</a></li>-->
           <li>
             <select id="lang" aria-label="Lang">
               <option value="en" selected>EN</option>
@@ -67,7 +68,10 @@
                       <option value="6" data-i18n>sensors.purposes.dhwFlowRate</option>
                       <option value="7" data-i18n>sensors.purposes.exhaustTemp</option>
                       <option value="8" data-i18n>sensors.purposes.modLevel</option>
-                      <option value="9" data-i18n>sensors.purposes.currentPower</option>
+                      <option value="248" data-i18n>sensors.purposes.powerFactor</option>
+                      <option value="249" data-i18n>sensors.purposes.power</option>
+                      <option value="250" data-i18n>sensors.purposes.fanSpeed</option>
+                      <option value="251" data-i18n>sensors.purposes.co2</option>
                       <option value="252" data-i18n>sensors.purposes.pressure</option>
                       <option value="253" data-i18n>sensors.purposes.humidity</option>
                       <option value="254" data-i18n>sensors.purposes.temperature</option>
@@ -90,6 +94,14 @@
                       <option value="9" data-i18n>sensors.types.otPressure</option>
                       <option value="10" data-i18n>sensors.types.otModLevel</option>
                       <option value="11" data-i18n>sensors.types.otCurrentPower</option>
+                      <option value="12" data-i18n>sensors.types.otExhaustCo2</option>
+                      <option value="13" data-i18n>sensors.types.otExhaustFanSpeed</option>
+                      <option value="14" data-i18n>sensors.types.otSupplyFanSpeed</option>
+                      <option value="15" data-i18n>sensors.types.otSolarStorageTemp</option>
+                      <option value="16" data-i18n>sensors.types.otSolarCollectorTemp</option>
+                      <option value="17" data-i18n>sensors.types.otFanSpeedSetpoint</option>
+                      <option value="18" data-i18n>sensors.types.otFanSpeedCurrent</option>
+
                       <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>
@@ -114,10 +126,10 @@
                 </label>
               </div>
 
-              <hr />
+              <hr class="correction" />
 
-              <fieldset>
-                <legend><b data-i18n>sensors.correction.desc</b></legend>
+              <details class="correction">
+                <summary><b data-i18n>sensors.correction.desc</b></summary>
 
                 <div class="grid">
                   <label>
@@ -130,27 +142,30 @@
                     <input type="number" inputmode="numeric" name="factor" min="0.01" max="10" step="0.01" required>
                   </label>
                 </div>
-              </fieldset>
+              </details>
 
-              <hr />
+              <hr class="filtering" />
 
-              <fieldset>
-                <legend><b data-i18n>sensors.filtering.desc</b></legend>
-
-                <label>
-                  <input type="checkbox" name="filtering" value="true">
-                  <span data-i18n>sensors.filtering.enabled.title</span>
-                  <br />
-                  <small data-i18n>sensors.filtering.enabled.note</small>
-                </label>
-
-                <label>
-                  <span data-i18n>sensors.filtering.factor.title</span>
-                  <input type="number" inputmode="numeric" name="filteringFactor" min="0.01" max="1" step="0.01">
-                  <small data-i18n>sensors.filtering.factor.note</small>
-                </label>
-              </fieldset>
+              <details class="filtering">
+                <summary><b data-i18n>sensors.filtering.desc</b></summary>
 
+                <div>
+                  <label>
+                    <input type="checkbox" name="filtering" value="true">
+                    <span data-i18n>sensors.filtering.enabled.title</span>
+                    <br />
+                    <small data-i18n>sensors.filtering.enabled.note</small>
+                  </label>
+  
+                  <label>
+                    <span data-i18n>sensors.filtering.factor.title</span>
+                    <input type="number" inputmode="numeric" name="filteringFactor" min="0.01" max="1" step="0.01">
+                    <small data-i18n>sensors.filtering.factor.note</small>
+                  </label>
+                </div>
+              </details>
+              
+              <br/>
               <button type="submit" data-i18n>button.save</button>
             </form>
           </div>
@@ -169,7 +184,7 @@
       </small>
     </footer>
 
-    <script src="/static/app.js"></script>
+    <script src="/static/app.js?{BUILD_TIME}"></script>
     <script>
       document.addEventListener("DOMContentLoaded", async () => {
         const lang = new Lang(document.getElementById("lang"));
@@ -179,7 +194,11 @@
         const templateNode = container.querySelector("#template");
 
         try {
-          const response = await fetch("/api/sensors", { cache: "no-cache" });
+          const response = await fetch("/api/sensors", {
+            cache: "no-cache",
+            credentials: "include"
+          });
+
           if (!response.ok) {
             throw new Error("Response not valid");
           }
@@ -221,6 +240,20 @@
               const parentGpio = gpio.parentElement;
               const parentAddress = address.parentElement;
 
+              switch(parseInt(event.target.value)) {
+                // heating setpoint, manual
+                case 253:
+                case 254:
+                  hide(".correction", sensorForm);
+                  hide(".filtering", sensorForm);
+                  break;
+
+                // other
+                default:
+                  show(".correction", sensorForm);
+                  show(".filtering", sensorForm);
+              }
+
               switch(parseInt(event.target.value)) {
                 // ntc
                 case 50:
@@ -251,13 +284,18 @@
                   break;
               }
             });
+
             sensorNode.addEventListener("click", async (event) => {
               if (parseInt(sensorNode.dataset.preloaded)) {
                 return;
               }
 
               try {
-                const response = await fetch(sensorForm.action, { cache: "no-cache" });
+                const response = await fetch(sensorForm.action, {
+                  cache: "no-cache",
+                  credentials: "include"
+                });
+                
                 if (response.status != 200) {
                   return;
                 }
@@ -271,7 +309,7 @@
               }
             });
             
-            setupForm(".sensor[data-id='" + sensorId + "'] form", fillData, ['address']);
+            setupForm(`.sensor[data-id='${sensorId}'] form`, fillData, ['address']);
           }
 
         } catch (error) {

src_data/pages/settings.html

@@ -4,19 +4,20 @@
     <meta charset="utf-8" />
     <meta name="viewport" content="width=device-width, initial-scale=1" />
     <title data-i18n>settings.title</title>
-    <link rel="stylesheet" href="/static/app.css" />
+    <link rel="stylesheet" href="/static/app.css?{BUILD_TIME}" />
   </head>
 
   <body>
     <header class="container">
       <nav>
         <ul>
-          <li><a href="/">
+          <li>
+            <a href="/">
               <div class="logo" data-i18n>logo</div>
-            </a></li>
+            </a>
+          </li>
         </ul>
         <ul>
-          <!--<li><a href="https://github.com/Laxilef/OTGateway/wiki" role="button" class="secondary" target="_blank">Help</a></li>-->
           <li>
             <select id="lang" aria-label="Lang">
               <option value="en" selected>EN</option>
@@ -95,12 +96,12 @@
                 <legend data-i18n>settings.section.diag</legend>
 
                 <label for="system-serial-enable">
-                  <input type="checkbox" id="system-serial-enable" name="system[serial][enable]" value="true">
+                  <input type="checkbox" id="system-serial-enable" name="system[serial][enabled]" value="true">
                   <span data-i18n>settings.system.serial.enable</span>
                 </label>
 
                 <label for="system-telnet-enable">
-                  <input type="checkbox" id="system-telnet-enable" name="system[telnet][enable]" value="true">
+                  <input type="checkbox" id="system-telnet-enable" name="system[telnet][enabled]" value="true">
                   <span data-i18n>settings.system.telnet.enable</span>
                 </label>
 
@@ -245,7 +246,7 @@
             <form action="/api/settings" id="equitherm-settings" class="hidden">
               <fieldset>
                 <label for="equitherm-enable">
-                  <input type="checkbox" id="equitherm-enable" name="equitherm[enable]" value="true">
+                  <input type="checkbox" id="equitherm-enable" name="equitherm[enabled]" value="true">
                   <span data-i18n>settings.enable</span>
                 </label>
               </fieldset>
@@ -282,7 +283,7 @@
             <form action="/api/settings" id="pid-settings" class="hidden">
               <fieldset>
                 <label for="pid-enable">
-                  <input type="checkbox" id="pid-enable" name="pid[enable]" value="true">
+                  <input type="checkbox" id="pid-enable" name="pid[enabled]" value="true">
                   <span data-i18n>settings.enable</span>
                 </label>
               </fieldset>
@@ -470,7 +471,7 @@
             <form action="/api/settings" id="mqtt-settings" class="hidden">
               <fieldset>
                 <label for="mqtt-enable">
-                  <input type="checkbox" id="mqtt-enable" name="mqtt[enable]" value="true">
+                  <input type="checkbox" id="mqtt-enable" name="mqtt[enabled]" value="true">
                   <span data-i18n>settings.enable</span>
                 </label>
 
@@ -573,7 +574,7 @@
             <form action="/api/settings" id="cc-settings" class="hidden">
               <fieldset>
                 <label for="cc-input-enable">
-                  <input type="checkbox" id="cc-input-enable" name="cascadeControl[input][enable]" value="true">
+                  <input type="checkbox" id="cc-input-enable" name="cascadeControl[input][enabled]" value="true">
                   <span data-i18n>settings.cascadeControl.input.enable</span>
                   <br />
                   <small data-i18n>settings.cascadeControl.input.desc</small>
@@ -601,7 +602,7 @@
 
               <fieldset>
                 <label for="cc-output-enable">
-                  <input type="checkbox" id="cc-output-enable" name="cascadeControl[output][enable]" value="true">
+                  <input type="checkbox" id="cc-output-enable" name="cascadeControl[output][enabled]" value="true">
                   <span data-i18n>settings.cascadeControl.output.enable</span>
                   <br />
                   <small data-i18n>settings.cascadeControl.output.desc</small>
@@ -662,7 +663,7 @@
       </small>
     </footer>
 
-    <script src="/static/app.js"></script>
+    <script src="/static/app.js?{BUILD_TIME}"></script>
     <script>
       document.addEventListener('DOMContentLoaded', async () => {
         const lang = new Lang(document.getElementById('lang'));
@@ -807,7 +808,11 @@
         };
 
         try {
-          const response = await fetch('/api/settings', { cache: 'no-cache' });
+          const response = await fetch("/api/settings", {
+            cache: "no-cache",
+            credentials: "include"
+          });
+          
           if (!response.ok) {
             throw new Error('Response not valid');
           }

src_data/pages/upgrade.html

@@ -4,19 +4,20 @@
     <meta charset="utf-8" />
     <meta name="viewport" content="width=device-width, initial-scale=1" />
     <title data-i18n>upgrade.title</title>
-    <link rel="stylesheet" href="/static/app.css">
+    <link rel="stylesheet" href="/static/app.css?{BUILD_TIME}">
   </head>
 
   <body>
     <header class="container">
       <nav>
         <ul>
-          <li><a href="/">
+          <li>
+            <a href="/">
               <div class="logo" data-i18n>logo</div>
-            </a></li>
+            </a>
+          </li>
         </ul>
         <ul>
-          <!--<li><a href="https://github.com/Laxilef/OTGateway/wiki" role="button" class="secondary" target="_blank">Help</a></li>-->
           <li>
             <select id="lang" aria-label="Lang">
               <option value="en" selected>EN</option>
@@ -41,7 +42,7 @@
               <input type="file" name="settings" id="restore-file" accept=".json">
             </label>
 
-            <div class="grid">
+            <div role="group">
               <button type="submit" data-i18n>button.restore</button>
               <button type="button" class="secondary" onclick="window.location='/api/backup/save';" data-i18n>button.backup</button>
             </div>
@@ -97,7 +98,7 @@
       </small>
     </footer>
 
-    <script src="/static/app.js"></script>
+    <script src="/static/app.js?{BUILD_TIME}"></script>
     <script>
       document.addEventListener('DOMContentLoaded', async () => {
         const lang = new Lang(document.getElementById('lang'));

src_data/scripts/lang.js

@@ -32,7 +32,7 @@ class Lang {
     }
 
     if (!this.localeIsSupported(this.defaultLocale)) {
-      const selected = this.switcher.selectedIndex ?? 0;
+      const selected = this.switcher.selectedIndex ? this.switcher.selectedIndex : 0;
       this.defaultLocale = this.switcher.options[selected].value;
     }
   
@@ -63,7 +63,7 @@ class Lang {
   }
 
   async fetchTranslations(locale) {
-    const response = await fetch(`/static/locales/${locale}.json`);
+    const response = await fetch(`/static/locales/${locale}.json?{BUILD_TIME}`);
     const data = await response.json();
   
     if (data.values instanceof Object) {

src_data/scripts/utils.js

@@ -60,10 +60,11 @@ const setupForm = (formSelector, onResultCallback = null, noCastItems = []) => {
       }
 
       let response = await fetch(url, {
-        method: 'POST',
-        cache: 'no-cache',
+        method: "POST",
+        cache: "no-cache",
+        credentials: "include",
         headers: {
-          'Content-Type': 'application/json'
+          "Content-Type": "application/json"
         },
         body: form2json(fd, noCastItems)
       });
@@ -143,8 +144,8 @@ const setupNetworkScanForm = (formSelector, tableSelector) => {
           input.focus();
         };
 
-        row.insertCell().textContent = "#" + (i + 1);
-        row.insertCell().innerHTML = result[i].hidden ? ("<i>" + result[i].bssid + "</i>") : result[i].ssid;
+        row.insertCell().textContent = `#${i + 1}`;
+        row.insertCell().innerHTML = result[i].hidden ? `<i>${result[i].bssid}</i>` : result[i].ssid;
 
         // info cell
         let infoCell = row.insertCell();
@@ -164,7 +165,7 @@ const setupNetworkScanForm = (formSelector, tableSelector) => {
         }
         
         let signalQualityContainer = document.createElement("span");
-        signalQualityContainer.setAttribute('data-tooltip', result[i].signalQuality + "%");
+        signalQualityContainer.setAttribute('data-tooltip', `${result[i].signalQuality}%`);
         signalQualityContainer.appendChild(signalQualityIcon);
         infoCell.appendChild(signalQualityContainer);
 
@@ -218,7 +219,10 @@ const setupNetworkScanForm = (formSelector, tableSelector) => {
       attempts--;
 
       try {
-        let response = await fetch(url, { cache: 'no-cache' });
+        let response = await fetch(url, {
+          cache: "no-cache",
+          credentials: "include"
+        });
 
         if (response.status == 200) {
           await onSuccess(response);
@@ -306,31 +310,16 @@ const setupRestoreBackupForm = (formSelector) => {
       try {
         const data = JSON.parse(event.target.result);
         console.log("Backup: ", data);
-        
-        if (data.network != undefined) {
-          let response = await fetch(url, {
-            method: 'POST',
-            cache: 'no-cache',
-            headers: {
-              'Content-Type': 'application/json'
-            },
-            body: JSON.stringify(data.network)
-          });
-
-          if (!response.ok) {
-            onFailed();
-            return;
-          }
-        }
 
         if (data.settings != undefined) {
           let response = await fetch(url, {
-            method: 'POST',
-            cache: 'no-cache',
+            method: "POST",
+            cache: "no-cache",
+            credentials: "include",
             headers: {
-              'Content-Type': 'application/json'
+              "Content-Type": "application/json"
             },
-            body: JSON.stringify(data.settings)
+            body: JSON.stringify({"settings": data.settings})
           });
 
           if (!response.ok) {
@@ -347,10 +336,11 @@ const setupRestoreBackupForm = (formSelector) => {
             payload["sensors"][sensorId] = data.sensors[sensorId];
 
             const response = await fetch(url, {
-              method: 'POST',
-              cache: 'no-cache',
+              method: "POST",
+              cache: "no-cache",
+              credentials: "include",
               headers: {
-                'Content-Type': 'application/json'
+                "Content-Type": "application/json"
               },
               body: JSON.stringify(payload)
             });
@@ -362,6 +352,23 @@ const setupRestoreBackupForm = (formSelector) => {
           }
         }
 
+        if (data.network != undefined) {
+          let response = await fetch(url, {
+            method: "POST",
+            cache: "no-cache",
+            credentials: "include",
+            headers: {
+              "Content-Type": "application/json"
+            },
+            body: JSON.stringify({"network": data.network})
+          });
+
+          if (!response.ok) {
+            onFailed();
+            return;
+          }
+        }
+
         onSuccess();
 
       } catch (err) {
@@ -427,7 +434,7 @@ const setupUpgradeForm = (formSelector) => {
         resItem.classList.add('failed');
 
         if (result.firmware.error != "") {
-          resItem.textContent += ": " + result.firmware.error;
+          resItem.textContent += `: ${result.firmware.error}`;
         }
       }
     }
@@ -445,7 +452,7 @@ const setupUpgradeForm = (formSelector) => {
         resItem.classList.add('failed');
 
         if (result.filesystem.error != "") {
-          resItem.textContent += ": " + result.filesystem.error;
+          resItem.textContent += `: ${result.filesystem.error}`;
         }
       }
     }
@@ -496,8 +503,9 @@ const setupUpgradeForm = (formSelector) => {
     try {
       let fd = new FormData(form);
       let response = await fetch(url, {
-        method: 'POST',
-        cache: 'no-cache',
+        method: "POST",
+        cache: "no-cache",
+        credentials: "include",
         body: fd
       });
 
@@ -526,8 +534,8 @@ const setBusy = (busySelector, contentSelector, value, parent = undefined) => {
   }
 }
 
-const setState = (selector, value, parent = undefined) => {
-  if (parent == undefined) {
+const setAriaState = (selector, value, parent = undefined) => {
+  if (parent === undefined) {
     parent = document;
   }
 
@@ -539,8 +547,40 @@ const setState = (selector, value, parent = undefined) => {
   item.setAttribute('aria-invalid', !value);
 }
 
+const setStatus = (selector, state, color = undefined, parent = undefined) => {
+  if (parent === undefined) {
+    parent = document;
+  }
+
+  let item = parent.querySelector(selector);
+  if (!item) {
+    return;
+  }
+
+  item.classList.forEach(cName => {
+    if (cName.indexOf("icons-") === 0) {
+      item.classList.remove(cName);
+    }
+  });
+
+  item.classList.add(`icons-${state}`);
+  
+  if (color !== undefined) {
+    item.classList.add(`icons-color-${color}`);
+  }
+}
+
+const setState = (selector, state, parent = undefined) => {
+  return setStatus(
+    selector,
+    state ? "success" : "error",
+    state ? "green" : "gray",
+    parent
+  );
+}
+
 const setValue = (selector, value, parent = undefined) => {
-  if (parent == undefined) {
+  if (parent === undefined) {
     parent = document;
   }
 
@@ -554,8 +594,32 @@ const setValue = (selector, value, parent = undefined) => {
   }
 }
 
+const appendValue = (selector, value, nl = null, parent = undefined) => {
+  if (parent === undefined) {
+    parent = document;
+  }
+
+  let items = parent.querySelectorAll(selector);
+  if (!items.length) {
+    return;
+  }
+
+  for (let item of items) {
+    if (item.innerHTML.trim().length > 0) {
+      if (nl !== null) {
+        item.innerHTML += nl;
+      }
+
+      item.innerHTML += value;
+
+    } else {
+      item.innerHTML = value;
+    }
+  }
+}
+
 const setCheckboxValue = (selector, value, parent = undefined) => {
-  if (parent == undefined) {
+  if (parent === undefined) {
     parent = document;
   }
 
@@ -568,7 +632,7 @@ const setCheckboxValue = (selector, value, parent = undefined) => {
 }
 
 const setRadioValue = (selector, value, parent = undefined) => {
-  if (parent == undefined) {
+  if (parent === undefined) {
     parent = document;
   }
 
@@ -583,7 +647,7 @@ const setRadioValue = (selector, value, parent = undefined) => {
 }
 
 const setInputValue = (selector, value, attrs = {}, parent = undefined) => {
-  if (parent == undefined) {
+  if (parent === undefined) {
     parent = document;
   }
 
@@ -604,7 +668,7 @@ const setInputValue = (selector, value, attrs = {}, parent = undefined) => {
 }
 
 const setSelectValue = (selector, value, parent = undefined) => {
-  if (parent == undefined) {
+  if (parent === undefined) {
     parent = document;
   }
   
@@ -619,7 +683,7 @@ const setSelectValue = (selector, value, parent = undefined) => {
 }
 
 const show = (selector, parent = undefined) => {
-  if (parent == undefined) {
+  if (parent === undefined) {
     parent = document;
   }
 
@@ -636,7 +700,7 @@ const show = (selector, parent = undefined) => {
 }
 
 const hide = (selector, parent = undefined) => {
-  if (parent == undefined) {
+  if (parent === undefined) {
     parent = document;
   }
 
@@ -679,6 +743,29 @@ const volumeUnit = (unitSystem) => {
   });
 }
 
+const purposeUnit = (purpose, unitSystem) => {
+  const tUnit = temperatureUnit(unitSystem);
+
+  return unit2str(purpose, {
+    0:    tUnit,
+    1:    tUnit,
+    2:    tUnit,
+    3:    tUnit,
+    4:    tUnit,
+    5:    tUnit,
+    6:    `${volumeUnit(unitSystem)}/${i18n('time.min')}`,
+    7:    tUnit,
+    8:    "%",
+    248:  "%",
+    249:  i18n('kw'),
+    250:  "RPM",
+    251:  "ppm",
+    252:  pressureUnit(unitSystem),
+    253:  "%",
+    254:  tUnit
+  }, null);
+}
+
 const memberIdToVendor = (memberId) => {
   // https://github.com/Jeroen88/EasyOpenTherm/blob/main/src/EasyOpenTherm.h
   // https://github.com/Evgen2/SmartTherm/blob/v0.7/src/Web.cpp
@@ -757,7 +844,7 @@ function form2json(data, noCastItems = []) {
 function dec2hex(i) {
   let hex = parseInt(i).toString(16);
   if (hex.length % 2 != 0) {
-    hex = "0" + hex;
+    hex = `0${hex}`;
   }
   
   return hex.toUpperCase();

src_data/styles/app.css

@@ -59,7 +59,7 @@ footer {
 /*nav li a:has(> div.logo) {
   margin-bottom: 0;
 }*/
-nav li :where(a,[role=link]) {
+nav li :where(a, [role=link]) {
   margin: 0;
 }
 
@@ -71,6 +71,11 @@ pre {
   padding: 0.5rem;
 }
 
+:nth-last-child(1 of table tr:not(.hidden)) th,
+:nth-last-child(1 of table tr:not(.hidden)) td {
+  border-bottom: 0 !important;
+}
+
 
 .hidden {
   display: none !important;
@@ -200,4 +205,20 @@ tr.network:hover {
 
 [data-tooltip]:has(> [class*=" icons-"], > [class=icons], > [class^=icons-]) {
   border: 0 !important;
+}
+
+.icons-color-green {
+  color: var(--pico-form-element-valid-active-border-color);
+}
+
+.icons-color-yellow {
+  color: #c89048;
+}
+
+.icons-color-gray {
+  color: var(--pico-form-element-placeholder-color);
+}
+
+.icons-color-red {
+  color: var(--pico-form-element-invalid-active-border-color);
 }

src_data/styles/iconly.css

@@ -7,8 +7,8 @@
   font-family: "Icons";
   font-style: normal;
   font-weight: 400;
-  src: url("/static/fonts/iconly.eot?1718563596894");
-  src: url("/static/fonts/iconly.eot?#iefix") format("embedded-opentype"), url("/static/fonts/iconly.woff2?1718563596894") format("woff2"), url("/static/fonts/iconly.woff?1718563596894") format("woff"), url("/static/fonts/iconly.ttf?1718563596894") format("truetype"), url("/static/fonts/iconly.svg?1718563596894#Icons") format("svg");
+  src: url("/static/fonts/iconly.eot?1732913937966");
+  src: url("/static/fonts/iconly.eot?#iefix") format("embedded-opentype"), url("/static/fonts/iconly.woff2?1732913937966") format("woff2"), url("/static/fonts/iconly.woff?1732913937966") format("woff"), url("/static/fonts/iconly.ttf?1732913937966") format("truetype"), url("/static/fonts/iconly.svg?1732913937966#Icons") format("svg");
 }
 
 [class="icons"], [class^="icons-"], [class*=" icons-"] {
@@ -51,6 +51,10 @@
   content: "\e006";
 }
 
+.icons-error:before {
+  content: "\e007";
+}
+
 .icons-wifi-strength-3:before {
   content: "\e008";
 }
@@ -63,6 +67,14 @@
   content: "\e00a";
 }
 
+.icons-success:before {
+  content: "\e00b";
+}
+
 .icons-up:before {
   content: "\e00c";
 }
+
+.icons-alarm:before {
+  content: "\e00d";
+}