X-Git-Url: https://git.gag.com/?p=fw%2Faltos;a=blobdiff_plain;f=ao-bringup%2Fturnon_chaoskey;h=4a255bff3d27581e1070641c5cf1f59d79ab7243;hp=8ac8479e337a7e0a537972b6bafc85772334c47f;hb=f1bbf1bd18d52a084af714a022b12bfc3c76374c;hpb=165868999f45f4572ff2585fcb3986974a5bbd5c

diff --git a/ao-bringup/turnon_chaoskey b/ao-bringup/turnon_chaoskey
index 8ac8479e..4a255bff 100755
--- a/ao-bringup/turnon_chaoskey
+++ b/ao-bringup/turnon_chaoskey
@@ -7,8 +7,8 @@ else
     exit 1
 fi
 
-if [ -x /usr/bin/ao-usbload ]; then
-	USBLOAD=/usr/bin/ao-usbload
+if [ -x `which ao-usbload` ]; then
+	USBLOAD=`which ao-usbload`
 else
 	echo "Can't find ao-usbload!  Aborting."
 	exit 1
@@ -27,7 +27,7 @@ echo
 FLASH_FILE=~/altusmetrumllc/Binaries/loaders/chaoskey-v1.0-altos-flash-*.bin
 ALTOS_FILE=~/altusmetrumllc/Binaries/chaoskey-v1.0-*.elf
 
-$DFU_UTIL -a 0 -s 0x08000000:leave -D $FLASH_FILE || exit 1
+$DFU_UTIL -a 0 -s 0x08000000:leave -D $FLASH_FILE || true
 
 sleep 2
 
@@ -35,10 +35,6 @@ $USBLOAD --serial=1 $ALTOS_FILE || exit 1
 
 sleep 1
 
-serial=`dmesg | grep 'on chaoskey' | tail -1 | sed 's/.*chaoskey \([0-9a-f][0-9a-f]*\) on chaoskey.*/\1/'`
-
-echo 'Testing ChaosKey' $serial
-
-./test-chaoskey $serial
+./test-chaoskey
 
 exit $?