6 files changed, 155 insertions, 7 deletions
diff --git a/ao-bringup/test-telemega b/ao-bringup/test-telemega
index 0ac475a3..ec024e32 100755
--- a/ao-bringup/test-telemega
+++ b/ao-bringup/test-telemega
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-VERSION=2.0
+VERSION=3.0
 PRODUCT=TeleMega
 BASE=`echo $PRODUCT | tr 'A-Z' 'a-z'`
 
diff --git a/ao-bringup/test-telemega-v2.0 b/ao-bringup/test-telemega-v2.0
new file mode 100755
index 00000000..0ac475a3
--- /dev/null
+++ b/ao-bringup/test-telemega-v2.0
@@ -0,0 +1,67 @@
+#!/bin/sh
+
+VERSION=2.0
+PRODUCT=TeleMega
+BASE=`echo $PRODUCT | tr 'A-Z' 'a-z'`
+
+echo "$PRODUCT-v$VERSION Test Program"
+echo "Copyright 2014 by Keith Packard.  Released under GPL v2"
+echo
+echo "Expectations:"
+echo "\t$PRODUCT v$VERSION powered from USB"
+echo
+
+ret=1
+ao-list | while read product serial dev; do
+    case "$product" in
+	"$PRODUCT-v$VERSION")
+
+	    echo "Testing $product $serial $dev"
+
+	    ./test-igniters $dev main drogue 3 0 1 2
+	    echo""
+
+	    echo "Testing baro sensor"
+	    ../ao-tools/ao-test-baro/ao-test-baro --tty="$dev"
+
+	    case $? in
+		0)
+		    ;;
+		*)
+		    echo "failed"
+		    exit 1
+	    esac
+	    echo""
+
+	    FLASHSIZE=8388608
+
+	    echo "Testing flash"
+	    ../ao-tools/ao-test-flash/ao-test-flash --tty="$dev" "$FLASHSIZE"
+
+	    case $? in
+		0)
+		    ;;
+		*)
+		    echo "failed"
+		    exit 1
+	    esac
+	    echo""
+
+	    echo "Testing GPS"
+	    ../ao-tools/ao-test-gps/ao-test-gps --tty="$dev"
+
+	    case $? in
+		0)
+		    ;;
+		*)
+		    echo "failed"
+		    exit 1
+	    esac
+	    echo""
+
+	    echo "$PRODUCT-v$VERSION" serial "$serial" is ready to ship
+	    echo "\007"
+	    ret=0
+	    ;;
+    esac
+done
diff --git a/ao-bringup/turnon_telebt b/ao-bringup/turnon_telebt
index fb8318b3..8bf9bcb5 100755
--- a/ao-bringup/turnon_telebt
+++ b/ao-bringup/turnon_telebt
@@ -44,7 +44,7 @@ esac
 FLASH_FILE=$REPO/loaders/telebt-v$VERSION-altos-flash-*.bin
 ALTOS_FILE=$REPO/telebt-v$VERSION-*.elf
 
-$DFU_UTIL -a 0 -s 0x08000000:leave -D $FLASH_FILE || exit 1
+$DFU_UTIL -a 0 -s 0x08000000:leave -D $FLASH_FILE
 
 sleep 2
 
diff --git a/ao-bringup/turnon_telegps b/ao-bringup/turnon_telegps
index fd879abd..48af692a 100755
--- a/ao-bringup/turnon_telegps
+++ b/ao-bringup/turnon_telegps
@@ -49,7 +49,7 @@ esac
 FLASH_FILE=$REPO/loaders/telegps-v2.0-altos-flash-*.bin
 ALTOS_FILE=$REPO/telegps-v2.0-*.elf
 
-$DFU_UTIL -a 0 -s 0x08000000:leave -D $FLASH_FILE || exit 1
+$DFU_UTIL -a 0 -s 0x08000000:leave -D $FLASH_FILE 
 
 sleep 2
 
diff --git a/ao-bringup/turnon_telemega b/ao-bringup/turnon_telemega
index e2b539e1..49776788 100755
--- a/ao-bringup/turnon_telemega
+++ b/ao-bringup/turnon_telemega
@@ -14,12 +14,12 @@ else
 	exit 1
 fi
 
-VERSION=2.0
+VERSION=3.0
 REPO=~/altusmetrumllc/Binaries
 PRODUCT=TeleMega
 
 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 "\t$PRODUCT v$VERSION powered from USB"
@@ -44,11 +44,11 @@ esac
 
 echo $FLASH_STM
 
-$FLASH_STM $REPO/loaders/telemega-v$VERSION*.elf || exit 1
+$FLASH_STM $REPO/loaders/telemega-v$VERSION*.elf 
 
 sleep 5
 
-$USBLOAD --serial=$SERIAL $REPO/telemega-v$VERSION*.elf || exit 1
+$USBLOAD --serial=$SERIAL --force $REPO/telemega-v$VERSION*.elf || exit 1
 
 sleep 5
 
diff --git a/ao-bringup/turnon_telemega_v2.0 b/ao-bringup/turnon_telemega_v2.0
new file mode 100755
index 00000000..3c80dd94
--- /dev/null
+++ b/ao-bringup/turnon_telemega_v2.0
@@ -0,0 +1,81 @@
+#!/bin/sh
+
+if [ -x /usr/bin/ao-flash-stm ]; then
+	FLASH_STM=/usr/bin/ao-flash-stm
+else
+	echo "Can't find ao-flash-stm!  Aborting."
+	exit 1
+fi
+
+if [ -x /usr/bin/ao-usbload ]; then
+	USBLOAD=/usr/bin/ao-usbload
+else
+	echo "Can't find ao-usbload!  Aborting."
+	exit 1
+fi
+
+VERSION=2.0
+REPO=~/altusmetrumllc/Binaries
+PRODUCT=TeleMega
+
+echo "$PRODUCT v$VERSION Turn-On and Calibration Program"
+echo "Copyright 2014 by Bdale Garbee.  Released under GPL v2"
+echo
+echo "Expectations:"
+echo "\t$PRODUCT v$VERSION powered from USB"
+echo "\t\twith ST-Link-V2 cabled to debug header"
+echo "\t\twith coax from UHF to frequency counter"
+echo
+
+case $# in
+    1)
+	SERIAL="$1"
+	echo "$PRODUCT-$VERSION serial number: $SERIAL" 
+	;;
+    0)
+	echo -n "$PRODUCT-$VERSION serial number: "
+	read SERIAL
+	;;
+    *)
+	echo "Usage: $0 <serial-number>" 1>&2
+	exit 1;
+	;;
+esac
+
+echo $FLASH_STM
+
+$FLASH_STM $REPO/loaders/telemega-v$VERSION*.elf 
+
+sleep 5
+
+$USBLOAD --serial=$SERIAL --force $REPO/telemega-v$VERSION*.elf || exit 1
+
+sleep 5
+
+dev=`ao-list | awk '/TeleMega-v'"$VERSION"'/ { print $3; exit(0); }'`
+
+case "$dev" in
+/dev/tty*)
+	echo "TeleMega found on $dev"
+	;;
+*)
+	echo 'No TeleMega-v'"$VERSION"' found'
+	exit 1
+	;;
+esac
+
+echo 'E 0' > $dev
+
+SERIAL=$SERIAL ./cal-freq $dev
+
+failed=1
+while [ $failed = 1 ]; do
+    ../ao-tools/ao-cal-accel/ao-cal-accel $dev
+    failed=$?
+done
+
+echo 'E 1' > $dev
+
+./test-telemega-v2.0
+
+exit $?