chore: bump version to 1.5.1

Co-authored-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com>

.github/dependabot.yaml

@@ -0,0 +1,11 @@
+version: 2
+updates:
+  - package-ecosystem: "npm"
+    directory: "/"
+    schedule:
+      interval: "daily"
+
+  - package-ecosystem: "github-actions"
+    directory: "/"
+    schedule:
+      interval: "daily"

.github/workflows/pio-dependabot.yaml

@@ -0,0 +1,22 @@
+name: PlatformIO Dependabot
+on:
+  workflow_dispatch: # option to manually trigger the workflow
+  schedule:
+    # Runs every day at 00:00
+    - cron: "0 0 * * *"
+
+permissions:
+  contents: write
+  pull-requests: write
+
+jobs:
+  dependabot:
+    runs-on: ubuntu-latest
+    name: run PlatformIO Dependabot
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v4
+      - name: run PlatformIO Dependabot
+        uses: peterus/platformio_dependabot@v1.2.0
+        with:
+          github_token: ${{ secrets.GITHUB_TOKEN }}

.github/workflows/stale.yaml

@@ -0,0 +1,20 @@
+name: "Close stale issues and PR"
+on:
+  schedule:
+    - cron: "0 * * * *"
+
+jobs:
+  stale:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/stale@v9
+        with:
+          stale-issue-message: >
+            This issue is stale because it has been open 15 days with no activity. Remove stale label or comment or this will be closed in 5 days.
+          close-issue-message: >
+            This issue was closed because it has been stalled for 5 days with no activity.
+          days-before-stale: 15
+          days-before-close: 5
+          days-before-pr-stale: -1
+          days-before-pr-close: -1
+          exempt-issue-labels: "documentation,bug,enhancement"

.gitignore

@@ -1,2 +1,8 @@
 .pio
-.vscode
+.vscode
+build/*.bin
+data/*
+secrets.ini
+node_modules
+package-lock.json
+!.gitkeep

README.md

@@ -1,207 +1,73 @@
-![logo](/assets/logo.svg)
+<div align="center">
+
+   [![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](#compatible-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 the coolant for heating: works/does not work
-  - The process of heating water for hot water: working/not working
-  - Display of boiler errors
-  - Burner status: 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 coolant temperature (depending on the selected mode)
-  - Current hot water temperature
-- Auto tuning of PID and Equitherm parameters *(in development)*
+  - 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:
 
-## Tested on
-| Boiler | Master Member ID | Notes |
-| --- | --- | --- |
-| BAXI ECO Nova | default | Pressure sensor not supported, modulation level not stable |
-| BAXI Ampera | 1028 | Pressure sensor not supported, only heating (DHW not tested) |
-| [Remeha Calenta Ace 40C](https://github.com/Laxilef/OTGateway/issues/1#issuecomment-1726081554) | default | - |
+* [Home](https://github.com/Laxilef/OTGateway/wiki)
+   * [Quick Start](https://github.com/Laxilef/OTGateway/wiki#quick-start)
+   * [Build firmware](https://github.com/Laxilef/OTGateway/wiki#build-firmware)
+   * [Flash firmware via ESP Flash Download Tool](https://github.com/Laxilef/OTGateway/wiki#flash-firmware-via-esp-flash-download-tool)
+   * [Settings](https://github.com/Laxilef/OTGateway/wiki#settings)
+      * [External temperature sensors](https://github.com/Laxilef/OTGateway/wiki#external-temperature-sensors)
+      * [Reporting indoor/outdoor temperature from any Home Assistant sensor](https://github.com/Laxilef/OTGateway/wiki#reporting-indooroutdoor-temperature-from-any-home-assistant-sensor)
+      * [Reporting outdoor temperature from Home Assistant weather integration](https://github.com/Laxilef/OTGateway/wiki#reporting-outdoor-temperature-from-home-assistant-weather-integration)
+      * [DHW meter](https://github.com/Laxilef/OTGateway/wiki#dhw-meter)
+      * [Advanced Settings](https://github.com/Laxilef/OTGateway/wiki#advanced-settings)
+   * [Equitherm mode](https://github.com/Laxilef/OTGateway/wiki#equitherm-mode)
+      * [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)
+   * [Temperature sensors](https://github.com/Laxilef/OTGateway/wiki/Compatibility#temperature-sensors)
+* [FAQ & Troubleshooting](https://github.com/Laxilef/OTGateway/wiki/FAQ-&-Troubleshooting)
+* [OT adapters](https://github.com/Laxilef/OTGateway/wiki/OT-adapters)
+   * [Adapters on sale](https://github.com/Laxilef/OTGateway/wiki/OT-adapters#adapters-on-sale)
+   * [DIY](https://github.com/Laxilef/OTGateway/wiki/OT-adapters#diy)
+      * [Files for production](https://github.com/Laxilef/OTGateway/wiki/OT-adapters#files-for-production)
+      * [Connection](https://github.com/Laxilef/OTGateway/wiki/OT-adapters#connection)
+      * [Leds on board](https://github.com/Laxilef/OTGateway/wiki/OT-adapters#leds-on-board)
 
-## PCB
-<img src="/assets/pcb.svg" width="27%" /> <img src="/assets/pcb_3d.png" width="30%" /> <img src="/assets/after_assembly.png" width="40%" />
-
-Housing for installation on DIN rail - D2MG. Occupies only 2 DIN modules.<br>
-The 220V > 5V power supply is already on the board, so additional power supplies are not needed.<br>
-To save money, 2 levels are ordered as one board. After manufacturing, the boards need to be divided into 2 parts - upper and lower. The boards are inexpensively (5pcs for $2) manufactured at JLCPCB (Remove Order Number = Specify a location).<br><br>
-Some components can be replaced with similar ones (for example use a fuse and led with legs). Some SMD components (for example optocouplers) can be replaced with similar SOT components.<br>Most of the components can be purchased inexpensively on Aliexpress, the rest in your local stores.<br><br>
-The outdoor temperature sensor must be connected to the **TEMP1** connector, the indoor temperature sensor must be connected to the **TEMP2** connector. The power supply for the sensors must be connected to the **3.3V** connector, GND to **GND**.<br>
-**The opentherm connection polarity does not matter.**
-<!-- **Important!** On this board opentherm IN pin = 5, OUT pin = 4 -->
-
-- [Schematic](/assets/Schematic.pdf)
-- [BOM](/assets/BOM.xlsx)
-- [Gerber](/assets/gerber.zip)
-
-## Another compatible OpenTherm Adapters
-- [Ihor Melnyk OpenTherm Adapter](http://ihormelnyk.com/opentherm_adapter)
-- [DIYLESS Master OpenTherm Shield](https://diyless.com/product/master-opentherm-shield)
-- [OpenTherm master shield for Wemos/Lolin](https://www.tindie.com/products/thehognl/opentherm-master-shield-for-wemoslolin/)
-- And others. It's just that the adapter must implement [the schema](http://ihormelnyk.com/Content/Pages/opentherm_adapter/opentherm_adapter_schematic_o.png)
-
-## Compatible Temperature Sensors
-* DS18B20
-* DS1822
-* DS1820
-* MAX31820
-* MAX31850
-
-[See more](https://github.com/milesburton/Arduino-Temperature-Control-Library#usage)
-
-# Quick Start
-1. Download the latest firmware from the [releases page](https://github.com/Laxilef/OTGateway/releases) (or compile yourself) and flash your ESP8266 board using the [ESP Flash Download Tool](https://www.espressif.com/en/support/download/other-tools) or other software.
-2. Connect to *OpenTherm Gateway* hotspot, password: otgateway123456
-3. Open configuration page in browser: 192.168.4.1
-4. Set up a connection to your wifi network
-5. Set up a connection to your MQTT server: ip, port, user, password
-6. Set up a **Opentherm pin IN** & **Opentherm pin OUT**. No change for my board. Typically used **IN** = 4, **OUT** = 5
-7. Set up a **Outdoor sensor pin** & **Indoor sensor pin**. No change for my board.
-8. if necessary, set up a the master member ID ([see more](#tested-on))
-9. Restart module (required after changing OT pins and/or sensors pins!)
-
-After connecting to your wifi network, you can go to the setup page at the address that ESP8266 received.
-The OTGateway device will be automatically added to homeassistant if MQTT server ip, login and password are correct.
-
-## HomeAsssistant settings
-By default, the "Equitherm" and "PID" modes are disabled. In this case, the boiler will simply maintain the temperature you set.
-To use "Equitherm" or "PID" modes, the controller needs to know the temperature inside and outside the house.<br><br>
-The temperature inside the house can be set using simple automation:
-<details>
-
-  **sensor.livingroom_temperature** - temperature sensor inside the house.<br>
-  **number.opentherm_indoor_temp** - an entity that stores the temperature value inside the house. The default does not need to be changed.
-
-  ```yaml
-    alias: Set boiler indoor temp
-    description: ""
-    trigger:
-      - platform: state
-        entity_id:
-          - sensor.livingroom_temperature
-      - platform: time_pattern
-        seconds: /30
-    condition: []
-    action:
-      - if:
-          - condition: template
-            value_template: "{{ has_value('number.opentherm_indoor_temp') and (states('sensor.livingroom_temperature')|float(0) - states('number.opentherm_indoor_temp')|float(0)) | abs | round(2) >= 0.01 }}"
-        then:
-          - service: number.set_value
-            data:
-              value: "{{ states('sensor.livingroom_temperature')|float(0)|round(2) }}"
-            target:
-              entity_id: number.opentherm_indoor_temp
-    mode: single
-  ```
-</details>
-
-If your boiler does not support the installation of an outdoor temperature sensor or does not provide this value via the opentherm protocol, then you can use an external sensor or use automation.
-<details>
-  <summary>Simple automation</summary>
-
-  **weather.home** - [weather entity](https://www.home-assistant.io/integrations/weather/). It is important that the address of your home is entered correctly in the Home Assistant settings.<br>
-  **number.opentherm_outdoor_temp** - an entity that stores the temperature value outside the house. The default does not need to be changed.
-
-  ```yaml
-    alias: Set boiler outdoor temp
-    description: ""
-    trigger:
-      - platform: state
-        entity_id:
-          - weather.home
-        attribute: temperature
-        for:
-          hours: 0
-          minutes: 1
-          seconds: 0
-      - platform: time_pattern
-        seconds: /30
-    condition: []
-    action:
-      - if:
-          - condition: template
-            value_template: "{{ has_value('weather.home') and (state_attr('weather.home', 'temperature')|float(0) - states('number.opentherm_outdoor_temp')|float(0)) | abs | round(2) >= 0.1 }}"
-        then:
-          - service: number.set_value
-            data:
-              value: "{{ state_attr('weather.home', 'temperature')|float(0)|round(2) }}"
-            target:
-              entity_id: number.opentherm_outdoor_temp
-    mode: single
-  ```
-</details>
-After these settings, you can enable the "Equitherm" and/or "PID" modes and configure them as described below.
-
-
-## About modes
-### Equitherm
-Weather-compensated temperature control maintains a comfortable set temperature in the house. The algorithm requires temperature sensors in the house and outside.<br> Instead of an outdoor sensor, you can use the weather forecast and automation for HA.
-
-#### Ratios:
-***N*** - heating curve coefficient. The coefficient is selected individually, depending on the insulation of the room, the heated area, etc.<br>
-Range: 0.3...10, default: 0.7, step 0.01
-
-
-***K*** - сorrection for desired room temperature.<br>
-Range: 0...10, default: 3, step 0.01
-
-
-***T*** - thermostat correction.<br>
-Range: 0...10, default: 2, step 0.01
-
-#### Instructions for fit coefficients:
-**Tip.** I created a [table in Excel](/assets/equitherm_calc.xlsx) in which you can enter temperature parameters inside and outside the house and select coefficients. On the graph you can see the temperature that the boiler will set.
-
-1. Set the ***K*** and ***T*** coefficients to 0.
-2. The first thing you need to do is to fit the curve (***N*** coefficient). If your home has low heat loss, then start with 0.5. Otherwise start at 0.7. When the temperature inside the house stops changing, increase or decrease the coefficient value in increments of 0.1 to select the optimal curve.<br>
-Please note that passive heating (sun) will affect the house temperature during curve fitting. This process is not fast and will take you 1-2 days.
-Important. During curve fitting, the temperature must be kept stable as the outside temperature changes.<br>
-At this stage, it is important for you to stabilize the indoor temperature at exactly 20 (+- 0.5) degrees.<br>
-For example. You fit curve 0.67; set temperature 20; the temperature in the house is 20.1 degrees while the outside temperature is -10 degrees and -5 degrees. This is good.
-3. After fitting the curve, you must select the ***K*** coefficient. It influences the boiler temperature correction to maintain the set temperature.
-For example. Set temperature: 23 degrees; temperature in the house: 20 degrees. Try setting it to 2 and see how the temperature in the house changes after stabilization. Select the value so that the temperature in the house is close to the set.
-4. Now you can choose the ***T*** coefficient. Simply put, it affects the sharpness of the temperature change. If you want fast heating, then set a high value (6-10), but then the room may overheat. If you want smooth heating, set 1-5. Choose the optimal value for yourself.
-5. Check to see if it works correctly at different set temperatures over several days.
-
-Read more about the algorithm [here](https://wdn.su/blog/1154).
-
-### PID
-See [Wikipedia](https://en.wikipedia.org/wiki/PID_controller).
-![PID example](https://upload.wikimedia.org/wikipedia/commons/3/33/PID_Compensation_Animated.gif)
-
-In Google you can find instructions for tuning the PID controller.
-
-### Use Equitherm mode + PID mode
-@todo
-
-## Dependencies
-- [ESP8266Scheduler](https://github.com/nrwiersma/ESP8266Scheduler)
-- [NTPClient](https://github.com/arduino-libraries/NTPClient)
-- [ArduinoJson](https://github.com/bblanchon/ArduinoJson)
-- [OpenTherm Library](https://github.com/ihormelnyk/opentherm_library)
-- [PubSubClient](https://github.com/knolleary/pubsubclient)
-- [TelnetStream](https://github.com/jandrassy/TelnetStream)
-- [EEManager](https://github.com/GyverLibs/EEManager)
-- [GyverPID](https://github.com/GyverLibs/GyverPID)
-- [DallasTemperature](https://github.com/milesburton/Arduino-Temperature-Control-Library)
-- [WiFiManager](https://github.com/tzapu/WiFiManager)
-
-## 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.

assets/blueprint_import.svg

@@ -0,0 +1,12 @@
+<?xml version="1.0"?>
+<svg xmlns="http://www.w3.org/2000/svg" height="40" aria-label="Import blueprint to My Home Assistant" style="border-radius:24px;width:auto" viewBox="0 0 592 96">
+  <rect width="592" height="96" fill="#18BCF2" rx="48"/>
+  <path fill="#fff" d="M42.55 60.2h4.59V36.75h-4.59Zm10.35 0h4.59V43.99l7.23 10.58 7.24-10.62V60.2h4.56V36.75h-4.56v.03l-.4-.03-6.84 10.12-6.83-10.12-.4.03v-.03H52.9Zm29.38 0h4.59v-7.77h4.49c4.72 0 8.07-3.29 8.07-7.87 0-4.59-3.48-7.88-8.44-7.84l-4.66.03h-4.05Zm8.61-19.26c2.27-.04 3.88 1.47 3.88 3.62 0 2.14-1.47 3.65-3.51 3.65h-4.39v-7.27Zm22.98 19.66c6.97 0 11.92-5.02 11.92-12.09 0-7.1-4.95-12.13-12.02-12.13-7.04 0-12 4.99-12 12.13 0 7.07 5 12.09 12.1 12.09m0-4.19c-4.36 0-7.41-3.28-7.41-7.9 0-4.66 3.02-7.94 7.31-7.94 4.32 0 7.33 3.28 7.33 7.94 0 4.62-2.98 7.9-7.23 7.9m16.31 3.79h4.59v-8.31h3.52l4.79 8.31h5.19l-5.42-9.11c2.71-1.21 4.48-3.69 4.48-6.77 0-4.45-3.48-7.64-8.44-7.6l-4.65.03h-4.06Zm8.51-19.26c2.28 0 3.89 1.37 3.89 3.38 0 1.98-1.61 3.38-3.65 3.38h-4.16v-6.76Zm18.33 19.26h4.59V40.94h7v-4.19h-18.63v4.19h7.04Zm23.91 0h9.02c4.69 0 7.77-2.41 7.77-6.7 0-2.65-1.24-4.42-3.42-5.53 1.64-1.17 2.61-2.78 2.61-4.55 0-4.43-3.21-6.7-8.04-6.7l-3.45.03h-4.49Zm7.68-19.8c2.21-.03 3.61 1.07 3.61 2.95s-1.27 2.95-3.25 2.95h-3.55v-5.9Zm.53 9.65c2.41-.03 3.89 1.17 3.89 3.08 0 1.81-1.34 3.02-3.52 3.02h-4.09v-6.1h.24Zm12.97 10.15h14.9v-4.19H206.7V36.75h-4.59Zm18.32-8.74c0 5.62 3.69 9.21 9.51 9.21 5.9 0 9.65-3.59 9.65-9.21V36.75H235v14.71c0 3.01-1.97 4.95-4.99 4.95-3.01 0-4.99-1.94-4.99-4.95V36.75h-4.59Zm24.59 8.74h14.97v-4.19h-10.38v-5.66h8.84v-4.09h-8.84v-5.32h10.25v-4.19h-14.84Zm20.4 0h4.59v-7.77h4.49c4.72 0 8.07-3.29 8.07-7.87 0-4.59-3.48-7.88-8.44-7.84l-4.66.03h-4.05Zm8.61-19.26c2.28-.04 3.89 1.47 3.89 3.62 0 2.14-1.48 3.65-3.52 3.65h-4.39v-7.27Zm12.26 19.26h4.59v-8.31h3.52l4.79 8.31h5.19l-5.43-9.11c2.72-1.21 4.49-3.69 4.49-6.77 0-4.45-3.48-7.64-8.44-7.6l-4.65.03h-4.06Zm8.51-19.26c2.28 0 3.89 1.37 3.89 3.38 0 1.98-1.61 3.38-3.65 3.38h-4.16v-6.76Zm13.77 19.26h4.59V36.75h-4.59Zm10.35 0 4.59.03V44.12l11.66 16.08h4.55V36.75h-4.55v15.81l-11.46-15.81h-4.79Zm31.52 0h4.59V40.94h7.01v-4.19h-18.63v4.19h7.03Zm28.88 0h4.59V40.94h7v-4.19h-18.62v4.19h7.03Zm26 .4c6.97 0 11.92-5.02 11.92-12.09 0-7.1-4.95-12.13-12.02-12.13-7.04 0-12 4.99-12 12.13 0 7.07 5 12.09 12.1 12.09m0-4.19c-4.36 0-7.41-3.28-7.41-7.9 0-4.66 3.02-7.94 7.31-7.94 4.32 0 7.33 3.28 7.33 7.94 0 4.62-2.98 7.9-7.23 7.9"/>
+  <g style="transform:translate(95px,0)">
+    <rect width="137" height="64" x="344" y="16" fill="#F2F4F9" rx="32"/>
+    <path fill="#18BCF2" d="M394.419 37.047V60.5h-4.297V46.797L384.716 60.5h-4.157l-5.343-13.594V60.5h-4.188V37.047h4.188l7.422 18.36 7.484-18.36zm9.365 0 5.344 9.89 5.344-9.89h4.766l-7.969 14.14V60.5h-4.391v-9.312l-8.031-14.141zM457 60c0 1.65-1.35 3-3 3h-24c-1.65 0-3-1.35-3-3v-9c0-1.65.95-3.95 2.12-5.12l10.76-10.76a3 3 0 0 1 4.24 0l10.76 10.76c1.17 1.17 2.12 3.47 2.12 5.12z"/>
+    <path fill="#F2F4F9" stroke="#F2F4F9" d="M442 45.5a2 2 0 1 0 0-4 2 2 0 0 0 0 4Z"/>
+    <path fill="#F2F4F9" stroke="#F2F4F9" stroke-miterlimit="10" d="M449.5 53.5a2 2 0 1 0 0-4 2 2 0 0 0 0 4ZM434.5 57.5a2 2 0 1 0 0-4 2 2 0 0 0 0 4Z"/>
+    <path fill="none" stroke="#F2F4F9" stroke-miterlimit="10" stroke-width="2.25" d="M442 43.48V63l-7.5-7.5M449.5 51.46l-7.41 7.41"/>
+  </g>
+</svg>

assets/ha/dhw_meter.yaml

@@ -0,0 +1,19 @@
+# Package for Home Assistant Packages
+# More info: https://www.home-assistant.io/docs/configuration/packages/
+
+dhw_meter:
+  sensor:
+    - platform: integration
+      unique_id: hot_water_meter
+      name: hot_water_meter
+      source: sensor.opentherm_dhw_flow_rate
+      unit_time: min
+      method: left
+      round: 2
+
+  homeassistant:
+    customize:
+      sensor.hot_water_meter:
+        friendly_name: "Hot water"
+        device_class: "water"
+        icon: "mdi:water-pump"

assets/ha/report_temp_to_otgateway.yaml

@@ -0,0 +1,48 @@
+# Blueprint for reporting indoor/outdoor temperature to OpenTherm Gateway from any home assistant sensor
+# Updated: 03.09.2024
+
+blueprint:
+  name: Report temp to OpenTherm Gateway
+  domain: automation
+  author: "Laxilef"
+  
+  input:
+    source_entity:
+      name: Source entity
+      description: "Temperature data source"
+      selector:
+        entity:
+          multiple: false
+          filter:
+            - domain: sensor
+              device_class: temperature
+    target_entity:
+      name: Target entity
+      description: "Usually ``number.opentherm_indoor_temp`` or ``number.opentherm_outdoor_temp``"
+      default: "number.opentherm_indoor_temp"
+      selector:
+        entity:
+          multiple: false
+          filter:
+            - domain: number
+
+mode: single
+variables:
+  source_entity: !input source_entity
+  target_entity: !input target_entity
+trigger:
+  - platform: time_pattern
+    seconds: /30
+condition:
+  - condition: template
+    value_template: "{{ states(source_entity) != 'unavailable' and states(target_entity) != 'unavailable' }}"
+action:
+  - if:
+      - condition: template
+        value_template: "{{ (states(source_entity)|float(0) - states(target_entity)|float(0)) | abs | round(2) >= 0.01 }}"
+    then:
+      - service: number.set_value
+        data:
+          value: "{{ states(source_entity)|float(0)|round(2) }}"
+        target:
+          entity_id: "{{ target_entity }}"

assets/ha/report_temp_to_otgateway_from_weather.yaml

@@ -0,0 +1,47 @@
+# Blueprint for reporting temperature to OpenTherm Gateway from home assistant weather integration
+# Updated: 03.09.2024
+
+blueprint:
+  name: Report temp to OpenTherm Gateway from Weather
+  domain: automation
+  author: "Laxilef"
+  
+  input:
+    source_entity:
+      name: Source entity
+      description: "Temperature data source"
+      selector:
+        entity:
+          multiple: false
+          filter:
+            - domain: weather
+    target_entity:
+      name: Target entity
+      description: "Usually ``number.opentherm_outdoor_temp``"
+      default: "number.opentherm_outdoor_temp"
+      selector:
+        entity:
+          multiple: false
+          filter:
+            - domain: number
+
+mode: single
+variables:
+  source_entity: !input source_entity
+  target_entity: !input target_entity
+trigger:
+  - platform: time_pattern
+    seconds: /30
+condition:
+  - condition: template
+    value_template: "{{ states(source_entity) != 'unavailable' and states(target_entity) != 'unavailable' }}"
+action:
+  - if:
+      - condition: template
+        value_template: "{{ (state_attr(source_entity, 'temperature')|float(0) - states(target_entity)|float(0)) | abs | round(2) >= 0.1 }}"
+    then:
+      - service: number.set_value
+        data:
+          value: "{{ state_attr(source_entity, 'temperature')|float(0)|round(2) }}"
+        target:
+          entity_id: "{{ target_entity }}"

esp32_partitions.csv

@@ -0,0 +1,7 @@
+# Name,     Type,   SubType,    Offset,     Size,     Flags
+nvs,        data,   nvs,        0x9000,     0x5000,   
+otadata,    data,   ota,        0xE000,     0x2000,   
+app0,       app,    ota_0,      0x10000,    0x1B0000, 
+app1,       app,    ota_1,      0x1C0000,   0x1B0000, 
+spiffs,     data,   spiffs,     0x370000,   0x80000,  
+coredump,   data,   coredump,   0x3F0000,   0x10000,  

gulpfile.js

@@ -0,0 +1,159 @@
+const { src, dest, series, parallel } = require('gulp');
+const concat = require('gulp-concat');
+const gzip = require('gulp-gzip');
+const postcss = require('gulp-postcss');
+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 = {
+  styles: {
+    dest: 'data/static/',
+    bundles: {
+      'app.css': [
+        'src_data/styles/pico.min.css',
+        'src_data/styles/iconly.css',
+        'src_data/styles/app.css'
+      ]
+    }
+  },
+  scripts: {
+    dest: 'data/static/',
+    bundles: {
+      'app.js': [
+        'src_data/scripts/i18n.min.js',
+        'src_data/scripts/lang.js',
+        'src_data/scripts/utils.js'
+      ]
+    }
+  },
+  json: [
+    {
+      src: 'src_data/locales/*.json',
+      dest: 'data/static/locales/'
+    }
+  ],
+  static: [
+    {
+      src: 'src_data/fonts/*.*',
+      dest: 'data/static/fonts/'
+    },
+    {
+      src: 'src_data/images/*.*',
+      dest: 'data/static/images/'
+    }
+  ],
+  pages: {
+    src: 'src_data/pages/*.html',
+    dest: 'data/pages/'
+  }
+};
+
+
+
+// Tasks
+const styles = (cb) => {
+  for (let name in paths.styles.bundles) {
+    const items = paths.styles.bundles[name];
+
+    src(items)
+      .pipe(replace(
+        "{BUILD_TIME}",
+        Math.floor(Date.now() / 1000)
+      ))
+      .pipe(postcss([
+        cssnano({ preset: 'advanced' })
+      ]))
+      .pipe(concat(name))
+      .pipe(gzip({
+        append: true
+      }))
+      .pipe(dest(paths.styles.dest));
+  }
+
+  cb();
+}
+
+const scripts = (cb) => {
+  for (let name in paths.scripts.bundles) {
+    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({
+        append: true
+      }))
+      .pipe(dest(paths.scripts.dest));
+  }
+
+  cb();
+}
+
+const jsonFiles = (cb) => {
+  for (let i in paths.json) {
+    const item = paths.json[i];
+
+    src(item.src)
+      .pipe(replace(
+        "{BUILD_TIME}",
+        Math.floor(Date.now() / 1000)
+      ))
+      .pipe(jsonminify())
+      .pipe(gzip({
+        append: true
+      }))
+      .pipe(dest(item.dest));
+  }
+
+  cb();
+}
+
+const staticFiles = (cb) => {
+  for (let i in paths.static) {
+    const item = paths.static[i];
+
+    src(item.src, { encoding: false })
+      .pipe(gzip({
+        append: true
+      }))
+      .pipe(dest(item.dest));
+  }
+
+  cb();
+}
+
+const pages = () => {
+  return src(paths.pages.src)
+    .pipe(replace(
+      "{BUILD_TIME}",
+      Math.floor(Date.now() / 1000)
+    ))
+    .pipe(htmlmin({
+      html5: true,
+      caseSensitive: true,
+      collapseWhitespace: true,
+      collapseInlineTagWhitespace: true,
+      conservativeCollapse: true,
+      removeComments: true,
+      minifyJS: true
+    }))
+    .pipe(gzip({
+      append: true
+    }))
+    .pipe(dest(paths.pages.dest));
+}
+
+exports.build_styles = styles;
+exports.build_scripts = scripts;
+exports.build_json = jsonFiles;
+exports.build_static = staticFiles;
+exports.build_pages = pages;
+exports.build_all = parallel(styles, scripts, jsonFiles, staticFiles, pages);

lib/BufferedWebServer/BufferedWebServer.h

@@ -0,0 +1,102 @@
+class BufferedWebServer {
+public:
+  BufferedWebServer(WebServer* webServer, size_t bufferSize = 64) {
+    this->webServer = webServer;
+    this->bufferSize = bufferSize;
+    this->buffer = (uint8_t*)malloc(bufferSize * sizeof(*this->buffer));
+  }
+
+  ~BufferedWebServer() {
+    free(this->buffer);
+  }
+
+  template <class T>
+  void send(int code, T contentType, const JsonVariantConst content, bool pretty = false) {
+    auto contentLength = pretty ? measureJsonPretty(content) : measureJson(content);
+
+    #ifdef ARDUINO_ARCH_ESP8266
+    if (!this->webServer->chunkedResponseModeStart(code, contentType)) {
+      this->webServer->send(505, F("text/html"), F("HTTP1.1 required"));
+      return;
+    }
+
+    this->webServer->setContentLength(contentLength);
+    #else
+    this->webServer->setContentLength(contentLength);
+    this->webServer->send(code, contentType, emptyString);
+    #endif
+
+    if (pretty) {
+      serializeJsonPretty(content, *this);
+      
+    } else {
+      serializeJson(content, *this);
+    }
+
+    this->flush();
+
+    #ifdef ARDUINO_ARCH_ESP8266
+    this->webServer->chunkedResponseFinalize();
+    #else
+    this->webServer->sendContent(emptyString);
+    #endif
+  }
+
+  size_t write(uint8_t c) {
+    this->buffer[this->bufferPos++] = c;
+
+    if (this->bufferPos >= this->bufferSize) {
+      this->flush();
+    }
+
+    return 1;
+  }
+
+  size_t write(const uint8_t* buffer, size_t length) {
+    size_t written = 0;
+    while (written < length) {
+      size_t copySize = this->bufferSize - this->bufferPos;
+      if (written + copySize > length) {
+        copySize = length - written;
+      }
+
+      memcpy(this->buffer + this->bufferPos, buffer + written, copySize);
+      this->bufferPos += copySize;
+
+      if (this->bufferPos >= this->bufferSize) {
+        this->flush();
+      }
+
+      written += copySize;
+    }
+
+    return written;
+  }
+
+  void flush() {
+    if (this->bufferPos == 0) {
+      return;
+    }
+
+    #ifdef ARDUINO_ARCH_ESP8266
+    ::optimistic_yield(1000);
+    #endif
+
+    auto& client = this->webServer->client();
+    if (client.connected()) {
+      this->webServer->sendContent((const char*)this->buffer, this->bufferPos);
+    }
+
+    this->bufferPos = 0;
+
+    #ifdef ARDUINO_ARCH_ESP8266
+    ::optimistic_yield(1000);
+    #endif
+  }
+
+protected:
+  WebServer* webServer = nullptr;
+  uint8_t* buffer;
+  size_t bufferSize = 64;
+  size_t bufferPos = 0;
+};

lib/CustomOpenTherm/CustomOpenTherm.h

@@ -1,106 +1,170 @@
 #include <Arduino.h>
 #include <OpenTherm.h>
 
-extern SchedulerClass Scheduler;
-
 class CustomOpenTherm : public OpenTherm {
-private:
-  unsigned long send_ts = millis();
-  void(*handleSendRequestCallback)(unsigned long, unsigned long, OpenThermResponseStatus status, byte attempt);
-
 public:
-  CustomOpenTherm(int inPin = 4, int outPin = 5, bool isSlave = false) : OpenTherm(inPin, outPin, isSlave) {}
-  void setHandleSendRequestCallback(void(*handleSendRequestCallback)(unsigned long, unsigned long, OpenThermResponseStatus status, byte attempt)) {
-    this->handleSendRequestCallback = handleSendRequestCallback;
+  typedef std::function<void(unsigned int)> DelayCallback;
+  typedef std::function<void(unsigned long, byte)> BeforeSendRequestCallback;
+  typedef std::function<void(unsigned long, unsigned long, OpenThermResponseStatus, byte)> AfterSendRequestCallback;
+
+  CustomOpenTherm(int inPin = 4, int outPin = 5, bool isSlave = false) : OpenTherm(inPin, outPin, isSlave) {
+    this->_outPin = outPin;
+  }
+  ~CustomOpenTherm() {}
+
+  CustomOpenTherm* setDelayCallback(DelayCallback callback = nullptr) {
+    this->delayCallback = callback;
+
+    return this;
+  }
+
+  CustomOpenTherm* setBeforeSendRequestCallback(BeforeSendRequestCallback callback = nullptr) {
+    this->beforeSendRequestCallback = callback;
+
+    return this;
+  }
+
+  CustomOpenTherm* setAfterSendRequestCallback(AfterSendRequestCallback callback = nullptr) {
+    this->afterSendRequestCallback = callback;
+
+    return this;
+  }
+
+  void reset() {
+    if (this->status == OpenThermStatus::NOT_INITIALIZED) {
+      return;
+    }
+
+    this->end();
+    this->status = OpenThermStatus::NOT_INITIALIZED;
+
+    digitalWrite(this->_outPin, LOW);
+    if (this->delayCallback) {
+      this->delayCallback(1000);
+    }
+    
+    this->begin();
   }
 
   unsigned long sendRequest(unsigned long request, byte attempts = 5, byte _attempt = 0) {
     _attempt++;
-    while (send_ts > 0 && millis() - send_ts < 200) {
-      Scheduler.yield();
+
+    while (!this->isReady()) {
+      if (this->delayCallback) {
+        this->delayCallback(150);
+      }
+
+      this->process();
+    }
+
+    if (this->beforeSendRequestCallback) {
+      this->beforeSendRequestCallback(request, _attempt);
     }
 
     unsigned long _response;
-    if (!sendRequestAync(request)) {
+    OpenThermResponseStatus _responseStatus = OpenThermResponseStatus::NONE;
+    if (!this->sendRequestAsync(request)) {
       _response = 0;
+
     } else {
-      while (!isReady()) {
-        Scheduler.yield();
-        process();
-      }
+      do {
+        if (this->delayCallback) {
+          this->delayCallback(150);
+        }
 
-      _response = getLastResponse();
+        this->process();
+      } while (this->status != OpenThermStatus::READY && this->status != OpenThermStatus::DELAY);
+
+      _response = this->getLastResponse();
+      _responseStatus = this->getLastResponseStatus();
     }
 
-    if (handleSendRequestCallback != NULL) {
-      handleSendRequestCallback(request, _response, getLastResponseStatus(), _attempt);
+    if (this->afterSendRequestCallback) {
+      this->afterSendRequestCallback(request, _response, _responseStatus, _attempt);
     }
 
-    send_ts = millis();
-    if (getLastResponseStatus() == OpenThermResponseStatus::SUCCESS || _attempt >= attempts) {
+    if (_responseStatus == OpenThermResponseStatus::SUCCESS || _responseStatus == OpenThermResponseStatus::INVALID || _attempt >= attempts) {
       return _response;
+
     } else {
-      return sendRequest(request, attempts, _attempt);
+      return this->sendRequest(request, attempts, _attempt);
     }
   }
 
-  unsigned long setBoilerStatus(bool enableCentralHeating, bool enableHotWater, bool enableCooling, bool enableOutsideTemperatureCompensation, bool enableCentralHeating2, bool summerWinterMode, bool dhwBlocking) {
-    return sendRequest(buildSetBoilerStatusRequest(enableCentralHeating, enableHotWater, enableCooling, enableOutsideTemperatureCompensation, enableCentralHeating2, summerWinterMode, dhwBlocking));
-  }
-
-  unsigned long buildSetBoilerStatusRequest(bool enableCentralHeating, bool enableHotWater, bool enableCooling, bool enableOutsideTemperatureCompensation, bool enableCentralHeating2, bool summerWinterMode, bool dhwBlocking) {
-    unsigned int data = enableCentralHeating | (enableHotWater << 1) | (enableCooling << 2) | (enableOutsideTemperatureCompensation << 3) | (enableCentralHeating2 << 4) | (summerWinterMode << 5) | (dhwBlocking << 6);
+  unsigned long setBoilerStatus(bool enableCentralHeating, bool enableHotWater, bool enableCooling, bool enableOutsideTemperatureCompensation, bool enableCentralHeating2, bool summerWinterMode, bool dhwBlocking, uint8_t lb = 0) {
+    unsigned int data = enableCentralHeating
+      | (enableHotWater << 1)
+      | (enableCooling << 2)
+      | (enableOutsideTemperatureCompensation << 3)
+      | (enableCentralHeating2 << 4)
+      | (summerWinterMode << 5)
+      | (dhwBlocking << 6);
+    
     data <<= 8;
-    return buildRequest(OpenThermMessageType::READ_DATA, OpenThermMessageID::Status, data);
-  }
+    data |= lb;
 
-  bool setBoilerTemperature(float temperature) {
-    unsigned int data = temperatureToData(temperature);
-    unsigned long response = sendRequest(buildRequest(OpenThermMessageType::WRITE_DATA, OpenThermMessageID::TSet, data));
-    return isValidResponse(response);
-  }
-
-  bool setBoilerTemperature2(float temperature) {
-    unsigned int data = temperatureToData(temperature);
-    unsigned long response = sendRequest(buildRequest(OpenThermMessageType::WRITE_DATA, OpenThermMessageID::TsetCH2, data));
-    return isValidResponse(response);
+    return this->sendRequest(buildRequest(
+      OpenThermMessageType::READ_DATA,
+      OpenThermMessageID::Status,
+      data
+    ));
   }
 
   bool sendBoilerReset() {
     unsigned int data = 1;
     data <<= 8;
-    unsigned long response = sendRequest(buildRequest(OpenThermMessageType::WRITE_DATA, OpenThermMessageID::Command, data));
-    return isValidResponse(response);
+    unsigned long response = this->sendRequest(buildRequest(
+      OpenThermMessageType::WRITE_DATA,
+      OpenThermMessageID::RemoteRequest,
+      data
+    ));
+
+    return isValidResponse(response) && isValidResponseId(response, OpenThermMessageID::RemoteRequest);
   }
 
   bool sendServiceReset() {
     unsigned int data = 10;
     data <<= 8;
-    unsigned long response = sendRequest(buildRequest(OpenThermMessageType::WRITE_DATA, OpenThermMessageID::Command, data));
-    return isValidResponse(response);
+    unsigned long response = this->sendRequest(buildRequest(
+      OpenThermMessageType::WRITE_DATA,
+      OpenThermMessageID::RemoteRequest,
+      data
+    ));
+
+    return isValidResponse(response) && isValidResponseId(response, OpenThermMessageID::RemoteRequest);
   }
 
   bool sendWaterFilling() {
     unsigned int data = 2;
     data <<= 8;
-    unsigned long response = sendRequest(buildRequest(OpenThermMessageType::WRITE_DATA, OpenThermMessageID::Command, data));
-    return isValidResponse(response);
+    unsigned long response = this->sendRequest(buildRequest(
+      OpenThermMessageType::WRITE_DATA,
+      OpenThermMessageID::RemoteRequest,
+      data
+    ));
+
+    return isValidResponse(response) && isValidResponseId(response, OpenThermMessageID::RemoteRequest);
+  }
+
+  static bool isValidResponseId(unsigned long response, OpenThermMessageID id) {
+    byte responseId = (response >> 16) & 0xFF;
+    
+    return (byte)id == responseId;
   }
 
   // converters
-  float f88(unsigned long response) {
-    const byte valueLB = response & 0xFF;
-    const byte valueHB = (response >> 8) & 0xFF;
-
-    float value = (int8_t) valueHB;
-    return value + (float)valueLB / 256.0;
+  template <class T>
+  static unsigned int toFloat(const T val) {
+    return (unsigned int)(val * 256);
   }
 
-  int16_t s16(unsigned long response) {
-    const byte valueLB = response & 0xFF;
-    const byte valueHB = (response >> 8) & 0xFF;
-
-    int16_t value = valueHB;
-    return ((value << 8) + valueLB);
+  static short getInt(const unsigned long response) {
+    return response & 0xffff;
   }
+
+protected:
+  DelayCallback delayCallback;
+  BeforeSendRequestCallback beforeSendRequestCallback;
+  AfterSendRequestCallback afterSendRequestCallback;
+  int _outPin;
 };

lib/Equitherm/Equitherm.h

@@ -17,7 +17,7 @@ public:
   float Kk = 0.0;
   float Kt = 0.0;
 
-  Equitherm() {}
+  Equitherm() = default;
 
   // kn, kk, kt
   Equitherm(float new_kn, float new_kk, float new_kt) {
@@ -27,7 +27,7 @@ public:
   }
 
   // лимит выходной величины
-  void setLimits(int min_output, int max_output) {
+  void setLimits(unsigned short min_output, unsigned short max_output) {
     _minOut = min_output;
     _maxOut = max_output;
   }
@@ -40,7 +40,7 @@ public:
   }
 
 private:
-  int _minOut = 20, _maxOut = 90;
+  unsigned short _minOut = 20, _maxOut = 90;
 
   // температура контура отопления в зависимости от наружной температуры
   datatype getResultN() {
@@ -58,6 +58,6 @@ private:
 
   // Расчет поправки (ошибки) термостата
   datatype getResultT() {
-    return constrain((targetTemp - indoorTemp), -2, 2) * Kt;
+    return constrain((targetTemp - indoorTemp), -3, 3) * Kt;
   }
 };

lib/HomeAssistantHelper/HomeAssistantHelper.h

@@ -0,0 +1,169 @@
+#pragma once
+#include <Arduino.h>
+#include "strings.h"
+
+class HomeAssistantHelper {
+public:
+  typedef std::function<void(const char*, bool)> PublishEventCallback;
+
+  HomeAssistantHelper() = default;
+
+  void setWriter() {
+    this->writer = nullptr;
+  }
+
+  void setWriter(MqttWriter* writer) {
+    this->writer = writer;
+  }
+
+  void setPublishEventCallback(PublishEventCallback callback) {
+    this->publishEventCallback = callback;
+  }
+
+  void setDevicePrefix(const char* value) {
+    this->devicePrefix = value;
+  }
+
+  void setDeviceVersion(const char* value) {
+    this->deviceVersion = value;
+  }
+
+  void setDeviceManufacturer(const char* value) {
+    this->deviceManufacturer = value;
+  }
+
+  void setDeviceModel(const char* value) {
+    this->deviceModel = value;
+  }
+
+  void setDeviceName(const char* value) {
+    this->deviceName = value;
+  }
+
+  void setDeviceConfigUrl(const char* value) {
+    this->deviceConfigUrl = value;
+  }
+
+  bool publish(const char* topic, JsonDocument& doc) {
+    if (this->writer == nullptr) {
+      if (this->publishEventCallback) {
+        this->publishEventCallback(topic, false);
+      }
+      
+      return false;
+    }
+
+    doc[FPSTR(HA_DEVICE)][FPSTR(HA_IDENTIFIERS)][0] = this->devicePrefix;
+    doc[FPSTR(HA_DEVICE)][FPSTR(HA_SW_VERSION)] = this->deviceVersion;
+
+    if (this->deviceManufacturer != nullptr) {
+      doc[FPSTR(HA_DEVICE)][FPSTR(HA_MANUFACTURER)] = this->deviceManufacturer;
+    }
+
+    if (this->deviceModel != nullptr) {
+      doc[FPSTR(HA_DEVICE)][FPSTR(HA_MODEL)] = this->deviceModel;
+    }
+
+    if (this->deviceName != nullptr) {
+      doc[FPSTR(HA_DEVICE)][FPSTR(HA_NAME)] = this->deviceName;
+    }
+
+    if (this->deviceConfigUrl != nullptr) {
+      doc[FPSTR(HA_DEVICE)][FPSTR(HA_CONF_URL)] = this->deviceConfigUrl;
+    }
+
+    bool result = this->writer->publish(topic, doc, true);
+    doc.clear();
+    doc.shrinkToFit();
+
+    if (this->publishEventCallback) {
+      this->publishEventCallback(topic, result);
+    }
+
+    return result;
+  }
+
+  bool publish(const char* topic) {
+    if (this->writer == nullptr) {
+      if (this->publishEventCallback) {
+        this->publishEventCallback(topic, false);
+      }
+
+      return false;
+    }
+
+    bool result = writer->publish(topic, nullptr, 0, true);
+    if (this->publishEventCallback) {
+      this->publishEventCallback(topic, result);
+    }
+
+    return result;
+  }
+
+  template <class CT, class NT>
+  String makeConfigTopic(CT category, NT name, char nameSeparator = '/') {
+    String topic = "";
+    topic.concat(this->prefix);
+    topic.concat('/');
+    topic.concat(category);
+    topic.concat('/');
+    topic.concat(this->devicePrefix);
+    topic.concat(nameSeparator);
+    topic.concat(name);
+    topic.concat(F("/config"));
+    return topic;
+  }
+
+  template <class T> 
+  String getDeviceTopic(T value, char dpvSeparator = '/') {
+    String topic = "";
+    topic.concat(this->devicePrefix);
+    topic.concat(dpvSeparator);
+    topic.concat(value);
+    return topic;
+  }
+
+  template <class CT, class NT>
+  String getDeviceTopic(CT category, NT name, char dpcSeparator = '/', char cnSeparator = '/') {
+    String topic = "";
+    topic.concat(this->devicePrefix);
+    topic.concat(dpcSeparator);
+    topic.concat(category);
+    topic.concat(cnSeparator);
+    topic.concat(name);
+    return topic;
+  }
+
+  template <class CT, class NT, class ST>
+  String getDeviceTopic(CT category, NT name, ST suffix, char dpcSeparator = '/', char cnSeparator = '/', char nsSeparator = '/') {
+    String topic = "";
+    topic.concat(this->devicePrefix);
+    topic.concat(dpcSeparator);
+    topic.concat(category);
+    topic.concat(cnSeparator);
+    topic.concat(name);
+    topic.concat(nsSeparator);
+    topic.concat(suffix);
+    return topic;
+  }
+
+  template <class T> 
+  String getObjectIdWithPrefix(T value, char separator = '_') {
+    String topic = "";
+    topic.concat(this->devicePrefix);
+    topic.concat(separator);
+    topic.concat(value);
+    return topic;
+  }
+
+protected:
+  PublishEventCallback publishEventCallback;
+  MqttWriter* writer = nullptr;
+  const char* prefix = "homeassistant";
+  const char* devicePrefix = "";
+  const char* deviceVersion = "1.0";
+  const char* deviceManufacturer = nullptr;
+  const char* deviceModel = nullptr;
+  const char* deviceName = nullptr;
+  const char* deviceConfigUrl = nullptr;
+};

lib/HomeAssistantHelper/strings.h

@@ -0,0 +1,77 @@
+#pragma once
+#ifndef PROGMEM
+  #define PROGMEM 
+#endif
+
+const char HA_ENTITY_BINARY_SENSOR[]            PROGMEM = "binary_sensor";
+const char HA_ENTITY_BUTTON[]                   PROGMEM = "button";
+const char HA_ENTITY_FAN[]                      PROGMEM = "fan";
+const char HA_ENTITY_CLIMATE[]                  PROGMEM = "climate";
+const char HA_ENTITY_NUMBER[]                   PROGMEM = "number";
+const char HA_ENTITY_SELECT[]                   PROGMEM = "select";
+const char HA_ENTITY_SENSOR[]                   PROGMEM = "sensor";
+const char HA_ENTITY_SWITCH[]                   PROGMEM = "switch";
+
+const char HA_DEVICE[]                          PROGMEM = "device";
+const char HA_IDENTIFIERS[]                     PROGMEM = "identifiers";
+const char HA_SW_VERSION[]                      PROGMEM = "sw_version";
+const char HA_MANUFACTURER[]                    PROGMEM = "manufacturer";
+const char HA_MODEL[]                           PROGMEM = "model";
+const char HA_NAME[]                            PROGMEM = "name";
+const char HA_CONF_URL[]                        PROGMEM = "configuration_url";
+const char HA_COMMAND_TOPIC[]                   PROGMEM = "command_topic";
+const char HA_COMMAND_TEMPLATE[]                PROGMEM = "command_template";
+const char HA_ENABLED_BY_DEFAULT[]              PROGMEM = "enabled_by_default";
+const char HA_UNIQUE_ID[]                       PROGMEM = "unique_id";
+const char HA_OBJECT_ID[]                       PROGMEM = "object_id";
+const char HA_ENTITY_CATEGORY[]                 PROGMEM = "entity_category";
+const char HA_ENTITY_CATEGORY_DIAGNOSTIC[]      PROGMEM = "diagnostic";
+const char HA_ENTITY_CATEGORY_CONFIG[]          PROGMEM = "config";
+const char HA_STATE_TOPIC[]                     PROGMEM = "state_topic";
+const char HA_VALUE_TEMPLATE[]                  PROGMEM = "value_template";
+const char HA_OPTIONS[]                         PROGMEM = "options";
+const char HA_AVAILABILITY[]                    PROGMEM = "availability";
+const char HA_AVAILABILITY_MODE[]               PROGMEM = "availability_mode";
+const char HA_TOPIC[]                           PROGMEM = "topic";
+const char HA_DEVICE_CLASS[]                    PROGMEM = "device_class";
+const char HA_UNIT_OF_MEASUREMENT[]             PROGMEM = "unit_of_measurement";
+const char HA_UNIT_OF_MEASUREMENT_C[]           PROGMEM = "°C";
+const char HA_UNIT_OF_MEASUREMENT_F[]           PROGMEM = "°F";
+const char HA_UNIT_OF_MEASUREMENT_PERCENT[]     PROGMEM = "%";
+const char HA_UNIT_OF_MEASUREMENT_L_MIN[]       PROGMEM = "L/min";
+const char HA_UNIT_OF_MEASUREMENT_GAL_MIN[]     PROGMEM = "gal/min";
+const char HA_ICON[]                            PROGMEM = "icon";
+const char HA_MIN[]                             PROGMEM = "min";
+const char HA_MAX[]                             PROGMEM = "max";
+const char HA_STEP[]                            PROGMEM = "step";
+const char HA_MODE[]                            PROGMEM = "mode";
+const char HA_MODE_BOX[]                        PROGMEM = "box";
+const char HA_STATE_ON[]                        PROGMEM = "state_on";
+const char HA_STATE_OFF[]                       PROGMEM = "state_off";
+const char HA_PAYLOAD_ON[]                      PROGMEM = "payload_on";
+const char HA_PAYLOAD_OFF[]                     PROGMEM = "payload_off";
+const char HA_STATE_CLASS[]                     PROGMEM = "state_class";
+const char HA_STATE_CLASS_MEASUREMENT[]         PROGMEM = "measurement";
+const char HA_EXPIRE_AFTER[]                    PROGMEM = "expire_after";
+const char HA_CURRENT_TEMPERATURE_TOPIC[]       PROGMEM = "current_temperature_topic";
+const char HA_CURRENT_TEMPERATURE_TEMPLATE[]    PROGMEM = "current_temperature_template";
+const char HA_TEMPERATURE_COMMAND_TOPIC[]       PROGMEM = "temperature_command_topic";
+const char HA_TEMPERATURE_COMMAND_TEMPLATE[]    PROGMEM = "temperature_command_template";
+const char HA_TEMPERATURE_STATE_TOPIC[]         PROGMEM = "temperature_state_topic";
+const char HA_TEMPERATURE_STATE_TEMPLATE[]      PROGMEM = "temperature_state_template";
+const char HA_TEMPERATURE_UNIT[]                PROGMEM = "temperature_unit";
+const char HA_MODE_COMMAND_TOPIC[]              PROGMEM = "mode_command_topic";
+const char HA_MODE_COMMAND_TEMPLATE[]           PROGMEM = "mode_command_template";
+const char HA_MODE_STATE_TOPIC[]                PROGMEM = "mode_state_topic";
+const char HA_MODE_STATE_TEMPLATE[]             PROGMEM = "mode_state_template";
+const char HA_MODES[]                           PROGMEM = "modes";
+const char HA_ACTION_TOPIC[]                    PROGMEM = "action_topic";
+const char HA_ACTION_TEMPLATE[]                 PROGMEM = "action_template";
+const char HA_MIN_TEMP[]                        PROGMEM = "min_temp";
+const char HA_MAX_TEMP[]                        PROGMEM = "max_temp";
+const char HA_TEMP_STEP[]                       PROGMEM = "temp_step";
+const char HA_PRESET_MODE_COMMAND_TOPIC[]       PROGMEM = "preset_mode_command_topic";
+const char HA_PRESET_MODE_COMMAND_TEMPLATE[]    PROGMEM = "preset_mode_command_template";
+const char HA_PRESET_MODE_STATE_TOPIC[]         PROGMEM = "preset_mode_state_topic";
+const char HA_PRESET_MODE_VALUE_TEMPLATE[]      PROGMEM = "preset_mode_value_template";
+const char HA_PRESET_MODES[]                    PROGMEM = "preset_modes";

lib/MqttWriter/MqttWiFiClient.h

@@ -0,0 +1,24 @@
+#include <WiFiClient.h>
+
+class MqttWiFiClient : public WiFiClient {
+public:
+#ifdef ARDUINO_ARCH_ESP8266
+  void flush() override {
+    if (this->connected()) {
+      WiFiClient::flush(0);
+    }
+  }
+
+  void stop() override {
+    this->abort();
+  }
+#endif
+
+#ifdef ARDUINO_ARCH_ESP32
+  void setSync(bool) {}
+
+  bool getSync() {
+    return false;
+  }
+#endif
+};

lib/MqttWriter/MqttWriter.h

@@ -0,0 +1,220 @@
+#pragma once
+#include <Arduino.h>
+#include <MqttClient.h>
+#ifdef ARDUINO_ARCH_ESP32
+#include <mutex>
+#endif
+
+
+class MqttWriter {
+public:
+  typedef std::function<void()> YieldCallback;
+  typedef std::function<void(const char*, size_t, size_t, bool)> PublishEventCallback;
+  typedef std::function<void(size_t, size_t)> FlushEventCallback;
+
+  MqttWriter(MqttClient* client, size_t bufferSize = 64) {
+    this->client = client;
+    this->bufferSize = bufferSize;
+    this->buffer = (uint8_t*) malloc(bufferSize * sizeof(*this->buffer));
+
+#ifdef ARDUINO_ARCH_ESP32
+    this->mutex = new std::mutex();
+#endif
+  }
+
+  ~MqttWriter() {
+    free(this->buffer);
+
+#ifdef ARDUINO_ARCH_ESP32
+    delete this->mutex;
+#endif
+  }
+
+  MqttWriter* setYieldCallback(YieldCallback callback = nullptr) {
+    this->yieldCallback = callback;
+
+    return this;
+  }
+
+  MqttWriter* setPublishEventCallback(PublishEventCallback callback) {
+    this->publishEventCallback = callback;
+
+    return this;
+  }
+
+  MqttWriter* setFlushEventCallback(FlushEventCallback callback) {
+    this->flushEventCallback = callback;
+
+    return this;
+  }
+
+  bool lock() {
+#ifdef ARDUINO_ARCH_ESP32
+    if (!this->mutex->try_lock()) {
+      return false;
+    }
+#else
+    if (this->isLocked()) {
+      return false;
+    }
+#endif
+
+    this->locked = true;
+    this->writeAfterLock = 0;
+    this->lockedTime = millis();
+
+    return true;
+  }
+
+  bool isLocked() {
+    return this->locked;
+  }
+
+  void unlock() {
+    this->locked = false;
+#if defined(ARDUINO_ARCH_ESP32)
+    this->mutex->unlock();
+#endif
+  }
+
+  bool publish(const char* topic, const JsonVariantConst doc, bool retained = false) {
+    if (!this->client->connected()) {
+      this->bufferPos = 0;
+      return false;
+    }
+
+    while (!this->lock()) {
+      if (this->yieldCallback) {
+        this->yieldCallback();
+      }
+    }
+
+    this->bufferPos = 0;
+    size_t docSize = measureJson(doc);
+    size_t written = 0;
+    if (this->client->beginMessage(topic, docSize, retained)) {
+      serializeJson(doc, *this);
+      this->flush();
+      this->client->endMessage();
+      
+      written = this->writeAfterLock;
+    }
+    this->unlock();
+
+    if (this->publishEventCallback) {
+      this->publishEventCallback(topic, written, docSize, written == docSize);
+    }
+
+    return written == docSize;
+  }
+
+  bool publish(const char* topic, const char* buffer, bool retained = false) {
+    return this->publish(topic, (const uint8_t*) buffer, strlen(buffer), retained);
+  }
+
+  bool publish(const char* topic, const uint8_t* buffer, size_t length, bool retained = false) {
+    if (!this->client->connected()) {
+      this->bufferPos = 0;
+      return false;
+    }
+
+    while (!this->lock()) {
+      if (this->yieldCallback) {
+        this->yieldCallback();
+      }
+    }
+
+    this->bufferPos = 0;
+    size_t written = 0;
+    bool result = false;
+    if (!length || buffer == nullptr) {
+      result = this->client->beginMessage(topic, retained) && this->client->endMessage();
+
+    } else if (this->client->beginMessage(topic, length, retained)) {
+      this->write(buffer, length);
+      this->flush();
+      this->client->endMessage();
+      
+      written = this->writeAfterLock;
+      result = written == length;
+    }
+    this->unlock();
+
+    if (this->publishEventCallback) {
+      this->publishEventCallback(topic, written, length, result);
+    }
+
+    return result;
+  }
+
+  size_t write(uint8_t c) {
+    this->buffer[this->bufferPos++] = c;
+
+    if (this->bufferPos >= this->bufferSize) {
+      this->flush();
+    }
+
+    return 1;
+  }
+
+  size_t write(const uint8_t* buffer, size_t length) {
+    size_t written = 0;
+    while (written < length) {
+      size_t copySize = this->bufferSize - this->bufferPos;
+      if (written + copySize > length) {
+        copySize = length - written;
+      }
+
+      memcpy(this->buffer + this->bufferPos, buffer + written, copySize);
+      this->bufferPos += copySize;
+
+      if (this->bufferPos >= this->bufferSize) {
+        this->flush();
+      }
+
+      written += copySize;
+    }
+
+    return written;
+  }
+
+  bool flush() {
+    if (this->bufferPos == 0) {
+      return false;
+    }
+
+    if (!this->client->connected()) {
+      this->bufferPos = 0;
+    }
+
+    size_t length = this->bufferPos;
+    size_t written = this->client->write(this->buffer, length);
+    this->client->flush();
+    this->bufferPos = 0;
+
+    if (this->isLocked()) {
+      this->writeAfterLock += written;
+    }
+
+    if (this->flushEventCallback) {
+      this->flushEventCallback(written, length);
+    }
+
+    return written == length;
+  }
+
+protected:
+  YieldCallback yieldCallback;
+  PublishEventCallback publishEventCallback;
+  FlushEventCallback flushEventCallback;
+  MqttClient* client;
+  uint8_t* buffer;
+  size_t bufferSize = 64;
+  size_t bufferPos = 0;
+  bool locked = false;
+#ifdef ARDUINO_ARCH_ESP32
+  mutable std::mutex* mutex;
+#endif
+  unsigned long lockedTime = 0;
+  size_t writeAfterLock = 0;
+};

lib/NetworkUtils/NetworkConnection.cpp

@@ -0,0 +1,158 @@
+#include "NetworkConnection.h"
+using namespace NetworkUtils;
+
+void NetworkConnection::setup(bool useDhcp) {
+  setUseDhcp(useDhcp);
+
+  #if defined(ARDUINO_ARCH_ESP8266)
+  wifi_set_event_handler_cb(NetworkConnection::onEvent);
+  #elif defined(ARDUINO_ARCH_ESP32)
+  WiFi.onEvent(NetworkConnection::onEvent);
+  #endif
+}
+
+void NetworkConnection::reset() {
+  status = Status::NONE;
+  rawDisconnectReason = 0;
+  disconnectReason = DisconnectReason::NONE;
+}
+
+void NetworkConnection::setUseDhcp(bool value) {
+  useDhcp = value;
+}
+
+NetworkConnection::Status NetworkConnection::getStatus() {
+  return status;
+}
+
+NetworkConnection::DisconnectReason NetworkConnection::getDisconnectReason() {
+  return disconnectReason;
+}
+
+#if defined(ARDUINO_ARCH_ESP8266)
+void NetworkConnection::onEvent(System_Event_t *event) {
+  switch (event->event) {
+    case EVENT_STAMODE_CONNECTED:
+      status = useDhcp ? Status::CONNECTING : Status::CONNECTED;
+      rawDisconnectReason = 0;
+      disconnectReason = DisconnectReason::NONE;
+      break;
+
+    case EVENT_STAMODE_GOT_IP:
+      status = Status::CONNECTED;
+      rawDisconnectReason = 0;
+      disconnectReason = DisconnectReason::NONE;
+      break;
+
+    case EVENT_STAMODE_DHCP_TIMEOUT:
+      status = Status::DISCONNECTED;
+      rawDisconnectReason = 0;
+      disconnectReason = DisconnectReason::DHCP_TIMEOUT;
+      break;
+
+    case EVENT_STAMODE_DISCONNECTED:
+      status = Status::DISCONNECTED;
+      rawDisconnectReason = event->event_info.disconnected.reason;
+      disconnectReason = convertDisconnectReason(event->event_info.disconnected.reason);
+
+      // https://github.com/esp8266/Arduino/blob/d5eb265f78bff9deb7063d10030a02d021c8c66c/libraries/ESP8266WiFi/src/ESP8266WiFiGeneric.cpp#L231
+      if ((wifi_station_get_connect_status() == STATION_GOT_IP) && !wifi_station_get_reconnect_policy()) {
+        wifi_station_disconnect();
+      }
+      break;
+
+    case EVENT_STAMODE_AUTHMODE_CHANGE:
+      // https://github.com/esp8266/Arduino/blob/d5eb265f78bff9deb7063d10030a02d021c8c66c/libraries/ESP8266WiFi/src/ESP8266WiFiGeneric.cpp#L241
+      {
+        auto& src = event->event_info.auth_change;
+        if ((src.old_mode != AUTH_OPEN) && (src.new_mode == AUTH_OPEN)) {
+          status = Status::DISCONNECTED;
+          rawDisconnectReason = 0;
+          disconnectReason = DisconnectReason::OTHER;
+
+          wifi_station_disconnect();
+        }
+      }
+      break;
+    
+    default:
+      break;
+  }
+}
+#elif defined(ARDUINO_ARCH_ESP32)
+void NetworkConnection::onEvent(WiFiEvent_t event, WiFiEventInfo_t info) {
+  switch (event) {
+    case ARDUINO_EVENT_WIFI_STA_CONNECTED:
+      status = useDhcp ? Status::CONNECTING : Status::CONNECTED;
+      rawDisconnectReason = 0;
+      disconnectReason = DisconnectReason::NONE;
+      break;
+
+    case ARDUINO_EVENT_WIFI_STA_GOT_IP:
+    case ARDUINO_EVENT_WIFI_STA_GOT_IP6:
+      status = Status::CONNECTED;
+      rawDisconnectReason = 0;
+      disconnectReason = DisconnectReason::NONE;
+      break;
+
+    case ARDUINO_EVENT_WIFI_STA_LOST_IP:
+      status = Status::DISCONNECTED;
+      rawDisconnectReason = 0;
+      disconnectReason = DisconnectReason::DHCP_TIMEOUT;
+      break;
+
+    case ARDUINO_EVENT_WIFI_STA_DISCONNECTED:
+      status = Status::DISCONNECTED;
+      rawDisconnectReason = info.wifi_sta_disconnected.reason;
+      disconnectReason = convertDisconnectReason(info.wifi_sta_disconnected.reason);
+      break;
+    
+    default:
+      break;
+  }
+}
+#endif
+
+NetworkConnection::DisconnectReason NetworkConnection::convertDisconnectReason(uint8_t reason) {
+  switch (reason) {
+  #if defined(ARDUINO_ARCH_ESP8266)
+    case REASON_BEACON_TIMEOUT:
+      return DisconnectReason::BEACON_TIMEOUT;
+
+    case REASON_NO_AP_FOUND:
+      return DisconnectReason::NO_AP_FOUND;
+
+    case REASON_AUTH_FAIL:
+      return DisconnectReason::AUTH_FAIL;
+
+    case REASON_ASSOC_FAIL:
+      return DisconnectReason::ASSOC_FAIL;
+
+    case REASON_HANDSHAKE_TIMEOUT:
+      return DisconnectReason::HANDSHAKE_TIMEOUT;
+  #elif defined(ARDUINO_ARCH_ESP32)
+    case WIFI_REASON_BEACON_TIMEOUT:
+      return DisconnectReason::BEACON_TIMEOUT;
+
+    case WIFI_REASON_NO_AP_FOUND:
+      return DisconnectReason::NO_AP_FOUND;
+
+    case WIFI_REASON_AUTH_FAIL:
+      return DisconnectReason::AUTH_FAIL;
+
+    case WIFI_REASON_ASSOC_FAIL:
+      return DisconnectReason::ASSOC_FAIL;
+
+    case WIFI_REASON_HANDSHAKE_TIMEOUT:
+      return DisconnectReason::HANDSHAKE_TIMEOUT;
+  #endif
+    
+    default:
+      return DisconnectReason::OTHER;
+  }
+}
+
+bool NetworkConnection::useDhcp = false;
+NetworkConnection::Status NetworkConnection::status = Status::NONE;
+NetworkConnection::DisconnectReason NetworkConnection::disconnectReason = DisconnectReason::NONE;
+uint8_t NetworkConnection::rawDisconnectReason = 0;

lib/NetworkUtils/NetworkConnection.h

@@ -0,0 +1,47 @@
+#if defined(ARDUINO_ARCH_ESP8266)
+  #include <ESP8266WiFi.h>
+  #include "lwip/etharp.h"
+#elif defined(ARDUINO_ARCH_ESP32)
+  #include <WiFi.h>
+#endif
+
+namespace NetworkUtils {
+  struct NetworkConnection {
+    enum class Status {
+      CONNECTED,
+      CONNECTING,
+      DISCONNECTED,
+      NONE
+    };
+
+    enum class DisconnectReason {
+      BEACON_TIMEOUT,
+      NO_AP_FOUND,
+      AUTH_FAIL,
+      ASSOC_FAIL,
+      HANDSHAKE_TIMEOUT,
+      DHCP_TIMEOUT,
+      OTHER,
+      NONE
+    };
+
+    static Status status;
+    static DisconnectReason disconnectReason;
+    static uint8_t rawDisconnectReason;
+    
+    static void setup(bool useDhcp);
+    static void setUseDhcp(bool value);
+    static void reset();
+    static Status getStatus();
+    static DisconnectReason getDisconnectReason();
+    #if defined(ARDUINO_ARCH_ESP8266)
+    static void onEvent(System_Event_t *evt);
+    #elif defined(ARDUINO_ARCH_ESP32)
+    static void onEvent(WiFiEvent_t event, WiFiEventInfo_t info);
+    #endif
+
+  protected:
+    static DisconnectReason convertDisconnectReason(uint8_t reason);
+    static bool useDhcp;
+  };
+}

lib/NetworkUtils/NetworkMgr.h

@@ -0,0 +1,476 @@
+#if defined(ARDUINO_ARCH_ESP8266)
+#include <ESP8266WiFi.h>
+#include "lwip/etharp.h"
+#elif defined(ARDUINO_ARCH_ESP32)
+#include <WiFi.h>
+#include <esp_wifi.h>
+#endif
+#include <NetworkConnection.h>
+
+namespace NetworkUtils {
+  class NetworkMgr {
+  public:
+    typedef std::function<void()> YieldCallback;
+    typedef std::function<void(unsigned int)> DelayCallback;
+
+    NetworkMgr() {
+      NetworkConnection::setup(this->useDhcp);
+      this->resetWifi();
+    }
+
+    NetworkMgr* setYieldCallback(YieldCallback callback = nullptr) {
+      this->yieldCallback = callback;
+
+      return this;
+    }
+
+    NetworkMgr* setDelayCallback(DelayCallback callback = nullptr) {
+      this->delayCallback = callback;
+
+      return this;
+    }
+
+    NetworkMgr* setHostname(const char* value) {
+      this->hostname = value;
+      return this;
+    }
+
+    NetworkMgr* setApCredentials(const char* ssid, const char* password = nullptr, byte channel = 0) {
+      this->apName = ssid;
+      this->apPassword = password;
+      this->apChannel = channel;
+
+      return this;
+    }
+
+    NetworkMgr* setStaCredentials(const char* ssid = nullptr, const char* password = nullptr, byte channel = 0) {
+      this->staSsid = ssid;
+      this->staPassword = password;
+      this->staChannel = channel;
+
+      return this;
+    }
+
+    NetworkMgr* setUseDhcp(bool value) {
+      this->useDhcp = value;
+      NetworkConnection::setup(this->useDhcp);
+
+      return this;
+    }
+
+    NetworkMgr* setStaticConfig(const char* ip, const char* gateway, const char* subnet, const char* dns) {
+      this->staticIp.fromString(ip);
+      this->staticGateway.fromString(gateway);
+      this->staticSubnet.fromString(subnet);
+      this->staticDns.fromString(dns);
+
+      return this;
+    }
+
+    NetworkMgr* setStaticConfig(IPAddress& ip, IPAddress& gateway, IPAddress& subnet, IPAddress& dns) {
+      this->staticIp = ip;
+      this->staticGateway = gateway;
+      this->staticSubnet = subnet;
+      this->staticDns = dns;
+
+      return this;
+    }
+
+    bool hasStaCredentials() {
+      return this->staSsid != nullptr;
+    }
+
+    bool isConnected() {
+      return this->isStaEnabled() && NetworkConnection::getStatus() == NetworkConnection::Status::CONNECTED;
+    }
+
+    bool isConnecting() {
+      return this->isStaEnabled() && NetworkConnection::getStatus() == NetworkConnection::Status::CONNECTING;
+    }
+
+    bool isStaEnabled() {
+      return (WiFi.getMode() & WIFI_STA) != 0;
+    }
+
+    bool isApEnabled() {
+      return (WiFi.getMode() & WIFI_AP) != 0;
+    }
+
+    bool hasApClients() {
+      if (!this->isApEnabled()) {
+        return false;
+      }
+
+      return WiFi.softAPgetStationNum() > 0;
+    }
+
+    short int getRssi() {
+      return WiFi.RSSI();
+    }
+
+    IPAddress getApIp() {
+      return WiFi.softAPIP();
+    }
+
+    IPAddress getStaIp() {
+      return WiFi.localIP();
+    }
+
+    IPAddress getStaSubnet() {
+      return WiFi.subnetMask();
+    }
+
+    IPAddress getStaGateway() {
+      return WiFi.gatewayIP();
+    }
+
+    IPAddress getStaDns() {
+      return WiFi.dnsIP();
+    }
+
+    String getStaMac() {
+      return WiFi.macAddress();
+    }
+
+    const char* getStaSsid() {
+      return this->staSsid;
+    }
+
+    const char* getStaPassword() {
+      return this->staPassword;
+    }
+
+    byte getStaChannel() {
+      return this->staChannel;
+    }
+
+    bool resetWifi() {
+      // set policy manual for work 13 ch
+      {
+        #ifdef ARDUINO_ARCH_ESP8266
+        wifi_country_t country = {"CN", 1, 13, WIFI_COUNTRY_POLICY_AUTO};
+        wifi_set_country(&country);
+        #elif defined(ARDUINO_ARCH_ESP32)
+        const wifi_country_t country = {"CN", 1, 13, CONFIG_ESP32_PHY_MAX_WIFI_TX_POWER, WIFI_COUNTRY_POLICY_AUTO};
+        esp_wifi_set_country(&country);
+        #endif
+      }
+
+      WiFi.persistent(false);
+      #if !defined(ESP_ARDUINO_VERSION_MAJOR) || ESP_ARDUINO_VERSION_MAJOR < 3
+      WiFi.setAutoConnect(false);
+      #endif
+      WiFi.setAutoReconnect(false);
+
+      #ifdef ARDUINO_ARCH_ESP8266
+      WiFi.setSleepMode(WIFI_NONE_SLEEP);
+      #elif defined(ARDUINO_ARCH_ESP32)
+      WiFi.setSleep(USE_BLE ? WIFI_PS_MIN_MODEM : WIFI_PS_NONE);
+      #endif
+
+      WiFi.softAPdisconnect();
+      #ifdef ARDUINO_ARCH_ESP8266
+      /*if (wifi_softap_dhcps_status() == DHCP_STARTED) {
+        wifi_softap_dhcps_stop();
+      }*/
+      #endif
+
+      WiFi.disconnect(false, true);
+      #ifdef ARDUINO_ARCH_ESP8266
+      /*if (wifi_station_dhcpc_status() == DHCP_STARTED) {
+        wifi_station_dhcpc_stop();
+      }*/
+
+      wifi_station_dhcpc_set_maxtry(5);
+      #endif
+      
+      #if defined(ARDUINO_ARCH_ESP32) && ESP_ARDUINO_VERSION_MAJOR < 3
+      // Nothing. Because memory leaks when turn off WiFi on ESP32 SDK < 3.0.0
+      return true;
+      #else
+      return WiFi.mode(WIFI_OFF);
+      #endif
+    }
+
+    void reconnect() {
+      this->reconnectFlag = true;
+    }
+
+    bool connect(bool force = false, unsigned int timeout = 1000u) {
+      if (this->isConnected() && !force) {
+        return true;
+      }
+
+      if (force && !this->isApEnabled()) {
+        this->resetWifi();
+        NetworkConnection::reset();
+
+      } else {
+        /*#ifdef ARDUINO_ARCH_ESP8266
+        if (wifi_station_dhcpc_status() == DHCP_STARTED) {
+          wifi_station_dhcpc_stop();
+        }
+        #endif*/
+
+        this->disconnect();
+      }
+
+      if (!this->hasStaCredentials()) {
+        return false;
+      }
+
+      this->delayCallback(250);
+
+      #ifdef ARDUINO_ARCH_ESP32
+      if (this->setWifiHostname(this->hostname)) {
+        Log.straceln(FPSTR(L_NETWORK), F("Set hostname '%s': success"), this->hostname);
+
+      } else {
+        Log.serrorln(FPSTR(L_NETWORK), F("Set hostname '%s': fail"), this->hostname);
+      }
+      #endif
+
+      if (!WiFi.mode((WiFiMode_t)(WiFi.getMode() | WIFI_STA))) {
+        return false;
+      }
+
+      this->delayCallback(250);
+
+      #ifdef ARDUINO_ARCH_ESP8266
+      if (this->setWifiHostname(this->hostname)) {
+        Log.straceln(FPSTR(L_NETWORK), F("Set hostname '%s': success"), this->hostname);
+
+      } else {
+        Log.serrorln(FPSTR(L_NETWORK), F("Set hostname '%s': fail"), this->hostname);
+      }
+
+      this->delayCallback(250);
+      #endif
+
+      #ifdef ARDUINO_ARCH_ESP32
+      WiFi.setScanMethod(WIFI_ALL_CHANNEL_SCAN);
+      WiFi.setSortMethod(WIFI_CONNECT_AP_BY_SIGNAL);
+      #endif
+
+      if (!this->useDhcp) {
+        WiFi.begin(this->staSsid, this->staPassword, this->staChannel, nullptr, false);
+        WiFi.config(this->staticIp, this->staticGateway, this->staticSubnet, this->staticDns);
+        WiFi.reconnect();
+
+      } else {
+        WiFi.begin(this->staSsid, this->staPassword, this->staChannel, nullptr, true);
+      }
+
+      unsigned long beginConnectionTime = millis();
+      while (millis() - beginConnectionTime < timeout) {
+        this->delayCallback(100);
+
+        NetworkConnection::Status status = NetworkConnection::getStatus();
+        if (status != NetworkConnection::Status::CONNECTING && status != NetworkConnection::Status::NONE) {
+          return status == NetworkConnection::Status::CONNECTED;
+        }
+      }
+
+      return false;
+    }
+
+    void disconnect() {
+      #ifdef ARDUINO_ARCH_ESP32
+      WiFi.disconnectAsync(false, true);
+
+      const unsigned long start = millis();
+      while (WiFi.isConnected() && (millis() - start) < 5000) {
+        this->delayCallback(100);
+      }
+      #else
+      WiFi.disconnect(false, true);
+      #endif
+    }
+
+    void loop() {
+      if (this->reconnectFlag) {
+        this->delayCallback(5000);
+
+        Log.sinfoln(FPSTR(L_NETWORK), F("Reconnecting..."));
+        this->reconnectFlag = false;
+        this->disconnect();
+        NetworkConnection::reset();
+        this->delayCallback(1000);
+
+      } else if (this->isConnected() && !this->hasStaCredentials()) {
+        Log.sinfoln(FPSTR(L_NETWORK), F("Reset"));
+        this->resetWifi();
+        NetworkConnection::reset();
+        this->delayCallback(1000);
+
+      } else if (this->isConnected()) {
+        if (!this->connected) {
+          this->connectedTime = millis();
+          this->connected = true;
+
+          Log.sinfoln(
+            FPSTR(L_NETWORK),
+            F("Connected, downtime: %lu s., IP: %s, RSSI: %hhd"),
+            (millis() - this->disconnectedTime) / 1000,
+            WiFi.localIP().toString().c_str(),
+            WiFi.RSSI()
+          );
+        }
+
+        if (this->isApEnabled() && millis() - this->connectedTime > this->reconnectInterval && !this->hasApClients()) {
+          Log.sinfoln(FPSTR(L_NETWORK), F("Stop AP because STA connected"));
+
+          WiFi.mode(WIFI_STA);
+          return;
+        }
+
+        #ifdef ARDUINO_ARCH_ESP8266
+        if (millis() - this->prevArpGratuitous > 60000) {
+          this->stationKeepAliveNow();
+          this->prevArpGratuitous = millis();
+        }
+        #endif
+
+      } else {
+        if (this->connected) {
+          this->disconnectedTime = millis();
+          this->connected = false;
+
+          Log.sinfoln(
+            FPSTR(L_NETWORK),
+            F("Disconnected, reason: %d, uptime: %lu s."),
+            NetworkConnection::getDisconnectReason(),
+            (millis() - this->connectedTime) / 1000
+          );
+        }
+
+        if (!this->hasStaCredentials() && !this->isApEnabled()) {
+          Log.sinfoln(FPSTR(L_NETWORK), F("No STA credentials, start AP"));
+
+          WiFi.mode(WIFI_AP_STA);
+          this->delayCallback(250);
+          WiFi.softAP(this->apName, this->apPassword, this->apChannel);
+
+        } else if (!this->isApEnabled() && millis() - this->disconnectedTime > this->failedConnectTimeout) {
+          Log.sinfoln(FPSTR(L_NETWORK), F("Disconnected for a long time, start AP"));
+
+          WiFi.mode(WIFI_AP_STA);
+          this->delayCallback(250);
+          WiFi.softAP(this->apName, this->apPassword, this->apChannel);
+
+        } else if (this->isConnecting() && millis() - this->prevReconnectingTime > this->resetConnectionTimeout) {
+          Log.swarningln(FPSTR(L_NETWORK), F("Connection timeout, reset wifi..."));
+          this->resetWifi();
+          NetworkConnection::reset();
+          this->delayCallback(250);
+
+        } else if (!this->isConnecting() && this->hasStaCredentials() && (!this->prevReconnectingTime || millis() - this->prevReconnectingTime > this->reconnectInterval)) {
+          Log.sinfoln(FPSTR(L_NETWORK), F("Try connect..."));
+
+          NetworkConnection::reset();
+          if (!this->connect(true, this->connectionTimeout)) {
+            Log.straceln(FPSTR(L_NETWORK), F("Connection failed. Status: %d, reason: %d, raw reason: %d"), NetworkConnection::getStatus(), NetworkConnection::getDisconnectReason(), NetworkConnection::rawDisconnectReason);
+          }
+
+          this->prevReconnectingTime = millis();
+        }
+      }
+    }
+
+    static byte rssiToSignalQuality(short int rssi) {
+      return constrain(map(rssi, -100, -50, 0, 100), 0, 100);
+    }
+
+  protected:
+    const unsigned int reconnectInterval = 15000;
+    const unsigned int failedConnectTimeout = 185000;
+    const unsigned int connectionTimeout = 5000;
+    const unsigned int resetConnectionTimeout = 90000;
+
+    YieldCallback yieldCallback = []() {
+      ::yield();
+    };
+    DelayCallback delayCallback = [](unsigned int time) {
+      ::delay(time);
+    };
+
+    const char* hostname = "esp";
+    const char* apName = "ESP";
+    const char* apPassword = nullptr;
+    byte apChannel = 1;
+
+    const char* staSsid = nullptr;
+    const char* staPassword = nullptr;
+    byte staChannel = 0;
+
+    bool useDhcp = true;
+    IPAddress staticIp;
+    IPAddress staticGateway;
+    IPAddress staticSubnet;
+    IPAddress staticDns;
+
+    bool connected = false;
+    bool reconnectFlag = false;
+    unsigned long prevArpGratuitous = 0;
+    unsigned long prevReconnectingTime = 0;
+    unsigned long connectedTime = 0;
+    unsigned long disconnectedTime = 0;
+
+
+    bool setWifiHostname(const char* hostname) {
+      if (!this->isHostnameValid(hostname)) {
+        return false;
+      }
+
+      if (strcmp(WiFi.getHostname(), hostname) == 0) {
+        return true;
+      }
+
+      return WiFi.setHostname(hostname);
+    }
+
+    #ifdef ARDUINO_ARCH_ESP8266
+    /**
+     * @brief
+     * https://github.com/arendst/Tasmota/blob/e6515883f0ee5451931b6280ff847b117de5a231/tasmota/tasmota_support/support_wifi.ino#L1196
+     */
+    static void stationKeepAliveNow(void) {
+      for (netif* interface = netif_list; interface != nullptr; interface = interface->next) {
+        if (
+          (interface->flags & NETIF_FLAG_LINK_UP)
+          && (interface->flags & NETIF_FLAG_UP)
+          && interface->num == STATION_IF
+          && (!ip4_addr_isany_val(*netif_ip4_addr(interface)))
+          ) {
+          etharp_gratuitous(interface);
+          break;
+        }
+      }
+    }
+    #endif
+
+    /**
+     * @brief check RFC compliance
+     *
+     * @param value
+     * @return true
+     * @return false
+     */
+    static bool isHostnameValid(const char* value) {
+      size_t len = strlen(value);
+      if (len > 24) {
+        return false;
+      } else if (value[len - 1] == '-') {
+        return false;
+      }
+
+      for (size_t i = 0; i < len; i++) {
+        if (!isalnum(value[i]) && value[i] != '-') {
+          return false;
+        }
+      }
+
+      return true;
+    }
+  };
+}

lib/WebServerHandlers/DynamicPage.h

@@ -0,0 +1,224 @@
+#include <FS.h>
+
+
+class DynamicPage : public RequestHandler {
+public:
+  typedef std::function<bool(HTTPMethod, const String&)> CanHandleCallback;
+  typedef std::function<bool()> BeforeSendCallback;
+  typedef std::function<String(const char*)> TemplateCallback;
+  
+  DynamicPage(const char* uri, FS* fs, const char* path, const char* cacheHeader = nullptr) {
+    this->uri = uri;
+    this->fs = fs;
+    this->path = path;
+    this->cacheHeader = cacheHeader;
+  }
+
+  DynamicPage* setCanHandleCallback(CanHandleCallback callback = nullptr) {
+    this->canHandleCallback = callback;
+
+    return this;
+  }
+
+  DynamicPage* setBeforeSendCallback(BeforeSendCallback callback = nullptr) {
+    this->beforeSendCallback = callback;
+
+    return this;
+  }
+
+  DynamicPage* setTemplateCallback(TemplateCallback callback = nullptr) {
+    this->templateCallback = callback;
+
+    return this;
+  }
+
+  #if defined(ARDUINO_ARCH_ESP32)
+  bool canHandle(WebServer &server, HTTPMethod method, const String &uri) override {
+    return this->canHandle(method, uri);
+  }
+  #endif
+
+  bool canHandle(HTTPMethod method, const String& uri) override {
+    return uri.equals(this->uri) && (!this->canHandleCallback || this->canHandleCallback(method, uri));
+  }
+
+  bool handle(WebServer& server, HTTPMethod method, const String& uri) override {
+    if (!this->canHandle(method, uri)) {
+      return false;
+    }
+
+    if (this->beforeSendCallback && !this->beforeSendCallback()) {
+      return true;
+    }
+
+    File file = this->fs->open(this->path, "r");
+    if (!file) {
+      return false;
+
+    } else if (file.isDirectory()) {
+      file.close();
+      return false;
+    }
+
+    if (this->cacheHeader != nullptr) {
+      server.sendHeader(F("Cache-Control"), this->cacheHeader);
+    }
+
+    #ifdef ARDUINO_ARCH_ESP8266
+    if (!server.chunkedResponseModeStart(200, F("text/html"))) {
+      server.send(505, F("text/html"), F("HTTP1.1 required"));
+      return true;
+    }
+    #else
+    server.setContentLength(CONTENT_LENGTH_UNKNOWN);
+    server.send(200, "text/html", emptyString);
+    #endif
+
+    uint8_t* argStartPos = nullptr;
+    uint8_t* argEndPos = nullptr;
+    uint8_t argName[16];
+    size_t sizeArgName = 0;
+    bool argNameProcess = false;
+    while (file.available()) {
+      uint8_t buf[64];
+      size_t length = file.read(buf, sizeof(buf));
+      size_t offset = 0;
+
+      if (argNameProcess) {
+        argEndPos = (uint8_t*) memchr(buf, '}', length);
+        
+        if (argEndPos != nullptr) {
+          size_t fullSizeArgName = sizeArgName + (argEndPos - buf);
+          if (fullSizeArgName < sizeof(argName)) {
+            // copy full arg name
+            if (argEndPos - buf > 0) {
+              memcpy(argName + sizeArgName, buf, argEndPos - buf);
+            }
+            argName[fullSizeArgName] = '\0';
+
+            // send arg value
+            String argValue = this->templateCallback((const char*) argName);
+            if (argValue.length()) {
+              server.sendContent(argValue.c_str());
+
+            } else if (fullSizeArgName > 0) {
+              server.sendContent("{");
+              server.sendContent((const char*) argName);
+              server.sendContent("}");
+            }
+
+            offset = size_t(argEndPos - buf + 1);
+            sizeArgName = 0;
+            argNameProcess = false;
+          }
+        }
+
+        if (argNameProcess) {
+          server.sendContent("{");
+
+          if (sizeArgName > 0) {
+            argName[sizeArgName] = '\0';
+            server.sendContent((const char*) argName);
+          }
+
+          argNameProcess = false;
+        }
+      }
+
+      do {
+        uint8_t* currentBuf = buf + offset;
+        size_t currentLength = length - offset;
+
+        argStartPos = (uint8_t*) memchr(currentBuf, '{', currentLength);
+
+        // send all content
+        if (argStartPos == nullptr) {
+          if (currentLength > 0) {
+            server.sendContent((const char*) currentBuf, currentLength);
+          }
+
+          break;
+        }
+        
+        argEndPos = (uint8_t*) memchr(argStartPos, '}', length - (argStartPos - buf));
+        if (argEndPos != nullptr) {
+          sizeArgName = argEndPos - argStartPos - 1;
+
+          // send all content if arg len > space
+          if (sizeArgName >= sizeof(argName)) {
+            if (currentLength > 0) {
+              server.sendContent((const char*) currentBuf, currentLength);
+            }
+
+            break;
+          }
+          
+          // arg name
+          memcpy(argName, argStartPos + 1, sizeArgName);
+          argName[sizeArgName] = '\0';
+
+          // send arg value
+          String argValue = this->templateCallback((const char*) argName);
+          if (argValue.length()) {
+            // send content before var
+            if (argStartPos - buf > 0) {
+              server.sendContent((const char*) currentBuf, argStartPos - buf);
+            }
+
+            server.sendContent(argValue.c_str());
+            
+          } else {
+            server.sendContent((const char*) currentBuf, argEndPos - currentBuf + 1);
+          }
+
+          offset = size_t(argEndPos - currentBuf + 1);
+
+        } else {
+          sizeArgName = length - size_t(argStartPos - currentBuf) - 1;
+
+          // send all content if arg len > space
+          if (sizeArgName >= sizeof(argName)) {
+            if (currentLength) {
+              server.sendContent((const char*) currentBuf, currentLength);
+            }
+
+            break;
+          }
+
+          // send content before var
+          if (argStartPos - buf > 0) {
+            server.sendContent((const char*) currentBuf, argStartPos - buf);
+          }
+
+          // copy arg name chunk
+          if (sizeArgName > 0) {
+            memcpy(argName, argStartPos + 1, sizeArgName);
+          }
+
+          argNameProcess = true;
+
+          break;
+        }
+      } while(true);
+    }
+    
+    file.close();
+
+    #ifdef ARDUINO_ARCH_ESP8266
+    server.chunkedResponseFinalize();
+    #else
+    server.sendContent(emptyString);
+    #endif
+
+    return true;
+  }
+
+protected:
+  FS* fs = nullptr;
+  CanHandleCallback canHandleCallback;
+  BeforeSendCallback beforeSendCallback;
+  TemplateCallback templateCallback;
+  const char* uri = nullptr;
+  const char* path = nullptr;
+  const char* cacheHeader = nullptr;
+};

lib/WebServerHandlers/StaticPage.h

@@ -0,0 +1,115 @@
+#include <FS.h>
+#include <detail/mimetable.h>
+#if defined(ARDUINO_ARCH_ESP32)
+  #include <detail/RequestHandlersImpl.h>
+#endif
+
+using namespace mime;
+
+class StaticPage : public RequestHandler {
+public:
+  typedef std::function<bool(HTTPMethod, const String&)> CanHandleCallback;
+  typedef std::function<bool()> BeforeSendCallback;
+  
+  template <class T>
+  StaticPage(const char* uri, FS* fs, T path, const char* cacheHeader = nullptr) {
+    this->uri = uri;
+    this->fs = fs;
+    this->path = path;
+    this->cacheHeader = cacheHeader;
+  }
+
+  StaticPage* setCanHandleCallback(CanHandleCallback callback = nullptr) {
+    this->canHandleCallback = callback;
+
+    return this;
+  }
+
+  StaticPage* setBeforeSendCallback(BeforeSendCallback callback = nullptr) {
+    this->beforeSendCallback = callback;
+
+    return this;
+  }
+
+  #if defined(ARDUINO_ARCH_ESP32)
+  bool canHandle(WebServer &server, HTTPMethod method, const String &uri) override {
+    return this->canHandle(method, uri);
+  }
+  #endif
+
+  bool canHandle(HTTPMethod method, const String& uri) override {
+    return method == HTTP_GET && uri.equals(this->uri) && (!this->canHandleCallback || this->canHandleCallback(method, uri));
+  }
+
+  bool handle(WebServer& server, HTTPMethod method, const String& uri) override {
+    if (!this->canHandle(method, uri)) {
+      return false;
+    }
+
+    if (this->beforeSendCallback && !this->beforeSendCallback()) {
+      return true;
+    }
+
+    if (server._eTagEnabled) {
+      if (this->eTag.isEmpty()) {
+        if (server._eTagFunction) {
+          this->eTag = (server._eTagFunction)(*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 (!this->eTag.isEmpty() && server.header(F("If-None-Match")).equals(this->eTag.c_str())) {
+        server.send(304);
+        return true;
+      }
+    }
+
+    if (!this->path.endsWith(FPSTR(mimeTable[gz].endsWith)) && !this->fs->exists(path))  {
+      String pathWithGz = this->path + FPSTR(mimeTable[gz].endsWith);
+
+      if (this->fs->exists(pathWithGz)) {
+        this->path += FPSTR(mimeTable[gz].endsWith);
+      }
+    }
+
+    File file = this->fs->open(this->path, "r");
+    if (!file) {
+      return false;
+
+    } else if (file.isDirectory()) {
+      file.close();
+      return false;
+    }
+
+    if (this->cacheHeader != nullptr) {
+      server.sendHeader(F("Cache-Control"), this->cacheHeader);
+    }
+
+    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);
+    #endif
+
+    return true;
+  }
+
+protected:
+  FS* fs = nullptr;
+  CanHandleCallback canHandleCallback;
+  BeforeSendCallback beforeSendCallback;
+  String eTag;
+  const char* uri = nullptr;
+  String path;
+  const char* cacheHeader = nullptr;
+};

lib/WebServerHandlers/UpgradeHandler.h

@@ -0,0 +1,216 @@
+#include <Arduino.h>
+
+class UpgradeHandler : public RequestHandler {
+public:
+  enum class UpgradeType {
+    FIRMWARE = 0,
+    FILESYSTEM = 1
+  };
+
+  enum class UpgradeStatus {
+    NONE,
+    NO_FILE,
+    SUCCESS,
+    PROHIBITED,
+    ABORTED,
+    ERROR_ON_START,
+    ERROR_ON_WRITE,
+    ERROR_ON_FINISH
+  };
+
+  typedef struct {
+    UpgradeType type;
+    UpgradeStatus status;
+    String error;
+  } UpgradeResult;
+
+  typedef std::function<bool(HTTPMethod, const String&)> CanHandleCallback;
+  typedef std::function<bool(const String&)> CanUploadCallback;
+  typedef std::function<bool(UpgradeType)> BeforeUpgradeCallback;
+  typedef std::function<void(const UpgradeResult&, const UpgradeResult&)> AfterUpgradeCallback;
+  
+  UpgradeHandler(const char* uri) {
+    this->uri = uri;
+  }
+
+  UpgradeHandler* setCanHandleCallback(CanHandleCallback callback = nullptr) {
+    this->canHandleCallback = callback;
+
+    return this;
+  }
+
+  UpgradeHandler* setCanUploadCallback(CanUploadCallback callback = nullptr) {
+    this->canUploadCallback = callback;
+
+    return this;
+  }
+
+  UpgradeHandler* setBeforeUpgradeCallback(BeforeUpgradeCallback callback = nullptr) {
+    this->beforeUpgradeCallback = callback;
+
+    return this;
+  }
+
+  UpgradeHandler* setAfterUpgradeCallback(AfterUpgradeCallback callback = nullptr) {
+    this->afterUpgradeCallback = callback;
+
+    return this;
+  }
+
+  #if defined(ARDUINO_ARCH_ESP32)
+  bool canHandle(WebServer &server, HTTPMethod method, const String &uri) override {
+    return this->canHandle(method, uri);
+  }
+  #endif
+
+  bool canHandle(HTTPMethod method, const String& uri) override {
+    return method == HTTP_POST && uri.equals(this->uri) && (!this->canHandleCallback || this->canHandleCallback(method, uri));
+  }
+
+  #if defined(ARDUINO_ARCH_ESP32)
+  bool canUpload(WebServer &server, const String &uri) override {
+    return this->canUpload(uri);
+  }
+  #endif
+
+  bool canUpload(const String& uri) override {
+    return uri.equals(this->uri) && (!this->canUploadCallback || this->canUploadCallback(uri));
+  }
+
+  bool handle(WebServer& server, HTTPMethod method, const String& uri) override {
+    if (this->afterUpgradeCallback) {
+      this->afterUpgradeCallback(this->firmwareResult, this->filesystemResult);
+    }
+
+    this->firmwareResult.status = UpgradeStatus::NONE;
+    this->firmwareResult.error.clear();
+
+    this->filesystemResult.status = UpgradeStatus::NONE;
+    this->filesystemResult.error.clear();
+
+    return true;
+  }
+
+  void upload(WebServer& server, const String& uri, HTTPUpload& upload) override {
+    UpgradeResult* result;
+    if (upload.name.equals(F("firmware"))) {
+      result = &this->firmwareResult;
+
+    } else if (upload.name.equals(F("filesystem"))) {
+      result = &this->filesystemResult;
+      
+    } else {
+      return;
+    }
+
+    if (result->status != UpgradeStatus::NONE) {
+      return;
+    }
+
+    if (this->beforeUpgradeCallback && !this->beforeUpgradeCallback(result->type)) {
+      result->status = UpgradeStatus::PROHIBITED;
+      return;
+    }
+
+    if (!upload.filename.length()) {
+      result->status = UpgradeStatus::NO_FILE;
+      return;
+    }
+
+    if (upload.status == UPLOAD_FILE_START) {
+      // reset
+      if (Update.isRunning()) {
+        Update.end(false);
+        Update.clearError();
+      }
+
+      bool begin = false;
+      #ifdef ARDUINO_ARCH_ESP8266
+      Update.runAsync(true);
+      
+      if (result->type == UpgradeType::FIRMWARE) {
+        begin = Update.begin((ESP.getFreeSketchSpace() - 0x1000) & 0xFFFFF000, U_FLASH);
+        
+      } else if (result->type == UpgradeType::FILESYSTEM) {
+        close_all_fs();
+        begin = Update.begin((size_t)FS_end - (size_t)FS_start, U_FS);
+      }
+      #elif defined(ARDUINO_ARCH_ESP32)
+      if (result->type == UpgradeType::FIRMWARE) {
+        begin = Update.begin(UPDATE_SIZE_UNKNOWN, U_FLASH);
+        
+      } else if (result->type == UpgradeType::FILESYSTEM) {
+        begin = Update.begin(UPDATE_SIZE_UNKNOWN, U_SPIFFS);
+      }
+      #endif
+
+      if (!begin || Update.hasError()) {
+        result->status = UpgradeStatus::ERROR_ON_START;
+        #ifdef ARDUINO_ARCH_ESP8266
+        result->error = Update.getErrorString();
+        #else
+        result->error = Update.errorString();
+        #endif
+
+        Log.serrorln(FPSTR(L_PORTAL_OTA), F("File '%s', on start: %s"), upload.filename.c_str(), result->error.c_str());
+        return;
+      }
+      
+      Log.sinfoln(FPSTR(L_PORTAL_OTA), F("File '%s', started"), upload.filename.c_str());
+
+    } else if (upload.status == UPLOAD_FILE_WRITE) {
+      if (Update.write(upload.buf, upload.currentSize) != upload.currentSize) {
+        Update.end(false);
+
+        result->status = UpgradeStatus::ERROR_ON_WRITE;
+        #ifdef ARDUINO_ARCH_ESP8266
+        result->error = Update.getErrorString();
+        #else
+        result->error = Update.errorString();
+        #endif
+
+        Log.serrorln(
+          FPSTR(L_PORTAL_OTA),
+          F("File '%s', on writing %d bytes: %s"),
+          upload.filename.c_str(), upload.totalSize, result->error.c_str()
+        );
+
+      } else {
+        Log.sinfoln(FPSTR(L_PORTAL_OTA), F("File '%s', writed %d bytes"), upload.filename.c_str(), upload.totalSize);
+      }
+
+    } else if (upload.status == UPLOAD_FILE_END) {
+      if (Update.end(true)) {
+        result->status = UpgradeStatus::SUCCESS;
+
+        Log.sinfoln(FPSTR(L_PORTAL_OTA), F("File '%s': finish"), upload.filename.c_str());
+
+      } else {
+        result->status = UpgradeStatus::ERROR_ON_FINISH;
+        #ifdef ARDUINO_ARCH_ESP8266
+        result->error = Update.getErrorString();
+        #else
+        result->error = Update.errorString();
+        #endif
+
+        Log.serrorln(FPSTR(L_PORTAL_OTA), F("File '%s', on finish: %s"), upload.filename.c_str(), result->error);
+      }
+
+    } else if (upload.status == UPLOAD_FILE_ABORTED) {
+      Update.end(false);
+      result->status = UpgradeStatus::ABORTED;
+
+      Log.serrorln(FPSTR(L_PORTAL_OTA), F("File '%s': aborted"), upload.filename.c_str());
+    }
+  }
+
+protected:
+  CanHandleCallback canHandleCallback;
+  CanUploadCallback canUploadCallback;
+  BeforeUpgradeCallback beforeUpgradeCallback;
+  AfterUpgradeCallback afterUpgradeCallback;
+  const char* uri = nullptr;
+
+  UpgradeResult firmwareResult{UpgradeType::FIRMWARE, UpgradeStatus::NONE};
+  UpgradeResult filesystemResult{UpgradeType::FILESYSTEM, UpgradeStatus::NONE};
+};

lib/WiFiManagerParameters/WiFiManagerParameters.h

@@ -1,38 +0,0 @@
-class IntParameter : public WiFiManagerParameter {
-public:
-  IntParameter(const char* id, const char* label, int value, const uint8_t length = 10) : WiFiManagerParameter("") {
-    init(id, label, String(value).c_str(), length, "", WFM_LABEL_DEFAULT);
-  }
-
-  int getValue() {
-    return atoi(WiFiManagerParameter::getValue());
-  }
-};
-
-class CheckboxParameter : public WiFiManagerParameter {
-public:
-  const char* checked = "type=\"checkbox\" checked";
-  const char* noChecked = "type=\"checkbox\"";
-  const char* trueVal = "T";
-
-  CheckboxParameter(const char* id, const char* label, bool value): WiFiManagerParameter("") {
-    init(id, label, value ? trueVal : "0", 1, "", WFM_LABEL_AFTER);
-  }
-
-  const char* getValue() const override {
-    return trueVal;
-  }
-
-  const char* getCustomHTML() const override {
-    return strcmp(WiFiManagerParameter::getValue(), trueVal) == 0 ? checked : noChecked;
-  }
-
-  bool getCheckboxValue() {
-    return strcmp(WiFiManagerParameter::getValue(), trueVal) == 0 ? true : false;
-  }
-};
-
-class SeparatorParameter : public WiFiManagerParameter {
-public:
-  SeparatorParameter(): WiFiManagerParameter("<hr>") {}
-};

otgateway.ino

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

package.json

@@ -0,0 +1,18 @@
+{
+  "name": "otgateway",
+  "scripts": {
+    "test": "echo \"Error: no test specified\" && exit 1"
+  },
+  "devDependencies": {
+    "cssnano": "^7.0.2",
+    "cssnano-preset-advanced": "^7.0.2",
+    "gulp": "^5.0.0",
+    "gulp-concat": "^2.6.1",
+    "gulp-gzip": "^1.4.2",
+    "gulp-html-minifier-terser": "^7.1.0",
+    "gulp-jsonminify": "^1.1.0",
+    "gulp-postcss": "^10.0.0",
+    "gulp-terser": "^2.1.0",
+    "gulp-replace": "^1.1.4"
+  }
+}

platformio.ini

@@ -8,22 +8,296 @@
 ; Please visit documentation for the other options and examples
 ; https://docs.platformio.org/page/projectconf.html
 
-[env:d1_mini_pro]
-platform = espressif8266
-board = d1_mini_pro
+[platformio]
+;extra_configs = secrets.ini
+extra_configs = secrets.default.ini
+core_dir = .pio
+
+[env]
+version = 1.5.1
 framework = arduino
 lib_deps = 
-	nrwiersma/ESP8266Scheduler@^1.0
-	arduino-libraries/NTPClient@^3.2.1
-	bblanchon/ArduinoJson@^6.20.0
-	ihormelnyk/OpenTherm Library@^1.1.4
-	knolleary/PubSubClient@^2.8
-	jandrassy/TelnetStream@^1.2.4
-	gyverlibs/EEManager@^2.0
-	gyverlibs/GyverPID@^3.3
-	milesburton/DallasTemperature@^3.11.0
-	https://github.com/Laxilef/WiFiManager/archive/refs/heads/patch-1.zip
-;	https://github.com/tzapu/WiFiManager.git#v2.0.16-rc.2
-build_flags = -D PIO_FRAMEWORK_ARDUINO_LWIP2_HIGHER_BANDWIDTH
+	bblanchon/ArduinoJson@^7.3.0
+	;ihormelnyk/OpenTherm Library@^1.1.5
+	https://github.com/ihormelnyk/opentherm_library#master
+	;arduino-libraries/ArduinoMqttClient@^0.1.8
+	https://github.com/Laxilef/ArduinoMqttClient.git#esp32_core_310
+	lennarthennigs/ESP Telnet@^2.2
+	gyverlibs/FileData@^1.0.2
+	gyverlibs/GyverPID@^3.3.2
+	gyverlibs/GyverBlinker@^1.1.1
+	https://github.com/pstolarz/Arduino-Temperature-Control-Library.git#OneWireNg
+	laxilef/TinyLogger@^1.1.1
+build_type = ${secrets.build_type}
+build_flags = 
+	-mtext-section-literals
+	-D MQTT_CLIENT_STD_FUNCTION_CALLBACK=1
+	;-D DEBUG_ESP_CORE -D DEBUG_ESP_WIFI -D DEBUG_ESP_HTTP_SERVER -D DEBUG_ESP_PORT=Serial
+	-D BUILD_VERSION='"${this.version}"'
+	-D BUILD_ENV='"$PIOENV"'
+	-D DEFAULT_SERIAL_ENABLED=${secrets.serial_enabled}
+	-D DEFAULT_SERIAL_BAUD=${secrets.serial_baud}
+	-D DEFAULT_TELNET_ENABLED=${secrets.telnet_enabled}
+	-D DEFAULT_TELNET_PORT=${secrets.telnet_port}
+	-D DEFAULT_LOG_LEVEL=${secrets.log_level}
+	-D DEFAULT_HOSTNAME='"${secrets.hostname}"'
+	-D DEFAULT_AP_SSID='"${secrets.ap_ssid}"'
+	-D DEFAULT_AP_PASSWORD='"${secrets.ap_password}"'
+	-D DEFAULT_STA_SSID='"${secrets.sta_ssid}"'
+	-D DEFAULT_STA_PASSWORD='"${secrets.sta_password}"'
+	-D DEFAULT_PORTAL_LOGIN='"${secrets.portal_login}"'
+	-D DEFAULT_PORTAL_PASSWORD='"${secrets.portal_password}"'
+	-D DEFAULT_MQTT_ENABLED=${secrets.mqtt_enabled}
+	-D DEFAULT_MQTT_SERVER='"${secrets.mqtt_server}"'
+	-D DEFAULT_MQTT_PORT=${secrets.mqtt_port}
+	-D DEFAULT_MQTT_USER='"${secrets.mqtt_user}"'
+	-D DEFAULT_MQTT_PASSWORD='"${secrets.mqtt_password}"'
+	-D DEFAULT_MQTT_PREFIX='"${secrets.mqtt_prefix}"'
 upload_speed = 921600
 monitor_speed = 115200
+;monitor_filters = direct
+monitor_filters = 
+	esp32_exception_decoder
+	esp8266_exception_decoder
+board_build.flash_mode = dio
+board_build.filesystem = littlefs
+
+; Defaults
+[esp8266_defaults]
+platform = espressif8266@^4.2.1
+lib_deps = 
+	${env.lib_deps}
+	nrwiersma/ESP8266Scheduler@^1.2
+lib_ignore = 
+extra_scripts = 
+	post:tools/build.py
+build_type = ${env.build_type}
+build_flags = 
+	${env.build_flags}
+	-D PIO_FRAMEWORK_ARDUINO_LWIP2_LOW_MEMORY
+	;-D PIO_FRAMEWORK_ARDUINO_LWIP2_HIGHER_BANDWIDTH_LOW_FLASH
+	-D PIO_FRAMEWORK_ARDUINO_ESPRESSIF_SDK305
+board_build.ldscript = eagle.flash.4m1m.ld
+
+[esp32_defaults]
+;platform = espressif32@^6.7
+;platform = https://github.com/platformio/platform-espressif32.git
+;platform_packages = 
+;  framework-arduinoespressif32 @ https://github.com/espressif/arduino-esp32.git#3.0.5
+;  framework-arduinoespressif32-libs @ https://github.com/espressif/esp32-arduino-lib-builder/releases/download/idf-release_v5.1/esp32-arduino-libs-idf-release_v5.1-33fbade6.zip
+platform = https://github.com/pioarduino/platform-espressif32/releases/download/53.03.10/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@^2.1.0
+lib_ignore = 
+extra_scripts = 
+	post:tools/esp32.py
+	post:tools/build.py
+build_type = ${env.build_type}
+build_flags = 
+	${env.build_flags}
+	-D CORE_DEBUG_LEVEL=0
+	-Wl,--wrap=esp_panic_handler
+
+
+; Boards
+[env:d1_mini]
+platform = ${esp8266_defaults.platform}
+board = d1_mini
+lib_deps = ${esp8266_defaults.lib_deps}
+lib_ignore = ${esp8266_defaults.lib_ignore}
+extra_scripts = ${esp8266_defaults.extra_scripts}
+board_build.ldscript = ${esp8266_defaults.board_build.ldscript}
+build_type = ${esp8266_defaults.build_type}
+build_flags = 
+	${esp8266_defaults.build_flags}
+	-D DEFAULT_OT_IN_GPIO=4
+	-D DEFAULT_OT_OUT_GPIO=5
+	-D DEFAULT_SENSOR_OUTDOOR_GPIO=12
+	-D DEFAULT_SENSOR_INDOOR_GPIO=14
+	-D DEFAULT_STATUS_LED_GPIO=13
+	-D DEFAULT_OT_RX_LED_GPIO=15
+
+[env:d1_mini_lite]
+platform = ${esp8266_defaults.platform}
+board = d1_mini_lite
+lib_deps = ${esp8266_defaults.lib_deps}
+lib_ignore = ${esp8266_defaults.lib_ignore}
+extra_scripts = ${esp8266_defaults.extra_scripts}
+board_build.ldscript = ${esp8266_defaults.board_build.ldscript}
+build_type = ${esp8266_defaults.build_type}
+build_flags = 
+	${esp8266_defaults.build_flags}
+	-D DEFAULT_OT_IN_GPIO=4
+	-D DEFAULT_OT_OUT_GPIO=5
+	-D DEFAULT_SENSOR_OUTDOOR_GPIO=12
+	-D DEFAULT_SENSOR_INDOOR_GPIO=14
+	-D DEFAULT_STATUS_LED_GPIO=13
+	-D DEFAULT_OT_RX_LED_GPIO=15
+
+[env:d1_mini_pro]
+platform = ${esp8266_defaults.platform}
+board = d1_mini_pro
+lib_deps = ${esp8266_defaults.lib_deps}
+lib_ignore = ${esp8266_defaults.lib_ignore}
+extra_scripts = ${esp8266_defaults.extra_scripts}
+board_build.ldscript = ${esp8266_defaults.board_build.ldscript}
+build_type = ${esp8266_defaults.build_type}
+build_flags = 
+	${esp8266_defaults.build_flags}
+	-D DEFAULT_OT_IN_GPIO=4
+	-D DEFAULT_OT_OUT_GPIO=5
+	-D DEFAULT_SENSOR_OUTDOOR_GPIO=12
+	-D DEFAULT_SENSOR_INDOOR_GPIO=14
+	-D DEFAULT_STATUS_LED_GPIO=13
+	-D DEFAULT_OT_RX_LED_GPIO=15
+
+[env:nodemcu_8266]
+platform = ${esp8266_defaults.platform}
+board = nodemcuv2
+lib_deps = ${esp8266_defaults.lib_deps}
+lib_ignore = ${esp8266_defaults.lib_ignore}
+extra_scripts = ${esp8266_defaults.extra_scripts}
+board_build.ldscript = ${esp8266_defaults.board_build.ldscript}
+build_type = ${esp8266_defaults.build_type}
+build_flags = 
+	${esp8266_defaults.build_flags}
+	-D DEFAULT_OT_IN_GPIO=13
+	-D DEFAULT_OT_OUT_GPIO=15
+	-D DEFAULT_SENSOR_OUTDOOR_GPIO=12
+	-D DEFAULT_SENSOR_INDOOR_GPIO=4
+	-D DEFAULT_STATUS_LED_GPIO=2
+	-D DEFAULT_OT_RX_LED_GPIO=16
+
+[env:s2_mini]
+platform = ${esp32_defaults.platform}
+platform_packages = ${esp32_defaults.platform_packages}
+board = lolin_s2_mini
+board_build.partitions = ${esp32_defaults.board_build.partitions}
+lib_deps = ${esp32_defaults.lib_deps}
+lib_ignore = ${esp32_defaults.lib_ignore}
+extra_scripts = ${esp32_defaults.extra_scripts}
+build_unflags =
+	-DARDUINO_USB_MODE=1
+build_type = ${esp32_defaults.build_type}
+build_flags = 
+	${esp32_defaults.build_flags}
+	-D ARDUINO_USB_MODE=0
+	-D ARDUINO_USB_CDC_ON_BOOT=1
+	-D DEFAULT_OT_IN_GPIO=33
+	-D DEFAULT_OT_OUT_GPIO=35
+	-D DEFAULT_SENSOR_OUTDOOR_GPIO=9
+	-D DEFAULT_SENSOR_INDOOR_GPIO=7
+	-D DEFAULT_STATUS_LED_GPIO=11
+	-D DEFAULT_OT_RX_LED_GPIO=12
+
+[env:s3_mini] 
+platform = ${esp32_defaults.platform}
+platform_packages = ${esp32_defaults.platform_packages}
+board = lolin_s3_mini
+board_build.partitions = ${esp32_defaults.board_build.partitions}
+lib_deps = 
+	${esp32_defaults.lib_deps}
+	${esp32_defaults.nimble_lib}
+lib_ignore = ${esp32_defaults.lib_ignore}
+extra_scripts = ${esp32_defaults.extra_scripts}
+build_unflags =
+	-DARDUINO_USB_MODE=1
+build_type = ${esp32_defaults.build_type}
+build_flags = 
+	${esp32_defaults.build_flags}
+	-D ARDUINO_USB_MODE=0
+	-D ARDUINO_USB_CDC_ON_BOOT=1
+	-D USE_BLE=1
+	-D DEFAULT_OT_IN_GPIO=35
+	-D DEFAULT_OT_OUT_GPIO=36
+	-D DEFAULT_SENSOR_OUTDOOR_GPIO=13
+	-D DEFAULT_SENSOR_INDOOR_GPIO=12
+	-D DEFAULT_STATUS_LED_GPIO=11
+	-D DEFAULT_OT_RX_LED_GPIO=10
+
+[env:c3_mini] 
+platform = ${esp32_defaults.platform}
+platform_packages = ${esp32_defaults.platform_packages}
+board = lolin_c3_mini
+board_build.partitions = ${esp32_defaults.board_build.partitions}
+lib_deps = 
+	${esp32_defaults.lib_deps}
+	${esp32_defaults.nimble_lib}
+lib_ignore = ${esp32_defaults.lib_ignore}
+extra_scripts = ${esp32_defaults.extra_scripts}
+build_unflags = 
+	-mtext-section-literals
+build_type = ${esp32_defaults.build_type}
+build_flags = 
+	${esp32_defaults.build_flags}
+	-D USE_BLE=1
+	-D DEFAULT_OT_IN_GPIO=8
+	-D DEFAULT_OT_OUT_GPIO=10
+	-D DEFAULT_SENSOR_OUTDOOR_GPIO=0
+	-D DEFAULT_SENSOR_INDOOR_GPIO=1
+	-D DEFAULT_STATUS_LED_GPIO=4
+	-D DEFAULT_OT_RX_LED_GPIO=5
+
+[env:nodemcu_32]
+platform = ${esp32_defaults.platform}
+platform_packages = ${esp32_defaults.platform_packages}
+board = nodemcu-32s
+board_build.partitions = ${esp32_defaults.board_build.partitions}
+lib_deps = 
+	${esp32_defaults.lib_deps}
+	${esp32_defaults.nimble_lib}
+lib_ignore = ${esp32_defaults.lib_ignore}
+extra_scripts = ${esp32_defaults.extra_scripts}
+build_type = ${esp32_defaults.build_type}
+build_flags = 
+	${esp32_defaults.build_flags}
+	-D USE_BLE=1
+	-D DEFAULT_OT_IN_GPIO=16
+	-D DEFAULT_OT_OUT_GPIO=4
+	-D DEFAULT_SENSOR_OUTDOOR_GPIO=15
+	-D DEFAULT_SENSOR_INDOOR_GPIO=26
+	-D DEFAULT_STATUS_LED_GPIO=2
+	-D DEFAULT_OT_RX_LED_GPIO=19
+
+[env:d1_mini32]
+platform = ${esp32_defaults.platform}
+platform_packages = ${esp32_defaults.platform_packages}
+board = wemos_d1_mini32
+board_build.partitions = ${esp32_defaults.board_build.partitions}
+lib_deps = 
+	${esp32_defaults.lib_deps}
+	${esp32_defaults.nimble_lib}
+lib_ignore = ${esp32_defaults.lib_ignore}
+extra_scripts = ${esp32_defaults.extra_scripts}
+build_type = ${esp32_defaults.build_type}
+build_flags = 
+	${esp32_defaults.build_flags}
+	-D USE_BLE=1
+	-D DEFAULT_OT_IN_GPIO=21
+	-D DEFAULT_OT_OUT_GPIO=22
+	-D DEFAULT_SENSOR_OUTDOOR_GPIO=12
+	-D DEFAULT_SENSOR_INDOOR_GPIO=18
+	-D DEFAULT_STATUS_LED_GPIO=2
+	-D DEFAULT_OT_RX_LED_GPIO=19
+
+[env:esp32_c6]
+platform = ${esp32_defaults.platform}
+platform_packages = ${esp32_defaults.platform_packages}
+board = esp32-c6-devkitm-1
+board_build.partitions = ${esp32_defaults.board_build.partitions}
+lib_deps = 
+	${esp32_defaults.lib_deps}
+	;${esp32_defaults.nimble_lib}
+lib_ignore = ${esp32_defaults.lib_ignore}
+extra_scripts = ${esp32_defaults.extra_scripts}
+build_unflags = 
+	-mtext-section-literals
+build_type = ${esp32_defaults.build_type}
+build_flags = 
+	${esp32_defaults.build_flags}
+	; Currently the NimBLE library is incompatible with ESP32 C6
+	;-D USE_BLE=1

secrets.default.ini

@@ -0,0 +1,25 @@
+[secrets]
+build_type = release
+
+serial_enabled = true
+serial_baud = 115200
+telnet_enabled = true
+telnet_port = 23
+log_level = 5
+hostname = opentherm
+
+ap_ssid = OpenTherm Gateway
+ap_password = otgateway123456
+
+sta_ssid = 
+sta_password = 
+
+portal_login = admin
+portal_password = admin
+
+mqtt_enabled = false
+mqtt_server = 
+mqtt_port = 1883
+mqtt_user = 
+mqtt_password = 
+mqtt_prefix = opentherm

src/CrashRecorder.h

@@ -0,0 +1,132 @@
+#pragma once
+#include <Arduino.h>
+
+#ifdef ARDUINO_ARCH_ESP32
+  #include "esp_err.h"
+#endif
+
+#ifdef ARDUINO_ARCH_ESP8266
+  extern "C" {
+    #include <user_interface.h>
+  }
+
+  // https://github.com/espressif/ESP8266_RTOS_SDK/blob/master/components/esp8266/include/esp_attr.h
+  #define _COUNTER_STRINGIFY(COUNTER) #COUNTER
+  #define _SECTION_ATTR_IMPL(SECTION, COUNTER) __attribute__((section(SECTION "." _COUNTER_STRINGIFY(COUNTER))))
+  #define __NOINIT_ATTR _SECTION_ATTR_IMPL(".noinit", __COUNTER__)
+#endif
+
+namespace CrashRecorder {
+  typedef struct {
+    unsigned int data[32];
+    uint8_t length;
+    bool continues;
+  } backtrace_t;
+
+  typedef struct {
+    unsigned int data[4];
+    uint8_t length;
+  } epc_t;
+
+  typedef struct {
+    uint8_t core;
+    size_t heap;
+    unsigned long uptime;
+  } ext_t;
+
+
+  __NOINIT_ATTR volatile static backtrace_t backtrace;
+  __NOINIT_ATTR volatile static epc_t epc;
+  __NOINIT_ATTR volatile static ext_t ext;
+
+  uint8_t backtraceMaxLength = sizeof(backtrace.data) / sizeof(*backtrace.data);
+  uint8_t epcMaxLength = sizeof(epc.data) / sizeof(*epc.data);
+
+  #ifdef ARDUINO_ARCH_ESP32
+  void IRAM_ATTR panicHandler(arduino_panic_info_t *info, void *arg) {;
+    ext.core = info->core;
+    ext.heap = ESP.getFreeHeap();
+    ext.uptime = millis() / 1000u;
+
+    // Backtrace
+    backtrace.length = info->backtrace_len < backtraceMaxLength ? info->backtrace_len : backtraceMaxLength;
+    backtrace.continues = false;
+    for (unsigned int i = 0; i < info->backtrace_len; i++) {
+      if (i >= backtraceMaxLength) {
+        backtrace.continues = true;
+        break;
+      }
+
+      backtrace.data[i] = info->backtrace[i];
+    }
+
+    // EPC
+    if (info->pc) {
+      epc.data[0] = (unsigned int) info->pc;
+      epc.length = 1;
+
+    } else {
+      epc.length = 0;
+    }
+  }
+  #endif
+  
+  void init() {
+    if (backtrace.length > backtraceMaxLength) {
+      backtrace.length = 0;
+    }
+
+    if (epc.length > epcMaxLength) {
+      epc.length = 0;
+    }
+
+    #ifdef ARDUINO_ARCH_ESP32
+    set_arduino_panic_handler(panicHandler, nullptr);
+    #endif
+  }
+}
+
+#ifdef ARDUINO_ARCH_ESP8266
+extern "C" void custom_crash_callback(struct rst_info *info, uint32_t stack, uint32_t stack_end) {
+  uint8_t _length = 0;
+
+  CrashRecorder::ext.core = 0;
+  CrashRecorder::ext.heap = ESP.getFreeHeap();
+  CrashRecorder::ext.uptime = millis() / 1000u;
+
+  // Backtrace
+  CrashRecorder::backtrace.continues = false;
+  uint32_t value;
+  for (uint32_t i = stack; i < stack_end; i += 4) {
+    value = *((uint32_t*) i);
+
+    // keep only addresses in code area
+    if ((value >= 0x40000000) && (value < 0x40300000)) {
+      if (_length >= CrashRecorder::backtraceMaxLength) {
+        CrashRecorder::backtrace.continues = true;
+        break;
+      }
+
+      CrashRecorder::backtrace.data[_length++] = value;
+    }
+  }
+
+  CrashRecorder::backtrace.length = _length;
+
+  // EPC
+  _length = 0;
+  if (info->epc1 > 0) {
+    CrashRecorder::epc.data[_length++] = info->epc1;
+  }
+
+  if (info->epc2 > 0) {
+    CrashRecorder::epc.data[_length++] = info->epc2;
+  }
+
+  if (info->epc3 > 0) {
+    CrashRecorder::epc.data[_length++] = info->epc3;
+  }
+
+  CrashRecorder::epc.length = _length;
+}
+#endif

src/MainTask.h

@@ -1,134 +1,601 @@
+#include <Blinker.h>
+
+using namespace NetworkUtils;
+
+extern NetworkMgr* network;
 extern MqttTask* tMqtt;
-extern SensorsTask* tSensors;
 extern OpenThermTask* tOt;
+extern FileData fsNetworkSettings, fsSettings, fsSensorsSettings;
+extern ESPTelnetStream* telnetStream;
 
-class MainTask: public Task {
+
+class MainTask : public Task {
 public:
-  MainTask(bool _enabled = false, unsigned long _interval = 0): Task(_enabled, _interval) {}
+  MainTask(bool _enabled = false, unsigned long _interval = 0) : Task(_enabled, _interval) {
+    this->blinker = new Blinker();
 
-protected:
-  unsigned long lastHeapInfo = 0;
-  unsigned long firstFailConnect = 0;
-  unsigned short minFreeHeapSize = 65535;
-
-  void setup() {
-    pinMode(LED_STATUS_PIN, OUTPUT);
+    network->setDelayCallback([this](unsigned int time) {
+      this->delay(time);
+    })->setYieldCallback([this]() {
+      this->yield();
+    });
   }
 
+  ~MainTask() {
+    delete this->blinker;
+  }
+
+protected:
+  enum class PumpStartReason {NONE, HEATING, ANTISTUCK};
+
+  Blinker* blinker = nullptr;
+  unsigned long lastHeapInfo = 0;
+  unsigned int minFreeHeap = 0;
+  unsigned int minMaxFreeBlockHeap = 0;
+  bool restartSignalReceived = false;
+  unsigned long restartSignalReceivedTime = 0;
+  bool heatingEnabled = false;
+  unsigned long heatingDisabledTime = 0;
+  PumpStartReason extPumpStartReason = PumpStartReason::NONE;
+  unsigned long externalPumpStartTime = 0;
+  bool telnetStarted = false;
+  bool emergencyDetected = false;
+  unsigned long emergencyFlipTime = 0;
+
+  #if defined(ARDUINO_ARCH_ESP32)
+  const char* getTaskName() override {
+    return "Main";
+  }
+
+  /*BaseType_t getTaskCore() override {
+    return 1;
+  }*/
+
+  int getTaskPriority() override {
+    return 3;
+  }
+  #endif
+
+  void setup() {}
+
   void loop() {
-    if (eeSettings.tick()) {
-      INFO("Settings updated (EEPROM)");
+    network->loop();
+
+    if (fsNetworkSettings.tick() == FD_WRITE) {
+      Log.sinfoln(FPSTR(L_NETWORK_SETTINGS), F("Updated"));
     }
 
-    if (WiFi.status() == WL_CONNECTED) {
-      if (!tMqtt->isEnabled()) {
+    if (fsSettings.tick() == FD_WRITE) {
+      Log.sinfoln(FPSTR(L_SETTINGS), F("Updated"));
+    }
+
+    if (fsSensorsSettings.tick() == FD_WRITE) {
+      Log.sinfoln(FPSTR(L_SENSORS_SETTINGS), F("Updated"));
+    }
+
+    if (vars.actions.restart) {
+      this->restartSignalReceivedTime = millis();
+      this->restartSignalReceived = true;
+      vars.actions.restart = false;
+
+      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();
+    vars.network.connected = network->isConnected();
+    vars.network.rssi = network->isConnected() ? WiFi.RSSI() : 0;
+
+    if (settings.system.logLevel >= TinyLogger::Level::SILENT && settings.system.logLevel <= TinyLogger::Level::VERBOSE) {
+      if (Log.getLevel() != settings.system.logLevel) {
+        Log.setLevel(static_cast<TinyLogger::Level>(settings.system.logLevel));
+      }
+    }
+
+    if (network->isConnected()) {
+      if (!this->telnetStarted && telnetStream != nullptr) {
+        telnetStream->begin(23, false);
+        this->telnetStarted = true;
+      }
+
+      if (settings.mqtt.enabled && !tMqtt->isEnabled()) {
         tMqtt->enable();
+
+      } else if (!settings.mqtt.enabled && tMqtt->isEnabled()) {
+        tMqtt->disable();
       }
 
-      if ( firstFailConnect != 0 ) {
-        firstFailConnect = 0;
-      }
-
-      vars.states.rssi = WiFi.RSSI();
+      Sensors::setConnectionStatusByType(Sensors::Type::MANUAL, !settings.mqtt.enabled || vars.mqtt.connected, false);
 
     } else {
+      if (this->telnetStarted) {
+        telnetStream->stop();
+        this->telnetStarted = false;
+      }
+
       if (tMqtt->isEnabled()) {
         tMqtt->disable();
       }
 
-      if (settings.emergency.enable && !vars.states.emergency) {
-        if (firstFailConnect == 0) {
-          firstFailConnect = millis();
-        }
-        
-        if (millis() - firstFailConnect > EMERGENCY_TIME_TRESHOLD) {
-          vars.states.emergency = true;
-          INFO("Emergency mode enabled");
-        }
-      }
+      Sensors::setConnectionStatusByType(Sensors::Type::MANUAL, false, false);
+    }
+    this->yield();
+
+    this->emergency();
+    this->ledStatus();
+    this->cascadeControl();
+    this->externalPump();
+    this->yield();
+
+
+    // telnet
+    if (this->telnetStarted) {
+      telnetStream->loop();
+      this->yield();
     }
 
-    if (!tOt->isEnabled() && settings.opentherm.inPin > 0 && settings.opentherm.outPin > 0 && settings.opentherm.inPin != settings.opentherm.outPin) {
-      tOt->enable();
-    }
-
-    ledStatus();
-
-#ifdef USE_TELNET
-    yield();
 
     // anti memory leak
-    TelnetStream.flush();
-    while (TelnetStream.available() > 0) {
-      TelnetStream.read();
-    }
-#endif
+    for (Stream* stream : Log.getStreams()) {
+      while (stream->available() > 0) {
+        stream->read();
 
-    if (settings.debug) {
-      unsigned short freeHeapSize = ESP.getFreeHeap();
-      unsigned short minFreeHeapSizeDiff = 0;
-
-      if (freeHeapSize < minFreeHeapSize) {
-        minFreeHeapSizeDiff = minFreeHeapSize - freeHeapSize;
-        minFreeHeapSize = freeHeapSize;
+        #ifdef ARDUINO_ARCH_ESP8266
+        ::optimistic_yield(1000);
+        #endif
       }
-      if (millis() - lastHeapInfo > 10000 || minFreeHeapSizeDiff > 0) {
-        DEBUG_F("Free heap size: %hu bytes, min: %hu bytes (diff: %hu bytes)\n", freeHeapSize, minFreeHeapSize, minFreeHeapSizeDiff);
-        lastHeapInfo = millis();
+    }
+
+    // heap info
+    this->heap();
+
+
+    // restart
+    if (this->restartSignalReceived && millis() - this->restartSignalReceivedTime > 15000) {
+      this->restartSignalReceived = false;
+
+      ESP.restart();
+    }
+  }
+
+  void heap() {
+    unsigned int freeHeap = getFreeHeap();
+    unsigned int maxFreeBlockHeap = getMaxFreeBlockHeap();
+
+    // critical heap
+    if (!vars.states.restarting && (freeHeap < 2048 || maxFreeBlockHeap < 2048)) {
+      this->restartSignalReceivedTime = millis();
+      vars.states.restarting = true;
+    }
+
+    if (settings.system.logLevel < TinyLogger::Level::VERBOSE) {
+      return;
+    }
+
+    size_t minFreeHeap = getFreeHeap(true);
+    size_t minFreeHeapDiff = 0;
+    if (minFreeHeap < this->minFreeHeap || this->minFreeHeap == 0) {
+      minFreeHeapDiff = this->minFreeHeap - minFreeHeap;
+      this->minFreeHeap = minFreeHeap;
+    }
+    
+    size_t minMaxFreeBlockHeap = getMaxFreeBlockHeap(true);
+    size_t minMaxFreeBlockHeapDiff = 0;
+    if (minMaxFreeBlockHeap < this->minMaxFreeBlockHeap || this->minMaxFreeBlockHeap == 0) {
+      minMaxFreeBlockHeapDiff = this->minMaxFreeBlockHeap - minMaxFreeBlockHeap;
+      this->minMaxFreeBlockHeap = minMaxFreeBlockHeap;
+    }
+
+    if (millis() - this->lastHeapInfo > 20000 || minFreeHeapDiff > 0 || minMaxFreeBlockHeapDiff > 0) {
+      Log.sverboseln(
+        FPSTR(L_MAIN),
+        F("Free heap size: %u of %u bytes (min: %u, diff: %u), max free block: %u (min: %u, diff: %u, frag: %hhu%%)"),
+        freeHeap, getTotalHeap(), this->minFreeHeap, minFreeHeapDiff, maxFreeBlockHeap, this->minMaxFreeBlockHeap, minMaxFreeBlockHeapDiff, getHeapFrag()
+      );
+      this->lastHeapInfo = millis();
+    }
+  }
+
+  void emergency() {
+    // flags
+    uint8_t emergencyFlags = 0b00000000;
+
+    // set outdoor sensor flag
+    if (settings.equitherm.enabled) {
+      if (!Sensors::existsConnectedSensorsByPurpose(Sensors::Purpose::OUTDOOR_TEMP)) {
+        emergencyFlags |= 0b00000001;
+      }
+    }
+
+    // set indoor sensor flags
+    if (!Sensors::existsConnectedSensorsByPurpose(Sensors::Purpose::INDOOR_TEMP)) {
+      if (!settings.equitherm.enabled && settings.pid.enabled) {
+        emergencyFlags |= 0b00000010;
+      }
+      
+      if (settings.opentherm.options.nativeHeatingControl) {
+        emergencyFlags |= 0b00000100;
+      }
+    }
+
+    // if any flags is true
+    if ((emergencyFlags & 0b00001111) != 0) {
+      if (!this->emergencyDetected) {
+        // flip flag
+        this->emergencyDetected = true;
+        this->emergencyFlipTime = millis();
+
+      } else if (this->emergencyDetected && !vars.emergency.state) {
+        // enable emergency
+        if (millis() - this->emergencyFlipTime > (settings.emergency.tresholdTime * 1000)) {
+          vars.emergency.state = true;
+          Log.sinfoln(FPSTR(L_MAIN), F("Emergency mode enabled (%hhu)"), emergencyFlags);
+        }
+      }
+
+    } else {
+      if (this->emergencyDetected) {
+        // flip flag
+        this->emergencyDetected = false;
+        this->emergencyFlipTime = millis();
+
+      } else if (!this->emergencyDetected && vars.emergency.state) {
+        // disable emergency
+        if (millis() - this->emergencyFlipTime > (settings.emergency.tresholdTime * 1000)) {
+          vars.emergency.state = false;
+          Log.sinfoln(FPSTR(L_MAIN), F("Emergency mode disabled"));
+        }
       }
     }
   }
 
   void ledStatus() {
-    static byte blinkLeft = 0;
+    uint8_t errors[4];
+    uint8_t errCount = 0;
+    static uint8_t errPos = 0;
+    static unsigned long endBlinkTime = 0;
     static bool ledOn = false;
-    static unsigned long changeTime = 0;
+    static uint8_t configuredGpio = GPIO_IS_NOT_CONFIGURED;
 
-    byte errNo = 0;
-    if (!vars.states.otStatus) {
-      errNo = 1;
-    } else if (vars.states.fault) {
-      errNo = 2;
-    } else if (vars.states.emergency) {
-      errNo = 3;
+    if (settings.system.statusLedGpio != configuredGpio) {
+      if (configuredGpio != GPIO_IS_NOT_CONFIGURED) {
+        digitalWrite(configuredGpio, LOW);
+      }
+      
+      if (GPIO_IS_VALID(settings.system.statusLedGpio)) {
+        configuredGpio = settings.system.statusLedGpio;
+        pinMode(configuredGpio, OUTPUT);
+        digitalWrite(configuredGpio, LOW);
+        this->blinker->init(configuredGpio);
+
+      } else if (configuredGpio != GPIO_IS_NOT_CONFIGURED) {
+        configuredGpio = GPIO_IS_NOT_CONFIGURED;
+      }
     }
 
-    if (errNo == 0) {
-      if (!ledOn) {
-        digitalWrite(LED_STATUS_PIN, true);
-        ledOn = true;
-      }
+    if (configuredGpio == GPIO_IS_NOT_CONFIGURED) {
+      return;
+    }
 
-      if (blinkLeft > 0) {
-        blinkLeft = 0;
-      }
+    if (!network->isConnected()) {
+      errors[errCount++] = 2;
+    }
 
-    } else {
-      if (blinkLeft == 0) {
-        if (ledOn) {
-          digitalWrite(LED_STATUS_PIN, false);
-          ledOn = false;
-          changeTime = millis();
-        }
+    if (!vars.slave.connected) {
+      errors[errCount++] = 3;
+    }
 
-        if (millis() - changeTime >= 3000) {
-          blinkLeft = errNo;
-        }
-      }
+    if (vars.slave.fault.active) {
+      errors[errCount++] = 4;
+    }
 
-      if (blinkLeft > 0 && millis() - changeTime >= 500) {
-        if (ledOn) {
-          digitalWrite(LED_STATUS_PIN, false);
-          ledOn = false;
-          blinkLeft--;
+    if (vars.emergency.state) {
+      errors[errCount++] = 5;
+    }
 
-        } else {
-          digitalWrite(LED_STATUS_PIN, true);
+
+    if (this->blinker->ready()) {
+      endBlinkTime = millis();
+    }
+
+    if (!this->blinker->running() && millis() - endBlinkTime >= 5000) {
+      if (errCount == 0) {
+        if (!ledOn) {
+          digitalWrite(configuredGpio, HIGH);
           ledOn = true;
         }
 
-        changeTime = millis();
+        return;
+
+      } else if (ledOn) {
+        digitalWrite(configuredGpio, LOW);
+        ledOn = false;
+        endBlinkTime = millis();
+        return;
+      }
+
+      if (errPos >= errCount) {
+        errPos = 0;
+
+        // end of error list
+        this->blinker->blink(10, 50, 50);
+
+      } else {
+        this->blinker->blink(errors[errPos++], 300, 300);
+      }
+    }
+
+    this->blinker->tick();
+  }
+
+  void cascadeControl() {
+    static uint8_t configuredInputGpio = GPIO_IS_NOT_CONFIGURED;
+    static uint8_t configuredOutputGpio = GPIO_IS_NOT_CONFIGURED;
+    static bool inputTempValue = false;
+    static unsigned long inputChangedTs = 0;
+    static bool outputTempValue = false;
+    static unsigned long outputChangedTs = 0;
+
+    // input
+    if (settings.cascadeControl.input.enabled) {
+      if (settings.cascadeControl.input.gpio != configuredInputGpio) {
+        if (configuredInputGpio != GPIO_IS_NOT_CONFIGURED) {
+          pinMode(configuredInputGpio, OUTPUT);
+          digitalWrite(configuredInputGpio, LOW);
+
+          Log.sinfoln(FPSTR(L_CASCADE_INPUT), F("Deinitialized on GPIO %hhu"), configuredInputGpio);
+        }
+        
+        if (GPIO_IS_VALID(settings.cascadeControl.input.gpio)) {
+          configuredInputGpio = settings.cascadeControl.input.gpio;
+          pinMode(configuredInputGpio, INPUT);
+
+          Log.sinfoln(FPSTR(L_CASCADE_INPUT), F("Initialized on GPIO %hhu"), configuredInputGpio);
+
+        } else if (configuredInputGpio != GPIO_IS_NOT_CONFIGURED) {
+          configuredInputGpio = GPIO_IS_NOT_CONFIGURED;
+
+          Log.swarningln(FPSTR(L_CASCADE_INPUT), F("Failed initialize: GPIO %hhu is not valid!"), configuredInputGpio);
+        }
+      }
+
+      if (configuredInputGpio != GPIO_IS_NOT_CONFIGURED) {
+        bool value;
+        if (digitalRead(configuredInputGpio) == HIGH) {
+          value = true ^ settings.cascadeControl.input.invertState;
+        } else {
+          value = false ^ settings.cascadeControl.input.invertState;
+        }
+
+        if (value != vars.cascadeControl.input) {
+          if (value != inputTempValue) {
+            inputTempValue = value;
+            inputChangedTs = millis();
+
+          } else if (millis() - inputChangedTs >= settings.cascadeControl.input.thresholdTime * 1000u) {
+            vars.cascadeControl.input = value;
+
+            Log.sinfoln(
+              FPSTR(L_CASCADE_INPUT),
+              F("State changed to %s"),
+              value ? F("TRUE") : F("FALSE")
+            );
+          }
+
+        } else if (value != inputTempValue) {
+          inputTempValue = value;
+        }
+      }
+    }
+    
+    if (!settings.cascadeControl.input.enabled || configuredInputGpio == GPIO_IS_NOT_CONFIGURED) {
+      if (!vars.cascadeControl.input) {
+        vars.cascadeControl.input = true;
+
+        Log.sinfoln(
+          FPSTR(L_CASCADE_INPUT),
+          F("Disabled, state changed to %s"),
+          vars.cascadeControl.input ? F("TRUE") : F("FALSE")
+        );
+      }
+    }
+
+
+    // output
+    if (settings.cascadeControl.output.enabled) {
+      if (settings.cascadeControl.output.gpio != configuredOutputGpio) {
+        if (configuredOutputGpio != GPIO_IS_NOT_CONFIGURED) {
+          pinMode(configuredOutputGpio, OUTPUT);
+          digitalWrite(configuredOutputGpio, LOW);
+
+          Log.sinfoln(FPSTR(L_CASCADE_OUTPUT), F("Deinitialized on GPIO %hhu"), configuredOutputGpio);
+        }
+        
+        if (GPIO_IS_VALID(settings.cascadeControl.output.gpio)) {
+          configuredOutputGpio = settings.cascadeControl.output.gpio;
+          pinMode(configuredOutputGpio, OUTPUT);
+          digitalWrite(
+            configuredOutputGpio,
+            settings.cascadeControl.output.invertState
+              ? HIGH 
+              : LOW
+          );
+
+          Log.sinfoln(FPSTR(L_CASCADE_OUTPUT), F("Initialized on GPIO %hhu"), configuredOutputGpio);
+
+        } else if (configuredOutputGpio != GPIO_IS_NOT_CONFIGURED) {
+          configuredOutputGpio = GPIO_IS_NOT_CONFIGURED;
+
+          Log.swarningln(FPSTR(L_CASCADE_OUTPUT), F("Failed initialize: GPIO %hhu is not valid!"), configuredOutputGpio);
+        }
+      }
+
+      if (configuredOutputGpio != GPIO_IS_NOT_CONFIGURED) {
+        bool value = false;
+        if (settings.cascadeControl.output.onFault && vars.slave.fault.active) {
+          value = true;
+
+        } else if (settings.cascadeControl.output.onLossConnection && !vars.slave.connected) {
+          value = true;
+
+        } else if (settings.cascadeControl.output.onEnabledHeating && settings.heating.enabled && vars.cascadeControl.input) {
+          value = true;
+        }
+
+        if (value != vars.cascadeControl.output) {
+          if (value != outputTempValue) {
+            outputTempValue = value;
+            outputChangedTs = millis();
+            
+          } else if (millis() - outputChangedTs >= settings.cascadeControl.output.thresholdTime * 1000u) {
+            vars.cascadeControl.output = value;
+
+            digitalWrite(
+              configuredOutputGpio,
+              vars.cascadeControl.output ^ settings.cascadeControl.output.invertState
+                ? HIGH
+                : LOW
+            );
+
+            Log.sinfoln(
+              FPSTR(L_CASCADE_OUTPUT),
+              F("State changed to %s"),
+              value ? F("TRUE") : F("FALSE")
+            );
+          }
+
+        } else if (value != outputTempValue) {
+          outputTempValue = value;
+        }
+      }
+    }
+
+    if (!settings.cascadeControl.output.enabled || configuredOutputGpio == GPIO_IS_NOT_CONFIGURED) {
+      if (vars.cascadeControl.output) {
+        vars.cascadeControl.output = false;
+
+        if (configuredOutputGpio != GPIO_IS_NOT_CONFIGURED) {
+          digitalWrite(
+            configuredOutputGpio,
+            vars.cascadeControl.output ^ settings.cascadeControl.output.invertState
+              ? HIGH
+              : LOW
+          );
+        }
+
+        Log.sinfoln(
+          FPSTR(L_CASCADE_OUTPUT),
+          F("Disabled, state changed to %s"),
+          vars.cascadeControl.output ? F("TRUE") : F("FALSE")
+        );
       }
     }
   }
+
+  void externalPump() {
+    static uint8_t configuredGpio = GPIO_IS_NOT_CONFIGURED;
+
+    if (settings.externalPump.gpio != configuredGpio) {
+      if (configuredGpio != GPIO_IS_NOT_CONFIGURED) {
+        digitalWrite(configuredGpio, LOW);
+      }
+      
+      if (GPIO_IS_VALID(settings.externalPump.gpio)) {
+        configuredGpio = settings.externalPump.gpio;
+        pinMode(configuredGpio, OUTPUT);
+        digitalWrite(configuredGpio, LOW);
+
+      } else if (configuredGpio != GPIO_IS_NOT_CONFIGURED) {
+        configuredGpio = GPIO_IS_NOT_CONFIGURED;
+      }
+    }
+
+    if (configuredGpio == GPIO_IS_NOT_CONFIGURED) {
+      if (vars.externalPump.state) {
+        vars.externalPump.state = false;
+        vars.externalPump.lastEnabledTime = millis();
+
+        Log.sinfoln(FPSTR(L_EXTPUMP), F("Disabled: use = off"));
+      }
+
+      return;
+    }
+
+    if (!vars.master.heating.enabled && this->heatingEnabled) {
+      this->heatingEnabled = false;
+      this->heatingDisabledTime = millis();
+
+    } else if (vars.master.heating.enabled && !this->heatingEnabled) {
+      this->heatingEnabled = true;
+    }
+    
+    if (!settings.externalPump.use) {
+      if (vars.externalPump.state) {
+        digitalWrite(configuredGpio, LOW);
+
+        vars.externalPump.state = false;
+        vars.externalPump.lastEnabledTime = millis();
+
+        Log.sinfoln(FPSTR(L_EXTPUMP), F("Disabled: use = off"));
+      }
+
+      return;
+    }
+
+    if (vars.externalPump.state && !this->heatingEnabled) {
+      if (this->extPumpStartReason == MainTask::PumpStartReason::HEATING && millis() - this->heatingDisabledTime > (settings.externalPump.postCirculationTime * 1000u)) {
+        digitalWrite(configuredGpio, LOW);
+
+        vars.externalPump.state = false;
+        vars.externalPump.lastEnabledTime = millis();
+
+        Log.sinfoln(FPSTR(L_EXTPUMP), F("Disabled: expired post circulation time"));
+
+      } else if (this->extPumpStartReason == MainTask::PumpStartReason::ANTISTUCK && millis() - this->externalPumpStartTime >= (settings.externalPump.antiStuckTime * 1000u)) {
+        digitalWrite(configuredGpio, LOW);
+
+        vars.externalPump.state = false;
+        vars.externalPump.lastEnabledTime = millis();
+
+        Log.sinfoln(FPSTR(L_EXTPUMP), F("Disabled: expired anti stuck time"));
+      }
+
+    } else if (vars.externalPump.state && this->heatingEnabled && this->extPumpStartReason == MainTask::PumpStartReason::ANTISTUCK) {
+      this->extPumpStartReason = MainTask::PumpStartReason::HEATING;
+
+    } else if (!vars.externalPump.state && this->heatingEnabled) {
+      vars.externalPump.state = true;
+      this->externalPumpStartTime = millis();
+      this->extPumpStartReason = MainTask::PumpStartReason::HEATING;
+
+      digitalWrite(configuredGpio, HIGH);
+
+      Log.sinfoln(FPSTR(L_EXTPUMP), F("Enabled: heating on"));
+
+    } else if (!vars.externalPump.state && (vars.externalPump.lastEnabledTime == 0 || millis() - vars.externalPump.lastEnabledTime >= (settings.externalPump.antiStuckInterval * 1000lu))) {
+      vars.externalPump.state = true;
+      this->externalPumpStartTime = millis();
+      this->extPumpStartReason = MainTask::PumpStartReason::ANTISTUCK;
+
+      digitalWrite(configuredGpio, HIGH);
+
+      Log.sinfoln(FPSTR(L_EXTPUMP), F("Enabled: anti stuck"));
+    }
+  }
 };

src/RegulatorTask.h

@@ -1,121 +1,190 @@
 #include <Equitherm.h>
 #include <GyverPID.h>
-#include <PIDtuner.h>
 
 Equitherm etRegulator;
 GyverPID pidRegulator(0, 0, 0);
-PIDtuner pidTuner;
 
-class RegulatorTask: public LeanTask {
+
+class RegulatorTask : public LeanTask {
 public:
-  RegulatorTask(bool _enabled = false, unsigned long _interval = 0): LeanTask(_enabled, _interval) {}
+  RegulatorTask(bool _enabled = false, unsigned long _interval = 0) : LeanTask(_enabled, _interval) {}
 
 protected:
-  bool tunerInit = false;
-  byte tunerState = 0;
-  byte tunerRegulator = 0;
-  float prevHeatingTarget = 0;
-  float prevEtResult = 0;
-  float prevPidResult = 0;
+  float prevHeatingTarget = 0.0f;
+  float prevEtResult = 0.0f;
+  float prevPidResult = 0.0f;
 
+  bool indoorSensorsConnected = false;
+  //bool outdoorSensorsConnected = false;
 
-  void setup() {}
+  #if defined(ARDUINO_ARCH_ESP32)
+  const char* getTaskName() override {
+    return "Regulator";
+  }
+  
+  /*BaseType_t getTaskCore() override {
+    return 1;
+  }*/
+
+  int getTaskPriority() override {
+    return 4;
+  }
+  #endif
+  
   void loop() {
-    byte newTemp = vars.parameters.heatingSetpoint;
+    if (vars.states.restarting || vars.states.upgrading) {
+      return;
+    }
 
-    if (vars.states.emergency) {
-      if (settings.heating.turbo) {
+    this->indoorSensorsConnected = Sensors::existsConnectedSensorsByPurpose(Sensors::Purpose::INDOOR_TEMP);
+    //this->outdoorSensorsConnected = Sensors::existsConnectedSensorsByPurpose(Sensors::Purpose::OUTDOOR_TEMP);
+
+    if (settings.equitherm.enabled || settings.pid.enabled || settings.opentherm.options.nativeHeatingControl) {
+      vars.master.heating.indoorTempControl = true;
+      vars.master.heating.minTemp = THERMOSTAT_INDOOR_MIN_TEMP;
+      vars.master.heating.maxTemp = THERMOSTAT_INDOOR_MAX_TEMP;
+
+    } else {
+      vars.master.heating.indoorTempControl = false;
+      vars.master.heating.minTemp = settings.heating.minTemp;
+      vars.master.heating.maxTemp = settings.heating.maxTemp;
+    }
+
+    if (!settings.pid.enabled && fabsf(pidRegulator.integral) > 0.01f) {
+      pidRegulator.integral = 0.0f;
+
+      Log.sinfoln(FPSTR(L_REGULATOR_PID), F("Integral sum has been reset"));
+    }
+
+    this->turbo();
+    this->hysteresis();
+
+    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.setpointTemp,
+      Sensors::ValueType::PRIMARY, true, true
+    );
+  }
+
+  void turbo() {
+    if (settings.heating.turbo) {
+      if (!settings.heating.enabled || vars.emergency.state || !this->indoorSensorsConnected) {
         settings.heating.turbo = false;
 
-        INFO("[REGULATOR] Turbo mode auto disabled");
+      } else if (!settings.pid.enabled && !settings.equitherm.enabled) {
+        settings.heating.turbo = false;
+
+      } else if (fabsf(settings.heating.target - vars.master.heating.indoorTemp) <= 1.0f) {
+        settings.heating.turbo = false;
       }
 
-      newTemp = getEmergencyModeTemp();
-
-    } else {
-      if (vars.tuning.enable || tunerInit) {
-        if (settings.heating.turbo) {
-          settings.heating.turbo = false;
-
-          INFO("[REGULATOR] Turbo mode auto disabled");
-        }
-
-        newTemp = getTuningModeTemp();
-
-        if (newTemp == 0) {
-          vars.tuning.enable = false;
-        }
+      if (!settings.heating.turbo) {
+        Log.sinfoln(FPSTR(L_REGULATOR), F("Turbo mode auto disabled"));
       }
-
-      if (!vars.tuning.enable) {
-        if (settings.heating.turbo && (fabs(settings.heating.target - vars.temperatures.indoor) < 1 || (settings.equitherm.enable && settings.pid.enable))) {
-          settings.heating.turbo = false;
-
-          INFO("[REGULATOR] Turbo mode auto disabled");
-        }
-
-        newTemp = getNormalModeTemp();
-      }
-    }
-
-    // Ограничиваем, если до этого не ограничило
-    if (newTemp < vars.parameters.heatingMinTemp || newTemp > vars.parameters.heatingMaxTemp) {
-      newTemp = constrain(newTemp, vars.parameters.heatingMinTemp, vars.parameters.heatingMaxTemp);
-    }
-
-    if (abs(vars.parameters.heatingSetpoint - newTemp) + 0.0001 >= 1) {
-      vars.parameters.heatingSetpoint = newTemp;
     }
   }
 
+  void hysteresis() {
+    bool useHyst = false;
+    if (settings.heating.hysteresis > 0.01f && this->indoorSensorsConnected) {
+      useHyst = settings.equitherm.enabled || settings.pid.enabled || settings.opentherm.options.nativeHeatingControl;
+    }
 
-  byte getEmergencyModeTemp() {
+    if (useHyst) {
+      if (!vars.master.heating.blocking && vars.master.heating.indoorTemp - settings.heating.target + 0.0001f >= settings.heating.hysteresis) {
+        vars.master.heating.blocking = true;
+
+      } else if (vars.master.heating.blocking && vars.master.heating.indoorTemp - settings.heating.target - 0.0001f <= -(settings.heating.hysteresis)) {
+        vars.master.heating.blocking = false;
+      }
+
+    } else if (vars.master.heating.blocking) {
+      vars.master.heating.blocking = false;
+    }
+  }
+
+  inline float getHeatingMinSetpointTemp() {
+    return settings.opentherm.options.nativeHeatingControl
+      ? vars.master.heating.minTemp
+      : settings.heating.minTemp;
+  }
+
+  inline float getHeatingMaxSetpointTemp() {
+    return settings.opentherm.options.nativeHeatingControl
+      ? vars.master.heating.maxTemp
+      : settings.heating.maxTemp;
+  }
+
+  float getHeatingSetpointTemp() {
     float newTemp = 0;
 
+    if (fabsf(prevHeatingTarget - settings.heating.target) > 0.0001f) {
+      prevHeatingTarget = settings.heating.target;
+      Log.sinfoln(FPSTR(L_REGULATOR), F("New target: %.2f"), settings.heating.target);
+
+      /*if (settings.pid.enabled) {
+        pidRegulator.integral = 0.0f;
+        Log.sinfoln(FPSTR(L_REGULATOR_PID), F("Integral sum has been reset"));
+      }*/
+    }
+
+    if (vars.emergency.state) {
+      return settings.emergency.target;
+
+    } else if (settings.opentherm.options.nativeHeatingControl) {
+      return settings.heating.target;
+
+    } else if (!settings.equitherm.enabled && !settings.pid.enabled) {
+      return settings.heating.target;
+    }
+
     // if use equitherm
-    if (settings.emergency.useEquitherm && settings.sensors.outdoor.type != 1) {
-      float etResult = getEquithermTemp(vars.parameters.heatingMinTemp, vars.parameters.heatingMaxTemp);
+    if (settings.equitherm.enabled) {
+      unsigned short minTemp = settings.heating.minTemp;
+      unsigned short maxTemp = settings.heating.maxTemp;
+      float targetTemp = settings.heating.target;
+      float indoorTemp = vars.master.heating.indoorTemp;
+      float outdoorTemp = vars.master.heating.outdoorTemp;
 
-      if (fabs(prevEtResult - etResult) + 0.0001 >= 0.5) {
-        prevEtResult = etResult;
-        newTemp += etResult;
+      if (settings.system.unitSystem == UnitSystem::IMPERIAL) {
+        minTemp = f2c(minTemp);
+        maxTemp = f2c(maxTemp);
+        targetTemp = f2c(targetTemp);
+        indoorTemp = f2c(indoorTemp);
+        outdoorTemp = f2c(outdoorTemp);
+      }
 
-        INFO_F("[REGULATOR][EQUITHERM] New emergency result: %u (%f) \n", (int)round(etResult), etResult);
+      if (!this->indoorSensorsConnected || settings.pid.enabled) {
+        etRegulator.Kt = 0.0f;
+        etRegulator.indoorTemp = 0.0f;
 
       } else {
-        newTemp += prevEtResult;
+        etRegulator.Kt = settings.heating.turbo ? 0.0f : settings.equitherm.t_factor;
+        etRegulator.indoorTemp = indoorTemp;
       }
 
-    } else {
-      // default temp, manual mode
-      newTemp = settings.emergency.target;
-    }
+      etRegulator.setLimits(minTemp, maxTemp);
+      etRegulator.Kn = settings.equitherm.n_factor;
+      etRegulator.Kk = settings.equitherm.k_factor;
+      etRegulator.targetTemp = targetTemp;
+      etRegulator.outdoorTemp = outdoorTemp;
+      float etResult = etRegulator.getResult();
 
-    return round(newTemp);
-  }
-
-  byte getNormalModeTemp() {
-    float newTemp = 0;
-
-    if (fabs(prevHeatingTarget - settings.heating.target) > 0.0001) {
-      prevHeatingTarget = settings.heating.target;
-      INFO_F("[REGULATOR] New target: %f \n", settings.heating.target);
-
-      if (settings.equitherm.enable && settings.pid.enable) {
-        pidRegulator.integral = 0;
-        INFO_F("[REGULATOR][PID] Integral sum has been reset");
+      if (settings.system.unitSystem == UnitSystem::IMPERIAL) {
+        etResult = c2f(etResult);
       }
-    }
 
-    // if use equitherm
-    if (settings.equitherm.enable) {
-      float etResult = getEquithermTemp(vars.parameters.heatingMinTemp, vars.parameters.heatingMaxTemp);
-
-      if (fabs(prevEtResult - etResult) + 0.0001 >= 0.5) {
+      if (fabsf(prevEtResult - etResult) > 0.09f) {
         prevEtResult = etResult;
         newTemp += etResult;
 
-        INFO_F("[REGULATOR][EQUITHERM] New result: %u (%f) \n", (int)round(etResult), etResult);
+        Log.sinfoln(FPSTR(L_REGULATOR_EQUITHERM), F("New result: %.2f"), etResult);
 
       } else {
         newTemp += prevEtResult;
@@ -123,185 +192,51 @@ protected:
     }
 
     // if use pid
-    if (settings.pid.enable && vars.parameters.heatingEnabled) {
-      float pidResult = getPidTemp(
-        settings.equitherm.enable ? (settings.pid.maxTemp * -1) : settings.pid.minTemp,
-        settings.equitherm.enable ? settings.pid.maxTemp : settings.pid.maxTemp
-      );
+    if (settings.pid.enabled) {
+      //if (vars.parameters.heatingEnabled) {
+      if (settings.heating.enabled && this->indoorSensorsConnected) {
+        pidRegulator.Kp = settings.heating.turbo ? 0.0f : settings.pid.p_factor;
+        pidRegulator.Kd = settings.pid.d_factor;
 
-      if (fabs(prevPidResult - pidResult) + 0.0001 >= 0.5) {
-        prevPidResult = pidResult;
-        newTemp += pidResult;
+        pidRegulator.setLimits(settings.pid.minTemp, settings.pid.maxTemp);
+        pidRegulator.setDt(settings.pid.dt * 1000u);
+        pidRegulator.input = vars.master.heating.indoorTemp;
+        pidRegulator.setpoint = settings.heating.target;
 
-        INFO_F("[REGULATOR][PID] New result: %d (%f) \n", (int)round(pidResult), pidResult);
+        if (fabsf(pidRegulator.Ki - settings.pid.i_factor) >= 0.0001f) {
+          pidRegulator.Ki = settings.pid.i_factor;
+          pidRegulator.integral = 0.0f;
+          pidRegulator.getResultNow();
+
+          Log.sinfoln(FPSTR(L_REGULATOR_PID), F("Integral sum has been reset"));
+        }
+
+        float pidResult = pidRegulator.getResultTimer();
+        if (fabsf(prevPidResult - pidResult) > 0.09f) {
+          prevPidResult = pidResult;
+          newTemp += pidResult;
+
+          Log.sinfoln(FPSTR(L_REGULATOR_PID), F("New result: %.2f"), pidResult);
+          Log.straceln(FPSTR(L_REGULATOR_PID), F("Integral: %.2f"), pidRegulator.integral);
+
+        } else {
+          newTemp += prevPidResult;
+        }
 
       } else {
         newTemp += prevPidResult;
       }
-
-    } else if ( settings.pid.enable && !vars.parameters.heatingEnabled && prevPidResult != 0 ) {
-      newTemp += prevPidResult;
     }
 
-    // default temp, manual mode
-    if (!settings.equitherm.enable && !settings.pid.enable) {
-      newTemp = settings.heating.target;
+    // Turbo mode
+    if (settings.heating.turbo && (settings.equitherm.enabled || settings.pid.enabled)) {
+      newTemp += constrain(
+        settings.heating.target - vars.master.heating.indoorTemp,
+        -3.0f,
+        3.0f
+      ) * settings.heating.turboFactor;
     }
 
-    newTemp = round(newTemp);
-    newTemp = constrain(newTemp, 0, 100);
     return newTemp;
   }
-
-  byte getTuningModeTemp() {
-    if (tunerInit && (!vars.tuning.enable || vars.tuning.regulator != tunerRegulator)) {
-      if (tunerRegulator == 0) {
-        pidTuner.reset();
-      }
-
-      tunerInit = false;
-      tunerRegulator = 0;
-      tunerState = 0;
-      INFO(F("[REGULATOR][TUNING] Stopped"));
-    }
-
-    if (!vars.tuning.enable) {
-      return 0;
-    }
-
-
-    if (vars.tuning.regulator == 0) {
-      // @TODO дописать
-      INFO(F("[REGULATOR][TUNING][EQUITHERM] Not implemented"));
-      return 0;
-
-    } else if (vars.tuning.regulator == 1) {
-      // PID tuner
-      float defaultTemp = settings.equitherm.enable
-        ? getEquithermTemp(vars.parameters.heatingMinTemp, vars.parameters.heatingMaxTemp)
-        : settings.heating.target;
-
-      if (tunerInit && pidTuner.getState() == 3) {
-        INFO(F("[REGULATOR][TUNING][PID] Finished"));
-        pidTuner.debugText(&INFO_STREAM);
-
-        pidTuner.reset();
-        tunerInit = false;
-        tunerRegulator = 0;
-        tunerState = 0;
-
-        if (pidTuner.getAccuracy() < 90) {
-          WARN(F("[REGULATOR][TUNING][PID] Bad result, try again..."));
-
-        } else {
-          settings.pid.p_factor = pidTuner.getPID_p();
-          settings.pid.i_factor = pidTuner.getPID_i();
-          settings.pid.d_factor = pidTuner.getPID_d();
-
-          return 0;
-        }
-      }
-
-      if (!tunerInit) {
-        INFO(F("[REGULATOR][TUNING][PID] Start..."));
-
-        float step;
-        if (vars.temperatures.indoor - vars.temperatures.outdoor > 10) {
-          step = ceil(vars.parameters.heatingSetpoint / vars.temperatures.indoor * 2);
-        } else {
-          step = 5.0f;
-        }
-
-        float startTemp = step;
-        INFO_F("[REGULATOR][TUNING][PID] Started. Start value: %f, step: %f \n", startTemp, step);
-        pidTuner.setParameters(NORMAL, startTemp, step, 20 * 60 * 1000, 0.15, 60 * 1000, 10000);
-        tunerInit = true;
-        tunerRegulator = 1;
-      }
-
-      pidTuner.setInput(vars.temperatures.indoor);
-      pidTuner.compute();
-
-      if (tunerState > 0 && pidTuner.getState() != tunerState) {
-        INFO(F("[REGULATOR][TUNING][PID] Log:"));
-        pidTuner.debugText(&INFO_STREAM);
-        tunerState = pidTuner.getState();
-      }
-
-      return round(defaultTemp + pidTuner.getOutput());
-
-    } else {
-      return 0;
-    }
-  }
-
-  float getEquithermTemp(int minTemp, int maxTemp) {
-    if (vars.states.emergency) {
-      etRegulator.Kt = 0;
-      etRegulator.indoorTemp = 0;
-      etRegulator.outdoorTemp = vars.temperatures.outdoor;
-
-    } else if (settings.pid.enable) {
-      etRegulator.Kt = 0;
-      etRegulator.indoorTemp = round(vars.temperatures.indoor);
-      etRegulator.outdoorTemp = round(vars.temperatures.outdoor);
-
-    } else {
-      if (settings.heating.turbo) {
-        etRegulator.Kt = 10;
-      } else {
-        etRegulator.Kt = settings.equitherm.t_factor;
-      }
-      etRegulator.indoorTemp = vars.temperatures.indoor;
-      etRegulator.outdoorTemp = vars.temperatures.outdoor;
-    }
-
-    etRegulator.setLimits(minTemp, maxTemp);
-    etRegulator.Kn = settings.equitherm.n_factor;
-    // etRegulator.Kn = tuneEquithermN(etRegulator.Kn, vars.temperatures.indoor, settings.heating.target, 300, 1800, 0.01, 1);
-    etRegulator.Kk = settings.equitherm.k_factor;
-    etRegulator.targetTemp = vars.states.emergency ? settings.emergency.target : settings.heating.target;
-
-    return etRegulator.getResult();
-  }
-
-  float getPidTemp(int minTemp, int maxTemp) {
-    pidRegulator.Kp = settings.pid.p_factor;
-    pidRegulator.Ki = settings.pid.i_factor;
-    pidRegulator.Kd = settings.pid.d_factor;
-
-    pidRegulator.setLimits(minTemp, maxTemp);
-    pidRegulator.input = vars.temperatures.indoor;
-    pidRegulator.setpoint = settings.heating.target;
-
-    return pidRegulator.getResultNow();
-  }
-
-  float tuneEquithermN(float ratio, float currentTemp, float setTemp, unsigned int dirtyInterval = 60, unsigned int accurateInterval = 1800, float accurateStep = 0.01, float accurateStepAfter = 1) {
-    static uint32_t _prevIteration = millis();
-
-    if (abs(currentTemp - setTemp) < accurateStepAfter) {
-      if (millis() - _prevIteration < (accurateInterval * 1000)) {
-        return ratio;
-      }
-
-      if (currentTemp - setTemp > 0.1f) {
-        ratio -= accurateStep;
-
-      } else if (currentTemp - setTemp < -0.1f) {
-        ratio += accurateStep;
-      }
-
-    } else {
-      if (millis() - _prevIteration < (dirtyInterval * 1000)) {
-        return ratio;
-      }
-
-      ratio = ratio * (setTemp / currentTemp);
-    }
-
-    _prevIteration = millis();
-    return ratio;
-  }
-
 };

src/Sensors.h

@@ -0,0 +1,464 @@
+#pragma once
+
+class Sensors {
+protected:
+  static uint8_t maxSensors;
+
+public:
+  enum class Type : uint8_t {
+    OT_OUTDOOR_TEMP         = 0,
+    OT_HEATING_TEMP         = 1,
+    OT_HEATING_RETURN_TEMP  = 2,
+    OT_DHW_TEMP             = 3,
+    OT_DHW_TEMP2            = 4,
+    OT_DHW_FLOW_RATE        = 5,
+    OT_CH2_TEMP             = 6,
+    OT_EXHAUST_TEMP         = 7,
+    OT_HEAT_EXCHANGER_TEMP  = 8,
+    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,
+    BLUETOOTH               = 52,
+
+    HEATING_SETPOINT_TEMP   = 253,
+    MANUAL                  = 254,
+    NOT_CONFIGURED          = 255
+  };
+
+  enum class Purpose : uint8_t {
+    OUTDOOR_TEMP          = 0,
+    INDOOR_TEMP           = 1,
+    HEATING_TEMP          = 2,
+    HEATING_RETURN_TEMP   = 3,
+    DHW_TEMP              = 4,
+    DHW_RETURN_TEMP       = 5,
+    DHW_FLOW_RATE         = 6,
+    EXHAUST_TEMP          = 7,
+    MODULATION_LEVEL      = 8,
+
+    POWER_FACTOR          = 248,
+    POWER                 = 249,
+    FAN_SPEED             = 250,
+    CO2                   = 251,
+    PRESSURE              = 252,
+    HUMIDITY              = 253,
+    TEMPERATURE           = 254,
+    NOT_CONFIGURED        = 255
+  };
+
+  enum class ValueType : uint8_t {
+    PRIMARY     = 0,
+    TEMPERATURE = 0,
+    HUMIDITY    = 1,
+    BATTERY     = 2,
+    RSSI        = 3
+  };
+
+  typedef struct {
+    bool enabled = false;
+    char name[33];
+    Purpose purpose = Purpose::NOT_CONFIGURED;
+    Type type = Type::NOT_CONFIGURED;
+    uint8_t gpio = GPIO_IS_NOT_CONFIGURED;
+    uint8_t address[8] = {0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00};
+    float offset = 0.0f;
+    float factor = 1.0f;
+    bool filtering = false;
+    float filteringFactor = 0.15f;
+  } Settings;
+
+  typedef struct {
+    bool connected = false;
+    unsigned long activityTime = 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;
+
+
+  static Settings* settings;
+  static Result* results;
+
+  static inline void setMaxSensors(uint8_t value) {
+    maxSensors = value;
+  }
+
+  static inline uint8_t getMaxSensors() {
+    return maxSensors;
+  }
+
+  static uint8_t getMaxSensorId() {
+    uint8_t maxSensors = getMaxSensors();
+    return maxSensors > 1 ? (maxSensors - 1) : 0;
+  }
+
+  static inline bool isValidSensorId(const uint8_t id) {
+    return id >= 0 && id <= getMaxSensorId();
+  }
+
+  static inline bool isValidValueId(const uint8_t id) {
+    return id >= (uint8_t) ValueType::TEMPERATURE && id <= (uint8_t) ValueType::RSSI;
+  }
+
+  static bool hasEnabledAndValid(const uint8_t id) {
+    if (!isValidSensorId(id) || !settings[id].enabled) {
+      return false;
+    }
+
+    if (settings[id].type == Type::NOT_CONFIGURED || settings[id].purpose == Purpose::NOT_CONFIGURED) {
+      return false;
+    }
+
+    return true;
+  }
+
+  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 && (!onlyEnabled || settings[id].enabled)) {
+        amount++;
+      }
+    }
+
+    return amount;
+  }
+
+  static int16_t getIdByName(const char* name) {
+    if (settings == nullptr) {
+      return 0;
+    }
+
+    for (uint8_t id = 0; id < getMaxSensorId(); id++) {
+      if (strcmp(settings[id].name, name) == 0) {
+        return id;
+      }
+    }
+
+    return -1;
+  }
+
+  static int16_t getIdByObjectId(const char* objectId) {
+    if (settings == nullptr) {
+      return 0;
+    }
+
+    String refObjectId;
+    for (uint8_t id = 0; id < getMaxSensorId(); id++) {
+      Sensors::makeObjectId(refObjectId, settings[id].name);
+      if (refObjectId.equals(objectId)) {
+        return id;
+      }
+    }
+
+    return -1;
+  }
+
+  static bool setValueById(const uint8_t sensorId, float value, const ValueType valueType, const bool updateActivityTime = false, const bool markConnected = false) {
+    if (settings == nullptr || results == nullptr) {
+      return false;
+    }
+
+    uint8_t valueId = (uint8_t) valueType;
+    if (!isValidSensorId(sensorId) || !isValidValueId(valueId)) {
+      return false;
+    }
+
+    auto& sSensor = settings[sensorId];
+    auto& rSensor = results[sensorId];
+    
+    float compensatedValue = value;
+    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 && !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 value %hhu: %.2f, compensated: %.2f, raw: %.2f"),
+      sensorId, sSensor.name, valueId, rSensor.values[valueId], compensatedValue, value
+    );
+
+    return true;
+  }
+
+  static uint8_t setValueByType(Type type, float value, const ValueType valueType, const bool updateActivityTime = false, const bool markConnected = false) {
+    if (settings == nullptr) {
+      return 0;
+    }
+
+    uint8_t updated = 0;
+    
+    // read sensors data for current instance
+    for (uint8_t sensorId = 0; sensorId < getMaxSensorId(); sensorId++) {
+      auto& sSensor = settings[sensorId];
+      
+      // only target & valid sensors
+      if (!sSensor.enabled || sSensor.type != type) {
+        continue;
+      }
+
+      if (setValueById(sensorId, value, valueType, updateActivityTime, markConnected)) {
+        updated++;
+      }
+    }
+
+    return updated;
+  }
+
+  static bool getConnectionStatusById(const uint8_t sensorId) {
+    if (settings == nullptr || results == nullptr) {
+      return false;
+    }
+
+    if (!isValidSensorId(sensorId)) {
+      return false;
+    }
+
+    return results[sensorId].connected;
+  }
+
+  static bool setConnectionStatusById(const uint8_t sensorId, const bool status, const bool updateActivityTime = true) {
+    if (settings == nullptr || results == nullptr) {
+      return false;
+    }
+
+    if (!isValidSensorId(sensorId)) {
+      return false;
+    }
+
+    auto& sSensor = settings[sensorId];
+    auto& rSensor = results[sensorId];
+
+    if (rSensor.connected != status) {
+      Log.snoticeln(
+        FPSTR(L_SENSORS), F("#%hhu '%s' new status: %s"),
+        sensorId, sSensor.name, status ? F("CONNECTED") : F("DISCONNECTED")
+      );
+      
+      rSensor.connected = status;
+    }
+
+    if (updateActivityTime) {
+      rSensor.activityTime = millis();
+    }
+
+    return true;
+  }
+
+  static uint8_t setConnectionStatusByType(Type type, const bool status, const bool updateActivityTime = true) {
+    if (settings == nullptr) {
+      return 0;
+    }
+
+    uint8_t updated = 0;
+    
+    // read sensors data for current instance
+    for (uint8_t sensorId = 0; sensorId < getMaxSensorId(); sensorId++) {
+      auto& sSensor = settings[sensorId];
+      
+      // only target & valid sensors
+      if (!sSensor.enabled || sSensor.type != type) {
+        continue;
+      }
+
+      if (setConnectionStatusById(sensorId, status, updateActivityTime)) {
+        updated++;
+      }
+    }
+
+    return updated;
+  }
+
+  static float getMeanValueByPurpose(Purpose purpose, const ValueType valueType, bool onlyConnected = true) {
+    if (settings == nullptr || results == nullptr) {
+      return 0;
+    }
+
+    uint8_t valueId = (uint8_t) valueType;
+    if (!isValidValueId(valueId)) {
+      return false;
+    }
+    
+    float value = 0.0f;
+    uint8_t amount = 0;
+
+    for (uint8_t id = 0; id < getMaxSensorId(); id++) {
+      auto& sSensor = settings[id];
+      auto& rSensor = results[id];
+
+      if (sSensor.purpose == purpose && (!onlyConnected || rSensor.connected)) {
+        value += rSensor.values[valueId];
+        amount++;
+      }
+    }
+
+    if (!amount) {
+      return 0.0f;
+      
+    } else if (amount == 1) {
+      return value;
+
+    } else {
+      return value / amount;
+    }
+  }
+
+  static bool existsConnectedSensorsByPurpose(Purpose purpose) {
+    if (settings == nullptr || results == nullptr) {
+      return 0;
+    }
+
+    for (uint8_t id = 0; id < getMaxSensorId(); id++) {
+      if (settings[id].purpose == purpose && results[id].connected) {
+        return true;
+      }
+    }
+
+    return false;
+  }
+
+  static String& cleanName(String& value, char space = ' ') {
+    // only valid symbols
+    for (uint8_t pos = 0; pos < value.length(); pos++) {
+      char symbol = value.charAt(pos);
+
+      // 0..9
+      if (symbol >= 48 && symbol <= 57) {
+        continue;
+      }
+
+      // A..Z
+      if (symbol >= 65 && symbol <= 90) {
+        continue;
+      }
+
+      // a..z
+      if (symbol >= 97 && symbol <= 122) {
+        continue;
+      }
+
+      // _-
+      if (symbol == 95 || symbol == 45 || symbol == space) {
+        continue;
+      }
+
+      value.setCharAt(pos, space);
+    }
+
+    value.trim();
+
+    return value;
+  }
+
+  template <class T> 
+  static String cleanName(T value, char space = ' ') {
+    String res = value;
+    return cleanName(res, space);
+  }
+
+  template <class T> 
+  static String& makeObjectId(String& res, T value, char separator = '_') {
+    res = value;
+    cleanName(res);
+    res.toLowerCase();
+    res.replace(' ', separator);
+
+    return res;
+  }
+
+  template <class T> 
+  static String makeObjectId(T value, char separator = '_') {
+    String res;
+    makeObjectId(res, value, separator);
+
+    return res;
+  }
+
+  template <class TV, class TS> 
+  static String& makeObjectIdWithSuffix(String& res, TV value, TS suffix, char separator = '_') {
+    res.clear();
+    makeObjectId(res, value, separator);
+    res += separator;
+    res += suffix;
+
+    return res;
+  }
+
+  template <class TV, class TS> 
+  static String makeObjectIdWithSuffix(TV value, TS suffix, char separator = '_') {
+    String res;
+    makeObjectIdWithSuffix(res, value, suffix, separator);
+    return res;
+  }
+
+  template <class TV, class TP> 
+  static String& makeObjectIdWithPrefix(String& res, TV value, TP prefix, char separator = '_') {
+    res = prefix;
+    res += separator;
+    res += makeObjectId(value, separator).c_str();
+
+    return res;
+  }
+
+  template <class TV, class TP> 
+  static String makeObjectIdWithPrefix(TV value, TP prefix, char separator = '_') {
+    String res;
+    return makeObjectIdWithPrefix(res, value, prefix, separator);
+  }
+
+  static uint8_t bluetoothRssiToQuality(int rssi) {
+    return constrain(map(rssi, -110, -50, 0, 100), 0, 100);;
+  }
+};
+
+uint8_t Sensors::maxSensors = 0;
+Sensors::Settings* Sensors::settings = nullptr;
+Sensors::Result* Sensors::results = nullptr;

src/SensorsTask.h

@@ -1,149 +1,885 @@
+#include <unordered_map>
 #include <OneWire.h>
 #include <DallasTemperature.h>
 
-class SensorsTask: public LeanTask {
+#if USE_BLE
+  #include <NimBLEDevice.h>
+#endif
+
+extern FileData fsSensorsSettings;
+
+class SensorsTask : public LeanTask {
 public:
-  SensorsTask(bool _enabled = false, unsigned long _interval = 0): LeanTask(_enabled, _interval) {}
+  SensorsTask(bool _enabled = false, unsigned long _interval = 0) : LeanTask(_enabled, _interval) {
+    this->owInstances.reserve(2);
+    this->dallasInstances.reserve(2);
+    this->dallasSearchTime.reserve(2);
+    this->dallasPolling.reserve(2);
+    this->dallasLastPollingTime.reserve(2);
+  }
+
+  ~SensorsTask() {
+    this->dallasInstances.clear();
+    this->owInstances.clear();
+    this->dallasSearchTime.clear();
+    this->dallasPolling.clear();
+    this->dallasLastPollingTime.clear();
+  }
 
 protected:
-  OneWire* oneWireOutdoorSensor;
-  OneWire* oneWireIndoorSensor;
+  const unsigned int disconnectedTimeout = 120000;
+  const unsigned short dallasSearchInterval = 60000;
+  const unsigned short dallasPollingInterval = 10000;
+  const unsigned short globalPollingInterval = 15000;
 
-  DallasTemperature* outdoorSensor;
-  DallasTemperature* indoorSensor;
+  std::unordered_map<uint8_t, OneWire> owInstances;
+  std::unordered_map<uint8_t, DallasTemperature> dallasInstances;
+  std::unordered_map<uint8_t, unsigned long> dallasSearchTime;
+  std::unordered_map<uint8_t, bool> dallasPolling;
+  std::unordered_map<uint8_t, unsigned long> dallasLastPollingTime;
+  unsigned long globalLastPollingTime = 0;
 
-  bool initOutdoorSensor = false;
-  unsigned long startConversionTime = 0;
-  float filteredOutdoorTemp = 0;
-  bool emptyOutdoorTemp = true;
+  #if defined(ARDUINO_ARCH_ESP32)
+  const char* getTaskName() override {
+    return "Sensors";
+  }
 
-  bool initIndoorSensor = false;
-  float filteredIndoorTemp = 0;
-  bool emptyIndoorTemp = true;
+  BaseType_t getTaskCore() override {
+    // https://github.com/h2zero/NimBLE-Arduino/issues/676
+    #if USE_BLE && defined(CONFIG_BT_NIMBLE_PINNED_TO_CORE)
+    return CONFIG_BT_NIMBLE_PINNED_TO_CORE;
+    #else
+    return tskNO_AFFINITY;
+    #endif
+  }
 
+  int getTaskPriority() override {
+    return 4;
+  }
+  #endif
 
-  void setup() {}
   void loop() {
-    if ( settings.sensors.outdoor.type == 2 ) {
-      outdoorTemperatureSensor();
+    if (vars.states.restarting || vars.states.upgrading) {
+      return;
     }
 
-    if ( settings.sensors.indoor.type == 2 ) {
-      indoorTemperatureSensor();
+    if (isPollingDallasSensors()) {
+      pollingDallasSensors(false);
+      this->yield();
+    }
+
+    if (millis() - this->globalLastPollingTime > this->globalPollingInterval) {
+      cleanDallasInstances();
+      makeDallasInstances();
+      this->yield();
+
+      searchDallasSensors();
+      fillingAddressesDallasSensors();
+      this->yield();
+
+      pollingDallasSensors();
+      this->yield();
+
+      pollingNtcSensors();
+      this->yield();
+
+      pollingBleSensors();
+      this->yield();
+
+      this->globalLastPollingTime = millis();
+    }
+
+    updateConnectionStatus();
+    updateMasterValues();
+  }
+
+  void updateMasterValues() {
+    vars.master.heating.outdoorTemp = Sensors::getMeanValueByPurpose(Sensors::Purpose::OUTDOOR_TEMP, Sensors::ValueType::PRIMARY);
+    vars.master.heating.indoorTemp = Sensors::getMeanValueByPurpose(Sensors::Purpose::INDOOR_TEMP, Sensors::ValueType::PRIMARY);
+
+    vars.master.heating.currentTemp = Sensors::getMeanValueByPurpose(Sensors::Purpose::HEATING_TEMP, Sensors::ValueType::PRIMARY);
+    vars.master.heating.returnTemp = Sensors::getMeanValueByPurpose(Sensors::Purpose::HEATING_RETURN_TEMP, Sensors::ValueType::PRIMARY);
+
+    vars.master.dhw.currentTemp = Sensors::getMeanValueByPurpose(Sensors::Purpose::DHW_TEMP, Sensors::ValueType::PRIMARY);
+    vars.master.dhw.returnTemp = Sensors::getMeanValueByPurpose(Sensors::Purpose::DHW_RETURN_TEMP, Sensors::ValueType::PRIMARY);
+  }
+
+  void makeDallasInstances() {
+    for (uint8_t sensorId = 0; sensorId <= Sensors::getMaxSensorId(); sensorId++) {
+      auto& sSensor = Sensors::settings[sensorId];
+
+      if (!sSensor.enabled || sSensor.type != Sensors::Type::DALLAS_TEMP || sSensor.purpose == Sensors::Purpose::NOT_CONFIGURED) {
+        continue;
+
+      } else if (this->dallasInstances.count(sSensor.gpio)) {
+        // no need to make instances
+        continue;
+      }
+
+      auto& owInstance = this->owInstances[sSensor.gpio];
+      owInstance.begin(sSensor.gpio);
+      owInstance.reset();
+
+      this->dallasSearchTime[sSensor.gpio] = 0;
+      this->dallasPolling[sSensor.gpio] = false;
+      this->dallasLastPollingTime[sSensor.gpio] = 0;
+
+      auto& instance = this->dallasInstances[sSensor.gpio];
+      instance.setOneWire(&owInstance);
+      instance.setWaitForConversion(false);
+
+      Log.sinfoln(FPSTR(L_SENSORS_DALLAS), F("Started on GPIO %hhu"), sSensor.gpio);
     }
   }
 
-  void outdoorTemperatureSensor() {
-    if ( !initOutdoorSensor ) {
-      oneWireOutdoorSensor = new OneWire(settings.sensors.outdoor.pin);
-      outdoorSensor = new DallasTemperature(oneWireOutdoorSensor);
-      outdoorSensor->begin();
-      outdoorSensor->setResolution(12);
-      outdoorSensor->setWaitForConversion(false);
-      outdoorSensor->requestTemperatures();
-      startConversionTime = millis();
-      initOutdoorSensor = true;
-    }
+  void cleanDallasInstances() {
+    // for (auto& [gpio, instance] : this->dallasInstances) {
+    auto it = this->dallasInstances.begin();
+    while (it != this->dallasInstances.end()) {
+      auto gpio = it->first;
+      bool instanceUsed = false;
 
-    unsigned long estimateConversionTime = millis() - startConversionTime;
-    if ( estimateConversionTime < outdoorSensor->millisToWaitForConversion() ) {
-      return;
-    }
+      for (uint8_t sensorId = 0; sensorId <= Sensors::getMaxSensorId(); sensorId++) {
+        auto& sSensor = Sensors::settings[sensorId];
+        
+        if (!sSensor.enabled || sSensor.type != Sensors::Type::DALLAS_TEMP || sSensor.purpose == Sensors::Purpose::NOT_CONFIGURED) {
+          continue;
+        }
 
-    bool completed = outdoorSensor->isConversionComplete();
-    if ( !completed && estimateConversionTime >= 1000 ) {
-      // fail, retry
-      outdoorSensor->requestTemperatures();
-      startConversionTime = millis();
-
-      ERROR("[SENSORS][OUTDOOR] Could not read temperature data (no response)");
-    }
-
-    if ( !completed ) {
-      return;
-    }
-
-    float rawTemp = outdoorSensor->getTempCByIndex(0);
-    if (rawTemp == DEVICE_DISCONNECTED_C) {
-      ERROR("[SENSORS][OUTDOOR] Could not read temperature data (not connected)");
-
-    } else {
-      DEBUG_F("[SENSORS][OUTDOOR] Raw temp: %f \n", rawTemp);
-
-      if (emptyOutdoorTemp) {
-        filteredOutdoorTemp = rawTemp;
-        emptyOutdoorTemp = false;
-
-      } else {
-        filteredOutdoorTemp += (rawTemp - filteredOutdoorTemp) * EXT_SENSORS_FILTER_K;
+        if (Sensors::settings[sensorId].gpio == gpio) {
+          instanceUsed = true;
+          break;
+        }
       }
 
-      filteredOutdoorTemp = floor(filteredOutdoorTemp * 100) / 100;
+      if (!instanceUsed) {
+        it = this->dallasInstances.erase(it);
+        this->owInstances.erase(gpio);
+        this->dallasSearchTime.erase(gpio);
+        this->dallasPolling.erase(gpio);
+        this->dallasLastPollingTime.erase(gpio);
 
-      if (fabs(vars.temperatures.outdoor - filteredOutdoorTemp) > 0.099) {
-        vars.temperatures.outdoor = filteredOutdoorTemp + settings.sensors.outdoor.offset;
-        INFO_F("[SENSORS][OUTDOOR] New temp: %f \n", filteredOutdoorTemp);
+        Log.sinfoln(FPSTR(L_SENSORS_DALLAS), F("Stopped on GPIO %hhu"), gpio);
+        continue;
       }
-    }
 
-    outdoorSensor->requestTemperatures();
-    startConversionTime = millis();
+      it++;
+    }
   }
 
-  void indoorTemperatureSensor() {
-    if ( !initIndoorSensor ) {
-      oneWireIndoorSensor = new OneWire(settings.sensors.indoor.pin);
-      indoorSensor = new DallasTemperature(oneWireIndoorSensor);
-      indoorSensor->begin();
-      indoorSensor->setResolution(12);
-      indoorSensor->setWaitForConversion(false);
-      indoorSensor->requestTemperatures();
-      startConversionTime = millis();
-      initIndoorSensor = true;
+  void searchDallasSensors() {
+    // search sensors on bus
+    for (auto& [gpio, instance] : this->dallasInstances) {
+      // do not search if polling!
+      if (this->dallasPolling[gpio]) {
+        continue;
+      }
+
+      if (millis() - this->dallasSearchTime[gpio] < this->dallasSearchInterval) {
+        continue;
+      }
+
+      this->dallasSearchTime[gpio] = millis();
+      this->owInstances[gpio].reset();
+      instance.begin();
+
+      Log.straceln(
+        FPSTR(L_SENSORS_DALLAS),
+        F("GPIO %hhu, devices on bus: %hhu, DS18* devices: %hhu"),
+        gpio, instance.getDeviceCount(), instance.getDS18Count()
+      );
+    }
+  }
+
+  void fillingAddressesDallasSensors() {
+    // check & filling sensors address
+    for (uint8_t sensorId = 0; sensorId <= Sensors::getMaxSensorId(); sensorId++) {
+      auto& sSensor = Sensors::settings[sensorId];
+      
+      if (!sSensor.enabled || sSensor.type != Sensors::Type::DALLAS_TEMP || sSensor.purpose == Sensors::Purpose::NOT_CONFIGURED) {
+        continue;
+
+      } else if (!this->dallasInstances.count(sSensor.gpio)) {
+        continue;
+      }
+
+      // do nothing if address not empty
+      if (!isEmptyAddress(sSensor.address)) {
+        continue;
+      }
+
+      // do nothing if polling
+      if (this->dallasPolling[sSensor.gpio]) {
+        continue;
+      }
+
+      auto& instance = this->dallasInstances[sSensor.gpio];
+      DeviceAddress devAddr;
+      for (uint8_t devId = 0; devId < instance.getDeviceCount(); devId++) {
+        if (!instance.getAddress(devAddr, devId)) {
+          continue;
+        }
+
+        bool freeAddress = true;
+
+        // checking address usage
+        for (uint8_t checkingSensorId = 0; checkingSensorId <= Sensors::getMaxSensorId(); checkingSensorId++) {
+          auto& sCheckingSensor = Sensors::settings[checkingSensorId];
+          if (sCheckingSensor.type != Sensors::Type::DALLAS_TEMP || checkingSensorId == sensorId) {
+            continue;
+          }
+          
+          if (sCheckingSensor.gpio != sSensor.gpio || isEmptyAddress(sCheckingSensor.address)) {
+            continue;
+          }
+
+          if (isEqualAddress(sCheckingSensor.address, devAddr)) {
+            freeAddress = false;
+            break;
+          }
+        }
+
+        // address already in use
+        if (!freeAddress) {
+          continue;
+        }
+
+        // set address
+        for (uint8_t i = 0; i < 8; i++) {
+          sSensor.address[i] = devAddr[i];
+        }
+
+        fsSensorsSettings.update();
+        Log.straceln(
+          FPSTR(L_SENSORS_DALLAS), F("GPIO %hhu, sensor #%hhu '%s', set address: %hhX:%hhX:%hhX:%hhX:%hhX:%hhX:%hhX:%hhX"),
+          sSensor.gpio, sensorId, sSensor.name,
+          sSensor.address[0], sSensor.address[1], sSensor.address[2], sSensor.address[3],
+          sSensor.address[4], sSensor.address[5], sSensor.address[6], sSensor.address[7]
+        );
+
+        break;
+      }
+    }
+  }
+
+  bool isPollingDallasSensors() {
+    for (auto& [gpio, instance] : this->dallasInstances) {
+      if (this->dallasPolling.count(gpio) && this->dallasPolling[gpio]) {
+        return true;
+      }
     }
 
-    unsigned long estimateConversionTime = millis() - startConversionTime;
-    if ( estimateConversionTime < indoorSensor->millisToWaitForConversion() ) {
-      return;
+    return false;
+  }
+
+  void pollingDallasSensors(bool newPolling = true) {
+    for (auto& [gpio, instance] : this->dallasInstances) {
+      unsigned long ts = millis();
+
+      if (this->dallasPolling[gpio]) {
+        auto minPollingTime = instance.millisToWaitForConversion(12) * 2;
+        unsigned long estimatePollingTime = ts - this->dallasLastPollingTime[gpio];
+
+        // check conversion time
+        // isConversionComplete does not work with chinese clones!
+        if (estimatePollingTime < minPollingTime) {
+          continue;
+        }
+
+        // read sensors data for current instance
+        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];
+          float value = instance.getTempC(sSensor.address);
+          if (value == DEVICE_DISCONNECTED_C) {
+            Log.swarningln(
+              FPSTR(L_SENSORS_DALLAS), F("GPIO %hhu, sensor #%hhu '%s': failed receiving data"),
+              sSensor.gpio, sensorId, sSensor.name
+            );
+
+            if (rSensor.signalQuality > 0) {
+              rSensor.signalQuality--;
+            }
+
+            continue;
+          }
+
+          Log.straceln(
+            FPSTR(L_SENSORS_DALLAS), F("GPIO %hhu, sensor #%hhu '%s', received data: %.2f"),
+            sSensor.gpio, sensorId, sSensor.name, value
+          );
+
+          if (rSensor.signalQuality < 100) {
+            rSensor.signalQuality++;
+          }
+
+          // set sensor value
+          Sensors::setValueById(sensorId, value, Sensors::ValueType::TEMPERATURE, true, true);
+        }
+
+        // reset polling flag
+        this->dallasPolling[gpio] = false;
+
+      } else if (newPolling) {
+        auto estimateLastPollingTime = ts - this->dallasLastPollingTime[gpio];
+
+        // check last polling time
+        if (estimateLastPollingTime < this->dallasPollingInterval) {
+          continue;
+        }
+
+        // start polling
+        instance.setResolution(12);
+        instance.requestTemperatures();
+        this->dallasPolling[gpio] = true;
+        this->dallasLastPollingTime[gpio] = ts;
+
+        Log.straceln(FPSTR(L_SENSORS_DALLAS), F("GPIO %hhu, polling..."), gpio);
+      }
+    }
+  }
+
+  void pollingBleSensors() {
+    #if USE_BLE
+    if (!NimBLEDevice::isInitialized() && millis() > 5000) {
+      Log.sinfoln(FPSTR(L_SENSORS_BLE), F("Initialized"));
+      BLEDevice::init("");
+      NimBLEDevice::setPower(9);
     }
 
-    bool completed = indoorSensor->isConversionComplete();
-    if ( !completed && estimateConversionTime >= 1000 ) {
-      // fail, retry
-      indoorSensor->requestTemperatures();
-      startConversionTime = millis();
+    for (uint8_t sensorId = 0; sensorId <= Sensors::getMaxSensorId(); sensorId++) {
+      auto& sSensor = Sensors::settings[sensorId];
+      
+      if (!sSensor.enabled || sSensor.type != Sensors::Type::BLUETOOTH || sSensor.purpose == Sensors::Purpose::NOT_CONFIGURED) {
+        continue;
+      }
 
-      ERROR("[SENSORS][INDOOR] Could not read temperature data (no response)");
+      connectToBleDevice(sensorId);
+    }
+    #endif
+  }
+
+  void pollingNtcSensors() {
+    for (uint8_t sensorId = 0; sensorId <= Sensors::getMaxSensorId(); sensorId++) {
+      auto& sSensor = Sensors::settings[sensorId];
+      
+      if (!sSensor.enabled || sSensor.type != Sensors::Type::NTC_10K_TEMP || sSensor.purpose == Sensors::Purpose::NOT_CONFIGURED) {
+        continue;
+      }
+
+      #ifdef ARDUINO_ARCH_ESP32
+      const auto value = analogReadMilliVolts(sSensor.gpio);
+      #else
+      const auto value = analogRead(sSensor.gpio) / 1023 * DEFAULT_NTC_VREF;
+      #endif
+
+      if (value < DEFAULT_NTC_VLOW_TRESHOLD || value > DEFAULT_NTC_VHIGH_TRESHOLD) {
+        if (Sensors::getConnectionStatusById(sensorId)) {
+          Sensors::setConnectionStatusById(sensorId, false, false);
+        }
+
+        Log.swarningln(
+          FPSTR(L_SENSORS_NTC), F("GPIO %hhu, sensor #%hhu '%s', voltage is out of threshold: %.3f"),
+          sSensor.gpio, sensorId, sSensor.name, (value / 1000.0f)
+        );
+
+        continue;
+      }
+
+      const float sensorResistance = value > 0.001f
+        ? DEFAULT_NTC_REF_RESISTANCE / (DEFAULT_NTC_VREF / (float) value - 1.0f)
+        : 0.0f;
+      const float rawTemp = 1.0f / (
+        1.0f / (DEFAULT_NTC_NOMINAL_TEMP + 273.15f) +
+        log(sensorResistance / DEFAULT_NTC_NOMINAL_RESISTANCE) / DEFAULT_NTC_BETA_FACTOR
+      ) - 273.15f;
+
+      Log.straceln(
+        FPSTR(L_SENSORS_NTC), F("GPIO %hhu, sensor #%hhu '%s', raw temp: %.2f, raw voltage: %.3f, raw resistance: %.2f"),
+        sSensor.gpio, sensorId, sSensor.name, rawTemp, (value / 1000.0f), sensorResistance
+      );
+
+      // set temp
+      Sensors::setValueById(sensorId, rawTemp, Sensors::ValueType::TEMPERATURE, true, true);
+    }
+  }
+
+  bool connectToBleDevice(const uint8_t sensorId) {
+    #if USE_BLE
+    if (!NimBLEDevice::isInitialized()) {
+      return false;
     }
 
-    if ( !completed ) {
-      return;
+    auto& sSensor = Sensors::settings[sensorId];
+    auto& rSensor = Sensors::results[sensorId];
+
+    if (!sSensor.enabled || sSensor.type != Sensors::Type::BLUETOOTH || sSensor.purpose == Sensors::Purpose::NOT_CONFIGURED) {
+      return false;
+    }
+    
+    uint8_t addr[6] = {
+      sSensor.address[0], sSensor.address[1], sSensor.address[2],
+      sSensor.address[3], sSensor.address[4], sSensor.address[5]
+    };
+    const auto address = NimBLEAddress(addr, 0);
+    
+    NimBLEClient* pClient = nullptr;
+    pClient = NimBLEDevice::getClientByPeerAddress(address);
+
+    if (pClient == nullptr) {
+      pClient = NimBLEDevice::getDisconnectedClient();
     }
 
-    float rawTemp = indoorSensor->getTempCByIndex(0);
-    if (rawTemp == DEVICE_DISCONNECTED_C) {
-      ERROR("[SENSORS][INDOOR] Could not read temperature data (not connected)");
+    if (pClient == nullptr) {
+      if (NimBLEDevice::getCreatedClientCount() >= NIMBLE_MAX_CONNECTIONS) {
+        return false;
+      }
+
+      pClient = NimBLEDevice::createClient();
+      pClient->setConnectTimeout(5000);
+      pClient->setSelfDelete(false, true);
+    }
+
+    if(pClient->isConnected()) {
+      if (!rSensor.connected) {
+        rSensor.connected = true;
+      }
+
+      return true;
+    }
+
+    if (!pClient->connect(address)) {
+      Log.swarningln(
+        FPSTR(L_SENSORS_BLE), F("Sensor #%hhu '%s': failed connecting to %s"),
+        sensorId, sSensor.name, address.toString().c_str()
+      );
+
+      return false;
+    }
+
+    Log.sinfoln(
+      FPSTR(L_SENSORS_BLE), F("Sensor #%hhu '%s': connected to %s"),
+      sensorId, sSensor.name, address.toString().c_str()
+    );
+
+    NimBLERemoteService* pService = nullptr;
+    NimBLERemoteCharacteristic* pChar = nullptr;
+
+    // ENV Service (0x181A)
+    NimBLEUUID serviceUuid((uint16_t) 0x181AU);
+    pService = pClient->getService(serviceUuid);
+    if (!pService) {
+      Log.straceln(
+        FPSTR(L_SENSORS_BLE), F("Sensor #%hhu '%s': failed to find env service (%s) on device %s"),
+        sensorId, sSensor.name, serviceUuid.toString().c_str(), address.toString().c_str()
+      );
 
     } else {
-      DEBUG_F("[SENSORS][INDOOR] Raw temp: %f \n", rawTemp);
+      Log.straceln(
+        FPSTR(L_SENSORS_BLE), F("Sensor #%hhu '%s': found env service (%s) on device %s"),
+        sensorId, sSensor.name, serviceUuid.toString().c_str(), address.toString().c_str()
+      );
 
-      if (emptyIndoorTemp) {
-        filteredIndoorTemp = rawTemp;
-        emptyIndoorTemp = false;
+      // 0x2A6E - Notify temperature x0.01C (pvvx)
+      bool tempNotifyCreated = false;
+      if (!tempNotifyCreated) {
+        NimBLEUUID charUuid((uint16_t) 0x2A6E);
+        pChar = pService->getCharacteristic(charUuid);
 
-      } else {
-        filteredIndoorTemp += (rawTemp - filteredIndoorTemp) * EXT_SENSORS_FILTER_K;
+        if (pChar && pChar->canNotify()) {
+          Log.straceln(
+            FPSTR(L_SENSORS_BLE), F("Sensor #%hhu '%s': found temp char (%s) in env service on device %s"),
+            sensorId, sSensor.name, charUuid.toString().c_str(), address.toString().c_str()
+          );
+
+          tempNotifyCreated = pChar->subscribe(true, [sensorId](NimBLERemoteCharacteristic* pChar, uint8_t* pData, size_t length, bool isNotify) {
+            if (pChar == nullptr) {
+              return;
+            }
+
+            const NimBLERemoteService* pService = pChar->getRemoteService();
+            if (pService == nullptr) {
+              return;
+            }
+
+            NimBLEClient* pClient = pService->getClient();
+            if (pClient == nullptr) {
+              return;
+            }
+
+            auto& sSensor = Sensors::settings[sensorId];
+
+            if (length != 2) {
+              Log.swarningln(
+                FPSTR(L_SENSORS_BLE),
+                F("Sensor #%hhu '%s': invalid notification data at temp char (%s) on device %s"),
+                sensorId,
+                sSensor.name,
+                pChar->getUUID().toString().c_str(),
+                pClient->getPeerAddress().toString().c_str()
+              );
+
+              return;
+            }
+
+            float rawTemp = (pChar->getValue<int16_t>() * 0.01f);
+            Log.straceln(
+              FPSTR(L_SENSORS_BLE),
+              F("Sensor #%hhu '%s': received temp: %.2f"),
+              sensorId, sSensor.name, rawTemp
+            );
+
+            // set temp
+            Sensors::setValueById(sensorId, rawTemp, Sensors::ValueType::TEMPERATURE, true, true);
+
+            // update rssi
+            Sensors::setValueById(sensorId, pClient->getRssi(), Sensors::ValueType::RSSI, false, false);
+          });
+
+          if (tempNotifyCreated) {
+            Log.straceln(
+              FPSTR(L_SENSORS_BLE), F("Sensor #%hhu '%s': subscribed to temp char (%s) in env service on device %s"),
+              sensorId, sSensor.name,
+              charUuid.toString().c_str(), address.toString().c_str()
+            );
+
+          } else {
+            Log.swarningln(
+              FPSTR(L_SENSORS_BLE), F("Sensor #%hhu '%s': failed to subscribe to temp char (%s) in env service on device %s"),
+              sensorId, sSensor.name,
+              charUuid.toString().c_str(), address.toString().c_str()
+            );
+          }
+        }
       }
 
-      filteredIndoorTemp = floor(filteredIndoorTemp * 100) / 100;
 
-      if (fabs(vars.temperatures.indoor - filteredIndoorTemp) > 0.099) {
-        vars.temperatures.indoor = filteredIndoorTemp + settings.sensors.indoor.offset;
-        INFO_F("[SENSORS][INDOOR] New temp: %f \n", filteredIndoorTemp);
+      // 0x2A1F - Notify temperature x0.1C (atc1441/pvvx)
+      if (!tempNotifyCreated) {
+        NimBLEUUID charUuid((uint16_t) 0x2A1F);
+        pChar = pService->getCharacteristic(charUuid);
+
+        if (pChar && pChar->canNotify()) {
+          Log.straceln(
+            FPSTR(L_SENSORS_BLE), F("Sensor #%hhu '%s': found temp char (%s) in env service on device %s"),
+            sensorId, sSensor.name, charUuid.toString().c_str(), address.toString().c_str()
+          );
+
+          tempNotifyCreated = pChar->subscribe(true, [sensorId](NimBLERemoteCharacteristic* pChar, uint8_t* pData, size_t length, bool isNotify) {
+            if (pChar == nullptr) {
+              return;
+            }
+
+            const NimBLERemoteService* pService = pChar->getRemoteService();
+            if (pService == nullptr) {
+              return;
+            }
+
+            NimBLEClient* pClient = pService->getClient();
+            if (pClient == nullptr) {
+              return;
+            }
+
+            auto& sSensor = Sensors::settings[sensorId];
+
+            if (length != 2) {
+              Log.swarningln(
+                FPSTR(L_SENSORS_BLE),
+                F("Sensor #%hhu '%s': invalid notification data at temp char (%s) on device %s"),
+                sensorId,
+                sSensor.name,
+                pChar->getUUID().toString().c_str(),
+                pClient->getPeerAddress().toString().c_str()
+              );
+
+              return;
+            }
+
+            float rawTemp = (pChar->getValue<int16_t>() * 0.1f);
+            Log.straceln(
+              FPSTR(L_SENSORS_BLE),
+              F("Sensor #%hhu '%s': received temp: %.2f"),
+              sensorId, sSensor.name, rawTemp
+            );
+
+            // set temp
+            Sensors::setValueById(sensorId, rawTemp, Sensors::ValueType::TEMPERATURE, true, true);
+
+            // update rssi
+            Sensors::setValueById(sensorId, pClient->getRssi(), Sensors::ValueType::RSSI, false, false);
+          });
+
+          if (tempNotifyCreated) {
+            Log.straceln(
+              FPSTR(L_SENSORS_BLE), F("Sensor #%hhu '%s': subscribed to temp char (%s) in env service on device %s"),
+              sensorId, sSensor.name,
+              charUuid.toString().c_str(), address.toString().c_str()
+            );
+
+          } else {
+            Log.swarningln(
+              FPSTR(L_SENSORS_BLE), F("Sensor #%hhu '%s': failed to subscribe to temp char (%s) in env service on device %s"),
+              sensorId, sSensor.name,
+              charUuid.toString().c_str(), address.toString().c_str()
+            );
+          }
+        }
+      }
+
+      if (!tempNotifyCreated) {
+        Log.swarningln(
+          FPSTR(L_SENSORS_BLE), F("Sensor #%hhu '%s': not found supported temp chars in env service on device %s"),
+          sensorId, sSensor.name, address.toString().c_str()
+        );
+
+        pClient->disconnect();
+        return false;
+      }
+
+
+      // 0x2A6F - Notify about humidity x0.01% (pvvx)
+      {
+        bool humidityNotifyCreated = false;
+        if (!humidityNotifyCreated) {
+          NimBLEUUID charUuid((uint16_t) 0x2A6F);
+          pChar = pService->getCharacteristic(charUuid);
+
+          if (pChar && pChar->canNotify()) {
+            Log.straceln(
+              FPSTR(L_SENSORS_BLE), F("Sensor #%hhu '%s': found humidity char (%s) in env service on device %s"),
+              sensorId, sSensor.name, charUuid.toString().c_str(), address.toString().c_str()
+            );
+
+            humidityNotifyCreated = pChar->subscribe(true, [sensorId](NimBLERemoteCharacteristic* pChar, uint8_t* pData, size_t length, bool isNotify) {
+              if (pChar == nullptr) {
+                return;
+              }
+
+              const NimBLERemoteService* pService = pChar->getRemoteService();
+              if (pService == nullptr) {
+                return;
+              }
+
+              NimBLEClient* pClient = pService->getClient();
+              if (pClient == nullptr) {
+                return;
+              }
+
+              auto& sSensor = Sensors::settings[sensorId];
+
+              if (length != 2) {
+                Log.swarningln(
+                  FPSTR(L_SENSORS_BLE),
+                  F("Sensor #%hhu '%s': invalid notification data at humidity char (%s) on device %s"),
+                  sensorId,
+                  sSensor.name,
+                  pChar->getUUID().toString().c_str(),
+                  pClient->getPeerAddress().toString().c_str()
+                );
+
+                return;
+              }
+
+              float rawHumidity = (pChar->getValue<uint16_t>() * 0.01f);
+              Log.straceln(
+                FPSTR(L_SENSORS_BLE),
+                F("Sensor #%hhu '%s': received humidity: %.2f"),
+                sensorId, sSensor.name, rawHumidity
+              );
+
+              // set humidity
+              Sensors::setValueById(sensorId, rawHumidity, Sensors::ValueType::HUMIDITY, true, true);
+
+              // update rssi
+              Sensors::setValueById(sensorId, pClient->getRssi(), Sensors::ValueType::RSSI, false, false);
+            });
+
+            if (humidityNotifyCreated) {
+              Log.straceln(
+                FPSTR(L_SENSORS_BLE), F("Sensor #%hhu '%s': subscribed to humidity char (%s) in env service on device %s"),
+                sensorId, sSensor.name,
+                charUuid.toString().c_str(), address.toString().c_str()
+              );
+
+            } else {
+              Log.swarningln(
+                FPSTR(L_SENSORS_BLE), F("Sensor #%hhu '%s': failed to subscribe to humidity char (%s) in env service on device %s"),
+                sensorId, sSensor.name,
+                charUuid.toString().c_str(), address.toString().c_str()
+              );
+            }
+          }
+        }
+
+        if (!humidityNotifyCreated) {
+          Log.swarningln(
+            FPSTR(L_SENSORS_BLE), F("Sensor #%hhu '%s': not found supported humidity chars in env service on device %s"),
+            sensorId, sSensor.name, address.toString().c_str()
+          );
+        }
       }
     }
 
-    indoorSensor->requestTemperatures();
-    startConversionTime = millis();
+
+    // Battery Service (0x180F)
+    {
+      NimBLEUUID serviceUuid((uint16_t) 0x180F);
+      pService = pClient->getService(serviceUuid);
+      if (!pService) {
+        Log.straceln(
+          FPSTR(L_SENSORS_BLE), F("Sensor #%hhu '%s': failed to find battery service (%s) on device %s"),
+          sensorId, sSensor.name, serviceUuid.toString().c_str(), address.toString().c_str()
+        );
+
+      } else {
+        Log.straceln(
+          FPSTR(L_SENSORS_BLE), F("Sensor #%hhu '%s': found battery service (%s) on device %s"),
+          sensorId, sSensor.name, serviceUuid.toString().c_str(), address.toString().c_str()
+        );
+
+        // 0x2A19 - Notify the battery charge level 0..99% (pvvx)
+        bool batteryNotifyCreated = false;
+        if (!batteryNotifyCreated) {
+          NimBLEUUID charUuid((uint16_t) 0x2A19);
+          pChar = pService->getCharacteristic(charUuid);
+
+          if (pChar && pChar->canNotify()) {
+            Log.straceln(
+              FPSTR(L_SENSORS_BLE), F("Sensor #%hhu '%s': found battery char (%s) in battery service on device %s"),
+              sensorId, sSensor.name, charUuid.toString().c_str(), address.toString().c_str()
+            );
+
+            batteryNotifyCreated = pChar->subscribe(true, [sensorId](NimBLERemoteCharacteristic* pChar, uint8_t* pData, size_t length, bool isNotify) {
+              if (pChar == nullptr) {
+                return;
+              }
+
+              const NimBLERemoteService* pService = pChar->getRemoteService();
+              if (pService == nullptr) {
+                return;
+              }
+
+              NimBLEClient* pClient = pService->getClient();
+              if (pClient == nullptr) {
+                return;
+              }
+
+              auto& sSensor = Sensors::settings[sensorId];
+
+              if (length != 1) {
+                Log.swarningln(
+                  FPSTR(L_SENSORS_BLE),
+                  F("Sensor #%hhu '%s': invalid notification data at battery char (%s) on device %s"),
+                  sensorId,
+                  sSensor.name,
+                  pChar->getUUID().toString().c_str(),
+                  pClient->getPeerAddress().toString().c_str()
+                );
+
+                return;
+              }
+
+              auto rawBattery = pChar->getValue<uint8_t>();
+              Log.straceln(
+                FPSTR(L_SENSORS_BLE),
+                F("Sensor #%hhu '%s': received battery: %.2f"),
+                sensorId, sSensor.name, rawBattery
+              );
+
+              // set battery
+              Sensors::setValueById(sensorId, rawBattery, Sensors::ValueType::BATTERY, true, true);
+              
+              // update rssi
+              Sensors::setValueById(sensorId, pClient->getRssi(), Sensors::ValueType::RSSI, false, false);
+            });
+
+            if (batteryNotifyCreated) {
+              Log.straceln(
+                FPSTR(L_SENSORS_BLE), F("Sensor #%hhu '%s': subscribed to battery char (%s) in battery service on device %s"),
+                sensorId, sSensor.name,
+                charUuid.toString().c_str(), address.toString().c_str()
+              );
+
+            } else {
+              Log.swarningln(
+                FPSTR(L_SENSORS_BLE), F("Sensor #%hhu '%s': failed to subscribe to battery char (%s) in battery service on device %s"),
+                sensorId, sSensor.name,
+                charUuid.toString().c_str(), address.toString().c_str()
+              );
+            }
+          }
+        }
+
+        if (!batteryNotifyCreated) {
+          Log.swarningln(
+            FPSTR(L_SENSORS_BLE), F("Sensor #%hhu '%s': not found supported battery chars in battery service on device %s"),
+            sensorId, sSensor.name, address.toString().c_str()
+          );
+        }
+      }
+    }
+
+    return true;
+    #else
+    return false;
+    #endif
+  }
+
+  void updateConnectionStatus() {
+    for (uint8_t sensorId = 0; sensorId <= Sensors::getMaxSensorId(); sensorId++) {
+      auto& sSensor = Sensors::settings[sensorId];
+      auto& rSensor = Sensors::results[sensorId];
+
+      if (rSensor.connected && !sSensor.enabled) {
+        rSensor.connected = false;
+
+      } else if (rSensor.connected && sSensor.type == Sensors::Type::NOT_CONFIGURED) {
+        rSensor.connected = false;
+
+      } else if (rSensor.connected && sSensor.purpose == Sensors::Purpose::NOT_CONFIGURED) {
+        rSensor.connected = false;
+
+      } else if (sSensor.type != Sensors::Type::MANUAL && rSensor.connected && (millis() - rSensor.activityTime) > this->disconnectedTimeout) {
+        rSensor.connected = false;
+
+      }/* else if (!rSensor.connected) {
+        rSensor.connected = true;
+      }*/
+    }
+  }
+
+  static bool isEqualAddress(const uint8_t *addr1, const uint8_t *addr2, const uint8_t length = 8) {
+    bool result = true;
+
+    for (uint8_t i = 0; i < length; i++) {
+      if (addr1[i] != addr2[i]) {
+        result = false;
+        break;
+      }
+    }
+
+    return result;
+  }
+
+  static bool isEmptyAddress(const uint8_t *addr, const uint8_t length = 8) {
+    bool result = true;
+
+    for (uint8_t i = 0; i < length; i++) {
+      if (addr[i] != 0) {
+        result = false;
+        break;
+      }
+    }
+
+    return result;
   }
 };

src/Settings.h

@@ -1,121 +1,380 @@
-struct Settings {
-  bool debug = false;
-  char hostname[80] = "opentherm";
+struct NetworkSettings {
+  char hostname[25] = DEFAULT_HOSTNAME;
+  bool useDhcp = true;
 
   struct {
-    byte inPin = 4;
-    byte outPin = 5;
-    unsigned int memberIdCode = 0;
-    bool dhwPresent = true;
+    char ip[16] = "192.168.0.100";
+    char gateway[16] = "192.168.0.1";
+    char subnet[16] = "255.255.255.0";
+    char dns[16] = "192.168.0.1";
+  } staticConfig;
+
+  struct {
+    char ssid[33] = DEFAULT_AP_SSID;
+    char password[65] = DEFAULT_AP_PASSWORD;
+    byte channel = 6;
+  } ap;
+
+  struct {
+    char ssid[33] = DEFAULT_STA_SSID;
+    char password[65] = DEFAULT_STA_PASSWORD;
+    byte channel = 0;
+  } sta;
+} networkSettings;
+
+struct Settings {
+  struct {
+    uint8_t logLevel = DEFAULT_LOG_LEVEL;
+
+    struct {
+      bool enabled = DEFAULT_SERIAL_ENABLED;
+      unsigned int baudrate = DEFAULT_SERIAL_BAUD;
+    } serial;
+
+    struct {
+      bool enabled = DEFAULT_TELNET_ENABLED;
+      unsigned short port = DEFAULT_TELNET_PORT;
+    } telnet;
+
+    UnitSystem unitSystem = UnitSystem::METRIC;
+    byte statusLedGpio = DEFAULT_STATUS_LED_GPIO;
+  } system;
+
+  struct {
+    bool auth = false;
+    char login[13] = DEFAULT_PORTAL_LOGIN;
+    char password[33] = DEFAULT_PORTAL_PASSWORD;
+  } portal;
+
+  struct {
+    UnitSystem unitSystem = UnitSystem::METRIC;
+    byte inGpio = DEFAULT_OT_IN_GPIO;
+    byte outGpio = DEFAULT_OT_OUT_GPIO;
+    byte rxLedGpio = DEFAULT_OT_RX_LED_GPIO;
+    uint8_t memberId = 0;
+    uint8_t flags = 0;
+    uint8_t maxModulation = 100;
+    float minPower = 0.0f;
+    float maxPower = 0.0f;
+
+    struct {
+      bool dhwSupport = true;
+      bool coolingSupport = false;
+      bool summerWinterMode = false;
+      bool heatingStateToSummerWinterMode = false;
+      bool ch2AlwaysEnabled = true;
+      bool heatingToCh2 = false;
+      bool dhwToCh2 = false;
+      bool dhwBlocking = false;
+      bool modulationSyncWithHeating = false;
+      bool maxTempSyncWithTargetTemp = true;
+      bool getMinMaxTemp = true;
+      bool nativeHeatingControl = false;
+      bool immergasFix = false;
+    } options;
   } opentherm;
 
   struct {
-    char server[80];
-    int port = 1883;
-    char user[32];
-    char password[32];
-    char prefix[80] = "opentherm";
-    unsigned int interval = 5000;
+    bool enabled = DEFAULT_MQTT_ENABLED;
+    char server[81] = DEFAULT_MQTT_SERVER;
+    unsigned short port = DEFAULT_MQTT_PORT;
+    char user[33] = DEFAULT_MQTT_USER;
+    char password[33] = DEFAULT_MQTT_PASSWORD;
+    char prefix[33] = DEFAULT_MQTT_PREFIX;
+    unsigned short interval = 5;
+    bool homeAssistantDiscovery = true;
   } mqtt;
 
   struct {
-    bool enable = true;
-    float target = 40.0f;
-    bool useEquitherm = false;
+    float target = DEFAULT_HEATING_TARGET_TEMP;
+    unsigned short tresholdTime = 120;
   } emergency;
 
   struct {
-    bool enable = true;
+    bool enabled = true;
     bool turbo = false;
-    float target = 40.0f;
+    float target = DEFAULT_HEATING_TARGET_TEMP;
     float hysteresis = 0.5f;
-    byte minTemp = 20.0f;
-    byte maxTemp = 90.0f;
+    float turboFactor = 7.5f;
+    byte minTemp = DEFAULT_HEATING_MIN_TEMP;
+    byte maxTemp = DEFAULT_HEATING_MAX_TEMP;
   } heating;
 
   struct {
-    bool enable = true;
-    byte target = 40;
-    byte minTemp = 30.0f;
-    byte maxTemp = 60.0f;
+    bool enabled = true;
+    float target = DEFAULT_DHW_TARGET_TEMP;
+    byte minTemp = DEFAULT_DHW_MIN_TEMP;
+    byte maxTemp = DEFAULT_DHW_MAX_TEMP;
   } dhw;
 
   struct {
-    bool enable = false;
-    float p_factor = 3;
-    float i_factor = 0.2f;
-    float d_factor = 0;
-    byte minTemp = 0.0f;
-    byte maxTemp = 90.0f;
+    bool enabled = false;
+    float p_factor = 2.0f;
+    float i_factor = 0.0055f;
+    float d_factor = 0.0f;
+    unsigned short dt = 180;
+    short minTemp = 0;
+    short maxTemp = DEFAULT_HEATING_MAX_TEMP;
   } pid;
 
   struct {
-    bool enable = false;
+    bool enabled = false;
     float n_factor = 0.7f;
     float k_factor = 3.0f;
     float t_factor = 2.0f;
   } equitherm;
 
+  struct {
+    bool use = false;
+    byte gpio = DEFAULT_EXT_PUMP_GPIO;
+    unsigned short postCirculationTime = 600;
+    unsigned int antiStuckInterval = 2592000;
+    unsigned short antiStuckTime = 300;
+  } externalPump;
+
   struct {
     struct {
-      // 0 - boiler, 1 - manual, 2 - ds18b20
-      byte type = 0;
-      byte pin = 12;
-      float offset = 0.0f;
-    } outdoor;
+      bool enabled = false;
+      byte gpio = GPIO_IS_NOT_CONFIGURED;
+      byte invertState = false;
+      unsigned short thresholdTime = 60;
+    } input;
 
     struct {
-      // 1 - manual, 2 - ds18b20
-      byte type = 1;
-      byte pin = 14;
-      float offset = 0.0f;
-    } indoor;
-  } sensors;
+      bool enabled = false;
+      byte gpio = GPIO_IS_NOT_CONFIGURED;
+      byte invertState = false;
+      unsigned short thresholdTime = 60;
+      bool onFault = true;
+      bool onLossConnection = true;
+      bool onEnabledHeating = false;
+    } output;
+  } cascadeControl;
 
   char validationValue[8] = SETTINGS_VALID_VALUE;
 } settings;
 
+Sensors::Settings sensorsSettings[SENSORS_AMOUNT] = {
+  {
+    false,
+    "Outdoor temp",
+    Sensors::Purpose::OUTDOOR_TEMP,
+    Sensors::Type::OT_OUTDOOR_TEMP,
+    DEFAULT_SENSOR_OUTDOOR_GPIO
+  },
+  {
+    false,
+    "Indoor temp",
+    Sensors::Purpose::INDOOR_TEMP,
+    Sensors::Type::DALLAS_TEMP,
+    DEFAULT_SENSOR_INDOOR_GPIO
+  },
+  {
+    true,
+    "Heating temp",
+    Sensors::Purpose::HEATING_TEMP,
+    Sensors::Type::OT_HEATING_TEMP,
+  },
+  {
+    true,
+    "Heating return temp",
+    Sensors::Purpose::HEATING_RETURN_TEMP,
+    Sensors::Type::OT_HEATING_RETURN_TEMP,
+  },
+  {
+    true,
+    "Heating setpoint temp",
+    Sensors::Purpose::TEMPERATURE,
+    Sensors::Type::HEATING_SETPOINT_TEMP,
+  },
+  {
+    true,
+    "DHW temp",
+    Sensors::Purpose::DHW_TEMP,
+    Sensors::Type::OT_DHW_TEMP,
+  },
+  {
+    true,
+    "DHW flow rate",
+    Sensors::Purpose::DHW_FLOW_RATE,
+    Sensors::Type::OT_DHW_FLOW_RATE,
+  },
+  {
+    true,
+    "Exhaust temp",
+    Sensors::Purpose::EXHAUST_TEMP,
+    Sensors::Type::OT_EXHAUST_TEMP,
+  },
+  {
+    true,
+    "Pressure",
+    Sensors::Purpose::PRESSURE,
+    Sensors::Type::OT_PRESSURE,
+  },
+  {
+    true,
+    "Modulation level",
+    Sensors::Purpose::MODULATION_LEVEL,
+    Sensors::Type::OT_MODULATION_LEVEL,
+  },
+  {
+    true,
+    "Power",
+    Sensors::Purpose::POWER,
+    Sensors::Type::OT_CURRENT_POWER,
+  }
+};
+
 struct Variables {
   struct {
-    bool enable = false;
-    byte regulator = 0;
-  } tuning;
-
-  struct {
-    bool otStatus = false;
-    bool emergency = false;
-    bool heating = false;
-    bool dhw = false;
-    bool flame = false;
-    bool fault = false;
-    bool diagnostic = false;
-    byte faultCode = 0;
+    bool connected = false;
     int8_t rssi = 0;
-  } states;
+  } network;
 
   struct {
-    float modulation = 0.0f;
+    bool connected = false;
+  } mqtt;
+
+  struct {
+    bool state = false;
+  } emergency;
+
+  struct {
+    bool state = false;
+    unsigned long lastEnabledTime = 0;
+  } externalPump;
+
+  struct {
+    bool input = false;
+    bool output = false;
+  } cascadeControl;
+
+  struct {
+    uint8_t memberId = 0;
+    uint8_t flags = 0;
+    uint8_t type = 0;
+    uint8_t appVersion = 0;
+    float protocolVersion = 0.0f;
+
+    struct {
+      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;
+      float indoorTemp = 0.0f;
+      float outdoorTemp = 0.0f;
+      float minTemp = 0.0f;
+      float maxTemp = 0.0f;
+    } heating;
+
+    struct {
+      bool enabled = false;
+      float targetTemp = 0.0f;
+      float currentTemp = 0.0f;
+      float returnTemp = 0.0f;
+    } dhw;
+
+    struct {
+      bool enabled = false;
+      float targetTemp = 0.0f;
+    } ch2;
+  } master;
+
+  struct {
+    uint8_t memberId = 0;
+    uint8_t flags = 0;
+    uint8_t type = 0;
+    uint8_t appVersion = 0;
+    float protocolVersion = 0.0f;
+
+    bool connected = false;
+    bool flame = false;
+    bool cooling = false;
     float pressure = 0.0f;
-  } sensors;
+    float heatExchangerTemp = 0.0f;
+
+    struct {
+      bool active = false;
+      uint8_t code = 0;
+    } fault;
+
+    struct {
+      bool active = false;
+      uint16_t code = 0;
+    } diag;
+
+    struct {
+      uint8_t current = 0;
+      uint8_t min = 0;
+      uint8_t max = 100;
+    } modulation;
+
+    struct {
+      float current = 0.0f;
+      float min = 0.0f;
+      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;
+      float targetTemp = 0.0f;
+      float currentTemp = 0.0f;
+      float returnTemp = 0.0f;
+      float indoorTemp = 0.0f;
+      float outdoorTemp = 0.0f;
+      uint8_t minTemp = DEFAULT_HEATING_MIN_TEMP;
+      uint8_t maxTemp = DEFAULT_HEATING_MAX_TEMP;
+    } heating;
+
+    struct {
+      bool active = false;
+      bool enabled = false;
+      float targetTemp = 0.0f;
+      float currentTemp = 0.0f;
+      float currentTemp2 = 0.0f;
+      float returnTemp = 0.0f;
+      float flowRate = 0.0f;
+      uint8_t minTemp = DEFAULT_DHW_MIN_TEMP;
+      uint8_t maxTemp = DEFAULT_DHW_MAX_TEMP;
+    } dhw;
+
+    struct {
+      bool enabled = false;
+      float targetTemp = 0.0f;
+      float currentTemp = 0.0f;
+      float indoorTemp = 0.0f;
+    } ch2;
+  } slave;
 
   struct {
-    float indoor = 0.0f;
-    float outdoor = 0.0f;
-    float heating = 0.0f;
-    float dhw = 0.0f;
-  } temperatures;
+    bool restart = false;
+    bool resetFault = false;
+    bool resetDiagnostic = false;
+  } actions;
 
   struct {
-    bool heatingEnabled = false;
-    byte heatingMinTemp = 0;
-    byte heatingMaxTemp = 0;
-    byte heatingSetpoint = 0.0f;
-    byte dhwMinTemp = 0;
-    byte dhwMaxTemp = 0;
-    uint8_t slaveMemberIdCode;
-    uint8_t slaveType;
-    uint8_t slaveVersion;
-    uint8_t masterType;
-    uint8_t masterVersion;
-  } parameters;
+    bool restarting = false;
+    bool upgrading = false;
+  } states;
 } vars;

src/WifiManagerTask.h

@@ -1,165 +0,0 @@
-#include <WiFiManager.h>
-#include <WiFiManagerParameters.h>
-
-// Wifimanager
-WiFiManager wm;
-WiFiManagerParameter* wmHostname;
-WiFiManagerParameter* wmMqttServer;
-IntParameter* wmMqttPort;
-WiFiManagerParameter* wmMqttUser;
-WiFiManagerParameter* wmMqttPassword;
-WiFiManagerParameter* wmMqttPrefix;
-IntParameter* wmMqttPublishInterval;
-IntParameter* wmOtInPin;
-IntParameter* wmOtOutPin;
-IntParameter* wmOtMemberIdCode;
-CheckboxParameter* wmOtDHWPresent;
-IntParameter* wmOutdoorSensorPin;
-IntParameter* wmIndoorSensorPin;
-
-SeparatorParameter* wmSep1;
-SeparatorParameter* wmSep2;
-
-class WifiManagerTask : public Task {
-public:
-  WifiManagerTask(bool _enabled = false, unsigned long _interval = 0) : Task(_enabled, _interval) {}
-
-protected:
-  void setup() {
-    //WiFi.mode(WIFI_STA);
-    wm.setDebugOutput(settings.debug);
-
-    wmHostname = new WiFiManagerParameter("hostname", "Hostname", settings.hostname, 80);
-    wm.addParameter(wmHostname);
-
-    wmMqttServer = new WiFiManagerParameter("mqtt_server", "MQTT server", settings.mqtt.server, 80);
-    wm.addParameter(wmMqttServer);
-
-    wmMqttPort = new IntParameter("mqtt_port", "MQTT port", settings.mqtt.port, 6);
-    wm.addParameter(wmMqttPort);
-
-    wmMqttUser = new WiFiManagerParameter("mqtt_user", "MQTT username", settings.mqtt.user, 32);
-    wm.addParameter(wmMqttUser);
-
-    wmMqttPassword = new WiFiManagerParameter("mqtt_password", "MQTT password", settings.mqtt.password, 32, "type=\"password\"");
-    wm.addParameter(wmMqttPassword);
-
-    wmMqttPrefix = new WiFiManagerParameter("mqtt_prefix", "MQTT prefix", settings.mqtt.prefix, 32);
-    wm.addParameter(wmMqttPrefix);
-
-    wmMqttPublishInterval = new IntParameter("mqtt_publish_interval", "MQTT publish interval", settings.mqtt.interval, 5);
-    wm.addParameter(wmMqttPublishInterval);
-
-    wmSep1 = new SeparatorParameter();
-    wm.addParameter(wmSep1);
-
-    wmOtInPin = new IntParameter("ot_in_pin", "Opentherm pin IN", settings.opentherm.inPin, 2);
-    wm.addParameter(wmOtInPin);
-
-    wmOtOutPin = new IntParameter("ot_out_pin", "Opentherm pin OUT", settings.opentherm.outPin, 2);
-    wm.addParameter(wmOtOutPin);
-
-    wmOtMemberIdCode = new IntParameter("ot_member_id_code", "Opentherm member id", settings.opentherm.memberIdCode, 5);
-    wm.addParameter(wmOtMemberIdCode);
-
-    wmOtDHWPresent = new CheckboxParameter("ot_dhw_present", "Opentherm DHW present", settings.opentherm.dhwPresent);
-    wm.addParameter(wmOtDHWPresent);
-
-    wmSep2 = new SeparatorParameter();
-    wm.addParameter(wmSep2);
-
-    wmOutdoorSensorPin = new IntParameter("outdoor_sensor_pin", "Outdoor sensor pin", settings.sensors.outdoor.pin, 2);
-    wm.addParameter(wmOutdoorSensorPin);
-
-    wmIndoorSensorPin = new IntParameter("indoor_sensor_pin", "Indoor sensor pin", settings.sensors.indoor.pin, 2);
-    wm.addParameter(wmIndoorSensorPin);
-
-    //wm.setCleanConnect(true);
-    wm.setRestorePersistent(false);
-
-    wm.setHostname(settings.hostname);
-    wm.setWiFiAutoReconnect(true);
-    wm.setAPClientCheck(true);
-    wm.setConfigPortalBlocking(false);
-    wm.setSaveParamsCallback(saveParamsCallback);
-    wm.setConfigPortalTimeout(180);
-    //wm.setDisableConfigPortal(false);
-
-    wm.autoConnect(AP_SSID, AP_PASSWORD);
-  }
-
-  void loop() {
-    /*if (WiFi.status() != WL_CONNECTED && !wm.getWebPortalActive() && !wm.getConfigPortalActive()) {
-      wm.autoConnect(AP_SSID);
-    }*/
-
-    if (connected && WiFi.status() != WL_CONNECTED) {
-      connected = false;
-      INFO("[wifi] Disconnected");
-
-    } else if (!connected && WiFi.status() == WL_CONNECTED) {
-      connected = true;
-
-      if (wm.getConfigPortalActive()) {
-        wm.stopConfigPortal();
-      }
-
-      INFO_F("[wifi] Connected. IP address: %s, RSSI: %d\n", WiFi.localIP().toString().c_str(), WiFi.RSSI());
-    }
-
-    if (WiFi.status() == WL_CONNECTED && !wm.getWebPortalActive() && !wm.getConfigPortalActive()) {
-      wm.startWebPortal();
-    }
-
-    wm.process();
-  }
-
-  void static saveParamsCallback() {
-    strcpy(settings.hostname, wmHostname->getValue());
-    strcpy(settings.mqtt.server, wmMqttServer->getValue());
-    settings.mqtt.port = wmMqttPort->getValue();
-    strcpy(settings.mqtt.user, wmMqttUser->getValue());
-    strcpy(settings.mqtt.password, wmMqttPassword->getValue());
-    strcpy(settings.mqtt.prefix, wmMqttPrefix->getValue());
-    settings.mqtt.interval = wmMqttPublishInterval->getValue();
-    settings.opentherm.inPin = wmOtInPin->getValue();
-    settings.opentherm.outPin = wmOtOutPin->getValue();
-    settings.opentherm.memberIdCode = wmOtMemberIdCode->getValue();
-    settings.opentherm.dhwPresent = wmOtDHWPresent->getCheckboxValue();
-    settings.sensors.outdoor.pin = wmOutdoorSensorPin->getValue();
-    settings.sensors.indoor.pin = wmIndoorSensorPin->getValue();
-
-    INFO_F(
-      "New settings:\r\n"
-      "  Hostname: %s\r\n"
-      "  Mqtt server: %s:%d\r\n"
-      "  Mqtt user: %s\r\n"
-      "  Mqtt pass: %s\r\n"
-      "  Mqtt prefix: %s\r\n"
-      "  Mqtt publish interval: %d\r\n"
-      "  OT in pin: %d\r\n"
-      "  OT out pin: %d\r\n"
-      "  OT member id code: %d\r\n"
-      "  OT DHW present: %d\r\n"
-      "  Outdoor sensor pin: %d\r\n"
-      "  Indoor sensor pin: %d\r\n",
-      settings.hostname,
-      settings.mqtt.server,
-      settings.mqtt.port,
-      settings.mqtt.user,
-      settings.mqtt.password,
-      settings.mqtt.prefix,
-      settings.mqtt.interval,
-      settings.opentherm.inPin,
-      settings.opentherm.outPin,
-      settings.opentherm.memberIdCode,
-      settings.opentherm.dhwPresent,
-      settings.sensors.outdoor.pin,
-      settings.sensors.indoor.pin
-    );
-    eeSettings.updateNow();
-    INFO(F("Settings saved"));
-  }
-
-  bool connected = false;
-};

src/defines.h

@@ -1,46 +1,166 @@
-#define OT_GATEWAY_VERSION          "1.3.1"
-#define AP_SSID                     "OpenTherm Gateway"
-#define AP_PASSWORD                 "otgateway123456"
-#define USE_TELNET
+#define PROJECT_NAME                    "OpenTherm Gateway"
+#define PROJECT_REPO                    "https://github.com/Laxilef/OTGateway"
 
-#define EMERGENCY_TIME_TRESHOLD     120000
-#define MQTT_RECONNECT_INTERVAL     5000
-#define MQTT_KEEPALIVE              30
+#define MQTT_RECONNECT_INTERVAL         15000
+#define CONFIG_URL                      "http://%s/"
+#define SETTINGS_VALID_VALUE            "stvalid" // only 8 chars!
+#define GPIO_IS_NOT_CONFIGURED          0xff
 
-#define OPENTHERM_OFFLINE_TRESHOLD  10
+#define DEFAULT_HEATING_TARGET_TEMP     40
+#define DEFAULT_HEATING_MIN_TEMP        20
+#define DEFAULT_HEATING_MAX_TEMP        90
 
-#define EXT_SENSORS_INTERVAL        5000
-#define EXT_SENSORS_FILTER_K        0.15
-#define DS_CHECK_CRC                true
-#define DS_CRC_USE_TABLE            true
+#define DEFAULT_DHW_TARGET_TEMP         40
+#define DEFAULT_DHW_MIN_TEMP            30
+#define DEFAULT_DHW_MAX_TEMP            60
 
-#define LED_STATUS_PIN              13
-#define LED_OT_RX_PIN               15
+#define THERMOSTAT_INDOOR_DEFAULT_TEMP  20
+#define THERMOSTAT_INDOOR_MIN_TEMP      5
+#define THERMOSTAT_INDOOR_MAX_TEMP      30
 
-#define CONFIG_URL                  "http://%s/"
-#define SETTINGS_VALID_VALUE        "stvalid" // only 8 chars!
+#define DEFAULT_NTC_NOMINAL_RESISTANCE  10000.0f
+#define DEFAULT_NTC_NOMINAL_TEMP        25.0f
+#define DEFAULT_NTC_REF_RESISTANCE      10000.0f
+#define DEFAULT_NTC_BETA_FACTOR         3950.0f
+#define DEFAULT_NTC_VREF                3300.0f
+#define DEFAULT_NTC_VLOW_TRESHOLD       25.0f
+#define DEFAULT_NTC_VHIGH_TRESHOLD      3298.0f
 
-
-#ifdef USE_TELNET
-  #define INFO_STREAM TelnetStream
-  #define WARN_STREAM TelnetStream
-  #define ERROR_STREAM TelnetStream
-  #define DEBUG_STREAM  if (settings.debug) TelnetStream
-  #define WM_DEBUG_PORT TelnetStream
-#else
-  #define INFO_STREAM Serial
-  #define WARN_STREAM Serial
-  #define ERROR_STREAM Serial
-  #define DEBUG_STREAM  if (settings.debug) Serial
-  #define WM_DEBUG_PORT Serial
+#ifndef BUILD_VERSION
+  #define BUILD_VERSION                 "0.0.0"
 #endif
 
-#define INFO(...) INFO_STREAM.print("\r[INFO] "); INFO_STREAM.println(__VA_ARGS__);
-#define INFO_F(...) INFO_STREAM.print("\r[INFO] "); INFO_STREAM.printf(__VA_ARGS__);
-#define WARN(...) WARN_STREAM.print("\r[WARN] "); WARN_STREAM.println(__VA_ARGS__);
-#define WARN_F(...) WARN_STREAM.print("\r[WARN] "); WARN_STREAM.printf(__VA_ARGS__);
-#define ERROR(...) ERROR_STREAM.print("\r[ERROR] "); ERROR_STREAM.println(__VA_ARGS__);
-#define DEBUG(...) DEBUG_STREAM.print("\r[DEBUG] "); DEBUG_STREAM.println(__VA_ARGS__);
-#define DEBUG_F(...) DEBUG_STREAM.print("\r[DEBUG] "); DEBUG_STREAM.printf(__VA_ARGS__);
+#ifndef BUILD_ENV
+  #define BUILD_ENV                     "undefined"
+#endif
 
-char buffer[120];
+#ifndef DEFAULT_SERIAL_ENABLED
+  #define DEFAULT_SERIAL_ENABLED true
+#endif
+
+#ifndef DEFAULT_SERIAL_BAUD
+  #define DEFAULT_SERIAL_BAUD 115200
+#endif
+
+#ifndef DEFAULT_TELNET_ENABLED
+  #define DEFAULT_TELNET_ENABLED true
+#endif
+
+#ifndef DEFAULT_TELNET_PORT
+  #define DEFAULT_TELNET_PORT 23
+#endif
+
+#ifndef USE_BLE
+  #define USE_BLE false
+#endif
+
+#ifndef DEFAULT_HOSTNAME
+  #define DEFAULT_HOSTNAME "opentherm"
+#endif
+
+#ifndef DEFAULT_AP_SSID
+  #define DEFAULT_AP_SSID "OpenTherm Gateway"
+#endif
+
+#ifndef DEFAULT_AP_PASSWORD
+  #define DEFAULT_AP_PASSWORD "otgateway123456"
+#endif
+
+#ifndef DEFAULT_STA_SSID
+  #define DEFAULT_STA_SSID ""
+#endif
+
+#ifndef DEFAULT_STA_PASSWORD
+  #define DEFAULT_STA_PASSWORD ""
+#endif
+
+#ifndef DEFAULT_LOG_LEVEL
+  #define DEFAULT_LOG_LEVEL TinyLogger::Level::VERBOSE
+#endif
+
+#ifndef DEFAULT_STATUS_LED_GPIO
+  #define DEFAULT_STATUS_LED_GPIO GPIO_IS_NOT_CONFIGURED
+#endif
+
+#ifndef DEFAULT_PORTAL_LOGIN
+  #define DEFAULT_PORTAL_LOGIN ""
+#endif
+
+#ifndef DEFAULT_PORTAL_PASSWORD
+  #define DEFAULT_PORTAL_PASSWORD ""
+#endif
+
+#ifndef DEFAULT_MQTT_ENABLED
+  #define DEFAULT_MQTT_ENABLED false
+#endif
+
+#ifndef DEFAULT_MQTT_SERVER
+  #define DEFAULT_MQTT_SERVER ""
+#endif
+
+#ifndef DEFAULT_MQTT_PORT
+  #define DEFAULT_MQTT_PORT 1883
+#endif
+
+#ifndef DEFAULT_MQTT_USER
+  #define DEFAULT_MQTT_USER ""
+#endif
+
+#ifndef DEFAULT_MQTT_PASSWORD
+  #define DEFAULT_MQTT_PASSWORD ""
+#endif
+
+#ifndef DEFAULT_MQTT_PREFIX
+  #define DEFAULT_MQTT_PREFIX "opentherm"
+#endif
+
+#ifndef DEFAULT_OT_IN_GPIO
+  #define DEFAULT_OT_IN_GPIO GPIO_IS_NOT_CONFIGURED
+#endif
+
+#ifndef DEFAULT_OT_OUT_GPIO
+  #define DEFAULT_OT_OUT_GPIO GPIO_IS_NOT_CONFIGURED
+#endif
+
+#ifndef DEFAULT_OT_RX_LED_GPIO
+  #define DEFAULT_OT_RX_LED_GPIO GPIO_IS_NOT_CONFIGURED
+#endif
+
+#ifndef DEFAULT_OT_FAULT_STATE_GPIO
+  #define DEFAULT_OT_FAULT_STATE_GPIO GPIO_IS_NOT_CONFIGURED
+#endif
+
+#ifndef DEFAULT_SENSOR_OUTDOOR_GPIO
+  #define DEFAULT_SENSOR_OUTDOOR_GPIO GPIO_IS_NOT_CONFIGURED
+#endif
+
+#ifndef DEFAULT_SENSOR_INDOOR_GPIO
+  #define DEFAULT_SENSOR_INDOOR_GPIO GPIO_IS_NOT_CONFIGURED
+#endif
+
+#ifndef SENSORS_AMOUNT
+  #define SENSORS_AMOUNT 20
+#endif
+
+#ifndef DEFAULT_EXT_PUMP_GPIO
+  #define DEFAULT_EXT_PUMP_GPIO GPIO_IS_NOT_CONFIGURED
+#endif
+
+#ifndef PROGMEM
+  #define PROGMEM 
+#endif
+
+#ifdef ARDUINO_ARCH_ESP32
+  #include <driver/gpio.h>
+#elif !defined(GPIO_IS_VALID_GPIO)
+  #define GPIO_IS_VALID_GPIO(gpioNum) (gpioNum >= 0 && gpioNum <= 17)
+#endif
+
+#define GPIO_IS_VALID(gpioNum) (gpioNum != GPIO_IS_NOT_CONFIGURED && GPIO_IS_VALID_GPIO(gpioNum))
+
+enum class UnitSystem : uint8_t {
+  METRIC    = 0,
+  IMPERIAL  = 1
+};
+
+char buffer[255];

src/main.cpp

@@ -1,78 +1,220 @@
+#define ARDUINOJSON_USE_DOUBLE 0
+#define ARDUINOJSON_USE_LONG_LONG 0
+
 #include <Arduino.h>
-#include "defines.h"
 #include <ArduinoJson.h>
-#include <TelnetStream.h>
-#include <EEManager.h>
-#include <Scheduler.h>
+#include <FileData.h>
+#include <LittleFS.h>
+#include <ESPTelnetStream.h>
+
+#include "defines.h"
+#include "strings.h"
+
+#include <TinyLogger.h>
+#include <NetworkMgr.h>
+#include "CrashRecorder.h"
+#include "Sensors.h"
+#include "Settings.h"
+#include "utils.h"
+
+#if defined(ARDUINO_ARCH_ESP32)
+  #include <ESP32Scheduler.h>
+#elif defined(ARDUINO_ARCH_ESP8266)
+  #include <Scheduler.h>
+#else
+  #error Wrong board. Supported boards: esp8266, esp32
+#endif
+
 #include <Task.h>
 #include <LeanTask.h>
-#include "Settings.h"
-
-EEManager eeSettings(settings, 30000);
-
-#include "WifiManagerTask.h"
 #include "MqttTask.h"
 #include "OpenThermTask.h"
 #include "SensorsTask.h"
 #include "RegulatorTask.h"
+#include "PortalTask.h"
 #include "MainTask.h"
 
+using namespace NetworkUtils;
+
+// Vars
+ESPTelnetStream* telnetStream = nullptr;
+NetworkMgr* network = nullptr;
+Sensors::Result sensorsResults[SENSORS_AMOUNT];
+
+FileData fsNetworkSettings(&LittleFS, "/network.conf", 'n', &networkSettings, sizeof(networkSettings), 1000);
+FileData fsSettings(&LittleFS, "/settings.conf", 's', &settings, sizeof(settings), 60000);
+FileData fsSensorsSettings(&LittleFS, "/sensors.conf", 'e', &sensorsSettings, sizeof(sensorsSettings), 60000);
+
 // Tasks
-WifiManagerTask* tWm;
 MqttTask* tMqtt;
 OpenThermTask* tOt;
 SensorsTask* tSensors;
 RegulatorTask* tRegulator;
+PortalTask* tPortal;
 MainTask* tMain;
 
 
 void setup() {
-#ifdef USE_TELNET
-  TelnetStream.begin();
-  delay(1000);
-#else
+  CrashRecorder::init();
+  Sensors::setMaxSensors(SENSORS_AMOUNT);
+  Sensors::settings = sensorsSettings;
+  Sensors::results = sensorsResults;
+  LittleFS.begin();
+
+  Log.setLevel(TinyLogger::Level::VERBOSE);
+  Log.setServiceTemplate("\033[1m[%s]\033[22m");
+  Log.setLevelTemplate("\033[1m[%s]\033[22m");
+  Log.setMsgPrefix("\033[m ");
+  Log.setDateTemplate("\033[1m[%H:%M:%S]\033[22m");
+  Log.setDateCallback([] {
+    unsigned int time = millis() / 1000;
+    int sec = time % 60;
+    int min = time % 3600 / 60;
+    int hour = time / 3600;
+
+    return tm{sec, min, hour};
+  });
+  
   Serial.begin(115200);
-  Serial.println("\n\n");
-#endif
+  #if ARDUINO_USB_MODE
+  Serial.setTxBufferSize(512);
+  #endif
+  Log.addStream(&Serial);
+  Log.print("\n\n\r");
 
-  EEPROM.begin(eeSettings.blockSize());
-  uint8_t eeSettingsResult = eeSettings.begin(0, 's');
-  if (eeSettingsResult == 0) {
-    INFO("Settings loaded");
-
-    if ( strcmp(SETTINGS_VALID_VALUE, settings.validationValue) != 0 ) {
-      INFO("Settings not valid, reset and restart...");
-      eeSettings.reset();
-      delay(1000);
-      ESP.restart();
-    }
-
-  } else if (eeSettingsResult == 1) {
-    INFO("Settings NOT loaded, first start");
-
-  } else if (eeSettingsResult == 2) {
-    INFO("Settings NOT loaded (error)");
+  //
+  // Network settings
+  switch (fsNetworkSettings.read()) {
+    case FD_FS_ERR:
+      Log.swarningln(FPSTR(L_NETWORK_SETTINGS), F("Filesystem error, load default"));
+      break;
+    case FD_FILE_ERR:
+      Log.swarningln(FPSTR(L_NETWORK_SETTINGS), F("Bad data, load default"));
+      break;
+    case FD_WRITE:
+      Log.sinfoln(FPSTR(L_NETWORK_SETTINGS), F("Not found, load default"));
+      break;
+    case FD_ADD:
+    case FD_READ:
+      Log.sinfoln(FPSTR(L_NETWORK_SETTINGS), F("Loaded"));
+      break;
+    default:
+      break;
   }
 
-  tWm = new WifiManagerTask(true);
-  Scheduler.start(tWm);
+  network = (new NetworkMgr)
+    ->setHostname(networkSettings.hostname)
+    ->setStaCredentials(
+      strlen(networkSettings.sta.ssid) ? networkSettings.sta.ssid : nullptr,
+      strlen(networkSettings.sta.password) ? networkSettings.sta.password : nullptr,
+      networkSettings.sta.channel
+    )->setApCredentials(
+      strlen(networkSettings.ap.ssid) ? networkSettings.ap.ssid : nullptr,
+      strlen(networkSettings.ap.password) ? networkSettings.ap.password : nullptr,
+      networkSettings.ap.channel
+    )
+    ->setUseDhcp(networkSettings.useDhcp)
+    ->setStaticConfig(
+      networkSettings.staticConfig.ip,
+      networkSettings.staticConfig.gateway,
+      networkSettings.staticConfig.subnet,
+      networkSettings.staticConfig.dns
+    );
 
-  tMqtt = new MqttTask(false);
+  //
+  // Settings
+  switch (fsSettings.read()) {
+    case FD_FS_ERR:
+      Log.swarningln(FPSTR(L_SETTINGS), F("Filesystem error, load default"));
+      break;
+    case FD_FILE_ERR:
+      Log.swarningln(FPSTR(L_SETTINGS), F("Bad data, load default"));
+      break;
+    case FD_WRITE:
+      Log.sinfoln(FPSTR(L_SETTINGS), F("Not found, load default"));
+      break;
+    case FD_ADD:
+    case FD_READ:
+      Log.sinfoln(FPSTR(L_SETTINGS), F("Loaded"));
+
+      if (strcmp(SETTINGS_VALID_VALUE, settings.validationValue) != 0) {
+        Log.swarningln(FPSTR(L_SETTINGS), F("Not valid, set default and restart..."));
+        fsSettings.reset();
+        ::delay(5000);
+        ESP.restart();
+      }
+      break;
+    default:
+      break;
+  }
+
+  // Logs settings
+  if (!settings.system.serial.enabled) {
+    Serial.end();
+    Log.clearStreams();
+
+  } else if (settings.system.serial.baudrate != 115200) {
+    Serial.end();
+    Log.clearStreams();
+
+    Serial.begin(settings.system.serial.baudrate);
+    Log.addStream(&Serial);
+  }
+
+  if (settings.system.telnet.enabled) {
+    telnetStream = new ESPTelnetStream;
+    telnetStream->setKeepAliveInterval(500);
+    Log.addStream(telnetStream);
+  }
+
+  if (settings.system.logLevel >= TinyLogger::Level::SILENT && settings.system.logLevel <= TinyLogger::Level::VERBOSE) {
+    Log.setLevel(static_cast<TinyLogger::Level>(settings.system.logLevel));
+  }
+
+  //
+  // Sensors settings
+  switch (fsSensorsSettings.read()) {
+    case FD_FS_ERR:
+      Log.swarningln(FPSTR(L_SENSORS), F("Filesystem error, load default"));
+      break;
+    case FD_FILE_ERR:
+      Log.swarningln(FPSTR(L_SENSORS), F("Bad data, load default"));
+      break;
+    case FD_WRITE:
+      Log.sinfoln(FPSTR(L_SENSORS), F("Not found, load default"));
+      break;
+    case FD_ADD:
+    case FD_READ:
+      Log.sinfoln(FPSTR(L_SENSORS), F("Loaded"));
+    default:
+      break;
+  }
+
+  //
+  // Make tasks
+  tMqtt = new MqttTask(false, 500);
   Scheduler.start(tMqtt);
 
-  tOt = new OpenThermTask(false);
+  tOt = new OpenThermTask(true, 750);
   Scheduler.start(tOt);
 
-  tSensors = new SensorsTask(true, EXT_SENSORS_INTERVAL);
+  tSensors = new SensorsTask(true, 1000);
   Scheduler.start(tSensors);
 
   tRegulator = new RegulatorTask(true, 10000);
   Scheduler.start(tRegulator);
 
-  tMain = new MainTask(true);
+  tPortal = new PortalTask(true, 0);
+  Scheduler.start(tPortal);
+
+  tMain = new MainTask(true, 100);
   Scheduler.start(tMain);
 
   Scheduler.begin();
 }
 
-void loop() {}
+void loop() {
+#if defined(ARDUINO_ARCH_ESP32)
+  vTaskDelete(NULL);
+#endif
+}

src/strings.h

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

src_data/fonts/iconly.svg

@@ -0,0 +1,96 @@
+<?xml version="1.0" standalone="no"?>
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd" >
+<svg xmlns="http://www.w3.org/2000/svg">
+<defs>
+  <font id="iconly" horiz-adv-x="1024">
+    <font-face font-family="iconly"
+      units-per-em="1024" ascent="896"
+      descent="128" />
+    <missing-glyph horiz-adv-x="0" />
+    <glyph glyph-name="plus"
+      unicode="&#xE000;"
+      horiz-adv-x="895.5537099041368" d="M831.585587768127 479.8473854289214H543.729038156083V767.7039350409655C543.729038156083 803.0263324829433 515.0833134620511 831.6720571769752 479.7609160200732 831.6720571769752H415.7927938840635C380.4703964420856 831.6720571769752 351.8246717480538 803.0263324829433 351.8246717480538 767.7039350409655V479.8473854289214H63.9681221360098C28.6457246940319 479.8473854289214 0 451.2016607348895 0 415.8792632929117V351.9111411569019C0 316.588743714924 28.6457246940319 287.9430190208922 63.9681221360098 287.9430190208922H351.8246717480538V0.0864694088482C351.8246717480538 -35.2359280331298 380.4703964420857 -63.8816527271616 415.7927938840635 -63.8816527271616H479.7609160200732C515.0833134620511 -63.8816527271616 543.729038156083 -35.2359280331298 543.729038156083 0.0864694088482V287.9430190208922H831.585587768127C866.9079852101049 287.9430190208922 895.5537099041368 316.588743714924 895.5537099041368 351.9111411569019V415.8792632929117C895.5537099041368 451.2016607348896 866.9079852101049 479.8473854289214 831.585587768127 479.8473854289214z" />
+    <glyph glyph-name="plus-1"
+      unicode="&#x70;&#x6C;&#x75;&#x73;"
+      horiz-adv-x="895.5537099041368" d="M831.585587768127 479.8473854289214H543.729038156083V767.7039350409655C543.729038156083 803.0263324829433 515.0833134620511 831.6720571769752 479.7609160200732 831.6720571769752H415.7927938840635C380.4703964420856 831.6720571769752 351.8246717480538 803.0263324829433 351.8246717480538 767.7039350409655V479.8473854289214H63.9681221360098C28.6457246940319 479.8473854289214 0 451.2016607348895 0 415.8792632929117V351.9111411569019C0 316.588743714924 28.6457246940319 287.9430190208922 63.9681221360098 287.9430190208922H351.8246717480538V0.0864694088482C351.8246717480538 -35.2359280331298 380.4703964420857 -63.8816527271616 415.7927938840635 -63.8816527271616H479.7609160200732C515.0833134620511 -63.8816527271616 543.729038156083 -35.2359280331298 543.729038156083 0.0864694088482V287.9430190208922H831.585587768127C866.9079852101049 287.9430190208922 895.5537099041368 316.588743714924 895.5537099041368 351.9111411569019V415.8792632929117C895.5537099041368 451.2016607348896 866.9079852101049 479.8473854289214 831.585587768127 479.8473854289214z" />
+    <glyph glyph-name="minus"
+      unicode="&#xE001;"
+      horiz-adv-x="893.7641930109211" d="M829.9238935101409 480.448527979227H63.8402995007801C28.5884841201931 480.4465329698676 0 451.8580488496745 0 416.6062334690875V352.7659339683073C0 317.5141185877203 28.5884841201931 288.9256344675273 63.8402995007801 288.9256344675273H829.9238935101409C865.1757088907281 288.9256344675273 893.7641930109211 317.5141185877203 893.7641930109211 352.7659339683073V416.6062334690875C893.7641930109211 451.8580488496744 865.1757088907281 480.4465329698675 829.9238935101409 480.4465329698675z" />
+    <glyph glyph-name="minus-1"
+      unicode="&#x6D;&#x69;&#x6E;&#x75;&#x73;"
+      horiz-adv-x="893.7641930109211" d="M829.9238935101409 480.448527979227H63.8402995007801C28.5884841201931 480.4465329698676 0 451.8580488496745 0 416.6062334690875V352.7659339683073C0 317.5141185877203 28.5884841201931 288.9256344675273 63.8402995007801 288.9256344675273H829.9238935101409C865.1757088907281 288.9256344675273 893.7641930109211 317.5141185877203 893.7641930109211 352.7659339683073V416.6062334690875C893.7641930109211 451.8580488496744 865.1757088907281 480.4465329698675 829.9238935101409 480.4465329698675z" />
+    <glyph glyph-name="unlocked"
+      unicode="&#xE002;"
+      horiz-adv-x="1024" d="M426.667 341.333C473.6 341.333 512 303.36 512 256S474.027 170.667 426.6670000000001 170.667S341.3330000000001 208.64 341.3330000000001 256S379.733 341.333 426.6670000000001 341.333M768 853.333C650.24 853.333 554.667 757.76 554.667 640V554.667H170.667C123.733 554.667 85.333 516.267 85.333 469.333V42.667C85.333 -4.2669999999999 123.733 -42.6669999999999 170.667 -42.6669999999999H682.667C729.6 -42.6669999999999 768 -4.2669999999999 768 42.6670000000001V469.333C768 516.267 729.6 554.667 682.667 554.667H640V640C640 710.827 697.173 768 768 768S896 710.827 896 640V554.667H981.333V640C981.333 757.76 885.76 853.333 768 853.333M682.667 469.333V42.6669999999999H170.667V469.333H682.667z" />
+    <glyph glyph-name="unlocked-1"
+      unicode="&#x75;&#x6E;&#x6C;&#x6F;&#x63;&#x6B;&#x65;&#x64;"
+      horiz-adv-x="1024" d="M426.667 341.333C473.6 341.333 512 303.36 512 256S474.027 170.667 426.6670000000001 170.667S341.3330000000001 208.64 341.3330000000001 256S379.733 341.333 426.6670000000001 341.333M768 853.333C650.24 853.333 554.667 757.76 554.667 640V554.667H170.667C123.733 554.667 85.333 516.267 85.333 469.333V42.667C85.333 -4.2669999999999 123.733 -42.6669999999999 170.667 -42.6669999999999H682.667C729.6 -42.6669999999999 768 -4.2669999999999 768 42.6670000000001V469.333C768 516.267 729.6 554.667 682.667 554.667H640V640C640 710.827 697.173 768 768 768S896 710.827 896 640V554.667H981.333V640C981.333 757.76 885.76 853.333 768 853.333M682.667 469.333V42.6669999999999H170.667V469.333H682.667z" />
+    <glyph glyph-name="locked"
+      unicode="&#xE003;"
+      horiz-adv-x="1024" d="M512 170.667C464.64 170.667 426.6670000000001 209.067 426.6670000000001 256C426.6670000000001 303.36 464.64 341.333 512 341.333A85.333 85.333 0 0 0 597.333 256A85.333 85.333 0 0 0 512 170.667M768 42.667V469.333H256V42.667H768M768 554.667A85.333 85.333 0 0 0 853.333 469.333V42.667A85.333 85.333 0 0 0 768 -42.667H256C208.64 -42.667 170.667 -4.2670000000001 170.667 42.6669999999999V469.333C170.667 516.693 208.64 554.667 256 554.667H298.6670000000001V640A213.333 213.333 0 0 0 512 853.333A213.333 213.333 0 0 0 725.333 640V554.667H768M512 768A128 128 0 0 1 384 640V554.667H640V640A128 128 0 0 1 512 768z" />
+    <glyph glyph-name="locked-1"
+      unicode="&#x6C;&#x6F;&#x63;&#x6B;&#x65;&#x64;"
+      horiz-adv-x="1024" d="M512 170.667C464.64 170.667 426.6670000000001 209.067 426.6670000000001 256C426.6670000000001 303.36 464.64 341.333 512 341.333A85.333 85.333 0 0 0 597.333 256A85.333 85.333 0 0 0 512 170.667M768 42.667V469.333H256V42.667H768M768 554.667A85.333 85.333 0 0 0 853.333 469.333V42.667A85.333 85.333 0 0 0 768 -42.667H256C208.64 -42.667 170.667 -4.2670000000001 170.667 42.6669999999999V469.333C170.667 516.693 208.64 554.667 256 554.667H298.6670000000001V640A213.333 213.333 0 0 0 512 853.333A213.333 213.333 0 0 0 725.333 640V554.667H768M512 768A128 128 0 0 1 384 640V554.667H640V640A128 128 0 0 1 512 768z" />
+    <glyph glyph-name="wifi-strength-1"
+      unicode="&#xE004;"
+      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.4516956956384L665.3592366333123 307.3637631451326C618.0467201032712 329.95509018927 564.7661931477559 341.8891130454328 511.4866651896333 341.8891130454328C458.2071372315108 341.8891130454328 404.9266102759954 329.9550901892699 357.6140937459543 307.7903350319215L139.3801162641751 578.8782675824273C251.9071826058945 646.6502507200537 380.6309936794878 682.8808891701171 511.4866651896334 682.8808891701171z" />
+    <glyph glyph-name="wifi-strength-1-1"
+      unicode="&#x77;&#x69;&#x66;&#x69;&#x5F;&#x73;&#x74;&#x72;&#x65;&#x6E;&#x67;&#x74;&#x68;&#x5F;&#x31;"
+      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.4516956956384L665.3592366333123 307.3637631451326C618.0467201032712 329.95509018927 564.7661931477559 341.8891130454328 511.4866651896333 341.8891130454328C458.2071372315108 341.8891130454328 404.9266102759954 329.9550901892699 357.6140937459543 307.7903350319215L139.3801162641751 578.8782675824273C251.9071826058945 646.6502507200537 380.6309936794878 682.8808891701171 511.4866651896334 682.8808891701171z" />
+    <glyph glyph-name="wifi-strength-0"
+      unicode="&#xE005;"
+      horiz-adv-x="1022.9733303792667" d="M511.4866651896334 768.1283337025917C332.4663323732617 768.1283337025917 157.7087214326013 708.4552224295987 17.0498885054521 597.6324456402496C183.283054692083 393.0377795643962 349.5162208787138 184.1813906102245 511.4866651896334 -20.4132754656289C609.5212763518488 103.1956689560682 711.8186093897755 226.8046133777654 809.8542195493837 350.4145567968553V486.8106678482933L511.4866651896334 115.9828355858092L140.6588329271492 580.5835561321903C251.4806107191054 648.7811121592129 379.3522770165138 682.8808891701171 511.4866651896334 682.8808891701171S771.4927196601614 644.5193892808945 882.3144974521176 580.5835561321903L865.2646089466655 555.0092228727087H976.0873857360147C988.8745523657554 567.7963895024495 997.398997119785 584.8452790105086 1010.186163749526 597.6324456402496C865.2646089466655 708.4552224295987 690.5069980060051 768.1283337025917 511.4866651896334 768.1283337025917M895.1016640818584 469.7607793428413V214.0174467480247H980.349108614333V469.7607793428413M895.1016640818584 128.77000221555V43.5225576830754H980.349108614333V128.77000221555" />
+    <glyph glyph-name="wifi-strength-0-1"
+      unicode="&#x77;&#x69;&#x66;&#x69;&#x5F;&#x73;&#x74;&#x72;&#x65;&#x6E;&#x67;&#x74;&#x68;&#x5F;&#x30;"
+      horiz-adv-x="1022.9733303792667" d="M511.4866651896334 768.1283337025917C332.4663323732617 768.1283337025917 157.7087214326013 708.4552224295987 17.0498885054521 597.6324456402496C183.283054692083 393.0377795643962 349.5162208787138 184.1813906102245 511.4866651896334 -20.4132754656289C609.5212763518488 103.1956689560682 711.8186093897755 226.8046133777654 809.8542195493837 350.4145567968553V486.8106678482933L511.4866651896334 115.9828355858092L140.6588329271492 580.5835561321903C251.4806107191054 648.7811121592129 379.3522770165138 682.8808891701171 511.4866651896334 682.8808891701171S771.4927196601614 644.5193892808945 882.3144974521176 580.5835561321903L865.2646089466655 555.0092228727087H976.0873857360147C988.8745523657554 567.7963895024495 997.398997119785 584.8452790105086 1010.186163749526 597.6324456402496C865.2646089466655 708.4552224295987 690.5069980060051 768.1283337025917 511.4866651896334 768.1283337025917M895.1016640818584 469.7607793428413V214.0174467480247H980.349108614333V469.7607793428413M895.1016640818584 128.77000221555V43.5225576830754H980.349108614333V128.77000221555" />
+    <glyph glyph-name="wifi-strength-2"
+      unicode="&#xE006;"
+      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="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" />
+    <glyph glyph-name="wifi-strength-3-1"
+      unicode="&#x77;&#x69;&#x66;&#x69;&#x5F;&#x73;&#x74;&#x72;&#x65;&#x6E;&#x67;&#x74;&#x68;&#x5F;&#x33;"
+      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" />
+    <glyph glyph-name="down"
+      unicode="&#xE009;"
+      horiz-adv-x="893.7641930109211" d="M824.1383663678829 451.520892267936L868.427574146549 407.2306869845902C887.180662124903 388.477599006236 887.180662124903 358.1514617340061 868.427574146549 339.5978746915919L480.79725561525 -48.2279547569284C462.0441676368958 -66.9810427352825 431.7200253740253 -66.9810427352825 413.1664383316111 -48.2279547569284L25.3366188643721 339.6018647103107C6.5835308860179 358.3549526886648 6.5835308860179 388.6790949515354 25.3366188643721 407.2326819939496L69.6258266430383 451.5218897726157C88.5784155573323 470.4744786869098 119.5010606280227 470.07547681503 138.0546476704369 450.723886028856L367.0817221294855 210.325258221231V783.690948112612C367.0817221294855 810.2245725926238 388.4283222750588 831.5711727381971 414.9619467550705 831.5711727381971H478.8022462558506C505.3358707358623 831.5711727381971 526.6824708814356 810.2245725926238 526.6824708814356 783.690948112612V210.325258221231L755.7095453404842 450.723886028856C774.2631323828984 470.2749777509699 805.1857774535888 470.6739796228497 824.1383663678829 451.5218897726157z" />
+    <glyph glyph-name="down-1"
+      unicode="&#x64;&#x6F;&#x77;&#x6E;"
+      horiz-adv-x="893.7641930109211" d="M824.1383663678829 451.520892267936L868.427574146549 407.2306869845902C887.180662124903 388.477599006236 887.180662124903 358.1514617340061 868.427574146549 339.5978746915919L480.79725561525 -48.2279547569284C462.0441676368958 -66.9810427352825 431.7200253740253 -66.9810427352825 413.1664383316111 -48.2279547569284L25.3366188643721 339.6018647103107C6.5835308860179 358.3549526886648 6.5835308860179 388.6790949515354 25.3366188643721 407.2326819939496L69.6258266430383 451.5218897726157C88.5784155573323 470.4744786869098 119.5010606280227 470.07547681503 138.0546476704369 450.723886028856L367.0817221294855 210.325258221231V783.690948112612C367.0817221294855 810.2245725926238 388.4283222750588 831.5711727381971 414.9619467550705 831.5711727381971H478.8022462558506C505.3358707358623 831.5711727381971 526.6824708814356 810.2245725926238 526.6824708814356 783.690948112612V210.325258221231L755.7095453404842 450.723886028856C774.2631323828984 470.2749777509699 805.1857774535888 470.6739796228497 824.1383663678829 451.5218897726157z" />
+    <glyph glyph-name="wifi-strength-4"
+      unicode="&#xE00A;"
+      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="wifi-strength-4-1"
+      unicode="&#x77;&#x69;&#x66;&#x69;&#x5F;&#x73;&#x74;&#x72;&#x65;&#x6E;&#x67;&#x74;&#x68;&#x5F;&#x34;"
+      horiz-adv-x="1022.9733303792667" d="M511.4866651896334 768.1283337025917C332.0397604864727 768.1283337025917 157.7087214326013 708.0286505428097 16.1967447318741 597.6324456402496C187.9713494571903 381.9559014844185 336.3024823621839 198.2472739029395 511.4866651896334 -20.4132754656288C685.3921313541088 196.1154134663874 862.7071756207173 416.9078232715078 1008.0553023103668 597.6324456402497C866.1177527202434 708.0286505428097 691.3591427821901 768.1283337025917 511.4866651896334 768.1283337025917z" />
+    <glyph glyph-name="success"
+      unicode="&#xE00B;"
+      horiz-adv-x="1024" d="M512 810.667C276.36 810.667 85.333 619.64 85.333 384C85.333 148.36 276.3590000000001 -42.6669999999999 512 -42.6669999999999C747.64 -42.6669999999999 938.667 148.3590000000002 938.667 384.0000000000001C938.667 619.64 747.64 810.667 512 810.667zM512 42.667C323.79 42.667 170.667 195.789 170.667 384.0000000000001C170.667 572.21 323.789 725.3330000000001 512 725.3330000000001C700.21 725.3330000000001 853.3330000000001 572.211 853.3330000000001 384.0000000000001C853.3330000000001 195.7900000000001 700.211 42.667 512 42.667zM672.672 536.437L733.005 476.104L469.333 211.328L311.167 369.495L371.5 429.828L469.333 331.995L672.673 536.438z" />
+    <glyph glyph-name="success-1"
+      unicode="&#x73;&#x75;&#x63;&#x63;&#x65;&#x73;&#x73;"
+      horiz-adv-x="1024" d="M512 810.667C276.36 810.667 85.333 619.64 85.333 384C85.333 148.36 276.3590000000001 -42.6669999999999 512 -42.6669999999999C747.64 -42.6669999999999 938.667 148.3590000000002 938.667 384.0000000000001C938.667 619.64 747.64 810.667 512 810.667zM512 42.667C323.79 42.667 170.667 195.789 170.667 384.0000000000001C170.667 572.21 323.789 725.3330000000001 512 725.3330000000001C700.21 725.3330000000001 853.3330000000001 572.211 853.3330000000001 384.0000000000001C853.3330000000001 195.7900000000001 700.211 42.667 512 42.667zM672.672 536.437L733.005 476.104L469.333 211.328L311.167 369.495L371.5 429.828L469.333 331.995L672.673 536.438z" />
+    <glyph glyph-name="up"
+      unicode="&#xE00C;"
+      horiz-adv-x="893.7641930109211" d="M69.6258266430383 317.8562626928574L25.3366188643721 362.1454704715236C6.5835308860179 380.8985584498777 6.5835308860179 411.2227007127483 25.3366188643721 429.7762877551625L412.9669373956711 817.6021172036826C431.7200253740253 836.3552051820368 462.0441676368958 836.3552051820368 480.59775467931 817.6021172036826L868.2280732106092 429.9717986723836C886.9811611889633 411.2187106940295 886.9811611889633 380.894568431159 868.2280732106092 362.3409813887447L823.938865431943 318.0517736100786C804.9862765176489 299.0991846957845 774.0636314469585 299.4981865676644 755.5100444045443 318.8497773538383L526.6824708814356 559.0528942442421V-14.3127956471388C526.6824708814356 -40.8464201271506 505.3358707358623 -62.1930202727239 478.8022462558506 -62.1930202727239H414.9619467550705C388.4283222750588 -62.1930202727239 367.0817221294855 -40.8464201271506 367.0817221294855 -14.3127956471388V559.0528942442422L138.0546476704369 318.6542664366173C119.5010606280227 299.1031747145034 88.5784155573324 298.7041728426234 69.6258266430383 317.8562626928575z" />
+    <glyph glyph-name="up-1"
+      unicode="&#x75;&#x70;"
+      horiz-adv-x="893.7641930109211" d="M69.6258266430383 317.8562626928574L25.3366188643721 362.1454704715236C6.5835308860179 380.8985584498777 6.5835308860179 411.2227007127483 25.3366188643721 429.7762877551625L412.9669373956711 817.6021172036826C431.7200253740253 836.3552051820368 462.0441676368958 836.3552051820368 480.59775467931 817.6021172036826L868.2280732106092 429.9717986723836C886.9811611889633 411.2187106940295 886.9811611889633 380.894568431159 868.2280732106092 362.3409813887447L823.938865431943 318.0517736100786C804.9862765176489 299.0991846957845 774.0636314469585 299.4981865676644 755.5100444045443 318.8497773538383L526.6824708814356 559.0528942442421V-14.3127956471388C526.6824708814356 -40.8464201271506 505.3358707358623 -62.1930202727239 478.8022462558506 -62.1930202727239H414.9619467550705C388.4283222750588 -62.1930202727239 367.0817221294855 -40.8464201271506 367.0817221294855 -14.3127956471388V559.0528942442422L138.0546476704369 318.6542664366173C119.5010606280227 299.1031747145034 88.5784155573324 298.7041728426234 69.6258266430383 317.8562626928575z" />
+    <glyph glyph-name="alarm"
+      unicode="&#xE00D;"
+      horiz-adv-x="1024" d="M512 810.667C747.22 810.667 938.667 619.22 938.667 384C938.667 148.78 747.2199999999999 -42.6669999999999 511.9999999999999 -42.6669999999999C276.78 -42.667 85.333 148.78 85.333 384C85.333 619.22 276.78 810.667 512 810.667zM512 725.333C323.082 725.333 170.667 572.918 170.667 384C170.667 195.082 323.082 42.6669999999999 512 42.6669999999999C700.918 42.6669999999999 853.3330000000001 195.0819999999999 853.3330000000001 384C853.3330000000001 572.918 700.9180000000001 725.3330000000001 512 725.3330000000001zM512 266.581C542.476 266.581 565.333 244.054 565.333 213.3340000000001S542.476 160.085 512 160.085C480.83 160.085 458.667 182.6130000000001 458.667 214.015C458.667 244.053 481.524 266.581 512 266.581zM554.667 640V341.3330000000001H469.333V640H554.667z" />
+    <glyph glyph-name="alarm-1"
+      unicode="&#x61;&#x6C;&#x61;&#x72;&#x6D;"
+      horiz-adv-x="1024" d="M512 810.667C747.22 810.667 938.667 619.22 938.667 384C938.667 148.78 747.2199999999999 -42.6669999999999 511.9999999999999 -42.6669999999999C276.78 -42.667 85.333 148.78 85.333 384C85.333 619.22 276.78 810.667 512 810.667zM512 725.333C323.082 725.333 170.667 572.918 170.667 384C170.667 195.082 323.082 42.6669999999999 512 42.6669999999999C700.918 42.6669999999999 853.3330000000001 195.0819999999999 853.3330000000001 384C853.3330000000001 572.918 700.9180000000001 725.3330000000001 512 725.3330000000001zM512 266.581C542.476 266.581 565.333 244.054 565.333 213.3340000000001S542.476 160.085 512 160.085C480.83 160.085 458.667 182.6130000000001 458.667 214.015C458.667 244.053 481.524 266.581 512 266.581zM554.667 640V341.3330000000001H469.333V640H554.667z" />
+  </font>
+</defs>
+</svg>

src_data/locales/en.json

@@ -0,0 +1,455 @@
+{
+  "values": {
+    "logo": "OpenTherm Gateway",
+    "nav": {
+      "license": "License",
+      "source": "Source code",
+      "help": "Help",
+      "issues": "Issues & questions",
+      "releases": "Releases"
+    },
+    "dbm": "dBm",
+    "kw": "kW",
+    "time": {
+      "days": "d.",
+      "hours": "h.",
+      "min": "min.",
+      "sec": "sec."
+    },
+
+    "button": {
+      "upgrade": "Upgrade",
+      "restart": "Restart",
+      "save": "Save",
+      "saved": "Saved",
+      "refresh": "Refresh",
+      "restore": "Restore",
+      "restored": "Restored",
+      "backup": "Backup",
+      "wait": "Please wait...",
+      "uploading": "Uploading...",
+      "success": "Success",
+      "error": "Error"
+    },
+
+    "index": {
+      "title": "OpenTherm Gateway",
+
+      "section": {
+        "network": "Network",
+        "system": "System"
+      },
+
+      "system": {
+        "build": {
+          "title": "Build",
+          "version": "Version",
+          "date": "Date",
+          "core": "Core",
+          "sdk": "SDK"
+        },
+        "uptime": "Uptime",
+        "memory": {
+          "title": "Free memory",
+          "maxFreeBlock": "max free block",
+          "min": "min"
+        },
+        "board": "Board",
+        "chip": {
+          "model": "Chip",
+          "cores": "Cores",
+          "freq": "frequency"
+        },
+        "flash": {
+          "size": "Flash size",
+          "realSize": "real size"
+        },
+        "lastResetReason": "Last reset reason"
+      }
+    },
+
+    "dashboard": {
+      "name": "Dashboard",
+      "title": "Dashboard - OpenTherm Gateway",
+
+      "section": {
+        "control": "Control",
+        "states": "States",
+        "sensors": "Sensors",
+        "diag": "OpenTherm diagnostic"
+      },
+
+      "thermostat": {
+        "heating": "Heating",
+        "dhw": "DHW",
+        "temp.current": "Current",
+        "enable": "Enable",
+        "turbo": "Turbo mode"
+      },
+
+      "notify": {
+        "fault": {
+          "title": "Boiler Fault state is active!",
+          "note": "It is recommended to inspect the boiler and study the documentation to interpret the fault code:"
+        },
+        "diag": {
+          "title": "Boiler Diagnostic state is active!",
+          "note": "Perhaps your boiler needs inspection? It is recommended study the documentation to interpret the diag code:"
+        },
+        "reset": "Try reset"
+      },
+
+      "states": {
+        "mNetworkConnected": "Network connection",
+        "mMqttConnected": "MQTT connection",
+        "mEmergencyState": "Emergency mode",
+        "mExtPumpState": "External pump",
+        "mCascadeControlInput": "Cascade control (input)",
+        "mCascadeControlOutput": "Cascade control (output)",
+
+        "sConnected": "OpenTherm connection",
+        "sFlame": "Flame",
+        "sCooling": "Cooling",
+        "sFaultActive": "Fault",
+        "sFaultCode": "Fault code",
+        "sDiagActive": "Diagnostic",
+        "sDiagCode": "Diagnostic code",
+        
+        "mHeatEnabled": "Heating enabled",
+        "mHeatBlocking": "Heating blocked",
+        "sHeatActive": "Heating active",
+        "mHeatSetpointTemp": "Heating setpoint temp",
+        "mHeatTargetTemp": "Heating target temp",
+        "mHeatCurrTemp": "Heating current temp",
+        "mHeatRetTemp": "Heating return temp",
+        "mHeatIndoorTemp": "Heating, indoor temp",
+        "mHeatOutdoorTemp": "Heating, outdoor temp",
+
+        "mDhwEnabled": "DHW enabled",
+        "sDhwActive": "DHW active",
+        "mDhwTargetTemp": "DHW target temp",
+        "mDhwCurrTemp": "DHW current temp",
+        "mDhwRetTemp": "DHW return temp"
+      },
+
+      "sensors": {
+        "values": {
+          "temp": "Temperature",
+          "humidity": "Humidity",
+          "battery": "Battery",
+          "rssi": "RSSI"
+        }
+      }
+    },
+
+    "network": {
+      "title": "Network - OpenTherm Gateway",
+      "name": "Network settings",
+
+      "section": {
+        "static": "Static settings",
+        "availableNetworks": "Available networks",
+        "staSettings": "WiFi settings",
+        "apSettings": "AP settings"
+      },
+
+      "scan": {
+        "pos": "#",
+        "info": "Info"
+      },
+
+      "wifi": {
+        "ssid": "SSID",
+        "password": "Password",
+        "channel": "Channel",
+        "signal": "Signal",
+        "connected": "Connected"
+      },
+
+      "params": {
+        "hostname": "Hostname",
+        "dhcp": "Use DHCP",
+        "mac": "MAC",
+        "ip": "IP",
+        "subnet": "Subnet",
+        "gateway": "Gateway",
+        "dns": "DNS"
+      },
+
+      "sta": {
+        "channel.note": "set 0 for auto select"
+      }
+    },
+
+    "sensors": {
+      "title": "Sensors settings - OpenTherm Gateway",
+      "name": "Sensors settings",
+
+      "enabled": "Enabled",
+      "sensorName": {
+        "title": "Sensor name",
+        "note": "May only contain: a-z, A-Z, 0-9, _ and space"
+      },
+      "purpose": "Purpose",
+      "purposes": {
+        "outdoorTemp": "Outdoor temperature",
+        "indoorTemp": "Indoor temperature",
+        "heatTemp": "Heating, temperature",
+        "heatRetTemp": "Heating, return temperature",
+        "dhwTemp": "DHW, temperature",
+        "dhwRetTemp": "DHW, return temperature",
+        "dhwFlowRate": "DHW, flow rate",
+        "exhaustTemp": "Exhaust temperature",
+        "modLevel": "Modulation level (in percents)",
+        "powerFactor": "Power (in percent)",
+        "power": "Power (in kWt)",
+        "fanSpeed": "Fan speed",
+        "co2": "CO2",
+        "pressure": "Pressure",
+        "humidity": "Humidity",
+        "temperature": "Temperature",
+        "notConfigured": "Not configured"
+      },
+      "type": "Type/source",
+      "types": {
+        "otOutdoorTemp": "OpenTherm, outdoor temp",
+        "otHeatTemp": "OpenTherm, heating, temp",
+        "otHeatRetTemp": "OpenTherm, heating, return temp",
+        "otDhwTemp": "OpenTherm, DHW, temperature",
+        "otDhwTemp2": "OpenTherm, DHW, temperature 2",
+        "otDhwFlowRate": "OpenTherm, DHW, flow rate",
+        "otCh2Temp": "OpenTherm, channel 2, temp",
+        "otExhaustTemp": "OpenTherm, exhaust temp",
+        "otHeatExchangerTemp": "OpenTherm, heat exchanger temp",
+        "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",
+        "heatSetpointTemp": "Heating, setpoint temp",
+        "manual": "Manual via MQTT/API",
+        "notConfigured": "Not configured"
+      },
+      "gpio": "GPIO",
+      "address": {
+        "title": "Sensor address",
+        "note": "For auto detection of DALLAS sensors leave it at default, for BLE devices need a MAC address"
+      },
+      "correction": {
+        "desc": "Correction of values",
+        "offset": "Compensation (offset)",
+        "factor": "Multiplier"
+      },
+      "filtering": {
+        "desc": "Filtering values",
+        "enabled": {
+          "title": "Enabled filtering",
+          "note": "It can be useful if there is a lot of sharp noise on the charts. The filter used is \"Running Average\"."
+        },
+        "factor": {
+          "title": "Filtration factor",
+          "note": "The lower the value, the smoother and <u>longer</u> the change in numeric values."
+        }
+      }
+    },
+
+    "settings": {
+      "title": "Settings - OpenTherm Gateway",
+      "name": "Settings",
+
+      "section": {
+        "portal": "Portal settings",
+        "system": "System settings",
+        "diag": "Diagnostic",
+        "heating": "Heating settings",
+        "dhw": "DHW settings",
+        "emergency": "Emergency mode settings",
+        "equitherm": "Equitherm settings",
+        "pid": "PID settings",
+        "ot": "OpenTherm settings",
+        "mqtt": "MQTT settings",
+        "extPump": "External pump settings",
+        "cascadeControl": "Cascade control settings"
+      },
+
+      "enable": "Enable",
+      "note": {
+        "restart": "After changing these settings, the device must be restarted for the changes to take effect.",
+        "blankNotUse": "blank - not use",
+        "bleDevice": "BLE device can be used <u>only</u> with some ESP32 boards with BLE support!"
+      },
+
+      "temp": {
+        "min": "Minimum temperature",
+        "max": "Maximum temperature"
+      },
+
+      "portal": {
+        "login": "Login",
+        "password": "Password",
+        "auth": "Require authentication"
+      },
+
+      "system": {
+        "unit": "Unit system",
+        "metric": "Metric <small>(celsius, liters, bar)</small>",
+        "imperial": "Imperial <small>(fahrenheit, gallons, psi)</small>",
+        "statusLedGpio": "Status LED GPIO",
+        "logLevel": "Log level",
+        "serial": {
+          "enable": "Enabled Serial port",
+          "baud": "Serial port baud rate"
+        },
+        "telnet": {
+          "enable": "Enabled Telnet",
+          "port": {
+            "title": "Telnet port",
+            "note": "Default: 23"
+          }
+        }
+      },
+
+      "heating": {
+        "hyst": "Hysteresis <small>(in degrees)</small>",
+        "turboFactor": "Turbo mode coeff."
+      },
+
+      "emergency": {
+        "desc": "Emergency mode is activated automatically when «PID» or «Equitherm» cannot calculate the heat carrier setpoint:<br />- if «Equitherm» is enabled and the outdoor temperature sensor is disconnected;<br />- if «PID» or OT option <i>«Native heating control»</i> is enabled and the indoor temperature sensor is disconnected.<br /><b>Note:</b> On network fault or MQTT fault, sensors with <i>«Manual via MQTT/API»</i> type will be in DISCONNECTED state.",
+        
+        "target": {
+          "title": "Target temperature",
+          "note": "<b>Important:</b> <u>Target indoor temperature</u> if OT option <i>«Native heating control»</i> is enabled.<br />In all other cases, the <u>target heat carrier temperature</u>."
+        },
+        "treshold": "Treshold time <small>(sec)</small>"
+      },
+
+      "equitherm": {
+        "n": "N factor",
+        "k": "K factor",
+        "t": {
+          "title": "T factor",
+          "note": "Not used if PID is enabled"
+        }
+      },
+
+      "pid": {
+        "p": "P factor",
+        "i": "I factor",
+        "d": "D factor",
+        "dt": "DT <small>in seconds</small>",
+        "noteMinMaxTemp": "<b>Important:</b> When using «Equitherm» and «PID» at the same time, the min and max temperatures limit the influence on the «Equitherm» result temperature.<br />Thus, if the min temperature is set to -15 and the max temperature is set to 15, then the final heat carrier setpoint will be from <code>equitherm_result - 15</code> to <code>equitherm_result + 15</code>."
+      },
+
+      "ot": {
+        "advanced": "Advanced Settings",
+        "inGpio": "In GPIO",
+        "outGpio": "Out GPIO",
+        "ledGpio": "RX LED GPIO",
+        "memberId": "Master member ID",
+        "flags": "Master flags",
+        "maxMod": "Max modulation level",
+        "minPower": {
+          "title": "Min boiler power <small>(kW)</small>",
+          "note": "This value is at 0-1% boiler modulation level. Typically found in the boiler specification as \"minimum useful heat output\"."
+        },
+        "maxPower": {
+          "title": "Max boiler power <small>(kW)</small>",
+          "note": "<b>0</b> - try detect automatically. Typically found in the boiler specification as \"maximum useful heat output\"."
+        },
+
+        "options": {
+          "desc": "Options",
+          "dhwSupport": "DHW support",
+          "coolingSupport": "Cooling support",
+          "summerWinterMode": "Summer/winter mode",
+          "heatingStateToSummerWinterMode": "Heating state as summer/winter mode",
+          "ch2AlwaysEnabled": "CH2 always enabled",
+          "heatingToCh2": "Duplicate heating to CH2",
+          "dhwToCh2": "Duplicate DHW to CH2",
+          "dhwBlocking": "DHW blocking",
+          "modulationSyncWithHeating": "Sync modulation with heating",
+          "maxTempSyncWithTargetTemp": "Sync max heating temp with target temp",
+          "getMinMaxTemp": "Get min/max temp from boiler",
+          "immergasFix": "Fix for Immergas boilers"
+        },
+
+        "nativeHeating": {
+          "title": "Native heating control (boiler)",
+          "note": "Works <u>ONLY</u> if the boiler requires the desired room temperature and regulates the temperature of the coolant itself. Not compatible with PID and Equitherm regulators in firmware."
+        }
+      },
+
+      "mqtt": {
+        "homeAssistantDiscovery": "Home Assistant Discovery",
+        "server": "Server",
+        "port": "Port",
+        "user": "User",
+        "password": "Password",
+        "prefix": "Prefix",
+        "interval": "Publish interval <small>(sec)</small>"
+      },
+
+      "extPump": {
+        "use": "Use external pump",
+        "gpio": "Relay GPIO",
+        "postCirculationTime": "Post circulation time <small>(min)</small>",
+        "antiStuckInterval": "Anti stuck interval <small>(days)</small>",
+        "antiStuckTime": "Anti stuck time <small>(min)</small>"
+      },
+
+      "cascadeControl": {
+        "input": {
+          "desc": "Can be used to turn on the heating only if another boiler is faulty. The other boiler controller must change the state of the GPIO input in the event of a fault.",
+          "enable": "Enabled input",
+          "gpio": "GPIO",
+          "invertState": "Invert GPIO state",
+          "thresholdTime": "State change threshold time <small>(sec)</small>"
+        },
+        "output": {
+          "desc": "Can be used to switch on another boiler <u>via relay</u>.",
+          "enable": "Enabled output",
+          "gpio": "GPIO",
+          "invertState": "Invert GPIO state",
+          "thresholdTime": "State change threshold time <small>(sec)</small>",
+          "events": {
+            "desc": "Events",
+            "onFault": "If the fault state is active",
+            "onLossConnection": "If the connection via Opentherm is lost",
+            "onEnabledHeating": "If heating is enabled"
+          }
+        }
+      }
+    },
+
+    "upgrade": {
+      "title": "Upgrade - OpenTherm Gateway",
+      "name": "Upgrade",
+
+      "section": {
+        "backupAndRestore": "Backup & restore",
+        "backupAndRestore.desc": "In this section you can save and restore a backup of ALL settings.",
+        "upgrade": "Upgrade",
+        "upgrade.desc": "In this section you can upgrade the firmware and filesystem of your device.<br />Latest releases can be downloaded from the <a href=\"https://github.com/Laxilef/OTGateway/releases\" target=\"_blank\">Releases page</a> of the project repository." 
+      },
+
+      "note": {
+        "disclaimer1": "After a successful upgrade the filesystem, ALL settings will be reset to default values! Save backup before upgrading.",
+        "disclaimer2": "After a successful upgrade, the device will automatically reboot after 15 seconds."
+      },
+
+      "settingsFile": "Settings file",
+      "fw": "Firmware",
+      "fs": "Filesystem"
+    }
+  }
+}

src_data/locales/ru.json

@@ -0,0 +1,455 @@
+{
+  "values": {
+    "logo": "OpenTherm Gateway",
+    "nav": {
+      "license": "Лицензия",
+      "source": "Исходный код",
+      "help": "Помощь",
+      "issues": "Проблемы и вопросы",
+      "releases": "Релизы"
+    },
+    "dbm": "дБм",
+    "kw": "кВт",
+    "time": {
+      "days": "д.",
+      "hours": "ч.",
+      "min": "мин.",
+      "sec": "сек."
+    },
+
+    "button": {
+      "upgrade": "Обновить",
+      "restart": "Перезагрузка",
+      "save": "Сохранить",
+      "saved": "Сохранено",
+      "refresh": "Обновить",
+      "restore": "Восстановить настройки",
+      "restored": "Восстановлено",
+      "backup": "Сохранить настройки",
+      "wait": "Пожалуйста, подождите...",
+      "uploading": "Загрузка...",
+      "success": "Успешно",
+      "error": "Ошибка"
+    },
+
+    "index": {
+      "title": "OpenTherm Gateway",
+
+      "section": {
+        "network": "Сеть",
+        "system": "Система"
+      },
+
+      "system": {
+        "build": {
+          "title": "Билд",
+          "version": "Версия",
+          "date": "Дата",
+          "core": "Ядро",
+          "sdk": "SDK"
+        },
+        "uptime": "Аптайм",
+        "memory": {
+          "title": "ОЗУ",
+          "maxFreeBlock": "макс. блок",
+          "min": "мин."
+        },
+        "board": "Плата",
+        "chip": {
+          "model": "Чип",
+          "cores": "Кол-во ядер",
+          "freq": "частота"
+        },
+        "flash": {
+          "size": "Размер ПЗУ",
+          "realSize": "реальный размер"
+        },
+        "lastResetReason": "Причина перезагрузки"
+      }
+    },
+
+    "dashboard": {
+      "name": "Дашборд",
+      "title": "Дашборд - OpenTherm Gateway",
+
+      "section": {
+        "control": "Управление",
+        "states": "Состояние",
+        "sensors": "Сенсоры",
+        "diag": "Диагностика OpenTherm"
+      },
+
+      "thermostat": {
+        "heating": "Отопление",
+        "dhw": "ГВС",
+        "temp.current": "Текущая",
+        "enable": "Вкл",
+        "turbo": "Турбо"
+      },
+
+      "notify": {
+        "fault": {
+          "title": "Состояние неисправности котла активно!",
+          "note": "Рекомендуется осмотреть котел и изучить документацию котла для расшифровки кода неисправности:"
+        },
+        "diag": {
+          "title": "Состояние диагностики котла активно!",
+          "note": "Возможно, вашему котлу требуется проверка? Рекомендуется изучить документацию котла для расшифровки кода диагностики:"
+        },
+        "reset": "Сбросить"
+      },
+
+      "states": {
+        "mNetworkConnected": "Подключение к сети",
+        "mMqttConnected": "Подключение к MQTT",
+        "mEmergencyState": "Аварийный режим",
+        "mExtPumpState": "Внешний насос",
+        "mCascadeControlInput": "Каскадное управление (вход)",
+        "mCascadeControlOutput": "Каскадное управление (выход)",
+
+        "sConnected": "Подключение к OpenTherm",
+        "sFlame": "Пламя",
+        "sCooling": "Охлаждение",
+        "sFaultActive": "Ошибка",
+        "sFaultCode": "Код ошибки",
+        "sDiagActive": "Диагностика",
+        "sDiagCode": "Диагностический код",
+        
+        "mHeatEnabled": "Отопление",
+        "mHeatBlocking": "Блокировка отопления",
+        "sHeatActive": "Активность отопления",
+        "mHeatSetpointTemp": "Отопление, уставка",
+        "mHeatTargetTemp": "Отопление, целевая температура",
+        "mHeatCurrTemp": "Отопление, текущая температура",
+        "mHeatRetTemp": "Отопление, температура обратки",
+        "mHeatIndoorTemp": "Отопление, внутренняя темп.",
+        "mHeatOutdoorTemp": "Отопление, наружная темп.",
+
+        "mDhwEnabled": "ГВС",
+        "sDhwActive": "Активность ГВС",
+        "mDhwTargetTemp": "ГВС, целевая температура",
+        "mDhwCurrTemp": "ГВС, текущая температура",
+        "mDhwRetTemp": "ГВС, температура обратки"
+      },
+      
+      "sensors": {
+        "values": {
+          "temp": "Температура",
+          "humidity": "Влажность",
+          "battery": "Уровень заряда",
+          "rssi": "RSSI"
+        }
+      }
+    },
+
+    "network": {
+      "title": "Сеть - OpenTherm Gateway",
+      "name": "Настройки сети",
+
+      "section": {
+        "static": "Статические параметры",
+        "availableNetworks": "Доступные сети",
+        "staSettings": "Настройки подключения",
+        "apSettings": "Настройки точки доступа"
+      },
+
+      "scan": {
+        "pos": "#",
+        "info": "Инфо"
+      },
+
+      "wifi": {
+        "ssid": "Имя сети",
+        "password": "Пароль",
+        "channel": "Канал",
+        "signal": "Сигнал",
+        "connected": "Подключено"
+      },
+
+      "params": {
+        "hostname": "Имя хоста",
+        "dhcp": "Использовать DHCP",
+        "mac": "MAC адрес",
+        "ip": "IP адрес",
+        "subnet": "Адрес подсети",
+        "gateway": "Адрес шлюза",
+        "dns": "DNS адрес"
+      },
+
+      "sta": {
+        "channel.note": "установите 0 для автоматического выбора"
+      }
+    },
+
+    "sensors": {
+      "title": "Настройки сенсоров - OpenTherm Gateway",
+      "name": "Настройки сенсоров",
+
+      "enabled": "Включить и использовать",
+      "sensorName": {
+        "title": "Имя сенсора",
+        "note": "Может содержать только: a-z, A-Z, 0-9, _ и пробел"
+      },
+      "purpose": "Назначение",
+      "purposes": {
+        "outdoorTemp": "Внешняя температура",
+        "indoorTemp": "Внутренняя температура",
+        "heatTemp": "Отопление, температура",
+        "heatRetTemp": "Отопление, температура обратки",
+        "dhwTemp": "ГВС, температура",
+        "dhwRetTemp": "ГВС, температура обратки",
+        "dhwFlowRate": "ГВС, расход/скорость потока",
+        "exhaustTemp": "Температура выхлопных газов",
+        "modLevel": "Уровень модуляции (в процентах)",
+        "powerFactor": "Мощность (в процентах)",
+        "power": "Мощность (в кВт)",
+        "fanSpeed": "Скорость вентилятора",
+        "co2": "CO2",
+        "pressure": "Давление",
+        "humidity": "Влажность",
+        "temperature": "Температура",
+        "notConfigured": "Не сконфигурировано"
+      },
+      "type": "Тип/источник",
+      "types": {
+        "otOutdoorTemp": "OpenTherm, внешняя температура",
+        "otHeatTemp": "OpenTherm, отопление, температура",
+        "otHeatRetTemp": "OpenTherm, отопление, температура обратки",
+        "otDhwTemp": "OpenTherm, ГВС, температура",
+        "otDhwTemp2": "OpenTherm, ГВС, температура 2",
+        "otDhwFlowRate": "OpenTherm, ГВС, расход/скорость потока",
+        "otCh2Temp": "OpenTherm, канал 2, температура",
+        "otExhaustTemp": "OpenTherm, температура выхлопных газов",
+        "otHeatExchangerTemp": "OpenTherm, температура теплообменника",
+        "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 датчик",
+        "heatSetpointTemp": "Отопление, температура уставки",
+        "manual": "Вручную через MQTT/API",
+        "notConfigured": "Не сконфигурировано"
+      },
+      "gpio": "GPIO датчика",
+      "address": {
+        "title": "Адрес датчика",
+        "note": "Для DALLAS датчиков оставьте по умолчанию для автоопределения, для BLE устройств необходимо указать MAC адрес"
+      },
+      "correction": {
+        "desc": "Коррекция показаний",
+        "offset": "Компенсация (смещение)",
+        "factor": "Множитель"
+      },
+      "filtering": {
+        "desc": "Фильтрация показаний",
+        "enabled": {
+          "title": "Включить фильтрацию",
+          "note": "Может быть полезно, если на графиках много резкого шума. В качестве фильтра используется \"бегущее среднее\"."
+        },
+        "factor": {
+          "title": "Коэфф. фильтрации",
+          "note": "Чем меньше коэф., тем плавнее и <u>дольше</u> изменение числовых значений."
+        }
+      }
+    },
+
+    "settings": {
+      "title": "Настройки - OpenTherm Gateway",
+      "name": "Настройки",
+
+      "section": {
+        "portal": "Настройки портала",
+        "system": "Системные настройки",
+        "diag": "Диагностика",
+        "heating": "Настройки отопления",
+        "dhw": "Настройки ГВС",
+        "emergency": "Настройки аварийного режима",
+        "equitherm": "Настройки ПЗА",
+        "pid": "Настройки ПИД",
+        "ot": "Настройки OpenTherm",
+        "mqtt": "Настройки MQTT",
+        "extPump": "Настройки дополнительного насоса",
+        "cascadeControl": "Настройки каскадного управления"
+      },
+
+      "enable": "Вкл",
+      "note": {
+        "restart": "После изменения этих настроек устройство необходимо перезагрузить, чтобы изменения вступили в силу.",
+        "blankNotUse": "пусто - не использовать",
+        "bleDevice": "BLE устройство можно использовать <u>только</u> с некоторыми платами ESP32, которые поддерживают BLE!"
+      },
+
+      "temp": {
+        "min": "Мин. температура",
+        "max": "Макс. температура"
+      },
+
+      "portal": {
+        "login": "Логин",
+        "password": "Пароль",
+        "auth": "Требовать аутентификацию"
+      },
+
+      "system": {
+        "unit": "Система единиц",
+        "metric": "Метрическая <small>(цильсии, литры, бары)</small>",
+        "imperial": "Imperial <small>(фаренгейты, галлоны, psi)</small>",
+        "statusLedGpio": "Статус LED GPIO",
+        "logLevel": "Уровень логирования",
+        "serial": {
+          "enable": "Вкл. Serial порт",
+          "baud": "Скорость Serial порта"
+        },
+        "telnet": {
+          "enable": "Вкл. Telnet",
+          "port": {
+            "title": "Telnet порт",
+            "note": "По умолчанию: 23"
+          }
+        }
+      },
+
+      "heating": {
+        "hyst": "Гистерезис <small>(в градусах)</small>",
+        "turboFactor": "Коэфф. турбо режима"
+      },
+
+      "emergency": {
+        "desc": "Аварийный режим активируется автоматически, если «ПИД» или «ПЗА» не могут рассчитать уставку теплоносителя:<br />- если «ПЗА» включен и датчик наружной температуры отключен;<br />- если включен «ПИД» или OT опция <i>«Передать управление отоплением котлу»</i> и датчик внутренней температуры отключен.<br /><b>Примечание:</b> При сбое сети или MQTT датчики с типом <i>«Вручную через MQTT/API»</i> будут находиться в состоянии ОТКЛЮЧЕН.",
+        
+        "target": {
+          "title": "Целевая температура",
+          "note": "<b>Важно:</b> <u>Целевая температура в помещении</u>, если включена ОТ опция <i>«Передать управление отоплением котлу»</i>.<br />Во всех остальных случаях <u>целевая температура теплоносителя</u>."
+        },
+        "treshold": "Пороговое время включения <small>(сек)</small>"
+      },
+
+      "equitherm": {
+        "n": "Коэффициент N",
+        "k": "Коэффициент K",
+        "t": {
+          "title": "Коэффициент T",
+          "note": "Не используется, если ПИД включен"
+        }
+      },
+
+      "pid": {
+        "p": "Коэффициент P",
+        "i": "Коэффициент I",
+        "d": "Коэффициент D",
+        "dt": "DT <small>(сек)</small>",
+        "noteMinMaxTemp": "<b>Важно:</b> При использовании «ПЗА» и «ПИД» одновременно, мин. и макс. температура ограничивает влияние на расчётную температуру «ПЗА».<br />Таким образом, если мин. температура задана как -15, а макс. как 15, то конечная температура теплоносителя будет от <code>equitherm_result - 15</code> до <code>equitherm_result + 15</code>."
+      },
+
+      "ot": {
+        "advanced": "Дополнительные настройки",
+        "inGpio": "Вход GPIO",
+        "outGpio": "Выход GPIO",
+        "ledGpio": "RX LED GPIO",
+        "memberId": "Master member ID",
+        "flags": "Master flags",
+        "maxMod": "Макс. уровень модуляции",
+        "minPower": {
+          "title": "Мин. мощность котла <small>(кВт)</small>",
+          "note": "Это значение соответствует уровню модуляции котла 0–1%. Обычно можно найти в спецификации котла как \"минимальная полезная тепловая мощность\"."
+        },
+        "maxPower": {
+          "title": "Макс. мощность котла <small>(кВт)</small>",
+          "note": "<b>0</b> - попробовать определить автоматически. Обычно можно найти в спецификации котла как \"максимальная полезная тепловая мощность\"."
+        },
+
+        "options": {
+          "desc": "Опции",
+          "dhwSupport": "Поддержка ГВС",
+          "coolingSupport": "Поддержка охлаждения",
+          "summerWinterMode": "Летний/зимний режим",
+          "heatingStateToSummerWinterMode": "Летний/зимний режим в качестве состояния отопления",
+          "ch2AlwaysEnabled": "Канал 2 всегда вкл.",
+          "heatingToCh2": "Дублировать параметры отопления в канал 2",
+          "dhwToCh2": "Дублировать параметры ГВС в канал 2",
+          "dhwBlocking": "DHW blocking",
+          "modulationSyncWithHeating": "Синхронизировать модуляцию с отоплением",
+          "maxTempSyncWithTargetTemp": "Синхронизировать макс. темп. отопления с целевой темп.",
+          "getMinMaxTemp": "Получать мин. и макс. температуру от котла",
+          "immergasFix": "Фикс для котлов Immergas"
+        },
+
+        "nativeHeating": {
+          "title": "Передать управление отоплением котлу",
+          "note": "Работает <u>ТОЛЬКО</u> если котел требует и принимает целевую температуру в помещении и сам регулирует температуру теплоносителя на основе встроенного режима кривых. Несовместимо с ПИД и ПЗА."
+        }
+      },
+
+      "mqtt": {
+        "homeAssistantDiscovery": "Home Assistant Discovery",
+        "server": "Адрес сервера",
+        "port": "Порт",
+        "user": "Имя пользователя",
+        "password": "Пароль",
+        "prefix": "Префикс",
+        "interval": "Интервал публикации <small>(сек)</small>"
+      },
+
+      "extPump": {
+        "use": "Использовать доп. насос",
+        "gpio": "GPIO реле",
+        "postCirculationTime": "Время постциркуляции <small>(в минутах)</small>",
+        "antiStuckInterval": "Интервал защиты от блокировки <small>(в днях)</small>",
+        "antiStuckTime": "Время работы насоса <small>(в минутах)</small>"
+      },
+
+      "cascadeControl": {
+        "input": {
+          "desc": "Может использоваться для включения отопления только при неисправности другого котла. Контроллер другого котла должен изменить состояние входа GPIO в случае неисправности.",
+          "enable": "Включить вход",
+          "gpio": "GPIO",
+          "invertState": "Инвертировать состояние GPIO",
+          "thresholdTime": "Пороговое время изменения состояния <small>(сек)</small>"
+        },
+        "output": {
+          "desc": "Может использоваться для включения другого котла <u>через реле</u>.",
+          "enable": "Включить выход",
+          "gpio": "GPIO",
+          "invertState": "Инвертировать состояние GPIO",
+          "thresholdTime": "Пороговое время изменения состояния <small>(сек)</small>",
+          "events": {
+            "desc": "События",
+            "onFault": "Если состояние fault (ошибки) активно",
+            "onLossConnection": "Если соединение по OpenTherm потеряно",
+            "onEnabledHeating": "Если отопление включено"
+          }
+        }
+      }
+    },
+
+    "upgrade": {
+      "title": "Обновление - OpenTherm Gateway",
+      "name": "Обновление",
+
+      "section": {
+        "backupAndRestore": "Резервное копирование и восстановление",
+        "backupAndRestore.desc": "В этом разделе вы можете сохранить и восстановить резервную копию ВСЕХ настроек.",
+        "upgrade": "Обновление",
+        "upgrade.desc": "В этом разделе вы можете обновить прошивку и файловую систему вашего устройства.<br />Последнюю версию можно загрузить со страницы <a href=\"https://github.com/Laxilef/OTGateway/releases\" target=\"_blank\">Релизы</a> в репозитории проекта." 
+      },
+
+      "note": {
+        "disclaimer1": "После успешного обновления файловой системы ВСЕ настройки будут сброшены на стандартные! Создайте резервную копию ПЕРЕД обновлением.",
+        "disclaimer2": "После успешного обновления устройство автоматически перезагрузится через 15 секунд."
+      },
+
+      "settingsFile": "Файл настроек",
+      "fw": "Прошивка",
+      "fs": "Файловая система"
+    }
+  }
+}

src_data/pages/dashboard.html

@@ -0,0 +1,740 @@
+<!doctype html>
+<html lang="en">
+  <head>
+    <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?{BUILD_TIME}" />
+  </head>
+
+  <body>
+    <header class="container">
+      <nav>
+        <ul>
+          <li>
+            <a href="/">
+              <div class="logo" data-i18n>logo</div>
+            </a>
+          </li>
+        </ul>
+        <ul>
+          <li>
+            <select id="lang" aria-label="Lang">
+              <option value="en" selected>EN</option>
+              <option value="ru">RU</option>
+            </select>
+          </li>
+        </ul>
+      </nav>
+    </header>
+
+    <main class="container">
+      <article>
+        <hgroup>
+          <h2 data-i18n>dashboard.name</h2>
+          <p></p>
+        </hgroup>
+
+        <div id="dashboard-busy" aria-busy="true"></div>
+        <div id="dashboard-container" class="hidden">
+          <details open>
+            <summary><b data-i18n>dashboard.section.control</b></summary>
+            <div class="grid">
+              <div class="thermostat" id="thermostat-heating">
+                <div class="thermostat-header" data-i18n>dashboard.thermostat.heating</div>
+                <div class="thermostat-temp">
+                  <div class="thermostat-temp-target"><span id="tHeatTargetTemp"></span> <span class="tempUnit"></span></div>
+                  <div class="thermostat-temp-current"><span data-i18n>dashboard.thermostat.temp.current</span>: <span id="tHeatCurrentTemp"></span> <span class="tempUnit"></span></div>
+                </div>
+                <div class="thermostat-minus"><button id="tHeatActionMinus" class="outline"><i class="icons-down"></i></button></div>
+                <div class="thermostat-plus"><button id="tHeatActionPlus" class="outline"><i class="icons-up"></i></button></div>
+                <div class="thermostat-control">
+                  <input type="checkbox" role="switch" id="tHeatEnabled" value="true">
+                  <label htmlFor="tHeatEnabled" data-i18n>dashboard.thermostat.enable</label>
+
+                  <input type="checkbox" role="switch" id="tHeatTurbo" value="true">
+                  <label htmlFor="tHeatTurbo" data-i18n>dashboard.thermostat.turbo</label>
+                </div>
+              </div>
+
+              <div class="thermostat" id="thermostat-dhw">
+                <div class="thermostat-header" data-i18n>dashboard.thermostat.dhw</div>
+                <div class="thermostat-temp">
+                  <div class="thermostat-temp-target"><span id="tDhwTargetTemp"></span> <span class="tempUnit"></span></div>
+                  <div class="thermostat-temp-current"><span data-i18n>dashboard.thermostat.temp.current</span>: <span id="tDhwCurrentTemp"></span> <span class="tempUnit"></span></div>
+                </div>
+                <div class="thermostat-minus"><button class="outline" id="tDhwActionMinus"><i class="icons-down"></i></button></div>
+                <div class="thermostat-plus"><button class="outline" id="tDhwActionPlus"><i class="icons-up"></i></button></div>
+                <div class="thermostat-control">
+                  <input type="checkbox" role="switch" id="tDhwEnabled" value="true">
+                  <label htmlFor="tDhwEnabled" data-i18n>dashboard.thermostat.enable</label>
+                </div>
+              </div>
+            </div>
+            
+            <div class="notify notify-error notify-fault hidden">
+              <div class="notify-icon">
+                <i class="icons-error"></i>
+              </div>
+              <div class="notify-content">
+                <b data-i18n>dashboard.notify.fault.title</b><br />
+                <small>
+                  <span data-i18n>dashboard.notify.fault.note</span> <b class="sFaultCode"></b>
+                </small>
+              </div>
+              <div class="notify-actions">
+                <button class="reset" data-i18n>dashboard.notify.reset</button>
+              </div>
+            </div>
+
+            <div class="notify notify-alarm notify-diag hidden">
+              <div class="notify-icon">
+                <i class="icons-alarm"></i>
+              </div>
+              <div class="notify-content">
+                <b data-i18n>dashboard.notify.diag.title</b><br />
+                <small>
+                  <span data-i18n>dashboard.notify.diag.note</span> <b class="sDiagCode"></b>
+                </small>
+              </div>
+              <div class="notify-actions">
+                <button class="reset" data-i18n>dashboard.notify.reset</button>
+              </div>
+            </div>
+          </details>
+
+          <hr />
+
+          <details>
+            <summary><b data-i18n>dashboard.section.states</b></summary>
+            <table>
+              <tbody>
+                <tr>
+                  <th scope="row" data-i18n>dashboard.states.mNetworkConnected</th>
+                  <td><i class="mNetworkConnected"></i></td>
+                </tr>
+                <tr>
+                  <th scope="row" data-i18n>dashboard.states.mMqttConnected</th>
+                  <td><i class="mMqttConnected"></i></td>
+                </tr>
+                <tr>
+                  <th scope="row" data-i18n>dashboard.states.mEmergencyState</th>
+                  <td><i class="mEmergencyState"></i></td>
+                </tr>
+                <tr>
+                  <th scope="row" data-i18n>dashboard.states.mExtPumpState</th>
+                  <td><i class="mExtPumpState"></i></td>
+                </tr>
+                <tr>
+                  <th scope="row" data-i18n>dashboard.states.mCascadeControlInput</th>
+                  <td><i class="mCascadeControlInput"></i></td>
+                </tr>
+                <tr>
+                  <th scope="row" data-i18n>dashboard.states.mCascadeControlOutput</th>
+                  <td><i class="mCascadeControlOutput"></i></td>
+                </tr>
+
+
+                <tr>
+                  <th scope="row" data-i18n>dashboard.states.sConnected</th>
+                  <td><i class="sConnected"></i></td>
+                </tr>
+                <tr>
+                  <th scope="row" data-i18n>dashboard.states.sFlame</th>
+                  <td><i class="sFlame"></i></td>
+                </tr>
+                <tr>
+                  <th scope="row" data-i18n>dashboard.states.sCooling</th>
+                  <td><i class="sCooling"></i></td>
+                </tr>
+
+
+                <tr>
+                  <th scope="row" data-i18n>dashboard.states.sFaultActive</th>
+                  <td><i class="sFaultActive"></i></td>
+                </tr>
+                <tr>
+                  <th scope="row" data-i18n>dashboard.states.sFaultCode</th>
+                  <td><b class="sFaultCode"></b></td>
+                </tr>
+                <tr>
+                  <th scope="row" data-i18n>dashboard.states.sDiagActive</th>
+                  <td><i class="sDiagActive"></i></td>
+                </tr>
+                <tr>
+                  <th scope="row" data-i18n>dashboard.states.sDiagCode</th>
+                  <td><b class="sDiagCode"></b></td>
+                </tr>
+
+
+                <tr>
+                  <th scope="row" data-i18n>dashboard.states.mHeatEnabled</th>
+                  <td><i class="mHeatEnabled"></i></td>
+                </tr>
+                <tr>
+                  <th scope="row" data-i18n>dashboard.states.mHeatBlocking</th>
+                  <td><i class="mHeatBlocking"></i></td>
+                </tr>
+                <tr>
+                  <th scope="row" data-i18n>dashboard.states.sHeatActive</th>
+                  <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>
+                </tr>
+                <tr>
+                  <th scope="row" data-i18n>dashboard.states.mHeatRetTemp</th>
+                  <td><b class="mHeatRetTemp"></b> <span class="tempUnit"></span></td>
+                </tr>
+                <tr>
+                  <th scope="row" data-i18n>dashboard.states.mHeatIndoorTemp</th>
+                  <td><b class="mHeatIndoorTemp"></b> <span class="tempUnit"></span></td>
+                </tr>
+                <tr>
+                  <th scope="row" data-i18n>dashboard.states.mHeatOutdoorTemp</th>
+                  <td><b class="mHeatOutdoorTemp"></b> <span class="tempUnit"></span></td>
+                </tr>
+
+
+                <tr>
+                  <th scope="row" data-i18n>dashboard.states.mDhwEnabled</th>
+                  <td><i class="mDhwEnabled"></i></td>
+                </tr>
+                <tr>
+                  <th scope="row" data-i18n>dashboard.states.sDhwActive</th>
+                  <td><i class="sDhwActive"></i></td>
+                </tr>
+                <tr>
+                  <th scope="row" data-i18n>dashboard.states.mDhwTargetTemp</th>
+                  <td><b class="mDhwTargetTemp"></b> <span class="tempUnit"></span></td>
+                </tr>
+                <tr>
+                  <th scope="row" data-i18n>dashboard.states.mDhwCurrTemp</th>
+                  <td><b class="mDhwCurrTemp"></b> <span class="tempUnit"></span></td>
+                </tr>
+                <tr>
+                  <th scope="row" data-i18n>dashboard.states.mDhwRetTemp</th>
+                  <td><b class="mDhwRetTemp"></b> <span class="tempUnit"></span></td>
+                </tr>
+              </tbody>
+            </table>
+          </details>
+
+          <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>
+<b>Member ID:</b>          <span class="sMemberId"></span>
+<b>Flags:</b>              <span class="sFlags"></span>
+<b>Type:</b>               <span class="sType"></span>
+<b>AppVersion:</b>         <span class="sAppVersion"></span>
+<b>OT version:</b>         <span class="sProtocolVersion"></span>
+<b>Modulation limits:</b>  <span class="sModMin"></span>...<span class="sModMax"></span> %
+<b>Power limits:</b>       <span class="sPowerMin"></span>...<span class="sPowerMax"></span> kW
+<b>Heating limits:</b>     <span class="sHeatMinTemp"></span>...<span class="sHeatMaxTemp"></span> <span class="tempUnit"></span>
+<b>DHW limits:</b>         <span class="sDhwMinTemp"></span>...<span class="sDhwMaxTemp"></span> <span class="tempUnit"></span></pre>
+          </details>
+        </div>
+      </article>
+    </main>
+
+    <footer class="container">
+      <small>
+        <b>Made by Laxilef</b>
+        • <a href="https://github.com/Laxilef/OTGateway/blob/master/LICENSE" target="_blank" class="secondary" data-i18n>nav.license</a>
+        • <a href="https://github.com/Laxilef/OTGateway/blob/master/" target="_blank" class="secondary" data-i18n>nav.source</a>
+        • <a href="https://github.com/Laxilef/OTGateway/wiki" target="_blank" class="secondary" data-i18n>nav.help</a>
+        • <a href="https://github.com/Laxilef/OTGateway/issues" target="_blank" class="secondary" data-i18n>nav.issues</a>
+        • <a href="https://github.com/Laxilef/OTGateway/releases" target="_blank" class="secondary" data-i18n>nav.releases</a>
+      </small>
+    </footer>
+
+    <script src="/static/app.js?{BUILD_TIME}"></script>
+    <script>
+      let modifiedTime = null;
+      let noRegulators;
+      let prevSettings;
+      let newSettings = {
+        heating: {
+          enable: false,
+          turbo: false,
+          target: 0
+        },
+        dhw: {
+          enable: false,
+          target: 0
+        }
+      };
+
+      document.addEventListener('DOMContentLoaded', async () => {
+        const lang = new Lang(document.getElementById('lang'));
+        lang.build();
+
+        document.querySelector('#tHeatActionMinus').addEventListener('click', (event) => {
+          if (!prevSettings) {
+            return;
+          }
+
+          newSettings.heating.target -= 0.5;
+          modifiedTime = Date.now();
+
+          let minTemp;
+          if (noRegulators) {
+            minTemp = prevSettings.heating.minTemp;
+          } else {
+            minTemp = prevSettings.system.unitSystem == 0 ? 5 : 41;
+          }
+
+          if (prevSettings && newSettings.heating.target < minTemp) {
+            newSettings.heating.target = minTemp;
+          }
+
+          setValue('#tHeatTargetTemp', newSettings.heating.target);
+        });
+
+        document.querySelector('#tHeatActionPlus').addEventListener('click', (event) => {
+          if (!prevSettings) {
+            return;
+          }
+
+          newSettings.heating.target += 0.5;
+          modifiedTime = Date.now();
+
+          let maxTemp;
+          if (noRegulators) {
+            maxTemp = prevSettings.heating.maxTemp;
+          } else {
+            maxTemp = prevSettings.system.unitSystem == 0 ? 30 : 86;
+          }
+
+          if (prevSettings && newSettings.heating.target > maxTemp) {
+            newSettings.heating.target = maxTemp;
+          }
+
+          setValue('#tHeatTargetTemp', newSettings.heating.target);
+        });
+
+        document.querySelector('#tDhwActionMinus').addEventListener('click', (event) => {
+          if (!prevSettings) {
+            return;
+          }
+
+          newSettings.dhw.target -= 1.0;
+          modifiedTime = Date.now();
+
+          if (newSettings.dhw.target < prevSettings.dhw.minTemp) {
+            newSettings.dhw.target = prevSettings.dhw.minTemp;
+          }
+
+          setValue('#tDhwTargetTemp', newSettings.dhw.target);
+        });
+
+        document.querySelector('#tDhwActionPlus').addEventListener('click', (event) => {
+          if (!prevSettings) {
+            return;
+          }
+
+          newSettings.dhw.target += 1.0;
+          modifiedTime = Date.now();
+
+          if (newSettings.dhw.target > prevSettings.dhw.maxTemp) {
+            newSettings.dhw.target = prevSettings.dhw.maxTemp;
+          }
+
+          setValue('#tDhwTargetTemp', newSettings.dhw.target);
+        });
+
+        document.querySelector('#tHeatEnabled').addEventListener('change', (event) => {
+          modifiedTime = Date.now();
+          newSettings.heating.enabled = event.currentTarget.checked;
+        });
+
+        document.querySelector('#tHeatTurbo').addEventListener('change', (event) => {
+          modifiedTime = Date.now();
+          newSettings.heating.turbo = event.currentTarget.checked;
+        });
+
+        document.querySelector('#tDhwEnabled').addEventListener('change', (event) => {
+          modifiedTime = Date.now();
+          newSettings.dhw.enabled = event.currentTarget.checked;
+        });
+
+        document.querySelector('.notify-fault .reset').addEventListener('click', async (event) => {
+          const resetBtn = document.querySelector(".notify-fault .reset");
+          if (!resetBtn.disabled) {
+            resetBtn.disabled = true;
+          }
+
+          let response = await fetch("/api/vars", {
+            method: "POST",
+            cache: "no-cache",
+            credentials: "include",
+            headers: {
+              "Content-Type": "application/json"
+            },
+            body: JSON.stringify({
+              "actions": {
+                "resetFault": true
+              }
+            })
+          });
+
+          setTimeout(() => {
+            if (resetBtn.disabled) {
+              resetBtn.disabled = false;
+            }
+          }, 10000);
+        });
+
+        document.querySelector('.notify-diag .reset').addEventListener('click', async (event) => {
+          const resetBtn = document.querySelector(".notify-diag .reset");
+          if (!resetBtn.disabled) {
+            resetBtn.disabled = true;
+          }
+
+          let response = await fetch("/api/vars", {
+            method: "POST",
+            cache: "no-cache",
+            credentials: "include",
+            headers: {
+              "Content-Type": "application/json"
+            },
+            body: JSON.stringify({
+              "actions": {
+                "resetDiagnostic": true
+              }
+            })
+          });
+
+          setTimeout(() => {
+            if (resetBtn.disabled) {
+              resetBtn.disabled = false;
+            }
+          }, 10000);
+        });
+
+        setTimeout(async function onLoadPage() {
+          let unitSystem = null;
+
+          if (modifiedTime) {
+            if ((Date.now() - modifiedTime) < 5000) {
+              setTimeout(onLoadPage, 1000);
+              return;
+            }
+
+            modifiedTime = null;
+          }
+
+          // settings
+          try {
+            let modified = prevSettings && (
+              (prevSettings.heating.enabled != newSettings.heating.enabled)
+              || (prevSettings.heating.turbo != newSettings.heating.turbo)
+              || (prevSettings.heating.target != newSettings.heating.target)
+              || (prevSettings.opentherm.options.dhwSupport && prevSettings.dhw.enabled != newSettings.dhw.enabled)
+              || (prevSettings.opentherm.options.dhwSupport && prevSettings.dhw.target != newSettings.dhw.target)
+            );
+
+            if (modified) {
+              console.log(newSettings);
+            }
+
+            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);
+            if (!response.ok) {
+              throw new Error('Response not valid');
+            }
+
+            const result = await response.json();
+            noRegulators = !result.opentherm.options.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;
+            newSettings.dhw.enabled = result.dhw.enabled;
+            newSettings.dhw.target = result.dhw.target;
+
+            if (result.opentherm.options.dhwSupport) {
+              show('#thermostat-dhw');
+            } else {
+              hide('#thermostat-dhw');
+            }
+
+            setCheckboxValue('#tHeatEnabled', result.heating.enabled);
+            setCheckboxValue('#tHeatTurbo', result.heating.turbo);
+            setValue('#tHeatTargetTemp', result.heating.target);
+
+            setCheckboxValue('#tDhwEnabled', result.dhw.enabled);
+            setValue('#tDhwTargetTemp', result.dhw.target);
+
+            setValue('.tempUnit', temperatureUnit(unitSystem));
+            setValue('.pressureUnit', pressureUnit(unitSystem));
+            setValue('.volumeUnit', volumeUnit(unitSystem));
+
+          } catch (error) {
+            console.log(error);
+          }
+
+          // vars
+          try {
+            const response = await fetch("/api/vars", {
+              cache: "no-cache",
+              credentials: "include"
+            });
+            
+            if (!response.ok) {
+              throw new Error('Response not valid');
+            }
+
+            const result = await response.json();
+            
+            // Graph
+            setValue('#tHeatCurrentTemp', result.master.heating.indoorTempControl 
+              ? result.master.heating.indoorTemp 
+              : result.master.heating.currentTemp
+            );
+            setValue('#tDhwCurrentTemp', result.master.dhw.currentTemp);
+            
+
+            // SLAVE
+            setValue('.sMemberId', result.slave.memberId);
+            setValue('.sVendor', memberIdToVendor(result.slave.memberId));
+            setValue('.sFlags', result.slave.flags);
+            setValue('.sType', result.slave.type);
+            setValue('.sAppVersion', result.slave.appVersion);
+            setValue('.sProtocolVersion', result.slave.protocolVersion);
+
+            setStatus(
+              '.sConnected',
+              result.slave.connected ? "success" : "error",
+              result.slave.connected ? "green" : "red"
+            );
+            setState('.sFlame', result.slave.flame);
+            setState('.sCooling', result.slave.cooling);
+
+            setValue('.sModMin', result.slave.modulation.min);
+            setValue('.sModMax', result.slave.modulation.max);
+
+            setValue('.sPowerMin', result.slave.power.min);
+            setValue('.sPowerMax', result.slave.power.max);
+
+            setState('.sHeatActive', result.slave.heating.active);
+            setValue('.sHeatMinTemp', result.slave.heating.minTemp);
+            setValue('.sHeatMaxTemp', result.slave.heating.maxTemp);
+
+            setState('.sDhwActive', result.slave.dhw.active);
+            setValue('.sDhwMinTemp', result.slave.dhw.minTemp);
+            setValue('.sDhwMaxTemp', result.slave.dhw.maxTemp);
+
+            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)})`
+                : "-"
+            );
+
+            if (result.slave.fault.active) {
+              show(".notify-fault");
+
+            } else {
+              hide('.notify-fault');
+            }
+
+            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)})`
+                : "-"
+            );
+
+            if (result.slave.diag.active) {
+              show(".notify-diag");
+
+            } else {
+              hide('.notify-diag');
+            }
+
+
+            // MASTER
+            setState('.mHeatEnabled', result.master.heating.enabled);
+            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);
+            setValue('.mHeatIndoorTemp', result.master.heating.indoorTemp);
+            setValue('.mHeatOutdoorTemp', result.master.heating.outdoorTemp);
+            setValue('.mHeatMinTemp', result.master.heating.minTemp);
+            setValue('.mHeatMaxTemp', result.master.heating.maxTemp);
+
+            setState('.mDhwEnabled', result.master.dhw.enabled);
+            setValue('.mDhwTargetTemp', result.master.dhw.targetTemp);
+            setValue('.mDhwCurrTemp', result.master.dhw.currentTemp);
+            setValue('.mDhwRetTemp', result.master.dhw.returnTemp);
+            setValue('.mDhwMinTemp', result.master.dhw.minTemp);
+            setValue('.mDhwMaxTemp', result.master.dhw.maxTemp);
+
+            setStatus(
+              '.mNetworkConnected',
+              result.master.network.connected ? "success" : "error",
+              result.master.network.connected ? "green" : "red"
+            );
+            setState('.mMqttConnected', result.master.mqtt.connected);
+            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);
+
+            setBusy('#dashboard-busy', '#dashboard-container', false);
+
+          } catch (error) {
+            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);
+      });
+    </script>
+  </body>
+</html>

src_data/pages/index.html

@@ -0,0 +1,235 @@
+<!doctype html>
+<html lang="en">
+  <head>
+    <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?{BUILD_TIME}" />
+  </head>
+
+  <body>
+    <header class="container">
+      <nav>
+        <ul>
+          <li>
+            <a href="/">
+              <div class="logo" data-i18n>logo</div>
+            </a>
+          </li>
+        </ul>
+        <ul>
+          <li>
+            <select id="lang" aria-label="Lang">
+              <option value="en" selected>EN</option>
+              <option value="ru">RU</option>
+            </select>
+          </li>
+        </ul>
+      </nav>
+    </header>
+
+    <main class="container">
+      <article>
+        <div>
+          <hgroup>
+            <h2 data-i18n>index.section.network</h2>
+            <p></p>
+          </hgroup>
+
+          <div id="main-busy" aria-busy="true"></div>
+          <table id="main-table" class="hidden">
+            <tbody>
+              <tr>
+                <th scope="row" data-i18n>network.params.hostname</th>
+                <td><b id="network-hostname"></b></td>
+              </tr>
+              <tr>
+                <th scope="row" data-i18n>network.params.mac</th>
+                <td><b id="network-mac"></b></td>
+              </tr>
+              <tr>
+                <th scope="row" data-i18n>network.wifi.connected</th>
+                <td><i id="network-connected"></i></td>
+              </tr>
+              <tr>
+                <th scope="row" data-i18n>network.wifi.ssid</th>
+                <td><b id="network-ssid"></b></td>
+              </tr>
+              <tr>
+                <th scope="row" data-i18n>network.wifi.signal</th>
+                <td><b id="network-signal"></b> %</td>
+              </tr>
+              <tr>
+                <th scope="row" data-i18n>network.params.ip</th>
+                <td><b id="network-ip"></b></td>
+              </tr>
+              <tr>
+                <th scope="row" data-i18n>network.params.subnet</th>
+                <td><b id="network-subnet"></b></td>
+              </tr>
+              <tr>
+                <th scope="row" data-i18n>network.params.gateway</th>
+                <td><b id="network-gateway"></b></td>
+              </tr>
+              <tr>
+                <th scope="row" data-i18n>network.params.dns</th>
+                <td><b id="network-dns"></b></td>
+              </tr>
+            </tbody>
+          </table>
+          <div class="grid">
+            <a href="/network.html" role="button" data-i18n>network.name</a>
+          </div>
+        </div>
+      </article>
+
+      <article>
+        <div>
+          <hgroup>
+            <h2 data-i18n>index.section.system</h2>
+            <p></p>
+          </hgroup>
+
+          <div id="system-busy" aria-busy="true"></div>
+          <table id="system-table" class="hidden">
+            <tbody>
+              <tr>
+                <th scope="row" data-i18n>index.system.build.version</th>
+                <td><b id="build-version"></b></td>
+              </tr>
+              <tr>
+                <th scope="row" data-i18n>index.system.build.title</th>
+                <td>
+                  Env: <b id="build-env"></b><br />
+                  <span data-i18n>index.system.build.date</span>: <b id="build-date"></b><br />
+                  <span data-i18n>index.system.build.core</span>: <b id="build-core"></b><br />
+                  <span data-i18n>index.system.build.sdk</span>: <b id="build-sdk"></b>
+                </td>
+              </tr>
+              <tr>
+                <th scope="row" data-i18n>index.system.uptime</th>
+                <td>
+                  <b id="uptime-days"></b> <span data-i18n>time.days</span>, 
+                  <b id="uptime-hours"></b> <span data-i18n>time.hours</span>, 
+                  <b id="uptime-min"></b> <span data-i18n>time.min</span>, 
+                  <b id="uptime-sec"></b> <span data-i18n>time.sec</span>
+                </td>
+              </tr>
+              <tr>
+                <th scope="row" data-i18n>index.system.memory.title</th>
+                <td>
+                  <b id="heap-free"></b> of <b id="heap-total"></b> bytes (<span data-i18n>index.system.memory.min</span>: <b id="heap-min-free"></b> bytes)<br />
+                  <span data-i18n>index.system.memory.maxFreeBlock</span>: <b id="heap-max-free-block"></b> bytes (<span data-i18n>index.system.memory.min</span>: <b id="heap-min-max-free-block"></b> bytes)
+                </td>
+              </tr>
+              <tr>
+                <th scope="row" data-i18n>index.system.board</th>
+                <td>
+                  <span data-i18n>index.system.chip.model</span>: <b id="chip-model"></b> (rev. <span id="chip-rev"></span>)<br />
+                  <span data-i18n>index.system.chip.cores</span>: <b id="chip-cores"></b>, <span data-i18n>index.system.chip.freq</span>: <b id="chip-freq"></b> mHz<br />
+                  <span data-i18n>index.system.flash.size</span>: <b id="flash-size"></b> MB (<span data-i18n>index.system.flash.realSize</span>: <b id="flash-real-size"></b> MB)
+                </td>
+              </tr>
+              <tr>
+                <th scope="row" data-i18n>index.system.lastResetReason</th>
+                <td>
+                  <b id="reset-reason"></b><br />
+                  <a href="/api/debug" target="_blank"><small>Save debug data</small></a>
+                </td>
+              </tr>
+            </tbody>
+          </table>
+
+          <div class="grid" style="grid-template-columns: repeat(auto-fit,minmax(12rem,1fr)) !important;">
+            <a href="/dashboard.html" role="button" data-i18n>dashboard.name</a>
+            <a href="/settings.html" role="button" data-i18n>settings.name</a>
+            <a href="/sensors.html" role="button" data-i18n>sensors.name</a>
+            <a href="/upgrade.html" role="button" data-i18n>upgrade.name</a>
+            <a href="/restart.html" role="button" class="secondary restart" data-i18n>button.restart</a>
+          </div>
+        </div>
+      </article>
+    </main>
+
+    <footer class="container">
+      <small>
+        <b>Made by Laxilef</b>
+        • <a href="https://github.com/Laxilef/OTGateway/blob/master/LICENSE" target="_blank" class="secondary" data-i18n>nav.license</a>
+        • <a href="https://github.com/Laxilef/OTGateway/blob/master/" target="_blank" class="secondary" data-i18n>nav.source</a>
+        • <a href="https://github.com/Laxilef/OTGateway/wiki" target="_blank" class="secondary" data-i18n>nav.help</a>
+        • <a href="https://github.com/Laxilef/OTGateway/issues" target="_blank" class="secondary" data-i18n>nav.issues</a>
+        • <a href="https://github.com/Laxilef/OTGateway/releases" target="_blank" class="secondary" data-i18n>nav.releases</a>
+      </small>
+    </footer>
+
+    <script src="/static/app.js?{BUILD_TIME}"></script>
+    <script>
+      document.addEventListener('DOMContentLoaded', async () => {
+        const lang = new Lang(document.getElementById('lang'));
+        lang.build();
+
+        setTimeout(async function onLoadPage() {
+          try {
+            const response = await fetch("/api/info", {
+              cache: "no-cache",
+              credentials: "include"
+            });
+            
+            if (!response.ok) {
+              throw new Error('Response not valid');
+            }
+
+            const result = await response.json();
+            setValue('#reset-reason', result.system.resetReason);
+            setValue('#uptime', result.system.uptime);
+            setValue('#uptime-days', Math.floor(result.system.uptime / 86400));
+            setValue('#uptime-hours', Math.floor(result.system.uptime % 86400 / 3600));
+            setValue('#uptime-min', Math.floor(result.system.uptime % 3600 / 60));
+            setValue('#uptime-sec', Math.floor(result.system.uptime % 60));
+
+            setValue('#network-hostname', result.network.hostname);
+            setValue('#network-mac', result.network.mac);
+            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);
+            setValue('#network-subnet', result.network.subnet);
+            setValue('#network-gateway', result.network.gateway);
+            setValue('#network-dns', result.network.dns);
+            setBusy('#main-busy', '#main-table', false);
+
+            setValue('#build-version', result.build.version);
+            setValue('#build-date', result.build.date);
+            setValue('#build-env', result.build.env);
+            setValue('#build-core', result.build.core);
+            setValue('#build-sdk', result.build.sdk);
+
+            setValue('#heap-total', result.heap.total);
+            setValue('#heap-free', result.heap.free);
+            setValue('#heap-min-free', result.heap.minFree);
+            setValue('#heap-max-free-block', result.heap.maxFreeBlock);
+            setValue('#heap-min-max-free-block', result.heap.minMaxFreeBlock);
+
+            setValue('#chip-model', result.chip.model);
+            setValue('#chip-rev', result.chip.rev);
+            setValue('#chip-cores', result.chip.cores);
+            setValue('#chip-freq', result.chip.freq);
+            setValue('#flash-size', result.flash.size / 1024 / 1024);
+            setValue('#flash-real-size', result.flash.realSize / 1024 / 1024);
+
+            setBusy('#system-busy', '#system-table', false);
+
+          } catch (error) {
+            console.log(error);
+          }
+
+          setTimeout(onLoadPage, 10000);
+        }, 1000);
+      });
+    </script>
+  </body>
+</html>

src_data/pages/network.html

@@ -0,0 +1,225 @@
+<!doctype html>
+<html lang="en">
+  <head>
+    <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?{BUILD_TIME}" />
+  </head>
+
+  <body>
+    <header class="container">
+      <nav>
+        <ul>
+          <li>
+            <a href="/">
+              <div class="logo" data-i18n>logo</div>
+            </a>
+          </li>
+        </ul>
+        <ul>
+          <li>
+            <select id="lang" aria-label="Lang">
+              <option value="en" selected>EN</option>
+              <option value="ru">RU</option>
+            </select>
+          </li>
+        </ul>
+      </nav>
+    </header>
+
+    <main class="container">
+      <article>
+        <div>
+          <hgroup>
+            <h2 data-i18n>network.name</h2>
+            <p></p>
+          </hgroup>
+
+          <div id="network-settings-busy" aria-busy="true"></div>
+          <form action="/api/network/settings" id="network-settings" class="hidden">
+            <label>
+              <span data-i18n>network.params.hostname</span>
+              <input type="text" name="hostname" maxlength="24" pattern="[A-Za-z0-9]+[A-Za-z0-9\-]+[A-Za-z0-9]+" required>
+            </label>
+
+            <label>
+              <input type="checkbox" name="useDhcp" value="true">
+              <span data-i18n>network.params.dhcp</span>
+            </label>
+            <br />
+            <hr />
+            <h4 data-i18n>network.section.static</h4>
+
+            <label>
+              <span data-i18n>network.params.ip</span>
+              <input type="text" name="staticConfig[ip]" value="true" maxlength="16" pattern="\d{1,3}\.\d{1,3}\.\d{1,3}\.\d{1,3}" required>
+            </label>
+
+            <label>
+              <span data-i18n>network.params.gateway</span>
+              <input type="text" name="staticConfig[gateway]" maxlength="16" pattern="\d{1,3}\.\d{1,3}\.\d{1,3}\.\d{1,3}" required>
+            </label>
+
+            <label>
+              <span data-i18n>network.params.subnet</span>
+              <input type="text" name="staticConfig[subnet]" maxlength="16" pattern="\d{1,3}\.\d{1,3}\.\d{1,3}\.\d{1,3}" required>
+            </label>
+
+            <label>
+              <span data-i18n>network.params.dns</span>
+              <input type="text" name="staticConfig[dns]" maxlength="16" pattern="\d{1,3}\.\d{1,3}\.\d{1,3}\.\d{1,3}" required>
+            </label>
+
+            <button type="submit" data-i18n>button.save</button>
+          </form>
+        </div>
+      </article>
+
+      <article>
+        <div>
+          <hgroup>
+            <h3 data-i18n>network.section.availableNetworks</h3>
+            <p></p>
+          </hgroup>
+
+          <form action="/api/network/scan" id="network-scan">
+            <div style="max-height: 25rem;" class="overflow-auto">
+              <table id="networks" role="grid">
+                <thead>
+                  <tr>
+                    <th scope="col" data-i18n>network.scan.pos</th>
+                    <th scope="col" data-i18n>network.wifi.ssid</th>
+                    <th scope="col" data-i18n>network.scan.info</th>
+                  </tr>
+                </thead>
+                <tbody></tbody>
+              </table>
+            </div>
+
+            <button type="submit" data-i18n>button.refresh</button>
+          </form>
+
+          <hr />
+          <div>
+            <hgroup>
+              <h2 data-i18n>network.section.staSettings</h2>
+              <p></p>
+            </hgroup>
+
+            <div id="sta-settings-busy" aria-busy="true"></div>
+            <form action="/api/network/settings" id="sta-settings" class="hidden">
+              <label>
+                <span data-i18n>network.wifi.ssid</span>
+                <input type="text" name="sta[ssid]" maxlength="32" required>
+              </label>
+
+              <label>
+                <span data-i18n>network.wifi.password</span>
+                <input type="password" name="sta[password]" maxlength="64" required>
+              </label>
+
+              <label>
+                <span data-i18n>network.wifi.channel</span>
+                <input type="number" inputmode="numeric" name="sta[channel]" min="0" max="12" step="1" required>
+                <small data-i18n>network.sta.channel.note</small>
+              </label>
+
+              <button type="submit" data-i18n>button.save</button>
+            </form>
+          </div>
+        </div>
+      </article>
+
+      <article>
+        <div>
+          <hgroup>
+            <h2 data-i18n>network.section.apSettings</h2>
+            <p></p>
+          </hgroup>
+
+          <div id="ap-settings-busy" aria-busy="true"></div>
+          <form action="/api/network/settings" id="ap-settings" class="hidden">
+            <label>
+              <span data-i18n>network.wifi.ssid</span>
+              <input type="text" name="ap[ssid]" maxlength="32" required>
+            </label>
+
+            <label>
+              <span data-i18n>network.wifi.password</span>
+              <input type="text" name="ap[password]" maxlength="64" required>
+            </label>
+
+            <label>
+              <span data-i18n>network.wifi.channel</span>
+              <input type="number" inputmode="numeric" name="ap[channel]" min="1" max="12" step="1" required>
+            </label>
+
+            <button type="submit" data-i18n>button.save</button>
+          </form>
+        </div>
+      </article>
+    </main>
+
+    <footer class="container">
+      <small>
+        <b>Made by Laxilef</b>
+        • <a href="https://github.com/Laxilef/OTGateway/blob/master/LICENSE" target="_blank" class="secondary" data-i18n>nav.license</a>
+        • <a href="https://github.com/Laxilef/OTGateway/blob/master/" target="_blank" class="secondary" data-i18n>nav.source</a>
+        • <a href="https://github.com/Laxilef/OTGateway/wiki" target="_blank" class="secondary" data-i18n>nav.help</a>
+        • <a href="https://github.com/Laxilef/OTGateway/issues" target="_blank" class="secondary" data-i18n>nav.issues</a>
+        • <a href="https://github.com/Laxilef/OTGateway/releases" target="_blank" class="secondary" data-i18n>nav.releases</a>
+      </small>
+    </footer>
+
+    <script src="/static/app.js?{BUILD_TIME}"></script>
+    <script>
+      document.addEventListener('DOMContentLoaded', async () => {
+        const lang = new Lang(document.getElementById('lang'));
+        lang.build();
+
+        const fillData = (data) => {
+          setInputValue("[name='hostname']", data.hostname);
+          setCheckboxValue("[name='useDhcp']", data.useDhcp);
+          setInputValue("[name='staticConfig[ip]']", data.staticConfig.ip);
+          setInputValue("[name='staticConfig[gateway]']", data.staticConfig.gateway);
+          setInputValue("[name='staticConfig[subnet]']", data.staticConfig.subnet);
+          setInputValue("[name='staticConfig[dns]']", data.staticConfig.dns);
+          setBusy('#network-settings-busy', '#network-settings', false);
+
+          setInputValue("[name='sta[ssid]']", data.sta.ssid);
+          setInputValue("[name='sta[password]']", data.sta.password);
+          setInputValue("[name='sta[channel]']", data.sta.channel);
+          setBusy('#sta-settings-busy', '#sta-settings', false);
+
+          setInputValue("[name='ap[ssid]']", data.ap.ssid);
+          setInputValue("[name='ap[password]']", data.ap.password);
+          setInputValue("[name='ap[channel]']", data.ap.channel);
+          setBusy('#ap-settings-busy', '#ap-settings', false);
+        };
+
+        try {
+          const response = await fetch("/api/network/settings", {
+            cache: "no-cache",
+            credentials: "include"
+          });
+          
+          if (!response.ok) {
+            throw new Error('Response not valid');
+          }
+
+          const result = await response.json();
+          fillData(result);
+
+          setupForm('#network-settings', fillData, ['hostname']);
+          setupNetworkScanForm('#network-scan', '#networks');
+          setupForm('#sta-settings', fillData, ['sta.ssid', 'sta.password']);
+          setupForm('#ap-settings', fillData, ['ap.ssid', 'ap.password']);
+
+        } catch (error) {
+          console.log(error);
+        }
+      });
+    </script>
+  </body>
+</html>

src_data/pages/sensors.html

@@ -0,0 +1,321 @@
+<!doctype html>
+<html lang="en">
+  <head>
+    <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?{BUILD_TIME}" />
+  </head>
+
+  <body>
+    <header class="container">
+      <nav>
+        <ul>
+          <li>
+            <a href="/">
+              <div class="logo" data-i18n>logo</div>
+            </a>
+          </li>
+        </ul>
+        <ul>
+          <li>
+            <select id="lang" aria-label="Lang">
+              <option value="en" selected>EN</option>
+              <option value="ru">RU</option>
+            </select>
+          </li>
+        </ul>
+      </nav>
+    </header>
+
+    <main class="container">
+      <article>
+        <hgroup>
+          <h2 data-i18n>sensors.name</h2>
+          <p></p>
+        </hgroup>
+
+        <details id="template" class="sensor hidden" data-id="" data-preloaded="0">
+          <summary><b>#<span class="id"></span>: <span class="name"></span></b></summary>
+
+          <div>
+            <div class="form-busy" aria-busy="true"></div>
+            <form action="/api/sensor?id={id}" class="hidden">
+              <fieldset>
+                <label>
+                  <input type="checkbox" role="switch" name="enabled" value="true">
+                  <span data-i18n>sensors.enabled</span>
+                </label>
+
+                <br />
+
+                <label>
+                  <span data-i18n>sensors.sensorName.title</span>
+                  <input type="text" name="name" maxlength="32" required>
+                  <small data-i18n>sensors.sensorName.note</small>
+                </label>
+
+                <div class="grid">
+                  <label>
+                    <span data-i18n>sensors.purpose</span>
+                    <select name="purpose" required>
+                      <option value="0" data-i18n>sensors.purposes.outdoorTemp</option>
+                      <option value="1" data-i18n>sensors.purposes.indoorTemp</option>
+                      <option value="2" data-i18n>sensors.purposes.heatTemp</option>
+                      <option value="3" data-i18n>sensors.purposes.heatRetTemp</option>
+                      <option value="4" data-i18n>sensors.purposes.dhwTemp</option>
+                      <option value="5" data-i18n>sensors.purposes.dhwRetTemp</option>
+                      <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="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>
+                      <option value="255" data-i18n>sensors.purposes.notConfigured</option>
+                    </select>
+                  </label>
+
+                  <label>
+                    <span data-i18n>sensors.type</span>
+                    <select name="type" required>
+                      <option value="0" data-i18n>sensors.types.otOutdoorTemp</option>
+                      <option value="1" data-i18n>sensors.types.otHeatTemp</option>
+                      <option value="2" data-i18n>sensors.types.otHeatRetTemp</option>
+                      <option value="3" data-i18n>sensors.types.otDhwTemp</option>
+                      <option value="4" data-i18n>sensors.types.otDhwTemp2</option>
+                      <option value="5" data-i18n>sensors.types.otDhwFlowRate</option>
+                      <option value="6" data-i18n>sensors.types.otCh2Temp</option>
+                      <option value="7" data-i18n>sensors.types.otExhaustTemp</option>
+                      <option value="8" data-i18n>sensors.types.otHeatExchangerTemp</option>
+                      <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>
+                      <option value="253" data-i18n>sensors.types.heatSetpointTemp</option>
+                      <option value="254" data-i18n>sensors.types.manual</option>
+                      <option value="255" data-i18n>sensors.types.notConfigured</option>
+                    </select>
+                  </label>
+                </div>
+              </fieldset>
+
+              <div class="grid">
+                <label>
+                  <span data-i18n>sensors.gpio</span>
+                  <input type="number" outputmode="numeric" name="gpio" min="0" max="254" step="1">
+                </label>
+
+                <label>
+                  <span data-i18n>sensors.address.title</span>
+                  <input type="text" name="address">
+                  <small data-i18n>sensors.address.note</small>
+                </label>
+              </div>
+
+              <hr class="correction" />
+
+              <details class="correction">
+                <summary><b data-i18n>sensors.correction.desc</b></summary>
+
+                <div class="grid">
+                  <label>
+                    <span data-i18n>sensors.correction.offset</span>
+                    <input type="number" inputmode="decimal" name="offset" min="-20" max="20" step="0.01" required>
+                  </label>
+
+                  <label>
+                    <span data-i18n>sensors.correction.factor</span>
+                    <input type="number" inputmode="decimal" name="factor" min="0.01" max="10" step="0.01" required>
+                  </label>
+                </div>
+              </details>
+
+              <hr class="filtering" />
+
+              <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="decimal" 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>
+        </details>
+      </article>
+    </main>
+
+    <footer class="container">
+      <small>
+        <b>Made by Laxilef</b>
+        • <a href="https://github.com/Laxilef/OTGateway/blob/master/LICENSE" target="_blank" class="secondary" data-i18n>nav.license</a>
+        • <a href="https://github.com/Laxilef/OTGateway/blob/master/" target="_blank" class="secondary" data-i18n>nav.source</a>
+        • <a href="https://github.com/Laxilef/OTGateway/wiki" target="_blank" class="secondary" data-i18n>nav.help</a>
+        • <a href="https://github.com/Laxilef/OTGateway/issues" target="_blank" class="secondary" data-i18n>nav.issues</a>
+        • <a href="https://github.com/Laxilef/OTGateway/releases" target="_blank" class="secondary" data-i18n>nav.releases</a>
+      </small>
+    </footer>
+
+    <script src="/static/app.js?{BUILD_TIME}"></script>
+    <script>
+      document.addEventListener("DOMContentLoaded", async () => {
+        const lang = new Lang(document.getElementById("lang"));
+        lang.build();
+
+        const container = document.querySelector("article");
+        const templateNode = container.querySelector("#template");
+
+        try {
+          const response = await fetch("/api/sensors", {
+            cache: "no-cache",
+            credentials: "include"
+          });
+
+          if (!response.ok) {
+            throw new Error("Response not valid");
+          }
+
+          const result = await response.json();
+          for (const sensorId in result) {
+            const sensorNode = templateNode.cloneNode(true);
+            sensorNode.removeAttribute("id");
+            sensorNode.classList.remove("hidden");
+            sensorNode.dataset.id = sensorId;
+            setValue(".id", sensorId, sensorNode);
+            setValue(".name", result[sensorId], sensorNode);
+            
+            container.appendChild(sensorNode);
+            container.appendChild(document.createElement("hr"));
+
+            const sensorForm = sensorNode.querySelector("form");
+            const fillData = (data) => {
+              setCheckboxValue("[name='enabled']", data.enabled, sensorForm);
+              setInputValue("[name='name']", data.name, {}, sensorForm);
+              setSelectValue("[name='purpose']", data.purpose, sensorForm);
+              setSelectValue("[name='type']", data.type, sensorForm);
+              setInputValue("[name='gpio']", data.gpio < 255 ? data.gpio : "", {}, sensorForm);
+              setInputValue("[name='address']", data.address, {}, sensorForm);
+              setInputValue("[name='offset']", data.offset, {}, sensorForm);
+              setInputValue("[name='factor']", data.factor, {}, sensorForm);
+              setCheckboxValue("[name='filtering']", data.filtering, sensorForm);
+              setInputValue("[name='filteringFactor']", data.filteringFactor, {}, sensorForm);
+
+              sensorForm.querySelector("[name='type']").dispatchEvent(new Event("change"));
+
+              setBusy(".form-busy", "form", false, sensorNode);
+            };
+
+            sensorForm.action = sensorForm.action.replace("{id}", sensorId);
+            sensorForm.querySelector("[name='type']").addEventListener("change", async (event) => {
+              const gpio = sensorForm.querySelector("[name='gpio']");
+              const address = sensorForm.querySelector("[name='address']");
+              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:
+                  parentGpio.classList.remove("hidden");
+                  parentAddress.classList.add("hidden");
+                  address.removeAttribute("pattern");
+                  break;
+
+                // dallas
+                case 51:
+                  parentGpio.classList.remove("hidden");
+                  parentAddress.classList.remove("hidden");
+                  address.setAttribute("pattern", "([A-Fa-f0-9]{2}:){7}[A-Fa-f0-9]{2}");
+                  break;
+
+                // ble
+                case 52:
+                  parentGpio.classList.add("hidden");
+                  parentAddress.classList.remove("hidden");
+                  address.setAttribute("pattern", "([A-Fa-f0-9]{2}:){5}[A-Fa-f0-9]{2}");
+                  break;
+
+                // other
+                default:
+                  parentGpio.classList.add("hidden");
+                  parentAddress.classList.add("hidden");
+                  address.removeAttribute("pattern");
+                  break;
+              }
+            });
+
+            sensorNode.addEventListener("click", async (event) => {
+              if (parseInt(sensorNode.dataset.preloaded)) {
+                return;
+              }
+
+              try {
+                const response = await fetch(sensorForm.action, {
+                  cache: "no-cache",
+                  credentials: "include"
+                });
+                
+                if (response.status != 200) {
+                  return;
+                }
+
+                const result = await response.json();
+                fillData(result);
+                sensorNode.dataset.preloaded = 1;
+
+              } catch (error) {
+                console.log(error);
+              }
+            });
+            
+            setupForm(`.sensor[data-id='${sensorId}'] form`, fillData, ['address']);
+          }
+
+        } catch (error) {
+          console.log(error);
+        }
+      });
+    </script>
+  </body>
+</html>

src_data/pages/settings.html

@@ -0,0 +1,859 @@
+<!doctype html>
+<html lang="en">
+  <head>
+    <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?{BUILD_TIME}" />
+  </head>
+
+  <body>
+    <header class="container">
+      <nav>
+        <ul>
+          <li>
+            <a href="/">
+              <div class="logo" data-i18n>logo</div>
+            </a>
+          </li>
+        </ul>
+        <ul>
+          <li>
+            <select id="lang" aria-label="Lang">
+              <option value="en" selected>EN</option>
+              <option value="ru">RU</option>
+            </select>
+          </li>
+        </ul>
+      </nav>
+    </header>
+
+    <main class="container">
+      <article>
+        <hgroup>
+          <h2 data-i18n>settings.name</h2>
+          <p></p>
+        </hgroup>
+
+        <details>
+          <summary><b data-i18n>settings.section.portal</b></summary>
+          <div>
+            <div id="portal-settings-busy" aria-busy="true"></div>
+            <form action="/api/settings" id="portal-settings" class="hidden">
+              <div class="grid">
+                <label>
+                  <span data-i18n>settings.portal.login</span>
+                  <input type="text" name="portal[login]" maxlength="12" required>
+                </label>
+
+                <label>
+                  <span data-i18n>settings.portal.password</span>
+                  <input type="password" name="portal[password]" maxlength="32" required>
+                </label>
+              </div>
+
+              <label>
+                <input type="checkbox" name="portal[auth]" value="true">
+                <span data-i18n>settings.portal.auth</span>
+              </label>
+              <br />
+
+              <button type="submit" data-i18n>button.save</button>
+            </form>
+          </div>
+        </details>
+
+        <hr />
+
+        <details>
+          <summary><b data-i18n>settings.section.system</b></summary>
+          <div>
+            <div id="system-settings-busy" aria-busy="true"></div>
+            <form action="/api/settings" id="system-settings" class="hidden">
+              <fieldset>
+                <legend data-i18n>settings.system.unit</legend>
+
+                <label>
+                  <input type="radio" name="system[unitSystem]" value="0" />
+                  <span data-i18n>settings.system.metric</span>
+                </label>
+
+                <label>
+                  <input type="radio" name="system[unitSystem]" value="1" />
+                  <span data-i18n>settings.system.imperial</span>
+                </label>
+              </fieldset>
+
+              <fieldset>
+                <label>
+                  <span data-i18n>settings.system.statusLedGpio</span>
+                  <input type="number" inputmode="numeric" name="system[statusLedGpio]" min="0" max="254" step="1">
+                  <small data-i18n>settings.note.blankNotUse</small>
+                </label>
+              </fieldset>
+
+              <fieldset>
+                <legend data-i18n>settings.section.diag</legend>
+
+                <label>
+                  <input type="checkbox" name="system[serial][enabled]" value="true">
+                  <span data-i18n>settings.system.serial.enable</span>
+                </label>
+
+                <label>
+                  <input type="checkbox" name="system[telnet][enabled]" value="true">
+                  <span data-i18n>settings.system.telnet.enable</span>
+                </label>
+
+                <label>
+                  <span data-i18n>settings.system.logLevel</span>
+                  <select name="system[logLevel]">
+                    <option value="0">SILENT</option>
+                    <option value="1">FATAL</option>
+                    <option value="2">ERROR</option>
+                    <option value="3">WARNING</option>
+                    <option value="4">INFO</option>
+                    <option value="5">NOTICE</option>
+                    <option value="6">TRACE</option>
+                    <option value="7">VERBOSE</option>
+                  </select>
+                </label>
+
+                <div class="grid">
+                  <label>
+                    <span data-i18n>settings.system.serial.baud</span>
+                    <select name="system[serial][baudrate]" required>
+                      <option value="9600">9600</option>
+                      <option value="19200">19200</option>
+                      <option value="38400">38400</option>
+                      <option value="57600">57600</option>
+                      <option value="74880">74880</option>
+                      <option value="115200">115200</option>
+                    </select>
+                  </label>
+
+                  <label>
+                    <span data-i18n>settings.system.telnet.port.title</span>
+                    <input type="number" inputmode="numeric" name="system[telnet][port]" min="1" max="65535" step="1" required>
+                    <small data-i18n>settings.system.telnet.port.note</small>
+                  </label>
+                </div>
+
+                <mark data-i18n>settings.note.restart</mark>
+              </fieldset>
+
+              <button type="submit" data-i18n>button.save</button>
+            </form>
+          </div>
+        </details>
+
+
+        <hr />
+
+        <details>
+          <summary><b data-i18n>settings.section.heating</b></summary>
+          <div>
+            <div id="heating-settings-busy" aria-busy="true"></div>
+            <form action="/api/settings" id="heating-settings" class="hidden">
+              <div class="grid">
+                <label>
+                  <span data-i18n>settings.temp.min</span>
+                  <input type="number" inputmode="numeric" name="heating[minTemp]" min="0" max="0" step="1" required>
+                </label>
+
+                <label>
+                  <span data-i18n>settings.temp.max</span>
+                  <input type="number" inputmode="numeric" name="heating[maxTemp]" min="0" max="0" step="1" required>
+                </label>
+              </div>
+
+              <div class="grid">
+                <label>
+                  <span data-i18n>settings.heating.hyst</span>
+                  <input type="number" inputmode="decimal" name="heating[hysteresis]" min="0" max="5" step="0.05" required>
+                </label>
+
+                <label>
+                  <span data-i18n>settings.heating.turboFactor</span>
+                  <input type="number" inputmode="decimal" name="heating[turboFactor]" min="1.5" max="10" step="0.1" required>
+                </label>
+              </div>
+
+              <button type="submit" data-i18n>button.save</button>
+            </form>
+          </div>
+        </details>
+
+        <hr />
+
+        <details>
+          <summary><b data-i18n>settings.section.dhw</b></summary>
+          <div>
+            <div id="dhw-settings-busy" aria-busy="true"></div>
+            <form action="/api/settings" id="dhw-settings" class="hidden">
+              <div class="grid">
+                <label>
+                  <span data-i18n>settings.temp.min</span>
+                  <input type="number" inputmode="numeric" name="dhw[minTemp]" min="0" max="0" step="1" required>
+                </label>
+
+                <label>
+                  <span data-i18n>settings.temp.max</span>
+                  <input type="number" inputmode="numeric" name="dhw[maxTemp]" min="0" max="0" step="1" required>
+                </label>
+              </div>
+
+              <button type="submit" data-i18n>button.save</button>
+            </form>
+          </div>
+        </details>
+
+        <hr />
+
+        <details>
+          <summary><b data-i18n>settings.section.emergency</b></summary>
+          <div>
+            <div id="emergency-settings-busy" aria-busy="true"></div>
+            <form action="/api/settings" id="emergency-settings" class="hidden">
+              <fieldset>
+                <small data-i18n>settings.emergency.desc</small>
+              </fieldset>
+
+              <div class="grid">
+                <label>
+                  <span data-i18n>settings.emergency.target.title</span>
+                  <input type="number" inputmode="numeric" name="emergency[target]" min="0" max="0" step="1" required>
+                  <small data-i18n>settings.emergency.target.note</small>
+                </label>
+
+                <label>
+                  <span data-i18n>settings.emergency.treshold</span>
+                  <input type="number" inputmode="numeric" name="emergency[tresholdTime]" min="60" max="1800" step="1" required>
+                </label>
+              </div>
+
+              <button type="submit" data-i18n>button.save</button>
+            </form>
+          </div>
+        </details>
+
+        <hr />
+
+        <details>
+          <summary><b data-i18n>settings.section.equitherm</b></summary>
+          <div>
+            <div id="equitherm-settings-busy" aria-busy="true"></div>
+            <form action="/api/settings" id="equitherm-settings" class="hidden">
+              <fieldset>
+                <label>
+                  <input type="checkbox" name="equitherm[enabled]" value="true">
+                  <span data-i18n>settings.enable</span>
+                </label>
+              </fieldset>
+
+              <div class="grid">
+                <label>
+                  <span data-i18n>settings.equitherm.n</span>
+                  <input type="number" inputmode="decimal" name="equitherm[n_factor]" min="0.001" max="10" step="0.001" required>
+                </label>
+
+                <label>
+                  <span data-i18n>settings.equitherm.k</span>
+                  <input type="number" inputmode="decimal" name="equitherm[k_factor]" min="0" max="10" step="0.01" required>
+                </label>
+
+                <label>
+                  <span data-i18n>settings.equitherm.t.title</span>
+                  <input type="number" inputmode="decimal" name="equitherm[t_factor]" min="0" max="10" step="0.01" required>
+                  <small data-i18n>settings.equitherm.t.note</small>
+                </label>
+              </div>
+
+              <button type="submit" data-i18n>button.save</button>
+            </form>
+          </div>
+        </details>
+
+        <hr />
+
+        <details>
+          <summary><b data-i18n>settings.section.pid</b></summary>
+          <div>
+            <div id="pid-settings-busy" aria-busy="true"></div>
+            <form action="/api/settings" id="pid-settings" class="hidden">
+              <fieldset>
+                <label>
+                  <input type="checkbox" name="pid[enabled]" value="true">
+                  <span data-i18n>settings.enable</span>
+                </label>
+              </fieldset>
+
+              <div class="grid">
+                <label>
+                  <span data-i18n>settings.pid.p</span>
+                  <input type="number" inputmode="decimal" name="pid[p_factor]" min="0.1" max="1000" step="0.01" required>
+                </label>
+
+                <label>
+                  <span data-i18n>settings.pid.i</span>
+                  <input type="number" inputmode="decimal" name="pid[i_factor]" min="0" max="100" step="0.0001" required>
+                </label>
+
+                <label>
+                  <span data-i18n>settings.pid.d</span>
+                  <input type="number" inputmode="decimal" name="pid[d_factor]" min="0" max="100000" step="0.1" required>
+                </label>
+              </div>
+
+              <label>
+                <span data-i18n>settings.pid.dt</span>
+                <input type="number" inputmode="numeric" name="pid[dt]" min="30" max="1800" step="1" required>
+              </label>
+
+              <hr />
+
+              <div class="grid">
+                <label>
+                  <span data-i18n>settings.temp.min</span>
+                  <input type="number" inputmode="numeric" name="pid[minTemp]" min="0" max="0" step="1" required>
+                </label>
+
+                <label>
+                  <span data-i18n>settings.temp.max</span>
+                  <input type="number" inputmode="numeric" name="pid[maxTemp]" min="0" max="0" step="1" required>
+                </label>
+              </div>
+
+              <small data-i18n>settings.pid.noteMinMaxTemp</small>
+
+              <button type="submit" data-i18n>button.save</button>
+            </form>
+          </div>
+        </details>
+
+        <hr />
+
+        <details>
+          <summary><b data-i18n>settings.section.ot</b></summary>
+          <div>
+            <div id="ot-settings-busy" aria-busy="true"></div>
+            <form action="/api/settings" id="ot-settings" class="hidden">
+              <fieldset>
+                <legend data-i18n>settings.system.unit</legend>
+
+                <label>
+                  <input type="radio" name="opentherm[unitSystem]" value="0" />
+                  <span data-i18n>settings.system.metric</span>
+                </label>
+
+                <label>
+                  <input type="radio" name="opentherm[unitSystem]" value="1" />
+                  <span data-i18n>settings.system.imperial</span>
+                </label>
+              </fieldset>
+
+              <div class="grid">
+                <label>
+                  <span data-i18n>settings.ot.inGpio</span>
+                  <input type="number" inputmode="numeric" name="opentherm[inGpio]" min="0" max="254" step="1">
+                </label>
+
+                <label>
+                  <span data-i18n>settings.ot.outGpio</span>
+                  <input type="number" inputmode="numeric" name="opentherm[outGpio]" min="0" max="254" step="1">
+                </label>
+
+                <label>
+                  <span data-i18n>settings.ot.ledGpio</span>
+                  <input type="number" inputmode="numeric" name="opentherm[rxLedGpio]" min="0" max="254" step="1">
+                  <small data-i18n>settings.note.blankNotUse</small>
+                </label>
+              </div>
+
+              <div class="grid">
+                <label>
+                  <span data-i18n>settings.ot.memberId</span>
+                  <input type="number" inputmode="numeric" name="opentherm[memberId]" min="0" max="255" step="1" required>
+                </label>
+
+                <label>
+                  <span data-i18n>settings.ot.flags</span>
+                  <input type="number" inputmode="numeric" name="opentherm[flags]" min="0" max="255" step="1" required>
+                </label>
+
+                <label>
+                  <span data-i18n>settings.ot.maxMod</span>
+                  <input type="number" inputmode="numeric" name="opentherm[maxModulation]" min="1" max="100" step="1" required>
+                </label>
+              </div>
+
+              <div class="grid">
+                <label>
+                  <span data-i18n>settings.ot.minPower.title</span>
+                  <input type="number" inputmode="decimal" name="opentherm[minPower]" min="0" max="1000" step="0.01">
+                  <small data-i18n>settings.ot.minPower.note</small>
+                </label>
+
+                <label>
+                  <span data-i18n>settings.ot.maxPower.title</span>
+                  <input type="number" inputmode="decimal" name="opentherm[maxPower]" min="0" max="1000" step="0.01">
+                  <small data-i18n>settings.ot.maxPower.note</small>
+                </label>
+              </div>
+
+              <fieldset>
+                <legend data-i18n>settings.ot.options.desc</legend>
+
+                <label>
+                  <input type="checkbox" name="opentherm[options][dhwSupport]" value="true">
+                  <span data-i18n>settings.ot.options.dhwSupport</span>
+                </label>
+
+                <label>
+                  <input type="checkbox" name="opentherm[options][coolingSupport]" value="true">
+                  <span data-i18n>settings.ot.options.coolingSupport</span>
+                </label>
+
+                <label>
+                  <input type="checkbox" name="opentherm[options][summerWinterMode]" value="true">
+                  <span data-i18n>settings.ot.options.summerWinterMode</span>
+                </label>
+
+                <label>
+                  <input type="checkbox" name="opentherm[options][heatingStateToSummerWinterMode]" value="true">
+                  <span data-i18n>settings.ot.options.heatingStateToSummerWinterMode</span>
+                </label>
+
+                <label>
+                  <input type="checkbox" name="opentherm[options][ch2AlwaysEnabled]" value="true">
+                  <span data-i18n>settings.ot.options.ch2AlwaysEnabled</span>
+                </label>
+
+                <label>
+                  <input type="checkbox" name="opentherm[options][heatingToCh2]" value="true">
+                  <span data-i18n>settings.ot.options.heatingToCh2</span>
+                </label>
+
+                <label>
+                  <input type="checkbox" name="opentherm[options][dhwToCh2]" value="true">
+                  <span data-i18n>settings.ot.options.dhwToCh2</span>
+                </label>
+
+                <label>
+                  <input type="checkbox" name="opentherm[options][dhwBlocking]" value="true">
+                  <span data-i18n>settings.ot.options.dhwBlocking</span>
+                </label>
+
+                <label>
+                  <input type="checkbox" name="opentherm[options][modulationSyncWithHeating]" value="true">
+                  <span data-i18n>settings.ot.options.modulationSyncWithHeating</span>
+                </label>
+
+                <label>
+                  <input type="checkbox" name="opentherm[options][maxTempSyncWithTargetTemp]" value="true">
+                  <span data-i18n>settings.ot.options.maxTempSyncWithTargetTemp</span>
+                </label>
+
+                <label>
+                  <input type="checkbox" name="opentherm[options][getMinMaxTemp]" value="true">
+                  <span data-i18n>settings.ot.options.getMinMaxTemp</span>
+                </label>
+
+                <label>
+                  <input type="checkbox" name="opentherm[options][immergasFix]" value="true">
+                  <span data-i18n>settings.ot.options.immergasFix</span>
+                </label>
+
+                <hr />
+                <label>
+                  <input type="checkbox" name="opentherm[options][nativeHeatingControl]" value="true">
+                  <span data-i18n>settings.ot.nativeHeating.title</span><br />
+                  <small data-i18n>settings.ot.nativeHeating.note</small>
+                </label>
+              </fieldset>
+
+              <button type="submit" data-i18n>button.save</button>
+            </form>
+          </div>
+        </details>
+
+        <hr />
+
+        <details>
+          <summary><b data-i18n>settings.section.mqtt</b></summary>
+          <div>
+            <div id="mqtt-settings-busy" aria-busy="true"></div>
+            <form action="/api/settings" id="mqtt-settings" class="hidden">
+              <fieldset>
+                <label>
+                  <input type="checkbox" name="mqtt[enabled]" value="true">
+                  <span data-i18n>settings.enable</span>
+                </label>
+
+                <label>
+                  <input type="checkbox" name="mqtt[homeAssistantDiscovery]" value="true">
+                  <span data-i18n>settings.mqtt.homeAssistantDiscovery</span>
+                </label>
+              </fieldset>
+
+              <div class="grid">
+                <label>
+                  <span data-i18n>settings.mqtt.server</span>
+                  <input type="text" name="mqtt[server]" maxlength="80" required>
+                </label>
+
+                <label>
+                  <span data-i18n>settings.mqtt.port</span>
+                  <input type="number" inputmode="numeric" name="mqtt[port]" min="1" max="65535" step="1" required>
+                </label>
+              </div>
+
+              <div class="grid">
+                <label>
+                  <span data-i18n>settings.mqtt.user</span>
+                  <input type="text" name="mqtt[user]" maxlength="32" required>
+                </label>
+
+                <label>
+                  <span data-i18n>settings.mqtt.password</span>
+                  <input type="password" name="mqtt[password]" maxlength="32">
+                </label>
+              </div>
+
+              <div class="grid">
+                <label>
+                  <span data-i18n>settings.mqtt.prefix</span>
+                  <input type="text" name="mqtt[prefix]" maxlength="32" required>
+                </label>
+
+                <label>
+                  <span data-i18n>settings.mqtt.interval</span>
+                  <input type="number" inputmode="numeric" name="mqtt[interval]" min="3" max="60" step="1" required>
+                </label>
+              </div>
+
+              <button type="submit" data-i18n>button.save</button>
+            </form>
+          </div>
+        </details>
+
+        <hr />
+
+        <details>
+          <summary><b data-i18n>settings.section.extPump</b></summary>
+          <div>
+            <div id="extpump-settings-busy" aria-busy="true"></div>
+            <form action="/api/settings" id="extpump-settings" class="hidden">
+              <fieldset>
+                <label>
+                  <input type="checkbox" name="externalPump[use]" value="true">
+                  <span data-i18n>settings.extPump.use</span>
+                </label>
+              </fieldset>
+
+              <div class="grid">
+                <label>
+                  <span data-i18n>settings.extPump.gpio</span>
+                  <input type="number" inputmode="numeric" name="externalPump[gpio]" min="0" max="254" step="1">
+                </label>
+
+                <label>
+                  <span data-i18n>settings.extPump.postCirculationTime</span>
+                  <input type="number" inputmode="numeric" name="externalPump[postCirculationTime]" min="1" max="120" step="1" required>
+                </label>
+              </div>
+
+              <div class="grid">
+                <label>
+                  <span data-i18n>settings.extPump.antiStuckInterval</span>
+                  <input type="number" inputmode="numeric" name="externalPump[antiStuckInterval]" min="1" max="366" step="1" required>
+                </label>
+
+                <label>
+                  <span data-i18n>settings.extPump.antiStuckTime</span>
+                  <input type="number" inputmode="numeric" name="externalPump[antiStuckTime]" min="1" max="20" step="1" required>
+                </label>
+              </div>
+
+              <button type="submit" data-i18n>button.save</button>
+            </form>
+          </div>
+        </details>
+
+        <hr />
+
+        <details>
+          <summary><b data-i18n>settings.section.cascadeControl</b></summary>
+          <div>
+            <div id="cc-settings-busy" aria-busy="true"></div>
+            <form action="/api/settings" id="cc-settings" class="hidden">
+              <fieldset>
+                <label>
+                  <input type="checkbox" name="cascadeControl[input][enabled]" value="true">
+                  <span data-i18n>settings.cascadeControl.input.enable</span>
+                  <br />
+                  <small data-i18n>settings.cascadeControl.input.desc</small>
+                </label>
+
+                <label>
+                  <input type="checkbox" name="cascadeControl[input][invertState]" value="true">
+                  <span data-i18n>settings.cascadeControl.input.invertState</span>
+                </label>
+              </fieldset>
+
+              <div class="grid">
+                <label>
+                  <span data-i18n>settings.cascadeControl.input.gpio</span>
+                  <input type="number" inputmode="numeric" name="cascadeControl[input][gpio]" min="0" max="254" step="1">
+                </label>
+
+                <label>
+                  <span data-i18n>settings.cascadeControl.input.thresholdTime</span>
+                  <input type="number" inputmode="numeric" name="cascadeControl[input][thresholdTime]" min="5" max="600" step="1" required>
+                </label>
+              </div>
+
+              <hr />
+
+              <fieldset>
+                <label>
+                  <input type="checkbox" name="cascadeControl[output][enabled]" value="true">
+                  <span data-i18n>settings.cascadeControl.output.enable</span>
+                  <br />
+                  <small data-i18n>settings.cascadeControl.output.desc</small>
+                </label>
+
+                <label>
+                  <input type="checkbox" name="cascadeControl[output][invertState]" value="true">
+                  <span data-i18n>settings.cascadeControl.output.invertState</span>
+                </label>
+              </fieldset>
+
+              <div class="grid">
+                <label>
+                  <span data-i18n>settings.cascadeControl.output.gpio</span>
+                  <input type="number" outputmode="numeric" name="cascadeControl[output][gpio]" min="0" max="254" step="1">
+                </label>
+
+                <label>
+                  <span data-i18n>settings.cascadeControl.output.thresholdTime</span>
+                  <input type="number" outputmode="numeric" name="cascadeControl[output][thresholdTime]" min="5" max="600" step="1" required>
+                </label>
+              </div>
+
+              <fieldset>
+                <legend data-i18n>settings.cascadeControl.output.events.desc</legend>
+
+                <label>
+                  <input type="checkbox" name="cascadeControl[output][onFault]" value="true">
+                  <span data-i18n>settings.cascadeControl.output.events.onFault</span>
+                </label>
+
+                <label>
+                  <input type="checkbox" name="cascadeControl[output][onLossConnection]" value="true">
+                  <span data-i18n>settings.cascadeControl.output.events.onLossConnection</span>
+                </label>
+
+                <label>
+                  <input type="checkbox" name="cascadeControl[output][onEnabledHeating]" value="true">
+                  <span data-i18n>settings.cascadeControl.output.events.onEnabledHeating</span>
+                </label>
+              </fieldset>
+
+              <button type="submit" data-i18n>button.save</button>
+            </form>
+          </div>
+        </details>
+      </article>
+    </main>
+
+    <footer class="container">
+      <small>
+        <b>Made by Laxilef</b>
+        • <a href="https://github.com/Laxilef/OTGateway/blob/master/LICENSE" target="_blank" class="secondary" data-i18n>nav.license</a>
+        • <a href="https://github.com/Laxilef/OTGateway/blob/master/" target="_blank" class="secondary" data-i18n>nav.source</a>
+        • <a href="https://github.com/Laxilef/OTGateway/wiki" target="_blank" class="secondary" data-i18n>nav.help</a>
+        • <a href="https://github.com/Laxilef/OTGateway/issues" target="_blank" class="secondary" data-i18n>nav.issues</a>
+        • <a href="https://github.com/Laxilef/OTGateway/releases" target="_blank" class="secondary" data-i18n>nav.releases</a>
+      </small>
+    </footer>
+
+    <script src="/static/app.js?{BUILD_TIME}"></script>
+    <script>
+      document.addEventListener('DOMContentLoaded', async () => {
+        const lang = new Lang(document.getElementById('lang'));
+        lang.build();
+
+        const fillData = (data) => {
+          // System
+          setSelectValue("[name='system[logLevel]']", data.system.logLevel);
+          setCheckboxValue("[name='system[serial][enabled]']", data.system.serial.enabled);
+          setSelectValue("[name='system[serial][baudrate]']", data.system.serial.baudrate);
+          setCheckboxValue("[name='system[telnet][enabled]']", data.system.telnet.enabled);
+          setInputValue("[name='system[telnet][port]']", data.system.telnet.port);
+          setRadioValue("[name='system[unitSystem]']", data.system.unitSystem);
+          setInputValue("[name='system[statusLedGpio]']", data.system.statusLedGpio < 255 ? data.system.statusLedGpio : '');
+          setBusy('#system-settings-busy', '#system-settings', false);
+
+          // Portal
+          setCheckboxValue("[name='portal[auth]']", data.portal.auth);
+          setInputValue("[name='portal[login]']", data.portal.login);
+          setInputValue("[name='portal[password]']", data.portal.password);
+          setBusy('#portal-settings-busy', '#portal-settings', false);
+
+          // Opentherm
+          setRadioValue("[name='opentherm[unitSystem]']", data.opentherm.unitSystem);
+          setInputValue("[name='opentherm[inGpio]']", data.opentherm.inGpio < 255 ? data.opentherm.inGpio : '');
+          setInputValue("[name='opentherm[outGpio]']", data.opentherm.outGpio < 255 ? data.opentherm.outGpio : '');
+          setInputValue("[name='opentherm[rxLedGpio]']", data.opentherm.rxLedGpio < 255 ? data.opentherm.rxLedGpio : '');
+          setInputValue("[name='opentherm[memberId]']", data.opentherm.memberId);
+          setInputValue("[name='opentherm[flags]']", data.opentherm.flags);
+          setInputValue("[name='opentherm[maxModulation]']", data.opentherm.maxModulation);
+          setInputValue("[name='opentherm[minPower]']", data.opentherm.minPower);
+          setInputValue("[name='opentherm[maxPower]']", data.opentherm.maxPower);
+          setCheckboxValue("[name='opentherm[options][dhwSupport]']", data.opentherm.options.dhwSupport);
+          setCheckboxValue("[name='opentherm[options][coolingSupport]']", data.opentherm.options.coolingSupport);
+          setCheckboxValue("[name='opentherm[options][summerWinterMode]']", data.opentherm.options.summerWinterMode);
+          setCheckboxValue("[name='opentherm[options][heatingStateToSummerWinterMode]']", data.opentherm.options.heatingStateToSummerWinterMode);
+          setCheckboxValue("[name='opentherm[options][ch2AlwaysEnabled]']", data.opentherm.options.ch2AlwaysEnabled);
+          setCheckboxValue("[name='opentherm[options][heatingToCh2]']", data.opentherm.options.heatingToCh2);
+          setCheckboxValue("[name='opentherm[options][dhwToCh2]']", data.opentherm.options.dhwToCh2);
+          setCheckboxValue("[name='opentherm[options][dhwBlocking]']", data.opentherm.options.dhwBlocking);
+          setCheckboxValue("[name='opentherm[options][modulationSyncWithHeating]']", data.opentherm.options.modulationSyncWithHeating);
+          setCheckboxValue("[name='opentherm[options][maxTempSyncWithTargetTemp]']", data.opentherm.options.maxTempSyncWithTargetTemp);
+          setCheckboxValue("[name='opentherm[options][getMinMaxTemp]']", data.opentherm.options.getMinMaxTemp);
+          setCheckboxValue("[name='opentherm[options][nativeHeatingControl]']", data.opentherm.options.nativeHeatingControl);
+          setCheckboxValue("[name='opentherm[options][immergasFix]']", data.opentherm.options.immergasFix);
+          setBusy('#ot-settings-busy', '#ot-settings', false);
+
+          // MQTT
+          setCheckboxValue("[name='mqtt[enabled]']", data.mqtt.enabled);
+          setCheckboxValue("[name='mqtt[homeAssistantDiscovery]']", data.mqtt.homeAssistantDiscovery);
+          setInputValue("[name='mqtt[server]']", data.mqtt.server);
+          setInputValue("[name='mqtt[port]']", data.mqtt.port);
+          setInputValue("[name='mqtt[user]']", data.mqtt.user);
+          setInputValue("[name='mqtt[password]']", data.mqtt.password);
+          setInputValue("[name='mqtt[prefix]']", data.mqtt.prefix);
+          setInputValue("[name='mqtt[interval]']", data.mqtt.interval);
+          setBusy('#mqtt-settings-busy', '#mqtt-settings', false);
+
+          // Extpump
+          setCheckboxValue("[name='externalPump[use]']", data.externalPump.use);
+          setInputValue("[name='externalPump[gpio]']", data.externalPump.gpio < 255 ? data.externalPump.gpio : '');
+          setInputValue("[name='externalPump[postCirculationTime]']", data.externalPump.postCirculationTime);
+          setInputValue("[name='externalPump[antiStuckInterval]']", data.externalPump.antiStuckInterval);
+          setInputValue("[name='externalPump[antiStuckTime]']", data.externalPump.antiStuckTime);
+          setBusy('#extpump-settings-busy', '#extpump-settings', false);
+
+          // Cascade control
+          setCheckboxValue("[name='cascadeControl[input][enabled]']", data.cascadeControl.input.enabled);
+          setInputValue("[name='cascadeControl[input][gpio]']", data.cascadeControl.input.gpio < 255 ? data.cascadeControl.input.gpio : '');
+          setCheckboxValue("[name='cascadeControl[input][invertState]']", data.cascadeControl.input.invertState);
+          setInputValue("[name='cascadeControl[input][thresholdTime]']", data.cascadeControl.input.thresholdTime);
+
+          setCheckboxValue("[name='cascadeControl[output][enabled]']", data.cascadeControl.output.enabled);
+          setInputValue("[name='cascadeControl[output][gpio]']", data.cascadeControl.output.gpio < 255 ? data.cascadeControl.output.gpio : '');
+          setCheckboxValue("[name='cascadeControl[output][invertState]']", data.cascadeControl.output.invertState);
+          setInputValue("[name='cascadeControl[output][thresholdTime]']", data.cascadeControl.output.thresholdTime);
+          setCheckboxValue("[name='cascadeControl[output][onFault]']", data.cascadeControl.output.onFault);
+          setCheckboxValue("[name='cascadeControl[output][onLossConnection]']", data.cascadeControl.output.onLossConnection);
+          setCheckboxValue("[name='cascadeControl[output][onEnabledHeating]']", data.cascadeControl.output.onEnabledHeating);
+          setBusy('#cc-settings-busy', '#cc-settings', false);
+
+          // Heating
+          setInputValue("[name='heating[minTemp]']", data.heating.minTemp, {
+            "min": data.system.unitSystem == 0 ? 0 : 32,
+            "max": data.system.unitSystem == 0 ? 99 : 211
+          });
+          setInputValue("[name='heating[maxTemp]']", data.heating.maxTemp, {
+            "min": data.system.unitSystem == 0 ? 1 : 33,
+            "max": data.system.unitSystem == 0 ? 100 : 212
+          });
+          setInputValue("[name='heating[hysteresis]']", data.heating.hysteresis);
+          setInputValue("[name='heating[turboFactor]']", data.heating.turboFactor);
+          setBusy('#heating-settings-busy', '#heating-settings', false);
+
+          // DHW
+          setInputValue("[name='dhw[minTemp]']", data.dhw.minTemp, {
+            "min": data.system.unitSystem == 0 ? 0 : 32,
+            "max": data.system.unitSystem == 0 ? 99 : 211
+          });
+          setInputValue("[name='dhw[maxTemp]']", data.dhw.maxTemp, {
+            "min": data.system.unitSystem == 0 ? 1 : 33,
+            "max": data.system.unitSystem == 0 ? 100 : 212
+          });
+          setBusy('#dhw-settings-busy', '#dhw-settings', false);
+
+          // Emergency mode
+          setInputValue("[name='emergency[tresholdTime]']", data.emergency.tresholdTime);
+          if (data.opentherm.options.nativeHeatingControl) {
+            setInputValue("[name='emergency[target]']", data.emergency.target, {
+              "min": data.system.unitSystem == 0 ? 5 : 41,
+              "max": data.system.unitSystem == 0 ? 30 : 86
+            });
+
+          } else {
+            setInputValue("[name='emergency[target]']", data.emergency.target, {
+              "min": data.heating.minTemp,
+              "max": data.heating.maxTemp,
+            });
+          }
+
+          setBusy('#emergency-settings-busy', '#emergency-settings', false);
+
+          // Equitherm
+          setCheckboxValue("[name='equitherm[enabled]']", data.equitherm.enabled);
+          setInputValue("[name='equitherm[n_factor]']", data.equitherm.n_factor);
+          setInputValue("[name='equitherm[k_factor]']", data.equitherm.k_factor);
+          setInputValue("[name='equitherm[t_factor]']", data.equitherm.t_factor);
+          setBusy('#equitherm-settings-busy', '#equitherm-settings', false);
+
+          // PID
+          setCheckboxValue("[name='pid[enabled]']", data.pid.enabled);
+          setInputValue("[name='pid[p_factor]']", data.pid.p_factor);
+          setInputValue("[name='pid[i_factor]']", data.pid.i_factor);
+          setInputValue("[name='pid[d_factor]']", data.pid.d_factor);
+          setInputValue("[name='pid[dt]']", data.pid.dt);
+          setInputValue("[name='pid[minTemp]']", data.pid.minTemp, {
+            "min": data.equitherm.enabled ? (data.system.unitSystem == 0 ? -100 : -146) : (data.system.unitSystem == 0 ? 0 : 32),
+            "max": (data.system.unitSystem == 0 ? 99 : 211)
+          });
+          setInputValue("[name='pid[maxTemp]']", data.pid.maxTemp, {
+            "min": (data.system.unitSystem == 0 ? 0 : 33),
+            "max": (data.system.unitSystem == 0 ? 100 : 212)
+          });
+          setBusy('#pid-settings-busy', '#pid-settings', false);
+        };
+
+        try {
+          const response = await fetch("/api/settings", {
+            cache: "no-cache",
+            credentials: "include"
+          });
+          
+          if (!response.ok) {
+            throw new Error('Response not valid');
+          }
+
+          const result = await response.json();
+          fillData(result);
+
+          setupForm('#portal-settings', fillData, ['portal.login', 'portal.password']);
+          setupForm('#system-settings', fillData);
+          setupForm('#heating-settings', fillData);
+          setupForm('#dhw-settings', fillData);
+          setupForm('#emergency-settings', fillData);
+          setupForm('#equitherm-settings', fillData);
+          setupForm('#pid-settings', fillData);
+          setupForm('#ot-settings', fillData);
+          setupForm('#mqtt-settings', fillData, ['mqtt.user', 'mqtt.password', 'mqtt.prefix']);
+          setupForm('#extpump-settings', fillData);
+          setupForm('#cc-settings', fillData);
+
+        } catch (error) {
+          console.log(error);
+        }
+      });
+    </script>
+  </body>
+</html>

src_data/pages/upgrade.html

@@ -0,0 +1,112 @@
+<!doctype html>
+<html lang="en">
+  <head>
+    <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?{BUILD_TIME}">
+  </head>
+
+  <body>
+    <header class="container">
+      <nav>
+        <ul>
+          <li>
+            <a href="/">
+              <div class="logo" data-i18n>logo</div>
+            </a>
+          </li>
+        </ul>
+        <ul>
+          <li>
+            <select id="lang" aria-label="Lang">
+              <option value="en" selected>EN</option>
+              <option value="ru">RU</option>
+            </select>
+          </li>
+        </ul>
+      </nav>
+    </header>
+
+    <main class="container">
+      <article>
+        <div>
+          <hgroup>
+            <h2 data-i18n>upgrade.section.backupAndRestore</h2>
+            <p data-i18n>upgrade.section.backupAndRestore.desc</p>
+          </hgroup>
+
+          <form action="/api/backup/restore" id="restore">
+            <label for="restore-file">
+              <span data-i18n>upgrade.settingsFile</span>
+              <input type="file" name="settings" id="restore-file" accept=".json">
+            </label>
+
+            <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>
+          </form>
+        </div>
+      </article>
+
+      <article>
+        <div>
+          <hgroup>
+            <h2 data-i18n>upgrade.section.upgrade</h2>
+            <p data-i18n>upgrade.section.upgrade.desc</p>
+          </hgroup>
+
+          <form action="/api/upgrade" id="upgrade">
+            <fieldset class="primary">
+              <label for="firmware-file">
+                <span data-i18n>upgrade.fw</span>:
+                <div class="grid">
+                  <input type="file" name="firmware" id="firmware-file" accept=".bin">
+                  <button type="button" class="upgrade-firmware-result hidden" disabled></button>
+                </div>
+              </label>
+
+              <label for="filesystem-file">
+                <span data-i18n>upgrade.fs</span>:
+                <div class="grid">
+                  <input type="file" name="filesystem" id="filesystem-file" accept=".bin">
+                  <button type="button" class="upgrade-filesystem-result hidden" disabled></button>
+                </div>
+              </label>
+            </fieldset>
+
+            <ul>
+              <li><mark data-i18n>upgrade.note.disclaimer1</mark></li>
+              <li><mark data-i18n>upgrade.note.disclaimer2</mark></li>
+            </ul>
+
+            <button type="submit" data-i18n>button.upgrade</button>
+          </form>
+        </div>
+      </article>
+    </main>
+
+    <footer class="container">
+      <small>
+        <b>Made by Laxilef</b>
+        • <a href="https://github.com/Laxilef/OTGateway/blob/master/LICENSE" target="_blank" class="secondary" data-i18n>nav.license</a>
+        • <a href="https://github.com/Laxilef/OTGateway/blob/master/" target="_blank" class="secondary" data-i18n>nav.source</a>
+        • <a href="https://github.com/Laxilef/OTGateway/wiki" target="_blank" class="secondary" data-i18n>nav.help</a>
+        • <a href="https://github.com/Laxilef/OTGateway/issues" target="_blank" class="secondary" data-i18n>nav.issues</a>
+        • <a href="https://github.com/Laxilef/OTGateway/releases" target="_blank" class="secondary" data-i18n>nav.releases</a>
+      </small>
+    </footer>
+
+    <script src="/static/app.js?{BUILD_TIME}"></script>
+    <script>
+      document.addEventListener('DOMContentLoaded', async () => {
+        const lang = new Lang(document.getElementById('lang'));
+        lang.build();
+
+        setupRestoreBackupForm('#restore');
+        setupUpgradeForm('#upgrade');
+      });
+    </script>
+  </body>
+</html>

src_data/scripts/i18n.min.js

@@ -0,0 +1 @@
+(function(){var e,t,n,r=function(e,t){return function(){return e.apply(t,arguments)}};e=function(){function e(){this.translate=r(this.translate,this);this.data={values:{},contexts:[]};this.globalContext={}}e.prototype.translate=function(e,t,n,r,i){var s,o,u,a;if(i==null){i=this.globalContext}u=function(e){var t;t=typeof e;return t==="function"||t==="object"&&!!e};if(u(t)){s=null;a=null;o=t;i=n||this.globalContext}else{if(typeof t==="number"){s=null;a=t;o=n;i=r||this.globalContext}else{s=t;if(typeof n==="number"){a=n;o=r;i=i}else{a=null;o=n;i=r||this.globalContext}}}if(u(e)){if(u(e["i18n"])){e=e["i18n"]}return this.translateHash(e,i)}else{return this.translateText(e,a,o,i,s)}};e.prototype.add=function(e){var t,n,r,i,s,o,u,a;if(e.values!=null){o=e.values;for(n in o){r=o[n];this.data.values[n]=r}}if(e.contexts!=null){u=e.contexts;a=[];for(i=0,s=u.length;i<s;i++){t=u[i];a.push(this.data.contexts.push(t))}return a}};e.prototype.setContext=function(e,t){return this.globalContext[e]=t};e.prototype.clearContext=function(e){return this.lobalContext[e]=null};e.prototype.reset=function(){this.data={values:{},contexts:[]};return this.globalContext={}};e.prototype.resetData=function(){return this.data={values:{},contexts:[]}};e.prototype.resetContext=function(){return this.globalContext={}};e.prototype.translateHash=function(e,t){var n,r;for(n in e){r=e[n];if(typeof r==="string"){e[n]=this.translateText(r,null,null,t)}}return e};e.prototype.translateText=function(e,t,n,r,i){var s,o;if(r==null){r=this.globalContext}if(this.data==null){return this.useOriginalText(i||e,t,n)}s=this.getContextData(this.data,r);if(s!=null){o=this.findTranslation(e,t,n,s.values,i)}if(o==null){o=this.findTranslation(e,t,n,this.data.values,i)}if(o==null){return this.useOriginalText(i||e,t,n)}return o};e.prototype.findTranslation=function(e,t,n,r){var i,s,o,u,a;o=r[e];if(o==null){return null}if(t==null){if(typeof o==="string"){return this.applyFormatting(o,t,n)}}else{if(o instanceof Array||o.length){for(u=0,a=o.length;u<a;u++){s=o[u];if((t>=s[0]||s[0]===null)&&(t<=s[1]||s[1]===null)){i=this.applyFormatting(s[2].replace("-%n",String(-t)),t,n);return this.applyFormatting(i.replace("%n",String(t)),t,n)}}}}return null};e.prototype.getContextData=function(e,t){var n,r,i,s,o,u,a,f;if(e.contexts==null){return null}a=e.contexts;for(o=0,u=a.length;o<u;o++){n=a[o];r=true;f=n.matches;for(i in f){s=f[i];r=r&&s===t[i]}if(r){return n}}return null};e.prototype.useOriginalText=function(e,t,n){if(t==null){return this.applyFormatting(e,t,n)}return this.applyFormatting(e.replace("%n",String(t)),t,n)};e.prototype.applyFormatting=function(e,t,n){var r,i;for(r in n){i=new RegExp("%{"+r+"}","g");e=e.replace(i,n[r])}return e};return e}();n=new e;t=n.translate;t.translator=n;t.create=function(n){var r;r=new e;if(n!=null){r.add(n)}r.translate.create=t.create;return r.translate};(typeof module!=="undefined"&&module!==null?module.exports=t:void 0)||(this.i18n=t)}).call(this)

src_data/scripts/lang.js

@@ -0,0 +1,128 @@
+class Lang {
+  constructor(switcher, defaultLocale = null) {
+    if (!(switcher instanceof Object)) {
+      throw new SyntaxError("switcher must be an element object");
+    }
+
+    this.switcher = switcher;
+    this.defaultLocale = defaultLocale;
+    this.supportedLocales = [];
+    this.currentLocale = null;
+  }
+
+  async build() {
+    this.bindSwitcher();
+  
+    const userLocale = localStorage.getItem('locale');
+    if (this.localeIsSupported(userLocale)) {
+      await this.setLocale(userLocale);
+  
+    } else {
+      const initialLocale = this.getSuitableLocale(this.browserLocales(true));
+      await this.setLocale(initialLocale);
+    }
+
+    this.translatePage();
+  }
+
+  bindSwitcher() {
+    this.supportedLocales = [];
+    for (const option of this.switcher.options) {
+      this.supportedLocales.push(option.value);
+    }
+
+    if (!this.localeIsSupported(this.defaultLocale)) {
+      const selected = this.switcher.selectedIndex ? this.switcher.selectedIndex : 0;
+      this.defaultLocale = this.switcher.options[selected].value;
+    }
+  
+    this.switcher.addEventListener('change', async (element) => {
+      await this.setLocale(element.target.value);
+      this.translatePage();
+    });
+  }
+
+  async setLocale(newLocale) {
+    if (this.currentLocale == newLocale) {
+      return;
+    }
+
+    i18n.translator.reset();
+    i18n.translator.add(await this.fetchTranslations(newLocale));
+  
+    this.currentLocale = newLocale;
+    localStorage.setItem('locale', this.currentLocale);
+  
+    if (document.documentElement) {
+      document.documentElement.setAttribute("lang", this.currentLocale);
+    }
+
+    if (this.switcher.value != this.currentLocale) {
+      this.switcher.value = this.currentLocale;
+    }
+  }
+
+  async fetchTranslations(locale) {
+    const response = await fetch(`/static/locales/${locale}.json?{BUILD_TIME}`);
+    const data = await response.json();
+  
+    if (data.values instanceof Object) {
+      data.values = this.flattenKeys({keys: data.values, prefix: ''});
+    }
+  
+    return data;
+  }
+
+  translatePage() {
+    document
+      .querySelectorAll("[data-i18n]")
+      .forEach((element) => this.translateElement(element));
+  }
+  
+  translateElement(element) {
+    let key = element.getAttribute("data-i18n");
+    if (!key && element.innerHTML) {
+      key = element.innerHTML;
+      element.setAttribute("data-i18n", key);
+    }
+
+    if (!key) {
+      return;
+    }
+  
+    const arg = element.getAttribute("data-i18n-arg") || null;
+    const options = JSON.parse(element.getAttribute("data-i18n-options")) || null;
+  
+    element.innerHTML = i18n(key, arg, options);
+  }
+
+
+  localeIsSupported(locale) {
+    return locale !== null && this.supportedLocales.indexOf(locale) > -1;
+  }
+  
+  getSuitableLocale(locales) {
+    return locales.find(this.localeIsSupported, this) || this.defaultLocale;
+  }
+  
+  browserLocales(codeOnly = false) {
+    return navigator.languages.map((locale) =>
+      codeOnly ? locale.split("-")[0] : locale,
+    );
+  }
+
+  flattenKeys({ keys, prefix }) {
+    let result = {};
+    for (let key in keys) {
+      const type = typeof keys[key];
+      if (type === 'string') {
+        result[`${prefix}${key}`] = keys[key];
+      }
+      else if (type === 'object') {
+        result = { ...result, ...this.flattenKeys({ keys: keys[key], prefix: `${prefix}${key}.` }) }
+      }
+    }
+    return result;
+  }
+}
+

src_data/scripts/utils.js

@@ -0,0 +1,851 @@
+const setupForm = (formSelector, onResultCallback = null, noCastItems = []) => {
+  const form = document.querySelector(formSelector);
+  if (!form) {
+    return;
+  }
+
+  form.querySelectorAll('input').forEach(item => {
+    item.addEventListener('change', (e) => {
+      e.target.setAttribute('aria-invalid', !e.target.checkValidity());
+    })
+  });
+
+  form.addEventListener('submit', async (event) => {
+    event.preventDefault();
+
+    const url = form.action;
+    let button = form.querySelector('button[type="submit"]');
+    let defaultText;
+
+    if (button) {
+      defaultText = button.textContent;
+      button.textContent = i18n("button.wait");
+      button.setAttribute('disabled', true);
+      button.setAttribute('aria-busy', true);
+    }
+
+    const onSuccess = (result) => {
+      if (button) {
+        button.textContent = i18n('button.saved');
+        button.classList.add('success');
+        button.removeAttribute('aria-busy');
+
+        setTimeout(() => {
+          button.removeAttribute('disabled');
+          button.classList.remove('success', 'failed');
+          button.textContent = defaultText;
+        }, 5000);
+      }
+    };
+
+    const onFailed = () => {
+      if (button) {
+        button.textContent = i18n('button.error');
+        button.classList.add('failed');
+        button.removeAttribute('aria-busy');
+
+        setTimeout(() => {
+          button.removeAttribute('disabled');
+          button.classList.remove('success', 'failed');
+          button.textContent = defaultText;
+        }, 5000);
+      }
+    };
+
+    try {
+      let fd = new FormData(form);
+      let checkboxes = form.querySelectorAll('input[type="checkbox"]');
+      for (let checkbox of checkboxes) {
+        fd.append(checkbox.getAttribute('name'), checkbox.checked);
+      }
+
+      let response = await fetch(url, {
+        method: "POST",
+        cache: "no-cache",
+        credentials: "include",
+        headers: {
+          "Content-Type": "application/json"
+        },
+        body: form2json(fd, noCastItems)
+      });
+
+      if (!response.ok) {
+        throw new Error('Response not valid');
+      }
+
+      const result = response.status != 204 ? (await response.json()) : null;
+      onSuccess(result);
+
+      if (onResultCallback instanceof Function) {
+        onResultCallback(result);
+      }
+
+    } catch (err) {
+      console.log(err);
+      onFailed();
+    }
+  });
+}
+
+const setupNetworkScanForm = (formSelector, tableSelector) => {
+  const form = document.querySelector(formSelector);
+  if (!form) {
+    console.error("form not found");
+    return;
+  }
+
+  const url = form.action;
+  let button = form.querySelector('button[type="submit"]');
+  let defaultText;
+
+  const onSubmitFn = async (event) => {
+    if (event) {
+      event.preventDefault();
+    }
+
+    if (button) {
+      defaultText = button.innerHTML;
+      button.innerHTML = i18n('button.wait');
+      button.setAttribute('disabled', true);
+      button.setAttribute('aria-busy', true);
+    }
+
+    let table = document.querySelector(tableSelector);
+    if (!table) {
+      console.error("table not found");
+      return;
+    }
+
+    const onSuccess = async (response) => {
+      let result = await response.json();
+      console.log('networks: ', result);
+
+      let tbody = table.querySelector('tbody');
+      if (!tbody) {
+        tbody = table.createTBody();
+      }
+
+      while (tbody.rows.length > 0) {
+        tbody.rows[0].remove();
+      }
+
+      for (let i = 0; i < result.length; i++) {
+        let row = tbody.insertRow(-1);
+        row.classList.add("network");
+        row.setAttribute('data-ssid', result[i].hidden ? '' : result[i].ssid);
+        row.onclick = () => {
+          const input = document.querySelector('input#sta-ssid');
+          const ssid = this.getAttribute('data-ssid');
+          if (!input || !ssid) {
+            return;
+          }
+
+          input.value = ssid;
+          input.focus();
+        };
+
+        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();
+
+        // signal quality
+        let signalQualityIcon = document.createElement("i");
+        if (result[i].signalQuality > 80) {
+          signalQualityIcon.classList.add('icons-wifi-strength-4');
+        } else if (result[i].signalQuality > 60) {
+          signalQualityIcon.classList.add('icons-wifi-strength-3');
+        } else if (result[i].signalQuality > 40) {
+          signalQualityIcon.classList.add('icons-wifi-strength-2');
+        } else if (result[i].signalQuality > 20) {
+          signalQualityIcon.classList.add('icons-wifi-strength-1');
+        } else {
+          signalQualityIcon.classList.add('icons-wifi-strength-0');
+        }
+        
+        let signalQualityContainer = document.createElement("span");
+        signalQualityContainer.setAttribute('data-tooltip', `${result[i].signalQuality}%`);
+        signalQualityContainer.appendChild(signalQualityIcon);
+        infoCell.appendChild(signalQualityContainer);
+
+        // auth
+        const authList = {
+          0: "Open",
+          1: "WEP",
+          2: "WPA",
+          3: "WPA2",
+          4: "WPA/WPA2",
+          5: "WPA/WPA2 Enterprise",
+          6: "WPA3",
+          7: "WPA2/WPA3",
+          8: "WAPI",
+          9: "OWE",
+          10: "WPA3 Enterprise"
+        };
+        let authIcon = document.createElement("i");
+
+        if (result[i].auth == 0) {
+          authIcon.classList.add('icons-unlocked');
+        } else {
+          authIcon.classList.add('icons-locked');
+        }
+
+        let authContainer = document.createElement("span");
+        authContainer.setAttribute('data-tooltip', (result[i].auth in authList) ? authList[result[i].auth] : "unknown");
+        authContainer.appendChild(authIcon);
+        infoCell.appendChild(authContainer);
+      }
+
+      if (button) {
+        button.innerHTML = defaultText;
+        button.removeAttribute('disabled');
+        button.removeAttribute('aria-busy');
+      }
+    };
+
+    const onFailed = async (response) => {
+      table.classList.remove('hidden');
+
+      if (button) {
+        button.innerHTML = defaultText;
+        button.removeAttribute('disabled');
+        button.removeAttribute('aria-busy');
+      }
+    };
+
+    let attempts = 6;
+    let attemptFn = async () => {
+      attempts--;
+
+      try {
+        let response = await fetch(url, {
+          cache: "no-cache",
+          credentials: "include"
+        });
+
+        if (response.status == 200) {
+          await onSuccess(response);
+
+        } else if (attempts <= 0) {
+          await onFailed(response);
+
+        } else {
+          setTimeout(attemptFn, 5000);
+        }
+
+      } catch (err) {
+        if (attempts <= 0) {
+          onFailed(err);
+
+        } else {
+          setTimeout(attemptFn, 10000);
+        }
+      }
+    };
+    attemptFn();
+  };
+
+  form.addEventListener('submit', onSubmitFn);
+  onSubmitFn();
+}
+
+const setupRestoreBackupForm = (formSelector) => {
+  const form = document.querySelector(formSelector);
+  if (!form) {
+    return;
+  }
+
+  const url = form.action;
+  let button = form.querySelector('button[type="submit"]');
+  let defaultText;
+
+  form.addEventListener('submit', async (event) => {
+    event.preventDefault();
+
+    if (button) {
+      defaultText = button.textContent;
+      button.textContent = i18n('button.wait');
+      button.setAttribute('disabled', true);
+      button.setAttribute('aria-busy', true);
+    }
+
+    const onSuccess = () => {
+      if (button) {
+        button.textContent = i18n('button.restored');
+        button.classList.add('success');
+        button.removeAttribute('aria-busy');
+
+        setTimeout(() => {
+          button.removeAttribute('disabled');
+          button.classList.remove('success', 'failed');
+          button.textContent = defaultText;
+        }, 5000);
+      }
+    };
+
+    const onFailed = () => {
+      if (button) {
+        button.textContent = i18n('button.error');
+        button.classList.add('failed');
+        button.removeAttribute('aria-busy');
+
+        setTimeout(() => {
+          button.removeAttribute('disabled');
+          button.classList.remove('success', 'failed');
+          button.textContent = defaultText;
+        }, 5000);
+      }
+    };
+
+    const files = form.querySelector('#restore-file').files;
+    if (files.length <= 0) {
+      onFailed(false);
+      return;
+    }
+
+    let reader = new FileReader();
+    reader.readAsText(files[0]);
+    reader.onload = async (event) => {
+      try {
+        const data = JSON.parse(event.target.result);
+        console.log("Backup: ", data);
+
+        if (data.settings != undefined) {
+          let response = await fetch(url, {
+            method: "POST",
+            cache: "no-cache",
+            credentials: "include",
+            headers: {
+              "Content-Type": "application/json"
+            },
+            body: JSON.stringify({"settings": data.settings})
+          });
+
+          if (!response.ok) {
+            onFailed();
+            return;
+          }
+        }
+
+        if (data.sensors != undefined) {
+          for (const sensorId in data.sensors) {
+            const payload = {
+              "sensors": {}
+            };
+            payload["sensors"][sensorId] = data.sensors[sensorId];
+
+            const response = await fetch(url, {
+              method: "POST",
+              cache: "no-cache",
+              credentials: "include",
+              headers: {
+                "Content-Type": "application/json"
+              },
+              body: JSON.stringify(payload)
+            });
+
+            if (!response.ok) {
+              onFailed();
+              return;
+            }
+          }
+        }
+
+        if (data.network != undefined) {
+          let response = await fetch(url, {
+            method: "POST",
+            cache: "no-cache",
+            credentials: "include",
+            headers: {
+              "Content-Type": "application/json"
+            },
+            body: JSON.stringify({"network": data.network})
+          });
+
+          if (!response.ok) {
+            onFailed();
+            return;
+          }
+        }
+
+        onSuccess();
+
+      } catch (err) {
+        onFailed();
+      }
+    };
+    reader.onerror = () => {
+      console.log(reader.error);
+    };
+  });
+}
+
+const setupUpgradeForm = (formSelector) => {
+  const form = document.querySelector(formSelector);
+  if (!form) {
+    return;
+  }
+
+  const url = form.action;
+  let button = form.querySelector('button[type="submit"]');
+  let defaultText;
+
+  const statusToText = (status) => {
+    switch (status) {
+      case 0:
+        return "None";
+      case 1:
+        return "No file";
+      case 2:
+        return "Success";
+      case 3:
+        return "Prohibited";
+      case 4:
+        return "Aborted";
+      case 5:
+        return "Error on start";
+      case 6:
+        return "Error on write";
+      case 7:
+        return "Error on finish";
+      default:
+        return "Unknown";
+    }
+  };
+
+  const onResult = async (response) => {
+    if (!response) {
+      return;
+    }
+
+    const result = await response.json();
+
+    let resItem = form.querySelector('.upgrade-firmware-result');
+    if (resItem && result.firmware.status > 1) {
+      resItem.textContent = statusToText(result.firmware.status);
+      resItem.classList.remove('hidden');
+
+      if (result.firmware.status == 2) {
+        resItem.classList.remove('failed');
+        resItem.classList.add('success');
+      } else {
+        resItem.classList.remove('success');
+        resItem.classList.add('failed');
+
+        if (result.firmware.error != "") {
+          resItem.textContent += `: ${result.firmware.error}`;
+        }
+      }
+    }
+
+    resItem = form.querySelector('.upgrade-filesystem-result');
+    if (resItem && result.filesystem.status > 1) {
+      resItem.textContent = statusToText(result.filesystem.status);
+      resItem.classList.remove('hidden');
+
+      if (result.filesystem.status == 2) {
+        resItem.classList.remove('failed');
+        resItem.classList.add('success');
+      } else {
+        resItem.classList.remove('success');
+        resItem.classList.add('failed');
+
+        if (result.filesystem.error != "") {
+          resItem.textContent += `: ${result.filesystem.error}`;
+        }
+      }
+    }
+  };
+
+  const onSuccess = (response) => {
+    onResult(response);
+
+    if (button) {
+      button.textContent = defaultText;
+      button.removeAttribute('aria-busy');
+
+      setTimeout(() => {
+        button.removeAttribute('disabled');
+        button.classList.remove('success', 'failed');
+        button.textContent = defaultText;
+      }, 5000);
+    }
+  };
+
+  const onFailed = (response) => {
+    if (button) {
+      button.textContent = i18n('button.error');
+      button.classList.add('failed');
+      button.removeAttribute('aria-busy');
+
+      setTimeout(() => {
+        button.removeAttribute('disabled');
+        button.classList.remove('success', 'failed');
+        button.textContent = defaultText;
+      }, 5000);
+    }
+  };
+
+  form.addEventListener('submit', async (event) => {
+    event.preventDefault();
+
+    hide('.upgrade-firmware-result');
+    hide('.upgrade-filesystem-result');
+
+    if (button) {
+      defaultText = button.textContent;
+      button.textContent = i18n('button.uploading');
+      button.setAttribute('disabled', true);
+      button.setAttribute('aria-busy', true);
+    }
+
+    try {
+      let fd = new FormData(form);
+      let response = await fetch(url, {
+        method: "POST",
+        cache: "no-cache",
+        credentials: "include",
+        body: fd
+      });
+
+      if (response.status >= 200 && response.status < 500) {
+        onSuccess(response);
+
+      } else {
+        onFailed(response);
+      }
+
+    } catch (err) {
+      onFailed(false);
+    }
+  });
+}
+
+
+const setBusy = (busySelector, contentSelector, value, parent = undefined) => {
+  if (!value) {
+    hide(busySelector, parent);
+    show(contentSelector, parent);
+
+  } else {
+    show(busySelector, parent);
+    hide(contentSelector, parent);
+  }
+}
+
+const setAriaState = (selector, value, parent = undefined) => {
+  if (parent === undefined) {
+    parent = document;
+  }
+
+  let item = parent.querySelector(selector);
+  if (!item) {
+    return;
+  }
+
+  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) {
+    parent = document;
+  }
+
+  let items = parent.querySelectorAll(selector);
+  if (!items.length) {
+    return;
+  }
+
+  for (let item of items) {
+    item.innerHTML = value;
+  }
+}
+
+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) {
+    parent = document;
+  }
+
+  let item = parent.querySelector(selector);
+  if (!item) {
+    return;
+  }
+
+  item.checked = value;
+}
+
+const setRadioValue = (selector, value, parent = undefined) => {
+  if (parent === undefined) {
+    parent = document;
+  }
+
+  let items = parent.querySelectorAll(selector);
+  if (!items.length) {
+    return;
+  }
+
+  for (let item of items) {
+    item.checked = item.value == value;
+  }
+}
+
+const setInputValue = (selector, value, attrs = {}, parent = undefined) => {
+  if (parent === undefined) {
+    parent = document;
+  }
+
+  let items = parent.querySelectorAll(selector);
+  if (!items.length) {
+    return;
+  }
+
+  for (let item of items) {
+    item.value = value;
+
+    if (attrs instanceof Object) {
+      for (let attrKey of Object.keys(attrs)) {
+        item.setAttribute(attrKey, attrs[attrKey]);
+      }
+    }
+  }
+}
+
+const setSelectValue = (selector, value, parent = undefined) => {
+  if (parent === undefined) {
+    parent = document;
+  }
+  
+  let item = parent.querySelector(selector);
+  if (!item) {
+    return;
+  }
+
+  for (let option of item.options) {
+    option.selected = option.value == value;
+  }
+}
+
+const show = (selector, parent = undefined) => {
+  if (parent === undefined) {
+    parent = document;
+  }
+
+  let items = parent.querySelectorAll(selector);
+  if (!items.length) {
+    return;
+  }
+
+  for (let item of items) {
+    if (item.classList.contains('hidden')) {
+      item.classList.remove('hidden');
+    }
+  }
+}
+
+const hide = (selector, parent = undefined) => {
+  if (parent === undefined) {
+    parent = document;
+  }
+
+  let items = parent.querySelectorAll(selector);
+  if (!items.length) {
+    return;
+  }
+
+  for (let item of items) {
+    if (!item.classList.contains('hidden')) {
+      item.classList.add('hidden');
+    }
+  }
+}
+
+function unit2str(unitSystem, units = {}, defaultValue = '?') {
+  return (unitSystem in units) 
+    ? units[unitSystem] 
+    : defaultValue;
+}
+
+const temperatureUnit = (unitSystem) => {
+  return unit2str(unitSystem, {
+    0: "°C",
+    1: "°F"
+  });
+}
+
+const pressureUnit = (unitSystem) => {
+  return unit2str(unitSystem, {
+    0: "bar",
+    1: "psi"
+  });
+}
+
+const volumeUnit = (unitSystem) => {
+  return unit2str(unitSystem, {
+    0: "L",
+    1: "gal"
+  });
+}
+
+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
+  const vendorList = {
+    1:    "Baxi",
+    2:    "AWB/Brink/Viessmann",
+    4:    "ATAG/Baxi/Brötje/ELCO/GEMINOX",
+    5:    "Itho Daalderop",
+    6:    "IDEAL",
+    8:    "Buderus/Bosch/Hoval",
+    9:    "Ferroli",
+    11:   "Remeha/De Dietrich",
+    16:   "Unical",
+    24:   "Vaillant/Bulex",
+    27:   "Baxi",
+    29:   "Itho Daalderop",
+    33:   "Viessmann",
+    41:   "Italtherm/Radiant",
+    56:   "Baxi",
+    131:  "Nefit",
+    148:  "Navien",
+    173:  "Intergas",
+    247:  "Baxi Ampera",
+    248:  "Zota Lux-X"
+  };
+  
+  return (memberId in vendorList) 
+    ? vendorList[memberId] 
+    : "unknown vendor";
+}
+
+function form2json(data, noCastItems = []) {
+  let method = function (object, pair) {
+    let keys = pair[0].replace(/\]/g, '').split('[');
+    let key = keys[0];
+    let value = pair[1];
+
+    if (!noCastItems.includes(keys.join('.'))) {
+      if (value === 'true' || value === 'false') {
+        value = value === 'true';
+
+      } else if (typeof (value) === 'string' && value.trim() !== '' && !isNaN(value)) {
+        value = parseFloat(value);
+      }
+    }
+
+    if (keys.length > 1) {
+      let i, x, segment;
+      let last = value;
+      let type = isNaN(keys[1]) ? {} : [];
+      value = segment = object[key] || type;
+
+      for (i = 1; i < keys.length; i++) {
+        x = keys[i];
+        if (i == keys.length - 1) {
+          if (Array.isArray(segment)) {
+            segment.push(last);
+          } else {
+            segment[x] = last;
+          }
+        } else if (segment[x] == undefined) {
+          segment[x] = isNaN(keys[i + 1]) ? {} : [];
+        }
+        segment = segment[x];
+      }
+    }
+
+    object[key] = value;
+    return object;
+  }
+
+  let object = Array.from(data).reduce(method, {});
+  return JSON.stringify(object);
+}
+
+function dec2hex(i) {
+  let hex = parseInt(i).toString(16);
+  if (hex.length % 2 != 0) {
+    hex = `0${hex}`;
+  }
+  
+  return hex.toUpperCase();
+}

src_data/styles/app.css

@@ -0,0 +1,311 @@
+@media (min-width: 576px) {
+  article {
+    --pico-block-spacing-vertical: calc(var(--pico-spacing) * 0.75);
+    --pico-block-spacing-horizontal: calc(var(--pico-spacing) * 0.75);
+  }
+}
+
+@media (min-width: 768px) {
+  article {
+    --pico-block-spacing-vertical: var(--pico-spacing);
+    --pico-block-spacing-horizontal: var(--pico-spacing);
+  }
+}
+
+@media (min-width: 1024px) {
+  article {
+    --pico-block-spacing-vertical: calc(var(--pico-spacing) * 1.25);
+    --pico-block-spacing-horizontal: calc(var(--pico-spacing) * 1.25);
+  }
+}
+
+@media (min-width: 1280px) {
+  article {
+    --pico-block-spacing-vertical: calc(var(--pico-spacing) * 1.5);
+    --pico-block-spacing-horizontal: calc(var(--pico-spacing) * 1.5);
+  }
+
+  .container {
+    max-width: 1000px;
+  }
+}
+
+@media (min-width: 1536px) {
+  article {
+    --pico-block-spacing-vertical: calc(var(--pico-spacing) * 1.75);
+    --pico-block-spacing-horizontal: calc(var(--pico-spacing) * 1.75);
+  }
+
+  .container {
+    max-width: 1000px;
+  }
+}
+
+header,
+main,
+footer {
+  padding-top: 1rem !important;
+  padding-bottom: 1rem !important;
+}
+
+article {
+  margin-bottom: 1rem;
+}
+
+footer {
+  text-align: center;
+}
+
+/*nav li a:has(> div.logo) {
+  margin-bottom: 0;
+}*/
+nav li :where(a, [role=link]) {
+  margin: 0;
+}
+
+details>div {
+  padding: 0 var(--pico-form-element-spacing-horizontal);
+}
+
+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;
+}
+
+button.success {
+  background-color: var(--pico-form-element-valid-border-color);
+  border-color: var(--pico-form-element-valid-border-color);
+}
+
+button.failed {
+  background-color: var(--pico-form-element-invalid-border-color);
+  border-color: var(--pico-form-element-invalid-border-color);
+}
+
+tr.network:hover {
+  --pico-background-color: var(--pico-primary-focus);
+  cursor: pointer;
+}
+
+.primary {
+  border: 0.25rem solid var(--pico-form-element-invalid-border-color);
+  padding: 1rem;
+  margin-bottom: 1rem;
+}
+
+.logo {
+  display: inline-block;
+  padding: calc(var(--pico-nav-link-spacing-vertical) - var(--pico-border-width) * 2) var(--pico-nav-link-spacing-horizontal);
+  vertical-align: baseline;
+  line-height: var(--pico-line-height);
+  background-color: var(--pico-code-kbd-background-color);
+  border-radius: var(--pico-border-radius);
+  color: var(--pico-code-kbd-color);
+  font-weight: bolder;
+  font-size: 1.3rem;
+  font-family: var(--pico-font-family-monospace);
+}
+
+
+.thermostat {
+  display: grid;
+  grid-template-columns: 0.5fr 2fr 0.5fr;
+  grid-template-rows: 0.25fr 1fr 0.25fr;
+  gap: 0px 0px;
+  grid-auto-flow: row;
+  justify-content: center;
+  justify-items: center;
+  grid-template-areas:
+    ". thermostat-header ."
+    "thermostat-minus thermostat-temp thermostat-plus"
+    "thermostat-control thermostat-control thermostat-control";
+
+  border: .25rem solid var(--pico-blockquote-border-color);
+  padding: 0.5rem;
+}
+
+.thermostat-header {
+  justify-self: center;
+  align-self: end;
+  grid-area: thermostat-header;
+
+  font-size: 1rem;
+  font-weight: bold;
+  border-bottom: .25rem solid var(--pico-primary-hover-border);
+  margin: 0 0 1rem 0;
+}
+
+.thermostat-temp {
+  display: grid;
+  grid-template-columns: 1fr;
+  grid-template-rows: 1fr 0.5fr;
+  gap: 0px 0px;
+  grid-auto-flow: row;
+  grid-template-areas:
+    "thermostat-temp-target"
+    "thermostat-temp-current";
+  grid-area: thermostat-temp;
+}
+
+.thermostat-temp-target {
+  justify-self: center;
+  align-self: center;
+  grid-area: thermostat-temp-target;
+
+  font-weight: bold;
+  font-size: 1.75rem;
+}
+
+.thermostat-temp-current {
+  justify-self: center;
+  align-self: start;
+  grid-area: thermostat-temp-current;
+
+  color: var(--pico-secondary);
+  font-size: 0.85rem;
+}
+
+.thermostat-minus {
+  justify-self: end;
+  align-self: center;
+  grid-area: thermostat-minus;
+}
+
+.thermostat-plus {
+  justify-self: start;
+  align-self: center;
+  grid-area: thermostat-plus;
+}
+
+.thermostat-control {
+  justify-self: center;
+  align-self: start;
+  grid-area: thermostat-control;
+
+  margin: 1.25rem 0;
+}
+
+
+@media (max-width: 575px) {
+  .notify {
+    display: grid; 
+    grid-template-columns: 1fr; 
+    grid-template-rows: 1fr 0.5fr; 
+    gap: 0.5rem 0.5rem;
+    grid-template-areas: 
+      "notify-content"
+      "notify-actions"; 
+  }
+
+  .notify-icon {
+    display: none;
+  }
+
+  .notify-content {
+    justify-self: center;
+    align-self: center;
+    grid-area: notify-content; 
+  }
+
+  .notify-actions {
+    justify-self: center; 
+    align-self: center; 
+    grid-area: notify-actions; 
+  }
+}
+
+@media (min-width: 576px) {
+  .notify {
+    display: grid;
+    grid-template-columns: 5rem 1fr 10rem;
+    grid-template-rows: 1fr;
+    gap: 0rem 0.5rem;
+    grid-auto-flow: row;
+    grid-template-areas:
+      "notify-icon notify-content notify-actions";
+  }
+
+  .notify-icon {
+    justify-self: center;
+    align-self: center;
+    grid-area: notify-icon;
+  }
+
+  .notify-content {
+    justify-self: center;
+    align-self: center;
+    grid-area: notify-content;
+  }
+  
+  .notify-actions {
+    justify-self: center;
+    align-self: center;
+    grid-area: notify-actions;
+  }
+}
+
+.notify {
+  margin: 1rem;
+  padding: 0.5rem;
+  border: .25rem solid var(--pico-blockquote-border-color);
+}
+
+.notify-error {
+  border-color: var(--pico-form-element-invalid-border-color);
+}
+
+.notify-error .notify-icon {
+  color: var(--pico-form-element-invalid-border-color);
+}
+
+.notify-alarm {
+  border-color: #c89048;
+}
+
+.notify-alarm .notify-icon {
+  color: #c89048;
+}
+
+.notify-icon i {
+  font-size: 2.5rem;
+}
+
+
+[class*=" icons-"],
+[class=icons],
+[class^=icons-] {
+  font-size: 1.35rem;
+}
+
+*:has(> [class*=" icons-"], > [class=icons], > [class^=icons-]):has(+ * > [class*=" icons-"], + * > [class=icons], + * > [class^=icons-]) {
+  margin: 0 0.5rem 0 0;
+}
+
+[data-tooltip]:has(> [class*=" icons-"], > [class=icons], > [class^=icons-]) {
+  border: 0 !important;
+}
+
+.icons-color-green {
+  color: var(--pico-form-element-valid-active-border-color);
+}
+
+.icons-color-yellow {
+  color: #c89048;
+}
+
+.icons-color-gray {
+  color: var(--pico-form-element-placeholder-color);
+}
+
+.icons-color-red {
+  color: var(--pico-form-element-invalid-active-border-color);
+}

src_data/styles/iconly.css

@@ -0,0 +1,80 @@
+/*!
+ *  Icons icon font. Generated by Iconly: https://iconly.io/
+ */
+
+@font-face {
+  font-display: auto;
+  font-family: "Icons";
+  font-style: normal;
+  font-weight: 400;
+  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-"] {
+  display: inline-block;
+  font-family: "Icons" !important;
+  font-weight: 400;
+  font-style: normal;
+  font-variant: normal;
+  text-rendering: auto;
+  line-height: 1;
+  -moz-osx-font-smoothing: grayscale;
+  -webkit-font-smoothing: antialiased;
+}
+
+.icons-plus:before {
+  content: "\e000";
+}
+
+.icons-minus:before {
+  content: "\e001";
+}
+
+.icons-unlocked:before {
+  content: "\e002";
+}
+
+.icons-locked:before {
+  content: "\e003";
+}
+
+.icons-wifi-strength-1:before {
+  content: "\e004";
+}
+
+.icons-wifi-strength-0:before {
+  content: "\e005";
+}
+
+.icons-wifi-strength-2:before {
+  content: "\e006";
+}
+
+.icons-error:before {
+  content: "\e007";
+}
+
+.icons-wifi-strength-3:before {
+  content: "\e008";
+}
+
+.icons-down:before {
+  content: "\e009";
+}
+
+.icons-wifi-strength-4:before {
+  content: "\e00a";
+}
+
+.icons-success:before {
+  content: "\e00b";
+}
+
+.icons-up:before {
+  content: "\e00c";
+}
+
+.icons-alarm:before {
+  content: "\e00d";
+}

tools/build.py

@@ -0,0 +1,62 @@
+import shutil
+import gzip
+import os
+Import("env")
+
+
+def post_build(source, target, env):
+  copy_to_build_dir({
+    source[0].get_abspath():                          "firmware_%s_%s.bin" % (env["PIOENV"], env.GetProjectOption("version")),
+    env.subst("$BUILD_DIR/${PROGNAME}.factory.bin"):  "firmware_%s_%s.factory.bin" % (env["PIOENV"], env.GetProjectOption("version")),
+    env.subst("$BUILD_DIR/${PROGNAME}.elf"):          "firmware_%s_%s.elf" % (env["PIOENV"], env.GetProjectOption("version"))
+  }, os.path.join(env["PROJECT_DIR"], "build"));
+  
+  env.Execute("pio run --target buildfs --environment %s" % env["PIOENV"]);
+
+
+def before_buildfs(source, target, env):
+  env.Execute("npm install --silent")
+  env.Execute("npx gulp build_all --no-deprecation")
+"""
+  src = os.path.join(env["PROJECT_DIR"], "src_data")
+  dst = os.path.join(env["PROJECT_DIR"], "data")
+
+  for root, dirs, files in os.walk(src, topdown=False):
+    for name in files:
+      src_path = os.path.join(root, name)
+
+      with open(src_path, 'rb') as f_in:
+          dst_name = name + ".gz"
+          dst_path = os.path.join(dst, os.path.relpath(root, src), dst_name)
+
+          if os.path.exists(os.path.join(dst, os.path.relpath(root, src))) == False:
+            os.mkdir(os.path.join(dst, os.path.relpath(root, src)))
+
+          with gzip.open(dst_path, 'wb', 9) as f_out:
+            shutil.copyfileobj(f_in, f_out)
+          
+          print("Compressed '%s' to '%s'" % (src_path, dst_path))
+"""
+
+def after_buildfs(source, target, env):
+  copy_to_build_dir({
+    source[0].get_abspath(): "filesystem_%s_%s.bin" % (env["PIOENV"], env.GetProjectOption("version")),
+  }, os.path.join(env["PROJECT_DIR"], "build"));
+
+
+def copy_to_build_dir(files, build_dir):
+  if os.path.exists(build_dir) == False:
+    return
+  
+  for src in files:
+    if os.path.exists(src):
+      dst = os.path.join(build_dir, files[src])
+      
+      print("Copying '%s' to '%s'" % (src, dst))
+      shutil.copy(src, dst)
+
+
+env.AddPostAction("buildprog", post_build)
+env.AddPreAction("$BUILD_DIR/spiffs.bin", before_buildfs)
+env.AddPreAction("$BUILD_DIR/littlefs.bin", before_buildfs)
+env.AddPostAction("buildfs", after_buildfs)

tools/esp32.py

@@ -0,0 +1,79 @@
+# Source: https://raw.githubusercontent.com/letscontrolit/ESPEasy/mega/tools/pio/post_esp32.py
+
+# Part of ESPEasy build toolchain.
+#
+# Combines separate bin files with their respective offsets into a single file
+# This single file must then be flashed to an ESP32 node with 0 offset.
+#
+# Original implementation: Bartłomiej Zimoń (@uzi18)
+# Maintainer: Gijs Noorlander (@TD-er)
+#
+# Special thanks to @Jason2866 (Tasmota) for helping debug flashing to >4MB flash
+# Thanks @jesserockz (esphome) for adapting to use esptool.py with merge_bin
+#
+# Typical layout of the generated file:
+#    Offset | File
+# -  0x1000 | ~\.platformio\packages\framework-arduinoespressif32\tools\sdk\esp32\bin\bootloader_dout_40m.bin
+# -  0x8000 | ~\ESPEasy\.pio\build\<env name>\partitions.bin
+# -  0xe000 | ~\.platformio\packages\framework-arduinoespressif32\tools\partitions\boot_app0.bin
+# - 0x10000 | ~\ESPEasy\.pio\build\<env name>/<built binary>.bin
+
+Import("env")
+
+platform = env.PioPlatform()
+
+import sys
+from os.path import join
+
+sys.path.append(join(platform.get_package_dir("tool-esptoolpy")))
+import esptool
+
+def esp32_create_combined_bin(source, target, env):
+    print("Generating combined binary for serial flashing")
+
+    # The offset from begin of the file where the app0 partition starts
+    # This is defined in the partition .csv file
+    app_offset = 0x10000
+
+    new_file_name = env.subst("$BUILD_DIR/${PROGNAME}.factory.bin")
+    sections = env.subst(env.get("FLASH_EXTRA_IMAGES"))
+    firmware_name = env.subst("$BUILD_DIR/${PROGNAME}.bin")
+    chip = env.get("BOARD_MCU")
+    flash_size = env.BoardConfig().get("upload.flash_size")
+    flash_freq = env.BoardConfig().get("build.f_flash", '40m')
+    flash_freq = flash_freq.replace('000000L', 'm')
+    flash_mode = env.BoardConfig().get("build.flash_mode", "dio")
+    memory_type = env.BoardConfig().get("build.arduino.memory_type", "qio_qspi")
+    if flash_mode == "qio" or flash_mode == "qout":
+        flash_mode = "dio"
+    if memory_type == "opi_opi" or memory_type == "opi_qspi":
+        flash_mode = "dout"
+    cmd = [
+        "--chip",
+        chip,
+        "merge_bin",
+        "-o",
+        new_file_name,
+        "--flash_mode",
+        flash_mode,
+        "--flash_freq",
+        flash_freq,
+        "--flash_size",
+        flash_size,
+    ]
+
+    print("    Offset | File")
+    for section in sections:
+        sect_adr, sect_file = section.split(" ", 1)
+        print(f" -  {sect_adr} | {sect_file}")
+        cmd += [sect_adr, sect_file]
+
+    print(f" - {hex(app_offset)} | {firmware_name}")
+    cmd += [hex(app_offset), firmware_name]
+
+    print('Using esptool.py arguments: %s' % ' '.join(cmd))
+
+    esptool.main(cmd)
+
+
+env.AddPostAction("$BUILD_DIR/${PROGNAME}.bin", esp32_create_combined_bin)