Skip to content

Commit eaf9914

Browse files
bouwewbouwew
authored
Merge pull request #362 from plugwise/more_types
Improvement: add Types for Number and Select
2 parents b20ab8e + 7c358d6 commit eaf9914

File tree

35 files changed

+147
-117
lines changed

35 files changed

+147
-117
lines changed

‎CHANGELOG.md‎

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,16 @@
11
# Changelog
22

3+
## v0.31.9: Further typing improvements
4+
5+
- Add NumberType, SelectType and SelectOptionsType constants to improve typing further
6+
- Code quality housekeeping
7+
38
## v0.31.8: Improve typing as per Core PR #96915
49

10+
## v0.31.8: Improve typing
11+
12+
- Add BinarySensorType, SensorType, SwitchType as per HA Core PR 96915
13+
514
## v0.31.7: Various small updates
615

716
- Repair coverage/fix testing - #294

‎fixtures/adam_heatpump_cooling/all_data.json‎

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@
5252
"model": "Lisa",
5353
"name": "Thermostaat BK",
5454
"preset_modes": ["no_frost", "vacation", "away", "home", "asleep"],
55-
"selected_schedule": "None",
55+
"select_schedule": "None",
5656
"sensors": {
5757
"battery": 55,
5858
"setpoint_high": 18.0,
@@ -159,7 +159,7 @@
159159
"model": "Lisa",
160160
"name": "Thermostaat DB",
161161
"preset_modes": ["no_frost", "vacation", "away", "home", "asleep"],
162-
"selected_schedule": "None",
162+
"select_schedule": "None",
163163
"sensors": {
164164
"setpoint_high": 18.0,
165165
"setpoint_low": 4.0,
@@ -205,14 +205,14 @@
205205
"mac_address": "012345670001",
206206
"model": "Gateway",
207207
"name": "Adam",
208-
"regulation_mode": "cooling",
209208
"regulation_modes": [
210209
"heating",
211210
"off",
212211
"bleeding_cold",
213212
"bleeding_hot",
214213
"cooling"
215214
],
215+
"select_regulation_mode": "cooling",
216216
"sensors": {
217217
"outdoor_temperature": 13.4
218218
},
@@ -233,7 +233,7 @@
233233
"model": "Lisa",
234234
"name": "Thermostaat JM",
235235
"preset_modes": ["no_frost", "vacation", "away", "home", "asleep"],
236-
"selected_schedule": "None",
236+
"select_schedule": "None",
237237
"sensors": {
238238
"setpoint_high": 18.0,
239239
"setpoint_low": 4.0,
@@ -358,7 +358,7 @@
358358
"model": "Lisa",
359359
"name": "Thermostaat SQ",
360360
"preset_modes": ["no_frost", "vacation", "away", "home", "asleep"],
361-
"selected_schedule": "None",
361+
"select_schedule": "None",
362362
"sensors": {
363363
"setpoint_high": 18.5,
364364
"setpoint_low": 4.0,
@@ -388,7 +388,7 @@
388388
"model": "Lisa",
389389
"name": "Thermostaat RB",
390390
"preset_modes": ["no_frost", "vacation", "away", "home", "asleep"],
391-
"selected_schedule": "None",
391+
"select_schedule": "None",
392392
"sensors": {
393393
"setpoint_high": 17.0,
394394
"setpoint_low": 4.0,
@@ -415,7 +415,7 @@
415415
"model": "ThermoTouch",
416416
"name": "Thermostaat WK",
417417
"preset_modes": ["no_frost", "vacation", "away", "home", "asleep"],
418-
"selected_schedule": "Werkdag schema",
418+
"select_schedule": "Werkdag schema",
419419
"sensors": {
420420
"setpoint_high": 21.5,
421421
"setpoint_low": 4.0,
@@ -444,7 +444,7 @@
444444
"model": "Lisa",
445445
"name": "Thermostaat SJ",
446446
"preset_modes": ["no_frost", "vacation", "away", "home", "asleep"],
447-
"selected_schedule": "None",
447+
"select_schedule": "None",
448448
"sensors": {
449449
"setpoint_high": 20.5,
450450
"setpoint_low": 4.0,
@@ -474,7 +474,7 @@
474474
"model": "Lisa",
475475
"name": "Thermostaat KK",
476476
"preset_modes": ["no_frost", "vacation", "away", "home", "asleep"],
477-
"selected_schedule": "Werkdag schema",
477+
"select_schedule": "Werkdag schema",
478478
"sensors": {
479479
"battery": 53,
480480
"setpoint_high": 21.5,
@@ -505,7 +505,7 @@
505505
"model": "Lisa",
506506
"name": "Thermostaat BK1",
507507
"preset_modes": ["no_frost", "vacation", "away", "home", "asleep"],
508-
"selected_schedule": "Werkdag schema",
508+
"select_schedule": "Werkdag schema",
509509
"sensors": {
510510
"setpoint_high": 20.5,
511511
"setpoint_low": 4.0,
@@ -535,7 +535,7 @@
535535
"model": "Lisa",
536536
"name": "Thermostaat BK2",
537537
"preset_modes": ["no_frost", "vacation", "away", "home", "asleep"],
538-
"selected_schedule": "Werkdag schema",
538+
"select_schedule": "Werkdag schema",
539539
"sensors": {
540540
"setpoint_high": 20.5,
541541
"setpoint_low": 4.0,

‎fixtures/adam_jip/all_data.json‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
"model": "Lisa",
1515
"name": "Slaapkamer",
1616
"preset_modes": ["home", "asleep", "away", "vacation", "no_frost"],
17-
"selected_schedule": "None",
17+
"select_schedule": "None",
1818
"sensors": {
1919
"battery": 92,
2020
"setpoint": 13.0,
@@ -93,7 +93,7 @@
9393
"model": "Lisa",
9494
"name": "Kinderkamer",
9595
"preset_modes": ["home", "asleep", "away", "vacation", "no_frost"],
96-
"selected_schedule": "None",
96+
"select_schedule": "None",
9797
"sensors": {
9898
"battery": 79,
9999
"setpoint": 13.0,
@@ -139,7 +139,7 @@
139139
"model": "Lisa",
140140
"name": "Logeerkamer",
141141
"preset_modes": ["home", "asleep", "away", "vacation", "no_frost"],
142-
"selected_schedule": "None",
142+
"select_schedule": "None",
143143
"sensors": {
144144
"battery": 80,
145145
"setpoint": 13.0,
@@ -165,8 +165,8 @@
165165
"mac_address": "012345670001",
166166
"model": "Gateway",
167167
"name": "Adam",
168-
"regulation_mode": "heating",
169168
"regulation_modes": ["heating", "off", "bleeding_cold", "bleeding_hot"],
169+
"select_regulation_mode": "heating",
170170
"sensors": {
171171
"outdoor_temperature": 24.9
172172
},
@@ -239,7 +239,7 @@
239239
"model": "Jip",
240240
"name": "Woonkamer",
241241
"preset_modes": ["home", "asleep", "away", "vacation", "no_frost"],
242-
"selected_schedule": "None",
242+
"select_schedule": "None",
243243
"sensors": {
244244
"battery": 100,
245245
"humidity": 56.2,

‎fixtures/adam_multiple_devices_per_zone/all_data.json‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -117,7 +117,7 @@
117117
"model": "Lisa",
118118
"name": "Zone Thermostat Jessie",
119119
"preset_modes": ["home", "asleep", "away", "vacation", "no_frost"],
120-
"selected_schedule": "CV Jessie",
120+
"select_schedule": "CV Jessie",
121121
"sensors": {
122122
"battery": 37,
123123
"setpoint": 15.0,
@@ -239,7 +239,7 @@
239239
"model": "Lisa",
240240
"name": "Zone Lisa WK",
241241
"preset_modes": ["home", "asleep", "away", "vacation", "no_frost"],
242-
"selected_schedule": "GF7 Woonkamer",
242+
"select_schedule": "GF7 Woonkamer",
243243
"sensors": {
244244
"battery": 34,
245245
"setpoint": 21.5,
@@ -311,7 +311,7 @@
311311
"model": "Lisa",
312312
"name": "Zone Lisa Bios",
313313
"preset_modes": ["home", "asleep", "away", "vacation", "no_frost"],
314-
"selected_schedule": "None",
314+
"select_schedule": "None",
315315
"sensors": {
316316
"battery": 67,
317317
"setpoint": 13.0,
@@ -345,7 +345,7 @@
345345
"model": "Tom/Floor",
346346
"name": "CV Kraan Garage",
347347
"preset_modes": ["home", "asleep", "away", "vacation", "no_frost"],
348-
"selected_schedule": "None",
348+
"select_schedule": "None",
349349
"sensors": {
350350
"battery": 68,
351351
"setpoint": 5.5,
@@ -381,7 +381,7 @@
381381
"model": "Lisa",
382382
"name": "Zone Thermostat Badkamer",
383383
"preset_modes": ["home", "asleep", "away", "vacation", "no_frost"],
384-
"selected_schedule": "Badkamer Schema",
384+
"select_schedule": "Badkamer Schema",
385385
"sensors": {
386386
"battery": 92,
387387
"setpoint": 14.0,
@@ -407,7 +407,7 @@
407407
"mac_address": "012345670001",
408408
"model": "Gateway",
409409
"name": "Adam",
410-
"regulation_mode": "heating",
410+
"select_regulation_mode": "heating",
411411
"sensors": {
412412
"outdoor_temperature": 7.81
413413
},

‎fixtures/adam_onoff_cooling_fake_firmware/all_data.json‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -47,14 +47,14 @@
4747
"mac_address": "012345670001",
4848
"model": "Gateway",
4949
"name": "Adam",
50-
"regulation_mode": "cooling",
5150
"regulation_modes": [
5251
"heating",
5352
"off",
5453
"bleeding_cold",
5554
"bleeding_hot",
5655
"cooling"
5756
],
57+
"select_regulation_mode": "cooling",
5858
"sensors": {
5959
"outdoor_temperature": 13.4
6060
},
@@ -72,7 +72,7 @@
7272
"model": "ThermoTouch",
7373
"name": "Thermostaat WK",
7474
"preset_modes": ["no_frost", "vacation", "away", "home", "asleep"],
75-
"selected_schedule": "Werkdag schema",
75+
"select_schedule": "Werkdag schema",
7676
"sensors": {
7777
"setpoint_high": 21.5,
7878
"setpoint_low": 4.0,

‎fixtures/adam_plus_anna/all_data.json‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@
5656
"mac_address": "012345670001",
5757
"model": "Gateway",
5858
"name": "Adam",
59-
"regulation_mode": "heating",
59+
"select_regulation_mode": "heating",
6060
"sensors": {
6161
"outdoor_temperature": 11.9
6262
},
@@ -73,7 +73,7 @@
7373
"model": "ThermoTouch",
7474
"name": "Anna",
7575
"preset_modes": ["home", "asleep", "away", "vacation", "no_frost"],
76-
"selected_schedule": "Weekschema",
76+
"select_schedule": "Weekschema",
7777
"sensors": {
7878
"setpoint": 20.5,
7979
"temperature": 20.5

‎fixtures/adam_plus_anna_copy_with_error_domain_added/all_data.json‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@
5656
"mac_address": "0123456789AB",
5757
"model": "Gateway",
5858
"name": "Adam",
59-
"regulation_mode": "heating",
59+
"select_regulation_mode": "heating",
6060
"vendor": "Plugwise",
6161
"zigbee_mac_address": "0123456789AB"
6262
},
@@ -70,7 +70,7 @@
7070
"model": "ThermoTouch",
7171
"name": "Anna",
7272
"preset_modes": ["home", "away", "no_frost", "asleep", "vacation"],
73-
"selected_schedule": "None",
73+
"select_schedule": "None",
7474
"sensors": {
7575
"setpoint": 20.5,
7676
"temperature": 20.5

‎fixtures/adam_plus_anna_new/all_data.json‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -129,7 +129,7 @@
129129
"model": "ThermoTouch",
130130
"name": "Anna",
131131
"preset_modes": ["home", "asleep", "away", "vacation", "no_frost"],
132-
"selected_schedule": "Weekschema",
132+
"select_schedule": "Weekschema",
133133
"sensors": {
134134
"setpoint": 18.5,
135135
"temperature": 18.1
@@ -153,8 +153,8 @@
153153
"mac_address": "012345670001",
154154
"model": "Gateway",
155155
"name": "Adam",
156-
"regulation_mode": "heating",
157156
"regulation_modes": ["heating", "off", "bleeding_cold", "bleeding_hot"],
157+
"select_regulation_mode": "heating",
158158
"sensors": {
159159
"outdoor_temperature": -1.25
160160
},
@@ -175,7 +175,7 @@
175175
"model": "Lisa",
176176
"name": "Lisa Badkamer",
177177
"preset_modes": ["home", "asleep", "away", "vacation", "no_frost"],
178-
"selected_schedule": "Badkamer",
178+
"select_schedule": "Badkamer",
179179
"sensors": {
180180
"battery": 56,
181181
"setpoint": 15.0,

‎fixtures/adam_zone_per_device/all_data.json‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -117,7 +117,7 @@
117117
"model": "Lisa",
118118
"name": "Zone Thermostat Jessie",
119119
"preset_modes": ["home", "asleep", "away", "vacation", "no_frost"],
120-
"selected_schedule": "CV Jessie",
120+
"select_schedule": "CV Jessie",
121121
"sensors": {
122122
"battery": 37,
123123
"setpoint": 16.0,
@@ -239,7 +239,7 @@
239239
"model": "Lisa",
240240
"name": "Zone Lisa WK",
241241
"preset_modes": ["home", "asleep", "away", "vacation", "no_frost"],
242-
"selected_schedule": "GF7 Woonkamer",
242+
"select_schedule": "GF7 Woonkamer",
243243
"sensors": {
244244
"battery": 34,
245245
"setpoint": 21.5,
@@ -311,7 +311,7 @@
311311
"model": "Lisa",
312312
"name": "Zone Lisa Bios",
313313
"preset_modes": ["home", "asleep", "away", "vacation", "no_frost"],
314-
"selected_schedule": "None",
314+
"select_schedule": "None",
315315
"sensors": {
316316
"battery": 67,
317317
"setpoint": 13.0,
@@ -345,7 +345,7 @@
345345
"model": "Tom/Floor",
346346
"name": "CV Kraan Garage",
347347
"preset_modes": ["home", "asleep", "away", "vacation", "no_frost"],
348-
"selected_schedule": "None",
348+
"select_schedule": "None",
349349
"sensors": {
350350
"battery": 68,
351351
"setpoint": 5.5,
@@ -381,7 +381,7 @@
381381
"model": "Lisa",
382382
"name": "Zone Thermostat Badkamer",
383383
"preset_modes": ["home", "asleep", "away", "vacation", "no_frost"],
384-
"selected_schedule": "Badkamer Schema",
384+
"select_schedule": "Badkamer Schema",
385385
"sensors": {
386386
"battery": 92,
387387
"setpoint": 14.0,
@@ -407,7 +407,7 @@
407407
"mac_address": "012345670001",
408408
"model": "Gateway",
409409
"name": "Adam",
410-
"regulation_mode": "heating",
410+
"select_regulation_mode": "heating",
411411
"sensors": {
412412
"outdoor_temperature": 7.69
413413
},

‎fixtures/anna_elga_2/all_data.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@
4646
"model": "ThermoTouch",
4747
"name": "Anna",
4848
"preset_modes": ["away", "no_frost", "vacation", "home", "asleep"],
49-
"selected_schedule": "Thermostat schedule",
49+
"select_schedule": "Thermostat schedule",
5050
"sensors": {
5151
"cooling_activation_outdoor_temperature": 26.0,
5252
"cooling_deactivation_threshold": 3.0,

0 commit comments

Comments
 (0)