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

Remove unnecessary receiver info 'hid_driver' 

The same constant is used everywhere.
This commit is contained in:
MattHag 2024-05-28 02:39:43 +02:00 committed by Peter F. Patel-Schneider
parent a5ded24057
commit e316ed1bc2
2 changed files with 1 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
lib/hidapi/udev.py
View File

@ -111,7 +111,7 @@ def _match(action, device, filterfn):
filter = filterfn(int(bid, 16), int(vid, 16), int(pid, 16), hidpp_short, hidpp_long) filter = filterfn(int(bid, 16), int(vid, 16), int(pid, 16), hidpp_short, hidpp_long)
if not filter: if not filter:
return return
hid_driver = filter.get("hid_driver") hid_driver = ("hid-generic", "generic-usb", "logitech-djreceiver")
interface_number = filter.get("usb_interface") interface_number = filter.get("usb_interface")
isDevice = filter.get("isDevice") isDevice = filter.get("isDevice")

11
lib/logitech_receiver/base_usb.py
View File

@ -36,15 +36,12 @@ from solaar.i18n import _
# re_pairs determines whether a receiver pairs by replacing existing pairings, default to False # re_pairs determines whether a receiver pairs by replacing existing pairings, default to False
## currently only one receiver is so marked - should there be more? ## currently only one receiver is so marked - should there be more?
DRIVER = ("hid-generic", "generic-usb", "logitech-djreceiver")
def _bolt_receiver(product_id): def _bolt_receiver(product_id):
return { return {
"vendor_id": 1133, "vendor_id": 1133,
"product_id": product_id, "product_id": product_id,
"usb_interface": 2, "usb_interface": 2,
"hid_driver": DRIVER,
"name": _("Bolt Receiver"), "name": _("Bolt Receiver"),
"receiver_kind": "bolt", "receiver_kind": "bolt",
"max_devices": 6, "max_devices": 6,
@ -57,7 +54,6 @@ def _unifying_receiver(product_id):
"vendor_id": 1133, "vendor_id": 1133,
"product_id": product_id, "product_id": product_id,
"usb_interface": 2, "usb_interface": 2,
"hid_driver": DRIVER,
"name": _("Unifying Receiver"), "name": _("Unifying Receiver"),
"receiver_kind": "unifying", "receiver_kind": "unifying",
"may_unpair": True, "may_unpair": True,
@ -69,7 +65,6 @@ def _nano_receiver(product_id):
"vendor_id": 1133, "vendor_id": 1133,
"product_id": product_id, "product_id": product_id,
"usb_interface": 1, "usb_interface": 1,
"hid_driver": DRIVER,
"name": _("Nano Receiver"), "name": _("Nano Receiver"),
"receiver_kind": "nano", "receiver_kind": "nano",
"may_unpair": False, "may_unpair": False,
@ -82,7 +77,6 @@ def _nano_receiver_no_unpair(product_id):
"vendor_id": 1133, "vendor_id": 1133,
"product_id": product_id, "product_id": product_id,
"usb_interface": 1, "usb_interface": 1,
"hid_driver": DRIVER,
"name": _("Nano Receiver"), "name": _("Nano Receiver"),
"receiver_kind": "nano", "receiver_kind": "nano",
"may_unpair": False, "may_unpair": False,
@ -96,7 +90,6 @@ def _nano_receiver_max2(product_id):
"vendor_id": 1133, "vendor_id": 1133,
"product_id": product_id, "product_id": product_id,
"usb_interface": 1, "usb_interface": 1,
"hid_driver": DRIVER,
"name": _("Nano Receiver"), "name": _("Nano Receiver"),
"receiver_kind": "nano", "receiver_kind": "nano",
"max_devices": 2, "max_devices": 2,
@ -110,7 +103,6 @@ def _nano_receiver_maxn(product_id, max):
"vendor_id": 1133, "vendor_id": 1133,
"product_id": product_id, "product_id": product_id,
"usb_interface": 1, "usb_interface": 1,
"hid_driver": DRIVER,
"name": _("Nano Receiver"), "name": _("Nano Receiver"),
"receiver_kind": "nano", "receiver_kind": "nano",
"max_devices": max, "max_devices": max,
@ -124,7 +116,6 @@ def _lenovo_receiver(product_id):
"vendor_id": 6127, "vendor_id": 6127,
"product_id": product_id, "product_id": product_id,
"usb_interface": 1, "usb_interface": 1,
"hid_driver": DRIVER,
"name": _("Nano Receiver"), "name": _("Nano Receiver"),
"receiver_kind": "nano", "receiver_kind": "nano",
"may_unpair": False, "may_unpair": False,
@ -136,7 +127,6 @@ def _lightspeed_receiver(product_id):
"vendor_id": 1133, "vendor_id": 1133,
"product_id": product_id, "product_id": product_id,
"usb_interface": 2, "usb_interface": 2,
"hid_driver": DRIVER,
"receiver_kind": "lightspeed", "receiver_kind": "lightspeed",
"name": _("Lightspeed Receiver"), "name": _("Lightspeed Receiver"),
"may_unpair": False, "may_unpair": False,
@ -148,7 +138,6 @@ def _ex100_receiver(product_id):
"vendor_id": 1133, "vendor_id": 1133,
"product_id": product_id, "product_id": product_id,
"usb_interface": 1, "usb_interface": 1,
"hid_driver": DRIVER,
"name": _("EX100 Receiver 27 Mhz"), "name": _("EX100 Receiver 27 Mhz"),
"receiver_kind": "27Mhz", "receiver_kind": "27Mhz",
"max_devices": 4, "max_devices": 4,