diff options
-rw-r--r-- | lib/python/qmk/cli/flash.py | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/lib/python/qmk/cli/flash.py b/lib/python/qmk/cli/flash.py index 031cb9496..e897174a2 100644 --- a/lib/python/qmk/cli/flash.py +++ b/lib/python/qmk/cli/flash.py | |||
@@ -4,6 +4,7 @@ You can compile a keymap already in the repo or using a QMK Configurator export. | |||
4 | A bootloader must be specified. | 4 | A bootloader must be specified. |
5 | """ | 5 | """ |
6 | import subprocess | 6 | import subprocess |
7 | from argparse import FileType | ||
7 | 8 | ||
8 | import qmk.path | 9 | import qmk.path |
9 | from milc import cli | 10 | from milc import cli |
@@ -28,7 +29,7 @@ def print_bootloader_help(): | |||
28 | 29 | ||
29 | 30 | ||
30 | @cli.argument('-bl', '--bootloader', default='flash', help='The flash command, corresponding to qmk\'s make options of bootloaders.') | 31 | @cli.argument('-bl', '--bootloader', default='flash', help='The flash command, corresponding to qmk\'s make options of bootloaders.') |
31 | @cli.argument('filename', nargs='?', arg_only=True, help='The configurator export JSON to compile. Use this if you dont want to specify a keymap and keyboard.') | 32 | @cli.argument('filename', nargs='?', arg_only=True, type=FileType('r'), help='The configurator export JSON to compile.') |
32 | @cli.argument('-km', '--keymap', help='The keymap to build a firmware for. Use this if you dont have a configurator file. Ignored when a configurator file is supplied.') | 33 | @cli.argument('-km', '--keymap', help='The keymap to build a firmware for. Use this if you dont have a configurator file. Ignored when a configurator file is supplied.') |
33 | @cli.argument('-kb', '--keyboard', help='The keyboard to build a firmware for. Use this if you dont have a configurator file. Ignored when a configurator file is supplied.') | 34 | @cli.argument('-kb', '--keyboard', help='The keyboard to build a firmware for. Use this if you dont have a configurator file. Ignored when a configurator file is supplied.') |
34 | @cli.argument('-b', '--bootloaders', action='store_true', help='List the available bootloaders.') | 35 | @cli.argument('-b', '--bootloaders', action='store_true', help='List the available bootloaders.') |
@@ -65,7 +66,7 @@ def flash(cli): | |||
65 | cli.log.info('Creating {fg_cyan}%s{style_reset_all} keymap in {fg_cyan}%s', user_keymap['keymap'], keymap_path) | 66 | cli.log.info('Creating {fg_cyan}%s{style_reset_all} keymap in {fg_cyan}%s', user_keymap['keymap'], keymap_path) |
66 | 67 | ||
67 | # Convert the JSON into a C file and write it to disk. | 68 | # Convert the JSON into a C file and write it to disk. |
68 | command = compile_configurator_json(cli.args.filename, cli.args.bootloader) | 69 | command = compile_configurator_json(user_keymap, cli.args.bootloader) |
69 | 70 | ||
70 | cli.log.info('Wrote keymap to {fg_cyan}%s/%s/keymap.c', keymap_path, user_keymap['keymap']) | 71 | cli.log.info('Wrote keymap to {fg_cyan}%s/%s/keymap.c', keymap_path, user_keymap['keymap']) |
71 | 72 | ||