mirror of
https://github.com/qmk/qmk_firmware.git
synced 2025-04-23 15:41:28 +00:00
Merge remote-tracking branch 'origin/develop' into xap
This commit is contained in:
commit
b82de7a1b5
@ -12,7 +12,7 @@ from pygments.token import Token
|
|||||||
from pygments import lex
|
from pygments import lex
|
||||||
|
|
||||||
import qmk.path
|
import qmk.path
|
||||||
from qmk.keyboard import find_keyboard_from_dir, rules_mk
|
from qmk.keyboard import find_keyboard_from_dir, rules_mk, keyboard_folder
|
||||||
from qmk.errors import CppError
|
from qmk.errors import CppError
|
||||||
|
|
||||||
# The `keymap.c` template to use when a keyboard doesn't have its own
|
# The `keymap.c` template to use when a keyboard doesn't have its own
|
||||||
@ -357,7 +357,7 @@ def locate_keymap(keyboard, keymap):
|
|||||||
checked_dirs = ''
|
checked_dirs = ''
|
||||||
keymap_path = ''
|
keymap_path = ''
|
||||||
|
|
||||||
for dir in keyboard.split('/'):
|
for dir in keyboard_folder(keyboard).split('/'):
|
||||||
if checked_dirs:
|
if checked_dirs:
|
||||||
checked_dirs = '/'.join((checked_dirs, dir))
|
checked_dirs = '/'.join((checked_dirs, dir))
|
||||||
else:
|
else:
|
||||||
|
Loading…
Reference in New Issue
Block a user