chore: bump version to 1.5.4

refactor: BLE device support for ESP32 C6 (#147 )
Building on ``Arduino``+``ESP-IDF`` with ``h2zero/esp-nimble-cpp`` for ESP32 C6
2025-12-12 03:04:27 +05:00 · 2025-03-06 19:15:56 +03:00 · 2025-03-06 04:45:13 +03:00 · 2025-03-06 04:29:01 +03:00 · 2025-03-05 02:28:17 +03:00 · 2025-03-04 17:50:59 +03:00
41 changed files with 3223 additions and 1332 deletions
--- a/.gitignore
+++ b/.gitignore
@@ -1,8 +1,13 @@
 .pio
 .vscode
-build/*.bin
+build/*
 data/*
+managed_components/*
+node_modules/*
 secrets.ini
-node_modules
 package-lock.json
+*.lock
+sdkconfig.*
+CMakeLists.txt
+!sdkconfig.defaults
 !.gitkeep
--- a/README.md
+++ b/README.md
@@ -45,9 +45,11 @@ All available information and instructions can be found in the wiki:
 * [Home](https://github.com/Laxilef/OTGateway/wiki)
   * [Quick Start](https://github.com/Laxilef/OTGateway/wiki#quick-start)
   * [Build firmware](https://github.com/Laxilef/OTGateway/wiki#build-firmware)
-   * [Flash firmware via ESP Flash Download Tool](https://github.com/Laxilef/OTGateway/wiki#flash-firmware-via-esp-flash-download-tool)
+   * [Flashing via Web Flasher](https://github.com/Laxilef/OTGateway/wiki#flashing-via-web-flasher)
+   * [Flashing via ESP Flash Download Tool](https://github.com/Laxilef/OTGateway/wiki#flashing-via-esp-flash-download-tool)
   * [Settings](https://github.com/Laxilef/OTGateway/wiki#settings)
      * [External temperature sensors](https://github.com/Laxilef/OTGateway/wiki#external-temperature-sensors)
+      * [Other external sensors](https://github.com/Laxilef/OTGateway/wiki#other-external-sensors)
      * [Reporting indoor/outdoor temperature from any Home Assistant sensor](https://github.com/Laxilef/OTGateway/wiki#reporting-indooroutdoor-temperature-from-any-home-assistant-sensor)
      * [Reporting outdoor temperature from Home Assistant weather integration](https://github.com/Laxilef/OTGateway/wiki#reporting-outdoor-temperature-from-home-assistant-weather-integration)
      * [DHW meter](https://github.com/Laxilef/OTGateway/wiki#dhw-meter)
--- a/assets/2D_PCB_bottom.png
+++ b/assets/2D_PCB_bottom.png
--- a/assets/2D_PCB_top.png
+++ b/assets/2D_PCB_top.png
--- a/assets/BOM.xlsx
+++ b/assets/BOM.xlsx
--- a/assets/CPL.csv
+++ b/assets/CPL.csv
--- a/assets/Schematic.pdf
+++ b/assets/Schematic.pdf
@@ -365,7 +365,7 @@ BT
 10.80 TL
 0.000 0.000 0.502 rg
 730.08 129.39 Td
-(2024-12-07) Tj
+(2024-12-17) Tj
 ET
 7.20 w
 BT
@@ -405,7 +405,7 @@ BT
 10.80 TL
 0.000 0.000 0.502 rg
 506.48 21.39 Td
-(V1.5.2) Tj
+(V1.5.3) Tj
 ET
 7.20 w
 BT
@@ -1568,6 +1568,90 @@ BT
 714.36 413.76 Td
 (3.3V) Tj
 ET
+0.80 0.00 0.00 rg
+119.88 517.68 m 119.88 518.67 119.07 519.48 118.08 519.48 c
+117.09 519.48 116.28 518.67 116.28 517.68 c
+116.28 516.69 117.09 515.88 118.08 515.88 c
+119.07 515.88 119.88 516.69 119.88 517.68 c
+f
+0.80 0.00 0.00 rg
+119.88 481.68 m 119.88 482.67 119.07 483.48 118.08 483.48 c
+117.09 483.48 116.28 482.67 116.28 481.68 c
+116.28 480.69 117.09 479.88 118.08 479.88 c
+119.07 479.88 119.88 480.69 119.88 481.68 c
+f
+0.80 0.00 0.00 rg
+307.08 481.68 m 307.08 482.67 306.27 483.48 305.28 483.48 c
+304.29 483.48 303.48 482.67 303.48 481.68 c
+303.48 480.69 304.29 479.88 305.28 479.88 c
+306.27 479.88 307.08 480.69 307.08 481.68 c
+f
+0.80 0.00 0.00 rg
+253.08 481.68 m 253.08 482.67 252.27 483.48 251.28 483.48 c
+250.29 483.48 249.48 482.67 249.48 481.68 c
+249.48 480.69 250.29 479.88 251.28 479.88 c
+252.27 479.88 253.08 480.69 253.08 481.68 c
+f
+0.80 0.00 0.00 rg
+220.68 481.68 m 220.68 482.67 219.87 483.48 218.88 483.48 c
+217.89 483.48 217.08 482.67 217.08 481.68 c
+217.08 480.69 217.89 479.88 218.88 479.88 c
+219.87 479.88 220.68 480.69 220.68 481.68 c
+f
+0.80 0.00 0.00 rg
+220.68 517.68 m 220.68 518.67 219.87 519.48 218.88 519.48 c
+217.89 519.48 217.08 518.67 217.08 517.68 c
+217.08 516.69 217.89 515.88 218.88 515.88 c
+219.87 515.88 220.68 516.69 220.68 517.68 c
+f
+0.80 0.00 0.00 rg
+253.08 517.68 m 253.08 518.67 252.27 519.48 251.28 519.48 c
+250.29 519.48 249.48 518.67 249.48 517.68 c
+249.48 516.69 250.29 515.88 251.28 515.88 c
+252.27 515.88 253.08 516.69 253.08 517.68 c
+f
+0.80 0.00 0.00 rg
+263.88 517.68 m 263.88 518.67 263.07 519.48 262.08 519.48 c
+261.09 519.48 260.28 518.67 260.28 517.68 c
+260.28 516.69 261.09 515.88 262.08 515.88 c
+263.07 515.88 263.88 516.69 263.88 517.68 c
+f
+0.80 0.00 0.00 rg
+343.08 510.48 m 343.08 511.47 342.27 512.28 341.28 512.28 c
+340.29 512.28 339.48 511.47 339.48 510.48 c
+339.48 509.49 340.29 508.68 341.28 508.68 c
+342.27 508.68 343.08 509.49 343.08 510.48 c
+f
+0.80 0.00 0.00 rg
+357.48 510.48 m 357.48 511.47 356.67 512.28 355.68 512.28 c
+354.69 512.28 353.88 511.47 353.88 510.48 c
+353.88 509.49 354.69 508.68 355.68 508.68 c
+356.67 508.68 357.48 509.49 357.48 510.48 c
+f
+0.80 0.00 0.00 rg
+573.48 478.08 m 573.48 479.07 572.67 479.88 571.68 479.88 c
+570.69 479.88 569.88 479.07 569.88 478.08 c
+569.88 477.09 570.69 476.28 571.68 476.28 c
+572.67 476.28 573.48 477.09 573.48 478.08 c
+f
+0.80 0.00 0.00 rg
+703.08 416.88 m 703.08 417.87 702.27 418.68 701.28 418.68 c
+700.29 418.68 699.48 417.87 699.48 416.88 c
+699.48 415.89 700.29 415.08 701.28 415.08 c
+702.27 415.08 703.08 415.89 703.08 416.88 c
+f
+0.80 0.00 0.00 rg
+703.08 488.88 m 703.08 489.87 702.27 490.68 701.28 490.68 c
+700.29 490.68 699.48 489.87 699.48 488.88 c
+699.48 487.89 700.29 487.08 701.28 487.08 c
+702.27 487.08 703.08 487.89 703.08 488.88 c
+f
+0.80 0.00 0.00 rg
+659.88 208.08 m 659.88 209.07 659.07 209.88 658.08 209.88 c
+657.09 209.88 656.28 209.07 656.28 208.08 c
+656.28 207.09 657.09 206.28 658.08 206.28 c
+659.07 206.28 659.88 207.09 659.88 208.08 c
+f
 1 J
 1 j
 0.72 w
@@ -5108,90 +5192,6 @@ BT
 113.63 364.42 Td
 (N) Tj
 ET
-0.80 0.00 0.00 rg
-119.88 517.68 m 119.88 518.67 119.07 519.48 118.08 519.48 c
-117.09 519.48 116.28 518.67 116.28 517.68 c
-116.28 516.69 117.09 515.88 118.08 515.88 c
-119.07 515.88 119.88 516.69 119.88 517.68 c
-f
-0.80 0.00 0.00 rg
-119.88 481.68 m 119.88 482.67 119.07 483.48 118.08 483.48 c
-117.09 483.48 116.28 482.67 116.28 481.68 c
-116.28 480.69 117.09 479.88 118.08 479.88 c
-119.07 479.88 119.88 480.69 119.88 481.68 c
-f
-0.80 0.00 0.00 rg
-307.08 481.68 m 307.08 482.67 306.27 483.48 305.28 483.48 c
-304.29 483.48 303.48 482.67 303.48 481.68 c
-303.48 480.69 304.29 479.88 305.28 479.88 c
-306.27 479.88 307.08 480.69 307.08 481.68 c
-f
-0.80 0.00 0.00 rg
-253.08 481.68 m 253.08 482.67 252.27 483.48 251.28 483.48 c
-250.29 483.48 249.48 482.67 249.48 481.68 c
-249.48 480.69 250.29 479.88 251.28 479.88 c
-252.27 479.88 253.08 480.69 253.08 481.68 c
-f
-0.80 0.00 0.00 rg
-220.68 481.68 m 220.68 482.67 219.87 483.48 218.88 483.48 c
-217.89 483.48 217.08 482.67 217.08 481.68 c
-217.08 480.69 217.89 479.88 218.88 479.88 c
-219.87 479.88 220.68 480.69 220.68 481.68 c
-f
-0.80 0.00 0.00 rg
-220.68 517.68 m 220.68 518.67 219.87 519.48 218.88 519.48 c
-217.89 519.48 217.08 518.67 217.08 517.68 c
-217.08 516.69 217.89 515.88 218.88 515.88 c
-219.87 515.88 220.68 516.69 220.68 517.68 c
-f
-0.80 0.00 0.00 rg
-253.08 517.68 m 253.08 518.67 252.27 519.48 251.28 519.48 c
-250.29 519.48 249.48 518.67 249.48 517.68 c
-249.48 516.69 250.29 515.88 251.28 515.88 c
-252.27 515.88 253.08 516.69 253.08 517.68 c
-f
-0.80 0.00 0.00 rg
-263.88 517.68 m 263.88 518.67 263.07 519.48 262.08 519.48 c
-261.09 519.48 260.28 518.67 260.28 517.68 c
-260.28 516.69 261.09 515.88 262.08 515.88 c
-263.07 515.88 263.88 516.69 263.88 517.68 c
-f
-0.80 0.00 0.00 rg
-343.08 510.48 m 343.08 511.47 342.27 512.28 341.28 512.28 c
-340.29 512.28 339.48 511.47 339.48 510.48 c
-339.48 509.49 340.29 508.68 341.28 508.68 c
-342.27 508.68 343.08 509.49 343.08 510.48 c
-f
-0.80 0.00 0.00 rg
-357.48 510.48 m 357.48 511.47 356.67 512.28 355.68 512.28 c
-354.69 512.28 353.88 511.47 353.88 510.48 c
-353.88 509.49 354.69 508.68 355.68 508.68 c
-356.67 508.68 357.48 509.49 357.48 510.48 c
-f
-0.80 0.00 0.00 rg
-573.48 478.08 m 573.48 479.07 572.67 479.88 571.68 479.88 c
-570.69 479.88 569.88 479.07 569.88 478.08 c
-569.88 477.09 570.69 476.28 571.68 476.28 c
-572.67 476.28 573.48 477.09 573.48 478.08 c
-f
-0.80 0.00 0.00 rg
-703.08 416.88 m 703.08 417.87 702.27 418.68 701.28 418.68 c
-700.29 418.68 699.48 417.87 699.48 416.88 c
-699.48 415.89 700.29 415.08 701.28 415.08 c
-702.27 415.08 703.08 415.89 703.08 416.88 c
-f
-0.80 0.00 0.00 rg
-703.08 488.88 m 703.08 489.87 702.27 490.68 701.28 490.68 c
-700.29 490.68 699.48 489.87 699.48 488.88 c
-699.48 487.89 700.29 487.08 701.28 487.08 c
-702.27 487.08 703.08 487.89 703.08 488.88 c
-f
-0.80 0.00 0.00 rg
-659.88 208.08 m 659.88 209.07 659.07 209.88 658.08 209.88 c
-657.09 209.88 656.28 209.07 656.28 208.08 c
-656.28 207.09 657.09 206.28 658.08 206.28 c
-659.07 206.28 659.88 207.09 659.88 208.08 c
-f
 Q
 endstream
 endobj
@@ -5570,7 +5570,7 @@ BT
 10.80 TL
 0.000 0.000 0.502 rg
 730.08 129.39 Td
-(2024-12-07) Tj
+(2024-12-17) Tj
 ET
 7.20 w
 BT
@@ -5578,7 +5578,7 @@ BT
 10.80 TL
 0.000 0.000 0.502 rg
 730.08 114.99 Td
-(2024-09-17) Tj
+(2024-09-16) Tj
 ET
 7.20 w
 BT
@@ -5610,7 +5610,7 @@ BT
 10.80 TL
 0.000 0.000 0.502 rg
 506.48 21.39 Td
-(V1.5.2) Tj
+(V1.5.3) Tj
 ET
 7.20 w
 BT
@@ -8176,6 +8176,126 @@ BT
 796.27 436.17 Td
 (3.3V_B) Tj
 ET
+0.80 0.00 0.00 rg
+397.08 431.28 m 397.08 432.27 396.27 433.08 395.28 433.08 c
+394.29 433.08 393.48 432.27 393.48 431.28 c
+393.48 430.29 394.29 429.48 395.28 429.48 c
+396.27 429.48 397.08 430.29 397.08 431.28 c
+f
+0.80 0.00 0.00 rg
+224.28 463.68 m 224.28 464.67 223.47 465.48 222.48 465.48 c
+221.49 465.48 220.68 464.67 220.68 463.68 c
+220.68 462.69 221.49 461.88 222.48 461.88 c
+223.47 461.88 224.28 462.69 224.28 463.68 c
+f
+0.80 0.00 0.00 rg
+263.88 535.68 m 263.88 536.67 263.07 537.48 262.08 537.48 c
+261.09 537.48 260.28 536.67 260.28 535.68 c
+260.28 534.69 261.09 533.88 262.08 533.88 c
+263.07 533.88 263.88 534.69 263.88 535.68 c
+f
+0.80 0.00 0.00 rg
+249.48 517.68 m 249.48 518.67 248.67 519.48 247.68 519.48 c
+246.69 519.48 245.88 518.67 245.88 517.68 c
+245.88 516.69 246.69 515.88 247.68 515.88 c
+248.67 515.88 249.48 516.69 249.48 517.68 c
+f
+0.80 0.00 0.00 rg
+224.28 499.68 m 224.28 500.67 223.47 501.48 222.48 501.48 c
+221.49 501.48 220.68 500.67 220.68 499.68 c
+220.68 498.69 221.49 497.88 222.48 497.88 c
+223.47 497.88 224.28 498.69 224.28 499.68 c
+f
+0.80 0.00 0.00 rg
+584.28 478.08 m 584.28 479.07 583.47 479.88 582.48 479.88 c
+581.49 479.88 580.68 479.07 580.68 478.08 c
+580.68 477.09 581.49 476.28 582.48 476.28 c
+583.47 476.28 584.28 477.09 584.28 478.08 c
+f
+0.80 0.00 0.00 rg
+785.88 438.48 m 785.88 439.47 785.07 440.28 784.08 440.28 c
+783.09 440.28 782.28 439.47 782.28 438.48 c
+782.28 437.49 783.09 436.68 784.08 436.68 c
+785.07 436.68 785.88 437.49 785.88 438.48 c
+f
+0.80 0.00 0.00 rg
+688.68 514.08 m 688.68 515.07 687.87 515.88 686.88 515.88 c
+685.89 515.88 685.08 515.07 685.08 514.08 c
+685.08 513.09 685.89 512.28 686.88 512.28 c
+687.87 512.28 688.68 513.09 688.68 514.08 c
+f
+0.80 0.00 0.00 rg
+325.08 280.08 m 325.08 281.07 324.27 281.88 323.28 281.88 c
+322.29 281.88 321.48 281.07 321.48 280.08 c
+321.48 279.09 322.29 278.28 323.28 278.28 c
+324.27 278.28 325.08 279.09 325.08 280.08 c
+f
+0.80 0.00 0.00 rg
+789.48 524.88 m 789.48 525.87 788.67 526.68 787.68 526.68 c
+786.69 526.68 785.88 525.87 785.88 524.88 c
+785.88 523.89 786.69 523.08 787.68 523.08 c
+788.67 523.08 789.48 523.89 789.48 524.88 c
+f
+0.80 0.00 0.00 rg
+541.08 200.88 m 541.08 201.87 540.27 202.68 539.28 202.68 c
+538.29 202.68 537.48 201.87 537.48 200.88 c
+537.48 199.89 538.29 199.08 539.28 199.08 c
+540.27 199.08 541.08 199.89 541.08 200.88 c
+f
+0.80 0.00 0.00 rg
+112.68 67.68 m 112.68 68.67 111.87 69.48 110.88 69.48 c
+109.89 69.48 109.08 68.67 109.08 67.68 c
+109.08 66.69 109.89 65.88 110.88 65.88 c
+111.87 65.88 112.68 66.69 112.68 67.68 c
+f
+0.80 0.00 0.00 rg
+148.68 67.68 m 148.68 68.67 147.87 69.48 146.88 69.48 c
+145.89 69.48 145.08 68.67 145.08 67.68 c
+145.08 66.69 145.89 65.88 146.88 65.88 c
+147.87 65.88 148.68 66.69 148.68 67.68 c
+f
+0.80 0.00 0.00 rg
+137.88 319.68 m 137.88 320.67 137.07 321.48 136.08 321.48 c
+135.09 321.48 134.28 320.67 134.28 319.68 c
+134.28 318.69 135.09 317.88 136.08 317.88 c
+137.07 317.88 137.88 318.69 137.88 319.68 c
+f
+0.80 0.00 0.00 rg
+544.68 312.48 m 544.68 313.47 543.87 314.28 542.88 314.28 c
+541.89 314.28 541.08 313.47 541.08 312.48 c
+541.08 311.49 541.89 310.68 542.88 310.68 c
+543.87 310.68 544.68 311.49 544.68 312.48 c
+f
+0.80 0.00 0.00 rg
+278.28 431.28 m 278.28 432.27 277.47 433.08 276.48 433.08 c
+275.49 433.08 274.68 432.27 274.68 431.28 c
+274.68 430.29 275.49 429.48 276.48 429.48 c
+277.47 429.48 278.28 430.29 278.28 431.28 c
+f
+0.80 0.00 0.00 rg
+249.48 431.28 m 249.48 432.27 248.67 433.08 247.68 433.08 c
+246.69 433.08 245.88 432.27 245.88 431.28 c
+245.88 430.29 246.69 429.48 247.68 429.48 c
+248.67 429.48 249.48 430.29 249.48 431.28 c
+f
+0.80 0.00 0.00 rg
+224.28 431.28 m 224.28 432.27 223.47 433.08 222.48 433.08 c
+221.49 433.08 220.68 432.27 220.68 431.28 c
+220.68 430.29 221.49 429.48 222.48 429.48 c
+223.47 429.48 224.28 430.29 224.28 431.28 c
+f
+0.80 0.00 0.00 rg
+195.48 431.28 m 195.48 432.27 194.67 433.08 193.68 433.08 c
+192.69 433.08 191.88 432.27 191.88 431.28 c
+191.88 430.29 192.69 429.48 193.68 429.48 c
+194.67 429.48 195.48 430.29 195.48 431.28 c
+f
+0.80 0.00 0.00 rg
+224.28 535.68 m 224.28 536.67 223.47 537.48 222.48 537.48 c
+221.49 537.48 220.68 536.67 220.68 535.68 c
+220.68 534.69 221.49 533.88 222.48 533.88 c
+223.47 533.88 224.28 534.69 224.28 535.68 c
+f
 1 J
 1 j
 0.72 w
@@ -16078,126 +16198,6 @@ S
 359.280 175.680 m 
 352.080 175.680 l
 S
-0.80 0.00 0.00 rg
-397.08 431.28 m 397.08 432.27 396.27 433.08 395.28 433.08 c
-394.29 433.08 393.48 432.27 393.48 431.28 c
-393.48 430.29 394.29 429.48 395.28 429.48 c
-396.27 429.48 397.08 430.29 397.08 431.28 c
-f
-0.80 0.00 0.00 rg
-224.28 463.68 m 224.28 464.67 223.47 465.48 222.48 465.48 c
-221.49 465.48 220.68 464.67 220.68 463.68 c
-220.68 462.69 221.49 461.88 222.48 461.88 c
-223.47 461.88 224.28 462.69 224.28 463.68 c
-f
-0.80 0.00 0.00 rg
-263.88 535.68 m 263.88 536.67 263.07 537.48 262.08 537.48 c
-261.09 537.48 260.28 536.67 260.28 535.68 c
-260.28 534.69 261.09 533.88 262.08 533.88 c
-263.07 533.88 263.88 534.69 263.88 535.68 c
-f
-0.80 0.00 0.00 rg
-249.48 517.68 m 249.48 518.67 248.67 519.48 247.68 519.48 c
-246.69 519.48 245.88 518.67 245.88 517.68 c
-245.88 516.69 246.69 515.88 247.68 515.88 c
-248.67 515.88 249.48 516.69 249.48 517.68 c
-f
-0.80 0.00 0.00 rg
-224.28 499.68 m 224.28 500.67 223.47 501.48 222.48 501.48 c
-221.49 501.48 220.68 500.67 220.68 499.68 c
-220.68 498.69 221.49 497.88 222.48 497.88 c
-223.47 497.88 224.28 498.69 224.28 499.68 c
-f
-0.80 0.00 0.00 rg
-584.28 478.08 m 584.28 479.07 583.47 479.88 582.48 479.88 c
-581.49 479.88 580.68 479.07 580.68 478.08 c
-580.68 477.09 581.49 476.28 582.48 476.28 c
-583.47 476.28 584.28 477.09 584.28 478.08 c
-f
-0.80 0.00 0.00 rg
-785.88 438.48 m 785.88 439.47 785.07 440.28 784.08 440.28 c
-783.09 440.28 782.28 439.47 782.28 438.48 c
-782.28 437.49 783.09 436.68 784.08 436.68 c
-785.07 436.68 785.88 437.49 785.88 438.48 c
-f
-0.80 0.00 0.00 rg
-688.68 514.08 m 688.68 515.07 687.87 515.88 686.88 515.88 c
-685.89 515.88 685.08 515.07 685.08 514.08 c
-685.08 513.09 685.89 512.28 686.88 512.28 c
-687.87 512.28 688.68 513.09 688.68 514.08 c
-f
-0.80 0.00 0.00 rg
-325.08 280.08 m 325.08 281.07 324.27 281.88 323.28 281.88 c
-322.29 281.88 321.48 281.07 321.48 280.08 c
-321.48 279.09 322.29 278.28 323.28 278.28 c
-324.27 278.28 325.08 279.09 325.08 280.08 c
-f
-0.80 0.00 0.00 rg
-789.48 524.88 m 789.48 525.87 788.67 526.68 787.68 526.68 c
-786.69 526.68 785.88 525.87 785.88 524.88 c
-785.88 523.89 786.69 523.08 787.68 523.08 c
-788.67 523.08 789.48 523.89 789.48 524.88 c
-f
-0.80 0.00 0.00 rg
-541.08 200.88 m 541.08 201.87 540.27 202.68 539.28 202.68 c
-538.29 202.68 537.48 201.87 537.48 200.88 c
-537.48 199.89 538.29 199.08 539.28 199.08 c
-540.27 199.08 541.08 199.89 541.08 200.88 c
-f
-0.80 0.00 0.00 rg
-112.68 67.68 m 112.68 68.67 111.87 69.48 110.88 69.48 c
-109.89 69.48 109.08 68.67 109.08 67.68 c
-109.08 66.69 109.89 65.88 110.88 65.88 c
-111.87 65.88 112.68 66.69 112.68 67.68 c
-f
-0.80 0.00 0.00 rg
-148.68 67.68 m 148.68 68.67 147.87 69.48 146.88 69.48 c
-145.89 69.48 145.08 68.67 145.08 67.68 c
-145.08 66.69 145.89 65.88 146.88 65.88 c
-147.87 65.88 148.68 66.69 148.68 67.68 c
-f
-0.80 0.00 0.00 rg
-137.88 319.68 m 137.88 320.67 137.07 321.48 136.08 321.48 c
-135.09 321.48 134.28 320.67 134.28 319.68 c
-134.28 318.69 135.09 317.88 136.08 317.88 c
-137.07 317.88 137.88 318.69 137.88 319.68 c
-f
-0.80 0.00 0.00 rg
-544.68 312.48 m 544.68 313.47 543.87 314.28 542.88 314.28 c
-541.89 314.28 541.08 313.47 541.08 312.48 c
-541.08 311.49 541.89 310.68 542.88 310.68 c
-543.87 310.68 544.68 311.49 544.68 312.48 c
-f
-0.80 0.00 0.00 rg
-278.28 431.28 m 278.28 432.27 277.47 433.08 276.48 433.08 c
-275.49 433.08 274.68 432.27 274.68 431.28 c
-274.68 430.29 275.49 429.48 276.48 429.48 c
-277.47 429.48 278.28 430.29 278.28 431.28 c
-f
-0.80 0.00 0.00 rg
-249.48 431.28 m 249.48 432.27 248.67 433.08 247.68 433.08 c
-246.69 433.08 245.88 432.27 245.88 431.28 c
-245.88 430.29 246.69 429.48 247.68 429.48 c
-248.67 429.48 249.48 430.29 249.48 431.28 c
-f
-0.80 0.00 0.00 rg
-224.28 431.28 m 224.28 432.27 223.47 433.08 222.48 433.08 c
-221.49 433.08 220.68 432.27 220.68 431.28 c
-220.68 430.29 221.49 429.48 222.48 429.48 c
-223.47 429.48 224.28 430.29 224.28 431.28 c
-f
-0.80 0.00 0.00 rg
-195.48 431.28 m 195.48 432.27 194.67 433.08 193.68 433.08 c
-192.69 433.08 191.88 432.27 191.88 431.28 c
-191.88 430.29 192.69 429.48 193.68 429.48 c
-194.67 429.48 195.48 430.29 195.48 431.28 c
-f
-0.80 0.00 0.00 rg
-224.28 535.68 m 224.28 536.67 223.47 537.48 222.48 537.48 c
-221.49 537.48 220.68 536.67 220.68 535.68 c
-220.68 534.69 221.49 533.88 222.48 533.88 c
-223.47 533.88 224.28 534.69 224.28 535.68 c
-f
 Q
 endstream
 endobj
@@ -18501,7 +18501,7 @@ endobj
 428 0 obj
 <<
 /Producer (jsPDF 0.0.0)
-/CreationDate (D:20241207234636+03'00')
+/CreationDate (D:20250105015408+03'00')
 >>
 endobj
 429 0 obj
@@ -18950,7 +18950,7 @@ trailer
 /Size 430
 /Root 429 0 R
 /Info 428 0 R
-/ID [ <DE6EF81C840A106501DCF215445806E1> <DE6EF81C840A106501DCF215445806E1> ]
+/ID [ <0FF718394C008026CB860ADB87CB39D7> <0FF718394C008026CB860ADB87CB39D7> ]
 >>
 startxref
 266667
--- a/assets/gerber.zip
+++ b/assets/gerber.zip
--- a/gulpfile.js
+++ b/gulpfile.js
@@ -34,6 +34,10 @@ let paths = {
    {
      src: 'src_data/locales/*.json',
      dest: 'data/static/locales/'
+    },
+    {
+      src: 'src_data/*.json',
+      dest: 'data/static/'
    }
  ],
  static: [
@@ -44,6 +48,10 @@ let paths = {
    {
      src: 'src_data/images/*.*',
      dest: 'data/static/images/'
+    },
+    {
+      src: 'src_data/*.txt',
+      dest: 'data/static/'
    }
  ],
  pages: {
--- a/lib/BufferedWebServer/BufferedWebServer.h
+++ b/lib/BufferedWebServer/BufferedWebServer.h
@@ -12,16 +12,17 @@ public:

  template <class T>
  void send(int code, T contentType, const JsonVariantConst content, bool pretty = false) {
+    auto contentLength = pretty ? measureJsonPretty(content) : measureJson(content);
+
    #ifdef ARDUINO_ARCH_ESP8266
    if (!this->webServer->chunkedResponseModeStart(code, contentType)) {
      this->webServer->send(505, F("text/html"), F("HTTP1.1 required"));
      return;
    }

-    this->webServer->setContentLength(measureJson(content));
+    this->webServer->setContentLength(contentLength);
    #else
-    this->webServer->setContentLength(CONTENT_LENGTH_UNKNOWN);
-    this->webServer->sendHeader(F("Content-Length"), String(measureJson(content)));
+    this->webServer->setContentLength(contentLength);
    this->webServer->send(code, contentType, emptyString);
    #endif

--- a/lib/CustomOpenTherm/CustomOpenTherm.h
+++ b/lib/CustomOpenTherm/CustomOpenTherm.h
@@ -3,15 +3,15 @@

 class CustomOpenTherm : public OpenTherm {
 public:
-  typedef std::function<void()> YieldCallback;
+  typedef std::function<void(unsigned int)> DelayCallback;
  typedef std::function<void(unsigned long, byte)> BeforeSendRequestCallback;
  typedef std::function<void(unsigned long, unsigned long, OpenThermResponseStatus, byte)> AfterSendRequestCallback;

  CustomOpenTherm(int inPin = 4, int outPin = 5, bool isSlave = false) : OpenTherm(inPin, outPin, isSlave) {}
  ~CustomOpenTherm() {}

-  CustomOpenTherm* setYieldCallback(YieldCallback callback = nullptr) {
-    this->yieldCallback = callback;
+  CustomOpenTherm* setDelayCallback(DelayCallback callback = nullptr) {
+    this->delayCallback = callback;

    return this;
  }
@@ -32,10 +32,8 @@ public:
    _attempt++;

    while (!this->isReady()) {
-      if (this->yieldCallback) {
-        this->yieldCallback();
-      } else {
-        ::yield();
+      if (this->delayCallback) {
+        this->delayCallback(150);
      }

      this->process();
@@ -51,17 +49,13 @@ public:
      _response = 0;

    } else {
-      while (true) {
-        this->process();
-
-        if (this->status == OpenThermStatus::READY || this->status == OpenThermStatus::DELAY) {
-          break;
-        } else if (this->yieldCallback) {
-          this->yieldCallback();
-        } else {
-          ::yield();
+      do {
+        if (this->delayCallback) {
+          this->delayCallback(150);
        }
-      }
+
+        this->process();
+      } while (this->status != OpenThermStatus::READY && this->status != OpenThermStatus::DELAY);

      _response = this->getLastResponse();
      _responseStatus = this->getLastResponseStatus();
@@ -151,7 +145,7 @@ public:
  }

 protected:
-  YieldCallback yieldCallback;
+  DelayCallback delayCallback;
  BeforeSendRequestCallback beforeSendRequestCallback;
  AfterSendRequestCallback afterSendRequestCallback;
 };
--- a/lib/NetworkUtils/NetworkMgr.h
+++ b/lib/NetworkUtils/NetworkMgr.h
@@ -148,10 +148,10 @@ namespace NetworkUtils {
      // set policy manual for work 13 ch
      {
        #ifdef ARDUINO_ARCH_ESP8266
-        wifi_country_t country = {"CN", 1, 13, WIFI_COUNTRY_POLICY_AUTO};
+        wifi_country_t country = {"JP", 1, 14, WIFI_COUNTRY_POLICY_MANUAL};
        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};
+        const wifi_country_t country = {"JP", 1, 14, CONFIG_ESP32_PHY_MAX_WIFI_TX_POWER, WIFI_COUNTRY_POLICY_MANUAL};
        esp_wifi_set_country(&country);
        #endif
      }
@@ -384,7 +384,7 @@ namespace NetworkUtils {
  protected:
    const unsigned int reconnectInterval = 15000;
    const unsigned int failedConnectTimeout = 185000;
-    const unsigned int connectionTimeout = 5000;
+    const unsigned int connectionTimeout = 10000;
    const unsigned int resetConnectionTimeout = 90000;

    YieldCallback yieldCallback = []() {
--- a/lib/WebServerHandlers/StaticPage.h
+++ b/lib/WebServerHandlers/StaticPage.h
@@ -1,8 +1,5 @@
 #include <FS.h>
 #include <detail/mimetable.h>
-#if defined(ARDUINO_ARCH_ESP32)
-  #include <detail/RequestHandlersImpl.h>
-#endif

 using namespace mime;

@@ -54,13 +51,6 @@ public:
      if (this->eTag.isEmpty()) {
        if (server._eTagFunction) {
          this->eTag = (server._eTagFunction)(*this->fs, this->path);
-
-        } else {
-          #if defined(ARDUINO_ARCH_ESP8266)
-          this->eTag = esp8266webserver::calcETag(*this->fs, this->path);
-          #elif defined(ARDUINO_ARCH_ESP32)
-          this->eTag = StaticRequestHandler::calcETag(*this->fs, this->path);
-          #endif
        }
      }

--- a/platformio.ini
+++ b/platformio.ini
@@ -14,14 +14,13 @@ extra_configs = secrets.default.ini
 core_dir = .pio

 [env]
-version = 1.5.0
+version = 1.5.4
 framework = arduino
 lib_deps = 
-	bblanchon/ArduinoJson@^7.1.0
+	bblanchon/ArduinoJson@^7.3.0
 	;ihormelnyk/OpenTherm Library@^1.1.5
 	https://github.com/ihormelnyk/opentherm_library#master
-	;arduino-libraries/ArduinoMqttClient@^0.1.8
-	https://github.com/Laxilef/ArduinoMqttClient.git#esp32_core_310
+	arduino-libraries/ArduinoMqttClient@^0.1.8
 	lennarthennigs/ESP Telnet@^2.2
 	gyverlibs/FileData@^1.0.2
 	gyverlibs/GyverPID@^3.3.2
@@ -85,7 +84,7 @@ board_build.ldscript = eagle.flash.4m1m.ld
 ;platform_packages = 
 ;  framework-arduinoespressif32 @ https://github.com/espressif/arduino-esp32.git#3.0.5
 ;  framework-arduinoespressif32-libs @ https://github.com/espressif/esp32-arduino-lib-builder/releases/download/idf-release_v5.1/esp32-arduino-libs-idf-release_v5.1-33fbade6.zip
-platform = https://github.com/pioarduino/platform-espressif32/releases/download/53.03.10-rc3/platform-espressif32.zip
+platform = https://github.com/pioarduino/platform-espressif32/releases/download/53.03.13/platform-espressif32.zip
 platform_packages =
 board_build.partitions = esp32_partitions.csv
 lib_deps =
@@ -211,6 +210,7 @@ build_flags =
 	${esp32_defaults.build_flags}
 	-D ARDUINO_USB_MODE=0
 	-D ARDUINO_USB_CDC_ON_BOOT=1
+	-D CONFIG_BT_NIMBLE_EXT_ADV=1
 	-D USE_BLE=1
 	-D DEFAULT_OT_IN_GPIO=35
 	-D DEFAULT_OT_OUT_GPIO=36
@@ -234,6 +234,7 @@ build_unflags =
 build_type = ${esp32_defaults.build_type}
 build_flags = 
 	${esp32_defaults.build_flags}
+	-D CONFIG_BT_NIMBLE_EXT_ADV=1
 	-D USE_BLE=1
 	-D DEFAULT_OT_IN_GPIO=8
 	-D DEFAULT_OT_OUT_GPIO=10
@@ -286,12 +287,35 @@ build_flags =

 [env:esp32_c6]
 platform = ${esp32_defaults.platform}
+framework = arduino, espidf
 platform_packages = ${esp32_defaults.platform_packages}
 board = esp32-c6-devkitm-1
 board_build.partitions = ${esp32_defaults.board_build.partitions}
+lib_deps = ${esp32_defaults.lib_deps}
+lib_ignore = 
+	${esp32_defaults.lib_ignore}
+extra_scripts = ${esp32_defaults.extra_scripts}
+build_unflags = 
+	-mtext-section-literals
+build_type = ${esp32_defaults.build_type}
+build_flags = 
+	${esp32_defaults.build_flags}
+	-D USE_BLE=1
+	-D DEFAULT_OT_IN_GPIO=15
+	-D DEFAULT_OT_OUT_GPIO=23
+	-D DEFAULT_SENSOR_OUTDOOR_GPIO=0
+	-D DEFAULT_SENSOR_INDOOR_GPIO=0
+	-D DEFAULT_STATUS_LED_GPIO=11
+	-D DEFAULT_OT_RX_LED_GPIO=10
+
+[env:otthing] 
+platform = ${esp32_defaults.platform}
+platform_packages = ${esp32_defaults.platform_packages}
+board = lolin_c3_mini
+board_build.partitions = ${esp32_defaults.board_build.partitions}
 lib_deps = 
 	${esp32_defaults.lib_deps}
-	;${esp32_defaults.nimble_lib}
+	${esp32_defaults.nimble_lib}
 lib_ignore = ${esp32_defaults.lib_ignore}
 extra_scripts = ${esp32_defaults.extra_scripts}
 build_unflags = 
@@ -299,5 +323,12 @@ build_unflags =
 build_type = ${esp32_defaults.build_type}
 build_flags = 
 	${esp32_defaults.build_flags}
-	; Currently the NimBLE library is incompatible with ESP32 C6
-	;-D USE_BLE=1
+	-D CONFIG_BT_NIMBLE_EXT_ADV=1
+	-D USE_BLE=1
+	-D DEFAULT_OT_IN_GPIO=3
+	-D DEFAULT_OT_OUT_GPIO=1
+;	-D DEFAULT_SENSOR_OUTDOOR_GPIO=0
+;	-D DEFAULT_SENSOR_INDOOR_GPIO=1
+	-D DEFAULT_STATUS_LED_GPIO=8
+	-D DEFAULT_OT_RX_LED_GPIO=2
+	-D OT_BYPASS_RELAY_GPIO=20
--- a/sdkconfig.defaults
+++ b/sdkconfig.defaults
@@ -0,0 +1,33 @@
+# Source:
+# https://github.com/pioarduino/platform-espressif32/tree/main/examples/espidf-arduino-h2zero-BLE_scan
+
+CONFIG_FREERTOS_HZ=1000
+CONFIG_MBEDTLS_PSK_MODES=y
+CONFIG_MBEDTLS_KEY_EXCHANGE_PSK=y
+CONFIG_BOOTLOADER_COMPILER_OPTIMIZATION_SIZE=y
+CONFIG_COMPILER_OPTIMIZATION_SIZE=y
+CONFIG_ESPTOOLPY_FLASHSIZE_4MB=y
+CONFIG_ESPTOOLPY_HEADER_FLASHSIZE_UPDATE=y
+
+#
+# BT config
+CONFIG_BT_ENABLED=y
+CONFIG_BTDM_CTRL_MODE_BLE_ONLY=y
+CONFIG_BTDM_CTRL_MODE_BR_EDR_ONLY=n
+CONFIG_BTDM_CTRL_MODE_BTDM=n
+CONFIG_BT_BLUEDROID_ENABLED=n
+CONFIG_BT_NIMBLE_ENABLED=y
+
+#
+# Arduino Configuration
+CONFIG_AUTOSTART_ARDUINO=y
+CONFIG_ARDUINO_SELECTIVE_COMPILATION=y
+CONFIG_ARDUINO_SELECTIVE_Zigbee=n
+CONFIG_ARDUINO_SELECTIVE_Matter=n
+CONFIG_ARDUINO_SELECTIVE_WiFiProv=n
+CONFIG_ARDUINO_SELECTIVE_BLE=n
+CONFIG_ARDUINO_SELECTIVE_BluetoothSerial=n
+CONFIG_ARDUINO_SELECTIVE_SimpleBLE=n
+CONFIG_ARDUINO_SELECTIVE_RainMaker=n
+CONFIG_ARDUINO_SELECTIVE_OpenThread=n
+CONFIG_ARDUINO_SELECTIVE_Insights=n
--- a/src/HaHelper.h
+++ b/src/HaHelper.h
@@ -181,7 +181,7 @@ public:
    if (sSensor.type == Sensors::Type::BLUETOOTH) {
      // available state topic
      doc[FPSTR(HA_AVAILABILITY)][1][FPSTR(HA_TOPIC)] = doc[FPSTR(HA_STATE_TOPIC)];
-      doc[FPSTR(HA_AVAILABILITY)][1][FPSTR(HA_VALUE_TEMPLATE)] = AVAILABILITY_SENSOR_CONN;
+      doc[FPSTR(HA_AVAILABILITY)][1][FPSTR(HA_VALUE_TEMPLATE)] = JsonString(AVAILABILITY_SENSOR_CONN, true);

      String sName = sSensor.name;
      switch (vType) {
@@ -254,7 +254,7 @@ public:
    } else {
      // available state topic
      doc[FPSTR(HA_AVAILABILITY)][1][FPSTR(HA_TOPIC)] = doc[FPSTR(HA_STATE_TOPIC)];
-      doc[FPSTR(HA_AVAILABILITY)][1][FPSTR(HA_VALUE_TEMPLATE)] = AVAILABILITY_SENSOR_CONN;
+      doc[FPSTR(HA_AVAILABILITY)][1][FPSTR(HA_VALUE_TEMPLATE)] = JsonString(AVAILABILITY_SENSOR_CONN, true);

      doc[FPSTR(HA_NAME)] = sSensor.name;
      doc[FPSTR(HA_VALUE_TEMPLATE)] = F("{{ value_json.value|float(0)|round(2) }}");
@@ -970,7 +970,7 @@ public:
    JsonDocument doc;
    doc[FPSTR(HA_AVAILABILITY)][0][FPSTR(HA_TOPIC)] = this->statusTopic.c_str();
    doc[FPSTR(HA_AVAILABILITY)][1][FPSTR(HA_TOPIC)] = this->stateTopic.c_str();
-    doc[FPSTR(HA_AVAILABILITY)][1][FPSTR(HA_VALUE_TEMPLATE)] = AVAILABILITY_OT_CONN;
+    doc[FPSTR(HA_AVAILABILITY)][1][FPSTR(HA_VALUE_TEMPLATE)] = JsonString(AVAILABILITY_OT_CONN, true);
    doc[FPSTR(HA_AVAILABILITY_MODE)] = F("all");
    doc[FPSTR(HA_ENABLED_BY_DEFAULT)] = enabledByDefault;
    doc[FPSTR(HA_UNIQUE_ID)] = this->getObjectIdWithPrefix(F("heating"));
@@ -991,7 +991,7 @@ public:
    JsonDocument doc;
    doc[FPSTR(HA_AVAILABILITY)][0][FPSTR(HA_TOPIC)] = this->statusTopic.c_str();
    doc[FPSTR(HA_AVAILABILITY)][1][FPSTR(HA_TOPIC)] = this->stateTopic.c_str();
-    doc[FPSTR(HA_AVAILABILITY)][1][FPSTR(HA_VALUE_TEMPLATE)] = AVAILABILITY_OT_CONN;
+    doc[FPSTR(HA_AVAILABILITY)][1][FPSTR(HA_VALUE_TEMPLATE)] = JsonString(AVAILABILITY_OT_CONN, true);
    doc[FPSTR(HA_AVAILABILITY_MODE)] = F("all");
    doc[FPSTR(HA_ENABLED_BY_DEFAULT)] = enabledByDefault;
    doc[FPSTR(HA_UNIQUE_ID)] = this->getObjectIdWithPrefix(F("dhw"));
@@ -1012,7 +1012,7 @@ public:
    JsonDocument doc;
    doc[FPSTR(HA_AVAILABILITY)][0][FPSTR(HA_TOPIC)] = this->statusTopic.c_str();
    doc[FPSTR(HA_AVAILABILITY)][1][FPSTR(HA_TOPIC)] = this->stateTopic.c_str();
-    doc[FPSTR(HA_AVAILABILITY)][1][FPSTR(HA_VALUE_TEMPLATE)] = AVAILABILITY_OT_CONN;
+    doc[FPSTR(HA_AVAILABILITY)][1][FPSTR(HA_VALUE_TEMPLATE)] = JsonString(AVAILABILITY_OT_CONN, true);
    doc[FPSTR(HA_AVAILABILITY_MODE)] = F("all");
    doc[FPSTR(HA_ENABLED_BY_DEFAULT)] = enabledByDefault;
    doc[FPSTR(HA_UNIQUE_ID)] = this->getObjectIdWithPrefix(F("flame"));
@@ -1033,7 +1033,7 @@ public:
    JsonDocument doc;
    doc[FPSTR(HA_AVAILABILITY)][0][FPSTR(HA_TOPIC)] = this->statusTopic.c_str();
    doc[FPSTR(HA_AVAILABILITY)][1][FPSTR(HA_TOPIC)] = this->stateTopic.c_str();
-    doc[FPSTR(HA_AVAILABILITY)][1][FPSTR(HA_VALUE_TEMPLATE)] = AVAILABILITY_OT_CONN;
+    doc[FPSTR(HA_AVAILABILITY)][1][FPSTR(HA_VALUE_TEMPLATE)] = JsonString(AVAILABILITY_OT_CONN, true);
    doc[FPSTR(HA_AVAILABILITY_MODE)] = F("all");
    doc[FPSTR(HA_ENABLED_BY_DEFAULT)] = enabledByDefault;
    doc[FPSTR(HA_UNIQUE_ID)] = this->getObjectIdWithPrefix(F("fault"));
@@ -1054,7 +1054,7 @@ public:
    JsonDocument doc;
    doc[FPSTR(HA_AVAILABILITY)][0][FPSTR(HA_TOPIC)] = this->statusTopic.c_str();
    doc[FPSTR(HA_AVAILABILITY)][1][FPSTR(HA_TOPIC)] = this->stateTopic.c_str();
-    doc[FPSTR(HA_AVAILABILITY)][1][FPSTR(HA_VALUE_TEMPLATE)] = AVAILABILITY_OT_CONN;
+    doc[FPSTR(HA_AVAILABILITY)][1][FPSTR(HA_VALUE_TEMPLATE)] = JsonString(AVAILABILITY_OT_CONN, true);
    doc[FPSTR(HA_AVAILABILITY_MODE)] = F("all");
    doc[FPSTR(HA_ENABLED_BY_DEFAULT)] = enabledByDefault;
    doc[FPSTR(HA_UNIQUE_ID)] = this->getObjectIdWithPrefix(FPSTR(HA_ENTITY_CATEGORY_DIAGNOSTIC));
@@ -1215,7 +1215,7 @@ public:

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

--- a/src/MainTask.h
+++ b/src/MainTask.h
@@ -38,6 +38,7 @@ protected:
  unsigned long heatingDisabledTime = 0;
  PumpStartReason extPumpStartReason = PumpStartReason::NONE;
  unsigned long externalPumpStartTime = 0;
+  bool ntpStarted = false;
  bool telnetStarted = false;
  bool emergencyDetected = false;
  unsigned long emergencyFlipTime = 0;
@@ -109,6 +110,16 @@ protected:
    }

    if (network->isConnected()) {
+      if (!this->ntpStarted) {
+        if (strlen(settings.system.ntp.server)) {
+          configTime(0, 0, settings.system.ntp.server);
+          setenv("TZ", settings.system.ntp.timezone, 1);
+          tzset();
+
+          this->ntpStarted = true;
+        }
+      }
+
      if (!this->telnetStarted && telnetStream != nullptr) {
        telnetStream->begin(23, false);
        this->telnetStarted = true;
@@ -124,6 +135,10 @@ protected:
      Sensors::setConnectionStatusByType(Sensors::Type::MANUAL, !settings.mqtt.enabled || vars.mqtt.connected, false);

    } else {
+      if (this->ntpStarted) {
+        this->ntpStarted = false;
+      }
+
      if (this->telnetStarted) {
        telnetStream->stop();
        this->telnetStarted = false;
@@ -229,7 +244,7 @@ protected:
        emergencyFlags |= 0b00000010;
      }
      
-      if (settings.opentherm.nativeHeatingControl) {
+      if (settings.opentherm.options.nativeHeatingControl) {
        emergencyFlags |= 0b00000100;
      }
    }
--- a/src/MqttTask.h
+++ b/src/MqttTask.h
@@ -70,8 +70,8 @@ public:
    this->prevPubVarsTime = 0;
  }

-  inline void rebuildHaEntity(uint8_t sensorId, Sensors::Settings& prevSettings) {
-    this->queueRebuildingHaEntities[sensorId] = prevSettings;
+  inline void reconfigureSensor(uint8_t sensorId, Sensors::Settings& prevSettings) {
+    this->queueReconfigureSensors[sensorId] = prevSettings;
  }

 protected:
@@ -81,7 +81,7 @@ protected:
  MqttWriter* writer = nullptr;
  UnitSystem currentUnitSystem = UnitSystem::METRIC;
  bool currentHomeAssistantDiscovery = false;
-  std::unordered_map<uint8_t, Sensors::Settings> queueRebuildingHaEntities;
+  std::unordered_map<uint8_t, Sensors::Settings> queueReconfigureSensors;
  unsigned short readyForSendTime = 30000;
  unsigned long lastReconnectTime = 0;
  unsigned long connectedTime = 0;
@@ -120,7 +120,6 @@ protected:
    #endif

    // client settings
-    this->client->setKeepAliveInterval(15000);
    this->client->setTxPayloadSize(256);
    #ifdef ARDUINO_ARCH_ESP8266
    this->client->setConnectionTimeout(1000);
@@ -197,14 +196,14 @@ protected:

      this->haHelper->setDevicePrefix(settings.mqtt.prefix);
      this->haHelper->updateCachedTopics();
+
      this->client->stop();
+      this->client->setKeepAliveInterval(settings.mqtt.interval * 10000);
      this->client->setId(networkSettings.hostname);
      this->client->setUsernamePassword(settings.mqtt.user, settings.mqtt.password);
-
      this->client->beginWill(this->haHelper->getDeviceTopic(F("status")).c_str(), 7, true, 1);
      this->client->print(F("offline"));
      this->client->endWill();
-
      this->client->connect(settings.mqtt.server, settings.mqtt.port);
      this->lastReconnectTime = millis();
      this->yield();
@@ -277,8 +276,8 @@ protected:
        this->publishNonStaticHaEntities();
      }

-
-      for (auto& [sensorId, prevSettings] : this->queueRebuildingHaEntities) {
+      // rebuilding ha configs
+      for (auto& [sensorId, prevSettings] : this->queueReconfigureSensors) {
        Log.sinfoln(FPSTR(L_MQTT_HA), F("Rebuilding config for sensor #%hhu '%s'"), sensorId, prevSettings.name);

        // delete old config
@@ -298,15 +297,6 @@ protected:
              this->haHelper->deleteSignalQualityDynamicSensor(prevSettings);
              this->haHelper->deleteDynamicSensor(prevSettings, Sensors::ValueType::TEMPERATURE);
              break;
-            
-            case Sensors::Type::MANUAL:
-              this->client->unsubscribe(
-                this->haHelper->getDeviceTopic(
-                  F("sensors"),
-                  Sensors::makeObjectId(prevSettings.name).c_str(),
-                  F("set")
-                ).c_str()
-              );

            default:
              this->haHelper->deleteDynamicSensor(prevSettings, Sensors::ValueType::PRIMARY);
@@ -334,26 +324,51 @@ protected:
            this->haHelper->publishSignalQualityDynamicSensor(sSettings, false);
            this->haHelper->publishDynamicSensor(sSettings, Sensors::ValueType::TEMPERATURE, settings.system.unitSystem);
            break;
-
-          case Sensors::Type::MANUAL: 
-            this->client->subscribe(
-              this->haHelper->getDeviceTopic(
-                F("sensors"),
-                Sensors::makeObjectId(prevSettings.name).c_str(),
-                F("set")
-              ).c_str()
-            );
          
          default:
            this->haHelper->publishDynamicSensor(sSettings, Sensors::ValueType::PRIMARY, settings.system.unitSystem);
        }
      }
-      this->queueRebuildingHaEntities.clear();

    } else if (this->currentHomeAssistantDiscovery) {
      this->currentHomeAssistantDiscovery = false;
    }

+    // reconfigure manual sensors
+    for (auto& [sensorId, prevSettings] : this->queueReconfigureSensors) {
+      // unsubscribe from old topic
+      if (strlen(prevSettings.name) && prevSettings.enabled) {
+        if (prevSettings.type == Sensors::Type::MANUAL) {
+          this->client->unsubscribe(
+            this->haHelper->getDeviceTopic(
+              F("sensors"),
+              Sensors::makeObjectId(prevSettings.name).c_str(),
+              F("set")
+            ).c_str()
+          );
+        }
+      }
+
+      if (!Sensors::hasEnabledAndValid(sensorId)) {
+        continue;
+      }
+
+      // subscribe to new topic
+      auto& sSettings = Sensors::settings[sensorId];
+      if (sSettings.type == Sensors::Type::MANUAL) {
+        this->client->subscribe(
+          this->haHelper->getDeviceTopic(
+            F("sensors"),
+            Sensors::makeObjectId(sSettings.name).c_str(),
+            F("set")
+          ).c_str()
+        );
+      }
+    }
+
+    // clear queue
+    this->queueReconfigureSensors.clear();
+
    if (this->newConnection) {
      this->newConnection = false;
    }
@@ -367,6 +382,26 @@ protected:

    this->client->subscribe(this->haHelper->getDeviceTopic(F("settings/set")).c_str());
    this->client->subscribe(this->haHelper->getDeviceTopic(F("state/set")).c_str());
+
+    // subscribe to manual sensors
+    for (uint8_t sensorId = 0; sensorId <= Sensors::getMaxSensorId(); sensorId++) {
+      if (!Sensors::hasEnabledAndValid(sensorId)) {
+        continue;
+      }
+
+      auto& sSettings = Sensors::settings[sensorId];
+      if (sSettings.type != Sensors::Type::MANUAL) {
+        continue;
+      }
+
+      this->client->subscribe(
+        this->haHelper->getDeviceTopic(
+          F("sensors"),
+          Sensors::makeObjectId(sSettings.name).c_str(),
+          F("set")
+        ).c_str()
+      );
+    }
  }

  void onDisconnect() {
@@ -514,15 +549,6 @@ protected:
          this->haHelper->publishSignalQualityDynamicSensor(sSettings, false);
          this->haHelper->publishDynamicSensor(sSettings, Sensors::ValueType::TEMPERATURE, settings.system.unitSystem);
          break;
-
-        case Sensors::Type::MANUAL:
-          this->client->subscribe(
-            this->haHelper->getDeviceTopic(
-              F("sensors"),
-              Sensors::makeObjectId(sSettings.name).c_str(),
-              F("set")
-            ).c_str()
-          );
        
        default:
          this->haHelper->publishDynamicSensor(sSettings, Sensors::ValueType::PRIMARY, settings.system.unitSystem);
@@ -532,13 +558,13 @@ protected:

  bool publishNonStaticHaEntities(bool force = false) {
    static byte _heatingMinTemp, _heatingMaxTemp, _dhwMinTemp, _dhwMaxTemp = 0;
-    static bool _indoorTempControl, _dhwPresent = false;
+    static bool _indoorTempControl, _dhwSupport = false;

    bool published = false;
-    if (force || _dhwPresent != settings.opentherm.dhwPresent) {
-      _dhwPresent = settings.opentherm.dhwPresent;
+    if (force || _dhwSupport != settings.opentherm.options.dhwSupport) {
+      _dhwSupport = settings.opentherm.options.dhwSupport;

-      if (_dhwPresent) {
+      if (_dhwSupport) {
        this->haHelper->publishInputDhwMinTemp(settings.system.unitSystem);
        this->haHelper->publishInputDhwMaxTemp(settings.system.unitSystem);
        this->haHelper->publishDhwState();
@@ -569,7 +595,7 @@ protected:
      published = true;
    }

-    if (_dhwPresent && (force || _dhwMinTemp != settings.dhw.minTemp || _dhwMaxTemp != settings.dhw.maxTemp)) {
+    if (_dhwSupport && (force || _dhwMinTemp != settings.dhw.minTemp || _dhwMaxTemp != settings.dhw.maxTemp)) {
      _dhwMinTemp = settings.dhw.minTemp;
      _dhwMaxTemp = settings.dhw.maxTemp;

--- a/src/OpenThermTask.h
+++ b/src/OpenThermTask.h
@@ -10,17 +10,21 @@ public:
  }

 protected:
-  const unsigned short readyTime = 60000;
-  const unsigned short heatingSetTempInterval = 60000;
-  const unsigned short dhwSetTempInterval = 60000;
-  const unsigned short ch2SetTempInterval = 60000;
-  const unsigned int initializingInterval = 3600000;
+  const unsigned short readyTime = 60000u;
+  const unsigned int resetBusInterval = 120000u;
+  const unsigned short heatingSetTempInterval = 60000u;
+  const unsigned short dhwSetTempInterval = 60000u;
+  const unsigned short ch2SetTempInterval = 60000u;
+  const unsigned int initializingInterval = 3600000u;

  CustomOpenTherm* instance = nullptr;
  unsigned long instanceCreatedTime = 0;
  byte instanceInGpio = 0;
  byte instanceOutGpio = 0;
  bool initialized = false;
+  unsigned long connectedTime = 0;
+  unsigned long disconnectedTime = 0;
+  unsigned long resetBusTime = 0;
  unsigned long initializedTime = 0;
  unsigned long lastSuccessResponse = 0;
  unsigned long prevUpdateNonEssentialVars = 0;
@@ -69,6 +73,11 @@ protected:
      return;
    }

+    #ifdef OT_BYPASS_RELAY_GPIO
+    pinMode(OT_BYPASS_RELAY_GPIO, OUTPUT);
+    digitalWrite(OT_BYPASS_RELAY_GPIO, true);
+    #endif
+
    // create instance
    this->instance = new CustomOpenTherm(settings.opentherm.inGpio, settings.opentherm.outGpio);

@@ -76,6 +85,7 @@ protected:
    this->instanceCreatedTime = millis();
    this->instanceInGpio = settings.opentherm.inGpio;
    this->instanceOutGpio = settings.opentherm.outGpio;
+    this->resetBusTime = millis();
    this->initialized = false;

    Log.sinfoln(FPSTR(L_OT), F("Started. GPIO IN: %hhu, GPIO OUT: %hhu"), settings.opentherm.inGpio, settings.opentherm.outGpio);
@@ -98,11 +108,9 @@ protected:
      }
    });

-    this->instance->setYieldCallback([this]() {
-      this->delay(25);
+    this->instance->setDelayCallback([this](unsigned int time) {
+      this->delay(time);
    });
-
-    this->instance->begin();
  }

  void loop() {
@@ -128,6 +136,9 @@ protected:
    if (this->instance == nullptr) {
      this->delay(5000);
      return;
+
+    } else if (this->instance->status == OpenThermStatus::NOT_INITIALIZED) {
+      this->instance->begin();
    }

    // RX LED GPIO setup
@@ -153,18 +164,18 @@ protected:
      && !vars.master.heating.blocking;

    // DHW settings
-    vars.master.dhw.enabled = settings.opentherm.dhwPresent && settings.dhw.enabled;
+    vars.master.dhw.enabled = settings.opentherm.options.dhwSupport && settings.dhw.enabled;
    vars.master.dhw.targetTemp = settings.dhw.target;

    // CH2 settings
-    vars.master.ch2.enabled = settings.opentherm.heatingCh2Enabled
-      || (settings.opentherm.heatingCh1ToCh2 && vars.master.heating.enabled)
-      || (settings.opentherm.dhwToCh2 && settings.opentherm.dhwPresent && settings.dhw.enabled);
+    vars.master.ch2.enabled = settings.opentherm.options.ch2AlwaysEnabled
+      || (settings.opentherm.options.heatingToCh2 && vars.master.heating.enabled)
+      || (settings.opentherm.options.dhwToCh2 && settings.opentherm.options.dhwSupport && settings.dhw.enabled);

-    if (settings.opentherm.heatingCh1ToCh2) {
+    if (settings.opentherm.options.heatingToCh2) {
      vars.master.ch2.targetTemp = vars.master.heating.setpointTemp;

-    } else if (settings.opentherm.dhwToCh2) {
+    } else if (settings.opentherm.options.dhwToCh2) {
      vars.master.ch2.targetTemp = vars.master.dhw.targetTemp;
    }

@@ -174,18 +185,24 @@ protected:

    // Immergas fix
    // https://arduino.ru/forum/programmirovanie/termostat-opentherm-na-esp8266?page=15#comment-649392
-    if (settings.opentherm.immergasFix) {
+    if (settings.opentherm.options.immergasFix) {
      statusLb = 0xCA;
    }

+    // Summer/winter mode
+    bool summerWinterMode = settings.opentherm.options.summerWinterMode;
+    if (settings.opentherm.options.heatingStateToSummerWinterMode) {
+      summerWinterMode = vars.master.heating.enabled == summerWinterMode;
+    }
+
    unsigned long response = this->instance->setBoilerStatus(
      vars.master.heating.enabled,
      vars.master.dhw.enabled,
-      false,
-      settings.opentherm.nativeHeatingControl,
+      settings.opentherm.options.coolingSupport,
+      settings.opentherm.options.nativeHeatingControl,
      vars.master.ch2.enabled,
-      settings.opentherm.summerWinterMode,
-      settings.opentherm.dhwBlocking,
+      summerWinterMode,
+      settings.opentherm.options.dhwBlocking,
      statusLb
    );

@@ -197,13 +214,27 @@ protected:
      );
    }

-    if (!vars.slave.connected && millis() - this->lastSuccessResponse < 1150) {
-      Log.sinfoln(FPSTR(L_OT), F("Connected"));
+    // 5 request retries
+    // 1000ms maximum response waiting time
+    // 100ms delay between requests
+    // +15%
+    // 5 * (1000 + 100) * 1.15 = 6325 ms
+    if (!vars.slave.connected && millis() - this->lastSuccessResponse < 6325) {
+      Log.sinfoln(
+        FPSTR(L_OT),
+        F("Connected, downtime: %lu s."),
+        (millis() - this->disconnectedTime) / 1000
+      );
      
+      this->connectedTime = millis();
      vars.slave.connected = true;
      
-    } else if (vars.slave.connected && millis() - this->lastSuccessResponse > 1150) {
-      Log.swarningln(FPSTR(L_OT), F("Disconnected"));
+    } else if (vars.slave.connected && millis() - this->lastSuccessResponse > 6325) {
+      Log.swarningln(
+        FPSTR(L_OT),
+        F("Disconnected, uptime: %lu s."),
+        (millis() - this->connectedTime) / 1000  
+      );

      // Mark sensors as disconnected
      Sensors::setConnectionStatusByType(Sensors::Type::OT_OUTDOOR_TEMP, false);
@@ -227,6 +258,7 @@ protected:
      Sensors::setConnectionStatusByType(Sensors::Type::OT_FAN_SPEED_CURRENT, false);

      this->initialized = false;
+      this->disconnectedTime = millis();
      vars.slave.connected = false;
    }

@@ -242,6 +274,20 @@ protected:
      vars.slave.diag.active = false;
      vars.slave.diag.code = 0;

+      // reset bus
+      if (millis() - this->disconnectedTime > this->resetBusInterval) {
+        if (millis() - this->resetBusTime > this->resetBusInterval) {
+          Log.sinfoln(FPSTR(L_OT), F("Reset bus..."));
+
+          this->instance->end();
+          this->instance->status = OpenThermStatus::NOT_INITIALIZED;
+
+          digitalWrite(this->instanceOutGpio, LOW);
+          this->resetBusTime = millis();
+          this->delay(5000);
+        }
+      }
+
      return;
    }

@@ -265,15 +311,16 @@ protected:
    }

    vars.slave.heating.active = CustomOpenTherm::isCentralHeatingActive(response);
-    vars.slave.dhw.active = settings.opentherm.dhwPresent ? CustomOpenTherm::isHotWaterActive(response) : false;
+    vars.slave.dhw.active = settings.opentherm.options.dhwSupport ? CustomOpenTherm::isHotWaterActive(response) : false;
    vars.slave.flame = CustomOpenTherm::isFlameOn(response);
+    vars.slave.cooling = CustomOpenTherm::isCoolingActive(response);
    vars.slave.fault.active = CustomOpenTherm::isFault(response);
    vars.slave.diag.active = CustomOpenTherm::isDiagnostic(response);

    Log.snoticeln(
-      FPSTR(L_OT), F("Received boiler status. Heating: %hhu; DHW: %hhu; flame: %hhu; fault: %hhu; diag: %hhu"),
+      FPSTR(L_OT), F("Received boiler status. Heating: %hhu; DHW: %hhu; flame: %hhu; cooling: %hhu; fault: %hhu; diag: %hhu"),
      vars.slave.heating.active, vars.slave.dhw.active,
-      vars.slave.flame, vars.slave.fault.active, vars.slave.diag.active
+      vars.slave.flame, vars.slave.cooling, vars.slave.fault.active, vars.slave.diag.active
    );

    // These parameters will be updated every minute
@@ -309,7 +356,7 @@ protected:
        Log.swarningln(FPSTR(L_OT), F("Failed receive min modulation and max power"));
      }

-      if (!vars.master.heating.enabled && settings.opentherm.modulationSyncWithHeating) {
+      if (!vars.master.heating.enabled && settings.opentherm.options.modulationSyncWithHeating) {
        if (this->setMaxModulationLevel(0)) {
          Log.snoticeln(FPSTR(L_OT), F("Set max modulation: 0% (response: %hhu%%)"), vars.slave.modulation.max);

@@ -334,7 +381,7 @@ protected:


      // Get DHW min/max temp (if necessary)
-      if (settings.opentherm.dhwPresent && settings.opentherm.getMinMaxTemp) {
+      if (settings.opentherm.options.dhwSupport && settings.opentherm.options.getMinMaxTemp) {
        if (this->updateMinMaxDhwTemp()) {
          uint8_t convertedMinTemp = convertTemp(
            vars.slave.dhw.minTemp,
@@ -380,7 +427,7 @@ protected:


      // Get heating min/max temp
-      if (settings.opentherm.getMinMaxTemp) {
+      if (settings.opentherm.options.getMinMaxTemp) {
        if (this->updateMinMaxHeatingTemp()) {
          uint8_t convertedMinTemp = convertTemp(
            vars.slave.heating.minTemp,
@@ -520,7 +567,7 @@ protected:
    }

    // Update DHW temp
-    if (settings.opentherm.dhwPresent && Sensors::getAmountByType(Sensors::Type::OT_DHW_TEMP, true)) {
+    if (settings.opentherm.options.dhwSupport && Sensors::getAmountByType(Sensors::Type::OT_DHW_TEMP, true)) {
      bool result = this->updateDhwTemp();

      if (result) {
@@ -546,7 +593,7 @@ protected:
    }

    // Update DHW temp 2
-    if (settings.opentherm.dhwPresent && Sensors::getAmountByType(Sensors::Type::OT_DHW_TEMP2, true)) {
+    if (settings.opentherm.options.dhwSupport && Sensors::getAmountByType(Sensors::Type::OT_DHW_TEMP2, true)) {
      if (this->updateDhwTemp2()) {
        float convertedDhwTemp2 = convertTemp(
          vars.slave.dhw.currentTemp2,
@@ -570,7 +617,7 @@ protected:
    }

    // Update DHW flow rate
-    if (settings.opentherm.dhwPresent && Sensors::getAmountByType(Sensors::Type::OT_DHW_FLOW_RATE, true)) {
+    if (settings.opentherm.options.dhwSupport && Sensors::getAmountByType(Sensors::Type::OT_DHW_FLOW_RATE, true)) {
      if (this->updateDhwFlowRate()) {
        float convertedDhwFlowRate = convertVolume(
          vars.slave.dhw.flowRate,
@@ -643,7 +690,7 @@ protected:

    // Update CH2 temp
    if (Sensors::getAmountByType(Sensors::Type::OT_CH2_TEMP, true)) {
-      if (vars.master.ch2.enabled && !settings.opentherm.nativeHeatingControl) {
+      if (vars.master.ch2.enabled && !settings.opentherm.options.nativeHeatingControl) {
        if (this->updateCh2Temp()) {
          float convertedCh2Temp = convertTemp(
            vars.slave.ch2.currentTemp,
@@ -942,7 +989,7 @@ protected:
    }

    // Native heating control
-    if (settings.opentherm.nativeHeatingControl) {
+    if (settings.opentherm.options.nativeHeatingControl) {
      // Converted current indoor temp
      float convertedTemp = convertTemp(vars.master.heating.indoorTemp, settings.system.unitSystem, settings.opentherm.unitSystem);

@@ -958,7 +1005,7 @@ protected:
      }

      // Set current CH2 indoor temp
-      if (settings.opentherm.heatingCh1ToCh2) {
+      if (settings.opentherm.options.heatingToCh2) {
        if (this->setRoomTempCh2(convertedTemp)) {
          Log.sinfoln(
            FPSTR(L_OT_HEATING), F("Set current CH2 indoor temp: %.2f (converted: %.2f, response: %.2f)"),
@@ -990,7 +1037,7 @@ protected:
      }

      // Set target CH2 temp
-      if (settings.opentherm.heatingCh1ToCh2 && this->needSetCh2Temp(convertedTemp)) {
+      if (settings.opentherm.options.heatingToCh2 && this->needSetCh2Temp(convertedTemp)) {
        if (this->setRoomSetpointCh2(convertedTemp)) {
          this->ch2SetTempTime = millis();

@@ -1006,20 +1053,25 @@ protected:
    }

    // Normal heating control
-    if (!settings.opentherm.nativeHeatingControl && vars.master.heating.enabled) {
+    if (!settings.opentherm.options.nativeHeatingControl && vars.master.heating.enabled) {
      // Converted target heating temp
      float convertedTemp = convertTemp(vars.master.heating.setpointTemp, settings.system.unitSystem, settings.opentherm.unitSystem);

      if (this->needSetHeatingTemp(convertedTemp)) {
        // Set max heating temp
-        if (this->setMaxHeatingTemp(convertedTemp)) {
-          Log.sinfoln(
-            FPSTR(L_OT_HEATING), F("Set max heating temp: %.2f (converted: %.2f)"),
-            vars.master.heating.setpointTemp, convertedTemp
-          );
+        if (settings.opentherm.options.maxTempSyncWithTargetTemp) {
+          if (this->setMaxHeatingTemp(convertedTemp)) {
+            Log.sinfoln(
+              FPSTR(L_OT_HEATING), F("Set max heating temp: %.2f (converted: %.2f)"),
+              vars.master.heating.setpointTemp, convertedTemp
+            );

-        } else {
-          Log.swarningln(FPSTR(L_OT_HEATING), F("Failed set max heating temp"));
+          } else {
+            Log.swarningln(
+              FPSTR(L_OT_HEATING), F("Failed set max heating temp: %.2f (converted: %.2f)"),
+              vars.master.heating.setpointTemp, convertedTemp
+            );
+          }
        }

        // Set target heating temp
@@ -1038,8 +1090,8 @@ protected:
    }

    // Set CH2 temp
-    if (!settings.opentherm.nativeHeatingControl && vars.master.ch2.enabled) {
-      if (settings.opentherm.heatingCh1ToCh2 || settings.opentherm.dhwToCh2) {
+    if (!settings.opentherm.options.nativeHeatingControl && vars.master.ch2.enabled) {
+      if (settings.opentherm.options.heatingToCh2 || settings.opentherm.options.dhwToCh2) {
        // Converted target CH2 temp
        float convertedTemp = convertTemp(
          vars.master.ch2.targetTemp,
--- a/src/PortalTask.h
+++ b/src/PortalTask.h
@@ -1,10 +1,12 @@
 //#define PORTAL_CACHE "max-age=86400"
 #define PORTAL_CACHE nullptr
 #ifdef ARDUINO_ARCH_ESP8266
+#include <ESP8266mDNS.h>
 #include <ESP8266WebServer.h>
 #include <Updater.h>
 using WebServer = ESP8266WebServer;
 #else
+#include <ESPmDNS.h>
 #include <WebServer.h>
 #include <Update.h>
 #endif
@@ -53,7 +55,7 @@ protected:
  bool webServerEnabled = false;
  bool dnsServerEnabled = false;
  unsigned long webServerChangeState = 0;
-  unsigned long dnsServerChangeState = 0;
+  bool mDnsState = false;

  #if defined(ARDUINO_ARCH_ESP32)
  const char* getTaskName() override {
@@ -616,7 +618,7 @@ protected:
      }

      if (changed) {
-        tMqtt->rebuildHaEntity(sensorId, prevSettings);
+        tMqtt->reconfigureSensor(sensorId, prevSettings);
        fsSensorsSettings.update();
      }
    });
@@ -858,6 +860,7 @@ protected:
      }
    });

+    this->webServer->serveStatic("/robots.txt", LittleFS, "/static/robots.txt", PORTAL_CACHE);
    this->webServer->serveStatic("/favicon.ico", LittleFS, "/static/images/favicon.ico", PORTAL_CACHE);
    this->webServer->serveStatic("/static", LittleFS, "/static", PORTAL_CACHE);
  }
@@ -872,6 +875,16 @@ protected:
      this->startWebServer();
      Log.straceln(FPSTR(L_PORTAL_WEBSERVER), F("Started: AP up or STA connected"));

+      // Enabling mDNS
+      if (!this->mDnsState && settings.portal.mdns) {
+        if (MDNS.begin(networkSettings.hostname)) {
+          MDNS.addService("http", "tcp", 80);
+          this->mDnsState = true;
+
+          Log.straceln(FPSTR(L_PORTAL_WEBSERVER), F("mDNS enabled and service added"));
+        }
+      }
+
      #ifdef ARDUINO_ARCH_ESP8266
      ::optimistic_yield(1000);
      #endif
@@ -880,13 +893,29 @@ protected:
      this->stopWebServer();
      Log.straceln(FPSTR(L_PORTAL_WEBSERVER), F("Stopped: AP and STA down"));

+      // Disabling mDNS
+      if (this->mDnsState) {
+        MDNS.end();
+        this->mDnsState = false;
+
+        Log.straceln(FPSTR(L_PORTAL_WEBSERVER), F("mDNS disabled"));
+      }
+
      #ifdef ARDUINO_ARCH_ESP8266
      ::optimistic_yield(1000);
      #endif
    }

+    // Disabling mDNS if disabled in settings
+    if (this->mDnsState && !settings.portal.mdns) {
+      MDNS.end();
+      this->mDnsState = false;
+
+      Log.straceln(FPSTR(L_PORTAL_WEBSERVER), F("mDNS disabled"));
+    }
+
    // dns server
-    if (!this->stateDnsServer() && this->stateWebServer() && network->isApEnabled() && network->hasApClients() && millis() - this->dnsServerChangeState >= this->changeStateInterval) {
+    if (!this->stateDnsServer() && !network->isConnected() && network->isApEnabled() && this->stateWebServer()) {
      this->startDnsServer();
      Log.straceln(FPSTR(L_PORTAL_DNSSERVER), F("Started: AP up"));
      
@@ -894,9 +923,9 @@ protected:
      ::optimistic_yield(1000);
      #endif

-    } else if (this->stateDnsServer() && (!network->isApEnabled() || !this->stateWebServer())) {
+    } else if (this->stateDnsServer() && (network->isConnected() || !network->isApEnabled() || !this->stateWebServer())) {
      this->stopDnsServer();
-      Log.straceln(FPSTR(L_PORTAL_DNSSERVER), F("Stopped: AP down"));
+      Log.straceln(FPSTR(L_PORTAL_DNSSERVER), F("Stopped: AP down/STA connected"));

      #ifdef ARDUINO_ARCH_ESP8266
      ::optimistic_yield(1000);
@@ -1006,7 +1035,6 @@ protected:

    this->dnsServer->start(53, "*", network->getApIp());
    this->dnsServerEnabled = true;
-    this->dnsServerChangeState = millis();
  }

  void stopDnsServer() {
@@ -1017,6 +1045,5 @@ protected:
    //this->dnsServer->processNextRequest();
    this->dnsServer->stop();
    this->dnsServerEnabled = false;
-    this->dnsServerChangeState = millis();
  }
 };
--- a/src/RegulatorTask.h
+++ b/src/RegulatorTask.h
@@ -39,7 +39,7 @@ protected:
    this->indoorSensorsConnected = Sensors::existsConnectedSensorsByPurpose(Sensors::Purpose::INDOOR_TEMP);
    //this->outdoorSensorsConnected = Sensors::existsConnectedSensorsByPurpose(Sensors::Purpose::OUTDOOR_TEMP);

-    if (settings.equitherm.enabled || settings.pid.enabled || settings.opentherm.nativeHeatingControl) {
+    if (settings.equitherm.enabled || settings.pid.enabled || settings.opentherm.options.nativeHeatingControl) {
      vars.master.heating.indoorTempControl = true;
      vars.master.heating.minTemp = THERMOSTAT_INDOOR_MIN_TEMP;
      vars.master.heating.maxTemp = THERMOSTAT_INDOOR_MAX_TEMP;
@@ -93,7 +93,7 @@ protected:
  void hysteresis() {
    bool useHyst = false;
    if (settings.heating.hysteresis > 0.01f && this->indoorSensorsConnected) {
-      useHyst = settings.equitherm.enabled || settings.pid.enabled || settings.opentherm.nativeHeatingControl;
+      useHyst = settings.equitherm.enabled || settings.pid.enabled || settings.opentherm.options.nativeHeatingControl;
    }

    if (useHyst) {
@@ -110,13 +110,13 @@ protected:
  }

  inline float getHeatingMinSetpointTemp() {
-    return settings.opentherm.nativeHeatingControl
+    return settings.opentherm.options.nativeHeatingControl
      ? vars.master.heating.minTemp
      : settings.heating.minTemp;
  }

  inline float getHeatingMaxSetpointTemp() {
-    return settings.opentherm.nativeHeatingControl
+    return settings.opentherm.options.nativeHeatingControl
      ? vars.master.heating.maxTemp
      : settings.heating.maxTemp;
  }
@@ -137,7 +137,7 @@ protected:
    if (vars.emergency.state) {
      return settings.emergency.target;

-    } else if (settings.opentherm.nativeHeatingControl) {
+    } else if (settings.opentherm.options.nativeHeatingControl) {
      return settings.heating.target;

    } else if (!settings.equitherm.enabled && !settings.pid.enabled) {
@@ -196,6 +196,7 @@ protected:
      //if (vars.parameters.heatingEnabled) {
      if (settings.heating.enabled && this->indoorSensorsConnected) {
        pidRegulator.Kp = settings.heating.turbo ? 0.0f : settings.pid.p_factor;
+        pidRegulator.Ki = settings.pid.i_factor;
        pidRegulator.Kd = settings.pid.d_factor;

        pidRegulator.setLimits(settings.pid.minTemp, settings.pid.maxTemp);
@@ -203,12 +204,22 @@ protected:
        pidRegulator.input = vars.master.heating.indoorTemp;
        pidRegulator.setpoint = settings.heating.target;

-        if (fabsf(pidRegulator.Ki - settings.pid.i_factor) >= 0.0001f) {
+        /*if (fabsf(pidRegulator.Ki - settings.pid.i_factor) >= 0.0001f) {
          pidRegulator.Ki = settings.pid.i_factor;
          pidRegulator.integral = 0.0f;
          pidRegulator.getResultNow();

          Log.sinfoln(FPSTR(L_REGULATOR_PID), F("Integral sum has been reset"));
+        }*/
+
+        float error = pidRegulator.setpoint - pidRegulator.input;
+        bool hasDeadband = (error > -(settings.pid.deadband.thresholdHigh))
+          && (error < settings.pid.deadband.thresholdLow);
+
+        if (hasDeadband) {
+          pidRegulator.Kp *= settings.pid.deadband.p_multiplier;
+          pidRegulator.Ki *= settings.pid.deadband.i_multiplier;
+          pidRegulator.Kd *= settings.pid.deadband.d_multiplier;
        }

        float pidResult = pidRegulator.getResultTimer();
--- a/src/SensorsTask.h
+++ b/src/SensorsTask.h
@@ -31,12 +31,19 @@ protected:
  const unsigned short dallasSearchInterval = 60000;
  const unsigned short dallasPollingInterval = 10000;
  const unsigned short globalPollingInterval = 15000;
+  #if USE_BLE
+  const unsigned int bleSetDtInterval = 7200000;
+  #endif

  std::unordered_map<uint8_t, OneWire> owInstances;
  std::unordered_map<uint8_t, DallasTemperature> dallasInstances;
  std::unordered_map<uint8_t, unsigned long> dallasSearchTime;
  std::unordered_map<uint8_t, bool> dallasPolling;
  std::unordered_map<uint8_t, unsigned long> dallasLastPollingTime;
+  #if USE_BLE
+  std::unordered_map<uint8_t, bool> bleSubscribed;
+  std::unordered_map<uint8_t, unsigned long> bleLastSetDtTime;
+  #endif
  unsigned long globalLastPollingTime = 0;

  #if defined(ARDUINO_ARCH_ESP32)
@@ -83,8 +90,11 @@ protected:
      pollingNtcSensors();
      this->yield();

+      #if USE_BLE
+      cleanBleInstances();
      pollingBleSensors();
      this->yield();
+      #endif

      this->globalLastPollingTime = millis();
    }
