chore: bump version to 1.5.1

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

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

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->setContentLength(contentLength);
-    this->webServer->sendHeader(F("Content-Length"), String(measureJson(content)));
     this->webServer->send(code, contentType, emptyString);
     #endif
 

lib/CustomOpenTherm/CustomOpenTherm.h

@@ -3,15 +3,17 @@
 
 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(int inPin = 4, int outPin = 5, bool isSlave = false) : OpenTherm(inPin, outPin, isSlave) {
+    this->_outPin = outPin;
+  }
   ~CustomOpenTherm() {}
 
-  CustomOpenTherm* setYieldCallback(YieldCallback callback = nullptr) {
+  CustomOpenTherm* setDelayCallback(DelayCallback callback = nullptr) {
-    this->yieldCallback = callback;
+    this->delayCallback = callback;
 
     return this;
   }
@@ -28,14 +30,28 @@ public:
     return this;
   }
 
+  void reset() {
+    if (this->status == OpenThermStatus::NOT_INITIALIZED) {
+      return;
+    }
+
+    this->end();
+    this->status = OpenThermStatus::NOT_INITIALIZED;
+
+    digitalWrite(this->_outPin, LOW);
+    if (this->delayCallback) {
+      this->delayCallback(1000);
+    }
+    
+    this->begin();
+  }
+
   unsigned long sendRequest(unsigned long request, byte attempts = 5, byte _attempt = 0) {
     _attempt++;
 
     while (!this->isReady()) {
-      if (this->yieldCallback) {
+      if (this->delayCallback) {
-        this->yieldCallback();
+        this->delayCallback(150);
-      } else {
-        ::yield();
       }
 
       this->process();
@@ -51,17 +67,13 @@ public:
       _response = 0;
 
     } else {
-      while (true) {
+      do {
-        this->process();
+        if (this->delayCallback) {
-
+          this->delayCallback(150);
-        if (this->status == OpenThermStatus::READY || this->status == OpenThermStatus::DELAY) {
-          break;
-        } else if (this->yieldCallback) {
-          this->yieldCallback();
-        } else {
-          ::yield();
         }
-      }
+
+        this->process();
+      } while (this->status != OpenThermStatus::READY && this->status != OpenThermStatus::DELAY);
 
       _response = this->getLastResponse();
       _responseStatus = this->getLastResponseStatus();
@@ -151,7 +163,8 @@ public:
   }
 
 protected:
-  YieldCallback yieldCallback;
+  DelayCallback delayCallback;
   BeforeSendRequestCallback beforeSendRequestCallback;
   AfterSendRequestCallback afterSendRequestCallback;
+  int _outPin;
 };

platformio.ini

@@ -14,10 +14,10 @@ extra_configs = secrets.default.ini
 core_dir = .pio
 
 [env]
-version = 1.5.0
+version = 1.5.1
 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
@@ -85,13 +85,13 @@ board_build.ldscript = eagle.flash.4m1m.ld
 ;platform_packages = 
 ;  framework-arduinoespressif32 @ https://github.com/espressif/arduino-esp32.git#3.0.5
 ;  framework-arduinoespressif32-libs @ https://github.com/espressif/esp32-arduino-lib-builder/releases/download/idf-release_v5.1/esp32-arduino-libs-idf-release_v5.1-33fbade6.zip
-platform = https://github.com/pioarduino/platform-espressif32/releases/download/53.03.10-rc3/platform-espressif32.zip
+platform = https://github.com/pioarduino/platform-espressif32/releases/download/53.03.10/platform-espressif32.zip
 platform_packages =
 board_build.partitions = esp32_partitions.csv
 lib_deps =
 	${env.lib_deps}
 	laxilef/ESP32Scheduler@^1.0.1
-nimble_lib = h2zero/NimBLE-Arduino@^1.4.2
+nimble_lib = h2zero/NimBLE-Arduino@^2.1.0
 lib_ignore = 
 extra_scripts = 
 	post:tools/esp32.py

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

src/OpenThermTask.h

@@ -98,8 +98,8 @@ protected:
       }
     });
 
