diff options
| author | Zach White <[email protected]> | 2021-08-20 08:22:41 -0700 | 
|---|---|---|
| committer | Zach White <[email protected]> | 2021-08-20 08:22:41 -0700 | 
| commit | 1ec6ce8c370d53292979718cc406b66c4c5616a8 (patch) | |
| tree | 05a61c562c26f859f5af6931e50f7181c8fc645c /lib/python | |
| parent | 92fa07336cd7fcd578c31a8069cf955a4d601327 (diff) | |
| parent | c1add5d0e278da55128964dc305b833fb0bbc063 (diff) | |
| download | qmk_firmware-1ec6ce8c370d53292979718cc406b66c4c5616a8.tar.gz qmk_firmware-1ec6ce8c370d53292979718cc406b66c4c5616a8.zip | |
Merge remote-tracking branch 'origin/master' into develop
Resolved Conflicts:
	lib/python/qmk/info.py
Diffstat (limited to 'lib/python')
| -rw-r--r-- | lib/python/qmk/info.py | 41 | 
1 files changed, 6 insertions, 35 deletions
| diff --git a/lib/python/qmk/info.py b/lib/python/qmk/info.py index b6f2ecf644..7f3aabdc3b 100644 --- a/lib/python/qmk/info.py +++ b/lib/python/qmk/info.py @@ -551,39 +551,6 @@ def _check_matrix(info_data):              _log_error(info_data, f'MATRIX_ROWS is inconsistent with the size of MATRIX_ROW_PINS: {row_count} != {actual_row_count}') -def _merge_layouts(info_data, new_info_data): -    """Merge new_info_data into info_data in an intelligent way. -    """ -    for layout_name, layout_json in new_info_data['layouts'].items(): -        if layout_name in info_data['layouts']: -            # Pull in layouts we have a macro for -            if len(info_data['layouts'][layout_name]['layout']) != len(layout_json['layout']): -                msg = '%s: %s: Number of elements in info.json does not match! info.json:%s != %s:%s' -                _log_error(info_data, msg % (info_data['keyboard_folder'], layout_name, len(layout_json['layout']), layout_name, len(info_data['layouts'][layout_name]['layout']))) -            else: -                for i, key in enumerate(info_data['layouts'][layout_name]['layout']): -                    key.update(layout_json['layout'][i]) -        else: -            # Pull in layouts that have matrix data -            missing_matrix = False -            for key in layout_json.get('layout', {}): -                if 'matrix' not in key: -                    missing_matrix = True - -            if not missing_matrix: -                if layout_name in info_data['layouts']: -                    # Update an existing layout with new data -                    for i, key in enumerate(info_data['layouts'][layout_name]['layout']): -                        key.update(layout_json['layout'][i]) - -                else: -                    # Copy in the new layout wholesale -                    layout_json['c_macro'] = False -                    info_data['layouts'][layout_name] = layout_json - -    return info_data - -  def _search_keyboard_h(keyboard):      keyboard = Path(keyboard)      current_path = Path('keyboards/') @@ -723,8 +690,12 @@ def merge_info_jsons(keyboard, info_data):                  layout_name = info_data['layout_aliases'][layout_name]              if layout_name in info_data['layouts']: -                for new_key, existing_key in zip(layout['layout'], info_data['layouts'][layout_name]['layout']): -                    existing_key.update(new_key) +                if len(info_data['layouts'][layout_name]['layout']) != len(layout['layout']): +                    msg = '%s: %s: Number of elements in info.json does not match! info.json:%s != %s:%s' +                    _log_error(info_data, msg % (info_data['keyboard_folder'], layout_name, len(layout['layout']), layout_name, len(info_data['layouts'][layout_name]['layout']))) +                else: +                    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 | 
