Skip to content

Commit 00c25bf

Browse files
bouwewbouwew
authored
Merge pull request #899 from plugwise/schedule_null
Change no thermostat schedule defined representation
2 parents ce32275 + 30103db commit 00c25bf

69 files changed

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

3+
## Ongoing
4+
5+
- Change representation of no-thermostat-schedule-defined to a single `off` option via PR [#899](https://github.com/plugwise/python-plugwise/pull/899)
6+
37
## v1.14.1
48

59
- Improve manual fixtures script, reorder set_schedule_state() arguments for better compatibility with set_dhw_mode(), via PR[#897](https://github.com/plugwise/python-plugwise/pull/897)

‎fixtures/adam_bad_thermostat/data.json‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,9 @@
4545
},
4646
"3ee6b9486cb04c258a3130fff2b144a4": {
4747
"active_preset": "home",
48-
"available_schedules": [],
48+
"available_schedules": [
49+
"off"
50+
],
4951
"climate_mode": "heat",
5052
"control_state": "idle",
5153
"dev_class": "climate",
@@ -58,7 +60,7 @@
5860
"vacation",
5961
"no_frost"
6062
],
61-
"select_schedule": null,
63+
"select_schedule": "off",
6264
"sensors": {
6365
"temperature": 20.3
6466
},

‎fixtures/adam_heatpump_cooling/data.json‎

Lines changed: 20 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -2,10 +2,10 @@
22
"04b15f6e884448288f811d29fb7b1b30": {
33
"active_preset": "away",
44
"available_schedules": [
5+
"off",
56
"Opstaan weekdag",
67
"Werkdag schema",
7-
"Weekend",
8-
"off"
8+
"Weekend"
99
],
1010
"climate_mode": "cool",
1111
"control_state": "idle",
@@ -141,10 +141,10 @@
141141
"20e735858f8146cead98b873177a4f99": {
142142
"active_preset": "away",
143143
"available_schedules": [
144+
"off",
144145
"Opstaan weekdag",
145146
"Werkdag schema",
146-
"Weekend",
147-
"off"
147+
"Weekend"
148148
],
149149
"climate_mode": "cool",
150150
"control_state": "idle",
@@ -269,10 +269,10 @@
269269
"5cc21042f87f4b4c94ccb5537c47a53f": {
270270
"active_preset": "away",
271271
"available_schedules": [
272+
"off",
272273
"Opstaan weekdag",
273274
"Werkdag schema",
274-
"Weekend",
275-
"off"
275+
"Weekend"
276276
],
277277
"climate_mode": "auto",
278278
"control_state": "idle",
@@ -429,10 +429,10 @@
429429
"8cf650a4c10c44819e426bed406aec34": {
430430
"active_preset": "away",
431431
"available_schedules": [
432+
"off",
432433
"Opstaan weekdag",
433434
"Werkdag schema",
434-
"Weekend",
435-
"off"
435+
"Weekend"
436436
],
437437
"climate_mode": "auto",
438438
"control_state": "idle",
@@ -475,10 +475,10 @@
475475
"93ac3f7bf25342f58cbb77c4a99ac0b3": {
476476
"active_preset": "away",
477477
"available_schedules": [
478+
"off",
478479
"Opstaan weekdag",
479480
"Werkdag schema",
480-
"Weekend",
481-
"off"
481+
"Weekend"
482482
],
483483
"climate_mode": "cool",
484484
"control_state": "idle",
@@ -540,10 +540,10 @@
540540
"9a27714b970547ee9a6bdadc2b815ad5": {
541541
"active_preset": "away",
542542
"available_schedules": [
543+
"off",
543544
"Opstaan weekdag",
544545
"Werkdag schema",
545-
"Weekend",
546-
"off"
546+
"Weekend"
547547
],
548548
"climate_mode": "cool",
549549
"control_state": "idle",
@@ -606,10 +606,10 @@
606606
"a562019b0b1f47a4bde8ebe3dbe3e8a9": {
607607
"active_preset": "away",
608608
"available_schedules": [
609+
"off",
609610
"Opstaan weekdag",
610611
"Werkdag schema",
611-
"Weekend",
612-
"off"
612+
"Weekend"
613613
],
614614
"climate_mode": "auto",
615615
"control_state": "idle",
@@ -652,10 +652,10 @@
652652
"b52908550469425b812c87f766fe5303": {
653653
"active_preset": "away",
654654
"available_schedules": [
655+
"off",
655656
"Opstaan weekdag",
656657
"Werkdag schema",
657-
"Weekend",
658-
"off"
658+
"Weekend"
659659
],
660660
"climate_mode": "cool",
661661
"control_state": "idle",
@@ -796,10 +796,10 @@
796796
"e39529c79ab54fda9bed26cfc0447546": {
797797
"active_preset": "away",
798798
"available_schedules": [
799+
"off",
799800
"Opstaan weekdag",
800801
"Werkdag schema",
801-
"Weekend",
802-
"off"
802+
"Weekend"
803803
],
804804
"climate_mode": "cool",
805805
"control_state": "idle",
@@ -912,10 +912,10 @@
912912
"fa5fa6b34f6b40a0972988b20e888ed4": {
913913
"active_preset": "away",
914914
"available_schedules": [
915+
"off",
915916
"Opstaan weekdag",
916917
"Werkdag schema",
917-
"Weekend",
918-
"off"
918+
"Weekend"
919919
],
920920
"climate_mode": "auto",
921921
"control_state": "idle",

‎fixtures/adam_jip/data.json‎

Lines changed: 16 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,9 @@
11
{
22
"06aecb3d00354375924f50c47af36bd2": {
33
"active_preset": "no_frost",
4-
"available_schedules": [],
4+
"available_schedules": [
5+
"off"
6+
],
57
"climate_mode": "heat",
68
"control_state": "idle",
79
"dev_class": "climate",
@@ -14,7 +16,7 @@
1416
"vacation",
1517
"no_frost"
1618
],
17-
"select_schedule": null,
19+
"select_schedule": "off",
1820
"select_zone_profile": "active",
1921
"sensors": {
2022
"temperature": 24.2
@@ -42,7 +44,9 @@
4244
},
4345
"13228dab8ce04617af318a2888b3c548": {
4446
"active_preset": "home",
45-
"available_schedules": [],
47+
"available_schedules": [
48+
"off"
49+
],
4650
"climate_mode": "heat",
4751
"control_state": "idle",
4852
"dev_class": "climate",
@@ -55,7 +59,7 @@
5559
"vacation",
5660
"no_frost"
5761
],
58-
"select_schedule": null,
62+
"select_schedule": "off",
5963
"select_zone_profile": "active",
6064
"sensors": {
6165
"temperature": 27.4
@@ -282,7 +286,9 @@
282286
},
283287
"d27aede973b54be484f6842d1b2802ad": {
284288
"active_preset": "home",
285-
"available_schedules": [],
289+
"available_schedules": [
290+
"off"
291+
],
286292
"climate_mode": "heat",
287293
"control_state": "idle",
288294
"dev_class": "climate",
@@ -295,7 +301,7 @@
295301
"vacation",
296302
"no_frost"
297303
],
298-
"select_schedule": null,
304+
"select_schedule": "off",
299305
"select_zone_profile": "active",
300306
"sensors": {
301307
"temperature": 30.0
@@ -347,7 +353,9 @@
347353
},
348354
"d58fec52899f4f1c92e4f8fad6d8c48c": {
349355
"active_preset": "home",
350-
"available_schedules": [],
356+
"available_schedules": [
357+
"off"
358+
],
351359
"climate_mode": "heat",
352360
"control_state": "idle",
353361
"dev_class": "climate",
@@ -360,7 +368,7 @@
360368
"vacation",
361369
"no_frost"
362370
],
363-
"select_schedule": null,
371+
"select_schedule": "off",
364372
"select_zone_profile": "active",
365373
"sensors": {
366374
"temperature": 30.0

‎fixtures/adam_multiple_devices_per_zone/data.json‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -23,12 +23,12 @@
2323
"08963fec7c53423ca5680aa4cb502c63": {
2424
"active_preset": "away",
2525
"available_schedules": [
26+
"off",
2627
"CV Roan",
2728
"Bios Schema met Film Avond",
2829
"GF7 Woonkamer",
2930
"Badkamer Schema",
30-
"CV Jessie",
31-
"off"
31+
"CV Jessie"
3232
],
3333
"climate_mode": "auto",
3434
"control_state": "idle",
@@ -64,12 +64,12 @@
6464
"12493538af164a409c6a1c79e38afe1c": {
6565
"active_preset": "away",
6666
"available_schedules": [
67+
"off",
6768
"CV Roan",
6869
"Bios Schema met Film Avond",
6970
"GF7 Woonkamer",
7071
"Badkamer Schema",
71-
"CV Jessie",
72-
"off"
72+
"CV Jessie"
7373
],
7474
"climate_mode": "heat",
7575
"control_state": "idle",
@@ -129,12 +129,12 @@
129129
"446ac08dd04d4eff8ac57489757b7314": {
130130
"active_preset": "no_frost",
131131
"available_schedules": [
132+
"off",
132133
"CV Roan",
133134
"Bios Schema met Film Avond",
134135
"GF7 Woonkamer",
135136
"Badkamer Schema",
136-
"CV Jessie",
137-
"off"
137+
"CV Jessie"
138138
],
139139
"climate_mode": "heat",
140140
"control_state": "idle",
@@ -285,12 +285,12 @@
285285
"82fa13f017d240daa0d0ea1775420f24": {
286286
"active_preset": "asleep",
287287
"available_schedules": [
288+
"off",
288289
"CV Roan",
289290
"Bios Schema met Film Avond",
290291
"GF7 Woonkamer",
291292
"Badkamer Schema",
292-
"CV Jessie",
293-
"off"
293+
"CV Jessie"
294294
],
295295
"climate_mode": "auto",
296296
"control_state": "idle",
@@ -440,12 +440,12 @@
440440
"c50f167537524366a5af7aa3942feb1e": {
441441
"active_preset": "home",
442442
"available_schedules": [
443+
"off",
443444
"CV Roan",
444445
"Bios Schema met Film Avond",
445446
"GF7 Woonkamer",
446447
"Badkamer Schema",
447-
"CV Jessie",
448-
"off"
448+
"CV Jessie"
449449
],
450450
"climate_mode": "auto",
451451
"control_state": "heating",

‎fixtures/adam_onoff_cooling_fake_firmware/data.json‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -91,10 +91,10 @@
9191
"fa5fa6b34f6b40a0972988b20e888ed4": {
9292
"active_preset": "away",
9393
"available_schedules": [
94+
"off",
9495
"Opstaan weekdag",
9596
"Werkdag schema",
96-
"Weekend",
97-
"off"
97+
"Weekend"
9898
],
9999
"climate_mode": "auto",
100100
"control_state": "idle",

‎fixtures/adam_plus_anna/data.json‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,8 @@
22
"009490cc2f674ce6b576863fbb64f867": {
33
"active_preset": "home",
44
"available_schedules": [
5-
"Weekschema",
6-
"off"
5+
"off",
6+
"Weekschema"
77
],
88
"climate_mode": "auto",
99
"control_state": "idle",

‎fixtures/adam_plus_anna_new/data.json‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -302,11 +302,11 @@
302302
"f2bf9048bef64cc5b6d5110154e33c81": {
303303
"active_preset": "home",
304304
"available_schedules": [
305+
"off",
305306
"Badkamer",
306307
"Vakantie",
307308
"Weekschema",
308-
"Test",
309-
"off"
309+
"Test"
310310
],
311311
"climate_mode": "auto",
312312
"control_state": "heating",
@@ -351,11 +351,11 @@
351351
"f871b8c4d63549319221e294e4f88074": {
352352
"active_preset": "vacation",
353353
"available_schedules": [
354+
"off",
354355
"Badkamer",
355356
"Vakantie",
356357
"Weekschema",
357-
"Test",
358-
"off"
358+
"Test"
359359
],
360360
"climate_mode": "heat",
361361
"control_state": "idle",

‎fixtures/adam_plus_anna_new_regulation_off/data.json‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -254,11 +254,11 @@
254254
"f2bf9048bef64cc5b6d5110154e33c81": {
255255
"active_preset": "home",
256256
"available_schedules": [
257+
"off",
257258
"Badkamer",
258259
"Test",
259260
"Vakantie",
260-
"Weekschema",
261-
"off"
261+
"Weekschema"
262262
],
263263
"climate_mode": "off",
264264
"control_state": "idle",
@@ -301,11 +301,11 @@
301301
"f871b8c4d63549319221e294e4f88074": {
302302
"active_preset": "home",
303303
"available_schedules": [
304+
"off",
304305
"Badkamer",
305306
"Test",
306307
"Vakantie",
307-
"Weekschema",
308-
"off"
308+
"Weekschema"
309309
],
310310
"climate_mode": "off",
311311
"control_state": "idle",

0 commit comments

Comments
 (0)