From b38fd6e43553a25e1c63fa7e0702ee1c01732e4f Mon Sep 17 00:00:00 2001
From: Bdale Garbee <bdale@gag.com>
Date: Wed, 11 Oct 2023 22:13:43 -0600
Subject: [PATCH] rework bringup scripts to use packaged firmware and utilities

---
 ao-bringup/cal-freq                           |  4 +-
 ao-bringup/fix-telebt                         |  2 +-
 ao-bringup/test-easymega                      |  6 +-
 ao-bringup/test-easymega-v1.0                 |  8 +--
 ao-bringup/test-easymini                      |  6 +-
 ao-bringup/test-easymini-v1.0                 |  6 +-
 ao-bringup/test-easymini-v3.0                 |  6 +-
 ao-bringup/test-easymotor-v3                  |  4 +-
 ao-bringup/test-easytimer                     |  2 +-
 ao-bringup/test-igniters                      |  2 +-
 ao-bringup/test-igniters-nowait               |  2 +-
 ao-bringup/test-telegps-v1                    |  4 +-
 ao-bringup/test-telegps-v2                    |  4 +-
 ao-bringup/test-telegps-v3                    |  4 +-
 ao-bringup/test-telemega-v1.0                 |  8 +--
 ao-bringup/test-telemega-v2.0                 |  8 +--
 ao-bringup/test-telemega-v3.0                 |  8 +--
 ao-bringup/test-telemega-v4.0                 |  8 +--
 ao-bringup/test-telemega-v5.0                 |  8 +--
 ao-bringup/test-telemega-v6.0                 |  8 +--
 ao-bringup/test-telemetrum-v2.0               |  8 +--
 ao-bringup/test-telemetrum-v3.0               |  8 +--
 ao-bringup/test-telemetrum-v4.0               |  8 +--
 ao-bringup/test-telemini                      |  6 +-
 ao-bringup/turnon_chaoskey                    |  6 +-
 ao-bringup/turnon_easymega                    |  6 +-
 ao-bringup/turnon_easymega_v1.0               | 16 ++---
 ao-bringup/turnon_easymini                    | 15 ++---
 ao-bringup/turnon_easymini_v1.0               | 18 ++----
 ao-bringup/turnon_easymotor                   | 17 +++--
 ao-bringup/turnon_easytimer                   |  6 +-
 ao-bringup/turnon_telebt                      |  4 +-
 ao-bringup/turnon_telebt_v1                   | 62 -------------------
 ao-bringup/turnon_telebt_v3                   |  4 +-
 ao-bringup/turnon_teledongle                  |  8 +--
 ao-bringup/turnon_teledongle_v0.2             | 58 -----------------
 ao-bringup/turnon_telefireeight               |  4 +-
 ao-bringup/turnon_telegps                     | 13 ++--
 ao-bringup/turnon_telegps_v1                  | 13 ++--
 ao-bringup/turnon_telegps_v2                  |  6 +-
 ao-bringup/turnon_telelco                     |  4 +-
 ao-bringup/turnon_telemega                    |  8 +--
 ao-bringup/turnon_telemega_v1.0               |  8 +--
 ao-bringup/turnon_telemega_v2.0               |  8 +--
 ao-bringup/turnon_telemega_v3.0               |  8 +--
 ao-bringup/turnon_telemega_v4.0               |  8 +--
 ao-bringup/turnon_telemega_v5.0               |  8 +--
 ao-bringup/turnon_telemetrum                  | 11 ++--
 ao-bringup/turnon_telemetrum_v1.1             | 49 ---------------
 ao-bringup/turnon_telemetrum_v2.0             | 11 ++--
 ao-bringup/turnon_telemetrum_v3.0             | 11 ++--
 ao-bringup/turnon_telemini                    | 11 ++--
 .../{turnon_teleminiv2 => turnon_telemini_v2} | 12 ++--
 ao-bringup/turnon_teleshield                  | 48 --------------
 ao-bringup/turnon_teleterra                   | 48 --------------
 55 files changed, 183 insertions(+), 464 deletions(-)
 delete mode 100755 ao-bringup/turnon_telebt_v1
 delete mode 100755 ao-bringup/turnon_teledongle_v0.2
 delete mode 100755 ao-bringup/turnon_telemetrum_v1.1
 rename ao-bringup/{turnon_teleminiv2 => turnon_telemini_v2} (80%)
 delete mode 100755 ao-bringup/turnon_teleshield
 delete mode 100755 ao-bringup/turnon_teleterra

diff --git a/ao-bringup/cal-freq b/ao-bringup/cal-freq
index 40c25ce8..849a919d 100755
--- a/ao-bringup/cal-freq
+++ b/ao-bringup/cal-freq
@@ -10,10 +10,10 @@ case $# in
 	;;
 esac
 
-../ao-tools/ao-cal-freq/ao-cal-freq --tty=$dev
+ao-cal-freq --tty=$dev
 case $? in
     0)
-	calline=`./get-radio-cal $dev`
+	calline=`get-radio-cal $dev`
 	CAL_VALUE=`echo $calline | awk '{print $2}'`
 	CURRENT_FREQ=`echo $calline | awk '{print $4}'`
 	echo $SERIAL","$CAL_VALUE >> cal_values
diff --git a/ao-bringup/fix-telebt b/ao-bringup/fix-telebt
index 35933e9f..dcd04401 100755
--- a/ao-bringup/fix-telebt
+++ b/ao-bringup/fix-telebt
@@ -1,7 +1,7 @@
 #!/bin/sh
 
 VERSION=4.0
-REPO=~/altusmetrumllc/Binaries
+REPO=/usr/share/altos/mfg-fw
 PRODUCT=TeleBT
 
 ALTOS_FILE=$REPO/telebt-v$VERSION-*.elf
diff --git a/ao-bringup/test-easymega b/ao-bringup/test-easymega
index 04dfb44b..b863163a 100755
--- a/ao-bringup/test-easymega
+++ b/ao-bringup/test-easymega
@@ -19,11 +19,11 @@ ao-list | while read product serial dev; do
 	    echo "Testing $product $serial $dev"
 	    echo ""
 
-	    ./test-igniters $dev --rplus=100 --rminus=27 --adcmax=4095 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"
-	    ../ao-tools/ao-test-baro/ao-test-baro --tty="$dev"
+	    ao-test-baro --tty="$dev"
 
 	    case $? in
 		0)
@@ -37,7 +37,7 @@ ao-list | while read product serial dev; do
 	    FLASHSIZE=8388608
 
 	    echo "Testing flash"
-	    ../ao-tools/ao-test-flash/ao-test-flash --tty="$dev" "$FLASHSIZE"
+	    ao-test-flash --tty="$dev" "$FLASHSIZE"
 
 	    case $? in
 		0)
diff --git a/ao-bringup/test-easymega-v1.0 b/ao-bringup/test-easymega-v1.0
index 2f0a7822..795a0b8a 100755
--- a/ao-bringup/test-easymega-v1.0
+++ b/ao-bringup/test-easymega-v1.0
@@ -12,18 +12,18 @@ echo "\t$PRODUCT v$VERSION powered from USB"
 echo
 
 ret=1
-../ao-tools/ao-list/ao-list | while read product serial dev; do
+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 0 1 2 3
+	    test-igniters $dev drogue main 0 1 2 3
 	    echo""
 
 	    echo "Testing baro sensor"
-	    ../ao-tools/ao-test-baro/ao-test-baro --tty="$dev"
+	    ao-test-baro --tty="$dev"
 
 	    case $? in
 		0)
@@ -37,7 +37,7 @@ ret=1
 	    FLASHSIZE=8388608
 
 	    echo "Testing flash"
-	    ../ao-tools/ao-test-flash/ao-test-flash --tty="$dev" "$FLASHSIZE"
+	    ao-test-flash --tty="$dev" "$FLASHSIZE"
 
 	    case $? in
 		0)
diff --git a/ao-bringup/test-easymini b/ao-bringup/test-easymini
index 3268f44c..5ebd51ae 100755
--- a/ao-bringup/test-easymini
+++ b/ao-bringup/test-easymini
@@ -23,11 +23,11 @@ while [ $found -eq 0 ]; do
 		
 		sleep 0.25
 
-		./test-igniters-nowait "$dev" --rplus=100 --rminus=27 --adcmax=32767 drogue main
+		test-igniters-nowait "$dev" --rplus=100 --rminus=27 --adcmax=32767 drogue main
 		echo ""
 
 		echo "Testing baro sensor"
-		../ao-tools/ao-test-baro/ao-test-baro --tty="$dev"
+		ao-test-baro --tty="$dev"
 
 		if [ $? -ne 0 ]; then
 		    echo -e '\e[31m'"$PRODUCT-$VERSION serial $serial failed"'\e[39m'
