Skip to content

Added password support from nemccarthy #8

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.

Sign up for GitHub

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

Merged
merged 5 commits into from
Dec 29, 2019
Merged

Added password support from nemccarthy #8

Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
4d45c81
dded password support from nemccarthy
magnussand Dec 26, 2019
eac8613
Got rid of "The Travis CI build failed" error
magnussand Dec 26, 2019
473e040
Fixed bug with static action (key)
magnussand Dec 27, 2019
f678556
Simplified function _commandkey
magnussand Dec 28, 2019
2a4c9ed
Small cleanup of code
magnussand Dec 28, 2019
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
26 changes: 24 additions & 2 deletions switchbot/__init__.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,20 +12,30 @@
UUID = "cba20d00-224d-11e6-9fb8-0002a5d5c51b"
HANDLE = "cba20002-224d-11e6-9fb8-0002a5d5c51b"

KEY_PASSWORD_PREFIX = "5711"

PRESS_KEY = "570100"
ON_KEY = "570101"
OFF_KEY = "570102"

ON_KEY_SUFFIX = "01"
OFF_KEY_SUFFIX = "02"
PRESS_KEY_SUFFIX = "00"

_LOGGER = logging.getLogger(__name__)


class Switchbot:
"""Representation of a Switchbot."""

def __init__(self, mac, retry_count=DEFAULT_RETRY_COUNT) -> None:
def __init__(self, mac, retry_count=DEFAULT_RETRY_COUNT, password=None) -> None:
self._mac = mac
self._device = None
self._retry_count = retry_count
if password is None or password == "":
self._password_encoded = None
else:
self._password_encoded = '%x' % (binascii.crc32(password.encode('ascii')) & 0xffffffff)

def _connect(self) -> None:
if self._device is not None:
Expand All @@ -51,6 +61,16 @@ def _disconnect(self) -> None:
finally:
self._device = None

def _commandkey(self, key) -> str:
if self._password_encoded is None:
return key
key_suffix = PRESS_KEY_SUFFIX
if key == ON_KEY:
key_suffix = ON_KEY_SUFFIX
elif key == OFF_KEY:
key_suffix = OFF_KEY_SUFFIX
return KEY_PASSWORD_PREFIX + self._password_encoded + key_suffix

def _writekey(self, key) -> bool:
_LOGGER.debug("Prepare to send")
hand_service = self._device.getServiceByUUID(UUID)
Expand All @@ -66,9 +86,11 @@ def _writekey(self, key) -> bool:

def _sendcommand(self, key, retry) -> bool:
send_success = False
command = self._commandkey(key)
_LOGGER.debug("Sending command to switchbot %s", command)
try:
self._connect()
send_success = self._writekey(key)
send_success = self._writekey(command)
except bluepy.btle.BTLEException:
_LOGGER.warning("Error talking to Switchbot.", exc_info=True)
finally:
Expand Down