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

broadlink_discovery returns wrong devtype (#157)

Browse Source 
* few item in gendevice use `if` instead of `elif`

* passing `devtype` back to device
change `cli/broadlink_discovery` to display proper devtype
This commit is contained in:
Nightreaver 2018-03-19 06:58:15 +09:00 committed by Matthew Garrett
parent 21d96bd140
commit 8754493951
2 changed files with 50 additions and 51 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

93
broadlink/__init__.py
View File

@ -15,63 +15,63 @@ import codecs
def gendevice(devtype, host, mac): def gendevice(devtype, host, mac):
if devtype == 0: # SP1 if devtype == 0: # SP1
return sp1(host=host, mac=mac) return sp1(host=host, mac=mac, devtype=devtype)
if devtype == 0x2711: # SP2 elif devtype == 0x2711: # SP2
return sp2(host=host, mac=mac) return sp2(host=host, mac=mac, devtype=devtype)
if devtype == 0x2719 or devtype == 0x7919 or devtype == 0x271a or devtype == 0x791a: # Honeywell SP2 elif devtype == 0x2719 or devtype == 0x7919 or devtype == 0x271a or devtype == 0x791a: # Honeywell SP2
return sp2(host=host, mac=mac) return sp2(host=host, mac=mac, devtype=devtype)
if devtype == 0x2720: # SPMini elif devtype == 0x2720: # SPMini
return sp2(host=host, mac=mac) return sp2(host=host, mac=mac, devtype=devtype)
elif devtype == 0x753e: # SP3 elif devtype == 0x753e: # SP3
return sp2(host=host, mac=mac) return sp2(host=host, mac=mac, devtype=devtype)
elif devtype == 0x947a or devtype == 0x9479: # SP3S elif devtype == 0x947a or devtype == 0x9479: # SP3S
return sp2(host=host, mac=mac) return sp2(host=host, mac=mac, devtype=devtype)
elif devtype == 0x2728: # SPMini2 elif devtype == 0x2728: # SPMini2
return sp2(host=host, mac=mac) return sp2(host=host, mac=mac, devtype=devtype)
elif devtype == 0x2733 or devtype == 0x273e: # OEM branded SPMini elif devtype == 0x2733 or devtype == 0x273e: # OEM branded SPMini
return sp2(host=host, mac=mac) return sp2(host=host, mac=mac, devtype=devtype)
elif devtype >= 0x7530 and devtype <= 0x7918: # OEM branded SPMini2 elif devtype >= 0x7530 and devtype <= 0x7918: # OEM branded SPMini2
return sp2(host=host, mac=mac) return sp2(host=host, mac=mac, devtype=devtype)
elif devtype == 0x2736: # SPMiniPlus elif devtype == 0x2736: # SPMiniPlus
return sp2(host=host, mac=mac) return sp2(host=host, mac=mac, devtype=devtype)
elif devtype == 0x2712: # RM2 elif devtype == 0x2712: # RM2
return rm(host=host, mac=mac) return rm(host=host, mac=mac, devtype=devtype)
elif devtype == 0x2737: # RM Mini elif devtype == 0x2737: # RM Mini
return rm(host=host, mac=mac) return rm(host=host, mac=mac, devtype=devtype)
elif devtype == 0x273d: # RM Pro Phicomm elif devtype == 0x273d: # RM Pro Phicomm
return rm(host=host, mac=mac) return rm(host=host, mac=mac, devtype=devtype)
elif devtype == 0x2783: # RM2 Home Plus elif devtype == 0x2783: # RM2 Home Plus
return rm(host=host, mac=mac) return rm(host=host, mac=mac, devtype=devtype)
elif devtype == 0x277c: # RM2 Home Plus GDT elif devtype == 0x277c: # RM2 Home Plus GDT
return rm(host=host, mac=mac) return rm(host=host, mac=mac, devtype=devtype)
elif devtype == 0x272a: # RM2 Pro Plus elif devtype == 0x272a: # RM2 Pro Plus
return rm(host=host, mac=mac) return rm(host=host, mac=mac, devtype=devtype)
elif devtype == 0x2787: # RM2 Pro Plus2 elif devtype == 0x2787: # RM2 Pro Plus2
return rm(host=host, mac=mac) return rm(host=host, mac=mac, devtype=devtype)
elif devtype == 0x279d: # RM2 Pro Plus3 elif devtype == 0x279d: # RM2 Pro Plus3
return rm(host=host, mac=mac) return rm(host=host, mac=mac, devtype=devtype)
elif devtype == 0x27a9: # RM2 Pro Plus_300 elif devtype == 0x27a9: # RM2 Pro Plus_300
return rm(host=host, mac=mac) return rm(host=host, mac=mac, devtype=devtype)
elif devtype == 0x278b: # RM2 Pro Plus BL elif devtype == 0x278b: # RM2 Pro Plus BL
return rm(host=host, mac=mac) return rm(host=host, mac=mac, devtype=devtype)
elif devtype == 0x2797: # RM2 Pro Plus HYC elif devtype == 0x2797: # RM2 Pro Plus HYC
return rm(host=host, mac=mac) return rm(host=host, mac=mac, devtype=devtype)
elif devtype == 0x27a1: # RM2 Pro Plus R1 elif devtype == 0x27a1: # RM2 Pro Plus R1
return rm(host=host, mac=mac) return rm(host=host, mac=mac, devtype=devtype)
elif devtype == 0x27a6: # RM2 Pro PP elif devtype == 0x27a6: # RM2 Pro PP
return rm(host=host, mac=mac) return rm(host=host, mac=mac, devtype=devtype)
elif devtype == 0x278f: # RM Mini Shate elif devtype == 0x278f: # RM Mini Shate
return rm(host=host, mac=mac) return rm(host=host, mac=mac, devtype=devtype)
elif devtype == 0x2714: # A1 elif devtype == 0x2714: # A1
return a1(host=host, mac=mac) return a1(host=host, mac=mac, devtype=devtype)
elif devtype == 0x4EB5 or devtype == 0x4EF7: # MP1: 0x4eb5, honyar oem mp1: 0x4ef7 elif devtype == 0x4EB5 or devtype == 0x4EF7: # MP1: 0x4eb5, honyar oem mp1: 0x4ef7
return mp1(host=host, mac=mac) return mp1(host=host, mac=mac, devtype=devtype)
elif devtype == 0x2722: # S1 (SmartOne Alarm Kit) elif devtype == 0x2722: # S1 (SmartOne Alarm Kit)
return S1C(host=host, mac=mac) return S1C(host=host, mac=mac, devtype=devtype)
elif devtype == 0x4E4D: # Dooya DT360E (DOOYA_CURTAIN_V2) elif devtype == 0x4E4D: # Dooya DT360E (DOOYA_CURTAIN_V2)
return dooya(host=host, mac=mac) return dooya(host=host, mac=mac, devtype=devtype)
else: else:
return device(host=host, mac=mac) return device(host=host, mac=mac, devtype=devtype)
def discover(timeout=None, local_ip_address=None): def discover(timeout=None, local_ip_address=None):
if local_ip_address is None: if local_ip_address is None:
@ -152,9 +152,10 @@ def discover(timeout=None, local_ip_address=None):
class device: class device:
def __init__(self, host, mac, timeout=10): def __init__(self, host, mac, devtype, timeout=10):
self.host = host self.host = host
self.mac = mac self.mac = mac
self.devtype = devtype
self.timeout = timeout self.timeout = timeout
self.count = random.randrange(0xffff) self.count = random.randrange(0xffff)
self.key = bytearray([0x09, 0x76, 0x28, 0x34, 0x3f, 0xe9, 0x9e, 0x23, 0x76, 0x5c, 0x15, 0x13, 0xac, 0xcf, 0x8b, 0x02]) self.key = bytearray([0x09, 0x76, 0x28, 0x34, 0x3f, 0xe9, 0x9e, 0x23, 0x76, 0x5c, 0x15, 0x13, 0xac, 0xcf, 0x8b, 0x02])
@ -302,8 +303,8 @@ class device:
class mp1(device): class mp1(device):
def __init__ (self, host, mac): def __init__ (self, host, mac, devtype):
device.__init__(self, host, mac) device.__init__(self, host, mac, devtype)
self.type = "MP1" self.type = "MP1"
def set_power_mask(self, sid_mask, state): def set_power_mask(self, sid_mask, state):
@ -365,8 +366,8 @@ class mp1(device):
class sp1(device): class sp1(device):
def __init__ (self, host, mac): def __init__ (self, host, mac, devtype):
device.__init__(self, host, mac) device.__init__(self, host, mac, devtype)
self.type = "SP1" self.type = "SP1"
def set_power(self, state): def set_power(self, state):
@ -376,8 +377,8 @@ class sp1(device):
class sp2(device): class sp2(device):
def __init__ (self, host, mac): def __init__ (self, host, mac, devtype):
device.__init__(self, host, mac) device.__init__(self, host, mac, devtype)
self.type = "SP2" self.type = "SP2"
def set_power(self, state): def set_power(self, state):
@ -415,8 +416,8 @@ class sp2(device):
class a1(device): class a1(device):
def __init__ (self, host, mac): def __init__ (self, host, mac, devtype):
device.__init__(self, host, mac) device.__init__(self, host, mac, devtype)
self.type = "A1" self.type = "A1"
def check_sensors(self): def check_sensors(self):
@ -493,8 +494,8 @@ class a1(device):
class rm(device): class rm(device):
def __init__ (self, host, mac): def __init__ (self, host, mac, devtype):
device.__init__(self, host, mac) device.__init__(self, host, mac, devtype)
self.type = "RM2" self.type = "RM2"
def check_data(self): def check_data(self):
@ -532,7 +533,7 @@ class rm(device):
# For legay compatibility - don't use this # For legay compatibility - don't use this
class rm2(rm): class rm2(rm):
def __init__ (self): def __init__ (self):
device.__init__(self, None, None) device.__init__(self, None, None, None)
def discover(self): def discover(self):
dev = discover() dev = discover()
@ -597,8 +598,8 @@ class S1C(device):
class dooya(device): class dooya(device):
def __init__ (self, host, mac): def __init__ (self, host, mac, devtype):
device.__init__(self, host, mac) device.__init__(self, host, mac, devtype)
self.type = "Dooya DT360E" self.type = "Dooya DT360E"
def _send(self, magic1, magic2): def _send(self, magic1, magic2):

8
cli/broadlink_discovery
View File

@ -8,17 +8,15 @@ parser = argparse.ArgumentParser(fromfile_prefix_chars='@');
parser.add_argument("--timeout", type=int, default=5, help="timeout to wait for receiving discovery responses") parser.add_argument("--timeout", type=int, default=5, help="timeout to wait for receiving discovery responses")
args = parser.parse_args() args = parser.parse_args()
print "discover" print "Discovering..."
devices = broadlink.discover(timeout=args.timeout) devices = broadlink.discover(timeout=args.timeout)
#print devices
for device in devices: for device in devices:
if device.auth(): if device.auth():
print "###########################################" print "###########################################"
# print device
print device.type print device.type
print "# broadlink_cli --type 0x2712 --host {} --mac {}".format(device.host[0], ''.join(format(x, '02x') for x in device.mac)) print "# broadlink_cli --type {} --host {} --mac {}".format(hex(device.devtype), device.host[0], ''.join(format(x, '02x') for x in device.mac))
print "Device file data (to be used with --device @filename in broadlink_cli) : " print "Device file data (to be used with --device @filename in broadlink_cli) : "
print "0x2712 {} {}".format(device.host[0], ''.join(format(x, '02x') for x in device.mac)) print "{} {} {}".format(hex(device.devtype), device.host[0], ''.join(format(x, '02x') for x in device.mac))
if hasattr(device, 'check_temperature'): if hasattr(device, 'check_temperature'):
print "temperature = {}".format(device.check_temperature()) print "temperature = {}".format(device.check_temperature())
print "" print ""