Merge branch 'master' of ssh://git.gag.com/scm/git/fw/altos

[fw/altos] / ao-bringup / turnon_easymega

diff --git a/ao-bringup/turnon_easymega b/ao-bringup/turnon_easymega
index b313e16286dd1ee2c83977bdd4535ec031b6c855..1e75e72fb0c9a04be36f87f07fabeaf94a681a22 100755 (executable)
--- 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