[maple_upload] Improve script on linux

This makes it possible to recover if upload-reset isn't working,
for example if a board is running a sketch without USB CDC enabled

Changes:
* Uncomment `set -e`
* Ask the user to manually reset their device if upload-reset fails
* Retry dfu-util if no device is found
* Print periods while waiting for serial port
* Exit with an error if script times out while waiting for serial port
* Send all messages to STDERR

Author: GrantM11235

linux/maple_upload.sh

@@ -1,6 +1,6 @@
 #!/bin/bash
 
-#set -e
+set -e
 
 if [ $# -lt 4 ]; then
   echo "Usage: $0 $# <dummy_port> <altID> <usbID> <binfile>" >&2
@@ -24,16 +24,42 @@ DIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
 # This value is in milliseonds
 # You may need to tune this to your system
 # 750ms to 1500ms seems to work on my Mac
+# This is less critical now that we automatically retry dfu-util
 
-"${DIR}/upload-reset" "${dummy_port_fullpath}" 750
+if ! "${DIR}/upload-reset" "${dummy_port_fullpath}" 750
+then
+  echo "****************************************" >&2
+  echo "* Could not automatically reset device *" >&2
+  echo "* Please manually reset device!        *" >&2
+  echo "****************************************" >&2
+  sleep 2 # Wait for user to see message.
+fi
 
-"${DIR}/dfu-util.sh" -d "${usbID}" -a "${altID}" -D "${binfile}" ${dfuse_addr} -R
+COUNTER=10
+while "${DIR}/dfu-util.sh" -d "${usbID}" -a "${altID}" -D "${binfile}" ${dfuse_addr} -R ; ((ret=$?))
+do
+  if [ $ret -eq 74 ] && [ $((--COUNTER)) -gt 0 ]
+  then
+    # I/O error, probably because no DFU device was found
+    echo "Trying ${COUNTER} more time(s)" >&2
+    sleep 1
+  else
+    exit $ret
+  fi
+done
 
-echo -n Waiting for "${dummy_port_fullpath}" serial...
+echo -n "Waiting for ${dummy_port_fullpath} serial..." >&2
 
-COUNTER=0
-while [ ! -r "${dummy_port_fullpath}" ] && ((COUNTER++ < 40)); do
+COUNTER=40
+while [ ! -r "${dummy_port_fullpath}" ] && ((COUNTER--)); do
+  echo -n "." >&2
   sleep 0.1
 done
 
-echo Done
+if [ $COUNTER -eq -1 ]
+then
+  echo " Timed out." >&2
+  exit 1
+else
+  echo " Done." >&2
+fi