summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRyan <fauxpark@gmail.com>2020-10-09 11:43:07 +1100
committerDrashna Jael're <drashna@live.com>2021-01-12 22:43:31 -0800
commit9daa7dcb374ea6174420a03f10921caf0c5ed36e (patch)
tree099f6d4ee63eb1699640a136f0b03c389138a030
parent71c1d5a0117db2fdbe4d6559af0668562c757bfc (diff)
CLI: Fix MCU lists for `qmk info` (#10574)
-rw-r--r--lib/python/qmk/constants.py7
-rw-r--r--lib/python/qmk/info.py6
2 files changed, 6 insertions, 7 deletions
diff --git a/lib/python/qmk/constants.py b/lib/python/qmk/constants.py
index 0a4708e4ce..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 = 'at90usb1286', 'at90usb646', 'atmega16u2', 'atmega328p', 'atmega32a', 'atmega32u2', 'atmega32u4', 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))