@@ -175,16 +185,19 @@ protected:
        continue;
      }

-      if (millis() - this->dallasSearchTime[gpio] > this->dallasSearchInterval) {
-        this->dallasSearchTime[gpio] = millis();
-        instance.begin();
-
-        Log.straceln(
-          FPSTR(L_SENSORS_DALLAS),
-          F("GPIO %hhu, devices on bus: %hhu, DS18* devices: %hhu"),
-          gpio, instance.getDeviceCount(), instance.getDS18Count()
-        );
+      if (millis() - this->dallasSearchTime[gpio] < this->dallasSearchInterval) {
+        continue;
      }
+
+      this->dallasSearchTime[gpio] = millis();
+      this->owInstances[gpio].reset();
+      instance.begin();
+
+      Log.straceln(
+        FPSTR(L_SENSORS_DALLAS),
+        F("GPIO %hhu, devices on bus: %hhu, DS18* devices: %hhu"),
+        gpio, instance.getDeviceCount(), instance.getDS18Count()
+      );
    }
  }

@@ -274,25 +287,14 @@ protected:
      unsigned long ts = millis();

      if (this->dallasPolling[gpio]) {
-        auto minPollingTime = instance.millisToWaitForConversion(12);
+        unsigned long minPollingTime = instance.millisToWaitForConversion(12) * 2;
        unsigned long estimatePollingTime = ts - this->dallasLastPollingTime[gpio];

        // check conversion time
+        // isConversionComplete does not work with chinese clones!
        if (estimatePollingTime < minPollingTime) {
          continue;
        }
-        
-        // check conversion
-        bool conversionComplete = instance.isConversionComplete();
-        if (!conversionComplete) {
-          if (estimatePollingTime > (minPollingTime * 2)) {
-            this->dallasPolling[gpio] = false;
-
-            Log.swarningln(FPSTR(L_SENSORS_DALLAS), F("GPIO %hhu, timeout receiving data"), gpio);
-          }
-
-          continue;
-        }

        // read sensors data for current instance
        for (uint8_t sensorId = 0; sensorId <= Sensors::getMaxSensorId(); sensorId++) {
@@ -345,28 +347,6 @@ protected:
          continue;
        }

-        // check sensors on bus
-        if (!instance.getDeviceCount()) {
-          for (uint8_t sensorId = 0; sensorId <= Sensors::getMaxSensorId(); sensorId++) {
-            auto& sSensor = Sensors::settings[sensorId];
-            
-            // only target & valid sensors
-            if (!sSensor.enabled || sSensor.type != Sensors::Type::DALLAS_TEMP || sSensor.purpose == Sensors::Purpose::NOT_CONFIGURED) {
-              continue;
-
-            } else if (sSensor.gpio != gpio || isEmptyAddress(sSensor.address)) {
-              continue;
-            }
-            
-            auto& rSensor = Sensors::results[sensorId];
-            if (rSensor.signalQuality > 0) {
-              rSensor.signalQuality--;
-            }
-          }
-
-          continue;
-        }
-
        // start polling
        instance.setResolution(12);
        instance.requestTemperatures();
@@ -378,26 +358,6 @@ protected:
    }
  }

