From d999b56de8775cd5c2f98f913e555febd92357a9 Mon Sep 17 00:00:00 2001 From: Bdale Garbee Date: Tue, 1 Nov 2022 10:41:03 -0600 Subject: [PATCH] easymini v3.0 production scripts working --- ao-bringup/test-easymini-v3.0 | 62 ++++++++++++++++++++++++++++ ao-bringup/turnon_easymini | 13 +++--- ao-bringup/turnon_easymini_v1.0 | 72 +++++++++++++++++++++++++++++++++ 3 files changed, 139 insertions(+), 8 deletions(-) create mode 100755 ao-bringup/test-easymini-v3.0 create mode 100755 ao-bringup/turnon_easymini_v1.0 diff --git a/ao-bringup/test-easymini-v3.0 b/ao-bringup/test-easymini-v3.0 new file mode 100755 index 00000000..779a800c --- /dev/null +++ b/ao-bringup/test-easymini-v3.0 @@ -0,0 +1,62 @@ +#!/bin/bash + +VERSION=3.0 +PRODUCT=EasyMini +BASE=`echo $PRODUCT | tr 'A-Z' 'a-z'` + +echo "$PRODUCT-v$VERSION Test Program" +echo "Copyright 2022 by Bdale Garbee. Released under GPL v3" +echo +echo "Expectations:" +echo -e "\t$PRODUCT v$VERSION powered from USB" +echo + +found=0 +while [ $found -eq 0 ]; do + (ao-list; echo END END END END) | while read product serial dev; do + case "$product" in + "$PRODUCT-v$VERSION") + + found=1 + echo -e '\e[34m'Testing $product $serial $dev'\e[39m' + echo "" + + sleep 2 + + ./test-igniters-nowait "$dev" drogue main + echo "" + + echo "Testing baro sensor" + ../ao-tools/ao-test-baro/ao-test-baro --tty="$dev" + + if [ $? -ne 0 ]; then + echo -e '\e[31m'"$PRODUCT-$VERSION serial $serial failed"'\e[39m' + exit 1 + fi + 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 -e '\e[32m'"$PRODUCT-v$VERSION" serial "$serial" is ready to ship'\e[39m' + exit 0 + ;; + END) + exit 2 + ;; + esac + done + result=$? + if [ $result -ne 2 ]; then + exit $result + fi + sleep 0.25 +done diff --git a/ao-bringup/turnon_easymini b/ao-bringup/turnon_easymini index 2041a448..1960c4d6 100755 --- a/ao-bringup/turnon_easymini +++ b/ao-bringup/turnon_easymini @@ -18,13 +18,13 @@ else exit 1 fi -VERSION=1.0 +VERSION=3.0 PRODUCT=EasyMini BASE=`echo $PRODUCT | tr 'A-Z' 'a-z'` echo $FILE echo "$PRODUCT v$VERSION Turn-On and Calibration Program" -echo "Copyright 2010 by Bdale Garbee. Released under GPL v2" +echo "Copyright 2022 by Bdale Garbee. Released under GPL v3" echo echo "Expectations:" echo "\t$PRODUCT v$VERSION powered from USB" @@ -49,11 +49,8 @@ esac # # Use released versions of everything # -FLASH_FILE=~/altusmetrumllc/Binaries/loaders/easymini-v1.0-altos-flash-*.elf -ALTOS_FILE=~/altusmetrumllc/Binaries/easymini-v1.0-*.elf - -#FLASH_FILE=../src/$BASE-v$VERSION/flash-loader/$BASE-v$VERSION-altos-flash-*.elf -#ALTOS_FILE=../src/$BASE-v$VERSION/*.ihx +FLASH_FILE=~/altusmetrumllc/Binaries/loaders/easymini-v3.0-altos-flash-*.elf +ALTOS_FILE=~/altusmetrumllc/Binaries/easymini-v3.0-*.elf echo $FLASH_LPC $FLASH_FILE @@ -67,6 +64,6 @@ $USBLOAD --serial=$SERIAL $ALTOS_FILE || exit 1 sleep 1 -./test-easymini-v1.0 +./test-easymini-v3.0 exit $? diff --git a/ao-bringup/turnon_easymini_v1.0 b/ao-bringup/turnon_easymini_v1.0 new file mode 100755 index 00000000..2041a448 --- /dev/null +++ b/ao-bringup/turnon_easymini_v1.0 @@ -0,0 +1,72 @@ +#!/bin/sh + +if [ -x ../ao-tools/ao-flash/ao-flash-lpc ]; then + FLASH_LPC=../ao-tools/ao-flash/ao-flash-lpc +elif [ -x /usr/bin/ao-flash-lpc ]; then + FLASH_LPC=/usr/bin/ao-flash-lpc +else + echo "Can't find ao-flash-lpc! Aborting." + 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 + USBLOAD=/usr/bin/ao-usbload +else + echo "Can't find ao-usbload! Aborting." + exit 1 +fi + +VERSION=1.0 +PRODUCT=EasyMini +BASE=`echo $PRODUCT | tr 'A-Z' 'a-z'` +echo $FILE + +echo "$PRODUCT v$VERSION Turn-On and Calibration Program" +echo "Copyright 2010 by Bdale Garbee. Released under GPL v2" +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 + +# +# Use released versions of everything +# +FLASH_FILE=~/altusmetrumllc/Binaries/loaders/easymini-v1.0-altos-flash-*.elf +ALTOS_FILE=~/altusmetrumllc/Binaries/easymini-v1.0-*.elf + +#FLASH_FILE=../src/$BASE-v$VERSION/flash-loader/$BASE-v$VERSION-altos-flash-*.elf +#ALTOS_FILE=../src/$BASE-v$VERSION/*.ihx + +echo $FLASH_LPC $FLASH_FILE + +$FLASH_LPC $FLASH_FILE || exit 1 + +sleep 1 + +echo $USBLOAD $ALTOS_FILE + +$USBLOAD --serial=$SERIAL $ALTOS_FILE || exit 1 + +sleep 1 + +./test-easymini-v1.0 + +exit $? -- 2.30.2