Merge branch 'branch-1.8' into debian

6 files changed, 87 insertions, 9 deletions

diff --git a/ao-bringup/turnon_chaoskey b/ao-bringup/turnon_chaoskey
index d710e5ff..9ad80912 100755
--- a/ao-bringup/turnon_chaoskey
+++ b/ao-bringup/turnon_chaoskey
@@ -1,7 +1,7 @@
 #!/bin/sh
 
-if [ -x /usr/bin/dfu-util ]; then
-    DFU_UTIL=/usr/bin/dfu-util
+if [ -x `which dfu-util` ]; then
+    DFU_UTIL=`which dfu-util`
 else
     echo "Can't find dfu-util! Aborting."
     exit 1
@@ -33,7 +33,7 @@ $DFU_UTIL -a 0 -s 0x08000000:leave -D $FLASH_FILE || true
 
 #$USBLOAD --serial=1 $ALTOS_FILE || exit 1
 
-sleep 1
+sleep 3
 
 ./test-chaoskey
 
diff --git a/ao-bringup/turnon_telegps b/ao-bringup/turnon_telegps
index 48af692a..5e4cd616 100755
--- a/ao-bringup/turnon_telegps
+++ b/ao-bringup/turnon_telegps
@@ -49,9 +49,9 @@ esac
 FLASH_FILE=$REPO/loaders/telegps-v2.0-altos-flash-*.bin
 ALTOS_FILE=$REPO/telegps-v2.0-*.elf
 
-$DFU_UTIL -a 0 -s 0x08000000:leave -D $FLASH_FILE 
+$DFU_UTIL -v -v -R -a 0 -s 0x08000000:leave -D $FLASH_FILE 
 
-sleep 2
+sleep 3
 
 $USBLOAD --serial=$SERIAL $ALTOS_FILE || exit 1
 
diff --git a/ao-bringup/turnon_telelco b/ao-bringup/turnon_telelco
new file mode 100755
index 00000000..dafa2131
--- /dev/null
+++ b/ao-bringup/turnon_telelco
@@ -0,0 +1,76 @@
+#!/bin/sh
+
+if [ -x /usr/bin/ao-flash-stm ]; then
+	FLASH_STM=/usr/bin/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
+else
+	echo "Can't find ao-usbload!  Aborting."
+	exit 1
+fi
+
+VERSION=2.0
+REPO=~/altusmetrumllc/Binaries
+PRODUCT=TeleLCO
+
+echo "$PRODUCT v$VERSION Turn-On and Calibration Program"
+echo "Copyright 2018 by Bdale Garbee.  Released under GPL v3"
+echo
+echo "Expectations:"
+echo "\t$PRODUCT 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
+
+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 $FLASH_STM
+
+$FLASH_STM $REPO/loaders/telelco-v$VERSION*.elf 
+
+sleep 3
+
+$USBLOAD --serial=$SERIAL --force $REPO/telelco-v$VERSION*.elf || exit 1
+
+sleep 5
+
+dev=`ao-list | awk '/'"$PRODUCT-v$VERSION"'/ { print $3; exit(0); }'`
+
+case "$dev" in
+/dev/tty*)
+	echo "$PRODUCT"' found on $dev'
+	;;
+*)
+	echo 'No '"$PRODUCT-v$VERSION"' found'
+	exit 1
+	;;
+esac
+
+echo 'E 0' > $dev
+
+SERIAL=$SERIAL ./cal-freq $dev
+
+echo 'E 1' > $dev
+
+echo "$PRODUCT-v$VERSION" serial "$serial" is ready to ship
+echo "\007"
+
+exit $?
diff --git a/ao-bringup/turnon_telemega b/ao-bringup/turnon_telemega
index 49776788..1fce345a 100755
--- a/ao-bringup/turnon_telemega
+++ b/ao-bringup/turnon_telemega
@@ -46,7 +46,7 @@ echo $FLASH_STM
 
 $FLASH_STM $REPO/loaders/telemega-v$VERSION*.elf 
 
-sleep 5
+sleep 3
 
 $USBLOAD --serial=$SERIAL --force $REPO/telemega-v$VERSION*.elf || exit 1
 
diff --git a/ao-bringup/turnon_telemetrum b/ao-bringup/turnon_telemetrum
index d40be953..dd30378a 100755
--- a/ao-bringup/turnon_telemetrum
+++ b/ao-bringup/turnon_telemetrum
@@ -46,7 +46,7 @@ echo $FLASH_STM
 
 $FLASH_STM ~/altusmetrumllc/Binaries/loaders/telemetrum-v$VERSION-*.elf || exit 1
 
-sleep 2
+sleep 3
 
 $USBLOAD --serial=$SERIAL ~/altusmetrumllc/Binaries/telemetrum-v$VERSION-*.elf || exit 1
 
diff --git a/ao-bringup/turnon_telemini b/ao-bringup/turnon_telemini
index 23031481..678251f4 100755
--- a/ao-bringup/turnon_telemini
+++ b/ao-bringup/turnon_telemini
@@ -45,9 +45,11 @@ 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
 
-$DFU_UTIL -a 0 -s 0x08000000:leave -D $FLASH_FILE || exit 1
+if lsusb -d 0483:df11 | grep -q STM; then
+    $DFU_UTIL -a 0 -s 0x08000000:leave -D $FLASH_FILE || exit 1
 
-sleep 2
+    sleep 2
+fi
 
 $USBLOAD --serial=$SERIAL $ALTOS_FILE || exit 1