Skip to content

Commit

Permalink
Merge branch 'release/0.0.96'
Browse files Browse the repository at this point in the history
  • Loading branch information
dmulcahey committed Apr 7, 2023
2 parents 1c8a719 + 4998d64 commit 4bb9ade
Show file tree
Hide file tree
Showing 7 changed files with 9 additions and 8 deletions.
2 changes: 1 addition & 1 deletion setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@

from setuptools import find_packages, setup

VERSION = "0.0.95"
VERSION = "0.0.96"


setup(
Expand Down
2 changes: 1 addition & 1 deletion zhaquirks/ikea/opencloseremote.py
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
7 changes: 3 additions & 4 deletions zhaquirks/tuya/ts004f.py
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,6 @@
import logging

from zigpy.profiles import zha
from zigpy.quirks import CustomDevice
from zigpy.zcl.clusters.general import (
Basic,
Groups,
Expand Down Expand Up @@ -67,7 +66,7 @@
_LOGGER = logging.getLogger(__name__)


class TuyaSmartRemote004FROK(EnchantedDevice, CustomDevice):
class TuyaSmartRemote004FROK(EnchantedDevice):
"""Tuya Smart (rotating) Knob device."""

signature = {
Expand Down Expand Up @@ -186,7 +185,7 @@ class TuyaSmartRemote004FROK(EnchantedDevice, CustomDevice):
}


class TuyaSmartRemote004FDMS(EnchantedDevice, CustomDevice):
class TuyaSmartRemote004FDMS(EnchantedDevice):
"""Tuya 4 btton dimmer switch / remote device."""

signature = {
Expand Down Expand Up @@ -320,7 +319,7 @@ class TuyaSmartRemote004FDMS(EnchantedDevice, CustomDevice):
}


class TuyaSmartRemote004F(EnchantedDevice, CustomDevice):
class TuyaSmartRemote004F(EnchantedDevice):
"""Tuya 4-button New version remote device."""

signature = {
Expand Down
1 change: 1 addition & 0 deletions zhaquirks/tuya/ts0601_dimmer.py
Original file line number Diff line number Diff line change
Expand Up @@ -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"),
],
Expand Down
2 changes: 1 addition & 1 deletion zhaquirks/tuya/ts0601_motion.py
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down
1 change: 1 addition & 0 deletions zhaquirks/tuya/ts0601_sensor.py
Original file line number Diff line number Diff line change
Expand Up @@ -184,6 +184,7 @@ class TuyaTempHumiditySensorVar03(CustomDevice):
("_TZE200_yjjdcqsq", "TS0601"),
("_TZE200_9yapgbuv", "TS0601"),
("_TZE200_qyflbnbj", "TS0601"),
("_TZE200_utkemkbs", "TS0601"),
],
ENDPOINTS: {
1: {
Expand Down
2 changes: 1 addition & 1 deletion zhaquirks/tuya/ts0601_siren.py
Original file line number Diff line number Diff line change
Expand Up @@ -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,
)
Expand Down

0 comments on commit 4bb9ade

Please sign in to comment.