Skip to content

Commit 01725c4

Browse files
bouwewbouwew
authored
Merge pull request #895 from plugwise/revert-wh-names
Include both old and new entities for a step-wise introduction of water_heaters in HA
2 parents aef6e39 + f877fc5 commit 01725c4

69 files changed

Lines changed: 807 additions & 549 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: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,12 @@
11
# Changelog
22

3+
## v1.14.0
4+
5+
- Include both old and new entities for a step-wise introduction of water_heaters in HA via PR [#895](https://github.com/plugwise/python-plugwise/pull/895):
6+
- Keep the `dhw_cm_switch` and add the `dhw_modes list` and the `select_dhw_mode` string that will replace the `dhw_cm_switch` in the future
7+
- `dhw_cm_switch` = `on` --> `select_dhw_mode` = `comfort`, `dhw_cm_switch` = `off` --> `select_dhw_mode` = `eco`
8+
- Add a `current` (`temperature`) key to the `maximum_boiler_temperature` and `max_dhw_temperature` dicts
9+
310
## v1.13.1
411

512
- Implement dedicated boiler_temperature dict for legacy Anna via PR [#893](https://github.com/plugwise/python-plugwise/pull/893)

‎fixtures/adam_bad_thermostat/data.json‎

Lines changed: 15 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -6,35 +6,40 @@
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-
},
169
"dev_class": "heater_central",
1710
"dhw_mode": "eco",
1811
"dhw_modes": [
1912
"comfort",
2013
"eco"
2114
],
22-
"dhw_temperature": {
15+
"location": "856285a783f24bf4b2573c8bc510eabf",
16+
"max_dhw_temperature": {
2317
"current": 49.9,
2418
"lower_bound": 0.0,
2519
"resolution": 1.0,
2620
"setpoint": 50.0,
2721
"upper_bound": 100.0
2822
},
29-
"location": "856285a783f24bf4b2573c8bc510eabf",
23+
"maximum_boiler_temperature": {
24+
"current": 20.9,
25+
"lower_bound": 25.0,
26+
"resolution": 0.01,
27+
"setpoint": 38.0,
28+
"upper_bound": 45.0
29+
},
3030
"model": "Generic heater",
3131
"model_id": "1.1",
3232
"name": "OpenTherm",
3333
"sensors": {
34+
"dhw_temperature": 49.9,
3435
"intended_boiler_temperature": 0.0,
3536
"modulation_level": 0.0,
3637
"outdoor_air_temperature": 13.6,
37-
"return_temperature": 33.0
38+
"return_temperature": 33.0,
39+
"water_temperature": 20.9
40+
},
41+
"switches": {
42+
"dhw_cm_switch": false
3843
},
3944
"vendor": "WeHeat"
4045
},

‎fixtures/adam_heatpump_cooling/data.json‎

Lines changed: 15 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -54,36 +54,41 @@
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-
},
6457
"dev_class": "heater_central",
6558
"dhw_mode": "comfort",
6659
"dhw_modes": [
6760
"comfort",
6861
"eco"
6962
],
70-
"dhw_temperature": {
63+
"location": "eedadcb297564f1483faa509179aebed",
64+
"max_dhw_temperature": {
7165
"current": 63.5,
7266
"lower_bound": 40.0,
7367
"resolution": 0.01,
7468
"setpoint": 60.0,
7569
"upper_bound": 65.0
7670
},
77-
"location": "eedadcb297564f1483faa509179aebed",
71+
"maximum_boiler_temperature": {
72+
"current": 24.5,
73+
"lower_bound": 7.0,
74+
"resolution": 0.01,
75+
"setpoint": 35.0,
76+
"upper_bound": 50.0
77+
},
7878
"model": "Generic heater/cooler",
7979
"model_id": "17.1",
8080
"name": "OpenTherm",
8181
"sensors": {
82+
"dhw_temperature": 63.5,
8283
"intended_boiler_temperature": 0.0,
8384
"modulation_level": 0.0,
8485
"outdoor_air_temperature": 13.5,
8586
"return_temperature": 24.9,
86-
"water_pressure": 2.0
87+
"water_pressure": 2.0,
88+
"water_temperature": 24.5
89+
},
90+
"switches": {
91+
"dhw_cm_switch": true
8792
},
8893
"vendor": "Remeha B.V."
8994
},

‎fixtures/adam_jip/data.json‎

