From: Bdale Garbee <bdale@gag.com>
Date: Thu, 14 Aug 2014 23:08:36 +0000 (-0600)
Subject: Merge branch 'master' of ssh://git.gag.com/scm/git/fw/altos
X-Git-Tag: 1.4.9.3~23
X-Git-Url: https://git.gag.com/?p=fw%2Faltos;a=commitdiff_plain;h=4828be0ca5252ac9cd6061209385dcd6c4c57965;hp=165b7dcf6fba90b15ff32b891cba4b9111c1965b

Merge branch 'master' of ssh://git.gag.com/scm/git/fw/altos
---

diff --git a/ao-bringup/test-telegps b/ao-bringup/test-telegps
index f3174485..9295dd06 100755
--- a/ao-bringup/test-telegps
+++ b/ao-bringup/test-telegps
@@ -42,7 +42,7 @@ ao-list | while read product serial dev; do
 		    exit 1
 	    esac
 
-	    echo "$PRODUCT-v$VERSION" serial "$serial" is ready to ship
+	    echo "$PRODUCT-v$VERSION" serial "$serial" passed functional tests
 	    ret=0
 	    ;;
 	*)
diff --git a/ao-bringup/turnon_telemetrum b/ao-bringup/turnon_telemetrum
index 80193c4c..588c7f31 100755
--- a/ao-bringup/turnon_telemetrum
+++ b/ao-bringup/turnon_telemetrum
@@ -1,17 +1,13 @@
 #!/bin/sh
 
-if [ -x ../ao-tools/ao-stmload/ao-stmload ]; then
-	STMLOAD=../ao-tools/ao-stmload/ao-stmload
-elif [ -x /usr/bin/ao-stmload ]; then
-	STMLOAD=/usr/bin/ao-stmload
+if [ -x /usr/bin/ao-flash-stm ]; then
+	FLASH_STM=/usr/bin/ao-flash-stm
 else
-	echo "Can't find ao-stmload!  Aborting."
+	echo "Can't find ao-flash-stm!  Aborting."
 	exit 1
 fi
 
-if [ -x ../ao-tools/ao-usbload/ao-usbload ]; then
-	USBLOAD=../ao-tools/ao-usbload/ao-usbload
-elif [ -x /usr/bin/ao-usbload ]; then
+if [ -x /usr/bin/ao-usbload ]; then
 	USBLOAD=/usr/bin/ao-usbload
 else
 	echo "Can't find ao-usbload!  Aborting."
@@ -31,9 +27,9 @@ echo
 echo -n "TeleMetrum-$VERSION serial number: "
 read SERIAL
 
-echo $STMLOAD
+echo $FLASH_STM
 
-$STMLOAD --raw ../src/telemetrum-v$VERSION/flash-loader/*.elf || exit 1
+$FLASH_STM ~/altusmetrumllc/Binaries/loaders/telemetrum-v$VERSION-*.elf || exit 1
 
 sleep 2