@@ -36,8 +36,8 @@ def json_writer(manual_name: str, all_data: dict) -> None:
3636adam_multiple_devices_per_zone = base .copy ()
3737
3838# Change schedule to not present for "e7693eb9582644e5b865dba8d4447cf1"
39- adam_multiple_devices_per_zone ["devices " ]["e7693eb9582644e5b865dba8d4447cf1" ].pop ("available_schedules" )
40- adam_multiple_devices_per_zone ["devices " ]["e7693eb9582644e5b865dba8d4447cf1" ].pop ("select_schedule" )
39+ adam_multiple_devices_per_zone ["device_zones " ]["e7693eb9582644e5b865dba8d4447cf1" ].pop ("available_schedules" )
40+ adam_multiple_devices_per_zone ["device_zones " ]["e7693eb9582644e5b865dba8d4447cf1" ].pop ("select_schedule" )
4141
4242json_writer ("m_adam_multiple_devices_per_zone" , adam_multiple_devices_per_zone )
4343
@@ -50,7 +50,7 @@ def json_writer(manual_name: str, all_data: dict) -> None:
5050adam_jip = base .copy ()
5151
5252# Change mode to off for "1346fbd8498d4dbcab7e18d51b771f3d"
53- adam_jip ["devices " ]["1346fbd8498d4dbcab7e18d51b771f3d" ]["climate_mode" ] = "off"
53+ adam_jip ["device_zones " ]["1346fbd8498d4dbcab7e18d51b771f3d" ]["climate_mode" ] = "off"
5454
5555json_writer ("m_adam_jip" , adam_jip )
5656
@@ -70,86 +70,86 @@ def json_writer(manual_name: str, all_data: dict) -> None:
7070m_adam_cooling ["gateway" ]["item_count" ] = 89
7171
7272# Remove devices "67d73d0bd469422db25a618a5fb8eeb0" and "10016900610d4c7481df78c89606ef22" from anywhere
73- m_adam_cooling ["devices " ].pop ("67d73d0bd469422db25a618a5fb8eeb0" )
74- m_adam_cooling ["devices " ].pop ("10016900610d4c7481df78c89606ef22" )
73+ m_adam_cooling ["device_zones " ].pop ("67d73d0bd469422db25a618a5fb8eeb0" )
74+ m_adam_cooling ["device_zones " ].pop ("10016900610d4c7481df78c89606ef22" )
7575
7676# Correct setpoint for "ad4838d7d35c4d6ea796ee12ae5aedf8"
77- m_adam_cooling ["zones " ]["f2bf9048bef64cc5b6d5110154e33c81" ]["thermostat" ][
77+ m_adam_cooling ["device_zones " ]["f2bf9048bef64cc5b6d5110154e33c81" ]["thermostat" ][
7878 "setpoint"
7979] = 23.5
8080
8181# Add new key available
82- m_adam_cooling ["devices " ]["ad4838d7d35c4d6ea796ee12ae5aedf8" ]["available" ] = True
82+ m_adam_cooling ["device_zones " ]["ad4838d7d35c4d6ea796ee12ae5aedf8" ]["available" ] = True
8383
84- m_adam_cooling ["zones " ]["f2bf9048bef64cc5b6d5110154e33c81" ][
84+ m_adam_cooling ["device_zones " ]["f2bf9048bef64cc5b6d5110154e33c81" ][
8585 "select_schedule"
8686] = "off"
87- m_adam_cooling ["zones " ]["f2bf9048bef64cc5b6d5110154e33c81" ][
87+ m_adam_cooling ["device_zones " ]["f2bf9048bef64cc5b6d5110154e33c81" ][
8888 "control_state"
8989] = "cooling"
90- m_adam_cooling ["zones " ]["f2bf9048bef64cc5b6d5110154e33c81" ]["climate_mode" ] = "cool"
90+ m_adam_cooling ["device_zones " ]["f2bf9048bef64cc5b6d5110154e33c81" ]["climate_mode" ] = "cool"
9191
9292# (following diff, now 2954 is removed)
9393# Remove device "29542b2b6a6a4169acecc15c72a599b8" from anywhere
94- m_adam_cooling ["devices " ].pop ("29542b2b6a6a4169acecc15c72a599b8" )
94+ m_adam_cooling ["device_zones " ].pop ("29542b2b6a6a4169acecc15c72a599b8" )
9595
9696# Back at ad48
97- m_adam_cooling ["devices " ]["ad4838d7d35c4d6ea796ee12ae5aedf8" ]["sensors" ][
97+ m_adam_cooling ["device_zones " ]["ad4838d7d35c4d6ea796ee12ae5aedf8" ]["sensors" ][
9898 "temperature"
9999] = 25.8
100- m_adam_cooling ["devices " ]["ad4838d7d35c4d6ea796ee12ae5aedf8" ]["sensors" ][
100+ m_adam_cooling ["device_zones " ]["ad4838d7d35c4d6ea796ee12ae5aedf8" ]["sensors" ][
101101 "setpoint"
102102] = 23.5
103103
104104# (again, following diff)
105105# Remove device "2568cc4b9c1e401495d4741a5f89bee1" from anywhere
106- m_adam_cooling ["devices " ].pop ("2568cc4b9c1e401495d4741a5f89bee1" )
106+ m_adam_cooling ["device_zones " ].pop ("2568cc4b9c1e401495d4741a5f89bee1" )
107107
108108# Remove device "854f8a9b0e7e425db97f1f110e1ce4b3" from anywhere
109- m_adam_cooling ["devices " ].pop ("854f8a9b0e7e425db97f1f110e1ce4b3" )
109+ m_adam_cooling ["device_zones " ].pop ("854f8a9b0e7e425db97f1f110e1ce4b3" )
110110
111111# Go for 1772
112- m_adam_cooling ["devices " ]["1772a4ea304041adb83f357b751341ff" ]["sensors" ].pop ("setpoint" )
113- m_adam_cooling ["devices " ]["1772a4ea304041adb83f357b751341ff" ]["sensors" ][
112+ m_adam_cooling ["device_zones " ]["1772a4ea304041adb83f357b751341ff" ]["sensors" ].pop ("setpoint" )
113+ m_adam_cooling ["device_zones " ]["1772a4ea304041adb83f357b751341ff" ]["sensors" ][
114114 "temperature"
115115] = 21.6
116116
117117# Go for e2f4
118- m_adam_cooling ["zones " ]["f871b8c4d63549319221e294e4f88074" ]["thermostat" ][
118+ m_adam_cooling ["device_zones " ]["f871b8c4d63549319221e294e4f88074" ]["thermostat" ][
119119 "setpoint"
120120] = 25.0
121- m_adam_cooling ["devices " ]["e2f4322d57924fa090fbbc48b3a140dc" ]["sensors" ][
121+ m_adam_cooling ["device_zones " ]["e2f4322d57924fa090fbbc48b3a140dc" ]["sensors" ][
122122 "temperature"
123123] = 23.9
124- m_adam_cooling ["devices " ]["e2f4322d57924fa090fbbc48b3a140dc" ]["sensors" ][
124+ m_adam_cooling ["device_zones " ]["e2f4322d57924fa090fbbc48b3a140dc" ]["sensors" ][
125125 "setpoint"
126126] = 23.5
127127
128128# Go for da22
129- m_adam_cooling ["devices " ]["da224107914542988a88561b4452b0f6" ][
129+ m_adam_cooling ["device_zones " ]["da224107914542988a88561b4452b0f6" ][
130130 "select_regulation_mode"
131131] = "cooling"
132- m_adam_cooling ["devices " ]["da224107914542988a88561b4452b0f6" ][
132+ m_adam_cooling ["device_zones " ]["da224107914542988a88561b4452b0f6" ][
133133 "regulation_modes"
134134].append ("cooling" )
135- m_adam_cooling ["devices " ]["da224107914542988a88561b4452b0f6" ]["sensors" ][
135+ m_adam_cooling ["device_zones " ]["da224107914542988a88561b4452b0f6" ]["sensors" ][
136136 "outdoor_temperature"
137137] = 29.65
138138
139139# Go for 056e
140- m_adam_cooling ["devices " ]["056ee145a816487eaa69243c3280f8bf" ]["binary_sensors" ][
140+ m_adam_cooling ["device_zones " ]["056ee145a816487eaa69243c3280f8bf" ]["binary_sensors" ][
141141 "cooling_state"
142142] = True
143- m_adam_cooling ["devices " ]["056ee145a816487eaa69243c3280f8bf" ]["binary_sensors" ][
143+ m_adam_cooling ["device_zones " ]["056ee145a816487eaa69243c3280f8bf" ]["binary_sensors" ][
144144 "heating_state"
145145] = False
146- m_adam_cooling ["devices " ]["056ee145a816487eaa69243c3280f8bf" ]["binary_sensors" ][
146+ m_adam_cooling ["device_zones " ]["056ee145a816487eaa69243c3280f8bf" ]["binary_sensors" ][
147147 "flame_state"
148148] = False
149- m_adam_cooling ["devices " ]["056ee145a816487eaa69243c3280f8bf" ]["sensors" ][
149+ m_adam_cooling ["device_zones " ]["056ee145a816487eaa69243c3280f8bf" ]["sensors" ][
150150 "water_temperature"
151151] = 19.0
152- m_adam_cooling ["devices " ]["056ee145a816487eaa69243c3280f8bf" ]["sensors" ][
152+ m_adam_cooling ["device_zones " ]["056ee145a816487eaa69243c3280f8bf" ]["sensors" ][
153153 "intended_boiler_temperature"
154154] = 17.5
155155
@@ -163,73 +163,73 @@ def json_writer(manual_name: str, all_data: dict) -> None:
163163m_adam_heating ["gateway" ]["cooling_present" ] = False
164164
165165# Correct setpoint for "ad4838d7d35c4d6ea796ee12ae5aedf8"
166- m_adam_heating ["zones " ]["f2bf9048bef64cc5b6d5110154e33c81" ]["thermostat" ][
166+ m_adam_heating ["device_zones " ]["f2bf9048bef64cc5b6d5110154e33c81" ]["thermostat" ][
167167 "setpoint"
168168] = 20.0
169169
170- m_adam_heating ["zones " ]["f2bf9048bef64cc5b6d5110154e33c81" ][
170+ m_adam_heating ["device_zones " ]["f2bf9048bef64cc5b6d5110154e33c81" ][
171171 "control_state"
172172] = "preheating"
173173
174- m_adam_heating ["zones " ]["f2bf9048bef64cc5b6d5110154e33c81" ]["climate_mode" ] = "heat"
174+ m_adam_heating ["device_zones " ]["f2bf9048bef64cc5b6d5110154e33c81" ]["climate_mode" ] = "heat"
175175
176176# Back at ad48
177- m_adam_heating ["devices " ]["ad4838d7d35c4d6ea796ee12ae5aedf8" ]["sensors" ][
177+ m_adam_heating ["device_zones " ]["ad4838d7d35c4d6ea796ee12ae5aedf8" ]["sensors" ][
178178 "setpoint"
179179] = 20.0
180- m_adam_heating ["devices " ]["ad4838d7d35c4d6ea796ee12ae5aedf8" ]["sensors" ][
180+ m_adam_heating ["device_zones " ]["ad4838d7d35c4d6ea796ee12ae5aedf8" ]["sensors" ][
181181 "temperature"
182182] = 19.1
183183
184184# Go for 1772
185- m_adam_heating ["devices " ]["1772a4ea304041adb83f357b751341ff" ]["sensors" ][
185+ m_adam_heating ["device_zones " ]["1772a4ea304041adb83f357b751341ff" ]["sensors" ][
186186 "temperature"
187187] = 18.6
188188
189189# Go for e2f4
190- m_adam_heating ["zones " ]["f871b8c4d63549319221e294e4f88074" ]["thermostat" ][
190+ m_adam_heating ["device_zones " ]["f871b8c4d63549319221e294e4f88074" ]["thermostat" ][
191191 "setpoint"
192192] = 15.0
193193
194- m_adam_heating ["devices " ]["e2f4322d57924fa090fbbc48b3a140dc" ][
194+ m_adam_heating ["device_zones " ]["e2f4322d57924fa090fbbc48b3a140dc" ][
195195 "control_state"
196196] = "off"
197197
198- m_adam_heating ["devices " ]["e2f4322d57924fa090fbbc48b3a140dc" ]["sensors" ][
198+ m_adam_heating ["device_zones " ]["e2f4322d57924fa090fbbc48b3a140dc" ]["sensors" ][
199199 "setpoint"
200200] = 15.0
201- m_adam_heating ["devices " ]["e2f4322d57924fa090fbbc48b3a140dc" ]["sensors" ][
201+ m_adam_heating ["device_zones " ]["e2f4322d57924fa090fbbc48b3a140dc" ]["sensors" ][
202202 "temperature"
203203] = 17.9
204204
205205# Go for da22
206- m_adam_heating ["devices " ]["da224107914542988a88561b4452b0f6" ][
206+ m_adam_heating ["device_zones " ]["da224107914542988a88561b4452b0f6" ][
207207 "select_regulation_mode"
208208] = "heating"
209- m_adam_heating ["devices " ]["da224107914542988a88561b4452b0f6" ][
209+ m_adam_heating ["device_zones " ]["da224107914542988a88561b4452b0f6" ][
210210 "regulation_modes"
211211].remove ("cooling" )
212- m_adam_heating ["devices " ]["da224107914542988a88561b4452b0f6" ]["sensors" ][
212+ m_adam_heating ["device_zones " ]["da224107914542988a88561b4452b0f6" ]["sensors" ][
213213 "outdoor_temperature"
214214] = - 1.25
215215
216216# Go for 056e
217- m_adam_heating ["devices " ]["056ee145a816487eaa69243c3280f8bf" ]["binary_sensors" ].pop (
217+ m_adam_heating ["device_zones " ]["056ee145a816487eaa69243c3280f8bf" ]["binary_sensors" ].pop (
218218 "cooling_state"
219219)
220- m_adam_heating ["devices " ]["056ee145a816487eaa69243c3280f8bf" ]["binary_sensors" ][
220+ m_adam_heating ["device_zones " ]["056ee145a816487eaa69243c3280f8bf" ]["binary_sensors" ][
221221 "heating_state"
222222] = True
223- m_adam_cooling ["devices " ]["056ee145a816487eaa69243c3280f8bf" ]["binary_sensors" ][
223+ m_adam_cooling ["device_zones " ]["056ee145a816487eaa69243c3280f8bf" ]["binary_sensors" ][
224224 "flame_state"
225225] = False
226- m_adam_heating ["devices " ]["056ee145a816487eaa69243c3280f8bf" ]["sensors" ][
226+ m_adam_heating ["device_zones " ]["056ee145a816487eaa69243c3280f8bf" ]["sensors" ][
227227 "water_temperature"
228228] = 37.0
229- m_adam_heating ["devices " ]["056ee145a816487eaa69243c3280f8bf" ]["sensors" ][
229+ m_adam_heating ["device_zones " ]["056ee145a816487eaa69243c3280f8bf" ]["sensors" ][
230230 "intended_boiler_temperature"
231231] = 38.1
232- m_adam_heating ["devices " ]["056ee145a816487eaa69243c3280f8bf" ]["max_dhw_temperature" ] = {
232+ m_adam_heating ["device_zones " ]["056ee145a816487eaa69243c3280f8bf" ]["max_dhw_temperature" ] = {
233233 "setpoint" : 60.0 ,
234234 "lower_bound" : 40.0 ,
235235 "upper_bound" : 60.0 ,
@@ -251,60 +251,60 @@ def json_writer(manual_name: str, all_data: dict) -> None:
251251m_anna_heatpump_cooling ["gateway" ]["cooling_present" ] = True
252252
253253# Go for 1cbf
254- m_anna_heatpump_cooling ["devices " ]["1cbf783bb11e4a7c8a6843dee3a86927" ][
254+ m_anna_heatpump_cooling ["device_zones " ]["1cbf783bb11e4a7c8a6843dee3a86927" ][
255255 "model"
256256] = "Generic heater/cooler"
257257
258- m_anna_heatpump_cooling ["devices " ]["1cbf783bb11e4a7c8a6843dee3a86927" ][
258+ m_anna_heatpump_cooling ["device_zones " ]["1cbf783bb11e4a7c8a6843dee3a86927" ][
259259 "binary_sensors"
260260]["cooling_enabled" ] = True
261- m_anna_heatpump_cooling ["devices " ]["1cbf783bb11e4a7c8a6843dee3a86927" ][
261+ m_anna_heatpump_cooling ["device_zones " ]["1cbf783bb11e4a7c8a6843dee3a86927" ][
262262 "binary_sensors"
263263]["heating_state" ] = False
264- m_anna_heatpump_cooling ["devices " ]["1cbf783bb11e4a7c8a6843dee3a86927" ][
264+ m_anna_heatpump_cooling ["device_zones " ]["1cbf783bb11e4a7c8a6843dee3a86927" ][
265265 "binary_sensors"
266266]["cooling_state" ] = True
267267
268- m_anna_heatpump_cooling ["devices " ]["1cbf783bb11e4a7c8a6843dee3a86927" ]["sensors" ][
268+ m_anna_heatpump_cooling ["device_zones " ]["1cbf783bb11e4a7c8a6843dee3a86927" ]["sensors" ][
269269 "water_temperature"
270270] = 22.7
271- m_anna_heatpump_cooling ["devices " ]["1cbf783bb11e4a7c8a6843dee3a86927" ]["sensors" ][
271+ m_anna_heatpump_cooling ["device_zones " ]["1cbf783bb11e4a7c8a6843dee3a86927" ]["sensors" ][
272272 "dhw_temperature"
273273] = 41.5
274- m_anna_heatpump_cooling ["devices " ]["1cbf783bb11e4a7c8a6843dee3a86927" ]["sensors" ][
274+ m_anna_heatpump_cooling ["device_zones " ]["1cbf783bb11e4a7c8a6843dee3a86927" ]["sensors" ][
275275 "intended_boiler_temperature"
276276] = 0.0
277- m_anna_heatpump_cooling ["devices " ]["1cbf783bb11e4a7c8a6843dee3a86927" ]["sensors" ][
277+ m_anna_heatpump_cooling ["device_zones " ]["1cbf783bb11e4a7c8a6843dee3a86927" ]["sensors" ][
278278 "modulation_level"
279279] = 40
280- m_anna_heatpump_cooling ["devices " ]["1cbf783bb11e4a7c8a6843dee3a86927" ]["sensors" ][
280+ m_anna_heatpump_cooling ["device_zones " ]["1cbf783bb11e4a7c8a6843dee3a86927" ]["sensors" ][
281281 "return_temperature"
282282] = 23.8
283- m_anna_heatpump_cooling ["devices " ]["1cbf783bb11e4a7c8a6843dee3a86927" ]["sensors" ][
283+ m_anna_heatpump_cooling ["device_zones " ]["1cbf783bb11e4a7c8a6843dee3a86927" ]["sensors" ][
284284 "outdoor_air_temperature"
285285] = 28.0
286286
287287
288288# Go for 015a
289- m_anna_heatpump_cooling ["devices " ]["015ae9ea3f964e668e490fa39da3870b" ]["sensors" ][
289+ m_anna_heatpump_cooling ["device_zones " ]["015ae9ea3f964e668e490fa39da3870b" ]["sensors" ][
290290 "outdoor_temperature"
291291] = 28.2
292292
293293# Go for 3cb7
294- m_anna_heatpump_cooling ["devices " ]["3cb70739631c4d17a86b8b12e8a5161b" ]["thermostat" ][
294+ m_anna_heatpump_cooling ["device_zones " ]["3cb70739631c4d17a86b8b12e8a5161b" ]["thermostat" ][
295295 "setpoint_low"
296296] = 20.5
297- m_anna_heatpump_cooling ["devices " ]["3cb70739631c4d17a86b8b12e8a5161b" ]["thermostat" ][
297+ m_anna_heatpump_cooling ["device_zones " ]["3cb70739631c4d17a86b8b12e8a5161b" ]["thermostat" ][
298298 "setpoint_high"
299299] = 30.0
300300
301- m_anna_heatpump_cooling ["devices " ]["3cb70739631c4d17a86b8b12e8a5161b" ]["sensors" ][
301+ m_anna_heatpump_cooling ["device_zones " ]["3cb70739631c4d17a86b8b12e8a5161b" ]["sensors" ][
302302 "temperature"
303303] = 26.3
304- m_anna_heatpump_cooling ["devices " ]["3cb70739631c4d17a86b8b12e8a5161b" ]["sensors" ][
304+ m_anna_heatpump_cooling ["device_zones " ]["3cb70739631c4d17a86b8b12e8a5161b" ]["sensors" ][
305305 "setpoint_low"
306306] = 20.5
307- m_anna_heatpump_cooling ["devices " ]["3cb70739631c4d17a86b8b12e8a5161b" ]["sensors" ][
307+ m_anna_heatpump_cooling ["device_zones " ]["3cb70739631c4d17a86b8b12e8a5161b" ]["sensors" ][
308308 "setpoint_high"
309309] = 30.0
310310
@@ -315,39 +315,39 @@ def json_writer(manual_name: str, all_data: dict) -> None:
315315m_anna_heatpump_idle = m_anna_heatpump_cooling .copy ()
316316
317317# Go for 1cbf
318- m_anna_heatpump_idle ["devices " ]["1cbf783bb11e4a7c8a6843dee3a86927" ]["binary_sensors" ][
318+ m_anna_heatpump_idle ["device_zones " ]["1cbf783bb11e4a7c8a6843dee3a86927" ]["binary_sensors" ][
319319 "compressor_state"
320320] = False
321- m_anna_heatpump_idle ["devices " ]["1cbf783bb11e4a7c8a6843dee3a86927" ]["binary_sensors" ][
321+ m_anna_heatpump_idle ["device_zones " ]["1cbf783bb11e4a7c8a6843dee3a86927" ]["binary_sensors" ][
322322 "cooling_state"
323323] = False
324324
325- m_anna_heatpump_idle ["devices " ]["1cbf783bb11e4a7c8a6843dee3a86927" ]["sensors" ][
325+ m_anna_heatpump_idle ["device_zones " ]["1cbf783bb11e4a7c8a6843dee3a86927" ]["sensors" ][
326326 "water_temperature"
327327] = 19.1
328- m_anna_heatpump_idle ["devices " ]["1cbf783bb11e4a7c8a6843dee3a86927" ]["sensors" ][
328+ m_anna_heatpump_idle ["device_zones " ]["1cbf783bb11e4a7c8a6843dee3a86927" ]["sensors" ][
329329 "dhw_temperature"
330330] = 46.3
331- m_anna_heatpump_idle ["devices " ]["1cbf783bb11e4a7c8a6843dee3a86927" ]["sensors" ][
331+ m_anna_heatpump_idle ["device_zones " ]["1cbf783bb11e4a7c8a6843dee3a86927" ]["sensors" ][
332332 "intended_boiler_temperature"
333333] = 18.0
334- m_anna_heatpump_idle ["devices " ]["1cbf783bb11e4a7c8a6843dee3a86927" ]["sensors" ][
334+ m_anna_heatpump_idle ["device_zones " ]["1cbf783bb11e4a7c8a6843dee3a86927" ]["sensors" ][
335335 "modulation_level"
336336] = 0
337- m_anna_heatpump_idle ["devices " ]["1cbf783bb11e4a7c8a6843dee3a86927" ]["sensors" ][
337+ m_anna_heatpump_idle ["device_zones " ]["1cbf783bb11e4a7c8a6843dee3a86927" ]["sensors" ][
338338 "return_temperature"
339339] = 22.0
340- m_anna_heatpump_idle ["devices " ]["1cbf783bb11e4a7c8a6843dee3a86927" ]["sensors" ][
340+ m_anna_heatpump_idle ["device_zones " ]["1cbf783bb11e4a7c8a6843dee3a86927" ]["sensors" ][
341341 "outdoor_air_temperature"
342342] = 28.2
343343
344344
345345# Go for 3cb7
346346
347- m_anna_heatpump_idle ["devices " ]["3cb70739631c4d17a86b8b12e8a5161b" ]["sensors" ][
347+ m_anna_heatpump_idle ["device_zones " ]["3cb70739631c4d17a86b8b12e8a5161b" ]["sensors" ][
348348 "temperature"
349349] = 23.0
350- m_anna_heatpump_idle ["devices " ]["3cb70739631c4d17a86b8b12e8a5161b" ]["sensors" ][
350+ m_anna_heatpump_idle ["device_zones " ]["3cb70739631c4d17a86b8b12e8a5161b" ]["sensors" ][
351351 "cooling_activation_outdoor_temperature"
352352] = 25.0
353353
0 commit comments