-  void pollingBleSensors() {
-    #if USE_BLE
-    if (!NimBLEDevice::getInitialized() && millis() > 5000) {
-      Log.sinfoln(FPSTR(L_SENSORS_BLE), F("Initialized"));
-      BLEDevice::init("");
-      NimBLEDevice::setPower(ESP_PWR_LVL_P9);
-    }
-
-    for (uint8_t sensorId = 0; sensorId <= Sensors::getMaxSensorId(); sensorId++) {
-      auto& sSensor = Sensors::settings[sensorId];
-      
-      if (!sSensor.enabled || sSensor.type != Sensors::Type::BLUETOOTH || sSensor.purpose == Sensors::Purpose::NOT_CONFIGURED) {
-        continue;
-      }
-
-      connectToBleDevice(sensorId);
-    }
-    #endif
-  }
-
  void pollingNtcSensors() {
    for (uint8_t sensorId = 0; sensorId <= Sensors::getMaxSensorId(); sensorId++) {
      auto& sSensor = Sensors::settings[sensorId];
@@ -443,64 +403,182 @@ protected:
    }
  }

-  bool connectToBleDevice(const uint8_t sensorId) {
+  #if USE_BLE
+  void cleanBleInstances() {
    #if USE_BLE
-    if (!NimBLEDevice::getInitialized()) {
-      return false;
+    if (!NimBLEDevice::isInitialized()) {
+      return;
+    }
+
+    for (auto client : NimBLEDevice::getConnectedClients()) {
+      auto address = client->getPeerAddress();
+      bool used = false;
+
+      for (uint8_t sensorId = 0; sensorId <= Sensors::getMaxSensorId(); sensorId++) {
+        auto& sSensor = Sensors::settings[sensorId];
+        
+        if (!sSensor.enabled || sSensor.type != Sensors::Type::BLUETOOTH || sSensor.purpose == Sensors::Purpose::NOT_CONFIGURED) {
+          continue;
+        }
+        
+        auto pAddress = address.getVal();
+        uint8_t addr[] = {
+          pAddress[5], pAddress[4], pAddress[3],
+          pAddress[2], pAddress[1], pAddress[0]
+        };
+
+        if (isEqualAddress(addr, sSensor.address, sizeof(addr))) {
+          used = true;
+          break;
+        }
+      }
+
+      if (!used) {
+        Log.sinfoln(
+          FPSTR(L_SENSORS_BLE), F("Deleted unused client connected to %s"),
+          address.toString().c_str()
+        );
+
+        NimBLEDevice::deleteClient(client);
+      }
+    }
+    #endif
+  }
+
+  void pollingBleSensors() {
+    if (!NimBLEDevice::isInitialized() && millis() > 5000) {
+      Log.sinfoln(FPSTR(L_SENSORS_BLE), F("Initialized"));
+      BLEDevice::init("");
+      NimBLEDevice::setPower(9);
+    }
+
+    for (uint8_t sensorId = 0; sensorId <= Sensors::getMaxSensorId(); sensorId++) {
+      auto& sSensor = Sensors::settings[sensorId];
+      auto& rSensor = Sensors::results[sensorId];
+      
+      if (!sSensor.enabled || sSensor.type != Sensors::Type::BLUETOOTH || sSensor.purpose == Sensors::Purpose::NOT_CONFIGURED) {
+        continue;
+      }
+
+      auto client = this->getBleClient(sensorId);
+      if (client == nullptr) {
+        continue;
+      }
+
+      if (!client->isConnected()) {
+        this->bleSubscribed[sensorId] = false;
+        this->bleLastSetDtTime[sensorId] = 0;
+
+        if (client->connect()) {
+          Log.sinfoln(
+            FPSTR(L_SENSORS_BLE), F("Sensor #%hhu '%s': connected to %s"),
+            sensorId, sSensor.name, client->getPeerAddress().toString().c_str()
+          );
+
+        } else {
+          Log.swarningln(
+            FPSTR(L_SENSORS_BLE), F("Sensor #%hhu '%s': failed connecting to %s"),
+            sensorId, sSensor.name, client->getPeerAddress().toString().c_str()
+          );
+
+          continue;
+        }
+      }
+      
+      if (!this->bleSubscribed[sensorId]) {
+        if (this->subscribeToBleDevice(sensorId, client)) {
+          this->bleSubscribed[sensorId] = true;
+
+        } else {
+          this->bleSubscribed[sensorId] = false;
+          client->disconnect();
+          continue;
+        }
+      }
+
+      // Mark connected
+      Sensors::setConnectionStatusById(sensorId, true, true);
+
+      if (!this->bleLastSetDtTime[sensorId] || millis() - this->bleLastSetDtTime[sensorId] > this->bleSetDtInterval) {
+        struct tm ti;
+        
+        if (getLocalTime(&ti)) {
+          if (this->setDateOnBleSensor(client, &ti)) {
+            Log.sinfoln(
+              FPSTR(L_SENSORS_BLE), F("Sensor #%hhu '%s', successfully set date: %02d.%02d.%04d %02d:%02d:%02d"),
+              sensorId, sSensor.name,
+              ti.tm_mday, ti.tm_mon + 1, ti.tm_year + 1900, ti.tm_hour, ti.tm_min, ti.tm_sec
+            );
+
+          } else {
+            Log.swarningln(
+              FPSTR(L_SENSORS_BLE), F("Sensor #%hhu '%s', failed set date: %02d.%02d.%04d %02d:%02d:%02d"),
+              sensorId, sSensor.name,
+              ti.tm_mday, ti.tm_mon + 1, ti.tm_year + 1900, ti.tm_hour, ti.tm_min, ti.tm_sec
+            );
+          }
+
+          this->bleLastSetDtTime[sensorId] = millis();
+        }
+      }
+    }
+  }
+
+  NimBLEClient* getBleClient(const uint8_t sensorId) {
+    if (!NimBLEDevice::isInitialized()) {
+      return nullptr;
    }

    auto& sSensor = Sensors::settings[sensorId];
    auto& rSensor = Sensors::results[sensorId];

    if (!sSensor.enabled || sSensor.type != Sensors::Type::BLUETOOTH || sSensor.purpose == Sensors::Purpose::NOT_CONFIGURED) {
-      return false;
+      return nullptr;
    }
    
    uint8_t addr[6] = {
      sSensor.address[0], sSensor.address[1], sSensor.address[2],
      sSensor.address[3], sSensor.address[4], sSensor.address[5]
    };
-    const NimBLEAddress address = NimBLEAddress(addr);
+    const auto address = NimBLEAddress(addr, 0);
    
-    NimBLEClient* pClient = nullptr;
-    pClient = NimBLEDevice::getClientByPeerAddress(address);
-
+    NimBLEClient* pClient = NimBLEDevice::getClientByPeerAddress(address);
    if (pClient == nullptr) {
      pClient = NimBLEDevice::getDisconnectedClient();
    }

    if (pClient == nullptr) {
-      if (NimBLEDevice::getClientListSize() >= NIMBLE_MAX_CONNECTIONS) {
-        return false;
+      if (NimBLEDevice::getCreatedClientCount() >= NIMBLE_MAX_CONNECTIONS) {
+        return nullptr;
      }

      pClient = NimBLEDevice::createClient();
-      pClient->setConnectTimeout(5);
-    }
-
-    if(pClient->isConnected()) {
-      if (!rSensor.connected) {
-        rSensor.connected = true;
+      if (pClient == nullptr) {
+        return nullptr;
      }

-      return true;
+      /**
+       *  Set initial connection parameters:
+       *  These settings are safe for 3 clients to connect reliably, can go faster if you have less
+       *  connections. Timeout should be a multiple of the interval, minimum is 100ms.
+       *  Min interval: 12 * 1.25ms = 15, Max interval: 12 * 1.25ms = 15, 0 latency, 1000 * 10ms = 10000ms timeout
+       */
+      pClient->setConnectionParams(12, 12, 0, 1000);
+      pClient->setConnectTimeout(5000);
+      pClient->setSelfDelete(false, true);
    }

-    if (!pClient->connect(address)) {
-      Log.swarningln(
-        FPSTR(L_SENSORS_BLE), F("Sensor #%hhu '%s': failed connecting to %s"),
-        sensorId, sSensor.name, address.toString().c_str()
-      );
-
-      NimBLEDevice::deleteClient(pClient);
-      return false;
+    if (!pClient->isConnected()) {
+      pClient->setPeerAddress(address);
    }

-    Log.sinfoln(
-      FPSTR(L_SENSORS_BLE), F("Sensor #%hhu '%s': connected to %s"),
-      sensorId, sSensor.name, address.toString().c_str()
-    );
+    return pClient;
+  }

+  bool subscribeToBleDevice(const uint8_t sensorId, NimBLEClient* pClient) {
+    auto& sSensor = Sensors::settings[sensorId];
+    auto pAddress = pClient->getPeerAddress().toString().c_str();
+    
    NimBLERemoteService* pService = nullptr;
    NimBLERemoteCharacteristic* pChar = nullptr;

@@ -510,13 +588,13 @@ protected:
    if (!pService) {
      Log.straceln(
        FPSTR(L_SENSORS_BLE), F("Sensor #%hhu '%s': failed to find env service (%s) on device %s"),
-        sensorId, sSensor.name, serviceUuid.toString().c_str(), address.toString().c_str()
+        sensorId, sSensor.name, serviceUuid.toString().c_str(), pAddress
      );

    } else {
      Log.straceln(
        FPSTR(L_SENSORS_BLE), F("Sensor #%hhu '%s': found env service (%s) on device %s"),
-        sensorId, sSensor.name, serviceUuid.toString().c_str(), address.toString().c_str()
+        sensorId, sSensor.name, serviceUuid.toString().c_str(), pAddress
      );

      // 0x2A6E - Notify temperature x0.01C (pvvx)
@@ -525,176 +603,21 @@ protected:
        NimBLEUUID charUuid((uint16_t) 0x2A6E);
        pChar = pService->getCharacteristic(charUuid);

-        if (pChar && pChar->canNotify()) {
+        if (pChar && (pChar->canNotify() || pChar->canIndicate())) {
          Log.straceln(
            FPSTR(L_SENSORS_BLE), F("Sensor #%hhu '%s': found temp char (%s) in env service on device %s"),
-            sensorId, sSensor.name, charUuid.toString().c_str(), address.toString().c_str()
+            sensorId, sSensor.name, charUuid.toString().c_str(), pAddress
          );

-          tempNotifyCreated = pChar->subscribe(true, [sensorId](NimBLERemoteCharacteristic* pChar, uint8_t* pData, size_t length, bool isNotify) {
-            if (pChar == nullptr) {
-              return;
-            }
-
-            NimBLERemoteService* pService = pChar->getRemoteService();
-            if (pService == nullptr) {
-              return;
-            }
-
-            NimBLEClient* pClient = pService->getClient();
-            if (pClient == nullptr) {
-              return;
-            }
-
-            auto& sSensor = Sensors::settings[sensorId];
-
-            if (length != 2) {
-              Log.swarningln(
-                FPSTR(L_SENSORS_BLE),
-                F("Sensor #%hhu '%s': invalid notification data at temp char (%s) on device %s"),
-                sensorId,
-                sSensor.name,
-                pChar->getUUID().toString().c_str(),
-                pClient->getPeerAddress().toString().c_str()
-              );
-
-              return;
-            }
-
-            float rawTemp = (pChar->getValue<int16_t>() * 0.01f);
-            Log.straceln(
-              FPSTR(L_SENSORS_BLE),
-              F("Sensor #%hhu '%s': received temp: %.2f"),
-              sensorId, sSensor.name, rawTemp
-            );
-
-            // set temp
-            Sensors::setValueById(sensorId, rawTemp, Sensors::ValueType::TEMPERATURE, true, true);
-
-            // update rssi
-            Sensors::setValueById(sensorId, pClient->getRssi(), Sensors::ValueType::RSSI, false, false);
-          });
-
-          if (tempNotifyCreated) {
-            Log.straceln(
-              FPSTR(L_SENSORS_BLE), F("Sensor #%hhu '%s': subscribed to temp char (%s) in env service on device %s"),
-              sensorId, sSensor.name,
-              charUuid.toString().c_str(), address.toString().c_str()
-            );
-
-          } else {
-            Log.swarningln(
-              FPSTR(L_SENSORS_BLE), F("Sensor #%hhu '%s': failed to subscribe to temp char (%s) in env service on device %s"),
-              sensorId, sSensor.name,
-              charUuid.toString().c_str(), address.toString().c_str()
-            );
-          }
-        }
-      }
-
-
-      // 0x2A1F - Notify temperature x0.1C (atc1441/pvvx)
-      if (!tempNotifyCreated) {
-        NimBLEUUID charUuid((uint16_t) 0x2A1F);
-        pChar = pService->getCharacteristic(charUuid);
-
-        if (pChar && pChar->canNotify()) {
-          Log.straceln(
-            FPSTR(L_SENSORS_BLE), F("Sensor #%hhu '%s': found temp char (%s) in env service on device %s"),
-            sensorId, sSensor.name, charUuid.toString().c_str(), address.toString().c_str()
-          );
-
-          tempNotifyCreated = pChar->subscribe(true, [sensorId](NimBLERemoteCharacteristic* pChar, uint8_t* pData, size_t length, bool isNotify) {
-            if (pChar == nullptr) {
-              return;
-            }
-
-            NimBLERemoteService* pService = pChar->getRemoteService();
-            if (pService == nullptr) {
-              return;
-            }
-
-            NimBLEClient* pClient = pService->getClient();
-            if (pClient == nullptr) {
-              return;
-            }
-
-            auto& sSensor = Sensors::settings[sensorId];
-
-            if (length != 2) {
-              Log.swarningln(
-                FPSTR(L_SENSORS_BLE),
-                F("Sensor #%hhu '%s': invalid notification data at temp char (%s) on device %s"),
-                sensorId,
-                sSensor.name,
-                pChar->getUUID().toString().c_str(),
-                pClient->getPeerAddress().toString().c_str()
-              );
-
-              return;
-            }
-
-            float rawTemp = (pChar->getValue<int16_t>() * 0.1f);
-            Log.straceln(
-              FPSTR(L_SENSORS_BLE),
-              F("Sensor #%hhu '%s': received temp: %.2f"),
-              sensorId, sSensor.name, rawTemp
-            );
-
-            // set temp
-            Sensors::setValueById(sensorId, rawTemp, Sensors::ValueType::TEMPERATURE, true, true);
-
-            // update rssi
-            Sensors::setValueById(sensorId, pClient->getRssi(), Sensors::ValueType::RSSI, false, false);
-          });
-
-          if (tempNotifyCreated) {
-            Log.straceln(
-              FPSTR(L_SENSORS_BLE), F("Sensor #%hhu '%s': subscribed to temp char (%s) in env service on device %s"),
-              sensorId, sSensor.name,
-              charUuid.toString().c_str(), address.toString().c_str()
-            );
-
-          } else {
-            Log.swarningln(
-              FPSTR(L_SENSORS_BLE), F("Sensor #%hhu '%s': failed to subscribe to temp char (%s) in env service on device %s"),
-              sensorId, sSensor.name,
-              charUuid.toString().c_str(), address.toString().c_str()
-            );
-          }
-        }
-      }
-
-      if (!tempNotifyCreated) {
-        Log.swarningln(
-          FPSTR(L_SENSORS_BLE), F("Sensor #%hhu '%s': not found supported temp chars in env service on device %s"),
-          sensorId, sSensor.name, address.toString().c_str()
-        );
-
-        pClient->disconnect();
-        return false;
-      }
-
-
-      // 0x2A6F - Notify about humidity x0.01% (pvvx)
-      {
-        bool humidityNotifyCreated = false;
-        if (!humidityNotifyCreated) {
-          NimBLEUUID charUuid((uint16_t) 0x2A6F);
-          pChar = pService->getCharacteristic(charUuid);
-
-          if (pChar && pChar->canNotify()) {
-            Log.straceln(
-              FPSTR(L_SENSORS_BLE), F("Sensor #%hhu '%s': found humidity char (%s) in env service on device %s"),
-              sensorId, sSensor.name, charUuid.toString().c_str(), address.toString().c_str()
-            );
-
-            humidityNotifyCreated = pChar->subscribe(true, [sensorId](NimBLERemoteCharacteristic* pChar, uint8_t* pData, size_t length, bool isNotify) {
+          pChar->unsubscribe();
+          tempNotifyCreated = pChar->subscribe(
+            pChar->canNotify(),
+            [sensorId](NimBLERemoteCharacteristic* pChar, uint8_t* pData, size_t length, bool isNotify) {
              if (pChar == nullptr) {
                return;
              }

-              NimBLERemoteService* pService = pChar->getRemoteService();
+              const NimBLERemoteService* pService = pChar->getRemoteService();
              if (pService == nullptr) {
                return;
              }
@@ -709,7 +632,7 @@ protected:
              if (length != 2) {
                Log.swarningln(
                  FPSTR(L_SENSORS_BLE),
-                  F("Sensor #%hhu '%s': invalid notification data at humidity char (%s) on device %s"),
+                  F("Sensor #%hhu '%s': invalid notification data at temp char (%s) on device %s"),
                  sensorId,
                  sSensor.name,
                  pChar->getUUID().toString().c_str(),
@@ -719,32 +642,199 @@ protected:
                return;
              }

-              float rawHumidity = (pChar->getValue<uint16_t>() * 0.01f);
+              float rawTemp = (pChar->getValue<int16_t>() * 0.01f);
              Log.straceln(
                FPSTR(L_SENSORS_BLE),
-                F("Sensor #%hhu '%s': received humidity: %.2f"),
-                sensorId, sSensor.name, rawHumidity
+                F("Sensor #%hhu '%s': received temp: %.2f"),
+                sensorId, sSensor.name, rawTemp
              );

-              // set humidity
-              Sensors::setValueById(sensorId, rawHumidity, Sensors::ValueType::HUMIDITY, true, true);
+              // set temp
+              Sensors::setValueById(sensorId, rawTemp, Sensors::ValueType::TEMPERATURE, true, true);

              // update rssi
              Sensors::setValueById(sensorId, pClient->getRssi(), Sensors::ValueType::RSSI, false, false);
-            });
+            }
+          );
+
+          if (tempNotifyCreated) {
+            Log.straceln(
+              FPSTR(L_SENSORS_BLE), F("Sensor #%hhu '%s': subscribed to temp char (%s) in env service on device %s"),
+              sensorId, sSensor.name,
+              charUuid.toString().c_str(), pAddress
+            );
+
+          } else {
+            Log.swarningln(
+              FPSTR(L_SENSORS_BLE), F("Sensor #%hhu '%s': failed to subscribe to temp char (%s) in env service on device %s"),
+              sensorId, sSensor.name,
+              charUuid.toString().c_str(), pAddress
+            );
+          }
+        }
+      }
+
+
+      // 0x2A1F - Notify temperature x0.1C (atc1441/pvvx)
+      if (!tempNotifyCreated) {
+        NimBLEUUID charUuid((uint16_t) 0x2A1F);
+        pChar = pService->getCharacteristic(charUuid);
+
+        if (pChar && (pChar->canNotify() || pChar->canIndicate())) {
+          Log.straceln(
+            FPSTR(L_SENSORS_BLE), F("Sensor #%hhu '%s': found temp char (%s) in env service on device %s"),
+            sensorId, sSensor.name, charUuid.toString().c_str(), pAddress
+          );
+
+          pChar->unsubscribe();
+          tempNotifyCreated = pChar->subscribe(
+            pChar->canNotify(),
+            [sensorId](NimBLERemoteCharacteristic* pChar, uint8_t* pData, size_t length, bool isNotify) {
+              if (pChar == nullptr) {
+                return;
+              }
+
+              const NimBLERemoteService* pService = pChar->getRemoteService();
+              if (pService == nullptr) {
+                return;
+              }
+
+              NimBLEClient* pClient = pService->getClient();
+              if (pClient == nullptr) {
+                return;
+              }
+
+              auto& sSensor = Sensors::settings[sensorId];
+
+              if (length != 2) {
+                Log.swarningln(
+                  FPSTR(L_SENSORS_BLE),
+                  F("Sensor #%hhu '%s': invalid notification data at temp char (%s) on device %s"),
+                  sensorId,
+                  sSensor.name,
+                  pChar->getUUID().toString().c_str(),
+                  pClient->getPeerAddress().toString().c_str()
+                );
+
+                return;
+              }
+
+              float rawTemp = (pChar->getValue<int16_t>() * 0.1f);
+              Log.straceln(
+                FPSTR(L_SENSORS_BLE),
+                F("Sensor #%hhu '%s': received temp: %.2f"),
+                sensorId, sSensor.name, rawTemp
+              );
+
+              // set temp
+              Sensors::setValueById(sensorId, rawTemp, Sensors::ValueType::TEMPERATURE, true, true);
+
+              // update rssi
+              Sensors::setValueById(sensorId, pClient->getRssi(), Sensors::ValueType::RSSI, false, false);
+            }
+          );
+
+          if (tempNotifyCreated) {
+            Log.straceln(
+              FPSTR(L_SENSORS_BLE), F("Sensor #%hhu '%s': subscribed to temp char (%s) in env service on device %s"),
+              sensorId, sSensor.name,
+              charUuid.toString().c_str(), pAddress
+            );
+
+          } else {
+            Log.swarningln(
+              FPSTR(L_SENSORS_BLE), F("Sensor #%hhu '%s': failed to subscribe to temp char (%s) in env service on device %s"),
+              sensorId, sSensor.name,
+              charUuid.toString().c_str(), pAddress
+            );
+          }
+        }
+      }
+
+      if (!tempNotifyCreated) {
+        Log.swarningln(
+          FPSTR(L_SENSORS_BLE), F("Sensor #%hhu '%s': not found supported temp chars in env service on device %s"),
+          sensorId, sSensor.name, pAddress
+        );
+
+        pClient->disconnect();
+        return false;
+      }
+
+
+      // 0x2A6F - Notify about humidity x0.01% (pvvx)
+      {
+        bool humidityNotifyCreated = false;
+        if (!humidityNotifyCreated) {
+          NimBLEUUID charUuid((uint16_t) 0x2A6F);
+          pChar = pService->getCharacteristic(charUuid);
+
+          if (pChar && (pChar->canNotify() || pChar->canIndicate())) {
+            Log.straceln(
+              FPSTR(L_SENSORS_BLE), F("Sensor #%hhu '%s': found humidity char (%s) in env service on device %s"),
+              sensorId, sSensor.name, charUuid.toString().c_str(), pAddress
+            );
+
+            pChar->unsubscribe();
+            humidityNotifyCreated = pChar->subscribe(
+              pChar->canNotify(),
+              [sensorId](NimBLERemoteCharacteristic* pChar, uint8_t* pData, size_t length, bool isNotify) {
+                if (pChar == nullptr) {
+                  return;
+                }
+
+                const NimBLERemoteService* pService = pChar->getRemoteService();
+                if (pService == nullptr) {
+                  return;
+                }
+
+                NimBLEClient* pClient = pService->getClient();
+                if (pClient == nullptr) {
+                  return;
+                }
+
+                auto& sSensor = Sensors::settings[sensorId];
+
+                if (length != 2) {
+                  Log.swarningln(
+                    FPSTR(L_SENSORS_BLE),
+                    F("Sensor #%hhu '%s': invalid notification data at humidity char (%s) on device %s"),
+                    sensorId,
+                    sSensor.name,
+                    pChar->getUUID().toString().c_str(),
+                    pClient->getPeerAddress().toString().c_str()
+                  );
+
+                  return;
+                }
+
+                float rawHumidity = (pChar->getValue<uint16_t>() * 0.01f);
+                Log.straceln(
+                  FPSTR(L_SENSORS_BLE),
+                  F("Sensor #%hhu '%s': received humidity: %.2f"),
+                  sensorId, sSensor.name, rawHumidity
+                );
+
+                // set humidity
+                Sensors::setValueById(sensorId, rawHumidity, Sensors::ValueType::HUMIDITY, true, true);
+
+                // update rssi
+                Sensors::setValueById(sensorId, pClient->getRssi(), Sensors::ValueType::RSSI, false, false);
+              }
+            );

            if (humidityNotifyCreated) {
              Log.straceln(
                FPSTR(L_SENSORS_BLE), F("Sensor #%hhu '%s': subscribed to humidity char (%s) in env service on device %s"),
                sensorId, sSensor.name,
-                charUuid.toString().c_str(), address.toString().c_str()
+                charUuid.toString().c_str(), pAddress
              );

            } else {
              Log.swarningln(
                FPSTR(L_SENSORS_BLE), F("Sensor #%hhu '%s': failed to subscribe to humidity char (%s) in env service on device %s"),
                sensorId, sSensor.name,
-                charUuid.toString().c_str(), address.toString().c_str()
+                charUuid.toString().c_str(), pAddress
              );
            }
          }
@@ -753,7 +843,7 @@ protected:
        if (!humidityNotifyCreated) {
          Log.swarningln(
            FPSTR(L_SENSORS_BLE), F("Sensor #%hhu '%s': not found supported humidity chars in env service on device %s"),
-            sensorId, sSensor.name, address.toString().c_str()
+            sensorId, sSensor.name, pAddress
          );
        }
      }
@@ -767,13 +857,13 @@ protected:
      if (!pService) {
        Log.straceln(
          FPSTR(L_SENSORS_BLE), F("Sensor #%hhu '%s': failed to find battery service (%s) on device %s"),
-          sensorId, sSensor.name, serviceUuid.toString().c_str(), address.toString().c_str()
+          sensorId, sSensor.name, serviceUuid.toString().c_str(), pAddress
        );

      } else {
        Log.straceln(
          FPSTR(L_SENSORS_BLE), F("Sensor #%hhu '%s': found battery service (%s) on device %s"),
-          sensorId, sSensor.name, serviceUuid.toString().c_str(), address.toString().c_str()
+          sensorId, sSensor.name, serviceUuid.toString().c_str(), pAddress
        );

        // 0x2A19 - Notify the battery charge level 0..99% (pvvx)
@@ -782,68 +872,72 @@ protected:
          NimBLEUUID charUuid((uint16_t) 0x2A19);
          pChar = pService->getCharacteristic(charUuid);

-          if (pChar && pChar->canNotify()) {
+          if (pChar && (pChar->canNotify() || pChar->canIndicate())) {
            Log.straceln(
              FPSTR(L_SENSORS_BLE), F("Sensor #%hhu '%s': found battery char (%s) in battery service on device %s"),
-              sensorId, sSensor.name, charUuid.toString().c_str(), address.toString().c_str()
+              sensorId, sSensor.name, charUuid.toString().c_str(), pAddress
            );

-            batteryNotifyCreated = pChar->subscribe(true, [sensorId](NimBLERemoteCharacteristic* pChar, uint8_t* pData, size_t length, bool isNotify) {
-              if (pChar == nullptr) {
-                return;
-              }
+            pChar->unsubscribe();
+            batteryNotifyCreated = pChar->subscribe(
+              pChar->canNotify(),
+              [sensorId](NimBLERemoteCharacteristic* pChar, uint8_t* pData, size_t length, bool isNotify) {
+                if (pChar == nullptr) {
+                  return;
+                }

-              NimBLERemoteService* pService = pChar->getRemoteService();
-              if (pService == nullptr) {
-                return;
-              }
+                const NimBLERemoteService* pService = pChar->getRemoteService();
+                if (pService == nullptr) {
+                  return;
+                }

-              NimBLEClient* pClient = pService->getClient();
-              if (pClient == nullptr) {
-                return;
-              }
+                NimBLEClient* pClient = pService->getClient();
+                if (pClient == nullptr) {
+                  return;
+                }

-              auto& sSensor = Sensors::settings[sensorId];
+                auto& sSensor = Sensors::settings[sensorId];

-              if (length != 1) {
-                Log.swarningln(
+                if (length != 1) {
+                  Log.swarningln(
+                    FPSTR(L_SENSORS_BLE),
+                    F("Sensor #%hhu '%s': invalid notification data at battery char (%s) on device %s"),
+                    sensorId,
+                    sSensor.name,
+                    pChar->getUUID().toString().c_str(),
+                    pClient->getPeerAddress().toString().c_str()
+                  );
+
+                  return;
+                }
+
+                auto rawBattery = pChar->getValue<uint8_t>();
+                Log.straceln(
                  FPSTR(L_SENSORS_BLE),
-                  F("Sensor #%hhu '%s': invalid notification data at battery char (%s) on device %s"),
-                  sensorId,
-                  sSensor.name,
-                  pChar->getUUID().toString().c_str(),
-                  pClient->getPeerAddress().toString().c_str()
+                  F("Sensor #%hhu '%s': received battery: %hhu"),
+                  sensorId, sSensor.name, rawBattery
                );

-                return;
+                // set battery
+                Sensors::setValueById(sensorId, rawBattery, Sensors::ValueType::BATTERY, true, true);
+                
+                // update rssi
+                Sensors::setValueById(sensorId, pClient->getRssi(), Sensors::ValueType::RSSI, false, false);
              }
-
-              auto rawBattery = pChar->getValue<uint8_t>();
-              Log.straceln(
-                FPSTR(L_SENSORS_BLE),
-                F("Sensor #%hhu '%s': received battery: %.2f"),
-                sensorId, sSensor.name, rawBattery
-              );
-
-              // set battery
-              Sensors::setValueById(sensorId, rawBattery, Sensors::ValueType::BATTERY, true, true);
-              
-              // update rssi
-              Sensors::setValueById(sensorId, pClient->getRssi(), Sensors::ValueType::RSSI, false, false);
-            });
+            );

            if (batteryNotifyCreated) {
              Log.straceln(
                FPSTR(L_SENSORS_BLE), F("Sensor #%hhu '%s': subscribed to battery char (%s) in battery service on device %s"),
                sensorId, sSensor.name,
-                charUuid.toString().c_str(), address.toString().c_str()
+                charUuid.toString().c_str(), pAddress
              );

            } else {
              Log.swarningln(
                FPSTR(L_SENSORS_BLE), F("Sensor #%hhu '%s': failed to subscribe to battery char (%s) in battery service on device %s"),
                sensorId, sSensor.name,
-                charUuid.toString().c_str(), address.toString().c_str()
+                charUuid.toString().c_str(), pAddress
              );
            }
          }
@@ -852,34 +946,49 @@ protected:
        if (!batteryNotifyCreated) {
          Log.swarningln(
            FPSTR(L_SENSORS_BLE), F("Sensor #%hhu '%s': not found supported battery chars in battery service on device %s"),
-            sensorId, sSensor.name, address.toString().c_str()
+            sensorId, sSensor.name, pAddress
          );
        }
      }
    }

    return true;
-    #else
-    return false;
-    #endif
  }

+  bool setDateOnBleSensor(NimBLEClient* pClient, const struct tm *ptm) {
+    auto ts = mkgmtime(ptm);
+
+    uint8_t data[5] = {};
+    data[0] = 0x23;
+    data[1] = ts & 0xff;
+    data[2] = (ts >> 8) & 0xff;
+    data[3] = (ts >> 16) & 0xff;
+    data[4] = (ts >> 24) & 0xff;
+
+    return pClient->setValue(
+      NimBLEUUID((uint16_t) 0x1f10),
+      NimBLEUUID((uint16_t) 0x1f1f),
+      NimBLEAttValue(data, sizeof(data))
+    );
+  }
+  #endif
+
  void updateConnectionStatus() {
    for (uint8_t sensorId = 0; sensorId <= Sensors::getMaxSensorId(); sensorId++) {
      auto& sSensor = Sensors::settings[sensorId];
      auto& rSensor = Sensors::results[sensorId];

      if (rSensor.connected && !sSensor.enabled) {
-        rSensor.connected = false;
+        Sensors::setConnectionStatusById(sensorId, false, false);

      } else if (rSensor.connected && sSensor.type == Sensors::Type::NOT_CONFIGURED) {
-        rSensor.connected = false;
+        Sensors::setConnectionStatusById(sensorId, false, false);

      } else if (rSensor.connected && sSensor.purpose == Sensors::Purpose::NOT_CONFIGURED) {
-        rSensor.connected = false;
+        Sensors::setConnectionStatusById(sensorId, false, false);

      } else if (sSensor.type != Sensors::Type::MANUAL && rSensor.connected && (millis() - rSensor.activityTime) > this->disconnectedTimeout) {
-        rSensor.connected = false;
+        Sensors::setConnectionStatusById(sensorId, false, false);

      }/* else if (!rSensor.connected) {
        rSensor.connected = true;
@@ -888,7 +997,8 @@ protected:
  }

  static bool isEqualAddress(const uint8_t *addr1, const uint8_t *addr2, const uint8_t length = 8) {
-    bool result = true;
+    return memcmp(addr1, addr2, length) == 0;
+    /*bool result = true;

    for (uint8_t i = 0; i < length; i++) {
      if (addr1[i] != addr2[i]) {
@@ -897,7 +1007,7 @@ protected:
      }
    }

-    return result;
+    return result;*/
  }

  static bool isEmptyAddress(const uint8_t *addr, const uint8_t length = 8) {
--- a/src/Settings.h
+++ b/src/Settings.h
@@ -36,6 +36,11 @@ struct Settings {
      unsigned short port = DEFAULT_TELNET_PORT;
    } telnet;

+    struct {
+      char server[49] = "pool.ntp.org";
+      char timezone[49] = "UTC0";
+    } ntp;
+
    UnitSystem unitSystem = UnitSystem::METRIC;
    byte statusLedGpio = DEFAULT_STATUS_LED_GPIO;
  } system;
@@ -44,6 +49,7 @@ struct Settings {
    bool auth = false;
    char login[13] = DEFAULT_PORTAL_LOGIN;
    char password[33] = DEFAULT_PORTAL_PASSWORD;
+    bool mdns = true;
  } portal;

  struct {
@@ -57,16 +63,21 @@ struct Settings {
    float minPower = 0.0f;
    float maxPower = 0.0f;

-    bool dhwPresent = true;
-    bool summerWinterMode = false;
-    bool heatingCh2Enabled = true;
-    bool heatingCh1ToCh2 = false;
-    bool dhwToCh2 = false;
-    bool dhwBlocking = false;
-    bool modulationSyncWithHeating = false;
-    bool getMinMaxTemp = true;
-    bool nativeHeatingControl = false;
-    bool immergasFix = false;
+    struct {
+      bool dhwSupport = true;
+      bool coolingSupport = false;
+      bool summerWinterMode = false;
+      bool heatingStateToSummerWinterMode = false;
+      bool ch2AlwaysEnabled = true;
+      bool heatingToCh2 = false;
+      bool dhwToCh2 = false;
+      bool dhwBlocking = false;
+      bool modulationSyncWithHeating = false;
+      bool maxTempSyncWithTargetTemp = true;
+      bool getMinMaxTemp = true;
+      bool nativeHeatingControl = false;
+      bool immergasFix = false;
+    } options;
  } opentherm;

  struct {
@@ -105,11 +116,20 @@ struct Settings {
  struct {
    bool enabled = false;
    float p_factor = 2.0f;
-    float i_factor = 0.0055f;
+    float i_factor = 0.002f;
    float d_factor = 0.0f;
-    unsigned short dt = 180;
+    unsigned short dt = 300;
    short minTemp = 0;
    short maxTemp = DEFAULT_HEATING_MAX_TEMP;
+
+    struct {
+      bool enabled = true;
+      float p_multiplier = 1.0f;
+      float i_multiplier = 0.05f;
+      float d_multiplier = 1.0f;
+      float thresholdHigh = 0.5f;
+      float thresholdLow = 1.0f;
+    } deadband;
  } pid;

  struct {
@@ -287,6 +307,7 @@ struct Variables {

    bool connected = false;
    bool flame = false;
+    bool cooling = false;
    float pressure = 0.0f;
    float heatExchangerTemp = 0.0f;

--- a/src/defines.h
+++ b/src/defines.h
@@ -55,7 +55,7 @@
 #endif

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

 #ifndef DEFAULT_AP_SSID
@@ -111,7 +111,7 @@
 #endif

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

 #ifndef DEFAULT_OT_IN_GPIO
--- a/src/idf_component.yml
+++ b/src/idf_component.yml
@@ -0,0 +1,3 @@
+dependencies:
+  idf: ">=5.3.2"
+  h2zero/esp-nimble-cpp: ">=2.2.1"
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -102,6 +102,12 @@ void setup() {
      break;
  }

+  // generate hostname if it is empty
+  if (!strlen(networkSettings.hostname)) {
+    strcpy(networkSettings.hostname, getChipId("otgateway-").c_str());
+    fsNetworkSettings.update();
+  }
+
  network = (new NetworkMgr)
    ->setHostname(networkSettings.hostname)
    ->setStaCredentials(
@@ -148,6 +154,12 @@ void setup() {
      break;
  }

+  // generate mqtt prefix if it is empty
+  if (!strlen(settings.mqtt.prefix)) {
+    strcpy(settings.mqtt.prefix, getChipId("otgateway_").c_str());
+    fsSettings.update();
+  }
+
  // Logs settings
  if (!settings.system.serial.enabled) {
    Serial.end();
--- a/src/strings.h
+++ b/src/strings.h
@@ -3,192 +3,206 @@
  #define PROGMEM 
 #endif

-const char L_SETTINGS[]                        PROGMEM = "SETTINGS";
-const char L_SETTINGS_OT[]                     PROGMEM = "SETTINGS.OT";
-const char L_SETTINGS_DHW[]                    PROGMEM = "SETTINGS.DHW";
-const char L_SETTINGS_HEATING[]                PROGMEM = "SETTINGS.HEATING";
-const char L_NETWORK[]                         PROGMEM = "NETWORK";
-const char L_NETWORK_SETTINGS[]                PROGMEM = "NETWORK.SETTINGS";
-const char L_PORTAL_WEBSERVER[]                PROGMEM = "PORTAL.WEBSERVER";
-const char L_PORTAL_DNSSERVER[]                PROGMEM = "PORTAL.DNSSERVER";
-const char L_PORTAL_CAPTIVE[]                  PROGMEM = "PORTAL.CAPTIVE";
-const char L_PORTAL_OTA[]                      PROGMEM = "PORTAL.OTA";
-const char L_MAIN[]                            PROGMEM = "MAIN";
-const char L_MQTT[]                            PROGMEM = "MQTT";
-const char L_MQTT_HA[]                         PROGMEM = "MQTT.HA";
-const char L_MQTT_MSG[]                        PROGMEM = "MQTT.MSG";
-const char L_OT[]                              PROGMEM = "OT";
-const char L_OT_DHW[]                          PROGMEM = "OT.DHW";
-const char L_OT_HEATING[]                      PROGMEM = "OT.HEATING";
-const char L_OT_CH2[]                          PROGMEM = "OT.CH2";
-const char L_SENSORS[]                         PROGMEM = "SENSORS";
-const char L_SENSORS_SETTINGS[]                PROGMEM = "SENSORS.SETTINGS";
-const char L_SENSORS_DALLAS[]                  PROGMEM = "SENSORS.DALLAS";
-const char L_SENSORS_NTC[]                     PROGMEM = "SENSORS.NTC";
-const char L_SENSORS_BLE[]                     PROGMEM = "SENSORS.BLE";
-const char L_REGULATOR[]                       PROGMEM = "REGULATOR";
-const char L_REGULATOR_PID[]                   PROGMEM = "REGULATOR.PID";
-const char L_REGULATOR_EQUITHERM[]             PROGMEM = "REGULATOR.EQUITHERM";
-const char L_CASCADE_INPUT[]                   PROGMEM = "CASCADE.INPUT";
-const char L_CASCADE_OUTPUT[]                  PROGMEM = "CASCADE.OUTPUT";
-const char L_EXTPUMP[]                         PROGMEM = "EXTPUMP";
+const char L_SETTINGS[]                             PROGMEM = "SETTINGS";
+const char L_SETTINGS_OT[]                          PROGMEM = "SETTINGS.OT";
+const char L_SETTINGS_DHW[]                         PROGMEM = "SETTINGS.DHW";
+const char L_SETTINGS_HEATING[]                     PROGMEM = "SETTINGS.HEATING";
+const char L_NETWORK[]                              PROGMEM = "NETWORK";
+const char L_NETWORK_SETTINGS[]                     PROGMEM = "NETWORK.SETTINGS";
+const char L_PORTAL_WEBSERVER[]                     PROGMEM = "PORTAL.WEBSERVER";
+const char L_PORTAL_DNSSERVER[]                     PROGMEM = "PORTAL.DNSSERVER";
+const char L_PORTAL_CAPTIVE[]                       PROGMEM = "PORTAL.CAPTIVE";
+const char L_PORTAL_OTA[]                           PROGMEM = "PORTAL.OTA";
+const char L_MAIN[]                                 PROGMEM = "MAIN";
+const char L_MQTT[]                                 PROGMEM = "MQTT";
+const char L_MQTT_HA[]                              PROGMEM = "MQTT.HA";
+const char L_MQTT_MSG[]                             PROGMEM = "MQTT.MSG";
+const char L_OT[]                                   PROGMEM = "OT";
+const char L_OT_DHW[]                               PROGMEM = "OT.DHW";
+const char L_OT_HEATING[]                           PROGMEM = "OT.HEATING";
+const char L_OT_CH2[]                               PROGMEM = "OT.CH2";
+const char L_SENSORS[]                              PROGMEM = "SENSORS";
+const char L_SENSORS_SETTINGS[]                     PROGMEM = "SENSORS.SETTINGS";
+const char L_SENSORS_DALLAS[]                       PROGMEM = "SENSORS.DALLAS";
+const char L_SENSORS_NTC[]                          PROGMEM = "SENSORS.NTC";
+const char L_SENSORS_BLE[]                          PROGMEM = "SENSORS.BLE";
+const char L_REGULATOR[]                            PROGMEM = "REGULATOR";
+const char L_REGULATOR_PID[]                        PROGMEM = "REGULATOR.PID";
+const char L_REGULATOR_EQUITHERM[]                  PROGMEM = "REGULATOR.EQUITHERM";
+const char L_CASCADE_INPUT[]                        PROGMEM = "CASCADE.INPUT";
+const char L_CASCADE_OUTPUT[]                       PROGMEM = "CASCADE.OUTPUT";
+const char L_EXTPUMP[]                              PROGMEM = "EXTPUMP";


-const char S_ACTIONS[]                         PROGMEM = "actions";
-const char S_ACTIVE[]                          PROGMEM = "active";
-const char S_ADDRESS[]                         PROGMEM = "address";
-const char S_ANTI_STUCK_INTERVAL[]             PROGMEM = "antiStuckInterval";
-const char S_ANTI_STUCK_TIME[]                 PROGMEM = "antiStuckTime";
-const char S_AP[]                              PROGMEM = "ap";
-const char S_APP_VERSION[]                     PROGMEM = "appVersion";
-const char S_AUTH[]                            PROGMEM = "auth";
-const char S_BACKTRACE[]                       PROGMEM = "backtrace";
-const char S_BATTERY[]                         PROGMEM = "battery";
-const char S_BAUDRATE[]                        PROGMEM = "baudrate";
-const char S_BLOCKING[]                        PROGMEM = "blocking";
-const char S_BSSID[]                           PROGMEM = "bssid";
-const char S_BUILD[]                           PROGMEM = "build";
-const char S_CASCADE_CONTROL[]                 PROGMEM = "cascadeControl";
-const char S_CHANNEL[]                         PROGMEM = "channel";
-const char S_CHIP[]                            PROGMEM = "chip";
-const char S_CODE[]                            PROGMEM = "code";
-const char S_CONNECTED[]                       PROGMEM = "connected";
-const char S_CONTINUES[]                       PROGMEM = "continues";
-const char S_CORE[]                            PROGMEM = "core";
-const char S_CORES[]                           PROGMEM = "cores";
-const char S_CRASH[]                           PROGMEM = "crash";
-const char S_CURRENT_TEMP[]                    PROGMEM = "currentTemp";
-const char S_DATA[]                            PROGMEM = "data";
-const char S_DATE[]                            PROGMEM = "date";
-const char S_DHW[]                             PROGMEM = "dhw";
-const char S_DHW_BLOCKING[]                    PROGMEM = "dhwBlocking";
-const char S_DHW_PRESENT[]                     PROGMEM = "dhwPresent";
-const char S_DHW_TO_CH2[]                      PROGMEM = "dhwToCh2";
-const char S_DIAG[]                            PROGMEM = "diag";
-const char S_DNS[]                             PROGMEM = "dns";
-const char S_DT[]                              PROGMEM = "dt";
-const char S_D_FACTOR[]                        PROGMEM = "d_factor";
-const char S_EMERGENCY[]                       PROGMEM = "emergency";
-const char S_ENABLED[]                         PROGMEM = "enabled";
-const char S_ENV[]                             PROGMEM = "env";
-const char S_EPC[]                             PROGMEM = "epc";
-const char S_EQUITHERM[]                       PROGMEM = "equitherm";
-const char S_EXTERNAL_PUMP[]                   PROGMEM = "externalPump";
-const char S_FACTOR[]                          PROGMEM = "factor";
-const char S_FAULT[]                           PROGMEM = "fault";
-const char S_FILTERING[]                       PROGMEM = "filtering";
-const char S_FILTERING_FACTOR[]                PROGMEM = "filteringFactor";
-const char S_FLAGS[]                           PROGMEM = "flags";
-const char S_FLAME[]                           PROGMEM = "flame";
-const char S_FLASH[]                           PROGMEM = "flash";
-const char S_FREE[]                            PROGMEM = "free";
-const char S_FREQ[]                            PROGMEM = "freq";
-const char S_GATEWAY[]                         PROGMEM = "gateway";
-const char S_GET_MIN_MAX_TEMP[]                PROGMEM = "getMinMaxTemp";
-const char S_GPIO[]                            PROGMEM = "gpio";
-const char S_HEAP[]                            PROGMEM = "heap";
-const char S_HEATING[]                         PROGMEM = "heating";
-const char S_HEATING_CH1_TO_CH2[]              PROGMEM = "heatingCh1ToCh2";
-const char S_HEATING_CH2_ENABLED[]             PROGMEM = "heatingCh2Enabled";
-const char S_HIDDEN[]                          PROGMEM = "hidden";
-const char S_HOME_ASSISTANT_DISCOVERY[]        PROGMEM = "homeAssistantDiscovery";
-const char S_HOSTNAME[]                        PROGMEM = "hostname";
-const char S_HUMIDITY[]                        PROGMEM = "humidity";
-const char S_HYSTERESIS[]                      PROGMEM = "hysteresis";
-const char S_ID[]                              PROGMEM = "id";
-const char S_IMMERGAS_FIX[]                    PROGMEM = "immergasFix";
-const char S_INDOOR_TEMP[]                     PROGMEM = "indoorTemp";
-const char S_INDOOR_TEMP_CONTROL[]             PROGMEM = "indoorTempControl";
-const char S_IN_GPIO[]                         PROGMEM = "inGpio";
-const char S_INPUT[]                           PROGMEM = "input";
-const char S_INTERVAL[]                        PROGMEM = "interval";
-const char S_INVERT_STATE[]                    PROGMEM = "invertState";
-const char S_IP[]                              PROGMEM = "ip";
-const char S_I_FACTOR[]                        PROGMEM = "i_factor";
-const char S_K_FACTOR[]                        PROGMEM = "k_factor";
-const char S_LOGIN[]                           PROGMEM = "login";
-const char S_LOG_LEVEL[]                       PROGMEM = "logLevel";
-const char S_MAC[]                             PROGMEM = "mac";
-const char S_MASTER[]                          PROGMEM = "master";
-const char S_MAX[]                             PROGMEM = "max";
-const char S_MAX_FREE_BLOCK[]                  PROGMEM = "maxFreeBlock";
-const char S_MAX_MODULATION[]                  PROGMEM = "maxModulation";
-const char S_MAX_POWER[]                       PROGMEM = "maxPower";
-const char S_MAX_TEMP[]                        PROGMEM = "maxTemp";
-const char S_MEMBER_ID[]                       PROGMEM = "memberId";
-const char S_MIN[]                             PROGMEM = "min";
-const char S_MIN_FREE[]                        PROGMEM = "minFree";
-const char S_MIN_MAX_FREE_BLOCK[]              PROGMEM = "minMaxFreeBlock";
-const char S_MIN_POWER[]                       PROGMEM = "minPower";
-const char S_MIN_TEMP[]                        PROGMEM = "minTemp";
-const char S_MODEL[]                           PROGMEM = "model";
-const char S_MODULATION[]                      PROGMEM = "modulation";
-const char S_MODULATION_SYNC_WITH_HEATING[]    PROGMEM = "modulationSyncWithHeating";
-const char S_MQTT[]                            PROGMEM = "mqtt";
-const char S_NAME[]                            PROGMEM = "name";
-const char S_NATIVE_HEATING_CONTROL[]          PROGMEM = "nativeHeatingControl";
-const char S_NETWORK[]                         PROGMEM = "network";
-const char S_N_FACTOR[]                        PROGMEM = "n_factor";
-const char S_OFFSET[]                          PROGMEM = "offset";
-const char S_ON_ENABLED_HEATING[]              PROGMEM = "onEnabledHeating";
-const char S_ON_FAULT[]                        PROGMEM = "onFault";
-const char S_ON_LOSS_CONNECTION[]              PROGMEM = "onLossConnection";
-const char S_OPENTHERM[]                       PROGMEM = "opentherm";
-const char S_OUTDOOR_TEMP[]                    PROGMEM = "outdoorTemp";
-const char S_OUT_GPIO[]                        PROGMEM = "outGpio";
-const char S_OUTPUT[]                          PROGMEM = "output";
-const char S_PASSWORD[]                        PROGMEM = "password";
-const char S_PID[]                             PROGMEM = "pid";
-const char S_PORT[]                            PROGMEM = "port";
-const char S_PORTAL[]                          PROGMEM = "portal";
-const char S_POST_CIRCULATION_TIME[]           PROGMEM = "postCirculationTime";
-const char S_POWER[]                           PROGMEM = "power";
-const char S_PREFIX[]                          PROGMEM = "prefix";
-const char S_PROTOCOL_VERSION[]                PROGMEM = "protocolVersion";
-const char S_PURPOSE[]                         PROGMEM = "purpose";
-const char S_P_FACTOR[]                        PROGMEM = "p_factor";
-const char S_REAL_SIZE[]                       PROGMEM = "realSize";
-const char S_REASON[]                          PROGMEM = "reason";
-const char S_RESET_DIAGNOSTIC[]                PROGMEM = "resetDiagnostic";
-const char S_RESET_FAULT[]                     PROGMEM = "resetFault";
-const char S_RESET_REASON[]                    PROGMEM = "resetReason";
-const char S_RESTART[]                         PROGMEM = "restart";
-const char S_RETURN_TEMP[]                     PROGMEM = "returnTemp";
-const char S_REV[]                             PROGMEM = "rev";
-const char S_RSSI[]                            PROGMEM = "rssi";
-const char S_RX_LED_GPIO[]                     PROGMEM = "rxLedGpio";
-const char S_SDK[]                             PROGMEM = "sdk";
-const char S_SENSORS[]                         PROGMEM = "sensors";
-const char S_SERIAL[]                          PROGMEM = "serial";
-const char S_SERVER[]                          PROGMEM = "server";
-const char S_SETTINGS[]                        PROGMEM = "settings";
-const char S_SIGNAL_QUALITY[]                  PROGMEM = "signalQuality";
-const char S_SIZE[]                            PROGMEM = "size";
-const char S_SLAVE[]                           PROGMEM = "slave";
-const char S_SSID[]                            PROGMEM = "ssid";
-const char S_STA[]                             PROGMEM = "sta";
-const char S_STATE[]                           PROGMEM = "state";
-const char S_STATIC_CONFIG[]                   PROGMEM = "staticConfig";
-const char S_STATUS_LED_GPIO[]                 PROGMEM = "statusLedGpio";
-const char S_SETPOINT_TEMP[]                   PROGMEM = "setpointTemp";
-const char S_SUBNET[]                          PROGMEM = "subnet";
-const char S_SUMMER_WINTER_MODE[]              PROGMEM = "summerWinterMode";
-const char S_SYSTEM[]                          PROGMEM = "system";
-const char S_TARGET[]                          PROGMEM = "target";
-const char S_TARGET_TEMP[]                     PROGMEM = "targetTemp";
-const char S_TELNET[]                          PROGMEM = "telnet";
-const char S_TEMPERATURE[]                     PROGMEM = "temperature";
-const char S_THRESHOLD_TIME[]                  PROGMEM = "thresholdTime";
-const char S_TOTAL[]                           PROGMEM = "total";
-const char S_TRESHOLD_TIME[]                   PROGMEM = "tresholdTime";
-const char S_TURBO[]                           PROGMEM = "turbo";
-const char S_TURBO_FACTOR[]                    PROGMEM = "turboFactor";
-const char S_TYPE[]                            PROGMEM = "type";
-const char S_T_FACTOR[]                        PROGMEM = "t_factor";
-const char S_UNIT_SYSTEM[]                     PROGMEM = "unitSystem";
-const char S_UPTIME[]                          PROGMEM = "uptime";
-const char S_USE[]                             PROGMEM = "use";
-const char S_USE_DHCP[]                        PROGMEM = "useDhcp";
-const char S_USER[]                            PROGMEM = "user";
-const char S_VALUE[]                           PROGMEM = "value";
-const char S_VERSION[]                         PROGMEM = "version";
+const char S_ACTIONS[]                              PROGMEM = "actions";
+const char S_ACTIVE[]                               PROGMEM = "active";
+const char S_ADDRESS[]                              PROGMEM = "address";
+const char S_ANTI_STUCK_INTERVAL[]                  PROGMEM = "antiStuckInterval";
+const char S_ANTI_STUCK_TIME[]                      PROGMEM = "antiStuckTime";
+const char S_AP[]                                   PROGMEM = "ap";
+const char S_APP_VERSION[]                          PROGMEM = "appVersion";
+const char S_AUTH[]                                 PROGMEM = "auth";
+const char S_BACKTRACE[]                            PROGMEM = "backtrace";
+const char S_BATTERY[]                              PROGMEM = "battery";
+const char S_BAUDRATE[]                             PROGMEM = "baudrate";
+const char S_BLOCKING[]                             PROGMEM = "blocking";
+const char S_BSSID[]                                PROGMEM = "bssid";
+const char S_BUILD[]                                PROGMEM = "build";
+const char S_CASCADE_CONTROL[]                      PROGMEM = "cascadeControl";
+const char S_CHANNEL[]                              PROGMEM = "channel";
+const char S_CH2_ALWAYS_ENABLED[]                   PROGMEM = "ch2AlwaysEnabled";
+const char S_CHIP[]                                 PROGMEM = "chip";
+const char S_CODE[]                                 PROGMEM = "code";
+const char S_CONNECTED[]                            PROGMEM = "connected";
+const char S_CONTINUES[]                            PROGMEM = "continues";
+const char S_COOLING[]                              PROGMEM = "cooling";
+const char S_COOLING_SUPPORT[]                      PROGMEM = "coolingSupport";
+const char S_CORE[]                                 PROGMEM = "core";
+const char S_CORES[]                                PROGMEM = "cores";
+const char S_CRASH[]                                PROGMEM = "crash";
+const char S_CURRENT_TEMP[]                         PROGMEM = "currentTemp";
+const char S_DATA[]                                 PROGMEM = "data";
+const char S_DATE[]                                 PROGMEM = "date";
+const char S_DEADBAND[]                             PROGMEM = "deadband";
+const char S_DHW[]                                  PROGMEM = "dhw";
+const char S_DHW_BLOCKING[]                         PROGMEM = "dhwBlocking";
+const char S_DHW_SUPPORT[]                          PROGMEM = "dhwSupport";
+const char S_DHW_TO_CH2[]                           PROGMEM = "dhwToCh2";
+const char S_DIAG[]                                 PROGMEM = "diag";
+const char S_DNS[]                                  PROGMEM = "dns";
+const char S_DT[]                                   PROGMEM = "dt";
+const char S_D_FACTOR[]                             PROGMEM = "d_factor";
+const char S_D_MULTIPLIER[]                         PROGMEM = "d_multiplier";
+const char S_EMERGENCY[]                            PROGMEM = "emergency";
+const char S_ENABLED[]                              PROGMEM = "enabled";
+const char S_ENV[]                                  PROGMEM = "env";
+const char S_EPC[]                                  PROGMEM = "epc";
+const char S_EQUITHERM[]                            PROGMEM = "equitherm";
+const char S_EXTERNAL_PUMP[]                        PROGMEM = "externalPump";
+const char S_FACTOR[]                               PROGMEM = "factor";
+const char S_FAULT[]                                PROGMEM = "fault";
+const char S_FILTERING[]                            PROGMEM = "filtering";
+const char S_FILTERING_FACTOR[]                     PROGMEM = "filteringFactor";
+const char S_FLAGS[]                                PROGMEM = "flags";
+const char S_FLAME[]                                PROGMEM = "flame";
+const char S_FLASH[]                                PROGMEM = "flash";
+const char S_FREE[]                                 PROGMEM = "free";
+const char S_FREQ[]                                 PROGMEM = "freq";
+const char S_GATEWAY[]                              PROGMEM = "gateway";
+const char S_GET_MIN_MAX_TEMP[]                     PROGMEM = "getMinMaxTemp";
+const char S_GPIO[]                                 PROGMEM = "gpio";
+const char S_HEAP[]                                 PROGMEM = "heap";
+const char S_HEATING[]                              PROGMEM = "heating";
+const char S_HEATING_TO_CH2[]                       PROGMEM = "heatingToCh2";
+const char S_HEATING_STATE_TO_SUMMER_WINTER_MODE[]  PROGMEM = "heatingStateToSummerWinterMode";
+const char S_HIDDEN[]                               PROGMEM = "hidden";
+const char S_HOME_ASSISTANT_DISCOVERY[]             PROGMEM = "homeAssistantDiscovery";
+const char S_HOSTNAME[]                             PROGMEM = "hostname";
+const char S_HUMIDITY[]                             PROGMEM = "humidity";
+const char S_HYSTERESIS[]                           PROGMEM = "hysteresis";
+const char S_ID[]                                   PROGMEM = "id";
+const char S_IMMERGAS_FIX[]                         PROGMEM = "immergasFix";
+const char S_INDOOR_TEMP[]                          PROGMEM = "indoorTemp";
+const char S_INDOOR_TEMP_CONTROL[]                  PROGMEM = "indoorTempControl";
+const char S_IN_GPIO[]                              PROGMEM = "inGpio";
+const char S_INPUT[]                                PROGMEM = "input";
+const char S_INTERVAL[]                             PROGMEM = "interval";
+const char S_INVERT_STATE[]                         PROGMEM = "invertState";
+const char S_IP[]                                   PROGMEM = "ip";
+const char S_I_FACTOR[]                             PROGMEM = "i_factor";
+const char S_I_MULTIPLIER[]                         PROGMEM = "i_multiplier";
+const char S_K_FACTOR[]                             PROGMEM = "k_factor";
+const char S_LOGIN[]                                PROGMEM = "login";
+const char S_LOG_LEVEL[]                            PROGMEM = "logLevel";
+const char S_MAC[]                                  PROGMEM = "mac";
+const char S_MASTER[]                               PROGMEM = "master";
+const char S_MAX[]                                  PROGMEM = "max";
+const char S_MAX_FREE_BLOCK[]                       PROGMEM = "maxFreeBlock";
+const char S_MAX_MODULATION[]                       PROGMEM = "maxModulation";
+const char S_MAX_POWER[]                            PROGMEM = "maxPower";
+const char S_MAX_TEMP[]                             PROGMEM = "maxTemp";
+const char S_MAX_TEMP_SYNC_WITH_TARGET_TEMP[]       PROGMEM = "maxTempSyncWithTargetTemp";
+const char S_MDNS[]                                 PROGMEM = "mdns";
+const char S_MEMBER_ID[]                            PROGMEM = "memberId";
+const char S_MIN[]                                  PROGMEM = "min";
+const char S_MIN_FREE[]                             PROGMEM = "minFree";
+const char S_MIN_MAX_FREE_BLOCK[]                   PROGMEM = "minMaxFreeBlock";
+const char S_MIN_POWER[]                            PROGMEM = "minPower";
+const char S_MIN_TEMP[]                             PROGMEM = "minTemp";
+const char S_MODEL[]                                PROGMEM = "model";
+const char S_MODULATION[]                           PROGMEM = "modulation";
+const char S_MODULATION_SYNC_WITH_HEATING[]         PROGMEM = "modulationSyncWithHeating";
+const char S_MQTT[]                                 PROGMEM = "mqtt";
+const char S_NAME[]                                 PROGMEM = "name";
+const char S_NATIVE_HEATING_CONTROL[]               PROGMEM = "nativeHeatingControl";
+const char S_NETWORK[]                              PROGMEM = "network";
+const char S_NTP[]                                  PROGMEM = "ntp";
+const char S_N_FACTOR[]                             PROGMEM = "n_factor";
+const char S_OFFSET[]                               PROGMEM = "offset";
+const char S_ON_ENABLED_HEATING[]                   PROGMEM = "onEnabledHeating";
+const char S_ON_FAULT[]                             PROGMEM = "onFault";
+const char S_ON_LOSS_CONNECTION[]                   PROGMEM = "onLossConnection";
+const char S_OPENTHERM[]                            PROGMEM = "opentherm";
+const char S_OPTIONS[]                              PROGMEM = "options";
+const char S_OUTDOOR_TEMP[]                         PROGMEM = "outdoorTemp";
+const char S_OUT_GPIO[]                             PROGMEM = "outGpio";
+const char S_OUTPUT[]                               PROGMEM = "output";
+const char S_PASSWORD[]                             PROGMEM = "password";
+const char S_PID[]                                  PROGMEM = "pid";
+const char S_PORT[]                                 PROGMEM = "port";
+const char S_PORTAL[]                               PROGMEM = "portal";
+const char S_POST_CIRCULATION_TIME[]                PROGMEM = "postCirculationTime";
+const char S_POWER[]                                PROGMEM = "power";
+const char S_PREFIX[]                               PROGMEM = "prefix";
+const char S_PROTOCOL_VERSION[]                     PROGMEM = "protocolVersion";
+const char S_PURPOSE[]                              PROGMEM = "purpose";
+const char S_P_FACTOR[]                             PROGMEM = "p_factor";
+const char S_P_MULTIPLIER[]                         PROGMEM = "p_multiplier";
+const char S_REAL_SIZE[]                            PROGMEM = "realSize";
+const char S_REASON[]                               PROGMEM = "reason";
+const char S_RESET_DIAGNOSTIC[]                     PROGMEM = "resetDiagnostic";
+const char S_RESET_FAULT[]                          PROGMEM = "resetFault";
+const char S_RESET_REASON[]                         PROGMEM = "resetReason";
+const char S_RESTART[]                              PROGMEM = "restart";
+const char S_RETURN_TEMP[]                          PROGMEM = "returnTemp";
+const char S_REV[]                                  PROGMEM = "rev";
+const char S_RSSI[]                                 PROGMEM = "rssi";
+const char S_RX_LED_GPIO[]                          PROGMEM = "rxLedGpio";
+const char S_SDK[]                                  PROGMEM = "sdk";
+const char S_SENSORS[]                              PROGMEM = "sensors";
+const char S_SERIAL[]                               PROGMEM = "serial";
+const char S_SERVER[]                               PROGMEM = "server";
+const char S_SETTINGS[]                             PROGMEM = "settings";
+const char S_SIGNAL_QUALITY[]                       PROGMEM = "signalQuality";
+const char S_SIZE[]                                 PROGMEM = "size";
+const char S_SLAVE[]                                PROGMEM = "slave";
+const char S_SSID[]                                 PROGMEM = "ssid";
+const char S_STA[]                                  PROGMEM = "sta";
+const char S_STATE[]                                PROGMEM = "state";
+const char S_STATIC_CONFIG[]                        PROGMEM = "staticConfig";
+const char S_STATUS_LED_GPIO[]                      PROGMEM = "statusLedGpio";
+const char S_SETPOINT_TEMP[]                        PROGMEM = "setpointTemp";
+const char S_SUBNET[]                               PROGMEM = "subnet";
+const char S_SUMMER_WINTER_MODE[]                   PROGMEM = "summerWinterMode";
+const char S_SYSTEM[]                               PROGMEM = "system";
+const char S_TARGET[]                               PROGMEM = "target";
+const char S_TARGET_TEMP[]                          PROGMEM = "targetTemp";
+const char S_TELNET[]                               PROGMEM = "telnet";
+const char S_TEMPERATURE[]                          PROGMEM = "temperature";
+const char S_THRESHOLD_HIGH[]                       PROGMEM = "thresholdHigh";
+const char S_THRESHOLD_LOW[]                        PROGMEM = "thresholdLow";
+const char S_THRESHOLD_TIME[]                       PROGMEM = "thresholdTime";
+const char S_TIMEZONE[]                             PROGMEM = "timezone";
+const char S_TOTAL[]                                PROGMEM = "total";
+const char S_TRESHOLD_TIME[]                        PROGMEM = "tresholdTime";
+const char S_TURBO[]                                PROGMEM = "turbo";
+const char S_TURBO_FACTOR[]                         PROGMEM = "turboFactor";
+const char S_TYPE[]                                 PROGMEM = "type";
+const char S_T_FACTOR[]                             PROGMEM = "t_factor";
+const char S_UNIT_SYSTEM[]                          PROGMEM = "unitSystem";
+const char S_UPTIME[]                               PROGMEM = "uptime";
+const char S_USE[]                                  PROGMEM = "use";
+const char S_USE_DHCP[]                             PROGMEM = "useDhcp";
+const char S_USER[]                                 PROGMEM = "user";
+const char S_VALUE[]                                PROGMEM = "value";
+const char S_VERSION[]                              PROGMEM = "version";
--- a/src/utils.h
+++ b/src/utils.h
@@ -1,5 +1,75 @@
 #include <Arduino.h>

+String getChipId(const char* prefix = nullptr, const char* suffix = nullptr) {
+  String chipId;
+  chipId.reserve(
+    6
+    + (prefix != nullptr ? strlen(prefix) : 0)
+    + (suffix != nullptr ? strlen(suffix) : 0)
+  );
+  
+  if (prefix != nullptr) {
+    chipId.concat(prefix);
+  }
+
+  uint32_t cid = 0;
+  #if defined(ARDUINO_ARCH_ESP8266)
+  cid = ESP.getChipId();
+  #elif defined(ARDUINO_ARCH_ESP32)
+  // https://github.com/espressif/arduino-esp32/blob/master/libraries/ESP32/examples/ChipID/GetChipID/GetChipID.ino
+  for (uint8_t i = 0; i < 17; i = i + 8) {
+    cid |= ((ESP.getEfuseMac() >> (40 - i)) & 0xff) << i;
+  }
+  #endif
+
+  chipId += String(cid, HEX);
+
+  if (suffix != nullptr) {
+    chipId.concat(suffix);
+  }
+
+  chipId.trim();
+  return chipId;
+}
+
+bool isLeapYear(short year) {
+  if (year % 4 != 0) {
+    return false;
+  }
+
+  if (year % 100 != 0) {
+    return true;
+  }
+
+  return (year % 400) == 0;
+}
+
+// convert UTC tm time to time_t epoch time
+// source: https://github.com/cyberman54/ESP32-Paxcounter/blob/master/src/timekeeper.cpp
+time_t mkgmtime(const struct tm *ptm) {
+  const int SecondsPerMinute = 60;
+  const int SecondsPerHour = 3600;
+  const int SecondsPerDay = 86400;
+  const int DaysOfMonth[12] = {31, 28, 31, 30, 31, 30, 31, 31, 30, 31, 30, 31};
+  time_t secs = 0;
+  // tm_year is years since 1900
+  int year = ptm->tm_year + 1900;
+  for (int y = 1970; y < year; ++y) {
+    secs += (isLeapYear(y) ? 366 : 365) * SecondsPerDay;
+  }
+  // tm_mon is month from 0..11
+  for (int m = 0; m < ptm->tm_mon; ++m) {
+    secs += DaysOfMonth[m] * SecondsPerDay;
+    if (m == 1 && isLeapYear(year))
+      secs += SecondsPerDay;
+  }
+  secs += (ptm->tm_mday - 1) * SecondsPerDay;
+  secs += ptm->tm_hour * SecondsPerHour;
+  secs += ptm->tm_min * SecondsPerMinute;
+  secs += ptm->tm_sec;
+  return secs;
+}
+
 inline bool isDigit(const char* ptr) {
  char* endPtr;
  strtol(ptr, &endPtr, 10);
@@ -359,6 +429,10 @@ void settingsToJson(const Settings& src, JsonVariant dst, bool safe = false) {
    telnet[FPSTR(S_ENABLED)] = src.system.telnet.enabled;
    telnet[FPSTR(S_PORT)] = src.system.telnet.port;

+    auto ntp = system[FPSTR(S_NTP)].to<JsonObject>();
+    ntp[FPSTR(S_SERVER)] = src.system.ntp.server;
+    ntp[FPSTR(S_TIMEZONE)] = src.system.ntp.timezone;
+
    system[FPSTR(S_UNIT_SYSTEM)] = static_cast<uint8_t>(src.system.unitSystem);
    system[FPSTR(S_STATUS_LED_GPIO)] = src.system.statusLedGpio;

@@ -366,6 +440,7 @@ void settingsToJson(const Settings& src, JsonVariant dst, bool safe = false) {
    portal[FPSTR(S_AUTH)] = src.portal.auth;
    portal[FPSTR(S_LOGIN)] = src.portal.login;
    portal[FPSTR(S_PASSWORD)] = src.portal.password;
+    portal[FPSTR(S_MDNS)] = src.portal.mdns;

    auto opentherm = dst[FPSTR(S_OPENTHERM)].to<JsonObject>();
    opentherm[FPSTR(S_UNIT_SYSTEM)] = static_cast<uint8_t>(src.opentherm.unitSystem);
@@ -377,16 +452,21 @@ void settingsToJson(const Settings& src, JsonVariant dst, bool safe = false) {
    opentherm[FPSTR(S_MAX_MODULATION)] = src.opentherm.maxModulation;
    opentherm[FPSTR(S_MIN_POWER)] = roundf(src.opentherm.minPower, 2);
    opentherm[FPSTR(S_MAX_POWER)] = roundf(src.opentherm.maxPower, 2);
-    opentherm[FPSTR(S_DHW_PRESENT)] = src.opentherm.dhwPresent;
-    opentherm[FPSTR(S_SUMMER_WINTER_MODE)] = src.opentherm.summerWinterMode;
-    opentherm[FPSTR(S_HEATING_CH2_ENABLED)] = src.opentherm.heatingCh2Enabled;
-    opentherm[FPSTR(S_HEATING_CH1_TO_CH2)] = src.opentherm.heatingCh1ToCh2;
-    opentherm[FPSTR(S_DHW_TO_CH2)] = src.opentherm.dhwToCh2;
-    opentherm[FPSTR(S_DHW_BLOCKING)] = src.opentherm.dhwBlocking;
-    opentherm[FPSTR(S_MODULATION_SYNC_WITH_HEATING)] = src.opentherm.modulationSyncWithHeating;
-    opentherm[FPSTR(S_GET_MIN_MAX_TEMP)] = src.opentherm.getMinMaxTemp;
-    opentherm[FPSTR(S_NATIVE_HEATING_CONTROL)] = src.opentherm.nativeHeatingControl;
-    opentherm[FPSTR(S_IMMERGAS_FIX)] = src.opentherm.immergasFix;
+
+    auto otOptions = opentherm[FPSTR(S_OPTIONS)].to<JsonObject>();
+    otOptions[FPSTR(S_DHW_SUPPORT)] = src.opentherm.options.dhwSupport;
+    otOptions[FPSTR(S_COOLING_SUPPORT)] = src.opentherm.options.coolingSupport;
+    otOptions[FPSTR(S_SUMMER_WINTER_MODE)] = src.opentherm.options.summerWinterMode;
+    otOptions[FPSTR(S_HEATING_STATE_TO_SUMMER_WINTER_MODE)] = src.opentherm.options.heatingStateToSummerWinterMode;
+    otOptions[FPSTR(S_CH2_ALWAYS_ENABLED)] = src.opentherm.options.ch2AlwaysEnabled;
+    otOptions[FPSTR(S_HEATING_TO_CH2)] = src.opentherm.options.heatingToCh2;
+    otOptions[FPSTR(S_DHW_TO_CH2)] = src.opentherm.options.dhwToCh2;
+    otOptions[FPSTR(S_DHW_BLOCKING)] = src.opentherm.options.dhwBlocking;
+    otOptions[FPSTR(S_MODULATION_SYNC_WITH_HEATING)] = src.opentherm.options.modulationSyncWithHeating;
+    otOptions[FPSTR(S_MAX_TEMP_SYNC_WITH_TARGET_TEMP)] = src.opentherm.options.maxTempSyncWithTargetTemp;
+    otOptions[FPSTR(S_GET_MIN_MAX_TEMP)] = src.opentherm.options.getMinMaxTemp;
+    otOptions[FPSTR(S_NATIVE_HEATING_CONTROL)] = src.opentherm.options.nativeHeatingControl;
+    otOptions[FPSTR(S_IMMERGAS_FIX)] = src.opentherm.options.immergasFix;

    auto mqtt = dst[FPSTR(S_MQTT)].to<JsonObject>();
    mqtt[FPSTR(S_ENABLED)] = src.mqtt.enabled;
@@ -433,6 +513,14 @@ void settingsToJson(const Settings& src, JsonVariant dst, bool safe = false) {
  pid[FPSTR(S_MIN_TEMP)] = src.pid.minTemp;
  pid[FPSTR(S_MAX_TEMP)] = src.pid.maxTemp;

+  auto pidDeadband = pid[FPSTR(S_DEADBAND)].to<JsonObject>();
+  pidDeadband[FPSTR(S_ENABLED)] = src.pid.deadband.enabled;
+  pidDeadband[FPSTR(S_P_MULTIPLIER)] = src.pid.deadband.p_multiplier;
+  pidDeadband[FPSTR(S_I_MULTIPLIER)] = src.pid.deadband.i_multiplier;
+  pidDeadband[FPSTR(S_D_MULTIPLIER)] = src.pid.deadband.d_multiplier;
+  pidDeadband[FPSTR(S_THRESHOLD_HIGH)] = src.pid.deadband.thresholdHigh;
+  pidDeadband[FPSTR(S_THRESHOLD_LOW)] = src.pid.deadband.thresholdLow;
+
  if (!safe) {
    auto externalPump = dst[FPSTR(S_EXTERNAL_PUMP)].to<JsonObject>();
    externalPump[FPSTR(S_USE)] = src.externalPump.use;
@@ -514,6 +602,24 @@ bool jsonToSettings(const JsonVariantConst src, Settings& dst, bool safe = false
      }
    }

+    if (!src[FPSTR(S_SYSTEM)][FPSTR(S_NTP)][FPSTR(S_SERVER)].isNull()) {
+      String value = src[FPSTR(S_SYSTEM)][FPSTR(S_NTP)][FPSTR(S_SERVER)].as<String>();
+
+      if (value.length() < sizeof(dst.system.ntp.server) && !value.equals(dst.system.ntp.server)) {
+        strcpy(dst.system.ntp.server, value.c_str());
+        changed = true;
+      }
+    }
+
+    if (!src[FPSTR(S_SYSTEM)][FPSTR(S_NTP)][FPSTR(S_TIMEZONE)].isNull()) {
+      String value = src[FPSTR(S_SYSTEM)][FPSTR(S_NTP)][FPSTR(S_TIMEZONE)].as<String>();
+
+      if (value.length() < sizeof(dst.system.ntp.timezone) && !value.equals(dst.system.ntp.timezone)) {
+        strcpy(dst.system.ntp.timezone, value.c_str());
+        changed = true;
+      }
+    }
+
    if (!src[FPSTR(S_SYSTEM)][FPSTR(S_UNIT_SYSTEM)].isNull()) {
      uint8_t value = src[FPSTR(S_SYSTEM)][FPSTR(S_UNIT_SYSTEM)].as<unsigned char>();
      UnitSystem prevUnitSystem = dst.system.unitSystem;
@@ -597,6 +703,20 @@ bool jsonToSettings(const JsonVariantConst src, Settings& dst, bool safe = false
      }
    }

+    if (dst.portal.auth && (!strlen(dst.portal.login) || !strlen(dst.portal.password))) {
+      dst.portal.auth = false;
+      changed = true;
+    }
+
+    if (src[FPSTR(S_PORTAL)][FPSTR(S_MDNS)].is<bool>()) {
+      bool value = src[FPSTR(S_PORTAL)][FPSTR(S_MDNS)].as<bool>();
+
+      if (value != dst.portal.mdns) {
+        dst.portal.mdns = value;
+        changed = true;
+      }
+    }
+

    // opentherm
    if (!src[FPSTR(S_OPENTHERM)][FPSTR(S_UNIT_SYSTEM)].isNull()) {
@@ -718,101 +838,128 @@ bool jsonToSettings(const JsonVariantConst src, Settings& dst, bool safe = false
      }
    }

-    if (src[FPSTR(S_OPENTHERM)][FPSTR(S_DHW_PRESENT)].is<bool>()) {
-      bool value = src[FPSTR(S_OPENTHERM)][FPSTR(S_DHW_PRESENT)].as<bool>();
+    if (src[FPSTR(S_OPENTHERM)][FPSTR(S_OPTIONS)][FPSTR(S_DHW_SUPPORT)].is<bool>()) {
+      bool value = src[FPSTR(S_OPENTHERM)][FPSTR(S_OPTIONS)][FPSTR(S_DHW_SUPPORT)].as<bool>();

-      if (value != dst.opentherm.dhwPresent) {
-        dst.opentherm.dhwPresent = value;
+      if (value != dst.opentherm.options.dhwSupport) {
+        dst.opentherm.options.dhwSupport = value;
        changed = true;
      }
    }

-    if (src[FPSTR(S_OPENTHERM)][FPSTR(S_SUMMER_WINTER_MODE)].is<bool>()) {
-      bool value = src[FPSTR(S_OPENTHERM)][FPSTR(S_SUMMER_WINTER_MODE)].as<bool>();
+    if (src[FPSTR(S_OPENTHERM)][FPSTR(S_OPTIONS)][FPSTR(S_COOLING_SUPPORT)].is<bool>()) {
+      bool value = src[FPSTR(S_OPENTHERM)][FPSTR(S_OPTIONS)][FPSTR(S_COOLING_SUPPORT)].as<bool>();

-      if (value != dst.opentherm.summerWinterMode) {
-        dst.opentherm.summerWinterMode = value;
+      if (value != dst.opentherm.options.coolingSupport) {
+        dst.opentherm.options.coolingSupport = value;
        changed = true;
      }
    }

-    if (src[FPSTR(S_OPENTHERM)][FPSTR(S_HEATING_CH2_ENABLED)].is<bool>()) {
-      bool value = src[FPSTR(S_OPENTHERM)][FPSTR(S_HEATING_CH2_ENABLED)].as<bool>();
+    if (src[FPSTR(S_OPENTHERM)][FPSTR(S_OPTIONS)][FPSTR(S_SUMMER_WINTER_MODE)].is<bool>()) {
+      bool value = src[FPSTR(S_OPENTHERM)][FPSTR(S_OPTIONS)][FPSTR(S_SUMMER_WINTER_MODE)].as<bool>();

-      if (value != dst.opentherm.heatingCh2Enabled) {
-        dst.opentherm.heatingCh2Enabled = value;
+      if (value != dst.opentherm.options.summerWinterMode) {
+        dst.opentherm.options.summerWinterMode = value;
+        changed = true;
+      }
+    }

-        if (dst.opentherm.heatingCh2Enabled) {
-          dst.opentherm.heatingCh1ToCh2 = false;
-          dst.opentherm.dhwToCh2 = false;
+    if (src[FPSTR(S_OPENTHERM)][FPSTR(S_OPTIONS)][FPSTR(S_HEATING_STATE_TO_SUMMER_WINTER_MODE)].is<bool>()) {
+      bool value = src[FPSTR(S_OPENTHERM)][FPSTR(S_OPTIONS)][FPSTR(S_HEATING_STATE_TO_SUMMER_WINTER_MODE)].as<bool>();
+
+      if (value != dst.opentherm.options.heatingStateToSummerWinterMode) {
+        dst.opentherm.options.heatingStateToSummerWinterMode = value;
+        changed = true;
+      }
+    }
+
+    if (src[FPSTR(S_OPENTHERM)][FPSTR(S_OPTIONS)][FPSTR(S_CH2_ALWAYS_ENABLED)].is<bool>()) {
+      bool value = src[FPSTR(S_OPENTHERM)][FPSTR(S_OPTIONS)][FPSTR(S_CH2_ALWAYS_ENABLED)].as<bool>();
+
+      if (value != dst.opentherm.options.ch2AlwaysEnabled) {
+        dst.opentherm.options.ch2AlwaysEnabled = value;
+
+        if (dst.opentherm.options.ch2AlwaysEnabled) {
+          dst.opentherm.options.heatingToCh2 = false;
+          dst.opentherm.options.dhwToCh2 = false;
        }

        changed = true;
      }
    }

-    if (src[FPSTR(S_OPENTHERM)][FPSTR(S_HEATING_CH1_TO_CH2)].is<bool>()) {
-      bool value = src[FPSTR(S_OPENTHERM)][FPSTR(S_HEATING_CH1_TO_CH2)].as<bool>();
+    if (src[FPSTR(S_OPENTHERM)][FPSTR(S_OPTIONS)][FPSTR(S_HEATING_TO_CH2)].is<bool>()) {
+      bool value = src[FPSTR(S_OPENTHERM)][FPSTR(S_OPTIONS)][FPSTR(S_HEATING_TO_CH2)].as<bool>();

-      if (value != dst.opentherm.heatingCh1ToCh2) {
-        dst.opentherm.heatingCh1ToCh2 = value;
+      if (value != dst.opentherm.options.heatingToCh2) {
+        dst.opentherm.options.heatingToCh2 = value;

-        if (dst.opentherm.heatingCh1ToCh2) {
-          dst.opentherm.heatingCh2Enabled = false;
-          dst.opentherm.dhwToCh2 = false;
+        if (dst.opentherm.options.heatingToCh2) {
+          dst.opentherm.options.ch2AlwaysEnabled = false;
+          dst.opentherm.options.dhwToCh2 = false;
        }

        changed = true;
      }
    }

-    if (src[FPSTR(S_OPENTHERM)][FPSTR(S_DHW_TO_CH2)].is<bool>()) {
-      bool value = src[FPSTR(S_OPENTHERM)][FPSTR(S_DHW_TO_CH2)].as<bool>();
+    if (src[FPSTR(S_OPENTHERM)][FPSTR(S_OPTIONS)][FPSTR(S_DHW_TO_CH2)].is<bool>()) {
+      bool value = src[FPSTR(S_OPENTHERM)][FPSTR(S_OPTIONS)][FPSTR(S_DHW_TO_CH2)].as<bool>();

-      if (value != dst.opentherm.dhwToCh2) {
-        dst.opentherm.dhwToCh2 = value;
+      if (value != dst.opentherm.options.dhwToCh2) {
+        dst.opentherm.options.dhwToCh2 = value;

-        if (dst.opentherm.dhwToCh2) {
-          dst.opentherm.heatingCh2Enabled = false;
-          dst.opentherm.heatingCh1ToCh2 = false;
+        if (dst.opentherm.options.dhwToCh2) {
+          dst.opentherm.options.ch2AlwaysEnabled = false;
+          dst.opentherm.options.heatingToCh2 = false;
        }

        changed = true;
      }
    }

-    if (src[FPSTR(S_OPENTHERM)][FPSTR(S_DHW_BLOCKING)].is<bool>()) {
-      bool value = src[FPSTR(S_OPENTHERM)][FPSTR(S_DHW_BLOCKING)].as<bool>();
+    if (src[FPSTR(S_OPENTHERM)][FPSTR(S_OPTIONS)][FPSTR(S_DHW_BLOCKING)].is<bool>()) {
+      bool value = src[FPSTR(S_OPENTHERM)][FPSTR(S_OPTIONS)][FPSTR(S_DHW_BLOCKING)].as<bool>();

-      if (value != dst.opentherm.dhwBlocking) {
-        dst.opentherm.dhwBlocking = value;
+      if (value != dst.opentherm.options.dhwBlocking) {
+        dst.opentherm.options.dhwBlocking = value;
        changed = true;
      }
    }

-    if (src[FPSTR(S_OPENTHERM)][FPSTR(S_MODULATION_SYNC_WITH_HEATING)].is<bool>()) {
-      bool value = src[FPSTR(S_OPENTHERM)][FPSTR(S_MODULATION_SYNC_WITH_HEATING)].as<bool>();
+    if (src[FPSTR(S_OPENTHERM)][FPSTR(S_OPTIONS)][FPSTR(S_MODULATION_SYNC_WITH_HEATING)].is<bool>()) {
+      bool value = src[FPSTR(S_OPENTHERM)][FPSTR(S_OPTIONS)][FPSTR(S_MODULATION_SYNC_WITH_HEATING)].as<bool>();

-      if (value != dst.opentherm.modulationSyncWithHeating) {
-        dst.opentherm.modulationSyncWithHeating = value;
+      if (value != dst.opentherm.options.modulationSyncWithHeating) {
+        dst.opentherm.options.modulationSyncWithHeating = value;
        changed = true;
      }
    }

-    if (src[FPSTR(S_OPENTHERM)][FPSTR(S_GET_MIN_MAX_TEMP)].is<bool>()) {
-      bool value = src[FPSTR(S_OPENTHERM)][FPSTR(S_GET_MIN_MAX_TEMP)].as<bool>();
+    if (src[FPSTR(S_OPENTHERM)][FPSTR(S_OPTIONS)][FPSTR(S_MAX_TEMP_SYNC_WITH_TARGET_TEMP)].is<bool>()) {
+      bool value = src[FPSTR(S_OPENTHERM)][FPSTR(S_OPTIONS)][FPSTR(S_MAX_TEMP_SYNC_WITH_TARGET_TEMP)].as<bool>();

-      if (value != dst.opentherm.getMinMaxTemp) {
-        dst.opentherm.getMinMaxTemp = value;
+      if (value != dst.opentherm.options.maxTempSyncWithTargetTemp) {
+        dst.opentherm.options.maxTempSyncWithTargetTemp = value;
        changed = true;
      }
    }

-    if (src[FPSTR(S_OPENTHERM)][FPSTR(S_NATIVE_HEATING_CONTROL)].is<bool>()) {
-      bool value = src[FPSTR(S_OPENTHERM)][FPSTR(S_NATIVE_HEATING_CONTROL)].as<bool>();
+    if (src[FPSTR(S_OPENTHERM)][FPSTR(S_OPTIONS)][FPSTR(S_GET_MIN_MAX_TEMP)].is<bool>()) {
+      bool value = src[FPSTR(S_OPENTHERM)][FPSTR(S_OPTIONS)][FPSTR(S_GET_MIN_MAX_TEMP)].as<bool>();

-      if (value != dst.opentherm.nativeHeatingControl) {
-        dst.opentherm.nativeHeatingControl = value;
+      if (value != dst.opentherm.options.getMinMaxTemp) {
+        dst.opentherm.options.getMinMaxTemp = value;
+        changed = true;
+      }
+    }
+
+    if (src[FPSTR(S_OPENTHERM)][FPSTR(S_OPTIONS)][FPSTR(S_NATIVE_HEATING_CONTROL)].is<bool>()) {
+      bool value = src[FPSTR(S_OPENTHERM)][FPSTR(S_OPTIONS)][FPSTR(S_NATIVE_HEATING_CONTROL)].as<bool>();
+
+      if (value != dst.opentherm.options.nativeHeatingControl) {
+        dst.opentherm.options.nativeHeatingControl = value;

        if (value) {
          dst.equitherm.enabled = false;
@@ -823,11 +970,11 @@ bool jsonToSettings(const JsonVariantConst src, Settings& dst, bool safe = false
      }
    }

-    if (src[FPSTR(S_OPENTHERM)][FPSTR(S_IMMERGAS_FIX)].is<bool>()) {
-      bool value = src[FPSTR(S_OPENTHERM)][FPSTR(S_IMMERGAS_FIX)].as<bool>();
+    if (src[FPSTR(S_OPENTHERM)][FPSTR(S_OPTIONS)][FPSTR(S_IMMERGAS_FIX)].is<bool>()) {
+      bool value = src[FPSTR(S_OPENTHERM)][FPSTR(S_OPTIONS)][FPSTR(S_IMMERGAS_FIX)].as<bool>();

-      if (value != dst.opentherm.immergasFix) {
-        dst.opentherm.immergasFix = value;
+      if (value != dst.opentherm.options.immergasFix) {
+        dst.opentherm.options.immergasFix = value;
        changed = true;
      }
    }
@@ -923,7 +1070,7 @@ bool jsonToSettings(const JsonVariantConst src, Settings& dst, bool safe = false
  if (src[FPSTR(S_EQUITHERM)][FPSTR(S_ENABLED)].is<bool>()) {
    bool value = src[FPSTR(S_EQUITHERM)][FPSTR(S_ENABLED)].as<bool>();

-    if (!dst.opentherm.nativeHeatingControl) {
+    if (!dst.opentherm.options.nativeHeatingControl) {
      if (value != dst.equitherm.enabled) {
        dst.equitherm.enabled = value;
        changed = true;
@@ -967,7 +1114,7 @@ bool jsonToSettings(const JsonVariantConst src, Settings& dst, bool safe = false
  if (src[FPSTR(S_PID)][FPSTR(S_ENABLED)].is<bool>()) {
    bool value = src[FPSTR(S_PID)][FPSTR(S_ENABLED)].as<bool>();

-    if (!dst.opentherm.nativeHeatingControl) {
+    if (!dst.opentherm.options.nativeHeatingControl) {
      if (value != dst.pid.enabled) {
        dst.pid.enabled = value;
        changed = true;
@@ -1038,6 +1185,60 @@ bool jsonToSettings(const JsonVariantConst src, Settings& dst, bool safe = false
    changed = true;
  }

+  if (src[FPSTR(S_PID)][FPSTR(S_DEADBAND)][FPSTR(S_ENABLED)].is<bool>()) {
+    bool value = src[FPSTR(S_PID)][FPSTR(S_DEADBAND)][FPSTR(S_ENABLED)].as<bool>();
+
+    if (value != dst.pid.deadband.enabled) {
+      dst.pid.deadband.enabled = value;
+      changed = true;
+    }
+  }
+
+  if (!src[FPSTR(S_PID)][FPSTR(S_DEADBAND)][FPSTR(S_P_MULTIPLIER)].isNull()) {
+    float value = src[FPSTR(S_PID)][FPSTR(S_DEADBAND)][FPSTR(S_P_MULTIPLIER)].as<float>();
+
+    if (value >= 0 && value <= 1 && fabsf(value - dst.pid.deadband.p_multiplier) > 0.0001f) {
+      dst.pid.deadband.p_multiplier = roundf(value, 3);
+      changed = true;
+    }
+  }
+
+  if (!src[FPSTR(S_PID)][FPSTR(S_DEADBAND)][FPSTR(S_I_MULTIPLIER)].isNull()) {
+    float value = src[FPSTR(S_PID)][FPSTR(S_DEADBAND)][FPSTR(S_I_MULTIPLIER)].as<float>();
+
+    if (value >= 0 && value <= 1 && fabsf(value - dst.pid.deadband.i_multiplier) > 0.0001f) {
+      dst.pid.deadband.i_multiplier = roundf(value, 3);
+      changed = true;
+    }
+  }
+
+  if (!src[FPSTR(S_PID)][FPSTR(S_DEADBAND)][FPSTR(S_D_MULTIPLIER)].isNull()) {
+    float value = src[FPSTR(S_PID)][FPSTR(S_DEADBAND)][FPSTR(S_D_MULTIPLIER)].as<float>();
+
+    if (value >= 0 && value <= 1 && fabsf(value - dst.pid.deadband.d_multiplier) > 0.0001f) {
+      dst.pid.deadband.d_multiplier = roundf(value, 3);
+      changed = true;
+    }
+  }
+
+  if (!src[FPSTR(S_PID)][FPSTR(S_DEADBAND)][FPSTR(S_THRESHOLD_HIGH)].isNull()) {
+    float value = src[FPSTR(S_PID)][FPSTR(S_DEADBAND)][FPSTR(S_THRESHOLD_HIGH)].as<float>();
+
+    if (value >= 0.0f && value <= 5.0f && fabsf(value - dst.pid.deadband.thresholdHigh) > 0.0001f) {
+      dst.pid.deadband.thresholdHigh = roundf(value, 2);
+      changed = true;
+    }
+  }
+
+  if (!src[FPSTR(S_PID)][FPSTR(S_DEADBAND)][FPSTR(S_THRESHOLD_LOW)].isNull()) {
+    float value = src[FPSTR(S_PID)][FPSTR(S_DEADBAND)][FPSTR(S_THRESHOLD_LOW)].as<float>();
+
+    if (value >= 0.0f && value <= 5.0f && fabsf(value - dst.pid.deadband.thresholdLow) > 0.0001f) {
+      dst.pid.deadband.thresholdLow = roundf(value, 2);
+      changed = true;
+    }
+  }
+

  // heating
  if (src[FPSTR(S_HEATING)][FPSTR(S_ENABLED)].is<bool>()) {
@@ -1326,7 +1527,7 @@ bool jsonToSettings(const JsonVariantConst src, Settings& dst, bool safe = false
  // force check emergency target
  {
    float value = !src[FPSTR(S_EMERGENCY)][FPSTR(S_TARGET)].isNull() ? src[FPSTR(S_EMERGENCY)][FPSTR(S_TARGET)].as<float>() : dst.emergency.target;
-    bool noRegulators = !dst.opentherm.nativeHeatingControl;
+    bool noRegulators = !dst.opentherm.options.nativeHeatingControl;
    bool valid = isValidTemp(
      value,
      dst.system.unitSystem,
@@ -1351,7 +1552,7 @@ bool jsonToSettings(const JsonVariantConst src, Settings& dst, bool safe = false

  // force check heating target
  {
-    bool indoorTempControl = dst.equitherm.enabled || dst.pid.enabled || dst.opentherm.nativeHeatingControl;
+    bool indoorTempControl = dst.equitherm.enabled || dst.pid.enabled || dst.opentherm.options.nativeHeatingControl;
    float minTemp = indoorTempControl ? THERMOSTAT_INDOOR_MIN_TEMP : dst.heating.minTemp;
    float maxTemp = indoorTempControl ? THERMOSTAT_INDOOR_MAX_TEMP : dst.heating.maxTemp;

@@ -1632,7 +1833,7 @@ bool jsonToSensorSettings(const uint8_t sensorId, const JsonVariantConst src, Se
  if (!src[FPSTR(S_FACTOR)].isNull()) {
    float value = src[FPSTR(S_FACTOR)].as<float>();

-    if (value > 0.09f && value <= 10.0f && fabsf(value - dst.factor) > 0.0001f) {
+    if (value > 0.09f && value <= 100.0f && fabsf(value - dst.factor) > 0.0001f) {
      dst.factor = roundf(value, 3);
      changed = true;
    }
@@ -1720,6 +1921,7 @@ void varsToJson(const Variables& src, JsonVariant dst) {
  slave[FPSTR(S_PROTOCOL_VERSION)] = src.slave.appVersion;
  slave[FPSTR(S_CONNECTED)] = src.slave.connected;
  slave[FPSTR(S_FLAME)] = src.slave.flame;
+  slave[FPSTR(S_COOLING)] = src.slave.cooling;

  auto sModulation = slave[FPSTR(S_MODULATION)].to<JsonObject>();
  sModulation[FPSTR(S_MIN)] = src.slave.modulation.min;
--- a/src_data/locales/en.json
+++ b/src_data/locales/en.json
@@ -87,6 +87,18 @@
        "turbo": "Turbo mode"
      },

+      "notify": {
+        "fault": {
+          "title": "Boiler Fault state is active!",
+          "note": "It is recommended to inspect the boiler and study the documentation to interpret the fault code:"
+        },
+        "diag": {
+          "title": "Boiler Diagnostic state is active!",
+          "note": "Perhaps your boiler needs inspection? It is recommended study the documentation to interpret the diag code:"
+        },
+        "reset": "Try reset"
+      },
+
      "states": {
        "mNetworkConnected": "Network connection",
        "mMqttConnected": "MQTT connection",
@@ -97,8 +109,9 @@

        "sConnected": "OpenTherm connection",
        "sFlame": "Flame",
+        "sCooling": "Cooling",
        "sFaultActive": "Fault",
-        "sFaultCode": "Faul code",
+        "sFaultCode": "Fault code",
        "sDiagActive": "Diagnostic",
        "sDiagCode": "Diagnostic code",
        
@@ -283,7 +296,8 @@
      "portal": {
        "login": "Login",
        "password": "Password",
-        "auth": "Require authentication"
+        "auth": "Require authentication",
+        "mdns": "Use mDNS"
      },

      "system": {
@@ -302,6 +316,11 @@
            "title": "Telnet port",
            "note": "Default: 23"
          }
+        },
+        "ntp": {
+          "server": "NTP server",
+          "timezone": "Timezone",
+          "timezonePresets": "Select preset..."
        }
      },

@@ -334,7 +353,19 @@
        "i": "I factor",
        "d": "D factor",
        "dt": "DT <small>in seconds</small>",
-        "noteMinMaxTemp": "<b>Important:</b> When using «Equitherm» and «PID» at the same time, the min and max temperatures limit the influence on the «Equitherm» result temperature.<br />Thus, if the min temperature is set to -15 and the max temperature is set to 15, then the final heat carrier setpoint will be from <code>equitherm_result - 15</code> to <code>equitherm_result + 15</code>."
+        "limits": {
+          "title": "Limits",
+          "note": "<b>Important:</b> When using «Equitherm» and «PID» at the same time, the min and max temperatures limit the influence on the «Equitherm» result temperature.<br />Thus, if the min temperature is set to -15 and the max temperature is set to 15, then the final heat carrier setpoint will be from <code>equitherm_result - 15</code> to <code>equitherm_result + 15</code>."
+        },
+        "deadband": {
+          "title": "Deadband",
+          "note": "Deadband is a range around the target temperature where PID regulation becomes less active. Within this range, the algorithm can reduce intensity or pause adjustments to avoid overreacting to small fluctuations.<br /><br />For instance, with a target temperature of 22°, a lower threshold of 1.0, and an upper threshold of 0.5, the deadband operates between 21° and 22.5°. If the I coefficient is 0.0005 and the I multiplier is 0.05, then within the deadband, the I coefficient becomes: <code>0.0005 * 0.05 = 0.000025</code>",
+          "p_multiplier": "Multiplier for P factor",
+          "i_multiplier": "Multiplier for I factor",
+          "d_multiplier": "Multiplier for D factor",
+          "thresholdHigh": "Threshold high",
+          "thresholdLow": "Threshold low"
+        }
      },

      "ot": {
@@ -356,13 +387,16 @@

        "options": {
          "desc": "Options",
-          "dhwPresent": "DHW present",
+          "dhwSupport": "DHW support",
+          "coolingSupport": "Cooling support",
          "summerWinterMode": "Summer/winter mode",
-          "heatingCh2Enabled": "Heating CH2 always enabled",
-          "heatingCh1ToCh2": "Duplicate heating CH1 to CH2",
+          "heatingStateToSummerWinterMode": "Heating state as summer/winter mode",
+          "ch2AlwaysEnabled": "CH2 always enabled",
+          "heatingToCh2": "Duplicate heating to CH2",
          "dhwToCh2": "Duplicate DHW to CH2",
          "dhwBlocking": "DHW blocking",
          "modulationSyncWithHeating": "Sync modulation with heating",
+          "maxTempSyncWithTargetTemp": "Sync max heating temp with target temp",
          "getMinMaxTemp": "Get min/max temp from boiler",
          "immergasFix": "Fix for Immergas boilers"
        },
--- a/src_data/locales/it.json
+++ b/src_data/locales/it.json
@@ -0,0 +1,473 @@
+{
+  "values": {
+    "logo": "OpenTherm Gateway",
+    "nav": {
+      "license": "Licenza",
+      "source": "Codice",
+      "help": "Aiuto",
+      "issues": "Problemi e domande",
+      "releases": "Versione"
+    },
+    "dbm": "dBm",
+    "kw": "kW",
+    "time": {
+      "days": "d.",
+      "hours": "h.",
+      "min": "min.",
+      "sec": "sec."
+    },
+
+    "button": {
+      "upgrade": "Aggiorna",
+      "restart": "Riavvia",
+      "save": "Salva",
+      "saved": "Salvato",
+      "refresh": "Ricarica",
+      "restore": "Recupera",
+      "restored": "Recuperato",
+      "backup": "Backup",
+      "wait": "Attendi...",
+      "uploading": "caricamento...",
+      "success": "Riuscito",
+      "error": "Errore"
+    },
+
+    "index": {
+      "title": "OpenTherm Gateway",
+
+      "section": {
+        "network": "Rete",
+        "system": "Sistema"
+      },
+
+      "system": {
+        "build": {
+          "title": "Build",
+          "version": "Versione",
+          "date": "Data",
+          "core": "Core",
+          "sdk": "SDK"
+        },
+        "uptime": "Tempo di attività",
+        "memory": {
+          "title": "Memoria libera",
+          "maxFreeBlock": "max free block",
+          "min": "min"
+        },
+        "board": "Scheda",
+        "chip": {
+          "model": "Chip",
+          "cores": "Cores",
+          "freq": "frequenza"
+        },
+        "flash": {
+          "size": "Dimensioni del flash",
+          "realSize": "dimensione reale"
+        },
+        "lastResetReason": "Motivo ultimo Reset"
+      }
+    },
+
+    "dashboard": {
+      "name": "Pannello",
+      "title": "Pannello - OpenTherm Gateway",
+
+      "section": {
+        "control": "Controlli",
+        "states": "Stato",
+        "sensors": "Sensori",
+        "diag": "Diagnostica OpenTherm"
+      },
+
+      "thermostat": {
+        "heating": "Riscaldamento",
+        "dhw": "ACS",
+        "temp.current": "Attuale",
+        "enable": "Attiva",
+        "turbo": "Turbo"
+      },
+
+      "notify": {
+        "fault": {
+          "title": "Rilevamento guasti caldiaia attivo!",
+          "note": "Si consiglia di ispezionare la caldaia e studiare la documentazione per interpretare il codice di errore:"
+        },
+        "diag": {
+          "title": "Stato diagnostica Caldaia attivo!",
+          "note": "Forse la tua caldaia ha bisogno di un'ispezione? Si consiglia di studiare la documentazione per interpretare il codice diagnostico:"
+        },
+        "reset": "Prova a resettare"
+      },
+
+      "states": {
+        "mNetworkConnected": "Connessione Rete",
+        "mMqttConnected": "Connessione MQTT",
+        "mEmergencyState": "Modo Emergenza",
+        "mExtPumpState": "Pompa esterna",
+        "mCascadeControlInput": "Controllo a cascata (input)",
+        "mCascadeControlOutput": "Controllo a cascata (output)",
+
+        "sConnected": "Connessione OpenTherm",
+        "sFlame": "Fiamma",
+        "sCooling": "Raffrescamento",
+        "sFaultActive": "Anomalia",
+        "sFaultCode": "Codice anomalia",
+        "sDiagActive": "Diagnostica",
+        "sDiagCode": "Codice Diagnostica",
+        
+        "mHeatEnabled": "Riscaldamento attivato",
+        "mHeatBlocking": "Riscaldamento bloccato",
+        "sHeatActive": "Riscaldamento attivo",
+        "mHeatSetpointTemp": "Temp riscaldamento impostato",
+        "mHeatTargetTemp": "Target Temp caldaia",
+        "mHeatCurrTemp": "Temp attuale riscaldamento",
+        "mHeatRetTemp": "Temp ritorno riscaldamento",
+        "mHeatIndoorTemp": "Riscaldamento, temp interna",
+        "mHeatOutdoorTemp": "Riscaldamento, temp esterna",
+
+        "mDhwEnabled": "ACS attivata",
+        "sDhwActive": "ACS attiva",
+        "mDhwTargetTemp": "ACS temp impostata",
+        "mDhwCurrTemp": "ACS temp attuale",
+        "mDhwRetTemp": "ACS temp ricircolo"
+      },
+
+      "sensors": {
+        "values": {
+          "temp": "Temperatura",
+          "humidity": "Umidità",
+          "battery": "Batteria",
+          "rssi": "RSSI"
+        }
+      }
+    },
+
+    "network": {
+      "title": "Rete - OpenTherm Gateway",
+      "name": "Impostazioni rete",
+
+      "section": {
+        "static": "Impostazioni statico",
+        "availableNetworks": "Reti disponibili",
+        "staSettings": "Impostazioni WiFi",
+        "apSettings": "Impostazioni AP"
+      },
+
+      "scan": {
+        "pos": "#",
+        "info": "Info"
+      },
+
+      "wifi": {
+        "ssid": "SSID",
+        "password": "Password",
+        "channel": "Canale",
+        "signal": "Segnale",
+        "connected": "Connesso"
+      },
+
+      "params": {
+        "hostname": "Hostname",
+        "dhcp": "Usa DHCP",
+        "mac": "MAC",
+        "ip": "IP",
+        "subnet": "Subnet",
+        "gateway": "Gateway",
+        "dns": "DNS"
+      },
+
+      "sta": {
+        "channel.note": "Metti 0 per auto selezione"
+      }
+    },
+
+    "sensors": {
+      "title": "Impostazione sensori - OpenTherm Gateway",
+      "name": "Impostazione sensori",
+
+      "enabled": "Attivato",
+      "sensorName": {
+        "title": "Nome sensore",
+        "note": "Può contenere solo: a-z, A-Z, 0-9, _ e spazi"
+      },
+      "purpose": "Funzione",
+      "purposes": {
+        "outdoorTemp": "Temperatura esterna",
+        "indoorTemp": "Temperatura interna",
+        "heatTemp": "Riscaldamento, temperatura mandata",
+        "heatRetTemp": "Riscaldamento, temperatura ritorno",
+        "dhwTemp": "ACS, temperatura",
+        "dhwRetTemp": "ACS, temperatura ritorno",
+        "dhwFlowRate": "ACS, prelievo",
+        "exhaustTemp": "Temperatura fumi",
+        "modLevel": "Livello Modulazione (%)",
+        "powerFactor": "Potenza (%)",
+        "power": "Potenza (in kW)",
+        "fanSpeed": "Velocità ventilatore",
+        "co2": "CO2",
+        "pressure": "Pressione",
+        "humidity": "Umidità",
+        "temperature": "Temperatura",
+        "notConfigured": "Non configurato"
+      },
+      "type": "Tipo/sorgente",
+      "types": {
+        "otOutdoorTemp": "OpenTherm, temp esterna",
+        "otHeatTemp": "OpenTherm, riscaldamento, temp",
+        "otHeatRetTemp": "OpenTherm, riscaldamento, temp ritorno",
+        "otDhwTemp": "OpenTherm, ACS, temperatura",
+        "otDhwTemp2": "OpenTherm, ACS, temperatura 2",
+        "otDhwFlowRate": "OpenTherm, ACS, prelievo",
+        "otCh2Temp": "OpenTherm, canale 2, temp",
+        "otExhaustTemp": "OpenTherm, temp fumi",
+        "otHeatExchangerTemp": "OpenTherm, temp scambiatore",
+        "otPressure": "OpenTherm, pressione",
+        "otModLevel": "OpenTherm, livello modulazione",
+        "otCurrentPower": "OpenTherm, potenza attuale",
+        "otExhaustCo2": "OpenTherm, CO2 fumi",
+        "otExhaustFanSpeed": "OpenTherm, velocità ventola fumi",
+        "otSupplyFanSpeed": "OpenTherm, velocità ventola supporto",
+        "otSolarStorageTemp": "OpenTherm, temp accumulo solare",
+        "otSolarCollectorTemp": "OpenTherm, temp collettore solare",
+        "otFanSpeedSetpoint": "OpenTherm, velocità ventola impostata",
+        "otFanSpeedCurrent": "OpenTherm, velocità ventola attuale",
+        
+        "ntcTemp": "Sensore NTC",
+        "dallasTemp": "Sensore DALLAS",
+        "bluetooth": "Sensore BLE",
+        "heatSetpointTemp": "Riscaldamento, temp impostata",
+        "manual": "Manuale via MQTT/API",
+        "notConfigured": "Non configurato"
+      },
+      "gpio": "GPIO",
+      "address": {
+        "title": "Indirizzo sensore",
+        "note": "Per l'autoriconoscimento del sensore DALLAS lasciare quello di default, per sensore BLE richiede indirizzo MAC"
+      },
+      "correction": {
+        "desc": "Correzione del valore",
+        "offset": "Compensazione (offset)",
+        "factor": "Moltiplicatore"
+      },
+      "filtering": {
+        "desc": "Filtraggio valore",
+        "enabled": {
+          "title": "Filtraggio attivo",
+          "note": "Può servire in caso vi siano molti sbalzi nel grafico. Il filtro usato è \"Running Average\"."
+        },
+        "factor": {
+          "title": "Fattore di filtrazione",
+          "note": "Quanto più basso è il valore, tanto più graduale e prolungata sarà la variazione dei valori numerici."
+        }
+      }
+    },
+
+    "settings": {
+      "title": "Impostazioni - OpenTherm Gateway",
+      "name": "Impostazioni",
+
+      "section": {
+        "portal": "Impostazioni Accesso",
+        "system": "Impostazioni sistema",
+        "diag": "Diagnostica",
+        "heating": "Impostazioni riscaldamento",
+        "dhw": "Impostazioni ACS",
+        "emergency": "Impostazioni modo Emergenza",
+        "equitherm": "Impostazioni Equitherm",
+        "pid": "Impostazioni PID",
+        "ot": "Impostazioni OpenTherm",
+        "mqtt": "Impostazioni MQTT",
+        "extPump": "Impostazioni pompa esterna",
+        "cascadeControl": "Impostazioni controllo a cascata"
+      },
+
+      "enable": "Attiva",
+      "note": {
+        "restart": "Dopo aver cambiato queste impostazioni, il sistema sarà riavviato perchè i cambiamenti abbiano effetto.",
+        "blankNotUse": "vuoto - non usare",
+        "bleDevice": "Dispositivi BLE possono essere usati <u>solo</u> con alcune schede ESP32 che supportano il bluetooth!"
+      },
+
+      "temp": {
+        "min": "Temperatura minima",
+        "max": "Temperatura massima"
+      },
+
+      "portal": {
+        "login": "Login",
+        "password": "Password",
+        "auth": "Richiede autenticazione",
+        "mdns": "Usa mDNS"
+      },
+
+      "system": {
+        "unit": "Unità di misura",
+        "metric": "Metrico <small>(celsius, litri, bar)</small>",
+        "imperial": "Imperiale <small>(fahrenheit, galloni, psi)</small>",
+        "statusLedGpio": "LED di stato GPIO",
+        "logLevel": "Log livello",
+        "serial": {
+          "enable": "Porta seriale attivata",
+          "baud": "Porta seriale baud rate"
+        },
+        "telnet": {
+          "enable": "Telnet attivato",
+          "port": {
+            "title": "Porta Telnet",
+            "note": "Default: 23"
+          }
+        },
+        "ntp": {
+          "server": "NTP server",
+          "timezone": "Zona oraria",
+          "timezonePresets": "Seleziona preimpostato..."
+        }
+      },
+
+      "heating": {
+        "hyst": "Isteresi <small>(in gradi)</small>",
+        "turboFactor": "Turbo mode coeff."
+      },
+
+      "emergency": {
+        "desc": "Il modo emergenza è attivato automaticamente quando «PID» o «Equitherm» non possono calcolare il setpoint:<br />- se «Equitherm» è attivato e il sensore della temperatura esternare è disconnesso;<br />- se «PID» o l'opzione OT <i>«Impostazioni riscaldamento native»</i> è attiva e il sensore di temperatura interno è disconnesso.<br /><b>Nota:</b> In mancanza di rete o MQTT, sensore di tipo <i>«Manuale via MQTT/API»</i> è in stato Disconnesso.",
+        
+        "target": {
+          "title": "Temperatura impostata",
+          "note": "<b>Importante:</b> <u>Temperatura interna impostata</u> se l'opzione OT <i>«Controllo riscaldamento interno»</i> è attivato.<br />In tutti gli altri casi, la <u>target heat carrier temperature</u>."
+        },
+        "treshold": "Tempo di soglia <small>(sec)</small>"
+      },
+
+      "equitherm": {
+        "n": "Fattore N",
+        "k": "Fattore K",
+        "t": {
+          "title": "Fattore T",
+          "note": "Non usato se PID è attivato"
+        }
+      },
+
+      "pid": {
+        "p": "Fattore P",
+        "i": "Fattore I",
+        "d": "Fattore D",
+        "dt": "DT <small>in secondi</small>",
+        "limits": {
+          "title": "Limiti",
+          "note": "<b>Importante:</b> Quando usi «Equitherm» e «PID» allo stesso tempo, i limiti della temperatura min e max influenzano il risultato della temperatura «Equitherm».<br />Thus, se la temperatura minima è impostata a -15 e la massima a 15, il riscaldamento finale sarà impostato fra <code>equitherm_result - 15</code> a <code>equitherm_result + 15</code>."
+        },
+        "deadband": {
+          "title": "Zona morta (Deadband)",
+          "note": "La zona morta è un intervallo intorno alla temperatura target in cui la regolazione PID diventa meno attiva. In questo intervallo, l'algoritmo può ridurre l'intensità o interrompere gli aggiustamenti per evitare di reagire eccessivamente a piccole fluttuazioni.<br /><br />Ad esempio, con una temperatura target di 22°, una soglia inferiore di 1.0 e una soglia superiore di 0.5, la zona morta opera tra 21° e 22.5°. Se il coefficiente I è 0.0005 e il moltiplicatore I è 0.05, allora nella zona morta, il coefficiente I diventa: <code>0.0005 * 0.05 = 0.000025</code>",
+          "p_multiplier": "Moltiplicatore P",
+          "i_multiplier": "Moltiplicatore I",
+          "d_multiplier": "Moltiplicatore D",
+          "thresholdHigh": "Soglia superiore",
+          "thresholdLow": "Soglia inferiore"
+        }
+      },
+
+      "ot": {
+        "advanced": "Impostazioni avanzate",
+        "inGpio": "In GPIO",
+        "outGpio": "Out GPIO",
+        "ledGpio": "RX LED GPIO",
+        "memberId": "Master member ID",
+        "flags": "Master flags",
+        "maxMod": "Max livello modulazione",
+        "minPower": {
+          "title": "Potenza minima caldaia <small>(kW)</small>",
+          "note": "Questo valore corrisponde allo livello 0-1% di modulazione della caldaia. Di solito si trova nelle specifiche delle caldaia come \"potenza minima disponibile\"."
+        },
+        "maxPower": {
+          "title": "Potenza massima caldaia <small>(kW)</small>",
+          "note": "<b>0</b> - prova a rilevarla automaticamente. Di solito si trova nelle specifiche delle caldaia come \"potenza massima disponibile\"."
+        },
+
+        "options": {
+          "desc": "Opzioni",
+          "dhwSupport": "Supporto ACS",
+          "coolingSupport": "Supporto rafferscamento",
+          "summerWinterMode": "Modalità Estate/inverno",
+          "heatingStateToSummerWinterMode": "Stato di riscaldamento come modalità estate/inverno",
+          "ch2AlwaysEnabled": "CH2 sempre abilitato",
+          "heatingToCh2": "Riproduci riscaldamento su CH2",
+          "dhwToCh2": "Riproduci ACS su CH2",
+          "dhwBlocking": "Bloccare ACS",
+          "modulationSyncWithHeating": "Sincronizzare modulazione con caldaia",
+          "maxTempSyncWithTargetTemp": "Sincronizza la temperatura massima di riscaldamento con la temperatura target",
+          "getMinMaxTemp": "Prendi temp min/max dalla caldaia",
+          "immergasFix": "Fix per caldiaie Immergas"
+        },
+
+        "nativeHeating": {
+          "title": "Controllo del riscaldamento nativo (caldaia)",
+          "note": "Lavora <u>SOLO</u> se la caldaia richiede la temperatura ambiente desiderata e regola autonomamente la temperatura del fluido. Non compatiblile con regolazioni PID e Equitherm del sistema."
+        }
+      },
+
+      "mqtt": {
+        "homeAssistantDiscovery": "Home Assistant Discovery",
+        "server": "Server",
+        "port": "Porta",
+        "user": "Utente",
+        "password": "Password",
+        "prefix": "Prefisso",
+        "interval": "Intervallo invio <small>(sec)</small>"
+      },
+
+      "extPump": {
+        "use": "Usa pompa/circolatore esterno",
+        "gpio": "GPIO relè",
+        "postCirculationTime": "Tempo di post circolazione <small>(min)</small>",
+        "antiStuckInterval": "Intervallo antiblocco <small>(days)</small>",
+        "antiStuckTime": "Tempo antiblocco <small>(min)</small>"
+      },
+
+      "cascadeControl": {
+        "input": {
+          "desc": "Può essere attivata la caldaia se un'altra ha fallito. Il controllo dell'altra caldaia cambia lo stato dell'ingresso del GPIO in caso di errore.",
+          "enable": "Ingresso abilitato",
+          "gpio": "GPIO",
+          "invertState": "Inverti stato GPIO",
+          "thresholdTime": "Tempo soglia di modifica dello stato <small>(sec)</small>"
+        },
+        "output": {
+          "desc": "Può essere usato per passare ad un'altra caldaia tramite <u>relè</u>.",
+          "enable": "Uscita abilitata",
+          "gpio": "GPIO",
+          "invertState": "Invert GPIO state",
+          "thresholdTime": "Tempo soglia di modifica dello stato <small>(sec)</small>",
+          "events": {
+            "desc": "Eventi",
+            "onFault": "Se lo stato di errore è attivo",
+            "onLossConnection": "Se non c'è la connessione via Opentherm",
+            "onEnabledHeating": "Se il riscaldamento è attivato"
+          }
+        }
+      }
+    },
+
+    "upgrade": {
+      "title": "Aggiornamenti - OpenTherm Gateway",
+      "name": "Aggiornamenti",
+
+      "section": {
+        "backupAndRestore": "Backup & restore",
+        "backupAndRestore.desc": "In questa sezione puoi salvare e recuperare un backup di tutte le impostazioni.",
+        "upgrade": "Aggiorna",
+        "upgrade.desc": "In questa sezione puoi aggiornare il firmware il filesystem del tuo dispositivo.<br />L'ultimo aggiornamento può essere scaricato da <a href=\"https://github.com/Laxilef/OTGateway/releases\" target=\"_blank\">Releases page</a> del progetto." 
+      },
+
+      "note": {
+        "disclaimer1": "Dopo un aggiornamento riuscito del filesystem, tutte le impostazioni sono impostate di default! Salva un backup prima di aggiornare.",
+        "disclaimer2": "Dopo un aggiornamento riuscito, il sistema viene automaticamente riavviato dopo 15 secondi."
+      },
+
+      "settingsFile": "Settings file",
+      "fw": "Firmware",
+      "fs": "Filesystem"
+    }
+  }
+}
--- a/src_data/locales/ru.json
+++ b/src_data/locales/ru.json
@@ -87,6 +87,18 @@
        "turbo": "Турбо"
      },

+      "notify": {
+        "fault": {
+          "title": "Состояние неисправности котла активно!",
+          "note": "Рекомендуется осмотреть котел и изучить документацию котла для расшифровки кода неисправности:"
+        },
+        "diag": {
+          "title": "Состояние диагностики котла активно!",
+          "note": "Возможно, вашему котлу требуется проверка? Рекомендуется изучить документацию котла для расшифровки кода диагностики:"
+        },
+        "reset": "Сбросить"
+      },
+
      "states": {
        "mNetworkConnected": "Подключение к сети",
        "mMqttConnected": "Подключение к MQTT",
@@ -97,6 +109,7 @@

        "sConnected": "Подключение к OpenTherm",
        "sFlame": "Пламя",
+        "sCooling": "Охлаждение",
        "sFaultActive": "Ошибка",
        "sFaultCode": "Код ошибки",
        "sDiagActive": "Диагностика",
@@ -180,7 +193,7 @@
      "purpose": "Назначение",
      "purposes": {
        "outdoorTemp": "Внешняя температура",
-        "indoorTemp": "Внутреняя температура",
+        "indoorTemp": "Внутренняя температура",
        "heatTemp": "Отопление, температура",
        "heatRetTemp": "Отопление, температура обратки",
        "dhwTemp": "ГВС, температура",
@@ -283,12 +296,13 @@
      "portal": {
        "login": "Логин",
        "password": "Пароль",
-        "auth": "Требовать аутентификацию"
+        "auth": "Требовать аутентификацию",
+        "mdns": "Использовать mDNS"
      },

      "system": {
        "unit": "Система единиц",
-        "metric": "Метрическая <small>(цильсии, литры, бары)</small>",
+        "metric": "Метрическая <small>(цельсии, литры, бары)</small>",
        "imperial": "Imperial <small>(фаренгейты, галлоны, psi)</small>",
        "statusLedGpio": "Статус LED GPIO",
        "logLevel": "Уровень логирования",
@@ -302,6 +316,11 @@
            "title": "Telnet порт",
            "note": "По умолчанию: 23"
          }
+        },
+        "ntp": {
+          "server": "NTP сервер",
+          "timezone": "Часовой пояс",
+          "timezonePresets": "Выберите пресет..."
        }
      },

@@ -334,7 +353,19 @@
        "i": "Коэффициент I",
        "d": "Коэффициент D",
        "dt": "DT <small>(сек)</small>",
-        "noteMinMaxTemp": "<b>Важно:</b> При использовании «ПЗА» и «ПИД» одновременно, мин. и макс. температура ограничивает влияние на расчётную температуру «ПЗА».<br />Таким образом, если мин. температура задана как -15, а макс. как 15, то конечная температура теплоносителя будет от <code>equitherm_result - 15</code> до <code>equitherm_result + 15</code>."
+        "limits": {
+          "title": "Лимиты",
+          "note": "<b>Важно:</b> При использовании «ПЗА» и «ПИД» одновременно, мин. и макс. температура ограничивает влияние на расчётную температуру «ПЗА».<br />Таким образом, если мин. температура задана как -15, а макс. как 15, то конечная температура теплоносителя будет от <code>equitherm_result - 15</code> до <code>equitherm_result + 15</code>."
+        },
+        "deadband": {
+          "title": "Зона нечувствительности (Deadband)",
+          "note": "Deadband - это зона нечувствительности вокруг целевой температуры, в которой PID-регулирование становится менее активным. В этом диапазоне алгоритм может снижать интенсивность или полностью прекращать корректировку температуры, чтобы избежать излишней чувствительности к небольшим колебаниям.<br /><br />Например, при целевой температуре 22°, нижнем пороге 1.0 и верхнем 0.5, deadband активен в диапазоне от 21° до 22.5°. Если коэфф. I=0.0005, а множитель I=0.05, то при включении зоны нечувствительности коэфф. I будет равен: <code>0.0005 * 0.05 = 0.000025</code>",
+          "p_multiplier": "Множитель для коэф. P",
+          "i_multiplier": "Множитель для коэф. I",
+          "d_multiplier": "Множитель для коэф. D",
+          "thresholdHigh": "Верхний порог",
+          "thresholdLow": "Нижний порог"
+        }
      },

      "ot": {
@@ -356,13 +387,16 @@

        "options": {
          "desc": "Опции",
-          "dhwPresent": "Контур ГВС",
+          "dhwSupport": "Поддержка ГВС",
+          "coolingSupport": "Поддержка охлаждения",
          "summerWinterMode": "Летний/зимний режим",
-          "heatingCh2Enabled": "Канал 2 отопления всегда вкл.",
-          "heatingCh1ToCh2": "Дублировать параметры отопления канала 1 в канал 2",
+          "heatingStateToSummerWinterMode": "Летний/зимний режим в качестве состояния отопления",
+          "ch2AlwaysEnabled": "Канал 2 всегда вкл.",
+          "heatingToCh2": "Дублировать параметры отопления в канал 2",
          "dhwToCh2": "Дублировать параметры ГВС в канал 2",
          "dhwBlocking": "DHW blocking",
          "modulationSyncWithHeating": "Синхронизировать модуляцию с отоплением",
+          "maxTempSyncWithTargetTemp": "Синхронизировать макс. темп. отопления с целевой темп.",
          "getMinMaxTemp": "Получать мин. и макс. температуру от котла",
          "immergasFix": "Фикс для котлов Immergas"
        },
--- a/src_data/pages/dashboard.html
+++ b/src_data/pages/dashboard.html
@@ -21,6 +21,7 @@
          <li>
            <select id="lang" aria-label="Lang">
              <option value="en" selected>EN</option>
+              <option value="it">IT</option>
              <option value="ru">RU</option>
            </select>
          </li>
@@ -40,14 +41,18 @@
          <details open>
            <summary><b data-i18n>dashboard.section.control</b></summary>
            <div class="grid">
-              <div class="thermostat" id="thermostat-heating">
+              <div class="thermostat tHeat" data-purpose="heating" data-min="0" data-max="100" data-step="0.1" data-big-step="1">
                <div class="thermostat-header" data-i18n>dashboard.thermostat.heating</div>
                <div class="thermostat-temp">
-                  <div class="thermostat-temp-target"><span id="tHeatTargetTemp"></span> <span class="tempUnit"></span></div>
+                  <div class="thermostat-temp-target"><span class="targetTemp"></span> <span class="tempUnit"></span></div>
                  <div class="thermostat-temp-current"><span data-i18n>dashboard.thermostat.temp.current</span>: <span id="tHeatCurrentTemp"></span> <span class="tempUnit"></span></div>
                </div>
-                <div class="thermostat-minus"><button id="tHeatActionMinus" class="outline"><i class="icons-down"></i></button></div>
-                <div class="thermostat-plus"><button id="tHeatActionPlus" class="outline"><i class="icons-up"></i></button></div>
+                <div class="thermostat-minus">
+                  <button class="tAction outline" data-action="decrement"><i class="icons-down"></i></button>
+                </div>
+                <div class="thermostat-plus">
+                  <button class="tAction outline" data-action="increment"><i class="icons-up"></i></button>
+                </div>
                <div class="thermostat-control">
                  <input type="checkbox" role="switch" id="tHeatEnabled" value="true">
                  <label htmlFor="tHeatEnabled" data-i18n>dashboard.thermostat.enable</label>
@@ -57,20 +62,54 @@
                </div>
              </div>

-              <div class="thermostat" id="thermostat-dhw">
+              <div class="thermostat tDhw" data-purpose="dhw" data-min="0" data-max="100" data-step="1" data-big-step="5">
                <div class="thermostat-header" data-i18n>dashboard.thermostat.dhw</div>
                <div class="thermostat-temp">
-                  <div class="thermostat-temp-target"><span id="tDhwTargetTemp"></span> <span class="tempUnit"></span></div>
+                  <div class="thermostat-temp-target"><span class="targetTemp"></span> <span class="tempUnit"></span></div>
                  <div class="thermostat-temp-current"><span data-i18n>dashboard.thermostat.temp.current</span>: <span id="tDhwCurrentTemp"></span> <span class="tempUnit"></span></div>
                </div>
-                <div class="thermostat-minus"><button class="outline" id="tDhwActionMinus"><i class="icons-down"></i></button></div>
-                <div class="thermostat-plus"><button class="outline" id="tDhwActionPlus"><i class="icons-up"></i></button></div>
+                <div class="thermostat-minus">
+                  <button class="tAction outline" data-action="decrement"><i class="icons-down"></i></button>
+                </div>
+                <div class="thermostat-plus">
+                  <button class="tAction outline" data-action="increment"><i class="icons-up"></i></button>
+                </div>
                <div class="thermostat-control">
                  <input type="checkbox" role="switch" id="tDhwEnabled" value="true">
                  <label htmlFor="tDhwEnabled" data-i18n>dashboard.thermostat.enable</label>
                </div>
              </div>
            </div>
+
+            <div class="notify notify-error notify-fault hidden">
+              <div class="notify-icon">
+                <i class="icons-error"></i>
+              </div>
+              <div class="notify-content">
+                <b data-i18n>dashboard.notify.fault.title</b><br />
+                <small>
+                  <span data-i18n>dashboard.notify.fault.note</span> <b class="sFaultCode"></b>
+                </small>
+              </div>
+              <div class="notify-actions">
+                <button class="reset" data-i18n>dashboard.notify.reset</button>
+              </div>
+            </div>
+
+            <div class="notify notify-alarm notify-diag hidden">
+              <div class="notify-icon">
+                <i class="icons-alarm"></i>
+              </div>
+              <div class="notify-content">
+                <b data-i18n>dashboard.notify.diag.title</b><br />
+                <small>
+                  <span data-i18n>dashboard.notify.diag.note</span> <b class="sDiagCode"></b>
+                </small>
+              </div>
+              <div class="notify-actions">
+                <button class="reset" data-i18n>dashboard.notify.reset</button>
+              </div>
+            </div>
          </details>

          <hr />
@@ -113,6 +152,10 @@
                  <th scope="row" data-i18n>dashboard.states.sFlame</th>
                  <td><i class="sFlame"></i></td>
                </tr>
+                <tr>
+                  <th scope="row" data-i18n>dashboard.states.sCooling</th>
+                  <td><i class="sCooling"></i></td>
+                </tr>


                <tr>
@@ -224,7 +267,7 @@
 <b>Type:</b>               <span class="sType"></span>
 <b>AppVersion:</b>         <span class="sAppVersion"></span>
 <b>OT version:</b>         <span class="sProtocolVersion"></span>
-<b>Modulation limits:</b>  <span class="sModMin"></span>...<span class="sModMax"></span> %
+<b>Modulation limits:</b>  <span class="sModMin"></span>...<span class="sAbsModMax"></span> %, curr. max: <span class="sModMax"></span> %
 <b>Power limits:</b>       <span class="sPowerMin"></span>...<span class="sPowerMax"></span> kW
 <b>Heating limits:</b>     <span class="sHeatMinTemp"></span>...<span class="sHeatMaxTemp"></span> <span class="tempUnit"></span>
 <b>DHW limits:</b>         <span class="sDhwMinTemp"></span>...<span class="sDhwMaxTemp"></span> <span class="tempUnit"></span></pre>
@@ -247,7 +290,6 @@
    <script src="/static/app.js?{BUILD_TIME}"></script>
    <script>
      let modifiedTime = null;
-      let noRegulators;
      let prevSettings;
      let newSettings = {
        heating: {
@@ -265,78 +307,69 @@
        const lang = new Lang(document.getElementById('lang'));
        lang.build();

-        document.querySelector('#tHeatActionMinus').addEventListener('click', (event) => {
-          if (!prevSettings) {
-            return;
+        let actionTimer = null;
+        let actionLongPress = false;
+        document.querySelectorAll('.tAction').forEach((item) => {
+          const action = item.dataset.action;
+          const tContainer = item.parentNode.parentNode;
+
+          for (const eName of ['pointerup', 'pointercancel']) {
+            item.addEventListener(eName, (event) => {
+              clearInterval(actionTimer);
+
+              const purpose = tContainer.dataset.purpose;
+              const minTemp = parseFloat(tContainer.dataset.min);
+              const maxTemp = parseFloat(tContainer.dataset.max);
+              const step = parseFloat(tContainer.dataset.step);
+              const bigStep = parseFloat(tContainer.dataset.bigStep);
+
+              if (!actionLongPress && prevSettings) {
+                let value = 0;
+                if (action == 'increment') {
+                  value = step;
+
+                } else if (action == 'decrement') {
+                  value = -(step);
+                }
+
+                newSettings[purpose].target = parseFloat(constrain(newSettings[purpose].target + value, minTemp, maxTemp).toFixed(2));
+                modifiedTime = Date.now();
+                setValue('.targetTemp', newSettings[purpose].target, tContainer);
+              }
+            });
          }

-          newSettings.heating.target -= 0.5;
-          modifiedTime = Date.now();
+          item.addEventListener('pointerdown', (event) => {
+            if (!prevSettings) {
+              return;
+            }

-          let minTemp;
-          if (noRegulators) {
-            minTemp = prevSettings.heating.minTemp;
-          } else {
-            minTemp = prevSettings.system.unitSystem == 0 ? 5 : 41;
-          }
+            const purpose = tContainer.dataset.purpose;
+            const minTemp = parseFloat(tContainer.dataset.min);
+            const maxTemp = parseFloat(tContainer.dataset.max);
+            const step = parseFloat(tContainer.dataset.step);
+            const bigStep = parseFloat(tContainer.dataset.bigStep);

-          if (prevSettings && newSettings.heating.target < minTemp) {
-            newSettings.heating.target = minTemp;
-          }
+            actionLongPress = false;
+            actionTimer = setInterval(() => {
+              if (!actionLongPress) {
+                actionLongPress = true;
+              }

-          setValue('#tHeatTargetTemp', newSettings.heating.target);
-        });
+              let value = 0;
+              if (action == 'increment') {
+                value = bigStep;

-        document.querySelector('#tHeatActionPlus').addEventListener('click', (event) => {
-          if (!prevSettings) {
-            return;
-          }
+              } else if (action == 'decrement') {
+                value = -(bigStep);
+              }

-          newSettings.heating.target += 0.5;
-          modifiedTime = Date.now();
+              newSettings[purpose].target = parseFloat(constrain(newSettings[purpose].target + value, minTemp, maxTemp).toFixed(2));
+              modifiedTime = Date.now();

-          let maxTemp;
-          if (noRegulators) {
-            maxTemp = prevSettings.heating.maxTemp;
-          } else {
-            maxTemp = prevSettings.system.unitSystem == 0 ? 30 : 86;
-          }
-
-          if (prevSettings && newSettings.heating.target > maxTemp) {
-            newSettings.heating.target = maxTemp;
-          }
-
-          setValue('#tHeatTargetTemp', newSettings.heating.target);
-        });
-
-        document.querySelector('#tDhwActionMinus').addEventListener('click', (event) => {
-          if (!prevSettings) {
-            return;
-          }
-
-          newSettings.dhw.target -= 1.0;
-          modifiedTime = Date.now();
-
-          if (newSettings.dhw.target < prevSettings.dhw.minTemp) {
-            newSettings.dhw.target = prevSettings.dhw.minTemp;
-          }
-
-          setValue('#tDhwTargetTemp', newSettings.dhw.target);
-        });
-
-        document.querySelector('#tDhwActionPlus').addEventListener('click', (event) => {
-          if (!prevSettings) {
-            return;
-          }
-
-          newSettings.dhw.target += 1.0;
-          modifiedTime = Date.now();
-
-          if (newSettings.dhw.target > prevSettings.dhw.maxTemp) {
-            newSettings.dhw.target = prevSettings.dhw.maxTemp;
-          }
-
-          setValue('#tDhwTargetTemp', newSettings.dhw.target);
+              setValue('.targetTemp', newSettings[purpose].target, tContainer);
+            }, 500);
+          });
        });

        document.querySelector('#tHeatEnabled').addEventListener('change', (event) => {
@@ -354,6 +387,60 @@
          newSettings.dhw.enabled = event.currentTarget.checked;
        });

+        document.querySelector('.notify-fault .reset').addEventListener('click', async (event) => {
+          const resetBtn = document.querySelector(".notify-fault .reset");
+          if (!resetBtn.disabled) {
+            resetBtn.disabled = true;
+          }
+
+          let response = await fetch("/api/vars", {
+            method: "POST",
+            cache: "no-cache",
+            credentials: "include",
+            headers: {
+              "Content-Type": "application/json"
+            },
+            body: JSON.stringify({
+              "actions": {
+                "resetFault": true
+              }
+            })
+          });
+
+          setTimeout(() => {
+            if (resetBtn.disabled) {
+              resetBtn.disabled = false;
+            }
+          }, 10000);
+        });
+
+        document.querySelector('.notify-diag .reset').addEventListener('click', async (event) => {
+          const resetBtn = document.querySelector(".notify-diag .reset");
+          if (!resetBtn.disabled) {
+            resetBtn.disabled = true;
+          }
+
+          let response = await fetch("/api/vars", {
+            method: "POST",
+            cache: "no-cache",
+            credentials: "include",
+            headers: {
+              "Content-Type": "application/json"
+            },
+            body: JSON.stringify({
+              "actions": {
+                "resetDiagnostic": true
+              }
+            })
+          });
+
+          setTimeout(() => {
+            if (resetBtn.disabled) {
+              resetBtn.disabled = false;
+            }
+          }, 10000);
+        });
+
        setTimeout(async function onLoadPage() {
          let unitSystem = null;

@@ -372,8 +459,8 @@
              (prevSettings.heating.enabled != newSettings.heating.enabled)
              || (prevSettings.heating.turbo != newSettings.heating.turbo)
              || (prevSettings.heating.target != newSettings.heating.target)
-              || (prevSettings.opentherm.dhwPresent && prevSettings.dhw.enabled != newSettings.dhw.enabled)
-              || (prevSettings.opentherm.dhwPresent && prevSettings.dhw.target != newSettings.dhw.target)
+              || (prevSettings.opentherm.options.dhwSupport && prevSettings.dhw.enabled != newSettings.dhw.enabled)
+              || (prevSettings.opentherm.options.dhwSupport && prevSettings.dhw.target != newSettings.dhw.target)
            );

            if (modified) {
@@ -397,7 +484,6 @@
            }

            const result = await response.json();
-            noRegulators = !result.opentherm.nativeHeatingControl && !result.equitherm.enabled && !result.pid.enabled;
            prevSettings = result;
            unitSystem = result.system.unitSystem;
            newSettings.heating.enabled = result.heating.enabled;
@@ -406,22 +492,23 @@
            newSettings.dhw.enabled = result.dhw.enabled;
            newSettings.dhw.target = result.dhw.target;

-            if (result.opentherm.dhwPresent) {
-              show('#thermostat-dhw');
+            if (result.opentherm.options.dhwSupport) {
+              show('.tDhw');
            } else {
-              hide('#thermostat-dhw');
+              hide('.tDhw');
            }

            setCheckboxValue('#tHeatEnabled', result.heating.enabled);
            setCheckboxValue('#tHeatTurbo', result.heating.turbo);
-            setValue('#tHeatTargetTemp', result.heating.target);
+            setValue('.tHeat .targetTemp', result.heating.target);

            setCheckboxValue('#tDhwEnabled', result.dhw.enabled);
-            setValue('#tDhwTargetTemp', result.dhw.target);
+            setValue('.tDhw .targetTemp', result.dhw.target);

            setValue('.tempUnit', temperatureUnit(unitSystem));
            setValue('.pressureUnit', pressureUnit(unitSystem));
            setValue('.volumeUnit', volumeUnit(unitSystem));
+            setValue('.sAbsModMax', result.opentherm.maxModulation);

          } catch (error) {
            console.log(error);
@@ -433,20 +520,20 @@
              cache: "no-cache",
              credentials: "include"
            });
-            
+
            if (!response.ok) {
              throw new Error('Response not valid');
            }

            const result = await response.json();
-            
+
            // Graph
-            setValue('#tHeatCurrentTemp', result.master.heating.indoorTempControl 
-              ? result.master.heating.indoorTemp 
+            setValue('#tHeatCurrentTemp', result.master.heating.indoorTempControl
+              ? result.master.heating.indoorTemp
              : result.master.heating.currentTemp
            );
            setValue('#tDhwCurrentTemp', result.master.dhw.currentTemp);
-            
+

            // SLAVE
            setValue('.sMemberId', result.slave.memberId);
@@ -462,6 +549,7 @@
              result.slave.connected ? "green" : "red"
            );
            setState('.sFlame', result.slave.flame);
+            setState('.sCooling', result.slave.cooling);

            setValue('.sModMin', result.slave.modulation.min);
            setValue('.sModMax', result.slave.modulation.max);
@@ -489,6 +577,13 @@
                : "-"
            );

+            if (result.slave.fault.active) {
+              show(".notify-fault");
+
+            } else {
+              hide('.notify-fault');
+            }
+
            setStatus(
              '.sDiagActive',
              result.slave.diag.active ? "success" : "error",
@@ -501,6 +596,13 @@
                : "-"
            );

+            if (result.slave.diag.active) {
+              show(".notify-diag");
+
+            } else {
+              hide('.notify-diag');
+            }
+

            // MASTER
            setState('.mHeatEnabled', result.master.heating.enabled);
@@ -541,6 +643,14 @@
            setState('.mCascadeControlInput', result.master.cascadeControl.input);
            setState('.mCascadeControlOutput', result.master.cascadeControl.output);

+            const tHeat = document.querySelector('.tHeat');
+            tHeat.dataset.min = result.master.heating.minTemp;
+            tHeat.dataset.max = result.master.heating.maxTemp;
+
+            const tDhw = document.querySelector('.tDhw');
+            tDhw.dataset.min = result.master.dhw.minTemp;
+            tDhw.dataset.max = result.master.dhw.maxTemp;
+
            setBusy('#dashboard-busy', '#dashboard-container', false);

          } catch (error) {
@@ -553,7 +663,7 @@
              cache: "no-cache",
              credentials: "include"
            });
-            
+
            if (!response.ok) {
              throw new Error("Response not valid");
            }
@@ -579,7 +689,7 @@
              if (!sensorNode) {
                continue;
              }
-              
+
              const sData = result[sensorId];
              if (!sData.enabled || sData.purpose == 255) {
                sensorNode.classList.toggle("hidden", true);
--- a/src_data/pages/index.html
+++ b/src_data/pages/index.html
@@ -21,6 +21,7 @@
          <li>
            <select id="lang" aria-label="Lang">
              <option value="en" selected>EN</option>
+              <option value="it">IT</option>
              <option value="ru">RU</option>
            </select>
          </li>
--- a/src_data/pages/network.html
+++ b/src_data/pages/network.html
@@ -21,6 +21,7 @@
          <li>
            <select id="lang" aria-label="Lang">
              <option value="en" selected>EN</option>
+              <option value="it">IT</option>
              <option value="ru">RU</option>
            </select>
          </li>
@@ -38,37 +39,37 @@

          <div id="network-settings-busy" aria-busy="true"></div>
          <form action="/api/network/settings" id="network-settings" class="hidden">
-            <label for="network-hostname">
+            <label>
              <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>
+              <input type="text" 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">
+            <label>
+              <input type="checkbox" name="useDhcp" value="true">
              <span data-i18n>network.params.dhcp</span>
            </label>
            <br />
            <hr />
            <h4 data-i18n>network.section.static</h4>

-            <label for="network-static-ip">
+            <label>
              <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>
+              <input type="text" name="staticConfig[ip]" value="true" maxlength="16" pattern="\d{1,3}\.\d{1,3}\.\d{1,3}\.\d{1,3}" required>
            </label>

-            <label for="network-static-gateway">
+            <label>
              <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>
+              <input type="text" 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">
+            <label>
              <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>
+              <input type="text" 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">
+            <label>
              <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>
+              <input type="text" name="staticConfig[dns]" maxlength="16" pattern="\d{1,3}\.\d{1,3}\.\d{1,3}\.\d{1,3}" required>
            </label>

            <button type="submit" data-i18n>button.save</button>
@@ -109,19 +110,19 @@

            <div id="sta-settings-busy" aria-busy="true"></div>
            <form action="/api/network/settings" id="sta-settings" class="hidden">
-              <label for="sta-ssid">
+              <label>
                <span data-i18n>network.wifi.ssid</span>
-                <input type="text" id="sta-ssid" name="sta[ssid]" maxlength="32" required>
+                <input type="text" name="sta[ssid]" maxlength="32" required>
              </label>

-              <label for="sta-password">
+              <label>
                <span data-i18n>network.wifi.password</span>
-                <input type="password" id="sta-password" name="sta[password]" maxlength="64" required>
+                <input type="password" name="sta[password]" maxlength="64" required>
              </label>

-              <label for="sta-channel">
+              <label>
                <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>
+                <input type="number" inputmode="numeric" name="sta[channel]" min="0" max="12" step="1" required>
                <small data-i18n>network.sta.channel.note</small>
              </label>

@@ -140,19 +141,19 @@

          <div id="ap-settings-busy" aria-busy="true"></div>
          <form action="/api/network/settings" id="ap-settings" class="hidden">
-            <label for="ap-ssid">
+            <label>
              <span data-i18n>network.wifi.ssid</span>
-              <input type="text" id="ap-ssid" name="ap[ssid]" maxlength="32" required>
+              <input type="text" name="ap[ssid]" maxlength="32" required>
            </label>

-            <label for="ap-password">
+            <label>
              <span data-i18n>network.wifi.password</span>
-              <input type="text" id="ap-password" name="ap[password]" maxlength="64" required>
+              <input type="text" name="ap[password]" maxlength="64" required>
            </label>

-            <label for="ap-channel">
+            <label>
              <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>
+              <input type="number" inputmode="numeric" name="ap[channel]" min="1" max="12" step="1" required>
            </label>

            <button type="submit" data-i18n>button.save</button>
@@ -179,22 +180,22 @@
        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);
+          setInputValue("[name='hostname']", data.hostname);
+          setCheckboxValue("[name='useDhcp']", data.useDhcp);
+          setInputValue("[name='staticConfig[ip]']", data.staticConfig.ip);
+          setInputValue("[name='staticConfig[gateway]']", data.staticConfig.gateway);
+          setInputValue("[name='staticConfig[subnet]']", data.staticConfig.subnet);
+          setInputValue("[name='staticConfig[dns]']", data.staticConfig.dns);
          setBusy('#network-settings-busy', '#network-settings', false);

-          setInputValue('#sta-ssid', data.sta.ssid);
-          setInputValue('#sta-password', data.sta.password);
-          setInputValue('#sta-channel', data.sta.channel);
+          setInputValue("[name='sta[ssid]']", data.sta.ssid);
+          setInputValue("[name='sta[password]']", data.sta.password);
+          setInputValue("[name='sta[channel]']", data.sta.channel);
          setBusy('#sta-settings-busy', '#sta-settings', false);

-          setInputValue('#ap-ssid', data.ap.ssid);
-          setInputValue('#ap-password', data.ap.password);
-          setInputValue('#ap-channel', data.ap.channel);
+          setInputValue("[name='ap[ssid]']", data.ap.ssid);
+          setInputValue("[name='ap[password]']", data.ap.password);
+          setInputValue("[name='ap[channel]']", data.ap.channel);
          setBusy('#ap-settings-busy', '#ap-settings', false);
        };

--- a/src_data/pages/sensors.html
+++ b/src_data/pages/sensors.html
@@ -21,6 +21,7 @@
          <li>
            <select id="lang" aria-label="Lang">
              <option value="en" selected>EN</option>
+              <option value="it">IT</option>
              <option value="ru">RU</option>
            </select>
          </li>
@@ -36,7 +37,7 @@
        </hgroup>

        <details id="template" class="sensor hidden" data-id="" data-preloaded="0">
-          <summary><b>#<span class="id"></span>: <span class="name"></span></b></summary>
+          <summary><b>#<span class="pos"></span>: <span class="name"></span></b></summary>

          <div>
            <div class="form-busy" aria-busy="true"></div>
@@ -134,12 +135,12 @@
                <div class="grid">
                  <label>
                    <span data-i18n>sensors.correction.offset</span>
-                    <input type="number" inputmode="numeric" name="offset" min="-20" max="20" step="0.01" required>
+                    <input type="number" inputmode="decimal" name="offset" min="-20" max="20" step="0.01" required>
                  </label>

                  <label>
                    <span data-i18n>sensors.correction.factor</span>
-                    <input type="number" inputmode="numeric" name="factor" min="0.01" max="10" step="0.01" required>
+                    <input type="number" inputmode="decimal" name="factor" min="0.01" max="100" step="0.01" required>
                  </label>
                </div>
              </details>
@@ -159,7 +160,7 @@
  
                  <label>
                    <span data-i18n>sensors.filtering.factor.title</span>
-                    <input type="number" inputmode="numeric" name="filteringFactor" min="0.01" max="1" step="0.01">
+                    <input type="number" inputmode="decimal" name="filteringFactor" min="0.01" max="1" step="0.01">
                    <small data-i18n>sensors.filtering.factor.note</small>
                  </label>
                </div>
@@ -210,6 +211,7 @@
            sensorNode.classList.remove("hidden");
            sensorNode.dataset.id = sensorId;
            setValue(".id", sensorId, sensorNode);
+            setValue(".pos", parseInt(sensorId) + 1, sensorNode);
            setValue(".name", result[sensorId], sensorNode);
            
            container.appendChild(sensorNode);
--- a/src_data/pages/settings.html
+++ b/src_data/pages/settings.html
@@ -21,6 +21,7 @@
          <li>
            <select id="lang" aria-label="Lang">
              <option value="en" selected>EN</option>
+              <option value="it">IT</option>
              <option value="ru">RU</option>
            </select>
          </li>
@@ -41,21 +42,26 @@
            <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">
+                <label>
                  <span data-i18n>settings.portal.login</span>
-                  <input type="text" id="portal-login" name="portal[login]" maxlength="12" required>
+                  <input type="text" name="portal[login]" maxlength="12">
                </label>

-                <label for="portal-password">
+                <label>
                  <span data-i18n>settings.portal.password</span>
-                  <input type="password" id="portal-password" name="portal[password]" maxlength="32" required>
+                  <input type="password" name="portal[password]" maxlength="32">
                </label>
              </div>

-              <label for="portal-auth">
-                <input type="checkbox" id="portal-auth" name="portal[auth]" value="true">
+              <label>
+                <input type="checkbox" name="portal[auth]" value="true">
                <span data-i18n>settings.portal.auth</span>
              </label>
+
+              <label>
+                <input type="checkbox" name="portal[mdns]" value="true">
+                <span data-i18n>settings.portal.mdns</span>
+              </label>
              <br />

              <button type="submit" data-i18n>button.save</button>
@@ -74,20 +80,37 @@
                <legend data-i18n>settings.system.unit</legend>

                <label>
-                  <input type="radio" class="system-unit-system" name="system[unitSystem]" value="0" />
+                  <input type="radio" 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" />
+                  <input type="radio" name="system[unitSystem]" value="1" />
                  <span data-i18n>settings.system.imperial</span>
                </label>
              </fieldset>

              <fieldset>
-                <label for="system-status-led-gpio">
+                <label>
+                  <span data-i18n>settings.system.ntp.server</span>
+                  <input type="text" name="system[ntp][server]" maxlength="48">
+                </label>
+
+                <label>
+                  <span data-i18n>settings.system.ntp.timezone</span>
+                  <div role="group">
+                    <input type="text" name="system[ntp][timezone]" maxlength="48">
+                    <select class="presetTimezones">
+                      <option disabled selected data-i18n>settings.system.ntp.timezonePresets</option>
+                    </select>
+                  </div>
+                  </label>
+              </fieldset>
+
+              <fieldset>
+                <label>
                  <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">
+                  <input type="number" inputmode="numeric" name="system[statusLedGpio]" min="0" max="254" step="1">
                  <small data-i18n>settings.note.blankNotUse</small>
                </label>
              </fieldset>
@@ -95,19 +118,19 @@
              <fieldset>
                <legend data-i18n>settings.section.diag</legend>

-                <label for="system-serial-enable">
-                  <input type="checkbox" id="system-serial-enable" name="system[serial][enabled]" value="true">
+                <label>
+                  <input type="checkbox" name="system[serial][enabled]" value="true">
                  <span data-i18n>settings.system.serial.enable</span>
                </label>

-                <label for="system-telnet-enable">
-                  <input type="checkbox" id="system-telnet-enable" name="system[telnet][enabled]" value="true">
+                <label>
+                  <input type="checkbox" name="system[telnet][enabled]" value="true">
                  <span data-i18n>settings.system.telnet.enable</span>
                </label>

-                <label for="system-log-level">
+                <label>
                  <span data-i18n>settings.system.logLevel</span>
-                  <select id="system-log-level" name="system[logLevel]">
+                  <select name="system[logLevel]">
                    <option value="0">SILENT</option>
                    <option value="1">FATAL</option>
                    <option value="2">ERROR</option>
@@ -120,9 +143,9 @@
                </label>

                <div class="grid">
-                  <label for="system-serial-baudrate">
+                  <label>
                    <span data-i18n>settings.system.serial.baud</span>
-                    <select id="system-serial-baudrate" name="system[serial][baudrate]" required>
+                    <select name="system[serial][baudrate]" required>
                      <option value="9600">9600</option>
                      <option value="19200">19200</option>
                      <option value="38400">38400</option>
@@ -132,9 +155,9 @@
                    </select>
                  </label>

-                  <label for="system-telnet-port">
+                  <label>
                    <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>
+                    <input type="number" inputmode="numeric" name="system[telnet][port]" min="1" max="65535" step="1" required>
                    <small data-i18n>settings.system.telnet.port.note</small>
                  </label>
                </div>
@@ -156,26 +179,26 @@
            <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">
+                <label>
                  <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>
+                  <input type="number" inputmode="numeric" name="heating[minTemp]" min="0" max="0" step="1" required>
                </label>

-                <label for="heating-max-temp">
+                <label>
                  <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>
+                  <input type="number" inputmode="numeric" name="heating[maxTemp]" min="0" max="0" step="1" required>
                </label>
              </div>

              <div class="grid">
-                <label for="heating-hysteresis">
+                <label>
                  <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>
+                  <input type="number" inputmode="decimal" name="heating[hysteresis]" min="0" max="5" step="0.05" required>
                </label>

-                <label for="heating-turbo-factor">
+                <label>
                  <span data-i18n>settings.heating.turboFactor</span>
-                  <input type="number" inputmode="numeric" id="heating-turbo-factor" name="heating[turboFactor]" min="1.5" max="10" step="0.1" required>
+                  <input type="number" inputmode="decimal" name="heating[turboFactor]" min="1.5" max="10" step="0.1" required>
                </label>
              </div>

@@ -192,14 +215,14 @@
            <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">
+                <label>
                  <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>
+                  <input type="number" inputmode="numeric" name="dhw[minTemp]" min="0" max="0" step="1" required>
                </label>

-                <label for="dhw-max-temp">
+                <label>
                  <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>
+                  <input type="number" inputmode="numeric" name="dhw[maxTemp]" min="0" max="0" step="1" required>
                </label>
              </div>

@@ -220,15 +243,15 @@
              </fieldset>

              <div class="grid">
-                <label for="emergency-target">
+                <label>
                  <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>
+                  <input type="number" inputmode="numeric" name="emergency[target]" min="0" max="0" step="1" required>
                  <small data-i18n>settings.emergency.target.note</small>
                </label>

-                <label for="emergency-treshold-time">
+                <label>
                  <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>
+                  <input type="number" inputmode="numeric" name="emergency[tresholdTime]" min="60" max="1800" step="1" required>
                </label>
              </div>

@@ -245,26 +268,26 @@
            <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[enabled]" value="true">
+                <label>
+                  <input type="checkbox" name="equitherm[enabled]" value="true">
                  <span data-i18n>settings.enable</span>
                </label>
              </fieldset>

              <div class="grid">
-                <label for="equitherm-n-factor">
+                <label>
                  <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>
+                  <input type="number" inputmode="decimal" name="equitherm[n_factor]" min="0.001" max="10" step="0.001" required>
                </label>

-                <label for="equitherm-k-factor">
+                <label>
                  <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>
+                  <input type="number" inputmode="decimal" name="equitherm[k_factor]" min="0" max="10" step="0.01" required>
                </label>

-                <label for="equitherm-t-factor">
+                <label>
                  <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>
+                  <input type="number" inputmode="decimal" name="equitherm[t_factor]" min="0" max="10" step="0.01" required>
                  <small data-i18n>settings.equitherm.t.note</small>
                </label>
              </div>
@@ -282,49 +305,103 @@
            <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[enabled]" value="true">
+                <label>
+                  <input type="checkbox" name="pid[enabled]" value="true">
                  <span data-i18n>settings.enable</span>
                </label>
              </fieldset>

              <div class="grid">
-                <label for="pid-p-factor">
+                <label>
                  <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.01" required>
+                  <input type="number" inputmode="decimal" name="pid[p_factor]" min="0.1" max="1000" step="0.01" required>
                </label>

-                <label for="pid-i-factor">
+                <label>
                  <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>
+                  <input type="number" inputmode="decimal" name="pid[i_factor]" min="0" max="100" step="0.0001" required>
                </label>

-                <label for="pid-d-factor">
+                <label>
                  <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="0.1" required>
+                  <input type="number" inputmode="decimal" name="pid[d_factor]" min="0" max="100000" step="0.1" required>
                </label>
              </div>

-              <label for="pid-dt">
+              <label>
                <span data-i18n>settings.pid.dt</span>
-                <input type="number" inputmode="numeric" id="pid-dt" name="pid[dt]" min="30" max="1800" step="1" required>
+                <input type="number" inputmode="numeric" name="pid[dt]" min="30" max="1800" 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>
+              <details>
+                <summary><b data-i18n>settings.pid.limits.title</b></summary>

-                <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>
+                <div>
+                  <div class="grid">
+                    <label>
+                      <span data-i18n>settings.temp.min</span>
+                      <input type="number" inputmode="decimal" name="pid[minTemp]" min="0" max="0" step="1" required>
+                    </label>
+    
+                    <label>
+                      <span data-i18n>settings.temp.max</span>
+                      <input type="number" inputmode="numeric" name="pid[maxTemp]" min="0" max="0" step="1" required>
+                    </label>
+                  </div>

-              <small data-i18n>settings.pid.noteMinMaxTemp</small>
+                  <small data-i18n>settings.pid.limits.note</small>
+                </div>
+              </details>
+
+              <hr />
+
+              <details>
+                <summary><b data-i18n>settings.pid.deadband.title</b></summary>
+
+                <div>
+                  <fieldset>
+                    <label>
+                      <input type="checkbox" name="pid[deadband][enabled]" value="true">
+                      <span data-i18n>settings.enable</span>
+                    </label>
+                  </fieldset>
+
+                  <div class="grid">
+                    <label>
+                      <span data-i18n>settings.pid.deadband.p_multiplier</span>
+                      <input type="number" inputmode="decimal" name="pid[deadband][p_multiplier]" min="0" max="5" step="0.001" required>
+                    </label>
+    
+                    <label>
+                      <span data-i18n>settings.pid.deadband.i_multiplier</span>
+                      <input type="number" inputmode="decimal" name="pid[deadband][i_multiplier]" min="0" max="1" step="0.001" required>
+                    </label>
+    
+                    <label>
+                      <span data-i18n>settings.pid.deadband.d_multiplier</span>
+                      <input type="number" inputmode="decimal" name="pid[deadband][d_multiplier]" min="0" max="1" step="0.001" required>
+                    </label>
+                  </div>
+
+                  <div class="grid">
+                    <label>
+                      <span data-i18n>settings.pid.deadband.thresholdHigh</span>
+                      <input type="number" inputmode="decimal" name="pid[deadband][thresholdHigh]" min="0" max="5" step="0.01" required>
+                    </label>
+    
+                    <label>
+                      <span data-i18n>settings.pid.deadband.thresholdLow</span>
+                      <input type="number" inputmode="decimal" name="pid[deadband][thresholdLow]" min="0" max="5" step="0.01" required>
+                    </label>
+                  </div>
+
+                  <small data-i18n>settings.pid.deadband.note</small>
+                </div>
+              </details>
+
+              <br />

              <button type="submit" data-i18n>button.save</button>
            </form>
@@ -336,67 +413,67 @@
        <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">
+            <div id="ot-settings-busy" aria-busy="true"></div>
+            <form action="/api/settings" id="ot-settings" class="hidden">
              <fieldset>
                <legend data-i18n>settings.system.unit</legend>

                <label>
-                  <input type="radio" class="opentherm-unit-system" name="opentherm[unitSystem]" value="0" />
+                  <input type="radio" 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" />
+                  <input type="radio" name="opentherm[unitSystem]" value="1" />
                  <span data-i18n>settings.system.imperial</span>
                </label>
              </fieldset>

              <div class="grid">
-                <label for="opentherm-in-gpio">
+                <label>
                  <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">
+                  <input type="number" inputmode="numeric" name="opentherm[inGpio]" min="0" max="254" step="1">
                </label>

-                <label for="opentherm-in-gpio">
+                <label>
                  <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">
+                  <input type="number" inputmode="numeric" name="opentherm[outGpio]" min="0" max="254" step="1">
                </label>

-                <label for="opentherm-rx-led-gpio">
+                <label>
                  <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">
+                  <input type="number" inputmode="numeric" name="opentherm[rxLedGpio]" min="0" max="254" step="1">
                  <small data-i18n>settings.note.blankNotUse</small>
                </label>
              </div>

              <div class="grid">
-                <label for="opentherm-member-id-code">
+                <label>
                  <span data-i18n>settings.ot.memberId</span>
-                  <input type="number" inputmode="numeric" id="opentherm-member-id" name="opentherm[memberId]" min="0" max="255" step="1" required>
+                  <input type="number" inputmode="numeric" name="opentherm[memberId]" min="0" max="255" step="1" required>
                </label>

-                <label for="opentherm-flags">
+                <label>
                  <span data-i18n>settings.ot.flags</span>
-                  <input type="number" inputmode="numeric" id="opentherm-flags" name="opentherm[flags]" min="0" max="255" step="1" required>
+                  <input type="number" inputmode="numeric" name="opentherm[flags]" min="0" max="255" step="1" required>
                </label>

-                <label for="opentherm-max-modulation">
+                <label>
                  <span data-i18n>settings.ot.maxMod</span>
-                  <input type="number" inputmode="numeric" id="opentherm-max-modulation" name="opentherm[maxModulation]" min="1" max="100" step="1" required>
+                  <input type="number" inputmode="numeric" name="opentherm[maxModulation]" min="1" max="100" step="1" required>
                </label>
              </div>

              <div class="grid">
-                <label for="opentherm-min-power">
+                <label>
                  <span data-i18n>settings.ot.minPower.title</span>
-                  <input type="number" inputmode="numeric" id="opentherm-min-power" name="opentherm[minPower]" min="0" max="1000" step="0.1">
+                  <input type="number" inputmode="decimal" name="opentherm[minPower]" min="0" max="1000" step="0.01">
                  <small data-i18n>settings.ot.minPower.note</small>
                </label>

-                <label for="opentherm-max-power">
+                <label>
                  <span data-i18n>settings.ot.maxPower.title</span>
-                  <input type="number" inputmode="numeric" id="opentherm-max-power" name="opentherm[maxPower]" min="0" max="1000" step="0.1">
+                  <input type="number" inputmode="decimal" name="opentherm[maxPower]" min="0" max="1000" step="0.01">
                  <small data-i18n>settings.ot.maxPower.note</small>
                </label>
              </div>
@@ -404,54 +481,69 @@
              <fieldset>
                <legend data-i18n>settings.ot.options.desc</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>
+                  <input type="checkbox" name="opentherm[options][dhwSupport]" value="true">
+                  <span data-i18n>settings.ot.options.dhwSupport</span>
                </label>

-                <label for="opentherm-sw-mode">
-                  <input type="checkbox" id="opentherm-sw-mode" name="opentherm[summerWinterMode]" value="true">
+                <label>
+                  <input type="checkbox" name="opentherm[options][coolingSupport]" value="true">
+                  <span data-i18n>settings.ot.options.coolingSupport</span>
+                </label>
+
+                <label>
+                  <input type="checkbox" name="opentherm[options][summerWinterMode]" value="true">
                  <span data-i18n>settings.ot.options.summerWinterMode</span>
                </label>

-                <label 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>
+                  <input type="checkbox" name="opentherm[options][heatingStateToSummerWinterMode]" value="true">
+                  <span data-i18n>settings.ot.options.heatingStateToSummerWinterMode</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>
+                  <input type="checkbox" name="opentherm[options][ch2AlwaysEnabled]" value="true">
+                  <span data-i18n>settings.ot.options.ch2AlwaysEnabled</span>
                </label>

-                <label for="opentherm-dhw-to-ch2">
-                  <input type="checkbox" id="opentherm-dhw-to-ch2" name="opentherm[dhwToCh2]" value="true">
+                <label>
+                  <input type="checkbox" name="opentherm[options][heatingToCh2]" value="true">
+                  <span data-i18n>settings.ot.options.heatingToCh2</span>
+                </label>
+
+                <label>
+                  <input type="checkbox" name="opentherm[options][dhwToCh2]" value="true">
                  <span data-i18n>settings.ot.options.dhwToCh2</span>
                </label>

-                <label for="opentherm-dhw-blocking">
-                  <input type="checkbox" id="opentherm-dhw-blocking" name="opentherm[dhwBlocking]" value="true">
+                <label>
+                  <input type="checkbox" name="opentherm[options][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">
+                <label>
+                  <input type="checkbox" name="opentherm[options][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">
+                <label>
+                  <input type="checkbox" name="opentherm[options][maxTempSyncWithTargetTemp]" value="true">
+                  <span data-i18n>settings.ot.options.maxTempSyncWithTargetTemp</span>
+                </label>
+
+                <label>
+                  <input type="checkbox" name="opentherm[options][getMinMaxTemp]" value="true">
                  <span data-i18n>settings.ot.options.getMinMaxTemp</span>
                </label>

-                <label for="opentherm-immergas-fix">
-                  <input type="checkbox" id="opentherm-immergas-fix" name="opentherm[immergasFix]" value="true">
+                <label>
+                  <input type="checkbox" name="opentherm[options][immergasFix]" value="true">
                  <span data-i18n>settings.ot.options.immergasFix</span>
                </label>

                <hr />
-                <label for="opentherm-native-heating-control">
-                  <input type="checkbox" id="opentherm-native-heating-control" name="opentherm[nativeHeatingControl]" value="true">
+                <label>
+                  <input type="checkbox" name="opentherm[options][nativeHeatingControl]" value="true">
                  <span data-i18n>settings.ot.nativeHeating.title</span><br />
                  <small data-i18n>settings.ot.nativeHeating.note</small>
                </label>
@@ -470,50 +562,50 @@
            <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[enabled]" value="true">
+                <label>
+                  <input type="checkbox" name="mqtt[enabled]" 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">
+                <label>
+                  <input type="checkbox" name="mqtt[homeAssistantDiscovery]" value="true">
                  <span data-i18n>settings.mqtt.homeAssistantDiscovery</span>
                </label>
              </fieldset>

              <div class="grid">
-                <label for="mqtt-server">
+                <label>
                  <span data-i18n>settings.mqtt.server</span>
-                  <input type="text" id="mqtt-server" name="mqtt[server]" maxlength="80" required>
+                  <input type="text" name="mqtt[server]" maxlength="80" required>
                </label>

-                <label for="mqtt-port">
+                <label>
                  <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>
+                  <input type="number" inputmode="numeric" name="mqtt[port]" min="1" max="65535" step="1" required>
                </label>
              </div>

              <div class="grid">
-                <label for="mqtt-user">
+                <label>
                  <span data-i18n>settings.mqtt.user</span>
-                  <input type="text" id="mqtt-user" name="mqtt[user]" maxlength="32" required>
+                  <input type="text" name="mqtt[user]" maxlength="32">
                </label>

-                <label for="mqtt-password">
+                <label>
                  <span data-i18n>settings.mqtt.password</span>
-                  <input type="password" id="mqtt-password" name="mqtt[password]" maxlength="32">
+                  <input type="password" name="mqtt[password]" maxlength="32">
                </label>
              </div>

              <div class="grid">
-                <label for="mqtt-prefix">
+                <label>
                  <span data-i18n>settings.mqtt.prefix</span>
-                  <input type="text" id="mqtt-prefix" name="mqtt[prefix]" maxlength="32" required>
+                  <input type="text" name="mqtt[prefix]" maxlength="32" required>
                </label>

-                <label for="mqtt-interval">
+                <label>
                  <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>
+                  <input type="number" inputmode="numeric" name="mqtt[interval]" min="3" max="60" step="1" required>
                </label>
              </div>

@@ -530,33 +622,33 @@
            <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">
+                <label>
+                  <input type="checkbox" name="externalPump[use]" value="true">
                  <span data-i18n>settings.extPump.use</span>
                </label>
              </fieldset>

              <div class="grid">
-                <label for="extpump-gpio">
+                <label>
                  <span data-i18n>settings.extPump.gpio</span>
-                  <input type="number" inputmode="numeric" id="extpump-gpio" name="externalPump[gpio]" min="0" max="254" step="1">
+                  <input type="number" inputmode="numeric" name="externalPump[gpio]" min="0" max="254" step="1">
                </label>

-                <label for="extpump-pc-time">
+                <label>
                  <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>
+                  <input type="number" inputmode="numeric" name="externalPump[postCirculationTime]" min="1" max="120" step="1" required>
                </label>
              </div>

              <div class="grid">
-                <label for="extpump-as-interval">
+                <label>
                  <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>
+                  <input type="number" inputmode="numeric" name="externalPump[antiStuckInterval]" min="1" max="366" step="1" required>
                </label>

-                <label for="extpump-as-time">
+                <label>
                  <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>
+                  <input type="number" inputmode="numeric" name="externalPump[antiStuckTime]" min="1" max="20" step="1" required>
                </label>
              </div>

@@ -573,74 +665,74 @@
            <div id="cc-settings-busy" aria-busy="true"></div>
            <form action="/api/settings" id="cc-settings" class="hidden">
              <fieldset>
-                <label for="cc-input-enable">
-                  <input type="checkbox" id="cc-input-enable" name="cascadeControl[input][enabled]" value="true">
+                <label>
+                  <input type="checkbox" name="cascadeControl[input][enabled]" value="true">
                  <span data-i18n>settings.cascadeControl.input.enable</span>
                  <br />
                  <small data-i18n>settings.cascadeControl.input.desc</small>
                </label>

-                <label for="cc-input-invert-state">
-                  <input type="checkbox" id="cc-input-invert-state" name="cascadeControl[input][invertState]" value="true">
+                <label>
+                  <input type="checkbox" name="cascadeControl[input][invertState]" value="true">
                  <span data-i18n>settings.cascadeControl.input.invertState</span>
                </label>
              </fieldset>

              <div class="grid">
-                <label for="cc-input-gpio">
+                <label>
                  <span data-i18n>settings.cascadeControl.input.gpio</span>
-                  <input type="number" inputmode="numeric" id="cc-input-gpio" name="cascadeControl[input][gpio]" min="0" max="254" step="1">
+                  <input type="number" inputmode="numeric" name="cascadeControl[input][gpio]" min="0" max="254" step="1">
                </label>

-                <label for="cc-input-tt">
+                <label>
                  <span data-i18n>settings.cascadeControl.input.thresholdTime</span>
-                  <input type="number" inputmode="numeric" id="cc-input-tt" name="cascadeControl[input][thresholdTime]" min="5" max="600" step="1" required>
+                  <input type="number" inputmode="numeric" name="cascadeControl[input][thresholdTime]" min="5" max="600" step="1" required>
                </label>
              </div>

              <hr />

              <fieldset>
-                <label for="cc-output-enable">
-                  <input type="checkbox" id="cc-output-enable" name="cascadeControl[output][enabled]" value="true">
+                <label>
+                  <input type="checkbox" name="cascadeControl[output][enabled]" value="true">
                  <span data-i18n>settings.cascadeControl.output.enable</span>
                  <br />
                  <small data-i18n>settings.cascadeControl.output.desc</small>
                </label>

-                <label for="cc-output-invert-state">
-                  <input type="checkbox" id="cc-output-invert-state" name="cascadeControl[output][invertState]" value="true">
+                <label>
+                  <input type="checkbox" name="cascadeControl[output][invertState]" value="true">
                  <span data-i18n>settings.cascadeControl.output.invertState</span>
                </label>
              </fieldset>

              <div class="grid">
-                <label for="cc-output-gpio">
+                <label>
                  <span data-i18n>settings.cascadeControl.output.gpio</span>
-                  <input type="number" outputmode="numeric" id="cc-output-gpio" name="cascadeControl[output][gpio]" min="0" max="254" step="1">
+                  <input type="number" inputmode="numeric" name="cascadeControl[output][gpio]" min="0" max="254" step="1">
                </label>

-                <label for="cc-output-tt">
+                <label>
                  <span data-i18n>settings.cascadeControl.output.thresholdTime</span>
-                  <input type="number" outputmode="numeric" id="cc-output-tt" name="cascadeControl[output][thresholdTime]" min="5" max="600" step="1" required>
+                  <input type="number" inputmode="numeric" name="cascadeControl[output][thresholdTime]" min="5" max="600" step="1" required>
                </label>
              </div>

              <fieldset>
                <legend data-i18n>settings.cascadeControl.output.events.desc</legend>

-                <label for="cc-on-fault">
-                  <input type="checkbox" id="cc-on-fault" name="cascadeControl[output][onFault]" value="true">
+                <label>
+                  <input type="checkbox" name="cascadeControl[output][onFault]" value="true">
                  <span data-i18n>settings.cascadeControl.output.events.onFault</span>
                </label>

-                <label for="cc-on-loss-conn">
-                  <input type="checkbox" id="cc-on-loss-conn" name="cascadeControl[output][onLossConnection]" value="true">
+                <label>
+                  <input type="checkbox" name="cascadeControl[output][onLossConnection]" value="true">
                  <span data-i18n>settings.cascadeControl.output.events.onLossConnection</span>
                </label>

-                <label for="cc-on-enabled-heating">
-                  <input type="checkbox" id="cc-on-enabled-heating" name="cascadeControl[output][onEnabledHeating]" value="true">
+                <label>
+                  <input type="checkbox" name="cascadeControl[output][onEnabledHeating]" value="true">
                  <span data-i18n>settings.cascadeControl.output.events.onEnabledHeating</span>
                </label>
              </fieldset>
@@ -671,111 +763,117 @@

        const fillData = (data) => {
          // System
-          setSelectValue('#system-log-level', data.system.logLevel);
-          setCheckboxValue('#system-serial-enable', data.system.serial.enabled);
-          setSelectValue('#system-serial-baudrate', data.system.serial.baudrate);
-          setCheckboxValue('#system-telnet-enable', data.system.telnet.enabled);
-          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 : '');
+          setSelectValue("[name='system[logLevel]']", data.system.logLevel);
+          setCheckboxValue("[name='system[serial][enabled]']", data.system.serial.enabled);
+          setSelectValue("[name='system[serial][baudrate]']", data.system.serial.baudrate);
+          setCheckboxValue("[name='system[telnet][enabled]']", data.system.telnet.enabled);
+          setInputValue("[name='system[telnet][port]']", data.system.telnet.port);
+          setInputValue("[name='system[ntp][server]']", data.system.ntp.server);
+          setInputValue("[name='system[ntp][timezone]']", data.system.ntp.timezone);
+          setRadioValue("[name='system[unitSystem]']", data.system.unitSystem);
+          setInputValue("[name='system[statusLedGpio]']", 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);
+          setCheckboxValue("[name='portal[auth]']", data.portal.auth);
+          setInputValue("[name='portal[login]']", data.portal.login);
+          setInputValue("[name='portal[password]']", data.portal.password);
+          setCheckboxValue("[name='portal[mdns]']", data.portal.mdns);
          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-member-id', data.opentherm.memberId);
-          setInputValue('#opentherm-flags', data.opentherm.flags);
-          setInputValue('#opentherm-max-modulation', data.opentherm.maxModulation);
-          setInputValue('#opentherm-min-power', data.opentherm.minPower);
-          setInputValue('#opentherm-max-power', data.opentherm.maxPower);
-          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);
-          setCheckboxValue('#opentherm-immergas-fix', data.opentherm.immergasFix);
-          setBusy('#opentherm-settings-busy', '#opentherm-settings', false);
+          setRadioValue("[name='opentherm[unitSystem]']", data.opentherm.unitSystem);
+          setInputValue("[name='opentherm[inGpio]']", data.opentherm.inGpio < 255 ? data.opentherm.inGpio : '');
+          setInputValue("[name='opentherm[outGpio]']", data.opentherm.outGpio < 255 ? data.opentherm.outGpio : '');
+          setInputValue("[name='opentherm[rxLedGpio]']", data.opentherm.rxLedGpio < 255 ? data.opentherm.rxLedGpio : '');
+          setInputValue("[name='opentherm[memberId]']", data.opentherm.memberId);
+          setInputValue("[name='opentherm[flags]']", data.opentherm.flags);
+          setInputValue("[name='opentherm[maxModulation]']", data.opentherm.maxModulation);
+          setInputValue("[name='opentherm[minPower]']", data.opentherm.minPower);
+          setInputValue("[name='opentherm[maxPower]']", data.opentherm.maxPower);
+          setCheckboxValue("[name='opentherm[options][dhwSupport]']", data.opentherm.options.dhwSupport);
+          setCheckboxValue("[name='opentherm[options][coolingSupport]']", data.opentherm.options.coolingSupport);
+          setCheckboxValue("[name='opentherm[options][summerWinterMode]']", data.opentherm.options.summerWinterMode);
+          setCheckboxValue("[name='opentherm[options][heatingStateToSummerWinterMode]']", data.opentherm.options.heatingStateToSummerWinterMode);
+          setCheckboxValue("[name='opentherm[options][ch2AlwaysEnabled]']", data.opentherm.options.ch2AlwaysEnabled);
+          setCheckboxValue("[name='opentherm[options][heatingToCh2]']", data.opentherm.options.heatingToCh2);
+          setCheckboxValue("[name='opentherm[options][dhwToCh2]']", data.opentherm.options.dhwToCh2);
+          setCheckboxValue("[name='opentherm[options][dhwBlocking]']", data.opentherm.options.dhwBlocking);
+          setCheckboxValue("[name='opentherm[options][modulationSyncWithHeating]']", data.opentherm.options.modulationSyncWithHeating);
+          setCheckboxValue("[name='opentherm[options][maxTempSyncWithTargetTemp]']", data.opentherm.options.maxTempSyncWithTargetTemp);
+          setCheckboxValue("[name='opentherm[options][getMinMaxTemp]']", data.opentherm.options.getMinMaxTemp);
+          setCheckboxValue("[name='opentherm[options][nativeHeatingControl]']", data.opentherm.options.nativeHeatingControl);
+          setCheckboxValue("[name='opentherm[options][immergasFix]']", data.opentherm.options.immergasFix);
+          setBusy('#ot-settings-busy', '#ot-settings', false);

          // MQTT
-          setCheckboxValue('#mqtt-enable', data.mqtt.enabled);
-          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);
+          setCheckboxValue("[name='mqtt[enabled]']", data.mqtt.enabled);
+          setCheckboxValue("[name='mqtt[homeAssistantDiscovery]']", data.mqtt.homeAssistantDiscovery);
+          setInputValue("[name='mqtt[server]']", data.mqtt.server);
+          setInputValue("[name='mqtt[port]']", data.mqtt.port);
+          setInputValue("[name='mqtt[user]']", data.mqtt.user);
+          setInputValue("[name='mqtt[password]']", data.mqtt.password);
+          setInputValue("[name='mqtt[prefix]']", data.mqtt.prefix);
+          setInputValue("[name='mqtt[interval]']", data.mqtt.interval);
          setBusy('#mqtt-settings-busy', '#mqtt-settings', false);

          // Extpump
-          setCheckboxValue('#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);
+          setCheckboxValue("[name='externalPump[use]']", data.externalPump.use);
+          setInputValue("[name='externalPump[gpio]']", data.externalPump.gpio < 255 ? data.externalPump.gpio : '');
+          setInputValue("[name='externalPump[postCirculationTime]']", data.externalPump.postCirculationTime);
+          setInputValue("[name='externalPump[antiStuckInterval]']", data.externalPump.antiStuckInterval);
+          setInputValue("[name='externalPump[antiStuckTime]']", data.externalPump.antiStuckTime);
          setBusy('#extpump-settings-busy', '#extpump-settings', false);

          // Cascade control
-          setCheckboxValue('#cc-input-enable', data.cascadeControl.input.enabled);
-          setInputValue('#cc-input-gpio', data.cascadeControl.input.gpio < 255 ? data.cascadeControl.input.gpio : '');
-          setCheckboxValue('#cc-input-invert-state', data.cascadeControl.input.invertState);
-          setInputValue('#cc-input-tt', data.cascadeControl.input.thresholdTime);
+          setCheckboxValue("[name='cascadeControl[input][enabled]']", data.cascadeControl.input.enabled);
+          setInputValue("[name='cascadeControl[input][gpio]']", data.cascadeControl.input.gpio < 255 ? data.cascadeControl.input.gpio : '');
+          setCheckboxValue("[name='cascadeControl[input][invertState]']", data.cascadeControl.input.invertState);
+          setInputValue("[name='cascadeControl[input][thresholdTime]']", data.cascadeControl.input.thresholdTime);

-          setCheckboxValue('#cc-output-enable', data.cascadeControl.output.enabled);
-          setInputValue('#cc-output-gpio', data.cascadeControl.output.gpio < 255 ? data.cascadeControl.output.gpio : '');
-          setCheckboxValue('#cc-output-invert-state', data.cascadeControl.output.invertState);
-          setInputValue('#cc-output-tt', data.cascadeControl.output.thresholdTime);
-          setCheckboxValue('#cc-on-fault', data.cascadeControl.output.onFault);
-          setCheckboxValue('#cc-on-loss-conn', data.cascadeControl.output.onLossConnection);
-          setCheckboxValue('#cc-on-enabled-heating', data.cascadeControl.output.onEnabledHeating);
+          setCheckboxValue("[name='cascadeControl[output][enabled]']", data.cascadeControl.output.enabled);
+          setInputValue("[name='cascadeControl[output][gpio]']", data.cascadeControl.output.gpio < 255 ? data.cascadeControl.output.gpio : '');
+          setCheckboxValue("[name='cascadeControl[output][invertState]']", data.cascadeControl.output.invertState);
+          setInputValue("[name='cascadeControl[output][thresholdTime]']", data.cascadeControl.output.thresholdTime);
+          setCheckboxValue("[name='cascadeControl[output][onFault]']", data.cascadeControl.output.onFault);
+          setCheckboxValue("[name='cascadeControl[output][onLossConnection]']", data.cascadeControl.output.onLossConnection);
+          setCheckboxValue("[name='cascadeControl[output][onEnabledHeating]']", data.cascadeControl.output.onEnabledHeating);
          setBusy('#cc-settings-busy', '#cc-settings', false);

          // Heating
-          setInputValue('#heating-min-temp', data.heating.minTemp, {
+          setInputValue("[name='heating[minTemp]']", data.heating.minTemp, {
            "min": data.system.unitSystem == 0 ? 0 : 32,
            "max": data.system.unitSystem == 0 ? 99 : 211
          });
-          setInputValue('#heating-max-temp', data.heating.maxTemp, {
+          setInputValue("[name='heating[maxTemp]']", 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-turbo-factor', data.heating.turboFactor);
+          setInputValue("[name='heating[hysteresis]']", data.heating.hysteresis);
+          setInputValue("[name='heating[turboFactor]']", data.heating.turboFactor);
          setBusy('#heating-settings-busy', '#heating-settings', false);

          // DHW
-          setInputValue('#dhw-min-temp', data.dhw.minTemp, {
+          setInputValue("[name='dhw[minTemp]']", data.dhw.minTemp, {
            "min": data.system.unitSystem == 0 ? 0 : 32,
            "max": data.system.unitSystem == 0 ? 99 : 211
          });
-          setInputValue('#dhw-max-temp', data.dhw.maxTemp, {
+          setInputValue("[name='dhw[maxTemp]']", data.dhw.maxTemp, {
            "min": data.system.unitSystem == 0 ? 1 : 33,
            "max": data.system.unitSystem == 0 ? 100 : 212
          });
          setBusy('#dhw-settings-busy', '#dhw-settings', false);

          // Emergency mode
-          setInputValue('#emergency-treshold-time', data.emergency.tresholdTime);
-          if (data.opentherm.nativeHeatingControl) {
-            setInputValue('#emergency-target', data.emergency.target, {
+          setInputValue("[name='emergency[tresholdTime]']", data.emergency.tresholdTime);
+          if (data.opentherm.options.nativeHeatingControl) {
+            setInputValue("[name='emergency[target]']", data.emergency.target, {
              "min": data.system.unitSystem == 0 ? 5 : 41,
              "max": data.system.unitSystem == 0 ? 30 : 86
            });

          } else {
-            setInputValue('#emergency-target', data.emergency.target, {
+            setInputValue("[name='emergency[target]']", data.emergency.target, {
              "min": data.heating.minTemp,
              "max": data.heating.maxTemp,
            });
@@ -784,29 +882,57 @@
          setBusy('#emergency-settings-busy', '#emergency-settings', false);

          // Equitherm
-          setCheckboxValue('#equitherm-enable', data.equitherm.enabled);
-          setInputValue('#equitherm-n-factor', data.equitherm.n_factor);
-          setInputValue('#equitherm-k-factor', data.equitherm.k_factor);
-          setInputValue('#equitherm-t-factor', data.equitherm.t_factor);
+          setCheckboxValue("[name='equitherm[enabled]']", data.equitherm.enabled);
+          setInputValue("[name='equitherm[n_factor]']", data.equitherm.n_factor);
+          setInputValue("[name='equitherm[k_factor]']", data.equitherm.k_factor);
+          setInputValue("[name='equitherm[t_factor]']", data.equitherm.t_factor);
          setBusy('#equitherm-settings-busy', '#equitherm-settings', false);

          // PID
-          setCheckboxValue('#pid-enable', data.pid.enabled);
-          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, {
+          setCheckboxValue("[name='pid[enabled]']", data.pid.enabled);
+          setInputValue("[name='pid[p_factor]']", data.pid.p_factor);
+          setInputValue("[name='pid[i_factor]']", data.pid.i_factor);
+          setInputValue("[name='pid[d_factor]']", data.pid.d_factor);
+          setInputValue("[name='pid[dt]']", data.pid.dt);
+          setInputValue("[name='pid[minTemp]']", data.pid.minTemp, {
            "min": data.equitherm.enabled ? (data.system.unitSystem == 0 ? -100 : -146) : (data.system.unitSystem == 0 ? 0 : 32),
            "max": (data.system.unitSystem == 0 ? 99 : 211)
          });
-          setInputValue('#pid-max-temp', data.pid.maxTemp, {
+          setInputValue("[name='pid[maxTemp]']", data.pid.maxTemp, {
            "min": (data.system.unitSystem == 0 ? 0 : 33),
            "max": (data.system.unitSystem == 0 ? 100 : 212)
          });
+          setCheckboxValue("[name='pid[deadband][enabled]']", data.pid.deadband.enabled);
+          setInputValue("[name='pid[deadband][p_multiplier]']", data.pid.deadband.p_multiplier);
+          setInputValue("[name='pid[deadband][i_multiplier]']", data.pid.deadband.i_multiplier);
+          setInputValue("[name='pid[deadband][d_multiplier]']", data.pid.deadband.d_multiplier);
+          setInputValue("[name='pid[deadband][thresholdHigh]']", data.pid.deadband.thresholdHigh);
+          setInputValue("[name='pid[deadband][thresholdLow]']", data.pid.deadband.thresholdLow);
          setBusy('#pid-settings-busy', '#pid-settings', false);
        };

+        try {
+          const response = await fetch("/static/timezones.json");
+          if (!response.ok) {
+            throw new Error('Response not valid');
+          }
+
+          const result = await response.json();
+          const ptzSelector = document.querySelector(".presetTimezones");
+          for (const ptzName in result) {
+            ptzSelector.appendChild(
+              new Option(ptzName, result[ptzName])
+            );
+          }
+
+          ptzSelector.addEventListener("change", async (event) => {
+            document.querySelector("[name='system[ntp][timezone]']").value = event.target.value;
+          });
+
+        } catch (error) {
+          console.log(error);
+        }
+
        try {
          const response = await fetch("/api/settings", {
            cache: "no-cache",
@@ -827,7 +953,7 @@
          setupForm('#emergency-settings', fillData);
          setupForm('#equitherm-settings', fillData);
          setupForm('#pid-settings', fillData);
-          setupForm('#opentherm-settings', fillData);
+          setupForm('#ot-settings', fillData);
          setupForm('#mqtt-settings', fillData, ['mqtt.user', 'mqtt.password', 'mqtt.prefix']);
          setupForm('#extpump-settings', fillData);
          setupForm('#cc-settings', fillData);
--- a/src_data/pages/upgrade.html
+++ b/src_data/pages/upgrade.html
@@ -21,6 +21,7 @@
          <li>
            <select id="lang" aria-label="Lang">
              <option value="en" selected>EN</option>
+              <option value="it">IT</option>
              <option value="ru">RU</option>
            </select>
          </li>
--- a/src_data/robots.txt
+++ b/src_data/robots.txt
@@ -0,0 +1,2 @@
+User-agent: *
+Disallow: /
--- a/src_data/scripts/utils.js
+++ b/src_data/scripts/utils.js
@@ -132,10 +132,14 @@ const setupNetworkScanForm = (formSelector, tableSelector) => {
      for (let i = 0; i < result.length; i++) {
        let row = tbody.insertRow(-1);
        row.classList.add("network");
-        row.setAttribute('data-ssid', result[i].hidden ? '' : result[i].ssid);
-        row.onclick = () => {
-          const input = document.querySelector('input#sta-ssid');
-          const ssid = this.getAttribute('data-ssid');
+        row.dataset.ssid = result[i].hidden ? '' : result[i].ssid;
+        row.insertCell().textContent = `#${i + 1}`;
+
+        const nameCell = row.insertCell();
+        nameCell.innerHTML = result[i].hidden ? `<i>${result[i].bssid}</i>` : result[i].ssid;
+        nameCell.onclick = (event) => {
+          const input = document.querySelector("[name='sta[ssid]']");
+          const ssid = event.target.parentNode.dataset.ssid;
          if (!input || !ssid) {
            return;
          }
@@ -144,9 +148,6 @@ const setupNetworkScanForm = (formSelector, tableSelector) => {
          input.focus();
        };

-        row.insertCell().textContent = `#${i + 1}`;
-        row.insertCell().innerHTML = result[i].hidden ? `<i>${result[i].bssid}</i>` : result[i].ssid;
-
        // info cell
        let infoCell = row.insertCell();

@@ -165,7 +166,7 @@ const setupNetworkScanForm = (formSelector, tableSelector) => {
        }
        
        let signalQualityContainer = document.createElement("span");
-        signalQualityContainer.setAttribute('data-tooltip', `${result[i].signalQuality}%`);
+        signalQualityContainer.dataset.tooltip = `${result[i].signalQuality}%`;
        signalQualityContainer.appendChild(signalQualityIcon);
        infoCell.appendChild(signalQualityContainer);

@@ -192,7 +193,7 @@ const setupNetworkScanForm = (formSelector, tableSelector) => {
        }

        let authContainer = document.createElement("span");
-        authContainer.setAttribute('data-tooltip', (result[i].auth in authList) ? authList[result[i].auth] : "unknown");
+        authContainer.dataset.tooltip = (result[i].auth in authList) ? authList[result[i].auth] : "unknown";
        authContainer.appendChild(authIcon);
        infoCell.appendChild(authContainer);
      }
@@ -848,4 +849,8 @@ function dec2hex(i) {
  }
  
  return hex.toUpperCase();
+}
+
+function constrain(amt, low, high) {
+  return ((amt) < (low) ? (low) : ((amt) > (high) ? (high) : (amt)));
 }
--- a/src_data/styles/app.css
+++ b/src_data/styles/app.css
@@ -115,6 +115,7 @@ tr.network:hover {
  font-family: var(--pico-font-family-monospace);
 }

+
 .thermostat {
  display: grid;
  grid-template-columns: 0.5fr 2fr 0.5fr;
@@ -193,6 +194,92 @@ tr.network:hover {
  margin: 1.25rem 0;
 }

+
+@media (max-width: 575px) {
+  .notify {
+    display: grid; 
+    grid-template-columns: 1fr; 
+    grid-template-rows: 1fr 0.5fr; 
+    gap: 0.5rem 0.5rem;
+    grid-template-areas: 
+      "notify-content"
+      "notify-actions"; 
+  }
+
+  .notify-icon {
+    display: none;
+  }
+
+  .notify-content {
+    justify-self: center;
+    align-self: center;
+    grid-area: notify-content; 
+  }
+
+  .notify-actions {
+    justify-self: center; 
+    align-self: center; 
+    grid-area: notify-actions; 
+  }
+}
+
+@media (min-width: 576px) {
+  .notify {
+    display: grid;
+    grid-template-columns: 5rem 1fr 10rem;
+    grid-template-rows: 1fr;
+    gap: 0rem 0.5rem;
+    grid-auto-flow: row;
+    grid-template-areas:
+      "notify-icon notify-content notify-actions";
+  }
+
+  .notify-icon {
+    justify-self: center;
+    align-self: center;
+    grid-area: notify-icon;
+  }
+
+  .notify-content {
+    justify-self: center;
+    align-self: center;
+    grid-area: notify-content;
+  }
+  
+  .notify-actions {
+    justify-self: center;
+    align-self: center;
+    grid-area: notify-actions;
+  }
+}
+
+.notify {
+  margin: 1rem;
+  padding: 0.5rem;
+  border: .25rem solid var(--pico-blockquote-border-color);
+}
+
+.notify-error {
+  border-color: var(--pico-form-element-invalid-border-color);
+}
+
+.notify-error .notify-icon {
+  color: var(--pico-form-element-invalid-border-color);
+}
+
+.notify-alarm {
+  border-color: #c89048;
+}
+
+.notify-alarm .notify-icon {
+  color: #c89048;
+}
+
+.notify-icon i {
+  font-size: 2.5rem;
+}
+
+
 [class*=" icons-"],
 [class=icons],
 [class^=icons-] {
--- a/src_data/timezones.json
+++ b/src_data/timezones.json
@@ -0,0 +1,458 @@
+{
+  "Africa/Abidjan":"GMT0",
+  "Africa/Accra":"GMT0",
+  "Africa/Addis_Ababa":"EAT-3",
+  "Africa/Algiers":"CET-1",
+  "Africa/Asmara":"EAT-3",
+  "Africa/Bamako":"GMT0",
+  "Africa/Bangui":"WAT-1",
+  "Africa/Banjul":"GMT0",
+  "Africa/Bissau":"GMT0",
+  "Africa/Blantyre":"CAT-2",
+  "Africa/Brazzaville":"WAT-1",
+  "Africa/Bujumbura":"CAT-2",
+  "Africa/Cairo":"EET-2EEST,M4.5.5/0,M10.5.4/24",
+  "Africa/Casablanca":"<+01>-1",
+  "Africa/Ceuta":"CET-1CEST,M3.5.0,M10.5.0/3",
+  "Africa/Conakry":"GMT0",
+  "Africa/Dakar":"GMT0",
+  "Africa/Dar_es_Salaam":"EAT-3",
+  "Africa/Djibouti":"EAT-3",
+  "Africa/Douala":"WAT-1",
+  "Africa/El_Aaiun":"<+01>-1",
+  "Africa/Freetown":"GMT0",
+  "Africa/Gaborone":"CAT-2",
+  "Africa/Harare":"CAT-2",
+  "Africa/Johannesburg":"SAST-2",
+  "Africa/Juba":"CAT-2",
+  "Africa/Kampala":"EAT-3",
+  "Africa/Khartoum":"CAT-2",
+  "Africa/Kigali":"CAT-2",
+  "Africa/Kinshasa":"WAT-1",
+  "Africa/Lagos":"WAT-1",
+  "Africa/Libreville":"WAT-1",
+  "Africa/Lome":"GMT0",
+  "Africa/Luanda":"WAT-1",
+  "Africa/Lubumbashi":"CAT-2",
+  "Africa/Lusaka":"CAT-2",
+  "Africa/Malabo":"WAT-1",
+  "Africa/Maputo":"CAT-2",
+  "Africa/Maseru":"SAST-2",
+  "Africa/Mbabane":"SAST-2",
+  "Africa/Mogadishu":"EAT-3",
+  "Africa/Monrovia":"GMT0",
+  "Africa/Nairobi":"EAT-3",
+  "Africa/Ndjamena":"WAT-1",
+  "Africa/Niamey":"WAT-1",
+  "Africa/Nouakchott":"GMT0",
+  "Africa/Ouagadougou":"GMT0",
+  "Africa/Porto-Novo":"WAT-1",
+  "Africa/Sao_Tome":"GMT0",
+  "Africa/Tripoli":"EET-2",
+  "Africa/Tunis":"CET-1",
+  "Africa/Windhoek":"CAT-2",
+  "America/Adak":"HST10HDT,M3.2.0,M11.1.0",
+  "America/Anchorage":"AKST9AKDT,M3.2.0,M11.1.0",
+  "America/Anguilla":"AST4",
+  "America/Antigua":"AST4",
+  "America/Araguaina":"<-03>3",
+  "America/Argentina/Buenos_Aires":"<-03>3",
+  "America/Argentina/Catamarca":"<-03>3",
+  "America/Argentina/Cordoba":"<-03>3",
+  "America/Argentina/Jujuy":"<-03>3",
+  "America/Argentina/La_Rioja":"<-03>3",
+  "America/Argentina/Mendoza":"<-03>3",
+  "America/Argentina/Rio_Gallegos":"<-03>3",
+  "America/Argentina/Salta":"<-03>3",
+  "America/Argentina/San_Juan":"<-03>3",
+  "America/Argentina/San_Luis":"<-03>3",
+  "America/Argentina/Tucuman":"<-03>3",
+  "America/Argentina/Ushuaia":"<-03>3",
+  "America/Aruba":"AST4",
+  "America/Asuncion":"<-04>4<-03>,M10.1.0/0,M3.4.0/0",
+  "America/Atikokan":"EST5",
+  "America/Bahia":"<-03>3",
+  "America/Bahia_Banderas":"CST6",
+  "America/Barbados":"AST4",
+  "America/Belem":"<-03>3",
+  "America/Belize":"CST6",
+  "America/Blanc-Sablon":"AST4",
+  "America/Boa_Vista":"<-04>4",
+  "America/Bogota":"<-05>5",
+  "America/Boise":"MST7MDT,M3.2.0,M11.1.0",
+  "America/Cambridge_Bay":"MST7MDT,M3.2.0,M11.1.0",
+  "America/Campo_Grande":"<-04>4",
+  "America/Cancun":"EST5",
+  "America/Caracas":"<-04>4",
+  "America/Cayenne":"<-03>3",
+  "America/Cayman":"EST5",
+  "America/Chicago":"CST6CDT,M3.2.0,M11.1.0",
+  "America/Chihuahua":"CST6",
+  "America/Costa_Rica":"CST6",
+  "America/Creston":"MST7",
+  "America/Cuiaba":"<-04>4",
+  "America/Curacao":"AST4",
+  "America/Danmarkshavn":"GMT0",
+  "America/Dawson":"MST7",
+  "America/Dawson_Creek":"MST7",
+  "America/Denver":"MST7MDT,M3.2.0,M11.1.0",
+  "America/Detroit":"EST5EDT,M3.2.0,M11.1.0",
+  "America/Dominica":"AST4",
+  "America/Edmonton":"MST7MDT,M3.2.0,M11.1.0",
+  "America/Eirunepe":"<-05>5",
+  "America/El_Salvador":"CST6",
+  "America/Fort_Nelson":"MST7",
+  "America/Fortaleza":"<-03>3",
+  "America/Glace_Bay":"AST4ADT,M3.2.0,M11.1.0",
+  "America/Godthab":"<-02>2<-01>,M3.5.0/-1,M10.5.0/0",
+  "America/Goose_Bay":"AST4ADT,M3.2.0,M11.1.0",
+  "America/Grand_Turk":"EST5EDT,M3.2.0,M11.1.0",
+  "America/Grenada":"AST4",
+  "America/Guadeloupe":"AST4",
+  "America/Guatemala":"CST6",
+  "America/Guayaquil":"<-05>5",
+  "America/Guyana":"<-04>4",
+  "America/Halifax":"AST4ADT,M3.2.0,M11.1.0",
+  "America/Havana":"CST5CDT,M3.2.0/0,M11.1.0/1",
+  "America/Hermosillo":"MST7",
+  "America/Indiana/Indianapolis":"EST5EDT,M3.2.0,M11.1.0",
+  "America/Indiana/Knox":"CST6CDT,M3.2.0,M11.1.0",
+  "America/Indiana/Marengo":"EST5EDT,M3.2.0,M11.1.0",
+  "America/Indiana/Petersburg":"EST5EDT,M3.2.0,M11.1.0",
+  "America/Indiana/Tell_City":"CST6CDT,M3.2.0,M11.1.0",
+  "America/Indiana/Vevay":"EST5EDT,M3.2.0,M11.1.0",
+  "America/Indiana/Vincennes":"EST5EDT,M3.2.0,M11.1.0",
+  "America/Indiana/Winamac":"EST5EDT,M3.2.0,M11.1.0",
+  "America/Inuvik":"MST7MDT,M3.2.0,M11.1.0",
+  "America/Iqaluit":"EST5EDT,M3.2.0,M11.1.0",
+  "America/Jamaica":"EST5",
+  "America/Juneau":"AKST9AKDT,M3.2.0,M11.1.0",
+  "America/Kentucky/Louisville":"EST5EDT,M3.2.0,M11.1.0",
+  "America/Kentucky/Monticello":"EST5EDT,M3.2.0,M11.1.0",
+  "America/Kralendijk":"AST4",
+  "America/La_Paz":"<-04>4",
+  "America/Lima":"<-05>5",
+  "America/Los_Angeles":"PST8PDT,M3.2.0,M11.1.0",
+  "America/Lower_Princes":"AST4",
+  "America/Maceio":"<-03>3",
+  "America/Managua":"CST6",
+  "America/Manaus":"<-04>4",
+  "America/Marigot":"AST4",
+  "America/Martinique":"AST4",
+  "America/Matamoros":"CST6CDT,M3.2.0,M11.1.0",
+  "America/Mazatlan":"MST7",
+  "America/Menominee":"CST6CDT,M3.2.0,M11.1.0",
+  "America/Merida":"CST6",
+  "America/Metlakatla":"AKST9AKDT,M3.2.0,M11.1.0",
+  "America/Mexico_City":"CST6",
+  "America/Miquelon":"<-03>3<-02>,M3.2.0,M11.1.0",
+  "America/Moncton":"AST4ADT,M3.2.0,M11.1.0",
+  "America/Monterrey":"CST6",
+  "America/Montevideo":"<-03>3",
+  "America/Montreal":"EST5EDT,M3.2.0,M11.1.0",
+  "America/Montserrat":"AST4",
+  "America/Nassau":"EST5EDT,M3.2.0,M11.1.0",
+  "America/New_York":"EST5EDT,M3.2.0,M11.1.0",
+  "America/Nipigon":"EST5EDT,M3.2.0,M11.1.0",
+  "America/Nome":"AKST9AKDT,M3.2.0,M11.1.0",
+  "America/Noronha":"<-02>2",
+  "America/North_Dakota/Beulah":"CST6CDT,M3.2.0,M11.1.0",
+  "America/North_Dakota/Center":"CST6CDT,M3.2.0,M11.1.0",
+  "America/North_Dakota/New_Salem":"CST6CDT,M3.2.0,M11.1.0",
+  "America/Nuuk":"<-02>2<-01>,M3.5.0/-1,M10.5.0/0",
+  "America/Ojinaga":"CST6CDT,M3.2.0,M11.1.0",
+  "America/Panama":"EST5",
+  "America/Pangnirtung":"EST5EDT,M3.2.0,M11.1.0",
+  "America/Paramaribo":"<-03>3",
+  "America/Phoenix":"MST7",
+  "America/Port-au-Prince":"EST5EDT,M3.2.0,M11.1.0",
+  "America/Port_of_Spain":"AST4",
+  "America/Porto_Velho":"<-04>4",
+  "America/Puerto_Rico":"AST4",
+  "America/Punta_Arenas":"<-03>3",
+  "America/Rainy_River":"CST6CDT,M3.2.0,M11.1.0",
+  "America/Rankin_Inlet":"CST6CDT,M3.2.0,M11.1.0",
+  "America/Recife":"<-03>3",
+  "America/Regina":"CST6",
+  "America/Resolute":"CST6CDT,M3.2.0,M11.1.0",
+  "America/Rio_Branco":"<-05>5",
+  "America/Santarem":"<-03>3",
+  "America/Santiago":"<-04>4<-03>,M9.1.6/24,M4.1.6/24",
+  "America/Santo_Domingo":"AST4",
+  "America/Sao_Paulo":"<-03>3",
+  "America/Scoresbysund":"<-02>2<-01>,M3.5.0/-1,M10.5.0/0",
+  "America/Sitka":"AKST9AKDT,M3.2.0,M11.1.0",
+  "America/St_Barthelemy":"AST4",
+  "America/St_Johns":"NST3:30NDT,M3.2.0,M11.1.0",
+  "America/St_Kitts":"AST4",
+  "America/St_Lucia":"AST4",
+  "America/St_Thomas":"AST4",
+  "America/St_Vincent":"AST4",
+  "America/Swift_Current":"CST6",
+  "America/Tegucigalpa":"CST6",
+  "America/Thule":"AST4ADT,M3.2.0,M11.1.0",
+  "America/Thunder_Bay":"EST5EDT,M3.2.0,M11.1.0",
+  "America/Tijuana":"PST8PDT,M3.2.0,M11.1.0",
+  "America/Toronto":"EST5EDT,M3.2.0,M11.1.0",
+  "America/Tortola":"AST4",
+  "America/Vancouver":"PST8PDT,M3.2.0,M11.1.0",
+  "America/Whitehorse":"MST7",
+  "America/Winnipeg":"CST6CDT,M3.2.0,M11.1.0",
+  "America/Yakutat":"AKST9AKDT,M3.2.0,M11.1.0",
+  "America/Yellowknife":"MST7MDT,M3.2.0,M11.1.0",
+  "Antarctica/Casey":"<+08>-8",
+  "Antarctica/Davis":"<+07>-7",
+  "Antarctica/DumontDUrville":"<+10>-10",
+  "Antarctica/Macquarie":"AEST-10AEDT,M10.1.0,M4.1.0/3",
+  "Antarctica/Mawson":"<+05>-5",
+  "Antarctica/McMurdo":"NZST-12NZDT,M9.5.0,M4.1.0/3",
+  "Antarctica/Palmer":"<-03>3",
+  "Antarctica/Rothera":"<-03>3",
+  "Antarctica/Syowa":"<+03>-3",
+  "Antarctica/Troll":"<+00>0<+02>-2,M3.5.0/1,M10.5.0/3",
+  "Antarctica/Vostok":"<+05>-5",
+  "Arctic/Longyearbyen":"CET-1CEST,M3.5.0,M10.5.0/3",
+  "Asia/Aden":"<+03>-3",
+  "Asia/Almaty":"<+05>-5",
+  "Asia/Amman":"<+03>-3",
+  "Asia/Anadyr":"<+12>-12",
+  "Asia/Aqtau":"<+05>-5",
+  "Asia/Aqtobe":"<+05>-5",
+  "Asia/Ashgabat":"<+05>-5",
+  "Asia/Atyrau":"<+05>-5",
+  "Asia/Baghdad":"<+03>-3",
+  "Asia/Bahrain":"<+03>-3",
+  "Asia/Baku":"<+04>-4",
+  "Asia/Bangkok":"<+07>-7",
+  "Asia/Barnaul":"<+07>-7",
+  "Asia/Beirut":"EET-2EEST,M3.5.0/0,M10.5.0/0",
+  "Asia/Bishkek":"<+06>-6",
+  "Asia/Brunei":"<+08>-8",
+  "Asia/Chita":"<+09>-9",
+  "Asia/Choibalsan":"<+08>-8",
+  "Asia/Colombo":"<+0530>-5:30",
+  "Asia/Damascus":"<+03>-3",
+  "Asia/Dhaka":"<+06>-6",
+  "Asia/Dili":"<+09>-9",
+  "Asia/Dubai":"<+04>-4",
+  "Asia/Dushanbe":"<+05>-5",
+  "Asia/Famagusta":"EET-2EEST,M3.5.0/3,M10.5.0/4",
+  "Asia/Gaza":"EET-2EEST,M3.4.4/50,M10.4.4/50",
+  "Asia/Hebron":"EET-2EEST,M3.4.4/50,M10.4.4/50",
+  "Asia/Ho_Chi_Minh":"<+07>-7",
+  "Asia/Hong_Kong":"HKT-8",
+  "Asia/Hovd":"<+07>-7",
+  "Asia/Irkutsk":"<+08>-8",
+  "Asia/Jakarta":"WIB-7",
+  "Asia/Jayapura":"WIT-9",
+  "Asia/Jerusalem":"IST-2IDT,M3.4.4/26,M10.5.0",
+  "Asia/Kabul":"<+0430>-4:30",
+  "Asia/Kamchatka":"<+12>-12",
+  "Asia/Karachi":"PKT-5",
+  "Asia/Kathmandu":"<+0545>-5:45",
+  "Asia/Khandyga":"<+09>-9",
+  "Asia/Kolkata":"IST-5:30",
+  "Asia/Krasnoyarsk":"<+07>-7",
+  "Asia/Kuala_Lumpur":"<+08>-8",
+  "Asia/Kuching":"<+08>-8",
+  "Asia/Kuwait":"<+03>-3",
+  "Asia/Macau":"CST-8",
+  "Asia/Magadan":"<+11>-11",
+  "Asia/Makassar":"WITA-8",
+  "Asia/Manila":"PST-8",
+  "Asia/Muscat":"<+04>-4",
+  "Asia/Nicosia":"EET-2EEST,M3.5.0/3,M10.5.0/4",
+  "Asia/Novokuznetsk":"<+07>-7",
+  "Asia/Novosibirsk":"<+07>-7",
+  "Asia/Omsk":"<+06>-6",
+  "Asia/Oral":"<+05>-5",
+  "Asia/Phnom_Penh":"<+07>-7",
+  "Asia/Pontianak":"WIB-7",
+  "Asia/Pyongyang":"KST-9",
+  "Asia/Qatar":"<+03>-3",
+  "Asia/Qyzylorda":"<+05>-5",
+  "Asia/Riyadh":"<+03>-3",
+  "Asia/Sakhalin":"<+11>-11",
+  "Asia/Samarkand":"<+05>-5",
+  "Asia/Seoul":"KST-9",
+  "Asia/Shanghai":"CST-8",
+  "Asia/Singapore":"<+08>-8",
+  "Asia/Srednekolymsk":"<+11>-11",
+  "Asia/Taipei":"CST-8",
+  "Asia/Tashkent":"<+05>-5",
+  "Asia/Tbilisi":"<+04>-4",
+  "Asia/Tehran":"<+0330>-3:30",
+  "Asia/Thimphu":"<+06>-6",
+  "Asia/Tokyo":"JST-9",
+  "Asia/Tomsk":"<+07>-7",
+  "Asia/Ulaanbaatar":"<+08>-8",
+  "Asia/Urumqi":"<+06>-6",
+  "Asia/Ust-Nera":"<+10>-10",
+  "Asia/Vientiane":"<+07>-7",
+  "Asia/Vladivostok":"<+10>-10",
+  "Asia/Yakutsk":"<+09>-9",
+  "Asia/Yangon":"<+0630>-6:30",
+  "Asia/Yekaterinburg":"<+05>-5",
+  "Asia/Yerevan":"<+04>-4",
+  "Atlantic/Azores":"<-01>1<+00>,M3.5.0/0,M10.5.0/1",
+  "Atlantic/Bermuda":"AST4ADT,M3.2.0,M11.1.0",
+  "Atlantic/Canary":"WET0WEST,M3.5.0/1,M10.5.0",
+  "Atlantic/Cape_Verde":"<-01>1",
+  "Atlantic/Faroe":"WET0WEST,M3.5.0/1,M10.5.0",
+  "Atlantic/Madeira":"WET0WEST,M3.5.0/1,M10.5.0",
+  "Atlantic/Reykjavik":"GMT0",
+  "Atlantic/South_Georgia":"<-02>2",
+  "Atlantic/St_Helena":"GMT0",
+  "Atlantic/Stanley":"<-03>3",
+  "Australia/Adelaide":"ACST-9:30ACDT,M10.1.0,M4.1.0/3",
+  "Australia/Brisbane":"AEST-10",
+  "Australia/Broken_Hill":"ACST-9:30ACDT,M10.1.0,M4.1.0/3",
+  "Australia/Currie":"AEST-10AEDT,M10.1.0,M4.1.0/3",
+  "Australia/Darwin":"ACST-9:30",
+  "Australia/Eucla":"<+0845>-8:45",
+  "Australia/Hobart":"AEST-10AEDT,M10.1.0,M4.1.0/3",
+  "Australia/Lindeman":"AEST-10",
+  "Australia/Lord_Howe":"<+1030>-10:30<+11>-11,M10.1.0,M4.1.0",
+  "Australia/Melbourne":"AEST-10AEDT,M10.1.0,M4.1.0/3",
+  "Australia/Perth":"AWST-8",
+  "Australia/Sydney":"AEST-10AEDT,M10.1.0,M4.1.0/3",
+  "Europe/Amsterdam":"CET-1CEST,M3.5.0,M10.5.0/3",
+  "Europe/Andorra":"CET-1CEST,M3.5.0,M10.5.0/3",
+  "Europe/Astrakhan":"<+04>-4",
+  "Europe/Athens":"EET-2EEST,M3.5.0/3,M10.5.0/4",
+  "Europe/Belgrade":"CET-1CEST,M3.5.0,M10.5.0/3",
+  "Europe/Berlin":"CET-1CEST,M3.5.0,M10.5.0/3",
+  "Europe/Bratislava":"CET-1CEST,M3.5.0,M10.5.0/3",
+  "Europe/Brussels":"CET-1CEST,M3.5.0,M10.5.0/3",
+  "Europe/Bucharest":"EET-2EEST,M3.5.0/3,M10.5.0/4",
+  "Europe/Budapest":"CET-1CEST,M3.5.0,M10.5.0/3",
+  "Europe/Busingen":"CET-1CEST,M3.5.0,M10.5.0/3",
+  "Europe/Chisinau":"EET-2EEST,M3.5.0,M10.5.0/3",
+  "Europe/Copenhagen":"CET-1CEST,M3.5.0,M10.5.0/3",
+  "Europe/Dublin":"IST-1GMT0,M10.5.0,M3.5.0/1",
+  "Europe/Gibraltar":"CET-1CEST,M3.5.0,M10.5.0/3",
+  "Europe/Guernsey":"GMT0BST,M3.5.0/1,M10.5.0",
+  "Europe/Helsinki":"EET-2EEST,M3.5.0/3,M10.5.0/4",
+  "Europe/Isle_of_Man":"GMT0BST,M3.5.0/1,M10.5.0",
+  "Europe/Istanbul":"<+03>-3",
+  "Europe/Jersey":"GMT0BST,M3.5.0/1,M10.5.0",
+  "Europe/Kaliningrad":"EET-2",
+  "Europe/Kiev":"EET-2EEST,M3.5.0/3,M10.5.0/4",
+  "Europe/Kirov":"MSK-3",
+  "Europe/Lisbon":"WET0WEST,M3.5.0/1,M10.5.0",
+  "Europe/Ljubljana":"CET-1CEST,M3.5.0,M10.5.0/3",
+  "Europe/London":"GMT0BST,M3.5.0/1,M10.5.0",
+  "Europe/Luxembourg":"CET-1CEST,M3.5.0,M10.5.0/3",
+  "Europe/Madrid":"CET-1CEST,M3.5.0,M10.5.0/3",
+  "Europe/Malta":"CET-1CEST,M3.5.0,M10.5.0/3",
+  "Europe/Mariehamn":"EET-2EEST,M3.5.0/3,M10.5.0/4",
+  "Europe/Minsk":"<+03>-3",
+  "Europe/Monaco":"CET-1CEST,M3.5.0,M10.5.0/3",
+  "Europe/Moscow":"MSK-3",
+  "Europe/Oslo":"CET-1CEST,M3.5.0,M10.5.0/3",
+  "Europe/Paris":"CET-1CEST,M3.5.0,M10.5.0/3",
+  "Europe/Podgorica":"CET-1CEST,M3.5.0,M10.5.0/3",
+  "Europe/Prague":"CET-1CEST,M3.5.0,M10.5.0/3",
+  "Europe/Riga":"EET-2EEST,M3.5.0/3,M10.5.0/4",
+  "Europe/Rome":"CET-1CEST,M3.5.0,M10.5.0/3",
+  "Europe/Samara":"<+04>-4",
+  "Europe/San_Marino":"CET-1CEST,M3.5.0,M10.5.0/3",
+  "Europe/Sarajevo":"CET-1CEST,M3.5.0,M10.5.0/3",
+  "Europe/Saratov":"<+04>-4",
+  "Europe/Simferopol":"MSK-3",
+  "Europe/Skopje":"CET-1CEST,M3.5.0,M10.5.0/3",
+  "Europe/Sofia":"EET-2EEST,M3.5.0/3,M10.5.0/4",
+  "Europe/Stockholm":"CET-1CEST,M3.5.0,M10.5.0/3",
+  "Europe/Tallinn":"EET-2EEST,M3.5.0/3,M10.5.0/4",
+  "Europe/Tirane":"CET-1CEST,M3.5.0,M10.5.0/3",
+  "Europe/Ulyanovsk":"<+04>-4",
+  "Europe/Uzhgorod":"EET-2EEST,M3.5.0/3,M10.5.0/4",
+  "Europe/Vaduz":"CET-1CEST,M3.5.0,M10.5.0/3",
+  "Europe/Vatican":"CET-1CEST,M3.5.0,M10.5.0/3",
+  "Europe/Vienna":"CET-1CEST,M3.5.0,M10.5.0/3",
+  "Europe/Vilnius":"EET-2EEST,M3.5.0/3,M10.5.0/4",
+  "Europe/Volgograd":"MSK-3",
+  "Europe/Warsaw":"CET-1CEST,M3.5.0,M10.5.0/3",
+  "Europe/Zagreb":"CET-1CEST,M3.5.0,M10.5.0/3",
+  "Europe/Zaporozhye":"EET-2EEST,M3.5.0/3,M10.5.0/4",
+  "Europe/Zurich":"CET-1CEST,M3.5.0,M10.5.0/3",
+  "Indian/Antananarivo":"EAT-3",
+  "Indian/Chagos":"<+06>-6",
+  "Indian/Christmas":"<+07>-7",
+  "Indian/Cocos":"<+0630>-6:30",
+  "Indian/Comoro":"EAT-3",
+  "Indian/Kerguelen":"<+05>-5",
+  "Indian/Mahe":"<+04>-4",
+  "Indian/Maldives":"<+05>-5",
+  "Indian/Mauritius":"<+04>-4",
+  "Indian/Mayotte":"EAT-3",
+  "Indian/Reunion":"<+04>-4",
+  "Pacific/Apia":"<+13>-13",
+  "Pacific/Auckland":"NZST-12NZDT,M9.5.0,M4.1.0/3",
+  "Pacific/Bougainville":"<+11>-11",
+  "Pacific/Chatham":"<+1245>-12:45<+1345>,M9.5.0/2:45,M4.1.0/3:45",
+  "Pacific/Chuuk":"<+10>-10",
+  "Pacific/Easter":"<-06>6<-05>,M9.1.6/22,M4.1.6/22",
+  "Pacific/Efate":"<+11>-11",
+  "Pacific/Enderbury":"<+13>-13",
+  "Pacific/Fakaofo":"<+13>-13",
+  "Pacific/Fiji":"<+12>-12",
+  "Pacific/Funafuti":"<+12>-12",
+  "Pacific/Galapagos":"<-06>6",
+  "Pacific/Gambier":"<-09>9",
+  "Pacific/Guadalcanal":"<+11>-11",
+  "Pacific/Guam":"ChST-10",
+  "Pacific/Honolulu":"HST10",
+  "Pacific/Kiritimati":"<+14>-14",
+  "Pacific/Kosrae":"<+11>-11",
+  "Pacific/Kwajalein":"<+12>-12",
+  "Pacific/Majuro":"<+12>-12",
+  "Pacific/Marquesas":"<-0930>9:30",
+  "Pacific/Midway":"SST11",
+  "Pacific/Nauru":"<+12>-12",
+  "Pacific/Niue":"<-11>11",
+  "Pacific/Norfolk":"<+11>-11<+12>,M10.1.0,M4.1.0/3",
+  "Pacific/Noumea":"<+11>-11",
+  "Pacific/Pago_Pago":"SST11",
+  "Pacific/Palau":"<+09>-9",
+  "Pacific/Pitcairn":"<-08>8",
+  "Pacific/Pohnpei":"<+11>-11",
+  "Pacific/Port_Moresby":"<+10>-10",
+  "Pacific/Rarotonga":"<-10>10",
+  "Pacific/Saipan":"ChST-10",
+  "Pacific/Tahiti":"<-10>10",
+  "Pacific/Tarawa":"<+12>-12",
+  "Pacific/Tongatapu":"<+13>-13",
+  "Pacific/Wake":"<+12>-12",
+  "Pacific/Wallis":"<+12>-12",
+
+  "Etc/UTC":"UTC0",
+  "Etc/GMT":"GMT0",
+  "Etc/GMT+1":"<-01>1",
+  "Etc/GMT+2":"<-02>2",
+  "Etc/GMT+3":"<-03>3",
+  "Etc/GMT+4":"<-04>4",
+  "Etc/GMT+5":"<-05>5",
+  "Etc/GMT+6":"<-06>6",
+  "Etc/GMT+7":"<-07>7",
+  "Etc/GMT+8":"<-08>8",
+  "Etc/GMT+9":"<-09>9",
+  "Etc/GMT+10":"<-10>10",
+  "Etc/GMT+11":"<-11>11",
+  "Etc/GMT+12":"<-12>12",
+  "Etc/GMT-1":"<+01>-1",
+  "Etc/GMT-2":"<+02>-2",
+  "Etc/GMT-3":"<+03>-3",
+  "Etc/GMT-4":"<+04>-4",
+  "Etc/GMT-5":"<+05>-5",
+  "Etc/GMT-6":"<+06>-6",
+  "Etc/GMT-7":"<+07>-7",
+  "Etc/GMT-8":"<+08>-8",
+  "Etc/GMT-9":"<+09>-9",
+  "Etc/GMT-10":"<+10>-10",
+  "Etc/GMT-11":"<+11>-11",
+  "Etc/GMT-12":"<+12>-12",
+  "Etc/GMT-13":"<+13>-13",
+  "Etc/GMT-14":"<+14>-14",
+  "Etc/Zulu":"UTC0"
+}
Author	SHA1	Message	Date
Yurii	dd53d1ef3e	chore: bump version to 1.5.4	2025-03-06 19:15:56 +03:00
Yurii	3bd8010b74	refactor: BLE device support for ESP32 C6 (#147 ) Building on ``Arduino``+``ESP-IDF`` with ``h2zero/esp-nimble-cpp`` for ESP32 C6	2025-03-06 04:45:13 +03:00
Yurii	6a26e27d39	refactor: heating temperature step changed * step changed to 0.1 * added processing of long presses on thermostats in the dashboard	2025-03-06 04:29:01 +03:00
Yurii	8fa440810c	refactor: status BLE sensors	2025-03-05 02:28:17 +03:00
Yurii	95b18385ba	chore: gitignore update	2025-03-04 17:50:59 +03:00
Yurii	4457e16a8f	refactor: increased opentherm disconnect timeout	2025-02-27 12:48:27 +03:00
Yurii	1965ca671e	chore: bump pioarduino/platform-espressif32 from 3.1.2 to 3.1.3	2025-02-20 16:50:06 +03:00
Yurii	0d1873ec77	fix: set SSID on click in table of available networks fixed	2025-02-17 19:37:51 +03:00
Yurii	38ec56fb33	fix: working with ``Sensors::Type::MANUAL`` sensors fixed	2025-02-17 18:58:01 +03:00
Yurii	bb7c3eeba3	feat: added mDNS settings	2025-02-15 00:05:10 +03:00
Yurii	0c778d4c7f	refactor: added ``robots.txt`` to disallow indexing	2025-02-14 23:43:25 +03:00
Yurii	2e5e5e59a8	feat: added mDNS	2025-02-14 07:43:52 +03:00
Yurii	e1623e7b63	chore: bump pioarduino/platform-espressif32 from 3.1.1 to 3.1.2	2025-02-14 06:34:46 +03:00
Yurii	80b91d9a01	feat: generate ``network.hostname` `and` `settings.mqtt.prefix`` if they are empty	2025-02-03 06:38:36 +03:00
Roman Andriadi	25b70e4db5	refactor: allow up to 100x correction of sensor values (#137 )	2025-02-03 04:56:00 +03:00
Yurii	1903ee2bc7	chore: bump version to 1.5.3	2025-02-02 08:09:20 +03:00
Yurii	916a710064	refactor: improved connection to wifi	2025-01-30 21:46:06 +03:00
Yurii	38acae417d	refactor: reworked BLE sensors * add clean unused ble instances * moved subscribe to notify to another method * set date/time on BLE sensors	2025-01-30 01:46:55 +03:00
Yurii	3bc9fa81a8	feat: added ntp server and timezone settings	2025-01-30 01:25:05 +03:00
Yurii	cc2d6ef385	fix: increase keep alive timeout for mqtt #115	2025-01-24 21:07:08 +03:00
Yurii	fe93c00204	chore: locale correction for pid deadband	2025-01-24 06:42:22 +03:00
Yurii	05a2d080be	refactor: default pid coefficients changed	2025-01-24 06:38:10 +03:00
Yurii	664bd7938c	fix: sensors pos from 1 on Sensors settings page	2025-01-24 04:48:59 +03:00
Yurii	a78f35328f	refactor: increased timeout for nimble	2025-01-24 04:48:09 +03:00
Yurii	eab47af0e1	refactor: added ``CONFIG_BT_NIMBLE_EXT_ADV=1` `to` `build_flags`` for esp32 s3, esp32 c3	2025-01-24 04:47:29 +03:00
Yurii	c524abd959	refactor: trying to improve connection to BLE devices	2025-01-24 03:17:14 +03:00
Yurii	666786fd65	refactor: small fixes	2025-01-24 03:15:15 +03:00
Yurii	8475833dce	feat: added deadband for pid	2025-01-24 01:43:52 +03:00
Yurii	afe710abd3	fix: ``inputmode`` attribute fixed for pid min temp on settings page	2025-01-20 03:48:54 +03:00
Yurii	1982843624	chore: bump version to 1.5.2	2025-01-19 22:44:52 +03:00
Yurii	bf161c1200	feat: added Italian locale by @bredy73 #132	2025-01-19 22:20:16 +03:00
Yurii	57f1129cee	style: formatting	2025-01-14 06:22:04 +03:00
Yurii	0425cdc499	refactor: prohibition of enabling portal auth with an empty login or password	2025-01-14 06:21:32 +03:00
Yurii	53ff69f03a	fix: removed ``required`` attribute for optional parameters on settings page #128	2025-01-14 06:16:15 +03:00
Yurii	e7cae4b950	refactor: improved OT bus reset	2025-01-13 10:56:19 +03:00
Yurii	3ff8f40654	refactor: sensors pos from 1 on ``Sensors settings`` page	2025-01-13 01:26:22 +03:00
Yurii	d2499a2727	docs: update readme	2025-01-13 01:02:07 +03:00
Yurii	5b7da4ed2a	fix: typo	2025-01-09 20:44:12 +03:00
Yurii	8d516c7f95	refactor: optimized work with etag	2025-01-09 19:35:56 +03:00
Yurii	d756716497	chore: bump pioarduino/platform-espressif32 from 3.1.0 to 3.1.1	2025-01-09 19:35:24 +03:00
Stefan S	9a2f9d64ec	feat: add support board "OT Thing" (#123 ) * Add board "OT Thing" * style: formatting --------- Co-authored-by: Yurii <34578544+Laxilef@users.noreply.github.com>	2025-01-08 23:41:06 +03:00
Yurii	0d0926cdac	chore: update README	2025-01-07 07:14:19 +03:00
Yurii	3ce3ce5016	chore: move web flasher to ``gh-pages`` branch	2025-01-07 06:53:08 +03:00
Yurii	6ca6d3cab7	chore: added web flasher	2025-01-07 06:22:41 +03:00
Yurii	e7f3c66e05	chore: bump version to 1.5.1	2025-01-05 21:45:28 +03:00
Yurii	17bd31b2a2	feat: added OT option ``Sync max heating temp with target temp``	2025-01-05 17:32:10 +03:00
Yurii	8662b9dc8f	chore: update pcb for smt	2025-01-05 01:55:34 +03:00
Yurii	6efa3a52fe	refactor: added OT bus reset; increased timings for changing OT status	2025-01-05 01:39:36 +03:00
Yurii	7e31de6c71	fix: typo	2025-01-02 23:21:54 +03:00
Yurii	b53dae6a43	fix: ``inputmode`` attribute fixed for float settings #117	2024-12-31 01:48:44 +03:00
Yurii	de2318bc6a	refactor: compatibility with ArduinoJson 7.3.0	2024-12-30 23:12:31 +03:00
Yurii	081209420a	chore: bump bblanchon/ArduinoJson from 7.1.0 to 7.3.0	2024-12-30 23:11:14 +03:00
Yurii	75bc4d5c4a	feat: ability to reset fault on the dashboard	2024-12-26 19:37:39 +03:00
Yurii	527e9cc1d6	feat: added OT option ``Heating state as summer/winter mode``	2024-12-25 19:30:09 +03:00
Yurii	60b7caf4bc	fix: typo	2024-12-25 19:25:22 +03:00
Yurii	e8d0ad0a4e	refactor: improved work with clones (not original) of DS18B20 sensors	2024-12-23 11:37:54 +03:00
Yurii	afe269aeff	fix: ``Content-Length`` for pretty json for chunked response	2024-12-23 11:08:37 +03:00
Yurii	4702909043	fix: BLE power 9 dbm with NimBLE-Arduino 2.1.x	2024-12-18 21:58:45 +03:00
Yurii	4c32ccc450	fix: ``Content-Length`` on esp32 for chunked response	2024-12-18 20:53:33 +03:00
Yurii	2e3b38e14f	refactor: compatibility with NimBLE-Arduino 2.1.x	2024-12-17 11:24:49 +03:00
Yurii	b6c80f355f	Merge branch 'master' of https://github.com/Laxilef/OTGateway	2024-12-17 11:22:13 +03:00
github-actions[bot]	65b2a3c2bd	chore: bump NimBLE-Arduino from 1.4.3 to 2.1.0 Co-authored-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com>	2024-12-17 11:21:04 +03:00
Yurii	0cb361d243	refactor: OT option ``heatingCh2Enabled` `has been renamed to` `ch2AlwaysEnabled``	2024-12-17 10:30:06 +03:00
Yurii	c7f54ca4fb	chore: bump pioarduino/platform-espressif32 from 3.1.0 rc3 to 3.1.0	2024-12-17 09:45:10 +03:00
Yurii	1d46176b5e	chore: update pcb	2024-12-17 04:00:29 +03:00
Yurii	5e2f6c9cea	refactor: optimization of the web portal layout	2024-12-16 00:43:32 +03:00
Yurii	f439f8c5ba	feat: added OT cooling support flag * refactoring OT settings struct * renamed some OT settings	2024-12-15 14:24:05 +03:00