From: Bdale Garbee <bdale@gag.com>
Date: Thu, 20 Feb 2014 20:23:52 +0000 (-0700)
Subject: Merge branch 'master' of ssh://git.gag.com/scm/git/fw/altos
X-Git-Tag: 1.3.2.2~175
X-Git-Url: https://git.gag.com/?p=fw%2Faltos;a=commitdiff_plain;h=104b8bfc9b37fda175f2cb2a1e33601fbf6f48f6;hp=1edf7ef8026ac4ab698a7f99671e9348d18ffd0a

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

diff --git a/ao-bringup/turnon_telebt b/ao-bringup/turnon_telebt
index ef20e915..c4902f31 100755
--- a/ao-bringup/turnon_telebt
+++ b/ao-bringup/turnon_telebt
@@ -45,7 +45,8 @@ read FREQ
 CAL_VALUE=`nickle -e "floor(434.55 / $FREQ * 1186611 + 0.5)"`
 
 echo "Programming flash with cal value " $CAL_VALUE
-$AOLOAD -D $DONGLE --cal $CAL_VALUE /usr/share/altos/stable/telebt-v1.0*.ihx $SERIAL
+$AOLOAD -D $DONGLE --cal $CAL_VALUE /usr/share/altos/telebt-v1.0*.ihx $SERIAL
 
 echo "Serial number "$SERIAL" programmed with RF cal value "$CAL_VALUE
+echo $SERIAL","$CAL_VALUE >> cal_values
 echo "Unplug debug cable, power cycle, cu to the board, confirm freq and record power"
diff --git a/ao-bringup/turnon_teledongle b/ao-bringup/turnon_teledongle
index a11683db..ddee5ee8 100755
--- a/ao-bringup/turnon_teledongle
+++ b/ao-bringup/turnon_teledongle
@@ -45,4 +45,5 @@ echo "Programming flash with cal value " $CAL_VALUE
 $AOLOAD -D 100 --cal $CAL_VALUE /usr/share/altos/teledongle-v0.2*.ihx $SERIAL
 
 echo "Serial number "$SERIAL" programmed with RF cal value "$CAL_VALUE
+echo $SERIAL","$CAL_VALUE >> cal_values
 echo "Unplug and replug USB, cu to the board, confirm freq and record power"
diff --git a/doc/altos.xsl b/doc/altos.xsl
index 5b9e12e8..6092dfcb 100644
--- a/doc/altos.xsl
+++ b/doc/altos.xsl
@@ -413,7 +413,7 @@
 	<title>__sfr, __sfr16, __sfr32, __sbit</title>
 	<para>
 	  Access to physical registers in the device use this mode
-	  which declares the variable name, it's type and the
+	  which declares the variable name, its type and the
 	  address it lives at. No memory is allocated for these
 	  variables.
 	</para>
@@ -809,7 +809,7 @@
 	  ao_dma_abort(uint8_t id)
 	</programlisting>
 	<para>
-	  Terminate any in-progress DMA transation, marking its
+	  Terminate any in-progress DMA transaction, marking its
 	  'done' variable with the AO_DMA_ABORTED bit.
 	</para>
       </section>
@@ -894,7 +894,7 @@
 	  ao_dma_abort(uint8_t id)
 	</programlisting>
 	<para>
-	  Terminate any in-progress DMA transation, marking its
+	  Terminate any in-progress DMA transaction, marking its
 	  'done' variable with the AO_DMA_ABORTED bit.
 	</para>
       </section>
@@ -904,7 +904,7 @@
     <title>Stdio interface</title>
     <para>
       AltOS offers a stdio interface over USB, serial and the RF
-      packet link. This provides for control of the device localy or
+      packet link. This provides for control of the device locally or
       remotely. This is hooked up to the stdio functions by providing
       the standard putchar/getchar/flush functions. These
       automatically multiplex the available communication channels;
@@ -944,7 +944,7 @@
       <para>
 	Flushes the current console device output buffer. Any
 	pending characters will be delivered to the target device.
-      xo	  </para>
+      </para>
     </section>
     <section>
       <title>ao_add_stdio</title>