Add Sonoff smart plug S60ZBTPF quirk #4075

Gatsby-2024 · 2025-05-19T05:57:11Z

Proposed change

Additional information

Checklist

The changes are tested and work correctly
pre-commit checks pass / the code has been formatted using Black
Tests have been added to verify that the new code works

TheJulianJES · 2025-05-19T13:14:22Z

zhaquirks/sonoff/s60zbtpf.py

+    async def _read_attributes(
+        self,
+        attribute_ids: list[t.uint16_t],
+        *args,
+        manufacturer: int | t.uint16_t | None = None,
+        **kwargs,
+    ):
+        """Read attributes ZCL foundation command."""
+        return await super()._read_attributes(
+            attribute_ids,
+            *args,
+            manufacturer=foundation.ZCLHeader.NO_MANUFACTURER_ID,
+            **kwargs,
+        )
+
+    @property
+    def _is_manuf_specific(self):
+        return False


We have manufacturer_id_override = foundation.ZCLHeader.NO_MANUFACTURER_ID at the top.
Are you sure this is needed too?

Do you mean that I should delete lines 82 and 75

Lines 71 to 88. So, does the quirk still work fine if you delete the _read_attributes method and _is_manuf_specific property?

Yes, it still works after deletion.I have deleted the code you mentioned

TheJulianJES · 2025-05-19T13:54:54Z

Also, keeping the old PR would have been fine. No need to create a new one after making changes.

codecov · 2025-05-21T10:08:15Z

Codecov Report

✅ All modified and coverable lines are covered by tests.
✅ Project coverage is 92.18%. Comparing base (81108c4) to head (e0daa7d).
⚠️ Report is 76 commits behind head on dev.

Additional details and impacted files

@@            Coverage Diff             @@
##              dev    #4075      +/-   ##
==========================================
+ Coverage   91.20%   92.18%   +0.98%     
==========================================
  Files         335      362      +27     
  Lines       10889    12009    +1120     
==========================================
+ Hits         9931    11071    +1140     
+ Misses        958      938      -20

☔ View full report in Codecov by Sentry.
📢 Have feedback on the report? Share it here.

🚀 New features to boost your workflow:

❄️ Test Analytics: Detect flaky tests, report on failures, and find test suite problems.

fgsch · 2025-05-22T10:01:57Z

I got some of these myself and will test them against this PR.

fgsch · 2025-05-22T10:02:59Z

zhaquirks/sonoff/s60zbtpf.py

