X-Git-Url: https://git.gag.com/?p=fw%2Faltos;a=blobdiff_plain;f=ao-bringup%2Fturnon_easymega;h=b14ed2ab9895c835d20f3de84bdb2775753db31b;hp=b313e16286dd1ee2c83977bdd4535ec031b6c855;hb=df39a30c762d57c7d04110e054f74d50fa8d85de;hpb=54994d02a5ca5bb91512f31748a48a0140d3a640

diff --git a/ao-bringup/turnon_easymega b/ao-bringup/turnon_easymega
index b313e162..b14ed2ab 100755
--- a/ao-bringup/turnon_easymega
+++ b/ao-bringup/turnon_easymega
@@ -1,14 +1,16 @@
 #!/bin/sh
 
-if [ -x /usr/bin/ao-flash-stm ]; then
-	STMLOAD=/usr/bin/ao-flash-stm
+PRODUCT=EasyMega
+
+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
@@ -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,21 +53,21 @@ $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 '/'"$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
 
 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