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

receiver: count found devices when enumerating them and cut off when all found

This commit is contained in:
Peter F. Patel-Schneider 2023-01-06 07:16:22 -05:00
parent 351e2268cd
commit 6b9c8cffef
1 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
lib/logitech_receiver/receiver.py
View File

@ -61,7 +61,6 @@ class Receiver:
self.receiver_kind = product_info.get('receiver_kind', 'unknown') self.receiver_kind = product_info.get('receiver_kind', 'unknown')
# read the serial immediately, so we can find out max_devices # read the serial immediately, so we can find out max_devices
self.last_id = 0
if self.receiver_kind == 'bolt': if self.receiver_kind == 'bolt':
serial_reply = self.read_register(_R.bolt_uniqueId) serial_reply = self.read_register(_R.bolt_uniqueId)
self.serial = _strhex(serial_reply) self.serial = _strhex(serial_reply)
@ -72,7 +71,6 @@ class Receiver:
if serial_reply: if serial_reply:
self.serial = _strhex(serial_reply[1:5]) self.serial = _strhex(serial_reply[1:5])
self.max_devices = ord(serial_reply[6:7]) self.max_devices = ord(serial_reply[6:7])
self.last_id = ord(serial_reply[7:8])
if self.max_devices <= 0 or self.max_devices > 6: if self.max_devices <= 0 or self.max_devices > 6:
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)
@ -80,7 +78,6 @@ class Receiver:
self.serial = None 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)
self.last_id = self.last_id if self.last_id else self.max_devices
self.name = product_info.get('name', 'Receiver') self.name = product_info.get('name', 'Receiver')
self.re_pairs = product_info.get('re_pairs', False) self.re_pairs = product_info.get('re_pairs', False)
@ -178,7 +175,7 @@ class Receiver:
_log.error('Unable to get wpid from udev for device %d of %s', n, self) _log.error('Unable to get wpid from udev for device %d of %s', n, self)
raise _base.NoSuchDevice(number=n, receiver=self, error='Not present 27Mhz device') raise _base.NoSuchDevice(number=n, receiver=self, error='Not present 27Mhz device')
kind = _hidpp10.DEVICE_KIND[self.get_kind_from_index(n, self)] kind = _hidpp10.DEVICE_KIND[self.get_kind_from_index(n, self)]
else: # unifying protocol not supported, may be an old Nano receiver elif not self.receiver_kind == 'unifying': # unifying protocol not supported, may be an old Nano receiver
device_info = self.read_register(_R.receiver_info, 0x04) device_info = self.read_register(_R.receiver_info, 0x04)
if device_info: if device_info:
wpid = _strhex(device_info[3:5]) wpid = _strhex(device_info[3:5])
@ -288,12 +285,17 @@ class Receiver:
write_register = _hidpp10.write_register write_register = _hidpp10.write_register
def __iter__(self): def __iter__(self):
for number in range(1, 16): # some receivers have devices past their max # devices connected_devices = self.count()
found_devices = 0
for number in range(1, 8): # some receivers have devices past their max # devices
if found_devices >= connected_devices:
return
if number in self._devices: if number in self._devices:
dev = self._devices[number] dev = self._devices[number]
else: else:
dev = self.__getitem__(number) dev = self.__getitem__(number)
if dev is not None: if dev is not None:
found_devices += 1
yield dev yield dev
def __getitem__(self, key): def __getitem__(self, key):