8 Commits

Author SHA1 Message Date
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
17 changed files with 297 additions and 260 deletions

Binary file not shown.

Before

Width:  |  Height:  |  Size: 290 KiB

After

Width:  |  Height:  |  Size: 283 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 380 KiB

After

Width:  |  Height:  |  Size: 386 KiB

Binary file not shown.

Binary file not shown.

View File

@@ -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
@@ -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
@@ -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:20241217035901+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 [ <A3E4774EF492C13E9BEE4782370DB042> <A3E4774EF492C13E9BEE4782370DB042> ]
/ID [ <0FF718394C008026CB860ADB87CB39D7> <0FF718394C008026CB860ADB87CB39D7> ]
>>
startxref
266667

Binary file not shown.

View File

@@ -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) {
this->yieldCallback = callback;
CustomOpenTherm* setDelayCallback(DelayCallback callback = nullptr) {
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) {
this->yieldCallback();
} else {
::yield();
if (this->delayCallback) {
this->delayCallback(150);
}
this->process();
@@ -51,17 +67,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 +163,8 @@ public:
}
protected:
YieldCallback yieldCallback;
DelayCallback delayCallback;
BeforeSendRequestCallback beforeSendRequestCallback;
AfterSendRequestCallback afterSendRequestCallback;
int _outPin;
};

View File

@@ -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

View File

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

View File

@@ -98,8 +98,8 @@ protected:
}
});
this->instance->setYieldCallback([this]() {
this->delay(25);
this->instance->setDelayCallback([this](unsigned int time) {
this->delay(time);
});
this->instance->begin();
@@ -203,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
@@ -248,6 +248,8 @@ protected:
vars.slave.diag.active = false;
vars.slave.diag.code = 0;
this->instance->reset();
return;
}
@@ -1019,14 +1021,16 @@ protected:
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"));
}
}
// Set target heating temp

View File

@@ -67,6 +67,7 @@ struct Settings {
bool dhwToCh2 = false;
bool dhwBlocking = false;
bool modulationSyncWithHeating = false;
bool maxTempSyncWithTargetTemp = true;
bool getMinMaxTemp = true;
bool nativeHeatingControl = false;
bool immergasFix = false;

View File

@@ -118,6 +118,7 @@ const char S_MAX_FREE_BLOCK[] PROGMEM = "maxFreeBlock";
const char S_MAX_MODULATION[] PROGMEM = "maxModulation";
const char S_MAX_POWER[] PROGMEM = "maxPower";
const char S_MAX_TEMP[] PROGMEM = "maxTemp";
const char S_MAX_TEMP_SYNC_WITH_TARGET_TEMP[] PROGMEM = "maxTempSyncWithTargetTemp";
const char S_MEMBER_ID[] PROGMEM = "memberId";
const char S_MIN[] PROGMEM = "min";
const char S_MIN_FREE[] PROGMEM = "minFree";

View File

@@ -388,6 +388,7 @@ void settingsToJson(const Settings& src, JsonVariant dst, bool safe = false) {
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;
@@ -821,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>();

View File

@@ -378,6 +378,7 @@
"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"
},

View File

@@ -193,7 +193,7 @@
"purpose": "Назначение",
"purposes": {
"outdoorTemp": "Внешняя температура",
"indoorTemp": "Внутреняя температура",
"indoorTemp": "Внутренняя температура",
"heatTemp": "Отопление, температура",
"heatRetTemp": "Отопление, температура обратки",
"dhwTemp": "ГВС, температура",
@@ -378,6 +378,7 @@
"dhwToCh2": "Дублировать параметры ГВС в канал 2",
"dhwBlocking": "DHW blocking",
"modulationSyncWithHeating": "Синхронизировать модуляцию с отоплением",
"maxTempSyncWithTargetTemp": "Синхронизировать макс. темп. отопления с целевой темп.",
"getMinMaxTemp": "Получать мин. и макс. температуру от котла",
"immergasFix": "Фикс для котлов Immergas"
},

View File

@@ -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>

View File

@@ -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>
@@ -449,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>
@@ -715,6 +720,7 @@
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);