diff options
author | Zach White <skullydazed@users.noreply.github.com> | 2020-05-26 15:18:49 -0700 |
---|---|---|
committer | GitHub <noreply@github.com> | 2020-05-26 15:18:49 -0700 |
commit | a5e749d8cd76959e8103fff47d65725e19460d81 (patch) | |
tree | 9ac28352439267ad88b050c3c3f3c9433d54e760 /lib/python/qmk/cli/compile.py | |
parent | 4ee623fdd588edb9ac8816040f01d7644a49bd52 (diff) | |
download | qmk_firmware-a5e749d8cd76959e8103fff47d65725e19460d81.tar.gz qmk_firmware-a5e749d8cd76959e8103fff47d65725e19460d81.zip |
Fix the path for generated keymaps (#9213)
Diffstat (limited to 'lib/python/qmk/cli/compile.py')
-rwxr-xr-x | lib/python/qmk/cli/compile.py | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/lib/python/qmk/cli/compile.py b/lib/python/qmk/cli/compile.py index 6480d624b..341f365f8 100755 --- a/lib/python/qmk/cli/compile.py +++ b/lib/python/qmk/cli/compile.py | |||
@@ -7,7 +7,6 @@ from argparse import FileType | |||
7 | 7 | ||
8 | from milc import cli | 8 | from milc import cli |
9 | 9 | ||
10 | import qmk.path | ||
11 | from qmk.decorators import automagic_keyboard, automagic_keymap | 10 | from qmk.decorators import automagic_keyboard, automagic_keymap |
12 | from qmk.commands import compile_configurator_json, create_make_command, parse_configurator_json | 11 | from qmk.commands import compile_configurator_json, create_make_command, parse_configurator_json |
13 | 12 | ||
@@ -32,11 +31,8 @@ def compile(cli): | |||
32 | # If a configurator JSON was provided generate a keymap and compile it | 31 | # If a configurator JSON was provided generate a keymap and compile it |
33 | # FIXME(skullydazed): add code to check and warn if the keymap already exists when compiling a json keymap. | 32 | # FIXME(skullydazed): add code to check and warn if the keymap already exists when compiling a json keymap. |
34 | user_keymap = parse_configurator_json(cli.args.filename) | 33 | user_keymap = parse_configurator_json(cli.args.filename) |
35 | keymap_path = qmk.path.keymap(user_keymap['keyboard']) | ||
36 | command = compile_configurator_json(user_keymap) | 34 | command = compile_configurator_json(user_keymap) |
37 | 35 | ||
38 | cli.log.info('Wrote keymap to {fg_cyan}%s/%s/keymap.c', keymap_path, user_keymap['keymap']) | ||
39 | |||
40 | else: | 36 | else: |
41 | if cli.config.compile.keyboard and cli.config.compile.keymap: | 37 | if cli.config.compile.keyboard and cli.config.compile.keymap: |
42 | # Generate the make command for a specific keyboard/keymap. | 38 | # Generate the make command for a specific keyboard/keymap. |