Bump NimBLE-Arduino to 2.1.0

chore: update pcb
refactor: little changes
2025-12-27 02:23:36 +05:00 · 2024-12-15 00:35:16 +00:00 · 2024-12-07 23:47:21 +03:00 · 2024-12-07 23:10:50 +03:00 · 2024-12-07 23:10:27 +03:00 · 2024-12-07 22:59:29 +03:00
47 changed files with 16999 additions and 7871 deletions
--- a/README.md
+++ b/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.
--- a/assets/2D_PCB_bottom.png
+++ b/assets/2D_PCB_bottom.png
--- a/assets/2D_PCB_top.png
+++ b/assets/2D_PCB_top.png
--- a/assets/3D_PCB.png
+++ b/assets/3D_PCB.png
--- a/assets/BOM.xlsx
+++ b/assets/BOM.xlsx
--- a/assets/CPL.csv
+++ b/assets/CPL.csv
--- a/assets/Schematic.pdf
+++ b/assets/Schematic.pdf
--- a/assets/gerber.zip
+++ b/assets/gerber.zip
--- a/assets/ha.png
+++ b/assets/ha.png
--- a/assets/poster-1.png
+++ b/assets/poster-1.png
--- a/assets/poster-2.png
+++ b/assets/poster-2.png
--- a/assets/poster-3.png
+++ b/assets/poster-3.png
--- a/gulpfile.js
+++ b/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,
--- a/lib/WebServerHandlers/DynamicPage.h
+++ b/lib/WebServerHandlers/DynamicPage.h
@@ -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;
--- a/lib/WebServerHandlers/StaticPage.h
+++ b/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;

@@ -47,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(F("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);
@@ -84,11 +91,11 @@ public:
      server.sendHeader(F("Cache-Control"), this->cacheHeader);
    }

-    #if defined(ARDUINO_ARCH_ESP8266)
-    if (server._eTagEnabled && this->eTag.length() > 0) {
+    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);
--- a/otgateway.ino
+++ b/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
-*/
--- a/package.json
+++ b/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"
  }
 }
--- a/platformio.ini
+++ b/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
@@ -75,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]
@@ -84,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
--- a/src/HaHelper.h
+++ b/src/HaHelper.h
@@ -67,15 +67,25 @@ public:
        break;

      case Sensors::Purpose::MODULATION_LEVEL:
+      case Sensors::Purpose::POWER_FACTOR:
        doc[FPSTR(HA_DEVICE_CLASS)] = F("power_factor");
        doc[FPSTR(HA_UNIT_OF_MEASUREMENT)] = FPSTR(HA_UNIT_OF_MEASUREMENT_PERCENT);
        break;

-      case Sensors::Purpose::CURRENT_POWER:
+      case Sensors::Purpose::POWER:
        doc[FPSTR(HA_DEVICE_CLASS)] = F("power");
        doc[FPSTR(HA_UNIT_OF_MEASUREMENT)] = F("kW");
        break;

