projects
/
fw
/
altos
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
altoslib: Fix 8 to 12 bit conversion for Mega pyro voltage data
[fw/altos]
/
ao-bringup
/
turnon_chaoskey
diff --git
a/ao-bringup/turnon_chaoskey
b/ao-bringup/turnon_chaoskey
index 50460008f2479717c2d226a341f3858e7bc4bb45..4a255bff3d27581e1070641c5cf1f59d79ab7243 100755
(executable)
--- a/
ao-bringup/turnon_chaoskey
+++ b/
ao-bringup/turnon_chaoskey
@@
-7,8
+7,8
@@
else
exit 1
fi
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
else
echo "Can't find ao-usbload! Aborting."
exit 1
@@
-24,18
+24,17
@@
echo "Expectations:"
echo "\tChaosKey v$VERSION powered from USB"
echo
echo "\tChaosKey v$VERSION powered from USB"
echo
-$DFU_UTIL -a 0 -s 0x08000000:leave -D ../src/chaoskey-v$VERSION/flash-loader/chaoskey-v$VERSION*.bin || 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 || true
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
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 $?
exit $?