diff options
| author | Ryan <fauxpark@gmail.com> | 2020-10-09 11:43:07 +1100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-10-09 11:43:07 +1100 |
| commit | 7229997e7d7e3519c09774020c7f3979541ea761 (patch) | |
| tree | 03194111710784bb1e24ef527ce3b690657ad228 /lib | |
| parent | 5fbd55999b7b121758441d1c22f66c7e8e41522b (diff) | |
CLI: Fix MCU lists for `qmk info` (#10574)
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/python/qmk/constants.py | 7 | ||||
| -rw-r--r-- | lib/python/qmk/info.py | 6 |
2 files changed, 6 insertions, 7 deletions
diff --git a/lib/python/qmk/constants.py b/lib/python/qmk/constants.py index 0450724df4..102111d7c4 100644 --- a/lib/python/qmk/constants.py +++ b/lib/python/qmk/constants.py @@ -9,7 +9,6 @@ QMK_FIRMWARE = Path.cwd() MAX_KEYBOARD_SUBFOLDERS = 5 # Supported processor types -ARM_PROCESSORS = 'cortex-m0', 'cortex-m0plus', 'cortex-m3', 'cortex-m4', 'MKL26Z64', 'MK20DX128', 'MK20DX256', 'STM32F042', 'STM32F072', 'STM32F103', 'STM32F303', 'STM32F401', 'STM32F411' -AVR_PROCESSORS = 'atmega16u2', 'atmega32u2', 'atmega16u4', 'atmega32u4', 'at90usb646', 'at90usb647', 'at90usb1286', 'at90usb1287', 'atmega328p', 'atmega32a', None -ALL_PROCESSORS = ARM_PROCESSORS + AVR_PROCESSORS -VUSB_PROCESSORS = 'atmega328p', 'atmega32a', 'atmega328', 'attiny85' +CHIBIOS_PROCESSORS = 'cortex-m0', 'cortex-m0plus', 'cortex-m3', 'cortex-m4', 'MKL26Z64', 'MK20DX128', 'MK20DX256', 'STM32F042', 'STM32F072', 'STM32F103', 'STM32F303', 'STM32F401', 'STM32F411' +LUFA_PROCESSORS = 'atmega16u2', 'atmega32u2', 'atmega16u4', 'atmega32u4', 'at90usb646', 'at90usb647', 'at90usb1286', 'at90usb1287', None +VUSB_PROCESSORS = 'atmega32a', 'atmega328p', 'atmega328', 'attiny85' diff --git a/lib/python/qmk/info.py b/lib/python/qmk/info.py index c780a0ab23..15a5c097a5 100644 --- a/lib/python/qmk/info.py +++ b/lib/python/qmk/info.py @@ -6,7 +6,7 @@ from pathlib import Path from milc import cli -from qmk.constants import ARM_PROCESSORS, AVR_PROCESSORS, VUSB_PROCESSORS +from qmk.constants import CHIBIOS_PROCESSORS, LUFA_PROCESSORS, VUSB_PROCESSORS from qmk.c_parse import find_layouts from qmk.keyboard import config_h, rules_mk from qmk.makefile import parse_rules_mk_file @@ -95,9 +95,9 @@ def _extract_rules_mk(info_data): rules = rules_mk(info_data['keyboard_folder']) mcu = rules.get('MCU') - if mcu in ARM_PROCESSORS: + if mcu in CHIBIOS_PROCESSORS: arm_processor_rules(info_data, rules) - elif mcu in AVR_PROCESSORS: + elif mcu in LUFA_PROCESSORS + VUSB_PROCESSORS: avr_processor_rules(info_data, rules) else: cli.log.warning("%s: Unknown MCU: %s" % (info_data['keyboard_folder'], mcu)) |