+      case Sensors::Purpose::FAN_SPEED:
+        doc[FPSTR(HA_UNIT_OF_MEASUREMENT)] = F("RPM");
+        break;
+
+      case Sensors::Purpose::CO2:
+        doc[FPSTR(HA_DEVICE_CLASS)] = F("carbon_dioxide");
+        doc[FPSTR(HA_UNIT_OF_MEASUREMENT)] = F("ppm");
+        break;
+
      case Sensors::Purpose::PRESSURE:
        doc[FPSTR(HA_DEVICE_CLASS)] = F("pressure");
        if (unit == UnitSystem::METRIC) {
@@ -137,10 +147,15 @@ public:
        doc[FPSTR(HA_ICON)] = F("mdi:fire-circle");
        break;

-      case Sensors::Purpose::CURRENT_POWER:
+      case Sensors::Purpose::POWER_FACTOR:
+      case Sensors::Purpose::POWER:
        doc[FPSTR(HA_ICON)] = F("mdi:chart-bar");
        break;

+      case Sensors::Purpose::FAN_SPEED:
+        doc[FPSTR(HA_ICON)] = F("mdi:fan");
+        break;
+
      case Sensors::Purpose::PRESSURE:
        doc[FPSTR(HA_ICON)] = F("mdi:gauge");
        break;
@@ -223,6 +238,7 @@ public:

    } else if (sSensor.type == Sensors::Type::MANUAL) {
      doc[FPSTR(HA_ENTITY_CATEGORY)] = FPSTR(HA_ENTITY_CATEGORY_CONFIG);
+      doc[FPSTR(HA_STEP)] = 0.01f;
      doc[FPSTR(HA_MODE)] = FPSTR(HA_MODE_BOX);

      doc[FPSTR(HA_COMMAND_TOPIC)] = this->getDeviceTopic(
@@ -1188,7 +1204,7 @@ public:
    doc[FPSTR(HA_MODES)][1] = F("heat");

    doc[FPSTR(HA_ACTION_TOPIC)] = this->stateTopic.c_str();
-    doc[FPSTR(HA_ACTION_TEMPLATE)] = F("{{ iif(value_json.master.heating.enabled, iif(value_json.slave.heating.active, 'heating', 'idle'), 'off') }}");
+    doc[FPSTR(HA_ACTION_TEMPLATE)] = F("{{ iif(value_json.slave.heating.active, 'heating', 'idle') }}");

    doc[FPSTR(HA_PRESET_MODE_COMMAND_TOPIC)] = this->setSettingsTopic.c_str();
    doc[FPSTR(HA_PRESET_MODE_COMMAND_TEMPLATE)] = F("{% if value == 'boost' %}{\"heating\": {\"turbo\" : true}}"
@@ -1240,7 +1256,7 @@ public:
    doc[FPSTR(HA_MODES)][1] = F("heat");

    doc[FPSTR(HA_ACTION_TOPIC)] = this->stateTopic.c_str();
-    doc[FPSTR(HA_ACTION_TEMPLATE)] = F("{{ iif(value_json.master.dhw.enabled, iif(value_json.slave.dhw.active, 'heating', 'idle'), 'off') }}");
+    doc[FPSTR(HA_ACTION_TEMPLATE)] = F("{{ iif(value_json.slave.dhw.active, 'heating', 'idle') }}");

    doc[FPSTR(HA_MIN_TEMP)] = minTemp;
    doc[FPSTR(HA_MAX_TEMP)] = maxTemp;
--- a/src/MainTask.h
+++ b/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,10 +74,28 @@ protected:
    }

    if (vars.actions.restart) {
+      this->restartSignalReceivedTime = millis();
+      this->restartSignalReceived = true;
      vars.actions.restart = false;
-      this->restartSignalTime = millis();

-      Log.sinfoln(FPSTR(L_MAIN), F("Restart signal received. Restart after 10 sec."));
+      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();
+
+      // save sensors settings
+      fsSensorsSettings.updateNow();
+
+      // force save network settings
+      if (fsNetworkSettings.updateNow() == FD_FILE_ERR && LittleFS.begin()) {
+        fsNetworkSettings.write();
+      }
+
+      Log.sinfoln(FPSTR(L_MAIN), F("Restart scheduled in 10 sec."));
    }

    vars.mqtt.connected = tMqtt->isConnected();
@@ -148,20 +167,9 @@ protected:


    // restart
-    if (this->restartSignalTime > 0 && millis() - this->restartSignalTime > 10000) {
-      // save settings
-      fsSettings.updateNow();
+    if (this->restartSignalReceived && millis() - this->restartSignalReceivedTime > 15000) {
+      this->restartSignalReceived = false;

-      // save sensors settings
-      fsSensorsSettings.updateNow();
-
-      // force save network settings
-      if (fsNetworkSettings.updateNow() == FD_FILE_ERR && LittleFS.begin()) {
-        fsNetworkSettings.write();
-      }
-
-      this->restartSignalTime = 0;
-      this->delay(500);
      ESP.restart();
    }
  }
@@ -170,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) {
@@ -208,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;
      }
--- a/src/MqttTask.h
+++ b/src/MqttTask.h
@@ -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();
--- a/src/OpenThermTask.h
+++ b/src/OpenThermTask.h
--- a/src/PortalTask.h
+++ b/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"))
@@ -93,8 +108,8 @@ protected:
    // dashboard page
    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;
        }

