drashna/qmk_firmware
1
0
Fork 0
Code Activity Actions

CLI/c2json: Print 'cpp' error when executed in verbose mode (#12869)

Browse source 
Co-authored-by: Ryan <fauxpark@gmail.com>
This commit is contained in:
Erovia 2021-05-27 17:42:38 +01:00 • committed by GitHub
parent 147cf8afbb
commit 84883d3400
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 20 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

9
lib/python/qmk/cli/c2json.py
View file

@ -9,6 +9,7 @@ import qmk.keymap
import qmk.path
from qmk.json_encoders import InfoJSONEncoder
from qmk.keyboard import keyboard_completer, keyboard_folder
from qmk.errors import CppError
@cli.argument('--no-cpp', arg_only=True, action='store_false', help='Do not use \'cpp\' on keymap.c')
@ -37,7 +38,13 @@ def c2json(cli):
cli.args.output = None
# Parse the keymap.c
keymap_json = qmk.keymap.c2json(cli.args.keyboard, cli.args.keymap, cli.args.filename, use_cpp=cli.args.no_cpp)
try:
keymap_json = qmk.keymap.c2json(cli.args.keyboard, cli.args.keymap, cli.args.filename, use_cpp=cli.args.no_cpp)
except CppError as e:
if cli.config.general.verbose:
cli.log.debug('The C pre-processor ran into a fatal error: %s', e)
cli.log.error('Something went wrong. Try to use --no-cpp.\nUse the CLI in verbose mode to find out more.')
return False
# Generate the keymap.json
try: