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

[fw/altos] / doc / system-operation.inc

diff --git a/doc/system-operation.inc b/doc/system-operation.inc
index 67b7e6933ec5f64f1b4eed36c7cd701c79b407f5..656ed8e42a756a1bbfab56699a8e026821fe765e 100644 (file)
--- a/doc/system-operation.inc
+++ b/doc/system-operation.inc
@@ -7,9 +7,9 @@
                fundamental modes, “idle” and “flight”.  Which of these modes
                the firmware operates in is determined at start up
                time.
-               ifdef::telemetrum,telemega,easymega[]
+               ifdef::telemetrum,telemega,easymega,easytimer[]
                For
-               TeleMetrum, TeleMega and EasyMega, which have accelerometers, the mode is
+               TeleMetrum, TeleMega, EasyMega and EasyTimer, which have accelerometers, the mode is
                controlled by the orientation of the
                rocket (well, actually the board, of course...) at the time
                power is switched on.  If the rocket is “nose up”, then
@@ -17,17 +17,20 @@
                launch, so the firmware chooses flight mode.  However, if the
                rocket is more or less horizontal, the firmware instead enters
                idle mode.
-               endif::telemetrum,telemega,easymega[]
+               endif::telemetrum,telemega,easymega,easytimer[]
                Since
                EasyMini doesn't
                have an
                accelerometer we can use to determine orientation, “idle” mode
                is selected if the board is connected via USB to a computer,
-               otherwise the board enters “flight” mode.
+               otherwise the board enters “flight” mode.  This is also how
+               EasyMotor works, since even though it has an accelerometer,
+               it detects the motor burn it is meant to record by detecting\ e\ 1          a rise in chamber pressure, and board orientation doesn't 
+               matter.
                ifdef::telemini[]
                TeleMini
-               selects “idle” mode if receives a command packet is
-               received within the
+               selects “idle” mode if it receives a command packet
+               within the
                first five seconds of operation.
                endif::telemini[]
 
@@ -61,7 +64,7 @@
                mode for requests sent via TeleDongle.  Commands can be issued
                in idle mode over either USB or the radio link
                equivalently.
-               ifdef::telemini[TeleMini only have the radio link.]
+               ifdef::telemini[TeleMini only has the radio link.]
                endif::radio[]
                Idle mode is useful for configuring the altimeter, for
                extracting data from the on-board storage chip after
@@ -98,7 +101,7 @@
                endif::telemetrum,telemega,easymega[]
 
                ifdef::telemini[]
-               TeleMini are configured solely via the radio link. Of course, that
+               TeleMini is configured solely via the radio link. Of course, that
                means you need to know the TeleMini radio configuration values
                or you won't be able to communicate with it. For situations
                when you don't have the radio configuration values,
@@ -157,7 +160,7 @@
                Any operation which can be performed with a flight computer can
                either be done with the device directly connected to the
                computer via the USB cable, or through the radio
-               link. TeleMini don't provide a USB connector and so it is
+               link. TeleMini doesn't provide a USB connector and so it is
                always communicated with over radio.  Select the appropriate
                TeleDongle device when the list of devices is presented and
                AltosUI will interact with an altimeter over the radio link.
@@ -295,9 +298,9 @@
        endif::radio[]
 
        ifdef::gps+radio[]
-       :aprsdevices: TeleMetrum v2.0 and TeleMega
+       :aprsdevices: TeleMetrum v2 and newer and TeleMega
        :configure_section: _configure_altimeter
-       include::aprs-operation.raw[]
+       include::aprs-operation.adoc[]
        endif::gps+radio[]
 
        === Configurable Parameters