First pass at supporting keyboard overrides at all levels

lib/python/qmk/cli/generate/config_h.py

@@ -5,10 +5,9 @@ from pathlib import Path
 from dotty_dict import dotty
 from milc import cli
 
-from qmk.info import info_json
-from qmk.json_schema import json_load, validate
+from qmk.info import info_json, get_keyboard_overrides
+from qmk.json_schema import json_load
 from qmk.keyboard import keyboard_completer, keyboard_folder
-from qmk.keymap import locate_keymap
 from qmk.path import normpath
 
 
@@ -158,19 +157,11 @@ def generate_split_config(kb_info_json, config_h_lines):
 @cli.argument('-o', '--output', arg_only=True, type=normpath, help='File to write to')
 @cli.argument('-q', '--quiet', arg_only=True, action='store_true', help="Quiet mode, only output error messages")
 @cli.argument('-kb', '--keyboard', arg_only=True, type=keyboard_folder, completer=keyboard_completer, required=True, help='Keyboard to generate config.h for.')
-@cli.argument('-km', '--keymap', arg_only=True, help='Keymap to generate config.h for.')
 @cli.subcommand('Used by the make system to generate info_config.h from info.json', hidden=True)
 def generate_config_h(cli):
     """Generates the info_config.h file.
     """
-    # Determine our keyboard/keymap
-    if cli.args.keymap:
-        km = locate_keymap(cli.args.keyboard, cli.args.keymap)
-        km_json = json_load(km)
-        validate(km_json, 'qmk.keymap.v1')
-        kb_info_json = dotty(km_json.get('config', {}))
-    else:
-        kb_info_json = dotty(info_json(cli.args.keyboard))
+    kb_info_json = dotty(info_json(cli.args.keyboard, overrides=get_keyboard_overrides(cli.args.keyboard)))
 
     # Build the info_config.h file.
     config_h_lines = ['/* This file was generated by `qmk generate-config-h`. Do not edit or copy.' ' */', '', '#pragma once']

lib/python/qmk/cli/generate/dfu_header.py

@@ -4,7 +4,7 @@ from dotty_dict import dotty
 from milc import cli
 
 from qmk.decorators import automagic_keyboard
-from qmk.info import info_json
+from qmk.info import info_json, get_keyboard_overrides
 from qmk.path import is_keyboard, normpath
 from qmk.keyboard import keyboard_completer
 
@@ -28,7 +28,7 @@ def generate_dfu_header(cli):
         return False
 
     # Build the Keyboard.h file.
-    kb_info_json = dotty(info_json(cli.config.generate_dfu_header.keyboard))
+    kb_info_json = dotty(info_json(cli.config.generate_dfu_header.keyboard, overrides=get_keyboard_overrides(cli.args.keyboard)))
 
     keyboard_h_lines = ['/* This file was generated by `qmk generate-dfu-header`. Do not edit or copy.' ' */', '', '#pragma once']
     keyboard_h_lines.append(f'#define MANUFACTURER {kb_info_json["manufacturer"]}')

lib/python/qmk/cli/generate/info_json.py

@@ -9,7 +9,7 @@ from jsonschema import Draft7Validator, RefResolver, validators
 from milc import cli
 from pathlib import Path
 
-from qmk.decorators import automagic_keyboard, automagic_keymap
+from qmk.decorators import automagic_keyboard
 from qmk.info import info_json
 from qmk.json_encoders import InfoJSONEncoder
 from qmk.json_schema import compile_schema_store
@@ -46,12 +46,10 @@ def strip_info_json(kb_info_json):
 
 
 @cli.argument('-kb', '--keyboard', type=keyboard_folder, completer=keyboard_completer, help='Keyboard to show info for.')
-@cli.argument('-km', '--keymap', help='Show the layers for a JSON keymap too.')
 @cli.argument('-o', '--output', arg_only=True, completer=FilesCompleter, help='Write the output the specified file, overwriting if necessary.')
 @cli.argument('-ow', '--overwrite', arg_only=True, action='store_true', help='Overwrite the existing info.json. (Overrides the location of --output)')
 @cli.subcommand('Generate an info.json file for a keyboard.', hidden=False if cli.config.user.developer else True)
 @automagic_keyboard
