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 ef20e915f863ec1494bf624595b3e3b3bd898263..c4902f31ff68e5f938148cc9db6bddaf364f2bb9 100755 (executable)
--- 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 a11683dbb5eada2d6f294468a09172cb44c8c699..ddee5ee81e6fc89091c838554c6b6b5371b421b6 100755 (executable)
--- 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 5b9e12e8fa4b84d63f24558d9f54d9113e6e98b8..6092dfcb9f0155cef0a4436f08df0d896125cad4 100644 (file)
--- 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>