@@ -104,11 +119,9 @@ protected:

    // restart
    this->webServer->on(F("/restart.html"), HTTP_GET, [this]() {
-      if (this->isAuthRequired()) {
-        if (!this->webServer->authenticate(settings.portal.login, settings.portal.password)) {
-          this->webServer->send(401);
-          return;
-        }
+      if (this->isAuthRequired() && !this->isValidCredentials()) {
+        this->webServer->requestAuthentication(BASIC_AUTH);
+        return;
      }

      vars.actions.restart = true;
@@ -119,8 +132,8 @@ protected:
    // network settings page
    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;
        }

@@ -131,8 +144,8 @@ protected:
    // settings page
    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;
        }

@@ -143,8 +156,8 @@ protected:
    // sensors page
    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;
        }

@@ -155,8 +168,8 @@ protected:
    // upgrade page
    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,7 +179,7 @@ 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)) {
+      if (this->isAuthRequired() && !this->isValidCredentials()) {
        this->webServer->sendHeader(F("Connection"), F("close"));
        this->webServer->send(401);
        return false;
@@ -174,6 +187,11 @@ protected:

      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;
@@ -194,16 +212,16 @@ protected:
      response.concat(fsResult.error);
      response.concat(F("\"}}"));
      this->webServer->send(status, F("application/json"), response);
+
+      vars.states.upgrading = false;
    });
    this->webServer->addHandler(upgradeHandler);


    // backup
    this->webServer->on(F("/api/backup/save"), HTTP_GET, [this]() {
-      if (this->isAuthRequired()) {
-        if (!this->webServer->authenticate(settings.portal.login, settings.portal.password)) {
-          return this->webServer->send(401);
-        }
+      if (this->isAuthRequired() && !this->isValidCredentials()) {
+        return this->webServer->send(401);
      }

      JsonDocument doc;
@@ -226,10 +244,12 @@ protected:
    });

    this->webServer->on(F("/api/backup/restore"), HTTP_POST, [this]() {
-      if (this->isAuthRequired()) {
-        if (!this->webServer->authenticate(settings.portal.login, settings.portal.password)) {
-          return this->webServer->send(401);
-        }
+      if (this->isAuthRequired() && !this->isValidCredentials()) {
+        return this->webServer->send(401);
+      }
+
+      if (vars.states.restarting) {
+        return this->webServer->send(503);
      }

      const String& plain = this->webServer->arg(0);
@@ -303,10 +323,8 @@ protected:

    // network
    this->webServer->on(F("/api/network/settings"), HTTP_GET, [this]() {
-      if (this->isAuthRequired()) {
-        if (!this->webServer->authenticate(settings.portal.login, settings.portal.password)) {
-          return this->webServer->send(401);
-        }
+      if (this->isAuthRequired() && !this->isValidCredentials()) {
+        return this->webServer->send(401);
      }

      JsonDocument doc;
@@ -317,10 +335,12 @@ protected:
    });

    this->webServer->on(F("/api/network/settings"), HTTP_POST, [this]() {
-      if (this->isAuthRequired()) {
-        if (!this->webServer->authenticate(settings.portal.login, settings.portal.password)) {
-          return this->webServer->send(401);
-        }
+      if (this->isAuthRequired() && !this->isValidCredentials()) {
+        return this->webServer->send(401);
+      }
+      
+      if (vars.states.restarting) {
+        return this->webServer->send(503);
      }

      const String& plain = this->webServer->arg(0);
@@ -372,11 +392,8 @@ protected:
    });

    this->webServer->on(F("/api/network/scan"), HTTP_GET, [this]() {
-      if (this->isAuthRequired()) {
-        if (!this->webServer->authenticate(settings.portal.login, settings.portal.password)) {
-          this->webServer->send(401);
-          return;
-        }
+      if (this->isAuthRequired() && !this->isValidCredentials()) {
+        return this->webServer->send(401);
      }

      auto apCount = WiFi.scanComplete();
@@ -418,10 +435,8 @@ protected:

    // settings
    this->webServer->on(F("/api/settings"), HTTP_GET, [this]() {
-      if (this->isAuthRequired()) {
-        if (!this->webServer->authenticate(settings.portal.login, settings.portal.password)) {
-          return this->webServer->send(401);
-        }
+      if (this->isAuthRequired() && !this->isValidCredentials()) {
+        return this->webServer->send(401);
      }

      JsonDocument doc;
@@ -432,10 +447,12 @@ protected:
    });

    this->webServer->on(F("/api/settings"), HTTP_POST, [this]() {
-      if (this->isAuthRequired()) {
-        if (!this->webServer->authenticate(settings.portal.login, settings.portal.password)) {
-          return this->webServer->send(401);
-        }
+      if (this->isAuthRequired() && !this->isValidCredentials()) {
+        return this->webServer->send(401);
+      }
+      
+      if (vars.states.restarting) {
+        return this->webServer->send(503);
      }

      const String& plain = this->webServer->arg(0);
@@ -479,10 +496,8 @@ protected:

    // sensors list
    this->webServer->on(F("/api/sensors"), HTTP_GET, [this]() {
-      if (this->isAuthRequired()) {
-        if (!this->webServer->authenticate(settings.portal.login, settings.portal.password)) {
-          return this->webServer->send(401);
-        }
+      if (this->isAuthRequired() && !this->isValidCredentials()) {
+        return this->webServer->send(401);
      }

      bool detailed = false;
@@ -494,6 +509,7 @@ protected:
      for (uint8_t sensorId = 0; sensorId <= Sensors::getMaxSensorId(); sensorId++) {
        if (detailed) {
          auto& sSensor = Sensors::settings[sensorId];
+          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]);
@@ -509,10 +525,8 @@ protected:

    // sensor settings
    this->webServer->on(F("/api/sensor"), HTTP_GET, [this]() {
-      if (this->isAuthRequired()) {
-        if (!this->webServer->authenticate(settings.portal.login, settings.portal.password)) {
-          return this->webServer->send(401);
-        }
+      if (this->isAuthRequired() && !this->isValidCredentials()) {
+        return this->webServer->send(401);
      }
      
      if (!this->webServer->hasArg(F("id"))) {
@@ -537,10 +551,12 @@ protected:
    });
    
    this->webServer->on(F("/api/sensor"), HTTP_POST, [this]() {
-      if (this->isAuthRequired()) {
-        if (!this->webServer->authenticate(settings.portal.login, settings.portal.password)) {
-          return this->webServer->send(401);
-        }
+      if (this->isAuthRequired() && !this->isValidCredentials()) {
+        return this->webServer->send(401);
+      }
+      
+      if (vars.states.restarting) {
+        return this->webServer->send(503);
      }

      #ifdef ARDUINO_ARCH_ESP8266
@@ -616,10 +632,8 @@ protected:
    });

    this->webServer->on(F("/api/vars"), HTTP_POST, [this]() {
-      if (this->isAuthRequired()) {
-        if (!this->webServer->authenticate(settings.portal.login, settings.portal.password)) {
-          return this->webServer->send(401);
-        }
+      if (this->isAuthRequired() && !this->isValidCredentials()) {
+        return this->webServer->send(401);
      }

      const String& plain = this->webServer->arg(0);
@@ -898,6 +912,14 @@ protected:
    }

    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();
    }

@@ -910,6 +932,10 @@ protected:
    return !network->isApEnabled() && settings.portal.auth && strlen(settings.portal.password);
  }

+  bool isValidCredentials() {
+    return this->webServer->authenticate(settings.portal.login, settings.portal.password);
+  }
+
  void onCaptivePortal() {
    const String& uri = this->webServer->uri();

--- a/src/RegulatorTask.h
+++ b/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) {
--- a/src/Sensors.h
+++ b/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++;
      }
    }
@@ -171,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(
--- a/src/SensorsTask.h
+++ b/src/SensorsTask.h
@@ -59,6 +59,10 @@ protected:
  #endif

  void loop() {
+    if (vars.states.restarting || vars.states.upgrading) {
+      return;
+    }
+
    if (isPollingDallasSensors()) {
      pollingDallasSensors(false);
      this->yield();
@@ -302,6 +306,7 @@ protected:
            continue;
          }
          
+          auto& rSensor = Sensors::results[sensorId];
          float value = instance.getTempC(sSensor.address);
          if (value == DEVICE_DISCONNECTED_C) {
            Log.swarningln(
@@ -309,6 +314,10 @@ protected:
              sSensor.gpio, sensorId, sSensor.name
            );

+            if (rSensor.signalQuality > 0) {
+              rSensor.signalQuality--;
+            }
+
            continue;
          }

@@ -317,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);
        }
@@ -334,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;
        }

@@ -531,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"),
@@ -604,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"),
@@ -689,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"),
@@ -788,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"),
--- a/src/Settings.h
+++ b/src/Settings.h
@@ -215,7 +215,7 @@ Sensors::Settings sensorsSettings[SENSORS_AMOUNT] = {
  {
    true,
    "Power",
-    Sensors::Purpose::CURRENT_POWER,
+    Sensors::Purpose::POWER,
    Sensors::Type::OT_CURRENT_POWER,
  }
 };
@@ -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;
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -6,11 +6,12 @@
 #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"
--- a/src/strings.h
+++ b/src/strings.h
@@ -170,6 +170,7 @@ 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";
--- a/src/utils.h
+++ b/src/utils.h
@@ -1351,20 +1351,24 @@ bool jsonToSettings(const JsonVariantConst src, Settings& dst, bool safe = false

  // force check heating target
  {
-    float value = !src[FPSTR(S_HEATING)][FPSTR(S_TARGET)].isNull() ? src[FPSTR(S_HEATING)][FPSTR(S_TARGET)].as<float>() : dst.heating.target;
+    bool indoorTempControl = dst.equitherm.enabled || dst.pid.enabled || dst.opentherm.nativeHeatingControl;
+    float minTemp = indoorTempControl ? THERMOSTAT_INDOOR_MIN_TEMP : dst.heating.minTemp;
+    float maxTemp = indoorTempControl ? THERMOSTAT_INDOOR_MAX_TEMP : dst.heating.maxTemp;
+
+    float value = !src[FPSTR(S_HEATING)][FPSTR(S_TARGET)].isNull() 
+      ? src[FPSTR(S_HEATING)][FPSTR(S_TARGET)].as<float>() 
+      : dst.heating.target;
    bool valid = isValidTemp(
      value,
      dst.system.unitSystem,
-      vars.master.heating.minTemp,
-      vars.master.heating.maxTemp,
+      minTemp,
+      maxTemp,
      dst.system.unitSystem
    );

    if (!valid) {
      value = convertTemp(
-        vars.master.heating.indoorTempControl
-        ? THERMOSTAT_INDOOR_DEFAULT_TEMP
-        : DEFAULT_HEATING_TARGET_TEMP,
+        indoorTempControl ? THERMOSTAT_INDOOR_DEFAULT_TEMP : DEFAULT_HEATING_TARGET_TEMP,
        UnitSystem::METRIC,
        dst.system.unitSystem
      );
@@ -1378,7 +1382,9 @@ bool jsonToSettings(const JsonVariantConst src, Settings& dst, bool safe = false

  // force check dhw target
  {
-    float value = !src[FPSTR(S_DHW)][FPSTR(S_TARGET)].isNull() ? src[FPSTR(S_DHW)][FPSTR(S_TARGET)].as<float>() : dst.dhw.target;
+    float value = !src[FPSTR(S_DHW)][FPSTR(S_TARGET)].isNull() 
+      ? src[FPSTR(S_DHW)][FPSTR(S_TARGET)].as<float>() 
+      : dst.dhw.target;
    bool valid = isValidTemp(
      value,
      dst.system.unitSystem,
@@ -1484,7 +1490,11 @@ bool jsonToSensorSettings(const uint8_t sensorId, const JsonVariantConst src, Se
      case static_cast<uint8_t>(Sensors::Purpose::DHW_FLOW_RATE):
      case static_cast<uint8_t>(Sensors::Purpose::EXHAUST_TEMP):
      case static_cast<uint8_t>(Sensors::Purpose::MODULATION_LEVEL):
-      case static_cast<uint8_t>(Sensors::Purpose::CURRENT_POWER):
+
+      case static_cast<uint8_t>(Sensors::Purpose::POWER_FACTOR):
+      case static_cast<uint8_t>(Sensors::Purpose::POWER):
+      case static_cast<uint8_t>(Sensors::Purpose::FAN_SPEED):
+      case static_cast<uint8_t>(Sensors::Purpose::CO2):
      case static_cast<uint8_t>(Sensors::Purpose::PRESSURE):
      case static_cast<uint8_t>(Sensors::Purpose::HUMIDITY):
      case static_cast<uint8_t>(Sensors::Purpose::TEMPERATURE):
@@ -1517,6 +1527,14 @@ bool jsonToSensorSettings(const uint8_t sensorId, const JsonVariantConst src, Se
      case static_cast<uint8_t>(Sensors::Type::OT_PRESSURE):
      case static_cast<uint8_t>(Sensors::Type::OT_MODULATION_LEVEL):
      case static_cast<uint8_t>(Sensors::Type::OT_CURRENT_POWER):
+      case static_cast<uint8_t>(Sensors::Type::OT_EXHAUST_CO2):
+      case static_cast<uint8_t>(Sensors::Type::OT_EXHAUST_FAN_SPEED):
+      case static_cast<uint8_t>(Sensors::Type::OT_SUPPLY_FAN_SPEED):
+      case static_cast<uint8_t>(Sensors::Type::OT_SOLAR_STORAGE_TEMP):
+      case static_cast<uint8_t>(Sensors::Type::OT_SOLAR_COLLECTOR_TEMP):
+      case static_cast<uint8_t>(Sensors::Type::OT_FAN_SPEED_SETPOINT):
+      case static_cast<uint8_t>(Sensors::Type::OT_FAN_SPEED_CURRENT):
+
      case static_cast<uint8_t>(Sensors::Type::NTC_10K_TEMP):
      case static_cast<uint8_t>(Sensors::Type::DALLAS_TEMP):
      case static_cast<uint8_t>(Sensors::Type::BLUETOOTH):
@@ -1656,13 +1674,13 @@ void sensorResultToJson(const uint8_t sensorId, JsonVariant dst) {
  dst[FPSTR(S_SIGNAL_QUALITY)] = rSensor.signalQuality;

  if (sSensor.type == Sensors::Type::BLUETOOTH) {
-    dst[FPSTR(S_TEMPERATURE)] = rSensor.values[static_cast<uint8_t>(Sensors::ValueType::TEMPERATURE)];
-    dst[FPSTR(S_HUMIDITY)] = rSensor.values[static_cast<uint8_t>(Sensors::ValueType::HUMIDITY)];
-    dst[FPSTR(S_BATTERY)] = rSensor.values[static_cast<uint8_t>(Sensors::ValueType::BATTERY)];
-    dst[FPSTR(S_RSSI)] = rSensor.values[static_cast<uint8_t>(Sensors::ValueType::RSSI)];
+    dst[FPSTR(S_TEMPERATURE)] = roundf(rSensor.values[static_cast<uint8_t>(Sensors::ValueType::TEMPERATURE)], 3);
+    dst[FPSTR(S_HUMIDITY)] = roundf(rSensor.values[static_cast<uint8_t>(Sensors::ValueType::HUMIDITY)], 3);
+    dst[FPSTR(S_BATTERY)] = roundf(rSensor.values[static_cast<uint8_t>(Sensors::ValueType::BATTERY)], 1);
+    dst[FPSTR(S_RSSI)] = roundf(rSensor.values[static_cast<uint8_t>(Sensors::ValueType::RSSI)], 0);

  } else {
-    dst[FPSTR(S_VALUE)] = rSensor.values[static_cast<uint8_t>(Sensors::ValueType::PRIMARY)];
+    dst[FPSTR(S_VALUE)] = roundf(rSensor.values[static_cast<uint8_t>(Sensors::ValueType::PRIMARY)], 3);
  }
 }

@@ -1735,6 +1753,7 @@ void varsToJson(const Variables& src, JsonVariant dst) {
  mHeating[FPSTR(S_ENABLED)] = src.master.heating.enabled;
  mHeating[FPSTR(S_BLOCKING)] = src.master.heating.blocking;
  mHeating[FPSTR(S_INDOOR_TEMP_CONTROL)] = src.master.heating.indoorTempControl;
+  mHeating[FPSTR(S_SETPOINT_TEMP)] = roundf(src.master.heating.setpointTemp, 2);
  mHeating[FPSTR(S_TARGET_TEMP)] = roundf(src.master.heating.targetTemp, 2);
  mHeating[FPSTR(S_CURRENT_TEMP)] = roundf(src.master.heating.currentTemp, 2);
  mHeating[FPSTR(S_RETURN_TEMP)] = roundf(src.master.heating.returnTemp, 2);
@@ -1752,6 +1771,7 @@ void varsToJson(const Variables& src, JsonVariant dst) {
  mDhw[FPSTR(S_MAX_TEMP)] = settings.dhw.maxTemp;

  master[FPSTR(S_NETWORK)][FPSTR(S_CONNECTED)] = src.network.connected;
+  master[FPSTR(S_NETWORK)][FPSTR(S_RSSI)] = src.network.rssi;
  master[FPSTR(S_MQTT)][FPSTR(S_CONNECTED)] = src.mqtt.connected;
  master[FPSTR(S_EMERGENCY)][FPSTR(S_STATE)] = src.emergency.state;
  master[FPSTR(S_EXTERNAL_PUMP)][FPSTR(S_STATE)] = src.externalPump.state;
--- a/src_data/fonts/iconly.eot
+++ b/src_data/fonts/iconly.eot
--- a/src_data/fonts/iconly.svg
+++ b/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>
--- a/src_data/fonts/iconly.ttf
+++ b/src_data/fonts/iconly.ttf
--- a/src_data/fonts/iconly.woff
+++ b/src_data/fonts/iconly.woff
--- a/src_data/fonts/iconly.woff2
+++ b/src_data/fonts/iconly.woff2
--- a/src_data/locales/en.json
+++ b/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",
--- a/src_data/locales/ru.json
+++ b/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": "Файл настроек",
--- a/src_data/pages/dashboard.html
+++ b/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);
      });
--- a/src_data/pages/index.html
+++ b/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);
--- a/src_data/pages/network.html
+++ b/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');
          }
--- a/src_data/pages/sensors.html
+++ b/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) {
--- a/src_data/pages/settings.html
+++ b/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>
@@ -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');
          }
--- a/src_data/pages/upgrade.html
+++ b/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'));
--- a/src_data/scripts/lang.js
+++ b/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) {
--- a/src_data/scripts/utils.js
+++ b/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);
@@ -309,10 +313,11 @@ const setupRestoreBackupForm = (formSelector) => {

        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({"settings": data.settings})
          });
@@ -331,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)
            });
@@ -348,10 +354,11 @@ const setupRestoreBackupForm = (formSelector) => {

        if (data.network != 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({"network": data.network})
          });
@@ -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();
--- a/src_data/styles/app.css
+++ b/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);
 }
--- a/src_data/styles/iconly.css
+++ b/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";
+}
Author	SHA1	Message	Date
github-actions[bot]	bef31da3d5	Bump NimBLE-Arduino to 2.1.0	2024-12-15 00:35:16 +00:00
Yurii	bae7770371	chore: update pcb	2024-12-07 23:47:21 +03:00
Yurii	4e5a3e9da5	refactor: little changes	2024-12-07 23:10:50 +03:00
Yurii	412e1594e9	chore: update readme & assets	2024-12-07 23:10:27 +03:00
Yurii	9701e8c97b	chore: update readme	2024-12-07 22:59:29 +03:00
Yurii	2fe546812c	chore: update readme	2024-12-07 22:47:24 +03:00
Yurii	7efcbaa57e	chore: bump version to 1.5.0	2024-12-05 00:04:58 +03:00
Yurii	43c065b97a	Merge branch 'master' into 1.5.0-dev	2024-12-04 07:56:19 +03:00
Yurii	5c1e967fdc	refactor: improved display of sensors on Dashboard	2024-12-04 06:09:20 +03:00
Yurii	105a79f72c	refactor: optimization of OT requests for CH2	2024-12-04 05:55:01 +03:00
Yurii	50280f6db3	fix: negative temperature values from BLE devices	2024-12-04 05:36:04 +03:00
Yurii	c97e50669c	fix: typo in purpose of sensors for emergency mode	2024-12-04 05:35:19 +03:00
Yurii	43fd095714	fix: digest auth changed to basic Digest auth not working on ios #99	2024-12-02 06:26:03 +03:00
Yurii	1bb9b61017	feat: display sensor values on dashboard page	2024-12-01 05:26:14 +03:00
Yurii	1eb10563ed	chore: update readme	2024-11-30 23:58:54 +03:00
Yurii	222ea4feaa	refactor: some changes	2024-11-29 20:58:52 +03:00
Yurii	ea1406c509	fix: action state for HA ``climate`` entities fixed	2024-11-20 23:11:30 +03:00
Yurii	b20b450736	fix: fixed ERR_CONNECTION_RESET for Chrome based browsers	2024-11-20 23:10:42 +03:00
Yurii	e8c7f58e67	fix: fixed power calculation	2024-11-18 19:41:12 +03:00
Yurii	2589020428	refactor: optimized polling of unused OT IDs	2024-11-16 22:57:52 +03:00
Yurii	2bb771a4a7	chore: bump pioarduino/platform-espressif32 from 3.1.0 rc2 to 3.1.0 rc3	2024-11-16 22:56:01 +03:00
Yurii	f4af237472	chore: bump version to 1.4.6	2024-11-16 14:19:40 +03:00
Yurii	5473034421	chore: deleted .ino file	2024-11-16 14:15:26 +03:00
Yurii	a5996cc93d	refactor: rounding sensor values	2024-11-15 01:28:28 +03:00
Yurii	9d6b6c18ab	fix: pub network.rssi	2024-11-15 01:18:45 +03:00
Yurii	e6119dc7ee	refactor: restart action improved	2024-11-15 00:55:38 +03:00
Yurii	19feb85230	refactor: some changes	2024-11-15 00:25:41 +03:00
Yurii	0d71a674b6	feat: added more OT polled IDs & reformat code * ID79 - exhaust CO2 * ID84 - exhaust fan speed * ID85 - supply fan speed * ID29 - solar storage temp * ID30 - solar collector temp * ID35 - boiler fan speed setpoint & actual	2024-11-14 23:02:46 +03:00
Yurii	34eabca64a	refactor: improved web cache	2024-11-14 22:30:34 +03:00
Yurii	d3b28c5bfb	fix: building without BLE fixed	2024-11-13 12:11:36 +03:00
Yurii	640935a2b7	refactor: improved updating OT sensors	2024-11-13 01:00:04 +03:00
Yurii	c0c631aab4	fix: added ``step` `to HA entities for` `Sensors::Type::MANUAL``	2024-11-13 00:58:28 +03:00
Yurii	861db33765	feat: added signal quality for DALLAS sensors	2024-11-13 00:57:01 +03:00
Yurii	b91266063b	refactor: imporved updating OT sensors	2024-11-12 19:47:56 +03:00
Yurii	b087e6e6d3	refactor: some changes	2024-11-12 15:26:28 +03:00
Yurii	b205f14bae	refactor: impoved sensors settings page	2024-11-12 15:25:58 +03:00
Yurii	7482eb8898	refactor: added {BUILD_TIME} in path js and css files	2024-11-12 11:44:02 +03:00
Yurii	2ff84cbddf	fix: update target heating temp when restoring settings	2024-11-12 11:42:48 +03:00
Yurii	8b6e6be670	fix: display of current heating temp on dashboard	2024-11-12 11:37:09 +03:00
Yurii	636872f72d	refactor: some fixes	2024-11-12 10:48:29 +03:00