Merge remote-tracking branch 'origin/master' into develop

This commit is contained in:
QMK Bot 2024-03-12 04:28:31 +00:00
commit 2756912a0d

View File

@ -78,7 +78,7 @@ def _find_invalid_encoder_index(info_data):
return ret return ret
def _validate_layouts(keyboard, info_data): def _validate_layouts(keyboard, info_data): # noqa C901
"""Non schema checks """Non schema checks
""" """
col_num = info_data.get('matrix_size', {}).get('cols', 0) col_num = info_data.get('matrix_size', {}).get('cols', 0)
@ -92,6 +92,11 @@ def _validate_layouts(keyboard, info_data):
if len(layouts) == 0 or all(not layout.get('json_layout', False) for layout in layouts.values()): 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.')
# Make sure all layouts are DD
for layout_name, layout_data in layouts.items():
if layout_data.get('c_macro', False):
_log_error(info_data, f'{layout_name}: Layout macro should not be defined within ".h" files.')
# Make sure all matrix values are in bounds # Make sure all matrix values are in bounds
for layout_name, layout_data in layouts.items(): for layout_name, layout_data in layouts.items():
for index, key_data in enumerate(layout_data['layout']): for index, key_data in enumerate(layout_data['layout']):