Skip to content

Commit 8d3b908

Browse files
authored
Merge pull request #814 from plugwise/regulation_control
Feature request: add setting of Adam thermostat zone profile
2 parents c936416 + cd30b1f commit 8d3b908

File tree

22 files changed

+259
-75
lines changed

22 files changed

+259
-75
lines changed

CHANGELOG.md

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

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

5-
- Improve testing: compare internal and code testcounters, line up fixture and test-json format, fix a missed count.
5+
- New feature: implement setting Adam zone profile via PR [#814](https://github.com/plugwise/python-plugwise/pull/814)
6+
- Improve testing: compare internal and code testcounters, line up fixture and test-json format, fix a missed count via PR [#815](https://github.com/plugwise/python-plugwise/pull/815)
67

78
## v1.9.0
89

fixtures/adam_heatpump_cooling/data.json

Lines changed: 30 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@
1414
"name": "Slaapkamer SJ",
1515
"preset_modes": ["no_frost", "vacation", "away", "home", "asleep"],
1616
"select_schedule": "off",
17+
"select_zone_profile": "passive",
1718
"sensors": {
1819
"electricity_consumed": 0.0,
1920
"electricity_produced": 0.0,
@@ -29,7 +30,8 @@
2930
"primary": ["d3a276aeb3114a509bab1e4bf8c40348"],
3031
"secondary": []
3132
},
32-
"vendor": "Plugwise"
33+
"vendor": "Plugwise",
34+
"zone_profiles": ["active", "off", "passive"]
3335
},
3436
"0ca13e8176204ca7bf6f09de59f81c83": {
3537
"available": true,
@@ -132,6 +134,7 @@
132134
"name": "Slaapkamer DB",
133135
"preset_modes": ["no_frost", "vacation", "away", "home", "asleep"],
134136
"select_schedule": "off",
137+
"select_zone_profile": "passive",
135138
"sensors": {
136139
"electricity_consumed": 0.0,
137140
"electricity_produced": 0.0,
@@ -147,7 +150,8 @@
147150
"primary": ["47e2c550a33846b680725aa3fb229473"],
148151
"secondary": []
149152
},
150-
"vendor": "Plugwise"
153+
"vendor": "Plugwise",
154+
"zone_profiles": ["active", "off", "passive"]
151155
},
152156
"2e0fc4db2a6d4cbeb7cf786143543961": {
153157
"available": true,
@@ -246,6 +250,7 @@
246250
"name": "Badkamer 2",
247251
"preset_modes": ["no_frost", "vacation", "away", "home", "asleep"],
248252
"select_schedule": "Werkdag schema",
253+
"select_zone_profile": "passive",
249254
"sensors": {
250255
"electricity_consumed": 0.0,
251256
"temperature": 21.9
@@ -260,7 +265,8 @@
260265
"primary": ["f04c985c11ad4848b8fcd710343f9dcf"],
261266
"secondary": []
262267
},
263-
"vendor": "Plugwise"
268+
"vendor": "Plugwise",
269+
"zone_profiles": ["active", "off", "passive"]
264270
},
265271
"5ead63c65e5f44e7870ba2bd680ceb9e": {
266272
"available": true,
@@ -388,6 +394,7 @@
388394
"name": "Badkamer 1",
389395
"preset_modes": ["no_frost", "vacation", "away", "home", "asleep"],
390396
"select_schedule": "Werkdag schema",
397+
"select_zone_profile": "passive",
391398
"sensors": {
392399
"electricity_consumed": 0.0,
393400
"electricity_produced": 0.0,
@@ -403,7 +410,8 @@
403410
"primary": ["eac5db95d97241f6b17790897847ccf5"],
404411
"secondary": []
405412
},
406-
"vendor": "Plugwise"
413+
"vendor": "Plugwise",
414+
"zone_profiles": ["active", "off", "passive"]
407415
},
408416
"93ac3f7bf25342f58cbb77c4a99ac0b3": {
409417
"active_preset": "away",
@@ -420,6 +428,7 @@
420428
"name": "Slaapkamer RB",
421429
"preset_modes": ["no_frost", "vacation", "away", "home", "asleep"],
422430
"select_schedule": "off",
431+
"select_zone_profile": "passive",
423432
"sensors": {
424433
"electricity_consumed": 3.13,
425434
"temperature": 20.7
@@ -434,7 +443,8 @@
434443
"primary": ["c4ed311d54e341f58b4cdd201d1fde7e"],
435444
"secondary": []
436445
},
437-
"vendor": "Plugwise"
446+
"vendor": "Plugwise",
447+
"zone_profiles": ["active", "off", "passive"]
438448
},
439449
"96714ad90fc948bcbcb5021c4b9f5ae9": {
440450
"available": true,
@@ -471,6 +481,7 @@
471481
"name": "Slaapkamer SQ",
472482
"preset_modes": ["no_frost", "vacation", "away", "home", "asleep"],
473483
"select_schedule": "off",
484+
"select_zone_profile": "passive",
474485
"sensors": {
475486
"electricity_consumed": 0.0,
476487
"electricity_produced": 0.0,
@@ -486,7 +497,8 @@
486497
"primary": ["beb32da072274e698146db8b022f3c36"],
487498
"secondary": []
488499
},
489-
"vendor": "Plugwise"
500+
"vendor": "Plugwise",
501+
"zone_profiles": ["active", "off", "passive"]
490502
},
491503
"a03b6e8e76dd4646af1a77c31dd9370c": {
492504
"available": true,
@@ -523,6 +535,7 @@
523535
"name": "Keuken",
524536
"preset_modes": ["no_frost", "vacation", "away", "home", "asleep"],
525537
"select_schedule": "Werkdag schema",
538+
"select_zone_profile": "active",
526539
"sensors": {
527540
"electricity_consumed": 2.13,
528541
"electricity_produced": 0.0,
@@ -538,7 +551,8 @@
538551
"primary": ["ea8372c0e3ad4622ad45a041d02425f5"],
539552
"secondary": []
540553
},
541-
"vendor": "Plugwise"
554+
"vendor": "Plugwise",
555+
"zone_profiles": ["active", "off", "passive"]
542556
},
543557
"b52908550469425b812c87f766fe5303": {
544558
"active_preset": "away",
@@ -555,6 +569,7 @@
555569
"name": "Bijkeuken",
556570
"preset_modes": ["no_frost", "vacation", "away", "home", "asleep"],
557571
"select_schedule": "off",
572+
"select_zone_profile": "active",
558573
"sensors": {
559574
"electricity_consumed": 0.0,
560575
"electricity_produced": 0.0,
@@ -570,7 +585,8 @@
570585
"primary": ["1053c8bbf8be43c6921742b146a625f1"],
571586
"secondary": []
572587
},
573-
"vendor": "Plugwise"
588+
"vendor": "Plugwise",
589+
"zone_profiles": ["active", "off", "passive"]
574590
},
575591
"bbcffa48019f4b09b8368bbaf9559e68": {
576592
"available": true,
@@ -685,6 +701,7 @@
685701
"name": "Slaapkamer JM",
686702
"preset_modes": ["no_frost", "vacation", "away", "home", "asleep"],
687703
"select_schedule": "off",
704+
"select_zone_profile": "passive",
688705
"sensors": {
689706
"electricity_consumed": 0.0,
690707
"electricity_produced": 0.0,
@@ -700,7 +717,8 @@
700717
"primary": ["7fda9f84f01342f8afe9ebbbbff30c0f"],
701718
"secondary": []
702719
},
703-
"vendor": "Plugwise"
720+
"vendor": "Plugwise",
721+
"zone_profiles": ["active", "off", "passive"]
704722
},
705723
"ea8372c0e3ad4622ad45a041d02425f5": {
706724
"available": true,
@@ -787,6 +805,7 @@
787805
"name": "Woonkamer",
788806
"preset_modes": ["no_frost", "vacation", "away", "home", "asleep"],
789807
"select_schedule": "Werkdag schema",
808+
"select_zone_profile": "active",
790809
"sensors": {
791810
"electricity_consumed": 0.0,
792811
"electricity_produced": 0.0,
@@ -802,6 +821,7 @@
802821
"primary": ["ca79d23ae0094120b877558734cff85c"],
803822
"secondary": []
804823
},
805-
"vendor": "Plugwise"
824+
"vendor": "Plugwise",
825+
"zone_profiles": ["active", "off", "passive"]
806826
}
807827
}

