summaryrefslogtreecommitdiff
path: root/lib/python/qmk/commands.py
diff options
context:
space:
mode:
authorQMK Bot <hello@qmk.fm>2023-10-05 23:35:02 +0000
committerQMK Bot <hello@qmk.fm>2023-10-05 23:35:02 +0000
commit0ca60eb759d567878024eaabc613d6193f560745 (patch)
tree7ddbd6335f67a067a02053b041186aecef2cbfad /lib/python/qmk/commands.py
parenta7406a429eb726731fe2a69e284282994dc9cd0c (diff)
parent127560ae223255d0e081b932e902d2da242abf06 (diff)
Merge remote-tracking branch 'origin/master' into develop
Diffstat (limited to 'lib/python/qmk/commands.py')
-rw-r--r--lib/python/qmk/commands.py11
1 files changed, 7 insertions, 4 deletions
diff --git a/lib/python/qmk/commands.py b/lib/python/qmk/commands.py
index 660b2ff72e..34696e3793 100644
--- a/lib/python/qmk/commands.py
+++ b/lib/python/qmk/commands.py
@@ -212,13 +212,16 @@ def parse_configurator_json(configurator_file):
cli.log.error(f'Invalid JSON keymap: {configurator_file} : {e.message}')
exit(1)
- orig_keyboard = user_keymap['keyboard']
+ keyboard = user_keymap['keyboard']
aliases = json_load(Path('data/mappings/keyboard_aliases.hjson'))
- if orig_keyboard in aliases:
- if 'target' in aliases[orig_keyboard]:
- user_keymap['keyboard'] = aliases[orig_keyboard]['target']
+ while keyboard in aliases:
+ last_keyboard = keyboard
+ keyboard = aliases[keyboard].get('target', keyboard)
+ if keyboard == last_keyboard:
+ break
+ user_keymap['keyboard'] = keyboard
return user_keymap