Skip to content

Commit 8b5ca07

Browse files
TheJulianJESTheJulianJES
authored
Fix Aqara PowerConfiguration clusters (#4735)
1 parent a49b834 commit 8b5ca07

File tree

5 files changed

+58
-57
lines changed

5 files changed

+58
-57
lines changed

‎zhaquirks/xiaomi/aqara/illumination.py‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,6 @@
66
from zigpy.zcl.clusters.measurement import IlluminanceMeasurement
77
from zigpy.zdo.types import NodeDescriptor
88

9-
from zhaquirks import PowerConfigurationCluster
109
from zhaquirks.const import (
1110
DEVICE_TYPE,
1211
ENDPOINTS,
@@ -21,6 +20,7 @@
2120
BasicCluster,
2221
XiaomiAqaraE1Cluster,
2322
XiaomiCustomDevice,
23+
XiaomiPowerConfiguration,
2424
)
2525

2626

@@ -60,7 +60,7 @@ class Illumination(XiaomiCustomDevice):
6060
BasicCluster,
6161
Identify.cluster_id,
6262
IlluminanceMeasurement.cluster_id,
63-
PowerConfigurationCluster,
63+
XiaomiPowerConfiguration,
6464
],
6565
OUTPUT_CLUSTERS: [Identify.cluster_id],
6666
}
@@ -94,7 +94,7 @@ class IlluminationT1(XiaomiCustomDevice):
9494
BasicCluster,
9595
Identify.cluster_id,
9696
IlluminanceMeasurement.cluster_id,
97-
PowerConfigurationCluster,
97+
XiaomiPowerConfiguration,
9898
OppleCluster,
9999
],
100100
OUTPUT_CLUSTERS: [Identify.cluster_id],

‎zhaquirks/xiaomi/aqara/opple_remote.py‎

Lines changed: 31 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -8,11 +8,12 @@
88
LevelControl,
99
MultistateInput,
1010
OnOff,
11+
PowerConfiguration,
1112
)
1213
from zigpy.zcl.clusters.lighting import Color
1314
from zigpy.zdo.types import NodeDescriptor
1415

15-
from zhaquirks import CustomCluster, PowerConfigurationCluster
16+
from zhaquirks import CustomCluster
1617
from zhaquirks.const import (
1718
ALT_DOUBLE_PRESS,
1819
ALT_LONG_PRESS,
@@ -55,6 +56,7 @@
5556
BasicCluster,
5657
XiaomiAqaraE1Cluster,
5758
XiaomiCustomDevice,
59+
XiaomiPowerConfiguration,
5860
)
5961

