Skip to content

Commit 8675504

Browse files
committed
Save updated fixture, update related test-json
1 parent a1691e5 commit 8675504

File tree

2 files changed

+305
-247
lines changed

2 files changed

+305
-247
lines changed

fixtures/adam_anna_new_2/data.json

Lines changed: 68 additions & 39 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,8 @@
33
"available": true,
44
"binary_sensors": {
55
"dhw_state": false,
6-
"flame_state": false,
7-
"heating_state": false
6+
"flame_state": true,
7+
"heating_state": true
88
},
99
"dev_class": "heater_central",
1010
"location": "bc93488efab249e5bc54fd7e175a6f91",
@@ -17,25 +17,29 @@
1717
"model": "Generic heater",
1818
"name": "OpenTherm",
1919
"sensors": {
20-
"intended_boiler_temperature": 0.0,
21-
"water_temperature": 34.0
20+
"intended_boiler_temperature": 22.5,
21+
"water_temperature": 35.0
2222
},
2323
"switches": {
2424
"dhw_cm_switch": false
2525
}
2626
},
2727
"14df5c4dc8cb4ba69f9d1ac0eaf7c5c6": {
2828
"available": true,
29+
"binary_sensors": {
30+
"low_battery": false
31+
},
2932
"dev_class": "zone_thermostat",
3033
"hardware": "1",
3134
"location": "f2bf9048bef64cc5b6d5110154e33c81",
3235
"model": "Emma",
3336
"model_id": "170-01",
3437
"name": "Emma",
3538
"sensors": {
36-
"humidity": 61.8,
37-
"setpoint": 15.0,
38-
"temperature": 21.9
39+
"battery": 100,
40+
"humidity": 65.0,
41+
"setpoint": 21.0,
42+
"temperature": 19.5
3943
},
4044
"temperature_offset": {
4145
"lower_bound": -2.0,
@@ -44,7 +48,7 @@
4448
"upper_bound": 2.0
4549
},
4650
"vendor": "Plugwise",
47-
"zigbee_mac_address": "60EFABFFFE89965C"
51+
"zigbee_mac_address": "60EFABFFFE89CBA0"
4852
},
4953
"1772a4ea304041adb83f357b751341ff": {
5054
"available": true,
@@ -61,7 +65,7 @@
6165
"sensors": {
6266
"battery": 60,
6367
"setpoint": 12.0,
64-
"temperature": 19.1,
68+
"temperature": 19.0,
6569
"temperature_difference": -0.4,
6670
"valve_position": 0.0
6771
},
@@ -72,7 +76,7 @@
7276
"upper_bound": 2.0
7377
},
7478
"vendor": "Plugwise",
75-
"zigbee_mac_address": "000D6F000C8FF5EE"
79+
"zigbee_mac_address": "000D6F000C8FCBA0"
7680
},
7781
"2568cc4b9c1e401495d4741a5f89bee1": {
7882
"available": true,
@@ -83,8 +87,8 @@
8387
"model_id": "160-01",
8488
"name": "Plug MediaTV",
8589
"sensors": {
86-
"electricity_consumed": 15.6,
87-
"electricity_consumed_interval": 4.0,
90+
"electricity_consumed": 15.8,
91+
"electricity_consumed_interval": 3.0,
8892
"electricity_produced": 0.0,
8993
"electricity_produced_interval": 0.0
9094
},
@@ -93,7 +97,7 @@
9397
"relay": true
9498
},
9599
"vendor": "Plugwise",
96-
"zigbee_mac_address": "000D6F000D13CCFD"
100+
"zigbee_mac_address": "000D6F000D13CBA0"
97101
},
98102
"29542b2b6a6a4169acecc15c72a599b8": {
99103
"available": true,
@@ -114,7 +118,7 @@
114118
"relay": true
115119
},
116120
"vendor": "Plugwise",
117-
"zigbee_mac_address": "000D6F000D13CA9A"
121+
"zigbee_mac_address": "000D6F000D13CBA0"
118122
},
119123
"854f8a9b0e7e425db97f1f110e1ce4b3": {
120124
"available": true,
@@ -125,16 +129,16 @@
125129
"model_id": "160-01",
126130
"name": "Plug Vloerverwarming",
127131
"sensors": {
128-
"electricity_consumed": 0.0,
132+
"electricity_consumed": 49.0,
129133
"electricity_consumed_interval": 0.0,
130134
"electricity_produced": 0.0,
131135
"electricity_produced_interval": 0.0
132136
},
133137
"switches": {
134-
"relay": false
138+
"relay": true
135139
},
136140
"vendor": "Plugwise",
137-
"zigbee_mac_address": "000D6F000D13CB6F"
141+
"zigbee_mac_address": "000D6F000D13CBA0"
138142
},
139143
"ad4838d7d35c4d6ea796ee12ae5aedf8": {
140144
"dev_class": "thermostat",
@@ -143,8 +147,8 @@
143147
"model_id": "143.1",
144148
"name": "Anna",
145149
"sensors": {
146-
"setpoint": 15.0,
147-
"temperature": 19.5
150+
"setpoint": 21.0,
151+
"temperature": 19.9
148152
},
149153
"vendor": "Plugwise"
150154
},
@@ -154,22 +158,31 @@
154158
},
155159
"dev_class": "gateway",
156160
"firmware": "3.9.0",
157-
"gateway_modes": ["away", "full", "vacation"],
161+
"gateway_modes": [
162+
"away",
163+
"full",
164+
"vacation"
165+
],
158166
"hardware": "AME Smile 2.0 board",
159167
"location": "bc93488efab249e5bc54fd7e175a6f91",
160-
"mac_address": "D40FB2019891",
168+
"mac_address": "D40FB201CBA0",
161169
"model": "Gateway",
162170
"model_id": "smile_open_therm",
163171
"name": "Adam",
164172
"notifications": {},
165-
"regulation_modes": ["bleeding_cold", "heating", "off", "bleeding_hot"],
173+
"regulation_modes": [
174+
"bleeding_cold",
175+
"heating",
176+
"off",
177+
"bleeding_hot"
178+
],
166179
"select_gateway_mode": "full",
167180
"select_regulation_mode": "heating",
168181
"sensors": {
169-
"outdoor_temperature": 13.9
182+
"outdoor_temperature": 15.6
170183
},
171184
"vendor": "Plugwise",
172-
"zigbee_mac_address": "000D6F000D5A168D"
185+
"zigbee_mac_address": "000D6F000D5ACBA0"
173186
},
174187
"da575e9e09b947e281fb6e3ebce3b174": {
175188
"available": true,
@@ -186,11 +199,11 @@
186199
"sensors": {
187200
"battery": 100,
188201
"humidity": 63.9,
189-
"setpoint": 15.0,
190-
"temperature": 18.8
202+
"setpoint": 21.0,
203+
"temperature": 19.3
191204
},
192205
"vendor": "Plugwise",
193-
"zigbee_mac_address": "70AC08FFFEE16437"
206+
"zigbee_mac_address": "70AC08FFFEE1CBA0"
194207
},
195208
"e2f4322d57924fa090fbbc48b3a140dc": {
196209
"available": true,
@@ -207,7 +220,7 @@
207220
"sensors": {
208221
"battery": 71,
209222
"setpoint": 12.0,
210-
"temperature": 18.8
223+
"temperature": 18.7
211224
},
212225
"temperature_offset": {
213226
"lower_bound": -2.0,
@@ -216,7 +229,7 @@
216229
"upper_bound": 2.0
217230
},
218231
"vendor": "Plugwise",
219-
"zigbee_mac_address": "000D6F000C869B61"
232+
"zigbee_mac_address": "000D6F000C86CBA0"
220233
},
221234
"e8ef2a01ed3b4139a53bf749204fe6b4": {
222235
"dev_class": "switching",
@@ -232,7 +245,7 @@
232245
"vendor": "Plugwise"
233246
},
234247
"f2bf9048bef64cc5b6d5110154e33c81": {
235-
"active_preset": "vacation",
248+
"active_preset": "home",
236249
"available_schedules": [
237250
"Badkamer",
238251
"Vakantie",
@@ -241,21 +254,27 @@
241254
"off"
242255
],
243256
"climate_mode": "heat",
244-
"control_state": "idle",
257+
"control_state": "heating",
245258
"dev_class": "climate",
246259
"model": "ThermoZone",
247260
"name": "Living room",
248-
"preset_modes": ["vacation", "no_frost", "asleep", "home", "away"],
261+
"preset_modes": [
262+
"vacation",
263+
"no_frost",
264+
"asleep",
265+
"home",
266+
"away"
267+
],
249268
"select_schedule": "off",
250269
"sensors": {
251-
"electricity_consumed": 15.6,
270+
"electricity_consumed": 64.8,
252271
"electricity_produced": 0.0,
253-
"temperature": 18.8
272+
"temperature": 19.3
254273
},
255274
"thermostat": {
256275
"lower_bound": 1.0,
257276
"resolution": 0.01,
258-
"setpoint": 15.0,
277+
"setpoint": 21.0,
259278
"upper_bound": 35.0
260279
},
261280
"thermostats": {
@@ -282,12 +301,18 @@
282301
"dev_class": "climate",
283302
"model": "ThermoZone",
284303
"name": "Bathroom",
285-
"preset_modes": ["vacation", "no_frost", "asleep", "home", "away"],
304+
"preset_modes": [
305+
"vacation",
306+
"no_frost",
307+
"asleep",
308+
"home",
309+
"away"
310+
],
286311
"select_schedule": "off",
287312
"sensors": {
288313
"electricity_consumed": 0.0,
289314
"electricity_produced": 0.0,
290-
"temperature": 18.8
315+
"temperature": 18.7
291316
},
292317
"thermostat": {
293318
"lower_bound": 0.0,
@@ -296,8 +321,12 @@
296321
"upper_bound": 99.9
297322
},
298323
"thermostats": {
299-
"primary": ["e2f4322d57924fa090fbbc48b3a140dc"],
300-
"secondary": ["1772a4ea304041adb83f357b751341ff"]
324+
"primary": [
325+
"e2f4322d57924fa090fbbc48b3a140dc"
326+
],
327+
"secondary": [
328+
"1772a4ea304041adb83f357b751341ff"
329+
]
301330
},
302331
"vendor": "Plugwise"
303332
}

0 commit comments

Comments
 (0)