diff options
author | jorgemanzo <jmanzo203689@gmail.com> | 2019-10-04 23:38:34 -0700 |
---|---|---|
committer | skullY <skullydazed@gmail.com> | 2019-11-15 23:06:07 -0800 |
commit | 897888db419239f013561b155de5993b1966820e (patch) | |
tree | dc9041ea683d9188961749aec7f511719fbde241 /lib/python/qmk/cli/compile.py | |
parent | 4f5b34af565d00e069d3f37b3faa8091608ed21f (diff) | |
download | qmk_firmware-897888db419239f013561b155de5993b1966820e.tar.gz qmk_firmware-897888db419239f013561b155de5993b1966820e.zip |
Add CLI command for flashing a keyboard
A new CLI subcommand was added, flash, which behaves very similar to the already present compile CLI comamnd, but with the added ability to target a bootloader. The command is used like so: qmk flash [-h] [-b] [-kb KEYBOARD] [-km KEYMAP] [-bl BOOTLOADER] [filename].
A -kb <keyboard> and -km <keymap> is expected, or a configurator export JSON filename. A bootloader can be specified using -bl <target>, and if left unspecified, the target is assumed to be :flash. -bl can be used to list the available bootloaders.
If -km <keymap> is provided, but no -kb <keyboard>, then a message is printed suggesting the user to run qmk list_keyboards.
Diffstat (limited to 'lib/python/qmk/cli/compile.py')
-rwxr-xr-x | lib/python/qmk/cli/compile.py | 14 |
1 files changed, 9 insertions, 5 deletions
diff --git a/lib/python/qmk/cli/compile.py b/lib/python/qmk/cli/compile.py index 6646891b3..c7093d421 100755 --- a/lib/python/qmk/cli/compile.py +++ b/lib/python/qmk/cli/compile.py | |||
@@ -9,6 +9,9 @@ import subprocess | |||
9 | from argparse import FileType | 9 | from argparse import FileType |
10 | 10 | ||
11 | from milc import cli | 11 | from milc import cli |
12 | from qmk.commands import create_make_command | ||
13 | from qmk.commands import parse_configurator_json | ||
14 | from qmk.commands import compile_configurator_json | ||
12 | 15 | ||
13 | import qmk.keymap | 16 | import qmk.keymap |
14 | import qmk.path | 17 | import qmk.path |
@@ -30,20 +33,21 @@ def compile(cli): | |||
30 | """ | 33 | """ |
31 | if cli.args.filename: | 34 | if cli.args.filename: |
32 | # Parse the configurator json | 35 | # Parse the configurator json |
33 | user_keymap = json.load(cli.args.filename) | 36 | user_keymap = parse_configurator_json(cli.args.filename) |
34 | 37 | ||
35 | # Generate the keymap | 38 | # Generate the keymap |
36 | keymap_path = qmk.path.keymap(user_keymap['keyboard']) | 39 | keymap_path = qmk.path.keymap(user_keymap['keyboard']) |
37 | cli.log.info('Creating {fg_cyan}%s{style_reset_all} keymap in {fg_cyan}%s', user_keymap['keymap'], keymap_path) | 40 | cli.log.info('Creating {fg_cyan}%s{style_reset_all} keymap in {fg_cyan}%s', user_keymap['keymap'], keymap_path) |
38 | qmk.keymap.write(user_keymap['keyboard'], user_keymap['keymap'], user_keymap['layout'], user_keymap['layers']) | 41 | |
42 | # Compile the keymap | ||
43 | command = compile_configurator_json(cli.args.filename) | ||
44 | |||
39 | cli.log.info('Wrote keymap to {fg_cyan}%s/%s/keymap.c', keymap_path, user_keymap['keymap']) | 45 | cli.log.info('Wrote keymap to {fg_cyan}%s/%s/keymap.c', keymap_path, user_keymap['keymap']) |
40 | 46 | ||
41 | # Compile the keymap | ||
42 | command = ['make', ':'.join((user_keymap['keyboard'], user_keymap['keymap']))] | ||
43 | 47 | ||
44 | elif cli.config.compile.keyboard and cli.config.compile.keymap: | 48 | elif cli.config.compile.keyboard and cli.config.compile.keymap: |
45 | # Generate the make command for a specific keyboard/keymap. | 49 | # Generate the make command for a specific keyboard/keymap. |
46 | command = ['make', ':'.join((cli.config.compile.keyboard, cli.config.compile.keymap))] | 50 | command = create_make_command(cli.config.compile.keyboard, cli.config.compile.keymap) |
47 | 51 | ||
48 | else: | 52 | else: |
49 | cli.log.error('You must supply a configurator export or both `--keyboard` and `--keymap`.') | 53 | cli.log.error('You must supply a configurator export or both `--keyboard` and `--keymap`.') |