ao-bringup: Allow dfu_util to "fail" while flashing chaoskey

[fw/altos] / ao-bringup / test-easymega

diff --git a/ao-bringup/test-easymega b/ao-bringup/test-easymega
index eabe1ee5f975aa6e2b29dc43997e385ef9296d9e..2f0a7822335e8ea46fb2babdfb6bc568da593e39 100755 (executable)
--- a/ao-bringup/test-easymega
+++ b/ao-bringup/test-easymega
@@ -12,27 +12,15 @@ echo "\t$PRODUCT v$VERSION powered from USB"
 echo
 
 ret=1
-ao-list | while read product serial dev; do
+../ao-tools/ao-list/ao-list | while read product serial dev; do
     case "$product" in
        "$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 drogue main 0 1 2 3
+           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