Use zcl_type to avoid custom write_attribute code for display orientation.

Author: mrrstux

tests/test_bosch.py

@@ -2,17 +2,14 @@
 
 from unittest import mock
 
-from zigpy.zcl import foundation
-from zigpy.zcl.clusters.hvac import ControlSequenceOfOperation, Thermostat
-from zigpy.zcl.foundation import WriteAttributesStatusRecord
-
 import zhaquirks
 from zhaquirks.bosch.rbsh_trv0_zb_eu import (
-    BoschDisplayOrientation,
     BoschOperatingMode,
     BoschThermostatCluster as BoschTrvThermostatCluster,
-    BoschUserInterfaceCluster as BoschTrvUserInterfaceCluster,
 )
+from zigpy.zcl import foundation
+from zigpy.zcl.clusters.hvac import ControlSequenceOfOperation, Thermostat
+from zigpy.zcl.foundation import WriteAttributesStatusRecord
 
 zhaquirks.setup()
 
@@ -544,88 +541,3 @@ def mock_write(attributes, manufacturer=None):
             ]
             == ControlSequenceOfOperation.Cooling_Only
         )
-
-
-async def test_bosch_radiator_thermostat_II_user_interface_write_attributes(
-    zigpy_device_from_v2_quirk,
-):
-    """Test the Radiator Thermostat II user-interface writes behaving correctly."""
-
-    device = zigpy_device_from_v2_quirk(manufacturer="BOSCH", model="RBSH-TRV0-ZB-EU")
-
-    bosch_thermostat_ui_cluster = device.endpoints[1].thermostat_ui
-
-    def mock_write(attributes, manufacturer=None):
-        records = [
-            WriteAttributesStatusRecord(foundation.Status.SUCCESS) for _ in attributes
-        ]
-        return [records, []]
-
-    # data is written to trv ui
-    patch_bosch_trv_ui_write = mock.patch.object(
-        bosch_thermostat_ui_cluster,
-        "_write_attributes",
-        mock.AsyncMock(side_effect=mock_write),
-    )
-
-    # check that display_orientation gets converted to supported value type:
-    with patch_bosch_trv_ui_write:
-        # - orientation (by-id) normal
-        success, fail = await bosch_thermostat_ui_cluster.write_attributes(
-            {
-                BoschTrvUserInterfaceCluster.AttributeDefs.display_orientation.id: BoschDisplayOrientation.Normal
-            }
-        )
-        assert success
-        assert not fail
-        assert (
-            bosch_thermostat_ui_cluster._attr_cache[
-                BoschTrvUserInterfaceCluster.AttributeDefs.display_orientation.id
-            ]
-            == 0
-        )
-
-        # - orientation (by-id) flipped
-        success, fail = await bosch_thermostat_ui_cluster.write_attributes(
-            {
-                BoschTrvUserInterfaceCluster.AttributeDefs.display_orientation.id: BoschDisplayOrientation.Flipped
-            }
-        )
-        assert success
-        assert not fail
-        assert (
-            bosch_thermostat_ui_cluster._attr_cache[
-                BoschTrvUserInterfaceCluster.AttributeDefs.display_orientation.id
-            ]
-            == 1
-        )
-
-        # - orientation (by-name) normal
-        success, fail = await bosch_thermostat_ui_cluster.write_attributes(
-            {
-                BoschTrvUserInterfaceCluster.AttributeDefs.display_orientation.name: BoschDisplayOrientation.Normal
-            }
-        )
-        assert success
-        assert not fail
-        assert (
-            bosch_thermostat_ui_cluster._attr_cache[
-                BoschTrvUserInterfaceCluster.AttributeDefs.display_orientation.id
-            ]
-            == 0
-        )
-
-        # - orientation (by-name) flipped
-        success, fail = await bosch_thermostat_ui_cluster.write_attributes(
-            {
-                BoschTrvUserInterfaceCluster.AttributeDefs.display_orientation.name: BoschDisplayOrientation.Flipped
-            }
-        )
-        assert success
-        assert not fail
-        assert (
-            bosch_thermostat_ui_cluster._attr_cache[
-                BoschTrvUserInterfaceCluster.AttributeDefs.display_orientation.id
-            ]
-            == 1
-        )

zhaquirks/bosch/rbsh_trv0_zb_eu.py

@@ -13,7 +13,7 @@
     Thermostat,
     UserInterface,
 )
-from zigpy.zcl.foundation import Direction, ZCLAttributeDef, ZCLCommandDef
+from zigpy.zcl.foundation import DataTypeId, Direction, ZCLAttributeDef, ZCLCommandDef
 
 """Bosch specific thermostat attribute ids."""
 
@@ -423,8 +423,8 @@ class AttributeDefs(UserInterface.AttributeDefs):
 
         display_orientation: Final = ZCLAttributeDef(
             id=SCREEN_ORIENTATION_ATTR_ID,
-            # To be matched to BoschDisplayOrientation enum.
-            type=t.uint8_t,
+            type=BoschDisplayOrientation,
+            zcl_type=DataTypeId.uint8,
             is_manufacturer_specific=True,
         )
 
@@ -448,37 +448,6 @@ class AttributeDefs(UserInterface.AttributeDefs):
             is_manufacturer_specific=True,
         )
 
-    async def write_attributes(
-        self, attributes: dict[str | int, Any], manufacturer: int | None = None
-    ) -> list:
-        """display_orientation special handling.
-
-        - convert from enum to uint8_t
-        """
-        display_orientation_attr = self.AttributeDefs.display_orientation
-
-        remaining_attributes = attributes.copy()
-        display_orientation_attribute_id = None
-
-        """Check if display_orientation is being written (can be numeric or string)."""
-        if display_orientation_attr.id in attributes:
-            display_orientation_attribute_id = display_orientation_attr.id
-        elif display_orientation_attr.name in attributes:
-            display_orientation_attribute_id = display_orientation_attr.name
-
-        if display_orientation_attribute_id is not None:
-            display_orientation_value = remaining_attributes.pop(
-                display_orientation_attribute_id
-            )
-            new_display_orientation_value = DISPLAY_ORIENTATION_ENUM_TO_INT_MAP[
-                display_orientation_value
-            ]
-            remaining_attributes[display_orientation_attribute_id] = (
-                new_display_orientation_value
-            )
-
-        return await super().write_attributes(remaining_attributes, manufacturer)
-
 
 (
     QuirkBuilder("BOSCH", "RBSH-TRV0-ZB-EU")