andrejl
/
qmk-dactyl-manuform-a
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

CLI: Fix MCU lists for `qmk info` (#10574)

master
Ryan 2020-10-09 11:43:07 +11:00 committed by GitHub
parent 5fbd55999b
commit 7229997e7d
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 6 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
lib/python/qmk/constants.py
View File

@ -9,7 +9,6 @@ QMK_FIRMWARE = Path.cwd()
MAX_KEYBOARD_SUBFOLDERS = 5 MAX_KEYBOARD_SUBFOLDERS = 5
# Supported processor types # Supported processor types
ARM_PROCESSORS = 'cortex-m0', 'cortex-m0plus', 'cortex-m3', 'cortex-m4', 'MKL26Z64', 'MK20DX128', 'MK20DX256', 'STM32F042', 'STM32F072', 'STM32F103', 'STM32F303', 'STM32F401', 'STM32F411' CHIBIOS_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 LUFA_PROCESSORS = 'atmega16u2', 'atmega32u2', 'atmega16u4', 'atmega32u4', 'at90usb646', 'at90usb647', 'at90usb1286', 'at90usb1287', None
ALL_PROCESSORS = ARM_PROCESSORS + AVR_PROCESSORS VUSB_PROCESSORS = 'atmega32a', 'atmega328p', 'atmega328', 'attiny85'
VUSB_PROCESSORS = 'atmega328p', 'atmega32a', 'atmega328', 'attiny85'

6
lib/python/qmk/info.py
View File

@ -6,7 +6,7 @@ from pathlib import Path
from milc import cli 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.c_parse import find_layouts
from qmk.keyboard import config_h, rules_mk from qmk.keyboard import config_h, rules_mk
from qmk.makefile import parse_rules_mk_file 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']) rules = rules_mk(info_data['keyboard_folder'])
mcu = rules.get('MCU') mcu = rules.get('MCU')
if mcu in ARM_PROCESSORS: if mcu in CHIBIOS_PROCESSORS:
arm_processor_rules(info_data, rules) arm_processor_rules(info_data, rules)
elif mcu in AVR_PROCESSORS: elif mcu in LUFA_PROCESSORS + VUSB_PROCESSORS:
avr_processor_rules(info_data, rules) avr_processor_rules(info_data, rules)
else: else:
cli.log.warning("%s: Unknown MCU: %s" % (info_data['keyboard_folder'], mcu)) cli.log.warning("%s: Unknown MCU: %s" % (info_data['keyboard_folder'], mcu))