diff options
| author | Joel Challis <git@zvecr.com> | 2024-06-20 02:59:29 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-06-20 02:59:29 +0100 |
| commit | 4fdde75333acce3c15eb1b733f7c29798804ed82 (patch) | |
| tree | 12c645598ef38a9577db4ec6fd12b7b41d7b67ca /lib/python | |
| parent | dafc46f1d11134bee65a4b21a404f8e79d7b8402 (diff) | |
Update 'qmk import-kbfirmware' to use 'keyboard.json' (#23960)
Diffstat (limited to 'lib/python')
| -rw-r--r-- | lib/python/qmk/importers.py | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/lib/python/qmk/importers.py b/lib/python/qmk/importers.py index 8c449a7194..35a38e8572 100644 --- a/lib/python/qmk/importers.py +++ b/lib/python/qmk/importers.py | |||
| @@ -102,7 +102,7 @@ def import_keyboard(info_data, keymap_data=None): | |||
| 102 | 102 | ||
| 103 | # And validate some more as everything is optional | 103 | # And validate some more as everything is optional |
| 104 | if not all(key in info_data for key in ['keyboard_name', 'layouts']): | 104 | if not all(key in info_data for key in ['keyboard_name', 'layouts']): |
| 105 | raise ValueError('invalid info.json') | 105 | raise ValueError('invalid json config') |
| 106 | 106 | ||
| 107 | kb_name = info_data['keyboard_name'] | 107 | kb_name = info_data['keyboard_name'] |
| 108 | 108 | ||
| @@ -115,7 +115,7 @@ def import_keyboard(info_data, keymap_data=None): | |||
| 115 | # TODO: if supports community then grab that instead | 115 | # TODO: if supports community then grab that instead |
| 116 | keymap_data = _gen_dummy_keymap(kb_name, info_data) | 116 | keymap_data = _gen_dummy_keymap(kb_name, info_data) |
| 117 | 117 | ||
| 118 | keyboard_info = kb_folder / 'info.json' | 118 | keyboard_json = kb_folder / 'keyboard.json' |
| 119 | keyboard_keymap = kb_folder / 'keymaps' / 'default' / 'keymap.json' | 119 | keyboard_keymap = kb_folder / 'keymaps' / 'default' / 'keymap.json' |
| 120 | 120 | ||
| 121 | # begin with making the deepest folder in the tree | 121 | # begin with making the deepest folder in the tree |
| @@ -136,10 +136,10 @@ def import_keyboard(info_data, keymap_data=None): | |||
| 136 | for file in list(TEMPLATE.iterdir()): | 136 | for file in list(TEMPLATE.iterdir()): |
| 137 | replace_placeholders(file, kb_folder / file.name, tokens) | 137 | replace_placeholders(file, kb_folder / file.name, tokens) |
| 138 | 138 | ||
| 139 | temp = json_load(keyboard_info) | 139 | temp = json_load(keyboard_json) |
| 140 | deep_update(temp, info_data) | 140 | deep_update(temp, info_data) |
| 141 | 141 | ||
| 142 | keyboard_info.write_text(json.dumps(temp, cls=InfoJSONEncoder, sort_keys=True)) | 142 | keyboard_json.write_text(json.dumps(temp, cls=InfoJSONEncoder, sort_keys=True)) |
| 143 | keyboard_keymap.write_text(json.dumps(keymap_data, cls=KeymapJSONEncoder, sort_keys=True)) | 143 | keyboard_keymap.write_text(json.dumps(keymap_data, cls=KeymapJSONEncoder, sort_keys=True)) |
| 144 | 144 | ||
| 145 | return kb_name | 145 | return kb_name |
