Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

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

Closed
wants to merge 23 commits into from
Closed
Show file tree
Hide file tree
Changes from 2 commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions broadlink/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -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"),
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Where did you get the model name from?

Copy link
Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The sticker on the motor housing and on packaging
dooya_dt360

Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Beautiful.

0x51e3: (bg1, "BG800/BG900", "BG Electrical"),
}

Expand Down
52 changes: 52 additions & 0 deletions broadlink/cover.py
Original file line number Diff line number Diff line change
Expand Up @@ -58,3 +58,55 @@ 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."""
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

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

Copy link
Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

All done


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

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

        self.type = "DT36B"


def _send(self, magic1: int, magic2: int, magic3:int, magic4:int) -> int:
Copy link
Collaborator

@felipediel felipediel Nov 5, 2020

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

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:

"""Send a packet to the device."""
packet = bytearray(32)
packet[0] = 0x16
packet[2] = 0xa5
packet[3] = 0xa5
packet[4] = 0x5a
packet[5] = 0x5a
packet[6] = magic1
packet[7] = magic2
Copy link
Collaborator

@felipediel felipediel Nov 5, 2020

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This magic is called checksum. We can use this:

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

packet[8] = 0x02
packet[9] = 0x0b
packet[10] = 0x0a
packet[15] = magic3
packet[16] = magic4
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

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

response = self.send_packet(0x6a, packet)
check_error(response[0x22:0x24])
payload = self.decrypt(response[0x38:])
return payload[17]

def open(self) -> int:
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

What does the integer returned by this function represent?

"""Open the curtain."""
return self._send(0xc5, 0xc0, 0x01, 0x00)

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

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

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

def set_percentage_and_wait(self, new_percentage) -> int:
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

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

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