Lines changed: 14 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -393,35 +393,39 @@
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-
},
403396
"dev_class": "heater_central",
404397
"dhw_mode": "eco",
405398
"dhw_modes": [
406399
"comfort",
407400
"eco"
408401
],
409-
"dhw_temperature": {
402+
"location": "9e4433a9d69f40b3aefd15e74395eaec",
403+
"max_dhw_temperature": {
410404
"current": 37.3,
411405
"lower_bound": 40.0,
412406
"resolution": 0.01,
413407
"setpoint": 60.0,
414408
"upper_bound": 60.0
415409
},
416-
"location": "9e4433a9d69f40b3aefd15e74395eaec",
410+
"maximum_boiler_temperature": {
411+
"current": 37.3,
412+
"lower_bound": 20.0,
413+
"resolution": 0.01,
414+
"setpoint": 90.0,
415+
"upper_bound": 90.0
416+
},
417417
"model": "Generic heater",
418418
"model_id": "10.20",
419419
"name": "OpenTherm",
420420
"sensors": {
421421
"intended_boiler_temperature": 0.0,
422422
"modulation_level": 0.0,
423423
"return_temperature": 37.1,
424-
"water_pressure": 1.4
424+
"water_pressure": 1.4,
425+
"water_temperature": 37.3
426+
},
427+
"switches": {
428+
"dhw_cm_switch": false
425429
},
426430
"vendor": "Remeha B.V."
427431
},

‎fixtures/adam_onoff_cooling_fake_firmware/data.json‎

