Add tuya switch_mode for rotary knobs

Author: elupus

tests/data/devices/tz3000-gwkzibhs-ts004f.json

@@ -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,
@@ -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",
@@ -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",
@@ -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": {

tests/data/devices/tz3000-kjfzuycl-ts004f.json

@@ -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,
@@ -99,6 +101,11 @@
           "endpoint_attribute": "groups",
           "attributes": []
         },
+        {
+          "cluster_id": "0x0006",
+          "endpoint_attribute": "on_off",
+          "attributes": []
+        },
         {
           "cluster_id": "0x1000",
           "endpoint_attribute": "lightlink",
@@ -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": {

zha/application/platforms/select.py

@@ -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,
@@ -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."""
 

zha/zigbee/cluster_handlers/general.py

@@ -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: