projects
/
fw
/
altos
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'master' of ssh://git.gag.com/scm/git/fw/altos
[fw/altos]
/
ao-bringup
/
turnon_easymini
diff --git
a/ao-bringup/turnon_easymini
b/ao-bringup/turnon_easymini
index 7db726654b4d339a6aecada867ea953e1f8454ac..2041a448f9d8acc303dbdbeb71cdf0dcf3ad3c06 100755
(executable)
--- a/
ao-bringup/turnon_easymini
+++ b/
ao-bringup/turnon_easymini
@@
-1,10
+1,12
@@
#!/bin/sh
#!/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
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
fi
if [ -x ../ao-tools/ao-usbload/ao-usbload ]; then
@@
-16,16
+18,17
@@
else
exit 1
fi
exit 1
fi
-VERSION=
2
.0
+VERSION=
1
.0
PRODUCT=EasyMini
BASE=`echo $PRODUCT | tr 'A-Z' 'a-z'`
echo $FILE
echo "$PRODUCT v$VERSION Turn-On and Calibration Program"
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
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
echo
case $# in
@@
-46,17
+49,17
@@
esac
#
# Use released versions of everything
#
#
# Use released versions of everything
#
-FLASH_FILE=~/altusmetrumllc/Binaries/loaders/easymini-v
2.0-altos-flash-*.bin
-ALTOS_FILE=~/altusmetrumllc/Binaries/easymini-v
2
.0-*.elf
+FLASH_FILE=~/altusmetrumllc/Binaries/loaders/easymini-v
1.0-altos-flash-*.elf
+ALTOS_FILE=~/altusmetrumllc/Binaries/easymini-v
1
.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=../src/$BASE-v$VERSION/flash-loader/$BASE-v$VERSION-altos-flash-*.elf
#ALTOS_FILE=../src/$BASE-v$VERSION/*.ihx
-echo $
DFU_UTIL -a 0 -s 0x08000000:leave -D
$FLASH_FILE
+echo $
FLASH_LPC
$FLASH_FILE
-$
DFU_UTIL -a 0 -s 0x08000000:leave -D
$FLASH_FILE || exit 1
+$
FLASH_LPC
$FLASH_FILE || exit 1
-sleep
2
+sleep
1
echo $USBLOAD $ALTOS_FILE
echo $USBLOAD $ALTOS_FILE
@@
-64,6
+67,6
@@
$USBLOAD --serial=$SERIAL $ALTOS_FILE || exit 1
sleep 1
sleep 1
-./test-easymini
+./test-easymini
-v1.0
exit $?
exit $?