@@ -38,7 +38,7 @@ while [ $found -eq 0 ]; do
 		FLASHSIZE=1048576
 
 		echo "Testing flash"
-		../ao-tools/ao-test-flash/ao-test-flash --tty="$dev" "$FLASHSIZE"
+		ao-test-flash --tty="$dev" "$FLASHSIZE"
 
 		if [ $? -ne 0 ]; then
 		    echo -e '\e[31m'"$PRODUCT-$VERSION serial $serial failed"'\e[39m'
diff --git a/ao-bringup/test-easymini-v1.0 b/ao-bringup/test-easymini-v1.0
index 8a0836f6..56892537 100755
--- a/ao-bringup/test-easymini-v1.0
+++ b/ao-bringup/test-easymini-v1.0
@@ -23,11 +23,11 @@ while [ $found -eq 0 ]; do
 		
 		sleep 2
 
-		./test-igniters-nowait "$dev" drogue main
+		test-igniters-nowait "$dev" drogue main
 		echo ""
 
 		echo "Testing baro sensor"
-		../ao-tools/ao-test-baro/ao-test-baro --tty="$dev"
+		ao-test-baro --tty="$dev"
 
 		if [ $? -ne 0 ]; then
 		    echo -e '\e[31m'"$PRODUCT-$VERSION serial $serial failed"'\e[39m'
@@ -38,7 +38,7 @@ while [ $found -eq 0 ]; do
 		FLASHSIZE=1048576
 
 		echo "Testing flash"
-		../ao-tools/ao-test-flash/ao-test-flash --tty="$dev" "$FLASHSIZE"
+		ao-test-flash --tty="$dev" "$FLASHSIZE"
 
 		if [ $? -ne 0 ]; then
 		    echo -e '\e[31m'"$PRODUCT-$VERSION serial $serial failed"'\e[39m'
diff --git a/ao-bringup/test-easymini-v3.0 b/ao-bringup/test-easymini-v3.0
index 779a800c..3633cae9 100755
--- a/ao-bringup/test-easymini-v3.0
+++ b/ao-bringup/test-easymini-v3.0
@@ -23,11 +23,11 @@ while [ $found -eq 0 ]; do
 		
 		sleep 2
 
-		./test-igniters-nowait "$dev" drogue main
+		test-igniters-nowait "$dev" drogue main
 		echo ""
 
 		echo "Testing baro sensor"
-		../ao-tools/ao-test-baro/ao-test-baro --tty="$dev"
+		ao-test-baro --tty="$dev"
 
 		if [ $? -ne 0 ]; then
 		    echo -e '\e[31m'"$PRODUCT-$VERSION serial $serial failed"'\e[39m'
@@ -38,7 +38,7 @@ while [ $found -eq 0 ]; do
 		FLASHSIZE=1048576
 
 		echo "Testing flash"
-		../ao-tools/ao-test-flash/ao-test-flash --tty="$dev" "$FLASHSIZE"
+		ao-test-flash --tty="$dev" "$FLASHSIZE"
 
 		if [ $? -ne 0 ]; then
 		    echo -e '\e[31m'"$PRODUCT-$VERSION serial $serial failed"'\e[39m'
diff --git a/ao-bringup/test-easymotor-v3 b/ao-bringup/test-easymotor-v3
index e1454b8b..e82ed38c 100755
--- a/ao-bringup/test-easymotor-v3
+++ b/ao-bringup/test-easymotor-v3
@@ -23,12 +23,12 @@ ao-list | while read product serial dev; do
 	    FLASHSIZE=8388608
 
 	    echo "Testing flash"
-	    ../ao-tools/ao-test-flash/ao-test-flash --tty="$dev" "$FLASHSIZE"
+	    ao-test-flash --tty="$dev" "$FLASHSIZE"
 
 	    echo "" 
 
 	    echo "Testing pressure sensor input"
-	    ../ao-tools/ao-test-pressure/ao-test-pressure --tty="$dev" 
+	    ao-test-pressure --tty="$dev" 
 
 	    case $? in
 		0)
diff --git a/ao-bringup/test-easytimer b/ao-bringup/test-easytimer
index f93164c6..eacdc5dd 100755
--- a/ao-bringup/test-easytimer
+++ b/ao-bringup/test-easytimer
@@ -18,7 +18,7 @@ ao-list | while read product serial dev; do
 
 	    echo "Testing $product $serial $dev"
 
-	    ./test-igniters $dev 0 1
+	    test-igniters $dev 0 1
 	    echo""
 
 	    case $? in
diff --git a/ao-bringup/test-igniters b/ao-bringup/test-igniters
index 1cbe4744..14a1b967 100755
--- a/ao-bringup/test-igniters
+++ b/ao-bringup/test-igniters
@@ -14,7 +14,7 @@ for igniter in "$@"; do
 	    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" $args $igniter
+		ao-test-igniter --tty="$dev" $args $igniter
 
 		case $? in
 		    0)
diff --git a/ao-bringup/test-igniters-nowait b/ao-bringup/test-igniters-nowait
index 338f49af..731bcf36 100755
--- a/ao-bringup/test-igniters-nowait
+++ b/ao-bringup/test-igniters-nowait
@@ -14,7 +14,7 @@ for igniter in "$@"; do
 	    while [ $pass != "y" ]; do
 
 		echo "Testing $igniter igniter."
-		../ao-tools/ao-test-igniter/ao-test-igniter --tty="$dev" $args $igniter
+		ao-test-igniter --tty="$dev" $args $igniter
 
 		case $? in
 		    0)
diff --git a/ao-bringup/test-telegps-v1 b/ao-bringup/test-telegps-v1
index 0b275802..914d4d8d 100755
--- a/ao-bringup/test-telegps-v1
+++ b/ao-bringup/test-telegps-v1
@@ -21,7 +21,7 @@ ao-list | while read product serial dev; do
 	    FLASHSIZE=2097152
 
 	    echo "Testing flash"
-	    ../ao-tools/ao-test-flash/ao-test-flash --tty="$dev" "$FLASHSIZE"
+	    ao-test-flash --tty="$dev" "$FLASHSIZE"
 
 	    case $? in
 		0)
@@ -32,7 +32,7 @@ ao-list | while read product serial dev; do
 	    esac
 
 	    echo "Testing GPS"
-	    ../ao-tools/ao-test-gps/ao-test-gps --tty="$dev"
+	    ao-test-gps --tty="$dev"
 
 	    case $? in
 		0)
diff --git a/ao-bringup/test-telegps-v2 b/ao-bringup/test-telegps-v2
index b103aed4..784d7e23 100755
--- a/ao-bringup/test-telegps-v2
+++ b/ao-bringup/test-telegps-v2
@@ -21,7 +21,7 @@ ao-list | while read product serial dev; do
 	    FLASHSIZE=2097152
 
 	    echo "Testing flash"
-	    ../ao-tools/ao-test-flash/ao-test-flash --tty="$dev" "$FLASHSIZE"
+	    ao-test-flash --tty="$dev" "$FLASHSIZE"
 
 	    case $? in
 		0)
@@ -32,7 +32,7 @@ ao-list | while read product serial dev; do
 	    esac
 
 	    echo "Testing GPS"
-	    ../ao-tools/ao-test-gps/ao-test-gps --tty="$dev"
+	    ao-test-gps --tty="$dev"
 
 	    case $? in
 		0)
diff --git a/ao-bringup/test-telegps-v3 b/ao-bringup/test-telegps-v3
index 03543838..f231589c 100755
--- a/ao-bringup/test-telegps-v3
+++ b/ao-bringup/test-telegps-v3
@@ -21,7 +21,7 @@ ao-list | while read product serial dev; do
 	    FLASHSIZE=2097152
 
 	    echo "Testing flash"
-	    ../ao-tools/ao-test-flash/ao-test-flash --tty="$dev" "$FLASHSIZE"
+	    ao-test-flash --tty="$dev" "$FLASHSIZE"
 
 	    case $? in
 		0)
@@ -32,7 +32,7 @@ ao-list | while read product serial dev; do
 	    esac
 
 	    echo "Testing GPS"
-	    ../ao-tools/ao-test-gps/ao-test-gps --tty="$dev"
+	    ao-test-gps --tty="$dev"
 
 	    case $? in
 		0)
diff --git a/ao-bringup/test-telemega-v1.0 b/ao-bringup/test-telemega-v1.0
index 2e497886..41e9ea3f 100755
--- a/ao-bringup/test-telemega-v1.0
+++ b/ao-bringup/test-telemega-v1.0
@@ -18,11 +18,11 @@ 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 main drogue 3 0 1 2
 	    echo""
 
 	    echo "Testing baro sensor"
-	    ../ao-tools/ao-test-baro/ao-test-baro --tty="$dev"
+	    ao-test-baro --tty="$dev"
 
 	    case $? in
 		0)
