diff options
| author | Dan Halbert <halbert@halwitz.org> | 2017-05-21 23:20:47 -0400 |
|---|---|---|
| committer | Dan Halbert <halbert@halwitz.org> | 2017-05-21 23:20:47 -0400 |
| commit | 5c7071e92a4106429ea11497cd37d12a6319fa3f (patch) | |
| tree | 1dfe0f9a0bf2ba2222cb4ba0badd430510fed78a | |
| parent | 253bdf7739a0b9f1c08797179ec8350e2d5c55e1 (diff) | |
| parent | eeced45bed8aa3da36fa7d62c2fa5915fa07dfb8 (diff) | |
Merge branch 'master' into add-ure-et-al
| -rw-r--r-- | .travis.yml | 1 | ||||
| -rw-r--r-- | atmel-samd/main.c | 3 |
2 files changed, 3 insertions, 1 deletions
diff --git a/.travis.yml b/.travis.yml index 6400611dc..7f58adc8a 100644 --- a/.travis.yml +++ b/.travis.yml @@ -41,7 +41,6 @@ script: - tools/build_adafruit_bins.sh - make -C minimal CROSS=1 build/firmware.bin - ls -l minimal/build/firmware.bin - - tools/check_code_size.sh - mkdir -p ${HOME}/persist # Save new firmware for reference, but only if building a main branch, not a pull request - 'if [ "$TRAVIS_PULL_REQUEST" = "false" ]; then cp minimal/build/firmware.bin ${HOME}/persist/; fi' diff --git a/atmel-samd/main.c b/atmel-samd/main.c index a1ccf0e3c..a45a59d1e 100644 --- a/atmel-samd/main.c +++ b/atmel-samd/main.c @@ -576,6 +576,9 @@ int main(void) { reset_samd21(); reset_mp(); + // Turn on autoreload by default but before boot.py in case it wants to change it. + autoreload_enable(); + // If not in safe mode, run boot before initing USB and capture output in a // file. if (safe_mode == NO_SAFE_MODE) { |