+    )
+    .number(
+        SonoffCluster.AttributeDefs.ac_current_max_overload.name,
+        0xFC11,


Can this and all instances of 0xFC11 use SonoffCluster.cluster_id?

fgsch · 2025-05-22T10:05:19Z

zhaquirks/sonoff/s60zbtpf.py

+    @property
+    def _is_manuf_specific(self):
+        return False


This is not needed now that manufacturer_id_override: t.uint16_t = .. is used.

Ok. I'll revise it together after you reply to me

fgsch · 2025-05-22T10:05:33Z

zhaquirks/sonoff/s60zbtpg.py

+    @property
+    def _is_manuf_specific(self):
+        return False


Ok. I'll revise it together after you reply to me

fgsch · 2025-05-22T10:15:18Z

zhaquirks/sonoff/s60zbtpg.py

+    .number(
+        SonoffCluster.AttributeDefs.ac_current_max_overload.name,
+        0xFC11,
+        ClusterType.Server,
+        1,
+        0.1,
+        14.0,
+        0.1,
+        unit=UnitOfElectricCurrent.AMPERE,
+        multiplier=0.001,
+        translation_key="ac_current_max_overload",
+        device_class=NumberDeviceClass.CURRENT,
+        fallback_name="AC current max overload",
+    )


I might be missing something, but from a quick look, the values in https://github.com/Koenkk/zigbee-herdsman-converters/blob/master/src/devices/sonoff.ts#L1866 seem to be shared between the two variants of this device.

Yes, some are the same, but some are different, such as overloadProtection

Ah, right. The wattage/amp is different for the F and G variants.

TheJulianJES · 2025-05-24T20:42:40Z

zhaquirks/sonoff/s60zbtpf.py

+    .number(
+        SonoffCluster.AttributeDefs.ac_current_max_overload.name,
+        SonoffCluster.cluster_id,
+        ClusterType.Server,
+        1,
+        0.1,
+        17.0,
+        0.1,
+        unit=UnitOfElectricCurrent.AMPERE,
+        multiplier=0.001,
+        translation_key="ac_current_max_overload",
+        device_class=NumberDeviceClass.CURRENT,
+        fallback_name="AC current max overload",
+    )


Let's explicitly specify what parameter we provide by using keyword arguments, so:

Suggested change

.number(

SonoffCluster.AttributeDefs.ac_current_max_overload.name,

SonoffCluster.cluster_id,

ClusterType.Server,

1,

0.1,

17.0,

0.1,

unit=UnitOfElectricCurrent.AMPERE,

multiplier=0.001,

translation_key="ac_current_max_overload",

device_class=NumberDeviceClass.CURRENT,

fallback_name="AC current max overload",

)

.number(

SonoffCluster.AttributeDefs.ac_current_max_overload.name,

SonoffCluster.cluster_id,

cluster_type=ClusterType.Server,

endpoint_id=1,

min_value=0.1,

max_value=17.0,

step=0.1,

unit=UnitOfElectricCurrent.AMPERE,

multiplier=0.001,

translation_key="ac_current_max_overload",

device_class=NumberDeviceClass.CURRENT,

fallback_name="AC current max overload",

)

Please also apply that to all other quirks v2 methods.

Omitting the parameter name for attribute_name and cluster_id is fine (first two parameters), as that's a common pattern across all our v2 quirks. We should explicitly provide all other names though.
In the future, we'll hopefully enforce this in the zigpy quirks v2 API.

ok,I have added it

TheJulianJES · 2025-05-24T20:43:54Z

zhaquirks/sonoff/s60zbtpf.py

+        """Attribute definitions."""
+
+        outlet_control_protect_setting = ZCLAttributeDef(
+            name="outlet_control_protect_setting",


The name doesn't need to be provided here, since we're already using the new-style AttributeDefs.
We'll just use the actual attribute ("value") name.

Please remove it for all ZCLAttributeDef.

ok,I have removed

Gatsby-2024 · 2025-05-27T02:08:25Z

@TheJulianJES @fgsch Is there anything else that needs to be modified

fgsch · 2025-05-28T01:46:03Z

@TheJulianJES @fgsch Is there anything else that needs to be modified

You may want to remove cluster_type=ClusterType.Server and endpoint_id=1, as these are the default values. That said, I’d defer to @TheJulianJES for confirmation.

Gatsby-2024 · 2025-06-03T01:34:56Z

@fgsch You mean that I'm going to delete cluster_type=ClusterType.Server and endpoint_id=1

fgsch · 2025-06-06T09:01:39Z

@fgsch You mean that I'm going to delete cluster_type=ClusterType.Server and endpoint_id=1

Yes, those are the default values, so no need to specify them.

Gatsby-2024 · 2025-06-07T05:51:40Z

@fgsch I have deleted the default value

fgsch · 2025-06-10T13:47:32Z

LGTM. Thank you!

Gatsby-2024 · 2025-06-23T01:41:18Z

@TheJulianJES @fgsch Hi,When can you help me merge

fgsch · 2025-09-06T17:20:09Z

@Gatsby-2024 I'm afraid I don't have permissions to merge, so we'll need to wait for @TheJulianJES or someone else to do so.

Gatsby-2024 · 2025-10-08T10:06:21Z

@TheJulianJES May I ask if there are any other questions? If not, could you help me merge?

fgsch · 2025-10-12T03:00:21Z

@Gatsby-2024 please don't add more changes, and in particular other files. Those should go in a separate PR.

Gatsby-2024 and others added 11 commits April 28, 2025 15:36

add s60zbtpf.py and s60zbtpg.py

4f663ba

Apply pre-commit auto fixes

deced99

add s60

32ca221

Apply pre-commit auto fixes

c41bc0b

add s60

e55d4b1

Apply pre-commit auto fixes

82f636e

Modify the code to meet the requirements

b9927db

Apply pre-commit auto fixes

0dcbe99

Merge branch 'dev' into dev

59978c8

Make modifications according to the suggestions

04f0bd7

Apply pre-commit auto fixes

be71e54

TheJulianJES reviewed May 19, 2025

View reviewed changes

Merge branch 'zigpy:dev' into dev

2784a4a

Gatsby-2024 and others added 2 commits May 21, 2025 18:09

Make the modifications as suggested

0ed0c3a

Apply pre-commit auto fixes

f8f36b1

fgsch reviewed May 22, 2025

View reviewed changes

Gatsby-2024 and others added 2 commits May 24, 2025 16:21

modify code

e9d5e09

Apply pre-commit auto fixes

ecc052b

TheJulianJES reviewed May 24, 2025

View reviewed changes

Gatsby-2024 and others added 2 commits May 26, 2025 20:32

modify ZCLAttributeDef style

619c927

Apply pre-commit auto fixes

052c6d5

TheJulianJES added the needs reviewer answer An answer from a reviewer is needed (e.g. why a PR isn't acceptable in the current state). label May 26, 2025

Gatsby-2024 and others added 2 commits June 7, 2025 12:02

delete default value

d2328a0

Apply pre-commit auto fixes

3608d2b

TheJulianJES added the needs review This PR should be reviewed soon, as it generally looks good. label Jun 24, 2025

Gatsby-2024 and others added 3 commits October 8, 2025 17:56

add zb2gs-l

adf050f

add zb2gs

8f298bc

Apply pre-commit auto fixes

e0daa7d

Turbo87 mentioned this pull request Oct 14, 2025

Fix SONOFF S60ZBTPF power usage when off #4401

Open

4 tasks

Add Sonoff smart plug S60ZBTPF quirk #4075

Are you sure you want to change the base?

Add Sonoff smart plug S60ZBTPF quirk #4075

Uh oh!

Conversation

Gatsby-2024 commented May 19, 2025

Proposed change

Additional information

Checklist

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Gatsby-2024 May 19, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

TheJulianJES commented May 19, 2025

Uh oh!

codecov bot commented May 21, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Codecov Report

Uh oh!

fgsch commented May 22, 2025

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

TheJulianJES May 24, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Gatsby-2024 commented May 27, 2025

Uh oh!

fgsch commented May 28, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

Gatsby-2024 commented Jun 3, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

fgsch commented Jun 6, 2025

Uh oh!

Gatsby-2024 commented Jun 7, 2025

Uh oh!

fgsch commented Jun 10, 2025

Uh oh!

Gatsby-2024 commented Jun 23, 2025

Uh oh!

fgsch commented Sep 6, 2025

Uh oh!

Gatsby-2024 commented Oct 8, 2025

Uh oh!

fgsch commented Oct 12, 2025

Uh oh!

Reviewers

Assignees

Gatsby-2024 May 19, 2025 •

edited

Loading

codecov bot commented May 21, 2025 •

edited

Loading

TheJulianJES May 24, 2025 •

edited

Loading

fgsch commented May 28, 2025 •

edited

Loading

Gatsby-2024 commented Jun 3, 2025 •

edited

Loading