-    this->instance->setYieldCallback([this]() {
+    this->instance->setDelayCallback([this](unsigned int time) {
-      this->delay(25);
+      this->delay(time);
     });
 
     this->instance->begin();
@@ -157,7 +157,7 @@ protected:
     vars.master.dhw.targetTemp = settings.dhw.target;
 
     // CH2 settings
-    vars.master.ch2.enabled = settings.opentherm.options.heatingCh2Enabled
+    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);
 
@@ -178,13 +178,19 @@ protected:
       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,
       settings.opentherm.options.coolingSupport,
       settings.opentherm.options.nativeHeatingControl,
       vars.master.ch2.enabled,
-      settings.opentherm.options.summerWinterMode,
+      summerWinterMode,
       settings.opentherm.options.dhwBlocking,
       statusLb
     );
@@ -197,12 +203,12 @@ protected:
       );
     }
 
-    if (!vars.slave.connected && millis() - this->lastSuccessResponse < 1150) {
+    if (!vars.slave.connected && millis() - this->lastSuccessResponse < 1325) {
       Log.sinfoln(FPSTR(L_OT), F("Connected"));
       
       vars.slave.connected = true;
       
-    } else if (vars.slave.connected && millis() - this->lastSuccessResponse > 1150) {
+    } else if (vars.slave.connected && millis() - this->lastSuccessResponse > 1325) {
       Log.swarningln(FPSTR(L_OT), F("Disconnected"));
 
       // Mark sensors as disconnected
@@ -242,6 +248,8 @@ protected:
       vars.slave.diag.active = false;
       vars.slave.diag.code = 0;
 
+      this->instance->reset();
+
       return;
     }
 
@@ -1013,14 +1021,16 @@ protected:
 
       if (this->needSetHeatingTemp(convertedTemp)) {
         // Set max heating temp
-        if (this->setMaxHeatingTemp(convertedTemp)) {
+        if (settings.opentherm.options.maxTempSyncWithTargetTemp) {
-          Log.sinfoln(
+          if (this->setMaxHeatingTemp(convertedTemp)) {
-            FPSTR(L_OT_HEATING), F("Set max heating temp: %.2f (converted: %.2f)"),
+            Log.sinfoln(
-            vars.master.heating.setpointTemp, convertedTemp
+              FPSTR(L_OT_HEATING), F("Set max heating temp: %.2f (converted: %.2f)"),
-          );
+              vars.master.heating.setpointTemp, convertedTemp
+            );
 
-        } else {
+          } else {
-          Log.swarningln(FPSTR(L_OT_HEATING), F("Failed set max heating temp"));
+            Log.swarningln(FPSTR(L_OT_HEATING), F("Failed set max heating temp"));
+          }
         }
 
         // Set target heating temp

src/SensorsTask.h

@@ -175,16 +175,19 @@ protected:
         continue;
       }
 
-      if (millis() - this->dallasSearchTime[gpio] > this->dallasSearchInterval) {
+      if (millis() - this->dallasSearchTime[gpio] < this->dallasSearchInterval) {
-        this->dallasSearchTime[gpio] = millis();
+        continue;
-        instance.begin();
-
-        Log.straceln(
-          FPSTR(L_SENSORS_DALLAS),
-          F("GPIO %hhu, devices on bus: %hhu, DS18* devices: %hhu"),
-          gpio, instance.getDeviceCount(), instance.getDS18Count()
-        );
       }
+
+      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,26 +277,15 @@ protected:
       unsigned long ts = millis();
 
       if (this->dallasPolling[gpio]) {
-        auto minPollingTime = instance.millisToWaitForConversion(12);
+        auto minPollingTime = instance.millisToWaitForConversion(12) * 2;
         unsigned long estimatePollingTime = ts - this->dallasLastPollingTime[gpio];
 
         // check conversion time
+        // isConversionComplete does not work with chinese clones!
         if (estimatePollingTime < minPollingTime) {
           continue;
         }
 
-        // 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++) {
           auto& sSensor = Sensors::settings[sensorId];
@@ -345,28 +337,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();
@@ -380,10 +350,10 @@ protected:
 
   void pollingBleSensors() {
     #if USE_BLE
-    if (!NimBLEDevice::getInitialized() && millis() > 5000) {
+    if (!NimBLEDevice::isInitialized() && millis() > 5000) {
       Log.sinfoln(FPSTR(L_SENSORS_BLE), F("Initialized"));
       BLEDevice::init("");
-      NimBLEDevice::setPower(ESP_PWR_LVL_P9);
+      NimBLEDevice::setPower(9);
     }
 
     for (uint8_t sensorId = 0; sensorId <= Sensors::getMaxSensorId(); sensorId++) {
@@ -445,7 +415,7 @@ protected:
 
   bool connectToBleDevice(const uint8_t sensorId) {
     #if USE_BLE
-    if (!NimBLEDevice::getInitialized()) {
+    if (!NimBLEDevice::isInitialized()) {
       return false;
     }
 
@@ -460,7 +430,7 @@ protected:
       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);
@@ -470,12 +440,13 @@ protected:
     }
 
     if (pClient == nullptr) {
-      if (NimBLEDevice::getClientListSize() >= NIMBLE_MAX_CONNECTIONS) {
+      if (NimBLEDevice::getCreatedClientCount() >= NIMBLE_MAX_CONNECTIONS) {
         return false;
       }
 
       pClient = NimBLEDevice::createClient();
-      pClient->setConnectTimeout(5);
+      pClient->setConnectTimeout(5000);
+      pClient->setSelfDelete(false, true);
     }
 
     if(pClient->isConnected()) {
@@ -492,7 +463,6 @@ protected:
         sensorId, sSensor.name, address.toString().c_str()
       );
 
-      NimBLEDevice::deleteClient(pClient);
       return false;
     }
 
@@ -536,7 +506,7 @@ protected:
               return;
             }
 
-            NimBLERemoteService* pService = pChar->getRemoteService();
+            const NimBLERemoteService* pService = pChar->getRemoteService();
             if (pService == nullptr) {
               return;
             }
@@ -609,7 +579,7 @@ protected:
               return;
             }
 
-            NimBLERemoteService* pService = pChar->getRemoteService();
+            const NimBLERemoteService* pService = pChar->getRemoteService();
             if (pService == nullptr) {
               return;
             }
@@ -694,7 +664,7 @@ protected:
                 return;
               }
 
-              NimBLERemoteService* pService = pChar->getRemoteService();
+              const NimBLERemoteService* pService = pChar->getRemoteService();
               if (pService == nullptr) {
                 return;
               }
@@ -793,7 +763,7 @@ protected:
                 return;
               }
 
-              NimBLERemoteService* pService = pChar->getRemoteService();
+              const NimBLERemoteService* pService = pChar->getRemoteService();
               if (pService == nullptr) {
                 return;
               }

src/Settings.h

@@ -61,11 +61,13 @@ struct Settings {
       bool dhwSupport = true;
       bool coolingSupport = false;
       bool summerWinterMode = false;
-      bool heatingCh2Enabled = true;
+      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;

src/strings.h

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

src/utils.h

@@ -382,11 +382,13 @@ void settingsToJson(const Settings& src, JsonVariant dst, bool safe = false) {
     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_CH2_ENABLED)] = src.opentherm.options.heatingCh2Enabled;
+    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;
@@ -748,13 +750,22 @@ bool jsonToSettings(const JsonVariantConst src, Settings& dst, bool safe = false
       }
     }
 
-    if (src[FPSTR(S_OPENTHERM)][FPSTR(S_OPTIONS)][FPSTR(S_HEATING_CH2_ENABLED)].is<bool>()) {
+    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_CH2_ENABLED)].as<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.heatingCh2Enabled) {
+      if (value != dst.opentherm.options.heatingStateToSummerWinterMode) {
-        dst.opentherm.options.heatingCh2Enabled = value;
+        dst.opentherm.options.heatingStateToSummerWinterMode = value;
+        changed = true;
+      }
+    }
 
