Skip to content

Commit 76e68f0

Browse files
committed
Save updatef fixture, copy to test-json
1 parent 7b42aaf commit 76e68f0

File tree

2 files changed

+441
-347
lines changed

2 files changed

+441
-347
lines changed

fixtures/adam_plus_anna_new/data.json

Lines changed: 124 additions & 77 deletions
Original file line numberDiff line numberDiff line change
@@ -17,24 +17,38 @@
1717
"model": "Generic heater",
1818
"name": "OpenTherm",
1919
"sensors": {
20-
"intended_boiler_temperature": 23.9,
21-
"water_temperature": 30.0
20+
"intended_boiler_temperature": 22.5,
21+
"water_temperature": 43.0
2222
},
2323
"switches": {
2424
"dhw_cm_switch": false
2525
}
2626
},
27-
"10016900610d4c7481df78c89606ef22": {
27+
"14df5c4dc8cb4ba69f9d1ac0eaf7c5c6": {
2828
"available": true,
29-
"dev_class": "valve_actuator_plug",
30-
"location": "d9786723dbcf4f19b5c629a54629f9c7",
31-
"model_id": "TS0011",
32-
"name": "Aanvoer water afsluiter (nous lz3)",
33-
"switches": {
34-
"relay": false
29+
"binary_sensors": {
30+
"low_battery": false
31+
},
32+
"dev_class": "zone_thermostat",
33+
"hardware": "1",
34+
"location": "f2bf9048bef64cc5b6d5110154e33c81",
35+
"model": "Emma",
36+
"model_id": "170-01",
37+
"name": "Emma",
38+
"sensors": {
39+
"battery": 100,
40+
"humidity": 65.0,
41+
"setpoint": 20.5,
42+
"temperature": 19.7
43+
},
44+
"temperature_offset": {
45+
"lower_bound": -2.0,
46+
"resolution": 0.1,
47+
"setpoint": 0.0,
48+
"upper_bound": 2.0
3549
},
36-
"vendor": "_TZ3000_abjodzas",
37-
"zigbee_mac_address": "A4C13862AF9917B1"
50+
"vendor": "Plugwise",
51+
"zigbee_mac_address": "60EFABFFFE89CBA0"
3852
},
3953
"1772a4ea304041adb83f357b751341ff": {
4054
"available": true,
@@ -49,11 +63,11 @@
4963
"model_id": "106-03",
5064
"name": "Tom Badkamer",
5165
"sensors": {
52-
"battery": 99,
53-
"setpoint": 18.0,
54-
"temperature": 17.6,
55-
"temperature_difference": -0.2,
56-
"valve_position": 100
66+
"battery": 60,
67+
"setpoint": 12.0,
68+
"temperature": 19.0,
69+
"temperature_difference": -0.4,
70+
"valve_position": 0.0
5771
},
5872
"temperature_offset": {
5973
"lower_bound": -2.0,
@@ -62,7 +76,7 @@
6276
"upper_bound": 2.0
6377
},
6478
"vendor": "Plugwise",
65-
"zigbee_mac_address": "000D6F000C8FF5EE"
79+
"zigbee_mac_address": "000D6F000C8FCBA0"
6680
},
6781
"2568cc4b9c1e401495d4741a5f89bee1": {
6882
"available": true,
@@ -73,55 +87,38 @@
7387
"model_id": "160-01",
7488
"name": "Plug MediaTV",
7589
"sensors": {
76-
"electricity_consumed": 14.8,
77-
"electricity_consumed_interval": 3.0,
90+
"electricity_consumed": 15.8,
91+
"electricity_consumed_interval": 4.0,
7892
"electricity_produced": 0.0,
7993
"electricity_produced_interval": 0.0
8094
},
8195
"switches": {
82-
"lock": true,
96+
"lock": false,
8397
"relay": true
8498
},
8599
"vendor": "Plugwise",
86-
"zigbee_mac_address": "000D6F000D13CCFD"
100+
"zigbee_mac_address": "000D6F000D13CBA0"
87101
},
88102
"29542b2b6a6a4169acecc15c72a599b8": {
89103
"available": true,
90-
"dev_class": "computer_desktop_plug",
104+
"dev_class": "water_heater_vessel_plug",
91105
"firmware": "2020-11-10T01:00:00+01:00",
92-
"location": "f2bf9048bef64cc5b6d5110154e33c81",
106+
"location": "8201a2ac4d1b4303bf994e18d67311eb",
93107
"model": "Plug",
94108
"model_id": "160-01",
95-
"name": "Plug Werkplek",
109+
"name": "Plug Thermex Boiler",
96110
"sensors": {
97-
"electricity_consumed": 91.3,
98-
"electricity_consumed_interval": 23.0,
111+
"electricity_consumed": 0.69,
112+
"electricity_consumed_interval": 0.0,
99113
"electricity_produced": 0.0,
100114
"electricity_produced_interval": 0.0
101115
},
102116
"switches": {
103-
"lock": false,
117+
"lock": true,
104118
"relay": true
105119
},
106120
"vendor": "Plugwise",
107-
"zigbee_mac_address": "000D6F000D13CA9A"
108-
},
109-
"67d73d0bd469422db25a618a5fb8eeb0": {
110-
"available": true,
111-
"dev_class": "heater_central_plug",
112-
"location": "b4f211175e124df59603412bafa77a34",
113-
"model": "Aqara Smart Plug",
114-
"model_id": "lumi.plug.maeu01",
115-
"name": "SmartPlug Floor 0",
116-
"sensors": {
117-
"electricity_consumed_interval": 0.0
118-
},
119-
"switches": {
120-
"lock": false,
121-
"relay": true
122-
},
123-
"vendor": "LUMI",
124-
"zigbee_mac_address": "54EF4410002C97F2"
121+
"zigbee_mac_address": "000D6F000D13CBA0"
125122
},
126123
"854f8a9b0e7e425db97f1f110e1ce4b3": {
127124
"available": true,
@@ -132,16 +129,16 @@
132129
"model_id": "160-01",
133130
"name": "Plug Vloerverwarming",
134131
"sensors": {
135-
"electricity_consumed": 43.8,
136-
"electricity_consumed_interval": 0.0,
132+
"electricity_consumed": 45.0,
133+
"electricity_consumed_interval": 12.0,
137134
"electricity_produced": 0.0,
138135
"electricity_produced_interval": 0.0
139136
},
140137
"switches": {
141138
"relay": true
142139
},
143140
"vendor": "Plugwise",
144-
"zigbee_mac_address": "000D6F000D13CB6F"
141+
"zigbee_mac_address": "000D6F000D13CBA0"
145142
},
146143
"ad4838d7d35c4d6ea796ee12ae5aedf8": {
147144
"dev_class": "thermostat",
@@ -150,8 +147,8 @@
150147
"model_id": "143.1",
151148
"name": "Anna",
152149
"sensors": {
153-
"setpoint": 18.5,
154-
"temperature": 18.4
150+
"setpoint": 20.5,
151+
"temperature": 20.1
155152
},
156153
"vendor": "Plugwise"
157154
},
@@ -160,28 +157,58 @@
160157
"plugwise_notification": false
161158
},
162159
"dev_class": "gateway",
163-
"firmware": "3.7.8",
164-
"gateway_modes": ["away", "full", "vacation"],
160+
"firmware": "3.9.0",
161+
"gateway_modes": [
162+
"away",
163+
"full",
164+
"vacation"
165+
],
165166
"hardware": "AME Smile 2.0 board",
166167
"location": "bc93488efab249e5bc54fd7e175a6f91",
167-
"mac_address": "012345679891",
168+
"mac_address": "D40FB201CBA0",
168169
"model": "Gateway",
169170
"model_id": "smile_open_therm",
170171
"name": "Adam",
171172
"notifications": {},
172-
"regulation_modes": ["bleeding_hot", "bleeding_cold", "off", "heating"],
173+
"regulation_modes": [
174+
"bleeding_cold",
175+
"heating",
176+
"off",
177+
"bleeding_hot"
178+
],
173179
"select_gateway_mode": "full",
174180
"select_regulation_mode": "heating",
175181
"sensors": {
176-
"outdoor_temperature": 9.19
182+
"outdoor_temperature": 15.1
177183
},
178184
"vendor": "Plugwise",
179-
"zigbee_mac_address": "000D6F000D5A168D"
185+
"zigbee_mac_address": "000D6F000D5ACBA0"
186+
},
187+
"da575e9e09b947e281fb6e3ebce3b174": {
188+
"available": true,
189+
"binary_sensors": {
190+
"low_battery": false
191+
},
192+
"dev_class": "zone_thermometer",
193+
"firmware": "2020-09-01T02:00:00+02:00",
194+
"hardware": "1",
195+
"location": "f2bf9048bef64cc5b6d5110154e33c81",
196+
"model": "Jip",
197+
"model_id": "168-01",
198+
"name": "Jip",
199+
"sensors": {
200+
"battery": 100,
201+
"humidity": 65.8,
202+
"setpoint": 20.5,
203+
"temperature": 20.4
204+
},
205+
"vendor": "Plugwise",
206+
"zigbee_mac_address": "70AC08FFFEE1CBA0"
180207
},
181208
"e2f4322d57924fa090fbbc48b3a140dc": {
182209
"available": true,
183210
"binary_sensors": {
184-
"low_battery": true
211+
"low_battery": false
185212
},
186213
"dev_class": "zone_thermostat",
187214
"firmware": "2016-10-10T02:00:00+02:00",
@@ -191,9 +218,9 @@
191218
"model_id": "158-01",
192219
"name": "Lisa Badkamer",
193220
"sensors": {
194-
"battery": 14,
195-
"setpoint": 18.0,
196-
"temperature": 16.5
221+
"battery": 71,
222+
"setpoint": 12.0,
223+
"temperature": 18.7
197224
},
198225
"temperature_offset": {
199226
"lower_bound": -2.0,
@@ -202,7 +229,7 @@
202229
"upper_bound": 2.0
203230
},
204231
"vendor": "Plugwise",
205-
"zigbee_mac_address": "000D6F000C869B61"
232+
"zigbee_mac_address": "000D6F000C86CBA0"
206233
},
207234
"e8ef2a01ed3b4139a53bf749204fe6b4": {
208235
"dev_class": "switching",
@@ -221,65 +248,85 @@
221248
"active_preset": "home",
222249
"available_schedules": [
223250
"Badkamer",
224-
"Test",
225251
"Vakantie",
226252
"Weekschema",
253+
"Test",
227254
"off"
228255
],
229256
"climate_mode": "auto",
230257
"control_state": "heating",
231258
"dev_class": "climate",
232259
"model": "ThermoZone",
233260
"name": "Living room",
234-
"preset_modes": ["no_frost", "asleep", "vacation", "home", "away"],
261+
"preset_modes": [
262+
"vacation",
263+
"no_frost",
264+
"asleep",
265+
"home",
266+
"away"
267+
],
235268
"select_schedule": "Weekschema",
236269
"sensors": {
237-
"electricity_consumed": 149.9,
270+
"electricity_consumed": 60.8,
238271
"electricity_produced": 0.0,
239-
"temperature": 18.4
272+
"temperature": 19.7
240273
},
241274
"thermostat": {
242275
"lower_bound": 1.0,
243276
"resolution": 0.01,
244-
"setpoint": 18.5,
277+
"setpoint": 20.5,
245278
"upper_bound": 35.0
246279
},
247280
"thermostats": {
248-
"primary": ["ad4838d7d35c4d6ea796ee12ae5aedf8"],
281+
"primary": [
282+
"ad4838d7d35c4d6ea796ee12ae5aedf8",
283+
"14df5c4dc8cb4ba69f9d1ac0eaf7c5c6",
284+
"da575e9e09b947e281fb6e3ebce3b174"
285+
],
249286
"secondary": []
250287
},
251288
"vendor": "Plugwise"
252289
},
253290
"f871b8c4d63549319221e294e4f88074": {
254-
"active_preset": "home",
291+
"active_preset": "vacation",
255292
"available_schedules": [
256293
"Badkamer",
257-
"Test",
258294
"Vakantie",
259295
"Weekschema",
296+
"Test",
260297
"off"
261298
],
262-
"climate_mode": "auto",
263-
"control_state": "preheating",
299+
"climate_mode": "heat",
300+
"control_state": "idle",
264301
"dev_class": "climate",
265302
"model": "ThermoZone",
266303
"name": "Bathroom",
267-
"preset_modes": ["no_frost", "asleep", "vacation", "home", "away"],
268-
"select_schedule": "Badkamer",
304+
"preset_modes": [
305+
"vacation",
306+
"no_frost",
307+
"asleep",
308+
"home",
309+
"away"
310+
],
311+
"select_schedule": "off",
269312
"sensors": {
270313
"electricity_consumed": 0.0,
271314
"electricity_produced": 0.0,
272-
"temperature": 16.5
315+
"temperature": 18.7
273316
},
274317
"thermostat": {
275318
"lower_bound": 0.0,
276319
"resolution": 0.01,
277-
"setpoint": 18.0,
320+
"setpoint": 12.0,
278321
"upper_bound": 99.9
279322
},
280323
"thermostats": {
281-
"primary": ["e2f4322d57924fa090fbbc48b3a140dc"],
282-
"secondary": ["1772a4ea304041adb83f357b751341ff"]
324+
"primary": [
325+
"e2f4322d57924fa090fbbc48b3a140dc"
326+
],
327+
"secondary": [
328+
"1772a4ea304041adb83f357b751341ff"
329+
]
283330
},
284331
"vendor": "Plugwise"
285332
}

0 commit comments

Comments
 (0)