masq
/
qmk_firmware
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix 'No LAYOUTs defined' check (#19537)

This commit is contained in:
Joel Challis 2023-01-19 00:27:11 +00:00 committed by GitHub
parent 0ce3f6bcfe
commit 0b25528b6b
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
data/schemas/keyboard.jsonschema
View File

@ -257,6 +257,9 @@
"c_macro": { "c_macro": {
"type": "boolean" "type": "boolean"
}, },
"json_layout": {
"type": "boolean"
},
"layout": { "layout": {
"type": "array", "type": "array",
"items": { "items": {

5
lib/python/qmk/info.py
View File

@ -52,7 +52,7 @@ def _validate(keyboard, info_data):
community_layouts_names = list(map(lambda layout: f'LAYOUT_{layout}', community_layouts)) community_layouts_names = list(map(lambda layout: f'LAYOUT_{layout}', community_layouts))
# Make sure we have at least one layout # 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.') _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" # 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(): for layout_name, layout_json in layouts.items():
if not layout_name.startswith('LAYOUT_kc'): if not layout_name.startswith('LAYOUT_kc'):
layout_json['c_macro'] = True layout_json['c_macro'] = True
layout_json['json_layout'] = False
info_data['layouts'][layout_name] = layout_json info_data['layouts'][layout_name] = layout_json
# Merge in the data from info.json, config.h, and rules.mk # 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' 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']))) _log_error(info_data, msg % (layout_name, len(layout['layout']), len(info_data['layouts'][layout_name]['layout'])))
else: else:
info_data['layouts'][layout_name]['json_layout'] = True
for new_key, existing_key in zip(layout['layout'], info_data['layouts'][layout_name]['layout']): for new_key, existing_key in zip(layout['layout'], info_data['layouts'][layout_name]['layout']):
existing_key.update(new_key) existing_key.update(new_key)
else: 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"!') _log_error(info_data, f'Layout "{layout_name}" has no "matrix" definition in either "info.json" or "<keyboard>.h"!')
else: else:
layout['c_macro'] = False layout['c_macro'] = False
layout['json_layout'] = True
info_data['layouts'][layout_name] = layout info_data['layouts'][layout_name] = layout
# Update info_data with the new data # Update info_data with the new data