@@ -36,7 +36,7 @@ ao-list | while read product serial dev; do
 	    FLASHSIZE=8388608
 
 	    echo "Testing flash"
-	    ../ao-tools/ao-test-flash/ao-test-flash --tty="$dev" "$FLASHSIZE"
+	    ao-test-flash --tty="$dev" "$FLASHSIZE"
 
 	    case $? in
 		0)
@@ -48,7 +48,7 @@ ao-list | while read product serial dev; do
 	    echo""
 
 	    echo "Testing GPS"
-	    ../ao-tools/ao-test-gps/ao-test-gps --tty="$dev"
+	    ao-test-gps --tty="$dev"
 
 	    case $? in
 		0)
diff --git a/ao-bringup/test-telemega-v2.0 b/ao-bringup/test-telemega-v2.0
index 0ac475a3..c31ea96d 100755
--- a/ao-bringup/test-telemega-v2.0
+++ b/ao-bringup/test-telemega-v2.0
@@ -18,11 +18,11 @@ 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 main drogue 3 0 1 2
 	    echo""
 
 	    echo "Testing baro sensor"
-	    ../ao-tools/ao-test-baro/ao-test-baro --tty="$dev"
+	    ao-test-baro --tty="$dev"
 
 	    case $? in
 		0)
@@ -36,7 +36,7 @@ ao-list | while read product serial dev; do
 	    FLASHSIZE=8388608
 
 	    echo "Testing flash"
-	    ../ao-tools/ao-test-flash/ao-test-flash --tty="$dev" "$FLASHSIZE"
+	    ao-test-flash --tty="$dev" "$FLASHSIZE"
 
 	    case $? in
 		0)
@@ -48,7 +48,7 @@ ao-list | while read product serial dev; do
 	    echo""
 
 	    echo "Testing GPS"
-	    ../ao-tools/ao-test-gps/ao-test-gps --tty="$dev"
+	    ao-test-gps --tty="$dev"
 
 	    case $? in
 		0)
diff --git a/ao-bringup/test-telemega-v3.0 b/ao-bringup/test-telemega-v3.0
index ec024e32..7cd5bd8a 100755
--- a/ao-bringup/test-telemega-v3.0
+++ b/ao-bringup/test-telemega-v3.0
@@ -18,11 +18,11 @@ 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 main drogue 3 0 1 2
 	    echo""
 
 	    echo "Testing baro sensor"
-	    ../ao-tools/ao-test-baro/ao-test-baro --tty="$dev"
+	    ao-test-baro --tty="$dev"
 
 	    case $? in
 		0)
@@ -36,7 +36,7 @@ ao-list | while read product serial dev; do
 	    FLASHSIZE=8388608
 
 	    echo "Testing flash"
-	    ../ao-tools/ao-test-flash/ao-test-flash --tty="$dev" "$FLASHSIZE"
+	    ao-test-flash --tty="$dev" "$FLASHSIZE"
 
 	    case $? in
 		0)
@@ -48,7 +48,7 @@ ao-list | while read product serial dev; do
 	    echo""
 
 	    echo "Testing GPS"
-	    ../ao-tools/ao-test-gps/ao-test-gps --tty="$dev"
+	    ao-test-gps --tty="$dev"
 
 	    case $? in
 		0)
diff --git a/ao-bringup/test-telemega-v4.0 b/ao-bringup/test-telemega-v4.0
index 3355d866..a17e1f1d 100755
--- a/ao-bringup/test-telemega-v4.0
+++ b/ao-bringup/test-telemega-v4.0
@@ -18,11 +18,11 @@ ao-list | while read product serial dev; do
 
 	    echo "Testing $product $serial $dev"
 
-	    ./test-igniters $dev --rplus=100 --rminus=27 --adcmax=4095 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"
-	    ../ao-tools/ao-test-baro/ao-test-baro --tty="$dev"
+	    ao-test-baro --tty="$dev"
 
 	    case $? in
 		0)
@@ -36,7 +36,7 @@ ao-list | while read product serial dev; do
 	    FLASHSIZE=8388608
 
 	    echo "Testing flash"
-	    ../ao-tools/ao-test-flash/ao-test-flash --tty="$dev" "$FLASHSIZE"
+	    ao-test-flash --tty="$dev" "$FLASHSIZE"
 
 	    case $? in
 		0)
@@ -48,7 +48,7 @@ ao-list | while read product serial dev; do
 	    echo""
 
 	    echo "Testing GPS"
-	    ../ao-tools/ao-test-gps/ao-test-gps --tty="$dev"
+	    ao-test-gps --tty="$dev"
 
 	    case $? in
 		0)
diff --git a/ao-bringup/test-telemega-v5.0 b/ao-bringup/test-telemega-v5.0
index 14e4a456..929044c5 100755
--- a/ao-bringup/test-telemega-v5.0
+++ b/ao-bringup/test-telemega-v5.0
@@ -18,11 +18,11 @@ ao-list | while read product serial dev; do
 
 	    echo "Testing $product $serial $dev"
 
-	    ./test-igniters $dev --rplus=100 --rminus=27 --adcmax=4095 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"
-	    ../ao-tools/ao-test-baro/ao-test-baro --tty="$dev"
+	    ao-test-baro --tty="$dev"
 
 	    case $? in
 		0)
@@ -36,7 +36,7 @@ ao-list | while read product serial dev; do
 	    FLASHSIZE=8388608
 
 	    echo "Testing flash"
-	    ../ao-tools/ao-test-flash/ao-test-flash --tty="$dev" "$FLASHSIZE"
+	    ao-test-flash --tty="$dev" "$FLASHSIZE"
 
 	    case $? in
 		0)
@@ -48,7 +48,7 @@ ao-list | while read product serial dev; do
 	    echo""
 
 	    echo "Testing GPS"
-	    ../ao-tools/ao-test-gps/ao-test-gps --tty="$dev"
+	    ao-test-gps --tty="$dev"
 
 	    case $? in
 		0)
diff --git a/ao-bringup/test-telemega-v6.0 b/ao-bringup/test-telemega-v6.0
index 881a74b0..f6feb7b7 100755
--- a/ao-bringup/test-telemega-v6.0
+++ b/ao-bringup/test-telemega-v6.0
@@ -18,11 +18,11 @@ ao-list | while read product serial dev; do
 
 	    echo "Testing $product $serial $dev"
 
-	    ./test-igniters $dev --rplus=100 --rminus=27 --adcmax=4095 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"
-	    ../ao-tools/ao-test-baro/ao-test-baro --tty="$dev"
+	    ao-test-baro --tty="$dev"
 
 	    case $? in
 		0)
@@ -36,7 +36,7 @@ ao-list | while read product serial dev; do
 	    FLASHSIZE=8388608
 
 	    echo "Testing flash"
-	    ../ao-tools/ao-test-flash/ao-test-flash --tty="$dev" "$FLASHSIZE"
+	    ao-test-flash --tty="$dev" "$FLASHSIZE"
 
 	    case $? in
 		0)
@@ -48,7 +48,7 @@ ao-list | while read product serial dev; do
 	    echo""
 
 	    echo "Testing GPS"
-	    ../ao-tools/ao-test-gps/ao-test-gps --tty="$dev"
+	    ao-test-gps --tty="$dev"
 
 	    case $? in
 		0)
diff --git a/ao-bringup/test-telemetrum-v2.0 b/ao-bringup/test-telemetrum-v2.0
index 13407e86..dc785d9e 100755
--- a/ao-bringup/test-telemetrum-v2.0
+++ b/ao-bringup/test-telemetrum-v2.0
@@ -19,11 +19,11 @@ ao-list | while read product serial dev; do
 	    echo "Testing $product $serial $dev"
 	    echo ""
 
-	    ./test-igniters "$dev" drogue main
+	    test-igniters "$dev" drogue main
 	    echo ""
 
 	    echo "Testing baro sensor"
-	    ../ao-tools/ao-test-baro/ao-test-baro --tty="$dev"
+	    ao-test-baro --tty="$dev"
 
 	    case $? in
 		0)
@@ -37,7 +37,7 @@ ao-list | while read product serial dev; do
 	    FLASHSIZE=8388608
 
 	    echo "Testing flash"
-	    ../ao-tools/ao-test-flash/ao-test-flash --tty="$dev" "$FLASHSIZE"
+	    ao-test-flash --tty="$dev" "$FLASHSIZE"
 
 	    case $? in
 		0)
@@ -49,7 +49,7 @@ ao-list | while read product serial dev; do
 	    echo""
 
 	    echo "Testing GPS"
-	    ../ao-tools/ao-test-gps/ao-test-gps --tty="$dev"
+	    ao-test-gps --tty="$dev"
 
 	    case $? in
 		0)
