Merge branch 'dev' into sinope-sw2500zb-press-release-events

Author: bassdr

tests/test_tuya_builder.py

@@ -67,25 +67,35 @@ class TestEnum(t.enum8):
         .tuya_switch(
             dp_id=6,
             attribute_name="test_onoff",
+            translation_key="test_onoff",
+            fallback_name="Test on/off",
         )
         .tuya_number(
             dp_id=7,
             attribute_name="test_number",
             type=t.uint16_t,
+            translation_key="test_number",
+            fallback_name="Test number",
         )
         .tuya_binary_sensor(
             dp_id=8,
             attribute_name="test_binary",
+            translation_key="test_binary",
+            fallback_name="Test binary",
         )
         .tuya_sensor(
             dp_id=9,
             attribute_name="test_sensor",
             type=t.uint8_t,
+            translation_key="test_sensor",
+            fallback_name="Test sensor",
         )
         .tuya_enum(
             dp_id=10,
             attribute_name="test_enum",
             enum_class=TestEnum,
+            translation_key="test_enum",
+            fallback_name="Test enum",
         )
         .tuya_humidity(dp_id=11)
         .add_to_registry()

zhaquirks/lixee/zlinky.py

@@ -11,6 +11,7 @@
     Identify,
     Ota,
     PowerConfiguration,
+    Time,
 )
 from zigpy.zcl.clusters.homeautomation import ElectricalMeasurement, MeterIdentification
 from zigpy.zcl.clusters.smartenergy import Metering
@@ -24,6 +25,7 @@
     PROFILE_ID,
 )
 from zhaquirks.lixee import LIXEE, ZLINKY_MANUFACTURER_CLUSTER_ID
+from zhaquirks.tuya import TuyaManufCluster
 
 
 class ZLinkyTICManufacturerCluster(CustomCluster):
@@ -200,9 +202,25 @@ class ZLinkyTIC(CustomDevice):
 
 
 class ZLinkyTICFWV12(ZLinkyTIC):
-    """ZLinky_TIC from LiXee with firmware v12.0+."""
+    """ZLinky_TIC from LiXee with firmware v12.0 & v13.0."""
 
     signature = deepcopy(ZLinkyTIC.signature)
 
-    # Insert PowerConfiguration cluster in signature for devices with firmware v12.0+
+    # Insert PowerConfiguration cluster in signature for devices with firmware v12.0 & v13.0
     signature[ENDPOINTS][1][INPUT_CLUSTERS].insert(1, PowerConfiguration.cluster_id)
+
+
+class ZLinkyTICFWV14(ZLinkyTICFWV12):
+    """ZLinky_TIC from LiXee with firmware v14.0+."""
+
+    signature = deepcopy(ZLinkyTICFWV12.signature)
+    replacement = deepcopy(ZLinkyTICFWV12.replacement)
+
+    # Insert Time configuration cluster in signature for devices with firmware v14.0+
+    signature[ENDPOINTS][1][INPUT_CLUSTERS].insert(1, Time.cluster_id)
+
+    # Insert Tuya cluster in signature for devices with firmware v14.0+
+    signature[ENDPOINTS][1][INPUT_CLUSTERS].insert(7, TuyaManufCluster.cluster_id)
+    signature[ENDPOINTS][1][OUTPUT_CLUSTERS].insert(1, TuyaManufCluster.cluster_id)
+
+    replacement[ENDPOINTS][1][INPUT_CLUSTERS].insert(1, Time.cluster_id)

zhaquirks/tuya/ts0601_trv.py

@@ -1527,7 +1527,8 @@ def __init__(self, *args, **kwargs):
             ("_TZE200_cwnjrr72", "TS0601"),
             ("_TZE200_2atgpdho", "TS0601"),
             ("_TZE200_pvvbommb", "TS0601"),
-            ("_TZE200_4eeyebrt", "TS0601"),
+            ("_TZE200_4eeyebrt", "TS0601"),  # Immax NEO Smart (v1)
+            ("_TZE200_rufdtfyv", "TS0601"),  # Immax NEO Smart (v2)
             ("_TZE200_cpmgn2cf", "TS0601"),
             ("_TZE200_9sfg7gm0", "TS0601"),
             ("_TZE200_8whxpsiw", "TS0601"),