Add support for New Dooya motor`s (0x4f6E) #431

burjakremen · 2020-09-25T12:24:42Z

Add support for a new Dooya DT360E-45/20 curtain motor`s (Device ID: 4F6E)

Adding support for a Dooya DT360E-45/20 (Device ID: 4F6E)

felipediel · 2020-09-28T18:42:25Z

broadlink/__init__.py

@@ -86,6 +86,7 @@
    0x2722: (S1C, "S2KIT", "Broadlink"),
    0x4ead: (hysen, "HY02B05H", "Hysen"),
    0x4e4d: (dooya, "DT360E-45/20", "Dooya"),
+    0x4f6e: (dooya_new, "DT360E-45/20", "Dooya"),


Where did you get the model name from?

The sticker on the motor housing and on packaging

felipediel · 2020-09-28T18:43:14Z

@burjakremen Thank you very much for the contribution!

felipediel · 2020-09-28T22:53:55Z

broadlink/cover.py

+        """Return the position of the curtain."""
+        return self._send(0xca, 0xc0 ,0x06, 0x5d)
+
+    def set_percentage_and_wait(self, new_percentage) -> int:


def set_percentage(self, new_percentage: int) -> int:

felipediel · 2020-09-28T22:56:00Z

broadlink/cover.py

+        payload = self.decrypt(response[0x38:])
+        return payload[17]
+
+    def open(self) -> int:


What does the integer returned by this function represent?

Fixing errors in code

Fixing code error

felipediel · 2020-11-04T03:06:33Z

broadlink/cover.py

+        """Return the position of the curtain."""
+        return self._send(0xca, 0xc0 ,0x06, 0x00)
+
+    def set_percentage_and_wait(self, new_percentage) -> None:


I think this method should be renamed to set_percentage because it is non-blocking.

` return self._send(0xca, 0xc0 ,0x06, 0x00)

def set_percentage(self, new_percentage) -> None: new_percent_hex = struct.pack('<H', 49357+new_percentage)`

Does the device wait until the position is reached to send the response?

Rename method "def set_percentage_and_wait" -> "def set_percentage"

felipediel · 2020-11-05T15:30:26Z

broadlink/cover.py

+        device.__init__(self, *args, **kwargs)
+        self.type = "Dooya DT360E(4F6E)"
+
+    def _send(self, magic1: int, magic2: int, magic3:int, magic4:int) -> int:


Remove the "magic1" and "magic2" parameters.
Rename "magic3" to "command".
Rename "magic4" to "attribute" and set default to 0.

def _send(self, command: int, attribute: int = 0) -> int:

felipediel · 2020-11-05T15:44:48Z

broadlink/cover.py

+        packet[6] = magic1
+        packet[7] = magic2


This magic is called checksum. We can use this:

checksum = 0xc0c4 + command + attribute & 0xffff packet[6] = checksum & 0xff packet[7] = checksum >> 8

felipediel · 2020-11-05T15:45:45Z

broadlink/cover.py

+        packet[15] = magic3
+        packet[16] = magic4


Rename "magic3" to "command" and "magic4" to "attribute".

felipediel · 2020-11-05T15:46:52Z

broadlink/cover.py

+
+    def open(self) -> None:
+        """Open the curtain."""
+        self._send(0xc5, 0xc0, 0x01, 0x00)


self._send(0x01)

felipediel · 2020-11-05T15:47:04Z

broadlink/cover.py

+
+    def close(self) -> None:
+        """Close the curtain."""
+        self._send(0xc6, 0xc0, 0x02, 0x00)


self._send(0x02)

felipediel · 2020-11-05T15:47:11Z

broadlink/cover.py

+
+    def stop(self) -> None:
+        """Stop the curtain."""
+        self._send(0xc7, 0xc0, 0x03, 0x00)


self._send(0x03)

felipediel · 2020-11-05T15:47:35Z

broadlink/cover.py

+
+    def get_percentage(self) -> int:
+        """Return the position of the curtain."""
+        return self._send(0xca, 0xc0 ,0x06, 0x00)


self._send(0x06)

felipediel · 2020-11-05T15:49:02Z

broadlink/cover.py

+        new_percent_hex = struct.pack('<H', 49357+new_percentage)
+        magic1 = new_percent_hex[0]
+        magic2 = new_percent_hex[1]
+        magic3 = 0x09
+        magic4 = new_percentage
+        self._send(magic1, magic2, magic3, magic4)