diff --git a/ao-bringup/test-telemetrum-v3.0 b/ao-bringup/test-telemetrum-v3.0
index 91427183..5e8ce559 100755
--- a/ao-bringup/test-telemetrum-v3.0
+++ b/ao-bringup/test-telemetrum-v3.0
@@ -19,11 +19,11 @@ ao-list | while read product serial dev; do
 	    echo "Testing $product $serial $dev"
 	    echo ""
 
-	    ./test-igniters "$dev" --rplus=100 --rminus=27 --adcmax=4095 drogue main
+	    test-igniters "$dev" --rplus=100 --rminus=27 --adcmax=4095 drogue main
 	    echo ""
 
 	    echo "Testing baro sensor"
-	    ../ao-tools/ao-test-baro/ao-test-baro --tty="$dev"
+	    ao-test-baro --tty="$dev"
 
 	    case $? in
 		0)
@@ -37,7 +37,7 @@ ao-list | while read product serial dev; do
 	    FLASHSIZE=8388608
 
 	    echo "Testing flash"
-	    ../ao-tools/ao-test-flash/ao-test-flash --tty="$dev" "$FLASHSIZE"
+	    ao-test-flash --tty="$dev" "$FLASHSIZE"
 
 	    case $? in
 		0)
@@ -49,7 +49,7 @@ ao-list | while read product serial dev; do
 	    echo""
 
 	    echo "Testing GPS"
-	    ../ao-tools/ao-test-gps/ao-test-gps --tty="$dev"
+	    ao-test-gps --tty="$dev"
 
 	    case $? in
 		0)
diff --git a/ao-bringup/test-telemetrum-v4.0 b/ao-bringup/test-telemetrum-v4.0
index 9fbacb5d..0c3b631b 100755
--- a/ao-bringup/test-telemetrum-v4.0
+++ b/ao-bringup/test-telemetrum-v4.0
@@ -19,11 +19,11 @@ ao-list | while read product serial dev; do
 	    echo "Testing $product $serial $dev"
 	    echo ""
 
-	    ./test-igniters "$dev" --rplus=100 --rminus=27 --adcmax=4095 drogue main
+	    test-igniters "$dev" --rplus=100 --rminus=27 --adcmax=4095 drogue main
 	    echo ""
 
 	    echo "Testing baro sensor"
-	    ../ao-tools/ao-test-baro/ao-test-baro --tty="$dev"
+	    ao-test-baro --tty="$dev"
 
 	    case $? in
 		0)
@@ -37,7 +37,7 @@ ao-list | while read product serial dev; do
 	    FLASHSIZE=8388608
 
 	    echo "Testing flash"
-	    ../ao-tools/ao-test-flash/ao-test-flash --tty="$dev" "$FLASHSIZE"
+	    ao-test-flash --tty="$dev" "$FLASHSIZE"
 
 	    case $? in
 		0)
@@ -49,7 +49,7 @@ ao-list | while read product serial dev; do
 	    echo""
 
 	    echo "Testing GPS"
-	    ../ao-tools/ao-test-gps/ao-test-gps --tty="$dev"
+	    ao-test-gps --tty="$dev"
 
 	    case $? in
 		0)
diff --git a/ao-bringup/test-telemini b/ao-bringup/test-telemini
index c4a22f64..c6f435a3 100755
--- a/ao-bringup/test-telemini
+++ b/ao-bringup/test-telemini
@@ -19,11 +19,11 @@ ao-list | while read product serial dev; do
 	    echo "Testing $product $serial $dev"
 	    echo ""
 
-	    ./test-igniters "$dev" --rplus=100 --rminus=27 --adcmax=4095 drogue main
+	    test-igniters "$dev" --rplus=100 --rminus=27 --adcmax=4095 drogue main
 	    echo ""
 
 	    echo "Testing baro sensor"
-	    ../ao-tools/ao-test-baro/ao-test-baro --tty="$dev"
+	    ao-test-baro --tty="$dev"
 
 	    case $? in
 		0)
@@ -37,7 +37,7 @@ ao-list | while read product serial dev; do
 	    FLASHSIZE=524288
 
 	    echo "Testing flash"
-	    ../ao-tools/ao-test-flash/ao-test-flash --tty="$dev" "$FLASHSIZE"
+	    ao-test-flash --tty="$dev" "$FLASHSIZE"
 
 	    case $? in
 		0)
diff --git a/ao-bringup/turnon_chaoskey b/ao-bringup/turnon_chaoskey
index 9ad80912..8625216c 100755
--- a/ao-bringup/turnon_chaoskey
+++ b/ao-bringup/turnon_chaoskey
@@ -16,6 +16,7 @@ fi
 
 VERSION=1.0
 PRODUCT=ChaosKey
+REPO=/usr/share/altos/mfg-fw
 
 echo "ChaosKey v$VERSION Turn-On and Calibration Program"
 echo "Copyright 2015 by Keith Packard.  Released under GPL v2"
@@ -24,8 +25,7 @@ echo "Expectations:"
 echo "\tChaosKey v$VERSION powered from USB"
 echo
 
-FLASH_FILE=~/altusmetrumllc/Binaries/chaoskey-v1.0-all-*.bin
-#ALTOS_FILE=~/altusmetrumllc/Binaries/chaoskey-v1.0-*.elf
+FLASH_FILE=$REPO/chaoskey-v1.0-all-*.bin
 
 $DFU_UTIL -a 0 -s 0x08000000:leave -D $FLASH_FILE || true
 
@@ -35,6 +35,6 @@ $DFU_UTIL -a 0 -s 0x08000000:leave -D $FLASH_FILE || true
 
 sleep 3
 
-./test-chaoskey
+test-chaoskey
 
 exit $?
diff --git a/ao-bringup/turnon_easymega b/ao-bringup/turnon_easymega
index 64180bd3..be5f4265 100755
--- a/ao-bringup/turnon_easymega
+++ b/ao-bringup/turnon_easymega
@@ -2,7 +2,7 @@
 
 PRODUCT=EasyMega
 VERSION=2.0
-REPO=~/altusmetrumllc/Binaries
+REPO=/usr/share/altos/mfg-fw
 
 if [ -x /usr/bin/ao-flash-stm ]; then
 	FLASH_STM=/usr/bin/ao-flash-stm
@@ -68,12 +68,12 @@ echo 'E 0' > $dev
 
 failed=1
 while [ $failed =  1 ]; do
-    ../ao-tools/ao-cal-accel/ao-cal-accel $dev
+    ao-cal-accel $dev
     failed=$?
 done
 
 echo 'E 1' > $dev
 
-./test-easymega
+test-easymega
 
 exit $?
diff --git a/ao-bringup/turnon_easymega_v1.0 b/ao-bringup/turnon_easymega_v1.0
index 2a330984..15c09074 100755
--- a/ao-bringup/turnon_easymega_v1.0
+++ b/ao-bringup/turnon_easymega_v1.0
@@ -2,22 +2,22 @@
 
 PRODUCT=EasyMega
 
-if [ -x ../ao-tools/ao-flash/ao-flash-stm ]; then
-	STMLOAD=../ao-tools/ao-flash/ao-flash-stm
+if [ -x /usr/bin/ao-flash-stm ]; then
+	STMLOAD=/usr/bin/ao-flash-stm
 else
 	echo "Can't find ao-flash-stm!  Aborting."
 	exit 1
 fi
 
-if [ -x ../ao-tools/ao-usbload/ao-usbload ]; then
-	USBLOAD=../ao-tools/ao-usbload/ao-usbload
+if [ -x /usr/bin/ao-usbload ]; then
+	USBLOAD=/usr/bin/ao-usbload
 else
 	echo "Can't find ao-usbload!  Aborting."
 	exit 1
 fi
 
 VERSION=1.0
-REPO=~/altusmetrumllc/Binaries
+REPO=/usr/share/altos/mfg-fw
 
 echo "$PRODUCT v$VERSION Turn-On and Calibration Program"
 echo "Copyright 2014 by Bdale Garbee.  Released under GPL v2"
@@ -53,7 +53,7 @@ $USBLOAD --serial=$SERIAL $REPO/easymega-v$VERSION*.elf || exit 1
 
 sleep 2
 
-dev=`../ao-tools/ao-list/ao-list | awk '/'"$PRODUCT"'-v'"$VERSION"'/ { print $3; exit(0); }'`
+dev=`ao-list | awk '/'"$PRODUCT"'-v'"$VERSION"'/ { print $3; exit(0); }'`
 
 case "$dev" in
 /dev/tty*)
@@ -67,10 +67,10 @@ esac
 
 echo 'E 0' > $dev
 
-../ao-tools/ao-cal-accel/ao-cal-accel $dev || exit 1
+ao-cal-accel $dev || exit 1
 
 echo 'E 1' > $dev
 
-./test-easymega-v1.0
+test-easymega-v1.0
 
 exit $?
