doc: Remove telemini v2.0. Add telemega v2.0

Reflect hardware we've actually shipped.

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

diff --git a/doc/Makefile b/doc/Makefile
index 08835ad3a3d97e7327a80639915361c5f574d48e..6a04a591dd57e458d2e62a7e6838df52b13c26ac 100644 (file)
--- a/doc/Makefile
+++ b/doc/Makefile
@@ -84,7 +84,6 @@ IMAGES=\
        telemetrum-v2.0-th.jpg \
        telemini.svg \
        telemini-v1-top.jpg \
        telemetrum-v2.0-th.jpg \
        telemini.svg \
        telemini-v1-top.jpg \

-       telemini-v2-top.jpg \

        altusmetrum-oneline.svg \
        telegps-oneline.svg \
        micropeak-oneline.svg
        altusmetrum-oneline.svg \
        telegps-oneline.svg \
        micropeak-oneline.svg


@@ -105,7 +104,6 @@ INC_FILES=\
        usage.inc \
        telemetrum.inc \
        telemini-v1.0.inc \
        usage.inc \
        telemetrum.inc \
        telemini-v1.0.inc \

-       telemini-v2.0.inc \

        easymini-device.inc \
        telemega.inc \
        easymega.inc \
        easymini-device.inc \
        telemega.inc \
        easymega.inc \

diff --git a/doc/altusmetrum-docinfo.xml b/doc/altusmetrum-docinfo.xml
index 8644584f54f82dba68bfb6b3335859ddcac9453f..63c1e0355d0c0d3483946518f5650f343114d53c 100644 (file)
--- a/doc/altusmetrum-docinfo.xml
+++ b/doc/altusmetrum-docinfo.xml
@@ -115,7 +115,7 @@
     <date>12 November 2013</date>
     <revremark>
       Updated for software version 1.3. Version 1.3 adds support
     <date>12 November 2013</date>
     <revremark>
       Updated for software version 1.3. Version 1.3 adds support

-      for TeleMega, TeleMetrum v2.0, TeleMini v2.0 and EasyMini
+      for TeleMega, TeleMetrum v2.0 and EasyMini

       and fixes bugs in AltosUI and the AltOS firmware.
     </revremark>
   </revision>
       and fixes bugs in AltosUI and the AltOS firmware.
     </revremark>
   </revision>

diff --git a/doc/altusmetrum.txt b/doc/altusmetrum.txt
index 598de8e6d55f6156cb18232ea7db585abadd83a5..15fc28fc6bba760f54d1beb46f4200322cd7c5a9 100644 (file)
--- a/doc/altusmetrum.txt
+++ b/doc/altusmetrum.txt
@@ -24,8 +24,6 @@
 
        include::telemini-v1.0.raw[]
 
 
        include::telemini-v1.0.raw[]
 

-       include::telemini-v2.0.raw[]
-

        include::easymini-device.raw[]
 
        include::telemega.raw[]
        include::easymini-device.raw[]
 
        include::telemega.raw[]

diff --git a/doc/flight-data-recording.inc b/doc/flight-data-recording.inc
index d0ffa7f1e3d3cf965bf9e42f995c8aa6dc6fcc54..32e44840fc86bbd9a7ad2e3292e6670c794f0910 100644 (file)
--- a/doc/flight-data-recording.inc
+++ b/doc/flight-data-recording.inc
@@ -25,7 +25,6 @@
        endif::telemetrum[]
        ifdef::telemini[]
        |TeleMini v1.0          |2      |5kB    |4
        endif::telemetrum[]
        ifdef::telemini[]
        |TeleMini v1.0          |2      |5kB    |4

-       |TeleMini v2.0          |16     |1MB    |10

        endif::telemini[]
        ifdef::easymini[]
        |EasyMini               |16     |1MB    |10
        endif::telemini[]
        ifdef::easymini[]
        |EasyMini               |16     |1MB    |10

