summaryrefslogtreecommitdiff
path: root/lib
diff options
context:
space:
mode:
authorZach White <skullydazed@users.noreply.github.com>2020-05-26 15:18:49 -0700
committerDrashna Jael're <drashna@live.com>2020-08-08 20:32:02 -0700
commite85a5f04f870d553ac98a3443718ed6ee51895e7 (patch)
tree631c731b0a96c70ea7dd113e7744e3d2ffa09016 /lib
parent583c2cead21f64541d8edde871754a899780b3fa (diff)
Fix the path for generated keymaps (#9213)
Diffstat (limited to 'lib')
-rwxr-xr-xlib/python/qmk/cli/compile.py4
-rw-r--r--lib/python/qmk/keymap.py6
2 files changed, 5 insertions, 5 deletions
diff --git a/lib/python/qmk/cli/compile.py b/lib/python/qmk/cli/compile.py
index 6480d624b0..341f365f8c 100755
--- a/lib/python/qmk/cli/compile.py
+++ b/lib/python/qmk/cli/compile.py
@@ -7,7 +7,6 @@ from argparse import FileType
from milc import cli
-import qmk.path
from qmk.decorators import automagic_keyboard, automagic_keymap
from qmk.commands import compile_configurator_json, create_make_command, parse_configurator_json
@@ -32,11 +31,8 @@ def compile(cli):
# If a configurator JSON was provided generate a keymap and compile it
# FIXME(skullydazed): add code to check and warn if the keymap already exists when compiling a json keymap.
user_keymap = parse_configurator_json(cli.args.filename)
- keymap_path = qmk.path.keymap(user_keymap['keyboard'])
command = compile_configurator_json(user_keymap)
- cli.log.info('Wrote keymap to {fg_cyan}%s/%s/keymap.c', keymap_path, user_keymap['keymap'])
-
else:
if cli.config.compile.keyboard and cli.config.compile.keymap:
# Generate the make command for a specific keyboard/keymap.
diff --git a/lib/python/qmk/keymap.py b/lib/python/qmk/keymap.py
index a2923f86db..78510a8a78 100644
--- a/lib/python/qmk/keymap.py
+++ b/lib/python/qmk/keymap.py
@@ -2,6 +2,8 @@
"""
from pathlib import Path
+from milc import cli
+
from qmk.keyboard import rules_mk
import qmk.path
@@ -103,11 +105,13 @@ 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 = qmk.path.keymap(keyboard) / 'keymap.c'
+ keymap_file = qmk.path.keymap(keyboard) / keymap / 'keymap.c'
keymap_file.parent.mkdir(parents=True, exist_ok=True)
keymap_file.write_text(keymap_c)
+ cli.log.info('Wrote keymap to {fg_cyan}%s', keymap_file)
+
return keymap_file