diff options
| author | Erovia <erovia@users.noreply.github.com> | 2019-10-30 08:39:38 +0100 |
|---|---|---|
| committer | skullydazed <skullydazed@users.noreply.github.com> | 2020-01-11 12:18:30 -0800 |
| commit | e905d86fc5ba839595ba8472f99f74250b053a47 (patch) | |
| tree | 8ec0ab1395229eebcea994597857a0071f8f5e36 /lib/python | |
| parent | c6f47b5bd76eaa1b64cd4bc97dc0f59ed4d99eb7 (diff) | |
| download | qmk_firmware-e905d86fc5ba839595ba8472f99f74250b053a47.tar.gz qmk_firmware-e905d86fc5ba839595ba8472f99f74250b053a47.zip | |
Fix Pro Micro's and its bootloader's name
Diffstat (limited to 'lib/python')
| -rwxr-xr-x | lib/python/qmk/cli/doctor.py | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/lib/python/qmk/cli/doctor.py b/lib/python/qmk/cli/doctor.py index cbe44c9ae..80bd013b2 100755 --- a/lib/python/qmk/cli/doctor.py +++ b/lib/python/qmk/cli/doctor.py | |||
| @@ -57,7 +57,7 @@ def doctor(cli): | |||
| 57 | "input-club": {'SUBSYSTEMS=="usb", ATTRS{idVendor}=="1c11", MODE:="0666"'}, | 57 | "input-club": {'SUBSYSTEMS=="usb", ATTRS{idVendor}=="1c11", MODE:="0666"'}, |
| 58 | "stm32": {'SUBSYSTEMS=="usb", ATTRS{idVendor}=="1eaf", ATTRS{idProduct}=="0003", MODE:="0666"', | 58 | "stm32": {'SUBSYSTEMS=="usb", ATTRS{idVendor}=="1eaf", ATTRS{idProduct}=="0003", MODE:="0666"', |
| 59 | 'SUBSYSTEMS=="usb", ATTRS{idVendor}=="0483", ATTRS{idProduct}=="df11", MODE:="0666"'}, | 59 | 'SUBSYSTEMS=="usb", ATTRS{idVendor}=="0483", ATTRS{idProduct}=="df11", MODE:="0666"'}, |
| 60 | "catalina": {'ATTRS{idVendor}=="2a03", ENV{ID_MM_DEVICE_IGNORE}="1"', | 60 | "caterina": {'ATTRS{idVendor}=="2a03", ENV{ID_MM_DEVICE_IGNORE}="1"', |
| 61 | 'ATTRS{idVendor}=="2341", ENV{ID_MM_DEVICE_IGNORE}="1"'}} | 61 | 'ATTRS{idVendor}=="2341", ENV{ID_MM_DEVICE_IGNORE}="1"'}} |
| 62 | if os.path.exists(udev_dir): | 62 | if os.path.exists(udev_dir): |
| 63 | udev_rules = [rule for rule in glob.iglob(os.path.join(udev_dir, "*.rules")) if os.path.isfile(rule)] | 63 | udev_rules = [rule for rule in glob.iglob(os.path.join(udev_dir, "*.rules")) if os.path.isfile(rule)] |
| @@ -74,12 +74,12 @@ def doctor(cli): | |||
| 74 | for bootloader, rules in desired_rules.items(): | 74 | for bootloader, rules in desired_rules.items(): |
| 75 | if not rules.issubset(current_rules): | 75 | if not rules.issubset(current_rules): |
| 76 | # If the rules for catalina are not present, check if ModemManager is running | 76 | # If the rules for catalina are not present, check if ModemManager is running |
| 77 | if bootloader == "catalina": | 77 | if bootloader == "caterina": |
| 78 | if shutil.which("systemctl"): | 78 | if shutil.which("systemctl"): |
| 79 | mm_check = subprocess.run(["systemctl", "--quiet", "is-active", "ModemManager.service"], timeout=10) | 79 | mm_check = subprocess.run(["systemctl", "--quiet", "is-active", "ModemManager.service"], timeout=10) |
| 80 | if mm_check.returncode == 0: | 80 | if mm_check.returncode == 0: |
| 81 | ok = False | 81 | ok = False |
| 82 | cli.log.warn("{bg_yellow}Detected ModemManager without udev rules. Please either disable it or set the appropriate udev rules if you are using a Pro-Micro.") | 82 | cli.log.warn("{bg_yellow}Detected ModemManager without udev rules. Please either disable it or set the appropriate udev rules if you are using a Pro Micro.") |
| 83 | else: | 83 | else: |
| 84 | cli.log.warn("Can't find systemctl to check for ModemManager.") | 84 | cli.log.warn("Can't find systemctl to check for ModemManager.") |
| 85 | else: | 85 | else: |