diff --git a/ao-bringup/turnon_easymini b/ao-bringup/turnon_easymini
index 1960c4d6..a8a28420 100755
--- a/ao-bringup/turnon_easymini
+++ b/ao-bringup/turnon_easymini
@@ -1,17 +1,13 @@
 #!/bin/sh
 
-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
+if [ -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
 fi
 
-if [ -x ../ao-tools/ao-usbload/ao-usbload ]; then
-	USBLOAD=../ao-tools/ao-usbload/ao-usbload
-elif [ -x /usr/bin/ao-usbload ]; then
+if [ -x /usr/bin/ao-usbload ]; then
 	USBLOAD=/usr/bin/ao-usbload
 else
 	echo "Can't find ao-usbload!  Aborting."
@@ -20,6 +16,7 @@ fi
 
 VERSION=3.0
 PRODUCT=EasyMini
+REPO=/usr/share/altos/mfg-fw
 BASE=`echo $PRODUCT | tr 'A-Z' 'a-z'`
 echo $FILE
 
@@ -49,8 +46,8 @@ esac
 #
 # Use released versions of everything
 #
-FLASH_FILE=~/altusmetrumllc/Binaries/loaders/easymini-v3.0-altos-flash-*.elf
-ALTOS_FILE=~/altusmetrumllc/Binaries/easymini-v3.0-*.elf
+FLASH_FILE=$REPO/loaders/easymini-v3.0-altos-flash-*.elf
+ALTOS_FILE=$REPO/easymini-v3.0-*.elf
 
 echo $FLASH_LPC $FLASH_FILE
 
@@ -64,6 +61,6 @@ $USBLOAD --serial=$SERIAL $ALTOS_FILE || exit 1
 
 sleep 1
 
-./test-easymini-v3.0
+test-easymini-v3.0
 
 exit $?
diff --git a/ao-bringup/turnon_easymini_v1.0 b/ao-bringup/turnon_easymini_v1.0
index 2041a448..c9d750db 100755
--- a/ao-bringup/turnon_easymini_v1.0
+++ b/ao-bringup/turnon_easymini_v1.0
@@ -1,17 +1,13 @@
 #!/bin/sh
 
-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
+if [ -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
 fi
 
-if [ -x ../ao-tools/ao-usbload/ao-usbload ]; then
-	USBLOAD=../ao-tools/ao-usbload/ao-usbload
-elif [ -x /usr/bin/ao-usbload ]; then
+if [ -x /usr/bin/ao-usbload ]; then
 	USBLOAD=/usr/bin/ao-usbload
 else
 	echo "Can't find ao-usbload!  Aborting."
@@ -20,6 +16,7 @@ fi
 
 VERSION=1.0
 PRODUCT=EasyMini
+REPO=/usr/share/altos/mfg-fw
 BASE=`echo $PRODUCT | tr 'A-Z' 'a-z'`
 echo $FILE
 
@@ -49,11 +46,8 @@ esac
 #
 # Use released versions of everything
 #
-FLASH_FILE=~/altusmetrumllc/Binaries/loaders/easymini-v1.0-altos-flash-*.elf
-ALTOS_FILE=~/altusmetrumllc/Binaries/easymini-v1.0-*.elf
-
-#FLASH_FILE=../src/$BASE-v$VERSION/flash-loader/$BASE-v$VERSION-altos-flash-*.elf
-#ALTOS_FILE=../src/$BASE-v$VERSION/*.ihx
+FLASH_FILE=$REPO/loaders/easymini-v1.0-altos-flash-*.elf
+ALTOS_FILE=$REPO/easymini-v1.0-*.elf
 
 echo $FLASH_LPC $FLASH_FILE
 
@@ -67,6 +61,6 @@ $USBLOAD --serial=$SERIAL $ALTOS_FILE || exit 1
 
 sleep 1
 
-./test-easymini-v1.0
+test-easymini-v1.0
 
 exit $?
diff --git a/ao-bringup/turnon_easymotor b/ao-bringup/turnon_easymotor
index 4678430d..42bc2b6f 100755
--- a/ao-bringup/turnon_easymotor
+++ b/ao-bringup/turnon_easymotor
@@ -1,17 +1,13 @@
 #!/bin/sh
 
-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
+if [ -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
 fi
 
-if [ -x ../ao-tools/ao-usbload/ao-usbload ]; then
-	USBLOAD=../ao-tools/ao-usbload/ao-usbload
-elif [ -x /usr/bin/ao-usbload ]; then
+if [ -x /usr/bin/ao-usbload ]; then
 	USBLOAD=/usr/bin/ao-usbload
 else
 	echo "Can't find ao-usbload!  Aborting."
@@ -20,6 +16,7 @@ fi
 
 VERSION=3
 PRODUCT=EasyMotor
+REPO=/usr/share/altos/mfg-fw
 BASE=`echo $PRODUCT | tr 'A-Z' 'a-z'`
 echo $FILE
 
@@ -50,8 +47,8 @@ otootor
 #
 # Use released versions of everything
 #
-FLASH_FILE=~/altusmetrumllc/Binaries/loaders/easymotor-v3-altos-flash-*.elf
-ALTOS_FILE=~/altusmetrumllc/Binaries/easymotor-v3-*.elf
+FLASH_FILE=$REPO/loaders/easymotor-v3-altos-flash-*.elf
+ALTOS_FILE=$REPO/easymotor-v3-*.elf
 
 echo $FLASH_LPC $FLASH_FILE
 
@@ -81,7 +78,7 @@ echo 'E 0' > $dev
 
 failed=1
 while [ $failed = 1 ]; do
-    ../ao-tools/ao-cal-accel/ao-cal-accel $dev
+    ao-cal-accel $dev
     failed=$?
 done
 
@@ -89,6 +86,6 @@ echo 'E 1' > $dev
 
 sleep 1
 
-./test-easymotor-v3
+test-easymotor-v3
 
 exit $?
diff --git a/ao-bringup/turnon_easytimer b/ao-bringup/turnon_easytimer
index 8953f900..71db2c16 100755
--- a/ao-bringup/turnon_easytimer
+++ b/ao-bringup/turnon_easytimer
@@ -15,7 +15,7 @@ else
 fi
 
 VERSION=1
-REPO=~/altusmetrumllc/Binaries
+REPO=/usr/share/altos/mfg-fw
 PRODUCT=EasyTimer
 
 echo "$PRODUCT v$VERSION Turn-On and Calibration Program"
@@ -67,12 +67,12 @@ echo 'E 0' > $dev
 
 failed=1
 while [ $failed = 1 ]; do
-    ../ao-tools/ao-cal-accel/ao-cal-accel $dev
+    ao-cal-accel $dev
     failed=$?
 done
 
 echo 'E 1' > $dev
 
-./test-easytimer
+test-easytimer
 
 exit $?
diff --git a/ao-bringup/turnon_telebt b/ao-bringup/turnon_telebt
index af72bab8..7bb52505 100755
--- a/ao-bringup/turnon_telebt
+++ b/ao-bringup/turnon_telebt
@@ -15,7 +15,7 @@ else
 fi
 
 VERSION=4.0
-REPO=~/altusmetrumllc/Binaries
+REPO=/usr/share/altos/mfg-fw
 PRODUCT=TeleBT
 
 echo "$PRODUCT v$VERSION Turn-On and Calibration Program"
@@ -66,7 +66,7 @@ esac
 
 CALFILE=cal-$SERIAL.txt
 
-../ao-tools/ao-cal-freq/ao-cal-freq --nosave --output=$CALFILE --tty=$dev
+ao-cal-freq --nosave --output=$CALFILE --tty=$dev
 
 CAL_VALUE=`cat $CALFILE`
 echo $SERIAL","$CAL_VALUE >> cal_values
diff --git a/ao-bringup/turnon_telebt_v1 b/ao-bringup/turnon_telebt_v1
deleted file mode 100755
index f4100ae2..00000000
--- a/ao-bringup/turnon_telebt_v1
+++ /dev/null
@@ -1,62 +0,0 @@
-#!/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 "TeleBT v1.1 Turn-On and Calibration Program"
-echo "Copyright 2013 by Bdale Garbee.  Released under GPL v2"
-echo
-echo "Expectations:"
-echo "\tTeleBT v1.1 powered from USB"
-echo "\t\twith TeleDonlge (on /dev/ttyACM0) cabled to debug header"
-echo "\t\twith coax from SMA to frequency counter"
-echo
-echo -n "TeleBT serial number: "
-read SERIAL
-
-echo $RAWLOAD
-
-case $USER in
-    bdale)
-	DONGLE=100
-	;;
-    keithp)
-	DONGLE=186
-	;;
-    *)
-	echo "Unknow user"
-	exit 1
-	;;
-esac
-
-$RAWLOAD -D $DONGLE -r ao_led_blink.ihx
-echo "LEDs should be blinking"
-sleep 5
-
-$RAWLOAD -D $DONGLE -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 -D $DONGLE --cal $CAL_VALUE ~/altusmetrumllc/Binaries/telebt-v1.0*.ihx $SERIAL
-
-echo "Serial number "$SERIAL" programmed with RF cal value "$CAL_VALUE
-echo $SERIAL","$CAL_VALUE >> cal_values
-echo "Unplug debug cable, power cycle, cu to the board, confirm freq and record power"
diff --git a/ao-bringup/turnon_telebt_v3 b/ao-bringup/turnon_telebt_v3
index 509814d3..5bedf3dd 100755
--- a/ao-bringup/turnon_telebt_v3
+++ b/ao-bringup/turnon_telebt_v3
@@ -15,7 +15,7 @@ else
 fi
 
 VERSION=3.0
