From adfbccfeb551c9d0315116912e7255a173fc3103 Mon Sep 17 00:00:00 2001 From: Keith Packard Date: Thu, 29 Oct 2015 16:49:00 +0900 Subject: doc: Lots more conversion from docbook to asciidoc Signed-off-by: Keith Packard --- doc/easymega.inc | 121 +++++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 121 insertions(+) create mode 100644 doc/easymega.inc (limited to 'doc/easymega.inc') diff --git a/doc/easymega.inc b/doc/easymega.inc new file mode 100644 index 00000000..eebece92 --- /dev/null +++ b/doc/easymega.inc @@ -0,0 +1,121 @@ +== EasyMega + + image::easymega-v1.0-top.jpg[width="4.5in"] + + EasyMega is a 1¼ inch by 2¼ inch circuit board. It was + designed to easily fit in a 38mm coupler. Like TeleMetrum, + EasyMega has an accelerometer and so it must be mounted so that + the board is aligned with the flight axis. It can be mounted + either antenna up or down. + + === EasyMega Screw Terminals + + EasyMega has two sets of nine screw terminals on the end of + the board opposite the telemetry antenna. They are as follows: + + [options="header",grid="all",cols="2,3,10"] + |==== + |Terminal #|Terminal Name|Description + + |Top 1 + |Switch Input + |Switch connection to positive battery terminal + + |Top 2 + |Switch Output + |Switch connection to flight computer + + |Top 3 + |GND + |Ground connection for use with external active switch + + |Top 4 + |Main - + |Main pyro channel connection to pyro circuit + + |Top 5 + |Main + + |Main pyro channel common connection to battery + + + |Top 6 + |Apogee - + |Apogee pyro channel connection to pyro circuit + + |Top 7 + |Apogee + + |Apogee pyro channel common connection to battery + + + |Top 8 + |D - + |D pyro channel connection to pyro circuit + + |Top 9 + |D + + |D pyro channel common connection to battery + + + |Bottom 1 + |GND + |Ground connection for negative pyro battery terminal + + |Bottom 2 + |Pyro + |Positive pyro battery terminal + + |Bottom 3 + |Lipo + |Power switch output. Use to connect main battery to pyro battery input + + |Bottom 4 + |A - + |A pyro channel connection to pyro circuit + + |Bottom 5 + |A + + |A pyro channel common connection to battery + + + |Bottom 6 + |B - + |B pyro channel connection to pyro circuit + + |Bottom 7 + |B + + |B pyro channel common connection to battery + + + |Bottom 8 + |C - + |C pyro channel connection to pyro circuit + + |Bottom 9 + |C + + |C pyro channel common connection to battery + + |==== + + === Using a Separate Pyro Battery with EasyMega + + EasyMega provides explicit support for an external pyro + battery. All that is required is to remove the jumper + between the lipo terminal (Bottom 3) and the pyro terminal + (Bottom 2). Then hook the negative pyro battery terminal to ground + (Bottom 1) and the positive pyro battery to the pyro battery + input (Bottom 2). You can then use the existing pyro screw + terminals to hook up all of the pyro charges. + + === Using Only One Battery With EasyMega + + Because EasyMega has built-in support for a separate pyro + battery, if you want to fly with just one battery running + both the computer and firing the charges, you need to + connect the flight computer battery to the pyro + circuit. EasyMega has two screw terminals for this—hook a + wire from the Lipo terminal (Bottom 3) to the Pyro terminal + (Bottom 2). + + === Using an Active Switch with EasyMega + + 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. + + The positive battery terminal is available on Top terminal + 1, the positive flight computer input is on Top terminal + 2. Ground is on Top terminal 3. -- cgit v1.2.3 From 9aed128dc0aab5d49e1b3264c864a6c3e929bffe Mon Sep 17 00:00:00 2001 From: Keith Packard Date: Sat, 31 Oct 2015 14:54:20 -0700 Subject: doc: Add titles to all figures Signed-off-by: Keith Packard --- doc/altosui.inc | 10 ++++++++++ doc/easymega.inc | 1 + doc/easymini.inc | 1 + doc/telemega.inc | 1 + doc/telemetrum.inc | 4 ++++ doc/telemini-v1.0.inc | 1 + doc/telemini-v2.0.inc | 2 +- 7 files changed, 19 insertions(+), 1 deletion(-) (limited to 'doc/easymega.inc') diff --git a/doc/altosui.inc b/doc/altosui.inc index 8297c0a0..fb034ad8 100644 --- a/doc/altosui.inc +++ b/doc/altosui.inc @@ -362,6 +362,7 @@ ==== Flight Graph + .Flight Data Graph image::graph.png[width="5.5in"] By default, the graph contains acceleration (blue), @@ -378,6 +379,7 @@ ==== Configure Graph + .Flight Graph Configuration image::graph-configure.png[width="5.5in"] This selects which graph elements to show, and, at the @@ -386,12 +388,14 @@ ==== Flight Statistics + .Flight Statistics image::graph-stats.png[width="5.5in"] Shows overall data computed from the flight. ==== Map + .Flight Map image::graph-map.png[width="5.5in"] Shows a satellite image of the flight area overlaid @@ -437,6 +441,7 @@ === Configure Altimeter + .Altimeter Configuration image::configure-altimeter.png[width="3.6in"] Select this button and then select either an altimeter or @@ -638,6 +643,7 @@ ==== Configure Pyro Channels + .Additional Pyro Channel Configuration image::configure-pyro.png[width="5.5in"] This opens a separate window to configure the @@ -845,6 +851,7 @@ === Fire Igniter + .Fire Igniter Window image::fire-igniter.png[width="1.2in"] This activates the igniter circuits in the flight @@ -872,6 +879,7 @@ === Scan Channels + .Scan Channels Window image::scan-channels.png[width="3.2in"] This listens for telemetry packets on all of the @@ -884,6 +892,7 @@ === Load Maps + .Load Maps Window image::load-maps.png[width="5.2in"] Before heading out to a new launch site, you can use @@ -944,6 +953,7 @@ === Monitor Idle + .Monitor Idle Window image::monitor-idle.png[width="5.2in"] This brings up a dialog similar to the Monitor Flight diff --git a/doc/easymega.inc b/doc/easymega.inc index eebece92..f6c06431 100644 --- a/doc/easymega.inc +++ b/doc/easymega.inc @@ -1,5 +1,6 @@ == EasyMega + .EasyMega Board image::easymega-v1.0-top.jpg[width="4.5in"] EasyMega is a 1¼ inch by 2¼ inch circuit board. It was diff --git a/doc/easymini.inc b/doc/easymini.inc index 0714d7c3..a7f06c01 100644 --- a/doc/easymini.inc +++ b/doc/easymini.inc @@ -1,5 +1,6 @@ == EasyMini + .EasyMini Board image::easymini-top.jpg[width="5.5in"] EasyMini is built on a 0.8 inch by 1½ inch circuit board. It's diff --git a/doc/telemega.inc b/doc/telemega.inc index 12db50d6..fcfd8d8e 100644 --- a/doc/telemega.inc +++ b/doc/telemega.inc @@ -1,5 +1,6 @@ == TeleMega + .TeleMega Board image::telemega-v1.0-top.jpg[width="5.5in"] TeleMega is a 1¼ inch by 3¼ inch circuit board. It was diff --git a/doc/telemetrum.inc b/doc/telemetrum.inc index 9562d994..54185bff 100644 --- a/doc/telemetrum.inc +++ b/doc/telemetrum.inc @@ -1,5 +1,9 @@ == TeleMetrum + .TeleMetrum v2 Board + image::telemetrum-v2.0-th.jpg[width="5.5in"] + + .TeleMetrum v1 Board image::telemetrum-v1.1-thside.jpg[width="5.5in"] TeleMetrum is a 1 inch by 2¾ inch circuit board. It was designed to diff --git a/doc/telemini-v1.0.inc b/doc/telemini-v1.0.inc index 11a2c9f9..ea70ac2a 100644 --- a/doc/telemini-v1.0.inc +++ b/doc/telemini-v1.0.inc @@ -1,5 +1,6 @@ == TeleMini v1.0 + .TeleMini v1.0 Board image::telemini-v1-top.jpg[width="5.5in"] TeleMini v1.0 is ½ inches by 1½ inches. It was diff --git a/doc/telemini-v2.0.inc b/doc/telemini-v2.0.inc index 0a6a7b2d..bd6756a8 100644 --- a/doc/telemini-v2.0.inc +++ b/doc/telemini-v2.0.inc @@ -1,7 +1,7 @@ == 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 -- cgit v1.2.3 From 553d9041b52cbb88662fcc5e6a277ce43bd151cd Mon Sep 17 00:00:00 2001 From: Keith Packard Date: Sun, 1 Nov 2015 04:23:56 -0800 Subject: doc: Get images and tables all centered and labeled A bunch of images were using image: instead of image:: and some images and tables were missing titles. Signed-off-by: Keith Packard --- doc/altosui.inc | 80 +++++++++++++++++++++++++-------------------------- doc/easymega.inc | 1 + doc/easymini.inc | 20 ++++++++----- doc/micropeak.txt | 24 ++++++++-------- doc/specs.inc | 2 ++ doc/telemega.inc | 1 + doc/telemetrum.inc | 1 + doc/telemini-v1.0.inc | 1 + doc/telemini-v2.0.inc | 1 + 9 files changed, 72 insertions(+), 59 deletions(-) (limited to 'doc/easymega.inc') diff --git a/doc/altosui.inc b/doc/altosui.inc index fb034ad8..a7bf4449 100644 --- a/doc/altosui.inc +++ b/doc/altosui.inc @@ -677,7 +677,8 @@ === Configure AltosUI - image:configure-altosui.png[width="2.4in"] + .Configure AltosUI Dialog + image::configure-altosui.png[width="2.4in"] This button presents a dialog so that you can configure the AltosUI global settings. @@ -770,45 +771,44 @@ === Configure Groundstation - image:configure-groundstation.png[width="3.1in"] - - Select this button and then select a - TeleDongle or TeleBT Device from the list - provided. - - The first few lines of the dialog provide - information about the connected device, - including the product name, software version - and hardware serial number. Below that are the - individual configuration entries. - - Note that TeleDongle and TeleBT don't save any - configuration data, the settings here are - recorded on the local machine in the Java - preferences database. Moving the device to - another machine, or using a different user - account on the same machine will cause - settings made here to have no effect. - - At the bottom of the dialog, there are three - buttons: - - Save:: - This writes any changes to the local Java - preferences file. If you don't press this - button, any changes you make will be lost. - - Reset:: - This resets the dialog to the most recently - saved values, erasing any changes you have - made. - - Close:: - This closes the dialog. Any unsaved changes - will be lost. - - The rest of the dialog contains the parameters - to be configured. + .Configure Groundstation Dialog + image::configure-groundstation.png[width="3.1in"] + + Select this button and then select a TeleDongle or + TeleBT Device from the list provided. + + The first few lines of the dialog provide information + about the connected device, including the product + name, software version and hardware serial + number. Below that are the individual configuration + entries. + + Note that TeleDongle and TeleBT don't save any + configuration data, the settings here are recorded on + the local machine in the Java preferences + database. Moving the device to another machine, or + using a different user account on the same machine + will cause settings made here to have no effect. + + At the bottom of the dialog, there are three + buttons: + + Save:: + This writes any changes to the local Java + preferences file. If you don't press this + button, any changes you make will be lost. + + Reset:: + This resets the dialog to the most recently + saved values, erasing any changes you have + made. + + Close:: + This closes the dialog. Any unsaved changes + will be lost. + + The rest of the dialog contains the parameters + to be configured. ==== Frequency diff --git a/doc/easymega.inc b/doc/easymega.inc index f6c06431..c126004b 100644 --- a/doc/easymega.inc +++ b/doc/easymega.inc @@ -14,6 +14,7 @@ EasyMega has two sets of nine screw terminals on the end of the board opposite the telemetry antenna. They are as follows: + .EasyMega Screw Terminals [options="header",grid="all",cols="2,3,10"] |==== |Terminal #|Terminal Name|Description diff --git a/doc/easymini.inc b/doc/easymini.inc index a7f06c01..fb2b6098 100644 --- a/doc/easymini.inc +++ b/doc/easymini.inc @@ -4,19 +4,25 @@ image::easymini-top.jpg[width="5.5in"] EasyMini is built on a 0.8 inch by 1½ inch circuit board. It's - designed to fit in a 24mm coupler tube. The connectors and - screw terminals match TeleMini v2.0, so you can easily swap between - EasyMini and TeleMini. + designed to fit in a 24mm coupler tube. + + You usually don't need to configure EasyMini at all; it's set + up to do dual-deployment with an event at apogee to separate + the airframe and deploy a drogue and another event at 250m + (820ft) to deploy the main. Install EasyMini in your airframe, + hook up a battery, igniters and a power switch and you're + ready to fly. === EasyMini Screw Terminals - EasyMini has two sets of four screw terminals on the end of the - board opposite the telemetry antenna. Using the picture + EasyMini has two sets of four screw terminals near one end of the + board. 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: + .EasyMini Screw Terminals [options="header",grid="all",cols="2,3,10"] |==== |Terminal #|Terminal Name|Description @@ -53,7 +59,7 @@ |Switch connection to positive battery terminal |==== - === Connecting A Battery To TeleMini v2.0 + === Connecting A Battery To EasyMini There are two possible battery connections on EasyMini. You can use either method; both feed @@ -84,7 +90,7 @@ 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 + To connect the negative pyro battery terminal to EasyMini ground, connect it to the negative external battery connection, top terminal 4. diff --git a/doc/micropeak.txt b/doc/micropeak.txt index d62e4633..085be0ed 100644 --- a/doc/micropeak.txt +++ b/doc/micropeak.txt @@ -78,7 +78,7 @@ == The MicroPeak USB adapter .MicroPeak USB Adapter - image::MicroPeakUSB-2.0.jpg[width="4.5in"] + image::MicroPeakUSB-2.0.jpg[width="4.5in",align="center"] MicroPeak stores barometric pressure information for the first 48 seconds of the flight in on-board non-volatile memory. The @@ -103,25 +103,25 @@ * Start the MicroPeak application. - image::micropeak-nofont.svg[width="0.5in"] + image::micropeak-nofont.svg[width="0.5in",align="center"] * Click on the Download button at the top of the window. .MicroPeak Application - image::micropeak-app.png[width="4.5in"] + image::micropeak-app.png[width="4.5in",align="center"] * Select from the listed devices. There will probably be only one. .MicroPeak Device Dialog - image::micropeak-device-dialog.png[width="2.3in"] + image::micropeak-device-dialog.png[width="2.3in",align="center"] * The application will now wait until it receives valid data from the MicroPeak USB adapter. .MicroPeak Download Dialog - image::micropeak-download.png[width="2in"] + image::micropeak-download.png[width="2in",align="center"] * The MicroPeak USB adapter has a small phototransistor under the hole in the center of the @@ -133,7 +133,7 @@ MicroPeak board itself. .MicroPeak Downloading - image::MicroPeakUSB-2.0-inuse.jpg[width="4.5in"] + image::MicroPeakUSB-2.0-inuse.jpg[width="4.5in",align="center"] * After the maximum flight height is reported, MicroPeak will pause for a few seconds, blink the @@ -145,7 +145,7 @@ MicroPeak board and try again. .MicroPeak Save Dialog - image::micropeak-save-dialog.png[width="2.3in"] + image::micropeak-save-dialog.png[width="2.3in",align="center"] * Once the data are saved, a graph will be displayed with height, speed and acceleration values computed @@ -185,7 +185,7 @@ ==== MicroPeak Graphs .MicroPeak Graph - image::micropeak-graph.png[width="4.5in"] + image::micropeak-graph.png[width="4.5in",align="center"] Under the Graph tab, the height, speed and acceleration values are displayed together. You can zoom in on the graph by @@ -196,7 +196,7 @@ ==== MicroPeak Flight Statistics .MicroPeak Flight Statistics - image::micropeak-statistics.png[width="4.5in"] + image::micropeak-statistics.png[width="4.5in",align="center"] The Statistics tab presents overall data from the flight. Note that the Maximum height value @@ -211,7 +211,7 @@ ==== Raw Flight Data .MicroPeak Raw Flight Data - image::micropeak-raw-data.png[width="4.5in"] + image::micropeak-raw-data.png[width="4.5in",align="center"] A table consisting of the both the raw barometric pressure data and values computed from that for each recorded time. @@ -219,7 +219,7 @@ ==== Configuring the Graph .MicroPeak Graph Configuration - image::micropeak-graph-configure.png[width="4.5in"] + image::micropeak-graph-configure.png[width="4.5in",align="center"] This selects which graph elements to show, and lets you switch between metric and imperial units @@ -227,7 +227,7 @@ === Setting MicroPeak Preferences .MicroPeak Preferences - image::micropeak-preferences.png[width="1.8in"] + image::micropeak-preferences.png[width="1.8in",align="center"] The MicroPeak application has a few user settings which are configured through the Preferences dialog, which can be diff --git a/doc/specs.inc b/doc/specs.inc index 0991bd2d..6af3bd76 100644 --- a/doc/specs.inc +++ b/doc/specs.inc @@ -4,6 +4,7 @@ Here's the full set of Altus Metrum products, both in production and retired. + .Altus Metrum Flight Computer Electronics [options="header"] |================================ |Device | Barometer | Z-axis accel | GPS | 3D sensors | Storage | RF Output | Battery @@ -91,6 +92,7 @@ |============================== <<<< + .Altus Metrum Flight Computer Mechanical Components [options="header",grid="all"] |============================== |Device|Connectors|Screw Terminals|Width|Length|Tube Size diff --git a/doc/telemega.inc b/doc/telemega.inc index fcfd8d8e..4383f228 100644 --- a/doc/telemega.inc +++ b/doc/telemega.inc @@ -14,6 +14,7 @@ TeleMega has two sets of nine screw terminals on the end of the board opposite the telemetry antenna. They are as follows: + .TeleMega Screw Terminals [options="header",grid="all",cols="2,3,10"] |==== |Terminal #|Terminal Name|Description diff --git a/doc/telemetrum.inc b/doc/telemetrum.inc index fa7d202c..7c9dadb5 100644 --- a/doc/telemetrum.inc +++ b/doc/telemetrum.inc @@ -37,6 +37,7 @@ circuits. Using the picture above and starting from the top, the terminals are as follows: + .TeleMetrum Screw Terminals [options="header",grid="all",cols="2,3,10"] |========================= |Terminal #|Terminal Name|Description diff --git a/doc/telemini-v1.0.inc b/doc/telemini-v1.0.inc index ea70ac2a..e0d674f6 100644 --- a/doc/telemini-v1.0.inc +++ b/doc/telemini-v1.0.inc @@ -26,6 +26,7 @@ and from the left for the power switch wires, the connections are as follows: + .TeleMini v1.0 Screw Terminals [options="header",grid="all",cols="2,3,10"] |==== |Terminal #|Terminal Name|Description diff --git a/doc/telemini-v2.0.inc b/doc/telemini-v2.0.inc index bd6756a8..5803a2ca 100644 --- a/doc/telemini-v2.0.inc +++ b/doc/telemini-v2.0.inc @@ -18,6 +18,7 @@ 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 -- cgit v1.2.3