mirrors/opensteno_qmk
1
0
Fork 0
mirror of https://github.com/openstenoproject/qmk synced 2024-11-14 12:34:39 +00:00
Code Issues Projects Releases Packages Wiki Activity

Merge remote-tracking branch 'origin/master' into develop

Browse source
This commit is contained in:
QMK Bot 2021-02-01 19:56:36 +00:00
commit 85079d6a2e
2 changed files with 6 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -76,9 +76,9 @@ def flash(cli):
if cli.args.filename: if cli.args.filename:
# Handle compiling a configurator JSON # 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']) 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']) cli.log.info('Wrote keymap to {fg_cyan}%s/%s/keymap.c', keymap_path, user_keymap['keymap'])

5
lib/python/qmk/commands.py
View file

@ -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)) 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. """Convert a configurator export JSON file into a C file and then compile it.
Args: Args:
@ -153,6 +153,9 @@ def compile_configurator_json(user_keymap, parallel=1, **env_vars):
'build_keyboard.mk', 'build_keyboard.mk',
]) ])
if bootloader:
make_command.append(bootloader)
for key, value in env_vars.items(): for key, value in env_vars.items():
make_command.append(f'{key}={value}') make_command.append(f'{key}={value}')