diff options
| author | Zach White <skullydazed@gmail.com> | 2021-03-07 20:29:23 -0800 |
|---|---|---|
| committer | Zach White <skullydazed@drpepper.org> | 2021-03-09 08:04:07 -0800 |
| commit | 6d8d20774ff57ea19743d2c9afc209a68c51e361 (patch) | |
| tree | 04219aaa7b6edca674424f4a8f4672e1dd5af536 | |
| parent | 2aa38f5bd339b206b01963110d4c068bbe0f64bf (diff) | |
improve detection of community layout support
| -rw-r--r-- | lib/python/qmk/info.py | 17 |
1 files changed, 4 insertions, 13 deletions
diff --git a/lib/python/qmk/info.py b/lib/python/qmk/info.py index 051459698f..96e4399c36 100644 --- a/lib/python/qmk/info.py +++ b/lib/python/qmk/info.py @@ -74,19 +74,10 @@ def info_json(keyboard): _log_error(info_data, 'No LAYOUTs defined! Need at least one layout defined in the keyboard.h or info.json.') # Make sure we supply layout macros for the community layouts we claim to support - # FIXME(skullydazed): This should be populated into info.json and read from there instead - if 'LAYOUTS' in rules and info_data.get('layouts'): - # Match these up against the supplied layouts - supported_layouts = rules['LAYOUTS'].strip().split() - for layout_name in sorted(info_data['layouts']): - layout_name = layout_name[7:] - - if layout_name in supported_layouts: - supported_layouts.remove(layout_name) - - if supported_layouts: - for supported_layout in supported_layouts: - _log_error(info_data, 'Claims to support community layout %s but no LAYOUT_%s() macro found' % (supported_layout, supported_layout)) + for layout in info_data.get('community_layouts', []): + layout_name = 'LAYOUT_' + layout + if layout_name not in info_data.get('layouts', {}) and layout_name not in info_data.get('layout_aliases', {}): + _log_error(info_data, 'Claims to support community layout %s but no %s() macro found' % (layout, layout_name)) return info_data |