aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDrashna Jaelre <drashna@live.com>2021-08-17 11:13:54 -0700
committerGitHub <noreply@github.com>2021-08-18 04:13:54 +1000
commit85351dc23d423d1fa5d23aed8b4b478c49949b46 (patch)
tree532ea6caafbc88b6ea0a8d9d1ac0f69186bcf3a6
parentfae5cc6c67c9475d08c56ff01e470389747196f7 (diff)
downloadqmk_firmware-85351dc23d423d1fa5d23aed8b4b478c49949b46.tar.gz
qmk_firmware-85351dc23d423d1fa5d23aed8b4b478c49949b46.zip
[CLI] Add qmk-hid bootloader detection support to `qmk console` (#14038)
* [CLI] Add qmk-hid bootloader detection support to `qmk console` * Remove duplicate entry Co-authored-by: Ryan <fauxpark@gmail.com> * Begrudgingly add lufa-ms * Add udev rules for hid bootloaders * Update util/udev/50-qmk.rules Co-authored-by: Sergey Vlasov <sigprof@gmail.com> * Fix VID/PID combos Co-authored-by: Sergey Vlasov <sigprof@gmail.com> Co-authored-by: Ryan <fauxpark@gmail.com> Co-authored-by: Sergey Vlasov <sigprof@gmail.com>
-rw-r--r--lib/python/qmk/cli/console.py5
-rw-r--r--lib/python/qmk/cli/doctor/linux.py4
-rw-r--r--util/udev/50-qmk.rules6
3 files changed, 13 insertions, 2 deletions
diff --git a/lib/python/qmk/cli/console.py b/lib/python/qmk/cli/console.py
index 45ff0c8be..3c508160e 100644
--- a/lib/python/qmk/cli/console.py
+++ b/lib/python/qmk/cli/console.py
@@ -48,10 +48,11 @@ KNOWN_BOOTLOADERS = {
48 ('239A', '000C'): 'caterina: Adafruit Feather 32U4', 48 ('239A', '000C'): 'caterina: Adafruit Feather 32U4',
49 ('239A', '000D'): 'caterina: Adafruit ItsyBitsy 32U4 3v', 49 ('239A', '000D'): 'caterina: Adafruit ItsyBitsy 32U4 3v',
50 ('239A', '000E'): 'caterina: Adafruit ItsyBitsy 32U4 5v', 50 ('239A', '000E'): 'caterina: Adafruit ItsyBitsy 32U4 5v',
51 ('239A', '000E'): 'caterina: Adafruit ItsyBitsy 32U4 5v',
52 ('2A03', '0036'): 'caterina: Arduino Leonardo', 51 ('2A03', '0036'): 'caterina: Arduino Leonardo',
53 ('2A03', '0037'): 'caterina: Arduino Micro', 52 ('2A03', '0037'): 'caterina: Arduino Micro',
54 ('314B', '0106'): 'apm32-dfu: APM32 DFU ISP Mode' 53 ('314B', '0106'): 'apm32-dfu: APM32 DFU ISP Mode',
54 ('03EB', '2067'): 'qmk-hid: HID Bootloader',
55 ('03EB', '2045'): 'lufa-ms: LUFA Mass Storage Bootloader'
55} 56}
56 57
57 58
diff --git a/lib/python/qmk/cli/doctor/linux.py b/lib/python/qmk/cli/doctor/linux.py
index 8ea04cd69..6ce00f6ef 100644
--- a/lib/python/qmk/cli/doctor/linux.py
+++ b/lib/python/qmk/cli/doctor/linux.py
@@ -82,6 +82,10 @@ def check_udev_rules():
82 # dog hunter AG 82 # dog hunter AG
83 _udev_rule("2a03", "0036", 'ENV{ID_MM_DEVICE_IGNORE}="1"'), # Leonardo 83 _udev_rule("2a03", "0036", 'ENV{ID_MM_DEVICE_IGNORE}="1"'), # Leonardo
84 _udev_rule("2a03", "0037", 'ENV{ID_MM_DEVICE_IGNORE}="1"') # Micro 84 _udev_rule("2a03", "0037", 'ENV{ID_MM_DEVICE_IGNORE}="1"') # Micro
85 },
86 'hid-bootloader': {
87 _udev_rule("03eb", "2067"), # QMK HID
88 _udev_rule("16c0", "0478") # PJRC halfkay
85 } 89 }
86 } 90 }
87 91
diff --git a/util/udev/50-qmk.rules b/util/udev/50-qmk.rules
index 679fe4ced..db27d4dc8 100644
--- a/util/udev/50-qmk.rules
+++ b/util/udev/50-qmk.rules
@@ -63,3 +63,9 @@ SUBSYSTEMS=="usb", ATTRS{idVendor}=="2a03", ATTRS{idProduct}=="0037", TAG+="uacc
63 63
64# hid_listen 64# hid_listen
65KERNEL=="hidraw*", MODE="0660", GROUP="plugdev", TAG+="uaccess", TAG+="udev-acl" 65KERNEL=="hidraw*", MODE="0660", GROUP="plugdev", TAG+="uaccess", TAG+="udev-acl"
66
67# hid bootloaders
68## QMK HID
69SUBSYSTEMS=="usb", ATTRS{idVendor}=="03eb", ATTRS{idProduct}=="2067", TAG+="uaccess"
70## PJRC's HalfKay
71SUBSYSTEMS=="usb", ATTRS{idVendor}=="16c0", ATTRS{idProduct}=="0478", TAG+="uaccess"