Merge remote-tracking branch 'origin/develop' into xap

2026-09-28 21:08:57 +02:00 · 2023-10-05 23:35:42 +00:00
parent 621dd83530 0ca60eb759
commit 4c91fc5bf9
7 changed files with 97 additions and 55 deletions
@@ -94,8 +94,11 @@ def keyboard_folder(keyboard):
    """
    aliases = json_load(Path('data/mappings/keyboard_aliases.hjson'))

-    if keyboard in aliases:
+    while keyboard in aliases:
+        last_keyboard = keyboard
        keyboard = aliases[keyboard].get('target', keyboard)
+        if keyboard == last_keyboard:
+            break

    rules_mk_file = Path(base_path, keyboard, 'rules.mk')