Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fix compiling json files. #6340

Merged
merged 1 commit into from
Jul 15, 2019
Merged

Fix compiling json files. #6340

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion build_json.mk
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,5 +23,5 @@ endif

# Generate the keymap.c
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
12 changes: 6 additions & 6 deletions lib/python/qmk/cli/json/keymap.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,8 +28,8 @@ def main(cli):
exit(1)

# Environment processing
if cli.args.output == ('-'):
cli.args.output = None
if cli.config.general.output == ('-'):
cli.config.general.output = None

# Parse the configurator json
with open(qmk.path.normpath(cli.args.filename), 'r') as fd:
Expand All @@ -38,17 +38,17 @@ def main(cli):
# Generate the keymap
keymap_c = qmk.keymap.generate(user_keymap['keyboard'], user_keymap['layout'], user_keymap['layers'])

if cli.args.output:
output_dir = os.path.dirname(cli.args.output)
if cli.config.general.output:
output_dir = os.path.dirname(cli.config.general.output)

if not os.path.exists(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:
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:
print(keymap_c)
2 changes: 1 addition & 1 deletion lib/python/qmk/keymap.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,7 @@ def generate(keyboard, layout, layers):
layer_txt.append('\t[%s] = %s(%s)' % (layer_num, layout, layer_keys))

keymap = '\n'.join(layer_txt)
keymap_c = template(keyboard, keymap)
keymap_c = template(keyboard)

return keymap_c.replace('__KEYMAP_GOES_HERE__', keymap)

Expand Down