diff options
| author | Joel Challis <git@zvecr.com> | 2023-01-07 17:05:53 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-01-07 17:05:53 +0000 |
| commit | 974a1eaf2a1076de0cc06deeefe12e15b7e209bc (patch) | |
| tree | 9b3f151fa17b2ce923dee1d28e126883c03645ce | |
| parent | 403c7eeb5c2dd5ff896a228fe3e7832a5c773340 (diff) | |
Ignore defaults.hjson values if already set (#19511)
* Ignore defaults.hjson values if already set * Add warning when nothing is merged
| -rw-r--r-- | keyboards/handwired/onekey/blackpill_f401_tinyuf2/info.json | 3 | ||||
| -rw-r--r-- | keyboards/handwired/onekey/blackpill_f411_tinyuf2/info.json | 3 | ||||
| -rw-r--r-- | lib/python/qmk/info.py | 12 |
3 files changed, 12 insertions, 6 deletions
diff --git a/keyboards/handwired/onekey/blackpill_f401_tinyuf2/info.json b/keyboards/handwired/onekey/blackpill_f401_tinyuf2/info.json index ada49d3849..6787be36af 100644 --- a/keyboards/handwired/onekey/blackpill_f401_tinyuf2/info.json +++ b/keyboards/handwired/onekey/blackpill_f401_tinyuf2/info.json @@ -1,8 +1,7 @@ { "keyboard_name": "Onekey Blackpill STM32F401 TinyUF2", - "processor": "STM32F401", + "development_board": "blackpill_f401", "bootloader": "tinyuf2", - "board": "BLACKPILL_STM32_F401", "matrix_pins": { "cols": ["B0"], "rows": ["A7"] diff --git a/keyboards/handwired/onekey/blackpill_f411_tinyuf2/info.json b/keyboards/handwired/onekey/blackpill_f411_tinyuf2/info.json index 3acccb7148..25d33a7dde 100644 --- a/keyboards/handwired/onekey/blackpill_f411_tinyuf2/info.json +++ b/keyboards/handwired/onekey/blackpill_f411_tinyuf2/info.json @@ -1,8 +1,7 @@ { "keyboard_name": "Onekey Blackpill STM32F411 TinyUF2", - "processor": "STM32F411", + "development_board": "blackpill_f411", "bootloader": "tinyuf2", - "board": "BLACKPILL_STM32_F411", "matrix_pins": { "cols": ["B0"], "rows": ["A7"] diff --git a/lib/python/qmk/info.py b/lib/python/qmk/info.py index 7e588b5182..86b1e2c063 100644 --- a/lib/python/qmk/info.py +++ b/lib/python/qmk/info.py @@ -561,8 +561,16 @@ def _process_defaults(info_data): 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 + merged_count = 0 + 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 |