ao-bringup: Use new ao-cal-freq program for cal-freq script

Remove shell script bits that were unreliable.

Signed-off-by: Keith Packard <keithp@keithp.com>

diff --git a/ao-bringup/cal-freq b/ao-bringup/cal-freq
index 5d876e21e9e2ead8179ff20d23a0d98a74ecacd1..d3d9dc956f859729289f0e48b93d75c91071f303 100755 (executable)
--- 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