chore: bump version

feat: added multilanguage for portal
fix: fix typo
2025-12-11 18:54:28 +05:00 · 2024-06-21 02:05:34 +03:00 · 2024-06-21 02:01:38 +03:00 · 2024-06-20 06:41:32 +03:00 · 2024-06-18 10:25:58 +03:00 · 2024-06-15 03:03:50 +03:00
55 changed files with 5858 additions and 2554 deletions
--- a/.gitignore
+++ b/.gitignore
@@ -1,5 +1,8 @@
 .pio
 .vscode
 build/*.bin
+data/*
 secrets.ini
+node_modules
+package-lock.json
 !.gitkeep
--- a/README.md
+++ b/README.md
@@ -2,7 +2,7 @@
   
   ![logo](/assets/logo.svg)
   <br>
-   [![GitHub version](https://img.shields.io/github/release/Laxilef/OTGateway.svg)](https://github.com/Laxilef/OTGateway/releases)
+   [![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)
@@ -31,7 +31,6 @@
  - The current temperature of the heat carrier (usually the return heat carrier)
  - Set heat carrier temperature (depending on the selected mode)
  - Current hot water temperature
- Auto tuning of PID and Equitherm parameters *(in development)*
 - [Home Assistant](https://www.home-assistant.io/) integration via MQTT. The ability to create any automation for the boiler!

 ![logo](/assets/ha.png)
--- a/data/.gitkeep
+++ b/data/.gitkeep
--- a/data/index.html
+++ b/data/index.html
@@ -1,230 +0,0 @@
-<!doctype html>
-<html lang="en">
-  <head>
-    <meta charset="utf-8" />
-    <meta name="viewport" content="width=device-width, initial-scale=1" />
-    <title>OpenTherm Gateway</title>
-    <link rel="stylesheet" href="/static/pico.min.css">
-    <link rel="stylesheet" href="/static/app.css"/>
-  </head>
-
-  <body>
-    <header class="container">
-      <nav>
-        <ul>
-          <li><a href="/"><div class="logo">OpenTherm Gateway</div></a></li>
-        </ul>
-        <ul>
-          <li><a href="https://github.com/Laxilef/OTGateway/wiki" role="button" class="secondary" target="_blank">Help</a></li>
-        </ul>
-      </nav>
-    </header>
-
-    <main class="container">
-      <article>
-        <div>
-          <hgroup>
-            <h2>Network</h2>
-            <p></p>
-          </hgroup>
-
-          <div class="main-busy" aria-busy="true"></div>
-          <table class="main-table hidden">
-            <tbody>
-              <tr>
-                <th scope="row">Hostname:</th>
-                <td><b class="network-hostname"></b></td>
-              </tr>
-              <tr>
-                <th scope="row">MAC:</th>
-                <td><b class="network-mac"></b></td>
-              </tr>
-              <tr>
-                <th scope="row">Connected:</th>
-                <td><input type="radio" class="network-connected" aria-invalid="false" checked disabled /></td>
-              </tr>
-              <tr>
-                <th scope="row">SSID:</th>
-                <td><b class="network-ssid"></b></td>
-              </tr>
-              <tr>
-                <th scope="row">Signal:</th>
-                <td><b class="network-signal"></b> %</td>
-              </tr>
-              <tr>
-                <th scope="row">IP:</th>
-                <td><b class="network-ip"></b></td>
-              </tr>
-              <tr>
-                <th scope="row">Subnet:</th>
-                <td><b class="network-subnet"></b></td>
-              </tr>
-              <tr>
-                <th scope="row">Gateway:</th>
-                <td><b class="network-gateway"></b></td>
-              </tr>
-              <tr>
-                <th scope="row">DNS:</th>
-                <td><b class="network-dns"></b></td>
-              </tr>
-            </tbody>
-          </table>
-          <div class="grid">
-            <a href="/network.html" role="button">Network settings</a>
-          </div>
-        </div>
-      </article>
-
-      <article>
-        <div>
-          <hgroup>
-            <h2>System</h2>
-            <p></p>
-          </hgroup>
-
-          <div class="system-busy" aria-busy="true"></div>
-          <table class="system-table hidden">
-            <tbody>
-              <tr>
-                <th scope="row">Version:</th>
-                <td><b class="version"></b></td>
-              </tr>
-              <tr>
-                <th scope="row">Build date:</th>
-                <td><b class="build-date"></b></td>
-              </tr>
-              <tr>
-                <th scope="row">Uptime:</th>
-                <td><b class="uptime-days"></b> days, <b class="uptime-hours"></b> hours, <b class="uptime-min"></b> min., <b class="uptime-sec"></b> sec.</td>
-              </tr>
-              <tr>
-                <th scope="row">Free memory:</th>
-                <td><b class="free-heap"></b> of <b class="total-heap"></b> bytes (min: <b class="min-free-heap"></b> bytes)<br>max free block: <b class="max-free-block-heap"></b> bytes (min: <b class="min-max-free-block-heap"></b> bytes)</td>
-              </tr>
-              <tr>
-                <th scope="row">Last reset reason:</th>
-                <td><b class="reset-reason"></b></td>
-              </tr>
-            </tbody>
-          </table>
-
-          <div class="grid">
-            <a href="/settings.html" role="button">Settings</a>
-            <a href="/upgrade.html" role="button">Upgrade</a>
-            <a href="/restart.html" role="button" class="secondary restart">Restart</a>
-          </div>
-        </div>
-      </article>
-
-      <article>
-        <div>
-          <hgroup>
-            <h2>States and sensors</h2>
-            <p>More information and settings can be found in your home assistant after setting up network and MQTT</p>
-          </hgroup>
-
-          <div class="ot-busy" aria-busy="true"></div>
-          <table class="ot-table hidden">
-            <tbody>
-              <tr>
-                <th scope="row">OpenTherm connected:</th>
-                <td><input type="radio" class="ot-connected" aria-invalid="false" checked disabled /></td>
-              </tr>
-              <tr>
-                <th scope="row">MQTT connected:</th>
-                <td><input type="radio" class="mqtt-connected" aria-invalid="false" checked disabled /></td>
-              </tr>
-              <tr>
-                <th scope="row">Emergency:</th>
-                <td><input type="radio" class="ot-emergency" aria-invalid="false" checked disabled /></td>
-              </tr>
-              <tr>
-                <th scope="row">Heating:</th>
-                <td><input type="radio" class="ot-heating" aria-invalid="false" checked disabled /></td>
-              </tr>
-              <tr>
-                <th scope="row">DHW:</th>
-                <td><input type="radio" class="ot-dhw" aria-invalid="false" checked disabled /></td>
-              </tr>
-              <tr>
-                <th scope="row">Flame:</th>
-                <td><input type="radio" class="ot-flame" aria-invalid="false" checked disabled /></td>
-              </tr>
-              <tr>
-                <th scope="row">Fault:</th>
-                <td><input type="radio" class="ot-fault" aria-invalid="false" checked disabled /></td>
-              </tr>
-              <tr>
-                <th scope="row">Diagnostic:</th>
-                <td><input type="radio" class="ot-diagnostic" aria-invalid="false" checked disabled /></td>
-              </tr>
-              <tr>
-                <th scope="row">External pump:</th>
-                <td><input type="radio" class="ot-external-pump" aria-invalid="false" checked disabled /></td>
-              </tr>
-              <tr>
-                <th scope="row">Modulation:</th>
-                <td><b class="ot-modulation"></b> %</td>
-              </tr>
-              <tr>
-                <th scope="row">Pressure:</th>
-                <td><b class="ot-pressure"></b> bar</td>
-              </tr>
-              <tr>
-                <th scope="row">DHW flow rate:</th>
-                <td><b class="ot-dhw-flow-rate"></b> l/min</td>
-              </tr>
-              <tr>
-                <th scope="row">Fault code:</th>
-                <td><b class="ot-fault-code"></b></td>
-              </tr>
-              <tr>
-                <th scope="row">Indoor temp:</th>
-                <td><b class="indoor-temp"></b> C</td>
-              </tr>
-              <tr>
-                <th scope="row">Outdoor temp:</th>
-                <td><b class="outdoor-temp"></b> C</td>
-              </tr>
-              <tr>
-                <th scope="row">Heating temp:</th>
-                <td><b class="heating-temp"></b> C</td>
-              </tr>
-              <tr>
-                <th scope="row">Heating setpoint temp:</th>
-                <td><b class="heating-setpoint-temp"></b> C</td>
-              </tr>
-              <tr>
-                <th scope="row">DHW temp:</th>
-                <td><b class="dhw-temp"></b> C</td>
-              </tr>
-            </tbody>
-          </table>
-        </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">License</a>
-        • <a href="https://github.com/Laxilef/OTGateway/blob/master/" target="_blank" class="secondary">Source code</a>
-        • <a href="https://github.com/Laxilef/OTGateway/wiki" target="_blank" class="secondary">Help</a>
-        • <a href="https://github.com/Laxilef/OTGateway/issues" target="_blank" class="secondary">Issue & questions</a>
-        • <a href="https://github.com/Laxilef/OTGateway/releases" target="_blank" class="secondary">Releases</a>
-      </small>
-    </footer>
-
-    <script src="/static/app.js"></script>
-    <script>
-      window.onload = async function () {
-        setTimeout(async function onLoadPage() {
-          await loadNetworkStatus();
-          await loadVars();
-
-          setTimeout(onLoadPage, 10000);
-        }, 1000);
-      };
-    </script>
-  </body>
-</html>
--- a/data/network.html
+++ b/data/network.html
@@ -1,166 +0,0 @@
-<!doctype html>
-<html lang="en">
-
-<head>
-  <meta charset="utf-8" />
-  <meta name="viewport" content="width=device-width, initial-scale=1" />
-  <title>Network - OpenTherm Gateway</title>
-  <link rel="stylesheet" href="/static/pico.min.css">
-  <link rel="stylesheet" href="/static/app.css" />
-</head>
-
-<body>
-  <header class="container">
-    <nav>
-      <ul>
-        <li><a href="/"><div class="logo">OpenTherm Gateway</div></a></li>
-      </ul>
-      <ul>
-        <li><a href="https://github.com/Laxilef/OTGateway/wiki" role="button" class="secondary" target="_blank">Help</a></li>
-      </ul>
-    </nav>
-  </header>
-
-  <main class="container">
-    <article>
-      <div>
-        <hgroup>
-          <h2>Network settings</h2>
-          <p></p>
-        </hgroup>
-
-        <div id="network-settings-busy" aria-busy="true"></div>
-        <form action="/api/network/settings" id="network-settings" class="hidden">
-          <label for="hostname">
-            Hostname
-            <input type="text" class="network-hostname" name="hostname" maxlength="24" pattern="[A-Za-z0-9]+[A-Za-z0-9\-]+[A-Za-z0-9]+" required>
-          </label>
-          <label for="network-use-dhcp">
-            <input type="checkbox" class="network-use-dhcp" name="useDhcp" value="true">
-            Use DHCP
-          </label>
-          <br>
-          <hr>
-          <label for="network-static-ip">
-            Static IP:
-            <input type="text" class="network-static-ip" name="staticConfig[ip]" value="true" maxlength="16" pattern="\d{1,3}\.\d{1,3}\.\d{1,3}\.\d{1,3}" required>
-          </label>
-          <label for="network-static-gateway">
-            Static gateway:
-            <input type="text" class="network-static-gateway" name="staticConfig[gateway]" maxlength="16" pattern="\d{1,3}\.\d{1,3}\.\d{1,3}\.\d{1,3}" required>
-          </label>
-          <label for="network-static-subnet">
-            Static subnet:
-            <input type="text" class="network-static-subnet" name="staticConfig[subnet]" maxlength="16" pattern="\d{1,3}\.\d{1,3}\.\d{1,3}\.\d{1,3}" required>
-          </label>
-          <label for="network-static-dns">
-            Static DNS:
-            <input type="text" class="network-static-dns" name="staticConfig[dns]" maxlength="16" pattern="\d{1,3}\.\d{1,3}\.\d{1,3}\.\d{1,3}" required>
-          </label>
-          <button type="submit">Save</button>
-        </form>
-      </div>
-    </article>
-
-    <article>
-      <div>
-        <hgroup>
-          <h3>Available networks</h3>
-          <p></p>
-        </hgroup>
-
-        <form action="/api/network/scan" id="network-scan">
-          <figure style="max-height: 25em;">
-            <table id="networks" role="grid">
-              <thead>
-                <tr>
-                  <th scope="col">#</th>
-                  <th scope="col">SSID</th>
-                  <th scope="col">Signal</th>
-                </tr>
-              </thead>
-              <tbody></tbody>
-            </table>
-          </figure>
-          <button type="submit">Refresh</button>
-        </form>
-
-        <hr>
-        <div>
-          <hgroup>
-            <h2>WiFi settings</h2>
-            <p></p>
-          </hgroup>
-          <div id="sta-settings-busy" aria-busy="true"></div>
-          <form action="/api/network/settings" id="sta-settings" class="hidden">
-            <label for="sta-ssid">
-              SSID:
-              <input type="text" class="sta-ssid" name="sta[ssid]" maxlength="32" required>
-            </label>
-            <label for="sta-password">
-              Password:
-              <input type="password" class="sta-password" name="sta[password]" maxlength="64" required>
-            </label>
-            <label for="sta-channel">
-              Channel:
-              <input type="number" inputmode="numeric" class="sta-channel" name="sta[channel]" min="0" max="12" step="1" required>
-              <small>set 0 for auto select</small>
-            </label>
-
-            <button type="submit">Save</button>
-          </form>
-        </div>
-      </div>
-    </article>
-
-    <article>
-      <div>
-        <hgroup>
-          <h2>AP settings</h2>
-          <p></p>
-        </hgroup>
-        <div id="ap-settings-busy" aria-busy="true"></div>
-        <form action="/api/network/settings" id="ap-settings" class="hidden">
-          <label for="ap-ssid">
-            SSID:
-            <input type="text" class="ap-ssid" name="ap[ssid]" maxlength="32" required>
-          </label>
-          <label for="ap-password">
-            Password:
-            <input type="text" class="ap-password" name="ap[password]" maxlength="64" required>
-          </label>
-          <label for="ap-channel">
-            Channel:
-            <input type="number" inputmode="numeric" class="ap-channel" name="ap[channel]" min="1" max="12" step="1" required>
-          </label>
-          <button type="submit">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">License</a>
-      • <a href="https://github.com/Laxilef/OTGateway/blob/master/" target="_blank" class="secondary">Source code</a>
-      • <a href="https://github.com/Laxilef/OTGateway/wiki" target="_blank" class="secondary">Help</a>
-      • <a href="https://github.com/Laxilef/OTGateway/issues" target="_blank" class="secondary">Issue & questions</a>
-      • <a href="https://github.com/Laxilef/OTGateway/releases" target="_blank" class="secondary">Releases</a>
-    </small>
-  </footer>
-
-  <script src="/static/app.js"></script>
-  <script>
-    window.onload = async function () {
-      await loadNetworkSettings();
-
-      setupForm('#network-settings');
-      setupNetworkScanForm('#network-scan', '#networks');
-      setupForm('#sta-settings');
-      setupForm('#ap-settings');
-    };
-  </script>
-</body>
-
-</html>
--- a/data/settings.html
+++ b/data/settings.html
@@ -1,357 +0,0 @@
-<!doctype html>
-<html lang="en">
-
-<head>
-  <meta charset="utf-8" />
-  <meta name="viewport" content="width=device-width, initial-scale=1" />
-  <title>Settings - OpenTherm Gateway</title>
-  <link rel="stylesheet" href="/static/pico.min.css">
-  <link rel="stylesheet" href="/static/app.css" />
-</head>
-
-<body>
-  <header class="container">
-    <nav>
-      <ul>
-        <li><a href="/"><div class="logo">OpenTherm Gateway</div></a></li>
-      </ul>
-      <ul>
-        <li><a href="https://github.com/Laxilef/OTGateway/wiki" role="button" class="secondary" target="_blank">Help</a></li>
-      </ul>
-    </nav>
-  </header>
-
-  <main class="container">
-    <article>
-      <div>
-        <hgroup>
-          <h2>Portal settings</h2>
-          <p></p>
-        </hgroup>
-
-        <div id="portal-settings-busy" aria-busy="true"></div>
-        <form action="/api/settings" id="portal-settings" class="hidden">
-          <div class="grid">
-            <label for="portal-login">
-              Login
-              <input type="text" class="portal-login" name="portal[login]" maxlength="12" required>
-            </label>
-            <label for="portal-password">
-              Password
-              <input type="password" class="portal-password" name="portal[password]" maxlength="32" required>
-            </label>
-          </div>
-          
-          <label for="portal-use-auth">
-            <input type="checkbox" class="portal-use-auth" name="portal[useAuth]" value="true">
-            Use auth
-          </label>
-          <br>
-
-          <button type="submit">Save</button>
-        </form>
-      </div>
-    </article>
-
-    <article>
-      <div>
-        <hgroup>
-          <h2>OpenTherm settings</h2>
-          <p></p>
-        </hgroup>
-
-        <div id="opentherm-settings-busy" aria-busy="true"></div>
-        <form action="/api/settings" id="opentherm-settings" class="hidden">
-          <div class="grid">
-            <label for="opentherm-in-pin">
-              In GPIO
-              <input type="number" inputmode="numeric" class="opentherm-in-pin" name="opentherm[inPin]" min="0" max="99" step="1" required>
-            </label>
-            <label for="opentherm-in-pin">
-              Out GPIO
-              <input type="number" inputmode="numeric" class="opentherm-out-pin" name="opentherm[outPin]" min="0" max="99" step="1" required>
-            </label>
-            <label for="opentherm-member-id-code">
-              Master MemberID code
-              <input type="number" inputmode="numeric" class="opentherm-member-id-code" name="opentherm[memberIdCode]" min="0" max="65535" step="1" required>
-            </label>
-          </div>
-
-          <fieldset>
-            <mark>After changing GPIO, the ESP must be restarted for the changes to take effect.</mark>
-          </fieldset>
-
-          <fieldset>
-            <legend>Options</legend>
-            <label for="opentherm-dhw-present">
-              <input type="checkbox" class="opentherm-dhw-present" name="opentherm[dhwPresent]" value="true">
-              DHW present
-            </label>
-            <label for="opentherm-sw-mode">
-              <input type="checkbox" class="opentherm-sw-mode" name="opentherm[summerWinterMode]" value="true">
-              Summer/winter mode
-            </label>
-            <label for="opentherm-heating-ch2-enabled">
-              <input type="checkbox" class="opentherm-heating-ch2-enabled" name="opentherm[heatingCh2Enabled]" value="true">
-              Heating CH2 always enabled
-            </label>
-            <label for="opentherm-heating-ch1-to-ch2">
-              <input type="checkbox" class="opentherm-heating-ch1-to-ch2" name="opentherm[heatingCh1ToCh2]" value="true">
-              Duplicate heating CH1 to CH2
-            </label>
-            <label for="opentherm-dhw-to-ch2">
-              <input type="checkbox" class="opentherm-dhw-to-ch2" name="opentherm[dhwToCh2]" value="true">
-              Duplicate DHW to CH2
-            </label>
-            <label for="opentherm-dhw-blocking">
-              <input type="checkbox" class="opentherm-dhw-blocking" name="opentherm[dhwBlocking]" value="true">
-              DHW blocking
-            </label>
-            <label for="opentherm-sync-modulation-with-heating">
-              <input type="checkbox" class="opentherm-sync-modulation-with-heating" name="opentherm[modulationSyncWithHeating]" value="true">
-              Sync modulation with heating
-            </label>
-          </fieldset>
-
-          <button type="submit">Save</button>
-        </form>
-      </div>
-    </article>
-
-    <article>
-      <div>
-        <hgroup>
-          <h2>MQTT settings</h2>
-          <p></p>
-        </hgroup>
-
-        <div id="mqtt-settings-busy" aria-busy="true"></div>
-        <form action="/api/settings" id="mqtt-settings" class="hidden">
-          <div class="grid">
-            <label for="mqtt-server">
-              Server
-              <input type="text" class="mqtt-server" name="mqtt[server]" maxlength="80" required>
-            </label>
-            <label for="mqtt-port">
-              Port
-              <input type="number" inputmode="numeric" class="mqtt-port" name="mqtt[port]" min="1" max="65535" step="1" required>
-            </label>
-          </div>
-
-          <div class="grid">
-            <label for="mqtt-user">
-              User
-              <input type="text" class="mqtt-user" name="mqtt[user]" maxlength="32" required>
-            </label>
-            <label for="mqtt-password">
-              Password
-              <input type="password" class="mqtt-password" name="mqtt[password]" maxlength="32">
-            </label>
-          </div>
-
-          <div class="grid">
-            <label for="mqtt-prefix">
-              Prefix
-              <input type="text" class="mqtt-prefix" name="mqtt[prefix]" maxlength="32" required>
-            </label>
-            <label for="mqtt-interval">
-              Publish interval <small>(sec)</small>
-              <input type="number" inputmode="numeric" class="mqtt-interval" name="mqtt[interval]" min="3" max="60" step="1" required>
-            </label>
-          </div>
-
-          <button type="submit">Save</button>
-        </form>
-      </div>
-    </article>
-
-    <article>
-      <div>
-        <hgroup>
-          <h2>Outdoor sensor settings</h2>
-          <p></p>
-        </hgroup>
-
-        <div id="outdoor-sensor-settings-busy" aria-busy="true"></div>
-        <form action="/api/settings" id="outdoor-sensor-settings" class="hidden">
-          <fieldset>
-            <legend>Source type</legend>
-            <label>
-              <input type="radio" class="outdoor-sensor-type" name="sensors[outdoor][type]" value="0" />
-              From boiler via OpenTherm
-            </label>
-            <label>
-              <input type="radio" class="outdoor-sensor-type" name="sensors[outdoor][type]" value="1" />
-              Manual via MQTT/API
-            </label>
-            <label>
-              <input type="radio" class="outdoor-sensor-type" name="sensors[outdoor][type]" value="2" />
-              External (DS18B20)
-            </label>
-          </fieldset>
-
-          <label for="outdoor-sensor-pin">
-            GPIO
-            <input type="number" inputmode="numeric" class="outdoor-sensor-pin" name="sensors[outdoor][pin]" min="0" max="99" step="1" required>
-          </label>
-          <label for="outdoor-sensor-offset">
-            Temp offset (calibration)
-            <input type="number" inputmode="numeric" class="outdoor-sensor-offset" name="sensors[outdoor][offset]" min="-20" max="20" step="0.01" required>
-          </label>
-
-          <button type="submit">Save</button>
-        </form>
-      </div>
-    </article>
-
-    <article>
-      <div>
-        <hgroup>
-          <h2>Indoor sensor settings</h2>
-          <p></p>
-        </hgroup>
-
-        <div id="indoor-sensor-settings-busy" aria-busy="true"></div>
-        <form action="/api/settings" id="indoor-sensor-settings" class="hidden">
-          <fieldset>
-            <legend>Source type</legend>
-            <label>
-              <input type="radio" class="indoor-sensor-type" name="sensors[indoor][type]" value="1" />
-              Manual via MQTT/API
-            </label>
-            <label>
-              <input type="radio" class="indoor-sensor-type" name="sensors[indoor][type]" value="2" />
-              External (DS18B20)
-            </label>
-            <label>
-              <input type="radio" class="indoor-sensor-type" name="sensors[indoor][type]" value="3" />
-              BLE device <i>(ONLY for some ESP32 which support BLE)</i>
-            </label>
-          </fieldset>
-
-          <label for="indoor-sensor-pin">
-            GPIO
-            <input type="number" inputmode="numeric" class="indoor-sensor-pin" name="sensors[indoor][pin]" min="0" max="99" step="1" required>
-          </label>
-
-          <div class="grid">
-            <label for="indoor-sensor-offset">
-              Temp offset (calibration)
-              <input type="number" inputmode="numeric" class="indoor-sensor-offset" name="sensors[indoor][offset]" min="-20" max="20" step="0.01" required>
-            </label>
-            <label for="indoor-sensor-ble-addresss">
-              BLE addresss
-              <input type="text" class="indoor-sensor-ble-addresss" name="sensors[indoor][bleAddresss]" pattern="([A-Fa-f0-9]{2}:){5}[A-Fa-f0-9]{2}">
-              <small>ONLY for some ESP32 which support BLE</small>
-            </label>
-          </div>
-
-          <button type="submit">Save</button>
-        </form>
-      </div>
-    </article>
-
-    <article>
-      <div>
-        <hgroup>
-          <h2>External pump settings</h2>
-          <p></p>
-        </hgroup>
-
-        <div id="extpump-settings-busy" aria-busy="true"></div>
-        <form action="/api/settings" id="extpump-settings" class="hidden">
-          <label for="extpump-use">
-            <input type="checkbox" class="extpump-use" name="externalPump[use]" value="true">
-            Use external pump
-          </label>
-          <br>
-
-          <div class="grid">
-            <label for="extpump-pin">
-              Relay GPIO
-              <input type="number" inputmode="numeric" class="extpump-pin" name="externalPump[pin]" min="0" max="99" step="1" required>
-            </label>
-            <label for="extpump-pc-time">
-              Post circulation time <small>(min)</small>
-              <input type="number" inputmode="numeric" class="extpump-pc-time" name="externalPump[postCirculationTime]" min="1" max="120" step="1" required>
-            </label>
-          </div>
-
-          <div class="grid">
-            <label for="extpump-as-interval">
-              Anti stuck interval <small>(days)</small>
-              <input type="number" inputmode="numeric" class="extpump-as-interval" name="externalPump[antiStuckInterval]" min="1" max="366" step="1" required>
-            </label>
-            <label for="extpump-as-time">
-              Anti stuck time <small>(min)</small>
-              <input type="number" inputmode="numeric" class="extpump-as-time" name="externalPump[antiStuckTime]" min="1" max="20" step="1" required>
-            </label>
-          </div>
-
-          <button type="submit">Save</button>
-        </form>
-      </div>
-    </article>
-
-    <article>
-      <div>
-        <hgroup>
-          <h2>System settings</h2>
-          <p></p>
-        </hgroup>
-
-        <div id="system-settings-busy" aria-busy="true"></div>
-        <form action="/api/settings" id="system-settings" class="hidden">
-          <fieldset>
-            <label for="system-debug">
-              <input type="checkbox" class="system-debug" name="system[debug]" value="true">
-              Debug mode
-            </label>
-            <label for="system-use-serial">
-              <input type="checkbox" class="system-use-serial" name="system[useSerial]" value="true">
-              Enable serial port
-            </label>
-            <label for="system-use-telnet">
-              <input type="checkbox" class="system-use-telnet" name="system[useTelnet]" value="true">
-              Enable telnet
-            </label>
-          </fieldset>
-
-          <fieldset>
-            <mark>After changing this settings, the ESP must be restarted for the changes to take effect.</mark>
-          </fieldset>
-
-          <button type="submit">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">License</a>
-      • <a href="https://github.com/Laxilef/OTGateway/blob/master/" target="_blank" class="secondary">Source code</a>
-      • <a href="https://github.com/Laxilef/OTGateway/wiki" target="_blank" class="secondary">Help</a>
-      • <a href="https://github.com/Laxilef/OTGateway/issues" target="_blank" class="secondary">Issue & questions</a>
-      • <a href="https://github.com/Laxilef/OTGateway/releases" target="_blank" class="secondary">Releases</a>
-    </small>
-  </footer>
-
-  <script src="/static/app.js"></script>
-  <script>
-    window.onload = async function () {
-      await loadSettings();
-
-      setupForm('#portal-settings');
-      setupForm('#opentherm-settings');
-      setupForm('#mqtt-settings');
-      setupForm('#outdoor-sensor-settings');
-      setupForm('#indoor-sensor-settings');
-      setupForm('#extpump-settings');
-      setupForm('#system-settings');
-    };
-  </script>
-</body>
-
-</html>
--- a/data/static/.gitkeep
+++ b/data/static/.gitkeep
--- a/data/static/app.css.gz
+++ b/data/static/app.css.gz
--- a/data/static/app.js.gz
+++ b/data/static/app.js.gz
--- a/data/static/favicon.ico.gz
+++ b/data/static/favicon.ico.gz
--- a/data/static/pico.min.css.gz
+++ b/data/static/pico.min.css.gz
--- a/data/upgrade.html
+++ b/data/upgrade.html
@@ -1,108 +0,0 @@
-<!doctype html>
-<html lang="en">
-
-<head>
-  <meta charset="utf-8" />
-  <meta name="viewport" content="width=device-width, initial-scale=1" />
-  <title>Upgrade - OpenTherm Gateway</title>
-  <link rel="stylesheet" href="/static/pico.min.css">
-  <link rel="stylesheet" href="/static/app.css">
-</head>
-
-<body>
-  <header class="container">
-    <nav>
-      <ul>
-        <li><a href="/"><div class="logo">OpenTherm Gateway</div></a></li>
-      </ul>
-      <ul>
-        <li><a href="https://github.com/Laxilef/OTGateway/wiki" role="button" class="secondary" target="_blank">Help</a></li>
-      </ul>
-    </nav>
-  </header>
-
-  <main class="container">
-    <article>
-      <div>
-        <hgroup>
-          <h2>Backup & restore</h2>
-          <p>
-            In this section you can save and restore a backup of ALL settings.
-          </p>
-        </hgroup>
-
-        <form action="/api/backup/restore" id="restore">
-          <label for="restore-file">
-            Settings file:
-            <input type="file" name="settings" id="restore-file" accept=".json">
-          </label>
-          
-          <div class="grid">
-            <button type="submit">Restore</button>
-            <button type="button" class="secondary" onclick="window.location='/api/backup/save';">Backup</button>
-          </div>
-        </form>
-      </div>
-    </article>
-
-    <article>
-      <div>
-        <hgroup>
-          <h2>Upgrade</h2>
-          <p>
-            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.
-          </p>
-        </hgroup>
-
-        <form action="/api/upgrade" id="upgrade">
-          <fieldset class="primary">
-            <label for="firmware-file">
-              Firmware:
-              <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">
-              Filesystem:
-              <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>After a successful upgrade the filesystem, ALL settings will be reset to default values! Save backup before upgrading.</mark></li>
-            <li><mark>After a successful upgrade, the device will automatically reboot after 10 seconds.</mark></li>
-          </ul>
-
-          <button type="submit">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">License</a>
-      • <a href="https://github.com/Laxilef/OTGateway/blob/master/" target="_blank" class="secondary">Source code</a>
-      • <a href="https://github.com/Laxilef/OTGateway/wiki" target="_blank" class="secondary">Help</a>
-      • <a href="https://github.com/Laxilef/OTGateway/issues" target="_blank" class="secondary">Issue & questions</a>
-      • <a href="https://github.com/Laxilef/OTGateway/releases" target="_blank" class="secondary">Releases</a>
-    </small>
-  </footer>
-
-  <script src="/static/app.js"></script>
-  <script>
-    window.onload = async function () {
-      setupRestoreBackupForm('#restore');
-      setupUpgradeForm('#upgrade');
-    };
-  </script>
-</body>
-
-</html>
--- a/gulpfile.js
+++ b/gulpfile.js
@@ -0,0 +1,142 @@
+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');
+
+// 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(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(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(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(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);
--- a/lib/CustomOpenTherm/CustomOpenTherm.h
+++ b/lib/CustomOpenTherm/CustomOpenTherm.h
@@ -8,6 +8,7 @@ public:
  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) {}
+  ~CustomOpenTherm() {}

  CustomOpenTherm* setYieldCallback(YieldCallback callback = nullptr) {
    this->yieldCallback = callback;
@@ -46,7 +47,7 @@ public:

    unsigned long _response;
    OpenThermResponseStatus _responseStatus = OpenThermResponseStatus::NONE;
-    if (!this->sendRequestAync(request)) {
+    if (!this->sendRequestAsync(request)) {
      _response = 0;

    } else {
@@ -88,7 +89,7 @@ public:
      | (dhwBlocking << 6);
    data <<= 8;

-    return this->sendRequest(this->buildRequest(
+    return this->sendRequest(buildRequest(
      OpenThermMessageType::READ_DATA,
      OpenThermMessageID::Status,
      data
@@ -96,30 +97,60 @@ public:
  }

  bool setHeatingCh1Temp(float temperature) {
-    unsigned long response = this->sendRequest(this->buildRequest(
+    unsigned long response = this->sendRequest(buildRequest(
      OpenThermMessageType::WRITE_DATA,
      OpenThermMessageID::TSet,
-      this->temperatureToData(temperature)
+      temperatureToData(temperature)
    ));

    return isValidResponse(response);
  }

  bool setHeatingCh2Temp(float temperature) {
-    unsigned long response = this->sendRequest(this->buildRequest(
+    unsigned long response = this->sendRequest(buildRequest(
      OpenThermMessageType::WRITE_DATA,
      OpenThermMessageID::TsetCH2,
-      this->temperatureToData(temperature)
+      temperatureToData(temperature)
    ));

    return isValidResponse(response);
  }

  bool setDhwTemp(float temperature) {
-    unsigned long response = this->sendRequest(this->buildRequest(
+    unsigned long response = this->sendRequest(buildRequest(
      OpenThermMessageType::WRITE_DATA,
      OpenThermMessageID::TdhwSet,
-      this->temperatureToData(temperature)
+      temperatureToData(temperature)
+    ));
+
+    return isValidResponse(response);
+  }
+
+  bool setRoomSetpoint(float temperature) {
+    unsigned long response = this->sendRequest(buildRequest(
+      OpenThermMessageType::WRITE_DATA,
+      OpenThermMessageID::TrSet,
+      temperatureToData(temperature)
+    ));
+
+    return isValidResponse(response);
+  }
+
+  bool setRoomSetpointCh2(float temperature) {
+    unsigned long response = this->sendRequest(buildRequest(
+      OpenThermMessageType::WRITE_DATA,
+      OpenThermMessageID::TrSetCH2,
+      temperatureToData(temperature)
+    ));
+
+    return isValidResponse(response);
+  }
+
+  bool setRoomTemp(float temperature) {
+    unsigned long response = this->sendRequest(buildRequest(
+      OpenThermMessageType::WRITE_DATA,
+      OpenThermMessageID::Tr,
+      temperatureToData(temperature)
    ));

    return isValidResponse(response);
@@ -128,9 +159,9 @@ public:
  bool sendBoilerReset() {
    unsigned int data = 1;
    data <<= 8;
-    unsigned long response = this->sendRequest(this->buildRequest(
+    unsigned long response = this->sendRequest(buildRequest(
      OpenThermMessageType::WRITE_DATA,
-      OpenThermMessageID::Command,
+      OpenThermMessageID::RemoteRequest,
      data
    ));

@@ -140,9 +171,9 @@ public:
  bool sendServiceReset() {
    unsigned int data = 10;
    data <<= 8;
-    unsigned long response = this->sendRequest(this->buildRequest(
+    unsigned long response = this->sendRequest(buildRequest(
      OpenThermMessageType::WRITE_DATA,
-      OpenThermMessageID::Command,
+      OpenThermMessageID::RemoteRequest,
      data
    ));

@@ -152,9 +183,9 @@ public:
  bool sendWaterFilling() {
    unsigned int data = 2;
    data <<= 8;
-    unsigned long response = this->sendRequest(this->buildRequest(
+    unsigned long response = this->sendRequest(buildRequest(
      OpenThermMessageType::WRITE_DATA,
-      OpenThermMessageID::Command,
+      OpenThermMessageID::RemoteRequest,
      data
    ));

@@ -162,24 +193,13 @@ public:
  }

  // converters
-  float fromF88(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> unsigned int toF88(T val) {
+  template <class T>
+  static unsigned int toFloat(const T val) {
    return (unsigned int)(val * 256);
  }

-  int16_t fromS16(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:
--- a/lib/HomeAssistantHelper/strings.h
+++ b/lib/HomeAssistantHelper/strings.h
@@ -33,6 +33,8 @@ 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_ICON[]                            PROGMEM = "icon";
 const char HA_MIN[]                             PROGMEM = "min";
 const char HA_MAX[]                             PROGMEM = "max";
@@ -50,6 +52,7 @@ const char HA_TEMPERATURE_COMMAND_TOPIC[]       PROGMEM = "temperature_command_t
 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";
--- a/lib/NetworkUtils/NetworkConnection.cpp
+++ b/lib/NetworkUtils/NetworkConnection.cpp
@@ -1,54 +1,58 @@
 #include "NetworkConnection.h"
-using namespace Network;
+using namespace NetworkUtils;

-void Connection::setup(bool useDhcp) {
+void NetworkConnection::setup(bool useDhcp) {
  setUseDhcp(useDhcp);

  #if defined(ARDUINO_ARCH_ESP8266)
-  wifi_set_event_handler_cb(Connection::onEvent);
+  wifi_set_event_handler_cb(NetworkConnection::onEvent);
  #elif defined(ARDUINO_ARCH_ESP32)
-  WiFi.onEvent(Connection::onEvent);
+  WiFi.onEvent(NetworkConnection::onEvent);
  #endif
 }

-void Connection::reset() {
+void NetworkConnection::reset() {
  status = Status::NONE;
+  rawDisconnectReason = 0;
  disconnectReason = DisconnectReason::NONE;
 }

-void Connection::setUseDhcp(bool value) {
+void NetworkConnection::setUseDhcp(bool value) {
  useDhcp = value;
 }

-Connection::Status Connection::getStatus() {
+NetworkConnection::Status NetworkConnection::getStatus() {
  return status;
 }

-Connection::DisconnectReason Connection::getDisconnectReason() {
+NetworkConnection::DisconnectReason NetworkConnection::getDisconnectReason() {
  return disconnectReason;
 }

 #if defined(ARDUINO_ARCH_ESP8266)
-void Connection::onEvent(System_Event_t *event) {
+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
@@ -63,6 +67,7 @@ void Connection::onEvent(System_Event_t *event) {
        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();
@@ -75,29 +80,31 @@ void Connection::onEvent(System_Event_t *event) {
  }
 }
 #elif defined(ARDUINO_ARCH_ESP32)
-void Connection::onEvent(WiFiEvent_t event, WiFiEventInfo_t info) {
+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:
@@ -106,7 +113,7 @@ void Connection::onEvent(WiFiEvent_t event, WiFiEventInfo_t info) {
 }
 #endif

-Connection::DisconnectReason Connection::convertDisconnectReason(uint8_t reason) {
+NetworkConnection::DisconnectReason NetworkConnection::convertDisconnectReason(uint8_t reason) {
  switch (reason) {
  #if defined(ARDUINO_ARCH_ESP8266)
    case REASON_BEACON_TIMEOUT:
@@ -145,6 +152,7 @@ Connection::DisconnectReason Connection::convertDisconnectReason(uint8_t reason)
  }
 }

-bool Connection::useDhcp = false;
-Connection::Status Connection::status = Status::NONE;
-Connection::DisconnectReason Connection::disconnectReason = DisconnectReason::NONE;
+bool NetworkConnection::useDhcp = false;
+NetworkConnection::Status NetworkConnection::status = Status::NONE;
+NetworkConnection::DisconnectReason NetworkConnection::disconnectReason = DisconnectReason::NONE;
+uint8_t NetworkConnection::rawDisconnectReason = 0;
--- a/lib/NetworkUtils/NetworkConnection.h
+++ b/lib/NetworkUtils/NetworkConnection.h
@@ -5,8 +5,8 @@
  #include <WiFi.h>
 #endif

-namespace Network {
-  struct Connection {
+namespace NetworkUtils {
+  struct NetworkConnection {
    enum class Status {
      CONNECTED,
      CONNECTING,
@@ -27,6 +27,7 @@ namespace Network {

    static Status status;
    static DisconnectReason disconnectReason;
+    static uint8_t rawDisconnectReason;
    
    static void setup(bool useDhcp);
    static void setUseDhcp(bool value);
--- a/lib/NetworkUtils/NetworkMgr.h
+++ b/lib/NetworkUtils/NetworkMgr.h
@@ -7,35 +7,35 @@
 #endif
 #include <NetworkConnection.h>

-namespace Network {
-  class Manager {
+namespace NetworkUtils {
+  class NetworkMgr {
  public:
    typedef std::function<void()> YieldCallback;
    typedef std::function<void(unsigned int)> DelayCallback;

-    Manager() {
-      Connection::setup(this->useDhcp);
+    NetworkMgr() {
+      NetworkConnection::setup(this->useDhcp);
      this->resetWifi();
    }

-    Manager* setYieldCallback(YieldCallback callback = nullptr) {
+    NetworkMgr* setYieldCallback(YieldCallback callback = nullptr) {
      this->yieldCallback = callback;

      return this;
    }

-    Manager* setDelayCallback(DelayCallback callback = nullptr) {
+    NetworkMgr* setDelayCallback(DelayCallback callback = nullptr) {
      this->delayCallback = callback;

      return this;
    }

-    Manager* setHostname(const char* value) {
+    NetworkMgr* setHostname(const char* value) {
      this->hostname = value;
      return this;
    }

-    Manager* setApCredentials(const char* ssid, const char* password = nullptr, byte channel = 0) {
+    NetworkMgr* setApCredentials(const char* ssid, const char* password = nullptr, byte channel = 0) {
      this->apName = ssid;
      this->apPassword = password;
      this->apChannel = channel;
@@ -43,7 +43,7 @@ namespace Network {
      return this;
    }

-    Manager* setStaCredentials(const char* ssid = nullptr, const char* password = nullptr, byte channel = 0) {
+    NetworkMgr* setStaCredentials(const char* ssid = nullptr, const char* password = nullptr, byte channel = 0) {
      this->staSsid = ssid;
      this->staPassword = password;
      this->staChannel = channel;
@@ -51,14 +51,14 @@ namespace Network {
      return this;
    }

-    Manager* setUseDhcp(bool value) {
+    NetworkMgr* setUseDhcp(bool value) {
      this->useDhcp = value;
-      Connection::setup(this->useDhcp);
+      NetworkConnection::setup(this->useDhcp);

      return this;
    }

-    Manager* setStaticConfig(const char* ip, const char* gateway, const char* subnet, const char* dns) {
+    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);
@@ -67,7 +67,7 @@ namespace Network {
      return this;
    }

-    Manager* setStaticConfig(IPAddress &ip, IPAddress &gateway, IPAddress &subnet, IPAddress &dns) {
+    NetworkMgr* setStaticConfig(IPAddress& ip, IPAddress& gateway, IPAddress& subnet, IPAddress& dns) {
      this->staticIp = ip;
      this->staticGateway = gateway;
      this->staticSubnet = subnet;
@@ -81,11 +81,11 @@ namespace Network {
    }

    bool isConnected() {
-      return this->isStaEnabled() && Connection::getStatus() == Connection::Status::CONNECTED;
+      return this->isStaEnabled() && NetworkConnection::getStatus() == NetworkConnection::Status::CONNECTED;
    }

    bool isConnecting() {
-      return this->isStaEnabled() && Connection::getStatus() == Connection::Status::CONNECTING;
+      return this->isStaEnabled() && NetworkConnection::getStatus() == NetworkConnection::Status::CONNECTING;
    }

    bool isStaEnabled() {
@@ -147,16 +147,19 @@ namespace Network {
    bool resetWifi() {
      // set policy manual for work 13 ch
      {
-        wifi_country_t country = {"CN", 1, 13, WIFI_COUNTRY_POLICY_MANUAL};
        #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
@@ -181,7 +184,12 @@ namespace Network {
      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() {
@@ -195,6 +203,7 @@ namespace Network {

      if (force && !this->isApEnabled()) {
        this->resetWifi();
+        NetworkConnection::reset();

      } else {
        /*#ifdef ARDUINO_ARCH_ESP8266
@@ -203,14 +212,14 @@ namespace Network {
        }
        #endif*/