fixtures/adam_jip/data.json

Lines changed: 12 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@
99
"name": "Slaapkamer",
1010
"preset_modes": ["home", "asleep", "away", "vacation", "no_frost"],
1111
"select_schedule": null,
12+
"select_zone_profile": "active",
1213
"sensors": {
1314
"temperature": 24.2
1415
},
@@ -22,7 +23,8 @@
2223
"primary": ["1346fbd8498d4dbcab7e18d51b771f3d"],
2324
"secondary": ["356b65335e274d769c338223e7af9c33"]
2425
},
25-
"vendor": "Plugwise"
26+
"vendor": "Plugwise",
27+
"zone_profiles": ["active", "off", "passive"]
2628
},
2729
"13228dab8ce04617af318a2888b3c548": {
2830
"active_preset": "home",
@@ -34,6 +36,7 @@
3436
"name": "Woonkamer",
3537
"preset_modes": ["home", "asleep", "away", "vacation", "no_frost"],
3638
"select_schedule": null,
39+
"select_zone_profile": "active",
3740
"sensors": {
3841
"temperature": 27.4
3942
},
@@ -47,7 +50,8 @@
4750
"primary": ["f61f1a2535f54f52ad006a3d18e459ca"],
4851
"secondary": ["833de10f269c4deab58fb9df69901b4e"]
4952
},
50-
"vendor": "Plugwise"
53+
"vendor": "Plugwise",
54+
"zone_profiles": ["active", "off", "passive"]
5155
},
5256
"1346fbd8498d4dbcab7e18d51b771f3d": {
5357
"available": true,
@@ -249,6 +253,7 @@
249253
"name": "Kinderkamer",
250254
"preset_modes": ["home", "asleep", "away", "vacation", "no_frost"],
251255
"select_schedule": null,
256+
"select_zone_profile": "active",
252257
"sensors": {
253258
"temperature": 30.0
254259
},
@@ -262,7 +267,8 @@
262267
"primary": ["6f3e9d7084214c21b9dfa46f6eeb8700"],
263268
"secondary": ["d4496250d0e942cfa7aea3476e9070d5"]
264269
},
265-
"vendor": "Plugwise"
270+
"vendor": "Plugwise",
271+
"zone_profiles": ["active", "off", "passive"]
266272
},
267273
"d4496250d0e942cfa7aea3476e9070d5": {
268274
"available": true,
@@ -298,6 +304,7 @@
298304
"name": "Logeerkamer",
299305
"preset_modes": ["home", "asleep", "away", "vacation", "no_frost"],
300306
"select_schedule": null,
307+
"select_zone_profile": "active",
301308
"sensors": {
302309
"temperature": 30.0
303310
},
@@ -311,7 +318,8 @@
311318
"primary": ["a6abc6a129ee499c88a4d420cc413b47"],
312319
"secondary": ["1da4d325838e4ad8aac12177214505c9"]
313320
},
314-
"vendor": "Plugwise"
321+
"vendor": "Plugwise",
322+
"zone_profiles": ["active", "off", "passive"]
315323
},
316324
"e4684553153b44afbef2200885f379dc": {
317325
"available": true,

fixtures/adam_onoff_cooling_fake_firmware/data.json

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -92,6 +92,7 @@
9292
"name": "Woonkamer",
9393
"preset_modes": ["no_frost", "vacation", "away", "home", "asleep"],
9494
"select_schedule": "Werkdag schema",
95+
"select_zone_profile": "active",
9596
"sensors": {
9697
"electricity_consumed": 0.0,
9798
"electricity_produced": 0.0,
@@ -107,6 +108,7 @@
107108
"primary": ["ca79d23ae0094120b877558734cff85c"],
108109
"secondary": []
109110
},
110-
"vendor": "Plugwise"
111+
"vendor": "Plugwise",
112+
"zone_profiles": ["active", "off", "passive"]
111113
}
112114
}

