Merge branch 'release/0.0.35'

Author: dmulcahey

Contributors.md

@@ -18,3 +18,4 @@
 - [Nemesis24](https://github.com/Nemesis24)
 - [Andy Zickler](https://github.com/andyzickler)
 - [Piotr Majkrzak](https://github.com/majkrzak)
+- [Gleb Sinyavskiy](https://github.com/zhulik)

README.md

@@ -40,6 +40,8 @@ If you are looking to make your first code contribution to this project then we
 - [Motion Sensor](https://www.aqara.com/en/motion_sensor.html): lumi.sensor_motion.aq2
 - [Temperature / Humidity Sensor](https://www.aqara.com/en/temperature_and_humidity_sensor-product.html): lumi.weather
 - [Water Leak](https://www.aqara.com/en/water_leak_sensor.html): lumi.sensor_wleak.aq1
+- [US Plug](https://www.aqara.com/en/smart_plug.html): lumi.plug.maus01
+- [EU Plug](https://zigbee.blakadder.com/Xiaomi_ZNCZ04LM.html): lumi.plug.mmeu01
 
 ### Osram
 - [OSRAM LIGHTIFY Dimming Switch](https://assets.osram-americas.com/assets/Documents/LTFY012.06c0d6e6-17c7-4dcb-bd2c-1fca7feecfb4.pdf):
@@ -96,6 +98,7 @@ If you are looking to make your first code contribution to this project then we
 - Cube sends the following events: `flip (90 and 180 degrees)`, `rotate_left`, `rotate_right`, `knock`, `drop`, `slide` and `shake`
 - Motion sensor exposes binary sensors for motion and occupancy.
 - Button sends events to Home Assistant
+- All supported plugs report power consumption and can be toggled
 
 ### SmartThings
 

setup.py

@@ -2,7 +2,7 @@
 
 from setuptools import find_packages, setup
 
-VERSION = "0.0.34"
+VERSION = "0.0.35"
 
 
 def readme():

zhaquirks/__init__.py

@@ -51,7 +51,7 @@ async def write_attributes(self, attributes, manufacturer=None):
         """Prevent remote writes."""
         for attrid, value in attributes.items():
             if isinstance(attrid, str):
-                attrid = self._attridx[attrid]
+                attrid = self.attridx[attrid]
             if attrid not in self.attributes:
                 self.error("%d is not a valid attribute id", attrid)
                 continue

zhaquirks/xiaomi/__init__.py

@@ -5,7 +5,7 @@
 
 from zigpy import types as t
 from zigpy.quirks import CustomCluster, CustomDevice
-from zigpy.zcl.clusters.general import Basic, PowerConfiguration
+from zigpy.zcl.clusters.general import AnalogInput, Basic, PowerConfiguration
 from zigpy.zcl.clusters.homeautomation import ElectricalMeasurement
 from zigpy.zcl.clusters.measurement import (
     OccupancySensing,
@@ -409,7 +409,23 @@ def pressure_reported(self, value):
         self._update_attribute(self.ATTR_ID, value)
 
 
-class ElectricalMeasurementCluster(CustomCluster, ElectricalMeasurement):
+class AnalogInputCluster(CustomCluster, AnalogInput):
+    """Analog input cluster, only used to relay power consumtion information to ElectricalMeasurementCluster."""
+
+    cluster_id = AnalogInput.cluster_id
+
+    def __init__(self, *args, **kwargs):
+        """Init."""
+        self._current_state = {}
+        super().__init__(*args, **kwargs)
+
+    def _update_attribute(self, attrid, value):
+        super()._update_attribute(attrid, value)
+        if value is not None and value >= 0:
+            self.endpoint.device.power_bus.listener_event(POWER_REPORTED, value)
+
+
+class ElectricalMeasurementCluster(LocalDataCluster, ElectricalMeasurement):
     """Electrical measurement cluster to receive reports that are sent to the basic cluster."""
 
     cluster_id = ElectricalMeasurement.cluster_id
@@ -435,9 +451,3 @@ def voltage_reported(self, value):
     def consumption_reported(self, value):
         """Consumption reported."""
         self._update_attribute(self.CONSUMPTION_ID, value)
-
-    async def read_attributes_raw(self, attributes, manufacturer=None):
-        """Prevent remote reads."""
-        attributes = [t.uint16_t(a) for a in attributes]
-        values = [self._attr_cache.get(attr) for attr in attributes]
-        return values

zhaquirks/xiaomi/aqara/cube.py

@@ -35,7 +35,7 @@
 DROP_VALUE = 3
 DROPPED = "device_dropped"
 
-FACE_ANY = "fave_any"
+FACE_ANY = "face_any"
 FACE_1 = "face_1"
 FACE_2 = "face_2"
 FACE_3 = "face_3"

zhaquirks/xiaomi/aqara/cube_aqgl01.py

@@ -35,7 +35,7 @@
 DROP_VALUE = 3
 DROPPED = "device_dropped"
 
-FACE_ANY = "fave_any"
+FACE_ANY = "face_any"
 FACE_1 = "face_1"
 FACE_2 = "face_2"
 FACE_3 = "face_3"

zhaquirks/xiaomi/aqara/plug.py renamed to zhaquirks/xiaomi/aqara/plug_maus01.py

@@ -1,4 +1,4 @@
-"""Xiaomi aqara button sensor."""
+"""Xiaomi lumi.plug.maus01 plug."""
 import logging
 
 from zigpy.profiles import zha
@@ -20,12 +20,12 @@
 
 from .. import (
     LUMI,
-    POWER_REPORTED,
+    AnalogInputCluster,
     BasicCluster,
     ElectricalMeasurementCluster,
     XiaomiCustomDevice,
 )
-from ... import Bus, CustomCluster
+from ... import Bus
 from ...const import (
     DEVICE_TYPE,
     ENDPOINTS,
@@ -39,24 +39,8 @@
 _LOGGER = logging.getLogger(__name__)
 
 
-class AnalogInputCluster(CustomCluster, AnalogInput):
-    """Analog input cluster."""
-
-    cluster_id = AnalogInput.cluster_id
-
-    def __init__(self, *args, **kwargs):
-        """Init."""
-        self._current_state = {}
-        super().__init__(*args, **kwargs)
-
-    def _update_attribute(self, attrid, value):
-        super()._update_attribute(attrid, value)
-        if value is not None and value >= 0:
-            self.endpoint.device.power_bus.listener_event(POWER_REPORTED, value)
-
-
 class Plug(XiaomiCustomDevice):
-    """lumi.plug.maus01 device."""
+    """lumi.plug.maus01 plug."""
 
     def __init__(self, *args, **kwargs):
         """Init."""

zhaquirks/xiaomi/aqara/plug_mmeu01.py

@@ -0,0 +1,120 @@
+"""Xiaomi lumi.plug.mmeu01 plug."""
+import logging
+
+from zigpy.profiles import zha
+from zigpy.zcl.clusters.general import (
+    Alarms,
+    AnalogInput,
+    Basic,
+    DeviceTemperature,
+    GreenPowerProxy,
+    Groups,
+    Identify,
+    OnOff,
+    Ota,
+    Scenes,
+    Time,
+)
+from zigpy.zcl.clusters.homeautomation import ElectricalMeasurement
+from zigpy.zcl.clusters.smartenergy import Metering
+
+from .. import (
+    LUMI,
+    AnalogInputCluster,
+    BasicCluster,
+    ElectricalMeasurementCluster,
+    XiaomiCustomDevice,
+)
+from ... import Bus
+from ...const import (
+    DEVICE_TYPE,
+    ENDPOINTS,
+    INPUT_CLUSTERS,
+    MODELS_INFO,
+    OUTPUT_CLUSTERS,
+    PROFILE_ID,
+    SKIP_CONFIGURATION,
+)
+
+_LOGGER = logging.getLogger(__name__)
+
+XIAOMI_PROFILE_ID = 0xA1E0
+XIAOMI_DEVICE_TYPE = 0x61
+
+
+class Plug(XiaomiCustomDevice):
+    """lumi.plug.mmeu01 plug."""
+
+    def __init__(self, *args, **kwargs):
+        """Init."""
+        self.voltage_bus = Bus()
+        self.consumption_bus = Bus()
+        self.power_bus = Bus()
+        super().__init__(*args, **kwargs)
+
+    signature = {
+        MODELS_INFO: [(LUMI, "lumi.plug.mmeu01")],
+        ENDPOINTS: {
+            # <SimpleDescriptor endpoint=1 profile=260 device_type=81
+            # device_version=1
+            # input_clusters=[0, 2, 3, 4, 5, 6, 9, 1794, 2820]
+            # output_clusters=[10, 25]>
+            1: {
+                PROFILE_ID: zha.PROFILE_ID,
+                DEVICE_TYPE: zha.DeviceType.SMART_PLUG,
+                INPUT_CLUSTERS: [
+                    Basic.cluster_id,
+                    DeviceTemperature.cluster_id,
+                    Identify.cluster_id,
+                    Groups.cluster_id,
+                    Scenes.cluster_id,
+                    OnOff.cluster_id,
+                    Alarms.cluster_id,
+                    Metering.cluster_id,
+                    ElectricalMeasurement.cluster_id,
+                ],
+                OUTPUT_CLUSTERS: [Time.cluster_id, Ota.cluster_id],
+            },
+            # <SimpleDescriptor endpoint=242 profile=41440 device_type=97
+            # device_version=0
+            # input_clusters=[]
+            # output_clusters=[33]>
+            242: {
+                PROFILE_ID: XIAOMI_PROFILE_ID,
+                DEVICE_TYPE: XIAOMI_DEVICE_TYPE,
+                OUTPUT_CLUSTERS: [GreenPowerProxy.cluster_id],
+            },
+        },
+    }
+    replacement = {
+        SKIP_CONFIGURATION: True,
+        ENDPOINTS: {
+            1: {
+                PROFILE_ID: zha.PROFILE_ID,
+                DEVICE_TYPE: zha.DeviceType.SMART_PLUG,
+                INPUT_CLUSTERS: [
+                    BasicCluster,
+                    DeviceTemperature.cluster_id,
+                    Identify.cluster_id,
+                    Groups.cluster_id,
+                    Scenes.cluster_id,
+                    OnOff.cluster_id,
+                    Alarms.cluster_id,
+                    Metering.cluster_id,
+                    ElectricalMeasurementCluster,
+                ],
+                OUTPUT_CLUSTERS: [Time.cluster_id, Ota.cluster_id],
+            },
+            21: {
+                PROFILE_ID: zha.PROFILE_ID,
+                DEVICE_TYPE: zha.DeviceType.MAIN_POWER_OUTLET,
+                INPUT_CLUSTERS: [AnalogInputCluster],
+                OUTPUT_CLUSTERS: [AnalogInput.cluster_id, Groups.cluster_id],
+            },
+            242: {
+                PROFILE_ID: XIAOMI_PROFILE_ID,
+                DEVICE_TYPE: XIAOMI_DEVICE_TYPE,
+                OUTPUT_CLUSTERS: [GreenPowerProxy.cluster_id],
+            },
+        },
+    }

zhaquirks/xiaomi/aqara/relay.py renamed to zhaquirks/xiaomi/aqara/relay_c2acn01.py

@@ -1,4 +1,4 @@
-"""Xiaomi aqara button sensor."""
+"""Xiaomi lumi.relay.c2acn01 relay."""
 import logging
 
 from zigpy.profiles import zha
@@ -19,12 +19,12 @@
 
 from .. import (
     LUMI,
-    POWER_REPORTED,
+    AnalogInputCluster,
     BasicCluster,
     ElectricalMeasurementCluster,
     XiaomiCustomDevice,
 )
-from ... import Bus, CustomCluster
+from ... import Bus
 from ...const import (
     DEVICE_TYPE,
     ENDPOINTS,
@@ -38,24 +38,8 @@
 _LOGGER = logging.getLogger(__name__)
 
 
-class AnalogInputCluster(CustomCluster, AnalogInput):
-    """Analog input cluster."""
-
-    cluster_id = AnalogInput.cluster_id
-
-    def __init__(self, *args, **kwargs):
-        """Init."""
-        self._current_state = {}
-        super().__init__(*args, **kwargs)
-
-    def _update_attribute(self, attrid, value):
-        super()._update_attribute(attrid, value)
-        if value is not None and value >= 0:
-            self.endpoint.device.power_bus.listener_event(POWER_REPORTED, value)
-
-
 class Relay(XiaomiCustomDevice):
-    """lumi.plug.maus01 device."""
+    """lumi.relay.c2acn01 relay."""
 
     def __init__(self, *args, **kwargs):
         """Init."""