Merge remote-tracking branch 'upstream/master'

This commit is contained in:
Rowan Decker 2015-03-08 20:17:39 -07:00
commit 2922fce0f7
21 changed files with 543 additions and 97 deletions

View file

@ -49,7 +49,7 @@ done
if [[ "$SERIAL_PORT" != "" ]] && [[ -e "$SERIAL_PORT" ]]; then
echo "NOTE: This may fail if the uC is in a bad state or does not support remote flashing"
printf "reload\r" > $SERIAL_PORT
sleep 1
sleep 2
fi
# Load via dfu-util