Skip to content

Commit c696b59

Browse files
CoMPaTechCoMPaTech
committed
Refactor for #482 
1 parent 59bff6a commit c696b59

File tree

5 files changed

+648
-538
lines changed

5 files changed

+648
-538
lines changed

‎tests/data/combined/adam_jip.json‎

Lines changed: 253 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,253 @@
1+
{
2+
"e4684553153b44afbef2200885f379dc": {
3+
"dev_class": "heater_central",
4+
"location": "9e4433a9d69f40b3aefd15e74395eaec",
5+
"model": "10.20",
6+
"name": "OpenTherm",
7+
"vendor": "Remeha B.V.",
8+
"maximum_boiler_temperature": {
9+
"setpoint": 90,
10+
"lower_bound": 20,
11+
"upper_bound": 90,
12+
"resolution": 0.01
13+
},
14+
"max_dhw_temperature": {
15+
"setpoint": 60,
16+
"lower_bound": 40,
17+
"upper_bound": 60,
18+
"resolution": 0.01
19+
},
20+
"available": true,
21+
"binary_sensors": {
22+
"dhw_state": false,
23+
"heating_state": false,
24+
"flame_state": false
25+
},
26+
"sensors": {
27+
"water_temperature": 37.3,
28+
"intended_boiler_temperature": 0,
29+
"modulation_level": 0,
30+
"return_temperature": 37.1,
31+
"water_pressure": 1.4
32+
},
33+
"switches": {
34+
"dhw_cm_switch": false
35+
}
36+
},
37+
"a6abc6a129ee499c88a4d420cc413b47": {
38+
"dev_class": "zone_thermostat",
39+
"firmware": "2016-10-27T02:00:00+02:00",
40+
"hardware": "255",
41+
"location": "d58fec52899f4f1c92e4f8fad6d8c48c",
42+
"model": "Lisa",
43+
"name": "Logeerkamer",
44+
"zigbee_mac_address": "ABCD012345670A01",
45+
"vendor": "Plugwise",
46+
"thermostat": {
47+
"setpoint": 13,
48+
"lower_bound": 0,
49+
"upper_bound": 99.9,
50+
"resolution": 0.01
51+
},
52+
"available": true,
53+
"preset_modes": ["home", "asleep", "away", "vacation", "no_frost"],
54+
"active_preset": "home",
55+
"available_schedules": ["None"],
56+
"select_schedule": "None",
57+
"control_state": "off",
58+
"mode": "heat",
59+
"sensors": {
60+
"temperature": 30,
61+
"setpoint": 13,
62+
"battery": 80
63+
}
64+
},
65+
"1346fbd8498d4dbcab7e18d51b771f3d": {
66+
"dev_class": "zone_thermostat",
67+
"firmware": "2016-10-27T02:00:00+02:00",
68+
"hardware": "255",
69+
"location": "06aecb3d00354375924f50c47af36bd2",
70+
"model": "Lisa",
71+
"name": "Slaapkamer",
72+
"zigbee_mac_address": "ABCD012345670A03",
73+
"vendor": "Plugwise",
74+
"thermostat": {
75+
"setpoint": 13,
76+
"lower_bound": 0,
77+
"upper_bound": 99.9,
78+
"resolution": 0.01
79+
},
80+
"available": true,
81+
"preset_modes": ["home", "asleep", "away", "vacation", "no_frost"],
82+
"active_preset": "no_frost",
83+
"available_schedules": ["None"],
84+
"select_schedule": "None",
85+
"control_state": "off",
86+
"mode": "heat",
87+
"sensors": {
88+
"temperature": 24.2,
89+
"setpoint": 13,
90+
"battery": 92
91+
}
92+
},
93+
"833de10f269c4deab58fb9df69901b4e": {
94+
"dev_class": "thermo_sensor",
95+
"firmware": "2020-11-04T01:00:00+01:00",
96+
"hardware": "1",
97+
"location": "13228dab8ce04617af318a2888b3c548",
98+
"model": "Tom/Floor",
99+
"name": "Tom Woonkamer",
100+
"zigbee_mac_address": "ABCD012345670A09",
101+
"vendor": "Plugwise",
102+
"available": true,
103+
"sensors": {
104+
"temperature": 24,
105+
"setpoint": 9,
106+
"temperature_difference": 1.8,
107+
"valve_position": 100
108+
}
109+
},
110+
"6f3e9d7084214c21b9dfa46f6eeb8700": {
111+
"dev_class": "zone_thermostat",
112+
"firmware": "2016-10-27T02:00:00+02:00",
113+
"hardware": "255",
114+
"location": "d27aede973b54be484f6842d1b2802ad",
115+
"model": "Lisa",
116+
"name": "Kinderkamer",
117+
"zigbee_mac_address": "ABCD012345670A02",
118+
"vendor": "Plugwise",
119+
"thermostat": {
120+
"setpoint": 13,
121+
"lower_bound": 0,
122+
"upper_bound": 99.9,
123+
"resolution": 0.01
124+
},
125+
"available": true,
126+
"preset_modes": ["home", "asleep", "away", "vacation", "no_frost"],
127+
"active_preset": "home",
128+
"available_schedules": ["None"],
129+
"select_schedule": "None",
130+
"control_state": "off",
131+
"mode": "heat",
132+
"sensors": {
133+
"temperature": 30,
134+
"setpoint": 13,
135+
"battery": 79
136+
}
137+
},
138+
"f61f1a2535f54f52ad006a3d18e459ca": {
139+
"dev_class": "zone_thermometer",
140+
"firmware": "2020-09-01T02:00:00+02:00",
141+
"hardware": "1",
142+
"location": "13228dab8ce04617af318a2888b3c548",
143+
"model": "Jip",
144+
"name": "Woonkamer",
145+
"zigbee_mac_address": "ABCD012345670A08",
146+
"vendor": "Plugwise",
147+
"thermostat": {
148+
"setpoint": 9,
149+
"lower_bound": 4,
150+
"upper_bound": 30,
151+
"resolution": 0.01
152+
},
153+
"available": true,
154+
"preset_modes": ["home", "asleep", "away", "vacation", "no_frost"],
155+
"active_preset": "home",
156+
"available_schedules": ["None"],
157+
"select_schedule": "None",
158+
"control_state": "off",
159+
"mode": "heat",
160+
"sensors": {
161+
"temperature": 27.4,
162+
"setpoint": 9,
163+
"battery": 100,
164+
"humidity": 56.2
165+
}
166+
},
167+
"d4496250d0e942cfa7aea3476e9070d5": {
168+
"dev_class": "thermo_sensor",
169+
"firmware": "2020-11-04T01:00:00+01:00",
170+
"hardware": "1",
171+
"location": "d27aede973b54be484f6842d1b2802ad",
172+
"model": "Tom/Floor",
173+
"name": "Tom Kinderkamer",
174+
"zigbee_mac_address": "ABCD012345670A04",
175+
"vendor": "Plugwise",
176+
"available": true,
177+
"sensors": {
178+
"temperature": 28.7,
179+
"setpoint": 13,
180+
"temperature_difference": 1.9,
181+
"valve_position": 0
182+
}
183+
},
184+
"356b65335e274d769c338223e7af9c33": {
185+
"dev_class": "thermo_sensor",
186+
"firmware": "2020-11-04T01:00:00+01:00",
187+
"hardware": "1",
188+
"location": "06aecb3d00354375924f50c47af36bd2",
189+
"model": "Tom/Floor",
190+
"name": "Tom Slaapkamer",
191+
"zigbee_mac_address": "ABCD012345670A05",
192+
"vendor": "Plugwise",
193+
"available": true,
194+
"sensors": {
195+
"temperature": 24.3,
196+
"setpoint": 13,
197+
"temperature_difference": 1.7,
198+
"valve_position": 0
199+
}
200+
},
201+
"b5c2386c6f6342669e50fe49dd05b188": {
202+
"dev_class": "gateway",
203+
"firmware": "3.2.8",
204+
"hardware": "AME Smile 2.0 board",
205+
"location": "9e4433a9d69f40b3aefd15e74395eaec",
206+
"mac_address": "012345670001",
207+
"model": "Gateway",
208+
"name": "Adam",
209+
"zigbee_mac_address": "ABCD012345670101",
210+
"vendor": "Plugwise",
211+
"select_regulation_mode": "heating",
212+
"regulation_modes": ["heating", "off", "bleeding_cold", "bleeding_hot"],
213+
"binary_sensors": {
214+
"plugwise_notification": false
215+
},
216+
"sensors": {
217+
"outdoor_temperature": 24.9
218+
}
219+
},
220+
"1da4d325838e4ad8aac12177214505c9": {
221+
"dev_class": "thermo_sensor",
222+
"firmware": "2020-11-04T01:00:00+01:00",
223+
"hardware": "1",
224+
"location": "d58fec52899f4f1c92e4f8fad6d8c48c",
225+
"model": "Tom/Floor",
226+
"name": "Tom Logeerkamer",
227+
"zigbee_mac_address": "ABCD012345670A07",
228+
"vendor": "Plugwise",
229+
"available": true,
230+
"sensors": {
231+
"temperature": 28.8,
232+
"setpoint": 13,
233+
"temperature_difference": 2,
234+
"valve_position": 0
235+
}
236+
},
237+
"457ce8414de24596a2d5e7dbc9c7682f": {
238+
"dev_class": "zz_misc",
239+
"location": "9e4433a9d69f40b3aefd15e74395eaec",
240+
"model": "lumi.plug.maeu01",
241+
"name": "Plug",
242+
"zigbee_mac_address": "ABCD012345670A06",
243+
"vendor": "LUMI",
244+
"available": true,
245+
"sensors": {
246+
"electricity_consumed_interval": 0
247+
},
248+
"switches": {
249+
"relay": false,
250+
"lock": true
251+
}
252+
}
253+
}

