aboutsummaryrefslogtreecommitdiff
path: root/util
diff options
context:
space:
mode:
authorNick Brassel <nick@tzarc.org>2020-06-06 18:52:19 +1000
committerJames Young <18669334+noroadsleft@users.noreply.github.com>2020-08-29 14:30:02 -0700
commit385d49cc39b57e74203e0c1c78c0789d249e4742 (patch)
treedbd8b3f7bc30a9d40d51ffaa5cd5a93d5eb47359 /util
parent5cc3ab38c9148cd6bc7ccdba176a88fbb95653b1 (diff)
downloadqmk_firmware-385d49cc39b57e74203e0c1c78c0789d249e4742.tar.gz
qmk_firmware-385d49cc39b57e74203e0c1c78c0789d249e4742.zip
Initial work for consolidation of ChibiOS platform files (#8327)
* Initial work for consolidation of board files and default ChibiOS configs. * Migrate F401/F411 black pills for testing. * Add early init bootloader jump flag. * Add support for I2C in order to use i2c_scanner keymap. * Add F401/F411 HSE bypass to get things booting. * Exempt "hooked" ChibiOS conf files from updater script. * Fix up ordering for bootloader_defs file check. * Match previous $(KEYBOARD_PATHS) value for Proton-C, updated for all board configs.
Diffstat (limited to 'util')
-rwxr-xr-xutil/chibios-upgrader.sh6
-rwxr-xr-xutil/travis_compiled_push.sh2
2 files changed, 6 insertions, 2 deletions
diff --git a/util/chibios-upgrader.sh b/util/chibios-upgrader.sh
index 2174da3cf..ebc12abe7 100755
--- a/util/chibios-upgrader.sh
+++ b/util/chibios-upgrader.sh
@@ -38,7 +38,11 @@ find_chibi_files() {
38 local search_path="$1" 38 local search_path="$1"
39 shift 39 shift
40 local conditions=( "$@" ) 40 local conditions=( "$@" )
41 find -L "$search_path" -not -path '*/lib/chibios*' -and -not -path '*/lib/ugfx*' -and -not -path '*/util/*' -and \( "${conditions[@]}" \) | sort 41 for file in $(find -L "$search_path" -not -path '*/lib/chibios*' -and -not -path '*/lib/ugfx*' -and -not -path '*/util/*' -and \( "${conditions[@]}" \) | sort) ; do
42 if [ -z "$(grep 'include_next' "$file")" ] ; then
43 echo $file
44 fi
45 done
42} 46}
43 47
44revert_chibi_files() { 48revert_chibi_files() {
diff --git a/util/travis_compiled_push.sh b/util/travis_compiled_push.sh
index 68f6d5c11..195a87208 100755
--- a/util/travis_compiled_push.sh
+++ b/util/travis_compiled_push.sh
@@ -13,7 +13,7 @@ if [[ "$TRAVIS_BRANCH" == "master" && "$TRAVIS_PULL_REQUEST" == "false" ]] ; the
13# fix formatting 13# fix formatting
14git checkout master 14git checkout master
15git diff --diff-filter=AM --name-only -n 1 -z ${TRAVIS_COMMIT_RANGE} | xargs -0 dos2unix 15git diff --diff-filter=AM --name-only -n 1 -z ${TRAVIS_COMMIT_RANGE} | xargs -0 dos2unix
16git diff --diff-filter=AM --name-only -n 1 -z ${TRAVIS_COMMIT_RANGE} '*.c' '*.h' '*.cpp' | grep -z -e '^drivers' -e '^quantum' -e '^tests' -e '^tmk_core' | grep -zv -e 'quantum/template' -e 'tmk_core/protocol/usb_hid' | xargs -0 clang-format-7 -i 16git diff --diff-filter=AM --name-only -n 1 -z ${TRAVIS_COMMIT_RANGE} '*.c' '*.h' '*.cpp' | grep -z -e '^drivers' -e '^quantum' -e '^tests' -e '^tmk_core' | grep -zv -e 'quantum/template' -e 'tmk_core/protocol/usb_hid' -e 'platforms/chibios' | xargs -0 clang-format-7 -i
17git diff --diff-filter=AM --name-only -n 1 -z ${TRAVIS_COMMIT_RANGE} | xargs -0 git add 17git diff --diff-filter=AM --name-only -n 1 -z ${TRAVIS_COMMIT_RANGE} | xargs -0 git add
18git commit -m "format code according to conventions [skip ci]" && git push git@github.com:qmk/qmk_firmware.git master 18git commit -m "format code according to conventions [skip ci]" && git push git@github.com:qmk/qmk_firmware.git master
19 19