Add Third Reality dual plug and single plug settings #4109

3reality-support · 2025-06-06T07:17:13Z

Proposed change

This PR added adaptation code for dual_plug and added 2 additional private clusters

reset_summation_delivered---reset the accumulated power of the plug
on_to_off_delay---off delay, when you set the attribute to 10 and the current status is on, it will change to off after 10 seconds
off_to_on_delay---on delay, similar to the above
If both on_to_off_delay and off_to_of_delay are set, the plug will loop on and off

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

for more information, see https://pre-commit.ci

…oil.py

3reality-support · 2025-07-11T08:15:03Z

@TheJulianJES

TheJulianJES · 2025-07-12T03:25:46Z

zhaquirks/thirdreality/plug_dual.py

+        translation_key="on_to_off_delay_ep1",
+        fallback_name="Turn off delay",
+    )
+    .number(
+        attribute_name=ThirdRealityPlugCluster.AttributeDefs.on_to_off_delay.name,
+        cluster_id=ThirdRealityPlugCluster.cluster_id,
+        endpoint_id=2,
+        min_value=0,
+        max_value=65535,
+        step=1,
+        mode="box",
+        unit=UnitOfTime.SECONDS,
+        device_class=NumberDeviceClass.DURATION,
+        translation_key="on_to_off_delay_ep2",
+        fallback_name="Turn off delay",
+    )


The fallback_name will be used as the English translation for the translation_key when this makes its way into HA. Here, the translation keys are different for the two endpoints, but the fallback name is the same.
We should just change the fallback_name to either be "Turn off delay 1" and "Turn off delay 2" or be something like "Turn off delay left" and "Turn off delay right".

In the future, we'll try and add a postfix if there are entities named in the same way on multiple endpoints. For now, it's fine to explicitly make the translation key and fallback name different. Other integrations in HA also do this.

Please also adjust all other occurrences.

Do you mean that the translation_key for ep1 and ep2 can be the same.But there was an error on my end

TheJulianJES · 2025-07-12T03:27:07Z

zhaquirks/thirdreality/plug_dual.py

+    .number(
+        attribute_name=ThirdRealityPlugCluster.AttributeDefs.on_to_off_delay.name,
+        cluster_id=ThirdRealityPlugCluster.cluster_id,
+        endpoint_id=1,
+        min_value=0,
+        max_value=65535,
+        step=1,
+        mode="box",
+        unit=UnitOfTime.SECONDS,
+        device_class=NumberDeviceClass.DURATION,
+        translation_key="on_to_off_delay_ep1",
+        fallback_name="Turn off delay",
+    )
+    .number(
+        attribute_name=ThirdRealityPlugCluster.AttributeDefs.on_to_off_delay.name,
+        cluster_id=ThirdRealityPlugCluster.cluster_id,
+        endpoint_id=2,
+        min_value=0,
+        max_value=65535,
+        step=1,
+        mode="box",
+        unit=UnitOfTime.SECONDS,
+        device_class=NumberDeviceClass.DURATION,
+        translation_key="on_to_off_delay_ep2",
+        fallback_name="Turn off delay",
+    )


Also, have you checked that the two entities each for the dual plug both show up in HA?
I thought the unique IDs might conflict, as they're just based on the attribute name, but we might also include the endpoint. I'd have to check.

If both appear, this is fine. Otherwise, you can include unique_id_suffix="on_to_off_delay_1" (and _2) for the entities to assign a different UID.

TheJulianJES · 2025-07-12T03:27:40Z

zhaquirks/thirdreality/plug_dual.py