self._send(0x09, new_percentage)

felipediel · 2020-11-05T16:09:43Z

broadlink/cover.py

@@ -1,5 +1,6 @@
 """Support for covers."""
 import time
+import struct


Remove unused import.

Thanks for your constructive comments. All necessary changes have been made.

Add GH Actions

felipediel

This code looks very good. Latest suggestions (not mandatory)...

felipediel · 2020-11-09T18:13:44Z

broadlink/cover.py

@@ -58,3 +58,52 @@ def set_percentage_and_wait(self, new_percentage: int) -> None:
                time.sleep(0.2)
                current = self.get_percentage()
        self.stop()
+
+class dooya_new(device):


class dt36b(device):

felipediel · 2020-11-09T18:13:51Z

broadlink/cover.py

+    def __init__(self, *args, **kwargs) -> None:
+        """Initialize the controller."""
+        device.__init__(self, *args, **kwargs)
+        self.type = "Dooya DT360E(4F6E)"


self.type = "DT36B"

felipediel · 2020-11-09T18:15:54Z

broadlink/__init__.py

@@ -5,7 +5,7 @@

 from .alarm import S1C
 from .climate import hysen
-from .cover import dooya
+from .cover import dooya, dooya_new


from .cover import dooya, dt36b

felipediel · 2020-11-09T18:15:59Z

broadlink/__init__.py

@@ -92,6 +92,7 @@
    0x2722: (S1C, "S2KIT", "Broadlink"),
    0x4EAD: (hysen, "HY02B05H", "Hysen"),
    0x4E4D: (dooya, "DT360E-45/20", "Dooya"),
+    0x4F6E: (dooya_new, "DT360E-45/20", "Dooya"),


0x4F6E: (dt36b, "DT360E-45/20", "Dooya"),

felipediel · 2020-11-09T18:24:32Z

broadlink/cover.py

@@ -58,3 +58,52 @@ def set_percentage_and_wait(self, new_percentage: int) -> None:
                time.sleep(0.2)
                current = self.get_percentage()
        self.stop()
+
+class dooya_new(device):
+    """Controls a Dooya curtain motor."""


"""Controls a Dooya DT360E (type B)."""

felipediel · 2020-11-26T04:14:36Z

This code looks really good. I think it is ready to be merged.

My only doubt is about the name of the class. Maybe we should rename dooya to dt1 and this one to dt2? Or use dt360 and dt360b? I don't know. @mjg59 May I have your opinion on this?

yuqianma · 2021-12-19T09:30:02Z

What's status here? I have 0x4f6e devices too.

yuqianma · 2022-12-30T14:58:41Z

@felipediel Hi, can you merge 0x4f6e? So we can use it in HA to make things easier. Or is there any simple way to add custom codes instead of forking the whole repo?

felipediel · 2022-12-30T17:44:10Z

Hi. This code is outdated, I will rebase and give it some treatment when I find the time

yuqianma · 2023-06-12T16:52:16Z

I think it's better to make it work first then improve it later.

Adding a hexadecimal code is not that difficult, it doesn't take three years. If this is an active project, valuing code quality is understandable, but since updates are not frequent, why not add it first?

felipediel · 2023-06-12T17:49:11Z

It's not just a hex code, it needs a PR rebase and Home Assistant integration. It will take some time.

felipediel · 2023-09-01T05:40:30Z

Hi, why did you close, it's a really good addition to the project, could you please reopen it?

burjakremen · 2023-09-01T07:34:41Z

Reopen here: #770

burjakremen added 2 commits September 25, 2020 15:19

Update __init__.py

a2eec32

Adding support for a Dooya DT360E-45/20 (Device ID: 4F6E)

Update cover.py

0de42b1

Adding support for a Dooya DT360E-45/20 (Device ID: 4F6E)

