Update Bosch RBSH-RTH0-ZB-EU quirk

Author: Sopsy

zhaquirks/bosch/rbsh_rth0_zb_eu.py

@@ -2,22 +2,23 @@
 
 from zigpy.quirks import CustomCluster
 from zigpy.quirks.v2 import QuirkBuilder
-from zigpy.quirks.v2.homeassistant import EntityPlatform, EntityType
+from zigpy.quirks.v2.homeassistant import EntityType, PERCENTAGE
 import zigpy.types as t
 from zigpy.zcl.clusters.hvac import (
-    ControlSequenceOfOperation,
     Thermostat,
     UserInterface,
+    TemperatureDisplayMode,
 )
+from zigpy.quirks.v2.homeassistant.sensor import SensorStateClass
 from zigpy.zcl.foundation import ZCLAttributeDef
 
 """Bosch specific thermostat attribute ids."""
 
 # Mode of operation with values BoschOperatingMode.
 OPERATING_MODE_ATTR_ID = 0x4007
 
-# Valve position: 0% - 100%
-VALVE_POSITION_ATTR_ID = 0x4020
+# Valve duty cycle: 0% - 100%
+VALVE_DUTY_CYCLE_ATTR_ID = 0x4020
 
 # Window open switch (changes to a lower target temperature when on).
 WINDOW_OPEN_ATTR_ID = 0x4042
@@ -33,12 +34,9 @@
 # Display brightness (0 - 10).
 SCREEN_BRIGHTNESS_ATTR_ID = 0x403B
 
-# Control sequence of operation (heating/cooling)
-CTRL_SEQUENCE_OF_OPERATION_ID = Thermostat.AttributeDefs.ctrl_sequence_of_oper.id
-
 
 class BoschOperatingMode(t.enum8):
-    """Bosh operating mode attribute values."""
+    """Bosch operating mode attribute values."""
 
     Schedule = 0x00
     Manual = 0x01
@@ -52,16 +50,15 @@ class State(t.enum8):
     On = 0x01
 
 
-class BoschControlSequenceOfOperation(t.enum8):
-    """Supported ControlSequenceOfOperation modes."""
-
-    Cooling = ControlSequenceOfOperation.Cooling_Only
-    Heating = ControlSequenceOfOperation.Heating_Only
-
-
 class BoschThermostatCluster(CustomCluster, Thermostat):
     """Bosch thermostat cluster."""
 
+    # Works around an issue where ZHA thinks "Heating_Only" can't be changed
+    # 0x06 is "centralite specific", but works perfectly for this thermostat as well
+    _CONSTANT_ATTRIBUTES = {
+        Thermostat.AttributeDefs.ctrl_sequence_of_oper.id: 0x06
+    }
+    
     class AttributeDefs(Thermostat.AttributeDefs):
         """Bosch thermostat manufacturer specific attributes."""
 
@@ -71,8 +68,8 @@ class AttributeDefs(Thermostat.AttributeDefs):
             is_manufacturer_specific=True,
         )
 
-        pi_heating_demand = ZCLAttributeDef(
-            id=VALVE_POSITION_ATTR_ID,
+        valve_duty_cycle = ZCLAttributeDef(
+            id=VALVE_DUTY_CYCLE_ATTR_ID,
             # Values range from 0-100
             type=t.uint8_t,
             is_manufacturer_specific=True,
@@ -89,6 +86,12 @@ class AttributeDefs(Thermostat.AttributeDefs):
             type=State,
             is_manufacturer_specific=True,
         )
+        
+        temperature_display_mode = ZCLAttributeDef(
+            id=0x0000,
+            type=TemperatureDisplayMode,
+            access="rw",
+        )
 
 
 class BoschUserInterfaceCluster(CustomCluster, UserInterface):
@@ -117,16 +120,33 @@ class AttributeDefs(UserInterface.AttributeDefs):
     .applies_to("Bosch", "RBSH-RTH0-BAT-ZB-EU")
     .replaces(BoschThermostatCluster)
     .replaces(BoschUserInterfaceCluster)
+    # Valve duty cycle, PWM controlled.
+    .sensor(
+        BoschThermostatCluster.AttributeDefs.valve_duty_cycle.name,
+        BoschThermostatCluster.cluster_id,
+        state_class=SensorStateClass.MEASUREMENT,
+        unit=PERCENTAGE,
+        translation_key="valve_duty_cycle",
+        fallback_name="Valve duty cycle",
+    )
     # Operating mode - read-only: controlled automatically through Thermostat.system_mode (HAVC mode).
     .enum(
         BoschThermostatCluster.AttributeDefs.operating_mode.name,
         BoschOperatingMode,
         BoschThermostatCluster.cluster_id,
-        entity_platform=EntityPlatform.SENSOR,
-        entity_type=EntityType.DIAGNOSTIC,
+        entity_type=EntityType.CONFIG,
         translation_key="operating_mode",
         fallback_name="Operating mode",
     )
+    # Temperature display type.
+    .enum(
+        BoschUserInterfaceCluster.AttributeDefs.temperature_display_mode.name,
+        TemperatureDisplayMode,
+        BoschUserInterfaceCluster.cluster_id,
+        entity_type=EntityType.CONFIG,
+        translation_key="temperature_display_mode",
+        fallback_name="Temperature display mode",
+    )
     # Fast heating/boost.
     .switch(
         BoschThermostatCluster.AttributeDefs.boost_heating.name,
@@ -161,13 +181,5 @@ class AttributeDefs(UserInterface.AttributeDefs):
         translation_key="display_brightness",
         fallback_name="Display brightness",
     )
-    # Heating vs Cooling.
-    .enum(
-        Thermostat.AttributeDefs.ctrl_sequence_of_oper.name,
-        BoschControlSequenceOfOperation,
-        BoschThermostatCluster.cluster_id,
-        translation_key="ctrl_sequence_of_oper",
-        fallback_name="Control sequence",
-    )
     .add_to_registry()
 )