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

hidapi: skip unsupported devices and handle exception on open

This commit is contained in:
vulpes2 2025-01-02 13:16:56 +00:00 committed by Peter F. Patel-Schneider
parent 73ad98d5e4
commit 41e652609b
1 changed files with 12 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
lib/hidapi/hidapi_impl.py
View File

@ -233,6 +233,7 @@ def _match(
vid = device["vendor_id"] vid = device["vendor_id"]
pid = device["product_id"] pid = device["product_id"]
hid_bus_type = device["bus_type"]
# Translate hidapi bus_type to the bus_id values Solaar expects # Translate hidapi bus_type to the bus_id values Solaar expects
if device.get("bus_type") == 0x01: if device.get("bus_type") == 0x01:
@ -241,6 +242,14 @@ def _match(
bus_id = 0x05 # Bluetooth bus_id = 0x05 # Bluetooth
else: else:
bus_id = None bus_id = None
logger.info(f"Device {device['path']} has an unsupported bus type {hid_bus_type:02X}")
return None
# Skip unlikely devices with all-zero VID PID or unsupported bus IDs
if vid == 0 and pid == 0:
logger.info(f"Device {device['path']} has all-zero VID and PID")
logger.info(f"Skipping unlikely device {device['path']} ({bus_id}/{vid:04X}/{pid:04X})")
return None
# Check for hidpp support # Check for hidpp support
device["hidpp_short"] = False device["hidpp_short"] = False
@ -265,7 +274,7 @@ def _match(
close(device_handle) close(device_handle)
logger.info( logger.info(
"Found device BID %s VID %04X PID %04X HID++ %s %s", "Found device BID %s VID %04X PID %04X HID++ SHORT %s LONG %s",
bus_id, bus_id,
vid, vid,
pid, pid,
@ -317,6 +326,8 @@ def _match(
) )
return d_info return d_info
logger.info(f"Finished checking HIDPP support for device {device['path']} ({bus_id}/{vid:04X}/{pid:04X})")
def find_paired_node(receiver_path: str, index: int, timeout: int): def find_paired_node(receiver_path: str, index: int, timeout: int):
"""Find the node of a device paired with a receiver""" """Find the node of a device paired with a receiver"""