Update Aqara quirks for various Zigbee 3.0 devices (#1151)

dmulcahey · web-flow · commit a666e463edde · 2021-12-02T12:49:23.000-05:00
* Add quirk for Aqara E1 contact sensor

* get model from device

* fix temperature

* replace magic number

* this was intentionally jacked up

* more aqara updates

* review comment
diff --git a/setup.py b/setup.py
@@ -24,6 +24,6 @@ def readme():
     keywords="zha quirks homeassistant hass",
     packages=find_packages(exclude=["tests"]),
     python_requires=">=3",
-    install_requires=["zigpy>=0.32.0"],
+    install_requires=["zigpy>=0.42.0"],
     tests_require=["pytest"],
 )
diff --git a/zhaquirks/xiaomi/__init__.py b/zhaquirks/xiaomi/__init__.py
@@ -17,6 +17,7 @@
     PowerConfiguration,
 )
 from zigpy.zcl.clusters.homeautomation import ElectricalMeasurement
+from zigpy.zcl.clusters.manufacturer_specific import ManufacturerSpecificCluster
 from zigpy.zcl.clusters.measurement import (
     IlluminanceMeasurement,
     PressureMeasurement,
@@ -66,13 +67,15 @@
 STATE = "state"
 TEMPERATURE = "temperature"
 TEMPERATURE_MEASUREMENT = "temperature_measurement"
+TVOC_MEASUREMENT = "tvoc_measurement"
 TEMPERATURE_REPORTED = "temperature_reported"
 POWER_REPORTED = "power_reported"
 CONSUMPTION_REPORTED = "consumption_reported"
 VOLTAGE_REPORTED = "voltage_reported"
 ILLUMINANCE_MEASUREMENT = "illuminance_measurement"
 ILLUMINANCE_REPORTED = "illuminance_reported"
 XIAOMI_AQARA_ATTRIBUTE = 0xFF01
+XIAOMI_AQARA_ATTRIBUTE_E1 = 0x00F7
 XIAOMI_ATTR_3 = "X-attrib-3"
 XIAOMI_ATTR_4 = "X-attrib-4"
 XIAOMI_ATTR_5 = "X-attrib-5"
@@ -110,10 +113,8 @@ class XiaomiQuickInitDevice(XiaomiCustomDevice, QuickInitDevice):
     """Xiaomi devices eligible for QuickInit."""
 
 
-class BasicCluster(CustomCluster, Basic):
-    """Xiaomi basic cluster implementation."""
-
-    cluster_id = Basic.cluster_id
+class XiaomiCluster(CustomCluster):
+    """Xiaomi cluster implementation."""
 
     def _iter_parse_attr_report(
         self, data: bytes
@@ -125,7 +126,12 @@ def _iter_parse_attr_report(
         attr_type, data = t.uint8_t.deserialize(data)
 
         if (
-            attr_id not in (XIAOMI_AQARA_ATTRIBUTE, XIAOMI_MIJA_ATTRIBUTE)
+            attr_id
+            not in (
+                XIAOMI_AQARA_ATTRIBUTE,
+                XIAOMI_MIJA_ATTRIBUTE,
+                XIAOMI_AQARA_ATTRIBUTE_E1,
+            )
             or attr_type != 0x42  # "Character String"
         ):
             # Assume other attributes are reported correctly
@@ -199,20 +205,17 @@ def deserialize(self, data):
         return super().deserialize(hdr.serialize() + fixed_data)
 
     def _update_attribute(self, attrid, value):
-        if attrid == XIAOMI_AQARA_ATTRIBUTE:
+        if attrid in (XIAOMI_AQARA_ATTRIBUTE, XIAOMI_AQARA_ATTRIBUTE_E1):
             attributes = self._parse_aqara_attributes(value)
             super()._update_attribute(attrid, value)
-            if (
-                MODEL in self._attr_cache
-                and self._attr_cache[MODEL] == "lumi.sensor_switch.aq2"
-            ):
+            if self.endpoint.device.model == "lumi.sensor_switch.aq2":
                 if value == b"\x04!\xa8C\n!\x00\x00":
                     self.listener_event(ZHA_SEND_EVENT, COMMAND_TRIPLE, [])
         elif attrid == XIAOMI_MIJA_ATTRIBUTE:
             attributes = self._parse_mija_attributes(value)
         else:
             super()._update_attribute(attrid, value)
-            if attrid == 0x0005:
+            if attrid == MODEL:
                 # 0x0005 = model attribute.
                 # Xiaomi sensors send the model attribute when their reset button is
                 # pressed quickly."""
@@ -266,6 +269,10 @@ def _update_attribute(self, attrid, value):
             self.endpoint.device.illuminance_bus.listener_event(
                 ILLUMINANCE_REPORTED, attributes[ILLUMINANCE_MEASUREMENT]
             )
+        if TVOC_MEASUREMENT in attributes:
+            self.endpoint.voc_level.update_attribute(
+                0x0000, attributes[TVOC_MEASUREMENT]
+            )
 
     def _parse_aqara_attributes(self, value):
         """Parse non standard attributes."""
@@ -279,29 +286,29 @@ def _parse_aqara_attributes(self, value):
             10: PATH,
         }
 
-        if MODEL in self._attr_cache and self._attr_cache[MODEL] in [
+        if self.endpoint.device.model in [
             "lumi.sensor_ht",
             "lumi.sens",
             "lumi.weather",
+            "lumi.airmonitor.acn01",
         ]:
             # Temperature sensors send temperature/humidity/pressure updates trough this
             # cluster instead of the respective clusters
             attribute_names.update(
                 {
                     100: TEMPERATURE_MEASUREMENT,
                     101: HUMIDITY_MEASUREMENT,
-                    102: PRESSURE_MEASUREMENT,
+                    102: TVOC_MEASUREMENT
+                    if self.endpoint.device.model == "lumi.airmonitor.acn01"
+                    else PRESSURE_MEASUREMENT,
                 }
             )
-        elif MODEL in self._attr_cache and self._attr_cache[MODEL] in [
+        elif self.endpoint.device.model in [
             "lumi.plug.maus01",
             "lumi.relay.c2acn01",
         ]:
             attribute_names.update({149: CONSUMPTION, 150: VOLTAGE, 152: POWER})
-        elif (
-            MODEL in self._attr_cache
-            and self._attr_cache[MODEL] == "lumi.sensor_motion.aq2"
-        ):
+        elif self.endpoint.device.model == "lumi.sensor_motion.aq2":
             attribute_names.update({11: ILLUMINANCE_MEASUREMENT})
 
         result = {}
@@ -340,6 +347,16 @@ def _parse_mija_attributes(self, value):
         return attributes
 
 
+class BasicCluster(XiaomiCluster, Basic):
+    """Xiaomi basic cluster implementation."""
+
+
+class XiaomiAqaraE1Cluster(XiaomiCluster, ManufacturerSpecificCluster):
+    """Xiaomi mfg cluster implementation."""
+
+    cluster_id = 0xFCC0
+
+
 class BinaryOutputInterlock(CustomCluster, BinaryOutput):
     """Xiaomi binaryoutput cluster with added interlock attribute."""
 
diff --git a/zhaquirks/xiaomi/aqara/magnet_acn001.py b/zhaquirks/xiaomi/aqara/magnet_acn001.py
@@ -0,0 +1,68 @@
+"""Xiaomi aqara E1 contact sensor device."""
+
+from zigpy.profiles import zha
+from zigpy.zcl.clusters.general import Identify, Ota
+from zigpy.zcl.clusters.security import IasZone
+
+from zhaquirks.const import (
+    DEVICE_TYPE,
+    ENDPOINTS,
+    INPUT_CLUSTERS,
+    MODELS_INFO,
+    OUTPUT_CLUSTERS,
+    PROFILE_ID,
+)
+from zhaquirks.xiaomi import (
+    LUMI,
+    BasicCluster,
+    XiaomiAqaraE1Cluster,
+    XiaomiCustomDevice,
+    XiaomiPowerConfiguration,
+)
+
+XIAOMI_CLUSTER_ID = 0xFCC0
+
+
+class MagnetE1(XiaomiCustomDevice):
+    """Xiaomi contact sensor device."""
+
+    def __init__(self, *args, **kwargs):
+        """Init."""
+        self.battery_size = 11
+        super().__init__(*args, **kwargs)
+
+    signature = {
+        #  <SimpleDescriptor endpoint=1 profile=260 device_type=1026
+        #  device_version=1
+        #  input_clusters=[0, 1, 3, 1280, 64704]
+        #  output_clusters=[3, 19]>
+        MODELS_INFO: [(LUMI, "lumi.magnet.acn001")],
+        ENDPOINTS: {
+            1: {
+                PROFILE_ID: zha.PROFILE_ID,
+                DEVICE_TYPE: zha.DeviceType.IAS_ZONE,
+                INPUT_CLUSTERS: [
+                    BasicCluster.cluster_id,
+                    XiaomiPowerConfiguration.cluster_id,
+                    Identify.cluster_id,
+                    IasZone.cluster_id,
+                    XIAOMI_CLUSTER_ID,
+                ],
+                OUTPUT_CLUSTERS: [Identify.cluster_id, Ota.cluster_id],
+            }
+        },
+    }
+    replacement = {
+        ENDPOINTS: {
+            1: {
+                INPUT_CLUSTERS: [
+                    BasicCluster,
+                    XiaomiPowerConfiguration,
+                    Identify.cluster_id,
+                    IasZone.cluster_id,
+                    XiaomiAqaraE1Cluster,
+                ],
+                OUTPUT_CLUSTERS: [Identify.cluster_id, Ota.cluster_id],
+            }
+        },
+    }
diff --git a/zhaquirks/xiaomi/aqara/motion_agl02.py b/zhaquirks/xiaomi/aqara/motion_agl02.py
@@ -0,0 +1,85 @@
+"""Xiaomi aqara T1 motion sensor device."""
+from zigpy.profiles import zha
+from zigpy.zcl.clusters.general import Identify, Ota
+from zigpy.zcl.clusters.measurement import OccupancySensing
+
+from zhaquirks import Bus
+from zhaquirks.const import (
+    DEVICE_TYPE,
+    ENDPOINTS,
+    INPUT_CLUSTERS,
+    MODELS_INFO,
+    OUTPUT_CLUSTERS,
+    PROFILE_ID,
+)
+from zhaquirks.xiaomi import (
+    LUMI,
+    BasicCluster,
+    IlluminanceMeasurementCluster,
+    MotionCluster,
+    OccupancyCluster,
+    XiaomiAqaraE1Cluster,
+    XiaomiCustomDevice,
+    XiaomiPowerConfiguration,
+)
+
+XIAOMI_CLUSTER_ID = 0xFCC0
+
+
+class XiaomiManufacturerCluster(XiaomiAqaraE1Cluster):
+    """Xiaomi manufacturer cluster."""
+
+    def _update_attribute(self, attrid, value):
+        super()._update_attribute(attrid, value)
+        if attrid == 274:
+            value = value - 65536
+            self.endpoint.illuminance.illuminance_reported(value)
+            self.endpoint.occupancy.update_attribute(0, 1)
+
+
+class MotionT1(XiaomiCustomDevice):
+    """Xiaomi contact sensor device."""
+
+    def __init__(self, *args, **kwargs):
+        """Init."""
+        self.battery_size = 11
+        self.motion_bus = Bus()
+        self.illuminance_bus = Bus()
+        super().__init__(*args, **kwargs)
+
+    signature = {
+        #  <SimpleDescriptor endpoint=1 profile=260 device_type=263
+        #  device_version=1
+        #  input_clusters=[0, 1, 3, 1030]
+        #  output_clusters=[3, 19]>
+        MODELS_INFO: [(LUMI, "lumi.motion.agl02")],
+        ENDPOINTS: {
+            1: {
+                PROFILE_ID: zha.PROFILE_ID,
+                DEVICE_TYPE: zha.DeviceType.OCCUPANCY_SENSOR,
+                INPUT_CLUSTERS: [
+                    BasicCluster.cluster_id,
+                    XiaomiPowerConfiguration.cluster_id,
+                    Identify.cluster_id,
+                    OccupancySensing.cluster_id,
+                ],
+                OUTPUT_CLUSTERS: [Identify.cluster_id, Ota.cluster_id],
+            }
+        },
+    }
+    replacement = {
+        ENDPOINTS: {
+            1: {
+                INPUT_CLUSTERS: [
+                    BasicCluster,
+                    XiaomiPowerConfiguration,
+                    Identify.cluster_id,
+                    OccupancyCluster,
+                    MotionCluster,
+                    IlluminanceMeasurementCluster,
+                    XiaomiManufacturerCluster,
+                ],
+                OUTPUT_CLUSTERS: [Identify.cluster_id, Ota.cluster_id],
+            }
+        },
+    }
diff --git a/zhaquirks/xiaomi/aqara/tvoc.py b/zhaquirks/xiaomi/aqara/tvoc.py
@@ -1,5 +1,4 @@
 """Quirk for lumi.airmonitor.acn01 tvoc air monitor."""
-import logging
 
 from zigpy.profiles import zha
 from zigpy.quirks import CustomCluster
@@ -8,7 +7,7 @@
 from zigpy.zcl.clusters.measurement import RelativeHumidity, TemperatureMeasurement
 from zigpy.zdo.types import NodeDescriptor
 
-from zhaquirks import LocalDataCluster, PowerConfigurationCluster
+from zhaquirks import Bus, LocalDataCluster, PowerConfigurationCluster
 from zhaquirks.const import (
     DEVICE_TYPE,
     ENDPOINTS,
@@ -18,17 +17,24 @@
     OUTPUT_CLUSTERS,
     PROFILE_ID,
 )
-from zhaquirks.xiaomi import LUMI, BasicCluster, XiaomiCustomDevice
+from zhaquirks.xiaomi import (
+    LUMI,
+    BasicCluster,
+    RelativeHumidityCluster,
+    TemperatureMeasurementCluster,
+    XiaomiAqaraE1Cluster,
+    XiaomiCustomDevice,
+)
 
-_LOGGER = logging.getLogger(__name__)
+MEASURED_VALUE = 0x0000
 
 
 class AnalogInputCluster(CustomCluster, AnalogInput):
     """Analog input cluster, relay tvoc to the correct cluster."""
 
     def _update_attribute(self, attrid, value):
         super()._update_attribute(attrid, value)
-        self.endpoint.voc_level.update_attribute(value)
+        self.endpoint.voc_level.update_attribute(MEASURED_VALUE, value)
 
 
 class EmulatedTVOCMeasurement(LocalDataCluster):
@@ -38,7 +44,6 @@ class EmulatedTVOCMeasurement(LocalDataCluster):
     ONE_HOUR = 3600
     MIN_CHANGE = 5
     TEN_SECONDS = 10
-    MEASURED_VALUE = 0x0000
 
     cluster_id = 0x042E
     name = "VOC Level"
@@ -59,14 +64,16 @@ async def bind(self):
         )
         return result
 
-    def update_attribute(self, value):
-        """VOC reported."""
-        self._update_attribute(self.MEASURED_VALUE, value)
-
 
 class TVOCMonitor(XiaomiCustomDevice):
     """Aqara LUMI lumi.airmonitor.acn01."""
 
+    def __init__(self, *args, **kwargs):
+        """Init."""
+        self.temperature_bus = Bus()
+        self.humidity_bus = Bus()
+        super().__init__(*args, **kwargs)
+
     signature = {
         # <SimpleDescriptor endpoint=1 profile=260 device_type=770
         # device_version=1
@@ -101,11 +108,12 @@ class TVOCMonitor(XiaomiCustomDevice):
                 INPUT_CLUSTERS: [
                     BasicCluster,
                     Identify.cluster_id,
-                    TemperatureMeasurement.cluster_id,
+                    TemperatureMeasurementCluster,
                     PowerConfigurationCluster,
-                    RelativeHumidity.cluster_id,
+                    RelativeHumidityCluster,
                     AnalogInputCluster,
                     EmulatedTVOCMeasurement,
+                    XiaomiAqaraE1Cluster,
                 ],
                 OUTPUT_CLUSTERS: [Ota.cluster_id],
             }

Original file line number	Diff line number	Diff line change
`@@ -24,6 +24,6 @@ def readme():`
`24`	`24`	`keywords="zha quirks homeassistant hass",`
`25`	`25`	`packages=find_packages(exclude=["tests"]),`
`26`	`26`	`python_requires=">=3",`
`27`		`- install_requires=["zigpy>=0.32.0"],`
	`27`	`+ install_requires=["zigpy>=0.42.0"],`
`28`	`28`	`tests_require=["pytest"],`
`29`	`29`	`)`