‎tests/data/combined/adam_plus_anna.json‎

Lines changed: 106 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,106 @@
1+
{
2+
"2743216f626f43948deec1f7ab3b3d70": {
3+
"dev_class": "heater_central",
4+
"location": "07d618f0bb80412687f065b8698ce3e7",
5+
"model": "Generic heater",
6+
"name": "OpenTherm",
7+
"maximum_boiler_temperature": {
8+
"setpoint": 80,
9+
"lower_bound": 0,
10+
"upper_bound": 100,
11+
"resolution": 1
12+
},
13+
"available": false,
14+
"binary_sensors": {
15+
"dhw_state": false,
16+
"heating_state": false,
17+
"flame_state": false
18+
},
19+
"sensors": {
20+
"water_temperature": 47,
21+
"intended_boiler_temperature": 0
22+
},
23+
"switches": {
24+
"dhw_cm_switch": false
25+
}
26+
},
27+
"aa6b0002df0a46e1b1eb94beb61eddfe": {
28+
"dev_class": "hometheater",
29+
"firmware": "2019-06-21T02:00:00+02:00",
30+
"location": "45d410adf8fd461e85cebf16d5ead542",
31+
"model": "Plug",
32+
"name": "MediaCenter",
33+
"zigbee_mac_address": "ABCD012345670A01",
34+
"vendor": "Plugwise",
35+
"available": true,
36+
"sensors": {
37+
"electricity_consumed": 10.3,
38+
"electricity_consumed_interval": 0,
39+
"electricity_produced": 0,
40+
"electricity_produced_interval": 0
41+
},
42+
"switches": {
43+
"relay": true,
44+
"lock": false
45+
}
46+
},
47+
"b128b4bbbd1f47e9bf4d756e8fb5ee94": {
48+
"dev_class": "gateway",
49+
"firmware": "3.0.15",
50+
"hardware": "AME Smile 2.0 board",
51+
"location": "07d618f0bb80412687f065b8698ce3e7",
52+
"mac_address": "012345670001",
53+
"model": "Gateway",
54+
"name": "Adam",
55+
"zigbee_mac_address": "ABCD012345670101",
56+
"vendor": "Plugwise",
57+
"select_regulation_mode": "heating",
58+
"binary_sensors": {
59+
"plugwise_notification": true
60+
},
61+
"sensors": {
62+
"outdoor_temperature": 11.9
63+
}
64+
},
65+
"ee62cad889f94e8ca3d09021f03a660b": {
66+
"dev_class": "thermostat",
67+
"location": "009490cc2f674ce6b576863fbb64f867",
68+
"model": "ThermoTouch",
69+
"name": "Anna",
70+
"vendor": "Plugwise",
71+
"thermostat": {
72+
"setpoint": 20.5,
73+
"lower_bound": 1,
74+
"upper_bound": 35,
75+
"resolution": 0.01
76+
},
77+
"preset_modes": ["home", "asleep", "away", "vacation", "no_frost"],
78+
"active_preset": "home",
79+
"available_schedules": ["Weekschema", "off"],
80+
"select_schedule": "Weekschema",
81+
"mode": "auto",
82+
"sensors": {
83+
"temperature": 20.5,
84+
"setpoint": 20.5
85+
}
86+
},
87+
"f2be121e4a9345ac83c6e99ed89a98be": {
88+
"dev_class": "computer_desktop",
89+
"firmware": "2019-06-21T02:00:00+02:00",
90+
"location": "5ccb6c41a7d9403988d261ceee04239f",
91+
"name": "Work-PC",
92+
"zigbee_mac_address": "ABCD012345670A02",
93+
"vendor": "Plugwise",
94+
"available": true,
95+
"sensors": {
96+
"electricity_consumed": 79.8,
97+
"electricity_consumed_interval": 7.03,
98+
"electricity_produced": 0,
99+
"electricity_produced_interval": 0
100+
},
101+
"switches": {
102+
"relay": true,
103+
"lock": false
104+
}
105+
}
106+
}

0 commit comments

Comments
 (0)