Nulo/qmk_firmware
1
0
Fork 0
Code Releases Activity

Update the flash cli command to use the user config (#8125)

Browse source
This commit is contained in:
Erovia 2020-02-08 23:58:28 +01:00 committed by GitHub
parent 174a15d07d
commit b6e23f974b
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
lib/python/qmk/cli/flash.py
View file

@ -52,7 +52,7 @@ def flash(cli):
print_bootloader_help() print_bootloader_help()
return False return False
elif cli.args.keymap and not cli.args.keyboard: elif cli.config.flash.keymap and not cli.config.flash.keyboard:
# If only a keymap was given but no keyboard, suggest listing keyboards # If only a keymap was given but no keyboard, suggest listing keyboards
cli.echo('usage: qmk flash [-h] [-b] [-kb KEYBOARD] [-km KEYMAP] [-bl BOOTLOADER] [filename]') cli.echo('usage: qmk flash [-h] [-b] [-kb KEYBOARD] [-km KEYMAP] [-bl BOOTLOADER] [filename]')
cli.log.error('run \'qmk list_keyboards\' to find out the supported keyboards') cli.log.error('run \'qmk list_keyboards\' to find out the supported keyboards')
@ -70,7 +70,7 @@ def flash(cli):
cli.log.info('Wrote keymap to {fg_cyan}%s/%s/keymap.c', keymap_path, user_keymap['keymap']) cli.log.info('Wrote keymap to {fg_cyan}%s/%s/keymap.c', keymap_path, user_keymap['keymap'])
elif cli.args.keyboard and cli.args.keymap: elif cli.config.flash.keyboard and cli.config.flash.keymap:
# Generate the make command for a specific keyboard/keymap. # Generate the make command for a specific keyboard/keymap.
command = create_make_command(cli.config.flash.keyboard, cli.config.flash.keymap, cli.args.bootloader) command = create_make_command(cli.config.flash.keyboard, cli.config.flash.keymap, cli.args.bootloader)