Lines changed: 15 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -7,35 +7,40 @@
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-
},
1710
"dev_class": "heater_central",
1811
"dhw_mode": "comfort",
1912
"dhw_modes": [
2013
"comfort",
2114
"eco"
2215
],
23-
"dhw_temperature": {
16+
"location": "eedadcb297564f1483faa509179aebed",
17+
"max_dhw_temperature": {
2418
"current": 63.5,
2519
"lower_bound": 40.0,
2620
"resolution": 0.01,
2721
"setpoint": 60.0,
2822
"upper_bound": 65.0
2923
},
30-
"location": "eedadcb297564f1483faa509179aebed",
24+
"maximum_boiler_temperature": {
25+
"current": 24.5,
26+
"lower_bound": 7.0,
27+
"resolution": 0.01,
28+
"setpoint": 35.0,
29+
"upper_bound": 50.0
30+
},
3131
"model": "Unknown",
3232
"name": "OnOff",
3333
"sensors": {
34+
"dhw_temperature": 63.5,
3435
"intended_boiler_temperature": 0.0,
3536
"modulation_level": 0.0,
3637
"outdoor_air_temperature": 13.5,
3738
"return_temperature": 24.9,
38-
"water_pressure": 2.0
39+
"water_pressure": 2.0,
40+
"water_temperature": 24.5
41+
},
42+
"switches": {
43+
"dhw_cm_switch": true
3944
}
4045
},
4146
"7d97fc3117784cfdafe347bcedcbbbcb": {

‎fixtures/adam_plus_anna/data.json‎

Lines changed: 12 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -44,24 +44,28 @@
4444
"flame_state": false,
4545
"heating_state": false
4646
},
47-
"boiler_temperature": {
48-
"current": 48.0,
49-
"lower_bound": 0.0,
50-
"resolution": 1.0,
51-
"setpoint": 80.0,
52-
"upper_bound": 100.0
53-
},
5447
"dev_class": "heater_central",
5548
"dhw_modes": [
5649
"comfort",
5750
"eco"
5851
],
5952
"location": "07d618f0bb80412687f065b8698ce3e7",
53+
"maximum_boiler_temperature": {
54+
"current": 48.0,
55+
"lower_bound": 0.0,
56+
"resolution": 1.0,
57+
"setpoint": 80.0,
58+
"upper_bound": 100.0
59+
},
6060
"model": "Generic heater",
6161
"name": "OpenTherm",
6262
"select_dhw_mode": "eco",
6363
"sensors": {
64-
"intended_boiler_temperature": 0.0
64+
"intended_boiler_temperature": 0.0,
65+
"water_temperature": 48.0
66+
},
67+
"switches": {
68+
"dhw_cm_switch": false
6569
}
6670
},
6771
"aa6b0002df0a46e1b1eb94beb61eddfe": {

‎fixtures/adam_plus_anna_new/data.json‎

Lines changed: 12 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -6,24 +6,28 @@
66
"flame_state": true,
77
"heating_state": true
88
},
9-
"boiler_temperature": {
10-
"current": 43.0,
11-
"lower_bound": 25.0,
12-
"resolution": 0.01,
13-
"setpoint": 50.0,
14-
"upper_bound": 95.0
15-
},
169
"dev_class": "heater_central",
1710
"dhw_modes": [
1811
"comfort",
1912
"eco"
2013
],
2114
"location": "bc93488efab249e5bc54fd7e175a6f91",
15+
"maximum_boiler_temperature": {
16+
"current": 43.0,
17+
"lower_bound": 25.0,
18+
"resolution": 0.01,
19+
"setpoint": 50.0,
20+
"upper_bound": 95.0
21+
},
2222
"model": "Generic heater",
2323
"name": "OpenTherm",
2424
"select_dhw_mode": "eco",
2525
"sensors": {
26-
"intended_boiler_temperature": 22.5
26+
"intended_boiler_temperature": 22.5,
27+
"water_temperature": 43.0
28+
},
29+
"switches": {
30+
"dhw_cm_switch": false
2731
}
2832
},
2933
"10016900610d4c7481df78c89606ef22": {

‎fixtures/adam_plus_anna_new_regulation_off/data.json‎

Lines changed: 12 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -6,24 +6,28 @@
66
"flame_state": false,
77
"heating_state": false
88
},
9-
"boiler_temperature": {
10-
"current": 30.0,
11-
"lower_bound": 25.0,
12-
"resolution": 0.01,
13-
"setpoint": 50.0,
14-
"upper_bound": 95.0
15-
},
169
"dev_class": "heater_central",
1710
"dhw_modes": [
1811
"comfort",
1912
"eco"
2013
],
2114
"location": "bc93488efab249e5bc54fd7e175a6f91",
15+
"maximum_boiler_temperature": {
16+
"current": 30.0,
17+
"lower_bound": 25.0,
18+
"resolution": 0.01,
19+
"setpoint": 50.0,
20+
"upper_bound": 95.0
21+
},
2222
"model": "Generic heater",
2323
"name": "OpenTherm",
2424
"select_dhw_mode": "eco",
2525
"sensors": {
26-
"intended_boiler_temperature": 0.0
26+
"intended_boiler_temperature": 0.0,
27+
"water_temperature": 30.0
28+
},
29+
"switches": {
30+
"dhw_cm_switch": false
2731
}
2832
},
2933
"10016900610d4c7481df78c89606ef22": {

‎fixtures/anna_elga_2/data.json‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,9 @@
2828
"water_pressure": 0.5,
2929
"water_temperature": 42.6
3030
},
31+
"switches": {
32+
"dhw_cm_switch": false
33+
},
3134
"vendor": "Techneco"
3235
},
3336
"ebd90df1ab334565b5895f37590ccff4": {

‎fixtures/anna_elga_2_cooling/data.json‎

Lines changed: 12 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -10,19 +10,19 @@
1010
"heating_state": false,
1111
"secondary_boiler_state": false
1212
},
13-
"boiler_temperature": {
14-
"current": 22.8,
15-
"lower_bound": 0.0,
16-
"resolution": 1.0,
17-
"setpoint": 60.0,
18-
"upper_bound": 100.0
19-
},
2013
"dev_class": "heater_central",
2114
"dhw_modes": [
2215
"comfort",
2316
"eco"
2417
],
2518
"location": "d34dfe6ab90b410c98068e75de3eb631",
19+
"maximum_boiler_temperature": {
20+
"current": 22.8,
21+
"lower_bound": 0.0,
22+
"resolution": 1.0,
23+
"setpoint": 60.0,
24+
"upper_bound": 100.0
25+
},
2626
"model": "Generic heater/cooler",
2727
"name": "OpenTherm",
2828
"select_dhw_mode": "comfort",
@@ -32,7 +32,11 @@
3232
"modulation_level": 0.0,
3333
"outdoor_air_temperature": 30.0,
3434
"return_temperature": 23.4,
35-
"water_pressure": 0.5
35+
"water_pressure": 0.5,
36+
"water_temperature": 22.8
37+
},
38+
"switches": {
39+
"dhw_cm_switch": true
3640
},
3741
"vendor": "Techneco"
3842
},

0 commit comments

Comments
 (0)