varl/qmk_firmware
1
0
Fork 0
forked from forks/qmk_firmware
Code Pull requests Activity

Ignore defaults.hjson values if already set (#19511)

Browse source 
* Ignore defaults.hjson values if already set

* Add warning when nothing is merged
This commit is contained in:
Joel Challis 2023-01-07 17:05:53 +00:00 committed by GitHub
parent 403c7eeb5c
commit 974a1eaf2a
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 12 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
keyboards/handwired/onekey/blackpill_f401_tinyuf2/info.json
View file

@ -1,8 +1,7 @@
{ {
"keyboard_name": "Onekey Blackpill STM32F401 TinyUF2", "keyboard_name": "Onekey Blackpill STM32F401 TinyUF2",
"processor": "STM32F401", "development_board": "blackpill_f401",
"bootloader": "tinyuf2", "bootloader": "tinyuf2",
"board": "BLACKPILL_STM32_F401",
"matrix_pins": { "matrix_pins": {
"cols": ["B0"], "cols": ["B0"],
"rows": ["A7"] "rows": ["A7"]

3
keyboards/handwired/onekey/blackpill_f411_tinyuf2/info.json
View file

@ -1,8 +1,7 @@
{ {
"keyboard_name": "Onekey Blackpill STM32F411 TinyUF2", "keyboard_name": "Onekey Blackpill STM32F411 TinyUF2",
"processor": "STM32F411", "development_board": "blackpill_f411",
"bootloader": "tinyuf2", "bootloader": "tinyuf2",
"board": "BLACKPILL_STM32_F411",
"matrix_pins": { "matrix_pins": {
"cols": ["B0"], "cols": ["B0"],
"rows": ["A7"] "rows": ["A7"]

12
lib/python/qmk/info.py
View file

@ -561,8 +561,16 @@ def _process_defaults(info_data):
for default_type in defaults_map.keys(): for default_type in defaults_map.keys():
thing_map = defaults_map[default_type] thing_map = defaults_map[default_type]
if default_type in info_data: if default_type in info_data:
for key, value in thing_map.get(info_data[default_type], {}).items(): merged_count = 0
info_data[key] = value thing_items = thing_map.get(info_data[default_type], {}).items()
for key, value in thing_items:
if key not in info_data:
info_data[key] = value
merged_count += 1
if merged_count == 0 and len(thing_items) > 0:
_log_warning(info_data, 'All defaults for \'%s\' were skipped, potential redundant config or misconfiguration detected' % (default_type))
return info_data return info_data