diff options
| author | Joel Challis <git@zvecr.com> | 2023-01-19 00:27:11 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-01-19 00:27:11 +0000 |
| commit | 0b25528b6bc433e8609d4e12fb108b4ee7865197 (patch) | |
| tree | 677ddd4d7aefbd644d4b8d60323a910670f0cd02 | |
| parent | 0ce3f6bcfe8241e51dd6936d24e6a88c907c535d (diff) | |
Fix 'No LAYOUTs defined' check (#19537)
| -rw-r--r-- | data/schemas/keyboard.jsonschema | 3 | ||||
| -rw-r--r-- | lib/python/qmk/info.py | 5 |
2 files changed, 7 insertions, 1 deletions
diff --git a/data/schemas/keyboard.jsonschema b/data/schemas/keyboard.jsonschema index 0002898327..f1a1bb87c0 100644 --- a/data/schemas/keyboard.jsonschema +++ b/data/schemas/keyboard.jsonschema @@ -257,6 +257,9 @@ "c_macro": { "type": "boolean" }, + "json_layout": { + "type": "boolean" + }, "layout": { "type": "array", "items": { diff --git a/lib/python/qmk/info.py b/lib/python/qmk/info.py index 789d05850c..e73d825696 100644 --- a/lib/python/qmk/info.py +++ b/lib/python/qmk/info.py @@ -52,7 +52,7 @@ def _validate(keyboard, info_data): community_layouts_names = list(map(lambda layout: f'LAYOUT_{layout}', community_layouts)) # Make sure we have at least one layout - if len(layouts) == 0: + if len(layouts) == 0 or all(not layout.get('json_layout', False) for layout in layouts.values()): _log_error(info_data, 'No LAYOUTs defined! Need at least one layout defined in info.json.') # Providing only LAYOUT_all "because I define my layouts in a 3rd party tool" @@ -107,6 +107,7 @@ def info_json(keyboard): for layout_name, layout_json in layouts.items(): if not layout_name.startswith('LAYOUT_kc'): layout_json['c_macro'] = True + layout_json['json_layout'] = False info_data['layouts'][layout_name] = layout_json # Merge in the data from info.json, config.h, and rules.mk @@ -824,6 +825,7 @@ def merge_info_jsons(keyboard, info_data): msg = 'Number of keys for %s does not match! info.json specifies %d keys, C macro specifies %d' _log_error(info_data, msg % (layout_name, len(layout['layout']), len(info_data['layouts'][layout_name]['layout']))) else: + info_data['layouts'][layout_name]['json_layout'] = True for new_key, existing_key in zip(layout['layout'], info_data['layouts'][layout_name]['layout']): existing_key.update(new_key) else: @@ -831,6 +833,7 @@ def merge_info_jsons(keyboard, info_data): _log_error(info_data, f'Layout "{layout_name}" has no "matrix" definition in either "info.json" or "<keyboard>.h"!') else: layout['c_macro'] = False + layout['json_layout'] = True info_data['layouts'][layout_name] = layout # Update info_data with the new data |