burjakremen changed the title ~~Add dooya new~~ Add support for New Dooya motor`s Sep 25, 2020

felipediel reviewed Sep 28, 2020

View reviewed changes

burjakremen added 3 commits September 29, 2020 15:21

Update cover.py

af4163a

Fixing errors in code

Update __init__.py

43c3745

Fixing code error

Update cover.py

119fb0c

felipediel reviewed Nov 4, 2020

View reviewed changes

Update cover.py

2031674

Rename method "def set_percentage_and_wait" -> "def set_percentage"

burjakremen changed the title ~~Add support for New Dooya motor`s~~ Add support for New Dooya motor`s (0x4F6E) Nov 5, 2020

burjakremen changed the title ~~Add support for New Dooya motor`s (0x4F6E)~~ Add support for New Dooya motor`s (0x4f6E) Nov 5, 2020

felipediel requested changes Nov 5, 2020

View reviewed changes

felipediel reviewed Nov 5, 2020

View reviewed changes

KTibow and others added 14 commits November 5, 2020 11:00

Add GH Actions

4fd2b16

Fix branches

ebaac1f

Conditionals

97077d3

Update flake8.yaml

25856e3

Go back

d09f501

Update flake8.yaml

9482804

Update flake8.yaml

153b96f

Run black

922eb45

Clean up get_energy() (#471)

75e483c

Merge branch 'master' into patch-2

1799a8c

Merge pull request #470 from KTibow/patch-2

29345a1

Add GH Actions

Update __init__.py

5c37f85

Update cover.py

aa516d8

Merge branch 'master' into add-dooya-new

3cd4dcd

Update cover.py

c08c274

felipediel approved these changes Nov 9, 2020

View reviewed changes

burjakremen added 2 commits November 9, 2020 22:25

Update __init__.py

4dbabc9

Update cover.py

3cca9b2

felipediel force-pushed the master branch from 9559f62 to b3542a8 Compare January 20, 2021 20:08

felipediel force-pushed the master branch from 4dfda47 to b33bbdb Compare January 29, 2021 21:22

burjakremen closed this by deleting the head repository Sep 1, 2023

burjakremen mentioned this pull request Sep 1, 2023

Add dooya new (Dooya DT360E-45/20 curtain motor`s (Device ID: 4F6E)) #770

Closed

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Add support for New Dooya motor`s (0x4f6E) #431

Add support for New Dooya motor`s (0x4f6E) #431

burjakremen commented Sep 25, 2020

felipediel Sep 28, 2020

burjakremen Sep 28, 2020

felipediel Sep 29, 2020

felipediel commented Sep 28, 2020

felipediel Sep 28, 2020

felipediel Sep 28, 2020

felipediel Nov 4, 2020

burjakremen Nov 5, 2020

felipediel Nov 5, 2020

felipediel Nov 5, 2020 •

edited

Loading

felipediel Nov 5, 2020 •

edited

Loading

felipediel Nov 5, 2020

felipediel Nov 5, 2020

felipediel Nov 5, 2020

felipediel Nov 5, 2020

felipediel Nov 5, 2020

felipediel Nov 5, 2020

felipediel Nov 5, 2020

burjakremen Nov 9, 2020

felipediel left a comment •

edited

Loading

felipediel Nov 9, 2020

felipediel Nov 9, 2020

felipediel Nov 9, 2020

felipediel Nov 9, 2020

felipediel Nov 9, 2020

burjakremen Nov 9, 2020

felipediel commented Nov 26, 2020

yuqianma commented Dec 19, 2021

yuqianma commented Dec 30, 2022

felipediel commented Dec 30, 2022

yuqianma commented Jun 12, 2023

felipediel commented Jun 12, 2023

felipediel commented Sep 1, 2023

burjakremen commented Sep 1, 2023

Add support for New Dooya motor`s (0x4f6E) #431

Add support for New Dooya motor`s (0x4f6E) #431

Conversation

burjakremen commented Sep 25, 2020

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

felipediel commented Sep 28, 2020

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

felipediel Nov 5, 2020 • edited Loading

Choose a reason for hiding this comment

felipediel Nov 5, 2020 • edited Loading

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

felipediel left a comment • edited Loading

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

felipediel commented Nov 26, 2020

yuqianma commented Dec 19, 2021

yuqianma commented Dec 30, 2022

felipediel commented Dec 30, 2022

yuqianma commented Jun 12, 2023

felipediel commented Jun 12, 2023

felipediel commented Sep 1, 2023

burjakremen commented Sep 1, 2023

felipediel Nov 5, 2020 •

edited

Loading

felipediel Nov 5, 2020 •

edited

Loading

felipediel left a comment •

edited

Loading