6062
PRESS_TYPES = {0: "hold", 1: "single", 2: "double", 3: "triple", 255: "release"}
@@ -169,7 +171,7 @@ class RemoteB286OPCN01(XiaomiCustomDevice):
169171
INPUT_CLUSTERS: [
170172
Basic.cluster_id,
171173
Identify.cluster_id,
172-
PowerConfigurationCluster.cluster_id,
174+
PowerConfiguration.cluster_id,
173175
],
174176
OUTPUT_CLUSTERS: [
175177
Identify.cluster_id,
@@ -206,7 +208,7 @@ class RemoteB286OPCN01(XiaomiCustomDevice):
206208
INPUT_CLUSTERS: [
207209
BasicCluster,
208210
Identify.cluster_id,
209-
PowerConfigurationCluster,
211+
XiaomiPowerConfiguration,
210212
OppleCluster,
211213
MultistateInputCluster,
212214
],
@@ -282,7 +284,7 @@ class RemoteB286OPCN01V2(XiaomiCustomDevice):
282284
INPUT_CLUSTERS: [
283285
Basic.cluster_id,
284286
Identify.cluster_id,
285-
PowerConfigurationCluster.cluster_id,
287+
PowerConfiguration.cluster_id,
286288
],
287289
OUTPUT_CLUSTERS: [
288290
Identify.cluster_id,
@@ -305,7 +307,7 @@ class RemoteB286OPCN01V2(XiaomiCustomDevice):
305307
INPUT_CLUSTERS: [
306308
BasicCluster,
307309
Identify.cluster_id,
308-
PowerConfigurationCluster,
310+
XiaomiPowerConfiguration,
309311
OppleCluster,
310312
MultistateInputCluster,
311313
],
@@ -368,7 +370,7 @@ class RemoteB286OPCN01Alt(XiaomiCustomDevice):
368370
INPUT_CLUSTERS: [
369371
Basic.cluster_id,
370372
Identify.cluster_id,
371-
PowerConfigurationCluster.cluster_id,
373+
PowerConfiguration.cluster_id,
372374
],
373375
OUTPUT_CLUSTERS: [
374376
Identify.cluster_id,
@@ -396,7 +398,7 @@ class RemoteB286OPCN01Alt(XiaomiCustomDevice):
396398
INPUT_CLUSTERS: [
397399
BasicCluster,
398400
Identify.cluster_id,
399-
PowerConfigurationCluster,
401+
XiaomiPowerConfiguration,
400402
OppleCluster,
401403
MultistateInputCluster,
402404
],
@@ -439,7 +441,7 @@ class RemoteB486OPCN01(XiaomiCustomDevice):
439441
INPUT_CLUSTERS: [
440442
Basic.cluster_id,
441443
Identify.cluster_id,
442-
PowerConfigurationCluster.cluster_id,
444+
PowerConfiguration.cluster_id,
443445
],
444446
OUTPUT_CLUSTERS: [
445447
Identify.cluster_id,
@@ -476,7 +478,7 @@ class RemoteB486OPCN01(XiaomiCustomDevice):
476478
INPUT_CLUSTERS: [
477479
BasicCluster,
478480
Identify.cluster_id,
479-
PowerConfigurationCluster,
481+
XiaomiPowerConfiguration,
480482
OppleCluster,
481483
MultistateInputCluster,
482484
],
@@ -572,7 +574,7 @@ class RemoteB686OPCN01(XiaomiCustomDevice):
572574
INPUT_CLUSTERS: [
573575
Basic.cluster_id,
574576
Identify.cluster_id,
575-
PowerConfigurationCluster.cluster_id,
577+
PowerConfiguration.cluster_id,
576578
],
577579
OUTPUT_CLUSTERS: [
578580
Identify.cluster_id,
@@ -609,7 +611,7 @@ class RemoteB686OPCN01(XiaomiCustomDevice):
609611
INPUT_CLUSTERS: [
610612
BasicCluster,
611613
Identify.cluster_id,
612-
PowerConfigurationCluster,
614+
XiaomiPowerConfiguration,
613615
OppleCluster,
614616
MultistateInputCluster,
615617
],
@@ -745,7 +747,7 @@ class RemoteB286OPCN01V3(XiaomiCustomDevice):
745747
INPUT_CLUSTERS: [
746748
Basic.cluster_id,
747749
Identify.cluster_id,
748-
PowerConfigurationCluster.cluster_id,
750+
PowerConfiguration.cluster_id,
749751
],
750752
OUTPUT_CLUSTERS: [
751753
Identify.cluster_id,
@@ -778,7 +780,7 @@ class RemoteB286OPCN01V3(XiaomiCustomDevice):
778780
INPUT_CLUSTERS: [
779781
BasicCluster,
780782
Identify.cluster_id,
781-
PowerConfigurationCluster,
783+
XiaomiPowerConfiguration,
782784
OppleCluster,
783785
MultistateInputCluster,
784786
],
@@ -811,7 +813,7 @@ class RemoteB286OPCN01V4(XiaomiCustomDevice):
811813
INPUT_CLUSTERS: [
812814
Basic.cluster_id,
813815
Identify.cluster_id,
814-
PowerConfigurationCluster.cluster_id,
816+
PowerConfiguration.cluster_id,
815817
],
816818
OUTPUT_CLUSTERS: [
817819
Identify.cluster_id,
@@ -876,7 +878,7 @@ class RemoteB286OPCN01V4(XiaomiCustomDevice):
876878
INPUT_CLUSTERS: [
877879
BasicCluster,
878880
Identify.cluster_id,
879-
PowerConfigurationCluster,
881+
XiaomiPowerConfiguration,
880882
OppleCluster,
881883
MultistateInputCluster,
882884
],
@@ -939,7 +941,7 @@ class RemoteB486OPCN01V2(XiaomiCustomDevice):
939941
INPUT_CLUSTERS: [
940942
Basic.cluster_id,
941943
Identify.cluster_id,
942-
PowerConfigurationCluster.cluster_id,
944+
PowerConfiguration.cluster_id,
943945
],
944946
OUTPUT_CLUSTERS: [
945947
Identify.cluster_id,
@@ -962,7 +964,7 @@ class RemoteB486OPCN01V2(XiaomiCustomDevice):
962964
INPUT_CLUSTERS: [
963965
BasicCluster,
964966
Identify.cluster_id,
965-
PowerConfigurationCluster,
967+
XiaomiPowerConfiguration,
966968
OppleCluster,
967969
MultistateInputCluster,
968970
],
@@ -1013,7 +1015,7 @@ class RemoteB486OPCN01V3(XiaomiCustomDevice):
10131015
INPUT_CLUSTERS: [
10141016
Basic.cluster_id,
10151017
Identify.cluster_id,
1016-
PowerConfigurationCluster.cluster_id,
1018+
PowerConfiguration.cluster_id,
10171019
],
10181020
OUTPUT_CLUSTERS: [
10191021
Identify.cluster_id,
@@ -1041,7 +1043,7 @@ class RemoteB486OPCN01V3(XiaomiCustomDevice):
10411043
INPUT_CLUSTERS: [
10421044
BasicCluster,
10431045
Identify.cluster_id,
1044-
PowerConfigurationCluster,
1046+
XiaomiPowerConfiguration,
10451047
OppleCluster,
10461048
MultistateInputCluster,
10471049
],
@@ -1094,7 +1096,7 @@ class RemoteB486OPCN01V4(XiaomiCustomDevice):
10941096
INPUT_CLUSTERS: [
10951097
Basic.cluster_id,
10961098
Identify.cluster_id,
1097-
PowerConfigurationCluster.cluster_id,
1099+
PowerConfiguration.cluster_id,
10981100
],
10991101
OUTPUT_CLUSTERS: [
11001102
Identify.cluster_id,
@@ -1155,7 +1157,7 @@ class RemoteB486OPCN01V4(XiaomiCustomDevice):
11551157
INPUT_CLUSTERS: [
11561158
BasicCluster,
11571159
Identify.cluster_id,
1158-
PowerConfigurationCluster,
1160+
XiaomiPowerConfiguration,
11591161
OppleCluster,
11601162
MultistateInputCluster,
11611163
],
@@ -1218,7 +1220,7 @@ class RemoteB686OPCN01V2(XiaomiCustomDevice):
12181220
INPUT_CLUSTERS: [
12191221
Basic.cluster_id,
12201222
Identify.cluster_id,
1221-
PowerConfigurationCluster.cluster_id,
1223+
PowerConfiguration.cluster_id,
12221224
],
12231225
OUTPUT_CLUSTERS: [
12241226
Identify.cluster_id,
@@ -1241,7 +1243,7 @@ class RemoteB686OPCN01V2(XiaomiCustomDevice):
12411243
INPUT_CLUSTERS: [
12421244
BasicCluster,
12431245
Identify.cluster_id,
1244-
PowerConfigurationCluster,
1246+
XiaomiPowerConfiguration,
12451247
OppleCluster,
12461248
MultistateInputCluster,
12471249
],
@@ -1304,7 +1306,7 @@ class RemoteB686OPCN01V3(XiaomiCustomDevice):
13041306
INPUT_CLUSTERS: [
13051307
Basic.cluster_id,
13061308
Identify.cluster_id,
1307-
PowerConfigurationCluster.cluster_id,
1309+
PowerConfiguration.cluster_id,
13081310
],
13091311
OUTPUT_CLUSTERS: [
13101312
Identify.cluster_id,
@@ -1369,7 +1371,7 @@ class RemoteB686OPCN01V3(XiaomiCustomDevice):
13691371
INPUT_CLUSTERS: [
13701372
BasicCluster,
13711373
Identify.cluster_id,
1372-
PowerConfigurationCluster,
1374+
XiaomiPowerConfiguration,
13731375
OppleCluster,
13741376
MultistateInputCluster,
13751377
],
@@ -1432,7 +1434,7 @@ class RemoteB686OPCN01V4(XiaomiCustomDevice):
14321434
INPUT_CLUSTERS: [
14331435
Basic.cluster_id,
14341436
Identify.cluster_id,
1435-
PowerConfigurationCluster.cluster_id,
1437+
PowerConfiguration.cluster_id,
14361438
],
14371439
OUTPUT_CLUSTERS: [
14381440
Identify.cluster_id,
@@ -1481,7 +1483,7 @@ class RemoteB686OPCN01V4(XiaomiCustomDevice):
14811483
INPUT_CLUSTERS: [
14821484
BasicCluster,
14831485
Identify.cluster_id,
1484-
PowerConfigurationCluster,
1486+
XiaomiPowerConfiguration,
14851487
OppleCluster,
14861488
MultistateInputCluster,
14871489
],
@@ -1544,7 +1546,7 @@ class RemoteB686OPCN01V5(XiaomiCustomDevice):
15441546
INPUT_CLUSTERS: [
15451547
Basic.cluster_id,
15461548
Identify.cluster_id,
1547-
PowerConfigurationCluster.cluster_id,
1549+
PowerConfiguration.cluster_id,
15481550
],
15491551
OUTPUT_CLUSTERS: [
15501552
Identify.cluster_id,
@@ -1572,7 +1574,7 @@ class RemoteB686OPCN01V5(XiaomiCustomDevice):
15721574
INPUT_CLUSTERS: [
15731575
BasicCluster,
15741576
Identify.cluster_id,
1575-
PowerConfigurationCluster,
1577+
XiaomiPowerConfiguration,
15761578
OppleCluster,
15771579
MultistateInputCluster,
15781580
],

‎zhaquirks/xiaomi/aqara/remote_e1.py‎

Lines changed: 9 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,12 @@
3030
SHORT_PRESS,
3131
TRIPLE_PRESS,
3232
)
33-
from zhaquirks.xiaomi import LUMI, BasicCluster, XiaomiCustomDevice
33+
from zhaquirks.xiaomi import (
34+
LUMI,
35+
BasicCluster,
36+
XiaomiCustomDevice,
37+
XiaomiPowerConfiguration,
38+
)
3439
from zhaquirks.xiaomi.aqara.opple_remote import (
3540
COMMAND_1_DOUBLE,
3641
COMMAND_1_HOLD,
@@ -46,10 +51,7 @@
4651
COMMAND_3_TRIPLE,
4752
MultistateInputCluster,
4853
)
49-
from zhaquirks.xiaomi.aqara.remote_h1 import (
50-
AqaraRemoteManuSpecificCluster,
51-
PowerConfigurationClusterH1Remote,
52-
)
54+
from zhaquirks.xiaomi.aqara.remote_h1 import AqaraRemoteManuSpecificCluster
5355

5456
BOTH_BUTTONS = "both_buttons"
5557

@@ -90,7 +92,7 @@ class RemoteE1SingleRocker1(XiaomiCustomDevice):
9092
INPUT_CLUSTERS: [
9193
BasicCluster,
9294
Identify.cluster_id,
93-
PowerConfigurationClusterH1Remote,
95+
XiaomiPowerConfiguration,
9496
MultistateInputCluster,
9597
AqaraRemoteManuSpecificCluster,
9698
],
@@ -169,7 +171,7 @@ class RemoteE1DoubleRocker1(XiaomiCustomDevice):
169171
INPUT_CLUSTERS: [
170172
BasicCluster,
171173
Identify.cluster_id,
172-
PowerConfigurationClusterH1Remote,
174+
XiaomiPowerConfiguration,
173175
MultistateInputCluster,
174176
AqaraRemoteManuSpecificCluster,
175177
],

0 commit comments

Comments
 (0)