diff --git a/setup.py b/setup.py index dd3a7a6c9c..bc00e30c82 100644 --- a/setup.py +++ b/setup.py @@ -4,7 +4,7 @@ from setuptools import find_packages, setup -VERSION = "0.0.95" +VERSION = "0.0.96" setup( diff --git a/zhaquirks/ikea/opencloseremote.py b/zhaquirks/ikea/opencloseremote.py index ba2da52123..a21f38d41f 100644 --- a/zhaquirks/ikea/opencloseremote.py +++ b/zhaquirks/ikea/opencloseremote.py @@ -65,7 +65,7 @@ def handle_cluster_request( We just want to keep track of direction, to associate it with the stop command. """ - cmd_name = self.server_commands.get(hdr.command_id, [hdr.command_id])[0] + cmd_name = self.server_commands[hdr.command_id].name if cmd_name == COMMAND_OPEN: self._is_closing = False elif cmd_name == COMMAND_CLOSE: diff --git a/zhaquirks/tuya/ts004f.py b/zhaquirks/tuya/ts004f.py index 1d41678723..39684f12e0 100644 --- a/zhaquirks/tuya/ts004f.py +++ b/zhaquirks/tuya/ts004f.py @@ -4,7 +4,6 @@ import logging from zigpy.profiles import zha -from zigpy.quirks import CustomDevice from zigpy.zcl.clusters.general import ( Basic, Groups, @@ -67,7 +66,7 @@ _LOGGER = logging.getLogger(__name__) -class TuyaSmartRemote004FROK(EnchantedDevice, CustomDevice): +class TuyaSmartRemote004FROK(EnchantedDevice): """Tuya Smart (rotating) Knob device.""" signature = { @@ -186,7 +185,7 @@ class TuyaSmartRemote004FROK(EnchantedDevice, CustomDevice): } -class TuyaSmartRemote004FDMS(EnchantedDevice, CustomDevice): +class TuyaSmartRemote004FDMS(EnchantedDevice): """Tuya 4 btton dimmer switch / remote device.""" signature = { @@ -320,7 +319,7 @@ class TuyaSmartRemote004FDMS(EnchantedDevice, CustomDevice): } -class TuyaSmartRemote004F(EnchantedDevice, CustomDevice): +class TuyaSmartRemote004F(EnchantedDevice): """Tuya 4-button New version remote device.""" signature = { diff --git a/zhaquirks/tuya/ts0601_dimmer.py b/zhaquirks/tuya/ts0601_dimmer.py index d6c71d6441..5c0932b6f0 100644 --- a/zhaquirks/tuya/ts0601_dimmer.py +++ b/zhaquirks/tuya/ts0601_dimmer.py @@ -48,6 +48,7 @@ class TuyaSingleSwitchDimmer(TuyaDimmerSwitch): ("_TZE200_la2c2uo9", "TS0601"), ("_TZE200_1agwnems", "TS0601"), # TODO: validation pending? ("_TZE200_9cxuhakf", "TS0601"), # Added for Mercator IKUU SSWM-DIMZ Device + ("_TZE200_a0syesf5", "TS0601"), # Added for Mercator IKUU SSWRM-ZB ("_TZE200_p0gzbqct", "TS0601"), ("_TZE200_w4cryh2i", "TS0601"), ], diff --git a/zhaquirks/tuya/ts0601_motion.py b/zhaquirks/tuya/ts0601_motion.py index 649a9394bc..e1d680f718 100644 --- a/zhaquirks/tuya/ts0601_motion.py +++ b/zhaquirks/tuya/ts0601_motion.py @@ -191,7 +191,7 @@ class MmwRadarManufCluster(TuyaMCUCluster): 104: DPToAttributeMapping( TuyaIlluminanceMeasurement.ep_attribute, "measured_value", - lambda x: 10000 * math.log10(x) + 1, + lambda x: 10000 * math.log10(x) + 1 if x != 0 else 0, ), 105: DPToAttributeMapping( TuyaMCUCluster.ep_attribute, diff --git a/zhaquirks/tuya/ts0601_sensor.py b/zhaquirks/tuya/ts0601_sensor.py index 4f255a5360..0034f53b9b 100644 --- a/zhaquirks/tuya/ts0601_sensor.py +++ b/zhaquirks/tuya/ts0601_sensor.py @@ -184,6 +184,7 @@ class TuyaTempHumiditySensorVar03(CustomDevice): ("_TZE200_yjjdcqsq", "TS0601"), ("_TZE200_9yapgbuv", "TS0601"), ("_TZE200_qyflbnbj", "TS0601"), + ("_TZE200_utkemkbs", "TS0601"), ], ENDPOINTS: { 1: { diff --git a/zhaquirks/tuya/ts0601_siren.py b/zhaquirks/tuya/ts0601_siren.py index d05ad16445..0e549f2294 100644 --- a/zhaquirks/tuya/ts0601_siren.py +++ b/zhaquirks/tuya/ts0601_siren.py @@ -293,7 +293,7 @@ async def command( endpoint_id=self.endpoint.endpoint_id, cluster_name=self.ep_attribute, cluster_attr="on_off", - attr_value=command_id, + attr_value=bool(command_id), expect_reply=expect_reply, manufacturer=foundation.ZCLHeader.NO_MANUFACTURER_ID, )