Skip to content

Commit 2d05ca8

Browse files
nworbnebnworbneb
authored
Enumerates Zigbee Green Power profile and device types in existing quirks (#2414)
* Add Zigbee Green Power enumerations * Add Zigbee Green Power enumerations * Add Zigbee Green Power enumerations * Add Zigbee Green Power enumerations * Add Zigbee Green Power enumerations * Add Zigbee Green Power enumerations * Add Zigbee Green Power enumerations * Add Zigbee Green Power enumerations * Add Zigbee Green Power enumerations * Add Zigbee Green Power enumerations * Add Zigbee Green Power enumerations * Add Zigbee Green Power enumerations * Add Zigbee Green Power enumerations * Add Zigbee Green Power enumerations * Add Zigbee Green Power enumerations * Add Zigbee Green Power enumerations * Add Zigbee Green Power enumerations * Add Zigbee Green Power enumerations * Add Zigbee Green Power enumerations * Add Zigbee Green Power enumerations * Add Zigbee Green Power enumerations * Add Zigbee Green Power enumerations * Add Zigbee Green Power enumerations * Add Zigbee Green Power enumerations * Add Zigbee Green Power enumerations * Add Zigbee Green Power enumerations * Add Zigbee Green Power enumerations * Add Zigbee Green Power enumerations * Add Zigbee Green Power enumerations * Add Zigbee Green Power enumerations * Add Zigbee Green Power enumerations * Add Zigbee Green Power enumerations * Add Zigbee Green Power enumerations * Add Zigbee Green Power enumerations * Add Zigbee Green Power enumerations * Add Zigbee Green Power enumerations * Add Zigbee Green Power enumerations * Add Zigbee Green Power enumerations * Add Zigbee Green Power enumerations * Add Zigbee Green Power enumerations * Update Zigbee Green Power enumerations * Update Zigbee Green Power enumerations * Add GreenPowerProxy * Add GreenPowerProxy * Add GreenPowerProxy * black fixes
1 parent b2197b2 commit 2d05ca8

40 files changed

+376
-367
lines changed

‎zhaquirks/aurora/aurora_dimmer.py‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
"""Device handler for Aurora dimmer switch, battery powered."""
2-
from zigpy.profiles import zha
2+
from zigpy.profiles import zgp, zha
33
from zigpy.quirks import CustomDevice
44
from zigpy.zcl.clusters.general import (
55
Basic,
@@ -118,8 +118,8 @@ class WallSwitchColorCluster(EventableCluster, Color):
118118
# device_version=0
119119
# input_clusters=[]
120120
# output_clusters=[33]
121-
PROFILE_ID: 41440,
122-
DEVICE_TYPE: 97,
121+
PROFILE_ID: zgp.PROFILE_ID,
122+
DEVICE_TYPE: zgp.DeviceType.PROXY_BASIC,
123123
INPUT_CLUSTERS: [],
124124
OUTPUT_CLUSTERS: [GreenPowerProxy.cluster_id],
125125
},
@@ -165,8 +165,8 @@ class WallSwitchColorCluster(EventableCluster, Color):
165165
],
166166
},
167167
242: {
168-
PROFILE_ID: 41440,
169-
DEVICE_TYPE: 97,
168+
PROFILE_ID: zgp.PROFILE_ID,
169+
DEVICE_TYPE: zgp.DeviceType.PROXY_BASIC,
170170
INPUT_CLUSTERS: [],
171171
OUTPUT_CLUSTERS: [GreenPowerProxy.cluster_id],
172172
},

