From 08923aa0cf31ae7bd73b66b4d1cd81fae4241ff0 Mon Sep 17 00:00:00 2001
From: Keith Packard <keithp@keithp.com>
Date: Wed, 31 Aug 2016 21:25:59 -0600
Subject: [PATCH] ao-bringup: telemega allow serial on command line, loop on
 accel fail

Allow the serial number on the turnon_telemega command line, instead
of reading it.

When accel cal fails, loop waiting for it to succeed instead of
continuing blindly.

Signed-off-by: Keith Packard <keithp@keithp.com>
---
 ao-bringup/turnon_telemega | 28 +++++++++++++++++++++++-----
 1 file changed, 23 insertions(+), 5 deletions(-)

diff --git a/ao-bringup/turnon_telemega b/ao-bringup/turnon_telemega
index 62f51fba..e2b539e1 100755
--- a/ao-bringup/turnon_telemega
+++ b/ao-bringup/turnon_telemega
@@ -16,17 +16,31 @@ fi
 
 VERSION=2.0
 REPO=~/altusmetrumllc/Binaries
+PRODUCT=TeleMega
 
-echo "TeleMega 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 "\tTeleMega 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 -n "TeleMega-$VERSION serial number: "
-read SERIAL
+
+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
 
@@ -54,7 +68,11 @@ echo 'E 0' > $dev
 
 SERIAL=$SERIAL ./cal-freq $dev
 
-../ao-tools/ao-cal-accel/ao-cal-accel $dev
+failed=1
+while [ $failed = 1 ]; do
+    ../ao-tools/ao-cal-accel/ao-cal-accel $dev
+    failed=$?
+done
 
 echo 'E 1' > $dev
 
-- 
2.30.2