aboutsummaryrefslogtreecommitdiff
path: root/lib/python/qmk/cli/flash.py
diff options
context:
space:
mode:
authorErovia <Erovia@users.noreply.github.com>2020-02-08 23:58:28 +0100
committerGitHub <noreply@github.com>2020-02-08 23:58:28 +0100
commitb6e23f974bf92a2e2342ede43e98ecfd24a84f51 (patch)
tree77be0971c3dad4d8124625ed4fe853b5f6ee3f61 /lib/python/qmk/cli/flash.py
parent174a15d07d7321e762e51584e985bb73fe01e99b (diff)
downloadqmk_firmware-b6e23f974bf92a2e2342ede43e98ecfd24a84f51.tar.gz
qmk_firmware-b6e23f974bf92a2e2342ede43e98ecfd24a84f51.zip
Update the flash cli command to use the user config (#8125)
Diffstat (limited to 'lib/python/qmk/cli/flash.py')
-rw-r--r--lib/python/qmk/cli/flash.py4
1 files changed, 2 insertions, 2 deletions
diff --git a/lib/python/qmk/cli/flash.py b/lib/python/qmk/cli/flash.py
index e897174a2..cc1e6235a 100644
--- a/lib/python/qmk/cli/flash.py
+++ b/lib/python/qmk/cli/flash.py
@@ -52,7 +52,7 @@ def flash(cli):
52 print_bootloader_help() 52 print_bootloader_help()
53 return False 53 return False
54 54
55 elif cli.args.keymap and not cli.args.keyboard: 55 elif cli.config.flash.keymap and not cli.config.flash.keyboard:
56 # If only a keymap was given but no keyboard, suggest listing keyboards 56 # If only a keymap was given but no keyboard, suggest listing keyboards
57 cli.echo('usage: qmk flash [-h] [-b] [-kb KEYBOARD] [-km KEYMAP] [-bl BOOTLOADER] [filename]') 57 cli.echo('usage: qmk flash [-h] [-b] [-kb KEYBOARD] [-km KEYMAP] [-bl BOOTLOADER] [filename]')
58 cli.log.error('run \'qmk list_keyboards\' to find out the supported keyboards') 58 cli.log.error('run \'qmk list_keyboards\' to find out the supported keyboards')
@@ -70,7 +70,7 @@ def flash(cli):
70 70
71 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'])
72 72
73 elif cli.args.keyboard and cli.args.keymap: 73 elif cli.config.flash.keyboard and cli.config.flash.keymap:
74 # Generate the make command for a specific keyboard/keymap. 74 # Generate the make command for a specific keyboard/keymap.
75 command = create_make_command(cli.config.flash.keyboard, cli.config.flash.keymap, cli.args.bootloader) 75 command = create_make_command(cli.config.flash.keyboard, cli.config.flash.keymap, cli.args.bootloader)
76 76