masq
/
qmk_firmware
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Add frameworking for development board presets (#16637) 

* Add frameworking for development board presets

* Update lib/python/qmk/info.py

Co-authored-by: Nick Brassel <nick@tzarc.org>

Co-authored-by: Nick Brassel <nick@tzarc.org>
This commit is contained in:
Joel Challis 2022-04-03 18:45:10 +01:00 committed by GitHub
parent 1660b2d2e2
commit c0ac3f7372
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 34 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
data/mappings/defaults.json Normal file
View File

@ -0,0 +1,17 @@
{
"development_board": {
"promicro": {
"processor": "atmega32u4",
"bootloader": "caterina"
},
"elite_c": {
"processor": "atmega32u4",
"bootloader": "atmel-dfu"
},
"proton_c": {
"processor": "STM32F303",
"bootloader": "stm32-dfu",
"board": "QMK_PROTON_C"
}
}
}

4
data/schemas/keyboard.jsonschema
View File

@ -12,6 +12,10 @@
"type": "string",
"format": "uri"
},
"development_board": {
"type": "string",
"enum": ["promicro", "elite_c", "proton_c"]
},
"processor": {
"type": "string",
"enum": ["cortex-m0", "cortex-m0plus", "cortex-m3", "cortex-m4", "MKL26Z64", "MK20DX128", "MK20DX256", "MK66FX1M0", "STM32F042", "STM32F072", "STM32F103", "STM32F303", "STM32F401", "STM32F405", "STM32F407", "STM32F411", "STM32F446", "STM32G431", "STM32G474", "STM32L412", "STM32L422", "STM32L432", "STM32L433", "STM32L442", "STM32L443", "GD32VF103", "WB32F3G71", "atmega16u2", "atmega32u2", "atmega16u4", "atmega32u4", "at90usb162", "at90usb646", "at90usb647", "at90usb1286", "at90usb1287", "atmega32a", "atmega328p", "atmega328", "attiny85", "unknown"]

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

@ -69,6 +69,7 @@ def info_json(keyboard):
# Merge in the data from info.json, config.h, and rules.mk
info_data = merge_info_jsons(keyboard, info_data)
info_data = _process_defaults(info_data)
info_data = _extract_rules_mk(info_data, rules_mk(str(keyboard)))
info_data = _extract_config_h(info_data, config_h(str(keyboard)))
@ -473,6 +474,18 @@ def _extract_config_h(info_data, config_c):
return info_data
def _process_defaults(info_data):
"""Process any additional defaults based on currently discovered information
"""
defaults_map = json_load(Path('data/mappings/defaults.json'))
for default_type in defaults_map.keys():
thing_map = defaults_map[default_type]
if default_type in info_data:
for key, value in thing_map.get(info_data[default_type], {}).items():
info_data[key] = value
return info_data
def _extract_rules_mk(info_data, rules):
"""Pull some keyboard information from existing rules.mk files
"""