From a4c6cdb9e531b9f643567c32e8cd8bacc64840cd Mon Sep 17 00:00:00 2001 From: MattWestb <49618193+MattWestb@users.noreply.github.com> Date: Mon, 6 Dec 2021 13:38:39 +0100 Subject: [PATCH 1/4] Add _TZ3000_8uaoilu9 for CT (#1205) --- zhaquirks/lidl/cct.py | 1 + 1 file changed, 1 insertion(+) diff --git a/zhaquirks/lidl/cct.py b/zhaquirks/lidl/cct.py index b45bbed83a..de1d9769b6 100644 --- a/zhaquirks/lidl/cct.py +++ b/zhaquirks/lidl/cct.py @@ -44,6 +44,7 @@ class CCTLight(CustomDevice): ("_TZ3000_rylaozuc", "TS0502A"), ("_TZ3000_el5kt5im", "TS0502A"), ("_TZ3000_oh7jddmx", "TS0502A"), + ("_TZ3000_8uaoilu9", "TS0502A"), ], ENDPOINTS: { 1: { From e6138e4722c7471d014735a6f8d9fbb46c8ce0e8 Mon Sep 17 00:00:00 2001 From: MattWestb <49618193+MattWestb@users.noreply.github.com> Date: Thu, 9 Dec 2021 13:30:44 +0100 Subject: [PATCH 2/4] Fixing the braking TS001X quirk (#1210) * Fixing TS001X braking Reversing the braking zha.DeviceType.ON_OFF_PLUG_IN_UNIT to original zha.DeviceType.ON_OFF_LIGHT that was braking automations in HA. Also adding the TS0012 the 2 gang version. * BLACK !! * Update ts000x.py --- zhaquirks/tuya/ts000x.py | 96 ++++++++++++++++++++++++++++++++++++++-- 1 file changed, 92 insertions(+), 4 deletions(-) diff --git a/zhaquirks/tuya/ts000x.py b/zhaquirks/tuya/ts000x.py index c6b45eaaeb..de644cc619 100644 --- a/zhaquirks/tuya/ts000x.py +++ b/zhaquirks/tuya/ts000x.py @@ -68,7 +68,7 @@ class Switch_1G_GPP(CustomDevice): ENDPOINTS: { 1: { PROFILE_ID: zha.PROFILE_ID, - DEVICE_TYPE: zha.DeviceType.ON_OFF_PLUG_IN_UNIT, + DEVICE_TYPE: zha.DeviceType.ON_OFF_LIGHT, INPUT_CLUSTERS: [ Basic.cluster_id, Identify.cluster_id, @@ -84,6 +84,94 @@ class Switch_1G_GPP(CustomDevice): } +class Switch_2G_GPP(CustomDevice): + """Tuya 2 gang switch module with restore power state support.""" + + signature = { + MODEL: "TS0002", + ENDPOINTS: { + # + 1: { + PROFILE_ID: zha.PROFILE_ID, + DEVICE_TYPE: zha.DeviceType.ON_OFF_LIGHT, + INPUT_CLUSTERS: [ + Basic.cluster_id, + Identify.cluster_id, + Groups.cluster_id, + Scenes.cluster_id, + OnOff.cluster_id, + TuyaZBE000Cluster.cluster_id, + TuyaZBExternalSwitchTypeCluster.cluster_id, + ], + OUTPUT_CLUSTERS: [Time.cluster_id, Ota.cluster_id], + }, + # + 2: { + PROFILE_ID: zha.PROFILE_ID, + DEVICE_TYPE: zha.DeviceType.ON_OFF_LIGHT, + INPUT_CLUSTERS: [ + Groups.cluster_id, + Scenes.cluster_id, + OnOff.cluster_id, + TuyaZBExternalSwitchTypeCluster.cluster_id, + ], + OUTPUT_CLUSTERS: [], + }, + # + 242: { + PROFILE_ID: 41440, + DEVICE_TYPE: 97, + INPUT_CLUSTERS: [], + OUTPUT_CLUSTERS: [GreenPowerProxy.cluster_id], + }, + }, + } + replacement = { + ENDPOINTS: { + 1: { + PROFILE_ID: zha.PROFILE_ID, + DEVICE_TYPE: zha.DeviceType.ON_OFF_LIGHT, + INPUT_CLUSTERS: [ + Basic.cluster_id, + Identify.cluster_id, + Groups.cluster_id, + Scenes.cluster_id, + TuyaZBOnOffAttributeCluster, + TuyaZBE000Cluster, + TuyaZBExternalSwitchTypeCluster, + ], + OUTPUT_CLUSTERS: [Time.cluster_id, Ota.cluster_id], + }, + 2: { + PROFILE_ID: zha.PROFILE_ID, + DEVICE_TYPE: zha.DeviceType.ON_OFF_LIGHT, + INPUT_CLUSTERS: [ + Groups.cluster_id, + Scenes.cluster_id, + TuyaZBOnOffAttributeCluster, + TuyaZBExternalSwitchTypeCluster, + ], + OUTPUT_CLUSTERS: [], + }, + 242: { + PROFILE_ID: 41440, + DEVICE_TYPE: 97, + INPUT_CLUSTERS: [], + OUTPUT_CLUSTERS: [GreenPowerProxy.cluster_id], + }, + }, + } + + class Switch_3G_GPP(CustomDevice): """Tuya 3 gang switch module with restore power state support.""" @@ -154,7 +242,7 @@ class Switch_3G_GPP(CustomDevice): ENDPOINTS: { 1: { PROFILE_ID: zha.PROFILE_ID, - DEVICE_TYPE: zha.DeviceType.ON_OFF_PLUG_IN_UNIT, + DEVICE_TYPE: zha.DeviceType.ON_OFF_LIGHT, INPUT_CLUSTERS: [ Basic.cluster_id, Identify.cluster_id, @@ -168,7 +256,7 @@ class Switch_3G_GPP(CustomDevice): }, 2: { PROFILE_ID: zha.PROFILE_ID, - DEVICE_TYPE: zha.DeviceType.ON_OFF_PLUG_IN_UNIT, + DEVICE_TYPE: zha.DeviceType.ON_OFF_LIGHT, INPUT_CLUSTERS: [ Groups.cluster_id, Scenes.cluster_id, @@ -179,7 +267,7 @@ class Switch_3G_GPP(CustomDevice): }, 3: { PROFILE_ID: zha.PROFILE_ID, - DEVICE_TYPE: zha.DeviceType.ON_OFF_PLUG_IN_UNIT, + DEVICE_TYPE: zha.DeviceType.ON_OFF_LIGHT, INPUT_CLUSTERS: [ Groups.cluster_id, Scenes.cluster_id, From bba057e3f01aa42637fa1194318fa1c964ed863e Mon Sep 17 00:00:00 2001 From: MattWestb <49618193+MattWestb@users.noreply.github.com> Date: Fri, 10 Dec 2021 20:01:02 +0100 Subject: [PATCH 3/4] Update ts0601_trv.py (#1201) Add 2 more CN-Hysen TRVs "_TZE200_pvvbommb" and "_TZE200_4eeyebrt". --- zhaquirks/tuya/ts0601_trv.py | 2 ++ 1 file changed, 2 insertions(+) diff --git a/zhaquirks/tuya/ts0601_trv.py b/zhaquirks/tuya/ts0601_trv.py index 938d64d09a..279826ff70 100644 --- a/zhaquirks/tuya/ts0601_trv.py +++ b/zhaquirks/tuya/ts0601_trv.py @@ -1062,6 +1062,8 @@ def __init__(self, *args, **kwargs): ("_TZE200_ywdxldoj", "TS0601"), ("_TZE200_cwnjrr72", "TS0601"), ("_TZE200_2atgpdho", "TS0601"), + ("_TZE200_pvvbommb", "TS0601"), + ("_TZE200_4eeyebrt", "TS0601"), ], ENDPOINTS: { 1: { From 0104b322c2a8b28d72d122430a6a764302c22361 Mon Sep 17 00:00:00 2001 From: David Mulcahey Date: Fri, 10 Dec 2021 14:02:05 -0500 Subject: [PATCH 4/4] Bump version --- setup.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/setup.py b/setup.py index f793d3e088..f8b588c23c 100644 --- a/setup.py +++ b/setup.py @@ -2,7 +2,7 @@ from setuptools import find_packages, setup -VERSION = "0.0.64" +VERSION = "0.0.65" def readme():