fixtures/adam_plus_anna_new/data.json

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -280,6 +280,7 @@
280280
"name": "Living room",
281281
"preset_modes": ["vacation", "no_frost", "asleep", "home", "away"],
282282
"select_schedule": "Weekschema",
283+
"select_zone_profile": "active",
283284
"sensors": {
284285
"electricity_consumed": 60.8,
285286
"electricity_produced": 0.0,
@@ -299,7 +300,8 @@
299300
],
300301
"secondary": []
301302
},
302-
"vendor": "Plugwise"
303+
"vendor": "Plugwise",
304+
"zone_profiles": ["active", "off", "passive"]
303305
},
304306
"f871b8c4d63549319221e294e4f88074": {
305307
"active_preset": "vacation",
@@ -317,6 +319,7 @@
317319
"name": "Bathroom",
318320
"preset_modes": ["vacation", "no_frost", "asleep", "home", "away"],
319321
"select_schedule": "off",
322+
"select_zone_profile": "passive",
320323
"sensors": {
321324
"electricity_consumed": 0.0,
322325
"electricity_produced": 0.0,
@@ -332,6 +335,7 @@
332335
"primary": ["e2f4322d57924fa090fbbc48b3a140dc"],
333336
"secondary": ["1772a4ea304041adb83f357b751341ff"]
334337
},
335-
"vendor": "Plugwise"
338+
"vendor": "Plugwise",
339+
"zone_profiles": ["active", "off", "passive"]
336340
}
337341
}

