Skip to content

Commit 5f6d559

Browse files
bouwewbouwew
authored
Merge pull request #878 from plugwise/extra_fixture
Add an extra fixture for testing in the Integration
2 parents 45ab4e3 + afc7747 commit 5f6d559

3 files changed

Lines changed: 336 additions & 1 deletion

File tree

‎CHANGELOG.md‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,8 @@
22

33
## Ongoing
44

5-
- Add Add missing Emma firmware via PR [#863](https://github.com/plugwise/python-plugwise/pull/863)
5+
- Create an extra test-fixture for increased test coverage in the Integration via PR [#878](https://github.com/plugwise/python-plugwise/pull/878)
6+
- Add missing Emma firmware via PR [#863](https://github.com/plugwise/python-plugwise/pull/863)
67
- Improve test function added in #860 via PR [#862](https://github.com/plugwise/python-plugwise/pull/862)
78

89
## v1.11.3

‎fixtures/m_adam_heating_off_schedule/data.json‎

Lines changed: 309 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,309 @@
1+
{
2+
"056ee145a816487eaa69243c3280f8bf": {
3+
"available": true,
4+
"binary_sensors": {
5+
"dhw_state": false,
6+
"flame_state": false,
7+
"heating_state": false
8+
},
9+
"dev_class": "heater_central",
10+
"location": "bc93488efab249e5bc54fd7e175a6f91",
11+
"max_dhw_temperature": {
12+
"lower_bound": 40.0,
13+
"resolution": 0.01,
14+
"setpoint": 60.0,
15+
"upper_bound": 60.0
16+
},
17+
"maximum_boiler_temperature": {
18+
"lower_bound": 25.0,
19+
"resolution": 0.01,
20+
"setpoint": 50.0,
21+
"upper_bound": 95.0
22+
},
23+
"model": "Generic heater",
24+
"name": "OpenTherm",
25+
"sensors": {
26+
"intended_boiler_temperature": 0.0,
27+
"water_temperature": 37.0
28+
},
29+
"switches": {
30+
"dhw_cm_switch": false
31+
}
32+
},
33+
"14df5c4dc8cb4ba69f9d1ac0eaf7c5c6": {
34+
"available": true,
35+
"binary_sensors": {
36+
"low_battery": false
37+
},
38+
"dev_class": "zone_thermostat",
39+
"firmware": "2025-11-10T01:00:00+01:00",
40+
"hardware": "1",
41+
"location": "f2bf9048bef64cc5b6d5110154e33c81",
42+
"model": "Emma Pro",
43+
"model_id": "170-01",
44+
"name": "Emma",
45+
"sensors": {
46+
"battery": 100,
47+
"humidity": 65.0,
48+
"setpoint": 20.0,
49+
"temperature": 19.5
50+
},
51+
"temperature_offset": {
52+
"lower_bound": -2.0,
53+
"resolution": 0.1,
54+
"setpoint": 0.0,
55+
"upper_bound": 2.0
56+
},
57+
"vendor": "Plugwise",
58+
"zigbee_mac_address": "60EFABFFFE89CBA0"
59+
},
60+
"1772a4ea304041adb83f357b751341ff": {
61+
"available": true,
62+
"binary_sensors": {
63+
"low_battery": false
64+
},
65+
"dev_class": "thermostatic_radiator_valve",
66+
"firmware": "2020-11-04T01:00:00+01:00",
67+
"hardware": "1",
68+
"location": "f871b8c4d63549319221e294e4f88074",
69+
"model": "Tom",
70+
"model_id": "106-03",
71+
"name": "Tom Badkamer",
72+
"sensors": {
73+
"battery": 60,
74+
"setpoint": 25.0,
75+
"temperature": 18.6,
76+
"temperature_difference": -0.4,
77+
"valve_position": 100.0
78+
},
79+
"temperature_offset": {
80+
"lower_bound": -2.0,
81+
"resolution": 0.1,
82+
"setpoint": 0.1,
83+
"upper_bound": 2.0
84+
},
85+
"vendor": "Plugwise",
86+
"zigbee_mac_address": "000D6F000C8FCBA0"
87+
},
88+
"ad4838d7d35c4d6ea796ee12ae5aedf8": {
89+
"dev_class": "thermostat",
90+
"location": "f2bf9048bef64cc5b6d5110154e33c81",
91+
"model": "ThermoTouch",
92+
"model_id": "143.1",
93+
"name": "Anna",
94+
"sensors": {
95+
"setpoint": 20.0,
96+
"temperature": 19.1
97+
},
98+
"vendor": "Plugwise"
99+
},
100+
"c9293d1d68ee48fc8843c6f0dee2b6be": {
101+
"dev_class": "pumping",
102+
"members": [
103+
"854f8a9b0e7e425db97f1f110e1ce4b3",
104+
"ad4838d7d35c4d6ea796ee12ae5aedf8"
105+
],
106+
"model": "Group",
107+
"name": "Vloerverwarming",
108+
"sensors": {
109+
"electricity_consumed": 45.0,
110+
"electricity_produced": 0.0,
111+
"temperature": 20.1
112+
},
113+
"vendor": "Plugwise"
114+
},
115+
"da224107914542988a88561b4452b0f6": {
116+
"binary_sensors": {
117+
"plugwise_notification": false
118+
},
119+
"dev_class": "gateway",
120+
"firmware": "3.9.0",
121+
"gateway_modes": [
122+
"away",
123+
"full",
124+
"vacation"
125+
],
126+
"hardware": "AME Smile 2.0 board",
127+
"location": "bc93488efab249e5bc54fd7e175a6f91",
128+
"mac_address": "D40FB201CBA0",
129+
"model": "Gateway",
130+
"model_id": "smile_open_therm",
131+
"name": "Adam",
132+
"notifications": {},
133+
"regulation_modes": [
134+
"bleeding_cold",
135+
"heating",
136+
"off",
137+
"bleeding_hot"
138+
],
139+
"select_gateway_mode": "full",
140+
"select_regulation_mode": "off",
141+
"sensors": {
142+
"outdoor_temperature": -1.25
143+
},
144+
"vendor": "Plugwise",
145+
"zigbee_mac_address": "000D6F000D5ACBA0"
146+
},
147+
"da575e9e09b947e281fb6e3ebce3b174": {
148+
"available": true,
149+
"binary_sensors": {
150+
"low_battery": false
151+
},
152+
"dev_class": "zone_thermometer",
153+
"firmware": "2020-09-01T02:00:00+02:00",
154+
"hardware": "1",
155+
"location": "f2bf9048bef64cc5b6d5110154e33c81",
156+
"model": "Jip",
157+
"model_id": "168-01",
158+
"name": "Jip",
159+
"sensors": {
160+
"battery": 100,
161+
"humidity": 65.8,
162+
"setpoint": 20.0,
163+
"temperature": 19.3
164+
},
165+
"vendor": "Plugwise",
166+
"zigbee_mac_address": "70AC08FFFEE1CBA0"
167+
},
168+
"e2f4322d57924fa090fbbc48b3a140dc": {
169+
"available": true,
170+
"binary_sensors": {
171+
"low_battery": false
172+
},
173+
"dev_class": "zone_thermostat",
174+
"firmware": "2016-10-10T02:00:00+02:00",
175+
"hardware": "255",
176+
"location": "f871b8c4d63549319221e294e4f88074",
177+
"model": "Lisa",
178+
"model_id": "158-01",
179+
"name": "Lisa Badkamer",
180+
"sensors": {
181+
"battery": 71,
182+
"setpoint": 15.0,
183+
"temperature": 17.9
184+
},
185+
"temperature_offset": {
186+
"lower_bound": -2.0,
187+
"resolution": 0.1,
188+
"setpoint": 0.0,
189+
"upper_bound": 2.0
190+
},
191+
"vendor": "Plugwise",
192+
"zigbee_mac_address": "000D6F000C86CBA0"
193+
},
194+
"e8ef2a01ed3b4139a53bf749204fe6b4": {
195+
"dev_class": "switching",
196+
"members": [
197+
"2568cc4b9c1e401495d4741a5f89bee1",
198+
"29542b2b6a6a4169acecc15c72a599b8"
199+
],
200+
"model": "Group",
201+
"name": "Test",
202+
"sensors": {
203+
"electricity_consumed": 16.5,
204+
"electricity_produced": 0.0
205+
},
206+
"switches": {
207+
"relay": true
208+
},
209+
"vendor": "Plugwise"
210+
},
211+
"f2bf9048bef64cc5b6d5110154e33c81": {
212+
"active_preset": "home",
213+
"available_schedules": [
214+
"Badkamer",
215+
"Vakantie",
216+
"Weekschema",
217+
"Test",
218+
"off"
219+
],
220+
"climate_mode": "off",
221+
"control_state": "idle",
222+
"dev_class": "climate",
223+
"model": "ThermoZone",
224+
"name": "Living room",
225+
"preset_modes": [
226+
"vacation",
227+
"no_frost",
228+
"asleep",
229+
"home",
230+
"away"
231+
],
232+
"select_schedule": "off",
233+
"select_zone_profile": "active",
234+
"sensors": {
235+
"electricity_consumed": 60.8,
236+
"electricity_produced": 0.0,
237+
"temperature": 19.1
238+
},
239+
"thermostat": {
240+
"lower_bound": 1.0,
241+
"resolution": 0.01,
242+
"setpoint": 20.0,
243+
"upper_bound": 35.0
244+
},
245+
"thermostats": {
246+
"primary": [
247+
"ad4838d7d35c4d6ea796ee12ae5aedf8",
248+
"14df5c4dc8cb4ba69f9d1ac0eaf7c5c6",
249+
"da575e9e09b947e281fb6e3ebce3b174"
250+
],
251+
"secondary": []
252+
},
253+
"vendor": "Plugwise",
254+
"zone_profiles": [
255+
"active",
256+
"off",
257+
"passive"
258+
]
259+
},
260+
"f871b8c4d63549319221e294e4f88074": {
261+
"active_preset": "vacation",
262+
"available_schedules": [
263+
"Badkamer",
264+
"Vakantie",
265+
"Weekschema",
266+
"Test",
267+
"off"
268+
],
269+
"climate_mode": "off",
270+
"control_state": "idle",
271+
"dev_class": "climate",
272+
"model": "ThermoZone",
273+
"name": "Bathroom",
274+
"preset_modes": [
275+
"vacation",
276+
"no_frost",
277+
"asleep",
278+
"home",
279+
"away"
280+
],
281+
"select_schedule": "Badkamer",
282+
"select_zone_profile": "passive",
283+
"sensors": {
284+
"electricity_consumed": 0.0,
285+
"electricity_produced": 0.0,
286+
"temperature": 17.9
287+
},
288+
"thermostat": {
289+
"lower_bound": 0.0,
290+
"resolution": 0.01,
291+
"setpoint": 15.0,
292+
"upper_bound": 99.9
293+
},
294+
"thermostats": {
295+
"primary": [
296+
"e2f4322d57924fa090fbbc48b3a140dc"
297+
],
298+
"secondary": [
299+
"1772a4ea304041adb83f357b751341ff"
300+
]
301+
},
302+
"vendor": "Plugwise",
303+
"zone_profiles": [
304+
"active",
305+
"off",
306+
"passive"
307+
]
308+
}
309+
}

‎scripts/manual_fixtures.py‎

Lines changed: 25 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -199,6 +199,31 @@ def json_writer(manual_name: str, output: dict) -> None:
199199

200200
json_writer("m_adam_heating", m_adam_heating)
201201

202+
# Version with select_regulation = off and an active schedule
203+
m_adam_heating_off_schedule = m_adam_heating.copy()
204+
205+
# Updates for f2bf9048bef64cc5b6d5110154e33c81"
206+
m_adam_heating_off_schedule["f2bf9048bef64cc5b6d5110154e33c81"]["climate_mode"] = "off"
207+
m_adam_heating_off_schedule["f2bf9048bef64cc5b6d5110154e33c81"]["control_state"] = "idle"
208+
209+
# Go for e2f4
210+
m_adam_heating_off_schedule["f871b8c4d63549319221e294e4f88074"]["climate_mode"] = "off"
211+
m_adam_heating_off_schedule["f871b8c4d63549319221e294e4f88074"]["control_state"] = "idle"
212+
m_adam_heating_off_schedule["f871b8c4d63549319221e294e4f88074"]["select_schedule"] = "Badkamer"
213+
214+
# Go for da22
215+
m_adam_heating_off_schedule["da224107914542988a88561b4452b0f6"]["select_regulation_mode"] = "off"
216+
217+
# Go for 056e
218+
m_adam_heating_off_schedule["056ee145a816487eaa69243c3280f8bf"]["binary_sensors"][
219+
"heating_state"
220+
] = False
221+
m_adam_heating_off_schedule["056ee145a816487eaa69243c3280f8bf"]["sensors"][
222+
"intended_boiler_temperature"
223+
] = 0.0
224+
225+
json_writer("m_adam_heating_off_schedule", m_adam_heating_off_schedule)
226+
202227
### Manual Anna fixtures
203228

204229
base_anna_manual = "anna_heatpump_heating"

0 commit comments

Comments
 (0)