Handle reporting and rework manufacturer override

Author: fgsch

zhaquirks/sonoff/swv.py

@@ -1,9 +1,10 @@
 """Sonoff SWV - Zigbee smart water valve."""
 
 from zigpy.quirks import CustomCluster
-from zigpy.quirks.v2 import QuirkBuilder
+from zigpy.quirks.v2 import QuirkBuilder, ReportingConfig
 from zigpy.quirks.v2.homeassistant.binary_sensor import BinarySensorDeviceClass
 import zigpy.types as t
+from zigpy.zcl import foundation
 from zigpy.zcl.foundation import BaseAttributeDefs, ZCLAttributeDef
 
 
@@ -20,6 +21,7 @@ class CustomSonoffCluster(CustomCluster):
     """Custom Sonoff cluster."""
 
     cluster_id = 0xFC11
+    manufacturer_id_override: t.uint16_t = foundation.ZCLHeader.NO_MANUFACTURER_ID
 
     class AttributeDefs(BaseAttributeDefs):
         """Attribute definitions."""
@@ -29,10 +31,6 @@ class AttributeDefs(BaseAttributeDefs):
             type=ValveState,
         )
 
-    @property
-    def _is_manuf_specific(self):
-        return False
-
 
 (
     QuirkBuilder("SONOFF", "SWV")
@@ -43,6 +41,9 @@ def _is_manuf_specific(self):
         device_class=BinarySensorDeviceClass.PROBLEM,
         attribute_converter=lambda x: x & ValveState.Water_Leakage,
         unique_id_suffix="water_leak_status",
+        reporting_config=ReportingConfig(
+            min_interval=30, max_interval=900, reportable_change=1
+        ),
         translation_key="water_leak",
         fallback_name="Water leak",
     )