X-Git-Url: https://git.gag.com/?a=blobdiff_plain;f=ao-bringup%2Fturnon_easymini;h=3bef31450ae27c28dc9c12aff323751a746db11f;hb=863a9d523b26a8a5f8fbd5b516bd7dd914ee079e;hp=0b915c5ee46152a5e5653c3fde19b121bbe9da8a;hpb=47750e236c45ab03f28fc3393996edb2bd4312e3;p=fw%2Faltos

diff --git a/ao-bringup/turnon_easymini b/ao-bringup/turnon_easymini
index 0b915c5e..3bef3145 100755
--- a/ao-bringup/turnon_easymini
+++ b/ao-bringup/turnon_easymini
@@ -1,12 +1,10 @@
 #!/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
+if [ -x /usr/bin/dfu-util ]; then
+    DFU_UTIL=/usr/bin/dfu-util
 else
-	echo "Can't find ao-flash-lpc!  Aborting."
-	exit 1
+    echo "Can't find dfu-util! Aborting."
+    exit 1
 fi
 
 if [ -x ../ao-tools/ao-usbload/ao-usbload ]; then
@@ -18,17 +16,16 @@ else
 	exit 1
 fi
 
-VERSION=1.0
+VERSION=2.0
 PRODUCT=EasyMini
 BASE=`echo $PRODUCT | tr 'A-Z' 'a-z'`
 echo $FILE
 
 echo "$PRODUCT v$VERSION Turn-On and Calibration Program"
-echo "Copyright 2010 by Bdale Garbee.  Released under GPL v2"
+echo "Copyright 2010 by Bdale Garbee.  Released under GPL v2+"
 echo
 echo "Expectations:"
-echo "\t$PRODUCT v$VERSION powered from USB"
-echo "\t\twith ST-Link-V2 cabled to debug header"
+echo "\t$PRODUCT v$VERSION powered and connected to USB"
 echo
 
 case $# in
@@ -49,23 +46,25 @@ esac
 #
 # Use released versions of everything
 #
-FLASH_FILE=~/altusmetrumllc/Binaries/loaders/easymini-v1.0-altos-flash-*.elf
-ALTOS_FILE=~/altusmetrumllc/Binaries/easymini-v1.0-*.elf
+FLASH_FILE=~/altusmetrumllc/Binaries/loaders/easymini-v2.0-altos-flash-*.bin
+ALTOS_FILE=~/altusmetrumllc/Binaries/easymini-v2.0-*.elf
 
 #FLASH_FILE=../src/$BASE-v$VERSION/flash-loader/$BASE-v$VERSION-altos-flash-*.elf
 #ALTOS_FILE=../src/$BASE-v$VERSION/*.ihx
 
-echo $FLASH_LPC $FLASH_FILE
+if lsusb -d 0483:df11 | grep -q STM; then
+    echo $DFU_UTIL -v -v -R -a 0 -s 0x08000000:leave -D $FLASH_FILE
 
-$FLASH_LPC $FLASH_FILE || exit 1
+    $DFU_UTIL -a 0 -s 0x08000000:leave -D $FLASH_FILE
 
-sleep 1
+    sleep 2
+fi
 
 echo $USBLOAD $ALTOS_FILE
 
 $USBLOAD --serial=$SERIAL $ALTOS_FILE || exit 1
 
-sleep 2
+sleep 1
 
 ./test-easymini