Skip to content

Commit 54b3a27

Browse files
bouwewbouwew
authored
Merge pull request #888 from plugwise/water_heater_2
Further improvement on HA water_heater related output data
2 parents e67106e + 159b22d commit 54b3a27

62 files changed

Lines changed: 1128 additions & 709 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎CHANGELOG.md‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,9 @@
11
# Changelog
22

3-
## Ongoing
3+
## v1.13.0
44

5+
- Improve on v1.12.0 update by outputting dedicated boiler_ and dhw_temperature dicts with current-key added. Rename dhw_mode off to eco for standard cv-heaters.
6+
Via PR [#888](https://github.com/plugwise/python-plugwise/pull/888)
57
- Add PEP 740 digital attestations (workaround until included in `uv publish`), pin GitHub acions including our own from gh-actions, via PR [#891](https://github.com/plugwise/python-plugwise/pull/891)
68
- Solve aiohttp BasicAuth deprecation via PR [#890](https://github.com/plugwise/python-plugwise/pull/890)
79

‎fixtures/adam_bad_thermostat/data.json‎

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -6,35 +6,35 @@
66
"flame_state": false,
77
"heating_state": false
88
},
9+
"boiler_temperature": {
10+
"current": 20.9,
11+
"lower_bound": 25.0,
12+
"resolution": 0.01,
13+
"setpoint": 38.0,
14+
"upper_bound": 45.0
15+
},
916
"dev_class": "heater_central",
10-
"dhw_mode": "off",
17+
"dhw_mode": "eco",
1118
"dhw_modes": [
1219
"comfort",
13-
"off"
20+
"eco"
1421
],
15-
"location": "856285a783f24bf4b2573c8bc510eabf",
16-
"max_dhw_temperature": {
22+
"dhw_temperature": {
23+
"current": 49.9,
1724
"lower_bound": 0.0,
1825
"resolution": 1.0,
1926
"setpoint": 50.0,
2027
"upper_bound": 100.0
2128
},
22-
"maximum_boiler_temperature": {
23-
"lower_bound": 25.0,
24-
"resolution": 0.01,
25-
"setpoint": 38.0,
26-
"upper_bound": 45.0
27-
},
29+
"location": "856285a783f24bf4b2573c8bc510eabf",
2830
"model": "Generic heater",
2931
"model_id": "1.1",
3032
"name": "OpenTherm",
3133
"sensors": {
32-
"dhw_temperature": 49.9,
3334
"intended_boiler_temperature": 0.0,
3435
"modulation_level": 0.0,
3536
"outdoor_air_temperature": 13.6,
36-
"return_temperature": 33.0,
37-
"water_temperature": 20.9
37+
"return_temperature": 33.0
3838
},
3939
"vendor": "WeHeat"
4040
},

‎fixtures/adam_heatpump_cooling/data.json‎

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -54,36 +54,36 @@
5454
"flame_state": false,
5555
"heating_state": false
5656
},
57+
"boiler_temperature": {
58+
"current": 24.5,
59+
"lower_bound": 7.0,
60+
"resolution": 0.01,
61+
"setpoint": 35.0,
62+
"upper_bound": 50.0
63+
},
5764
"dev_class": "heater_central",
5865
"dhw_mode": "comfort",
5966
"dhw_modes": [
6067
"comfort",
61-
"off"
68+
"eco"
6269
],
63-
"location": "eedadcb297564f1483faa509179aebed",
64-
"max_dhw_temperature": {
70+
"dhw_temperature": {
71+
"current": 63.5,
6572
"lower_bound": 40.0,
6673
"resolution": 0.01,
6774
"setpoint": 60.0,
6875
"upper_bound": 65.0
6976
},
70-
"maximum_boiler_temperature": {
71-
"lower_bound": 7.0,
72-
"resolution": 0.01,
73-
"setpoint": 35.0,
74-
"upper_bound": 50.0
75-
},
77+
"location": "eedadcb297564f1483faa509179aebed",
7678
"model": "Generic heater/cooler",
7779
"model_id": "17.1",
7880
"name": "OpenTherm",
7981
"sensors": {
80-
"dhw_temperature": 63.5,
8182
"intended_boiler_temperature": 0.0,
8283
"modulation_level": 0.0,
8384
"outdoor_air_temperature": 13.5,
8485
"return_temperature": 24.9,
85-
"water_pressure": 2.0,
86-
"water_temperature": 24.5
86+
"water_pressure": 2.0
8787
},
8888
"vendor": "Remeha B.V."
8989
},

‎fixtures/adam_jip/data.json‎

Lines changed: 13 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -393,34 +393,35 @@
393393
"flame_state": false,
394394
"heating_state": false
395395
},
396+
"boiler_temperature": {
397+
"current": 37.3,
398+
"lower_bound": 20.0,
399+
"resolution": 0.01,
400+
"setpoint": 90.0,
401+
"upper_bound": 90.0
402+
},
396403
"dev_class": "heater_central",
397-
"dhw_mode": "off",
404+
"dhw_mode": "eco",
398405
"dhw_modes": [
399406
"comfort",
400-
"off"
407+
"eco"
401408
],
402-
"location": "9e4433a9d69f40b3aefd15e74395eaec",
403-
"max_dhw_temperature": {
409+
"dhw_temperature": {
410+
"current": 37.3,
404411
"lower_bound": 40.0,
405412
"resolution": 0.01,
406413
"setpoint": 60.0,
407414
"upper_bound": 60.0
408415
},
409-
"maximum_boiler_temperature": {
410-
"lower_bound": 20.0,
411-
"resolution": 0.01,
412-
"setpoint": 90.0,
413-
"upper_bound": 90.0
414-
},
416+
"location": "9e4433a9d69f40b3aefd15e74395eaec",
415417
"model": "Generic heater",
416418
"model_id": "10.20",
417419
"name": "OpenTherm",
418420
"sensors": {
419421
"intended_boiler_temperature": 0.0,
420422
"modulation_level": 0.0,
421423
"return_temperature": 37.1,
422-
"water_pressure": 1.4,
423-
"water_temperature": 37.3
424+
"water_pressure": 1.4
424425
},
425426
"vendor": "Remeha B.V."
426427
},

