Nulo/qmk_firmware
1
0
Fork 0
Code Releases Activity

Fix compiling json files. (#6340)

Browse source
This commit is contained in:
skullydazed 2019-07-15 15:12:35 -07:00 committed by GitHub
parent a25dd58bc5
commit 7d557a0514
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 8 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
build_json.mk
View file

@ -23,5 +23,5 @@ endif
# Generate the keymap.c # Generate the keymap.c
ifneq ("$(KEYMAP_JSON)","") ifneq ("$(KEYMAP_JSON)","")
_ = $(shell bin/qmk-json-keymap -f $(KEYMAP_JSON) -o $(KEYMAP_C)) _ = $(shell test -e $(KEYMAP_C) || bin/qmk-json-keymap $(KEYMAP_JSON) -o $(KEYMAP_C))
endif endif

12
lib/python/qmk/cli/json/keymap.py
View file

@ -28,8 +28,8 @@ def main(cli):
exit(1) exit(1)
# Environment processing # Environment processing
if cli.args.output == ('-'): if cli.config.general.output == ('-'):
cli.args.output = None cli.config.general.output = None
# Parse the configurator json # Parse the configurator json
with open(qmk.path.normpath(cli.args.filename), 'r') as fd: with open(qmk.path.normpath(cli.args.filename), 'r') as fd:
@ -38,17 +38,17 @@ def main(cli):
# Generate the keymap # Generate the keymap
keymap_c = qmk.keymap.generate(user_keymap['keyboard'], user_keymap['layout'], user_keymap['layers']) keymap_c = qmk.keymap.generate(user_keymap['keyboard'], user_keymap['layout'], user_keymap['layers'])
if cli.args.output: if cli.config.general.output:
output_dir = os.path.dirname(cli.args.output) output_dir = os.path.dirname(cli.config.general.output)
if not os.path.exists(output_dir): if not os.path.exists(output_dir):
os.makedirs(output_dir) os.makedirs(output_dir)
output_file = qmk.path.normpath(cli.args.output) output_file = qmk.path.normpath(cli.config.general.output)
with open(output_file, 'w') as keymap_fd: with open(output_file, 'w') as keymap_fd:
keymap_fd.write(keymap_c) keymap_fd.write(keymap_c)
cli.log.info('Wrote keymap to %s.', cli.args.output) cli.log.info('Wrote keymap to %s.', cli.config.general.output)
else: else:
print(keymap_c) print(keymap_c)

2
lib/python/qmk/keymap.py
View file

@ -63,7 +63,7 @@ def generate(keyboard, layout, layers):
layer_txt.append('\t[%s] = %s(%s)' % (layer_num, layout, layer_keys)) layer_txt.append('\t[%s] = %s(%s)' % (layer_num, layout, layer_keys))
keymap = '\n'.join(layer_txt) keymap = '\n'.join(layer_txt)
keymap_c = template(keyboard, keymap) keymap_c = template(keyboard)
return keymap_c.replace('__KEYMAP_GOES_HERE__', keymap) return keymap_c.replace('__KEYMAP_GOES_HERE__', keymap)