7 files changed, 50 insertions, 56 deletions
diff --git a/ao-bringup/cal-freq b/ao-bringup/cal-freq
index 5d876e21..d3d9dc95 100755
--- a/ao-bringup/cal-freq
+++ b/ao-bringup/cal-freq
@@ -10,42 +10,16 @@ case $# in
 	;;
 esac
 
-while true; do
-	echo 'C 1' > $dev
-
-	echo -n "Generating RF carrier. Please enter measured frequency [enter for done]: "
-
-	read FREQ
-
-	echo 'C 0' > $dev
-
+../ao-tools/ao-cal-freq/ao-cal-freq --dev=$dev
+case $? in
+    0)
 	calline=`./get-radio-cal $dev`
-	CURRENT_CAL=`echo $calline | awk '{print $2}'`
+	CAL_VALUE=`echo $calline | awk '{print $2}'`
 	CURRENT_FREQ=`echo $calline | awk '{print $4}'`
-	CAL_VALUE=$CURRENT_CAL
-
-	case "$FREQ" in
-	"")
-		echo $SERIAL","$CAL_VALUE >> cal_values
-		exit 0
-		;;
-	*)
-		echo "Current radio calibration "$CURRENT_CAL
-		echo "Current radio frequency "$CURRENT_FREQ
-
-		CAL_VALUE=`nickle -e "floor($CURRENT_FREQ / $FREQ * $CURRENT_CAL + 0.5)"`
-
-		echo "Programming flash with cal value " $CAL_VALUE
-
-		dd if=$dev iflag=nonblock
-
-		cat << EOF > $dev
-c f $CAL_VALUE
-c w
-EOF
-
-		echo "Serial number "$SERIAL" programmed with RF cal value "$CAL_VALUE
-		;;
-	esac
-done
-
+	echo $SERIAL","$CAL_VALUE >> cal_values
+	exit 0
+	;;
+    *)
+	exit 1
+	;;
+esac
diff --git a/ao-bringup/test-easymega b/ao-bringup/test-easymega
index 76f3effb..2f0a7822 100755
--- a/ao-bringup/test-easymega
+++ b/ao-bringup/test-easymega
@@ -12,7 +12,7 @@ echo "\t$PRODUCT v$VERSION powered from USB"
 echo
 
 ret=1
-ao-list | while read product serial dev; do
+../ao-tools/ao-list/ao-list | while read product serial dev; do
     case "$product" in
 	"$PRODUCT-v$VERSION")
 
diff --git a/ao-bringup/test-telemetrum b/ao-bringup/test-telemetrum
index 57a4d90d..13407e86 100755
--- a/ao-bringup/test-telemetrum
+++ b/ao-bringup/test-telemetrum
@@ -61,6 +61,7 @@ ao-list | while read product serial dev; do
 	    echo""
 
 	    echo "$PRODUCT-v$VERSION" serial "$serial" is ready to ship
+	    echo "\007"
 	    ret=0
 	    ;;
     esac
diff --git a/ao-bringup/turnon_easymega b/ao-bringup/turnon_easymega
index b313e162..1e75e72f 100755
--- a/ao-bringup/turnon_easymega
+++ b/ao-bringup/turnon_easymega
@@ -1,14 +1,14 @@
 #!/bin/sh
 
-if [ -x /usr/bin/ao-flash-stm ]; then
-	STMLOAD=/usr/bin/ao-flash-stm
+if [ -x ../ao-tools/ao-flash/ao-flash-stm ]; then
+	STMLOAD=../ao-tools/ao-flash/ao-flash-stm
 else
 	echo "Can't find ao-flash-stm!  Aborting."
 	exit 1
 fi
 
-if [ -x /usr/bin/ao-usbload ]; then
-	USBLOAD=/usr/bin/ao-usbload
+if [ -x ../ao-tools/ao-usbload/ao-usbload ]; then
+	USBLOAD=../ao-tools/ao-usbload/ao-usbload
 else
 	echo "Can't find ao-usbload!  Aborting."
 	exit 1
@@ -38,7 +38,7 @@ $USBLOAD --serial=$SERIAL $REPO/easymega-v$VERSION*.elf || exit 1
 
 sleep 2
 
-dev=`ao-list | awk '/EasyMega-v'"$VERSION"'/ { print $3; exit(0); }'`
+dev=`../ao-tools/ao-list/ao-list | awk '/EasyMega-v'"$VERSION"'/ { print $3; exit(0); }'`
 
 case "$dev" in
 /dev/tty*)
@@ -52,7 +52,7 @@ esac
 
 echo 'E 0' > $dev
 
-../ao-tools/ao-cal-accel/ao-cal-accel $dev
+../ao-tools/ao-cal-accel/ao-cal-accel $dev || exit 1
 
 echo 'E 1' > $dev
 
diff --git a/ao-bringup/turnon_telebt b/ao-bringup/turnon_telebt
index c4902f31..f4100ae2 100755
--- a/ao-bringup/turnon_telebt
+++ b/ao-bringup/turnon_telebt
@@ -1,8 +1,5 @@
 #!/bin/sh
 
-# serial number of the TeleDongle being used as the flash programmer
-DONGLE=612
-
 if [ -x ../ao-tools/ao-load/ao-load ]; then
 	AOLOAD=../ao-tools/ao-load/ao-load
 elif [ -x /usr/bin/ao-load ]; then
@@ -34,6 +31,19 @@ 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
@@ -45,7 +55,7 @@ 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 /usr/share/altos/telebt-v1.0*.ihx $SERIAL
+$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
diff --git a/ao-bringup/turnon_telegps b/ao-bringup/turnon_telegps
index 123f0b54..ba97d503 100755
--- a/ao-bringup/turnon_telegps
+++ b/ao-bringup/turnon_telegps
@@ -72,10 +72,8 @@ case "$dev" in
         ;;
 esac
 
-echo 'E 0' > $dev
+SERIAL=$SERIAL ./cal-freq $dev
 
 ./test-telegps
 
-SERIAL=$SERIAL ./cal-freq $dev
-
 exit $?
diff --git a/ao-bringup/turnon_telemini b/ao-bringup/turnon_telemini
index 4450d6f6..6aef7f51 100755
--- a/ao-bringup/turnon_telemini
+++ b/ao-bringup/turnon_telemini
@@ -18,11 +18,13 @@ else
 	exit 1
 fi
 
-echo "TeleMini v1.0 Turn-On and Calibration Program"
+VERSION=1.0
+
+echo "TeleMini v$VERSION Turn-On and Calibration Program"
 echo "Copyright 2011 by Bdale Garbee.  Released under GPL v2"
 echo
 echo "Expectations:"
-echo "\tTeleMini v1.0 powered from LiPo"
+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
@@ -31,18 +33,27 @@ read SERIAL
 
 echo $RAWLOAD
 
-$RAWLOAD -D 100 -r ao_led_blink.ihx
+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 100 -r ao_radio_xmit.ihx
+$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 100 --cal $CAL_VALUE /usr/share/altos/stable/telemini-v1.0*.ihx $SERIAL
+$AOLOAD -D $programmer --cal $CAL_VALUE ~/altusmetrumllc/Binaries/telemini-v$VERSION-*.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"