Fix bug in rfxtrx for int device id (#2497)

This commit is contained in:
Daniel Høyer Iversen authored and Paulus Schoutsen committed 2016-07-12 01:45:22 -07:00
1 parent 6d60287455
commit 09a4336bc5
2 files changed
+19 -1

No files matched your search

+8 -1
View File
@@ -66,6 +66,9 @@ def _valid_device(value, device_type):
key = device.get('packetid')
device.pop('packetid')
if not len(key) % 2 == 0:
key = '0' + key
if get_rfx_object(key) is None:
raise vol.Invalid('Rfxtrx device {} is invalid: '
'Invalid device id for {}'.format(key, value))
@@ -160,7 +163,11 @@ def get_rfx_object(packetid):
"""Return the RFXObject with the packetid."""
import RFXtrx as rfxtrxmod
binarypacket = bytearray.fromhex(packetid)
try:
binarypacket = bytearray.fromhex(packetid)
except ValueError:
return None
pkt = rfxtrxmod.lowlevel.parse(binarypacket)
if pkt is None:
return None