First pass at supporting keyboard overrides at all levels

2021-09-09 11:13:50 -07:00
parent 93387f8941
commit 3f9e745b71
13 changed files with 104 additions and 87 deletions
--- a/lib/python/qmk/cli/format/json.py
+++ b/lib/python/qmk/cli/format/json.py
@@ -42,7 +42,7 @@ def format_json(cli):
    if json_encoder == KeymapJSONEncoder and 'layout' in json_file:
        # Attempt to format the keycodes.
        layout = json_file['layout']
-        info_data = info_json(json_file['keyboard'])
+        info_data = info_json(json_file['keyboard'], overrides=json_file.get('keyboard_overrides'))

        if layout in info_data.get('layout_aliases', {}):
            layout = json_file['layout'] = info_data['layout_aliases'][layout]