masq
/
qmk_firmware
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Simplify doctor rule checking

This commit is contained in:
fauxpark 2020-07-11 12:52:36 +10:00
parent 07e37c857c
commit 510138f525
1 changed files with 32 additions and 35 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

67
lib/python/qmk/cli/doctor.py
View File

@ -149,31 +149,29 @@ 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 = {
'qmk': { # Atmel DFU
# Atmel DFU _udev_rule("03EB", "2FEF"), # ATmega16U2
_udev_rule("03EB", "2FEF"), # ATmega16U2 _udev_rule("03EB", "2FF0"), # ATmega32U2
_udev_rule("03EB", "2FF0"), # ATmega32U2 _udev_rule("03EB", "2FF3"), # ATmega16U4
_udev_rule("03EB", "2FF3"), # ATmega16U4 _udev_rule("03EB", "2FF4"), # ATmega32U4
_udev_rule("03EB", "2FF4"), # ATmega32U4 _udev_rule("03EB", "2FF9"), # AT90USB64
_udev_rule("03EB", "2FF9"), # AT90USB64 _udev_rule("03EB", "2FFB"), # AT90USB128
_udev_rule("03EB", "2FFB"), # AT90USB128 # Kiibohd bootloader
# Kiibohd bootloader _udev_rule("1C11", "B007"),
_udev_rule("1C11", "B007"), # STM32duino
# STM32duino _udev_rule("1EAF", "0003"),
_udev_rule("1EAF", "0003"), # STM32 DFU
# STM32 DFU _udev_rule("0483", "DF11"),
_udev_rule("0483", "DF11"), # BootloadHID
# BootloadHID _udev_rule("16C0", "05DF"),
_udev_rule("16C0", "05DF"), # USBAspLoader
# USBAspLoader _udev_rule("16C0", "05DC"),
_udev_rule("16C0", "05DC"), # Atmel SAM-Ba (Massdrop)
# Atmel SAM-Ba (Massdrop) _udev_rule("03EB", "6124"),
_udev_rule("03EB", "6124"), # Caterina (Pro Micro)
# Caterina (Pro Micro) _udev_rule("1B4F", None, 'ENV{ID_MM_DEVICE_IGNORE}="1"'), # Sparkfun
_udev_rule("1B4F", None, 'ENV{ID_MM_DEVICE_IGNORE}="1"'), # Sparkfun _udev_rule("2341", None, 'ENV{ID_MM_DEVICE_IGNORE}="1"'), # Arduino SA
_udev_rule("2341", None, 'ENV{ID_MM_DEVICE_IGNORE}="1"'), # Arduino SA _udev_rule("2A03", None, 'ENV{ID_MM_DEVICE_IGNORE}="1"') # dog hunter AG
_udev_rule("2A03", None, 'ENV{ID_MM_DEVICE_IGNORE}="1"') # dog hunter AG
}
} }
# These rules are no longer recommended, only use them to check for their presence. # These rules are no longer recommended, only use them to check for their presence.
@ -197,18 +195,17 @@ def check_udev_rules():
current_rules.add(line) current_rules.add(line)
# Check if the desired rules are among the currently present rules # Check if the desired rules are among the currently present rules
for bootloader, rules in desired_rules.items(): for rules in desired_rules.items():
# For caterina, check if ModemManager is running # For caterina, check if ModemManager is running
if bootloader == "caterina": if check_modem_manager():
if check_modem_manager(): ok = False
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.")
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):
deprecated_rule = deprecated_rules.get(bootloader) for bootloader, rules in deprecated_rules.items():
if deprecated_rule and deprecated_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