-        if (dst.opentherm.options.heatingCh2Enabled) {
+    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;
         }
@@ -770,7 +781,7 @@ bool jsonToSettings(const JsonVariantConst src, Settings& dst, bool safe = false
         dst.opentherm.options.heatingToCh2 = value;
 
         if (dst.opentherm.options.heatingToCh2) {
-          dst.opentherm.options.heatingCh2Enabled = false;
+          dst.opentherm.options.ch2AlwaysEnabled = false;
           dst.opentherm.options.dhwToCh2 = false;
         }
 
@@ -785,7 +796,7 @@ bool jsonToSettings(const JsonVariantConst src, Settings& dst, bool safe = false
         dst.opentherm.options.dhwToCh2 = value;
 
         if (dst.opentherm.options.dhwToCh2) {
-          dst.opentherm.options.heatingCh2Enabled = false;
+          dst.opentherm.options.ch2AlwaysEnabled = false;
           dst.opentherm.options.heatingToCh2 = false;
         }
 
@@ -811,6 +822,15 @@ bool jsonToSettings(const JsonVariantConst src, Settings& dst, bool safe = false
       }
     }
 
+    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.options.maxTempSyncWithTargetTemp) {
+        dst.opentherm.options.maxTempSyncWithTargetTemp = value;
+        changed = true;
+      }
+    }
+
     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>();
 

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",
@@ -99,7 +111,7 @@
         "sFlame": "Flame",
         "sCooling": "Cooling",
         "sFaultActive": "Fault",