-@automagic_keymap
 def generate_info_json(cli):
     """Generate an info.json file for a keyboard
     """

lib/python/qmk/cli/generate/keyboard_h.py

@@ -2,7 +2,7 @@
 """
 from milc import cli
 
-from qmk.info import info_json
+from qmk.info import info_json, get_keyboard_overrides
 from qmk.keyboard import keyboard_completer, keyboard_folder
 from qmk.path import normpath
 
@@ -11,7 +11,7 @@ def would_populate_layout_h(keyboard):
     """Detect if a given keyboard is doing data driven layouts
     """
     # Build the info.json file
-    kb_info_json = info_json(keyboard)
+    kb_info_json = info_json(keyboard, overrides=get_keyboard_overrides(keyboard))
 
     for layout_name in kb_info_json['layouts']:
         if kb_info_json['layouts'][layout_name]['c_macro']:

lib/python/qmk/cli/generate/layouts.py

@@ -4,7 +4,7 @@ from milc import cli
 
 from qmk.constants import COL_LETTERS, ROW_LETTERS
 from qmk.decorators import automagic_keyboard, automagic_keymap
-from qmk.info import info_json
+from qmk.info import info_json, get_keyboard_overrides
 from qmk.keyboard import keyboard_completer, keyboard_folder
 from qmk.path import is_keyboard, normpath
 
@@ -35,7 +35,7 @@ def generate_layouts(cli):
         return False
 
     # Build the info.json file
-    kb_info_json = info_json(cli.config.generate_layouts.keyboard)
+    kb_info_json = info_json(cli.config.generate_layouts.keyboard, overrides=get_keyboard_overrides(cli.config.generate_layouts.keyboard))
 
     # Build the layouts.h file.
     layouts_h_lines = ['/* This file was generated by `qmk generate-layouts`. Do not edit or copy.' ' */', '', '#pragma once']

lib/python/qmk/cli/generate/rules_mk.py

@@ -5,10 +5,9 @@ from pathlib import Path
 from dotty_dict import dotty
 from milc import cli
 
-from qmk.info import info_json
-from qmk.json_schema import json_load, validate
+from qmk.info import info_json, get_keyboard_overrides
+from qmk.json_schema import json_load
 from qmk.keyboard import keyboard_completer, keyboard_folder
-from qmk.keymap import locate_keymap
 from qmk.path import normpath
 
 
@@ -40,21 +39,12 @@ def process_mapping_rule(kb_info_json, rules_key, info_dict):
 @cli.argument('-q', '--quiet', arg_only=True, action='store_true', help="Quiet mode, only output error messages")
 @cli.argument('-e', '--escape', arg_only=True, action='store_true', help="Escape spaces in quiet mode")
 @cli.argument('-kb', '--keyboard', arg_only=True, type=keyboard_folder, completer=keyboard_completer, required=True, help='Keyboard to generate rules.mk for.')
-@cli.argument('-km', '--keymap', arg_only=True, help='Keymap to generate rules.mk for.')
 @cli.subcommand('Used by the make system to generate rules.mk from info.json', hidden=True)
 def generate_rules_mk(cli):
     """Generates a rules.mk file from info.json.
     """
-    # Determine our keyboard/keymap
-    if cli.args.keymap:
-        km = locate_keymap(cli.args.keyboard, cli.args.keymap)
-        km_json = json_load(km)
-        validate(km_json, 'qmk.keymap.v1')
-        kb_info_json = dotty(km_json.get('config', {}))
-    else:
-        kb_info_json = dotty(info_json(cli.args.keyboard))
-
     info_rules_map = json_load(Path('data/mappings/info_rules.json'))
+    kb_info_json = dotty(info_json(cli.args.keyboard, overrides=get_keyboard_overrides(cli.args.keyboard)))
     rules_mk_lines = ['# This file was generated by `qmk generate-rules-mk`. Do not edit or copy.', '']
 
     # Iterate through the info_rules map to generate basic rules