-        WiFi.disconnect(false, true);
+        this->disconnect();
      }

      if (!this->hasStaCredentials()) {
        return false;
      }

-      this->delayCallback(200);
+      this->delayCallback(250);

      #ifdef ARDUINO_ARCH_ESP32
      if (this->setWifiHostname(this->hostname)) {
@@ -225,7 +234,7 @@ namespace Network {
        return false;
      }

-      this->delayCallback(200);
+      this->delayCallback(250);

      #ifdef ARDUINO_ARCH_ESP8266
      if (this->setWifiHostname(this->hostname)) {
@@ -235,7 +244,7 @@ namespace Network {
        Log.serrorln(FPSTR(L_NETWORK), F("Set hostname '%s': fail"), this->hostname);
      }

-      this->delayCallback(200);
+      this->delayCallback(250);
      #endif

      if (!this->useDhcp) {
@@ -248,23 +257,36 @@ namespace Network {
      while (millis() - beginConnectionTime < timeout) {
        this->delayCallback(100);

-        Connection::Status status = Connection::getStatus();
-        if (status != Connection::Status::CONNECTING && status != Connection::Status::NONE) {
-          return status == Connection::Status::CONNECTED;
+        NetworkConnection::Status status = NetworkConnection::getStatus();
+        if (status != NetworkConnection::Status::CONNECTING && status != NetworkConnection::Status::NONE) {
+          return status == NetworkConnection::Status::CONNECTED;
        }
      }

      return false;
    }

+    void disconnect() {
+      WiFi.disconnect(false, true);
+    }
+
    void loop() {
-      if (this->isConnected() && !this->hasStaCredentials()) {
+      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();
-        Connection::reset();
-        this->delayCallback(200);
+        NetworkConnection::reset();
+        this->delayCallback(1000);

-      } else if (this->isConnected() && !this->reconnectFlag) {
+      } else if (this->isConnected()) {
        if (!this->connected) {
          this->connectedTime = millis();
          this->connected = true;
@@ -279,7 +301,7 @@ namespace Network {
        }

        if (this->isApEnabled() && millis() - this->connectedTime > this->reconnectInterval && !this->hasApClients()) {
-          Log.sinfoln(FPSTR(L_NETWORK), F("Stop AP because connected, start only STA"));
+          Log.sinfoln(FPSTR(L_NETWORK), F("Stop AP because STA connected"));

          WiFi.mode(WIFI_STA);
          return;
@@ -300,7 +322,7 @@ namespace Network {
          Log.sinfoln(
            FPSTR(L_NETWORK),
            F("Disconnected, reason: %d, uptime: %lu s."),
-            Connection::getDisconnectReason(),
+            NetworkConnection::getDisconnectReason(),
            (millis() - this->connectedTime) / 1000
          );
        }
@@ -322,16 +344,15 @@ namespace Network {
        } else if (this->isConnecting() && millis() - this->prevReconnectingTime > this->resetConnectionTimeout) {
          Log.swarningln(FPSTR(L_NETWORK), F("Connection timeout, reset wifi..."));
          this->resetWifi();
-          Connection::reset();
-          this->delayCallback(200);
+          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..."));

-          this->reconnectFlag = false;        
-          Connection::reset();
+          NetworkConnection::reset();
          if (!this->connect(true, this->connectionTimeout)) {
-            Log.straceln(FPSTR(L_NETWORK), F("Connection failed. Status: %d, reason: %d"), Connection::getStatus(), Connection::getDisconnectReason());
+            Log.straceln(FPSTR(L_NETWORK), F("Connection failed. Status: %d, reason: %d, raw reason: %d"), NetworkConnection::getStatus(), NetworkConnection::getDisconnectReason(), NetworkConnection::rawDisconnectReason);
          }

          this->prevReconnectingTime = millis();
--- a/lib/WebServerHandlers/StaticPage.h
+++ b/lib/WebServerHandlers/StaticPage.h
@@ -1,4 +1,7 @@
 #include <FS.h>
+#include <detail/mimetable.h>
+
+using namespace mime;

 class StaticPage : public RequestHandler {
 public:
@@ -61,6 +64,14 @@ public:
    }
    #endif

+    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;
@@ -93,6 +104,6 @@ protected:
  BeforeSendCallback beforeSendCallback;
  String eTag;
  const char* uri = nullptr;
-  const char* path = nullptr;
+  String path;
  const char* cacheHeader = nullptr;
 };
--- a/lib/WebServerHandlers/UpgradeHandler.h
+++ b/lib/WebServerHandlers/UpgradeHandler.h
@@ -174,7 +174,7 @@ public:
        Log.serrorln(
          FPSTR(L_PORTAL_OTA),
          F("File '%s', on writing %d bytes: %s"),
-          upload.filename.c_str(), upload.totalSize, result->error
+          upload.filename.c_str(), upload.totalSize, result->error.c_str()
        );

      } else {
--- a/package.json
+++ b/package.json
@@ -0,0 +1,17 @@
+{
+  "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"
+  }
+}
--- a/platformio.ini
+++ b/platformio.ini
@@ -13,61 +13,69 @@
 extra_configs = secrets.default.ini

 [env]
+version = 1.4.3
 framework = arduino
 lib_deps = 
-	bblanchon/ArduinoJson@^7.0.3
-	;ihormelnyk/OpenTherm Library@^1.1.4
-	https://github.com/Laxilef/opentherm_library/archive/refs/heads/fix_start_bit.zip
+	bblanchon/ArduinoJson@^7.0.4
+	;ihormelnyk/OpenTherm Library@^1.1.5
+	https://github.com/ihormelnyk/opentherm_library#master
 	arduino-libraries/ArduinoMqttClient@^0.1.8
 	lennarthennigs/ESP Telnet@^2.2
 	gyverlibs/FileData@^1.0.2
 	gyverlibs/GyverPID@^3.3.2
 	gyverlibs/GyverBlinker@^1.0
+	https://github.com/PaulStoffregen/OneWire#master
 	milesburton/DallasTemperature@^3.11.0
 	laxilef/TinyLogger@^1.1.0
 build_flags = 
 	-D PIO_FRAMEWORK_ARDUINO_LWIP2_LOW_MEMORY
+	;-D PIO_FRAMEWORK_ARDUINO_LWIP2_HIGHER_BANDWIDTH_LOW_FLASH
 	-D PIO_FRAMEWORK_ARDUINO_ESPRESSIF_SDK305
 	-mtext-section-literals
 	-D MQTT_CLIENT_STD_FUNCTION_CALLBACK=1
-	;-D DEBUG_ESP_CORE -D DEBUG_ESP_WIFI -D DEBUG_ESP_PORT=Serial
+	;-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 USE_SERIAL=${secrets.use_serial}
 	-D USE_TELNET=${secrets.use_telnet}
 	-D DEBUG_BY_DEFAULT=${secrets.debug}
-	-D HOSTNAME_DEFAULT='"${secrets.hostname}"'
-	-D AP_SSID_DEFAULT='"${secrets.ap_ssid}"'
-	-D AP_PASSWORD_DEFAULT='"${secrets.ap_password}"'
-	-D STA_SSID_DEFAULT='"${secrets.sta_ssid}"'
-	-D STA_PASSWORD_DEFAULT='"${secrets.sta_password}"'
-	-D PORTAL_LOGIN_DEFAULT='"${secrets.portal_login}"'
-	-D PORTAL_PASSWORD_DEFAULT='"${secrets.portal_password}"'
-	-D MQTT_SERVER_DEFAULT='"${secrets.mqtt_server}"'
-	-D MQTT_PORT_DEFAULT=${secrets.mqtt_port}
-	-D MQTT_USER_DEFAULT='"${secrets.mqtt_user}"'
-	-D MQTT_PASSWORD_DEFAULT='"${secrets.mqtt_password}"'
-	-D MQTT_PREFIX_DEFAULT='"${secrets.mqtt_prefix}"'
+	-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_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
 board_build.flash_mode = dio
 board_build.filesystem = littlefs
-version = 1.4.0-rc.16

 ; Defaults
 [esp8266_defaults]
-platform = espressif8266
+platform = espressif8266@^4.2.1
 lib_deps = 
 	${env.lib_deps}
-	nrwiersma/ESP8266Scheduler@^1.1
+	nrwiersma/ESP8266Scheduler@^1.2
 lib_ignore = 
 extra_scripts = 
 	post:tools/build.py
 build_flags = ${env.build_flags}
-board_build.ldscript = eagle.flash.1m256.ld
-;board_build.ldscript = eagle.flash.4m1m.ld
+board_build.ldscript = eagle.flash.4m1m.ld

 [esp32_defaults]
-platform = espressif32
+;platform = espressif32@^6.7
+platform = https://github.com/platformio/platform-espressif32.git
+platform_packages =
+  ;platformio/framework-arduinoespressif32 @ https://github.com/espressif/arduino-esp32/archive/refs/tags/2.0.17.zip
+  framework-arduinoespressif32 @ https://github.com/espressif/arduino-esp32.git#3.0.1
+  framework-arduinoespressif32-libs @ https://github.com/espressif/arduino-esp32/releases/download/3.0.1/esp32-arduino-libs-3.0.1.zip
 board_build.partitions = esp32_partitions.csv
 lib_deps =
 	${env.lib_deps}
@@ -91,12 +99,12 @@ extra_scripts = ${esp8266_defaults.extra_scripts}
 board_build.ldscript = ${esp8266_defaults.board_build.ldscript}
 build_flags = 
 	${esp8266_defaults.build_flags}
-	-D OT_IN_PIN_DEFAULT=4
-	-D OT_OUT_PIN_DEFAULT=5
-	-D SENSOR_OUTDOOR_PIN_DEFAULT=12
-	-D SENSOR_INDOOR_PIN_DEFAULT=14
-	-D LED_STATUS_PIN=13
-	-D LED_OT_RX_PIN=15
+	-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}
@@ -107,12 +115,12 @@ extra_scripts = ${esp8266_defaults.extra_scripts}
 board_build.ldscript = ${esp8266_defaults.board_build.ldscript}
 build_flags = 
 	${esp8266_defaults.build_flags}
-	-D OT_IN_PIN_DEFAULT=4
-	-D OT_OUT_PIN_DEFAULT=5
-	-D SENSOR_OUTDOOR_PIN_DEFAULT=12
-	-D SENSOR_INDOOR_PIN_DEFAULT=14
-	-D LED_STATUS_PIN=13
-	-D LED_OT_RX_PIN=15
+	-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}
@@ -123,31 +131,53 @@ extra_scripts = ${esp8266_defaults.extra_scripts}
 board_build.ldscript = ${esp8266_defaults.board_build.ldscript}
 build_flags = 
 	${esp8266_defaults.build_flags}
-	-D OT_IN_PIN_DEFAULT=4
-	-D OT_OUT_PIN_DEFAULT=5
-	-D SENSOR_OUTDOOR_PIN_DEFAULT=12
-	-D SENSOR_INDOOR_PIN_DEFAULT=14
-	-D LED_STATUS_PIN=13
-	-D LED_OT_RX_PIN=15
+	-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_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_flags = 
 	${esp32_defaults.build_flags}
-	-D OT_IN_PIN_DEFAULT=33
-	-D OT_OUT_PIN_DEFAULT=35
-	-D SENSOR_OUTDOOR_PIN_DEFAULT=9
-	-D SENSOR_INDOOR_PIN_DEFAULT=7
-	-D LED_STATUS_PIN=11
-	-D LED_OT_RX_PIN=12
+	-D ARDUINO_USB_MODE=0
+	-D ARDUINO_USB_CDC_ON_BOOT=1
+	-D DEFAULT_OT_IN_GPIO=33
+	-D DEFAULT_OT_OUT_GPIO=35
+	-D DEFAULT_SENSOR_OUTDOOR_GPIO=9
+	-D DEFAULT_SENSOR_INDOOR_GPIO=7
+	-D DEFAULT_STATUS_LED_GPIO=11
+	-D DEFAULT_OT_RX_LED_GPIO=12

 [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 = 
@@ -155,18 +185,23 @@ lib_deps =
 	h2zero/NimBLE-Arduino@^1.4.1
 lib_ignore = ${esp32_defaults.lib_ignore}
 extra_scripts = ${esp32_defaults.extra_scripts}
+build_unflags =
+	-DARDUINO_USB_MODE=1
 build_flags = 
 	${esp32_defaults.build_flags}
+	-D ARDUINO_USB_MODE=0
+	-D ARDUINO_USB_CDC_ON_BOOT=1
 	-D USE_BLE=1
-	-D OT_IN_PIN_DEFAULT=35
-	-D OT_OUT_PIN_DEFAULT=36
-	-D SENSOR_OUTDOOR_PIN_DEFAULT=13
-	-D SENSOR_INDOOR_PIN_DEFAULT=12
-	-D LED_STATUS_PIN=11
-	-D LED_OT_RX_PIN=10
+	-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 = 
@@ -179,15 +214,16 @@ build_unflags =
 build_flags = 
 	${esp32_defaults.build_flags}
 	-D USE_BLE=1
-	-D OT_IN_PIN_DEFAULT=8
-	-D OT_OUT_PIN_DEFAULT=10
-	-D SENSOR_OUTDOOR_PIN_DEFAULT=0
-	-D SENSOR_INDOOR_PIN_DEFAULT=1
-	-D LED_STATUS_PIN=4
-	-D LED_OT_RX_PIN=5
+	-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_32s]
+[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 = 
@@ -198,16 +234,17 @@ extra_scripts = ${esp32_defaults.extra_scripts}
 build_flags = 
 	${esp32_defaults.build_flags}
 	-D USE_BLE=1
-	-D OT_IN_PIN_DEFAULT=21
-	-D OT_OUT_PIN_DEFAULT=22
-	-D SENSOR_OUTDOOR_PIN_DEFAULT=12
-	-D SENSOR_INDOOR_PIN_DEFAULT=13
-	-D LED_STATUS_PIN=2 ; 18
-	-D LED_OT_RX_PIN=19
+	-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
 	;-D WOKWI=1

 [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 = 
@@ -218,9 +255,9 @@ extra_scripts = ${esp32_defaults.extra_scripts}
 build_flags = 
 	${esp32_defaults.build_flags}
 	-D USE_BLE=1
-	-D OT_IN_PIN_DEFAULT=21
-	-D OT_OUT_PIN_DEFAULT=22
-	-D SENSOR_OUTDOOR_PIN_DEFAULT=12
-	-D SENSOR_INDOOR_PIN_DEFAULT=18
-	-D LED_STATUS_PIN=2
-	-D LED_OT_RX_PIN=19
+	-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
--- a/src/HaHelper.h
+++ b/src/HaHelper.h
@@ -6,98 +6,6 @@ public:
  static const byte TEMP_SOURCE_HEATING = 0;
  static const byte TEMP_SOURCE_INDOOR = 1;

-  bool publishSwitchEmergency(bool enabledByDefault = true) {
-    JsonDocument doc;
-    doc[FPSTR(HA_ENABLED_BY_DEFAULT)] = enabledByDefault;
-    doc[FPSTR(HA_UNIQUE_ID)] = this->getObjectId(F("emergency"));
-    doc[FPSTR(HA_OBJECT_ID)] = this->getObjectId(F("emergency"));
-    doc[FPSTR(HA_ENTITY_CATEGORY)] = F("config");
-    doc[FPSTR(HA_NAME)] = F("Use emergency");
-    doc[FPSTR(HA_ICON)] = F("mdi:sun-snowflake-variant");
-    doc[FPSTR(HA_STATE_TOPIC)] = this->getDeviceTopic(F("settings"));
-    doc[FPSTR(HA_STATE_ON)] = true;
-    doc[FPSTR(HA_STATE_OFF)] = false;
-    doc[FPSTR(HA_VALUE_TEMPLATE)] = F("{{ value_json.emergency.enable }}");
-    doc[FPSTR(HA_COMMAND_TOPIC)] = this->getDeviceTopic(F("settings/set"));
-    doc[FPSTR(HA_PAYLOAD_ON)] = F("{\"emergency\": {\"enable\" : true}}");
-    doc[FPSTR(HA_PAYLOAD_OFF)] = F("{\"emergency\": {\"enable\" : false}}");
-    doc[FPSTR(HA_EXPIRE_AFTER)] = 120;
-    doc.shrinkToFit();
-
-    return this->publish(this->getTopic(FPSTR(HA_ENTITY_SWITCH), F("emergency")).c_str(), doc);
-  }
-
-  bool publishNumberEmergencyTarget(bool enabledByDefault = true) {
-    JsonDocument doc;
-    doc[FPSTR(HA_ENABLED_BY_DEFAULT)] = enabledByDefault;
-    doc[FPSTR(HA_UNIQUE_ID)] = this->getObjectId(F("emergency_target"));
-    doc[FPSTR(HA_OBJECT_ID)] = this->getObjectId(F("emergency_target"));
-    doc[FPSTR(HA_ENTITY_CATEGORY)] = F("config");
-    doc[FPSTR(HA_DEVICE_CLASS)] = F("temperature");
-    doc[FPSTR(HA_UNIT_OF_MEASUREMENT)] = F("°C");
-    doc[FPSTR(HA_NAME)] = F("Emergency target temp");
-    doc[FPSTR(HA_ICON)] = F("mdi:thermometer-alert");
-    doc[FPSTR(HA_STATE_TOPIC)] = this->getDeviceTopic(F("settings"));
-    doc[FPSTR(HA_VALUE_TEMPLATE)] = F("{{ value_json.emergency.target|float(0)|round(1) }}");
-    doc[FPSTR(HA_COMMAND_TOPIC)] = this->getDeviceTopic(F("settings/set"));
-    doc[FPSTR(HA_COMMAND_TEMPLATE)] = F("{\"emergency\": {\"target\" : {{ value }}}}");
-    doc[FPSTR(HA_MIN)] = 5;
-    doc[FPSTR(HA_MAX)] = 50;
-    doc[FPSTR(HA_STEP)] = 0.5;
-    doc[FPSTR(HA_MODE)] = "box";
-    doc[FPSTR(HA_EXPIRE_AFTER)] = 120;
-    doc.shrinkToFit();
-
-    return this->publish(this->getTopic(FPSTR(HA_ENTITY_NUMBER), F("emergency_target")).c_str(), doc);
-  }
-
-  bool publishSwitchEmergencyUseEquitherm(bool enabledByDefault = true) {
-    JsonDocument doc;
-    doc[FPSTR(HA_AVAILABILITY)][FPSTR(HA_TOPIC)] = this->getDeviceTopic(F("settings"));
-    doc[FPSTR(HA_AVAILABILITY)][FPSTR(HA_VALUE_TEMPLATE)] = F("{{ iif(value_json.sensors.outdoor.type != 1, 'online', 'offline') }}");
-    doc[FPSTR(HA_ENABLED_BY_DEFAULT)] = enabledByDefault;
-    doc[FPSTR(HA_UNIQUE_ID)] = this->getObjectId(F("emergency_use_equitherm"));
-    doc[FPSTR(HA_OBJECT_ID)] = this->getObjectId(F("emergency_use_equitherm"));
-    doc[FPSTR(HA_ENTITY_CATEGORY)] = F("config");
-    doc[FPSTR(HA_NAME)] = F("Use equitherm in emergency");
-    doc[FPSTR(HA_ICON)] = F("mdi:snowflake-alert");
-    doc[FPSTR(HA_STATE_TOPIC)] = this->getDeviceTopic(F("settings"));
-    doc[FPSTR(HA_STATE_ON)] = true;
-    doc[FPSTR(HA_STATE_OFF)] = false;
-    doc[FPSTR(HA_VALUE_TEMPLATE)] = F("{{ value_json.emergency.useEquitherm }}");
-    doc[FPSTR(HA_COMMAND_TOPIC)] = this->getDeviceTopic(F("settings/set"));
-    doc[FPSTR(HA_PAYLOAD_ON)] = F("{\"emergency\": {\"useEquitherm\" : true}}");
-    doc[FPSTR(HA_PAYLOAD_OFF)] = F("{\"emergency\": {\"useEquitherm\" : false}}");
-    doc[FPSTR(HA_EXPIRE_AFTER)] = 120;
-    doc.shrinkToFit();
-
-    return this->publish(this->getTopic(FPSTR(HA_ENTITY_SWITCH), F("emergency_use_equitherm")).c_str(), doc);
-  }
-
-  bool publishSwitchEmergencyUsePid(bool enabledByDefault = true) {
-    JsonDocument doc;
-    doc[FPSTR(HA_AVAILABILITY)][FPSTR(HA_TOPIC)] = this->getDeviceTopic(F("settings"));
-    doc[FPSTR(HA_AVAILABILITY)][FPSTR(HA_VALUE_TEMPLATE)] = F("{{ iif(value_json.sensors.indoor.type != 1, 'online', 'offline') }}");
-    doc[FPSTR(HA_ENABLED_BY_DEFAULT)] = enabledByDefault;
-    doc[FPSTR(HA_UNIQUE_ID)] = this->getObjectId(F("emergency_use_pid"));
-    doc[FPSTR(HA_OBJECT_ID)] = this->getObjectId(F("emergency_use_pid"));
-    doc[FPSTR(HA_ENTITY_CATEGORY)] = F("config");
-    doc[FPSTR(HA_NAME)] = F("Use PID in emergency");
-    doc[FPSTR(HA_ICON)] = F("mdi:snowflake-alert");
-    doc[FPSTR(HA_STATE_TOPIC)] = this->getDeviceTopic(F("settings"));
-    doc[FPSTR(HA_STATE_ON)] = true;
-    doc[FPSTR(HA_STATE_OFF)] = false;
-    doc[FPSTR(HA_VALUE_TEMPLATE)] = F("{{ value_json.emergency.usePid }}");
-    doc[FPSTR(HA_COMMAND_TOPIC)] = this->getDeviceTopic(F("settings/set"));
-    doc[FPSTR(HA_PAYLOAD_ON)] = F("{\"emergency\": {\"usePid\" : true}}");
-    doc[FPSTR(HA_PAYLOAD_OFF)] = F("{\"emergency\": {\"usePid\" : false}}");
-    doc[FPSTR(HA_EXPIRE_AFTER)] = 120;
-    doc.shrinkToFit();
-
-    return this->publish(this->getTopic(FPSTR(HA_ENTITY_SWITCH), F("emergency_use_pid")).c_str(), doc);
-  }
-
-
  bool publishSwitchHeating(bool enabledByDefault = true) {
    JsonDocument doc;
    doc[FPSTR(HA_AVAILABILITY)][FPSTR(HA_TOPIC)] = this->getDeviceTopic(F("status"));
@@ -142,7 +50,7 @@ public:
    return this->publish(this->getTopic(FPSTR(HA_ENTITY_SWITCH), F("heating_turbo")).c_str(), doc);
  }

-  bool publishNumberHeatingTarget(byte minTemp = 20, byte maxTemp = 90, bool enabledByDefault = true) {
+  bool publishNumberHeatingTarget(UnitSystem unit = UnitSystem::METRIC, byte minTemp = 20, byte maxTemp = 90, bool enabledByDefault = true) {
    JsonDocument doc;
    doc[FPSTR(HA_AVAILABILITY)][FPSTR(HA_TOPIC)] = this->getDeviceTopic(F("status"));
    doc[FPSTR(HA_ENABLED_BY_DEFAULT)] = enabledByDefault;
@@ -150,7 +58,14 @@ public:
    doc[FPSTR(HA_OBJECT_ID)] = this->getObjectId(F("heating_target"));
    doc[FPSTR(HA_ENTITY_CATEGORY)] = F("config");
    doc[FPSTR(HA_DEVICE_CLASS)] = F("temperature");
-    doc[FPSTR(HA_UNIT_OF_MEASUREMENT)] = F("°C");
+
+    if (unit == UnitSystem::METRIC) {
+      doc[FPSTR(HA_UNIT_OF_MEASUREMENT)] = FPSTR(HA_UNIT_OF_MEASUREMENT_C);
+      
+    } else if (unit == UnitSystem::IMPERIAL) {
+      doc[FPSTR(HA_UNIT_OF_MEASUREMENT)] = FPSTR(HA_UNIT_OF_MEASUREMENT_F);
+    }
+
    doc[FPSTR(HA_NAME)] = F("Heating target");
    doc[FPSTR(HA_ICON)] = F("mdi:radiator");
    doc[FPSTR(HA_STATE_TOPIC)] = this->getDeviceTopic(F("settings"));
@@ -159,7 +74,7 @@ public:
    doc[FPSTR(HA_COMMAND_TEMPLATE)] = F("{\"heating\": {\"target\" : {{ value }}}}");
    doc[FPSTR(HA_MIN)] = minTemp;
    doc[FPSTR(HA_MAX)] = maxTemp;
-    doc[FPSTR(HA_STEP)] = 0.5;
+    doc[FPSTR(HA_STEP)] = 0.5f;
    doc[FPSTR(HA_MODE)] = "box";
    doc[FPSTR(HA_EXPIRE_AFTER)] = 120;
    doc.shrinkToFit();
@@ -167,14 +82,21 @@ public:
    return this->publish(this->getTopic(FPSTR(HA_ENTITY_NUMBER), F("heating_target")).c_str(), doc);
  }

-  bool publishNumberHeatingHysteresis(bool enabledByDefault = true) {
+  bool publishNumberHeatingHysteresis(UnitSystem unit = UnitSystem::METRIC, bool enabledByDefault = true) {
    JsonDocument doc;
    doc[FPSTR(HA_ENABLED_BY_DEFAULT)] = enabledByDefault;
    doc[FPSTR(HA_UNIQUE_ID)] = this->getObjectId(F("heating_hysteresis"));
    doc[FPSTR(HA_OBJECT_ID)] = this->getObjectId(F("heating_hysteresis"));
    doc[FPSTR(HA_ENTITY_CATEGORY)] = F("config");
    doc[FPSTR(HA_DEVICE_CLASS)] = F("temperature");
-    doc[FPSTR(HA_UNIT_OF_MEASUREMENT)] = F("°C");
+
+    if (unit == UnitSystem::METRIC) {
+      doc[FPSTR(HA_UNIT_OF_MEASUREMENT)] = FPSTR(HA_UNIT_OF_MEASUREMENT_C);
+      
+    } else if (unit == UnitSystem::IMPERIAL) {
+      doc[FPSTR(HA_UNIT_OF_MEASUREMENT)] = FPSTR(HA_UNIT_OF_MEASUREMENT_F);
+    }
+
    doc[FPSTR(HA_NAME)] = F("Heating hysteresis");
    doc[FPSTR(HA_ICON)] = F("mdi:altimeter");
    doc[FPSTR(HA_STATE_TOPIC)] = this->getDeviceTopic(F("settings"));
@@ -183,7 +105,7 @@ public:
    doc[FPSTR(HA_COMMAND_TEMPLATE)] = F("{\"heating\": {\"hysteresis\" : {{ value }}}}");
    doc[FPSTR(HA_MIN)] = 0;
    doc[FPSTR(HA_MAX)] = 5;
-    doc[FPSTR(HA_STEP)] = 0.1;
+    doc[FPSTR(HA_STEP)] = 0.1f;
    doc[FPSTR(HA_MODE)] = "box";
    doc[FPSTR(HA_EXPIRE_AFTER)] = 120;
    doc.shrinkToFit();
@@ -191,7 +113,7 @@ public:
    return this->publish(this->getTopic(FPSTR(HA_ENTITY_NUMBER), F("heating_hysteresis")).c_str(), doc);
  }

-  bool publishSensorHeatingSetpoint(bool enabledByDefault = true) {
+  bool publishSensorHeatingSetpoint(UnitSystem unit = UnitSystem::METRIC, bool enabledByDefault = true) {
    JsonDocument doc;
    doc[FPSTR(HA_AVAILABILITY)][FPSTR(HA_TOPIC)] = this->getDeviceTopic(F("status"));
    doc[FPSTR(HA_ENABLED_BY_DEFAULT)] = enabledByDefault;
@@ -200,18 +122,25 @@ public:
    doc[FPSTR(HA_ENTITY_CATEGORY)] = F("diagnostic");
    doc[FPSTR(HA_DEVICE_CLASS)] = F("temperature");
    doc[FPSTR(HA_STATE_CLASS)] = F("measurement");
-    doc[FPSTR(HA_UNIT_OF_MEASUREMENT)] = F("°C");
+
+    if (unit == UnitSystem::METRIC) {
+      doc[FPSTR(HA_UNIT_OF_MEASUREMENT)] = FPSTR(HA_UNIT_OF_MEASUREMENT_C);
+      
+    } else if (unit == UnitSystem::IMPERIAL) {
+      doc[FPSTR(HA_UNIT_OF_MEASUREMENT)] = FPSTR(HA_UNIT_OF_MEASUREMENT_F);
+    }
+
    doc[FPSTR(HA_NAME)] = F("Heating setpoint");
    doc[FPSTR(HA_ICON)] = F("mdi:coolant-temperature");
    doc[FPSTR(HA_STATE_TOPIC)] = this->getDeviceTopic(F("state"));
-    doc[FPSTR(HA_VALUE_TEMPLATE)] = F("{{ value_json.parameters.heatingSetpoint|int(0) }}");
+    doc[FPSTR(HA_VALUE_TEMPLATE)] = F("{{ value_json.parameters.heatingSetpoint|float(0)|round(1) }}");
    doc[FPSTR(HA_EXPIRE_AFTER)] = 120;
    doc.shrinkToFit();

    return this->publish(this->getTopic(FPSTR(HA_ENTITY_SENSOR), F("heating_setpoint")).c_str(), doc);
  }

-  bool publishSensorBoilerHeatingMinTemp(bool enabledByDefault = true) {
+  bool publishSensorBoilerHeatingMinTemp(UnitSystem unit = UnitSystem::METRIC, bool enabledByDefault = true) {
    JsonDocument doc;
    doc[FPSTR(HA_AVAILABILITY)][0][FPSTR(HA_TOPIC)] = this->getDeviceTopic(F("status"));
    doc[FPSTR(HA_AVAILABILITY)][1][FPSTR(HA_TOPIC)] = this->getDeviceTopic(F("state"));
@@ -223,7 +152,14 @@ public:
    doc[FPSTR(HA_ENTITY_CATEGORY)] = F("diagnostic");
    doc[FPSTR(HA_DEVICE_CLASS)] = F("temperature");
    doc[FPSTR(HA_STATE_CLASS)] = F("measurement");
-    doc[FPSTR(HA_UNIT_OF_MEASUREMENT)] = F("°C");
+
+    if (unit == UnitSystem::METRIC) {
+      doc[FPSTR(HA_UNIT_OF_MEASUREMENT)] = FPSTR(HA_UNIT_OF_MEASUREMENT_C);
+      
+    } else if (unit == UnitSystem::IMPERIAL) {
+      doc[FPSTR(HA_UNIT_OF_MEASUREMENT)] = FPSTR(HA_UNIT_OF_MEASUREMENT_F);
+    }
+
    doc[FPSTR(HA_NAME)] = F("Boiler heating min temp");
    doc[FPSTR(HA_ICON)] = F("mdi:thermometer-chevron-down");
    doc[FPSTR(HA_STATE_TOPIC)] = this->getDeviceTopic(F("state"));
@@ -234,7 +170,7 @@ public:
    return this->publish(this->getTopic(FPSTR(HA_ENTITY_SENSOR), F("boiler_heating_min_temp")).c_str(), doc);
  }

-  bool publishSensorBoilerHeatingMaxTemp(bool enabledByDefault = true) {
+  bool publishSensorBoilerHeatingMaxTemp(UnitSystem unit = UnitSystem::METRIC, bool enabledByDefault = true) {
    JsonDocument doc;
    doc[FPSTR(HA_AVAILABILITY)][0][FPSTR(HA_TOPIC)] = this->getDeviceTopic(F("status"));
    doc[FPSTR(HA_AVAILABILITY)][1][FPSTR(HA_TOPIC)] = this->getDeviceTopic(F("state"));
@@ -246,7 +182,14 @@ public:
    doc[FPSTR(HA_ENTITY_CATEGORY)] = F("diagnostic");
    doc[FPSTR(HA_DEVICE_CLASS)] = F("temperature");
    doc[FPSTR(HA_STATE_CLASS)] = F("measurement");
-    doc[FPSTR(HA_UNIT_OF_MEASUREMENT)] = F("°C");
+
+    if (unit == UnitSystem::METRIC) {
+      doc[FPSTR(HA_UNIT_OF_MEASUREMENT)] = FPSTR(HA_UNIT_OF_MEASUREMENT_C);
+      
+    } else if (unit == UnitSystem::IMPERIAL) {
+      doc[FPSTR(HA_UNIT_OF_MEASUREMENT)] = FPSTR(HA_UNIT_OF_MEASUREMENT_F);
+    }
+
    doc[FPSTR(HA_NAME)] = F("Boiler heating max temp");
    doc[FPSTR(HA_ICON)] = F("mdi:thermometer-chevron-up");
    doc[FPSTR(HA_STATE_TOPIC)] = this->getDeviceTopic(F("state"));
@@ -257,22 +200,31 @@ public:
    return this->publish(this->getTopic(FPSTR(HA_ENTITY_SENSOR), F("boiler_heating_max_temp")).c_str(), doc);
  }

-  bool publishNumberHeatingMinTemp(bool enabledByDefault = true) {
+  bool publishNumberHeatingMinTemp(UnitSystem unit = UnitSystem::METRIC, bool enabledByDefault = true) {
    JsonDocument doc;
    doc[FPSTR(HA_ENABLED_BY_DEFAULT)] = enabledByDefault;
    doc[FPSTR(HA_UNIQUE_ID)] = this->getObjectId(F("heating_min_temp"));
    doc[FPSTR(HA_OBJECT_ID)] = this->getObjectId(F("heating_min_temp"));
    doc[FPSTR(HA_ENTITY_CATEGORY)] = F("config");
    doc[FPSTR(HA_DEVICE_CLASS)] = F("temperature");
-    doc[FPSTR(HA_UNIT_OF_MEASUREMENT)] = F("°C");
+
+    if (unit == UnitSystem::METRIC) {
+      doc[FPSTR(HA_UNIT_OF_MEASUREMENT)] = FPSTR(HA_UNIT_OF_MEASUREMENT_C);
+      doc[FPSTR(HA_MIN)] = 0;
+      doc[FPSTR(HA_MAX)] = 99;
+      
+    } else if (unit == UnitSystem::IMPERIAL) {
+      doc[FPSTR(HA_UNIT_OF_MEASUREMENT)] = FPSTR(HA_UNIT_OF_MEASUREMENT_F);
+      doc[FPSTR(HA_MIN)] = 32;
+      doc[FPSTR(HA_MAX)] = 211;
+    }
+
    doc[FPSTR(HA_NAME)] = F("Heating min temp");
    doc[FPSTR(HA_ICON)] = F("mdi:thermometer-chevron-down");
    doc[FPSTR(HA_STATE_TOPIC)] = this->getDeviceTopic(F("settings"));
    doc[FPSTR(HA_VALUE_TEMPLATE)] = F("{{ value_json.heating.minTemp|float(0)|round(1) }}");
    doc[FPSTR(HA_COMMAND_TOPIC)] = this->getDeviceTopic(F("settings/set"));
    doc[FPSTR(HA_COMMAND_TEMPLATE)] = F("{\"heating\": {\"minTemp\" : {{ value }}}}");
-    doc[FPSTR(HA_MIN)] = 0;
-    doc[FPSTR(HA_MAX)] = 99;
    doc[FPSTR(HA_STEP)] = 1;
    doc[FPSTR(HA_MODE)] = "box";
    doc[FPSTR(HA_EXPIRE_AFTER)] = 120;
@@ -281,22 +233,31 @@ public:
    return this->publish(this->getTopic(FPSTR(HA_ENTITY_NUMBER), F("heating_min_temp")).c_str(), doc);
  }

-  bool publishNumberHeatingMaxTemp(bool enabledByDefault = true) {
+  bool publishNumberHeatingMaxTemp(UnitSystem unit = UnitSystem::METRIC, bool enabledByDefault = true) {
    JsonDocument doc;
    doc[FPSTR(HA_ENABLED_BY_DEFAULT)] = enabledByDefault;
    doc[FPSTR(HA_UNIQUE_ID)] = this->getObjectId(F("heating_max_temp"));
    doc[FPSTR(HA_OBJECT_ID)] = this->getObjectId(F("heating_max_temp"));
    doc[FPSTR(HA_ENTITY_CATEGORY)] = F("config");
    doc[FPSTR(HA_DEVICE_CLASS)] = F("temperature");
-    doc[FPSTR(HA_UNIT_OF_MEASUREMENT)] = F("°C");
+
+    if (unit == UnitSystem::METRIC) {
+      doc[FPSTR(HA_UNIT_OF_MEASUREMENT)] = FPSTR(HA_UNIT_OF_MEASUREMENT_C);
+      doc[FPSTR(HA_MIN)] = 1;
+      doc[FPSTR(HA_MAX)] = 100;
+      
+    } else if (unit == UnitSystem::IMPERIAL) {
+      doc[FPSTR(HA_UNIT_OF_MEASUREMENT)] = FPSTR(HA_UNIT_OF_MEASUREMENT_F);
+      doc[FPSTR(HA_MIN)] = 33;
+      doc[FPSTR(HA_MAX)] = 212;
+    }
+
    doc[FPSTR(HA_NAME)] = F("Heating max temp");
    doc[FPSTR(HA_ICON)] = F("mdi:thermometer-chevron-up");
    doc[FPSTR(HA_STATE_TOPIC)] = this->getDeviceTopic(F("settings"));
    doc[FPSTR(HA_VALUE_TEMPLATE)] = F("{{ value_json.heating.maxTemp|float(0)|round(1) }}");
    doc[FPSTR(HA_COMMAND_TOPIC)] = this->getDeviceTopic(F("settings/set"));
    doc[FPSTR(HA_COMMAND_TEMPLATE)] = F("{\"heating\": {\"maxTemp\" : {{ value }}}}");
-    doc[FPSTR(HA_MIN)] = 1;
-    doc[FPSTR(HA_MAX)] = 100;
    doc[FPSTR(HA_STEP)] = 1;
    doc[FPSTR(HA_MODE)] = "box";
    doc[FPSTR(HA_EXPIRE_AFTER)] = 120;
@@ -352,7 +313,7 @@ public:
    return this->publish(this->getTopic(FPSTR(HA_ENTITY_SWITCH), F("dhw")).c_str(), doc);
  }

-  bool publishNumberDhwTarget(byte minTemp = 40, byte maxTemp = 60, bool enabledByDefault = true) {
+  bool publishNumberDhwTarget(UnitSystem unit = UnitSystem::METRIC, byte minTemp = 40, byte maxTemp = 60, bool enabledByDefault = true) {
    JsonDocument doc;
    doc[FPSTR(HA_AVAILABILITY)][FPSTR(HA_TOPIC)] = this->getDeviceTopic(F("status"));
    doc[FPSTR(HA_ENABLED_BY_DEFAULT)] = enabledByDefault;
@@ -360,11 +321,18 @@ public:
    doc[FPSTR(HA_OBJECT_ID)] = this->getObjectId(F("dhw_target"));
    doc[FPSTR(HA_ENTITY_CATEGORY)] = F("config");
    doc[FPSTR(HA_DEVICE_CLASS)] = F("temperature");
-    doc[FPSTR(HA_UNIT_OF_MEASUREMENT)] = F("°C");
+
+    if (unit == UnitSystem::METRIC) {
+      doc[FPSTR(HA_UNIT_OF_MEASUREMENT)] = FPSTR(HA_UNIT_OF_MEASUREMENT_C);
+      
+    } else if (unit == UnitSystem::IMPERIAL) {
+      doc[FPSTR(HA_UNIT_OF_MEASUREMENT)] = FPSTR(HA_UNIT_OF_MEASUREMENT_F);
+    }
+
    doc[FPSTR(HA_NAME)] = F("DHW target");
    doc[FPSTR(HA_ICON)] = F("mdi:water-pump");
    doc[FPSTR(HA_STATE_TOPIC)] = this->getDeviceTopic(F("settings"));
-    doc[FPSTR(HA_VALUE_TEMPLATE)] = F("{{ value_json.dhw.target|int(0) }}");
+    doc[FPSTR(HA_VALUE_TEMPLATE)] = F("{{ value_json.dhw.target|float(0)|round(1) }}");
    doc[FPSTR(HA_COMMAND_TOPIC)] = this->getDeviceTopic(F("settings/set"));
    doc[FPSTR(HA_COMMAND_TEMPLATE)] = F("{\"dhw\": {\"target\" : {{ value|int(0) }}}}");
    doc[FPSTR(HA_MIN)] = minTemp;
@@ -377,7 +345,7 @@ public:
    return this->publish(this->getTopic(FPSTR(HA_ENTITY_NUMBER), F("dhw_target")).c_str(), doc);
  }

-  bool publishSensorBoilerDhwMinTemp(bool enabledByDefault = true) {
+  bool publishSensorBoilerDhwMinTemp(UnitSystem unit = UnitSystem::METRIC, bool enabledByDefault = true) {
    JsonDocument doc;
    doc[FPSTR(HA_AVAILABILITY)][0][FPSTR(HA_TOPIC)] = this->getDeviceTopic(F("status"));
    doc[FPSTR(HA_AVAILABILITY)][1][FPSTR(HA_TOPIC)] = this->getDeviceTopic(F("state"));
@@ -389,7 +357,14 @@ public:
    doc[FPSTR(HA_ENTITY_CATEGORY)] = F("diagnostic");
    doc[FPSTR(HA_DEVICE_CLASS)] = F("temperature");
    doc[FPSTR(HA_STATE_CLASS)] = F("measurement");
-    doc[FPSTR(HA_UNIT_OF_MEASUREMENT)] = F("°C");
+
+    if (unit == UnitSystem::METRIC) {
+      doc[FPSTR(HA_UNIT_OF_MEASUREMENT)] = FPSTR(HA_UNIT_OF_MEASUREMENT_C);
+      
+    } else if (unit == UnitSystem::IMPERIAL) {
+      doc[FPSTR(HA_UNIT_OF_MEASUREMENT)] = FPSTR(HA_UNIT_OF_MEASUREMENT_F);
+    }
+
    doc[FPSTR(HA_NAME)] = F("Boiler DHW min temp");
    doc[FPSTR(HA_ICON)] = F("mdi:thermometer-chevron-down");
    doc[FPSTR(HA_STATE_TOPIC)] = this->getDeviceTopic(F("state"));
@@ -400,7 +375,7 @@ public:
    return this->publish(this->getTopic(FPSTR(HA_ENTITY_SENSOR), F("boiler_dhw_min_temp")).c_str(), doc);
  }

-  bool publishSensorBoilerDhwMaxTemp(bool enabledByDefault = true) {
+  bool publishSensorBoilerDhwMaxTemp(UnitSystem unit = UnitSystem::METRIC, bool enabledByDefault = true) {
    JsonDocument doc;
    doc[FPSTR(HA_AVAILABILITY)][0][FPSTR(HA_TOPIC)] = this->getDeviceTopic(F("status"));
    doc[FPSTR(HA_AVAILABILITY)][1][FPSTR(HA_TOPIC)] = this->getDeviceTopic(F("state"));
@@ -412,7 +387,14 @@ public:
    doc[FPSTR(HA_ENTITY_CATEGORY)] = F("diagnostic");
    doc[FPSTR(HA_DEVICE_CLASS)] = F("temperature");
    doc[FPSTR(HA_STATE_CLASS)] = F("measurement");
-    doc[FPSTR(HA_UNIT_OF_MEASUREMENT)] = F("°C");
+
+    if (unit == UnitSystem::METRIC) {
+      doc[FPSTR(HA_UNIT_OF_MEASUREMENT)] = FPSTR(HA_UNIT_OF_MEASUREMENT_C);
+      
+    } else if (unit == UnitSystem::IMPERIAL) {
+      doc[FPSTR(HA_UNIT_OF_MEASUREMENT)] = FPSTR(HA_UNIT_OF_MEASUREMENT_F);
+    }
+
    doc[FPSTR(HA_NAME)] = F("Boiler DHW max temp");
    doc[FPSTR(HA_ICON)] = F("mdi:thermometer-chevron-up");
    doc[FPSTR(HA_STATE_TOPIC)] = this->getDeviceTopic(F("state"));
@@ -423,22 +405,31 @@ public:
    return this->publish(this->getTopic(FPSTR(HA_ENTITY_SENSOR), F("boiler_dhw_max_temp")).c_str(), doc);
  }

-  bool publishNumberDhwMinTemp(bool enabledByDefault = true) {
+  bool publishNumberDhwMinTemp(UnitSystem unit = UnitSystem::METRIC, bool enabledByDefault = true) {
    JsonDocument doc;
    doc[FPSTR(HA_ENABLED_BY_DEFAULT)] = enabledByDefault;
    doc[FPSTR(HA_UNIQUE_ID)] = this->getObjectId(F("dhw_min_temp"));
    doc[FPSTR(HA_OBJECT_ID)] = this->getObjectId(F("dhw_min_temp"));
    doc[FPSTR(HA_ENTITY_CATEGORY)] = F("config");
    doc[FPSTR(HA_DEVICE_CLASS)] = F("temperature");
-    doc[FPSTR(HA_UNIT_OF_MEASUREMENT)] = F("°C");
+
+    if (unit == UnitSystem::METRIC) {
+      doc[FPSTR(HA_UNIT_OF_MEASUREMENT)] = FPSTR(HA_UNIT_OF_MEASUREMENT_C);
+      doc[FPSTR(HA_MIN)] = 0;
+      doc[FPSTR(HA_MAX)] = 99;
+      
+    } else if (unit == UnitSystem::IMPERIAL) {
+      doc[FPSTR(HA_UNIT_OF_MEASUREMENT)] = FPSTR(HA_UNIT_OF_MEASUREMENT_F);
+      doc[FPSTR(HA_MIN)] = 32;
+      doc[FPSTR(HA_MAX)] = 211;
+    }
+
    doc[FPSTR(HA_NAME)] = F("DHW min temp");
    doc[FPSTR(HA_ICON)] = F("mdi:thermometer-chevron-down");
    doc[FPSTR(HA_STATE_TOPIC)] = this->getDeviceTopic(F("settings"));
    doc[FPSTR(HA_VALUE_TEMPLATE)] = F("{{ value_json.dhw.minTemp|float(0)|round(1) }}");
    doc[FPSTR(HA_COMMAND_TOPIC)] = this->getDeviceTopic(F("settings/set"));
    doc[FPSTR(HA_COMMAND_TEMPLATE)] = F("{\"dhw\": {\"minTemp\" : {{ value }}}}");
-    doc[FPSTR(HA_MIN)] = 0;
-    doc[FPSTR(HA_MAX)] = 99;
    doc[FPSTR(HA_STEP)] = 1;
    doc[FPSTR(HA_MODE)] = "box";
    doc[FPSTR(HA_EXPIRE_AFTER)] = 120;
@@ -447,22 +438,31 @@ public:
    return this->publish(this->getTopic(FPSTR(HA_ENTITY_NUMBER), F("dhw_min_temp")).c_str(), doc);
  }

-  bool publishNumberDhwMaxTemp(bool enabledByDefault = true) {
+  bool publishNumberDhwMaxTemp(UnitSystem unit = UnitSystem::METRIC, bool enabledByDefault = true) {
    JsonDocument doc;
    doc[FPSTR(HA_ENABLED_BY_DEFAULT)] = enabledByDefault;
    doc[FPSTR(HA_UNIQUE_ID)] = this->getObjectId(F("dhw_max_temp"));
    doc[FPSTR(HA_OBJECT_ID)] = this->getObjectId(F("dhw_max_temp"));
    doc[FPSTR(HA_ENTITY_CATEGORY)] = F("config");
    doc[FPSTR(HA_DEVICE_CLASS)] = F("temperature");
-    doc[FPSTR(HA_UNIT_OF_MEASUREMENT)] = F("°C");
+
+    if (unit == UnitSystem::METRIC) {
+      doc[FPSTR(HA_UNIT_OF_MEASUREMENT)] = FPSTR(HA_UNIT_OF_MEASUREMENT_C);
+      doc[FPSTR(HA_MIN)] = 1;
+      doc[FPSTR(HA_MAX)] = 100;
+      
+    } else if (unit == UnitSystem::IMPERIAL) {
+      doc[FPSTR(HA_UNIT_OF_MEASUREMENT)] = FPSTR(HA_UNIT_OF_MEASUREMENT_F);
+      doc[FPSTR(HA_MIN)] = 33;
+      doc[FPSTR(HA_MAX)] = 212;
+    }
+
    doc[FPSTR(HA_NAME)] = F("DHW max temp");
    doc[FPSTR(HA_ICON)] = F("mdi:thermometer-chevron-up");
    doc[FPSTR(HA_STATE_TOPIC)] = this->getDeviceTopic(F("settings"));
    doc[FPSTR(HA_VALUE_TEMPLATE)] = F("{{ value_json.dhw.maxTemp|float(0)|round(1) }}");
    doc[FPSTR(HA_COMMAND_TOPIC)] = this->getDeviceTopic(F("settings/set"));
    doc[FPSTR(HA_COMMAND_TEMPLATE)] = F("{\"dhw\": {\"maxTemp\" : {{ value }}}}");
-    doc[FPSTR(HA_MIN)] = 1;
-    doc[FPSTR(HA_MAX)] = 100;
    doc[FPSTR(HA_STEP)] = 1;
    doc[FPSTR(HA_MODE)] = "box";
    doc[FPSTR(HA_EXPIRE_AFTER)] = 120;
@@ -504,9 +504,9 @@ public:
    doc[FPSTR(HA_VALUE_TEMPLATE)] = F("{{ value_json.pid.p_factor|float(0)|round(3) }}");
    doc[FPSTR(HA_COMMAND_TOPIC)] = this->getDeviceTopic(F("settings/set"));
    doc[FPSTR(HA_COMMAND_TEMPLATE)] = F("{\"pid\": {\"p_factor\" : {{ value }}}}");
-    doc[FPSTR(HA_MIN)] = 0.1;
+    doc[FPSTR(HA_MIN)] = 0.1f;
    doc[FPSTR(HA_MAX)] = 1000;
-    doc[FPSTR(HA_STEP)] = 0.1;
+    doc[FPSTR(HA_STEP)] = 0.1f;
    doc[FPSTR(HA_MODE)] = "box";
    doc[FPSTR(HA_EXPIRE_AFTER)] = 120;
    doc.shrinkToFit();
@@ -522,12 +522,12 @@ public:
    doc[FPSTR(HA_NAME)] = F("PID factor I");
    doc[FPSTR(HA_ICON)] = F("mdi:alpha-i-circle-outline");
    doc[FPSTR(HA_STATE_TOPIC)] = this->getDeviceTopic(F("settings"));
-    doc[FPSTR(HA_VALUE_TEMPLATE)] = F("{{ value_json.pid.i_factor|float(0)|round(3) }}");
+    doc[FPSTR(HA_VALUE_TEMPLATE)] = F("{{ value_json.pid.i_factor|float(0)|round(4) }}");
    doc[FPSTR(HA_COMMAND_TOPIC)] = this->getDeviceTopic(F("settings/set"));
    doc[FPSTR(HA_COMMAND_TEMPLATE)] = F("{\"pid\": {\"i_factor\" : {{ value }}}}");
    doc[FPSTR(HA_MIN)] = 0;
    doc[FPSTR(HA_MAX)] = 100;
-    doc[FPSTR(HA_STEP)] = 0.001;
+    doc[FPSTR(HA_STEP)] = 0.001f;
    doc[FPSTR(HA_MODE)] = "box";
    doc[FPSTR(HA_EXPIRE_AFTER)] = 120;
    doc.shrinkToFit();
@@ -579,22 +579,31 @@ public:
    return this->publish(this->getTopic(FPSTR(HA_ENTITY_NUMBER), F("pid_dt")).c_str(), doc);
  }

-  bool publishNumberPidMinTemp(bool enabledByDefault = true) {
+  bool publishNumberPidMinTemp(UnitSystem unit = UnitSystem::METRIC, bool enabledByDefault = true) {
    JsonDocument doc;
    doc[FPSTR(HA_ENABLED_BY_DEFAULT)] = enabledByDefault;
    doc[FPSTR(HA_UNIQUE_ID)] = this->getObjectId(F("pid_min_temp"));
    doc[FPSTR(HA_OBJECT_ID)] = this->getObjectId(F("pid_min_temp"));
    doc[FPSTR(HA_ENTITY_CATEGORY)] = F("config");
    doc[FPSTR(HA_DEVICE_CLASS)] = F("temperature");
-    doc[FPSTR(HA_UNIT_OF_MEASUREMENT)] = F("°C");
+
+    if (unit == UnitSystem::METRIC) {
+      doc[FPSTR(HA_UNIT_OF_MEASUREMENT)] = FPSTR(HA_UNIT_OF_MEASUREMENT_C);
+      doc[FPSTR(HA_MIN)] = 0;
+      doc[FPSTR(HA_MAX)] = 99;
+      
+    } else if (unit == UnitSystem::IMPERIAL) {
+      doc[FPSTR(HA_UNIT_OF_MEASUREMENT)] = FPSTR(HA_UNIT_OF_MEASUREMENT_F);
+      doc[FPSTR(HA_MIN)] = 0;
+      doc[FPSTR(HA_MAX)] = 211;
+    }
+
    doc[FPSTR(HA_NAME)] = F("PID min temp");
    doc[FPSTR(HA_ICON)] = F("mdi:thermometer-chevron-down");
    doc[FPSTR(HA_STATE_TOPIC)] = this->getDeviceTopic(F("settings"));
    doc[FPSTR(HA_VALUE_TEMPLATE)] = F("{{ value_json.pid.minTemp|float(0)|round(1) }}");
    doc[FPSTR(HA_COMMAND_TOPIC)] = this->getDeviceTopic(F("settings/set"));
    doc[FPSTR(HA_COMMAND_TEMPLATE)] = F("{\"pid\": {\"minTemp\" : {{ value }}}}");
-    doc[FPSTR(HA_MIN)] = 0;
-    doc[FPSTR(HA_MAX)] = 99;
    doc[FPSTR(HA_STEP)] = 1;
    doc[FPSTR(HA_MODE)] = "box";
    doc[FPSTR(HA_EXPIRE_AFTER)] = 120;
@@ -603,22 +612,31 @@ public:
    return this->publish(this->getTopic(FPSTR(HA_ENTITY_NUMBER), F("pid_min_temp")).c_str(), doc);
  }

-  bool publishNumberPidMaxTemp(bool enabledByDefault = true) {
+  bool publishNumberPidMaxTemp(UnitSystem unit = UnitSystem::METRIC, bool enabledByDefault = true) {
    JsonDocument doc;
    doc[FPSTR(HA_ENABLED_BY_DEFAULT)] = enabledByDefault;
    doc[FPSTR(HA_UNIQUE_ID)] = this->getObjectId(F("pid_max_temp"));
    doc[FPSTR(HA_OBJECT_ID)] = this->getObjectId(F("pid_max_temp"));
    doc[FPSTR(HA_ENTITY_CATEGORY)] = F("config");
    doc[FPSTR(HA_DEVICE_CLASS)] = F("temperature");
-    doc[FPSTR(HA_UNIT_OF_MEASUREMENT)] = F("°C");
+
+    if (unit == UnitSystem::METRIC) {
+      doc[FPSTR(HA_UNIT_OF_MEASUREMENT)] = FPSTR(HA_UNIT_OF_MEASUREMENT_C);
+      doc[FPSTR(HA_MIN)] = 1;
+      doc[FPSTR(HA_MAX)] = 100;
+      
+    } else if (unit == UnitSystem::IMPERIAL) {
+      doc[FPSTR(HA_UNIT_OF_MEASUREMENT)] = FPSTR(HA_UNIT_OF_MEASUREMENT_F);
+      doc[FPSTR(HA_MIN)] = 1;
+      doc[FPSTR(HA_MAX)] = 212;
+    }
+
    doc[FPSTR(HA_NAME)] = F("PID max temp");
    doc[FPSTR(HA_ICON)] = F("mdi:thermometer-chevron-up");
    doc[FPSTR(HA_STATE_TOPIC)] = this->getDeviceTopic(F("settings"));
    doc[FPSTR(HA_VALUE_TEMPLATE)] = F("{{ value_json.pid.maxTemp|float(0)|round(1) }}");
    doc[FPSTR(HA_COMMAND_TOPIC)] = this->getDeviceTopic(F("settings/set"));
    doc[FPSTR(HA_COMMAND_TEMPLATE)] = F("{\"pid\": {\"maxTemp\" : {{ value }}}}");
-    doc[FPSTR(HA_MIN)] = 1;
-    doc[FPSTR(HA_MAX)] = 100;
    doc[FPSTR(HA_STEP)] = 1;
    doc[FPSTR(HA_MODE)] = "box";
    doc[FPSTR(HA_EXPIRE_AFTER)] = 120;
@@ -660,9 +678,9 @@ public:
    doc[FPSTR(HA_VALUE_TEMPLATE)] = F("{{ value_json.equitherm.n_factor|float(0)|round(3) }}");
    doc[FPSTR(HA_COMMAND_TOPIC)] = this->getDeviceTopic(F("settings/set"));
    doc[FPSTR(HA_COMMAND_TEMPLATE)] = F("{\"equitherm\": {\"n_factor\" : {{ value }}}}");
-    doc[FPSTR(HA_MIN)] = 0.001;
+    doc[FPSTR(HA_MIN)] = 0.001f;
    doc[FPSTR(HA_MAX)] = 10;
-    doc[FPSTR(HA_STEP)] = 0.001;
+    doc[FPSTR(HA_STEP)] = 0.001f;
    doc[FPSTR(HA_MODE)] = "box";
    doc[FPSTR(HA_EXPIRE_AFTER)] = 120;
    doc.shrinkToFit();
@@ -683,7 +701,7 @@ public:
    doc[FPSTR(HA_COMMAND_TEMPLATE)] = F("{\"equitherm\": {\"k_factor\" : {{ value }}}}");
    doc[FPSTR(HA_MIN)] = 0;
    doc[FPSTR(HA_MAX)] = 10;
-    doc[FPSTR(HA_STEP)] = 0.01;
+    doc[FPSTR(HA_STEP)] = 0.01f;
    doc[FPSTR(HA_MODE)] = "box";
    doc[FPSTR(HA_EXPIRE_AFTER)] = 120;
    doc.shrinkToFit();
@@ -706,7 +724,7 @@ public:
    doc[FPSTR(HA_COMMAND_TEMPLATE)] = F("{\"equitherm\": {\"t_factor\" : {{ value }}}}");
    doc[FPSTR(HA_MIN)] = 0;
    doc[FPSTR(HA_MAX)] = 10;
-    doc[FPSTR(HA_STEP)] = 0.01;
+    doc[FPSTR(HA_STEP)] = 0.01f;
    doc[FPSTR(HA_MODE)] = "box";
    doc[FPSTR(HA_EXPIRE_AFTER)] = 120;
    doc.shrinkToFit();
@@ -715,48 +733,6 @@ public:
  }


-  bool publishSwitchTuning(bool enabledByDefault = true) {
-    JsonDocument doc;
-    doc[FPSTR(HA_ENABLED_BY_DEFAULT)] = enabledByDefault;
-    doc[FPSTR(HA_UNIQUE_ID)] = this->getObjectId(F("tuning"));
-    doc[FPSTR(HA_OBJECT_ID)] = this->getObjectId(F("tuning"));
-    doc[FPSTR(HA_ENTITY_CATEGORY)] = F("config");
-    doc[FPSTR(HA_NAME)] = F("Tuning");
-    doc[FPSTR(HA_ICON)] = F("mdi:tune-vertical");
-    doc[FPSTR(HA_STATE_TOPIC)] = this->getDeviceTopic(F("state"));
-    doc[FPSTR(HA_STATE_ON)] = true;
-    doc[FPSTR(HA_STATE_OFF)] = false;
-    doc[FPSTR(HA_VALUE_TEMPLATE)] = F("{{ value_json.tuning.enable }}");
-    doc[FPSTR(HA_COMMAND_TOPIC)] = this->getDeviceTopic(F("state/set"));
-    doc[FPSTR(HA_PAYLOAD_ON)] = F("{\"tuning\": {\"enable\" : true}}");
-    doc[FPSTR(HA_PAYLOAD_OFF)] = F("{\"tuning\": {\"enable\" : false}}");
-    doc[FPSTR(HA_EXPIRE_AFTER)] = 120;
-    doc.shrinkToFit();
-
-    return this->publish(this->getTopic(FPSTR(HA_ENTITY_SWITCH), F("tuning")).c_str(), doc);
-  }
-
-  bool publishSelectTuningRegulator(bool enabledByDefault = true) {
-    JsonDocument doc;
-    doc[FPSTR(HA_AVAILABILITY)][FPSTR(HA_TOPIC)] = this->getDeviceTopic(F("status"));
-    doc[FPSTR(HA_COMMAND_TOPIC)] = this->getDeviceTopic(F("state/set"));
-    doc[FPSTR(HA_COMMAND_TEMPLATE)] = F("{\"tuning\": {\"regulator\": {% if value == 'Equitherm' %}0{% elif value == 'PID' %}1{% endif %}}}");
-    doc[FPSTR(HA_ENABLED_BY_DEFAULT)] = enabledByDefault;
-    doc[FPSTR(HA_UNIQUE_ID)] = this->getObjectId(F("tuning_regulator"));
-    doc[FPSTR(HA_OBJECT_ID)] = this->getObjectId(F("tuning_regulator"));
-    doc[FPSTR(HA_ENTITY_CATEGORY)] = F("config");
-    doc[FPSTR(HA_NAME)] = F("Tuning regulator");
-    doc[FPSTR(HA_STATE_TOPIC)] = this->getDeviceTopic(F("state"));
-    doc[FPSTR(HA_VALUE_TEMPLATE)] = F("{% if value_json.tuning.regulator == 0 %}Equitherm{% elif value_json.tuning.regulator == 1 %}PID{% endif %}");
-    doc[FPSTR(HA_OPTIONS)][0] = F("Equitherm");
-    doc[FPSTR(HA_OPTIONS)][1] = F("PID");
-    doc[FPSTR(HA_EXPIRE_AFTER)] = 120;
-    doc.shrinkToFit();
-
-    return this->publish(this->getTopic(FPSTR(HA_ENTITY_SELECT), F("tuning_regulator")).c_str(), doc);
-  }
-
-
  bool publishBinSensorStatus(bool enabledByDefault = true) {
    JsonDocument doc;
    doc[FPSTR(HA_ENABLED_BY_DEFAULT)] = enabledByDefault;
@@ -980,7 +956,7 @@ public:
    return this->publish(this->getTopic(FPSTR(HA_ENTITY_SENSOR), F("modulation")).c_str(), doc);
  }

-  bool publishSensorPressure(bool enabledByDefault = true) {
+  bool publishSensorPressure(UnitSystem unit = UnitSystem::METRIC, bool enabledByDefault = true) {
    JsonDocument doc;
    doc[FPSTR(HA_AVAILABILITY)][0][FPSTR(HA_TOPIC)] = this->getDeviceTopic(F("status"));
    doc[FPSTR(HA_AVAILABILITY)][1][FPSTR(HA_TOPIC)] = this->getDeviceTopic(F("state"));
@@ -992,7 +968,14 @@ public:
    doc[FPSTR(HA_ENTITY_CATEGORY)] = F("diagnostic");
    doc[FPSTR(HA_DEVICE_CLASS)] = F("pressure");
    doc[FPSTR(HA_STATE_CLASS)] = F("measurement");
-    doc[FPSTR(HA_UNIT_OF_MEASUREMENT)] = F("bar");
+
+    if (unit == UnitSystem::METRIC) {
+      doc[FPSTR(HA_UNIT_OF_MEASUREMENT)] = F("bar");
+
+    } else if (unit == UnitSystem::IMPERIAL) {
+      doc[FPSTR(HA_UNIT_OF_MEASUREMENT)] = F("psi");
+    }
+
    doc[FPSTR(HA_NAME)] = F("Pressure");
    doc[FPSTR(HA_ICON)] = F("mdi:gauge");
    doc[FPSTR(HA_STATE_TOPIC)] = this->getDeviceTopic(F("state"));
@@ -1003,7 +986,7 @@ public:
    return this->publish(this->getTopic(FPSTR(HA_ENTITY_SENSOR), F("pressure")).c_str(), doc);
  }

-  bool publishSensorDhwFlowRate(bool enabledByDefault = true) {
+  bool publishSensorDhwFlowRate(UnitSystem unit = UnitSystem::METRIC, bool enabledByDefault = true) {
    JsonDocument doc;
    doc[FPSTR(HA_AVAILABILITY)][0][FPSTR(HA_TOPIC)] = this->getDeviceTopic(F("status"));
    doc[FPSTR(HA_AVAILABILITY)][1][FPSTR(HA_TOPIC)] = this->getDeviceTopic(F("state"));
@@ -1015,7 +998,14 @@ public:
    doc[FPSTR(HA_ENTITY_CATEGORY)] = F("diagnostic");
    doc[FPSTR(HA_DEVICE_CLASS)] = F("volume_flow_rate");
    doc[FPSTR(HA_STATE_CLASS)] = F("measurement");
-    doc[FPSTR(HA_UNIT_OF_MEASUREMENT)] = F("L/min");
+
+    if (unit == UnitSystem::METRIC) {
+      doc[FPSTR(HA_UNIT_OF_MEASUREMENT)] = F("L/min");
+
+    } else if (unit == UnitSystem::IMPERIAL) {
+      doc[FPSTR(HA_UNIT_OF_MEASUREMENT)] = F("gal/min");
+    }
+
    doc[FPSTR(HA_NAME)] = F("DHW flow rate");
    doc[FPSTR(HA_ICON)] = F("mdi:water-pump");
    doc[FPSTR(HA_STATE_TOPIC)] = this->getDeviceTopic(F("state"));
@@ -1027,22 +1017,31 @@ public:
  }


-  bool publishNumberIndoorTemp(bool enabledByDefault = true) {
+  bool publishNumberIndoorTemp(UnitSystem unit = UnitSystem::METRIC, bool enabledByDefault = true) {
    JsonDocument doc;
    doc[FPSTR(HA_ENABLED_BY_DEFAULT)] = enabledByDefault;
    doc[FPSTR(HA_UNIQUE_ID)] = this->getObjectId(F("indoor_temp"));
    doc[FPSTR(HA_OBJECT_ID)] = this->getObjectId(F("indoor_temp"));
    doc[FPSTR(HA_ENTITY_CATEGORY)] = F("config");
-    doc[FPSTR(HA_UNIT_OF_MEASUREMENT)] = F("°C");
+
+    if (unit == UnitSystem::METRIC) {
+      doc[FPSTR(HA_UNIT_OF_MEASUREMENT)] = FPSTR(HA_UNIT_OF_MEASUREMENT_C);
+      doc[FPSTR(HA_MIN)] = -99;
+      doc[FPSTR(HA_MAX)] = 99;
+      
+    } else if (unit == UnitSystem::IMPERIAL) {
+      doc[FPSTR(HA_UNIT_OF_MEASUREMENT)] = FPSTR(HA_UNIT_OF_MEASUREMENT_F);
+      doc[FPSTR(HA_MIN)] = -147;
+      doc[FPSTR(HA_MAX)] = 211;
+    }
+
    doc[FPSTR(HA_NAME)] = F("Indoor temperature");
    doc[FPSTR(HA_ICON)] = F("mdi:home-thermometer");
    doc[FPSTR(HA_STATE_TOPIC)] = this->getDeviceTopic(F("state"));
    doc[FPSTR(HA_VALUE_TEMPLATE)] = F("{{ value_json.temperatures.indoor|float(0)|round(1) }}");
    doc[FPSTR(HA_COMMAND_TOPIC)] = this->getDeviceTopic(F("state/set"));
    doc[FPSTR(HA_COMMAND_TEMPLATE)] = F("{\"temperatures\": {\"indoor\":{{ value }}}}");
-    doc[FPSTR(HA_MIN)] = -99;
-    doc[FPSTR(HA_MAX)] = 99;
-    doc[FPSTR(HA_STEP)] = 0.01;
+    doc[FPSTR(HA_STEP)] = 0.01f;
    doc[FPSTR(HA_MODE)] = "box";
    doc[FPSTR(HA_EXPIRE_AFTER)] = 120;
    doc.shrinkToFit();
@@ -1050,7 +1049,7 @@ public:
    return this->publish(this->getTopic(FPSTR(HA_ENTITY_NUMBER), F("indoor_temp")).c_str(), doc);
  }

-  bool publishSensorIndoorTemp(bool enabledByDefault = true) {
+  bool publishSensorIndoorTemp(UnitSystem unit = UnitSystem::METRIC, bool enabledByDefault = true) {
    JsonDocument doc;
    doc[FPSTR(HA_AVAILABILITY)][FPSTR(HA_TOPIC)] = this->getDeviceTopic(F("status"));
    doc[FPSTR(HA_ENABLED_BY_DEFAULT)] = enabledByDefault;
@@ -1059,7 +1058,14 @@ public:
    doc[FPSTR(HA_ENTITY_CATEGORY)] = F("diagnostic");
    doc[FPSTR(HA_DEVICE_CLASS)] = F("temperature");
    doc[FPSTR(HA_STATE_CLASS)] = F("measurement");
-    doc[FPSTR(HA_UNIT_OF_MEASUREMENT)] = F("°C");
+
+    if (unit == UnitSystem::METRIC) {
+      doc[FPSTR(HA_UNIT_OF_MEASUREMENT)] = FPSTR(HA_UNIT_OF_MEASUREMENT_C);
+      
+    } else if (unit == UnitSystem::IMPERIAL) {
+      doc[FPSTR(HA_UNIT_OF_MEASUREMENT)] = FPSTR(HA_UNIT_OF_MEASUREMENT_F);
+    }
+
    doc[FPSTR(HA_NAME)] = F("Indoor temperature");
    doc[FPSTR(HA_ICON)] = F("mdi:home-thermometer");
    doc[FPSTR(HA_STATE_TOPIC)] = this->getDeviceTopic(F("state"));
@@ -1070,22 +1076,31 @@ public:
    return this->publish(this->getTopic(FPSTR(HA_ENTITY_SENSOR), F("indoor_temp")).c_str(), doc);
  }

-  bool publishNumberOutdoorTemp(bool enabledByDefault = true) {
+  bool publishNumberOutdoorTemp(UnitSystem unit = UnitSystem::METRIC, bool enabledByDefault = true) {
    JsonDocument doc;
    doc[FPSTR(HA_ENABLED_BY_DEFAULT)] = enabledByDefault;
    doc[FPSTR(HA_UNIQUE_ID)] = this->getObjectId(F("outdoor_temp"));
    doc[FPSTR(HA_OBJECT_ID)] = this->getObjectId(F("outdoor_temp"));
    doc[FPSTR(HA_ENTITY_CATEGORY)] = F("config");
-    doc[FPSTR(HA_UNIT_OF_MEASUREMENT)] = F("°C");
+
+    if (unit == UnitSystem::METRIC) {
+      doc[FPSTR(HA_UNIT_OF_MEASUREMENT)] = FPSTR(HA_UNIT_OF_MEASUREMENT_C);
+      doc[FPSTR(HA_MIN)] = -99;
+      doc[FPSTR(HA_MAX)] = 99;
+      
+    } else if (unit == UnitSystem::IMPERIAL) {
+      doc[FPSTR(HA_UNIT_OF_MEASUREMENT)] = FPSTR(HA_UNIT_OF_MEASUREMENT_F);
+      doc[FPSTR(HA_MIN)] = -147;
+      doc[FPSTR(HA_MAX)] = 211;
+    }
+
    doc[FPSTR(HA_NAME)] = F("Outdoor temperature");
    doc[FPSTR(HA_ICON)] = F("mdi:home-thermometer-outline");
    doc[FPSTR(HA_STATE_TOPIC)] = this->getDeviceTopic(F("state"));
    doc[FPSTR(HA_VALUE_TEMPLATE)] = F("{{ value_json.temperatures.outdoor|float(0)|round(1) }}");
    doc[FPSTR(HA_COMMAND_TOPIC)] = this->getDeviceTopic(F("state/set"));
    doc[FPSTR(HA_COMMAND_TEMPLATE)] = F("{\"temperatures\": {\"outdoor\":{{ value }}}}");
-    doc[FPSTR(HA_MIN)] = -99;
-    doc[FPSTR(HA_MAX)] = 99;
-    doc[FPSTR(HA_STEP)] = 0.01;
+    doc[FPSTR(HA_STEP)] = 0.01f;
    doc[FPSTR(HA_MODE)] = "box";
    doc[FPSTR(HA_EXPIRE_AFTER)] = 120;
    doc.shrinkToFit();
@@ -1093,7 +1108,7 @@ public:
    return this->publish(this->getTopic(FPSTR(HA_ENTITY_NUMBER), F("outdoor_temp")).c_str(), doc);
  }

-  bool publishSensorOutdoorTemp(bool enabledByDefault = true) {
+  bool publishSensorOutdoorTemp(UnitSystem unit = UnitSystem::METRIC, bool enabledByDefault = true) {
    JsonDocument doc;
    doc[FPSTR(HA_AVAILABILITY)][FPSTR(HA_TOPIC)] = this->getDeviceTopic(F("status"));
    doc[FPSTR(HA_ENABLED_BY_DEFAULT)] = enabledByDefault;
@@ -1102,7 +1117,14 @@ public:
    doc[FPSTR(HA_ENTITY_CATEGORY)] = F("diagnostic");
    doc[FPSTR(HA_DEVICE_CLASS)] = F("temperature");
    doc[FPSTR(HA_STATE_CLASS)] = F("measurement");
-    doc[FPSTR(HA_UNIT_OF_MEASUREMENT)] = F("°C");
+
+    if (unit == UnitSystem::METRIC) {
+      doc[FPSTR(HA_UNIT_OF_MEASUREMENT)] = FPSTR(HA_UNIT_OF_MEASUREMENT_C);
+      
+    } else if (unit == UnitSystem::IMPERIAL) {
+      doc[FPSTR(HA_UNIT_OF_MEASUREMENT)] = FPSTR(HA_UNIT_OF_MEASUREMENT_F);
+    }
+
    doc[FPSTR(HA_NAME)] = F("Outdoor temperature");
    doc[FPSTR(HA_ICON)] = F("mdi:home-thermometer-outline");
    doc[FPSTR(HA_STATE_TOPIC)] = this->getDeviceTopic(F("state"));
@@ -1113,7 +1135,7 @@ public:
    return this->publish(this->getTopic(FPSTR(HA_ENTITY_SENSOR), F("outdoor_temp")).c_str(), doc);
  }

-  bool publishSensorHeatingTemp(bool enabledByDefault = true) {
+  bool publishSensorHeatingTemp(UnitSystem unit = UnitSystem::METRIC, bool enabledByDefault = true) {
    JsonDocument doc;
    doc[FPSTR(HA_AVAILABILITY)][0][FPSTR(HA_TOPIC)] = this->getDeviceTopic(F("status"));
    doc[FPSTR(HA_AVAILABILITY)][1][FPSTR(HA_TOPIC)] = this->getDeviceTopic(F("state"));
@@ -1125,7 +1147,14 @@ public:
    doc[FPSTR(HA_ENTITY_CATEGORY)] = F("diagnostic");
    doc[FPSTR(HA_DEVICE_CLASS)] = F("temperature");
    doc[FPSTR(HA_STATE_CLASS)] = F("measurement");
-    doc[FPSTR(HA_UNIT_OF_MEASUREMENT)] = F("°C");
+
+    if (unit == UnitSystem::METRIC) {
+      doc[FPSTR(HA_UNIT_OF_MEASUREMENT)] = FPSTR(HA_UNIT_OF_MEASUREMENT_C);
+      
+    } else if (unit == UnitSystem::IMPERIAL) {
+      doc[FPSTR(HA_UNIT_OF_MEASUREMENT)] = FPSTR(HA_UNIT_OF_MEASUREMENT_F);
+    }
+
    doc[FPSTR(HA_NAME)] = F("Heating temperature");
    doc[FPSTR(HA_ICON)] = F("mdi:radiator");
    doc[FPSTR(HA_STATE_TOPIC)] = this->getDeviceTopic(F("state"));
@@ -1136,7 +1165,37 @@ public:
    return this->publish(this->getTopic(FPSTR(HA_ENTITY_SENSOR), F("heating_temp")).c_str(), doc);
  }

-  bool publishSensorDhwTemp(bool enabledByDefault = true) {
+  bool publishSensorHeatingReturnTemp(UnitSystem unit = UnitSystem::METRIC, bool enabledByDefault = true) {
+    JsonDocument doc;
+    doc[FPSTR(HA_AVAILABILITY)][0][FPSTR(HA_TOPIC)] = this->getDeviceTopic(F("status"));
+    doc[FPSTR(HA_AVAILABILITY)][1][FPSTR(HA_TOPIC)] = this->getDeviceTopic(F("state"));
+    doc[FPSTR(HA_AVAILABILITY)][1][FPSTR(HA_VALUE_TEMPLATE)] = F("{{ iif(value_json.states.otStatus, 'online', 'offline') }}");
+    doc[FPSTR(HA_AVAILABILITY_MODE)] = F("all");
+    doc[FPSTR(HA_ENABLED_BY_DEFAULT)] = enabledByDefault;
+    doc[FPSTR(HA_UNIQUE_ID)] = this->getObjectId(F("heating_return_temp"));
+    doc[FPSTR(HA_OBJECT_ID)] = this->getObjectId(F("heating_return_temp"));
+    doc[FPSTR(HA_ENTITY_CATEGORY)] = F("diagnostic");
+    doc[FPSTR(HA_DEVICE_CLASS)] = F("temperature");
+    doc[FPSTR(HA_STATE_CLASS)] = F("measurement");
+
+    if (unit == UnitSystem::METRIC) {
+      doc[FPSTR(HA_UNIT_OF_MEASUREMENT)] = FPSTR(HA_UNIT_OF_MEASUREMENT_C);
+      
+    } else if (unit == UnitSystem::IMPERIAL) {
+      doc[FPSTR(HA_UNIT_OF_MEASUREMENT)] = FPSTR(HA_UNIT_OF_MEASUREMENT_F);
+    }
+
+    doc[FPSTR(HA_NAME)] = F("Heating return temperature");
+    doc[FPSTR(HA_ICON)] = F("mdi:radiator");
+    doc[FPSTR(HA_STATE_TOPIC)] = this->getDeviceTopic(F("state"));
+    doc[FPSTR(HA_VALUE_TEMPLATE)] = F("{{ value_json.temperatures.heatingReturn|float(0)|round(2) }}");
+    doc[FPSTR(HA_EXPIRE_AFTER)] = 120;
+    doc.shrinkToFit();
+
+    return this->publish(this->getTopic(FPSTR(HA_ENTITY_SENSOR), F("heating_return_temp")).c_str(), doc);
+  }
+
+  bool publishSensorDhwTemp(UnitSystem unit = UnitSystem::METRIC, bool enabledByDefault = true) {
    JsonDocument doc;
    doc[FPSTR(HA_AVAILABILITY)][0][FPSTR(HA_TOPIC)] = this->getDeviceTopic(F("status"));
    doc[FPSTR(HA_AVAILABILITY)][1][FPSTR(HA_TOPIC)] = this->getDeviceTopic(F("state"));
@@ -1148,7 +1207,14 @@ public:
    doc[FPSTR(HA_ENTITY_CATEGORY)] = F("diagnostic");
    doc[FPSTR(HA_DEVICE_CLASS)] = F("temperature");
    doc[FPSTR(HA_STATE_CLASS)] = F("measurement");
-    doc[FPSTR(HA_UNIT_OF_MEASUREMENT)] = F("°C");
+
+    if (unit == UnitSystem::METRIC) {
+      doc[FPSTR(HA_UNIT_OF_MEASUREMENT)] = FPSTR(HA_UNIT_OF_MEASUREMENT_C);
+      
+    } else if (unit == UnitSystem::IMPERIAL) {
+      doc[FPSTR(HA_UNIT_OF_MEASUREMENT)] = FPSTR(HA_UNIT_OF_MEASUREMENT_F);
+    }
+
    doc[FPSTR(HA_NAME)] = F("DHW temperature");
    doc[FPSTR(HA_ICON)] = F("mdi:water-pump");
    doc[FPSTR(HA_STATE_TOPIC)] = this->getDeviceTopic(F("state"));
@@ -1159,8 +1225,38 @@ public:
    return this->publish(this->getTopic(FPSTR(HA_ENTITY_SENSOR), F("dhw_temp")).c_str(), doc);
  }

+  bool publishSensorExhaustTemp(UnitSystem unit = UnitSystem::METRIC, bool enabledByDefault = true) {
+    JsonDocument doc;
+    doc[FPSTR(HA_AVAILABILITY)][0][FPSTR(HA_TOPIC)] = this->getDeviceTopic(F("status"));
+    doc[FPSTR(HA_AVAILABILITY)][1][FPSTR(HA_TOPIC)] = this->getDeviceTopic(F("state"));
+    doc[FPSTR(HA_AVAILABILITY)][1][FPSTR(HA_VALUE_TEMPLATE)] = F("{{ iif(value_json.states.otStatus, 'online', 'offline') }}");
+    doc[FPSTR(HA_AVAILABILITY_MODE)] = F("all");
+    doc[FPSTR(HA_ENABLED_BY_DEFAULT)] = enabledByDefault;
+    doc[FPSTR(HA_UNIQUE_ID)] = this->getObjectId(F("exhaust_temp"));
+    doc[FPSTR(HA_OBJECT_ID)] = this->getObjectId(F("exhaust_temp"));
+    doc[FPSTR(HA_ENTITY_CATEGORY)] = F("diagnostic");
+    doc[FPSTR(HA_DEVICE_CLASS)] = F("temperature");
+    doc[FPSTR(HA_STATE_CLASS)] = F("measurement");

-  bool publishClimateHeating(byte minTemp = 20, byte maxTemp = 90, byte currentTempSource = HaHelper::TEMP_SOURCE_HEATING, bool enabledByDefault = true) {
+    if (unit == UnitSystem::METRIC) {
+      doc[FPSTR(HA_UNIT_OF_MEASUREMENT)] = FPSTR(HA_UNIT_OF_MEASUREMENT_C);
+      
+    } else if (unit == UnitSystem::IMPERIAL) {
+      doc[FPSTR(HA_UNIT_OF_MEASUREMENT)] = FPSTR(HA_UNIT_OF_MEASUREMENT_F);
+    }
+
+    doc[FPSTR(HA_NAME)] = F("Exhaust temperature");
+    doc[FPSTR(HA_ICON)] = F("mdi:smoke");
+    doc[FPSTR(HA_STATE_TOPIC)] = this->getDeviceTopic(F("state"));
+    doc[FPSTR(HA_VALUE_TEMPLATE)] = F("{{ value_json.temperatures.exhaust|float(0)|round(2) }}");
+    doc[FPSTR(HA_EXPIRE_AFTER)] = 120;
+    doc.shrinkToFit();
+
+    return this->publish(this->getTopic(FPSTR(HA_ENTITY_SENSOR), F("exhaust_temp")).c_str(), doc);
+  }
+
+
+  bool publishClimateHeating(UnitSystem unit = UnitSystem::METRIC, byte minTemp = 20, byte maxTemp = 90, byte currentTempSource = HaHelper::TEMP_SOURCE_HEATING, bool enabledByDefault = true) {
    JsonDocument doc;
    doc[FPSTR(HA_AVAILABILITY)][FPSTR(HA_TOPIC)] = this->getDeviceTopic(F("status"));
    doc[FPSTR(HA_ENABLED_BY_DEFAULT)] = enabledByDefault;
@@ -1186,6 +1282,13 @@ public:
    doc[FPSTR(HA_TEMPERATURE_STATE_TOPIC)] = this->getDeviceTopic(F("settings"));
    doc[FPSTR(HA_TEMPERATURE_STATE_TEMPLATE)] = F("{{ value_json.heating.target|float(0)|round(1) }}");

+    if (unit == UnitSystem::METRIC) {
+      doc[FPSTR(HA_TEMPERATURE_UNIT)] = "C";
+      
+    } else if (unit == UnitSystem::IMPERIAL) {
+      doc[FPSTR(HA_TEMPERATURE_UNIT)] = "F";
+    }
+
    doc[FPSTR(HA_MODE_COMMAND_TOPIC)] = this->getDeviceTopic(F("settings/set"));
    doc[FPSTR(HA_MODE_COMMAND_TEMPLATE)] = F("{% if value == 'heat' %}{\"heating\": {\"enable\" : true}}"
      "{% elif value == 'off' %}{\"heating\": {\"enable\" : false}}{% endif %}");
@@ -1206,14 +1309,14 @@ public:

    doc[FPSTR(HA_MIN_TEMP)] = minTemp;
    doc[FPSTR(HA_MAX_TEMP)] = maxTemp;
-    doc[FPSTR(HA_TEMP_STEP)] = 0.5;
+    doc[FPSTR(HA_TEMP_STEP)] = 0.5f;
    doc[FPSTR(HA_EXPIRE_AFTER)] = 120;
    doc.shrinkToFit();

    return this->publish(this->getTopic(FPSTR(HA_ENTITY_CLIMATE), F("heating"), '_').c_str(), doc);
  }

-  bool publishClimateDhw(byte minTemp = 40, byte maxTemp = 60, bool enabledByDefault = true) {
+  bool publishClimateDhw(UnitSystem unit = UnitSystem::METRIC, byte minTemp = 40, byte maxTemp = 60, bool enabledByDefault = true) {
    JsonDocument doc;
    doc[FPSTR(HA_AVAILABILITY)][FPSTR(HA_TOPIC)] = this->getDeviceTopic(F("status"));
    doc[FPSTR(HA_ENABLED_BY_DEFAULT)] = enabledByDefault;
@@ -1229,7 +1332,14 @@ public:
    doc[FPSTR(HA_TEMPERATURE_COMMAND_TEMPLATE)] = F("{\"dhw\": {\"target\" : {{ value|int(0) }}}}");

    doc[FPSTR(HA_TEMPERATURE_STATE_TOPIC)] = this->getDeviceTopic(F("settings"));
-    doc[FPSTR(HA_TEMPERATURE_STATE_TEMPLATE)] = F("{{ value_json.dhw.target|int(0) }}");
+    doc[FPSTR(HA_TEMPERATURE_STATE_TEMPLATE)] = F("{{ value_json.dhw.target|float(0)|round(1) }}");
+
+    if (unit == UnitSystem::METRIC) {
+      doc[FPSTR(HA_TEMPERATURE_UNIT)] = "C";
+      
+    } else if (unit == UnitSystem::IMPERIAL) {
+      doc[FPSTR(HA_TEMPERATURE_UNIT)] = "F";
+    }

    doc[FPSTR(HA_MODE_COMMAND_TOPIC)] = this->getDeviceTopic(F("settings/set"));
    doc[FPSTR(HA_MODE_COMMAND_TEMPLATE)] = F("{% if value == 'heat' %}{\"dhw\": {\"enable\" : true}}"
--- a/src/MainTask.h
+++ b/src/MainTask.h
@@ -1,6 +1,8 @@
 #include <Blinker.h>

-extern Network::Manager* network;
+using namespace NetworkUtils;
+
+extern NetworkMgr* network;
 extern MqttTask* tMqtt;
 extern OpenThermTask* tOt;
 extern FileData fsSettings, fsNetworkSettings;
@@ -27,7 +29,6 @@ protected:
  enum class PumpStartReason {NONE, HEATING, ANTISTUCK};

  Blinker* blinker = nullptr;
-  bool blinkerInitialized = false;
  unsigned long firstFailConnect = 0;
  unsigned long lastHeapInfo = 0;
  unsigned int minFreeHeap = 0;
@@ -39,29 +40,21 @@ protected:
  unsigned long externalPumpStartTime = 0;
  bool telnetStarted = false;

-  const char* getTaskName() {
+  #if defined(ARDUINO_ARCH_ESP32)
+  const char* getTaskName() override {
    return "Main";
  }

-  /*int getTaskCore() {
+  /*BaseType_t getTaskCore() override {
    return 1;
  }*/

-  int getTaskPriority() {
+  int getTaskPriority() override {
    return 3;
  }
+  #endif

-  void setup() {
-    #ifdef LED_STATUS_PIN
-      pinMode(LED_STATUS_PIN, OUTPUT);
-      digitalWrite(LED_STATUS_PIN, LOW);
-    #endif
-
-    if (settings.externalPump.pin != 0) {
-      pinMode(settings.externalPump.pin, OUTPUT);
-      digitalWrite(settings.externalPump.pin, LOW);
-    }
-  }
+  void setup() {}

  void loop() {
    network->loop();
@@ -89,20 +82,31 @@ protected:
      Log.sinfoln(FPSTR(L_MAIN), F("Restart signal received. Restart after 10 sec."));
    }

-    if (!tOt->isEnabled() && settings.opentherm.inPin > 0 && settings.opentherm.outPin > 0 && settings.opentherm.inPin != settings.opentherm.outPin) {
-      tOt->enable();
+    vars.states.mqtt = tMqtt->isConnected();
+    vars.sensors.rssi = network->isConnected() ? WiFi.RSSI() : 0;
+
+    if (vars.states.emergency && !settings.emergency.enable) {
+      vars.states.emergency = false;
    }

    if (network->isConnected()) {
-      vars.sensors.rssi = WiFi.RSSI();
-
      if (!this->telnetStarted && telnetStream != nullptr) {
        telnetStream->begin(23, false);
        this->telnetStarted = true;
      }

-      if (!tMqtt->isEnabled() && strlen(settings.mqtt.server) > 0) {
+      if (settings.mqtt.enable && !tMqtt->isEnabled()) {
        tMqtt->enable();
+
+      } else if (!settings.mqtt.enable && tMqtt->isEnabled()) {
+        tMqtt->disable();
+      }
+
+      if (!vars.states.emergency && settings.emergency.enable && settings.emergency.onMqttFault && !tMqtt->isEnabled()) {
+        vars.states.emergency = true;
+
+      } else if (vars.states.emergency && !settings.emergency.onMqttFault) {
+        vars.states.emergency = false;
      }

      if (this->firstFailConnect != 0) {
@@ -126,12 +130,12 @@ protected:
        tMqtt->disable();
      }

-      if (settings.emergency.enable && !vars.states.emergency) {
+      if (!vars.states.emergency && settings.emergency.enable && settings.emergency.onNetworkFault) {
        if (this->firstFailConnect == 0) {
          this->firstFailConnect = millis();
        }

-        if (millis() - this->firstFailConnect > EMERGENCY_TIME_TRESHOLD) {
+        if (millis() - this->firstFailConnect > (settings.emergency.tresholdTime * 1000)) {
          vars.states.emergency = true;
          Log.sinfoln(FPSTR(L_MAIN), F("Emergency mode enabled"));
        }
@@ -140,9 +144,7 @@ protected:
    this->yield();


-    #ifdef LED_STATUS_PIN
-      this->ledStatus(LED_STATUS_PIN);
-    #endif
+    this->ledStatus();
    this->externalPump();
    this->yield();

@@ -211,16 +213,32 @@ protected:
    }
  }

-  void ledStatus(uint8_t ledPin) {
+  void ledStatus() {
    uint8_t errors[4];
    uint8_t errCount = 0;
    static uint8_t errPos = 0;
    static unsigned long endBlinkTime = 0;
    static bool ledOn = false;
+    static uint8_t configuredGpio = GPIO_IS_NOT_CONFIGURED;

-    if (!this->blinkerInitialized) {
-      this->blinker->init(ledPin);
-      this->blinkerInitialized = true;
+    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 (configuredGpio == GPIO_IS_NOT_CONFIGURED) {
+      return;
    }

    if (!network->isConnected()) {
@@ -247,14 +265,14 @@ protected:
    if (!this->blinker->running() && millis() - endBlinkTime >= 5000) {
      if (errCount == 0) {
        if (!ledOn) {
-          digitalWrite(ledPin, HIGH);
+          digitalWrite(configuredGpio, HIGH);
          ledOn = true;
        }

        return;

      } else if (ledOn) {
-        digitalWrite(ledPin, LOW);
+        digitalWrite(configuredGpio, LOW);
        ledOn = false;
        endBlinkTime = millis();
        return;
@@ -275,6 +293,34 @@ protected:
  }

  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.states.externalPump) {
+        vars.states.externalPump = false;
+        vars.parameters.extPumpLastEnableTime = millis();
+
+        Log.sinfoln("EXTPUMP", F("Disabled: use = off"));
+      }
+
+      return;
+    }
+
    if (!vars.states.heating && this->heatingEnabled) {
      this->heatingEnabled = false;
      this->heatingDisabledTime = millis();
@@ -283,11 +329,9 @@ protected:
      this->heatingEnabled = true;
    }
    
-    if (!settings.externalPump.use || settings.externalPump.pin == 0) {
+    if (!settings.externalPump.use) {
      if (vars.states.externalPump) {
-        if (settings.externalPump.pin != 0) {
-          digitalWrite(settings.externalPump.pin, LOW);
-        }
+        digitalWrite(configuredGpio, LOW);

        vars.states.externalPump = false;
        vars.parameters.extPumpLastEnableTime = millis();
@@ -300,7 +344,7 @@ protected:

    if (vars.states.externalPump && !this->heatingEnabled) {
      if (this->extPumpStartReason == MainTask::PumpStartReason::HEATING && millis() - this->heatingDisabledTime > (settings.externalPump.postCirculationTime * 1000u)) {
-        digitalWrite(settings.externalPump.pin, LOW);
+        digitalWrite(configuredGpio, LOW);

        vars.states.externalPump = false;
        vars.parameters.extPumpLastEnableTime = millis();
@@ -308,7 +352,7 @@ protected:
        Log.sinfoln("EXTPUMP", F("Disabled: expired post circulation time"));

      } else if (this->extPumpStartReason == MainTask::PumpStartReason::ANTISTUCK && millis() - this->externalPumpStartTime >= (settings.externalPump.antiStuckTime * 1000u)) {
-        digitalWrite(settings.externalPump.pin, LOW);
+        digitalWrite(configuredGpio, LOW);

        vars.states.externalPump = false;
        vars.parameters.extPumpLastEnableTime = millis();
@@ -324,7 +368,7 @@ protected:
      this->externalPumpStartTime = millis();
      this->extPumpStartReason = MainTask::PumpStartReason::HEATING;

-      digitalWrite(settings.externalPump.pin, HIGH);
+      digitalWrite(configuredGpio, HIGH);

      Log.sinfoln("EXTPUMP", F("Enabled: heating on"));

@@ -333,7 +377,7 @@ protected:
      this->externalPumpStartTime = millis();
      this->extPumpStartReason = MainTask::PumpStartReason::ANTISTUCK;

-      digitalWrite(settings.externalPump.pin, HIGH);
+      digitalWrite(configuredGpio, HIGH);

      Log.sinfoln("EXTPUMP", F("Enabled: anti stuck"));
    }
--- a/src/MqttTask.h
+++ b/src/MqttTask.h
@@ -20,6 +20,11 @@ public:
    if (this->client != nullptr) {
      if (this->client->connected()) {
        this->client->stop();
+
+        if (this->connected) {
+          this->onDisconnect();
+          this->connected = false;
+        }
      }

      delete this->client;
@@ -31,6 +36,12 @@ public:

  void disable() {
    this->client->stop();
+
+    if (this->connected) {
+      this->onDisconnect();
+      this->connected = false;
+    }
+    
    Task::disable();

    Log.sinfoln(FPSTR(L_MQTT), F("Disabled"));
@@ -42,15 +53,25 @@ public:
    Log.sinfoln(FPSTR(L_MQTT), F("Enabled"));
  }

-  bool isConnected() {
+  inline bool isConnected() {
    return this->connected;
  }

+  inline void resetPublishedSettingsTime() {
+    this->prevPubSettingsTime = 0;
+  }
+
+  inline void resetPublishedVarsTime() {
+    this->prevPubVarsTime = 0;
+  }
+
 protected:
  MqttWiFiClient* wifiClient = nullptr;
  MqttClient* client = nullptr;
  HaHelper* haHelper = nullptr;
  MqttWriter* writer = nullptr;
+  UnitSystem currentUnitSystem = UnitSystem::METRIC;
+  bool currentHomeAssistantDiscovery = false;
  unsigned short readyForSendTime = 15000;
  unsigned long lastReconnectTime = 0;
  unsigned long connectedTime = 0;
@@ -60,19 +81,21 @@ protected:
  bool connected = false;
  bool newConnection = false;

-  const char* getTaskName() {
+  #if defined(ARDUINO_ARCH_ESP32)
+  const char* getTaskName() override {
    return "Mqtt";
  }
  
-  /*int getTaskCore() {
+  /*BaseType_t getTaskCore() override {
    return 1;
  }*/

-  int getTaskPriority() {
-    return 1;
+  int getTaskPriority() override {
+    return 2;
  }
+  #endif

-  bool isReadyForSend() {
+  inline bool isReadyForSend() {
    return millis() - this->connectedTime > this->readyForSendTime;
  }

@@ -140,7 +163,7 @@ protected:

    // ha helper settings
    this->haHelper->setDevicePrefix(settings.mqtt.prefix);
-    this->haHelper->setDeviceVersion(PROJECT_VERSION);
+    this->haHelper->setDeviceVersion(BUILD_VERSION);
    this->haHelper->setDeviceModel(PROJECT_NAME);
    this->haHelper->setDeviceName(PROJECT_NAME);
    this->haHelper->setWriter(this->writer);
@@ -175,13 +198,15 @@ protected:
      this->onConnect();
    }

-    if (!this->connected && settings.emergency.enable && !vars.states.emergency && millis() - this->disconnectedTime > EMERGENCY_TIME_TRESHOLD) {
-      vars.states.emergency = true;
-      Log.sinfoln(FPSTR(L_MQTT), F("Emergency mode enabled"));
+    if (settings.emergency.enable && settings.emergency.onMqttFault) {
+      if (!this->connected && !vars.states.emergency && millis() - this->disconnectedTime > (settings.emergency.tresholdTime * 1000)) {
+        vars.states.emergency = true;
+        Log.sinfoln(FPSTR(L_MQTT), F("Emergency mode enabled"));

-    } else if (this->connected && vars.states.emergency && millis() - this->connectedTime > 10000) {
-      vars.states.emergency = false;
-      Log.sinfoln(FPSTR(L_MQTT), F("Emergency mode disabled"));
+      } else if (this->connected && vars.states.emergency && millis() - this->connectedTime > 10000) {
+        vars.states.emergency = false;
+        Log.sinfoln(FPSTR(L_MQTT), F("Emergency mode disabled"));
+      }
    }

    if (!this->connected) {
@@ -213,14 +238,24 @@ protected:
    }

    // publish ha entities if not published
-    if (this->newConnection) {
-      this->publishHaEntities();
-      this->publishNonStaticHaEntities(true);
-      this->newConnection = false;
+    if (settings.mqtt.homeAssistantDiscovery) {
+      if (this->newConnection || !this->currentHomeAssistantDiscovery || this->currentUnitSystem != settings.system.unitSystem) {
+        this->publishHaEntities();
+        this->publishNonStaticHaEntities(true);
+        this->currentHomeAssistantDiscovery = true;
+        this->currentUnitSystem = settings.system.unitSystem;

-    } else {
-      // publish non static ha entities
-      this->publishNonStaticHaEntities();
+      } else {
+        // publish non static ha entities
+        this->publishNonStaticHaEntities();
+      }
+
+    } else if (this->currentHomeAssistantDiscovery) {
+      this->currentHomeAssistantDiscovery = false;
+    }
+
+    if (this->newConnection) {
+      this->newConnection = false;
    }
  }

@@ -276,61 +311,35 @@ protected:
      Log.swarningln(FPSTR(L_MQTT_MSG), F("Not valid json"));
      return;
    }
+    doc.shrinkToFit();

    if (this->haHelper->getDeviceTopic("state/set").equals(topic)) {
      this->writer->publish(this->haHelper->getDeviceTopic("state/set").c_str(), nullptr, 0, true);
-      this->updateVariables(doc);
+      
+      if (jsonToVars(doc, vars)) {
+        this->resetPublishedVarsTime();
+      }

    } else if (this->haHelper->getDeviceTopic("settings/set").equals(topic)) {
      this->writer->publish(this->haHelper->getDeviceTopic("settings/set").c_str(), nullptr, 0, true);
-      this->updateSettings(doc);
+      
+      if (safeJsonToSettings(doc, settings)) {
+        this->resetPublishedSettingsTime();
+        fsSettings.update();
+      }
    }
  }

-
-  bool updateSettings(JsonDocument& doc) {
-    bool changed = safeJsonToSettings(doc, settings);
-    doc.clear();
-    doc.shrinkToFit();
-
-    if (changed) {
-      this->prevPubSettingsTime = 0;
-      fsSettings.update();
-      return true;
-    }
-
-    return false;
-  }
-
-  bool updateVariables(JsonDocument& doc) {
-    bool changed = jsonToVars(doc, vars);
-    doc.clear();
-    doc.shrinkToFit();
-
-    if (changed) {
-      this->prevPubVarsTime = 0;
-      return true;
-    }
-
-    return false;
-  }
-
  void publishHaEntities() {
-    // emergency
-    this->haHelper->publishSwitchEmergency();
-    this->haHelper->publishNumberEmergencyTarget();
-    this->haHelper->publishSwitchEmergencyUseEquitherm();
-    this->haHelper->publishSwitchEmergencyUsePid();
-
    // heating
    this->haHelper->publishSwitchHeating(false);
    this->haHelper->publishSwitchHeatingTurbo();
-    this->haHelper->publishNumberHeatingHysteresis();
-    this->haHelper->publishSensorHeatingSetpoint(false);
-    this->haHelper->publishSensorBoilerHeatingMinTemp(false);
-    this->haHelper->publishSensorBoilerHeatingMaxTemp(false);
-    this->haHelper->publishNumberHeatingMinTemp(false);
-    this->haHelper->publishNumberHeatingMaxTemp(false);
+    this->haHelper->publishNumberHeatingHysteresis(settings.system.unitSystem);
+    this->haHelper->publishSensorHeatingSetpoint(settings.system.unitSystem, false);
+    this->haHelper->publishSensorBoilerHeatingMinTemp(settings.system.unitSystem, false);
+    this->haHelper->publishSensorBoilerHeatingMaxTemp(settings.system.unitSystem, false);
+    this->haHelper->publishNumberHeatingMinTemp(settings.system.unitSystem, false);
+    this->haHelper->publishNumberHeatingMaxTemp(settings.system.unitSystem, false);
    this->haHelper->publishNumberHeatingMaxModulation(false);

    // pid
@@ -339,8 +348,8 @@ protected:
    this->haHelper->publishNumberPidFactorI();
    this->haHelper->publishNumberPidFactorD();
    this->haHelper->publishNumberPidDt(false);
-    this->haHelper->publishNumberPidMinTemp(false);
-    this->haHelper->publishNumberPidMaxTemp(false);
+    this->haHelper->publishNumberPidMinTemp(settings.system.unitSystem, false);
+    this->haHelper->publishNumberPidMaxTemp(settings.system.unitSystem, false);

    // equitherm
    this->haHelper->publishSwitchEquitherm();
@@ -348,10 +357,6 @@ protected:
    this->haHelper->publishNumberEquithermFactorK();
    this->haHelper->publishNumberEquithermFactorT();

-    // tuning
-    this->haHelper->publishSwitchTuning();
-    this->haHelper->publishSelectTuningRegulator();
-
    // states
    this->haHelper->publishBinSensorStatus();
    this->haHelper->publishBinSensorOtStatus();
@@ -362,14 +367,16 @@ protected:

    // sensors
    this->haHelper->publishSensorModulation(false);
-    this->haHelper->publishSensorPressure(false);
+    this->haHelper->publishSensorPressure(settings.system.unitSystem, false);
    this->haHelper->publishSensorFaultCode();
    this->haHelper->publishSensorRssi(false);
    this->haHelper->publishSensorUptime(false);

    // temperatures
-    this->haHelper->publishNumberIndoorTemp();
-    this->haHelper->publishSensorHeatingTemp();
+    this->haHelper->publishNumberIndoorTemp(settings.system.unitSystem);
+    this->haHelper->publishSensorHeatingTemp(settings.system.unitSystem);
+    this->haHelper->publishSensorHeatingReturnTemp(settings.system.unitSystem, false);
+    this->haHelper->publishSensorExhaustTemp(settings.system.unitSystem, false);

    // buttons
    this->haHelper->publishButtonRestart(false);
@@ -379,27 +386,36 @@ protected:

  bool publishNonStaticHaEntities(bool force = false) {
    static byte _heatingMinTemp, _heatingMaxTemp, _dhwMinTemp, _dhwMaxTemp = 0;
-    static bool _isStupidMode, _editableOutdoorTemp, _editableIndoorTemp, _dhwPresent = false;
+    static bool _noRegulators, _editableOutdoorTemp, _editableIndoorTemp, _dhwPresent = false;

    bool published = false;
-    bool isStupidMode = !settings.pid.enable && !settings.equitherm.enable;
-    byte heatingMinTemp = isStupidMode ? settings.heating.minTemp : 10;
-    byte heatingMaxTemp = isStupidMode ? settings.heating.maxTemp : 30;
-    bool editableOutdoorTemp = settings.sensors.outdoor.type == 1;
-    bool editableIndoorTemp = settings.sensors.indoor.type == 1;
+    bool noRegulators = !settings.opentherm.nativeHeatingControl && !settings.pid.enable && !settings.equitherm.enable;
+    byte heatingMinTemp = 0;
+    byte heatingMaxTemp = 0;
+    bool editableOutdoorTemp = settings.sensors.outdoor.type == SensorType::MANUAL;
+    bool editableIndoorTemp = settings.sensors.indoor.type == SensorType::MANUAL;
+
+    if (noRegulators) {
+      heatingMinTemp = settings.heating.minTemp;
+      heatingMaxTemp = settings.heating.maxTemp;
+
+    } else {
+      heatingMinTemp = convertTemp(THERMOSTAT_INDOOR_MIN_TEMP, UnitSystem::METRIC, settings.system.unitSystem);
+      heatingMaxTemp = convertTemp(THERMOSTAT_INDOOR_MAX_TEMP, UnitSystem::METRIC, settings.system.unitSystem);
+    }

    if (force || _dhwPresent != settings.opentherm.dhwPresent) {
      _dhwPresent = settings.opentherm.dhwPresent;

      if (_dhwPresent) {
        this->haHelper->publishSwitchDhw(false);
-        this->haHelper->publishSensorBoilerDhwMinTemp(false);
-        this->haHelper->publishSensorBoilerDhwMaxTemp(false);
-        this->haHelper->publishNumberDhwMinTemp(false);
-        this->haHelper->publishNumberDhwMaxTemp(false);
+        this->haHelper->publishSensorBoilerDhwMinTemp(settings.system.unitSystem, false);
+        this->haHelper->publishSensorBoilerDhwMaxTemp(settings.system.unitSystem, false);
+        this->haHelper->publishNumberDhwMinTemp(settings.system.unitSystem, false);
+        this->haHelper->publishNumberDhwMaxTemp(settings.system.unitSystem, false);
        this->haHelper->publishBinSensorDhw();
-        this->haHelper->publishSensorDhwTemp();
-        this->haHelper->publishSensorDhwFlowRate(false);
+        this->haHelper->publishSensorDhwTemp(settings.system.unitSystem);
+        this->haHelper->publishSensorDhwFlowRate(settings.system.unitSystem, false);

      } else {
        this->haHelper->deleteSwitchDhw();
@@ -417,30 +433,17 @@ protected:
      published = true;
    }

-    if (force || _heatingMinTemp != heatingMinTemp || _heatingMaxTemp != heatingMaxTemp) {
-      if (settings.heating.target < heatingMinTemp || settings.heating.target > heatingMaxTemp) {
-        settings.heating.target = constrain(settings.heating.target, heatingMinTemp, heatingMaxTemp);
-      }
-
+    if (force || _noRegulators != noRegulators || _heatingMinTemp != heatingMinTemp || _heatingMaxTemp != heatingMaxTemp) {
      _heatingMinTemp = heatingMinTemp;
      _heatingMaxTemp = heatingMaxTemp;
-      _isStupidMode = isStupidMode;
+      _noRegulators = noRegulators;

-      this->haHelper->publishNumberHeatingTarget(heatingMinTemp, heatingMaxTemp, false);
+      this->haHelper->publishNumberHeatingTarget(settings.system.unitSystem, heatingMinTemp, heatingMaxTemp, false);
      this->haHelper->publishClimateHeating(
+        settings.system.unitSystem,
        heatingMinTemp,
        heatingMaxTemp,
-        isStupidMode ? HaHelper::TEMP_SOURCE_HEATING : HaHelper::TEMP_SOURCE_INDOOR
-      );
-
-      published = true;
-
-    } else if (_isStupidMode != isStupidMode) {
-      _isStupidMode = isStupidMode;
-      this->haHelper->publishClimateHeating(
-        heatingMinTemp,
-        heatingMaxTemp,
-        isStupidMode ? HaHelper::TEMP_SOURCE_HEATING : HaHelper::TEMP_SOURCE_INDOOR
+        noRegulators ? HaHelper::TEMP_SOURCE_HEATING : HaHelper::TEMP_SOURCE_INDOOR
      );

      published = true;
@@ -450,8 +453,8 @@ protected:
      _dhwMinTemp = settings.dhw.minTemp;
      _dhwMaxTemp = settings.dhw.maxTemp;

-      this->haHelper->publishNumberDhwTarget(settings.dhw.minTemp, settings.dhw.maxTemp, false);
-      this->haHelper->publishClimateDhw(settings.dhw.minTemp, settings.dhw.maxTemp);
+      this->haHelper->publishNumberDhwTarget(settings.system.unitSystem, settings.dhw.minTemp, settings.dhw.maxTemp, false);
+      this->haHelper->publishClimateDhw(settings.system.unitSystem, settings.dhw.minTemp, settings.dhw.maxTemp);

      published = true;
    }
@@ -461,10 +464,10 @@ protected:

      if (editableOutdoorTemp) {
        this->haHelper->deleteSensorOutdoorTemp();
-        this->haHelper->publishNumberOutdoorTemp();
+        this->haHelper->publishNumberOutdoorTemp(settings.system.unitSystem);
      } else {
        this->haHelper->deleteNumberOutdoorTemp();
-        this->haHelper->publishSensorOutdoorTemp();
+        this->haHelper->publishSensorOutdoorTemp(settings.system.unitSystem);
      }

      published = true;
@@ -475,10 +478,10 @@ protected:

      if (editableIndoorTemp) {
        this->haHelper->deleteSensorIndoorTemp();
-        this->haHelper->publishNumberIndoorTemp();
+        this->haHelper->publishNumberIndoorTemp(settings.system.unitSystem);
      } else {
        this->haHelper->deleteNumberIndoorTemp();
-        this->haHelper->publishSensorIndoorTemp();
+        this->haHelper->publishSensorIndoorTemp(settings.system.unitSystem);
      }

      published = true;
--- a/src/OpenThermTask.h
+++ b/src/OpenThermTask.h
--- a/src/PortalTask.h
+++ b/src/PortalTask.h
@@ -14,7 +14,9 @@ using WebServer = ESP8266WebServer;
 #include <UpgradeHandler.h>
 #include <DNSServer.h>

-extern Network::Manager* network;
+using namespace NetworkUtils;
+
+extern NetworkMgr* network;
 extern FileData fsSettings, fsNetworkSettings;
 extern MqttTask* tMqtt;

@@ -53,17 +55,19 @@ protected:
  unsigned long webServerChangeState = 0;
  unsigned long dnsServerChangeState = 0;

-  const char* getTaskName() {
+  #if defined(ARDUINO_ARCH_ESP32)
+  const char* getTaskName() override {
    return "Portal";
  }

-  /*int getTaskCore() {
+  /*BaseType_t getTaskCore() override {
    return 1;
  }*/

-  int getTaskPriority() {
-    return 0;
+  int getTaskPriority() override {
+    return 1;
  }
+  #endif

  void setup() {
    this->dnsServer->setTTL(0);
@@ -73,22 +77,34 @@ protected:
    #endif

    // index page
-    /*auto indexPage = (new DynamicPage("/", &LittleFS, "/index.html"))
+    /*auto indexPage = (new DynamicPage("/", &LittleFS, "/pages/index.html"))
      ->setTemplateCallback([](const char* var) -> String {
        String result;

        if (strcmp(var, "ver") == 0) {
-          result = PROJECT_VERSION;
+          result = BUILD_VERSION;
        }

        return result;
      });
    this->webServer->addHandler(indexPage);*/
-    this->webServer->addHandler(new StaticPage("/", &LittleFS, "/index.html", PORTAL_CACHE));
+    this->webServer->addHandler(new StaticPage("/", &LittleFS, "/pages/index.html", PORTAL_CACHE));
+
+    // dashboard page
+    auto dashboardPage = (new StaticPage("/dashboard.html", &LittleFS, "/pages/dashboard.html", PORTAL_CACHE))
+      ->setBeforeSendCallback([this]() {
+        if (this->isAuthRequired() && !this->webServer->authenticate(settings.portal.login, settings.portal.password)) {
+          this->webServer->requestAuthentication(DIGEST_AUTH);
+          return false;
+        }
+
+        return true;
+      });
+    this->webServer->addHandler(dashboardPage);

    // restart
    this->webServer->on("/restart.html", HTTP_GET, [this]() {
-      if (this->isNeedAuth()) {
+      if (this->isAuthRequired()) {
        if (!this->webServer->authenticate(settings.portal.login, settings.portal.password)) {
          this->webServer->send(401);
          return;
@@ -101,9 +117,9 @@ protected:
    });

    // network settings page
-    auto networkPage = (new StaticPage("/network.html", &LittleFS, "/network.html", PORTAL_CACHE))
+    auto networkPage = (new StaticPage("/network.html", &LittleFS, "/pages/network.html", PORTAL_CACHE))
      ->setBeforeSendCallback([this]() {
-        if (this->isNeedAuth() && !this->webServer->authenticate(settings.portal.login, settings.portal.password)) {
+        if (this->isAuthRequired() && !this->webServer->authenticate(settings.portal.login, settings.portal.password)) {
          this->webServer->requestAuthentication(DIGEST_AUTH);
          return false;
        }
@@ -113,9 +129,9 @@ protected:
    this->webServer->addHandler(networkPage);

    // settings page
-    auto settingsPage = (new StaticPage("/settings.html", &LittleFS, "/settings.html", PORTAL_CACHE))
+    auto settingsPage = (new StaticPage("/settings.html", &LittleFS, "/pages/settings.html", PORTAL_CACHE))
      ->setBeforeSendCallback([this]() {
-        if (this->isNeedAuth() && !this->webServer->authenticate(settings.portal.login, settings.portal.password)) {
+        if (this->isAuthRequired() && !this->webServer->authenticate(settings.portal.login, settings.portal.password)) {
          this->webServer->requestAuthentication(DIGEST_AUTH);
          return false;
        }
@@ -125,9 +141,9 @@ protected:
    this->webServer->addHandler(settingsPage);

    // upgrade page
-    auto upgradePage = (new StaticPage("/upgrade.html", &LittleFS, "/upgrade.html", PORTAL_CACHE))
+    auto upgradePage = (new StaticPage("/upgrade.html", &LittleFS, "/pages/upgrade.html", PORTAL_CACHE))
      ->setBeforeSendCallback([this]() {
-        if (this->isNeedAuth() && !this->webServer->authenticate(settings.portal.login, settings.portal.password)) {
+        if (this->isAuthRequired() && !this->webServer->authenticate(settings.portal.login, settings.portal.password)) {
          this->webServer->requestAuthentication(DIGEST_AUTH);
          return false;
        }
@@ -138,7 +154,7 @@ protected:

    // OTA
    auto upgradeHandler = (new UpgradeHandler("/api/upgrade"))->setCanUploadCallback([this](const String& uri) {
-      if (this->isNeedAuth() && !this->webServer->authenticate(settings.portal.login, settings.portal.password)) {
+      if (this->isAuthRequired() && !this->webServer->authenticate(settings.portal.login, settings.portal.password)) {
        this->webServer->sendHeader("Connection", "close");
        this->webServer->send(401);
        return false;
@@ -172,7 +188,7 @@ protected:

    // backup
    this->webServer->on("/api/backup/save", HTTP_GET, [this]() {
-      if (this->isNeedAuth()) {
+      if (this->isAuthRequired()) {
        if (!this->webServer->authenticate(settings.portal.login, settings.portal.password)) {
          return this->webServer->send(401);
        }
@@ -196,7 +212,7 @@ protected:
    });

    this->webServer->on("/api/backup/restore", HTTP_POST, [this]() {
-      if (this->isNeedAuth()) {
+      if (this->isAuthRequired()) {
        if (!this->webServer->authenticate(settings.portal.login, settings.portal.password)) {
          return this->webServer->send(401);
        }
@@ -234,6 +250,7 @@ protected:
        fsNetworkSettings.update();
        network->setHostname(networkSettings.hostname)
          ->setStaCredentials(networkSettings.sta.ssid, networkSettings.sta.password, networkSettings.sta.channel)
+          ->setApCredentials(networkSettings.ap.ssid, networkSettings.ap.password, networkSettings.ap.channel)
          ->setUseDhcp(networkSettings.useDhcp)
          ->setStaticConfig(
            networkSettings.staticConfig.ip,
@@ -253,7 +270,7 @@ protected:

    // network
    this->webServer->on("/api/network/settings", HTTP_GET, [this]() {
-      if (this->isNeedAuth()) {
+      if (this->isAuthRequired()) {
        if (!this->webServer->authenticate(settings.portal.login, settings.portal.password)) {
          return this->webServer->send(401);
        }
@@ -267,7 +284,7 @@ protected:
    });

    this->webServer->on("/api/network/settings", HTTP_POST, [this]() {
-      if (this->isNeedAuth()) {
+      if (this->isAuthRequired()) {
        if (!this->webServer->authenticate(settings.portal.login, settings.portal.password)) {
          return this->webServer->send(401);
        }
@@ -298,12 +315,19 @@ protected:
      doc.clear();
      doc.shrinkToFit();

+      networkSettingsToJson(networkSettings, doc);
+      doc.shrinkToFit();
+      
+      this->bufferedWebServer->send(changed ? 201 : 200, "application/json", doc);
+
      if (changed) {
-        this->webServer->send(201);
+        doc.clear();
+        doc.shrinkToFit();

        fsNetworkSettings.update();
        network->setHostname(networkSettings.hostname)
          ->setStaCredentials(networkSettings.sta.ssid, networkSettings.sta.password, networkSettings.sta.channel)
+          ->setApCredentials(networkSettings.ap.ssid, networkSettings.ap.password, networkSettings.ap.channel)
          ->setUseDhcp(networkSettings.useDhcp)
          ->setStaticConfig(
            networkSettings.staticConfig.ip,
@@ -312,33 +336,11 @@ protected:
            networkSettings.staticConfig.dns
          )
          ->reconnect();
-
-      } else {
-        this->webServer->send(200);
      }
    });

-    this->webServer->on("/api/network/status", HTTP_GET, [this]() {
-      bool isConnected = network->isConnected();
-
-      JsonDocument doc;
-      doc["hostname"] = networkSettings.hostname;
-      doc["mac"] = network->getStaMac();
-      doc["isConnected"] = isConnected;
-      doc["ssid"] = network->getStaSsid();
-      doc["signalQuality"] = isConnected ? Network::Manager::rssiToSignalQuality(network->getRssi()) : 0;
-      doc["channel"] = isConnected ? network->getStaChannel() : 0;
-      doc["ip"] = isConnected ? network->getStaIp().toString() : "";
-      doc["subnet"] = isConnected ? network->getStaSubnet().toString() : "";
-      doc["gateway"] = isConnected ? network->getStaGateway().toString() : "";
-      doc["dns"] = isConnected ? network->getStaDns().toString() : "";
-      doc.shrinkToFit();
-
-      this->bufferedWebServer->send(200, "application/json", doc);
-    });
-
    this->webServer->on("/api/network/scan", HTTP_GET, [this]() {
-      if (this->isNeedAuth()) {
+      if (this->isAuthRequired()) {
        if (!this->webServer->authenticate(settings.portal.login, settings.portal.password)) {
          this->webServer->send(401);
          return;
@@ -348,7 +350,11 @@ protected:
      auto apCount = WiFi.scanComplete();
      if (apCount <= 0) {
        if (apCount != WIFI_SCAN_RUNNING) {
+          #ifdef ARDUINO_ARCH_ESP8266
          WiFi.scanNetworks(true, true);
+          #else
+          WiFi.scanNetworks(true, true, true);
+          #endif
        }
        
        this->webServer->send(404);
@@ -359,10 +365,16 @@ protected:
      for (short int i = 0; i < apCount; i++) {
        String ssid = WiFi.SSID(i);
        doc[i]["ssid"] = ssid;
-        doc[i]["signalQuality"] = Network::Manager::rssiToSignalQuality(WiFi.RSSI(i));
+        doc[i]["bssid"] = WiFi.BSSIDstr(i);
+        doc[i]["signalQuality"] = NetworkMgr::rssiToSignalQuality(WiFi.RSSI(i));
        doc[i]["channel"] = WiFi.channel(i);
        doc[i]["hidden"] = !ssid.length();
-        doc[i]["encryptionType"] = WiFi.encryptionType(i);
+        #ifdef ARDUINO_ARCH_ESP8266
+        const bss_info* info = WiFi.getScanInfoByIndex(i);
+        doc[i]["auth"] = info->authmode;
+        #else
+        doc[i]["auth"] = WiFi.encryptionType(i);
+        #endif
      }
      doc.shrinkToFit();

@@ -374,7 +386,7 @@ protected:

    // settings
    this->webServer->on("/api/settings", HTTP_GET, [this]() {
-      if (this->isNeedAuth()) {
+      if (this->isAuthRequired()) {
        if (!this->webServer->authenticate(settings.portal.login, settings.portal.password)) {
          return this->webServer->send(401);
        }
@@ -388,7 +400,7 @@ protected:
    });

    this->webServer->on("/api/settings", HTTP_POST, [this]() {
-      if (this->isNeedAuth()) {
+      if (this->isAuthRequired()) {
        if (!this->webServer->authenticate(settings.portal.login, settings.portal.password)) {
          return this->webServer->send(401);
        }
@@ -419,12 +431,17 @@ protected:
      doc.clear();
      doc.shrinkToFit();

-      if (changed) {
-        fsSettings.update();
-        this->webServer->send(201);
+      settingsToJson(settings, doc);
+      doc.shrinkToFit();

-      } else {
-        this->webServer->send(200);
+      this->bufferedWebServer->send(changed ? 201 : 200, "application/json", doc);
+
+      if (changed) {
+        doc.clear();
+        doc.shrinkToFit();
+
+        fsSettings.update();
+        tMqtt->resetPublishedSettingsTime();
      }
    });

@@ -433,24 +450,13 @@ protected:
    this->webServer->on("/api/vars", HTTP_GET, [this]() {
      JsonDocument doc;
      varsToJson(vars, doc);
-
-      doc["system"]["version"] = PROJECT_VERSION;
-      doc["system"]["buildDate"] = __DATE__ " " __TIME__;
-      doc["system"]["uptime"] = millis() / 1000ul;
-      doc["system"]["totalHeap"] = getTotalHeap();
-      doc["system"]["freeHeap"] = getFreeHeap();
-      doc["system"]["minFreeHeap"] = getFreeHeap(true);
-      doc["system"]["maxFreeBlockHeap"] = getMaxFreeBlockHeap();
-      doc["system"]["minMaxFreeBlockHeap"] = getMaxFreeBlockHeap(true);
-      doc["system"]["resetReason"] = getResetReason();
-      doc["system"]["mqttConnected"] = tMqtt->isConnected();
      doc.shrinkToFit();

      this->bufferedWebServer->send(200, "application/json", doc);
    });

    this->webServer->on("/api/vars", HTTP_POST, [this]() {
-      if (this->isNeedAuth()) {
+      if (this->isAuthRequired()) {
        if (!this->webServer->authenticate(settings.portal.login, settings.portal.password)) {
          return this->webServer->send(401);
        }
@@ -481,14 +487,77 @@ protected:
      doc.clear();
      doc.shrinkToFit();

-      if (changed) {
-        this->webServer->send(201);
+      varsToJson(vars, doc);
+      doc.shrinkToFit();
      
-      } else {
-        this->webServer->send(200);
+      this->bufferedWebServer->send(changed ? 201 : 200, "application/json", doc);
+
+      if (changed) {
+        doc.clear();
+        doc.shrinkToFit();
+        
+        tMqtt->resetPublishedVarsTime();
      }
    });

+    this->webServer->on("/api/info", HTTP_GET, [this]() {
+      bool isConnected = network->isConnected();
+
+      JsonDocument doc;
+      doc["network"]["hostname"] = networkSettings.hostname;
+      doc["network"]["mac"] = network->getStaMac();
+      doc["network"]["connected"] = isConnected;
+      doc["network"]["ssid"] = network->getStaSsid();
+      doc["network"]["signalQuality"] = isConnected ? NetworkMgr::rssiToSignalQuality(network->getRssi()) : 0;
+      doc["network"]["channel"] = isConnected ? network->getStaChannel() : 0;
+      doc["network"]["ip"] = isConnected ? network->getStaIp().toString() : "";
+      doc["network"]["subnet"] = isConnected ? network->getStaSubnet().toString() : "";
+      doc["network"]["gateway"] = isConnected ? network->getStaGateway().toString() : "";
+      doc["network"]["dns"] = isConnected ? network->getStaDns().toString() : "";
+
+      doc["system"]["buildVersion"] = BUILD_VERSION;
+      doc["system"]["buildDate"] = __DATE__ " " __TIME__;
+      doc["system"]["buildEnv"] = BUILD_ENV;
+      doc["system"]["uptime"] = millis() / 1000ul;
+      doc["system"]["totalHeap"] = getTotalHeap();
+      doc["system"]["freeHeap"] = getFreeHeap();
+      doc["system"]["minFreeHeap"] = getFreeHeap(true);
+      doc["system"]["maxFreeBlockHeap"] = getMaxFreeBlockHeap();
+      doc["system"]["minMaxFreeBlockHeap"] = getMaxFreeBlockHeap(true);
+      doc["system"]["resetReason"] = getResetReason();
+      
+      #ifdef ARDUINO_ARCH_ESP8266
+      doc["system"]["chipModel"] = esp_is_8285() ? "ESP8285" : "ESP8266";
+      doc["system"]["chipRevision"] = 0;
+      doc["system"]["chipCores"] = 1;
+      doc["system"]["cpuFreq"] = ESP.getCpuFreqMHz();
+      doc["system"]["coreVersion"] = ESP.getCoreVersion();
+      doc["system"]["flashSize"] = ESP.getFlashChipSize();
+      doc["system"]["flashRealSize"] = ESP.getFlashChipRealSize();
+      #elif ARDUINO_ARCH_ESP32
+      doc["system"]["chipModel"] = ESP.getChipModel();
+      doc["system"]["chipRevision"] = ESP.getChipRevision();
+      doc["system"]["chipCores"] = ESP.getChipCores();
+      doc["system"]["cpuFreq"] = ESP.getCpuFreqMHz();
+      doc["system"]["coreVersion"] = ESP.getSdkVersion();
+      doc["system"]["flashSize"] = ESP.getFlashChipSize();
+      doc["system"]["flashRealSize"] = doc["system"]["flashSize"];
+      #else
+      doc["system"]["chipModel"] = 0;
+      doc["system"]["chipRevision"] = 0;
+      doc["system"]["chipCores"] = 0;
+      doc["system"]["cpuFreq"] = 0;
+      doc["system"]["coreVersion"] = 0;
+      doc["system"]["flashSize"] = 0;
+      doc["system"]["flashRealSize"] = 0;
+      #endif
+
+
+      doc.shrinkToFit();
+
+      this->bufferedWebServer->send(200, "application/json", doc);
+    });
+

    // not found
    this->webServer->onNotFound([this]() {
@@ -506,7 +575,7 @@ protected:
      }
    });

-    this->webServer->serveStatic("/favicon.ico", LittleFS, "/static/favicon.ico", PORTAL_CACHE);
+    this->webServer->serveStatic("/favicon.ico", LittleFS, "/static/images/favicon.ico", PORTAL_CACHE);
    this->webServer->serveStatic("/static", LittleFS, "/static", PORTAL_CACHE);
  }

@@ -557,10 +626,14 @@ protected:
    if (this->stateWebServer()) {
      this->webServer->handleClient();
    }
+
+    if (!this->stateDnsServer() && !this->stateWebServer()) {
+      this->delay(250);
+    }
  }

-  bool isNeedAuth() {
-    return !network->isApEnabled() && settings.portal.useAuth && strlen(settings.portal.password);
+  bool isAuthRequired() {
+    return !network->isApEnabled() && settings.portal.auth && strlen(settings.portal.password);
  }

  void onCaptivePortal() {
--- a/src/RegulatorTask.h
+++ b/src/RegulatorTask.h
@@ -1,10 +1,8 @@
 #include <Equitherm.h>
 #include <GyverPID.h>
-#include <PIDtuner.h>

 Equitherm etRegulator;
 GyverPID pidRegulator(0, 0, 0);
-PIDtuner pidTuner;


 class RegulatorTask : public LeanTask {
@@ -12,27 +10,26 @@ public:
  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;

-  const char* getTaskName() {
+  #if defined(ARDUINO_ARCH_ESP32)
+  const char* getTaskName() override {
    return "Regulator";
  }
  
-  /*int getTaskCore() {
+  /*BaseType_t getTaskCore() override {
    return 1;
  }*/

-  int getTaskPriority() {
+  int getTaskPriority() override {
    return 4;
  }
+  #endif
  
  void loop() {
-    byte newTemp = vars.parameters.heatingSetpoint;
+    float newTemp = vars.parameters.heatingSetpoint;

    if (vars.states.emergency) {
      if (settings.heating.turbo) {
@@ -41,74 +38,60 @@ protected:
        Log.sinfoln(FPSTR(L_REGULATOR), F("Turbo mode auto disabled"));
      }

-      newTemp = getEmergencyModeTemp();
+      newTemp = this->getEmergencyModeTemp();

    } else {
-      if (vars.tuning.enable || tunerInit) {
-        if (settings.heating.turbo) {
-          settings.heating.turbo = false;
+      if (settings.heating.turbo && (fabs(settings.heating.target - vars.temperatures.indoor) < 1 || !settings.heating.enable || (settings.equitherm.enable && settings.pid.enable))) {
+        settings.heating.turbo = false;

-          Log.sinfoln(FPSTR(L_REGULATOR), F("Turbo mode auto disabled"));
-        }
-
-        newTemp = getTuningModeTemp();
-
-        if (newTemp == 0) {
-          vars.tuning.enable = false;
-        }
+        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.heating.enable || (settings.equitherm.enable && settings.pid.enable))) {
-          settings.heating.turbo = false;
-
-          Log.sinfoln(FPSTR(L_REGULATOR), F("Turbo mode auto disabled"));
-        }
-
-        newTemp = getNormalModeTemp();
-      }
+      newTemp = this->getNormalModeTemp();
    }

-    // Ограничиваем, если до этого не ограничило
-    if (newTemp < settings.heating.minTemp || newTemp > settings.heating.maxTemp) {
-      newTemp = constrain(newTemp, settings.heating.minTemp, settings.heating.maxTemp);
-    }
+    // Limits
+    newTemp = constrain(
+      newTemp,
+      !settings.opentherm.nativeHeatingControl ? settings.heating.minTemp : THERMOSTAT_INDOOR_MIN_TEMP,
+      !settings.opentherm.nativeHeatingControl ? settings.heating.maxTemp : THERMOSTAT_INDOOR_MAX_TEMP
+    );

-    if (abs(vars.parameters.heatingSetpoint - newTemp) + 0.0001 >= 1) {
+    if (fabs(vars.parameters.heatingSetpoint - newTemp) > 0.4999f) {
      vars.parameters.heatingSetpoint = newTemp;
    }
  }


-  byte getEmergencyModeTemp() {
+  float getEmergencyModeTemp() {
    float newTemp = 0;

    // if use equitherm
-    if (settings.emergency.useEquitherm && settings.sensors.outdoor.type != 1) {
+    if (settings.emergency.useEquitherm) {
      float etResult = getEquithermTemp(settings.heating.minTemp, settings.heating.maxTemp);

-      if (fabs(prevEtResult - etResult) + 0.0001 >= 0.5) {
+      if (fabs(prevEtResult - etResult) > 0.4999f) {
        prevEtResult = etResult;
        newTemp += etResult;

-        Log.sinfoln(FPSTR(L_REGULATOR_EQUITHERM), F("New emergency result: %hhu (%.2f)"), (uint8_t) round(etResult), etResult);
+        Log.sinfoln(FPSTR(L_REGULATOR_EQUITHERM), F("New emergency result: %.2f"), etResult);

      } else {
        newTemp += prevEtResult;
      }

-    } else if(settings.emergency.usePid && settings.sensors.indoor.type != 1) {
+    } else if(settings.emergency.usePid) {
      if (vars.parameters.heatingEnabled) {
        float pidResult = getPidTemp(
          settings.heating.minTemp,
          settings.heating.maxTemp
        );

-        if (fabs(prevPidResult - pidResult) + 0.0001 >= 0.5) {
+        if (fabs(prevPidResult - pidResult) > 0.4999f) {
          prevPidResult = pidResult;
          newTemp += pidResult;

-          Log.sinfoln(FPSTR(L_REGULATOR_PID), F("New emergency result: %hhu (%.2f)"), (uint8_t) round(pidResult), pidResult);
+          Log.sinfoln(FPSTR(L_REGULATOR_PID), F("New emergency result: %.2f"), pidResult);

        } else {
          newTemp += prevPidResult;
@@ -123,17 +106,17 @@ protected:
      newTemp = settings.emergency.target;
    }

-    return round(newTemp);
+    return newTemp;
  }

-  byte getNormalModeTemp() {
+  float getNormalModeTemp() {
    float newTemp = 0;

-    if (fabs(prevHeatingTarget - settings.heating.target) > 0.0001) {
+    if (fabs(prevHeatingTarget - settings.heating.target) > 0.0001f) {
      prevHeatingTarget = settings.heating.target;
      Log.sinfoln(FPSTR(L_REGULATOR), F("New target: %.2f"), settings.heating.target);

-      if (settings.equitherm.enable && settings.pid.enable) {
+      if (/*settings.equitherm.enable && */settings.pid.enable) {
        pidRegulator.integral = 0;
        Log.sinfoln(FPSTR(L_REGULATOR_PID), F("Integral sum has been reset"));
      }
@@ -143,11 +126,11 @@ protected:
    if (settings.equitherm.enable) {
      float etResult = getEquithermTemp(settings.heating.minTemp, settings.heating.maxTemp);

-      if (fabs(prevEtResult - etResult) + 0.0001 >= 0.5) {
+      if (fabs(prevEtResult - etResult) > 0.4999f) {
        prevEtResult = etResult;
        newTemp += etResult;

-        Log.sinfoln(FPSTR(L_REGULATOR_EQUITHERM), F("New result: %hhu (%.2f)"), (uint8_t) round(etResult), etResult);
+        Log.sinfoln(FPSTR(L_REGULATOR_EQUITHERM), F("New result: %.2f"), etResult);

      } else {
        newTemp += prevEtResult;
@@ -162,11 +145,12 @@ protected:
          settings.pid.maxTemp
        );

-        if (fabs(prevPidResult - pidResult) + 0.0001 >= 0.5) {
+        if (fabs(prevPidResult - pidResult) > 0.4999f) {
          prevPidResult = pidResult;
          newTemp += pidResult;

-          Log.sinfoln(FPSTR(L_REGULATOR_PID), F("New result: %hhd (%.2f)"), (int8_t) round(pidResult), 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;
@@ -174,6 +158,10 @@ protected:
      } else {
        newTemp += prevPidResult;
      }
+
+    } else if (fabs(pidRegulator.integral) > 0.0001f) {
+        pidRegulator.integral = 0;
+        Log.sinfoln(FPSTR(L_REGULATOR_PID), F("Integral sum has been reset"));
    }

    // default temp, manual mode
@@ -181,108 +169,46 @@ protected:
      newTemp = settings.heating.target;
    }

-    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;
-      Log.sinfoln("REGULATOR.TUNING", F("Stopped"));
-    }
-
-    if (!vars.tuning.enable) {
-      return 0;
-    }
-
-
-    if (vars.tuning.regulator == 0) {
-      // @TODO дописать
-      Log.sinfoln("REGULATOR.TUNING.EQUITHERM", F("Not implemented"));
-      return 0;
-
-    } else if (vars.tuning.regulator == 1) {
-      // PID tuner
-      float defaultTemp = settings.equitherm.enable
-        ? getEquithermTemp(settings.heating.minTemp, settings.heating.maxTemp)
-        : settings.heating.target;
-
-      if (tunerInit && pidTuner.getState() == 3) {
-        Log.sinfoln("REGULATOR.TUNING.PID", F("Finished"));
-        for (Stream* stream : Log.getStreams()) {
-          pidTuner.debugText(stream);
-        }
-
-        pidTuner.reset();
-        tunerInit = false;
-        tunerRegulator = 0;
-        tunerState = 0;
-
-        if (pidTuner.getAccuracy() < 90) {
-          Log.swarningln("REGULATOR.TUNING.PID", F("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) {
-        Log.sinfoln("REGULATOR.TUNING.PID", F("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;
-        Log.sinfoln("REGULATOR.TUNING.PID", F("Started. Start value: %f, step: %f"), 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) {
-        Log.sinfoln("REGULATOR.TUNING.PID", F("Log:"));
-        for (Stream* stream : Log.getStreams()) {
-          pidTuner.debugText(stream);
-        }
-        
-        tunerState = pidTuner.getState();
-      }
-
-      return round(defaultTemp + pidTuner.getOutput());
-
-    } else {
-      return 0;
-    }
-  }
-
+  /**
+   * @brief Get the Equitherm Temp
+   * Calculations in degrees C, conversion occurs when using F
+   * 
+   * @param minTemp 
+   * @param maxTemp 
+   * @return float 
+   */
  float getEquithermTemp(int minTemp, int maxTemp) {
+    float targetTemp = vars.states.emergency ? settings.emergency.target : settings.heating.target;
+    float indoorTemp = vars.temperatures.indoor;
+    float outdoorTemp = vars.temperatures.outdoor;
+
+    if (settings.system.unitSystem == UnitSystem::IMPERIAL) {
+      minTemp = f2c(minTemp);
+      maxTemp = f2c(maxTemp);
+      targetTemp = f2c(targetTemp);
+      indoorTemp = f2c(indoorTemp);
+      outdoorTemp = f2c(outdoorTemp);
+    }
+
    if (vars.states.emergency) {
-      etRegulator.Kt = 0;
-      etRegulator.indoorTemp = 0;
-      etRegulator.outdoorTemp = vars.temperatures.outdoor;
+      if (settings.sensors.indoor.type == SensorType::MANUAL) {
+        etRegulator.Kt = 0;
+        etRegulator.indoorTemp = 0;
+
+      } else {
+        etRegulator.Kt = settings.equitherm.t_factor;
+        etRegulator.indoorTemp = indoorTemp;
+      }
+      
+      etRegulator.outdoorTemp = outdoorTemp;

    } else if (settings.pid.enable) {
      etRegulator.Kt = 0;
-      etRegulator.indoorTemp = round(vars.temperatures.indoor);
-      etRegulator.outdoorTemp = round(vars.temperatures.outdoor);
+      etRegulator.indoorTemp = round(indoorTemp);
+      etRegulator.outdoorTemp = round(outdoorTemp);

    } else {
      if (settings.heating.turbo) {
@@ -290,23 +216,41 @@ protected:
      } else {
        etRegulator.Kt = settings.equitherm.t_factor;
      }
-      etRegulator.indoorTemp = vars.temperatures.indoor;
-      etRegulator.outdoorTemp = vars.temperatures.outdoor;
+      etRegulator.indoorTemp = indoorTemp;
+      etRegulator.outdoorTemp = outdoorTemp;
    }

    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;
+    etRegulator.targetTemp = targetTemp;
+    float result = etRegulator.getResult();

-    return etRegulator.getResult();
+    if (settings.system.unitSystem == UnitSystem::IMPERIAL) {
+      result = c2f(result);
+    }
+
+    return result;
  }

  float getPidTemp(int minTemp, int maxTemp) {
-    pidRegulator.Kp = settings.pid.p_factor;
-    pidRegulator.Ki = settings.pid.i_factor;
-    pidRegulator.Kd = settings.pid.d_factor;
+    if (fabs(pidRegulator.Kp - settings.pid.p_factor) >= 0.0001f) {
+      pidRegulator.Kp = settings.pid.p_factor;
+      pidRegulator.integral = 0;
+      Log.sinfoln(FPSTR(L_REGULATOR_PID), F("Integral sum has been reset"));
+    }
+
+    if (fabs(pidRegulator.Ki - settings.pid.i_factor) >= 0.0001f) {
+      pidRegulator.Ki = settings.pid.i_factor;
+      pidRegulator.integral = 0;
+      Log.sinfoln(FPSTR(L_REGULATOR_PID), F("Integral sum has been reset"));
+    }
+
+    if (fabs(pidRegulator.Kd - settings.pid.d_factor) >= 0.0001f) {
+      pidRegulator.Kd = settings.pid.d_factor;
+      pidRegulator.integral = 0;
+      Log.sinfoln(FPSTR(L_REGULATOR_PID), F("Integral sum has been reset"));
+    }

    pidRegulator.setLimits(minTemp, maxTemp);
    pidRegulator.setDt(settings.pid.dt * 1000u);
@@ -315,32 +259,4 @@ protected:

    return pidRegulator.getResultTimer();
  }
-
-  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;
-  }
-
 };
--- a/src/SensorsTask.h
+++ b/src/SensorsTask.h
@@ -32,67 +32,95 @@ protected:
  DallasTemperature* indoorSensor = nullptr;

  bool initOutdoorSensor = false;
+  unsigned long initOutdoorSensorTime = 0;
  unsigned long startOutdoorConversionTime = 0;
  float filteredOutdoorTemp = 0;
  bool emptyOutdoorTemp = true;
  
  bool initIndoorSensor = false;
+  unsigned long initIndoorSensorTime = 0;
  unsigned long startIndoorConversionTime = 0;
  float filteredIndoorTemp = 0;
  bool emptyIndoorTemp = true;

-#if USE_BLE
+  #if defined(ARDUINO_ARCH_ESP32)
+  #if USE_BLE
  BLEClient* pBleClient = nullptr;
  bool initBleSensor = false;
  bool initBleNotify = false;
-#endif
+  #endif

-  const char* getTaskName() {
+  const char* getTaskName() override {
    return "Sensors";
  }

-  /*int getTaskCore() {
-    return 1;
-  }*/
+  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() {
+  int getTaskPriority() override {
    return 4;
  }
+  #endif

  void loop() {
-    bool needUpdateIndoorTemp = false;
-    bool needUpdateOutdoorTemp = false;
+    bool indoorTempUpdated = false;
+    bool outdoorTempUpdated = false;

-    if (settings.sensors.outdoor.type == 2 && settings.sensors.outdoor.pin) {
+    if (settings.sensors.outdoor.type == SensorType::DS18B20 && GPIO_IS_VALID(settings.sensors.outdoor.gpio)) {
      outdoorTemperatureSensor();
-      needUpdateOutdoorTemp = true;
+      outdoorTempUpdated = true;
    }

-    if (settings.sensors.indoor.type == 2 && settings.sensors.indoor.pin) {
+    if (settings.sensors.indoor.type == SensorType::DS18B20 && GPIO_IS_VALID(settings.sensors.indoor.gpio)) {
      indoorTemperatureSensor();
-      needUpdateIndoorTemp = true;
+      indoorTempUpdated = true;
+    }
+    #if USE_BLE
+    else if (settings.sensors.indoor.type == SensorType::BLUETOOTH) {
+      indoorTemperatureBluetoothSensor();
+      indoorTempUpdated = true;
+    }
+    #endif
+
+    if (outdoorTempUpdated) {
+      float newTemp = settings.sensors.outdoor.offset;
+      if (settings.system.unitSystem == UnitSystem::METRIC) {
+        newTemp += this->filteredOutdoorTemp;
+
+      } else if (settings.system.unitSystem == UnitSystem::IMPERIAL) {
+        newTemp += c2f(this->filteredOutdoorTemp);
+      }
+
+      if (fabs(vars.temperatures.outdoor - newTemp) > 0.099f) {
+        vars.temperatures.outdoor = newTemp;
+        Log.sinfoln(FPSTR(L_SENSORS_OUTDOOR), F("New temp: %f"), vars.temperatures.outdoor);
+      }
    }

-#if USE_BLE
-    if (settings.sensors.indoor.type == 3) {
-      bluetoothSensor();
-      needUpdateIndoorTemp = true;
-    }
-#endif
+    if (indoorTempUpdated) {
+      float newTemp = settings.sensors.indoor.offset;
+      if (settings.system.unitSystem == UnitSystem::METRIC) {
+        newTemp += this->filteredIndoorTemp;

-    if (needUpdateOutdoorTemp && fabs(vars.temperatures.outdoor - this->filteredOutdoorTemp) > 0.099) {
-      vars.temperatures.outdoor = this->filteredOutdoorTemp + settings.sensors.outdoor.offset;
-      Log.sinfoln(FPSTR(L_SENSORS_OUTDOOR), F("New temp: %f"), vars.temperatures.outdoor);
-    }
+      } else if (settings.system.unitSystem == UnitSystem::IMPERIAL) {
+        newTemp += c2f(this->filteredIndoorTemp);
+      }

-    if (needUpdateIndoorTemp && fabs(vars.temperatures.indoor - this->filteredIndoorTemp) > 0.099) {
-      vars.temperatures.indoor = this->filteredIndoorTemp + settings.sensors.indoor.offset;
-      Log.sinfoln(FPSTR(L_SENSORS_INDOOR), F("New temp: %f"), vars.temperatures.indoor);
+      if (fabs(vars.temperatures.indoor - newTemp) > 0.099f) {
+        vars.temperatures.indoor = newTemp;
+        Log.sinfoln(FPSTR(L_SENSORS_INDOOR), F("New temp: %f"), vars.temperatures.indoor);
+      }
    }
  }

 #if USE_BLE
-  void bluetoothSensor() {
+  void indoorTemperatureBluetoothSensor() {
    static bool initBleNotify = false;
    if (!initBleSensor && millis() > 5000) {
      Log.sinfoln(FPSTR(L_SENSORS_BLE), F("Init BLE"));
@@ -112,7 +140,7 @@ protected:
    this->initBleNotify = false;

    // Connect to the remote BLE Server.
-    BLEAddress bleServerAddress(settings.sensors.indoor.bleAddresss);
+    BLEAddress bleServerAddress(settings.sensors.indoor.bleAddress);
    if (!pBleClient->connect(bleServerAddress)) {
      Log.swarningln(FPSTR(L_SENSORS_BLE), "Failed connecting to device at %s", bleServerAddress.toString().c_str());
      return;
@@ -142,7 +170,7 @@ protected:
            return;
          }

-          float rawTemp = ((pData[0] | (pData[1] << 8)) * 0.01);
+          float rawTemp = ((pData[0] | (pData[1] << 8)) * 0.01f);
          Log.straceln(FPSTR(L_SENSORS_INDOOR), F("Raw temp: %f"), rawTemp);

          if (this->emptyIndoorTemp) {
@@ -210,10 +238,16 @@ protected:

  void outdoorTemperatureSensor() {
    if (!this->initOutdoorSensor) {
-      Log.sinfoln(FPSTR(L_SENSORS_OUTDOOR), F("Starting on gpio %hhu..."), settings.sensors.outdoor.pin);
+      if (this->initOutdoorSensorTime && millis() - this->initOutdoorSensorTime < EXT_SENSORS_INTERVAL * 10) {
+        return;
+      }

-      this->oneWireOutdoorSensor->begin(settings.sensors.outdoor.pin);
+      Log.sinfoln(FPSTR(L_SENSORS_OUTDOOR), F("Starting on GPIO %hhu..."), settings.sensors.outdoor.gpio);
+
+      this->oneWireOutdoorSensor->begin(settings.sensors.outdoor.gpio);
+      this->oneWireOutdoorSensor->reset();
      this->outdoorSensor->begin();
+      this->initOutdoorSensorTime = millis();

      Log.straceln(
        FPSTR(L_SENSORS_OUTDOOR),
@@ -276,10 +310,16 @@ protected:

  void indoorTemperatureSensor() {
    if (!this->initIndoorSensor) {
-      Log.sinfoln(FPSTR(L_SENSORS_INDOOR), F("Starting on gpio %hhu..."), settings.sensors.indoor.pin);
+      if (this->initIndoorSensorTime && millis() - this->initIndoorSensorTime < EXT_SENSORS_INTERVAL * 10) {
+        return;
+      }
      
-      this->oneWireIndoorSensor->begin(settings.sensors.indoor.pin);
+      Log.sinfoln(FPSTR(L_SENSORS_INDOOR), F("Starting on GPIO %hhu..."), settings.sensors.indoor.gpio);
+
+      this->oneWireIndoorSensor->begin(settings.sensors.indoor.gpio);
+      this->oneWireIndoorSensor->reset();
      this->indoorSensor->begin();
+      this->initIndoorSensorTime = millis();

      Log.straceln(
        FPSTR(L_SENSORS_INDOOR),
--- a/src/Settings.h
+++ b/src/Settings.h
@@ -1,5 +1,5 @@
 struct NetworkSettings {
-  char hostname[25] = HOSTNAME_DEFAULT;
+  char hostname[25] = DEFAULT_HOSTNAME;
  bool useDhcp = true;

  struct {
@@ -10,14 +10,14 @@ struct NetworkSettings {
  } staticConfig;

  struct {
-    char ssid[33] = AP_SSID_DEFAULT;
-    char password[65] = AP_PASSWORD_DEFAULT;
+    char ssid[33] = DEFAULT_AP_SSID;
+    char password[65] = DEFAULT_AP_PASSWORD;
    byte channel = 6;
  } ap;

  struct {
-    char ssid[33] = STA_SSID_DEFAULT;
-    char password[65] = STA_PASSWORD_DEFAULT;
+    char ssid[33] = DEFAULT_STA_SSID;
+    char password[65] = DEFAULT_STA_PASSWORD;
    byte channel = 0;
  } sta;
 } networkSettings;
@@ -25,19 +25,34 @@ struct NetworkSettings {
 struct Settings {
  struct {
    bool debug = DEBUG_BY_DEFAULT;
-    bool useSerial = USE_SERIAL;
-    bool useTelnet = USE_TELNET;
+
+    struct {
+      bool enable = USE_SERIAL;
+      unsigned int baudrate = 115200;
+    } serial;
+
+    struct {
+      bool enable = USE_TELNET;
+      unsigned short port = 23;
+    } telnet;
+
+    UnitSystem unitSystem = UnitSystem::METRIC;
+    byte statusLedGpio = DEFAULT_STATUS_LED_GPIO;
  } system;

  struct {
-    bool useAuth = false;
-    char login[13] = PORTAL_LOGIN_DEFAULT;
-    char password[33] = PORTAL_PASSWORD_DEFAULT;
+    bool auth = false;
+    char login[13] = DEFAULT_PORTAL_LOGIN;
+    char password[33] = DEFAULT_PORTAL_PASSWORD;
  } portal;

  struct {
-    byte inPin = OT_IN_PIN_DEFAULT;
-    byte outPin = OT_OUT_PIN_DEFAULT;
+    UnitSystem unitSystem = UnitSystem::METRIC;
+    byte inGpio = DEFAULT_OT_IN_GPIO;
+    byte outGpio = DEFAULT_OT_OUT_GPIO;
+    byte rxLedGpio = DEFAULT_OT_RX_LED_GPIO;
+    byte faultStateGpio = DEFAULT_OT_FAULT_STATE_GPIO;
+    byte invertFaultState = false;
    unsigned int memberIdCode = 0;
    bool dhwPresent = true;
    bool summerWinterMode = false;
@@ -46,28 +61,35 @@ struct Settings {
    bool dhwToCh2 = false;
    bool dhwBlocking = false;
    bool modulationSyncWithHeating = false;
+    bool getMinMaxTemp = true;
+    bool nativeHeatingControl = false;
  } opentherm;

  struct {
-    char server[81] = MQTT_SERVER_DEFAULT;
-    unsigned short port = MQTT_PORT_DEFAULT;
-    char user[33] = MQTT_USER_DEFAULT;
-    char password[33] = MQTT_PASSWORD_DEFAULT;
-    char prefix[33] = MQTT_PREFIX_DEFAULT;
+    bool enable = false;
+    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;
+    float target = DEFAULT_HEATING_TARGET_TEMP;
+    unsigned short tresholdTime = 120;
    bool useEquitherm = false;
    bool usePid = false;
+    bool onNetworkFault = true;
+    bool onMqttFault = true;
  } emergency;

  struct {
    bool enable = true;
    bool turbo = false;
-    float target = 40.0f;
+    float target = DEFAULT_HEATING_TARGET_TEMP;
    float hysteresis = 0.5f;
    byte minTemp = DEFAULT_HEATING_MIN_TEMP;
    byte maxTemp = DEFAULT_HEATING_MAX_TEMP;
@@ -76,16 +98,16 @@ struct Settings {

  struct {
    bool enable = true;
-    byte target = 40;
+    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 = 50;
-    float i_factor = 0.006f;
-    float d_factor = 10000;
+    float p_factor = 2;
+    float i_factor = 0.0055f;
+    float d_factor = 0;
    unsigned short dt = 180;
    byte minTemp = 0;
    byte maxTemp = DEFAULT_HEATING_MAX_TEMP;
@@ -100,24 +122,22 @@ struct Settings {

  struct {
    struct {
-      // 0 - boiler, 1 - manual, 2 - ds18b20
-      byte type = 0;
-      byte pin = SENSOR_OUTDOOR_PIN_DEFAULT;
+      SensorType type = SensorType::BOILER;
+      byte gpio = DEFAULT_SENSOR_OUTDOOR_GPIO;
      float offset = 0.0f;
    } outdoor;

    struct {
-      // 1 - manual, 2 - ds18b20, 3 - ble
-      byte type = 1;
-      byte pin = SENSOR_INDOOR_PIN_DEFAULT;
-      uint8_t bleAddresss[6] = {0x00, 0x00, 0x00, 0x00, 0x00, 0x00};
+      SensorType type = SensorType::MANUAL;
+      byte gpio = DEFAULT_SENSOR_INDOOR_GPIO;
+      uint8_t bleAddress[6] = {0x00, 0x00, 0x00, 0x00, 0x00, 0x00};
      float offset = 0.0f;
    } indoor;
  } sensors;

  struct {
    bool use = false;
-    byte pin = EXT_PUMP_PIN_DEFAULT;
+    byte gpio = DEFAULT_EXT_PUMP_GPIO;
    unsigned short postCirculationTime = 600;
    unsigned int antiStuckInterval = 2592000;
    unsigned short antiStuckTime = 300;
@@ -127,11 +147,6 @@ struct Settings {
 } settings;

 struct Variables {
-  struct {
-    bool enable = false;
-    byte regulator = 0;
-  } tuning;
-
  struct {
    bool otStatus = false;
    bool emergency = false;
@@ -141,6 +156,7 @@ struct Variables {
    bool fault = false;
    bool diagnostic = false;
    bool externalPump = false;
+    bool mqtt = false;
  } states;

  struct {
@@ -155,14 +171,16 @@ struct Variables {
    float indoor = 0.0f;
    float outdoor = 0.0f;
    float heating = 0.0f;
+    float heatingReturn = 0.0f;
    float dhw = 0.0f;
+    float exhaust = 0.0f;
  } temperatures;

  struct {
    bool heatingEnabled = false;
    byte heatingMinTemp = DEFAULT_HEATING_MIN_TEMP;
    byte heatingMaxTemp = DEFAULT_HEATING_MAX_TEMP;
-    byte heatingSetpoint = 0;
+    float heatingSetpoint = 0;
    unsigned long extPumpLastEnableTime = 0;
    byte dhwMinTemp = DEFAULT_DHW_MIN_TEMP;
    byte dhwMaxTemp = DEFAULT_DHW_MAX_TEMP;
--- a/src/defines.h
+++ b/src/defines.h
@@ -1,27 +1,33 @@
-#define PROJECT_NAME                "OpenTherm Gateway"
-#define PROJECT_VERSION             "1.4.0-rc.16"
-#define PROJECT_REPO                "https://github.com/Laxilef/OTGateway"
+#define PROJECT_NAME                    "OpenTherm Gateway"
+#define PROJECT_REPO                    "https://github.com/Laxilef/OTGateway"

-#define EMERGENCY_TIME_TRESHOLD     120000
-#define MQTT_RECONNECT_INTERVAL     15000
-#define MQTT_KEEPALIVE              30
+#define MQTT_RECONNECT_INTERVAL         15000

-#define OPENTHERM_OFFLINE_TRESHOLD  10
+#define EXT_SENSORS_INTERVAL            5000
+#define EXT_SENSORS_FILTER_K            0.15

-#define EXT_SENSORS_INTERVAL        5000
-#define EXT_SENSORS_FILTER_K        0.15
+#define CONFIG_URL                      "http://%s/"
+#define SETTINGS_VALID_VALUE            "stvalid" // only 8 chars!
+#define GPIO_IS_NOT_CONFIGURED          0xff

-#define CONFIG_URL                  "http://%s/"
-#define SETTINGS_VALID_VALUE        "stvalid" // only 8 chars!
+#define DEFAULT_HEATING_TARGET_TEMP     40
+#define DEFAULT_HEATING_MIN_TEMP        20
+#define DEFAULT_HEATING_MAX_TEMP        90

-#define DEFAULT_HEATING_MIN_TEMP    20
-#define DEFAULT_HEATING_MAX_TEMP    90
-#define DEFAULT_DHW_MIN_TEMP        30
-#define DEFAULT_DHW_MAX_TEMP        60
+#define DEFAULT_DHW_TARGET_TEMP         40
+#define DEFAULT_DHW_MIN_TEMP            30
+#define DEFAULT_DHW_MAX_TEMP            60

+#define THERMOSTAT_INDOOR_DEFAULT_TEMP  20
+#define THERMOSTAT_INDOOR_MIN_TEMP      5
+#define THERMOSTAT_INDOOR_MAX_TEMP      30

-#ifndef WM_DEBUG_MODE
-  #define WM_DEBUG_MODE WM_DEBUG_NOTIFY
+#ifndef BUILD_VERSION
+  #define BUILD_VERSION                 "0.0.0"
+#endif
+
+#ifndef BUILD_ENV
+  #define BUILD_ENV                     "undefined"
 #endif

 #ifndef USE_SERIAL
@@ -36,80 +42,112 @@
  #define USE_BLE false
 #endif

-#ifndef HOSTNAME_DEFAULT
-  #define HOSTNAME_DEFAULT "opentherm"
+#ifndef DEFAULT_HOSTNAME
+  #define DEFAULT_HOSTNAME "opentherm"
 #endif

-#ifndef AP_SSID_DEFAULT
-  #define AP_SSID_DEFAULT "OpenTherm Gateway"
+#ifndef DEFAULT_AP_SSID
+  #define DEFAULT_AP_SSID "OpenTherm Gateway"
 #endif

-#ifndef AP_PASSWORD_DEFAULT
-  #define AP_PASSWORD_DEFAULT "otgateway123456"
+#ifndef DEFAULT_AP_PASSWORD
+  #define DEFAULT_AP_PASSWORD "otgateway123456"
 #endif

-#ifndef STA_SSID_DEFAULT
-  #define STA_SSID_DEFAULT ""
+#ifndef DEFAULT_STA_SSID
+  #define DEFAULT_STA_SSID ""
 #endif

-#ifndef STA_PASSWORD_DEFAULT
-  #define STA_PASSWORD_DEFAULT ""
+#ifndef DEFAULT_STA_PASSWORD
+  #define DEFAULT_STA_PASSWORD ""
 #endif

 #ifndef DEBUG_BY_DEFAULT
  #define DEBUG_BY_DEFAULT false
 #endif

-#ifndef PORTAL_LOGIN_DEFAULT
-  #define PORTAL_LOGIN_DEFAULT ""
+#ifndef DEFAULT_STATUS_LED_GPIO
+  #define DEFAULT_STATUS_LED_GPIO GPIO_IS_NOT_CONFIGURED
 #endif

-#ifndef PORTAL_PASSWORD_DEFAULT
-  #define PORTAL_PASSWORD_DEFAULT ""
+#ifndef DEFAULT_PORTAL_LOGIN
+  #define DEFAULT_PORTAL_LOGIN ""
 #endif

-#ifndef MQTT_SERVER_DEFAULT
-  #define MQTT_SERVER_DEFAULT ""
+#ifndef DEFAULT_PORTAL_PASSWORD
+  #define DEFAULT_PORTAL_PASSWORD ""
 #endif

-#ifndef MQTT_PORT_DEFAULT
-  #define MQTT_PORT_DEFAULT 1883
+#ifndef DEFAULT_MQTT_SERVER
+  #define DEFAULT_MQTT_SERVER ""
 #endif

-#ifndef MQTT_USER_DEFAULT
-  #define MQTT_USER_DEFAULT ""
+#ifndef DEFAULT_MQTT_PORT
+  #define DEFAULT_MQTT_PORT 1883
 #endif

-#ifndef MQTT_PASSWORD_DEFAULT
-  #define MQTT_PASSWORD_DEFAULT ""
+#ifndef DEFAULT_MQTT_USER
+  #define DEFAULT_MQTT_USER ""
 #endif

-#ifndef MQTT_PREFIX_DEFAULT
-  #define MQTT_PREFIX_DEFAULT "opentherm"
+#ifndef DEFAULT_MQTT_PASSWORD
+  #define DEFAULT_MQTT_PASSWORD ""
 #endif

-#ifndef OT_IN_PIN_DEFAULT
-  #define OT_IN_PIN_DEFAULT 0
+#ifndef DEFAULT_MQTT_PREFIX
+  #define DEFAULT_MQTT_PREFIX "opentherm"
 #endif

-#ifndef OT_OUT_PIN_DEFAULT
-  #define OT_OUT_PIN_DEFAULT 0
+#ifndef DEFAULT_OT_IN_GPIO
+  #define DEFAULT_OT_IN_GPIO GPIO_IS_NOT_CONFIGURED
 #endif

-#ifndef SENSOR_OUTDOOR_PIN_DEFAULT
-  #define SENSOR_OUTDOOR_PIN_DEFAULT 0
+#ifndef DEFAULT_OT_OUT_GPIO
+  #define DEFAULT_OT_OUT_GPIO GPIO_IS_NOT_CONFIGURED
 #endif

-#ifndef SENSOR_INDOOR_PIN_DEFAULT
-  #define SENSOR_INDOOR_PIN_DEFAULT 0
+#ifndef DEFAULT_OT_RX_LED_GPIO
+  #define DEFAULT_OT_RX_LED_GPIO GPIO_IS_NOT_CONFIGURED
 #endif

-#ifndef EXT_PUMP_PIN_DEFAULT
-  #define EXT_PUMP_PIN_DEFAULT 0
+#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 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 <= 16)
+#endif
+
+#define GPIO_IS_VALID(gpioNum) (gpioNum != GPIO_IS_NOT_CONFIGURED && GPIO_IS_VALID_GPIO(gpioNum))
+
+enum class SensorType : byte {
+  BOILER,
+  MANUAL,
+  DS18B20,
+  BLUETOOTH
+};
+
+enum class UnitSystem : byte {
+  METRIC,
+  IMPERIAL
+};
+
 char buffer[255];
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -4,11 +4,11 @@
 #include <ArduinoJson.h>
 #include <FileData.h>
 #include <LittleFS.h>
-#include "ESPTelnetStream.h"
+#include <ESPTelnetStream.h>
 #include <TinyLogger.h>
-#include <NetworkManager.h>
+#include <NetworkMgr.h>
 #include "Settings.h"
-#include <utils.h>
+#include "utils.h"

 #if defined(ARDUINO_ARCH_ESP32)
  #include <ESP32Scheduler.h>
@@ -27,11 +27,13 @@
 #include "PortalTask.h"
 #include "MainTask.h"

+using namespace NetworkUtils;
+
 // Vars
 FileData fsNetworkSettings(&LittleFS, "/network.conf", 'n', &networkSettings, sizeof(networkSettings), 1000);
 FileData fsSettings(&LittleFS, "/settings.conf", 's', &settings, sizeof(settings), 60000);
 ESPTelnetStream* telnetStream = nullptr;
-Network::Manager* network = nullptr;
+NetworkMgr* network = nullptr;

 // Tasks
 MqttTask* tMqtt;
@@ -109,12 +111,19 @@ void setup() {
  }

  // logs
-  if (!settings.system.useSerial) {
-    Log.clearStreams();
+  if (!settings.system.serial.enable) {
    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.useTelnet) {
+  if (settings.system.telnet.enable) {
    telnetStream = new ESPTelnetStream;
    telnetStream->setKeepAliveInterval(500);
    Log.addStream(telnetStream);
@@ -123,7 +132,7 @@ void setup() {
  Log.setLevel(settings.system.debug ? TinyLogger::Level::VERBOSE : TinyLogger::Level::INFO);

  // network
-  network = (new Network::Manager)
+  network = (new NetworkMgr)
    ->setHostname(networkSettings.hostname)
    ->setStaCredentials(
    #ifdef WOKWI
@@ -137,13 +146,20 @@ void setup() {
      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
    );

  // tasks
  tMqtt = new MqttTask(false, 500);
  Scheduler.start(tMqtt);

-  tOt = new OpenThermTask(false, 750);
+  tOt = new OpenThermTask(true, 750);
  Scheduler.start(tOt);

  tSensors = new SensorsTask(true, EXT_SENSORS_INTERVAL);
--- a/src/utils.h
+++ b/src/utils.h
--- a/src_data/fonts/iconly.eot
+++ b/src_data/fonts/iconly.eot
--- a/src_data/fonts/iconly.svg
+++ b/src_data/fonts/iconly.svg
@@ -0,0 +1,78 @@
+<?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="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="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" />
+  </font>
+</defs>
+</svg>
--- a/src_data/fonts/iconly.ttf
+++ b/src_data/fonts/iconly.ttf
--- a/src_data/fonts/iconly.woff
+++ b/src_data/fonts/iconly.woff
--- a/src_data/fonts/iconly.woff2
+++ b/src_data/fonts/iconly.woff2
--- a/src_data/images/favicon.ico
+++ b/src_data/images/favicon.ico
--- a/src_data/locales/en.json
+++ b/src_data/locales/en.json
@@ -0,0 +1,331 @@
+{
+  "values": {
+    "logo": "OpenTherm Gateway",
+    "nav": {
+      "license": "License",
+      "source": "Source code",
+      "help": "Help",
+      "issues": "Issues & questions",
+      "releases": "Releases"
+    },
+
+    "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",
+          "sdk": "Core/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 and sensors",
+        "otDiag": "OpenTherm diagnostic"
+      },
+
+      "thermostat": {
+        "heating": "Heating",
+        "dhw": "DHW",
+        "temp.current": "Current",
+        "enable": "Enable",
+        "turbo": "Turbo mode"
+      },
+
+      "state": {
+        "ot": "OpenTherm connected",
+        "mqtt": "MQTT connected",
+        "emergency": "Emergency",
+        "heating": "Heating",
+        "dhw": "DHW",
+        "flame": "Flame",
+        "fault": "Fault",
+        "diag": "Diagnostic",
+        "extpump": "External pump",
+        "modulation": "Modulation",
+        "pressure": "Pressure",
+        "dhwFlowRate": "DHW flow rate",
+        "faultCode": "Fault code",
+        "indoorTemp": "Indoor temp",
+        "outdoorTemp": "Outdoor temp",
+        "heatingTemp": "Heating temp",
+        "heatingSetpointTemp": "Heating setpoint temp",
+        "heatingReturnTemp": "Heating return temp",
+        "dhwTemp": "DHW temp",
+        "exhaustTemp": "Exhaust temp"
+      }
+    },
+
+    "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"
+      }
+    },
+
+    "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",
+        "emergency.events": "Events",
+        "emergency.regulators": "Using regulators",
+        "equitherm": "Equitherm settings",
+        "pid": "PID settings",
+        "ot": "OpenTherm settings",
+        "ot.options": "Options",
+        "mqtt": "MQTT settings",
+        "outdorSensor": "Outdoor sensor settings",
+        "indoorSensor": "Indoor sensor settings",
+        "extPump": "External pump settings"
+      },
+
+      "enable": "Enable",
+      "note": {
+        "restart": "After changing these settings, the device must be restarted for the changes to take effect.",
+        "blankNotUse": "blank - not use"
+      },
+
+      "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",
+        "debug": "Debug mode",
+        "serial": {
+          "enable": "Enable Serial port",
+          "baud": {
+            "title": "Serial port baud rate",
+            "note": "Available: 9600, 19200, 38400, 57600, 74880, 115200"
+          }
+        },
+        "telnet": {
+          "enable": "Enable Telnet",
+          "port": {
+            "title": "Telnet port",
+            "note": "Default: 23"
+          }
+        }
+      },
+
+      "heating": {
+        "hyst": "Hysteresis",
+        "maxMod": "Max modulation level"
+      },
+
+      "emergency": {
+        "desc": "<b>!</b> Emergency mode can be useful <u>only</u> when using Equitherm and/or PID (when normal work) and when reporting indoor/outdoor temperature via MQTT or API. In this mode, sensor values that are reported via MQTT/API are not used.",
+        
+        "target": {
+          "title": "Target temperature",
+          "note": "<u>Indoor temperature</u> if Equitherm or PID is <b>enabled</b><br /><u>Heat carrier temperature</u> if Equitherm and PID <b>is disabled</b>"
+        },
+        "treshold": "Treshold time <small>(sec)</small>",
+
+        "events": {
+          "network": "On network fault",
+          "mqtt": "On MQTT fault"
+        },
+
+        "regulators": {
+          "equitherm": "Equitherm <small>(requires at least an external/boiler <u>outdoor</u> sensor)</small>",
+          "pid": "PID <small>(requires at least an external/BLE <u>indoor</u> sensor)</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>"
+      },
+
+      "ot": {
+        "inGpio": "In GPIO",
+        "outGpio": "Out GPIO",
+        "ledGpio": "RX LED GPIO",
+        "memberIdCode": "Master MemberID code",
+
+        "options": {
+          "dhwPresent": "DHW present",
+          "summerWinterMode": "Summer/winter mode",
+          "heatingCh2Enabled": "Heating CH2 always enabled",
+          "heatingCh1ToCh2": "Duplicate heating CH1 to CH2",
+          "dhwToCh2": "Duplicate DHW to CH2",
+          "dhwBlocking": "DHW blocking",
+          "modulationSyncWithHeating": "Sync modulation with heating",
+          "getMinMaxTemp": "Get min/max temp from boiler"
+        },
+
+        "faultState": {
+          "gpio": "Fault state GPIO",
+          "note": "Can be useful to switch on another boiler <u>via relay</u>. Blank - not use.",
+          "invert": "Invert fault state"
+        },
+
+        "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 and hysteresis in firmware."
+        }
+      },
+
+      "mqtt": {
+        "homeAssistantDiscovery": "Home Assistant Discovery",
+        "server": "Server",
+        "port": "Port",
+        "user": "User",
+        "password": "Password",
+        "prefix": "Prefix",
+        "interval": "Publish interval <small>(sec)</small>"
+      },
+
+      "tempSensor": {
+        "source": {
+          "type": "Source type",
+          "boiler": "From boiler via OpenTherm",
+          "manual": "Manual via MQTT/API",
+          "ext": "External (DS18B20)",
+          "ble": "BLE device <i>(ONLY for some ESP32 which support BLE)</i>"
+        },
+        "gpio": "GPIO",
+        "offset": "Temp offset <small>(calibration)</small>",
+        "bleAddress": {
+          "title": "BLE address",
+          "note": "ONLY for some ESP32 which support BLE"
+        }
+      },
+
+      "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>"
+      }
+    },
+
+    "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 10 seconds."
+      },
+
+      "settingsFile": "Settings file",
+      "fw": "Firmware",
+      "fs": "Filesystem"
+    }
+  }
+}
--- a/src_data/locales/ru.json
+++ b/src_data/locales/ru.json
@@ -0,0 +1,331 @@
+{
+  "values": {
+    "logo": "OpenTherm Gateway",
+    "nav": {
+      "license": "Лицензия",
+      "source": "Исходный код",
+      "help": "Помощь",
+      "issues": "Проблемы и вопросы",
+      "releases": "Релизы"
+    },
+
+    "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": "Дата",
+          "sdk": "Ядро/SDK"
+        },
+        "uptime": "Аптайм",
+        "memory": {
+          "title": "ОЗУ",
+          "maxFreeBlock": "макс. блок",
+          "min": "мин."
+        },
+        "board": "Плата",
+        "chip": {
+          "model": "Чип",
+          "cores": "Кол-во ядер",
+          "freq": "частота"
+        },
+        "flash": {
+          "size": "Размер ПЗУ",
+          "realSize": "реальный размер"
+        },
+        "lastResetReason": "Причина перезагрузки"
+      }
+    },
+
+    "dashboard": {
+      "name": "Дашборд",
+      "title": "Дашборд - OpenTherm Gateway",
+
+      "section": {
+        "control": "Управление",
+        "states": "Состояние и сенсоры",
+        "otDiag": "Диагностика OpenTherm"
+      },
+
+      "thermostat": {
+        "heating": "Отопление",
+        "dhw": "ГВС",
+        "temp.current": "Текущая",
+        "enable": "Вкл",
+        "turbo": "Турбо"
+      },
+
+      "state": {
+        "ot": "OpenTherm подключение",
+        "mqtt": "MQTT подключение",
+        "emergency": "Аварийный режим",
+        "heating": "Отопление",
+        "dhw": "ГВС",
+        "flame": "Пламя",
+        "fault": "Ошибка",
+        "diag": "Диагностика",
+        "extpump": "Внешний насос",
+        "modulation": "Уровень модуляции",
+        "pressure": "Давление",
+        "dhwFlowRate": "Расход ГВС",
+        "faultCode": "Код ошибки",
+        "indoorTemp": "Внутренняя темп.",
+        "outdoorTemp": "Наружная темп.",
+        "heatingTemp": "Темп. отопления",
+        "heatingSetpointTemp": "Уставка темп. отопления",
+        "heatingReturnTemp": "Темп. обратки отопления",
+        "dhwTemp": "Темп. ГВС",
+        "exhaustTemp": "Темп. выхлопных газов"
+      }
+    },
+
+    "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 для автоматического выбора"
+      }
+    },
+
+    "settings": {
+      "title": "Настройки - OpenTherm Gateway",
+      "name": "Настройки",
+
+      "section": {
+        "portal": "Настройки портала",
+        "system": "Системные настройки",
+        "diag": "Диагностика",
+        "heating": "Настройки отопления",
+        "dhw": "Настройки ГВС",
+        "emergency": "Настройки аварийного режима",
+        "emergency.events": "События",
+        "emergency.regulators": "Используемые регуляторы",
+        "equitherm": "Настройки ПЗА",
+        "pid": "Настройки ПИД",
+        "ot": "Настройки OpenTherm",
+        "ot.options": "Опции",
+        "mqtt": "Настройки MQTT",
+        "outdorSensor": "Настройки наружного датчика температуры",
+        "indoorSensor": "Настройки внутреннего датчика температуры",
+        "extPump": "Настройки дополнительного насоса"
+      },
+
+      "enable": "Вкл",
+      "note": {
+        "restart": "После изменения этих настроек устройство необходимо перезагрузить, чтобы изменения вступили в силу.",
+        "blankNotUse": "пусто - не использовать"
+      },
+
+      "temp": {
+        "min": "Мин. температура",
+        "max": "Макс. температура"
+      },
+
+      "portal": {
+        "login": "Логин",
+        "password": "Пароль",
+        "auth": "Требовать аутентификацию"
+      },
+
+      "system": {
+        "unit": "Система единиц",
+        "metric": "Метрическая <small>(цильсии, литры, бары)</small>",
+        "imperial": "Imperial <small>(фаренгейты, галлоны, psi)</small>",
+        "statusLedGpio": "Статус LED GPIO",
+        "debug": "Отладка",
+        "serial": {
+          "enable": "Вкл. Serial порт",
+          "baud": {
+            "title": "Скорость Serial порта",
+            "note": "Доступно: 9600, 19200, 38400, 57600, 74880, 115200"
+          }
+        },
+        "telnet": {
+          "enable": "Вкл. Telnet",
+          "port": {
+            "title": "Telnet порт",
+            "note": "По умолчанию: 23"
+          }
+        }
+      },
+
+      "heating": {
+        "hyst": "Гистерезис",
+        "maxMod": "Макс. уровень модуляции"
+      },
+
+      "emergency": {
+        "desc": "<b>!</b> Аварийный режим может быть полезен <u>только</u> при использовании ПЗА и/или ПИД и при передачи наружной/внутренней температуры через MQTT или API. В этом режиме значения датчиков, передаваемые через MQTT/API, не используются.",
+        
+        "target": {
+          "title": "Целевая температура",
+          "note": "Целевая <u>внутренняя температура</u> если ПЗА и/или ПИД <b>включены</b><br />Целевая <u>температура теплоносителя</u> если ПЗА и ПИД <b>выключены</b>"
+        },
+        "treshold": "Пороговое время включения <small>(сек)</small>",
+
+        "events": {
+          "network": "При отключении сети",
+          "mqtt": "При отключении MQTT"
+        },
+
+        "regulators": {
+          "equitherm": "ПЗА <small>(требуется внешний или подключенный к котлу датчик <u>наружной</u> температуры)</small>",
+          "pid": "ПИД <small>(требуется внешний/BLE датчик <u>внутренней</u> температуры)</small>"
+        }
+      },
+
+      "equitherm": {
+        "n": "Коэффициент N",
+        "k": "Коэффициент K",
+        "t": {
+          "title": "Коэффициент T",
+          "note": "Не используется, если ПИД включен"
+        }
+      },
+
+      "pid": {
+        "p": "Коэффициент P",
+        "i": "Коэффициент I",
+        "d": "Коэффициент D",
+        "dt": "DT <small>в секундах</small>"
+      },
+
+      "ot": {
+        "inGpio": "Вход GPIO",
+        "outGpio": "Выход GPIO",
+        "ledGpio": "RX LED GPIO",
+        "memberIdCode": "Master MemberID код",
+
+        "options": {
+          "dhwPresent": "Контур ГВС",
+          "summerWinterMode": "Летний/зимний режим",
+          "heatingCh2Enabled": "Канал 2 отопления всегда вкл.",
+          "heatingCh1ToCh2": "Дублировать параметры отопления канала 1 в канал 2",
+          "dhwToCh2": "Дублировать параметры ГВС в канал 2",
+          "dhwBlocking": "DHW blocking",
+          "modulationSyncWithHeating": "Синхронизировать модуляцию с отоплением",
+          "getMinMaxTemp": "Получать мин. и макс. температуру от котла"
+        },
+
+        "faultState": {
+          "gpio": "Fault state GPIO",
+          "note": "Can be useful to switch on another boiler <u>via relay</u>. Blank - not use.",
+          "invert": "Invert fault state"
+        },
+
+        "nativeHeating": {
+          "title": "Передать управление отоплением котлу",
+          "note": "Работает <u>ТОЛЬКО</u> если котел требует и принимает целевую температуру в помещении и сам регулирует температуру теплоносителя на основе встроенного режима кривых. Несовместимо с ПИД и ПЗА, а также с гистерезисом встроенного ПО."
+        }
+      },
+
+      "mqtt": {
+        "homeAssistantDiscovery": "Home Assistant Discovery",
+        "server": "Адрес сервера",
+        "port": "Порт",
+        "user": "Имя пользователя",
+        "password": "Пароль",
+        "prefix": "Префикс",
+        "interval": "Интервал публикации (в секундах)"
+      },
+
+      "tempSensor": {
+        "source": {
+          "type": "Источник данных",
+          "boiler": "От котла через OpenTherm",
+          "manual": "Вручную через MQTT/API",
+          "ext": "Внешний датчик (DS18B20)",
+          "ble": "BLE устройство <i>(ТОЛЬКО для некоторых плат ESP32 с поддержкой BLE)</i>"
+        },
+        "gpio": "GPIO",
+        "offset": "Смещение температуры <small>(калибровка)</small>",
+        "bleAddress": {
+          "title": "BLE адрес",
+          "note": "ТОЛЬКО для некоторых плат ESP32 с поддержкой BLE"
+        }
+      },
+
+      "extPump": {
+        "use": "Использовать доп. насос",
+        "gpio": "GPIO реле",
+        "postCirculationTime": "Время постциркуляции <small>(в минутах)</small>",
+        "antiStuckInterval": "Интервал защиты от блокировки <small>(в днях)</small>",
+        "antiStuckTime": "Время работы насоса <small>(в минутах)</small>"
+      }
+    },
+
+    "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": "После успешного обновления устройство автоматически перезагрузится через 10 секунд."
+      },
+
+      "settingsFile": "Файл настроек",
+      "fw": "Прошивка",
+      "fs": "Файловая система"
+    }
+  }
+}
--- a/src_data/pages/dashboard.html
+++ b/src_data/pages/dashboard.html
@@ -0,0 +1,425 @@
+<!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" />
+  </head>
+
+  <body>
+    <header class="container">
+      <nav>
+        <ul>
+          <li><a href="/">
+              <div class="logo" data-i18n>logo</div>
+            </a></li>
+        </ul>
+        <ul>
+          <!--<li><a href="https://github.com/Laxilef/OTGateway/wiki" role="button" class="secondary" target="_blank">Help</a></li>-->
+          <li>
+            <select id="lang" aria-label="Lang">
+              <option value="en" selected>EN</option>
+              <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="thermostat-heating-target"></span> <span class="temp-unit"></span></div>
+                  <div class="thermostat-temp-current"><span data-i18n>dashboard.thermostat.temp.current</span>: <span id="thermostat-heating-current"></span> <span class="temp-unit"></span></div>
+                </div>
+                <div class="thermostat-minus"><button id="thermostat-heating-minus" class="outline"><i class="icons-down"></i></button></div>
+                <div class="thermostat-plus"><button id="thermostat-heating-plus" class="outline"><i class="icons-up"></i></button></div>
+                <div class="thermostat-control">
+                  <input type="checkbox" role="switch" id="thermostat-heating-enabled" value="true">
+                  <label htmlFor="thermostat-heating-enabled" data-i18n>dashboard.thermostat.enable</label>
+
+                  <input type="checkbox" role="switch" id="thermostat-heating-turbo" value="true">
+                  <label htmlFor="thermostat-heating-turbo" 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="thermostat-dhw-target"></span> <span class="temp-unit"></span></div>
+                  <div class="thermostat-temp-current"><span data-i18n>dashboard.thermostat.temp.current</span>: <span id="thermostat-dhw-current"></span> <span class="temp-unit"></span></div>
+                </div>
+                <div class="thermostat-minus"><button class="outline" id="thermostat-dhw-minus"><i class="icons-down"></i></button></div>
+                <div class="thermostat-plus"><button class="outline" id="thermostat-dhw-plus"><i class="icons-up"></i></button></div>
+                <div class="thermostat-control">
+                  <input type="checkbox" role="switch" id="thermostat-dhw-enabled" value="true">
+                  <label htmlFor="thermostat-dhw-enabled" data-i18n>dashboard.thermostat.enable</label>
+                </div>
+              </div>
+            </div>
+          </details>
+
+          <hr />
+
+          <details>
+            <summary><b data-i18n>dashboard.section.states</b></summary>
+            <table>
+              <tbody>
+                <tr>
+                  <th scope="row" data-i18n>dashboard.state.ot</th>
+                  <td><input type="radio" id="ot-connected" aria-invalid="false" checked disabled /></td>
+                </tr>
+                <tr>
+                  <th scope="row" data-i18n>dashboard.state.mqtt</th>
+                  <td><input type="radio" id="mqtt-connected" aria-invalid="false" checked disabled /></td>
+                </tr>
+                <tr>
+                  <th scope="row" data-i18n>dashboard.state.emergency</th>
+                  <td><input type="radio" id="ot-emergency" aria-invalid="false" checked disabled /></td>
+                </tr>
+                <tr>
+                  <th scope="row" data-i18n>dashboard.state.heating</th>
+                  <td><input type="radio" id="ot-heating" aria-invalid="false" checked disabled /></td>
+                </tr>
+                <tr>
+                  <th scope="row" data-i18n>dashboard.state.dhw</th>
+                  <td><input type="radio" id="ot-dhw" aria-invalid="false" checked disabled /></td>
+                </tr>
+                <tr>
+                  <th scope="row" data-i18n>dashboard.state.flame</th>
+                  <td><input type="radio" id="ot-flame" aria-invalid="false" checked disabled /></td>
+                </tr>
+                <tr>
+                  <th scope="row" data-i18n>dashboard.state.fault</th>
+                  <td><input type="radio" id="ot-fault" aria-invalid="false" checked disabled /></td>
+                </tr>
+                <tr>
+                  <th scope="row" data-i18n>dashboard.state.diag</th>
+                  <td><input type="radio" id="ot-diagnostic" aria-invalid="false" checked disabled /></td>
+                </tr>
+                <tr>
+                  <th scope="row" data-i18n>dashboard.state.extpump</th>
+                  <td><input type="radio" id="ot-external-pump" aria-invalid="false" checked disabled /></td>
+                </tr>
+                <tr>
+                  <th scope="row" data-i18n>dashboard.state.modulation</th>
+                  <td><b id="ot-modulation"></b> %</td>
+                </tr>
+                <tr>
+                  <th scope="row" data-i18n>dashboard.state.pressure</th>
+                  <td><b id="ot-pressure"></b> <span class="pressure-unit"></span></td>
+                </tr>
+                <tr>
+                  <th scope="row" data-i18n>dashboard.state.dhwFlowRate</th>
+                  <td><b id="ot-dhw-flow-rate"></b> <span class="volume-unit"></span>/min</td>
+                </tr>
+                <tr>
+                  <th scope="row" data-i18n>dashboard.state.faultCode</th>
+                  <td><b id="ot-fault-code"></b></td>
+                </tr>
+                <tr>
+                  <th scope="row" data-i18n>dashboard.state.indoorTemp</th>
+                  <td><b id="indoor-temp"></b> <span class="temp-unit"></span></td>
+                </tr>
+                <tr>
+                  <th scope="row" data-i18n>dashboard.state.outdoorTemp</th>
+                  <td><b id="outdoor-temp"></b> <span class="temp-unit"></span></td>
+                </tr>
+                <tr>
+                  <th scope="row" data-i18n>dashboard.state.heatingTemp</th>
+                  <td><b id="heating-temp"></b> <span class="temp-unit"></span></td>
+                </tr>
+                <tr>
+                  <th scope="row" data-i18n>dashboard.state.heatingSetpointTemp</th>
+                  <td><b id="heating-setpoint-temp"></b> <span class="temp-unit"></span></td>
+                </tr>
+                <tr>
+                  <th scope="row" data-i18n>dashboard.state.heatingReturnTemp</th>
+                  <td><b id="heating-return-temp"></b> <span class="temp-unit"></span></td>
+                </tr>
+                <tr>
+                  <th scope="row" data-i18n>dashboard.state.dhwTemp</th>
+                  <td><b id="dhw-temp"></b> <span class="temp-unit"></span></td>
+                </tr>
+                <tr>
+                  <th scope="row" data-i18n>dashboard.state.exhaustTemp</th>
+                  <td><b id="exhaust-temp"></b> <span class="temp-unit"></span></td>
+                </tr>
+              </tbody>
+            </table>
+          </details>
+
+          <hr />
+
+          <details>
+            <summary><b data-i18n>dashboard.section.otDiag</b></summary>
+            <pre><b>Vendor:</b>          <span id="slave-vendor"></span>
+<b>Member ID:</b>       <span id="slave-member-id"></span>
+<b>Flags:</b>           <span id="slave-flags"></span>
+<b>Type:</b>            <span id="slave-type"></span>
+<b>Version:</b>         <span id="slave-version"></span>
+<b>OT version:</b>      <span id="slave-ot-version"></span>
+<b>Heating limits:</b>  <span id="heating-min-temp"></span>...<span id="heating-max-temp"></span> <span class="temp-unit"></span>
+<b>DHW limits:</b>      <span id="dhw-min-temp"></span>...<span id="dhw-max-temp"></span> <span class="temp-unit"></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"></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('#thermostat-heating-minus').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('#thermostat-heating-target', newSettings.heating.target);
+        });
+
+        document.querySelector('#thermostat-heating-plus').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('#thermostat-heating-target', newSettings.heating.target);
+        });
+
+        document.querySelector('#thermostat-dhw-minus').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('#thermostat-dhw-target', newSettings.dhw.target);
+        });
+
+        document.querySelector('#thermostat-dhw-plus').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('#thermostat-dhw-target', newSettings.dhw.target);
+        });
+
+        document.querySelector('#thermostat-heating-enabled').addEventListener('change', (event) => {
+          modifiedTime = Date.now();
+          newSettings.heating.enable = event.currentTarget.checked;
+        });
+
+        document.querySelector('#thermostat-heating-turbo').addEventListener('change', (event) => {
+          modifiedTime = Date.now();
+          newSettings.heating.turbo = event.currentTarget.checked;
+        });
+
+        document.querySelector('#thermostat-dhw-enabled').addEventListener('change', (event) => {
+          modifiedTime = Date.now();
+          newSettings.dhw.enable = event.currentTarget.checked;
+        });
+
+        setTimeout(async function onLoadPage() {
+          if (modifiedTime) {
+            if ((Date.now() - modifiedTime) < 5000) {
+              setTimeout(onLoadPage, 1000);
+              return;
+            }
+
+            modifiedTime = null;
+          }
+
+          // settings
+          try {
+            let modified = prevSettings && (
+              (prevSettings.heating.enable != newSettings.heating.enable)
+              || (prevSettings.heating.turbo != newSettings.heating.turbo)
+              || (prevSettings.heating.target != newSettings.heating.target)
+              || (prevSettings.opentherm.dhwPresent && prevSettings.dhw.enable != newSettings.dhw.enable)
+              || (prevSettings.opentherm.dhwPresent && prevSettings.dhw.target != newSettings.dhw.target)
+            );
+
+            if (modified) {
+              console.log(newSettings);
+            }
+
+            let parameters = { cache: 'no-cache' };
+            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.nativeHeatingControl && !result.equitherm.enable && !result.pid.enable;
+            prevSettings = result;
+            newSettings.heating.enable = result.heating.enable;
+            newSettings.heating.turbo = result.heating.turbo;
+            newSettings.heating.target = result.heating.target;
+            newSettings.dhw.enable = result.dhw.enable;
+            newSettings.dhw.target = result.dhw.target;
+
+            if (result.opentherm.dhwPresent) {
+              show('#thermostat-dhw');
+            } else {
+              hide('#thermostat-dhw');
+            }
+
+            setCheckboxValue('#thermostat-heating-enabled', result.heating.enable);
+            setCheckboxValue('#thermostat-heating-turbo', result.heating.turbo);
+            setValue('#thermostat-heating-target', result.heating.target);
+
+            setCheckboxValue('#thermostat-dhw-enabled', result.dhw.enable);
+            setValue('#thermostat-dhw-target', result.dhw.target);
+
+            setValue('.temp-unit', temperatureUnit(result.system.unitSystem));
+            setValue('.pressure-unit', pressureUnit(result.system.unitSystem));
+            setValue('.volume-unit', volumeUnit(result.system.unitSystem));
+
+          } catch (error) {
+            console.log(error);
+          }
+
+          // vars
+          try {
+            const response = await fetch('/api/vars', { cache: 'no-cache' });
+            if (!response.ok) {
+              throw new Error('Response not valid');
+            }
+
+            const result = await response.json();
+            setValue('#thermostat-heating-current', noRegulators ? result.temperatures.heating : result.temperatures.indoor);
+            setValue('#thermostat-dhw-current', result.temperatures.dhw);
+
+            setState('#ot-connected', result.states.otStatus);
+            setState('#ot-emergency', result.states.emergency);
+            setState('#ot-heating', result.states.heating);
+            setState('#ot-dhw', result.states.dhw);
+            setState('#ot-flame', result.states.flame);
+            setState('#ot-fault', result.states.fault);
+            setState('#ot-diagnostic', result.states.diagnostic);
+            setState('#ot-external-pump', result.states.externalPump);
+            setState('#mqtt-connected', result.states.mqtt);
+
+            setValue('#ot-modulation', result.sensors.modulation);
+            setValue('#ot-pressure', result.sensors.pressure);
+            setValue('#ot-dhw-flow-rate', result.sensors.dhwFlowRate);
+            setValue('#ot-fault-code', result.sensors.faultCode ? ("E" + result.sensors.faultCode) : "-");
+
+            setValue('#indoor-temp', result.temperatures.indoor);
+            setValue('#outdoor-temp', result.temperatures.outdoor);
+            setValue('#heating-temp', result.temperatures.heating);
+            setValue('#heating-return-temp', result.temperatures.heatingReturn);
+            setValue('#dhw-temp', result.temperatures.dhw);
+            setValue('#exhaust-temp', result.temperatures.exhaust);
+
+            setValue('#heating-min-temp', result.parameters.heatingMinTemp);
+            setValue('#heating-max-temp', result.parameters.heatingMaxTemp);
+            setValue('#heating-setpoint-temp', result.parameters.heatingSetpoint);
+            setValue('#dhw-min-temp', result.parameters.dhwMinTemp);
+            setValue('#dhw-max-temp', result.parameters.dhwMaxTemp);
+
+            setValue('#slave-member-id', result.parameters.slaveMemberId);
+            setValue('#slave-vendor', memberIdToVendor(result.parameters.slaveMemberId));
+
+            setValue('#slave-flags', result.parameters.slaveFlags);
+            setValue('#slave-type', result.parameters.slaveType);
+            setValue('#slave-version', result.parameters.slaveVersion);
+            setValue('#slave-ot-version', result.parameters.slaveOtVersion);
+            setBusy('#dashboard-busy', '#dashboard-container', false);
+
+          } catch (error) {
+            console.log(error);
+          }
+
+          setTimeout(onLoadPage, 10000);
+        }, 1000);
+      });
+    </script>
+  </body>
+</html>
--- a/src_data/pages/index.html
+++ b/src_data/pages/index.html
@@ -0,0 +1,218 @@
+<!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" />
+  </head>
+
+  <body>
+    <header class="container">
+      <nav>
+        <ul>
+          <li><a href="/">
+              <div class="logo" data-i18n>logo</div>
+            </a></li>
+        </ul>
+        <ul>
+          <!--<li><a href="https://github.com/Laxilef/OTGateway/wiki" role="button" class="secondary" target="_blank">Help</a></li>-->
+          <li>
+            <select id="lang" aria-label="Lang">
+              <option value="en" selected>EN</option>
+              <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><input type="radio" id="network-connected" aria-invalid="false" checked disabled /></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.sdk</span>: <b id="core-version"></b>
+                </td>
+              </tr>
+              <tr>
+                <th scope="row" data-i18n>index.system.uptime</th>
+                <td>
+                  <b id="uptime-days"></b> days, 
+                  <b id="uptime-hours"></b> hours, 
+                  <b id="uptime-min"></b> min., 
+                  <b id="uptime-sec"></b> sec.
+                </td>
+              </tr>
+              <tr>
+                <th scope="row" data-i18n>index.system.memory.title</th>
+                <td>
+                  <b id="free-heap"></b> of <b id="total-heap"></b> bytes (<span data-i18n>index.system.memory.min</span>: <b id="min-free-heap"></b> bytes)<br />
+                  <span data-i18n>index.system.memory.maxFreeBlock</span>: <b id="max-free-block-heap"></b> bytes (<span data-i18n>index.system.memory.min</span>: <b id="min-max-free-block-heap"></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-revision"></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="cpu-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></td>
+              </tr>
+            </tbody>
+          </table>
+
+          <div class="grid">
+            <a href="/dashboard.html" role="button" data-i18n>dashboard.name</a>
+            <a href="/settings.html" role="button" data-i18n>settings.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"></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' });
+            if (!response.ok) {
+              throw new Error('Response not valid');
+            }
+
+            const result = await response.json();
+            setValue('#network-hostname', result.network.hostname);
+            setValue('#network-mac', result.network.mac);
+            setState('#network-connected', result.network.connected);
+            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.system.buildVersion);
+            setValue('#build-date', result.system.buildDate);
+            setValue('#build-env', result.system.buildEnv);
+            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('#total-heap', result.system.totalHeap);
+            setValue('#free-heap', result.system.freeHeap);
+            setValue('#min-free-heap', result.system.minFreeHeap);
+            setValue('#max-free-block-heap', result.system.maxFreeBlockHeap);
+            setValue('#min-max-free-block-heap', result.system.minMaxFreeBlockHeap);
+            setValue('#reset-reason', result.system.resetReason);
+
+            setValue('#chip-model', result.system.chipModel);
+            setValue('#chip-revision', result.system.chipRevision);
+            setValue('#chip-cores', result.system.chipCores);
+            setValue('#cpu-freq', result.system.cpuFreq);
+            setValue('#core-version', result.system.coreVersion);
+            setValue('#flash-size', result.system.flashSize / 1024 / 1024);
+            setValue('#flash-real-size', result.system.flashRealSize / 1024 / 1024);
+
+            setBusy('#system-busy', '#system-table', false);
+
+          } catch (error) {
+            console.log(error);
+          }
+
+          setTimeout(onLoadPage, 10000);
+        }, 1000);
+      });
+    </script>
+  </body>
+</html>
--- a/src_data/pages/network.html
+++ b/src_data/pages/network.html
@@ -0,0 +1,220 @@
+<!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" />
+  </head>
+
+  <body>
+    <header class="container">
+      <nav>
+        <ul>
+          <li><a href="/">
+              <div class="logo" data-i18n>logo</div>
+            </a></li>
+        </ul>
+        <ul>
+          <!--<li><a href="https://github.com/Laxilef/OTGateway/wiki" role="button" class="secondary" target="_blank">Help</a></li>-->
+          <li>
+            <select id="lang" aria-label="Lang">
+              <option value="en" selected>EN</option>
+              <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 for="network-hostname">
+              <span data-i18n>network.params.hostname</span>
+              <input type="text" id="network-hostname" name="hostname" maxlength="24" pattern="[A-Za-z0-9]+[A-Za-z0-9\-]+[A-Za-z0-9]+" required>
+            </label>
+
+            <label for="network-use-dhcp">
+              <input type="checkbox" id="network-use-dhcp" name="useDhcp" value="true">
+              <span data-i18n>network.params.dhcp</span>
+            </label>
+            <br />
+            <hr />
+            <h4 data-i18n>network.section.static</h4>
+
+            <label for="network-static-ip">
+              <span data-i18n>network.params.ip</span>
+              <input type="text" id="network-static-ip" name="staticConfig[ip]" value="true" maxlength="16" pattern="\d{1,3}\.\d{1,3}\.\d{1,3}\.\d{1,3}" required>
+            </label>
+
+            <label for="network-static-gateway">
+              <span data-i18n>network.params.gateway</span>
+              <input type="text" id="network-static-gateway" name="staticConfig[gateway]" maxlength="16" pattern="\d{1,3}\.\d{1,3}\.\d{1,3}\.\d{1,3}" required>
+            </label>
+
+            <label for="network-static-subnet">
+              <span data-i18n>network.params.subnet</span>
+              <input type="text" id="network-static-subnet" name="staticConfig[subnet]" maxlength="16" pattern="\d{1,3}\.\d{1,3}\.\d{1,3}\.\d{1,3}" required>
+            </label>
+
+            <label for="network-static-dns">
+              <span data-i18n>network.params.dns</span>
+              <input type="text" id="network-static-dns" 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 for="sta-ssid">
+                <span data-i18n>network.wifi.ssid</span>
+                <input type="text" id="sta-ssid" name="sta[ssid]" maxlength="32" required>
+              </label>
+
+              <label for="sta-password">
+                <span data-i18n>network.wifi.password</span>
+                <input type="password" id="sta-password" name="sta[password]" maxlength="64" required>
+              </label>
+
+              <label for="sta-channel">
+                <span data-i18n>network.wifi.channel</span>
+                <input type="number" inputmode="numeric" id="sta-channel" 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 for="ap-ssid">
+              <span data-i18n>network.wifi.ssid</span>
+              <input type="text" id="ap-ssid" name="ap[ssid]" maxlength="32" required>
+            </label>
+
+            <label for="ap-password">
+              <span data-i18n>network.wifi.password</span>
+              <input type="text" id="ap-password" name="ap[password]" maxlength="64" required>
+            </label>
+
+            <label for="ap-channel">
+              <span data-i18n>network.wifi.channel</span>
+              <input type="number" inputmode="numeric" id="ap-channel" 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"></script>
+    <script>
+      document.addEventListener('DOMContentLoaded', async () => {
+        const lang = new Lang(document.getElementById('lang'));
+        lang.build();
+
+        const fillData = (data) => {
+          setInputValue('#network-hostname', data.hostname);
+          setCheckboxValue('#network-use-dhcp', data.useDhcp);
+          setInputValue('#network-static-ip', data.staticConfig.ip);
+          setInputValue('#network-static-gateway', data.staticConfig.gateway);
+          setInputValue('#network-static-subnet', data.staticConfig.subnet);
+          setInputValue('#network-static-dns', data.staticConfig.dns);
+          setBusy('#network-settings-busy', '#network-settings', false);
+
+          setInputValue('#sta-ssid', data.sta.ssid);
+          setInputValue('#sta-password', data.sta.password);
+          setInputValue('#sta-channel', data.sta.channel);
+          setBusy('#sta-settings-busy', '#sta-settings', false);
+
+          setInputValue('#ap-ssid', data.ap.ssid);
+          setInputValue('#ap-password', data.ap.password);
+          setInputValue('#ap-channel', data.ap.channel);
+          setBusy('#ap-settings-busy', '#ap-settings', false);
+        };
+
+        try {
+          const response = await fetch('/api/network/settings', { cache: 'no-cache' });
+          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>
--- a/src_data/pages/settings.html
+++ b/src_data/pages/settings.html
@@ -0,0 +1,833 @@
+<!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" />
+  </head>
+
+  <body>
+    <header class="container">
+      <nav>
+        <ul>
+          <li><a href="/">
+              <div class="logo" data-i18n>logo</div>
+            </a></li>
+        </ul>
+        <ul>
+          <!--<li><a href="https://github.com/Laxilef/OTGateway/wiki" role="button" class="secondary" target="_blank">Help</a></li>-->
+          <li>
+            <select id="lang" aria-label="Lang">
+              <option value="en" selected>EN</option>
+              <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 for="portal-login">
+                  <span data-i18n>settings.portal.login</span>
+                  <input type="text" id="portal-login" name="portal[login]" maxlength="12" required>
+                </label>
+
+                <label for="portal-password">
+                  <span data-i18n>settings.portal.password</span>
+                  <input type="password" id="portal-password" name="portal[password]" maxlength="32" required>
+                </label>
+              </div>
+
+              <label for="portal-auth">
+                <input type="checkbox" id="portal-auth" 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" class="system-unit-system" name="system[unitSystem]" value="0" />
+                  <span data-i18n>settings.system.metric</span>
+                </label>
+
+                <label>
+                  <input type="radio" class="system-unit-system" name="system[unitSystem]" value="1" />
+                  <span data-i18n>settings.system.imperial</span>
+                </label>
+              </fieldset>
+
+              <fieldset>
+                <label for="system-status-led-gpio">
+                  <span data-i18n>settings.system.statusLedGpio</span>
+                  <input type="number" inputmode="numeric" id="system-status-led-gpio" 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 for="system-debug">
+                  <input type="checkbox" id="system-debug" name="system[debug]" value="true">
+                  <span data-i18n>settings.system.debug</span>
+                </label>
+
+                <label for="system-serial-enable">
+                  <input type="checkbox" id="system-serial-enable" name="system[serial][enable]" value="true">
+                  <span data-i18n>settings.system.serial.enable</span>
+                </label>
+
+                <label for="system-telnet-enable">
+                  <input type="checkbox" id="system-telnet-enable" name="system[telnet][enable]" value="true">
+                  <span data-i18n>settings.system.telnet.enable</span>
+                </label>
+
+                <div class="grid">
+                  <label for="system-serial-baudrate">
+                    <span data-i18n>settings.system.serial.baud.title</span>
+                    <input type="number" inputmode="numeric" id="system-serial-baudrate" name="system[serial][baudrate]" min="9600" max="115200" step="1" required>
+                    <small data-i18n>settings.system.serial.baud.note</small>
+                  </label>
+
+                  <label for="system-telnet-port">
+                    <span data-i18n>settings.system.telnet.port.title</span>
+                    <input type="number" inputmode="numeric" id="system-telnet-port" 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 for="heating-min-temp">
+                  <span data-i18n>settings.temp.min</span>
+                  <input type="number" inputmode="numeric" id="heating-min-temp" name="heating[minTemp]" min="0" max="0" step="1" required>
+                </label>
+
+                <label for="heating-max-temp">
+                  <span data-i18n>settings.temp.max</span>
+                  <input type="number" inputmode="numeric" id="heating-max-temp" name="heating[maxTemp]" min="0" max="0" step="1" required>
+                </label>
+              </div>
+
+              <div class="grid">
+                <label for="heating-hysteresis">
+                  <span data-i18n>settings.heating.hyst</span>
+                  <input type="number" inputmode="numeric" id="heating-hysteresis" name="heating[hysteresis]" min="0" max="5" step="0.05" required>
+                </label>
+
+                <label for="heating-max-modulation">
+                  <span data-i18n>settings.heating.maxMod</span>
+                  <input type="number" inputmode="numeric" id="heating-max-modulation" name="heating[maxModulation]" min="1" max="100" step="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 for="dhw-min-temp">
+                  <span data-i18n>settings.temp.min</span>
+                  <input type="number" inputmode="numeric" id="dhw-min-temp" name="dhw[minTemp]" min="0" max="0" step="1" required>
+                </label>
+
+                <label for="dhw-max-temp">
+                  <span data-i18n>settings.temp.max</span>
+                  <input type="number" inputmode="numeric" id="dhw-max-temp" 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>
+                <label for="emergency-enable">
+                  <input type="checkbox" id="emergency-enable" name="emergency[enable]" value="true">
+                  <span data-i18n>settings.enable</span>
+                </label>
+
+                <small data-i18n>settings.emergency.desc</small>
+              </fieldset>
+
+              <div class="grid">
+                <label for="emergency-target">
+                  <span data-i18n>settings.emergency.target.title</span>
+                  <input type="number" inputmode="numeric" id="emergency-target" name="emergency[target]" min="0" max="0" step="1" required>
+                  <small data-i18n>settings.emergency.target.note</small>
+                </label>
+
+                <label for="emergency-treshold-time">
+                  <span data-i18n>settings.emergency.treshold</span>
+                  <input type="number" inputmode="numeric" id="emergency-treshold-time" name="emergency[tresholdTime]" min="60" max="1800" step="1" required>
+                </label>
+              </div>
+
+              <fieldset>
+                <legend data-i18n>settings.section.emergency.events</legend>
+
+                <label for="emergency-on-network-fault">
+                  <input type="checkbox" id="emergency-on-network-fault" name="emergency[onNetworkFault]" value="true">
+                  <span data-i18n>settings.emergency.events.network</span>
+                </label>
+
+                <label for="emergency-on-mqtt-fault">
+                  <input type="checkbox" id="emergency-on-mqtt-fault" name="emergency[onMqttFault]" value="true">
+                  <span data-i18n>settings.emergency.events.mqtt</span>
+                </label>
+              </fieldset>
+
+              <fieldset>
+                <legend data-i18n>settings.section.emergency.regulators</legend>
+
+                <label for="emergency-use-equitherm">
+                  <input type="checkbox" id="emergency-use-equitherm" name="emergency[useEquitherm]" value="true">
+                  <span data-i18n>settings.emergency.regulators.equitherm</span>
+                </label>
+                <label for="emergency-use-pid">
+                  <input type="checkbox" id="emergency-use-pid" name="emergency[usePid]" value="true">
+                  <span data-i18n>settings.emergency.regulators.pid</span>
+                </label>
+              </fieldset>
+
+              <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 for="equitherm-enable">
+                  <input type="checkbox" id="equitherm-enable" name="equitherm[enable]" value="true">
+                  <span data-i18n>settings.enable</span>
+                </label>
+              </fieldset>
+
+              <div class="grid">
+                <label for="equitherm-n-factor">
+                  <span data-i18n>settings.equitherm.n</span>
+                  <input type="number" inputmode="numeric" id="equitherm-n-factor" name="equitherm[n_factor]" min="0.001" max="10" step="0.001" required>
+                </label>
+
+                <label for="equitherm-k-factor">
+                  <span data-i18n>settings.equitherm.k</span>
+                  <input type="number" inputmode="numeric" id="equitherm-k-factor" name="equitherm[k_factor]" min="0" max="10" step="0.01" required>
+                </label>
+
+                <label for="equitherm-t-factor">
+                  <span data-i18n>settings.equitherm.t.title</span>
+                  <input type="number" inputmode="numeric" id="equitherm-t-factor" 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 for="pid-enable">
+                  <input type="checkbox" id="pid-enable" name="pid[enable]" value="true">
+                  <span data-i18n>settings.enable</span>
+                </label>
+              </fieldset>
+
+              <div class="grid">
+                <label for="pid-p-factor">
+                  <span data-i18n>settings.pid.p</span>
+                  <input type="number" inputmode="numeric" id="pid-p-factor" name="pid[p_factor]" min="0.1" max="1000" step="0.1" required>
+                </label>
+
+                <label for="pid-i-factor">
+                  <span data-i18n>settings.pid.i</span>
+                  <input type="number" inputmode="numeric" id="pid-i-factor" name="pid[i_factor]" min="0" max="100" step="0.0001" required>
+                </label>
+
+                <label for="pid-d-factor">
+                  <span data-i18n>settings.pid.d</span>
+                  <input type="number" inputmode="numeric" id="pid-d-factor" name="pid[d_factor]" min="0" max="100000" step="1" required>
+                </label>
+              </div>
+
+              <label for="pid-dt">
+                <span data-i18n>settings.pid.dt</span>
+                <input type="number" inputmode="numeric" id="pid-dt" name="pid[dt]" min="30" max="600" step="1" required>
+              </label>
+
+              <hr />
+
+              <div class="grid">
+                <label for="pid-min-temp">
+                  <span data-i18n>settings.temp.min</span>
+                  <input type="number" inputmode="numeric" id="pid-min-temp" name="pid[minTemp]" min="0" max="0" step="1" required>
+                </label>
+
+                <label for="pid-max-temp">
+                  <span data-i18n>settings.temp.max</span>
+                  <input type="number" inputmode="numeric" id="pid-max-temp" name="pid[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.ot</b></summary>
+          <div>
+            <div id="opentherm-settings-busy" aria-busy="true"></div>
+            <form action="/api/settings" id="opentherm-settings" class="hidden">
+              <fieldset>
+                <legend data-i18n>settings.system.unit</legend>
+
+                <label>
+                  <input type="radio" class="opentherm-unit-system" name="opentherm[unitSystem]" value="0" />
+                  <span data-i18n>settings.system.metric</span>
+                </label>
+
+                <label>
+                  <input type="radio" class="opentherm-unit-system" name="opentherm[unitSystem]" value="1" />
+                  <span data-i18n>settings.system.imperial</span>
+                </label>
+              </fieldset>
+
+              <div class="grid">
+                <label for="opentherm-in-gpio">
+                  <span data-i18n>settings.ot.inGpio</span>
+                  <input type="number" inputmode="numeric" id="opentherm-in-gpio" name="opentherm[inGpio]" min="0" max="254" step="1">
+                </label>
+
+                <label for="opentherm-in-gpio">
+                  <span data-i18n>settings.ot.outGpio</span>
+                  <input type="number" inputmode="numeric" id="opentherm-out-gpio" name="opentherm[outGpio]" min="0" max="254" step="1">
+                </label>
+              </div>
+
+              <div class="grid">
+                <label for="opentherm-rx-led-gpio">
+                  <span data-i18n>settings.ot.ledGpio</span>
+                  <input type="number" inputmode="numeric" id="opentherm-rx-led-gpio" name="opentherm[rxLedGpio]" min="0" max="254" step="1">
+                  <small data-i18n>settings.note.blankNotUse</small>
+                </label>
+
+                <label for="opentherm-member-id-code">
+                  <span data-i18n>settings.ot.memberIdCode</span>
+                  <input type="number" inputmode="numeric" id="opentherm-member-id-code" name="opentherm[memberIdCode]" min="0" max="65535" step="1" required>
+                </label>
+              </div>
+
+              <fieldset>
+                <legend data-i18n>settings.section.ot.options</legend>
+                <label for="opentherm-dhw-present">
+                  <input type="checkbox" id="opentherm-dhw-present" name="opentherm[dhwPresent]" value="true">
+                  <span data-i18n>settings.ot.options.dhwPresent</span>
+                </label>
+
+                <label for="opentherm-sw-mode">
+                  <input type="checkbox" id="opentherm-sw-mode" name="opentherm[summerWinterMode]" value="true">
+                  <span data-i18n>settings.ot.options.summerWinterMode</span>
+                </label>
+
+                <label for="opentherm-heating-ch2-enabled">
+                  <input type="checkbox" id="opentherm-heating-ch2-enabled" name="opentherm[heatingCh2Enabled]" value="true">
+                  <span data-i18n>settings.ot.options.heatingCh2Enabled</span>
+                </label>
+
+                <label for="opentherm-heating-ch1-to-ch2">
+                  <input type="checkbox" id="opentherm-heating-ch1-to-ch2" name="opentherm[heatingCh1ToCh2]" value="true">
+                  <span data-i18n>settings.ot.options.heatingCh1ToCh2</span>
+                </label>
+
+                <label for="opentherm-dhw-to-ch2">
+                  <input type="checkbox" id="opentherm-dhw-to-ch2" name="opentherm[dhwToCh2]" value="true">
+                  <span data-i18n>settings.ot.options.dhwToCh2</span>
+                </label>
+
+                <label for="opentherm-dhw-blocking">
+                  <input type="checkbox" id="opentherm-dhw-blocking" name="opentherm[dhwBlocking]" value="true">
+                  <span data-i18n>settings.ot.options.dhwBlocking</span>
+                </label>
+
+                <label for="opentherm-sync-modulation-with-heating">
+                  <input type="checkbox" id="opentherm-sync-modulation-with-heating" name="opentherm[modulationSyncWithHeating]" value="true">
+                  <span data-i18n>settings.ot.options.modulationSyncWithHeating</span>
+                </label>
+
+                <label for="opentherm-get-min-max-temp">
+                  <input type="checkbox" id="opentherm-get-min-max-temp" name="opentherm[getMinMaxTemp]" value="true">
+                  <span data-i18n>settings.ot.options.getMinMaxTemp</span>
+                </label>
+
+                <hr />
+                <fieldset>
+                  <label for="opentherm-fault-state-gpio">
+                    <span data-i18n>settings.ot.faultState.gpio</span>
+                    <input type="number" inputmode="numeric" id="opentherm-fault-state-gpio" name="opentherm[faultStateGpio]" min="0" max="254" step="1">
+                    <small data-i18n>settings.ot.faultState.note</small>
+                  </label>
+
+                  <label for="opentherm-invert-fault-state">
+                    <input type="checkbox" id="opentherm-invert-fault-state" name="opentherm[invertFaultState]" value="true">
+                    <span data-i18n>settings.ot.faultState.invert</span>
+                  </label>
+                </fieldset>
+
+                <hr />
+                <label for="opentherm-native-heating-control">
+                  <input type="checkbox" id="opentherm-native-heating-control" name="opentherm[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 for="mqtt-enable">
+                  <input type="checkbox" id="mqtt-enable" name="mqtt[enable]" value="true">
+                  <span data-i18n>settings.enable</span>
+                </label>
+
+                <label for="mqtt-ha-discovery">
+                  <input type="checkbox" id="mqtt-ha-discovery" name="mqtt[homeAssistantDiscovery]" value="true">
+                  <span data-i18n>settings.mqtt.homeAssistantDiscovery</span>
+                </label>
+              </fieldset>
+
+              <div class="grid">
+                <label for="mqtt-server">
+                  <span data-i18n>settings.mqtt.server</span>
+                  <input type="text" id="mqtt-server" name="mqtt[server]" maxlength="80" required>
+                </label>
+
+                <label for="mqtt-port">
+                  <span data-i18n>settings.mqtt.port</span>
+                  <input type="number" inputmode="numeric" id="mqtt-port" name="mqtt[port]" min="1" max="65535" step="1" required>
+                </label>
+              </div>
+
+              <div class="grid">
+                <label for="mqtt-user">
+                  <span data-i18n>settings.mqtt.user</span>
+                  <input type="text" id="mqtt-user" name="mqtt[user]" maxlength="32" required>
+                </label>
+
+                <label for="mqtt-password">
+                  <span data-i18n>settings.mqtt.password</span>
+                  <input type="password" id="mqtt-password" name="mqtt[password]" maxlength="32">
+                </label>
+              </div>
+
+              <div class="grid">
+                <label for="mqtt-prefix">
+                  <span data-i18n>settings.mqtt.prefix</span>
+                  <input type="text" id="mqtt-prefix" name="mqtt[prefix]" maxlength="32" required>
+                </label>
+
+                <label for="mqtt-interval">
+                  <span data-i18n>settings.mqtt.interval</span>
+                  <input type="number" inputmode="numeric" id="mqtt-interval" 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.outdorSensor</b></summary>
+          <div>
+            <div id="outdoor-sensor-settings-busy" aria-busy="true"></div>
+            <form action="/api/settings" id="outdoor-sensor-settings" class="hidden">
+              <fieldset>
+                <legend data-i18n>settings.tempSensor.source.type</legend>
+
+                <label>
+                  <input type="radio" class="outdoor-sensor-type" name="sensors[outdoor][type]" value="0" />
+                  <span data-i18n>settings.tempSensor.source.boiler</span>
+                </label>
+
+                <label>
+                  <input type="radio" class="outdoor-sensor-type" name="sensors[outdoor][type]" value="1" />
+                  <span data-i18n>settings.tempSensor.source.manual</span>
+                </label>
+
+                <label>
+                  <input type="radio" class="outdoor-sensor-type" name="sensors[outdoor][type]" value="2" />
+                  <span data-i18n>settings.tempSensor.source.ext</span>
+                </label>
+              </fieldset>
+
+              <label for="outdoor-sensor-gpio">
+                <span data-i18n>settings.tempSensor.gpio</span>
+                <input type="number" inputmode="numeric" id="outdoor-sensor-gpio" name="sensors[outdoor][gpio]" min="0" max="254" step="1">
+              </label>
+
+              <label for="outdoor-sensor-offset">
+                <span data-i18n>settings.tempSensor.offset</span>
+                <input type="number" inputmode="numeric" id="outdoor-sensor-offset" name="sensors[outdoor][offset]" min="-10" max="10" step="0.01" required>
+              </label>
+
+              <button type="submit" data-i18n>button.save</button>
+            </form>
+          </div>
+        </details>
+
+        <hr />
+
+        <details>
+          <summary><b data-i18n>settings.section.indoorSensor</b></summary>
+          <div>
+            <div id="indoor-sensor-settings-busy" aria-busy="true"></div>
+            <form action="/api/settings" id="indoor-sensor-settings" class="hidden">
+              <fieldset>
+                <legend data-i18n>settings.tempSensor.source.type</legend>
+
+                <label>
+                  <input type="radio" class="indoor-sensor-type" name="sensors[indoor][type]" value="1" />
+                  <span data-i18n>settings.tempSensor.source.manual</span>
+                </label>
+
+                <label>
+                  <input type="radio" class="indoor-sensor-type" name="sensors[indoor][type]" value="2" />
+                  <span data-i18n>settings.tempSensor.source.ext</span>
+                </label>
+
+                <label>
+                  <input type="radio" class="indoor-sensor-type" name="sensors[indoor][type]" value="3" />
+                  <span data-i18n>settings.tempSensor.source.ble</span>
+                </label>
+              </fieldset>
+
+              <label for="indoor-sensor-gpio">
+                <span data-i18n>settings.tempSensor.gpio</span>
+                <input type="number" inputmode="numeric" id="indoor-sensor-gpio" name="sensors[indoor][gpio]" min="0" max="254" step="1">
+              </label>
+
+              <div class="grid">
+                <label for="indoor-sensor-offset">
+                  <span data-i18n>settings.tempSensor.offset</span>
+                  <input type="number" inputmode="numeric" id="indoor-sensor-offset" name="sensors[indoor][offset]" min="-10" max="10" step="0.01" required>
+                </label>
+
+                <label for="indoor-sensor-ble-addresss">
+                  <span data-i18n>settings.tempSensor.bleAddress.title</span>
+                  <input type="text" id="indoor-sensor-ble-addresss" name="sensors[indoor][bleAddress]" pattern="([A-Fa-f0-9]{2}:){5}[A-Fa-f0-9]{2}">
+                  <small data-i18n>settings.tempSensor.bleAddress.note</small>
+                </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 for="extpump-use">
+                  <input type="checkbox" id="extpump-use" name="externalPump[use]" value="true">
+                  <span data-i18n>settings.extPump.use</span>
+                </label>
+              </fieldset>
+
+              <div class="grid">
+                <label for="extpump-gpio">
+                  <span data-i18n>settings.extPump.gpio</span>
+                  <input type="number" inputmode="numeric" id="extpump-gpio" name="externalPump[gpio]" min="0" max="254" step="1">
+                </label>
+
+                <label for="extpump-pc-time">
+                  <span data-i18n>settings.extPump.postCirculationTime</span>
+                  <input type="number" inputmode="numeric" id="extpump-pc-time" name="externalPump[postCirculationTime]" min="1" max="120" step="1" required>
+                </label>
+              </div>
+
+              <div class="grid">
+                <label for="extpump-as-interval">
+                  <span data-i18n>settings.extPump.antiStuckInterval</span>
+                  <input type="number" inputmode="numeric" id="extpump-as-interval" name="externalPump[antiStuckInterval]" min="1" max="366" step="1" required>
+                </label>
+
+                <label for="extpump-as-time">
+                  <span data-i18n>settings.extPump.antiStuckTime</span>
+                  <input type="number" inputmode="numeric" id="extpump-as-time" name="externalPump[antiStuckTime]" min="1" max="20" step="1" required>
+                </label>
+              </div>
+
+              <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"></script>
+    <script>
+      document.addEventListener('DOMContentLoaded', async () => {
+        const lang = new Lang(document.getElementById('lang'));
+        lang.build();
+
+
+        const fillData = (data) => {
+          // System
+          setCheckboxValue('#system-debug', data.system.debug);
+          setCheckboxValue('#system-serial-enable', data.system.serial.enable);
+          setInputValue('#system-serial-baudrate', data.system.serial.baudrate);
+          setCheckboxValue('#system-telnet-enable', data.system.telnet.enable);
+          setInputValue('#system-telnet-port', data.system.telnet.port);
+          setRadioValue('.system-unit-system', data.system.unitSystem);
+          setInputValue('#system-status-led-gpio', data.system.statusLedGpio < 255 ? data.system.statusLedGpio : '');
+          setBusy('#system-settings-busy', '#system-settings', false);
+
+          // Portal
+          setCheckboxValue('#portal-auth', data.portal.auth);
+          setInputValue('#portal-login', data.portal.login);
+          setInputValue('#portal-password', data.portal.password);
+          setBusy('#portal-settings-busy', '#portal-settings', false);
+
+          // Opentherm
+          setRadioValue('.opentherm-unit-system', data.opentherm.unitSystem);
+          setInputValue('#opentherm-in-gpio', data.opentherm.inGpio < 255 ? data.opentherm.inGpio : '');
+          setInputValue('#opentherm-out-gpio', data.opentherm.outGpio < 255 ? data.opentherm.outGpio : '');
+          setInputValue('#opentherm-rx-led-gpio', data.opentherm.rxLedGpio < 255 ? data.opentherm.rxLedGpio : '');
+          setInputValue('#opentherm-fault-state-gpio', data.opentherm.faultStateGpio < 255 ? data.opentherm.faultStateGpio : '');
+          setCheckboxValue('#opentherm-invert-fault-state', data.opentherm.invertFaultState);
+          setInputValue('#opentherm-member-id-code', data.opentherm.memberIdCode);
+          setCheckboxValue('#opentherm-dhw-present', data.opentherm.dhwPresent);
+          setCheckboxValue('#opentherm-sw-mode', data.opentherm.summerWinterMode);
+          setCheckboxValue('#opentherm-heating-ch2-enabled', data.opentherm.heatingCh2Enabled);
+          setCheckboxValue('#opentherm-heating-ch1-to-ch2', data.opentherm.heatingCh1ToCh2);
+          setCheckboxValue('#opentherm-dhw-to-ch2', data.opentherm.dhwToCh2);
+          setCheckboxValue('#opentherm-dhw-blocking', data.opentherm.dhwBlocking);
+          setCheckboxValue('#opentherm-sync-modulation-with-heating', data.opentherm.modulationSyncWithHeating);
+          setCheckboxValue('#opentherm-get-min-max-temp', data.opentherm.getMinMaxTemp);
+          setCheckboxValue('#opentherm-native-heating-control', data.opentherm.nativeHeatingControl);
+          setBusy('#opentherm-settings-busy', '#opentherm-settings', false);
+
+          // MQTT
+          setCheckboxValue('#mqtt-enable', data.mqtt.enable);
+          setCheckboxValue('#mqtt-ha-discovery', data.mqtt.homeAssistantDiscovery);
+          setInputValue('#mqtt-server', data.mqtt.server);
+          setInputValue('#mqtt-port', data.mqtt.port);
+          setInputValue('#mqtt-user', data.mqtt.user);
+          setInputValue('#mqtt-password', data.mqtt.password);
+          setInputValue('#mqtt-prefix', data.mqtt.prefix);
+          setInputValue('#mqtt-interval', data.mqtt.interval);
+          setBusy('#mqtt-settings-busy', '#mqtt-settings', false);
+
+          // Outdoor sensor
+          setRadioValue('.outdoor-sensor-type', data.sensors.outdoor.type);
+          setInputValue('#outdoor-sensor-gpio', data.sensors.outdoor.gpio < 255 ? data.sensors.outdoor.gpio : '');
+          setInputValue('#outdoor-sensor-offset', data.sensors.outdoor.offset);
+          setBusy('#outdoor-sensor-settings-busy', '#outdoor-sensor-settings', false);
+
+          // Indoor sensor
+          setRadioValue('.indoor-sensor-type', data.sensors.indoor.type);
+          setInputValue('#indoor-sensor-gpio', data.sensors.indoor.gpio < 255 ? data.sensors.indoor.gpio : '');
+          setInputValue('#indoor-sensor-offset', data.sensors.indoor.offset);
+          setInputValue('#indoor-sensor-ble-addresss', data.sensors.indoor.bleAddress);
+          setBusy('#indoor-sensor-settings-busy', '#indoor-sensor-settings', false);
+
+          // Extpump
+          setCheckboxValue('#extpump-use', data.externalPump.use);
+          setInputValue('#extpump-gpio', data.externalPump.gpio < 255 ? data.externalPump.gpio : '');
+          setInputValue('#extpump-pc-time', data.externalPump.postCirculationTime);
+          setInputValue('#extpump-as-interval', data.externalPump.antiStuckInterval);
+          setInputValue('#extpump-as-time', data.externalPump.antiStuckTime);
+          setBusy('#extpump-settings-busy', '#extpump-settings', false);
+
+          // Heating
+          setInputValue('#heating-min-temp', data.heating.minTemp, {
+            "min": data.system.unitSystem == 0 ? 0 : 32,
+            "max": data.system.unitSystem == 0 ? 99 : 211
+          });
+          setInputValue('#heating-max-temp', data.heating.maxTemp, {
+            "min": data.system.unitSystem == 0 ? 1 : 33,
+            "max": data.system.unitSystem == 0 ? 100 : 212
+          });
+          setInputValue('#heating-hysteresis', data.heating.hysteresis);
+          setInputValue('#heating-max-modulation', data.heating.maxModulation);
+          setBusy('#heating-settings-busy', '#heating-settings', false);
+
+          // DHW
+          setInputValue('#dhw-min-temp', data.dhw.minTemp, {
+            "min": data.system.unitSystem == 0 ? 0 : 32,
+            "max": data.system.unitSystem == 0 ? 99 : 211
+          });
+          setInputValue('#dhw-max-temp', 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
+          setCheckboxValue('#emergency-enable', data.emergency.enable);
+          setInputValue('#emergency-treshold-time', data.emergency.tresholdTime);
+          setCheckboxValue('#emergency-use-equitherm', data.emergency.useEquitherm);
+          setCheckboxValue('#emergency-use-pid', data.emergency.usePid);
+          setCheckboxValue('#emergency-on-network-fault', data.emergency.onNetworkFault);
+          setCheckboxValue('#emergency-on-mqtt-fault', data.emergency.onMqttFault);
+          setInputValue('#emergency-target', data.emergency.target, {
+            "min": (!data.emergency.useEquitherm && !data.emergency.usePid) ? data.heating.minTemp : 10,
+            "max": (!data.emergency.useEquitherm && !data.emergency.usePid) ? data.heating.maxTemp : 30,
+          });
+          setBusy('#emergency-settings-busy', '#emergency-settings', false);
+
+          // Equitherm
+          setCheckboxValue('#equitherm-enable', data.equitherm.enable);
+          setInputValue('#equitherm-n-factor', data.equitherm.n_factor);
+          setInputValue('#equitherm-k-factor', data.equitherm.k_factor);
+          setInputValue('#equitherm-t-factor', data.equitherm.t_factor);
+          setBusy('#equitherm-settings-busy', '#equitherm-settings', false);
+
+          // PID
+          setCheckboxValue('#pid-enable', data.pid.enable);
+          setInputValue('#pid-p-factor', data.pid.p_factor);
+          setInputValue('#pid-i-factor', data.pid.i_factor);
+          setInputValue('#pid-d-factor', data.pid.d_factor);
+          setInputValue('#pid-dt', data.pid.dt);
+          setInputValue('#pid-min-temp', data.pid.minTemp, {
+            "min": 0,
+            "max": data.system.unitSystem == 0 ? 99 : 211
+          });
+          setInputValue('#pid-max-temp', data.pid.maxTemp, {
+            "min": 1,
+            "max": data.system.unitSystem == 0 ? 100 : 212
+          });
+          setBusy('#pid-settings-busy', '#pid-settings', false);
+        };
+
+        try {
+          const response = await fetch('/api/settings', { cache: 'no-cache' });
+          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('#opentherm-settings', fillData);
+          setupForm('#mqtt-settings', fillData, ['mqtt.user', 'mqtt.password', 'mqtt.prefix']);
+          setupForm('#outdoor-sensor-settings', fillData);
+          setupForm('#indoor-sensor-settings', fillData, ['sensors.indoor.bleAddress']);
+          setupForm('#extpump-settings', fillData);
+
+        } catch (error) {
+          console.log(error);
+        }
+      });
+    </script>
+  </body>
+</html>
--- a/src_data/pages/upgrade.html
+++ b/src_data/pages/upgrade.html
@@ -0,0 +1,111 @@
+<!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">
+  </head>
+
+  <body>
+    <header class="container">
+      <nav>
+        <ul>
+          <li><a href="/">
+              <div class="logo" data-i18n>logo</div>
+            </a></li>
+        </ul>
+        <ul>
+          <!--<li><a href="https://github.com/Laxilef/OTGateway/wiki" role="button" class="secondary" target="_blank">Help</a></li>-->
+          <li>
+            <select id="lang" aria-label="Lang">
+              <option value="en" selected>EN</option>
+              <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 class="grid">
+              <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"></script>
+    <script>
+      document.addEventListener('DOMContentLoaded', async () => {
+        const lang = new Lang(document.getElementById('lang'));
+        lang.build();
+
+        setupRestoreBackupForm('#restore');
+        setupUpgradeForm('#upgrade');
+      });
+    </script>
+  </body>
+</html>
--- a/src_data/scripts/i18n.min.js
+++ b/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)
--- a/src_data/scripts/lang.js
+++ b/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 ?? 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`);
+    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.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;
+  }
+}
+
--- a/src_data/scripts/utils.js
+++ b/src_data/scripts/utils.js
@@ -1,4 +1,4 @@
-function setupForm(formSelector) {
+function setupForm(formSelector, onResultCallback = null, noCastItems = []) {
  const form = document.querySelector(formSelector);
  if (!form) {
    return;
@@ -22,14 +22,14 @@ function setupForm(formSelector) {
    event.preventDefault();

    if (button) {
-      button.textContent = 'Please wait...';
+      button.textContent = i18n("button.wait");
      button.setAttribute('disabled', true);
      button.setAttribute('aria-busy', true);
    }

-    const onSuccess = (response) => {
+    const onSuccess = (result) => {
      if (button) {
-        button.textContent = 'Saved';
+        button.textContent = i18n('button.saved');
        button.classList.add('success');
        button.removeAttribute('aria-busy');

@@ -41,9 +41,9 @@ function setupForm(formSelector) {
      }
    };

-    const onFailed = (response) => {
+    const onFailed = () => {
      if (button) {
-        button.textContent = 'Error';
+        button.textContent = i18n('button.error');
        button.classList.add('failed');
        button.removeAttribute('aria-busy');

@@ -68,18 +68,23 @@ function setupForm(formSelector) {
        headers: {
          'Content-Type': 'application/json'
        },
-        body: form2json(fd)
+        body: form2json(fd, noCastItems)
      });

-      if (response.ok) {
-        onSuccess(response);
+      if (!response.ok) {
+        throw new Error('Response not valid');
+      }

-      } else {
-        onFailed(response);
+      const result = response.status != 204 ? (await response.json()) : null;
+      onSuccess(result);
+
+      if (onResultCallback instanceof Function) {
+        onResultCallback(result);
      }

    } catch (err) {
-      onFailed(false);
+      console.log(err);
+      onFailed();
    }
  });
 }
@@ -105,7 +110,7 @@ function setupNetworkScanForm(formSelector, tableSelector) {
    }

    if (button) {
-      button.innerHTML = 'Please wait...';
+      button.innerHTML = i18n('button.wait');
      button.setAttribute('disabled', true);
      button.setAttribute('aria-busy', true);
    }
@@ -134,7 +139,7 @@ function setupNetworkScanForm(formSelector, tableSelector) {
        row.classList.add("network");
        row.setAttribute('data-ssid', result[i].hidden ? '' : result[i].ssid);
        row.onclick = function () {
-          const input = document.querySelector('input.sta-ssid');
+          const input = document.querySelector('input#sta-ssid');
          const ssid = this.getAttribute('data-ssid');
          if (!input || !ssid) {
            return;
@@ -145,19 +150,56 @@ function setupNetworkScanForm(formSelector, tableSelector) {
        };

        row.insertCell().textContent = "#" + (i + 1);
-        row.insertCell().innerHTML = result[i].hidden ? '<i>Hidden</i>' : result[i].ssid;
+        row.insertCell().innerHTML = result[i].hidden ? ("<i>" + result[i].bssid + "</i>") : result[i].ssid;

-        const signalCell = row.insertCell();
-        const signalElement = document.createElement("kbd");
-        signalElement.textContent = result[i].signalQuality + "%";
-        if (result[i].signalQuality > 60) {
-          signalElement.classList.add('greatSignal');
+        // 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) {
-          signalElement.classList.add('normalSignal');
+          signalQualityIcon.classList.add('icons-wifi-strength-2');
+        } else if (result[i].signalQuality > 20) {
+          signalQualityIcon.classList.add('icons-wifi-strength-1');
        } else {
-          signalElement.classList.add('badSignal');
+          signalQualityIcon.classList.add('icons-wifi-strength-0');
        }
-        signalCell.appendChild(signalElement);
+        
+        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) {
@@ -228,14 +270,14 @@ function setupRestoreBackupForm(formSelector) {
    event.preventDefault();

    if (button) {
-      button.textContent = 'Please wait...';
+      button.textContent = i18n('button.wait');
      button.setAttribute('disabled', true);
      button.setAttribute('aria-busy', true);
    }

    const onSuccess = (response) => {
      if (button) {
-        button.textContent = 'Restored';
+        button.textContent = i18n('button.restored');
        button.classList.add('success');
        button.removeAttribute('aria-busy');

@@ -249,7 +291,7 @@ function setupRestoreBackupForm(formSelector) {

    const onFailed = (response) => {
      if (button) {
-        button.textContent = 'Error';
+        button.textContent = i18n('button.error');
        button.classList.add('failed');
        button.removeAttribute('aria-busy');

@@ -395,7 +437,7 @@ function setupUpgradeForm(formSelector) {

  const onFailed = (response) => {
    if (button) {
-      button.textContent = 'Error';
+      button.textContent = i18n('button.error');
      button.classList.add('failed');
      button.removeAttribute('aria-busy');

@@ -410,8 +452,11 @@ function setupUpgradeForm(formSelector) {
  form.addEventListener('submit', async (event) => {
    event.preventDefault();

+    hide('.upgrade-firmware-result');
+    hide('.upgrade-filesystem-result');
+
    if (button) {
-      button.textContent = 'Uploading...';
+      button.textContent = i18n('button.uploading');
      button.setAttribute('disabled', true);
      button.setAttribute('aria-busy', true);
    }
@@ -437,157 +482,15 @@ function setupUpgradeForm(formSelector) {
  });
 }

-async function loadNetworkStatus() {
-  let response = await fetch('/api/network/status', { cache: 'no-cache' });
-  let result = await response.json();
-
-  setValue('.network-hostname', result.hostname);
-  setValue('.network-mac', result.mac);
-  setState('.network-connected', result.isConnected);
-  setValue('.network-ssid', result.ssid);
-  setValue('.network-signal', result.signalQuality);
-  setValue('.network-ip', result.ip);
-  setValue('.network-subnet', result.subnet);
-  setValue('.network-gateway', result.gateway);
-  setValue('.network-dns', result.dns);
-
-  setBusy('.main-busy', '.main-table', false);
-}
-
-async function loadNetworkSettings() {
-  let response = await fetch('/api/network/settings', { cache: 'no-cache' });
-  let result = await response.json();
-
-  setInputValue('.network-hostname', result.hostname);
-  setCheckboxValue('.network-use-dhcp', result.useDhcp);
-  setInputValue('.network-static-ip', result.staticConfig.ip);
-  setInputValue('.network-static-gateway', result.staticConfig.gateway);
-  setInputValue('.network-static-subnet', result.staticConfig.subnet);
-  setInputValue('.network-static-dns', result.staticConfig.dns);
-  setBusy('#network-settings-busy', '#network-settings', false);
-
-  setInputValue('.sta-ssid', result.sta.ssid);
-  setInputValue('.sta-password', result.sta.password);
-  setInputValue('.sta-channel', result.sta.channel);
-  setBusy('#sta-settings-busy', '#sta-settings', false);
-
-  setInputValue('.ap-ssid', result.ap.ssid);
-  setInputValue('.ap-password', result.ap.password);
-  setInputValue('.ap-channel', result.ap.channel);
-  setBusy('#ap-settings-busy', '#ap-settings', false);
-}
-
-async function loadSettings() {
-  let response = await fetch('/api/settings', { cache: 'no-cache' });
-  let result = await response.json();
-
-  setCheckboxValue('.system-debug', result.system.debug);
-  setCheckboxValue('.system-use-serial', result.system.useSerial);
-  setCheckboxValue('.system-use-telnet', result.system.useTelnet);
-  setBusy('#system-settings-busy', '#system-settings', false);
-
-  setCheckboxValue('.portal-use-auth', result.portal.useAuth);
-  setInputValue('.portal-login', result.portal.login);
-  setInputValue('.portal-password', result.portal.password);
-  setBusy('#portal-settings-busy', '#portal-settings', false);
-
-  setInputValue('.opentherm-in-pin', result.opentherm.inPin);
-  setInputValue('.opentherm-out-pin', result.opentherm.outPin);
-  setInputValue('.opentherm-member-id-code', result.opentherm.memberIdCode);
-  setCheckboxValue('.opentherm-dhw-present', result.opentherm.dhwPresent);
-  setCheckboxValue('.opentherm-sw-mode', result.opentherm.summerWinterMode);
-  setCheckboxValue('.opentherm-heating-ch2-enabled', result.opentherm.heatingCh2Enabled);
-  setCheckboxValue('.opentherm-heating-ch1-to-ch2', result.opentherm.heatingCh1ToCh2);
-  setCheckboxValue('.opentherm-dhw-to-ch2', result.opentherm.dhwToCh2);
-  setCheckboxValue('.opentherm-dhw-blocking', result.opentherm.dhwBlocking);
-  setCheckboxValue('.opentherm-sync-modulation-with-heating', result.opentherm.modulationSyncWithHeating);
-  setBusy('#opentherm-settings-busy', '#opentherm-settings', false);
-
-  setInputValue('.mqtt-server', result.mqtt.server);
-  setInputValue('.mqtt-port', result.mqtt.port);
-  setInputValue('.mqtt-user', result.mqtt.user);
-  setInputValue('.mqtt-password', result.mqtt.password);
-  setInputValue('.mqtt-prefix', result.mqtt.prefix);
-  setInputValue('.mqtt-interval', result.mqtt.interval);
-  setBusy('#mqtt-settings-busy', '#mqtt-settings', false);
-
-  setRadioValue('.outdoor-sensor-type', result.sensors.outdoor.type);
-  setInputValue('.outdoor-sensor-pin', result.sensors.outdoor.pin);
-  setInputValue('.outdoor-sensor-offset', result.sensors.outdoor.offset);
-  setBusy('#outdoor-sensor-settings-busy', '#outdoor-sensor-settings', false);
-
-  setRadioValue('.indoor-sensor-type', result.sensors.indoor.type);
-  setInputValue('.indoor-sensor-pin', result.sensors.indoor.pin);
-  setInputValue('.indoor-sensor-offset', result.sensors.indoor.offset);
-  setInputValue('.indoor-sensor-ble-addresss', result.sensors.indoor.bleAddresss);
-  setBusy('#indoor-sensor-settings-busy', '#indoor-sensor-settings', false);
-
-  setCheckboxValue('.extpump-use', result.externalPump.use);
-  setInputValue('.extpump-pin', result.externalPump.pin);
-  setInputValue('.extpump-pc-time', result.externalPump.postCirculationTime);
-  setInputValue('.extpump-as-interval', result.externalPump.antiStuckInterval);
-  setInputValue('.extpump-as-time', result.externalPump.antiStuckTime);
-  setBusy('#extpump-settings-busy', '#extpump-settings', false);
-}
-
-async function loadVars() {
-  let response = await fetch('/api/vars');
-  let result = await response.json();
-
-  setState('.ot-connected', result.states.otStatus);
-  setState('.ot-emergency', result.states.emergency);
-  setState('.ot-heating', result.states.heating);
-  setState('.ot-dhw', result.states.dhw);
-  setState('.ot-flame', result.states.flame);
-  setState('.ot-fault', result.states.fault);
-  setState('.ot-diagnostic', result.states.diagnostic);
-  setState('.ot-external-pump', result.states.externalPump);
-
-  setValue('.ot-modulation', result.sensors.modulation);
-  setValue('.ot-pressure', result.sensors.pressure);
-  setValue('.ot-dhw-flow-rate', result.sensors.dhwFlowRate);
-  setValue('.ot-fault-code', result.sensors.faultCode ? ("E" + result.sensors.faultCode) : "-");
-
-  setValue('.indoor-temp', result.temperatures.indoor);
-  setValue('.outdoor-temp', result.temperatures.outdoor);
-  setValue('.heating-temp', result.temperatures.heating);
-  setValue('.heating-setpoint-temp', result.parameters.heatingSetpoint);
-  setValue('.dhw-temp', result.temperatures.dhw);
-
-  setBusy('.ot-busy', '.ot-table', false);
-
-  setValue('.version', result.system.version);
-  setValue('.build-date', result.system.buildDate);
-  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('.total-heap', result.system.totalHeap);
-  setValue('.free-heap', result.system.freeHeap);
-  setValue('.min-free-heap', result.system.minFreeHeap);
-  setValue('.max-free-block-heap', result.system.maxFreeBlockHeap);
-  setValue('.min-max-free-block-heap', result.system.minMaxFreeBlockHeap);
-  setValue('.reset-reason', result.system.resetReason);
-  setState('.mqtt-connected', result.system.mqttConnected);
-
-  setBusy('.system-busy', '.system-table', false);
-}

 function setBusy(busySelector, contentSelector, value) {
-  let busy = document.querySelector(busySelector);
-  let content = document.querySelector(contentSelector);
-  if (!busy || !content) {
-    return;
-  }
-
  if (!value) {
-    busy.classList.add('hidden');
-    content.classList.remove('hidden');
+    hide(busySelector);
+    show(contentSelector);

  } else {
-    busy.classList.remove('hidden');
-    content.classList.add('hidden');
+    show(busySelector);
+    hide(contentSelector);
  }
 }

@@ -601,12 +504,14 @@ function setState(selector, value) {
 }

 function setValue(selector, value) {
-  let item = document.querySelector(selector);
-  if (!item) {
+  let items = document.querySelectorAll(selector);
+  if (!items.length) {
    return;
  }

-  item.innerHTML = value;
+  for (let item of items) {
+    item.innerHTML = value;
+  }
 }

 function setCheckboxValue(selector, value) {
@@ -629,25 +534,120 @@ function setRadioValue(selector, value) {
  }
 }

-function setInputValue(selector, value) {
-  let item = document.querySelector(selector);
-  if (!item) {
+function setInputValue(selector, value, attrs = {}) {
+  let items = document.querySelectorAll(selector);
+  if (!items.length) {
    return;
  }

-  item.value = value;
+  for (let item of items) {
+    item.value = value;
+
+    if (attrs instanceof Object) {
+      for (let attrKey of Object.keys(attrs)) {
+        item.setAttribute(attrKey, attrs[attrKey]);
+      }
+    }
+  }
 }

+function show(selector) {
+  let items = document.querySelectorAll(selector);
+  if (!items.length) {
+    return;
+  }

-function form2json(data) {
+  for (let item of items) {
+    if (item.classList.contains('hidden')) {
+      item.classList.remove('hidden');
+    }
+  }
+}
+
+function hide(selector) {
+  let items = document.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;
+}
+
+function temperatureUnit(unitSystem) {
+  return unit2str(unitSystem, {
+    0: "°C",
+    1: "°F"
+  });
+}
+
+function pressureUnit(unitSystem) {
+  return unit2str(unitSystem, {
+    0: "bar",
+    1: "psi"
+  });
+}
+
+function volumeUnit(unitSystem) {
+  return unit2str(unitSystem, {
+    0: "L",
+    1: "gal"
+  });
+}
+
+function 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 Fourtech/Luna 3",
+    2:    "AWB/Brink",
+    4:    "ATAG/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",
+    56:   "Baxi Luna Duo-Tec",
+    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 (value === 'true' || value === 'false') {
-      value = value === 'true';
-    } else if (typeof (value) === 'string' && value.trim() !== '' && !isNaN(value)) {
-      value = parseFloat(value);
+
+    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) {
--- a/src_data/static/app.css
+++ b/src_data/static/app.css
@@ -1,80 +0,0 @@
-@media (min-width: 1280px) {
-	.container {
-		max-width: 1000px;
-	}
-}
-
-@media (min-width: 1536px) {
-	.container {
-		max-width: 1000px;
-	}
-}
-
-.hidden {
-	display: none !important;
-}
-
-header,
-main,
-footer {
-	padding-top: 1rem !important;
-	padding-bottom: 1rem !important;
-}
-
-article {
-	margin-bottom: 1rem;
-}
-
-footer {
-	text-align: center;
-}
-
-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;
-}
-
-.greatSignal {
-	background-color: var(--pico-form-element-valid-border-color);
-}
-
-.normalSignal {
-	background-color: #e48500;
-}
-
-.badSignal {
-	background-color: var(--pico-form-element-invalid-border-color);
-}
-
-.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);
-}
-
-nav li a:has(> div.logo) {
-	margin-bottom: 0;
-}
--- a/src_data/static/pico.min.css
+++ b/src_data/static/pico.min.css
--- a/src_data/styles/app.css
+++ b/src_data/styles/app.css
@@ -0,0 +1,203 @@
+@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;
+}
+
+
+.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;
+}
+
+[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;
+}
--- a/src_data/styles/iconly.css
+++ b/src_data/styles/iconly.css
@@ -0,0 +1,68 @@
+/*!
+ *  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?1718563596894");
+  src: url("/static/fonts/iconly.eot?#iefix") format("embedded-opentype"), url("/static/fonts/iconly.woff2?1718563596894") format("woff2"), url("/static/fonts/iconly.woff?1718563596894") format("woff"), url("/static/fonts/iconly.ttf?1718563596894") format("truetype"), url("/static/fonts/iconly.svg?1718563596894#Icons") format("svg");
+}
+
+[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-wifi-strength-3:before {
+  content: "\e008";
+}
+
+.icons-down:before {
+  content: "\e009";
+}
+
+.icons-wifi-strength-4:before {
+  content: "\e00a";
+}
+
+.icons-up:before {
+  content: "\e00c";
+}
--- a/src_data/styles/pico.min.css
+++ b/src_data/styles/pico.min.css
--- a/tools/build.py
+++ b/tools/build.py
@@ -1,4 +1,5 @@
 import shutil
+import gzip
 import os
 Import("env")

@@ -12,6 +13,30 @@ def post_build(source, target, env):
  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")),
@@ -31,4 +56,6 @@ def copy_to_build_dir(files, build_dir):


 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)
Author	SHA1	Message	Date
Yurii	ca3c318d8f	chore: bump version	2024-06-21 02:05:34 +03:00
Yurii	2648918dda	feat: added multilanguage for portal	2024-06-21 02:01:38 +03:00
Yurii	8b50fdec21	fix: fix typo	2024-06-20 06:41:32 +03:00
Yurii	5b6e23251a	fix: use static IP at startup fixed #70	2024-06-18 10:25:58 +03:00
Yurii	769daa0857	chore: bump version to 1.4.2	2024-06-15 03:03:50 +03:00
Yurii	76979531b8	feat: added more info about the build to the portal	2024-06-15 03:03:31 +03:00
Yurii	7779076498	refactor: optimizing work with network	2024-06-14 18:18:43 +03:00
Yurii	45e2e0334e	chore: added nodemcu v3 board; changed default gpio for nodemcu 32s	2024-06-14 18:17:12 +03:00
Yurii	b631b496cb	chore: bump version to 1.4.1	2024-06-13 17:15:37 +03:00
Yurii	36328a1db5	refactor: NetworkMgr code optimization	2024-06-13 17:09:41 +03:00
Yurii	a28c7f67b5	chore: added min version of espressif8266 for build #68	2024-06-13 17:07:53 +03:00
Yurii	bb9b6a5f4c	fix: casting types in setupForm fixed #61	2024-06-11 20:19:54 +03:00
Yurii	ce7bd7e23b	feat: migrate to arduino-esp32 core 3.0.1	2024-06-10 16:20:03 +03:00
Yurii	249d32ce35	chore: more info when scan wifi	2024-06-10 14:55:14 +03:00
Yurii	baf8adfb02	fix: validation GPIO and reset wifi for arduino-esp32 core 3.x.x fixed	2024-06-06 16:37:57 +03:00
Yurii	018a1c5188	fix: set ssid on portal fixed	2024-06-06 02:56:19 +03:00
Yurii	b600c130f0	fix: conflicts with sdk 3.x.x for esp32 fixed	2024-06-05 23:11:27 +03:00
Yurii	59eb05726a	chore: bump platformio/framework-arduinoespressif32 to 2.0.17	2024-05-26 23:22:19 +03:00
Yurii	f245f37dfd	chore: bump version	2024-05-26 17:41:12 +03:00
Yurii	a825412f37	feat: added fault state GPIO setting	2024-05-25 02:51:10 +03:00
Yurii	935f8bd0a8	fix: outdoor sensor GPIO validation fixed	2024-05-25 00:17:55 +03:00
Yurii	f78d2f38b8	fix: equitherm with BLE indoor sensor in emergency mode fixed	2024-04-25 13:38:03 +03:00
Yurii	ef083991e3	feat: added board info on portal	2024-04-23 10:30:42 +03:00
Yurii	3c0f846335	fix: added set target indoor temp to CH2 for native heating control #58	2024-04-23 08:13:03 +03:00
Yurii	85011ce4ea	chore: bump version	2024-04-22 08:19:41 +03:00
Yurii	8687e122ca	feat: added native heating control by boiler; refactoring; emergency settings removed from HA	2024-04-22 08:18:59 +03:00
Yurii	d35ea81080	fix: PID optimization, correction of default PID settings	2024-04-18 00:04:23 +03:00
Yurii	cca8ec58b4	fix: fix radio on settings page (portal)	2024-04-16 18:58:28 +03:00
Yurii	301b14bbd4	chore: bump version	2024-04-15 15:07:28 +03:00
Yurii	41ce9b268e	fix: fix set heating temp on ITALTHERM TIME MAX 30F	2024-04-15 15:00:41 +03:00
Yurii	646939179e	fix: serial on s2, s3 fixed	2024-04-15 05:49:46 +03:00
Yurii	73dddd18f0	fix: scan networks on s3 fixed	2024-04-15 02:47:42 +03:00
Yurii	f069de0415	chore: fix typo	2024-04-12 21:47:09 +03:00
Yurii	f4a4afeb29	chore: bump version	2024-04-12 20:47:02 +03:00
Yurii	f9824337dc	chore: delete .gz files	2024-04-12 20:39:56 +03:00
Yurii	1cd8c6a336	chore: html files moved to src_data dir; compression files	2024-04-12 04:13:44 +03:00
Yurii	63228baebd	chore: auto file compression when building a FS	2024-04-12 04:10:55 +03:00
Yurii	6bb261dfd7	feat: ability to use compressed files for StaticPage	2024-04-12 04:08:28 +03:00
Yurii	a026a962f0	fix: fixed thermostat temperature limits for different unit systems on dashboard	2024-04-12 02:03:43 +03:00
Yurii	db2faad741	feat: added Italtherm to vendor list	2024-04-12 01:58:33 +03:00
Yurii	fbc43dc535	feat: added settings for status led gpio, opentherm rx led gpio, emergency treshold time	2024-04-11 23:53:15 +03:00
Yurii	31dfc21d69	refactor: added info for emergency mode in settings	2024-04-11 04:38:12 +03:00
Yurii	96289cb0f7	fix: reset onewire before begin (fix DS18B20)	2024-04-11 04:09:11 +03:00
Yurii	73da3ee07a	fix: fixing button groups on the mobile version	2024-04-11 03:13:39 +03:00
Yurii	a14281924f	chore: bump version	2024-04-11 03:08:35 +03:00
Yurii	3dec390cce	feat: many features * added dashboard on portal * added settings for serial port and telnet * added on/off settings for mqtt * added event selection for emergency mode * refactor html & css	2024-04-11 03:06:56 +03:00
Yurii	9a29819d4f	refactor: reworked layout and styles of the portal	2024-04-08 05:37:36 +03:00
Yurii	2af159d566	chore: updated css framework	2024-04-07 23:00:22 +03:00
Yurii	92ca257d32	feat: added slave parameters to index page on portal; added poll ID125 (opentherm protocol version)	2024-04-07 22:59:43 +03:00
Yurii	44b6620431	fix: rounding the DHW flow rate value	2024-04-07 19:22:15 +03:00
Yurii	b89f61ed58	chore: bump version	2024-04-06 20:28:41 +03:00
Yurii	ab1566bd45	fix: memory leak on esp32 fixed	2024-04-06 20:28:05 +03:00
Yurii	86734ab622	refactor: update portal (unit system)	2024-04-06 18:25:30 +03:00
Yurii	0a8dd2a076	feat: added support unit systems for pressure and flow rate	2024-04-06 18:19:06 +03:00
Yurii	a7a561622e	Merge branch 'unit-system'	2024-04-06 17:38:24 +03:00
Yurii	b0e0f6fd7d	feat: added setting to enable/disable polling of min and max temperatures via opentherm	2024-04-06 15:51:49 +03:00
Yurii	53eaa1d7f1	chore: bump version	2024-04-04 21:26:48 +03:00
Yurii	a7d796e0cc	refactor: removed unused methods, replaced some methods to native	2024-03-31 22:29:53 +03:00
Yurii	4490b38130	fix: fixed reading exhaust gas temperature	2024-03-31 19:41:33 +03:00
Yurii	0ede2240a2	fix: temperature_unit for climate fixed; temp in vars.parameters.* by default fixed	2024-03-31 07:29:32 +03:00
Yurii	0cff35ee12	feat: update portal for unit systems	2024-03-31 06:32:23 +03:00
Yurii	14aef20234	fix: typo for HA_TEMPERATURE_UNIT	2024-03-31 02:49:36 +03:00
Yurii	560f8fbd51	feat: optimizing with different unit systems	2024-03-31 02:47:20 +03:00
Yurii	946414ad31	Merge branch 'master' into unit-system	2024-03-31 01:02:59 +03:00
Yurii	39a29042e1	fix: set max temp (ID57) as setpoint heating temp	2024-03-31 00:37:18 +03:00
Yurii	f544f01caa	feat: polling of exhaust gas temperature (#42 ) and heating return temperature; added new sensors to HA	2024-03-30 00:04:51 +03:00
Yurii	41cca76bfa	chore: update README	2024-03-24 20:38:02 +03:00
Yurii	942bc53043	chore: bump version	2024-03-24 19:28:26 +03:00
Yurii	1bad689b6b	fix: revert board_build.ldscript for esp8266, update OpenTherm Library	2024-03-24 19:27:16 +03:00
Yurii	2f4dbcc205	feat: added unit system selection	2024-03-20 02:37:20 +03:00
Yurii	9e3ef7a465	chore: bump version	2024-03-14 13:08:11 +03:00
Yurii	a5f6749101	refactor: added SensorType enum	2024-03-14 13:07:42 +03:00
Yurii	b07dd46f55	refactor: optimization * names changed: pin => gpio * ability to change OpenTherm GPIO without rebooting	2024-03-10 04:10:18 +03:00
Yurii	07ab121788	chore: bump OpenTherm Library to master	2024-03-09 00:03:34 +03:00
				`@@ -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)