Merge branch 'branch-1.7' into debian

11 files changed, 253 insertions, 92 deletions

diff --git a/ao-bringup/test-chaoskey b/ao-bringup/test-chaoskey
index b4c8164f..f64b1f84 100755
--- a/ao-bringup/test-chaoskey
+++ b/ao-bringup/test-chaoskey
@@ -12,7 +12,9 @@ case "$#" in
 	serial="--serial $1"
 	;;
     0)
-	snum=`dmesg | grep 'on chaoskey' | tail -1 | sed 's/.*chaoskey \([0-9a-f][0-9a-f]*\) on chaoskey.*/\1/'`
+	snum=`sudo dmesg | awk '/usb.*Product:/ { ck = index($0, "ChaosKey"); }
+		     /usb.*SerialNumber:/ { if (ck) print $5; }' | tail -1`
+
 	case "$snum" in
 	    "")
 		serial=""
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/test-telemini b/ao-bringup/test-telemini
new file mode 100755
index 00000000..7df36a28
--- /dev/null
+++ b/ao-bringup/test-telemini
@@ -0,0 +1,56 @@
+#!/bin/sh
+
+VERSION=3.0
+PRODUCT=TeleMini
+BASE=`echo $PRODUCT | tr 'A-Z' 'a-z'`
+
+echo "$PRODUCT-v$VERSION Test Program"
+echo "Copyright 2017 by Keith Packard.  Released under GPL v2 or later"
+echo
+echo "Expectations:"
+echo "\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""
+
+	    FLASHSIZE=524288
+
+	    echo "Testing flash"
+	    ../ao-tools/ao-test-flash/ao-test-flash --tty="$dev" "$FLASHSIZE"
+
+	    case $? in
+		0)
+		    ;;
+		*)
+		    echo "failed"
+		    exit 1
+	    esac
+	    echo""
+
+	    echo "$PRODUCT-v$VERSION" serial "$serial" is ready to ship
+	    echo "\007"
+	    ret=0
+	    ;;
+    esac
+done
diff --git a/ao-bringup/turnon_easymega b/ao-bringup/turnon_easymega
index 1e75e72f..b14ed2ab 100755
--- a/ao-bringup/turnon_easymega
+++ b/ao-bringup/turnon_easymega
@@ -1,5 +1,7 @@
 #!/bin/sh
 
+PRODUCT=EasyMega
+
 if [ -x ../ao-tools/ao-flash/ao-flash-stm ]; then
 	STMLOAD=../ao-tools/ao-flash/ao-flash-stm
 else
@@ -17,16 +19,29 @@ fi
 VERSION=1.0
 REPO=~/altusmetrumllc/Binaries
 
-echo "EasyMega v$VERSION Turn-On and Calibration Program"
+echo "$PRODUCT v$VERSION Turn-On and Calibration Program"
 echo "Copyright 2014 by Bdale Garbee.  Released under GPL v2"
 echo
 echo "Expectations:"
-echo "\tEasyMega v$VERSION"
+echo "\t$PRODUCT v$VERSION"
 echo "\t\twith USB cable attached"
 echo "\t\twith ST-Link-V2 cabled to debug header"
 echo
-echo -n "EasyMega-$VERSION serial number: "
-read SERIAL
+
+case $# in
+    1)
+	SERIAL="$1"
+	echo "$PRODUCT-$VERSION serial number: $SERIAL" 
+	;;
+    0)
+	echo -n "$PRODUCT-$VERSION serial number: "
+	read SERIAL
+	;;
+    *)
+	echo "Usage: $0 <serial-number>" 1>&2
+	exit 1;
+	;;
+esac
 
 echo $STMLOAD
 
@@ -38,14 +53,14 @@ $USBLOAD --serial=$SERIAL $REPO/easymega-v$VERSION*.elf || exit 1
 
 sleep 2
 
