X-Git-Url: https://git.gag.com/?a=blobdiff_plain;f=ao-bringup%2Fturnon_easymini;h=9b66dc5ec25e5c333a3d40765af652900d10d443;hb=master;hp=3bef31450ae27c28dc9c12aff323751a746db11f;hpb=788d02a3caf0f14f3c84ff6ae7e2a2fff302e91b;p=fw%2Faltos

diff --git a/ao-bringup/turnon_easymini b/ao-bringup/turnon_easymini
index 3bef3145..1960c4d6 100755
--- a/ao-bringup/turnon_easymini
+++ b/ao-bringup/turnon_easymini
@@ -1,10 +1,12 @@
 #!/bin/sh
 
-if [ -x /usr/bin/dfu-util ]; then
-    DFU_UTIL=/usr/bin/dfu-util
+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
 else
-    echo "Can't find dfu-util! Aborting."
-    exit 1
+	echo "Can't find ao-flash-lpc!  Aborting."
+	exit 1
 fi
 
 if [ -x ../ao-tools/ao-usbload/ao-usbload ]; then
@@ -16,16 +18,17 @@ else
 	exit 1
 fi
 
-VERSION=2.0
+VERSION=3.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 2022 by Bdale Garbee.  Released under GPL v3"
 echo
 echo "Expectations:"
-echo "\t$PRODUCT v$VERSION powered and connected to USB"
+echo "\t$PRODUCT v$VERSION powered from USB"
+echo "\t\twith ST-Link-V2 cabled to debug header"
 echo
 
 case $# in
@@ -46,19 +49,14 @@ esac
 #
 # Use released versions of everything
 #
-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
+FLASH_FILE=~/altusmetrumllc/Binaries/loaders/easymini-v3.0-altos-flash-*.elf
+ALTOS_FILE=~/altusmetrumllc/Binaries/easymini-v3.0-*.elf
 
-if lsusb -d 0483:df11 | grep -q STM; then
-    echo $DFU_UTIL -v -v -R -a 0 -s 0x08000000:leave -D $FLASH_FILE
+echo $FLASH_LPC $FLASH_FILE
 
-    $DFU_UTIL -a 0 -s 0x08000000:leave -D $FLASH_FILE
+$FLASH_LPC $FLASH_FILE || exit 1
 
-    sleep 2
-fi
+sleep 1
 
 echo $USBLOAD $ALTOS_FILE
 
@@ -66,6 +64,6 @@ $USBLOAD --serial=$SERIAL $ALTOS_FILE || exit 1
 
 sleep 1
 
-./test-easymini
+./test-easymini-v3.0
 
 exit $?