-        "sFaultCode": "Faul code",
+        "sFaultCode": "Fault code",
         "sDiagActive": "Diagnostic",
         "sDiagCode": "Diagnostic code",
         
@@ -360,11 +372,13 @@
           "dhwSupport": "DHW support",
           "coolingSupport": "Cooling support",
           "summerWinterMode": "Summer/winter mode",
-          "heatingCh2Enabled": "Heating CH2 always enabled",
+          "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"
         },

src_data/locales/ru.json

@@ -87,6 +87,18 @@
         "turbo": "Турбо"
       },
 
+      "notify": {
+        "fault": {
+          "title": "Состояние неисправности котла активно!",
+          "note": "Рекомендуется осмотреть котел и изучить документацию котла для расшифровки кода неисправности:"
+        },
+        "diag": {
+          "title": "Состояние диагностики котла активно!",
+          "note": "Возможно, вашему котлу требуется проверка? Рекомендуется изучить документацию котла для расшифровки кода диагностики:"
+        },
+        "reset": "Сбросить"
+      },
+
       "states": {
         "mNetworkConnected": "Подключение к сети",
         "mMqttConnected": "Подключение к MQTT",
@@ -181,7 +193,7 @@
       "purpose": "Назначение",
       "purposes": {
         "outdoorTemp": "Внешняя температура",
-        "indoorTemp": "Внутреняя температура",
+        "indoorTemp": "Внутренняя температура",
         "heatTemp": "Отопление, температура",
         "heatRetTemp": "Отопление, температура обратки",
         "dhwTemp": "ГВС, температура",
@@ -360,11 +372,13 @@
           "dhwSupport": "Поддержка ГВС",
           "coolingSupport": "Поддержка охлаждения",
           "summerWinterMode": "Летний/зимний режим",
-          "heatingCh2Enabled": "Канал 2 отопления всегда вкл.",
+          "heatingStateToSummerWinterMode": "Летний/зимний режим в качестве состояния отопления",
+          "ch2AlwaysEnabled": "Канал 2 всегда вкл.",
           "heatingToCh2": "Дублировать параметры отопления в канал 2",
           "dhwToCh2": "Дублировать параметры ГВС в канал 2",
           "dhwBlocking": "DHW blocking",
           "modulationSyncWithHeating": "Синхронизировать модуляцию с отоплением",
+          "maxTempSyncWithTargetTemp": "Синхронизировать макс. темп. отопления с целевой темп.",
           "getMinMaxTemp": "Получать мин. и макс. температуру от котла",
           "immergasFix": "Фикс для котлов Immergas"
         },

src_data/pages/dashboard.html

@@ -71,6 +71,36 @@
                 </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 />
@@ -358,6 +388,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;
 
@@ -494,6 +578,13 @@
                 : "-"
             );
 