-dev=`../ao-tools/ao-list/ao-list | awk '/EasyMega-v'"$VERSION"'/ { print $3; exit(0); }'`
+dev=`../ao-tools/ao-list/ao-list | awk '/'"$PRODUCT"'-v'"$VERSION"'/ { print $3; exit(0); }'`
 
 case "$dev" in
 /dev/tty*)
-	echo "EasyMega found on $dev"
+	echo "$PRODUCT found on $dev"
 	;;
 *)
-	echo 'No EasyMega-v'"$VERSION"' found'
+	echo 'No '"$PRODUCT"'-v'"$VERSION"' found'
 	exit 1
 	;;
 esac
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
 
diff --git a/ao-bringup/turnon_teledongle b/ao-bringup/turnon_teledongle
index d17e2b96..0cdbde7a 100755
--- a/ao-bringup/turnon_teledongle
+++ b/ao-bringup/turnon_teledongle
@@ -28,8 +28,21 @@ echo "\t$PRODUCT_NAME v$VERSION powered from USB"
 echo "\t\twith ST-Link-V2 cabled to debug header"
 echo "\t\twith coax from UHF to frequency counter"
 echo
-echo -n "$PRODUCT_NAME-$VERSION serial number: "
-read SERIAL
+
+case $# in
+    1)
+	SERIAL="$1"
+	echo "$PRODUCT-$VERSION serial number: $SERIAL" 
+	;;
+    0)
+	echo -n "$PRODUCT-$VERSION serial number: "
+	read SERIAL
+	;;
+    *)
+	echo "Usage: $0 <serial-number>" 1>&2
+	exit 1;
+	;;
+esac
 
 BINARIES=$HOME/altusmetrumllc/Binaries
 
diff --git a/ao-bringup/turnon_teledongle_v0.2 b/ao-bringup/turnon_teledongle_v0.2
index 058e72ce..20c8798a 100755
--- a/ao-bringup/turnon_teledongle_v0.2
+++ b/ao-bringup/turnon_teledongle_v0.2
@@ -51,7 +51,7 @@ read FREQ
 CAL_VALUE=`nickle -e "floor(434.55 / $FREQ * 1186611 + 0.5)"`
 
 echo "Programming flash with cal value " $CAL_VALUE
-$AOLOAD -D $programmer --cal $CAL_VALUE /usr/share/altos/teledongle-v0.2*.ihx $SERIAL
+$AOLOAD -D $programmer --cal $CAL_VALUE ~/altusmetrumllc/Binaries/teledongle-v0.2*.ihx $SERIAL
 
 echo "Serial number "$SERIAL" programmed with RF cal value "$CAL_VALUE
 echo $SERIAL","$CAL_VALUE >> cal_values
diff --git a/ao-bringup/turnon_telegps b/ao-bringup/turnon_telegps
index ba97d503..b6da2898 100755
--- a/ao-bringup/turnon_telegps
+++ b/ao-bringup/turnon_telegps
@@ -1,10 +1,12 @@
 #!/bin/sh
 
-if [ -x /usr/bin/ao-flash-lpc ]; then
-	FLASH_LPC=/usr/bin/ao-flash-lpc
+if [ -x ../ao-tools/ao-flash/ao-flash-lpc ]; then
+        FLASH_LPC=../ao-tools/ao-flash/ao-flash-lpc
+elif [ -x /usr/bin/ao-flash-lpc ]; then
+        FLASH_LPC=/usr/bin/ao-flash-lpc
 else
-	echo "Can't find ao-flash-lpc!  Aborting."
-	exit 1
+        echo "Can't find ao-flash-lpc!  Aborting."
+        exit 1
 fi
 
 if [ -x /usr/bin/ao-usbload ]; then
@@ -14,8 +16,8 @@ else
 	exit 1
 fi
 
-VERSION=1.0
 PRODUCT=TeleGPS
+VERSION=1.0
 BASE=`echo $PRODUCT | tr 'A-Z' 'a-z'`
 echo $FILE
 
