aboutsummaryrefslogtreecommitdiff
path: root/lib/python/qmk/info.py
diff options
context:
space:
mode:
Diffstat (limited to 'lib/python/qmk/info.py')
-rw-r--r--lib/python/qmk/info.py55
1 files changed, 44 insertions, 11 deletions
diff --git a/lib/python/qmk/info.py b/lib/python/qmk/info.py
index 38ca89697c..b4fa481b1b 100644
--- a/lib/python/qmk/info.py
+++ b/lib/python/qmk/info.py
@@ -99,6 +99,13 @@ def _validate_build_target(keyboard, info_data):
if info_file != keyboard_json_path:
_log_error(info_data, f'Invalid keyboard.json location detected: {info_file}.')
+ # No keyboard.json next to info.json
+ for conf_file in config_files:
+ if conf_file.name == 'keyboard.json':
+ info_file = conf_file.parent / 'info.json'
+ if info_file.exists():
+ _log_error(info_data, f'Invalid info.json location detected: {info_file}.')
+
# Moving forward keyboard.json should be used as a build target
if keyboard_json_count == 0:
_log_warning(info_data, 'Build marker "keyboard.json" not found.')
@@ -216,12 +223,6 @@ def _validate(keyboard, info_data):
def info_json(keyboard, force_layout=None):
"""Generate the info.json data for a specific keyboard.
"""
- cur_dir = Path('keyboards')
- root_rules_mk = parse_rules_mk_file(cur_dir / keyboard / 'rules.mk')
-
- if 'DEFAULT_FOLDER' in root_rules_mk:
- keyboard = root_rules_mk['DEFAULT_FOLDER']
-
info_data = {
'keyboard_name': str(keyboard),
'keyboard_folder': str(keyboard),
@@ -253,6 +254,7 @@ def info_json(keyboard, force_layout=None):
# Ensure that we have various calculated values
info_data = _matrix_size(info_data)
info_data = _joystick_axis_count(info_data)
+ info_data = _matrix_masked(info_data)
# Merge in data from <keyboard.c>
info_data = _extract_led_config(info_data, str(keyboard))
@@ -829,6 +831,25 @@ def _joystick_axis_count(info_data):
return info_data
+def _matrix_masked(info_data):
+ """"Add info_data['matrix_pins.masked'] if required"""
+ mask_required = False
+
+ if 'matrix_grid' in info_data.get('dip_switch', {}):
+ mask_required = True
+ if 'matrix_grid' in info_data.get('split', {}).get('handedness', {}):
+ mask_required = True
+
+ if mask_required:
+ if 'masked' not in info_data.get('matrix_pins', {}):
+ if 'matrix_pins' not in info_data:
+ info_data['matrix_pins'] = {}
+
+ info_data['matrix_pins']['masked'] = True
+
+ return info_data
+
+
def _check_matrix(info_data):
"""Check the matrix to ensure that row/column count is consistent.
"""
@@ -998,11 +1019,6 @@ def find_info_json(keyboard):
keyboard_parent = keyboard_path.parent
info_jsons = [keyboard_path / 'info.json', keyboard_path / 'keyboard.json']
- # Add DEFAULT_FOLDER before parents, if present
- rules = rules_mk(keyboard)
- if 'DEFAULT_FOLDER' in rules:
- info_jsons.append(Path(rules['DEFAULT_FOLDER']) / 'info.json')
-
# Add in parent folders for least specific
for _ in range(5):
if keyboard_parent == base_path:
@@ -1052,3 +1068,20 @@ def keymap_json(keyboard, keymap, force_layout=None):
_extract_config_h(kb_info_json, parse_config_h_file(keymap_config))
return kb_info_json
+
+
+def get_modules(keyboard, keymap_filename):
+ """Get the modules for a keyboard/keymap.
+ """
+ modules = []
+
+ kb_info_json = info_json(keyboard)
+ modules.extend(kb_info_json.get('modules', []))
+
+ if keymap_filename:
+ keymap_json = parse_configurator_json(keymap_filename)
+
+ if keymap_json:
+ modules.extend(keymap_json.get('modules', []))
+
+ return list(dict.fromkeys(modules)) # remove dupes