diff options
| -rwxr-xr-x | ao-bringup/test-easymini | 83 | ||||
| -rwxr-xr-x | ao-bringup/turnon_easymini | 2 |
2 files changed, 46 insertions, 39 deletions
diff --git a/ao-bringup/test-easymini b/ao-bringup/test-easymini index e11244d2..e9948da9 100755 --- a/ao-bringup/test-easymini +++ b/ao-bringup/test-easymini @@ -1,4 +1,4 @@ -#!/bin/sh +#!/bin/bash VERSION=1.0 PRODUCT=EasyMini @@ -8,48 +8,55 @@ 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 -e "\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" - echo "" - - ./test-igniters "$dev" drogue main - echo "" - - echo "Testing baro sensor" - ../ao-tools/ao-test-baro/ao-test-baro --tty="$dev" - - case $? in - 0) - ;; - *) - echo "failed" - exit 1 - esac - echo"" +found=0 +while [ $found -eq 0 ]; do + (ao-list; echo END END END END) | while read product serial dev; do + case "$product" in + "$PRODUCT-v$VERSION") - FLASHSIZE=1048576 + found=1 + echo -e '\e[34m'Testing $product $serial $dev'\e[39m' + echo "" + + ./test-igniters "$dev" drogue main + echo "" - echo "Testing flash" - ../ao-tools/ao-test-flash/ao-test-flash --tty="$dev" "$FLASHSIZE" + echo "Testing baro sensor" + ../ao-tools/ao-test-baro/ao-test-baro --tty="$dev" - case $? in - 0) - ;; - *) - echo "failed" + if [ $? -ne 0 ]; then + echo -e '\e[31m'"$PRODUCT-$VERSION serial $serial failed"'\e[39m' exit 1 - esac - echo"" + fi + echo"" + + FLASHSIZE=1048576 - echo "$PRODUCT-v$VERSION" serial "$serial" is ready to ship - ret=0 - ;; - esac + echo "Testing flash" + ../ao-tools/ao-test-flash/ao-test-flash --tty="$dev" "$FLASHSIZE" + + if [ $? -ne 0 ]; then + echo -e '\e[31m'"$PRODUCT-$VERSION serial $serial failed"'\e[39m' + exit 1 + fi + + echo "" + + echo -e '\e[32m'"$PRODUCT-v$VERSION" serial "$serial" is ready to ship'\e[39m' + exit 0 + ;; + END) + exit 2 + ;; + esac + done + result=$? + if [ $result -ne 2 ]; then + exit $result + fi + echo 'No device, sleeping...' + sleep 1 done diff --git a/ao-bringup/turnon_easymini b/ao-bringup/turnon_easymini index 0b915c5e..4580790a 100755 --- a/ao-bringup/turnon_easymini +++ b/ao-bringup/turnon_easymini @@ -65,7 +65,7 @@ echo $USBLOAD $ALTOS_FILE $USBLOAD --serial=$SERIAL $ALTOS_FILE || exit 1 -sleep 2 +sleep 1 ./test-easymini |