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

receiver: use Bolt unique ID as serial number

This commit is contained in:
Peter F. Patel-Schneider 2021-11-11 10:42:46 -05:00
parent 4bc3799e96
commit 5acc216e12
2 changed files with 20 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
lib/logitech_receiver/hidpp10.py
View File

@ -123,6 +123,7 @@ REGISTERS = _NamedInts(
receiver_info=0x2B5, receiver_info=0x2B5,
bolt_device_discovery=0xC0, bolt_device_discovery=0xC0,
bolt_pairing=0x2C1, bolt_pairing=0x2C1,
bolt_uniqueId=0x02FB,
# only apply to devices # only apply to devices
mouse_button_flags=0x01, mouse_button_flags=0x01,

35
lib/logitech_receiver/receiver.py
View File

@ -63,24 +63,27 @@ class Receiver:
# read the serial immediately, so we can find out max_devices # read the serial immediately, so we can find out max_devices
if self.receiver_kind == 'bolt': if self.receiver_kind == 'bolt':
serial_reply = None serial_reply = self.read_register(_R.bolt_uniqueId)
else: self.serial = _strhex(serial_reply)
serial_reply = self.read_register(_R.receiver_info, _IR.receiver_information)
if serial_reply:
self.serial = _strhex(serial_reply[1:5])
self.max_devices = ord(serial_reply[6:7])
if self.max_devices <= 0 or self.max_devices > 6:
self.max_devices = product_info.get('max_devices', 1)
# TODO _properly_ figure out which receivers do and which don't support unpairing
# This code supposes that receivers that don't unpair support a pairing request for device index 0
if 'unpair' in product_info:
self.may_unpair = product_info['unpair']
else:
self.may_unpair = self.write_register(_R.receiver_pairing) is None
else: # handle receivers that don't have a serial number specially (i.e., c534 and Bolt receivers)
self.serial = None
self.max_devices = product_info.get('max_devices', 1) self.max_devices = product_info.get('max_devices', 1)
self.may_unpair = product_info.get('may_unpair', False) self.may_unpair = product_info.get('may_unpair', False)
else:
serial_reply = self.read_register(_R.receiver_info, _IR.receiver_information)
if serial_reply:
self.serial = _strhex(serial_reply[1:5])
self.max_devices = ord(serial_reply[6:7])
if self.max_devices <= 0 or self.max_devices > 6:
self.max_devices = product_info.get('max_devices', 1)
# TODO _properly_ figure out which receivers do and which don't support unpairing
# This code supposes that receivers that don't unpair support a pairing request for device index 0
if 'unpair' in product_info:
self.may_unpair = product_info['unpair']
else:
self.may_unpair = self.write_register(_R.receiver_pairing) is None
else: # handle receivers that don't have a serial number specially (i.e., c534 and Bolt receivers)
self.serial = None
self.max_devices = product_info.get('max_devices', 1)
self.may_unpair = product_info.get('may_unpair', False)
self.name = product_info.get('name', '') self.name = product_info.get('name', '')
self.re_pairs = product_info.get('re_pairs', False) self.re_pairs = product_info.get('re_pairs', False)