-REPO=~/altusmetrumllc/Binaries
+REPO=/usr/share/altos/mfg-fw
 
 echo "TeleBT v$VERSION Turn-On and Calibration Program"
 echo "Copyright 2015 by Bdale Garbee.  Released under GPL v2"
@@ -52,7 +52,7 @@ esac
 
 echo 'E 0' > $dev
 
-SERIAL=$SERIAL ./cal-freq $dev
+SERIAL=$SERIAL cal-freq $dev
 
 echo 'E 1' > $dev
 
diff --git a/ao-bringup/turnon_teledongle b/ao-bringup/turnon_teledongle
index 983f1010..08f05f6d 100755
--- a/ao-bringup/turnon_teledongle
+++ b/ao-bringup/turnon_teledongle
@@ -1,8 +1,6 @@
 #!/bin/sh
 
-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
+if [ -x /usr/bin/ao-flash-lpc ]; then
 	FLASH_LPC=/usr/bin/ao-flash-lpc
 else
 	echo "Can't find ao-flash-lpc!  Aborting."
@@ -44,7 +42,7 @@ case $# in
 	;;
 esac
 
-BINARIES=$HOME/altusmetrumllc/Binaries
+BINARIES=/usr/share/altos/mfg-fw
 
 LOADER="$BINARIES/loaders/$PRODUCT-v$VERSION-"*.elf
 ALTOS="$BINARIES/$PRODUCT-v$VERSION"*.elf
@@ -73,7 +71,7 @@ echo 'E 0' > $dev
 
 CALFILE=cal-$SERIAL.txt
 
-../ao-tools/ao-cal-freq/ao-cal-freq --verbose --nosave --output=$CALFILE --tty=$dev
+ao-cal-freq --verbose --nosave --output=$CALFILE --tty=$dev
 
 case $? in
     0)
diff --git a/ao-bringup/turnon_teledongle_v0.2 b/ao-bringup/turnon_teledongle_v0.2
deleted file mode 100755
index 20c8798a..00000000
--- a/ao-bringup/turnon_teledongle_v0.2
+++ /dev/null
@@ -1,58 +0,0 @@
-#!/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 "TeleDongle v0.2 Turn-On and Calibration Program"
-echo "Copyright 2010 by Bdale Garbee.  Released under GPL v2"
-echo
-echo "Expectations:"
-echo "\tTeleDongle v0.2 powered from USB"
-echo "\t\twith TIdongle (on /dev/ttyACM0) cabled to debug header"
-echo "\t\twith coax from SMA to frequency counter"
-echo
-echo -n "TeleDongle serial number: "
-read SERIAL
-
-echo $RAWLOAD
-
-case $USER in
-    bdale)
-	programmer=100
-	;;
-    keithp)
-	programmer=186
-	;;
-esac
-
-$RAWLOAD -D $programmer -r ao_led_blink.ihx
-echo "LEDs should be blinking"
-sleep 5
-
-$RAWLOAD -D $programmer -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 -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
-echo "Unplug and replug USB, cu to the board, confirm freq and record power"
diff --git a/ao-bringup/turnon_telefireeight b/ao-bringup/turnon_telefireeight
index 871c357f..38744c02 100755
--- a/ao-bringup/turnon_telefireeight
+++ b/ao-bringup/turnon_telefireeight
@@ -2,7 +2,7 @@
 
 PRODUCT=TeleFireEight
 VERSION=2.0
-REPO=~/altusmetrumllc/Binaries
+REPO=/usr/share/altos/mfg-fw
 
 if [ -x /usr/bin/ao-flash-stm ]; then
 	FLASH_STM=/usr/bin/ao-flash-stm
@@ -65,7 +65,7 @@ case "$dev" in
 esac
 
 echo 'E 0' > $dev
-SERIAL=$SERIAL ./cal-freq $dev
+SERIAL=$SERIAL cal-freq $dev
 echo 'E 1' > $dev
 
 echo "$PRODUCT-v$VERSION" serial "$SERIAL" is ready for integration and testing
diff --git a/ao-bringup/turnon_telegps b/ao-bringup/turnon_telegps
index 45f8fcf5..5a3f0d53 100755
--- a/ao-bringup/turnon_telegps
+++ b/ao-bringup/turnon_telegps
@@ -1,8 +1,6 @@
 #!/bin/sh
 
-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
+if [ -x /usr/bin/ao-flash-lpc ]; then
         FLASH_LPC=/usr/bin/ao-flash-lpc
 else
         echo "Can't find ao-flash-lpc!  Aborting."
@@ -17,6 +15,7 @@ else
 fi
 
 PRODUCT=TeleGPS
+REPO=/usr/share/altos/mfg-fw
 VERSION=3.0
 BASE=`echo $PRODUCT | tr 'A-Z' 'a-z'`
 echo $FILE
@@ -47,8 +46,8 @@ esac
 #
 # Use released versions of everything
 #
-FLASH_FILE=~/altusmetrumllc/Binaries/loaders/telegps-v3.0-altos-flash-*.elf
-ALTOS_FILE=~/altusmetrumllc/Binaries/telegps-v3.0-*.elf
+FLASH_FILE=$REPO/loaders/telegps-v3.0-altos-flash-*.elf
+ALTOS_FILE=$REPO/telegps-v3.0-*.elf
 
 echo $FLASH_LPC $FLASH_FILE
 
@@ -75,10 +74,10 @@ case "$dev" in
 esac
 
 CALFILE=cal-$SERIAL.txt
-../ao-tools/ao-cal-freq/ao-cal-freq --output=$CALFILE --tty=$dev
+ao-cal-freq --output=$CALFILE --tty=$dev
 CAL_VALUE=`cat $CALFILE`
 echo $SERIAL","$CAL_VALUE >> cal_values
 
-./test-telegps-v3
+test-telegps-v3
 
 exit $?
diff --git a/ao-bringup/turnon_telegps_v1 b/ao-bringup/turnon_telegps_v1
index 5341acc7..8ce1e8b6 100755
--- a/ao-bringup/turnon_telegps_v1
+++ b/ao-bringup/turnon_telegps_v1
@@ -1,8 +1,6 @@
 #!/bin/sh
 
-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
+if [ -x /usr/bin/ao-flash-lpc ]; then
         FLASH_LPC=/usr/bin/ao-flash-lpc
 else
         echo "Can't find ao-flash-lpc!  Aborting."
@@ -18,6 +16,7 @@ fi
 
 PRODUCT=TeleGPS
 VERSION=1.0
+REPO=/usr/share/altos/mfg-fw
 BASE=`echo $PRODUCT | tr 'A-Z' 'a-z'`
 echo $FILE
 
@@ -47,8 +46,8 @@ esac
 #
 # Use released versions of everything
 #
-FLASH_FILE=~/altusmetrumllc/Binaries/loaders/telegps-v1.0-altos-flash-*.elf
-ALTOS_FILE=~/altusmetrumllc/Binaries/telegps-v1.0-*.elf
+FLASH_FILE=$REPO/loaders/telegps-v1.0-altos-flash-*.elf
+ALTOS_FILE=$REPO/telegps-v1.0-*.elf
 
 echo $FLASH_LPC $FLASH_FILE
 
@@ -74,8 +73,8 @@ case "$dev" in
         ;;
 esac
 
-SERIAL=$SERIAL ./cal-freq $dev
+SERIAL=$SERIAL cal-freq $dev
 
-./test-telegps-v1
+test-telegps-v1
 
 exit $?
diff --git a/ao-bringup/turnon_telegps_v2 b/ao-bringup/turnon_telegps_v2
index 5e4cd616..2a1653df 100755
--- a/ao-bringup/turnon_telegps_v2
+++ b/ao-bringup/turnon_telegps_v2
@@ -16,7 +16,7 @@ fi
 
 PRODUCT=TeleGPS
 VERSION=2.0