‎zhaquirks/gledopto/glc009p.py‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
"""GLEDOPTO GL-C-009P device."""
2-
from zigpy.profiles import zha
2+
from zigpy.profiles import zgp, zha
33
from zigpy.quirks import CustomDevice
44
from zigpy.zcl.clusters.general import (
55
Basic,
@@ -48,8 +48,8 @@ class GLC009P(CustomDevice):
4848
],
4949
},
5050
242: {
51-
PROFILE_ID: 41440,
52-
DEVICE_TYPE: 0x0061,
51+
PROFILE_ID: zgp.PROFILE_ID,
52+
DEVICE_TYPE: zgp.DeviceType.PROXY_BASIC,
5353
INPUT_CLUSTERS: [],
5454
OUTPUT_CLUSTERS: [
5555
GreenPowerProxy.cluster_id,
@@ -77,8 +77,8 @@ class GLC009P(CustomDevice):
7777
],
7878
},
7979
242: {
80-
PROFILE_ID: 41440,
81-
DEVICE_TYPE: 0x0061,
80+
PROFILE_ID: zgp.PROFILE_ID,
81+
DEVICE_TYPE: zgp.DeviceType.PROXY_BASIC,
8282
INPUT_CLUSTERS: [],
8383
OUTPUT_CLUSTERS: [
8484
GreenPowerProxy.cluster_id,

‎zhaquirks/ikea/starkvind.py‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
import logging
55
from typing import Any
66

7-
from zigpy.profiles import zha
7+
from zigpy.profiles import zgp, zha
88
from zigpy.quirks import CustomCluster, CustomDevice
99
import zigpy.types as t
1010
from zigpy.zcl.clusters.general import (
@@ -177,8 +177,8 @@ def __init__(self, *args, **kwargs):
177177
# device_version=0
178178
# input_clusters=[33] output_clusters=[33]>
179179
242: {
180-
PROFILE_ID: 0xA1E0, # 41440 (dec)
181-
DEVICE_TYPE: 0x0061,
180+
PROFILE_ID: zgp.PROFILE_ID, # 41440 (dec)
181+
DEVICE_TYPE: zgp.DeviceType.PROXY_BASIC,
182182
INPUT_CLUSTERS: [],
183183
OUTPUT_CLUSTERS: [
184184
GreenPowerProxy.cluster_id, # 0x0021 = GreenPowerProxy.cluster_id
@@ -210,8 +210,8 @@ def __init__(self, *args, **kwargs):
210210
# device_version=0
211211
# input_clusters=[33] output_clusters=[33]>
212212
242: {
213-
PROFILE_ID: 0xA1E0, # 41440 (dec)
214-
DEVICE_TYPE: 0x0061,
213+
PROFILE_ID: zgp.PROFILE_ID, # 41440 (dec)
214+
DEVICE_TYPE: zgp.DeviceType.PROXY_BASIC,
215215
INPUT_CLUSTERS: [],
216216
OUTPUT_CLUSTERS: [
217217
GreenPowerProxy.cluster_id, # 0x0021 = GreenPowerProxy.cluster_id
@@ -253,8 +253,8 @@ class IkeaSTARKVIND_v2(IkeaSTARKVIND):
253253
# device_version=0
254254
# input_clusters=[33] output_clusters=[33]>
255255
242: {
256-
PROFILE_ID: 0xA1E0, # 41440 (dec)
257-
DEVICE_TYPE: 0x0061,
256+
PROFILE_ID: zgp.PROFILE_ID, # 41440 (dec)
257+
DEVICE_TYPE: zgp.DeviceType.PROXY_BASIC,
258258
INPUT_CLUSTERS: [],
259259
OUTPUT_CLUSTERS: [
260260
GreenPowerProxy.cluster_id, # 0x0021 = GreenPowerProxy.cluster_id
@@ -287,8 +287,8 @@ class IkeaSTARKVIND_v2(IkeaSTARKVIND):
287287
# device_version=0
288288
# input_clusters=[33] output_clusters=[33]>
289289
242: {
290-
PROFILE_ID: 0xA1E0, # 41440 (dec)
291-
DEVICE_TYPE: 0x0061,
290+
PROFILE_ID: zgp.PROFILE_ID, # 41440 (dec)
291+
DEVICE_TYPE: zgp.DeviceType.PROXY_BASIC,
292292
INPUT_CLUSTERS: [],
293293
OUTPUT_CLUSTERS: [
294294
GreenPowerProxy.cluster_id, # 0x0021 = GreenPowerProxy.cluster_id

‎zhaquirks/ikea/tradfriplug.py‎

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,9 @@
11
"""Tradfri Plug Quirk."""
2-
from zigpy.profiles import zha, zll
2+
from zigpy.profiles import zgp, zha, zll
33
from zigpy.quirks import CustomDevice
44
from zigpy.zcl.clusters.general import (
55
Basic,
6+
GreenPowerProxy,
67
Groups,
78
Identify,
89
LevelControl,
@@ -64,10 +65,10 @@ class TradfriPlug(CustomDevice):
6465
# device_version=0
6566
# input_clusters=[33] output_clusters=[33]>
6667
242: {
67-
PROFILE_ID: 0xA1E0,
68-
DEVICE_TYPE: 0x0061,
69-
INPUT_CLUSTERS: [33],
70-
OUTPUT_CLUSTERS: [33],
68+
PROFILE_ID: zgp.PROFILE_ID,
69+
DEVICE_TYPE: zgp.DeviceType.PROXY_BASIC,
70+
INPUT_CLUSTERS: [GreenPowerProxy.cluster_id],
71+
OUTPUT_CLUSTERS: [GreenPowerProxy.cluster_id],
7172
},
7273
},
7374
}

‎zhaquirks/iluminize/cct.py‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
"""Quirk for iluminize CCT actor."""
2-
from zigpy.profiles import zll
2+
from zigpy.profiles import zgp, zll
33
from zigpy.quirks import CustomCluster, CustomDevice
44
from zigpy.zcl.clusters.general import (
55
Basic,
@@ -64,8 +64,8 @@ class CCTLight(CustomDevice):
6464
# device_version=0
6565
# input_clusters=[33]
6666
# output_clusters=[33]
67-
PROFILE_ID: 41440,
68-
DEVICE_TYPE: 102,
67+
PROFILE_ID: zgp.PROFILE_ID,
68+
DEVICE_TYPE: zgp.DeviceType.COMBO_BASIC,
6969
INPUT_CLUSTERS: [GreenPowerProxy.cluster_id],
7070
OUTPUT_CLUSTERS: [GreenPowerProxy.cluster_id],
7171
},
@@ -91,8 +91,8 @@ class CCTLight(CustomDevice):
9191
OUTPUT_CLUSTERS: [Ota.cluster_id],
9292
},
9393
242: {
94-
PROFILE_ID: 41440,
95-
DEVICE_TYPE: 102,
94+
PROFILE_ID: zgp.PROFILE_ID,
95+
DEVICE_TYPE: zgp.DeviceType.COMBO_BASIC,
9696
INPUT_CLUSTERS: [GreenPowerProxy.cluster_id],
9797
OUTPUT_CLUSTERS: [GreenPowerProxy.cluster_id],
9898
},

‎zhaquirks/iluminize/dim.py‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
"""Quirk for iluminize DIM actor."""
2-
from zigpy.profiles import zha
2+
from zigpy.profiles import zgp, zha
33
from zigpy.quirks import CustomCluster, CustomDevice
44
from zigpy.zcl.clusters.general import (
55
Basic,
@@ -64,8 +64,8 @@ class DIMLight(CustomDevice):
6464
# device_version=0
6565
# input_clusters=[33]
6666
# output_clusters=[33]
67-
PROFILE_ID: 41440,
68-
DEVICE_TYPE: 102,
67+
PROFILE_ID: zgp.PROFILE_ID,
68+
DEVICE_TYPE: zgp.DeviceType.COMBO_BASIC,
6969
INPUT_CLUSTERS: [GreenPowerProxy.cluster_id],
7070
OUTPUT_CLUSTERS: [GreenPowerProxy.cluster_id],
7171
},
@@ -91,8 +91,8 @@ class DIMLight(CustomDevice):
9191
OUTPUT_CLUSTERS: [Ota.cluster_id],
9292
},
9393
242: {
94-
PROFILE_ID: 41440,
95-
DEVICE_TYPE: 102,
94+
PROFILE_ID: zgp.PROFILE_ID,
95+
DEVICE_TYPE: zgp.DeviceType.COMBO_BASIC,
9696
INPUT_CLUSTERS: [GreenPowerProxy.cluster_id],
9797
OUTPUT_CLUSTERS: [GreenPowerProxy.cluster_id],
9898
},

‎zhaquirks/innr/innr_sp234_plug.py‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
"""Innr SP 234 plug."""
2-
from zigpy.profiles import zha
2+
from zigpy.profiles import zgp, zha
33
from zigpy.quirks import CustomCluster, CustomDevice
44
from zigpy.zcl.clusters.general import (
55
Basic,
@@ -64,8 +64,8 @@ class SP234(CustomDevice):
6464
],
6565
},
6666
242: {
67-
PROFILE_ID: 41440,
68-
DEVICE_TYPE: 0x0061,
67+
PROFILE_ID: zgp.PROFILE_ID,
68+
DEVICE_TYPE: zgp.DeviceType.PROXY_BASIC,
6969
INPUT_CLUSTERS: [],
7070
OUTPUT_CLUSTERS: [GreenPowerProxy.cluster_id],
7171
},
@@ -98,8 +98,8 @@ class SP234(CustomDevice):
9898
],
9999
},
100100
242: {
101-
PROFILE_ID: 41440,
102-
DEVICE_TYPE: 0x0061,
101+
PROFILE_ID: zgp.PROFILE_ID,
102+
DEVICE_TYPE: zgp.DeviceType.PROXY_BASIC,
103103
INPUT_CLUSTERS: [],
104104
OUTPUT_CLUSTERS: [GreenPowerProxy.cluster_id],
105105
},

‎zhaquirks/innr/rs228t.py‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
"""Innr RS 228 T device."""
2-
from zigpy.profiles import zha
2+
from zigpy.profiles import zgp, zha
33
from zigpy.profiles.zha import DeviceType
44
from zigpy.quirks import CustomDevice
55
from zigpy.zcl.clusters.general import (
@@ -55,8 +55,8 @@ class RS228T(CustomDevice):
5555
# input_clusters=[]
5656
# output_clusters=[33]>
5757
242: {
58-
PROFILE_ID: 41440,
59-
DEVICE_TYPE: 97,
58+
PROFILE_ID: zgp.PROFILE_ID,
59+
DEVICE_TYPE: zgp.DeviceType.PROXY_BASIC,
6060
INPUT_CLUSTERS: [],
6161
OUTPUT_CLUSTERS: [GreenPowerProxy.cluster_id],
6262
},
@@ -81,8 +81,8 @@ class RS228T(CustomDevice):
8181
OUTPUT_CLUSTERS: [Ota.cluster_id],
8282
},
8383
242: {
84-
PROFILE_ID: 41440,
85-
DEVICE_TYPE: 97,
84+
PROFILE_ID: zgp.PROFILE_ID,
85+
DEVICE_TYPE: zgp.DeviceType.PROXY_BASIC,
8686
INPUT_CLUSTERS: [],
8787
OUTPUT_CLUSTERS: [GreenPowerProxy.cluster_id],
8888
},

‎zhaquirks/inovelli/VZM31SN.py‎

Lines changed: 14 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,11 @@
11
"""VZM31-SN Two in One Switch/Dimmer Module."""
22

3-
from zigpy.profiles import zha
3+
from zigpy.profiles import zgp, zha
44
from zigpy.profiles.zha import DeviceType
55
from zigpy.quirks import CustomDevice
66
from zigpy.zcl.clusters.general import (
77
Basic,
8+
GreenPowerProxy,
89
Groups,
910
Identify,
1011
LevelControl,
@@ -70,10 +71,10 @@ class InovelliVZM31SNv12(CustomDevice):
7071
],
7172
},
7273
242: {
73-
PROFILE_ID: 41440,
74-
DEVICE_TYPE: 0x0061,
74+
PROFILE_ID: zgp.PROFILE_ID,
75+
DEVICE_TYPE: zgp.DeviceType.PROXY_BASIC,
7576
INPUT_CLUSTERS: [],
76-
OUTPUT_CLUSTERS: [0x0021],
77+
OUTPUT_CLUSTERS: [GreenPowerProxy.cluster_id],
7778
},
7879
},
7980
}
@@ -112,10 +113,10 @@ class InovelliVZM31SNv12(CustomDevice):
112113
],
113114
},
114115
242: {
115-
PROFILE_ID: 41440,
116-
DEVICE_TYPE: 0x0061,
116+
PROFILE_ID: zgp.PROFILE_ID,
117+
DEVICE_TYPE: zgp.DeviceType.PROXY_BASIC,
117118
INPUT_CLUSTERS: [],
118-
OUTPUT_CLUSTERS: [0x0021],
119+
OUTPUT_CLUSTERS: [GreenPowerProxy.cluster_id],
119120
},
120121
},
121122
}
@@ -159,10 +160,10 @@ class InovelliVZM31SNv11(CustomDevice):
159160
],
160161
},
161162
242: {
162-
PROFILE_ID: 41440,
163-
DEVICE_TYPE: 0x0061,
163+
PROFILE_ID: zgp.PROFILE_ID,
164+
DEVICE_TYPE: zgp.DeviceType.PROXY_BASIC,
164165
INPUT_CLUSTERS: [],
165-
OUTPUT_CLUSTERS: [0x0021],
166+
OUTPUT_CLUSTERS: [GreenPowerProxy.cluster_id],
166167
},
167168
},
168169
}
@@ -205,10 +206,10 @@ class InovelliVZM31SNv11(CustomDevice):
205206
],
206207
},
207208
242: {
208-
PROFILE_ID: 41440,
209-
DEVICE_TYPE: 0x0061,
209+
PROFILE_ID: zgp.PROFILE_ID,
210+
DEVICE_TYPE: zgp.DeviceType.PROXY_BASIC,
210211
INPUT_CLUSTERS: [],
211-
OUTPUT_CLUSTERS: [0x0021],
212+
OUTPUT_CLUSTERS: [GreenPowerProxy.cluster_id],
212213
},
213214
},
214215
}

