Skip to content

Commit b56d5d9

Browse files
bouwewbouwew
authored
Merge pull request #414 from plugwise/mode_off
Output mode = off for Adam
2 parents 421941d + af28855 commit b56d5d9

File tree

12 files changed

+157
-210
lines changed

12 files changed

+157
-210
lines changed

‎CHANGELOG.md‎

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,13 @@
11
# Changelog
22

3+
## v0.34.0
4+
5+
- New feature: for Adam, provide mode = off, related to the regulation_mode = off, and mode = cool, for regulation_mode = cooling.
6+
Also, for Adam, return to providing a single setpoint for both heating and cooling.
7+
- Update userdata, manual-fixture-creation, and tests related to the added modes.
8+
- A few small Typing updates
9+
- Manually change the adam_jip fixture, for testing in pw-beta/Core plugwise
10+
311
## v0.33.2 Bugfix for HA climate
412

513
- Remove last_used (schedule) from output.

‎fixtures/adam_heatpump_cooling/all_data.json‎

Lines changed: 27 additions & 47 deletions
Original file line numberDiff line numberDiff line change
@@ -46,15 +46,14 @@
4646
"firmware": "2016-10-10T02:00:00+02:00",
4747
"hardware": "255",
4848
"location": "b52908550469425b812c87f766fe5303",
49-
"mode": "heat_cool",
49+
"mode": "cool",
5050
"model": "Lisa",
5151
"name": "Thermostaat BK",
5252
"preset_modes": ["no_frost", "vacation", "away", "home", "asleep"],
5353
"select_schedule": "None",
5454
"sensors": {
5555
"battery": 55,
56-
"setpoint_high": 18.0,
57-
"setpoint_low": 4.0,
56+
"setpoint": 18.0,
5857
"temperature": 18.8
5958
},
6059
"temperature_offset": {
@@ -66,8 +65,7 @@
6665
"thermostat": {
6766
"lower_bound": 0.0,
6867
"resolution": 0.01,
69-
"setpoint_high": 18.0,
70-
"setpoint_low": 4.0,
68+
"setpoint": 18.0,
7169
"upper_bound": 99.9
7270
},
7371
"vendor": "Plugwise",
@@ -157,14 +155,13 @@
157155
"firmware": "2016-10-10T02:00:00+02:00",
158156
"hardware": "255",
159157
"location": "20e735858f8146cead98b873177a4f99",
160-
"mode": "heat_cool",
158+
"mode": "cool",
161159
"model": "Lisa",
162160
"name": "Thermostaat DB",
163161
"preset_modes": ["no_frost", "vacation", "away", "home", "asleep"],
164162
"select_schedule": "None",
165163
"sensors": {
166-
"setpoint_high": 18.0,
167-
"setpoint_low": 4.0,
164+
"setpoint": 18.0,
168165
"temperature": 22.0
169166
},
170167
"temperature_offset": {
@@ -176,8 +173,7 @@
176173
"thermostat": {
177174
"lower_bound": 0.0,
178175
"resolution": 0.01,
179-
"setpoint_high": 18.0,
180-
"setpoint_low": 4.0,
176+
"setpoint": 18.0,
181177
"upper_bound": 99.9
182178
},
183179
"vendor": "Plugwise",
@@ -235,14 +231,13 @@
235231
"firmware": "2016-10-10T02:00:00+02:00",
236232
"hardware": "255",
237233
"location": "e39529c79ab54fda9bed26cfc0447546",
238-
"mode": "heat_cool",
234+
"mode": "cool",
239235
"model": "Lisa",
240236
"name": "Thermostaat JM",
241237
"preset_modes": ["no_frost", "vacation", "away", "home", "asleep"],
242238
"select_schedule": "None",
243239
"sensors": {
244-
"setpoint_high": 18.0,
245-
"setpoint_low": 4.0,
240+
"setpoint": 18.0,
246241
"temperature": 20.0
247242
},
248243
"temperature_offset": {
@@ -254,8 +249,7 @@
254249
"thermostat": {
255250
"lower_bound": 0.0,
256251
"resolution": 0.01,
257-
"setpoint_high": 18.0,
258-
"setpoint_low": 4.0,
252+
"setpoint": 18.0,
259253
"upper_bound": 99.9
260254
},
261255
"vendor": "Plugwise",
@@ -364,14 +358,13 @@
364358
"firmware": "2016-10-10T02:00:00+02:00",
365359
"hardware": "255",
366360
"location": "9a27714b970547ee9a6bdadc2b815ad5",
367-
"mode": "heat_cool",
361+
"mode": "cool",
368362
"model": "Lisa",
369363
"name": "Thermostaat SQ",
370364
"preset_modes": ["no_frost", "vacation", "away", "home", "asleep"],
371365
"select_schedule": "None",
372366
"sensors": {
373-
"setpoint_high": 18.5,
374-
"setpoint_low": 4.0,
367+
"setpoint": 18.5,
375368
"temperature": 21.4
376369
},
377370
"temperature_offset": {
@@ -383,8 +376,7 @@
383376
"thermostat": {
384377
"lower_bound": 0.0,
385378
"resolution": 0.01,
386-
"setpoint_high": 18.5,
387-
"setpoint_low": 4.0,
379+
"setpoint": 18.5,
388380
"upper_bound": 99.9
389381
},
390382
"vendor": "Plugwise",
@@ -398,14 +390,13 @@
398390
"firmware": "2016-10-10T02:00:00+02:00",
399391
"hardware": "255",
400392
"location": "93ac3f7bf25342f58cbb77c4a99ac0b3",
401-
"mode": "heat_cool",
393+
"mode": "cool",
402394
"model": "Lisa",
403395
"name": "Thermostaat RB",
404396
"preset_modes": ["no_frost", "vacation", "away", "home", "asleep"],
405397
"select_schedule": "None",
406398
"sensors": {
407-
"setpoint_high": 17.0,
408-
"setpoint_low": 4.0,
399+
"setpoint": 17.0,
409400
"temperature": 20.7
410401
},
411402
"temperature_offset": {
@@ -417,8 +408,7 @@
417408
"thermostat": {
418409
"lower_bound": 0.0,
419410
"resolution": 0.01,
420-
"setpoint_high": 17.0,
421-
"setpoint_low": 4.0,
411+
"setpoint": 17.0,
422412
"upper_bound": 99.9
423413
},
424414
"vendor": "Plugwise",
@@ -435,15 +425,13 @@
435425
"preset_modes": ["no_frost", "vacation", "away", "home", "asleep"],
436426
"select_schedule": "Werkdag schema",
437427
"sensors": {
438-
"setpoint_high": 21.5,
439-
"setpoint_low": 4.0,
428+
"setpoint": 21.5,
440429
"temperature": 22.5
441430
},
442431
"thermostat": {
443432
"lower_bound": 1.0,
444433
"resolution": 0.01,
445-
"setpoint_high": 21.5,
446-
"setpoint_low": 4.0,
434+
"setpoint": 21.5,
447435
"upper_bound": 35.0
448436
},
449437
"vendor": "Plugwise"
@@ -456,14 +444,13 @@
456444
"firmware": "2016-10-10T02:00:00+02:00",
457445
"hardware": "255",
458446
"location": "04b15f6e884448288f811d29fb7b1b30",
459-
"mode": "heat_cool",
447+
"mode": "cool",
460448
"model": "Lisa",
461449
"name": "Thermostaat SJ",
462450
"preset_modes": ["no_frost", "vacation", "away", "home", "asleep"],
463451
"select_schedule": "None",
464452
"sensors": {
465-
"setpoint_high": 20.5,
466-
"setpoint_low": 4.0,
453+
"setpoint": 20.5,
467454
"temperature": 22.6
468455
},
469456
"temperature_offset": {
@@ -475,8 +462,7 @@
475462
"thermostat": {
476463
"lower_bound": 0.0,
477464
"resolution": 0.01,
478-
"setpoint_high": 20.5,
479-
"setpoint_low": 4.0,
465+
"setpoint": 20.5,
480466
"upper_bound": 99.9
481467
},
482468
"vendor": "Plugwise",
@@ -497,8 +483,7 @@
497483
"select_schedule": "Werkdag schema",
498484
"sensors": {
499485
"battery": 53,
500-
"setpoint_high": 21.5,
501-
"setpoint_low": 4.0,
486+
"setpoint": 21.5,
502487
"temperature": 22.5
503488
},
504489
"temperature_offset": {
@@ -510,8 +495,7 @@
510495
"thermostat": {
511496
"lower_bound": 0.0,
512497
"resolution": 0.01,
513-
"setpoint_high": 21.5,
514-
"setpoint_low": 4.0,
498+
"setpoint": 21.5,
515499
"upper_bound": 99.9
516500
},
517501
"vendor": "Plugwise",
@@ -531,8 +515,7 @@
531515
"preset_modes": ["no_frost", "vacation", "away", "home", "asleep"],
532516
"select_schedule": "Werkdag schema",
533517
"sensors": {
534-
"setpoint_high": 20.5,
535-
"setpoint_low": 4.0,
518+
"setpoint": 20.5,
536519
"temperature": 21.5
537520
},
538521
"temperature_offset": {
@@ -544,8 +527,7 @@
544527
"thermostat": {
545528
"lower_bound": 0.0,
546529
"resolution": 0.01,
547-
"setpoint_high": 20.5,
548-
"setpoint_low": 4.0,
530+
"setpoint": 20.5,
549531
"upper_bound": 99.9
550532
},
551533
"vendor": "Plugwise",
@@ -565,8 +547,7 @@
565547
"preset_modes": ["no_frost", "vacation", "away", "home", "asleep"],
566548
"select_schedule": "Werkdag schema",
567549
"sensors": {
568-
"setpoint_high": 20.5,
569-
"setpoint_low": 4.0,
550+
"setpoint": 20.5,
570551
"temperature": 21.9
571552
},
572553
"temperature_offset": {
@@ -578,8 +559,7 @@
578559
"thermostat": {
579560
"lower_bound": 0.0,
580561
"resolution": 0.01,
581-
"setpoint_high": 20.5,
582-
"setpoint_low": 4.0,
562+
"setpoint": 20.5,
583563
"upper_bound": 99.9
584564
},
585565
"vendor": "Plugwise",
@@ -590,7 +570,7 @@
590570
"cooling_present": true,
591571
"gateway_id": "7d97fc3117784cfdafe347bcedcbbbcb",
592572
"heater_id": "0ca13e8176204ca7bf6f09de59f81c83",
593-
"item_count": 423,
573+
"item_count": 403,
594574
"notifications": {},
595575
"smile_name": "Adam"
596576
}

‎fixtures/adam_jip/all_data.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
"firmware": "2016-10-27T02:00:00+02:00",
99
"hardware": "255",
1010
"location": "06aecb3d00354375924f50c47af36bd2",
11-
"mode": "heat",
11+
"mode": "off",
1212
"model": "Lisa",
1313
"name": "Slaapkamer",
1414
"preset_modes": ["home", "asleep", "away", "vacation", "no_frost"],

‎fixtures/adam_onoff_cooling_fake_firmware/all_data.json‎

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -72,15 +72,13 @@
7272
"preset_modes": ["no_frost", "vacation", "away", "home", "asleep"],
7373
"select_schedule": "Werkdag schema",
7474
"sensors": {
75-
"setpoint_high": 21.5,
76-
"setpoint_low": 4.0,
75+
"setpoint": 21.5,
7776
"temperature": 22.5
7877
},
7978
"thermostat": {
8079
"lower_bound": 1.0,
8180
"resolution": 0.01,
82-
"setpoint_high": 21.5,
83-
"setpoint_low": 4.0,
81+
"setpoint": 21.5,
8482
"upper_bound": 35.0
8583
},
8684
"vendor": "Plugwise"
@@ -90,7 +88,7 @@
9088
"cooling_present": true,
9189
"gateway_id": "7d97fc3117784cfdafe347bcedcbbbcb",
9290
"heater_id": "0ca13e8176204ca7bf6f09de59f81c83",
93-
"item_count": 55,
91+
"item_count": 53,
9492
"notifications": {},
9593
"smile_name": "Adam"
9694
}

‎fixtures/m_adam_cooling/all_data.json‎

Lines changed: 6 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -56,22 +56,20 @@
5656
"control_state": "cooling",
5757
"dev_class": "thermostat",
5858
"location": "f2bf9048bef64cc5b6d5110154e33c81",
59-
"mode": "heat_cool",
59+
"mode": "cool",
6060
"model": "ThermoTouch",
6161
"name": "Anna",
6262
"preset_modes": ["home", "asleep", "away", "vacation", "no_frost"],
6363
"select_schedule": "Weekschema",
6464
"selected_schedule": "None",
6565
"sensors": {
66-
"setpoint_high": 23.5,
67-
"setpoint_low": 4.0,
66+
"setpoint": 23.5,
6867
"temperature": 25.8
6968
},
7069
"thermostat": {
7170
"lower_bound": 1.0,
7271
"resolution": 0.01,
73-
"setpoint_high": 23.5,
74-
"setpoint_low": 4.0,
72+
"setpoint": 23.5,
7573
"upper_bound": 35.0
7674
},
7775
"vendor": "Plugwise"
@@ -116,9 +114,8 @@
116114
"select_schedule": "Badkamer",
117115
"sensors": {
118116
"battery": 56,
119-
"setpoint_high": 23.5,
120-
"setpoint_low": 20.0,
121-
"temperature": 239
117+
"setpoint": 23.5,
118+
"temperature": 23.9
122119
},
123120
"temperature_offset": {
124121
"lower_bound": -2.0,
@@ -129,8 +126,7 @@
129126
"thermostat": {
130127
"lower_bound": 0.0,
131128
"resolution": 0.01,
132-
"setpoint_high": 25.0,
133-
"setpoint_low": 19.0,
129+
"setpoint": 25.0,
134130
"upper_bound": 99.9
135131
},
136132
"vendor": "Plugwise",

0 commit comments

Comments
 (0)