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 | |
| parent | 193a9a97fe5340d8df20c851cb34b65251c69d6e (diff) | |
| parent | 7db826dce89eb16fa0b6362852b97f5a0e4880d5 (diff) | |
Merge remote-tracking branch 'origin/master' into develop
| -rw-r--r-- | lib/python/qmk/cli/flash.py | 4 | ||||
| -rw-r--r-- | lib/python/qmk/commands.py | 5 |
2 files changed, 6 insertions, 3 deletions
diff --git a/lib/python/qmk/cli/flash.py b/lib/python/qmk/cli/flash.py index b3827e8003..a876290035 100644 --- a/lib/python/qmk/cli/flash.py +++ b/lib/python/qmk/cli/flash.py @@ -76,9 +76,9 @@ def flash(cli): if cli.args.filename: # Handle compiling a configurator JSON - user_keymap = parse_configurator_json(cli.args.filename, parallel=cli.config.flash.parallel) + user_keymap = parse_configurator_json(cli.args.filename) keymap_path = qmk.path.keymap(user_keymap['keyboard']) - command = compile_configurator_json(user_keymap, cli.args.bootloader, **envs) + command = compile_configurator_json(user_keymap, cli.args.bootloader, parallel=cli.config.flash.parallel, **envs) cli.log.info('Wrote keymap to {fg_cyan}%s/%s/keymap.c', keymap_path, user_keymap['keymap']) diff --git a/lib/python/qmk/commands.py b/lib/python/qmk/commands.py index f58062004f..3c6f0d001d 100644 --- a/lib/python/qmk/commands.py +++ b/lib/python/qmk/commands.py @@ -98,7 +98,7 @@ def write_version_h(git_version, build_date, chibios_version, chibios_contrib_ve version_h_file.write_text('\n'.join(version_h)) -def compile_configurator_json(user_keymap, parallel=1, **env_vars): +def compile_configurator_json(user_keymap, bootloader=None, parallel=1, **env_vars): """Convert a configurator export JSON file into a C file and then compile it. Args: @@ -153,6 +153,9 @@ def compile_configurator_json(user_keymap, parallel=1, **env_vars): 'build_keyboard.mk', ]) + if bootloader: + make_command.append(bootloader) + for key, value in env_vars.items(): make_command.append(f'{key}={value}') |