Skip to content

Commit 9a1bcec

Browse files
bouwewbouwew
authored
Merge pull request #630 from plugwise/test_g_o
Solution for Plug set as type = heater_central
2 parents f64c469 + 1c8a271 commit 9a1bcec

File tree

28 files changed

+174
-111
lines changed

28 files changed

+174
-111
lines changed

‎CHANGELOG.md‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,9 @@
11
# Changelog
22

3+
## v1.4.2
4+
5+
- Bugfix: implement solution for issue reported in [#739](https://github.com/plugwise/plugwise-beta/issues/739)
6+
37
## v1.4.1
48

59
- Prettying documents with Biome (CLI), fixture layout updated accordingly.

‎fixtures/adam_heatpump_cooling/all_data.json‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -90,7 +90,7 @@
9090
},
9191
"1a27dd03b5454c4e8b9e75c8d1afc7af": {
9292
"available": true,
93-
"dev_class": "valve_actuator",
93+
"dev_class": "valve_actuator_plug",
9494
"firmware": "2020-05-13T02:00:00+02:00",
9595
"location": "20e735858f8146cead98b873177a4f99",
9696
"model": "Plug",
@@ -110,7 +110,7 @@
110110
},
111111
"2e0fc4db2a6d4cbeb7cf786143543961": {
112112
"available": true,
113-
"dev_class": "valve_actuator",
113+
"dev_class": "valve_actuator_plug",
114114
"firmware": "2020-05-13T02:00:00+02:00",
115115
"location": "a562019b0b1f47a4bde8ebe3dbe3e8a9",
116116
"model": "Plug",
@@ -130,7 +130,7 @@
130130
},
131131
"3b4d2574e2c9443a832b48d19a1c4f06": {
132132
"available": true,
133-
"dev_class": "valve_actuator",
133+
"dev_class": "valve_actuator_plug",
134134
"firmware": "2020-05-13T02:00:00+02:00",
135135
"location": "04b15f6e884448288f811d29fb7b1b30",
136136
"model": "Plug",
@@ -150,7 +150,7 @@
150150
},
151151
"3f0afa71f16c45ab964050002560e43c": {
152152
"available": true,
153-
"dev_class": "valve_actuator",
153+
"dev_class": "valve_actuator_plug",
154154
"firmware": "2020-05-13T02:00:00+02:00",
155155
"location": "fa5fa6b34f6b40a0972988b20e888ed4",
156156
"model": "Plug",
@@ -215,7 +215,7 @@
215215
},
216216
"5ead63c65e5f44e7870ba2bd680ceb9e": {
217217
"available": true,
218-
"dev_class": "valve_actuator",
218+
"dev_class": "valve_actuator_plug",
219219
"firmware": "2020-05-13T02:00:00+02:00",
220220
"location": "9a27714b970547ee9a6bdadc2b815ad5",
221221
"model": "Plug",
@@ -312,7 +312,7 @@
312312
},
313313
"838c2f48195242709b87217cf8d8a71f": {
314314
"available": true,
315-
"dev_class": "valve_actuator",
315+
"dev_class": "valve_actuator_plug",
316316
"firmware": "2020-05-13T02:00:00+02:00",
317317
"location": "b52908550469425b812c87f766fe5303",
318318
"model": "Plug",
@@ -332,7 +332,7 @@
332332
},
333333
"8a482fa9dddb43acb765d019d8c9838b": {
334334
"available": true,
335-
"dev_class": "valve_actuator",
335+
"dev_class": "valve_actuator_plug",
336336
"firmware": "2020-05-13T02:00:00+02:00",
337337
"location": "5cc21042f87f4b4c94ccb5537c47a53f",
338338
"model": "Plug",
@@ -352,7 +352,7 @@
352352
},
353353
"96714ad90fc948bcbcb5021c4b9f5ae9": {
354354
"available": true,
355-
"dev_class": "valve_actuator",
355+
"dev_class": "valve_actuator_plug",
356356
"firmware": "2020-05-13T02:00:00+02:00",
357357
"location": "e39529c79ab54fda9bed26cfc0447546",
358358
"model": "Plug",
@@ -372,7 +372,7 @@
372372
},
373373
"a03b6e8e76dd4646af1a77c31dd9370c": {
374374
"available": true,
375-
"dev_class": "valve_actuator",
375+
"dev_class": "valve_actuator_plug",
376376
"firmware": "2020-05-13T02:00:00+02:00",
377377
"location": "93ac3f7bf25342f58cbb77c4a99ac0b3",
378378
"model": "Plug",
@@ -392,7 +392,7 @@
392392
},
393393
"bbcffa48019f4b09b8368bbaf9559e68": {
394394
"available": true,
395-
"dev_class": "valve_actuator",
395+
"dev_class": "valve_actuator_plug",
396396
"firmware": "2020-05-13T02:00:00+02:00",
397397
"location": "8cf650a4c10c44819e426bed406aec34",
398398
"model": "Plug",

‎fixtures/adam_jip/all_data.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -92,7 +92,7 @@
9292
},
9393
"457ce8414de24596a2d5e7dbc9c7682f": {
9494
"available": true,
95-
"dev_class": "zz_misc",
95+
"dev_class": "zz_misc_plug",
9696
"location": "9e4433a9d69f40b3aefd15e74395eaec",
9797
"model": "Aqara Smart Plug",
9898
"model_id": "lumi.plug.maeu01",

‎fixtures/adam_multiple_devices_per_zone/all_data.json‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
"devices": {
33
"02cf28bfec924855854c544690a609ef": {
44
"available": true,
5-
"dev_class": "vcr",
5+
"dev_class": "vcr_plug",
66
"firmware": "2019-06-21T02:00:00+02:00",
77
"location": "cd143c07248f491493cea0533bc3d669",
88
"model": "Plug",
@@ -23,7 +23,7 @@
2323
},
2424
"21f2b542c49845e6bb416884c55778d6": {
2525
"available": true,
26-
"dev_class": "game_console",
26+
"dev_class": "game_console_plug",
2727
"firmware": "2019-06-21T02:00:00+02:00",
2828
"location": "cd143c07248f491493cea0533bc3d669",
2929
"model": "Plug",
@@ -44,7 +44,7 @@
4444
},
4545
"4a810418d5394b3f82727340b91ba740": {
4646
"available": true,
47-
"dev_class": "router",
47+
"dev_class": "router_plug",
4848
"firmware": "2019-06-21T02:00:00+02:00",
4949
"location": "cd143c07248f491493cea0533bc3d669",
5050
"model": "Plug",
@@ -65,7 +65,7 @@
6565
},
6666
"675416a629f343c495449970e2ca37b5": {
6767
"available": true,
68-
"dev_class": "router",
68+
"dev_class": "router_plug",
6969
"firmware": "2019-06-21T02:00:00+02:00",
7070
"location": "cd143c07248f491493cea0533bc3d669",
7171
"model": "Plug",
@@ -164,7 +164,7 @@
164164
},
165165
"78d1126fc4c743db81b61c20e88342a7": {
166166
"available": true,
167-
"dev_class": "central_heating_pump",
167+
"dev_class": "central_heating_pump_plug",
168168
"firmware": "2019-06-21T02:00:00+02:00",
169169
"location": "c50f167537524366a5af7aa3942feb1e",
170170
"model": "Plug",
@@ -198,7 +198,7 @@
198198
},
199199
"a28f588dc4a049a483fd03a30361ad3a": {
200200
"available": true,
201-
"dev_class": "settop",
201+
"dev_class": "settop_plug",
202202
"firmware": "2019-06-21T02:00:00+02:00",
203203
"location": "cd143c07248f491493cea0533bc3d669",
204204
"model": "Plug",
@@ -321,7 +321,7 @@
321321
},
322322
"cd0ddb54ef694e11ac18ed1cbce5dbbd": {
323323
"available": true,
324-
"dev_class": "vcr",
324+
"dev_class": "vcr_plug",
325325
"firmware": "2019-06-21T02:00:00+02:00",
326326
"location": "cd143c07248f491493cea0533bc3d669",
327327
"model": "Plug",

‎fixtures/adam_plus_anna/all_data.json‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@
2727
},
2828
"aa6b0002df0a46e1b1eb94beb61eddfe": {
2929
"available": true,
30-
"dev_class": "hometheater",
30+
"dev_class": "hometheater_plug",
3131
"firmware": "2019-06-21T02:00:00+02:00",
3232
"location": "45d410adf8fd461e85cebf16d5ead542",
3333
"model": "Plug",
@@ -99,7 +99,7 @@
9999
},
100100
"f2be121e4a9345ac83c6e99ed89a98be": {
101101
"available": true,
102-
"dev_class": "computer_desktop",
102+
"dev_class": "computer_desktop_plug",
103103
"firmware": "2019-06-21T02:00:00+02:00",
104104
"location": "5ccb6c41a7d9403988d261ceee04239f",
105105
"name": "Work-PC",

‎fixtures/adam_plus_anna_new/all_data.json‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@
5555
},
5656
"2568cc4b9c1e401495d4741a5f89bee1": {
5757
"available": true,
58-
"dev_class": "hometheater",
58+
"dev_class": "hometheater_plug",
5959
"firmware": "2020-11-10T01:00:00+01:00",
6060
"location": "f2bf9048bef64cc5b6d5110154e33c81",
6161
"model": "Plug",
@@ -76,7 +76,7 @@
7676
},
7777
"29542b2b6a6a4169acecc15c72a599b8": {
7878
"available": true,
79-
"dev_class": "computer_desktop",
79+
"dev_class": "computer_desktop_plug",
8080
"firmware": "2020-11-10T01:00:00+01:00",
8181
"location": "f2bf9048bef64cc5b6d5110154e33c81",
8282
"model": "Plug",
@@ -97,7 +97,7 @@
9797
},
9898
"67d73d0bd469422db25a618a5fb8eeb0": {
9999
"available": true,
100-
"dev_class": "zz_misc",
100+
"dev_class": "heater_central_plug",
101101
"location": "b4f211175e124df59603412bafa77a34",
102102
"model": "Aqara Smart Plug",
103103
"model_id": "lumi.plug.maeu01",
@@ -114,7 +114,7 @@
114114
},
115115
"854f8a9b0e7e425db97f1f110e1ce4b3": {
116116
"available": true,
117-
"dev_class": "central_heating_pump",
117+
"dev_class": "central_heating_pump_plug",
118118
"firmware": "2020-11-10T01:00:00+01:00",
119119
"location": "f2bf9048bef64cc5b6d5110154e33c81",
120120
"model": "Plug",

‎fixtures/adam_zone_per_device/all_data.json‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
"devices": {
33
"02cf28bfec924855854c544690a609ef": {
44
"available": true,
5-
"dev_class": "vcr",
5+
"dev_class": "vcr_plug",
66
"firmware": "2019-06-21T02:00:00+02:00",
77
"location": "c4d2bda6df8146caa2e5c2b5dc65660e",
88
"model": "Plug",
@@ -23,7 +23,7 @@
2323
},
2424
"21f2b542c49845e6bb416884c55778d6": {
2525
"available": true,
26-
"dev_class": "game_console",
26+
"dev_class": "game_console_plug",
2727
"firmware": "2019-06-21T02:00:00+02:00",
2828
"location": "4efbab4c8bb84fbab26c8decf670eb96",
2929
"model": "Plug",
@@ -44,7 +44,7 @@
4444
},
4545
"4a810418d5394b3f82727340b91ba740": {
4646
"available": true,
47-
"dev_class": "router",
47+
"dev_class": "router_plug",
4848
"firmware": "2019-06-21T02:00:00+02:00",
4949
"location": "0217e9743c174eef9d6e9f680d403ce2",
5050
"model": "Plug",
@@ -65,7 +65,7 @@
6565
},
6666
"675416a629f343c495449970e2ca37b5": {
6767
"available": true,
68-
"dev_class": "router",
68+
"dev_class": "router_plug",
6969
"firmware": "2019-06-21T02:00:00+02:00",
7070
"location": "2b1591ecf6344d4d93b03dece9747648",
7171
"model": "Plug",
@@ -164,7 +164,7 @@
164164
},
165165
"78d1126fc4c743db81b61c20e88342a7": {
166166
"available": true,
167-
"dev_class": "central_heating_pump",
167+
"dev_class": "central_heating_pump_plug",
168168
"firmware": "2019-06-21T02:00:00+02:00",
169169
"location": "c50f167537524366a5af7aa3942feb1e",
170170
"model": "Plug",
@@ -198,7 +198,7 @@
198198
},
199199
"a28f588dc4a049a483fd03a30361ad3a": {
200200
"available": true,
201-
"dev_class": "settop",
201+
"dev_class": "settop_plug",
202202
"firmware": "2019-06-21T02:00:00+02:00",
203203
"location": "cd143c07248f491493cea0533bc3d669",
204204
"model": "Plug",
@@ -321,7 +321,7 @@
321321
},
322322
"cd0ddb54ef694e11ac18ed1cbce5dbbd": {
323323
"available": true,
324-
"dev_class": "vcr",
324+
"dev_class": "vcr_plug",
325325
"firmware": "2019-06-21T02:00:00+02:00",
326326
"location": "e704bae65654496f9cade9c855decdfe",
327327
"model": "Plug",

‎fixtures/m_adam_jip/all_data.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -92,7 +92,7 @@
9292
},
9393
"457ce8414de24596a2d5e7dbc9c7682f": {
9494
"available": true,
95-
"dev_class": "zz_misc",
95+
"dev_class": "zz_misc_plug",
9696
"location": "9e4433a9d69f40b3aefd15e74395eaec",
9797
"model": "Aqara Smart Plug",
9898
"model_id": "lumi.plug.maeu01",

‎fixtures/m_adam_multiple_devices_per_zone/all_data.json‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
"devices": {
33
"02cf28bfec924855854c544690a609ef": {
44
"available": true,
5-
"dev_class": "vcr",
5+
"dev_class": "vcr_plug",
66
"firmware": "2019-06-21T02:00:00+02:00",
77
"location": "cd143c07248f491493cea0533bc3d669",
88
"model": "Plug",
@@ -23,7 +23,7 @@
2323
},
2424
"21f2b542c49845e6bb416884c55778d6": {
2525
"available": true,
26-
"dev_class": "game_console",
26+
"dev_class": "game_console_plug",
2727
"firmware": "2019-06-21T02:00:00+02:00",
2828
"location": "cd143c07248f491493cea0533bc3d669",
2929
"model": "Plug",
@@ -44,7 +44,7 @@
4444
},
4545
"4a810418d5394b3f82727340b91ba740": {
4646
"available": true,
47-
"dev_class": "router",
47+
"dev_class": "router_plug",
4848
"firmware": "2019-06-21T02:00:00+02:00",
4949
"location": "cd143c07248f491493cea0533bc3d669",
5050
"model": "Plug",
@@ -65,7 +65,7 @@
6565
},
6666
"675416a629f343c495449970e2ca37b5": {
6767
"available": true,
68-
"dev_class": "router",
68+
"dev_class": "router_plug",
6969
"firmware": "2019-06-21T02:00:00+02:00",
7070
"location": "cd143c07248f491493cea0533bc3d669",
7171
"model": "Plug",
@@ -164,7 +164,7 @@
164164
},
165165
"78d1126fc4c743db81b61c20e88342a7": {
166166
"available": true,
167-
"dev_class": "central_heating_pump",
167+
"dev_class": "central_heating_pump_plug",
168168
"firmware": "2019-06-21T02:00:00+02:00",
169169
"location": "c50f167537524366a5af7aa3942feb1e",
170170
"model": "Plug",
@@ -198,7 +198,7 @@
198198
},
199199
"a28f588dc4a049a483fd03a30361ad3a": {
200200
"available": true,
201-
"dev_class": "settop",
201+
"dev_class": "settop_plug",
202202
"firmware": "2019-06-21T02:00:00+02:00",
203203
"location": "cd143c07248f491493cea0533bc3d669",
204204
"model": "Plug",
@@ -321,7 +321,7 @@
321321
},
322322
"cd0ddb54ef694e11ac18ed1cbce5dbbd": {
323323
"available": true,
324-
"dev_class": "vcr",
324+
"dev_class": "vcr_plug",
325325
"firmware": "2019-06-21T02:00:00+02:00",
326326
"location": "cd143c07248f491493cea0533bc3d669",
327327
"model": "Plug",

‎fixtures/stretch_v23/all_data.json‎

Lines changed: 21 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -332,11 +332,31 @@
332332
},
333333
"vendor": "Plugwise",
334334
"zigbee_mac_address": "ABCD012345670A04"
335+
},
336+
"fead900a56d3430bb2d53d891f7c0656": {
337+
"dev_class": "heater_central_plug",
338+
"firmware": "2011-06-27T10:52:18+02:00",
339+
"hardware": "6539-0701-4026",
340+
"location": "0000aaaa0000aaaa0000aaaa0000aa00",
341+
"model": "Circle type F",
342+
"name": "CV-ketel 25F6789",
343+
"sensors": {
344+
"electricity_consumed": 1.56,
345+
"electricity_consumed_interval": 0.04,
346+
"electricity_produced": 0.0,
347+
"electricity_produced_interval": 0.0
348+
},
349+
"switches": {
350+
"lock": true,
351+
"relay": true
352+
},
353+
"vendor": "Plugwise",
354+
"zigbee_mac_address": "ABCD012345670A06"
335355
}
336356
},
337357
"gateway": {
338358
"gateway_id": "0000aaaa0000aaaa0000aaaa0000aa00",
339-
"item_count": 229,
359+
"item_count": 243,
340360
"smile_name": "Stretch"
341361
}
342362
}

0 commit comments

Comments
 (0)