From db58d8c58fd6dcb4d153d85e3fd37d59956c84db Mon Sep 17 00:00:00 2001 From: Bdale Garbee Date: Mon, 29 Apr 2024 11:41:48 -0600 Subject: [PATCH] first cut at turnon scripts for EasyTimer v2 --- ao-bringup/cal-freq | 25 ------ .../{test-easytimer => test-easytimer-v1} | 0 ao-bringup/test-easytimer-v2 | 51 ++++++++++++ ao-bringup/turnon_easytimer | 21 ++--- ao-bringup/turnon_easytimer_v1 | 78 +++++++++++++++++++ 5 files changed, 134 insertions(+), 41 deletions(-) delete mode 100755 ao-bringup/cal-freq rename ao-bringup/{test-easytimer => test-easytimer-v1} (100%) create mode 100755 ao-bringup/test-easytimer-v2 create mode 100755 ao-bringup/turnon_easytimer_v1 diff --git a/ao-bringup/cal-freq b/ao-bringup/cal-freq deleted file mode 100755 index 40c25ce8..00000000 --- a/ao-bringup/cal-freq +++ /dev/null @@ -1,25 +0,0 @@ -#!/bin/sh - -case $# in -1) - dev="$1" - ;; -*) - echo "Usage: $0 " - exit 1; - ;; -esac - -../ao-tools/ao-cal-freq/ao-cal-freq --tty=$dev -case $? in - 0) - calline=`./get-radio-cal $dev` - CAL_VALUE=`echo $calline | awk '{print $2}'` - CURRENT_FREQ=`echo $calline | awk '{print $4}'` - echo $SERIAL","$CAL_VALUE >> cal_values - exit 0 - ;; - *) - exit 1 - ;; -esac diff --git a/ao-bringup/test-easytimer b/ao-bringup/test-easytimer-v1 similarity index 100% rename from ao-bringup/test-easytimer rename to ao-bringup/test-easytimer-v1 diff --git a/ao-bringup/test-easytimer-v2 b/ao-bringup/test-easytimer-v2 new file mode 100755 index 00000000..023f27bc --- /dev/null +++ b/ao-bringup/test-easytimer-v2 @@ -0,0 +1,51 @@ +#!/bin/sh + +VERSION=2 +PRODUCT=EasyTimer +BASE=`echo $PRODUCT | tr 'A-Z' 'a-z'` + +echo "$PRODUCT-v$VERSION Test Program" +echo "Copyright 2024 by Bdale Garbee. Released under GPL v3" +echo +echo "Expectations:" +echo "\t$PRODUCT v$VERSION powered from USB" +echo + +ret=1 +ao-list | while read product serial dev; do + case "$product" in + "$PRODUCT-v$VERSION") + + echo "Testing $product $serial $dev" + + ./test-igniters $dev 0 1 + echo"" + + case $? in + 0) + ;; + *) + echo "failed" + exit 1 + esac + echo"" + + + FLASHSIZE=1048576 + + echo "Testing flash" + ../ao-tools/ao-test-flash/ao-test-flash --tty="$dev" "$FLASHSIZE" + + if [ $? -ne 0 ]; then + echo -e '\e[31m'"$PRODUCT-$VERSION serial $serial failed"'\e[39m' + exit 1 + fi + echo "" + + + echo "$PRODUCT-v$VERSION" serial "$serial" is ready to ship + echo "\007" + ret=0 + ;; + esac +done diff --git a/ao-bringup/turnon_easytimer b/ao-bringup/turnon_easytimer index 8953f900..da78cbb6 100755 --- a/ao-bringup/turnon_easytimer +++ b/ao-bringup/turnon_easytimer @@ -1,11 +1,7 @@ #!/bin/sh -if [ -x /usr/bin/ao-flash-stm ]; then - FLASH_STM=/usr/bin/ao-flash-stm -else - echo "Can't find ao-flash-stm! Aborting." - exit 1 -fi +# EasyTimer v2 all arrive from the assembler with +# the bootloader already flashed. if [ -x /usr/bin/ao-usbload ]; then USBLOAD=/usr/bin/ao-usbload @@ -14,16 +10,15 @@ else exit 1 fi -VERSION=1 +VERSION=2 REPO=~/altusmetrumllc/Binaries PRODUCT=EasyTimer echo "$PRODUCT v$VERSION Turn-On and Calibration Program" -echo "Copyright 2020 by Bdale Garbee. Released under GPL v3" +echo "Copyright 2024 by Bdale Garbee. Released under GPL v3" echo echo "Expectations:" echo "\t$PRODUCT v$VERSION powered from USB" -echo "\t\twith ST-Link-V2 cabled to debug header" echo case $# in @@ -41,12 +36,6 @@ case $# in ;; esac -echo $FLASH_STM - -$FLASH_STM $REPO/loaders/easytimer-v$VERSION*.elf - -sleep 3 - $USBLOAD --serial=$SERIAL --force $REPO/easytimer-v$VERSION*.elf || exit 1 sleep 5 @@ -73,6 +62,6 @@ done echo 'E 1' > $dev -./test-easytimer +./test-easytimer-v2 exit $? diff --git a/ao-bringup/turnon_easytimer_v1 b/ao-bringup/turnon_easytimer_v1 new file mode 100755 index 00000000..8953f900 --- /dev/null +++ b/ao-bringup/turnon_easytimer_v1 @@ -0,0 +1,78 @@ +#!/bin/sh + +if [ -x /usr/bin/ao-flash-stm ]; then + FLASH_STM=/usr/bin/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 +else + echo "Can't find ao-usbload! Aborting." + exit 1 +fi + +VERSION=1 +REPO=~/altusmetrumllc/Binaries +PRODUCT=EasyTimer + +echo "$PRODUCT v$VERSION Turn-On and Calibration Program" +echo "Copyright 2020 by Bdale Garbee. Released under GPL v3" +echo +echo "Expectations:" +echo "\t$PRODUCT v$VERSION powered from USB" +echo "\t\twith ST-Link-V2 cabled to debug header" +echo + +case $# in + 1) + SERIAL="$1" + echo "$PRODUCT-$VERSION serial number: $SERIAL" + ;; + 0) + echo -n "$PRODUCT-$VERSION serial number: " + read SERIAL + ;; + *) + echo "Usage: $0 " 1>&2 + exit 1; + ;; +esac + +echo $FLASH_STM + +$FLASH_STM $REPO/loaders/easytimer-v$VERSION*.elf + +sleep 3 + +$USBLOAD --serial=$SERIAL --force $REPO/easytimer-v$VERSION*.elf || exit 1 + +sleep 5 + +dev=`ao-list | awk '/EasyTimer-v'"$VERSION"'/ { print $3; exit(0); }'` + +case "$dev" in +/dev/tty*) + echo "EasyTimer found on $dev" + ;; +*) + echo 'No EasyTimer-v'"$VERSION"' found' + exit 1 + ;; +esac + +echo 'E 0' > $dev + +failed=1 +while [ $failed = 1 ]; do + ../ao-tools/ao-cal-accel/ao-cal-accel $dev + failed=$? +done + +echo 'E 1' > $dev + +./test-easytimer + +exit $? -- 2.30.2