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

Fix compiling json files (#9210)

Browse Source
This commit is contained in:
Zach White 2020-05-26 14:29:48 -07:00 committed by GitHub
parent 751316c344
commit 4ee623fdd5
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -2,8 +2,8 @@
"""
from pathlib import Path
from qmk.path import is_keyboard
from qmk.keyboard import rules_mk
import qmk.path
# The `keymap.c` template to use when a keyboard doesn't have its own
DEFAULT_KEYMAP_C = """#include QMK_KEYBOARD_H
@ -103,7 +103,7 @@ def write(keyboard, keymap, layout, layers):
An array of arrays describing the keymap. Each item in the inner array should be a string that is a valid QMK keycode.
"""
keymap_c = generate(keyboard, layout, layers)
keymap_file = keymap(keyboard) / keymap / 'keymap.c'
keymap_file = qmk.path.keymap(keyboard) / 'keymap.c'
keymap_file.parent.mkdir(parents=True, exist_ok=True)
keymap_file.write_text(keymap_c)
@ -114,7 +114,7 @@ def write(keyboard, keymap, layout, layers):
def locate_keymap(keyboard, keymap):
"""Returns the path to a keymap for a specific keyboard.
"""
if not is_keyboard(keyboard):
if not qmk.path.is_keyboard(keyboard):
raise KeyError('Invalid keyboard: ' + repr(keyboard))
# Check the keyboard folder first, last match wins