Fix up bad quirks

Author: puddly

tests/test_quirks_v2.py

@@ -65,8 +65,8 @@ def test_manufacturer_model_metadata_unique() -> None:
     )
 
     for quirk in ALL_QUIRK_V2_CLASSES:
-        if quirk.fw_version_filter is not None:
-            # skip quirks with firmware filter, as they can share manufacturer/model
+        if quirk.fw_version_filter is not None or quirk.filters:
+            # skip quirks with firmware filter or general filters, as they can share manufacturer/model
             continue
         for metadata in quirk.manufacturer_model_metadata:
             man_model_quirk_map[(metadata.manufacturer, metadata.model)].append(

zhaquirks/centralite/cl_3300S.py

@@ -10,7 +10,7 @@
 
 (
     QuirkBuilder(CENTRALITE, "3300")
-    .applies_to(CENTRALITE, "3300-S")
+    # .applies_to(CENTRALITE, "3300-S")  # TODO: this is also defined in `ias.py`!
     .applies_to(CENTRALITE, "3323-G")
     .replaces(PowerConfigurationCluster, endpoint_id=1)
     .removes(PowerConfiguration.cluster_id, endpoint_id=2)

zhaquirks/centralite/cl_3305S.py

@@ -5,14 +5,6 @@
 from zhaquirks import PowerConfigurationCluster
 from zhaquirks.centralite import CENTRALITE
 
-#  <SimpleDescriptor endpoint=1 profile=260 device_type=1026
-#  device_version=0
-#  input_clusters=[0, 1, 3, 1026, 1280, 32, 2821]
-#  output_clusters=[25]>
-#  <SimpleDescriptor endpoint=2 profile=260 device_type=263
-#  device_version=0
-#  input_clusters=[0, 1, 3, 1030, 2821]
-#  output_clusters=[3]>
 (
     QuirkBuilder(CENTRALITE, "3305-S")
     .applies_to(CENTRALITE, "3305")
@@ -26,10 +18,3 @@
     .removes(PowerConfigurationCluster, endpoint_id=2)
     .add_to_registry()
 )
-
-(
-    QuirkBuilder(CENTRALITE, "3305")
-    .replaces(PowerConfigurationCluster, endpoint_id=1)
-    .skip_configuration()
-    .add_to_registry()
-)

zhaquirks/ikea/shortcutbtn.py

@@ -18,7 +18,7 @@
     SHORT_PRESS,
     TURN_ON,
 )
-from zhaquirks.ikea import IKEA, IKEA_CLUSTER_ID, DoublingPowerConfig1CRCluster
+from zhaquirks.ikea import IKEA, DoublingPowerConfig1CRCluster
 
 (
     QuirkBuilder(IKEA, "TRADFRI SHORTCUT Button")
@@ -50,36 +50,3 @@
     )
     .add_to_registry()
 )
-
-
-(
-    QuirkBuilder(IKEA, "TRADFRI SHORTCUT Button")
-    .replaces(DoublingPowerConfig1CRCluster, endpoint_id=1)
-    .removes(IKEA_CLUSTER_ID, endpoint_id=1)
-    .device_automation_triggers(
-        {
-            (SHORT_PRESS, TURN_ON): {
-                COMMAND: COMMAND_ON,
-                CLUSTER_ID: 6,
-                ENDPOINT_ID: 1,
-            },
-            (DOUBLE_PRESS, TURN_ON): {
-                COMMAND: COMMAND_OFF,
-                CLUSTER_ID: 6,
-                ENDPOINT_ID: 1,
-            },
-            (LONG_PRESS, DIM_UP): {
-                COMMAND: COMMAND_MOVE_ON_OFF,
-                CLUSTER_ID: 8,
-                ENDPOINT_ID: 1,
-                PARAMS: {"move_mode": 0},
-            },
-            (LONG_RELEASE, DIM_UP): {
-                COMMAND: COMMAND_STOP_ON_OFF,
-                CLUSTER_ID: 8,
-                ENDPOINT_ID: 1,
-            },
-        }
-    )
-    .add_to_registry()
-)

zhaquirks/ikea/twobtnremote.py

@@ -2,7 +2,6 @@
 
 from zigpy.quirks.v2 import QuirkBuilder
 from zigpy.zcl.clusters.closures import WindowCovering
-from zigpy.zcl.clusters.general import Groups
 
 from zhaquirks.const import (
     CLUSTER_ID,
@@ -54,6 +53,9 @@
 
 (
     QuirkBuilder(IKEA, "TRADFRI on/off switch")
+    .filter(
+        lambda device: WindowCovering.cluster_id not in device.endpoints[1].in_clusters
+    )
     .replaces(DoublingPowerConfig1CRCluster, endpoint_id=1)
     .device_automation_triggers(_DEVICE_AUTOMATION_TRIGGERS)
     .add_to_registry()
@@ -63,6 +65,7 @@
 # ZLL profile variant
 (
     QuirkBuilder(IKEA, "TRADFRI on/off switch")
+    .filter(lambda device: WindowCovering.cluster_id in device.endpoints[1].in_clusters)
     .replaces(DoublingPowerConfig1CRCluster, endpoint_id=1)
     .removes(WindowCovering.cluster_id, endpoint_id=1)
     .device_automation_triggers(_DEVICE_AUTOMATION_TRIGGERS)
@@ -76,13 +79,3 @@
     .device_automation_triggers(_DEVICE_AUTOMATION_TRIGGERS)
     .add_to_registry()
 )
-
-
-(
-    QuirkBuilder(IKEA, "RODRET Dimmer")
-    .applies_to(IKEA, "RODRET wireless dimmer")
-    .replaces(PowerConfig1AAACluster, endpoint_id=1)
-    .removes(Groups.cluster_id, endpoint_id=1)
-    .device_automation_triggers(_DEVICE_AUTOMATION_TRIGGERS)
-    .add_to_registry()
-)

zhaquirks/thirdreality/switch.py

@@ -19,10 +19,3 @@ class CustomPowerConfigurationCluster(PowerConfigurationCluster):
     .replaces(CustomPowerConfigurationCluster, endpoint_id=1)
     .add_to_registry()
 )
-
-
-(
-    QuirkBuilder(THIRD_REALITY, "3RSS008Z")
-    .replaces(CustomPowerConfigurationCluster, endpoint_id=1)
-    .add_to_registry()
-)