projects
/
fw
/
altos
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
altoslib: Create new abstraction underneath AltosState for recording values
[fw/altos]
/
ao-bringup
/
turnon_telemetrum
diff --git
a/ao-bringup/turnon_telemetrum
b/ao-bringup/turnon_telemetrum
index bcf6239fafa62f7baf65f9fe071efec676769466..d40be953c4cb012bfe30eec44cb4846ff6e7ee12 100755
(executable)
--- a/
ao-bringup/turnon_telemetrum
+++ b/
ao-bringup/turnon_telemetrum
@@
-1,17
+1,13
@@
#!/bin/sh
#!/bin/sh
-if [ -x ../ao-tools/ao-stmload/ao-stmload ]; then
- STMLOAD=../ao-tools/ao-stmload/ao-stmload
-elif [ -x /usr/bin/ao-stmload ]; then
- STMLOAD=/usr/bin/ao-stmload
+if [ -x /usr/bin/ao-flash-stm ]; then
+ FLASH_STM=/usr/bin/ao-flash-stm
else
else
- echo "Can't find ao-
stmload
! Aborting."
+ echo "Can't find ao-
flash-stm
! Aborting."
exit 1
fi
exit 1
fi
-if [ -x ../ao-tools/ao-usbload/ao-usbload ]; then
- USBLOAD=../ao-tools/ao-usbload/ao-usbload
-elif [ -x /usr/bin/ao-usbload ]; then
+if [ -x /usr/bin/ao-usbload ]; then
USBLOAD=/usr/bin/ao-usbload
else
echo "Can't find ao-usbload! Aborting."
USBLOAD=/usr/bin/ao-usbload
else
echo "Can't find ao-usbload! Aborting."
@@
-19,27
+15,42
@@
else
fi
VERSION=2.0
fi
VERSION=2.0
+PRODUCT=TeleMetrum
-echo "
TeleMetrum
v$VERSION Turn-On and Calibration Program"
+echo "
$PRODUCT
v$VERSION Turn-On and Calibration Program"
echo "Copyright 2014 by Bdale Garbee. Released under GPL v2"
echo
echo "Expectations:"
echo "Copyright 2014 by Bdale Garbee. Released under GPL v2"
echo
echo "Expectations:"
-echo "\t
TeleMetrum v$VERSIOn
powered from USB"
+echo "\t
$PRODUCT v$VERSION
powered from USB"
echo "\t\twith ST-Link-V2 cabled to debug header"
echo "\t\twith coax from UHF to frequency counter"
echo
echo "\t\twith ST-Link-V2 cabled to debug header"
echo "\t\twith coax from UHF to frequency counter"
echo
-echo -n "TeleMetrum-$VERSION serial number: "
-read SERIAL
+echo -n "$PRODUCT-$VERSION serial number: "
-echo $STMLOAD
+case $# in
+ 1)
+ SERIAL="$1"
+ echo "$PRODUCT-$VERSION serial number: $SERIAL"
+ ;;
+ 0)
+ echo -n "$PRODUCT-$VERSION serial number: "
+ read SERIAL
+ ;;
+ *)
+ echo "Usage: $0 <serial-number>" 1>&2
+ exit 1;
+ ;;
+esac
+
+echo $FLASH_STM
-$
STMLOAD --raw ../src/telemetrum-v$VERSION/flash-loader/
*.elf || exit 1
+$
FLASH_STM ~/altusmetrumllc/Binaries/loaders/telemetrum-v$VERSION-
*.elf || exit 1
sleep 2
sleep 2
-$USBLOAD --serial=$SERIAL
/usr/share/altos/telemetrum-v$VERSION*.ihx
|| exit 1
+$USBLOAD --serial=$SERIAL
~/altusmetrumllc/Binaries/telemetrum-v$VERSION-*.elf
|| exit 1
-sleep
2
+sleep
5
dev=`ao-list | awk '/TeleMetrum-v'"$VERSION"'/ { print $3; exit(0); }'`
dev=`ao-list | awk '/TeleMetrum-v'"$VERSION"'/ { print $3; exit(0); }'`
@@
-57,4
+68,14
@@
echo 'E 0' > $dev
SERIAL=$SERIAL ./cal-freq $dev
SERIAL=$SERIAL ./cal-freq $dev
-./cal-accel $dev
+failed=1
+while [ $failed = 1 ]; do
+ ../ao-tools/ao-cal-accel/ao-cal-accel $dev
+ failed=$?
+done
+
+echo 'E 1' > $dev
+
+./test-telemetrum
+
+exit $?