qmk/qmk_firmware
1
0
Fork 0
mirror of https://github.com/qmk/qmk_firmware.git synced 2026-09-29 21:38:47 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/develop' into xap

Browse Source
This commit is contained in:
QMK Bot
2026-02-17 22:24:57 +00:00
parent c5addcbd5d cde41cf611
commit 679749fabf
2 changed files with 0 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
lib/python/qmk/cli/info.py
-1
View File
@@ -24,7 +24,6 @@ def _strip_api_content(info_json):
info_json.pop('platform_key', None) info_json.pop('platform_key', None)
info_json.pop('processor_type', None) info_json.pop('processor_type', None)
info_json.pop('protocol', None) info_json.pop('protocol', None)
info_json.pop('config_h_features', None)
info_json.pop('keymaps', None) info_json.pop('keymaps', None)
info_json.pop('keyboard_folder', None) info_json.pop('keyboard_folder', None)
info_json.pop('parse_errors', None) info_json.pop('parse_errors', None)
lib/python/qmk/info.py
-4
View File
@@ -324,9 +324,6 @@ def _extract_features(info_data, rules):
if key in ['lto']: if key in ['lto']:
continue continue
if 'config_h_features' not in info_data:
info_data['config_h_features'] = {}
if 'features' not in info_data: if 'features' not in info_data:
info_data['features'] = {} info_data['features'] = {}
@@ -334,7 +331,6 @@ def _extract_features(info_data, rules):
_log_warning(info_data, 'Feature %s is specified in both info.json (%s) and rules.mk (%s). The rules.mk value wins.' % (key, info_data['features'], value)) _log_warning(info_data, 'Feature %s is specified in both info.json (%s) and rules.mk (%s). The rules.mk value wins.' % (key, info_data['features'], value))
info_data['features'][key] = value info_data['features'][key] = value
info_data['config_h_features'][key] = value
return info_data return info_data