aboutsummaryrefslogtreecommitdiff
path: root/lib/python/qmk/commands.py
diff options
context:
space:
mode:
authorErovia <Erovia@users.noreply.github.com>2021-02-01 20:55:35 +0100
committerGitHub <noreply@github.com>2021-02-01 20:55:35 +0100
commit7db826dce89eb16fa0b6362852b97f5a0e4880d5 (patch)
tree7268acd8730338a6973004ce5df8102d38c50358 /lib/python/qmk/commands.py
parentd7126709225a9d6632602c6d7bd345e039e9e58d (diff)
downloadqmk_firmware-7db826dce89eb16fa0b6362852b97f5a0e4880d5.tar.gz
qmk_firmware-7db826dce89eb16fa0b6362852b97f5a0e4880d5.zip
CLI: Fix json flashing (#11765)
Diffstat (limited to 'lib/python/qmk/commands.py')
-rw-r--r--lib/python/qmk/commands.py5
1 files changed, 4 insertions, 1 deletions
diff --git a/lib/python/qmk/commands.py b/lib/python/qmk/commands.py
index f58062004..3c6f0d001 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
98 version_h_file.write_text('\n'.join(version_h)) 98 version_h_file.write_text('\n'.join(version_h))
99 99
100 100
101def compile_configurator_json(user_keymap, parallel=1, **env_vars): 101def compile_configurator_json(user_keymap, bootloader=None, parallel=1, **env_vars):
102 """Convert a configurator export JSON file into a C file and then compile it. 102 """Convert a configurator export JSON file into a C file and then compile it.
103 103
104 Args: 104 Args:
@@ -153,6 +153,9 @@ def compile_configurator_json(user_keymap, parallel=1, **env_vars):
153 'build_keyboard.mk', 153 'build_keyboard.mk',
154 ]) 154 ])
155 155
156 if bootloader:
157 make_command.append(bootloader)
158
156 for key, value in env_vars.items(): 159 for key, value in env_vars.items():
157 make_command.append(f'{key}={value}') 160 make_command.append(f'{key}={value}')
158 161