-REPO=~/altusmetrumllc/Binaries
+REPO=/usr/share/altos/mfg-fw
 
 #BASE=`echo $PRODUCT | tr 'A-Z' 'a-z'`
 #echo $FILE
@@ -69,8 +69,8 @@ case "$dev" in
         ;;
 esac
 
-SERIAL=$SERIAL ./cal-freq $dev
+SERIAL=$SERIAL cal-freq $dev
 
-./test-telegps-v2
+test-telegps-v2
 
 exit $?
diff --git a/ao-bringup/turnon_telelco b/ao-bringup/turnon_telelco
index dafa2131..61519576 100755
--- a/ao-bringup/turnon_telelco
+++ b/ao-bringup/turnon_telelco
@@ -15,7 +15,7 @@ else
 fi
 
 VERSION=2.0
-REPO=~/altusmetrumllc/Binaries
+REPO=/usr/share/altos/mfg-fw
 PRODUCT=TeleLCO
 
 echo "$PRODUCT v$VERSION Turn-On and Calibration Program"
@@ -66,7 +66,7 @@ esac
 
 echo 'E 0' > $dev
 
-SERIAL=$SERIAL ./cal-freq $dev
+SERIAL=$SERIAL cal-freq $dev
 
 echo 'E 1' > $dev
 
diff --git a/ao-bringup/turnon_telemega b/ao-bringup/turnon_telemega
index b433133b..897acb35 100755
--- a/ao-bringup/turnon_telemega
+++ b/ao-bringup/turnon_telemega
@@ -15,7 +15,7 @@ else
 fi
 
 VERSION=6.0
-REPO=~/altusmetrumllc/Binaries
+REPO=/usr/share/altos/mfg-fw
 PRODUCT=TeleMega
 
 echo "$PRODUCT v$VERSION Turn-On and Calibration Program"
@@ -66,16 +66,16 @@ esac
 
 echo 'E 0' > $dev
 
-SERIAL=$SERIAL ./cal-freq $dev
+SERIAL=$SERIAL cal-freq $dev
 
 failed=1
 while [ $failed = 1 ]; do
-    ../ao-tools/ao-cal-accel/ao-cal-accel $dev
+    ao-cal-accel $dev
     failed=$?
 done
 
 echo 'E 1' > $dev
 
-./test-telemega-v6.0
+test-telemega-v6.0
 
 exit $?
diff --git a/ao-bringup/turnon_telemega_v1.0 b/ao-bringup/turnon_telemega_v1.0
index a8fb8c86..298c3875 100755
--- a/ao-bringup/turnon_telemega_v1.0
+++ b/ao-bringup/turnon_telemega_v1.0
@@ -15,7 +15,7 @@ else
 fi
 
 VERSION=1.0
-REPO=~/altusmetrumllc/Binaries
+REPO=/usr/share/altos/mfg-fw
 
 echo "TeleMega v$VERSION Turn-On and Calibration Program"
 echo "Copyright 2014 by Bdale Garbee.  Released under GPL v2"
@@ -52,12 +52,12 @@ esac
 
 echo 'E 0' > $dev
 
-SERIAL=$SERIAL ./cal-freq $dev
+SERIAL=$SERIAL cal-freq $dev
 
-../ao-tools/ao-cal-accel/ao-cal-accel $dev
+ao-cal-accel $dev
 
 echo 'E 1' > $dev
 
-./test-telemega-v1.0
+test-telemega-v1.0
 
 exit $?
diff --git a/ao-bringup/turnon_telemega_v2.0 b/ao-bringup/turnon_telemega_v2.0
index 3c80dd94..def71d75 100755
--- a/ao-bringup/turnon_telemega_v2.0
+++ b/ao-bringup/turnon_telemega_v2.0
@@ -15,7 +15,7 @@ else
 fi
 
 VERSION=2.0
-REPO=~/altusmetrumllc/Binaries
+REPO=/usr/share/altos/mfg-fw
 PRODUCT=TeleMega
 
 echo "$PRODUCT v$VERSION Turn-On and Calibration Program"
@@ -66,16 +66,16 @@ esac
 
 echo 'E 0' > $dev
 
-SERIAL=$SERIAL ./cal-freq $dev
+SERIAL=$SERIAL cal-freq $dev
 
 failed=1
 while [ $failed = 1 ]; do
-    ../ao-tools/ao-cal-accel/ao-cal-accel $dev
+    ao-cal-accel $dev
     failed=$?
 done
 
 echo 'E 1' > $dev
 
-./test-telemega-v2.0
+test-telemega-v2.0
 
 exit $?
diff --git a/ao-bringup/turnon_telemega_v3.0 b/ao-bringup/turnon_telemega_v3.0
index 272a69d7..3e9f3a3e 100755
--- a/ao-bringup/turnon_telemega_v3.0
+++ b/ao-bringup/turnon_telemega_v3.0
@@ -15,7 +15,7 @@ else
 fi
 
 VERSION=3.0
-REPO=~/altusmetrumllc/Binaries
+REPO=/usr/share/altos/mfg-fw
 PRODUCT=TeleMega
 
 echo "$PRODUCT v$VERSION Turn-On and Calibration Program"
@@ -66,16 +66,16 @@ esac
 
 echo 'E 0' > $dev
 
-SERIAL=$SERIAL ./cal-freq $dev
+SERIAL=$SERIAL cal-freq $dev
 
 failed=1
 while [ $failed = 1 ]; do
-    ../ao-tools/ao-cal-accel/ao-cal-accel $dev
+    ao-cal-accel $dev
     failed=$?
 done
 
 echo 'E 1' > $dev
 
-./test-telemega-v3.0
+test-telemega-v3.0
 
 exit $?
diff --git a/ao-bringup/turnon_telemega_v4.0 b/ao-bringup/turnon_telemega_v4.0
index 67f4fb0c..f6d3d255 100755
--- a/ao-bringup/turnon_telemega_v4.0
+++ b/ao-bringup/turnon_telemega_v4.0
@@ -15,7 +15,7 @@ else
 fi
 
 VERSION=4.0
-REPO=~/altusmetrumllc/Binaries
+REPO=/usr/share/altos/mfg-fw
 PRODUCT=TeleMega
 
 echo "$PRODUCT v$VERSION Turn-On and Calibration Program"
@@ -66,16 +66,16 @@ esac
 
 echo 'E 0' > $dev
 
-SERIAL=$SERIAL ./cal-freq $dev
+SERIAL=$SERIAL cal-freq $dev
 
 failed=1
 while [ $failed = 1 ]; do
-    ../ao-tools/ao-cal-accel/ao-cal-accel $dev
+    ao-cal-accel $dev
     failed=$?
 done
 
 echo 'E 1' > $dev
 
-./test-telemega
+test-telemega
 
 exit $?
diff --git a/ao-bringup/turnon_telemega_v5.0 b/ao-bringup/turnon_telemega_v5.0
index eb26090b..eed8b091 100755
--- a/ao-bringup/turnon_telemega_v5.0
+++ b/ao-bringup/turnon_telemega_v5.0
@@ -15,7 +15,7 @@ else
 fi
 
 VERSION=5.0
-REPO=~/altusmetrumllc/Binaries
+REPO=/usr/share/altos/mfg-fw
 PRODUCT=TeleMega
 
 echo "$PRODUCT v$VERSION Turn-On and Calibration Program"
@@ -66,16 +66,16 @@ esac
 
 echo 'E 0' > $dev
 
-SERIAL=$SERIAL ./cal-freq $dev
+SERIAL=$SERIAL cal-freq $dev
 
 failed=1
 while [ $failed = 1 ]; do
-    ../ao-tools/ao-cal-accel/ao-cal-accel $dev
+    ao-cal-accel $dev
     failed=$?
 done
 
 echo 'E 1' > $dev
 
-./test-telemega-v5.0
+test-telemega-v5.0
 
 exit $?
diff --git a/ao-bringup/turnon_telemetrum b/ao-bringup/turnon_telemetrum
index bb455c98..04e8a401 100755
--- a/ao-bringup/turnon_telemetrum
+++ b/ao-bringup/turnon_telemetrum
@@ -15,6 +15,7 @@ else
 fi
 
 VERSION=4.0
+REPO=/usr/share/altos/mfg-fw
 PRODUCT=TeleMetrum
 
 echo "$PRODUCT v$VERSION Turn-On and Calibration Program"
@@ -44,11 +45,11 @@ esac
 
 echo $FLASH_STM
 
-$FLASH_STM ~/altusmetrumllc/Binaries/loaders/telemetrum-v$VERSION-*.elf || exit 1
+$FLASH_STM $REPO/loaders/telemetrum-v$VERSION-*.elf || exit 1
 
 sleep 3
 
-$USBLOAD --serial=$SERIAL ~/altusmetrumllc/Binaries/telemetrum-v$VERSION-*.elf || exit 1
+$USBLOAD --serial=$SERIAL $REPO/telemetrum-v$VERSION-*.elf || exit 1
 
 sleep 5
 
