kamp/python-broadlink
1
0
Fork 0
mirror of https://github.com/mjg59/python-broadlink.git synced 2024-11-21 22:51:41 +01:00
Code

Rename lock byte (#389)

Browse Source
This commit is contained in:
Felipe Martins Diel 2020-07-31 02:10:21 -03:00 committed by GitHub
parent 02ce6ec661
commit e4ad86278d
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
broadlink/__init__.py
View File

@ -90,13 +90,13 @@ def get_devices():
} }
def gendevice(dev_type, host, mac, name=None, cloud=None): def gendevice(dev_type, host, mac, name=None, is_locked=None):
"""Generate a device.""" """Generate a device."""
try: try:
dev_class, model, manufacturer = get_devices()[dev_type] dev_class, model, manufacturer = get_devices()[dev_type]
except KeyError: except KeyError:
return device(host, mac, dev_type, name=name, cloud=cloud) return device(host, mac, dev_type, name=name, is_locked=is_locked)
return dev_class( return dev_class(
host, host,
@ -105,7 +105,7 @@ def gendevice(dev_type, host, mac, name=None, cloud=None):
name=name, name=name,
model=model, model=model,
manufacturer=manufacturer, manufacturer=manufacturer,
cloud=cloud, is_locked=is_locked,
) )
@ -172,8 +172,8 @@ def discover(timeout=None, local_ip_address=None, discover_ip_address='255.255.2
devtype = responsepacket[0x34] | responsepacket[0x35] << 8 devtype = responsepacket[0x34] | responsepacket[0x35] << 8
mac = responsepacket[0x3f:0x39:-1] mac = responsepacket[0x3f:0x39:-1]
name = responsepacket[0x40:].split(b'\x00')[0].decode('utf-8') name = responsepacket[0x40:].split(b'\x00')[0].decode('utf-8')
cloud = bool(responsepacket[-1]) is_locked = bool(responsepacket[-1])
device = gendevice(devtype, host, mac, name=name, cloud=cloud) device = gendevice(devtype, host, mac, name=name, is_locked=is_locked)
cs.close() cs.close()
return device return device
@ -189,8 +189,8 @@ def discover(timeout=None, local_ip_address=None, discover_ip_address='255.255.2
devtype = responsepacket[0x34] | responsepacket[0x35] << 8 devtype = responsepacket[0x34] | responsepacket[0x35] << 8
mac = responsepacket[0x3f:0x39:-1] mac = responsepacket[0x3f:0x39:-1]
name = responsepacket[0x40:].split(b'\x00')[0].decode('utf-8') name = responsepacket[0x40:].split(b'\x00')[0].decode('utf-8')
cloud = bool(responsepacket[-1]) is_locked = bool(responsepacket[-1])
device = gendevice(devtype, host, mac, name=name, cloud=cloud) device = gendevice(devtype, host, mac, name=name, is_locked=is_locked)
devices.append(device) devices.append(device)
cs.close() cs.close()
return devices return devices
@ -206,7 +206,7 @@ class device:
name=None, name=None,
model=None, model=None,
manufacturer=None, manufacturer=None,
cloud=None is_locked=None
): ):
self.host = host self.host = host
self.mac = mac.encode() if isinstance(mac, str) else mac self.mac = mac.encode() if isinstance(mac, str) else mac
@ -215,7 +215,7 @@ class device:
self.name = name self.name = name
self.model = model self.model = model
self.manufacturer = manufacturer self.manufacturer = manufacturer
self.cloud = cloud self.is_locked = is_locked
self.count = random.randrange(0xffff) self.count = random.randrange(0xffff)
self.iv = bytearray( self.iv = bytearray(
[0x56, 0x2e, 0x17, 0x99, 0x6d, 0x09, 0x3d, 0x28, 0xdd, 0xb3, 0xba, 0x69, 0x5a, 0x2e, 0x6f, 0x58]) [0x56, 0x2e, 0x17, 0x99, 0x6d, 0x09, 0x3d, 0x28, 0xdd, 0xb3, 0xba, 0x69, 0x5a, 0x2e, 0x6f, 0x58])
@ -291,7 +291,7 @@ class device:
packet = bytearray(4) packet = bytearray(4)
packet += name.encode('utf-8') packet += name.encode('utf-8')
packet += bytearray(0x50 - len(packet)) packet += bytearray(0x50 - len(packet))
packet[0x43] = self.cloud packet[0x43] = self.is_locked
response = self.send_packet(0x6a, packet) response = self.send_packet(0x6a, packet)
check_error(response[0x22:0x24]) check_error(response[0x22:0x24])
self.name = name self.name = name
@ -303,7 +303,7 @@ class device:
packet[0x43] = state packet[0x43] = state
response = self.send_packet(0x6a, packet) response = self.send_packet(0x6a, packet)
check_error(response[0x22:0x24]) check_error(response[0x22:0x24])
self.cloud = bool(state) self.is_locked = bool(state)
def get_type(self): def get_type(self):
return self.type return self.type