Merge branch 'master' of ssh://git.gag.com/scm/git/fw/altos

Conflicts:
	ChangeLog

diff --combined ChangeLog
index 1b55a7f4139060eb2d9eb11d1f864fffaeb9c573,ea64f192da4256bb4bc732687102d925af033832..1c9e127a90d1db96e0506fd7a826c7da1a22d7ce
--- 1/ChangeLog
--- 2/ChangeLog
+++ b/ChangeLog
@@@ -1,15 -1,3 +1,18 @@@
++<<<<<<< HEAD
 +commit 20d4d410e0fc04fe192e309811eed6c0194fa5a8
 +Author: Bdale Garbee <bdale@gag.com>
 +Date:   Tue Mar 30 23:11:40 2010 -0600
 +
 +    initial harness for documentation
 +
 +commit 9801ff7de21027935f52ccabaa3ff157e22d21ce
 +Author: Bdale Garbee <bdale@gag.com>
 +Date:   Mon Mar 15 12:04:18 2010 -0600
 +
 +    move gbp.conf into debian/
 +
++=======
++>>>>>>> df7bda1f32b0049c3878c325ea0b55999f3980e3
  commit eda5e1166a97766aa22561beaa1086ba4e19ee16
  Author: Bdale Garbee <bdale@gag.com>
  Date:   Thu Mar 4 17:33:39 2010 -0700

diff --combined ao-bringup/turnon_teledongle
index ea7a7b2aec1cf937d0eef210dd23c1118e1850cf,97c1e419b981bc6086a16e5f734914321268b164..7dbb82b5bbd9335063529b3dd60e1714b57e232d
--- 1/ao-bringup/turnon_teledongle
--- 2/ao-bringup/turnon_teledongle
+++ b/ao-bringup/turnon_teledongle
@@@ -1,23 -1,5 +1,23 @@@
  #!/bin/sh
  
 +if [ -x ../ao-tools/ao-load/ao-load ]; then
 +      AOLOAD=../ao-tools/ao-load/ao-load
 +elif [ -x /usr/bin/ao-load ]; then
 +      AOLOAD=/usr/bin/ao-load
 +else
 +      echo "Can't find ao-load!  Aborting."
 +      exit 1
 +fi
 +
 +if [ -x ../ao-tools/ao-rawload/ao-rawload ]; then
 +      RAWLOAD=../ao-tools/ao-rawload/ao-rawload
 +elif [ -x /usr/bin/ao-rawload ]; then
 +      RAWLOAD=/usr/bin/ao-rawload
 +else
 +      echo "Can't find ao-rawload!  Aborting."
 +      exit 1
 +fi
 +
  echo "TeleDongle v0.2 Turn-On and Calibration Program"
  echo "Copyright 2010 by Bdale Garbee.  Released under GPL v2"
  echo
@@@ -29,20 -11,18 +29,20 @@@ ech
  echo -n "TeleDongle serial number: "
  read SERIAL
  
 -../ao-tools/ao-rawload/ao-rawload -r ao_led_blink.ihx
 +echo $RAWLOAD
 +
 +$RAWLOAD -r ao_led_blink.ihx
  echo "LEDs should be blinking"
  sleep 5
  
 -../ao-tools/ao-rawload/ao-rawload -r ao_radio_xmit.ihx
 +$RAWLOAD -r ao_radio_xmit.ihx
  echo -n "Generating RF carrier.  Please enter measured frequency: "
  read FREQ
  
- CAL_VALUE=`nickle -e "ceil(434.55 / $FREQ * 1186611)"`
+ CAL_VALUE=`nickle -e "floor(434.55 / $FREQ * 1186611 + 0.5)"`
  
  echo "Programming flash with cal value " $CAL_VALUE
 -ao-load --cal $CAL_VALUE /usr/share/altos/teledongle-v0.2.ihx $SERIAL
 +$AOLOAD --cal $CAL_VALUE /usr/share/altos/teledongle-v0.2.ihx $SERIAL
  
  echo "Serial number "$SERIAL" programmed with RF cal value "$CAL_VALUE
  echo "Unplug and replug USB, cu to the board, confirm freq and record power"