projects
/
fw
/
altos
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
ao-bringup: Use released files for chaoskey turnon
[fw/altos]
/
ao-bringup
/
turnon_chaoskey
diff --git
a/ao-bringup/turnon_chaoskey
b/ao-bringup/turnon_chaoskey
index 3617e777d1f5de8076898b162d6d5999cd9a7a14..8ac8479e337a7e0a537972b6bafc85772334c47f 100755
(executable)
--- a/
ao-bringup/turnon_chaoskey
+++ b/
ao-bringup/turnon_chaoskey
@@
-1,10
+1,10
@@
#!/bin/sh
#!/bin/sh
-if [ -x /usr/bin/
ao-flash-stm32f0x
]; then
- FLASH_STM=/usr/bin/ao-flash-stm32f0x
+if [ -x /usr/bin/
dfu-util
]; then
+ DFU_UTIL=/usr/bin/dfu-util
else
else
-
echo "Can't find ao-flash-stm32f0x!
Aborting."
-
exit 1
+
echo "Can't find dfu-util!
Aborting."
+ exit 1
fi
if [ -x /usr/bin/ao-usbload ]; then
fi
if [ -x /usr/bin/ao-usbload ]; then
@@
-22,13
+22,23
@@
echo "Copyright 2015 by Keith Packard. Released under GPL v2"
echo
echo "Expectations:"
echo "\tChaosKey v$VERSION powered from USB"
echo
echo "Expectations:"
echo "\tChaosKey v$VERSION powered from USB"
-echo "\t\twith ST-Link-V2 cabled to debug header"
echo
echo
-$FLASH_STM ../src/chaoskey-v$VERSION/flash-loader/chaoskey-v$VERSION-*.elf || exit 1
+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
sleep 2
sleep 2
-$USBLOAD --serial=1 ../src/chaoskey-v$VERSION/chaoskey-v$VERSION*.ihx || exit 1
+$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
exit $?
exit $?