don't exit on dfu-util errors, it's not reliable about reporting success

[fw/altos] / ao-bringup / turnon_telegps

diff --git a/ao-bringup/turnon_telegps b/ao-bringup/turnon_telegps
index ba97d503c09d476c1e52068320c286977dbf1f0c..48af692a2f9a02103f3a078105a63919ad144a77 100755 (executable)
--- a/ao-bringup/turnon_telegps
+++ b/ao-bringup/turnon_telegps
@@ -1,10 +1,10 @@
 #!/bin/sh
 
 #!/bin/sh
 

-if [ -x /usr/bin/ao-flash-lpc ]; then
-       FLASH_LPC=/usr/bin/ao-flash-lpc
+if [ -x /usr/bin/dfu-util ]; then
+    DFU_UTIL=/usr/bin/dfu-util

 else
 else

-       echo "Can't find ao-flash-lpc!  Aborting."
-       exit 1
+    echo "Can't find dfu-util! Aborting."
+    exit 1

 fi
 
 if [ -x /usr/bin/ao-usbload ]; then
 fi
 
 if [ -x /usr/bin/ao-usbload ]; then


@@ -14,17 +14,18 @@ else
        exit 1
 fi
 
        exit 1
 fi
 

-VERSION=1.0

 PRODUCT=TeleGPS
 PRODUCT=TeleGPS

-BASE=`echo $PRODUCT | tr 'A-Z' 'a-z'`
-echo $FILE
+VERSION=2.0
+REPO=~/altusmetrumllc/Binaries
+
+#BASE=`echo $PRODUCT | tr 'A-Z' 'a-z'`
+#echo $FILE

 
 echo "$PRODUCT v$VERSION Turn-On and Calibration Program"
 
 echo "$PRODUCT v$VERSION Turn-On and Calibration Program"

-echo "Copyright 2014 by Bdale Garbee.  Released under GPL v2"
+echo "Copyright 2017 by Bdale Garbee.  Released under GPL v3+"

 echo
 echo "Expectations:"
 echo
 echo "Expectations:"

-echo "\t$PRODUCT v$VERSION powered from USB"
-echo "\t\twith ST-Link-V2 cabled to debug header"
+echo "\t$PRODUCT v$VERSION powered from / attached to USB on this computer"

 echo
 
 case $# in
 echo
 
 case $# in


@@ -45,35 +46,31 @@ esac
 #
 # Use released versions of everything
 #
 #
 # Use released versions of everything
 #

-FLASH_FILE=~/altusmetrumllc/Binaries/loaders/telegps-v1.0-altos-flash-*.elf
-ALTOS_FILE=~/altusmetrumllc/Binaries/telegps-v1.0-*.elf
-
-echo $FLASH_LPC $FLASH_FILE
+FLASH_FILE=$REPO/loaders/telegps-v2.0-altos-flash-*.bin
+ALTOS_FILE=$REPO/telegps-v2.0-*.elf

 
 

-$FLASH_LPC $FLASH_FILE || exit 1
+$DFU_UTIL -a 0 -s 0x08000000:leave -D $FLASH_FILE 

 
 sleep 2
 
 
 sleep 2
 

-echo $USBLOAD $ALTOS_FILE
-

 $USBLOAD --serial=$SERIAL $ALTOS_FILE || exit 1
 
 $USBLOAD --serial=$SERIAL $ALTOS_FILE || exit 1
 

-sleep 2
+sleep 3

 
 

-dev=`ao-list | awk '/TeleGPS-v'"$VERSION"'/ { print $3; exit(0); }'`
+dev=`ao-list | awk '/'"$PRODUCT"'-v'"$VERSION"'/ { print $3; exit(0); }'`

 
 case "$dev" in
 /dev/tty*)
 
 case "$dev" in
 /dev/tty*)

-        echo "TeleGPS found on $dev"
+        echo "$PRODUCT found on $dev"

         ;;
 *)
         ;;
 *)

-        echo 'No TeleGPS-v'"$VERSION"' found'
+        echo 'No '"$PRODUCT"'-v'"$VERSION"' found'

         exit 1
         ;;
 esac
 
 SERIAL=$SERIAL ./cal-freq $dev
 
         exit 1
         ;;
 esac
 
 SERIAL=$SERIAL ./cal-freq $dev
 

-./test-telegps
+./test-telegps-v2

 
 exit $?
 
 exit $?