summaryrefslogtreecommitdiff
path: root/lib/python
diff options
context:
space:
mode:
authorQMK Bot <hello@qmk.fm>2022-07-01 21:21:11 +0000
committerQMK Bot <hello@qmk.fm>2022-07-01 21:21:11 +0000
commitd6c39490df2aa114b4fb0fba00b4c03b5ff3a405 (patch)
treebd1d799e3675d70f637f71c7a54e33baf4147640 /lib/python
parenta61e549a31d8c4bdc1a3f665142c1370382cdf0f (diff)
parent9d70162d53a1e42733562bdab511f649ed0980c2 (diff)
downloadqmk_firmware-d6c39490df2aa114b4fb0fba00b4c03b5ff3a405.tar.gz
qmk_firmware-d6c39490df2aa114b4fb0fba00b4c03b5ff3a405.zip
Merge remote-tracking branch 'origin/master' into develop
Diffstat (limited to 'lib/python')
-rw-r--r--lib/python/qmk/keymap.py4
1 files changed, 2 insertions, 2 deletions
diff --git a/lib/python/qmk/keymap.py b/lib/python/qmk/keymap.py
index ca5be0959b..f317f4d11e 100644
--- a/lib/python/qmk/keymap.py
+++ b/lib/python/qmk/keymap.py
@@ -12,7 +12,7 @@ from pygments.token import Token
from pygments import lex
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
# 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 = ''
keymap_path = ''
- for dir in keyboard.split('/'):
+ for dir in keyboard_folder(keyboard).split('/'):
if checked_dirs:
checked_dirs = '/'.join((checked_dirs, dir))
else: