Skip to content

Add tuya switch_mode for rotary knobs #590

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
elupus wants to merge 3 commits into
base: dev
Choose a base branch
from
+154 −54
Draft

Add tuya switch_mode for rotary knobs #590

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
5298684
Avoid adding switch if not supported
elupus Nov 30, 2025
b57adc1
Stay with current quirk version
elupus Nov 30, 2025
57af648
Add tuya switch_mode for rotary knobs
elupus Nov 30, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
80 changes: 71 additions & 9 deletions tests/data/devices/tz3000-gwkzibhs-ts004f.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,9 @@
"name": "_TZ3000_gwkzibhs TS004F",
"quirk_applied": true,
"quirk_class": "zhaquirks.tuya.ts004f.TuyaSmartRemote004FROK",
"exposes_features": [],
"exposes_features": [
"tuya.plug_on_off_attributes"
],
"manufacturer_code": 4742,
"power_source": "Battery or Unknown",
"lqi": 182,
Expand Down Expand Up @@ -123,6 +125,24 @@
"endpoint_attribute": "groups",
"attributes": []
},
{
"cluster_id": "0x0006",
"endpoint_attribute": "on_off",
"attributes": [
{
"id": "0x0000",
"name": "on_off",
"zcl_type": "bool",
"unsupported": true
},
{
"id": "0x8004",
"name": "switch_mode",
"zcl_type": "enum8",
"value": 0
}
]
},
{
"cluster_id": "0x1000",
"endpoint_attribute": "lightlink",
Expand All @@ -148,14 +168,7 @@
{
"cluster_id": "0x0006",
"endpoint_attribute": "TS004X_cluster",
"attributes": [
{
"id": "0x8004",
"name": "switch_mode",
"zcl_type": "enum8",
"value": 0
}
]
"attributes": []
},
{
"cluster_id": "0x0008",
Expand Down Expand Up @@ -297,6 +310,55 @@
}
}
],
"select": [
{
"info_object": {
"fallback_name": null,
"unique_id": "ab:cd:ef:12:e5:79:a6:00-1-6-switch_mode",
"migrate_unique_ids": [],
"platform": "select",
"class_name": "TuyaSwitchModeSelectEntity",
"translation_key": "switch_mode",
"translation_placeholders": null,
"device_class": null,
"state_class": null,
"entity_category": "config",
"entity_registry_enabled_default": true,
"enabled": true,
"primary": false,
"cluster_handlers": [
{
"class_name": "OnOffClusterHandler",
"generic_id": "cluster_handler_0x0006",
"endpoint_id": 1,
"cluster": {
"id": 6,
"name": "On/Off",
"type": "server"
},
"id": "1:0x0006",
"unique_id": "ab:cd:ef:12:e5:79:a6:00:1:0x0006",
"status": "INITIALIZED",
"value_attribute": "on_off"
}
],
"device_ieee": "ab:cd:ef:12:e5:79:a6:00",
"endpoint_id": 1,
"available": true,
"group_id": null,
"enum": "SwitchMode",
"options": [
"Command",
"Event"
]
},
"state": {
"class_name": "TuyaSwitchModeSelectEntity",
"available": true,
"state": "Command"
}
}
],
"sensor": [
{
"info_object": {
Expand Down
53 changes: 52 additions & 1 deletion tests/data/devices/tz3000-kjfzuycl-ts004f.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,9 @@
"name": "_TZ3000_kjfzuycl TS004F",
"quirk_applied": true,
"quirk_class": "zhaquirks.tuya.ts004f.TuyaSmartRemote004FSK",
"exposes_features": [],
"exposes_features": [
"tuya.plug_on_off_attributes"
],
"manufacturer_code": 4098,
"power_source": "Battery or Unknown",
"lqi": null,
Expand Down Expand Up @@ -99,6 +101,11 @@
"endpoint_attribute": "groups",
"attributes": []
},
{
"cluster_id": "0x0006",
"endpoint_attribute": "on_off",
"attributes": []
},
{
"cluster_id": "0x1000",
"endpoint_attribute": "lightlink",
Expand Down Expand Up @@ -386,6 +393,50 @@
]
}
],
"switch": [
{
"info_object": {
"fallback_name": null,
"unique_id": "38:5b:44:ff:fe:36:af:0f-1-6",
"migrate_unique_ids": [],
"platform": "switch",
"class_name": "Switch",
"translation_key": "switch",
"translation_placeholders": null,
"device_class": null,
"state_class": null,
"entity_category": null,
"entity_registry_enabled_default": true,
"enabled": true,
"primary": true,
"cluster_handlers": [
{
"class_name": "OnOffClusterHandler",
"generic_id": "cluster_handler_0x0006",
"endpoint_id": 1,
"cluster": {
"id": 6,
"name": "On/Off",
"type": "server"
},
"id": "1:0x0006",
"unique_id": "38:5b:44:ff:fe:36:af:0f:1:0x0006",
"status": "INITIALIZED",
"value_attribute": "on_off"
}
],
"device_ieee": "38:5b:44:ff:fe:36:af:0f",
"endpoint_id": 1,
"available": true,
"group_id": null
},
"state": {
"class_name": "Switch",
"state": false,
"available": true
}
}
],
"update": [
{
"info_object": {
Expand Down
44 changes: 1 addition & 43 deletions tests/data/devices/tze200-2aaelwxk-ts0225.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -501,7 +501,7 @@
"entity_category": null,
"entity_registry_enabled_default": true,
"enabled": true,
"primary": false,
"primary": true,
"cluster_handlers": [
{
"class_name": "OccupancySensingClusterHandler",
Expand Down Expand Up @@ -1427,48 +1427,6 @@
}
],
"switch": [
{
"info_object": {
"fallback_name": null,
"unique_id": "ab:cd:ef:12:94:85:f7:5f-1-6",
"migrate_unique_ids": [],
"platform": "switch",
"class_name": "Switch",
"translation_key": "switch",
"translation_placeholders": null,
"device_class": null,
"state_class": null,
"entity_category": null,
"entity_registry_enabled_default": true,
"enabled": true,
"primary": true,
"cluster_handlers": [
{
"class_name": "OnOffClusterHandler",
"generic_id": "cluster_handler_0x0006",
"endpoint_id": 1,
"cluster": {
"id": 6,
"name": "On/Off",
"type": "server"
},
"id": "1:0x0006",
"unique_id": "ab:cd:ef:12:94:85:f7:5f:1:0x0006",
"status": "INITIALIZED",
"value_attribute": "on_off"
}
],
"device_ieee": "ab:cd:ef:12:94:85:f7:5f",
"endpoint_id": 1,
"available": true,
"group_id": null
},
"state": {
"class_name": "Switch",
"state": false,
"available": true
}
},
{
"info_object": {
"fallback_name": "LED indicator",
Expand Down
13 changes: 13 additions & 0 deletions zha/application/platforms/select.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@
import logging
from typing import TYPE_CHECKING, Any

from zhaquirks import tuya
from zhaquirks.danfoss import thermostat as danfoss_thermostat
from zhaquirks.quirk_ids import (
DANFOSS_ALLY_THERMOSTAT,
Expand Down Expand Up @@ -317,6 +318,18 @@ class TuyaBacklightModeSelectEntity(ZCLEnumSelectEntity):
_attr_translation_key: str = "backlight_mode"


@CONFIG_DIAGNOSTIC_MATCH(
cluster_handler_names=CLUSTER_HANDLER_ON_OFF, exposed_features=TUYA_PLUG_ONOFF
)
class TuyaSwitchModeSelectEntity(ZCLEnumSelectEntity):
"""Representation of a ZHA backlight mode select entity."""

_unique_id_suffix = "switch_mode"
_attribute_name = "switch_mode"
_enum = tuya.SwitchMode
_attr_translation_key: str = "switch_mode"


class MoesBacklightMode(types.enum8):
"""MOES switch backlight mode enum."""

Expand Down
17 changes: 16 additions & 1 deletion zha/application/platforms/switch.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -111,6 +111,7 @@ class Switch(PlatformEntity, BaseSwitch):

_attr_translation_key = "switch"
_attr_primary_weight = 10
_attribute_name = OnOff.AttributeDefs.on_off.name

def __init__(
self,
Expand All @@ -135,12 +136,26 @@ def on_add(self) -> None:
)
)

def _is_supported(self) -> bool:
if (
self._attribute_name
in self._on_off_cluster_handler.cluster.unsupported_attributes
):
_LOGGER.debug(
"%s is not supported - skipping %s entity creation",
self._attribute_name,
self.__class__.__name__,
)
return False

return super()._is_supported()

def handle_cluster_handler_attribute_updated(
self,
event: ClusterAttributeUpdatedEvent, # pylint: disable=unused-argument
) -> None:
"""Handle state update from cluster handler."""
if event.attribute_name == OnOff.AttributeDefs.on_off.name:
if event.attribute_name == self._attribute_name:
self.maybe_emit_state_changed_event()


Expand Down
1 change: 1 addition & 0 deletions zha/zigbee/cluster_handlers/general.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -550,6 +550,7 @@ def __init__(self, cluster: zigpy.zcl.Cluster, endpoint: Endpoint) -> None:
self.ZCL_INIT_ATTRS["backlight_mode"] = True
self.ZCL_INIT_ATTRS["power_on_state"] = True
self.ZCL_INIT_ATTRS["child_lock"] = True
self.ZCL_INIT_ATTRS["switch_mode"] = True

@classmethod
def matches(cls, cluster: zigpy.zcl.Cluster, endpoint: Endpoint) -> bool:
Expand Down
Loading