From 2db7efcc40e997b78c7ca6e792b66153921ff820 Mon Sep 17 00:00:00 2001
From: Keith Packard <keithp@keithp.com>
Date: Mon, 26 Jul 2021 22:13:58 -0700
Subject: [PATCH] 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>
---
 ao-bringup/test-easymega        |  2 +-
 ao-bringup/test-easymini        |  2 +-
 ao-bringup/test-igniters        | 16 ++++++++++++----
 ao-bringup/test-igniters-nowait | 16 ++++++++++++----
 ao-bringup/test-telemega        |  2 +-
 ao-bringup/test-telemetrum      |  2 +-
 ao-bringup/test-telemini        |  2 +-
 src/Makefile.defs               |  3 ++-
 8 files changed, 31 insertions(+), 14 deletions(-)

diff --git a/ao-bringup/test-easymega b/ao-bringup/test-easymega
index 1e419b44..04dfb44b 100755
--- 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 c4479680..3268f44c 100755
--- 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 763f42a9..1cbe4744 100755
--- 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 849f91de..338f49af 100755
--- 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 8505a682..3355d866 100755
--- 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 8fa1d1d3..91427183 100755
--- 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 7df36a28..c4a22f64 100755
--- 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 897f7ac1..d9b71997 100644
--- 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
 
-- 
2.30.2