diff --git a/ao-bringup/turnon_telemetrum b/ao-bringup/turnon_telemetrum
index 5c62c49d..d40be953 100755
--- a/ao-bringup/turnon_telemetrum
+++ b/ao-bringup/turnon_telemetrum
@@ -48,7 +48,7 @@ $FLASH_STM ~/altusmetrumllc/Binaries/loaders/telemetrum-v$VERSION-*.elf || exit
 
 sleep 2
 
-$USBLOAD --serial=$SERIAL /usr/share/altos/telemetrum-v$VERSION*.ihx || exit 1
+$USBLOAD --serial=$SERIAL ~/altusmetrumllc/Binaries/telemetrum-v$VERSION-*.elf || exit 1
 
 sleep 5
 
diff --git a/ao-bringup/turnon_telemetrum_v1.1 b/ao-bringup/turnon_telemetrum_v1.1
new file mode 100755
index 00000000..830d7ed9
--- /dev/null
+++ b/ao-bringup/turnon_telemetrum_v1.1
@@ -0,0 +1,49 @@
+#!/bin/sh
+
+if [ -x ../ao-tools/ao-load/ao-load ]; then
+	AOLOAD=../ao-tools/ao-load/ao-load
+elif [ -x /usr/bin/ao-load ]; then
+	AOLOAD=/usr/bin/ao-load
+else
+	echo "Can't find ao-load!  Aborting."
+	exit 1
+fi
+
+if [ -x ../ao-tools/ao-rawload/ao-rawload ]; then
+	RAWLOAD=../ao-tools/ao-rawload/ao-rawload
+elif [ -x /usr/bin/ao-rawload ]; then
+	RAWLOAD=/usr/bin/ao-rawload
+else
+	echo "Can't find ao-rawload!  Aborting."
+	exit 1
+fi
+
+echo "TeleMetrum v1.1 Turn-On and Calibration Program"
+echo "Copyright 2010 by Bdale Garbee.  Released under GPL v2"
+echo
+echo "Expectations:"
+echo "\tTeleMetrum v1.1 powered from USB"
+echo "\t\twith TeleDongle (on /dev/ttyACM0) cabled to debug header"
+echo "\t\twith coax from UHF to frequency counter"
+echo
+echo -n "TeleMetrum serial number: "
+read SERIAL
+
+echo $RAWLOAD
+
+$RAWLOAD --device 100 -r ao_led_blink.ihx
+echo "the red LED should be blinking"
+sleep 5
+
+$RAWLOAD --device 100 -r ao_radio_xmit.ihx
+echo -n "Generating RF carrier.  Please enter measured frequency: "
+read FREQ
+
+CAL_VALUE=`nickle -e "floor(434.55 / $FREQ * 1186611 + 0.5)"`
+
+echo "Programming flash with cal value " $CAL_VALUE
+$AOLOAD --device 100 --cal $CAL_VALUE \
+	~/altusmetrumllc/Binaries/telemetrum-v1.1*.ihx $SERIAL
+
+echo "Serial number "$SERIAL" programmed with RF cal value "$CAL_VALUE
+echo "Unplug and replug USB, cu to the board, confirm freq and record power"
diff --git a/ao-bringup/turnon_telemini b/ao-bringup/turnon_telemini
index 6aef7f51..1958de2a 100755
--- a/ao-bringup/turnon_telemini
+++ b/ao-bringup/turnon_telemini
@@ -1,59 +1,76 @@
 #!/bin/sh
 
-if [ -x ../ao-tools/ao-load/ao-load ]; then
-	AOLOAD=../ao-tools/ao-load/ao-load
-elif [ -x /usr/bin/ao-load ]; then
-	AOLOAD=/usr/bin/ao-load
+if [ -x /usr/bin/dfu-util ]; then
+    DFU_UTIL=/usr/bin/dfu-util
 else
-	echo "Can't find ao-load!  Aborting."
-	exit 1
+    echo "Can't find dfu-util! Aborting."
+    exit 1
 fi
 
