cleanup, use NoManufTime cluster

Author: prairiesnpr

tests/test_tuya_builder.py

@@ -94,6 +94,9 @@ class TestEnum(t.enum8):
         A = 0x00
         B = 0x01
 
+    class ModTuyaMCUCluster(TuyaMCUCluster):
+        """Modified Cluster."""
+
     entry = (
         TuyaQuirkBuilder(device_mock.manufacturer, device_mock.model, registry=registry)
         .tuya_battery(dp_id=1)
@@ -132,7 +135,7 @@ class TestEnum(t.enum8):
             fallback_name="Test enum",
         )
         .skip_configuration()
-        .add_to_registry()
+        .add_to_registry(mcu_cluster=ModTuyaMCUCluster)
     )
 
     # coverage for overridden __eq__ method
@@ -149,6 +152,7 @@ class TestEnum(t.enum8):
     assert isinstance(ep.basic, Basic)
 
     assert ep.tuya_manufacturer is not None
+    assert isinstance(ep.tuya_manufacturer, ModTuyaMCUCluster)
     assert isinstance(ep.tuya_manufacturer, TuyaMCUCluster)
 
     tuya_cluster = ep.tuya_manufacturer

zhaquirks/tuya/builder/__init__.py

@@ -522,16 +522,16 @@ def tuya_sensor(
 
         return self
 
-    def add_to_registry(self) -> QuirksV2RegistryEntry:
+    def add_to_registry(self, mcu_cluster=TuyaMCUCluster) -> QuirksV2RegistryEntry:
         """Build the quirks v2 registry entry."""
 
-        class NewAttributeDefs(TuyaMCUCluster.AttributeDefs):
+        class NewAttributeDefs(mcu_cluster.AttributeDefs):
             """Attribute Definitions."""
 
         for attr in self.new_attributes:
             setattr(NewAttributeDefs, attr.name, attr)
 
-        class TuyaReplacementCluster(TuyaMCUCluster):
+        class TuyaReplacementCluster(mcu_cluster):
             """Replacement Tuya Cluster."""
 
             data_point_handlers: dict[int, str]

zhaquirks/tuya/ts0601_sensor.py

@@ -4,8 +4,15 @@
 from zigpy.quirks.v2.homeassistant import PERCENTAGE, UnitOfTemperature, UnitOfTime
 from zigpy.quirks.v2.homeassistant.sensor import SensorDeviceClass, SensorStateClass
 import zigpy.types as t
+from zigpy.zcl import foundation
 
-from zhaquirks.tuya.builder import TuyaPowerConfigurationCluster2AAA, TuyaQuirkBuilder
+from zhaquirks.tuya import (
+    TUYA_SET_TIME,
+    TuyaPowerConfigurationCluster2AAA,
+    TuyaTimePayload,
+)
+from zhaquirks.tuya.builder import TuyaQuirkBuilder
+from zhaquirks.tuya.mcu import TuyaMCUCluster
 
 
 class TuyaTempUnitConvert(t.enum8):
@@ -50,6 +57,26 @@ class TuyaNousTempHumiAlarm(t.enum8):
     .add_to_registry()
 )
 
+
+class NoManufTimeTuyaMCUCluster(TuyaMCUCluster):
+    """Tuya Manufacturer Cluster with set_time mod."""
+
+    set_time_offset = 1970
+    set_time_local_offset = 1970
+
+    server_commands = TuyaMCUCluster.server_commands.copy()
+    server_commands.update(
+        {
+            TUYA_SET_TIME: foundation.ZCLCommandDef(
+                "set_time",
+                {"time": TuyaTimePayload},
+                False,
+                is_manufacturer_specific=False,
+            ),
+        }
+    )
+
+
 # TH01Z - Temperature and humidity sensor with clock
 (
     TuyaQuirkBuilder("_TZE200_lve3dvpy", "TS0601")
@@ -180,18 +207,18 @@ class TuyaNousTempHumiAlarm(t.enum8):
     )
     .tuya_number(
         dp_id=20,
-        attribute_name="humidity_report_interval",
+        attribute_name="humidity_sensitivity",
         type=t.uint16_t,
         unit=PERCENTAGE,
         min_value=1,
         max_value=100,
         step=1,
         entity_type=EntityType.CONFIG,
-        translation_key="humidity_report_interval",
-        fallback_name="Humidity report interval",
+        translation_key="humidity_sensitivity",
+        fallback_name="Humidity sensitivity",
     )
     .skip_configuration()
-    .add_to_registry()
+    .add_to_registry(mcu_cluster=NoManufTimeTuyaMCUCluster)
 )