‎zhaquirks/insta/nexentro_pushbutton_interface.py‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
"""Device handler for Insta NEXENTRO Pushbutton Interface."""
2-
from zigpy.profiles import zha
2+
from zigpy.profiles import zgp, zha
33
from zigpy.quirks import CustomDevice
44
from zigpy.zcl.clusters.closures import WindowCovering
55
from zigpy.zcl.clusters.general import (
@@ -121,8 +121,8 @@ class InstaNexentroPushbuttonInterface(CustomDevice):
121121
# input_clusters=[]
122122
# output_clusters=[33]>
123123
242: {
124-
PROFILE_ID: 0xA1E0,
125-
DEVICE_TYPE: 0x0061,
124+
PROFILE_ID: zgp.PROFILE_ID,
125+
DEVICE_TYPE: zgp.DeviceType.PROXY_BASIC,
126126
INPUT_CLUSTERS: [],
127127
OUTPUT_CLUSTERS: [GreenPowerProxy.cluster_id],
128128
},
@@ -180,8 +180,8 @@ class InstaNexentroPushbuttonInterface(CustomDevice):
180180
],
181181
},
182182
242: {
183-
PROFILE_ID: 0xA1E0,
184-
DEVICE_TYPE: 0x0061,
183+
PROFILE_ID: zgp.PROFILE_ID,
184+
DEVICE_TYPE: zgp.DeviceType.PROXY_BASIC,
185185
INPUT_CLUSTERS: [],
186186
OUTPUT_CLUSTERS: [GreenPowerProxy.cluster_id],
187187
},

0 commit comments

Comments
 (0)