diff options
author | QMK Bot <hello@qmk.fm> | 2022-06-10 10:45:24 +0000 |
---|---|---|
committer | QMK Bot <hello@qmk.fm> | 2022-06-10 10:45:24 +0000 |
commit | 6b838785b7aa5a8614d7cc348fc9ab74be952f2d (patch) | |
tree | 7b2f0d4353da266a628c2c9229b3d4c8dc03b331 /lib/python/qmk/info.py | |
parent | 97fc4f1b6a20da4323c73b74974a6eb732902cd9 (diff) | |
parent | 92665aef33148fef051ad07687028c88f0da64fc (diff) |
Merge remote-tracking branch 'origin/master' into develop
Diffstat (limited to 'lib/python/qmk/info.py')
-rw-r--r-- | lib/python/qmk/info.py | 17 |
1 files changed, 5 insertions, 12 deletions
diff --git a/lib/python/qmk/info.py b/lib/python/qmk/info.py index 6ff9cba45b..23761d71b7 100644 --- a/lib/python/qmk/info.py +++ b/lib/python/qmk/info.py @@ -26,13 +26,6 @@ def _valid_community_layout(layout): return (Path('layouts/default') / layout).exists() -def _remove_newlines_from_labels(layouts): - for layout_name, layout_json in layouts.items(): - for key in layout_json['layout']: - if '\n' in key['label']: - key['label'] = key['label'].split('\n')[0] - - def info_json(keyboard): """Generate the info.json data for a specific keyboard. """ @@ -111,9 +104,6 @@ def info_json(keyboard): # Check that the reported matrix size is consistent with the actual matrix size _check_matrix(info_data) - # Remove newline characters from layout labels - _remove_newlines_from_labels(layouts) - return info_data @@ -807,8 +797,11 @@ def merge_info_jsons(keyboard, info_data): for new_key, existing_key in zip(layout['layout'], info_data['layouts'][layout_name]['layout']): existing_key.update(new_key) else: - layout['c_macro'] = False - info_data['layouts'][layout_name] = layout + if not all('matrix' in key_data.keys() for key_data in layout['layout']): + _log_error(info_data, f'Layout "{layout_name}" has no "matrix" definition in either "info.json" or "<keyboard>.h"!') + else: + layout['c_macro'] = False + info_data['layouts'][layout_name] = layout # Update info_data with the new data if 'layouts' in new_info_data: |