From 527700623cc369cc58e15c29dc1ee374fa4efeb7 Mon Sep 17 00:00:00 2001 From: Keith Packard Date: Fri, 5 Jun 2015 22:52:21 -0700 Subject: ao-bringup: Use new ao-cal-freq program for cal-freq script Remove shell script bits that were unreliable. Signed-off-by: Keith Packard --- ao-bringup/cal-freq | 48 +++++++++++------------------------------------- 1 file changed, 11 insertions(+), 37 deletions(-) (limited to 'ao-bringup') diff --git a/ao-bringup/cal-freq b/ao-bringup/cal-freq index 5d876e21..d3d9dc95 100755 --- a/ao-bringup/cal-freq +++ b/ao-bringup/cal-freq @@ -10,42 +10,16 @@ case $# in ;; esac -while true; do - echo 'C 1' > $dev - - echo -n "Generating RF carrier. Please enter measured frequency [enter for done]: " - - read FREQ - - echo 'C 0' > $dev - +../ao-tools/ao-cal-freq/ao-cal-freq --dev=$dev +case $? in + 0) calline=`./get-radio-cal $dev` - CURRENT_CAL=`echo $calline | awk '{print $2}'` + CAL_VALUE=`echo $calline | awk '{print $2}'` CURRENT_FREQ=`echo $calline | awk '{print $4}'` - CAL_VALUE=$CURRENT_CAL - - case "$FREQ" in - "") - echo $SERIAL","$CAL_VALUE >> cal_values - exit 0 - ;; - *) - echo "Current radio calibration "$CURRENT_CAL - echo "Current radio frequency "$CURRENT_FREQ - - CAL_VALUE=`nickle -e "floor($CURRENT_FREQ / $FREQ * $CURRENT_CAL + 0.5)"` - - echo "Programming flash with cal value " $CAL_VALUE - - dd if=$dev iflag=nonblock - - cat << EOF > $dev -c f $CAL_VALUE -c w -EOF - - echo "Serial number "$SERIAL" programmed with RF cal value "$CAL_VALUE - ;; - esac -done - + echo $SERIAL","$CAL_VALUE >> cal_values + exit 0 + ;; + *) + exit 1 + ;; +esac -- cgit v1.2.3 From 55753ac8b4b73ec58cb6ef874acc8d606193c5e7 Mon Sep 17 00:00:00 2001 From: Keith Packard Date: Fri, 5 Jun 2015 22:52:51 -0700 Subject: ao-bringup: Do telegps freq cal before testing GPS This lets the GPS get some time to see sats while we're messing with the radio frequency calibration. Signed-off-by: Keith Packard --- ao-bringup/turnon_telegps | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) (limited to 'ao-bringup') diff --git a/ao-bringup/turnon_telegps b/ao-bringup/turnon_telegps index 123f0b54..ba97d503 100755 --- a/ao-bringup/turnon_telegps +++ b/ao-bringup/turnon_telegps @@ -72,10 +72,8 @@ case "$dev" in ;; esac -echo 'E 0' > $dev +SERIAL=$SERIAL ./cal-freq $dev ./test-telegps -SERIAL=$SERIAL ./cal-freq $dev - exit $? -- cgit v1.2.3 From 39f4361675aa13899864f427a33d4aa48be56cd2 Mon Sep 17 00:00:00 2001 From: Robert Garbee Date: Sat, 13 Jun 2015 17:40:16 -0600 Subject: add beep when test completes --- ao-bringup/test-telemetrum | 1 + 1 file changed, 1 insertion(+) (limited to 'ao-bringup') diff --git a/ao-bringup/test-telemetrum b/ao-bringup/test-telemetrum index 57a4d90d..13407e86 100755 --- a/ao-bringup/test-telemetrum +++ b/ao-bringup/test-telemetrum @@ -61,6 +61,7 @@ ao-list | while read product serial dev; do echo"" echo "$PRODUCT-v$VERSION" serial "$serial" is ready to ship + echo "\007" ret=0 ;; esac -- cgit v1.2.3 From 3e5521070564e9a184f3b781dad9d39cdd963510 Mon Sep 17 00:00:00 2001 From: Keith Packard Date: Thu, 18 Jun 2015 16:56:19 -0700 Subject: ao-bringup: Fail turnon_easymega if accel cal fails This prevents a failing board from being reported as good Signed-off-by: Keith Packard --- ao-bringup/turnon_easymega | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'ao-bringup') diff --git a/ao-bringup/turnon_easymega b/ao-bringup/turnon_easymega index b313e162..632b71e2 100755 --- a/ao-bringup/turnon_easymega +++ b/ao-bringup/turnon_easymega @@ -52,7 +52,7 @@ esac echo 'E 0' > $dev -../ao-tools/ao-cal-accel/ao-cal-accel $dev +../ao-tools/ao-cal-accel/ao-cal-accel $dev || exit 1 echo 'E 1' > $dev -- cgit v1.2.3 From 6cf27ddd5e84824610d6a0bcbb81ba4626b71409 Mon Sep 17 00:00:00 2001 From: Keith Packard Date: Thu, 18 Jun 2015 17:12:41 -0700 Subject: ao-bringup: Use local versions of tools instead of /usr/bin for turnon_easymega Signed-off-by: Keith Packard --- ao-bringup/turnon_easymega | 8 ++++---- ao-tools/ao-flash/ao-flash-stm | 0 2 files changed, 4 insertions(+), 4 deletions(-) mode change 100644 => 100755 ao-tools/ao-flash/ao-flash-stm (limited to 'ao-bringup') diff --git a/ao-bringup/turnon_easymega b/ao-bringup/turnon_easymega index 632b71e2..01546537 100755 --- a/ao-bringup/turnon_easymega +++ b/ao-bringup/turnon_easymega @@ -1,14 +1,14 @@ #!/bin/sh -if [ -x /usr/bin/ao-flash-stm ]; then - STMLOAD=/usr/bin/ao-flash-stm +if [ -x ../ao-tools/ao-flash/ao-flash-stm ]; then + STMLOAD=../ao-tools/ao-flash/ao-flash-stm else echo "Can't find ao-flash-stm! Aborting." exit 1 fi -if [ -x /usr/bin/ao-usbload ]; then - USBLOAD=/usr/bin/ao-usbload +if [ -x ../ao-tools/ao-usbload/ao-usbload ]; then + USBLOAD=../ao-tools/ao-usbload/ao-usbload else echo "Can't find ao-usbload! Aborting." exit 1 diff --git a/ao-tools/ao-flash/ao-flash-stm b/ao-tools/ao-flash/ao-flash-stm old mode 100644 new mode 100755 -- cgit v1.2.3 From 5568c30f0a4fe346b8ed58934c23653064427d65 Mon Sep 17 00:00:00 2001 From: Keith Packard Date: Thu, 18 Jun 2015 17:37:35 -0700 Subject: ao-bringup: Make turnon_easymega run without 'make install' Use relative paths for all altos tools Signed-off-by: Keith Packard --- ao-bringup/test-easymega | 2 +- ao-bringup/turnon_easymega | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) (limited to 'ao-bringup') diff --git a/ao-bringup/test-easymega b/ao-bringup/test-easymega index 76f3effb..2f0a7822 100755 --- a/ao-bringup/test-easymega +++ b/ao-bringup/test-easymega @@ -12,7 +12,7 @@ echo "\t$PRODUCT v$VERSION powered from USB" echo ret=1 -ao-list | while read product serial dev; do +../ao-tools/ao-list/ao-list | while read product serial dev; do case "$product" in "$PRODUCT-v$VERSION") diff --git a/ao-bringup/turnon_easymega b/ao-bringup/turnon_easymega index 01546537..1e75e72f 100755 --- a/ao-bringup/turnon_easymega +++ b/ao-bringup/turnon_easymega @@ -38,7 +38,7 @@ $USBLOAD --serial=$SERIAL $REPO/easymega-v$VERSION*.elf || exit 1 sleep 2 -dev=`ao-list | awk '/EasyMega-v'"$VERSION"'/ { print $3; exit(0); }'` +dev=`../ao-tools/ao-list/ao-list | awk '/EasyMega-v'"$VERSION"'/ { print $3; exit(0); }'` case "$dev" in /dev/tty*) -- cgit v1.2.3