djsundog/circuitpython
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #4560 from dhalbert/fix-hid-order

Browse Source 
Put mouse before gamepad due to MacOS being finicky
This commit is contained in:
Dan Halbert 2021-04-04 23:11:14 -04:00 committed by GitHub
commit a1562430f6
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
tools/gen_usb_descriptor.py
View File

@ -17,9 +17,11 @@ ALL_DEVICES = "CDC CDC2 MSC AUDIO HID VENDOR"
ALL_DEVICES_SET = frozenset(ALL_DEVICES.split()) ALL_DEVICES_SET = frozenset(ALL_DEVICES.split())
DEFAULT_DEVICES = "CDC MSC AUDIO HID" DEFAULT_DEVICES = "CDC MSC AUDIO HID"
# This list is in preferred order. MacOS does not like GAMEPAD coming before MOUSE.
ALL_HID_DEVICES = ( ALL_HID_DEVICES = (
"KEYBOARD MOUSE CONSUMER SYS_CONTROL GAMEPAD DIGITIZER XAC_COMPATIBLE_GAMEPAD RAW" "KEYBOARD MOUSE CONSUMER SYS_CONTROL GAMEPAD DIGITIZER XAC_COMPATIBLE_GAMEPAD RAW"
) )
ALL_HID_DEVICES_ORDER = dict((name, idx) for (idx, name) in enumerate(ALL_HID_DEVICES.split()))
ALL_HID_DEVICES_SET = frozenset(ALL_HID_DEVICES.split()) ALL_HID_DEVICES_SET = frozenset(ALL_HID_DEVICES.split())
# Digitizer works on Linux but conflicts with mouse, so omit it. # Digitizer works on Linux but conflicts with mouse, so omit it.
DEFAULT_HID_DEVICES = "KEYBOARD MOUSE CONSUMER GAMEPAD" DEFAULT_HID_DEVICES = "KEYBOARD MOUSE CONSUMER GAMEPAD"
@ -352,7 +354,8 @@ if include_hid:
else: else:
report_id = 1 report_id = 1
concatenated_descriptors = bytearray() concatenated_descriptors = bytearray()
for name in args.hid_devices: # Sort HID devices by preferred order.
for name in sorted(args.hid_devices, key=ALL_HID_DEVICES_ORDER.get):
concatenated_descriptors.extend( concatenated_descriptors.extend(
bytes(hid_report_descriptors.REPORT_DESCRIPTOR_FUNCTIONS[name](report_id)) bytes(hid_report_descriptors.REPORT_DESCRIPTOR_FUNCTIONS[name](report_id))
) )