drashna/qmk_firmware
1
0
Fork 0
Code Activity Actions

CLI: Fix json flashing (#11765)

Browse source
This commit is contained in:
Erovia 2021-02-01 20:55:35 +01:00 • committed by GitHub
parent d712670922
commit 7db826dce8
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 6 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

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))
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}')