+            if (result.slave.fault.active) {
+              show(".notify-fault");
+
+            } else {
+              hide('.notify-fault');
+            }
+
             setStatus(
               '.sDiagActive',
               result.slave.diag.active ? "success" : "error",
@@ -506,6 +597,13 @@
                 : "-"
             );
 
+            if (result.slave.diag.active) {
+              show(".notify-diag");
+
+            } else {
+              hide('.notify-diag');
+            }
+
 
             // MASTER
             setState('.mHeatEnabled', result.master.heating.enabled);

src_data/pages/sensors.html

@@ -134,12 +134,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="10" step="0.01" required>
                   </label>
                 </div>
               </details>
@@ -159,7 +159,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>

src_data/pages/settings.html

@@ -170,12 +170,12 @@
               <div class="grid">
                 <label>
                   <span data-i18n>settings.heating.hyst</span>
-                  <input type="number" inputmode="numeric" 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>
                   <span data-i18n>settings.heating.turboFactor</span>
-                  <input type="number" inputmode="numeric" 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>
 
@@ -254,17 +254,17 @@
               <div class="grid">
                 <label>
                   <span data-i18n>settings.equitherm.n</span>
-                  <input type="number" inputmode="numeric" 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>
                   <span data-i18n>settings.equitherm.k</span>
-                  <input type="number" inputmode="numeric" 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>
                   <span data-i18n>settings.equitherm.t.title</span>
-                  <input type="number" inputmode="numeric" 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>
@@ -291,17 +291,17 @@
               <div class="grid">
                 <label>
                   <span data-i18n>settings.pid.p</span>
-                  <input type="number" inputmode="numeric" 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>
                   <span data-i18n>settings.pid.i</span>
-                  <input type="number" inputmode="numeric" 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>
                   <span data-i18n>settings.pid.d</span>
-                  <input type="number" inputmode="numeric" 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>
 
@@ -390,13 +390,13 @@
               <div class="grid">
                 <label>
                   <span data-i18n>settings.ot.minPower.title</span>
-                  <input type="number" inputmode="numeric" 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>
                   <span data-i18n>settings.ot.maxPower.title</span>
-                  <input type="number" inputmode="numeric" 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>
@@ -420,8 +420,13 @@
                 </label>
 
                 <label>
-                  <input type="checkbox" name="opentherm[options][heatingCh2Enabled]" value="true">
+                  <input type="checkbox" name="opentherm[options][heatingStateToSummerWinterMode]" value="true">
-                  <span data-i18n>settings.ot.options.heatingCh2Enabled</span>
+                  <span data-i18n>settings.ot.options.heatingStateToSummerWinterMode</span>
+                </label>
+
+                <label>
+                  <input type="checkbox" name="opentherm[options][ch2AlwaysEnabled]" value="true">
+                  <span data-i18n>settings.ot.options.ch2AlwaysEnabled</span>
                 </label>
 
                 <label>
@@ -444,6 +449,11 @@
                   <span data-i18n>settings.ot.options.modulationSyncWithHeating</span>
                 </label>
 
+                <label>
+                  <input type="checkbox" name="opentherm[options][maxTempSyncWithTargetTemp]" value="true">
+                  <span data-i18n>settings.ot.options.maxTempSyncWithTargetTemp</span>
+                </label>
+
                 <label>
                   <input type="checkbox" name="opentherm[options][getMinMaxTemp]" value="true">
                   <span data-i18n>settings.ot.options.getMinMaxTemp</span>
@@ -704,11 +714,13 @@
           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][heatingCh2Enabled]']", data.opentherm.options.heatingCh2Enabled);
+          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);

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-] {