diff options
author | Zach White <skullydazed@gmail.com> | 2021-01-16 15:13:04 -0800 |
---|---|---|
committer | GitHub <noreply@github.com> | 2021-01-16 15:13:04 -0800 |
commit | d9785ec31339d7f80279fd3d1005f76689ed2f6a (patch) | |
tree | 01f9e771367cfcd18d347eef7f85ce78a3b5ba50 /lib/python/qmk/cli/chibios/confmigrate.py | |
parent | c628408688306ed3e970505268cc4a235af8a5ff (diff) | |
download | qmk_firmware-d9785ec31339d7f80279fd3d1005f76689ed2f6a.tar.gz qmk_firmware-d9785ec31339d7f80279fd3d1005f76689ed2f6a.zip |
Improve the compile and flash subcommands (#11334)
* add support for --clean to compile and flash
* compile standalone JSON keymaps without polluting the tree
* Add support for passing environment vars to make
* make flake8 happy
* document changes to qmk compile and flash
* add -e support to json export compiling
* Fix python 3.6
* honor $MAKE
* add support for parallel builds
Diffstat (limited to 'lib/python/qmk/cli/chibios/confmigrate.py')
-rw-r--r-- | lib/python/qmk/cli/chibios/confmigrate.py | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/lib/python/qmk/cli/chibios/confmigrate.py b/lib/python/qmk/cli/chibios/confmigrate.py index eae294a0c..b9cfda961 100644 --- a/lib/python/qmk/cli/chibios/confmigrate.py +++ b/lib/python/qmk/cli/chibios/confmigrate.py | |||
@@ -13,7 +13,7 @@ def eprint(*args, **kwargs): | |||
13 | print(*args, file=sys.stderr, **kwargs) | 13 | print(*args, file=sys.stderr, **kwargs) |
14 | 14 | ||
15 | 15 | ||
16 | fileHeader = """\ | 16 | file_header = """\ |
17 | /* Copyright 2020 QMK | 17 | /* Copyright 2020 QMK |
18 | * | 18 | * |
19 | * This program is free software: you can redistribute it and/or modify | 19 | * This program is free software: you can redistribute it and/or modify |
@@ -77,7 +77,7 @@ def check_diffs(input_defs, reference_defs): | |||
77 | 77 | ||
78 | 78 | ||
79 | def migrate_chconf_h(to_override, outfile): | 79 | def migrate_chconf_h(to_override, outfile): |
80 | print(fileHeader.format(cli.args.input.relative_to(QMK_FIRMWARE), cli.args.reference.relative_to(QMK_FIRMWARE)), file=outfile) | 80 | print(file_header.format(cli.args.input.relative_to(QMK_FIRMWARE), cli.args.reference.relative_to(QMK_FIRMWARE)), file=outfile) |
81 | 81 | ||
82 | for override in to_override: | 82 | for override in to_override: |
83 | print("#define %s %s" % (override[0], override[1]), file=outfile) | 83 | print("#define %s %s" % (override[0], override[1]), file=outfile) |
@@ -87,7 +87,7 @@ def migrate_chconf_h(to_override, outfile): | |||
87 | 87 | ||
88 | 88 | ||
89 | def migrate_halconf_h(to_override, outfile): | 89 | def migrate_halconf_h(to_override, outfile): |
90 | print(fileHeader.format(cli.args.input.relative_to(QMK_FIRMWARE), cli.args.reference.relative_to(QMK_FIRMWARE)), file=outfile) | 90 | print(file_header.format(cli.args.input.relative_to(QMK_FIRMWARE), cli.args.reference.relative_to(QMK_FIRMWARE)), file=outfile) |
91 | 91 | ||
92 | for override in to_override: | 92 | for override in to_override: |
93 | print("#define %s %s" % (override[0], override[1]), file=outfile) | 93 | print("#define %s %s" % (override[0], override[1]), file=outfile) |
@@ -97,7 +97,7 @@ def migrate_halconf_h(to_override, outfile): | |||
97 | 97 | ||
98 | 98 | ||
99 | def migrate_mcuconf_h(to_override, outfile): | 99 | def migrate_mcuconf_h(to_override, outfile): |
100 | print(fileHeader.format(cli.args.input.relative_to(QMK_FIRMWARE), cli.args.reference.relative_to(QMK_FIRMWARE)), file=outfile) | 100 | print(file_header.format(cli.args.input.relative_to(QMK_FIRMWARE), cli.args.reference.relative_to(QMK_FIRMWARE)), file=outfile) |
101 | 101 | ||
102 | print("#include_next <mcuconf.h>\n", file=outfile) | 102 | print("#include_next <mcuconf.h>\n", file=outfile) |
103 | 103 | ||