swap names so v3.0 is the default TeleDongle version to turn on

diff --git a/ao-bringup/turnon_teledongle b/ao-bringup/turnon_teledongle
index 058e72cec590936c7073bae6755cf17c5fb27e5f..e6750c453a0e72ca11c197e2ad18f8ed4f3607ca 100755 (executable)
--- a/ao-bringup/turnon_teledongle
+++ b/ao-bringup/turnon_teledongle
@@ -1,58 +1,89 @@
 #!/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 ../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-load!  Aborting."
+       echo "Can't find ao-flash-lpc!  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
 
-echo "TeleDongle v0.2 Turn-On and Calibration Program"
-echo "Copyright 2010 by Bdale Garbee.  Released under GPL v2"
+PRODUCT=teledongle
+PRODUCT_NAME=TeleDongle
+VERSION=3.0
+
+echo "$PRODUCT_NAME v$VERSION Turn-On and Calibration Program"
+echo "Copyright © 2015 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 "\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 "TeleDongle serial number: "
+echo -n "$PRODUCT_NAME-$VERSION serial number: "
 read SERIAL
 
-echo $RAWLOAD
+BINARIES=$HOME/altusmetrumllc/Binaries
+
+LOADER="$BINARIES/loaders/$PRODUCT-v$VERSION-"*.elf
+ALTOS="$BINARIES/$PRODUCT-v$VERSION"*.elf
+
+$FLASH_LPC $LOADER || exit 1
 
-case $USER in
-    bdale)
-       programmer=100
+sleep 2
+
+$USBLOAD --serial=$SERIAL $ALTOS || exit 1
+
+sleep 5
+
+dev=`ao-list | awk '/TeleDongle-v'"$VERSION"'/ { print $3; exit(0); }'`
+
+case "$dev" in
+/dev/tty*)
+       echo "TeleDongle found on $dev"
        ;;
-    keithp)
-       programmer=186
+*)
+       echo 'No TeleDongle-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
+
+./cal-freq-file $dev $SERIAL
+
+case $? in
+    0)
+       ;;
+    *)
+       echo "Frequency calibration failed"
+       exit 1
+       ;;
+esac
+
+CAL_VALUE=`grep "^$SERIAL," cal_values | tail -1 | sed 's/^[^,]*,//'`
+
+case "$CAL_VALUE" in
+    [1-9]*)
+    ;;
+    *)
+       echo "Invalid calibration value: $CAL_VALUE"
+       exit 1
+       ;;
+esac
 
-$RAWLOAD -D $programmer -r ao_radio_xmit.ihx
-echo -n "Generating RF carrier.  Please enter measured frequency: "
-read FREQ
+echo "Reflashing with calibration: $CAL_VALUE"
 
-CAL_VALUE=`nickle -e "floor(434.55 / $FREQ * 1186611 + 0.5)"`
+$USBLOAD --cal=$CAL_VALUE --tty=$dev $ALTOS || exit 1
 
-echo "Programming flash with cal value " $CAL_VALUE
-$AOLOAD -D $programmer --cal $CAL_VALUE /usr/share/altos/teledongle-v0.2*.ihx $SERIAL
+echo "$PRODUCT_NAME-v$VERSION $SERIAL is ready to ship"
 
-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"
+exit $?

diff --git a/ao-bringup/turnon_teledongle_v0.2 b/ao-bringup/turnon_teledongle_v0.2
new file mode 100755 (executable)
index 0000000..058e72c
--- /dev/null
+++ b/ao-bringup/turnon_teledongle_v0.2
@@ -0,0 +1,58 @@
+#!/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 /usr/share/altos/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_teledonglev3 b/ao-bringup/turnon_teledonglev3
deleted file mode 100755 (executable)
index e6750c4..0000000
--- a/ao-bringup/turnon_teledonglev3
+++ /dev/null
@@ -1,89 +0,0 @@
-#!/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
-       FLASH_LPC=/usr/bin/ao-flash-lpc
-else
-       echo "Can't find ao-flash-lpc!  Aborting."
-       exit 1
-fi
-
-if [ -x /usr/bin/ao-usbload ]; then
-       USBLOAD=/usr/bin/ao-usbload
-else
-       echo "Can't find ao-usbload!  Aborting."
-       exit 1
-fi
-
-PRODUCT=teledongle
-PRODUCT_NAME=TeleDongle
-VERSION=3.0
-
-echo "$PRODUCT_NAME v$VERSION Turn-On and Calibration Program"
-echo "Copyright © 2015 by Bdale Garbee.  Released under GPL v2"
-echo
-echo "Expectations:"
-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
-
-BINARIES=$HOME/altusmetrumllc/Binaries
-
-LOADER="$BINARIES/loaders/$PRODUCT-v$VERSION-"*.elf
-ALTOS="$BINARIES/$PRODUCT-v$VERSION"*.elf
-
-$FLASH_LPC $LOADER || exit 1
-
-sleep 2
-
-$USBLOAD --serial=$SERIAL $ALTOS || exit 1
-
-sleep 5
-
-dev=`ao-list | awk '/TeleDongle-v'"$VERSION"'/ { print $3; exit(0); }'`
-
-case "$dev" in
-/dev/tty*)
-       echo "TeleDongle found on $dev"
-       ;;
-*)
-       echo 'No TeleDongle-v'"$VERSION"' found'
-       exit 1
-       ;;
-esac
-
-echo 'E 0' > $dev
-
-./cal-freq-file $dev $SERIAL
-
-case $? in
-    0)
-       ;;
-    *)
-       echo "Frequency calibration failed"
-       exit 1
-       ;;
-esac
-
-CAL_VALUE=`grep "^$SERIAL," cal_values | tail -1 | sed 's/^[^,]*,//'`
-
-case "$CAL_VALUE" in
-    [1-9]*)
-    ;;
-    *)
-       echo "Invalid calibration value: $CAL_VALUE"
-       exit 1
-       ;;
-esac
-
-echo "Reflashing with calibration: $CAL_VALUE"
-
-$USBLOAD --cal=$CAL_VALUE --tty=$dev $ALTOS || exit 1
-
-echo "$PRODUCT_NAME-v$VERSION $SERIAL is ready to ship"
-
-exit $?