diff options
| author | QMK Bot <hello@qmk.fm> | 2019-11-16 07:10:19 +0000 |
|---|---|---|
| committer | QMK Bot <hello@qmk.fm> | 2019-11-16 07:10:19 +0000 |
| commit | 7891de7f6d64431cedbd580a3f7863533dc8be88 (patch) | |
| tree | a4fc89d7821126c1d101cf7acea75efcecdbc7a9 /lib/python/qmk/commands.py | |
| parent | 897888db419239f013561b155de5993b1966820e (diff) | |
| download | qmk_firmware-7891de7f6d64431cedbd580a3f7863533dc8be88.tar.gz qmk_firmware-7891de7f6d64431cedbd580a3f7863533dc8be88.zip | |
format code according to conventions [skip ci]
Diffstat (limited to 'lib/python/qmk/commands.py')
| -rw-r--r-- | lib/python/qmk/commands.py | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/lib/python/qmk/commands.py b/lib/python/qmk/commands.py index 9fbf00f16..f83a89578 100644 --- a/lib/python/qmk/commands.py +++ b/lib/python/qmk/commands.py | |||
| @@ -3,6 +3,7 @@ | |||
| 3 | import json | 3 | import json |
| 4 | import qmk.keymap | 4 | import qmk.keymap |
| 5 | 5 | ||
| 6 | |||
| 6 | def create_make_command(keyboard, keymap, target=None): | 7 | def create_make_command(keyboard, keymap, target=None): |
| 7 | """Create a make compile command | 8 | """Create a make compile command |
| 8 | 9 | ||
| @@ -23,6 +24,7 @@ def create_make_command(keyboard, keymap, target=None): | |||
| 23 | return ['make', ':'.join((keyboard, keymap))] | 24 | return ['make', ':'.join((keyboard, keymap))] |
| 24 | return ['make', ':'.join((keyboard, keymap, target))] | 25 | return ['make', ':'.join((keyboard, keymap, target))] |
| 25 | 26 | ||
| 27 | |||
| 26 | def parse_configurator_json(configurator_filename): | 28 | def parse_configurator_json(configurator_filename): |
| 27 | """Open and parse a configurator json export | 29 | """Open and parse a configurator json export |
| 28 | """ | 30 | """ |
| @@ -31,6 +33,7 @@ def parse_configurator_json(configurator_filename): | |||
| 31 | file.close() | 33 | file.close() |
| 32 | return user_keymap | 34 | return user_keymap |
| 33 | 35 | ||
| 36 | |||
| 34 | def compile_configurator_json(configurator_filename, bootloader=None): | 37 | def compile_configurator_json(configurator_filename, bootloader=None): |
| 35 | """Convert a configurator export JSON file into a C file | 38 | """Convert a configurator export JSON file into a C file |
| 36 | 39 | ||
| @@ -54,4 +57,3 @@ def compile_configurator_json(configurator_filename, bootloader=None): | |||
| 54 | if bootloader is None: | 57 | if bootloader is None: |
| 55 | return create_make_command(user_keymap['keyboard'], user_keymap['keymap']) | 58 | return create_make_command(user_keymap['keyboard'], user_keymap['keymap']) |
| 56 | return create_make_command(user_keymap['keyboard'], user_keymap['keymap'], bootloader) | 59 | return create_make_command(user_keymap['keyboard'], user_keymap['keymap'], bootloader) |
| 57 | |||