@@ -66,16 +67,16 @@ esac
 
 echo 'E 0' > $dev
 
-SERIAL=$SERIAL ./cal-freq $dev
+SERIAL=$SERIAL cal-freq $dev
 
 failed=1
 while [ $failed = 1 ]; do
-    ../ao-tools/ao-cal-accel/ao-cal-accel $dev
+    ao-cal-accel $dev
     failed=$?
 done
 
 echo 'E 1' > $dev
 
-./test-telemetrum-v4.0
+test-telemetrum-v4.0
 
 exit $?
diff --git a/ao-bringup/turnon_telemetrum_v1.1 b/ao-bringup/turnon_telemetrum_v1.1
deleted file mode 100755
index 830d7ed9..00000000
--- a/ao-bringup/turnon_telemetrum_v1.1
+++ /dev/null
@@ -1,49 +0,0 @@
-#!/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_telemetrum_v2.0 b/ao-bringup/turnon_telemetrum_v2.0
index e2d2f532..349299ff 100755
--- a/ao-bringup/turnon_telemetrum_v2.0
+++ b/ao-bringup/turnon_telemetrum_v2.0
@@ -15,6 +15,7 @@ else
 fi
 
 VERSION=2.0
+REPO=/usr/share/altos/mfg-fw
 PRODUCT=TeleMetrum
 
 echo "$PRODUCT v$VERSION Turn-On and Calibration Program"
@@ -44,11 +45,11 @@ esac
 
 echo $FLASH_STM
 
-$FLASH_STM ~/altusmetrumllc/Binaries/loaders/telemetrum-v$VERSION-*.elf || exit 1
+$FLASH_STM $REPO/loaders/telemetrum-v$VERSION-*.elf || exit 1
 
 sleep 3
 
-$USBLOAD --serial=$SERIAL ~/altusmetrumllc/Binaries/telemetrum-v$VERSION-*.elf || exit 1
+$USBLOAD --serial=$SERIAL $REPO/telemetrum-v$VERSION-*.elf || exit 1
 
 sleep 5
 
@@ -66,16 +67,16 @@ esac
 
 echo 'E 0' > $dev
 
-SERIAL=$SERIAL ./cal-freq $dev
+SERIAL=$SERIAL cal-freq $dev
 
 failed=1
 while [ $failed = 1 ]; do
-    ../ao-tools/ao-cal-accel/ao-cal-accel $dev
+    ao-cal-accel $dev
     failed=$?
 done
 
 echo 'E 1' > $dev
 
-./test-telemetrum-v2.0
+test-telemetrum-v2.0
 
 exit $?
diff --git a/ao-bringup/turnon_telemetrum_v3.0 b/ao-bringup/turnon_telemetrum_v3.0
index 96de4ad4..c7a026c9 100755
--- a/ao-bringup/turnon_telemetrum_v3.0
+++ b/ao-bringup/turnon_telemetrum_v3.0
@@ -15,6 +15,7 @@ else
 fi
 
 VERSION=3.0
+REPO=/usr/share/altos/mfg-fw
 PRODUCT=TeleMetrum
 
 echo "$PRODUCT v$VERSION Turn-On and Calibration Program"
@@ -44,11 +45,11 @@ esac
 
 echo $FLASH_STM
 
-$FLASH_STM ~/altusmetrumllc/Binaries/loaders/telemetrum-v$VERSION-*.elf || exit 1
+$FLASH_STM $REPO/loaders/telemetrum-v$VERSION-*.elf || exit 1
 
 sleep 3
 
-$USBLOAD --serial=$SERIAL ~/altusmetrumllc/Binaries/telemetrum-v$VERSION-*.elf || exit 1
+$USBLOAD --serial=$SERIAL $REPO/telemetrum-v$VERSION-*.elf || exit 1
 
 sleep 5
 
@@ -66,16 +67,16 @@ esac
 
 echo 'E 0' > $dev
 
-SERIAL=$SERIAL ./cal-freq $dev
+SERIAL=$SERIAL cal-freq $dev
 
 failed=1
 while [ $failed = 1 ]; do
-    ../ao-tools/ao-cal-accel/ao-cal-accel $dev
+    ao-cal-accel $dev
     failed=$?
 done
 
 echo 'E 1' > $dev
 
-./test-telemetrum-v3.0
+test-telemetrum-v3.0
 
 exit $?
diff --git a/ao-bringup/turnon_telemini b/ao-bringup/turnon_telemini
index 678251f4..0b56503c 100755
--- a/ao-bringup/turnon_telemini
+++ b/ao-bringup/turnon_telemini
@@ -15,6 +15,7 @@ else
 fi
 
 VERSION=3.0
+REPO=/usr/share/altos/mfg-fw
 PRODUCT=TeleMini
 
 echo "$PRODUCT v$VERSION Turn-On and Calibration Program"
@@ -40,10 +41,8 @@ case $# in
 	;;
 esac
 
-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
+FLASH_FILE=$REPO/loaders/telemini-v$VERSION-altos-flash-*.bin
+ALTOS_FILE=$REPO/telemini-v$VERSION-*.elf
 
 if lsusb -d 0483:df11 | grep -q STM; then
     $DFU_UTIL -a 0 -s 0x08000000:leave -D $FLASH_FILE || exit 1
@@ -69,10 +68,10 @@ esac
 
 echo 'E 0' > $dev
 
-SERIAL=$SERIAL ./cal-freq $dev
+SERIAL=$SERIAL cal-freq $dev
 
 echo 'E 1' > $dev
 
-./test-telemini
+test-telemini
 
 exit $?
diff --git a/ao-bringup/turnon_teleminiv2 b/ao-bringup/turnon_telemini_v2
similarity index 80%
rename from ao-bringup/turnon_teleminiv2
rename to ao-bringup/turnon_telemini_v2
index 0ce73cbb..eb134956 100755
--- a/ao-bringup/turnon_teleminiv2
+++ b/ao-bringup/turnon_telemini_v2
@@ -1,17 +1,15 @@
 #!/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
+REPO=/usr/share/altos/mfg-fw
+
+if [ -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
+if [ -x /usr/bin/ao-rawload ]; then
 	RAWLOAD=/usr/bin/ao-rawload
 else
 	echo "Can't find ao-rawload!  Aborting."
@@ -34,7 +32,7 @@ echo $RAWLOAD
 
 #TTY=/dev/ttyACM0
 PROGRAMMER="-D 186"
-BIN=../src/telemini-v2.0*.ihx
+BIN=$REPO/telemini-v2.0*.ihx
 
 $RAWLOAD $PROGRAMMER -r ao_led_blink.ihx
 echo "LEDs should be blinking"
diff --git a/ao-bringup/turnon_teleshield b/ao-bringup/turnon_teleshield
deleted file mode 100755
index e9f651fb..00000000
--- a/ao-bringup/turnon_teleshield
+++ /dev/null
@@ -1,48 +0,0 @@
-#!/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 "TeleShield v0.1 Turn-On and Calibration Program"
-echo "Copyright 2012 by Bdale Garbee.  Released under GPL v2"
-echo
-echo "Expectations:"
-echo "\tTeleShield v0.1 powered from USB"
-echo "\t\twith TeleDongle (on /dev/ttyACM0) cabled to debug header"
-echo "\t\twith coax from SMA to frequency counter"
-echo
-echo -n "TeleShield serial number: "
-read SERIAL
-
-echo $RAWLOAD
-
-$RAWLOAD -D 100 -r ao_led_blink.ihx
-echo "LEDs should be blinking"
-sleep 5
-
-$RAWLOAD -D 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 -D 100 --cal $CAL_VALUE /home/bdale/debian/altos/src/teleshield-v0.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_teleterra b/ao-bringup/turnon_teleterra
deleted file mode 100755
index b63da2ff..00000000
--- a/ao-bringup/turnon_teleterra
+++ /dev/null
@@ -1,48 +0,0 @@
-#!/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 "TeleTerra v0.2 Turn-On and Calibration Program"
-echo "Copyright 2012 by Bdale Garbee.  Released under GPL v2"
-echo
-echo "Expectations:"
-echo "\tTeleTerra v0.2 powered from USB"
-echo "\t\twith TeleDongle (on /dev/ttyACM0) cabled to debug header"
-echo "\t\twith coax from SMA to frequency counter"
-echo
-echo -n "TeleTerra serial number: "
-read SERIAL
-
-echo $RAWLOAD
-
-$RAWLOAD -D 100 -r ao_led_blink.ihx
-echo "LEDs should be blinking"
-sleep 5
-
-$RAWLOAD -D 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 -D 100 --cal $CAL_VALUE /home/bdale/debian/altos/src/teleterra-v0.2/*.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"
-- 
2.47.2