From acb6d26f9ca67a50f55f2b4edad46a60ac52ad48 Mon Sep 17 00:00:00 2001
From: Grant Miller <GrantM11235@gmail.com>
Date: Fri, 1 May 2020 17:24:08 -0500
Subject: [PATCH 1/5] [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
---
 linux/maple_upload.sh | 40 +++++++++++++++++++++++++++++++++-------
 1 file changed, 33 insertions(+), 7 deletions(-)

diff --git a/linux/maple_upload.sh b/linux/maple_upload.sh
index 6f767332e..b78eab4e4 100755
--- a/linux/maple_upload.sh
+++ b/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

From c0c0f9b658dcab4d5418afe08ebe2b0d7a2e5c2a Mon Sep 17 00:00:00 2001
From: Grant Miller <GrantM11235@gmail.com>
Date: Fri, 1 May 2020 17:32:24 -0500
Subject: [PATCH 2/5] [maple_upload] Use dfu-util.sh on macosx

---
 macosx/dfu-util.sh     | 18 ++++++++++++++++++
 macosx/maple_upload.sh | 13 +------------
 2 files changed, 19 insertions(+), 12 deletions(-)
 create mode 100644 macosx/dfu-util.sh

diff --git a/macosx/dfu-util.sh b/macosx/dfu-util.sh
new file mode 100644
index 000000000..77bd42617
--- /dev/null
+++ b/macosx/dfu-util.sh
@@ -0,0 +1,18 @@
+#!/bin/bash
+
+# Get the directory where the script is running.
+DIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
+
+DFU_UTIL=${DIR}/dfu-util/dfu-util
+if [ ! -x "${DFU_UTIL}" ]; then
+  DFU_UTIL=/opt/local/bin/dfu-util
+fi
+
+# Not found!
+if [ ! -x "${DFU_UTIL}" ]; then
+  echo "$0: error: cannot find ${DFU_UTIL}" >&2
+  exit 2
+fi
+
+# Pass all parameters through
+"${DFU_UTIL}" "$@"
diff --git a/macosx/maple_upload.sh b/macosx/maple_upload.sh
index 5e567e02c..916bda72f 100755
--- a/macosx/maple_upload.sh
+++ b/macosx/maple_upload.sh
@@ -40,18 +40,7 @@ else
   dfuse_addr=""
 fi
 
-#DFU_UTIL=/usr/local/bin/dfu-util
-DFU_UTIL=${DIR}/dfu-util/dfu-util
-if [ ! -x "${DFU_UTIL}" ]; then
-  DFU_UTIL=/opt/local/bin/dfu-util
-fi
-
-if [ ! -x ${DFU_UTIL} ]; then
-  echo "$0: error: cannot find ${DFU_UTIL}" >&2
-  exit 2
-fi
-
-${DFU_UTIL} -d "${usbID}" -a "${altID}" -D "${binfile}" -R ${dfuse_addr} -R
+"${DIR}/dfu-util.sh" -d "${usbID}" -a "${altID}" -D "${binfile}" -R ${dfuse_addr} -R
 
 echo -n Waiting for "${dummy_port_fullpath}" serial...
 

From 07a262002b5e8cf12ff5f4c8ca8fb99b9d26b8aa Mon Sep 17 00:00:00 2001
From: Grant Miller <GrantM11235@gmail.com>
Date: Fri, 1 May 2020 17:42:40 -0500
Subject: [PATCH 3/5] [maple_upload] Copy script from linux to macosx

---
 macosx/maple_upload.sh | 65 +++++++++++++++++++++++++-----------------
 1 file changed, 39 insertions(+), 26 deletions(-)

diff --git a/macosx/maple_upload.sh b/macosx/maple_upload.sh
index 916bda72f..b78eab4e4 100755
--- a/macosx/maple_upload.sh
+++ b/macosx/maple_upload.sh
@@ -6,47 +6,60 @@ if [ $# -lt 4 ]; then
   echo "Usage: $0 $# <dummy_port> <altID> <usbID> <binfile>" >&2
   exit 1
 fi
-altID=$2
-usbID=$3
-binfile=$4
+altID="$2"
+usbID="$3"
+binfile="$4"
 dummy_port_fullpath="/dev/$1"
+if [ $# -eq 5 ]; then
+  dfuse_addr="--dfuse-address $5"
+else
+  dfuse_addr=""
+fi
 
 # Get the directory where the script is running.
 DIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
 
-# -----------------  Old code to reset the USB - which doesn't seem to work --------
-#
-#if we can find the Serial device try resetting it and then sleeping for 1 sec while the board reboots
-#if [ -e $dummy_port_fullpath ]; then
-#	echo "resetting " $dummy_port_fullpath
-#	stty -f $dummy_port_fullpath 1200
-#	sleep 1
-##	stty -f $dummy_port_fullpath 1200
-##	sleep 1
-#fi
-# ------------------  End of old code -----------------
-
 #  ----------------- IMPORTANT -----------------
 # The 2nd parameter to upload-reset is the delay after resetting before it exits
 # 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 [ $# -eq 5 ]; then
-  dfuse_addr="--dfuse-address $5"
-else
-  dfuse_addr=""
+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}" -R ${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 [ ! -c "${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

From 51eab0f609e6e4de4ec83aedd0242be2c1060f88 Mon Sep 17 00:00:00 2001
From: Grant Miller <GrantM11235@gmail.com>
Date: Mon, 4 May 2020 12:25:27 -0500
Subject: [PATCH 4/5] [maple_upload] Run shfmt

---
 linux/maple_upload.sh  | 13 ++++++-------
 macosx/maple_upload.sh | 13 ++++++-------
 2 files changed, 12 insertions(+), 14 deletions(-)

diff --git a/linux/maple_upload.sh b/linux/maple_upload.sh
index b78eab4e4..8a1ca175f 100755
--- a/linux/maple_upload.sh
+++ b/linux/maple_upload.sh
@@ -26,8 +26,7 @@ DIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
 # 750ms to 1500ms seems to work on my Mac
 # This is less critical now that we automatically retry dfu-util
 
-if ! "${DIR}/upload-reset" "${dummy_port_fullpath}" 750
-then
+if ! "${DIR}/upload-reset" "${dummy_port_fullpath}" 750; then
   echo "****************************************" >&2
   echo "* Could not automatically reset device *" >&2
   echo "* Please manually reset device!        *" >&2
@@ -36,10 +35,11 @@ then
 fi
 
 COUNTER=10
-while "${DIR}/dfu-util.sh" -d "${usbID}" -a "${altID}" -D "${binfile}" ${dfuse_addr} -R ; ((ret=$?))
+while
+  "${DIR}/dfu-util.sh" -d "${usbID}" -a "${altID}" -D "${binfile}" ${dfuse_addr} -R
+  ((ret = $?))
 do
-  if [ $ret -eq 74 ] && [ $((--COUNTER)) -gt 0 ]
-  then
+  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
@@ -56,8 +56,7 @@ while [ ! -r "${dummy_port_fullpath}" ] && ((COUNTER--)); do
   sleep 0.1
 done
 
-if [ $COUNTER -eq -1 ]
-then
+if [ $COUNTER -eq -1 ]; then
   echo " Timed out." >&2
   exit 1
 else
diff --git a/macosx/maple_upload.sh b/macosx/maple_upload.sh
index b78eab4e4..8a1ca175f 100755
--- a/macosx/maple_upload.sh
+++ b/macosx/maple_upload.sh
@@ -26,8 +26,7 @@ DIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
 # 750ms to 1500ms seems to work on my Mac
 # This is less critical now that we automatically retry dfu-util
 
-if ! "${DIR}/upload-reset" "${dummy_port_fullpath}" 750
-then
+if ! "${DIR}/upload-reset" "${dummy_port_fullpath}" 750; then
   echo "****************************************" >&2
   echo "* Could not automatically reset device *" >&2
   echo "* Please manually reset device!        *" >&2
@@ -36,10 +35,11 @@ then
 fi
 
 COUNTER=10
-while "${DIR}/dfu-util.sh" -d "${usbID}" -a "${altID}" -D "${binfile}" ${dfuse_addr} -R ; ((ret=$?))
+while
+  "${DIR}/dfu-util.sh" -d "${usbID}" -a "${altID}" -D "${binfile}" ${dfuse_addr} -R
+  ((ret = $?))
 do
-  if [ $ret -eq 74 ] && [ $((--COUNTER)) -gt 0 ]
-  then
+  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
@@ -56,8 +56,7 @@ while [ ! -r "${dummy_port_fullpath}" ] && ((COUNTER--)); do
   sleep 0.1
 done
 
-if [ $COUNTER -eq -1 ]
-then
+if [ $COUNTER -eq -1 ]; then
   echo " Timed out." >&2
   exit 1
 else

From bec6008298daf5a60aa1ddb3ba24511879e2b9f5 Mon Sep 17 00:00:00 2001
From: Grant Miller <GrantM11235@gmail.com>
Date: Mon, 4 May 2020 12:27:34 -0500
Subject: [PATCH 5/5] [maple_upload] Reduce number of retries

---
 linux/maple_upload.sh  | 2 +-
 macosx/maple_upload.sh | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/linux/maple_upload.sh b/linux/maple_upload.sh
index 8a1ca175f..df751aae4 100755
--- a/linux/maple_upload.sh
+++ b/linux/maple_upload.sh
@@ -34,7 +34,7 @@ if ! "${DIR}/upload-reset" "${dummy_port_fullpath}" 750; then
   sleep 2 # Wait for user to see message.
 fi
 
-COUNTER=10
+COUNTER=5
 while
   "${DIR}/dfu-util.sh" -d "${usbID}" -a "${altID}" -D "${binfile}" ${dfuse_addr} -R
   ((ret = $?))
diff --git a/macosx/maple_upload.sh b/macosx/maple_upload.sh
index 8a1ca175f..df751aae4 100755
--- a/macosx/maple_upload.sh
+++ b/macosx/maple_upload.sh
@@ -34,7 +34,7 @@ if ! "${DIR}/upload-reset" "${dummy_port_fullpath}" 750; then
   sleep 2 # Wait for user to see message.
 fi
 
-COUNTER=10
+COUNTER=5
 while
   "${DIR}/dfu-util.sh" -d "${usbID}" -a "${altID}" -D "${binfile}" ${dfuse_addr} -R
   ((ret = $?))