Merge branch 'branch-1.6' into debian

Conflicts:
	ChangeLog
	altoslib/AltosTelemetryReader.java
	configure.ac

1 files changed, 6 insertions, 14 deletions

diff --git a/ao-bringup/test-easymini b/ao-bringup/test-easymini
index 17e00955..e11244d2 100755
--- a/ao-bringup/test-easymini
+++ b/ao-bringup/test-easymini
@@ -17,17 +17,10 @@ ao-list | while read product serial dev; do
 	"$PRODUCT-v$VERSION")
 
 	    echo "Testing $product $serial $dev"
-
-	    echo "Testing igniters. Both should flash"
-	    ../ao-tools/ao-test-igniter/ao-test-igniter --tty="$dev" drogue main
-
-	    case $? in
-		0)
-		    ;;
-		*)
-		    echo "failed"
-		    exit 1
-	    esac
+	    echo ""
+	    
+	    ./test-igniters "$dev" drogue main
+	    echo ""
 
 	    echo "Testing baro sensor"
 	    ../ao-tools/ao-test-baro/ao-test-baro --tty="$dev"
@@ -39,6 +32,7 @@ ao-list | while read product serial dev; do
 		    echo "failed"
 		    exit 1
 	    esac
+	    echo""
 
 	    FLASHSIZE=1048576
 
@@ -52,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