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 f31744850dddb579e983c632f909582d53b86686..9295dd062db03c698308eb4198530c9e27f79afc 100755 (executable)
--- 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 80193c4c448f98700f074d5eff3a211f2fe6ced6..588c7f317e6c01568d330266834c3f1c12705bd0 100755 (executable)
--- 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