|
@@ -149,35 +149,41 @@ def check_udev_rules():
|
|
ok = True
|
|
ok = True
|
|
udev_dir = Path("/etc/udev/rules.d/")
|
|
udev_dir = Path("/etc/udev/rules.d/")
|
|
desired_rules = {
|
|
desired_rules = {
|
|
-
|
|
+ 'atmel-dfu': {
|
|
- _udev_rule("03EB", "2FEF"),
|
|
+ _udev_rule("03EB", "2FEF"),
|
|
- _udev_rule("03EB", "2FF0"),
|
|
+ _udev_rule("03EB", "2FF0"),
|
|
- _udev_rule("03EB", "2FF3"),
|
|
+ _udev_rule("03EB", "2FF3"),
|
|
- _udev_rule("03EB", "2FF4"),
|
|
+ _udev_rule("03EB", "2FF4"),
|
|
- _udev_rule("03EB", "2FF9"),
|
|
+ _udev_rule("03EB", "2FF9"),
|
|
- _udev_rule("03EB", "2FFB"),
|
|
+ _udev_rule("03EB", "2FFB")
|
|
-
|
|
+ },
|
|
- _udev_rule("1C11", "B007"),
|
|
+ 'kiibohd': {
|
|
-
|
|
+ _udev_rule("1C11", "B007")
|
|
- _udev_rule("1EAF", "0003"),
|
|
+ },
|
|
-
|
|
+ 'stm32': {
|
|
- _udev_rule("0483", "DF11"),
|
|
+ _udev_rule("1EAF", "0003"),
|
|
-
|
|
+ _udev_rule("0483", "DF11")
|
|
- _udev_rule("16C0", "05DF"),
|
|
+ },
|
|
-
|
|
+ 'bootloadhid': {
|
|
- _udev_rule("16C0", "05DC"),
|
|
+ _udev_rule("16C0", "05DF")
|
|
-
|
|
+ },
|
|
- _udev_rule("03EB", "6124"),
|
|
+ 'usbasploader': {
|
|
-
|
|
+ _udev_rule("16C0", "05DC")
|
|
- _udev_rule("1B4F", None, 'ENV{ID_MM_DEVICE_IGNORE}="1"'),
|
|
+ },
|
|
- _udev_rule("2341", None, 'ENV{ID_MM_DEVICE_IGNORE}="1"'),
|
|
+ 'massdrop': {
|
|
- _udev_rule("2A03", None, 'ENV{ID_MM_DEVICE_IGNORE}="1"')
|
|
+ _udev_rule("03EB", "6124")
|
|
|
|
+ },
|
|
|
|
+ 'caterina': {
|
|
|
|
+ _udev_rule("1B4F", None, 'ENV{ID_MM_DEVICE_IGNORE}="1"'),
|
|
|
|
+ _udev_rule("2341", None, 'ENV{ID_MM_DEVICE_IGNORE}="1"'),
|
|
|
|
+ _udev_rule("2A03", None, 'ENV{ID_MM_DEVICE_IGNORE}="1"')
|
|
|
|
+ }
|
|
}
|
|
}
|
|
|
|
|
|
|
|
|
|
deprecated_rules = {
|
|
deprecated_rules = {
|
|
- 'dfu': {_deprecated_udev_rule("03eb", "2ff4"), _deprecated_udev_rule("03eb", "2ffb"), _deprecated_udev_rule("03eb", "2ff0")},
|
|
+ 'atmel-dfu': {_deprecated_udev_rule("03eb", "2ff4"), _deprecated_udev_rule("03eb", "2ffb"), _deprecated_udev_rule("03eb", "2ff0")},
|
|
- 'input_club': {_deprecated_udev_rule("1c11")},
|
|
+ 'kiibohd': {_deprecated_udev_rule("1c11")},
|
|
'stm32': {_deprecated_udev_rule("1eaf", "0003"), _deprecated_udev_rule("0483", "df11")},
|
|
'stm32': {_deprecated_udev_rule("1eaf", "0003"), _deprecated_udev_rule("0483", "df11")},
|
|
'bootloadhid': {_deprecated_udev_rule("16c0", "05df")},
|
|
'bootloadhid': {_deprecated_udev_rule("16c0", "05df")},
|
|
'caterina': {'ATTRS{idVendor}=="2a03", ENV{ID_MM_DEVICE_IGNORE}="1"', 'ATTRS{idVendor}=="2341", ENV{ID_MM_DEVICE_IGNORE}="1"'},
|
|
'caterina': {'ATTRS{idVendor}=="2a03", ENV{ID_MM_DEVICE_IGNORE}="1"', 'ATTRS{idVendor}=="2341", ENV{ID_MM_DEVICE_IGNORE}="1"'},
|
|
@@ -196,17 +202,18 @@ def check_udev_rules():
|
|
current_rules.add(line)
|
|
current_rules.add(line)
|
|
|
|
|
|
|
|
|
|
- for rules in desired_rules.items():
|
|
+ for bootloader, rules in desired_rules.items():
|
|
|
|
|
|
- if check_modem_manager():
|
|
+ if bootloader == "caterina":
|
|
- ok = False
|
|
+ if check_modem_manager():
|
|
- cli.log.warn("{bg_yellow}Detected ModemManager without the necessary udev rules. Please either disable it or set the appropriate udev rules if you are using a Pro Micro.")
|
|
+ ok = False
|
|
|
|
+ cli.log.warn("{bg_yellow}Detected ModemManager without the necessary udev rules. Please either disable it or set the appropriate udev rules if you are using a Pro Micro.")
|
|
if not rules.issubset(current_rules):
|
|
if not rules.issubset(current_rules):
|
|
- for bootloader, rule in deprecated_rules.items():
|
|
+ deprecated_rule = deprecated_rules.get(bootloader)
|
|
- if rule and rule.issubset(current_rules):
|
|
+ if deprecated_rule and deprecated_rule.issubset(current_rules):
|
|
- cli.log.warn("{bg_yellow}Found old, deprecated udev rules for '%s' boards. The new rules on https://docs.qmk.fm/#/faq_build?id=linux-udev-rules offer better security with the same functionality.", bootloader)
|
|
+ cli.log.warn("{bg_yellow}Found old, deprecated udev rules for '%s' boards. The new rules on https://docs.qmk.fm/#/faq_build?id=linux-udev-rules offer better security with the same functionality.", bootloader)
|
|
- else:
|
|
+ else:
|
|
- cli.log.warn("{bg_yellow}Missing udev rules for '%s' boards. You'll need to use `sudo` in order to flash them.", bootloader)
|
|
+ cli.log.warn("{bg_yellow}Missing udev rules for '%s' boards. You'll need to use `sudo` in order to flash them.", bootloader)
|
|
|
|
|
|
return ok
|
|
return ok
|
|
|
|
|