-if [ -x ../ao-tools/ao-rawload/ao-rawload ]; then
-	RAWLOAD=../ao-tools/ao-rawload/ao-rawload
-elif [ -x /usr/bin/ao-rawload ]; then
-	RAWLOAD=/usr/bin/ao-rawload
+if [ -x /usr/bin/ao-usbload ]; then
+	USBLOAD=/usr/bin/ao-usbload
 else
-	echo "Can't find ao-rawload!  Aborting."
+	echo "Can't find ao-usbload!  Aborting."
 	exit 1
 fi
 
-VERSION=1.0
+VERSION=3.0
+PRODUCT=TeleMini
 
-echo "TeleMini v$VERSION Turn-On and Calibration Program"
-echo "Copyright 2011 by Bdale Garbee.  Released under GPL v2"
+echo "$PRODUCT v$VERSION Turn-On and Calibration Program"
+echo "Copyright 2017 by Keith Packard.  Released under GPL v2 or later"
 echo
 echo "Expectations:"
-echo "\tTeleMini v$VERSION powered from LiPo"
-echo "\t\twith TeleDongle (on /dev/ttyACM0) cabled to debug header"
-echo "\t\twith frequency counter able to sample RF output"
+echo "\t$PRODUCT v$VERSION powered from USB"
 echo
-echo -n "TeleMini serial number: "
-read SERIAL
+echo -n "$PRODUCT-$VERSION serial number: "
+
+case $# in
+    1)
+	SERIAL="$1"
+	echo "$PRODUCT-$VERSION serial number: $SERIAL" 
+	;;
+    0)
+	echo -n "$PRODUCT-$VERSION serial number: "
+	read SERIAL
+	;;
+    *)
+	echo "Usage: $0 <serial-number>" 1>&2
+	exit 1;
+	;;
+esac
 
-echo $RAWLOAD
+FLASH_FILE=~/altusmetrumllc/Binaries/loaders/telemini-v$VERSION-altos-flash-*.bin
+ALTOS_FILE=~/altusmetrumllc/Binaries/telemini-v$VERSION-*.elf
+#FLASH_FILE=../src/telemini-v3.0/flash-loader/telemini-v$VERSION-altos-flash-*.bin
+#ALTOS_FILE=../src/telemini-v3.0/telemini-v$VERSION-*.elf
 
-case $USER in
-    bdale)
-	programmer=100
+$DFU_UTIL -a 0 -s 0x08000000:leave -D $FLASH_FILE || exit 1
+
+sleep 2
+
+$USBLOAD --serial=$SERIAL $ALTOS_FILE || exit 1
+
+sleep 3
+
+dev=`ao-list | awk '/'"$PRODUCT"'-v'"$VERSION"'/ { print $3; exit(0); }'`
+
+case "$dev" in
+/dev/tty*)
+	echo "$PRODUCT found on $dev"
 	;;
-    keithp)
-	programmer=186
+*)
+	echo 'No '"$PRODUCT"'-v'"$VERSION"' found'
+	exit 1
 	;;
 esac
 
-$RAWLOAD -D $programmer -r ao_led_blink.ihx
-echo "LEDs should be blinking"
-sleep 5
+echo 'E 0' > $dev
 
-$RAWLOAD -D $programmer -r ao_radio_xmit.ihx
-echo -n "Generating RF carrier.  Please enter measured frequency: "
-read FREQ
+SERIAL=$SERIAL ./cal-freq $dev
 
-CAL_VALUE=`nickle -e "floor(434.55 / $FREQ * 1186611 + 0.5)"`
+echo 'E 1' > $dev
 
-echo "Programming flash with cal value " $CAL_VALUE
-$AOLOAD -D $programmer --cal $CAL_VALUE ~/altusmetrumllc/Binaries/telemini-v$VERSION-*.ihx $SERIAL
+./test-telemini
 
-echo "Serial number "$SERIAL" programmed with RF cal value "$CAL_VALUE
-echo "Unplug and replug USB, cu to the board, confirm freq and record power"
+exit $?