diff options
| author | QMK Bot <hello@qmk.fm> | 2021-02-01 19:56:36 +0000 |
|---|---|---|
| committer | QMK Bot <hello@qmk.fm> | 2021-02-01 19:56:36 +0000 |
| commit | 85079d6a2ecfd55d0d33ce32cd1ad137f1c1df55 (patch) | |
| tree | 2c8b1126c5294aef58ddf9bd553b36f7c4ac9f91 /lib/python/qmk/cli | |
| parent | 193a9a97fe5340d8df20c851cb34b65251c69d6e (diff) | |
| parent | 7db826dce89eb16fa0b6362852b97f5a0e4880d5 (diff) | |
| download | qmk_firmware-85079d6a2ecfd55d0d33ce32cd1ad137f1c1df55.tar.gz qmk_firmware-85079d6a2ecfd55d0d33ce32cd1ad137f1c1df55.zip | |
Merge remote-tracking branch 'origin/master' into develop
Diffstat (limited to 'lib/python/qmk/cli')
| -rw-r--r-- | lib/python/qmk/cli/flash.py | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/lib/python/qmk/cli/flash.py b/lib/python/qmk/cli/flash.py index b3827e800..a87629003 100644 --- a/lib/python/qmk/cli/flash.py +++ b/lib/python/qmk/cli/flash.py | |||
| @@ -76,9 +76,9 @@ def flash(cli): | |||
| 76 | 76 | ||
| 77 | if cli.args.filename: | 77 | if cli.args.filename: |
| 78 | # Handle compiling a configurator JSON | 78 | # Handle compiling a configurator JSON |
| 79 | user_keymap = parse_configurator_json(cli.args.filename, parallel=cli.config.flash.parallel) | 79 | user_keymap = parse_configurator_json(cli.args.filename) |
| 80 | keymap_path = qmk.path.keymap(user_keymap['keyboard']) | 80 | keymap_path = qmk.path.keymap(user_keymap['keyboard']) |
| 81 | command = compile_configurator_json(user_keymap, cli.args.bootloader, **envs) | 81 | command = compile_configurator_json(user_keymap, cli.args.bootloader, parallel=cli.config.flash.parallel, **envs) |
| 82 | 82 | ||
| 83 | cli.log.info('Wrote keymap to {fg_cyan}%s/%s/keymap.c', keymap_path, user_keymap['keymap']) | 83 | cli.log.info('Wrote keymap to {fg_cyan}%s/%s/keymap.c', keymap_path, user_keymap['keymap']) |
| 84 | 84 | ||