aboutsummaryrefslogtreecommitdiff
path: root/lib/python
diff options
context:
space:
mode:
authorRyan <fauxpark@gmail.com>2020-10-09 11:43:07 +1100
committerGitHub <noreply@github.com>2020-10-09 11:43:07 +1100
commit7229997e7d7e3519c09774020c7f3979541ea761 (patch)
tree03194111710784bb1e24ef527ce3b690657ad228 /lib/python
parent5fbd55999b7b121758441d1c22f66c7e8e41522b (diff)
downloadqmk_firmware-7229997e7d7e3519c09774020c7f3979541ea761.tar.gz
qmk_firmware-7229997e7d7e3519c09774020c7f3979541ea761.zip
CLI: Fix MCU lists for `qmk info` (#10574)
Diffstat (limited to 'lib/python')
-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 0450724df..102111d7c 100644
--- a/lib/python/qmk/constants.py
+++ b/lib/python/qmk/constants.py
@@ -9,7 +9,6 @@ QMK_FIRMWARE = Path.cwd()
9MAX_KEYBOARD_SUBFOLDERS = 5 9MAX_KEYBOARD_SUBFOLDERS = 5
10 10
11# Supported processor types 11# Supported processor types
12ARM_PROCESSORS = 'cortex-m0', 'cortex-m0plus', 'cortex-m3', 'cortex-m4', 'MKL26Z64', 'MK20DX128', 'MK20DX256', 'STM32F042', 'STM32F072', 'STM32F103', 'STM32F303', 'STM32F401', 'STM32F411' 12CHIBIOS_PROCESSORS = 'cortex-m0', 'cortex-m0plus', 'cortex-m3', 'cortex-m4', 'MKL26Z64', 'MK20DX128', 'MK20DX256', 'STM32F042', 'STM32F072', 'STM32F103', 'STM32F303', 'STM32F401', 'STM32F411'
13AVR_PROCESSORS = 'atmega16u2', 'atmega32u2', 'atmega16u4', 'atmega32u4', 'at90usb646', 'at90usb647', 'at90usb1286', 'at90usb1287', 'atmega328p', 'atmega32a', None 13LUFA_PROCESSORS = 'atmega16u2', 'atmega32u2', 'atmega16u4', 'atmega32u4', 'at90usb646', 'at90usb647', 'at90usb1286', 'at90usb1287', None
14ALL_PROCESSORS = ARM_PROCESSORS + AVR_PROCESSORS 14VUSB_PROCESSORS = 'atmega32a', 'atmega328p', 'atmega328', 'attiny85'
15VUSB_PROCESSORS = 'atmega328p', 'atmega32a', 'atmega328', 'attiny85'
diff --git a/lib/python/qmk/info.py b/lib/python/qmk/info.py
index c780a0ab2..15a5c097a 100644
--- a/lib/python/qmk/info.py
+++ b/lib/python/qmk/info.py
@@ -6,7 +6,7 @@ from pathlib import Path
6 6
7from milc import cli 7from milc import cli
8 8
9from qmk.constants import ARM_PROCESSORS, AVR_PROCESSORS, VUSB_PROCESSORS 9from qmk.constants import CHIBIOS_PROCESSORS, LUFA_PROCESSORS, VUSB_PROCESSORS
10from qmk.c_parse import find_layouts 10from qmk.c_parse import find_layouts
11from qmk.keyboard import config_h, rules_mk 11from qmk.keyboard import config_h, rules_mk
12from qmk.makefile import parse_rules_mk_file 12from qmk.makefile import parse_rules_mk_file
@@ -95,9 +95,9 @@ def _extract_rules_mk(info_data):
95 rules = rules_mk(info_data['keyboard_folder']) 95 rules = rules_mk(info_data['keyboard_folder'])
96 mcu = rules.get('MCU') 96 mcu = rules.get('MCU')
97 97
98 if mcu in ARM_PROCESSORS: 98 if mcu in CHIBIOS_PROCESSORS:
99 arm_processor_rules(info_data, rules) 99 arm_processor_rules(info_data, rules)
100 elif mcu in AVR_PROCESSORS: 100 elif mcu in LUFA_PROCESSORS + VUSB_PROCESSORS:
101 avr_processor_rules(info_data, rules) 101 avr_processor_rules(info_data, rules)
102 else: 102 else:
103 cli.log.warning("%s: Unknown MCU: %s" % (info_data['keyboard_folder'], mcu)) 103 cli.log.warning("%s: Unknown MCU: %s" % (info_data['keyboard_folder'], mcu))