Create SONOFF S60ZBTPF quirk

The power and current values of the SONOFF S60ZBTPF and S60ZBTPG are not correctly reset to zero when the switch of the socket is turned off. Similarly, these devices sometimes even send power and current updates even after the switch was turned off.

This commit creates a custom quirk for the two devices to fix the broken behavior. I've only tested this with the SONOFF S60ZBTPF devices I have, but, judging by https://github.com/Koenkk/zigbee-herdsman-converters/blob/v25.44.0/src/devices/sonoff.ts#L2020, this should also apply to the S60ZBTPG.

Author: Turbo87

tests/test_sonoff_s60zbtpf.py

@@ -0,0 +1,50 @@
+"""Tests for the SONOFF S60ZBTPF device."""
+
+import pytest
+from zigpy.zcl import ClusterType
+from zigpy.zcl.clusters.general import OnOff
+from zigpy.zcl.clusters.homeautomation import ElectricalMeasurement
+
+import zhaquirks.sonoff.s60zbtpf
+
+zhaquirks.setup()
+
+POWER_ID = ElectricalMeasurement.AttributeDefs.active_power.id
+CURRENT_ID = ElectricalMeasurement.AttributeDefs.rms_current.id
+ON_OFF_ID = OnOff.AttributeDefs.on_off.id
+
+
+@pytest.fixture
+def device(zigpy_device_from_v2_quirk):
+    """Create a SONOFF S60ZBTPF zigpy device mock for testing."""
+    cluster_ids = {1: {ElectricalMeasurement.cluster_id: ClusterType.Server}}
+    return zigpy_device_from_v2_quirk("SONOFF", "S60ZBTPF", cluster_ids=cluster_ids)
+
+
+async def test_power_fix(device):
+    """Test power measurement overrides."""
+    electrical_cluster = device.endpoints[1].electrical_measurement
+    on_off_cluster = device.endpoints[1].on_off
+
+    electrical_cluster.update_attribute(POWER_ID, 300)
+    electrical_cluster.update_attribute(CURRENT_ID, 13)
+    assert electrical_cluster.get(POWER_ID) == 300
+    assert electrical_cluster.get(CURRENT_ID) == 13
+
+    on_off_cluster.update_attribute(ON_OFF_ID, False)
+    assert electrical_cluster.get(POWER_ID) == 0
+    assert electrical_cluster.get(CURRENT_ID) == 0
+
+    electrical_cluster.update_attribute(POWER_ID, 300)
+    electrical_cluster.update_attribute(CURRENT_ID, 13)
+    assert electrical_cluster.get(POWER_ID) == 0
+    assert electrical_cluster.get(CURRENT_ID) == 0
+
+    on_off_cluster.update_attribute(ON_OFF_ID, True)
+    assert electrical_cluster.get(POWER_ID) == 0
+    assert electrical_cluster.get(CURRENT_ID) == 0
+
+    electrical_cluster.update_attribute(POWER_ID, 300)
+    electrical_cluster.update_attribute(CURRENT_ID, 13)
+    assert electrical_cluster.get(POWER_ID) == 300
+    assert electrical_cluster.get(CURRENT_ID) == 13

zhaquirks/sonoff/s60zbtpf.py

@@ -0,0 +1,65 @@
+"""SONOFF S60ZBTPF - Smart Socket with power measurement fix.
+
+This device has a quirk where it continues to report active power consumption
+even when the socket is turned off. This quirk fixes that by setting the
+`active_power` and `rms_current` to 0 when the `on_off` state is False.
+"""
+
+from zigpy.quirks import CustomCluster
+from zigpy.quirks.v2 import QuirkBuilder
+import zigpy.types as t
+from zigpy.zcl.clusters.general import OnOff
+from zigpy.zcl.clusters.homeautomation import ElectricalMeasurement
+
+POWER_ID = ElectricalMeasurement.AttributeDefs.active_power.id
+CURRENT_ID = ElectricalMeasurement.AttributeDefs.rms_current.id
+VOLTAGE_ID = ElectricalMeasurement.AttributeDefs.rms_voltage.id
+ON_OFF_ID = OnOff.AttributeDefs.on_off.id
+
+
+class SonoffS60OnOff(CustomCluster, OnOff):
+    """Custom OnOff cluster that resets power readings when the socket is turned off."""
+
+    def _update_attribute(self, attrid, value):
+        """Reset attributes to zero when the socket is turned off."""
+
+        if attrid == ON_OFF_ID and value == t.Bool.false:
+            self.debug(
+                "Socket turned off, resetting power and current measurements to zero"
+            )
+            self.endpoint.electrical_measurement.update_attribute(POWER_ID, 0)
+            self.endpoint.electrical_measurement.update_attribute(CURRENT_ID, 0)
+            self.endpoint.electrical_measurement.update_attribute(VOLTAGE_ID, None)
+
+        super()._update_attribute(attrid, value)
+
+
+class SonoffS60ElectricalMeasurement(CustomCluster, ElectricalMeasurement):
+    """Custom ElectricalMeasurement cluster that prevents power updates when the socket is turned off."""
+
+    def _update_attribute(self, attrid, value):
+        """Prevent updates when the socket is turned off."""
+
+        if self.endpoint.on_off.get(ON_OFF_ID) == t.Bool.false:
+            if attrid == POWER_ID:
+                self.debug("Socket turned off, preventing power measurement update")
+                return
+
+            if attrid == CURRENT_ID:
+                self.debug("Socket turned off, preventing current measurement update")
+                return
+
+            if attrid == VOLTAGE_ID:
+                self.debug("Socket turned off, preventing voltage measurement update")
+                return
+
+        super()._update_attribute(attrid, value)
+
+
+(
+    QuirkBuilder("SONOFF", "S60ZBTPF")
+    .also_applies_to("SONOFF", "S60ZBTPG")
+    .replaces(SonoffS60OnOff)
+    .replaces(SonoffS60ElectricalMeasurement)
+    .add_to_registry()
+)