g1smo
/
qmk_firmware
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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

master
QMK Bot 2022-07-01 21:21:11 +00:00
parent a61e549a31 9d70162d53
commit d6c39490df
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
lib/python/qmk/keymap.py
View File

@ -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: