Skip to content

Commit d841b1c

Browse files
authored
Merge pull request #370 from plugwise/temp_offset
Add support for changing the temperature offset on a supported thermostat device
2 parents e8dae37 + 4bd7747 commit d841b1c

File tree

29 files changed

+475
-51
lines changed

29 files changed

+475
-51
lines changed

CHANGELOG.md

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

3-
## Ongoing
3+
## v0.32.0: New Feature: add support for changing the temperature offset on a supported thermostat device
44

5+
- Add support for changing the temperature-offset on Jip, Lisa, Tom, Floor and on Anna (in some configurations)
56
- Fix issue introduced by ruff: replace using .keys() in xml-find result
67

78
## v0.31.9: Further typing improvements

fixtures/adam_heatpump_cooling/all_data.json

Lines changed: 54 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -59,6 +59,12 @@
5959
"setpoint_low": 4.0,
6060
"temperature": 18.8
6161
},
62+
"temperature_offset": {
63+
"lower_bound": -2.0,
64+
"resolution": 0.1,
65+
"setpoint": 0.0,
66+
"upper_bound": 2.0
67+
},
6268
"thermostat": {
6369
"lower_bound": 0.0,
6470
"resolution": 0.01,
@@ -165,6 +171,12 @@
165171
"setpoint_low": 4.0,
166172
"temperature": 22.0
167173
},
174+
"temperature_offset": {
175+
"lower_bound": -2.0,
176+
"resolution": 0.1,
177+
"setpoint": 0.0,
178+
"upper_bound": 2.0
179+
},
168180
"thermostat": {
169181
"lower_bound": 0.0,
170182
"resolution": 0.01,
@@ -239,6 +251,12 @@
239251
"setpoint_low": 4.0,
240252
"temperature": 20.0
241253
},
254+
"temperature_offset": {
255+
"lower_bound": -2.0,
256+
"resolution": 0.1,
257+
"setpoint": 0.0,
258+
"upper_bound": 2.0
259+
},
242260
"thermostat": {
243261
"lower_bound": 0.0,
244262
"resolution": 0.01,
@@ -364,6 +382,12 @@
364382
"setpoint_low": 4.0,
365383
"temperature": 21.4
366384
},
385+
"temperature_offset": {
386+
"lower_bound": -2.0,
387+
"resolution": 0.1,
388+
"setpoint": 0.0,
389+
"upper_bound": 2.0
390+
},
367391
"thermostat": {
368392
"lower_bound": 0.0,
369393
"resolution": 0.01,
@@ -394,6 +418,12 @@
394418
"setpoint_low": 4.0,
395419
"temperature": 20.7
396420
},
421+
"temperature_offset": {
422+
"lower_bound": -2.0,
423+
"resolution": 0.1,
424+
"setpoint": 0.0,
425+
"upper_bound": 2.0
426+
},
397427
"thermostat": {
398428
"lower_bound": 0.0,
399429
"resolution": 0.01,
@@ -450,6 +480,12 @@
450480
"setpoint_low": 4.0,
451481
"temperature": 22.6
452482
},
483+
"temperature_offset": {
484+
"lower_bound": -2.0,
485+
"resolution": 0.1,
486+
"setpoint": 0.0,
487+
"upper_bound": 2.0
488+
},
453489
"thermostat": {
454490
"lower_bound": 0.0,
455491
"resolution": 0.01,
@@ -481,6 +517,12 @@
481517
"setpoint_low": 4.0,
482518
"temperature": 22.5
483519
},
520+
"temperature_offset": {
521+
"lower_bound": -2.0,
522+
"resolution": 0.1,
523+
"setpoint": 0.0,
524+
"upper_bound": 2.0
525+
},
484526
"thermostat": {
485527
"lower_bound": 0.0,
486528
"resolution": 0.01,
@@ -511,6 +553,12 @@
511553
"setpoint_low": 4.0,
512554
"temperature": 21.5
513555
},
556+
"temperature_offset": {
557+
"lower_bound": -2.0,
558+
"resolution": 0.1,
559+
"setpoint": 0.0,
560+
"upper_bound": 2.0
561+
},
514562
"thermostat": {
515563
"lower_bound": 0.0,
516564
"resolution": 0.01,
@@ -541,6 +589,12 @@
541589
"setpoint_low": 4.0,
542590
"temperature": 21.9
543591
},
592+
"temperature_offset": {
593+
"lower_bound": -2.0,
594+
"resolution": 0.1,
595+
"setpoint": 0.0,
596+
"upper_bound": 2.0
597+
},
544598
"thermostat": {
545599
"lower_bound": 0.0,
546600
"resolution": 0.01,

fixtures/adam_jip/all_data.json

Lines changed: 48 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,12 @@
2020
"setpoint": 13.0,
2121
"temperature": 24.2
2222
},
23+
"temperature_offset": {
24+
"lower_bound": -2.0,
25+
"resolution": 0.1,
26+
"setpoint": 0.0,
27+
"upper_bound": 2.0
28+
},
2329
"thermostat": {
2430
"lower_bound": 0.0,
2531
"resolution": 0.01,
@@ -43,6 +49,12 @@
4349
"temperature_difference": 2.0,
4450
"valve_position": 0.0
4551
},
52+
"temperature_offset": {
53+
"lower_bound": -2.0,
54+
"resolution": 0.1,
55+
"setpoint": 0.1,
56+
"upper_bound": 2.0
57+
},
4658
"vendor": "Plugwise",
4759
"zigbee_mac_address": "ABCD012345670A07"
4860
},
@@ -60,6 +72,12 @@
6072
"temperature_difference": 1.7,
6173
"valve_position": 0.0
6274
},
75+
"temperature_offset": {
76+
"lower_bound": -2.0,
77+
"resolution": 0.1,
78+
"setpoint": 0.1,
79+
"upper_bound": 2.0
80+
},
6381
"vendor": "Plugwise",
6482
"zigbee_mac_address": "ABCD012345670A05"
6583
},
@@ -99,6 +117,12 @@
99117
"setpoint": 13.0,
100118
"temperature": 30.0
101119
},
120+
"temperature_offset": {
121+
"lower_bound": -2.0,
122+
"resolution": 0.1,
123+
"setpoint": 0.0,
124+
"upper_bound": 2.0
125+
},
102126
"thermostat": {
103127
"lower_bound": 0.0,
104128
"resolution": 0.01,
@@ -122,6 +146,12 @@
122146
"temperature_difference": 1.8,
123147
"valve_position": 100
124148
},
149+
"temperature_offset": {
150+
"lower_bound": -2.0,
151+
"resolution": 0.1,
152+
"setpoint": 0.1,
153+
"upper_bound": 2.0
154+
},
125155
"vendor": "Plugwise",
126156
"zigbee_mac_address": "ABCD012345670A09"
127157
},
@@ -145,6 +175,12 @@
145175
"setpoint": 13.0,
146176
"temperature": 30.0
147177
},
178+
"temperature_offset": {
179+
"lower_bound": -2.0,
180+
"resolution": 0.1,
181+
"setpoint": 0.0,
182+
"upper_bound": 2.0
183+
},
148184
"thermostat": {
149185
"lower_bound": 0.0,
150186
"resolution": 0.01,
@@ -187,6 +223,12 @@
187223
"temperature_difference": 1.9,
188224
"valve_position": 0.0
189225
},
226+
"temperature_offset": {
227+
"lower_bound": -2.0,
228+
"resolution": 0.1,
229+
"setpoint": 0.1,
230+
"upper_bound": 2.0
231+
},
190232
"vendor": "Plugwise",
191233
"zigbee_mac_address": "ABCD012345670A04"
192234
},
@@ -246,6 +288,12 @@
246288
"setpoint": 9.0,
247289
"temperature": 27.4
248290
},
291+
"temperature_offset": {
292+
"lower_bound": -2.0,
293+
"resolution": 0.1,
294+
"setpoint": 0.0,
295+
"upper_bound": 2.0
296+
},
249297
"thermostat": {
250298
"lower_bound": 4.0,
251299
"resolution": 0.01,

fixtures/adam_multiple_devices_per_zone/all_data.json

Lines changed: 54 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -95,6 +95,12 @@
9595
"temperature_difference": -0.4,
9696
"valve_position": 0.0
9797
},
98+
"temperature_offset": {
99+
"lower_bound": -2.0,
100+
"resolution": 0.1,
101+
"setpoint": 0.0,
102+
"upper_bound": 2.0
103+
},
98104
"vendor": "Plugwise",
99105
"zigbee_mac_address": "ABCD012345670A17"
100106
},
@@ -123,6 +129,12 @@
123129
"setpoint": 15.0,
124130
"temperature": 17.2
125131
},
132+
"temperature_offset": {
133+
"lower_bound": -2.0,
134+
"resolution": 0.1,
135+
"setpoint": 0.0,
136+
"upper_bound": 2.0
137+
},
126138
"thermostat": {
127139
"lower_bound": 0.0,
128140
"resolution": 0.01,
@@ -200,6 +212,12 @@
200212
"temperature_difference": -0.2,
201213
"valve_position": 0.0
202214
},
215+
"temperature_offset": {
216+
"lower_bound": -2.0,
217+
"resolution": 0.1,
218+
"setpoint": 0.0,
219+
"upper_bound": 2.0
220+
},
203221
"vendor": "Plugwise",
204222
"zigbee_mac_address": "ABCD012345670A09"
205223
},
@@ -217,6 +235,12 @@
217235
"temperature_difference": 3.5,
218236
"valve_position": 100
219237
},
238+
"temperature_offset": {
239+
"lower_bound": -2.0,
240+
"resolution": 0.1,
241+
"setpoint": 0.0,
242+
"upper_bound": 2.0
243+
},
220244
"vendor": "Plugwise",
221245
"zigbee_mac_address": "ABCD012345670A02"
222246
},
@@ -245,6 +269,12 @@
245269
"setpoint": 21.5,
246270
"temperature": 20.9
247271
},
272+
"temperature_offset": {
273+
"lower_bound": -2.0,
274+
"resolution": 0.1,
275+
"setpoint": 0.0,
276+
"upper_bound": 2.0
277+
},
248278
"thermostat": {
249279
"lower_bound": 0.0,
250280
"resolution": 0.01,
@@ -289,6 +319,12 @@
289319
"temperature_difference": 0.1,
290320
"valve_position": 0.0
291321
},
322+
"temperature_offset": {
323+
"lower_bound": -2.0,
324+
"resolution": 0.1,
325+
"setpoint": 0.0,
326+
"upper_bound": 2.0
327+
},
292328
"vendor": "Plugwise",
293329
"zigbee_mac_address": "ABCD012345670A10"
294330
},
@@ -317,6 +353,12 @@
317353
"setpoint": 13.0,
318354
"temperature": 16.5
319355
},
356+
"temperature_offset": {
357+
"lower_bound": -2.0,
358+
"resolution": 0.1,
359+
"setpoint": 0.0,
360+
"upper_bound": 2.0
361+
},
320362
"thermostat": {
321363
"lower_bound": 0.0,
322364
"resolution": 0.01,
@@ -353,6 +395,12 @@
353395
"temperature_difference": 0.0,
354396
"valve_position": 0.0
355397
},
398+
"temperature_offset": {
399+
"lower_bound": -2.0,
400+
"resolution": 0.1,
401+
"setpoint": 0.0,
402+
"upper_bound": 2.0
403+
},
356404
"thermostat": {
357405
"lower_bound": 0.0,
358406
"resolution": 0.01,
@@ -387,6 +435,12 @@
387435
"setpoint": 14.0,
388436
"temperature": 18.9
389437
},
438+
"temperature_offset": {
439+
"lower_bound": -2.0,
440+
"resolution": 0.1,
441+
"setpoint": 0.0,
442+
"upper_bound": 2.0
443+
},
390444
"thermostat": {
391445
"lower_bound": 0.0,
392446
"resolution": 0.01,

fixtures/adam_plus_anna_new/all_data.json

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -40,6 +40,12 @@
4040
"temperature_difference": 2.3,
4141
"valve_position": 0.0
4242
},
43+
"temperature_offset": {
44+
"lower_bound": -2.0,
45+
"resolution": 0.1,
46+
"setpoint": 0.1,
47+
"upper_bound": 2.0
48+
},
4349
"vendor": "Plugwise",
4450
"zigbee_mac_address": "ABCD012345670A01"
4551
},
@@ -181,6 +187,12 @@
181187
"setpoint": 15.0,
182188
"temperature": 17.9
183189
},
190+
"temperature_offset": {
191+
"lower_bound": -2.0,
192+
"resolution": 0.1,
193+
"setpoint": 0.0,
194+
"upper_bound": 2.0
195+
},
184196
"thermostat": {
185197
"lower_bound": 0.0,
186198
"resolution": 0.01,

0 commit comments

Comments
 (0)