Add sensors for Sonoff SWV Smart Water Valve status

zha/application/platforms/binary_sensor/__init__.py

@@ -8,6 +8,7 @@
 from typing import TYPE_CHECKING
 
 from zhaquirks.quirk_ids import DANFOSS_ALLY_THERMOSTAT
+from zhaquirks.sonoff import swv as sonoff_swv
 from zigpy.quirks.v2 import BinarySensorMetadata
 
 from zha.application import Platform
@@ -400,3 +401,33 @@
     _attr_translation_key: str = "preheat_status"
     _attr_entity_registry_enabled_default = False
     _attr_entity_category = EntityCategory.DIAGNOSTIC
+
+
+@MULTI_MATCH(cluster_handler_names="sonoff_manufacturer", models={"SWV"})
+class SonoffSWVValveLeakStatus(BinarySensor):
+    """Danfoss proprietary attribute for showing the status of the adaptation run."""
+
+    _unique_id_suffix = "valve_leak_status"
+    _attribute_name = "valve_status"
+    _attr_translation_key: str = "valve_leak"
+    _attr_device_class = BinarySensorDeviceClass.PROBLEM
+
+    @staticmethod
+    def parse(value: bool | int) -> bool:
+        """Parse the raw attribute into a bool state."""
+        return BinarySensor.parse(value & sonoff_swv.ValveStatusBitmap.Water_Leakage)
+
+
+@MULTI_MATCH(cluster_handler_names="sonoff_manufacturer", models={"SWV"})
+class SonoffSWVWaterShortageStatus(BinarySensor):
+    """Danfoss proprietary attribute for showing the status of the adaptation run."""
+
+    _unique_id_suffix = "water_supply_status"
+    _attribute_name = "valve_status"
+    _attr_translation_key: str = "water_supply"
+    _attr_device_class = BinarySensorDeviceClass.PROBLEM
+
+    @staticmethod
+    def parse(value: bool | int) -> bool:
+        """Parse the raw attribute into a bool state."""
+        return BinarySensor.parse(value & sonoff_swv.ValveStatusBitmap.Water_Shortage)

zha/zigbee/cluster_handlers/manufacturerspecific.py

@@ -450,14 +450,19 @@
 
 @registries.CLUSTER_HANDLER_ONLY_CLUSTERS.register(SONOFF_CLUSTER)
 @registries.CLUSTER_HANDLER_REGISTRY.register(SONOFF_CLUSTER)
-class SonoffPresenceSenorClusterHandler(ClusterHandler):
-    """SonoffPresenceSensor cluster handler."""
+class SonoffClusterHandler(ClusterHandler):
+    """Sonoff Custom cluster handler."""
 
     def __init__(self, cluster: zigpy.zcl.Cluster, endpoint: Endpoint) -> None:
-        """Initialize SonoffPresenceSensor cluster handler."""
+        """Initialize Sonoff cluster handler."""
         super().__init__(cluster, endpoint)
         if self.cluster.endpoint.model == "SNZB-06P":
             self.ZCL_INIT_ATTRS = {"last_illumination_state": True}
+        elif self.cluster.endpoint.model == "SWV":
+            self.ZCL_INIT_ATTRS = {"valve_status": True}
+            self.REPORT_CONFIG = AttrReportConfig(
+                attr="valve_status", config=REPORT_CONFIG_DEFAULT
+            )
 
 
 @registries.CLUSTER_HANDLER_REGISTRY.register(