X-Git-Url: https://git.gag.com/?p=fw%2Faltos;a=blobdiff_plain;f=ao-bringup%2Ftest-easymega;h=04dfb44bfef9b903b64f97336f669f585a5a246f;hp=eabe1ee5f975aa6e2b29dc43997e385ef9296d9e;hb=HEAD;hpb=8c212cd5bfa03f71a31d84bd0051314e77d88461

diff --git a/ao-bringup/test-easymega b/ao-bringup/test-easymega
index eabe1ee5..04dfb44b 100755
--- a/ao-bringup/test-easymega
+++ b/ao-bringup/test-easymega
@@ -1,11 +1,11 @@
 #!/bin/sh
 
-VERSION=1.0
+VERSION=2.0
 PRODUCT=EasyMega
 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 "Copyright 2018 by Bdale Garbee.  Released under GPL v2"
 echo
 echo "Expectations:"
 echo "\t$PRODUCT v$VERSION powered from USB"
@@ -17,22 +17,10 @@ ao-list | while read product serial dev; do
 	"$PRODUCT-v$VERSION")
 
 	    echo "Testing $product $serial $dev"
+	    echo ""
 
-	    for igniter in drogue main 0 1 2 3; do
-		echo "Testing $igniter igniter."
-		echo -n "Press enter to continue..."
-		read foo < /dev/tty
-		../ao-tools/ao-test-igniter/ao-test-igniter --tty="$dev" $igniter
-
-		case $? in
-		    0)
-			;;
-		    *)
-			echo "failed"
-			exit 1
-			;;
-		esac
-	    done
+	    ./test-igniters $dev --rplus=100 --rminus=27 --adcmax=4095 main drogue 3 0 1 2
+	    echo""
 
 	    echo "Testing baro sensor"
 	    ../ao-tools/ao-test-baro/ao-test-baro --tty="$dev"
@@ -44,6 +32,7 @@ ao-list | while read product serial dev; do
 		    echo "failed"
 		    exit 1
 	    esac
+	    echo""
 
 	    FLASHSIZE=8388608
 
@@ -57,12 +46,10 @@ ao-list | while read product serial dev; do
 		    echo "failed"
 		    exit 1
 	    esac
+	    echo""
 
 	    echo "$PRODUCT-v$VERSION" serial "$serial" is ready to ship
 	    ret=0
 	    ;;
-	*)
-	    echo "Skipping $product $serial $dev"
-	    ;;
     esac
 done