+
+(
+    QuirkBuilder("Third Reality, Inc", "3RDP01072Z")
+    .also_applies_to("Third Reality, Inc", "3RWP01073Z")


Let's use applies_to. Both do the same, but we've switched to just using applies_to in most quirks.

TheJulianJES · 2025-07-12T03:28:34Z

zhaquirks/thirdreality/plug_dual.py

+        min_value=0,
+        max_value=65535,
+        step=1,
+        mode="box",


mode=box is fine to keep, but we don't actually set that mode in ZHA yet.
So, it's expected that this does nothing (for now). There's an open issue in the ZHA repo about this.

TheJulianJES · 2025-07-12T03:29:49Z

zhaquirks/thirdreality/plug_dual.py

+        cluster_id=ThirdRealityPlugCluster.cluster_id,
+        endpoint_id=2,
+        translation_key="reset_summation_delivered_ep2",
+        fallback_name="Reset right summation delivered ep2",  # ep2 is right


This is similar to my previous comment, let's just include either left/right or 1/2, not both and not something abbreviated like "ep2".

TheJulianJES

Otherwise, I think this looks good. We'll come back to this when the last few things are addressed.
Lastly, there's no reason to ping us every couple of days. We'll try to review PRs as soon as possible.

3reality-support · 2025-07-14T07:02:12Z

Otherwise, I think this looks good. We'll come back to this when the last few things are addressed. Lastly, there's no reason to ping us every couple of days. We'll try to review PRs as soon as possible.

Sorry, I got it. Also, do I need to @ you every time I make modifications. Or quote your comment

3reality-support · 2025-07-28T02:15:43Z

@TheJulianJES

3reality-support · 2025-08-26T03:27:37Z

@TheJulianJES

TheJulianJES

We'll likely automatically add a postfix number to all entities named the same in the future: zigpy/zha#525

I'll come back to this shortly. For clarity, you can still use different translation keys with left and right though. Those won't be impacted by the change then, since they'll be named differently.

TheJulianJES · 2025-09-02T03:12:42Z

zhaquirks/thirdreality/plug_dual.py

+        attribute_value=0x01,  # 1 reset summation delivered
+        cluster_id=ThirdRealityPlugCluster.cluster_id,
+        endpoint_id=1,
+        translation_key="reset_summation_delivered1",


Please add an underscore before the 1 at the end. Do this for all translation keys.

In this case, it might make even more sense to rename the translation_key to reset_summation_delivered_left, since that's what the fallback_name (translation value) will be. If the translation were to include 1 or 2, we should mention that in the translation key. But if it's left or right, we should instead mention that.

OK. Modified, please check

@TheJulianJES

TheJulianJES

I've combined these two quirks into one file/module now, as the manufacturer cluster is exactly the same at the moment.
They can be split apart again if the manufacturer cluster is changed for one device only.

I've also added mode="box", even though that was likely already used due to the big max_value in HA. I've also removed step=1, as that's the default, and we don't really need it with the "box" mode.
Lastly, I changed some names/translations.

jintj and others added 30 commits August 30, 2024 10:05

add 3r waterleak py

f04cc8c

[pre-commit.ci] auto fixes from pre-commit.com hooks

ede63c1

for more information, see https://pre-commit.ci

Update waterleak.py

ce0a7fb

[pre-commit.ci] auto fixes from pre-commit.com hooks

5fa93b2

for more information, see https://pre-commit.ci

Update waterleak.py

bb80eea

[pre-commit.ci] auto fixes from pre-commit.com hooks

50e524f

for more information, see https://pre-commit.ci

Update waterleak.py

59c7701

Update waterleak.py

207156b

[pre-commit.ci] auto fixes from pre-commit.com hooks

4ac23ee

for more information, see https://pre-commit.ci

add 3r project py

463ad2f

[pre-commit.ci] auto fixes from pre-commit.com hooks

7156188

for more information, see https://pre-commit.ci

Update door.py

45d3744

[pre-commit.ci] auto fixes from pre-commit.com hooks

87a5218

for more information, see https://pre-commit.ci

add 3r project py

503169a

[pre-commit.ci] auto fixes from pre-commit.com hooks

bded2c7

for more information, see https://pre-commit.ci

Update garage.py

2e84798

[pre-commit.ci] auto fixes from pre-commit.com hooks

62dcafd

for more information, see https://pre-commit.ci

Rename temperature_humidity and soil.py to temperature_humidity_and_s…

a22f4e9

…oil.py

Merge branch 'zigpy:dev' into test

5cca1a7

Merge branch 'zigpy:dev' into test

089b76e

merge

ed10c06

Merge branch 'test' into dev

2314b00

Merge branch 'zigpy:dev' into dev

697e43f

Merge branch 'zigpy:dev' into dev

1e99c2b

update

316640a

update

1d3de26

update

31ca101

update

0d83b67

update

cff8d6c

update

1146892

TheJulianJES changed the title ~~Add Third Reality dual_plug and modify plug private cluster~~ Add Third Reality dual plug settings Jul 12, 2025

TheJulianJES changed the title ~~Add Third Reality dual plug settings~~ Add Third Reality dual plug and single plug settings Jul 12, 2025

TheJulianJES reviewed Jul 12, 2025

View reviewed changes

TheJulianJES added the smash This PR is close to be merged soon label Jul 12, 2025

3reality-support and others added 4 commits July 14, 2025 11:45

Merge branch 'zigpy:dev' into dev

19a74f0

update

377c1c7

update

bed3146

update

0af9494

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 Jul 30, 2025

TheJulianJES added the manufacturer This request was made by the device's manufacturer label Sep 2, 2025

TheJulianJES reviewed Sep 2, 2025

View reviewed changes

3reality-support and others added 7 commits September 4, 2025 15:10

Merge branch 'zigpy:dev' into dev

3307bbb

update plug_dual translation_key

d4951f6

update

640321b

Merge branch 'zigpy:dev' into dev

bfe7979

Merge branch 'zigpy:dev' into dev

1ab9e50

Combine plug quirks to share manufacturer cluster, clean up

a1cfb12

Fix typo

e016943

TheJulianJES reviewed Oct 29, 2025

View reviewed changes

TheJulianJES merged commit f35ef57 into zigpy:dev Oct 29, 2025
9 checks passed

TheJulianJES mentioned this pull request Oct 29, 2025

Clean up Third Reality switch quirk 3RSS009Z #4443

Merged

4 tasks

Add Third Reality dual plug and single plug settings #4109

Add Third Reality dual plug and single plug settings #4109

Uh oh!

Conversation

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

Uh oh!

Proposed change

Additional information

Checklist

Uh oh!

3reality-support commented Jul 11, 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!

TheJulianJES left a comment

Choose a reason for hiding this comment

Uh oh!

3reality-support commented Jul 14, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

3reality-support commented Jul 28, 2025

Uh oh!

3reality-support commented Aug 26, 2025

Uh oh!

TheJulianJES left a comment

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 left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

4 participants

3reality-support commented Jun 6, 2025 •

edited

Loading

3reality-support commented Jul 14, 2025 •

edited

Loading