diff --git a/doc/getting-started.inc b/doc/getting-started.inc
index 9c0df26d2f1890b376226c74259eb38688988721..decaf4d43203fe0600c48a49e4b0707d4890a7b1 100644 (file)
--- a/doc/getting-started.inc
+++ b/doc/getting-started.inc
@@ -22,7 +22,6 @@
                USB power source.
 
                You can also choose to use another battery with
                USB power source.
 
                You can also choose to use another battery with

-               ifdef::telemini[TeleMini v2.0 and]

                EasyMini, anything supplying between 4 and 12 volts should
                work fine (like a standard 9V battery), but if you are planning
                to fire pyro charges, ground testing is required to verify that
                EasyMini, anything supplying between 4 and 12 volts should
                work fine (like a standard 9V battery), but if you are planning
                to fire pyro charges, ground testing is required to verify that

diff --git a/doc/specs.inc b/doc/specs.inc
index 7266462515ae2d0ec78d561e724ea7d6b08f2d50..a6c7b69a6f55058dbe4831c502991ee087322707 100644 (file)
--- a/doc/specs.inc
+++ b/doc/specs.inc
@@ -57,14 +57,6 @@
        |10mW
        |3.7V
 
        |10mW
        |3.7V
 

-       |TeleMini v2.0
-       |MS5607 30km (100k')
-       |-
-       |-
-       |-
-       |1MB
-       |10mW
-       |3.7-12V

        endif::telemini[]
 
        ifdef::easymini[]
        endif::telemini[]
 
        ifdef::easymini[]

diff --git a/doc/system-operation.inc b/doc/system-operation.inc
index 313415ca4a46a8de50490a5995e7eb03b385f8bb..e68b2acbc5dca491c7c2bd3858a5334402149628 100644 (file)
--- a/doc/system-operation.inc
+++ b/doc/system-operation.inc
@@ -19,8 +19,7 @@
                idle mode.
                endif::telemetrum,telemega,easymega[]
                Since
                idle mode.
                endif::telemetrum,telemega,easymega[]
                Since

-               ifdef::telemini[TeleMini v2.0 and EasyMini don't]
-               ifndef::telemini[EasyMini doesn't]
+               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,
                have an
                accelerometer we can use to determine orientation, “idle” mode
                is selected if the board is connected via USB to a computer,

diff --git a/doc/telemega.inc b/doc/telemega.inc
index 4383f228e34af27ccbb119081c0cacea171a99f2..55f77bc48771d6db476df1adb85c4325cdd0378e 100644 (file)
--- a/doc/telemega.inc
+++ b/doc/telemega.inc
@@ -9,6 +9,18 @@
        the board is aligned with the flight axis. It can be mounted
        either antenna up or down.
 
        the board is aligned with the flight axis. It can be mounted
        either antenna up or down.
 

+       TeleMega v2.0 has a few minor changes from v1.0:
+
+       * Companion connector matches EasyMega functions
+       * Serial port connector replaced with servo connector with
+         support for up to 4 PWM channels.
+       * Radio switched from cc1120 to cc1200.
+
+       None of these affect operation using the stock firmware, but
+       they do mean that the device needs different firmware to
+       operate correctly, so make sure you load the right firmware
+       when reflashing the device.
+

        === TeleMega Screw Terminals
 
                TeleMega has two sets of nine screw terminals on the end of
        === TeleMega Screw Terminals
 
                TeleMega has two sets of nine screw terminals on the end of

diff --git a/doc/telemini-v2-top.jpg b/doc/telemini-v2-top.jpg
deleted file mode 100644 (file)
index bc8ae45..0000000
Binary files a/doc/telemini-v2-top.jpg and /dev/null differ

diff --git a/doc/telemini-v2.0.inc b/doc/telemini-v2.0.inc
deleted file mode 100644 (file)
index 5803a2c..0000000
--- a/doc/telemini-v2.0.inc
+++ /dev/null
@@ -1,112 +0,0 @@
-== TeleMini v2.0
-
-       .TeleMini v2.0 Board
-       image::telemini-v2-top.jpg[width="5.5in"]
-      
-       TeleMini v2.0 is 0.8 inches by 1½ inches. It adds more
-       on-board data logging memory, a built-in USB connector and
-       screw terminals for the battery and power switch. The larger
-       board fits in a 24mm coupler. There's also a battery connector
-       for a LiPo battery if you want to use one of those.
-
-       === TeleMini v2.0 Screw Terminals
-       
-               TeleMini v2.0 has two sets of four screw terminals on the end of the
-               board opposite the telemetry antenna. Using the picture
-               above, the top four have connections for the main pyro
-               circuit and an external battery and the bottom four have
-               connections for the apogee pyro circuit and the power
-               switch. Counting from the left, the connections are as follows:
-
-               .TeleMini v2.0 Screw Terminals
-               [options="header",grid="all",cols="2,3,10"]
-               |====
-               |Terminal #|Terminal Name|Description
-               |Top 1
-               |Main -
-               |Main pyro channel connection to pyro circuit
-             
-               |Top 2
-               |Main +
-               |Main pyro channel common connection to battery +
-             
-               |Top 3
-               |Battery +
-               |Positive external battery terminal
-             
-               |Top 4
-               |Battery -
-               |Negative external battery terminal
-             
-               |Bottom 1
-               |Apogee -
-               |Apogee pyro channel connection to pyro circuit
-             
-               |Bottom 2
-               |Apogee +
-               |Apogee pyro channel common connection to battery +
-             
-               |Bottom 3
-               |Switch Output
-               |Switch connection to flight computer
-             
-               |Bottom 4
-               |Switch Input
-               |Switch connection to positive battery terminal
-               |====
-
-       === Connecting A Battery To TeleMini v2.0
-
-               There are two possible battery connections on TeleMini
-               v2.0. You can use either method; both feed through
-               the power switch terminals.
-
-               One battery connection is the standard Altus Metrum
-               white JST plug. This mates with single-cell Lithium
-               Polymer batteries sold by Altus Metrum.
-
-               The other is a pair of screw terminals marked 'Battery
-               +' and 'Battery -'. Connect a battery from 4 to 12
-               volts to these terminals, being careful to match polarity.
-
-       === Charging Lithium Batteries
-
-               Because TeleMini v2.0 allows for batteries other than
-               the standard Altus Metrum Lithium Polymer cells, it
-               cannot incorporate a battery charger
-               circuit. Therefore, when using a Litium Polymer cell,
-               you'll need an external charger. These are available
-               from Altus Metrum, or from Spark Fun.
-
-       === Using a Separate Pyro Battery with TeleMini v2.0
-       
-               As described above, using an external pyro battery involves
-               connecting the negative battery terminal to the flight
-               computer ground, connecting the positive battery terminal to
-               one of the igniter leads and connecting the other igniter
-               lead to the per-channel pyro circuit connection.
-
-               To connect the negative pyro battery terminal to TeleMini
-               ground, connect it to the negative external battery
-               connection, top terminal 4.
-
-               Connecting the positive battery terminal to the pyro
-               charges must be done separate from TeleMini v2.0, by soldering
-               them together or using some other connector.
-
-               The other lead from each pyro charge is then inserted into
-               the appropriate per-pyro channel screw terminal (top
-               terminal 1 for the Main charge, bottom terminal 1 for the
-               Apogee charge).
-
-       === Using an Active Switch with TeleMini v2.0
-       
-               As explained above, an external active switch requires three
-               connections, one to the positive battery terminal, one to
-               the flight computer positive input and one to ground. Use
-               the negative external battery connection, top terminal 4 for
-               ground.
-
-               The positive battery terminal is available on bottom
-               terminal 4, the positive flight computer input is on the
-               bottom terminal 3.