aboutsummaryrefslogtreecommitdiff
path: root/lib/python
diff options
context:
space:
mode:
authorQMK Bot <[email protected]>2024-06-20 01:59:59 +0000
committerQMK Bot <[email protected]>2024-06-20 01:59:59 +0000
commit92881d38ef30d5fb9f83428feb92117c3e24cc9b (patch)
tree03ab74d2d8b75ba0c1ebe29f988811793b666b26 /lib/python
parent0a5b8928202078a7a64b7fadf11b0fc25a26b4a6 (diff)
parent4fdde75333acce3c15eb1b733f7c29798804ed82 (diff)
downloadqmk_firmware-92881d38ef30d5fb9f83428feb92117c3e24cc9b.tar.gz
qmk_firmware-92881d38ef30d5fb9f83428feb92117c3e24cc9b.zip
Merge remote-tracking branch 'origin/master' into develop
Diffstat (limited to 'lib/python')
-rw-r--r--lib/python/qmk/importers.py8
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):
# And validate some more as everything is optional
if not all(key in info_data for key in ['keyboard_name', 'layouts']):
- raise ValueError('invalid info.json')
+ raise ValueError('invalid json config')
kb_name = info_data['keyboard_name']
@@ -115,7 +115,7 @@ def import_keyboard(info_data, keymap_data=None):
# TODO: if supports community then grab that instead
keymap_data = _gen_dummy_keymap(kb_name, info_data)
- keyboard_info = kb_folder / 'info.json'
+ keyboard_json = kb_folder / 'keyboard.json'
keyboard_keymap = kb_folder / 'keymaps' / 'default' / 'keymap.json'
# begin with making the deepest folder in the tree
@@ -136,10 +136,10 @@ def import_keyboard(info_data, keymap_data=None):
for file in list(TEMPLATE.iterdir()):
replace_placeholders(file, kb_folder / file.name, tokens)
- temp = json_load(keyboard_info)
+ temp = json_load(keyboard_json)
deep_update(temp, info_data)
- keyboard_info.write_text(json.dumps(temp, cls=InfoJSONEncoder, sort_keys=True))
+ keyboard_json.write_text(json.dumps(temp, cls=InfoJSONEncoder, sort_keys=True))
keyboard_keymap.write_text(json.dumps(keymap_data, cls=KeymapJSONEncoder, sort_keys=True))
return kb_name