‎fixtures/adam_onoff_cooling_fake_firmware/data.json‎

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -7,35 +7,35 @@
77
"flame_state": false,
88
"heating_state": false
99
},
10+
"boiler_temperature": {
11+
"current": 24.5,
12+
"lower_bound": 7.0,
13+
"resolution": 0.01,
14+
"setpoint": 35.0,
15+
"upper_bound": 50.0
16+
},
1017
"dev_class": "heater_central",
1118
"dhw_mode": "comfort",
1219
"dhw_modes": [
1320
"comfort",
14-
"off"
21+
"eco"
1522
],
16-
"location": "eedadcb297564f1483faa509179aebed",
17-
"max_dhw_temperature": {
23+
"dhw_temperature": {
24+
"current": 63.5,
1825
"lower_bound": 40.0,
1926
"resolution": 0.01,
2027
"setpoint": 60.0,
2128
"upper_bound": 65.0
2229
},
23-
"maximum_boiler_temperature": {
24-
"lower_bound": 7.0,
25-
"resolution": 0.01,
26-
"setpoint": 35.0,
27-
"upper_bound": 50.0
28-
},
30+
"location": "eedadcb297564f1483faa509179aebed",
2931
"model": "Unknown",
3032
"name": "OnOff",
3133
"sensors": {
32-
"dhw_temperature": 63.5,
3334
"intended_boiler_temperature": 0.0,
3435
"modulation_level": 0.0,
3536
"outdoor_air_temperature": 13.5,
3637
"return_temperature": 24.9,
37-
"water_pressure": 2.0,
38-
"water_temperature": 24.5
38+
"water_pressure": 2.0
3939
}
4040
},
4141
"7d97fc3117784cfdafe347bcedcbbbcb": {

‎fixtures/adam_plus_anna/data.json‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -44,24 +44,24 @@
4444
"flame_state": false,
4545
"heating_state": false
4646
},
47-
"dev_class": "heater_central",
48-
"dhw_modes": [
49-
"comfort",
50-
"off"
51-
],
52-
"location": "07d618f0bb80412687f065b8698ce3e7",
53-
"maximum_boiler_temperature": {
47+
"boiler_temperature": {
48+
"current": 48.0,
5449
"lower_bound": 0.0,
5550
"resolution": 1.0,
5651
"setpoint": 80.0,
5752
"upper_bound": 100.0
5853
},
54+
"dev_class": "heater_central",
55+
"dhw_modes": [
56+
"comfort",
57+
"eco"
58+
],
59+
"location": "07d618f0bb80412687f065b8698ce3e7",
5960
"model": "Generic heater",
6061
"name": "OpenTherm",
61-
"select_dhw_mode": "off",
62+
"select_dhw_mode": "eco",
6263
"sensors": {
63-
"intended_boiler_temperature": 0.0,
64-
"water_temperature": 48.0
64+
"intended_boiler_temperature": 0.0
6565
}
6666
},
6767
"aa6b0002df0a46e1b1eb94beb61eddfe": {

‎fixtures/adam_plus_anna_new/data.json‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -6,24 +6,24 @@
66
"flame_state": true,
77
"heating_state": true
88
},
9-
"dev_class": "heater_central",
10-
"dhw_modes": [
11-
"comfort",
12-
"off"
13-
],
14-
"location": "bc93488efab249e5bc54fd7e175a6f91",
15-
"maximum_boiler_temperature": {
9+
"boiler_temperature": {
10+
"current": 43.0,
1611
"lower_bound": 25.0,
1712
"resolution": 0.01,
1813
"setpoint": 50.0,
1914
"upper_bound": 95.0
2015
},
16+
"dev_class": "heater_central",
17+
"dhw_modes": [
18+
"comfort",
19+
"eco"
20+
],
21+
"location": "bc93488efab249e5bc54fd7e175a6f91",
2122
"model": "Generic heater",
2223
"name": "OpenTherm",
23-
"select_dhw_mode": "off",
24+
"select_dhw_mode": "eco",
2425
"sensors": {
25-
"intended_boiler_temperature": 22.5,
26-
"water_temperature": 43.0
26+
"intended_boiler_temperature": 22.5
2727
}
2828
},
2929
"10016900610d4c7481df78c89606ef22": {

‎fixtures/adam_plus_anna_new_regulation_off/data.json‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -6,24 +6,24 @@
66
"flame_state": false,
77
"heating_state": false
88
},
9-
"dev_class": "heater_central",
10-
"dhw_modes": [
11-
"comfort",
12-
"off"
13-
],
14-
"location": "bc93488efab249e5bc54fd7e175a6f91",
15-
"maximum_boiler_temperature": {
9+
"boiler_temperature": {
10+
"current": 30.0,
1611
"lower_bound": 25.0,
1712
"resolution": 0.01,
1813
"setpoint": 50.0,
1914
"upper_bound": 95.0
2015
},
16+
"dev_class": "heater_central",
17+
"dhw_modes": [
18+
"comfort",
19+
"eco"
20+
],
21+
"location": "bc93488efab249e5bc54fd7e175a6f91",
2122
"model": "Generic heater",
2223
"name": "OpenTherm",
23-
"select_dhw_mode": "off",
24+
"select_dhw_mode": "eco",
2425
"sensors": {
25-
"intended_boiler_temperature": 0.0,
26-
"water_temperature": 30.0
26+
"intended_boiler_temperature": 0.0
2727
}
2828
},
2929
"10016900610d4c7481df78c89606ef22": {

‎fixtures/anna_elga_2/data.json‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,12 +13,12 @@
1313
"dev_class": "heater_central",
1414
"dhw_modes": [
1515
"comfort",
16-
"off"
16+
"eco"
1717
],
1818
"location": "d34dfe6ab90b410c98068e75de3eb631",
1919
"model": "Generic heater/cooler",
2020
"name": "OpenTherm",
21-
"select_dhw_mode": "off",
21+
"select_dhw_mode": "eco",
2222
"sensors": {
2323
"domestic_hot_water_setpoint": 60.0,
2424
"intended_boiler_temperature": 58.3,

‎fixtures/anna_elga_2_cooling/data.json‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -10,18 +10,19 @@
1010
"heating_state": false,
1111
"secondary_boiler_state": false
1212
},
13-
"dev_class": "heater_central",
14-
"dhw_modes": [
15-
"comfort",
16-
"off"
17-
],
18-
"location": "d34dfe6ab90b410c98068e75de3eb631",
19-
"maximum_boiler_temperature": {
13+
"boiler_temperature": {
14+
"current": 22.8,
2015
"lower_bound": 0.0,
2116
"resolution": 1.0,
2217
"setpoint": 60.0,
2318
"upper_bound": 100.0
2419
},
20+
"dev_class": "heater_central",
21+
"dhw_modes": [
22+
"comfort",
23+
"eco"
24+
],
25+
"location": "d34dfe6ab90b410c98068e75de3eb631",
2526
"model": "Generic heater/cooler",
2627
"name": "OpenTherm",
2728
"select_dhw_mode": "comfort",
@@ -31,8 +32,7 @@
3132
"modulation_level": 0.0,
3233
"outdoor_air_temperature": 30.0,
3334
"return_temperature": 23.4,
34-
"water_pressure": 0.5,
35-
"water_temperature": 22.8
35+
"water_pressure": 0.5
3636
},
3737
"vendor": "Techneco"
3838
},

0 commit comments

Comments
 (0)