RomanNum3ral
/
Solaar
mirror of https://github.com/pwr-Solaar/Solaar.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

fix for python3

This commit is contained in:
Daniel Pavel 2012-10-23 09:06:19 +03:00
parent 4f183b2826
commit 7354429316
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
lib/logitech/unifying_receiver/api.py
View File

@ -40,23 +40,23 @@ def get_receiver_info(handle):
serial = None serial = None
reply = _base.request(handle, 0xFF, b'\x83\xB5', b'\x03') reply = _base.request(handle, 0xFF, b'\x83\xB5', b'\x03')
if reply and reply[0:1] == b'\x03': if reply and reply[0:1] == b'\x03':
serial = _hexlify(reply[1:5]).upper() serial = _hexlify(reply[1:5]).decode('ascii').upper()
firmware = '??.??' firmware = '??.??'
reply = _base.request(handle, 0xFF, b'\x81\xF1', b'\x01') reply = _base.request(handle, 0xFF, b'\x81\xF1', b'\x01')
if reply and reply[0:1] == b'\x01': if reply and reply[0:1] == b'\x01':
fw_version = _hexlify(reply[1:3]) fw_version = _hexlify(reply[1:3]).decode('ascii')
firmware = fw_version[0:2] + '.' + fw_version[2:4] firmware = '%s.%s' % (fw_version[0:2], fw_version[2:4])
reply = _base.request(handle, 0xFF, b'\x81\xF1', b'\x02') reply = _base.request(handle, 0xFF, b'\x81\xF1', b'\x02')
if reply and reply[0:1] == b'\x02': if reply and reply[0:1] == b'\x02':
firmware += '.' + _hexlify(reply[1:3]) firmware += '.' + _hexlify(reply[1:3]).decode('ascii')
bootloader = None bootloader = None
reply = _base.request(handle, 0xFF, b'\x81\xF1', b'\x04') reply = _base.request(handle, 0xFF, b'\x81\xF1', b'\x04')
if reply and reply[0:1] == b'\x04': if reply and reply[0:1] == b'\x04':
bl_version = _hexlify(reply[1:3]) bl_version = _hexlify(reply[1:3]).decode('ascii')
bootloader = bl_version[0:2] + '.' + bl_version[2:4] bootloader = '%s.%s' % (bl_version[0:2], bl_version[2:4])
return (serial, firmware, bootloader) return (serial, firmware, bootloader)