mirror of
https://github.com/qmk/qmk_firmware.git
synced 2026-08-04 16:30:55 -04:00
Merge remote-tracking branch 'upstream/develop' into xap
This commit is contained in:
@@ -72,6 +72,11 @@ class AllKeyboards:
|
||||
base_path = os.path.join(os.getcwd(), "keyboards") + os.path.sep
|
||||
|
||||
|
||||
@lru_cache(maxsize=1)
|
||||
def keyboard_alias_definitions():
|
||||
return json_load(Path('data/mappings/keyboard_aliases.hjson'))
|
||||
|
||||
|
||||
def is_all_keyboards(keyboard):
|
||||
"""Returns True if the keyboard is an AllKeyboards object.
|
||||
"""
|
||||
@@ -114,7 +119,7 @@ def keyboard_folder(keyboard):
|
||||
|
||||
This checks aliases and DEFAULT_FOLDER to resolve the actual path for a keyboard.
|
||||
"""
|
||||
aliases = json_load(Path('data/mappings/keyboard_aliases.hjson'))
|
||||
aliases = keyboard_alias_definitions()
|
||||
|
||||
while keyboard in aliases:
|
||||
last_keyboard = keyboard
|
||||
|
||||
Reference in New Issue
Block a user