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

improved read of device serial

This commit is contained in:
Daniel Pavel 2012-11-07 22:34:43 +02:00
parent 8ae8d4502d
commit 8db1ce97a8
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
app/receiver.py
View File

@ -111,7 +111,8 @@ class DeviceInfo(_api.PairedDevice):
self.LOG = _Logger("Device[%d]" % number) self.LOG = _Logger("Device[%d]" % number)
self._listener = listener self._listener = listener
self._pair_code = _pack('!B', 0x40 + number - 1) self._pair_code = _pack('!B', 0x40 + number - 1)
self._serial = serial_prefix self._serial_prefix = _base._hex(serial_prefix)
self._serial = None
self._codename = None self._codename = None
self._status = status self._status = status
@ -180,15 +181,14 @@ class DeviceInfo(_api.PairedDevice):
@property @property
def serial(self): def serial(self):
assert self._serial is not None if self._serial is None:
if len(self._serial) == 2:
# dodgy # dodgy
b = bytearray(self._pair_code) b = bytearray(self._pair_code)
b[0] -= 0x10 b[0] -= 0x10
serial = _base.request(self.handle, 0xFF, b'\x83\xB5', bytes(b)) serial = _base.request(self.handle, 0xFF, b'\x83\xB5', bytes(b))
if serial: if serial:
self._serial = _base._hex(self._serial) + '-' + _base._hex(serial[1:5]) self._serial = self._serial_prefix + '-' + _base._hex(serial[1:5])
return self._serial or '?' return self._serial or self._serial_prefix + '-?'
@property @property
def codename(self): def codename(self):