fixtures/adam_plus_anna_new_regulation_off/data.json

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -233,6 +233,7 @@
233233
"name": "Living room",
234234
"preset_modes": ["no_frost", "asleep", "vacation", "home", "away"],
235235
"select_schedule": "off",
236+
"select_zone_profile": "active",
236237
"sensors": {
237238
"electricity_consumed": 149.9,
238239
"electricity_produced": 0.0,
@@ -248,7 +249,8 @@
248249
"primary": ["ad4838d7d35c4d6ea796ee12ae5aedf8"],
249250
"secondary": []
250251
},
251-
"vendor": "Plugwise"
252+
"vendor": "Plugwise",
253+
"zone_profiles": ["active", "off", "passive"]
252254
},
253255
"f871b8c4d63549319221e294e4f88074": {
254256
"active_preset": "home",
@@ -266,6 +268,7 @@
266268
"name": "Bathroom",
267269
"preset_modes": ["no_frost", "asleep", "vacation", "home", "away"],
268270
"select_schedule": "off",
271+
"select_zone_profile": "passive",
269272
"sensors": {
270273
"electricity_consumed": 0.0,
271274
"electricity_produced": 0.0,
@@ -281,6 +284,7 @@
281284
"primary": ["e2f4322d57924fa090fbbc48b3a140dc"],
282285
"secondary": ["1772a4ea304041adb83f357b751341ff"]
283286
},
284-
"vendor": "Plugwise"
287+
"vendor": "Plugwise",
288+
"zone_profiles": ["active", "off", "passive"]
285289
}
286290
}

fixtures/m_adam_cooling/data.json

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -196,6 +196,7 @@
196196
"name": "Living room",
197197
"preset_modes": ["vacation", "no_frost", "asleep", "home", "away"],
198198
"select_schedule": "off",
199+
"select_zone_profile": "active",
199200
"sensors": {
200201
"electricity_consumed": 60.8,
201202
"electricity_produced": 0.0,
@@ -215,7 +216,8 @@
215216
],
216217
"secondary": []
217218
},
218-
"vendor": "Plugwise"
219+
"vendor": "Plugwise",
220+
"zone_profiles": ["active", "off", "passive"]
219221
},
220222
"f871b8c4d63549319221e294e4f88074": {
221223
"active_preset": "vacation",
@@ -233,6 +235,7 @@
233235
"name": "Bathroom",
234236
"preset_modes": ["vacation", "no_frost", "asleep", "home", "away"],
235237
"select_schedule": "off",
238+
"select_zone_profile": "passive",
236239
"sensors": {
237240
"electricity_consumed": 0.0,
238241
"electricity_produced": 0.0,
@@ -248,6 +251,7 @@
248251
"primary": ["e2f4322d57924fa090fbbc48b3a140dc"],
249252
"secondary": ["1772a4ea304041adb83f357b751341ff"]
250253
},
251-
"vendor": "Plugwise"
254+
"vendor": "Plugwise",
255+
"zone_profiles": ["active", "off", "passive"]
252256
}
253257
}

0 commit comments

Comments
 (0)