|
@ -691,8 +691,8 @@ def merge_info_jsons(keyboard, info_data): |
|
|
|
|
|
|
|
|
if layout_name in info_data['layouts']: |
|
|
if layout_name in info_data['layouts']: |
|
|
if len(info_data['layouts'][layout_name]['layout']) != len(layout['layout']): |
|
|
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']))) |
|
|
|
|
|
|
|
|
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']))) |
|
|
else: |
|
|
else: |
|
|
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) |
|
|