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

receiver: get receiver name from receiver information list

This commit is contained in:
Peter F. Patel-Schneider 2020-01-25 09:42:25 -05:00 committed by Filipe Laíns
parent 907c5ab075
commit a6fcb75aa8
2 changed files with 13 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
lib/logitech_receiver/base_usb.py
View File

@ -105,3 +105,11 @@ ALL = (
LIGHTSPEED_RECEIVER_C53a,
LIGHTSPEED_RECEIVER_C53f,
)
def product_information(usb_id):
if isinstance(usb_id,str):
usb_id = int(usb_id,16)
for r in ALL:
if usb_id == r.get('product_id'):
return r
return { }

13
lib/logitech_receiver/receiver.py
View File

@ -33,6 +33,7 @@ from . import hidpp20 as _hidpp20
from .common import strhex as _strhex
from .descriptors import DEVICES as _DESCRIPTORS
from .settings_templates import check_feature_settings as _check_feature_settings
from .base_usb import product_information as _product_information
_R = _hidpp10.REGISTERS
@ -345,14 +346,10 @@ class Receiver(object):
self.serial = None
self.max_devices = 6
if self.product_id == 'c539' or self.product_id == 'c53a' or self.product_id == 'c53f':
self.name = 'Lightspeed Receiver'
elif self.max_devices == 6:
self.name = 'Unifying Receiver'
elif self.max_devices < 6:
self.name = 'Nano Receiver'
else:
raise Exception("unknown receiver type", self.max_devices)
product_info = _product_information(self.product_id)
if not product_info:
raise Exception("unknown receiver type", self.product_id)
self.name = product_info.get('name','')
self._str = '<%s(%s,%s%s)>' % (self.name.replace(' ', ''), self.path, '' if isinstance(self.handle, int) else 'T', self.handle)
# TODO _properly_ figure out which receivers do and which don't support unpairing