Fix Aqara motion sensor erroneous motion events (#2779)

zigpy · Mar 27, 2024 · 9ccb69a · 9ccb69a
1 parent ef83953
commit 9ccb69a
Show file tree

Hide file tree

Showing 3 changed files with 20 additions and 4 deletions.
diff --git a/zhaquirks/xiaomi/__init__.py b/zhaquirks/xiaomi/__init__.py
@@ -11,6 +11,7 @@
 import zigpy.device
 from zigpy.profiles import zha
 from zigpy.quirks import CustomCluster, CustomDevice
+from zigpy.typing import AddressingMode
 from zigpy.zcl import foundation
 from zigpy.zcl.clusters.general import (
     AnalogInput,
@@ -543,6 +544,19 @@ class MotionCluster(LocalDataCluster, MotionOnEvent):
     reset_s: int = 70
 
 
+class LocalOccupancyCluster(LocalDataCluster, OccupancyCluster):
+    """Local occupancy cluster that ignores messages from device."""
+
+    def handle_cluster_general_request(
+        self,
+        hdr: zigpy.zcl.foundation.ZCLHeader,
+        args: list,
+        *,
+        dst_addressing: AddressingMode | None = None,
+    ) -> None:
+        """Ignore occupancy attribute reports on this cluster, as they're invalid and sent by the sensor every hour."""
+
+
 class DeviceTemperatureCluster(LocalDataCluster, DeviceTemperature):
     """Device Temperature Cluster."""
 

diff --git a/zhaquirks/xiaomi/aqara/motion_agl02.py b/zhaquirks/xiaomi/aqara/motion_agl02.py
@@ -1,4 +1,6 @@
 """Xiaomi aqara T1 motion sensor device."""
+from __future__ import annotations
+
 from zigpy.profiles import zha
 from zigpy.zcl.clusters.general import Identify, Ota
 from zigpy.zcl.clusters.measurement import IlluminanceMeasurement, OccupancySensing
@@ -16,8 +18,8 @@
     LUMI,
     BasicCluster,
     IlluminanceMeasurementCluster,
+    LocalOccupancyCluster,
     MotionCluster,
-    OccupancyCluster,
     XiaomiAqaraE1Cluster,
     XiaomiCustomDevice,
     XiaomiPowerConfiguration,
@@ -78,7 +80,7 @@ def __init__(self, *args, **kwargs):
                     BasicCluster,
                     XiaomiPowerConfiguration,
                     Identify.cluster_id,
-                    OccupancyCluster,
+                    LocalOccupancyCluster,
                     MotionCluster,
                     IlluminanceMeasurementCluster,
                     XiaomiManufacturerCluster,

diff --git a/zhaquirks/xiaomi/aqara/motion_agl04.py b/zhaquirks/xiaomi/aqara/motion_agl04.py
@@ -19,8 +19,8 @@
 )
 from zhaquirks.xiaomi import (
     DeviceTemperatureCluster,
+    LocalOccupancyCluster,
     MotionCluster,
-    OccupancyCluster,
     XiaomiAqaraE1Cluster,
     XiaomiCustomDevice,
     XiaomiPowerConfiguration,
@@ -98,7 +98,7 @@ def __init__(self, *args, **kwargs):
                     XiaomiPowerConfiguration,
                     Identify.cluster_id,
                     DeviceTemperatureCluster,
-                    OccupancyCluster,
+                    LocalOccupancyCluster,
                     LocalMotionCluster,
                     OppleCluster,
                 ],