ao-bringup: Use ao-test-igniter voltage check feature in pyro tests

This makes sure all pyro channels are 'in range' during testing to
validate the ADC is operating nominally.

Signed-off-by: Keith Packard <keithp@keithp.com>

diff --git a/ao-bringup/test-easymega b/ao-bringup/test-easymega
index 1e419b4418813ca75f393e6dd73ae5050fa30087..04dfb44bfef9b903b64f97336f669f585a5a246f 100755 (executable)
--- a/ao-bringup/test-easymega
+++ b/ao-bringup/test-easymega
@@ -19,7 +19,7 @@ ao-list | while read product serial dev; do
            echo "Testing $product $serial $dev"
            echo ""
 
-           ./test-igniters $dev main drogue 3 0 1 2
+           ./test-igniters $dev --rplus=100 --rminus=27 --adcmax=4095 main drogue 3 0 1 2
            echo""
 
            echo "Testing baro sensor"

diff --git a/ao-bringup/test-easymini b/ao-bringup/test-easymini
index c4479680120e4d722353bc1834a06535c3f657d7..3268f44cdb0ddedacad98555d4624b98b3f143e6 100755 (executable)
--- a/ao-bringup/test-easymini
+++ b/ao-bringup/test-easymini
@@ -23,7 +23,7 @@ while [ $found -eq 0 ]; do
                
                sleep 0.25
 
-               ./test-igniters-nowait "$dev" drogue main
+               ./test-igniters-nowait "$dev" --rplus=100 --rminus=27 --adcmax=32767 drogue main
                echo ""
 
                echo "Testing baro sensor"

diff --git a/ao-bringup/test-igniters b/ao-bringup/test-igniters
index 763f42a9aad2c68ebe1257bfcb269e9964ce6046..1cbe4744f70b6b25452cbe5cb0c5c5f2c8b00a7a 100755 (executable)
--- a/ao-bringup/test-igniters
+++ b/ao-bringup/test-igniters
@@ -2,13 +2,19 @@
 
 dev="$1"
 shift
+args=""
 
 for igniter in "$@"; do
-       pass="n"
-       while [ $pass != "y" ]; do
+    case "$igniter" in
+       -*)
+           args="$args $igniter"
+           ;;
+       *)
+           pass="n"
+           while [ $pass != "y" ]; do
                echo -n "Testing $igniter igniter. Press enter to continue..."
                read foo < /dev/tty
-               ../ao-tools/ao-test-igniter/ao-test-igniter --tty="$dev" $igniter
+               ../ao-tools/ao-test-igniter/ao-test-igniter --tty="$dev" $args $igniter
 
                case $? in
                    0)
@@ -19,7 +25,9 @@ for igniter in "$@"; do
                        echo "Failed. Try again."
                        ;;
                esac
-       done
+           done
+           ;;
+    esac
 done
 
 exit 0

diff --git a/ao-bringup/test-igniters-nowait b/ao-bringup/test-igniters-nowait
index 849f91de738c56826694f097da3245d1916c4304..338f49af7b058b6811adf943d02a2530e08c6c79 100755 (executable)
--- a/ao-bringup/test-igniters-nowait
+++ b/ao-bringup/test-igniters-nowait
@@ -2,13 +2,19 @@
 
 dev="$1"
 shift
+args=""
 
 for igniter in "$@"; do
-       pass="n"
-       while [ $pass != "y" ]; do
+    case "$igniter" in
+       -*)
+           args="$args $igniter"
+           ;;
+       *)
+           pass="n"
+           while [ $pass != "y" ]; do
 
                echo "Testing $igniter igniter."
-               ../ao-tools/ao-test-igniter/ao-test-igniter --tty="$dev" $igniter
+               ../ao-tools/ao-test-igniter/ao-test-igniter --tty="$dev" $args $igniter
 
                case $? in
                    0)
@@ -20,7 +26,9 @@ for igniter in "$@"; do
                        read foo < /dev/tty
                        ;;
                esac
-       done
+           done
+           ;;
+    esac
 done
 
 exit 0

diff --git a/ao-bringup/test-telemega b/ao-bringup/test-telemega
index 8505a682d03c7b7dc0ccd88c5c338752efccbd83..3355d866ba464e381a3c7dfd362d65930237cda5 100755 (executable)
--- a/ao-bringup/test-telemega
+++ b/ao-bringup/test-telemega
@@ -18,7 +18,7 @@ ao-list | while read product serial dev; do
 
            echo "Testing $product $serial $dev"
 
-           ./test-igniters $dev main drogue 3 0 1 2
+           ./test-igniters $dev --rplus=100 --rminus=27 --adcmax=4095 main drogue 3 0 1 2
            echo""
 
            echo "Testing baro sensor"

diff --git a/ao-bringup/test-telemetrum b/ao-bringup/test-telemetrum
index 8fa1d1d3d0fde2302770e4eeff1ea93e86d0d925..914271837af9a6d953f326ae0d88df2e5ae82764 100755 (executable)
--- a/ao-bringup/test-telemetrum
+++ b/ao-bringup/test-telemetrum
@@ -19,7 +19,7 @@ ao-list | while read product serial dev; do
            echo "Testing $product $serial $dev"
            echo ""
 
-           ./test-igniters "$dev" drogue main
+           ./test-igniters "$dev" --rplus=100 --rminus=27 --adcmax=4095 drogue main
            echo ""
 
            echo "Testing baro sensor"

diff --git a/ao-bringup/test-telemini b/ao-bringup/test-telemini
index 7df36a28ade225432a213f3e4df3463fd98122c7..c4a22f64813e267394cd3edb08f20753c23b85e9 100755 (executable)
--- a/ao-bringup/test-telemini
+++ b/ao-bringup/test-telemini
@@ -19,7 +19,7 @@ ao-list | while read product serial dev; do
            echo "Testing $product $serial $dev"
            echo ""
 
-           ./test-igniters "$dev" drogue main
+           ./test-igniters "$dev" --rplus=100 --rminus=27 --adcmax=4095 drogue main
            echo ""
 
            echo "Testing baro sensor"

diff --git a/src/Makefile.defs b/src/Makefile.defs
index 897f7ac1b35ade9d2574b45c6e1f1208f6923a6a..d9b719973da61e5c52fabe871d8b3111318b7630 100644 (file)
--- a/src/Makefile.defs
+++ b/src/Makefile.defs
@@ -16,7 +16,8 @@ WARN_FLAGS=-Wall -Wextra -Werror -Wcast-align \
        -Wmissing-declarations \
        -Wnested-externs \
        -Wshadow \
-       -Warray-bounds=2
+       -Warray-bounds=2 \
+       -Wconversion
 
 OPT=-Os -Wl,-Map=$(PROGNAME)-$(VERSION).map